Request 5519 (accepted)

Overview

Request 5519 (accepted)

Update to version 2.0.0

Created by Aloysius almost 3 years ago
In state accepted

Submit gpac

Submit package home:Aloysius:branches:Essentials / gpac to package Essentials / gpac

gpac.changes Changed

@@ -1,4 +1,111 @@
 -------------------------------------------------------------------
+Thu Feb 24 11:20:47 UTC 2022 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 2.0.0
+ Adaptive Streaming:
+ * Low Latency HLS (LL-HLS, generation and playback)
+ * Custom forwarding modes of DASH reader, allowing for example
+ to encrypt/decrypt a live DASH/HLS session
+ * DASHing now possible using inband cues (generated by flist,
+ dashin or dasher filters)
+ * Cue-generation only mode for dasher
+ * HLS/DASH signaling of intra-only representations
+ * playback improvements for SRD (HEVC tiling and independent
+ streams)
+ * CMAF-compatible signaling
+ * PPS injection for inband parameter set modes
+ * Improved SmoothStreaming support
+ * DASH period continuity support (from playlists or reframer)
+ * DASH MPD Chaining support
+ * Text segments in native format (WebVTT, TTML) in dasher
+ * User tags injection for HLS master and variant playlists
+ Image File Format (HEIF):
+ * Grid creation and other derived images
+ * Encryption
+ * Time range in -add-image
+ * Item to sample data reference (no copy)
+ * Item to item data reference (no copy)
+ * Generic auxiliary image tagging
+ * Image replacement in HEIF collection
+ * AV1 (AVIF) and VVC support
+ MP4Box:
+ * In-place editing (no file remultiplexing)
+ * Improved splitting, including sample-accurate split
+ * ISOBMFF edit lists modification through :edits and -edits
+ options
+ * Track extraction from non ISOBMFF sources in MP4Box
+ * Most import options can now be applied on an existing ISOBMF
+ file or track
+ * Multiple filter chains per source in -dash or -add modes
+ * Chunk interleaving dumper
+ Filters:
+ * Simplified gpac command line (backward compatible syntax)
+ avoiding links directives for common cases
+ * Added avmix, a playlist-based audio video mixer/compositor
+ with GPU or software rendering
+ * Python bindings for filter session
+ * NodeJS bindings for filter session
+ * Custom HAS adaptation algorithms (JS, Python and NodeJS)
+ * Custom Remotery callbacks (JS, Python and NodeJS)
+ * Added avgen, a simple counter generation
+ * Splicing support in playlists: raw and compressed domain,
+ vod and live splicing
+ * Tile splitting now available as a filter
+ * Added restamp, a stream timestamp rewriter filter
+ * Added bssplit and bsagg, compressed bitstream splitter and
+ aggregator filters
+ * Aspect ratio support in rescaler (ffsws)
+ * Raw (uncompressed) modes for flist and reframer
+ * Flip and rotate in vout
+ * Simple UI for vout to test seeking and speed modes
+ * Improved color space support in rendering (OpenGL only)
+ * Improved round-trip audio decode
+ * Improved audio resampler
+ * Added back old arch compositor features (TEMI support, HEVC
+ tiling JS monitoring, MPEG-4 SegmentDescriptor)
+ * Reading back frame interface data (GPU, decoder mem) in JS
+ or Python sink filters
+ * Memory storage in httpout server file sink
+ * FileIO wrapper available in QJS, Python and NodeJS
+ Protocols:
+ * HTTP/2 (client and server) through nghttp2
+ * ROUTE multiplexer and low-latency ROUTE (mux and demux)
+ Media Formats:
+ * Improved MPEG-H audio mux/demux/dashing
+ * VVC parsing, inspecting, mux/demux (ISOBMFF, M2TS), RTP,
+ DASH and encryption
+ * VUI color info rewrite for AVC, HEVC and VVC (mp4box and
+ bsrw filter)
+ * Dolby TrueHD
+ * DolbyVision muxing
+ * Improved multichannel AAC (>=8) support
+ * Improved raw video in ISOBMFF support
+ * Bitstream dumping for inspect analyze mode
+ * Improved TTML support: metrics, image embedding (IMSC1),
+ TTML sample merging while exporting, subtitle zero in TTML
+ * YouTube VR meta-data
+ * yuv4mpeg format read/write
+ * Extended NHML syntax for properties, reconfiguration,
+ subsamples and sample auxiliary data
+ Encryption:
+ * Multi-key per sample encryption
+ * HLS full segment encryption and decryption
+ * Per-segment or per-period key roll
+ * Master/leaf key schemes
+ Misc:
+ * Improved HTTP rate limiter and chunk-transfer rate estimator
+ * Cleanup of mod-dirs and js-dirs usage, JS filters can now be
+ included in the default available filters
+ * Support for windows long path
+ * Moved to latest QuickJS (2021-03-27)
+ * Added QJS-libc modules, support for exec/waitpid/kill and
+ Workers on most platforms
+ * Support for FFmpeg 4.4 +
+ * many bug fixes, improvements and security patches
+- Bumped soversion to 11
+- Dropped gpac-1.0.1-desktop.patch (no longer necessary)
+
+-------------------------------------------------------------------
 Sat Nov 28 13:50:35 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
 
 - Update to version 1.0.1

gpac.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package gpac
 #
-# Copyright (c) 2020 Packman Team <packman@links2linux.de>
+# Copyright (c) 2022 Packman Team <packman@links2linux.de>
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,9 +17,9 @@
 #
 
 
-%define sover 10
+%define sover 11
 Name: gpac
-Version: 1.0.1
+Version: 2.0.0
 Release: 0
 Summary: A multimedia framework covering MPEG-4, VRML/X3D and SVG
 License: LGPL-2.1-or-later
@@ -32,14 +32,13 @@
 #PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
 Patch3: gpac-1.0.0-64bit-portability.patch
 Patch12: gpac.ssl.patch
-# PATCH-FIX-OPENSUSE gpac-1.0.1-desktop.patch
-Patch14: gpac-1.0.1-desktop.patch
 BuildRequires: Mesa-devel
 BuildRequires: dos2unix
 BuildRequires: doxygen
 BuildRequires: fdupes
 BuildRequires: gcc-c++
 BuildRequires: graphviz
+BuildRequires: hicolor-icon-theme
 BuildRequires: libxvidcore-devel
 BuildRequires: update-desktop-files
 BuildRequires: pkgconfig(alsa)
@@ -181,7 +180,7 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_libdir}/%{name}
 %{_mandir}/man1/gpac.1%{?ext_man}
 %{_mandir}/man1/gpac-filters.1%{?ext_man}

gpac-1.0.1-desktop.patch Deleted

gpac-1.0.1.tar.gz/Clean.bat Deleted

@@ -1,23 +0,0 @@
-cd src
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-cd modules
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-cd build
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-cd applications
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-cd bin
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-
-
-

gpac-1.0.1.tar.gz/applications/mp4box/wrapper.c Deleted

@@ -1,102 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <android/log.h>
-#include <jni.h>
-#include "stdlib.h"
-#include "stdio.h"
-#include "string.h"
-
-
-#define jniTAG "WRAPPER_JNI"
-
-#define jniLOGV(X) __android_log_print(ANDROID_LOG_VERBOSE, jniTAG, X)
-#define jniLOGI(X) __android_log_print(ANDROID_LOG_INFO, jniTAG, X)
-#define jniLOGE(X) __android_log_print(ANDROID_LOG_ERROR, jniTAG, X)
-
-/*#define CAST_HANDLE(wr) jclass c = env->GetObjectClass(obj);\
- if (!c) return;\
- jfieldID fid = env->GetFieldID(c, "handle", "J");\
- if (!fid){\
- __android_log_print(ANDROID_LOG_ERROR, jniTAG, "No Field ID, ERROR");\
- return;\
- }\
- jlong h = env->GetLongField(obj, fid);
- //CNativeWrapper* wr = (CNativeWrapper*) h;*/
-
-char ** ConvertCommandLine( const char* sCommand, int* iNbArg );
-
-JNIEXPORT void JNICALL Java_com_enst_mp4box_mp4terminal_run(JNIEnv * env, jobject obj, jstring sCommand)
-{
-	//CAST_HANDLE(wr);
-	jniLOGV("mp4terminal::start");
-	/*if (!wr)
-	{
-		jniLOGV("mp4terminal::end : aborted");
-	 return;
-	}*/
-	jboolean isCopy;
-	const char * sOriginalCommand = (*env)->GetStringUTFChars(env, sCommand, &isCopy);
-
-	jniLOGV("mp4terminal::command get back ok");
-	jniLOGV(sOriginalCommand);
-
-	int i = 0;
-	char** sConvertedCommandLine;
-	sConvertedCommandLine = ConvertCommandLine( sOriginalCommand, &i );
-
-	jniLOGV("Convert command line done");
-	FILE* ferr = freopen( "/mnt/sdcard/stderrout.txt", "w", stderr );
-
-	FILE* fout = freopen( "/mnt/sdcard/stdout.txt", "w", stdout );
-
-	mp4boxMain(i, sConvertedCommandLine);
-
-	(*env)->ReleaseStringUTFChars(env, sCommand, sOriginalCommand);
-	jniLOGV("mp4terminal::end");
-	gf_fclose(ferr);
-	gf_fclose(fout);
-}
-
-char ** ConvertCommandLine( const char* sCommand, int* iNbArg )
-{
-	int iLength = strlen( sCommand );
-	int iArgNumber = 1;
-	int i = 0;
-	char** pReturn;
-	int iPreviousPos = 0;
-	int k = 1;//begin at character position 1 as the 0 position will be held by the process name , i.e. mp4box
-	int l = 0;
-
-	for ( i = 0; i < iLength ; i++ )
-	{
-		if( sCommand[i] == ' ' )
-		{
-			iArgNumber++;
-		}
-	}
-	iArgNumber++;; // last argument will not be detected as it is not followed by a space character
-	pReturn = (char**)malloc(sizeof(char*)*iArgNumber);
-	pReturn[0] = (char*)malloc(sizeof( char) * ( 7 ));
-	strcpy( pReturn[0], "MP4Box" );//just a place holder , will never be read.
-	pReturn[0][6] = '\0';
-
-	for ( l = 0; l <= iLength ; l++ )
-	{
-		if( sCommand[l] == ' ' || l == ( iLength ) )
-		{
-			pReturn[k] = (char*)malloc(sizeof( char) * ( l - iPreviousPos + 1));
-			strncpy( pReturn[k], sCommand + iPreviousPos, l - iPreviousPos );
-			pReturn[k][l-iPreviousPos] = '\0';
-			iPreviousPos = l + 1;
-			k++;
-		}
-	}
-	*iNbArg = iArgNumber;
-	return pReturn;
-}
-#ifdef __cplusplus
-}
-#endif
-

gpac-1.0.1.tar.gz/applications/mp4box_android/.classpath Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/.project Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/AndroidManifest.xml Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/default.properties Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/gen Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/gen/org Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/gen/org/enst Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/gen/org/enst/mp4box Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/gen/org/enst/mp4box/R.java Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/jni Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/jni/README.txt Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/proguard.cfg Deleted

@@ -1,36 +0,0 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
- native <methods>;
-}
-
--keepclasseswithmembernames class * {
- public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembernames class * {
- public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers enum * {
- public static **[] values();
- public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
- public static final android.os.Parcelable$Creator *;
-}

gpac-1.0.1.tar.gz/applications/mp4box_android/res Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/res/drawable-hdpi Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/res/drawable-ldpi Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/res/drawable-mdpi Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/res/layout Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/res/layout/main.xml Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/res/values Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/res/values/strings.xml Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/src Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/src/com Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/src/com/enst Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/src/com/enst/mp4box Deleted

gpac-1.0.1.tar.gz/applications/mp4box_android/src/com/enst/mp4box/mp4box.java Deleted

@@ -1,129 +0,0 @@
-package com.enst.mp4box;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.enst.mp4box.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.Button;
-import android.widget.EditText;
-import android.util.Log;
-import android.view.View;
-
-
-
-public class mp4box extends Activity {
-	private mp4terminal myTerminal;
-	
- /** Called when the activity is first created. */
- @Override
- 
- 
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
- myTerminal = new mp4terminal();
- errors = loadAllLibraries();
- System.out.println( "hello world java" );
- final Button button = (Button) findViewById(R.id.OkButton);
- 
- button.setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- 	EditText oCommandLine = (EditText) findViewById(R.id.CommandLineEdit );
- 	CharSequence sCommandLine = oCommandLine.getText();
- 	myTerminal.run( sCommandLine.toString() );
- 	//showKeyboard( true );
- }
- });
- 
- }
- 
-
- 
- 
- private static Map<String, Throwable> errors = null;
- 
- synchronized static Map<String, Throwable> loadAllLibraries() 
- {
- 	if( errors != null)
- 		return errors;
- StringBuilder sb = new StringBuilder();
- final String[] toLoad = { "GLESv1_CM", "dl", "log",//$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
- "jpeg", "javaenv", //$NON-NLS-1$ //$NON-NLS-2$ 
- "mad", "editline", "ft2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- "js_osmo", "openjpeg", "png", "z", //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$
- "ffmpeg", "faad", "gpac", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- "stdc++", "mp4box" }; // //$NON-NLS-1$ //$NON-NLS-2$
- HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
- for (String s : toLoad) {
- try {
- String msg = "Loading library " + s + "...";//$NON-NLS-1$//$NON-NLS-2$
- sb.append(msg);
- //Log.i(LOG_LIB, msg);
- System.loadLibrary(s);
- } catch (UnsatisfiedLinkError e) {
- sb.append("Failed to load " + s + ", error=" + e.getLocalizedMessage() + " :: " //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
- + e.getClass().getSimpleName() + "\n"); //$NON-NLS-1$
- exceptions.put(s, e);
- //Log.e(LOG_LIB, "Failed to load library : " + s + " due to link error " + e.getLocalizedMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (SecurityException e) {
- exceptions.put(s, e);
- //Log.e(LOG_LIB, "Failed to load library : " + s + " due to security error " + e.getLocalizedMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (Throwable e) {
- exceptions.put(s, e);
- //Log.e(LOG_LIB, "Failed to load library : " + s + " due to Runtime error " + e.getLocalizedMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /*if (!exceptions.isEmpty()) {
- try {
- PrintStream out = new PrintStream(config.getGpacConfigDirectory() + "debug_libs.txt", "UTF-8"); //$NON-NLS-1$//$NON-NLS-2$
- out.println("$Revision: 2972 $"); //$NON-NLS-1$
- out.println(new Date());
- out.println("\n*** Configuration\n"); //$NON-NLS-1$
- out.println(config.getConfigAsText());
- sb.append("*** Libs listing: "); //$NON-NLS-1$
- sb.append(config.getGpacLibsDirectory());
- sb.append('\n');
- listing(sb, new File(config.getGpacLibsDirectory()), 2);
- sb.append("*** Modules listing: "); //$NON-NLS-1$
- sb.append(config.getGpacModulesDirectory());
- sb.append('\n');
- listing(sb, new File(config.getGpacModulesDirectory()), 2);
- sb.append("*** Fonts listing: \n"); //$NON-NLS-1$
- sb.append(config.getGpacFontDirectory());
- sb.append('\n');
- listing(sb, new File(config.getGpacFontDirectory()), 2);
- sb.append("*** Exceptions:\n"); //$NON-NLS-1$
- for (Map.Entry<String, Throwable> ex : exceptions.entrySet()) {
- sb.append(ex.getKey()).append(": ") //$NON-NLS-1$
- .append(ex.getValue().getLocalizedMessage())
- .append('(')
- .append(ex.getValue().getClass())
- .append(")\n"); //$NON-NLS-1$
- }
- out.println(sb.toString());
- out.flush();
- out.close();
- } catch (Exception e) {
- Log.e(LOG_LIB, "Failed to output debug info to debug file", e); //$NON-NLS-1$
- }
- }*/
- errors = Collections.unmodifiableMap(exceptions);
- return errors;
-}
- /*public void showKeyboard(boolean showKeyboard) {
- if (keyboardIsVisible == showKeyboard == true)
- return;
- InputMethodManager mgr = ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE));
- this.keyboardIsVisible = showKeyboard;
- if (showKeyboard)
- mgr.showSoftInput(findViewById(R.id.CommandLineEdit ), 0);
- else
- mgr.hideSoftInputFromInputMethod(findViewById(R.id.CommandLineEdit ).getWindowToken(), 0);
-
- }*/
-}
\ No newline at end of file

gpac-1.0.1.tar.gz/applications/mp4box_android/src/com/enst/mp4box/mp4terminal.java Deleted

gpac-1.0.1.tar.gz/include/gpac/atsc.h Deleted

@@ -1,229 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2019
- *					All rights reserved
- *
- * This file is part of GPAC / ATSC demuxer
- *
- * GPAC is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * GPAC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef _GF_ATSC_H_
-#define _GF_ATSC_H_
-
-#include <gpac/tools.h>
-
-#ifndef GPAC_DISABLE_ATSC
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!
-\file <gpac/atsc.h>
-\brief Specific extensions for ATSC ROUTE demux
-*/
-
-/*!
-\addtogroup atsc_grp ATSC3
-\ingroup media_grp
-\brief ATSC 3.0 reciever
-
-The ATSC 3.0 receiver implements part of the ATSC 3.0 specification, mostly low-level signaling and ROUTE reception.
-It can write received files to disk, or send them back to the user for cache population
-
-@{
-*/
-
-/*!The GF_ATSCDmx object.*/
-typedef struct __gf_atscdmx GF_ATSCDmx;
-
-/*!The types of events used to communicate withe the demuxer user.*/
-typedef enum
-{
-	/*! A new service detected, service ID is in evt_param*/
-	GF_ATSC_EVT_SERVICE_FOUND = 0,
-	/*! Service scan completed, no evt_param*/
-	GF_ATSC_EVT_SERVICE_SCAN,
-	/*! New MPD available for service, service ID is in evt_param*/
-	GF_ATSC_EVT_MPD,
-	/*! Init segment update, service ID is in evt_param, file info is in finfo*/
-	GF_ATSC_EVT_INIT_SEG,
-	/*! Segment reception, service ID is in evt_param, file info is in finfo*/
-	GF_ATSC_EVT_SEG,
-} GF_ATSCEventType;
-
-/*! Structure used to communicate file objects properties to the user*/
-typedef struct
-{
-	/*! original file name*/
-	const char *filename;
-	/*! data pointer*/
-	u8 *data;
-	/*! data size*/
-	u32 size;
-	/*! object TSI*/
-	u32 tsi;
-	/*! object TOI*/
-	u32 toi;
-	/*! download time in ms*/
-	u32 download_ms;
-	/*! flag set if file is corrupted*/
-	Bool corrupted;
-} GF_ATSCEventFileInfo;
-
-/*! Creates a new ATSC demultiplexer
-\param ifce network interface to monitor, NULL for INADDR_ANY
-\param dir output directory for files. If NULL, files are not written to disk and user callback will be called if set
-\param sock_buffer_size default buffer size for the udp sockets. If 0, uses 0x2000
-\return the ATSC demultiplexer created
-*/
-GF_ATSCDmx *gf_atsc3_dmx_new(const char *ifce, const char *dir, u32 sock_buffer_size);
-/*! Deletes an ATSC demultiplexer
-\param atscd the ATSC demultiplexer to delete
-*/
-void gf_atsc3_dmx_del(GF_ATSCDmx *atscd);
-
-/*! Processes demultiplexing, returns when nothing to read
-\param atscd the ATSC demultiplexer
-\return error code if any, GF_IP_NETWORK_EMPTY if nothing was read
- */
-GF_Err gf_atsc3_dmx_process(GF_ATSCDmx *atscd);
-
-/*! Sets user callback for disk-less operations
-\param atscd the ATSC demultiplexer
-\param on_event the user callback function
-\param udta the user data passed back by the callback
-\return error code if any
- */
-GF_Err gf_atsc3_set_callback(GF_ATSCDmx *atscd, void (*on_event)(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *finfo), void *udta);
-
-/*! Sets the maximum number of objects to store on disk per TSI
-\param atscd the ATSC demultiplexer
-\param max_segs max number of objects (segments) to store. If 0, all objects are kept
-\return error code if any
- */
-GF_Err gf_atsc3_set_max_objects_store(GF_ATSCDmx *atscd, u32 max_segs);
-
-/*! Sets reordering on.
-\param atscd the ATSC demultiplexer
-\param force_reorder if TRUE, the order flag in ROUTE/LCT is ignored and objects are gathered for the given time. Otherwise, if order flag is set in ROUTE/LCT, an object is considered done as soon as a new object starts
-\param timeout_ms maximum delay to wait before considering the object is done when ROUTE/LCT order is not used. A value of 0 implies waiting forever (default value is 5s).
-\return error code if any
- */
-GF_Err gf_atsc3_set_reorder(GF_ATSCDmx *atscd, Bool force_reorder, u32 timeout_ms);
-
-/*! Sets the maximum number of objects to store on disk per TSI
-\param atscd the ATSC demultiplexer
-\param service_id ID of the service to tune in. 0 means no service, 0xFFFFFFFF means all services and 0xFFFFFFFE means first service found
-\param tune_others if set, will tune all non-selected services to get the MPD, but won't receive any media data
-\return error code if any
- */
-GF_Err gf_atsc3_tune_in(GF_ATSCDmx *atscd, u32 service_id, Bool tune_others);
-
-
-/*! Gets the number of objects currently loaded in the service
-\param atscd the ATSC demultiplexer
-\param service_id ID of the service to query
-\return number of objects in service
- */
-u32 gf_atsc3_dmx_get_object_count(GF_ATSCDmx *atscd, u32 service_id);
-
-/*! Removes an object with a given filename
-\param atscd the ATSC demultiplexer
-\param service_id ID of the service to query
-\param fileName name of the file associated with the object
-\param purge_previous if set, indicates that all objects with the same TSI and a TOI less than TOI of the deleted object will be removed
- */
-void gf_atsc3_dmx_remove_object_by_name(GF_ATSCDmx *atscd, u32 service_id, char *fileName, Bool purge_previous);
-
-/*! Removes the first object loaded in the service
-\param atscd the ATSC demultiplexer
-\param service_id ID of the service to query
-\return GF_TRUE if success, GF_FALSE if no object could be removed (the object is in download)
- */
-Bool gf_atsc3_dmx_remove_first_object(GF_ATSCDmx *atscd, u32 service_id);
-
-/*! Checks existence of a service
-\param atscd the ATSC demultiplexer
-\param service_id ID of the service to query
-\return true if service is found, false otherwise
- */
-Bool gf_atsc3_dmx_find_service(GF_ATSCDmx *atscd, u32 service_id);
-
-/*! Removes all non-signaling objects (ie TSI!=0), keeping only init segments and currently/last downloaded objects
-\note this is mostly useful in case of looping session, or at MPD switch boundaries
-\param atscd the ATSC demultiplexer
-\param service_id ID of the service to cleanup
- */
-void gf_atsc3_dmx_purge_objects(GF_ATSCDmx *atscd, u32 service_id);
-
-
-/*! Gets high resolution system time clock of the first packet received
-\param atscd the ATSC demultiplexer
-\return system clock in microseconds of first packet received
- */
-u64 gf_atsc3_dmx_get_first_packet_time(GF_ATSCDmx *atscd);
-
-/*! Gets high resolution system time clock of the last packet received
-\param atscd the ATSC demultiplexer
-\return system clock in microseconds of last packet received
- */
-u64 gf_atsc3_dmx_get_last_packet_time(GF_ATSCDmx *atscd);
-
-/*! Gets the number of packets received since start of the session, for all active services
-\param atscd the ATSC demultiplexer
-\return number of packets received
- */
-u64 gf_atsc3_dmx_get_nb_packets(GF_ATSCDmx *atscd);
-
-/*! Gets the number of bytes received since start of the session, for all active services
-\param atscd the ATSC demultiplexer
-\return number of bytes received
- */
-u64 gf_atsc3_dmx_get_recv_bytes(GF_ATSCDmx *atscd);
-
-/*! Gather only objects with given TSI (for debug purposes)
-\param atscd the ATSC demultiplexer
-\param tsi the target TSI, 0 for no filtering
- */
-void gf_atsc3_dmx_debug_tsi(GF_ATSCDmx *atscd, u32 tsi);
-
-/*! Sets udta for given service id
-\param atscd the ATSC demultiplexer
-\param service_id the target service
-\param udta the target user data
- */
-void gf_atsc3_dmx_set_service_udta(GF_ATSCDmx *atscd, u32 service_id, void *udta);
-
-/*! Gets udta for given service id
-\param atscd the ATSC demultiplexer
-\param service_id the target service
-\return the user data associated with the service
- */
-void *gf_atsc3_dmx_get_service_udta(GF_ATSCDmx *atscd, u32 service_id);
-
-/*! @} */
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GPAC_DISABLE_ATSC */
-
-#endif	//_GF_ATSC_H_
-

gpac-1.0.1.tar.gz/src/filters/in_atsc.c Deleted

@@ -1,507 +0,0 @@
-	/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2020
- *					All rights reserved
- *
- * This file is part of GPAC / ATSC input filter
- *
- * GPAC is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * GPAC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <gpac/filters.h>
-#include <gpac/atsc.h>
-
-#ifndef GPAC_DISABLE_ATSC
-
-typedef struct
-{
-	u32 sid;
-	u32 tsi;
-	GF_FilterPid *opid;
-	Bool init_sent;
-} TSI_Output;
-
-typedef struct
-{
-	GF_FilterPid *opid;
-	char *seg_name;
-} SegInfo;
-
-typedef struct
-{
-	//options
-	char *src, *ifce, *odir;
-	Bool gcache, kc, sr, reorder;
-	u32 buffer, timeout, stats, max_segs, tsidbg, rtimeout;
-	s32 tunein, stsi;
-	
-	//internal
-	GF_Filter *filter;
-	GF_DownloadManager *dm;
-
-	char *clock_init_seg;
-	GF_ATSCDmx *atsc_dmx;
-	u32 tune_service_id;
-
-	u32 sync_tsi, last_toi;
-
-	u32 start_time, tune_time;
-	GF_FilterPid *opid;
-	GF_List *tsi_outs;
-
-	u32 nb_stats;
-	GF_List *received_seg_names;
-} ATSCInCtx;
-
-
-static GF_FilterProbeScore atscin_probe_url(const char *url, const char *mime)
-{
-	if (!strnicmp(url, "atsc://", 7)) return GF_FPROBE_SUPPORTED;
-	return GF_FPROBE_NOT_SUPPORTED;
-}
-
-
-static void atscin_finalize(GF_Filter *filter)
-{
-	ATSCInCtx *ctx = gf_filter_get_udta(filter);
-	if (ctx->clock_init_seg) gf_free(ctx->clock_init_seg);
-	if (ctx->atsc_dmx) gf_atsc3_dmx_del(ctx->atsc_dmx);
-
-	if (ctx->tsi_outs) {
-		while (gf_list_count(ctx->tsi_outs)) {
-			TSI_Output *tsio = gf_list_pop_back(ctx->tsi_outs);
-			gf_free(tsio);
-		}
-		gf_list_del(ctx->tsi_outs);
-	}
-	if (ctx->received_seg_names) {
-		while (gf_list_count(ctx->received_seg_names)) {
-			SegInfo *si = gf_list_pop_back(ctx->received_seg_names);
-			gf_free(si->seg_name);
-			gf_free(si);
-		}
-		gf_list_del(ctx->received_seg_names);
-	}
-}
-
-static void atscin_send_file(ATSCInCtx *ctx, u32 service_id, GF_ATSCEventFileInfo *finfo, u32 evt_type)
-{
-	if (!ctx->kc || !finfo->corrupted) {
-		u8 *output;
-		char *ext;
-		GF_FilterPid *pid, **p_pid;
-		GF_FilterPacket *pck;
-		TSI_Output *tsio = NULL;
-
-		p_pid = &ctx->opid;
-		if (finfo->tsi && ctx->stsi) {
-			u32 i, count = gf_list_count(ctx->tsi_outs);
-			for (i=0; i<count; i++) {
-				tsio = gf_list_get(ctx->tsi_outs, i);
-				if ((tsio->sid==service_id) && (tsio->tsi==finfo->tsi)) {
-					break;
-				}
-				tsio=NULL;
-			}
-			if (!tsio) {
-				GF_SAFEALLOC(tsio, TSI_Output);
-				if (!tsio) return;
-
-				tsio->tsi = finfo->tsi;
-				tsio->sid = service_id;
-				gf_list_add(ctx->tsi_outs, tsio);
-			}
-			p_pid = &tsio->opid;
-
-			if ((evt_type==GF_ATSC_EVT_INIT_SEG) || (evt_type==GF_ATSC_EVT_MPD)) {
-				if (ctx->sr && tsio->init_sent) return;
-				tsio->init_sent = GF_TRUE;
-			}
-		}
-		pid = *p_pid;
-
-		if (!pid) {
-			pid = gf_filter_pid_new(ctx->filter);
-			(*p_pid) = pid;
-			gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
-		}
-		gf_filter_pid_set_property(pid, GF_PROP_PID_ID, &PROP_UINT(tsio ? tsio->tsi : service_id));
-		gf_filter_pid_set_property(pid, GF_PROP_PID_SERVICE_ID, &PROP_UINT(service_id));
-		gf_filter_pid_set_property(pid, GF_PROP_PID_URL, &PROP_STRING(finfo->filename));
-		ext = gf_file_ext_start(finfo->filename);
-		gf_filter_pid_set_property(pid, GF_PROP_PID_FILE_EXT, &PROP_STRING(ext ? (ext+1) : "*" ));
-
-		pck = gf_filter_pck_new_alloc(pid, finfo->size, &output);
-		memcpy(output, finfo->data, finfo->size);
-		if (finfo->corrupted) gf_filter_pck_set_corrupted(pck, GF_TRUE);
-		gf_filter_pck_send(pck);
-
-		if (ctx->received_seg_names && (evt_type==GF_ATSC_EVT_SEG)) {
-			SegInfo *si;
-			GF_SAFEALLOC(si, SegInfo);
-			if (!si) return;
-			si->opid = pid;
-			si->seg_name = gf_strdup(finfo->filename);
-			gf_list_add(ctx->received_seg_names, si);
-		}
-	}
-
-	while (gf_atsc3_dmx_get_object_count(ctx->atsc_dmx, service_id)>1) {
-		if (! gf_atsc3_dmx_remove_first_object(ctx->atsc_dmx, service_id))
-			break;
-	}
-
-	if (ctx->max_segs) {
-		while (gf_list_count(ctx->received_seg_names) > ctx->max_segs) {
-			GF_FilterEvent evt;
-			SegInfo *si = gf_list_pop_front(ctx->received_seg_names);
-			GF_FEVT_INIT(evt, GF_FEVT_FILE_DELETE, si->opid);
-			evt.file_del.url = si->seg_name;
-			gf_filter_pid_send_event(si->opid, &evt);
-			gf_free(si->seg_name);
-			gf_free(si);
-		}
-	}
-}
-
-void atscin_on_event(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *finfo)
-{
-	char szPath[GF_MAX_PATH];
-	ATSCInCtx *ctx = (ATSCInCtx *)udta;
-	u32 nb_obj;
-	Bool is_init = GF_TRUE;
-	Bool is_loop = GF_FALSE;
-	DownloadedCacheEntry cache_entry;
-
-	switch (evt) {
-	case GF_ATSC_EVT_SERVICE_FOUND:
-		if (!ctx->tune_time) ctx->tune_time = gf_sys_clock();
-
-		break;
-	case GF_ATSC_EVT_SERVICE_SCAN:
-		if (ctx->tune_service_id && !gf_atsc3_dmx_find_service(ctx->atsc_dmx, ctx->tune_service_id)) {
-
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSCDmx] Asked to tune to service %d but no such service, tuning to first one\n", ctx->tune_service_id));
-
-			ctx->tune_service_id = 0;
-			gf_atsc3_tune_in(ctx->atsc_dmx, (u32) -2, GF_TRUE);
-		}
-		break;
-	case GF_ATSC_EVT_MPD:
-
-		if (!ctx->gcache) {
-			atscin_send_file(ctx, evt_param, finfo, evt);
-			break;
-		}
-
-		if (!ctx->opid) {
-			ctx->opid = gf_filter_pid_new(ctx->filter);
-			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
-		}
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(evt_param));
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SERVICE_ID, &PROP_UINT(evt_param));
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("mpd"));
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("application/dash+xml"));
-
-		sprintf(szPath, "http://gpatsc/service%d/%s", evt_param, finfo->filename);
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_REDIRECT_URL, &PROP_STRING(szPath));
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_URL, &PROP_STRING(szPath));
-
-		cache_entry = gf_dm_add_cache_entry(ctx->dm, szPath, finfo->data, finfo->size, 0, 0, "application/dash+xml", GF_TRUE, 0);
-
-		sprintf(szPath, "x-dash-atsc: %d\r\n", evt_param);
-		gf_dm_force_headers(ctx->dm, cache_entry, szPath);
-		gf_atsc3_dmx_set_service_udta(ctx->atsc_dmx, evt_param, cache_entry);
-
-		ctx->sync_tsi = 0;
-		ctx->last_toi = 0;
-		if (ctx->clock_init_seg) gf_free(ctx->clock_init_seg);
-		ctx->clock_init_seg = NULL;
-		ctx->tune_service_id = evt_param;
-		break;
-	case GF_ATSC_EVT_SEG:
-
-		if (!ctx->gcache) {
-			atscin_send_file(ctx, evt_param, finfo, evt);
-			break;
-		}
-		if (finfo->corrupted && !ctx->kc) return;
-		cache_entry = gf_atsc3_dmx_get_service_udta(ctx->atsc_dmx, evt_param);
-		if (cache_entry) {
-			if (!ctx->clock_init_seg) ctx->clock_init_seg = gf_strdup(finfo->filename);
-			sprintf(szPath, "x-dash-atsc: %d\r\nx-dash-first-seg: %s\r\n", evt_param, ctx->clock_init_seg);
-			gf_dm_force_headers(ctx->dm, cache_entry, szPath);
-		}
-		is_init = GF_FALSE;
-		if (!ctx->sync_tsi) {
-			ctx->sync_tsi = finfo->tsi;
-			ctx->last_toi = finfo->toi;
-		} else if (ctx->sync_tsi == finfo->tsi) {
-			if (ctx->last_toi > finfo->toi) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSCDmx] Loop detected on service %d for TSI %u: prev TOI %u this toi %u\n", ctx->tune_service_id, finfo->tsi, ctx->last_toi, finfo->toi));
-
-				gf_atsc3_dmx_purge_objects(ctx->atsc_dmx, evt_param);
-				is_loop = GF_TRUE;
-				if (cache_entry) {
-					if (ctx->clock_init_seg) gf_free(ctx->clock_init_seg);
-					ctx->clock_init_seg = gf_strdup(finfo->filename);
-					sprintf(szPath, "x-dash-atsc: %d\r\nx-dash-first-seg: %s\r\nx-atsc-loop: yes\r\n", evt_param, ctx->clock_init_seg);
-					gf_dm_force_headers(ctx->dm, cache_entry, szPath);
-				}
-			}
-			ctx->last_toi = finfo->toi;
-		}
-		//fallthrough
-
-	case GF_ATSC_EVT_INIT_SEG:
-		if (!ctx->gcache) {
-			atscin_send_file(ctx, evt_param, finfo, evt);
-			break;
-		}
-
-		if (finfo->corrupted && !ctx->kc) return;
-
-		sprintf(szPath, "http://gpatsc/service%d/%s", evt_param, finfo->filename);
-		//we copy over the init segment, but only share the data pointer for segments
-
-		cache_entry = gf_dm_add_cache_entry(ctx->dm, szPath, finfo->data, finfo->size, 0, 0, "video/mp4", is_init ? GF_TRUE : GF_FALSE, finfo->download_ms);
-
-		if (cache_entry) gf_dm_force_headers(ctx->dm, cache_entry, "x-atsc: yes\r\n");
-
-		GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSCDmx] Pushing file %s to cache\n", szPath));
-
-		if (is_loop) break;
-
-		nb_obj = gf_atsc3_dmx_get_object_count(ctx->atsc_dmx, evt_param);
-		if (nb_obj>10) {
-			while (nb_obj>10) {
-				gf_atsc3_dmx_remove_first_object(ctx->atsc_dmx, evt_param);
-				nb_obj = gf_atsc3_dmx_get_object_count(ctx->atsc_dmx, evt_param);
-			}
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static Bool atscin_local_cache_probe(void *par, char *url, Bool is_destroy)
-{
-	ATSCInCtx *ctx = (ATSCInCtx *)par;
-	u32 sid=0;
-	char *subr;
-	if (strncmp(url, "http://gpatsc/service", 21)) return GF_FALSE;
-
-	subr = strchr(url+21, '/');
-	subr[0] = 0;
-	sid = atoi(url+21);
-	subr[0] = '/';
-	if (is_destroy) {
-		gf_atsc3_dmx_remove_object_by_name(ctx->atsc_dmx, sid, subr+1, GF_TRUE);
-	} else if (sid && (sid != ctx->tune_service_id)) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSCDmx] Request on service %d but tuned on service %d, retuning\n", sid, ctx->tune_service_id));
-		ctx->tune_service_id = sid;
-		ctx->sync_tsi = 0;
-		ctx->last_toi = 0;
-		if (ctx->clock_init_seg) gf_free(ctx->clock_init_seg);
-		ctx->clock_init_seg = NULL;
-		gf_atsc3_tune_in(ctx->atsc_dmx, sid, GF_TRUE);
-	}
-	return GF_TRUE;
-}
-
-static GF_Err atscin_process(GF_Filter *filter)
-{
-	ATSCInCtx *ctx = gf_filter_get_udta(filter);
-
-	while (1) {
-		GF_Err e = gf_atsc3_dmx_process(ctx->atsc_dmx);
-		if (e == GF_IP_NETWORK_EMPTY) {
-			gf_filter_ask_rt_reschedule(filter, 1000);
-			break;
-		}
-	}
-	if (!ctx->tune_time) {
-	 	u32 diff = gf_sys_clock() - ctx->start_time;
-	 	if (diff>ctx->timeout) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSCDmx] No data for %d ms, aborting\n", diff));
-			gf_filter_setup_failure(filter, GF_SERVICE_ERROR);
-			return GF_EOS;
-		}
-	}
-
-	if (ctx->stats) {
-		u32 now = gf_sys_clock() - ctx->start_time;
-		if (now >= ctx->nb_stats*ctx->stats) {
-			ctx->nb_stats+=1;
-			if (gf_filter_reporting_enabled(filter)) {
-				Double rate=0.0;
-				char szRpt[1024];
-
-				u64 st = gf_atsc3_dmx_get_first_packet_time(ctx->atsc_dmx);
-				u64 et = gf_atsc3_dmx_get_last_packet_time(ctx->atsc_dmx);
-				u64 nb_pck = gf_atsc3_dmx_get_nb_packets(ctx->atsc_dmx);
-				u64 nb_bytes = gf_atsc3_dmx_get_recv_bytes(ctx->atsc_dmx);
-
-				et -= st;
-				if (et) {
-					rate = (Double)nb_bytes*8;
-					rate /= et;
-				}
-				sprintf(szRpt, "[%us] "LLU" bytes "LLU" packets in "LLU" ms rate %.02f mbps", now/1000, nb_bytes, nb_pck, et/1000, rate);
-				gf_filter_update_status(filter, 0, szRpt);
-			}
-		}
-	}
-
-	return GF_OK;
-}
-
-
-static GF_Err atscin_initialize(GF_Filter *filter)
-{
-	ATSCInCtx *ctx = gf_filter_get_udta(filter);
-	ctx->filter = filter;
-
-	if (!ctx->src) return GF_BAD_PARAM;
-	if (strcmp(ctx->src, "atsc://")) return GF_BAD_PARAM;
-
-	if (ctx->odir)
-		ctx->gcache = GF_FALSE;
-
-	if (ctx->gcache) {
-		ctx->dm = gf_filter_get_download_manager(filter);
-		if (!ctx->dm) return GF_SERVICE_ERROR;
-		gf_dm_set_localcache_provider(ctx->dm, atscin_local_cache_probe, ctx);
-	}
-
-	ctx->atsc_dmx = gf_atsc3_dmx_new(ctx->ifce, ctx->odir, ctx->buffer);
-	if (ctx->odir && ctx->max_segs) {
-		gf_atsc3_set_max_objects_store(ctx->atsc_dmx, (u32) ctx->max_segs);
-	}
-
-	gf_atsc3_set_reorder(ctx->atsc_dmx, ctx->reorder, ctx->rtimeout);
-
-	if (ctx->tsidbg) {
-		gf_atsc3_dmx_debug_tsi(ctx->atsc_dmx, ctx->tsidbg);
-	}
-
-	gf_atsc3_set_callback(ctx->atsc_dmx, atscin_on_event, ctx);
-	if (ctx->tunein>0) ctx->tune_service_id = ctx->tunein;
-
-	if (ctx->tune_service_id)
-		gf_atsc3_tune_in(ctx->atsc_dmx, ctx->tune_service_id, GF_FALSE);
-	else
-		gf_atsc3_tune_in(ctx->atsc_dmx, (u32) ctx->tunein, GF_TRUE);
-
-	ctx->start_time = gf_sys_clock();
-
-	if (ctx->stsi) ctx->tsi_outs = gf_list_new();
-	if (ctx->max_segs)
-		ctx->received_seg_names = gf_list_new();
-
-	return GF_OK;
-}
-
-#define OFFS(_n)	#_n, offsetof(ATSCInCtx, _n)
-static const GF_FilterArgs ATSCInArgs[] =
-{
-	{ OFFS(src), "location of source content - see filter help", GF_PROP_NAME, NULL, NULL, 0},
-	{ OFFS(ifce), "default interface to use for multicast. If NULL, the default system interface will be used", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(gcache), "indicate the files should populate GPAC HTTP cache - see filter help", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(tunein), "service ID to bootstrap on. 0 means tune to no service, -1 tune all services -2 means tune on first service found", GF_PROP_SINT, "-2", NULL, 0},
-	{ OFFS(buffer), "receive buffer size to use in bytes", GF_PROP_UINT, "0x80000", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(timeout), "timeout in ms after which tunein fails", GF_PROP_UINT, "5000", NULL, 0},
-	{ OFFS(kc), "keep corrupted file", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(sr), "skip repeated files - ignored in cache mode", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(stsi), "define one output pid per tsi/serviceID - ignored in cache mode, see filter help", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(stats), "log statistics at the given rate in ms (0 disables stats)", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(tsidbg), "gather only objects with given TSI (debug)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(max_segs), "maximum number of segments to keep - ignored in cache mode", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(odir), "output directory for stand-alone mode - see filter help", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(reorder), "ignore order flag in ROUTE/LCT packets, avoiding considering object done when TOI changes", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(rtimeout), "default timeout in ms to wait when gathering out-of-order packets", GF_PROP_UINT, "5000", NULL, GF_FS_ARG_HINT_EXPERT},
-	{0}
-};
-
-static const GF_FilterCapability ATSCInCaps[] =
-{
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
-};
-
-GF_FilterRegister ATSCInRegister = {
-	.name = "atscin",
-	GF_FS_SET_DESCRIPTION("ATSC input")
-#ifndef GPAC_DISABLE_DOC
-	.help = "This filter is a receiver for ATSC 3.0 ROUTE sessions. Source is identified using the string `atsc://`.\n"
-	"The filter can work in cached mode, source mode or standalone mode.\n"
-	"# Cached mode\n"
-	"The cached mode is the default filter behaviour. It populates GPAC HTTP Cache with the recieved files, using `http://gpatsc/serviceN/` as service root, N being the ATSC service ID.\n"
-	"In cached mode, repeated files are always send.\n"
-	" \n"
-	"The cached MPD is assigned the following headers:\n"
-	"- x-dash-atsc: integer value, indicates the ATSC service ID.\n"
-	"- x-dash-first-seg: string value, indicates the name of the first segment completely retrieved from the broadcast.\n"
-	"- x-atsc-loop: boolean value, if yes indicates a loop in the service has been detected (usually pcap replay loop).\n"
-	" \n"
-	"The cached files are assigned the following headers:\n"
-	"- x-atsc: boolean value, if yes indicates the file comes from an ATSC session.\n"
-	"\n"
-	"# Source mode\n"
-	"In source mode, the filter outputs files on a single output pid of type `file`. "
-	"The files are dispatched once fully received, the output pid carries a sequence of complete files. Repeated files are not sent unless requested.\n"
-	"If needed, one pid per TSI can be used rather than a single pid. This avoids mixing files of different mime types on the same pid (e.g. mpd and isobmff).\n"
-	"EX gpac -i atsc://cache=false -o $ServiceID$/$File$:dynext\n"
-	"This will grab the files and forward them as output PIDs, consumed by the [fout](fout) filter.\n"
-	"\n"
-	"# Standalone mode\n"
-	"In standalone mode, the filter does not produce any output pid and writes received files to the [-odir]() directory.\n"
-	"EX gpac -i atsc://odir=output\n"
-	"This will grab the files and write them to `output` directory.\n"
-	"\n"
-	"# Interface setup\n"
-	"On some systems (OSX), when using VM packet replay, you may need to force multicast routing on your local interface.\n"
-	"You will have to do this for the base ATSC3 multicast (224.0.23.60):\n"
-	"EX route add -net 224.0.23.60/32 -interface vboxnet0\n"
-	"and on each service multicast:\n"
-	"EX route add -net 239.255.1.4/32 -interface vboxnet0\n"
-	"",
-#endif //GPAC_DISABLE_DOC
-	.private_size = sizeof(ATSCInCtx),
-	.args = ATSCInArgs,
-	.initialize = atscin_initialize,
-	.finalize = atscin_finalize,
-	SETCAPS(ATSCInCaps),
-	.process = atscin_process,
-	.probe_url = atscin_probe_url
-};
-
-const GF_FilterRegister *atscin_register(GF_FilterSession *session)
-{
-	return &ATSCInRegister;
-}
-
-#else
-
-const GF_FilterRegister *atscin_register(GF_FilterSession *session)
-{
-	return NULL;
-}
-
-#endif /* GPAC_DISABLE_ATSC */
-

gpac-1.0.1.tar.gz/src/media_tools/atsc_dmx.c Deleted

@@ -1,1942 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2020
- *					All rights reserved
- *
- * This file is part of GPAC / Media Tools ATSC demux sub-project
- *
- * GPAC is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * GPAC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <gpac/atsc.h>
-
-#ifndef GPAC_DISABLE_ATSC
-
-#include <gpac/network.h>
-#include <gpac/bitstream.h>
-#include <gpac/xml.h>
-
-#define GF_ATSC_MCAST_ADDR	"224.0.23.60"
-#define GF_ATSC_MCAST_PORT	4937
-#define GF_ATSC_SOCK_SIZE	0x80000
-
-typedef struct
-{
-	u8 codepoint;
-	u8 format_id;
-	u8 frag;
-	u8 order;
-	u32 src_fec_payload_id;
-} GF_ATSCLCTReg;
-
-typedef struct
-{
-	u32 tsi;
-	char *init_filename;
-	u32 init_toi;
-	char *toi_template;
-	GF_ATSCLCTReg CPs[8];
-	u32 nb_cps;
-	u32 last_dispatched_tsi, last_dispatched_toi;
-
-} GF_ATSCLCTChannel;
-
-
-typedef struct
-{
-	u32 offset;
-	u32 size;
-} GF_LCTFragInfo;
-
-typedef enum
-{
-	GF_LCT_OBJ_INIT=0,
-	GF_LCT_OBJ_RECEPTION,
-	GF_LCT_OBJ_DONE_ERR,
-	GF_LCT_OBJ_DONE,
-	GF_LCT_OBJ_DISPATCHED,
-} GF_LCTObjectStatus;
-
-typedef struct
-{
-	u32 toi, tsi;
-	u32 total_length;
-	//fragment reaggregation
-	char *payload;
-	u32 nb_bytes, nb_recv_bytes, alloc_size;
-	u32 nb_frags, nb_alloc_frags, nb_recv_frags;
-	GF_LCTFragInfo *frags;
-	GF_LCTObjectStatus status;
-	Bool closed_flag;
-	u32 download_time_ms;
-	u32 last_gather_time;
-
-	GF_ATSCLCTChannel *rlct;
-
-	u32 prev_start_offset;
-} GF_LCTObject;
-
-
-
-typedef struct
-{
-	GF_Socket *sock;
-
-	GF_List *channels;
-} GF_ATSCRouteSession;
-
-typedef enum
-{
-	GF_ATSC_TUNE_OFF=0,
-	GF_ATSC_TUNE_ON,
-	GF_ATSC_TUNE_SLS_ONLY,
-} GF_ATSCTuneMode;
-
-typedef struct
-{
-	u32 service_id;
-	u32 protocol;
-	u32 mpd_version, stsid_version;
-	GF_Socket *sock;
-	u32 secondary_sockets;
-	GF_List *objects;
-	GF_LCTObject *last_active_obj;
-	char *output_dir;
-	u32 port;
-	char *dst_ip;
-	u32 last_dispatched_toi_on_tsi_zero;
-	u32 stsid_crc;
-
-	GF_List *route_sessions;
-	GF_ATSCTuneMode tune_mode;
-	void *udta;
-} GF_ATSCService;
-
-struct __gf_atscdmx {
-	const char *ip_ifce;
-	const char *base_dir;
-	GF_Socket *sock;
-	u8 *buffer;
-	u32 buffer_size;
-	u8 *unz_buffer;
-	u32 unz_buffer_size;
-
-	u32 max_seg_store;
-	u32 reorder_timeout;
-	Bool force_reorder;
-
-	u32 slt_version, rrt_version, systime_version, aeat_version;
-	GF_List *services;
-
-	GF_List *object_reservoir;
-	GF_BitStream *bs;
-
-	GF_DOMParser *dom;
-	u32 service_autotune;
-	Bool tune_all_sls;
-
-	GF_SockGroup *active_sockets;
-
-
-	void (*on_event)(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *info);
-	void *udta;
-
-	u32 debug_tsi;
-
-	u64 nb_packets;
-	u64 total_bytes_recv;
-	u64 first_pck_time, last_pck_time;
-};
-
-static void gf_atsc3_route_session_del(GF_ATSCRouteSession *rs)
-{
-	if (rs->sock) gf_sk_del(rs->sock);
-	while (gf_list_count(rs->channels)) {
-		GF_ATSCLCTChannel *lc = gf_list_pop_back(rs->channels);
-		if (lc->init_filename) gf_free(lc->init_filename);
-		gf_free(lc->toi_template);
-		gf_free(lc);
-	}
-	gf_list_del(rs->channels);
-	gf_free(rs);
-}
-
-static void gf_atsc3_lct_obj_del(GF_LCTObject *o)
-{
-	if (o->frags) gf_free(o->frags);
-	if (o->payload) gf_free(o->payload);
-	gf_free(o);
-}
-
-static void gf_atsc3_service_del(GF_ATSCDmx *atscd, GF_ATSCService *s)
-{
-	if (s->sock) {
-		gf_sk_group_unregister(atscd->active_sockets, s->sock);
-		gf_sk_del(s->sock);
-	}
-	if (s->output_dir) gf_free(s->output_dir);
-	while (gf_list_count(s->route_sessions)) {
-		GF_ATSCRouteSession *rsess = gf_list_pop_back(s->route_sessions);
-		gf_atsc3_route_session_del(rsess);
-	}
-	gf_list_del(s->route_sessions);
-
-	while (gf_list_count(s->objects)) {
-		GF_LCTObject *o = gf_list_pop_back(s->objects);
-		gf_atsc3_lct_obj_del(o);
-	}
-	gf_list_del(s->objects);
-	if (s->dst_ip) gf_free(s->dst_ip);
-	gf_free(s);
-}
-
-GF_EXPORT
-void gf_atsc3_dmx_del(GF_ATSCDmx *atscd)
-{
-	if (atscd->buffer) gf_free(atscd->buffer);
-	if (atscd->unz_buffer) gf_free(atscd->unz_buffer);
-	if (atscd->sock) gf_sk_del(atscd->sock);
-	if (atscd->dom) gf_xml_dom_del(atscd->dom);
-	if (atscd->services) {
-		while (gf_list_count(atscd->services)) {
-			GF_ATSCService *s = gf_list_pop_back(atscd->services);
-			gf_atsc3_service_del(atscd, s);
-		}
-		gf_list_del(atscd->services);
-	}
-	if (atscd->active_sockets) gf_sk_group_del(atscd->active_sockets);
-	if (atscd->object_reservoir) {
-		while (gf_list_count(atscd->object_reservoir)) {
-			GF_LCTObject *obj = gf_list_pop_back(atscd->object_reservoir);
-			gf_atsc3_lct_obj_del(obj);
-		}
-		gf_list_del(atscd->object_reservoir);
-	}
-	if (atscd->bs) gf_bs_del(atscd->bs);
-	gf_free(atscd);
-}
-
-GF_EXPORT
-GF_ATSCDmx *gf_atsc3_dmx_new(const char *ifce, const char *dir, u32 sock_buffer_size)
-{
-	GF_ATSCDmx *atscd;
-	GF_Err e;
-	GF_SAFEALLOC(atscd, GF_ATSCDmx);
-	if (!atscd) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate ATSC demuxer\n"));
-		return NULL;
-	}
-	atscd->ip_ifce = ifce;
-	atscd->base_dir = dir;
-	if (dir && !gf_dir_exists(dir)) {
-		e = gf_mkdir(dir);
-		if (e == GF_IO_ERR) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to create output dir %s - using memory mode\n", dir));
-			atscd->base_dir = NULL;
-		}
-	}
-	atscd->dom = gf_xml_dom_new();
-	if (!atscd->dom) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate DOM parser\n" ));
-		gf_atsc3_dmx_del(atscd);
-		return NULL;
-	}
-	atscd->services = gf_list_new();
-	if (!atscd->services) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate ATSC service list\n" ));
-		gf_atsc3_dmx_del(atscd);
-		return NULL;
-	}
-	atscd->object_reservoir = gf_list_new();
-	if (!atscd->object_reservoir) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate ATSC object reservoir\n" ));
-		gf_atsc3_dmx_del(atscd);
-		return NULL;
-	}
-
-	if (!sock_buffer_size) sock_buffer_size = GF_ATSC_SOCK_SIZE;
-	atscd->unz_buffer_size = sock_buffer_size;
-	//we store one UDP packet, or realloc to store LLS signaling so starting with 10k should be enough in most cases
-	atscd->buffer_size = 10000;
-	atscd->buffer = gf_malloc(atscd->buffer_size);
-	if (!atscd->buffer) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate socket buffer\n"));
-		gf_atsc3_dmx_del(atscd);
-		return NULL;
-	}
-	atscd->unz_buffer = gf_malloc(atscd->unz_buffer_size);
-	if (!atscd->unz_buffer) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate socket buffer\n"));
-		gf_atsc3_dmx_del(atscd);
-		return NULL;
-	}
-
-	atscd->active_sockets = gf_sk_group_new();
-	if (!atscd->active_sockets) {
-		gf_atsc3_dmx_del(atscd);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to create socket group\n"));
-		return NULL;
-	}
-
-	atscd->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
-	if (!atscd->sock) {
-		gf_atsc3_dmx_del(atscd);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to create UDP socket\n"));
-		return NULL;
-	}
-	gf_sk_group_register(atscd->active_sockets, atscd->sock);
-
-	gf_sk_set_usec_wait(atscd->sock, 1);
-	e = gf_sk_setup_multicast(atscd->sock, GF_ATSC_MCAST_ADDR, GF_ATSC_MCAST_PORT, 1, GF_FALSE, (char *) ifce);
-	if (e) {
-		gf_atsc3_dmx_del(atscd);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to bind to multicast address on interface %s\n", ifce ? ifce : "default"));
-		return NULL;
-	}
-	gf_sk_set_buffer_size(atscd->sock, GF_FALSE, sock_buffer_size);
-	//gf_sk_set_block_mode(atscd->sock, GF_TRUE);
-	//create static bs
-	atscd->bs = gf_bs_new((char*)&e, 1, GF_BITSTREAM_READ);
-
-	atscd->reorder_timeout = 5000;
-	return atscd;
-}
-
-static void gf_atsc3_register_service_sockets(GF_ATSCDmx *atscd, GF_ATSCService *s, Bool do_register)
-{
-	u32 i;
-	GF_ATSCRouteSession *rsess;
-	if (do_register) gf_sk_group_register(atscd->active_sockets, s->sock);
-	else gf_sk_group_unregister(atscd->active_sockets, s->sock);
-
-	if (!s->secondary_sockets) return;
-
-	i=0;
-	while ((rsess = gf_list_enum(s->route_sessions, &i))) {
-		if (! rsess->sock) continue;
-		if (do_register) gf_sk_group_register(atscd->active_sockets, rsess->sock);
-		else gf_sk_group_unregister(atscd->active_sockets, rsess->sock);
-	}
-}
-
-GF_EXPORT
-GF_Err gf_atsc3_tune_in(GF_ATSCDmx *atscd, u32 serviceID, Bool tune_all_sls)
-{
-	u32 i;
-	GF_ATSCService *s;
-	if (!atscd) return GF_BAD_PARAM;
-	atscd->service_autotune = serviceID;
-	atscd->tune_all_sls = tune_all_sls;
-	i=0;
-	while ((s = gf_list_enum(atscd->services, &i))) {
-		GF_ATSCTuneMode prev_mode = s->tune_mode;
-		if (s->service_id==serviceID) s->tune_mode = GF_ATSC_TUNE_ON;
-		else if (serviceID==0xFFFFFFFF) s->tune_mode = GF_ATSC_TUNE_ON;
-		else if ((s->tune_mode!=GF_ATSC_TUNE_ON) && (serviceID==0xFFFFFFFE)) {
-			s->tune_mode = GF_ATSC_TUNE_ON;
-			serviceID = s->service_id;
-		} else {
-			s->tune_mode = tune_all_sls ? GF_ATSC_TUNE_SLS_ONLY : GF_ATSC_TUNE_OFF;
-		}
-		//we were previously not tuned
-		if (prev_mode == GF_ATSC_TUNE_OFF) {
-			//we are now tuned, register sockets
-			if (s->tune_mode != GF_ATSC_TUNE_OFF) {
-				gf_atsc3_register_service_sockets(atscd, s, GF_TRUE);
-			}
-		}
-		//we were previously tuned
-		else {
-			//we are now not tuned, unregister sockets
-			if (s->tune_mode == GF_ATSC_TUNE_OFF) {
-				gf_atsc3_register_service_sockets(atscd, s, GF_FALSE);
-			}
-		}
-	}
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_atsc3_set_max_objects_store(GF_ATSCDmx *atscd, u32 max_segs)
-{
-	if (!atscd) return GF_BAD_PARAM;
-	atscd->max_seg_store = max_segs;
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_atsc3_set_reorder(GF_ATSCDmx *atscd, Bool force_reorder, u32 timeout_ms)
-{
-	if (!atscd) return GF_BAD_PARAM;
-	atscd->reorder_timeout = timeout_ms;
-	atscd->force_reorder = force_reorder;
-	return GF_OK;
-}
-
-static GF_Err gf_atsc3_dmx_process_slt(GF_ATSCDmx *atscd, GF_XMLNode *root)
-{
-	GF_XMLNode *n;
-	u32 i=0;
-
-	while ( ( n = gf_list_enum(root->content, &i)) ) {
-		if (n->type != GF_XML_NODE_TYPE) continue;
-		//setup service
-		if (!strcmp(n->name, "Service")) {
-			GF_XMLAttribute *att;
-			GF_XMLNode *m;
-			u32 j=0;
-			GF_Err e;
-			GF_ATSCService *service;
-			const char *dst_ip=NULL;
-			u32 dst_port = 0;
-			u32 protocol = 0;
-			u32 service_id=0;
-			while ( ( att = gf_list_enum(n->attributes, &j)) ) {
-				if (!strcmp(att->name, "serviceId")) sscanf(att->value, "%u", &service_id);
-			}
-
-			j=0;
-			while ( ( m = gf_list_enum(n->content, &j)) ) {
-				if (m->type != GF_XML_NODE_TYPE) continue;
-				if (!strcmp(m->name, "BroadcastSvcSignaling")) {
-					u32 k=0;
-					while ( ( att = gf_list_enum(m->attributes, &k)) ) {
-						if (!strcmp(att->name, "slsProtocol")) protocol = atoi(att->value);
-						if (!strcmp(att->name, "slsDestinationIpAddress")) dst_ip = att->value;
-						else if (!strcmp(att->name, "slsDestinationUdpPort")) dst_port = atoi(att->value);
-						//don't care about the rest
-					}
-				}
-			}
-
-			if (!dst_ip || !dst_port) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] No service destination IP or port found for service %d - ignoring service\n", service_id));
-				continue;
-			}
-			if ((protocol!=1) && (protocol!=2)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Unknown ATSC service signaling protocol %d for service %d - ignoring service\n", service_id, protocol));
-				continue;
-			}
-
-			//todo - remove existing service ?
-
-			GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSC3] Found service %d destination IP %s port %d\n", service_id, dst_ip, dst_port));
-
-			GF_SAFEALLOC(service, GF_ATSCService);
-			if (!service) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate service %d\n", service_id));
-				continue;
-			}
-			service->service_id = service_id;
-			service->protocol = protocol;
-
-			service->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
-			gf_sk_set_usec_wait(service->sock, 1);
-			e = gf_sk_setup_multicast(service->sock, dst_ip, dst_port, 0, GF_FALSE, (char*) atscd->ip_ifce);
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to setup multicast on %s:%d for service %d\n", dst_ip, dst_port, service_id));
-				gf_atsc3_service_del(atscd, service);
-				continue;
-			}
-			gf_sk_set_buffer_size(service->sock, GF_FALSE, atscd->unz_buffer_size);
-			//gf_sk_set_block_mode(service->sock, GF_TRUE);
-
-			service->dst_ip = gf_strdup(dst_ip);
-			service->port = dst_port;
-			service->objects = gf_list_new();
-			service->route_sessions = gf_list_new();
-
-			if (atscd->base_dir) {
-				u32 len = (u32) strlen(atscd->base_dir);
-				service->output_dir = gf_malloc(sizeof(char) * (len + 20) );
-				if ((atscd->base_dir[len-1]=='/') || (atscd->base_dir[len-1]=='\\')) {
-					sprintf(service->output_dir, "%sservice%d", atscd->base_dir, service_id);
-				} else {
-					sprintf(service->output_dir, "%s/service%d", atscd->base_dir, service_id);
-				}
-				if (! gf_dir_exists(service->output_dir)) {
-					e = gf_mkdir(service->output_dir);
-					if (e==GF_IO_ERR) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to create output service dir %s, working in memory mode\n", service->output_dir));
-						gf_free(service->output_dir);
-						service->output_dir = NULL;
-					}
-				}
-			}
-			if (atscd->service_autotune==0xFFFFFFFF) service->tune_mode = GF_ATSC_TUNE_ON;
-			else if (atscd->service_autotune==0xFFFFFFFE) {
-				service->tune_mode = GF_ATSC_TUNE_ON;
-				atscd->service_autotune -= 1;
-			}
-			else if (atscd->service_autotune==service_id) service->tune_mode = GF_ATSC_TUNE_ON;
-			else if (atscd->tune_all_sls) service->tune_mode = GF_ATSC_TUNE_SLS_ONLY;
-
-			//we are tuning, register socket
-			if (service->tune_mode != GF_ATSC_TUNE_OFF)
-				gf_sk_group_register(atscd->active_sockets, service->sock);
-
-			gf_list_add(atscd->services, service);
-			if (atscd->on_event) atscd->on_event(atscd->udta, GF_ATSC_EVT_SERVICE_FOUND, service_id, NULL);
-		}
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSC3] Done scaning all services\n"));
-	if (atscd->on_event) atscd->on_event(atscd->udta, GF_ATSC_EVT_SERVICE_SCAN, 0, NULL);
-	return GF_OK;
-}
-
-#ifndef GPAC_DISABLE_LOG
-static const char *get_lct_obj_status_name(GF_LCTObjectStatus status)
-{
-	switch (status) {
-	case GF_LCT_OBJ_INIT: return "init";
-	case GF_LCT_OBJ_RECEPTION: return "reception";
-	case GF_LCT_OBJ_DONE_ERR: return "done_error";
-	case GF_LCT_OBJ_DONE: return "done";
-	case GF_LCT_OBJ_DISPATCHED: return "dispatched";
-	}
-	return "unknown";
-}
-#endif // GPAC_DISABLE_LOG
-
-static void gf_atsc3_obj_to_reservoir(GF_ATSCDmx *atscd, GF_ATSCService *s, GF_LCTObject *obj)
-{
-
-	assert (obj->status != GF_LCT_OBJ_RECEPTION);
-
-	//remove other objects
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d : moving object tsi %u toi %u to reservoir (status %s)\n", s->service_id, obj->tsi, obj->toi, get_lct_obj_status_name(obj->status) ));
-
-#ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_ATSC, GF_LOG_DEBUG)){
-		u32 i, count = gf_list_count(s->objects);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d : active objects TOIs for tsi %u: ", s->service_id, obj->tsi));
-		for (i=0;i<count;i++) {
-			GF_LCTObject *o = gf_list_get(s->objects, i);
-			if (o==obj) continue;
-			if (o->tsi != obj->tsi) continue;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, (" %u", o->toi));
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("\n"));
-	}
-#endif
-
-	if (s->last_active_obj==obj) s->last_active_obj = NULL;
-	obj->closed_flag = GF_FALSE;
-	obj->nb_bytes = 0;
-	obj->nb_frags = GF_FALSE;
-	obj->nb_recv_frags = 0;
-	obj->rlct = NULL;
-	obj->toi = 0;
-	obj->tsi = 0;
-	obj->total_length = 0;
-	obj->prev_start_offset = 0;
-	obj->download_time_ms = 0;
-	obj->last_gather_time = 0;
-	obj->status = GF_LCT_OBJ_INIT;
-	gf_list_del_item(s->objects, obj);
-	gf_list_add(atscd->object_reservoir, obj);
-
-}
-
-//#define CHECK_ISOM
-
-#ifdef CHECK_ISOM
-#include <gpac/isomedia.h>
-#endif
-
-static GF_Err gf_atsc3_dmx_process_object(GF_ATSCDmx *atscd, GF_ATSCService *s, GF_LCTObject *obj)
-{
-	char szPath[GF_MAX_PATH], *sep;
-	u32 i, count, nb_objs;
-	Bool partial = GF_FALSE;
-	FILE *out;
-
-	if (!obj->rlct) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d : internal error, no LCT ROUTE channel defined for object TSI %u TOI %u\n", s->service_id, obj->tsi, obj->toi));
-		return GF_SERVICE_ERROR;
-	}
-	assert(obj->status>GF_LCT_OBJ_RECEPTION);
-
-	if (obj->status==GF_LCT_OBJ_DONE_ERR) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d : object TSI %u TOI %u partial received only\n", s->service_id, obj->tsi, obj->toi));
-		partial = GF_TRUE;
-	}
-	if (obj->status == GF_LCT_OBJ_DISPATCHED) return GF_OK;
-	obj->status = GF_LCT_OBJ_DISPATCHED;
-
-	if (!atscd->base_dir) {
-		Bool is_init = GF_FALSE;
-
-		if (obj->rlct->init_toi == obj->toi) {
-			sprintf(szPath, "%s", obj->rlct->init_filename ? obj->rlct->init_filename : "ghost-init.mp4");
-			is_init = GF_TRUE;
-		} else {
-			sprintf(szPath, obj->rlct->toi_template, obj->toi);
-		}
-#ifndef GPAC_DISABLE_LOG
-		if (partial || gf_log_tool_level_on(GF_LOG_ATSC, GF_LOG_DEBUG)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSC3] Service %d got file %s (TSI %u TOI %u) size %d in %d ms (%d bytes in %d fragments)\n", s->service_id, szPath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms, obj->nb_bytes, obj->nb_recv_frags));
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSC3] Service %d got file %s (TSI %u TOI %u) size %d in %d ms\n", s->service_id, szPath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms));
-		}
-#endif
-
-#ifdef CHECK_ISOM
-		{
-			char szBlob[1024];
-			GF_Blob blob;
-			blob.data = obj->payload;
-			blob.size = obj->total_length;
-			GF_ISOFile *file;
-			sprintf(szBlob, "gmem://%p", &blob);
-			file = gf_isom_open(szBlob, GF_ISOM_OPEN_READ_DUMP, NULL);
-			if (file) {
-				fprintf(stderr, "ISOBMF %s file OK\n", szPath);
-				gf_isom_delete(file);
-			} else {
-				fprintf(stderr, "ISOBMF %s file invalid\n", szPath);
-			}
-		}
-#endif
-
-		if (atscd->on_event) {
-			GF_ATSCEventFileInfo finfo;
-			memset(&finfo, 0, sizeof(GF_ATSCEventFileInfo));
-			finfo.filename = szPath;
-			finfo.data = obj->payload;
-			finfo.size = obj->total_length;
-			finfo.tsi = obj->tsi;
-			finfo.toi = obj->toi;
-			finfo.corrupted = partial;
-			finfo.download_ms = obj->download_time_ms;
-			atscd->on_event(atscd->udta, is_init ? GF_ATSC_EVT_INIT_SEG : GF_ATSC_EVT_SEG, s->service_id, &finfo);
-		}
-		return GF_OK;
-	}
-
-	if (obj->rlct->init_toi == obj->toi) {
-		sprintf(szPath, "%s/%s", s->output_dir, obj->rlct->init_filename ? obj->rlct->init_filename : "ghost-init.mp4");
-	} else {
-		char szFileName[1024];
-		sprintf(szFileName, obj->rlct->toi_template, obj->toi);
-		sprintf(szPath, "%s/%s", s->output_dir, szFileName);
-	}
-
-
-	sep = strrchr(szPath, '/');
-	sep[0]=0;
-	if (gf_dir_exists(szPath)==GF_FALSE) {
-		GF_Err e = gf_mkdir(szPath);
-		if (e==GF_IO_ERR) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to create output dir %s\n", s->service_id, szPath ));
-			return GF_IO_ERR;
-		}
-	}
-	sep[0]='/';
-
-	out = gf_fopen(szPath, "wb");
-	if (!out) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to create file %s\n", s->service_id, szPath ));
-		return GF_IO_ERR;
-	} else {
-		u32 bytes;
-		bytes = (u32) gf_fwrite(obj->payload, (size_t) obj->total_length, out);
-		gf_fclose(out);
-		if (bytes != obj->total_length) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to write DASH resource file %d written for %d total\n", s->service_id, bytes, obj->total_length));
-			return GF_IO_ERR;
-		}
-
-#ifdef CHECK_ISOM
-		{
-			GF_ISOFile *file = gf_isom_open(szPath, GF_ISOM_OPEN_READ_DUMP, NULL);
-			if (file) {
-				fprintf(stderr, "ISOBMF %s file OK\n", szPath);
-				gf_isom_delete(file);
-			} else {
-				fprintf(stderr, "ISOBMF %s file invalid\n", szPath);
-			}
-		}
-#endif
-
-	}
-#ifndef GPAC_DISABLE_LOG
-	if (partial || gf_log_tool_level_on(GF_LOG_ATSC, GF_LOG_DEBUG)) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSC3] Service %d got file %s (TSI %u TOI %u) size %d in %d ms (%d bytes in %d fragments)\n", s->service_id, szPath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms, obj->nb_bytes, obj->nb_recv_frags));
-	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSC3] Service %d got file %s (TSI %u TOI %u) size %d in %d ms\n", s->service_id, szPath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms));
-	}
-#endif
-	//keep init segment active
-	if (obj->toi==obj->rlct->init_toi) return GF_OK;
-	//no limit on objects, move to reservoir
-	if (!atscd->max_seg_store) {
-		gf_atsc3_obj_to_reservoir(atscd, s, obj);
-		return GF_OK;
-	}
-
-	//remove all pending objects except init segment
-	count = gf_list_count(s->objects);
-	nb_objs = 0;
-	for (i=0; i<count; i++) {
-		GF_LCTObject *o = gf_list_get(s->objects, i);
-		if (o->tsi != obj->tsi) continue;
-		if (obj->rlct && (o->toi==obj->rlct->init_toi)) continue;
-		nb_objs++;
-		if (o==obj) break;
-	}
-	if (atscd->max_seg_store >= nb_objs) return GF_OK;
-	nb_objs -= atscd->max_seg_store;
-
-	for (i=0; i<count; i++) {
-		char szFileName[1024];
-		GF_LCTObject *o;
-		if (!nb_objs) break;
-		o = gf_list_get(s->objects, i);
-		if (o->tsi != obj->tsi) continue;
-		if (o==obj) break;
-		if (o->toi==obj->rlct->init_toi) continue;
-
-		sprintf(szFileName, o->rlct->toi_template, o->toi);
-		sprintf(szPath, "%s/%s", s->output_dir, szFileName);
-		GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSC3] Service %d deleting file %s (TSI %u TOI %u)\n", s->service_id, szPath, o->tsi, o->toi));
-		gf_file_delete(szPath);
-		i--;
-		count--;
-		gf_atsc3_obj_to_reservoir(atscd, s, o);
-		nb_objs--;
-	}
-	return GF_OK;
-}
-
-static GF_Err gf_atsc3_service_flush_object(GF_ATSCService *s, GF_LCTObject *obj)
-{
-	u32 i;
-	u64 start_offset = 0;
-	obj->status = GF_LCT_OBJ_DONE;
-	for (i=0; i<obj->nb_frags; i++) {
-		if (start_offset != obj->frags[i].offset) {
-			obj->status = GF_LCT_OBJ_DONE_ERR;
-			break;
-		}
-		start_offset += obj->frags[i].size;
-	}
-	if (start_offset != obj->total_length) {
-		obj->status = GF_LCT_OBJ_DONE_ERR;
-	}
-	obj->download_time_ms = gf_sys_clock() - obj->download_time_ms;
-	return GF_EOS;
-}
-
-static GF_Err gf_atsc3_service_gather_object(GF_ATSCDmx *atscd, GF_ATSCService *s, u32 tsi, u32 toi, u32 start_offset, char *data, u32 size, u32 total_len, Bool close_flag, Bool in_order, GF_ATSCLCTChannel *rlct, GF_LCTObject **gather_obj)
-{
-	Bool inserted, done;
-	u32 i, count;
-	GF_LCTObject *obj = s->last_active_obj;
-
-	if (atscd->force_reorder)
-		in_order = GF_FALSE;
-
-	//in case last packet(s) are duplicated after we sent the object, skip them
-	if (rlct) {
-		if ((tsi==rlct->last_dispatched_tsi) && (toi==rlct->last_dispatched_toi)) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d TSI %u TOI %u LCT fragment on already dispatched object, skipping\n", s->service_id, tsi, toi));
-			return GF_OK;
-		}
-	} else {
-		if (!tsi && (toi==s->last_dispatched_toi_on_tsi_zero)) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d TSI %u TOI %u LCT fragment on already dispatched object, skipping\n", s->service_id, tsi, toi));
-			return GF_OK;
-		}
-	}
-
-	if (!obj || (obj->tsi!=tsi) || (obj->toi!=toi)) {
-		count = gf_list_count(s->objects);
-		for (i=0; i<count; i++) {
-			obj = gf_list_get(s->objects, i);
-			if ((obj->toi == toi) && (obj->tsi==tsi)) break;
-
-			if (!tsi && !obj->tsi && ((obj->toi&0xFFFFFF00) == (toi&0xFFFFFF00)) ) {
-				//change in version of bundle but same other flags: reuse this one
-				obj->nb_frags = obj->nb_recv_frags = 0;
-				obj->nb_bytes = obj->nb_recv_bytes = 0;
-				obj->total_length = total_len;
-				obj->toi = toi;
-				obj->status = GF_LCT_OBJ_INIT;
-				break;
-			}
-			obj = NULL;
-		}
-	}
-	if (!obj) {
-		obj = gf_list_pop_back(atscd->object_reservoir);
-		if (!obj) {
-			GF_SAFEALLOC(obj, GF_LCTObject);
-			if (!obj) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to allocate LCT object TSI %u TOI %u\n", s->service_id, toi, tsi ));
-				return GF_OUT_OF_MEM;
-			}
-			obj->nb_alloc_frags = 10;
-			obj->frags = gf_malloc(sizeof(GF_LCTFragInfo)*obj->nb_alloc_frags);
-		}
-		obj->toi = toi;
-		obj->tsi = tsi;
-		obj->status = GF_LCT_OBJ_INIT;
-		obj->total_length = total_len;
-		if (tsi && rlct) obj->rlct = rlct;
-
-		if (!total_len) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d object TSI %u TOI %u started without total-length assigned !\n", s->service_id, tsi, toi ));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d starting object TSI %u TOI %u total-length %d\n", s->service_id, tsi, toi, total_len));
-
-		}
-		obj->download_time_ms = gf_sys_clock();
-		gf_list_add(s->objects, obj);
-	} else if (!obj->total_length && total_len) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d object TSI %u TOI %u was started without total-length assigned, assigning to %u\n", s->service_id, tsi, toi, total_len));
-		obj->total_length = total_len;
-	} else if (total_len && (obj->total_length != total_len)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d object TSI %u TOI %u mismatch in total-length %u assigned, %u redeclared\n", s->service_id, tsi, toi, obj->total_length, total_len));
-	}
-	if (s->last_active_obj != obj) {
-		//last object had EOS and not completed
-		if (s->last_active_obj && s->last_active_obj->closed_flag && (s->last_active_obj->status<GF_LCT_OBJ_DONE_ERR)) {
-			GF_LCTObject *o = s->last_active_obj;
-		 	if (o->tsi) {
-		 		gf_atsc3_service_flush_object(s, o);
-				gf_atsc3_dmx_process_object(atscd, s, o);
-			} else {
-				gf_atsc3_obj_to_reservoir(atscd, s, o);
-			}
-		}
-		//note that if not in order and no timeout, we wait forever !
-		else if (in_order || atscd->reorder_timeout) {
-			count = gf_list_count(s->objects);
-			for (i=0; i<count; i++) {
-				u32 new_count;
-				GF_LCTObject *o = gf_list_get(s->objects, i);
-				if (o==obj) break;
-				//we can only detect losses if a new TOI on the same TSI is found
-				if (o->tsi != obj->tsi) continue;
-				if (o->status>=GF_LCT_OBJ_DONE_ERR) continue;
-
-				if (!in_order) {
-					u32 ellapsed = gf_sys_clock() - o->last_gather_time;
-					if (ellapsed < atscd->reorder_timeout)
-						continue;
-
-					GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d object TSI %u TOI %u timeout after %d ms - forcing dispatch\n", s->service_id, o->tsi, o->toi, ellapsed ));
-				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d object TSI %u TOI %u not completely received but in-order delivery signaled and new TOI %u - forcing dispatch\n", s->service_id, o->tsi, o->toi, toi ));
-				}
-
-				if (o->tsi) {
-		 			gf_atsc3_service_flush_object(s, o);
-					gf_atsc3_dmx_process_object(atscd, s, o);
-				} else {
-					gf_atsc3_obj_to_reservoir(atscd, s, o);
-				}
-				new_count = gf_list_count(s->objects);
-				//objects purged
-				if (new_count<count) {
-					i=-1;
-					count = new_count;
-				}
-			}
-		}
-		s->last_active_obj = obj;
-	}
-	*gather_obj = obj;
-	assert(obj->toi == toi);
-	assert(obj->tsi == tsi);
-
-	//keep receiving if we are done with errors
-	if (obj->status >= GF_LCT_OBJ_DONE) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d object TSI %u TOI %u already received - skipping\n", s->service_id, tsi, toi ));
-		return GF_EOS;
-	}
-	obj->nb_recv_bytes += size;
-	obj->last_gather_time = gf_sys_clock();
-
-	inserted = GF_FALSE;
-	for (i=0; i<obj->nb_frags; i++) {
-		if ((obj->frags[i].offset <= start_offset) && (obj->frags[i].offset + obj->frags[i].size >= start_offset + size) ) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d LCT fragment already received\n", s->service_id));
-			return GF_OK;
-		}
-
-		//insert fragment
-		if (obj->frags[i].offset > start_offset) {
-			//check overlap (not sure if this is legal)
-			if (start_offset + size > obj->frags[i].offset) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d Overlapping LCT fragment, not supported\n", s->service_id));
-				return GF_NOT_SUPPORTED;
-			}
-			if (obj->nb_frags==obj->nb_alloc_frags) {
-				obj->nb_alloc_frags *= 2;
-				obj->frags = gf_realloc(obj->frags, sizeof(GF_LCTFragInfo)*obj->nb_alloc_frags);
-			}
-			memmove(&obj->frags[i+1], &obj->frags[i], sizeof(GF_LCTFragInfo) * (obj->nb_frags - i) );
-			obj->frags[i].offset = start_offset;
-			obj->frags[i].size = size;
-			obj->nb_bytes += size;
-			obj->nb_frags++;
-			inserted = GF_TRUE;
-			break;
-		}
-		//expand fragment
-		if (obj->frags[i].offset + obj->frags[i].size == start_offset) {
-			obj->frags[i].size += size;
-			obj->nb_bytes += size;
-			inserted = GF_TRUE;
-			break;
-		}
-	}
-
-	if (!inserted) {
-		if (obj->nb_frags==obj->nb_alloc_frags) {
-			obj->nb_alloc_frags *= 2;
-			obj->frags = gf_realloc(obj->frags, sizeof(GF_LCTFragInfo)*obj->nb_alloc_frags);
-		}
-		obj->frags[obj->nb_frags].offset = start_offset;
-		obj->frags[obj->nb_frags].size = size;
-		obj->nb_frags++;
-		obj->nb_bytes += size;
-	}
-	obj->nb_recv_frags++;
-	obj->status = GF_LCT_OBJ_RECEPTION;
-
-	assert(obj->toi == toi);
-	assert(obj->tsi == tsi);
-	if (start_offset + size > obj->alloc_size) {
-		obj->alloc_size = start_offset + size;
-		//use total size if available
-		if (obj->alloc_size < obj->total_length)
-			obj->alloc_size = obj->total_length;
-		//for signaling objects, we set byte after last to 0 to use string functions
-		if (!tsi)
-			obj->alloc_size++;
-		obj->payload = gf_realloc(obj->payload, obj->alloc_size+1);
-		obj->payload[obj->alloc_size] = 0;
-	}
-	assert(obj->alloc_size >= start_offset + size);
-
-	memcpy(obj->payload + start_offset, data, size);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d TSI %u TOI %u append LCT fragment, offset %d total size %d recv bytes %d - offset diff since last %d\n", s->service_id, obj->tsi, obj->toi, start_offset, obj->total_length, obj->nb_bytes, (s32) start_offset - (s32) obj->prev_start_offset));
-
-	obj->prev_start_offset = start_offset;
-	assert(obj->toi == toi);
-	assert(obj->tsi == tsi);
-
-	//check if we are done
-	done = GF_FALSE;
-	if (obj->total_length) {
-		if (obj->nb_bytes >= obj->total_length) {
-			done = GF_TRUE;
-		}
-		else if (close_flag) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d object TSI %u TOI %u closed flag found (object not yet completed)\n", s->service_id, tsi, toi ));
-		}
-	} else {
-		if (close_flag) obj->closed_flag = GF_TRUE;
-	}
-	if (!done) return GF_OK;
-
-	s->last_active_obj = NULL;
-	if (obj->rlct) {
-		obj->rlct->last_dispatched_tsi = obj->tsi;
-		obj->rlct->last_dispatched_toi = obj->toi;
-	} else {
-		s->last_dispatched_toi_on_tsi_zero = obj->toi;
-	}
-	return gf_atsc3_service_flush_object(s, obj);
-}
-
-static GF_Err gf_atsc3_service_setup_dash(GF_ATSCDmx *atscd, GF_ATSCService *s, char *content, char *content_location)
-{
-	u32 len = (u32) strlen(content);
-
-	if (s->tune_mode==GF_ATSC_TUNE_SLS_ONLY) {
-		s->tune_mode = GF_ATSC_TUNE_OFF;
-		//unregister sockets
-		gf_atsc3_register_service_sockets(atscd, s, GF_FALSE);
-	}
-
-	if (s->output_dir) {
-		FILE *out;
-		char szPath[GF_MAX_PATH];
-		sprintf(szPath, "%s/%s", s->output_dir, content_location);
-		out = gf_fopen(szPath, "wb");
-		if (!out) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to create MPD file %s\n", s->service_id, szPath ));
-			return GF_IO_ERR;
-		} else {
-			u32 bytes = (u32) gf_fwrite(content, (size_t) len, out);
-			gf_fclose(out);
-			if (bytes != len) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to write MPD file %d written for %d total\n", s->service_id, bytes, len));
-				return GF_IO_ERR;
-			}
-		}
-		return GF_OK;
-	}
-
-	if (atscd->on_event) {
-		GF_ATSCEventFileInfo finfo;
-		memset(&finfo, 0, sizeof(GF_ATSCEventFileInfo));
-		finfo.data = content;
-		finfo.size = len;
-		finfo.filename = content_location;
-		GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSC3] Service %d received MPD file %s\n", s->service_id, content_location ));
-		atscd->on_event(atscd->udta, GF_ATSC_EVT_MPD, s->service_id, &finfo);
-	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_ATSC, ("[ATSC3] Service %d received MPD file %s content:\n%s\n", s->service_id, content_location, content ));
-	}
-	return GF_OK;
-}
-
-static GF_Err gf_atsc3_service_parse_mbms_enveloppe(GF_ATSCDmx *atscd, GF_ATSCService *s, char *content, char *content_location, u32 *stsid_version, u32 *mpd_version)
-{
-	u32 i, j;
-	GF_Err e;
-	GF_XMLAttribute *att;
-	GF_XMLNode *it, *root;
-
-	e = gf_xml_dom_parse_string(atscd->dom, content);
-	root = gf_xml_dom_get_root(atscd->dom);
-	if (e || !root) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to parse S-TSID: %s\n", s->service_id, gf_error_to_string(e) ));
-		return e;
-	}
-
-	i=0;
-	while ((it = gf_list_enum(root->content, &i))) {
-		const char *content_type = NULL;
-		/*const char *uri = NULL;*/
-		u32 version = 0;
-
-		if (strcmp(it->name, "item")) continue;
-
-		j=0;
-		while ((att = gf_list_enum(it->attributes, &j))) {
-			if (!stricmp(att->name, "contentType")) content_type = att->value;
-			/*else if (!stricmp(att->name, "metadataURI")) uri = att->value;*/
-			else if (!stricmp(att->name, "version")) version = atoi(att->value);
-		}
-		if (!content_type) continue;
-		if (!strcmp(content_type, "application/s-tsid")) *stsid_version = version;
-		else if (!strcmp(content_type, "application/dash+xml")) *mpd_version = version;
-	}
-	return GF_OK;
-}
-
-static GF_Err gf_atsc3_service_setup_stsid(GF_ATSCDmx *atscd, GF_ATSCService *s, char *content, char *content_location)
-{
-	GF_Err e;
-	GF_XMLAttribute *att;
-	GF_XMLNode *rs, *ls, *srcf, *efdt, *node, *root;
-	u32 i, j, k, crc, nb_lct_channels=0;
-
-	crc = gf_crc_32(content, (u32) strlen(content) );
-	if (!s->stsid_crc) {
-		s->stsid_crc = crc;
-	} else if (s->stsid_crc != crc) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d update of S-TSID not yet supported, skipping\n", s->service_id));
-		return GF_NOT_SUPPORTED;
-	} else {
-		return GF_OK;
-	}
-
-	e = gf_xml_dom_parse_string(atscd->dom, content);
-	root = gf_xml_dom_get_root(atscd->dom);
-	if (e || !root) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to parse S-TSID: %s\n", s->service_id, gf_error_to_string(e) ));
-		return e;
-	}
-	i=0;
-	while ((rs = gf_list_enum(root->content, &i))) {
-		char *dst_ip = s->dst_ip;
-		u32 dst_port = s->port;
-		char *file_template = NULL;
-		char *init_file_name = NULL;
-		GF_ATSCRouteSession *rsess;
-		GF_ATSCLCTChannel *rlct;
-		u32 init_file_toi=0;
-		u32 tsi = 0;
-		if (rs->type != GF_XML_NODE_TYPE) continue;
-		if (strcmp(rs->name, "RS")) continue;
-
-		j=0;
-		while ((att = gf_list_enum(rs->attributes, &j))) {
-			if (!stricmp(att->name, "dIpAddr")) dst_ip = att->value;
-			else if (!stricmp(att->name, "dPort")) dst_port = atoi(att->value);
-		}
-
-		GF_SAFEALLOC(rsess, GF_ATSCRouteSession);
-		if (!rsess) return GF_OUT_OF_MEM;
-
-		rsess->channels = gf_list_new();
-
-		//need a new socket for the session
-		if ((strcmp(s->dst_ip, dst_ip)) || (s->port != dst_port) ) {
-			rsess->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
-			gf_sk_set_usec_wait(rsess->sock, 1);
-			e = gf_sk_setup_multicast(rsess->sock, dst_ip, dst_port, 0, GF_FALSE, (char *) atscd->ip_ifce);
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to setup mcast for route session on %s:%d\n", s->service_id, dst_ip, dst_port));
-				return e;
-			}
-			gf_sk_set_buffer_size(rsess->sock, GF_FALSE, atscd->unz_buffer_size);
-			//gf_sk_set_block_mode(rsess->sock, GF_TRUE);
-			s->secondary_sockets++;
-			if (s->tune_mode == GF_ATSC_TUNE_ON) gf_sk_group_register(atscd->active_sockets, rsess->sock);
-		}
-		gf_list_add(s->route_sessions, rsess);
-
-		j=0;
-		while ((ls = gf_list_enum(rs->content, &j))) {
-			char *sep;
-			if (ls->type != GF_XML_NODE_TYPE) continue;
-			if (strcmp(ls->name, "LS")) continue;
-
-			//extract TSI
-			k=0;
-			while ((att = gf_list_enum(ls->attributes, &k))) {
-				if (!strcmp(att->name, "tsi")) sscanf(att->value, "%u", &tsi);
-			}
-			if (!tsi) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d missing TSI in LS/ROUTE session\n", s->service_id));
-				return GF_NON_COMPLIANT_BITSTREAM;
-			}
-			k=0;
-			srcf = NULL;
-			while ((srcf = gf_list_enum(ls->content, &k))) {
-				if ((srcf->type == GF_XML_NODE_TYPE) && !strcmp(srcf->name, "SrcFlow")) break;
-				srcf = NULL;
-			}
-			if (!srcf) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d missing srcFlow in LS/ROUTE session\n", s->service_id));
-				return GF_NON_COMPLIANT_BITSTREAM;
-			}
-			//enum srcf for efdt
-			k=0;
-			efdt = NULL;
-			while ((node = gf_list_enum(srcf->content, &k))) {
-				if (node->type != GF_XML_NODE_TYPE) continue;
-				if (!strcmp(node->name, "EFDT")) efdt = node;
-			}
-			if (!efdt) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d missing EFDT element in LS/ROUTE session, not supported\n", s->service_id));
-				return GF_NOT_SUPPORTED;
-			}
-
-			k=0;
-			while ((node = gf_list_enum(efdt->content, &k))) {
-				if (node->type != GF_XML_NODE_TYPE) continue;
-				//Korean version
-				if (!strcmp(node->name, "FileTemplate")) {
-					GF_XMLNode *cnode = gf_list_get(node->content, 0);
-					if (cnode->type==GF_XML_TEXT_TYPE) file_template = cnode->name;
-				}
-				else if (!strcmp(node->name, "FDTParameters")) {
-					u32 l=0;
-					GF_XMLNode *fdt = NULL;
-					while ((fdt = gf_list_enum(node->content, &l))) {
-						if ((fdt->type == GF_XML_NODE_TYPE) && (strstr(fdt->name, "File")!=NULL)) break;
-						fdt = NULL;
-					}
-					if (fdt) {
-						l=0;
-						while ((att = gf_list_enum(fdt->attributes, &l))) {
-							if (!strcmp(att->name, "Content-Location")) init_file_name = att->value;
-							else if (!strcmp(att->name, "TOI")) sscanf(att->value, "%u", &init_file_toi);
-						}
-					}
-				}
-				//US version
-				else if (!strcmp(node->name, "FDT-Instance")) {
-					u32 l=0;
-					GF_XMLNode *fdt = NULL;
-					while ((att = gf_list_enum(node->attributes, &l))) {
-						if (strstr(att->name, "fileTemplate")) file_template = att->value;
-					}
-					l=0;
-					while ((fdt = gf_list_enum(node->content, &l))) {
-						if ((fdt->type == GF_XML_NODE_TYPE) && (strstr(fdt->name, "File")!=NULL)) break;
-						fdt = NULL;
-					}
-					if (fdt) {
-						l=0;
-						while ((att = gf_list_enum(fdt->attributes, &l))) {
-							if (!strcmp(att->name, "Content-Location")) init_file_name = att->value;
-							else if (!strcmp(att->name, "TOI")) sscanf(att->value, "%u", &init_file_toi);
-						}
-					}
-				}
-			}
-
-			if (!init_file_name) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d missing init file name in LS/ROUTE session, could be problematic - will consider any TOI %u (-1) present as a ghost init segment\n", s->service_id, (u32)-1));
-				//force an init at -1, some streams still have the init not declared but send on TOI -1
-				// interpreting it as a regular segment would break clock setup
-				init_file_toi = (u32) -1;
-			}
-			if (!file_template) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d missing file TOI template in LS/ROUTE session, not supported - skipping stream\n", s->service_id));
-				continue;
-			}
-			sep = strstr(file_template, "$TOI$");
-			if (!sep) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d wrong TOI template %s in LS/ROUTE session\n", s->service_id, file_template));
-				return GF_NOT_SUPPORTED;
-			}
-			nb_lct_channels++;
-
-			//OK setup LCT channel for route
-			GF_SAFEALLOC(rlct, GF_ATSCLCTChannel);
-			if (!rlct) return GF_OUT_OF_MEM;
-			
-			rlct->init_toi = init_file_toi;
-			rlct->tsi = tsi;
-			rlct->init_filename = init_file_name ? gf_strdup(init_file_name) : NULL;
-			rlct->toi_template = gf_strdup(file_template);
-			sep = strstr(rlct->toi_template, "$TOI$");
-			sep[0] = 0;
-			strcat(rlct->toi_template, "%d");
-			sep = strstr(file_template, "$TOI$");
-			strcat(rlct->toi_template, sep+5);
-
-			//fill in payloads
-			k=0;
-			efdt = NULL;
-			while ((node = gf_list_enum(srcf->content, &k))) {
-				if (node->type != GF_XML_NODE_TYPE) continue;
-				if (!strcmp(node->name, "Payload")) {
-					u32 l=0;
-					GF_ATSCLCTReg *lreg;
-					lreg = &rlct->CPs[rlct->nb_cps];
-					lreg->order = 1; //default
-					while ((att = gf_list_enum(node->attributes, &l))) {
-						if (!strcmp(att->name, "codePoint")) lreg->codepoint = (u8) atoi(att->value);
-						else if (!strcmp(att->name, "formatID")) lreg->format_id = (u8) atoi(att->value);
-						else if (!strcmp(att->name, "frag")) lreg->frag = (u8) atoi(att->value);
-						else if (!strcmp(att->name, "order")) lreg->order = (u8) atoi(att->value);
-						else if (!strcmp(att->name, "srcFecPayloadID")) lreg->src_fec_payload_id = (u8) atoi(att->value);
-					}
-					if (lreg->src_fec_payload_id) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d payload format indicates srcFecPayloadId %d (reserved), assuming 0\n", s->service_id, lreg->src_fec_payload_id));
-
-					}
-					if (lreg->format_id != 1) {
-						if (lreg->format_id && (lreg->format_id<5)) {
-							GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d payload formatID %d not supported\n", s->service_id, lreg->format_id));
-						} else {
-							GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d payload formatID %d reserved, assuming 1\n", s->service_id, lreg->format_id));
-						}
-					}
-					rlct->nb_cps++;
-					if (rlct->nb_cps==8) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d more payload formats than supported (8 max)\n", s->service_id));
-						break;
-					}
-				}
-			}
-
-			gf_list_add(rsess->channels, rlct);
-		}
-	}
-
-	if (!nb_lct_channels) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d does not have any supported LCT channels\n", s->service_id));
-		return GF_NOT_SUPPORTED;
-	}
-	return GF_OK;
-}
-
-static GF_Err gf_atsc3_dmx_process_service_signaling(GF_ATSCDmx *atscd, GF_ATSCService *s, GF_LCTObject *object, u8 cc, u32 stsid_version, u32 mpd_version)
-{
-	char *payload, *boundary=NULL, *sep;
-	char szContentType[100], szContentLocation[1024];
-	u32 payload_size;
-	GF_Err e;
-
-	//uncompress bundle
-	if (object->toi & 0x80000000 /*(1<<31)*/ ) {
-		u32 raw_size;
-		if (object->total_length > atscd->buffer_size) {
-			atscd->buffer_size = object->total_length;
-			atscd->buffer = gf_realloc(atscd->buffer, object->total_length);
-			if (!atscd->buffer) return GF_OUT_OF_MEM;
-		}
-		memcpy(atscd->buffer, object->payload, object->total_length);
-		e = gf_gz_decompress_payload(atscd->buffer, object->total_length, &atscd->unz_buffer, &raw_size);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d failed to decompress signaling bundle: %s\n", s->service_id, gf_error_to_string(e) ));
-			return e;
-		}
-		if (raw_size > atscd->unz_buffer_size) atscd->unz_buffer_size = raw_size;
-		payload = atscd->unz_buffer;
-		payload_size = raw_size;
-	} else {
-		payload = object->payload;
-		payload_size = object->total_length;
-	}
-	payload[payload_size] = 0;
-
-	//check for multipart
-	if (!strncmp(payload, "Content-Type: multipart/", 24)) {
-		sep = strstr(payload, "boundary=\"");
-		if (!sep) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d cannot find multipart boundary in package:\n%s\n", s->service_id, payload ));
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		payload = sep + 10;
-		sep = strstr(payload, "\"");
-		if (!sep) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d multipart boundary not properly formatted in package:\n%s\n", s->service_id, payload ));
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		sep[0] = 0;
-		boundary = gf_strdup(payload);
-		sep[0] = '\"';
-		payload = sep+1;
-	}
-
-	//extract all content
-	while (1) {
-		char *content;
-		//multipart, check for start and end
-		if (boundary) {
-			sep = strstr(payload, boundary);
-			if (!sep) break;
-			payload = sep + strlen(boundary) + 2;
-			sep = strstr(payload, boundary);
-			if (!sep) break;
-			sep[0] = 0;
-		} else {
-			sep = NULL;
-		}
-
-		//extract headers
-		while (strncmp(payload, "\r\n\r\n", 4)) {
-			u32 i=0;
-			while (strchr("\n\r", payload[0]) != NULL) payload++;
-			while (strchr("\r\n", payload[i]) == NULL) i++;
-
-			if (!strnicmp(payload, "Content-Type: ", 14)) {
-				u32 copy = MIN(i-14, 100);
-				strncpy(szContentType, payload+14, copy);
-				szContentType[copy]=0;
-				payload += i;
-			}
-			else if (!strnicmp(payload, "Content-Location: ", 18)) {
-				u32 copy = MIN(i-18, 1024);
-				strncpy(szContentLocation, payload+18, copy);
-				szContentLocation[copy]=0;
-				payload += i;
-			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d unrecognized header entity in package:\n%s\n", s->service_id, payload ));
-			}
-		}
-		payload += 4;
-		content = boundary ? strstr(payload, "\r\n--") : strstr(payload, "\r\n\r\n");
-		if (content) {
-			content[0] = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d package type %s location %s content:\n%s\n", s->service_id, szContentType, szContentLocation, payload ));
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d %s not properly formatted in package:\n%s\n", s->service_id, boundary ? "multipart boundary" : "entity", payload ));
-			if (sep && boundary) sep[0] = boundary[0];
-			gf_free(boundary);
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-
-		if (!strcmp(szContentType, "application/mbms-envelope+xml")) {
-			e = gf_atsc3_service_parse_mbms_enveloppe(atscd, s, payload, szContentLocation, &stsid_version, &mpd_version);
-
-			if (e || !stsid_version || !mpd_version) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d MBMS envelope error %s, S-TSID version %d MPD version %d\n",s->service_id, gf_error_to_string(e), stsid_version, mpd_version ));
-				gf_free(boundary);
-				return e ? e : GF_SERVICE_ERROR;
-			}
-		} else if (!strcmp(szContentType, "application/mbms-user-service-description+xml")) {
-		} else if (!strcmp(szContentType, "application/dash+xml")) {
-			if (mpd_version && (mpd_version+1 != s->mpd_version)) {
-				s->mpd_version = mpd_version+1;
-				gf_atsc3_service_setup_dash(atscd, s, payload, szContentLocation);
-			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d same MPD version, ignoring\n",s->service_id));
-			}
-		}
-		//Korean and US version have different mime types
-		else if (!strcmp(szContentType, "application/s-tsid") || !strcmp(szContentType, "application/route-s-tsid+xml")) {
-			if (stsid_version && (stsid_version+1 != s->stsid_version)) {
-				s->stsid_version = stsid_version+1;
-				gf_atsc3_service_setup_stsid(atscd, s, payload, szContentLocation);
-			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d same S-TSID version, ignoring\n",s->service_id));
-			}
-		}
-		if (!sep) break;
-		sep[0] = boundary[0];
-		payload = sep;
-	}
-
-	gf_free(boundary);
-	return GF_OK;
-}
-
-enum
-{
-	/*No-operation extension header*/
-	GF_LCT_EXT_NOP = 0,
-	/*Authentication extension header*/
-	GF_LCT_EXT_AUTH = 1,
-	/*Time extension header*/
-	GF_LCT_EXT_TIME = 2,
-	/*FEC object transmission information extension header*/
-	GF_LCT_EXT_FTI = 64,
-	/*Extension header for FDT - FLUTE*/
-	GF_LCT_EXT_FDT = 192,
-	/*Extension header for FDT content encoding - FLUTE*/
-	GF_LCT_EXT_CENC = 193,
-	/*TOL extension header - ATSC - 24 bit payload*/
-	GF_LCT_EXT_TOL24 = 194,
-	/*TOL extension header - ATSC - HEL + 28 bit payload*/
-	GF_LCT_EXT_TOL48 = 67,
-};
-
-static GF_Err gf_atsc3_dmx_process_service(GF_ATSCDmx *atscd, GF_ATSCService *s, GF_ATSCRouteSession *route_sess)
-{
-	GF_Err e;
-	u32 nb_read, v, C, psi, S, O, H, /*Res, A,*/ B, hdr_len, cp, cc, tsi, toi, pos;
-	u32 /*a_G=0, a_U=0,*/ a_S=0, a_M=0/*, a_A=0, a_H=0, a_D=0*/;
-	u64 tol_size=0;
-	Bool in_order = GF_TRUE;
-	u32 start_offset;
-	GF_ATSCLCTChannel *rlct=NULL;
-	GF_LCTObject *gather_object=NULL;
-
-	if (route_sess) {
-		e = gf_sk_receive_no_select(route_sess->sock, atscd->buffer, atscd->buffer_size, &nb_read);
-	} else {
-		e = gf_sk_receive_no_select(s->sock, atscd->buffer, atscd->buffer_size, &nb_read);
-	}
-
-	if (e != GF_OK) return e;
-	assert(nb_read);
-
-	atscd->nb_packets++;
-	atscd->total_bytes_recv += nb_read;
-	atscd->last_pck_time = gf_sys_clock_high_res();
-	if (!atscd->first_pck_time) atscd->first_pck_time = atscd->last_pck_time;
-
-	e = gf_bs_reassign_buffer(atscd->bs, atscd->buffer, nb_read);
-	if (e != GF_OK) return e;
-
-	//parse LCT header
-	v = gf_bs_read_int(atscd->bs, 4);
-	C = gf_bs_read_int(atscd->bs, 2);
-	psi = gf_bs_read_int(atscd->bs, 2);
-	S = gf_bs_read_int(atscd->bs, 1);
-	O = gf_bs_read_int(atscd->bs, 2);
-	H = gf_bs_read_int(atscd->bs, 1);
-	/*Res = */gf_bs_read_int(atscd->bs, 2);
-	/*A = */gf_bs_read_int(atscd->bs, 1);
-	B = gf_bs_read_int(atscd->bs, 1);
-	hdr_len = gf_bs_read_int(atscd->bs, 8);
-	cp = gf_bs_read_int(atscd->bs, 8);
-
-	if (v!=1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d : wrong LCT header version %d\n", s->service_id, v));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	else if (C!=0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d : wrong ROUTE LCT header C %d, expecting 0\n", s->service_id, C));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	else if ((psi!=0) && (psi!=2) ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d : wrong ROUTE LCT header PSI %d, expecting b00 or b10\n", s->service_id, psi));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	else if (S!=1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d : wrong ROUTE LCT header S, shall be 1\n", s->service_id));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	else if (O!=1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d : wrong ROUTE LCT header S, shall be b01\n", s->service_id));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	else if (H!=0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d : wrong ROUTE LCT header H, shall be 0\n", s->service_id));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	if (hdr_len<4) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d : wrong ROUTE LCT header len %d, shall be at least 4 0\n", s->service_id, hdr_len));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
-	if (psi==0) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d : FEC ROUTE not implemented\n", s->service_id));
-		return GF_NOT_SUPPORTED;
-	}
-
-	cc = gf_bs_read_u32(atscd->bs);
-	tsi = gf_bs_read_u32(atscd->bs);
-	toi = gf_bs_read_u32(atscd->bs);
-	hdr_len-=4;
-
-	//filter TSI if not 0 (service TSI) and debug mode set
-	if (atscd->debug_tsi && tsi && (tsi!=atscd->debug_tsi)) return GF_OK;
-
-	//look for TSI 0 first
-	if (tsi!=0) {
-		u32 i=0;
-		Bool in_session = GF_FALSE;
-		if (s->tune_mode==GF_ATSC_TUNE_SLS_ONLY) return GF_OK;
-
-		if (s->last_active_obj && (s->last_active_obj->tsi==tsi)) {
-			in_session = GF_TRUE;
-			rlct = s->last_active_obj->rlct;
-		} else {
-			GF_ATSCRouteSession *rsess;
-			i=0;
-			while ((rsess = gf_list_enum(s->route_sessions, &i))) {
-				u32 j=0;
-				while ((rlct = gf_list_enum(rsess->channels, &j))) {
-					if (rlct->tsi == tsi) {
-						in_session = GF_TRUE;
-						break;
-					}
-					rlct = NULL;
-				}
-				if (in_session) break;
-			}
-		}
-		if (!in_session) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d : no session with TSI %u defined, skipping packet\n", s->service_id, tsi));
-			return GF_OK;
-		}
-		for (i=0; rlct && i<rlct->nb_cps; i++) {
-			if (rlct->CPs[i].codepoint==cp) {
-				in_order = rlct->CPs[i].order;
-				break;
-			}
-		}
-	} else {
-		//check TOI for TSI 0
-		//a_G = (toi & 0x80000000) /*(1<<31)*/ ? 1 : 0;
-		//a_U = (toi & (1<<16)) ? 1 : 0;
-		a_S = (toi & (1<<17)) ? 1 : 0;
-		a_M = (toi & (1<<18)) ? 1 : 0;
-		/*a_A = (toi & (1<<19)) ? 1 : 0;
-		a_H = (toi & (1<<22)) ? 1 : 0;
-		a_D = (toi & (1<<23)) ? 1 : 0;*/
-		v = toi & 0xFF;
-		//skip known version
-		if (a_M && (s->mpd_version == v+1)) a_M = 0;
-		if (a_S && (s->stsid_version == v+1)) a_S = 0;
-
-
-		//for now we only care about S and M
-		if (!a_S && ! a_M) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d : SLT bundle without MPD or S-TSID, skipping packet\n", s->service_id));
-			return GF_OK;
-		}
-	}
-
-	//parse extensions
-	while (hdr_len) {
-		u8 hel=0, het = gf_bs_read_u8(atscd->bs);
-		if (het<128) hel = gf_bs_read_u8(atscd->bs);
-
-		switch (het) {
-		case GF_LCT_EXT_FDT:
-			/*flute_version = */gf_bs_read_int(atscd->bs, 4);
-			/*fdt_instance_id = */gf_bs_read_int(atscd->bs, 20);
-			break;
-
-		case GF_LCT_EXT_CENC:
-			/*content_encodind = */gf_bs_read_int(atscd->bs, 8);
-			/*reserved = */gf_bs_read_int(atscd->bs, 16);
-			break;
-
-		case GF_LCT_EXT_TOL24:
-			tol_size = gf_bs_read_int(atscd->bs, 24);
-			break;
-
-		case GF_LCT_EXT_TOL48:
-			if (hel!=2) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d : wrong HEL %d for TOL48 LCT extension, expecing 2\n", s->service_id, hel));
-				continue;
-			}
-			tol_size = gf_bs_read_long_int(atscd->bs, 48);
-			break;
-
-		default:
-			GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d : unsupported header extension HEL %d HET %d\n", s->service_id, hel, het));
-			break;
-		}
-		if (hdr_len<hel) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d : wrong HEL %d for LCT extension %d, remainign header size %d\n", s->service_id, hel, het, hdr_len));
-			continue;
-		}
-		if (hel) hdr_len -= hel;
-		else hdr_len -= 1;
-	}
-
-	start_offset = gf_bs_read_u32(atscd->bs);
-	pos = (u32) gf_bs_get_position(atscd->bs);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d : LCT packet TSI %u TOI %u size %d startOffset %u TOL "LLU"\n", s->service_id, tsi, toi, nb_read-pos, start_offset, tol_size));
-
-	e = gf_atsc3_service_gather_object(atscd, s, tsi, toi, start_offset, atscd->buffer + pos, nb_read-pos, (u32) tol_size, B, in_order, rlct, &gather_object);
-
-	if (e==GF_EOS) {
-		if (!tsi) {
-			if (gather_object->status==GF_LCT_OBJ_DONE_ERR) {
-				gf_atsc3_obj_to_reservoir(atscd, s, gather_object);
-				return GF_OK;
-			}
-			//we don't assign version here, we use mbms envelope for that since the bundle may have several
-			//packages
-
-			gf_atsc3_dmx_process_service_signaling(atscd, s, gather_object, cc, a_S ? v : 0, a_M ? v : 0);
-			//we don't release the LCT object, so that we can disard future versions
-		} else {
-			gf_atsc3_dmx_process_object(atscd, s, gather_object);
-		}
-	}
-
-	return GF_OK;
-}
-
-static GF_Err gf_atsc3_dmx_process_lls(GF_ATSCDmx *atscd)
-{
-	u32 read;
-	GF_Err e;
-	const char *name=NULL;
-	u32 lls_table_id, lls_group_id, lls_group_count, lls_table_version;
-	u32 raw_size = atscd->unz_buffer_size;
-	GF_XMLNode *root;
-
-	e = gf_sk_receive_no_select(atscd->sock, atscd->buffer, atscd->buffer_size, &read);
-	if (e)
-		return e;
-
-	atscd->nb_packets++;
-	atscd->total_bytes_recv += read;
-	atscd->last_pck_time = gf_sys_clock_high_res();
-	if (!atscd->first_pck_time) atscd->first_pck_time = atscd->last_pck_time;
-
-	lls_table_id = atscd->buffer[0];
-	lls_group_id = atscd->buffer[1];
-	lls_group_count = 1 + atscd->buffer[2];
-	lls_table_version = atscd->buffer[3];
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSCDmx] LLSTable size %d version %d: ID %d (%s) - group ID %d - group count %d\n", read, lls_table_id, lls_table_version, (lls_table_id==1) ? "SLT" : (lls_table_id==2) ? "RRT" : (lls_table_id==3) ? "SystemTime" : (lls_table_id==4) ? "AEAT" : "Reserved", lls_group_id, lls_group_count));
-	switch (lls_table_id) {
-	case 1:
-		if (atscd->slt_version== 1+lls_table_version) return GF_OK;
-		atscd->slt_version = 1+lls_table_version;
-		name="SLT";
-		break;
-	case 2:
-		if (atscd->rrt_version== 1+lls_table_version) return GF_OK;
-		atscd->rrt_version = 1+lls_table_version;
-		name="RRT";
- 	break;
-	case 3:
-		if (atscd->systime_version== 1+lls_table_version) return GF_OK;
-		atscd->systime_version = 1+lls_table_version;
-		name="SysTime";
- 	break;
-	case 4:
-		if (atscd->aeat_version== 1+lls_table_version) return GF_OK;
-		atscd->aeat_version = 1+lls_table_version;
-		name="AEAT";
- 	break;
-	default:
-		return GF_OK;
-	}
-
-	e = gf_gz_decompress_payload(&atscd->buffer[4], read-4, &atscd->unz_buffer, &raw_size);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to decompress %s table: %s\n", name, gf_error_to_string(e) ));
-		return e;
-	}
-	//realloc happened
-	if (atscd->unz_buffer_size<raw_size) atscd->unz_buffer_size = raw_size;
-	atscd->unz_buffer[raw_size]=0;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSCDmx] SLT table - payload:\n%s\n", atscd->unz_buffer));
-
-
-	e = gf_xml_dom_parse_string(atscd->dom, atscd->unz_buffer);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to parse SLT XML: %s\n", gf_error_to_string(e) ));
-		return e;
-	}
-
-	root = gf_xml_dom_get_root(atscd->dom);
-	if (!root) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to get XML root for %s table\n", name ));
-		return e;
-	}
-
-	switch (lls_table_id) {
-	case 1:
-		return gf_atsc3_dmx_process_slt(atscd, root);
-	case 2:
-	case 3:
-	case 4:
-	default:
-		break;
-	}
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_atsc3_dmx_process(GF_ATSCDmx *atscd)
-{
-	u32 i, count;
-	GF_Err e;
-
-	//check all active sockets
-	e = gf_sk_group_select(atscd->active_sockets, 10, GF_SK_SELECT_READ);
-	if (e) return e;
-
-	if (gf_sk_group_sock_is_set(atscd->active_sockets, atscd->sock, GF_SK_SELECT_READ)) {
-		e = gf_atsc3_dmx_process_lls(atscd);
-		if (e) return e;
-	}
-
-	count = gf_list_count(atscd->services);
-	for (i=0; i<count; i++) {
-		u32 j;
-		GF_ATSCRouteSession *rsess;
-		GF_ATSCService *s = (GF_ATSCService *)gf_list_get(atscd->services, i);
-		if (s->tune_mode==GF_ATSC_TUNE_OFF) continue;
-
-		if (gf_sk_group_sock_is_set(atscd->active_sockets, s->sock, GF_SK_SELECT_READ)) {
-			e = gf_atsc3_dmx_process_service(atscd, s, NULL);
-			if (e) return e;
-		}
-		if (s->tune_mode!=GF_ATSC_TUNE_ON) continue;
-		if (!s->secondary_sockets) continue;
-
-		j=0;
-		while ((rsess = (GF_ATSCRouteSession *)gf_list_enum(s->route_sessions, &j) )) {
-			if (gf_sk_group_sock_is_set(atscd->active_sockets, rsess->sock, GF_SK_SELECT_READ)) {
-				e = gf_atsc3_dmx_process_service(atscd, s, rsess);
-				if (e) return e;
-			}
-		}
-
-	}
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_atsc3_set_callback(GF_ATSCDmx *atscd, void (*on_event)(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *info), void *udta)
-{
-	if (!atscd) return GF_BAD_PARAM;
-	atscd->udta = udta;
-	atscd->on_event = on_event;
-	return GF_OK;
-}
-
-GF_EXPORT
-Bool gf_atsc3_dmx_find_service(GF_ATSCDmx *atscd, u32 service_id)
-{
-	u32 i=0;
-	GF_ATSCService *s;
-	while ((s = gf_list_enum(atscd->services, &i))) {
-		if (s->service_id != service_id) continue;
-		return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-
-GF_EXPORT
-u32 gf_atsc3_dmx_get_object_count(GF_ATSCDmx *atscd, u32 service_id)
-{
-	u32 i=0;
-	GF_ATSCService *s;
-	while ((s = gf_list_enum(atscd->services, &i))) {
-		if (s->service_id != service_id) continue;
-		return gf_list_count(s->objects);
-	}
-	return 0;
-}
-
-GF_EXPORT
-void gf_atsc3_dmx_remove_object_by_name(GF_ATSCDmx *atscd, u32 service_id, char *fileName, Bool purge_previous)
-{
-	u32 i=0;
-	GF_ATSCService *s=NULL;
-	GF_LCTObject *obj = NULL;
-	while ((s = gf_list_enum(atscd->services, &i))) {
-		if (s->service_id == service_id) break;
-		s = NULL;
-	}
-	if (!s) return;
-	i=0;
-	while ((obj = gf_list_enum(s->objects, &i))) {
-		u32 toi;
-		if (obj->rlct && (sscanf(fileName, obj->rlct->toi_template, &toi) == 1)) {
-			if (toi == obj->toi) {
-				GF_ATSCLCTChannel *rlct = obj->rlct;
-				//we likely have a loop here
-				if (obj == s->last_active_obj) break;
-
-				gf_atsc3_obj_to_reservoir(atscd, s, obj);
-				if (purge_previous) {
-					i=0;
-					while ((obj = gf_list_enum(s->objects, &i))) {
-						if (obj->rlct != rlct) continue;
-						if (obj->toi==rlct->init_toi) continue;
-						if (obj->toi<toi) {
-							i--;
-							//we likely have a loop here
-							if (obj == s->last_active_obj) return;
-							gf_atsc3_obj_to_reservoir(atscd, s, obj);
-						}
-					}
-				}
-				return;
-			}
-		}
-		else if (obj->rlct && obj->rlct->init_filename && !strcmp(fileName, obj->rlct->init_filename)) {
-			gf_atsc3_obj_to_reservoir(atscd, s, obj);
-			return;
-		}
-	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Failed to remove object %s from service, object not found\n", fileName));
-}
-
-
-GF_EXPORT
-Bool gf_atsc3_dmx_remove_first_object(GF_ATSCDmx *atscd, u32 service_id)
-{
-	u32 i=0;
-	GF_ATSCService *s=NULL;
-	GF_LCTObject *obj = NULL;
-	while ((s = gf_list_enum(atscd->services, &i))) {
-		if (s->service_id == service_id) break;
-		s = NULL;
-	}
-	if (!s) return GF_FALSE;
-
-	i=0;
-	while ( (obj = gf_list_enum(s->objects, &i))) {
-		if (obj == s->last_active_obj) continue;
-		//object is active, abort
-		if (obj->status<=GF_LCT_OBJ_RECEPTION) break;
-		//keep init segment active
-		if (obj->rlct && (obj->toi==obj->rlct->init_toi))
-			continue;
-
-		gf_atsc3_obj_to_reservoir(atscd, s, obj);
-		return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-GF_EXPORT
-void gf_atsc3_dmx_purge_objects(GF_ATSCDmx *atscd, u32 service_id)
-{
-	u32 i=0;
-	GF_ATSCService *s=NULL;
-	GF_LCTObject *obj = NULL;
-	while ((s = gf_list_enum(atscd->services, &i))) {
-		if (s->service_id == service_id) break;
-		s = NULL;
-	}
-	if (!s) return;
-
-	i=0;
-	while ((obj = gf_list_enum(s->objects, &i))) {
-		//only purge non signaling objects
-		if (!obj->tsi) continue;
-		//if object is being received keep it
-		if (s->last_active_obj == obj) continue;
-		//if object is init segment keep it - this may need refinement in case we had init segment updates
-		if (obj->rlct && (obj->rlct->init_toi==obj->toi)) continue;
-		//trash
-		gf_atsc3_obj_to_reservoir(atscd, s, obj);
-	}
-}
-
-GF_EXPORT
-void gf_atsc3_dmx_set_service_udta(GF_ATSCDmx *atscd, u32 service_id, void *udta)
-{
-	u32 i=0;
-	GF_ATSCService *s=NULL;
-	while ((s = gf_list_enum(atscd->services, &i))) {
-		if (s->service_id == service_id) {
-			s->udta = udta;
-			return;
-		}
-	}
-}
-
-GF_EXPORT
-void *gf_atsc3_dmx_get_service_udta(GF_ATSCDmx *atscd, u32 service_id)
-{
-	u32 i=0;
-	GF_ATSCService *s=NULL;
-	while ((s = gf_list_enum(atscd->services, &i))) {
-		if (s->service_id == service_id) {
-			return s->udta;
-		}
-	}
-	return NULL;
-}
-
-GF_EXPORT
-u64 gf_atsc3_dmx_get_first_packet_time(GF_ATSCDmx *atscd)
-{
-	return atscd ? atscd->first_pck_time : 0;
-}
-
-GF_EXPORT
-u64 gf_atsc3_dmx_get_last_packet_time(GF_ATSCDmx *atscd)
-{
-	return atscd ? atscd->last_pck_time : 0;
-}
-
-GF_EXPORT
-u64 gf_atsc3_dmx_get_nb_packets(GF_ATSCDmx *atscd)
-{
-	return atscd ? atscd->nb_packets : 0;
-}
-
-GF_EXPORT
-u64 gf_atsc3_dmx_get_recv_bytes(GF_ATSCDmx *atscd)
-{
-	return atscd ? atscd->total_bytes_recv : 0;
-}
-
-GF_EXPORT
-void gf_atsc3_dmx_debug_tsi(GF_ATSCDmx *atscd, u32 tsi)
-{
-	if (atscd) atscd->debug_tsi = tsi;
-}
-
-#endif /* GPAC_DISABLE_ATSC */

gpac-1.0.1.tar.gz/.gitignore -> gpac-2.0.0.tar.gz/.gitignore Changed

gpac-1.0.1.tar.gz/.gitmodules -> gpac-2.0.0.tar.gz/.gitmodules Changed

gpac-1.0.1.tar.gz/.travis.yml -> gpac-2.0.0.tar.gz/.travis.yml Changed

@@ -2,7 +2,7 @@
 #TravisCI is only used for checking sanity of PRs. Consequently:
 #- OSX and mingw no longer compiled
 #- linux only compiled for
-# - mp4box static
+# - mp4box and gpac static
 # - release mode with mem tracking and gcov
 
 language: c
@@ -26,9 +26,9 @@
 # - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install gnu-time gnu-sed gnu-tar xz lcov ; fi
 # - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install faad2 sdl freetype libvorbis theora openjpeg libmad xvid libogg spidermonkey ffmpeg ; fi
 env:
- - GPAC_CONFIGURE_OPTIONS="--prefix=build/mp4box --enable-debug --static-mp4box" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="make install" DOTRAVIS=""
+ - GPAC_CONFIGURE_OPTIONS="--prefix=build/mp4box --enable-debug --static-bin" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="make install" DOTRAVIS=""
 - GPAC_CONFIGURE_OPTIONS="--enable-debug --static-modules" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
- - GPAC_CONFIGURE_OPTIONS="--enable-debug --enable-static-bin" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
+ - GPAC_CONFIGURE_OPTIONS="--enable-debug --static-build" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
 matrix:
 include:
 - os: linux
@@ -39,9 +39,9 @@
 env: GPAC_CONFIGURE_OPTIONS="--enable-mem-track --enable-gcov" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="sudo make install" DOTRAVIS="make travis" AUDIODEV=null
 
 # - os: linux
-# env: GPAC_CONFIGURE_OPTIONS="--prefix=build/x86_64-w64-mingw32 --enable-debug --static-mp4box --use-zlib=no --target-os=mingw32 --cross-prefix=i686-w64-mingw32- --extra-ldflags=-Lbuild/x86_64-w64-mingw32/lib" GPAC_CONFIGURE_ECFLAGS="-Ibuild/x86_64-w64-mingw32/include -w -fPIC" DOINSTALL="" DOTRAVIS=""
+# env: GPAC_CONFIGURE_OPTIONS="--prefix=build/x86_64-w64-mingw32 --enable-debug --static-bin --use-zlib=no --target-os=mingw32 --cross-prefix=i686-w64-mingw32- --extra-ldflags=-Lbuild/x86_64-w64-mingw32/lib" GPAC_CONFIGURE_ECFLAGS="-Ibuild/x86_64-w64-mingw32/include -w -fPIC" DOINSTALL="" DOTRAVIS=""
 # - os: linux
-# env: GPAC_CONFIGURE_OPTIONS="--prefix=build/x86_64-w64-mingw32 --enable-debug --static-mp4box --use-zlib=no --target-os=mingw32 --cross-prefix=x86_64-w64-mingw32- --extra-ldflags=-Lbuild/x86_64-w64-mingw32/lib" GPAC_CONFIGURE_ECFLAGS="-Ibuild/x86_64-w64-mingw32/include -w -fPIC" DOINSTALL="" DOTRAVIS=""
+# env: GPAC_CONFIGURE_OPTIONS="--prefix=build/x86_64-w64-mingw32 --enable-debug --static-bin --use-zlib=no --target-os=mingw32 --cross-prefix=x86_64-w64-mingw32- --extra-ldflags=-Lbuild/x86_64-w64-mingw32/lib" GPAC_CONFIGURE_ECFLAGS="-Ibuild/x86_64-w64-mingw32/include -w -fPIC" DOINSTALL="" DOTRAVIS=""
 # - os: linux
 # env: GPAC_CONFIGURE_OPTIONS="--prefix=build/all --enable-debug --disable-all" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="make install" DOTRAVIS=""
 # - os: linux
@@ -50,8 +50,6 @@
 # env: GPAC_CONFIGURE_OPTIONS="--enable-mem-track" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="sudo make install" DOTRAVIS="" AUDIODEV=null
 script:
 - ./configure --extra-cflags=''"$GPAC_CONFIGURE_ECFLAGS"'' $GPAC_CONFIGURE_OPTIONS && make && $DOINSTALL && ( if [ -n "$DOTRAVIS" ]; then xvfb-run -e /dev/stdout --auto-servernum --server-num=1 --server-args="-screen 0 1024x768x24" $DOTRAVIS ; fi )
-after_success:
- - if [ "$TRAVIS_OS_NAME" == "linux" ]; then bash <(curl -s https://codecov.io/bash) ; fi
 
 notifications:
 email:

gpac-1.0.1.tar.gz/Changelog -> gpac-2.0.0.tar.gz/Changelog Changed

@@ -1,4 +1,98 @@
-10/09/2020: GPAC 1.0.1
+22/02/2022: GPAC 2.0
+
+## Adaptive Streaming
+- Low Latency HLS (LL-HLS, generation and playback)
+- Custom forwarding modes of DASH reader, allowing for example to encrypt/decrypt a live DASH/HLS session
+- DASHing now possible using inband cues (generated by flist, dashin or dasher filters)
+- Cue-generation only mode for dasher
+- HLS/DASH signaling of intra-only representations
+- playback improvements for SRD (HEVC tiling and independent streams)
+- CMAF-compatible signaling
+- PPS injection for inband parameter set modes
+- Improved SmoothStreaming support
+- DASH period continuity support (from playlists or reframer)
+- DASH MPD Chaining support
+- Text segments in native format (WebVTT, TTML) in dasher
+- User tags injection for HLS master and variant playlists
+
+## Image File Format (HEIF)
+- Grid creation and other derived images
+- Encryption
+- Time range in -add-image
+- Item to sample data reference (no copy)
+- Item to item data reference (no copy)
+- Generic auxiliary image tagging
+- Image replacement in HEIF collection
+- AV1 (AVIF) and VVC support
+
+## MP4Box
+- In-place editing (no file remultiplexing) 
+- Improved splitting, including sample-accurate split
+- ISOBMFF edit lists modification through :edits and -edits options
+- Track extraction from non ISOBMFF sources in MP4Box
+- Most import options can now be applied on an existing ISOBMF file or track
+- Multiple filter chains per source in -dash or -add modes
+- Chunk interleaving dumper
+
+## Filters
+- Simplified gpac command line (backward compatible syntax) avoiding links directives for common cases
+- Added avmix, a playlist-based audio video mixer/compositor with GPU or software rendering
+- Python bindings for filter session
+- NodeJS bindings for filter session
+- Custom HAS adaptation algorithms (JS, Python and NodeJS)
+- Custom Remotery callbacks (JS, Python and NodeJS)
+- Added avgen, a simple counter generation
+- Splicing support in playlists: raw and compressed domain, vod and live splicing
+- Tile splitting now available as a filter 
+- Added restamp, a stream timestamp rewriter filter
+- Added bssplit and bsagg, compressed bitstream splitter and aggregator filters
+- Aspect ratio support in rescaler (ffsws)
+- Raw (uncompressed) modes for flist and reframer
+- Flip and rotate in vout
+- Simple UI for vout to test seeking and speed modes
+- Improved color space support in rendering (OpenGL only)
+- Improved round-trip audio decode
+- Improved audio resampler
+- Added back old arch compositor features (TEMI support, HEVC tiling JS monitoring, MPEG-4 SegmentDescriptor) 
+- Reading back frame interface data (GPU, decoder mem) in JS or Python sink filters
+- Memory storage in httpout server file sink
+- FileIO wrapper available in QJS, Python and NodeJS
+
+## Protocols
+- HTTP/2 (client and server) through nghttp2
+- ROUTE multiplexer and low-latency ROUTE (mux and demux)
+
+## Media Formats
+- Improved MPEG-H audio mux/demux/dashing
+- VVC parsing, inspecting, mux/demux (ISOBMFF, M2TS), RTP, DASH and encryption
+- VUI color info rewrite for AVC, HEVC and VVC (mp4box and bsrw filter)
+- Dolby TrueHD
+- DolbyVision muxing
+- Improved multichannel AAC (>=8) support 
+- Improved raw video in ISOBMFF support
+- Bitstream dumping for inspect analyze mode
+- Improved TTML support: metrics, image embedding (IMSC1), TTML sample merging while exporting, subtitle zero in TTML
+- YouTube VR meta-data
+- yuv4mpeg format read/write
+- Extended NHML syntax for properties, reconfiguration, subsamples and sample auxiliary data
+
+## Encryption
+- Multi-key per sample encryption
+- HLS full segment encryption and decryption
+- Per-segment or per-period key roll
+- Master/leaf key schemes
+
+## Misc
+- Improved HTTP rate limiter and chunk-transfer rate estimator
+- Cleanup of mod-dirs and js-dirs usage, JS filters can now be included in the default available filters
+- Support for windows long path
+- Moved to latest QuickJS (2021-03-27)
+- Added QJS-libc modules, support for exec/waitpid/kill and Workers on most platforms
+- Support for FFmpeg 4.4 +
+- many bug fixes, improvements and security patches
+
+
+# 10/09/2020: GPAC 1.0.1
 This release fixes build and installation issues in 1.0.0, as well as various bugs introduced during the migration to the filters architecture.
 
 It also adds several small features:
@@ -11,7 +105,7 @@
 - core tools exposed as JS module (file io, bitstream, etc ...)
 - android fixes
 
-16/06/2020: GPAC 1.0
+# 16/06/2020: GPAC 1.0
  - Complete rewrite of GPAC streaming core:
     * addition of a filter-based architecture, used by MP4Client and MP4Box.
     * moving all decoders and demuxer plugins of MP4Client and most of MP4Box import/export code as filters for this new architecture,
@@ -34,7 +128,7 @@
     * HTTP output (client and server), supporting low latency DASH access
     * Ad-hoc stream format called GSF to allow serialization to file, pipe or socket of a session (for distributed filter chains), supporting AES-128 CBC encryption.
 - Raw audio (PCM) and video (RGB, YUV) reframers and exporters
-- HEVC tile spliting and merging filters
+- HEVC tile splitting and merging filters
 - Compositor is a standalone filter (SVG/BIFS/VRML graphics in a filter chain)
 - Image encoding support through libjpg and libpng
 - Full FFMPEG support:
@@ -176,7 +270,7 @@
     * Moved dektec output to matrix API, added SDI clipping
     * Added temi periodic toggle and manual toggle in MP42TS
 
-26/04/2017: GPAC 0.7.1
+# 26/04/2017: GPAC 0.7.1
  - Full changelog at https://github.com/gpac/gpac/wiki/GPAC-0.7.0
  - Many security fixes (static compile and fuzzing through [AFL](http://lcamtuf.coredump.cx/afl/), always ongoing)
  - Colorized log.
@@ -207,10 +301,10 @@
  - Android: new File Manager.
  - Import of TTML via NHML according to MPEG-4 part 30 improved.
 
-19/02/2016: GPAC 0.6.0
+# 19/02/2016: GPAC 0.6.0
   Many things added, improved and fixed - see https://github.com/gpac/gpac/releases/tag/v0.6.0
 
-25/05/2012: GPAC 0.5.0
+# 25/05/2012: GPAC 0.5.0
   - MPEG-DASH and Apple HLS support in GPAC Clients
   - MPEG-DASH segmenter for ISO files and MPEG-2 TS in MP4Box
   - MP42TS generator now supports HLS output
@@ -228,7 +322,7 @@
   - more work on GUI
   - and many many fixes and improvements in players and MP4Box 
 
-02/12/08: GPAC 0.4.5
+# 02/12/08: GPAC 0.4.5
   - Support for AC3 in ISO Media, AC3 decoder (liba52) RTP hinting
   - Support for MediaAccessEvent (spec still under development ??)
   - Added support for user extensions (global class only) in JS through modules - cf gpac_js for sample code.
@@ -284,7 +378,7 @@
   - committed patch fixing VobSub extraction bug
   - added support for http playback in ffmpeg demuxer
   
-31/05/07: GPAC 0.4.4
+# 31/05/07: GPAC 0.4.4
   - Added support for XMLHttpRequest for both VRML/MPEG-4 and SVG. All methods should be supported, but only GET/HEAD have been tested
   - Added a basic subset of DOM Core for xml doc (XMLHttpRequest, SVG) and moved the uDOM implementation in it.
   - Added support for SVG focus & navigation in 2D renderer
@@ -338,7 +432,7 @@
   - major speed improvements in MPEG-4/VRML scripts and SVG uDOM regarding node creation
   - and a lot more bug fixes...
 
-21/07/06: GPAC 0.4.2
+# 21/07/06: GPAC 0.4.2
   - commit of GPAX (GPAC ActiveX) - controller only works in IE and ActiveX control tester for now.
   - API changes to Osmozilla to keep in sync with GPAX. Sample html file can be found in applications/GPAX.
      - both plugin now support browser navigation (ie link to html within MPEG-4 content)
@@ -374,7 +468,7 @@
     - cf configuration.html or man gpac for more info on progressive loading control
   - added 'define' support in BT - to use it just do:
      #define symbol blab labl a
-    and reuse the symbol in the BT text. This may be quite buggy, but it can be usefull
+    and reuse the symbol in the BT text. This may be quite buggy, but it can be useful
   - support for Scene Carousel in hinters, core and rtp reassembler. Currently only BIFS and BIFS+AV can be use the scene carousel, carouseling of 
     static data (eg images) is not supported. The OD data must be embedded in the IOD a la ISMA.
   - added FPS and size info dumping for MPEG and AVI file import (MP4Box -info file.mpg)
@@ -402,7 +496,7 @@
     - basic conditional processing (switch)
     - SMIL anim events (begin, end, restart)
   - added PAR modification support to MP4Box (import time and file based)
-  - improved precision of IsoMedia file spliting
+  - improved precision of IsoMedia file splitting
   - added NHML import/export. NHML is an XML representation of the NHNT file, with add-ons and a more flexible way of integrating media. Doc to come on web site
   - clean-up of 2D direct rendering mode: 
       * no more bounds tracking for less memory usage
@@ -461,7 +555,7 @@
   - fixes for gpac compilation on 64 bits platforms
   - fixed bugs related to cache in file downloader
   
-03/08/05: GPAC 0.4.0 RC2
+# 03/08/05: GPAC 0.4.0 RC2
   - fixed Invalid versioning of previous release (was still 0.4.0-DEV...)
   - fixed MinGW compilation
   - fixed MP4Box handling of full MSDOS paths (C:\)
@@ -471,7 +565,7 @@
   - fixed MP4A-LATM support at client side
   - fixed X11 module in embedded mode (should work well with both Osmo4/wx and Osmozilla)
   
-28/07/05: GPAC 0.4.0 release
+# 28/07/05: GPAC 0.4.0 release
   ** GPAC is now licensed under LGPL. **
   Massive code rewrite and repository reorganization in order to comply to some base coding style (cf gpac/doc/CODING_STYLE) have taken place 
   since previous release. Documentation is still a work in progress.
@@ -499,8 +593,8 @@
   - misc fixes in MP4Box option parsing, in RTP multicast setup
   - Osmozilla should now be much more stable on Win32 - Linux version to come.
 
-  
-20/06/05: GPAC 0.3.0 release
+
+# 20/06/05: GPAC 0.3.0 release
   - fixed bug in 4GB file writing in interleaving mode
   - fixed bug in absolute path usage in MP4Box
   - added -cat file*.mpg syntax support
@@ -517,7 +611,7 @@
   - misc fixes in ffmpeg decoder and MP4Box ISMA for PAR - this is disabled by default due to some unsolved crashes, cf gpac/doc/configuration.html or man gpac.s
   - misc updates in MP4Box meta handling for item extraction.
   - fixed MPEG-2 aac importing and info dumping
-  - fixed 3GPP text display bug when stoping and changing an animationStream using a 3GPP text object.
+  - fixed 3GPP text display bug when stopping and changing an animationStream using a 3GPP text object.
   - fixed AVC/H264 HP parsing
   - added BIFS track visual size info at BT/XMT encoding stage
   - MOVED FFMPEG INCLUDE FILES TO LATEST CVS VERSION to support AVC/H264 HP decoding
@@ -533,7 +627,7 @@
 
 	FROM THIS DAY ON, ALL WORK ADDED TO GPAC IS COPYLEFT ENST
 
-15/05/05: 
+# 15/05/05: 
 	- Updated makefiles and configure for MacOSX support
 	- commit of GPAC fixed-point version - may not be completely stable yet :)
 	- changed all project files location for soon-to-come EVC4 and Visual .NET support
@@ -565,7 +659,7 @@
 			** Streams with different sample descriptions are imported as distinct tracks **
 	- fixed bugs in OD and IPMPX parsers (ipmpDescrPtr and IPMP_ToolID)
 
-30/03/05: GPAC 0.2.4 release
+# 30/03/05: GPAC 0.2.4 release
 	- Added TeXML import (QT XML format for 3GPP text)
 	- Added SRT extraction for text tracks.
 	- Added SUB subtitles support (SUB->3GPP text, SUB->BIFS)
@@ -611,7 +705,7 @@
 	- fixed raw aac export bug
 	- fixed DIV5 import issues with PLs
 
-05/01/05: GPAC 0.2.3 release
+# 05/01/05: GPAC 0.2.3 release
 	- new regression tests (X3D and some other features)
 	- MPEG-4 playback from BT/XMT now supports proper startTime/stopTime behaviour
 	- found a port of XVID for WinCE/ARM, removed OpenDivX from distribution (seemed no longer maintained). This XviD port is BTW much faster & more reliable than old OpenDivx
@@ -662,7 +756,7 @@
 		Need some more testing before filing a request to mp4ra.org.
 		Streaming possible as MPEG-4 streams, Vorbis RTP packetizer still to be done. 
 	
-09/11/04: GPAC 0.2.2 release
+# 09/11/04: GPAC 0.2.2 release
 	- Xiph OGG demuxer: supports file, http download (not tested) and icecast servers.
 	- Xiph Vorbis decoder
 	- Xiph Theora support (should work with fluendo but I can't get any data from the server...)
@@ -701,7 +795,7 @@
 	- plethora of bug fixes
 
 
-15/10/04: GPAC 0.2.1 release
+# 15/10/04: GPAC 0.2.1 release
 	- massive fixes in javascript (assignment was only 50% working), new faster, less memory-hungry implementation (and Othello reg test now passes!!)
 	- CreateVrmlFromScript support for VRML content.
 	- collision detection
@@ -752,7 +846,7 @@
 	- BT parser supports basic VRML (uncompressed .WRL should now be imported fine)
 	- plethora of bug fixes
 	
-02/09/04: GPAC 0.2.0 release
+# 02/09/04: GPAC 0.2.0 release
 	- updated cfg file doc man pages & makefiles
 	- massive re-arch of renderer(s) to be able to load at run-time either 2D or 3D renderer, instead of static linking
 	- new 2D and 3D renderers
@@ -791,10 +885,10 @@
 		* updated 2D and 3D renderer accordingly
 	- added support for rectangular textures in GL (most graphic cards support this, at least on win32)
 	- added frustum culling
-	- added SFTime->SFString formating in valuator (current MPEG-4 COR)
+	- added SFTime->SFString formatting in valuator (current MPEG-4 COR)
 	- plethora of bug fixes
 
-11/05/04: JLF: dev version 0.1.9
+# 11/05/04: JLF: dev version 0.1.9
 	- changed source code architecture: rendering code is now in a dedicated static link outside libm4systems
 	- intergated draft 3D renderer:
 			- Most 2D features have been ported to the new renderer (missing: viewport, colorTransform and gradients)
@@ -812,7 +906,7 @@
 	- uploaded ultra basic SWF convertor (so that it doesn't get lost on my hard drive:)
 	- plethora of bug fixes
 
-28/04/04: GPAC Release 0.1.4
+# 28/04/04: GPAC Release 0.1.4
 	- MP4Box avi import fixes (key frames, VOL removal, n-VOP handling)
 	- Fixed MP4 and NHNT importers (visual tracks sizes)
 	- MP4Box avi extractor for visual tracks
@@ -828,7 +922,7 @@
 	- better "end of presentation" support
 	- plethora of bug fixes
 		
-18/04/04: JLF: GPAC Release 0.1.3 rc2
+# 18/04/04: JLF: GPAC Release 0.1.3 rc2
 	- MP4Box default hinting is now QT compatible - b-frame hinting support
 	- DecodingBuffer and CompositionMemory occupancey in ODInfo
 	- layout text splitting (word boundaries only)
@@ -852,7 +946,7 @@
 	- moved all windowing architecture to the video output plugins (keyboard and mouse events, WM messages) in order to support SDL, moved old input functions to new event model
 	- modified jconfig.h to support both win32 and MinGW.
 	- updated V4Studio to work with new event/windowing architecture (work with SDL and DX)
-	- UDP autoconfig option (if no UDP traffic is recieved, restart with TCP)
+	- UDP autoconfig option (if no UDP traffic is received, restart with TCP)
 	- moved to FAAD2.1 (CVS), fixed faad2 compil on MinGW & winCE
 	- cleaned up install docs
 	- added support for SDL with software YUV->RGB and software stretching
@@ -865,7 +959,7 @@
 	- added support for xvid 1.0.0
 	- plethora of bug fixes
 
-28/01/04: GPAC Release 0.1.2
+# 28/01/04: GPAC Release 0.1.2
 	- codec selection in Osmo4 GUI
 	- PocketPC installer
 	- OpenDivx plugin
@@ -900,7 +994,7 @@
 	- AMR NB support (payload parsing and 3GP codec plugin)
 	- plethora of bug fixes
 		
-20/11/03: GPAC Release 0.1.1 
+# 20/11/03: GPAC Release 0.1.1 
 	- 3GP rtsp streaming support
 	- GPAC uses latest stable extra libs: faad2 2.0rc3, FreeType 2.1.5 and mad 0.15.0b, and dev version (20031117) of xvid
 	- support for MediaSegment ranges ("#seg+" and "#seg1-seg2") in MediaControl/MediaSensor
@@ -937,5 +1031,5 @@
 	- InputSensor (keySensor, Mouse and StringSensor)
 	- plethora of bug fixes
 	
-version 0.1.0:
+# version 0.1.0:
 	initial release

gpac-1.0.1.tar.gz/Makefile -> gpac-2.0.0.tar.gz/Makefile Changed

@@ -12,13 +12,14 @@
 all:	version
 	$(MAKE) -C src all
 	$(MAKE) -C applications all
-ifneq ($(MP4BOX_STATIC),yes)
+ifneq ($(STATIC_BINARY),yes)
 	$(MAKE) -C modules all
 endif
 
 
 config.mak:
-	./configure
+	@echo "running default configure"
+	@./configure
 
 
 GITREV_PATH:=$(SRC_PATH)/include/gpac/revision.h
@@ -116,13 +117,15 @@
 	$(MAKE) install-lib
 
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
-	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/gpac$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin"
+	if [ -f bin/gcc/MP4Box$(EXE_SUFFIX) ] ; then \
+	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/gpac$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin" ; \
+	fi
 ifeq ($(DISABLE_ISOFF),no)
 	if [ -f bin/gcc/MP4Box$(EXE_SUFFIX) ] ; then \
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Box$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin" ; \
 	fi
 endif
-ifneq ($(MP4BOX_STATIC),yes)
+ifneq ($(STATIC_BINARY),yes)
 ifeq ($(DISABLE_PLAYER),no)
 	if [ -f bin/gcc/MP4Client$(EXE_SUFFIX) ] ; then \
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Client$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin" ; \
@@ -130,7 +133,7 @@
 endif
 endif
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)/$(moddir)"
-ifneq ($(MP4BOX_STATIC),yes)
+ifneq ($(STATIC_BINARY),yes)
 	$(INSTALL) bin/gcc/gm_*$(DYN_LIB_SUFFIX) "$(DESTDIR)$(prefix)/$(lib_dir)/$(moddir)" || true
 	$(INSTALL) bin/gcc/gf_*$(DYN_LIB_SUFFIX) "$(DESTDIR)$(prefix)/$(lib_dir)/$(moddir)" || true
 ifeq ($(CONFIG_OPENHEVC),yes)
@@ -151,34 +154,39 @@
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/extensions"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/shaders"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/scripts"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/res/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/res/
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/res/gpac_cfg_test.mp4 $(DESTDIR)$(prefix)/share/gpac/res/
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/res/gpac.png $(DESTDIR)$(prefix)/share/gpac/res/
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/python"
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/vis"
 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/default.cfg $(DESTDIR)$(prefix)/share/gpac/
 
 ifneq ($(CONFIG_DARWIN),yes)
-	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/pixmaps"
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/icons/hicolor/128x128/apps"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/applications"
 
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/res/gpac.png "$(DESTDIR)$(prefix)/share/pixmaps/"
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/res/gpac.png "$(DESTDIR)$(prefix)/share/icons/hicolor/128x128/apps/"
 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)$(prefix)/share/applications/"
 endif
 
 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/"
 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gui/gui.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gui/gwlib.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/scripts/webvtt-renderer.js "$(DESTDIR)$(prefix)/share/gpac/scripts/"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/scripts/ttml-renderer.js "$(DESTDIR)$(prefix)/share/gpac/scripts/"
 
 
 ifeq ($(CONFIG_DARWIN),yes)
 	cp $(SRC_PATH)/share/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/"
 	cp -R $(SRC_PATH)/share/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/"
 	cp $(SRC_PATH)/share/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/"
+	cp -R $(SRC_PATH)/share/scripts/* "$(DESTDIR)$(prefix)/share/gpac/scripts/"
+	cp -R $(SRC_PATH)/share/python/* "$(DESTDIR)$(prefix)/share/gpac/python/"
+	cp $(SRC_PATH)/share/res/* "$(DESTDIR)$(prefix)/share/gpac/res/"
+	cp -R $(SRC_PATH)/share/vis/* "$(DESTDIR)$(prefix)/share/gpac/vis/"
 else
 	cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/gui/icons/* $(DESTDIR)$(prefix)/share/gpac/gui/icons/
 	cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/gui/extensions/* $(DESTDIR)$(prefix)/share/gpac/gui/extensions/
 	cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/shaders/* $(DESTDIR)$(prefix)/share/gpac/shaders/
+	cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/scripts/* $(DESTDIR)$(prefix)/share/gpac/scripts/
+	cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/python/* $(DESTDIR)$(prefix)/share/gpac/python/
+	cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/res/* $(DESTDIR)$(prefix)/share/gpac/res/
+	cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/vis/* $(DESTDIR)$(prefix)/share/gpac/vis/
 endif
 
 lninstall:
@@ -189,7 +197,7 @@
 ifeq ($(DISABLE_ISOFF),no)
 	ln -sf $(BUILD_PATH)/bin/gcc/MP4Box$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/MP4Box$(EXE_SUFFIX)
 endif
-ifneq ($(MP4BOX_STATIC),yes)
+ifneq ($(STATIC_BINARY),yes)
 ifeq ($(DISABLE_PLAYER),no)
 	ln -sf $(BUILD_PATH)/bin/gcc/MP4Client$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/MP4Client$(EXE_SUFFIX)
 endif
@@ -198,13 +206,17 @@
 	ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(lib_dir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX)
 	ln -sf $(DESTDIR)$(prefix)/$(lib_dir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(lib_dir)/libgpac.$(VERSION_MAJOR)$(DYN_LIB_SUFFIX)
 	ln -sf $(DESTDIR)$(prefix)/$(lib_dir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(lib_dir)/libgpac$(DYN_LIB_SUFFIX)
+
+	ln -s $(BUILD_PATH)/bin/gcc/ $(DESTDIR)$(prefix)/$(lib_dir)/gpac
+	ln -s $(SRC_PATH)/share/ $(DESTDIR)$(prefix)/share/gpac
 else
 	ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(lib_dir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
 	ln -sf $(DESTDIR)$(prefix)/$(lib_dir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(lib_dir)/libgpac.so.$(VERSION_MAJOR)
 	ln -sf $(DESTDIR)$(prefix)/$(lib_dir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(lib_dir)/libgpac.so
+	ln -s $(BUILD_PATH)/bin/gcc/ $(DESTDIR)$(prefix)/$(lib_dir)/gpac
 
 	ln -s $(SRC_PATH)/share/ $(DESTDIR)$(prefix)/share/gpac
-	ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)/usr/share/pixmaps/gpac.png
+	ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpac.png
 	ln -sf $(SRC_PATH)/share/gpac.desktop $(DESTDIR)/usr/share/applications/
 
 ifeq ($(DESTDIR)$(prefix),$(prefix))
@@ -225,16 +237,18 @@
 	rm -rf $(DESTDIR)$(prefix)/$(man_dir)/man1/gpac.1
 	rm -rf $(DESTDIR)$(prefix)/$(man_dir)/man1/gpac-filters.1
 	rm -rf $(DESTDIR)$(prefix)/share/gpac
-	rm -rf $(DESTDIR)$(prefix)/share/pixmaps/gpac.png
+	rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/128x128/apps/gpac.png
 	rm -rf $(DESTDIR)$(prefix)/share/applications/gpac.desktop
 
 
 installdylib:
-ifneq ($(MP4BOX_STATIC),yes)
+ifneq ($(STATIC_BINARY),yes)
 
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
 
 ifeq ($(CONFIG_WIN32),yes)
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
+
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll.a $(DESTDIR)$(prefix)/$(lib_dir)
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(DESTDIR)$(prefix)/bin
 else

gpac-1.0.1.tar.gz/README.md -> gpac-2.0.0.tar.gz/README.md Changed

@@ -24,25 +24,26 @@
 
 
 # GPAC Introduction
-Current version: 1.0.1
+Latest Release: 2.0
 
 GPAC is an open-source multimedia framework focused on modularity and standards compliance.
-GPAC provides tools to process, inspect, package, stream playback and interact with media content. Such content can be any combination of audio, video, subtitles, metadata, scalable graphics, encrypted media, 2D/3D graphics and ECMAScript.
-GPAC is best-known for its wide MP4 capabilities and is popular among video enthusiasts, academic researchers, standardization bodies, and professional broadcasters.
+GPAC provides tools to process, inspect, package, stream, playback and interact with media content. Such content can be any combination of audio, video, subtitles, metadata, scalable graphics, encrypted media, 2D/3D graphics and ECMAScript.
+GPAC is best-known for its wide MP4/ISOBMFF capabilities and is popular among video enthusiasts, academic researchers, standardization bodies, and professional broadcasters.
 
 For more information, visit [GPAC website](http://gpac.io)
 
 GPAC is distributed under the LGPL v2.1 or later, and is also available, for most of it, under a [commercial license](https://www.gpac-licensing.com).
 
-Please cite our work in your research:
-- GPAC Filters: https://doi.org/10.1145/3339825.3394929
-- GPAC: https://doi.org/10.1145/1291233.1291452
+Please ! _cite_ ! our work in your research:
+- "GPAC Filters" (https://doi.org/10.1145/3339825.3394929) for recent versions (0.9 or above) 
+- "GPAC: open source multimedia framework" (https://doi.org/10.1145/1291233.1291452) for older versions.
+
 
 # Features
 
 GPAC can process, analyse, package, stream, encode, decode and playback a wide variety of contents. Selected feature list:
 - Audio: MPEG audio (mp1/2/3, aac), AC3, E-AC3, Opus, FLAC, …
-- Video: MPEG 1 / 2 / 4 (H264/AVC) / H (HEVC), AV1, VP9, Theora, ...
+- Video: MPEG 1 / 2 / 4 (H264/AVC) / H (HEVC), VVC, AV1, VP9, Theora, ...
 - Subtitles: WebVTT, TTML (full, EBU-TTD, …), 3GPP/Apple Timed Text, …
 - Encryption: CENC, PIFF, ISMA, OMA, ...
 - Containers: MP4/fMP4/CMAF/Quicktime MOV/ProRes MOV, AVI, MPG, OGG, MKV, ...
@@ -53,27 +54,31 @@
 - 3D support (360 videos, WebGL JS filters…)
 - Inputs: microphone, camera, desktop grabbing
 - Highly configurable media processing pipeline
+- Python and NodeJS bindings
 
 Features are encapsulated in processing modules called filters:
 - to get the full list of available features, you can run the command line `gpac -h filters` or check [filters' wiki](https://github.com/gpac/gpac/wiki/Filters).
-- to get the full list of playback features, check [our wiki](https://github.com/gpac/gpac/wiki/Player-Features).
+- to get the full list of playback features, check [the dedicated wiki page](https://github.com/gpac/gpac/wiki/Player-Features).
 
 
 # Tools
 
 ## MP4Box
-MP4Box is a multi-purpose MP4 file manipulation for the prompt, featuring media importing and extracting, file inspection, DASH segmentation, RTP hinting, ... See `MP4Box -h`, `man MP4Box` or [our wiki](https://wiki.gpac.io/MP4Box-Introduction).
+MP4Box is a multi-purpose MP4 file manipulation for the prompt, featuring media importing and extracting, file inspection, DASH segmentation, RTP hinting, ... See `MP4Box -h`, `man MP4Box` or [our wiki](https://wiki.gpac.io/MP4Box).
 
 
 ## gpac 
-As of version 0.9.0, GPAC includes a filter engine in charge of stream management and used by most applications in GPAC - [read this post](https://wiki.gpac.io/Rearchitecture) for more dicussion on how this impacts MP4Box and MP4Client.
+GPAC includes a filter engine in charge of stream management and used by most applications in GPAC - [read this post](https://wiki.gpac.io/Rearchitecture) for more discussion on how this impacts MP4Box and MP4Client.
 The gpac application is a direct interface to the filter engine of GPAC, allowing any combinaison of filters not enabled by other applications. See `gpac -h`, `man gpac`, `man gpac-filters` or [our wiki](https://wiki.gpac.io/Filters) for more details.
 
-## MP4Client
+## MP4Client (deprecated)
 MP4Client is a media player built upon libgpac, featuring a rich media interactive composition engine with MPEG-4 BIFS, SVG, VRML/X3D support.
 For GPAC configuration instruction, check `MP4Client -h` ,  `man MP4Client` or [our wiki](https://wiki.gpac.io/mp4client).
 
-
+__Warning__
+MP4Client is deprecated and will be removed in the next release. Start modifying your scripts:
+- replace `MP4Client URL` with `gpac -play URL` (audio/video playback only) or `gpac -mp4c URL` (if compositor is needed)
+- replace `MP4Client -gui URL` with `gpac -gui URL`.
 
 # Getting started
 ## Download
@@ -84,33 +89,30 @@
 ## Documentation
 The general GPAC framework documentation is available on [wiki.gpac.io](https://wiki.gpac.io), including [HowTos](https://github.com/gpac/gpac/wiki/Howtos).
 
-GPAC tools are mostly wrappers around an underlying library called libgpac which can easily be embedded in your projects. The libgpac developer documentation is available at [doxygen.gpac.io](https://doxygen.gpac.io), including documentation of [JS APIs](https://doxygen.gpac.io/group__jsapi__grp.html).
+GPAC tools are mostly wrappers around an underlying library called libgpac which can easily be embedded in your projects. The libgpac developer documentation is available at [doxygen.gpac.io](https://doxygen.gpac.io), including documentation of [JS APIs](https://doxygen.gpac.io/group__jsapi__grp.html), [Python APIs](https://doxygen.gpac.io/group__pyapi__grp.html) and [NodeJS APIs](https://doxygen.gpac.io/group__nodejs__grp.html).
 
 
 ## Testing
-GPAC has a test suite exercicing most features of the framework. The test suite is in a separate repository [https://github.com/gpac/testsuite/](https://github.com/gpac/testsuite/), but is available as a submodule of the GPAC main repository. To initialize the testsuite submodule, do `git submodule update --init`.
+GPAC has a test suite exercising most features of the framework. The test suite is in a separate repository [https://github.com/gpac/testsuite/](https://github.com/gpac/testsuite/), but is available as a submodule of the GPAC main repository. To initialize the testsuite submodule, do `git submodule update --init`.
 
 For more details on the test suite, read [this page](https://github.com/gpac/gpac/wiki/GPAC_tests) and check the [testsuite readme](https://github.com/gpac/testsuite).
 
 Per-commit [build](https://buildbot.gpac.io/) and [tests results](https://tests.gpac.io) are available.
 
 
-## Support 
+## Support, ongoing tasks and bugs
+
 Please use [github](https://github.com/gpac/gpac/issues) for feature requests and bug reports. When filing a request there, please tag it as _feature-request_.	
 
 ## Contributing
 A complex project like GPAC wouldn’t exist and persist without the support of its community. Please contribute: a nice message, supporting us in our communication, reporting issues when you see them… any gesture, even the smallest ones, counts. 
 
-If you use GPAC in your published research, ! _please cite_ ! using
-- [this paper](https://dl.acm.org/doi/abs/10.1145/3339825.3394929) for recent versions (0.9 or above) 
-- [this paper](https://dl.acm.org/doi/abs/10.1145/1291233.1291452) for legacy versions (0.8 or below).
-
-If you want to contribute to GPAC, you can find ideas at [GSoC page](https://gpac.wp.imt.fr/jobs/google-summer-of-code-ideas/) or look for ‘good first issue’ on  [github](https://github.com/gpac/gpac/issues). In any doubt please feel free to [contact us](mailto:contact@gpac.io).
+If you want to contribute to GPAC, you can find ideas at [GSoC page](https://gpac.wp.imt.fr/jobs/google-summer-of-code-ideas/) or look for a [good first issue](https://github.com/gpac/gpac/labels/good%20first%20issue). In any doubt please feel free to [contact us](mailto:contact@gpac.io).
 
 # Team
 GPAC is brought to you by an experienced team of developers with a wide track-record on media processing. 
 
-The project is mainly developed at [Telecom Paris](https://www.telecom-paris.fr/), in the [MultiMedia group](http://www.tsi.telecom-paristech.fr/mm/), with the help of many [great contributors](https://github.com/gpac/gpac/graphs/contributors)
+The project is mainly developed in the MultiMedia group of [Telecom Paris](https://www.telecom-paris.fr/) with the help of many [great contributors](https://github.com/gpac/gpac/graphs/contributors).
 
 GPAC has a peculiar story: started as a startup in NYC, GPAC gained traction from research and a nascent multimedia community as it was open-sourced in 2003. Since then we have never stopped transforming GPAC into a useful and up-to-date project, with many industrial R&D collaborations and a community of tens of thousands of users. This makes GPAC one of the few open-source multimedia projects that gathers so much diversity.
 
@@ -118,17 +120,15 @@
 # Roadmap
 Users are encouraged to use the latest tag or the master branch.
 
-The previous v0.8.X release (the last one using the legacy architecture) is LTS until 30/06/2021. Important bug fixes will be backported but new features won’t. API compatibility between both versions should make the migration easy. If not please [file a bug](https://github.com/gpac/gpac/issues).
+The v0.8.X release (the last one using the legacy architecture) is officially deprecated.
 
-## Ongoing tasks and bugs
-Please use [github](https://github.com/gpac/gpac/issues) for feature requests and bug reports. When filing a request there, please tag it as feature-request.	
-
-## V1.1.0
+## V2.X
 Targets:
-- [ ] add kvazaar/other encoders support?
-- [ ] improve remotery support
-- [ ] more JS filters
-- [ ] filters scriptable through other languages (python) ?
-- [ ] move input sensors to filter ?
-- [ ] fixed features disabled during rearchitecture or drop them (FILTER_FIXME macro)
-- [ ] move Android client to filters
+- [ ] drop MP4Client and GF_Terminal API
+- [ ] User authentication for HTTP and RTSP servers
+- [ ] DASH event support
+- [ ] Web integration (emscripten, Remotery UI)
+- [ ] GUI cleanup ?
+
+
+

gpac-2.0.0.tar.gz/SECURITY.md Added

@@ -0,0 +1,22 @@
+# Security Policy
+
+## Email Contact
+
+security@gpac.io
+
+## Supported Versions
+
+GPAC is under constant development using a continuous integration and deployment process. As a consequence the `HEAD` of the `master` branch is always considered as the _current version_ at any point. 
+
+Thus only reports that are confirmed reproducible on the current `HEAD` of the `master` branch will receive a patch. 
+
+
+## Reporting a Vulnerability
+
+Vulnerabilities (as well as other bugs) should be reported directly using the [Github issue trakcer](https://github.com/gpac/gpac/issues). 
+
+Please include all information needed to reproduce the issue, including a sample file. 
+
+Sample files can be joined directly via github (preferred way) or uploaded to the [GPAC file drop](https://www.mediafire.com/filedrop/filedrop_hosted.php?drop=eec9e058a9486fe4e99c33021481d9e1826ca9dbc242a6cfaab0fe95da5e5d95).
+
+However if public disclosure seems unreasonable, or if confidential information needs to be shared, you can contact security@gpac.io for private disclosure.

gpac-1.0.1.tar.gz/applications/Makefile -> gpac-2.0.0.tar.gz/applications/Makefile Changed

gpac-1.0.1.tar.gz/applications/deprecated/mp42ts/main.c -> gpac-2.0.0.tar.gz/applications/deprecated/mp42ts/main.c Changed

gpac-1.0.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAXPlugin.cpp -> gpac-2.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAXPlugin.cpp Changed

gpac-1.0.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Options.cpp -> gpac-2.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Options.cpp Changed

gpac-1.0.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/Options.cpp -> gpac-2.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/Options.cpp Changed

gpac-1.0.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/Playlist.cpp -> gpac-2.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/Playlist.cpp Changed

gpac-1.0.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxOsmo4.cpp -> gpac-2.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxOsmo4.cpp Changed

gpac-1.0.1.tar.gz/applications/generators/MPEG4/main.c -> gpac-2.0.0.tar.gz/applications/generators/MPEG4/main.c Changed

gpac-1.0.1.tar.gz/applications/generators/MPEG4/templates5.txt -> gpac-2.0.0.tar.gz/applications/generators/MPEG4/templates5.txt Changed

gpac-1.0.1.tar.gz/applications/generators/MPEG4/templates9.txt -> gpac-2.0.0.tar.gz/applications/generators/MPEG4/templates9.txt Changed

gpac-1.0.1.tar.gz/applications/generators/SVG/main.c -> gpac-2.0.0.tar.gz/applications/generators/SVG/main.c Changed

gpac-1.0.1.tar.gz/applications/generators/WebGLGen/main.c -> gpac-2.0.0.tar.gz/applications/generators/WebGLGen/main.c Changed

@@ -205,7 +205,7 @@
 		else if (strstr(fname, "4fv")) vlen = 4;
 
 		if (!strcmp(native_type, "s32 *"))
-			fprintf(ifce_c, "\tif (!WGL_LOAD_INT32_VEC(ctx, argv[%d], (s32 **) &%s, &%s_size, %d)) return js_throw_err(ctx, WGL_INVALID_VALUE);;\n", idx, arg_name, arg_name, vlen);
+			fprintf(ifce_c, "\tif (!WGL_LOAD_INT32_VEC(ctx, argv[%d], (s32 **) &%s, &%s_size, %d)) return js_throw_err(ctx, WGL_INVALID_VALUE);\n", idx, arg_name, arg_name, vlen);
 		else {
 			Bool is_matrix = GF_FALSE;
 			if (strstr(fname, "Matrix")) is_matrix = GF_TRUE;
@@ -254,7 +254,7 @@
 	}
 }
 /*all functions that cannot be mapped directly due to to heavy syntax pacthing or our own hacking*/
-static const char *not_autogen_funcs = "getContextAttributes,isContextLost,getSupportedExtensions,getExtension,getBufferParameter,getParameter,getFramebufferAttachmentParameter,getProgramParameter,getRenderbufferParameter,getShaderParameter,getShaderPrecisionFormat,getProgramInfoLog,getShaderParameter,getShaderInfoLog,getShaderSource,getTexParameter,getUniform,getVertexAttrib,getVertexAttribOffset,readPixels,shaderSource,texImage2D,texSubImage2D,useProgram,activeTexture,bindTexture,getUniformLocation,createTexture,bindFramebuffer";
+static const char *not_autogen_funcs = "getContextAttributes,isContextLost,getSupportedExtensions,getExtension,getBufferParameter,getParameter,getFramebufferAttachmentParameter,getProgramParameter,getRenderbufferParameter,getShaderParameter,getShaderPrecisionFormat,getProgramInfoLog,getShaderParameter,getShaderInfoLog,getShaderSource,getTexParameter,getUniform,getVertexAttrib,getVertexAttribOffset,readPixels,shaderSource,texImage2D,texSubImage2D,useProgram,activeTexture,bindTexture,getUniformLocation,createTexture,bindFramebuffer,pixelStorei";
 
 static void wrap_func(FILE *ifce_c, char *fname, char *fun_def)
 {

gpac-1.0.1.tar.gz/applications/generators/X3D/main.c -> gpac-2.0.0.tar.gz/applications/generators/X3D/main.c Changed

gpac-1.0.1.tar.gz/applications/gpac/Makefile -> gpac-2.0.0.tar.gz/applications/gpac/Makefile Changed

gpac-1.0.1.tar.gz/applications/gpac/main.c -> gpac-2.0.0.tar.gz/applications/gpac/main.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / gpac application
@@ -25,34 +25,41 @@
 
 #include <gpac/main.h>
 #include <gpac/filters.h>
+#include <gpac/thread.h>
 
 static GF_SystemRTInfo rti;
 static GF_FilterSession *session=NULL;
 static u32 list_filters = 0;
 static Bool dump_stats = GF_FALSE;
 static Bool dump_graph = GF_FALSE;
-static Bool print_filter_info = GF_FALSE;
+static u32 print_filter_info = 0;
 static Bool print_meta_filters = GF_FALSE;
 static Bool load_test_filters = GF_FALSE;
 static s32 nb_loops = 0;
 static s32 runfor = 0;
-Bool runfor_exit = GF_FALSE;
-Bool enable_prompt = GF_FALSE;
-u32 enable_reports = 0;
-char *report_filter = NULL;
-Bool do_unit_tests = GF_FALSE;
+static Bool runfor_exit = GF_FALSE;
+static u32 exit_mode = 0;
+static Bool enable_prompt = GF_FALSE;
+static u32 enable_reports = 0;
+static char *report_filter = NULL;
+static Bool do_unit_tests = GF_FALSE;
+static Bool use_step_mode = GF_FALSE;
 static int alias_argc = 0;
 static char **alias_argv = NULL;
 static GF_List *args_used = NULL;
 static GF_List *args_alloc = NULL;
 static u32 gen_doc = 0;
 static u32 help_flags = 0;
+static u32 loops_done = 0;
 
 //coverage for FileIO
 static const char *make_fileio(const char *inargs, const char **out_arg, Bool is_input, GF_Err *e);
 static void cleanup_file_io();
 
-FILE *sidebar_md=NULL;
+//coverage for custom filters
+static GF_Filter *load_custom_filter(GF_FilterSession *sess, char *opts, GF_Err *e);
+
+static FILE *sidebar_md=NULL;
 static FILE *helpout = NULL;
 
 static const char *auto_gen_md_warning = "\n";
@@ -67,8 +74,9 @@
 #define SEP_LIST	3
 
 static Bool print_filters(int argc, char **argv, GF_FilterSession *session, GF_SysArgMode argmode);
-static void dump_all_props(void);
+static void dump_all_props(char *pname);
 static void dump_all_colors(void);
+static void dump_all_audio_cicp(void);
 static void dump_all_codec(GF_FilterSession *session);
 static void write_filters_options(GF_FilterSession *fsess);
 static void write_core_options();
@@ -85,66 +93,63 @@
 const char *gpac_doc =
 "# General\n"
 "Filters are configurable processing units consuming and producing data packets. These packets are carried "
-"between filters through a data channel called __pid__. A PID is in charge of allocating/tracking data packets, "
+"between filters through a data channel called __PID__. A PID is in charge of allocating/tracking data packets, "
 "and passing the packets to the destination filter(s). A filter output PID may be connected to zero or more filters. "
 "This fan-out is handled internally by GPAC (no such thing as a tee filter in GPAC).\n"
 "Note: When a PID cannot be connected to any filter, a warning is thrown and all packets dispatched on "
 "this PID will be destroyed. The session may however still run, unless [-full-link](CORE) is set.\n"
-" \nEach output PID carries a set of properties describing the data it delivers (eg __width__, __height__, __codec__, ...). Properties "
-"can be built-in (identified by a 4 character code **abcd**, see [properties (-h props)](filters_properties) ), or user-defined (identified by a string). Each PID tracks "
+" \nEach output PID carries a set of properties describing the data it delivers (e.g. __width__, __height__, __codec__, ...). Properties "
+"can be built-in (see [gpac -h props](filters_properties) ), or user-defined. Each PID tracks "
 "its properties changes and triggers filter reconfiguration during packet processing. This allows the filter chain to be "
-"reconfigured at run time, potentially reloading part of the chain (eg unload a video decoder when switching from compressed "
+"reconfigured at run time, potentially reloading part of the chain (e.g. unload a video decoder when switching from compressed "
 "to uncompressed sources).\n"
-" \nEach filter exposes one or more sets of capabilities, called __capability bundle__, which are property type and values "
-"that must be matched or excluded by connecting PIDs.\n"
-" \nEach filter exposes a set of argument to configure itself, using property types and values described as strings formated with "
+" \nEach filter exposes a set of argument to configure itself, using property types and values described as strings formatted with "
 "separators. This help is given with default separator sets `:=#,@` to specify filters, properties and options. Use [-seps](GPAC) to change them.\n"
-"# Property format\n"
-"- boolean: formatted as `yes`|`true`|`1` or `no`|`false`|`0`\n"
+"# Property and filter option format\n"
+"- boolean: formatted as `yes`,`true`,`1` or `no`,`false`,`0`\n"
 "- enumeration (for filter arguments only): must use the syntax given in the argument description, otherwise value `0` (first in enum) is assumed.\n"
-"- 1-dimension (numbers, floats, ints...): formatted as `value[unit]`, where `unit` can be `k`|`K` (x1000) or `m`|`M` (x1000000) or `g`|`G` (x1000000000). "
-"For such properties, value `+I` means maximum possible value, `-I` minimum possible value.\n"
+"- 1-dimension (numbers, floats, ints...): formatted as `value[unit]`, where `unit` can be `k`,`K` (x 1000) or `m`,`M` (x 1000000) or `g`,`G` (x 1000000000) or `sec` (x 1000) or `min` (x 60000). `+I` means max float/int/uint value, `-I` min float/int/uint value.\n"
 "- fraction: formatted as `num/den` or `num-den` or `num`, in which case the denominator is 1 if `num` is an integer, or 1000000 if `num` is a floating-point value.\n"
-"- unsigned 32 bit integer: formated as number or hexadecimal using the format `0xAABBCCDD`.\n"
+"- unsigned 32 bit integer: formatted as number or hexadecimal using the format `0xAABBCCDD`.\n"
 "- N-dimension (vectors): formatted as `DIM1xDIM2[xDIM3[xDIM4]]` values, without unit multiplier.\n"
 "- string: formatted as:\n"
-" - `value`: copies value to string.\n"
-" - `file@FILE`: load string from local `FILE` (opened in binary mode).\n"
-" - `bxml@FILE`: binarize XML from local `FILE` and set property type to data - see https://wiki.gpac.io/NHML-Format.\n"
+" - `value`: copies value to string.\n"
+" - `file@FILE`: load string from local `FILE` (opened in binary mode).\n"
+" - `bxml@FILE`: binarize XML from local `FILE` and set property type to data - see https://wiki.gpac.io/NHML-Format.\n"
 "- data: formatted as:\n"
-" - `size@address`: constant data block, not internally copied; `size` gives the size of the block, `address` the data pointer.\n"
-" - `0xBYTESTRING`: data block specified in hexadecimal, internally copied.\n"
-" - `file@FILE`: load data from local `FILE` (opened in binary mode).\n"
-" - `bxml@FILE`: binarize XML from local `FILE` - see https://wiki.gpac.io/NHML-Format.\n"
-"- pointer: are formatted as `address` giving the pointer address (32 or 64 bit depending on platforms).\n"
+" - `size@address`: constant data block, not internally copied; `size` gives the size of the block, `address` the data pointer.\n"
+" - `0xBYTESTRING`: data block specified in hexadecimal, internally copied.\n"
+" - `file@FILE`: load data from local `FILE` (opened in binary mode).\n"
+" - `bxml@FILE`: binarize XML from local `FILE` - see https://wiki.gpac.io/NHML-Format.\n"
+" - `b64@DATA`: load data from base-64 encoded `DATA`.\n"
+"- pointer: pointer address as formatted by `%p` in C.\n"
 "- string lists: formatted as `val1,val2[,...]`. Each value can also use `file@FILE` syntax.\n"
 "- integer lists: formatted as `val1,val2[,...]`\n"
 "Note: The special characters in property formats (0x,/,-,+I,-I,x) cannot be configured.\n"
 "# Filter declaration [__FILTER__]\n"
 "## Generic declaration\n"
 "Each filter is declared by its name, with optional filter arguments appended as a list of colon-separated `name=value` pairs. Additional syntax is provided for:\n"
-"- boolean: `value` can be omitted, defaulting to `true` (eg `:noedit`). Using `!` before the name negates the result (eg `:!moof_first`)\n"
-"- enumerations: name can be omitted (eg `:disp=pbo` is equivalent to `:pbo`), provided that filter developers pay attention to not reuse enumeration names in the same filter.\n"
+"- boolean: `value` can be omitted, defaulting to `true` (e.g. `:noedit`). Using `!` before the name negates the result (e.g. `:!moof_first`)\n"
+"- enumerations: name can be omitted, e.g. `:disp=pbo` is equivalent to `:pbo`.\n"
 "\n \n"
-"When string parameters are used (eg URLs), it is recommended to escape the string using the keyword `gpac`. \n"
+"When string parameters are used (e.g. URLs), it is recommended to escape the string using the keyword `gpac`. \n"
 "EX filter:ARG=http://foo/bar?yes:gpac:opt=VAL\n"
 "This will properly extract the URL.\n"
 "EX filter:ARG=http://foo/bar?yes:opt=VAL\n"
 "This will fail to extract it and keep `:opt=VAL` as part of the URL.\n"
 "The escape mechanism is not needed for local source, for which file existence is probed during argument parsing. "
-"It is also not needed for builtin procotol handlers (`avin://`, `video://`, `audio://`, `pipe://`)\n"
+"It is also not needed for builtin protocol handlers (`avin://`, `video://`, `audio://`, `pipe://`)\n"
 "For `tcp://` and `udp://` protocols, the escape is not needed if a trailing `/` is appended after the port number.\n"
 "EX -i tcp://127.0.0.1:1234:OPT\n"
 "This will fail to extract the URL and options.\n"
 "EX -i tcp://127.0.0.1:1234/:OPT\n"
 "This will extract the URL and options.\n"
-"Note: one trick to avoid the escape sequence is to declare the URLs option at the end, eg `f1:opt1=foo:url=http://bar`, provided you have only one URL parameter to specify on the filter.\n"
+"Note: one trick to avoid the escape sequence is to declare the URLs option at the end, e.g. `f1:opt1=foo:url=http://bar`, provided you have only one URL parameter to specify on the filter.\n"
 "\n"
-"It is possible to disable option parsing (for string options) by duplicating the seperator.\n"
+"It is possible to disable option parsing (for string options) by duplicating the separator.\n"
 "EX filter::opt1=UDP://IP:PORT/:someopt=VAL::opt2=VAL2\n"
 "This will pass `UDP://IP:PORT/:someopt=VAL` to `opt1` without inspecting it, and `VAL2` to `opt2`.\n"
 " \n"
-"A filter may be assigned a name (for inspection purposes) using `:N=name` option. This name is not used in link resolution and may be changed at runtime by the filter instance.\n"
 "## Source and Sink filters\n"
 "Source and sink filters do not need to be addressed by the filter name, specifying `src=` or `dst=` instead is enough. "
 "You can also use the syntax `-src URL` or `-i URL` for sources and `-dst URL` or `-o URL` for destination, this allows prompt completion in shells.\n"
@@ -156,6 +161,7 @@
 "Specific source or sink filters may also be specified using `filterName:src=URL` or `filterName:dst=URL`.\n"
 "\n"
 "The `src=` and `dst=` syntaxes can also be used in alias for dynamic argument cloning (see `gpac -hx alias`).\n"
+"\n"
 "## Forcing specific filters\n"
 "There is a special option called `gfreg` which allows specifying preferred filters to use when handling URLs.\n"
 "EX src=file.mp4:gfreg=ffdmx,ffdec\n"
@@ -164,24 +170,28 @@
 "## Specifying encoders and decoders\n"
 "By default filters chain will be resolved without any decoding/encoding if the destination accepts the desired format. "
 "Otherwise, decoders/encoders will be dynamically loaded to perform the conversion, unless dynamic resolution is disabled. "
-"There is a special shorcut filter name for encoders `enc` allowing to match a filter providing the desired encoding. "
+"There is a special shortcut filter name for encoders `enc` allowing to match a filter providing the desired encoding. "
 "The parameters for `enc` are:\n"
-"- c=NAME: identifes the desired codec. `NAME` can be the gpac codec name or the encoder instance for ffmpeg/others\n"
+"- c=NAME: identifies the desired codec. `NAME` can be the GPAC codec name or the encoder instance for ffmpeg/others\n"
 "- b=UINT, rate=UINT, bitrate=UINT: indicates the bitrate in bits per second\n"
 "- g=UINT, gop=UINT: indicates the GOP size in frames\n"
 "- pfmt=NAME: indicates the target pixel format name (see [properties (-h props)](filters_properties) ) of the source, if supported by codec\n"
 "- all_intra=BOOL: indicates all frames should be intra frames, if supported by codec\n"
-"\n \nOther options will be passed to the filter if it accepts generic argument parsing (as is the case for ffmpeg).\n"
-"EX src=dump.yuv:size=320x240:fps=25 enc:c=avc:b=150000:g=50:cgop=true:fast=true dst=raw.264\n"
+"\n"
+"Other options will be passed to the filter if it accepts generic argument parsing (as is the case for ffmpeg).\n"
+"The shortcut syntax `c=TYPE` (e.g. `c=aac:opts`) is also supported.\n"
+"\n"
+"EX gpac -i dump.yuv:size=320x240:fps=25 enc:c=avc:b=150000:g=50:cgop=true:fast=true -o raw.264\n"
 "This creates a 25 fps AVC at 175kbps with a gop duration of 2 seconds, using closed gop and fast encoding settings for ffmpeg.\n"
 "\n"
 "The inverse operation (forcing a decode to happen) is possible using the __reframer__ filter.\n"
-"EX src=file.mp4 reframer:raw @ -o null\n"
+"EX gpac -i file.mp4 reframer:raw=av -o null\n"
 "This will force decoding media from `file.mp4` and trash (send to `null`) the result (doing a decoder benchmark for example).\n"
 "\n"
+"## Escaping option separators\n"
 "When a filter uses an option defined as a string using the same separator character as gpac, you can either "
-"modify the set of separators, or escape the seperator by duplicating it. The options enclosed by duplicated "
-"separator are not parsed. This is mostly used for meta filters, such as ffmpeg, to pass options to subfilters "
+"modify the set of separators, or escape the separator by duplicating it. The options enclosed by duplicated "
+"separator are not parsed. This is mostly used for meta filters, such as ffmpeg, to pass options to sub-filters "
 "such as libx264 (cf `x264opts` parameter).\n"
 "EX f:a=foo:b=bar\n"
 "This will set option `a` to `foo` and option `b` to `bar` on the filter.\n"
@@ -189,42 +199,99 @@
 "This will set option `a` to `foo:b=bar` on the filter.\n"
 "EX f:a=foo::b=bar:c::d=fun\n"
 "This will set option `a` to `foo`, `b` to `bar:c` and the option `d` to `fun` on the filter.\n"
-"# Expliciting links between filters [__LINK__]\n"
+"\n"
+"# Filter linking [__LINK__]\n"
+"\n"
+"Each filter exposes one or more sets of capabilities, called __capability bundle__, which are property type and values "
+"that must be matched or excluded by connecting PIDs.\n"
+"To check the possible sources and destination for a filter `FNAME`, use `gpac -h links FNAME`\n"
+"\n"
+"The filter graph resolver uses this information together with the PID properties to link the different filters.\n"
+"\n"
+"Link directives, when provided, specify which source a filter can accept connections from.\n"
+"__They do not specify which destination a filter can connect to.__\n"
+"\n"
+"## Default filter linking\n"
+"When no link instructions are given (see below), the default linking strategy used is either __implicit mode__ (default in `gpac`) or __complete mode__ (if [-cl](GPAC) is set).\n"
+"Each PID is checked for possible connection to all defined filters, in their declaration order.\n"
+"For each filter `DST` accepting a connection from the PID, directly or with intermediate filters:\n"
+"- if `DST` filter has link directives, use them to allow or reject PID connection.\n"
+"- otherwise, if __complete mode__ is enabled, allow connection.\n"
+"- otherwise (__implicit mode__):\n"
+" - if `DST` is not a sink and is the first matching filter with no link directive, allow connection.\n"
+" - otherwise, if `DST` is not a sink and is not the first matching filter with no link directive, reject connection.\n"
+" - otherwise (`DST` is a sink) and no previous connections to a non-sink filter, allow connection.\n"
+"\n"
+"EX gpac -i file.mp4 c=avc -o output\n"
+"With this setup in __implicit mode__:\n"
+"- if the file has a video PID, it will connect to `enc` but not to `output`. The output PID of `enc` will connect to `output`.\n"
+"- if the file has other PIDs than video, they will connect to `output`, since this `enc` filter accepts only video.\n"
+"\n"
+"EX gpac -cl -i file.mp4 c=avc -o output\n"
+"With this setup in __complete mode__:\n"
+"- if the file has a video PID, it will connect both to `enc` and to `output`, and the output PID of `enc` will connect to `output`.\n"
+"- if the file has other PIDs than video, they will connect to `output`.\n"
+"\n"
+"Furthermore in __implicit mode__, filter connections are restricted to filters defined between the last source and the sink(s).\n"
+"EX gpac -i video1 reframer:saps=1 -i video2 ffsws:osize=128x72 -o output\n"
+"This will connect:\n"
+"- `video1` to `reframer` then `reframer` to `output` but will prevent `reframer` to `ffsws` connection.\n"
+"- `video2` to `ffsws` then `ffsws` to `output` but will prevent `video2` to `reframer` connection.\n"
+"\n"
+"EX gpac -i video1 -i video2 reframer:saps=1 ffsws:osize=128x72 -o output\n"
+"This will connect `video1` AND `video2` to `reframer->ffsws->output`\n"
+"\n"
+"The __implicit mode__ allows specifying linear processing chains (no PID fan-out except for final output(s)) without link directives, simplifying command lines for common cases.\n"
+"Warning: Argument order really matters in implicit mode!\n"
+"\n"
+"EX gpac -i file.mp4 c=avc c=aac -o output\n"
+"If the file has a video PID, it will connect to `c=avc` but not to `output`. The output PID of `c=avc` will connect to `output`.\n"
+"If the file has an audio PID, it will connect to `c=aac` but not to `output`. The output PID of `c=aac` will connect to `output`.\n"
+"If the file has other PIDs than audio or video, they will connect to `output`.\n"
+"\n"
+"EX gpac -i file.mp4 ffswf=osize:128x72 c=avc resample=osr=48k c=aac -o output\n"
+"This will force:\n"
+"- `SRC(video)->ffsws->enc(video)->output` and prevent `SRC(video)->output`, `SRC(video)->enc(video)` and `ffsws->output` connections which would happen in __complete mode__.\n"
+"- `SRC(audio)->resample->enc(audio)->output` and prevent `SRC(audio)->output`, `SRC(audio)->enc(audio)` and `resample->output` connections which would happen in __complete mode__.\n"
+"\n"
 "## Quick links\n"
-"Link between filters may be manually specified. The syntax is an `@` character optionaly followed by an integer (0 if omitted). "
-"This indicates which filter previously specified at prompt should be link to the next filter listed. The optional integer is a 0-based index to the previous filter declarations, 0 indicating the previous filter declaration, 1 the one before the previous delaration, ...).\n"
-"Only the last link directive occuring before a filter is used to setup links for that filter.\n"
+"Link between filters may be manually specified. The syntax is an `@` character optionally followed by an integer (0 if omitted).\n"
+"This indicates that the following filter specified at prompt should be linked only to a previous listed filter.\n"
+"The optional integer is a 0-based index to the previous filter declarations, 0 indicating the previous filter declaration, 1 the one before the previous declaration, ...).\n"
+"If `@@` is used instead of `@`, the optional integer gives the filter index starting from the first filter (index 0) specified in command line.\n"
+"Several link directives can be given for a filter.\n"
 "EX fA fB @1 fC\n"
-"This indicates to direct `fA` outputs to `fC`.\n"
-"EX fA fB @1 @0 fC\n"
-"This indicates to direct `fB` outputs to `fC`, `@1` is ignored.\n"
-"\nIf no link directives are given, the links will be dynamically solved to fullfill as many connections as possible (__see below__).\n"
-"Warning: This means that `fA fB fC` and `fA fB @ fC` will likely not give the same result.\n"
+"This indicates that `fC` only accepts inputs from `fA`.\n"
+"EX fA fB fC @1 @0 fD\n"
+"This indicates that `fD` only accepts inputs from `fB` and `fC`.\n"
+"EX fA fB fC ... @@1 fZ\n"
+"This indicates that `fZ` only accepts inputs from `fB`.\n"
 "\n"
 "## Complex links\n"
-"The link directive is just a quick shortcut to set the following arguments:\n"
-"- FID=name, which assigns an identifier to the filter\n"
-"- SID=name1[,name2...], which set a list of filter identifiers , or __sourceIDs__, restricting the list of possible inputs for a filter.\n"
+"The `@` link directive is just a quick shortcut to set the following filter arguments:\n"
+"- FID=name: assigns an identifier to the filter\n"
+"- SID=name1[,name2...]: sets a list of filter identifiers, or __sourceIDs__, restricting the list of possible inputs for a filter.\n"
 "\n"
 "EX fA fB @1 fC\n"
 "This is equivalent to `fA:FID=1 fB fC:SID=1`.\n"
-"Link directives specify which source a filter can accept connections from. They do not specifiy which destination a filter can connect to.\n"
 "EX fA:FID=1 fB fC:SID=1\n"
-"This indicates that `fC` only accpets input from `fA`, but `fB` might accept inputs from `fA`.\n"
+"This indicates that `fC` only accepts input from `fA`, but `fB` might accept inputs from `fA`.\n"
 "EX fA:FID=1 fB:FID=2 fC:SID=1 fD:SID=1,2\n"
 "This indicates that `fD` only accepts input from `fA` and `fB` and `fC` only from `fA`\n"
 "Note: A filter with sourceID set cannot get input from filters with no IDs.\n"
+"\n"
 "A sourceID name can be further extended using fragment identifier (`#` by default):\n"
 "- name#PIDNAME: accepts only PID(s) with name `PIDNAME`\n"
 "- name#TYPE: accepts only PIDs of matching media type. TYPE can be `audio`, `video`, `scene`, `text`, `font`, `meta`\n"
-"- name#TYPEN: accepts only `N`th PID of matching type from source\n"
-"- name#P4CC=VAL: accepts only PIDs with property matching `VAL`.\n"
+"- name#TYPEN: accepts only `N` (1-based index) PID of matching type from source (e.g. `video2` to only accept second video PID)\n"
+"- name#TAG=VAL: accepts the PID if its parent filter has no tag or a tag matching `VAL`\n"
+"- name#P4CC=VAL: accepts only PIDs with builtin property of type `P4CC` and value `VAL`.\n"
 "- name#PName=VAL: same as above, using the builtin name corresponding to the property.\n"
 "- name#AnyName=VAL: same as above, using the name of a non built-in property.\n"
 "- name#Name=OtherPropName: compares the value with the value of another property of the PID. The matching will fail if the value to compare to is not present or different from the value to check. The property to compare with shall be a built-in property.\n"
 "If the property is not defined on the PID, the property is matched. Otherwise, its value is checked against the given value.\n"
 "\n"
-"The following modifiers for comparisons are allowed (for both `P4CC=`, `PName=` and `AnyName=`):\n"
+"The following modifiers for comparisons are allowed (for any fragment format using `=`):\n"
 "- name#P4CC=!VAL: accepts only PIDs with property NOT matching `VAL`.\n"
 "- name#P4CC-VAL: accepts only PIDs with property strictly less than `VAL` (only for 1-dimension number properties).\n"
 "- name#P4CC+VAL: accepts only PIDs with property strictly greater than `VAL` (only for 1-dimension number properties).\n"
@@ -235,99 +302,146 @@
 "This indicates to match connection between `fA` and `fB` only for PIDs with a `ServiceID` property of `2`.\n"
 "These extensions also work with the __LINK__ `@` shortcut.\n"
 "EX fA fB @1#video fC\n"
-"This indicates to direct `fA` video outputs to `fC`.\n"
-"EX src=img.heif @#ItemID=200 vout\n"
+"This indicates that `fC` only accepts inputs from `fA`, and of type video.\n"
+"EX gpac -i img.heif @#ItemID=200 vout\n"
 "This indicates to connect to `vout` only PIDs with `ItemID` property equal to `200`.\n"
-"EX src=vid.mp4 @#PID=1 vout\n"
+"EX gpac -i vid.mp4 @#PID=1 vout\n"
 "This indicates to connect to `vout` only PIDs with `ID` property equal to `1`.\n"
-"EX src=vid.mp4 @#Width=640 vout\n"
+"EX gpac -i vid.mp4 @#Width=640 vout\n"
 "This indicates to connect to `vout` only PIDs with `Width` property equal to `640`.\n"
-"EX src=vid.mp4 @#Width-640 vout\n"
+"EX gpac -i vid.mp4 @#Width-640 vout\n"
 "This indicates to connect to `vout` only PIDs with `Width` property less than `640`\n"
-"EX src=vid.mp4 @#ID=ItemID#ItemNumber=1 vout\n"
+"EX gpac -i vid.mp4 @#ID=ItemID#ItemNumber=1 vout\n"
 "This will connect to `vout` only PID with an ID property equal to ItemID property (keep items, discard tracks) and an Item number of 1 (first item).\n"
 "\n"
 "Multiple fragment can be specified to check for multiple PID properties.\n"
-"EX src=vid.mp4 @#Width=640#Height+380 vout\n"
+"EX gpac -i vid.mp4 @#Width=640#Height+380 vout\n"
 "This indicates to connect to `vout` only PIDs with `Width` property equal to `640` and `Height` greater than `380`.\n"
 "\n"
-"Warning: If a filter PID gets connected to a loaded filter, no further dynamic link resolution will "
-"be done to connect it to other filters, unless sourceIDs are set. Link directives should be carfully setup.\n"
-"EX src=file.mp4 @ reframer dst=dump.mp4\n"
-"This will link src `file.mp4` PID (type __file__) to dst `dump.mp4`filter (type `file`) because dst has no sourceID and therefore will "
-"accept input from src. Since the PID is connected, the filter engine will not try to solve "
-"a link between src and `reframer`. The result is a direct copy of the source file, `reframer` being unused.\n"
-"EX src=file.mp4 reframer @ dst=dump.mp4\n"
-"This will force dst to accept only from reframer, a muxer will be loaded to solve this link, and "
-"src PID will be linked to `reframer` (no source ID), loading a demuxer to solve the link. The result is a complete remux of the source file.\n"
+"Warning: If a PID directly connects to one or more explicitly loaded filters, no further dynamic link resolution will "
+"be done to connect it to other filters with no sourceID set. Link directives should be carefully setup.\n"
+"EX fA @ reframer fB\n"
+"If `fB` accepts inputs provided by `fA` but `reframer` does not, this will link `fA` PID to `fB` filter since `fB` has no sourceID.\n"
+"Since the PID is connected, the filter engine will not try to solve a link between `fA` and `reframer`.\n"
+"\n"
+"An exception is made for local files: by default, a local file destination will force a remultiplex of input PIDs from a local file.\n"
+"EX gpac -i file.mp4 -o dump.mp4\n"
+"This will prevent direct connection of PID of type `file` to dst `file.mp4`, remultiplexing the file.\n"
+"\n"
+"The special option `nomux` is used to allow direct connections (ignored for non-sink filters).\n"
+"EX gpac -i file.mp4 -o dump.mp4:nomux\n"
+"This will result in a direct file copy.\n"
+"\n"
+"This only applies to local files destination. For pipes, sockets or other file outputs (HTTP, ROUTE):\n"
+"- direct copy is enabled by default\n"
+"- `nomux=0` can be used to force remultiplex\n"
+"\n"
+"## Sub-session tagging\n"
+"Filters may be assigned to a sub-session using `:FS=N`, with `N` a positive integer.\n"
+"Filters belonging to different sub-sessions may only link to each-other:\n"
+"- if explicitly allowed through sourceID directives (`@` or `SID`)\n"
+"- or if they have the same sub-session identifier\n"
+"\n"
+"This is mostly used for __implicit mode__ in `gpac`: each first source filter specified after a sink filter will trigger a new sub-session.\n"
+"EX gpac -i in1.mp4 -i in2.mp4 -o out1.mp4 -o out2.mp4\n"
+"This will result in both inputs multiplexed in both outputs.\n"
+"EX gpac -i in1.mp4 -o out1.mp4 -i in2.mp4 -o out2.mp4\n"
+"This will result in in1 mixed to out1 and in2 mixed to out2, these last two filters belonging to a different sub-session.\n"
+"\n"
 "# Arguments inheriting\n"
 "Unless explicitly disabled (see [-max-chain](CORE)), the filter engine will resolve implicit or explicit (__LINK__) connections "
 "between filters and will allocate any filter chain required to connect the filters. "
 "In doing so, it loads new filters with arguments inherited from both the source and the destination.\n"
-"EX src=file.mp4:OPT dst=file.aac dst=file.264\n"
+"EX gpac -i file.mp4:OPT -o file.aac -o file.264\n"
 "This will pass the `:OPT` to all filters loaded between the source and the two destinations.\n"
-"EX src=file.mp4 dst=file.aac:OPT dst=file.264\n"
+"EX gpac -i file.mp4 -o file.aac:OPT -o file.264\n"
 "This will pass the `:OPT` to all filters loaded between the source and the file.aac destination.\n"
 "Note: the destination arguments inherited are the arguments placed **AFTER** the `dst=` option.\n"
-"EX src=file.mp4 fout:OPTFOO:dst=file.aac:OPTBAR\n"
+"EX gpac -i file.mp4 fout:OPTFOO:dst=file.aac:OPTBAR\n"
 "This will pass the `:OPTBAR` to all filters loaded between `file.mp4` source and `file.aac` destination, but not `OPTFOO`.\n"
 "Arguments inheriting can be stopped by using the keyword `gfloc`: arguments after the keyword will not be inherited.\n"
-"EX src=file.mp4 dst=file.aac:OPTFOO:gfloc:OPTBAR dst=file.264\n"
-"This will pass the `:OPTFOO` to all filters loaded between `file.mp4`source and `file.aac` destination, but not `OPTBAR`\n"
+"EX gpac -i file.mp4 -o file.aac:OPTFOO:gfloc:OPTBAR -o file.264\n"
+"This will pass `:OPTFOO` to all filters loaded between `file.mp4` source and `file.aac` destination, but not `OPTBAR`\n"
 "Arguments are by default tracked to check if they were used by the filter chain, and a warning is thrown if this is not the case.\n"
-"It may be usefull to specify arguments which may not be consumed depending on the graph resolution; the specific keyword `gfopt` indicates that arguments after the keyword will not be tracked.\n"
-"EX src=file.mp4 dst=file.aac:OPTFOO:gfopt:OPTBAR dst=file.264\n"
+"It may be useful to specify arguments which may not be consumed depending on the graph resolution; the specific keyword `gfopt` indicates that arguments after the keyword will not be tracked.\n"
+"EX gpac -i file.mp4 -o file.aac:OPTFOO:gfopt:OPTBAR -o file.264\n"
 "This will warn if `OPTFOO` is not consumed, but will not track `OPTBAR`.\n"
+" \n"
+"A filter may be assigned a name (for inspection purposes, not inherited) using `:N=name` option. This name is not used in link resolution and may be changed at runtime by the filter instance.\n"
+" \n"
+"A filter may be assigned a tag (any string) using `:TAG=name` option. This tag does not need to be unique, and can be used to exclude filter in link resolution. Tags are not inherited, therefore dynamically loaded filters never have a tag.\n"
+" \n"
 "# URL templating\n"
-"Destination URLs can be templated using the same mechanism as MPEG-DASH, where `$KEYWORD$` is replaced in the template with the "
-"resolved value and `$KEYWORD%%0Nd$` is replaced in the template with the resolved integer, padded with N zeros if needed. "
-"`$$` is an escape for $\n"
-"`KEYWORD` is **case sensitive**, and may be present multiple times in the string. Supported `KEYWORD` are:\n"
+"Destination URLs can be dynamically constructed using templates. Pattern `$KEYWORD$` is replaced in the template with the "
+"resolved value and `$KEYWORD%%0Nd$` is replaced in the template with the resolved integer, padded with up to N zeros if needed.\n"
+"`KEYWORD` is **case sensitive**, and may be present multiple times in the string. Supported `KEYWORD`:\n"
 "- num: replaced by file number if defined, 0 otherwise\n"
 "- PID: ID of the source PID\n"
 "- URL: URL of source file\n"
-"- File: path on disk for source file\n"
+"- File: path on disk for source file; if not found, use URL if set, or PID name otherwise\n"
+"- Type: name of stream type of PID (`video`, `audio` ...)\n"
 "- p4cc=ABCD: uses PID property with 4CC value `ABCD`\n"
 "- pname=VAL: uses PID property with name `VAL`\n"
 "- OTHER: locates property 4CC for the given name, or property name if no 4CC matches.\n"
-"\n \nTemplating can be useful when encoding several qualities in one pass.\n"
-"EX src=dump.yuv:size=640x360 vcrop:wnd=0x0x320x180 enc:c=avc:b=1M @2 enc:c=avc:b=750k dst=dump_$CropOrigin$x$Width$x$Height$.264:clone\n"
-"This will create a croped version of the source, encoded in AVC at 1M, and a full version of the content in AVC at 750k. "
-"Outputs will be `dump_0x0x320x180.264` for the croped version and `dump_0x0x640x360.264` for the non-croped one.\n"
+" \n"
+"`$$` is an escape for $\n"
+"\n"
+"Templating can be useful when encoding several qualities in one pass.\n"
+"EX gpac -i dump.yuv:size=640x360 vcrop:wnd=0x0x320x180 c=avc:b=1M @2 c=avc:b=750k -o dump_$CropOrigin$x$Width$x$Height$.264:clone\n"
+"This will create a cropped version of the source, encoded in AVC at 1M, and a full version of the content in AVC at 750k. "
+"Outputs will be `dump_0x0x320x180.264` for the cropped version and `dump_0x0x640x360.264` for the non-cropped one.\n"
 "# Cloning filters\n"
 "When a filter accepts a single connection and has a connected input, it is no longer available for dynamic resolution. "
-"There may be cases where this behaviour is undesired. Take a HEIF file with N items and do:\n"
-"EX src=img.heif dst=dump_$ItemID$.jpg\n"
+"There may be cases where this behavior is undesired. Take a HEIF file with N items and do:\n"
+"EX gpac -i img.heif -o dump_$ItemID$.jpg\n"
 "In this case, only one item (likely the first declared in the file) will connect to the destination.\n"
 "Other items will not be connected since the destination only accepts one input PID.\n"
-"There is a special option `clone` allowing destination filters (**and only them**) to be cloned with the same arguments:\n"
-"EX src=img.heif dst=dump_$ItemID$.jpg:clone\n"
+"There is a special option `clone` allowing filters to be cloned with the same arguments. The cloned filters have the same ID as the original one.\n"
+"EX gpac -i img.heif -o dump_$ItemID$.jpg:clone\n"
 "In this case, the destination will be cloned for each item, and all will be exported to different JPEGs thanks to URL templating.\n"
+"EX gpac -i vid.mpd c=avc:FID=1:clone -o transcode.mpd:SID=1\n"
+"In this case, the encoder will be cloned for each video PIDs in the source, and the destination will only use PIDs coming from the encoders.\n"
+"\n"
+"When implicit linking is enabled, all filters are by default clonable. This allows duplicating the processing for each PIDs of the same type.\n"
+"EX gpac -i dual_audio resample:osr=48k c=aac -o dst\n"
+"The `resampler` filter will be cloned for each audio PID, and the encoder will be cloned for each resampler output.\n"
+"You can explicitly deactivate the cloning instructions:\n"
+"EX gpac -i dual_audio resample:osr=48k:clone=0 c=aac -o dst\n"
+"The first audio will connect to the `resample` filter, the second to the `enc` filter and the `resample` output will connect to a clone of the `enc` filter.\n"
+"\n"
 "# Templating filter chains\n"
-"There can be cases where the number of desired outputs depends on the source content, for example dumping a multiplex of N services into N files. When the destination involves multiplexing the input PIDs, the `:clone`option is not enough since the muxer will always accept the input PIDs.\n"
+"There can be cases where the number of desired outputs depends on the source content, for example dumping a multiplex of N services into N files. When the destination involves multiplexing the input PIDs, the `:clone` option is not enough since the multiplexer will always accept the input PIDs.\n"
 "To handle this, it is possible to use a PID property name in the sourceID of a filter with the value `*` or an empty value. In this case, whenever a new PID with a new value for the property is found, the filter with such sourceID will be dynamically cloned.\n"
-"Warning: This feature should only be called with a single property set to `*` per source ID, results are undefined otherwise.\n"
-"EX src=source.ts dst=file_$ServiceID$.mp4:SID=*#ServiceID=*\n"
-"EX src=source.ts dst=file_$ServiceID$.mp4:SID=#ServiceID=\n"
+"Warning: This feature should only be called with a single property set to `*` (or empty) per source ID, results are undefined otherwise.\n"
+"EX gpac -i source.ts -o file_$ServiceID$.mp4:SID=*#ServiceID=*\n"
+"EX gpac -i source.ts -o file_$ServiceID$.mp4:SID=#ServiceID=\n"
 "In this case, each new `ServiceID` value found when connecting PIDs to the destination will create a new destination file.\n"
+"\n"
+"Cloning in implicit linking mode applies to output as well:\n"
+"EX gpac -i dual_audio -o dst_$PID$.aac\n"
+"Each audio track will be dumped to aac (potentially reencoding if needed).\n"
+"\n"
 "# Assigning PID properties\n"
 "It is possible to define properties on output PIDs that will be declared by a filter. This allows tagging parts of the "
 "graph with different properties than other parts (for example `ServiceID`). "
-"The syntax is the same as filter option, and uses the fragment separator to identify properties, eg `#Name=Value`.\n"
-"This sets output PIDs property (4cc, built-in name or any name) to the given value. Value can be omitted for booleans "
-"(defaults to true, eg `:#Alpha`).\n"
+"The syntax is the same as filter option, and uses the fragment separator to identify properties, e.g. `#Name=Value`.\n"
+"This sets output PIDs property (4cc, built-in name or any name) to the given value. Value can be omitted for boolean "
+"(defaults to true, e.g. `:#Alpha`).\n"
 "Non built-in properties are parsed as follows:\n"
 "- `file@FOO` will be declared as string with a value set to the content of `FOO`.\n"
 "- `bxml@FOO` will be declared as data with a value set to the binarized content of `FOO`.\n"
 "- `FOO` will be declared as string with a value set to `FOO`.\n"
 "- `TYPE@FOO` will be parsed according to `TYPE`. If the type is not recognized, the entire value is copied as string. See `gpac -h props` for defined types.\n"
-
-"Warning: Properties are not filtered and override the properties of the filter's output PIDs, be carefull not to break "
+"\n"
+"User-assigned PID properties on filter `fA` will be inherited by all filters dynamically loaded to solve `fA -> fB` connection.\n"
+"If `fB` also has user-assigned PID properties, these only apply starting from `fB` in the chain and are not inherited by filters between `fA` and `fB`.\n"
+"\n"
+"Warning: Properties are not filtered and override the properties of the filter's output PIDs, be careful not to break "
 "the session by overriding core properties such as width/height/samplerate/... !\n"
-"EX -i v1.mp4:#ServiceID=4 -i v2.mp4:#ServiceID=2 -o dump.ts\n"
-"This will mux the streams in `dump.ts`, using `ServiceID` 4 for PIDs from `v1.mp4` and `ServiceID` 2 for PIDs from `v2.mp4`.\n"
+"EX gpac -i v1.mp4:#ServiceID=4 -i v2.mp4:#ServiceID=2 -o dump.ts\n"
+"This will multiplex the streams in `dump.ts`, using `ServiceID` 4 for PIDs from `v1.mp4` and `ServiceID` 2 for PIDs from `v2.mp4`.\n"
 "\n"
-"PID properties may be conditionally assigned by checking other PID properties. The syntax uses paranthesis (not configurable) after the property assignment sign:\n"
+"PID properties may be conditionally assigned by checking other PID properties. The syntax uses parenthesis (not configurable) after the property assignment sign:\n"
 "`#Prop=(CP=CV)VAL`\n"
 "This will assign PID property `Prop` to `VAL` for PIDs with property `CP` equal to `CV`.\n"
 "`#Prop=(CP=CV)VAL,(CP2=CV2)VAL2`\n"
@@ -348,28 +462,42 @@
 "It is possible to use a file to define options of a filter, by specifying the target file name as an option without value, i.e. `:myopts.txt`.\n"
 "Warning: Only local files are allowed.\n"
 "An option file is a simple text file containing one or more options or PID properties on one or more lines.\n"
-"A line begining with \"//\" is a comment and is ignored.\n"
+"A line beginning with \"//\" is a comment and is ignored.\n"
 "Options in an option file may point to other option files, with a maximum redirection level of 5.\n"
 "An option file declaration (`filter:myopts.txt`) follows the same inheritance rules as regular options.\n"
-"EX src=source.mp4:myopts.txt:foo=bar dst\n"
+"EX gpac -i source.mp4:myopts.txt:foo=bar -o dst\n"
 "Any filter loaded between `source.mp4` and `dst` will inherit both `myopts.txt` and `foo` options and will resolve options and PID properties given in `myopts.txt`.\n"
 "# Specific filter options\n"
 "Some specific keywords are replaced when processing filter options.\n"
 "Warning: These keywords do not apply to PID properties. Multiple keywords cannot be defined for a single option.\n"
 "Defined keywords:\n"
-"- $GSHARE: replaced by system path to GPAC shared directory (e.g. /usr/share)\n"
-"- $GJS: replaced by the first path specified by global config option [-js-dirs](CORE) that contains the file name following the macro, e.g. $GJS/source.js\n"
+"- $GSHARE: replaced by system path to GPAC shared directory (e.g. /usr/share/gpac)\n"
+"- $GJS: replaced by the first path from global share directory and paths set through [-js-dirs](CORE) that contains the file name following the macro, e.g. $GJS/source.js\n"
 "- $GLANG: replaced by the global config language option [-lang](CORE)\n"
 "- $GUA: replaced by the global config user agent option [-user-agent](CORE)\n"
 "- $GINC(init_val[,inc]): replaced by `init_val` and increment `init_val` by `inc` (positive or negative number, 1 if not specified) each time a new filter using this string is created.\n"
 "\n"
-"The $GINC construct can be used to dynamically assign numbers in filter chains:\n"
+"The `$GINC` construct can be used to dynamically assign numbers in filter chains:\n"
 "EX gpac -i source.ts tssplit @#ServiceID= -o dump_$GINC(10,2).ts\n"
 "This will dump first service in dump_10.ts, second service in dump_12.ts, etc...\n"
+"\n"
+"As seen previously, the following options may be set on any filter, but are not visible in individual filter help:\n"
+"- FID: filter identifier\n"
+"- SID: filter source(s)\n"
+"- N: filter name\n"
+"- FS: sub-session identifier\n"
+"- TAG: filter tag\n"
+"- clone: filter cloning flag\n"
+"- nomux: enable/disable direct file copy\n"
+"- gfreg: preferred filter registry names for link solving\n"
+"- gfloc: following options are local to filter declaration (not inherited)\n"
+"- gfopt: following options are not tracked\n"
+"- gpac: argument separator for URLs\n"
+"\n"
 "# External filters\n"
 "GPAC comes with a set of built-in filters in libgpac. It may also load external filters in dynamic libraries, located in "
-"folders listed in [-mod-dirs](CORE) option. The files shall be named `gf_*` and shall export"
-" a single function returning a filter register - see [libgpac documentation](https://doxygen.gpac.io/) for more details.\n"
+"default module folder or folders listed in [-mod-dirs](CORE) option. The files shall be named `gf_*` and shall export"
+" a single function `RegisterFilter` returning a filter register - see [libgpac documentation](https://doxygen.gpac.io/) for more details.\n"
 "\n";
 #endif
 
@@ -457,8 +585,9 @@
 "\n"
 "The specified index can be:\n"
 "- forward index: a strictly positive integer, 1 being the first argument after the alias\n"
-"- backward index: the value 'n' (or 'N') to indicate the last argument on the command line. This can be followed by `-x` to rewind arguments (eg `@{n-1}` is the before last argument)\n"
+"- backward index: the value 'n' (or 'N') to indicate the last argument on the command line. This can be followed by `-x` to rewind arguments (e.g. `@{n-1}` is the before last argument)\n"
 "\n"
+"Before solving aliases, all option arguments are moved at the beginging of the command line. This implies that alias arguments cannot be options.\n"
 "Arguments not used by any aliases are kept on the command line, other ones are removed\n"
 "\n"
 "EX -alias=\"foo src=@{N} dst=test.mp4\"\n"
@@ -468,7 +597,7 @@
 "EX -alias=\"list inspect src=@{+2:N}\"\n"
 "The command `gpac list f1 f2 f3` expands to `gpac inspect src=f2 src=f3 f1`\n"
 "EX -alias=\"plist aout vout flist:srcs=@{-,N}\"\n"
-"The command `gpac plist f1 f2 f3` expands to `gpac aout vout plist:srcs=\"f1,f2,f3\"` \n"
+"The command `gpac plist f1 f2 f3` expands to `gpac aout vout flist:srcs=\"f1,f2,f3\"` \n"
 "\n"
 "Alias documentation can be set using `gpac -aliasdoc=\"NAME VALUE\"`, with `NAME` the alias name and `VALUE` the documentation.\n"
 "Alias documentation will then appear in gpac help.\n"
@@ -535,7 +664,7 @@
 	gf_sys_print_core_help(helpout, help_flags, mode, mask);
 }
 
-GF_GPACArg gpac_args[] =
+static GF_GPACArg gpac_args[] =
 {
 #ifdef GPAC_MEMORY_TRACKING
 	GF_DEF_ARG("mem-track", NULL, "enable memory tracker", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
@@ -545,47 +674,53 @@
 	GF_DEF_ARG("sloop", NULL, "loop execution of session, creating a session at each loop, mainly used for testing. If no value is given, loops forever", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT),
 	GF_DEF_ARG("runfor", NULL, "run for the given amount of milliseconds", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT),
 	GF_DEF_ARG("runforx", NULL, "run for the given amount of milliseconds and exit with no cleanup", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT),
+ 	GF_DEF_ARG("runfors", NULL, "run for the given amount of milliseconds and exit with segfault (tests)", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT),
+ 	GF_DEF_ARG("runforl", NULL, "run for the given amount of milliseconds and wait forever at end (tests)", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT),
 
 	GF_DEF_ARG("stats", NULL, "print stats after execution", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("graph", NULL, "print graph after execution", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("k", NULL, "enable keyboard interaction from command line", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
 	GF_DEF_ARG("r", NULL, "enable reporting\n"
 			"- r: runtime reporting\n"
-			"- r=FA[,FB]: runtime reporting but only print given filters, eg `r=mp4mx`for ISOBMFF muxer only\n"
+			"- r=FA[,FB]: runtime reporting but only print given filters, e.g. `r=mp4mx` for ISOBMFF multiplexer only\n"
 			"- r=: only print final report"
 			, NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("seps", NULL, "set the default character sets used to separate various arguments\n"\
-		"- the first char is used to separate argument names\n"\
-		"- the second char, if present, is used to separate names and values\n"\
-		"- the third char, if present, is used to separate fragments for PID sources\n"\
-		"- the fourth char, if present, is used for list separators (__sourceIDs__, __gfreg__, ...)\n"\
-		"- the fifth char, if present, is used for boolean negation\n"\
+	GF_DEF_ARG("seps", NULL, "set the default character sets used to separate various arguments\n"
+		"- the first char is used to separate argument names\n"
+		"- the second char, if present, is used to separate names and values\n"
+		"- the third char, if present, is used to separate fragments for PID sources\n"
+		"- the fourth char, if present, is used for list separators (__sourceIDs__, __gfreg__, ...)\n"
+		"- the fifth char, if present, is used for boolean negation\n"
 		"- the sixth char, if present, is used for LINK directives (see [filters help (-h doc)](filters_general))", GF_FS_DEFAULT_SEPS, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
 
 	GF_DEF_ARG("i", "src", "specify an input file - see [filters help (-h doc)](filters_general)", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("o", "dst", "specify an output file - see [filters help (-h doc)](filters_general)", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("ib", NULL, "specify an input file to wrap as GF_FileIO object (testing of GF_FileIO)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
 	GF_DEF_ARG("ob", NULL, "specify an output file to wrap as GF_FileIO object (testing of GF_FileIO)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("h", "help,-ha,-hx,-hh", "print help. Use `-help` or `-h` for basic options, `-ha` for advanced options, `-hx` for expert options and `-hh` for all. \nNote: The `@` character can be used in place of the `*` character. String parameter can be:\n"\
-			"- empty: print command line options help\n"\
-			"- doc: print the general filter info\n"\
-			"- alias: print the gpac alias syntax\n"\
-			"- log: print the log system help\n"\
-			"- core: print the supported libgpac core options. Use -ha/-hx/-hh for advanced/expert options\n"\
-			"- cfg: print the GPAC configuration help\n"\
-			"- prompt: print the GPAC prompt help when running in interactive mode (see [-k](GPAC) )\n"\
-			"- modules: print available modules\n"\
-			"- filters: print name of all available filters\n"\
-			"- filters:*: print name of all available filters, including meta filters\n"\
-			"- codecs: print the supported builtin codecs\n"\
-			"- props: print the supported builtin PID and packet properties\n"\
-			"- colors: print the builtin color names and their values\n"\
-			"- links: print possible connections between each supported filters\n"\
-			"- links FNAME: print sources and sinks for filter `FNAME` (either builtin or JS filter)\n"\
+	GF_DEF_ARG("cl", NULL, "force complete mode when no link directive are set - see [filters help (-h doc)](filters_general)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("step", NULL, "test step mode in non-blocking session", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("h", "help,-ha,-hx,-hh", "print help. Use `-help` or `-h` for basic options, `-ha` for advanced options, `-hx` for expert options and `-hh` for all. \nNote: The `@` character can be used in place of the `*` character. String parameter can be:\n"
+			"- empty: print command line options help\n"
+			"- doc: print the general filter info\n"
+			"- alias: print the gpac alias syntax\n"
+			"- log: print the log system help\n"
+			"- core: print the supported libgpac core options. Use -ha/-hx/-hh for advanced/expert options\n"
+			"- cfg: print the GPAC configuration help\n"
+			"- prompt: print the GPAC prompt help when running in interactive mode (see [-k](GPAC) )\n"
+			"- modules: print available modules\n"
+			"- filters: print name of all available filters\n"
+			"- filters:*: print name of all available filters, including meta filters\n"
+			"- codecs: print the supported builtin codecs\n"
+			"- props: print the supported builtin PID and packet properties\n"
+			"- props PNAME: print the supported builtin PID and packet properties mentioning `PNAME`\n"
+			"- colors: print the builtin color names and their values\n"
+			"- layouts: print the builtin CICP audio channel layout names and their values\n"
+			"- links: print possible connections between each supported filters (use -hx to view src->dst cap bundle detail)\n"
+			"- links FNAME: print sources and sinks for filter `FNAME` (either builtin or JS filter)\n"
 			"- FNAME: print filter `FNAME` info (multiple FNAME can be given)\n"
-			" - For meta-filters, use `FNAME:INST`, eg `ffavin:avfoundation`\n"
+			" - For meta-filters, use `FNAME:INST`, e.g. `ffavin:avfoundation`\n"
 			" - Use `*` to print info on all filters (__big output!__), `*:*` to print info on all filters including meta filter instances (__really big output!__)\n"
-			" - By default only basic filter options and description are shown. Use `-ha` to show advanced options capabilities, `-hx` for expert options, `-hh` for all options and filter capabilities including on filters disabled in this build\n"\
+			" - By default only basic filter options and description are shown. Use `-ha` to show advanced options capabilities, `-hx` for expert options, `-hh` for all options and filter capabilities including on filters disabled in this build\n"
 			"- FNAME.OPT: print option `OPT` in filter `FNAME`\n"
 			"- OPT: look in filter names and options for `OPT` and suggest possible matches if none found. Use `-hx` to look for keyword in all option descriptions\n"
 		, NULL, NULL, GF_ARG_STRING, 0),
@@ -603,7 +738,7 @@
 	GF_DEF_ARG("wfx", NULL, "write all filter options and all meta filter arguments in the config file unless already set (__large config file !__)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
 	GF_DEF_ARG("unit-tests", NULL, "enable unit tests of some functions otherwise not covered by gpac test suite", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_HIDE),
 	GF_DEF_ARG("genmd", NULL, "generate markdown doc", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_HIDE),
-	GF_DEF_ARG("xopt", NULL, "do not throw error on any unrecognized options following this option - used to pass arguments to GUI", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("xopt", NULL, "unrecognized options and filters declaration following this option are ignored - used to pass arguments to GUI", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
 	{0}
 };
 
@@ -616,19 +751,21 @@
 			gf_sys_format_help(helpout, help_flags, "Usage: gpac [options] FILTER [LINK] FILTER [...] \n");
 
 		gf_sys_format_help(helpout, help_flags, "gpac is GPAC's command line tool for setting up and running filter chains.\n\n"
-		"__FILTER__: a single filter declaration (eg, `-i file`, `-o dump`, `inspect`, ...), see %s.\n"
-		"__[LINK]__: a link instruction (eg, `@`, `@2`, `@2#StreamType=Visual`, ...), see %s.\n"
+		"__FILTER__: a single filter declaration (e.g., `-i file`, `-o dump`, `inspect`, ...), see %s.\n"
+		"__[LINK]__: a link instruction (e.g., `@`, `@2`, `@2#StreamType=Visual`, ...), see %s.\n"
 		"__[options]__: one or more option strings, each starting with a `-` character.\n"
 		" - an option using a single `-` indicates an option of gpac (see %s) or of libgpac (see %s)\n"
-		" - an option using `--` indicates a global filter option, for example `--block_size=1000` (see %s)\n"
-		" - an option using `-+` indicates a global meta-filter filter (eg FFMPEG) option, for example `-+profile=Baseline` (see %s)\n"
+		" - an option using `--` indicates a global filter or meta-filter (e.g. FFMPEG) option, e.g. `--block_size=1000` or `--profile=Baseline` (see %s)\n"
 		" \n"
 		"Filter declaration order may impact the link resolver which will try linking in declaration order. Most of the time for simple graphs, this has no impact. However, for complex graphs with no link declarations, this can lead to different results. \n"
 		"Options do not require any specific order, and may be present anywhere, including between link statements or filter declarations. \n"
 		"Boolean values do not need any value specified. Other types shall be formatted as `opt=val`, except [-i](), `-src`, [-o](), `-dst` and [-h]() options.\n\n"
+		"\n"
+		"The session can be interrupted at any time using `ctrl+c`, which can also be used to toggle global reporting.\n"
+		"\n"
 		"The possible options for gpac are:\n\n",
 			(gen_doc==1) ? "[gpac -h doc](filters_general#filter-declaration-filter)" : "`gpac -h doc`",
-			(gen_doc==1) ? "[gpac -h doc](filters_general#expliciting-links-between-filters-link)" : "`gpac -h doc`",
+			(gen_doc==1) ? "[gpac -h doc](filters_general#explicit-links-between-filters-link)" : "`gpac -h doc`",
 			(gen_doc==1) ? "[gpac -hx](gpac_general#h)" : "`gpac -hx`",
 			(gen_doc==1) ? "[gpac -hx core](core_options)" : "`gpac -hx core`",
 			(gen_doc==1) ? "[gpac -h doc](core_config#global-filter-options)" : "`gpac -h doc`",
@@ -665,7 +802,7 @@
 }
 
 #ifndef GPAC_DISABLE_DOC
-const char *gpac_config =
+static const char *gpac_config =
 {
 "# Configuration file\n"
 "GPAC uses a configuration file to modify default options of libgpac and filters. This configuration file is located in `$HOME/.gpac/GPAC.cfg`.\n"
@@ -688,7 +825,7 @@
 "Setting this in the config file is equivalent to using `-threads=2`.\n"
 "The options specified at prompt overrides the value of the config file.\n"
 "# Filter options in configuration\n"
-"It is possible to alter the default value of a filter option by modifing the configuration file. Filter __foo__ options are stored in section "
+"It is possible to alter the default value of a filter option by modifying the configuration file. Filter __foo__ options are stored in section "
 "`[filter@foo]`, using option name and value as key-value pair. Options specified through the configuration file do not take precedence over "
 "options specified at prompt or through alias.\n"
 "EX [filter@rtpin]interleave=yes\n"
@@ -703,11 +840,11 @@
 "EX --buffer=100 -i file vout aout:buffer=10\n"
 "This is equivalent to specifying `vout:buffer=100 aout:buffer=10`.\n"
 "Warning: This syntax only applies to regular filter options. It cannot be used with builtin shortcuts (gfreg, enc, ...).\n"
-"Meta-filter options can be set in the same way using the syntax `-+OPT_NAME=VAL`.\n"
-"EX -+profile=Baseline -i file.cmp -o dump.264\n"
+"Meta-filter options can be set in the same way using the syntax `--OPT_NAME=VAL`.\n"
+"EX --profile=Baseline -i file.cmp -o dump.264\n"
 "This is equivalent to specifying `-o dump.264:profile=Baseline`.\n"
 " \n"
-"For both syntax, it is possible to specify the filter registry name of the option, using `--FNAME@OPTNAME=VAL`.\n"
+"For both syntax, it is possible to specify the filter registry name of the option, using `--FNAME:OPTNAME=VAL` or `--FNAME@OPTNAME=VAL`.\n"
 "In this case the option will only be set for filters which are instances of registry FNAME. This is used when several registries use same option names.\n"
 "EX --flist@timescale=100 -i plist1 -i plist2 -o live.mpd\n"
 "This will set the timescale option on the playlists filters but not on the dasher filter.\n"
@@ -776,7 +913,7 @@
 	}
 }
 
-u64 last_report_clock_us = 0;
+static u64 last_report_clock_us = 0;
 static void print_date(u64 time)
 {
 	time_t gtime;
@@ -791,11 +928,14 @@
 	fprintf(stderr, "[%02d:%02d:%02d.%03dZ] ", t->tm_hour, t->tm_min, t->tm_sec, ms);
 }
 
+static Bool in_sig_handler = GF_FALSE;
 static void gpac_print_report(GF_FilterSession *fsess, Bool is_init, Bool is_final)
 {
 	u32 i, count, nb_active;
 	u64 now;
 
+	if (in_sig_handler) return;;
+
 	if (is_init) {
 		if (enable_reports==2)
 			gf_sys_set_console_code(stderr, GF_CONSOLE_SAVE);
@@ -907,7 +1047,7 @@
 		}
 	}
 	else if (event->type==GF_EVENT_QUIT) {
-		gf_fs_abort(fsess, GF_TRUE);
+		gf_fs_abort(fsess, GF_FS_FLUSH_ALL);
 	}
 	return GF_FALSE;
 }
@@ -927,7 +1067,7 @@
 	GPAC_PRINT_HELP
 } GPAC_Command;
 
-struct _gpac_key
+static struct _gpac_key
 {
 	u8 char_code;
 	GPAC_Command cmd_type;
@@ -968,8 +1108,8 @@
 	}
 }
 
-char szFilter[100];
-char szCom[2048];
+static char szFilter[100];
+static char szCom[2048];
 static u64 run_start_time = 0;
 static Bool gpac_fsess_task(GF_FilterSession *fsess, void *callback, u32 *reschedule_ms)
 {
@@ -982,11 +1122,11 @@
 		GPAC_Command c = get_cmd(gf_prompt_get_char());
 		switch (c) {
 		case GPAC_QUIT:
-			gf_fs_abort(fsess, GF_TRUE);
+			gf_fs_abort(fsess, GF_FS_FLUSH_ALL);
 			nb_loops = 0;
 			return GF_FALSE;
 		case GPAC_EXIT:
-			gf_fs_abort(fsess, GF_FALSE);
+			gf_fs_abort(fsess, GF_FS_FLUSH_NONE);
 			nb_loops = 0;
 			return GF_FALSE;
 		case GPAC_PRINT_STATS:
@@ -1118,63 +1258,121 @@
 	}
 	if (runfor>0) {
 		u64 now = gf_sys_clock_high_res();
-		if (!run_start_time) run_start_time = now;
-		else if (now - run_start_time > runfor) {
-			if (runfor_exit)
-				exit(0);
-
-			gf_fs_abort(fsess, GF_TRUE);
-			nb_loops = 0;
+		if (!run_start_time) {
+			run_start_time = now;
+		} else if (now - run_start_time > runfor) {
+			//segfault requested
+			if (exit_mode==1) {
+				exit(127);
+			}
+			//deadlock requested
+			else if (exit_mode==2) {
+				while(1) {
+					gf_sleep(1);
+				}
+			}
+			if (nb_loops || loops_done) {
+				gf_fs_abort(fsess, runfor_exit ? GF_FS_FLUSH_NONE : GF_FS_FLUSH_ALL);
+				run_start_time = 0;
+			} else {
+				if (runfor_exit)
+					exit(0);
+				gf_fs_abort(fsess, GF_FS_FLUSH_ALL);
+			}
 			return GF_FALSE;
 		}
 	}
 
 	if (gf_fs_is_last_task(fsess))
 		return GF_FALSE;
-	*reschedule_ms = 500;
+	//check every 50 ms
+	*reschedule_ms = 50;
 	return GF_TRUE;
 }
 
-static Bool sigint_catched=GF_FALSE;
-static Bool sigint_processed=GF_FALSE;
+static Bool prev_was_cmd=GF_FALSE;
+static Bool signal_catched=GF_FALSE;
+static Bool signal_processed=GF_FALSE;
 #ifdef WIN32
 #include <windows.h>
 static BOOL WINAPI gpac_sig_handler(DWORD sig)
 {
 	if (sig == CTRL_C_EVENT) {
+		Bool is_inter = GF_TRUE;
 #else
 #include <signal.h>
 static void gpac_sig_handler(int sig)
 {
-	if (sig == SIGINT) {
+	if ((sig == SIGINT) || (sig == SIGTERM) || (sig == SIGABRT)) {
+		Bool is_inter = (sig == SIGINT) ? GF_TRUE : GF_FALSE;
 #endif
 		nb_loops = 0;
 		if (session) {
 			char input=0;
 			int res;
-			if (sigint_catched) {
-				if (sigint_processed) {
-					fprintf(stderr, "catched SIGINT twice and session not responding, forcing exit. Please report to GPAC devs https://github.com/gpac/gpac\n");
+			if (signal_catched) {
+				if (signal_processed) {
+					fprintf(stderr, "catched SIGINT|SIGTERM twice and session not responding, forcing exit.\n");
 				}
 				exit(1);
 			}
-			sigint_catched = GF_TRUE;
-			fprintf(stderr, "catched SIGINT - flush session before exit ? (Y/n):\n");
-			res = scanf("%c", &input);
-			if (res!=1) input=0;
-			switch (input) {
-			case 'Y':
-			case 'y':
-			case '\n':
-				sigint_processed = GF_TRUE;
-				gf_fs_abort(session, GF_TRUE);
-				break;
-			case 0:
-				break;
-			default:
-				sigint_processed = GF_TRUE;
-				gf_fs_abort(session, GF_FALSE);
-				break;
+
+			signal_catched = GF_TRUE;
+			if (is_inter) {
+				in_sig_handler = GF_TRUE;
+				fprintf(stderr, "\nToggle reports (r) or flush session before exit (Y/f/n) ? \n");
+rescan:
+				res = scanf("%c", &input);
+				if (res!=1) input=0;
+				switch (input) {
+				case 'Y':
+				case 'y':
+					signal_processed = GF_TRUE;
+					gf_fs_abort(session, GF_FS_FLUSH_FAST);
+					break;
+				case 'F':
+				case 'f':
+					signal_processed = GF_TRUE;
+					gf_fs_abort(session, GF_FS_FLUSH_ALL);
+					break;
+				case 0:
+					break;
+				case '\n':
+					//prev was a command, flush \n
+					if (prev_was_cmd) {
+						prev_was_cmd = GF_FALSE;
+						goto rescan;
+					}
+					break;
+
+				case 'R':
+				case 'r':
+					prev_was_cmd = GF_TRUE;
+					if (!enable_reports) {
+						enable_reports = 2;
+						report_filter = NULL;
+						gf_fs_set_ui_callback(session, gpac_event_proc, session);
+						gf_fs_enable_reporting(session, GF_TRUE);
+						in_sig_handler = GF_FALSE;
+						gpac_print_report(session, GF_TRUE, GF_FALSE);
+					} else {
+						enable_reports = 0;
+						gf_fs_enable_reporting(session, GF_FALSE);
+						gf_sys_set_console_code(stderr, GF_CONSOLE_CLEAR);
+						gf_sys_set_console_code(stderr, GF_CONSOLE_RESTORE);
+					}
+					signal_catched = GF_FALSE;
+					signal_processed = GF_FALSE;
+					break;
+				default:
+					signal_processed = GF_TRUE;
+					gf_fs_abort(session, GF_FS_FLUSH_NONE);
+					break;
+				}
+				in_sig_handler = GF_FALSE;
+			} else {
+				signal_processed = GF_TRUE;
+				gf_fs_abort(session, GF_FS_FLUSH_NONE);
 			}
 		}
 	}
@@ -1201,13 +1399,17 @@
 static int gpac_exit_fun(int code, char **alias_argv, int alias_argc)
 {
 	u32 i;
-	for (i=1; i<gf_sys_get_argc(); i++) {
-		if (!gf_sys_is_arg_used(i)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Warning: argument %s set but not used\n", gf_sys_get_arg(i) ));
+	if (code>=0) {
+		for (i=1; i<gf_sys_get_argc(); i++) {
+			if (!gf_sys_is_arg_used(i)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Warning: argument %s set but not used\n", gf_sys_get_arg(i) ));
+			}
 		}
+	} else {
+		//negative code is unrecognized option, don't print unused arguments
+		code = 1;
 	}
 
-
 	if (alias_argv) {
 		while (gf_list_count(args_alloc)) {
 			gf_free(gf_list_pop_back(args_alloc));
@@ -1221,7 +1423,7 @@
 		if (gen_doc==2) {
 			fprintf(helpout, ".SH EXAMPLES\n.TP\nBasic and advanced examples are available at https://wiki.gpac.io/Filters\n");
 			fprintf(helpout, ".SH MORE\n.LP\nAuthors: GPAC developers, see git repo history (-log)\n"
-			".br\nFor bug reports, feature requests, more information and source code, visit http://github.com/gpac/gpac\n"
+			".br\nFor bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac\n"
 			".br\nbuild: %s\n"
 			".br\nCopyright: %s\n.br\n"
 			".SH SEE ALSO\n"
@@ -1311,6 +1513,9 @@
 				gf_dynstrcat(&argn, "--", NULL);
 			}
 			gf_dynstrcat(&argn, arg->arg_name, NULL);
+			if ((arg->arg_type==GF_PROP_UINT) && arg->min_max_enum && strchr(arg->min_max_enum, '|')) {
+				gf_dynstrcat(&argn, arg->min_max_enum, "@");
+			}
 
 			old_val = gf_cfg_get_key(opts, "allopts", argn);
 			if (old_val) {
@@ -1353,6 +1558,19 @@
 			}
 		}
 	}
+	//look in alias
+	u32 nb_alias = gf_opts_get_key_count("gpac.alias");
+	for (k=0; k<nb_alias; k++) {
+		const char *key = gf_opts_get_key_name("gpac.alias", k);
+		if (gf_sys_word_match(aname, key)) {
+			if (!found) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Unrecognized option \"%s\", did you mean:\n", aname));
+				found = GF_TRUE;
+			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("\t%s (see gpac -h)\n", key));
+		}
+	}
+
 	if (!found) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Unrecognized option \"%s\", check usage \"gpac -h\"\n", aname));
 	}
@@ -1361,48 +1579,105 @@
 static void gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only)
 {
 	Bool found = GF_FALSE;
-	u32 i, count;
+	Bool first = GF_FALSE;
+	u32 i, count, pass_exact = GF_TRUE;
 	if (!fname) return;
+
+	if (filter_only || !is_help) pass_exact = GF_FALSE;
+
+redo_pass:
+
 	count = gf_fs_filters_registers_count(session);
-	for (i=0; i<count; i++) {
-		const GF_FilterRegister *freg = gf_fs_get_filter_register(session, i);
+	if (!pass_exact) {
+		for (i=0; i<count; i++) {
+			const GF_FilterRegister *freg = gf_fs_get_filter_register(session, i);
 
-		if (gf_sys_word_match(fname, freg->name)) {
-			if (!found) {
-				found = GF_TRUE;
-				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Closest filter names: \n"));
+			if (gf_sys_word_match(fname, freg->name)) {
+				if (!first) {
+					first = GF_TRUE;
+					if (!found) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No such filter %s\n", fname));
+						found = GF_TRUE;
+					}
+					GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("Closest filter names: \n"));
+				}
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("- %s\n", freg->name));
 			}
-			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("- %s\n", freg->name));
 		}
 	}
-	if (!found && is_help) {
-		const char *doc_helps[] = {
-			"log", "core", "modules", "doc", "alias", "props", "colors", "cfg", "prompt", "codecs", "links", "bin", "filters", "filters:*", "filters:@", NULL
-		};
-		i=0;
-		while (doc_helps[i]) {
-			if (gf_sys_word_match(fname, doc_helps[i])) {
-				if (!found) {
-					found = GF_TRUE;
-					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Closest help command: \n"));
+
+	if (is_help) {
+		if (!pass_exact) {
+			const char *doc_helps[] = {
+				"log", "core", "modules", "doc", "alias", "props", "colors", "layouts", "cfg", "prompt", "codecs", "links", "bin", "filters", "filters:*", "filters:@", NULL
+			};
+			first = GF_FALSE;
+			i=0;
+			while (doc_helps[i]) {
+				if (gf_sys_word_match(fname, doc_helps[i])) {
+					if (!first) {
+						first = GF_TRUE;
+						if (!found) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No such filter %s\n", fname));
+							found = GF_TRUE;
+						}
+						GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("Closest help commands: \n"));
+					}
+					GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-h %s\n", doc_helps[i]));
 				}
-				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("-h %s\n", doc_helps[i]));
+				i++;
 			}
-			i++;
 		}
+
 		if (!filter_only) {
-			Bool arg_found=GF_FALSE;
 			u32 nb_alias = gf_opts_get_key_count("gpac.alias");
+			first = GF_FALSE;
 			for (i=0; i<nb_alias; i++) {
 				const char *alias = gf_opts_get_key_name("gpac.alias", i);
-				if (gf_sys_word_match(fname, alias)) {
-					if (!found) {
+
+				if (pass_exact) {
+					if (!strcmp(fname, alias+1)) {
+						const char *doc = gf_opts_get_key("gpac.aliasdoc", alias);
+						if (!doc) doc = "Not documented";
+						GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s: %s\n", alias, doc));
 						found = GF_TRUE;
-						GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Closest alias: \n"));
 					}
-					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("%s\n", alias));
+				}
+				else if (gf_sys_word_match(fname, alias)) {
+					if (!first) {
+						first = GF_TRUE;
+						if (!found) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No such filter %s\n", fname));
+							found = GF_TRUE;
+						}
+						GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("Closest alias: \n"));
+					}
+					GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s\n", alias));
+				}
+			}
+			//check in libgpac core opts
+			first = GF_FALSE;
+			i=0;
+			const GF_GPACArg *core_opts = gf_sys_get_options();
+			while (core_opts && core_opts[i].name) {
+				const GF_GPACArg *arg = &core_opts[i];
+				i++;
+
+				if (gf_sys_word_match(fname, arg->name)) {
+					if (!first) {
+						first = GF_TRUE;
+						if (!found) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No such filter %s\n", fname));
+							found = GF_TRUE;
+						}
+						GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("Closest core option: \n"));
+					}
+					GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-%s: %s\n", arg->name, arg->description));
 				}
 			}
+
+			//check filters
+			first = GF_FALSE;
 			for (i=0; i<count; i++) {
 				u32 j=0;
 				const GF_FilterRegister *reg = gf_fs_get_filter_register(session, i);
@@ -1411,12 +1686,23 @@
 					const GF_FilterArgs *arg = &reg->args[j];
 					if (!arg || !arg->arg_name) break;
 					j++;
+
+					if (pass_exact) {
+						if (!strcmp(fname, arg->arg_name)) {
+							gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s.%s %s\n", reg->name, arg->arg_name, arg->arg_desc);
+							found = GF_TRUE;
+						}
+						continue;
+					}
 					if (!gf_sys_word_match(fname, arg->arg_name)) continue;
 
-					if (!arg_found) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("Closest matching filter option:\n", fname));
-						arg_found = GF_TRUE;
-						found = GF_TRUE;
+					if (!first) {
+						first = GF_TRUE;
+						if (!found) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No such filter %s\n", fname));
+							found = GF_TRUE;
+						}
+						GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("Closest matching filter options:\n", fname));
 					}
 					gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s.%s \n", reg->name, arg->arg_name);
 				}
@@ -1424,9 +1710,14 @@
 		}
 	}
 	if (!found) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No filter %swith similar name found, see gpac -h filters%s\n",
-			is_help ? "or help command " : "",
-			is_help ? " or gpac -h" : ""
+		if (pass_exact) {
+			pass_exact = GF_FALSE;
+			goto redo_pass;
+		}
+
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No filter%swith similar name found, see gpac -h filters%s\n",
+			is_help ? ", option or help command " : " ",
+			is_help ? ", gpac -h or search all help using gpac -hx" : ""
 		));
 	}
 }
@@ -1460,14 +1751,33 @@
 	count = gf_cfg_get_key_count(opts, "allopts");
 	for (i=0; i<count; i++) {
 		Bool ffound = GF_FALSE;
+		char *enum_vals=NULL;
 		const char *arg = gf_cfg_get_key_name(opts, "allopts", i);
 		const char *aval = gf_cfg_get_key(opts, "allopts", arg);
 		if ((arg[1]=='+') && (atype!=2)) continue;
 		if ((arg[1]=='-') && (atype==2)) continue;
 
 		arg += 2;
+		char *sep = strchr(arg, '@');
+		if (sep) {
+			sep[0] = 0;
+			enum_vals = strstr(sep+1, argname);
+			if (enum_vals) {
+				if (!f_found) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Unknown argument \"%s%s\" set but not used by any filter - possible matches\n",
+						(atype==2) ? "-+" : (atype ? "--" : szSep), argname));
+					f_found = GF_TRUE;
+				}
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("- %s (%s) in filters %s\n", arg, sep+1, aval));
+				sep[0] = '@';
+				continue;
+			}
+		}
 		u32 alen = (u32) strlen(arg);
-		if (alen>2*len) continue;
+		if (alen>2*len) {
+			if (sep) sep[0] = '@';
+			continue;
+		}
 
 		for (j=0; j<nb_filters; j++) {
 			GF_FilterStats stats;
@@ -1479,8 +1789,10 @@
 				break;
 			}
 		}
-		if (!ffound) continue;
-
+		if (!ffound) {
+			if (sep) sep[0] = '@';
+			continue;
+		}
 		if (gf_sys_word_match(argname, arg)) {
 			if (!f_found) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Unknown argument \"%s%s\" set but not used by any filter - possible matches\n",
@@ -1489,6 +1801,7 @@
 			}
 			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("- %s in filters %s\n", arg, aval));
 		}
+		if (sep) sep[0] = '@';
 	}
 	if (!f_found) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Unknown argument \"%s%s\" set but not used by any filter - no matching argument found\n",
@@ -1532,8 +1845,7 @@
 	Bool write_profile=GF_FALSE;
 	Bool write_core_opts=GF_FALSE;
 	Bool write_extensions=GF_FALSE;
-	s32 link_prev_filter = -1;
-	char *link_prev_filter_ext=NULL;
+	GF_List *links_directive=NULL;
 	GF_List *loaded_filters=NULL;
 	GF_SysArgMode argmode = GF_ARGMODE_BASE;
 	u32 nb_filters = 0;
@@ -1545,11 +1857,16 @@
 	Bool has_alias = GF_FALSE;
 	Bool alias_set = GF_FALSE;
 	GF_FilterSession *tmp_sess;
-	u32 loops_done = 0;
+	Bool alias_is_play = GF_FALSE;
+	Bool prev_filter_is_sink;
+	Bool prev_filter_is_not_source;
+	u32 current_subsession_id;
+	u32 current_source_id;
 	Bool has_xopt = GF_FALSE;
+
 	helpout = stdout;
 
-	//look for mem track and profile, and also process all helpers
+	//look for mem track and profile, and check for link directives
 	for (i=1; i<argc; i++) {
 		char *arg = argv[i];
 		if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
@@ -1575,6 +1892,8 @@
 			char *arg = argv[i];
 			if (gf_opts_get_key("gpac.alias", arg) != NULL) {
 				has_alias = GF_TRUE;
+				if (!strcmp(arg, "-play"))
+					alias_is_play = GF_TRUE;
 				break;
 			}
 		}
@@ -1618,12 +1937,14 @@
 		}
 
 		gf_sys_mark_arg_used(i, GF_TRUE);
-		
+
 		if ((!has_xopt && !strcmp(arg, "-h")) || !strcmp(arg, "-help") || !strcmp(arg, "-ha") || !strcmp(arg, "-hx") || !strcmp(arg, "-hh")) {
 			if (!strcmp(arg, "-ha")) argmode = GF_ARGMODE_ADVANCED;
 			else if (!strcmp(arg, "-hx")) argmode = GF_ARGMODE_EXPERT;
 			else if (!strcmp(arg, "-hh")) argmode = GF_ARGMODE_ALL;
 
+			gf_opts_set_key("temp", "gpac-help", arg+1);
+
 			if (i+1<argc)
 				gf_sys_mark_arg_used(i+1, GF_TRUE);
 
@@ -1646,11 +1967,19 @@
 				gpac_alias_help(argmode);
 				gpac_exit(0);
 			} else if (!strcmp(argv[i+1], "props")) {
-				dump_all_props();
+				if (i+2<argc) {
+					gf_sys_mark_arg_used(i+2, GF_TRUE);
+					dump_all_props(argv[i+2]);
+				} else {
+					dump_all_props(NULL);
+				}
 				gpac_exit(0);
 			} else if (!strcmp(argv[i+1], "colors")) {
 				dump_all_colors();
 				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "layouts")) {
+				dump_all_audio_cicp();
+				gpac_exit(0);
 			} else if (!strcmp(argv[i+1], "cfg")) {
 				gpac_config_help();
 				gpac_exit(0);
@@ -1671,10 +2000,10 @@
 
 				i++;
 			} else if (!strcmp(argv[i+1], "bin")) {
-				gf_sys_format_help(helpout, help_flags, "GPAC binary information:\n"\
-				 	"Version: %s\n"\
-	 		"Compilation configuration: " GPAC_CONFIGURATION "\n"\
-	 		"Enabled features: %s\n" \
+				gf_sys_format_help(helpout, help_flags, "GPAC binary information:\n"
+					"Version: %s\n"
+					"Compilation configuration: " GPAC_CONFIGURATION "\n"
+					"Enabled features: %s\n"
 	 		"Disabled features: %s\n", gf_gpac_version(), gf_sys_features(GF_FALSE), gf_sys_features(GF_TRUE)
 				);
 				gpac_exit(0);
@@ -1688,6 +2017,8 @@
 				i++;
 			} else {
 				print_filter_info = 1;
+				if (!strcmp(argv[i+1], "*:*") || !strcmp(argv[i+1], "@:@"))
+					print_filter_info = 2;
 				sflags |= GF_FS_FLAG_NO_GRAPH_CACHE;
 			}
 		}
@@ -1764,13 +2095,13 @@
 				fprintf(helpout, "%s", auto_gen_md_warning);
 			}
 			gf_sys_format_help(helpout, help_flags, "# GPAC Built-in properties\n");
-			dump_all_props();
+			dump_all_props(NULL);
 //			dump_codecs = GF_TRUE;
 
 			if (gen_doc==2) {
 				fprintf(helpout, ".SH EXAMPLES\n.TP\nBasic and advanced examples are available at https://wiki.gpac.io/Filters\n");
 				fprintf(helpout, ".SH MORE\n.LP\nAuthors: GPAC developers, see git repo history (-log)\n"
-				".br\nFor bug reports, feature requests, more information and source code, visit http://github.com/gpac/gpac\n"
+				".br\nFor bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac\n"
 				".br\nbuild: %s\n"
 				".br\nCopyright: %s\n.br\n"
 				".SH SEE ALSO\n"
@@ -1793,6 +2124,7 @@
 		}
 		else if (!strcmp(arg, "-ltf")) {
 			load_test_filters = GF_TRUE;
+		} else if (!strncmp(arg, "-lcf", 4)) {
 		} else if (!strcmp(arg, "-stats")) {
 			dump_stats = GF_TRUE;
 		} else if (!strcmp(arg, "-graph")) {
@@ -1814,11 +2146,20 @@
 		} else if (!strcmp(arg, "-sloop")) {
 			nb_loops = -1;
 			if (arg_val) nb_loops = atoi(arg_val);
+			if (nb_loops) {
+				gf_opts_set_key("temp", "peristent-jsrt", "true");
+			}
 		} else if (!strcmp(arg, "-runfor")) {
 			if (arg_val) runfor = 1000*atoi(arg_val);
 		} else if (!strcmp(arg, "-runforx")) {
 			if (arg_val) runfor = 1000*atoi(arg_val);
 			runfor_exit = GF_TRUE;
+		} else if (!strcmp(arg, "-runfors")) {
+			if (arg_val) runfor = 1000*atoi(arg_val);
+			exit_mode = 1;
+		} else if (!strcmp(arg, "-runforl")) {
+			if (arg_val) runfor = 1000*atoi(arg_val);
+			exit_mode = 2;
 		} else if (!strcmp(arg, "-uncache")) {
 			const char *cache_dir = gf_opts_get_key("core", "cache");
 			gf_enum_directory(cache_dir, GF_FALSE, revert_cache_file, NULL, ".txt");
@@ -1869,18 +2210,30 @@
 			}
 		} else if (!strcmp(arg, "-unit-tests")) {
 			do_unit_tests = GF_TRUE;
+		} else if (!strcmp(arg, "-cl")) {
+			sflags |= GF_FS_FLAG_NO_IMPLICIT;
+		} else if (!strcmp(arg, "-step")) {
+			use_step_mode = GF_TRUE;
+			sflags |= GF_FS_FLAG_NON_BLOCKING;
 		} else if (!strcmp(arg, "-xopt")) {
 			has_xopt = GF_TRUE;
 		} else if (arg[0]=='-') {
 			if (!strcmp(arg, "-i") || !strcmp(arg, "-src")
 				|| !strcmp(arg, "-o") || !strcmp(arg, "-dst")
 				|| !strcmp(arg, "-ib") || !strcmp(arg, "-ob")
-				|| !strcmp(arg, "-p") || !strcmp(arg, "-")
 			) {
-			} else if (!gf_sys_is_gpac_arg(arg) ) {
+				//skip next arg: input or output, could start with '-'
+				i++;
+				gf_sys_mark_arg_used(i, GF_TRUE);
+			}
+			//profile already processed, and global options (--) handled by libgpac, not this app
+			else if (!strcmp(arg, "-p") || !strcmp(arg, "-")
+			) {
+			}
+			else if (!gf_sys_is_gpac_arg(arg) ) {
 				if (!has_xopt) {
 					gpac_suggest_arg(arg);
-					gpac_exit(1);
+					gpac_exit(-1);
 				} else {
 					gf_sys_mark_arg_used(i, GF_FALSE);
 				}
@@ -1902,15 +2255,24 @@
 	}
 
 	if (dump_stats && gf_sys_get_rti(0, &rti, 0) ) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("System info: %d MB RAM - %d cores\n", (u32) (rti.physical_memory/1024/1024), rti.nb_cores));
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("System info: %d MB RAM - %d cores - main thread ID %d\n", (u32) (rti.physical_memory/1024/1024), rti.nb_cores, gf_th_id() ));
 	}
 	if ((list_filters>=2) || print_meta_filters || dump_codecs || print_filter_info) sflags |= GF_FS_FLAG_LOAD_META;
 
 	if (view_filter_conn || list_filters || (print_filter_info && (argmode == GF_ARGMODE_ALL)) )
 		gf_opts_set_key("temp", "gendoc", "yes");
 
+	if (list_filters || print_filter_info)
+		gf_opts_set_key("temp", "helponly", "yes");
 
 restart:
+	prev_filter_is_sink = 0;
+	current_subsession_id = 0;
+	prev_filter_is_not_source = 0;
+	current_source_id = 0;
+
+	if (view_conn_for_filter && argmode>=GF_ARGMODE_EXPERT)
+		sflags |= GF_FS_FLAG_PRINT_CONNECTIONS;
 
 	session = gf_fs_new_defaults(sflags);
 
@@ -1957,6 +2319,7 @@
 
 	//all good to go, load filters
 	has_xopt = GF_FALSE;
+	links_directive = gf_list_new();
 	loaded_filters = gf_list_new();
 	for (i=1; i<argc; i++) {
 		GF_Filter *filter=NULL;
@@ -1989,29 +2352,18 @@
 			i++;
 			f_loaded = GF_TRUE;
 		}
+		else if (!strncmp(arg, "-lcf", 4)) {
+			f_loaded = GF_TRUE;
+			filter = load_custom_filter(session, arg+4, &e);
+		}
 		//appart from the above src/dst, other args starting with - are not filters
 		else if (arg[0]=='-') {
 			if (!strcmp(arg, "-xopt")) has_xopt = GF_TRUE;
 			continue;
 		}
-		if (!f_loaded) {
+		if (!f_loaded && !has_xopt) {
 			if (arg[0]== separator_set[SEP_LINK] ) {
-				char *ext = strchr(arg, separator_set[SEP_FRAG]);
-				if (ext) {
-					ext[0] = 0;
-					link_prev_filter_ext = ext+1;
-				}
-				link_prev_filter = 0;
-				if (strlen(arg)>1) {
-					link_prev_filter = atoi(arg+1);
-					if (link_prev_filter<0) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Wrong filter index %d, must be positive\n", link_prev_filter));
-						e = GF_BAD_PARAM;
-						goto exit;
-					}
-				}
-
-				if (ext) ext[0] = separator_set[SEP_FRAG];
+				gf_list_add(links_directive, arg);
 				continue;
 			}
 
@@ -2051,6 +2403,8 @@
 		}
 
 		if (!filter) {
+			if (has_xopt)
+				continue;
 			if (!e) e = GF_FILTER_NOT_FOUND;
 
 			if (e!=GF_FILTER_NOT_FOUND) {
@@ -2059,25 +2413,80 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to find filter%s \"%s\"\n", is_simple ? "" : " for", arg));
 
 				gpac_suggest_filter(arg, GF_FALSE, GF_TRUE);
+				nb_filters=0;
 			}
-			nb_filters=0;
 			goto exit;
 		}
 		nb_filters++;
 
-		if (link_prev_filter>=0) {
-			GF_Filter *link_from = gf_list_get(loaded_filters, gf_list_count(loaded_filters)-1-link_prev_filter);
+		if (!(sflags & GF_FS_FLAG_NO_IMPLICIT))
+			gf_filter_tag_subsession(filter, current_subsession_id, current_source_id);
+
+		while (gf_list_count(links_directive)) {
+			char *link_prev_filter_ext = NULL;
+			GF_Filter *link_from;
+			Bool reverse_order = GF_FALSE;
+			s32 link_filter_idx = -1;
+			char *link = gf_list_pop_front(links_directive);
+			char *ext = strchr(link, separator_set[SEP_FRAG]);
+			if (ext) {
+				ext[0] = 0;
+				link_prev_filter_ext = ext+1;
+			}
+			if (strlen(link)>1) {
+				if (link[1] == separator_set[SEP_LINK] ) {
+					reverse_order = GF_TRUE;
+					link++;
+				}
+				link_filter_idx = atoi(link+1);
+				if (link_filter_idx < 0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Wrong filter index %d, must be positive\n", link_filter_idx));
+					e = GF_BAD_PARAM;
+					goto exit;
+				}
+			} else {
+				link_filter_idx = 0;
+			}
+			if (ext) ext[0] = separator_set[SEP_FRAG];
+
+			if (reverse_order)
+				link_from = gf_list_get(loaded_filters, link_filter_idx);
+			else
+				link_from = gf_list_get(loaded_filters, gf_list_count(loaded_filters)-1-link_filter_idx);
+
 			if (!link_from) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Wrong filter index @%d\n", link_prev_filter));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Wrong filter index @%d\n", link_filter_idx));
 				e = GF_BAD_PARAM;
 				goto exit;
 			}
-			link_prev_filter = -1;
 			gf_filter_set_source(filter, link_from, link_prev_filter_ext);
-			link_prev_filter_ext = NULL;
 		}
 
 		gf_list_add(loaded_filters, filter);
+
+		//implicit mode, check changes of source and sinks
+		if (!(sflags & GF_FS_FLAG_NO_IMPLICIT)) {
+			if (gf_filter_is_source(filter)) {
+				if (prev_filter_is_not_source) {
+					current_source_id++;
+					gf_filter_tag_subsession(filter, current_subsession_id, current_source_id);
+				}
+				prev_filter_is_not_source = 0;
+			} else {
+				prev_filter_is_not_source = 1;
+			}
+
+			if (gf_filter_is_sink(filter)) {
+				prev_filter_is_sink = GF_TRUE;
+			}
+			else if (prev_filter_is_sink && gf_filter_is_source(filter)) {
+				prev_filter_is_sink = GF_FALSE;
+				current_subsession_id++;
+				current_source_id=0;
+				prev_filter_is_not_source = 0;
+				gf_filter_tag_subsession(filter, current_subsession_id, current_source_id);
+			}
+		}
 	}
 	if (!gf_list_count(loaded_filters) && !session_js) {
 		if (nothing_to_do && !gen_doc) {
@@ -2094,9 +2503,17 @@
 
 		gf_fs_enable_reporting(session, GF_TRUE);
 	}
+	if (gf_list_count(links_directive)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("Link separators specified but no following filter, ignoring links "));
+		while (gf_list_count(links_directive)) {
+			const char *ld = gf_list_pop_front(links_directive);
+			GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("\"%s\"", ld));
+		}
+		GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("\n"));
+	}
 
 	if (enable_prompt || (runfor>0)) {
-		if (enable_prompt) {
+		if (enable_prompt && !loops_done) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Running session, press 'h' for help\n"));
 		}
 		gf_fs_post_user_task(session, gpac_fsess_task, NULL, "gpac_fsess_task");
@@ -2106,6 +2523,7 @@
 		SetConsoleCtrlHandler((PHANDLER_ROUTINE)gpac_sig_handler, TRUE);
 #else
 		signal(SIGINT, gpac_sig_handler);
+		signal(SIGTERM, gpac_sig_handler);
 #endif
 	}
 
@@ -2113,8 +2531,39 @@
 		gpac_print_report(session, GF_TRUE, GF_FALSE);
 	}
 
-	e = gf_fs_run(session);
-	if (e>0) e = GF_OK;
+	if (!session_js) {
+		u32 j;
+		Bool has_vout = GF_FALSE;
+		Bool has_compositor = GF_FALSE;
+		for (j=0; j<gf_list_count(loaded_filters); j++) {
+			GF_FilterStats stats;
+			GF_Filter *f = gf_list_get(loaded_filters, j);
+			gf_filter_get_stats(f, &stats);
+			if (!stats.reg_name) continue;
+			if (!strcmp(stats.reg_name, "vout")) has_vout=GF_TRUE;
+			//if compositor in player mode, don't load script
+			else if (!strcmp(stats.reg_name, "compositor")) {
+				GF_PropertyValue p;
+				gf_filter_get_arg(f, "player", &p);
+				if (p.value.uint!=0)
+					has_compositor=GF_TRUE;
+			}
+		}
+		if (has_vout && !has_compositor) {
+			session_js = "$GSHARE/scripts/vout.js";
+			gf_fs_load_script(session, session_js);
+		}
+	}
+
+	if (use_step_mode) {
+		do {
+			gf_fs_run(session);
+		} while (!gf_fs_is_last_task(session));
+
+	} else {
+		e = gf_fs_run(session);
+		if (e>0) e = GF_OK;
+	}
 
 	if (e) {
 		fprintf(stderr, "session error %s\n", gf_error_to_string(e) );
@@ -2135,6 +2584,7 @@
 		}
 		gpac_print_report(session, GF_FALSE, GF_TRUE);
 	}
+	gf_fs_print_non_connected_ex(session, alias_is_play);
 
 exit:
 	if (enable_reports==2) {
@@ -2154,6 +2604,7 @@
 	session = NULL;
 	gf_fs_del(tmp_sess);
 	if (loaded_filters) gf_list_del(loaded_filters);
+	if (links_directive) gf_list_del(links_directive);
 
 	cleanup_file_io();
 
@@ -2161,10 +2612,18 @@
 		if (nb_loops>0) nb_loops--;
 		loops_done++;
 		fprintf(stderr, "session done, restarting (loop %d)\n", loops_done);
+		fflush(stderr);
 		gf_log_reset_file();
 		goto restart;
 	}
 
+#ifdef GPAC_HAS_QJS
+	if (loops_done) {
+		void gf_js_delete_runtime();
+		gf_js_delete_runtime();
+	}
+#endif
+
 	gpac_exit(e<0 ? 1 : 0);
 }
 
@@ -2201,7 +2660,7 @@
 		//dump some interesting predefined ones which are not mapped to types
 		if (cap->code==GF_PROP_PID_STREAM_TYPE) szVal = gf_stream_type_name(cap->val.value.uint);
 		else if (cap->code==GF_PROP_PID_CODECID) szVal = (const char *) gf_codecid_name(cap->val.value.uint);
-		else szVal = gf_props_dump_val(&cap->val, szDump, GF_FALSE, NULL);
+		else szVal = gf_props_dump_val(&cap->val, szDump, GF_PROP_DUMP_DATA_NONE, NULL);
 
 		gf_sys_format_help(helpout, help_flags, " %s=\"%s\"", szName, szVal);
 		if (cap->priority) gf_sys_format_help(helpout, help_flags, ", priority=%d", cap->priority);
@@ -2242,7 +2701,12 @@
 	}
 	if (a->flags & GF_FS_ARG_UPDATE) gf_sys_format_help(helpout, help_flags, ", updatable");
 //		if (a->flags & GF_FS_ARG_META) gf_sys_format_help(helpout, help_flags, ", meta");
-	gf_sys_format_help(helpout, help_flags | GF_PRINTARG_OPT_DESC, "): %s\n", a->arg_desc);
+
+	if (is_enum && a->arg_desc && !strchr(a->arg_desc, '\n')) {
+		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_OPT_DESC, "): %s (%s)\n", a->arg_desc, a->min_max_enum);
+	} else {
+		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_OPT_DESC, "): %s\n", a->arg_desc);
+	}
 
 	//check syntax
 	if (gen_doc) {
@@ -2256,6 +2720,8 @@
 
 	if (a->min_max_enum && strchr(a->min_max_enum, '|'))
 		gf_sys_format_help(helpout, help_flags, "\n");
+	else if (!a->min_max_enum && a->arg_desc && strstr(a->arg_desc, "\n- "))
+		gf_sys_format_help(helpout, help_flags, "\n");
 }
 
 static void print_filter_single_opt(const GF_FilterRegister *reg, char *optname, GF_Filter *filter_inst)
@@ -2263,8 +2729,10 @@
 	u32 idx=0;
 	Bool found = GF_FALSE;
 	const GF_FilterArgs *args = NULL;
-	if (filter_inst) args = gf_filter_get_args(filter_inst);
-	else args = reg->args;
+	if (filter_inst)
+		args = gf_filter_get_args(filter_inst);
+	else if (reg)
+		args = reg->args;
 
 	if (!args) return;
 
@@ -2300,17 +2768,44 @@
 	fprintf(stderr, "No such option %s for filter %s\n", optname, filter_inst ? gf_filter_get_name(filter_inst) : reg->name);
 }
 
-static void print_filter(const GF_FilterRegister *reg, GF_SysArgMode argmode, GF_Filter *filter_inst)
+static void print_filter(const GF_FilterRegister *reg, GF_SysArgMode argmode, GF_Filter *filter_inst, char *inst_name)
 {
+	u32 idx=0;
 	const GF_FilterArgs *args = NULL;
+	const char *reg_name, *reg_desc;
+#ifndef GPAC_DISABLE_DOC
+	const char *reg_help;
+#endif
+	Bool jsmod_help = (argmode>GF_ARGMODE_ALL) ? GF_TRUE : GF_FALSE;
+
+	if (filter_inst) {
+		reg_name = inst_name;
+		reg_desc = gf_filter_get_description(filter_inst);
+#ifndef GPAC_DISABLE_DOC
+		reg_help = gf_filter_get_help(filter_inst);
+#endif
+	} else if (reg) {
+		reg_name = reg->name;
+		reg_desc = reg->description;
+#ifndef GPAC_DISABLE_DOC
+		reg_help = reg->help;
+#endif
+	} else {
+		return;
+	}
+
+	//happens on some meta filter or JS filters
+	if (!reg_desc) {
+		reg_desc = "No description available";
+	}
 
 	if (gen_doc==1) {
 		char szName[1024];
-		sprintf(szName, "%s.md", reg->name);
+		sprintf(szName, "%s.md", reg_name);
 		if (gen_doc==1) {
 			gf_fclose(helpout);
 			helpout = gf_fopen(szName, "w");
-			fprintf(helpout, "[**HOME**](Home) » [**Filters**](Filters) » %s\n", reg->description);
+			fprintf(helpout, "[**HOME**](Home) » [**Filters**](Filters) » %s\n", reg_desc);
 			fprintf(helpout, "%s", auto_gen_md_warning);
 
 			if (!sidebar_md) {
@@ -2343,49 +2838,44 @@
 					gf_free(sbbuf);
 				}
 			}
+			fprintf(sidebar_md, "[[%s (%s)|%s]] \n", reg_desc, reg_name, reg_name);
 #ifndef GPAC_DISABLE_DOC
-			if (reg->description) {
-				fprintf(sidebar_md, "[[%s (%s)|%s]] \n", reg->description, reg->name, reg->name);
-			} else {
-				fprintf(sidebar_md, "[[%s|%s]] \n", reg->name, reg->name);
-			}
-			if (!reg->help) {
-				fprintf(stderr, "filter %s without help, forbidden\n", reg->name);
-				exit(1);
-			}
-			if (!reg->description) {
-				fprintf(stderr, "filter %s without description, forbidden\n", reg->name);
+
+			if (!reg_help) {
+				fprintf(stderr, "filter %s without help, forbidden\n", reg_name);
 				exit(1);
 			}
 #endif
 		}
 
 #ifndef GPAC_DISABLE_DOC
-		gf_sys_format_help(helpout, help_flags, "# %s\n", reg->description);
+		gf_sys_format_help(helpout, help_flags, "# %s\n", reg_desc);
 #endif
-		gf_sys_format_help(helpout, help_flags, "Register name used to load filter: **%s**\n", reg->name);
-		if (reg->flags & GF_FS_REG_EXPLICIT_ONLY) {
-			gf_sys_format_help(helpout, help_flags, "This filter is not checked during graph resolution and needs explicit loading.\n");
+		gf_sys_format_help(helpout, help_flags, "Register name used to load filter: **%s**\n", reg_name);
+		if (filter_inst) {
+			gf_sys_format_help(helpout, help_flags, "This is a JavaScript filter, not checked during graph resolution and needs explicit loading.\n");
 		} else {
-			gf_sys_format_help(helpout, help_flags, "This filter may be automatically loaded during graph resolution.\n");
-		}
-		if (reg->flags & GF_FS_REG_REQUIRES_RESOLVER) {
-			gf_sys_format_help(helpout, help_flags, "This filter requires the graph resolver to be activated.\n");
-		}
-	} else {
-		gf_sys_format_help(helpout, help_flags, "# %s\n", filter_inst ? gf_filter_get_name(filter_inst) : reg->name);
-		if (filter_inst)
-			gf_sys_format_help(helpout, help_flags, "Description: %s\n", gf_filter_get_description(filter_inst) );
-		else {
-#ifndef GPAC_DISABLE_DOC
-			if (reg->description) gf_sys_format_help(helpout, help_flags, "Description: %s\n", reg->description);
-#endif
-
+			if (reg->flags & GF_FS_REG_EXPLICIT_ONLY) {
+				gf_sys_format_help(helpout, help_flags, "This filter is not checked during graph resolution and needs explicit loading.\n");
+			} else {
+				gf_sys_format_help(helpout, help_flags, "This filter may be automatically loaded during graph resolution.\n");
+			}
+			if (reg->flags & GF_FS_REG_REQUIRES_RESOLVER) {
+				gf_sys_format_help(helpout, help_flags, "This filter requires the graph resolver to be activated.\n");
+			}
+			if (reg->flags & GF_FS_REG_ALLOW_CYCLIC) {
+				gf_sys_format_help(helpout, help_flags, "Filters of this class can connect to each-other.\n");
+			}
 		}
+	} else if (!jsmod_help) {
+		gf_sys_format_help(helpout, help_flags, "# %s\n", reg_name);
+		gf_sys_format_help(helpout, help_flags, "Description: %s\n", reg_desc );
 
-		if (filter_inst)
-			gf_sys_format_help(helpout, help_flags, "Version: %s\n", gf_filter_get_version(filter_inst) );
-		else {
+		if (filter_inst) {
+			const char *version = gf_filter_get_version(filter_inst);
+			if (version)
+				gf_sys_format_help(helpout, help_flags, "Version: %s\n", version );
+		} else {
 			if (reg->version) {
 				if (!strncmp(reg->version, "! ", 2)) {
 					if (!gen_doc)
@@ -2398,11 +2888,26 @@
 	}
 
 	if (filter_inst) {
-		gf_sys_format_help(helpout, help_flags, "Author: %s\n", gf_filter_get_author(filter_inst) );
-		gf_sys_format_help(helpout, help_flags, "\n%s\n\n", gf_filter_get_help(filter_inst) );
-	} else {
+		const char *str;
+		if (!jsmod_help) {
+			str = gf_filter_get_author(filter_inst);
+			if (str)
+				gf_sys_format_help(helpout, help_flags, "%s: %s\n", (str[0]=='-') ? "Configuration" : "Author", str );
+		}
+		str = gf_filter_get_help(filter_inst);
+		if (str)
+			gf_sys_format_help(helpout, help_flags, "\n%s\n\n", str);
+	} else if (reg) {
 #ifndef GPAC_DISABLE_DOC
-		if (reg->author) gf_sys_format_help(helpout, help_flags, "Author: %s\n", reg->author);
+		if (reg->author) {
+			if (reg->author[0]=='-') {
+				if (! (help_flags & (GF_PRINTARG_MD|GF_PRINTARG_MAN))) {
+					gf_sys_format_help(helpout, help_flags, "Configuration: %s\n", reg->author);
+				}
+			} else {
+				gf_sys_format_help(helpout, help_flags, "Author: %s\n", reg->author);
+			}
+		}
 		if (reg->help) {
 			u32 hf = help_flags;
 			if (gen_doc==1) hf |= GF_PRINTARG_ESCAPE_XML;
@@ -2413,7 +2918,7 @@
 #endif
 	}
 
-	if (argmode==GF_ARGMODE_EXPERT) {
+	if (reg && (argmode==GF_ARGMODE_EXPERT)) {
 		if (reg->max_extra_pids==(u32) -1) gf_sys_format_help(helpout, help_flags, "Max Input PIDs: any\n");
 		else gf_sys_format_help(helpout, help_flags, "Max Input PIDs: %d\n", 1 + reg->max_extra_pids);
 
@@ -2423,7 +2928,7 @@
 		if (reg->flags & GF_FS_REG_CONFIGURE_MAIN_THREAD) gf_sys_format_help(helpout, help_flags, " ConfigureMainThread");
 		if (reg->flags & GF_FS_REG_HIDE_WEIGHT) gf_sys_format_help(helpout, help_flags, " HideWeight");
 		if (reg->flags & GF_FS_REG_REQUIRES_RESOLVER) gf_sys_format_help(helpout, help_flags, " RequireResolver");
-		if (reg->flags & GF_FS_REG_DYNLIB) gf_sys_format_help(helpout, help_flags, " DynamicLib");
+		if (reg->flags & GF_FS_REG_ALLOW_CYCLIC) gf_sys_format_help(helpout, help_flags, " CyclicAllowed");
 		if (reg->probe_url) gf_sys_format_help(helpout, help_flags, " URLMimeProber");
 		if (reg->probe_data) gf_sys_format_help(helpout, help_flags, " DataProber");
 		if (reg->reconfigure_output) gf_sys_format_help(helpout, help_flags, " ReconfigurableOutput");
@@ -2436,8 +2941,20 @@
 	if (filter_inst) args = gf_filter_get_args(filter_inst);
 	else args = reg->args;
 
-	if (args) {
-		u32 idx=0;
+	u32 nb_opts=0;
+	idx=0;
+	while (1) {
+		const GF_FilterArgs *a = & args[idx];
+		if (!a || !a->arg_name) break;
+		idx++;
+		if (a->flags & GF_FS_ARG_HINT_HIDE) continue;
+		nb_opts++;
+	}
+	if (!nb_opts)
+		args = NULL;
+
+	if (args && !jsmod_help) {
+		idx=0;
 		if (gen_doc==1) {
 			gf_sys_format_help(helpout, help_flags, "# Options \n");
 		} else {
@@ -2485,8 +3002,9 @@
 			u32 j=0;
 			char szArg[100];
 			sprintf(szArg, " %s ", a->arg_name);
-			if (reg->help && strstr(reg->help, szArg)) {
-				fprintf(stderr, "\nWARNING: filter %s bad help, uses arg %s without link\n", reg->name, a->arg_name);
+			char *quoted = reg_help ? strstr(reg_help, szArg) : NULL;
+			if (quoted) {
+				fprintf(stderr, "\nWARNING: filter %s bad help, uses arg %s without link: \"... %s\"\n", reg_name, a->arg_name, quoted);
 				exit(1);
 			}
 			while (1) {
@@ -2494,25 +3012,45 @@
 				if (!anarg || !anarg->arg_name) break;
 				j++;
 				if (a == anarg) continue;
-				if (reg->help && strstr(reg->help, szArg)) {
-					fprintf(stderr, "\nWARNING: filter %s bad description for argument %s, uses arg %s without link\n", reg->name, anarg->arg_name, a->arg_name);
+				if (reg_help && strstr(reg_help, szArg)) {
+					fprintf(stderr, "\nWARNING: filter %s bad description for argument %s, uses arg %s without link\n", reg_name, anarg->arg_name, a->arg_name);
 					exit(1);
 				}
 			}
-			
+
 			if (a->min_max_enum) {
 				//check format
- if ((a->arg_type!=GF_PROP_UINT_LIST) && !(a->flags&GF_FS_ARG_META) && strchr(a->min_max_enum, '|') ) {
- 	if (!strstr(a->arg_desc, "- ")) {
- 	fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, missing list bullet \"- \"\n", reg->name, a->arg_name);
+ if ((a->arg_type!=GF_PROP_UINT_LIST) && !(a->flags&GF_FS_ARG_META) && strchr(a->min_max_enum, '|') && (!a->arg_default_val || strcmp(a->arg_default_val, "-1")) ) {
+					const char *a_val = a->min_max_enum;
+					while (a_val[0] == '|') a_val++;
+					if (strstr(a->arg_desc, "see filter "))
+						a_val = NULL;
+					while (a_val) {
+						char szName[100];
+						const char *a_sep = strchr(a_val, '|');
+						u32 len = a_sep ? (u32)(a_sep - a_val) : (u32)strlen(a_val);
+						strcpy(szName, "- ");
+						strncat(szName, a_val, MIN(sizeof(szName)-3,len));
+						szName[2+len]=0;
+						strcat(szName, ": ");
+
+						if (!strstr(a->arg_desc, szName)) {
+							fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, missing list bullet \"%s\"\n", reg_name, a->arg_name, szName);
+							exit(1);
+						}
+						if (!a_sep) break;
+						a_val = a_sep+1;
+					}
+					if (a_val && !strstr(a->arg_desc, "- ")) {
+ 	fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, missing list bullet \"- \"\n", reg_name, a->arg_name);
 	exit(1);
 					}
- 	if (strstr(a->arg_desc, ":\n")) {
- 	fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, should not use \":\\n\"\n", reg->name, a->arg_name);
+					if (a_val && strstr(a->arg_desc, ":\n")) {
+ 	fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, should not use \":\\n\"\n", reg_name, a->arg_name);
 	exit(1);
 					}
 } else if (!(a->flags&GF_FS_ARG_META) && strchr(a->arg_desc, '\n')) {
-					fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, should not contain \"\\n\"\n", reg->name, a->arg_name);
+					fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, should not contain \"\\n\"\n", reg_name, a->arg_name);
 					exit(1);
 				}
 			}
@@ -2521,7 +3059,7 @@
 
 				achar = a->arg_desc[strlen(a->arg_desc)-1];
 				if (achar == '\n') {
-					fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, should not end with \"\\n\"\n", reg->name, a->arg_name);
+					fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, should not end with \"\\n\"\n", reg_name, a->arg_name);
 					exit(1);
 				}
 
@@ -2529,29 +3067,33 @@
 				if ((achar >= 'A') && (achar <= 'Z')) {
 					achar = a->arg_desc[1];
 					if ((achar < 'A') || (achar > 'Z')) {
-						fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, should start with lowercase\n", reg->name, a->arg_name);
+						fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, should start with lowercase\n", reg_name, a->arg_name);
 						exit(1);
 					}
 				}
 				if (a->arg_desc[0] == ' ') {
-					fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, first character should not be space\n", reg->name, a->arg_name);
+					fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, first character should not be space\n", reg_name, a->arg_name);
 					exit(1);
 				}
 				sep = strchr(a->arg_desc+1, ' ');
 				if (sep) sep--;
 				if (sep && (sep[0] == 's') && (sep[-1] != 's')) {
-					fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, first word should be infinitive\n", reg->name, a->arg_name);
+					fprintf(stderr, "\nWARNING: filter %s bad description format for arg %s, first word should be infinitive\n", reg_name, a->arg_name);
 					exit(1);
 				}
 			}
 #endif
 		}
-	} else {
+	} else if (!args) {
 		gf_sys_format_help(helpout, help_flags, "No options\n");
 	}
 
-	if (reg->nb_caps) {
-		if (!gen_doc && (argmode==GF_ARGMODE_ALL)) {
+	if (!gen_doc && (argmode==GF_ARGMODE_ALL)) {
+		if (filter_inst) {
+			u32 nb_caps = 0;
+			const GF_FilterCapability *caps = gf_filter_get_caps(filter_inst, &nb_caps);
+			dump_caps(nb_caps, caps);
+		} else if (reg->nb_caps) {
 			dump_caps(reg->nb_caps, reg->caps);
 		}
 	}
@@ -2574,95 +3116,209 @@
 	return GF_FALSE;
 }
 
+struct __jsenum_info
+{
+	GF_FilterSession *session;
+	GF_SysArgMode argmode;
+	Bool print_filter_info;
+	const char *path;
+	char *js_dir;
+};
+
+static Bool jsinfo_enum(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	struct __jsenum_info *jsi = (struct __jsenum_info *)cbck;
+	GF_Filter *f;
+	if (jsi->js_dir && strcmp(item_name, "init.js")) {
+		return GF_FALSE;
+	}
+	f = gf_fs_load_filter(jsi->session, item_path, NULL);
+	if (f) {
+		char szPath[GF_MAX_PATH];
+		char *ext;
+		if (jsi->js_dir) {
+			strcpy(szPath, jsi->js_dir);
+		} else {
+			strcpy(szPath, item_name);
+		}
+		ext = gf_file_ext_start(szPath);
+		if (ext) ext[0] = 0;
+		if (jsi->print_filter_info || gen_doc)
+			print_filter(NULL, jsi->argmode, f, szPath);
+		else
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s: %s\n", szPath, gf_filter_get_description(f));
+	}
+	return GF_FALSE;
+}
+static Bool jsinfo_dir_enum(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	char szPath[GF_MAX_PATH];
+	struct __jsenum_info *jsi = (struct __jsenum_info *)cbck;
+	jsi->js_dir = item_name;
+
+	strcpy(szPath, jsi->path);
+	strcat(szPath, item_name);
+	strcat(szPath, "/");
+	gf_enum_directory(szPath, GF_FALSE, jsinfo_enum, jsi, ".js");
+	jsi->js_dir = NULL;
+	return GF_FALSE;
+}
+
 static Bool print_filters(int argc, char **argv, GF_FilterSession *session, GF_SysArgMode argmode)
 {
 	Bool found = GF_FALSE;
+	Bool print_all = GF_FALSE;
 	char *fname = NULL;
 	char *l_fname = NULL;
 	u32 lf_len = 0;
 	u32 i, count = gf_fs_filters_registers_count(session);
 
 	if (!gen_doc && list_filters) gf_sys_format_help(helpout, help_flags, "Listing %d supported filters%s:\n", count, (list_filters==2) ? " including meta-filters" : "");
-	for (i=0; i<count; i++) {
-		const GF_FilterRegister *reg = gf_fs_get_filter_register(session, i);
-		if (gen_doc) {
-			print_filter(reg, argmode, NULL);
-			found = GF_TRUE;
-		} else if (print_filter_info) {
-			u32 k;
-			//all good to go, load filters
-			for (k=1; k<(u32) argc; k++) {
-				char *arg = argv[k];
-				char *sepe;
-				char *optname = NULL;
-				if (arg[0]=='-') continue;
 
-				sepe = gf_file_basename(arg);
-				if (sepe) sepe = strchr(sepe, '.');
+	if (print_filter_info != 1) {
+		for (i=0; i<count; i++) {
+			const GF_FilterRegister *reg = gf_fs_get_filter_register(session, i);
+			if (gen_doc) {
+				print_filter(reg, argmode, NULL, NULL);
+			} else if (print_filter_info) {
+				print_filter(reg, argmode, NULL, NULL);
+			} else {
+#ifndef GPAC_DISABLE_DOC
+				gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s: %s\n", reg->name, reg->description);
+#else
+				gf_sys_format_help(helpout, help_flags, "%s (compiled without built-in doc)\n", reg->name);
+#endif
+			}
+		}
+		found = GF_TRUE;
+	}
+	//print a specific filter info, browse args
+	else {
+		u32 k;
+		//all good to go, load filters
+		for (k=1; k<(u32) argc; k++) {
+			char *arg = argv[k];
+			char *sepe;
+			Bool found_freg = GF_FALSE;
+			char *optname = NULL;
+			if (arg[0]=='-') continue;
+
+			sepe = gf_file_basename(arg);
+			if (sepe) sepe = strchr(sepe, '.');
+			if (sepe) {
+				if (!strncmp(sepe, ".js.", 4)) sepe = strchr(sepe+1, '.');
+				else if (!strcmp(sepe, ".js")) sepe = NULL;
 				if (sepe) {
-					if (!strncmp(sepe, ".js.", 4)) sepe = strchr(sepe+1, '.');
-					else if (!strcmp(sepe, ".js")) sepe = NULL;
-					if (sepe) {
-						sepe[0] = 0;
-						optname = sepe+1;
-					}
+					sepe[0] = 0;
+					optname = sepe+1;
 				}
-				fname = arg;
-
+			}
+			fname = arg;
+			for (i=0; i<count; i++) {
+				const GF_FilterRegister *reg = gf_fs_get_filter_register(session, i);
+				//exact match
 				if (!strcmp(arg, reg->name) ) {
 					if (optname)
 						print_filter_single_opt(reg, optname, NULL);
 					else
-						print_filter(reg, argmode, NULL);
-					found = GF_TRUE;
-				} else {
+						print_filter(reg, argmode, NULL, NULL);
+					found_freg = GF_TRUE;
+				}
+				//search for name:*, also accept *:*
+				else {
 					char *sepo = strchr(arg, ':');
-					char *sepd = strchr(reg->name, ':');
-					Bool patch_meta = GF_FALSE;
-					if (sepo && sepd) {
-						char *subf = strstr(reg->name, sepo+1);
-						if (subf) {
-							u32 slen = (u32) strlen(sepo+1);
-							if ((subf[slen]==0) || (subf[slen]==','))
-								patch_meta = GF_TRUE;
-						}
-					}
+
 					if (!strcmp(arg, "*:*") || !strcmp(arg, "@:@")
 						|| (!sepo && (!strcmp(arg, "*") || !strcmp(arg, "@")) )
-					 	|| (sepo && (!strcmp(sepo, ":*") || !strcmp(sepo, ":@")) && !strncmp(reg->name, arg, 1+sepo - arg) )
-					 	|| patch_meta
+						|| (sepo && (!strcmp(sepo, ":*") || !strcmp(sepo, ":@")) && !strncmp(reg->name, arg, 1+sepo - arg) )
 					) {
 						if (optname)
 							print_filter_single_opt(reg, optname, NULL);
 						else
-							print_filter(reg, argmode, NULL);
-						found = GF_TRUE;
-						break;
+							print_filter(reg, argmode, NULL, NULL);
+						found_freg = GF_TRUE;
+						if (!strcmp(arg, "*")) print_all = GF_TRUE;
 					}
-					//quick shortcuts
-					else if (!strcmp(reg->name, "jsf") && (!strncmp(arg, "jsf:", 4) || strstr(arg, ".js")) ) {
-						GF_Filter *f = gf_fs_load_filter(session, arg, NULL);
-						if (f) {
-							if (optname)
-								print_filter_single_opt(reg, optname, f);
-							else
-								print_filter(reg, argmode, f);
-							found = GF_TRUE;
-						}
+				}
+			}
+			if (found_freg) {
+				found = GF_TRUE;
+			} else /*if (!strchr(arg, ':')) */ {
+				GF_SysArgMode _argmode = argmode;
+				char *js_opt = strchr(arg, ':');
+				if (js_opt) {
+					js_opt[0] = 0;
+					gf_opts_set_key("temp", "gpac-js-help", js_opt+1);
+					_argmode = GF_ARGMODE_ALL+1;
+				}
+				//try to load the filter (JS)
+				GF_Filter *f = gf_fs_load_filter(session, arg, NULL);
+				const GF_FilterRegister *reg = f ? gf_filter_get_register(f) : NULL;
+				if (!reg || !(reg->flags & GF_FS_REG_SCRIPT))
+					f = NULL;
+
+				if (f) {
+					char *ext;
+					char szPath[GF_MAX_PATH];
+					strcpy(szPath, gf_file_basename(arg) );
+					ext = gf_file_ext_start(szPath);
+					if (ext) ext[0] = 0;
+					if (optname) {
+						print_filter_single_opt(NULL, optname, f);
+					} else {
+						print_filter(NULL, _argmode, f, szPath);
 					}
+					found = GF_TRUE;
+				}
+				if (js_opt) {
+					js_opt[0] = ':';
+					gf_opts_set_key("temp", "gpac-js-help", NULL);
 				}
-				if (sepe) sepe[0] = '.';
 			}
-		} else {
-#ifndef GPAC_DISABLE_DOC
-			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s: %s\n", reg->name, reg->description);
-#else
-			gf_sys_format_help(helpout, help_flags, "%s (compiled without built-in doc)\n", reg->name);
-#endif
-			found = GF_TRUE;
+			if (sepe) sepe[0] = '.';
+		}
+	}
 
+	if (print_all || !print_filter_info || gen_doc) {
+		const char *js_dirs = gf_opts_get_key("core", "js-dirs");
+		char szPath[GF_MAX_PATH];
+		struct __jsenum_info jsi;
+		jsi.argmode = argmode;
+		jsi.session = session;
+		jsi.print_filter_info = print_filter_info;
+
+		gf_log_set_tools_levels("console@error", GF_FALSE);
+
+		if (gf_opts_default_shared_directory(szPath)) {
+			strcat(szPath, "/scripts/jsf/");
+			jsi.path = szPath;
+			gf_enum_directory(szPath, GF_FALSE, jsinfo_enum, &jsi, ".js");
+			gf_enum_directory(szPath, GF_TRUE, jsinfo_dir_enum, &jsi, NULL);
+		}
+		while (js_dirs && js_dirs[0]) {
+			char *sep = strchr(js_dirs, ',');
+			if (sep) {
+				u32 cplen = (u32) (sep-js_dirs);
+				if (cplen>=GF_MAX_PATH) cplen = GF_MAX_PATH-1;
+				strncpy(szPath, js_dirs, cplen);
+				szPath[cplen]=0;
+				js_dirs = sep+1;
+			} else {
+				strcpy(szPath, js_dirs);
+			}
+			//pre 1.1, $GJS was inserted by default
+			if (strcmp(szPath, "$GJS")) {
+				u32 len = (u32) strlen(szPath);
+				if (len && (szPath[len-1]!='/') && (szPath[len-1]!='\\'))
+					strcat(szPath, "/");
+				gf_enum_directory(szPath, GF_FALSE, jsinfo_enum, &jsi, ".js");
+			}
+			if (!sep) break;
 		}
+		return GF_TRUE;
 	}
+
+
 	if (found) return GF_TRUE;
 	if (!fname) return GF_FALSE;
 	if (!print_filter_info) return GF_FALSE;
@@ -2685,7 +3341,7 @@
 			if (argmode==GF_ARGMODE_EXPERT) {
 				if (!arg->arg_desc || !strstr_nocase(arg->arg_desc, l_fname, lf_len)) continue;
 				if (!found) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("\"%s\" is mentionned in the following filters options:\n", fname));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("\"%s\" is mentioned in the following filters options:\n", fname));
 					found = GF_TRUE;
 				}
 				gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s.%s \n", reg->name, arg->arg_name);
@@ -2707,14 +3363,13 @@
 
 	if (found) return GF_TRUE;
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No such filter \"%s\"\n", fname));
 	gpac_suggest_filter(fname, GF_TRUE, GF_FALSE);
 	return GF_FALSE;
 }
 
-static void dump_all_props(void)
+static void dump_all_props(char *pname)
 {
-	u32 i=0;
+	u32 i=0, pname_len = pname ? (u32) strlen(pname) : 0;
 	const GF_BuiltInProperty *prop_info;
 
 	if (gen_doc==1) {
@@ -2726,22 +3381,26 @@
 		for (i=GF_PROP_FORBIDEN+1; i<GF_PROP_LAST_DEFINED; i++) {
 			if (i==GF_PROP_STRING_NO_COPY) continue;
 			if (i==GF_PROP_DATA_NO_COPY) continue;
+			if ((i>=GF_PROP_LAST_NON_ENUM) && (i<GF_PROP_FIRST_ENUM)) continue;
 			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, "%s | %s \n", gf_props_get_type_name(i), gf_props_get_type_desc(i) );
 		}
 
 		gf_sys_format_help(helpout, help_flags, "## Built-in properties for PIDs and packets, pixel formats and audio formats\n"
 		" \n"
 		"Flags can be:\n"
-		"- D: dropable property, see [GSF mux](gsfmx) filter help for more info\n"
+		"- D: droppable property, see [GSF multiplexer](gsfmx) filter help for more info\n"
 		"- P: property applying to packet\n"
 		" \n");
 		gf_sys_format_help(helpout, help_flags, "Name | type | Flags | Description | 4CC \n");
 		gf_sys_format_help(helpout, help_flags, "--- | --- | --- | --- | --- \n");
+	} else if (pname) {
+		gf_sys_format_help(helpout, help_flags, "Built-in properties matching `%s` for PIDs and packets listed as `Name (4CC type FLAGS): description`\n`FLAGS` can be D (droppable - see GSF multiplexer filter help), P (packet property)\n", pname);
 	} else {
 		gf_sys_format_help(helpout, help_flags, "Built-in property types\n");
-		for (i=GF_PROP_FORBIDEN+1; i<GF_PROP_LAST_DEFINED-1; i++) {
+		for (i=GF_PROP_FORBIDEN+1; i<GF_PROP_LAST_DEFINED; i++) {
 			if (i==GF_PROP_STRING_NO_COPY) continue;
 			if (i==GF_PROP_DATA_NO_COPY) continue;
+			if ((i>=GF_PROP_LAST_NON_ENUM) && (i<GF_PROP_FIRST_ENUM)) continue;
 
 			if (gen_doc==2) {
 				gf_sys_format_help(helpout, help_flags, ".TP\n.B %s\n%s\n", gf_props_get_type_name(i), gf_props_get_type_desc(i));
@@ -2751,7 +3410,7 @@
 		}
 		gf_sys_format_help(helpout, help_flags, "\n\n");
 
-		gf_sys_format_help(helpout, help_flags, "Built-in properties for PIDs and packets listed as `Name (4CC type FLAGS): description`\n`FLAGS` can be D (dropable - see GSF mux filter help), P (packet property)\n");
+		gf_sys_format_help(helpout, help_flags, "Built-in properties for PIDs and packets listed as `Name (4CC type FLAGS): description`\n`FLAGS` can be D (droppable - see GSF multiplexer filter help), P (packet property)\n");
 	}
 	i=0;
 	while ((prop_info = gf_props_get_description(i))) {
@@ -2777,6 +3436,12 @@
 		} else {
 			u32 len;
 			const char *ptype;
+
+			if (pname) {
+				if (gf_sys_word_match(prop_info->name, pname)) {}
+				else if (gf_strnistr(prop_info->description, pname, pname_len)) {}
+				else continue;
+			}
 			szFlags[0]=0;
 			if (prop_info->flags & GF_PROP_FLAG_GSF_REM) strcat(szFlags, "D");
 			if (prop_info->flags & GF_PROP_FLAG_PCK) strcat(szFlags, "P");
@@ -2789,8 +3454,8 @@
 			}
 			ptype = gf_props_get_type_name(prop_info->data_type);
 			gf_sys_format_help(helpout, help_flags, " (%s %s %s):", gf_4cc_to_str(prop_info->type), ptype, szFlags);
-			len = (u32) strlen(ptype);
-			while (len<6) {
+			len += (u32) strlen(ptype) + (u32) strlen(szFlags);
+			while (len<24) {
 				gf_sys_format_help(helpout, help_flags, " ");
 				len++;
 			}
@@ -2801,20 +3466,27 @@
 				gf_sys_format_help(helpout, help_flags, "\n\tNames: %s\n\tFile extensions: %s", gf_pixel_fmt_all_names(), gf_pixel_fmt_all_shortnames() );
 			} else if (prop_info->data_type==GF_PROP_PCMFMT) {
 				gf_sys_format_help(helpout, help_flags, "\n\tNames: %s\n\tFile extensions: %s", gf_audio_fmt_all_names(), gf_audio_fmt_all_shortnames() );
-			} else if (prop_info->type==GF_PROP_PID_STREAM_TYPE) {
-				gf_sys_format_help(helpout, help_flags, "\n\tNames: %s\n\t", gf_stream_type_all_names() );
+			} else if (gf_props_type_is_enum(prop_info->data_type)) {
+				gf_sys_format_help(helpout, help_flags, "\n\tNames: %s\n\t", gf_props_enum_all_names(prop_info->data_type) );
 			}
 			gf_sys_format_help(helpout, help_flags, "\n");
 		}
 	}
 	if (gen_doc==1) {
 		u32 idx=0;
+		u32 cicp;
+		u64 layout;
+		GF_PixelFormat pfmt;
 		const char *name, *fileext, *desc;
 		gf_sys_format_help(helpout, help_flags, "# Pixel formats\n");
-		gf_sys_format_help(helpout, help_flags, "Name | File extensions | Description \n");
-		gf_sys_format_help(helpout, help_flags, " --- | --- | --- \n");
-		while ( gf_pixel_fmt_enum(&idx, &name, &fileext, &desc)) {
-			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, "%s | %s | %s \n", name, fileext, desc);
+		gf_sys_format_help(helpout, help_flags, "Name | File extensions | QT 4CC | Description \n");
+		gf_sys_format_help(helpout, help_flags, " --- | --- | --- | --- \n");
+		while ( (pfmt = gf_pixel_fmt_enum(&idx, &name, &fileext, &desc) )) {
+			const char *qtname = "";
+			u32 qt_code = gf_pixel_fmt_to_qt_type(pfmt);
+			if (qt_code) qtname = gf_4cc_to_str(qt_code);
+
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, "%s | %s | %s | %s \n", name, fileext, qtname, desc);
 		}
 
 		idx=0;
@@ -2845,8 +3517,19 @@
 			idx++;
 		}
 
+
+		idx=0;
+		gf_sys_format_help(helpout, help_flags, "# CICP code points for audio channel layout\n");
+		gf_sys_format_help(helpout, help_flags, " Name | Integer value | ChannelMask \n");
+		gf_sys_format_help(helpout, help_flags, " --- | --- | --- \n");
+		while ( (cicp = gf_audio_fmt_cicp_enum(idx, &name, &layout)) ) {
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, "%s | %d | 0x%016"LLX_SUF" \n", name, cicp, layout);
+			idx++;
+		}
+
 	} else if (gen_doc==2) {
-		u32 idx=0;
+		u32 idx=0, cicp;
+		u64 layout;
 		const char *name, *fileext, *desc;
 		gf_sys_format_help(helpout, help_flags, "# Pixel formats\n");
 		while ( gf_pixel_fmt_enum(&idx, &name, &fileext, &desc)) {
@@ -2871,6 +3554,13 @@
 			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, ".TP\n.B %s\n%s\n", name, desc);
 			idx++;
 		}
+
+		idx=0;
+		gf_sys_format_help(helpout, help_flags, "# Stream types\n");
+		while ( (cicp = gf_audio_fmt_cicp_enum(idx, &name, &layout)) ) {
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, ".TP\n.B %s (int %d)\nLayout 0x%016"LLX_SUF"\n", name, cicp, layout);
+			idx++;
+		}
 	}
 }
 #include <gpac/color.h>
@@ -2884,6 +3574,18 @@
 	}
 }
 
+static void dump_all_audio_cicp(void)
+{
+	u32 i=0, cicp;
+	const char *name;
+	u64 layout;
+
+	while ((cicp = gf_audio_fmt_cicp_enum(i, &name, &layout)) ) {
+		gf_sys_format_help(helpout, help_flags|GF_PRINTARG_HIGHLIGHT_FIRST, "%s (%d): 0x%016"LLX_SUF"\n", name, cicp, layout);
+		i++;
+	}
+}
+
 static void dump_all_codec(GF_FilterSession *session)
 {
 	GF_PropertyValue rawp, filep, stp;
@@ -2893,8 +3595,8 @@
 	u32 count = gf_fs_filters_registers_count(session);
 
 	gf_sys_format_help(helpout, help_flags, "Codec support in filters, listed as `built_in_name[|variant] [FLAGS]: full_name (mime)` with possible FLAGS values:\n");
-	gf_sys_format_help(helpout, help_flags, " - I: Raw format input (demux) support\n");
-	gf_sys_format_help(helpout, help_flags, " - O: Raw format output (mux) support\n");
+	gf_sys_format_help(helpout, help_flags, " - I: Raw format input (demultiplexer) support\n");
+	gf_sys_format_help(helpout, help_flags, " - O: Raw format output (multiplexer) support\n");
 	gf_sys_format_help(helpout, help_flags, " - D: Decoder support\n");
 	gf_sys_format_help(helpout, help_flags, " - E: Encoder support\n");
 	gf_sys_format_help(helpout, help_flags, "\nNote: Raw output may still be possible even when no output serializer is given\n\n");
@@ -2921,7 +3623,7 @@
 		cp.value.uint = gf_codecid_enum(cidx, &sname, &lname);
 		cidx++;
 		if (cp.value.uint == GF_CODECID_NONE) break;
-		if (cp.value.uint == GF_CODECID_RAW) continue;
+//		if (cp.value.uint == GF_CODECID_RAW) continue;
 		if (!sname) break;
 
 		stp.value.uint = gf_codecid_type(cp.value.uint);
@@ -3203,7 +3905,7 @@
 
 static Bool gpac_expand_alias_arg(char *param, char *prefix, char *suffix, int arg_idx, int argc, char **argv)
 {
-	char szArg[1024];
+	char *alias_arg=NULL;
 	char szSepList[2];
 	char *oparam = param;
 	szSepList[0] = separator_set[SEP_LIST];
@@ -3213,7 +3915,8 @@
 	Bool is_expand = param[0]=='+';
 
 	if (is_list || is_expand) param++;
-	strcpy(szArg, prefix);
+
+	gf_dynstrcat(&alias_arg, prefix, NULL);
 	while (param) {
 		u32 idx=0;
 		u32 last_idx=0;
@@ -3227,6 +3930,7 @@
 				if (diff>=idx) {
 					if (sep) sep[0]=',';
 					fprintf(stderr, "Bad usage for alias parameter %s: not enough parameters\n", oparam);
+					gf_free(alias_arg);
 					return GF_FALSE;
 				}
 				idx -= diff;
@@ -3248,6 +3952,7 @@
 						u32 diff = atoi(lsep+3);
 						if (diff>=last_idx) {
 							fprintf(stderr, "Bad usage for alias parameter %s: not enough parameters\n", oparam);
+							gf_free(alias_arg);
 							return GF_FALSE;
 						}
 						last_idx -= diff;
@@ -3262,11 +3967,13 @@
 		if (!idx) {
 			if (sep) sep[0]=',';
 			fprintf(stderr, "Bad format for alias parameter %s: cannot extract argument index\n", oparam);
+			gf_free(alias_arg);
 			return GF_FALSE;
 		}
 		if ((int) idx + arg_idx >= argc) {
 			if (sep) sep[0]=',';
-			fprintf(stderr, "Bad format for alias parameter %s: argment out of bounds (not enough paramteters?)\n", oparam);
+			fprintf(stderr, "Bad format for alias parameter %s: argument out of bounds (not enough paramteters?)\n", oparam);
+			gf_free(alias_arg);
 			return GF_FALSE;
 		}
 
@@ -3278,19 +3985,22 @@
 			gf_list_add(args_used, an_arg);
 
 			if (is_expand) {
-				strcpy(szArg, prefix);
-				strcat(szArg, an_arg);
-				strcat(szArg, suffix);
+				gf_free(alias_arg);
+				alias_arg = NULL;
+				gf_dynstrcat(&alias_arg, prefix, NULL);
+				gf_dynstrcat(&alias_arg, an_arg, NULL);
+				gf_dynstrcat(&alias_arg, suffix, NULL);
 
-				Bool ok = check_param_extension(szArg, arg_idx, argc, argv);
+				Bool ok = check_param_extension(alias_arg, arg_idx, argc, argv);
 				if (!ok) {
 					if (sep) sep[0]=',';
+					gf_free(alias_arg);
 					return GF_FALSE;
 				}
 			} else {
-				strcat(szArg, an_arg);
+				gf_dynstrcat(&alias_arg, an_arg, NULL);
 				if (is_list && (idx<last_idx)) {
-					strcat(szArg, szSepList);
+					gf_dynstrcat(&alias_arg, szSepList, NULL);
 				}
 			}
 		}
@@ -3299,21 +4009,52 @@
 		sep[0]=',';
 		param = sep+1;
 		if (is_list) {
-			strcat(szArg, szSepList);
+			gf_dynstrcat(&alias_arg, szSepList, NULL);
 		}
 	}
 
-	if (is_expand)
+	if (is_expand) {
+		gf_free(alias_arg);
 		return GF_TRUE;
+	}
 
-	strcat(szArg, suffix);
+	gf_dynstrcat(&alias_arg, suffix, NULL);
 
-	return check_param_extension(szArg, arg_idx, argc, argv);
+	Bool res = check_param_extension(alias_arg, arg_idx, argc, argv);
+	gf_free(alias_arg);
+	return res;
 }
 
-static Bool gpac_expand_alias(int argc, char **argv)
+static Bool gpac_expand_alias(int o_argc, char **o_argv)
 {
-	u32 i;
+	u32 i, a_idx;
+	int argc = o_argc;
+
+	//move all options at the begining
+	char **argv = gf_malloc(sizeof(char*) * argc);
+	if (!argv) return GF_FALSE;
+
+	a_idx = 1;
+	argv[0] = o_argv[0];
+	for (i=1; i< (u32) argc; i++) {
+		//alias, do not push
+		if ( gf_opts_get_key("gpac.alias", o_argv[i]) != NULL)
+			continue;
+		//not an option, do not push
+		if (o_argv[i][0] != '-') continue;
+		argv[a_idx] = o_argv[i];
+		a_idx++;
+	}
+	for (i=1; i< (u32) argc; i++) {
+		//option and not an alias, do not push
+		if (o_argv[i][0] == '-') {
+			if ((char*) gf_opts_get_key("gpac.alias", o_argv[i]) == NULL)
+				continue;
+		}
+		argv[a_idx] = o_argv[i];
+		a_idx++;
+	}
+	assert(argc==a_idx);
 
 	for (i=0; i< (u32) argc; i++) {
 		char *arg = argv[i];
@@ -3330,12 +4071,15 @@
 			if (sep) sep[0] = 0;
 			Bool ok = check_param_extension(alias, i, argc, argv);
 			if (sep) sep[0] = ' ';
-			if (!ok) return GF_FALSE;
+			if (!ok) {
+				gf_free(argv);
+				return GF_FALSE;
+			}
 			if (!sep) break;
 			alias = sep+1;
 		}
-
 	}
+	gf_free(argv);
 	return GF_TRUE;
 }
 
@@ -3349,6 +4093,7 @@
 #include <gpac/thread.h>
 #include <gpac/avparse.h>
 #include <gpac/mpegts.h>
+#include <gpac/scenegraph_vrml.h>
 #include <gpac/rtp_streamer.h>
 #include <gpac/internal/odf_dev.h>
 #include <gpac/internal/media_dev.h>
@@ -3358,6 +4103,7 @@
 {
 #ifdef GPAC_ENABLE_COVERAGE
 	u32 ucs4_buf[4];
+	u32 i;
 	u8 utf8_buf[7];
 
 	void *mem = gf_calloc(4, sizeof(u32));
@@ -3368,6 +4114,14 @@
 	gpac_fsess_task_help(); //for coverage
 	gf_dm_sess_last_error(NULL);
 	gf_log_use_color();
+	gf_4cc_parse("abcd");
+	gf_gpac_abi_micro();
+	gf_audio_fmt_get_layout_from_name("3/2.1");
+	gf_audio_fmt_get_dolby_chanmap(4);
+	gf_itags_get_id3tag(1);
+	i=0;
+	gf_itags_enum_tags(&i, NULL, NULL, NULL);
+
 	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[CoreUnitTests] performing tests\n"));
 
 	utf8_buf[0] = 'a';
@@ -3503,6 +4257,7 @@
 	gf_lang_get_count();
 	gf_lang_get_2cc(2);
 	GF_Blob b;
+	memset(&b, 0, sizeof(GF_Blob));
 	b.data = (u8 *) "test";
 	b.size = 5;
 	char url[100];
@@ -3512,7 +4267,7 @@
 
 	gf_sys_profiler_set_callback(NULL, NULL);
 
-	gf_blob_get_data(url, &data, &size);
+	gf_blob_get(url, &data, &size, NULL);
 	if (!data || strcmp((char *)data, "test")) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] blob url parsing fail\n"));
 		return 1;
@@ -3525,12 +4280,13 @@
 	gf_sys_is_quiet();
 	gf_sys_get_argv();
 	gf_mx_get_num_locks(NULL);
-	sigint_catched = GF_TRUE;
+	signal_catched = GF_TRUE;
 
 #ifdef WIN32
 	gpac_sig_handler(CTRL_C_EVENT);
 #else
 	gpac_sig_handler(SIGINT);
+	gpac_sig_handler(SIGTERM);
 #endif
 
 	gf_mkdir("testdir");
@@ -3545,7 +4301,7 @@
 	gf_file_modification_time(url);
 	gf_m2ts_probe_file(url);
 
-	gf_cleanup_dir("testdir");
+	gf_dir_cleanup("testdir");
 	gf_rmdir("testdir");
 
 	//math.c not covered yet by our sample files
@@ -3620,7 +4376,7 @@
 	gf_path_add_quadratic_to(path, 5, 5, 10, 0);
 	gf_path_point_over(path, 4, 0);
 	gf_path_del(path);
-	
+
 	//xml dom - to update once we find a way to integrate atsc demux in tests
 	GF_DOMParser *dom = gf_xml_dom_new();
 	gf_xml_dom_parse_string(dom, "<Dummy>test</Dummy>");
@@ -3636,11 +4392,6 @@
 	gf_dm_set_data_rate(dm, 0);
 	gf_dm_get_data_rate(dm);
 	gf_dm_set_localcache_provider(dm, NULL, NULL);
-
-	const DownloadedCacheEntry ent = gf_dm_add_cache_entry(dm, "http://localhost/test.dummy", "test", 4, 0, 0, "application/octet-string", GF_FALSE, 1);
-
-	gf_dm_force_headers(dm, ent, "x-GPAC: test\r\n");
-	gf_dm_sess_enum_headers(NULL, NULL, NULL, NULL);//this one is deactivated in test mode in httpin because of Date: header
 	gf_dm_sess_abort(NULL);
 	gf_dm_del(dm);
 
@@ -3674,7 +4425,6 @@
 
 
 	gf_filter_post_task(NULL,NULL,NULL,NULL);
-	gf_filter_get_num_events_queued(NULL);
 	gf_filter_get_arg_str(NULL, NULL, NULL);
 	gf_filter_all_sinks_done(NULL);
 
@@ -3700,6 +4450,7 @@
 	gf_filter_get_max_extra_input_pids(NULL);
 	gf_filter_remove(NULL);
 	gf_filter_reconnect_output(NULL);
+	gf_filter_pid_get_udta_flags(NULL);
 
 	gf_audio_fmt_get_cicp_layout(2, 1, 1);
 	gf_audio_fmt_get_layout_from_cicp(3);
@@ -3714,9 +4465,9 @@
 	gf_odf_desc_del((GF_Descriptor *) txtc);
 
 	//stuff only used by vtbdec
-	gf_media_hevc_read_pps_bs(NULL, NULL);
-	gf_media_hevc_read_sps_bs(NULL, NULL);
-	gf_media_hevc_read_vps_bs(NULL, NULL);
+	gf_hevc_read_pps_bs(NULL, NULL);
+	gf_hevc_read_sps_bs(NULL, NULL);
+	gf_hevc_read_vps_bs(NULL, NULL);
 	gf_mpegv12_get_config(NULL, 0, NULL);
 
 	//hinting stuff
@@ -3739,6 +4490,17 @@
 	gf_isom_get_media_time(NULL, 0, 0, NULL);
 	gf_isom_get_sample_description_index(NULL, 0, 0);
 
+	gf_sg_has_scripting();
+	gf_node_get_proto_root(NULL);
+	gf_node_proto_is_grouping(NULL);
+	gf_sg_proto_get_id(NULL);
+	gf_sg_proto_instance_set_ised(NULL, 0, NULL, 0);
+
+	gf_audio_fmt_to_isobmf(0);
+	gf_pixel_fmt_probe(0, NULL);
+	gf_net_ntp_to_utc(0);
+	gf_sys_profiler_sampling_enabled();
+
 
 #endif
 	return 0;
@@ -3756,7 +4518,7 @@
 		u32 i, len, dir_len=0, k=0;
 		char *dst_name;
 		char *sep;
-		
+
 		sep = strstr(item_path, "gpac_cache_");
 		if (sep) {
 			sep[0] = 0;
@@ -3986,7 +4748,7 @@
 {
 	FileIOCtx *ioctx;
 	GF_FileIO *fio;
-	char *sep = (char *) gf_url_colon_suffix(inargs);
+	char *sep = (char *) gf_url_colon_suffix(inargs, separator_set[1]);
 	*out_arg = NULL;
 	if (sep) sep[0] = 0;
 
@@ -4025,7 +4787,7 @@
 		GF_FileIO *gfio = gf_list_pop_back(all_gfio_defined);
 		FileIOCtx *ioctx = gf_fileio_get_udta(gfio);
 		gf_fileio_del(gfio);
-		
+
 		if (ioctx->filep) {
 			fprintf(stderr, "Warning: file IO for %s still opened!\n", ioctx->path);
 			gf_fclose(ioctx->filep);
@@ -4037,3 +4799,49 @@
 	all_gfio_defined = NULL;
 }
 
+static GF_Err cust_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_FilterEvent evt;
+	if (is_remove) return GF_OK;
+
+	GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+	gf_filter_pid_send_event(pid, &evt);
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+static GF_Err cust_process(GF_Filter *filter)
+{
+	u32 i;
+	for (i=0; i<gf_filter_get_ipid_count(filter); i++) {
+		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+		const char *name = gf_filter_pid_get_name(pid);
+		while (1) {
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
+			if (!pck) break;
+			fprintf(stderr, "PID %s Got packet CTS "LLU"\n", name, gf_filter_pck_get_cts(pck));
+			gf_filter_pid_drop_packet(pid);
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Filter *load_custom_filter(GF_FilterSession *sess, char *opts, GF_Err *e)
+{
+	GF_Filter *f = gf_fs_new_filter(sess, "custom", 0, e);
+	if (!f) return NULL;
+
+	*e = gf_filter_push_caps(f, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL), NULL, GF_CAPS_INPUT, 0);
+	if (*e) return NULL;
+	*e = gf_filter_set_configure_ckb(f, cust_configure_pid);
+	if (*e) return NULL;
+	*e = gf_filter_set_process_ckb(f, cust_process);
+	if (*e) return NULL;
+	*e = gf_filter_set_process_event_ckb(f, NULL);
+	if (*e) return NULL;
+	*e = gf_filter_set_reconfigure_output_ckb(f, NULL);
+	if (*e) return NULL;
+	*e = gf_filter_set_probe_data_cbk(f, NULL);
+	if (*e) return NULL;
+
+	return f;
+}

gpac-1.0.1.tar.gz/applications/mp4box/Makefile -> gpac-2.0.0.tar.gz/applications/mp4box/Makefile Changed

gpac-1.0.1.tar.gz/applications/mp4box/filedump.c -> gpac-2.0.0.tar.gz/applications/mp4box/filedump.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / mp4box application
@@ -55,14 +55,31 @@
 /*for built-in box printing*/
 #include <gpac/internal/isomedia_dev.h>
 
+#include <gpac/download.h>
+#include <gpac/mpd.h>
+
 extern u32 swf_flags;
 extern Float swf_flatten_angle;
 extern GF_FileType get_file_type_by_ext(char *inName);
 extern u32 fs_dump_flags;
+extern Bool dump_check_xml;
 
 void scene_coding_log(void *cbk, GF_LOG_Level log_level, GF_LOG_Tool log_tool, const char *fmt, va_list vlist);
 
-void PrintLanguages()
+
+#ifdef GPAC_DISABLE_LOG
+void mp4box_log(const char *fmt, ...)
+{
+	va_list vl;
+	va_start(vl, fmt);
+	vfprintf(stderr, fmt, vlist);
+	fflush(stderr);
+	va_end(vl);
+}
+#endif
+
+
+u32 PrintLanguages(char *val, u32 opt)
 {
 	u32 i=0, count = gf_lang_get_count();
 	fprintf(stderr, "Supported ISO 639 languages and codes:\n\n");
@@ -71,6 +88,7 @@
 			fprintf(stderr, "%s (%s - %s)\n", gf_lang_get_name(i), gf_lang_get_3cc(i), gf_lang_get_2cc(i));
 		}
 	}
+	return 1;
 }
 
 static const char *GetLanguage(char *lcode)
@@ -88,7 +106,7 @@
 	GF_Err e = gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_COVER_ART, &tag, &tag_len);
 	if (e!=GF_OK) {
 		if (e==GF_URL_ERROR) {
-			fprintf(stderr, "No cover art found\n");
+			M4_LOG(GF_LOG_WARNING, ("No cover art found\n"));
 			return GF_OK;
 		}
 		return e;
@@ -103,7 +121,7 @@
 		}
 		t = gf_fopen(szName, "wb");
 		if (!t) {
-			fprintf(stderr, "Failed to open %s for dumping\n", szName);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s for dumping\n", szName));
 			return GF_IO_ERR;
 		}
 	} else {
@@ -144,7 +162,7 @@
 		load.isom = gf_isom_open(file, GF_ISOM_OPEN_READ, NULL);
 		if (!load.isom) {
 			e = gf_isom_last_error(NULL);
-			fprintf(stderr, "Error opening file: %s\n", gf_error_to_string(e));
+			M4_LOG(GF_LOG_ERROR, ("Error opening file: %s\n", gf_error_to_string(e)));
 			gf_sm_del(ctx);
 			gf_sg_del(sg);
 			return e;
@@ -157,15 +175,15 @@
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 		if (load.isom) {
 			GF_Fraction _frac = {0,0};
-			e = import_file(load.isom, file, 0, _frac, 0, NULL, NULL, 0);
+			e = import_file(load.isom, file, 0, _frac, 0, NULL, NULL, NULL, 0);
 		} else
 #else
-		fprintf(stderr, "Warning: GPAC was compiled without Media Import support\n");
+		M4_LOG(GF_LOG_WARNING, ("Warning: GPAC was compiled without Media Import support\n"));
 #endif
 			e = gf_isom_last_error(NULL);
 
 		if (e) {
-			fprintf(stderr, "Error importing file: %s\n", gf_error_to_string(e));
+			M4_LOG(GF_LOG_ERROR, ("Error importing file: %s\n", gf_error_to_string(e)));
 			gf_sm_del(ctx);
 			gf_sg_del(sg);
 			if (load.isom) gf_isom_delete(load.isom);
@@ -201,7 +219,7 @@
 
 	gf_sm_del(ctx);
 	gf_sg_del(sg);
-	if (e) fprintf(stderr, "Error loading scene: %s\n", gf_error_to_string(e));
+	if (e) M4_LOG(GF_LOG_ERROR, ("Error loading scene: %s\n", gf_error_to_string(e)));
 	if (load.isom) gf_isom_delete(load.isom);
 	return e;
 }
@@ -359,7 +377,7 @@
 	if (get_file_type_by_ext(file) == 1) {
 		load.isom = gf_isom_open(file, GF_ISOM_OPEN_READ, NULL);
 		if (!load.isom) {
-			fprintf(stderr, "Cannot open file: %s\n", gf_error_to_string(gf_isom_last_error(NULL)));
+			M4_LOG(GF_LOG_ERROR, ("Cannot open file: %s\n", gf_error_to_string(gf_isom_last_error(NULL))));
 			gf_sm_del(ctx);
 			gf_sg_del(scene_graph);
 			return;
@@ -376,7 +394,7 @@
 		if (!is_final_name) strcat(szBuf, "_stat.xml");
 		dump = gf_fopen(szBuf, "wt");
 		if (!dump) {
-			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s for dumping\n", szBuf));
 			return;
 		}
 		close = 1;
@@ -460,7 +478,7 @@
 	gf_sg_del(scene_graph);
 	if (load.isom) gf_isom_delete(load.isom);
 	if (e) {
-		fprintf(stderr, "%s\n", gf_error_to_string(e));
+		M4_LOG(GF_LOG_ERROR, ("Stats error: %s\n", gf_error_to_string(e)));
 	} else {
 		fprintf(dump, "</SceneStatistics>\n");
 	}
@@ -544,7 +562,7 @@
 		char szField[1024];
 		u32 tfirst, tlast;
 		if (gf_node_get_field_by_name(node, szField, &f) != GF_OK) {
-			fprintf(stderr, "Field %s is not a member of node %s\n", szField, name);
+			M4_LOG(GF_LOG_ERROR, ("Field %s is not a member of node %s\n", szField, name));
 			return;
 		}
 		fprintf(stderr, "Allowed nodes in %s.%s:\n", name, szField);
@@ -645,11 +663,11 @@
 #endif
 
 
-void PrintNode(const char *name, u32 graph_type)
+u32 PrintNode(const char *name, u32 graph_type)
 {
 #ifdef GPAC_DISABLE_VRML
-	fprintf(stderr, "VRML/MPEG-4/X3D scene graph is disabled in this build of GPAC\n");
-	return;
+	M4_LOG(GF_LOG_ERROR, ("VRML/MPEG-4/X3D scene graph is disabled in this build of GPAC\n"));
+	return 2;
 #else
 	const char *std_name;
 	GF_Node *node;
@@ -670,16 +688,16 @@
 		tag = gf_node_x3d_type_by_class_name(name);
 		std_name = "X3D";
 #else
-		fprintf(stderr, "X3D node printing is not supported (X3D support disabled)\n");
-		return;
+		M4_LOG(GF_LOG_ERROR, ("X3D node printing is not supported (X3D support disabled)\n"));
+		return 2;
 #endif
 	} else {
 		tag = gf_node_mpeg4_type_by_class_name(name);
 		std_name = "MPEG4";
 	}
 	if (!tag) {
-		fprintf(stderr, "Unknown %s node %s\n", std_name, name);
-		return;
+		M4_LOG(GF_LOG_ERROR, ("Unknown %s node %s\n", std_name, name));
+		return 2;
 	}
 
 	sg = gf_sg_new();
@@ -687,42 +705,49 @@
 	gf_node_register(node, NULL);
 	name = gf_node_get_class_name(node);
 	if (!node) {
-		fprintf(stderr, "Node %s not supported in current built\n", name);
-		return;
+		M4_LOG(GF_LOG_ERROR, ("Node %s not supported in current built\n", name));
+		return 2;
 	}
 	do_print_node(node, sg, name, graph_type, is_nodefield, GF_FALSE);
 
 	gf_node_unregister(node, NULL);
 	gf_sg_del(sg);
 #endif /*GPAC_DISABLE_VRML*/
+	return 1;
 }
 
-void PrintBuiltInNodes(u32 graph_type, Bool dump_nodes)
+u32 PrintBuiltInNodes(char *arg_val, u32 dump_type)
 {
 #if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_X3D) && !defined(GPAC_DISABLE_SVG)
 	GF_SceneGraph *sg;
 	u32 i, nb_in, nb_not_in, start_tag, end_tag;
+	u32 graph_type;
+	Bool dump_nodes = ((dump_type==1) || (dump_type==3)) ? 1 : 0;
+
+	if (dump_type==4) graph_type = 2;
+	else if ((dump_type==2) || (dump_type==3)) graph_type = 1;
+	else graph_type = 0;
 
 	if (graph_type==1) {
 #if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_X3D)
 		start_tag = GF_NODE_RANGE_FIRST_X3D;
 		end_tag = TAG_LastImplementedX3D;
 #else
-		fprintf(stderr, "X3D scene graph disabled in this build of GPAC\n");
-		return;
+		M4_LOG(GF_LOG_ERROR, ("X3D scene graph disabled in this build of GPAC\n"));
+		return 2;
 #endif
 	} else if (graph_type==2) {
 #ifdef GPAC_DISABLE_SVG
-		fprintf(stderr, "SVG scene graph disabled in this build of GPAC\n");
-		return;
+		M4_LOG(GF_LOG_ERROR, ("SVG scene graph disabled in this build of GPAC\n"));
+		return 2;
 #else
 		start_tag = GF_NODE_RANGE_FIRST_SVG;
 		end_tag = GF_NODE_RANGE_LAST_SVG;
 #endif
 	} else {
 #ifdef GPAC_DISABLE_VRML
-		fprintf(stderr, "VRML/MPEG-4 scene graph disabled in this build of GPAC\n");
-		return;
+		M4_LOG(GF_LOG_ERROR, ("VRML/MPEG-4 scene graph disabled in this build of GPAC\n"));
+		return 2;
 #else
 		start_tag = GF_NODE_RANGE_FIRST_MPEG4;
 		end_tag = TAG_LastImplementedMPEG4;
@@ -765,19 +790,24 @@
 	if (dump_nodes) {
 		for (i=GF_SG_VRML_SFBOOL; i<GF_SG_VRML_SCRIPT_FUNCTION; i++) {
 			void *fp = gf_sg_vrml_field_pointer_new(i);
-			if (fp) gf_sg_vrml_field_pointer_del(fp, i);
+			if (fp) {
+				if (i==GF_SG_VRML_SFSCRIPT) gf_free(fp);
+				else gf_sg_vrml_field_pointer_del(fp, i);
+			}
 		}
 
 	}
 #else
-	fprintf(stderr, "\nNo scene graph enabled in this MP4Box build\n");
+	M4_LOG(GF_LOG_ERROR, ("No scene graph enabled in this MP4Box build\n"));
 #endif
+	return 1;
 }
 
 
-void PrintBuiltInBoxes(Bool do_cov)
+u32 PrintBuiltInBoxes(char *argval, u32 do_cov)
 {
 	u32 i, count=gf_isom_get_num_supported_boxes();
+	
 	fprintf(stdout, "<Boxes>\n");
 	//index 0 is our internal unknown box handler
 	for (i=1; i<count; i++) {
@@ -794,6 +824,7 @@
 }
 	}
 	fprintf(stdout, "</Boxes>\n");
+	return 1;
 }
 
 #if !defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_ISOM_DUMP)
@@ -810,7 +841,7 @@
 		if (!is_final_name) strcat(szBuf, "_rtp.xml");
 		dump = gf_fopen(szBuf, "wt");
 		if (!dump) {
-			fprintf(stderr, "Failed to open %s\n", szBuf);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s\n", szBuf));
 			return;
 		}
 	} else {
@@ -862,7 +893,7 @@
 		if (!is_final_name) strcat(szBuf, "_ts.txt");
 		dump = gf_fopen(szBuf, "wt");
 		if (!dump) {
-			fprintf(stderr, "Failed to open %s\n", szBuf);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s\n", szBuf));
 			return;
 		}
 	} else {
@@ -961,7 +992,9 @@
 	if (timings) gf_free(timings);
 
 	if (inName) gf_fclose(dump);
-	if (has_ctts_error) fprintf(stderr, "\tFile has CTTS table errors\n");
+	if (has_ctts_error) {
+		M4_LOG(GF_LOG_ERROR, ("\tFile has CTTS table errors\n"));
+	}
 }
 
 
@@ -980,33 +1013,32 @@
 }
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-void gf_inspect_dump_nalu(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, u32 nalh_size, Bool dump_crc, Bool is_encrypted);
+void gf_inspect_dump_nalu(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, VVCState *vvc, u32 nalh_size, Bool dump_crc, Bool is_encrypted);
 #endif
 
 
-static void dump_isom_nal_ex(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, u32 dump_flags)
+static GF_Err dump_isom_nal_ex(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, u32 dump_flags)
 {
 	u32 i, j, count, nb_descs, track, nalh_size, timescale, cur_extract_mode;
+	GF_Err e=GF_OK;
 	s32 countRef;
 	Bool is_adobe_protected = GF_FALSE;
 	Bool is_cenc_protected = GF_FALSE;
 	Bool is_hevc = GF_FALSE;
+	Bool is_vvc = GF_FALSE;
 #ifndef GPAC_DISABLE_AV_PARSERS
-	AVCState avc;
-	HEVCState hevc;
+	AVCState *avc_state = NULL;
+	HEVCState *hevc_state = NULL;
+	VVCState *vvc_state = NULL;
 #endif
 	GF_AVCConfig *avccfg, *svccfg;
 	GF_HEVCConfig *hevccfg, *lhvccfg;
-	GF_AVCConfigSlot *slc;
+	GF_VVCConfig *vvccfg;
+	GF_NALUFFParam *slc;
 	Bool has_svcc = GF_FALSE;
 
 	track = gf_isom_get_track_by_id(file, trackID);
 
-#ifndef GPAC_DISABLE_AV_PARSERS
-	memset(&avc, 0, sizeof(AVCState));
-	memset(&hevc, 0, sizeof(HEVCState));
-#endif
-
 	count = gf_isom_get_sample_count(file, track);
 
 	timescale = gf_isom_get_media_timescale(file, track);
@@ -1015,8 +1047,8 @@
 
 	nb_descs = gf_isom_get_sample_description_count(file, track);
 	if (!nb_descs) {
-		fprintf(stderr, "Error: Track #%d has no sample description so is likely not NALU-based!\n", trackID);
-		return;
+		M4_LOG(GF_LOG_ERROR, ("Error: Track #%d has no sample description so is likely not NALU-based!\n", trackID));
+		return GF_BAD_PARAM;
 	}
 
 	fprintf(dump, "<NALUTrack trackID=\"%d\" SampleCount=\"%d\" TimeScale=\"%d\">\n", trackID, count, timescale);
@@ -1029,8 +1061,7 @@
 		for (i=0; i<gf_list_count(arr); i++) {\
 			slc = gf_list_get(arr, i);\
 			fprintf(dump, " <NALU size=\"%d\" ", slc->size);\
-			gf_inspect_dump_nalu(dump, (u8 *) slc->data, slc->size, _is_svc, is_hevc ? &hevc : NULL, &avc, nalh_size, (dump_flags&1) ? GF_TRUE : GF_FALSE, GF_FALSE);\
-			fprintf(dump, "/>\n");\
+			gf_inspect_dump_nalu(dump, (u8 *) slc->data, slc->size, _is_svc, is_hevc ? hevc_state : NULL, avc_state, is_vvc ? vvc_state : NULL, nalh_size, (dump_flags&1) ? GF_TRUE : GF_FALSE, GF_FALSE);\
 		}\
 		fprintf(dump, " </%sArray>\n", name);\
 	}\
@@ -1061,9 +1092,27 @@
 		mvccfg = gf_isom_mvc_config_get(file, track, j+1);
 		hevccfg = gf_isom_hevc_config_get(file, track, j+1);
 		lhvccfg = gf_isom_lhvc_config_get(file, track, j+1);
+		vvccfg = gf_isom_vvc_config_get(file, track, j+1);
 
 		is_svc = (svccfg!=NULL) ? 1:0;
 
+		if (hevccfg || lhvccfg) {
+			is_hevc = 1;
+#ifndef GPAC_DISABLE_AV_PARSERS
+			GF_SAFEALLOC(hevc_state, HEVCState)
+#endif
+		} else if (vvccfg) {
+			is_vvc = 1;
+#ifndef GPAC_DISABLE_AV_PARSERS
+			GF_SAFEALLOC(vvc_state, VVCState)
+#endif
+		} else if (avccfg || svccfg || mvccfg) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+			GF_SAFEALLOC(avc_state, AVCState)
+#endif
+		}
+
+
 		//for tile tracks the hvcC is stored in the 'tbas' track
 		if (!hevccfg && gf_isom_get_reference_count(file, track, GF_ISOM_REF_TBAS)) {
 			u32 tk = 0;
@@ -1073,9 +1122,9 @@
 
 		fprintf(dump, " <NALUConfig>\n");
 
-		if (!avccfg && !svccfg && !hevccfg && !lhvccfg) {
-			fprintf(stderr, "Error: Track #%d is not NALU-based!\n", trackID);
-			return;
+		if (!avccfg && !svccfg && !hevccfg && !lhvccfg && !vvccfg) {
+			M4_LOG(GF_LOG_ERROR, ("Error: Track #%d is not NALU or OBU based!\n", trackID));
+			return GF_BAD_PARAM;
 		}
 
 		if (avccfg) {
@@ -1098,9 +1147,8 @@
 		if (hevccfg) {
 			u32 idx;
 			nalh_size = hevccfg->nal_unit_size;
-			is_hevc = 1;
 			for (idx=0; idx<gf_list_count(hevccfg->param_array); idx++) {
-				GF_HEVCParamArray *ar = gf_list_get(hevccfg->param_array, idx);
+				GF_NALUFFParamArray *ar = gf_list_get(hevccfg->param_array, idx);
 				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
 					DUMP_ARRAY(ar->nalus, "HEVCSPS", "hvcC", 0)
 				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
@@ -1112,12 +1160,27 @@
 				}
 			}
 		}
+		if (vvccfg) {
+			u32 idx;
+			nalh_size = vvccfg->nal_unit_size;
+			for (idx=0; idx<gf_list_count(vvccfg->param_array); idx++) {
+				GF_NALUFFParamArray *ar = gf_list_get(vvccfg->param_array, idx);
+				if (ar->type==GF_VVC_NALU_SEQ_PARAM) {
+					DUMP_ARRAY(ar->nalus, "VVCSPS", "vvcC", 0)
+				} else if (ar->type==GF_VVC_NALU_PIC_PARAM) {
+					DUMP_ARRAY(ar->nalus, "VVCPPS", "vvcC", 0)
+				} else if (ar->type==GF_VVC_NALU_VID_PARAM) {
+					DUMP_ARRAY(ar->nalus, "VVCVPS", "vvcC", 0)
+				} else {
+					DUMP_ARRAY(ar->nalus, "VVCUnknownPS", "vvcC", 0)
+				}
+			}
+		}
 		if (lhvccfg) {
 			u32 idx;
 			nalh_size = lhvccfg->nal_unit_size;
-			is_hevc = 1;
 			for (idx=0; idx<gf_list_count(lhvccfg->param_array); idx++) {
-				GF_HEVCParamArray *ar = gf_list_get(lhvccfg->param_array, idx);
+				GF_NALUFFParamArray *ar = gf_list_get(lhvccfg->param_array, idx);
 				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
 					DUMP_ARRAY(ar->nalus, "HEVCSPS", "lhcC", 0)
 				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
@@ -1137,6 +1200,7 @@
 			has_svcc = GF_TRUE;
 		}
 		if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+		if (vvccfg) gf_odf_vvc_cfg_del(vvccfg);
 		if (lhvccfg) gf_odf_hevc_cfg_del(lhvccfg);
 	}
 
@@ -1169,8 +1233,8 @@
 		u8 *ptr;
 		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, &di);
 		if (!samp) {
-			fprintf(dump, "\n", i+1);
-			continue;
+			e = gf_isom_last_error(file);
+			break;
 		}
 		dts = samp->DTS;
 		cts = dts + (s32) samp->CTS_Offset;
@@ -1204,6 +1268,10 @@
 			}
 		}
 		while (size) {
+			if (size<nalh_size) {
+				fprintf(dump, " \n", idx, nal_size, size);
+				break;
+			}
 			nal_size = read_nal_size_hdr(ptr, nalh_size);
 			ptr += nalh_size;
 
@@ -1215,15 +1283,16 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 				Bool is_encrypted = 0;
 				if (is_cenc_protected) {
-					GF_Err e = gf_isom_get_sample_cenc_info(file, track, i + 1, &is_encrypted, NULL, NULL, NULL, NULL, NULL, NULL);
+					GF_Err e = gf_isom_get_sample_cenc_info(file, track, i + 1, &is_encrypted, NULL, NULL, NULL, NULL);
 					if (e != GF_OK) {
 						fprintf(dump, "dump_msg=\"Error %s while fetching encryption info for sample, assuming sample is encrypted\" ", gf_error_to_string(e) );
 						is_encrypted = GF_TRUE;
 					}
 				}
-				gf_inspect_dump_nalu(dump, ptr, nal_size, has_svcc ? 1 : 0, is_hevc ? &hevc : NULL, &avc, nalh_size, dump_flags, is_encrypted);
-#endif
+				gf_inspect_dump_nalu(dump, ptr, nal_size, has_svcc ? 1 : 0, hevc_state, avc_state, vvc_state, nalh_size, dump_flags, is_encrypted);
+#else
 				fprintf(dump, "/>\n");
+#endif
 			}
 			idx++;
 			ptr+=nal_size;
@@ -1239,22 +1308,30 @@
 	fprintf(dump, "</NALUTrack>\n");
 
 	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (hevc_state) gf_free(hevc_state);
+	if (vvc_state) gf_free(vvc_state);
+	if (avc_state) gf_free(avc_state);
+#endif
+
+	return e;
 }
 
-static void dump_isom_obu(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, Bool dump_crc);
-static void dump_qt_prores(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, Bool dump_crc);
+static GF_Err dump_isom_obu(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, Bool dump_crc);
+static GF_Err dump_qt_prores(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, Bool dump_crc);
 
-void dump_isom_nal(GF_ISOFile *file, GF_ISOTrackID trackID, char *inName, Bool is_final_name, u32 dump_flags)
+GF_Err dump_isom_nal(GF_ISOFile *file, GF_ISOTrackID trackID, char *inName, Bool is_final_name, u32 dump_flags)
 {
+	char szFileName[GF_MAX_PATH];
 	Bool is_av1 = GF_FALSE;
 	Bool is_prores = GF_FALSE;
 
 	FILE *dump;
 	if (inName) {
 		GF_ESD* esd;
-		char szBuf[GF_MAX_PATH];
 
-		strcpy(szBuf, inName);
+		strcpy(szFileName, inName);
 
 		u32 track = gf_isom_get_track_by_id(file, trackID);
 		esd = gf_isom_get_esd(file, track, 1);
@@ -1279,38 +1356,54 @@
 		}
 		if (esd) gf_odf_desc_del((GF_Descriptor*)esd);
 
-		if (!is_final_name) sprintf(szBuf, "%s_%d_%s.xml", inName, trackID, is_av1 ? "obu" : "nalu");
-		dump = gf_fopen(szBuf, "wt");
+		if (!is_final_name) sprintf(szFileName, "%s_%d_%s.xml", inName, trackID, is_av1 ? "obu" : "nalu");
+		dump = gf_fopen(szFileName, "wt");
 		if (!dump) {
-			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
-			return;
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s for dumping\n", szFileName));
+			return GF_URL_ERROR;
 		}
 	} else {
 		dump = stdout;
 	}
 
+	GF_Err e = GF_OK;
 	if (is_av1)
-		dump_isom_obu(file, trackID, dump, dump_flags);
+		e = dump_isom_obu(file, trackID, dump, dump_flags);
 	else if (is_prores)
-		dump_qt_prores(file, trackID, dump, dump_flags);
+		e = dump_qt_prores(file, trackID, dump, dump_flags);
 	else
-		dump_isom_nal_ex(file, trackID, dump, dump_flags);
+		e = dump_isom_nal_ex(file, trackID, dump, dump_flags);
 
 	if (inName) gf_fclose(dump);
+
+	if (!e && dump_check_xml) {
+		if (inName) {
+			GF_DOMParser *xml_parser = gf_xml_dom_new();
+			GF_Err e = gf_xml_dom_parse(xml_parser, szFileName, NULL, NULL);
+			if (e) {
+				fprintf(stderr, "Failed to parse XML dump %s: line %d: %s\n", szFileName, gf_xml_dom_get_line(xml_parser), gf_xml_dom_get_error(xml_parser) );
+			}
+			gf_xml_dom_del(xml_parser);
+		} else {
+			fprintf(stderr, "Cannot check XML for dump on stdout\n");
+		}
+	}
+	return e;
 }
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 void gf_inspect_dump_obu(FILE *dump, AV1State *av1, u8 *obu, u64 obu_length, ObuType obu_type, u64 obu_size, u32 hdr_size, Bool dump_crc);
 #endif
 
-static void dump_isom_obu(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, Bool dump_crc)
+static GF_Err dump_isom_obu(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, Bool dump_crc)
 {
+	GF_Err e = GF_OK;
 #ifndef GPAC_DISABLE_AV_PARSERS
 	u32 i, count, track, timescale;
 	AV1State av1;
-	ObuType obu_type;
-	u64 obu_size;
-	u32 hdr_size;
+	ObuType obu_type = 0;
+	u64 obu_size = 0;
+	u32 hdr_size = 0;
 	GF_BitStream *bs;
 	u32 idx;
 
@@ -1319,8 +1412,8 @@
 	gf_av1_init_state(&av1);
 	av1.config = gf_isom_av1_config_get(file, track, 1);
 	if (!av1.config) {
-		fprintf(stderr, "Error: Track #%d is not AV1!\n", trackID);
-		return;
+		M4_LOG(GF_LOG_ERROR, ("Error: Track #%d is not AV1!\n", trackID));
+		return GF_ISOM_INVALID_FILE;
 	}
 
 	count = gf_isom_get_sample_count(file, track);
@@ -1333,7 +1426,12 @@
 	for (i=0; i<gf_list_count(av1.config->obu_array); i++) {
 		GF_AV1_OBUArrayEntry *obu = gf_list_get(av1.config->obu_array, i);
 		bs = gf_bs_new(obu->obu, (u32) obu->obu_length, GF_BITSTREAM_READ);
-		gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, &av1);
+		e = gf_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, &av1);
+		if (e<GF_OK) {
+			if (av1.config) gf_odf_av1_cfg_del(av1.config);
+			gf_av1_reset_state(&av1, GF_TRUE);
+			return e;
+		}
 		gf_inspect_dump_obu(dump, &av1, obu->obu, obu->obu_length, obu_type, obu_size, hdr_size, dump_crc);
 		gf_bs_del(bs);
 	}
@@ -1341,14 +1439,15 @@
 
 	fprintf(dump, " <OBUSamples>\n");
 
+	e = GF_OK;
 	for (i=0; i<count; i++) {
 		u64 dts, cts;
 		u32 size;
 		u8 *ptr;
 		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, NULL);
 		if (!samp) {
-			fprintf(dump, "\n", i+1);
-			continue;
+			e = gf_isom_last_error(file);
+			break;
 		}
 		dts = samp->DTS;
 		cts = dts + (s32) samp->CTS_Offset;
@@ -1362,7 +1461,9 @@
 
 		bs = gf_bs_new(ptr, size, GF_BITSTREAM_READ);
 		while (size) {
-			gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, &av1);
+			e = gf_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, &av1);
+			if (e<GF_OK) break;
+
 			if (obu_size > size) {
 				fprintf(dump, " \n", idx, (u32) obu_size, size);
 				break;
@@ -1377,6 +1478,8 @@
 		gf_isom_sample_del(&samp);
 
 		fprintf(dump, "\n");
+
+		if (e<GF_OK) break;
 		gf_set_progress("Analysing Track OBUs", i+1, count);
 	}
 	fprintf(dump, " </OBUSamples>\n");
@@ -1385,10 +1488,12 @@
 	if (av1.config) gf_odf_av1_cfg_del(av1.config);
 	gf_av1_reset_state(&av1, GF_TRUE);
 #endif
+	return e;
 }
 
-static void dump_qt_prores(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc)
+static GF_Err dump_qt_prores(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc)
 {
+	GF_Err e = GF_OK;
 #ifndef GPAC_DISABLE_AV_PARSERS
 	u32 i, count, track, timescale;
 
@@ -1404,8 +1509,8 @@
 		u64 dts, cts;
 		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, NULL);
 		if (!samp) {
-			fprintf(dump, "\n", i+1);
-			continue;
+			e = gf_isom_last_error(file);
+			break;
 		}
 		dts = samp->DTS;
 		cts = dts + (s32) samp->CTS_Offset;
@@ -1425,6 +1530,7 @@
 	}
 	fprintf(dump, "</ProResTrack>\n");
 #endif
+	return e;
 }
 
 void dump_isom_saps(GF_ISOFile *file, GF_ISOTrackID trackID, u32 dump_saps_mode, char *inName, Bool is_final_name)
@@ -1440,7 +1546,7 @@
 		if (!is_final_name) sprintf(szBuf, "%s_%d_cues.xml", inName, trackID);
 		dump = gf_fopen(szBuf, "wt");
 		if (!dump) {
-			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s for dumping\n", szBuf));
 			return;
 		}
 	} else {
@@ -1507,6 +1613,179 @@
 	if (inName) gf_fclose(dump);
 }
 
+
+typedef struct
+{
+	u32 track_num;
+	u32 chunk_num;
+	u32 first_sample_num;
+	u32 timescale;
+	u32 sample_per_chunk;
+	u64 chunk_offset;
+	u64 size;
+} ChunkInfo;
+
+static s32 sort_chunk(const void* e1, const void* e2)
+{
+	const ChunkInfo *p1 = e1;
+	const ChunkInfo *p2 = e2;
+
+	if (p1->chunk_offset < p2->chunk_offset) return -1;
+	if (p1->chunk_offset > p2->chunk_offset) return 1;
+	return 0;
+}
+
+void dump_isom_chunks(GF_ISOFile *file, char *inName, Bool is_final_name)
+{
+	u32 i, count, nb_chunks_total, cur;
+	FILE *dump;
+	Bool dump_stsd = 0;
+	u32 dump_hm = 0;
+	u64 prev_time = 0;
+	u64 unused_space = 0;
+	u64 prev_chunk_end = 0;
+	Bool do_prog=GF_TRUE;
+	ChunkInfo *all_chunks;
+
+	if (inName) {
+		char szBuf[1024];
+		strcpy(szBuf, inName);
+		if (!is_final_name) strcat(szBuf, "_chunks.txt");
+		dump = gf_fopen(szBuf, "wt");
+		if (!dump) {
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s for dumping\n", szBuf));
+			return;
+		}
+	} else {
+		dump = stdout;
+		do_prog = GF_FALSE;
+	}
+
+	count = gf_isom_get_track_count(file);
+	nb_chunks_total = 0;
+	for (i=0; i<count; i++) {
+		nb_chunks_total += gf_isom_get_chunk_count(file, i+1);
+	}
+	all_chunks = gf_malloc(sizeof(ChunkInfo) * nb_chunks_total);
+	memset(all_chunks, 0, sizeof(ChunkInfo) * nb_chunks_total);
+
+	cur = 0;
+	for (i=0; i<count; i++) {
+		u32 csize = 0;
+		u32 c1, c2;
+		u32 j, nb_chunks = gf_isom_get_chunk_count(file, i+1);
+		u32 ts = gf_isom_get_media_timescale(file, i+1);
+		u64 dur = gf_isom_get_media_duration(file, i+1);
+
+		if (dur > 3600 * ts) dump_hm = 2;
+		else if (dur > 60 * ts) dump_hm = 1;
+
+		if (nb_chunks>1) {
+			csize = gf_isom_get_constant_sample_size(file, i+1);
+			if (csize) {
+				gf_isom_enable_raw_pack(file, i+1, 1024);
+				csize = gf_isom_get_constant_sample_size(file, i+1);
+			}
+		}
+		c1 = c2 = 0;
+		for (j=0; j<nb_chunks; j++) {
+			ChunkInfo *ci;
+			u32 k;
+			u32 sample_num, spc, di;
+			u64 offset;
+			gf_isom_get_chunk_info(file, i+1,j+1, &offset, &sample_num, &spc, &di, &c1, &c2);
+
+			ci = &all_chunks[cur];
+
+			ci->track_num = i+1;
+			ci->chunk_num = j+1;
+			ci->chunk_offset = offset;
+			ci->first_sample_num = sample_num;
+			ci->timescale = ts;
+			ci->sample_per_chunk = spc;
+
+			if (csize) {
+				ci->size += csize * spc;
+			} else {
+				for (k=0; k<spc; k++) {
+					ci->size += gf_isom_get_sample_size(file, i+1, sample_num+k);
+				}
+			}
+
+			if (di>1) dump_stsd=1;
+
+			if (do_prog)
+				gf_set_progress("Analysing chunks", cur+1, nb_chunks_total);
+			cur++;
+		}
+	}
+
+	qsort(all_chunks, nb_chunks_total, sizeof(ChunkInfo), sort_chunk);
+
+	fprintf(stderr, "Dumping chunk info - diff_prev_ms is the diff in ms between start time of current and prev chunk\n");
+
+	if (dump_stsd)
+		fprintf(dump, "ChunkNum\tOffset\tTkNum\tChkNbInTk\tChkSize\tSamp/Chunk\tFirstSample\tDescIdx\tSAP\tTime\tCTS\tdiff_prev_ms\n");
+	else
+		fprintf(dump, "ChunkNum\tOffset\tTkNum\tChkNbInTk\tChkSize\tSamp/Chunk\tFirstSample\tSAP\tTime\tCTS\tdiff_prev_ms\n");
+
+	for (i=0; i<nb_chunks_total; i++) {
+		ChunkInfo *ci = &all_chunks[i];
+		u32 di;
+		GF_ISOSample *samp = gf_isom_get_sample_info(file, ci->track_num, ci->first_sample_num, &di, NULL);
+		if (samp) {
+			u32 h, m, s, ms, secs;
+			u64 time = samp->DTS+samp->CTS_Offset;
+			s64 diff;
+			time *= 1000;
+			time /= ci->timescale;
+
+			secs = (u32) (time/1000);
+			h = secs / 3600;
+			m = (secs - 3600 * h) / 60;
+			s = (secs - 3600 * h - 60 * m);
+			ms = (u32) (time - secs*1000);
+
+			diff = time;
+			diff -= prev_time;
+			prev_time = time;
+
+			fprintf(dump, "%d\t"LLU"\t%d\t%d\t"LLU"\t%d\t%d\t", i+1, ci->chunk_offset, ci->track_num, ci->chunk_num, ci->size, ci->sample_per_chunk, ci->first_sample_num);
+			if (dump_stsd) fprintf(dump, "%d\t", di);
+			fprintf(dump, "%d\t", samp->IsRAP);
+			if (dump_hm==2)
+				fprintf(dump, "%02d:", h);
+			if (dump_hm>=1)
+				fprintf(dump, "%02d:", m);
+			fprintf(dump, "%02d.%03d\t"LLD"\t"LLD"\n", s, ms, samp->DTS+samp->CTS_Offset, diff);
+			gf_isom_sample_del(&samp);
+		} else {
+			fprintf(dump, "%d\t"LLU"\t%d\t%d\t%d\tN/A\tN/A\tN/A\tN/A\n", i+1, ci->chunk_offset, ci->track_num, ci->chunk_num, ci->first_sample_num);
+		}
+		//we assume single mdat ...
+		if (!prev_chunk_end) {
+			prev_chunk_end = gf_isom_get_first_mdat_start(file);
+		}
+
+		if (ci->chunk_offset > prev_chunk_end)
+			unused_space += ci->chunk_offset - prev_chunk_end;
+
+		prev_chunk_end = ci->chunk_offset + ci->size;
+
+		if (do_prog)
+			gf_set_progress("Dumping chunks", i+1, nb_chunks_total);
+	}
+	gf_free(all_chunks);
+	if (inName)
+		gf_fclose(dump);
+
+	prev_chunk_end = gf_isom_get_unused_box_bytes(file);
+	if (prev_chunk_end)
+		fprintf(stderr, "Unused bytes in box structure: "LLU"\n", prev_chunk_end);
+	if (unused_space)
+		fprintf(stderr, "Unused bytes in mdat: "LLU"\n", unused_space);
+}
+
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
 void dump_isom_ismacryp(GF_ISOFile *file, char *inName, Bool is_final_name)
@@ -1520,7 +1799,7 @@
 		if (!is_final_name) strcat(szBuf, "_ismacryp.xml");
 		dump = gf_fopen(szBuf, "wt");
 		if (!dump) {
-			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s for dumping\n", szBuf));
 			return;
 		}
 	} else {
@@ -1556,7 +1835,7 @@
 
 	track = gf_isom_get_track_by_id(file, trackID);
 	if (!track) {
-		fprintf(stderr, "Cannot find track ID %d\n", trackID);
+		M4_LOG(GF_LOG_ERROR, ("Cannot find track ID %d\n", trackID));
 		return;
 	}
 
@@ -1565,7 +1844,7 @@
 	case GF_ISOM_MEDIA_SUBT:
 		break;
 	default:
-		fprintf(stderr, "Track ID %d is not a 3GPP text track\n", trackID);
+		M4_LOG(GF_LOG_ERROR, ("Track ID %d is not a 3GPP text track\n", trackID));
 		return;
 	}
 
@@ -1582,7 +1861,7 @@
 
 		dump = gf_fopen(szBuf, "wt");
 		if (!dump) {
-			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s for dumping\n", szBuf));
 			return;
 		}
 	} else {
@@ -1591,8 +1870,11 @@
 	e = gf_isom_text_dump(file, track, dump, dump_type);
 	if (inName) gf_fclose(dump);
 
-	if (e) fprintf(stderr, "Conversion failed (%s)\n", gf_error_to_string(e));
-	else fprintf(stderr, "Conversion done\n");
+	if (e) {
+		M4_LOG(GF_LOG_ERROR, ("Conversion failed (%s)\n", gf_error_to_string(e)));
+	} else {
+		fprintf(stderr, "Conversion done\n");
+	}
 }
 
 #endif /*GPAC_DISABLE_ISOM_DUMP*/
@@ -1615,12 +1897,12 @@
 		}
 		dump = gf_fopen(szBuf, "wt");
 		if (!dump) {
-			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s for dumping\n", szBuf));
 			return;
 		}
 	} else {
 		dump = stdout;
-		fprintf(dump, "* File SDP content *\n\n");
+		fprintf(dump, "# File SDP content \n\n");
 	}
 	//get the movie SDP
 	gf_isom_sdp_get(file, &sdp, &size);
@@ -1632,7 +1914,8 @@
 	for (i=0; i<gf_isom_get_track_count(file); i++) {
 		if (gf_isom_get_media_type(file, i+1) != GF_ISOM_MEDIA_HINT) continue;
 		gf_isom_sdp_track_get(file, i+1, &sdp, &size);
-		fprintf(dump, "%s", sdp);
+		if (sdp && size)
+			fprintf(dump, "%s", sdp);
 	}
 	fprintf(dump, "\n\n");
 	if (inName) gf_fclose(dump);
@@ -1645,20 +1928,20 @@
 
 GF_Err dump_isom_xml(GF_ISOFile *file, char *inName, Bool is_final_name, Bool do_track_dump, Bool merge_vtt_cues, Bool skip_init, Bool skip_samples)
 {
+	char szFileName[1024];
 	GF_Err e;
 	FILE *dump = stdout;
 	Bool do_close=GF_FALSE;
 	if (!file) return GF_ISOM_INVALID_FILE;
 
 	if (inName) {
-		char szBuf[1024];
-		strcpy(szBuf, inName);
+		strcpy(szFileName, inName);
 		if (!is_final_name) {
-			strcat(szBuf, do_track_dump ? "_dump.xml" : "_info.xml");
+			strcat(szFileName, do_track_dump ? "_dump.xml" : "_info.xml");
 		}
-		dump = gf_fopen(szBuf, "wt");
+		dump = gf_fopen(szFileName, "wt");
 		if (!dump) {
-			fprintf(stderr, "Failed to open %s\n", szBuf);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open %s\n", szFileName));
 			return GF_IO_ERR;
 		}
 		do_close=GF_TRUE;
@@ -1670,7 +1953,7 @@
 	}
 	e = gf_isom_dump(file, dump, skip_init, skip_samples);
 	if (e) {
-		fprintf(stderr, "Error dumping ISO structure\n");
+		M4_LOG(GF_LOG_ERROR, ("Error dumping ISO structure\n"));
 	}
 
 	if (do_track_dump) {
@@ -1692,6 +1975,7 @@
 			dumper.trackID = trackID;
 			dumper.dump_file = dump;
 
+			e = GF_OK;
 			if (mtype == GF_ISOM_MEDIA_HINT) {
 #ifndef GPAC_DISABLE_ISOM_HINTING
 				char *name=NULL;
@@ -1714,16 +1998,35 @@
 				fmt_handled = GF_TRUE;
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
 			}
-			else if (gf_isom_get_avc_svc_type(the_file, i+1, 1) || gf_isom_get_hevc_lhvc_type(the_file, i+1, 1)) {
-				dump_isom_nal_ex(the_file, trackID, dump, GF_FALSE);
+			else if (gf_isom_get_avc_svc_type(the_file, i+1, 1)
+				|| gf_isom_get_hevc_lhvc_type(the_file, i+1, 1)
+				|| gf_isom_get_vvc_type(the_file, i+1, 1)
+			) {
+				e = dump_isom_nal_ex(the_file, trackID, dump, GF_FALSE);
 				fmt_handled = GF_TRUE;
-			} else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT) ) {
+			}
+			else if (msubtype == GF_ISOM_SUBTYPE_AV01) {
+				e = dump_isom_obu(the_file, trackID, dump, GF_FALSE);
+				fmt_handled = GF_TRUE;
+			}
+			else if (msubtype == GF_ISOM_SUBTYPE_AV01) {
+				e = dump_isom_obu(the_file, trackID, dump, GF_FALSE);
+				fmt_handled = GF_TRUE;
+			}
+			else if ((msubtype == GF_QT_SUBTYPE_APCH) || (msubtype == GF_QT_SUBTYPE_APCO)
+				|| (msubtype == GF_QT_SUBTYPE_APCN) || (msubtype == GF_QT_SUBTYPE_APCS)
+				|| (msubtype == GF_QT_SUBTYPE_AP4X) || (msubtype == GF_QT_SUBTYPE_AP4H)
+			) {
+				e = dump_qt_prores(the_file, trackID, dump, GF_FALSE);
+				fmt_handled = GF_TRUE;
+			}
+			else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT) ) {
 
 				if (msubtype==GF_ISOM_SUBTYPE_WVTT) {
-					gf_webvtt_dump_iso_track(&dumper, i+1, merge_vtt_cues, GF_TRUE);
+					e = gf_webvtt_dump_iso_track(&dumper, i+1, merge_vtt_cues, GF_TRUE);
 					fmt_handled = GF_TRUE;
 				} else if ((msubtype==GF_ISOM_SUBTYPE_TX3G) || (msubtype==GF_ISOM_SUBTYPE_TEXT)) {
-					gf_isom_text_dump(the_file, i+1, dump, GF_TEXTDUMPTYPE_TTXT_BOXES);
+					e = gf_isom_text_dump(the_file, i+1, dump, GF_TEXTDUMPTYPE_TTXT_BOXES);
 					fmt_handled = GF_TRUE;
 				}
 			}
@@ -1731,8 +2034,9 @@
 			if (!fmt_handled) {
 				dumper.flags = GF_EXPORT_NHML | GF_EXPORT_NHML_FULL;
 				dumper.print_stats_graph = fs_dump_flags;
-				gf_media_export(&dumper);
+				e = gf_media_export(&dumper);
 			}
+			if (e) break;
 		}
 #else
 		return GF_NOT_SUPPORTED;
@@ -1742,6 +2046,19 @@
 		fprintf(dump, "</ISOBaseMediaFileTrace>\n");
 	}
 	if (do_close) gf_fclose(dump);
+
+	if (!e && dump_check_xml) {
+		if (do_close) {
+			GF_DOMParser *xml_parser = gf_xml_dom_new();
+			e = gf_xml_dom_parse(xml_parser, szFileName, NULL, NULL);
+			if (e) {
+				fprintf(stderr, "Failed to parse XML dump %s: line %d: %s\n", szFileName, gf_xml_dom_get_line(xml_parser), gf_xml_dom_get_error(xml_parser) );
+			}
+			gf_xml_dom_del(xml_parser);
+		} else {
+			fprintf(stderr, "Cannot check XML for dump on stdout\n");
+		}
+	}
 	return e;
 }
 #endif
@@ -1793,20 +2110,53 @@
 	return szTime;
 }
 
-void print_udta(GF_ISOFile *file, u32 track_number)
+void print_udta(GF_ISOFile *file, u32 track_number, Bool has_itags)
 {
 	u32 i, count;
 
 	count = gf_isom_get_udta_count(file, track_number);
 	if (!count) return;
 
+	if (has_itags) {
+		for (i=0; i<count; i++) {
+			u32 type;
+			bin128 uuid;
+			gf_isom_get_udta_type(file, track_number, i+1, &type, &uuid);
+			if (type == GF_ISOM_BOX_TYPE_META) {
+				count--;
+				break;
+			}
+		}
+		if (!count) return;
+	}
+
 	fprintf(stderr, "%d UDTA types: ", count);
 
 	for (i=0; i<count; i++) {
-		u32 type;
+		u32 j, type, nb_items;
 		bin128 uuid;
 		gf_isom_get_udta_type(file, track_number, i+1, &type, &uuid);
-		fprintf(stderr, "%s (%d) ", gf_4cc_to_str(type), gf_isom_get_user_data_count(file, track_number, type, uuid) );
+		nb_items = gf_isom_get_user_data_count(file, track_number, type, uuid);
+		if (!nb_items) continue;
+
+		fprintf(stderr, "\n\t%s: ", gf_4cc_to_str(type));
+		for (j=0; j<nb_items; j++) {
+			u8 *udta=NULL;
+			u32 udta_size;
+			gf_isom_get_user_data(file, track_number, type, uuid, j+1, &udta, &udta_size);
+			if (!udta) continue;
+			if (j) fprintf(stderr, ", ");
+			if (udta_size && gf_utf8_is_legal(udta, udta_size)) {
+				u32 idx;
+				for (idx=0; idx<udta_size; idx++) {
+					if (!udta[idx]) break;
+					fprintf(stderr, "%c", udta[idx]);
+				}
+			} else {
+				fprintf(stderr, " unknown type (%d bytes)", udta_size);
+			}
+			gf_free(udta);
+		}
 	}
 	fprintf(stderr, "\n");
 }
@@ -1822,15 +2172,15 @@
 	memset(uuid, 0, 16);
 	count = gf_isom_get_user_data_count(file, dump_udta_track, dump_udta_type, uuid);
 	if (!count) {
-		fprintf(stderr, "No UDTA for type %s found\n", gf_4cc_to_str(dump_udta_type) );
-		return GF_OK;
+		M4_LOG(GF_LOG_ERROR, ("No UDTA for type %s found\n", gf_4cc_to_str(dump_udta_type) ));
+		return GF_NOT_FOUND;
 	}
 
 	data = NULL;
 	count = 0;
 	e = gf_isom_get_user_data(file, dump_udta_track, dump_udta_type, uuid, 0, &data, &count);
 	if (e) {
-		fprintf(stderr, "Error dumping UDTA %s: %s\n", gf_4cc_to_str(dump_udta_type), gf_error_to_string(e) );
+		M4_LOG(GF_LOG_ERROR, ("Error dumping UDTA %s: %s\n", gf_4cc_to_str(dump_udta_type), gf_error_to_string(e) ));
 		return e;
 	}
 	if (inName) {
@@ -1843,7 +2193,7 @@
 		t = gf_fopen(szName, "wb");
 		if (!t) {
 			gf_free(data);
-			fprintf(stderr, "Cannot open file %s\n", szName );
+			M4_LOG(GF_LOG_ERROR, ("Cannot open file %s\n", szName ));
 			return GF_IO_ERR;
 		}
 	} else {
@@ -1853,7 +2203,7 @@
 	if (inName) gf_fclose(t);
 	gf_free(data);
 	if (count-8 != res) {
-		fprintf(stderr, "Error writing udta to file\n");
+		M4_LOG(GF_LOG_ERROR, ("Error writing udta to file\n"));
 		return GF_IO_ERR;
 	}
 	return GF_OK;
@@ -1879,11 +2229,11 @@
 			}
 		}
 		if (!chap_tk) {
-			fprintf(stderr, "No chapters or chapters track found in file\n");
+			M4_LOG(GF_LOG_WARNING, ("No chapters or chapters track found in file\n"));
 			return GF_OK;
 		}
 
-		fprintf(stderr, "Chapter track found, dumping\n");
+		fprintf(stderr, "Dumping chapter track %d\n", chap_tk);
 		dump_isom_timed_text(file, gf_isom_get_track_id(file, chap_tk), inName, is_final_name, GF_FALSE, dump_mode);
 		return GF_OK;
 
@@ -1938,41 +2288,136 @@
 }
 
 
+static void dump_key_info(const u8 *key_info, u32 key_info_size, Bool is_protected)
+{
+	if (!key_info) return;
+	u32 j, k, kpos=3;
+	u32 nb_keys = 1;
+	if (key_info[0]) {
+		nb_keys = key_info[1];
+		nb_keys <<= 8;
+		nb_keys |= key_info[2];
+	}
+	for (k=0; k<nb_keys; k++) {
+		u8 constant_iv_size=0;
+		u8 iv_size=key_info[kpos+1];
+		fprintf(stderr, "\t\tKID");
+		if (nb_keys>1)
+			fprintf(stderr, "%d", k+1);
+		fprintf(stderr, " ");
+		for (j=0; j<16; j++) fprintf(stderr, "%02X", key_info[kpos+1+j]);
+		kpos+=17;
+		if (!iv_size && is_protected) {
+			constant_iv_size = key_info[1];
+			kpos += 1 + constant_iv_size;
+		}
+		fprintf(stderr, " - %sIV size %d \n", constant_iv_size ? "const " : "", constant_iv_size ? constant_iv_size : iv_size);
+	}
+}
+
 static void DumpMetaItem(GF_ISOFile *file, Bool root_meta, u32 tk_num, char *name)
 {
-	u32 i, count, brand, primary_id;
-	brand = gf_isom_get_meta_type(file, root_meta, tk_num);
-	if (!brand) return;
+	char szInd[2];
+	u32 i, count, primary_id;
+	u32 meta_type = gf_isom_get_meta_type(file, root_meta, tk_num);
+	if (name[0]=='\t') {
+		szInd[0] = '\t';
+		szInd[1] = 0;
+	} else {
+		szInd[0] = 0;
+	}
 
 	count = gf_isom_get_meta_item_count(file, root_meta, tk_num);
+	if (!count && !meta_type) return;
+
 	primary_id = gf_isom_get_meta_primary_item_id(file, root_meta, tk_num);
-	fprintf(stderr, "%s type: \"%s\" - %d resource item(s)\n", name, gf_4cc_to_str(brand), (count+(primary_id>0)));
+	fprintf(stderr, "%s type: \"%s\" - %d resource item(s)\n", name, meta_type ? gf_4cc_to_str(meta_type) : "undefined", (count+(primary_id>0)));
 	switch (gf_isom_has_meta_xml(file, root_meta, tk_num)) {
 	case 1:
-		fprintf(stderr, "Meta has XML resource\n");
+		fprintf(stderr, "%sMeta has XML resource\n", szInd);
 		break;
 	case 2:
-		fprintf(stderr, "Meta has BinaryXML resource\n");
+		fprintf(stderr, "%sMeta has BinaryXML resource\n", szInd);
 		break;
 	}
 	if (primary_id) {
-		fprintf(stderr, "Primary Item - ID %d\n", primary_id);
+		fprintf(stderr, "%sPrimary Item - ID %d\n", szInd, primary_id);
 	}
 	for (i=0; i<count; i++) {
 		const char *it_name, *mime, *enc, *url, *urn;
 		Bool self_ref;
 		u32 ID;
-		u32 it_type;
-		gf_isom_get_meta_item_info(file, root_meta, tk_num, i+1, &ID, &it_type, NULL, &self_ref, &it_name, &mime, &enc, &url, &urn);
-		fprintf(stderr, "Item #%d - ID %d - type %s ", i+1, ID, gf_4cc_to_str(it_type));
-		if (self_ref) fprintf(stderr, " - Self-Reference");
-		else if (it_name) fprintf(stderr, " - Name: %s", it_name);
-		if (mime) fprintf(stderr, " - MimeType: %s", mime);
-		if (enc) fprintf(stderr, " - ContentEncoding: %s", enc);
+		u32 it_type, cenc_scheme, cenc_version;
+		GF_Err e = gf_isom_get_meta_item_info(file, root_meta, tk_num, i+1, &ID, &it_type, &cenc_scheme, &cenc_version, &self_ref, &it_name, &mime, &enc, &url, &urn);
+		if (e) {
+			fprintf(stderr, "%sItem #%d fetch info error: %s\n", szInd, i+1, gf_error_to_string(e) );
+			continue;
+		}
+		fprintf(stderr, "%sItem #%d: ID %d type %s", szInd, i+1, ID, gf_4cc_to_str(it_type));
+		if (self_ref) fprintf(stderr, " Self-Reference");
+		else if (it_name && it_name[0]) fprintf(stderr, " Name \"%s\"", it_name);
+		if (mime) fprintf(stderr, " MIME: \"%s\"", mime);
+		if (enc) fprintf(stderr, " ContentEncoding: \"%s\"", enc);
+
+		if (meta_type == GF_META_ITEM_TYPE_PICT) {
+			GF_ImageItemProperties img_props;
+			e = gf_isom_get_meta_image_props(file, root_meta, tk_num, ID, &img_props);
+			if (e) {
+				fprintf(stderr, " invalid image properties !");
+			} else {
+				u32 j;
+				Bool chan_diff = 0;
+				if (img_props.width && img_props.height) {
+					fprintf(stderr, " size %ux%u", img_props.width, img_props.height);
+				}
+				if (img_props.hSpacing && img_props.vSpacing) {
+					fprintf(stderr, " SAR %u/%u", img_props.hSpacing, img_props.vSpacing);
+				}
+				if (img_props.num_channels) {
+					fprintf(stderr, " %d channel%s (", img_props.num_channels, (img_props.num_channels>1) ? "s" : "");
+					for (j=1; j<img_props.num_channels; j++) {
+						if (img_props.bits_per_channel[0] != img_props.bits_per_channel[j])
+							chan_diff = 1;
+					}
+					if (chan_diff) {
+						for (j=0; j<img_props.num_channels; j++) {
+							if (j) fprintf(stderr, ",");
+							fprintf(stderr, "%d", img_props.bits_per_channel[j]);
+						}
+					} else {
+						fprintf(stderr, "%d", img_props.bits_per_channel[0]);
+					}
+					fprintf(stderr, " bpc)");
+				}
+				if (img_props.hOffset || img_props.vOffset)
+					fprintf(stderr, " Offset %ux%u", img_props.hOffset, img_props.vOffset);
+				if (img_props.alpha) fprintf(stderr, " Alpha");
+				if (img_props.hidden) fprintf(stderr, " Hidden");
+				if (img_props.angle) fprintf(stderr, " Rotate %d", img_props.angle);
+				if (img_props.mirror) fprintf(stderr, " Mirror %d", img_props.mirror);
+				if (img_props.clap_hden || img_props.clap_wden)
+					fprintf(stderr, " Clap %d/%d,%d/%d,%d/%d,%d/%d", img_props.clap_wnum, img_props.clap_wden, img_props.clap_hnum, img_props.clap_hden, img_props.clap_honum, img_props.clap_hoden, img_props.clap_vonum, img_props.clap_voden);
+			}
+		}
+
+		if (cenc_scheme) {
+			Bool is_protected;
+			u8 skip_byte_block, crypt_byte_block;
+			const u8 *key_info;
+			u32 key_info_size;
+			fprintf(stderr, " - Protection scheme: %s v0x%08X", gf_4cc_to_str(cenc_scheme), cenc_version);
+
+			gf_isom_extract_meta_item_get_cenc_info(file, root_meta, tk_num, ID, &is_protected, &skip_byte_block, &crypt_byte_block, &key_info, &key_info_size, NULL, NULL, NULL, NULL);
+			if (skip_byte_block && crypt_byte_block)
+				fprintf(stderr, " - Pattern %d:%d", skip_byte_block, crypt_byte_block);
+			fprintf(stderr, "\n");
+			dump_key_info(key_info, key_info_size, is_protected);
+		}
 		fprintf(stderr, "\n");
-		if (url) fprintf(stderr, "URL: %s\n", url);
-		if (urn) fprintf(stderr, "URN: %s\n", urn);
+		if (url) fprintf(stderr, "%sURL: %s\n", szInd, url);
+		if (urn) fprintf(stderr, "%sURN: %s\n", szInd, urn);
 	}
+	fprintf(stderr, "\n");
 }
 
 
@@ -1981,7 +2426,7 @@
 	u32 i, j;
 	u8 hash[20];
 	for (i=0; i<gf_list_count(xps_array); i++) {
-		GF_AVCConfigSlot *slc = gf_list_get(xps_array, i);
+		GF_NALUFFParam *slc = gf_list_get(xps_array, i);
 		gf_sha1_csum((u8 *) slc->data, slc->size, hash);
 		fprintf(stderr, "\t%s#%d hash: ", szName, i+1);
 		for (j=0; j<20; j++) fprintf(stderr, "%02X", hash[j]);
@@ -2010,7 +2455,7 @@
 	fprintf(stderr, "\n");
 	fprintf(stderr, "\tParameter Sets: ");
 	for (k=0; k<gf_list_count(hevccfg->param_array); k++) {
-		GF_HEVCParamArray *ar=gf_list_get(hevccfg->param_array, k);
+		GF_NALUFFParamArray *ar=gf_list_get(hevccfg->param_array, k);
 		if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
 			fprintf(stderr, "%d SPS ", gf_list_count(ar->nalus));
 		}
@@ -2022,8 +2467,8 @@
 
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
 			for (idx=0; idx<gf_list_count(ar->nalus); idx++) {
-				GF_AVCConfigSlot *vps = gf_list_get(ar->nalus, idx);
-				s32 ps_idx=gf_media_hevc_read_vps(vps->data, vps->size, hevc_state);
+				GF_NALUFFParam *vps = gf_list_get(ar->nalus, idx);
+				s32 ps_idx=gf_hevc_read_vps(vps->data, vps->size, hevc_state);
 				if (hevccfg->is_lhvc && (ps_idx>=0)) {
 					non_hevc_base_layer = ! hevc_state->vps[ps_idx].base_layer_internal_flag;
 				}
@@ -2036,14 +2481,14 @@
 	fprintf(stderr, "\n");
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
 	for (k=0; k<gf_list_count(hevccfg->param_array); k++) {
-		GF_HEVCParamArray *ar=gf_list_get(hevccfg->param_array, k);
+		GF_NALUFFParamArray *ar=gf_list_get(hevccfg->param_array, k);
 		u32 width, height;
 		s32 par_n, par_d;
 
 		if (ar->type !=GF_HEVC_NALU_SEQ_PARAM) continue;
 		for (idx=0; idx<gf_list_count(ar->nalus); idx++) {
 			GF_Err e;
-			GF_AVCConfigSlot *sps = gf_list_get(ar->nalus, idx);
+			GF_NALUFFParam *sps = gf_list_get(ar->nalus, idx);
 			par_n = par_d = -1;
 			e = gf_hevc_get_sps_info_with_state(hevc_state, sps->data, sps->size, NULL, &width, &height, &par_n, &par_d);
 			if (e==GF_OK) {
@@ -2055,7 +2500,7 @@
 				}
 				fprintf(stderr, "\n");
 			} else {
-				fprintf(stderr, "\nFailed to read SPS: %s\n\n", gf_error_to_string((e) ));
+				M4_LOG(GF_LOG_ERROR, ("Failed to read SPS: %s\n\n", gf_error_to_string(e) ));
 			}
 		}
 	}
@@ -2069,19 +2514,105 @@
 	}
 
 	for (k=0; k<gf_list_count(hevccfg->param_array); k++) {
-		GF_HEVCParamArray *ar=gf_list_get(hevccfg->param_array, k);
+		GF_NALUFFParamArray *ar=gf_list_get(hevccfg->param_array, k);
 		if (ar->type==GF_HEVC_NALU_SEQ_PARAM) print_config_hash(ar->nalus, "SPS");
 		else if (ar->type==GF_HEVC_NALU_PIC_PARAM) print_config_hash(ar->nalus, "PPS");
 		else if (ar->type==GF_HEVC_NALU_VID_PARAM) print_config_hash(ar->nalus, "VPS");
 	}
 }
 
+void dump_vvc_track_info(GF_ISOFile *file, u32 trackNum, GF_VVCConfig *vvccfg
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+	, VVCState *vvc_state
+#endif /*GPAC_DISABLE_AV_PARSERS && defined(GPAC_DISABLE_HEVC)*/
+	)
+{
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+	u32 idx;
+#endif
+	u32 k;
+	fprintf(stderr, "\tNAL Unit length bits: %d", 8*vvccfg->nal_unit_size);
+	if (vvccfg->ptl_present) {
+		fprintf(stderr, " Profile %d @ Level %d - Chroma Format %s", vvccfg->general_profile_idc, vvccfg->general_level_idc, gf_avc_hevc_get_chroma_format_name(vvccfg->chroma_format));
+		if (vvccfg->general_constraint_info && vvccfg->num_constraint_info && vvccfg->general_constraint_info[0]) {
+			fprintf(stderr, " - general constraint info 0x");
+			for (idx=0; idx<vvccfg->num_constraint_info; idx++) {
+				fprintf(stderr, "%02X", vvccfg->general_constraint_info[idx]);
+			}
+		}
+		fprintf(stderr, "\n");
+		fprintf(stderr, "\tBit Depth %d - %d temporal layers\n", vvccfg->bit_depth, vvccfg->numTemporalLayers);
+	}
+
+	fprintf(stderr, "\tParameter Sets: ");
+	for (k=0; k<gf_list_count(vvccfg->param_array); k++) {
+		GF_NALUFFParamArray *ar=gf_list_get(vvccfg->param_array, k);
+		if (ar->type==GF_VVC_NALU_SEQ_PARAM) {
+			fprintf(stderr, "%d SPS ", gf_list_count(ar->nalus));
+		}
+		if (ar->type==GF_VVC_NALU_PIC_PARAM) {
+			fprintf(stderr, "%d PPS ", gf_list_count(ar->nalus));
+		}
+		if (ar->type==GF_VVC_NALU_VID_PARAM) {
+			fprintf(stderr, "%d VPS ", gf_list_count(ar->nalus));
 
-void DumpTrackInfo(GF_ISOFile *file, GF_ISOTrackID trackID, Bool full_dump, Bool is_track_num)
+#if !defined(GPAC_DISABLE_AV_PARSERS) && 0 //TODO
+			for (idx=0; idx<gf_list_count(ar->nalus); idx++) {
+				GF_NALUFFParam *vps = gf_list_get(ar->nalus, idx);
+				s32 ps_idx=gf_hevc_read_vps(vps->data, vps->size, hevc_state);
+				if (hevccfg->is_lhvc && (ps_idx>=0)) {
+					non_hevc_base_layer = ! hevc_state->vps[ps_idx].base_layer_internal_flag;
+				}
+			}
+#endif
+
+		}
+	}
+
+	fprintf(stderr, "\n");
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+	for (k=0; k<gf_list_count(vvccfg->param_array); k++) {
+		GF_NALUFFParamArray *ar=gf_list_get(vvccfg->param_array, k);
+		u32 width, height;
+		s32 par_n, par_d;
+
+		if (ar->type !=GF_VVC_NALU_SEQ_PARAM) continue;
+		for (idx=0; idx<gf_list_count(ar->nalus); idx++) {
+			GF_Err e;
+			GF_NALUFFParam *sps = gf_list_get(ar->nalus, idx);
+			par_n = par_d = -1;
+			e = gf_vvc_get_sps_info(sps->data, sps->size, NULL, &width, &height, &par_n, &par_d);
+			if (e==GF_OK) {
+				fprintf(stderr, "\tSPS resolution %dx%d", width, height);
+				if ((par_n>0) && (par_d>0)) {
+					u32 tw, th;
+					gf_isom_get_track_layout_info(file, trackNum, &tw, &th, NULL, NULL, NULL);
+					fprintf(stderr, " - Pixel Aspect Ratio %d:%d - Indicated track size %d x %d", par_n, par_d, tw, th);
+				}
+				fprintf(stderr, "\n");
+			} else {
+				M4_LOG(GF_LOG_ERROR, ("\nFailed to read SPS: %s\n\n", gf_error_to_string(e) ));
+			}
+		}
+	}
+#endif
+
+	for (k=0; k<gf_list_count(vvccfg->param_array); k++) {
+		GF_NALUFFParamArray *ar=gf_list_get(vvccfg->param_array, k);
+		if (ar->type==GF_VVC_NALU_SEQ_PARAM) print_config_hash(ar->nalus, "SPS");
+		else if (ar->type==GF_VVC_NALU_PIC_PARAM) print_config_hash(ar->nalus, "PPS");
+		else if (ar->type==GF_VVC_NALU_VID_PARAM) print_config_hash(ar->nalus, "VPS");
+	}
+}
+
+void gf_inspect_format_timecode(const u8 *data, u32 size, u32 tmcd_flags, u32 tc_num, u32 tc_den, u32 tmcd_fpt, char szFmt[100]);
+
+void DumpTrackInfo(GF_ISOFile *file, GF_ISOTrackID trackID, Bool full_dump, Bool is_track_num, Bool dump_m4sys)
 {
-	Float scale;
+	char szCodec[RFC6381_CODEC_NAME_SIZE_MAX];
+	Double scale, max_rate, rate;
 	Bool is_od_track = 0;
-	u32 trackNum, i, j, max_rate, rate, ts, mtype, msub_type, timescale, sr, nb_ch, count, alt_group, nb_groups, nb_edits, cdur, csize, bps;
+	u32 trackNum, i, j, ts, mtype, msub_type, timescale, sr, nb_ch, count, alt_group, nb_groups, nb_edits, cdur, csize, bps, pfmt, codecid;
 	u64 time_slice, dur, size;
 	s32 cts_shift;
 	GF_ESD *esd;
@@ -2095,29 +2626,43 @@
 		trackID = gf_isom_get_track_id(file, trackNum);
 	}
 	if (!trackNum) {
-		fprintf(stderr, "No track with ID %d found\n", trackID);
+		M4_LOG(GF_LOG_ERROR, ("No track with ID %d found\n", trackID));
 		return;
 	}
 
 	timescale = gf_isom_get_media_timescale(file, trackNum);
-	fprintf(stderr, "Track # %d Info - TrackID %d - TimeScale %d\n", trackNum, trackID, timescale);
-	fprintf(stderr, "Media Duration %s - ", format_duration(gf_isom_get_media_duration(file, trackNum), timescale, szDur));
-	fprintf(stderr, "Indicated Duration %s\n", format_duration(gf_isom_get_media_original_duration(file, trackNum), timescale, szDur));
+	fprintf(stderr, "# Track %d Info - ID %d - TimeScale %d\n", trackNum, trackID, timescale);
+
+	dur = gf_isom_get_media_original_duration(file, trackNum);
+	size = gf_isom_get_media_duration(file, trackNum);
+	fprintf(stderr, "Media Duration %s ", format_duration(dur, timescale, szDur));
+	if (dur != size)
+		fprintf(stderr, " (recomputed %s)", format_duration(size, timescale, szDur));
+	fprintf(stderr, "\n");
 
 	if (gf_isom_check_data_reference(file, trackNum, 1) != GF_OK) {
-		fprintf(stderr, "Track uses external data reference not supported by GPAC!\n");
+		M4_LOG(GF_LOG_WARNING, ("Track uses external data reference not supported by GPAC!\n"));
 	}
 
 	nb_edits = gf_isom_get_edits_count(file, trackNum);
 	if (nb_edits)
-		fprintf(stderr, "Track has %d edit lists: track duration is %s\n", nb_edits, format_duration(gf_isom_get_track_duration(file, trackNum), gf_isom_get_timescale(file), szDur));
+		fprintf(stderr, "Track has %d edits: track duration is %s\n", nb_edits, format_duration(gf_isom_get_track_duration(file, trackNum), gf_isom_get_timescale(file), szDur));
 
 	cts_shift = gf_isom_get_composition_offset_shift(file, trackNum);
 	if (cts_shift)
 		fprintf(stderr, "Track composition offset shift (negative CTS offset): %d\n", cts_shift);
 
 	if (gf_isom_is_track_in_root_od(file, trackNum) ) fprintf(stderr, "Track is present in Root OD\n");
-	if (!gf_isom_is_track_enabled(file, trackNum)) fprintf(stderr, "Track is disabled\n");
+
+	u32 tk_flags = gf_isom_get_track_flags(file, trackNum);
+	fprintf(stderr, "Track flags:");
+	if (tk_flags & GF_ISOM_TK_ENABLED) fprintf(stderr, " Enabled");
+	else fprintf(stderr, " Disabled");
+	if (tk_flags & GF_ISOM_TK_IN_MOVIE) fprintf(stderr, " In Movie");
+	if (tk_flags & GF_ISOM_TK_IN_PREVIEW) fprintf(stderr, " In Preview");
+	if (tk_flags & GF_ISOM_TK_SIZE_IS_AR) fprintf(stderr, " Size is AspectRatio");
+	fprintf(stderr, "\n");
+
 	gf_isom_get_media_language(file, trackNum, &lang);
 	fprintf(stderr, "Media Info: Language \"%s (%s)\" - ", GetLanguage(lang), lang );
 	gf_free(lang);
@@ -2127,6 +2672,9 @@
 	if (!msub_type) msub_type = gf_isom_get_media_subtype(file, trackNum, 1);
 	fprintf(stderr, "%s\" - %d samples\n", gf_4cc_to_str(msub_type), gf_isom_get_sample_count(file, trackNum));
 
+	pfmt = gf_pixel_fmt_from_qt_type(msub_type);
+	codecid = gf_codec_id_from_isobmf(msub_type);
+
 	count = gf_isom_get_track_kind_count(file, trackNum);
 	for (i = 0; i < count; i++) {
 		char *kind_scheme, *kind_value;
@@ -2165,7 +2713,32 @@
 		fprintf(stderr, "Handler name: %s\n", handler_name);
 	}
 
-	print_udta(file, trackNum);
+	print_udta(file, trackNum, GF_FALSE);
+
+	DumpMetaItem(file, 0, trackNum, "\tTrack Meta");
+
+	gf_isom_get_track_switch_group_count(file, trackNum, &alt_group, &nb_groups);
+	if (alt_group) {
+		fprintf(stderr, "Alternate Group ID %d\n", alt_group);
+		for (i=0; i<nb_groups; i++) {
+			u32 nb_crit, switchGroupID;
+			const u32 *criterias = gf_isom_get_track_switch_parameter(file, trackNum, i+1, &switchGroupID, &nb_crit);
+			if (!nb_crit) {
+				fprintf(stderr, "\tNo criteria in %s group\n", switchGroupID ? "switch" : "alternate");
+			} else {
+				if (switchGroupID) {
+					fprintf(stderr, "\tSwitchGroup ID %d criterias: ", switchGroupID);
+				} else {
+					fprintf(stderr, "\tAlternate Group criterias: ");
+				}
+				for (j=0; j<nb_crit; j++) {
+					if (j) fprintf(stderr, " ");
+					fprintf(stderr, "%s", gf_4cc_to_str(criterias[j]) );
+				}
+				fprintf(stderr, "\n");
+			}
+		}
+	}
 
 	if (gf_isom_is_video_handler_type(mtype) ) {
 		s32 tx, ty;
@@ -2178,6 +2751,15 @@
 
 		gf_isom_get_track_layout_info(file, trackNum, &w, &h, &tx, &ty, NULL);
 		fprintf(stderr, "Visual Track layout: x=%d y=%d width=%d height=%d\n", tx, ty, w, h);
+
+		GF_DOVIDecoderConfigurationRecord *dovi = gf_isom_dovi_config_get(file, trackNum, 1);
+		if (dovi) {
+			fprintf(stderr, "DolbyVision version %d.%d profile %d level %d (RPU: %d Base Layer: %d Enhancement Layer: %d Compatibility: %d)\n",
+				dovi->dv_version_major, dovi->dv_version_minor, dovi->dv_profile, dovi->dv_level,
+				dovi->rpu_present_flag, dovi->bl_present_flag, dovi->el_present_flag, dovi->dv_bl_signal_compatibility_id);
+
+			gf_odf_dovi_cfg_del(dovi);
+		}
 	}
 
 	gf_isom_get_audio_info(file, trackNum, 1, &sr, &nb_ch, &bps);
@@ -2205,17 +2787,20 @@
 	 ) {
 		esd = gf_isom_get_esd(file, trackNum, 1);
 		if (!esd || !esd->decoderConfig) {
-			fprintf(stderr, "WARNING: Broken MPEG-4 Track\n");
+			M4_LOG(GF_LOG_WARNING, ("WARNING: Broken MPEG-4 Track\n"));
 			if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
 		} else {
 			const char *st = gf_stream_type_name(esd->decoderConfig->streamType);
-			if (st) {
-				fprintf(stderr, "MPEG-4 Config%s%s Stream - ObjectTypeIndication 0x%02x\n",
-				 full_dump ? "\n\t" : ": ", st, esd->decoderConfig->objectTypeIndication);
-			} else {
-				fprintf(stderr, "MPEG-4 Config%sStream Type 0x%02x - ObjectTypeIndication 0x%02x\n",
-				 full_dump ? "\n\t" : ": ", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
+			if (dump_m4sys) {
+				if (st) {
+					fprintf(stderr, "MPEG-4 Config%s%s Stream - ObjectTypeIndication 0x%02x\n",
+							full_dump ? "\n\t" : ": ", st, esd->decoderConfig->objectTypeIndication);
+				} else {
+					fprintf(stderr, "MPEG-4 Config%sStream Type 0x%02x - ObjectTypeIndication 0x%02x\n",
+							full_dump ? "\n\t" : ": ", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
+				}
 			}
+
 			if (esd->decoderConfig->streamType==GF_STREAM_OD)
 				is_od_track=1;
 
@@ -2230,7 +2815,7 @@
 					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 					fprintf(stderr, "MPEG-4 Visual Size %d x %d\n", w, h);
 #endif
-						fprintf(stderr, "\tNon-compliant MPEG-4 Visual track: video_object_layer infos not found in sample description\n");
+						M4_LOG(GF_LOG_WARNING, ("Non-compliant MPEG-4 Visual track: video_object_layer infos not found in sample description\n"));
 #ifndef GPAC_DISABLE_AV_PARSERS
 					} else {
 						GF_M4VDecSpecInfo dsi;
@@ -2257,7 +2842,7 @@
 					svccfg = gf_isom_svc_config_get(file, trackNum, 1);
 					mvccfg = gf_isom_mvc_config_get(file, trackNum, 1);
 					if (!avccfg && !svccfg && !mvccfg) {
-						fprintf(stderr, "\n\n\tNon-compliant AVC track: SPS/PPS not found in sample description\n");
+						M4_LOG(GF_LOG_ERROR, ("\tNon-compliant AVC track: SPS/PPS not found in sample description\n"));
 					} else if (avccfg) {
 						fprintf(stderr, "\tAVC Info: %d SPS - %d PPS", gf_list_count(avccfg->sequenceParameterSets) , gf_list_count(avccfg->pictureParameterSets) );
 						fprintf(stderr, " - Profile %s @ Level %g\n", gf_avc_get_profile_name(avccfg->AVCProfileIndication), ((Double)avccfg->AVCLevelIndication)/10.0 );
@@ -2266,7 +2851,7 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 						for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
 							s32 par_n, par_d;
-							GF_AVCConfigSlot *slc = gf_list_get(avccfg->sequenceParameterSets, i);
+							GF_NALUFFParam *slc = gf_list_get(avccfg->sequenceParameterSets, i);
 							gf_avc_get_sps_info(slc->data, slc->size, NULL, NULL, NULL, &par_n, &par_d);
 							if ((par_n>0) && (par_d>0)) {
 								u32 tw, th;
@@ -2291,7 +2876,7 @@
 						fprintf(stderr, "\tSVC NAL Unit length bits: %d\n", 8*svccfg->nal_unit_size);
 #ifndef GPAC_DISABLE_AV_PARSERS
 						for (i=0; i<gf_list_count(svccfg->sequenceParameterSets); i++) {
-							GF_AVCConfigSlot *slc = gf_list_get(svccfg->sequenceParameterSets, i);
+							GF_NALUFFParam *slc = gf_list_get(svccfg->sequenceParameterSets, i);
 							if (slc) {
 								s32 par_n, par_d;
 								u32 s_w, s_h, sps_id;
@@ -2317,7 +2902,7 @@
 						fprintf(stderr, "\tMVC NAL Unit length bits: %d\n", 8*mvccfg->nal_unit_size);
 #ifndef GPAC_DISABLE_AV_PARSERS
 						for (i=0; i<gf_list_count(mvccfg->sequenceParameterSets); i++) {
-							GF_AVCConfigSlot *slc = gf_list_get(mvccfg->sequenceParameterSets, i);
+							GF_NALUFFParam *slc = gf_list_get(mvccfg->sequenceParameterSets, i);
 							if (slc) {
 								u32 s_w, s_h, sps_id;
 								s32 par_n, par_d;
@@ -2366,7 +2951,7 @@
 							fprintf(stderr, "\tHEVC Tile track without tiling info\n");
 						}
 					} else if (!hevccfg && !lhvccfg) {
-						fprintf(stderr, "\n\n\tNon-compliant HEVC track: No hvcC or shcC found in sample description\n");
+						M4_LOG(GF_LOG_ERROR, ("\tNon-compliant HEVC track: No hvcC or shcC found in sample description\n"));
 					}
 
 					if (gf_isom_get_reference_count(file, trackNum, GF_ISOM_REF_SABT)) {
@@ -2401,7 +2986,7 @@
 							fprintf(stderr, "Spatial scalability");
 							break;
 						case 8:
-							fprintf(stderr, "Auxilary");
+							fprintf(stderr, "Auxiliary");
 							break;
 						default:
 							fprintf(stderr, "unknown");
@@ -2417,21 +3002,22 @@
 					char *szName;
 					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 					if (full_dump) fprintf(stderr, "\t");
-					if (!strnicmp((char *) &esd->decoderConfig->decoderSpecificInfo->data[3], "theora", 6)) szName = "Theora";
-					else szName = "Unknown";
+					szName = "Unknown";
+					if (esd->decoderConfig->decoderSpecificInfo
+						&& (esd->decoderConfig->decoderSpecificInfo->dataLength>=10)
+						&& !strnicmp((char *) &esd->decoderConfig->decoderSpecificInfo->data[3], "theora", 6)
+					)
+						szName = "Theora";
+
 					fprintf(stderr, "Ogg/%s video / GPAC Mux - Visual Size %d x %d\n", szName, w, h);
 				}
-				else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_JPEG) {
-					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
-					fprintf(stderr, "JPEG Stream - Visual Size %d x %d\n", w, h);
-				}
-				else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_PNG) {
-					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
-					fprintf(stderr, "PNG Stream - Visual Size %d x %d\n", w, h);
-				}
-				else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_J2K) {
-					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
-					fprintf(stderr, "JPEG2000 Stream - Visual Size %d x %d\n", w, h);
+				else {
+					//check if we know this codec from its OTI
+					u32 codec_id = gf_codecid_from_oti(GF_STREAM_VISUAL, esd->decoderConfig->objectTypeIndication);
+					if (codec_id) {
+						gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
+						fprintf(stderr, "%s - Visual Size %d x %d\n", gf_codecid_name(codec_id), w, h);
+					}
 				}
 				if (!w || !h) {
 					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
@@ -2448,6 +3034,7 @@
 				GF_Err e;
 				u32 oti;
 #endif
+				u32 codec_id;
 				Bool is_mp2 = GF_FALSE;
 				switch (esd->decoderConfig->objectTypeIndication) {
 				case GF_CODECID_AAC_MPEG2_MP:
@@ -2461,8 +3048,9 @@
 					else
 						e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
 					if (full_dump) fprintf(stderr, "\t");
-					if (e) fprintf(stderr, "Corrupted AAC Config\n");
-					else {
+					if (e) {
+						M4_LOG(GF_LOG_ERROR, ("Corrupted AAC Config\n"));
+					} else {
 						char *signaling = "implicit";
 						char *heaac = "";
 						if (!is_mp2 && a_cfg.has_sbr) {
@@ -2487,39 +3075,32 @@
 					break;
 				case GF_CODECID_MPEG2_PART3:
 				case GF_CODECID_MPEG_AUDIO:
+				case GF_CODECID_MPEG_AUDIO_L1:
 					if (msub_type == GF_ISOM_SUBTYPE_MPEG4_CRYP) {
 						fprintf(stderr, "MPEG-1/2 Audio - %d Channels - SampleRate %d\n", nb_ch, sr);
 					} else {
 #ifndef GPAC_DISABLE_AV_PARSERS
 						GF_ISOSample *samp = gf_isom_get_sample(file, trackNum, 1, &oti);
 						if (samp) {
-							u32 mhdr = GF_4CC((u8)samp->data[0], (u8)samp->data[1], (u8)samp->data[2], (u8)samp->data[3]);
-							if (full_dump) fprintf(stderr, "\t");
-							fprintf(stderr, "%s Audio - %d Channel(s) - SampleRate %d - Layer %d\n",
-							 gf_mp3_version_name(mhdr),
-							 gf_mp3_num_channels(mhdr),
-							 gf_mp3_sampling_rate(mhdr),
-							 gf_mp3_layer(mhdr)
-							 );
+							if (samp->data && (samp->dataLength>4)) {
+								u32 mhdr = GF_4CC((u8)samp->data[0], (u8)samp->data[1], (u8)samp->data[2], (u8)samp->data[3]);
+								if (full_dump) fprintf(stderr, "\t");
+								fprintf(stderr, "%s Audio - %d Channel(s) - SampleRate %d - Layer %d\n",
+										gf_mp3_version_name(mhdr),
+										gf_mp3_num_channels(mhdr),
+										gf_mp3_sampling_rate(mhdr),
+										gf_mp3_layer(mhdr)
+									 );
+							}
 							gf_isom_sample_del(&samp);
 						} else {
-							fprintf(stderr, "\n\tError fetching sample: %s\n", gf_error_to_string(gf_isom_last_error(file)) );
+							M4_LOG(GF_LOG_ERROR, ("Error fetching sample: %s\n", gf_error_to_string(gf_isom_last_error(file)) ));
 						}
 #else
 						fprintf(stderr, "MPEG-1/2 Audio - %d Channels - SampleRate %d\n", nb_ch, sr);
 #endif
 					}
 					break;
-				/*OGG media*/
-				case GF_CODECID_VORBIS:
-					fprintf(stderr, "Ogg/Vorbis audio / GPAC Mux - Sample Rate %d - %d channel(s)\n", sr, nb_ch);
-					break;
-				case GF_CODECID_FLAC:
-					fprintf(stderr, "Ogg/FLAC audio / GPAC Mux - Sample Rate %d - %d channel(s)\n", sr, nb_ch);
-					break;
-				case GF_CODECID_SPEEX:
-					fprintf(stderr, "Ogg/Speex audio / GPAC Mux - Sample Rate %d - %d channel(s)\n", sr, nb_ch);
-					break;
 				case GF_CODECID_EVRC:
 					fprintf(stderr, "EVRC Audio - Sample Rate 8000 - 1 channel\n");
 					break;
@@ -2537,18 +3118,28 @@
 						fprintf(stderr, "EVRC Audio (PacketVideo Mux) - Sample Rate 8000 - 1 channel\n");
 					}
 					break;
+				default:
+					codec_id = gf_codecid_from_oti(GF_STREAM_AUDIO, esd->decoderConfig->objectTypeIndication);
+					if (codec_id) {
+						fprintf(stderr, "%s - Sample Rate %d - %d channel(s)\n", gf_codecid_name(codec_id), sr, nb_ch);
+					}
+					break;
 				}
 			}
 			else if (esd->decoderConfig->streamType==GF_STREAM_SCENE) {
 				if (esd->decoderConfig->objectTypeIndication<=4) {
 					GF_BIFSConfig *b_cfg = gf_odf_get_bifs_config(esd->decoderConfig->decoderSpecificInfo, esd->decoderConfig->objectTypeIndication);
-					fprintf(stderr, "BIFS Scene description - %s stream\n", b_cfg->elementaryMasks ? "Animation" : "Command");
-					if (full_dump && !b_cfg->elementaryMasks) {
-						fprintf(stderr, "\tWidth %d Height %d Pixel Metrics %s\n", b_cfg->pixelWidth, b_cfg->pixelHeight, b_cfg->pixelMetrics ? "yes" : "no");
+					if (b_cfg) {
+						fprintf(stderr, "BIFS Scene description - %s stream\n", b_cfg->elementaryMasks ? "Animation" : "Command");
+						if (full_dump && !b_cfg->elementaryMasks) {
+							fprintf(stderr, "\tWidth %d Height %d Pixel Metrics %s\n", b_cfg->pixelWidth, b_cfg->pixelHeight, b_cfg->pixelMetrics ? "yes" : "no");
+						}
+						gf_odf_desc_del((GF_Descriptor *)b_cfg);
+					} else {
+						fprintf(stderr, "! Invalid BIFS configuration !\n");
 					}
-					gf_odf_desc_del((GF_Descriptor *)b_cfg);
 				} else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_AFX) {
-					u8 tag = esd->decoderConfig->decoderSpecificInfo ? esd->decoderConfig->decoderSpecificInfo->data[0] : 0xFF;
+					u8 tag = (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) ? esd->decoderConfig->decoderSpecificInfo->data[0] : 0xFF;
 					const char *afxtype = gf_stream_type_afx_name(tag);
 					fprintf(stderr, "AFX Stream - type %s (%d)\n", afxtype, tag);
 				} else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_FONT) {
@@ -2562,16 +3153,18 @@
 				} else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_SYNTHESIZED_TEXTURE) {
 					fprintf(stderr, "Synthetized Texture stream stream\n");
 				} else {
-					fprintf(stderr, "Unknown Systems stream OTI %d\n", esd->decoderConfig->objectTypeIndication);
+					M4_LOG(GF_LOG_WARNING, ("Unknown Systems stream OTI %d\n", esd->decoderConfig->objectTypeIndication));
 				}
 			}
 
 			/*sync is only valid if we open all tracks to take care of default MP4 sync..*/
 			if (!full_dump) {
-				if (!esd->OCRESID || (esd->OCRESID == esd->ESID))
-					fprintf(stderr, "Self-synchronized\n");
-				else
-					fprintf(stderr, "Synchronized on stream %d\n", esd->OCRESID);
+				if (dump_m4sys) {
+					if (!esd->OCRESID || (esd->OCRESID == esd->ESID))
+						fprintf(stderr, "Self-synchronized\n");
+					else
+						fprintf(stderr, "Synchronized on stream %d\n", esd->OCRESID);
+				}
 			} else {
 				fprintf(stderr, "\tDecoding Buffer size %d - Bitrate: avg %d - max %d kbps\n", esd->decoderConfig->bufferSizeDB, esd->decoderConfig->avgBitrate/1000, esd->decoderConfig->maxBitrate/1000);
 				if (esd->dependsOnESID)
@@ -2583,69 +3176,6 @@
 				if (esd->URLString) fprintf(stderr, "\tRemote Data Source %s\n", esd->URLString);
 			}
 			gf_odf_desc_del((GF_Descriptor *) esd);
-
-			/*ISMACryp*/
-			if (msub_type == GF_ISOM_SUBTYPE_MPEG4_CRYP) {
-				const char *scheme_URI, *KMS_URI;
-				u32 scheme_type, version;
-				u32 IV_size;
-				Bool use_sel_enc;
-
-				if (gf_isom_is_ismacryp_media(file, trackNum, 1)) {
-					gf_isom_get_ismacryp_info(file, trackNum, 1, NULL, &scheme_type, &version, &scheme_URI, &KMS_URI, &use_sel_enc, &IV_size, NULL);
-					fprintf(stderr, "\n*Encrypted stream - ISMA scheme %s (version %d)\n", gf_4cc_to_str(scheme_type), version);
-					if (scheme_URI) fprintf(stderr, "scheme location: %s\n", scheme_URI);
-					if (KMS_URI) {
-						if (!strnicmp(KMS_URI, "(key)", 5)) fprintf(stderr, "KMS location: key in file\n");
-						else fprintf(stderr, "KMS location: %s\n", KMS_URI);
-					}
-					fprintf(stderr, "Selective Encryption: %s\n", use_sel_enc ? "Yes" : "No");
-					if (IV_size) fprintf(stderr, "Initialization Vector size: %d bits\n", IV_size*8);
-				} else if (gf_isom_is_omadrm_media(file, trackNum, 1)) {
-					const char *textHdrs;
-					u32 enc_type, hdr_len;
-					u64 orig_len;
-					fprintf(stderr, "\n*Encrypted stream - OMA DRM\n");
-					gf_isom_get_omadrm_info(file, trackNum, 1, NULL, NULL, NULL, &scheme_URI, &KMS_URI, &textHdrs, &hdr_len, &orig_len, &enc_type, &use_sel_enc, &IV_size, NULL);
-					fprintf(stderr, "Rights Issuer: %s\n", KMS_URI);
-					fprintf(stderr, "Content ID: %s\n", scheme_URI);
-					if (textHdrs) {
-						u32 offset;
-						const char *start = textHdrs;
-						fprintf(stderr, "OMA Textual Headers:\n");
-						i=0;
-						offset=0;
-						while (i<hdr_len) {
-							if (start[i]==0) {
-								fprintf(stderr, "\t%s\n", start+offset);
-								offset=i+1;
-							}
-							i++;
-						}
-						fprintf(stderr, "\t%s\n", start+offset);
-					}
-					if (orig_len) fprintf(stderr, "Original media size "LLD"\n", orig_len);
-					fprintf(stderr, "Encryption algorithm %s\n", (enc_type==1) ? "AEA 128 CBC" : (enc_type ? "AEA 128 CTR" : "None"));
-
-
-					fprintf(stderr, "Selective Encryption: %s\n", use_sel_enc ? "Yes" : "No");
-					if (IV_size) fprintf(stderr, "Initialization Vector size: %d bits\n", IV_size*8);
-				} else if(gf_isom_is_cenc_media(file, trackNum, 1)) {
-					gf_isom_get_cenc_info(file, trackNum, 1, NULL, &scheme_type, &version, &IV_size);
-					fprintf(stderr, "\n*Encrypted stream - CENC scheme %s (version: major=%u, minor=%u)\n", gf_4cc_to_str(scheme_type), (version&0xFFFF0000)>>16, version&0xFFFF);
-					if (IV_size)
-						fprintf(stderr, "Initialization Vector size: %d bits\n", IV_size*8);
-					if (gf_isom_cenc_is_pattern_mode(file, trackNum, 1))
-						fprintf(stderr, "Pattern mode enabled\n");
-
-				} else if(gf_isom_is_adobe_protection_media(file, trackNum, 1)) {
-					gf_isom_get_adobe_protection_info(file, trackNum, 1, NULL, &scheme_type, &version, NULL);
-					fprintf(stderr, "\n*Encrypted stream - Adobe protection scheme %s (version %d)\n", gf_4cc_to_str(scheme_type), version);
-				} else {
-					fprintf(stderr, "\n*Encrypted stream - unknown scheme %s\n", gf_4cc_to_str(gf_isom_is_media_encrypted(file, trackNum, 0) ));
-				}
-			}
-
 		}
 	} else if (msub_type == GF_ISOM_SUBTYPE_AV01) {
 		GF_AV1Config *av1c;
@@ -2654,23 +3184,27 @@
 		fprintf(stderr, "\tAOM AV1 stream - Resolution %d x %d\n", w, h);
 
 		av1c = gf_isom_av1_config_get(file, trackNum, 1);
-		fprintf(stderr, "\tversion=%u, profile=%u, level_idx0=%u, tier=%u\n", (u32)av1c->version, (u32)av1c->seq_profile, (u32)av1c->seq_level_idx_0, (u32)av1c->seq_tier_0);
-		fprintf(stderr, "\thigh_bitdepth=%u, twelve_bit=%u, monochrome=%u\n", (u32)av1c->high_bitdepth, (u32)av1c->twelve_bit, (u32)av1c->monochrome);
-		fprintf(stderr, "\tchroma: subsampling_x=%u, subsampling_y=%u, sample_position=%u\n", (u32)av1c->chroma_subsampling_x, (u32)av1c->chroma_subsampling_y, (u32)av1c->chroma_sample_position);
+		if (!av1c) {
+			fprintf(stderr, "\tCorrupted av1 config\n");
+		} else {
+			fprintf(stderr, "\tversion=%u, profile=%u, level_idx0=%u, tier=%u\n", (u32)av1c->version, (u32)av1c->seq_profile, (u32)av1c->seq_level_idx_0, (u32)av1c->seq_tier_0);
+			fprintf(stderr, "\thigh_bitdepth=%u, twelve_bit=%u, monochrome=%u\n", (u32)av1c->high_bitdepth, (u32)av1c->twelve_bit, (u32)av1c->monochrome);
+			fprintf(stderr, "\tchroma: subsampling_x=%u, subsampling_y=%u, sample_position=%u\n", (u32)av1c->chroma_subsampling_x, (u32)av1c->chroma_subsampling_y, (u32)av1c->chroma_sample_position);
 
-		if (av1c->initial_presentation_delay_present)
-			fprintf(stderr, "\tInitial presentation delay %u\n", (u32) av1c->initial_presentation_delay_minus_one+1);
+			if (av1c->initial_presentation_delay_present)
+				fprintf(stderr, "\tInitial presentation delay %u\n", (u32) av1c->initial_presentation_delay_minus_one+1);
 
-		count = gf_list_count(av1c->obu_array);
-		for (i=0; i<count; i++) {
-			u8 hash[20];
-			GF_AV1_OBUArrayEntry *obu = gf_list_get(av1c->obu_array, i);
-			gf_sha1_csum((u8*)obu->obu, (u32)obu->obu_length, hash);
-			fprintf(stderr, "\tOBU#%d %s hash: ", i+1, gf_av1_get_obu_name(obu->obu_type) );
-			for (j=0; j<20; j++) fprintf(stderr, "%02X", hash[j]);
-			fprintf(stderr, "\n");
+			count = gf_list_count(av1c->obu_array);
+			for (i=0; i<count; i++) {
+				u8 hash[20];
+				GF_AV1_OBUArrayEntry *obu = gf_list_get(av1c->obu_array, i);
+				gf_sha1_csum((u8*)obu->obu, (u32)obu->obu_length, hash);
+				fprintf(stderr, "\tOBU#%d %s hash: ", i+1, gf_av1_get_obu_name(obu->obu_type) );
+				for (j=0; j<20; j++) fprintf(stderr, "%02X", hash[j]);
+				fprintf(stderr, "\n");
+			}
+			gf_odf_av1_cfg_del(av1c);
 		}
-		gf_odf_av1_cfg_del(av1c);
 	} else if (msub_type == GF_ISOM_SUBTYPE_3GP_H263) {
 		u32 w, h;
 		gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
@@ -2786,10 +3320,12 @@
 			if (auxiliary_mimes != NULL) {
 				fprintf(stderr, " - auxiliary-mime-types %s", auxiliary_mimes);
 			}
+		} else if (mtype == GF_ISOM_MEDIA_SUBT) {
+			fprintf(stderr, "QT/3GPP subtitle");
 		} else {
 			fprintf(stderr, "Unknown Text Stream");
 		}
-		fprintf(stderr, "\n Size %d x %d - Translation X=%d Y=%d - Layer %d\n", w, h, tx, ty, l);
+		fprintf(stderr, "\n\tSize %d x %d - Translation X=%d Y=%d - Layer %d\n", w, h, tx, ty, l);
 	} else if (mtype == GF_ISOM_MEDIA_META) {
 		const char *content_encoding = NULL;
 		if (msub_type == GF_ISOM_SUBTYPE_METT) {
@@ -2819,44 +3355,131 @@
 		} else {
 			fprintf(stderr, "Unknown Metadata Stream\n");
 		}
-	} else if ((msub_type == GF_ISOM_SUBTYPE_MH3D_MHA1) || (msub_type == GF_ISOM_SUBTYPE_MH3D_MHA2)) {
-		fprintf(stderr, "\tMPEG-H Audio stream - Sample Rate %d - %d channel(s) %d bps\n", sr, nb_ch, (u32) bps);
-		esd = gf_media_map_esd(file, trackNum, 1);
-		if (!esd || !esd->decoderConfig || !esd->decoderConfig->decoderSpecificInfo
-		|| !esd->decoderConfig->decoderSpecificInfo->data || (esd->decoderConfig->decoderSpecificInfo->dataLength<5)
-		) {
-			fprintf(stderr, "\tInvalid MPEG-H audio config\n");
+	} else if ((msub_type==GF_ISOM_SUBTYPE_VVC1) || (msub_type==GF_ISOM_SUBTYPE_VVI1)) {
+		GF_VVCConfig *vvccfg;
+		u32 w, h;
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+		VVCState *vvc_state;
+		GF_SAFEALLOC(vvc_state, VVCState);
+		if (vvc_state) vvc_state->sps_active_idx = -1;
+#endif
+
+		gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
+		if (full_dump) fprintf(stderr, "\t");
+		fprintf(stderr, "VVC Video - Visual Size %d x %d\n", w, h);
+		vvccfg = gf_isom_vvc_config_get(file, trackNum, 1);
+
+		if (!vvccfg) {
+			M4_LOG(GF_LOG_ERROR, ("Non-compliant VVC track: No vvcC found in sample description\n"));
 		} else {
-			fprintf(stderr, "\tProfileLevelIndication: %02X\n", esd->decoderConfig->decoderSpecificInfo->data[1]);
+			dump_vvc_track_info(file, trackNum, vvccfg
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+				, vvc_state
+#endif
+			);
+			gf_odf_vvc_cfg_del(vvccfg);
+			fprintf(stderr, "\n");
 		}
-		if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
-	} else if ((msub_type == GF_ISOM_SUBTYPE_MH3D_MHM1) || (msub_type == GF_ISOM_SUBTYPE_MH3D_MHM2)) {
-		fprintf(stderr, "\tMPEG-H AudioMux stream - Sample Rate %d - %d channel(s) %d bps\n", sr, nb_ch, (u32) bps);
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+		if (vvc_state) gf_free(vvc_state);
+#endif
+	} else if ((msub_type == GF_ISOM_SUBTYPE_MH3D_MHA1) || (msub_type == GF_ISOM_SUBTYPE_MH3D_MHA2)
+			|| (msub_type == GF_ISOM_SUBTYPE_MH3D_MHM1) || (msub_type == GF_ISOM_SUBTYPE_MH3D_MHM2)
+	) {
+		const u8 *compat_profiles;
+		u32 nb_compat_profiles;
+		Bool valid = GF_FALSE;
+		Bool allow_inband = GF_FALSE;
+		if ( (msub_type == GF_ISOM_SUBTYPE_MH3D_MHM1) || (msub_type == GF_ISOM_SUBTYPE_MH3D_MHM2))
+			allow_inband = GF_TRUE;
+
+		fprintf(stderr, "\tMPEG-H Audio stream - Sample Rate %d\n", sr);
+
 		esd = gf_media_map_esd(file, trackNum, 1);
 		if (!esd || !esd->decoderConfig || !esd->decoderConfig->decoderSpecificInfo
-			|| !esd->decoderConfig->decoderSpecificInfo->data) {
-			GF_ISOSample *samp = gf_isom_get_sample(file, trackNum, 1, NULL);
-			if (samp) {
-				s32 PL = gf_mpegh_get_mhas_pl(samp->data, samp->dataLength);
-				if (PL>=0)
-					fprintf(stderr, "\tProfileLevelIndication: %02X\n", PL);
-				gf_isom_sample_del(&samp);
+			|| !esd->decoderConfig->decoderSpecificInfo->data
+		) {
+			if (allow_inband) {
+				GF_ISOSample *samp = gf_isom_get_sample(file, trackNum, 1, NULL);
+				if (samp) {
+					u64 ch_layout=0;
+					s32 PL = gf_mpegh_get_mhas_pl(samp->data, samp->dataLength, &ch_layout);
+					if (PL>=0) {
+						fprintf(stderr, "\tProfileLevelIndication: 0x%02X", PL);
+						if (ch_layout)
+							fprintf(stderr, " - Reference Channel Layout %s", gf_audio_fmt_get_layout_name(ch_layout) );
+						fprintf(stderr, "\n");
+					}
+					gf_isom_sample_del(&samp);
+				}
+				valid = GF_TRUE;
 			}
-		} else if (esd->decoderConfig->decoderSpecificInfo->dataLength<5) {
-			fprintf(stderr, "\tInvalid MPEG-H audio config\n");
-		} else {
-			fprintf(stderr, "\tProfileLevelIndication: %02X\n", esd->decoderConfig->decoderSpecificInfo->data[1]);
+		} else if (esd->decoderConfig->decoderSpecificInfo->dataLength>=5) {
+			fprintf(stderr, "\tProfileLevelIndication: 0x%02X - Reference Channel Layout %s\n", esd->decoderConfig->decoderSpecificInfo->data[1]
+				, gf_audio_fmt_get_layout_name_from_cicp(esd->decoderConfig->decoderSpecificInfo->data[2])
+			);
+			valid = GF_TRUE;
+		}
+		if (!valid) {
+			M4_LOG(GF_LOG_ERROR, ("Invalid MPEG-H audio config\n"));
 		}
 		if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
+		compat_profiles = gf_isom_get_mpegh_compatible_profiles(file, trackNum, 1, &nb_compat_profiles);
+		for (i=0; i<nb_compat_profiles; i++) {
+			if (!i)
+				fprintf(stderr, "\tCompatible profiles:");
+			fprintf(stderr, " 0x%02X", compat_profiles[i]);
+		}
+		if (i) fprintf(stderr, "\n");
+	} else if (msub_type==GF_ISOM_SUBTYPE_MLPA) {
+		u32 fmt, prate;
+		if (gf_isom_truehd_config_get(file, trackNum, 1, &fmt, &prate) != GF_OK) {
+			fprintf(stderr, "\tInvalid TrueHD audio config\n");
+		}
+		fprintf(stderr, "TrueHD Audio stream - Sample Rate %u - channels %u - format %u peak rate %u\n", sr, nb_ch, fmt, prate);
+	} else if (codecid) {
+		if (gf_isom_is_video_handler_type(mtype) ) {
+			u32 w, h;
+			gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
+			fprintf(stderr, "%s - Resolution %d x %d\n", gf_codecid_name(codecid), w, h);
+		} else if (mtype==GF_ISOM_MEDIA_AUDIO) {
+			gf_isom_get_audio_info(file, trackNum, 1, &sr, &nb_ch, NULL);
+			fprintf(stderr, "%s - Sample Rate %d - %d channel(s)\n", gf_codecid_name(codecid), sr, nb_ch);
+		} else {
+			fprintf(stderr, "%s\n", gf_codecid_name(codecid) );
+		}
+	} else if (pfmt) {
+		u32 w, h;
+		gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
+		fprintf(stderr, "Raw video %s - Resolution %d x %d\n", gf_pixel_fmt_name(pfmt), w, h);
+	} else if (msub_type==GF_QT_SUBTYPE_TMCD) {
+		u32 stsd_idx;
+		GF_ISOSample *sample = gf_isom_get_sample(file, trackNum, 1, &stsd_idx);
+		fprintf(stderr, "Time Code stream\n");
+		if (sample) {
+			u32 tmcd_flags, tmcd_num, tmcd_den, tmcd_fpt;
+
+			gf_isom_get_tmcd_config(file, trackNum, stsd_idx, &tmcd_flags, &tmcd_num, &tmcd_den, &tmcd_fpt);
+			if (sample->data) {
+				char szTimecode[100];
+				gf_inspect_format_timecode(sample->data, sample->dataLength, tmcd_flags, tmcd_num, tmcd_den, tmcd_fpt, szTimecode);
+				fprintf(stderr, "\tFirst timecode: %s\n", szTimecode);
+			}
+			gf_isom_sample_del(&sample);
+		}
+	} else if (msub_type==GF_ISOM_SUBTYPE_OPUS) {
+		fprintf(stderr, "\tOpus Audio - Sample Rate %d ch %d\n", sr, nb_ch);
 	} else {
-		GF_GenericSampleDescription *udesc = gf_isom_get_generic_sample_description(file, trackNum, 1);
+		GF_GenericSampleDescription *udesc;
+
+		udesc = gf_isom_get_generic_sample_description(file, trackNum, 1);
 		if (udesc) {
 			if (gf_isom_is_video_handler_type(mtype) ) {
- fprintf(stderr, "%s Track - Compressor \"%s\" - Resolution %d x %d\n",
- (mtype == GF_ISOM_MEDIA_VISUAL?"Visual":"Auxiliary Video"),
+ fprintf(stderr, "%s - Compressor \"%s\" - Resolution %d x %d\n",
+						( (mtype == GF_ISOM_MEDIA_VISUAL ? "Visual" : "Auxiliary Video") ),
 udesc->compressor_name, udesc->width, udesc->height);
 			} else if (mtype==GF_ISOM_MEDIA_AUDIO) {
-				fprintf(stderr, "Audio Track - Sample Rate %d - %d channel(s)\n", udesc->samplerate, udesc->nb_channels);
+				fprintf(stderr, "Audio - Sample Rate %d - %d channel(s)\n", udesc->samplerate, udesc->nb_channels);
 			} else {
 				fprintf(stderr, "Unknown media type\n");
 			}
@@ -2873,39 +3496,85 @@
 		}
 	}
 
-	{
-		char szCodec[RFC6381_CODEC_NAME_SIZE_MAX];
-		GF_Err e = gf_media_get_rfc_6381_codec_name(file, trackNum, szCodec, GF_FALSE, GF_FALSE);
-		if (e == GF_OK) {
-			fprintf(stderr, "\tRFC6381 Codec Parameters: %s\n", szCodec);
-		}
-	}
-
-	DumpMetaItem(file, 0, trackNum, "Track Meta");
 
-	gf_isom_get_track_switch_group_count(file, trackNum, &alt_group, &nb_groups);
-	if (alt_group) {
-		fprintf(stderr, "Alternate Group ID %d\n", alt_group);
-		for (i=0; i<nb_groups; i++) {
-			u32 nb_crit, switchGroupID;
-			const u32 *criterias = gf_isom_get_track_switch_parameter(file, trackNum, i+1, &switchGroupID, &nb_crit);
-			if (!nb_crit) {
-				fprintf(stderr, "\tNo criteria in %s group\n", switchGroupID ? "switch" : "alternate");
-			} else {
-				if (switchGroupID) {
-					fprintf(stderr, "\tSwitchGroup ID %d criterias: ", switchGroupID);
-				} else {
-					fprintf(stderr, "\tAlternate Group criterias: ");
-				}
-				for (j=0; j<nb_crit; j++) {
-					if (j) fprintf(stderr, " ");
-					fprintf(stderr, "%s", gf_4cc_to_str(criterias[j]) );
+	/*Crypto info*/
+	if (gf_isom_is_track_encrypted(file, trackNum)) {
+		const char *scheme_URI, *KMS_URI;
+		u32 scheme_type, version;
+		u32 IV_size;
+		Bool use_sel_enc;
+
+		if (gf_isom_is_ismacryp_media(file, trackNum, 1)) {
+			gf_isom_get_ismacryp_info(file, trackNum, 1, NULL, &scheme_type, &version, &scheme_URI, &KMS_URI, &use_sel_enc, &IV_size, NULL);
+			fprintf(stderr, "\n\tProtected by ISMA E&A scheme %s (version %d)\n", gf_4cc_to_str(scheme_type), version);
+			if (scheme_URI) fprintf(stderr, "scheme location: %s\n", scheme_URI);
+			if (KMS_URI) {
+				if (!strnicmp(KMS_URI, "(key)", 5)) fprintf(stderr, "\tKMS location: key in file\n");
+				else fprintf(stderr, "\tKMS location: %s\n", KMS_URI);
+			}
+			fprintf(stderr, "\tSelective Encryption: %s\n", use_sel_enc ? "Yes" : "No");
+			if (IV_size) fprintf(stderr, "\tInitialization Vector size: %d bits\n", IV_size*8);
+		} else if (gf_isom_is_omadrm_media(file, trackNum, 1)) {
+			const char *textHdrs;
+			u32 enc_type, hdr_len;
+			u64 orig_len;
+			gf_isom_get_omadrm_info(file, trackNum, 1, NULL, &scheme_type, &version, &scheme_URI, &KMS_URI, &textHdrs, &hdr_len, &orig_len, &enc_type, &use_sel_enc, &IV_size, NULL);
+			fprintf(stderr, "\n\tProtected by OMA DRM scheme %s (version %d)\n", gf_4cc_to_str(scheme_type), version);
+			fprintf(stderr, "\tRights Issuer: %s\n", KMS_URI);
+			fprintf(stderr, "\tContent ID: %s\n", scheme_URI);
+			if (textHdrs) {
+				u32 offset;
+				const char *start = textHdrs;
+				fprintf(stderr, "\tOMA Textual Headers:\n");
+				i=0;
+				offset=0;
+				while (i<hdr_len) {
+					if (start[i]==0) {
+						fprintf(stderr, "\t\t%s\n", start+offset);
+						offset=i+1;
+					}
+					i++;
 				}
-				fprintf(stderr, "\n");
+				fprintf(stderr, "\\tt%s\n", start+offset);
 			}
+			if (orig_len) fprintf(stderr, "\tOriginal media size "LLD"\n", orig_len);
+			fprintf(stderr, "\tEncryption algorithm %s\n", (enc_type==1) ? "AEA 128 CBC" : (enc_type ? "AEA 128 CTR" : "None"));
+			fprintf(stderr, "\tSelective Encryption: %s\n", use_sel_enc ? "Yes" : "No");
+			if (IV_size) fprintf(stderr, "\tInitialization Vector size: %d bits\n", IV_size*8);
+		} else if(gf_isom_is_cenc_media(file, trackNum, 1)) {
+			const u8 *def_key;
+			u32 def_key_size;
+			Bool IsEncrypted;
+			u8 crypt_byte_block, skip_byte_block;
+			IV_size = 0;
+			gf_isom_get_cenc_info(file, trackNum, 1, NULL, &scheme_type, &version);
+
+			gf_isom_cenc_get_default_info(file, trackNum, 1, NULL, &IsEncrypted, &crypt_byte_block, &skip_byte_block, &def_key, &def_key_size);
+
+			fprintf(stderr, "\n\tProtected by CENC scheme %s version 0x%08X", gf_4cc_to_str(scheme_type), version);
+
+			if (crypt_byte_block && skip_byte_block)
+				fprintf(stderr, " - Pattern %d:%d", (u32) skip_byte_block, (u32) crypt_byte_block);
+			if (def_key && def_key[0])
+				fprintf(stderr, " - MultiKey");
+
+			fprintf(stderr, "\n");
+			dump_key_info(def_key, def_key_size, IsEncrypted);
+
+		} else if(gf_isom_is_adobe_protection_media(file, trackNum, 1)) {
+			gf_isom_get_adobe_protection_info(file, trackNum, 1, NULL, &scheme_type, &version, NULL);
+			fprintf(stderr, "\nProtected by Adobe scheme %s (version %d)\n", gf_4cc_to_str(scheme_type), version);
+		} else {
+			fprintf(stderr, "\nProtected by unknown scheme %s\n", gf_4cc_to_str(gf_isom_is_media_encrypted(file, trackNum, 0) ));
 		}
+		fprintf(stderr, "\n");
+	}
+
+	if ( gf_media_get_rfc_6381_codec_name(file, trackNum, szCodec, GF_FALSE, GF_FALSE) == GF_OK) {
+		fprintf(stderr, "\tRFC6381 Codec Parameters: %s\n", szCodec);
 	}
 
+
 	switch (gf_isom_has_sync_points(file, trackNum)) {
 	case 0:
 		fprintf(stderr, "\tAll samples are sync\n");
@@ -2951,14 +3620,17 @@
 				samp = gf_isom_get_sample_info(file, trackNum, j+1, NULL, NULL);
 			}
 			if (!samp) {
-				fprintf(stderr, "Failed to fetch sample %d\n", j+1);
+				M4_LOG(GF_LOG_ERROR, ("Failed to fetch sample %d\n", j+1));
 				return;
 			}
 			dur = samp->DTS+samp->CTS_Offset;
 			size += samp->dataLength;
 			rate += samp->dataLength;
-			if (samp->DTS - time_slice>ts) {
-				if (max_rate < rate) max_rate = rate;
+			if ((samp->DTS - time_slice > ts) || (j+1==count) ) {
+				Double max_tmp = rate * ts / (samp->DTS - time_slice);
+				if (max_rate < max_tmp )
+					max_rate = max_tmp;
+
 				rate = 0;
 				time_slice = samp->DTS;
 			}
@@ -2969,28 +3641,25 @@
 	if (csize && cdur) {
 		fprintf(stderr, "\tConstant sample size %d bytes and dur %d / %d\n", csize, cdur, ts);
 	}
-	scale = 1000;
-	scale /= ts;
-	dur = (u64) (scale * (s64)dur);
+	scale = 1000.0 / ts;
+	dur = (u64) (scale * dur);
 	fprintf(stderr, "\tTotal size "LLU" bytes - Total samples duration "LLU" ms\n", size, dur);
 	if (!dur) {
 		fprintf(stderr, "\n");
 		return;
 	}
 	/*rate in byte, dur is in ms*/
-	rate = (u32) ((size * 8 * 1000) / dur);
+	rate = 8000.0 * size / dur;
 
 	if (!max_rate)
 		max_rate = rate;
 	else
-		max_rate *= 8;
+		max_rate *= 8.0;
 
 	if (rate >= 1500) {
-		rate /= 1000;
-		max_rate /= 1000;
-		fprintf(stderr, "\tAverage rate %d kbps - Max Rate %d kbps\n", rate, max_rate);
+		fprintf(stderr, "\tAverage rate %.2f kbps - Max Rate %.2f kbps\n", rate/1000, max_rate/1000);
 	} else {
-		fprintf(stderr, "\tAverage rate %d bps - Max Rate %d bps\n", rate, max_rate);
+		fprintf(stderr, "\tAverage rate %.2f bps - Max Rate %.2f bps\n", rate, max_rate);
 	}
 
 	{
@@ -3013,27 +3682,32 @@
 	}
 }
 
-void DumpMovieInfo(GF_ISOFile *file)
+void DumpMovieInfo(GF_ISOFile *file, Bool full_dump)
 {
 	GF_InitialObjectDescriptor *iod;
-	u32 i, brand, min, timescale, count, tag_len;
-	const u8 *tag;
+	Bool dump_m4sys = GF_FALSE;
+	u32 i, brand, min, timescale, count, data_len;
+	const u8 *data;
 	u64 create, modif;
+	Bool has_itags = GF_FALSE;
 	char szDur[50];
 
-	DumpMetaItem(file, 1, 0, "Root Meta");
+	DumpMetaItem(file, 1, 0, "# File Meta");
 	if (!gf_isom_has_movie(file)) {
 		if (gf_isom_has_segment(file, &brand, &min)) {
 			count = gf_isom_segment_get_fragment_count(file);
 			fprintf(stderr, "File is a segment - %d movie fragments - Brand %s (version %d):\n", count, gf_4cc_to_str(brand), min);
 			for (i=0; i<count; i++) {
-				u32 j, traf_count = gf_isom_segment_get_track_fragment_count(file, i+1);
+				u32 moof_size, j, traf_count = gf_isom_segment_get_track_fragment_count(file, i+1);
+				u64 fsize = gf_isom_segment_get_fragment_size(file, i+1, &moof_size);
+				fprintf(stderr, "\tFragment #%d size "LLU" (moof %d)", i+1, fsize, moof_size);
 				for (j=0; j<traf_count; j++) {
 					u32 ID;
 					u64 tfdt;
 					ID = gf_isom_segment_get_track_fragment_decode_time(file, i+1, j+1, &tfdt);
-					fprintf(stderr, "\tFragment #%d Track ID %d - TFDT "LLU"\n", i+1, ID, tfdt);
+					fprintf(stderr, "%s {TKID %d TFDT "LLU"}", j ? "," : "", ID, tfdt);
 				}
+				fprintf(stderr, "\n");
 			}
 		} else {
 			fprintf(stderr, "File has no movie (moov) - static data container\n");
@@ -3043,24 +3717,29 @@
 
 	timescale = gf_isom_get_timescale(file);
 	i=gf_isom_get_track_count(file);
-	fprintf(stderr, "* Movie Info *\n\tTimescale %d - %d track%s\n", timescale, i, i>1 ? "s" : "");
+	fprintf(stderr, "# Movie Info - %d track%s - TimeScale %d\n", i, i>1 ? "s" : "", timescale);
 
-	fprintf(stderr, "\tComputed Duration %s", format_duration(gf_isom_get_duration(file), timescale, szDur));
-	fprintf(stderr, " - Indicated Duration %s\n", format_duration(gf_isom_get_original_duration(file), timescale, szDur));
+	modif = gf_isom_get_duration(file);
+	create = gf_isom_get_original_duration(file);
+	fprintf(stderr, "Duration %s", format_duration(create, timescale, szDur));
+	if (create!=modif) {
+		fprintf(stderr, " (recomputed %s)", format_duration(modif, timescale, szDur));
+	}
+	fprintf(stderr, "\n");
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (gf_isom_is_fragmented(file)) {
-		fprintf(stderr, "\tFragmented File: yes - duration %s\n%d fragments - %d SegmentIndexes\n", format_duration(gf_isom_get_fragmented_duration(file), timescale, szDur), gf_isom_get_fragments_count(file, 0) , gf_isom_get_fragments_count(file, 1) );
+		fprintf(stderr, "Fragmented: yes - duration %s\n%d fragments - %d SegmentIndexes\n", format_duration(gf_isom_get_fragmented_duration(file), timescale, szDur), gf_isom_get_fragments_count(file, 0) , gf_isom_get_fragments_count(file, 1) );
 	} else {
-		fprintf(stderr, "\tFragmented File: no\n");
+		fprintf(stderr, "Fragmented: no\n");
 	}
 #endif
 
 	if (gf_isom_moov_first(file))
-		fprintf(stderr, "\tFile suitable for progressive download (moov before mdat)\n");
+		fprintf(stderr, "Progressive (moov before mdat)\n");
 
 	if (gf_isom_get_brand_info(file, &brand, &min, &count) == GF_OK) {
-		fprintf(stderr, "\tFile Brand %s - version %d\n\t\tCompatible brands:", gf_4cc_to_str(brand), min);
+		fprintf(stderr, "Major Brand %s - version %d - compatible brands:", gf_4cc_to_str(brand), min);
 		for (i=0; i<count;i++) {
 			if (gf_isom_get_alternate_brand(file, i+1, &brand)==GF_OK)
 				fprintf(stderr, " %s", gf_4cc_to_str(brand) );
@@ -3068,11 +3747,12 @@
 		fprintf(stderr, "\n");
 	}
 	gf_isom_get_creation_time(file, &create, &modif);
-	fprintf(stderr, "\tCreated: %s", format_date(create, szDur));
-	fprintf(stderr, "\tModified: %s", format_date(modif, szDur));
+	fprintf(stderr, "Created: %s", format_date(create, szDur));
+	if (create != modif)
+		fprintf(stderr, "Modified: %s", format_date(modif, szDur));
 	fprintf(stderr, "\n");
 
-	DumpMetaItem(file, 0, 0, "Moov Meta");
+	DumpMetaItem(file, 0, 0, "# Movie Meta");
 
 	iod = (GF_InitialObjectDescriptor *) gf_isom_get_root_od(file);
 	if (iod) {
@@ -3086,10 +3766,12 @@
 		} else {
 			fprintf(stderr, "File has root OD (%d bytes)\n", desc_size);
 		}
-		if (!gf_list_count(iod->ESDescriptors)) fprintf(stderr, "No streams included in root OD\n");
+		if (!gf_list_count(iod->ESDescriptors))
+			fprintf(stderr, "No streams included in root OD\n");
+		else
+			dump_m4sys = GF_TRUE;
+
 		gf_odf_desc_del((GF_Descriptor *) iod);
-	} else {
-		fprintf(stderr, "File has no MPEG4 IOD/OD\n");
 	}
 	if (gf_isom_is_JPEG2000(file)) fprintf(stderr, "File is JPEG 2000\n");
 
@@ -3114,57 +3796,95 @@
 		}
 	}
 
-	if (gf_isom_apple_get_tag(file, 0, &tag, &tag_len) == GF_OK) {
+	if (gf_isom_apple_get_tag(file, 0, &data, &data_len) == GF_OK) {
+		has_itags = GF_TRUE;
 		fprintf(stderr, "\niTunes Info:\n");
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_NAME, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tName: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_ARTIST, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tArtist: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_ALBUM, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tAlbum: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_COMMENT, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tComment: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_COMPOSER, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tComposer: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_WRITER, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tWriter: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_ALBUM_ARTIST, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tAlbum Artist: %s\n", tag);
-
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_GENRE, &tag, &tag_len)==GF_OK) {
-			if (tag[0]) {
-				fprintf(stderr, "\tGenre: %s\n", tag);
-			} else {
-				fprintf(stderr, "\tGenre: %s\n", gf_id3_get_genre(((u8*)tag)[1]));
-			}
-		}
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_COMPILATION, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tCompilation: %s\n", tag[0] ? "Yes" : "No");
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_GAPLESS, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tGapless album: %s\n", tag[0] ? "Yes" : "No");
 
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_CREATED, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tCreated: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_DISK, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tDisk: %d / %d\n", tag[3], tag[5]);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_TOOL, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tEncoder Software: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_ENCODER, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tEncoded by: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_TEMPO, &tag, &tag_len)==GF_OK) {
-			if (tag[0]) {
-				fprintf(stderr, "\tTempo (BPM): %s\n", tag);
-			} else {
-				fprintf(stderr, "\tTempo (BPM): %d\n", tag[1]);
+		i=0;
+		while (1) {
+			u32 int_val2, flags, itype;
+			GF_ISOiTunesTag tag;
+			u64 int_val;
+			s32 tag_idx;
+			GF_Err e = gf_isom_apple_enum_tag(file, i, &tag, &data, &data_len, &int_val, &int_val2, &flags);
+			if (e) break;
+			i++;
+
+			tag_idx = gf_itags_find_by_itag(tag);
+			if (tag_idx<0) {
+				fprintf(stderr, "\t%s: %s\n", gf_4cc_to_str(tag), data);
+				continue;
 			}
-		}
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_TRACKNUMBER, &tag, &tag_len)==GF_OK) {
-			if (tag[0]) {
-				fprintf(stderr, "\tTrackNumber: %s\n", tag);
-			} else {
-				fprintf(stderr, "\tTrackNumber: %d / %d\n", (0xff00 & (tag[2]<<8)) | (0xff & tag[3]), (0xff00 & (tag[4]<<8)) | (0xff & tag[5]));
+			fprintf(stderr, "\t%s: ", gf_itags_get_name(tag_idx) );
+			itype = gf_itags_get_type(tag_idx);
+			switch (itype) {
+			case GF_ITAG_BOOL: fprintf(stderr, int_val ? "yes" : "no"); break;
+			case GF_ITAG_INT8:
+			case GF_ITAG_INT16:
+			case GF_ITAG_INT32:
+			case GF_ITAG_INT64:
+				fprintf(stderr, LLU, int_val);
+				break;
+			case GF_ITAG_FRAC6:
+			case GF_ITAG_FRAC8:
+				fprintf(stderr, LLU" / %u", int_val, int_val2);
+				break;
+			case GF_ITAG_FILE:
+				if (flags==14) fprintf(stderr, "PNG File");
+				else if (flags==13) fprintf(stderr, "JPEG File");
+				else fprintf(stderr, "unknown (flags %d)", flags);
+				break;
+			case GF_ITAG_ID3_GENRE:
+				if (int_val) {
+					fprintf(stderr, "%s", gf_id3_get_genre((u32) int_val) );
+					break;
+				}
+				//fallthrough
+			default:
+				if (data)
+					fprintf(stderr, "%s", data);
+				else
+					fprintf(stderr, data_len ? "none" : "unknown");
+				break;
 			}
+			fprintf(stderr, "\n");
 		}
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_TRACK, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tTrack: %s\n", tag);
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_GROUP, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tGroup: %s\n", tag);
+	}
+	i=0;
+	while (1) {
+		u32 type, version;
+		char *wmatag;
+		GF_Err e = gf_isom_wma_enum_tag(file, i, &wmatag, &data, &data_len, &version, &type);
+		if (e) break;
+		if (!i) {
+			fprintf(stderr, "\nWMA Info:\n");
+		}
+		i++;
+		fprintf(stderr, "\t%s", wmatag);
+		if (version!=1)
+			fprintf(stderr, " (version %d)", version);
+		fprintf(stderr, ": ");
 
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_COVER_ART, &tag, &tag_len)==GF_OK) {
-			if (tag_len>>31) fprintf(stderr, "\tCover Art: PNG File\n");
-			else fprintf(stderr, "\tCover Art: JPEG File\n");
+		if (type) {
+			fprintf(stderr, "unknown type %d\n", type);
+		} else {
+			u16 *src_str = (u16 *) data;
+			u32 len = UTF8_MAX_BYTES_PER_CHAR * gf_utf8_wcslen(src_str);
+			char *utf8str = (char *)gf_malloc(len + 1);
+			u32 res_len = gf_utf8_wcstombs(utf8str, len, (const unsigned short **) &src_str);
+			if (res_len != GF_UTF8_FAIL) {
+				utf8str[res_len] = 0;
+				fprintf(stderr, "%s\n", utf8str);
+			}
+			gf_free(utf8str);
 		}
 	}
 
-	print_udta(file, 0);
+
+	print_udta(file, 0, has_itags);
 	fprintf(stderr, "\n");
 	for (i=0; i<gf_isom_get_track_count(file); i++) {
-		DumpTrackInfo(file, i+1, 0, GF_TRUE);
+		DumpTrackInfo(file, i+1, full_dump, GF_TRUE, dump_m4sys);
 	}
 }
 
@@ -3345,7 +4065,9 @@
 					diff = (pck->DTS ? pck->DTS : pck->PTS) / 90000.0;
 					diff -= pes->last_pcr_value / (300.0 * 90000);
 					fprintf(dumper->timestamps_info_file, "\t%f\n", diff);
-					if (diff<0) fprintf(stderr, "Warning: detected PTS/DTS value less than current PCR of %g sec\n", diff);
+					if (diff<0) {
+						M4_LOG(GF_LOG_WARNING, ("Warning: detected PTS/DTS value less than current PCR of %g sec\n", diff));
+					}
 				} else {
 					fprintf(dumper->timestamps_info_file, "\t\n");
 				}
@@ -3411,7 +4133,7 @@
 
 	src = gf_fopen(mpeg2ts_file, "rb");
 	if (!src) {
-		fprintf(stderr, "Cannot open %s: no such file\n", mpeg2ts_file);
+		M4_LOG(GF_LOG_ERROR, ("Cannot open %s: no such file\n", mpeg2ts_file));
 		return;
 	}
 	ts = gf_m2ts_demux_new();
@@ -3467,7 +4189,7 @@
 		sprintf(dumper.timestamps_info_name, "%s_prog_%d_timestamps.txt", mpeg2ts_file, prog_num/*, mpeg2ts_file*/);
 		dumper.timestamps_info_file = gf_fopen(dumper.timestamps_info_name, "wt");
 		if (!dumper.timestamps_info_file) {
-			fprintf(stderr, "Cannot open file %s\n", dumper.timestamps_info_name);
+			M4_LOG(GF_LOG_ERROR, ("Cannot open file %s\n", dumper.timestamps_info_name));
 			return;
 		}
 		fprintf(dumper.timestamps_info_file, "PCK#\tPID\tPCR\tDTS\tPTS\tRAP\tDiscontinuity\tDTS-PCR Diff\n");
@@ -3503,9 +4225,6 @@
 #endif /*GPAC_DISABLE_MPEG2TS*/
 
 
-#include <gpac/download.h>
-#include <gpac/mpd.h>
-
 void get_file_callback(void *usr_cbk, GF_NETIO_Parameter *parameter)
 {
 	if (parameter->msg_type==GF_NETIO_DATA_EXCHANGE) {
@@ -3585,7 +4304,7 @@
 
 		gf_free(dst_name);
 	} else {
-		fprintf(stderr, "Failed to reverse %s cache file\n", item_path);
+		M4_LOG(GF_LOG_ERROR, ("Failed to reverse %s cache file\n", item_path));
 	}
 	gf_cfg_del(cached);
 	gf_file_delete(szPATH);
@@ -3703,7 +4422,7 @@
 				}
 				if (rep->segment_base) segment_base=GF_TRUE;
 
-				e = gf_mpd_resolve_url(mpd, rep, as, period, mpd_src, 0, GF_MPD_RESOLVE_URL_INIT, 0, 0, &seg_url, &out_range_start, &out_range_end, &segment_duration, &is_in_base_url, NULL, NULL);
+				e = gf_mpd_resolve_url(mpd, rep, as, period, mpd_src, 0, GF_MPD_RESOLVE_URL_INIT, 0, 0, &seg_url, &out_range_start, &out_range_end, &segment_duration, &is_in_base_url, NULL, NULL, NULL);
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error resolving init segment name : %s\n", gf_error_to_string(e)));
 					continue;
@@ -3731,7 +4450,7 @@
 				if (segment_base) continue;
 
 				while (1) {
-					e = gf_mpd_resolve_url(mpd, rep, as, period, mpd_src, 0, GF_MPD_RESOLVE_URL_MEDIA, seg_idx, 0, &seg_url, &out_range_start, &out_range_end, &segment_duration, NULL, NULL, NULL);
+					e = gf_mpd_resolve_url(mpd, rep, as, period, mpd_src, 0, GF_MPD_RESOLVE_URL_MEDIA, seg_idx, 0, &seg_url, &out_range_start, &out_range_end, &segment_duration, NULL, NULL, NULL, NULL);
 					if (e) {
 						if (e<0) {
 							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error resolving segment name : %s\n", gf_error_to_string(e)));

gpac-1.0.1.tar.gz/applications/mp4box/fileimport.c -> gpac-2.0.0.tar.gz/applications/mp4box/fileimport.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / mp4box application
@@ -56,7 +56,7 @@
 	GF_List *imports;
 } WGTEnum;
 
-GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array)
+GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array, Bool is_string)
 {
 	u8 *data = NULL;
 	GF_Err res = GF_OK;
@@ -67,7 +67,12 @@
 	if (!udta_type && !is_box_array) return GF_BAD_PARAM;
 
 	if (!src || !strlen(src)) {
-		return gf_isom_remove_user_data(dest, tracknum, udta_type, uuid);
+		GF_Err e = gf_isom_remove_user_data(dest, tracknum, udta_type, uuid);
+		if (e==GF_EOS) {
+			e = GF_OK;
+			M4_LOG(GF_LOG_WARNING, ("No track.udta found, ignoring\n"));
+		}
+		return e;
 	}
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
@@ -78,7 +83,11 @@
 		size = gf_base64_decode((u8 *)src, size, data, size);
 	} else
 #endif
-	{
+	if (is_string) {
+		data = (u8 *) src;
+		size = (u32) strlen(src)+1;
+		is_box_array = 0;
+	} else {
 		GF_Err e = gf_file_load_data(src, (u8 **) &data, &size);
 		if (e) return e;
 	}
@@ -89,7 +98,8 @@
 		} else {
 			res = gf_isom_add_user_data(dest, tracknum, udta_type, uuid, data, size);
 		}
-		gf_free(data);
+		if (!is_string)
+			gf_free(data);
 	}
 	return res;
 }
@@ -117,7 +127,7 @@
 
 	e = gf_media_import(&import);
 	if (e) {
-		fprintf(stderr, "Error probing file %s: %s\n", inName, gf_error_to_string(e));
+		M4_LOG(GF_LOG_ERROR, ("Error probing file %s: %s\n", inName, gf_error_to_string(e)));
 		return;
 	}
 	if (trackID) {
@@ -125,7 +135,7 @@
 	} else {
 		fprintf(stderr, "Import probing results for %s:\n", inName);
 		if (!import.nb_tracks) {
-			fprintf(stderr, "File has no selectable tracks\n");
+			M4_LOG(GF_LOG_WARNING, ("File has no selectable tracks\n"));
 			return;
 		}
 		fprintf(stderr, "File has %d tracks\n", import.nb_tracks);
@@ -136,7 +146,7 @@
 	found = 0;
 	for (i=0; i<import.nb_tracks; i++) {
 		if (trackID && (trackID != import.tk_info[i].track_num)) continue;
-		if (!trackID) fprintf(stderr, "\tTrack %d type: ", import.tk_info[i].track_num);
+		if (!trackID) fprintf(stderr, "- Track %d type: ", import.tk_info[i].track_num);
 		else fprintf(stderr, "Track type: ");
 
 		switch (import.tk_info[i].stream_type) {
@@ -165,7 +175,7 @@
 			fprintf(stderr, "Other (%s)", gf_4cc_to_str(import.tk_info[i].stream_type));
 			break;
 		}
-		if (import.tk_info[i].codecid) fprintf(stderr, " Codec %s (ID %d)", gf_codecid_name(import.tk_info[i].codecid), import.tk_info[i].codecid);
+		if (import.tk_info[i].codecid) fprintf(stderr, " - Codec %s", gf_codecid_name(import.tk_info[i].codecid));
 
 		if (import.tk_info[i].lang) fprintf(stderr, " lang %s", gf_4cc_to_str(import.tk_info[i].lang));
 
@@ -205,17 +215,22 @@
 		}
 	}
 	fprintf(stderr, "\n");
-	fprintf(stderr, "For more details, use `gpac -i %s inspect[:deep][:analyze]`\n", gf_file_basename(inName));
-	if (!found && trackID) fprintf(stderr, "Cannot find track %d in file\n", trackID);
+	M4_LOG(GF_LOG_INFO, ("For more details, use `gpac -i %s inspect[:deep][:analyze=on|bs]`\n", gf_file_basename(inName)));
+	if (!found && trackID) {
+		M4_LOG(GF_LOG_ERROR, ("Cannot find track %d in file\n", trackID));
+	}
 }
 
-static void set_chapter_track(GF_ISOFile *file, u32 track, u32 chapter_ref_trak)
+static GF_Err set_chapter_track(GF_ISOFile *file, u32 track, u32 chapter_ref_trak)
 {
 	u64 ref_duration, chap_duration;
 	Double scale;
+	GF_Err e;
 
-	gf_isom_set_track_reference(file, chapter_ref_trak, GF_ISOM_REF_CHAP, gf_isom_get_track_id(file, track) );
-	gf_isom_set_track_enabled(file, track, GF_FALSE);
+	e = gf_isom_set_track_reference(file, chapter_ref_trak, GF_ISOM_REF_CHAP, gf_isom_get_track_id(file, track) );
+	if (e) return e;
+	e = gf_isom_set_track_enabled(file, track, GF_FALSE);
+	if (e) return e;
 
 	ref_duration = gf_isom_get_media_duration(file, chapter_ref_trak);
 	chap_duration = gf_isom_get_media_duration(file, track);
@@ -226,7 +241,8 @@
 	if (chap_duration < ref_duration) {
 		chap_duration -= gf_isom_get_sample_duration(file, track, gf_isom_get_sample_count(file, track));
 		chap_duration = ref_duration - chap_duration;
-		gf_isom_set_last_sample_duration(file, track, (u32) chap_duration);
+		e = gf_isom_set_last_sample_duration(file, track, (u32) chap_duration);
+		if (e) return e;
 	}
 #ifdef GPAC_ENABLE_COVERAGE
 	if (gf_sys_is_cov_mode()) {
@@ -264,22 +280,323 @@
 
 	}
 #endif
+	return GF_OK;
+}
+
+GF_Err parse_fracs(char *str, GF_Fraction64 *f, GF_Fraction64 *dur)
+{
+	GF_Err e = GF_OK;
+	if (dur) {
+		char *sep = strchr(str, '-');
+		if (sep) {
+			sep[0] = 0;
+			if (!gf_parse_lfrac(str, f)) e = GF_BAD_PARAM;
+			if (!gf_parse_lfrac(sep+1, dur)) e = GF_BAD_PARAM;
+			sep[0] = '-';
+			return e;
+		}
+		dur->num = 0;
+		dur->den = 0;
+	}
+	if (!gf_parse_lfrac(str, f)) e = GF_BAD_PARAM;
+	return e;
+}
+
+Bool scan_color(char *val, u32 *clr_prim, u32 *clr_tranf, u32 *clr_mx, Bool *clr_full_range)
+{
+	char *sep = strchr(val, ',');
+	if (!sep) return GF_FALSE;
+	sep[0] = 0;
+	*clr_prim = gf_cicp_parse_color_primaries(val);
+	sep[0] = ',';
+	if (*clr_prim == (u32) -1) return GF_FALSE;
+	val = sep+1;
+
+	sep = strchr(val, ',');
+	if (!sep) return GF_FALSE;
+	sep[0] = 0;
+	*clr_tranf = gf_cicp_parse_color_transfer(val);
+	sep[0] = ',';
+	if (*clr_tranf == (u32) -1) return GF_FALSE;
+	val = sep+1;
+
+	sep = strchr(val, ',');
+	if (sep) sep[0] = 0;
+	*clr_mx = gf_cicp_parse_color_matrix(val);
+	if (sep) sep[0] = ',';
+	if (*clr_mx == (u32) -1) return GF_FALSE;
+	if (!sep) return GF_TRUE;
+
+	val = sep+1;
+	if (!strcmp(val, "yes") || !strcmp(val, "on")) {
+		*clr_full_range = GF_TRUE;
+		return GF_TRUE;
+	}
+	if (!strcmp(val, "no") || !strcmp(val, "off")) {
+		*clr_full_range = GF_FALSE;
+		return GF_TRUE;
+	}
+
+	if (sscanf(val, "%d", (s32*) clr_full_range) == 1)
+		return GF_TRUE;
+
+	return GF_FALSE;
+}
+
+static GF_Err set_dv_profile(GF_ISOFile *dest, u32 track, char *dv_profile_str)
+{
+	GF_Err e;
+	Bool remove=GF_FALSE;
+	Bool force_dv=GF_FALSE;
+	u32 dv_profile = 0;
+	u32 dv_compat_id=0;
+	char *sep = strchr(dv_profile_str, '.');
+	if (sep) {
+		sep[0] = 0;
+		if (!strcmp(sep+1, "none")) dv_compat_id=0;
+		else if (!strcmp(sep+1, "hdr10")) dv_compat_id=1;
+		else if (!strcmp(sep+1, "bt709")) dv_compat_id=2;
+		else if (!strcmp(sep+1, "hlg709")) dv_compat_id=3;
+		else if (!strcmp(sep+1, "hlg2100")) dv_compat_id=4;
+		else if (!strcmp(sep+1, "bt2020")) dv_compat_id=5;
+		else if (!strcmp(sep+1, "brd")) dv_compat_id=6;
+		else if ((sep[1]>='0') && (sep[1]<='9')) dv_compat_id=atoi(sep+1);
+		else {
+			M4_LOG(GF_LOG_WARNING, ("DV compatibility mode %s not recognized, using none\n", sep+1));
+		}
+	}
+	if (dv_profile_str[0]=='f') {
+		force_dv = GF_TRUE;
+		dv_profile_str++;
+	}
+
+	if (!strcmp(dv_profile_str, "none")) {
+		remove = GF_TRUE;
+	} else {
+		dv_profile = atoi(dv_profile_str);
+		if (dv_profile==8) {
+			if ((dv_compat_id!=1) && (dv_compat_id!=2)) {
+				M4_LOG(GF_LOG_ERROR, ("DV profile 8 must indicate a compatibility mode `hdr10` or `bt709`\n"));
+				return GF_BAD_PARAM;
+			}
+		}
+	}
+
+	GF_DOVIDecoderConfigurationRecord *dovi = gf_isom_dovi_config_get(dest, track, 1);
+	if (dovi) {
+		dovi->dv_profile = dv_profile;
+		dovi->dv_bl_signal_compatibility_id = dv_compat_id;
+		dovi->force_dv = force_dv;
+		e = gf_isom_set_dolby_vision_profile(dest, track, 1, remove ? NULL : dovi);
+		gf_odf_dovi_cfg_del(dovi);
+		return e;
+	}
+	if (remove) return GF_OK;
+	u32 nb_samples = gf_isom_get_sample_count(dest, track);
+	if (!nb_samples) {
+		M4_LOG(GF_LOG_ERROR, ("No DV config in file and no samples, cannot guess DV config\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
+	GF_DOVIDecoderConfigurationRecord _dovi;
+	memset(&_dovi, 0, sizeof(GF_DOVIDecoderConfigurationRecord));
+	_dovi.dv_version_major = 1;
+	_dovi.dv_version_minor = 0;
+	_dovi.dv_profile = dv_profile;
+	_dovi.dv_bl_signal_compatibility_id = dv_compat_id;
+	_dovi.force_dv = force_dv;
+
+	u32 w, h;
+	Bool is_avc = GF_FALSE;
+
+	e = gf_isom_get_visual_info(dest, track, 1, &w, &h);
+	if (e) return e;
+	//no DV profile present in file, we need to guess
+	GF_AVCConfig *avcc = gf_isom_avc_config_get(dest, track, 1);
+	GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(dest, track, 1);
+
+	if (!avcc && !hvcc) {
+		M4_LOG(GF_LOG_WARNING, ("DV profile can only be set on AVC or HEVC tracks\n"));
+		return GF_BAD_PARAM;
+	}
+
+	u32 nalu_length = avcc ? avcc->nal_unit_size : hvcc->nal_unit_size;
+	if (avcc) {
+		is_avc = GF_TRUE;
+		gf_odf_avc_cfg_del(avcc);
+	}
+	if (hvcc) gf_odf_hevc_cfg_del(hvcc);
+
+	//inspect at most first 50 samples
+	u32 i;
+	for (i=0; i<50; i++) {
+		u32 stsd_idx;
+		GF_BitStream *bs;
+
+		GF_ISOSample *samp = gf_isom_get_sample(dest, track, i+1, &stsd_idx);
+		if (!samp) break;
+
+		bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+
+		while (gf_bs_available(bs)) {
+			u32 nal_type;
+			u32 nal_size = gf_bs_read_int(bs, nalu_length*8);
+			if (is_avc) {
+				nal_type = gf_bs_read_u8(bs);
+				nal_type = nal_type & 0x1F;
+				nal_size--;
+				if (nal_type == GF_AVC_NALU_DV_RPU) _dovi.rpu_present_flag = 1;
+				else if (nal_type == GF_AVC_NALU_DV_EL) _dovi.el_present_flag = 1;
+				else if (nal_type <= GF_AVC_NALU_IDR_SLICE) _dovi.bl_present_flag = 1;
+			} else {
+				gf_bs_read_int(bs, 1);
+				nal_type = gf_bs_read_int(bs, 6);
+				gf_bs_read_int(bs, 1);
+				nal_size--;
+				if (nal_type == GF_HEVC_NALU_DV_RPU) _dovi.rpu_present_flag = 1;
+				else if (nal_type == GF_HEVC_NALU_DV_EL) _dovi.el_present_flag = 1;
+				else if (nal_type <= GF_HEVC_NALU_SLICE_CRA) _dovi.bl_present_flag = 1;
+			}
+			gf_bs_skip_bytes(bs, nal_size);
+		}
+		gf_bs_del(bs);
+		gf_isom_sample_del(&samp);
+	}
+
+	u64 mdur = gf_isom_get_media_duration(dest, track);
+	mdur /= nb_samples;
+	u32 timescale = gf_isom_get_media_timescale(dest, track);
+
+	_dovi.dv_level = gf_dolby_vision_level(w, h, timescale, mdur, is_avc ? GF_CODECID_AVC : GF_CODECID_HEVC);
+	return gf_isom_set_dolby_vision_profile(dest, track, 1, &_dovi);
+}
+
+
+
+GF_Err apply_edits(GF_ISOFile *dest, u32 track, char *edits)
+{
+	u32 movie_ts = gf_isom_get_timescale(dest);
+	u32 media_ts = gf_isom_get_media_timescale(dest, track);
+	u64 media_dur = gf_isom_get_media_duration(dest, track);
+
+	while (edits) {
+		GF_Err e;
+		char c=0;
+		char *sep = strchr(edits+1, 'r');
+		if (!sep) sep = strchr(edits+1, 'e');
+		if (sep) {
+			c = sep[0];
+			sep[0] = 0;
+		}
+
+		//remove all edits
+		if (edits[0] == 'r') {
+			e = gf_isom_remove_edits(dest, track);
+			if (e) goto error;
+		}
+		else if (edits[0]=='e') {
+			u64 movie_t, media_t, edur;
+			u32 rate;
+			GF_Fraction64 movie_time, media_time, media_rate, edit_dur;
+			char *mtime_sep;
+
+			edits+=1;
+			mtime_sep = strchr(edits, ',');
+			movie_time.den = media_time.den = media_rate.den = 0;
+			if (!mtime_sep) {
+				e = parse_fracs(edits, &movie_time, &edit_dur);
+				if (e) goto error;
+			}
+			else {
+				mtime_sep[0] = 0;
+				e = parse_fracs(edits, &movie_time, &edit_dur);
+				if (e) goto error;
+				mtime_sep[0] = ',';
+				edits = mtime_sep+1;
+				mtime_sep = strchr(edits, ',');
+				if (!mtime_sep) {
+					e = parse_fracs(edits, &media_time, NULL);
+					if (e) goto error;
+					media_rate.num = media_rate.den = 1;
+				} else {
+					mtime_sep[0] = 0;
+					e = parse_fracs(edits, &media_time, NULL);
+					if (e) goto error;
+					mtime_sep[0] = ',';
+					e = parse_fracs(mtime_sep+1, &media_rate, NULL);
+					if (e) goto error;
+				}
+			}
+			if (!movie_time.den || (movie_time.num<0)) {
+				e = GF_BAD_PARAM;
+				fprintf(stderr, "Wrong edit format %s, movie time must be valid and >= 0\n", edits);
+				goto error;
+			}
+			movie_t = movie_time.num * movie_ts / movie_time.den;
+			if (!edit_dur.den || !edit_dur.num) {
+				edur = media_dur;
+				edur *= movie_ts;
+				edur /= media_ts;
+			} else {
+				edur = edit_dur.num;
+				edur *= movie_ts;
+				edur /= edit_dur.den;
+				if (edur>media_dur)
+					edur = media_dur;
+			}
+			if (!media_time.den) {
+				e = gf_isom_set_edit(dest, track, movie_t, edur, 0, GF_ISOM_EDIT_EMPTY);
+			} else {
+				rate = 0;
+				if (media_rate.den) {
+					u64 frac;
+					rate = (u32) ( media_rate.num / media_rate.den );
+					frac = media_rate.num - rate*media_rate.den;
+					frac *= 0xFFFF;
+					frac /= media_rate.den;
+					rate = (rate<<16) | (u32) frac;
+				}
+				media_t = media_time.num * media_ts / media_time.den;
+				e = gf_isom_set_edit_with_rate(dest, track, movie_t, edur, media_t, rate);
+			}
+			if (e==GF_EOS) {
+				fprintf(stderr, "Inserted empty edit before edit at start time "LLD"/"LLU"\n", movie_time.num, movie_time.den);
+				e = GF_OK;
+			}
+			if (e) goto error;
+		} else {
+			e = GF_BAD_PARAM;
+			fprintf(stderr, "Wrong edit format %s, should start with 'e' or 'r'\n", edits);
+			goto error;
+		}
+error:
+		if (sep) sep[0] = c;
+		if (e) return e;
+
+		if (!sep) break;
+		edits = sep;
+	}
+	return GF_OK;
 }
 
-GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, GF_FilterSession *fsess, char **mux_args_if_first_pass, u32 tk_idx)
+static const char *videofmt_names[] = { "component", "pal", "ntsc", "secam", "mac", "undef"};
+
+
+GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, GF_FilterSession *fsess, char **mux_args_if_first_pass, char **mux_sid_if_first_pass, u32 tk_idx)
 {
-	u32 track_id, i, j, timescale, track, stype, profile, level, new_timescale, rescale_num, rescale_den, svc_mode, txt_flags, split_tile_mode, temporal_mode, nb_tracks;
-	s32 par_d, par_n, prog_id, delay, force_rate, moov_timescale;
-	s32 tw, th, tx, ty, txtw, txth, txtx, txty;
-	Bool do_audio, do_video, do_auxv,do_pict, do_all, disable, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, negative_cts_offset, rap_only, refs_only, force_par, rewrite_bs;
-	u32 group, handler, rvc_predefined, check_track_for_svc, check_track_for_lhvc, check_track_for_hevc;
+	u32 track_id, i, j, timescale, track, stype, profile, compat, level, new_timescale, rescale_num, rescale_den, svc_mode, txt_flags, split_tile_mode, temporal_mode, nb_tracks;
+	s32 par_d, par_n, prog_id, force_rate, moov_timescale;
+	s32 tw, th, tx, ty, tz, txtw, txth, txtx, txty;
+	Bool do_audio, do_video, do_auxv,do_pict, do_all, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, rap_only, refs_only, force_par, rewrite_bs;
+	u32 group, handler, rvc_predefined, check_track_for_svc, check_track_for_lhvc, check_track_for_hevc, do_disable;
 	const char *szLan;
 	GF_Err e = GF_OK;
-	u32 tmcd_track = 0;
+	GF_Fraction delay;
+	u32 tmcd_track = 0, neg_ctts_mode=0;
 	Bool keep_audelim = GF_FALSE;
 	u32 print_stats_graph=fs_dump_flags;
 	GF_MediaImporter import;
-	char *ext, szName[1000], *handler_name, *rvc_config, *chapter_name;
+	char *ext, *final_name=NULL, *handler_name, *rvc_config, *chapter_name;
 	GF_List *kinds;
 	GF_TextFlagsMode txt_mode = GF_ISOM_TEXT_FLAGS_OVERWRITE;
 	u8 max_layer_id_plus_one, max_temporal_id_plus_one;
@@ -289,14 +606,15 @@
 	Bool has_mx=GF_FALSE;
 	s32 mx[9];
 	u32 bitdepth=0;
-	u32 dv_profile=0; /*Dolby Vision*/
+	char dv_profile[100]; /*Dolby Vision*/
 	u32 clr_type=0;
 	u32 clr_prim;
 	u32 clr_tranf;
 	u32 clr_mx;
-	u32 clr_full_range=GF_FALSE;
+	Bool rescale_override=GF_FALSE;
+	Bool clr_full_range=GF_FALSE;
 	Bool fmt_ok = GF_TRUE;
-	u32 icc_size=0;
+	u32 icc_size=0, track_flags=0;
 	u8 *icc_data = NULL;
 	u32 tc_fps_num=0, tc_fps_den=0, tc_h=0, tc_m=0, tc_s=0, tc_f=0, tc_frames_per_tick=0;
 	Bool tc_force_counter=GF_FALSE;
@@ -307,12 +625,21 @@
 	char *opt_src = NULL;
 	char *opt_dst = NULL;
 	char *fchain = NULL;
+	char *edits = NULL;
+	const char *fail_msg = NULL;
+	char *hdr_file=NULL;
 	Bool set_ccst=GF_FALSE;
 	Bool has_last_sample_dur=GF_FALSE;
+	u32 fake_import = 0;
 	GF_Fraction last_sample_dur = {0,0};
-
+	s32 fullrange, videofmt, colorprim, colortfc, colormx;
 	clap_wn = clap_wd = clap_hn = clap_hd = clap_hon = clap_hod = clap_von = clap_vod = 0;
+	GF_ISOMTrackFlagOp track_flags_mode=0;
+	u32 roll_change=0;
+	u32 roll = 0;
+	Bool src_is_isom = GF_FALSE;
 
+	dv_profile[0] = 0;
 	rvc_predefined = 0;
 	chapter_name = NULL;
 	new_timescale = 1;
@@ -325,31 +652,36 @@
 	 */
 	svc_mode = 0;
 
+	if (import_flags==0xFFFFFFFF) {
+		import_flags = 0;
+		fake_import = 1;
+	}
+
 	memset(&import, 0, sizeof(GF_MediaImporter));
 
-	strcpy(szName, inName);
+	final_name = gf_strdup(inName);
 #ifdef WIN32
 	/*dirty hack for msys&mingw: when we use import options, the ':' separator used prevents msys from translating the path
 	we do this for regular cases where the path starts with the drive letter. If the path start with anything else (/home , /opt, ...) we're screwed :( */
-	if ( (szName[0]=='/') && (szName[2]=='/')) {
-		szName[0] = szName[1];
-		szName[1] = ':';
+	if ( (final_name[0]=='/') && (final_name[2]=='/')) {
+		final_name[0] = final_name[1];
+		final_name[1] = ':';
 	}
 #endif
 
 	is_chap_file = 0;
 	handler = 0;
-	disable = 0;
+	do_disable = 0;
 	chap_ref = 0;
 	is_chap = 0;
 	kinds = gf_list_new();
 	track_layout = 0;
 	szLan = NULL;
-	delay = 0;
+	delay.num = delay.den = 0;
 	group = 0;
 	stype = 0;
-	profile = level = 0;
-	negative_cts_offset = 0;
+	profile = compat = level = 0;
+	fullrange = videofmt = colorprim = colortfc = colormx = -1;
 	split_tile_mode = 0;
 	temporal_mode = 0;
 	rap_only = 0;
@@ -358,34 +690,52 @@
 	max_layer_id_plus_one = max_temporal_id_plus_one = 0;
 	force_rate = -1;
 
-	tw = th = tx = ty = txtw = txth = txtx = txty = 0;
+	tw = th = tx = ty = tz = txtw = txth = txtx = txty = 0;
 	par_d = par_n = -1;
 	force_par = rewrite_bs = GF_FALSE;
 
-	ext = gf_url_colon_suffix(szName);
+	ext_start = gf_file_ext_start(final_name);
+	ext = strrchr(ext_start ? ext_start : final_name, '#');
+	if (!ext) ext = gf_url_colon_suffix(final_name, '=');
+	char c_sep = ext ? ext[0] : 0;
+	if (ext) ext[0] = 0;
+ 	if (!strlen(final_name) || !strcmp(final_name, "self")) {
+		fake_import = 2;
+	}
+	if (gf_isom_probe_file(final_name))
+		src_is_isom = GF_TRUE;
+
+	if (ext) ext[0] = c_sep;
+
+	ext = gf_url_colon_suffix(final_name, '=');
+
+#define GOTO_EXIT(_msg) if (e) { fail_msg = _msg; goto exit; }
+
+#define CHECK_FAKEIMPORT(_opt) if (fake_import) { M4_LOG(GF_LOG_ERROR, ("Option %s not available for self-reference import\n", _opt)); e = GF_BAD_PARAM; goto exit; }
+#define CHECK_FAKEIMPORT_2(_opt) if (fake_import==1) { M4_LOG(GF_LOG_ERROR, ("Option %s not available for self-reference import\n", _opt)); e = GF_BAD_PARAM; goto exit; }
+
 
 	handler_name = NULL;
 	rvc_config = NULL;
 	while (ext) {
-		char *ext2 = gf_url_colon_suffix(ext+1);
+		char *ext2 = gf_url_colon_suffix(ext+1, '=');
 
 		if (ext2) ext2[0] = 0;
 
 		/*all extensions for track-based importing*/
 		if (!strnicmp(ext+1, "dur=", 4)) {
-			s32 dur_n=0, dur_d=0;
-			if (strchr(ext, '/')) {
-				sscanf(ext+5, "%d/%d", &dur_n, &dur_d);
-			} else if (strchr(ext, '-')) {
-				dur_n = atoi(ext+5);
-				dur_d = 1;
+			CHECK_FAKEIMPORT("dur")
+
+			if (strchr(ext, '-')) {
+				import.duration.num = atoi(ext+5);
+				import.duration.den = 1;
 			} else {
-				//use 1/10 of millisecond precision
-				dur_n = (u32)( (atof(ext+5) * 10000) + 0.5 );
-				dur_d = 10000;
+				gf_parse_frac(ext+5, &import.duration);
 			}
-			import.duration.num = dur_n;
-			import.duration.den = dur_d;
+		}
+		else if (!strnicmp(ext+1, "start=", 6)) {
+			CHECK_FAKEIMPORT("start")
+			import.start_time = atof(ext+7);
 		}
 		else if (!strnicmp(ext+1, "lang=", 5)) {
 			/* prevent leak if param is set twice */
@@ -394,7 +744,12 @@
 
 			szLan = gf_strdup(ext+6);
 		}
-		else if (!strnicmp(ext+1, "delay=", 6)) delay = atoi(ext+7);
+		else if (!strnicmp(ext+1, "delay=", 6)) {
+			if (sscanf(ext+7, "%d/%u", &delay.num, &delay.den)!=2) {
+				delay.num = atoi(ext+7);
+				delay.den = 1000; //in ms
+			}
+		}
 		else if (!strnicmp(ext+1, "par=", 4)) {
 			if (!stricmp(ext + 5, "none")) {
 				par_n = par_d = 0;
@@ -411,9 +766,17 @@
 				}
 				if (ext[5]=='w') {
 					rewrite_bs = GF_TRUE;
-					sscanf(ext+6, "%d:%d", &par_n, &par_d);
+					if (sscanf(ext+6, "%d:%d", &par_n, &par_d)!=2) {
+						M4_LOG(GF_LOG_ERROR, ("Unrecognized syntax for par=, expecting N:D got %s\n", ext+5));
+						e = GF_BAD_PARAM;
+						goto exit;
+					}
 				} else {
-					sscanf(ext+5, "%d:%d", &par_n, &par_d);
+					if (sscanf(ext+5, "%d:%d", &par_n, &par_d) != 2) {
+						M4_LOG(GF_LOG_ERROR, ("Unrecognized syntax for par=, expecting N:D got %s\n", ext+5));
+						e = GF_BAD_PARAM;
+						goto exit;
+					}
 				}
 			}
 		}
@@ -428,10 +791,10 @@
 		}
 		else if (!strnicmp(ext+1, "mx=", 3)) {
 			if (strstr(ext+4, "0x")) {
-				if (sscanf(ext+4, "0x%d:0x%d:0x%d:0x%d:0x%d:0x%d:0x%d:0x%d:0x%d", &mx[0], &mx[1], &mx[2], &mx[3], &mx[4], &mx[5], &mx[6], &mx[7], &mx[8])==9) {
+				if (sscanf(ext+4, "0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%d", &mx[0], &mx[1], &mx[2], &mx[3], &mx[4], &mx[5], &mx[6], &mx[7], &mx[8])==9) {
 					has_mx=GF_TRUE;
 				}
-			} else if (sscanf(ext+4, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &mx[0], &mx[1], &mx[2], &mx[3], &mx[4], &mx[5], &mx[6], &mx[7], &mx[8])==9) {
+			} else if (sscanf(ext+4, "%d,%d,%d,%d,%d,%d,%d,%d,%d", &mx[0], &mx[1], &mx[2], &mx[3], &mx[4], &mx[5], &mx[6], &mx[7], &mx[8])==9) {
 				has_mx=GF_TRUE;
 			}
 		}
@@ -439,6 +802,7 @@
 			handler_name = gf_strdup(ext+6);
 		}
 		else if (!strnicmp(ext+1, "ext=", 4)) {
+			CHECK_FAKEIMPORT("ext")
 			/*extensions begin with '.'*/
 			if (*(ext+5) == '.')
 				import.force_ext = gf_strdup(ext+5);
@@ -449,45 +813,68 @@
 			}
 		}
 		else if (!strnicmp(ext+1, "hdlr=", 5)) handler = GF_4CC(ext[6], ext[7], ext[8], ext[9]);
-		else if (!strnicmp(ext+1, "disable", 7)) disable = 1;
+		else if (!strnicmp(ext+1, "stype=", 6)) stype = GF_4CC(ext[7], ext[8], ext[9], ext[10]);
+		else if (!strnicmp(ext+1, "tkhd", 4)) {
+			char *flags = ext+6;
+			if (flags[0]=='+') { track_flags_mode = GF_ISOM_TKFLAGS_ADD; flags += 1; }
+			else if (flags[0]=='-') { track_flags_mode = GF_ISOM_TKFLAGS_REM; flags += 1; }
+			else track_flags_mode = GF_ISOM_TKFLAGS_SET;
+
+			if (strstr(flags, "enable")) track_flags |= GF_ISOM_TK_ENABLED;
+			if (strstr(flags, "movie")) track_flags |= GF_ISOM_TK_IN_MOVIE;
+			if (strstr(flags, "preview")) track_flags |= GF_ISOM_TK_IN_PREVIEW;
+			if (strstr(flags, "size_ar")) track_flags |= GF_ISOM_TK_SIZE_IS_AR;
+			if (!track_flags) {
+				if (!strnicmp(flags, "0x", 2)) flags += 2;
+				sscanf(flags, "%X", &track_flags);
+			}
+		} else if (!strnicmp(ext+1, "disable", 7)) {
+			do_disable = !stricmp(ext+1, "disable=no") ? 2 : 1;
+		}
 		else if (!strnicmp(ext+1, "group=", 6)) {
 			group = atoi(ext+7);
 			if (!group) group = gf_isom_get_next_alternate_group_id(dest);
 		}
 		else if (!strnicmp(ext+1, "fps=", 4)) {
 			u32 ticks, dts_inc;
+			CHECK_FAKEIMPORT("fps")
 			if (!strcmp(ext+5, "auto")) {
-				fprintf(stderr, "Warning, fps=auto option is deprecated\n");
+				M4_LOG(GF_LOG_ERROR, ("Warning, fps=auto option is deprecated\n"));
 			} else if ((sscanf(ext+5, "%u-%u", &ticks, &dts_inc) == 2) || (sscanf(ext+5, "%u/%u", &ticks, &dts_inc) == 2)) {
 				if (!dts_inc) dts_inc=1;
 				force_fps.num = ticks;
 				force_fps.den = dts_inc;
 			} else {
-				force_fps.den = 1000;
-				force_fps.num = (u32) (atof(ext+5) * force_fps.den);
+				if (gf_sys_old_arch_compat()) {
+					force_fps.den = 1000;
+					force_fps.num = (u32) (atof(ext+5) * force_fps.den);
+				} else {
+					gf_parse_frac(ext+5, &force_fps);
+				}
 			}
 		}
 		else if (!stricmp(ext+1, "rap")) rap_only = 1;
 		else if (!stricmp(ext+1, "refs")) refs_only = 1;
-		else if (!stricmp(ext+1, "trailing")) import_flags |= GF_IMPORT_KEEP_TRAILING;
-		else if (!strnicmp(ext+1, "agg=", 4)) frames_per_sample = atoi(ext+5);
-		else if (!stricmp(ext+1, "dref")) import_flags |= GF_IMPORT_USE_DATAREF;
-		else if (!stricmp(ext+1, "keep_refs")) import_flags |= GF_IMPORT_KEEP_REFS;
-		else if (!stricmp(ext+1, "nodrop")) import_flags |= GF_IMPORT_NO_FRAME_DROP;
-		else if (!stricmp(ext+1, "packed")) import_flags |= GF_IMPORT_FORCE_PACKED;
-		else if (!stricmp(ext+1, "sbr")) import_flags |= GF_IMPORT_SBR_IMPLICIT;
-		else if (!stricmp(ext+1, "sbrx")) import_flags |= GF_IMPORT_SBR_EXPLICIT;
-		else if (!stricmp(ext+1, "ovsbr")) import_flags |= GF_IMPORT_OVSBR;
-		else if (!stricmp(ext+1, "ps")) import_flags |= GF_IMPORT_PS_IMPLICIT;
-		else if (!stricmp(ext+1, "psx")) import_flags |= GF_IMPORT_PS_EXPLICIT;
-		else if (!stricmp(ext+1, "mpeg4")) import_flags |= GF_IMPORT_FORCE_MPEG4;
-		else if (!stricmp(ext+1, "nosei")) import_flags |= GF_IMPORT_NO_SEI;
-		else if (!stricmp(ext+1, "svc") || !stricmp(ext+1, "lhvc") ) import_flags |= GF_IMPORT_SVC_EXPLICIT;
-		else if (!stricmp(ext+1, "nosvc") || !stricmp(ext+1, "nolhvc")) import_flags |= GF_IMPORT_SVC_NONE;
+		else if (!stricmp(ext+1, "trailing")) { CHECK_FAKEIMPORT("trailing") import_flags |= GF_IMPORT_KEEP_TRAILING; }
+		else if (!strnicmp(ext+1, "agg=", 4)) { CHECK_FAKEIMPORT("agg") frames_per_sample = atoi(ext+5); }
+		else if (!stricmp(ext+1, "dref")) { CHECK_FAKEIMPORT("dref") import_flags |= GF_IMPORT_USE_DATAREF; }
+		else if (!stricmp(ext+1, "keep_refs")) { CHECK_FAKEIMPORT("keep_refs") import_flags |= GF_IMPORT_KEEP_REFS; }
+		else if (!stricmp(ext+1, "nodrop")) { CHECK_FAKEIMPORT("nodrop") import_flags |= GF_IMPORT_NO_FRAME_DROP; }
+		else if (!stricmp(ext+1, "packed")) { CHECK_FAKEIMPORT("packed") import_flags |= GF_IMPORT_FORCE_PACKED; }
+		else if (!stricmp(ext+1, "sbr")) { CHECK_FAKEIMPORT("sbr") import_flags |= GF_IMPORT_SBR_IMPLICIT; }
+		else if (!stricmp(ext+1, "sbrx")) { CHECK_FAKEIMPORT("sbrx") import_flags |= GF_IMPORT_SBR_EXPLICIT; }
+		else if (!stricmp(ext+1, "ovsbr")) { CHECK_FAKEIMPORT("ovsbr") import_flags |= GF_IMPORT_OVSBR; }
+		else if (!stricmp(ext+1, "ps")) { CHECK_FAKEIMPORT("ps") import_flags |= GF_IMPORT_PS_IMPLICIT; }
+		else if (!stricmp(ext+1, "psx")) { CHECK_FAKEIMPORT("psx") import_flags |= GF_IMPORT_PS_EXPLICIT; }
+		else if (!stricmp(ext+1, "mpeg4")) { CHECK_FAKEIMPORT("mpeg4") import_flags |= GF_IMPORT_FORCE_MPEG4; }
+		else if (!stricmp(ext+1, "nosei")) { CHECK_FAKEIMPORT("nosei") import_flags |= GF_IMPORT_NO_SEI; }
+		else if (!stricmp(ext+1, "svc") || !stricmp(ext+1, "lhvc") ) { CHECK_FAKEIMPORT("svc/lhvc") import_flags |= GF_IMPORT_SVC_EXPLICIT; }
+		else if (!stricmp(ext+1, "nosvc") || !stricmp(ext+1, "nolhvc")) { CHECK_FAKEIMPORT("nosvc/nolhvc") import_flags |= GF_IMPORT_SVC_NONE; }
 
 		/*split SVC layers*/
 		else if (!strnicmp(ext+1, "svcmode=", 8) || !strnicmp(ext+1, "lhvcmode=", 9)) {
 			char *mode = ext+9;
+			CHECK_FAKEIMPORT_2("svcmode/lhvcmode")
 			if (mode[0]=='=') mode = ext+10;
 
 			if (!stricmp(mode, "splitnox"))
@@ -504,6 +891,7 @@
 		/*split SHVC temporal sublayers*/
 		else if (!strnicmp(ext+1, "temporal=", 9)) {
 			char *mode = ext+10;
+			CHECK_FAKEIMPORT_2("svcmode/lhvcmode")
 			if (!stricmp(mode, "split"))
 				temporal_mode = 2;
 			else if (!stricmp(mode, "splitnox"))
@@ -511,22 +899,23 @@
 			else if (!stricmp(mode, "splitbase"))
 				temporal_mode = 1;
 			else {
-				fprintf(stderr, "Unrecognized temporal mode %s, ignoring\n", mode);
+				M4_LOG(GF_LOG_ERROR, ("Unrecognized temporal mode %s, ignoring\n", mode));
 				temporal_mode = 0;
 			}
 		}
-		else if (!stricmp(ext+1, "subsamples")) import_flags |= GF_IMPORT_SET_SUBSAMPLES;
-		else if (!stricmp(ext+1, "deps")) import_flags |= GF_IMPORT_SAMPLE_DEPS;
-		else if (!stricmp(ext+1, "ccst")) set_ccst = GF_TRUE;
-		else if (!stricmp(ext+1, "alpha")) import.is_alpha = GF_TRUE;
-		else if (!stricmp(ext+1, "forcesync")) import_flags |= GF_IMPORT_FORCE_SYNC;
-		else if (!stricmp(ext+1, "xps_inband")) xps_inband = 1;
-		else if (!stricmp(ext+1, "xps_inbandx")) xps_inband = 2;
-		else if (!stricmp(ext+1, "au_delim")) keep_audelim = GF_TRUE;
+		else if (!stricmp(ext+1, "subsamples")) { CHECK_FAKEIMPORT("subsamples") import_flags |= GF_IMPORT_SET_SUBSAMPLES; }
+		else if (!stricmp(ext+1, "deps")) { CHECK_FAKEIMPORT("deps") import_flags |= GF_IMPORT_SAMPLE_DEPS; }
+		else if (!stricmp(ext+1, "ccst")) { CHECK_FAKEIMPORT("ccst") set_ccst = GF_TRUE; }
+		else if (!stricmp(ext+1, "alpha")) { CHECK_FAKEIMPORT("alpha") import.is_alpha = GF_TRUE; }
+		else if (!stricmp(ext+1, "forcesync")) { CHECK_FAKEIMPORT("forcesync") import_flags |= GF_IMPORT_FORCE_SYNC; }
+		else if (!stricmp(ext+1, "xps_inband")) { CHECK_FAKEIMPORT("xps_inband") xps_inband = 1; }
+		else if (!stricmp(ext+1, "xps_inbandx")) { CHECK_FAKEIMPORT("xps_inbandx") xps_inband = 2; }
+		else if (!stricmp(ext+1, "au_delim")) { CHECK_FAKEIMPORT("au_delim") keep_audelim = GF_TRUE; }
 		else if (!strnicmp(ext+1, "max_lid=", 8) || !strnicmp(ext+1, "max_tid=", 8)) {
 			s32 val = atoi(ext+9);
+			CHECK_FAKEIMPORT_2("max_lid/lhvcmode")
 			if (val < 0) {
-				fprintf(stderr, "Warning: request max layer/temporal id is negative - ignoring\n");
+				M4_LOG(GF_LOG_ERROR, ("Warning: request max layer/temporal id is negative - ignoring\n"));
 			} else {
 				if (!strnicmp(ext+1, "max_lid=", 8))
 					max_layer_id_plus_one = 1 + (u8) val;
@@ -534,14 +923,13 @@
 					max_temporal_id_plus_one = 1 + (u8) val;
 			}
 		}
-		else if (!stricmp(ext+1, "tiles")) split_tile_mode = 2;
-		else if (!stricmp(ext+1, "tiles_rle")) split_tile_mode = 3;
-		else if (!stricmp(ext+1, "split_tiles")) split_tile_mode = 1;
+		else if (!stricmp(ext+1, "tiles")) { CHECK_FAKEIMPORT_2("tiles") split_tile_mode = 2; }
+		else if (!stricmp(ext+1, "tiles_rle")) { CHECK_FAKEIMPORT_2("tiles_rle") split_tile_mode = 3; }
+		else if (!stricmp(ext+1, "split_tiles")) { CHECK_FAKEIMPORT_2("split_tiles") split_tile_mode = 1; }
 
 		/*force all composition offsets to be positive*/
-		else if (!strnicmp(ext+1, "negctts", 7)) negative_cts_offset = 1;
-		else if (!strnicmp(ext+1, "stype=", 6)) {
-			stype = GF_4CC(ext[7], ext[8], ext[9], ext[10]);
+		else if (!strnicmp(ext+1, "negctts", 7)) {
+			neg_ctts_mode = !strnicmp(ext+1, "negctts=no", 10) ? 2 : 1;
 		}
 		else if (!stricmp(ext+1, "chap")) is_chap = 1;
 		else if (!strnicmp(ext+1, "chapter=", 8)) {
@@ -552,19 +940,30 @@
 			is_chap_file=1;
 		}
 		else if (!strnicmp(ext+1, "layout=", 7)) {
-			if ( sscanf(ext+8, "%dx%dx%dx%d", &tw, &th, &tx, &ty)==4) {
-				track_layout = 1;
-			} else if ( sscanf(ext+8, "%dx%d", &tw, &th)==2) {
-				track_layout = 1;
+			track_layout = 1;
+			if ( sscanf(ext+13, "%dx%dx%dx%dx%d", &tw, &th, &tx, &ty, &tz)==5) {
+			} else if ( sscanf(ext+13, "%dx%dx%dx%d", &tw, &th, &tx, &ty)==4) {
+				tz = 0;
+			} else if ( sscanf(ext+13, "%dx%dx%d", &tw, &th, &tz)==3) {
 				tx = ty = 0;
+			} else if ( sscanf(ext+8, "%dx%d", &tw, &th)==2) {
+				tx = ty = tz = 0;
 			}
 		}
+
 		else if (!strnicmp(ext+1, "rescale=", 8)) {
-			if (sscanf(ext+9, "%d/%d", &rescale_num, &rescale_den) != 2) {
+			if (sscanf(ext+9, "%u/%u", &rescale_num, &rescale_den) != 2) {
 				rescale_num = atoi(ext+9);
 				rescale_den = 0;
 			}
 		}
+		else if (!strnicmp(ext+1, "sampdur=", 8)) {
+			if (sscanf(ext+9, "%u/%u", &rescale_den, &rescale_num) != 2) {
+				rescale_den = atoi(ext+9);
+				rescale_num = 0;
+			}
+			rescale_override = GF_TRUE;
+		}
 		else if (!strnicmp(ext+1, "timescale=", 10)) {
 			new_timescale = atoi(ext+11);
 		}
@@ -572,7 +971,7 @@
 			moov_timescale = atoi(ext+8);
 		}
 
-		else if (!stricmp(ext+1, "noedit")) import_flags |= GF_IMPORT_NO_EDIT_LIST;
+		else if (!stricmp(ext+1, "noedit")) { import_flags |= GF_IMPORT_NO_EDIT_LIST; }
 
 
 		else if (!strnicmp(ext+1, "rvc=", 4)) {
@@ -581,13 +980,30 @@
 			}
 		}
 		else if (!strnicmp(ext+1, "fmt=", 4)) import.streamFormat = gf_strdup(ext+5);
-		else if (!strnicmp(ext+1, "profile=", 8)) profile = atoi(ext+9);
-		else if (!strnicmp(ext+1, "level=", 6)) level = atoi(ext+7);
-		else if (!strnicmp(ext+1, "novpsext", 8)) import_flags |= GF_IMPORT_NO_VPS_EXTENSIONS;
-		else if (!strnicmp(ext+1, "keepav1t", 8)) import_flags |= GF_IMPORT_KEEP_AV1_TEMPORAL_OBU;
 
-		else if (!strnicmp(ext+1, "font=", 5)) import.fontName = gf_strdup(ext+6);
-		else if (!strnicmp(ext+1, "size=", 5)) import.fontSize = atoi(ext+6);
+		else if (!strnicmp(ext+1, "profile=", 8)) {
+			if (!stricmp(ext+9, "high444")) profile = 244;
+			else if (!stricmp(ext+9, "high")) profile = 100;
+			else if (!stricmp(ext+9, "extended")) profile = 88;
+			else if (!stricmp(ext+9, "main")) profile = 77;
+			else if (!stricmp(ext+9, "baseline")) profile = 66;
+			else profile = atoi(ext+9);
+		}
+		else if (!strnicmp(ext+1, "level=", 6)) {
+			if( atof(ext+7) < 6 )
+				level = (int)(10*atof(ext+7)+.5);
+			else
+				level = atoi(ext+7);
+		}
+		else if (!strnicmp(ext+1, "compat=", 7)) {
+			compat = atoi(ext+8);
+		}
+
+		else if (!strnicmp(ext+1, "novpsext", 8)) { CHECK_FAKEIMPORT("novpsext") import_flags |= GF_IMPORT_NO_VPS_EXTENSIONS; }
+		else if (!strnicmp(ext+1, "keepav1t", 8)) { CHECK_FAKEIMPORT("keepav1t") import_flags |= GF_IMPORT_KEEP_AV1_TEMPORAL_OBU; }
+
+		else if (!strnicmp(ext+1, "font=", 5)) { CHECK_FAKEIMPORT("font") import.fontName = gf_strdup(ext+6); }
+		else if (!strnicmp(ext+1, "size=", 5)) { CHECK_FAKEIMPORT("size") import.fontSize = atoi(ext+6); }
 		else if (!strnicmp(ext+1, "text_layout=", 12)) {
 			if ( sscanf(ext+13, "%dx%dx%dx%d", &txtw, &txth, &txtx, &txty)==4) {
 				text_layout = 1;
@@ -598,17 +1014,17 @@
 		}
 
 #ifndef GPAC_DISABLE_SWF_IMPORT
-		else if (!stricmp(ext+1, "swf-global")) import.swf_flags |= GF_SM_SWF_STATIC_DICT;
-		else if (!stricmp(ext+1, "swf-no-ctrl")) import.swf_flags &= ~GF_SM_SWF_SPLIT_TIMELINE;
-		else if (!stricmp(ext+1, "swf-no-text")) import.swf_flags |= GF_SM_SWF_NO_TEXT;
-		else if (!stricmp(ext+1, "swf-no-font")) import.swf_flags |= GF_SM_SWF_NO_FONT;
-		else if (!stricmp(ext+1, "swf-no-line")) import.swf_flags |= GF_SM_SWF_NO_LINE;
-		else if (!stricmp(ext+1, "swf-no-grad")) import.swf_flags |= GF_SM_SWF_NO_GRADIENT;
-		else if (!stricmp(ext+1, "swf-quad")) import.swf_flags |= GF_SM_SWF_QUAD_CURVE;
-		else if (!stricmp(ext+1, "swf-xlp")) import.swf_flags |= GF_SM_SWF_SCALABLE_LINE;
-		else if (!stricmp(ext+1, "swf-ic2d")) import.swf_flags |= GF_SM_SWF_USE_IC2D;
-		else if (!stricmp(ext+1, "swf-same-app")) import.swf_flags |= GF_SM_SWF_REUSE_APPEARANCE;
-		else if (!strnicmp(ext+1, "swf-flatten=", 12)) import.swf_flatten_angle = (Float) atof(ext+13);
+		else if (!stricmp(ext+1, "swf-global")) { CHECK_FAKEIMPORT("swf-global") import.swf_flags |= GF_SM_SWF_STATIC_DICT; }
+		else if (!stricmp(ext+1, "swf-no-ctrl")) { CHECK_FAKEIMPORT("swf-no-ctrl") import.swf_flags &= ~GF_SM_SWF_SPLIT_TIMELINE; }
+		else if (!stricmp(ext+1, "swf-no-text")) { CHECK_FAKEIMPORT("swf-no-text") import.swf_flags |= GF_SM_SWF_NO_TEXT; }
+		else if (!stricmp(ext+1, "swf-no-font")) { CHECK_FAKEIMPORT("swf-no-font") import.swf_flags |= GF_SM_SWF_NO_FONT; }
+		else if (!stricmp(ext+1, "swf-no-line")) { CHECK_FAKEIMPORT("swf-no-line") import.swf_flags |= GF_SM_SWF_NO_LINE; }
+		else if (!stricmp(ext+1, "swf-no-grad")) { CHECK_FAKEIMPORT("swf-no-grad") import.swf_flags |= GF_SM_SWF_NO_GRADIENT; }
+		else if (!stricmp(ext+1, "swf-quad")) { CHECK_FAKEIMPORT("swf-quad") import.swf_flags |= GF_SM_SWF_QUAD_CURVE; }
+		else if (!stricmp(ext+1, "swf-xlp")) { CHECK_FAKEIMPORT("swf-xlp") import.swf_flags |= GF_SM_SWF_SCALABLE_LINE; }
+		else if (!stricmp(ext+1, "swf-ic2d")) { CHECK_FAKEIMPORT("swf-ic2d") import.swf_flags |= GF_SM_SWF_USE_IC2D; }
+		else if (!stricmp(ext+1, "swf-same-app")) { CHECK_FAKEIMPORT("swf-same-app") import.swf_flags |= GF_SM_SWF_REUSE_APPEARANCE; }
+		else if (!strnicmp(ext+1, "swf-flatten=", 12)) { CHECK_FAKEIMPORT("swf-flatten") import.swf_flatten_angle = (Float) atof(ext+13); }
 #endif
 
 		else if (!strnicmp(ext+1, "kind=", 5)) {
@@ -644,22 +1060,31 @@
 		else if (!strnicmp(ext+1, "rate=", 5)) {
 			force_rate = atoi(ext+6);
 		}
-		else if (!stricmp(ext+1, "fstat"))
+		else if (!stricmp(ext+1, "stats") || !stricmp(ext+1, "fstat"))
 			print_stats_graph |= 1;
-		else if (!stricmp(ext+1, "fgraph"))
+		else if (!stricmp(ext+1, "graph") || !stricmp(ext+1, "graph"))
 			print_stats_graph |= 2;
-		else if (!strncmp(ext+1, "sopt", 4) || !strncmp(ext+1, "dopt", 4) || !strncmp(ext+1, "@@", 2)) {
+		else if (!strncmp(ext+1, "sopt", 4) || !strncmp(ext+1, "dopt", 4) || !strncmp(ext+1, "@", 1)) {
 			if (ext2) ext2[0] = ':';
 			opt_src = strstr(ext, ":sopt:");
 			opt_dst = strstr(ext, ":dopt:");
-			fchain = strstr(ext, ":@@");
+			fchain = strstr(ext, ":@");
 			if (opt_src) opt_src[0] = 0;
 			if (opt_dst) opt_dst[0] = 0;
 			if (fchain) fchain[0] = 0;
 
 			if (opt_src) import.filter_src_opts = opt_src+6;
 			if (opt_dst) import.filter_dst_opts = opt_dst+6;
-			if (fchain) import.filter_chain = fchain+3;
+			if (fchain) {
+				//check for old syntax (0.9->1.0) :@@
+				if (fchain[2]=='@') {
+					import.filter_chain = fchain + 3;
+					import.is_chain_old_syntax = GF_TRUE;
+				} else {
+					import.filter_chain = fchain + 2;
+					import.is_chain_old_syntax = GF_FALSE;
+				}
+			}
 
 			ext = NULL;
 			break;
@@ -676,21 +1101,24 @@
 			else if (!stricmp(mode, "v1-qt"))
 				import.asemode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF;
 			else
-				fprintf(stderr, "Unrecognized audio sample entry mode %s, ignoring\n", mode);
-		}
-
-		else if (!strnicmp(ext+1, "audio_roll=", 11)) {
-			import.audio_roll_change = GF_TRUE;
-			import.audio_roll = atoi(ext+12);
+				M4_LOG(GF_LOG_ERROR, ("Unrecognized audio sample entry mode %s, ignoring\n", mode));
 		}
+		else if (!strnicmp(ext+1, "audio_roll=", 11)) { roll_change = 3; roll = atoi(ext+12); }
+		else if (!strnicmp(ext+1, "roll=", 5)) { roll_change = 1; roll = atoi(ext+6); }
+		else if (!strnicmp(ext+1, "proll=", 6)) { roll_change = 2; roll = atoi(ext+7); }
 		else if (!strcmp(ext+1, "stz2")) {
 			use_stz2 = GF_TRUE;
 		} else if (!strnicmp(ext+1, "bitdepth=", 9)) {
 			bitdepth=atoi(ext+10);
 		}
+		else if (!strnicmp(ext+1, "hdr=", 4)) {
+			hdr_file = gf_strdup(ext+5);
+		}
 		else if (!strnicmp(ext+1, "colr=", 5)) {
 			char *cval = ext+6;
-			if (strlen(cval)<6) {
+			if (!strcmp(cval, "none")) {
+				clr_type = (u32) -1;
+			} else if (strlen(cval)<6) {
 				fmt_ok = GF_FALSE;
 			} else {
 				clr_type = GF_4CC(cval[0],cval[1],cval[2],cval[3]);
@@ -698,19 +1126,15 @@
 				if (cval[0] != ',') {
 					fmt_ok = GF_FALSE;
 				}
-				else if (clr_type==GF_ISOM_SUBTYPE_NCLX) {
-					if (sscanf(cval+1, "%d,%d,%d,%d", &clr_prim, &clr_tranf, &clr_mx, &clr_full_range) != 4)
-						fmt_ok=GF_FALSE;
-				}
-				else if (clr_type==GF_ISOM_SUBTYPE_NCLC) {
-					if (sscanf(cval+1, "%d,%d,%d", &clr_prim, &clr_tranf, &clr_mx) != 3)
-						fmt_ok=GF_FALSE;
+				else if ((clr_type==GF_ISOM_SUBTYPE_NCLX) || (clr_type==GF_ISOM_SUBTYPE_NCLC)) {
+					fmt_ok = scan_color(cval+1, &clr_prim, &clr_tranf, &clr_mx, &clr_full_range);
 				}
 				else if ((clr_type==GF_ISOM_SUBTYPE_RICC) || (clr_type==GF_ISOM_SUBTYPE_PROF)) {
 					FILE *f = gf_fopen(cval+1, "rb");
 					if (!f) {
-						fprintf(stderr, "Failed to open file %s\n", cval+1);
-						fmt_ok = GF_FALSE;
+						M4_LOG(GF_LOG_ERROR, ("Failed to open file %s\n", cval+1));
+						e = GF_BAD_PARAM;
+						goto exit;
 					} else {
 						gf_fseek(f, 0, SEEK_END);
 						icc_size = (u32) gf_ftell(f);
@@ -720,21 +1144,65 @@
 						gf_fclose(f);
 					}
 				} else {
-					fprintf(stderr, "unrecognized profile %s\n", gf_4cc_to_str(clr_type) );
-					fmt_ok = GF_FALSE;
+					M4_LOG(GF_LOG_ERROR, ("Unrecognized colr profile %s\n", gf_4cc_to_str(clr_type) ));
+					e = GF_BAD_PARAM;
+					goto exit;
 				}
 			}
 			if (!fmt_ok) {
-				fprintf(stderr, "Bad format for clr option, check help\n");
 				e = GF_BAD_PARAM;
-				goto exit;
+				GOTO_EXIT("parsing colr option");
 			}
 		}
 		else if (!strnicmp(ext + 1, "dv-profile=", 11)) {
-			dv_profile = atoi(ext + 12);
+			strncpy(dv_profile, ext + 12, 99);
+			dv_profile[99]=0;
+		}
+		else if (!strnicmp(ext+1, "fullrange=", 10)) {
+			if (!stricmp(ext+11, "off") || !stricmp(ext+11, "no")) fullrange = 0;
+			else if (!stricmp(ext+11, "on") || !stricmp(ext+11, "yes")) fullrange = 1;
+			else {
+				e = GF_BAD_PARAM;
+				GOTO_EXIT("invalid format for fullrange")
+			}
+		}
+		else if (!strnicmp(ext+1, "videofmt=", 10)) {
+			u32 idx, count = GF_ARRAY_LENGTH(videofmt_names);
+			for (idx=0; idx<count; idx++) {
+				if (!strcmp(ext+11, videofmt_names[idx])) {
+					videofmt = idx;
+					break;
+				}
+			}
+			if (videofmt==-1) {
+				e = GF_BAD_PARAM;
+				GOTO_EXIT("invalid format for videofmt")
+			}
+		}
+		else if (!strnicmp(ext+1, "colorprim=", 10)) {
+			colorprim = gf_cicp_parse_color_primaries(ext+11);
+			if (colorprim==-1) {
+				e = GF_BAD_PARAM;
+				GOTO_EXIT("invalid format for colorprim")
+			}
+		}
+		else if (!strnicmp(ext+1, "colortfc=", 9)) {
+			colortfc = gf_cicp_parse_color_transfer(ext+10);
+			if (colortfc==-1) {
+				e = GF_BAD_PARAM;
+				GOTO_EXIT("invalid format for colortfc")
+			}
+		}
+		else if (!strnicmp(ext+1, "colormx=", 10)) {
+			colormx = gf_cicp_parse_color_matrix(ext+11);
+			if (colormx==-1) {
+				e = GF_BAD_PARAM;
+				GOTO_EXIT("invalid format for colormx")
+			}
 		}
 		else if (!strnicmp(ext+1, "tc=", 3)) {
 			char *tc_str = ext+4;
+			
 			if (tc_str[0] == 'd') {
 				tc_drop_frame=GF_TRUE;
 				tc_str+=1;
@@ -760,9 +1228,12 @@
 				tc_h = tc_m = tc_s = 0;
 				tc_fps_den = 1;
 			} else {
-				fprintf(stderr, "Bad format %s for timecode, ignoring\n", ext+1);
+				M4_LOG(GF_LOG_ERROR, ("Bad format %s for timecode, ignoring\n", ext+1));
 			}
 		}
+		else if (!strnicmp(ext+1, "edits=", 6)) {
+			edits = gf_strdup(ext+7);
+		}
 		else if (!strnicmp(ext+1, "lastsampdur", 11)) {
 			has_last_sample_dur = GF_TRUE;
 			if (!strnicmp(ext+1, "lastsampdur=", 12)) {
@@ -773,13 +1244,25 @@
 				}
 			}
 		}
+		else if (!strnicmp(ext+1, "ID=", 3)) {
+			import.target_trackID = (u32) atoi(ext+4);
+		}
 		/*unrecognized, assume name has colon in it*/
 		else {
-			fprintf(stderr, "Unrecognized import option %s, ignoring\n", ext+1);
+			M4_LOG(GF_LOG_ERROR, ("Unrecognized import option %s, ignoring\n", ext+1));
 			if (ext2) ext2[0] = ':';
 			ext = ext2;
 			continue;
 		}
+		if (src_is_isom) {
+			char *opt = ext+1;
+			char *sep_eq = strchr(opt, '=');
+			if (sep_eq) sep_eq[0] = 0;
+			if (!mp4box_check_isom_fileopt(opt)) {
+				M4_LOG(GF_LOG_ERROR, ("\t! Import option `%s` not available for ISOBMFF/QT sources, ignoring !\n", ext+1));
+			}
+			if (sep_eq) sep_eq[0] = '=';
+		}
 
 		if (ext2) ext2[0] = ':';
 
@@ -792,10 +1275,9 @@
 	}
 
 	/*check duration import (old syntax)*/
-	ext = strrchr(szName, '%');
+	ext = strrchr(final_name, '%');
 	if (ext) {
-		import.duration.num = (u32) (atof(ext+1) * 1000000);
-		import.duration.den = 1000000;
+		gf_parse_frac(ext+1, &import.duration);
 		ext[0] = 0;
 	}
 
@@ -804,20 +1286,29 @@
 	track_id = prog_id = 0;
 	do_all = 1;
 
-	ext_start = gf_file_ext_start(szName);
-	ext = strrchr(ext_start ? ext_start : szName, '#');
+	ext_start = gf_file_ext_start(final_name);
+	ext = strrchr(ext_start ? ext_start : final_name, '#');
 	if (ext) ext[0] = 0;
 
-	if (ext) {
+	if (fake_import && ext) {
 		ext++;
-		char *sep = gf_url_colon_suffix(ext);
+		if (!strnicmp(ext, "audio", 5)) do_audio = 1;
+		else if (!strnicmp(ext, "video", 5)) do_video = 1;
+		else if (!strnicmp(ext, "auxv", 4)) do_auxv = 1;
+		else if (!strnicmp(ext, "pict", 4)) do_pict = 1;
+		else if (!strnicmp(ext, "trackID=", 8)) track_id = atoi(&ext[8]);
+		else track_id = atoi(ext);
+	}
+	else if (ext) {
+		ext++;
+		char *sep = gf_url_colon_suffix(ext, '=');
 		if (sep) sep[0] = 0;
 
 		//we have a fragment, we need to check if the track or the program is present in source
-		import.in_name = szName;
+		import.in_name = final_name;
 		import.flags = GF_IMPORT_PROBE_ONLY;
 		e = gf_media_import(&import);
-		if (e) goto exit;
+		GOTO_EXIT("importing import");
 
 		if (!strnicmp(ext, "audio", 5)) do_audio = 1;
 		else if (!strnicmp(ext, "video", 5)) do_video = 1;
@@ -866,7 +1357,7 @@
 				}
 			}
 			if (!track_id || !found) {
-				fprintf(stderr, "Cannot find track ID matching fragment #%s\n", ext);
+				M4_LOG(GF_LOG_ERROR, ("Cannot find track ID matching fragment #%s\n", ext));
 				if (sep) sep[0] = ':';
 				e = GF_NOT_FOUND;
 				goto exit;
@@ -921,8 +1412,8 @@
 	check_track_for_svc = check_track_for_lhvc = check_track_for_hevc = 0;
 
 	source_magic = (u64) gf_crc_32((u8 *)inName, (u32) strlen(inName));
-	if (!fsess || mux_args_if_first_pass) {
-		import.in_name = szName;
+	if (!fake_import && (!fsess || mux_args_if_first_pass)) {
+		import.in_name = final_name;
 		import.dest = dest;
 		import.video_fps = force_fps;
 		import.frames_per_sample = frames_per_sample;
@@ -935,6 +1426,16 @@
 		import.source_magic = source_magic;
 		import.track_index = tk_idx;
 
+		//if moov timescale is <0 (auto mode) set it at import time
+		if (moov_timescale<0) {
+			import.moov_timescale = moov_timescale;
+		}
+		//otherwise force it now
+		else if (moov_timescale>0) {
+			e = gf_isom_set_timescale(dest, moov_timescale);
+			GOTO_EXIT("changing timescale")
+		}
+
 		import.run_in_session = fsess;
 		import.update_mux_args = NULL;
 		if (do_all)
@@ -943,12 +1444,14 @@
 		e = gf_media_import(&import);
 		if (e) {
 			if (import.update_mux_args) gf_free(import.update_mux_args);
-			goto exit;
+			GOTO_EXIT("importing media");
 		}
 
 		if (fsess) {
 			*mux_args_if_first_pass = import.update_mux_args;
 			import.update_mux_args = NULL;
+			*mux_sid_if_first_pass = import.update_mux_sid;
+			import.update_mux_sid = NULL;
 			goto exit;
 		}
 	}
@@ -956,74 +1459,112 @@
 	nb_tracks = gf_isom_get_track_count(dest);
 	for (i=0; i<nb_tracks; i++) {
 		u32 media_type;
-		u64 tk_source_magic;
 		track = i+1;
-		tk_source_magic = gf_isom_get_track_magic(dest, track);
-
-		if ((tk_source_magic & 0xFFFFFFFFUL) != source_magic)
-			continue;
-		tk_source_magic>>=32;
-		
-		keep_handler = (tk_source_magic & 1) ? GF_TRUE : GF_FALSE;
-
 		media_type = gf_isom_get_media_type(dest, track);
+		e = GF_OK;
+		if (!fake_import) {
+			u64 tk_source_magic;
+			tk_source_magic = gf_isom_get_track_magic(dest, track);
 
-		if (moov_timescale) {
-			if (moov_timescale<0) moov_timescale = gf_isom_get_media_timescale(dest, track);
-			gf_isom_set_timescale(dest, moov_timescale);
-			moov_timescale = 0;
+			if ((tk_source_magic & 0xFFFFFFFFUL) != source_magic)
+				continue;
+			tk_source_magic>>=32;		
+			keep_handler = (tk_source_magic & 1) ? GF_TRUE : GF_FALSE;
+		} else {
+			keep_handler = GF_TRUE;
+
+			if (do_audio && (media_type!=GF_ISOM_MEDIA_AUDIO)) continue;
+			if (do_video && (media_type!=GF_ISOM_MEDIA_VISUAL)) continue;
+			if (do_auxv && (media_type!=GF_ISOM_MEDIA_AUXV)) continue;
+			if (do_pict && (media_type!=GF_ISOM_MEDIA_PICT)) continue;
+			if (track_id && (gf_isom_get_track_id(dest, track) != track_id))
+				continue;
 		}
 
 		timescale = gf_isom_get_timescale(dest);
-		if (szLan) gf_isom_set_media_language(dest, track, (char *) szLan);
-		if (disable) gf_isom_set_track_enabled(dest, track, GF_FALSE);
-
- if (import_flags & GF_IMPORT_NO_EDIT_LIST)
-			gf_isom_remove_edits(dest, track);
+		if (szLan) {
+			e = gf_isom_set_media_language(dest, track, (char *) szLan);
+			GOTO_EXIT("changing language")
+		}
+		if (do_disable) {
+			e = gf_isom_set_track_enabled(dest, track, (do_disable==2) ? GF_TRUE : GF_FALSE);
+			GOTO_EXIT("disabling track")
+		}
+		if (track_flags_mode) {
+			e = gf_isom_set_track_flags(dest, track, track_flags, track_flags_mode);
+			GOTO_EXIT("disabling track")
+		}
 
-		if (delay) {
+		if (import_flags & GF_IMPORT_NO_EDIT_LIST) {
+			e = gf_isom_remove_edits(dest, track);
+			GOTO_EXIT("removing edits")
+		}
+		if (delay.num && delay.den) {
 			u64 tk_dur;
-			gf_isom_remove_edits(dest, track);
+			e = gf_isom_remove_edits(dest, track);
 			tk_dur = gf_isom_get_track_duration(dest, track);
-			if (delay>0) {
-				gf_isom_append_edit(dest, track, (timescale*delay)/1000, 0, GF_ISOM_EDIT_EMPTY);
-				gf_isom_append_edit(dest, track, tk_dur, 0, GF_ISOM_EDIT_NORMAL);
+			if (delay.num>0) {
+				//cast to s64, timescale*delay could be quite large before /1000
+				e |= gf_isom_append_edit(dest, track, ((s64) delay.num) * timescale / delay.den, 0, GF_ISOM_EDIT_EMPTY);
+				e |= gf_isom_append_edit(dest, track, tk_dur, 0, GF_ISOM_EDIT_NORMAL);
 			} else {
-				u64 to_skip = (timescale*(-delay))/1000;
+					//cast to s64, timescale*delay could be quite large before /1000
+				u64 to_skip = ((s64) -delay.num) * timescale / delay.den;
 				if (to_skip<tk_dur) {
-					u64 media_time = (-delay)*gf_isom_get_media_timescale(dest, track) / 1000;
-					gf_isom_append_edit(dest, track, tk_dur-to_skip, media_time, GF_ISOM_EDIT_NORMAL);
+					//cast to s64, timescale*delay could be quite large before /1000
+					u64 media_time = ((s64) -delay.num) * gf_isom_get_media_timescale(dest, track) / delay.den;
+					e |= gf_isom_append_edit(dest, track, tk_dur-to_skip, media_time, GF_ISOM_EDIT_NORMAL);
 				} else {
-					fprintf(stderr, "Warning: request negative delay longer than track duration - ignoring\n");
+					M4_LOG(GF_LOG_ERROR, ("Warning: request negative delay longer than track duration - ignoring\n"));
 				}
 			}
+			GOTO_EXIT("assigning delay")
 		}
 		if (gf_isom_is_video_handler_type(media_type)) {
 			if (((par_n>=0) && (par_d>=0)) || force_par) {
 				e = gf_media_change_par(dest, track, par_n, par_d, force_par, rewrite_bs);
+				GOTO_EXIT("changing PAR")
+			}
+			if ((fullrange>=0) || (videofmt>=0) || (colorprim>=0) || (colortfc>=0) || (colormx>=0)) {
+				e = gf_media_change_color(dest, i+1, fullrange, videofmt, colorprim, colortfc, colormx);
+				GOTO_EXIT("changing color in bitstream")
 			}
 			if (has_clap) {
 				e = gf_isom_set_clean_aperture(dest, track, 1, clap_wn, clap_wd, clap_hn, clap_hd, clap_hon, clap_hod, clap_von, clap_vod);
+				GOTO_EXIT("changing clean aperture")
 			}
 			if (bitdepth) {
-				gf_isom_set_visual_bit_depth(dest, track, 1, bitdepth);
+				e = gf_isom_set_visual_bit_depth(dest, track, 1, bitdepth);
+				GOTO_EXIT("changing bit depth")
 			}
 			if (clr_type) {
-				gf_isom_set_visual_color_info(dest, track, 1, clr_type, clr_prim, clr_tranf, clr_mx, clr_full_range, icc_data, icc_size);
+				if (clr_type==(u32)-1)
+					clr_type = 0;
+
+				e = gf_isom_set_visual_color_info(dest, track, 1, clr_type, clr_prim, clr_tranf, clr_mx, clr_full_range, icc_data, icc_size);
+				GOTO_EXIT("changing color info")
 			}
-			if (dv_profile) {
-				gf_isom_set_dolby_vision_profile(dest, track, 1, dv_profile);
+			if (hdr_file) {
+				e = parse_high_dynamc_range_xml_desc(dest, track, hdr_file);
+				GOTO_EXIT("setting HDR info")
+			}
+			if (dv_profile[0]) {
+				e = set_dv_profile(dest, track, dv_profile);
+				GOTO_EXIT("setting DV profile")
 			}
 
 			if (set_ccst) {
-				gf_isom_set_image_sequence_coding_constraints(dest, track, 1, GF_FALSE, GF_FALSE, GF_TRUE, 15);
+				e = gf_isom_set_image_sequence_coding_constraints(dest, track, 1, GF_FALSE, GF_FALSE, GF_TRUE, 15);
+				GOTO_EXIT("setting image sequence constraints")
 			}
 		}
 		if (has_mx) {
 			e = gf_isom_set_track_matrix(dest, track, mx);
+			GOTO_EXIT("setting track matrix")
 		}
 		if (use_stz2) {
 			e = gf_isom_use_compact_size(dest, track, GF_TRUE);
+			GOTO_EXIT("setting compact size")
 		}
 
 		if (gf_isom_get_media_subtype(dest, track, 1) == GF_ISOM_MEDIA_TIMECODE) {
@@ -1031,9 +1572,12 @@
 		}
 		if (rap_only || refs_only) {
 			e = gf_media_remove_non_rap(dest, track, refs_only);
-			if (e) goto exit;
+			GOTO_EXIT("removing non RAPs")
+		}
+		if (handler_name) {
+			e = gf_isom_set_handler_name(dest, track, handler_name);
+			GOTO_EXIT("setting handler name")
 		}
-		if (handler_name) gf_isom_set_handler_name(dest, track, handler_name);
 		else if (!keep_handler) {
 			char szHName[1024];
 			const char *fName = gf_url_get_resource_name((const char *)inName);
@@ -1042,85 +1586,124 @@
 			else fName = "?";
 
 			sprintf(szHName, "%s@GPAC%s", fName, gf_gpac_version());
-			gf_isom_set_handler_name(dest, track, szHName);
+			e = gf_isom_set_handler_name(dest, track, szHName);
+			GOTO_EXIT("setting handler name")
+		}
+		if (handler) {
+			e = gf_isom_set_media_type(dest, track, handler);
+			GOTO_EXIT("setting media type")
 		}
-		if (handler) gf_isom_set_media_type(dest, track, handler);
-
 		if (group) {
-			gf_isom_set_alternate_group_id(dest, track, group);
+			e = gf_isom_set_alternate_group_id(dest, track, group);
+			GOTO_EXIT("setting alternate group")
 		}
 
 		if (track_layout) {
-			gf_isom_set_track_layout_info(dest, track, tw<<16, th<<16, tx<<16, ty<<16, 0);
+			e = gf_isom_set_track_layout_info(dest, track, tw<<16, th<<16, tx<<16, ty<<16, tz);
+			GOTO_EXIT("setting track layout")
+		}
+		if (stype) {
+			e = gf_isom_set_media_subtype(dest, track, 1, stype);
+			GOTO_EXIT("setting media subtype")
 		}
-		if (stype)
-			gf_isom_set_media_subtype(dest, track, 1, stype);
-
 		if (is_chap && chap_ref) {
-			set_chapter_track(dest, track, chap_ref);
+			e = set_chapter_track(dest, track, chap_ref);
+			GOTO_EXIT("setting chapter track")
 		}
 
-
 		for (j = 0; j < gf_list_count(kinds); j+=2) {
 			char *kind_scheme = (char *)gf_list_get(kinds, j);
 			char *kind_value = (char *)gf_list_get(kinds, j+1);
-			gf_isom_add_track_kind(dest, i+1, kind_scheme, kind_value);
+			e = gf_isom_add_track_kind(dest, i+1, kind_scheme, kind_value);
+			GOTO_EXIT("setting track kind")
 		}
 
-		if (profile || level)
-			gf_media_change_pl(dest, track, profile, level);
-
+		if (profile || compat || level) {
+			e = gf_media_change_pl(dest, track, profile, compat, level);
+			GOTO_EXIT("changing video PL")
+		}
 		if (gf_isom_get_mpeg4_subtype(dest, track, 1))
 			keep_sys_tracks = 1;
 
+		//if moov timescale is <0 (auto mode) set it at import time
+		if (fake_import) {
+			if (import_flags & GF_IMPORT_NO_EDIT_LIST)
+				gf_isom_remove_edits(dest, track);
+
+			if (moov_timescale<0) {
+				moov_timescale = gf_isom_get_media_timescale(dest, track);
+			}
+			if (moov_timescale>0) {
+				e = gf_isom_set_timescale(dest, moov_timescale);
+				GOTO_EXIT("changing timescale")
+			}
+
+			if (import.asemode && (media_type==GF_ISOM_MEDIA_AUDIO)) {
+				u32 sr, ch, bps;
+				gf_isom_get_audio_info(dest, track, 1, &sr, &ch, &bps);
+				gf_isom_set_audio_info(dest, track, 1, sr, ch, bps, import.asemode);
+			}
+		}
+
+		if (roll_change) {
+			if ((roll_change!=3) || (media_type==GF_ISOM_MEDIA_AUDIO)) {
+				e = gf_isom_set_sample_roll_group(dest, track, (u32) -1, (roll_change==2) ? GF_ISOM_SAMPLE_PREROLL : GF_ISOM_SAMPLE_ROLL, roll);
+				GOTO_EXIT("assigning roll")
+			}
+		}
+
 		if (new_timescale>1) {
-			gf_isom_set_media_timescale(dest, track, new_timescale, 0, 0);
+			e = gf_isom_set_media_timescale(dest, track, new_timescale, 0, 0);
+			GOTO_EXIT("setting media timescale")
 		}
 
 		if (rescale_num > 1) {
 			switch (gf_isom_get_media_type(dest, track)) {
 			case GF_ISOM_MEDIA_AUDIO:
-				fprintf(stderr, "Cannot force media timescale for audio media types - ignoring\n");
-				break;
+				if (!rescale_override) {
+					M4_LOG(GF_LOG_WARNING, ("Cannot force media timescale for audio media types - ignoring\n"));
+					break;
+				}
 			default:
-				e = gf_isom_set_media_timescale(dest, track, rescale_num, rescale_den, 1);
+				e = gf_isom_set_media_timescale(dest, track, rescale_num, rescale_den, rescale_override ? 2 : 1);
 if (e==GF_EOS) {
-					fprintf(stderr, "Rescale ignored, same config in source file\n");
+					M4_LOG(GF_LOG_WARNING, ("Rescale ignored, same config in source file\n"));
 					e = GF_OK;
-				} else if (e) {
-					fprintf(stderr, "Error rescaling media track %d\n", track);
-					goto exit;
 				}
+				GOTO_EXIT("rescaling media track")
 				break;
 			}
 		}
 
- if (has_last_sample_dur) {
-			gf_isom_set_last_sample_duration_ex(dest, track, last_sample_dur.num, last_sample_dur.den);
+		if (has_last_sample_dur) {
+			e = gf_isom_set_last_sample_duration_ex(dest, track, last_sample_dur.num, last_sample_dur.den);
+			GOTO_EXIT("setting last sample duration")
 		}
 		if (rvc_config) {
+#ifdef GPAC_DISABLE_ZLIB
+			M4_LOG(GF_LOG_ERROR, ("Error: no zlib support - RVC not available\n"));
+			e = GF_NOT_SUPPORTED;
+			goto exit;
+#else
 			u8 *data;
 			u32 size;
 			e = gf_file_load_data(rvc_config, (u8 **) &data, &size);
-			if (e) {
-				fprintf(stderr, "Error: failed to load rvc config from file: %s\n", gf_error_to_string(e) );
-			} else {
-#ifdef GPAC_DISABLE_ZLIB
-				fprintf(stderr, "Error: no zlib support - RVC not available\n");
-				e = GF_NOT_SUPPORTED;
-				gf_free(data);
-				goto exit;
-#else
-				gf_gz_compress_payload(&data, size, &size);
+			GOTO_EXIT("loading RVC config file")
+
+			gf_gz_compress_payload(&data, size, &size);
+			e |= gf_isom_set_rvc_config(dest, track, 1, 0, "application/rvc-config+xml+gz", data, size);
+			gf_free(data);
+			GOTO_EXIT("compressing and assigning RVC config")
 #endif
-				gf_isom_set_rvc_config(dest, track, 1, 0, "application/rvc-config+xml+gz", data, size);
-				gf_free(data);
-			}
 		} else if (rvc_predefined>0) {
-			gf_isom_set_rvc_config(dest, track, 1, rvc_predefined, NULL, NULL, 0);
+			e = gf_isom_set_rvc_config(dest, track, 1, rvc_predefined, NULL, NULL, 0);
+			GOTO_EXIT("setting RVC predefined config")
 		}
 
-		gf_isom_set_composition_offset_mode(dest, track, negative_cts_offset);
+		if (neg_ctts_mode) {
+			e = gf_isom_set_composition_offset_mode(dest, track, (neg_ctts_mode==1) ? GF_TRUE : GF_FALSE);
+			GOTO_EXIT("setting composition offset mode")
+		}
 
 		if (gf_isom_get_avc_svc_type(dest, track, 1)>=GF_ISOM_AVCTYPE_AVC_SVC)
 			check_track_for_svc = track;
@@ -1138,10 +1721,18 @@
 		}
 
 		if (txt_flags) {
-			gf_isom_text_set_display_flags(dest, track, 0, txt_flags, txt_mode);
+			e = gf_isom_text_set_display_flags(dest, track, 0, txt_flags, txt_mode);
+			GOTO_EXIT("setting text track display flags")
+		}
+
+		if (edits) {
+			e = apply_edits(dest, track, edits);
+			GOTO_EXIT("applying edits")
 		}
+
 		if (force_rate>=0) {
-			gf_isom_update_bitrate(dest, i+1, 1, force_rate, force_rate, 0);
+			e = gf_isom_update_bitrate(dest, i+1, 1, force_rate, force_rate, 0);
+			GOTO_EXIT("updating bitrate")
 		}
 
 		if (split_tile_mode) {
@@ -1165,6 +1756,7 @@
 		} else {
 			e = gf_isom_add_chapter(dest, 0, 0, chapter_name);
 		}
+		GOTO_EXIT("importing chapters")
 	}
 
 	if (tmcd_track) {
@@ -1178,7 +1770,8 @@
 			default:
 				continue;
 			}
-			gf_isom_set_track_reference(dest, i+1, GF_ISOM_REF_TMCD, tmcd_id);
+			e = gf_isom_set_track_reference(dest, i+1, GF_ISOM_REF_TMCD, tmcd_id);
+			GOTO_EXIT("assigning TMCD track references")
 		}
 	}
 
@@ -1198,7 +1791,7 @@
 		{
 			e = gf_media_filter_hevc(dest, i, max_temporal_id_plus_one, max_layer_id_plus_one);
 			if (e) {
-				fprintf(stderr, "Warning: track ID %d: error while filtering LHVC layers\n", gf_isom_get_track_id(dest, i));
+				M4_LOG(GF_LOG_ERROR, ("Warning: track ID %d: error while filtering LHVC layers\n", gf_isom_get_track_id(dest, i)));
 				e = GF_OK;
 			}
 		}
@@ -1208,10 +1801,10 @@
 	if (check_track_for_svc) {
 		if (svc_mode) {
 			e = gf_media_split_svc(dest, check_track_for_svc, (svc_mode==2) ? 1 : 0);
-			if (e) goto exit;
+			GOTO_EXIT("splitting SVC track")
 		} else {
 			e = gf_media_merge_svc(dest, check_track_for_svc, 1);
-			if (e) goto exit;
+			GOTO_EXIT("merging SVC/SHVC track")
 		}
 	}
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -1221,7 +1814,7 @@
 			if (svc_mode==3) xmode = GF_LHVC_EXTRACTORS_OFF;
 			else if (svc_mode==4) xmode = GF_LHVC_EXTRACTORS_OFF_FORCE_INBAND;
 			e = gf_media_split_lhvc(dest, check_track_for_lhvc, GF_FALSE, (svc_mode==1) ? 0 : 1, xmode );
-			if (e) goto exit;
+			GOTO_EXIT("splitting L-HEVC track")
 		} else {
 			//TODO - merge, temporal sublayers
 		}
@@ -1230,12 +1823,12 @@
 	if (check_track_for_hevc) {
 		if (split_tile_mode) {
 			e = gf_media_split_hevc_tiles(dest, split_tile_mode - 1);
-			if (e) goto exit;
+			GOTO_EXIT("splitting HEVC tiles")
 		}
 		if (temporal_mode) {
 			GF_LHVCExtractoreMode xmode = (temporal_mode==3) ? GF_LHVC_EXTRACTORS_OFF : GF_LHVC_EXTRACTORS_ON;
 			e = gf_media_split_lhvc(dest, check_track_for_hevc, GF_TRUE, (temporal_mode==1) ? GF_FALSE : GF_TRUE, xmode );
-			if (e) goto exit;
+			GOTO_EXIT("splitting HEVC temporal sublayers")
 		}
 	}
 #endif
@@ -1255,12 +1848,11 @@
 		tmcd_tk = gf_isom_new_track(dest, 0, GF_ISOM_MEDIA_TIMECODE, tc_fps_num);
 		if (!tmcd_tk) {
 			e = gf_isom_last_error(dest);
-			goto exit;
+			GOTO_EXIT("creating TMCD track")
 		}
-		e = gf_isom_set_track_enabled(import.dest, tmcd_tk, 1);
+		e = gf_isom_set_track_enabled(dest, tmcd_tk, 1);
 		if (e != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_track_enabled\n", gf_error_to_string(e)));
-			goto exit;
+			GOTO_EXIT("enabling TMCD track")
 		}
 
 		if (!tc_frames_per_tick) {
@@ -1272,12 +1864,13 @@
 
 		u32 tmcd_value = (tc_h * 3600 + tc_m*60 + tc_s)*tc_frames_per_tick+tc_f;
 		tmcd_id = gf_isom_get_track_id(dest, tmcd_tk);
-		e = gf_isom_tmcd_config_new(dest, tmcd_tk, tc_fps_num, tc_fps_den, tc_frames_per_tick, tc_drop_frame, tc_force_counter, &desc_index);
 
-		if (e) goto exit;
+		e = gf_isom_tmcd_config_new(dest, tmcd_tk, tc_fps_num, tc_fps_den, tc_frames_per_tick, tc_drop_frame, tc_force_counter, &desc_index);
+		GOTO_EXIT("configuring TMCD sample description")
 
 		if (video_ref) {
-			gf_isom_set_track_reference(dest, video_ref, GF_ISOM_REF_TMCD, tmcd_id);
+			e = gf_isom_set_track_reference(dest, video_ref, GF_ISOM_REF_TMCD, tmcd_id);
+			GOTO_EXIT("assigning TMCD track ref on video track")
 		}
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		gf_bs_write_u32(bs, tmcd_value);
@@ -1287,15 +1880,17 @@
 		gf_bs_del(bs);
 		e = gf_isom_add_sample(dest, tmcd_tk, desc_index, samp);
 		gf_isom_sample_del(&samp);
+		GOTO_EXIT("assigning TMCD sample")
 
 		if (video_ref) {
 			u64 video_ref_dur = gf_isom_get_media_duration(dest, video_ref);
 			video_ref_dur *= tc_fps_num;
 			video_ref_dur /= gf_isom_get_media_timescale(dest, video_ref);
-			gf_isom_set_last_sample_duration(dest, tmcd_tk, (u32) video_ref_dur);
+			e = gf_isom_set_last_sample_duration(dest, tmcd_tk, (u32) video_ref_dur);
 		} else {
-			gf_isom_set_last_sample_duration(dest, tmcd_tk, tc_fps_den ? tc_fps_den : 1);
+			e = gf_isom_set_last_sample_duration(dest, tmcd_tk, tc_fps_den ? tc_fps_den : 1);
 		}
+		GOTO_EXIT("setting TMCD sample dur")
 	}
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
@@ -1309,6 +1904,7 @@
 	if (opt_src) opt_src[0] = ':';
 	if (opt_dst) opt_dst[0] = ':';
 	if (fchain) fchain[0] = ':';
+	if (hdr_file) gf_free(hdr_file);
 
 	gf_list_del(kinds);
 	if (handler_name) gf_free(handler_name);
@@ -1317,34 +1913,62 @@
 	if (import.streamFormat) gf_free(import.streamFormat);
 	if (import.force_ext) gf_free(import.force_ext);
 	if (rvc_config) gf_free(rvc_config);
+	if (edits) gf_free(edits);
 	if (szLan) gf_free((char *)szLan);
 	if (icc_data) gf_free(icc_data);
+	if (final_name) gf_free(final_name);
+
+	if (!e) return GF_OK;
+	if (fail_msg) {
+		M4_LOG(GF_LOG_ERROR, ("Failure while %s: %s\n", fail_msg, gf_error_to_string(e) ));
+	}
 	return e;
 }
 
+typedef struct
+{
+	Double progress;
+	u32 file_idx;
+} SplitInfo;
 
 static Bool on_split_event(void *_udta, GF_Event *evt)
 {
 	Double progress;
-	u32 *prev_progress = (u32 *)_udta;
+	SplitInfo *sinfo = (SplitInfo *)_udta;
 	if (!_udta) return GF_FALSE;
 	if (evt->type != GF_EVENT_PROGRESS) return GF_FALSE;
 	if (!evt->progress.total) return GF_FALSE;
 
 	progress = (Double) (100*evt->progress.done) / evt->progress.total;
-	if ((u32) progress==*prev_progress)
+	if (progress <= sinfo->progress)
 		return GF_FALSE;
 
-	*prev_progress = (u32) progress;
+	if (evt->progress.done == evt->progress.total) {
+		if (sinfo->progress <= 0)
+			return GF_FALSE;
 #ifndef GPAC_DISABLE_LOG
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Spliting: % 2.2f %%\r", progress));
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("splitting: file %d done\n", sinfo->file_idx));
 #else
-	fprintf(stderr, "Spliting: % 2.2f %%\r", progress);
+		fprintf(stderr, "splitting: file %d done\n", sinfo->file_idx);
 #endif
+		sinfo->file_idx++;
+		sinfo->progress = -1;
+	} else {
+		sinfo->progress = progress;
+#ifndef GPAC_DISABLE_LOG
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("splitting: % 2.2f %%\r", progress));
+#else
+		fprintf(stderr, "splitting: % 2.2f %%\r", progress);
+#endif
+	}
 	return GF_FALSE;
 }
 
-GF_Err split_isomedia_file(GF_ISOFile *mp4, Double split_dur, u64 split_size_kb, char *inName, Double InterleavingTime, Double chunk_start_time, Bool adjust_split_end, char *outName, const char *tmpdir, Bool force_rap_split, const char *split_range_str)
+extern u32 do_flat;
+extern Bool do_frag;
+extern Double interleaving_time;
+
+GF_Err split_isomedia_file(GF_ISOFile *mp4, Double split_dur, u64 split_size_kb, char *inName, Double InterleavingTime, Double chunk_start_time, u32 adjust_split_end, char *outName, Bool force_rap_split, const char *split_range_str, u32 fs_dump_flags)
 {
 	Bool chunk_extraction, rap_split, split_until_end;
 	GF_Err e;
@@ -1353,7 +1977,10 @@
 	char *filter_args = NULL;
 	GF_FilterSession *fs;
 	GF_Filter *src, *reframe, *dst;
-	u32 progress = (u32) -1;
+	SplitInfo sinfo;
+
+	sinfo.progress = -1;
+	sinfo.file_idx = 1;
 
 	chunk_extraction = (chunk_start>=0) ? GF_TRUE : GF_FALSE;
 	if (split_range_str)
@@ -1376,16 +2003,16 @@
 
 	fs = gf_fs_new_defaults(0);
 	if (!fs) {
-		fprintf(stderr, "Failed to load filter session, aborting\n");
+		M4_LOG(GF_LOG_ERROR, ("Failed to load filter session, aborting\n"));
 		return GF_IO_ERR;
 	}
 
-
-	sprintf(szArgs, "mp4dmx:mov=%p", mp4);
+	//load source with all tracks processing
+	sprintf(szArgs, "mp4dmx:mov=%p:alltk", mp4);
 	src = gf_fs_load_filter(fs, szArgs, &e);
 
 	if (!src) {
-		fprintf(stderr, "Failed to load source filter: %s\n", gf_error_to_string(e) );
+		M4_LOG(GF_LOG_ERROR, ("Failed to load source filter: %s\n", gf_error_to_string(e) ));
 		gf_fs_del(fs);
 		return e;
 	}
@@ -1402,13 +2029,52 @@
 		sprintf(szArgs, ":xs=S"LLU"k", split_size_kb);
 		gf_dynstrcat(&filter_args, szArgs, NULL);
 	} else if (chunk_extraction) {
-		gf_dynstrcat(&filter_args, ":xround=closest", NULL);
+		//we adjust end: start at the iframe at or after requested time and use xadjust (move end to next I-frame)
+		//so that two calls with X:Y and Y:Z have the same Y boundary
+		if (adjust_split_end==1) {
+			gf_dynstrcat(&filter_args, ":xadjust:xround=after", NULL);
+		} else if (adjust_split_end==2) {
+			gf_dynstrcat(&filter_args, ":xadjust:xround=before", NULL);
+		} else if (adjust_split_end==3) {
+			gf_dynstrcat(&filter_args, ":xround=seek", NULL);
+		} else if (!gf_sys_find_global_arg("xround")) {
+			gf_dynstrcat(&filter_args, ":xround=closest", NULL);
+		}
+		if (!adjust_split_end || (adjust_split_end==3)) {
+			if (!gf_sys_find_global_arg("probe_ref")) {
+				gf_dynstrcat(&filter_args, ":probe_ref", NULL);
+			}
+		}
+
 		if (split_range_str) {
+			Bool is_time = GF_FALSE;
+			char c;
+			//S-E syntax
 			char *end = (char *) strchr(split_range_str, '-');
-			assert(end);
+			if (!end) {
+				//S:E syntax
+				end = (char *) strchr(split_range_str, ':');
+				//if another `:` assume time format
+				if (end && strchr(end+1, ':'))
+					is_time = GF_TRUE;
+			} else if (strchr(split_range_str, ':')) {
+				is_time = GF_TRUE;
+			}
+			if (!end) {
+				gf_free(filter_args);
+				M4_LOG(GF_LOG_ERROR, ("Invalid range specifer %s, expecting START-END or START:END\n", split_range_str ));
+				gf_fs_del(fs);
+				return GF_BAD_PARAM;
+			}
+
+			c = end[0];
 			end[0] = 0;
-			sprintf(szArgs, ":xs=T%s:xe=T%s", split_range_str, end+1);
-			end[0] = '-';
+			if (is_time) {
+				sprintf(szArgs, ":xs=T%s:xe=T%s", split_range_str, end+1);
+			} else {
+				sprintf(szArgs, ":xs=%s:xe=%s", split_range_str, end+1);
+			}
+			end[0] = c;
 		} else if (split_until_end) {
 			Double end=0;
 			if (split_dur<-2) {
@@ -1427,9 +2093,6 @@
 			sprintf(szArgs, ":xs=%u/1000:xe=%u/1000", (u32) (chunk_start*1000), (u32) ((chunk_start+split_dur) * 1000) );
 		}
 		gf_dynstrcat(&filter_args, szArgs, NULL);
-		if (adjust_split_end) {
-			gf_dynstrcat(&filter_args, ":xadjust", NULL);
-		}
 		if (!outName) {
 			sprintf(szFile, "%s_$FS$", szName);
 		}
@@ -1442,14 +2105,15 @@
 	} else {
 		gf_fs_del(fs);
 		gf_free(filter_args);
-		fprintf(stderr, "Unrecognized split syntax\n");
+		M4_LOG(GF_LOG_ERROR, ("Unrecognized split syntax\n"));
 		return GF_BAD_PARAM;
 	}
 
 	reframe = gf_fs_load_filter(fs, filter_args, &e);
 	gf_free(filter_args);
+	filter_args = NULL;
 	if (!reframe) {
-		fprintf(stderr, "Failed to load reframer filter: %s\n", gf_error_to_string(e) );
+		M4_LOG(GF_LOG_ERROR, ("Failed to load reframer filter: %s\n", gf_error_to_string(e) ));
 		gf_fs_del(fs);
 		return e;
 	}
@@ -1459,9 +2123,42 @@
 	} else {
 		strcpy(szFile, outName);
 	}
+	if (gf_dir_exists(szFile)) {
+		char c = szFile[strlen(szFile)-1];
+		if ((c!='/') && (c!='\\'))
+			strcat(szFile, "/");
+
+		strcat(szFile, szName);
+		strcat(szFile, "_$num%03d$.mp4");
+		M4_LOG(GF_LOG_WARNING, ("Split output is a directory, will use template %s\n", szFile));
+	}
+	else if (split_size_kb || split_dur) {
+		if (!strchr(szFile, '$') && (stricmp(szFile, "null") || !strcmp(szFile, "/dev/null")) ) {
+			char *sep = gf_file_ext_start(szFile);
+			if (sep) sep[0] = 0;
+			strcat(szFile, "_$num$.mp4");
+			M4_LOG(GF_LOG_WARNING, ("Split by %s but output not a template, using %s as output\n", split_size_kb ? "size" : "duration", szFile));
+		}
+	}
+	if (do_frag) {
+		sprintf(szArgs, ":cdur=%g", interleaving_time);
+		strcat(szFile, ":store=frag");
+		strcat(szFile, szArgs);
+	}
+	else if (do_flat==1) {
+		strcat(szFile, ":store=flat");
+	}
+	else if (do_flat || interleaving_time) {
+		if (do_flat==3) {
+			strcat(szFile, ":store=fstart");
+		}
+		sprintf(szArgs, ":cdur=%g", interleaving_time);
+		strcat(szFile, szArgs);
+	}
+
 	dst = gf_fs_load_destination(fs, szFile, NULL, NULL, &e);
 	if (!dst) {
-		fprintf(stderr, "Failed to load destination filter: %s\n", gf_error_to_string(e) );
+		M4_LOG(GF_LOG_ERROR, ("Failed to load destination filter: %s\n", gf_error_to_string(e) ));
 		gf_fs_del(fs);
 		return e;
 	}
@@ -1475,7 +2172,7 @@
 		&& !gf_sys_is_quiet()
 	) {
 		gf_fs_enable_reporting(fs, GF_TRUE);
-		gf_fs_set_ui_callback(fs, on_split_event, &progress);
+		gf_fs_set_ui_callback(fs, on_split_event, &sinfo);
 	}
 #ifdef GPAC_ENABLE_COVERAGE
 	else if (gf_sys_is_cov_mode()) {
@@ -1490,22 +2187,27 @@
 		if (e>=GF_OK)
 			e = gf_fs_get_last_process_error(fs);
 	}
+	gf_fs_print_non_connected(fs);
+	if (fs_dump_flags & 1) gf_fs_print_stats(fs);
+	if (fs_dump_flags & 2) gf_fs_print_connections(fs);
+
 	gf_fs_del(fs);
+	
 	if (e<GF_OK)
-		fprintf(stderr, "Split failed: %s\n", gf_error_to_string(e) );
+		M4_LOG(GF_LOG_ERROR, ("Split failed: %s\n", gf_error_to_string(e) ));
 	return e;
 }
 
-GF_Err cat_multiple_files(GF_ISOFile *dest, char *fileName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
+GF_Err cat_multiple_files(GF_ISOFile *dest, char *fileName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
 
 static Bool merge_parameter_set(GF_List *src, GF_List *dst, const char *name)
 {
 	u32 j, k;
 	for (j=0; j<gf_list_count(src); j++) {
 		Bool found = 0;
-		GF_AVCConfigSlot *slc = gf_list_get(src, j);
+		GF_NALUFFParam *slc = gf_list_get(src, j);
 		for (k=0; k<gf_list_count(dst); k++) {
-			GF_AVCConfigSlot *slc_dst = gf_list_get(dst, k);
+			GF_NALUFFParam *slc_dst = gf_list_get(dst, k);
 			if ( (slc->size==slc_dst->size) && !memcmp(slc->data, slc_dst->data, slc->size) ) {
 				found = 1;
 				break;
@@ -1518,9 +2220,10 @@
 	return GF_TRUE;
 }
 
-static u32 merge_avc_config(GF_ISOFile *dest, u32 tk_id, GF_ISOFile *orig, u32 src_track, Bool force_cat)
+static u32 merge_avc_config(GF_ISOFile *dest, u32 tk_id, GF_ISOFile **o_orig, u32 src_track, Bool force_cat, u32 *orig_nal_len, u32 *dst_nal_len)
 {
 	GF_AVCConfig *avc_src, *avc_dst;
+	GF_ISOFile *orig = *o_orig;
 	u32 dst_tk = gf_isom_get_track_by_id(dest, tk_id);
 
 	avc_src = gf_isom_avc_config_get(orig, src_track, 1);
@@ -1537,7 +2240,8 @@
 			gf_media_nal_rewrite_samples(dest, dst_tk, 8*avc_src->nal_unit_size);
 			avc_dst->nal_unit_size = avc_src->nal_unit_size;
 		} else if (avc_src->nal_unit_size < avc_dst->nal_unit_size) {
-			gf_media_nal_rewrite_samples(orig, src_track, 8*avc_dst->nal_unit_size);
+			*orig_nal_len = avc_src->nal_unit_size;
+			*dst_nal_len = avc_dst->nal_unit_size;
 		}
 
 		/*merge PS*/
@@ -1558,17 +2262,18 @@
 		if (!force_cat) {
 			gf_isom_avc_set_inband_config(dest, dst_tk, 1, GF_FALSE);
 		} else {
-			fprintf(stderr, "WARNING: Concatenating track ID %d even though sample descriptions do not match\n", tk_id);
+			M4_LOG(GF_LOG_WARNING, ("WARNING: Concatenating track ID %d even though sample descriptions do not match\n", tk_id));
 		}
 	}
 	return dst_tk;
 }
 
 #ifndef GPAC_DISABLE_HEVC
-static u32 merge_hevc_config(GF_ISOFile *dest, u32 tk_id, GF_ISOFile *orig, u32 src_track, Bool force_cat)
+static u32 merge_hevc_config(GF_ISOFile *dest, u32 tk_id, GF_ISOFile **o_orig, u32 src_track, Bool force_cat, u32 *orig_nal_len, u32 *dst_nal_len)
 {
 	u32 i;
 	GF_HEVCConfig *hevc_src, *hevc_dst;
+	GF_ISOFile *orig = *o_orig;
 	u32 dst_tk = gf_isom_get_track_by_id(dest, tk_id);
 
 	hevc_src = gf_isom_hevc_config_get(orig, src_track, 1);
@@ -1583,15 +2288,16 @@
 			gf_media_nal_rewrite_samples(dest, dst_tk, 8*hevc_src->nal_unit_size);
 			hevc_dst->nal_unit_size = hevc_src->nal_unit_size;
 		} else if (hevc_src->nal_unit_size < hevc_dst->nal_unit_size) {
-			gf_media_nal_rewrite_samples(orig, src_track, 8*hevc_dst->nal_unit_size);
+			*orig_nal_len = hevc_src->nal_unit_size;
+			*dst_nal_len = hevc_dst->nal_unit_size;
 		}
 
 		/*merge PS*/
 		for (i=0; i<gf_list_count(hevc_src->param_array); i++) {
 			u32 k;
-			GF_HEVCParamArray *src_ar = gf_list_get(hevc_src->param_array, i);
+			GF_NALUFFParamArray *src_ar = gf_list_get(hevc_src->param_array, i);
 			for (k=0; k<gf_list_count(hevc_dst->param_array); k++) {
-				GF_HEVCParamArray *dst_ar = gf_list_get(hevc_dst->param_array, k);
+				GF_NALUFFParamArray *dst_ar = gf_list_get(hevc_dst->param_array, k);
 				if (dst_ar->type==src_ar->type) {
 					if (!merge_parameter_set(src_ar->nalus, dst_ar->nalus, "SPS"))
 						dst_tk = 0;
@@ -1612,22 +2318,63 @@
 		if (!force_cat) {
 			gf_isom_hevc_set_inband_config(dest, dst_tk, 1, GF_FALSE);
 		} else {
-			fprintf(stderr, "WARNING: Concatenating track ID %d even though sample descriptions do not match\n", tk_id);
+			M4_LOG(GF_LOG_WARNING, ("WARNING: Concatenating track ID %d even though sample descriptions do not match\n", tk_id));
 		}
 	}
 	return dst_tk;
 }
 #endif /*GPAC_DISABLE_HEVC */
 
-GF_Err cat_playlist(GF_ISOFile *dest, char *playlistName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
+static GF_Err rewrite_nal_size_field(GF_ISOSample *samp, u32 orig_nal_len, u32 dst_nal_len)
+{
+	GF_Err e = GF_OK;
+	u32 msize=0, remain = samp->dataLength;
+	GF_BitStream *oldbs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+	GF_BitStream *newbs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	u8 *buffer = NULL;
+
+	while (remain) {
+		u32 size = gf_bs_read_int(oldbs, orig_nal_len*8);
+		if (size > remain) {
+			e = GF_ISOM_INVALID_FILE;
+			goto exit;
+		}
+		gf_bs_write_int(newbs, size, dst_nal_len*8);
+		remain -= orig_nal_len;
+		if (size > msize) {
+			msize = size;
+			buffer = (u8*)gf_realloc(buffer, sizeof(u8)*msize);
+			if (!buffer) {
+				e = GF_OUT_OF_MEM;
+				goto exit;
+			}
+		}
+		gf_bs_read_data(oldbs, buffer, size);
+		gf_bs_write_data(newbs, buffer, size);
+		remain -= size;
+	}
+	gf_free(samp->data);
+	samp->data = NULL;
+	samp->dataLength = 0;
+	gf_bs_get_content(newbs, &samp->data, &samp->dataLength);
+
+exit:
+	gf_bs_del(newbs);
+	gf_bs_del(oldbs);
+	if (buffer) gf_free(buffer);
+	return e;
+}
 
-GF_Err cat_isomedia_file(GF_ISOFile *dest, char *fileName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command, Bool is_pl)
+
+GF_Err cat_playlist(GF_ISOFile *dest, char *playlistName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
+
+GF_Err cat_isomedia_file(GF_ISOFile *dest, char *fileName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, Bool force_cat, Bool align_timelines, Bool allow_add_in_command, Bool is_pl)
 {
 	u32 i, j, count, nb_tracks, nb_samp, nb_done;
 	GF_ISOFile *orig;
 	GF_Err e;
 	char *opts, *multi_cat;
-	Double ts_scale;
+	Double ts_scale, media_ts_scale;
 	Double dest_orig_dur;
 	u32 dst_tk, tk_id, mtype;
 	u64 insert_dts;
@@ -1635,37 +2382,46 @@
 	GF_ISOSample *samp;
 	GF_Fraction64 aligned_to_DTS_frac;
 
-	if (is_pl) return cat_playlist(dest, fileName, import_flags, force_fps, frames_per_sample, tmp_dir, force_cat, align_timelines, allow_add_in_command);
+	if (is_pl) return cat_playlist(dest, fileName, import_flags, force_fps, frames_per_sample, force_cat, align_timelines, allow_add_in_command);
 
 	if (strchr(fileName, '*') || (strchr(fileName, '@')) )
-		return cat_multiple_files(dest, fileName, import_flags, force_fps, frames_per_sample, tmp_dir, force_cat, align_timelines, allow_add_in_command);
+		return cat_multiple_files(dest, fileName, import_flags, force_fps, frames_per_sample, force_cat, align_timelines, allow_add_in_command);
 
 	multi_cat = allow_add_in_command ? strchr(fileName, '+') : NULL;
 	if (multi_cat) {
 		multi_cat[0] = 0;
 		multi_cat = &multi_cat[1];
 	}
-	opts = gf_url_colon_suffix(fileName);
 
+	opts = gf_url_colon_suffix(fileName, '=');
 	e = GF_OK;
 
 	/*if options are specified, reimport the file*/
-	is_isom = opts ? 0 : gf_isom_probe_file(fileName);
+	if (opts) opts[0] = 0;
+	is_isom = gf_isom_probe_file(fileName);
 
-	if (!is_isom || opts) {
-		orig = gf_isom_open("temp", GF_ISOM_WRITE_EDIT, tmp_dir);
-		e = import_file(orig, fileName, import_flags, force_fps, frames_per_sample, NULL, NULL, 0);
+	if (!is_isom || multi_cat) {
+		orig = gf_isom_open("temp", GF_ISOM_WRITE_EDIT, NULL);
+		if (opts) opts[0] = ':';
+		e = import_file(orig, fileName, import_flags, force_fps, frames_per_sample, NULL, NULL, NULL, 0);
 		if (e) return e;
 	} else {
-		/*we open the original file in edit mode since we may have to rewrite AVC samples*/
-		orig = gf_isom_open(fileName, GF_ISOM_OPEN_EDIT, tmp_dir);
+		//open read+edit mode to allow applying options on file
+		orig = gf_isom_open(fileName, GF_ISOM_OPEN_READ_EDIT, NULL);
+		if (opts) opts[0] = ':';
+		if (!orig) return gf_isom_last_error(NULL);
+
+		if (opts) {
+			e = import_file(orig, fileName, 0xFFFFFFFF, force_fps, frames_per_sample, NULL, NULL, NULL, 0);
+			if (e) return e;
+		}
 	}
 
 	while (multi_cat) {
 		char *sep = strchr(multi_cat, '+');
 		if (sep) sep[0] = 0;
 
-		e = import_file(orig, multi_cat, import_flags, force_fps, frames_per_sample, NULL, NULL, 0);
+		e = import_file(orig, multi_cat, import_flags, force_fps, frames_per_sample, NULL, NULL, NULL, 0);
 		if (e) {
 			gf_isom_delete(orig);
 			return e;
@@ -1683,7 +2439,7 @@
 		case GF_ISOM_MEDIA_HINT:
 		case GF_ISOM_MEDIA_OD:
 		case GF_ISOM_MEDIA_FLASH:
-			fprintf(stderr, "WARNING: Track ID %d (type %s) not handled by concatenation - removing from destination\n", gf_isom_get_track_id(orig, i+1), gf_4cc_to_str(mtype));
+			M4_LOG(GF_LOG_WARNING, ("WARNING: Track ID %d (type %s) not handled by concatenation - removing from destination\n", gf_isom_get_track_id(orig, i+1), gf_4cc_to_str(mtype)));
 			continue;
 		case GF_ISOM_MEDIA_AUDIO:
 		case GF_ISOM_MEDIA_TEXT:
@@ -1708,7 +2464,7 @@
 		}
 	}
 	if (!nb_samp) {
-		fprintf(stderr, "No suitable media tracks to cat in %s - skipping\n", fileName);
+		M4_LOG(GF_LOG_ERROR, ("No suitable media tracks to cat in %s - skipping\n", fileName));
 		goto err_exit;
 	}
 
@@ -1723,13 +2479,13 @@
 	for (i=0; i<gf_isom_get_track_count(dest); i++) {
 		u64 track_dur = gf_isom_get_media_duration(dest, i+1);
 		u32 track_ts = gf_isom_get_media_timescale(dest, i+1);
-		if ((u64)aligned_to_DTS_frac.num * track_ts < track_dur * aligned_to_DTS_frac.den) {
+		if (gf_timestamp_less(aligned_to_DTS_frac.num, aligned_to_DTS_frac.den, track_dur, track_ts)) {
 			aligned_to_DTS_frac.num = track_dur;
 			aligned_to_DTS_frac.den = track_ts;
 		}
 	}
 
-	fprintf(stderr, "Appending file %s\n", fileName);
+	M4_LOG(GF_LOG_INFO, ("Appending file %s\n", fileName));
 	nb_done = 0;
 	for (i=0; i<nb_tracks; i++) {
 		u64 last_DTS, dest_track_dur_before_cat;
@@ -1739,6 +2495,8 @@
 		Bool merge_edits = 0;
 		Bool new_track = 0;
 		u32 dst_tk_sample_entry = 0;
+		u32 orig_nal_len = 0;
+		u32 dst_nal_len = 0;
 		mtype = gf_isom_get_media_type(orig, i+1);
 		switch (mtype) {
 		case GF_ISOM_MEDIA_HINT:
@@ -1790,6 +2548,11 @@
 				if (subtype_src==GF_ISOM_SUBTYPE_HEV1)
 					subtype_src=GF_ISOM_SUBTYPE_HVC1;
 
+				if (subtype_dst==GF_ISOM_SUBTYPE_VVI1)
+					subtype_dst=GF_ISOM_SUBTYPE_VVC1;
+				if (subtype_src==GF_ISOM_SUBTYPE_VVI1)
+					subtype_src=GF_ISOM_SUBTYPE_VVC1;
+
 				if (subtype_dst != subtype_src) {
 					dst_tk_sample_entry = dst_tk;
 					dst_tk = 0;
@@ -1873,7 +2636,7 @@
 				 || (stype == GF_ISOM_SUBTYPE_AVC2_H264)
 				 || (stype == GF_ISOM_SUBTYPE_AVC3_H264)
 				 || (stype == GF_ISOM_SUBTYPE_AVC4_H264) ) {
-					dst_tk = merge_avc_config(dest, tk_id, orig, i+1, force_cat);
+					dst_tk = merge_avc_config(dest, tk_id, &orig, i+1, force_cat, &orig_nal_len, &dst_nal_len);
 				}
 #ifndef GPAC_DISABLE_HEVC
 				/*merge HEVC config if possible*/
@@ -1881,7 +2644,7 @@
 				 || (stype == GF_ISOM_SUBTYPE_HEV1)
 				 || (stype == GF_ISOM_SUBTYPE_HVC2)
 				 || (stype == GF_ISOM_SUBTYPE_HEV2)) {
-					dst_tk = merge_hevc_config(dest, tk_id, orig, i+1, force_cat);
+					dst_tk = merge_hevc_config(dest, tk_id, &orig, i+1, force_cat, &orig_nal_len, &dst_nal_len);
 				}
 #endif /*GPAC_DISABLE_HEVC*/
 				else if (force_cat) {
@@ -1893,7 +2656,7 @@
 		if (dst_tk_sample_entry && !dst_tk) {
 			u32 k, nb_sample_desc = gf_isom_get_sample_description_count(orig, i+1);
 			dst_tk = dst_tk_sample_entry;
-			fprintf(stderr, "Multiple sample entry required, merging\n");
+			M4_LOG(GF_LOG_INFO, ("Multiple sample entry required, merging\n"));
 			for (k=0; k<nb_sample_desc; k++) {
 				u32 sdesc_idx;
 				e = gf_isom_clone_sample_description(dest, dst_tk, orig, i+1, k+1, NULL, NULL, &sdesc_idx);
@@ -1908,7 +2671,7 @@
 
 		/*looks like a new track*/
 		if (!dst_tk) {
-			fprintf(stderr, "No suitable destination track found - creating new one (type %s)\n", gf_4cc_to_str(mtype));
+			M4_LOG(GF_LOG_INFO, ("No suitable destination track found - creating new one (type %s)\n", gf_4cc_to_str(mtype)));
 			e = gf_isom_clone_track(orig, i+1, dest, 0, &dst_tk);
 			if (e) goto err_exit;
 			gf_isom_clone_pl_indications(orig, dest);
@@ -1957,6 +2720,8 @@
 
 		ts_scale = gf_isom_get_media_timescale(dest, dst_tk);
 		ts_scale /= gf_isom_get_media_timescale(orig, i+1);
+		media_ts_scale = gf_isom_get_media_timescale(dest, dst_tk);
+		media_ts_scale /= gf_isom_get_media_timescale(orig, i+1);
 
 		/*if not a new track, see if we can merge the edit list - this is a crude test that only checks
 		we have the same edit types*/
@@ -1982,11 +2747,23 @@
 		for (j=0; j<count; j++) {
 			u32 di;
 			samp = gf_isom_get_sample(orig, i+1, j+1, &di);
+			if (!samp) {
+				e = gf_isom_last_error(orig);
+				if (!e) e = GF_OUT_OF_MEM;
+				goto err_exit;
+			}
 			last_DTS = samp->DTS;
 			samp->DTS = (u64) (ts_scale * samp->DTS + (new_track ? 0 : insert_dts));
 			samp->CTS_Offset = (u32) (samp->CTS_Offset * ts_scale);
 
 			if (gf_isom_is_self_contained(orig, i+1, di)) {
+				if (orig_nal_len && dst_nal_len) {
+					e = rewrite_nal_size_field(samp, orig_nal_len, dst_nal_len);
+					if (e) {
+						gf_isom_sample_del(&samp);
+						goto err_exit;
+					}
+				}
 				e = gf_isom_add_sample(dest, dst_tk, di + dst_tk_sample_entry, samp);
 			} else {
 				u64 offset;
@@ -2003,6 +2780,11 @@
 			e = gf_isom_copy_sample_info(dest, dst_tk, orig, i+1, j+1);
 			if (e) goto err_exit;
 
+			if (j+1==count) {
+				u32 sdur = gf_isom_get_sample_duration(orig, i+1, j+1);
+				gf_isom_set_last_sample_duration(dest, dst_tk, (u32) (ts_scale * sdur) );
+			}
+
 			gf_set_progress("Appending", nb_done, nb_samp);
 			nb_done++;
 		}
@@ -2042,7 +2824,7 @@
 					/*safety test: some files have broken edit lists. If no more than 2 entries, check that the segment duration
 					is less or equal to the movie duration*/
 					if (prev_dur * movts_dst < segmentDuration * trackts_dst) {
-						fprintf(stderr, "Warning: suspicious edit list entry found: duration %g sec but longest track duration before cat is %g - fixing it\n", (Double) (s64) segmentDuration/movts_dst, prev_dur/trackts_dst);
+						M4_LOG(GF_LOG_WARNING, ("Warning: suspicious edit list entry found: duration %g sec but longest track duration before cat is %g - fixing it\n", (Double) (s64) segmentDuration/movts_dst, prev_dur/trackts_dst));
 						segmentDuration = (dest_track_dur_before_cat - mediaTime) * movts_dst;
 						segmentDuration /= trackts_dst;
 					}
@@ -2065,7 +2847,7 @@
 			if (count) {
 				e = gf_isom_get_edit(dest, dst_tk, count, &editTime, &segmentDuration, &mediaTime, &editMode);
 				if (e) {
-					fprintf(stderr, "Error: edit segment error on destination track %u could not be retrieved.\n", dst_tk);
+					M4_LOG(GF_LOG_ERROR, ("Error: edit segment error on destination track %u could not be retrieved.\n", dst_tk));
 					goto err_exit;
 				}
 			} else if (gf_isom_get_edits_count(orig, i+1)) {
@@ -2099,7 +2881,8 @@
 				t *= ts_scale;
 				segmentDuration = (s64) t;
 				t = (Double) (s64) mediaTime;
-				t *= ts_scale;
+				//we are in media time, apply media ts scale, not file ts scale
+				t *= media_ts_scale;
 				t+= (s64) dest_track_dur_before_cat;
 				mediaTime = (s64) t;
 				if ((editMode == GF_ISOM_EDIT_EMPTY) && (mediaTime > 0)) {
@@ -2174,7 +2957,6 @@
 	u32 import_flags;
 	GF_Fraction force_fps;
 	u32 frames_per_sample;
-	char *tmp_dir;
 	Bool force_cat, align_timelines, allow_add_in_command;
 } CATEnum;
 
@@ -2191,12 +2973,12 @@
 	strcpy(szFileName, szPath);
 	strcat(szFileName, cat_enum->szOpt);
 
-	e = cat_isomedia_file(cat_enum->dest, szFileName, cat_enum->import_flags, cat_enum->force_fps, cat_enum->frames_per_sample, cat_enum->tmp_dir, cat_enum->force_cat, cat_enum->align_timelines, cat_enum->allow_add_in_command, GF_FALSE);
+	e = cat_isomedia_file(cat_enum->dest, szFileName, cat_enum->import_flags, cat_enum->force_fps, cat_enum->frames_per_sample, cat_enum->force_cat, cat_enum->align_timelines, cat_enum->allow_add_in_command, GF_FALSE);
 	if (e) return 1;
 	return 0;
 }
 
-GF_Err cat_multiple_files(GF_ISOFile *dest, char *fileName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command)
+GF_Err cat_multiple_files(GF_ISOFile *dest, char *fileName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, Bool force_cat, Bool align_timelines, Bool allow_add_in_command)
 {
 	CATEnum cat_enum;
 	char *sep;
@@ -2205,7 +2987,6 @@
 	cat_enum.import_flags = import_flags;
 	cat_enum.force_fps = force_fps;
 	cat_enum.frames_per_sample = frames_per_sample;
-	cat_enum.tmp_dir = tmp_dir;
 	cat_enum.force_cat = force_cat;
 	cat_enum.align_timelines = align_timelines;
 	cat_enum.allow_add_in_command = allow_add_in_command;
@@ -2242,7 +3023,7 @@
 	sep[0] = 0;
 	sep = strchr(cat_enum.szRad2, '%');
 	if (!sep) sep = strchr(cat_enum.szRad2, '#');
-	if (!sep) sep = gf_url_colon_suffix(cat_enum.szRad2);
+	if (!sep) sep = gf_url_colon_suffix(cat_enum.szRad2, '=');
 	strcpy(cat_enum.szOpt, "");
 	if (sep) {
 		if (strlen(sep) >= sizeof(cat_enum.szOpt)) {
@@ -2255,7 +3036,7 @@
 	return gf_enum_directory(cat_enum.szPath, 0, cat_enumerate, &cat_enum, NULL);
 }
 
-GF_Err cat_playlist(GF_ISOFile *dest, char *playlistName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command)
+GF_Err cat_playlist(GF_ISOFile *dest, char *playlistName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, Bool force_cat, Bool align_timelines, Bool allow_add_in_command)
 {
 	GF_Err e;
 	FILE *pl = gf_fopen(playlistName, "r");
@@ -2282,7 +3063,7 @@
 		url = gf_url_concatenate(playlistName, szLine);
 		if (!url) url = gf_strdup(szLine);
 
-		e = cat_isomedia_file(dest, url, import_flags, force_fps, frames_per_sample, tmp_dir, force_cat, align_timelines, allow_add_in_command, GF_FALSE);
+		e = cat_isomedia_file(dest, url, import_flags, force_fps, frames_per_sample, force_cat, align_timelines, allow_add_in_command, GF_FALSE);
 
 
 		if (e) {
@@ -2327,7 +3108,7 @@
 	e = gf_sm_load_init(&load);
 	if (e<0) {
 		gf_sm_load_done(&load);
-		fprintf(stderr, "Cannot load context %s - %s\n", in, gf_error_to_string(e));
+		M4_LOG(GF_LOG_ERROR, ("Cannot load context %s - %s\n", in, gf_error_to_string(e)));
 		goto err_exit;
 	}
 	e = gf_sm_load_run(&load);
@@ -2410,7 +3191,7 @@
 #endif /*GPAC_DISABLE_SCENE_STATS*/
 
 	if (e<0) {
-		fprintf(stderr, "Error loading file %s\n", gf_error_to_string(e));
+		M4_LOG(GF_LOG_ERROR, ("Error loading file %s\n", gf_error_to_string(e)));
 		goto err_exit;
 	} else {
 		gf_log_cbk prev_logs = NULL;
@@ -2546,15 +3327,15 @@
 		/*NO CHANGE TO BIFSC otherwise the generated update will not match the input context*/
 		nbb = GetNbBits(ctx->max_node_id);
 		if (!bcfg->nodeIDbits) bcfg->nodeIDbits=nbb;
-		if (bcfg->nodeIDbits<nbb) fprintf(stderr, "Warning: BIFSConfig.NodeIDBits TOO SMALL\n");
+		if (bcfg->nodeIDbits<nbb) M4_LOG(GF_LOG_WARNING, ("Warning: BIFSConfig.NodeIDBits TOO SMALL\n"));
 
 		nbb = GetNbBits(ctx->max_route_id);
 		if (!bcfg->routeIDbits) bcfg->routeIDbits = nbb;
-		if (bcfg->routeIDbits<nbb) fprintf(stderr, "Warning: BIFSConfig.RouteIDBits TOO SMALL\n");
+		if (bcfg->routeIDbits<nbb) M4_LOG(GF_LOG_WARNING, ("Warning: BIFSConfig.RouteIDBits TOO SMALL\n"));
 
 		nbb = GetNbBits(ctx->max_proto_id);
 		if (!bcfg->protoIDbits) bcfg->protoIDbits=nbb;
-		if (bcfg->protoIDbits<nbb) fprintf(stderr, "Warning: BIFSConfig.ProtoIDBits TOO SMALL\n");
+		if (bcfg->protoIDbits<nbb) M4_LOG(GF_LOG_WARNING, ("Warning: BIFSConfig.ProtoIDBits TOO SMALL\n"));
 
 		/*this is the real pb, not stored in cfg or file level, set at EACH replaceScene*/
 		encode_names = 0;
@@ -2604,10 +3385,10 @@
 can be NULL, without .bt
 \param tmpdir can be NULL
 */
-GF_Err EncodeFileChunk(char *chunkFile, char *bifs, char *inputContext, char *outputContext, const char *tmpdir)
+GF_Err EncodeFileChunk(char *chunkFile, char *bifs, char *inputContext, char *outputContext)
 {
 #if defined(GPAC_DISABLE_SMGR) || defined(GPAC_DISABLE_BIFS_ENC) || defined(GPAC_DISABLE_SCENE_ENCODER) || defined (GPAC_DISABLE_SCENE_DUMP)
-	fprintf(stderr, "BIFS encoding is not supported in this build of GPAC\n");
+	M4_LOG(GF_LOG_WARNING, ("BIFS encoding is not supported in this build of GPAC\n"));
 	return GF_NOT_SUPPORTED;
 #else
 	GF_Err e;
@@ -2627,7 +3408,7 @@
 	if (!e) e = gf_sm_load_run(&load);
 	gf_sm_load_done(&load);
 	if (e) {
-		fprintf(stderr, "Cannot load context %s: %s\n", inputContext, gf_error_to_string(e));
+		M4_LOG(GF_LOG_WARNING, ("Cannot load context %s: %s\n", inputContext, gf_error_to_string(e)));
 		goto exit;
 	}
 
@@ -2644,10 +3425,10 @@
 	if (!e) e = gf_sm_load_run(&load);
 	gf_sm_load_done(&load);
 	if (e) {
-		fprintf(stderr, "Cannot load scene commands chunk %s: %s\n", chunkFile, gf_error_to_string(e));
+		M4_LOG(GF_LOG_WARNING, ("Cannot load scene commands chunk %s: %s\n", chunkFile, gf_error_to_string(e)));
 		goto exit;
 	}
-	fprintf(stderr, "Context and chunks loaded\n");
+	M4_LOG(GF_LOG_INFO, ("Context and chunks loaded\n"));
 
 	/* Assumes that the first AU contains only one command a SceneReplace and
 	 that is not part of the current chunk */
@@ -2679,7 +3460,7 @@
 		if (do_enc) {
 			GF_ISOFile *mp4;
 			strcat(szF, ".mp4");
-			mp4 = gf_isom_open(szF, GF_ISOM_WRITE_EDIT, tmpdir);
+			mp4 = gf_isom_open(szF, GF_ISOM_WRITE_EDIT, NULL);
 			e = gf_sm_encode_to_file(ctx, mp4, NULL);
 			if (e) gf_isom_delete(mp4);
 			else gf_isom_close(mp4);
@@ -2741,7 +3522,7 @@
 	return gf_enum_directory(file_path, 1, wgt_enum_dir, cbck, NULL);
 }
 
-GF_ISOFile *package_file(char *file_name, char *fcc, const char *tmpdir, Bool make_wgt)
+GF_ISOFile *package_file(char *file_name, char *fcc, Bool make_wgt)
 {
 	GF_ISOFile *file = NULL;
 	GF_Err e;
@@ -2755,12 +3536,12 @@
 
 	type = gf_xml_get_root_type(file_name, &e);
 	if (!type) {
-		fprintf(stderr, "Cannot process XML file %s: %s\n", file_name, gf_error_to_string(e) );
+		M4_LOG(GF_LOG_ERROR, ("Cannot process XML file %s: %s\n", file_name, gf_error_to_string(e) ));
 		return NULL;
 	}
 	if (make_wgt) {
 		if (strcmp(type, "widget")) {
-			fprintf(stderr, "XML Root type %s differs from \"widget\" \n", type);
+			M4_LOG(GF_LOG_ERROR, ("XML Root type %s differs from \"widget\" \n", type));
 			gf_free(type);
 			return NULL;
 		}
@@ -2809,7 +3590,7 @@
 		else if (!stricmp(type, "xmt-a")) mtype = ascii ? GF_META_TYPE_XMTA : GF_META_TYPE_XMTZ;
 	}
 	if (!mtype) {
-		fprintf(stderr, "Missing 4CC code for meta name - please use ABCD:fileName\n");
+		M4_LOG(GF_LOG_ERROR, ("Missing 4CC code for meta name - please use ABCD:fileName\n"));
 		e = GF_BAD_PARAM;
 		goto exit;
 	}
@@ -2839,7 +3620,7 @@
 			if (gf_isom_probe_file(res_url)) {
 				if (res_url) gf_free(res_url);
 				if (isom_src) {
-					fprintf(stderr, "Cannot package several IsoMedia files together\n");
+					M4_LOG(GF_LOG_ERROR, ("Cannot package several IsoMedia files together\n"));
 					e = GF_NOT_SUPPORTED;
 					goto exit;
 				}
@@ -2854,9 +3635,9 @@
 	}
 
 	if (isom_src) {
-		file = gf_isom_open(isom_src, GF_ISOM_OPEN_EDIT, tmpdir);
+		file = gf_isom_open(isom_src, GF_ISOM_OPEN_EDIT, NULL);
 	} else {
-		file = gf_isom_open("package", GF_ISOM_WRITE_EDIT, tmpdir);
+		file = gf_isom_open("package", GF_ISOM_WRITE_EDIT, NULL);
 	}
 
 	e = gf_isom_set_meta_type(file, 1, 0, mtype);
@@ -2935,7 +3716,7 @@
 	return file;
 }
 
-GF_Err parse_high_dynamc_range_xml_desc(GF_ISOFile *movie, char *file_name)
+GF_Err parse_high_dynamc_range_xml_desc(GF_ISOFile *movie, u32 track, char *file_name)
 {
 	GF_DOMParser *parser;
 	GF_XMLNode *root, *stream;
@@ -2947,38 +3728,55 @@
 	memset(&mdcv, 0, sizeof(GF_MasteringDisplayColourVolumeInfo));
 	memset(&clli, 0, sizeof(GF_ContentLightLevelInfo));
 
+	if (!strcmp(file_name, "none")) {
+		for (i=0; i<gf_isom_get_track_count(movie); i++) {
+			if (gf_isom_is_video_handler_type(gf_isom_get_media_type(movie, i+1))) {
+				gf_isom_set_high_dynamic_range_info(movie, i+1, 1, NULL, NULL);
+			}
+		}
+		return GF_OK;
+	}
+
 	parser = gf_xml_dom_new();
 	e = gf_xml_dom_parse(parser, file_name, NULL, NULL);
 	if (e) {
-		fprintf(stderr, "Error parsing HDR XML file: Line %d - %s. Abort.\n", gf_xml_dom_get_line(parser), gf_xml_dom_get_error(parser));
+		M4_LOG(GF_LOG_ERROR, ("Error parsing HDR XML file: Line %d - %s. Abort.\n", gf_xml_dom_get_line(parser), gf_xml_dom_get_error(parser)));
 		gf_xml_dom_del(parser);
 		return e;
 	}
 	root = gf_xml_dom_get_root(parser);
 	if (!root) {
-		fprintf(stderr, "Error parsing HDR XML file: no \"root\" found. Abort.\n");
+		M4_LOG(GF_LOG_ERROR, ("Error parsing HDR XML file: no \"root\" found. Abort.\n"));
 		gf_xml_dom_del(parser);
 		return e;
 	}
 	if (strcmp(root->name, "HDR")) {
-		fprintf(stderr, "Error parsing HDR XML file: root name is \"%s\", expecting \"HDR\"\n", root->name);
+		M4_LOG(GF_LOG_ERROR, ("Error parsing HDR XML file: root name is \"%s\", expecting \"HDR\"\n", root->name));
 		gf_xml_dom_del(parser);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
 	i = 0;
 	while ((stream = gf_list_enum(root->content, &i))) {
-		u32 id = 0, j;
+		u32 j;
 		GF_XMLAttribute* att = NULL;
 		GF_XMLNode *box = NULL;
 
 		if (stream->type != GF_XML_NODE_TYPE) continue;
 		if (strcmp(stream->name, "Track")) continue;
 
-		j = 0;
-		while ((att = gf_list_enum(stream->attributes, &j))) {
-			if (!strcmp(att->name, "id")) id = atoi(att->value);
-			else fprintf(stderr, "HDR XML: ignoring track attribute \"%s\"\n", att->name);
+		if (!track) {
+			j = 0;
+			while ((att = gf_list_enum(stream->attributes, &j))) {
+				if (!strcmp(att->name, "id")) {
+					u32 id = atoi(att->value);
+					track = gf_isom_get_track_by_id(movie, id);
+					if (!track) {
+						fprintf(stderr, "HDR XML: no track with ID %d, ignoring attribute\n", id);
+					}
+				}
+				else fprintf(stderr, "HDR XML: ignoring track attribute \"%s\"\n", att->name);
+			}
 		}
 
 		j = 0;
@@ -3015,9 +3813,18 @@
 			}
 		}
 
-		e = gf_isom_set_high_dynamic_range_info(movie, id, 1, &mdcv, &clli);
+		if (!track) {
+			for (i=0; i<gf_isom_get_track_count(movie); i++) {
+				if (gf_isom_is_video_handler_type(gf_isom_get_media_type(movie, i+1))) {
+					e = gf_isom_set_high_dynamic_range_info(movie, i+1, 1, &mdcv, &clli);
+					if (e) break;
+				}
+			}
+		} else {
+			e = gf_isom_set_high_dynamic_range_info(movie, track, 1, &mdcv, &clli);
+		}
 		if (e) {
-			fprintf(stderr, "HDR XML: error in gf_isom_set_high_dynamic_range_info()\n");
+			M4_LOG(GF_LOG_ERROR, ("HDR XML: error in gf_isom_set_high_dynamic_range_info()\n"));
 			break;
 		}
 	}
@@ -3027,15 +3834,15 @@
 }
 
 #else
-GF_ISOFile *package_file(char *file_name, char *fcc, const char *tmpdir, Bool make_wgt)
+GF_ISOFile *package_file(char *file_name, char *fcc, Bool make_wgt)
 {
-	fprintf(stderr, "XML Not supported in this build of GPAC - cannot package file\n");
+	M4_LOG(GF_LOG_ERROR, ("XML Not supported in this build of GPAC - cannot package file\n"));
 	return NULL;
 }
 
-GF_Err parse_high_dynamc_range_xml_desc(GF_ISOFile* movie, char* file_name)
+GF_Err parse_high_dynamc_range_xml_desc(GF_ISOFile* movie, u32 track, char* file_name)
 {
-	fprintf(stderr, "XML Not supported in this build of GPAC - cannot process HDR parameter file\n");
+	M4_LOG(GF_LOG_ERROR, ("XML Not supported in this build of GPAC - cannot process HDR parameter file\n"));
 	return GF_OK;
 }
 #endif //#ifndef GPAC_DISABLE_CORE_TOOLS

gpac-1.0.1.tar.gz/applications/mp4box/live.c -> gpac-2.0.0.tar.gz/applications/mp4box/live.c Changed

@@ -391,7 +391,7 @@
 		}
 	}
 	if (!filename) {
-		fprintf(stderr, "Missing filename\n");
+		M4_LOG(GF_LOG_ERROR, ("Missing filename\n"));
 		PrintLiveUsage();
 		return 1;
 	}
@@ -401,7 +401,7 @@
 
 	livesess.seng = gf_seng_init(&livesess, filename, load_type, NULL, (load_type == GF_SM_LOAD_DIMS) ? 1 : 0);
 	if (!livesess.seng) {
-		fprintf(stderr, "Cannot create scene engine\n");
+		M4_LOG(GF_LOG_ERROR, ("Cannot create scene engine\n"));
 		return 1;
 	}
 	if (livesess.streams) {
@@ -440,7 +440,7 @@
 				sscanf(arg, "-rap=ESID=%u:%u", &id, &period);
 				e = gf_seng_enable_aggregation(livesess.seng, id, 1);
 				if (e) {
-					fprintf(stderr, "Cannot enable aggregation on stream %u: %s\n", id, gf_error_to_string(e));
+					M4_LOG(GF_LOG_ERROR, ("Cannot enable aggregation on stream %u: %s\n", id, gf_error_to_string(e)));
 					goto exit;
 				}
 			} else {
@@ -547,7 +547,7 @@
 					char rad[GF_MAX_PATH];
 					fprintf(stderr, "Enter output file name - \"std\" for stderr: ");
 					if (1 > scanf("%1023s", rad)) {
-						fprintf(stderr, "No ouput file name entered, aborting.\n");
+						fprintf(stderr, "No output file name entered, aborting.\n");
 						break;
 					}
 					e = gf_seng_save_context(livesess.seng, !strcmp(rad, "std") ? NULL : rad);
@@ -699,7 +699,9 @@
 
 				if (update_length) {
 					e = gf_seng_encode_from_string(livesess.seng, es_id, aggregate_au ? 0 : 1, update_buffer, live_session_callback);
-					if (e) fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
+					if (e) {
+						M4_LOG(GF_LOG_ERROR, ("Processing command failed: %s\n", gf_error_to_string(e)));
+					}
 					e = gf_seng_aggregate_context(livesess.seng, 0);
 
 					update_context = 1;

gpac-1.0.1.tar.gz/applications/mp4box/main.c -> gpac-2.0.0.tar.gz/applications/mp4box/main.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / mp4box application
@@ -57,124 +57,355 @@
 #define BUFFSIZE	8192
 #define DEFAULT_INTERLEAVING_IN_SEC 0.5
 
+//undefine to check validity of defined args' syntax
+//#define TEST_ARGS
+
 
 int mp4boxTerminal(int argc, char **argv);
 
-Bool dvbhdemux = GF_FALSE;
-Bool keep_sys_tracks = GF_FALSE;
+static u32 mp4box_cleanup(u32 ret_code);
+
+/*
+ * 		START OF ARGUMENT VALUES DECLARATION
+ */
 
 
-/*some global vars for swf import :(*/
-u32 swf_flags = 0;
-Float swf_flatten_angle = 0;
-s32 laser_resolution = 0;
-static FILE *helpout = NULL;
-static u32 help_flags = 0;
+
+typedef struct
+{
+	GF_ISOTrackID trackID;
+	char *line;
+} SDPLine;
+
+typedef enum {
+	META_ACTION_SET_TYPE			= 0,
+	META_ACTION_ADD_ITEM			= 1,
+	META_ACTION_REM_ITEM			= 2,
+	META_ACTION_SET_PRIMARY_ITEM	= 3,
+	META_ACTION_SET_XML				= 4,
+	META_ACTION_SET_BINARY_XML		= 5,
+	META_ACTION_REM_XML				= 6,
+	META_ACTION_DUMP_ITEM			= 7,
+	META_ACTION_DUMP_XML			= 8,
+	META_ACTION_ADD_IMAGE_ITEM		= 9,
+	META_ACTION_ADD_IMAGE_DERIVED	= 10,
+} MetaActionType;
 
 typedef struct {
-	u32 code;
-	const char *name;
-	const char *comment;
-} itunes_tag;
-static const itunes_tag itags[] = {
-	{GF_ISOM_ITUNE_ALBUM_ARTIST, "album_artist", "usage: album_artist=album artist"},
-	{GF_ISOM_ITUNE_ALBUM, "album", "usage: album=name" },
-	{GF_ISOM_ITUNE_TRACKNUMBER, "tracknum", "usage: track=x/N"},
-	{GF_ISOM_ITUNE_TRACK, "track", "usage: track=name"},
-	{GF_ISOM_ITUNE_ARTIST, "artist", "usage: artist=name"},
-	{GF_ISOM_ITUNE_COMMENT, "comment", "usage: comment=any comment"},
-	{GF_ISOM_ITUNE_COMPILATION, "compilation", "usage: compilation=yes,no"},
-	{GF_ISOM_ITUNE_COMPOSER, "composer", "usage: composer=name"},
-	{GF_ISOM_ITUNE_CREATED, "created", "usage: created=time"},
-	{GF_ISOM_ITUNE_DISK, "disk", "usage: disk=x/N"},
-	{GF_ISOM_ITUNE_TOOL, "tool", "usage: tool=name"},
-	{GF_ISOM_ITUNE_GENRE, "genre", "usage: genre=name"},
-	{GF_ISOM_ITUNE_NAME, "name", "usage: name=name"},
-	{GF_ISOM_ITUNE_TEMPO, "tempo", "usage: tempo=integer"},
-	{GF_ISOM_ITUNE_WRITER, "writer", "usage: writer=name"},
-	{GF_ISOM_ITUNE_GROUP, "group", "usage: group=name"},
-	{GF_ISOM_ITUNE_COVER_ART, "cover", "usage: cover=file.jpg,file.png"},
-	{GF_ISOM_ITUNE_ENCODER, "encoder", "usage: encoder=name"},
-	{GF_ISOM_ITUNE_GAPLESS, "gapless", "usage: gapless=yes,no"},
-	{GF_ISOM_ITUNE_ALL, "all", "usage: all=NULL"},
+	u32 ref_item_id;
+	u32 ref_type;
+} MetaRef;
+
+typedef struct
+{
+	MetaActionType act_type;
+	Bool root_meta, use_dref;
+	GF_ISOTrackID trackID;
+	u32 meta_4cc;
+	char *szPath, *szName, *mime_type, *enc_type, *keep_props;
+	u32 item_id;
+	Bool primary;
+	Bool replace;
+	u32 item_type;
+	u32 ref_item_id;
+	GF_List *item_refs;
+	u32 group_id;
+	u32 group_type;
+	GF_ImageItemProperties *image_props;
+} MetaAction;
+
+
+typedef enum {
+	TRACK_ACTION_REM_TRACK= 0,
+	TRACK_ACTION_SET_LANGUAGE,
+	TRACK_ACTION_SET_DELAY,
+	TRACK_ACTION_SET_KMS_URI,
+	TRACK_ACTION_SET_PAR,
+	TRACK_ACTION_SET_HANDLER_NAME,
+	TRACK_ACTION_ENABLE,
+	TRACK_ACTION_DISABLE,
+	TRACK_ACTION_REFERENCE,
+	TRACK_ACTION_RAW_EXTRACT,
+	TRACK_ACTION_REM_NON_RAP,
+	TRACK_ACTION_SET_KIND,
+	TRACK_ACTION_REM_KIND,
+	TRACK_ACTION_SET_ID,
+	TRACK_ACTION_SET_UDTA,
+	TRACK_ACTION_SWAP_ID,
+	TRACK_ACTION_REM_NON_REFS,
+	TRACK_ACTION_SET_CLAP,
+	TRACK_ACTION_SET_MX,
+	TRACK_ACTION_SET_EDITS,
+	TRACK_ACTION_SET_TIME,
+	TRACK_ACTION_SET_MEDIA_TIME,
+} TrackActionType;
+
+typedef struct
+{
+	TrackActionType act_type;
+	GF_ISOTrackID trackID;
+	char lang[10];
+	GF_Fraction delay;
+	const char *kms;
+	const char *hdl_name;
+	s32 par_num, par_den;
+	u8 force_par, rewrite_bs;
+	u32 dump_type, sample_num;
+	char *out_name;
+	char *src_name;
+	char *string;
+	u32 udta_type;
+	char *kind_scheme, *kind_value;
+	u32 newTrackID;
+	s32 clap_wnum, clap_wden, clap_hnum, clap_hden, clap_honum, clap_hoden, clap_vonum, clap_voden;
+	s32 mx[9];
+	u64 time;
+	u8 dump_track_type;
+} TrackAction;
+
+enum
+{
+	GF_ISOM_CONV_TYPE_ISMA = 1,
+	GF_ISOM_CONV_TYPE_ISMA_EX,
+	GF_ISOM_CONV_TYPE_3GPP,
+	GF_ISOM_CONV_TYPE_IPOD,
+	GF_ISOM_CONV_TYPE_PSP,
+	GF_ISOM_CONV_TYPE_MOV
 };
 
-u32 nb_itunes_tags = sizeof(itags) / sizeof(itunes_tag);
+typedef enum {
+	TSEL_ACTION_SET_PARAM = 0,
+	TSEL_ACTION_REMOVE_TSEL = 1,
+	TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP = 2,
+} TSELActionType;
+
+typedef struct
+{
+	TSELActionType act_type;
+	GF_ISOTrackID trackID;
+
+	GF_ISOTrackID refTrackID;
+	u32 criteria[30];
+	u32 nb_criteria;
+	Bool is_switchGroup;
+	u32 switchGroupID;
+} TSELAction;
+
+GF_FileType get_file_type_by_ext(char *inName);
 
 
-void PrintVersion()
+char outfile[GF_MAX_PATH];
+#ifndef GPAC_DISABLE_SCENE_ENCODER
+GF_SMEncodeOptions smenc_opts;
+u32 swf_flags = GF_SM_SWF_SPLIT_TIMELINE;
+#endif
+GF_Fraction import_fps;
+
+//things to free upon cleanup
+MetaAction *metas = NULL;
+TrackAction *tracks = NULL;
+TSELAction *tsel_acts = NULL;
+SDPLine *sdp_lines = NULL;
+u32 *brand_add = NULL;
+u32 *brand_rem = NULL;
+char **mpd_base_urls = NULL;
+u32 nb_mpd_base_urls = 0;
+GF_DashSegmenterInput *dash_inputs = NULL;
+u32 nb_dash_inputs = 0;
+
+
+
+//all other options values - keep options with assignment other than 0 on a single line
+
+FILE *helpout = NULL;
+u32 help_flags = 0;
+
+Double interleaving_time=0.0, split_duration=0.0, split_start=-1.0, dash_duration=0.0, dash_subduration=0.0, swf_flatten_angle=0.0;
+Bool dash_duration_strict=0, dvbhdemux=0, keep_sys_tracks=0;
+
+u64 initial_tfdt=0;
+s32 subsegs_per_sidx=0, laser_resolution=0, ast_offset_ms=0;
+const char *split_range_str = NULL;
+GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_DEFAULT;
+u32 stat_level=0, hint_flags=0, info_track_id=0, import_flags=0, nb_add=0, nb_cat=0, crypt=0, agg_samples=0, nb_sdp_ex=0, max_ptime=0, split_size=0, nb_meta_act=0, nb_track_act=0, rtp_rate=0, major_brand=0, nb_alt_brand_add=0, nb_alt_brand_rem=0, old_interleave=0, minor_version=0, conv_type=0, nb_tsel_acts=0, program_number=0, dump_nal=0, time_shift_depth=0, initial_moof_sn=0, dump_std=0, import_subtitle=0, dump_saps=0, dump_saps_mode=0, force_new=0;
+GF_DashDynamicMode dash_mode=GF_DASH_STATIC;
+#ifndef GPAC_DISABLE_SCENE_DUMP
+GF_SceneDumpFormat dump_mode=GF_SM_DUMP_NONE;
+#endif
+
+/*align cat is the new default behavior for -cat*/
+Bool align_cat=GF_TRUE;
+
+Double mpd_live_duration=0;
+Bool do_hint=0, do_save=0, full_interleave=0, do_frag=0, hint_interleave=0, dump_rtp=0, regular_iod=0, remove_sys_tracks=0, remove_hint=0, remove_root_od=0;
+Bool print_sdp=0, open_edit=0, dump_cr=0, force_ocr=0, encode=0, do_scene_log=0, dump_srt=0, dump_ttxt=0, do_saf=0, dump_m2ts=0, dump_cart=0, dump_chunk=0, dump_check_xml=0;
+Bool do_hash=0, verbose=0, force_cat=0, pack_wgt=0, single_group=0, clean_groups=0, dash_live=0, no_fragments_defaults=0;
+Bool single_traf_per_moof=0, tfdt_per_traf=0, hls_clock=0, do_mpd_rip=0, merge_vtt_cues=0, get_nb_tracks=0;
+u32 compress_moov=0;
+char *inName=NULL, *outName=NULL, *mediaSource=NULL, *input_ctx=NULL, *output_ctx=NULL, *drm_file=NULL, *avi2raw=NULL, *cprt=NULL;
+char *chap_file=NULL, *chap_file_qt=NULL, *itunes_tags=NULL, *pack_file=NULL, *raw_cat=NULL, *seg_name=NULL, *dash_ctx_file=NULL;
+char *compress_top_boxes=NULL, *high_dynamc_range_filename=NULL, *use_init_seg=NULL, *box_patch_filename=NULL, *udp_dest = NULL;
+
+GF_ISOTrackID trackID=0;
+u32 track_dump_type=0, dump_isom=0, dump_timestamps=0, dump_nal_type=0, do_flat=0, box_patch_trackID=0, print_info=0;
+Bool no_inplace=0, merge_last_seg=0, freeze_box_order=0, no_odf_conf=0;
+Double min_buffer = 1.5;
+u32 size_top_box=0, fs_dump_flags=0, dump_chap=0, dump_udta_type=0, dump_udta_track=0, moov_pading=0, sdtp_in_traf=0, segment_marker=0, timescale=0;
+
+u32 dash_scale = 1000;
+GF_ISOFile *file = NULL;
+
+Bool insert_utc=0, chunk_mode=0, HintCopy=0, hint_no_offset=0, do_bin_xml=0, frag_real_time=0, force_co64=0, live_scene=0, use_mfra=0;
+Bool dump_iod=0, samplegroups_in_traf=0, mvex_after_traks=0, daisy_chain_sidx=0, use_ssix=0, single_segment=0, single_file=0, segment_timeline=0;
+Bool has_add_image=0;
+
+char *do_mpd_conv=NULL;
+u32 MTUSize = 1450;
+char *dash_start_date=NULL;
+GF_DASH_ContentLocationMode cp_location_mode = GF_DASH_CPMODE_ADAPTATION_SET;
+Double mpd_update_time = 0.0;
+GF_MemTrackerType mem_track = GF_MemTrackerNone;
+GF_DASHPSSHMode pssh_mode=0;
+
+GF_DashProfile dash_profile=GF_DASH_PROFILE_AUTO;
+char *dash_profile_extension = NULL;
+char *dash_cues = NULL;
+Bool strict_cues=0, use_url_template=0, seg_at_rap=0, frag_at_rap=0, memory_frags=0, keep_utc=0, has_next_arg=0, no_cache=0, no_loop=0;
+u32 adjust_split_end=0;
+char *do_wget = NULL;
+char *mux_name = NULL;
+char *seg_ext = NULL;
+char *init_seg_ext = NULL;
+char *dash_title = NULL;
+char *dash_source = NULL;
+char *dash_more_info = NULL;
+
+FILE *logfile = NULL;
+u32 run_for=0, dash_cumulated_time=0, dash_prev_time=0, dash_now_time=0;
+GF_DASH_SplitMode dash_split_mode = GF_DASH_SPLIT_OUT;
+
+
+typedef u32 (*parse_arg_fun)(char *arg_val, u32 param);
+typedef u32 (*parse_arg_fun2)(char *arg_name, char *arg_val, u32 param);
+
+//other custom option parsing functions definitions are in mp4box.h
+static u32 parse_meta_args(char *opts, MetaActionType act_type);
+static Bool parse_tsel_args(char *opts, TSELActionType act);
+
+
+
+/*
+ * 		START OF ARGS PARSING AND HELP
+ */
+
+
+Bool print_version(char *arg_val, u32 param)
 {
 	fprintf(stderr, "MP4Box - GPAC version %s\n"
 	 "%s\n"
 	 "GPAC Configuration: " GPAC_CONFIGURATION "\n"
 	 "Features: %s %s\n", gf_gpac_version(), gf_gpac_copyright_cite(), gf_sys_features(GF_FALSE), gf_sys_features(GF_TRUE));
+	return GF_TRUE;
 }
 
-GF_GPACArg m4b_gen_args[] =
+//arg will toggle open_edit
+#define ARG_OPEN_EDIT		1
+//arg will toggle do_save
+#define ARG_NEED_SAVE		1<<1
+#define ARG_NO_INPLACE		1<<2
+#define ARG_BIT_MASK		1<<3
+#define ARG_BIT_MASK_REM	1<<4
+#define ARG_HAS_VALUE		1<<5
+#define ARG_DIV_1000		1<<6
+#define ARG_NON_ZERO		1<<7
+#define ARG_64BITS			1<<8
+#define ARG_IS_4CC			1<<9
+#define ARG_BOOL_REV		1<<10
+#define ARG_INT_INC			1<<11
+#define ARG_IS_FUN			1<<12
+#define ARG_EMPTY			1<<13
+#define ARG_PUSH_SYSARGS	1<<14
+#define ARG_IS_FUN2			1<<15
+
+
+
+typedef struct
+{
+	GF_GPAC_ARG_BASE
+
+	void *arg_ptr;
+	u32 argv_val;
+	u16 parse_flags;
+} MP4BoxArg;
+
+#define MP4BOX_ARG(_a, _c, _f, _g, _h, _i, _j) {_a, NULL, _c, NULL, NULL, _f, _g, _h, _i, _j}
+#define MP4BOX_ARG_ALT(_a, _b, _c, _f, _g, _h, _i, _j) {_a, _b, _c, NULL, NULL, _f, _g, _h, _i, _j}
+#define MP4BOX_ARG_S(_a, _s, _c, _g, _h, _i, _j) {_a, NULL, _c, _s, NULL, GF_ARG_CUSTOM, _g, _h, _i, _j}
+#define MP4BOX_ARG_S_ALT(_a, _b, _s, _c, _g, _h, _i, _j) {_a, _b, _c, _s, NULL, GF_ARG_CUSTOM, _g, _h, _i, _j}
+
+
+MP4BoxArg m4b_gen_args[] =
 {
 #ifdef GPAC_MEMORY_TRACKING
- 	GF_DEF_ARG("mem-track", NULL, "enable memory tracker", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("mem-track-stack", NULL, "enable memory tracker with stack dumping", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+ 	MP4BOX_ARG("mem-track", "enable memory tracker", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, NULL, 0, 0),
+ 	MP4BOX_ARG("mem-track-stack", "enable memory tracker with stack dumping", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, NULL, 0, 0),
 #endif
- 	GF_DEF_ARG("p", NULL, "use indicated profile for the global GPAC config. If not found, config file is created. If a file path is indicated, this will load profile from that file. Otherwise, this will create a directory of the specified name and store new config there. Reserved name `0` means a new profile, not stored to disk. Works using -p=NAME or -p NAME", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("inter", NULL, "interleave file, producing track chunks with given duration in ms. A value of 0 disables interleaving ", "0.5", NULL, GF_ARG_DOUBLE, 0),
- 	GF_DEF_ARG("old-inter", NULL, "same as [-inter]() but wihout drift correction", NULL, NULL, GF_ARG_DOUBLE, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("tight", NULL, "tight interleaving (sample based) of the file. This reduces disk seek operations but increases file size", NULL, NULL, GF_ARG_DOUBLE, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("flat", NULL, "store file with all media data first, non-interleaved. This speeds up writing time when creating new files", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("frag", NULL, "fragment file, producing track fragments of given duration in ms. This disables interleaving", NULL, NULL, GF_ARG_DOUBLE, 0),
- 	GF_DEF_ARG("out", NULL, "specify output file name. By default input file is overwritten", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("tmp", NULL, "specify directory for temporary file creation", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("co64", NULL, "force usage of 64-bit chunk offsets for ISOBMF files", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("new", NULL, "force creation of a new destination file", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("newfs", NULL, "force creation of a new destination file without temp file but interleaving support", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("no-sys", NULL, "remove all MPEG-4 Systems info except IOD, kept for profiles. This is the default when creating regular AV content", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("no-iod", NULL, "remove MPEG-4 InitialObjectDescriptor from file", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("mfra", NULL, "insert movie fragment random offset when fragmenting file (ignored in dash mode)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("isma", NULL, "rewrite the file as an ISMA 1.0 file", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("ismax", NULL, "same as [-isma]() and remove all clock references", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("3gp", NULL, "rewrite as 3GPP(2) file (no more MPEG-4 Systems Info), always enabled if destination file extension is `.3gp`, `.3g2` or `.3gpp`. Some tracks may be removed in the process", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("ipod", NULL, "rewrite the file for iPod/old iTunes", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("psp", NULL, "rewrite the file for PSP devices", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("brand", NULL, "set major brand of file (`ABCD`) or brand with optional version (`ABCD:v`)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("ab", NULL, "add given brand to file's alternate brand list", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("rb", NULL, "remove given brand to file's alternate brand list", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("cprt", NULL, "add copyright string to file", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("chap", NULL, "set chapter information from given file", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("chapqt", NULL, "set chapter information from given file, using QT signaling for text tracks", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("set-track-id `id1:id2`", NULL, "change id of track with id1 to id2", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("swap-track-id `id1:id2`", NULL, "swap the id between tracks with id1 to id2", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("rem", NULL, "remove given track from file", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("rap", NULL, "remove all non-RAP samples from given track", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("refonly", NULL, "remove all non-reference pictures from given track", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("enable", NULL, "enable given track", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("disable", NULL, "disable given track", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("timescale", NULL, "set movie timescale to given value (ticks per second)", "600", NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("lang `[tkID=]LAN`", NULL, "set language. LAN is the BCP-47 code (eng, en-UK, ...). If no track ID is given, sets language to all tracks", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("delay `tkID=TIME`", NULL, "set track start delay in ms", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("par `tkID=PAR`", NULL, "set visual track pixel aspect ratio. PAR is:\n"
+ 	MP4BOX_ARG("p", "use indicated profile for the global GPAC config. If not found, config file is created. If a file path is indicated, this will load profile from that file. Otherwise, this will create a directory of the specified name and store new config there. Reserved name `0` means a new profile, not stored to disk. Works using -p=NAME or -p NAME", GF_ARG_STRING, GF_ARG_HINT_EXPERT, NULL, 0, 0),
+ 	{"inter", NULL, "interleave file, producing track chunks with given duration in ms. A value of 0 disables interleaving ", "0.5", NULL, GF_ARG_DOUBLE, 0, parse_store_mode, 0, ARG_IS_FUN},
+ 	MP4BOX_ARG("old-inter", "same as [-inter]() but without drift correction", GF_ARG_DOUBLE, GF_ARG_HINT_EXPERT, parse_store_mode, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("tight", "tight interleaving (sample based) of the file. This reduces disk seek operations but increases file size", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &full_interleave, 0, ARG_OPEN_EDIT|ARG_NEED_SAVE),
+ 	MP4BOX_ARG("flat", "store file with all media data first, non-interleaved. This speeds up writing time when creating new files", GF_ARG_BOOL, 0, &do_flat, 0, ARG_NO_INPLACE),
+ 	MP4BOX_ARG("frag", "fragment file, producing track fragments of given duration in ms. This disables interleaving", GF_ARG_DOUBLE, 0, parse_store_mode, 2, ARG_IS_FUN),
+ 	MP4BOX_ARG("out", "specify ISOBMFF output file name. By default input file is overwritten", GF_ARG_STRING, 0, &outName, 0, 0),
+ 	MP4BOX_ARG("co64","force usage of 64-bit chunk offsets for ISOBMF files", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &force_co64, 0, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("new", "force creation of a new destination file", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &force_new, 0, 0),
+ 	MP4BOX_ARG("newfs", "force creation of a new destination file without temp file but interleaving support", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, parse_store_mode, 3, ARG_IS_FUN),
+ 	MP4BOX_ARG_ALT("no-sys", "nosys", "remove all MPEG-4 Systems info except IOD, kept for profiles. This is the default when creating regular AV content", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &remove_sys_tracks, 0, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("no-iod", "remove MPEG-4 InitialObjectDescriptor from file", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &remove_root_od, 0, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("mfra", "insert movie fragment random offset when fragmenting file (ignored in dash mode)", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &use_mfra, 0, 0),
+ 	MP4BOX_ARG("isma", "rewrite the file as an ISMA 1.0 file", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &conv_type, GF_ISOM_CONV_TYPE_ISMA, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("ismax", "same as [-isma]() and remove all clock references", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &conv_type, GF_ISOM_CONV_TYPE_ISMA_EX, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("3gp", "rewrite as 3GPP(2) file (no more MPEG-4 Systems Info), always enabled if destination file extension is `.3gp`, `.3g2` or `.3gpp`. Some tracks may be removed in the process", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &conv_type, GF_ISOM_CONV_TYPE_3GPP, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("ipod", "rewrite the file for iPod/old iTunes", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &conv_type, GF_ISOM_CONV_TYPE_IPOD, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("psp", "rewrite the file for PSP devices", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &conv_type, GF_ISOM_CONV_TYPE_PSP, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("brand", "set major brand of file (`ABCD`) or brand with optional version (`ABCD:v`)", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, parse_brand, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("ab", "add given brand to file's alternate brand list", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, parse_brand, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("rb", "remove given brand to file's alternate brand list", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, parse_brand, 2, ARG_IS_FUN),
+ 	MP4BOX_ARG("cprt", "add copyright string to file", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, &cprt, 0, 0),
+ 	MP4BOX_ARG("chap", "set chapter information from given file. The following formats are supported (but cannot be mixed) in the chapter text file:\n"
+		" - ZoomPlayer: `AddChapter(nb_frames,chapter name)`, `AddChapterBySeconds(nb_sec,chapter name)` and `AddChapterByTime(h,m,s,chapter name)` with 1 chapter per line\n"
+		" - Time codes: `h:m:s chapter_name`, `h:m:s:ms chapter_name` and `h:m:s.ms chapter_name` with 1 chapter per line\n"
+		" - SMPTE codes: `h:m:s;nb_f/fps chapter_name` and `h:m:s;nb_f chapter_name` with `nb_f` the number of frames and `fps` the framerate with 1 chapter per line\n"
+		" - Common syntax: `CHAPTERX=h:m:s[:ms or .ms]` on first line and `CHAPTERXNAME=name` on next line (reverse order accepted)", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, &chap_file, 0, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("chapqt", "set chapter information from given file, using QT signaling for text tracks", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, &chap_file_qt, 0, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG_S("set-track-id", "id1:id2", "change id of track with id1 to id2", 0, parse_track_action, TRACK_ACTION_SET_ID, ARG_IS_FUN),
+ 	MP4BOX_ARG_S("swap-track-id", "id1:id2", "swap the id between tracks with id1 to id2", 0, parse_track_action, TRACK_ACTION_SWAP_ID, ARG_IS_FUN),
+ 	MP4BOX_ARG("rem", "remove given track from file", GF_ARG_INT, 0, parse_track_action, TRACK_ACTION_REM_TRACK, ARG_IS_FUN),
+ 	MP4BOX_ARG("rap", "remove all non-RAP samples from given track", GF_ARG_INT, GF_ARG_HINT_ADVANCED, parse_rap_ref, 0, ARG_IS_FUN | ARG_EMPTY),
+ 	MP4BOX_ARG("refonly", "remove all non-reference pictures from given track", GF_ARG_INT, GF_ARG_HINT_ADVANCED, parse_rap_ref, 1, ARG_IS_FUN | ARG_EMPTY),
+ 	MP4BOX_ARG("enable", "enable given track", GF_ARG_INT, 0, parse_track_action, TRACK_ACTION_ENABLE, ARG_IS_FUN),
+ 	MP4BOX_ARG("disable", "disable given track", GF_ARG_INT, 0, parse_track_action, TRACK_ACTION_DISABLE, ARG_IS_FUN),
+ 	{"timescale", NULL, "set movie timescale to given value (ticks per second)", "600", NULL, GF_ARG_INT, 0, &timescale, 0, ARG_OPEN_EDIT},
+ 	MP4BOX_ARG_S("lang", "[tkID=]LAN", "set language. LAN is the BCP-47 code (eng, en-UK, ...). If no track ID is given, sets language to all tracks", 0, parse_track_action, TRACK_ACTION_SET_LANGUAGE, ARG_IS_FUN),
+ 	MP4BOX_ARG_S("delay", "tkID=TIME", "set track start delay (>0) or initial skip (<0) in ms or in fractional seconds (`N/D`)", 0, parse_track_action, TRACK_ACTION_SET_DELAY, ARG_IS_FUN),
+ 	MP4BOX_ARG_S("par", "tkID=PAR", "set visual track pixel aspect ratio. PAR is:\n"
 					" - N:D: set PAR to N:D in track, do not modify the bitstream\n"
 					" - wN:D: set PAR to N:D in track and try to modify the bitstream\n"
 					" - none: remove PAR info from track, do not modify the bitstream\n"
 					" - auto: retrieve PAR info from bitstream and set it in track\n"
-					" - force: force 1:1 PAR in track, do not modify the bitstream", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("clap `tkID=CLAP`", NULL, "set visual track clean aperture. CLAP is `Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd` or `none`\n"
+					" - force: force 1:1 PAR in track, do not modify the bitstream", GF_ARG_HINT_ADVANCED, parse_track_action, TRACK_ACTION_SET_PAR, ARG_IS_FUN
+					),
+ 	MP4BOX_ARG_S("clap", "tkID=CLAP", "set visual track clean aperture. CLAP is `Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd` or `none`\n"
 			"- n, d: numerator, denominator\n"
 	 "- W, H, HO, VO: clap width, clap height, clap horizontal offset, clap vertical offset\n"
- 			, NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("mx `tkID=MX`", NULL, "set track matrix, with MX is M1:M2:M3:M4:M5:M6:M7:M8:M9 in 16.16 fixed point intergers or hexa"
- 			, NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("name `tkID=NAME`", NULL, "set track handler name to NAME (UTF-8 string)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("itags `tag1[:tag2]`", NULL, "set iTunes tags to file, see [-tag-list]()", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("tag-list", NULL, "print the set of supported iTunes tags", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
- 	GF_DEF_ARG("split", NULL, "split in files of given max duration", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("split-size", "splits", "split in files of given max size (in kb)", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("split-rap", "splitr", "split in files at each new RAP", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("split-chunk VAL", "splitx", "extract a new file from source. `VAL` can be formated as:\n"
-	"- `S:E`: `S` (number of seconds) to `E` with `E` a number (in seconds), `end` or `end-N`, N number of seconds before the end\n"
-	"- `S-E`: start and end dates, each formatted as `HH:MM:SS.ms` or `MM:SS.ms`", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("splitz `S:E`", NULL, "same as -split-chunk, but adjust the end time to be before the last RAP sample", NULL, NULL, GF_ARG_STRING, 0),
-
- 	GF_DEF_ARG("group-add", NULL, "create a new grouping information in the file. Format is a colon-separated list of following options:\n"
+ 			, GF_ARG_HINT_ADVANCED, parse_track_action, TRACK_ACTION_SET_CLAP, ARG_IS_FUN),
+ 	MP4BOX_ARG_S("mx", "tkID=MX", "set track matrix, with MX is M1:M2:M3:M4:M5:M6:M7:M8:M9 in 16.16 fixed point integers or hexa"
+ 			, GF_ARG_HINT_ADVANCED, parse_track_action, TRACK_ACTION_SET_MX, ARG_IS_FUN),
+	MP4BOX_ARG_S("kind", "tkID=schemeURI=value", "set kind for the track or for all tracks using `all=schemeURI=value`", 0, parse_track_action, TRACK_ACTION_SET_KIND, ARG_IS_FUN),
+	MP4BOX_ARG_S("kind-rem", "tkID=schemeURI=value", "remove kind if given schemeID for the track or for all tracks with `all=schemeURI=value`", 0, parse_track_action, TRACK_ACTION_REM_KIND, ARG_IS_FUN),
+ 	MP4BOX_ARG_S("name", "tkID=NAME", "set track handler name to NAME (UTF-8 string)", GF_ARG_HINT_ADVANCED, parse_track_action, TRACK_ACTION_SET_HANDLER_NAME, ARG_IS_FUN),
+ 	MP4BOX_ARG("itags", "set iTunes tags to file, see `-h tags`", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, &itunes_tags, 0, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("group-add", "create a new grouping information in the file. Format is a colon-separated list of following options:\n"
 	 "- refTrack=ID: ID of the track used as a group reference. If not set, the track will belong to the same group as the "
 	 "previous trackID specified. If 0 or no previous track specified, a new alternate group will be created\n"
 	 "- switchID=ID: ID of the switch group to create. If 0, a new ID will be computed for you. If <0, disables SwitchGroup\n"
@@ -182,26 +413,41 @@
 	 "- trackID=ID: ID of the track to add to this group\n"
 	 " \n"
 	 "Warning: Options modify state as they are parsed, `trackID=1:criteria=lang:trackID=2` is different from `criteria=lang:trackID=1:trackID=2`"
-	 "\n", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
+	 "\n", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, parse_tsel_args, TSEL_ACTION_SET_PARAM, ARG_IS_FUN),
 
-	GF_DEF_ARG("group-rem-track", NULL, "remove given track from its group", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("group-rem", NULL, "remove the track's group\n", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("group-clean", NULL, "remove all group information from all tracks\n", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("ref `id:XXXX:refID`", NULL, "add a reference of type 4CC from track ID to track refID\n", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("keep-utc", NULL, "keep UTC timing in the file after edit\n", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("udta tkID:[OPTS]", NULL, "set udta for given track or movie if tkID is 0. OPTS is a colon separated list of:\n"
+	MP4BOX_ARG("group-rem-track", "remove given track from its group", GF_ARG_INT, GF_ARG_HINT_ADVANCED, parse_tsel_args, TSEL_ACTION_REMOVE_TSEL, ARG_IS_FUN),
+	MP4BOX_ARG("group-rem", "remove the track's group", GF_ARG_INT, GF_ARG_HINT_ADVANCED, parse_tsel_args, TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP, ARG_IS_FUN),
+	MP4BOX_ARG("group-clean", "remove all group information from all tracks", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &clean_groups, 0, ARG_OPEN_EDIT),
+	MP4BOX_ARG_S("ref", "id:XXXX:refID", "add a reference of type 4CC from track ID to track refID", GF_ARG_HINT_ADVANCED, parse_track_action, TRACK_ACTION_REFERENCE, ARG_IS_FUN),
+	MP4BOX_ARG("keep-utc", "keep UTC timing in the file after edit", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &keep_utc, 0, 0),
+	MP4BOX_ARG_S("udta", "tkID:[OPTS]", "set udta for given track or movie if tkID is 0. OPTS is a colon separated list of:\n"
 	 "- type=CODE: 4CC code of the UDTA (not needed for `box=` option)\n"
 	 "- box=FILE: location of the udta data, formatted as serialized boxes\n"
 	 "- box=base64,DATA: base64 encoded udta data, formatted as serialized boxes\n"
 	 "- src=FILE: location of the udta data (will be stored in a single box of type CODE)\n"
 	 "- src=base64,DATA: base64 encoded udta data (will be stored in a single box of type CODE)\n"
-	 "Note: If no source is set, UDTA of type CODE will be removed\n", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("patch [tkID=]FILE", NULL, "apply box patch described in FILE, for given trackID if set\n", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("bo", NULL, "freeze the order of boxes in input file\n", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("init-seg", NULL, "use the given file as an init segment for dumping or for encryption\n", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("zmov", NULL, "compress movie box according to ISOBMFF box compression\n", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
-
-
+	 "- str=STRING: use the given string as payload for the udta box\n"
+	 "Note: If no source is set, UDTA of type CODE will be removed\n", GF_ARG_HINT_ADVANCED, parse_track_action, TRACK_ACTION_SET_UDTA, ARG_IS_FUN|ARG_OPEN_EDIT),
+	MP4BOX_ARG_S("patch", "[tkID=]FILE", "apply box patch described in FILE, for given trackID if set", GF_ARG_HINT_ADVANCED, parse_boxpatch, 0, ARG_IS_FUN),
+	MP4BOX_ARG("bo", "freeze the order of boxes in input file", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &freeze_box_order, 0, 0),
+	MP4BOX_ARG("init-seg", "use the given file as an init segment for dumping or for encryption", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, &use_init_seg, 0, 0),
+	MP4BOX_ARG("zmov", "compress movie box according to ISOBMFF box compression", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, parse_compress, 0, ARG_IS_FUN),
+	MP4BOX_ARG("xmov", "same as zmov and wraps ftyp in otyp", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, parse_compress, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG_S("edits", "tkID=EDITS", "set edit list. The following syntax is used (no separators between entries):\n"
+			" - `r`: removes all edits\n"
+			" - `eSTART`: add empty edit with given start time. START can be\n"
+			" - `VAL`: start time in seconds (int, double, fraction), media duration used as edit duration\n"
+			" - `VAL-DUR`: start time and duration in seconds (int, double, fraction)\n"
+			" - `eSTART,MEDIA[,RATE]`: add regular edit with given start, media start time in seconds (int, double, fraction) and rate (fraction or INT)\n"
+			" - Examples: \n"
+			" - `re0-5e5-3,4`: remove edits, add empty edit at 0s for 5s, then add regular edit at 5s for 3s starting at 4s in media track\n"
+			" - `re0-4,0,0.5`: remove edits, add single edit at 0s for 4s starting at 0s in media track and playing at speed 0.5\n"
+				, 0, parse_track_action, TRACK_ACTION_SET_EDITS, ARG_IS_FUN),
+ 	MP4BOX_ARG("moovpad", "specify amount of padding to keep after moov box for later inplace editing - if 0, moov padding is disabled", GF_ARG_INT, GF_ARG_HINT_EXPERT, &moov_pading, 0, ARG_NEED_SAVE),
+ 	MP4BOX_ARG("no-inplace", "disable inplace rewrite", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &no_inplace, 0, 0),
+ 	MP4BOX_ARG("hdr", "update HDR information based on given XML, 'none' removes HDR info", GF_ARG_STRING, GF_ARG_HINT_EXPERT, &high_dynamc_range_filename, 0, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG_S("time", "[tkID=]DAY/MONTH/YEAR-H:M:S", "set movie or track creation time", GF_ARG_HINT_EXPERT, parse_track_action, TRACK_ACTION_SET_TIME, ARG_IS_FUN),
+ 	MP4BOX_ARG_S("mtime", "tkID=DAY/MONTH/YEAR-H:M:S", "set media creation time", GF_ARG_HINT_EXPERT, parse_track_action, TRACK_ACTION_SET_MEDIA_TIME, ARG_IS_FUN),
 	{0}
 };
 
@@ -209,47 +455,108 @@
 {
 	u32 i=0;
 	gf_sys_format_help(helpout, help_flags, "# General Options\n"
-		"MP4Box is a multimedia packager, with a vast number of functionalities: conversion, splitting, hinting, dumping, DASH-ing, encryption and others.\n"
+		"MP4Box is a multimedia packager, with a vast number of functionalities: conversion, splitting, hinting, dumping, DASH-ing, encryption, transcoding and others.\n"
 		"MP4Box provides a large set of options, classified by categories (see [-h]()). These options do not follow any particular ordering.\n"
-		"MP4Box performs in-place rewrite of IsoMedia files (the input file is overwritten). You can change this behaviour by using the [-out]() option.\n"
-		"MP4Box stores by default the file with 0.5 second interleaving and meta-data (`moov`...) at the beginning, making it suitable for HTTP streaming. This may however takes longer to store the file, use [-flat]() to change this behaviour.\n"
+		" \n"
+		"By default, MP4Box rewrites the input file. You can change this behavior by using the [-out]() option.\n"
+		"MP4Box stores by default the file with 0.5 second interleaving and meta-data (`moov` ...) at the beginning, making it suitable for HTTP download-and-play. This may however takes longer to store the file, use [-flat]() to change this behavior.\n"
+		" \n"
 		"MP4Box usually generates a temporary file when creating a new IsoMedia file. The location of this temporary file is OS-dependent, and it may happen that the drive/partition the temporary file is created on has not enough space or no write access. In such a case, you can specify a temporary file location with [-tmp]().\n"
-		"Note: Track operations identify tracks through their ID (usually refered as tkID in the help), not their order.\n"
+		" \n"
 		"Option values:\n"
 		"Unless specified otherwise, an option of type `integer` expects a trackID value following it."
 		"An option of type `boolean` expects no following value."
+		"Note: Track operations identify tracks through their ID (usually referred to as tkID in the help), not their order.\n"
 		" \n"
-		"# File Splitting and Concatenation\n"
-		"MP4Box can split IsoMedia files by size, duration or extract a given part of the file to new IsoMedia file(s). This process requires that at most one track in the input file has non random-access points (typically one video track at most). This process will also ignore all MPEG-4 Systems tracks and hint tracks, but will try to split private media tracks.\n"
-		"Note: The input file must have enough random access points in order to be split. This may not be the case with some video files where only the very first sample of the video track is a key frame (many 3GP files with H263 video are recorded that way). In order to split such files you will have to use a real video editor and re-encode the content.\n"
-		"Note: You can add media to a file and split it in the same pass. In this case, the destination file (the one which would be obtained without spliting) will not be stored.\n"
-		" \n"
-		"Options:\n"
 	);
 
+
 	while (m4b_gen_args[i].name) {
-		GF_GPACArg *arg = &m4b_gen_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_gen_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-gen");
 	}
 }
 
 
-GF_GPACArg m4b_dash_args[] =
+MP4BoxArg m4b_split_args[] =
+{
+ 	MP4BOX_ARG("split", "split in files of given max duration (float number) in seconds. A trailing unit can be specified:\n"
+	"- `M`, `m`: duration is in minutes\n"
+	"- `H`, `h`: size is in hours", GF_ARG_STRING, 0, parse_split, 0, ARG_IS_FUN),
+	MP4BOX_ARG_ALT("split-rap", "splitr", "split in files at each new RAP", GF_ARG_STRING, 0, parse_split, 1, ARG_IS_FUN),
+	MP4BOX_ARG_ALT("split-size", "splits", "split in files of given max size (integer number) in kilobytes. A trailing unit can be specified:\n"
+	"- `M`, `m`: size is in megabytes\n"
+	"- `G`, `g`: size is in gigabytes", GF_ARG_STRING, 0, parse_split, 2, ARG_IS_FUN),
+	MP4BOX_ARG_ALT("split-chunk", "splitx", "extract the specified time range as follows:\n"
+	"- the start time is moved to the RAP sample closest to the specified start time\n"
+	"- the end time is kept as requested"
+		, GF_ARG_STRING, 0, parse_split, 3, ARG_IS_FUN),
+	MP4BOX_ARG("splitz", "extract the specified time range so that ranges `A:B` and `B:C` share exactly the same boundary `B`:\n"
+	"- the start time is moved to the RAP sample at or after the specified start time\n"
+	"- the end time is moved to the frame preceding the RAP sample at or following the specified end time"
+		, GF_ARG_STRING, 0, parse_split, 4, ARG_IS_FUN),
+	MP4BOX_ARG("splitg", "extract the specified time range as follows:\n"
+	"- the start time is moved to the RAP sample at or before the specified start time\n"
+	"- the end time is moved to the frame preceding the RAP sample at or following the specified end time"
+		, GF_ARG_STRING, 0, parse_split, 5, ARG_IS_FUN),
+	MP4BOX_ARG("splitf", "extract the specified time range and insert edits such that the extracted output is exactly the specified range\n", GF_ARG_STRING, 0, parse_split, 6, ARG_IS_FUN),
+	{0}
+};
+
+
+static void PrintSplitUsage()
+{
+	u32 i=0;
+	gf_sys_format_help(helpout, help_flags, " \n"
+		"# File splitting\n"
+		"MP4Box can split input files by size, duration or extract a given part of the file to new IsoMedia file(s).\n"
+		"This requires that at most one track in the input file has non random-access points (typically one video track at most).\n"
+		"Splitting will ignore all MPEG-4 Systems tracks and hint tracks, but will try to split private media tracks.\n"
+		"The input file must have enough random access points in order to be split. If this is not the case, you will have to re-encode the content.\n"
+		"You can add media to a file and split it in the same pass. In this case, the destination file (the one which would be obtained without splitting) will not be stored.\n"
+		" \n"
+		"Time ranges are specified as follows:\n"
+		"- `S-E`: `S` start and `E` end times, formatted as `HH:MM:SS.ms`, `MM:SS.ms` or time in seconds (int, double, fraction)\n"
+		"- `S:E`: `S` start time and `E` end times in seconds (int, double, fraction)\n"
+		"- `S:end` or `S:end-N`: `S` start time in seconds (int, double), `N` number of seconds (int, double) before the end\n"
+		" \n"
+		"MP4Box splitting runs a filter session using the `reframer` filter as follows:\n"
+		"- `splitrange` option of the reframer is always set\n"
+		"- source is demultiplexed with `alltk` option set\n"
+		"- start and end ranges are passed to `xs` and `xe` options of the reframer\n"
+		"- for `-splitz`, options `xadjust` and `xround=after` are enforced\n"
+		"- for `-splitg`, options `xadjust` and `xround=before` are enforced\n"
+		"- for `-splitf`, option `xround=seek` is enforced and `propbe_ref`set if not specified at prompt\n"
+		"- for `-splitx`, option `xround=closest` and `propbe_ref` are enforced if not specified at prompt\n"
+		" \n"
+		"The default output storage mode is to full interleave and will require a temp file for each output. This behavior can be modified using `-flat`, `-newfs`, `-inter` and `-frag`.\n"
+		"The output file name(s) can be specified using `-out` and templates (e.g. `-out split$num%%04d$.mp4` produces split0001.mp4, split0002.mp4, ...).\n"
+		" \n"
+	);
+
+	i=0;
+	while (m4b_split_args[i].name) {
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_split_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-split");
+	}
+
+}
+
+
+MP4BoxArg m4b_dash_args[] =
 {
- 	GF_DEF_ARG("mpd", NULL, "convert given HLS or smooth manifest (local or remote http) to MPD. \nWarning: This is not compatible with other DASH options and does not convert associated segments", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("dash", "-dash-strict", "create DASH from input files with given segment (subsegment for onDemand profile) duration in ms", NULL, NULL, GF_ARG_DOUBLE, 0),
- 	GF_DEF_ARG("dash-live", NULL, "generate a live DASH session using the given segment duration in ms; using `-dash-live=F`will also write the live context to `F`. MP4Box will run the live session until `q` is pressed or a fatal error occurs", NULL, NULL, GF_ARG_DOUBLE, 0),
- 	GF_DEF_ARG("ddbg-live", NULL, "same as [-dash-live]() without time regulation for debug purposes", NULL, NULL, GF_ARG_DOUBLE, 0),
-	GF_DEF_ARG("frag", NULL, "specify the fragment duration in ms. If not set, this is the DASH duration (one fragment per segment)", NULL, NULL, GF_ARG_DOUBLE, 0),
-	GF_DEF_ARG("out", NULL, "specify the output MPD file name", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("tmp", NULL, "specify directory for temporary file creation", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("profile", NULL, "specify the target DASH profile, and set default options to ensure conformance to the desired profile. Default profile is `full` in static mode, `live` in dynamic mode", NULL, "onDemand|live|main|simple|full|hbbtv1.5:live|dashavc264:live|dashavc264:onDemand", GF_ARG_STRING, 0),
-	GF_DEF_ARG("profile-ext", NULL, "specify a list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used", NULL, NULL, GF_ARG_STRING, 0),
-
-	GF_DEF_ARG("rap", NULL, "ensure that segments begin with random access points, segment durations might vary depending on the source encoding", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("frag-rap", NULL, "ensure that all fragments begin with random access points (duration might vary depending on the source encoding)", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("segment-name", NULL, "set the segment name for generated segments. If not set (default), segments are concatenated in output file except in `live` profile where `dash_%%s`. Supported replacement strings are:\n"
+ 	MP4BOX_ARG ("dash", "create DASH from input files with given segment (subsegment for onDemand profile) duration in ms", GF_ARG_DOUBLE, 0, &dash_duration, 0, ARG_NON_ZERO),
+ 	MP4BOX_ARG("dash-live", "generate a live DASH session using the given segment duration in ms; using `-dash-live=F` will also write the live context to `F`. MP4Box will run the live session until `q` is pressed or a fatal error occurs", GF_ARG_DOUBLE, 0, parse_dashlive, 0, ARG_IS_FUN2),
+ 	MP4BOX_ARG("ddbg-live", "same as [-dash-live]() without time regulation for debug purposes", GF_ARG_DOUBLE, 0, parse_dashlive, 1, ARG_IS_FUN2),
+	MP4BOX_ARG("frag", "specify the fragment duration in ms. If not set, this is the DASH duration (one fragment per segment)", GF_ARG_DOUBLE, 0, parse_store_mode, 2, ARG_IS_FUN),
+	MP4BOX_ARG("out", "specify the output MPD file name", GF_ARG_STRING, 0, &outName, 0, 0),
+	MP4BOX_ARG_ALT("profile", "dash-profile", "specify the target DASH profile, and set default options to ensure conformance to the desired profile. Default profile is `full` in static mode, `live` in dynamic mode (old syntax using `:live` instead of `.live` as separator still possible). Defined values are onDemand, live, main, simple, full, hbbtv1.5.live, dashavc264.live, dashavc264.onDemand, dashif.ll", GF_ARG_STRING, 0, parse_dash_profile, 0, ARG_IS_FUN),
+	MP4BOX_ARG("profile-ext", "specify a list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used", GF_ARG_STRING, 0, &dash_profile_extension, 0, 0),
+	MP4BOX_ARG("rap", "ensure that segments begin with random access points, segment durations might vary depending on the source encoding", GF_ARG_BOOL, 0, parse_rap_ref, 0, ARG_IS_FUN | ARG_EMPTY),
+	MP4BOX_ARG("frag-rap", "ensure that all fragments begin with random access points (duration might vary depending on the source encoding)", GF_ARG_BOOL, 0, &frag_at_rap, 0, 0),
+	MP4BOX_ARG("segment-name", "set the segment name for generated segments. If not set (default), segments are concatenated in output file except in `live` profile where `dash_%%s`. Supported replacement strings are:\n"
 	 "- $Number[%%0Nd]$ is replaced by the segment number, possibly prefixed with 0\n"
 	 "- $RepresentationID$ is replaced by representation name\n"
 	 "- $Time$ is replaced by segment start time\n"
@@ -257,77 +564,78 @@
 	 "- $Init=NAME$ is replaced by NAME for init segment, ignored otherwise\n"
 	 "- $Index=NAME$ is replaced by NAME for index segments, ignored otherwise\n"
 	 "- $Path=PATH$ is replaced by PATH when creating segments, ignored otherwise\n"
-	 "- $Segment=NAME$ is replaced by NAME for media segments, ignored for init segments", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("segment-ext", NULL, "set the segment extension, `null` means no extension", "m4s", NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("init-segment-ext", NULL, "set the segment extension for init, index and bitstream switching segments, `null` means no extension\n", "mp4", NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("segment-timeline", NULL, "use `SegmentTimeline` when generating segments", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("segment-marker `MARK`", NULL, "add a box of type `MARK` (4CC) at the end of each DASH segment", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("insert-utc", NULL, "insert UTC clock at the beginning of each ISOBMF segment", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("base-url", NULL, "set Base url at MPD level. Can be used several times. \nWarning: this does not modify generated files location", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("mpd-title", NULL, "set MPD title", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("mpd-source", NULL, "set MPD source", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("mpd-info-url", NULL, "set MPD info url", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("cprt", NULL, "add copyright string to MPD", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("dash-ctx", NULL, "store/restore DASH timing from indicated file", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("dynamic", NULL, "use dynamic MPD type instead of static", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("last-dynamic", NULL, "same as [-dynamic]() but close the period (insert lmsg brand if needed and update duration)", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("mpd-duration", NULL, "set the duration in second of a live session (if `0`, you must use [-mpd-refresh]())", "0", NULL, GF_ARG_DOUBLE, 0),
-	GF_DEF_ARG("mpd-refresh", NULL, "specify MPD update time in seconds", NULL, NULL, GF_ARG_DOUBLE, 0),
-	GF_DEF_ARG("time-shift", NULL, "specify MPD time shift buffer depth in seconds, `-1` to keep all files)", NULL, NULL, GF_ARG_DOUBLE, 0),
-	GF_DEF_ARG("subdur", NULL, "specify maximum duration in ms of the input file to be dashed in LIVE or context mode. This does not change the segment duration, but stops dashing once segments produced exceeded the duration. If there is not enough samples to finish a segment, data is looped unless [-no-loop]() is used which triggers a period end", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("run-for", NULL, "run for given ms the dash-live session then exits", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("min-buffer", NULL, "specify MPD min buffer time in ms", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("ast-offset", NULL, "specify MPD AvailabilityStartTime offset in ms if positive, or availabilityTimeOffset of each representation if negative", "0", NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("dash-scale", NULL, "specify that timing for [-dash]() and [-frag]() are expressed in given timexale (units per seconds)", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("mem-frags", NULL, "fragmentation happens in memory rather than on disk before flushing to disk", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("pssh", NULL, "set pssh store mode\n"
+	 "- $Segment=NAME$ is replaced by NAME for media segments, ignored for init segments", GF_ARG_STRING, 0, &seg_name, 0, 0),
+	{"segment-ext", NULL, "set the segment extension, `null` means no extension", "m4s", NULL, GF_ARG_STRING, 0, &seg_ext, 0, 0},
+	{"init-segment-ext", NULL, "set the segment extension for init, index and bitstream switching segments, `null` means no extension\n", "mp4", NULL, GF_ARG_STRING, 0, &init_seg_ext, 0, 0},
+	MP4BOX_ARG("segment-timeline", "use `SegmentTimeline` when generating segments", GF_ARG_BOOL, 0, &segment_timeline, 0, 0),
+	MP4BOX_ARG("segment-marker", "add a box of given type (4CC) at the end of each DASH segment", GF_ARG_STRING, 0, &segment_marker, 0, ARG_IS_4CC),
+	MP4BOX_ARG("insert-utc", "insert UTC clock at the beginning of each ISOBMF segment", GF_ARG_BOOL, 0, &insert_utc, 0, 0),
+	MP4BOX_ARG("base-url", "set Base url at MPD level. Can be used several times. \nWarning: this does not modify generated files location", GF_ARG_STRING, 0, parse_base_url, 0, ARG_IS_FUN),
+	MP4BOX_ARG("mpd-title", "set MPD title", GF_ARG_STRING, 0, &dash_title, 0, 0),
+	MP4BOX_ARG("mpd-source", "set MPD source", GF_ARG_STRING, 0, &dash_source, 0, 0),
+	MP4BOX_ARG("mpd-info-url", "set MPD info url", GF_ARG_STRING, 0, &dash_more_info, 0, 0),
+ 	MP4BOX_ARG("cprt", "add copyright string to MPD", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, &cprt, 0, 0),
+	MP4BOX_ARG("dash-ctx", "store/restore DASH timing from indicated file", GF_ARG_STRING, 0, &dash_ctx_file, 0, 0),
+	MP4BOX_ARG("dynamic", "use dynamic MPD type instead of static", GF_ARG_BOOL, 0, &dash_mode, GF_DASH_DYNAMIC, 0),
+	MP4BOX_ARG("last-dynamic", "same as [-dynamic]() but close the period (insert lmsg brand if needed and update duration)", GF_ARG_BOOL, 0, &dash_mode, GF_DASH_DYNAMIC_LAST, 0),
+	MP4BOX_ARG("mpd-duration", "set the duration in second of a live session (if `0`, you must use [-mpd-refresh]())", GF_ARG_DOUBLE, 0, &mpd_live_duration, 0, 0),
+	MP4BOX_ARG("mpd-refresh", "specify MPD update time in seconds", GF_ARG_DOUBLE, 0, &mpd_update_time, 0, 0),
+	MP4BOX_ARG("time-shift", "specify MPD time shift buffer depth in seconds, `-1` to keep all files)", GF_ARG_INT, 0, &time_shift_depth, 0, 0),
+	MP4BOX_ARG("subdur", "specify maximum duration in ms of the input file to be dashed in LIVE or context mode. This does not change the segment duration, but stops dashing once segments produced exceeded the duration. If there is not enough samples to finish a segment, data is looped unless [-no-loop]() is used which triggers a period end", GF_ARG_DOUBLE, 0, &dash_subduration, 0, 0),
+	MP4BOX_ARG("run-for", "run for given ms the dash-live session then exits", GF_ARG_INT, 0, &run_for, 0, 0),
+	MP4BOX_ARG("min-buffer", "specify MPD min buffer time in ms", GF_ARG_INT, 0, &min_buffer, 0, ARG_DIV_1000),
+	MP4BOX_ARG("ast-offset", "specify MPD AvailabilityStartTime offset in ms if positive, or availabilityTimeOffset of each representation if negative", GF_ARG_INT, 0, &ast_offset_ms, 0, 0),
+	MP4BOX_ARG("dash-scale", "specify that timing for [-dash](), [-dash-live](), [-subdur]() and [-do_frag]() are expressed in given timescale (units per seconds) rather than ms", GF_ARG_INT, 0, &dash_scale, 0, ARG_NON_ZERO),
+	MP4BOX_ARG("mem-frags", "fragmentation happens in memory rather than on disk before flushing to disk", GF_ARG_BOOL, 0, &memory_frags, 0, 0),
+	MP4BOX_ARG("pssh", "set pssh store mode\n"
 	"- v: initial movie\n"
 	"- f: movie fragments\n"
 	"- m: MPD\n"
 	"- mv, vm: in initial movie and MPD\n"
-	"- mf, fm: in movie fragments and MPD", NULL, "v|f|m|mv|vm|mf|fm", GF_ARG_INT, 0),
-	GF_DEF_ARG("sample-groups-traf", NULL, "store sample group descriptions in traf (duplicated for each traf). If not set, sample group descriptions are stored in the initial movie", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("mvex-after-traks", NULL, "store `mvex` box after `trak` boxes within the moov box. If not set, `mvex` is before", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("sdtp-traf", NULL, "use `sdtp` box in `traf` (Smooth-like)\n"
+	"- mf, fm: in movie fragments and MPD", GF_ARG_INT, 0, parse_pssh, 0, ARG_IS_FUN),
+	MP4BOX_ARG("sample-groups-traf", "store sample group descriptions in traf (duplicated for each traf). If not set, sample group descriptions are stored in the initial movie", GF_ARG_BOOL, 0, &samplegroups_in_traf, 0, 0),
+	MP4BOX_ARG("mvex-after-traks", "store `mvex` box after `trak` boxes within the moov box. If not set, `mvex` is before", GF_ARG_BOOL, 0, &mvex_after_traks, 0, 0),
+	MP4BOX_ARG("sdtp-traf", "use `sdtp` box in `traf` (Smooth-like)\n"
 	"- no: do not use sdtp\n"
-	"- sdtp: use sdtp box to indicate sample dependencies and don't write info in trun sample flags\n"
-	"- both: use sdtp box to indicate sample dependencies and also write info in trun sample flags\n", NULL, "no|sdtp|both", GF_ARG_INT, 0),
-	GF_DEF_ARG("no-cache", NULL, "disable file cache for dash inputs", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("no-loop", NULL, "disable looping content in live mode and uses period switch instead", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("hlsc", NULL, "insert UTC in variant playlists for live HLS", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("bound", NULL, "segmentation will always try to split before or at, but never after, the segment boundary", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("closest", NULL, "segmentation will use the closest frame to the segment boundary (before or after)", NULL, NULL, GF_ARG_BOOL, 0),
-
-	GF_DEF_ARG("subsegs-per-sidx", NULL, "set the number of subsegments to be written in each SIDX box\n"
+	"- sdtp: use sdtp box to indicate sample dependencies and do not write info in trun sample flags\n"
+	"- both: use sdtp box to indicate sample dependencies and also write info in trun sample flags\n", GF_ARG_INT, 0, parse_sdtp, 0, ARG_IS_FUN),
+	MP4BOX_ARG("no-cache", "disable file cache for dash inputs", GF_ARG_BOOL, 0, &no_cache, 0, 0),
+	MP4BOX_ARG("no-loop", "disable looping content in live mode and uses period switch instead", GF_ARG_BOOL, 0, &no_loop, 0, 0),
+	MP4BOX_ARG("hlsc", "insert UTC in variant playlists for live HLS", GF_ARG_BOOL, 0, &hls_clock, 0, 0),
+	MP4BOX_ARG("bound", "segmentation will always try to split before or at, but never after, the segment boundary", GF_ARG_BOOL, 0, &dash_split_mode, GF_DASH_SPLIT_IN, 0),
+	MP4BOX_ARG("closest", "segmentation will use the closest frame to the segment boundary (before or after)", GF_ARG_BOOL, 0, &dash_split_mode, GF_DASH_SPLIT_CLOSEST, 0),
+	MP4BOX_ARG_ALT("subsegs-per-sidx", "frags-per-sidx", "set the number of subsegments to be written in each SIDX box\n"
 	"- 0: a single SIDX box is used per segment\n"
-	"- -1: no SIDX box is used", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("ssix", NULL, "enable SubsegmentIndexBox describing 2 ranges, first one from moof to end of first I-frame, second one unmapped. This does not work with daisy chaining mode enabled", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("url-template", NULL, "use SegmentTemplate instead of explicit sources in segments. Ignored if segments are stored in the output file", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("daisy-chain", NULL, "use daisy-chain SIDX instead of hierarchical. Ignored if frags/sidx is 0", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("single-segment", NULL, "use a single segment for the whole file (OnDemand profile)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("single-file", NULL, "use a single file for the whole file (default)", "yes", NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("bs-switching", NULL, "set bitstream switching mode\n"
+	"- -1: no SIDX box is used", GF_ARG_INT, GF_ARG_HINT_EXPERT, &subsegs_per_sidx, 0, 0),
+	MP4BOX_ARG("ssix", "enable SubsegmentIndexBox describing 2 ranges, first one from moof to end of first I-frame, second one unmapped. This does not work with daisy chaining mode enabled", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &use_ssix, 0, 0),
+	MP4BOX_ARG("url-template", "use SegmentTemplate instead of explicit sources in segments. Ignored if segments are stored in the output file", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &use_url_template, 1, 0),
+	MP4BOX_ARG("url-template-sim", "use SegmentTemplate simulation while converting HLS to MPD", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &use_url_template, 2, 0),
+	MP4BOX_ARG("daisy-chain", "use daisy-chain SIDX instead of hierarchical. Ignored if frags/sidx is 0", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &daisy_chain_sidx, 0, 0),
+	MP4BOX_ARG("single-segment", "use a single segment for the whole file (OnDemand profile)", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &single_segment, 0, 0),
+	{"single-file", NULL, "use a single file for the whole file (default)", "yes", NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &single_file, 0, 0},
+	{"bs-switching", NULL, "set bitstream switching mode\n"
 	"- inband: use inband param set and a single init segment\n"
 	"- merge: try to merge param sets in a single sample description, fallback to `no`\n"
 	"- multi: use several sample description, one per quality\n"
 	"- no: use one init segment per quality\n"
-	"- single: to test with single input", "inband", "inband|merge|multi|no|single", GF_ARG_STRING, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("moof-sn", NULL, "set sequence number of first moof to given value", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("tfdt", NULL, "set TFDT of first traf to given value in SCALE units (cf -dash-scale)", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("no-frags-default", NULL, "disable default fragments flags in trex (required by some dash-if profiles and CMAF/smooth streaming compatibility)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("single-traf", NULL, "use a single track fragment per moof (smooth streaming and derived specs may require this)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("tfdt-traf", NULL, "use a tfdt per track fragment (when -single-traf is used)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("dash-ts-prog", NULL, "program_number to be considered in case of an MPTS input file", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("frag-rt", NULL, "when using fragments in live mode, flush fragments according to their timing", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("cp-location", NULL, "set ContentProtection element location\n"
+	"- pps: use out of band VPS,SPS,DCI, inband for PPS,APS and a single init segment\n"
+	"- single: to test with single input", "inband", "inband|merge|multi|no|single", GF_ARG_STRING, GF_ARG_HINT_EXPERT, parse_bs_switch, 0, ARG_IS_FUN},
+	MP4BOX_ARG("moof-sn", "set sequence number of first moof to given value", GF_ARG_INT, GF_ARG_HINT_EXPERT, &initial_moof_sn, 0, 0),
+	MP4BOX_ARG("tfdt", "set TFDT of first traf to given value in SCALE units (cf -dash-scale)", GF_ARG_INT, GF_ARG_HINT_EXPERT, &initial_tfdt, 0, ARG_64BITS),
+	MP4BOX_ARG("no-frags-default", "disable default fragments flags in trex (required by some dash-if profiles and CMAF/smooth streaming compatibility)", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &no_fragments_defaults, 0, 0),
+	MP4BOX_ARG("single-traf", "use a single track fragment per moof (smooth streaming and derived specs may require this)", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &single_traf_per_moof, 0, 0),
+	MP4BOX_ARG("tfdt-traf", "use a tfdt per track fragment (when -single-traf is used)", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &tfdt_per_traf, 0, 0),
+	MP4BOX_ARG("dash-ts-prog", "program_number to be considered in case of an MPTS input file", GF_ARG_INT, GF_ARG_HINT_EXPERT, &program_number, 0, 0),
+	MP4BOX_ARG("frag-rt", "when using fragments in live mode, flush fragments according to their timing", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &frag_real_time, 0, 0),
+	MP4BOX_ARG("cp-location", "set ContentProtection element location\n"
 	 "- as: sets ContentProtection in AdaptationSet element\n"
 	 "- rep: sets ContentProtection in Representation element\n"
-	 "- both: sets ContentProtection in both elements", NULL, "as|rep\both", GF_ARG_STRING, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("start-date", NULL, "for live mode, set start date (as xs:date, eg YYYY-MM-DDTHH:MM:SSZ). Default is current UTC\n"
-	"Warning: Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
-
-	GF_DEF_ARG("cues", NULL, "ignore dash duration and segment according to cue times in given XML file (tests/media/dash_cues for examples)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("strict-cues", NULL, "throw error if something is wrong while parsing cues or applying cue-based segmentation", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	 "- both: sets ContentProtection in both elements", GF_ARG_STRING, GF_ARG_HINT_EXPERT, parse_cp_loc, 0, ARG_IS_FUN),
+	MP4BOX_ARG("start-date", "for live mode, set start date (as xs:date, e.g. YYYY-MM-DDTHH:MM:SSZ). Default is current UTC\n"
+	"Warning: Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size", GF_ARG_STRING, GF_ARG_HINT_EXPERT, &dash_start_date, 0, 0),
+	MP4BOX_ARG("cues", "ignore dash duration and segment according to cue times in given XML file (tests/media/dash_cues for examples)", GF_ARG_STRING, GF_ARG_HINT_EXPERT, &dash_cues, 0, 0),
+	MP4BOX_ARG("strict-cues", "throw error if something is wrong while parsing cues or applying cue-based segmentation", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &strict_cues, 0, 0),
+	MP4BOX_ARG("merge-last-seg", "merge last segment if shorter than half the target duration", GF_ARG_BOOL, GF_ARG_HINT_EXPERT, &merge_last_seg, 0, 0),
 	{0}
 };
 
@@ -337,7 +645,7 @@
 	gf_sys_format_help(helpout, help_flags, "# DASH Options\n"
 		"Also see:\n"
 		"- the [dasher `gpac -h dash`](dasher) filter documentation\n"
-		"- [[online DASH Intro doc|DASH Introduction]].\n"
+		"- [[DASH wiki|DASH-intro]].\n"
 		"\n"
 		"# Specifying input files\n"
 		"Input media files to dash can use the following modifiers\n"
@@ -345,13 +653,13 @@
 		"- #N: only use the track ID N from the source file (mapped to [-tkid](mp4dmx))\n"
 		"- #video: only use the first video track from the source file\n"
 		"- #audio: only use the first audio track from the source file\n"
-		"- :id=NAME: set the representation ID to NAME. Reserved value `NULL` disables representation ID for multiplexed inputs\n"
-		"- :dur=VALUE: process VALUE seconds from the media. If VALUE is longer than media duration, last sample duration is extended.\n"
+		"- :id=NAME: set the representation ID to NAME. Reserved value `NULL` disables representation ID for multiplexed inputs. If not set, a default value is computed and all selected tracks from the source will be in the same output multiplex.\n"
+		"- :dur=VALUE: process VALUE seconds (fraction) from the media. If VALUE is longer than media duration, last sample duration is extended.\n"
 		"- :period=NAME: set the representation's period to NAME. Multiple periods may be used. Periods appear in the MPD in the same order as specified with this option\n"
 		"- :BaseURL=NAME: set the BaseURL. Set multiple times for multiple BaseURLs\nWarning: This does not modify generated files location (see segment template).\n"
 		"- :bandwidth=VALUE: set the representation's bandwidth to a given value\n"
-		"- :pdur=VALUE: increase the duration of this period by the given duration in seconds (alias for period_duration:VALUE). This is only used when no input media is specified (remote period insertion), eg `:period=X:xlink=Z:pdur=Y`\n"
-		"- :duration=VALUE: override target DASH segment duration for this input\n"
+		"- :pdur=VALUE: sets the duration of the associated period to VALUE seconds (fraction) (alias for period_duration:VALUE). This is only used when no input media is specified (remote period insertion), e.g. `:period=X:xlink=Z:pdur=Y`\n"
+		"- :ddur=VALUE: override target DASH segment duration to VALUE seconds (fraction) for this input (alias for duration:VALUE)\n"
 		"- :xlink=VALUE: set the xlink value for the period containing this element. Only the xlink declared on the first rep of a period will be used\n"
 		"- :asID=VALUE: set the AdaptationSet ID to NAME\n"
 		"- :role=VALUE: set the role of this representation (cf DASH spec). Media with different roles belong to different adaptation sets.\n"
@@ -361,68 +669,77 @@
 		"- :desc_rep=VALUE: add a descriptor at the Representation level. Value must be a properly formatted XML element. Value is ignored while creating AdaptationSet elements.\n"
 		"- :sscale: force movie timescale to match media timescale of the first track in the segment.\n"
 		"- :trackID=N: only use the track ID N from the source file\n"
-		"- @@f1[:args][@@fN:args]: set a filter chain to insert between the source and the dasher. Each filter in the chain is formatted as a regular filter, see [filter doc `gpac -h doc`](filters_general). If several filters are set, they will be chained in the given order.\n"
+		"- @f1[:args][@fN:args][@@fK:args]: set a filter chain to insert between the source and the dasher. Each filter in the chain is formatted as a regular filter, see [filter doc `gpac -h doc`](filters_general). If several filters are set:\n"
+		" - they will be chained in the given order if separated by a single `@`\n"
+		" - a new filter chain will be created if separated by a double `@@`. In this case, no representation ID is assigned to the source.\n"
+		"EX source.mp4:@c=avc:b=1M@@c=avc:b=500k\n"
+		"This will load a filter chain with two encoders connected to the source and to the dasher.\n"
+		"EX source.mp4:@c=avc:b=1M@c=avc:b=500k\n"
+		"This will load a filter chain with the second encoder connected to the output of the first (!!).\n"
 		"\n"
-		"Note: `@@f` must be placed after all other options.\n"
+		"Note: `@f` must be placed after all other options.\n"
 		"\n"
 		"# Options\n"
 		);
 
 
 	while (m4b_dash_args[i].name) {
-		GF_GPACArg *arg = &m4b_dash_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_dash_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-dash");
 	}
 }
 
 
-GF_GPACArg m4b_imp_args[] =
+MP4BoxArg m4b_imp_args[] =
 {
- 	GF_DEF_ARG("add", NULL, "add given file tracks to file. Multiple inputs can be specified using `+`, eg `-add url1+url2", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("cat", NULL, "concatenate given file samples to file, creating tracks if needed. Multiple inputs can be specified using `+`(eg `-cat url1+url2). \nNote: This aligns initial timestamp of the file to be concatenated", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("catx", NULL, "same as [-cat]() but new tracks can be imported before concatenation by specifying `+ADD_COMMAND` where `ADD_COMMAND` is a regular [-add]() syntax", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("catpl", NULL, "concatenate files listed in the given playlist file (one file per line, lines starting with # are comments). \nNote: Each listed file is concatenated as if called with -cat", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("unalign-cat", NULL, "do not attempt to align timestamps of samples inbetween tracks", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("force-cat", NULL, "skip media configuration check when concatenating file. \nWarning: THIS MAY BREAK THE CONCATENATED TRACK(S)", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("keep-sys", NULL, "keep all MPEG-4 Systems info when using [-add]() and [-cat]() (only used when adding IsoMedia files)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dref", NULL, "keep media data in original file using `data referencing`. The resulting file only contains the meta-data of the presentation (frame sizes, timing, etc...) and references media data in the original file. This is extremely useful when developping content, since importing and storage of the MP4 file is much faster and the resulting file much smaller. \nNote: Data referencing may fail on some files because it requires the framed data (eg an IsoMedia sample) to be continuous in the original file, which is not always the case depending on the original interleaving or bitstream format (__AVC__ or __HEVC__ cannot use this option)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("no-drop", NULL, "force constant FPS when importing AVI video", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("packed", NULL, "force packed bitstream when importing raw MPEG-4 part 2 Advanced Simple Profile", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("sbr", NULL, "backward compatible signaling of AAC-SBR", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("sbrx", NULL, "non-backward compatible signaling of AAC-SBR", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("ps", NULL, "backward compatible signaling of AAC-PS", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("psx", NULL, "non-backward compatible signaling of AAC-PS", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("ovsbr", NULL, "oversample SBR import (SBR AAC, PS AAC and oversampled SBR cannot be detected at import time)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("fps", NULL, "force frame rate for video and SUB subtitles import to the given value, expressed as a number or as `timescale-increment`. \nNote: For raw H263 import, default FPS is `15`, otherwise `25`. This is ignored for ISOBMFF import, use `:rescale` option for that", "25", NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("mpeg4", NULL, "force MPEG-4 sample descriptions when possible. For AAC, forces MPEG-4 AAC signaling even if MPEG-2", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("agg", NULL, "aggregate N audio frames in 1 sample (3GP media only, maximum value is 15)", NULL, NULL, GF_ARG_INT, 0),
+	MP4BOX_ARG("add", "add given file tracks to file. Multiple inputs can be specified using `+`, e.g. `-add url1+url2`", GF_ARG_STRING, 0, &nb_add, 0, ARG_INT_INC),
+	MP4BOX_ARG("cat", "concatenate given file samples to file, creating tracks if needed. Multiple inputs can be specified using `+`, e.g/ `-cat url1+url2`. \nNote: This aligns initial timestamp of the file to be concatenated", GF_ARG_STRING, 0, &nb_cat, 0, ARG_INT_INC),
+ 	MP4BOX_ARG("catx", "same as [-cat]() but new tracks can be imported before concatenation by specifying `+ADD_COMMAND` where `ADD_COMMAND` is a regular [-add]() syntax", GF_ARG_STRING, 0, &nb_cat, 0, ARG_INT_INC),
+ 	MP4BOX_ARG("catpl", "concatenate files listed in the given playlist file (one file per line, lines starting with # are comments). \nNote: Each listed file is concatenated as if called with -cat", GF_ARG_STRING, 0, &nb_cat, 0, ARG_INT_INC),
+ 	MP4BOX_ARG("unalign-cat", "do not attempt to align timestamps of samples in-between tracks", GF_ARG_BOOL, 0, &align_cat, 0, ARG_BOOL_REV),
+ 	MP4BOX_ARG("force-cat", "skip media configuration check when concatenating file. \nWarning: THIS MAY BREAK THE CONCATENATED TRACK(S)", GF_ARG_BOOL, 0, &force_cat, 0, 0),
+ 	MP4BOX_ARG("keep-sys", "keep all MPEG-4 Systems info when using [-add]() and [-cat]() (only used when adding IsoMedia files)", GF_ARG_BOOL, 0, &keep_sys_tracks, 0, 0),
+	MP4BOX_ARG("dref", "keep media data in original file using `data referencing`. The resulting file only contains the meta-data of the presentation (frame sizes, timing, etc...) and references media data in the original file. This is extremely useful when developing content, since importing and storage of the MP4 file is much faster and the resulting file much smaller. \nNote: Data referencing may fail on some files because it requires the framed data (e.g. an IsoMedia sample) to be continuous in the original file, which is not always the case depending on the original interleaving or bitstream format (__AVC__ or __HEVC__ cannot use this option)", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_USE_DATAREF, ARG_BIT_MASK),
+ 	MP4BOX_ARG_ALT("no-drop", "nodrop", "force constant FPS when importing AVI video", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_NO_FRAME_DROP, ARG_BIT_MASK),
+ 	MP4BOX_ARG("packed", "force packed bitstream when importing raw MPEG-4 part 2 Advanced Simple Profile", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_FORCE_PACKED, ARG_BIT_MASK),
+ 	MP4BOX_ARG("sbr", "backward compatible signaling of AAC-SBR", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_SBR_IMPLICIT, ARG_BIT_MASK),
+ 	MP4BOX_ARG("sbrx", "non-backward compatible signaling of AAC-SBR", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_SBR_EXPLICIT, ARG_BIT_MASK),
+ 	MP4BOX_ARG("ps", "backward compatible signaling of AAC-PS", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_PS_IMPLICIT, ARG_BIT_MASK),
+ 	MP4BOX_ARG("psx", "non-backward compatible signaling of AAC-PS", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_PS_EXPLICIT, ARG_BIT_MASK),
+ 	MP4BOX_ARG("ovsbr", "oversample SBR import (SBR AAC, PS AAC and oversampled SBR cannot be detected at import time)", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_OVSBR, ARG_BIT_MASK),
+ 	MP4BOX_ARG("fps", "force frame rate for video and SUB subtitles import to the given value, expressed as a number, as `TS-inc` or `TS/inc`. \nNote: For raw H263 import, default FPS is `15`, otherwise `25`. This is ignored for ISOBMFF import, use `:rescale` option for that", GF_ARG_STRING, 0, parse_fps, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("mpeg4", "force MPEG-4 sample descriptions when possible. For AAC, forces MPEG-4 AAC signaling even if MPEG-2", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_FORCE_MPEG4, ARG_BIT_MASK),
+ 	MP4BOX_ARG("agg", "aggregate N audio frames in 1 sample (3GP media only, maximum value is 15)", GF_ARG_INT, 0, &agg_samples, 0, 0),
 	{0}
 };
 
 
-static GF_GPACArg ImportFileOpts [] = {
-	GF_DEF_ARG("dur", NULL, "`X` import only the specified duration from the media. Value can be:\n"
+static MP4BoxArg m4b_imp_fileopt_args [] = {
+	GF_DEF_ARG("dur", NULL, "`XC` import only the specified duration from the media. Value can be:\n"
 		" - positive float: specifies duration in seconds\n"
 		" - fraction: specifies duration as NUM/DEN fraction\n"
 		" - negative integer: specifies duration in number of coded frames", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("lang", NULL, "set imported media language code", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("delay", NULL, "set imported media initial delay in ms", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("par", NULL, "set visual pixel aspect ratio (see [-par](MP4B_GEN) )", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("clap", NULL, "set visual clean aperture (see [-clap](MP4B_GEN) )", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("mx", NULL, "set track matrix (see [-mx](MP4B_GEN) )", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("name", NULL, "set track handler name", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("start", NULL, "`C` target start time in source media, may not be supported depending on the source", NULL, NULL, GF_ARG_DOUBLE, 0),
+	GF_DEF_ARG("lang", NULL, "`S` set imported media language code", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("delay", NULL, "`S` set imported media initial delay (>0) or initial skip (<0) in ms or as fractional seconds (`N/D`)", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("par", NULL, "`S` set visual pixel aspect ratio (see [-par](MP4B_GEN) )", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("clap", NULL, "`S` set visual clean aperture (see [-clap](MP4B_GEN) )", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("mx", NULL, "`S` set track matrix (see [-mx](MP4B_GEN) )", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("name", NULL, "`S` set track handler name", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("ext", NULL, "override file extension when importing", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("hdlr", NULL, "set track handler type to the given code point (4CC)", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("disable", NULL, "disable imported track(s)", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("group", NULL, "add the track as part of the G alternate group. If G is 0, the first available GroupID will be picked", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("hdlr", NULL, "`S` set track handler type to the given code point (4CC)", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("stype", NULL, "`S` force sample description type to given code point (4CC), may likely break the file", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("tkhd", NULL, "`S` set track header flags has hex integer or as comma-separated list of `enable`, `movie`, `preview`, `size_ar` keywords (use `tkhd+=FLAGS` to add and `tkhd-=FLAGS` to remove)", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("disable", NULL, "`S` disable imported track(s), use `disable=no` to force enabling a disabled track", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("group", NULL, "`S` add the track as part of the G alternate group. If G is 0, the first available GroupID will be picked", NULL, NULL, GF_ARG_INT, 0),
 	GF_DEF_ARG("fps", NULL, "same as [-fps]()", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("rap", NULL, "`D` import only RAP samples", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("refs", NULL, "`D` import only reference pictures", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("rap", NULL, "`DS` import only RAP samples", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("refs", NULL, "`DS` import only reference pictures", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("trailing", NULL, "keep trailing 0-bytes in AVC/HEVC samples", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("agg", NULL, "`X` same as [-agg]()", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("dref", NULL, "`X` same as [-dref]()", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("keep_refs", NULL, "keep track reference when importing a single track", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("dref", NULL, "`XC` same as [-dref]()", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("keep_refs", NULL, "`C` keep track reference when importing a single track", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("nodrop", NULL, "same as [-nodrop]()", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("packed", NULL, "`X` same as [-packed]()", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("sbr", NULL, "same as [-sbr]()", NULL, NULL, GF_ARG_BOOL, 0),
@@ -430,54 +747,55 @@
 	GF_DEF_ARG("ovsbr", NULL, "same as [-ovsbr]()", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("ps", NULL, "same as [-ps]()", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("psx", NULL, "same as [-psx]()", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("asemode", NULL, "`X` set the mode to create the AudioSampleEntry. Value can be:\n"
+	GF_DEF_ARG("asemode", NULL, "`XS` set the mode to create the AudioSampleEntry. Value can be:\n"
 		" - v0-bs: use MPEG AudioSampleEntry v0 and the channel count from the bitstream (even if greater than 2) - default\n"
 		" - v0-2: use MPEG AudioSampleEntry v0 and the channel count is forced to 2\n"
 		" - v1: use MPEG AudioSampleEntry v1 and the channel count from the bitstream\n"
 		" - v1-qt: use QuickTime Sound Sample Description Version 1 and the channel count from the bitstream (even if greater than 2). This will also trigger using alis data references instead of url, even for non-audio tracks", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("audio_roll", NULL, "add a roll sample group with roll_distance `N`", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("audio_roll", NULL, "`S` add a roll sample group with roll_distance `N` for audio tracks", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("roll", NULL, "`S` add a roll sample group with roll_distance `N`", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("proll", NULL, "`S` add a preroll sample group with roll_distance `N`", NULL, NULL, GF_ARG_INT, 0),
 	GF_DEF_ARG("mpeg4", NULL, "`X` same as [-mpeg4]() option", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("nosei", NULL, "discard all SEI messages during import", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("svc", NULL, "import SVC/LHVC with explicit signaling (no AVC base compatibility)", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("nosvc", NULL, "discard SVC/LHVC data when importing", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("svcmode", NULL, "`D` set SVC/LHVC import mode. Value can be:\n"
+	GF_DEF_ARG("svcmode", NULL, "`DS` set SVC/LHVC import mode. Value can be:\n"
 		" - split: each layer is in its own track\n"
 		" - merge: all layers are merged in a single track\n"
 		" - splitbase: all layers are merged in a track, and the AVC base in another\n"
 		" - splitnox: each layer is in its own track, and no extractors are written\n"
 		" - splitnoxib: each layer is in its own track, no extractors are written, using inband param set signaling", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("temporal", NULL, "`D` set HEVC/LHVC temporal sublayer import mode. Value can be:\n"
+	GF_DEF_ARG("temporal", NULL, "`DS` set HEVC/LHVC temporal sublayer import mode. Value can be:\n"
 		" - split: each sublayer is in its own track\n"
 		" - splitbase: all sublayers are merged in a track, and the HEVC base in another\n"
 		" - splitnox: each layer is in its own track, and no extractors are written", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("subsamples", NULL, "add SubSample information for AVC+SVC", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("deps", NULL, "import sample dependency information for AVC and HEVC", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("ccst", NULL, "add default HEIF ccst box to visual sample entry", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("forcesync", NULL, "force non IDR samples with I slices to be marked as sync points (AVC GDR)\n"
+	GF_DEF_ARG("ccst", NULL, "`S` add default HEIF ccst box to visual sample entry", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("forcesync", NULL, "force non IDR samples with I slices (OpenGOP or GDR) to be marked as sync points\n"
 		"Warning: RESULTING FILE IS NOT COMPLIANT WITH THE SPEC but will fix seeking in most players", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("xps_inband", NULL, "`X` set xPS inband for AVC/H264 and HEVC (for reverse operation, re-import from raw media)", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("xps_inbandx", NULL, "`X` same as xps_inband and also keep first xPS in sample desciption", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("xps_inband", NULL, "`XC` set xPS inband for AVC/H264 and HEVC (for reverse operation, re-import from raw media)", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("xps_inbandx", NULL, "`XC` same as xps_inband and also keep first xPS in sample description", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("au_delim", NULL, "keep AU delimiter NAL units in the imported file", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("max_lid", NULL, "set HEVC max layer ID to be imported to `N` (by default imports all layers)", NULL, NULL, GF_ARG_INT, 0),
 	GF_DEF_ARG("max_tid", NULL, "set HEVC max temporal ID to be imported to `N` (by default imports all temporal sublayers)", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("tiles", NULL, "add HEVC tiles signaling and NALU maps without splitting the tiles into different tile tracks", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("split_tiles", NULL, "`D` split HEVC tiles into different tile tracks, one tile (or all tiles of one slice) per track", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("negctts", NULL, "use negative CTS-DTS offsets (ISO4 brand)", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("chap", NULL, "specify the track is a chapter track", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("chapter", NULL, "add a single chapter (old nero format) with given name lasting the entire file", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("chapfile", NULL, "add a chapter file (old nero format)", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("layout", NULL, "specify the track layout as WxHxXxY\n"
-		" - if W (resp H) = 0: the max width (resp height) of the tracks in the file are used\n"
-		" - if Y=-1: the layout is moved to the bottom of the track area\n"
-		" - X and Y can be omitted: `:layout=WxH`", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("rescale", NULL, "force media timescale to TS !! changes the media duration", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("timescale", NULL, "set imported media timescale to TS", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("moovts", NULL, "set movie timescale to TS. A negative value picks the media timescale of the first track imported", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("noedit", NULL, "`X` do not set edit list when importing B-frames video tracks", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("rvc", NULL, "set RVC configuration for the media", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("fmt", NULL, "override format detection with given format (cf BT/XMTA doc)", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("profile", NULL, "override AVC profile", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("level", NULL, "override AVC level", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("tiles", NULL, "`S` add HEVC tiles signaling and NALU maps without splitting the tiles into different tile tracks", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("split_tiles", NULL, "`DS` split HEVC tiles into different tile tracks, one tile (or all tiles of one slice) per track", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("negctts", NULL, "`S` use negative CTS-DTS offsets (ISO4 brand). Use `negctts=no` to force using positive offset on existing track", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("chap", NULL, "`S` specify the track is a chapter track", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("chapter", NULL, "`S` add a single chapter (old nero format) with given name lasting the entire file", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("chapfile", NULL, "`S` add a chapter file (old nero format)", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("layout", NULL, "`S` specify the track layout as `WxH[xXxY][xLAYER]`. If `W` (resp `H`) is 0, the max width (resp height) of the tracks in the file are used", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("rescale", NULL, "`S` force media timescale to TS (int or fraction) and change the media duration", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("sampdur", NULL, "`S` force all samples duration (`D`) or sample durations and media timescale (`D/TS`), used to patch CFR files with broken timings", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("timescale", NULL, "`S` set imported media timescale to TS", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("moovts", NULL, "`S` set movie timescale to TS. A negative value picks the media timescale of the first track imported", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("noedit", NULL, "`XS` do not set edit list when importing B-frames video tracks", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("rvc", NULL, "`S` set RVC configuration for the media", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("fmt", NULL, "override format detection with given format - disable data probing and force `ext` option on source", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("profile", NULL, "`S` override AVC profile. Integer value, or `high444`, `high`, `extended`, `main`, `baseline`", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("level", NULL, "`S` override AVC level, if value < 6, interpreted as decimal expression", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("compat", NULL, "`S` force the profile compatibility flags for the H.264 content", NULL, NULL, GF_ARG_INT, 0),
 	GF_DEF_ARG("novpsext", NULL, "remove VPS extensions from HEVC VPS", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("keepav1t", NULL, "keep AV1 temporal delimiter OBU in samples, might help if source file had losses", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("font", NULL, "specify font name for text import (default `Serif`)", NULL, NULL, GF_ARG_STRING, 0),
@@ -497,44 +815,61 @@
 	GF_DEF_ARG("swf-ic2d", NULL, "use indexed curve 2D hardcoded proto", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("swf-same-app", NULL, "appearance nodes are reused", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("swf-flatten", NULL, "complementary angle below which 2 lines are merged, `0` means no flattening", NULL, NULL, GF_ARG_DOUBLE, 0),
-	GF_DEF_ARG("kind", NULL, "set kind for the track as `schemeURI=value`", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("kind", NULL, "`S` set kind for the track as `schemeURI=value`", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("txtflags", NULL, "set display flags (hexa number) of text track. Use `txtflags+=FLAGS` to add flags and `txtflags-=FLAGS` to remove flags", NULL, NULL, GF_ARG_INT, 0),
 	GF_DEF_ARG("rate", NULL, "force average rate and max rate to VAL (in bps) in btrt box. If 0, removes btrt box", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("stz2", NULL, "use compact size table (for low-bitrates)", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("stz2", NULL, "`S` use compact size table (for low-bitrates)", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("bitdepth", NULL, "set bit depth to VAL for imported video content (default is 24)", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("colr", NULL, "set color profile for imported video content (see ISO/IEC 23001-8). Value is formatted as:\n"
-		" - nclc,p,t,m: with p colour primary, t transfer characteristics and m matrix coef\n"
-		" - nclx,p,t,m,r: same as `nclx` with r full range flag\n"
+	GF_DEF_ARG("colr", NULL, "`S` set color profile for imported video content (see ISO/IEC 23001-8). Value is formatted as:\n"
+		" - nclc,p,t,m: with p colour primary (int or string), t transfer characteristics (int or string) and m matrix coef (int or string)\n"
+		" - nclx,p,t,m,r: same as `nclx` with r full range flag (`yes`, `on` or `no`, `off`)\n"
 		" - prof,path: with path indicating the file containing the ICC color profile\n"
-		" - rICC,path: with path indicating the file containing the restricted ICC color profile", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("dv-profile", NULL, "set the Dolby Vision profile", NULL, NULL, GF_ARG_INT, 0),
-	GF_DEF_ARG("tc", NULL, "inject a single QT timecode. Value is formated as:\n"
+		" - rICC,path: with path indicating the file containing the restricted ICC color profile\n"
+		" - 'none': removes color info", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("hdr", NULL, "`S` set HDR info on track (see [-hdr](MP4B_GEN) ), 'none' removes HDR info", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("dv-profile", NULL, "`S` set the Dolby Vision profile on imported track\n"
+	"- Profile is an integer, or `none` to remove DV signaling\n"
+	"- Profile can be suffixed with compatibility ID, e.g. `5.hdr10`\n"
+	"- Allowed compatibility ID are `none`, `hdr10`, `bt709`, `hlg709`, `hlg2100`, `bt2020`, `brd`, or integer value as per DV spec\n"
+	"- Profile can be prefixed with 'f' to force DV codec type signaling, e.g. `f8.2`", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("fullrange", NULL, "`S` force the video fullrange type in VUI for the AVC|H264 content (value `yes`, `on` or `no`, `off`)", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("videofmt", NULL, "`S` force the video format in VUI for AVC|H264 and HEVC content, value can be `component`, `pal`, `ntsc`, `secam`, `mac`, `undef`", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("colorprim", NULL, "`S` force the colour primaries in VUI for AVC|H264 and HEVC (int or string, cf `-h cicp`)", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("colortfc", NULL, "`S` force transfer characteristics in VUI for AVC|H264 and HEVC (int or string, cf `-h cicp`)", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("colormx", NULL, "`S` force the matrix coefficients in VUI for the AVC|H264 and HEVC content (int or string, cf `-h cicp`)", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("tc", NULL, "`S` inject a single QT timecode. Value is formatted as:\n"
 		" - [d]FPS[/FPS_den],h,m,s,f[,framespertick]: optional drop flag, framerate (integer or fractional), hours, minutes, seconds and frame number\n"
 		" - : `d` is an optional flag used to indicate that the counter is in drop-frame format\n"
 		" - : the `framespertick` is optional and defaults to round(framerate); it indicates the number of frames per counter tick", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("lastsampdur", NULL, "set duration of the last sample. Value is formated as:\n"
+	GF_DEF_ARG("edits", NULL, "`S` override edit list, same syntax as [-edits]()", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("lastsampdur", NULL, "`S` set duration of the last sample. Value is formatted as:\n"
 		" - no value: use the previous sample duration\n"
 		" - integer: indicate the duration in milliseconds\n"
 		" - N/D: indicate the duration as fractional second", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("fstat", NULL, "print filter session stats after import", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("fgraph", NULL, "print filter session graph after import", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("ID", NULL, "`S` set target ID\n"
+		" - a value of 0 (default) will try to keep source track ID\n"
+		" - a value of -1 will ignore source track ID\n"
+		" - other value will try to set track ID to this value if no other track with same ID is present"
+		"", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("stats", "fstat", "`C` print filter session stats after import", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("graph", "fgraph", "`C` print filter session graph after import", NULL, NULL, GF_ARG_BOOL, 0),
 	{"sopt:[OPTS]", NULL, "set `OPTS` as additional arguments to source filter. `OPTS` can be any usual filter argument, see [filter doc `gpac -h doc`](Filters)"},
 	{"dopt:[OPTS]", NULL, "`X` set `OPTS` as additional arguments to [destination filter](mp4mx). OPTS can be any usual filter argument, see [filter doc `gpac -h doc`](Filters)"},
-	{"@@f1[:args][@@fN:args]", NULL, "set a filter chain to insert before the muxer. Each filter in the chain is formatted as a regular filter, see [filter doc `gpac -h doc`](Filters). If several filters are set, they will be chained in the given order. The last filter shall not have any Filter ID specified"},
+	{"@f1[:args][@fN:args]", NULL, "set a filter chain to insert before the multiplexer. Each filter in the chain is formatted as a regular filter, see [filter doc `gpac -h doc`](Filters). A `@@` separator starts a new chain (see DASH help). The last filter in each chain shall not have any ID specified"},
 	{0}
 };
 
 void PrintImportUsage()
 {
 	u32 i;
-	
+
 	gf_sys_format_help(helpout, help_flags, "# Importing Options\n"
 		"# File importing\n"
-		"Syntax is [-add]() / [-cat]() `filename[#FRAGMENT][:opt1...:optN=val]`\n"
+		"Syntax is [-add]() / [-cat]() `URL[#FRAGMENT][:opt1...:optN=val]`\n"
 		"This process will create the destination file if not existing, and add the track(s) to it. If you wish to always create a new destination file, add [-new](MP4B_GEN).\n"
 		"The supported input media types depend on your installation, check [filters documentation](Filters) for more info.\n"
 		" \n"
-		"To select a desired media track from a source, a fragment identifier '#' can be specified, bfore any other options. The following syntax is used:\n"
+		"To select a desired media track from a source, a fragment identifier '#' can be specified, before any other options. The following syntax is used:\n"
 		"- `#video`: adds the first video track found in source\n"
 		"- `#audio`: adds the first audio track found in source\n"
 		"- `#auxv`: adds the first auxiliary video track found in source\n"
@@ -546,52 +881,95 @@
 		" \n"
 		"By default all imports are performed sequentially, and final interleaving is done at the end; this however requires a temporary file holding original ISOBMF file (if any) and added files before creating the final output. Since this can become quite large, it is possible to add media to a new file without temporary storage, using [-flat](MP4B_GEN) option, but this disables media interleaving.\n"
 		" \n"
-		"If you wish to create an interleaved new file with no temporary storage, use the [-newfs](MP4B_GEN) option. The interleaving might not be as precise as when using [-new]() since it is dependent on muxer input scheduling (each execution might lead to a slightly different result). Additionally in this mode: \n"
-		" - Some muxing options (marked with `X` below) will be activated for all inputs (e.g it is not possible to import one AVC track with `xps_inband` and another without).\n"
-		" - Some muxing options (marked as `D` below) cannot be used as they require temporary storage for file edition.\n"
-		" - Usage of [-cat]() is possible, but concatenated sources will not be interleaved in the output. If you wish to perforom more complex cat/add operations without temp file, use the [gpac application](Filters).\n"
+		"If you wish to create an interleaved new file with no temporary storage, use the [-newfs](MP4B_GEN) option. The interleaving might not be as precise as when using [-new]() since it is dependent on multiplexer input scheduling (each execution might lead to a slightly different result). Additionally in this mode: \n"
+		" - Some multiplexing options (marked with `X` below) will be activated for all inputs (e.g. it is not possible to import one AVC track with `xps_inband` and another without).\n"
+		" - Some multiplexing options (marked as `D` below) cannot be used as they require temporary storage for file edition.\n"
+		" - Usage of [-cat]() is possible, but concatenated sources will not be interleaved in the output. If you wish to perform more complex cat/add operations without temp file, use a [playlist](flist).\n"
+		" \n"
+		"Source URL can be any URL supported by GPAC, not limited to local files.\n"
 		" \n"
-		"Note: MP4Box cannot start importing from a random point in the input, it always import from the begining. If you wish to import from another point in the source, use the [gpac application](Filters).\n"
+		"Note: When importing SRT or SUB files, MP4Box will choose default layout options to make the subtitle appear at the bottom of the video. You SHOULD NOT import such files before any video track is added to the destination file, otherwise the results will likely not be useful (default SRT/SUB importing uses default serif font, fontSize 18 and display size 400x60). For more details, check [TTXT doc](Subtitling-with-GPAC).\n"
 		" \n"
-		"Note: When importing SRT or SUB files, MP4Box will choose default layout options to make the subtitle appear at the bottom of the video. You SHOULD NOT import such files before any video track is added to the destination file, otherwise the results will likelly not be useful (default SRT/SUB importing uses default serif font, fontSize 18 and display size 400x60). For more details, check [TTXT doc](Subtitling-with-GPAC).\n"
+		"When importing several tracks/sources in one pass, all options will be applied if relevant to each source. These options are set for all imported streams. If you need to specify these options per stream, set per-file options using the syntax `-add stream[:opt1:...:optN]`.\n"
 		" \n"
-		"When importing several tracks/sources in one pass, all options will be applied if relevant to each source. These options are set for all imported streams. If you need to specify these options par stream, set per-file options using the syntax `-add stream[:opt1:...:optN]`. Allowed per-file options:\n\n"
+		"The import file name may be set to empty or `self`, indicating that the import options should be applied to the destination file track(s).\n"
+		"EX -add self:moovts=-1:noedit src.mp4\n"
+		"This will apply `moovts` and `noedit` option to all tracks in src.mp4\n"
+		"EX -add self#2:moovts=-1:noedit src.mp4\n"
+		"This will apply `moovts` and `noedit` option to track with `ID=2` in src.mp4\n"
+		"Only per-file options marked with a `S` are possible in this mode.\n"
+		" \n"
+		"When importing an ISOBMFF/QT file, only options marked as `C` or `S` can be used.\n"
+		" \n"
+		"Allowed per-file options:\n\n"
 	);
 
 	i=0;
-	while (ImportFileOpts[i].name) {
-		GF_GPACArg *arg = &ImportFileOpts[i];
+	while (m4b_imp_fileopt_args[i].name) {
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_imp_fileopt_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags | GF_PRINTARG_NO_DASH, arg, "mp4box-import");
 	}
 
 	gf_sys_format_help(helpout, help_flags, "\n"
-		"Note: `sopt`, `dopt` and `@@f` must be placed after all other options.\n"
+		"Note: `sopt`, `dopt` and `@f` must be placed after all other options.\n"
 		"# Global import options\n"
 	);
 
 	i=0;
 	while (m4b_imp_args[i].name) {
-		GF_GPACArg *arg = &m4b_imp_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_imp_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-import");
 	}
 }
 
-GF_GPACArg m4b_senc_args[] =
+Bool mp4box_check_isom_fileopt(char *opt)
 {
- 	GF_DEF_ARG("mp4", NULL, "specify input file is for encoding", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("def", NULL, "encode DEF names in BIFS", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("sync", NULL, "force BIFS sync sample generation every given time in ms (cannot be used with [-shadow]() )", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("shadow", NULL, "force BIFS sync shadow sample generation every given time in ms (cannot be used with [-sync]() )", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("sclog", NULL, "generate scene codec log file if available", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("ms", NULL, "import tracks from the given file", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("ctx-in", NULL, "specify initial context (MP4/BT/XMT) file for chunk processing. Input file must be a commands-only file", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("ctx-out", NULL, "specify storage of updated context (MP4/BT/XMT) file for chunk processing, optional", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("resolution", NULL, "resolution factor (-8 to 7, default 0) for LASeR encoding, and all coords are multiplied by `2^res` before truncation (LASeR encoding)", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("coord-bits", NULL, "number of bits used for encoding truncated coordinates (0 to 31, default 12) (LASeR encoding)", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("scale-bits", NULL, "extra bits used for encoding truncated scales (0 to 4, default 0) (LASeR encoding)", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("auto-quant", NULL, "resolution is given as if using -resolution but coord-bits and scale-bits are infered (LASeR encoding)", NULL, NULL, GF_ARG_INT, 0),
+	GF_GPACArg *arg = NULL;
+	u32 i=0;
+
+	while (m4b_imp_fileopt_args[i].name) {
+		arg = (GF_GPACArg *) &m4b_imp_fileopt_args[i];
+		i++;
+		if (!stricmp(arg->name, opt)) break;
+		arg = NULL;
+	}
+	if (!arg) {
+		fprintf(stderr, "Option %s not described in doc, please report to GPAC devs!\n", opt);
+		return GF_FALSE;
+	}
+	if (arg->description[0] != '`')
+		return GF_FALSE;
+	const char *d = arg->description+1;
+	while (d[0] != '`') {
+		if (d[0]=='S') return GF_TRUE;
+		if (d[0]=='C') return GF_TRUE;
+		d++;
+	}
+	return GF_FALSE;
+}
+
+
+MP4BoxArg m4b_senc_args[] =
+{
+#ifndef GPAC_DISABLE_SCENE_ENCODER
+ 	MP4BOX_ARG("mp4", "specify input file is for BIFS/LASeR encoding", GF_ARG_BOOL, 0, &encode, 0, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("def", "encode DEF names in BIFS", GF_ARG_BOOL, 0, &smenc_opts.flags, GF_SM_ENCODE_USE_NAMES, ARG_BIT_MASK),
+ 	MP4BOX_ARG("sync", "force BIFS sync sample generation every given time in ms (cannot be used with [-shadow]() or [-carousel]() )", GF_ARG_INT, 0, parse_senc_param, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("shadow", "force BIFS sync shadow sample generation every given time in ms (cannot be used with [-sync]() or [-carousel]() )", GF_ARG_INT, 0, parse_senc_param, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("carousel", "use BIFS carousel (cannot be used with [-sync]() or [-shadow]() )", GF_ARG_INT, 0, parse_senc_param, 2, ARG_IS_FUN),
+
+ 	MP4BOX_ARG("sclog", "generate scene codec log file if available", GF_ARG_BOOL, 0, &do_scene_log, 0, 0),
+ 	MP4BOX_ARG("ms", "import tracks from the given file", GF_ARG_STRING, 0, &mediaSource, 0, 0),
+ 	MP4BOX_ARG("ctx-in", "specify initial context (MP4/BT/XMT) file for chunk processing. Input file must be a commands-only file", GF_ARG_STRING, 0, parse_senc_param, 5, ARG_IS_FUN),
+ 	MP4BOX_ARG("ctx-out", "specify storage of updated context (MP4/BT/XMT) file for chunk processing, optional", GF_ARG_STRING, 0, &output_ctx, 0, 0),
+ 	MP4BOX_ARG("resolution", "resolution factor (-8 to 7, default 0) for LASeR encoding, and all coordinates are multiplied by `2^res` before truncation (LASeR encoding)", GF_ARG_INT, 0, &smenc_opts.resolution, 0, 0),
+ 	MP4BOX_ARG("coord-bits", "number of bits used for encoding truncated coordinates (0 to 31, default 12) (LASeR encoding)", GF_ARG_INT, 0, &smenc_opts.coord_bits, 0, 0),
+ 	MP4BOX_ARG("scale-bits", "extra bits used for encoding truncated scales (0 to 4, default 0) (LASeR encoding)", GF_ARG_INT, 0, &smenc_opts.scale_bits, 0, 0),
+ 	MP4BOX_ARG("auto-quant", "resolution is given as if using [-resolution]() but coord-bits and scale-bits are inferred (LASeR encoding)", GF_ARG_INT, 0, parse_senc_param, 3, ARG_IS_FUN),
+ 	MP4BOX_ARG("global-quant", "resolution is given as if using [-resolution]() but the res is inferred (BIFS encoding)", GF_ARG_INT, 0, parse_senc_param, 4, ARG_IS_FUN),
+#endif
 	{0}
 };
 
@@ -607,7 +985,7 @@
 		"## Scene Random Access\n"
 		"MP4Box can encode BIFS or LASeR streams and insert random access points at a given frequency. This is useful when packaging content for broadcast, where users will not turn in the scene at the same time. In MPEG-4 terminology, this is called the __scene carousel__."
 		"## BIFS Chunk Processing\n"
-		"The BIFS chunk encoding mode alows encoding single BIFS access units from an initial context and a set of commands.\n"
+		"The BIFS chunk encoding mode allows encoding single BIFS access units from an initial context and a set of commands.\n"
 		"The generated AUs are raw BIFS (not SL-packetized), in files called FILE-ESID-AUIDX.bifs, with FILE the basename of the input file.\n"
 		"Commands with a timing of 0 in the input will modify the carousel version only (i.e. output context).\n"
 		"Commands with a timing different from 0 in the input will generate new AUs.\n"
@@ -616,17 +994,17 @@
 	);
 
 	while (m4b_senc_args[i].name) {
-		GF_GPACArg *arg = &m4b_senc_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_senc_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-senc");
 	}
 }
 
-GF_GPACArg m4b_crypt_args[] =
+MP4BoxArg m4b_crypt_args[] =
 {
- 	GF_DEF_ARG("crypt", NULL, "encrypt the input file using the given `CryptFile`", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("decrypt", NULL, "decrypt the input file, potentially using the given `CryptFile`. If `CryptFile` is not given, will fail if the key management system is not supported", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("set-kms", NULL, "change ISMA/OMA KMS location for all tracks, or for a given one if `ID=kms_uri` is used", NULL, NULL, GF_ARG_STRING, 0),
+ 	MP4BOX_ARG("crypt", "encrypt the input file using the given `CryptFile`", GF_ARG_STRING, 0, parse_cryp, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("decrypt", "decrypt the input file, potentially using the given `CryptFile`. If `CryptFile` is not given, will fail if the key management system is not supported", GF_ARG_STRING, 0, parse_cryp, 1, ARG_IS_FUN | ARG_EMPTY),
+ 	MP4BOX_ARG_S("set-kms", "tkID=kms_uri", "change ISMA/OMA KMS location for a given track or for all tracks if `all=` is used", 0, parse_track_action, TRACK_ACTION_SET_KMS_URI, ARG_IS_FUN),
 	{0}
 };
 
@@ -636,36 +1014,39 @@
 	gf_sys_format_help(helpout, help_flags, "# Encryption/Decryption Options\n"
 	"MP4Box supports encryption and decryption of ISMA, OMA and CENC content, see [encryption filter `gpac -h cecrypt`](cecrypt).\n"
 	"It requires a specific XML file called `CryptFile`, whose syntax is available at https://wiki.gpac.io/Common-Encryption\n"
+	"Image files (HEIF) can also be crypted / decrypted, using CENC only.\n"
 	" \n"
 	"Options:\n"
 	);
 	while (m4b_crypt_args[i].name) {
-		GF_GPACArg *arg = &m4b_crypt_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_crypt_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-crypt");
 	}
 }
 
-GF_GPACArg m4b_hint_args[] =
+MP4BoxArg m4b_hint_args[] =
 {
- 	GF_DEF_ARG("hint", NULL, "hint the file for RTP/RTSP", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("mtu", NULL, "specify RTP MTU (max size) in bytes (this includes 12 bytes RTP header)", "1450", NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("copy", NULL, "copy media data to hint track rather than reference (speeds up server but takes much more space)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("multi `[maxptime]`", NULL, "enable frame concatenation in RTP packets if possible (with max duration 100 ms or `maxptime` ms if given)", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("rate", NULL, "specify rtp rate in Hz when no default for payload", "90000", NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("mpeg4", NULL, "force MPEG-4 generic payload whenever possible", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("latm", NULL, "force MPG4-LATM transport for AAC streams", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("static", NULL, "enable static RTP payload IDs whenever possible (by default, dynamic payloads are always used)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("add-sdp", NULL, "add given SDP string to hint track (`tkID:string`) or movie (`string`)", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("no-offset", NULL, "signal no random offset for sequence number and timestamp (support will depend on server)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("unhint", NULL, "remove all hinting information from file", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("group-single", NULL, "put all tracks in a single hint group", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("ocr", NULL, "force all MPEG-4 streams to be synchronized (MPEG-4 Systems only)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("rap", NULL, "signal random access points in RTP packets (MPEG-4 Systems)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("ts", NULL, "signal AU Time Stamps in RTP packets (MPEG-4 Systems)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("size", NULL, "signal AU size in RTP packets (MPEG-4 Systems)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("idx", NULL, "signal AU sequence numbers in RTP packets (MPEG-4 Systems)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("iod", NULL, "prevent systems tracks embedding in IOD (MPEG-4 Systems), not compatible with [-isma]()", NULL, NULL, GF_ARG_BOOL, 0),
+#ifndef GPAC_DISABLE_STREAMING
+ 	MP4BOX_ARG("hint", "hint the file for RTP/RTSP", GF_ARG_BOOL, 0, &do_hint, 0, ARG_OPEN_EDIT),
+ 	{"mtu", NULL, "specify RTP MTU (max size) in bytes (this includes 12 bytes RTP header)", "1450", NULL, GF_ARG_INT, 0, &MTUSize, 0, 0},
+ 	MP4BOX_ARG("copy", "copy media data to hint track rather than reference (speeds up server but takes much more space)", GF_ARG_BOOL, 0, &HintCopy, 0, 0),
+ 	MP4BOX_ARG_S("multi", "[maxptime]", "enable frame concatenation in RTP packets if possible (with max duration 100 ms or `maxptime` ms if given)", 0, parse_multi_rtp, 0, ARG_IS_FUN),
+ 	{"rate", NULL, "specify rtp rate in Hz when no default for payload", "90000", NULL, GF_ARG_INT, 0, &rtp_rate, 0, 0},
+ 	MP4BOX_ARG("mpeg4", "force MPEG-4 generic payload whenever possible", GF_ARG_BOOL, 0, &import_flags, GF_IMPORT_FORCE_MPEG4, ARG_BIT_MASK),
+ 	MP4BOX_ARG("latm", "force MPG4-LATM transport for AAC streams", GF_ARG_BOOL, 0, &hint_flags, GP_RTP_PCK_USE_LATM_AAC, ARG_BIT_MASK),
+ 	MP4BOX_ARG("static", "enable static RTP payload IDs whenever possible (by default, dynamic payloads are always used)", GF_ARG_BOOL, 0, &hint_flags, GP_RTP_PCK_USE_STATIC_ID, ARG_BIT_MASK),
+ 	MP4BOX_ARG("add-sdp", "add given SDP string to movie (`string`) or track (`tkID:string`), `tkID` being the track ID or the hint track ID", GF_ARG_STRING, 0, parse_sdp_ext, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("no-offset", "signal no random offset for sequence number and timestamp (support will depend on server)", GF_ARG_BOOL, 0, &hint_no_offset, 0, 0),
+ 	MP4BOX_ARG("unhint", "remove all hinting information from file", GF_ARG_BOOL, 0, &remove_hint, 0, ARG_OPEN_EDIT),
+ 	MP4BOX_ARG("group-single", "put all tracks in a single hint group", GF_ARG_BOOL, 0, &single_group, 0, 0),
+ 	MP4BOX_ARG("ocr", "force all MPEG-4 streams to be synchronized (MPEG-4 Systems only)", GF_ARG_BOOL, 0, &force_ocr, 0, 0),
+ 	MP4BOX_ARG("rap", "signal random access points in RTP packets (MPEG-4 Systems)", GF_ARG_BOOL, 0, parse_rap_ref, 0, ARG_IS_FUN | ARG_EMPTY),
+ 	MP4BOX_ARG("ts", "signal AU Time Stamps in RTP packets (MPEG-4 Systems)", GF_ARG_BOOL, 0, &hint_flags, GP_RTP_PCK_SIGNAL_TS, ARG_BIT_MASK),
+	MP4BOX_ARG("size", "signal AU size in RTP packets (MPEG-4 Systems)", GF_ARG_BOOL, 0, &hint_flags, GP_RTP_PCK_SIGNAL_SIZE, ARG_BIT_MASK),
+ 	MP4BOX_ARG("idx", "signal AU sequence numbers in RTP packets (MPEG-4 Systems)", GF_ARG_BOOL, 0, &hint_flags, GP_RTP_PCK_SIGNAL_AU_IDX, ARG_BIT_MASK),
+ 	MP4BOX_ARG("iod", "prevent systems tracks embedding in IOD (MPEG-4 Systems), not compatible with [-isma]()", GF_ARG_BOOL, 0, &regular_iod, 0, 0),
+#endif
 	{0}
 };
 
@@ -681,29 +1062,29 @@
 		"Options:\n"
 	);
 	while (m4b_hint_args[i].name) {
-		GF_GPACArg *arg = &m4b_hint_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_hint_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-hint");
 	}
 }
 
 
-GF_GPACArg m4b_extr_args[] =
+MP4BoxArg m4b_extr_args[] =
 {
- 	GF_DEF_ARG("raw", NULL, "extract given track in raw format when supported. Use `tkID:output=FileName` to set output file name", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("raws", NULL, "extract each sample of the given track to a file. Use `tkID:N`to extract the Nth sample", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("nhnt", NULL, "extract given track to [NHNT](nhntr) format", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("nhml", NULL, "extract given track to [NHML](nhmlr) format. Use `tkID:full` for full NHML dump with all packet properties", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("webvtt-raw", NULL, "extract given track as raw media in WebVTT as metadata. Use `tkID:embedded` to include media data in the WebVTT file", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("single", NULL, "extract given track to a new mp4 file", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("six", NULL, "extract given track as raw media in **experimental** XML streaming instructions", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("avi", NULL, "extract given track to an avi file", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("avi", NULL, "same as [-raw]() but defaults to QCP file for EVRC/SMV", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("aviraw", NULL, "extract AVI track in raw format; parameter can be `video`, `audio`or `audioN`", NULL, "video|audio", GF_ARG_STRING, 0),
- 	GF_DEF_ARG("saf", NULL, "remux file to SAF multiplex", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dvbhdemux", NULL, "demux DVB-H file into IP Datagrams sent on the network", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("raw-layer", NULL, "same as [-raw]() but skips SVC/MVC/LHVC extractors when extracting", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("diod", NULL, "extract file IOD in raw format", NULL, NULL, GF_ARG_BOOL, 0),
+ 	MP4BOX_ARG("raw", "extract given track in raw format when supported. Use `tkID:output=FileName` to set output file name", GF_ARG_STRING, 0, parse_track_dump, GF_EXPORT_NATIVE, ARG_IS_FUN),
+ 	MP4BOX_ARG("raws", "extract each sample of the given track to a file. Use `tkID:N` to extract the Nth sample", GF_ARG_STRING, 0, parse_track_dump, GF_EXPORT_RAW_SAMPLES, ARG_IS_FUN),
+ 	MP4BOX_ARG("nhnt", "extract given track to [NHNT](nhntr) format", GF_ARG_INT, 0, parse_track_dump, GF_EXPORT_NHNT, ARG_IS_FUN),
+ 	MP4BOX_ARG("nhml", "extract given track to [NHML](nhmlr) format. Use `tkID:full` for full NHML dump with all packet properties", GF_ARG_STRING, 0, parse_track_dump, GF_EXPORT_NHML, ARG_IS_FUN),
+ 	MP4BOX_ARG("webvtt-raw", "extract given track as raw media in WebVTT as metadata. Use `tkID:embedded` to include media data in the WebVTT file", GF_ARG_STRING, 0, parse_track_dump, GF_EXPORT_WEBVTT_META, ARG_IS_FUN),
+ 	MP4BOX_ARG("single", "extract given track to a new mp4 file", GF_ARG_INT, 0, parse_track_dump, GF_EXPORT_MP4, ARG_IS_FUN),
+ 	MP4BOX_ARG("six", "extract given track as raw media in **experimental** XML streaming instructions", GF_ARG_INT, 0, parse_track_dump, GF_EXPORT_SIX, ARG_IS_FUN),
+ 	MP4BOX_ARG("mux", "multiplex input file to given destination", GF_ARG_STRING, 0, &mux_name, 0, 0),
+ 	MP4BOX_ARG("qcp", "same as [-raw]() but defaults to QCP file for EVRC/SMV", GF_ARG_INT, 0, parse_track_dump, GF_EXPORT_NATIVE | GF_EXPORT_USE_QCP, ARG_IS_FUN),
+ 	MP4BOX_ARG("saf", "multiplex input file to SAF multiplex", GF_ARG_BOOL, 0, &do_saf, 0, 0),
+ 	MP4BOX_ARG("dvbhdemux", "demultiplex DVB-H file into IP Datagrams sent on the network", GF_ARG_BOOL, 0, &dvbhdemux, 0, 0),
+ 	MP4BOX_ARG("raw-layer", "same as [-raw]() but skips SVC/MVC/LHVC extractors when extracting", GF_ARG_INT, 0, parse_track_dump, GF_EXPORT_NATIVE | GF_EXPORT_SVC_LAYER, ARG_IS_FUN),
+ 	MP4BOX_ARG("diod", "extract file IOD in raw format", GF_ARG_BOOL, 0, &dump_iod, 0, 0),
+ 	MP4BOX_ARG("mpd", "convert given HLS or smooth manifest (local or remote http) to MPD. \nWarning: This is not compatible with other DASH options and does not convert associated segments", GF_ARG_STRING, 0, &do_mpd_conv, 0, 0),
 	{0}
 };
 
@@ -716,62 +1097,73 @@
 	"Options:\n"
 	);
 	while (m4b_extr_args[i].name) {
-		GF_GPACArg *arg = &m4b_extr_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_extr_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
 	}
 }
 
-GF_GPACArg m4b_dump_args[] =
+MP4BoxArg m4b_dump_args[] =
 {
- 	GF_DEF_ARG("stdb", NULL, "dump/write to stdout and assume stdout is opened in binary mode", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("stdb", NULL, "dump/write to stdout and try to reopen stdout in binary mode", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("tracks", NULL, "print the number of tracks on stdout", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("info", NULL, "print movie info (no parameter) or track info with specified ID", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("infon", NULL, "print track info for given track number, 1 being the first track in the file", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("diso", NULL, "dump IsoMedia file boxes in XML output", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dxml", NULL, "dump IsoMedia file boxes and known track samples in XML output", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("disox", NULL, "dump IsoMedia file boxes except sample tables in XML output", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("keep-ods", NULL, "do not translate ISOM ODs and ESDs tags (debug purpose only)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("bt", NULL, "dump scene to BT format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("xmt", NULL, "dump scene to XMT format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("wrl", NULL, "dump scene to VRML format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("x3d", NULL, "dump scene to X3D XML format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("x3dc", NULL, "dump scene to X3D VRML format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("lsr", NULL, "dump scene to LASeR XML (XSR) format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("drtp", NULL, "dump rtp hint samples structure to XML output", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dts", NULL, "print sample timing, size and position in file to text output", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dtsx", NULL, "same as [-dts]() but does not print offset", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dtsc", NULL, "same as [-dts]() but analyse each sample for duplicated dts/cts (__slow !__)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dtsxc", NULL, "same as [-dtsc]() but does not print offset (__slow !__)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dnal", NULL, "print NAL sample info of given track", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("dnalc", NULL, "print NAL sample info of given track, adding CRC for each nal", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("dnald", NULL, "print NAL sample info of given track without DTS and CTS info", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("dnalx", NULL, "print NAL sample info of given track without DTS and CTS info and adding CRC for each nal", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("sdp", NULL, "dump SDP description of hinted file", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dsap", NULL, "dump DASH SAP cues (see -cues) for a given track", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("dsaps", NULL, "same as [-dsap]() but only print sample number", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("dsapc", NULL, "same as [-dsap]() but only print CTS", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("dsapd", NULL, "same as [-dsap]() but only print DTS, `-dsapp` to only print presentation time", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("dsapp", NULL, "same as [-dsap]() but only print presentation time", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("dcr", NULL, "dump ISMACryp samples structure to XML output", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dump-cover", NULL, "extract cover art", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dump-chap", NULL, "extract chapter file as TTXT format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dump-chap-ogg", NULL, "extract chapter file as OGG format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dump-chap-zoom", NULL, "extract chapter file as zoom format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("dump-udta `[tkID:]4cc`", NULL, "extract udta for the given 4CC. If `tkID` is given, dumps from UDTA of the given track ID, otherwise moov is used", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("mergevtt", NULL, "merge vtt cues while dumping", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("ttxt", NULL, "convert input subtitle to GPAC TTXT format if no parameter. Otherwise, dump given text track to GPAC TTXT format", NULL, NULL, GF_ARG_INT, 0),
- 	GF_DEF_ARG("srt", NULL, "convert input subtitle to SRT format if no parameter. Otherwise, dump given text track to SRT format", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("rip-mpd", NULL, "download manifest and segments of an MPD. Does not work with live sessions", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("stat", NULL, "generate node/field statistics for scene", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("stats", NULL, "generate node/field statistics per Access Unit", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("statx", NULL, "generate node/field statistics for scene after each AU", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("hash", NULL, "generate SHA-1 Hash of the input file", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("comp", NULL, "replace with compressed version all top level box types given as parameter, formated as `orig_4cc_1=comp_4cc_1[,orig_4cc_2=comp_4cc_2]`", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("bin", NULL, "convert input XML file using NHML bitstream syntax to binary", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("topcount", NULL, "print to stdout the number of top-level boxes matching box types given as parameter, formated as `4cc_1,4cc_2N`", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("topsize", NULL, "print to stdout the number of bytes of top-level boxes matching types given as parameter, formated as `4cc_1,4cc_2N` or `all` for all boxes", NULL, NULL, GF_ARG_STRING, 0),
+ 	MP4BOX_ARG("std", "dump/write to stdout and assume stdout is opened in binary mode", GF_ARG_BOOL, 0, &dump_std, 2, 0),
+ 	MP4BOX_ARG("stdb", "dump/write to stdout and try to reopen stdout in binary mode", GF_ARG_BOOL, 0, &dump_std, 1, 0),
+ 	MP4BOX_ARG("tracks", "print the number of tracks on stdout", GF_ARG_BOOL, 0, &get_nb_tracks, 0, 0),
+ 	MP4BOX_ARG("info", "print movie info (no parameter) or track extended info with specified ID", GF_ARG_STRING, 0, parse_file_info, 0, ARG_IS_FUN|ARG_EMPTY),
+ 	MP4BOX_ARG("infon", "print track info for given track number, 1 being the first track in the file", GF_ARG_STRING, 0, parse_file_info, 1, ARG_IS_FUN|ARG_EMPTY),
+ 	MP4BOX_ARG("infox", "print movie and track extended info (same as -info N` for each track)", GF_ARG_BOOL, 0, parse_file_info, 2, ARG_IS_FUN|ARG_EMPTY),
+ 	MP4BOX_ARG_ALT("diso", "dmp4", "dump IsoMedia file boxes in XML output", GF_ARG_BOOL, 0, &dump_isom, 1, 0),
+ 	MP4BOX_ARG("dxml", "dump IsoMedia file boxes and known track samples in XML output", GF_ARG_BOOL, 0, &dump_isom, 2, 0),
+ 	MP4BOX_ARG("disox", "dump IsoMedia file boxes except sample tables in XML output", GF_ARG_BOOL, 0, &dump_isom, 3, 0),
+ 	MP4BOX_ARG("keep-ods", "do not translate ISOM ODs and ESDs tags (debug purpose only)", GF_ARG_BOOL, 0, &no_odf_conf, 0, 0),
+#ifndef GPAC_DISABLE_SCENE_DUMP
+ 	MP4BOX_ARG("bt", "dump scene to BT format", GF_ARG_BOOL, 0, &dump_mode, GF_SM_DUMP_BT, ARG_HAS_VALUE),
+ 	MP4BOX_ARG("xmt", "dump scene to XMT format", GF_ARG_BOOL, 0, &dump_mode, GF_SM_DUMP_XMTA, 0),
+ 	MP4BOX_ARG("wrl", "dump scene to VRML format", GF_ARG_BOOL, 0, &dump_mode, GF_SM_DUMP_VRML, 0),
+ 	MP4BOX_ARG("x3d", "dump scene to X3D XML format", GF_ARG_BOOL, 0, &dump_mode, GF_SM_DUMP_X3D_XML, 0),
+ 	MP4BOX_ARG("x3dv", "dump scene to X3D VRML format", GF_ARG_BOOL, 0, &dump_mode, GF_SM_DUMP_X3D_VRML, 0),
+ 	MP4BOX_ARG("lsr", "dump scene to LASeR XML (XSR) format", GF_ARG_BOOL, 0, &dump_mode, GF_SM_DUMP_LASER, 0),
+ 	MP4BOX_ARG("svg", "dump scene to SVG", GF_ARG_BOOL, 0, &dump_mode, GF_SM_DUMP_SVG, 0),
+#endif
+ 	MP4BOX_ARG("drtp", "dump rtp hint samples structure to XML output", GF_ARG_BOOL, 0, &dump_rtp, 0, 0),
+ 	MP4BOX_ARG("dts", "print sample timing, size and position in file to text output", GF_ARG_BOOL, 0, parse_dump_ts, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("dtsx", "same as [-dts]() but does not print offset", GF_ARG_BOOL, 0, &dump_timestamps, 2, 0),
+ 	MP4BOX_ARG("dtsc", "same as [-dts]() but analyses each sample for duplicated dts/cts (__slow !__)", GF_ARG_BOOL, 0, &dump_timestamps, 3, 0),
+ 	MP4BOX_ARG("dtsxc", "same as [-dtsc]() but does not print offset (__slow !__)", GF_ARG_BOOL, 0, &dump_timestamps, 4, 0),
+ 	MP4BOX_ARG("dnal", "print NAL sample info of given track", GF_ARG_INT, 0, parse_dnal, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("dnalc", "print NAL sample info of given track, adding CRC for each nal", GF_ARG_INT, 0, parse_dnal, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("dnald", "print NAL sample info of given track without DTS and CTS info", GF_ARG_INT, 0, parse_dnal, 2, ARG_IS_FUN),
+ 	MP4BOX_ARG("dnalx", "print NAL sample info of given track without DTS and CTS info and adding CRC for each nal", GF_ARG_INT, 0, parse_dnal, 2|1, ARG_IS_FUN),
+ 	MP4BOX_ARG("sdp", "dump SDP description of hinted file", GF_ARG_BOOL, 0, &print_sdp, 0, 0),
+ 	MP4BOX_ARG("dsap", "dump DASH SAP cues (see -cues) for a given track", GF_ARG_INT, 0, parse_dsap, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("dsaps", "same as [-dsap]() but only print sample number", GF_ARG_INT, 0, parse_dsap, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("dsapc", "same as [-dsap]() but only print CTS", GF_ARG_INT, 0, parse_dsap, 2, ARG_IS_FUN),
+ 	MP4BOX_ARG("dsapd", "same as [-dsap]() but only print DTS", GF_ARG_INT, 0, parse_dsap, 3, ARG_IS_FUN),
+ 	MP4BOX_ARG("dsapp", "same as [-dsap]() but only print presentation time", GF_ARG_INT, 4, parse_dsap, 4, ARG_IS_FUN),
+ 	MP4BOX_ARG("dcr", "dump ISMACryp samples structure to XML output", GF_ARG_BOOL, 0, &dump_cr, 0, 0),
+ 	MP4BOX_ARG("dchunk", "dump chunk info", GF_ARG_BOOL, 0, &dump_chunk, 0, 0),
+ 	MP4BOX_ARG("dump-cover", "extract cover art", GF_ARG_BOOL, 0, &dump_cart, 0, 0),
+ 	MP4BOX_ARG("dump-chap", "extract chapter file as TTXT format", GF_ARG_BOOL, 0, &dump_chap, 1, 0),
+ 	MP4BOX_ARG("dump-chap-ogg", "extract chapter file as OGG format", GF_ARG_BOOL, 0, &dump_chap, 2, 0),
+ 	MP4BOX_ARG("dump-chap-zoom", "extract chapter file as zoom format", GF_ARG_BOOL, 0, &dump_chap, 3, 0),
+ 	MP4BOX_ARG_S("dump-udta", "[tkID:]4cc", "extract user data for the given 4CC. If `tkID` is given, dumps from UDTA of the given track ID, otherwise moov is used", 0, parse_dump_udta, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("mergevtt", "merge vtt cues while dumping", GF_ARG_BOOL, 0, &merge_vtt_cues, 0, 0),
+ 	MP4BOX_ARG("ttxt", "convert input subtitle to GPAC TTXT format if no parameter. Otherwise, dump given text track to GPAC TTXT format", GF_ARG_INT, 0, parse_ttxt, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("srt", "convert input subtitle to SRT format if no parameter. Otherwise, dump given text track to SRT format", GF_ARG_INT, 0, parse_ttxt, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("nstat", "generate node/field statistics for scene", GF_ARG_BOOL, 0, &stat_level, 1, 0),
+ 	MP4BOX_ARG("nstats", "generate node/field statistics per Access Unit", GF_ARG_BOOL, 0, &stat_level, 2, 0),
+ 	MP4BOX_ARG("nstatx", "generate node/field statistics for scene after each AU", GF_ARG_BOOL, 0, &stat_level, 3, 0),
+ 	MP4BOX_ARG("hash", "generate SHA-1 Hash of the input file", GF_ARG_BOOL, 0, &do_hash, 0, 0),
+ 	MP4BOX_ARG("comp", "replace with compressed version all top level box types given as parameter, formatted as `orig_4cc_1=comp_4cc_1[,orig_4cc_2=comp_4cc_2]`", GF_ARG_STRING, 0, parse_comp_box, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("topcount", "print to stdout the number of top-level boxes matching box types given as parameter, formatted as `4cc_1,4cc_2N`", GF_ARG_STRING, 0, parse_comp_box, 2, ARG_IS_FUN),
+ 	MP4BOX_ARG("topsize", "print to stdout the number of bytes of top-level boxes matching types given as parameter, formatted as `4cc_1,4cc_2N` or `all` for all boxes", GF_ARG_STRING, 0, parse_comp_box, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("bin", "convert input XML file using NHML bitstream syntax to binary", GF_ARG_BOOL, 0, &do_bin_xml, 0, 0),
+ 	MP4BOX_ARG("mpd-rip", "fetch MPD and segment to disk", GF_ARG_BOOL, 0, &do_mpd_rip, 0, 0),
+ 	//MP4BOX_ARG_S("udp-write", "IP[:port]", "write input name to UDP (default port 2345)", GF_FS_ARG_HINT_EXPERT, &udp_dest, 0, GF_ARG_STRING),
+	{"udp-write", NULL, "write input name to UDP (default port 2345)", "IP[:port]", NULL, GF_ARG_STRING, GF_FS_ARG_HINT_EXPERT, &udp_dest, 0, 0},
+ 	MP4BOX_ARG("raw-cat", "raw concatenation of given file with input file", GF_ARG_STRING, GF_FS_ARG_HINT_EXPERT, &raw_cat, 0, 0),
+ 	MP4BOX_ARG("wget", "fetch resource from http(s) URL", GF_ARG_STRING, GF_FS_ARG_HINT_EXPERT, &do_wget, 0, 0),
+ 	MP4BOX_ARG("dm2ts", "dump timing of an input MPEG-2 TS stream sample timing", GF_ARG_BOOL, 0, &dump_m2ts, 0, 0),
+ 	MP4BOX_ARG("check-xml", "check XML output format for -dnal*, -diso* and -dxml options", GF_ARG_BOOL, 0, &dump_check_xml, 0, 0),
 	{0}
 };
 
@@ -785,47 +1177,73 @@
 	"Options:\n"
 	);
 	while (m4b_dump_args[i].name) {
-		GF_GPACArg *arg = &m4b_dump_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_dump_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
 	}
 }
 
-GF_GPACArg m4b_meta_args[] =
+MP4BoxArg m4b_meta_args[] =
 {
- 	GF_DEF_ARG("set-meta `ABCD[:tk=tkID]`", NULL, "set meta box type, with `ABCD` the four char meta type (NULL or 0 to remove meta)\n"
+ 	MP4BOX_ARG_S("set-meta", "ABCD[:tk=tkID]", "set meta box type, with `ABCD` the four char meta type (NULL or 0 to remove meta)\n"
 		"- tk not set: use root (file) meta\n"
 		"- tkID == 0: use moov meta\n"
-		"- tkID != 0: use meta of given track", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("add-items", NULL, "add resource to meta, with parameter syntax `file_path[:opt1:optN]`\n"
+		"- tkID != 0: use meta of given track", 0, parse_meta_args, META_ACTION_SET_TYPE, ARG_IS_FUN),
+ 	MP4BOX_ARG("add-item", "add resource to meta, with parameter syntax `file_path[:opt1:optN]`\n"
 		"- file_path `this` or `self`: item is the file itself\n"
 		"- tk=tkID: meta location (file, moov, track)\n"
-		"- name=str: item name\n"
+		"- name=str: item name, none if not set\n"
 		"- type=itype: item 4cc type (not needed if mime is provided)\n"
-		"- mime=mtype: item mime type\n"
-		"- encoding=enctype: item content-encoding type\n"
+		"- mime=mtype: item mime type, none if not set\n"
+		"- encoding=enctype: item content-encoding type, none if not set\n"
 		"- id=ID: item ID\n"
-		"- ref=4cc,id: reference of type 4cc to an other item", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("add-image", NULL, "add the given file (with parameters) as HEIF image item. Same syntax as [-add-item]()\n"
-		"- name=str: see [-add-item]()\n"
-		"- id=id: see [-add-item]()\n"
-		"- ref=4cc, id: see [-add-item]()\n"
+		"- ref=4cc,id: reference of type 4cc to an other item (can be set multiple times)\n"
+		"- group=id,type: indicate the id and type of an alternate group for this item\n"
+		"- replace: replace existing item by new item"
+		, GF_ARG_STRING, 0, parse_meta_args, META_ACTION_ADD_ITEM, ARG_IS_FUN),
+	MP4BOX_ARG("add-image", "add the given file as HEIF image item, with parameter syntax `file_path[:opt1:optN]`. If `filepath` is omitted, source is the input MP4 file\n"
+		"- name, id, ref: see [-add-item]()\n"
 		"- primary: indicate that this item should be the primary item\n"
-		"- time=t: use the next sync sample after time t (float, in sec, default 0). A negative time imports ALL frames as items\n"
+		"- time=t[-e][/i]: use the next sync sample after time t (float, in sec, default 0). A negative time imports ALL intra frames as items\n"
+		" - If `e` is set (float, in sec), import all sync samples between `t` and `e`\n"
+		" - If `i` is set (float, in sec), sets time increment between samples to import\n"
 		"- split_tiles: for an HEVC tiled image, each tile is stored as a separate item\n"
+		"- image-size=wxh: force setting the image size and ignoring the bitstream info, used for grid, overlay and identity derived images also\n"
 		"- rotation=a: set the rotation angle for this image to 90*a degrees anti-clockwise\n"
+		"- mirror-axis=axis: set the mirror axis: vertical, horizontal\n"
+		"- clap=Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd: see track clap\n"
+ 		"- image-pasp=axb: force the aspect ratio of the image\n"
+ 		"- image-pixi=(a|a,b,c): force the bit depth (1 or 3 channels)\n"
 		"- hidden: indicate that this image item should be hidden\n"
-		"- icc_path: path to icc to add as colr\n"
+		"- icc_path: path to icc data to add as color info\n"
 		"- alpha: indicate that the image is an alpha image (should use ref=auxl also)\n"
-		"- any other option will be passed as options to the media importer, see [-add]()", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("rem-item `item_ID[:tk=tkID]`", NULL, "remove resource from meta", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("set-primary `item_ID[:tk=tkID]`", NULL, "set item as primary for meta", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("set-xml `xml_file_path[:tk=tkID][:binary]`", NULL, "set meta XML data", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("rem-xml `[tk=tkID]`", NULL, "remove meta XML data", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("dump-xml `file_path[:tk=tkID]`", NULL, "dump meta XML to file", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("dump-item `item_ID[:tk=tkID][:path=fileName]`", NULL, "dump item to file", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("package", NULL, "package input XML file into an ISO container, all media referenced except hyperlinks are added to file", NULL, NULL, GF_ARG_STRING, 0),
-	GF_DEF_ARG("package", NULL, "package input XML file into an MPEG-U widget with ISO container, all files contained in the current folder are added to the widget package", NULL, NULL, GF_ARG_STRING, 0),
+		"- depth: indicate that the image is a depth image (should use ref=auxl also)\n"
+		"- it=ID: indicate the item ID of the source item to import\n"
+		"- itp=ID: same as `it=` but copy over all properties of the source item\n"
+		"- tk=tkID: indicate the track ID of the source sample. If 0, uses the first video track in the file\n"
+		"- samp=N: indicate the sample number of the source sample\n"
+		"- ref: do not copy the data but refer to the final sample/item location, ignored if `filepath` is set\n"
+		"- agrid[=AR]: creates an automatic grid from the image items present in the file, in their declaration order. The grid will **try to** have `AR` aspect ratio if specified (float), or the aspect ratio of the source otherwise. The grid will be the primary item and all other images will be hidden\n"
+		"- av1_op_index: select the AV1 operating point to use via a1op box\n"
+		"- replace: replace existing image by new image, keeping props listed in `keep_props`\n"
+		"- keep_props=4CCs: coma-separated list of properties types to keep when replacing the image, e.g. `keep_props=auxC`\n"
+		"- auxt=URN: mark image as auxiliary using given `URN`\n"
+		"- auxd=FILE: use data from `FILE` as auxiliary extensions (cf `auxC` box)\n"
+		"- any other options will be passed as options to the media importer, see [-add]()"
+		, GF_ARG_STRING, 0, parse_meta_args, META_ACTION_ADD_IMAGE_ITEM, ARG_IS_FUN),
+	MP4BOX_ARG("add-derived-image", "create an image grid, overlay or identity item, with parameter syntax `:type=(grid|iovl|iden)[:opt1:optN]`\n"
+		"- image-grid-size=rxc: set the number of rows and columns of the grid\n"
+ 		"- image-overlay-offsets=h,v[,h,v]*: set the horizontal and vertical offsets of the images in the overlay\n"
+ 		"- image-overlay-color=r,g,b,a: set the canvas color of the overlay [0-65535]\n"
+	 "- any other options from [-add-image]() can be used\n", GF_ARG_STRING, 0, parse_meta_args, META_ACTION_ADD_IMAGE_DERIVED, ARG_IS_FUN),
+	MP4BOX_ARG_S_ALT("rem-item", "rem-image", "item_ID[:tk=tkID]", "remove resource from meta", 0, parse_meta_args, META_ACTION_REM_ITEM, ARG_IS_FUN),
+	MP4BOX_ARG_S("set-primary", "item_ID[:tk=tkID]", "set item as primary for meta", 0, parse_meta_args, META_ACTION_SET_PRIMARY_ITEM, ARG_IS_FUN),
+	MP4BOX_ARG_S("set-xml", "xml_file_path[:tk=tkID][:binary]", "set meta XML data", 0, parse_meta_args, META_ACTION_SET_XML, ARG_IS_FUN),
+	MP4BOX_ARG_S("rem-xml", "[tk=tkID]", "remove meta XML data", 0, parse_meta_args, META_ACTION_REM_XML, ARG_IS_FUN),
+	MP4BOX_ARG_S("dump-xml", "file_path[:tk=tkID]", "dump meta XML to file", 0, parse_meta_args, META_ACTION_DUMP_XML, ARG_IS_FUN),
+	MP4BOX_ARG_S("dump-item", "item_ID[:tk=tkID][:path=fileName]", "dump item to file", 0, parse_meta_args, META_ACTION_DUMP_ITEM, ARG_IS_FUN),
+	MP4BOX_ARG("package", "package input XML file into an ISO container, all media referenced except hyperlinks are added to file", GF_ARG_STRING, 0, &pack_file, 0, 0),
+	MP4BOX_ARG("mgt", "package input XML file into an MPEG-U widget with ISO container, all files contained in the current folder are added to the widget package", GF_ARG_STRING, 0, parse_mpegu, 0, ARG_IS_FUN),
 	{0}
 };
 
@@ -835,26 +1253,30 @@
 	gf_sys_format_help(helpout, help_flags, "# Meta and HEIF Options\n"
 	"IsoMedia files can be used as generic meta-data containers, for examples storing XML information and sample images for a movie. The resulting file may not always contain a movie as is the case with some HEIF files or MPEG-21 files.\n"
 	" \n"
-	"These information can be stored at the file root level, as is the case for HEIF/IFF and MPEG-21 file formats, or at the moovie or track level for a regular movie."
+	"These information can be stored at the file root level, as is the case for HEIF/IFF and MPEG-21 file formats, or at the movie or track level for a regular movie."
 	" \n \n");
 	while (m4b_meta_args[i].name) {
-		GF_GPACArg *arg = &m4b_meta_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_meta_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
 	}
 }
 
-GF_GPACArg m4b_swf_args[] =
+MP4BoxArg m4b_swf_args[] =
 {
- 	GF_DEF_ARG("global", NULL, "all SWF defines are placed in first scene replace rather than when needed", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("no-ctrl", NULL, "use a single stream for movie control and dictionary (this will disable ActionScript)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("no-text", NULL, "remove all SWF text", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("no-font", NULL, "remove all embedded SWF Fonts (local playback host fonts used)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("no-line", NULL, "remove all lines from SWF shapes", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("no-grad", NULL, "remove all gradients from swf shapes", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("quad", NULL, "use quadratic bezier curves instead of cubic ones", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("xlp", NULL, "support for lines transparency and scalability", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("flatten", NULL, "complementary angle below which 2 lines are merged, value `0`means no flattening", NULL, NULL, GF_ARG_DOUBLE, 0),
+#ifndef GPAC_DISABLE_SCENE_ENCODER
+ 	MP4BOX_ARG("global", "all SWF defines are placed in first scene replace rather than when needed", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_STATIC_DICT, ARG_BIT_MASK),
+ 	MP4BOX_ARG("no-ctrl", "use a single stream for movie control and dictionary (this will disable ActionScript)", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_SPLIT_TIMELINE, ARG_BIT_MASK_REM),
+ 	MP4BOX_ARG("no-text", "remove all SWF text", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_NO_TEXT, ARG_BIT_MASK),
+ 	MP4BOX_ARG("no-font", "remove all embedded SWF Fonts (local playback host fonts used)", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_NO_FONT, ARG_BIT_MASK),
+ 	MP4BOX_ARG("no-line", "remove all lines from SWF shapes", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_NO_LINE, ARG_BIT_MASK),
+ 	MP4BOX_ARG("no-grad", "remove all gradients from swf shapes", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_NO_GRADIENT, ARG_BIT_MASK),
+ 	MP4BOX_ARG("quad", "use quadratic bezier curves instead of cubic ones", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_QUAD_CURVE, ARG_BIT_MASK),
+ 	MP4BOX_ARG("xlp", "support for lines transparency and scalability", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_SCALABLE_LINE, ARG_BIT_MASK),
+	MP4BOX_ARG("ic2d", "use indexed curve 2D hardcoded proto", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_USE_IC2D, ARG_BIT_MASK),
+	MP4BOX_ARG("same-app", "appearance nodes are reused", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_REUSE_APPEARANCE, ARG_BIT_MASK),
+ 	MP4BOX_ARG("flatten", "complementary angle below which 2 lines are merged, value `0` means no flattening", GF_ARG_DOUBLE, 0, &swf_flatten_angle, 0, 0),
+#endif
 	{0}
 };
 
@@ -869,14 +1291,15 @@
 	 "Options:\n"
 	);
 	while (m4b_swf_args[i].name) {
-		GF_GPACArg *arg = &m4b_swf_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_swf_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
 	}
 }
 
-GF_GPACArg m4b_liveenc_args[] =
+MP4BoxArg m4b_liveenc_args[] =
 {
+ 	MP4BOX_ARG("live", "enable live BIFS/LASeR encoder", GF_ARG_BOOL, 0, &live_scene, 0, 0),
 	GF_DEF_ARG("dst", NULL, "destination IP", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("port", NULL, "destination port", "7000", NULL, GF_ARG_INT, 0),
 	GF_DEF_ARG("mtu", NULL, "path MTU for RTP packets", "1450", NULL, GF_ARG_INT, 0),
@@ -894,12 +1317,12 @@
 {
 	u32 i=0;
 	gf_sys_format_help(helpout, help_flags, "# Live Scene Encoder Options\n"
-	 "The options shall be specified as òpt_name=opt_val.\n"
+	 "The options shall be specified as `opt_name=opt_val.\n"
 	 "Options:\n"
 	 "\n"
 	);
 	while (m4b_liveenc_args[i].name) {
-		GF_GPACArg *arg = &m4b_liveenc_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_liveenc_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
 	}
@@ -923,15 +1346,95 @@
 	gf_sys_print_core_help(helpout, 0, GF_ARGMODE_ALL, 0);
 }
 
-GF_GPACArg m4b_usage_args[] =
+void PrintTags()
+{
+	u32 i = 0;
+
+	gf_sys_format_help(helpout, help_flags, "# Tagging support\n"
+	"Tags are specified as a colon-separated list `tag_name=tag_value[:tag2=val2]`\n"
+	"Setting a tag with no value or value `NULL` removes the tag.\n"
+	"Special tag value `clear` (or `reset`) removes all tags.\n"
+	"Unsupported tags can be added using their four character code as a tag name, and string value will be assumed.\n"
+	"If the tag name length is 3, the prefix 0xA9 is used to create the four character code.\n"
+	" \n"
+	"Tags can also be loaded from a text file using `-itags filename`. The file must be in UTF8 with:\n"
+	"- lines starting with `tag_name=value` specify the start of a tag\n"
+	"- other lines specify the remainder of the last declared tag\n"
+	" \n"
+	"If tag name starts with `WM/`, the tag is added to `Xtra` box (WMA tag, string only).\n"
+	" \n"
+	"Supported tag names, values, types, aliases:\n"
+	);
+
+	while (1) {
+		s32 type = gf_itags_get_type(i);
+		if (type<0) break;
+		const char *name = gf_itags_get_name(i);
+		u32 itag = gf_itags_get_itag(i);
+		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST , "%s", name);
+		gf_sys_format_help(helpout, help_flags, " (%s) ", gf_4cc_to_str(itag) );
+		switch (type) {
+		case GF_ITAG_STR:
+			gf_sys_format_help(helpout, help_flags, "string"); break;
+		case GF_ITAG_INT8:
+		case GF_ITAG_INT16:
+		case GF_ITAG_INT32:
+		case GF_ITAG_INT64:
+			gf_sys_format_help(helpout, help_flags, "integer"); break;
+		case GF_ITAG_FRAC6:
+		case GF_ITAG_FRAC8:
+			gf_sys_format_help(helpout, help_flags, "fraction (syntax: `A/B` or `A`, B will be 0)"); break;
+		case GF_ITAG_BOOL:
+			gf_sys_format_help(helpout, help_flags, "bool (`yes` or `no`)"); break;
+		case GF_ITAG_ID3_GENRE:
+			gf_sys_format_help(helpout, help_flags, "string (ID3 genre tag)"); break;
+		case GF_ITAG_FILE:
+			gf_sys_format_help(helpout, help_flags, "file path"); break;
+		}
+		name = gf_itags_get_alt_name(i);
+		if (name) {
+			gf_sys_format_help(helpout, help_flags, " (`alias` %s)", name);
+		}
+
+		gf_sys_format_help(helpout, help_flags, "\n");
+		i++;
+	}
+}
+
+void PrintCICP()
+{
+	u32 i;
+	gf_sys_format_help(helpout, help_flags, "# Video CICP (ISO/IEC 23091-2) Constants\n");
+	gf_sys_format_help(helpout, help_flags, "CICP Color Primaries:\n");
+	for (i=0; i<GF_CICP_PRIM_LAST; i++) {
+		const char *name = gf_cicp_color_primaries_name(i);
+		if (!name || !strcmp(name, "unknwon")) continue;
+		gf_sys_format_help(helpout, help_flags, " - `%s` (value %d)\n", name, i);
+	}
+	gf_sys_format_help(helpout, help_flags, " \nCICP Color Transfer Characteristics:\n");
+	for (i=0; i<GF_CICP_TRANSFER_LAST; i++) {
+		const char *name = gf_cicp_color_transfer_name(i);
+		if (!name) continue;
+		gf_sys_format_help(helpout, help_flags, " - `%s` (value %d)\n", name, i);
+	}
+	gf_sys_format_help(helpout, help_flags, " \nCICP Color Matrix Coefficients:\n");
+	for (i=0; i<GF_CICP_MX_LAST; i++) {
+		const char *name = gf_cicp_color_matrix_name(i);
+		if (!name) continue;
+		gf_sys_format_help(helpout, help_flags, " - `%s` (value %d)\n", name, i);
+	}
+}
+
+MP4BoxArg m4b_usage_args[] =
 {
- 	GF_DEF_ARG("h", NULL, "print help\n"
+ 	MP4BOX_ARG("h", "print help\n"
 		"- general: general options help\n"
 		"- hint: hinting options help\n"
 		"- dash: DASH segmenter help\n"
+		"- split: split options help\n"
 		"- import: import options help\n"
-		"- encode: encode options help\n"
-		"- meta: meta handling options help\n"
+		"- encode: scene description encoding options help\n"
+		"- meta: meta (HEIF, MPEG-21) handling options help\n"
 		"- extract: extraction options help\n"
 		"- dump: dump options help\n"
 		"- swf: Flash (SWF) options help\n"
@@ -941,22 +1444,29 @@
 		"- core: libgpac core options\n"
 		"- all: print all the above help screens\n"
 		"- opts: print all options\n"
+		"- tags: print supported iTunes tags\n"
+		"- cicp: print various CICP code points\n"
 		"- VAL: search for option named `VAL` (without `-` or `--`) in MP4Box, libgpac core and all filters\n"
-		, NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("hx", NULL, "look for given string in all possible options"
-		, NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("nodes", NULL, "list supported MPEG4 nodes", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("node", NULL, "get given MPEG4 node syntax and QP infolist", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("xnodes", NULL, "list supported X3D nodes", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("xnode", NULL, "get given X3D node syntax", NULL, NULL, GF_ARG_STRING, 0),
- 	GF_DEF_ARG("snodes", NULL, "list supported SVG nodes", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("languages", NULL, "list supported ISO 639 languages", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("boxes", NULL, "list all supported ISOBMF boxes and their syntax", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("fstat", NULL, "print filter session statistics (import/export/encrypt/decrypt/dashing)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("fgraph", NULL, "print filter session graph (import/export/encrypt/decrypt/dashing)", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("v", NULL, "verbose mode", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("version", NULL, "get build version", NULL, NULL, GF_ARG_BOOL, 0),
- 	GF_DEF_ARG("-- INPUT", NULL, "escape option if INPUT starts with `-` character", NULL, NULL, GF_ARG_BOOL, 0),
+		, GF_ARG_STRING, 0, parse_help, 0, ARG_IS_FUN | ARG_EMPTY | ARG_PUSH_SYSARGS),
+ 	MP4BOX_ARG("hx", "look for given string in name and descriptions of all MP4Box and filters options"
+		, GF_ARG_STRING, 0, parse_help, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("nodes", "list supported MPEG4 nodes", GF_ARG_BOOL, 0, PrintBuiltInNodes, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("nodex", "list supported MPEG4 nodes and print nodes", GF_ARG_BOOL, 0, PrintBuiltInNodes, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("node", "get given MPEG4 node syntax and QP infolist", GF_ARG_STRING, 0, PrintNode, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("xnodes", "list supported X3D nodes", GF_ARG_BOOL, 0, PrintBuiltInNodes, 2, ARG_IS_FUN),
+ 	MP4BOX_ARG("xnodex", "list supported X3D nodes and print nodes", GF_ARG_BOOL, 0, PrintBuiltInNodes, 3, ARG_IS_FUN),
+ 	MP4BOX_ARG("xnode", "get given X3D node syntax", GF_ARG_STRING, 0, PrintNode, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG("snodes", "list supported SVG nodes", GF_ARG_BOOL, 0, PrintBuiltInNodes, 4, ARG_IS_FUN),
+ 	MP4BOX_ARG("languages", "list supported ISO 639 languages", GF_ARG_BOOL, 0, PrintLanguages, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("boxes", "list all supported ISOBMF boxes and their syntax", GF_ARG_BOOL, 0, PrintBuiltInBoxes, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("boxcov", "perform coverage of box IO coode", GF_ARG_BOOL, GF_ARG_HINT_HIDE, PrintBuiltInBoxes, 1, ARG_IS_FUN|ARG_PUSH_SYSARGS),
+ 	MP4BOX_ARG_ALT("stats", "fstat", "print filter session statistics (import/export/encrypt/decrypt/dashing)", GF_ARG_BOOL, 0, &fs_dump_flags, 1, ARG_BIT_MASK),
+ 	MP4BOX_ARG_ALT("graph", "fgraph", "print filter session graph (import/export/encrypt/decrypt/dashing)", GF_ARG_BOOL, 0, &fs_dump_flags, 2, ARG_BIT_MASK),
+ 	MP4BOX_ARG("v", "verbose mode", GF_ARG_BOOL, 0, &verbose, 0, ARG_INT_INC),
+ 	MP4BOX_ARG("version", "get build version", GF_ARG_BOOL, 0, print_version, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("genmd", "generate MD doc", GF_ARG_BOOL, GF_ARG_HINT_HIDE, parse_gendoc, 0, ARG_IS_FUN),
+ 	MP4BOX_ARG("genman", "generate man doc", GF_ARG_BOOL, GF_ARG_HINT_HIDE, parse_gendoc, 1, ARG_IS_FUN),
+ 	MP4BOX_ARG_S("-", "INPUT", "escape option if INPUT starts with `-` character", 0, NULL, 0, 0),
 	{0}
 };
 
@@ -968,12 +1478,17 @@
 		"# General Options:\n"
 	);
 	while (m4b_usage_args[i].name) {
-		GF_GPACArg *arg = &m4b_usage_args[i];
+		GF_GPACArg *arg = (GF_GPACArg *) &m4b_usage_args[i];
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-general");
 	}
 }
 
+/*
+ * 		END OF ARGS PARSING AND HELP
+ */
+
+
 enum
 {
 	SEARCH_ARG_EXACT,
@@ -981,34 +1496,31 @@
 	SEARCH_DESC,
 };
 
-static Bool strstr_nocase(const char *text, const char *subtext, u32 subtext_len)
-{
-	if (!*text || !subtext || !subtext_len)
-		return GF_FALSE;
-
-	while (*text) {
-		if (tolower(*text) == *subtext) {
-			if (!strnicmp(text, subtext, subtext_len))
-				return GF_TRUE;
-
-		}
-		text++;
-	}
-	return GF_FALSE;
-}
-
-static u32 PrintHelpForArgs(char *arg_name, GF_GPACArg *args, u32 search_type)
+static u32 PrintHelpForArgs(char *arg_name, MP4BoxArg *args, GF_GPACArg *_args, u32 search_type, char *class_name)
 {
+	char szDesc[100];
 	u32 res=0;
 	u32 i=0;
 	u32 alen = (u32) strlen(arg_name);
-	while (args[i].name) {
+
+	sprintf(szDesc, "see MP4Box -h %s", class_name);
+
+	while (1) {
 		u32 flags=0;
-		GF_GPACArg *arg = &args[i];
+		GF_GPACArg *arg;
 		GF_GPACArg an_arg;
 		Bool do_match = GF_FALSE;
+		if (args) {
+			if (!args[i].name)
+				break;
+			arg = (GF_GPACArg *) &args[i];
+		} else {
+			if (!_args[i].name)
+				break;
+			arg = &_args[i];
+		}
 
-		if (args==ImportFileOpts) {
+		if (args == m4b_imp_fileopt_args) {
 			flags = GF_PRINTARG_COLON;
 			if (!strncmp(arg_name, arg->name, alen) && ((arg->name[alen]==0) || (arg->name[alen]=='=')))
 				do_match = GF_TRUE;
@@ -1029,17 +1541,23 @@
 			i++;
 			continue;
 		}
-		if ((search_type==SEARCH_DESC) && !strstr_nocase(arg->description, arg_name, alen)) {
+		if ((search_type==SEARCH_DESC) && strcmp(arg->name, arg_name) && !gf_strnistr(arg->description, arg_name, alen)) {
 			i++;
 			continue;
 		}
 
 		an_arg = *arg;
 		if (search_type!=SEARCH_ARG_EXACT) {
-			an_arg.description = NULL;
+			if (search_type == SEARCH_DESC)
+				an_arg.description = szDesc;
+			else
+				an_arg.description = NULL;
 			an_arg.type = GF_ARG_BOOL;
+			gf_sys_print_arg(helpout, flags, (GF_GPACArg *) &an_arg, "");
+
+		} else {
+			gf_sys_print_arg(helpout, flags, (GF_GPACArg *) &an_arg, "");
 		}
-		gf_sys_print_arg(helpout, flags, &an_arg, "");
 		res++;
 		i++;
 	}
@@ -1047,25 +1565,27 @@
 }
 static Bool PrintHelpArg(char *arg_name, u32 search_type, GF_FilterSession *fs)
 {
+	char szDesc[100];
 	Bool first=GF_TRUE;
 	GF_GPACArg an_arg;
 	u32 i, count;
 	u32 res = 0;
 	u32 alen = (u32) strlen(arg_name);
-	res += PrintHelpForArgs(arg_name, m4b_gen_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_dash_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_imp_args, search_type);
-	res += PrintHelpForArgs(arg_name, ImportFileOpts, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_senc_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_crypt_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_hint_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_extr_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_dump_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_meta_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_swf_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_liveenc_args, search_type);
-	res += PrintHelpForArgs(arg_name, m4b_usage_args, search_type);
-	res += PrintHelpForArgs(arg_name, (GF_GPACArg *) gf_sys_get_options(), search_type);
+	res += PrintHelpForArgs(arg_name, m4b_gen_args, NULL, search_type, "general");
+	res += PrintHelpForArgs(arg_name, m4b_split_args, NULL, search_type, "split");
+	res += PrintHelpForArgs(arg_name, m4b_dash_args, NULL, search_type, "dash");
+	res += PrintHelpForArgs(arg_name, m4b_imp_args, NULL, search_type, "import");
+	res += PrintHelpForArgs(arg_name, m4b_imp_fileopt_args, NULL, search_type, "import (per-file option)");
+	res += PrintHelpForArgs(arg_name, m4b_senc_args, NULL, search_type, "encode");
+	res += PrintHelpForArgs(arg_name, m4b_crypt_args, NULL, search_type, "crypt");
+	res += PrintHelpForArgs(arg_name, m4b_hint_args, NULL, search_type, "hint");
+	res += PrintHelpForArgs(arg_name, m4b_extr_args, NULL, search_type, "extract");
+	res += PrintHelpForArgs(arg_name, m4b_dump_args, NULL, search_type, "dump");
+	res += PrintHelpForArgs(arg_name, m4b_meta_args, NULL, search_type, "meta");
+	res += PrintHelpForArgs(arg_name, m4b_swf_args, NULL, search_type, "swf");
+	res += PrintHelpForArgs(arg_name, m4b_liveenc_args, NULL, search_type, "live");
+	res += PrintHelpForArgs(arg_name, m4b_usage_args, NULL, search_type, "");
+	res += PrintHelpForArgs(arg_name, NULL, (GF_GPACArg *) gf_sys_get_options(), search_type, "core");
 
 	if (!fs) return res;
 
@@ -1085,7 +1605,7 @@
 			if ((search_type==SEARCH_ARG_CLOSE) && !gf_sys_word_match(arg->arg_name, arg_name)) continue;
 
 			if (search_type==SEARCH_DESC) {
-				if (!strstr_nocase(arg->arg_desc, arg_name, alen)) continue;
+				if (stricmp(arg->arg_name, arg_name) && !gf_strnistr(arg->arg_desc, arg_name, alen)) continue;
 			}
 
 			an_arg.name = arg->arg_name;
@@ -1104,15 +1624,24 @@
 					break;
 				case GF_PROP_STRING_LIST:
 				case GF_PROP_UINT_LIST:
+				case GF_PROP_SINT_LIST:
+				case GF_PROP_VEC2I_LIST:
 					an_arg.type = GF_ARG_STRINGS;
 					break;
+				case GF_PROP_4CC:
+					an_arg.type = GF_ARG_4CC;
+					break;
+				case GF_PROP_4CC_LIST:
+					an_arg.type = GF_ARG_4CCS;
+					break;
 				default:
 					an_arg.type = GF_ARG_STRING;
 					break;
 				}
 				if (first) {
 					first = GF_FALSE;
-					gf_sys_format_help(helpout, 0, "\nGlobal filter session arguments. Syntax is `--arg` or `--arg=VAL`. `[F]` indicates filter name. See `gpac -h` and `gpac -h F` for more info.\n");
+					gf_sys_format_help(helpout, 0, "\nGlobal filter session arguments matching %s:\n", arg_name);
+					//. Syntax is `--arg` or `--arg=VAL`. `[F]` indicates filter name. See `gpac -h` and `gpac -h F` for more info.\n");
 				}
 				fprintf(helpout, "[%s]", reg->name);
 				len = (u32)strlen(reg->name);
@@ -1121,6 +1650,9 @@
 					fprintf(helpout, " ");
 				}
 				fprintf(helpout, " ");
+			} else if (search_type==SEARCH_DESC) {
+				sprintf(szDesc, "see filter %s", reg->name);
+				an_arg.description = szDesc;
 			}
 
 			gf_sys_print_arg(helpout, GF_PRINTARG_ADD_DASH, &an_arg, "TEST");
@@ -1144,7 +1676,7 @@
 	if (search_desc) {
 		char *_arg_name = gf_strdup(arg_name);
 		strlwr(_arg_name);
-		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Possible options mentionning `%s`:\n", arg_name));
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Possible options mentioning `%s`:\n", arg_name));
 		PrintHelpArg(_arg_name, SEARCH_DESC, fs);
 		gf_free(_arg_name);
 	} else {
@@ -1160,6 +1692,1720 @@
 		gf_fs_del(fs);
 }
 
+
+u32 parse_sdp_ext(char *arg_val, u32 param)
+{
+	char *id;
+	sdp_lines = gf_realloc(sdp_lines, sizeof(SDPLine) * (nb_sdp_ex + 1));
+	if (!sdp_lines) return 2;
+	id = strchr(arg_val, ':');
+	if (id) {
+		id[0] = 0;
+		if (sscanf(arg_val, "%u", &sdp_lines[nb_sdp_ex].trackID) == 1) {
+			id[0] = ':';
+			sdp_lines[nb_sdp_ex].line = id + 1;
+		}
+		else {
+			id[0] = ':';
+			sdp_lines[nb_sdp_ex].line = arg_val;
+			sdp_lines[nb_sdp_ex].trackID = 0;
+		}
+	}
+	else {
+		sdp_lines[nb_sdp_ex].line = arg_val;
+		sdp_lines[nb_sdp_ex].trackID = 0;
+	}
+	open_edit = GF_TRUE;
+	nb_sdp_ex++;
+	return GF_FALSE;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+static u32 parse_meta_args(char *opts, MetaActionType act_type)
+{
+	MetaAction *meta;
+
+	metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
+	if (!metas) return 2;
+	meta = &metas[nb_meta_act];
+	nb_meta_act ++;
+
+	memset(meta, 0, sizeof(MetaAction));
+	meta->act_type = act_type;
+	meta->trackID = 0;
+	meta->root_meta = 1;
+	open_edit = GF_TRUE;
+
+	if (!opts) return 2;
+
+	if (act_type == META_ACTION_ADD_IMAGE_ITEM)
+		has_add_image = GF_TRUE;
+
+#define CHECK_IMGPROP\
+			if (!meta->image_props) {\
+				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);\
+				if (!meta->image_props) return 2;\
+			}\
+
+	while (1) {
+		char *next;
+		char *szSlot;
+		if (!opts || !opts[0]) return 0;
+		if (opts[0]==':') opts += 1;
+
+		szSlot = opts;
+		next = gf_url_colon_suffix(opts, '=');
+		if (next) next[0] = 0;
+		if (next && !strncmp(szSlot, "auxt", 4)) {
+			next[0] = ':';
+			char *sep = strchr(next, '=');
+			if (sep) {
+				next = sep;
+				while (next[0] != ':')
+					next--;
+
+				next[0] = 0;
+			}
+		}
+
+		if (!strnicmp(szSlot, "tk=", 3)) {
+			sscanf(szSlot, "tk=%u", &meta->trackID);
+			if (act_type == META_ACTION_ADD_ITEM)
+				meta->root_meta = 0;
+		}
+		else if (!strnicmp(szSlot, "id=", 3)) {
+			meta->item_id = atoi(szSlot+3);
+		}
+		else if (!strnicmp(szSlot, "type=", 5)) {
+			meta->item_type = GF_4CC(szSlot[5], szSlot[6], szSlot[7], szSlot[8]);
+		}
+		//"ref" (without '=') is for data reference, "ref=" is for item references
+		else if (!strnicmp(szSlot, "ref=", 4)) {
+			char type[5];
+			MetaRef	*ref;
+			if (!meta->item_refs) {
+				meta->item_refs = gf_list_new();
+				if (!meta->item_refs) return 2;
+			}
+			GF_SAFEALLOC(ref, MetaRef);
+			if (!ref) return 2;
+			sscanf(szSlot, "ref=%4s,%u", type, &(ref->ref_item_id));
+			ref->ref_type = GF_4CC(type[0], type[1], type[2], type[3]);
+			gf_list_add(meta->item_refs, ref);
+		}
+		else if (!strnicmp(szSlot, "name=", 5)) {
+			meta->szName = gf_strdup(szSlot+5);
+		}
+		else if (!strnicmp(szSlot, "path=", 5)) {
+			meta->szPath = gf_strdup(szSlot+5);
+		}
+		else if (!strnicmp(szSlot, "mime=", 5)) {
+			meta->item_type = GF_META_ITEM_TYPE_MIME;
+			meta->mime_type = gf_strdup(szSlot+5);
+		}
+		else if (!strnicmp(szSlot, "encoding=", 9)) {
+			meta->enc_type = gf_strdup(szSlot+9);
+		}
+		else if (!strnicmp(szSlot, "image-size=", 11)) {
+			CHECK_IMGPROP
+			sscanf(szSlot+11, "%dx%d", &meta->image_props->width, &meta->image_props->height);
+		}
+		else if (!strnicmp(szSlot, "image-grid-size=", 16)) {
+			CHECK_IMGPROP
+			sscanf(szSlot+16, "%dx%d", &meta->image_props->num_grid_rows, &meta->image_props->num_grid_columns);
+		}
+		else if (!strnicmp(szSlot, "image-overlay-color=", 20)) {
+			CHECK_IMGPROP
+			sscanf(szSlot+20, "%d,%d,%d,%d", &meta->image_props->overlay_canvas_fill_value_r,&meta->image_props->overlay_canvas_fill_value_g,&meta->image_props->overlay_canvas_fill_value_b,&meta->image_props->overlay_canvas_fill_value_a);
+		}
+		else if (!strnicmp(szSlot, "image-overlay-offsets=", 22)) {
+			CHECK_IMGPROP
+			u32 position = 22;
+			u32 comma_count = 0;
+			u32 offset_index = 0;
+			char *prev = szSlot+position;
+			char *sub_next = strchr(szSlot+position, ',');
+			while (sub_next != NULL) {
+				comma_count++;
+				sub_next++;
+				sub_next = strchr(sub_next, ',');
+			}
+			meta->image_props->overlay_count = comma_count/2+1;
+			meta->image_props->overlay_offsets = (GF_ImageItemOverlayOffset *)gf_malloc(meta->image_props->overlay_count*sizeof(GF_ImageItemOverlayOffset));
+			if (!meta->image_props->overlay_offsets) {
+				return 0;
+			}
+			sub_next = strchr(szSlot+position, ',');
+			while (sub_next != NULL) {
+				*sub_next = 0;
+				meta->image_props->overlay_offsets[offset_index].horizontal = atoi(prev);
+				*sub_next = ',';
+				sub_next++;
+				prev = sub_next;
+				if (sub_next) {
+					sub_next = strchr(sub_next, ',');
+					if (sub_next) *sub_next = 0;
+					meta->image_props->overlay_offsets[offset_index].vertical = atoi(prev);
+					if (sub_next) {
+						*sub_next = ',';
+						sub_next++;
+						prev = sub_next;
+						sub_next = strchr(sub_next, ',');
+					}
+				} else {
+					meta->image_props->overlay_offsets[offset_index].vertical = 0;
+				}
+				offset_index++;
+			}
+		}
+		else if (!strnicmp(szSlot, "image-pasp=", 11)) {
+			CHECK_IMGPROP
+			sscanf(szSlot+11, "%dx%d", &meta->image_props->hSpacing, &meta->image_props->vSpacing);
+		}
+		else if (!strnicmp(szSlot, "image-pixi=", 11)) {
+			CHECK_IMGPROP
+			if (strchr(szSlot+11, ',') == NULL) {
+				meta->image_props->num_channels = 1;
+				meta->image_props->bits_per_channel[0] = atoi(szSlot+11);
+			} else {
+				meta->image_props->num_channels = 3;
+				sscanf(szSlot+11, "%u,%u,%u", &(meta->image_props->bits_per_channel[0]), &(meta->image_props->bits_per_channel[1]), &(meta->image_props->bits_per_channel[2]));
+			}
+		}
+		else if (!strnicmp(szSlot, "image-rloc=", 11)) {
+			CHECK_IMGPROP
+			sscanf(szSlot+11, "%dx%d", &meta->image_props->hOffset, &meta->image_props->vOffset);
+		}
+		else if (!strnicmp(szSlot, "rotation=", 9)) {
+			CHECK_IMGPROP
+			meta->image_props->angle = atoi(szSlot+9);
+		}
+		else if (!strnicmp(szSlot, "mirror-axis=", 12)) {
+			CHECK_IMGPROP
+			meta->image_props->mirror = (!strnicmp(szSlot+12, "vertical", 8) ? 1 : 2);
+		}
+		else if (!strnicmp(szSlot, "clap=", 5)) {
+			CHECK_IMGPROP
+			sscanf(szSlot + 5, "%d,%d,%d,%d,%d,%d,%d,%d", &meta->image_props->clap_wnum, &meta->image_props->clap_wden,
+					 &meta->image_props->clap_hnum, &meta->image_props->clap_hden,
+					 &meta->image_props->clap_honum, &meta->image_props->clap_hoden,
+					 &meta->image_props->clap_vonum, &meta->image_props->clap_voden);
+		}
+		else if (!stricmp(szSlot, "hidden")) {
+			CHECK_IMGPROP
+			meta->image_props->hidden = GF_TRUE;
+		}
+		else if (!stricmp(szSlot, "alpha")) {
+			CHECK_IMGPROP
+			meta->image_props->alpha = GF_TRUE;
+		}
+		else if (!stricmp(szSlot, "depth")) {
+			CHECK_IMGPROP
+			meta->image_props->depth = GF_TRUE;
+ 		}
+		//"ref" (without '=') is for data reference, "ref=" is for item references
+		else if (!stricmp(szSlot, "ref")) {
+			CHECK_IMGPROP
+			meta->image_props->use_reference = GF_TRUE;
+		}
+		else if (!strnicmp(szSlot, "it=", 3)) {
+			CHECK_IMGPROP
+			meta->image_props->item_ref_id = atoi(szSlot+3);
+		}
+		else if (!strnicmp(szSlot, "itp=", 4)) {
+			CHECK_IMGPROP
+			meta->image_props->item_ref_id = atoi(szSlot+4);
+			meta->image_props->copy_props = 1;
+		}
+		else if (!strnicmp(szSlot, "time=", 5)) {
+			Float s=0, e=0, step=0;
+			CHECK_IMGPROP
+			if (sscanf(szSlot+5, "%f-%f/%f", &s, &e, &step)==3) {
+				meta->image_props->time = s;
+				meta->image_props->end_time = e;
+				meta->image_props->step_time = step;
+			} else if (sscanf(szSlot+5, "%f-%f", &s, &e)==2) {
+				meta->image_props->time = s;
+				meta->image_props->end_time = e;
+			} else if (sscanf(szSlot+5, "%f/%f", &s, &step)==2) {
+				meta->image_props->time = s;
+				meta->image_props->step_time = step;
+			} else if (sscanf(szSlot+5, "%f", &s)==1) {
+				meta->image_props->time = s;
+			}
+		}
+		else if (!strnicmp(szSlot, "samp=", 5)) {
+			CHECK_IMGPROP
+			meta->image_props->sample_num = atoi(szSlot+5);
+			meta->root_meta = 1;
+		}
+		else if (!strnicmp(szSlot, "group=", 6)) {
+			char type[5];
+			sscanf(szSlot, "group=%4s,%u", type, &meta->group_id);
+			meta->group_type = GF_4CC(type[0], type[1], type[2], type[3]);
+		}
+		else if (!stricmp(szSlot, "split_tiles")) {
+			CHECK_IMGPROP
+			meta->image_props->tile_mode = TILE_ITEM_ALL_BASE;
+		}
+		else if (!stricmp(szSlot, "dref")) {
+			meta->use_dref = 1;
+		}
+		else if (!stricmp(szSlot, "primary")) {
+			meta->primary = 1;
+		}
+		else if (!stricmp(szSlot, "binary")) {
+			if (meta->act_type==META_ACTION_SET_XML) meta->act_type=META_ACTION_SET_BINARY_XML;
+		}
+		else if (!strnicmp(szSlot, "icc_path=", 9)) {
+			CHECK_IMGPROP
+			strcpy(meta->image_props->iccPath, szSlot+9);
+		}
+		else if (!stricmp(szSlot, "agrid") || !strnicmp(szSlot, "agrid=", 6)) {
+			CHECK_IMGPROP
+			meta->image_props->auto_grid = GF_TRUE;
+			if (!strnicmp(szSlot, "agrid=", 6))
+				meta->image_props->auto_grid_ratio = atof(szSlot+6);
+		}
+		else if (!strnicmp(szSlot, "av1_op_index=", 13)) {
+			CHECK_IMGPROP
+			meta->image_props->av1_op_index = atoi(szSlot+13);
+		}
+		else if (!stricmp(szSlot, "replace")) {
+			meta->replace = GF_TRUE;
+		}
+		else if (!strnicmp(szSlot, "keep_props=", 11)) {
+			CHECK_IMGPROP
+			meta->keep_props = gf_strdup(szSlot+11);
+		}
+		else if (!strnicmp(szSlot, "auxt=", 5)) {
+			CHECK_IMGPROP
+			meta->image_props->aux_urn = gf_strdup(szSlot+5);
+		}
+		else if (!strnicmp(szSlot, "auxd=", 5)) {
+			CHECK_IMGPROP
+			GF_Err e = gf_file_load_data(szSlot+5, (u8 **) &meta->image_props->aux_data, &meta->image_props->aux_data_len);
+			if (e) {
+				M4_LOG(GF_LOG_ERROR, ("Failed to load auxiliary data file %s: %s\n", szSlot+5, gf_error_to_string(e) ));
+				return 1;
+			}
+		}
+		else if (!strchr(szSlot, '=')) {
+			switch (meta->act_type) {
+			case META_ACTION_SET_TYPE:
+				if (!stricmp(szSlot, "null") || !stricmp(szSlot, "0")) meta->meta_4cc = 0;
+				else meta->meta_4cc = GF_4CC(szSlot[0], szSlot[1], szSlot[2], szSlot[3]);
+				break;
+			case META_ACTION_ADD_ITEM:
+			case META_ACTION_ADD_IMAGE_ITEM:
+			case META_ACTION_SET_XML:
+			case META_ACTION_DUMP_XML:
+				if (!strncmp(szSlot, "dopt", 4) || !strncmp(szSlot, "sopt", 4) || !strncmp(szSlot, "@", 1)) {
+					if (next) next[0]=':';
+					next=NULL;
+				}
+				//cat as -add arg
+				gf_dynstrcat(&meta->szPath, szSlot, ":");
+				if (!meta->szPath) return 2;
+				break;
+			case META_ACTION_REM_ITEM:
+			case META_ACTION_SET_PRIMARY_ITEM:
+			case META_ACTION_DUMP_ITEM:
+				meta->item_id = atoi(szSlot);
+				break;
+			default:
+				break;
+			}
+		}
+		if (!next) break;
+		opts += strlen(szSlot);
+		next[0] = ':';
+	}
+	return 0;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+static Bool parse_tsel_args(char *opts, TSELActionType act)
+{
+	GF_ISOTrackID refTrackID = 0;
+	Bool has_switch_id;
+	u32 switch_id = 0;
+	u32 criteria[30];
+	u32 nb_criteria = 0;
+	TSELAction *tsel_act;
+	char szSlot[1024];
+
+	has_switch_id = 0;
+
+	if (!opts) return 0;
+	while (1) {
+		char *next;
+		if (!opts || !opts[0]) return 0;
+		if (opts[0]==':') opts += 1;
+		strcpy(szSlot, opts);
+		next = gf_url_colon_suffix(szSlot, '=');
+		if (next) next[0] = 0;
+
+
+		if (!strnicmp(szSlot, "refTrack=", 9)) refTrackID = atoi(szSlot+9);
+		else if (!strnicmp(szSlot, "switchID=", 9)) {
+			if (atoi(szSlot+9)<0) {
+				switch_id = 0;
+				has_switch_id = 0;
+			} else {
+				switch_id = atoi(szSlot+9);
+				has_switch_id = 1;
+			}
+		}
+		else if (!strnicmp(szSlot, "switchID", 8)) {
+			switch_id = 0;
+			has_switch_id = 1;
+		}
+		else if (!strnicmp(szSlot, "criteria=", 9)) {
+			u32 j=9;
+			nb_criteria = 0;
+			while (j+3<strlen(szSlot)) {
+				criteria[nb_criteria] = GF_4CC(szSlot[j], szSlot[j+1], szSlot[j+2], szSlot[j+3]);
+				j+=5;
+				nb_criteria++;
+			}
+		}
+		else if (!strnicmp(szSlot, "trackID=", 8) || !strchr(szSlot, '=') ) {
+			tsel_acts = gf_realloc(tsel_acts, sizeof(TSELAction) * (nb_tsel_acts + 1));
+			if (!tsel_acts) return 2;
+
+			tsel_act = &tsel_acts[nb_tsel_acts];
+			nb_tsel_acts++;
+
+			memset(tsel_act, 0, sizeof(TSELAction));
+			tsel_act->act_type = act;
+			tsel_act->trackID = strchr(szSlot, '=') ? atoi(szSlot+8) : atoi(szSlot);
+			tsel_act->refTrackID = refTrackID;
+			tsel_act->switchGroupID = switch_id;
+			tsel_act->is_switchGroup = has_switch_id;
+			tsel_act->nb_criteria = nb_criteria;
+			memcpy(tsel_act->criteria, criteria, sizeof(u32)*nb_criteria);
+
+			if (!refTrackID)
+				refTrackID = tsel_act->trackID;
+
+			open_edit = GF_TRUE;
+		}
+		opts += strlen(szSlot);
+	}
+	return 0;
+}
+#endif // GPAC_DISABLE_ISOM_WRITE
+
+
+GF_DashSegmenterInput *set_dash_input(GF_DashSegmenterInput *dash_inputs, char *name, u32 *nb_dash_inputs)
+{
+	GF_DashSegmenterInput *di;
+	Bool skip_rep_id = GF_FALSE;
+	char *other_opts = NULL;
+	char *sep = gf_url_colon_suffix(name, '=');
+
+	dash_inputs = gf_realloc(dash_inputs, sizeof(GF_DashSegmenterInput) * (*nb_dash_inputs + 1) );
+	memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(GF_DashSegmenterInput) );
+	di = &dash_inputs[*nb_dash_inputs];
+	(*nb_dash_inputs)++;
+
+	if (sep) {
+		char *opts, *first_opt;
+		first_opt = sep;
+		opts = sep+1;
+		while (opts) {
+			//none of our options use filenames, so don't check for '='
+			sep = gf_url_colon_suffix(opts, 0);
+			if (sep && !strncmp(sep, "://", 3) && strncmp(sep, ":@", 2)) sep = gf_url_colon_suffix(sep+3, 0);
+			if (sep) sep[0] = 0;
+
+			if (!strnicmp(opts, "id=", 3)) {
+				if (!stricmp(opts+3, "NULL"))
+					skip_rep_id = GF_TRUE;
+				else
+					di->representationID = gf_strdup(opts+3);
+				/*we allow the same repID to be set to force muxed representations*/
+			}
+			else if (!strnicmp(opts, "dur=", 4)) gf_parse_lfrac(opts+4, &di->media_duration);
+			else if (!strnicmp(opts, "period=", 7)) di->periodID = gf_strdup(opts+7);
+			else if (!strnicmp(opts, "BaseURL=", 8)) {
+				di->baseURL = (char **)gf_realloc(di->baseURL, (di->nb_baseURL+1)*sizeof(char *));
+				di->baseURL[di->nb_baseURL] = gf_strdup(opts+8);
+				di->nb_baseURL++;
+			} else if (!strnicmp(opts, "bandwidth=", 10)) di->bandwidth = atoi(opts+10);
+			else if (!strnicmp(opts, "role=", 5)) {
+				di->roles = gf_realloc(di->roles, sizeof (char *) * (di->nb_roles+1));
+				di->roles[di->nb_roles] = gf_strdup(opts+5);
+				di->nb_roles++;
+			} else if (!strnicmp(opts, "desc", 4)) {
+				u32 *nb_descs=NULL;
+				char ***descs=NULL;
+				u32 opt_offset=0;
+				u32 len;
+				if (!strnicmp(opts, "desc_p=", 7)) {
+					nb_descs = &di->nb_p_descs;
+					descs = &di->p_descs;
+					opt_offset = 7;
+				} else if (!strnicmp(opts, "desc_as=", 8)) {
+					nb_descs = &di->nb_as_descs;
+					descs = &di->as_descs;
+					opt_offset = 8;
+				} else if (!strnicmp(opts, "desc_as_c=", 8)) {
+					nb_descs = &di->nb_as_c_descs;
+					descs = &di->as_c_descs;
+					opt_offset = 10;
+				} else if (!strnicmp(opts, "desc_rep=", 8)) {
+					nb_descs = &di->nb_rep_descs;
+					descs = &di->rep_descs;
+					opt_offset = 9;
+				}
+				if (opt_offset) {
+					(*nb_descs)++;
+					opts += opt_offset;
+					len = (u32) strlen(opts);
+					(*descs) = (char **)gf_realloc((*descs), (*nb_descs)*sizeof(char *));
+					(*descs)[(*nb_descs)-1] = (char *)gf_malloc((len+1)*sizeof(char));
+					memcpy((*descs)[(*nb_descs)-1], opts, len);
+					(*descs)[(*nb_descs)-1][len] = 0;
+				}
+
+			}
+			else if (!strnicmp(opts, "xlink=", 6)) di->xlink = gf_strdup(opts+6);
+			else if (!strnicmp(opts, "sscale", 6)) di->sscale = GF_TRUE;
+			else if (!strnicmp(opts, "pdur=", 5)) gf_parse_frac(opts+5, &di->period_duration);
+			else if (!strnicmp(opts, "period_duration=", 16)) gf_parse_frac(opts+16, &di->period_duration);
+			else if (!strnicmp(opts, "ddur=", 5)) gf_parse_frac(opts+5, &di->dash_duration);
+			else if (!strnicmp(opts, "duration=", 9)) gf_parse_frac(opts+9, &di->dash_duration);
+			else if (!strnicmp(opts, "asID=", 5)) di->asID = atoi(opts+5);
+			else if (!strnicmp(opts, "sn=", 3)) di->startNumber = atoi(opts+3);
+			else if (!strnicmp(opts, "tpl=", 4)) di->seg_template = gf_strdup(opts+4);
+			else if (!strnicmp(opts, "hls=", 4)) di->hls_pl = gf_strdup(opts+4);
+			else if (!strnicmp(opts, "trackID=", 8)) di->track_id = atoi(opts+8);
+			else if (!strnicmp(opts, "@", 1)) {
+				Bool old_syntax = (opts[1]=='@') ? GF_TRUE : GF_FALSE;
+				if (sep) sep[0] = ':';
+				di->filter_chain = gf_strdup(opts + (old_syntax ? 2 : 1) );
+				sep = NULL;
+				if (!old_syntax && (strstr(di->filter_chain, "@@")!=NULL)) {
+					skip_rep_id = GF_TRUE;
+				}
+			} else {
+				gf_dynstrcat(&other_opts, opts, ":");
+			}
+
+			if (!sep) break;
+			sep[0] = ':';
+			opts = sep+1;
+		}
+		first_opt[0] = '\0';
+	}
+	di->file_name = name;
+	di->source_opts = other_opts;
+
+	if (!skip_rep_id && !di->representationID) {
+		char szRep[100];
+		sprintf(szRep, "%d", *nb_dash_inputs);
+		di->representationID = gf_strdup(szRep);
+	}
+
+	return dash_inputs;
+}
+
+static Bool create_new_track_action(char *arg_val, u32 act_type, u32 dump_type)
+{
+	TrackAction *tka;
+	char *param = arg_val;
+	tracks = (TrackAction *)gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+	if (!tracks) return GF_FALSE;
+
+	tka = & tracks[nb_track_act];
+	nb_track_act++;
+
+	memset(tka, 0, sizeof(TrackAction) );
+	tka->act_type = act_type;
+	tka->dump_type = dump_type;
+	if (act_type != TRACK_ACTION_RAW_EXTRACT) {
+		open_edit = GF_TRUE;
+		do_save = GF_TRUE;
+	}
+
+	if ((act_type==TRACK_ACTION_SET_ID) || (act_type==TRACK_ACTION_SWAP_ID)) {
+		if (sscanf(param, "%d:%u", &tka->trackID, &tka->newTrackID) != 2) {
+			M4_LOG(GF_LOG_ERROR, ("Bad format for -set-track-id - expecting \"id1:id2\" got \"%s\"\n", param));
+			return GF_FALSE;
+		}
+		return GF_TRUE;
+	}
+	if (act_type==TRACK_ACTION_SET_PAR) {
+		char *ext;
+		ext = strchr(param, '=');
+		if (!ext) {
+			M4_LOG(GF_LOG_ERROR, ("Bad format for track par - expecting tkID=none or tkID=PAR_NUM:PAR_DEN got %s\n", param));
+			return GF_FALSE;
+		}
+		ext[0] = 0;
+		tka->trackID = atoi(param);
+		ext[0] = '=';
+
+		if (!stricmp(ext+1, "none"))
+			tka->par_num = tka->par_den = 0;
+		else if (!stricmp(ext+1, "auto")) {
+			tka->par_num = tka->par_den = -1;
+			tka->force_par = 1;
+		}
+		else if (!stricmp(ext+1, "force")) {
+			tka->par_num = tka->par_den = 1;
+			tka->force_par = 1;
+		}
+		else {
+			if (ext[1]=='w') {
+				tka->rewrite_bs = 1;
+				ext++;
+			}
+			if (sscanf(ext+1, "%d:%d", &tka->par_num, &tka->par_den) != 2) {
+				M4_LOG(GF_LOG_ERROR, ("Bad format for track par - expecting tkID=PAR_NUM:PAR_DEN got %s\n", param));
+				return GF_FALSE;
+			}
+		}
+		return GF_TRUE;
+	}
+	if (act_type==TRACK_ACTION_SET_CLAP) {
+		char *ext = strchr(param, '=');
+		if (!ext) {
+			M4_LOG(GF_LOG_ERROR, ("Bad format for track clap - expecting tkID=none or tkID=Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd got %s\n", param));
+			return GF_FALSE;
+		}
+		ext[0] = 0;
+		tka->trackID = atoi(param);
+		ext[0] = '=';
+		if (stricmp(ext + 1, "none")) {
+			if (sscanf(ext + 1, "%d,%d,%d,%d,%d,%d,%d,%d", &tka->clap_wnum, &tka->clap_wden, &tka->clap_hnum, &tka->clap_hden, &tka->clap_honum, &tka->clap_hoden, &tka->clap_vonum, &tka->clap_voden) != 8) {
+
+				M4_LOG(GF_LOG_ERROR, ("Bad format for track clap - expecting tkID=none or tkID=Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd got %s\n", param));
+				return GF_FALSE;
+			}
+		}
+		return GF_TRUE;
+	}
+
+	if (act_type==TRACK_ACTION_SET_MX) {
+		char *ext = strchr(param, '=');
+		if (!ext) {
+			M4_LOG(GF_LOG_ERROR, ("Bad format for track matrix - expecting ID=none or ID=M1:M2:M3:M4:M5:M6:M7:M8:M9 got %s\n", param));
+			return GF_FALSE;
+		}
+		ext[0] = 0;
+		tka->trackID = atoi(param);
+		ext[0] = '=';
+		if (!stricmp(ext + 1, "none")) {
+			memset(tka->mx, 0, sizeof(s32)*9);
+			tka->mx[0] = tka->mx[4] = tka->mx[8] = 1;
+		} else {
+			s32 res;
+			if (strstr(ext+1, "0x")) {
+				res = sscanf(ext + 1, "0x%d:0x%d:0x%d:0x%d:0x%d:0x%d:0x%d:0x%d:0x%d", &tka->mx[0], &tka->mx[1], &tka->mx[2], &tka->mx[3], &tka->mx[4], &tka->mx[5], &tka->mx[6], &tka->mx[7], &tka->mx[8]);
+			} else {
+				res = sscanf(ext + 1, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &tka->mx[0], &tka->mx[1], &tka->mx[2], &tka->mx[3], &tka->mx[4], &tka->mx[5], &tka->mx[6], &tka->mx[7], &tka->mx[8]);
+			}
+			if (res != 9) {
+				M4_LOG(GF_LOG_ERROR, ("Bad format for track matrix - expecting ID=none or ID=M1:M2:M3:M4:M5:M6:M7:M8:M9 got %s\n", param));
+				return GF_FALSE;
+			}
+		}
+		return GF_TRUE;
+	}
+	if (act_type==TRACK_ACTION_SET_EDITS) {
+		char *ext = strchr(param, '=');
+		if (!ext) {
+			M4_LOG(GF_LOG_ERROR, ("Bad format for track edits - expecting ID=EDITS got %s\n", param));
+			return GF_FALSE;
+		}
+		ext[0] = 0;
+		tka->trackID = atoi(param);
+		ext[0] = '=';
+		tka->string = gf_strdup(ext+1);
+		return GF_TRUE;
+	}
+	if (act_type==TRACK_ACTION_SET_LANGUAGE) {
+		char *ext = strchr(param, '=');
+		if (!strnicmp(param, "all=", 4)) {
+			strncpy(tka->lang, param + 4, 10-1);
+		}
+		else if (!ext) {
+			strncpy(tka->lang, param, 10-1);
+		} else {
+			strncpy(tka->lang, ext + 1, 10-1);
+			ext[0] = 0;
+			tka->trackID = atoi(param);
+			ext[0] = '=';
+		}
+		return GF_TRUE;
+	}
+	if ((act_type==TRACK_ACTION_SET_KIND) || (act_type==TRACK_ACTION_REM_KIND)) {
+		char *ext;
+		char *scheme_start = NULL;
+
+		//extract trackID
+		if (!strnicmp(param, "all=", 4)) {
+			scheme_start = param + 4;
+		} else {
+			ext = strchr(param, '=');
+			if (ext) {
+				ext[0] = 0;
+				if (sscanf(param, "%d", &tka->trackID) == 1) {
+					scheme_start = ext + 1;
+				} else {
+					scheme_start = param;
+				}
+				ext[0] = '=';
+			} else {
+				scheme_start = param;
+			}
+		}
+
+		//extract scheme and value - if not, remove kind
+		if (!scheme_start || !scheme_start[0]) {
+			M4_LOG(GF_LOG_ERROR, ("Missing kind scheme - expecting ID=schemeURI=value got %s\n", param));
+			return GF_FALSE;
+		} else {
+			ext = strchr(scheme_start, '=');
+			if (!ext) {
+				tka->kind_scheme = gf_strdup(scheme_start);
+			} else {
+				ext[0] = 0;
+				tka->kind_scheme = gf_strdup(scheme_start);
+				ext[0] = '=';
+				tka->kind_value = gf_strdup(ext + 1);
+			}
+		}
+		return GF_TRUE;
+	}
+	if (act_type==TRACK_ACTION_SET_DELAY) {
+		char *ext = strchr(param, '=');
+		if (!ext) {
+			M4_LOG(GF_LOG_ERROR, ("Bad format for track delay - expecting tkID=DLAY got %s\n", param));
+			return GF_FALSE;
+		}
+		ext[0] = 0;
+		tka->trackID = atoi(param);
+		ext[0] = '=';
+		if (sscanf(ext+1, "%d/%u", &tka->delay.num, &tka->delay.den) != 2) {
+			tka->delay.num = atoi(ext + 1);
+			tka->delay.den = 1000;
+		}
+		return GF_TRUE;
+	}
+	if (act_type==TRACK_ACTION_REFERENCE) {
+		char *ext = strchr(param, '=');
+		if (!ext) ext = strchr(param, ':');
+		if (!ext) {
+			M4_LOG(GF_LOG_ERROR, ("Bad format for track reference - expecting tkID:XXXX:refID got %s\n", param));
+			return GF_FALSE;
+		}
+		ext[0] = 0;
+		tka->trackID = atoi(param);
+		ext[0] = '=';
+
+		char *ext2 = strchr(ext, ':');
+		if (!ext2) {
+			M4_LOG(GF_LOG_ERROR, ("Bad format for track reference - expecting tkID:XXXX:refID got %s\n", param));
+			return GF_FALSE;
+		}
+		ext2[0] = 0;
+		strncpy(tka->lang, ext+1, 9);
+		ext2[0] = ':';
+		tka->newTrackID = (s32) atoi(ext2 + 1);
+		return GF_TRUE;
+	}
+	if (act_type==TRACK_ACTION_SET_HANDLER_NAME) {
+		char *ext = strchr(param, '=');
+		if (!ext) {
+			M4_LOG(GF_LOG_ERROR, ("Bad format for track name - expecting tkID=name got %s\n", param));
+			return GF_FALSE;
+		}
+		ext[0] = 0;
+		tka->trackID = atoi(param);
+		ext[0] = '=';
+		tka->hdl_name = ext + 1;
+		return GF_TRUE;
+	}
+	if (act_type==TRACK_ACTION_SET_KMS_URI) {
+		char *ext = strchr(param, '=');
+
+		if (!strnicmp(param, "all=", 4)) {
+			tka->kms = param + 4;
+		} else if (!ext) {
+			tka->kms = param;
+		} else {
+			tka->kms = ext + 1;
+			ext[0] = 0;
+			tka->trackID = atoi(param);
+			ext[0] = '=';
+		}
+		return GF_TRUE;
+	}
+	if ((act_type==TRACK_ACTION_SET_TIME) || (act_type==TRACK_ACTION_SET_MEDIA_TIME)) {
+		struct tm time;
+		char *ext = strchr(arg_val, '=');
+		if (ext) {
+			ext[0] = 0;
+			tka->trackID = atoi(arg_val);
+			ext[0] = '=';
+			arg_val = ext+1;
+		}
+		memset(&time, 0, sizeof(struct tm));
+		sscanf(arg_val, "%d/%d/%d-%d:%d:%d", &time.tm_mday, &time.tm_mon, &time.tm_year, &time.tm_hour, &time.tm_min, &time.tm_sec);
+		time.tm_isdst = 0;
+		time.tm_year -= 1900;
+		time.tm_mon -= 1;
+		tka->time = 2082758400;
+		tka->time += mktime(&time);
+		return GF_TRUE;
+	}
+
+	while (param) {
+		param = gf_url_colon_suffix(param, '=');
+		if (param) {
+			*param = 0;
+			param++;
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
+			if (!strncmp("vttnomerge", param, 10)) {
+				tka->dump_type |= GF_EXPORT_WEBVTT_NOMERGE;
+			} else if (!strncmp("layer", param, 5)) {
+				tka->dump_type |= GF_EXPORT_SVC_LAYER;
+			} else if (!strncmp("full", param, 4)) {
+				tka->dump_type |= GF_EXPORT_NHML_FULL;
+			} else if (!strncmp("embedded", param, 8)) {
+				tka->dump_type |= GF_EXPORT_WEBVTT_META_EMBEDDED;
+			} else if (!strncmp("output=", param, 7)) {
+				tka->out_name = gf_strdup(param+7);
+			} else if (!strncmp("src=", param, 4)) {
+				tka->src_name = gf_strdup(param+4);
+			} else if (!strncmp("str=", param, 4)) {
+				tka->string = gf_strdup(param+4);
+			} else if (!strncmp("box=", param, 4)) {
+				tka->src_name = gf_strdup(param+4);
+				tka->sample_num = 1;
+			} else if (!strncmp("type=", param, 4)) {
+				tka->udta_type = GF_4CC(param[5], param[6], param[7], param[8]);
+			} else if (tka->dump_type == GF_EXPORT_RAW_SAMPLES) {
+				tka->sample_num = atoi(param);
+			}
+#endif
+		}
+	}
+	if (arg_val) {
+		if (!strcmp(arg_val, "*")) {
+			tka->trackID = (u32) -1;
+		} else {
+			if (act_type==TRACK_ACTION_RAW_EXTRACT) {
+				if (!strncmp(arg_val, "video", 5)) {
+					arg_val += 5;
+					tka->dump_track_type = 1;
+				}
+				else if (!strncmp(arg_val, "audio", 5)) {
+					arg_val += 5;
+					tka->dump_track_type = 2;
+				}
+			}
+			if (arg_val[0])
+				tka->trackID = atoi(arg_val);
+		}
+	}
+	return GF_TRUE;
+}
+
+u32 parse_track_dump(char *arg, u32 dump_type)
+{
+	if (!create_new_track_action(arg, TRACK_ACTION_RAW_EXTRACT, dump_type))
+		return 2;
+	track_dump_type = dump_type;
+	return 0;
+}
+u32 parse_track_action(char *arg, u32 act_type)
+{
+	if (!create_new_track_action(arg, act_type, 0)) {
+		return 2;
+	}
+	return 0;
+}
+
+u32 parse_comp_box(char *arg_val, u32 opt)
+{
+	compress_top_boxes = arg_val;
+	size_top_box = opt;
+	return 0;
+}
+u32 parse_dnal(char *arg_val, u32 opt)
+{
+	dump_nal = atoi(arg_val);
+	dump_nal_type = opt;
+	return 0;
+}
+u32 parse_dsap(char *arg_val, u32 opt)
+{
+	dump_saps = atoi(arg_val);
+	dump_saps_mode = opt;
+	return 0;
+}
+
+u32 parse_bs_switch(char *arg_val, u32 opt)
+{
+	if (!stricmp(arg_val, "no") || !stricmp(arg_val, "off")) bitstream_switching_mode = GF_DASH_BSMODE_NONE;
+	else if (!stricmp(arg_val, "merge")) bitstream_switching_mode = GF_DASH_BSMODE_MERGED;
+	else if (!stricmp(arg_val, "multi")) bitstream_switching_mode = GF_DASH_BSMODE_MULTIPLE_ENTRIES;
+	else if (!stricmp(arg_val, "single")) bitstream_switching_mode = GF_DASH_BSMODE_SINGLE;
+	else if (!stricmp(arg_val, "inband")) bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
+	else if (!stricmp(arg_val, "pps")) bitstream_switching_mode = GF_DASH_BSMODE_INBAND_PPS;
+	else {
+		M4_LOG(GF_LOG_ERROR, ("Unrecognized bitstream switching mode \"%s\" - please check usage\n", arg_val));
+		return 2;
+	}
+	return 0;
+}
+
+u32 parse_cp_loc(char *arg_val, u32 opt)
+{
+	if (!strcmp(arg_val, "both")) cp_location_mode = GF_DASH_CPMODE_BOTH;
+	else if (!strcmp(arg_val, "as")) cp_location_mode = GF_DASH_CPMODE_ADAPTATION_SET;
+	else if (!strcmp(arg_val, "rep")) cp_location_mode = GF_DASH_CPMODE_REPRESENTATION;
+	else {
+		M4_LOG(GF_LOG_ERROR, ("Unrecognized ContentProtection loction mode \"%s\" - please check usage\n", arg_val));
+		return 2;
+	}
+	return 0;
+}
+
+u32 parse_pssh(char *arg_val, u32 opt)
+{
+	if (!strcmp(arg_val, "f")) pssh_mode = GF_DASH_PSSH_MOOF;
+	else if (!strcmp(arg_val, "v")) pssh_mode = GF_DASH_PSSH_MOOV;
+	else if (!strcmp(arg_val, "m")) pssh_mode = GF_DASH_PSSH_MPD;
+	else if (!strcmp(arg_val, "mf") || !strcmp(arg_val, "fm")) pssh_mode = GF_DASH_PSSH_MOOF_MPD;
+	else if (!strcmp(arg_val, "mv") || !strcmp(arg_val, "vm")) pssh_mode = GF_DASH_PSSH_MOOV_MPD;
+	else pssh_mode = GF_DASH_PSSH_MOOV;
+	return 0;
+}
+u32 parse_sdtp(char *arg_val, u32 opt)
+{
+	if (!stricmp(arg_val, "both")) sdtp_in_traf = 2;
+	else if (!stricmp(arg_val, "sdtp")) sdtp_in_traf = 1;
+	else sdtp_in_traf = 0;
+	return 0;
+}
+
+u32 parse_rap_ref(char *arg_val, u32 opt)
+{
+	if (arg_val) {
+		if (sscanf(arg_val, "%d", &trackID) == 1) {
+			parse_track_action(arg_val, opt ? TRACK_ACTION_REM_NON_REFS : TRACK_ACTION_REM_NON_RAP);
+		}
+	}
+#ifndef GPAC_DISABLE_STREAMING
+	hint_flags |= GP_RTP_PCK_SIGNAL_RAP;
+#endif
+	seg_at_rap = 1;
+	return 0;
+}
+u32 parse_store_mode(char *arg_val, u32 opt)
+{
+	do_save = GF_TRUE;
+	if ((opt == 0) || (opt == 1)) {
+		interleaving_time = atof(arg_val) / 1000;
+		if (!interleaving_time) do_flat = 2;
+		open_edit = GF_TRUE;
+		no_inplace = GF_TRUE;
+		if (opt==1) old_interleave = 1;
+	} else if (opt==2) {
+		interleaving_time = atof(arg_val);
+		do_frag = GF_TRUE;
+	} else {
+		force_new = 2;
+		interleaving_time = 0.5;
+		do_flat = 1;
+	}
+	return 0;
+}
+u32 parse_base_url(char *arg_val, u32 opt)
+{
+	mpd_base_urls = gf_realloc(mpd_base_urls, (nb_mpd_base_urls + 1)*sizeof(char**));
+	if (!mpd_base_urls) return 2;
+	mpd_base_urls[nb_mpd_base_urls] = arg_val;
+	nb_mpd_base_urls++;
+	return 0;
+}
+u32 parse_multi_rtp(char *arg_val, u32 opt)
+{
+#ifndef GPAC_DISABLE_STREAMING
+	hint_flags |= GP_RTP_PCK_USE_MULTI;
+#endif
+	if (arg_val)
+		max_ptime = atoi(arg_val);
+	return 0;
+}
+
+
+u32 parse_senc_param(char *arg_val, u32 opt)
+{
+#ifndef GPAC_DISABLE_SCENE_ENCODER
+	switch (opt) {
+	case 0: //-sync
+		smenc_opts.flags |= GF_SM_ENCODE_RAP_INBAND;
+		smenc_opts.rap_freq = atoi(arg_val);
+		break;
+	case 1: //-shadow
+		smenc_opts.flags &= ~GF_SM_ENCODE_RAP_INBAND;
+		smenc_opts.flags |= GF_SM_ENCODE_RAP_SHADOW;
+		smenc_opts.rap_freq = atoi(arg_val);
+		break;
+	case 2: //-carousel
+		smenc_opts.flags &= ~(GF_SM_ENCODE_RAP_INBAND | GF_SM_ENCODE_RAP_SHADOW);
+		smenc_opts.rap_freq = atoi(arg_val);
+		break;
+	case 3: //-auto-quant
+		smenc_opts.resolution = atoi(arg_val);
+		smenc_opts.auto_quant = 1;
+		break;
+	case 4: //-global-quant
+		smenc_opts.resolution = atoi(arg_val);
+		smenc_opts.auto_quant = 2;
+		break;
+	case 5: //-ctx-in or -inctx
+		chunk_mode = GF_TRUE;
+		input_ctx = arg_val;
+	}
+#endif
+	return 0;
+}
+u32 parse_cryp(char *arg_val, u32 opt)
+{
+	open_edit = GF_TRUE;
+	if (!opt) {
+		crypt = 1;
+		drm_file = arg_val;
+		open_edit = GF_TRUE;
+		return 0;
+	}
+	crypt = 2;
+	if (arg_val && get_file_type_by_ext(arg_val) != 1) {
+		drm_file = arg_val;
+		return 0;
+	}
+	return 3;
+}
+
+u32 parse_dash_profile(char *arg_val, u32 opt)
+{
+	if (!stricmp(arg_val, "live") || !stricmp(arg_val, "simple")) dash_profile = GF_DASH_PROFILE_LIVE;
+	else if (!stricmp(arg_val, "onDemand")) dash_profile = GF_DASH_PROFILE_ONDEMAND;
+	else if (!stricmp(arg_val, "hbbtv1.5:live") || !stricmp(arg_val, "hbbtv1.5.live"))
+		dash_profile = GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE;
+	else if (!stricmp(arg_val, "dashavc264:live") || !stricmp(arg_val, "dashavc264.live"))
+		dash_profile = GF_DASH_PROFILE_AVC264_LIVE;
+	else if (!stricmp(arg_val, "dashavc264:onDemand") || !stricmp(arg_val, "dashavc264.onDemand"))
+		dash_profile = GF_DASH_PROFILE_AVC264_ONDEMAND;
+	else if (!stricmp(arg_val, "dashif.ll")) dash_profile = GF_DASH_PROFILE_DASHIF_LL;
+	else if (!stricmp(arg_val, "main")) dash_profile = GF_DASH_PROFILE_MAIN;
+	else if (!stricmp(arg_val, "full")) dash_profile = GF_DASH_PROFILE_FULL;
+	else {
+		M4_LOG(GF_LOG_ERROR, ("Unrecognized DASH profile \"%s\" - please check usage\n", arg_val));
+		return 2;
+	}
+	return 0;
+}
+
+u32 parse_fps(char *arg_val, u32 opt)
+{
+	u32 ticks, dts_inc;
+	if (!strcmp(arg_val, "auto")) {
+		M4_LOG(GF_LOG_WARNING, ("Warning, fps=auto option is deprecated\n"));
+	}
+	else if ((sscanf(arg_val, "%u-%u", &ticks, &dts_inc)==2) || (sscanf(arg_val, "%u/%u", &ticks, &dts_inc)==2) ) {
+		if (!dts_inc) dts_inc = 1;
+		import_fps.num = ticks;
+		import_fps.den = dts_inc;
+	} else {
+		gf_parse_frac(arg_val, &import_fps);
+	}
+	return 0;
+}
+
+u32 parse_split(char *arg_val, u32 opt)
+{
+	u32 scale=1;
+	char *unit;
+	switch (opt) {
+	case 0://-split
+		unit = arg_val + (u32) (strlen(arg_val) - 1);
+		if (strchr("Mm", unit[0])) scale = 60;
+		else if (strchr("Hh", unit[0])) scale = 3600;
+		if (scale > 1) {
+			char c = unit[0];
+			unit[0] = 0;
+			split_duration = scale * atof(arg_val);
+			unit[0] = c;
+		} else {
+			split_duration = atof(arg_val);
+		}
+		if (split_duration < 0) split_duration = 0;
+		split_size = 0;
+		break;
+	case 1: //-split-rap, -splitr
+		split_duration = -1;
+		split_size = -1;
+		break;
+	case 2: //-split-size, -splits
+		unit = arg_val + (u32) (strlen(arg_val) - 1);
+		if (strchr("Mm", unit[0])) scale = 1000;
+		else if (strchr("Gg", unit[0])) scale = 1000000;
+		if (scale > 1) {
+			char c = unit[0];
+			unit[0] = 0;
+			split_size = scale * (u32)atoi(arg_val);
+			unit[0] = c;
+		} else {
+			split_size = (u32)atoi(arg_val);
+		}
+		split_duration = 0;
+		break;
+	case 3: //-split-chunk, -splitx
+	case 4: //-splitz
+	case 5: //-splitg
+	case 6: //-splitf
+		adjust_split_end = opt-3;
+		if (!strstr(arg_val, ":") && !strstr(arg_val, "-")) {
+			M4_LOG(GF_LOG_ERROR, ("Chunk extraction usage: \"-split* start:end\" expressed in seconds\n"));
+			return 2;
+		}
+		if (strstr(arg_val, "end")) {
+			if (strstr(arg_val, "end-")) {
+				Double dur_end=0;
+				sscanf(arg_val, "%lf:end-%lf", &split_start, &dur_end);
+				split_duration = -2 - dur_end;
+			} else {
+				sscanf(arg_val, "%lf:end", &split_start);
+				split_duration = -2;
+			}
+		} else {
+			split_range_str = arg_val;
+		}
+		split_size = 0;
+		break;
+	}
+	return 0;
+}
+
+u32 parse_brand(char *b, u32 opt)
+{
+	open_edit = GF_TRUE;
+	switch (opt) {
+	case 0: //-brand
+		major_brand = GF_4CC(b[0], b[1], b[2], b[3]);
+		if (b[4] == ':') {
+			if (!strncmp(b+5, "0x", 2))
+				sscanf(b+5, "0x%x", &minor_version);
+			else
+				minor_version = atoi(b + 5);
+		}
+		break;
+	case 1: //-ab
+		brand_add = (u32*)gf_realloc(brand_add, sizeof(u32) * (nb_alt_brand_add + 1));
+		if (!brand_add) return 2;
+		brand_add[nb_alt_brand_add] = GF_4CC(b[0], b[1], b[2], b[3]);
+		nb_alt_brand_add++;
+		break;
+	case 2: //-rb
+		brand_rem = (u32*)gf_realloc(brand_rem, sizeof(u32) * (nb_alt_brand_rem + 1));
+		if (!brand_rem) return 2;
+		brand_rem[nb_alt_brand_rem] = GF_4CC(b[0], b[1], b[2], b[3]);
+		nb_alt_brand_rem++;
+		break;
+	}
+	return 0;
+}
+
+u32 parse_mpegu(char *arg_val, u32 opt)
+{
+	pack_file = arg_val;
+	pack_wgt = GF_TRUE;
+	return 0;
+}
+
+u32 parse_file_info(char *arg_val, u32 opt)
+{
+	print_info = opt ? 2 : 1;
+	if (opt==2) {
+		print_info = 2;
+		if (arg_val) return 3;
+		return 0;
+	}
+	if (arg_val) {
+		if (sscanf(arg_val, "%u", &info_track_id) == 1) {
+			char szTk[20];
+			sprintf(szTk, "%u", info_track_id);
+			if (strcmp(szTk, arg_val)) info_track_id = 0;
+		}
+		if (!info_track_id) return 3;
+	}
+	return 0;
+}
+u32 parse_boxpatch(char *arg_val, u32 opt)
+{
+	box_patch_filename = arg_val;
+	char *sep = strchr(box_patch_filename, '=');
+	if (sep) {
+		sep[0] = 0;
+		box_patch_trackID = atoi(box_patch_filename);
+		sep[0] = '=';
+		box_patch_filename = sep+1;
+	}
+	open_edit = GF_TRUE;
+	return 0;
+}
+u32 parse_compress(char *arg_val, u32 opt)
+{
+	compress_moov = opt ? 2 : 1;
+	open_edit = GF_TRUE;
+	return 0;
+}
+
+
+u32 parse_dump_udta(char *code, u32 opt)
+{
+	char *sep;
+	sep = strchr(code, ':');
+	if (sep) {
+		sep[0] = 0;
+		dump_udta_track = atoi(code);
+		sep[0] = ':';
+		code = sep + 1;
+	}
+
+	if (strlen(code) == 4) {
+		dump_udta_type = GF_4CC(code[0], code[1], code[2], code[3]);
+	} else if (strlen(code) == 8) {
+		// hex representation on 8 chars
+		u32 hex1, hex2, hex3, hex4;
+		if (sscanf(code, "%02x%02x%02x%02x", &hex1, &hex2, &hex3, &hex4) != 4) {
+			M4_LOG(GF_LOG_ERROR, ("udta code is either a 4CC or 8 hex chars for non-printable 4CC\n"));
+			return 2;
+		}
+		dump_udta_type = GF_4CC(hex1, hex2, hex3, hex4);
+	} else {
+		M4_LOG(GF_LOG_ERROR, ("udta code is either a 4CC or 8 hex chars for non-printable 4CC\n"));
+		return 2;
+	}
+	return 0;
+}
+
+u32 parse_dump_ts(char *arg_val, u32 opt)
+{
+	dump_timestamps = 1;
+	if (arg_val) {
+		if (isdigit(arg_val[0])) {
+			program_number = atoi(arg_val);
+		} else {
+			return 3;
+		}
+	}
+	return 0;
+}
+
+u32 parse_ttxt(char *arg_val, u32 opt)
+{
+	if (opt) //-srt
+		dump_srt = GF_TRUE;
+	else
+		dump_ttxt = GF_TRUE;
+
+	import_subtitle = 1;
+	trackID = 0;
+
+	if (arg_val && (!strcmp(arg_val, "*") || !strcmp(arg_val, "@") || !strcmp(arg_val, "all")) ) {
+		trackID = (u32)-1;
+	} else if (arg_val) {
+		if (sscanf(arg_val, "%u", &trackID) == 1) {
+			char szTk[20];
+			sprintf(szTk, "%d", trackID);
+			if (strcmp(szTk, arg_val))
+				trackID = 0;
+		}
+		if (!trackID) return 3;
+	}
+	return 0;
+}
+
+u32 parse_dashlive(char *arg, char *arg_val, u32 opt)
+{
+	dash_mode = opt ? GF_DASH_DYNAMIC_DEBUG : GF_DASH_DYNAMIC;
+	dash_live = 1;
+	if (arg[10] == '=') {
+		dash_ctx_file = arg + 11;
+	}
+	dash_duration = atof(arg_val);
+	return 0;
+}
+
+u32 parse_help(char *arg_val, u32 opt)
+{
+	if (!arg_val) PrintUsage();
+	else if (opt) PrintHelp(arg_val, GF_TRUE, GF_FALSE);
+	else if (!strcmp(arg_val, "general")) PrintGeneralUsage();
+	else if (!strcmp(arg_val, "extract")) PrintExtractUsage();
+	else if (!strcmp(arg_val, "split")) PrintSplitUsage();
+	else if (!strcmp(arg_val, "dash")) PrintDASHUsage();
+	else if (!strcmp(arg_val, "dump")) PrintDumpUsage();
+	else if (!strcmp(arg_val, "import")) PrintImportUsage();
+	else if (!strcmp(arg_val, "format")) {
+		M4_LOG(GF_LOG_WARNING, ("deprecated, see [filters documentation](Filters)\n"));
+	}
+	else if (!strcmp(arg_val, "hint")) PrintHintUsage();
+	else if (!strcmp(arg_val, "encode")) PrintEncodeUsage();
+	else if (!strcmp(arg_val, "crypt")) PrintEncryptUsage();
+	else if (!strcmp(arg_val, "meta")) PrintMetaUsage();
+	else if (!strcmp(arg_val, "swf")) PrintSWFUsage();
+#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
+	else if (!strcmp(arg_val, "rtp")) {
+		M4_LOG(GF_LOG_WARNING, ("RTP streaming deprecated in MP4Box, use gpac application\n"));
+	}
+	else if (!strcmp(arg_val, "live")) PrintLiveUsage();
+#endif
+	else if (!strcmp(arg_val, "core")) PrintCoreUsage();
+	else if (!strcmp(arg_val, "tags")) PrintTags();
+	else if (!strcmp(arg_val, "cicp")) PrintCICP();
+	else if (!strcmp(arg_val, "all")) {
+		PrintGeneralUsage();
+		PrintExtractUsage();
+		PrintDASHUsage();
+		PrintSplitUsage();
+		PrintDumpUsage();
+		PrintImportUsage();
+		PrintHintUsage();
+		PrintEncodeUsage();
+		PrintEncryptUsage();
+		PrintMetaUsage();
+		PrintSWFUsage();
+#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
+		PrintLiveUsage();
+#endif
+		PrintCoreUsage();
+		PrintTags();
+		PrintCICP();
+	} else if (!strcmp(arg_val, "opts")) {
+		PrintHelp("@", GF_FALSE, GF_FALSE);
+	} else {
+		PrintHelp(arg_val, GF_FALSE, GF_FALSE);
+	}
+	return 1;
+}
+
+u32 parse_gendoc(char *name, u32 opt)
+{
+	u32 i=0;
+	//gen MD
+	if (!opt) {
+		help_flags = GF_PRINTARG_MD | GF_PRINTARG_IS_APP;
+		helpout = gf_fopen("mp4box-gen-opts.md", "w");
+
+		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » General");
+		fprintf(helpout, "\n");
+		fprintf(helpout, "# Syntax\n");
+		gf_sys_format_help(helpout, help_flags, "MP4Box [option] input [option] [other_dash_inputs]\n"
+			" \n"
+		);
+		PrintGeneralUsage();
+		PrintEncryptUsage();
+		fprintf(helpout, "# Help Options\n");
+		while (m4b_usage_args[i].name) {
+			GF_GPACArg *g_arg = (GF_GPACArg *) &m4b_usage_args[i];
+			i++;
+			gf_sys_print_arg(helpout, help_flags, g_arg, "mp4box-general");
+		}
+
+		gf_fclose(helpout);
+
+		helpout = gf_fopen("mp4box-import-opts.md", "w");
+		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Media Import");
+		fprintf(helpout, "\n");
+		PrintImportUsage();
+		gf_fclose(helpout);
+
+		helpout = gf_fopen("mp4box-dash-opts.md", "w");
+		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Media DASH");
+		fprintf(helpout, "\n");
+		PrintDASHUsage();
+		gf_fclose(helpout);
+
+		helpout = gf_fopen("mp4box-dump-opts.md", "w");
+		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Media Dump and Export");
+		fprintf(helpout, "\n");
+		PrintExtractUsage();
+		PrintDumpUsage();
+		PrintSplitUsage();
+		gf_fclose(helpout);
+
+		helpout = gf_fopen("mp4box-meta-opts.md", "w");
+		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Meta and HEIF/IFF");
+		fprintf(helpout, "\n");
+		PrintMetaUsage();
+		gf_fclose(helpout);
+
+
+		helpout = gf_fopen("mp4box-scene-opts.md", "w");
+		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Scene Description");
+		fprintf(helpout, "\n");
+		PrintEncodeUsage();
+#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
+		PrintLiveUsage();
+#endif
+		PrintSWFUsage();
+		gf_fclose(helpout);
+
+		helpout = gf_fopen("mp4box-other-opts.md", "w");
+		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Other Features");
+		fprintf(helpout, "\n");
+		PrintHintUsage();
+		PrintTags();
+		gf_fclose(helpout);
+	}
+	//gen man
+	else {
+		help_flags = GF_PRINTARG_MAN;
+		helpout = gf_fopen("mp4box.1", "w");
+
+
+		fprintf(helpout, ".TH MP4Box 1 2019 MP4Box GPAC\n");
+		fprintf(helpout, ".\n.SH NAME\n.LP\nMP4Box \\- GPAC command-line media packager\n.SH SYNOPSIS\n.LP\n.B MP4Box\n.RI [options] \\ [file] \\ [options]\n.br\n.\n");
+
+		PrintGeneralUsage();
+		PrintExtractUsage();
+		PrintDASHUsage();
+		PrintSplitUsage();
+		PrintDumpUsage();
+		PrintImportUsage();
+		PrintHintUsage();
+		PrintEncodeUsage();
+		PrintEncryptUsage();
+		PrintMetaUsage();
+		PrintSWFUsage();
+		PrintTags();
+#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
+		PrintLiveUsage();
+#endif
+
+		fprintf(helpout, ".SH EXAMPLES\n.TP\nBasic and advanced examples are available at https://wiki.gpac.io/MP4Box\n");
+		fprintf(helpout, ".SH MORE\n.LP\nAuthors: GPAC developers, see git repo history (-log)\n"
+		".br\nFor bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac\n"
+		".br\nbuild: %s\n"
+		".br\nCopyright: %s\n.br\n"
+		".SH SEE ALSO\n"
+		".LP\ngpac(1), MP4Client(1)\n", gf_gpac_version(), gf_gpac_copyright());
+
+		gf_fclose(helpout);
+	}
+	return 1;
+}
+
+static Bool arg_parse_res = 0;
+u32 mp4box_parse_single_arg_class(int argc, char **argv, char *arg, u32 *arg_index, MP4BoxArg *arg_class)
+{
+	MP4BoxArg *arg_desc = NULL;
+	char *arg_val = NULL;
+	u32 i=0;
+	while (arg_class[i].name) {
+		arg_desc = (MP4BoxArg *) &arg_class[i];
+		i++;
+
+#ifdef TEST_ARGS
+		char *sep = strchr(arg_desc->name, ' ');
+		if (sep) {
+			M4_LOG(GF_LOG_ERROR, ("Invalid arg %s, space not allowed\n", arg_desc->name));
+			exit(1);
+		}
+#endif
+		if (!strcmp(arg_desc->name, arg+1))
+			break;
+		if (arg_desc->altname && !strcmp(arg_desc->altname, arg+1))
+			break;
+
+		if (arg_desc->parse_flags & ARG_IS_FUN2) {
+			if (!strncmp(arg_desc->name, arg+1, strlen(arg_desc->name) ))
+				break;
+		}
+		arg_desc = NULL;
+	}
+	if (!arg_desc)
+		return GF_FALSE;
+
+	if (arg_desc->parse_flags & ARG_OPEN_EDIT) open_edit = GF_TRUE;
+	if (arg_desc->parse_flags & ARG_NEED_SAVE) do_save = GF_TRUE;
+	if (arg_desc->parse_flags & ARG_NO_INPLACE) no_inplace = GF_TRUE;
+
+	if (arg_desc->type != GF_ARG_BOOL) {
+		Bool has_next = GF_TRUE;
+		if (*arg_index + 1 == (u32) argc)
+			has_next = GF_FALSE;
+		else if (argv[*arg_index + 1][0] == '-') {
+			s32 v;
+			if (sscanf(argv[*arg_index + 1], "%d", &v)!=1)
+				has_next = GF_FALSE;
+		}
+		if (!has_next && ! (arg_desc->parse_flags & ARG_EMPTY) ) {
+			M4_LOG(GF_LOG_ERROR, ("Missing argument value for %s - please check usage\n", arg));
+			arg_parse_res = 2;
+			return GF_TRUE;
+		}
+
+		if (has_next && (arg_desc->parse_flags & ARG_EMPTY) && (arg_desc->type==GF_ARG_INT)) {
+			s32 ival;
+			if (sscanf(argv[*arg_index + 1], "%d", &ival) != 1) {
+				has_next = GF_FALSE;
+				arg_val = NULL;
+			}
+		}
+		if (has_next) {
+			has_next_arg = GF_TRUE;
+			*arg_index += 1;
+			arg_val = argv[*arg_index];
+		}
+	}
+	if (!arg_desc->arg_ptr) return GF_TRUE;
+
+	if (arg_desc->parse_flags & (ARG_IS_FUN|ARG_IS_FUN2) ) {
+		u32 res;
+		if (arg_desc->parse_flags & ARG_PUSH_SYSARGS)
+			gf_sys_set_args(argc, (const char**) argv);
+
+		if (arg_desc->parse_flags & ARG_IS_FUN) {
+			parse_arg_fun fun = (parse_arg_fun) arg_desc->arg_ptr;
+			res = fun(arg_val, arg_desc->argv_val);
+		} else {
+			parse_arg_fun2 fun2 = (parse_arg_fun2) arg_desc->arg_ptr;
+			res = fun2(arg, arg_val, arg_desc->argv_val);
+		}
+		//rewind, not our arg
+		if ((res==3) && argv) {
+			*arg_index -= 1;
+			res = 0;
+		}
+		arg_parse_res = res;
+		return GF_TRUE;
+	}
+
+	if (arg_desc->parse_flags & ARG_INT_INC) {
+		* (u32 *) arg_desc->arg_ptr += 1;
+		return GF_TRUE;
+	}
+
+	if (arg_desc->type == GF_ARG_BOOL) {
+		if (!arg_desc->parse_flags) {
+			if (arg_desc->argv_val) {
+				* (u32 *) arg_desc->arg_ptr = arg_desc->argv_val;
+			} else {
+				* (Bool *) arg_desc->arg_ptr = GF_TRUE;
+			}
+		} else if (arg_desc->parse_flags & ARG_BOOL_REV) {
+			* (Bool *) arg_desc->arg_ptr = GF_FALSE;
+		} else if (arg_desc->parse_flags & ARG_HAS_VALUE) {
+			* (u32 *) arg_desc->arg_ptr = 0;
+		} else if (arg_desc->parse_flags & ARG_BIT_MASK) {
+			* (u32 *) arg_desc->arg_ptr |= arg_desc->argv_val;
+		} else if (arg_desc->parse_flags & ARG_BIT_MASK_REM) {
+			* (u32 *) arg_desc->arg_ptr &= ~arg_desc->argv_val;
+		} else if (arg_desc->argv_val) {
+			* (u32 *) arg_desc->arg_ptr = arg_desc->argv_val;
+		} else {
+			* (u32 *) arg_desc->arg_ptr = GF_TRUE;
+		}
+		return GF_TRUE;
+	}
+
+	if (arg_desc->type == GF_ARG_STRING) {
+		if (arg_desc->parse_flags & ARG_IS_4CC) {
+			u32 alen = arg_val ? (u32) strlen(arg_val) : 0;
+			if ((alen<3) || (alen>4)) {
+				M4_LOG(GF_LOG_ERROR, ("Value for %s must be a 4CC, %s is not - please check usage\n", arg, arg_val));
+				arg_parse_res = 2;
+				return GF_TRUE;
+			}
+			* (u32 *) arg_desc->arg_ptr = GF_4CC(arg_val[0], arg_val[1], arg_val[2], arg_val[3]);
+			return GF_TRUE;
+		}
+
+		* (char **) arg_desc->arg_ptr = arg_val;
+		return GF_TRUE;
+	}
+	if (!arg_val) {
+		M4_LOG(GF_LOG_ERROR, ("Missing value for %s - please check usage\n", arg));
+		arg_parse_res = 2;
+		return GF_TRUE;
+	}
+
+	if (arg_desc->type == GF_ARG_DOUBLE) {
+		Double v = atof(arg_val);
+		if (arg_desc->parse_flags & ARG_DIV_1000) {
+			v /= 1000;
+		}
+		if ((arg_desc->parse_flags & ARG_NON_ZERO) && !v) {
+			M4_LOG(GF_LOG_ERROR, ("Value for %s shall not be 0 - please check usage\n", arg));
+			arg_parse_res = 2;
+			return GF_TRUE;
+		}
+		* (Double *) arg_desc->arg_ptr = v;
+		return GF_TRUE;
+	}
+
+	if (arg_desc->type != GF_ARG_INT) {
+		M4_LOG(GF_LOG_ERROR, ("Unsupported argument type for %s - please report to gpac devs\n", arg));
+		arg_parse_res = 2;
+		return GF_TRUE;
+	}
+	if (arg_desc->parse_flags & ARG_64BITS) {
+		u64 v;
+		sscanf(arg_val, LLU, &v);
+		if (arg_desc->parse_flags & ARG_DIV_1000) {
+			v /= 1000;
+		}
+		if ((arg_desc->parse_flags & ARG_NON_ZERO) && !v) {
+			M4_LOG(GF_LOG_ERROR, ("Value for %s shall not be 0 - please check usage\n", arg));
+			arg_parse_res = 2;
+			return GF_TRUE;
+		}
+		* (u64 *) arg_desc->arg_ptr = v;
+	} else {
+		u32 v = atoi(arg_val);
+		if (arg_desc->parse_flags & ARG_DIV_1000) {
+			v /= 1000;
+		}
+		if ((arg_desc->parse_flags & ARG_NON_ZERO) && !v) {
+			M4_LOG(GF_LOG_ERROR, ("Value for %s shall not be 0 - please check usage\n", arg));
+			arg_parse_res = 2;
+			return GF_TRUE;
+		}
+		* (s32 *) arg_desc->arg_ptr = v;
+	}
+	return GF_TRUE;
+}
+
+Bool mp4box_parse_single_arg(int argc, char **argv, char *arg, u32 *arg_index)
+{
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_gen_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_split_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_dash_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_imp_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_senc_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_crypt_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_hint_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_extr_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_dump_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_meta_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_swf_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_liveenc_args)) return GF_TRUE;
+	if (mp4box_parse_single_arg_class(argc, argv, arg, arg_index, m4b_usage_args)) return GF_TRUE;
+
+	return GF_FALSE;
+}
+
+
+u32 mp4box_parse_args(int argc, char **argv)
+{
+	u32 i;
+	/*parse our args*/
+	for (i = 1; i < (u32)argc; i++) {
+		char *arg = argv[i];
+		/*input file(s)*/
+		if ((arg[0] != '-') || !stricmp(arg, "--")) {
+			char *arg_val = arg;
+			if (!stricmp(arg, "--")) {
+				if (i+1==(u32)argc) {
+					M4_LOG(GF_LOG_ERROR, ("Missing arg for `--` - please check usage\n"));
+					return 2;
+				}
+				has_next_arg = GF_TRUE;
+				arg_val = argv[i + 1];
+				i++;
+			}
+			if (argc < 3) {
+				M4_LOG(GF_LOG_ERROR, ("Error - only one input file found as argument, please check usage\n"));
+				return 2;
+			}
+			else if (inName) {
+				if (dash_duration) {
+					if (!nb_dash_inputs) {
+						dash_inputs = set_dash_input(dash_inputs, inName, &nb_dash_inputs);
+					}
+					dash_inputs = set_dash_input(dash_inputs, arg_val, &nb_dash_inputs);
+				}
+				else {
+					M4_LOG(GF_LOG_ERROR, ("Error - 2 input names specified, please check usage\n"));
+					return 2;
+				}
+			}
+			else {
+				inName = arg_val;
+			}
+		}
+		//all deprecated options
+		else if (!stricmp(arg, "-grab-ts") || !stricmp(arg, "-atsc") || !stricmp(arg, "-rtp")) {
+			M4_LOG(GF_LOG_ERROR, ("Deprecated fuctionnality `%s` - use gpac application\n", arg));
+			return 2;
+		}
+		else if (!stricmp(arg, "-write-buffer")) {
+			M4_LOG(GF_LOG_WARNING, ("`%s` option deprecated, use `-bs-cache-size`", arg));
+			gf_opts_set_key("temp", "bs-cache-size", argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-pssh-moof")) {
+			M4_LOG(GF_LOG_ERROR, ("`-pssh-moof` option deprecated , use `-pssh` option\n"));
+			return 2;
+		}
+		else if (!stricmp(arg, "-tag-list")) {
+			M4_LOG(GF_LOG_ERROR, ("`-tag-list` option deprecated, use `-h tags`\n"));
+			return 2;
+		}
+		else if (!stricmp(arg, "-aviraw")) {
+			M4_LOG(GF_LOG_ERROR, ("`-aviraw` option deprecated, use `-raw`\n"));
+			return 2;
+		}
+		else if (!stricmp(arg, "-avi")) {
+			M4_LOG(GF_LOG_ERROR, ("`-avi` option deprecated, use `-mux`\n"));
+			return 2;
+		}
+		else if (!strncmp(arg, "-p=", 3)) {
+			continue;
+		}
+
+		//parse argument
+		else if (mp4box_parse_single_arg(argc, argv, arg, &i)) {
+			if (arg_parse_res)
+				return mp4box_cleanup(arg_parse_res);
+		}
+		//not a MP4Box arg
+		else {
+			u32 res = gf_sys_is_gpac_arg(arg);
+			if (res==0) {
+				PrintHelp(arg, GF_FALSE, GF_TRUE);
+				return 2;
+			} else if (res==2) {
+				i++;
+			}
+		}
+		//live scene encoder does not use the unified parsing and should be moved as a scene encoder filter
+		if (live_scene) return 0;
+	}
+	return 0;
+}
+
+/*
+	END OF OPTION PARSING CODE
+*/
+
+
+
 void scene_coding_log(void *cbk, GF_LOG_Level log_level, GF_LOG_Tool log_tool, const char *fmt, va_list vlist)
 {
 	FILE *logs = cbk;
@@ -1168,6 +3414,7 @@
 	fflush(logs);
 }
 
+
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
 /*
@@ -1249,7 +3496,7 @@
 		/*skip emty tracks (mainly MPEG-4 interaction streams...*/
 		if (!gf_isom_get_sample_count(file, i+1)) continue;
 		if (!gf_isom_is_track_enabled(file, i+1)) {
-			fprintf(stderr, "Track ID %d disabled - skipping hint\n", gf_isom_get_track_id(file, i+1) );
+			M4_LOG(GF_LOG_INFO, ("Track ID %d disabled - skipping hint\n", gf_isom_get_track_id(file, i+1) ));
 			continue;
 		}
 
@@ -1296,7 +3543,7 @@
 
 		streamType = 0;
 		esd = gf_isom_get_esd(file, i+1, 1);
-		if (esd) {
+		if (esd && esd->decoderConfig) {
 			streamType = esd->decoderConfig->streamType;
 			if (!prev_ocr) {
 				prev_ocr = esd->OCRESID;
@@ -1313,7 +3560,7 @@
 			/*single AU - check if base64 would fit in ESD (consider 33% overhead of base64), otherwise stream*/
 			if (gf_isom_get_sample_count(file, i+1)==1) {
 				GF_ISOSample *samp = gf_isom_get_sample(file, i+1, 1, &val);
-				if (streamType) {
+				if (streamType && samp) {
 					res = gf_hinter_can_embbed_data(samp->data, samp->dataLength, streamType);
 				} else {
 					/*not a system track, we shall hint it*/
@@ -1329,7 +3576,7 @@
 
 		if (!hinter) {
 			if (e) {
-				fprintf(stderr, "Cannot create hinter (%s)\n", gf_error_to_string(e));
+				M4_LOG(nb_done ? GF_LOG_WARNING : GF_LOG_ERROR, ("Cannot create hinter (%s)\n", gf_error_to_string(e) ));
 				if (!nb_done) return e;
 			}
 			continue;
@@ -1346,19 +3593,15 @@
 		gf_isom_set_nalu_extract_mode(file, i+1, GF_ISOM_NALU_EXTRACT_LAYER_ONLY);
 
 		gf_hinter_track_get_payload_name(hinter, szPayload);
-		fprintf(stderr, "Hinting track ID %d - Type \"%s:%s\" (%s) - BW %d kbps\n", gf_isom_get_track_id(file, i+1), gf_4cc_to_str(mtype), gf_4cc_to_str(mtype), szPayload, bw);
-		if (flags & GP_RTP_PCK_SYSTEMS_CAROUSEL) fprintf(stderr, "\tMPEG-4 Systems stream carousel enabled\n");
-		/*
-				if (flags & GP_RTP_PCK_FORCE_MPEG4) fprintf(stderr, "\tMPEG4 transport forced\n");
-				if (flags & GP_RTP_PCK_USE_MULTI) fprintf(stderr, "\tRTP aggregation enabled\n");
-		*/
+		M4_LOG(GF_LOG_INFO, ("Hinting track ID %d - Type \"%s:%s\" (%s) - BW %d kbps\n", gf_isom_get_track_id(file, i+1), gf_4cc_to_str(mtype), gf_4cc_to_str(mtype), szPayload, bw));
+		if (flags & GP_RTP_PCK_SYSTEMS_CAROUSEL) M4_LOG(GF_LOG_INFO, ("\tMPEG-4 Systems stream carousel enabled\n"));
 		e = gf_hinter_track_process(hinter);
 
 		if (!e) e = gf_hinter_track_finalize(hinter, has_iod);
 		gf_hinter_track_del(hinter);
 
 		if (e) {
-			fprintf(stderr, "Error while hinting (%s)\n", gf_error_to_string(e));
+			M4_LOG(GF_LOG_ERROR, ("Error while hinting (%s)\n", gf_error_to_string(e)));
 			if (!nb_done) return e;
 		}
 		init_payt++;
@@ -1374,7 +3617,7 @@
 	gf_hinter_finalize(file, iod_mode, tot_bw);
 
 	if (!single_ocr)
-		fprintf(stderr, "Warning: at least 2 timelines found in the file\nThis may not be supported by servers/players\n\n");
+		M4_LOG(GF_LOG_WARNING, ("Warning: at least 2 timelines found in the file\nThis may not be supported by servers/players\n\n"));
 
 	return GF_OK;
 }
@@ -1515,558 +3758,6 @@
 	return type;
 }
 
-typedef struct
-{
-	GF_ISOTrackID trackID;
-	char *line;
-} SDPLine;
-
-typedef enum {
-	META_ACTION_SET_TYPE			= 0,
-	META_ACTION_ADD_ITEM			= 1,
-	META_ACTION_REM_ITEM			= 2,
-	META_ACTION_SET_PRIMARY_ITEM	= 3,
-	META_ACTION_SET_XML				= 4,
-	META_ACTION_SET_BINARY_XML		= 5,
-	META_ACTION_REM_XML				= 6,
-	META_ACTION_DUMP_ITEM			= 7,
-	META_ACTION_DUMP_XML			= 8,
-	META_ACTION_ADD_IMAGE_ITEM		= 9,
-} MetaActionType;
-
-typedef struct
-{
-	MetaActionType act_type;
-	Bool root_meta, use_dref;
-	GF_ISOTrackID trackID;
-	u32 meta_4cc;
-	char *szPath, *szName, *mime_type, *enc_type;
-	u32 item_id;
-	Bool primary;
-	u32 item_type;
-	u32 ref_item_id;
-	u32 ref_type;
-	GF_ImageItemProperties *image_props;
-} MetaAction;
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-static Bool parse_meta_args(MetaAction *meta, MetaActionType act_type, char *opts)
-{
-	Bool ret = 0;
-
-	memset(meta, 0, sizeof(MetaAction));
-	meta->act_type = act_type;
-	meta->trackID = 0;
-	meta->root_meta = 1;
-
-	if (!opts) return 0;
-	while (1) {
-		char *next;
-		char *szSlot;
-		if (!opts || !opts[0]) return ret;
-		if (opts[0]==':') opts += 1;
-
-		szSlot = opts;
-		next = gf_url_colon_suffix(opts);
-		if (next) next[0] = 0;
-
-		if (!strnicmp(szSlot, "tk=", 3)) {
-			sscanf(szSlot, "tk=%u", &meta->trackID);
-			meta->root_meta = 0;
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "id=", 3)) {
-			meta->item_id = atoi(szSlot+3);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "type=", 5)) {
-			meta->item_type = GF_4CC(szSlot[5], szSlot[6], szSlot[7], szSlot[8]);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "ref=", 4)) {
-			char type[10];
-			sscanf(szSlot, "ref=%9s,%u", type, &meta->ref_item_id);
-			meta->ref_type = GF_4CC(type[0], type[1], type[2], type[3]);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "name=", 5)) {
-			meta->szName = gf_strdup(szSlot+5);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "path=", 5)) {
-			meta->szPath = gf_strdup(szSlot+5);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "mime=", 5)) {
-			meta->item_type = GF_META_ITEM_TYPE_MIME;
-			meta->mime_type = gf_strdup(szSlot+5);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "encoding=", 9)) {
-			meta->enc_type = gf_strdup(szSlot+9);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "image-size=", 11)) {
-			if (!meta->image_props) {
-				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
-				if (!meta->image_props) return 0;
-			}
-
-			sscanf(szSlot+11, "%dx%d", &meta->image_props->width, &meta->image_props->height);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "image-pasp=", 11)) {
-			if (!meta->image_props) {
-				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
-				if (!meta->image_props) return 0;
-			}
-			sscanf(szSlot+11, "%dx%d", &meta->image_props->hSpacing, &meta->image_props->vSpacing);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "image-rloc=", 11)) {
-			if (!meta->image_props) {
-				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
-				if (!meta->image_props) return 0;
-			}
-			sscanf(szSlot+11, "%dx%d", &meta->image_props->hOffset, &meta->image_props->vOffset);
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "rotation=", 9)) {
-			if (!meta->image_props) {
-				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
-				if (!meta->image_props) return 0;
-			}
-			meta->image_props->angle = atoi(szSlot+9);
-			ret = 1;
-		}
-		else if (!stricmp(szSlot, "hidden")) {
-			if (!meta->image_props) {
-				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
-				if (!meta->image_props) return 0;
-			}
-			meta->image_props->hidden = GF_TRUE;
-			ret = 1;
-		}
-		else if (!stricmp(szSlot, "alpha")) {
-			if (!meta->image_props) {
-				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
-				if (!meta->image_props) return 0;
-			}
-			meta->image_props->alpha = GF_TRUE;
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "time=", 5)) {
-			if (!meta->image_props) {
-				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
-				if (!meta->image_props) return 0;
-			}
-			meta->image_props->time = atof(szSlot+5);
-			ret = 1;
-		}
-		else if (!stricmp(szSlot, "split_tiles")) {
-			if (!meta->image_props) {
-				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
-				if (!meta->image_props) return 0;
-			}
-			meta->image_props->tile_mode = TILE_ITEM_ALL_BASE;
-			ret = 1;
-		}
-		else if (!stricmp(szSlot, "dref")) {
-			meta->use_dref = 1;
-			ret = 1;
-		}
-		else if (!stricmp(szSlot, "primary")) {
-			meta->primary = 1;
-			ret = 1;
-		}
-		else if (!stricmp(szSlot, "binary")) {
-			if (meta->act_type==META_ACTION_SET_XML) meta->act_type=META_ACTION_SET_BINARY_XML;
-			ret = 1;
-		}
-		else if (!strnicmp(szSlot, "icc_path=", 9)) {
-			if (!meta->image_props) {
-				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
-				if (!meta->image_props) return 0;
-			}
-			strcpy(meta->image_props->iccPath, szSlot+9);
-			ret = 1;
-		}
-		else if (!strchr(szSlot, '=')) {
-			switch (meta->act_type) {
-			case META_ACTION_SET_TYPE:
-				if (!stricmp(szSlot, "null") || !stricmp(szSlot, "0")) meta->meta_4cc = 0;
-				else meta->meta_4cc = GF_4CC(szSlot[0], szSlot[1], szSlot[2], szSlot[3]);
-				ret = 1;
-				break;
-			case META_ACTION_ADD_ITEM:
-			case META_ACTION_ADD_IMAGE_ITEM:
-			case META_ACTION_SET_XML:
-			case META_ACTION_DUMP_XML:
-				if (!strncmp(szSlot, "dopt", 4) || !strncmp(szSlot, "sopt", 4) || !strncmp(szSlot, "@@", 2)) {
-					if (next) next[0]=':';
-					next=NULL;
-				}
-				//cat as -add arg
-				gf_dynstrcat(&meta->szPath, szSlot, ":");
-				ret = 1;
-				break;
-			case META_ACTION_REM_ITEM:
-			case META_ACTION_SET_PRIMARY_ITEM:
-			case META_ACTION_DUMP_ITEM:
-				meta->item_id = atoi(szSlot);
-				ret = 1;
-				break;
-			default:
-				break;
-			}
-		}
-		if (!next) break;
-		opts += strlen(szSlot);
-		next[0] = ':';
-	}
-	return ret;
-}
-#endif //GPAC_DISABLE_ISOM_WRITE
-
-typedef enum {
-	TSEL_ACTION_SET_PARAM = 0,
-	TSEL_ACTION_REMOVE_TSEL = 1,
-	TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP = 2,
-} TSELActionType;
-
-typedef struct
-{
-	TSELActionType act_type;
-	GF_ISOTrackID trackID;
-
-	GF_ISOTrackID refTrackID;
-	u32 criteria[30];
-	u32 nb_criteria;
-	Bool is_switchGroup;
-	u32 switchGroupID;
-} TSELAction;
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-static Bool parse_tsel_args(TSELAction **__tsel_list, char *opts, u32 *nb_tsel_act, TSELActionType act)
-{
-	GF_ISOTrackID refTrackID = 0;
-	Bool has_switch_id;
-	u32 switch_id = 0;
-	u32 criteria[30];
-	u32 nb_criteria = 0;
-	TSELAction *tsel_act;
-	char szSlot[1024];
-	TSELAction *tsel_list;
-
-	has_switch_id = 0;
-
-
-	if (!opts) return 0;
-	while (1) {
-		char *next;
-		if (!opts || !opts[0]) return 1;
-		if (opts[0]==':') opts += 1;
-		strcpy(szSlot, opts);
-		next = gf_url_colon_suffix(szSlot);
-		if (next) next[0] = 0;
-
-
-		if (!strnicmp(szSlot, "refTrack=", 9)) refTrackID = atoi(szSlot+9);
-		else if (!strnicmp(szSlot, "switchID=", 9)) {
-			if (atoi(szSlot+9)<0) {
-				switch_id = 0;
-				has_switch_id = 0;
-			} else {
-				switch_id = atoi(szSlot+9);
-				has_switch_id = 1;
-			}
-		}
-		else if (!strnicmp(szSlot, "switchID", 8)) {
-			switch_id = 0;
-			has_switch_id = 1;
-		}
-		else if (!strnicmp(szSlot, "criteria=", 9)) {
-			u32 j=9;
-			nb_criteria = 0;
-			while (j+3<strlen(szSlot)) {
-				criteria[nb_criteria] = GF_4CC(szSlot[j], szSlot[j+1], szSlot[j+2], szSlot[j+3]);
-				j+=5;
-				nb_criteria++;
-			}
-		}
-		else if (!strnicmp(szSlot, "trackID=", 8) || !strchr(szSlot, '=') ) {
-			*__tsel_list = gf_realloc(*__tsel_list, sizeof(TSELAction) * (*nb_tsel_act + 1));
-			tsel_list = *__tsel_list;
-
-			tsel_act = &tsel_list[*nb_tsel_act];
-			memset(tsel_act, 0, sizeof(TSELAction));
-			tsel_act->act_type = act;
-			tsel_act->trackID = strchr(szSlot, '=') ? atoi(szSlot+8) : atoi(szSlot);
-			tsel_act->refTrackID = refTrackID;
-			tsel_act->switchGroupID = switch_id;
-			tsel_act->is_switchGroup = has_switch_id;
-			tsel_act->nb_criteria = nb_criteria;
-			memcpy(tsel_act->criteria, criteria, sizeof(u32)*nb_criteria);
-
-			if (!refTrackID)
-				refTrackID = tsel_act->trackID;
-
-			(*nb_tsel_act) ++;
-		}
-		opts += strlen(szSlot);
-	}
-	return 1;
-}
-#endif // GPAC_DISABLE_ISOM_WRITE
-
-
-#define CHECK_NEXT_ARG	if (i+1==(u32)argc) {\
-		fprintf(stderr, "Missing arg - please check usage\n"); return mp4box_cleanup(1);\
-	} else { \
-		has_next_arg = GF_TRUE;\
-	}
-
-
-typedef enum {
-	TRAC_ACTION_REM_TRACK		= 0,
-	TRAC_ACTION_SET_LANGUAGE	= 1,
-	TRAC_ACTION_SET_DELAY		= 2,
-	TRAC_ACTION_SET_KMS_URI		= 3,
-	TRAC_ACTION_SET_PAR			= 4,
-	TRAC_ACTION_SET_HANDLER_NAME= 5,
-	TRAC_ACTION_ENABLE			= 6,
-	TRAC_ACTION_DISABLE			= 7,
-	TRAC_ACTION_REFERENCE		= 8,
-	TRAC_ACTION_RAW_EXTRACT		= 9,
-	TRAC_ACTION_REM_NON_RAP		= 10,
-	TRAC_ACTION_SET_KIND		= 11,
-	TRAC_ACTION_REM_KIND		= 12,
-	TRAC_ACTION_SET_ID			= 13,
-	TRAC_ACTION_SET_UDTA		= 14,
-	TRAC_ACTION_SWAP_ID			= 15,
-	TRAC_ACTION_REM_NON_REFS	= 16,
-	TRAC_ACTION_SET_CLAP		= 17,
-	TRAC_ACTION_SET_MX		= 18,
-} TrackActionType;
-
-typedef struct
-{
-	TrackActionType act_type;
-	GF_ISOTrackID trackID;
-	char lang[10];
-	s32 delay_ms;
-	const char *kms;
-	const char *hdl_name;
-	s32 par_num, par_den;
-	u8 force_par, rewrite_bs;
-	u32 dump_type, sample_num;
-	char *out_name;
-	char *src_name;
-	u32 udta_type;
-	char *kind_scheme, *kind_value;
-	u32 newTrackID;
-	s32 clap_wnum, clap_wden, clap_hnum, clap_hden, clap_honum, clap_hoden, clap_vonum, clap_voden;
-	s32 mx[9];
-} TrackAction;
-
-enum
-{
-	GF_ISOM_CONV_TYPE_ISMA = 1,
-	GF_ISOM_CONV_TYPE_ISMA_EX,
-	GF_ISOM_CONV_TYPE_3GPP,
-	GF_ISOM_CONV_TYPE_IPOD,
-	GF_ISOM_CONV_TYPE_PSP,
-	GF_ISOM_CONV_TYPE_MOV
-};
-
-
-
-GF_DashSegmenterInput *set_dash_input(GF_DashSegmenterInput *dash_inputs, char *name, u32 *nb_dash_inputs)
-{
-	GF_DashSegmenterInput *di;
-	char *other_opts = NULL;
-	char *sep = gf_url_colon_suffix(name);
-
-	dash_inputs = gf_realloc(dash_inputs, sizeof(GF_DashSegmenterInput) * (*nb_dash_inputs + 1) );
-	memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(GF_DashSegmenterInput) );
-	di = &dash_inputs[*nb_dash_inputs];
-	(*nb_dash_inputs)++;
-
-	if (sep) {
-		char *opts, *first_opt;
-		opts = first_opt = sep;
-		while (opts) {
-			sep = gf_url_colon_suffix(opts);
-			while (sep) {
-				/* this is a real separator if it is followed by a keyword we are looking for */
-				if (!strnicmp(sep, ":id=", 4) ||
-				 !strnicmp(sep, ":dur=", 5) ||
-				 !strnicmp(sep, ":period=", 8) ||
-				 !strnicmp(sep, ":BaseURL=", 9) ||
-				 !strnicmp(sep, ":bandwidth=", 11) ||
-				 !strnicmp(sep, ":role=", 6) ||
-				 !strnicmp(sep, ":desc", 5) ||
-				 !strnicmp(sep, ":sscale", 7) ||
-				 !strnicmp(sep, ":duration=", 10) ||
-				 !strnicmp(sep, ":period_duration=", 10) ||
-				 !strnicmp(sep, ":pdur=", 6) ||
-				 !strnicmp(sep, ":xlink=", 7) ||
-				 !strnicmp(sep, ":asID=", 6) ||
-				 !strnicmp(sep, ":sn=", 4) ||
-				 !strnicmp(sep, ":tpl=", 5) ||
-				 !strnicmp(sep, ":hls=", 5) ||
-				 !strnicmp(sep, ":trackID=", 9) ||
-				 !strnicmp(sep, ":@@", 3)
-				 ) {
-					break;
-				} else {
-					char *nsep = gf_url_colon_suffix(sep+1);
-					if (nsep) nsep[0] = 0;
-
-					gf_dynstrcat(&other_opts, sep, ":");
-
-					if (nsep) nsep[0] = ':';
-
-					sep = strchr(sep+1, ':');
-				}
-			}
-			if (sep && !strncmp(sep, "://", 3) && strnicmp(sep, ":@@", 3)) sep = gf_url_colon_suffix(sep+3);
-			if (sep) sep[0] = 0;
-
-			if (!strnicmp(opts, "id=", 3)) {
-				di->representationID = gf_strdup(opts+3);
-				/*we allow the same repID to be set to force muxed representations*/
-			}
-			else if (!strnicmp(opts, "dur=", 4)) di->media_duration = (Double)atof(opts+4);
-			else if (!strnicmp(opts, "period=", 7)) di->periodID = gf_strdup(opts+7);
-			else if (!strnicmp(opts, "BaseURL=", 8)) {
-				di->baseURL = (char **)gf_realloc(di->baseURL, (di->nb_baseURL+1)*sizeof(char *));
-				di->baseURL[di->nb_baseURL] = gf_strdup(opts+8);
-				di->nb_baseURL++;
-			} else if (!strnicmp(opts, "bandwidth=", 10)) di->bandwidth = atoi(opts+10);
-			else if (!strnicmp(opts, "role=", 5)) {
-				di->roles = gf_realloc(di->roles, sizeof (char *) * (di->nb_roles+1));
-				di->roles[di->nb_roles] = gf_strdup(opts+5);
-				di->nb_roles++;
-			} else if (!strnicmp(opts, "desc", 4)) {
-				u32 *nb_descs=NULL;
-				char ***descs=NULL;
-				u32 opt_offset=0;
-				u32 len;
-				if (!strnicmp(opts, "desc_p=", 7)) {
-					nb_descs = &di->nb_p_descs;
-					descs = &di->p_descs;
-					opt_offset = 7;
-				} else if (!strnicmp(opts, "desc_as=", 8)) {
-					nb_descs = &di->nb_as_descs;
-					descs = &di->as_descs;
-					opt_offset = 8;
-				} else if (!strnicmp(opts, "desc_as_c=", 8)) {
-					nb_descs = &di->nb_as_c_descs;
-					descs = &di->as_c_descs;
-					opt_offset = 10;
-				} else if (!strnicmp(opts, "desc_rep=", 8)) {
-					nb_descs = &di->nb_rep_descs;
-					descs = &di->rep_descs;
-					opt_offset = 9;
-				}
-				if (opt_offset) {
-					(*nb_descs)++;
-					opts += opt_offset;
-					len = (u32) strlen(opts);
-					(*descs) = (char **)gf_realloc((*descs), (*nb_descs)*sizeof(char *));
-					(*descs)[(*nb_descs)-1] = (char *)gf_malloc((len+1)*sizeof(char));
-					strncpy((*descs)[(*nb_descs)-1], opts, len);
-					(*descs)[(*nb_descs)-1][len] = 0;
-				}
-
-			}
-			else if (!strnicmp(opts, "xlink=", 6)) di->xlink = gf_strdup(opts+6);
-			else if (!strnicmp(opts, "sscale", 6)) di->sscale = GF_TRUE;
-			else if (!strnicmp(opts, "pdur=", 5)) di->period_duration = (Double) atof(opts+5);
-			else if (!strnicmp(opts, "period_duration=", 16)) di->period_duration = (Double) atof(opts+16);
-			else if (!strnicmp(opts, "duration=", 9)) di->dash_duration = (Double) atof(opts+9);
-			else if (!strnicmp(opts, "asID=", 5)) di->asID = atoi(opts+5);
-			else if (!strnicmp(opts, "sn=", 3)) di->startNumber = atoi(opts+3);
-			else if (!strnicmp(opts, "tpl=", 4)) di->seg_template = gf_strdup(opts+4);
-			else if (!strnicmp(opts, "hls=", 4)) di->hls_pl = gf_strdup(opts+4);
-			else if (!strnicmp(opts, "trackID=", 8)) di->track_id = atoi(opts+8);
-			else if (!strnicmp(opts, "@@", 2)) {
-				di->filter_chain = gf_strdup(opts+2);
-				if (sep) sep[0] = ':';
-				sep = NULL;
-			}
-
-			if (!sep) break;
-			sep[0] = ':';
-			opts = sep+1;
-		}
-		first_opt[0] = '\0';
-	}
-	di->file_name = name;
-	di->source_opts = other_opts;
-
-	if (!di->representationID) {
-		char szRep[100];
-		sprintf(szRep, "%d", *nb_dash_inputs);
-		di->representationID = gf_strdup(szRep);
-	}
-
-	return dash_inputs;
-}
-
-static GF_Err parse_track_action_params(char *string, TrackAction *action)
-{
-	char *param = string;
-	if (!action || !string) return GF_BAD_PARAM;
-
-	while (param) {
-		param = gf_url_colon_suffix(param);
-		if (param) {
-			*param = 0;
-			param++;
-#ifndef GPAC_DISABLE_MEDIA_EXPORT
-			if (!strncmp("vttnomerge", param, 10)) {
-				action->dump_type |= GF_EXPORT_WEBVTT_NOMERGE;
-			} else if (!strncmp("layer", param, 5)) {
-				action->dump_type |= GF_EXPORT_SVC_LAYER;
-			} else if (!strncmp("full", param, 4)) {
-				action->dump_type |= GF_EXPORT_NHML_FULL;
-			} else if (!strncmp("embedded", param, 8)) {
-				action->dump_type |= GF_EXPORT_WEBVTT_META_EMBEDDED;
-			} else if (!strncmp("output=", param, 7)) {
-				action->out_name = gf_strdup(param+7);
-			} else if (!strncmp("src=", param, 4)) {
-				action->src_name = gf_strdup(param+4);
-			} else if (!strncmp("box=", param, 4)) {
-				action->src_name = gf_strdup(param+4);
-				action->sample_num = 1;
-			} else if (!strncmp("type=", param, 4)) {
-				action->udta_type = GF_4CC(param[5], param[6], param[7], param[8]);
-			} else if (action->dump_type == GF_EXPORT_RAW_SAMPLES) {
-				action->sample_num = atoi(param);
-			}
-#endif
-		}
-	}
-	if (!strcmp(string, "*")) {
-		action->trackID = (u32) -1;
-	} else {
-		action->trackID = atoi(string);
-	}
-	return GF_OK;
-}
-
-static u32 create_new_track_action(char *string, TrackAction **actions, u32 *nb_track_act, u32 dump_type)
-{
-	*actions = (TrackAction *)gf_realloc(*actions, sizeof(TrackAction) * (*nb_track_act+1));
-	memset(&(*actions)[*nb_track_act], 0, sizeof(TrackAction) );
-	(*actions)[*nb_track_act].act_type = TRAC_ACTION_RAW_EXTRACT;
-	(*actions)[*nb_track_act].dump_type = dump_type;
-	parse_track_action_params(string, &(*actions)[*nb_track_act]);
-	(*nb_track_act)++;
-	return dump_type;
-}
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
 static GF_Err xml_bs_to_bin(char *inName, char *outName, u32 dump_std)
@@ -2080,7 +3771,7 @@
 	e = gf_xml_dom_parse(dom, inName, NULL, NULL);
 	if (e) {
 		gf_xml_dom_del(dom);
-		fprintf(stderr, "Failed to parse XML file: %s\n", gf_error_to_string(e));
+		M4_LOG(GF_LOG_ERROR, ("Failed to parse XML file: %s\n", gf_error_to_string(e)));
 		return e;
 	}
 	root = gf_xml_dom_get_root_idx(dom, 0);
@@ -2093,7 +3784,7 @@
 	gf_xml_dom_del(dom);
 
 	if (e) {
-		fprintf(stderr, "Failed to parse binary sequence: %s\n", gf_error_to_string(e));
+		M4_LOG(GF_LOG_ERROR, ("Failed to parse binary sequence: %s\n", gf_error_to_string(e)));
 		return e;
 	}
 
@@ -2110,11 +3801,11 @@
 		}
 		t = gf_fopen(szFile, "wb");
 		if (!t) {
-			fprintf(stderr, "Failed to open file %s\n", szFile);
+			M4_LOG(GF_LOG_ERROR, ("Failed to open file %s\n", szFile));
 			e = GF_IO_ERR;
 		} else {
 			if (gf_fwrite(data, data_size, t) != data_size) {
-				fprintf(stderr, "Failed to write output to file %s\n", szFile);
+				M4_LOG(GF_LOG_ERROR, ("Failed to write output to file %s\n", szFile));
 				e = GF_IO_ERR;
 			}
 			gf_fclose(t);
@@ -2132,7 +3823,7 @@
 	Bool do_all = GF_FALSE;
 	GF_BitStream *bs_in;
 	if (!compress_top_boxes) return GF_BAD_PARAM;
-	if (!strcmp(compress_top_boxes, "all"))
+	if (!strcmp(compress_top_boxes, "all") || !strcmp(compress_top_boxes, "*") || !strcmp(compress_top_boxes, "@"))
 		do_all = GF_TRUE;
 
 	in = gf_fopen(inName, "rb");
@@ -2167,31 +3858,24 @@
 
 }
 
-static GF_Err do_compress_top_boxes(char *inName, char *outName, char *compress_top_boxes, u32 comp_top_box_version, Bool use_lzma)
+static GF_Err do_compress_top_boxes(char *inName, char *outName)
 {
 	FILE *in, *out;
 	u8 *buf;
-	u32 buf_alloc, comp_size, start_offset;
+	u32 buf_alloc, comp_size;
 	s32 bytes_comp=0;
 	s32 bytes_uncomp=0;
 	GF_Err e = GF_OK;
 	u64 source_size, dst_size;
 	u32 orig_box_overhead;
 	u32 final_box_overhead;
-	u32 gzip_code = use_lzma ? GF_4CC('l','z','m','a') : GF_4CC('g','z','i','p') ;
 	u32 nb_added_box_bytes=0;
 	Bool has_mov = GF_FALSE;
-	u32 range_idx, nb_ranges=0;
 	Bool replace_all = !strcmp(compress_top_boxes, "*");
-	Bool requires_byte_ranges=GF_FALSE;
 	GF_BitStream *bs_in, *bs_out;
-	u32 idx_size=0, nb_moof;
-	struct _ranges {
-		u32 size, csize;
-	} *ranges=NULL;
 
 	if (!outName) {
-		fprintf(stderr, "Missing output file name\n");
+		M4_LOG(GF_LOG_ERROR, ("Missing output file name\n"));
 		return GF_BAD_PARAM;
 	}
 
@@ -2208,68 +3892,6 @@
 
 	bs_out = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
 
-	start_offset = 0;
-	nb_moof = 0;
-	if (comp_top_box_version==2) {
-		u32 i;
-		while (gf_bs_available(bs_in)) {
-			u32 size = gf_bs_read_u32(bs_in);
-			u32 type = gf_bs_read_u32(bs_in);
-			const char *b4cc = gf_4cc_to_str(type);
-			const char *replace = strstr(compress_top_boxes, b4cc);
-
-			if (start_offset) {
-				Bool compress = (replace || replace_all) ? 1 : 0;
-				ranges = gf_realloc(ranges, sizeof(struct _ranges)*(nb_ranges+1));
-				ranges[nb_ranges].csize = compress;
-				ranges[nb_ranges].size = size-8;
-				nb_ranges++;
-			}
-			if (!strcmp(b4cc, "ftyp") || !strcmp(b4cc, "styp")) {
-				if (!start_offset) start_offset = (u32) gf_bs_get_position(bs_in) + size-8;
-			}
-			if (!strcmp(b4cc, "sidx") || !strcmp(b4cc, "ssix")) {
-				requires_byte_ranges = GF_TRUE;
-			}
-			if (!strcmp(b4cc, "moof"))
-				nb_moof++;
-
-			gf_bs_skip_bytes(bs_in, size-8);
-		}
-
-		gf_bs_seek(bs_in, 0);
-		if (buf_alloc<start_offset) {
-			buf_alloc = start_offset;
-			buf = gf_realloc(buf, buf_alloc);
-		}
-		gf_bs_read_data(bs_in, buf, start_offset);
-		gf_bs_write_data(bs_out, buf, start_offset);
-
-		if (!requires_byte_ranges) {
-			nb_ranges = 0;
-			gf_free(ranges);
-			ranges = NULL;
-		}
-		idx_size = 8 + 4 + 4;
-		for (i=0; i<nb_ranges; i++) {
-			idx_size += 1;
-			if (ranges[i].size<0xFFFF) {
-				idx_size += 2;
-				if (ranges[i].csize) idx_size += 2;
-			} else {
-				idx_size += 4;
-				if (ranges[i].csize) idx_size += 4;
-			}
-			ranges[i].csize = 0;
-		}
-		i=idx_size;
-		while (i) {
-			gf_bs_write_u8(bs_out, 0);
-			i--;
-		}
-	}
-
-	range_idx = 0;
 	orig_box_overhead = 0;
 	final_box_overhead = 0;
 	while (gf_bs_available(bs_in)) {
@@ -2280,10 +3902,6 @@
 		if (!strcmp(b4cc, "moov")) has_mov = GF_TRUE;
 
 		if (!replace && !replace_all) {
-			if (ranges) {
-				assert(! ranges[range_idx].csize);
-				range_idx++;
-			}
 			gf_bs_write_u32(bs_out, size);
 			gf_bs_write_u32(bs_out, type);
 
@@ -2299,8 +3917,7 @@
 		}
 		orig_box_overhead += size;
 
-		if (comp_top_box_version != 1)
-			size-=8;
+		size-=8;
 
 		if (size>buf_alloc) {
 			buf_alloc = size;
@@ -2308,16 +3925,11 @@
 		}
 		gf_bs_read_data(bs_in, buf, size);
 
-		if (comp_top_box_version != 1)
-			replace+=5;
+		replace+=5;
 
 		comp_size = buf_alloc;
 
-		if (use_lzma) {
-			e = gf_lz_compress_payload(&buf, size, &comp_size);
-		} else {
-			e = gf_gz_compress_payload(&buf, size, &comp_size);
-		}
+		e = gf_gz_compress_payload(&buf, size, &comp_size);
 		if (e) break;
 
 		if (comp_size>buf_alloc) {
@@ -2325,57 +3937,25 @@
 		}
 		bytes_uncomp += size;
 		bytes_comp += comp_size;
-		if (comp_top_box_version==1)
-			nb_added_box_bytes +=8;
 
 		//write size
 		gf_bs_write_u32(bs_out, comp_size+8);
 		//write type
-		if (comp_top_box_version==1)
-			gf_bs_write_u32(bs_out, gzip_code);
-		else
-			gf_bs_write_data(bs_out, replace, 4);
+		gf_bs_write_data(bs_out, replace, 4);
 		//write data
 		gf_bs_write_data(bs_out, buf, comp_size);
 
 		final_box_overhead += 8+comp_size;
-
-		if (ranges) {
-			assert(ranges[range_idx].size == size);
-			ranges[range_idx].csize = comp_size;
-			range_idx++;
-		}
 	}
 	dst_size = gf_bs_get_position(bs_out);
 
-	if (comp_top_box_version==2) {
-		u32 i;
-		gf_bs_seek(bs_out, start_offset);
-		gf_bs_write_u32(bs_out, idx_size);
-		gf_bs_write_u32(bs_out, GF_4CC('c','m','a','p'));
-		gf_bs_write_u32(bs_out, gzip_code);
-		gf_bs_write_u32(bs_out, nb_ranges);
-		for (i=0; i<nb_ranges; i++) {
-			u32 large_size = ranges[i].size>0xFFFF ? 1 : 0;
-			gf_bs_write_int(bs_out, ranges[i].csize ? 1 : 0, 1);
-			gf_bs_write_int(bs_out, large_size ? 1 : 0, 1);
-			gf_bs_write_int(bs_out, 0, 6);
-			large_size = large_size ? 32 : 16;
-
-			gf_bs_write_int(bs_out, ranges[i].size, large_size);
-			if (ranges[i].csize)
-				gf_bs_write_int(bs_out, ranges[i].csize, large_size);
-		}
-		final_box_overhead += idx_size;
-		nb_added_box_bytes += idx_size;
-
-	}
+	if (buf) gf_free(buf);
 	gf_bs_del(bs_in);
 	gf_bs_del(bs_out);
 	gf_fclose(in);
 	gf_fclose(out);
 	if (e) {
-		fprintf(stderr, "Error compressing: %s\n", gf_error_to_string(e));
+		M4_LOG(GF_LOG_ERROR, ("Error compressing: %s\n", gf_error_to_string(e)));
 		return e;
 	}
 
@@ -2437,2052 +4017,1674 @@
 	return GF_OK;
 }
 
+static u32 do_raw_cat()
+{
+	char chunk[4096];
+	FILE *fin, *fout;
+	s64 to_copy, done;
+	fin = gf_fopen(raw_cat, "rb");
+	if (!fin) return mp4box_cleanup(1);
 
-char outfile[GF_MAX_PATH];
-#ifndef GPAC_DISABLE_SCENE_ENCODER
-GF_SMEncodeOptions smenc_opts;
-#endif
-SDPLine *sdp_lines = NULL;
-Double interleaving_time, split_duration, split_start, dash_duration, dash_subduration;
-GF_Fraction import_fps;
-Bool dash_duration_strict;
-MetaAction *metas = NULL;
-TrackAction *tracks = NULL;
-TSELAction *tsel_acts = NULL;
-u64 movie_time, initial_tfdt;
-s32 subsegs_per_sidx;
-u32 *brand_add = NULL;
-u32 *brand_rem = NULL;
-const char *split_range_str = NULL;
-GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_DEFAULT;
-u32 stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, crypt, agg_samples, nb_sdp_ex, max_ptime, split_size, nb_meta_act, nb_track_act, rtp_rate, major_brand, nb_alt_brand_add, nb_alt_brand_rem, old_interleave, car_dur, minor_version, conv_type, nb_tsel_acts, program_number, dump_nal, time_shift_depth, initial_moof_sn, dump_std, import_subtitle, dump_saps, dump_saps_mode, force_new;
-GF_DashDynamicMode dash_mode=GF_DASH_STATIC;
-#ifndef GPAC_DISABLE_SCENE_DUMP
-GF_SceneDumpFormat dump_mode;
-#endif
-Double mpd_live_duration = 0;
-Bool HintIt, needSave, FullInter, Frag, HintInter, dump_rtp, regular_iod, remove_sys_tracks, remove_hint, remove_root_od;
-Bool print_sdp, open_edit, dump_cr, force_ocr, encode, do_scene_log, dump_srt, dump_ttxt, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group, clean_groups, dash_live, no_fragments_defaults, single_traf_per_moof, tfdt_per_traf, hls_clock, do_mpd_rip, merge_vtt_cues, compress_moov, get_nb_tracks;
-static char *inName, *outName, *mediaSource, *tmpdir, *input_ctx, *output_ctx, *drm_file, *avi2raw, *cprt, *chap_file, *pes_dump, *itunes_tags, *pack_file, *raw_cat, *seg_name, *dash_ctx_file, *compress_top_boxes, *high_dynamc_range_filename, *use_init_seg, *box_patch_filename;
-u32 track_dump_type, dump_isom, dump_timestamps, dump_nal_type;
-GF_ISOTrackID trackID;
-u32 do_flat, box_patch_trackID=0, print_info;
-Bool comp_lzma=GF_FALSE;
-Bool freeze_box_order=GF_FALSE;
-Bool chap_qt=GF_FALSE;
-Bool no_odf_conf=GF_FALSE;
-Double min_buffer = 1.5;
-u32 comp_top_box_version = 0;
-u32 size_top_box = 0;
-s32 ast_offset_ms = 0;
-u32 fs_dump_flags = 0;
-u32 dump_chap = 0;
-u32 dump_udta_type = 0;
-u32 dump_udta_track = 0;
-char **mpd_base_urls = NULL;
-u32 nb_mpd_base_urls = 0;
-u32 dash_scale = 1000;
-Bool insert_utc = GF_FALSE;
-const char *udp_dest = NULL;
-#ifndef GPAC_DISABLE_MPD
-Bool do_mpd = GF_FALSE;
-#endif
-#ifndef GPAC_DISABLE_SCENE_ENCODER
-Bool chunk_mode = GF_FALSE;
-#endif
-#ifndef GPAC_DISABLE_ISOM_HINTING
-Bool HintCopy = GF_FALSE;
-Bool hint_no_offset = GF_FALSE;
-u32 MTUSize = 1450;
-#endif
-#ifndef GPAC_DISABLE_CORE_TOOLS
-Bool do_bin_xml = GF_FALSE;
-#endif
-GF_ISOFile *file;
-Bool frag_real_time = GF_FALSE;
-const char *dash_start_date=NULL;
-GF_DASH_ContentLocationMode cp_location_mode = GF_DASH_CPMODE_ADAPTATION_SET;
-Double mpd_update_time = GF_FALSE;
-Bool force_co64 = GF_FALSE;
-Bool live_scene = GF_FALSE;
-Bool use_mfra = GF_FALSE;
-GF_MemTrackerType mem_track = GF_MemTrackerNone;
-
-Bool dump_iod = GF_FALSE;
-GF_DASHPSSHMode pssh_mode = 0;
-Bool samplegroups_in_traf = GF_FALSE;
-Bool mvex_after_traks = GF_FALSE;
-u32 sdtp_in_traf = 0;
-Bool daisy_chain_sidx = GF_FALSE;
-Bool use_ssix = GF_FALSE;
-Bool single_segment = GF_FALSE;
-Bool single_file = GF_FALSE;
-Bool segment_timeline = GF_FALSE;
-u32 segment_marker = GF_FALSE;
-GF_DashProfile dash_profile = GF_DASH_PROFILE_AUTO;
-const char *dash_profile_extension = NULL;
-const char *dash_cues = NULL;
-Bool strict_cues = GF_FALSE;
-Bool use_url_template = GF_FALSE;
-Bool seg_at_rap = GF_FALSE;
-Bool frag_at_rap = GF_FALSE;
-Bool adjust_split_end = GF_FALSE;
-Bool memory_frags = GF_TRUE;
-Bool keep_utc = GF_FALSE;
-u32 timescale = 0;
-Bool has_next_arg=GF_FALSE;
-const char *do_wget = NULL;
-GF_DashSegmenterInput *dash_inputs = NULL;
-u32 nb_dash_inputs = 0;
-char *seg_ext = NULL;
-char *init_seg_ext = NULL;
-const char *dash_title = NULL;
-const char *dash_source = NULL;
-const char *dash_more_info = NULL;
-
-FILE *logfile = NULL;
-static u32 run_for=0;
-static u32 dash_cumulated_time,dash_prev_time,dash_now_time;
-static Bool no_cache=GF_FALSE;
-static Bool no_loop=GF_FALSE;
-static GF_DASH_SplitMode dash_split_mode = GF_DASH_SPLIT_OUT;
-
-u32 mp4box_cleanup(u32 ret_code) {
-	if (mpd_base_urls) {
-		gf_free(mpd_base_urls);
-		mpd_base_urls = NULL;
+	fout = gf_fopen(inName, "a+b");
+	if (!fout) {
+		gf_fclose(fin);
+		return mp4box_cleanup(1);
 	}
-	if (sdp_lines) {
-		gf_free(sdp_lines);
-		sdp_lines = NULL;
+	gf_fseek(fin, 0, SEEK_END);
+	to_copy = gf_ftell(fin);
+	gf_fseek(fin, 0, SEEK_SET);
+	done = 0;
+	while (1) {
+		u32 nb_bytes = (u32) gf_fread(chunk, 4096, fin);
+		gf_fwrite(chunk, nb_bytes, fout);
+		done += nb_bytes;
+		fprintf(stderr, "Appending file %s - %02.2f done\r", raw_cat, 100.0*done/to_copy);
+		if (done >= to_copy) break;
+	}
+	gf_fclose(fin);
+	gf_fclose(fout);
+	return mp4box_cleanup(0);
+}
+
+static u32 do_write_udp()
+{
+	GF_Err e;
+	u32 res = 0;
+	GF_Socket *sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+	u16 port = 2345;
+	char *sep = strrchr(udp_dest, ':');
+	if (sep) {
+		sep[0] = 0;
+		port = atoi(sep+1);
 	}
-	if (metas) {
-		u32 i;
-		for (i=0; i<nb_meta_act; i++) {
-			if (metas[i].enc_type) gf_free(metas[i].enc_type);
-			if (metas[i].mime_type) gf_free(metas[i].mime_type);
-			if (metas[i].szName) gf_free(metas[i].szName);
-			if (metas[i].szPath) gf_free(metas[i].szPath);
+	e = gf_sk_bind( sock, NULL, port, udp_dest, port, 0);
+	if (sep) sep[0] = ':';
+	if (e) {
+		M4_LOG(GF_LOG_ERROR, ("Failed to bind socket to %s: %s\n", udp_dest, gf_error_to_string(e) ));
+		res = 1;
+	} else {
+		e = gf_sk_send(sock, (u8 *) inName, (u32)strlen(inName));
+		if (e) {
+			M4_LOG(GF_LOG_ERROR, ("Failed to send datagram: %s\n", gf_error_to_string(e) ));
+			res = 1;
 		}
-		gf_free(metas);
-		metas = NULL;
 	}
-	if (tracks) {
-		u32 i;
-		for (i = 0; i<nb_track_act; i++) {
-			if (tracks[i].out_name)
-				gf_free(tracks[i].out_name);
-			if (tracks[i].src_name)
-				gf_free(tracks[i].src_name);
-			if (tracks[i].kind_scheme)
-				gf_free(tracks[i].kind_scheme);
-			if (tracks[i].kind_value)
-				gf_free(tracks[i].kind_value);
+	gf_sk_del(sock);
+	return res;
+}
+
+#ifndef GPAC_DISABLE_MPD
+static u32 convert_mpd()
+{
+	GF_Err e;
+	Bool remote = GF_FALSE;
+	GF_MPD *mpd;
+	char *mpd_base_url = NULL;
+	if (!strnicmp(inName, "http://", 7) || !strnicmp(inName, "https://", 8)) {
+#if !defined(GPAC_DISABLE_CORE_TOOLS)
+		e = gf_dm_wget(inName, "tmp_main.m3u8", 0, 0, &mpd_base_url);
+		if (e != GF_OK) {
+			M4_LOG(GF_LOG_ERROR, ("Cannot retrieve M3U8 (%s): %s\n", inName, gf_error_to_string(e)));
+			if (mpd_base_url) gf_free(mpd_base_url);
+			return mp4box_cleanup(1);
+		}
+		remote = GF_TRUE;
+#else
+		gf_free(mpd_base_url);
+		M4_LOG(GF_LOG_ERROR, ("HTTP Downloader disabled in this build\n"));
+		return mp4box_cleanup(1);
+#endif
+
+		if (outName)
+			strcpy(outfile, outName);
+		else {
+			const char *sep = gf_file_basename(inName);
+			char *ext = gf_file_ext_start(sep);
+			if (ext) ext[0] = 0;
+			sprintf(outfile, "%s.mpd", sep);
+			if (ext) ext[0] = '.';
+		}
+	} else {
+		if (outName)
+			strcpy(outfile, outName);
+		else {
+			char *dst = strdup(inName);
+			char *ext = strstr(dst, ".m3u8");
+			if (ext) ext[0] = 0;
+			sprintf(outfile, "%s.mpd", dst);
+			gf_free(dst);
 		}
-		gf_free(tracks);
-		tracks = NULL;
 	}
-	if (tsel_acts) {
-		gf_free(tsel_acts);
-		tsel_acts = NULL;
+
+	mpd = gf_mpd_new();
+	if (!mpd) {
+		e = GF_OUT_OF_MEM;
+		M4_LOG(GF_LOG_ERROR, ("[DASH] Error: MPD creation problem %s\n", gf_error_to_string(e)));
+		mp4box_cleanup(1);
+	}
+	FILE *f = gf_fopen(remote ? "tmp_main.m3u8" : inName, "r");
+	u32 manif_type = 0;
+	if (f) {
+		char szDATA[1000];
+		s32 read;
+		szDATA[999]=0;
+		read = (s32) gf_fread(szDATA, 999, f);
+		if (read<0) read = 0;
+		szDATA[read]=0;
+		gf_fclose(f);
+		if (strstr(szDATA, "SmoothStreamingMedia"))
+			manif_type = 2;
+		else if (strstr(szDATA, "#EXTM3U"))
+			manif_type = 1;
+	}
+
+	if (manif_type==1) {
+		e = gf_m3u8_to_mpd(remote ? "tmp_main.m3u8" : inName, mpd_base_url ? mpd_base_url : inName, outfile, 0, "video/mp2t", GF_TRUE, use_url_template, segment_timeline, NULL, mpd, GF_TRUE, GF_TRUE);
+	} else if (manif_type==2) {
+		e = gf_mpd_smooth_to_mpd(remote ? "tmp_main.m3u8" : inName, mpd, mpd_base_url ? mpd_base_url : inName);
+	} else {
+		e = GF_NOT_SUPPORTED;
 	}
-	if (brand_add) {
-		gf_free(brand_add);
-		brand_add = NULL;
+	if (!e)
+		gf_mpd_write_file(mpd, outfile);
+
+	if (mpd)
+		gf_mpd_del(mpd);
+	if (mpd_base_url)
+		gf_free(mpd_base_url);
+
+	if (remote) {
+		gf_file_delete("tmp_main.m3u8");
 	}
-	if (brand_rem) {
-		gf_free(brand_rem);
-		brand_rem = NULL;
+	if (e != GF_OK) {
+		M4_LOG(GF_LOG_ERROR, ("Error converting %s (%s) to MPD (%s): %s\n", (manif_type==1) ? "HLS" : "Smooth", inName, outfile, gf_error_to_string(e)));
+		return mp4box_cleanup(1);
+	} else {
+		M4_LOG(GF_LOG_INFO, ("Done converting %s (%s) to MPD (%s)\n", (manif_type==1) ? "HLS" : "Smooth", inName, outfile));
+		return mp4box_cleanup(0);
 	}
-	if (dash_inputs) {
-		u32 i, j;
-		for (i = 0; i<nb_dash_inputs; i++) {
-			GF_DashSegmenterInput *di = &dash_inputs[i];
-			if (di->nb_baseURL) {
-				for (j = 0; j<di->nb_baseURL; j++) {
-					gf_free(di->baseURL[j]);
-				}
-				gf_free(di->baseURL);
-			}
-			if (di->rep_descs) {
-				for (j = 0; j<di->nb_rep_descs; j++) {
-					gf_free(di->rep_descs[j]);
-				}
-				gf_free(di->rep_descs);
-			}
-			if (di->as_descs) {
-				for (j = 0; j<di->nb_as_descs; j++) {
-					gf_free(di->as_descs[j]);
-				}
-				gf_free(di->as_descs);
-			}
-			if (di->as_c_descs) {
-				for (j = 0; j<di->nb_as_c_descs; j++) {
-					gf_free(di->as_c_descs[j]);
-				}
-				gf_free(di->as_c_descs);
-			}
-			if (di->p_descs) {
-				for (j = 0; j<di->nb_p_descs; j++) {
-					gf_free(di->p_descs[j]);
-				}
-				gf_free(di->p_descs);
-			}
-			if (di->representationID) gf_free(di->representationID);
-			if (di->periodID) gf_free(di->periodID);
-			if (di->xlink) gf_free(di->xlink);
-			if (di->seg_template) gf_free(di->seg_template);
-			if (di->hls_pl) gf_free(di->hls_pl);
-			if (di->source_opts) gf_free(di->source_opts);
-			if (di->filter_chain) gf_free(di->filter_chain);
+}
+#endif
 
-			if (di->roles) {
-				for (j = 0; j<di->nb_roles; j++) {
-					gf_free(di->roles[j]);
-				}
-				gf_free(di->roles);
-			}
-		}
-		gf_free(dash_inputs);
-		dash_inputs = NULL;
+static u32 do_import_sub()
+{
+	/* We import the subtitle file,
+	 i.e. we parse it and store the content as samples of a 3GPP Timed Text track in an ISO file,
+	 possibly for later export (e.g. when converting SRT to TTXT, ...) */
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+	GF_Err e;
+	GF_MediaImporter import;
+	/* Prepare the importer */
+	file = gf_isom_open("ttxt_convert", GF_ISOM_OPEN_WRITE, NULL);
+	if (timescale && file) gf_isom_set_timescale(file, timescale);
+
+	memset(&import, 0, sizeof(GF_MediaImporter));
+	import.dest = file;
+	import.in_name = inName;
+	/* Start the import */
+	e = gf_media_import(&import);
+	if (e) {
+		M4_LOG(GF_LOG_ERROR, ("Error importing %s: %s\n", inName, gf_error_to_string(e)));
+		gf_isom_delete(file);
+		gf_file_delete("ttxt_convert");
+		return mp4box_cleanup(1);
 	}
-	if (logfile) gf_fclose(logfile);
-	gf_sys_close();
-	return ret_code;
+	/* Prepare the export */
+	strcpy(outfile, inName);
+	if (strchr(outfile, '.')) {
+		while (outfile[strlen(outfile)-1] != '.') outfile[strlen(outfile)-1] = 0;
+		outfile[strlen(outfile)-1] = 0;
+	}
+#ifndef GPAC_DISABLE_ISOM_DUMP
+	/* Start the export of the track #1, in the appropriate dump type, indicating it's a conversion */
+	dump_isom_timed_text(file, gf_isom_get_track_id(file, 1),
+						 dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE,
+						 GF_TRUE,
+						 (import_subtitle==2) ? GF_TEXTDUMPTYPE_SVG : (dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT));
+#endif
+	/* Clean the importer */
+	gf_isom_delete(file);
+	gf_file_delete("ttxt_convert");
+	if (e) {
+		M4_LOG(GF_LOG_ERROR, ("Error converting %s: %s\n", inName, gf_error_to_string(e)));
+		return mp4box_cleanup(1);
+	}
+	return mp4box_cleanup(0);
+#else
+	M4_LOG(GF_LOG_ERROR, ("Feature not supported\n"));
+	return mp4box_cleanup(1);
+#endif
 }
 
-u32 mp4box_parse_args_continue(int argc, char **argv, u32 *current_index)
+#if !defined(GPAC_DISABLE_MEDIA_IMPORT) && !defined(GPAC_DISABLE_ISOM_WRITE)
+static u32 do_add_cat(int argc, char **argv)
 {
-	u32 i = *current_index;
-	/*parse our args*/
-	{
-		char *arg = argv[i];
-		if (!stricmp(arg, "-itags")) {
-			CHECK_NEXT_ARG
-			itunes_tags = argv[i + 1];
-			i++;
-			open_edit = GF_TRUE;
-		}
-#ifndef GPAC_DISABLE_ISOM_HINTING
-		else if (!stricmp(arg, "-hint")) {
-			open_edit = GF_TRUE;
-			HintIt = 1;
-		}
-		else if (!stricmp(arg, "-unhint")) {
-			open_edit = GF_TRUE;
-			remove_hint = 1;
-		}
-		else if (!stricmp(arg, "-copy")) HintCopy = 1;
-		else if (!stricmp(arg, "-no-offset")) hint_no_offset = GF_TRUE;
-		else if (!stricmp(arg, "-tight")) {
-			FullInter = 1;
-			open_edit = GF_TRUE;
-			needSave = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-ocr")) force_ocr = 1;
-		else if (!stricmp(arg, "-latm")) hint_flags |= GP_RTP_PCK_USE_LATM_AAC;
-		else if (!stricmp(arg, "-rap") || !stricmp(arg, "-refonly")) {
-			if ((i + 1 < (u32)argc) && (argv[i + 1][0] != '-')) {
-				if (sscanf(argv[i + 1], "%d", &trackID) == 1) {
-					tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-					memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-					tracks[nb_track_act].act_type = !stricmp(arg, "-rap") ? TRAC_ACTION_REM_NON_RAP : TRAC_ACTION_REM_NON_REFS;
-					tracks[nb_track_act].trackID = trackID;
-					nb_track_act++;
-					i++;
-					open_edit = GF_TRUE;
+	GF_Err e;
+	u32 i, ipass, nb_pass = 1;
+	char *mux_args=NULL;
+	char *mux_sid=NULL;
+	GF_FilterSession *fs = NULL;
+	if (nb_add) {
+
+		GF_ISOOpenMode open_mode = GF_ISOM_OPEN_EDIT;
+		if (force_new) {
+			open_mode = (do_flat || (force_new==2)) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
+		} else {
+			FILE *test = gf_fopen(inName, "rb");
+			if (!test) {
+				open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
+				if (!outName) outName = inName;
+			} else {
+				gf_fclose(test);
+				if (! gf_isom_probe_file(inName) ) {
+					open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
+					if (!outName) outName = inName;
 				}
 			}
-			hint_flags |= GP_RTP_PCK_SIGNAL_RAP;
-			seg_at_rap = 1;
-		}
-		else if (!stricmp(arg, "-frag-rap")) {
-			frag_at_rap = 1;
 		}
-		else if (!stricmp(arg, "-mfra")) {
-			use_mfra = GF_TRUE;
+		open_edit = do_flat ? GF_FALSE : GF_TRUE;
+		file = gf_isom_open(inName, open_mode, NULL);
+		if (!file) {
+			M4_LOG(GF_LOG_ERROR, ("Cannot open destination file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL)) ));
+			return mp4box_cleanup(1);
 		}
-		else if (!stricmp(arg, "-ts")) hint_flags |= GP_RTP_PCK_SIGNAL_TS;
-		else if (!stricmp(arg, "-size")) hint_flags |= GP_RTP_PCK_SIGNAL_SIZE;
-		else if (!stricmp(arg, "-idx")) hint_flags |= GP_RTP_PCK_SIGNAL_AU_IDX;
-		else if (!stricmp(arg, "-static")) hint_flags |= GP_RTP_PCK_USE_STATIC_ID;
-		else if (!stricmp(arg, "-multi")) {
-			hint_flags |= GP_RTP_PCK_USE_MULTI;
-			if ((i + 1 < (u32)argc) && (sscanf(argv[i + 1], "%u", &max_ptime) == 1)) {
-				char szPt[20];
-				sprintf(szPt, "%u", max_ptime);
-				if (!strcmp(szPt, argv[i + 1])) i++;
-				else max_ptime = 0;
+
+		if (freeze_box_order)
+			gf_isom_freeze_order(file);
+
+		if (do_flat) {
+			if (major_brand)
+				gf_isom_set_brand_info(file, major_brand, minor_version);
+			for (i=0; i<nb_alt_brand_add; i++) {
+				gf_isom_modify_alternate_brand(file, brand_add[i], GF_TRUE);
+				do_save = GF_TRUE;
+			}
+
+			if (!major_brand && !nb_alt_brand_add && has_add_image) {
+				gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_MIF1, GF_TRUE);
 			}
 		}
-#endif
-		else if (!stricmp(arg, "-mpeg4")) {
-#ifndef GPAC_DISABLE_ISOM_HINTING
-			hint_flags |= GP_RTP_PCK_FORCE_MPEG4;
-#endif
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-			import_flags |= GF_IMPORT_FORCE_MPEG4;
-#endif
-		}
-#ifndef GPAC_DISABLE_ISOM_HINTING
-		else if (!stricmp(arg, "-mtu")) {
-			CHECK_NEXT_ARG
-			MTUSize = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-cardur")) {
-			CHECK_NEXT_ARG
-			car_dur = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-rate")) {
-			CHECK_NEXT_ARG
-			rtp_rate = atoi(argv[i + 1]);
-			i++;
+	}
+
+	if (file && keep_utc && open_edit) {
+		gf_isom_keep_utc_times(file, 1);
+	}
+
+	if (do_flat && interleaving_time) {
+		char szSubArg[100];
+		gf_isom_set_storage_mode(file, GF_ISOM_STORE_FASTSTART);
+		do_flat = 2;
+		nb_pass = 2;
+		fs = gf_fs_new_defaults(0);
+		if (!fs) {
+			M4_LOG(GF_LOG_ERROR, ("Error creating filter session\n"));
+			gf_isom_delete(file);
+			return mp4box_cleanup(1);
 		}
-#ifndef GPAC_DISABLE_SENG
-		else if (!stricmp(arg, "-add-sdp") || !stricmp(arg, "-sdp_ex")) {
-			char *id;
-			CHECK_NEXT_ARG
-			sdp_lines = gf_realloc(sdp_lines, sizeof(SDPLine) * (nb_sdp_ex + 1));
-
-			id = strchr(argv[i + 1], ':');
-			if (id) {
-				id[0] = 0;
-				if (sscanf(argv[i + 1], "%u", &sdp_lines[0].trackID) == 1) {
-					id[0] = ':';
-					sdp_lines[nb_sdp_ex].line = id + 1;
+
+		//mux args
+		gf_dynstrcat(&mux_args, "mp4mx:importer:store=fstart", ":");
+
+		sprintf(szSubArg, "file=%p", file);
+		gf_dynstrcat(&mux_args, szSubArg, ":");
+		sprintf(szSubArg, "cdur=%g", interleaving_time);
+		gf_dynstrcat(&mux_args, szSubArg, ":");
+	}
+
+	for (ipass=0; ipass<nb_pass; ipass++) {
+		u32 tk_idx = 1;
+		for (i=0; i<(u32) argc; i++) {
+			char *margs=NULL;
+			char *msid = NULL;
+			if (!strcmp(argv[i], "-add")) {
+				char *src = argv[i+1];
+
+				while (src) {
+					char *loc_src = src;
+					char *sep = NULL;
+					while (1) {
+						char *opt_sep;
+						sep = strchr(loc_src, '+');
+						if (!sep) break;
+
+						sep[0] = 0;
+						if (strstr(src, "://"))
+							break;
+
+						opt_sep = gf_url_colon_suffix(src, '=');
+						if (opt_sep)
+							opt_sep[0] = 0;
+						if (gf_file_exists(src)) {
+							if (opt_sep)
+								opt_sep[0] = ':';
+							break;
+						}
+						if (opt_sep)
+							opt_sep[0] = ':';
+
+						sep[0] = '+';
+						loc_src = sep+1;
+					}
+					if (fs && (ipass==0)) {
+						e = import_file(file, src, import_flags, import_fps, agg_samples, fs, &margs, &msid, tk_idx);
+					} else {
+						e = import_file(file, src, import_flags, import_fps, agg_samples, fs, NULL, NULL, tk_idx);
+					}
+					tk_idx++;
+
+					if (margs) {
+						gf_dynstrcat(&mux_args, margs, ":");
+						gf_free(margs);
+					}
+					if (msid) {
+						gf_dynstrcat(&mux_sid, msid, ",");
+						gf_free(msid);
+					}
+
+					if (e) {
+						M4_LOG(GF_LOG_ERROR, ("Error importing %s: %s\n", argv[i+1], gf_error_to_string(e)));
+						gf_isom_delete(file);
+						if (fs)
+							gf_fs_del(fs);
+						return mp4box_cleanup(1);
+					}
+					if (sep) {
+						sep[0] = '+';
+						src = sep+1;
+					} else {
+						break;
+					}
 				}
-				else {
-					id[0] = ':';
-					sdp_lines[nb_sdp_ex].line = argv[i + 1];
-					sdp_lines[nb_sdp_ex].trackID = 0;
+				i++;
+			} else if (!strcmp(argv[i], "-cat") || !strcmp(argv[i], "-catx") || !strcmp(argv[i], "-catpl")) {
+				if (nb_pass == 2) {
+					M4_LOG(GF_LOG_ERROR, ("Cannot cat files when using -newfs mode\n"));
+					return mp4box_cleanup(1);
 				}
-			}
-			else {
-				sdp_lines[nb_sdp_ex].line = argv[i + 1];
-				sdp_lines[nb_sdp_ex].trackID = 0;
-			}
-			open_edit = GF_TRUE;
-			nb_sdp_ex++;
-			i++;
-		}
-#endif /*GPAC_DISABLE_SENG*/
-#endif /*GPAC_DISABLE_ISOM_HINTING*/
+				if (!file) {
+					u8 open_mode = GF_ISOM_OPEN_EDIT;
+					if (force_new) {
+						open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
+					} else {
+						FILE *test = gf_fopen(inName, "rb");
+						if (!test) {
+							open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
+							if (!outName) outName = inName;
+						}
+						else gf_fclose(test);
+					}
 
-		else if (!stricmp(arg, "-single")) {
-#ifndef GPAC_DISABLE_MEDIA_EXPORT
-			CHECK_NEXT_ARG
-			track_dump_type = GF_EXPORT_MP4;
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-			tracks[nb_track_act].act_type = TRAC_ACTION_RAW_EXTRACT;
-			tracks[nb_track_act].trackID = atoi(argv[i + 1]);
-			tracks[nb_track_act].dump_type = GF_EXPORT_MP4;
-			nb_track_act++;
-			i++;
-#endif
-		}
-		else if (!stricmp(arg, "-iod")) regular_iod = 1;
-		else if (!stricmp(arg, "-flat")) {
-			open_edit = GF_TRUE;
-			do_flat = 1;
-		}
-		else if (!stricmp(arg, "-keep-utc")) keep_utc = GF_TRUE;
-		else if (!stricmp(arg, "-new")) force_new = 1;
-		else if (!stricmp(arg, "-newfs")) {
-			force_new = 2;
-			interleaving_time = 0.5;
-			do_flat = 1;
-		}
-		else if (!stricmp(arg, "-timescale")) {
-			CHECK_NEXT_ARG
-			timescale = atoi(argv[i + 1]);
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-udta")) {
-			CHECK_NEXT_ARG
-			create_new_track_action(argv[i + 1], &tracks, &nb_track_act, 0);
-			tracks[nb_track_act - 1].act_type = TRAC_ACTION_SET_UDTA;
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-add") || !stricmp(arg, "-import") || !stricmp(arg, "-convert")) {
-			CHECK_NEXT_ARG
-			if (!stricmp(arg, "-import")) fprintf(stderr, "\tWARNING: \"-import\" is deprecated - use \"-add\"\n");
-			else if (!stricmp(arg, "-convert")) fprintf(stderr, "\tWARNING: \"-convert\" is deprecated - use \"-add\"\n");
-			nb_add++;
-			i++;
-		}
-		else if (!stricmp(arg, "-cat") || !stricmp(arg, "-catx") || !stricmp(arg, "-catpl")) {
-			CHECK_NEXT_ARG
-			nb_cat++;
-			i++;
-		}
-		else if (!stricmp(arg, "-time")) {
-			struct tm time;
-			CHECK_NEXT_ARG
-			memset(&time, 0, sizeof(struct tm));
-			sscanf(argv[i + 1], "%d/%d/%d-%d:%d:%d", &time.tm_mday, &time.tm_mon, &time.tm_year, &time.tm_hour, &time.tm_min, &time.tm_sec);
-			time.tm_isdst = 0;
-			time.tm_year -= 1900;
-			time.tm_mon -= 1;
-			open_edit = GF_TRUE;
-			movie_time = 2082758400;
-			movie_time += mktime(&time);
-			i++;
-		}
-		else if (!stricmp(arg, "-force-cat")) force_cat = 1;
-		else if (!stricmp(arg, "-align-cat")) align_cat = 1;
-		else if (!stricmp(arg, "-unalign-cat")) align_cat = 0;
-		else if (!stricmp(arg, "-raw-cat")) {
-			CHECK_NEXT_ARG
-			raw_cat = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-rem") || !stricmp(arg, "-disable") || !stricmp(arg, "-enable")) {
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-			if (!stricmp(arg, "-enable")) tracks[nb_track_act].act_type = TRAC_ACTION_ENABLE;
-			else if (!stricmp(arg, "-disable")) tracks[nb_track_act].act_type = TRAC_ACTION_DISABLE;
-			else tracks[nb_track_act].act_type = TRAC_ACTION_REM_TRACK;
-			tracks[nb_track_act].trackID = atoi(argv[i + 1]);
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
-		}
-		else if (!stricmp(arg, "-set-track-id") || !stricmp(arg, "-swap-track-id")) {
-			char *sep;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-			tracks[nb_track_act].act_type = !stricmp(arg, "-set-track-id") ? TRAC_ACTION_SET_ID : TRAC_ACTION_SWAP_ID;
-			sep = strchr(argv[i + 1], ':');
-			if (!sep) {
-				fprintf(stderr, "Bad format for -set-track-id - expecting \"id1:id2\" got \"%s\"\n", argv[i + 1]);
-				return 2;
-			}
-			*sep = 0;
-			tracks[nb_track_act].trackID = atoi(argv[i + 1]);
-			*sep = ':';
-			sep++;
-			tracks[nb_track_act].newTrackID = atoi(sep);
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
-		}
-		else if (!stricmp(arg, "-par")) {
-			char szTK[20], *ext;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-
-			tracks[nb_track_act].act_type = TRAC_ACTION_SET_PAR;
-			assert(strlen(argv[i + 1]) + 1 <= sizeof(szTK));
-			strncpy(szTK, argv[i + 1], sizeof(szTK));
-			ext = strchr(szTK, '=');
-			if (!ext) {
-				fprintf(stderr, "Bad format for track par - expecting tkID=none or tkID=PAR_NUM:PAR_DEN got %s\n", argv[i + 1]);
-				return 2;
-			}
-			if (!stricmp(ext + 1, "none")) {
-				tracks[nb_track_act].par_num = tracks[nb_track_act].par_den = 0;
-			}
-			else if (!stricmp(ext + 1, "auto")) {
-				tracks[nb_track_act].par_num = tracks[nb_track_act].par_den = -1;
-				tracks[nb_track_act].force_par = 1;
-			}
-			else if (!stricmp(ext + 1, "force")) {
-				tracks[nb_track_act].par_num = tracks[nb_track_act].par_den = 1;
-				tracks[nb_track_act].force_par = 1;
-			}
-			else {
-				if (ext[1]=='w') {
-					tracks[nb_track_act].rewrite_bs = 1;
-					ext++;
-				}
-				sscanf(ext + 1, "%d", &tracks[nb_track_act].par_num);
-				ext = strchr(ext + 1, ':');
-				if (!ext) {
-					fprintf(stderr, "Bad format for track par - expecting tkID=PAR_NUM:PAR_DEN got %s\n", argv[i + 1]);
-					return 2;
+					open_edit = GF_TRUE;
+					file = gf_isom_open(inName, open_mode, NULL);
+					if (!file) {
+						M4_LOG(GF_LOG_ERROR, ("Cannot open destination file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL)) ));
+						return mp4box_cleanup(1);
+					}
 				}
-				sscanf(ext + 1, "%d", &tracks[nb_track_act].par_den);
-			}
-			ext[0] = 0;
-			tracks[nb_track_act].trackID = atoi(szTK);
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
-		}
-		else if (!stricmp(arg, "-clap")) {
-			char szTK[200], *ext;
-			TrackAction *tka;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-
-			tracks[nb_track_act].act_type = TRAC_ACTION_SET_CLAP;
-			assert(strlen(argv[i + 1]) + 1 <= sizeof(szTK));
-			strncpy(szTK, argv[i + 1], sizeof(szTK));
-			ext = strchr(szTK, '=');
-			if (!ext) {
-				fprintf(stderr, "Bad format for track clap - expecting tkID=none or tkID=Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd got %s\n", argv[i + 1]);
-				return 2;
-			}
-			tka = &tracks[nb_track_act];
-			if (!stricmp(ext + 1, "none")) {
-				tka->clap_wnum= tka->clap_wden = tka->clap_hnum = tka->clap_hden = tka->clap_honum = tka->clap_hoden = tka->clap_vonum = tka->clap_voden = 0;
-			} else {
-				if (sscanf(ext + 1, "%d,%d,%d,%d,%d,%d,%d,%d", &tka->clap_wnum, &tka->clap_wden, &tka->clap_hnum, &tka->clap_hden, &tka->clap_honum, &tka->clap_hoden, &tka->clap_vonum, &tka->clap_voden) != 8) {
 
-					fprintf(stderr, "Bad format for track clap - expecting tkID=none or tkID=Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd got %s\n", argv[i + 1]);
-					return 2;
+				e = cat_isomedia_file(file, argv[i+1], import_flags, import_fps, agg_samples, force_cat, align_cat, !strcmp(argv[i], "-catx") ? GF_TRUE : GF_FALSE, !strcmp(argv[i], "-catpl") ? GF_TRUE : GF_FALSE);
+				if (e) {
+					M4_LOG(GF_LOG_ERROR, ("Error appending %s: %s\n", argv[i+1], gf_error_to_string(e)));
+					gf_isom_delete(file);
+					return mp4box_cleanup(1);
 				}
+				i++;
 			}
-			ext[0] = 0;
-			tracks[nb_track_act].trackID = atoi(szTK);
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
 		}
-		else if (!stricmp(arg, "-mx")) {
-			char szTK[200], *ext;
-			TrackAction *tka;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-
-			tracks[nb_track_act].act_type = TRAC_ACTION_SET_MX;
-			assert(strlen(argv[i + 1]) + 1 <= sizeof(szTK));
-			strncpy(szTK, argv[i + 1], sizeof(szTK));
-			ext = strchr(szTK, '=');
-			if (!ext) {
-				fprintf(stderr, "Bad format for track matrix - expecting ID=none or ID=M1:M2:M3:M4:M5:M6:M7:M8:M9 got %s\n", argv[i + 1]);
-				return 2;
+		if ((nb_pass == 2) && !ipass) {
+			if (mux_sid) {
+				gf_dynstrcat(&mux_args, "SID=", ":");
+				gf_dynstrcat(&mux_args, mux_sid, NULL);
+			}
+			GF_Filter *mux_filter = gf_fs_load_filter(fs, mux_args, NULL);
+			gf_free(mux_args);
+			if (!mux_filter) {
+				M4_LOG(GF_LOG_ERROR, ("Error loadin isobmff mux filter\n"));
+				gf_isom_delete(file);
+				gf_fs_del(fs);
+				return mp4box_cleanup(1);
 			}
-			tka = &tracks[nb_track_act];
-			if (!stricmp(ext + 1, "none")) {
-				memset(tka->mx, 0, sizeof(s32)*9);
-			} else {
-				s32 res;
-				if (strstr(ext+1, "0x")) {
-					res = sscanf(ext + 1, "0x%d:0x%d:0x%d:0x%d:0x%d:0x%d:0x%d:0x%d:0x%d", &tka->mx[0], &tka->mx[1], &tka->mx[2], &tka->mx[3], &tka->mx[4], &tka->mx[5], &tka->mx[6], &tka->mx[7], &tka->mx[8]);
-				} else {
-					res = sscanf(ext + 1, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &tka->mx[0], &tka->mx[1], &tka->mx[2], &tka->mx[3], &tka->mx[4], &tka->mx[5], &tka->mx[6], &tka->mx[7], &tka->mx[8]);
-				}
-				if (res != 9) {
-					fprintf(stderr, "Bad format for track matrix - expecting ID=none or ID=M1:M2:M3:M4:M5:M6:M7:M8:M9 got %s\n", argv[i + 1]);
-					return 2;
-				}
+
+			e = gf_fs_run(fs);
+			if (e==GF_EOS) e = GF_OK;
+
+			if (!e) e = gf_fs_get_last_connect_error(fs);
+			if (!e) e = gf_fs_get_last_process_error(fs);
+
+			if (e) {
+				M4_LOG(GF_LOG_ERROR, ("Error importing sources: %s\n", gf_error_to_string(e)));
+				gf_isom_delete(file);
+				gf_fs_del(fs);
+				return mp4box_cleanup(1);
 			}
-			ext[0] = 0;
-			tracks[nb_track_act].trackID = atoi(szTK);
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
 		}
-		else if (!stricmp(arg, "-hdr")) {
-			CHECK_NEXT_ARG
-			high_dynamc_range_filename = argv[i + 1];
-			i++;
+	}
+	if (fs) {
+		gf_fs_print_non_connected(fs);
+		if (fs_dump_flags & 1) gf_fs_print_stats(fs);
+		if (fs_dump_flags & 2) gf_fs_print_connections(fs);
+		gf_fs_del(fs);
+	}
+
+	/*unless explicitly asked, remove all systems tracks*/
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (!keep_sys_tracks) remove_systems_tracks(file);
+#endif
+	do_save = GF_TRUE;
+
+	return 0;
+}
+#endif /*!GPAC_DISABLE_MEDIA_IMPORT && !GPAC_DISABLE_ISOM_WRITE*/
+
+
+#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_SCENE_ENCODER) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
+static GF_Err do_scene_encode()
+{
+	GF_Err e;
+	FILE *logs = NULL;
+	if (do_scene_log) {
+		char alogfile[GF_MAX_PATH];
+		strcpy(alogfile, inName);
+		if (strchr(alogfile, '.')) {
+			while (alogfile[strlen(alogfile)-1] != '.') alogfile[strlen(alogfile)-1] = 0;
+			alogfile[strlen(alogfile)-1] = 0;
 		}
-		else if (!stricmp(arg, "-bo")) {
-			freeze_box_order = GF_TRUE;
+		strcat(alogfile, "_enc.logs");
+		logs = gf_fopen(alogfile, "wt");
+	}
+	strcpy(outfile, outName ? outName : inName);
+	if (strchr(outfile, '.')) {
+		while (outfile[strlen(outfile)-1] != '.') outfile[strlen(outfile)-1] = 0;
+		outfile[strlen(outfile)-1] = 0;
+	}
+	strcat(outfile, ".mp4");
+	file = gf_isom_open(outfile, GF_ISOM_WRITE_EDIT, NULL);
+	smenc_opts.mediaSource = mediaSource ? mediaSource : outfile;
+	e = EncodeFile(inName, file, &smenc_opts, logs);
+	if (logs) gf_fclose(logs);
+	if (e) return e;
+	do_save = GF_TRUE;
+	if (do_saf) {
+		do_save = GF_FALSE;
+		open_edit = GF_FALSE;
+	}
+	return GF_OK;
+}
+#endif //!defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_SCENE_ENCODER) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
+
+
+static GF_Err do_dash()
+{
+	GF_Err e;
+	u32 i;
+	Bool del_file = GF_FALSE;
+	char szMPD[GF_MAX_PATH], *sep;
+	char szStateFile[GF_MAX_PATH];
+	Bool dyn_state_file = GF_FALSE;
+	u32 do_abort = 0;
+	GF_DASHSegmenter *dasher=NULL;
+
+	if (crypt) {
+		M4_LOG(GF_LOG_ERROR, ("MP4Box cannot use -crypt and -dash in the same pass. Please encrypt your content first, or specify encryption filters on dash sources.\n"));
+		return GF_BAD_PARAM;
+	}
+
+	strcpy(outfile, outName ? outName : gf_url_get_resource_name(inName) );
+	sep = strrchr(outfile, '.');
+	if (sep) sep[0] = 0;
+	if (!outName) strcat(outfile, "_dash");
+	strcpy(szMPD, outfile);
+	if (outName && sep) {
+		sep[0] = '.';
+		strcat(szMPD, sep);
+	} else {
+		strcat(szMPD, ".mpd");
+	}
+
+	if ((dash_subduration>0) && (dash_duration > dash_subduration)) {
+		M4_LOG(GF_LOG_WARNING, ("Warning: -subdur parameter (%g s) should be greater than segment duration (%g s), using segment duration instead\n", dash_subduration, dash_duration));
+		dash_subduration = dash_duration;
+	}
+
+	if (dash_mode && dash_live)
+		M4_LOG(GF_LOG_INFO, ("Live DASH-ing - press 'q' to quit, 's' to save context and quit\n"));
+
+	if (!dash_ctx_file && dash_live) {
+		u32 r1;
+		u64 add = (u64) (intptr_t) &dasher;
+		add ^= gf_net_get_utc();
+		r1 = (u32) add ^ (u32) (add/0xFFFFFFFF);
+		r1 ^= gf_rand();
+		sprintf(szStateFile, "%s/dasher_%X.xml", gf_get_default_cache_directory(), r1 );
+		dash_ctx_file = szStateFile;
+		dyn_state_file = GF_TRUE;
+	} else if (dash_ctx_file) {
+		if (force_new)
+			gf_file_delete(dash_ctx_file);
+	}
+
+	if (dash_profile==GF_DASH_PROFILE_AUTO)
+		dash_profile = dash_mode ? GF_DASH_PROFILE_LIVE : GF_DASH_PROFILE_FULL;
+
+	if (!dash_mode) {
+		time_shift_depth = 0;
+		mpd_update_time = 0;
+	} else if ((dash_profile>=GF_DASH_PROFILE_MAIN) && !use_url_template && !mpd_update_time) {
+		/*use a default MPD update of dash_duration sec*/
+		mpd_update_time = (Double) (dash_subduration ? dash_subduration : dash_duration);
+		M4_LOG(GF_LOG_INFO, ("Using default MPD refresh of %g seconds\n", mpd_update_time));
+	}
+
+	if (file && do_save) {
+		gf_isom_close(file);
+		file = NULL;
+		del_file = GF_TRUE;
+	}
+
+	/*setup dash*/
+	dasher = gf_dasher_new(szMPD, dash_profile, NULL, dash_scale, dash_ctx_file);
+	if (!dasher) {
+		return mp4box_cleanup(1);
+	}
+	e = gf_dasher_set_info(dasher, dash_title, cprt, dash_more_info, dash_source, NULL);
+	if (e) {
+		M4_LOG(GF_LOG_ERROR, ("DASH Error: %s\n", gf_error_to_string(e)));
+		gf_dasher_del(dasher);
+		return e;
+	}
+
+	gf_dasher_set_start_date(dasher, dash_start_date);
+	gf_dasher_set_location(dasher, dash_source);
+	for (i=0; i < nb_mpd_base_urls; i++) {
+		e = gf_dasher_add_base_url(dasher, mpd_base_urls[i]);
+		if (e) {
+			M4_LOG(GF_LOG_ERROR, ("DASH Error: %s\n", gf_error_to_string(e)));
+			gf_dasher_del(dasher);
+			return e;
 		}
-		else if (!stricmp(arg, "-patch")) {
-			CHECK_NEXT_ARG
-			box_patch_filename = argv[i + 1];
-			char *sep = strchr(box_patch_filename, '=');
-			if (sep) {
-				sep[0] = 0;
-				box_patch_trackID = atoi(box_patch_filename);
-				sep[0] = '=';
-				box_patch_filename = sep+1;
-			}
- 			open_edit = GF_TRUE;
-			i++;
+	}
+
+	if (segment_timeline && !use_url_template) {
+		M4_LOG(GF_LOG_WARNING, ("DASH Warning: using -segment-timeline with no -url-template. Forcing URL template.\n"));
+		use_url_template = GF_TRUE;
+	}
+
+	e = gf_dasher_enable_url_template(dasher, (Bool) use_url_template, seg_name, seg_ext, init_seg_ext);
+	if (!e) e = gf_dasher_enable_segment_timeline(dasher, segment_timeline);
+	if (!e) e = gf_dasher_enable_single_segment(dasher, single_segment);
+	if (!e) e = gf_dasher_enable_single_file(dasher, single_file);
+	if (!e) e = gf_dasher_set_switch_mode(dasher, bitstream_switching_mode);
+	if (!e) e = gf_dasher_set_durations(dasher, dash_duration, interleaving_time, dash_subduration);
+	if (!e) e = gf_dasher_enable_rap_splitting(dasher, seg_at_rap, frag_at_rap);
+	if (!e) e = gf_dasher_set_segment_marker(dasher, segment_marker);
+	if (!e) e = gf_dasher_enable_sidx(dasher, (subsegs_per_sidx>=0) ? 1 : 0, (u32) subsegs_per_sidx, daisy_chain_sidx, use_ssix);
+	if (!e) e = gf_dasher_set_dynamic_mode(dasher, dash_mode, mpd_update_time, time_shift_depth, mpd_live_duration);
+	if (!e) e = gf_dasher_set_min_buffer(dasher, min_buffer);
+	if (!e) e = gf_dasher_set_ast_offset(dasher, ast_offset_ms);
+	if (!e) e = gf_dasher_enable_memory_fragmenting(dasher, memory_frags);
+	if (!e) e = gf_dasher_set_initial_isobmf(dasher, initial_moof_sn, initial_tfdt);
+	if (!e) e = gf_dasher_configure_isobmf_default(dasher, no_fragments_defaults, pssh_mode, samplegroups_in_traf, single_traf_per_moof, tfdt_per_traf, mvex_after_traks, sdtp_in_traf);
+	if (!e) e = gf_dasher_enable_utc_ref(dasher, insert_utc);
+	if (!e) e = gf_dasher_enable_real_time(dasher, frag_real_time);
+	if (!e) e = gf_dasher_set_content_protection_location_mode(dasher, cp_location_mode);
+	if (!e) e = gf_dasher_set_profile_extension(dasher, dash_profile_extension);
+	if (!e) e = gf_dasher_enable_cached_inputs(dasher, no_cache);
+	if (!e) e = gf_dasher_enable_loop_inputs(dasher, ! no_loop);
+	if (!e) e = gf_dasher_set_split_mode(dasher, dash_split_mode);
+	if (!e) e = gf_dasher_set_last_segment_merge(dasher, merge_last_seg);
+	if (!e) e = gf_dasher_set_hls_clock(dasher, hls_clock);
+	if (!e && dash_cues) e = gf_dasher_set_cues(dasher, dash_cues, strict_cues);
+	if (!e) e = gf_dasher_print_session_info(dasher, fs_dump_flags);
+	if (!e) e = gf_dasher_keep_source_utc(dasher, keep_utc);
+
+	for (i=0; i < nb_dash_inputs; i++) {
+		if (!e) e = gf_dasher_add_input(dasher, &dash_inputs[i]);
+	}
+	if (e) {
+		M4_LOG(GF_LOG_ERROR, ("DASH Setup Error: %s\n", gf_error_to_string(e)));
+		gf_dasher_del(dasher);
+		return e;
+	}
+
+	dash_cumulated_time=0;
+
+	while (1) {
+		if (run_for && (dash_cumulated_time >= run_for)) {
+			M4_LOG(GF_LOG_INFO, ("Done running, computing static MPD\n"));
+			do_abort = 3;
 		}
-		else if (!stricmp(arg, "-lang")) {
-			char szTK[20], *ext;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-
-			tracks[nb_track_act].act_type = TRAC_ACTION_SET_LANGUAGE;
-			tracks[nb_track_act].trackID = 0;
-			strncpy(szTK, argv[i + 1], sizeof(szTK)-1);
-			szTK[sizeof(szTK)-1] = 0;
-			ext = strchr(szTK, '=');
-			if (!strnicmp(argv[i + 1], "all=", 4)) {
-				strncpy(tracks[nb_track_act].lang, argv[i + 1] + 4, 10);
-			}
-			else if (!ext) {
-				strncpy(tracks[nb_track_act].lang, argv[i + 1], 10);
-			}
-			else {
-				strncpy(tracks[nb_track_act].lang, ext + 1, 10);
-				ext[0] = 0;
-				tracks[nb_track_act].trackID = atoi(szTK);
-				ext[0] = '=';
-			}
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
+
+		dash_prev_time=gf_sys_clock();
+		if (do_abort>=2) {
+			e = gf_dasher_set_dynamic_mode(dasher, GF_DASH_DYNAMIC_LAST, 0, time_shift_depth, mpd_live_duration);
 		}
-		else if (!stricmp(arg, "-kind") || !stricmp(arg, "-kind-rem")) {
-			char szTK[200], *ext;
-			char *scheme_start = NULL;
-			Bool has_track_id = GF_FALSE;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
-			if (!stricmp(arg, "-kind")) {
-				tracks[nb_track_act].act_type = TRAC_ACTION_SET_KIND;
-			}
-			else {
-				tracks[nb_track_act].act_type = TRAC_ACTION_REM_KIND;
+		if (!e) e = gf_dasher_process(dasher);
+		if (!dash_live && (e==GF_EOS) ) {
+			M4_LOG(GF_LOG_INFO, ("Nothing to dash, too early ...\n"));
+			e = GF_OK;
+		}
+
+		if (do_abort)
+			break;
+
+		//this happens when reading file while writing them (local playback of the live session ...)
+		if (dash_live && (e==GF_IO_ERR) ) {
+			M4_LOG(GF_LOG_WARNING, ("Error dashing file (%s) but continuing ...\n", gf_error_to_string(e) ));
+			e = GF_OK;
+		}
+
+		if (e) break;
+
+		if (dash_live) {
+			u64 ms_in_session=0;
+			u32 slept = gf_sys_clock();
+			u32 sleep_for = gf_dasher_next_update_time(dasher, &ms_in_session);
+			M4_LOG(GF_LOG_INFO, ("Next generation scheduled in %u ms (DASH time "LLU" ms)\r", sleep_for, ms_in_session));
+			if (run_for && (ms_in_session>=run_for)) {
+				dash_cumulated_time = 1+run_for;
+				continue;
 			}
-			tracks[nb_track_act].trackID = 0;
-			if (!strnicmp(argv[i + 1], "all=", 4)) {
-				scheme_start = argv[i + 1] + 4;
-				has_track_id = GF_TRUE;
-			}
-			if (!scheme_start) {
-				if (strlen(argv[i + 1]) > 200) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_ALL, ("Warning: track kind parameter is too long!"));
-				}
-				strncpy(szTK, argv[i + 1], 200);
-				ext = strchr(szTK, '=');
-				if (ext && !has_track_id) {
-					ext[0] = 0;
-					has_track_id = (sscanf(szTK, "%d", &tracks[nb_track_act].trackID) == 1 ? GF_TRUE : GF_FALSE);
-					if (has_track_id) {
-						scheme_start = ext + 1;
+
+			while (1) {
+				if (gf_prompt_has_input()) {
+					char c = (char) gf_prompt_get_char();
+					if (c=='X') {
+						do_abort = 1;
+						break;
+					}
+					if (c=='q') {
+						do_abort = 2;
+						break;
 					}
-					else {
-						scheme_start = szTK;
+					if (c=='s') {
+						do_abort = 3;
+						break;
 					}
-					ext[0] = '=';
 				}
-				else {
-					scheme_start = szTK;
+
+				if (dash_mode == GF_DASH_DYNAMIC_DEBUG) {
+					break;
+				}
+				if (!sleep_for) break;
+
+				gf_sleep(sleep_for/10);
+				sleep_for = gf_dasher_next_update_time(dasher, NULL);
+				if (sleep_for<=1) {
+					dash_now_time=gf_sys_clock();
+					dash_cumulated_time+=(dash_now_time-dash_prev_time);
+					M4_LOG(GF_LOG_INFO, ("Slept for %d ms before generation, dash cumulated time %d\n", dash_now_time - slept, dash_cumulated_time));
+					break;
 				}
 			}
-			ext = strchr(scheme_start, '=');
-			if (!ext) {
-				tracks[nb_track_act].kind_scheme = gf_strdup(scheme_start);
-			}
-			else {
-				ext[0] = 0;
-				tracks[nb_track_act].kind_scheme = gf_strdup(scheme_start);
-				ext[0] = '=';
-				tracks[nb_track_act].kind_value = gf_strdup(ext + 1);
-			}
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
+		} else {
+			break;
 		}
-		else if (!stricmp(arg, "-delay")) {
-			char szTK[20], *ext;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-
-			strncpy(szTK, argv[i + 1], sizeof(szTK)-1);
-			szTK[sizeof(szTK)-1] = 0;
-			ext = strchr(szTK, '=');
-			if (!ext) {
-				fprintf(stderr, "Bad format for track delay - expecting tkID=DLAY got %s\n", argv[i + 1]);
-				return 2;
-			}
-			tracks[nb_track_act].act_type = TRAC_ACTION_SET_DELAY;
-			tracks[nb_track_act].delay_ms = atoi(ext + 1);
-			ext[0] = 0;
-			tracks[nb_track_act].trackID = atoi(szTK);
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
+	}
+
+	gf_dasher_del(dasher);
+
+	if (!run_for && dash_ctx_file && (do_abort==3) && (dyn_state_file) && !gf_sys_is_test_mode() ) {
+		char szName[1024];
+		M4_LOG(GF_LOG_INFO, ("Enter file name to save dash context:\n"));
+		if (scanf("%1023s", szName) == 1) {
+			gf_file_move(dash_ctx_file, szName);
 		}
-		else if (!stricmp(arg, "-ref")) {
-			char *szTK, *ext;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
+	}
+	if (e) M4_LOG(GF_LOG_ERROR, ("Error DASHing file: %s\n", gf_error_to_string(e)));
+	if (file) gf_isom_delete(file);
+	if (del_file)
+		gf_file_delete(inName);
 
-			szTK = argv[i + 1];
-			ext = strchr(szTK, ':');
-			if (!ext) {
-				fprintf(stderr, "Bad format for track reference - expecting tkID:XXXX:refID got %s\n", argv[i + 1]);
-				return 2;
-			}
-			tracks[nb_track_act].act_type = TRAC_ACTION_REFERENCE;
-			ext[0] = 0;
-			tracks[nb_track_act].trackID = atoi(szTK);
-			ext[0] = ':';
-			szTK = ext + 1;
-			ext = strchr(szTK, ':');
-			if (!ext) {
-				fprintf(stderr, "Bad format for track reference - expecting tkID:XXXX:refID got %s\n", argv[i + 1]);
-				return 2;
-			}
-			ext[0] = 0;
-			strncpy(tracks[nb_track_act].lang, szTK, 10);
-			ext[0] = ':';
-			tracks[nb_track_act].delay_ms = (s32)atoi(ext + 1);
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
+	return e;
+}
+
+
+static GF_Err do_export_tracks_non_isobmf()
+{
+	u32 i;
+
+	GF_MediaExporter mdump;
+	char szFile[GF_MAX_PATH+24];
+	for (i=0; i<nb_track_act; i++) {
+		GF_Err e;
+		TrackAction *tka = &tracks[i];
+		if (tka->act_type != TRACK_ACTION_RAW_EXTRACT) continue;
+		memset(&mdump, 0, sizeof(mdump));
+		mdump.in_name = inName;
+		mdump.flags = tka->dump_type;
+		mdump.trackID = tka->trackID;
+		mdump.track_type = tka->dump_track_type;
+		mdump.sample_num = tka->sample_num;
+
+		if (dump_std) {
+			mdump.out_name = "std";
 		}
-		else if (!stricmp(arg, "-name")) {
-			char szTK[GF_MAX_PATH], *ext;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-
-			strncpy(szTK, argv[i + 1], sizeof(szTK)-1);
-			szTK[sizeof(szTK)-1] = 0;
-			ext = strchr(szTK, '=');
-			if (!ext) {
-				fprintf(stderr, "Bad format for track name - expecting tkID=name got %s\n", argv[i + 1]);
-				return 2;
-			}
-			tracks[nb_track_act].act_type = TRAC_ACTION_SET_HANDLER_NAME;
-			tracks[nb_track_act].hdl_name = strchr(argv[i + 1], '=') + 1;
-			ext[0] = 0;
-			tracks[nb_track_act].trackID = atoi(szTK);
-			ext[0] = '=';
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
+		else if (outName) {
+			mdump.out_name = outName;
+			mdump.flags |= GF_EXPORT_MERGE;
+		} else if (nb_track_act>1) {
+			sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
+			mdump.out_name = szFile;
+		} else {
+			mdump.out_name = outfile;
 		}
-#if !defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
-		else if (!stricmp(arg, "-dref")) import_flags |= GF_IMPORT_USE_DATAREF;
-		else if (!stricmp(arg, "-no-drop") || !stricmp(arg, "-nodrop")) import_flags |= GF_IMPORT_NO_FRAME_DROP;
-		else if (!stricmp(arg, "-packed")) import_flags |= GF_IMPORT_FORCE_PACKED;
-		else if (!stricmp(arg, "-sbr")) import_flags |= GF_IMPORT_SBR_IMPLICIT;
-		else if (!stricmp(arg, "-sbrx")) import_flags |= GF_IMPORT_SBR_EXPLICIT;
-		else if (!stricmp(arg, "-ps")) import_flags |= GF_IMPORT_PS_IMPLICIT;
-		else if (!stricmp(arg, "-psx")) import_flags |= GF_IMPORT_PS_EXPLICIT;
-		else if (!stricmp(arg, "-ovsbr")) import_flags |= GF_IMPORT_OVSBR;
-		else if (!stricmp(arg, "-fps")) {
-			CHECK_NEXT_ARG
-			if (!strcmp(argv[i + 1], "auto")) { fprintf(stderr, "Warning, fps=auto option is deprecated\n"); }
-			else if (strchr(argv[i + 1], '-')) {
-				u32 ticks, dts_inc;
-				sscanf(argv[i + 1], "%u-%u", &ticks, &dts_inc);
-				if (!dts_inc) dts_inc = 1;
-				import_fps.num = ticks;
-				import_fps.den = dts_inc;
+		mdump.print_stats_graph = fs_dump_flags;
+		e = gf_media_export(&mdump);
+		if (e) return e;
+	}
+	return GF_OK;
+}
+
+
+static GF_Err do_dump_iod()
+{
+	GF_Err e = GF_OK;
+	GF_InitialObjectDescriptor *iod = (GF_InitialObjectDescriptor *)gf_isom_get_root_od(file);
+	if (!iod) {
+		M4_LOG(GF_LOG_WARNING, ("File %s has no IOD\n", inName));
+	} else {
+		char szName[GF_MAX_PATH+10];
+		FILE *iodf;
+		sprintf(szName, "%s.iod", outfile);
+		iodf = gf_fopen(szName, "wb");
+		if (!iodf) {
+			M4_LOG(GF_LOG_ERROR, ("Cannot open destination %s\n", szName));
+			e = GF_IO_ERR;
+		} else {
+			u8 *desc;
+			u32 size;
+			GF_BitStream *bs = gf_bs_from_file(iodf, GF_BITSTREAM_WRITE);
+			if (gf_odf_desc_write((GF_Descriptor *)iod, &desc, &size)==GF_OK) {
+				gf_fwrite(desc, size, iodf);
+				gf_free(desc);
 			} else {
-				import_fps.num = (s32) (1000 * atof(argv[i + 1]));
-				import_fps.den = 1000;
+				M4_LOG(GF_LOG_ERROR, ("Error writing IOD %s\n", szName));
+				e = GF_IO_ERR;
 			}
-			i++;
-		}
-		else if (!stricmp(arg, "-agg")) {
-			CHECK_NEXT_ARG agg_samples = atoi(argv[i + 1]);
-			i++;
-		}
-#endif /*!defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_MEDIA_IMPORT*/
-		else if (!stricmp(arg, "-keep-sys") || !stricmp(arg, "-keepsys")) keep_sys_tracks = 1;
-		else if (!stricmp(arg, "-ms")) {
-			CHECK_NEXT_ARG mediaSource = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-mp4")) {
-			encode = GF_TRUE;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-saf")) {
-			do_saf = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-sclog")) {
-			do_scene_log = GF_TRUE;
-		}
-#ifndef GPAC_DISABLE_MPD
-		else if (!stricmp(arg, "-mpd")) {
-			do_mpd = GF_TRUE;
-			CHECK_NEXT_ARG
-			inName = argv[i + 1];
-			i++;
+			gf_bs_del(bs);
+			gf_fclose(iodf);
 		}
-#endif
+		gf_odf_desc_del((GF_Descriptor*)iod);
+	}
+	return e;
+}
 
-#ifndef GPAC_DISABLE_SCENE_ENCODER
-		else if (!stricmp(arg, "-def")) smenc_opts.flags |= GF_SM_ENCODE_USE_NAMES;
-		else if (!stricmp(arg, "-sync")) {
-			CHECK_NEXT_ARG
-			smenc_opts.flags |= GF_SM_ENCODE_RAP_INBAND;
-			smenc_opts.rap_freq = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-shadow")) {
-			CHECK_NEXT_ARG
-			smenc_opts.flags &= ~GF_SM_ENCODE_RAP_INBAND;
-			smenc_opts.flags |= GF_SM_ENCODE_RAP_SHADOW;
-			smenc_opts.rap_freq = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-carousel")) {
-			CHECK_NEXT_ARG
-			smenc_opts.flags &= ~(GF_SM_ENCODE_RAP_INBAND | GF_SM_ENCODE_RAP_SHADOW);
-			smenc_opts.rap_freq = atoi(argv[i + 1]);
-			i++;
-		}
-		/*LASeR options*/
-		else if (!stricmp(arg, "-resolution")) {
-			CHECK_NEXT_ARG
-			smenc_opts.resolution = atoi(argv[i + 1]);
-			i++;
+static GF_Err do_export_tracks()
+{
+	GF_Err e;
+	u32 i;
+	char szFile[GF_MAX_PATH+24];
+	GF_MediaExporter mdump;
+	for (i=0; i<nb_track_act; i++) {
+		u32 j;
+		TrackAction *tka = &tracks[i];
+		if (tka->act_type != TRACK_ACTION_RAW_EXTRACT) continue;
+		memset(&mdump, 0, sizeof(mdump));
+		mdump.file = file;
+		mdump.flags = tka->dump_type;
+		mdump.trackID = tka->trackID;
+		mdump.sample_num = tka->sample_num;
+		if (tka->out_name) {
+			mdump.out_name = tka->out_name;
+		} else if (outName) {
+			mdump.out_name = outName;
+			mdump.flags |= GF_EXPORT_MERGE;
+			/*don't infer extension on user-given filename*/
+			mdump.flags |= GF_EXPORT_NO_FILE_EXT;
+		} else if (mdump.trackID) {
+			sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
+			mdump.out_name = szFile;
+		} else {
+			sprintf(szFile, "%s_export", outfile);
+			mdump.out_name = szFile;
 		}
-#ifndef GPAC_DISABLE_SCENE_STATS
-		else if (!stricmp(arg, "-auto-quant")) {
-			CHECK_NEXT_ARG
-			smenc_opts.resolution = atoi(argv[i + 1]);
-			smenc_opts.auto_quant = 1;
-			i++;
+		if (tka->trackID==(u32) -1) {
+			for (j=0; j<gf_isom_get_track_count(file); j++) {
+				mdump.trackID = gf_isom_get_track_id(file, j+1);
+				sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
+				mdump.out_name = szFile;
+				mdump.print_stats_graph = fs_dump_flags;
+				e = gf_media_export(&mdump);
+				if (e) return e;
+			}
+		} else {
+			mdump.print_stats_graph = fs_dump_flags;
+			e = gf_media_export(&mdump);
+			if (e) return e;
 		}
+	}
+	return GF_OK;
+}
+
+static GF_Err do_meta_act()
+{
+	u32 i;
+	for (i=0; i<nb_meta_act; i++) {
+		GF_Err e = GF_OK;
+		u32 tk = 0;
+#ifndef GPAC_DISABLE_ISOM_WRITE
+		Bool self_ref;
 #endif
-		else if (!stricmp(arg, "-coord-bits")) {
-			CHECK_NEXT_ARG
-			smenc_opts.coord_bits = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-scale-bits")) {
-			CHECK_NEXT_ARG
-			smenc_opts.scale_bits = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-global-quant")) {
-			CHECK_NEXT_ARG
-			smenc_opts.resolution = atoi(argv[i + 1]);
-			smenc_opts.auto_quant = 2;
-			i++;
-		}
-		/*chunk encoding*/
-		else if (!stricmp(arg, "-ctx-out") || !stricmp(arg, "-outctx")) {
-			CHECK_NEXT_ARG
-			output_ctx = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-ctx-in") || !stricmp(arg, "-inctx")) {
-			CHECK_NEXT_ARG
-			chunk_mode = GF_TRUE;
-			input_ctx = argv[i + 1];
-			i++;
-		}
-#endif /*GPAC_DISABLE_SCENE_ENCODER*/
+		MetaAction *meta = &metas[i];
+
+		if (meta->trackID) tk = gf_isom_get_track_by_id(file, meta->trackID);
 
+		switch (meta->act_type) {
 #ifndef GPAC_DISABLE_ISOM_WRITE
-		else if (!strcmp(arg, "-crypt")) {
-			CHECK_NEXT_ARG
-			crypt = 1;
-			drm_file = argv[i + 1];
-			open_edit = GF_TRUE;
-			i += 1;
-		}
-		else if (!strcmp(arg, "-decrypt")) {
-			CHECK_NEXT_ARG
-			crypt = 2;
-			if (get_file_type_by_ext(argv[i + 1]) != 1) {
-				drm_file = argv[i + 1];
-				i += 1;
-			}
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-set-kms")) {
-			char szTK[20], *ext;
-			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-
-			strncpy(szTK, argv[i + 1], 19);
-			ext = strchr(szTK, '=');
-			tracks[nb_track_act].act_type = TRAC_ACTION_SET_KMS_URI;
-			tracks[nb_track_act].trackID = 0;
-			if (!strnicmp(argv[i + 1], "all=", 4)) {
-				tracks[nb_track_act].kms = argv[i + 1] + 4;
-			}
-			else if (!ext) {
-				tracks[nb_track_act].kms = argv[i + 1];
-			}
-			else {
-				tracks[nb_track_act].kms = ext + 1;
-				ext[0] = 0;
-				tracks[nb_track_act].trackID = atoi(szTK);
-				ext[0] = '=';
+		case META_ACTION_SET_TYPE:
+			/*note: we don't handle file brand modification, this is an author stuff and cannot be guessed from meta type*/
+			e = gf_isom_set_meta_type(file, meta->root_meta, tk, meta->meta_4cc);
+			gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_ISO2, GF_TRUE);
+			do_save = GF_TRUE;
+			break;
+		case META_ACTION_ADD_ITEM:
+
+			if (meta->replace) {
+				if (!gf_isom_get_meta_item_by_id(file, meta->root_meta, tk, meta->item_id)) {
+					M4_LOG(GF_LOG_WARNING, ("No item with ID %d, ignoring replace\n", meta->item_id));
+					meta->item_id = 0;
+				} else {
+					e = gf_isom_remove_meta_item(file, meta->root_meta, tk, meta->item_id, GF_TRUE, meta->keep_props);
+					if (e) break;
+				}
 			}
-			open_edit = GF_TRUE;
-			nb_track_act++;
-			i++;
-		}
-		else if (!stricmp(arg, "-split")) {
-			CHECK_NEXT_ARG
-			split_duration = atof(argv[i + 1]);
-			if (split_duration < 0) split_duration = 0;
-			i++;
-			split_size = 0;
-		}
-		else if (!stricmp(arg, "-split-rap") || !stricmp(arg, "-splitr")) {
-			CHECK_NEXT_ARG
-			split_duration = -1;
-			split_size = -1;
-		}
-		else if (!stricmp(arg, "-split-size") || !stricmp(arg, "-splits")) {
-			CHECK_NEXT_ARG
-			split_size = (u32)atoi(argv[i + 1]);
-			i++;
-			split_duration = 0;
-		}
-		else if (!stricmp(arg, "-split-chunk") || !stricmp(arg, "-splitx") || !stricmp(arg, "-splitz")) {
-			CHECK_NEXT_ARG
-			if (!strstr(argv[i + 1], ":")) {
-				fprintf(stderr, "Chunk extraction usage: \"-splitx start:end\" expressed in seconds\n");
-				return 2;
+
+			self_ref = !stricmp(meta->szPath, "NULL") || !stricmp(meta->szPath, "this") || !stricmp(meta->szPath, "self");
+			e = gf_isom_add_meta_item(file, meta->root_meta, tk, self_ref, self_ref ? NULL : meta->szPath,
+			 meta->szName,
+			 meta->item_id,
+									 meta->item_type,
+			 meta->mime_type,
+			 meta->enc_type,
+			 meta->use_dref ? meta->szPath : NULL, NULL,
+			 meta->image_props);
+			if (meta->item_refs && gf_list_count(meta->item_refs)) {
+				u32 ref_i;
+				for (ref_i = 0; ref_i < gf_list_count(meta->item_refs); ref_i++) {
+					MetaRef	*ref_entry = gf_list_get(meta->item_refs, ref_i);
+					e = gf_isom_meta_add_item_ref(file, meta->root_meta, tk, meta->item_id, ref_entry->ref_item_id, ref_entry->ref_type, NULL);
+				}
 			}
-			if (strstr(argv[i + 1], "end")) {
-				if (strstr(argv[i + 1], "end-")) {
-					Double dur_end=0;
-					sscanf(argv[i + 1], "%lf:end-%lf", &split_start, &dur_end);
-					split_duration = -2 - dur_end;
+			do_save = GF_TRUE;
+			break;
+		case META_ACTION_ADD_IMAGE_ITEM:
+		{
+			u32 old_tk_count = gf_isom_get_track_count(file);
+			u32 src_tk_id = 1;
+			GF_Fraction _frac = {0,0};
+			GF_ISOFile *fsrc = file;
+			self_ref = GF_FALSE;
+
+			tk = 0;
+			if (meta->image_props && meta->image_props->auto_grid) {
+				e = GF_OK;
+				self_ref = GF_TRUE;
+			} else if (!meta->szPath || (meta->image_props && meta->image_props->sample_num && meta->image_props->use_reference)) {
+				e = GF_OK;
+				self_ref = GF_TRUE;
+				src_tk_id = meta->trackID;
+			} else if (meta->szPath) {
+				if (meta->image_props && gf_isom_probe_file(meta->szPath) && !meta->image_props->tile_mode) {
+					meta->image_props->src_file = gf_isom_open(meta->szPath, GF_ISOM_OPEN_READ, NULL);
+					e = gf_isom_last_error(meta->image_props->src_file);
+					fsrc = meta->image_props->src_file;
+					if (meta->image_props->item_ref_id)
+						src_tk_id = 0;
 				} else {
-					sscanf(argv[i + 1], "%lf:end", &split_start);
-					split_duration = -2;
+					gf_isom_disable_brand_rewrite(file, GF_TRUE);
+					e = import_file(file, meta->szPath, 0, _frac, 0, NULL, NULL, NULL, 0);
+					gf_isom_disable_brand_rewrite(file, GF_FALSE);
 				}
+			} else {
+				M4_LOG(GF_LOG_ERROR, ("Missing file name to import\n"));
+				e = GF_BAD_PARAM;
 			}
-			else {
-				if (strchr(argv[i + 1], '-')) {
-					split_range_str = argv[i + 1];
+			if (e == GF_OK) {
+				u32 meta_type = gf_isom_get_meta_type(file, meta->root_meta, tk);
+				if (!meta_type) {
+					e = gf_isom_set_meta_type(file, meta->root_meta, tk, GF_META_ITEM_TYPE_PICT);
 				} else {
-					sscanf(argv[i + 1], "%lf:%lf", &split_start, &split_duration);
-					split_duration -= split_start;
+					if (meta_type != GF_META_ITEM_TYPE_PICT) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Warning: file already has a root 'meta' box of type %s\n", gf_4cc_to_str(meta_type)));
+						e = GF_BAD_PARAM;
+					}
+				}
+				if (e == GF_OK) {
+					if (!meta->item_id) {
+						e = gf_isom_meta_get_next_item_id(file, meta->root_meta, tk, &meta->item_id);
+					}
+					if (e == GF_OK) {
+						if (!src_tk_id && (!meta->image_props || !meta->image_props->item_ref_id) ) {
+							u32 j;
+							for (j=0; j<gf_isom_get_track_count(fsrc); j++) {
+								if (gf_isom_is_video_handler_type (gf_isom_get_media_type(fsrc, j+1))) {
+									src_tk_id = gf_isom_get_track_id(fsrc, j+1);
+									break;
+								}
+							}
+
+							if (!src_tk_id) {
+								M4_LOG(GF_LOG_ERROR, ("No video track in file, cannot add image from track\n"));
+								e = GF_BAD_PARAM;
+							}
+						}
+
+						if (e == GF_OK && meta->replace) {
+							if (!gf_isom_get_meta_item_by_id(file, meta->root_meta, tk, meta->item_id)) {
+								M4_LOG(GF_LOG_WARNING, ("No item with ID %d, ignoring replace\n", meta->item_id));
+								meta->item_id = 0;
+							} else {
+								e = gf_isom_remove_meta_item(file, meta->root_meta, tk, meta->item_id, GF_TRUE, meta->keep_props);
+							}
+						}
+						if (e==GF_OK)
+							e = gf_isom_iff_create_image_item_from_track(file, meta->root_meta, tk, src_tk_id, meta->szName, meta->item_id, meta->image_props, NULL);
+
+						if (e == GF_OK && meta->primary) {
+							e = gf_isom_set_meta_primary_item(file, meta->root_meta, tk, meta->item_id);
+						}
+						if (e == GF_OK && meta->item_refs && gf_list_count(meta->item_refs)) {
+							u32 ref_i;
+							for (ref_i = 0; ref_i < gf_list_count(meta->item_refs); ref_i++) {
+								MetaRef	*ref_entry = gf_list_get(meta->item_refs, ref_i);
+								e = gf_isom_meta_add_item_ref(file, meta->root_meta, tk, meta->item_id, ref_entry->ref_item_id, ref_entry->ref_type, NULL);
+							}
+						}
+						if (e == GF_OK && meta->group_type) {
+							e = gf_isom_meta_add_item_group(file, meta->root_meta, tk, meta->item_id, meta->group_id, meta->group_type);
+						}
+					}
 				}
 			}
-			split_size = 0;
-			if (!stricmp(arg, "-splitz")) adjust_split_end = 1;
-			i++;
-		}
-		/*meta*/
-		else if (!stricmp(arg, "-set-meta")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_TYPE, argv[i + 1]);
-			nb_meta_act++;
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-add-item")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_ADD_ITEM, argv[i + 1]);
-			nb_meta_act++;
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-add-image")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_ADD_IMAGE_ITEM, argv[i + 1]);
-			nb_meta_act++;
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-rem-item")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_REM_ITEM, argv[i + 1]);
-			nb_meta_act++;
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-set-primary")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_PRIMARY_ITEM, argv[i + 1]);
-			nb_meta_act++;
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-set-xml")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_XML, argv[i + 1]);
-			nb_meta_act++;
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-rem-xml")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
-			if (parse_meta_args(&metas[nb_meta_act], META_ACTION_REM_XML, argv[i + 1])) i++;
-			nb_meta_act++;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-dump-xml")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_DUMP_XML, argv[i + 1]);
-			nb_meta_act++;
-			i++;
-		}
-		else if (!stricmp(arg, "-dump-item")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_DUMP_ITEM, argv[i + 1]);
-			nb_meta_act++;
-			i++;
-		}
-		else if (!stricmp(arg, "-group-add") || !stricmp(arg, "-group-rem-track") || !stricmp(arg, "-group-rem") ) {
-			TSELActionType act_type;
-			if (!stricmp(arg, "-group-rem")) {
-				act_type = TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP;
-			}
-			else if (!stricmp(arg, "-group-rem-track")) {
-				act_type = TSEL_ACTION_REMOVE_TSEL;
+			if (meta->image_props && meta->image_props->src_file) {
+				gf_isom_delete(meta->image_props->src_file);
+				meta->image_props->src_file = NULL;
+			} else if (!self_ref) {
+				gf_isom_remove_track(file, old_tk_count+1);
+				if (do_flat) {
+					M4_LOG(GF_LOG_ERROR, ("Warning: -flat storage cannot be used when using -add-image on external file\n"));
+					e = GF_NOT_SUPPORTED;
+				}
 			}
-			else {
-				act_type = TSEL_ACTION_SET_PARAM;
+			do_save = GF_TRUE;
+		}
+			break;
+		case META_ACTION_ADD_IMAGE_DERIVED:
+		{
+			u32 meta_type = gf_isom_get_meta_type(file, meta->root_meta, tk);
+			e = GF_OK;
+			if (!meta_type) {
+				e = gf_isom_set_meta_type(file, meta->root_meta, tk, GF_META_ITEM_TYPE_PICT);
+			} else {
+				if (meta_type != GF_META_ITEM_TYPE_PICT) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Warning: file already has a root 'meta' box of type %s\n", gf_4cc_to_str(meta_type)));
+					e = GF_BAD_PARAM;
+				}
 			}
-			if (parse_tsel_args(&tsel_acts, argv[i + 1], &nb_tsel_acts, act_type) == 0) {
-				fprintf(stderr, "Invalid group syntax - check usage\n");
-				return 2;
+			if (e) break;
+			if (!meta->item_id) {
+				e = gf_isom_meta_get_next_item_id(file, meta->root_meta, tk, &meta->item_id);
 			}
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-group-clean")) {
-			clean_groups = 1;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-group-single")) {
-			single_group = 1;
-		}
-		else if (!stricmp(arg, "-package")) {
-			CHECK_NEXT_ARG
-			pack_file = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-zmov")) {
-			compress_moov = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-mgt")) {
-			CHECK_NEXT_ARG
-			pack_file = argv[i + 1];
-			pack_wgt = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-brand")) {
-			char *b = argv[i + 1];
-			CHECK_NEXT_ARG
-			major_brand = GF_4CC(b[0], b[1], b[2], b[3]);
-			open_edit = GF_TRUE;
-			if (b[4] == ':') {
-				if (!strncmp(b+5, "0x", 2))
-					sscanf(b+5, "0x%x", &minor_version);
-				else
-					minor_version = atoi(b + 5);
+			if (e == GF_OK && meta->item_type) {
+				if (meta->item_type == GF_4CC('g','r','i','d')) {
+					e = gf_isom_iff_create_image_grid_item(file, meta->root_meta, tk,
+							meta->szName && strlen(meta->szName) ? meta->szName : NULL,
+							meta->item_id,
+							meta->image_props);
+				} else if (meta->item_type == GF_4CC('i','o','v','l')) {
+					e = gf_isom_iff_create_image_overlay_item(file, meta->root_meta, tk,
+							meta->szName && strlen(meta->szName) ? meta->szName : NULL,
+							meta->item_id,
+							meta->image_props);
+				} else if (meta->item_type == GF_4CC('i','d','e','n')) {
+					e = gf_isom_iff_create_image_identity_item(file, meta->root_meta, tk,
+							meta->szName && strlen(meta->szName) ? meta->szName : NULL,
+							meta->item_id,
+							meta->image_props);
+				} else {
+					e = GF_NOT_SUPPORTED;
+				}
+				if (e) break;
+				if (meta->primary) {
+					e = gf_isom_set_meta_primary_item(file, meta->root_meta, tk, meta->item_id);
+					if (e) break;
+				}
+				if (meta->item_refs && gf_list_count(meta->item_refs)) {
+					u32 ref_i;
+					for (ref_i = 0; ref_i < gf_list_count(meta->item_refs); ref_i++) {
+						MetaRef	*ref_entry = gf_list_get(meta->item_refs, ref_i);
+						e = gf_isom_meta_add_item_ref(file, meta->root_meta, tk, meta->item_id, ref_entry->ref_item_id, ref_entry->ref_type, NULL);
+						if (e) break;
+					}
+				}
 			}
-			i++;
-		}
-		else if (!stricmp(arg, "-ab")) {
-			char *b = argv[i + 1];
-			CHECK_NEXT_ARG
-			brand_add = (u32*)gf_realloc(brand_add, sizeof(u32) * (nb_alt_brand_add + 1));
-			brand_add[nb_alt_brand_add] = GF_4CC(b[0], b[1], b[2], b[3]);
-			nb_alt_brand_add++;
-			open_edit = GF_TRUE;
-			i++;
-		}
-		else if (!stricmp(arg, "-rb")) {
-			char *b = argv[i + 1];
-			CHECK_NEXT_ARG
-			brand_rem = (u32*)gf_realloc(brand_rem, sizeof(u32) * (nb_alt_brand_rem + 1));
-			brand_rem[nb_alt_brand_rem] = GF_4CC(b[0], b[1], b[2], b[3]);
-			nb_alt_brand_rem++;
-			open_edit = GF_TRUE;
-			i++;
-		}
-#endif
-		else if (!stricmp(arg, "-languages")) {
-			PrintLanguages();
-			return 1;
+			do_save = GF_TRUE;
 		}
-		else if (!stricmp(arg, "-h")) {
-			gf_sys_set_args(argc, (const char**) argv);
-
-			if (i + 1 == (u32)argc) PrintUsage();
-			else if (!strcmp(argv[i + 1], "general")) PrintGeneralUsage();
-			else if (!strcmp(argv[i + 1], "extract")) PrintExtractUsage();
-			else if (!strcmp(argv[i + 1], "dash")) PrintDASHUsage();
-			else if (!strcmp(argv[i + 1], "dump")) PrintDumpUsage();
-			else if (!strcmp(argv[i + 1], "import")) PrintImportUsage();
-			else if (!strcmp(argv[i + 1], "format")) fprintf(stderr, "deprectaed, see [filters documentation](Filters)\n");
-			else if (!strcmp(argv[i + 1], "hint")) PrintHintUsage();
-			else if (!strcmp(argv[i + 1], "encode")) PrintEncodeUsage();
-			else if (!strcmp(argv[i + 1], "crypt")) PrintEncryptUsage();
-			else if (!strcmp(argv[i + 1], "meta")) PrintMetaUsage();
-			else if (!strcmp(argv[i + 1], "swf")) PrintSWFUsage();
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-			else if (!strcmp(argv[i + 1], "rtp")) fprintf(stderr, "RTP streaming deprecated in MP4Box, use gpac application\n");
-			else if (!strcmp(argv[i + 1], "live")) PrintLiveUsage();
-#endif
-			else if (!strcmp(argv[i + 1], "core")) PrintCoreUsage();
-			else if (!strcmp(argv[i + 1], "all")) {
-				PrintGeneralUsage();
-				PrintExtractUsage();
-				PrintDASHUsage();
-				PrintDumpUsage();
-				PrintImportUsage();
-				PrintHintUsage();
-				PrintEncodeUsage();
-				PrintEncryptUsage();
-				PrintMetaUsage();
-				PrintSWFUsage();
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-				PrintLiveUsage();
-#endif
-				PrintCoreUsage();
-			} else if (!strcmp(argv[i + 1], "opts")) {
-				PrintHelp("@", GF_FALSE, GF_FALSE);
+			break;
+		case META_ACTION_REM_ITEM:
+			e = gf_isom_remove_meta_item(file, meta->root_meta, tk, meta->item_id, GF_FALSE, NULL);
+			do_save = GF_TRUE;
+			break;
+		case META_ACTION_SET_PRIMARY_ITEM:
+			e = gf_isom_set_meta_primary_item(file, meta->root_meta, tk, meta->item_id);
+			do_save = GF_TRUE;
+			break;
+		case META_ACTION_SET_XML:
+		case META_ACTION_SET_BINARY_XML:
+			e = gf_isom_set_meta_xml(file, meta->root_meta, tk, meta->szPath, NULL, 0, (meta->act_type==META_ACTION_SET_BINARY_XML) ? 1 : 0);
+			do_save = GF_TRUE;
+			break;
+		case META_ACTION_REM_XML:
+			if (gf_isom_get_meta_item_count(file, meta->root_meta, tk)) {
+				e = gf_isom_remove_meta_xml(file, meta->root_meta, tk);
+				do_save = GF_TRUE;
 			} else {
-				PrintHelp(argv[i+1], GF_FALSE, GF_FALSE);
+				M4_LOG(GF_LOG_WARNING, ("No meta box in input file\n"));
+				e = GF_OK;
 			}
-			return 1;
-		}
-		else if (!stricmp(arg, "-hx")) {
-			if (i + 1 == (u32)argc) PrintUsage();
-			else PrintHelp(argv[i+1], GF_TRUE, GF_FALSE);
-			return 1;
-		}
-		else if (!strcmp(arg, "-genmd")) {
-			help_flags = GF_PRINTARG_MD | GF_PRINTARG_IS_APP;
-			helpout = gf_fopen("mp4box-gen-opts.md", "w");
-
-	 		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » General");
-	 		fprintf(helpout, "\n");
-			fprintf(helpout, "# Syntax\n");
-			gf_sys_format_help(helpout, help_flags, "MP4Box [option] input [option] [other_dash_inputs]\n"
-				" \n"
-			);
-			PrintGeneralUsage();
-			PrintEncryptUsage();
-			fprintf(helpout, "# Help Options\n");
-			while (m4b_usage_args[i].name) {
-				GF_GPACArg *g_arg = &m4b_usage_args[i];
-				i++;
-				gf_sys_print_arg(helpout, help_flags, g_arg, "mp4box-general");
+			break;
+		case META_ACTION_DUMP_ITEM:
+			if (gf_isom_get_meta_item_count(file, meta->root_meta, tk)) {
+				e = gf_isom_extract_meta_item(file, meta->root_meta, tk, meta->item_id, meta->szPath && strlen(meta->szPath) ? meta->szPath : NULL);
+			} else {
+				M4_LOG(GF_LOG_WARNING, ("No meta box in input file\n"));
+				e = GF_OK;
 			}
+			break;
+#endif // GPAC_DISABLE_ISOM_WRITE
 
-			gf_fclose(helpout);
-
-			helpout = gf_fopen("mp4box-import-opts.md", "w");
-	 		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Media Import");
-	 		fprintf(helpout, "\n");
-			PrintImportUsage();
-			gf_fclose(helpout);
-
-			helpout = gf_fopen("mp4box-dash-opts.md", "w");
-	 		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Media DASH");
-	 		fprintf(helpout, "\n");
-			PrintDASHUsage();
-			gf_fclose(helpout);
-
-			helpout = gf_fopen("mp4box-dump-opts.md", "w");
-	 		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Media Dump and Export");
-	 		fprintf(helpout, "\n");
-			PrintExtractUsage();
-			PrintDumpUsage();
-			gf_fclose(helpout);
-
-			helpout = gf_fopen("mp4box-meta-opts.md", "w");
-	 		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Meta and HEIF/IFF");
-	 		fprintf(helpout, "\n");
-			PrintMetaUsage();
-			gf_fclose(helpout);
-
-
-			helpout = gf_fopen("mp4box-scene-opts.md", "w");
-	 		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Scene Description");
-	 		fprintf(helpout, "\n");
-			PrintEncodeUsage();
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-			PrintLiveUsage();
-#endif
-			PrintSWFUsage();
-			gf_fclose(helpout);
-
-			helpout = gf_fopen("mp4box-other-opts.md", "w");
-	 		fprintf(helpout, "[**HOME**](Home) » [**MP4Box**](MP4Box) » Other Features");
-	 		fprintf(helpout, "\n");
-			PrintHintUsage();
-			gf_fclose(helpout);
-
-			gf_sys_close();
-			return 1;
-		} else if (!strcmp(arg, "-genman")) {
-			help_flags = GF_PRINTARG_MAN;
-			helpout = gf_fopen("mp4box.1", "w");
-
-
-	 		fprintf(helpout, ".TH MP4Box 1 2019 MP4Box GPAC\n");
-			fprintf(helpout, ".\n.SH NAME\n.LP\nMP4Box \\- GPAC command-line media packager\n.SH SYNOPSIS\n.LP\n.B MP4Box\n.RI [options] \\ [file] \\ [options]\n.br\n.\n");
-
-			PrintGeneralUsage();
-			PrintExtractUsage();
-			PrintDASHUsage();
-			PrintDumpUsage();
-			PrintImportUsage();
-			PrintHintUsage();
-			PrintEncodeUsage();
-			PrintEncryptUsage();
-			PrintMetaUsage();
-			PrintSWFUsage();
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-			PrintLiveUsage();
-#endif
-
-			fprintf(helpout, ".SH EXAMPLES\n.TP\nBasic and advanced examples are available at https://wiki.gpac.io/MP4Box-Introduction\n");
-			fprintf(helpout, ".SH MORE\n.LP\nAuthors: GPAC developers, see git repo history (-log)\n"
-			".br\nFor bug reports, feature requests, more information and source code, visit http://github.com/gpac/gpac\n"
-			".br\nbuild: %s\n"
-			".br\nCopyright: %s\n.br\n"
-			".SH SEE ALSO\n"
-			".LP\ngpac(1), MP4Client(1)\n", gf_gpac_version(), gf_gpac_copyright());
-
-			gf_fclose(helpout);
-			gf_sys_close();
-			return 1;
-		}
-
-		else if (!stricmp(arg, "-v")) verbose++;
-		else if (!stricmp(arg, "-tag-list")) {
-			fprintf(stderr, "Supported iTunes tag modifiers:\n");
-			for (i = 0; i < nb_itunes_tags; i++) {
-				fprintf(stderr, "\t%s\t%s\n", itags[i].name, itags[i].comment);
+		case META_ACTION_DUMP_XML:
+			if (gf_isom_has_meta_xml(file, meta->root_meta, tk)) {
+				e = gf_isom_extract_meta_xml(file, meta->root_meta, tk, meta->szPath, NULL);
+			} else {
+				M4_LOG(GF_LOG_WARNING, ("No meta box in input file\n"));
+				e = GF_OK;
 			}
-			return 1;
+			break;
+		default:
+			break;
 		}
-		else if (!live_scene) {
-			u32 res = gf_sys_is_gpac_arg(arg);
-			if (res==0) {
-				PrintHelp(arg, GF_FALSE, GF_TRUE);
-				return 2;
-			} else if (res==2) {
-				i++;
+		if (meta->item_refs) {
+			while (gf_list_count(meta->item_refs)) {
+				gf_free(gf_list_pop_back(meta->item_refs));
 			}
+			gf_list_del(meta->item_refs);
+			meta->item_refs = NULL;
 		}
+		// meta->image_props is freed in mp4box_cleanup
+		if (e) return e;
 	}
-	*current_index = i;
-	return 0;
+	return GF_OK;
 }
 
-Bool mp4box_parse_args(int argc, char **argv)
+static GF_Err do_tsel_act()
 {
 	u32 i;
-	/*parse our args*/
-	for (i = 1; i < (u32)argc; i++) {
-		char *arg = argv[i];
-		/*input file(s)*/
-		if ((arg[0] != '-') || !stricmp(arg, "--")) {
-			char *arg_val = arg;
-			if (!stricmp(arg, "--")) {
-				CHECK_NEXT_ARG
-				arg_val = argv[i + 1];
-				i++;
-			}
-			if (argc < 3) {
-				fprintf(stderr, "Error - only one input file found as argument, please check usage\n");
-				return 2;
+	GF_Err e;
+	for (i=0; i<nb_tsel_acts; i++) {
+		switch (tsel_acts[i].act_type) {
+		case TSEL_ACTION_SET_PARAM:
+			e = gf_isom_set_track_switch_parameter(file,
+			 gf_isom_get_track_by_id(file, tsel_acts[i].trackID),
+			 tsel_acts[i].refTrackID ? gf_isom_get_track_by_id(file, tsel_acts[i].refTrackID) : 0,
+			 tsel_acts[i].is_switchGroup ? 1 : 0,
+			 &tsel_acts[i].switchGroupID,
+			 tsel_acts[i].criteria, tsel_acts[i].nb_criteria);
+			if (e == GF_BAD_PARAM) {
+				u32 alternateGroupID, nb_groups;
+				gf_isom_get_track_switch_group_count(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), &alternateGroupID, &nb_groups);
+				if (alternateGroupID) {
+					M4_LOG(GF_LOG_ERROR, ("Error - for adding more tracks to group, using: -group-add -refTrack=ID1:[criteria:]trackID=ID2\n"));
+				} else {
+					M4_LOG(GF_LOG_ERROR, ("Error - for creating a new grouping information, using -group-add -trackID=ID1:[criteria:]trackID=ID2\n"));
+				}
 			}
-			else if (inName) {
-				if (dash_duration) {
-					if (!nb_dash_inputs) {
-						dash_inputs = set_dash_input(dash_inputs, inName, &nb_dash_inputs);
+			if (e) return e;
+			do_save = GF_TRUE;
+			break;
+		case TSEL_ACTION_REMOVE_TSEL:
+			e = gf_isom_reset_track_switch_parameter(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), 0);
+			if (e) return e;
+			do_save = GF_TRUE;
+			break;
+		case TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP:
+			e = gf_isom_reset_track_switch_parameter(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), 1);
+			if (e) return e;
+			do_save = GF_TRUE;
+			break;
+		default:
+			break;
+		}
+	}
+	return GF_OK;
+}
+
+static void do_ipod_conv()
+{
+	u32 i, ipod_major_brand = 0;
+	M4_LOG(GF_LOG_INFO, ("Setting up iTunes/iPod file\n"));
+
+	for (i=0; i<gf_isom_get_track_count(file); i++) {
+		u32 mType = gf_isom_get_media_type(file, i+1);
+		switch (mType) {
+		case GF_ISOM_MEDIA_VISUAL:
+		case GF_ISOM_MEDIA_AUXV:
+		case GF_ISOM_MEDIA_PICT:
+			ipod_major_brand = GF_ISOM_BRAND_M4V;
+			gf_isom_set_ipod_compatible(file, i+1);
+			break;
+		case GF_ISOM_MEDIA_AUDIO:
+			if (!ipod_major_brand) ipod_major_brand = GF_ISOM_BRAND_M4A;
+			else gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_M4A, GF_TRUE);
+			break;
+		case GF_ISOM_MEDIA_TEXT:
+			/*this is a text track track*/
+			if (gf_isom_get_media_subtype(file, i+1, 1) == GF_ISOM_SUBTYPE_TX3G) {
+				Bool is_chap = 0;
+				u32 j;
+				for (j=0; j<gf_isom_get_track_count(file); j++) {
+					s32 count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_CHAP);
+					if (count>0) {
+						u32 tk, k;
+						for (k=0; k<(u32) count; k++) {
+							gf_isom_get_reference(file, j+1, GF_ISOM_REF_CHAP, k+1, &tk);
+							if (tk==i+1) {
+								is_chap = 1;
+								break;
+							}
+						}
+						if (is_chap) break;
 					}
-					dash_inputs = set_dash_input(dash_inputs, arg_val, &nb_dash_inputs);
-				}
-				else {
-					fprintf(stderr, "Error - 2 input names specified, please check usage\n");
-					return 2;
+					if (is_chap) break;
 				}
+				/*this is a subtitle track*/
+				if (!is_chap)
+					gf_isom_set_media_type(file, i+1, GF_ISOM_MEDIA_SUBT);
 			}
-			else {
-				inName = arg_val;
-			}
-		}
-		else if (!stricmp(arg, "-?")) {
-			PrintUsage();
-			return 1;
-		}
-		else if (!stricmp(arg, "-version")) {
-			PrintVersion();
-			return 1;
-		}
-		else if (!stricmp(arg, "-sdp")) print_sdp = 1;
- else if (!strcmp(argv[i], "-mem-track")) continue;
- else if (!strcmp(argv[i], "-mem-track-stack")) continue;
- else if (!strcmp(argv[i], "-p")) {
- 	i++;
- 	continue;
-		}
- else if (!strncmp(argv[i], "-p=", 3)) continue;
-		else if (!stricmp(arg, "-logs") || !strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
-			i++;
+			break;
 		}
-		else if (!stricmp(arg, "-tracks")) get_nb_tracks = 1;
-		else if (!stricmp(arg, "-info") || !stricmp(arg, "-infon")) {
-			print_info = 1;
-			if ((i + 1<(u32)argc) && (sscanf(argv[i + 1], "%u", &info_track_id) == 1)) {
-				char szTk[20];
-				sprintf(szTk, "%u", info_track_id);
-				if (!strcmp(szTk, argv[i + 1])) i++;
-				else info_track_id = 0;
+	}
+	gf_isom_set_brand_info(file, ipod_major_brand, 1);
+	gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_MP42, GF_TRUE);
+	do_save = GF_TRUE;
+}
 
-				if (!stricmp(arg, "-infon")) print_info = 2;
+static GF_Err do_track_act()
+{
+	u32 j;
+	for (j=0; j<nb_track_act; j++) {
+		u32 i;
+		GF_Err e = GF_OK;
+		TrackAction *tka = &tracks[j];
+		u32 track = tka->trackID ? gf_isom_get_track_by_id(file, tka->trackID) : 0;
+
+		timescale = gf_isom_get_timescale(file);
+		switch (tka->act_type) {
+		case TRACK_ACTION_REM_TRACK:
+			e = gf_isom_remove_track(file, track);
+			if (e) {
+				M4_LOG(GF_LOG_ERROR, ("Error Removing track ID %d: %s\n", tka->trackID, gf_error_to_string(e)));
+			} else {
+				M4_LOG(GF_LOG_INFO, ("Removing track ID %d\n", tka->trackID));
 			}
-			else {
-				info_track_id = 0;
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_LANGUAGE:
+			for (i=0; i<gf_isom_get_track_count(file); i++) {
+				if (track && (track != i+1)) continue;
+				e = gf_isom_set_media_language(file, i+1, tka->lang);
+				if (e) return e;
+				do_save = GF_TRUE;
 			}
-		}
-		else if (!stricmp(arg, "-grab-ts")) {
-			fprintf(stderr, "Deprecated option - use gpac application\n");
-			return mp4box_cleanup(2);
-		}
-		else if (!stricmp(arg, "-atsc")) {
-			fprintf(stderr, "Deprecated option - use gpac application\n");
-			return mp4box_cleanup(2);
-		}
-#if !defined(GPAC_DISABLE_CORE_TOOLS)
-		else if (!stricmp(arg, "-wget")) {
-			CHECK_NEXT_ARG
-			do_wget = argv[i + 1];
-			i++;
-		}
-#endif
-		/*******************************************************************************/
-		else if (!stricmp(arg, "-dvbhdemux")) {
-			dvbhdemux = GF_TRUE;
-		}
-		/********************************************************************************/
-#ifndef GPAC_DISABLE_MEDIA_EXPORT
-		else if (!stricmp(arg, "-raw")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NATIVE);
-			i++;
-		}
-		else if (!stricmp(arg, "-raw-layer")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NATIVE | GF_EXPORT_SVC_LAYER);
-			i++;
-		}
-		else if (!stricmp(arg, "-qcp")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NATIVE | GF_EXPORT_USE_QCP);
-			i++;
-		}
-		else if (!stricmp(arg, "-aviraw")) {
-			CHECK_NEXT_ARG
-			if (argv[i + 1] && !stricmp(argv[i + 1], "video")) trackID = 1;
-			else if (argv[i + 1] && !stricmp(argv[i + 1], "audio")) {
-				if (strlen(argv[i + 1]) == 5) trackID = 2;
-				else trackID = 1 + atoi(argv[i + 1] + 5);
-			} else {
-				fprintf(stderr, "Usage: \"-aviraw video\" or \"-aviraw audio\"\n");
-				return 2;
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_KIND:
+			for (i=0; i<gf_isom_get_track_count(file); i++) {
+				if (track && (track != i+1)) continue;
+				e = gf_isom_add_track_kind(file, i+1, tka->kind_scheme, tka->kind_value);
+				if (e) return e;
+				do_save = GF_TRUE;
 			}
-			track_dump_type = GF_EXPORT_AVI_NATIVE;
-			i++;
-		}
-		else if (!stricmp(arg, "-raws")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_RAW_SAMPLES);
-			i++;
-		}
-		else if (!stricmp(arg, "-nhnt")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NHNT);
-			i++;
-		}
-		else if (!stricmp(arg, "-nhml")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NHML);
-			i++;
-		}
-		else if (!stricmp(arg, "-webvtt-raw")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_WEBVTT_META);
-			i++;
-		}
-		else if (!stricmp(arg, "-six")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_SIX);
-			i++;
-		}
-		else if (!stricmp(arg, "-avi")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_AVI);
-			if (tracks[nb_track_act-1].trackID)
-				i++;
-		}
-#endif /*GPAC_DISABLE_MEDIA_EXPORT*/
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-		else if (!stricmp(arg, "-rtp")) {
-			fprintf(stderr, "Deprecated option - use gpac application\n");
-			return mp4box_cleanup(2);
-		}
-		else if (!stricmp(arg, "-live")) {
-			live_scene = GF_TRUE;
-		}
-#endif
-		else if (!stricmp(arg, "-diod")) {
-			dump_iod = GF_TRUE;
-		}
-#ifndef GPAC_DISABLE_VRML
-		else if (!stricmp(arg, "-node")) {
-			CHECK_NEXT_ARG
-			PrintNode(argv[i + 1], 0);
-			return 1;
-		}
-		else if (!stricmp(arg, "-xnode")) {
-			CHECK_NEXT_ARG
-			PrintNode(argv[i + 1], 1);
-			return 1;
-		}
-		else if (!stricmp(arg, "-nodes") || !stricmp(arg, "-nodex")) {
-			PrintBuiltInNodes(0, !stricmp(arg, "-nodex") ? GF_TRUE : GF_FALSE);
-			return 1;
-		}
-		else if (!stricmp(arg, "-xnodes") || !stricmp(arg, "-xnodex")) {
-			PrintBuiltInNodes(1, !stricmp(arg, "-xnodex") ? GF_TRUE : GF_FALSE);
-			return 1;
-		}
-#endif
-#ifndef GPAC_DISABLE_SVG
-		else if (!stricmp(arg, "-snodes")) {
-			PrintBuiltInNodes(2, GF_FALSE);
-			return 1;
-		}
-#endif
-		else if (!stricmp(arg, "-boxcov")) {
-			gf_sys_set_args(argc, (const char **) argv);
- PrintBuiltInBoxes(GF_TRUE);
-			return 1;
-		} else if (!stricmp(arg, "-boxes")) {
-			PrintBuiltInBoxes(GF_FALSE);
-			return 1;
-		}
-		else if (!stricmp(arg, "-std")) dump_std = 2;
-		else if (!stricmp(arg, "-stdb")) dump_std = 1;
-		else if (!stricmp(arg, "-fstat")) fs_dump_flags |= 1;
-		else if (!stricmp(arg, "-fgraph")) fs_dump_flags |= 1<<1;
-
-#if !defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_SCENE_DUMP)
-		else if (!stricmp(arg, "-keep-ods")) no_odf_conf = GF_TRUE;
-		else if (!stricmp(arg, "-bt")) dump_mode = GF_SM_DUMP_BT;
-		else if (!stricmp(arg, "-xmt")) dump_mode = GF_SM_DUMP_XMTA;
-		else if (!stricmp(arg, "-wrl")) dump_mode = GF_SM_DUMP_VRML;
-		else if (!stricmp(arg, "-x3dv")) dump_mode = GF_SM_DUMP_X3D_VRML;
-		else if (!stricmp(arg, "-x3d")) dump_mode = GF_SM_DUMP_X3D_XML;
-		else if (!stricmp(arg, "-lsr")) dump_mode = GF_SM_DUMP_LASER;
-		else if (!stricmp(arg, "-svg")) dump_mode = GF_SM_DUMP_SVG;
-#endif /*defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_SCENE_DUMP)*/
-
-		else if (!stricmp(arg, "-stat")) stat_level = 1;
-		else if (!stricmp(arg, "-stats")) stat_level = 2;
-		else if (!stricmp(arg, "-statx")) stat_level = 3;
-		else if (!stricmp(arg, "-diso")) dump_isom = 1;
-		else if (!stricmp(arg, "-dxml")) dump_isom = 2;
-		else if (!stricmp(arg, "-disox")) dump_isom = 3;
-		else if (!stricmp(arg, "-mergevtt")) merge_vtt_cues = GF_TRUE;
-		else if (!stricmp(arg, "-dump-cover")) dump_cart = 1;
-		else if (!stricmp(arg, "-dump-chap")) dump_chap = 1;
-		else if (!stricmp(arg, "-dump-chap-ogg")) dump_chap = 2;
-		else if (!stricmp(arg, "-dump-chap-zoom")) dump_chap = 3;
-		else if (!stricmp(arg, "-hash")) do_hash = GF_TRUE;
-		else if (!strnicmp(arg, "-comp", 5)) {
-			CHECK_NEXT_ARG
-
-			if (strchr(arg, 'x')) comp_top_box_version = 1;
-			else if (strchr(arg, 'f')) comp_top_box_version = 2;
-
-			if (strchr(arg, 'l')) comp_lzma = GF_TRUE;
-
-			compress_top_boxes = argv[i + 1];
-			i++;
-		}
-		else if (!strnicmp(arg, "-topsize", 8)) {
-			CHECK_NEXT_ARG
-			size_top_box = 1;
-			compress_top_boxes = argv[i + 1];
-			i++;
-		}
-		else if (!strnicmp(arg, "-topcount", 8)) {
-			CHECK_NEXT_ARG
-			size_top_box = 2;
-			compress_top_boxes = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-mpd-rip")) do_mpd_rip = GF_TRUE;
-		else if (!strcmp(arg, "-init-seg")) {
-			CHECK_NEXT_ARG
-			use_init_seg = argv[i + 1];
-			i += 1;
-		}
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_REM_KIND:
+			for (i=0; i<gf_isom_get_track_count(file); i++) {
+				if (track && (track != i+1)) continue;
+				e = gf_isom_remove_track_kind(file, i+1, tka->kind_scheme, tka->kind_value);
+				if (e) return e;
+				do_save = GF_TRUE;
+			}
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_DELAY:
+			if (tka->delay.num && tka->delay.den) {
+				u64 tk_dur;
 
-#ifndef GPAC_DISABLE_CORE_TOOLS
-		else if (!stricmp(arg, "-bin")) do_bin_xml = GF_TRUE;
-#endif
-		else if (!stricmp(arg, "-dump-udta")) {
-			char *sep, *code;
-			CHECK_NEXT_ARG
-			sep = strchr(argv[i + 1], ':');
-			if (sep) {
-				sep[0] = 0;
-				dump_udta_track = atoi(argv[i + 1]);
-				sep[0] = ':';
-				code = &sep[1];
+				e = gf_isom_remove_edits(file, track);
+				if (e) return e;
+				tk_dur = gf_isom_get_track_duration(file, track);
+				if (gf_isom_get_edits_count(file, track))
+					do_save = GF_TRUE;
+				if (tka->delay.num>0) {
+					//cast to u64, delay_ms * timescale can be quite big before / 1000
+					e = gf_isom_append_edit(file, track, ((u64) tka->delay.num) * timescale / tka->delay.den, 0, GF_ISOM_EDIT_EMPTY);
+					if (e) return e;
+					e = gf_isom_append_edit(file, track, tk_dur, 0, GF_ISOM_EDIT_NORMAL);
+					if (e) return e;
+					do_save = GF_TRUE;
+				} else {
+					//cast to u64, delay_ms * timescale can be quite big before / 1000
+					u64 to_skip = ((u64) -tka->delay.num) * timescale / tka->delay.den;
+					if (to_skip<tk_dur) {
+						//cast to u64, delay_ms * timescale can be quite big before / 1000
+						u64 media_time = ((u64) -tka->delay.num) * gf_isom_get_media_timescale(file, track) / tka->delay.den;
+						e = gf_isom_append_edit(file, track, tk_dur-to_skip, media_time, GF_ISOM_EDIT_NORMAL);
+						if (e) return e;
+						do_save = GF_TRUE;
+					} else {
+						M4_LOG(GF_LOG_WARNING, ("Warning: request negative delay longer than track duration - ignoring\n"));
+					}
+				}
+			} else if (gf_isom_get_edits_count(file, track)) {
+				e = gf_isom_remove_edits(file, track);
+				if (e) return e;
+				do_save = GF_TRUE;
 			}
-			else {
-				code = argv[i + 1];
+			break;
+		case TRACK_ACTION_SET_KMS_URI:
+			for (i=0; i<gf_isom_get_track_count(file); i++) {
+				if (track && (track != i+1)) continue;
+				if (!gf_isom_is_media_encrypted(file, i+1, 1)) continue;
+				if (!gf_isom_is_ismacryp_media(file, i+1, 1)) continue;
+				e = gf_isom_change_ismacryp_protection(file, i+1, 1, NULL, (char *) tka->kms);
+				if (e) return e;
+				do_save = GF_TRUE;
 			}
-			if (strlen(code) == 4) {
-				dump_udta_type = GF_4CC(code[0], code[1], code[2], code[3]);
-			} else if (strlen(code) == 8) {
-				// hex representation on 8 chars
-				u32 hex1, hex2, hex3, hex4;
-				if (sscanf(code, "%02x%02x%02x%02x", &hex1, &hex2, &hex3, &hex4) != 4) {
-					fprintf(stderr, "udta code is either a 4CC or 8 hex chars for non-printable 4CC\n");
-					return mp4box_cleanup(1);
+			break;
+		case TRACK_ACTION_SET_ID:
+			if (!tka->trackID && (gf_isom_get_track_count(file) == 1)) {
+				M4_LOG(GF_LOG_WARNING, ("Warning: track id is not specified, but file has only one track - assume that you want to change id for this track\n"));
+				track = 1;
+			}
+			if (track) {
+				u32 newTrack;
+				newTrack = gf_isom_get_track_by_id(file, tka->newTrackID);
+				if (newTrack != 0) {
+					M4_LOG(GF_LOG_WARNING, ("Cannot set track id with value %d because a track already exists - ignoring", tka->newTrackID));
+				} else {
+					e = gf_isom_set_track_id(file, track, tka->newTrackID);
+					if (e) return e;
+					do_save = GF_TRUE;
 				}
-				dump_udta_type = GF_4CC(hex1, hex2, hex3, hex4);
 			} else {
-				fprintf(stderr, "udta code is either a 4CC or 8 hex chars for non-printable 4CC\n");
-				return mp4box_cleanup(1);
+				M4_LOG(GF_LOG_WARNING, ("Error: Cannot change id for track %d because it does not exist - ignoring", tka->trackID));
 			}
-			i++;
-		}
-		else if (!stricmp(arg, "-dmp4")) {
-			dump_isom = 1;
-			fprintf(stderr, "WARNING: \"-dmp4\" is deprecated - use \"-diso\" option\n");
-		}
-		else if (!stricmp(arg, "-drtp")) dump_rtp = 1;
-		else if (!stricmp(arg, "-dts")) {
-			dump_timestamps = 1;
-			if (((i + 1<(u32)argc) && inName) || (i + 2<(u32)argc)) {
-				if (isdigit(argv[i + 1][0])) {
-					program_number = atoi(argv[i + 1]);
-					i++;
+			break;
+		case TRACK_ACTION_SWAP_ID:
+			if (track) {
+				u32 tk1, tk2;
+				tk1 = gf_isom_get_track_by_id(file, tka->trackID);
+				tk2 = gf_isom_get_track_by_id(file, tka->newTrackID);
+				if (!tk1 || !tk2) {
+					M4_LOG(GF_LOG_WARNING, ("Error: Cannot swap track IDs because not existing - ignoring"));
+				} else {
+					e = gf_isom_set_track_id(file, tk2, 0);
+					if (e) return e;
+					e = gf_isom_set_track_id(file, tk1, tka->newTrackID);
+					if (e) return e;
+					e = gf_isom_set_track_id(file, tk2, tka->trackID);
+					if (e) return e;
+					do_save = GF_TRUE;
 				}
+			} else {
+				M4_LOG(GF_LOG_WARNING, ("Error: Cannot change id for track %d because it does not exist - ignoring", tka->trackID));
 			}
-		}
-		else if (!stricmp(arg, "-dtsx")) {
-			dump_timestamps = 2;
-		}
-		else if (!stricmp(arg, "-dtsc")) {
-			dump_timestamps = 3;
-		}
-		else if (!stricmp(arg, "-dtsxc")) {
-			dump_timestamps = 4;
-		}
-		else if (!strnicmp(arg, "-dnal", 5)) {
-			CHECK_NEXT_ARG
-			dump_nal = atoi(argv[i + 1]);
-			if (arg[5] == 'c') dump_nal_type |= 1;
-			else if (arg[5] == 'd') dump_nal_type |= 2;
-			else if (arg[5] == 'x') dump_nal_type |= 2|1;
-			i++;
-		}
-		else if (!strnicmp(arg, "-dsap", 5)) {
-			CHECK_NEXT_ARG
-			dump_saps = atoi(argv[i + 1]);
-			if (!stricmp(arg, "-dsaps")) dump_saps_mode = 1;
-			else if (!stricmp(arg, "-dsapc")) dump_saps_mode = 2;
-			else if (!stricmp(arg, "-dsapd")) dump_saps_mode = 3;
-			else if (!stricmp(arg, "-dsapp")) dump_saps_mode = 4;
-			else dump_saps_mode = 0;
-			i++;
-		}
-		else if (!stricmp(arg, "-dcr")) dump_cr = 1;
-		else if (!stricmp(arg, "-ttxt") || !stricmp(arg, "-srt")) {
-			if ((i + 1<(u32)argc) && (sscanf(argv[i + 1], "%u", &trackID) == 1)) {
-				char szTk[20];
-				sprintf(szTk, "%d", trackID);
-				if (!strcmp(szTk, argv[i + 1])) i++;
-				else trackID = 0;
-			}
-			else if ((i + 1<(u32)argc) && !strcmp(argv[i + 1], "*")) {
-				trackID = (u32)-1;
-				i++;
+			break;
+		case TRACK_ACTION_SET_PAR:
+			e = gf_media_change_par(file, track, tka->par_num, tka->par_den, tka->force_par, tka->rewrite_bs);
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_CLAP:
+			e = gf_isom_set_clean_aperture(file, track, 1, tka->clap_wnum, tka->clap_wden, tka->clap_hnum, tka->clap_hden, tka->clap_honum, tka->clap_hoden, tka->clap_vonum, tka->clap_voden);
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_MX:
+			e = gf_isom_set_track_matrix(file, track, tka->mx);
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_HANDLER_NAME:
+			e = gf_isom_set_handler_name(file, track, tka->hdl_name);
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_ENABLE:
+			if (!gf_isom_is_track_enabled(file, track)) {
+				e = gf_isom_set_track_enabled(file, track, GF_TRUE);
+				do_save = GF_TRUE;
 			}
-			else {
-				trackID = 0;
+			break;
+		case TRACK_ACTION_DISABLE:
+			if (gf_isom_is_track_enabled(file, track)) {
+				e = gf_isom_set_track_enabled(file, track, GF_FALSE);
+				do_save = GF_TRUE;
 			}
-#ifdef GPAC_DISABLE_ISOM_WRITE
-			if (trackID) {
-				fprintf(stderr, "Error: Read-Only version - subtitle conversion not available\n");
-				return 2;
+			break;
+		case TRACK_ACTION_REFERENCE:
+			e = gf_isom_set_track_reference(file, track, GF_4CC(tka->lang[0], tka->lang[1], tka->lang[2], tka->lang[3]), tka->newTrackID);
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_REM_NON_RAP:
+			e = gf_media_remove_non_rap(file, track, GF_FALSE);
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_REM_NON_REFS:
+			e = gf_media_remove_non_rap(file, track, GF_TRUE);
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_UDTA:
+			e = set_file_udta(file, track, tka->udta_type, tka->string ? tka->string : tka->src_name , tka->sample_num ? GF_TRUE : GF_FALSE, tka->string ? GF_TRUE : GF_FALSE);
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_EDITS:
+			e = apply_edits(file, track, tka->string);
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_TIME:
+			if (!tka->trackID) {
+				e = gf_isom_set_creation_time(file, tka->time, tka->time);
+				if (e) return e;
+				for (i=0; i<gf_isom_get_track_count(file); i++) {
+					e = gf_isom_set_track_creation_time(file, i+1, tka->time, tka->time);
+					if (e) return e;
+				}
+			} else {
+				e = gf_isom_set_track_creation_time(file, track, tka->time, tka->time);
 			}
-#endif //GPAC_DISABLE_ISOM_WRITE
-			if (!stricmp(arg, "-ttxt")) dump_ttxt = GF_TRUE;
-			else dump_srt = GF_TRUE;
-			import_subtitle = 1;
-		}
-		else if (!stricmp(arg, "-dm2ts")) {
-			dump_m2ts = 1;
-			if (((i + 1<(u32)argc) && inName) || (i + 2<(u32)argc)) {
-				if (argv[i + 1][0] != '-') pes_dump = argv[i + 1];
-				i++;
+			do_save = GF_TRUE;
+			break;
+		case TRACK_ACTION_SET_MEDIA_TIME:
+			for (i=0; i<gf_isom_get_track_count(file); i++) {
+				if (track && (track != i+1)) continue;
+				e = gf_isom_set_media_creation_time(file, i+1, tka->time, tka->time);
+				if (e) return e;
 			}
+			do_save = GF_TRUE;
+			break;
+		default:
+			break;
 		}
+		if (e) return e;
+	}
+	return GF_OK;
+}
 
-#ifndef GPAC_DISABLE_SWF_IMPORT
-		/*SWF importer options*/
-		else if (!stricmp(arg, "-global")) swf_flags |= GF_SM_SWF_STATIC_DICT;
-		else if (!stricmp(arg, "-no-ctrl")) swf_flags &= ~GF_SM_SWF_SPLIT_TIMELINE;
-		else if (!stricmp(arg, "-no-text")) swf_flags |= GF_SM_SWF_NO_TEXT;
-		else if (!stricmp(arg, "-no-font")) swf_flags |= GF_SM_SWF_NO_FONT;
-		else if (!stricmp(arg, "-no-line")) swf_flags |= GF_SM_SWF_NO_LINE;
-		else if (!stricmp(arg, "-no-grad")) swf_flags |= GF_SM_SWF_NO_GRADIENT;
-		else if (!stricmp(arg, "-quad")) swf_flags |= GF_SM_SWF_QUAD_CURVE;
-		else if (!stricmp(arg, "-xlp")) swf_flags |= GF_SM_SWF_SCALABLE_LINE;
-		else if (!stricmp(arg, "-ic2d")) swf_flags |= GF_SM_SWF_USE_IC2D;
-		else if (!stricmp(arg, "-same-app")) swf_flags |= GF_SM_SWF_REUSE_APPEARANCE;
-		else if (!stricmp(arg, "-flatten")) {
-			CHECK_NEXT_ARG
-			swf_flatten_angle = (Float)atof(argv[i + 1]);
-			i++;
-		}
-#endif
-#ifndef GPAC_DISABLE_ISOM_WRITE
-		else if (!stricmp(arg, "-isma")) {
-			conv_type = GF_ISOM_CONV_TYPE_ISMA;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-3gp")) {
-			conv_type = GF_ISOM_CONV_TYPE_3GPP;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-ipod")) {
-			conv_type = GF_ISOM_CONV_TYPE_IPOD;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-psp")) {
-			conv_type = GF_ISOM_CONV_TYPE_PSP;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-ismax")) {
-			conv_type = GF_ISOM_CONV_TYPE_ISMA_EX;
-			open_edit = GF_TRUE;
-		}
+static GF_Err do_itunes_tag()
+{
+	GF_Err e;
+	char *itunes_data = NULL;
+	char *tags = itunes_tags;
 
-		else if (!stricmp(arg, "-no-sys") || !stricmp(arg, "-nosys")) {
-			remove_sys_tracks = 1;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-no-iod")) {
-			remove_root_od = 1;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-out")) {
-			CHECK_NEXT_ARG outName = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-tmp")) {
-			CHECK_NEXT_ARG tmpdir = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-co64")) {
-			force_co64 = GF_TRUE;
-			open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-write-buffer")) {
-			CHECK_NEXT_ARG
-			fprintf(stderr, "\tWARNING: \"-write-buffer\" deprecated and will soon be removed, use -bs-cache-size=%s\n", argv[i + 1]);
-			gf_opts_set_key("temp", "bs-cache-size", argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-cprt")) {
-			CHECK_NEXT_ARG cprt = argv[i + 1];
-			i++;
-			if (!dash_duration) open_edit = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-chap") || !stricmp(arg, "-chapqt")) {
-			CHECK_NEXT_ARG
-			chap_file = argv[i + 1];
-			i++;
-			open_edit = GF_TRUE;
-			if (!stricmp(arg, "-chapqt")) chap_qt = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-inter") || !stricmp(arg, "-old-inter")) {
-			CHECK_NEXT_ARG
-			interleaving_time = atof(argv[i + 1]) / 1000;
-			if (!interleaving_time) do_flat = 2;
-			open_edit = GF_TRUE;
-			needSave = GF_TRUE;
-			if (!stricmp(arg, "-old-inter")) old_interleave = 1;
-			i++;
-		}
-		else if (!stricmp(arg, "-frag")) {
-			CHECK_NEXT_ARG
-			interleaving_time = atof(argv[i + 1]) / 1000;
-			needSave = GF_TRUE;
-			i++;
-			Frag = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-dash")) {
-			CHECK_NEXT_ARG
-			dash_duration = atof(argv[i + 1]) / 1000;
-			if (dash_duration == 0.0) {
-				fprintf(stderr, "\tERROR: \"-dash-dash_duration\": invalid parameter %s\n", argv[i + 1]);
-				return 2;
+	if (gf_file_exists(itunes_tags)) {
+		u32 len;
+		e = gf_file_load_data(itunes_tags, (u8 **) &itunes_data, &len);
+		if (e) return e;
+		tags = itunes_data;
+	}
+
+	while (tags) {
+		char *val;
+		Bool clear = GF_FALSE;
+		Bool is_wma = GF_FALSE;
+		u32 tlen, tagtype=0, itag = 0;
+		s32 tag_idx=-1;
+		char *sep = itunes_data ? strchr(tags, '\n') : gf_url_colon_suffix(tags, '=');
+		while (sep) {
+			char *eq = strchr(sep+1, '=');
+			if (eq) eq[0] = 0;
+			s32 next_tag_idx = gf_itags_find_by_name(sep+1);
+			if (next_tag_idx<0) {
+				//4CC tag
+				if ( strlen(sep+1)==4) {
+					next_tag_idx = 0;
+				}
+				//3CC tag, changed to @tag
+				if ( strlen(sep+1)==3) {
+					next_tag_idx = 0;
+				}
+				//unrecognized tag tag
+				else {
+					M4_LOG(GF_LOG_WARNING, ("Unrecognize tag \"%s\", assuming part of previous tag\n", sep+1));
+				}
 			}
-			i++;
-		}
-		else if (!stricmp(arg, "-dash-strict")) {
-			CHECK_NEXT_ARG
-			dash_duration = atof(argv[i + 1]) / 1000;
-			if (dash_duration == 0.0) {
-				fprintf(stderr, "\tERROR: \"-dash-dash_duration\": invalid parameter %s\n", argv[i + 1]);
-				return 2;
+
+			if (eq) eq[0] = '=';
+			if (next_tag_idx>=0) {
+				sep[0] = 0;
+				break;
 			}
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] -dash-strict is deprecated, will behave like -dash\n"));
-			i++;
+			sep = itunes_data ? strchr(sep+1, '\n') : gf_url_colon_suffix(sep+1, '=');
 		}
-		else if (!stricmp(arg, "-subdur")) {
-			CHECK_NEXT_ARG
-			dash_subduration = atof(argv[i + 1]) / 1000;
-			i++;
-		}
-		else if (!stricmp(arg, "-dash-scale")) {
-			CHECK_NEXT_ARG
-			dash_scale = atoi(argv[i + 1]);
-			if (!dash_scale) {
-				fprintf(stderr, "\tERROR: \"-dash-scale\": invalid parameter %s\n", argv[i + 1]);
-				return 2;
+		val = strchr(tags, '=');
+		if (val) val[0] = 0;
+		if (!strcmp(tags, "clear") || !strcmp(tags, "reset")) {
+			clear = GF_TRUE;
+		} else if (!strncmp(tags, "WM/", 3) ) {
+			is_wma = GF_TRUE;
+		} else {
+			tag_idx = gf_itags_find_by_name(tags);
+			if (tag_idx<0) {
+				if (strlen(tags)==4) {
+					itag = GF_4CC(tags[0], tags[1], tags[2], tags[3]);
+					tagtype = GF_ITAG_STR;
+				} else if (strlen(tags)==3) {
+					itag = GF_4CC(0xA9, tags[0], tags[1], tags[2]);
+					tagtype = GF_ITAG_STR;
+				}
 			}
-			i++;
-		}
-		else if (!stricmp(arg, "-dash-ts-prog")) {
-			CHECK_NEXT_ARG
-			program_number = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-subsegs-per-sidx") || !stricmp(arg, "-frags-per-sidx")) {
-			CHECK_NEXT_ARG
-			subsegs_per_sidx = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-segment-name")) {
-			CHECK_NEXT_ARG
-			seg_name = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-run-for")) {
-			CHECK_NEXT_ARG
-			run_for = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-no-cache")) {
-			no_cache = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-no-loop")) {
-			no_loop = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-hlsc")) {
-			hls_clock = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-bound")) {
-			dash_split_mode = GF_DASH_SPLIT_IN;
-		}
-		else if (!stricmp(arg, "-closest")) {
-			dash_split_mode = GF_DASH_SPLIT_CLOSEST;
 		}
-		else if (!stricmp(arg, "-segment-ext")) {
-			CHECK_NEXT_ARG
-			seg_ext = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-init-segment-ext")) {
-			CHECK_NEXT_ARG
-			init_seg_ext = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-bs-switching")) {
-			CHECK_NEXT_ARG
-			if (!stricmp(argv[i + 1], "no") || !stricmp(argv[i + 1], "off")) bitstream_switching_mode = GF_DASH_BSMODE_NONE;
-			else if (!stricmp(argv[i + 1], "merge")) bitstream_switching_mode = GF_DASH_BSMODE_MERGED;
-			else if (!stricmp(argv[i + 1], "multi")) bitstream_switching_mode = GF_DASH_BSMODE_MULTIPLE_ENTRIES;
-			else if (!stricmp(argv[i + 1], "single")) bitstream_switching_mode = GF_DASH_BSMODE_SINGLE;
-			else if (!stricmp(argv[i + 1], "inband")) bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
-			else {
-				fprintf(stderr, "\tWARNING: Unrecognized bitstream switchin mode \"%s\" - please check usage\n", argv[i + 1]);
-				return 2;
+		if (val) {
+			val[0] = '=';
+			val++;
+		}
+		if (!itag && !clear && !is_wma) {
+			if (tag_idx<0) {
+				M4_LOG(GF_LOG_WARNING, ("Invalid iTune tag name \"%s\" - ignoring\n", tags));
+				break;
 			}
-			i++;
-		}
-		else if (!stricmp(arg, "-dynamic")) {
-			dash_mode = GF_DASH_DYNAMIC;
+			itag = gf_itags_get_itag(tag_idx);
+			tagtype = gf_itags_get_type(tag_idx);
 		}
-		else if (!stricmp(arg, "-last-dynamic")) {
-			dash_mode = GF_DASH_DYNAMIC_LAST;
+		if (!val || (val[0]==':') || !val[0] || !stricmp(val, "NULL") ) val = NULL;
+
+		//if val is NULL, use tlen=1 to force removal of tag
+		tlen = val ? (u32) strlen(val) : 1;
+		if (clear) {
+			e = gf_isom_apple_set_tag(file, GF_ISOM_ITUNE_RESET, NULL, 0, 0, 0);
+		}
+		else if (is_wma) {
+			if (val) val[-1] = 0;
+			e = gf_isom_wma_set_tag(file, tags, val);
+			if (val) val[-1] = '=';
+		}
+		else if (val && (tagtype==GF_ITAG_FILE)) {
+			u32 flen = (u32) strlen(val);
+			u8 *d=NULL;
+			while (flen && val[flen-1]=='\n') flen--;
+			val[flen] = 0;
+			e = gf_file_load_data(val, (u8 **) &d, &tlen);
+			val[flen] = '\n';
+
+			if (!e)
+				e = gf_isom_apple_set_tag(file, itag, d, tlen, 0, 0);
+
+			if (d) gf_free(d);
+		} else {
+			e = gf_isom_apple_set_tag(file, itag, (u8 *) val, tlen, 0, 0);
 		}
-		else if (!stricmp(arg, "-frag-rt")) {
-			frag_real_time = GF_TRUE;
+		if (e) {
+			M4_LOG(GF_LOG_ERROR, ("Error assigning tag %s: %s\n", tags, gf_error_to_string(e) ));
 		}
-		else if (!stricmp(arg, "-start-date")) {
-			dash_start_date = argv[i+1];
-			i++;
+
+		do_save = GF_TRUE;
+
+		if (sep) {
+			sep[0] = itunes_data ? '\n' : ':';
+			tags = sep+1;
+		} else {
+			tags = NULL;
 		}
-		else if (!strnicmp(arg, "-cp-location=", 13)) {
-			if (strcmp(arg+13, "both")) cp_location_mode = GF_DASH_CPMODE_BOTH;
-			else if (strcmp(arg+13, "as")) cp_location_mode = GF_DASH_CPMODE_ADAPTATION_SET;
-			else if (strcmp(arg+13, "rep")) cp_location_mode = GF_DASH_CPMODE_REPRESENTATION;
-			else {
-				fprintf(stderr, "\tWARNING: Unrecognized ContentProtection loction mode \"%s\" - please check usage\n", argv[i + 13]);
-				return 2;
+	}
+	if (itunes_data) gf_free(itunes_data);
+	return GF_OK;
+}
+
+#if !defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_SENG)
+static void set_sdp_ext()
+{
+	u32 i, j;
+	for (i=0; i<nb_sdp_ex; i++) {
+		if (sdp_lines[i].trackID) {
+			u32 track = gf_isom_get_track_by_id(file, sdp_lines[i].trackID);
+			if (gf_isom_get_media_type(file, track)!=GF_ISOM_MEDIA_HINT) {
+				s32 ref_count;
+				u32 k, count = gf_isom_get_track_count(file);
+				for (j=0; j<count; j++) {
+					if (gf_isom_get_media_type(file, j+1)!=GF_ISOM_MEDIA_HINT) continue;
+					ref_count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_HINT);
+					if (ref_count<0) continue;
+					for (k=0; k<(u32) ref_count; k++) {
+						u32 refTk;
+						if (gf_isom_get_reference(file, j+1, GF_ISOM_REF_HINT, k+1, &refTk)) continue;
+						if (refTk==track) {
+							track = j+1;
+							j=count;
+							break;
+						}
+					}
+				}
 			}
+			gf_isom_sdp_add_track_line(file, track, sdp_lines[i].line);
+			do_save = GF_TRUE;
+		} else {
+			gf_isom_sdp_add_line(file, sdp_lines[i].line);
+			do_save = GF_TRUE;
 		}
-		else if (!strnicmp(arg, "-dash-live", 10) || !strnicmp(arg, "-ddbg-live", 10)) {
-			dash_mode = !strnicmp(arg, "-ddbg-live", 10) ? GF_DASH_DYNAMIC_DEBUG : GF_DASH_DYNAMIC;
-			dash_live = 1;
-			if (arg[10] == '=') {
-				dash_ctx_file = arg + 11;
+	}
+}
+#endif /*!defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_SENG)*/
+
+static GF_Err do_remux_file()
+{
+	GF_MediaExporter mdump;
+	memset(&mdump, 0, sizeof(GF_MediaExporter));
+	mdump.in_name = inName;
+	mdump.out_name = mux_name;
+	mdump.flags = GF_EXPORT_REMUX;
+	mdump.print_stats_graph = fs_dump_flags;
+	return gf_media_export(&mdump);
+}
+
+static u32 mp4box_cleanup(u32 ret_code) {
+	if (mpd_base_urls) {
+		gf_free(mpd_base_urls);
+		mpd_base_urls = NULL;
+	}
+	if (sdp_lines) {
+		gf_free(sdp_lines);
+		sdp_lines = NULL;
+	}
+	if (metas) {
+		u32 i;
+		for (i=0; i<nb_meta_act; i++) {
+			if (metas[i].enc_type) gf_free(metas[i].enc_type);
+			if (metas[i].mime_type) gf_free(metas[i].mime_type);
+			if (metas[i].szName) gf_free(metas[i].szName);
+			if (metas[i].szPath) gf_free(metas[i].szPath);
+			if (metas[i].keep_props) gf_free(metas[i].keep_props);
+			if (metas[i].image_props) {
+				GF_ImageItemProperties *iprops = metas[i].image_props;
+				if (iprops->overlay_offsets) gf_free(iprops->overlay_offsets);
+				if (iprops->aux_urn) gf_free((char *) iprops->aux_urn);
+				if (iprops->aux_data) gf_free((char *) iprops->aux_data);
+				gf_free(iprops);
 			}
-			CHECK_NEXT_ARG
-			dash_duration = atof(argv[i + 1]) / 1000;
-			i++;
-		}
-		else if (!stricmp(arg, "-mpd-duration")) {
-			CHECK_NEXT_ARG mpd_live_duration = atof(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-mpd-refresh")) {
-			CHECK_NEXT_ARG mpd_update_time = atof(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-time-shift")) {
-			CHECK_NEXT_ARG
-			time_shift_depth = (u32)atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-min-buffer")) {
-			CHECK_NEXT_ARG
-			min_buffer = atoi(argv[i + 1]);
-			min_buffer /= 1000;
-			i++;
-		}
-		else if (!stricmp(arg, "-ast-offset")) {
-			CHECK_NEXT_ARG
-			ast_offset_ms = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-moof-sn")) {
-			CHECK_NEXT_ARG
-			initial_moof_sn = (u32)atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-tfdt")) {
-			CHECK_NEXT_ARG
-			sscanf(argv[i + 1], LLU, &initial_tfdt);
-			i++;
-		}
-		else if (!stricmp(arg, "-no-frags-default")) {
-			no_fragments_defaults = 1;
-		}
-		else if (!stricmp(arg, "-single-traf")) {
-			single_traf_per_moof = 1;
-		}
- else if (!stricmp(arg, "-tfdt-traf")) {
- tfdt_per_traf = 1;
- }
-		else if (!stricmp(arg, "-mpd-title")) {
-			CHECK_NEXT_ARG dash_title = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-mpd-source")) {
-			CHECK_NEXT_ARG dash_source = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-mpd-info-url")) {
-			CHECK_NEXT_ARG dash_more_info = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-base-url")) {
-			CHECK_NEXT_ARG
-			dash_more_info = argv[i + 1];
-			mpd_base_urls = gf_realloc(mpd_base_urls, (nb_mpd_base_urls + 1)*sizeof(char**));
-			mpd_base_urls[nb_mpd_base_urls] = argv[i + 1];
-			nb_mpd_base_urls++;
-			i++;
-		}
-		else if (!stricmp(arg, "-dash-ctx")) {
-			CHECK_NEXT_ARG
-			dash_ctx_file = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-ssix")) {
-			use_ssix = 1;
-		}
-		else if (!stricmp(arg, "-daisy-chain")) {
-			daisy_chain_sidx = 1;
-		}
-		else if (!stricmp(arg, "-single-segment")) {
-			single_segment = 1;
 		}
-		else if (!stricmp(arg, "-single-file")) {
-			single_file = 1;
-		}
-		else if (!stricmp(arg, "-pssh-moof")) {
-			pssh_mode = GF_DASH_PSSH_MOOF;
-		}
-		else if (!strnicmp(arg, "-pssh=", 6)) {
-			if (!strcmp(arg+6, "f")) pssh_mode = GF_DASH_PSSH_MOOF;
-			else if (!strcmp(arg+6, "v")) pssh_mode = GF_DASH_PSSH_MOOV;
-			else if (!strcmp(arg+6, "m")) pssh_mode = GF_DASH_PSSH_MPD;
-			else if (!strcmp(arg+6, "mf") || !strcmp(arg+6, "fm")) pssh_mode = GF_DASH_PSSH_MOOF_MPD;
-			else if (!strcmp(arg+6, "mv") || !strcmp(arg+6, "vm")) pssh_mode = GF_DASH_PSSH_MOOV_MPD;
-			else pssh_mode = GF_DASH_PSSH_MOOV;
-		}
-		else if (!stricmp(arg, "-sample-groups-traf")) {
-			samplegroups_in_traf = 1;
-		}
-		else if (!stricmp(arg, "-mvex-after-traks")) {
-			mvex_after_traks = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-sdtp-traf")) {
-			CHECK_NEXT_ARG
-			if (!stricmp(argv[i + 1], "both")) sdtp_in_traf = 2;
-			else if (!stricmp(argv[i + 1], "sdtp")) sdtp_in_traf = 1;
-			else sdtp_in_traf = 0;
-			i++;
+		gf_free(metas);
+		metas = NULL;
+	}
+	if (tracks) {
+		u32 i;
+		for (i = 0; i<nb_track_act; i++) {
+			if (tracks[i].out_name)
+				gf_free(tracks[i].out_name);
+			if (tracks[i].src_name)
+				gf_free(tracks[i].src_name);
+			if (tracks[i].string)
+				gf_free(tracks[i].string);
+			if (tracks[i].kind_scheme)
+				gf_free(tracks[i].kind_scheme);
+			if (tracks[i].kind_value)
+				gf_free(tracks[i].kind_value);
 		}
-		else if (!stricmp(arg, "-dash-profile") || !stricmp(arg, "-profile")) {
-			CHECK_NEXT_ARG
-			if (!stricmp(argv[i + 1], "live") || !stricmp(argv[i + 1], "simple")) dash_profile = GF_DASH_PROFILE_LIVE;
-			else if (!stricmp(argv[i + 1], "onDemand")) dash_profile = GF_DASH_PROFILE_ONDEMAND;
-			else if (!stricmp(argv[i + 1], "hbbtv1.5:live")) {
-				dash_profile = GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE;
+		gf_free(tracks);
+		tracks = NULL;
+	}
+	if (tsel_acts) {
+		gf_free(tsel_acts);
+		tsel_acts = NULL;
+	}
+	if (brand_add) {
+		gf_free(brand_add);
+		brand_add = NULL;
+	}
+	if (brand_rem) {
+		gf_free(brand_rem);
+		brand_rem = NULL;
+	}
+	if (dash_inputs) {
+		u32 i, j;
+		for (i = 0; i<nb_dash_inputs; i++) {
+			GF_DashSegmenterInput *di = &dash_inputs[i];
+			if (di->nb_baseURL) {
+				for (j = 0; j<di->nb_baseURL; j++) {
+					gf_free(di->baseURL[j]);
+				}
+				gf_free(di->baseURL);
 			}
-			else if (!stricmp(argv[i + 1], "dashavc264:live")) {
-				dash_profile = GF_DASH_PROFILE_AVC264_LIVE;
+			if (di->rep_descs) {
+				for (j = 0; j<di->nb_rep_descs; j++) {
+					gf_free(di->rep_descs[j]);
+				}
+				gf_free(di->rep_descs);
 			}
-			else if (!stricmp(argv[i + 1], "dashavc264:onDemand")) {
-				dash_profile = GF_DASH_PROFILE_AVC264_ONDEMAND;
+			if (di->as_descs) {
+				for (j = 0; j<di->nb_as_descs; j++) {
+					gf_free(di->as_descs[j]);
+				}
+				gf_free(di->as_descs);
 			}
-			else if (!stricmp(argv[i + 1], "main")) dash_profile = GF_DASH_PROFILE_MAIN;
-			else if (!stricmp(argv[i + 1], "full")) dash_profile = GF_DASH_PROFILE_FULL;
-			else {
-				fprintf(stderr, "\tWARNING: Unrecognized DASH profile \"%s\" - please check usage\n", argv[i + 1]);
-				return 2;
+			if (di->as_c_descs) {
+				for (j = 0; j<di->nb_as_c_descs; j++) {
+					gf_free(di->as_c_descs[j]);
+				}
+				gf_free(di->as_c_descs);
+			}
+			if (di->p_descs) {
+				for (j = 0; j<di->nb_p_descs; j++) {
+					gf_free(di->p_descs[j]);
+				}
+				gf_free(di->p_descs);
+			}
+			if (di->representationID) gf_free(di->representationID);
+			if (di->periodID) gf_free(di->periodID);
+			if (di->xlink) gf_free(di->xlink);
+			if (di->seg_template) gf_free(di->seg_template);
+			if (di->hls_pl) gf_free(di->hls_pl);
+			if (di->source_opts) gf_free(di->source_opts);
+			if (di->filter_chain) gf_free(di->filter_chain);
+
+			if (di->roles) {
+				for (j = 0; j<di->nb_roles; j++) {
+					gf_free(di->roles[j]);
+				}
+				gf_free(di->roles);
 			}
-			i++;
-		}
-		else if (!stricmp(arg, "-profile-ext")) {
-			CHECK_NEXT_ARG
-			dash_profile_extension = argv[i + 1];
-			i++;
-		}
-		else if (!strnicmp(arg, "-url-template", 13)) {
-			use_url_template = 1;
-			if ((arg[13] == '=') && arg[14]) {
-				if (!strcmp(&arg[14], "simulate")) use_url_template = 2;
-			}
-		}
-		else if (!stricmp(arg, "-segment-timeline")) {
-			segment_timeline = 1;
-		}
-		else if (!stricmp(arg, "-mem-frags")) {
-			memory_frags = 1;
-		}
-		else if (!stricmp(arg, "-segment-marker")) {
-			char *m;
-			CHECK_NEXT_ARG
-			m = argv[i + 1];
-			segment_marker = GF_4CC(m[0], m[1], m[2], m[3]);
-			i++;
-		}
-		else if (!stricmp(arg, "-cues")) {
-			CHECK_NEXT_ARG
-			dash_cues = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-strict-cues")) {
-			strict_cues = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-insert-utc")) {
-			insert_utc = GF_TRUE;
-		}
-#endif //GPAC_DISABLE_ISOM_WRITE
-		else if (!stricmp(arg, "-udp-write")) {
-			udp_dest = argv[i+1];
-			i++;
-		}
-		else {
-			u32 ret = mp4box_parse_args_continue(argc, argv, &i);
-			if (ret) return ret;
 		}
+		gf_free(dash_inputs);
+		dash_inputs = NULL;
 	}
-	return 0;
+	if (logfile) gf_fclose(logfile);
+	gf_sys_close();
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (mem_track && (gf_memory_size() || gf_file_handles_count() )) {
+		gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
+		gf_memory_print();
+	}
+#endif
+
+	return ret_code;
 }
 
+
+
 int mp4boxMain(int argc, char **argv)
 {
 	u32 i, j;
 	const char *gpac_profile = "0";
 	GF_Err e = GF_OK;
-	nb_tsel_acts = nb_add = nb_cat = nb_track_act = nb_sdp_ex = max_ptime = nb_meta_act = rtp_rate = major_brand = nb_alt_brand_add = nb_alt_brand_rem = car_dur = minor_version = 0;
 
-	split_duration = 0.0;
-	split_start = -1.0;
-	interleaving_time = 0;
-	dash_duration = dash_subduration = 0.0;
-	import_fps.num = import_fps.den = 0;
-	import_flags = 0;
-	split_size = 0;
-	movie_time = 0;
-	dump_nal = dump_saps = dump_saps_mode = force_new = 0;
-	FullInter = HintInter = encode = do_scene_log = old_interleave = do_saf = do_hash = verbose = do_mpd_rip = merge_vtt_cues = get_nb_tracks = GF_FALSE;
-#ifndef GPAC_DISABLE_SCENE_DUMP
-	dump_mode = GF_SM_DUMP_NONE;
-#endif
-	Frag = force_ocr = remove_sys_tracks = agg_samples = remove_hint = keep_sys_tracks = remove_root_od = single_group = clean_groups = compress_moov = GF_FALSE;
-	conv_type = HintIt = needSave = print_sdp = regular_iod = dump_std = open_edit = dump_rtp = dump_cr = dump_srt = dump_ttxt = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = GF_FALSE;
-	no_fragments_defaults = GF_FALSE;
-	single_traf_per_moof = hls_clock = GF_FALSE;
- tfdt_per_traf = GF_FALSE;
-	dump_nal_type = 0;
-	dump_isom = 0;
-	print_info = 0;
-	/*align cat is the new default behaviour for -cat*/
-	align_cat = GF_TRUE;
-	subsegs_per_sidx = 0;
-	track_dump_type = 0;
-	crypt = 0;
-	time_shift_depth = 0;
-	file = NULL;
-	itunes_tags = pes_dump = NULL;
-	seg_name = dash_ctx_file = NULL;
-	compress_top_boxes = NULL;
-	initial_moof_sn = 0;
-	initial_tfdt = 0;
-
-#ifndef GPAC_DISABLE_SCENE_ENCODER
-	memset(&smenc_opts, 0, sizeof(smenc_opts));
-#endif
-
-	trackID = stat_level = hint_flags = 0;
-	program_number = 0;
-	info_track_id = 0;
-	do_flat = 0;
-	inName = outName = mediaSource = input_ctx = output_ctx = drm_file = avi2raw = cprt = chap_file = pack_file = raw_cat = high_dynamc_range_filename = use_init_seg = box_patch_filename = NULL;
-
-#ifndef GPAC_DISABLE_SWF_IMPORT
-	swf_flags = GF_SM_SWF_SPLIT_TIMELINE;
+#ifdef TEST_ARGS
+	i=0;
+	mp4box_parse_single_arg(argc, argv, "", &i);
 #endif
-	swf_flatten_angle = 0.0f;
-	tmpdir = NULL;
 
 	for (i = 1; i < (u32) argc ; i++) {
 		if (!strcmp(argv[i], "-mem-track") || !strcmp(argv[i], "-mem-track-stack")) {
 #ifdef GPAC_MEMORY_TRACKING
 mem_track = !strcmp(argv[i], "-mem-track-stack") ? GF_MemTrackerBackTrace : GF_MemTrackerSimple;
 #else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"%s\"\n", argv[i]);
+			M4_LOG(GF_LOG_WARNING, ("WARNING - GPAC not compiled with Memory Tracker - ignoring \"%s\"\n", argv[i]));
 #endif
 			break;
 		}
@@ -4490,7 +5692,7 @@
 			if (i+1<(u32) argc)
 				gpac_profile = argv[i+1];
 			else {
-				fprintf(stderr, "Bad argument for -p, expecting profile name but no more args\n");
+				M4_LOG(GF_LOG_ERROR, ("Bad argument for -p, expecting profile name but no more args\n"));
 				return 1;
 			}
 		}
@@ -4505,9 +5707,9 @@
 	/*init libgpac*/
 	gf_sys_init(mem_track, gpac_profile);
 	if (argc < 2) {
-		fprintf(stderr, "Not enough arguments - check usage with -h\n"
-			"MP4Box - GPAC version %s\n"
-	 "%s\n", gf_gpac_version(), gf_gpac_copyright_cite());
+		M4_LOG(GF_LOG_ERROR, ("Not enough arguments - check usage with -h\n"));
+		M4_LOG(GF_LOG_INFO, ("MP4Box - GPAC version %s\n"
+	 "%s\n", gf_gpac_version(), gf_gpac_copyright_cite() ));
 		gf_sys_close();
 		return 0;
 	}
@@ -4518,13 +5720,32 @@
 	if (i) {
 		return mp4box_cleanup(i - 1);
 	}
+#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
+	if (live_scene) {
+		int ret = live_session(argc, argv);
+		return mp4box_cleanup(ret);
+	}
+#endif
+
+	if (!dash_duration && interleaving_time && do_frag)
+		interleaving_time /= 1000;
+
+	if (do_mpd_conv) inName = do_mpd_conv;
+
+#ifndef GPAC_DISABLE_STREAMING
+	if (import_flags & GF_IMPORT_FORCE_MPEG4)
+		hint_flags |= GP_RTP_PCK_FORCE_MPEG4;
+#endif
 
 	if (!inName && dump_std)
 		inName = "std";
 
+	if (!dash_duration && cprt)
+		open_edit = GF_TRUE;
+
 	if (!inName) {
 		if (has_next_arg) {
-			fprintf(stderr, "Broken argument specifier or file name missing - check usage with -h\n");
+			M4_LOG(GF_LOG_ERROR, ("Broken argument specifier or file name missing - check usage with -h\n"));
 		} else {
 			PrintUsage();
 		}
@@ -4540,7 +5761,7 @@
 		/*by default use single fragment per dash segment*/
 		if (dash_duration)
 			interleaving_time = dash_duration;
-		else if (!do_flat) {
+		else if (!do_flat && !(split_duration || split_size || split_range_str)) {
 			interleaving_time = DEFAULT_INTERLEAVING_IN_SEC;
 		}
 	}
@@ -4555,23 +5776,16 @@
 		if ( freopen(NULL, "wb", stdout) == NULL)
 #endif
 		{
-			fprintf(stderr, "Fatal error: cannot reopen stdout in binary mode.\n");
+			M4_LOG(GF_LOG_ERROR, ("Fatal error: cannot reopen stdout in binary mode.\n"));
 			return mp4box_cleanup(1);
 		}
 	}
 
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-	if (live_scene) {
-		int ret = live_session(argc, argv);
-		return mp4box_cleanup(ret);
-	}
-#endif
-
 	GF_LOG_Level level = verbose ? GF_LOG_DEBUG : GF_LOG_INFO;
 	gf_log_set_tool_level(GF_LOG_CONTAINER, level);
 	gf_log_set_tool_level(GF_LOG_SCENE, level);
 	gf_log_set_tool_level(GF_LOG_PARSER, level);
-	gf_log_set_tool_level(GF_LOG_AUTHOR, level);
+	gf_log_set_tool_level(GF_LOG_MEDIA, level);
 	gf_log_set_tool_level(GF_LOG_CODING, level);
 	gf_log_set_tool_level(GF_LOG_DASH, level);
 #ifdef GPAC_MEMORY_TRACKING
@@ -4581,44 +5795,20 @@
 
 	e = gf_sys_set_args(argc, (const char **) argv);
 	if (e) {
-		fprintf(stderr, "Error assigning libgpac arguments: %s\n", gf_error_to_string(e) );
+		M4_LOG(GF_LOG_ERROR, ("Error assigning libgpac arguments: %s\n", gf_error_to_string(e) ));
 		return mp4box_cleanup(1);
 	}
 
-	if (raw_cat) {
-		char chunk[4096];
-		FILE *fin, *fout;
-		s64 to_copy, done;
-		fin = gf_fopen(raw_cat, "rb");
-		if (!fin) return mp4box_cleanup(1);
-
-		fout = gf_fopen(inName, "a+b");
-		if (!fout) {
-			gf_fclose(fin);
-			return mp4box_cleanup(1);
-		}
-		gf_fseek(fin, 0, SEEK_END);
-		to_copy = gf_ftell(fin);
-		gf_fseek(fin, 0, SEEK_SET);
-		done = 0;
-		while (1) {
-			u32 nb_bytes = (u32) gf_fread(chunk, 4096, fin);
-			gf_fwrite(chunk, nb_bytes, fout);
-			done += nb_bytes;
-			fprintf(stderr, "Appending file %s - %02.2f done\r", raw_cat, 100.0*done/to_copy);
-			if (done >= to_copy) break;
-		}
-		gf_fclose(fin);
-		gf_fclose(fout);
-		return mp4box_cleanup(0);
-	}
+	if (raw_cat)
+		return do_raw_cat();
+
 	if (compress_top_boxes) {
 		if (size_top_box) {
 			u64 top_size = do_size_top_boxes(inName, compress_top_boxes, size_top_box);
 			fprintf(stdout, LLU"\n", top_size);
 			return mp4box_cleanup(e ? 1 : 0);
 		} else {
-			e = do_compress_top_boxes(inName, outName, compress_top_boxes, comp_top_box_version, comp_lzma);
+			e = do_compress_top_boxes(inName, outName);
 			return mp4box_cleanup(e ? 1 : 0);
 		}
 	}
@@ -4632,127 +5822,25 @@
 	if (do_wget != NULL) {
 		e = gf_dm_wget(do_wget, inName, 0, 0, NULL);
 		if (e != GF_OK) {
-			fprintf(stderr, "Cannot retrieve %s: %s\n", do_wget, gf_error_to_string(e) );
+			M4_LOG(GF_LOG_ERROR, ("Cannot retrieve %s: %s\n", do_wget, gf_error_to_string(e) ));
 			return mp4box_cleanup(1);
 		}
 		return mp4box_cleanup(0);
 	}
 #endif
 
-	if (udp_dest) {
-		GF_Socket *sock = gf_sk_new(GF_SOCK_TYPE_UDP);
-		u16 port = 2345;
-		char *sep = strrchr(udp_dest, ':');
-		if (sep) {
-			sep[0] = 0;
-			port = atoi(sep+1);
-		}
-		e = gf_sk_bind( sock, "127.0.0.1", 0, udp_dest, port, 0);
-		if (sep) sep[0] = ':';
-		if (e) fprintf(stderr, "Failed to bind socket to %s: %s\n", udp_dest, gf_error_to_string(e) );
-		else {
-			e = gf_sk_send(sock, (u8 *) inName, (u32)strlen(inName));
-			if (e) fprintf(stderr, "Failed to send datagram: %s\n", gf_error_to_string(e) );
-		}
-		gf_sk_del(sock);
-		return 0;
-	}
+	if (udp_dest)
+		return do_write_udp();
 
 #ifndef GPAC_DISABLE_MPD
-	if (do_mpd) {
-		Bool remote = GF_FALSE;
-		GF_MPD *mpd;
-		char *mpd_base_url = NULL;
-		if (!strnicmp(inName, "http://", 7) || !strnicmp(inName, "https://", 8)) {
-#if !defined(GPAC_DISABLE_CORE_TOOLS)
-			e = gf_dm_wget(inName, "tmp_main.m3u8", 0, 0, &mpd_base_url);
-			if (e != GF_OK) {
-				fprintf(stderr, "Cannot retrieve M3U8 (%s): %s\n", inName, gf_error_to_string(e));
-				if (mpd_base_url) gf_free(mpd_base_url);
-				return mp4box_cleanup(1);
-			}
-			remote = GF_TRUE;
-#else
-			gf_free(mpd_base_url);
-			fprintf(stderr, "HTTP Downloader disabled in this build\n");
-			return mp4box_cleanup(1);
+	if (do_mpd_conv)
+		return convert_mpd();
 #endif
 
-			if (outName)
-				strcpy(outfile, outName);
-			else {
-				const char *sep = gf_file_basename(inName);
-				char *ext = gf_file_ext_start(sep);
-				if (ext) ext[0] = 0;
-				sprintf(outfile, "%s.mpd", sep);
-				if (ext) ext[0] = '.';
-			}
-		} else {
-			if (outName)
-				strcpy(outfile, outName);
-			else {
-				char *dst = strdup(inName);
-				char *ext = strstr(dst, ".m3u8");
-				if (ext) ext[0] = 0;
-				sprintf(outfile, "%s.mpd", dst);
-				gf_free(dst);
-			}
-		}
-
-		mpd = gf_mpd_new();
-		if (!mpd) {
-			e = GF_OUT_OF_MEM;
-			fprintf(stderr, "[DASH] Error: MPD creation problem %s\n", gf_error_to_string(e));
-			mp4box_cleanup(1);
-		}
-		FILE *f = gf_fopen(remote ? "tmp_main.m3u8" : inName, "r");
-		u32 manif_type = 0;
-		if (f) {
-			char szDATA[1000];
-			s32 read;
-			szDATA[999]=0;
-			read = (s32) gf_fread(szDATA, 999, f);
-			if (read<0) read = 0;
-			szDATA[read]=0;
-			gf_fclose(f);
-			if (strstr(szDATA, "SmoothStreamingMedia"))
-				manif_type = 2;
-			else if (strstr(szDATA, "#EXTM3U"))
-				manif_type = 1;
-		}
-
-		if (manif_type==1) {
-			e = gf_m3u8_to_mpd(remote ? "tmp_main.m3u8" : inName, mpd_base_url ? mpd_base_url : inName, outfile, 0, "video/mp2t", GF_TRUE, use_url_template, segment_timeline, NULL, mpd, GF_TRUE, GF_TRUE);
-		} else if (manif_type==2) {
-			e = gf_mpd_smooth_to_mpd(remote ? "tmp_main.m3u8" : inName, mpd, mpd_base_url ? mpd_base_url : inName);
-		} else {
-			e = GF_NOT_SUPPORTED;
-		}
-		if (!e)
-			gf_mpd_write_file(mpd, outfile);
-
-		if (mpd)
-			gf_mpd_del(mpd);
-		if (mpd_base_url)
-			gf_free(mpd_base_url);
-
-		if (remote) {
-			gf_file_delete("tmp_main.m3u8");
-		}
-		if (e != GF_OK) {
-			fprintf(stderr, "Error converting %s (%s) to MPD (%s): %s\n", (manif_type==1) ? "HLS" : "Smooth", inName, outfile, gf_error_to_string(e));
-			return mp4box_cleanup(1);
-		} else {
-			fprintf(stderr, "Done converting %s (%s) to MPD (%s)\n", (manif_type==1) ? "HLS" : "Smooth", inName, outfile);
-			return mp4box_cleanup(0);
-		}
-	}
-#endif
 	if (dash_duration && !nb_dash_inputs) {
 		dash_inputs = set_dash_input(dash_inputs, inName, &nb_dash_inputs);
 	}
 
-
 	if (do_saf && !encode) {
 		switch (get_file_type_by_ext(inName)) {
 		case GF_FILE_TYPE_BT_WRL_X3DV:
@@ -4774,533 +5862,78 @@
 	}
 #endif
 
+	if (import_subtitle && !trackID)
+		return do_import_sub();
 
-	if (import_subtitle && !trackID) {
-		/* We import the subtitle file,
-		 i.e. we parse it and store the content as samples of a 3GPP Timed Text track in an ISO file,
-		 possibly for later export (e.g. when converting SRT to TTXT, ...) */
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-		GF_MediaImporter import;
-		/* Prepare the importer */
-		file = gf_isom_open("ttxt_convert", GF_ISOM_OPEN_WRITE, NULL);
-		if (timescale && file) gf_isom_set_timescale(file, timescale);
-
-		memset(&import, 0, sizeof(GF_MediaImporter));
-		import.dest = file;
-		import.in_name = inName;
-		/* Start the import */
-		e = gf_media_import(&import);
-		if (e) {
-			fprintf(stderr, "Error importing %s: %s\n", inName, gf_error_to_string(e));
-			gf_isom_delete(file);
-			gf_file_delete("ttxt_convert");
-			return mp4box_cleanup(1);
-		}
-		/* Prepare the export */
-		strcpy(outfile, inName);
-		if (strchr(outfile, '.')) {
-			while (outfile[strlen(outfile)-1] != '.') outfile[strlen(outfile)-1] = 0;
-			outfile[strlen(outfile)-1] = 0;
-		}
-#ifndef GPAC_DISABLE_ISOM_DUMP
-		/* Start the export of the track #1, in the appropriate dump type, indicating it's a conversion */
-		dump_isom_timed_text(file, gf_isom_get_track_id(file, 1),
-							 dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE,
-		 GF_TRUE,
-		 (import_subtitle==2) ? GF_TEXTDUMPTYPE_SVG : (dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT));
-#endif
-		/* Clean the importer */
-		gf_isom_delete(file);
-		gf_file_delete("ttxt_convert");
-		if (e) {
-			fprintf(stderr, "Error converting %s: %s\n", inName, gf_error_to_string(e));
-			return mp4box_cleanup(1);
-		}
-		return mp4box_cleanup(0);
-#else
-		fprintf(stderr, "Feature not supported\n");
-		return mp4box_cleanup(1);
-#endif
-	}
 
 #if !defined(GPAC_DISABLE_MEDIA_IMPORT) && !defined(GPAC_DISABLE_ISOM_WRITE)
 	if (nb_add || nb_cat) {
-		u32 ipass, nb_pass = 1;
-		char *mux_args=NULL;
-		GF_FilterSession *fs = NULL;
-		if (nb_add) {
-
-			GF_ISOOpenMode open_mode = GF_ISOM_OPEN_EDIT;
-			if (force_new) {
-				open_mode = (do_flat || (force_new==2)) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
-			} else {
-				FILE *test = gf_fopen(inName, "rb");
-				if (!test) {
-					open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
-					if (!outName) outName = inName;
-				} else {
-					gf_fclose(test);
-					if (! gf_isom_probe_file(inName) ) {
-						open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
-						if (!outName) outName = inName;
-					}
-				}
-			}
-			open_edit = do_flat ? GF_FALSE : GF_TRUE;
-			file = gf_isom_open(inName, open_mode, tmpdir);
-			if (!file) {
-				fprintf(stderr, "Cannot open destination file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL)) );
-				return mp4box_cleanup(1);
-			}
-
-			if (freeze_box_order)
-				gf_isom_freeze_order(file);
-		}
-
-		if (do_flat && interleaving_time) {
-			char szSubArg[100];
-			gf_isom_set_storage_mode(file, GF_ISOM_STORE_FASTSTART);
-			do_flat = 2;
-			nb_pass = 2;
-			fs = gf_fs_new_defaults(0);
-			if (!fs) {
-				fprintf(stderr, "Error creating filter session\n");
-				gf_isom_delete(file);
-				return mp4box_cleanup(1);
-			}
-
-			//mux args
-			gf_dynstrcat(&mux_args, "mp4mx:importer:store=fstart", ":");
-
-			sprintf(szSubArg, "file=%p", file);
-			gf_dynstrcat(&mux_args, szSubArg, ":");
-			sprintf(szSubArg, "cdur=%g", interleaving_time);
-			gf_dynstrcat(&mux_args, szSubArg, ":");
-		}
-
-		for (ipass=0; ipass<nb_pass; ipass++) {
-			u32 tk_idx = 1;
-			for (i=0; i<(u32) argc; i++) {
-				char *margs=NULL;
-				if (!strcmp(argv[i], "-add")) {
-					char *src = argv[i+1];
-
-					while (src) {
-						char *loc_src = src;
-						char *sep = NULL;
-						while (1) {
-							char *opt_sep;
-							sep = strchr(loc_src, '+');
-							if (!sep) break;
-
-							sep[0] = 0;
-							if (strstr(src, "://"))
-								break;
-
-							opt_sep = gf_url_colon_suffix(src);
-							if (opt_sep)
-								opt_sep[0] = 0;
-							if (gf_file_exists(src)) {
-								if (opt_sep)
-									opt_sep[0] = ':';
-								break;
-							}
-							if (opt_sep)
-								opt_sep[0] = ':';
-
-							sep[0] = '+';
-							loc_src = sep+1;
-						}
-
-						e = import_file(file, src, import_flags, import_fps, agg_samples, fs, (fs && (ipass==0)) ? &margs : NULL, tk_idx);
-						tk_idx++;
-
-						if (margs) {
-							gf_dynstrcat(&mux_args, margs, ":");
-							gf_free(margs);
-						}
-
-						if (e) {
-							fprintf(stderr, "Error importing %s: %s\n", argv[i+1], gf_error_to_string(e));
-							gf_isom_delete(file);
-							if (fs)
-								gf_fs_del(fs);
-							return mp4box_cleanup(1);
-						}
-						if (sep) {
-							sep[0] = '+';
-							src = sep+1;
-						} else {
-							break;
-						}
-					}
-					i++;
-				} else if (!strcmp(argv[i], "-cat") || !strcmp(argv[i], "-catx") || !strcmp(argv[i], "-catpl")) {
-					if (nb_pass == 2) {
-						fprintf(stderr, "Cannot cat files when using -newfs mode\n");
-						return mp4box_cleanup(1);
-					}
-					if (!file) {
-						u8 open_mode = GF_ISOM_OPEN_EDIT;
-						if (force_new) {
-							open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
-						} else {
-							FILE *test = gf_fopen(inName, "rb");
-							if (!test) {
-								open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
-								if (!outName) outName = inName;
-							}
-							else gf_fclose(test);
-						}
-
-						open_edit = GF_TRUE;
-						file = gf_isom_open(inName, open_mode, tmpdir);
-						if (!file) {
-							fprintf(stderr, "Cannot open destination file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL)) );
-							return mp4box_cleanup(1);
-						}
-					}
-
-					e = cat_isomedia_file(file, argv[i+1], import_flags, import_fps, agg_samples, tmpdir, force_cat, align_cat, !strcmp(argv[i], "-catx") ? GF_TRUE : GF_FALSE, !strcmp(argv[i], "-catpl") ? GF_TRUE : GF_FALSE);
-					if (e) {
-						fprintf(stderr, "Error appending %s: %s\n", argv[i+1], gf_error_to_string(e));
-						gf_isom_delete(file);
-						return mp4box_cleanup(1);
-					}
-					i++;
-				}
-			}
-			if ((nb_pass == 2) && !ipass) {
-				GF_Filter *mux_filter = gf_fs_load_filter(fs, mux_args, NULL);
-				gf_free(mux_args);
-				if (!mux_filter) {
-					fprintf(stderr, "Error loadin isobmff mux filter\n");
-					gf_isom_delete(file);
-					gf_fs_del(fs);
-					return mp4box_cleanup(1);
-				}
-
-				e = gf_fs_run(fs);
-				if (e==GF_EOS) e = GF_OK;
-
-				if (!e) e = gf_fs_get_last_connect_error(fs);
-				if (!e) e = gf_fs_get_last_process_error(fs);
-
-				if (e) {
-					fprintf(stderr, "Error importing sources: %s\n", gf_error_to_string(e));
-					gf_isom_delete(file);
-					gf_fs_del(fs);
-					return mp4box_cleanup(1);
-				}
-			}
-		}
-		if (fs) {
-			if (fs_dump_flags & 1) gf_fs_print_stats(fs);
-			if (fs_dump_flags & 2) gf_fs_print_connections(fs);
-			gf_fs_del(fs);
-		}
-
-		/*unless explicitly asked, remove all systems tracks*/
-#ifndef GPAC_DISABLE_AV_PARSERS
-		if (!keep_sys_tracks) remove_systems_tracks(file);
-#endif
-		needSave = GF_TRUE;
+		u32 res = do_add_cat(argc, argv);
+		if (res) return res;
 	}
 #endif /*!GPAC_DISABLE_MEDIA_IMPORT && !GPAC_DISABLE_ISOM_WRITE*/
 
 #if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_SCENE_ENCODER) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 	else if (chunk_mode) {
 		if (!inName) {
-			fprintf(stderr, "chunk encoding syntax: [-outctx outDump] -inctx inScene auFile\n");
+			M4_LOG(GF_LOG_ERROR, ("chunk encoding syntax: [-outctx outDump] -inctx inScene auFile\n"));
 			return mp4box_cleanup(1);
 		}
-		e = EncodeFileChunk(inName, outName ? outName : inName, input_ctx, output_ctx, tmpdir);
+		e = EncodeFileChunk(inName, outName ? outName : inName, input_ctx, output_ctx);
 		if (e) {
-			fprintf(stderr, "Error encoding chunk file %s\n", gf_error_to_string(e));
+			M4_LOG(GF_LOG_ERROR, ("Error encoding chunk file %s\n", gf_error_to_string(e)));
 			return mp4box_cleanup(1);
 		}
 		goto exit;
 	}
 #endif // !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_SCENE_ENCODER) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
+
 	else if (encode) {
 #if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_SCENE_ENCODER) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
-		FILE *logs = NULL;
-		if (do_scene_log) {
-			char alogfile[GF_MAX_PATH];
-			strcpy(alogfile, inName);
-			if (strchr(alogfile, '.')) {
-				while (alogfile[strlen(alogfile)-1] != '.') alogfile[strlen(alogfile)-1] = 0;
-				alogfile[strlen(alogfile)-1] = 0;
-			}
-			strcat(alogfile, "_enc.logs");
-			logs = gf_fopen(alogfile, "wt");
-		}
-		strcpy(outfile, outName ? outName : inName);
-		if (strchr(outfile, '.')) {
-			while (outfile[strlen(outfile)-1] != '.') outfile[strlen(outfile)-1] = 0;
-			outfile[strlen(outfile)-1] = 0;
-		}
-		strcat(outfile, ".mp4");
-		file = gf_isom_open(outfile, GF_ISOM_WRITE_EDIT, tmpdir);
-		smenc_opts.mediaSource = mediaSource ? mediaSource : outfile;
-		e = EncodeFile(inName, file, &smenc_opts, logs);
-		if (logs) gf_fclose(logs);
+		e = do_scene_encode();
 		if (e) goto err_exit;
-		needSave = GF_TRUE;
-		if (do_saf) {
-			needSave = GF_FALSE;
-			open_edit = GF_FALSE;
-		}
 #endif //!defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_SCENE_ENCODER) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 	}
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	else if (pack_file) {
-		char *fileName = gf_url_colon_suffix(pack_file);
+		//don't use any check for ':', the first word must be the four CC
+		char *fileName = gf_url_colon_suffix(pack_file, 0);
 		if (fileName && ((fileName - pack_file)==4)) {
 			fileName[0] = 0;
-			file = package_file(fileName + 1, pack_file, tmpdir, pack_wgt);
+			file = package_file(fileName + 1, pack_file, pack_wgt);
 			fileName[0] = ':';
 		} else {
-			file = package_file(pack_file, NULL, tmpdir, pack_wgt);
+			file = package_file(pack_file, NULL, pack_wgt);
 			if (!file) {
-				fprintf(stderr, "Failed to package file\n");
+				M4_LOG(GF_LOG_ERROR, ("Failed to package file\n"));
 				return mp4box_cleanup(1);
 			}
 		}
 		if (!outName) outName = inName;
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 		open_edit = GF_TRUE;
 	}
 #endif //GPAC_DISABLE_ISOM_WRITE
 
 	if (dash_duration) {
-		Bool del_file = GF_FALSE;
-		char szMPD[GF_MAX_PATH], *sep;
-		char szStateFile[GF_MAX_PATH];
-		Bool dyn_state_file = GF_FALSE;
-		u32 do_abort = 0;
-		GF_DASHSegmenter *dasher=NULL;
-
-		if (crypt) {
-			fprintf(stderr, "MP4Box cannot crypt and DASH on the same pass. Please encrypt your content first.\n");
-			return mp4box_cleanup(1);
-		}
-
-		strcpy(outfile, outName ? outName : gf_url_get_resource_name(inName) );
-		sep = strrchr(outfile, '.');
-		if (sep) sep[0] = 0;
-		if (!outName) strcat(outfile, "_dash");
-		strcpy(szMPD, outfile);
-		if (outName && sep) {
-			sep[0] = '.';
-			strcat(szMPD, sep);
-		} else {
-			strcat(szMPD, ".mpd");
-		}
-		
-		if ((dash_subduration>0) && (dash_duration > dash_subduration)) {
-			fprintf(stderr, "Warning: -subdur parameter (%g s) should be greater than segment duration (%g s), using segment duration instead\n", dash_subduration, dash_duration);
-			dash_subduration = dash_duration;
-		}
-
-		if (dash_mode && dash_live)
-			fprintf(stderr, "Live DASH-ing - press 'q' to quit, 's' to save context and quit\n");
-
-		if (!dash_ctx_file && dash_live) {
-			u32 r1;
-			u64 add = (u64) (intptr_t) &dasher;
-			add ^= gf_net_get_utc();
-			r1 = (u32) add ^ (u32) (add/0xFFFFFFFF);
-			r1 ^= gf_rand();
- 			sprintf(szStateFile, "%s/dasher_%X.xml", gf_get_default_cache_directory(), r1 );
-			dash_ctx_file = szStateFile;
-			dyn_state_file = GF_TRUE;
-		} else if (dash_ctx_file) {
-			if (force_new)
-				gf_file_delete(dash_ctx_file);
-		}
-
-		if (dash_profile==GF_DASH_PROFILE_AUTO)
-			dash_profile = dash_mode ? GF_DASH_PROFILE_LIVE : GF_DASH_PROFILE_FULL;
-
-		if (!dash_mode) {
-			time_shift_depth = 0;
-			mpd_update_time = 0;
-		} else if ((dash_profile>=GF_DASH_PROFILE_MAIN) && !use_url_template && !mpd_update_time) {
-			/*use a default MPD update of dash_duration sec*/
-			mpd_update_time = (Double) (dash_subduration ? dash_subduration : dash_duration);
-			fprintf(stderr, "Using default MPD refresh of %g seconds\n", mpd_update_time);
-		}
-
-		if (file && needSave) {
-			gf_isom_close(file);
-			file = NULL;
-			del_file = GF_TRUE;
-		}
-
-		/*setup dash*/
-		dasher = gf_dasher_new(szMPD, dash_profile, tmpdir, dash_scale, dash_ctx_file);
-		if (!dasher) {
-			return mp4box_cleanup(1);
-		}
-		e = gf_dasher_set_info(dasher, dash_title, cprt, dash_more_info, dash_source, NULL);
-		if (e) {
-			fprintf(stderr, "DASH Error: %s\n", gf_error_to_string(e));
-			gf_dasher_del(dasher);
-			return mp4box_cleanup(1);
-		}
-
-		gf_dasher_set_start_date(dasher, dash_start_date);
-		gf_dasher_set_location(dasher, dash_source);
-		for (i=0; i < nb_mpd_base_urls; i++) {
-			e = gf_dasher_add_base_url(dasher, mpd_base_urls[i]);
-			if (e) {
-				fprintf(stderr, "DASH Error: %s\n", gf_error_to_string(e));
-				gf_dasher_del(dasher);
-				return mp4box_cleanup(1);
-			}
-		}
-
-		if (segment_timeline && !use_url_template) {
-			fprintf(stderr, "DASH Warning: using -segment-timeline with no -url-template. Forcing URL template.\n");
-			use_url_template = GF_TRUE;
-		}
-
-		e = gf_dasher_enable_url_template(dasher, (Bool) use_url_template, seg_name, seg_ext, init_seg_ext);
-		if (!e) e = gf_dasher_enable_segment_timeline(dasher, segment_timeline);
-		if (!e) e = gf_dasher_enable_single_segment(dasher, single_segment);
-		if (!e) e = gf_dasher_enable_single_file(dasher, single_file);
-		if (!e) e = gf_dasher_set_switch_mode(dasher, bitstream_switching_mode);
-		if (!e) e = gf_dasher_set_durations(dasher, dash_duration, interleaving_time, dash_subduration);
-		if (!e) e = gf_dasher_enable_rap_splitting(dasher, seg_at_rap, frag_at_rap);
-		if (!e) e = gf_dasher_set_segment_marker(dasher, segment_marker);
-		if (!e) e = gf_dasher_enable_sidx(dasher, (subsegs_per_sidx>=0) ? 1 : 0, (u32) subsegs_per_sidx, daisy_chain_sidx, use_ssix);
-		if (!e) e = gf_dasher_set_dynamic_mode(dasher, dash_mode, mpd_update_time, time_shift_depth, mpd_live_duration);
-		if (!e) e = gf_dasher_set_min_buffer(dasher, min_buffer);
-		if (!e) e = gf_dasher_set_ast_offset(dasher, ast_offset_ms);
-		if (!e) e = gf_dasher_enable_memory_fragmenting(dasher, memory_frags);
-		if (!e) e = gf_dasher_set_initial_isobmf(dasher, initial_moof_sn, initial_tfdt);
-		if (!e) e = gf_dasher_configure_isobmf_default(dasher, no_fragments_defaults, pssh_mode, samplegroups_in_traf, single_traf_per_moof, tfdt_per_traf, mvex_after_traks, sdtp_in_traf);
-		if (!e) e = gf_dasher_enable_utc_ref(dasher, insert_utc);
-		if (!e) e = gf_dasher_enable_real_time(dasher, frag_real_time);
-		if (!e) e = gf_dasher_set_content_protection_location_mode(dasher, cp_location_mode);
-		if (!e) e = gf_dasher_set_profile_extension(dasher, dash_profile_extension);
-		if (!e) e = gf_dasher_enable_cached_inputs(dasher, no_cache);
-		if (!e) e = gf_dasher_enable_loop_inputs(dasher, ! no_loop);
-		if (!e) e = gf_dasher_set_split_mode(dasher, dash_split_mode);
-		if (!e) e = gf_dasher_set_hls_clock(dasher, hls_clock);
-		if (!e && dash_cues) e = gf_dasher_set_cues(dasher, dash_cues, strict_cues);
-		if (!e && fs_dump_flags) e = gf_dasher_print_session_info(dasher, fs_dump_flags);
-
-		for (i=0; i < nb_dash_inputs; i++) {
-			if (!e) e = gf_dasher_add_input(dasher, &dash_inputs[i]);
-		}
-		if (e) {
-			fprintf(stderr, "DASH Setup Error: %s\n", gf_error_to_string(e));
-			gf_dasher_del(dasher);
-			return mp4box_cleanup(1);
-		}
-
-		dash_cumulated_time=0;
-
-		while (1) {
-			if (run_for && (dash_cumulated_time >= run_for)) {
-				fprintf(stderr, "Done running, computing static MPD\n");
-				do_abort = 3;
-			}
-
-			dash_prev_time=gf_sys_clock();
-			if (do_abort>=2) {
-				e = gf_dasher_set_dynamic_mode(dasher, GF_DASH_DYNAMIC_LAST, 0, time_shift_depth, mpd_live_duration);
-			}
-
-			if (!e) e = gf_dasher_process(dasher);
-			if (!dash_live && (e==GF_EOS) ) {
-				fprintf(stderr, "Nothing to dash, too early ...\n");
-				e = GF_OK;
-			}
-
-			if (do_abort)
-				break;
-
-			//this happens when reading file while writing them (local playback of the live session ...)
-			if (dash_live && (e==GF_IO_ERR) ) {
-				fprintf(stderr, "Error dashing file (%s) but continuing ...\n", gf_error_to_string(e) );
-				e = GF_OK;
-			}
-
-			if (e) break;
-
-			if (dash_live) {
-				u64 ms_in_session=0;
-				u32 slept = gf_sys_clock();
-				u32 sleep_for = gf_dasher_next_update_time(dasher, &ms_in_session);
-				fprintf(stderr, "Next generation scheduled in %u ms (DASH time "LLU" ms)\r", sleep_for, ms_in_session);
-				if (run_for && (ms_in_session>=run_for)) {
-					dash_cumulated_time = 1+run_for;
-					continue;
-				}
-
-				while (1) {
-					if (gf_prompt_has_input()) {
-						char c = (char) gf_prompt_get_char();
-						if (c=='X') {
-							do_abort = 1;
-							break;
-						}
-						if (c=='q') {
-							do_abort = 2;
-							break;
-						}
-						if (c=='s') {
-							do_abort = 3;
-							break;
-						}
-					}
-
-					if (dash_mode == GF_DASH_DYNAMIC_DEBUG) {
-						break;
-					}
-					if (!sleep_for) break;
-
-					gf_sleep(sleep_for/10);
-					sleep_for = gf_dasher_next_update_time(dasher, NULL);
-					if (sleep_for<=1) {
-						dash_now_time=gf_sys_clock();
-						dash_cumulated_time+=(dash_now_time-dash_prev_time);
-						fprintf(stderr, "Slept for %d ms before generation, dash cumulated time %d\n", dash_now_time - slept, dash_cumulated_time);
-						break;
-					}
-				}
-			} else {
-				break;
-			}
-		}
-
-		gf_dasher_del(dasher);
-
-		if (!run_for && dash_ctx_file && (do_abort==3) && (dyn_state_file) && !gf_sys_is_test_mode() ) {
-			char szName[1024];
-			fprintf(stderr, "Enter file name to save dash context:\n");
-			if (scanf("%1023s", szName) == 1) {
-				gf_file_move(dash_ctx_file, szName);
-			}
-		}
-		if (e) fprintf(stderr, "Error DASHing file: %s\n", gf_error_to_string(e));
-		if (file) gf_isom_delete(file);
-		if (del_file)
-			gf_file_delete(inName);
-
+		e = do_dash();
 		if (e) return mp4box_cleanup(1);
 		goto exit;
 	}
 
-	else if (!file && !do_hash
-#ifndef GPAC_DISABLE_MEDIA_EXPORT
-	 && !(track_dump_type & GF_EXPORT_AVI_NATIVE)
-#endif
-	 ) {
+	if (split_duration || split_size || split_range_str) {
+		if (force_new==2) {
+			do_flat = 3;
+			force_new = 0;
+		}
+	} else {
+		if (do_flat)
+			open_edit = GF_TRUE;
+	}
+
+	//need to open input
+	if (!file && !do_hash) {
 		FILE *st = gf_fopen(inName, "rb");
 		Bool file_exists = 0;
 		GF_ISOOpenMode omode;
@@ -5316,36 +5949,39 @@
 				//keep fragment signaling in moov
 				omode = GF_ISOM_OPEN_READ;
 				if (use_init_seg)
-					file = gf_isom_open(use_init_seg, GF_ISOM_OPEN_READ, tmpdir);
+					file = gf_isom_open(use_init_seg, GF_ISOM_OPEN_READ, NULL);
 			}
 			if (!crypt && use_init_seg) {
-				file = gf_isom_open(use_init_seg, GF_ISOM_OPEN_READ_DUMP, tmpdir);
+				file = gf_isom_open(use_init_seg, GF_ISOM_OPEN_READ_DUMP, NULL);
 				if (file) {
 					e = gf_isom_open_segment(file, inName, 0, 0, 0);
-					if (e) {
-						fprintf(stderr, "Error opening segment %s: %s\n", inName, gf_error_to_string(e) );
+					if (e==GF_ISOM_INCOMPLETE_FILE) {
+						M4_LOG(GF_LOG_WARNING, ("Segment %s: %s\n", inName, gf_error_to_string(e) ));
+					} else if (e) {
+						M4_LOG(GF_LOG_ERROR, ("Error opening segment %s: %s\n", inName, gf_error_to_string(e) ));
 						gf_isom_delete(file);
 						file = NULL;
 					}
 				}
 			}
 			if (!file)
-				file = gf_isom_open(inName, omode, tmpdir);
+				file = gf_isom_open(inName, omode, NULL);
 
 			if (!file && (gf_isom_last_error(NULL) == GF_ISOM_INCOMPLETE_FILE) && !open_edit) {
 				u64 missing_bytes;
-				e = gf_isom_open_progressive(inName, 0, 0, GF_FALSE, &file, &missing_bytes);
-				fprintf(stderr, "Truncated file - missing "LLD" bytes\n", missing_bytes);
+				gf_isom_open_progressive(inName, 0, 0, GF_FALSE, &file, &missing_bytes);
+				if (missing_bytes)
+					M4_LOG(GF_LOG_ERROR, ("Truncated file - missing "LLD" bytes\n", missing_bytes));
 			}
 
 			if (!file) {
 				if (open_edit && nb_meta_act) {
-					file = gf_isom_open(inName, GF_ISOM_WRITE_EDIT, tmpdir);
+					file = gf_isom_open(inName, GF_ISOM_WRITE_EDIT, NULL);
 					if (!outName && file) outName = inName;
 				}
 
 				if (!file) {
-					fprintf(stderr, "Error opening file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL)));
+					M4_LOG(GF_LOG_ERROR, ("Error opening file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL))));
 					return mp4box_cleanup(1);
 				}
 			}
@@ -5389,7 +6025,7 @@
 					import.flags = GF_IMPORT_MPE_DEMUX;
 					e = gf_media_import(&import);
 					if (e) {
-						fprintf(stderr, "Error importing %s: %s\n", inName, gf_error_to_string(e));
+						M4_LOG(GF_LOG_ERROR, ("Error importing %s: %s\n", inName, gf_error_to_string(e)));
 						gf_isom_delete(file);
 						gf_file_delete("ttxt_convert");
 						return mp4box_cleanup(1);
@@ -5399,11 +6035,11 @@
 
 				if (dump_m2ts) {
 #ifndef GPAC_DISABLE_MPEG2TS
-					dump_mpeg2_ts(inName, pes_dump, program_number);
+					dump_mpeg2_ts(inName, outName, program_number);
 #endif
 				} else if (dump_timestamps) {
 #ifndef GPAC_DISABLE_MPEG2TS
-					dump_mpeg2_ts(inName, pes_dump, program_number);
+					dump_mpeg2_ts(inName, outName, program_number);
 #endif
 #ifndef GPAC_DISABLE_CORE_TOOLS
 				} else if (do_bin_xml) {
@@ -5416,108 +6052,77 @@
 					convert_file_info(inName, info_track_id);
 #endif
 				} else {
-					fprintf(stderr, "Input %s is not an MP4 file, operation not allowed\n", inName);
-					return mp4box_cleanup(1);
+					if (mux_name) {
+						e = do_remux_file();
+						if (e) goto err_exit;
+						if (file) gf_isom_delete(file);
+						goto exit;
+					} else {
+						M4_LOG(GF_LOG_ERROR, ("Input %s is not an MP4 file, operation not allowed\n", inName));
+						return mp4box_cleanup(1);
+					}
 				}
 				goto exit;
 			}
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 			else if (open_edit) {
-				file = gf_isom_open(inName, GF_ISOM_WRITE_EDIT, tmpdir);
+				file = gf_isom_open(inName, GF_ISOM_WRITE_EDIT, NULL);
 				if (!outName && file) outName = inName;
 			} else if (!file_exists) {
-				fprintf(stderr, "Error creating file %s: %s\n", inName, gf_error_to_string(GF_URL_ERROR));
+				M4_LOG(GF_LOG_ERROR, ("Error %s file %s: %s\n", force_new ? "creating" : "opening", inName, gf_error_to_string(GF_URL_ERROR)));
 				return mp4box_cleanup(1);
 			} else {
-				fprintf(stderr, "Cannot open %s - extension not supported\n", inName);
+				M4_LOG(GF_LOG_ERROR, ("Cannot open %s - extension not supported\n", inName));
 				return mp4box_cleanup(1);
 			}
 		}
 	}
 
 	if (high_dynamc_range_filename) {
-		e = parse_high_dynamc_range_xml_desc(file, high_dynamc_range_filename);
+		e = parse_high_dynamc_range_xml_desc(file, 0, high_dynamc_range_filename);
 		if (e) goto err_exit;
 	}
 
-	if (file && keep_utc && open_edit) {
+	if (file && keep_utc) {
 		gf_isom_keep_utc_times(file, 1);
 	}
 
-	strcpy(outfile, outName ? outName : inName);
-	{
-
-		char *szExt = gf_file_ext_start(outfile);
+	if ( gf_strlcpy(outfile, outName ? outName : inName, sizeof(outfile)) >= sizeof(outfile) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Filename too long (limit is %d)\n", GF_MAX_PATH));
+		return mp4box_cleanup(1);
+	}
 
-		if (szExt)
-		{
-			/*turn on 3GP saving*/
-			if (!stricmp(szExt, ".3gp") || !stricmp(szExt, ".3gpp") || !stricmp(szExt, ".3g2"))
-				conv_type = GF_ISOM_CONV_TYPE_3GPP;
-			else if (!stricmp(szExt, ".m4a") || !stricmp(szExt, ".m4v"))
-				conv_type = GF_ISOM_CONV_TYPE_IPOD;
-			else if (!stricmp(szExt, ".psp"))
-				conv_type = GF_ISOM_CONV_TYPE_PSP;
-			else if (!stricmp(szExt, ".mov") || !stricmp(szExt, ".qt"))
-				conv_type = GF_ISOM_CONV_TYPE_MOV;
+	char *szExt = gf_file_ext_start(outfile);
+	if (szExt) {
+		/*turn on 3GP saving*/
+		if (!stricmp(szExt, ".3gp") || !stricmp(szExt, ".3gpp") || !stricmp(szExt, ".3g2"))
+			conv_type = GF_ISOM_CONV_TYPE_3GPP;
+		else if (!stricmp(szExt, ".m4a") || !stricmp(szExt, ".m4v"))
+			conv_type = GF_ISOM_CONV_TYPE_IPOD;
+		else if (!stricmp(szExt, ".psp"))
+			conv_type = GF_ISOM_CONV_TYPE_PSP;
+		else if (!stricmp(szExt, ".mov") || !stricmp(szExt, ".qt"))
+			conv_type = GF_ISOM_CONV_TYPE_MOV;
 
-			//remove extension from outfile
-			*szExt = 0;
-		}
+		//remove extension from outfile
+		*szExt = 0;
 	}
 
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
-	if (track_dump_type & GF_EXPORT_AVI_NATIVE) {
-		char szFile[GF_MAX_PATH+24];
-		GF_MediaExporter mdump;
-		memset(&mdump, 0, sizeof(mdump));
-		mdump.in_name = inName;
-		mdump.flags = GF_EXPORT_AVI_NATIVE;
-		mdump.trackID = trackID;
-		if (dump_std) {
-			mdump.out_name = "std";
-		} else if (outName) {
-			mdump.out_name = outName;
-		} else if (trackID>2) {
-			sprintf(szFile, "%s_audio%d", outfile, trackID-1);
-			mdump.out_name = szFile;
-		} else {
-			sprintf(szFile, "%s_%s", outfile, (trackID==1) ? "video" : "audio");
-			mdump.out_name = szFile;
-		}
-
-		mdump.print_stats_graph = fs_dump_flags;
-		e = gf_media_export(&mdump);
+	if (!open_edit && track_dump_type && !gf_isom_probe_file(inName)) {
+		e = do_export_tracks_non_isobmf();
 		if (e) goto err_exit;
 		goto exit;
 	}
-	if (!open_edit && track_dump_type && !gf_isom_probe_file(inName)) {
-		GF_MediaExporter mdump;
-		char szFile[GF_MAX_PATH+24];
-		for (i=0; i<nb_track_act; i++) {
-			TrackAction *tka = &tracks[i];
-			if (tka->act_type != TRAC_ACTION_RAW_EXTRACT) continue;
-			memset(&mdump, 0, sizeof(mdump));
-			mdump.in_name = inName;
-			mdump.flags = tka->dump_type;
-			mdump.trackID = tka->trackID;
-			mdump.sample_num = tka->sample_num;
-			if (outName) {
-				mdump.out_name = outName;
-				mdump.flags |= GF_EXPORT_MERGE;
-			} else if (nb_track_act>1) {
-				sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
-				mdump.out_name = szFile;
-			} else {
-				mdump.out_name = outfile;
-			}
-			mdump.print_stats_graph = fs_dump_flags;
-			e = gf_media_export(&mdump);
-			if (e) goto err_exit;
-		}
+	if (mux_name) {
+		e = do_remux_file();
+		if (e) goto err_exit;
+		if (file) gf_isom_delete(file);
 		goto exit;
 	}
 
+
+
 #endif /*GPAC_DISABLE_MEDIA_EXPORT*/
 
 #ifndef GPAC_DISABLE_SCENE_DUMP
@@ -5532,17 +6137,17 @@
 #endif
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	if (!HintIt && print_sdp) dump_isom_sdp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
+	if (!do_hint && print_sdp) dump_isom_sdp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 #endif
 	if (get_nb_tracks) {
 		fprintf(stdout, "%d\n", gf_isom_get_track_count(file));
 	}
 	if (print_info) {
 		if (!file) {
-			fprintf(stderr, "Cannot print info on a non ISOM file (%s)\n", inName);
+			M4_LOG(GF_LOG_ERROR, ("Cannot print info on a non ISOM file (%s)\n", inName));
 		} else {
-			if (info_track_id) DumpTrackInfo(file, info_track_id, 1, (print_info==2) ? GF_TRUE : GF_FALSE);
-			else DumpMovieInfo(file);
+			if (info_track_id) DumpTrackInfo(file, info_track_id, 1, (print_info==2) ? GF_TRUE : GF_FALSE, GF_FALSE);
+			else DumpMovieInfo(file, (print_info==2) ? GF_TRUE : GF_FALSE);
 		}
 	}
 #ifndef GPAC_DISABLE_ISOM_DUMP
@@ -5574,7 +6179,10 @@
 #endif
 
 	if (dump_timestamps) dump_isom_timestamps(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_timestamps);
-	if (dump_nal) dump_isom_nal(file, dump_nal, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_nal_type);
+	if (dump_nal) {
+		e = dump_isom_nal(file, dump_nal, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_nal_type);
+		if (e) goto err_exit;
+	}
 	if (dump_saps) dump_isom_saps(file, dump_saps, dump_saps_mode, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 
 	if (do_hash) {
@@ -5588,88 +6196,30 @@
 	}
 #endif
 
+	if (dump_chunk) dump_isom_chunks(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 	if (dump_cart) dump_isom_cover_art(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 	if (dump_chap) dump_isom_chapters(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_chap);
 	if (dump_udta_type) dump_isom_udta(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_udta_type, dump_udta_track);
 
 	if (dump_iod) {
-		GF_InitialObjectDescriptor *iod = (GF_InitialObjectDescriptor *)gf_isom_get_root_od(file);
-		if (!iod) {
-			fprintf(stderr, "File %s has no IOD\n", inName);
-		} else {
-			char szName[GF_MAX_PATH+10];
-			FILE *iodf;
-			sprintf(szName, "%s.iod", outfile);
-			iodf = gf_fopen(szName, "wb");
-			if (!iodf) {
-				fprintf(stderr, "Cannot open destination %s\n", szName);
-			} else {
-				u8 *desc;
-				u32 size;
-				GF_BitStream *bs = gf_bs_from_file(iodf, GF_BITSTREAM_WRITE);
-				if (gf_odf_desc_write((GF_Descriptor *)iod, &desc, &size)==GF_OK) {
-					gf_fwrite(desc, size, iodf);
-					gf_free(desc);
-				} else {
-					fprintf(stderr, "Error writing IOD %s\n", szName);
-				}
-				gf_fclose(iodf);
-				gf_bs_del(bs);
-			}
-			gf_odf_desc_del((GF_Descriptor*)iod);
-		}
+		e = do_dump_iod();
+		if (e) goto err_exit;
 	}
 
 #if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 	if (split_duration || split_size || split_range_str) {
-		split_isomedia_file(file, split_duration, split_size, inName, interleaving_time, split_start, adjust_split_end, outName, tmpdir, seg_at_rap, split_range_str);
+		split_isomedia_file(file, split_duration, split_size, inName, interleaving_time, split_start, adjust_split_end, outName, seg_at_rap, split_range_str, fs_dump_flags);
+
 		/*never save file when splitting is desired*/
 		open_edit = GF_FALSE;
-		needSave = GF_FALSE;
+		do_save = GF_FALSE;
 	}
 #endif // !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 	if (track_dump_type) {
-		char szFile[GF_MAX_PATH+24];
-		GF_MediaExporter mdump;
-		for (i=0; i<nb_track_act; i++) {
-			TrackAction *tka = &tracks[i];
-			if (tka->act_type != TRAC_ACTION_RAW_EXTRACT) continue;
-			memset(&mdump, 0, sizeof(mdump));
-			mdump.file = file;
-			mdump.flags = tka->dump_type;
-			mdump.trackID = tka->trackID;
-			mdump.sample_num = tka->sample_num;
-			if (tka->out_name) {
-				mdump.out_name = tka->out_name;
-			} else if (outName) {
-				mdump.out_name = outName;
-				mdump.flags |= GF_EXPORT_MERGE;
-				/*don't infer extension on user-given filename*/
-				mdump.flags |= GF_EXPORT_NO_FILE_EXT;
-			} else if (mdump.trackID) {
-				sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
-				mdump.out_name = szFile;
-			} else {
-				sprintf(szFile, "%s_export", outfile);
-				mdump.out_name = szFile;
-			}
-			if (tka->trackID==(u32) -1) {
-				for (j=0; j<gf_isom_get_track_count(file); j++) {
-					mdump.trackID = gf_isom_get_track_id(file, j+1);
-					sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
-					mdump.out_name = szFile;
-					mdump.print_stats_graph = fs_dump_flags;
-					e = gf_media_export(&mdump);
-					if (e) goto err_exit;
-				}
-			} else {
-				mdump.print_stats_graph = fs_dump_flags;
-				e = gf_media_export(&mdump);
-				if (e) goto err_exit;
-			}
-		}
+		e = do_export_tracks();
+		if (e) goto err_exit;
 	} else if (do_saf) {
 		GF_MediaExporter mdump;
 		memset(&mdump, 0, sizeof(mdump));
@@ -5682,122 +6232,10 @@
 	}
 #endif
 
-	for (i=0; i<nb_meta_act; i++) {
-		u32 tk = 0;
-#ifndef GPAC_DISABLE_ISOM_WRITE
-		Bool self_ref;
-#endif
-		MetaAction *meta = &metas[i];
-
-		if (meta->trackID) tk = gf_isom_get_track_by_id(file, meta->trackID);
-
-		switch (meta->act_type) {
-#ifndef GPAC_DISABLE_ISOM_WRITE
-		case META_ACTION_SET_TYPE:
-			/*note: we don't handle file brand modification, this is an author stuff and cannot be guessed from meta type*/
-			e = gf_isom_set_meta_type(file, meta->root_meta, tk, meta->meta_4cc);
-			gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_ISO2, GF_TRUE);
-			needSave = GF_TRUE;
-			break;
-		case META_ACTION_ADD_ITEM:
-			self_ref = !stricmp(meta->szPath, "NULL") || !stricmp(meta->szPath, "this") || !stricmp(meta->szPath, "self");
-			e = gf_isom_add_meta_item(file, meta->root_meta, tk, self_ref, self_ref ? NULL : meta->szPath,
-			 meta->szName,
-			 meta->item_id,
-									 meta->item_type,
-			 meta->mime_type,
-			 meta->enc_type,
-			 meta->use_dref ? meta->szPath : NULL, NULL,
-			 meta->image_props);
-			if (meta->ref_type) {
-				e = gf_isom_meta_add_item_ref(file, meta->root_meta, tk, meta->item_id, meta->ref_item_id, meta->ref_type, NULL);
-			}
-			needSave = GF_TRUE;
-			break;
-		case META_ACTION_ADD_IMAGE_ITEM:
-		{
-			u32 old_tk_count = gf_isom_get_track_count(file);
-			GF_Fraction _frac = {0,0};
-			e = import_file(file, meta->szPath, 0, _frac, 0, NULL, NULL, 0);
-			if (e == GF_OK) {
-				u32 meta_type = gf_isom_get_meta_type(file, meta->root_meta, tk);
-				if (!meta_type) {
-					e = gf_isom_set_meta_type(file, meta->root_meta, tk, GF_META_ITEM_TYPE_PICT);
-				} else {
-					if (meta_type != GF_META_ITEM_TYPE_PICT) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Warning: file already has a root 'meta' box of type %s\n", gf_4cc_to_str(meta_type)));
-						e = GF_BAD_PARAM;
-					}
-				}
-				if (e == GF_OK) {
-					if (!meta->item_id) {
-						e = gf_isom_meta_get_next_item_id(file, meta->root_meta, tk, &meta->item_id);
-					}
-					if (e == GF_OK) {
-						e = gf_isom_iff_create_image_item_from_track(file, meta->root_meta, tk, 1,
-								meta->szName,
-								meta->item_id,
-								meta->image_props, NULL);
-						if (e == GF_OK && meta->primary) {
-							e = gf_isom_set_meta_primary_item(file, meta->root_meta, tk, meta->item_id);
-						}
-						if (e == GF_OK && meta->ref_type) {
-							e = gf_isom_meta_add_item_ref(file, meta->root_meta, tk, meta->item_id, meta->ref_item_id, meta->ref_type, NULL);
-						}
-					}
-				}
-			}
-			gf_isom_remove_track(file, old_tk_count+1);
-			needSave = GF_TRUE;
-		}
-			break;
-		case META_ACTION_REM_ITEM:
-			e = gf_isom_remove_meta_item(file, meta->root_meta, tk, meta->item_id);
-			needSave = GF_TRUE;
-			break;
-		case META_ACTION_SET_PRIMARY_ITEM:
-			e = gf_isom_set_meta_primary_item(file, meta->root_meta, tk, meta->item_id);
-			needSave = GF_TRUE;
-			break;
-		case META_ACTION_SET_XML:
-		case META_ACTION_SET_BINARY_XML:
-			e = gf_isom_set_meta_xml(file, meta->root_meta, tk, meta->szPath, NULL, 0, (meta->act_type==META_ACTION_SET_BINARY_XML) ? 1 : 0);
-			needSave = GF_TRUE;
-			break;
-		case META_ACTION_REM_XML:
-			if (gf_isom_get_meta_item_count(file, meta->root_meta, tk)) {
-				e = gf_isom_remove_meta_xml(file, meta->root_meta, tk);
-				needSave = GF_TRUE;
-			} else {
-				fprintf(stderr, "No meta box in input file\n");
-			}
-			break;
-		case META_ACTION_DUMP_ITEM:
-			if (gf_isom_get_meta_item_count(file, meta->root_meta, tk)) {
-				e = gf_isom_extract_meta_item(file, meta->root_meta, tk, meta->item_id, strlen(meta->szPath) ? meta->szPath : NULL);
-			} else {
-				fprintf(stderr, "No meta box in input file\n");
-			}
-			break;
-#endif // GPAC_DISABLE_ISOM_WRITE
+	e = do_meta_act();
+	if (e) goto err_exit;
 
-		case META_ACTION_DUMP_XML:
-			if (gf_isom_has_meta_xml(file, meta->root_meta, tk)) {
-				e = gf_isom_extract_meta_xml(file, meta->root_meta, tk, meta->szPath, NULL);
-			} else {
-				fprintf(stderr, "No meta box in input file\n");
-			}
-			break;
-		default:
-			break;
-		}
-		if (meta->image_props) {
-			gf_free(meta->image_props);
-			meta->image_props = NULL;
-		}
-		if (e) goto err_exit;
-	}
-	if (!open_edit && !needSave) {
+	if (!open_edit && !do_save) {
 		if (file) gf_isom_delete(file);
 		goto exit;
 	}
@@ -5807,89 +6245,59 @@
 	if (clean_groups) {
 		e = gf_isom_reset_switch_parameters(file);
 		if (e) goto err_exit;
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 	}
 
-	for (i=0; i<nb_tsel_acts; i++) {
-		switch (tsel_acts[i].act_type) {
-		case TSEL_ACTION_SET_PARAM:
-			e = gf_isom_set_track_switch_parameter(file,
-			 gf_isom_get_track_by_id(file, tsel_acts[i].trackID),
-			 tsel_acts[i].refTrackID ? gf_isom_get_track_by_id(file, tsel_acts[i].refTrackID) : 0,
-			 tsel_acts[i].is_switchGroup ? 1 : 0,
-			 &tsel_acts[i].switchGroupID,
-			 tsel_acts[i].criteria, tsel_acts[i].nb_criteria);
-			if (e == GF_BAD_PARAM) {
-				u32 alternateGroupID, nb_groups;
-				gf_isom_get_track_switch_group_count(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), &alternateGroupID, &nb_groups);
-				if (alternateGroupID)
-					fprintf(stderr, "Hint: for adding more tracks to group, using: -group-add -refTrack=ID1:[criteria:]trackID=ID2\n");
-				else
-					fprintf(stderr, "Hint: for creates a new grouping information, using -group-add -trackID=ID1:[criteria:]trackID=ID2\n");
-			}
-			if (e) goto err_exit;
-			needSave = GF_TRUE;
-			break;
-		case TSEL_ACTION_REMOVE_TSEL:
-			e = gf_isom_reset_track_switch_parameter(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), 0);
-			if (e) goto err_exit;
-			needSave = GF_TRUE;
-			break;
-		case TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP:
-			e = gf_isom_reset_track_switch_parameter(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), 1);
-			if (e) goto err_exit;
-			needSave = GF_TRUE;
-			break;
-		default:
-			break;
-		}
-	}
+
+	e = do_tsel_act();
+	if (e) goto err_exit;
 
 	if (remove_sys_tracks) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 		remove_systems_tracks(file);
 #endif
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 		if (conv_type < GF_ISOM_CONV_TYPE_ISMA_EX) conv_type = 0;
 	}
 	if (remove_root_od) {
 		gf_isom_remove_root_od(file);
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 	}
 #ifndef GPAC_DISABLE_ISOM_HINTING
 	if (remove_hint) {
 		for (i=0; i<gf_isom_get_track_count(file); i++) {
 			if (gf_isom_get_media_type(file, i+1) == GF_ISOM_MEDIA_HINT) {
-				fprintf(stderr, "Removing hint track ID %d\n", gf_isom_get_track_id(file, i+1));
+				M4_LOG(GF_LOG_INFO, ("Removing hint track ID %d\n", gf_isom_get_track_id(file, i+1)));
 				gf_isom_remove_track(file, i+1);
 				i--;
 			}
 		}
 		gf_isom_sdp_clean(file);
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 	}
 #endif // GPAC_DISABLE_ISOM_HINTING
 
 	if (timescale && (timescale != gf_isom_get_timescale(file))) {
 		gf_isom_set_timescale(file, timescale);
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 	}
 
 	if (!encode) {
 		if (!file) {
-			fprintf(stderr, "Nothing to do - exiting\n");
+			M4_LOG(GF_LOG_INFO, ("Nothing to do - exiting\n"));
 			goto exit;
 		}
 		if (outName) {
 			strcpy(outfile, outName);
 		} else {
+			const char *tmp_dir = gf_opts_get_key("core", "tmp");
 			char *rel_name = strrchr(inName, GF_PATH_SEPARATOR);
 			if (!rel_name) rel_name = strrchr(inName, '/');
 
 			strcpy(outfile, "");
-			if (tmpdir) {
-				strcpy(outfile, tmpdir);
-				if (!strchr("\\/", tmpdir[strlen(tmpdir)-1])) strcat(outfile, "/");
+			if (tmp_dir) {
+				strcpy(outfile, tmp_dir);
+				if (!strchr("\\/", tmp_dir[strlen(tmp_dir)-1])) strcat(outfile, "/");
 			}
 			if (!pack_file) strcat(outfile, "out_");
 			strcat(outfile, rel_name ? rel_name + 1 : inName);
@@ -5903,391 +6311,63 @@
 		}
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 		if ((conv_type == GF_ISOM_CONV_TYPE_ISMA) || (conv_type == GF_ISOM_CONV_TYPE_ISMA_EX)) {
-			fprintf(stderr, "Converting to ISMA Audio-Video MP4 file...\n");
+			M4_LOG(GF_LOG_INFO, ("Converting to ISMA Audio-Video MP4 file\n"));
 			/*keep ESIDs when doing ISMACryp*/
 			e = gf_media_make_isma(file, crypt ? 1 : 0, GF_FALSE, (conv_type==GF_ISOM_CONV_TYPE_ISMA_EX) ? 1 : 0);
 			if (e) goto err_exit;
-			needSave = GF_TRUE;
+			do_save = GF_TRUE;
 		}
 		if (conv_type == GF_ISOM_CONV_TYPE_3GPP) {
-			fprintf(stderr, "Converting to 3GP file...\n");
+			M4_LOG(GF_LOG_INFO, ("Converting to 3GP file\n"));
 			e = gf_media_make_3gpp(file);
 			if (e) goto err_exit;
-			needSave = GF_TRUE;
+			do_save = GF_TRUE;
 		}
 		if (conv_type == GF_ISOM_CONV_TYPE_PSP) {
-			fprintf(stderr, "Converting to PSP file...\n");
+			M4_LOG(GF_LOG_INFO, ("Converting to PSP file\n"));
 			e = gf_media_make_psp(file);
 			if (e) goto err_exit;
-			needSave = GF_TRUE;
+			do_save = GF_TRUE;
 		}
 		if (conv_type == GF_ISOM_CONV_TYPE_MOV) {
 			e = gf_media_check_qt_prores(file);
 			if (e) goto err_exit;
-			needSave = GF_TRUE;
+			do_save = GF_TRUE;
 			if (interleaving_time) interleaving_time = 0.5;
 		}
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 		if (conv_type == GF_ISOM_CONV_TYPE_IPOD) {
-			u32 ipod_major_brand = 0;
-			fprintf(stderr, "Setting up iTunes/iPod file...\n");
-
-			for (i=0; i<gf_isom_get_track_count(file); i++) {
-				u32 mType = gf_isom_get_media_type(file, i+1);
-				switch (mType) {
-				case GF_ISOM_MEDIA_VISUAL:
- case GF_ISOM_MEDIA_AUXV:
- case GF_ISOM_MEDIA_PICT:
-					ipod_major_brand = GF_ISOM_BRAND_M4V;
-					gf_isom_set_ipod_compatible(file, i+1);
-					break;
-				case GF_ISOM_MEDIA_AUDIO:
-					if (!ipod_major_brand) ipod_major_brand = GF_ISOM_BRAND_M4A;
-					else gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_M4A, GF_TRUE);
-					break;
-				case GF_ISOM_MEDIA_TEXT:
-					/*this is a text track track*/
-					if (gf_isom_get_media_subtype(file, i+1, 1) == GF_ISOM_SUBTYPE_TX3G) {
-						Bool is_chap = 0;
-						for (j=0; j<gf_isom_get_track_count(file); j++) {
-							s32 count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_CHAP);
-							if (count>0) {
-								u32 tk, k;
-								for (k=0; k<(u32) count; k++) {
-									gf_isom_get_reference(file, j+1, GF_ISOM_REF_CHAP, k+1, &tk);
-									if (tk==i+1) {
-										is_chap = 1;
-										break;
-									}
-								}
-								if (is_chap) break;
-							}
-							if (is_chap) break;
-						}
-						/*this is a subtitle track*/
-						if (!is_chap)
-							gf_isom_set_media_type(file, i+1, GF_ISOM_MEDIA_SUBT);
-					}
-					break;
-				}
-			}
-			gf_isom_set_brand_info(file, ipod_major_brand, 1);
-			gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_MP42, GF_TRUE);
-			needSave = GF_TRUE;
+			do_ipod_conv();
 		}
 
 	} else if (outName) {
 		strcpy(outfile, outName);
 	}
 
-	for (j=0; j<nb_track_act; j++) {
-		TrackAction *tka = &tracks[j];
-		u32 track = tka->trackID ? gf_isom_get_track_by_id(file, tka->trackID) : 0;
-
-		timescale = gf_isom_get_timescale(file);
-		switch (tka->act_type) {
-		case TRAC_ACTION_REM_TRACK:
-			e = gf_isom_remove_track(file, track);
-			if (e) {
-				fprintf(stderr, "Error Removing track ID %d: %s\n", tka->trackID, gf_error_to_string(e));
-			} else {
-				fprintf(stderr, "Removing track ID %d\n", tka->trackID);
-			}
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_SET_LANGUAGE:
-			for (i=0; i<gf_isom_get_track_count(file); i++) {
-				if (track && (track != i+1)) continue;
-				e = gf_isom_set_media_language(file, i+1, tka->lang);
-				if (e) goto err_exit;
-				needSave = GF_TRUE;
-			}
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_SET_KIND:
-			for (i=0; i<gf_isom_get_track_count(file); i++) {
-				if (track && (track != i+1)) continue;
-				e = gf_isom_add_track_kind(file, i+1, tka->kind_scheme, tka->kind_value);
-				if (e) goto err_exit;
-				needSave = GF_TRUE;
-			}
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_REM_KIND:
-			for (i=0; i<gf_isom_get_track_count(file); i++) {
-				if (track && (track != i+1)) continue;
-				e = gf_isom_remove_track_kind(file, i+1, tka->kind_scheme, tka->kind_value);
-				if (e) goto err_exit;
-				needSave = GF_TRUE;
-			}
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_SET_DELAY:
-			if (tka->delay_ms) {
-				u64 tk_dur;
-
-				gf_isom_remove_edits(file, track);
-				tk_dur = gf_isom_get_track_duration(file, track);
-				if (gf_isom_get_edits_count(file, track))
-					needSave = GF_TRUE;
-				if (tka->delay_ms>0) {
-					gf_isom_append_edit(file, track, (timescale*tka->delay_ms)/1000, 0, GF_ISOM_EDIT_EMPTY);
-					gf_isom_append_edit(file, track, tk_dur, 0, GF_ISOM_EDIT_NORMAL);
-					needSave = GF_TRUE;
-				} else {
-					u64 to_skip = (timescale*(-tka->delay_ms))/1000;
-					if (to_skip<tk_dur) {
-						u64 media_time = (-tka->delay_ms)*gf_isom_get_media_timescale(file, track) / 1000;
-						gf_isom_append_edit(file, track, tk_dur-to_skip, media_time, GF_ISOM_EDIT_NORMAL);
-						needSave = GF_TRUE;
-					} else {
-						fprintf(stderr, "Warning: request negative delay longer than track duration - ignoring\n");
-					}
-				}
-			} else if (gf_isom_get_edits_count(file, track)) {
-				gf_isom_remove_edits(file, track);
-				needSave = GF_TRUE;
-			}
-			break;
-		case TRAC_ACTION_SET_KMS_URI:
-			for (i=0; i<gf_isom_get_track_count(file); i++) {
-				if (track && (track != i+1)) continue;
-				if (!gf_isom_is_media_encrypted(file, i+1, 1)) continue;
-				if (!gf_isom_is_ismacryp_media(file, i+1, 1)) continue;
-				e = gf_isom_change_ismacryp_protection(file, i+1, 1, NULL, (char *) tka->kms);
-				if (e) goto err_exit;
-				needSave = GF_TRUE;
-			}
-			break;
-		case TRAC_ACTION_SET_ID:
-			if (!tka->trackID && (gf_isom_get_track_count(file) == 1)) {
-				fprintf(stderr, "Warning: track id is not specified, but file has only one track - assume that you want to change id for this track\n");
-				track = 1;
-			}
-			if (track) {
-				u32 newTrack;
-				newTrack = gf_isom_get_track_by_id(file, tka->newTrackID);
-				if (newTrack != 0) {
-					fprintf(stderr, "Error: Cannot set track id with value %d because a track already exists - ignoring", tka->newTrackID);
-				} else {
-					e = gf_isom_set_track_id(file, track, tka->newTrackID);
-					needSave = GF_TRUE;
-				}
-			} else {
-				fprintf(stderr, "Error: Cannot change id for track %d because it does not exist - ignoring", tka->trackID);
-			}
-			break;
-		case TRAC_ACTION_SWAP_ID:
-			if (track) {
-				u32 tk1, tk2;
-				tk1 = gf_isom_get_track_by_id(file, tka->trackID);
-				tk2 = gf_isom_get_track_by_id(file, tka->newTrackID);
-				if (!tk1 || !tk2) {
-					fprintf(stderr, "Error: Cannot swap track IDs because not existing - ignoring");
-				} else {
-					e = gf_isom_set_track_id(file, tk2, 0);
-					if (!e) e = gf_isom_set_track_id(file, tk1, tka->newTrackID);
-					if (!e) e = gf_isom_set_track_id(file, tk2, tka->trackID);
-					needSave = GF_TRUE;
-				}
-			} else {
-				fprintf(stderr, "Error: Cannot change id for track %d because it does not exist - ignoring", tka->trackID);
-			}
-			break;
-		case TRAC_ACTION_SET_PAR:
-			e = gf_media_change_par(file, track, tka->par_num, tka->par_den, tka->force_par, tka->rewrite_bs);
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_SET_CLAP:
-			e = gf_isom_set_clean_aperture(file, track, 1, tka->clap_wnum, tka->clap_wden, tka->clap_hnum, tka->clap_hden, tka->clap_honum, tka->clap_hoden, tka->clap_vonum, tka->clap_voden);
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_SET_MX:
-			e = gf_isom_set_track_matrix(file, track, tka->mx);
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_SET_HANDLER_NAME:
-			e = gf_isom_set_handler_name(file, track, tka->hdl_name);
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_ENABLE:
-			if (!gf_isom_is_track_enabled(file, track)) {
-				e = gf_isom_set_track_enabled(file, track, GF_TRUE);
-				needSave = GF_TRUE;
-			}
-			break;
-		case TRAC_ACTION_DISABLE:
-			if (gf_isom_is_track_enabled(file, track)) {
-				e = gf_isom_set_track_enabled(file, track, GF_FALSE);
-				needSave = GF_TRUE;
-			}
-			break;
-		case TRAC_ACTION_REFERENCE:
-			e = gf_isom_set_track_reference(file, track, GF_4CC(tka->lang[0], tka->lang[1], tka->lang[2], tka->lang[3]), (u32) tka->delay_ms);
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_REM_NON_RAP:
-			fprintf(stderr, "Removing non-rap samples from track %d\n", tka->trackID);
-			e = gf_media_remove_non_rap(file, track, GF_FALSE);
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_REM_NON_REFS:
-			fprintf(stderr, "Removing non-reference samples from track %d\n", tka->trackID);
-			e = gf_media_remove_non_rap(file, track, GF_TRUE);
-			needSave = GF_TRUE;
-			break;
-		case TRAC_ACTION_SET_UDTA:
-			fprintf(stderr, "Assigning udta box\n");
-			e = set_file_udta(file, track, tka->udta_type, tka->src_name, tka->sample_num ? GF_TRUE : GF_FALSE);
-			if (e) goto err_exit;
-			needSave = GF_TRUE;
-			break;
-		default:
-			break;
-		}
-		if (e) goto err_exit;
-	}
+	e = do_track_act();
+	if (e) goto err_exit;
 
 	if (itunes_tags) {
-		char *tags = itunes_tags;
-
-		while (tags) {
-			char *val;
-			char *sep = gf_url_colon_suffix(tags);
-			u32 tlen, itag = 0;
-			if (sep) {
-				while (sep) {
-					for (itag=0; itag<nb_itunes_tags; itag++) {
-						if (!strnicmp(sep+1, itags[itag].name, strlen(itags[itag].name))) break;
-					}
-					if (itag<nb_itunes_tags) {
-						break;
-					}
-					sep = gf_url_colon_suffix(sep+1);
-				}
-				if (sep) sep[0] = 0;
-			}
-			for (itag=0; itag<nb_itunes_tags; itag++) {
-				if (!strnicmp(tags, itags[itag].name, strlen(itags[itag].name))) {
-					break;
-				}
-			}
-			if (itag==nb_itunes_tags) {
-				fprintf(stderr, "Invalid iTune tag format \"%s\" - ignoring\n", tags);
-				tags = NULL;
-				continue;
-			}
-			itag = itags[itag].code;
-
-			val = strchr(tags, '=');
-			if (!val) {
-				fprintf(stderr, "Invalid iTune tag format \"%s\" (expecting '=') - ignoring\n", tags);
-				tags = NULL;
-				continue;
-			}
-			val ++;
-			if ((val[0]==':') || !val[0] || !stricmp(val, "NULL") ) val = NULL;
-
-			tlen = val ? (u32) strlen(val) : 0;
-			switch (itag) {
-			case GF_ISOM_ITUNE_COVER_ART:
-			{
-				u8 *d=NULL;
-				e = GF_OK;
-				if (val) {
-					char *ext;
-					e = gf_file_load_data(val, (u8 **) &d, &tlen);
-
-					ext = strrchr(val, '.');
-					if (!stricmp(ext, ".png")) tlen |= 0x80000000;
-				}
-				if (!e)
-					e = gf_isom_apple_set_tag(file, GF_ISOM_ITUNE_COVER_ART, d, tlen);
-
-				if (d) gf_free(d);
-			}
-			break;
-			case GF_ISOM_ITUNE_TEMPO:
-				gf_isom_apple_set_tag(file, itag, NULL, val ? atoi(val) : 0);
-				break;
-			case GF_ISOM_ITUNE_GENRE:
-			{
-				u8 _v = gf_id3_get_genre_tag(val);
-				if (_v) {
-					gf_isom_apple_set_tag(file, itag, NULL, _v);
-				} else {
-					if (!val) val="";
-					gf_isom_apple_set_tag(file, itag, (u8 *) val, (u32) strlen(val) );
-				}
-			}
-			break;
-			case GF_ISOM_ITUNE_DISK:
-			case GF_ISOM_ITUNE_TRACKNUMBER:
-			{
-				u32 n, t;
-				char _t[8];
-				n = t = 0;
-				if (val) {
-					memset(_t, 0, sizeof(char) * 8);
-					tlen = (itag == GF_ISOM_ITUNE_DISK) ? 6 : 8;
-					if (sscanf(val, "%u/%u", &n, &t) == 2) {
-						_t[3] = n;
-						_t[2] = n >> 8;
-						_t[5] = t;
-						_t[4] = t >> 8;
-					}
-					else if (sscanf(val, "%u", &n) == 1) {
-						_t[3] = n;
-						_t[2] = n >> 8;
-					}
-					else tlen = 0;
-				}
-				if (!val || tlen) gf_isom_apple_set_tag(file, itag, val ? (u8 *)_t : NULL, tlen);
-			}
-			break;
-			case GF_ISOM_ITUNE_GAPLESS:
-			case GF_ISOM_ITUNE_COMPILATION:
-			{
-				u8 _t[1];
-				if (val && !stricmp(val, "yes")) _t[0] = 1;
-				else _t[0] = 0;
-				gf_isom_apple_set_tag(file, itag, _t, 1);
-			}
-			break;
-			default:
-				gf_isom_apple_set_tag(file, itag, (u8 *)val, tlen);
-				break;
-			}
-			needSave = GF_TRUE;
-
-			if (sep) {
-				sep[0] = ':';
-				tags = sep+1;
-			} else {
-				tags = NULL;
-			}
-		}
-	}
-
-	if (movie_time) {
-		gf_isom_set_creation_time(file, movie_time);
-		for (i=0; i<gf_isom_get_track_count(file); i++) {
-			gf_isom_set_track_creation_time(file, i+1, movie_time);
-		}
-		needSave = GF_TRUE;
+		e = do_itunes_tag();
+		if (e) goto err_exit;
 	}
 
 	if (cprt) {
 		e = gf_isom_set_copyright(file, "und", cprt);
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 		if (e) goto err_exit;
 	}
-	if (chap_file) {
+	if (chap_file || chap_file_qt) {
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
+		Bool chap_qt = GF_FALSE;
+		if (chap_file_qt) {
+			chap_file = chap_file_qt;
+			chap_qt = GF_TRUE;
+		}
 		e = gf_media_import_chapters(file, chap_file, import_fps, chap_qt);
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 #else
-		fprintf(stderr, "Warning: GPAC compiled without Media Import, chapters can't be imported\n");
+		M4_LOG(GF_LOG_WARNING, ("Warning: GPAC compiled without Media Import, chapters can't be imported\n"));
 		e = GF_NOT_SUPPORTED;
 #endif
 		if (e) goto err_exit;
@@ -6295,34 +6375,29 @@
 
 	if (major_brand) {
 		gf_isom_set_brand_info(file, major_brand, minor_version);
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 	}
 	for (i=0; i<nb_alt_brand_add; i++) {
 		gf_isom_modify_alternate_brand(file, brand_add[i], GF_TRUE);
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 	}
 	for (i=0; i<nb_alt_brand_rem; i++) {
 		gf_isom_modify_alternate_brand(file, brand_rem[i], GF_FALSE);
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 	}
 	if (box_patch_filename) {
 		e = gf_isom_apply_box_patch(file, box_patch_trackID, box_patch_filename, GF_FALSE);
 		if (e) {
-			fprintf(stderr, "Failed to apply box patch %s: %s\n", box_patch_filename, gf_error_to_string(e) );
+			M4_LOG(GF_LOG_ERROR, ("Failed to apply box patch %s: %s\n", box_patch_filename, gf_error_to_string(e) ));
 			goto err_exit;
 		}
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 	}
 
 #ifndef GPAC_DISABLE_CRYPTO
 	if (crypt) {
-		if (!drm_file) {
-			fprintf(stderr, "Missing DRM file location - usage '-%s drm_file input_file\n", (crypt==1) ? "crypt" : "decrypt");
-			e = GF_BAD_PARAM;
-			goto err_exit;
-		}
-		if (get_file_type_by_ext(inName) != GF_FILE_TYPE_ISO_MEDIA) {
-			fprintf(stderr, "MP4Box can crypt only ISOMedia File\n");
+		if (!drm_file && (crypt==1) ) {
+			M4_LOG(GF_LOG_ERROR, ("Missing DRM file location - usage '-%s drm_file input_file\n", (crypt==1) ? "crypt" : "decrypt"));
 			e = GF_BAD_PARAM;
 			goto err_exit;
 		}
@@ -6340,9 +6415,9 @@
 			}
 		}
 		if (e) goto err_exit;
-		needSave = outName ? GF_FALSE : GF_TRUE;
+		do_save = outName ? GF_FALSE : GF_TRUE;
 
-		if (!Frag && !HintIt && !FullInter && !force_co64) {
+		if (!do_frag && !do_hint && !full_interleave && !force_co64) {
 			char szName[GF_MAX_PATH];
 			strcpy(szName, gf_isom_get_filename(file) );
 			gf_isom_delete(file);
@@ -6357,15 +6432,19 @@
 #endif /*GPAC_DISABLE_CRYPTO*/
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-	if (Frag) {
+	if (do_frag) {
 		if (!interleaving_time) interleaving_time = DEFAULT_INTERLEAVING_IN_SEC;
-		if (HintIt) fprintf(stderr, "Warning: cannot hint and fragment - ignoring hint\n");
-		fprintf(stderr, "Fragmenting file (%.3f seconds fragments)\n", interleaving_time);
+		if (do_hint) M4_LOG(GF_LOG_WARNING, ("Warning: cannot hint and fragment - ignoring hint\n"));
+		M4_LOG(GF_LOG_INFO, ("Fragmenting file (%.3f seconds fragments)\n", interleaving_time));
 		e = gf_media_fragment_file(file, outfile, interleaving_time, use_mfra);
-		if (e) fprintf(stderr, "Error while fragmenting file: %s\n", gf_error_to_string(e));
+		if (e) M4_LOG(GF_LOG_ERROR, ("Error while fragmenting file: %s\n", gf_error_to_string(e)));
 		if (!e && !outName) {
-			if (gf_file_exists(inName) && gf_file_delete(inName)) fprintf(stderr, "Error removing file %s\n", inName);
-			else if (gf_file_move(outfile, inName)) fprintf(stderr, "Error renaming file %s to %s\n", outfile, inName);
+			if (gf_file_exists(inName) && gf_file_delete(inName)) {
+				M4_LOG(GF_LOG_INFO, ("Error removing file %s\n", inName));
+			}
+			else if (gf_file_move(outfile, inName)) {
+				M4_LOG(GF_LOG_INFO, ("Error renaming file %s to %s\n", outfile, inName));
+			}
 		}
 		if (e) goto err_exit;
 		gf_isom_delete(file);
@@ -6374,101 +6453,95 @@
 #endif
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	if (HintIt) {
+	if (do_hint) {
 		if (force_ocr) SetupClockReferences(file);
-		fprintf(stderr, "Hinting file with Path-MTU %d Bytes\n", MTUSize);
 		MTUSize -= 12;
-		e = HintFile(file, MTUSize, max_ptime, rtp_rate, hint_flags, HintCopy, HintInter, regular_iod, single_group, hint_no_offset);
+		e = HintFile(file, MTUSize, max_ptime, rtp_rate, hint_flags, HintCopy, hint_interleave, regular_iod, single_group, hint_no_offset);
 		if (e) goto err_exit;
-		needSave = GF_TRUE;
+		do_save = GF_TRUE;
 		if (print_sdp) dump_isom_sdp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 	}
 #endif
 
 #if !defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_SENG)
-	for (i=0; i<nb_sdp_ex; i++) {
-		if (sdp_lines[i].trackID) {
-			u32 track = gf_isom_get_track_by_id(file, sdp_lines[i].trackID);
-			if (gf_isom_get_media_type(file, track)!=GF_ISOM_MEDIA_HINT) {
-				s32 ref_count;
-				u32 k, count = gf_isom_get_track_count(file);
-				for (j=0; j<count; j++) {
-					if (gf_isom_get_media_type(file, j+1)!=GF_ISOM_MEDIA_HINT) continue;
-					ref_count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_HINT);
-					if (ref_count<0) continue;
-					for (k=0; k<(u32) ref_count; k++) {
-						u32 refTk;
-						if (gf_isom_get_reference(file, j+1, GF_ISOM_REF_HINT, k+1, &refTk)) continue;
-						if (refTk==track) {
-							track = j+1;
-							j=count;
-							break;
-						}
-					}
-				}
-			}
-			gf_isom_sdp_add_track_line(file, track, sdp_lines[i].line);
-			needSave = GF_TRUE;
-		} else {
-			gf_isom_sdp_add_line(file, sdp_lines[i].line);
-			needSave = GF_TRUE;
-		}
-	}
+	set_sdp_ext();
 #endif /*!defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_SENG)*/
 
+	if (force_co64)
+		gf_isom_force_64bit_chunk_offset(file, GF_TRUE);
+
+	if (compress_moov)
+		gf_isom_enable_compression(file, GF_ISOM_COMP_ALL, (compress_moov==2) ? GF_ISOM_COMP_WRAP_FTYPE : 0);
+
+	if (no_inplace)
+		gf_isom_disable_inplace_rewrite(file);
+
+	if (moov_pading)
+		gf_isom_set_inplace_padding(file, moov_pading);
+
+	if (outName) {
+		gf_isom_set_final_name(file, outfile);
+	} else if (!encode && !force_new && !gf_isom_is_inplace_rewrite(file)) {
+		gf_isom_set_final_name(file, outfile);
+	}
+
+	Bool is_inplace = gf_isom_is_inplace_rewrite(file);
+
+
 	/*full interleave (sample-based) if just hinted*/
-	if (FullInter) {
+	if (full_interleave) {
 		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_TIGHT);
 	} else if (do_flat) {
 		e = gf_isom_set_storage_mode(file, (do_flat==1) ? GF_ISOM_STORE_FLAT : GF_ISOM_STORE_STREAMABLE);
-		needSave = GF_TRUE;
-	} else {
+		do_save = GF_TRUE;
+	}
+	//do not set storage mode unless inplace rewrite is disabled , either by user or due to operations on file
+	else if (!is_inplace) {
 		e = gf_isom_make_interleave(file, interleaving_time);
 		if (!e && old_interleave) e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_INTERLEAVED);
 	}
-	if (force_co64)
-		gf_isom_force_64bit_chunk_offset(file, GF_TRUE);
-
-	if (compress_moov)
-		gf_isom_enable_compression(file, GF_ISO_COMP_MOOV, GF_FALSE);
 
 	if (e) goto err_exit;
 
-	if (!encode && !force_new) gf_isom_set_final_name(file, outfile);
-	if (needSave) {
+
+	if (do_save) {
 
 		if (!gf_sys_is_quiet()) {
 			if (outName) {
-				gf_isom_set_final_name(file, outfile);
 			} else if (encode || pack_file) {
-				fprintf(stderr, "Saving to %s: ", gf_isom_get_filename(file) );
+				M4_LOG(GF_LOG_INFO, ("Saving to %s: ", gf_isom_get_filename(file) ));
 			} else {
-				fprintf(stderr, "Saving %s: ", inName);
+				M4_LOG(GF_LOG_INFO, ("Saving %s: ", inName));
+			}
+			if (is_inplace) {
+				M4_LOG(GF_LOG_INFO, ("In-place rewrite\n"));
+			} else if (do_hint && full_interleave) {
+				M4_LOG(GF_LOG_INFO, ("Hinted file - Full Interleaving\n"));
+			} else if (full_interleave) {
+				M4_LOG(GF_LOG_INFO, ("Full Interleaving\n"));
+			} else if ((force_new==2) && interleaving_time) {
+				M4_LOG(GF_LOG_INFO, ("Fast-start interleaved storage\n"));
+			} else if (do_flat || !interleaving_time) {
+				M4_LOG(GF_LOG_INFO, ("Flat storage\n"));
+			} else {
+				M4_LOG(GF_LOG_INFO, ("%.3f secs Interleaving%s\n", interleaving_time, old_interleave ? " - no drift control" : ""));
 			}
-			if (HintIt && FullInter) fprintf(stderr, "Hinted file - Full Interleaving\n");
-			else if (FullInter) fprintf(stderr, "Full Interleaving\n");
-			else if ((force_new==2) && interleaving_time) fprintf(stderr, "Fast-start interleaved storage\n");
-			else if (do_flat || !interleaving_time) fprintf(stderr, "Flat storage\n");
-			else fprintf(stderr, "%.3f secs Interleaving%s\n", interleaving_time, old_interleave ? " - no drift control" : "");
-		} else {
-			if (outName)
-				gf_isom_set_final_name(file, outfile);
 		}
 
 		e = gf_isom_close(file);
 		file = NULL;
 
-		if (!e && !outName && !encode && !force_new && !pack_file) {
+		if (!e && !outName && !encode && !force_new && !pack_file && !is_inplace) {
 			if (gf_file_exists(inName)) {
 				e = gf_file_delete(inName);
 				if (e) {
-					fprintf(stderr, "Error removing file %s\n", inName);
+					M4_LOG(GF_LOG_ERROR, ("Error removing file %s\n", inName));
 				}
 			}
-			
+
 			e = gf_file_move(outfile, inName);
 			if (e) {
-				fprintf(stderr, "Error renaming file %s to %s\n", outfile, inName);
+				M4_LOG(GF_LOG_ERROR, ("Error renaming file %s to %s\n", outfile, inName));
 			}
 		}
 	} else {
@@ -6476,7 +6549,7 @@
 	}
 
 	if (e) {
-		fprintf(stderr, "Error: %s\n", gf_error_to_string(e));
+		M4_LOG(GF_LOG_ERROR, ("Error: %s\n", gf_error_to_string(e)));
 		goto err_exit;
 	}
 	goto exit;
@@ -6484,7 +6557,7 @@
 #else
 	/*close libgpac*/
 	gf_isom_delete(file);
-	fprintf(stderr, "Error: Read-only version of MP4Box.\n");
+	M4_LOG(GF_LOG_ERROR, ("Error: Read-only version of MP4Box.\n"));
 	return mp4box_cleanup(1);
 #endif //GPAC_DISABLE_ISOM_WRITE
 
@@ -6492,7 +6565,7 @@
 err_exit:
 	/*close libgpac*/
 	if (file) gf_isom_delete(file);
-	fprintf(stderr, "\n\tError: %s\n", gf_error_to_string(e));
+	M4_LOG(GF_LOG_ERROR, ("\n\tError: %s\n", gf_error_to_string(e)));
 	return mp4box_cleanup(1);
 
 exit:

gpac-1.0.1.tar.gz/applications/mp4box/mp4box.h -> gpac-2.0.0.tar.gz/applications/mp4box/mp4box.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / mp4box application
@@ -37,6 +37,14 @@
 #include <gpac/scene_manager.h>
 #endif
 
+#ifndef GPAC_DISABLE_LOG
+#define M4_LOG(_a, _b)	GF_LOG(_a, GF_LOG_APP, _b)
+#else
+void mp4box_log(const char *fmt, ...);
+
+#define M4_LOG(_a, _b) mp4box_log _b
+#endif
+
 
 typedef enum {
 	GF_FILE_TYPE_NOT_SUPPORTED	= 0,
@@ -53,26 +61,30 @@
 void convert_file_info(char *inName, GF_ISOTrackID trackID);
 #endif
 
-GF_Err parse_high_dynamc_range_xml_desc(GF_ISOFile* movie, char* file_name);
+Bool mp4box_check_isom_fileopt(char *opt);
+
+GF_Err parse_high_dynamc_range_xml_desc(GF_ISOFile* movie, u32 track, char* file_name);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
-GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, GF_FilterSession *fsess, char **mux_args_if_first_pass, u32 tk_idx);
+GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, GF_FilterSession *fsess, char **mux_args_if_first_pass, char **mux_sid_if_first_pass, u32 tk_idx);
 #else
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, GF_FilterSession *fsess, Bool second_pass) {
 	return GF_NOT_SUPPORTED;
 }
 #endif
-GF_Err split_isomedia_file(GF_ISOFile *mp4, Double split_dur, u64 split_size_kb, char *inName, Double interleaving_time, Double chunk_start, Bool adjust_split_end, char *outName, const char *tmpdir, Bool force_rap_split, const char *split_range_str);
-GF_Err cat_isomedia_file(GF_ISOFile *mp4, char *fileName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command, Bool is_pl);
+GF_Err split_isomedia_file(GF_ISOFile *mp4, Double split_dur, u64 split_size_kb, char *inName, Double interleaving_time, Double chunk_start, u32 adjust_split_end, char *outName, Bool force_rap_split, const char *split_range_str, u32 fs_dump_flags);
+GF_Err cat_isomedia_file(GF_ISOFile *mp4, char *fileName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, Bool force_cat, Bool align_timelines, Bool allow_add_in_command, Bool is_pl);
+
+GF_Err apply_edits(GF_ISOFile *dest, u32 track, char *edits);
 
 #if !defined(GPAC_DISABLE_SCENE_ENCODER)
 GF_Err EncodeFile(char *in, GF_ISOFile *mp4, GF_SMEncodeOptions *opts, FILE *logs);
-GF_Err EncodeFileChunk(char *chunkFile, char *bifs, char *inputContext, char *outputContext, const char *tmpdir);
+GF_Err EncodeFileChunk(char *chunkFile, char *bifs, char *inputContext, char *outputContext);
 #endif
 
-GF_ISOFile *package_file(char *file_name, char *fcc, const char *tmpdir, Bool make_wgt);
+GF_ISOFile *package_file(char *file_name, char *fcc, Bool make_wgt);
 
 #endif
 
@@ -80,7 +92,7 @@
 GF_Err dump_isom_chapters(GF_ISOFile *file, char *inName, Bool is_final_name, Bool dump_ogg);
 GF_Err dump_isom_udta(GF_ISOFile *file, char *inName, Bool is_final_name, u32 dump_udta_type, u32 dump_udta_track);
 
-GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array);
+GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array, Bool is_string);
 u32 id3_get_genre_tag(const char *name);
 
 /*in filedump.c*/
@@ -91,9 +103,9 @@
 #ifndef GPAC_DISABLE_SCENE_STATS
 void dump_isom_scene_stats(char *file, char *inName, Bool is_final_name, u32 stat_level);
 #endif
-void PrintNode(const char *name, u32 graph_type);
-void PrintBuiltInNodes(u32 graph_type, Bool dump_all);
-void PrintBuiltInBoxes(Bool do_cov);
+u32 PrintNode(const char *name, u32 graph_type);
+u32 PrintBuiltInNodes(char *arg_val, u32 dump_type);
+u32 PrintBuiltInBoxes(char *arg_val, u32 do_cov);
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 GF_Err dump_isom_xml(GF_ISOFile *file, char *inName, Bool is_final_name, Bool do_track_dump, Bool merge_vtt_cues, Bool skip_init, Bool skip_samples);
@@ -108,18 +120,20 @@
 #endif
 
 void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name, Bool skip_offset);
-void dump_isom_nal(GF_ISOFile *file, GF_ISOTrackID trackID, char *inName, Bool is_final_name, u32 dump_flags);
+GF_Err dump_isom_nal(GF_ISOFile *file, GF_ISOTrackID trackID, char *inName, Bool is_final_name, u32 dump_flags);
 void dump_isom_saps(GF_ISOFile *file, GF_ISOTrackID trackID, u32 dump_saps_mode, char *inName, Bool is_final_name);
 
+void dump_isom_chunks(GF_ISOFile *file, char *inName, Bool is_final_name);
+
 #ifndef GPAC_DISABLE_ISOM_DUMP
 void dump_isom_ismacryp(GF_ISOFile *file, char *inName, Bool is_final_name);
 void dump_isom_timed_text(GF_ISOFile *file, GF_ISOTrackID trackID, char *inName, Bool is_final_name, Bool is_convert, GF_TextDumpType dump_type);
 #endif /*GPAC_DISABLE_ISOM_DUMP*/
 
 
-void DumpTrackInfo(GF_ISOFile *file, GF_ISOTrackID trackID, Bool full_dump, Bool is_track_num);
-void DumpMovieInfo(GF_ISOFile *file);
-void PrintLanguages();
+void DumpTrackInfo(GF_ISOFile *file, GF_ISOTrackID trackID, Bool full_dump, Bool is_track_num, Bool dump_m4sys);
+void DumpMovieInfo(GF_ISOFile *file, Bool full_dump);
+u32 PrintLanguages(char *argv, u32 opt);
 
 #ifndef GPAC_DISABLE_MPEG2TS
 void dump_mpeg2_ts(char *mpeg2ts_file, char *pes_out_name, Bool prog_num);
@@ -139,7 +153,40 @@
 
 GF_Err rip_mpd(const char *mpd, const char *dst_file);
 
-GF_Err cat_playlist(GF_ISOFile *dest, char *playlistName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
+GF_Err cat_playlist(GF_ISOFile *dest, char *playlistName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
+
+
+u32 parse_track_dump(char *arg, u32 dump_type);
+u32 parse_track_action(char *arg, u32 act_type);
+u32 parse_sdp_ext(char *arg_val, u32 param);
+u32 parse_help(char *arg_val, u32 opt);
+u32 parse_gendoc(char *name, u32 opt);
+u32 parse_comp_box(char *arg_val, u32 opt);
+u32 parse_dnal(char *arg_val, u32 opt);
+u32 parse_dsap(char *arg_val, u32 opt);
+u32 parse_bs_switch(char *arg_val, u32 opt);
+u32 parse_cp_loc(char *arg_val, u32 opt);
+u32 parse_pssh(char *arg_val, u32 opt);
+u32 parse_sdtp(char *arg_val, u32 opt);
+u32 parse_dash_profile(char *arg_val, u32 opt);
+u32 parse_rap_ref(char *arg_val, u32 opt);
+u32 parse_store_mode(char *arg_val, u32 opt);
+u32 parse_base_url(char *arg_val, u32 opt);
+u32 parse_multi_rtp(char *arg_val, u32 opt);
+u32 parse_senc_param(char *arg_val, u32 opt);
+u32 parse_cryp(char *arg_val, u32 opt);
+u32 parse_fps(char *arg_val, u32 opt);
+u32 parse_split(char *arg_val, u32 opt);
+u32 parse_brand(char *b, u32 opt);
+u32 parse_mpegu(char *arg_val, u32 opt);
+u32 parse_file_info(char *arg_val, u32 opt);
+u32 parse_boxpatch(char *arg_val, u32 opt);
+u32 parse_aviraw(char *arg_val, u32 opt);
+u32 parse_dump_udta(char *code, u32 opt);
+u32 parse_dump_ts(char *arg_val, u32 opt);
+u32 parse_ttxt(char *arg_val, u32 opt);
+u32 parse_dashlive(char *arg, char *arg_val, u32 opt);
+u32 parse_compress(char *arg_val, u32 opt);
 
 #endif // _MP4BOX_H

gpac-2.0.0.tar.gz/applications/mp4box_android/.gitignore Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/build.gradle Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/AndroidManifest.xml Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/java Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/java/com Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/java/com/gpac Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/java/com/gpac/mp4box Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/java/com/gpac/mp4box/mp4box.java Added

@@ -0,0 +1,90 @@
+package com.gpac.mp4box;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.gpac.mp4box.R;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
+import android.util.Log;
+import android.view.View;
+
+
+
+public class mp4box extends Activity {
+	private mp4terminal myTerminal;
+
+ /** Called when the activity is first created. */
+ @Override
+
+
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.main);
+ myTerminal = new mp4terminal();
+ errors = loadAllLibraries();
+ System.out.println( "hello world java" );
+ final Button button = (Button) findViewById(R.id.OkButton);
+
+ button.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ 	EditText oCommandLine = (EditText) findViewById(R.id.CommandLineEdit );
+ 	CharSequence sCommandLine = oCommandLine.getText();
+ 	myTerminal.run( sCommandLine.toString() );
+ 	//showKeyboard( true );
+ }
+ });
+
+ }
+
+
+ private final static String LOG_LIB = "com.gpac.mp4box.libloader";
+
+ private static Map<String, Throwable> errors = null;
+
+ synchronized static Map<String, Throwable> loadAllLibraries()
+ {
+ 	if( errors != null)
+ 		return errors;
+ StringBuilder sb = new StringBuilder();
+ // final String[] toLoad = { "GLESv1_CM", "dl", "log",//$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
+ // "jpeg", "javaenv", //$NON-NLS-1$ //$NON-NLS-2$
+ // "mad", "editline", "ft2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ // "js_osmo", "openjpeg", "png", "z", //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$
+ // "ffmpeg", "faad", "gpac", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ // "stdc++", "mp4box" }; // //$NON-NLS-1$ //$NON-NLS-2$
+ final String[] toLoad = {"avutil", "swresample", "swscale", "avcodec", "avformat", "avfilter", "avdevice",
+ "editline", "faad", "ft2",
+ "jpegdroid", "js_osmo", "mad", "openjpeg",
+ "png", "stlport_shared",
+ "z", "gpac", "mp4box"};
+ HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
+ for (String s : toLoad) {
+ try {
+ String msg = "Loading library " + s + "...";
+ sb.append(msg);
+ Log.i(LOG_LIB, msg);
+ System.loadLibrary(s);
+ } catch (UnsatisfiedLinkError e) {
+ sb.append("Failed to load " + s + ", error=" + e.getLocalizedMessage() + " :: "
+ + e.getClass().getSimpleName() + "\n"); //$NON-NLS-1$
+ exceptions.put(s, e);
+ Log.e(LOG_LIB, "Failed to load library : " + s + " due to link error " + e.getLocalizedMessage(), e);
+ } catch (SecurityException e) {
+ exceptions.put(s, e);
+ Log.e(LOG_LIB, "Failed to load library : " + s + " due to security error " + e.getLocalizedMessage(), e);
+ } catch (Throwable e) {
+ exceptions.put(s, e);
+ Log.e(LOG_LIB, "Failed to load library : " + s + " due to Runtime error " + e.getLocalizedMessage(), e);
+ }
+ }
+
+ errors = Collections.unmodifiableMap(exceptions);
+ return errors;
+}
+
+}
\ No newline at end of file

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/java/com/gpac/mp4box/mp4terminal.java Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/jni Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/jni/wrapper.c Added

@@ -0,0 +1,102 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <android/log.h>
+#include <jni.h>
+#include "stdlib.h"
+#include "stdio.h"
+#include "string.h"
+
+
+#define jniTAG "WRAPPER_JNI"
+
+#define jniLOGV(X) __android_log_print(ANDROID_LOG_VERBOSE, jniTAG, X)
+#define jniLOGI(X) __android_log_print(ANDROID_LOG_INFO, jniTAG, X)
+#define jniLOGE(X) __android_log_print(ANDROID_LOG_ERROR, jniTAG, X)
+
+/*#define CAST_HANDLE(wr) jclass c = env->GetObjectClass(obj);\
+ if (!c) return;\
+ jfieldID fid = env->GetFieldID(c, "handle", "J");\
+ if (!fid){\
+ __android_log_print(ANDROID_LOG_ERROR, jniTAG, "No Field ID, ERROR");\
+ return;\
+ }\
+ jlong h = env->GetLongField(obj, fid);
+ //CNativeWrapper* wr = (CNativeWrapper*) h;*/
+
+char ** ConvertCommandLine( const char* sCommand, int* iNbArg );
+int mp4boxMain(int argc, char **argv);
+
+JNIEXPORT void JNICALL Java_com_gpac_mp4box_mp4terminal_run(JNIEnv * env, jobject obj, jstring sCommand)
+{
+	//CAST_HANDLE(wr);
+	jniLOGV("mp4terminal::start");
+	/*if (!wr)
+	{
+		jniLOGV("mp4terminal::end : aborted");
+	 return;
+	}*/
+	jboolean isCopy;
+	const char * sOriginalCommand = (*env)->GetStringUTFChars(env, sCommand, &isCopy);
+
+	jniLOGV("mp4terminal::command get back ok");
+	//jniLOGV(sOriginalCommand);
+
+	int i = 0;
+	char** sConvertedCommandLine;
+	sConvertedCommandLine = ConvertCommandLine( sOriginalCommand, &i );
+
+	jniLOGV("Convert command line done");
+	FILE* ferr = freopen( "/mnt/sdcard/stderrout.txt", "w", stderr );
+
+	FILE* fout = freopen( "/mnt/sdcard/stdout.txt", "w", stdout );
+
+	mp4boxMain(i, sConvertedCommandLine);
+
+	(*env)->ReleaseStringUTFChars(env, sCommand, sOriginalCommand);
+	jniLOGV("mp4terminal::end");
+	fclose(ferr);
+	fclose(fout);
+}
+
+char ** ConvertCommandLine( const char* sCommand, int* iNbArg )
+{
+	int iLength = strlen( sCommand );
+	int iArgNumber = 1;
+	int i = 0;
+	char** pReturn;
+	int iPreviousPos = 0;
+	int k = 1;//begin at character position 1 as the 0 position will be held by the process name , i.e. mp4box
+	int l = 0;
+
+	for ( i = 0; i < iLength ; i++ )
+	{
+		if( sCommand[i] == ' ' )
+		{
+			iArgNumber++;
+		}
+	}
+	iArgNumber++; // last argument will not be detected as it is not followed by a space character
+	pReturn = (char**)malloc(sizeof(char*)*iArgNumber);
+	pReturn[0] = (char*)malloc(sizeof( char) * ( 7 ));
+	strcpy( pReturn[0], "MP4Box" );//just a place holder , will never be read.
+	pReturn[0][6] = '\0';
+
+	for ( l = 0; l <= iLength ; l++ )
+	{
+		if( sCommand[l] == ' ' || l == ( iLength ) )
+		{
+			pReturn[k] = (char*)malloc(sizeof( char) * ( l - iPreviousPos + 1));
+			strncpy( pReturn[k], sCommand + iPreviousPos, l - iPreviousPos );
+			pReturn[k][l-iPreviousPos] = '\0';
+			iPreviousPos = l + 1;
+			k++;
+		}
+	}
+	*iNbArg = iArgNumber;
+	return pReturn;
+}
+#ifdef __cplusplus
+}
+#endif

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/drawable-hdpi Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/drawable-hdpi/icon.png Changed

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/drawable-ldpi Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/drawable-ldpi/icon.png Changed

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/drawable-mdpi Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/drawable-mdpi/icon.png Changed

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/layout Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/layout/main.xml Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/values Added

gpac-2.0.0.tar.gz/applications/mp4box_android/app/src/main/res/values/strings.xml Added

gpac-2.0.0.tar.gz/applications/mp4box_android/build.gradle Added

gpac-2.0.0.tar.gz/applications/mp4box_android/gradle Added

gpac-2.0.0.tar.gz/applications/mp4box_android/gradle/wrapper Added

gpac-2.0.0.tar.gz/applications/mp4box_android/gradle/wrapper/gradle-wrapper.jar Added

gpac-2.0.0.tar.gz/applications/mp4box_android/gradle/wrapper/gradle-wrapper.properties Added

gpac-2.0.0.tar.gz/applications/mp4box_android/gradlew Added

@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> $.*$$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gpac-2.0.0.tar.gz/applications/mp4box_android/gradlew.bat Added

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

gpac-2.0.0.tar.gz/applications/mp4box_android/settings.gradle Added

gpac-1.0.1.tar.gz/applications/mp4client/Makefile -> gpac-2.0.0.tar.gz/applications/mp4client/Makefile Changed

gpac-1.0.1.tar.gz/applications/mp4client/main.c -> gpac-2.0.0.tar.gz/applications/mp4client/main.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2020
+ *			Copyright (c) Telecom ParisTech 2005-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / command-line client
@@ -286,6 +286,9 @@
 			"# General\n"
 			"The player accepts any URL supported by GPAC.\n"
 			"Specific URLs shortcuts are available, see [GPAC Compositor (gpac -h compositor)](compositor)\n"
+			"\n"
+			"Warning: MP4Client is being deprecated, use `gpac -play URL`, `gpac -gui URL` or `gpac -mp4c URL`.\n"
+			"\n"
 			"Version: %s\n"
 			"%s\n"
 			"For more info on GPAC configuration, use `gpac ` [-h](GPAC) `bin`  \n  \n"
@@ -1250,7 +1253,7 @@
 
 			fprintf(helpout, ".SH EXAMPLES\n.TP\nBasic and advanced examples are available at https://wiki.gpac.io/mp4client\n");
 			fprintf(helpout, ".SH MORE\n.LP\nAuthors: GPAC developers, see git repo history (-log)\n"
-			".br\nFor bug reports, feature requests, more information and source code, visit http://github.com/gpac/gpac\n"
+			".br\nFor bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac\n"
 			".br\nbuild: %s\n"
 			".br\nCopyright: %s\n.br\n"
 			".SH SEE ALSO\n"
@@ -1391,7 +1394,7 @@
 		TCHAR buffer[1024];
 		DWORD res = GetCurrentDirectory(1024, buffer);
 		buffer[res] = 0;
-		opt = gf_opts_get_key("core", "mod-dirs");
+		opt = gf_opts_get_key("core", "module-dir");
 		if (strstr(opt, buffer)) {
 			gui_mode=1;
 		} else {
@@ -1494,26 +1497,12 @@
 			strcpy(the_url, url_arg);
 		}
 		ext = strrchr(the_url, '.');
-		if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
+		//only local playlist - maybe we could remove and control through flist ?
+		if (ext && !strncmp("http", the_url, 4) && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
 			e = GF_OK;
 			fprintf(stderr, "Opening Playlist %s\n", the_url);
 
 			strcpy(pl_path, the_url);
-			/*this is not clean, we need to have a plugin handle playlist for ourselves*/
-			if (!strncmp("http:", the_url, 5)) {
-#ifdef FILTER_FIXME
-				GF_DownloadSession *sess = gf_dm_sess_new(term->downloader, the_url, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
-				if (sess) {
-					e = gf_dm_sess_process(sess);
-					if (!e) {
-						strncpy(the_url, gf_dm_sess_get_cache_name(sess), sizeof(the_url) - 1);
-						the_url[sizeof(the_url) - 1] = 0;
-					}
-					gf_dm_sess_del(sess);
-				}
-#endif
-			}
-
 			playlist = e ? NULL : gf_fopen(the_url, "rt");
 			readonly_playlist = 1;
 			if (playlist) {
@@ -2610,7 +2599,7 @@
 		fprintf(stderr, "\tBitrate over last second: %d kbps\n\tMax bitrate over one second: %d kbps\n\tAverage Decoding Time %.2f us %d max)\n\tTotal decoded frames %d\n",
 		        (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames);
 	}
-	if (odi.protection) fprintf(stderr, "Encrypted Media%s\n", (odi.protection==2) ? " NOT UNLOCKED" : "");
+	if (odi.protection) fprintf(stderr, "Encrypted Media scheme %s\n", gf_4cc_to_str(odi.protection) );
 
 	fprintf(stderr, "\nStream ID %d - %s - Clock ID %d\n", odi.pid_id, gf_stream_type_name(odi.od_type), odi.ocr_id);
 //	if (esd->dependsOnESID) fprintf(stderr, "\tDepends on Stream ID %d for decoding\n", esd->dependsOnESID);

gpac-1.0.1.tar.gz/applications/mp4client/mp4client.rc -> gpac-2.0.0.tar.gz/applications/mp4client/mp4client.rc Changed

gpac-1.0.1.tar.gz/applications/osmo4_android_studio/app/src/main/assets/configuration.xml -> gpac-2.0.0.tar.gz/applications/osmo4_android_studio/app/src/main/assets/configuration.xml Changed

@@ -120,10 +120,10 @@
 			Specifies the user prefered language as expressed in ISO 639-1. This is used to select streams in case of alternate content in an audio object. 
 		</key>		
 		<key name="DrawLateFrames" type="" default="yes" usage="basic">
-			If set, late frames will still be drawn. If not set, the late frames are droped (or executed for systems decoders) untill the decoder output is back in sync. This is by default on to keep better testing heavy content or slow renderers, but should be set to off when needing a better sync or monitoring skipped frames. 
+			If set, late frames will still be drawn. If not set, the late frames are droped (or executed for systems decoders) until the decoder output is back in sync. This is by default on to keep better testing heavy content or slow renderers, but should be set to off when needing a better sync or monitoring skipped frames. 
 		</key>
 		<key name="ForceSingleClock" type="" default="no" usage="basic">
-			One big problem with MP4 files is that the notion of "duration" has been unclear for a long time, and most content available (audio-video files) specifiy a wrong BIFS duration. In such a case the movie cannot be controled/seeked into. Another problem with ISMA streaming is that BIFS/OD don't use the same clock as audio/video, thus seeking the main timeline does not seek AV media. Setting the ForceSingleClock will handle both cases by using a single timeline for all media streams and setting the duration to the one of the longest stream
+			One big problem with MP4 files is that the notion of "duration" has been unclear for a long time, and most content available (audio-video files) specify a wrong BIFS duration. In such a case the movie cannot be controled/seeked into. Another problem with ISMA streaming is that BIFS/OD don't use the same clock as audio/video, thus seeking the main timeline does not seek AV media. Setting the ForceSingleClock will handle both cases by using a single timeline for all media streams and setting the duration to the one of the longest stream
 		</key>
 		<key name="ThreadingPolicy" type="enum('Free', 'Single', 'Multi')" default="Free" usage="basic">
 			Specifies how media decoders are to be threaded. "Free" lets decoders decide of their threading, "Single" means that all decoders are managed in a single thread performing scheduling and priority handling and "Multi" means that each decoder runs in its own thread.

gpac-1.0.1.tar.gz/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GpacCallback.java -> gpac-2.0.0.tar.gz/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GpacCallback.java Changed

@@ -157,61 +157,54 @@
         GF_LOG_HTTP(4),
         /** Log message from the RTP/RTCP stack (TS info) and packet structure & hinting (debug) */
         GF_LOG_RTP(5),
-        /** Log message from authoring subsystem (file manip, import/export) */
-        GF_LOG_AUTHOR(6),
-        /** Log message from the sync layer of the terminal */
-        GF_LOG_SYNC(7),
         /** Log message from a codec */
-        GF_LOG_CODEC(8),
+        GF_LOG_CODEC(6),
         /** Log message from any XML parser (context loading, etc) */
-        GF_LOG_PARSER(9),
+        GF_LOG_PARSER(7),
         /** Log message from the terminal/compositor, indicating media object state */
-        GF_LOG_MEDIA(10),
+        GF_LOG_MEDIA(8),
         /** Log message from the scene graph/scene manager (handling of nodes and attribute modif, DOM core) */
-        GF_LOG_SCENE(11),
+        GF_LOG_SCENE(9),
         /** Log message from the scripting engine */
-        GF_LOG_SCRIPT(12),
+        GF_LOG_SCRIPT(10),
         /** Log message from event handling */
-        GF_LOG_INTERACT(13),
+        GF_LOG_INTERACT(11),
         /** Log message from compositor */
-        GF_LOG_COMPOSE(14),
+        GF_LOG_COMPOSE(12),
+        /** Log message from compositor */
+        GF_LOG_COMPTIME(13),
         /** Log for video object cache */
-        GF_LOG_CACHE(15),
+        GF_LOG_CACHE(14),
         /** Log message from multimedia I/O devices (audio/video input/output, ...) */
-        GF_LOG_MMIO(16),
+        GF_LOG_MMIO(15),
         /** Log for runtime info (times, memory, CPU usage) */
-        GF_LOG_RTI(17),
-        /** Log for SMIL timing and animation */
-        GF_LOG_SMIL(18),
+        GF_LOG_RTI(16),
         /** Log for memory tracker */
-        GF_LOG_MEMORY(19),
+        GF_LOG_MEMORY(17),
         /** Log for audio compositor */
-        GF_LOG_AUDIO(20),
+        GF_LOG_AUDIO(18),
         /** generic Log for modules */
-        GF_LOG_MODULE(21),
-        /**
-         * Log for GPAC mutexes and threads (Very verbose at DEBUG)
-         * 
-         */
-        GF_LOG_MUTEX(22),
+        GF_LOG_MODULE(19),
+        /** Log for GPAC mutexes and threads (Very verbose at DEBUG)*/
+        GF_LOG_MUTEX(20),
         /*! Log for threads and condition */
-		GF_LOG_CONDITION(23),
+		GF_LOG_CONDITION(21),
 		/*! Log for all HTTP streaming */
-		GF_LOG_DASH(24),
+		GF_LOG_DASH(22),
 		/*! Log for all filter engine */
-		GF_LOG_FILTER(25),
+		GF_LOG_FILTER(23),
 		/*! Log for all filter scheduler */
-		GF_LOG_SCHEDULER(26),
-		/*! Log for ATSC3 demux */
-		GF_LOG_ATSC(27),
+		GF_LOG_SCHEDULER(24),
+		/*! Log for ROUTE demux */
+		GF_LOG_ROUTE(25),
 		/*! Log for all messages coming from GF_Terminal or script alert()*/
-		GF_LOG_CONSOLE(28),
+		GF_LOG_CONSOLE(26),
 		/*! Log for all messages coming the application, not used by libgpac or the modules*/
-		GF_LOG_APP(29),
+		GF_LOG_APP(27),
         /**
          * Unknown Log subsystem
          */
-        GF_LOG_UNKNOWN(30);
+        GF_LOG_UNKNOWN(28);
 
         int value;
 
@@ -290,7 +283,7 @@
     // * @param siteURL The URL of site requiring authorization
     // * @param userName The User Name (may be null if never set)
     // * @param password The password (may be null if never set)
-    // * @return A String formated as username:password
+    // * @return A String formatted as username:password
     // */
     // public String onGPACAuthorization(String siteURL, String userName, String password);

gpac-1.0.1.tar.gz/applications/osmo4_android_studio/app/src/main/jni/wrapper.cpp -> gpac-2.0.0.tar.gz/applications/osmo4_android_studio/app/src/main/jni/wrapper.cpp Changed

@@ -480,11 +480,8 @@
 		case GF_LOG_RTP:
 			tag="GF_LOG_RTP";
 			break;
-		case GF_LOG_AUTHOR:
-			tag="GF_LOG_AUTHOR";
-			break;
-		case GF_LOG_SYNC:
-			tag="GF_LOG_SYNC";
+		case GF_LOG_COMPTIME:
+			tag="GF_LOG_COMPTIME";
 			break;
 		case GF_LOG_CODEC:
 			tag="GF_LOG_CODEC";
@@ -516,9 +513,6 @@
 		case GF_LOG_RTI:
 			tag="GF_LOG_RTI";
 			break;
-		case GF_LOG_SMIL:
-			tag="GF_LOG_SMIL";
-			break;
 		case GF_LOG_MEMORY:
 			tag="GF_LOG_MEMORY";
 			break;
@@ -537,15 +531,21 @@
 		case GF_LOG_DASH:
 			tag="GF_LOG_DASH";
 			break;
+		case GF_LOG_FILTER:
+			tag="GF_LOG_FILTER";
+			break;
+		case GF_LOG_SCHEDULER:
+			tag="GF_LOG_SCHEDULER";
+			break;
+		case GF_LOG_ROUTE:
+			tag="GF_LOG_ROUTE";
+			break;
 		case GF_LOG_CONSOLE:
 			tag="GF_LOG_CONSOLE";
 			break;
 		case GF_LOG_APP:
 			tag="GF_LOG_APP";
 			break;
-		case GF_LOG_SCHEDULER:
-			tag="GF_LOG_SCHEDULER";
-			break;
 		default:
 			snprintf(unknTag, 32, "GPAC_UNKNOWN[%d]", lm);
 			tag = unknTag;
@@ -609,7 +609,7 @@
 			break;
 		case GF_EVENT_PROGRESS:
 		{
-			const char * szTitle;;
+			const char * szTitle;
 			if (evt->progress.progress_type==0)
 				szTitle = "Buffering";
 			else if (evt->progress.progress_type==1)

gpac-1.0.1.tar.gz/applications/osmo4_ios/osmo4ios-Info.plist -> gpac-2.0.0.tar.gz/applications/osmo4_ios/osmo4ios-Info.plist Changed

gpac-1.0.1.tar.gz/applications/testapps/atscdmx/main.c -> gpac-2.0.0.tar.gz/applications/testapps/atscdmx/main.c Changed

gpac-1.0.1.tar.gz/applications/testapps/broadcaster/RTP_serv_generator.h -> gpac-2.0.0.tar.gz/applications/testapps/broadcaster/RTP_serv_generator.h Changed

gpac-1.0.1.tar.gz/applications/testapps/broadcaster/RTP_serv_packetizer.c -> gpac-2.0.0.tar.gz/applications/testapps/broadcaster/RTP_serv_packetizer.c Changed

@@ -13,21 +13,21 @@
 
 void OnNewPacket(void *cbk, GF_RTPHeader *header)
 {
-	((PNC_CallbackData *)cbk)->formatedPacketLength = 0;
+	((PNC_CallbackData *)cbk)->formattedPacketLength = 0;
 }
 
 void OnPacketDone(void *cbk, GF_RTPHeader *header)
 {
 	PNC_CallbackData *data = (PNC_CallbackData *)cbk;
 	dprintf(DEBUG_RTP_serv_packetizer, "RTP Packet done\n");
-	PNC_SendRTP(data, ((PNC_CallbackData *)cbk)->formatedPacket, ((PNC_CallbackData *)cbk)->formatedPacketLength);
-	((PNC_CallbackData *)cbk)->formatedPacketLength = 0;
+	PNC_SendRTP(data, ((PNC_CallbackData *)cbk)->formattedPacket, ((PNC_CallbackData *)cbk)->formattedPacketLength);
+	((PNC_CallbackData *)cbk)->formattedPacketLength = 0;
 }
 
 void OnData(void *cbk, char *data, u32 data_size, Bool is_head)
 {
-	memcpy(((PNC_CallbackData *)cbk)->formatedPacket+((PNC_CallbackData *)cbk)->formatedPacketLength, data, data_size);
-	((PNC_CallbackData *)cbk)->formatedPacketLength += data_size;
+	memcpy(((PNC_CallbackData *)cbk)->formattedPacket+((PNC_CallbackData *)cbk)->formattedPacketLength, data, data_size);
+	((PNC_CallbackData *)cbk)->formattedPacketLength += data_size;
 }
 
 void PNC_InitPacketiser(PNC_CallbackData * data, char *sdp_fmt, unsigned short mtu_size)
@@ -61,13 +61,13 @@
 	p->rtp_header.SSRC=rand();
 	data->hdr=& p->rtp_header;
 	data->rtpBuilder=p;
-	data->formatedPacket = gf_malloc(MAX_PACKET_SIZE);
-	data->formatedPacketLength = 0;
+	data->formattedPacket = gf_malloc(MAX_PACKET_SIZE);
+	data->formattedPacketLength = 0;
 }
 
 void PNC_ClosePacketizer(PNC_CallbackData *data)
 {
-	gf_free(data->formatedPacket);
+	gf_free(data->formattedPacket);
 	gf_rtp_builder_del(data->rtpBuilder);
 }

gpac-1.0.1.tar.gz/applications/testapps/hevcbench/main.c -> gpac-2.0.0.tar.gz/applications/testapps/hevcbench/main.c Changed

gpac-1.0.1.tar.gz/applications/testapps/udptsseg/Makefile -> gpac-2.0.0.tar.gz/applications/testapps/udptsseg/Makefile Changed

gpac-1.0.1.tar.gz/applications/testapps/udptsseg/main.c -> gpac-2.0.0.tar.gz/applications/testapps/udptsseg/main.c Changed

gpac-1.0.1.tar.gz/build/android/jni/Application.mk -> gpac-2.0.0.tar.gz/build/android/jni/Application.mk Changed

gpac-1.0.1.tar.gz/build/android/jni/common.mk -> gpac-2.0.0.tar.gz/build/android/jni/common.mk Changed

gpac-1.0.1.tar.gz/build/android/jni/gpac_build_android -> gpac-2.0.0.tar.gz/build/android/jni/gpac_build_android Changed

@@ -38,7 +38,7 @@
   SDK=1
   export PATH="$(echo $i | cut -d"=" -f2)/tools:$PATH"
   export ANDROID_HOME="$(echo $i | cut -d"=" -f2)/"
-  
+
 fi
 
 #! Check for the JDK path
@@ -76,14 +76,14 @@
 then
   echo "The JAVA_HOME environment variable must be set if you build without Android studio"
   echo "Please refer to https://github.com/gpac/gpac/commit/705e199c8eadf35774520206d7f7cf1a043c0539"
-  
+
 fi
 
 if [ -z $ANDROID_HOME ]
 then
   echo "The ANDROID_HOME environment variable must be set if you build without Android studio"
   echo "Please refer to https://github.com/gpac/gpac/commit/705e199c8eadf35774520206d7f7cf1a043c0539"
- 
+
 fi
 
 echo -e "\n $PATH"
@@ -153,10 +153,10 @@
 echo "[OK] success module for Osmo4."
 
 
-LIBS_DIR="$BASEPATH/applications/mp4box_android/libs"
+LIBS_DIR="$BASEPATH/applications/mp4box_android/app/src/main/libs"
 mkdir -p $LIBS_DIR
 echo "Copying libs to libs dir $LIBS_DIR ..."
-for i in $(find . $ -name '*.so' $ -a $ -name "*ft2*" -o -name "*edit*" -o -name "*libgpac.so*" -o -name "*jpeg*" -o -name "*js_osmo*" -o -name "*mp4box*" -o -name "*openjpeg*" -o -name "*png*" -o -name "*libz.*" $ )
+for i in $(find . $ -name '*.so' $ )
 do
 	echo " Copy $i"
 	TMP_DIR=$(dirname $i)
@@ -179,12 +179,12 @@
 done
 echo "[OK] success extra lib for Osmo4."
 
-LIBS_DIR="$BASEPATH/applications/mp4box_android/libs"
+LIBS_DIR="$BASEPATH/applications/mp4box_android/app/src/main/libs"
 mkdir -p $LIBS_DIR
 cd "$BASEPATH/extra_lib/lib/android"
 echo "Copying all extra libs to $LIBS_DIR ..."
 
-for i in $(find . $ -name '*.so' $ -a $ -name "*ft2*" -o -name "*edit*" -o -name "*libgpac.so*" -o -name "*jpeg*" -o -name "*js_osmo*" -o -name "*mp4box*" -o -name "*openjpeg*" -o -name "*png*" -o -name "*libz.*" $ )
+for i in $(find . $ -name '*.so' $ )
 do
 	echo " Copy $i"
 	TMP_DIR=$(dirname $i)
@@ -196,29 +196,40 @@
 ASSETS_DIR="$BASEPATH/applications/osmo4_android_studio/app/src/main/assets/"
 mkdir -p $ASSETS_DIR
 
-echo "Copying gui folder to $ASSETS_DIR ..."
+echo "Copying shared resources (GUI, scripts, shaders...) to $ASSETS_DIR ..."
 cp -R "$BASEPATH/share/gui" $ASSETS_DIR
-echo "[OK] success GUI for Osmo4."
-
-echo "Copying shaders folder to $ASSETS_DIR ..."
 cp -R "$BASEPATH/share/shaders" $ASSETS_DIR
-echo "[OK] success Shader Folder for Osmo4."
+cp -R "$BASEPATH/share/scripts" $ASSETS_DIR
+cp -R "$BASEPATH/share/res" $ASSETS_DIR
+echo "[OK] success shared resources for Osmo4."
 
 if [ $ $SDK -eq 1 $ -a $ $JDK -eq 1 $ ]
 then
+
+	TAG="$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )"
+
 	echo "Building osmo4 apk"
 	cd $BASEPATH/applications/osmo4_android_studio/
 	./gradlew assembleDebug
 	cd -
-	if [ -f $BASEPATH/osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-rev$version.apk ]
+	if [ -f $BASEPATH/osmo4-$TAG-rev$version.apk ]
 	then
-	echo -e "\nOld Osmo4.apk found. Removing it ..." 
-	rm $BASEPATH/osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-rev$version.apk
-	fi  
-	
-	cp $BASEPATH/applications/osmo4_android_studio/app/build/outputs/apk/app-debug.apk $BASEPATH/osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-rev$version.apk
+	echo -e "\nOld Osmo4.apk found. Removing it ..."
+	rm $BASEPATH/osmo4-$TAG-rev$version.apk
+	fi
+
+	cp $BASEPATH/applications/osmo4_android_studio/app/build/outputs/apk/app-debug.apk $BASEPATH/osmo4-$TAG-rev$version.apk
 	echo "[OK] success Building osmo4 apk"
+
+	echo "Building mp4box apk"
+	cd $BASEPATH/applications/mp4box_android/
+	./gradlew assembleDebug
+	cd -
+
+	# uncomment to copy apk to public build dir
+	# rm -f $BASEPATH/mp4box-$TAG-rev$version.apk
+	# cp $BASEPATH/applications/mp4box_android/app/build/outputs/apk/app-debug.apk $BASEPATH/mp4box-$TAG-rev$version.apk
+	echo "[OK] success Building mp4box apk"
 else
 	echo "Run project with Android studio to generate APK"
 fi
-

gpac-1.0.1.tar.gz/build/android/jni/libgpac/Android.mk -> gpac-2.0.0.tar.gz/build/android/jni/libgpac/Android.mk Changed

@@ -17,17 +17,18 @@
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/faad
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/ffmpeg_android/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/openjpeg
++LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/openssl_android/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../modules
 
 LOCAL_LDLIBS    += -L$(LOCAL_PATH)/../../../../extra_lib/lib/android/$(TARGET_ARCH_ABI)
 LOCAL_LDLIBS    += -lGLESv2 -ldl
-LOCAL_LDLIBS    += -lft2 -ljpegdroid -lopenjpeg -lpng -lfaad -lmad -lz
+LOCAL_LDLIBS    += -lft2 -ljpegdroid -lopenjpeg -lpng -lfaad -lmad -lnghttp2 -lz -lssl -lcrypto
 
 #ffmpeg
 LOCAL_LDLIBS    += -lavcodec -lavformat -lswresample -lavfilter -lavutil -lavdevice -lswscale
 
 #mediacodec - removed  ljavaenv from original settings
-LOCAL_LDLIBS    += -llog -ldl -lOpenMAXAL -lmediandk -landroid -lGLESv2
+LOCAL_LDLIBS    += -llog -lOpenMAXAL -lmediandk -landroid
 
 #LOCAL_SHARED_LIBRARIES    += -L$(LOCAL_PATH)/../../../../extra_lib/lib/android/$(TARGET_ARCH_ABI)
 #LOCAL_SHARED_LIBRARIES    += -lGLESv2 -ldl
@@ -40,6 +41,8 @@
 LOCAL_CFLAGS += -DNO_MALLINFO
 LOCAL_CFLAGS += -DGPAC_CONFIG_ANDROID
 LOCAL_CFLAGS += -DGPAC_DISABLE_REMOTERY
+#for now QJS libc is disabled on android
+LOCAL_CFLAGS += -DGPAC_DISABLE_QJS_LIBC
 
 #LOCAL_CFLAGS += -DGPAC_FIXED_POINT
 
@@ -150,6 +153,8 @@
 	../../../../src/filter_core/filter_register.c \
 	../../../../src/filter_core/filter_session.c \
 	../../../../src/filter_core/filter_session_js.c \
+	../../../../src/filters/bs_agg.c \
+	../../../../src/filters/bs_split.c \
 	../../../../src/filters/bsrw.c \
 	../../../../src/filters/compose.c \
 	../../../../src/filters/dasher.c \
@@ -196,7 +201,7 @@
 	../../../../src/filters/filelist.c \
 	../../../../src/filters/hevcmerge.c \
 	../../../../src/filters/hevcsplit.c \
-	../../../../src/filters/in_atsc.c \
+	../../../../src/filters/in_route.c \
 	../../../../src/filters/in_dvb4linux.c \
 	../../../../src/filters/in_file.c \
 	../../../../src/filters/in_http.c \
@@ -207,6 +212,7 @@
 	../../../../src/filters/in_rtp_stream.c \
 	../../../../src/filters/in_sock.c \
 	../../../../src/filters/inspect.c \
+	../../../../src/filters/io_fcryp.c \
 	../../../../src/filters/isoffin_load.c \
 	../../../../src/filters/isoffin_read.c \
 	../../../../src/filters/isoffin_read_ch.c \
@@ -221,6 +227,7 @@
 	../../../../src/filters/out_audio.c \
 	../../../../src/filters/out_file.c \
 	../../../../src/filters/out_http.c \
+	../../../../src/filters/out_route.c \
 	../../../../src/filters/out_rtp.c \
 	../../../../src/filters/out_rtsp.c \
 	../../../../src/filters/out_sock.c \
@@ -232,6 +239,7 @@
 	../../../../src/filters/reframe_h263.c \
 	../../../../src/filters/reframe_img.c \
 	../../../../src/filters/reframe_latm.c \
+	../../../../src/filters/reframe_mhas.c \
 	../../../../src/filters/reframe_mp3.c \
 	../../../../src/filters/reframe_mpgvid.c \
 	../../../../src/filters/reframe_nalu.c \
@@ -239,14 +247,18 @@
 	../../../../src/filters/reframe_qcp.c \
 	../../../../src/filters/reframe_rawpcm.c \
 	../../../../src/filters/reframe_rawvid.c \
+	../../../../src/filters/reframe_truehd.c \
 	../../../../src/filters/reframer.c \
 	../../../../src/filters/resample_audio.c \
+	../../../../src/filters/restamp.c \
 	../../../../src/filters/rewind.c \
 	../../../../src/filters/rewrite_adts.c \
+	../../../../src/filters/rewrite_mhas.c \
 	../../../../src/filters/rewrite_mp4v.c \
 	../../../../src/filters/rewrite_nalu.c \
 	../../../../src/filters/rewrite_obu.c \
 	../../../../src/filters/tileagg.c \
+	../../../../src/filters/tilesplit.c \
 	../../../../src/filters/tssplit.c \
 	../../../../src/filters/unit_test_filter.c \
 	../../../../src/filters/vcrop.c \
@@ -306,7 +318,7 @@
 	../../../../src/laser/lsr_enc.c \
 	../../../../src/laser/lsr_tables.c \
 	../../../../src/media_tools/ait.c \
-	../../../../src/media_tools/atsc_dmx.c \
+	../../../../src/media_tools/route_dmx.c \
 	../../../../src/media_tools/avilib.c \
 	../../../../src/media_tools/av_parsers.c \
 	../../../../src/media_tools/crypt_tools.c \
@@ -347,6 +359,7 @@
 	../../../../src/quickjs/libregexp.c \
 	../../../../src/quickjs/libunicode.c \
 	../../../../src/quickjs/quickjs.c \
+	../../../../src/quickjs/quickjs-libc.c \
 	../../../../src/scenegraph/base_scenegraph.c \
 	../../../../src/scenegraph/commands.c \
 	../../../../src/scenegraph/dom_events.c \

gpac-1.0.1.tar.gz/build/android/jni/libgpac/config.h -> gpac-2.0.0.tar.gz/build/android/jni/libgpac/config.h Changed

gpac-1.0.1.tar.gz/build/android/jni/mp4box/Android.mk -> gpac-2.0.0.tar.gz/build/android/jni/mp4box/Android.mk Changed

gpac-1.0.1.tar.gz/build/android/jni/mp4box/Application.mk -> gpac-2.0.0.tar.gz/build/android/jni/mp4box/Application.mk Changed

gpac-1.0.1.tar.gz/build/msvc14/dec_openhevc.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/dec_openhevc.vcxproj Changed

@@ -131,6 +131,7 @@
 </Link>
 <Manifest>
 <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
 </Manifest>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -176,6 +177,7 @@
 </Link>
 <Manifest>
 <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
 </Manifest>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -225,6 +227,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
@@ -268,6 +273,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\modules\filter_export.cpp" />

gpac-1.0.1.tar.gz/build/msvc14/dx_hw.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/dx_hw.vcxproj Changed

@@ -132,6 +132,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
@@ -175,6 +178,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 <Midl>
@@ -220,6 +226,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 <Midl>
@@ -262,6 +271,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemGroup>
 <None Include="..\..\modules\dx_hw\collide.cur" />

gpac-1.0.1.tar.gz/build/msvc14/ft_font.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/ft_font.vcxproj Changed

@@ -129,6 +129,7 @@
 </Link>
 <Manifest>
 <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
 </Manifest>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -174,6 +175,7 @@
 </Link>
 <Manifest>
 <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
 </Manifest>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -223,6 +225,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
@@ -266,6 +271,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\modules\ft_font\ft_font.c" />

gpac-1.0.1.tar.gz/build/msvc14/gpac.sln -> gpac-2.0.0.tar.gz/build/msvc14/gpac.sln Changed

gpac-1.0.1.tar.gz/build/msvc14/gpac.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/gpac.vcxproj Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <ItemGroup Label="ProjectConfigurations">
 <ProjectConfiguration Include="Debug|Win32">
@@ -158,6 +158,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 <Midl>
@@ -198,6 +201,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 <Midl>
@@ -240,6 +246,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">
 <Midl>
@@ -317,6 +326,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">
 <Midl>
@@ -328,7 +340,7 @@
 <Optimization>Full</Optimization>
 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <StringPooling>true</StringPooling>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -373,9 +385,18 @@
 </ClCompile>
 </ItemGroup>
 <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
+ <ProjectReference Include="libgpac_dll.vcxproj" Condition="'$(Configuration)'=='Release'">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ </ProjectReference>
+ <ProjectReference Include="libgpac_dll.vcxproj" Condition="'$(Configuration)'=='Debug'">
 <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
 </ProjectReference>
+ <ProjectReference Include="libgpac.vcxproj" Condition="'$(Configuration)'=='Release - MP4Box_only'">
+ <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
+ </ProjectReference>
+ <ProjectReference Include="libgpac.vcxproj" Condition="'$(Configuration)'=='Debug - MP4Box_only'">
+ <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
+ </ProjectReference>
 </ItemGroup>
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 <ImportGroup Label="ExtensionTargets">

gpac-2.0.0.tar.gz/build/msvc14/gpac_manifest.xml Added

gpac-1.0.1.tar.gz/build/msvc14/libgpac.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/libgpac.vcxproj Changed

@@ -36,7 +36,7 @@
 </ItemGroup>
 <ItemGroup>
 <ClInclude Include="..\..\include\gpac\ait.h" />
- <ClInclude Include="..\..\include\gpac\atsc.h" />
+ <ClInclude Include="..\..\include\gpac\route.h" />
 <ClInclude Include="..\..\include\gpac\avparse.h" />
 <ClInclude Include="..\..\include\gpac\base_coding.h" />
 <ClInclude Include="..\..\include\gpac\bifs.h" />
@@ -157,6 +157,7 @@
 <ClInclude Include="..\..\src\quickjs\quickjs-atom.h" />
 <ClInclude Include="..\..\src\quickjs\quickjs-opcode.h" />
 <ClInclude Include="..\..\src\quickjs\quickjs.h" />
+ <ClInclude Include="..\..\src\quickjs\quickjs-libc.h" />
 <ClInclude Include="..\..\src\scenegraph\qjs_common.h" />
 <ClInclude Include="..\..\src\utils\module_wrap.h" />
 </ItemGroup>
@@ -247,6 +248,8 @@
 <ClCompile Include="..\..\src\compositor\visual_manager_3d.c" />
 <ClCompile Include="..\..\src\compositor\visual_manager_3d_gl.c" />
 <ClCompile Include="..\..\src\compositor\x3d_geometry.c" />
+ <ClCompile Include="..\..\src\filters\bs_agg.c" />
+ <ClCompile Include="..\..\src\filters\bs_split.c" />
 <ClCompile Include="..\..\src\filters\bsrw.c" />
 <ClCompile Include="..\..\src\filters\compose.c" />
 <ClCompile Include="..\..\src\filters\dasher.c" />
@@ -295,7 +298,7 @@
 <ClCompile Include="..\..\src\filters\hevcmerge.c" />
 <ClCompile Include="..\..\src\filters\hevcsplit.c" />
 <ClCompile Include="..\..\src\filters\inspect.c" />
- <ClCompile Include="..\..\src\filters\in_atsc.c" />
+ <ClCompile Include="..\..\src\filters\in_route.c" />
 <ClCompile Include="..\..\src\filters\in_dvb4linux.c" />
 <ClCompile Include="..\..\src\filters\in_file.c" />
 <ClCompile Include="..\..\src\filters\in_http.c" />
@@ -306,6 +309,7 @@
 <ClCompile Include="..\..\src\filters\in_rtp_signaling.c" />
 <ClCompile Include="..\..\src\filters\in_rtp_stream.c" />
 <ClCompile Include="..\..\src\filters\in_sock.c" />
+ <ClCompile Include="..\..\src\filters\io_fcryp.c" />
 <ClCompile Include="..\..\src\filters\isoffin_load.c" />
 <ClCompile Include="..\..\src\filters\isoffin_read.c" />
 <ClCompile Include="..\..\src\filters\isoffin_read_ch.c" />
@@ -321,6 +325,7 @@
 <ClCompile Include="..\..\src\filters\out_file.c" />
 <ClCompile Include="..\..\src\filters\out_http.c" />
 <ClCompile Include="..\..\src\filters\out_pipe.c" />
+ <ClCompile Include="..\..\src\filters\out_route.c" />
 <ClCompile Include="..\..\src\filters\out_rtp.c" />
 <ClCompile Include="..\..\src\filters\out_rtsp.c" />
 <ClCompile Include="..\..\src\filters\out_sock.c" />
@@ -334,6 +339,7 @@
 <ClCompile Include="..\..\src\filters\reframe_h263.c" />
 <ClCompile Include="..\..\src\filters\reframe_img.c" />
 <ClCompile Include="..\..\src\filters\reframe_latm.c" />
+ <ClCompile Include="..\..\src\filters\reframe_mhas.c" />
 <ClCompile Include="..\..\src\filters\reframe_mp3.c" />
 <ClCompile Include="..\..\src\filters\reframe_mpgvid.c" />
 <ClCompile Include="..\..\src\filters\reframe_nalu.c" />
@@ -341,13 +347,17 @@
 <ClCompile Include="..\..\src\filters\reframe_qcp.c" />
 <ClCompile Include="..\..\src\filters\reframe_rawpcm.c" />
 <ClCompile Include="..\..\src\filters\reframe_rawvid.c" />
+ <ClCompile Include="..\..\src\filters\reframe_truehd.c" />
 <ClCompile Include="..\..\src\filters\resample_audio.c" />
+ <ClCompile Include="..\..\src\filters\restamp.c" />
 <ClCompile Include="..\..\src\filters\rewind.c" />
 <ClCompile Include="..\..\src\filters\rewrite_adts.c" />
+ <ClCompile Include="..\..\src\filters\rewrite_mhas.c" />
 <ClCompile Include="..\..\src\filters\rewrite_mp4v.c" />
 <ClCompile Include="..\..\src\filters\rewrite_nalu.c" />
 <ClCompile Include="..\..\src\filters\rewrite_obu.c" />
 <ClCompile Include="..\..\src\filters\tileagg.c" />
+ <ClCompile Include="..\..\src\filters\tilesplit.c" />
 <ClCompile Include="..\..\src\filters\tssplit.c" />
 <ClCompile Include="..\..\src\filters\unit_test_filter.c" />
 <ClCompile Include="..\..\src\filters\vcrop.c" />
@@ -429,7 +439,7 @@
 <ClCompile Include="..\..\src\evg\stencil.c" />
 <ClCompile Include="..\..\src\evg\surface.c" />
 <ClCompile Include="..\..\src\media_tools\ait.c" />
- <ClCompile Include="..\..\src\media_tools\atsc_dmx.c" />
+ <ClCompile Include="..\..\src\media_tools\route_dmx.c" />
 <ClCompile Include="..\..\src\media_tools\avilib.c" />
 <ClCompile Include="..\..\src\media_tools\av_parsers.c" />
 <ClCompile Include="..\..\src\media_tools\dash_client.c" />
@@ -498,6 +508,17 @@
 <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level1</WarningLevel>
 <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</InlineFunctionExpansion>
 </ClCompile>
+ <ClCompile Include="..\..\src\quickjs\quickjs-libc.c">
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level3</WarningLevel>
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">TurnOffAllWarnings</WarningLevel>
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TurnOffAllWarnings</WarningLevel>
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">TurnOffAllWarnings</WarningLevel>
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">TurnOffAllWarnings</WarningLevel>
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">TurnOffAllWarnings</WarningLevel>
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
+ <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</InlineFunctionExpansion>
+ </ClCompile>
 <ClCompile Include="..\..\src\scenegraph\base_scenegraph.c" />
 <ClCompile Include="..\..\src\scenegraph\commands.c" />
 <ClCompile Include="..\..\src\scenegraph\dom_events.c" />
@@ -986,4 +1007,4 @@
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 <ImportGroup Label="ExtensionTargets">
 </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

gpac-1.0.1.tar.gz/build/msvc14/libgpac.vcxproj.filters -> gpac-2.0.0.tar.gz/build/msvc14/libgpac.vcxproj.filters Changed

@@ -399,7 +399,7 @@
 <ClInclude Include="..\..\src\filters\isoffin.h">
 <Filter>filters</Filter>
 </ClInclude>
- <ClInclude Include="..\..\include\gpac\atsc.h">
+ <ClInclude Include="..\..\include\gpac\route.h">
 <Filter>include</Filter>
 </ClInclude>
 <ClInclude Include="..\..\include\gpac\crypt_tools.h">
@@ -441,6 +441,9 @@
 <ClInclude Include="..\..\src\scenegraph\qjs_common.h">
 <Filter>scenegraph</Filter>
 </ClInclude>
+ <ClInclude Include="..\..\src\quickjs\quickjs-libc.h">
+ <Filter>quickjs</Filter>
+ </ClInclude>
 </ItemGroup>
 <ItemGroup>
 <ClCompile Include="..\..\src\bifs\arith_decoder.c">
@@ -1097,7 +1100,7 @@
 <ClCompile Include="..\..\src\isomedia\iff.c">
 <Filter>isomedia</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\media_tools\atsc_dmx.c">
+ <ClCompile Include="..\..\src\media_tools\route_dmx.c">
 <Filter>media_tools</Filter>
 </ClCompile>
 <ClCompile Include="..\..\src\compositor\clock.c">
@@ -1295,6 +1298,9 @@
 <ClCompile Include="..\..\src\filters\inspect.c">
 <Filter>filters</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\filters\io_fcryp.c">
+ <Filter>filters</Filter>
+ </ClCompile>
 <ClCompile Include="..\..\src\filters\isoffin_load.c">
 <Filter>filters</Filter>
 </ClCompile>
@@ -1346,6 +1352,9 @@
 <ClCompile Include="..\..\src\filters\reframe_img.c">
 <Filter>filters</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\filters\reframe_mhas.c">
+ <Filter>filters</Filter>
+ </ClCompile>
 <ClCompile Include="..\..\src\filters\reframe_mp3.c">
 <Filter>filters</Filter>
 </ClCompile>
@@ -1364,18 +1373,27 @@
 <ClCompile Include="..\..\src\filters\reframe_rawvid.c">
 <Filter>filters</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\filters\reframe_truehd.c">
+ <Filter>filters</Filter>
+ </ClCompile>
 <ClCompile Include="..\..\src\filters\reframer.c">
 <Filter>filters</Filter>
 </ClCompile>
 <ClCompile Include="..\..\src\filters\resample_audio.c">
 <Filter>filters</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\filters\restamp.c">
+ <Filter>filters</Filter>
+ </ClCompile>
 <ClCompile Include="..\..\src\filters\rewind.c">
 <Filter>filters</Filter>
 </ClCompile>
 <ClCompile Include="..\..\src\filters\rewrite_adts.c">
 <Filter>filters</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\filters\rewrite_mhas.c">
+ <Filter>filters</Filter>
+ </ClCompile>
 <ClCompile Include="..\..\src\filters\rewrite_mp4v.c">
 <Filter>filters</Filter>
 </ClCompile>
@@ -1406,6 +1424,12 @@
 <ClCompile Include="..\..\src\filters\dasher.c">
 <Filter>filters</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\filters\bs_agg.c">
+ <Filter>filters</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\filters\bs_split.c">
+ <Filter>filters</Filter>
+ </ClCompile>
 <ClCompile Include="..\..\src\filters\bsrw.c">
 <Filter>filters</Filter>
 </ClCompile>
@@ -1439,6 +1463,9 @@
 <ClCompile Include="..\..\src\filters\tileagg.c">
 <Filter>filters</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\filters\tilesplit.c">
+ <Filter>filters</Filter>
+ </ClCompile>
 <ClCompile Include="..\..\src\filters\encrypt_cenc_isma.c">
 <Filter>filters</Filter>
 </ClCompile>
@@ -1454,12 +1481,15 @@
 <ClCompile Include="..\..\src\utils\Remotery.c">
 <Filter>utils</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\filters\in_atsc.c">
+ <ClCompile Include="..\..\src\filters\in_route.c">
 <Filter>filters</Filter>
 </ClCompile>
 <ClCompile Include="..\..\src\evg\ftgrays.c">
 <Filter>evg</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\filters\out_route.c">
+ <Filter>filters</Filter>
+ </ClCompile>
 <ClCompile Include="..\..\src\filters\out_rtp.c">
 <Filter>filters</Filter>
 </ClCompile>
@@ -1565,10 +1595,13 @@
 <ClCompile Include="..\..\src\filters\dec_mediacodec.c">
 <Filter>filters</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\quickjs\quickjs-libc.c">
+ <Filter>quickjs</Filter>
+ </ClCompile>
 </ItemGroup>
 <ItemGroup>
 <None Include="..\..\src\filters\dec_vtb_glctx.m">
 <Filter>filters</Filter>
 </None>
 </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

gpac-1.0.1.tar.gz/build/msvc14/libgpac_dll.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/libgpac_dll.vcxproj Changed

@@ -140,6 +140,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 <Midl>
@@ -189,6 +192,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 <Midl>
@@ -241,6 +247,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
@@ -288,6 +297,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\src\export.cpp" />

gpac-1.0.1.tar.gz/build/msvc14/mp4box.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/mp4box.vcxproj Changed

@@ -199,6 +199,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">
 <Midl>
@@ -287,6 +290,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">
 <Midl>
@@ -374,6 +380,9 @@
 <Command>
 </Command>
 </PostBuildEvent>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">
 <Midl>
@@ -459,6 +468,9 @@
 <Command>
 </Command>
 </PostBuildEvent>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">
 <Midl>
@@ -548,16 +560,16 @@
 </ClCompile>
 </ItemGroup>
 <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj" Condition="'$(Configuration)'=='Release'" >
+ <ProjectReference Include="libgpac_dll.vcxproj" Condition="'$(Configuration)'=='Release'">
 <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
 </ProjectReference>
- <ProjectReference Include="libgpac_dll.vcxproj" Condition="'$(Configuration)'=='Debug'" >
+ <ProjectReference Include="libgpac_dll.vcxproj" Condition="'$(Configuration)'=='Debug'">
 <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
 </ProjectReference>
- <ProjectReference Include="libgpac.vcxproj" Condition="'$(Configuration)'=='Release - MP4Box_only'">
+ <ProjectReference Include="libgpac.vcxproj" Condition="'$(Configuration)'=='Release - MP4Box_only'">
 <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
 </ProjectReference>
- <ProjectReference Include="libgpac.vcxproj" Condition="'$(Configuration)'=='Debug - MP4Box_only'">
+ <ProjectReference Include="libgpac.vcxproj" Condition="'$(Configuration)'=='Debug - MP4Box_only'">
 <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
 </ProjectReference>
 </ItemGroup>

gpac-1.0.1.tar.gz/build/msvc14/mp4client.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/mp4client.vcxproj Changed

@@ -124,6 +124,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 <Midl>
@@ -163,6 +166,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 <Midl>
@@ -201,6 +207,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
@@ -238,6 +247,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\applications\mp4client\main.c">

gpac-1.0.1.tar.gz/build/msvc14/sdl_out.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/sdl_out.vcxproj Changed

@@ -138,6 +138,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 <Midl>
@@ -180,6 +183,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 <Midl>
@@ -226,6 +232,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
@@ -269,6 +278,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\modules\sdl_out\audio.c">

gpac-1.0.1.tar.gz/build/msvc14/validator.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/validator.vcxproj Changed

@@ -128,6 +128,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 <Midl>
@@ -168,6 +171,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 <Midl>
@@ -211,6 +217,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
@@ -252,6 +261,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\modules\modules_export.cpp" />

gpac-1.0.1.tar.gz/build/msvc14/wav_out.vcxproj -> gpac-2.0.0.tar.gz/build/msvc14/wav_out.vcxproj Changed

@@ -129,6 +129,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
@@ -171,6 +174,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 <Midl>
@@ -215,6 +221,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 <Midl>
@@ -256,6 +265,9 @@
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\modules\modules_export.cpp" />

gpac-1.0.1.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj -> gpac-2.0.0.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj Changed

@@ -215,6 +215,7 @@
 		924E805F206D427A00AB580F /* reframe_rawpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 924E805E206D427A00AB580F /* reframe_rawpcm.c */; };
 		924FEE821BA6C63A003F77A6 /* iff.c in Sources */ = {isa = PBXBuildFile; fileRef = 924FEE811BA6C63A003F77A6 /* iff.c */; };
 		9251CA8A1E9D3E960089DDC6 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9251CA881E9D3E2B0089DDC6 /* main.c */; };
+		9251E5442524EB9800CEB84D /* reframe_mhas.c in Sources */ = {isa = PBXBuildFile; fileRef = 9251E5432524EB9700CEB84D /* reframe_mhas.c */; };
 		9256B38B208662FC00088537 /* mux_ts.c in Sources */ = {isa = PBXBuildFile; fileRef = 9256B38A208662FB00088537 /* mux_ts.c */; };
 		9257307F2056948D009DB328 /* rewrite_adts.c in Sources */ = {isa = PBXBuildFile; fileRef = 9257307D2056948D009DB328 /* rewrite_adts.c */; };
 		925730802056948D009DB328 /* rewrite_nalu.c in Sources */ = {isa = PBXBuildFile; fileRef = 9257307E2056948D009DB328 /* rewrite_nalu.c */; };
@@ -231,7 +232,9 @@
 		925975052215BA3A0007E02B /* raster_yuv.c in Sources */ = {isa = PBXBuildFile; fileRef = 925974FC2215BA3A0007E02B /* raster_yuv.c */; };
 		925975082215BAC30007E02B /* evg.h in Headers */ = {isa = PBXBuildFile; fileRef = 925975072215BAC30007E02B /* evg.h */; };
 		925CE3451FA2E642004EC6F5 /* decrypt_cenc_isma.c in Sources */ = {isa = PBXBuildFile; fileRef = 925CE3441FA2E641004EC6F5 /* decrypt_cenc_isma.c */; };
+		925E564C2798B87300BBD530 /* bs_agg.c in Sources */ = {isa = PBXBuildFile; fileRef = 925E564B2798B87300BBD530 /* bs_agg.c */; };
 		926245981FD691A000184072 /* ff_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 926245971FD691A000184072 /* ff_common.h */; };
+		9265307A27AD295200DEBE4B /* restamp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9265307927AD295200DEBE4B /* restamp.c */; };
 		926656C41F7D3DF700299CC6 /* dec_theora.c in Sources */ = {isa = PBXBuildFile; fileRef = 926656C31F7D3DF700299CC6 /* dec_theora.c */; };
 		926656C61F7D45F700299CC6 /* dmx_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 926656C51F7D45F700299CC6 /* dmx_ogg.c */; };
 		926656C81F7E92C200299CC6 /* dmx_m2ts.c in Sources */ = {isa = PBXBuildFile; fileRef = 926656C71F7E92C200299CC6 /* dmx_m2ts.c */; };
@@ -240,6 +243,7 @@
 		926C7E652019D76300E90AF6 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92A7E9602003BAE8000C22DE /* Security.framework */; };
 		926CE14D1FE7E388002B3CF6 /* write_generic.c in Sources */ = {isa = PBXBuildFile; fileRef = 926CE14C1FE7E388002B3CF6 /* write_generic.c */; };
 		926CE14F1FE81865002B3CF6 /* constants.c in Sources */ = {isa = PBXBuildFile; fileRef = 926CE14E1FE81865002B3CF6 /* constants.c */; };
+		926D48FD27957D8400E3C68C /* bs_split.c in Sources */ = {isa = PBXBuildFile; fileRef = 926D48FC27957D8400E3C68C /* bs_split.c */; };
 		926F15531FE867B000C40779 /* write_vtt.c in Sources */ = {isa = PBXBuildFile; fileRef = 926F15521FE867B000C40779 /* write_vtt.c */; };
 		926F15551FE964D000C40779 /* write_nhnt.c in Sources */ = {isa = PBXBuildFile; fileRef = 926F15541FE964CF00C40779 /* write_nhnt.c */; };
 		926F15571FE986B000C40779 /* write_nhml.c in Sources */ = {isa = PBXBuildFile; fileRef = 926F15561FE986B000C40779 /* write_nhml.c */; };
@@ -248,16 +252,23 @@
 		92754D60207D24F600170383 /* filelist.c in Sources */ = {isa = PBXBuildFile; fileRef = 92754D5F207D24F600170383 /* filelist.c */; };
 		927AAD0E1E44F492008C8E69 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		927DB14C21A3C7100032D205 /* reframe_latm.c in Sources */ = {isa = PBXBuildFile; fileRef = 927DB14B21A3C7100032D205 /* reframe_latm.c */; };
+		9285D1A7266F671F008FCD14 /* quickjs-libc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9285D1A6266F671F008FCD14 /* quickjs-libc.c */; };
 		92860707238690D700FDA1ED /* reframe_prores.c in Sources */ = {isa = PBXBuildFile; fileRef = 92860706238690D700FDA1ED /* reframe_prores.c */; };
 		9286070B23884A6B00FDA1ED /* ff_mx.c in Sources */ = {isa = PBXBuildFile; fileRef = 9286070A23884A6B00FDA1ED /* ff_mx.c */; };
 		9286070F239576D900FDA1ED /* tssplit.c in Sources */ = {isa = PBXBuildFile; fileRef = 9286070E239576D900FDA1ED /* tssplit.c */; };
 		928607132396DF8500FDA1ED /* ff_avf.c in Sources */ = {isa = PBXBuildFile; fileRef = 928607122396DF8500FDA1ED /* ff_avf.c */; };
 		9288350C1FE82E64002F603D /* write_qcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9288350B1FE82E63002F603D /* write_qcp.c */; };
+		9288A4A225ADB1DD006F7355 /* reframe_truehd.c in Sources */ = {isa = PBXBuildFile; fileRef = 9288A4A125ADB1DD006F7355 /* reframe_truehd.c */; };
+		9288A53B25AF6E6F006F7355 /* io_fcryp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9288A53A25AF6E6F006F7355 /* io_fcryp.c */; };
 		9288E8641FB1BF07005460C5 /* reframe_mpgvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 9288E8631FB1BF07005460C5 /* reframe_mpgvid.c */; };
 		9289D9F51FDEFFCE00C24F83 /* out_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 9289D9F41FDEFFCD00C24F83 /* out_file.c */; };
 		928A7F812059372C00E02E89 /* out_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 928A7F802059372C00E02E89 /* out_video.c */; };
 		928E7AC51FB9F2B800D2470E /* dmx_nhnt.c in Sources */ = {isa = PBXBuildFile; fileRef = 928E7AC41FB9F2B800D2470E /* dmx_nhnt.c */; };
 		928E7AC71FB9FCDD00D2470E /* dmx_nhml.c in Sources */ = {isa = PBXBuildFile; fileRef = 928E7AC61FB9FCDD00D2470E /* dmx_nhml.c */; };
+		928E9F9F250F5BA6000C0631 /* route.h in Headers */ = {isa = PBXBuildFile; fileRef = 928E9F9E250F5BA6000C0631 /* route.h */; };
+		928E9FA1250F5BB9000C0631 /* route_dmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 928E9FA0250F5BB9000C0631 /* route_dmx.c */; };
+		928E9FA3250F5BC9000C0631 /* in_route.c in Sources */ = {isa = PBXBuildFile; fileRef = 928E9FA2250F5BC9000C0631 /* in_route.c */; };
+		9290E75025263FC300BC0EE3 /* rewrite_mhas.c in Sources */ = {isa = PBXBuildFile; fileRef = 9290E74F25263FC300BC0EE3 /* rewrite_mhas.c */; };
 		9290F5111FAB4C2C0038C30D /* mux_isom.c in Sources */ = {isa = PBXBuildFile; fileRef = 9290F5101FAB4C2C0038C30D /* mux_isom.c */; };
 		92910FA62335363F0052365D /* libregexp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92910FA52335363F0052365D /* libregexp.c */; };
 		92910FA8233536620052365D /* cutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 92910FA7233536620052365D /* cutils.c */; };
@@ -268,7 +279,7 @@
 		9298677D235A146E008A2CC6 /* gltools.c in Sources */ = {isa = PBXBuildFile; fileRef = 9298677C235A146D008A2CC6 /* gltools.c */; };
 		929DE7472417DC020056AFA7 /* gzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 929DE7462417DC020056AFA7 /* gzio.c */; };
 		92A08DBD20D946B7003589FF /* tileagg.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A08DBC20D946B6003589FF /* tileagg.c */; };
-		92A505BA20FC833800049B29 /* in_atsc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A505B920FC833800049B29 /* in_atsc.c */; };
+		92A870FE251110E50047560D /* out_route.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A870FD251110E50047560D /* out_route.c */; };
 		92AAF0E418D6DB8600E2FF12 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0D818D6DB5500E2FF12 /* audio.c */; };
 		92AAF0E518D6DB8600E2FF12 /* sdl_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */; };
 		92AAF0E618D6DB8600E2FF12 /* sdl_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF0DB18D6DB5500E2FF12 /* sdl_out.h */; };
@@ -429,13 +440,11 @@
 		92BBFCCC1A7122AD006A7735 /* m3u8.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6A1A7122AD006A7735 /* m3u8.h */; };
 		92BBFCCD1A7122AD006A7735 /* media_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6B1A7122AD006A7735 /* media_dev.h */; };
 		92BBFCCE1A7122AD006A7735 /* mesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6C1A7122AD006A7735 /* mesh.h */; };
-		92BBFCCF1A7122AD006A7735 /* mpd.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6D1A7122AD006A7735 /* mpd.h */; };
 		92BBFCD01A7122AD006A7735 /* odf_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6E1A7122AD006A7735 /* odf_dev.h */; };
 		92BBFCD11A7122AD006A7735 /* odf_parse_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6F1A7122AD006A7735 /* odf_parse_common.h */; };
 		92BBFCD21A7122AD006A7735 /* ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC701A7122AD006A7735 /* ogg.h */; };
 		92BBFCD31A7122AD006A7735 /* reedsolomon.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC711A7122AD006A7735 /* reedsolomon.h */; };
 		92BBFCD41A7122AD006A7735 /* scenegraph_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC721A7122AD006A7735 /* scenegraph_dev.h */; };
-		92BBFCD51A7122AD006A7735 /* smjs_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC731A7122AD006A7735 /* smjs_api.h */; };
 		92BBFCD61A7122AD006A7735 /* swf_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC741A7122AD006A7735 /* swf_dev.h */; };
 		92BBFCD81A7122AD006A7735 /* vobsub.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC761A7122AD006A7735 /* vobsub.h */; };
 		92BBFCDA1A7122AD006A7735 /* iso639.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC781A7122AD006A7735 /* iso639.h */; };
@@ -449,8 +458,6 @@
 		92BBFCE31A7122AD006A7735 /* audio_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC821A7122AD006A7735 /* audio_out.h */; };
 		92BBFCE51A7122AD006A7735 /* font.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC841A7122AD006A7735 /* font.h */; };
 		92BBFCE61A7122AD006A7735 /* hardcoded_proto.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC851A7122AD006A7735 /* hardcoded_proto.h */; };
-		92BBFCE81A7122AD006A7735 /* js_usr.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC871A7122AD006A7735 /* js_usr.h */; };
-		92BBFCE91A7122AD006A7735 /* raster2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC881A7122AD006A7735 /* raster2d.h */; };
 		92BBFCEC1A7122AD006A7735 /* video_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8B1A7122AD006A7735 /* video_out.h */; };
 		92BBFCED1A7122AD006A7735 /* mpeg4_odf.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8C1A7122AD006A7735 /* mpeg4_odf.h */; };
 		92BBFCEE1A7122AD006A7735 /* mpegts.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8D1A7122AD006A7735 /* mpegts.h */; };
@@ -458,7 +465,6 @@
 		92BBFCF01A7122AD006A7735 /* nodes_mpeg4.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8F1A7122AD006A7735 /* nodes_mpeg4.h */; };
 		92BBFCF11A7122AD006A7735 /* nodes_svg.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC901A7122AD006A7735 /* nodes_svg.h */; };
 		92BBFCF21A7122AD006A7735 /* nodes_x3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC911A7122AD006A7735 /* nodes_x3d.h */; };
-		92BBFCF31A7122AD006A7735 /* nodes_xbl.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC921A7122AD006A7735 /* nodes_xbl.h */; };
 		92BBFCF41A7122AD006A7735 /* options.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC931A7122AD006A7735 /* options.h */; };
 		92BBFCF51A7122AD006A7735 /* path2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC941A7122AD006A7735 /* path2d.h */; };
 		92BBFCF61A7122AD006A7735 /* revision.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC951A7122AD006A7735 /* revision.h */; };
@@ -487,24 +493,24 @@
 		92BD556D205AE99A007C4C06 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92B02F4E1DD2004400F85E77 /* OpenGL.framework */; };
 		92BD5571205AE9BD007C4C06 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92BD5570205AE9BD007C4C06 /* AppKit.framework */; };
 		92BE50A318D632DA00AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92BE50A818D6348A00AA59D8 /* filedump.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A418D6348A00AA59D8 /* filedump.c */; };
-		92BE50A918D6348A00AA59D8 /* fileimport.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A518D6348A00AA59D8 /* fileimport.c */; };
-		92BE50AA18D6348A00AA59D8 /* live.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A618D6348A00AA59D8 /* live.c */; };
-		92BE50AB18D6348A00AA59D8 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A718D6348A00AA59D8 /* main.c */; };
 		92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92C0F37E21EC7BB0002961C8 /* out_rtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C0F37D21EC7BB0002961C8 /* out_rtp.c */; };
+		92C236DD25769BA500CD59A9 /* tilesplit.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C236DC25769BA500CD59A9 /* tilesplit.c */; };
+		92C23723257841A100CD59A9 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA6C1A15FE4A00372C59 /* CoreAudio.framework */; };
 		92C403DD2181F17E00331F39 /* dec_openhevc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C403DC2181F17E00331F39 /* dec_openhevc.c */; };
 		92C403EA2181F57600331F39 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92CDAEE81FBD9D0C0007C1C0 /* reframe_nalu.c in Sources */ = {isa = PBXBuildFile; fileRef = 92CDAEE71FBD9D0C0007C1C0 /* reframe_nalu.c */; };
 		92D211942370832900128AE2 /* raster3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D211932370832900128AE2 /* raster3d.c */; };
-		92D3C6272031E94F00BA1735 /* atsc_dmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D3C6262031E94F00BA1735 /* atsc_dmx.c */; };
-		92D3C6292031E98600BA1735 /* atsc.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D3C6282031E98600BA1735 /* atsc.h */; };
 		92D535711A5C0D1400F2442A /* carbon_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D5356F1A5C0CF700F2442A /* carbon_events.c */; };
 		92D6C59B2343BED700262217 /* scene_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C5992343BED700262217 /* scene_js.c */; };
 		92D6C59C2343BED700262217 /* xhr.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C59A2343BED700262217 /* xhr.c */; };
 		92D6C5A02343BEFF00262217 /* svg_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C59D2343BEFF00262217 /* svg_js.c */; };
 		92D6C5A12343BEFF00262217 /* vrml_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C59E2343BEFF00262217 /* vrml_js.c */; };
 		92D6C5A22343BEFF00262217 /* dom_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C59F2343BEFF00262217 /* dom_js.c */; };
+		92D7A2E925D580DD00FD4034 /* fileimport.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D7A2E425D580DC00FD4034 /* fileimport.c */; };
+		92D7A2EA25D580DD00FD4034 /* live.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D7A2E525D580DD00FD4034 /* live.c */; };
+		92D7A2EB25D580DD00FD4034 /* filedump.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D7A2E725D580DD00FD4034 /* filedump.c */; };
+		92D7A2EC25D580DD00FD4034 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D7A2E825D580DD00FD4034 /* main.c */; };
 		92DB148D1E4F05B500382A81 /* filters.h in Headers */ = {isa = PBXBuildFile; fileRef = 92DB148B1E4F05B500382A81 /* filters.h */; };
 		92DB148E1E4F05B500382A81 /* main.h in Headers */ = {isa = PBXBuildFile; fileRef = 92DB148C1E4F05B500382A81 /* main.h */; };
 		92E164AB20F8EBAE0024A9CA /* dec_nvdec_sdk.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E164A820F8EBAE0024A9CA /* dec_nvdec_sdk.c */; };
@@ -868,6 +874,7 @@
 		924E805E206D427A00AB580F /* reframe_rawpcm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_rawpcm.c; path = filters/reframe_rawpcm.c; sourceTree = "<group>"; };
 		924FEE811BA6C63A003F77A6 /* iff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iff.c; sourceTree = "<group>"; };
 		9251CA881E9D3E2B0089DDC6 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/mp4client/main.c; sourceTree = "<group>"; };
+		9251E5432524EB9700CEB84D /* reframe_mhas.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_mhas.c; path = filters/reframe_mhas.c; sourceTree = "<group>"; };
 		9256B38A208662FB00088537 /* mux_ts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mux_ts.c; path = filters/mux_ts.c; sourceTree = "<group>"; };
 		9257307D2056948D009DB328 /* rewrite_adts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_adts.c; path = filters/rewrite_adts.c; sourceTree = "<group>"; };
 		9257307E2056948D009DB328 /* rewrite_nalu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_nalu.c; path = filters/rewrite_nalu.c; sourceTree = "<group>"; };
@@ -884,7 +891,11 @@
 		925974FC2215BA3A0007E02B /* raster_yuv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_yuv.c; path = evg/raster_yuv.c; sourceTree = "<group>"; };
 		925975072215BAC30007E02B /* evg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = evg.h; path = ../include/gpac/evg.h; sourceTree = "<group>"; };
 		925CE3441FA2E641004EC6F5 /* decrypt_cenc_isma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = decrypt_cenc_isma.c; path = filters/decrypt_cenc_isma.c; sourceTree = "<group>"; };
+		925E564B2798B87300BBD530 /* bs_agg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bs_agg.c; path = filters/bs_agg.c; sourceTree = "<group>"; };
+		92609BD2252F56CC00DB821E /* export.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = export.cpp; sourceTree = "<group>"; };
+		92609BD3252F570200DB821E /* share */ = {isa = PBXFileReference; lastKnownFileType = folder; name = share; path = ../../share; sourceTree = "<group>"; };
 		926245971FD691A000184072 /* ff_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ff_common.h; path = filters/ff_common.h; sourceTree = "<group>"; };
+		9265307927AD295200DEBE4B /* restamp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = restamp.c; path = filters/restamp.c; sourceTree = "<group>"; };
 		926656C11F7D10F400299CC6 /* dec_vorbis.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_vorbis.c; path = filters/dec_vorbis.c; sourceTree = "<group>"; };
 		926656C31F7D3DF700299CC6 /* dec_theora.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_theora.c; path = filters/dec_theora.c; sourceTree = "<group>"; };
 		926656C51F7D45F700299CC6 /* dmx_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_ogg.c; path = filters/dmx_ogg.c; sourceTree = "<group>"; };
@@ -892,6 +903,7 @@
 		926998B31FEACE8F00AA759D /* dmx_vobsub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_vobsub.c; path = filters/dmx_vobsub.c; sourceTree = "<group>"; };
 		926CE14C1FE7E388002B3CF6 /* write_generic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_generic.c; path = filters/write_generic.c; sourceTree = "<group>"; };
 		926CE14E1FE81865002B3CF6 /* constants.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = constants.c; sourceTree = "<group>"; };
+		926D48FC27957D8400E3C68C /* bs_split.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bs_split.c; path = filters/bs_split.c; sourceTree = "<group>"; };
 		926F15521FE867B000C40779 /* write_vtt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_vtt.c; path = filters/write_vtt.c; sourceTree = "<group>"; };
 		926F15541FE964CF00C40779 /* write_nhnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_nhnt.c; path = filters/write_nhnt.c; sourceTree = "<group>"; };
 		926F15561FE986B000C40779 /* write_nhml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_nhml.c; path = filters/write_nhml.c; sourceTree = "<group>"; };
@@ -901,16 +913,23 @@
 		927AACF61E44ED58008C8E69 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/gpac/main.c; sourceTree = "<group>"; };
 		927AACFD1E44EEDC008C8E69 /* gpac */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gpac; sourceTree = BUILT_PRODUCTS_DIR; };
 		927DB14B21A3C7100032D205 /* reframe_latm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_latm.c; path = filters/reframe_latm.c; sourceTree = "<group>"; };
+		9285D1A6266F671F008FCD14 /* quickjs-libc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "quickjs-libc.c"; path = "quickjs/quickjs-libc.c"; sourceTree = "<group>"; };
 		92860706238690D700FDA1ED /* reframe_prores.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_prores.c; path = filters/reframe_prores.c; sourceTree = "<group>"; };
 		9286070A23884A6B00FDA1ED /* ff_mx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_mx.c; path = filters/ff_mx.c; sourceTree = "<group>"; };
 		9286070E239576D900FDA1ED /* tssplit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tssplit.c; path = filters/tssplit.c; sourceTree = "<group>"; };
 		928607122396DF8500FDA1ED /* ff_avf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_avf.c; path = filters/ff_avf.c; sourceTree = "<group>"; };
 		9288350B1FE82E63002F603D /* write_qcp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_qcp.c; path = filters/write_qcp.c; sourceTree = "<group>"; };
+		9288A4A125ADB1DD006F7355 /* reframe_truehd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_truehd.c; path = filters/reframe_truehd.c; sourceTree = "<group>"; };
+		9288A53A25AF6E6F006F7355 /* io_fcryp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io_fcryp.c; path = filters/io_fcryp.c; sourceTree = "<group>"; };
 		9288E8631FB1BF07005460C5 /* reframe_mpgvid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_mpgvid.c; path = filters/reframe_mpgvid.c; sourceTree = "<group>"; };
 		9289D9F41FDEFFCD00C24F83 /* out_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_file.c; path = filters/out_file.c; sourceTree = "<group>"; };
 		928A7F802059372C00E02E89 /* out_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_video.c; path = filters/out_video.c; sourceTree = "<group>"; };
 		928E7AC41FB9F2B800D2470E /* dmx_nhnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_nhnt.c; path = filters/dmx_nhnt.c; sourceTree = "<group>"; };
 		928E7AC61FB9FCDD00D2470E /* dmx_nhml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_nhml.c; path = filters/dmx_nhml.c; sourceTree = "<group>"; };
+		928E9F9E250F5BA6000C0631 /* route.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = route.h; path = ../include/gpac/route.h; sourceTree = "<group>"; };
+		928E9FA0250F5BB9000C0631 /* route_dmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = route_dmx.c; sourceTree = "<group>"; };
+		928E9FA2250F5BC9000C0631 /* in_route.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_route.c; path = filters/in_route.c; sourceTree = "<group>"; };
+		9290E74F25263FC300BC0EE3 /* rewrite_mhas.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_mhas.c; path = filters/rewrite_mhas.c; sourceTree = "<group>"; };
 		9290F5101FAB4C2C0038C30D /* mux_isom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mux_isom.c; path = filters/mux_isom.c; sourceTree = "<group>"; };
 		92910FA52335363F0052365D /* libregexp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libregexp.c; path = quickjs/libregexp.c; sourceTree = "<group>"; };
 		92910FA7233536620052365D /* cutils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cutils.c; path = quickjs/cutils.c; sourceTree = "<group>"; };
@@ -918,15 +937,14 @@
 		9293839B23548C8F00AAAFA8 /* webgl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = webgl.c; path = jsmods/webgl.c; sourceTree = "<group>"; };
 		9293839D2354A10800AAAFA8 /* webgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = webgl.h; path = jsmods/webgl.h; sourceTree = "<group>"; };
 		9293839F2354DBDB00AAAFA8 /* WebGLRenderingContextBase.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = WebGLRenderingContextBase.c; path = jsmods/WebGLRenderingContextBase.c; sourceTree = "<group>"; };
-		929383A32355A86F00AAAFA8 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/generators/WebGLGen/main.c; sourceTree = "<group>"; };
 		9296BF2122CF7F5300DC9742 /* reframe_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_flac.c; path = filters/reframe_flac.c; sourceTree = "<group>"; };
 		9298677C235A146D008A2CC6 /* gltools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gltools.c; sourceTree = "<group>"; };
 		929DE7462417DC020056AFA7 /* gzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzio.c; sourceTree = "<group>"; };
 		92A08DBC20D946B6003589FF /* tileagg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tileagg.c; path = filters/tileagg.c; sourceTree = "<group>"; };
-		92A505B920FC833800049B29 /* in_atsc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_atsc.c; path = filters/in_atsc.c; sourceTree = "<group>"; };
 		92A7E95C2003BAAA000C22DE /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
 		92A7E95E2003BACB000C22DE /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		92A7E9602003BAE8000C22DE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		92A870FD251110E50047560D /* out_route.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_route.c; path = filters/out_route.c; sourceTree = "<group>"; };
 		92AAF0D318D6DB2D00E2FF12 /* gm_sdl_out.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_sdl_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		92AAF0D818D6DB5500E2FF12 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio.c; path = ../../modules/sdl_out/audio.c; sourceTree = "<group>"; };
 		92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdl_out.c; path = ../../modules/sdl_out/sdl_out.c; sourceTree = "<group>"; };
@@ -1089,13 +1107,11 @@
 		92BBFC6A1A7122AD006A7735 /* m3u8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = m3u8.h; sourceTree = "<group>"; };
 		92BBFC6B1A7122AD006A7735 /* media_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = media_dev.h; sourceTree = "<group>"; };
 		92BBFC6C1A7122AD006A7735 /* mesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mesh.h; sourceTree = "<group>"; };
-		92BBFC6D1A7122AD006A7735 /* mpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpd.h; sourceTree = "<group>"; };
 		92BBFC6E1A7122AD006A7735 /* odf_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = odf_dev.h; sourceTree = "<group>"; };
 		92BBFC6F1A7122AD006A7735 /* odf_parse_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = odf_parse_common.h; sourceTree = "<group>"; };
 		92BBFC701A7122AD006A7735 /* ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ogg.h; sourceTree = "<group>"; };
 		92BBFC711A7122AD006A7735 /* reedsolomon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reedsolomon.h; sourceTree = "<group>"; };
 		92BBFC721A7122AD006A7735 /* scenegraph_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scenegraph_dev.h; sourceTree = "<group>"; };
-		92BBFC731A7122AD006A7735 /* smjs_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smjs_api.h; sourceTree = "<group>"; };
 		92BBFC741A7122AD006A7735 /* swf_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swf_dev.h; sourceTree = "<group>"; };
 		92BBFC761A7122AD006A7735 /* vobsub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vobsub.h; sourceTree = "<group>"; };
 		92BBFC781A7122AD006A7735 /* iso639.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iso639.h; path = ../include/gpac/iso639.h; sourceTree = "<group>"; };
@@ -1109,8 +1125,6 @@
 		92BBFC821A7122AD006A7735 /* audio_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio_out.h; sourceTree = "<group>"; };
 		92BBFC841A7122AD006A7735 /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
 		92BBFC851A7122AD006A7735 /* hardcoded_proto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hardcoded_proto.h; sourceTree = "<group>"; };
-		92BBFC871A7122AD006A7735 /* js_usr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_usr.h; sourceTree = "<group>"; };
-		92BBFC881A7122AD006A7735 /* raster2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = raster2d.h; sourceTree = "<group>"; };
 		92BBFC8B1A7122AD006A7735 /* video_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = video_out.h; sourceTree = "<group>"; };
 		92BBFC8C1A7122AD006A7735 /* mpeg4_odf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpeg4_odf.h; path = ../include/gpac/mpeg4_odf.h; sourceTree = "<group>"; };
 		92BBFC8D1A7122AD006A7735 /* mpegts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpegts.h; path = ../include/gpac/mpegts.h; sourceTree = "<group>"; };
@@ -1118,7 +1132,6 @@
 		92BBFC8F1A7122AD006A7735 /* nodes_mpeg4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nodes_mpeg4.h; path = ../include/gpac/nodes_mpeg4.h; sourceTree = "<group>"; };
 		92BBFC901A7122AD006A7735 /* nodes_svg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nodes_svg.h; path = ../include/gpac/nodes_svg.h; sourceTree = "<group>"; };
 		92BBFC911A7122AD006A7735 /* nodes_x3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nodes_x3d.h; path = ../include/gpac/nodes_x3d.h; sourceTree = "<group>"; };
-		92BBFC921A7122AD006A7735 /* nodes_xbl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nodes_xbl.h; path = ../include/gpac/nodes_xbl.h; sourceTree = "<group>"; };
 		92BBFC931A7122AD006A7735 /* options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = options.h; path = ../include/gpac/options.h; sourceTree = "<group>"; };
 		92BBFC941A7122AD006A7735 /* path2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = path2d.h; path = ../include/gpac/path2d.h; sourceTree = "<group>"; };
 		92BBFC951A7122AD006A7735 /* revision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = revision.h; path = ../include/gpac/revision.h; sourceTree = "<group>"; };
@@ -1145,24 +1158,24 @@
 		92BD556E205AE9B0007C4C06 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
 		92BD5570205AE9BD007C4C06 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		92BE509018D6325E00AA59D8 /* MP4Box */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP4Box; sourceTree = BUILT_PRODUCTS_DIR; };
-		92BE50A418D6348A00AA59D8 /* filedump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filedump.c; path = ../../applications/mp4box/filedump.c; sourceTree = SOURCE_ROOT; };
-		92BE50A518D6348A00AA59D8 /* fileimport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fileimport.c; path = ../../applications/mp4box/fileimport.c; sourceTree = SOURCE_ROOT; };
-		92BE50A618D6348A00AA59D8 /* live.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = live.c; path = ../../applications/mp4box/live.c; sourceTree = SOURCE_ROOT; };
-		92BE50A718D6348A00AA59D8 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/mp4box/main.c; sourceTree = SOURCE_ROOT; };
 		92BE50C718D6D60100AA59D8 /* MP4Client */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP4Client; sourceTree = BUILT_PRODUCTS_DIR; };
 		92C0F37D21EC7BB0002961C8 /* out_rtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_rtp.c; path = filters/out_rtp.c; sourceTree = "<group>"; };
+		92C236DC25769BA500CD59A9 /* tilesplit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tilesplit.c; path = filters/tilesplit.c; sourceTree = "<group>"; };
 		92C403D72181F10500331F39 /* gf_openhevc_dec.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gf_openhevc_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		92C403DC2181F17E00331F39 /* dec_openhevc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_openhevc.c; path = ../../src/filters/dec_openhevc.c; sourceTree = "<group>"; };
 		92CDAEE71FBD9D0C0007C1C0 /* reframe_nalu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_nalu.c; path = filters/reframe_nalu.c; sourceTree = "<group>"; };
 		92D211932370832900128AE2 /* raster3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster3d.c; path = evg/raster3d.c; sourceTree = "<group>"; };
-		92D3C6262031E94F00BA1735 /* atsc_dmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atsc_dmx.c; sourceTree = "<group>"; };
-		92D3C6282031E98600BA1735 /* atsc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = atsc.h; path = ../include/gpac/atsc.h; sourceTree = "<group>"; };
 		92D5356F1A5C0CF700F2442A /* carbon_events.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = carbon_events.c; path = ../../applications/mp4client/carbon_events.c; sourceTree = "<group>"; };
 		92D6C5992343BED700262217 /* scene_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = scene_js.c; path = jsmods/scene_js.c; sourceTree = "<group>"; };
 		92D6C59A2343BED700262217 /* xhr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xhr.c; path = jsmods/xhr.c; sourceTree = "<group>"; };
 		92D6C59D2343BEFF00262217 /* svg_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_js.c; sourceTree = "<group>"; };
 		92D6C59E2343BEFF00262217 /* vrml_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_js.c; sourceTree = "<group>"; };
 		92D6C59F2343BEFF00262217 /* dom_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dom_js.c; sourceTree = "<group>"; };
+		92D7A2E425D580DC00FD4034 /* fileimport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fileimport.c; path = ../../applications/mp4box/fileimport.c; sourceTree = "<group>"; };
+		92D7A2E525D580DD00FD4034 /* live.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = live.c; path = ../../applications/mp4box/live.c; sourceTree = "<group>"; };
+		92D7A2E625D580DD00FD4034 /* mp4box.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mp4box.h; path = ../../applications/mp4box/mp4box.h; sourceTree = "<group>"; };
+		92D7A2E725D580DD00FD4034 /* filedump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filedump.c; path = ../../applications/mp4box/filedump.c; sourceTree = "<group>"; };
+		92D7A2E825D580DD00FD4034 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/mp4box/main.c; sourceTree = "<group>"; };
 		92DB148B1E4F05B500382A81 /* filters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = filters.h; path = ../include/gpac/filters.h; sourceTree = "<group>"; };
 		92DB148C1E4F05B500382A81 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = main.h; path = ../include/gpac/main.h; sourceTree = "<group>"; };
 		92E164A820F8EBAE0024A9CA /* dec_nvdec_sdk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_nvdec_sdk.c; path = filters/dec_nvdec_sdk.c; sourceTree = "<group>"; };
@@ -1196,6 +1209,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92C23723257841A100CD59A9 /* CoreAudio.framework in Frameworks */,
 				92BD5571205AE9BD007C4C06 /* AppKit.framework in Frameworks */,
 				92BD556D205AE99A007C4C06 /* OpenGL.framework in Frameworks */,
 				92BD556B205AE974007C4C06 /* CoreGraphics.framework in Frameworks */,
@@ -1277,7 +1291,6 @@
 		9201002218D5A444003D1ACA /* media_tools */ = {
 			isa = PBXGroup;
 			children = (
-				92D3C6262031E94F00BA1735 /* atsc_dmx.c */,
 				9201002318D5A444003D1ACA /* ait.c */,
 				9201002418D5A444003D1ACA /* av_parsers.c */,
 				9201002518D5A444003D1ACA /* avilib.c */,
@@ -1299,6 +1312,7 @@
 				9201003918D5A444003D1ACA /* mpeg2_ps.h */,
 				9201003A18D5A444003D1ACA /* mpegts.c */,
 				9201003B18D5A444003D1ACA /* reedsolomon.c */,
+				928E9FA0250F5BB9000C0631 /* route_dmx.c */,
 				9201003C18D5A444003D1ACA /* saf.c */,
 				9201003E18D5A444003D1ACA /* vobsub.c */,
 				9201003F18D5A444003D1ACA /* webvtt.c */,
@@ -1426,6 +1440,7 @@
 		9201F92718D5A359003D1ACA = {
 			isa = PBXGroup;
 			children = (
+				92609BD3252F570200DB821E /* share */,
 				92912946218A3B2B004F1A6C /* README.md */,
 				92FA48841D0191570072C8A4 /* linklibs */,
 				92BE50AE18D6378C00AA59D8 /* xcode */,
@@ -1454,6 +1469,7 @@
 		9201FE7E18D5A444003D1ACA /* libgpac */ = {
 			isa = PBXGroup;
 			children = (
+				92609BD2252F56CC00DB821E /* export.cpp */,
 				92BBFC471A71228A006A7735 /* include */,
 				9201FF8918D5A444003D1ACA /* bifs */,
 				9201FF9A18D5A444003D1ACA /* compositor */,
@@ -1646,6 +1662,7 @@
 		92334C8E2333A8B800DA6051 /* quickjs */ = {
 			isa = PBXGroup;
 			children = (
+				9285D1A6266F671F008FCD14 /* quickjs-libc.c */,
 				923EB53123D1B78D00E1FFA1 /* libbf.c */,
 				92910FA7233536620052365D /* cutils.c */,
 				92910FA52335363F0052365D /* libregexp.c */,
@@ -1766,11 +1783,35 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		92B7DC0F2549A0E80086EC57 /* isobmf_dmx */ = {
+			isa = PBXGroup;
+			children = (
+				92BB85611F7BFB62009BC9C8 /* isoffin.h */,
+				92BB85641F7BFB63009BC9C8 /* isoffin_load.c */,
+				92BB85531F7BFB60009BC9C8 /* isoffin_read_ch.c */,
+				92BB85651F7BFB63009BC9C8 /* isoffin_read.c */,
+			);
+			name = isobmf_dmx;
+			sourceTree = "<group>";
+		};
+		92B7DC102549A1310086EC57 /* ffmpeg */ = {
+			isa = PBXGroup;
+			children = (
+				92BB855C1F7BFB61009BC9C8 /* ff_common.c */,
+				926245971FD691A000184072 /* ff_common.h */,
+				928607122396DF8500FDA1ED /* ff_avf.c */,
+				92BB85501F7BFB60009BC9C8 /* ff_dec.c */,
+				92BB85601F7BFB62009BC9C8 /* ff_dmx.c */,
+				92E9167B2073F1DB00EE92FB /* ff_enc.c */,
+				9286070A23884A6B00FDA1ED /* ff_mx.c */,
+				92E318CE20645036007BE021 /* ff_rescale.c */,
+			);
+			name = ffmpeg;
+			sourceTree = "<group>";
+		};
 		92BBFC471A71228A006A7735 /* include */ = {
 			isa = PBXGroup;
 			children = (
-				9225DD742326790C00F94C42 /* mpd.h */,
-				92D3C6282031E98600BA1735 /* atsc.h */,
 				92BBFC481A7122AD006A7735 /* ait.h */,
 				92BBFC491A7122AD006A7735 /* avparse.h */,
 				92BBFC4A1A7122AD006A7735 /* base_coding.h */,
@@ -1808,15 +1849,16 @@
 				92BBFC811A7122AD006A7735 /* modules */,
 				92BBFC8C1A7122AD006A7735 /* mpeg4_odf.h */,
 				92BBFC8D1A7122AD006A7735 /* mpegts.h */,
+				9225DD742326790C00F94C42 /* mpd.h */,
 				92BBFC8E1A7122AD006A7735 /* network.h */,
 				92BBFC8F1A7122AD006A7735 /* nodes_mpeg4.h */,
 				92BBFC901A7122AD006A7735 /* nodes_svg.h */,
 				92BBFC911A7122AD006A7735 /* nodes_x3d.h */,
-				92BBFC921A7122AD006A7735 /* nodes_xbl.h */,
 				92BBFC931A7122AD006A7735 /* options.h */,
 				92BBFC941A7122AD006A7735 /* path2d.h */,
 				92BBFC951A7122AD006A7735 /* revision.h */,
 				9231B3AE2321533F00ADB4A9 /* Remotery.h */,
+				928E9F9E250F5BA6000C0631 /* route.h */,
 				92BBFC971A7122AD006A7735 /* rtp_streamer.h */,
 				92BBFC981A7122AD006A7735 /* scene_engine.h */,
 				92BBFC991A7122AD006A7735 /* scene_manager.h */,
@@ -1856,13 +1898,11 @@
 				92BBFC6A1A7122AD006A7735 /* m3u8.h */,
 				92BBFC6B1A7122AD006A7735 /* media_dev.h */,
 				92BBFC6C1A7122AD006A7735 /* mesh.h */,
-				92BBFC6D1A7122AD006A7735 /* mpd.h */,
 				92BBFC6E1A7122AD006A7735 /* odf_dev.h */,
 				92BBFC6F1A7122AD006A7735 /* odf_parse_common.h */,
 				92BBFC701A7122AD006A7735 /* ogg.h */,
 				92BBFC711A7122AD006A7735 /* reedsolomon.h */,
 				92BBFC721A7122AD006A7735 /* scenegraph_dev.h */,
-				92BBFC731A7122AD006A7735 /* smjs_api.h */,
 				92BBFC741A7122AD006A7735 /* swf_dev.h */,
 				92BBFC761A7122AD006A7735 /* vobsub.h */,
 			);
@@ -1876,32 +1916,18 @@
 				92BBFC821A7122AD006A7735 /* audio_out.h */,
 				92BBFC841A7122AD006A7735 /* font.h */,
 				92BBFC851A7122AD006A7735 /* hardcoded_proto.h */,
-				92BBFC871A7122AD006A7735 /* js_usr.h */,
-				92BBFC881A7122AD006A7735 /* raster2d.h */,
 				92BBFC8B1A7122AD006A7735 /* video_out.h */,
 			);
 			name = modules;
 			path = ../include/gpac/modules;
 			sourceTree = "<group>";
 		};
-		92BE509218D6325E00AA59D8 /* MP4Box */ = {
-			isa = PBXGroup;
-			children = (
-				92BE50A418D6348A00AA59D8 /* filedump.c */,
-				92BE50A518D6348A00AA59D8 /* fileimport.c */,
-				92BE50A618D6348A00AA59D8 /* live.c */,
-				92BE50A718D6348A00AA59D8 /* main.c */,
-			);
-			path = MP4Box;
-			sourceTree = "<group>";
-		};
 		92BE50AC18D6375100AA59D8 /* applications */ = {
 			isa = PBXGroup;
 			children = (
-				929383A32355A86F00AAAFA8 /* main.c */,
+				92D7A2E325D580B200FD4034 /* MP4Box */,
 				9251CA871E9D3DFE0089DDC6 /* MP4Client */,
 				927AACF81E44ED5C008C8E69 /* gpac */,
-				92BE509218D6325E00AA59D8 /* MP4Box */,
 			);
 			name = applications;
 			sourceTree = "<group>";
@@ -1953,6 +1979,18 @@
 			name = jsmods;
 			sourceTree = "<group>";
 		};
+		92D7A2E325D580B200FD4034 /* MP4Box */ = {
+			isa = PBXGroup;
+			children = (
+				92D7A2E725D580DD00FD4034 /* filedump.c */,
+				92D7A2E425D580DC00FD4034 /* fileimport.c */,
+				92D7A2E525D580DD00FD4034 /* live.c */,
+				92D7A2E825D580DD00FD4034 /* main.c */,
+				92D7A2E625D580DD00FD4034 /* mp4box.h */,
+			);
+			name = MP4Box;
+			sourceTree = "<group>";
+		};
 		92E164AE20F8EBB60024A9CA /* nvdec */ = {
 			isa = PBXGroup;
 			children = (
@@ -1982,6 +2020,8 @@
 		92F8D47E1F71643600616F7C /* filters */ = {
 			isa = PBXGroup;
 			children = (
+				925E564B2798B87300BBD530 /* bs_agg.c */,
+				926D48FC27957D8400E3C68C /* bs_split.c */,
 				9274295724647AB8009ADD8D /* bsrw.c */,
 				92BB85581F7BFB61009BC9C8 /* compose.c */,
 				92FE596C2088E52900CF0C5A /* dasher.c */,
@@ -2017,29 +2057,20 @@
 				9239B8D5207369E5005F7264 /* enc_jpg.c */,
 				9239B8D72073AFEF005F7264 /* enc_png.c */,
 				92256CCC20E0DA26004EB243 /* encrypt_cenc_isma.c */,
-				92BB855C1F7BFB61009BC9C8 /* ff_common.c */,
-				926245971FD691A000184072 /* ff_common.h */,
-				928607122396DF8500FDA1ED /* ff_avf.c */,
-				92BB85501F7BFB60009BC9C8 /* ff_dec.c */,
-				92BB85601F7BFB62009BC9C8 /* ff_dmx.c */,
-				92E9167B2073F1DB00EE92FB /* ff_enc.c */,
-				9286070A23884A6B00FDA1ED /* ff_mx.c */,
-				92E318CE20645036007BE021 /* ff_rescale.c */,
+				92B7DC102549A1310086EC57 /* ffmpeg */,
 				92754D5F207D24F600170383 /* filelist.c */,
 				92B2A4A8229D64EF002A65A7 /* hevcmerge.c */,
 				92B2A4A9229D64EF002A65A7 /* hevcsplit.c */,
-				92A505B920FC833800049B29 /* in_atsc.c */,
 				92B9A5061F83FD7700A24FE4 /* in_dvb4linux.c */,
 				92BB855A1F7BFB61009BC9C8 /* in_file.c */,
 				92BB855E1F7BFB61009BC9C8 /* in_http.c */,
 				9206822B20EA41530041169F /* in_pipe.c */,
+				928E9FA2250F5BC9000C0631 /* in_route.c */,
 				9234CF4C1FD8344500CCDFA1 /* in_rtp */,
 				9203644C20EE0F190087883E /* in_sock.c */,
 				92BB855F1F7BFB62009BC9C8 /* inspect.c */,
-				92BB85641F7BFB63009BC9C8 /* isoffin_load.c */,
-				92BB85531F7BFB60009BC9C8 /* isoffin_read_ch.c */,
-				92BB85651F7BFB63009BC9C8 /* isoffin_read.c */,
-				92BB85611F7BFB62009BC9C8 /* isoffin.h */,
+				9288A53A25AF6E6F006F7355 /* io_fcryp.c */,
+				92B7DC0F2549A0E80086EC57 /* isobmf_dmx */,
 				92334CE02333AF0400DA6051 /* jsfilter.c */,
 				92BB85621F7BFB63009BC9C8 /* load_bt_xmt.c */,
 				92EE76401FD0315D008926F5 /* load_text.c */,
@@ -2053,6 +2084,7 @@
 				9289D9F41FDEFFCD00C24F83 /* out_file.c */,
 				92261A86239A6E4600C14199 /* out_http.c */,
 				9206822D20EA69680041169F /* out_pipe.c */,
+				92A870FD251110E50047560D /* out_route.c */,
 				92C0F37D21EC7BB0002961C8 /* out_rtp.c */,
 				92B2A4A42297FD9E002A65A7 /* out_rtsp.c */,
 				9203644E20EE12470087883E /* out_sock.c */,
@@ -2066,6 +2098,7 @@
 				92EC32CC1FAC81D5003FB9C3 /* reframe_h263.c */,
 				92BB85541F7BFB60009BC9C8 /* reframe_img.c */,
 				927DB14B21A3C7100032D205 /* reframe_latm.c */,
+				9251E5432524EB9700CEB84D /* reframe_mhas.c */,
 				92BB855B1F7BFB61009BC9C8 /* reframe_mp3.c */,
 				9288E8631FB1BF07005460C5 /* reframe_mpgvid.c */,
 				92CDAEE71FBD9D0C0007C1C0 /* reframe_nalu.c */,
@@ -2073,13 +2106,17 @@
 				92EC32CA1FAC5ACA003FB9C3 /* reframe_qcp.c */,
 				924E805E206D427A00AB580F /* reframe_rawpcm.c */,
 				924E805C206D357A00AB580F /* reframe_rawvid.c */,
+				9288A4A125ADB1DD006F7355 /* reframe_truehd.c */,
 				92E2498F2057B973002CC029 /* resample_audio.c */,
+				9265307927AD295200DEBE4B /* restamp.c */,
 				92FA79422076687100AE005F /* rewind.c */,
 				9257307D2056948D009DB328 /* rewrite_adts.c */,
+				9290E74F25263FC300BC0EE3 /* rewrite_mhas.c */,
 				925730812056A610009DB328 /* rewrite_mp4v.c */,
 				9257307E2056948D009DB328 /* rewrite_nalu.c */,
 				92EB479220F6333800E1F2DD /* rewrite_obu.c */,
 				92A08DBC20D946B6003589FF /* tileagg.c */,
+				92C236DC25769BA500CD59A9 /* tilesplit.c */,
 				9286070E239576D900FDA1ED /* tssplit.c */,
 				92BB85631F7BFB63009BC9C8 /* unit_test_filter.c */,
 				92E318D020651834007BE021 /* vcrop.c */,
@@ -2172,7 +2209,6 @@
 				92BBFD081A7122AD006A7735 /* utf.h in Headers */,
 				92BBFCD11A7122AD006A7735 /* odf_parse_common.h in Headers */,
 				92BBFD091A7122AD006A7735 /* version.h in Headers */,
-				92BBFCE81A7122AD006A7735 /* js_usr.h in Headers */,
 				9225DD752326790C00F94C42 /* mpd.h in Headers */,
 				92BBFCB21A7122AD006A7735 /* compositor.h in Headers */,
 				92BBFCAB1A7122AD006A7735 /* ait.h in Headers */,
@@ -2180,7 +2216,6 @@
 				92BBFCB51A7122AD006A7735 /* constants.h in Headers */,
 				92BBFD041A7122AD006A7735 /* token.h in Headers */,
 				92BBFCB11A7122AD006A7735 /* color.h in Headers */,
-				92BBFCD51A7122AD006A7735 /* smjs_api.h in Headers */,
 				92BBFCF41A7122AD006A7735 /* options.h in Headers */,
 				92BBFCAD1A7122AD006A7735 /* base_coding.h in Headers */,
 				92BBFCE51A7122AD006A7735 /* font.h in Headers */,
@@ -2200,7 +2235,6 @@
 				92B9A5AA1F8660D700A24FE4 /* texturing.h in Headers */,
 				92BBFCFC1A7122AD006A7735 /* scenegraph_vrml.h in Headers */,
 				92BB85771F7BFB63009BC9C8 /* isoffin.h in Headers */,
-				92BBFCE91A7122AD006A7735 /* raster2d.h in Headers */,
 				92BBFD031A7122AD006A7735 /* thread.h in Headers */,
 				92BBFD051A7122AD006A7735 /* tools.h in Headers */,
 				92BBFCB91A7122AD006A7735 /* dsmcc.h in Headers */,
@@ -2223,7 +2257,6 @@
 				920101B418D5A445003D1ACA /* module_wrap.h in Headers */,
 				92BBFD001A7122AD006A7735 /* sync_layer.h in Headers */,
 				92DB148D1E4F05B500382A81 /* filters.h in Headers */,
-				92D3C6292031E98600BA1735 /* atsc.h in Headers */,
 				92BBFD011A7122AD006A7735 /* term_info.h in Headers */,
 				92BBFCF01A7122AD006A7735 /* nodes_mpeg4.h in Headers */,
 				92BBFCDA1A7122AD006A7735 /* iso639.h in Headers */,
@@ -2234,14 +2267,13 @@
 				92BBFCFF1A7122AD006A7735 /* svg_types.h in Headers */,
 				9234CF491FD8344000CCDFA1 /* in_rtp.h in Headers */,
 				92BBFCD21A7122AD006A7735 /* ogg.h in Headers */,
-				92BBFCF31A7122AD006A7735 /* nodes_xbl.h in Headers */,
+				928E9F9F250F5BA6000C0631 /* route.h in Headers */,
 				92BBFCDD1A7122AD006A7735 /* list.h in Headers */,
 				92BBFCB81A7122AD006A7735 /* download.h in Headers */,
 				92B9A5A21F8660D700A24FE4 /* mpeg4_grouping.h in Headers */,
 				925975082215BAC30007E02B /* evg.h in Headers */,
 				92BBFCB41A7122AD006A7735 /* configuration.h in Headers */,
 				92BBFCEF1A7122AD006A7735 /* network.h in Headers */,
-				92BBFCCF1A7122AD006A7735 /* mpd.h in Headers */,
 				92B9A5751F8660D700A24FE4 /* drawable.h in Headers */,
 				92BBFCD01A7122AD006A7735 /* odf_dev.h in Headers */,
 				92BBFCCD1A7122AD006A7735 /* media_dev.h in Headers */,
@@ -2410,7 +2442,7 @@
 		9201F92918D5A359003D1ACA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1210;
 				ORGANIZATIONNAME = "Telecom ParisTech";
 				TargetAttributes = {
 					927AACFC1E44EEDC008C8E69 = {
@@ -2480,15 +2512,18 @@
 				9212C0FB222D7AC000FE3580 /* vflip.c in Sources */,
 				92B9A5661F8660D700A24FE4 /* svg_font.c in Sources */,
 				92B9A5AC1F8660D700A24FE4 /* svg_media.c in Sources */,
+				9251E5442524EB9800CEB84D /* reframe_mhas.c in Sources */,
 				920101B718D5A445003D1ACA /* os_module.c in Sources */,
 				92B9A5A41F8660D700A24FE4 /* scene.c in Sources */,
 				922CF1251FCEE5D600F2F6A4 /* dmx_mpegps.c in Sources */,
 				925730802056948D009DB328 /* rewrite_nalu.c in Sources */,
+				9285D1A7266F671F008FCD14 /* quickjs-libc.c in Sources */,
 				920100B018D5A444003D1ACA /* arith_decoder.c in Sources */,
 				92B9A5A11F8660D700A24FE4 /* mpeg4_textures.c in Sources */,
 				92B9A58B1F8660D700A24FE4 /* mpeg4_path_layout.c in Sources */,
 				920100B118D5A444003D1ACA /* bifs_codec.c in Sources */,
 				92F8D47B1F71642E00616F7C /* filter_session.c in Sources */,
+				9265307A27AD295200DEBE4B /* restamp.c in Sources */,
 				92E249902057B973002CC029 /* resample_audio.c in Sources */,
 				920100B218D5A444003D1ACA /* bifs_node_tables.c in Sources */,
 				920100B318D5A444003D1ACA /* com_dec.c in Sources */,
@@ -2576,6 +2611,7 @@
 				92EE76411FD0315D008926F5 /* load_text.c in Sources */,
 				92FE596D2088E52900CF0C5A /* dasher.c in Sources */,
 				9201011918D5A444003D1ACA /* box_code_drm.c in Sources */,
+				92C236DD25769BA500CD59A9 /* tilesplit.c in Sources */,
 				9201011A18D5A444003D1ACA /* box_code_meta.c in Sources */,
 				9201011B18D5A444003D1ACA /* box_dump.c in Sources */,
 				9201011C18D5A444003D1ACA /* box_funcs.c in Sources */,
@@ -2585,13 +2621,13 @@
 				92BB857D1F7BFD80009BC9C8 /* dec_xvid.c in Sources */,
 				92334CE12333AF0400DA6051 /* jsfilter.c in Sources */,
 				9201012118D5A444003D1ACA /* hinting.c in Sources */,
-				92A505BA20FC833800049B29 /* in_atsc.c in Sources */,
 				92B9A5871F8660D700A24FE4 /* mpeg4_timesensor.c in Sources */,
 				9201012218D5A444003D1ACA /* isom_intern.c in Sources */,
 				9201012318D5A444003D1ACA /* isom_read.c in Sources */,
 				9210D007237041C2007AFB48 /* ftgrays.c in Sources */,
 				92B9A5B41F8660D700A24FE4 /* visual_manager_3d.c in Sources */,
 				92D6C59B2343BED700262217 /* scene_js.c in Sources */,
+				928E9FA3250F5BC9000C0631 /* in_route.c in Sources */,
 				9289D9F51FDEFFCE00C24F83 /* out_file.c in Sources */,
 				9201012418D5A444003D1ACA /* isom_store.c in Sources */,
 				92BB85791F7BFB63009BC9C8 /* unit_test_filter.c in Sources */,
@@ -2617,6 +2653,7 @@
 				9257307F2056948D009DB328 /* rewrite_adts.c in Sources */,
 				92BA0ADA243B6E2B006FC74E /* dektec_video_decl.c in Sources */,
 				9201013118D5A444003D1ACA /* lsr_enc.c in Sources */,
+				928E9FA1250F5BB9000C0631 /* route_dmx.c in Sources */,
 				9201013218D5A445003D1ACA /* lsr_tables.c in Sources */,
 				92E164AB20F8EBAE0024A9CA /* dec_nvdec_sdk.c in Sources */,
 				924E805D206D357A00AB580F /* reframe_rawvid.c in Sources */,
@@ -2649,6 +2686,7 @@
 				9201014D18D5A445003D1ACA /* img.c in Sources */,
 				9201014F18D5A445003D1ACA /* isom_hinter.c in Sources */,
 				9201015018D5A445003D1ACA /* isom_tools.c in Sources */,
+				9288A4A225ADB1DD006F7355 /* reframe_truehd.c in Sources */,
 				92B9A5811F8660D700A24FE4 /* svg_geometry.c in Sources */,
 				9201015118D5A445003D1ACA /* m2ts_mux.c in Sources */,
 				9201015218D5A445003D1ACA /* m3u8.c in Sources */,
@@ -2701,6 +2739,7 @@
 				9201016918D5A445003D1ACA /* qos.c in Sources */,
 				9206822E20EA69680041169F /* out_pipe.c in Sources */,
 				92493D8020E2A64000203C2C /* crypt_tools.c in Sources */,
+				9290E75025263FC300BC0EE3 /* rewrite_mhas.c in Sources */,
 				925974FE2215BA3A0007E02B /* raster_rgb.c in Sources */,
 				9201016A18D5A445003D1ACA /* slc.c in Sources */,
 				92586A7F1EAA5A4300A0838A /* validator.c in Sources */,
@@ -2718,6 +2757,7 @@
 				92B9A5741F8660D700A24FE4 /* compositor_2d.c in Sources */,
 				92BB85741F7BFB63009BC9C8 /* in_http.c in Sources */,
 				92B9A57B1F8660D700A24FE4 /* navigate.c in Sources */,
+				9288A53B25AF6E6F006F7355 /* io_fcryp.c in Sources */,
 				92B9A59A1F8660D700A24FE4 /* texturing.c in Sources */,
 				9201016E18D5A445003D1ACA /* loader_qt.c in Sources */,
 				9201016F18D5A445003D1ACA /* loader_svg.c in Sources */,
@@ -2731,6 +2771,7 @@
 				926CE14F1FE81865002B3CF6 /* constants.c in Sources */,
 				9201017418D5A445003D1ACA /* scene_stats.c in Sources */,
 				9201017518D5A445003D1ACA /* swf_bifs.c in Sources */,
+				926D48FD27957D8400E3C68C /* bs_split.c in Sources */,
 				923E89CB20B6F04600F299B2 /* g_crypt_openssl.c in Sources */,
 				92B9A57F1F8660D700A24FE4 /* offscreen_cache.c in Sources */,
 				92B9A59E1F8660D700A24FE4 /* mesh.c in Sources */,
@@ -2752,9 +2793,9 @@
 				92910FA8233536620052365D /* cutils.c in Sources */,
 				9201017B18D5A445003D1ACA /* dom_events.c in Sources */,
 				92B9A56A1F8660D700A24FE4 /* svg_grouping.c in Sources */,
-				92D3C6272031E94F00BA1735 /* atsc_dmx.c in Sources */,
 				925975002215BA3A0007E02B /* raster_565.c in Sources */,
 				9234CF391FD6A6E400CCDFA1 /* dec_ttxt.c in Sources */,
+				92A870FE251110E50047560D /* out_route.c in Sources */,
 				92B9A56C1F8660D700A24FE4 /* svg_base.c in Sources */,
 				92BB85681F7BFB63009BC9C8 /* dec_bifs.c in Sources */,
 				9201017F18D5A445003D1ACA /* mpeg4_animators.c in Sources */,
@@ -2823,6 +2864,7 @@
 				920101B518D5A445003D1ACA /* os_config_init.c in Sources */,
 				920101B818D5A445003D1ACA /* os_net.c in Sources */,
 				920101B918D5A445003D1ACA /* os_thread.c in Sources */,
+				925E564C2798B87300BBD530 /* bs_agg.c in Sources */,
 				927DB14C21A3C7100032D205 /* reframe_latm.c in Sources */,
 				920101BA18D5A445003D1ACA /* path2d.c in Sources */,
 				920101BB18D5A445003D1ACA /* path2d_stroker.c in Sources */,
@@ -2876,10 +2918,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92BE50A818D6348A00AA59D8 /* filedump.c in Sources */,
-				92BE50A918D6348A00AA59D8 /* fileimport.c in Sources */,
-				92BE50AA18D6348A00AA59D8 /* live.c in Sources */,
-				92BE50AB18D6348A00AA59D8 /* main.c in Sources */,
+				92D7A2EC25D580DD00FD4034 /* main.c in Sources */,
+				92D7A2EB25D580DD00FD4034 /* filedump.c in Sources */,
+				92D7A2E925D580DD00FD4034 /* fileimport.c in Sources */,
+				92D7A2EA25D580DD00FD4034 /* live.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2966,6 +3008,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3011,6 +3054,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3043,6 +3087,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				COMBINE_HIDPI_IMAGES = YES;
@@ -3056,29 +3101,7 @@
 					GPAC_STATIC_MODULES,
 					GPAC_CONFIG_DARWIN,
 					CONFIG_DARWIN_GL,
-					NO_JS_RUNTIMETHREAD,
-					SPIDERMONKEY_NEW_API,
-					"DEBUG=1",
-					GPAC_AMR_IN_STANDALONE,
-					GPAC_HAS_MAD,
-					GPAC_HAS_FAAD,
-					GPAC_HAS_XVID,
-					GPAC_HAS_JP2,
-					GPAC_HAS_LIBA52,
-					GPAC_HAS_VORBIS,
-					GPAC_HAS_THEORA,
-					GPAC_HAS_OPENSVC,
-					GPAC_HAS_OPENHEVC,
-					GPAC_HAS_FFMPEG,
-				);
-				"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = (
-					GPAC_STATIC_MODULES,
-					GPAC_CONFIG_DARWIN,
-					CONFIG_DARWIN_GL,
-					NO_JS_RUNTIMETHREAD,
-					SPIDERMONKEY_NEW_API,
 					"DEBUG=1",
-					GPAC_AMR_IN_STANDALONE,
 					GPAC_HAS_MAD,
 					GPAC_HAS_FAAD,
 					GPAC_HAS_XVID,
@@ -3089,6 +3112,7 @@
 					GPAC_HAS_OPENSVC,
 					GPAC_HAS_OPENHEVC,
 					GPAC_HAS_FFMPEG,
+					FFMPEG_ENABLE_VVC,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
@@ -3102,17 +3126,15 @@
 				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					/opt/local/include,
-					/opt/local/include/mozjs185,
-					/opt/local/include/nspr,
 					../../include,
+					/opt/local/include,
 					/usr/local/include,
 					"/opt/local/include/openjpeg-1.5",
+					"/usr/local/include/openjpeg-1.5",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					/usr/local/lib,
 					/opt/local/lib,
-					/opt/local/lib/nspr,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OBJROOT = build;
@@ -3124,10 +3146,6 @@
 					"-lssl",
 					"-ljpeg",
 					"-lpng",
-					"-lmozjs185",
-					"-lplds4",
-					"-lplc4",
-					"-lnspr4",
 					"-lz",
 					"-lavcodec",
 					"-lavformat",
@@ -3138,9 +3156,10 @@
 					"-lx264",
 					"-lx265",
 					"-lavdevice",
-					"-lavfilter",
-					"-lavresample",
 					"-lpostproc",
+					"-lavresample",
+					"-lavfilter",
+					"-ldav1d",
 					"-liconv",
 					"-weak_framework",
 					VideoDecodeAcceleration,
@@ -3166,7 +3185,28 @@
 					"-laom",
 					"-lvpx",
 					"-llzma",
+					"-lkvazaar",
+					"-lnghttp2",
+					"-lvmaf",
+					"-lvvdec",
+					"-lc++",
+					"-lxml2",
+					"-lmp3lame",
 					"-lvpx",
+					"-weak_framework",
+					VideoToolbox,
+					"-weak_framework",
+					CoreFoundation,
+					"-weak_framework",
+					CoreMedia,
+					"-weak_framework",
+					CoreVideo,
+					"-weak_framework",
+					CoreImage,
+					"-weak_framework",
+					CoreServices,
+					"-framework",
+					Metal,
 				);
 				PRODUCT_NAME = gpac;
 				SDKROOT = macosx;
@@ -3179,6 +3219,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				COMBINE_HIDPI_IMAGES = YES;
@@ -3191,9 +3232,6 @@
 					GPAC_STATIC_MODULES,
 					GPAC_CONFIG_DARWIN,
 					CONFIG_DARWIN_GL,
-					NO_JS_RUNTIMETHREAD,
-					SPIDERMONKEY_NEW_API,
-					GPAC_AMR_IN_STANDALONE,
 					GPAC_HAS_MAD,
 					GPAC_HAS_FAAD,
 					GPAC_HAS_XVID,
@@ -3204,6 +3242,7 @@
 					GPAC_HAS_OPENSVC,
 					GPAC_HAS_OPENHEVC,
 					GPAC_HAS_FFMPEG,
+					FFMPEG_ENABLE_VVC,
 				);
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
@@ -3216,17 +3255,15 @@
 				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					/opt/local/include,
-					/opt/local/include/mozjs185,
-					/opt/local/include/nspr,
 					../../include,
+					/opt/local/include,
 					/usr/local/include,
 					"/opt/local/include/openjpeg-1.5",
+					"/usr/local/include/openjpeg-1.5",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					/usr/local/lib,
 					/opt/local/lib,
-					/opt/local/lib/nspr,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OBJROOT = build;
@@ -3237,10 +3274,6 @@
 					"-lssl",
 					"-ljpeg",
 					"-lpng",
-					"-lmozjs185",
-					"-lplds4",
-					"-lplc4",
-					"-lnspr4",
 					"-lz",
 					"-lavcodec",
 					"-lavformat",
@@ -3251,9 +3284,10 @@
 					"-lx264",
 					"-lx265",
 					"-lavdevice",
-					"-lavfilter",
-					"-lavresample",
 					"-lpostproc",
+					"-lavresample",
+					"-lavfilter",
+					"-ldav1d",
 					"-liconv",
 					"-weak_framework",
 					VideoDecodeAcceleration,
@@ -3279,7 +3313,28 @@
 					"-laom",
 					"-lvpx",
 					"-llzma",
+					"-lkvazaar",
+					"-lnghttp2",
+					"-lvmaf",
+					"-lvvdec",
+					"-lc++",
+					"-lxml2",
+					"-lmp3lame",
 					"-lvpx",
+					"-weak_framework",
+					VideoToolbox,
+					"-weak_framework",
+					CoreFoundation,
+					"-weak_framework",
+					CoreMedia,
+					"-weak_framework",
+					CoreVideo,
+					"-weak_framework",
+					CoreImage,
+					"-weak_framework",
+					CoreServices,
+					"-framework",
+					Metal,
 				);
 				PRODUCT_NAME = gpac;
 				SDKROOT = macosx;
@@ -3292,6 +3347,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -3314,7 +3370,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				LIBRARY_SEARCH_PATHS = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -3325,6 +3381,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -3342,7 +3399,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				LIBRARY_SEARCH_PATHS = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -3353,6 +3410,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
@@ -3376,8 +3434,8 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					/usr/local/include/SDL2,
 					../../include,
+					/usr/local/include/SDL2,
 					/opt/local/include/SDL2,
 				);
 				INSTALL_PATH = "";
@@ -3397,6 +3455,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
@@ -3414,8 +3473,8 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					/usr/local/include/SDL2,
 					../../include,
+					/usr/local/include/SDL2,
 					/opt/local/include/SDL2,
 				);
 				INSTALL_PATH = "";
@@ -3434,6 +3493,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
@@ -3454,11 +3514,14 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					../../include,
-					/usr/include/freetype2,
 					/opt/local/include/freetype2,
+					/usr/local/include/freetype2,
 				);
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				LIBRARY_SEARCH_PATHS = (
+					/opt/local/lib,
+					/usr/local/lib,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-lfreetype";
@@ -3471,6 +3534,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
@@ -3485,11 +3549,14 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					../../include,
-					/usr/include/freetype2,
 					/opt/local/include/freetype2,
+					/usr/local/include/freetype2,
 				);
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				LIBRARY_SEARCH_PATHS = (
+					/opt/local/lib,
+					/usr/local/lib,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_LDFLAGS = "-lfreetype";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3501,7 +3568,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -3532,7 +3601,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3556,7 +3627,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -3586,7 +3659,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3609,11 +3684,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_MODULES = NO;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -3641,11 +3717,17 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/opt/local/include,
+					/usr/local/include,
+					../../extra_lib/include,
+				);
 				LIBRARY_SEARCH_PATHS = (
 					/usr/local/lib,
 					/opt/local/lib,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "-lopenhevc";
@@ -3659,11 +3741,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_MODULES = NO;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -3689,11 +3772,17 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/opt/local/include,
+					/usr/local/include,
+					../../extra_lib/include,
+				);
 				LIBRARY_SEARCH_PATHS = (
 					/usr/local/lib,
 					/opt/local/lib,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "-lopenhevc";

gpac-1.0.1.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj -> gpac-2.0.0.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj Changed

@@ -15,7 +15,6 @@
 		0496F09B16DE35C9009D9D8D /* libgpac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71CCF1311277037A00339E12 /* libgpac_static.a */; };
 		0496F09C16DE36BC009D9D8D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847813127860F000917298 /* libz.dylib */; };
 		04EFB63516E51E4200D1D44A /* libglues.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EFB63416E51E4200D1D44A /* libglues.a */; };
-		285DBB49170F17D700AF2B9B /* ffmpeg_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 285DBB48170F17D700AF2B9B /* ffmpeg_in.h */; };
 		285DBBA01712C80E00AF2B9B /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9B1712C80E00AF2B9B /* libavcodec.a */; };
 		285DBBA11712C80E00AF2B9B /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9C1712C80E00AF2B9B /* libavformat.a */; };
 		285DBBA21712C80E00AF2B9B /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9D1712C80E00AF2B9B /* libavutil.a */; };
@@ -317,9 +316,9 @@
 		71CCF3FE12770A8C00339E12 /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3AF12770A8C00339E12 /* utf.h */; };
 		71CCF3FF12770A8C00339E12 /* xml.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3B012770A8C00339E12 /* xml.h */; };
 		71EC88E11396273B004DCB6A /* osmo.icns in Resources */ = {isa = PBXBuildFile; fileRef = 71EC88E01396273B004DCB6A /* osmo.icns */; };
+		8925C0EE25DD6F8900AFB064 /* libnghttp2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8925C0ED25DD6F8900AFB064 /* libnghttp2.a */; };
 		8959AC77211C9A26004D2C87 /* dmx_gsf.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC76211C9A26004D2C87 /* dmx_gsf.c */; };
 		8959AC79211C9B29004D2C87 /* reframe_av1.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC78211C9B29004D2C87 /* reframe_av1.c */; };
-		8959AC87211C9C3C004D2C87 /* in_atsc.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC7D211C9C3C004D2C87 /* in_atsc.c */; };
 		8959AC88211C9C3C004D2C87 /* in_pipe.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC7E211C9C3C004D2C87 /* in_pipe.c */; };
 		8959AC89211C9C3C004D2C87 /* in_sock.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC7F211C9C3C004D2C87 /* in_sock.c */; };
 		8959AC8A211C9C3C004D2C87 /* mux_gsf.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC80211C9C3C004D2C87 /* mux_gsf.c */; };
@@ -337,6 +336,8 @@
 		921FEBA61CF881DE00B437C2 /* sensors.h in Headers */ = {isa = PBXBuildFile; fileRef = 921FEBA31CF881DE00B437C2 /* sensors.h */; };
 		921FEBA71CF881DE00B437C2 /* sensors.m in Sources */ = {isa = PBXBuildFile; fileRef = 921FEBA41CF881DE00B437C2 /* sensors.m */; };
 		92261A89239E326900C14199 /* out_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 92261A88239E326900C14199 /* out_http.c */; };
+		9227B8582799F8E700BF3D1B /* bs_agg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9227B8562799F8E600BF3D1B /* bs_agg.c */; };
+		9227B8592799F8E700BF3D1B /* bs_split.c in Sources */ = {isa = PBXBuildFile; fileRef = 9227B8572799F8E600BF3D1B /* bs_split.c */; };
 		922B2774244625B0001D4F72 /* dec_ttml.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B2773244625B0001D4F72 /* dec_ttml.c */; };
 		922EB5801AAE13C500DF46D0 /* dash.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB5781AAE13C500DF46D0 /* dash.h */; };
 		922EB5811AAE13C500DF46D0 /* html5_media.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB5791AAE13C500DF46D0 /* html5_media.h */; };
@@ -350,8 +351,18 @@
 		92334CDA2333AB9A00DA6051 /* cutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 92334CC92333AB9900DA6051 /* cutils.c */; };
 		92334CDB2333AB9A00DA6051 /* libregexp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92334CCA2333AB9A00DA6051 /* libregexp.c */; };
 		92334CDD2333AB9A00DA6051 /* quickjs.h in Headers */ = {isa = PBXBuildFile; fileRef = 92334CCC2333AB9A00DA6051 /* quickjs.h */; };
+		92359C81250F651900525A42 /* main.h in Headers */ = {isa = PBXBuildFile; fileRef = 92359C7B250F651900525A42 /* main.h */; };
+		92359C82250F651900525A42 /* filters.h in Headers */ = {isa = PBXBuildFile; fileRef = 92359C7C250F651900525A42 /* filters.h */; };
+		92359C83250F651900525A42 /* mpd.h in Headers */ = {isa = PBXBuildFile; fileRef = 92359C7D250F651900525A42 /* mpd.h */; };
+		92359C84250F651900525A42 /* route.h in Headers */ = {isa = PBXBuildFile; fileRef = 92359C7E250F651900525A42 /* route.h */; };
+		92359C85250F651900525A42 /* evg.h in Headers */ = {isa = PBXBuildFile; fileRef = 92359C7F250F651900525A42 /* evg.h */; };
+		92359C86250F651900525A42 /* Remotery.h in Headers */ = {isa = PBXBuildFile; fileRef = 92359C80250F651900525A42 /* Remotery.h */; };
+		92359C88250F652700525A42 /* route_dmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 92359C87250F652700525A42 /* route_dmx.c */; };
+		92359C8A250F657B00525A42 /* in_route.c in Sources */ = {isa = PBXBuildFile; fileRef = 92359C89250F657A00525A42 /* in_route.c */; };
 		923EB53423D1B87E00E1FFA1 /* libbf.c in Sources */ = {isa = PBXBuildFile; fileRef = 923EB53323D1B87E00E1FFA1 /* libbf.c */; };
 		9246EE7724A1240600F72EAD /* filter_session_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 9246EE7624A1240600F72EAD /* filter_session_js.c */; };
+		9251E540251E398700CEB84D /* res in Resources */ = {isa = PBXBuildFile; fileRef = 9251E53F251E398600CEB84D /* res */; };
+		9251E542251E39A300CEB84D /* scripts in Resources */ = {isa = PBXBuildFile; fileRef = 9251E541251E39A300CEB84D /* scripts */; };
 		925730A21A0916D20057FF04 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 925730A11A0916D20057FF04 /* libiconv.dylib */; };
 		925730A41A0916DB0057FF04 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 925730A31A0916DB0057FF04 /* libbz2.dylib */; };
 		925FF2A51ABC53F30085B04C /* odf_parse_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 925FF2A31ABC53F30085B04C /* odf_parse_common.h */; };
@@ -364,12 +375,17 @@
 		9281B63021C92D00006B0FD5 /* gui in Resources */ = {isa = PBXBuildFile; fileRef = 9281B62E21C92D00006B0FD5 /* gui */; };
 		9281B63121C92D00006B0FD5 /* shaders in Resources */ = {isa = PBXBuildFile; fileRef = 9281B62F21C92D00006B0FD5 /* shaders */; };
 		92852443237ACC2700165130 /* raster3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92852442237ACC2700165130 /* raster3d.c */; };
+		9285D1C0266FB8D3008FCD14 /* quickjs-libc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9285D1BF266FB8D3008FCD14 /* quickjs-libc.c */; };
 		928607092386C2A000FDA1ED /* reframe_prores.c in Sources */ = {isa = PBXBuildFile; fileRef = 928607082386C2A000FDA1ED /* reframe_prores.c */; };
 		9286070D238BC43D00FDA1ED /* ff_mx.c in Sources */ = {isa = PBXBuildFile; fileRef = 9286070C238BC43D00FDA1ED /* ff_mx.c */; };
 		928607112395C0DE00FDA1ED /* tssplit.c in Sources */ = {isa = PBXBuildFile; fileRef = 928607102395C0DE00FDA1ED /* tssplit.c */; };
 		928607152398F4C800FDA1ED /* ff_avf.c in Sources */ = {isa = PBXBuildFile; fileRef = 928607142398F4C800FDA1ED /* ff_avf.c */; };
+		9288A4B425ADDCED006F7355 /* reframe_truehd.c in Sources */ = {isa = PBXBuildFile; fileRef = 9288A4B325ADDCED006F7355 /* reframe_truehd.c */; };
+		9288A54825AF6FCC006F7355 /* io_fcryp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9288A54725AF6FCC006F7355 /* io_fcryp.c */; };
 		928B2D131BE11BC100CAC65D /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928B2D111BE11BC100CAC65D /* libcrypto.a */; };
 		928B2D141BE11BC100CAC65D /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928B2D121BE11BC100CAC65D /* libssl.a */; };
+		928EB67525271B5800E47747 /* rewrite_mhas.c in Sources */ = {isa = PBXBuildFile; fileRef = 928EB67425271B5800E47747 /* rewrite_mhas.c */; };
+		9290E74E25263F4F00BC0EE3 /* reframe_mhas.c in Sources */ = {isa = PBXBuildFile; fileRef = 9290E74D25263F4E00BC0EE3 /* reframe_mhas.c */; };
 		92910FAA233A44110052365D /* jsfilter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92910FA9233A44110052365D /* jsfilter.c */; };
 		9292BEFF1CFC93C10070EB05 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9292BEFE1CFC93C10070EB05 /* VideoToolbox.framework */; };
 		9292BF011CFC93D50070EB05 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9292BF001CFC93D50070EB05 /* CoreVideo.framework */; };
@@ -385,6 +401,8 @@
 		929A92A016EF8BC200B7C64F /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929A16EF8BC200B7C64F /* icon.png */; };
 		929DE74924183FB40056AFA7 /* gzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 929DE74824183FB40056AFA7 /* gzio.c */; };
 		929FA64321A3E83F000455A7 /* reframe_latm.c in Sources */ = {isa = PBXBuildFile; fileRef = 929FA64221A3E83E000455A7 /* reframe_latm.c */; };
+		92A8710025150CF70047560D /* out_route.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A870FF25150CF70047560D /* out_route.c */; };
+		92AB30C127ADA66F00A5CCCB /* restamp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AB30C027ADA66F00A5CCCB /* restamp.c */; };
 		92B039F716F2050100B2568F /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 92B039F616F2050100B2568F /* libSDL2.a */; };
 		92B2A4A7229C0F47002A65A7 /* out_rtsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B2A4A6229C0F47002A65A7 /* out_rtsp.c */; };
 		92B2A4AE229D6646002A65A7 /* hevcmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B2A4AC229D6646002A65A7 /* hevcmerge.c */; };
@@ -397,7 +415,7 @@
 		92BC212F16EF8E7A000E0620 /* sdl_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1999D1278778800ACFF58 /* sdl_out.h */; };
 		92BC213716EF8E7A000E0620 /* video.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999E1278778800ACFF58 /* video.c */; };
 		92C0F38021EDFA8E002961C8 /* out_rtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C0F37F21EDFA8D002961C8 /* out_rtp.c */; };
-		92D3C62C2031ECE600BA1735 /* atsc_dmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D3C62B2031ECE600BA1735 /* atsc_dmx.c */; };
+		92C236E82576DC4E00CD59A9 /* tilesplit.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C236E72576DC4E00CD59A9 /* tilesplit.c */; };
 		92D6C5A62343BF6A00262217 /* xhr.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C5A42343BF6A00262217 /* xhr.c */; };
 		92D6C5A72343BF6A00262217 /* scene_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C5A52343BF6A00262217 /* scene_js.c */; };
 		92D6C5AB2343BF9400262217 /* svg_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C5A82343BF9400262217 /* svg_js.c */; };
@@ -580,7 +598,6 @@
 
 /* Begin PBXFileReference section */
 		04EFB63416E51E4200D1D44A /* libglues.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libglues.a; path = ../../extra_lib/lib/iOS/libglues.a; sourceTree = "<group>"; };
-		285DBB48170F17D700AF2B9B /* ffmpeg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffmpeg_in.h; path = ../../modules/ffmpeg_in/ffmpeg_in.h; sourceTree = "<group>"; };
 		285DBB9B1712C80E00AF2B9B /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = ../../extra_lib/lib/iOS/libavcodec.a; sourceTree = "<group>"; };
 		285DBB9C1712C80E00AF2B9B /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = ../../extra_lib/lib/iOS/libavformat.a; sourceTree = "<group>"; };
 		285DBB9D1712C80E00AF2B9B /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = ../../extra_lib/lib/iOS/libavutil.a; sourceTree = "<group>"; };
@@ -901,9 +918,9 @@
 		71F2A45412830B1400C384DE /* libjs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjs.a; path = ../../extra_lib/lib/iOS/libjs.a; sourceTree = SOURCE_ROOT; };
 		71F2A45512830B1400C384DE /* libmad.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmad.a; path = ../../extra_lib/lib/iOS/libmad.a; sourceTree = SOURCE_ROOT; };
 		71F2A45612830B1400C384DE /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../extra_lib/lib/iOS/libpng.a; sourceTree = SOURCE_ROOT; };
+		8925C0ED25DD6F8900AFB064 /* libnghttp2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libnghttp2.a; path = ../../extra_lib/lib/iOS/libnghttp2.a; sourceTree = "<group>"; };
 		8959AC76211C9A26004D2C87 /* dmx_gsf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_gsf.c; path = ../../src/filters/dmx_gsf.c; sourceTree = "<group>"; };
 		8959AC78211C9B29004D2C87 /* reframe_av1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_av1.c; path = ../../src/filters/reframe_av1.c; sourceTree = "<group>"; };
-		8959AC7D211C9C3C004D2C87 /* in_atsc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_atsc.c; path = ../../src/filters/in_atsc.c; sourceTree = "<group>"; };
 		8959AC7E211C9C3C004D2C87 /* in_pipe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_pipe.c; path = ../../src/filters/in_pipe.c; sourceTree = "<group>"; };
 		8959AC7F211C9C3C004D2C87 /* in_sock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_sock.c; path = ../../src/filters/in_sock.c; sourceTree = "<group>"; };
 		8959AC80211C9C3C004D2C87 /* mux_gsf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mux_gsf.c; path = ../../src/filters/mux_gsf.c; sourceTree = "<group>"; };
@@ -921,6 +938,8 @@
 		921FEBA31CF881DE00B437C2 /* sensors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sensors.h; path = ../../applications/osmo4_ios/sensors.h; sourceTree = "<group>"; };
 		921FEBA41CF881DE00B437C2 /* sensors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = sensors.m; path = ../../applications/osmo4_ios/sensors.m; sourceTree = "<group>"; };
 		92261A88239E326900C14199 /* out_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_http.c; path = ../../src/filters/out_http.c; sourceTree = "<group>"; };
+		9227B8562799F8E600BF3D1B /* bs_agg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bs_agg.c; path = ../../src/filters/bs_agg.c; sourceTree = "<group>"; };
+		9227B8572799F8E600BF3D1B /* bs_split.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bs_split.c; path = ../../src/filters/bs_split.c; sourceTree = "<group>"; };
 		922B2773244625B0001D4F72 /* dec_ttml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_ttml.c; path = ../../src/filters/dec_ttml.c; sourceTree = "<group>"; };
 		922EB5781AAE13C500DF46D0 /* dash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dash.h; sourceTree = "<group>"; };
 		922EB5791AAE13C500DF46D0 /* html5_media.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = html5_media.h; sourceTree = "<group>"; };
@@ -934,9 +953,19 @@
 		92334CC92333AB9900DA6051 /* cutils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cutils.c; path = ../../src/quickjs/cutils.c; sourceTree = "<group>"; };
 		92334CCA2333AB9A00DA6051 /* libregexp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libregexp.c; path = ../../src/quickjs/libregexp.c; sourceTree = "<group>"; };
 		92334CCC2333AB9A00DA6051 /* quickjs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quickjs.h; path = ../../src/quickjs/quickjs.h; sourceTree = "<group>"; };
+		92359C7B250F651900525A42 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = "<group>"; };
+		92359C7C250F651900525A42 /* filters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filters.h; sourceTree = "<group>"; };
+		92359C7D250F651900525A42 /* mpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpd.h; sourceTree = "<group>"; };
+		92359C7E250F651900525A42 /* route.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = route.h; sourceTree = "<group>"; };
+		92359C7F250F651900525A42 /* evg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = evg.h; sourceTree = "<group>"; };
+		92359C80250F651900525A42 /* Remotery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Remotery.h; sourceTree = "<group>"; };
+		92359C87250F652700525A42 /* route_dmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = route_dmx.c; sourceTree = "<group>"; };
+		92359C89250F657A00525A42 /* in_route.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_route.c; path = ../../src/filters/in_route.c; sourceTree = "<group>"; };
 		9236FDEF1DD23F1400B3E86F /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = file; name = iTunesArtwork; path = ../../applications/osmo4_ios/Resources/iTunesArtwork; sourceTree = "<group>"; };
 		923EB53323D1B87E00E1FFA1 /* libbf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libbf.c; path = ../../src/quickjs/libbf.c; sourceTree = "<group>"; };
 		9246EE7624A1240600F72EAD /* filter_session_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_session_js.c; path = ../../src/filter_core/filter_session_js.c; sourceTree = "<group>"; };
+		9251E53F251E398600CEB84D /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../../share/res; sourceTree = "<group>"; };
+		9251E541251E39A300CEB84D /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = scripts; path = ../../share/scripts; sourceTree = "<group>"; };
 		925730A11A0916D20057FF04 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
 		925730A31A0916DB0057FF04 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; };
 		925FF2A31ABC53F30085B04C /* odf_parse_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = odf_parse_common.h; sourceTree = "<group>"; };
@@ -947,12 +976,17 @@
 		9281B62E21C92D00006B0FD5 /* gui */ = {isa = PBXFileReference; lastKnownFileType = folder; name = gui; path = ../../share/gui; sourceTree = "<group>"; };
 		9281B62F21C92D00006B0FD5 /* shaders */ = {isa = PBXFileReference; lastKnownFileType = folder; name = shaders; path = ../../share/shaders; sourceTree = "<group>"; };
 		92852442237ACC2700165130 /* raster3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster3d.c; path = ../../src/evg/raster3d.c; sourceTree = "<group>"; };
+		9285D1BF266FB8D3008FCD14 /* quickjs-libc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "quickjs-libc.c"; path = "../../src/quickjs/quickjs-libc.c"; sourceTree = "<group>"; };
 		928607082386C2A000FDA1ED /* reframe_prores.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_prores.c; path = ../../src/filters/reframe_prores.c; sourceTree = "<group>"; };
 		9286070C238BC43D00FDA1ED /* ff_mx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_mx.c; path = ../../src/filters/ff_mx.c; sourceTree = "<group>"; };
 		928607102395C0DE00FDA1ED /* tssplit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tssplit.c; path = ../../src/filters/tssplit.c; sourceTree = "<group>"; };
 		928607142398F4C800FDA1ED /* ff_avf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_avf.c; path = ../../src/filters/ff_avf.c; sourceTree = "<group>"; };
+		9288A4B325ADDCED006F7355 /* reframe_truehd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_truehd.c; path = ../../src/filters/reframe_truehd.c; sourceTree = "<group>"; };
+		9288A54725AF6FCC006F7355 /* io_fcryp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io_fcryp.c; path = ../../src/filters/io_fcryp.c; sourceTree = "<group>"; };
 		928B2D111BE11BC100CAC65D /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = ../../extra_lib/lib/iOS/libcrypto.a; sourceTree = "<group>"; };
 		928B2D121BE11BC100CAC65D /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = ../../extra_lib/lib/iOS/libssl.a; sourceTree = "<group>"; };
+		928EB67425271B5800E47747 /* rewrite_mhas.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_mhas.c; path = ../../src/filters/rewrite_mhas.c; sourceTree = "<group>"; };
+		9290E74D25263F4E00BC0EE3 /* reframe_mhas.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_mhas.c; path = ../../src/filters/reframe_mhas.c; sourceTree = "<group>"; };
 		92910FA9233A44110052365D /* jsfilter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jsfilter.c; path = ../../src/filters/jsfilter.c; sourceTree = "<group>"; };
 		9292BEFE1CFC93C10070EB05 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
 		9292BF001CFC93D50070EB05 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
@@ -968,12 +1002,14 @@
 		929A929A16EF8BC200B7C64F /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = ../../applications/osmo4_ios/Resources/icon.png; sourceTree = SOURCE_ROOT; };
 		929DE74824183FB40056AFA7 /* gzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzio.c; sourceTree = "<group>"; };
 		929FA64221A3E83E000455A7 /* reframe_latm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_latm.c; path = ../../src/filters/reframe_latm.c; sourceTree = "<group>"; };
+		92A870FF25150CF70047560D /* out_route.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_route.c; path = ../../src/filters/out_route.c; sourceTree = "<group>"; };
+		92AB30C027ADA66F00A5CCCB /* restamp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = restamp.c; path = ../../src/filters/restamp.c; sourceTree = "<group>"; };
 		92B039F616F2050100B2568F /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = ../../extra_lib/lib/iOS/libSDL2.a; sourceTree = SOURCE_ROOT; };
 		92B2A4A6229C0F47002A65A7 /* out_rtsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_rtsp.c; path = ../../src/filters/out_rtsp.c; sourceTree = "<group>"; };
 		92B2A4AC229D6646002A65A7 /* hevcmerge.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hevcmerge.c; path = ../../src/filters/hevcmerge.c; sourceTree = "<group>"; };
 		92B2A4AD229D6646002A65A7 /* hevcsplit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hevcsplit.c; path = ../../src/filters/hevcsplit.c; sourceTree = "<group>"; };
 		92C0F37F21EDFA8D002961C8 /* out_rtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_rtp.c; path = ../../src/filters/out_rtp.c; sourceTree = "<group>"; };
-		92D3C62B2031ECE600BA1735 /* atsc_dmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atsc_dmx.c; sourceTree = "<group>"; };
+		92C236E72576DC4E00CD59A9 /* tilesplit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tilesplit.c; path = ../../src/filters/tilesplit.c; sourceTree = "<group>"; };
 		92D6C5A42343BF6A00262217 /* xhr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xhr.c; path = ../../src/jsmods/xhr.c; sourceTree = "<group>"; };
 		92D6C5A52343BF6A00262217 /* scene_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = scene_js.c; path = ../../src/jsmods/scene_js.c; sourceTree = "<group>"; };
 		92D6C5A82343BF9400262217 /* svg_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_js.c; sourceTree = "<group>"; };
@@ -1138,6 +1174,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8925C0EE25DD6F8900AFB064 /* libnghttp2.a in Frameworks */,
 				92EB6E4220E4ECD500A97A49 /* AVFoundation.framework in Frameworks */,
 				92EB6E4020E4EC9700A97A49 /* libavfilter.a in Frameworks */,
 				92EB6E3E20E4EC8600A97A49 /* libavdevice.a in Frameworks */,
@@ -1190,6 +1227,8 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				9251E541251E39A300CEB84D /* scripts */,
+				9251E53F251E398600CEB84D /* res */,
 				9281B62E21C92D00006B0FD5 /* gui */,
 				9281B62F21C92D00006B0FD5 /* shaders */,
 				71CCF1381277041D00339E12 /* libgpac */,
@@ -1205,6 +1244,7 @@
 		7184780712785F7B00917298 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				8925C0ED25DD6F8900AFB064 /* libnghttp2.a */,
 				92EB6E4120E4ECD500A97A49 /* AVFoundation.framework */,
 				92EB6E3F20E4EC9700A97A49 /* libavfilter.a */,
 				92EB6E3C20E4EC5600A97A49 /* libavdevice.a */,
@@ -1496,31 +1536,31 @@
 		71CCF1CD1277045100339E12 /* media_tools */ = {
 			isa = PBXGroup;
 			children = (
+				9747B6F214864C7800280D95 /* ait.c */,
+				71CCF1CE1277045100339E12 /* av_parsers.c */,
+				71CCF1CF1277045100339E12 /* avilib.c */,
 				92EB6E1F20E4E1A300A97A49 /* crypt_tools.c */,
-				92D3C62B2031ECE600BA1735 /* atsc_dmx.c */,
-				97E29F6817D1138B00904FBF /* webvtt.c */,
 				97DB67C41627B22F00A7E054 /* dash_segmenter.c */,
 				97793E5015E6370D005123E1 /* dash_client.c */,
-				9747B6F214864C7800280D95 /* ait.c */,
 				9747B6F314864C7800280D95 /* dsmcc.c */,
-				970A26C713434D2C0007362C /* m3u8.c */,
-				970A26C813434D2C0007362C /* mpd.c */,
-				71CCF1CE1277045100339E12 /* av_parsers.c */,
-				71CCF1CF1277045100339E12 /* avilib.c */,
 				71CCF1D01277045100339E12 /* dvb_mpe.c */,
 				71CCF1D21277045100339E12 /* gpac_ogg.c */,
 				71CCF1D31277045100339E12 /* img.c */,
 				71CCF1D51277045100339E12 /* isom_hinter.c */,
 				71CCF1D61277045100339E12 /* isom_tools.c */,
 				71CCF1D71277045100339E12 /* m2ts_mux.c */,
+				970A26C713434D2C0007362C /* m3u8.c */,
 				71CCF1D81277045100339E12 /* media_export.c */,
 				71CCF1D91277045100339E12 /* media_import.c */,
+				970A26C813434D2C0007362C /* mpd.c */,
 				71CCF1DA1277045100339E12 /* mpeg2_ps.c */,
 				71CCF1DB1277045100339E12 /* mpeg2_ps.h */,
 				71CCF1DC1277045100339E12 /* mpegts.c */,
 				71CCF1DD1277045100339E12 /* reedsolomon.c */,
+				92359C87250F652700525A42 /* route_dmx.c */,
 				71CCF1DE1277045100339E12 /* saf.c */,
 				71CCF1E01277045100339E12 /* vobsub.c */,
+				97E29F6817D1138B00904FBF /* webvtt.c */,
 			);
 			name = media_tools;
 			path = ../../src/media_tools;
@@ -1661,6 +1701,12 @@
 		71CCF35F12770A8C00339E12 /* gpac */ = {
 			isa = PBXGroup;
 			children = (
+				92359C7F250F651900525A42 /* evg.h */,
+				92359C7C250F651900525A42 /* filters.h */,
+				92359C7B250F651900525A42 /* main.h */,
+				92359C7D250F651900525A42 /* mpd.h */,
+				92359C80250F651900525A42 /* Remotery.h */,
+				92359C7E250F651900525A42 /* route.h */,
 				92EB6E2120E4E1B500A97A49 /* crypt_tools.h */,
 				922EB5781AAE13C500DF46D0 /* dash.h */,
 				922EB5791AAE13C500DF46D0 /* html5_media.h */,
@@ -1778,6 +1824,7 @@
 		92334CBB2333AB8200DA6051 /* quickjs */ = {
 			isa = PBXGroup;
 			children = (
+				9285D1BF266FB8D3008FCD14 /* quickjs-libc.c */,
 				923EB53323D1B87E00E1FFA1 /* libbf.c */,
 				92334CC92333AB9900DA6051 /* cutils.c */,
 				92334CCA2333AB9A00DA6051 /* libregexp.c */,
@@ -1860,6 +1907,10 @@
 		92EB6D5E20E4E16700A97A49 /* filters */ = {
 			isa = PBXGroup;
 			children = (
+				92AB30C027ADA66F00A5CCCB /* restamp.c */,
+				9227B8562799F8E600BF3D1B /* bs_agg.c */,
+				9227B8572799F8E600BF3D1B /* bs_split.c */,
+				92C236E72576DC4E00CD59A9 /* tilesplit.c */,
 				9274295924647B98009ADD8D /* bsrw.c */,
 				92EB6D8B20E4E19300A97A49 /* compose.c */,
 				92EB6D9420E4E19400A97A49 /* dasher.c */,
@@ -1906,11 +1957,11 @@
 				92EB6D7620E4E19200A97A49 /* filelist.c */,
 				92B2A4AC229D6646002A65A7 /* hevcmerge.c */,
 				92B2A4AD229D6646002A65A7 /* hevcsplit.c */,
-				8959AC7D211C9C3C004D2C87 /* in_atsc.c */,
 				92EB6D9020E4E19400A97A49 /* in_dvb4linux.c */,
 				92EB6DB820E4E19600A97A49 /* in_file.c */,
 				92EB6DC220E4E19700A97A49 /* in_http.c */,
 				8959AC7E211C9C3C004D2C87 /* in_pipe.c */,
+				92359C89250F657A00525A42 /* in_route.c */,
 				92EB6D8620E4E19300A97A49 /* in_rtp_rtsp.c */,
 				92EB6DAE20E4E19600A97A49 /* in_rtp_sdp.c */,
 				92EB6DC520E4E19700A97A49 /* in_rtp_signaling.c */,
@@ -1919,6 +1970,7 @@
 				92EB6DC420E4E19700A97A49 /* in_rtp.h */,
 				8959AC7F211C9C3C004D2C87 /* in_sock.c */,
 				92EB6D7C20E4E19200A97A49 /* inspect.c */,
+				9288A54725AF6FCC006F7355 /* io_fcryp.c */,
 				92EB6D9920E4E19400A97A49 /* isoffin_load.c */,
 				92EB6D9C20E4E19500A97A49 /* isoffin_read_ch.c */,
 				92EB6DAF20E4E19600A97A49 /* isoffin_read.c */,
@@ -1935,6 +1987,7 @@
 				92EB6D7020E4E19200A97A49 /* out_file.c */,
 				92261A88239E326900C14199 /* out_http.c */,
 				8959AC81211C9C3C004D2C87 /* out_pipe.c */,
+				92A870FF25150CF70047560D /* out_route.c */,
 				92C0F37F21EDFA8D002961C8 /* out_rtp.c */,
 				92B2A4A6229C0F47002A65A7 /* out_rtsp.c */,
 				8959AC82211C9C3C004D2C87 /* out_sock.c */,
@@ -1947,6 +2000,7 @@
 				92EB6DBA20E4E19700A97A49 /* reframe_h263.c */,
 				92EB6D8520E4E19300A97A49 /* reframe_img.c */,
 				929FA64221A3E83E000455A7 /* reframe_latm.c */,
+				9290E74D25263F4E00BC0EE3 /* reframe_mhas.c */,
 				92EB6DA520E4E19500A97A49 /* reframe_mp3.c */,
 				92EB6DBB20E4E19700A97A49 /* reframe_mpgvid.c */,
 				92EB6D7520E4E19200A97A49 /* reframe_nalu.c */,
@@ -1954,10 +2008,12 @@
 				92EB6DA620E4E19500A97A49 /* reframe_qcp.c */,
 				92EB6D9220E4E19400A97A49 /* reframe_rawpcm.c */,
 				92EB6D7820E4E19200A97A49 /* reframe_rawvid.c */,
+				9288A4B325ADDCED006F7355 /* reframe_truehd.c */,
 				92EB6D9D20E4E19500A97A49 /* reframer.c */,
 				92EB6DB620E4E19600A97A49 /* resample_audio.c */,
 				92EB6D9320E4E19400A97A49 /* rewind.c */,
 				92EB6D8120E4E19300A97A49 /* rewrite_adts.c */,
+				928EB67425271B5800E47747 /* rewrite_mhas.c */,
 				92EB6D9E20E4E19500A97A49 /* rewrite_mp4v.c */,
 				92EB6DB420E4E19600A97A49 /* rewrite_nalu.c */,
 				8959AC83211C9C3C004D2C87 /* rewrite_obu.c */,
@@ -1978,7 +2034,6 @@
 		92EB6E3920E4E62200A97A49 /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
-				285DBB48170F17D700AF2B9B /* ffmpeg_in.h */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
@@ -2020,6 +2075,7 @@
 				71CCF3B712770A8C00339E12 /* config_file.h in Headers */,
 				71CCF3B812770A8C00339E12 /* configuration.h in Headers */,
 				71CCF3B912770A8C00339E12 /* constants.h in Headers */,
+				92359C82250F651900525A42 /* filters.h in Headers */,
 				922EB5811AAE13C500DF46D0 /* html5_media.h in Headers */,
 				71CCF3BA12770A8C00339E12 /* crypt.h in Headers */,
 				92EB6E2220E4E1B500A97A49 /* crypt_tools.h in Headers */,
@@ -2073,6 +2129,7 @@
 				71CCF3E612770A8C00339E12 /* mpeg4_odf.h in Headers */,
 				71CCF3E712770A8C00339E12 /* mpegts.h in Headers */,
 				71CCF3E812770A8C00339E12 /* network.h in Headers */,
+				92359C83250F651900525A42 /* mpd.h in Headers */,
 				71CCF3E912770A8C00339E12 /* nodes_mpeg4.h in Headers */,
 				92334CDD2333AB9A00DA6051 /* quickjs.h in Headers */,
 				71CCF3EA12770A8C00339E12 /* nodes_svg.h in Headers */,
@@ -2087,8 +2144,10 @@
 				71CCF3F212770A8C00339E12 /* scenegraph.h in Headers */,
 				71CCF3F312770A8C00339E12 /* scenegraph_svg.h in Headers */,
 				71CCF3F412770A8C00339E12 /* scenegraph_vrml.h in Headers */,
+				92359C85250F651900525A42 /* evg.h in Headers */,
 				71CCF3F512770A8C00339E12 /* setup.h in Headers */,
 				71CCF3F612770A8C00339E12 /* svg_types.h in Headers */,
+				92359C86250F651900525A42 /* Remotery.h in Headers */,
 				92EB6D6D20E4E17F00A97A49 /* filter_session.h in Headers */,
 				71CCF3F712770A8C00339E12 /* sync_layer.h in Headers */,
 				71CCF3F812770A8C00339E12 /* term_info.h in Headers */,
@@ -2105,12 +2164,13 @@
 				970A26D213434D960007362C /* cache.h in Headers */,
 				970A26D313434D960007362C /* ringbuffer.h in Headers */,
 				970A26D413434D960007362C /* unicode.h in Headers */,
+				92359C84250F651900525A42 /* route.h in Headers */,
 				922EB5871AAE13C500DF46D0 /* webvtt.h in Headers */,
 				9747B6EF14864C6400280D95 /* ait.h in Headers */,
+				92359C81250F651900525A42 /* main.h in Headers */,
 				9747B6F014864C6400280D95 /* dsmcc.h in Headers */,
 				922EB5841AAE13C500DF46D0 /* maths.h in Headers */,
 				9747B6F114864C6400280D95 /* events_constants.h in Headers */,
-				285DBB49170F17D700AF2B9B /* ffmpeg_in.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2195,8 +2255,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				9281B63021C92D00006B0FD5 /* gui in Resources */,
+				9251E542251E39A300CEB84D /* scripts in Resources */,
 				9280E7251DD23FFE001E6441 /* iTunesArtwork in Resources */,
 				71EC88E11396273B004DCB6A /* osmo.icns in Resources */,
+				9251E540251E398700CEB84D /* res in Resources */,
 				929A929C16EF8BC200B7C64F /* Default-568h@2x.png in Resources */,
 				929A929D16EF8BC200B7C64F /* icon_ipad_retina.png in Resources */,
 				929A929E16EF8BC200B7C64F /* icon_ipad.png in Resources */,
@@ -2260,6 +2322,7 @@
 				92EB6DE120E4E19700A97A49 /* reframe_adts.c in Sources */,
 				92EB6E1120E4E19700A97A49 /* dec_theora.c in Sources */,
 				92EB6E0020E4E19700A97A49 /* dec_mad.c in Sources */,
+				9285D1C0266FB8D3008FCD14 /* quickjs-libc.c in Sources */,
 				92EB6E1420E4E19700A97A49 /* vcrop.c in Sources */,
 				92EB6E1E20E4E19700A97A49 /* unit_test_filter.c in Sources */,
 				92EB6DE220E4E19700A97A49 /* dmx_dash.c in Sources */,
@@ -2272,6 +2335,7 @@
 				92EB6DDF20E4E19700A97A49 /* out_audio.c in Sources */,
 				92852443237ACC2700165130 /* raster3d.c in Sources */,
 				92EB6DF520E4E19700A97A49 /* reframer.c in Sources */,
+				92359C88250F652700525A42 /* route_dmx.c in Sources */,
 				92E9DFA22215CE9A00628420 /* g_crypt_tinyaes.c in Sources */,
 				929383A72355AECE00AAAFA8 /* webgl.c in Sources */,
 				92EB6DFE20E4E19700A97A49 /* reframe_qcp.c in Sources */,
@@ -2285,6 +2349,7 @@
 				92D6C5AD2343BF9400262217 /* dom_js.c in Sources */,
 				71CCF24B1277045100339E12 /* conditional.c in Sources */,
 				71CCF24C1277045100339E12 /* field_decode.c in Sources */,
+				928EB67525271B5800E47747 /* rewrite_mhas.c in Sources */,
 				92EB6E0220E4E19700A97A49 /* write_generic.c in Sources */,
 				92EB6E3020E4E58E00A97A49 /* scene_node_init.c in Sources */,
 				92EB6E0B20E4E19700A97A49 /* mux_isom.c in Sources */,
@@ -2348,6 +2413,7 @@
 				71CCF27D1277045100339E12 /* mpeg4_path_layout.c in Sources */,
 				71CCF27E1277045100339E12 /* mpeg4_sensors.c in Sources */,
 				71CCF27F1277045100339E12 /* mpeg4_sound.c in Sources */,
+				9227B8582799F8E700BF3D1B /* bs_agg.c in Sources */,
 				71CCF2801277045100339E12 /* mpeg4_text.c in Sources */,
 				71CCF2811277045100339E12 /* mpeg4_textures.c in Sources */,
 				71CCF2821277045100339E12 /* mpeg4_timesensor.c in Sources */,
@@ -2385,6 +2451,7 @@
 				71CCF29D1277045100339E12 /* rtp.c in Sources */,
 				71CCF29E1277045100339E12 /* rtp_depacketizer.c in Sources */,
 				92EB6DDB20E4E19700A97A49 /* dmx_m2ts.c in Sources */,
+				9288A54825AF6FCC006F7355 /* io_fcryp.c in Sources */,
 				71CCF29F1277045100339E12 /* rtp_packetizer.c in Sources */,
 				71CCF2A01277045100339E12 /* rtp_pck_3gpp.c in Sources */,
 				92EB6DD920E4E19700A97A49 /* rewrite_adts.c in Sources */,
@@ -2438,7 +2505,6 @@
 				71CCF2C01277045100339E12 /* track.c in Sources */,
 				71CCF2C11277045100339E12 /* tx3g.c in Sources */,
 				92EB6DFA20E4E19700A97A49 /* dec_img.c in Sources */,
-				8959AC87211C9C3C004D2C87 /* in_atsc.c in Sources */,
 				92EB6DE920E4E19700A97A49 /* in_rtp.c in Sources */,
 				71CCF2C21277045100339E12 /* lsr_dec.c in Sources */,
 				71CCF2C31277045100339E12 /* lsr_enc.c in Sources */,
@@ -2464,6 +2530,7 @@
 				71CCF2E01277045100339E12 /* mpeg2_ps.c in Sources */,
 				71CCF2E21277045100339E12 /* mpegts.c in Sources */,
 				71CCF2E31277045100339E12 /* reedsolomon.c in Sources */,
+				92A8710025150CF70047560D /* out_route.c in Sources */,
 				929FA64321A3E83F000455A7 /* reframe_latm.c in Sources */,
 				92E9DFB22215CEA700628420 /* raster_yuv.c in Sources */,
 				92EB6D6920E4E17F00A97A49 /* filter_queue.c in Sources */,
@@ -2478,8 +2545,8 @@
 				71CCF2E91277045100339E12 /* ipmpx_code.c in Sources */,
 				71CCF2EA1277045100339E12 /* ipmpx_dump.c in Sources */,
 				92EB6DE420E4E19700A97A49 /* dmx_saf.c in Sources */,
-				92D3C62C2031ECE600BA1735 /* atsc_dmx.c in Sources */,
 				71CCF2EB1277045100339E12 /* ipmpx_parse.c in Sources */,
+				92C236E82576DC4E00CD59A9 /* tilesplit.c in Sources */,
 				71CCF2EC1277045100339E12 /* oci_codec.c in Sources */,
 				71CCF2ED1277045100339E12 /* odf_code.c in Sources */,
 				71CCF2EE1277045100339E12 /* odf_codec.c in Sources */,
@@ -2559,6 +2626,7 @@
 				92EB6E0420E4E19700A97A49 /* ff_dmx.c in Sources */,
 				92EB6DCE20E4E19700A97A49 /* filelist.c in Sources */,
 				92EB6DE320E4E19700A97A49 /* compose.c in Sources */,
+				9290E74E25263F4F00BC0EE3 /* reframe_mhas.c in Sources */,
 				92E9DFAF2215CEA700628420 /* raster_rgb.c in Sources */,
 				929DE74924183FB40056AFA7 /* gzio.c in Sources */,
 				92EB6DF320E4E19700A97A49 /* dmx_avi.c in Sources */,
@@ -2583,10 +2651,12 @@
 				71CCF3381277045100339E12 /* os_module.c in Sources */,
 				92E9DFA62215CE9A00628420 /* g_crypt_openssl.c in Sources */,
 				71CCF3391277045100339E12 /* os_net.c in Sources */,
+				9227B8592799F8E700BF3D1B /* bs_split.c in Sources */,
 				71CCF33A1277045100339E12 /* os_thread.c in Sources */,
 				71CCF33B1277045100339E12 /* path2d.c in Sources */,
 				71CCF33C1277045100339E12 /* path2d_stroker.c in Sources */,
 				92D6C5A72343BF6A00262217 /* scene_js.c in Sources */,
+				92AB30C127ADA66F00A5CCCB /* restamp.c in Sources */,
 				71CCF33F1277045100339E12 /* token.c in Sources */,
 				71CCF3401277045100339E12 /* uni_bidi.c in Sources */,
 				71CCF3411277045100339E12 /* url.c in Sources */,
@@ -2597,9 +2667,11 @@
 				71CCF3451277045100339E12 /* zutil.c in Sources */,
 				7141FF301292CB9200FCB27D /* alloc.c in Sources */,
 				7147426012B918C900DB5A59 /* cache.c in Sources */,
+				92359C8A250F657B00525A42 /* in_route.c in Sources */,
 				970A26C913434D2C0007362C /* m3u8.c in Sources */,
 				92EB6E1620E4E19700A97A49 /* decrypt_cenc_isma.c in Sources */,
 				970A26CA13434D2C0007362C /* mpd.c in Sources */,
+				9288A4B425ADDCED006F7355 /* reframe_truehd.c in Sources */,
 				92EB6DDE20E4E19700A97A49 /* in_rtp_rtsp.c in Sources */,
 				92EB6DFF20E4E19700A97A49 /* dmx_vobsub.c in Sources */,
 				970A26D813434DAC0007362C /* unicode.c in Sources */,

gpac-1.0.1.tar.gz/build/xcode/gpac4ios.xcodeproj/xcshareddata/xcschemes/osmo4ios.xcscheme -> gpac-2.0.0.tar.gz/build/xcode/gpac4ios.xcodeproj/xcshareddata/xcschemes/osmo4ios.xcscheme Changed

gpac-1.0.1.tar.gz/configure -> gpac-2.0.0.tar.gz/configure Changed

@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 # GPAC configure script
-# (c) 2003-2018 Telecom ParisTech
-# Authors: Jean Le Feuvre, Romain Bouqueau
+# (c) 2003-2022 Telecom ParisTech
+# Authors: Jean Le Feuvre, Romain Bouqueau, Aurelien David
 #
 #set -v
 
@@ -78,6 +78,7 @@
 has_mad="no"
 has_faad="no"
 has_ffmpeg="no"
+ffmpeg_vvc="no"
 has_amr_nb_fixed="no"
 has_amr_nb="no"
 has_amr_wb="no"
@@ -111,8 +112,9 @@
 has_hid="no"
 has_sock_un="no"
 has_lzma="no"
+has_nghttp2="no"
 enable_joystick="no"
-static_mp4box="no"
+static_bin="no"
 disable_core_tools="no"
 disable_3d="no"
 disable_svg="no"
@@ -161,18 +163,20 @@
 disable_ttxt="no"
 disable_ttml="no"
 disable_hevc="no"
-disable_atsc="no"
+disable_route="no"
 disable_crypto="no"
+disable_log="no"
+disable_nvdec="no"
 enable_qjs="yes"
+enable_qjs_libc="yes"
 enable_depth_compositor="no"
-enable_renoir="no"
 enable_sanitizer="no"
-has_avcap="no"
-avcap_cflags=""
-avcap_ldflags="-lavcap"
 has_opensvc="no"
 has_openhevc="no"
 has_vtb="no"
+has_strlcpy="no"
+disable_codecs="no"
+enable_qjs_stack_check="no"
 
 win32="no"
 mingw32="no"
@@ -197,6 +201,7 @@
 INSTFLAGS=""
 is_64="no"
 ffmpeg_extra_ldflags=""
+has_st_nsec="no"
 
 logs="config.log"
 echo "Logs for GPAC configure $GPAC_CONFIGURATION" > $logs
@@ -239,10 +244,10 @@
 --enable-pic enable Position Independant Code for shared objects
 --strip enable strip
 --std-allocator uses standard lib memory allocator
- --static-modules includes static modules in libgpac whenever possible
 --enable-mem-track enable tracking of all memory allocated by gpac
- --enable-sanitizer enable adress sanitizer
+ --enable-sanitizer enable address sanitizer
 --enable-afl enable instrumentation for American Fuzzy Lop
+ --enable-afl-clang enable instrumentation for American Fuzzy Lop using afl-clang(++)
 --disable-opt disable GCC optimizations
 --disable-ipv6 disable IPV6 support
 --disable-platinum disable Platinum UPnP support
@@ -263,9 +268,13 @@
 --enable-amr-nb enable AMR NB library
 --enable-amr-wb enable AMR WB library
 --enable-amr enable both AMR NB and WB libraries
- --enable-static-bin link statically against libgpac
- --static-mp4box configure for static linking of MP4Box only.
+ --static-modules use static modules in libgpac rather than dynamic library modules
+ --static-build link statically against libgpac but still allow dependencies to shared libraries (enable --static-modules)
+ --enable-static-bin old name for --static-build, deprecated
+ --static-bin enable static linking of MP4Box and gpac only (enable --static-build), disable MP4Client and all libraries not linkable statically.
+ --static-mp4box old name for --static-bin, deprecated
 --enable-depth enables depth handling in the compositor
+ --enable-qjs-stack enables stack depth checking in QuickJS (WILL CRASH in multithreaded modes)
 
 Configuration options for libgpac - all options can be enabled with --enable-optname
 --disable-all disables all features in libgpac
@@ -312,8 +321,10 @@
 --disable-player disable player (terminal and compositor)
 --disable-scenegraph disable scenegraph, scene parsers and player (terminal and compositor)
 --disable-hevc disable HEVC support
- --disable-atsc disable ATSC3 support
+ --disable-route disable ROUTE (ATSC3) support
 --disable-crypto disable crypto support
+ --disable-nvdec disable NVDec support
+ --disable-codecs disable all media decoders and encoders
 
 Extra libraries configuration. You can turn a library off or force using the local version in gpac/extra_lib/
 --use-ft=OPT force FreeType OPT=[no,local]
@@ -335,6 +346,8 @@
 exit 1
 fi
 
+use_static="no"
+
 for opt do
 case "$opt" in
 --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
@@ -375,8 +388,16 @@
 ;;
 --enable-afl) cc_orig="afl-gcc"; cxx_orig="afl-g++"
 ;;
+ --enable-afl-clang) cc_orig="afl-clang"; cxx_orig="afl-clang++"
+ ;;
 --verbose) verbose="yes";
 ;;
+ --static-bin) use_static="yes"
+ ;;
+ --static-mp4box) use_static="yes"
+ ;;
+ --enable-sanitizer) enable_sanitizer="yes"
+ ;;
 esac
 done
 
@@ -457,9 +478,23 @@
 ar="${cross_prefix}${ar}"
 ranlib="${cross_prefix}${ranlib}"
 strip="${cross_prefix}${strip}"
-pkg_config="${pkg_config}"
 windres="${cross_prefix}${windres}"
 
+if test "$enable_sanitizer" = "yes" ; then
+if test "$use_static" = "yes" ; then
+echo "Cannot use static bin with sanitizer, disabling static bin"
+use_static="no"
+fi
+fi
+
+if test "$use_static" = "yes" ; then
+pkg_config="${pkg_config} --static"
+if test "$darwin" != "yes" ; then
+ LDFLAGS="-static $LDFLAGS"
+fi
+else
+pkg_config="${pkg_config}"
+fi
 
 #check pkg_config
 if test "$cross_prefix" = "" ; then
@@ -601,7 +636,7 @@
 CFLAGS="$CFLAGS -I/mingw32/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 LDFLAGS="$LDFLAGS -L/mingw32/lib"
 else
- extralibs="$extralibs -lws2_32 -lwinmm -limagehlp"
+ extralibs="$extralibs -lws2_32 -lwinmm -limagehlp -ldbghelp"
 CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 fi
 		LDFLAGS="$LDFLAGS"
@@ -777,6 +812,17 @@
 
 
 
+#check st_mtim.tv_nsec
+cat > $TMPC << EOF
+#include <sys/stat.h>
+int main( void ) { struct stat st; st.st_mtim.tv_nsec = 0; return 0; }
+EOF
+
+if docc ; then
+ has_st_nsec="yes"
+fi
+
+
 #look for platinum support
 cat > $TMPCXX << EOF
 #include <Platinum.h>
@@ -786,39 +832,6 @@
 has_platinum="yes"
 fi
 
-#look for avcap support
-avcap_cflags=""
-avcap_ldflags="-lavcap"
-
-cat > $TMPC << EOF
-#include <avcap/avcap.h>
-using namespace avcap;
-int main( void ) {
- const DeviceCollector::DeviceList& dl = DEVICE_COLLECTOR::instance().getDeviceList();
- DeviceDescriptor* dd = 0;
- for (DeviceCollector::DeviceList::const_iterator i = dl.begin(); i != dl.end(); i++) {
- dd = *i;
- std::cout << dd->getName().c_str() << "\n";
- }
- return 0;
-}
-EOF
-if docxx -o $TMPO $TMPC $LDFLAGS $avcap_cflags $avcap_ldflags ; then
- has_avcap="yes"
-else
- if test "$darwin" = "yes" ; then
- avcap_cflags="-I$local_inc -I$local_inc/avcap/osx"
- avcap_ldflags="${wl}-flat_namespace -lavcap -lpthread -framework QuickTime -framework QuartzCore"
- else
- avcap_cflags="-I$local_inc -I$local_inc/avcap/linux"
- avcap_ldflags="-lavcap -lpthread"
- fi
- if docxx -o $TMPO $TMPC $avcap_cflags $LDFLAGS -L$local_lib $avcap_ldflags ; then
- has_avcap="yes"
- avcap_ldflags="-L$local_lib $avcap_ldflags"
- fi
-fi
-
 
 #look for opensvc support
 
@@ -904,7 +917,7 @@
 if test "$has_ft" = "no" ; then
 ft_cflags="-I$local_inc/freetype"
 ft_lflags="-L$local_lib -lfreetype"
- if docc $ft_cflags $ft_lflags ; then
+ if docc $ft_cflags $ft_lflags $LDFLAGS ; then
 has_ft="local"
 fi
 fi
@@ -1010,7 +1023,7 @@
 if test "$has_jpeg" = "no" ; then
 jpeg_cflags="-I$local_inc/jpeg"
 jpeg_lflags="-L$local_lib -ljpeg"
- if docc $jpeg_cflags $jpeg_lflags ; then
+ if docc $jpeg_cflags $jpeg_lflags $LDFLAGS ; then
 has_jpeg="local"
 fi
 fi
@@ -1054,7 +1067,7 @@
 fi
 
 if test "$has_openjpeg" = "no" ; then
- if docc -I$local_inc/openjpeg -L$local_lib -lopenjpeg ; then
+ if docc -I$local_inc/openjpeg -L$local_lib -lopenjpeg $LDFLAGS ; then
 has_openjpeg="local"
 	openjpeg_ldflags="-lopenjpeg"
 fi
@@ -1086,7 +1099,7 @@
 fi
 fi
 if test "$has_png" = "no" ; then
- if docc -I$local_inc/png -L$local_lib -lpng ; then
+ if docc -I$local_inc/png -L$local_lib -lpng $LDFLAGS ; then
 has_png="local"
 fi
 fi
@@ -1112,13 +1125,12 @@
 fi
 fi
 if test "$has_mad" = "no" ; then
- if docc -I$local_inc -L$local_lib -lmad ; then
+ if docc -I$local_inc -L$local_lib -lmad $LDFLAGS ; then
 has_mad="local"
 fi
 fi
 
 
-
 #look for A52DEC support
 cat > $TMPC << EOF
 #include <inttypes.h>
@@ -1142,13 +1154,12 @@
 fi
 fi
 if test "$has_a52" = "no" ; then
- if docc -I$local_inc -L$local_lib -la52 ; then
+ if docc -I$local_inc -L$local_lib -la52 $LDFLAGS ; then
 has_a52="local"
 fi
 fi
 
 
-
 #look for XVID support
 cat > $TMPC << EOF
 #include <xvid.h>
@@ -1170,13 +1181,12 @@
 fi
 fi
 if test "$has_xvid" = "no" ; then
- if docc -I$local_inc -L$local_lib -lxvidcore -lpthread ; then
+ if docc -I$local_inc -L$local_lib -lxvidcore -lpthread $LDFLAGS ; then
 has_xvid="local"
 fi
 fi
 
 
-
 #look for FAAD support
 cat > $TMPC << EOF
 #include <faad.h>
@@ -1196,13 +1206,12 @@
 fi
 fi
 if test "$has_faad" = "no" ; then
- if docc -I$local_inc -L$local_lib -lfaad -lm ; then
+ if docc -I$local_inc -L$local_lib -lfaad -lm $LDFLAGS ; then
 has_faad="local"
 fi
 fi
 
 
-
 #look for FFMPEG support
 
 ffmpeg_cflags=""
@@ -1274,7 +1283,7 @@
 fi
 fi
 if test "$has_ffmpeg" = "no" ; then
- if docc -I$local_inc -L$local_lib $ffmpeg_lflags ; then
+ if docc -I$local_inc -L$local_lib $ffmpeg_lflags $LDFLAGS ; then
 has_ffmpeg="local"
 ffmpeg_cflags="-I$local_inc"
 ffmpeg_lflags="-L$local_lib $ffmpeg_lflags"
@@ -1347,6 +1356,19 @@
 fi
 
 
+#detect vvc support in ffmpegf
+cat > $TMPC << EOF
+#include <libavcodec/avcodec.h>
+int main(void) {
+ AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_VVC);
+ return 0;
+}
+EOF
+
+if docc $ffmpeg_cflags $ffmpeg_lflags ; then
+ ffmpeg_vvc="yes"
+fi
+
 #look for FREENECT support
 freenect_flags=""
 freenect_ld="-lfreenect"
@@ -1460,6 +1482,7 @@
 if docc $LDFLAGS $vtb_ldflags ; then
 has_vtb="yes"
 fi
+
 fi
 
 
@@ -1665,12 +1688,65 @@
 
 if docc $CFLAGS_DIR -llzma $LDFLAGS ; then
 has_lzma="yes"
- GPAC_SH_FLAGS="$GPAC_SH_FLAGS -llzma"
- if test "$win32" = "yes"; then
- extralibs="$extralibs -llzma"
+fi
+
+#look for strlcpy support
+cat > $TMPC << EOF
+#include <string.h>
+int main( void ) {
+ char dest[1];
+ strlcpy(dest, "1", 1);
+ return 0;
+}
+EOF
+
+if docc $LDFLAGS ; then
+ has_strlcpy="yes"
+fi
+
+
+#look for nghttp2 support
+
+if test "$cross_prefix" = "" -a "$pkg_config" != "no"; then
+ if $pkg_config --exists libnghttp2 ; then
+ has_nghttp2="system"
+ nghttp2_cflags=`$pkg_config --cflags libnghttp2`
+ nghttp2_ldflags=`$pkg_config --libs libnghttp2`
 fi
 fi
 
+if test "$has_nghttp2" = "no" ; then
+cat > $TMPC << EOF
+#include <stdio.h>
+#include <nghttp2/nghttp2.h>
+int main( void ) { return 0; }
+EOF
+
+if docc $LDFLAGS -lnghttp2 ; then
+ has_nghttp2="system"
+ nghttp2_ldflags="-lnghttp2"
+fi
+if test "$cross_prefix" = "" ; then
+ if test "$has_nghttp2" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lnghttp2 2>>$logs ; then
+ has_nghttp2="system"
+ nghttp2_ldflags="-lnghttp2"
+ fi
+ fi
+ fi
+fi
+
+if test "$has_nghttp2" = "no" ; then
+ if docc -I$local_inc -L$local_lib -lnghttp2 $LDFLAGS ; then
+ has_nghttp2="local"
+ nghttp2_ldflags="-lnghttp2"
+ fi
+fi
+
+fi
+
+
 #overwrite detection with manual settings
 for opt do
 case "$opt" in
@@ -1708,7 +1784,11 @@
 ;;
 --enable-gprof) gprof_build="yes";
 ;;
- --enable-static-bin) static_build="yes";
+ --static-build) static_build="yes";
+ ;;
+ --enable-static-bin)
+ echo "$opt deprecated, use --static-build instead"
+ static_build="yes";
 ;;
 --disable-ipv6) has_ipv6="no"
 ;;
@@ -1728,8 +1808,6 @@
 ;;
 --enable-mem-track) use_memory_tracking="yes"
 ;;
- --enable-sanitizer) enable_sanitizer="yes"
- ;;
 --enable-tinygl) enable_tinygl="yes"
 ;;
 --disable-ssl) has_ssl="no"
@@ -1738,7 +1816,13 @@
 ;;
 --enable-depth) enable_depth_compositor="yes"
 ;;
- --static-mp4box) static_mp4box="yes"
+ --enable-qjs-stack) enable_qjs_stack_check="yes"
+ ;;
+ --static-bin) static_bin="yes"
+ ;;
+ --static-mp4box)
+ echo "$opt deprecated, use --static-bin instead"
+ static_bin="yes"
 ;;
 --use-faad=*) has_faad=${opt#--use-faad=}
 ;;
@@ -1812,9 +1896,9 @@
 ;;
 --enable-pulseaudio) has_pulseaudio="yes"
 ;;
- --disable-all) has_pulseaudio="no"; has_alsa="no"; disable_core_tools="yes"; disable_3d="yes"; disable_svg="yes"; disable_vrml="yes"; disable_od="yes"; disable_bifs="yes"; disable_bifs_enc="yes"; disable_laser="yes"; disable_seng="yes"; disable_qtvr="yes"; disable_avi="yes"; disable_ogg="yes"; disable_m2ps="yes"; disable_m2ts="yes"; disable_m2ts_mux="yes"; disable_parsers="yes"; disable_import="yes"; disable_export="yes"; disable_swf="yes"; disable_scene_stats="yes"; disable_scene_dump="yes"; disable_scene_encode="yes"; disable_loader_isoff="yes"; disable_od_dump="yes"; disable_od_parse="yes"; disable_isom_dump="yes"; disable_crypto="yes"; disable_isoff="yes"; disable_isoff_write="yes"; disable_isoff_hint="yes"; disable_isoff_frag="yes"; disable_streaming="yes"; disable_x3d="yes"; disable_loader_bt="yes"; disable_loader_xmt="yes"; has_dvb4linux="no"; disable_player="yes"; disable_vobsub="yes"; disable_scenegraph="yes"; disable_dvbx="yes"; disable_ttxt="yes"; disable_vtt="yes"; disable_ttml="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_isoff_hds="yes"; disable_hevc="yes" ; disable_atsc="yes" ; enable_qjs="no"
+ --disable-all) has_pulseaudio="no"; has_alsa="no"; disable_core_tools="yes"; disable_3d="yes"; disable_svg="yes"; disable_vrml="yes"; disable_od="yes"; disable_bifs="yes"; disable_bifs_enc="yes"; disable_laser="yes"; disable_seng="yes"; disable_qtvr="yes"; disable_avi="yes"; disable_ogg="yes"; disable_m2ps="yes"; disable_m2ts="yes"; disable_m2ts_mux="yes"; disable_parsers="yes"; disable_import="yes"; disable_export="yes"; disable_swf="yes"; disable_scene_stats="yes"; disable_scene_dump="yes"; disable_scene_encode="yes"; disable_loader_isoff="yes"; disable_log="yes"; disable_od_dump="yes"; disable_od_parse="yes"; disable_isom_dump="yes"; disable_crypto="yes"; disable_isoff="yes"; disable_isoff_write="yes"; disable_isoff_hint="yes"; disable_isoff_frag="yes"; disable_streaming="yes"; disable_x3d="yes"; disable_loader_bt="yes"; disable_loader_xmt="yes"; has_dvb4linux="no"; disable_player="yes"; disable_vobsub="yes"; disable_scenegraph="yes"; disable_dvbx="yes"; disable_ttxt="yes"; disable_vtt="yes"; disable_ttml="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_isoff_hds="yes"; disable_hevc="yes" ; disable_nvdec="yes" ; disable_route="yes" ; enable_qjs="no"
 ;;
- --isomedia-only) has_pulseaudio="no"; has_alsa="no"; disable_core_tools="yes"; disable_3d="yes"; disable_svg="yes"; disable_vrml="yes"; disable_od="yes"; disable_bifs="yes"; disable_bifs_enc="yes"; disable_laser="yes"; disable_seng="yes"; disable_qtvr="yes"; disable_avi="yes"; disable_ogg="yes"; disable_m2ps="yes"; disable_m2ts="yes"; disable_m2ts_mux="yes"; disable_parsers="yes"; disable_import="yes"; disable_export="yes"; disable_swf="yes"; disable_scene_stats="yes"; disable_scene_dump="yes"; disable_scene_encode="yes"; disable_loader_isoff="yes"; disable_od_dump="yes"; disable_od_parse="yes"; disable_isom_dump="yes"; disable_crypto="yes"; disable_streaming="yes"; disable_x3d="yes"; disable_loader_bt="yes"; disable_loader_xmt="yes"; has_dvb4linux="no"; disable_player="yes"; disable_vobsub="yes"; disable_scenegraph="yes"; disable_dvbx="yes"; disable_ttxt="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_hevc="no"; disable_isoff="no"; disable_isoff_hds="no"; disable_isoff_write="no"; disable_isoff_hint="no"; disable_isoff_frag="no" ; disable_atsc="yes" ; enable_qjs="no"
+ --isomedia-only) has_pulseaudio="no"; has_alsa="no"; disable_core_tools="yes"; disable_3d="yes"; disable_svg="yes"; disable_vrml="yes"; disable_od="yes"; disable_bifs="yes"; disable_bifs_enc="yes"; disable_laser="yes"; disable_seng="yes"; disable_qtvr="yes"; disable_avi="yes"; disable_ogg="yes"; disable_m2ps="yes"; disable_m2ts="yes"; disable_m2ts_mux="yes"; disable_parsers="yes"; disable_import="yes"; disable_export="yes"; disable_swf="yes"; disable_scene_stats="yes"; disable_scene_dump="yes"; disable_scene_encode="yes"; disable_loader_isoff="yes"; disable_od_dump="yes"; disable_od_parse="yes"; disable_isom_dump="yes"; disable_crypto="yes"; disable_streaming="yes"; disable_x3d="yes"; disable_loader_bt="yes"; disable_loader_xmt="yes"; has_dvb4linux="no"; disable_player="yes"; disable_vobsub="yes"; disable_scenegraph="yes"; disable_dvbx="yes"; disable_ttxt="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_hevc="no"; disable_isoff="no"; disable_isoff_hds="no"; disable_isoff_write="no"; disable_isoff_hint="no"; disable_isoff_frag="no" ; disable_route="yes" ; disable_nvdec="yes" ; enable_qjs="no"
 ;;
 --disable-3d) disable_3d="yes"
 ;;
@@ -2010,14 +2094,26 @@
 ;;
 --enable-hevc) disable_hevc="no"
 ;;
- --disable-atsc) disable_atsc="yes"
+ --disable-route) disable_route="yes"
 ;;
- --enable-atsc) disable_atsc="no"
+ --enable-route) disable_route="no"
 ;;
 --disable-qjs) enable_qjs="no"
 ;;
 --enable-qjs) enable_qjs="yes"
 ;;
+ --disable-qjs-libc) enable_qjs_libc="no"
+ ;;
+ --enable-qjs-libc) enable_qjs_libc="yes"
+ ;;
+ --disable-log) disable_log="yes"
+ ;;
+ --enable-log) disable_log="no"
+ ;;
+ --disable-nvdec) disable_nvdec="yes"
+ ;;
+ --disable-codecs) disable_codecs="yes"
+ ;;
 esac
 done
 
@@ -2032,6 +2128,12 @@
 echo "error: zlib not found on system or in local libs"
 exit 1
 fi
+ if test "$has_zlib" = "force-no" ; then
+ # can't have libpng without zlib
+ has_png="no"
+ # can't have freetype without libpng
+ has_ft="no"
+ fi
 if test "$dlopen" = "no"; then
 if test "$win32" = "no"; then
 echo "error: dlopen not found on system"
@@ -2248,38 +2350,91 @@
 mandir="share/man"
 fi
 
-if test "$static_mp4box" = "yes"; then
- has_opengl="no"
- has_ssl="no"
- has_js="no"
+
+if test "$disable_codecs" = "yes"; then
 has_jpeg="no"
 has_png="no"
 has_mad="no"
- has_ft="no"
- has_openjpeg="no"
+ has_a52="no"
 has_mad="no"
 has_faad="no"
 has_xvid="no"
+ has_opensvc="no"
+ has_openjpeg="no"
 has_ffmpeg="no"
 has_ogg="no"
 has_theora="no"
 has_vorbis="no"
- has_a52="no"
- has_opensvc="no"
+ has_openhevc="no"
+fi
+
+if test "$static_bin" = "yes"; then
+ static_modules="yes"
+ static_build="yes"
+ #we cannot use openssl vanilla since it is usually built with DSO and requires dlopen
+ has_ssl="no"
+ #we cannot use ipv6 due to getaddrinfo not being present
+ has_ipv6="no"
+
+# has_js="no"
+# has_ft="no"
+# has_jpeg="no"
+# has_png="no"
+# has_mad="no"
+# has_a52="no"
+# has_mad="no"
+# has_faad="no"
+# has_xvid="no"
+# has_opensvc="no"
+
+ #we cannot use openjpeg to produce a static bin, no static lib on most distributions
+ has_openjpeg="no"
+
+ #we cannot use FFMPEG to produce a static bin, no static lib on most distributions. This could be done by building a local statoc only ffmpeg
+if test "$has_ffmpeg" = "system" ; then
+ has_ffmpeg="no"
+fi
+
+ #we cannot use ogg/theora/vorbis to produce a static bin, no static lib on most distributions, issues with lm acosf_finite, log_finite, ...
+ has_ogg="no"
+ has_theora="no"
+ has_vorbis="no"
+ #we cannot use openhevc to produce a static bin, dependencies to avcodec/avformat. We need a static ffmpeg build with openhevc support
 has_openhevc="no"
 has_freenect="no"
 has_platinum="no"
- static_build="yes"
+ has_lzma="no"
+ has_vtb="no"
+
+#we cannot use openGL nor audio/video output to produce a static bin
+ has_opengl="no"
+ has_sdl="no"
+ has_oss_audio="no"
+ has_alsa="no"
+ has_jack="no"
+ has_pulseaudio="no"
+ has_directfb="no"
+ has_x11="no"
+ has_dvb4linux="no"
+ has_mingw_directx="no"
+
 fi
 
 if test "$cpu" = "sh4"; then
 viren_dir="`ls \"$source_path/modules\" | grep viren_out`"
 if test "$viren_dir" = "viren_out"; then
 enable_depth_compositor="yes"
- enable_renoir="yes"
 fi
 fi
 
+if test "$has_lzma" = "yes"; then
+ GPAC_SH_FLAGS="$GPAC_SH_FLAGS -llzma"
+ if test "$win32" = "yes"; then
+ extralibs="$extralibs -llzma"
+ fi
+fi
+
+
 if test "$disable_player" = "yes" ; then
 disable_scenegraph="yes"
 fi
@@ -2304,6 +2459,7 @@
 disable_streaming="yes"
 disable_player="yes"
 disable_smgr="yes"
+ disable_nvdec="yes"
 has_js="no"
 fi
 
@@ -2337,7 +2493,7 @@
 
 #check revision.h
 cd $source_path
-./check_revision.sh
+. ./check_revision.sh
 cd $build_path
 
 echo ""
@@ -2354,21 +2510,34 @@
 fi
 echo ""
 echo "** GPAC $version rev$revision Core Configuration **"
+if test "$static_bin" = "yes" ; then
+ echo "Static binaries enabled"
+ echo "#define GPAC_STATIC_BUILD" >> $TMPH
+elif test "$static_build" = "yes" ; then
+ echo "Static build enabled"
+ echo "#define GPAC_STATIC_BUILD" >> $TMPH
+else
+ echo "Static Modules: $static_modules"
+fi
 echo "debug version: $debuginfo"
 echo "GProf enabled: $gprof_build"
-echo "Static build enabled: $static_build"
 echo "Memory tracking enabled: $use_memory_tracking"
 echo "Sanitizer enabled: $enable_sanitizer"
 echo "Fixed-Point Version: $use_fixed_point"
 echo "IPV6 Support: $has_ipv6"
-echo "Static Modules: $static_modules"
-echo "QuickJS Support: $enable_qjs"
+echo "QuickJS Support: $enable_qjs (qjslibc $enable_qjs_libc)"
 
 if test "$disable_player" = "yes" ; then
 echo "Player disabled"
 echo "#define GPAC_DISABLE_PLAYER" >> $TMPH
 disable_laser="yes"
 fi
+
+if test "$has_st_nsec" = "yes" ; then
+ echo "#define GPAC_HAS_MTIM_NSEC" >> $TMPH
+fi
+
+
 if test "$disable_smgr" = "yes" ; then
 disable_seng="yes"
 disable_qtvr="yes"
@@ -2562,6 +2731,10 @@
 echo "#define GF_SR_USE_DEPTH" >> $TMPH
 fi
 
+if test "$enable_qjs_stack_check" = "yes" ; then
+ echo "#define GPAC_QJS_STACK_CHECK" >> $TMPH
+fi
+
 if test "$disable_mpd" = "yes" ; then
 echo "HLS and DASH Manifest Disabled"
 echo "#define GPAC_DISABLE_MPD" >> $TMPH
@@ -2577,9 +2750,9 @@
 echo "#define GPAC_DISABLE_HEVC" >> $TMPH
 fi
 
-if test "$disable_atsc" = "yes" ; then
- echo "ATSC3 Support disabled"
- echo "#define GPAC_DISABLE_ATSC" >> $TMPH
+if test "$disable_route" = "yes" ; then
+ echo "ROUTE Support disabled"
+ echo "#define GPAC_DISABLE_ROUTE" >> $TMPH
 fi
 
 if test "$disable_crypto" = "yes" ; then
@@ -2587,40 +2760,43 @@
 echo "#define GPAC_DISABLE_CRYPTO" >> $TMPH
 fi
 
+if test "$disable_log" = "yes" ; then
+ echo "Logging disabled"
+ echo "#define GPAC_DISABLE_LOG" >> $TMPH
+fi
+
 echo ""
 
 echo "** Detected libraries **"
 echo "zlib: $has_zlib"
+echo "OpenGL support: $has_opengl"
+echo "TinyGL support: $has_tinygl"
+echo "OpenSSL support: $has_ssl"
 
 if test "$win32" != "yes" ; then
 echo "OSS Audio: $has_oss_audio"
 echo "ALSA Audio: $has_alsa"
 echo "Jack Audio: $has_jack"
- echo "PulseAudio Audio: $has_pulseaudio"
- echo "DirectFB support: $has_directfb"
+ echo "Pulse Audio: $has_pulseaudio"
+ echo "DirectFB: $has_directfb"
 
 if test "$has_x11" != "no" ; then
 echo "X11 Shared Memory support: $has_x11_shm (path: $X11_PATH)"
 echo "X11 XVideo support: $has_x11_xv"
 fi
 fi
-echo "SDL Support: $has_sdl"
+echo "SDL: $has_sdl"
 if test "$sdl_too_old" = "yes" ; then
 echo "SDL Version too old - please upgrade for SDL support"
 fi
-echo "OpenGL support: $has_opengl"
-echo "TinyGL support: $has_tinygl"
-echo "OpenSSL support: $has_ssl"
 
 if test "$win32" = "yes" ; then
- echo "DirectX Support: $has_mingw_directx"
+ echo "DirectX: $has_mingw_directx"
 fi
 if test "$linux" = "yes" ; then
- echo "DVB Support: $has_dvb4linux"
+ echo "DVB for Linux: $has_dvb4linux"
 fi
 
-echo ""
-echo "** Extra Libraries used **"
 echo "FreeType: $has_ft"
 echo "JPEG: $has_jpeg"
 echo "OpenJPEG: $has_openjpeg"
@@ -2629,10 +2805,15 @@
 echo "FAAD: $has_faad"
 echo "XVID: $has_xvid"
 echo "FFMPEG: $has_ffmpeg"
+if test "$has_ffmpeg" != "no" ; then
+if test "$ffmpeg_vvc" = "yes" ; then
+echo "FFMPG VVC Support: $ffmpeg_vvc"
+fi
+fi
 echo "LZMA: $has_lzma"
 echo "Xiph OGG: $has_ogg"
 echo "Platinum UPnP: $has_platinum"
-echo "AVCap: $has_avcap"
+
 if test "$has_ogg" = "no"; then
 has_ogg="no"
 else
@@ -2643,10 +2824,8 @@
 echo "OpenSVCDecoder: $has_opensvc"
 echo "OpenHEVCDecoder: $has_openhevc"
 echo "Freenect: $has_freenect"
+echo "nghttp2: $has_nghttp2"
 
-if test "$enable_renoir" = "yes" ; then
- echo "Renoir enabled - make sure the driver libraries are present in modules/viren_out directory"
-fi
 
 if test "$has_amr_nb_fixed" = "yes" ; then
 echo ""
@@ -2697,7 +2876,7 @@
 
 
 if test "$enable_sanitizer" = "yes" ; then
- CFLAGS="$CFLAGS -fsanitize=address,undefined -fno-sanitize-recover -g"
+ CFLAGS="$CFLAGS -fsanitize=address,undefined -fno-sanitize-recover -g -fno-omit-frame-pointer -DASAN_ENABLED"
 LDFLAGS="$LDFLAGS -fsanitize=address,undefined -ldl"
 fi
 
@@ -2735,7 +2914,7 @@
 echo "WINDRES=$windres" >> config.mak
 fi
 echo "INSTALL=$install" >> config.mak
-echo "LIBTOOL=libtool" >> config.mak
+echo "LIBTOOL=@libtool" >> config.mak
 
 echo "INSTFLAGS=$instflags" >> config.mak
 echo "OPTFLAGS=$CFLAGS" >> config.mak
@@ -2865,6 +3044,10 @@
 echo "CONFIG_JS=$enable_qjs" >> config.mak
 if test "$enable_qjs" = "yes" ; then
 echo "#define GPAC_HAS_QJS" >> $TMPH
+if test "$enable_qjs_libc" = "no" ; then
+echo "#define GPAC_DISABLE_QJS_LIBC" >> $TMPH
+fi
+
 fi
 
 if test "$has_zlib" = "no" -o "$has_zlib" = "force-no" ; then
@@ -2893,6 +3076,11 @@
 echo "vtb_ldflags=$vtb_ldflags" >> config.mak
 fi
 
+echo "CONFIG_STRLCPY=$has_strlcpy" >> config.mak
+if test "$has_strlcpy" != "no" ; then
+ echo "#define GPAC_HAS_STRLCPY" >> $TMPH
+fi
+
 if test "$has_sock_un" != "no" ; then
 echo "#define GPAC_HAS_SOCK_UN" >> $TMPH
 fi
@@ -2938,6 +3126,9 @@
 echo "CONFIG_LIBAV=$is_libav" >> config.mak
 echo "CONFIG_LIBSWRESAMPLE=$has_libswresample" >> config.mak
 echo "#define GPAC_HAS_FFMPEG" >> $TMPH
+ if test "$ffmpeg_vvc" = "yes"; then
+ echo "#define FFMPEG_ENABLE_VVC" >> $TMPH
+ fi
 fi
 echo "CONFIG_FFMPEG_OLD=$old_ffmpeg_inc" >> config.mak
 
@@ -2960,6 +3151,14 @@
 echo "#define GPAC_ENABLE_COVERAGE" >> $TMPH
 fi
 
+echo "CONFIG_NGHTTP2=$has_nghttp2" >> config.mak
+if test "$has_nghttp2" != "no" ; then
+ echo "NGHTTP2_CFLAGS=$nghttp2_cflags" >> config.mak
+ echo "NGHTTP2_LDFLAGS=$nghttp2_ldflags" >> config.mak
+ echo "#define GPAC_HAS_HTTP2" >> $TMPH
+fi
+
+
 echo "DISABLE_PLAYER=$disable_player" >> config.mak
 echo "DISABLE_STREAMING=$disable_streaming" >> config.mak
 echo "DISABLE_SVG=$disable_svg" >> config.mak
@@ -2998,7 +3197,7 @@
 echo "MINIMAL_OD=$disable_od" >> config.mak
 echo "DISABLE_ISOM_ADOBE=$disable_isoff_hds" >> config.mak
 echo "DISABLE_VRML=$disable_vrml" >> config.mak
-echo "DISABLE_ATSC=$disable_atsc" >> config.mak
+echo "DISABLE_ROUTE=$disable_route" >> config.mak
 echo "DISABLE_CRYPTO=$disable_crypto" >> config.mak
 
 if test "$disable_parsers" = "yes" ; then
@@ -3023,6 +3222,10 @@
 echo "#define GPAC_USE_TINYGL" >> $TMPH
 fi
 
+if test "$disable_nvdec" = "yes" ; then
+ echo "#define GPAC_DISABLE_NVDEC" >> $TMPH
+fi
+
 echo "ENABLE_JOYSTICK=$has_joystick" >> config.mak
 
 echo "HAS_OPENSSL=$has_ssl" >> config.mak
@@ -3047,7 +3250,7 @@
 echo "CONFIG_AMR_WB_FT=$has_amr_wb" >> config.mak
 echo "DEBUGBUILD=$debuginfo" >> config.mak
 echo "GPROFBUILD=$gprof_build" >> config.mak
-echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
+echo "STATIC_BINARY=$static_bin" >> config.mak
 echo "STATICBUILD=$static_build" >> config.mak
 
 echo "CONFIG_IPV6=$has_ipv6" >> config.mak
@@ -3068,12 +3271,6 @@
 
 echo "CONFIG_PLATINUM=$has_platinum" >> config.mak
 
-echo "CONFIG_AVCAP=$has_avcap" >> config.mak
-if test "$has_avcap" = "yes" ; then
- echo "AVCAP_CFLAGS=$avcap_cflags" >> config.mak
- echo "AVCAP_LDFLAGS=$avcap_ldflags" >> config.mak
-fi
-
 echo "CONFIG_OPENSVC=$has_opensvc" >> config.mak
 if test "$has_opensvc" = "yes" ; then
 echo "OSVC_CFLAGS=$osvc_cflags" >> config.mak
@@ -3086,6 +3283,12 @@
 echo "OHEVC_CFLAGS=$ohevc_cflags" >> config.mak
 echo "OHEVC_LDFLAGS=$ohevc_ldflags" >> config.mak
 echo "#define GPAC_HAS_OPENHEVC" >> $TMPH
+
+
+if test "$static_modules" = "yes" ; then
+ echo "#define GPAC_OPENHEVC_STATIC" >> $TMPH
+fi
+
 fi
 
 echo "MOZILLA_DIR=$moz_path" >> config.mak
@@ -3131,8 +3334,6 @@
 fi
 echo "X11_INC_PATH=$X11_PATH/include" >> config.mak
 
-echo "RENOIR_ENABLE=$enable_renoir" >> config.mak
-
 GPAC_ENST_INC=no
 GPAC_ENST=no
 enst_dir="`ls \"$source_path/src/\" | grep enst`"
@@ -3261,6 +3462,13 @@
 fi
 echo '	$(CXX) $(CFLAGS) -c -o $@ $<' >> config.mak
 
+echo '%.o: %.rc' >> config.mak
+if test "$verbose" = "no" ; then
+echo '	@echo " RC $<"' >> config.mak
+fi
+echo '	$(WINDRES) $< -o $@ ' >> config.mak
+
+
 #pkg-config
 generate_pkgconfig () {
 	echo "prefix=$prefix"
@@ -3279,29 +3487,14 @@
 generate_pkgconfig > gpac.pc
 
 
-generate_gpacdesktop () {
-	echo "[Desktop Entry]"
-	echo "Version=1.0"
-	echo "Name=MP4Client"
-	echo "Comment=GPAC Media Player"
-	echo "GenericName=Media Player"
-	echo "Keywords=Media Player"
-	echo "Exec=MP4Client -gui %u"
-	echo "Terminal=false"
-	echo "X-MultipleArgs=false"
-	echo "Type=Application"
-	echo "Icon=$prefix/share/pixmaps/gpac.png"
-	echo "Categories=AudioVideo"
-	echo "MimeType=text/text;text/xml;application/xhtml+xml;application/xml;image/jpeg;image/png;video/webm;video/mp4;video/mpeg;audio/mp4;audio/mpeg;x-scheme-handler/rtsp;x-scheme-handler/rtp;x-scheme-handler/atsc"
-	echo "StartupNotify=true"
-	echo "Actions=new-window"
-	echo ""
-	echo "[Desktop Action new-window]"
-	echo "Name=Open a New Window"
-	echo "Exec=MP4Client"
-	echo ""
-}
+if test "$static_bin" = "yes"; then
+ if test "$darwin" = "yes" ; then
+ echo "\nWarning: static binaries on OSX cannot remove all dependendencies to system libraries\n"
+ elif test "$win32" = "yes" ; then
+ echo "\nWarning: static binaries on Win32 cannot remove all dependendencies to system libraries\n"
+ fi
+fi
+
 
-generate_gpacdesktop > "$source_path/share/gpac.desktop"
 
 echo "Done - type 'make help' for make info, 'make' to build"

gpac-1.0.1.tar.gz/debian/changelog -> gpac-2.0.0.tar.gz/debian/changelog Changed

gpac-1.0.1.tar.gz/debian/control -> gpac-2.0.0.tar.gz/debian/control Changed

@@ -6,27 +6,28 @@
 Homepage: http://gpac.io
 Standards-Version: 3.8.0
 Build-Conflicts: libgpac-dev
-Build-Depends: debhelper (>= 6), libc6, libc6-dev, libx11-dev (>= 1.3), zlib1g-dev (>= 1), libfreetype6-dev, libjpeg62-dev | libjpeg62-turbo-dev, libpng-dev, libmad0-dev, libfaad-dev, libogg-dev, libvorbis-dev, libtheora-dev, liba52-dev | liba52-0.7.4-dev, libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev, libavdevice-dev, libavfilter-dev, libxv-dev, x11proto-video-dev, libgl1-mesa-dev, x11proto-gl-dev, libxvidcore-dev, libssl-dev (>= 0.9.8), libjack-dev (>= 0.118), libasound2-dev (>= 1.0), libpulse-dev (>= 0.9), libsdl-dev (>= 1.2) | libsdl2-dev, ccache
+Build-Depends: debhelper (>= 6), libc6, libc6-dev, libx11-dev (>= 1.3), zlib1g-dev (>= 1), libfreetype6-dev, libjpeg62-dev | libjpeg62-turbo-dev, libpng-dev, libmad0-dev, libfaad-dev, libogg-dev, libvorbis-dev, libtheora-dev, liba52-dev | liba52-0.7.4-dev, libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev, libavdevice-dev, libavfilter-dev, libxv-dev, x11proto-video-dev, libgl1-mesa-dev, x11proto-gl-dev, libxvidcore-dev, libssl-dev (>= 0.9.8), libjack-dev (>= 0.118), libasound2-dev (>= 1.0), libpulse-dev (>= 0.9), libsdl-dev (>= 1.2) | libsdl2-dev, libnghttp2-dev, ccache
 
 Package: gpac
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: framework for production, encoding, delivery and interactive playback of multimedia content
+Description: Framework for production, encoding, delivery and interactive playback of multimedia content
 GPAC supports many AV codecs, multimedia containers (MP4,fMP4, TS, avi, mov, mpg, mkv ...), complex
 presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D) and subtitles (SRT, WebVTT, TTXT/TX3G, TTML).
- Supported inputs and outputs are pipes, UDP/TCP/UN sockets, local files, HTTP, RTP/RTSP, TS demuxing (from file, IP or DVB4Linux), 
+ Supported inputs and outputs are pipes, UDP/TCP/UN sockets, local files, HTTP, DASH/HLS, RTP/RTSP, MPEG-2 TS, 
 ATSC 3.0 ROUTE sessions, desktop grabbing, camera/microphone inputs and any input format supported by FFmpeg.
- GPAC features a highly configurable media processing pipeline, and can further be extended using JavaScript.
+ GPAC features a highly configurable media processing pipeline extensible through JavaScript, and can be embedded in Python or NodeJS applications.
 
 
 Package: libgpac-dev
 Architecture: any
 Section: libdevel
 Depends: gpac
-Replaces: gpac (<= 0.8.0)
-Description: framework for production, encoding, delivery and interactive playback of multimedia content
+Replaces: gpac (<= 1.0.1)
+Description: Framework for production, encoding, delivery and interactive playback of multimedia content
 GPAC supports many AV codecs, multimedia containers (MP4,fMP4, TS, avi, mov, mpg, mkv ...), complex
 presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D) and subtitles (SRT, WebVTT, TTXT/TX3G, TTML).
- Supported inputs and outputs are pipes, UDP/TCP/UN sockets, local files, HTTP, RTP/RTSP, TS demuxing (from file, IP or DVB4Linux), 
+ Supported inputs and outputs are pipes, UDP/TCP/UN sockets, local files, HTTP, DASH/HLS, RTP/RTSP, MPEG-2 TS, 
 ATSC 3.0 ROUTE sessions, desktop grabbing, camera/microphone inputs and any input format supported by FFmpeg.
- GPAC features a highly configurable media processing pipeline, and can further be extended using JavaScript.
+ GPAC features a highly configurable media processing pipeline extensible through JavaScript, and can be embedded in Python or NodeJS applications.
+

gpac-1.0.1.tar.gz/debian/copyright -> gpac-2.0.0.tar.gz/debian/copyright Changed

gpac-1.0.1.tar.gz/debian/gpac.install -> gpac-2.0.0.tar.gz/debian/gpac.install Changed

gpac-1.0.1.tar.gz/debian/watch -> gpac-2.0.0.tar.gz/debian/watch Changed

gpac-2.0.0.tar.gz/extra_lib/include/nghttp2 Added

gpac-2.0.0.tar.gz/extra_lib/include/nghttp2/nghttp2.h Added

@@ -0,0 +1,5558 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2013, 2014 Tatsuhiro Tsujikawa
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef NGHTTP2_H
+#define NGHTTP2_H
+
+/* Define WIN32 when build target is Win32 API (borrowed from
+ libcurl) */
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+# define WIN32
+#endif
+
+/* Compatibility for non-Clang compilers */
+#ifndef __has_declspec_attribute
+# define __has_declspec_attribute(x) 0
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdlib.h>
+#if defined(_MSC_VER) && (_MSC_VER < 1800)
+/* MSVC < 2013 does not have inttypes.h because it is not C99
+ compliant. See compiler macros and version number in
+ https://sourceforge.net/p/predef/wiki/Compilers/ */
+# include <stdint.h>
+#else /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
+# include <inttypes.h>
+#endif /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
+#include <sys/types.h>
+#include <stdarg.h>
+
+#include <nghttp2/nghttp2ver.h>
+
+#ifdef NGHTTP2_STATICLIB
+# define NGHTTP2_EXTERN
+#elif defined(WIN32) || (__has_declspec_attribute(dllexport) && \
+ __has_declspec_attribute(dllimport))
+# ifdef BUILDING_NGHTTP2
+# define NGHTTP2_EXTERN __declspec(dllexport)
+# else /* !BUILDING_NGHTTP2 */
+# define NGHTTP2_EXTERN __declspec(dllimport)
+# endif /* !BUILDING_NGHTTP2 */
+#else /* !defined(WIN32) */
+# ifdef BUILDING_NGHTTP2
+# define NGHTTP2_EXTERN __attribute__((visibility("default")))
+# else /* !BUILDING_NGHTTP2 */
+# define NGHTTP2_EXTERN
+# endif /* !BUILDING_NGHTTP2 */
+#endif /* !defined(WIN32) */
+
+/**
+ * @macro
+ *
+ * The protocol version identification string of this library
+ * supports. This identifier is used if HTTP/2 is used over TLS.
+ */
+#define NGHTTP2_PROTO_VERSION_ID "h2"
+/**
+ * @macro
+ *
+ * The length of :macro:`NGHTTP2_PROTO_VERSION_ID`.
+ */
+#define NGHTTP2_PROTO_VERSION_ID_LEN 2
+
+/**
+ * @macro
+ *
+ * The serialized form of ALPN protocol identifier this library
+ * supports. Notice that first byte is the length of following
+ * protocol identifier. This is the same wire format of `TLS ALPN
+ * extension <https://tools.ietf.org/html/rfc7301>`_. This is useful
+ * to process incoming ALPN tokens in wire format.
+ */
+#define NGHTTP2_PROTO_ALPN "\x2h2"
+
+/**
+ * @macro
+ *
+ * The length of :macro:`NGHTTP2_PROTO_ALPN`.
+ */
+#define NGHTTP2_PROTO_ALPN_LEN (sizeof(NGHTTP2_PROTO_ALPN) - 1)
+
+/**
+ * @macro
+ *
+ * The protocol version identification string of this library
+ * supports. This identifier is used if HTTP/2 is used over cleartext
+ * TCP.
+ */
+#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID "h2c"
+
+/**
+ * @macro
+ *
+ * The length of :macro:`NGHTTP2_CLEARTEXT_PROTO_VERSION_ID`.
+ */
+#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID_LEN 3
+
+struct nghttp2_session;
+/**
+ * @struct
+ *
+ * The primary structure to hold the resources needed for a HTTP/2
+ * session. The details of this structure are intentionally hidden
+ * from the public API.
+ */
+typedef struct nghttp2_session nghttp2_session;
+
+/**
+ * @macro
+ *
+ * The age of :type:`nghttp2_info`
+ */
+#define NGHTTP2_VERSION_AGE 1
+
+/**
+ * @struct
+ *
+ * This struct is what `nghttp2_version()` returns. It holds
+ * information about the particular nghttp2 version.
+ */
+typedef struct {
+ /**
+ * Age of this struct. This instance of nghttp2 sets it to
+ * :macro:`NGHTTP2_VERSION_AGE` but a future version may bump it and
+ * add more struct fields at the bottom
+ */
+ int age;
+ /**
+ * the :macro:`NGHTTP2_VERSION_NUM` number (since age ==1)
+ */
+ int version_num;
+ /**
+ * points to the :macro:`NGHTTP2_VERSION` string (since age ==1)
+ */
+ const char *version_str;
+ /**
+ * points to the :macro:`NGHTTP2_PROTO_VERSION_ID` string this
+ * instance implements (since age ==1)
+ */
+ const char *proto_str;
+ /* -------- the above fields all exist when age == 1 */
+} nghttp2_info;
+
+/**
+ * @macro
+ *
+ * The default weight of stream dependency.
+ */
+#define NGHTTP2_DEFAULT_WEIGHT 16
+
+/**
+ * @macro
+ *
+ * The maximum weight of stream dependency.
+ */
+#define NGHTTP2_MAX_WEIGHT 256
+
+/**
+ * @macro
+ *
+ * The minimum weight of stream dependency.
+ */
+#define NGHTTP2_MIN_WEIGHT 1
+
+/**
+ * @macro
+ *
+ * The maximum window size
+ */
+#define NGHTTP2_MAX_WINDOW_SIZE ((int32_t)((1U << 31) - 1))
+
+/**
+ * @macro
+ *
+ * The initial window size for stream level flow control.
+ */
+#define NGHTTP2_INITIAL_WINDOW_SIZE ((1 << 16) - 1)
+/**
+ * @macro
+ *
+ * The initial window size for connection level flow control.
+ */
+#define NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE ((1 << 16) - 1)
+
+/**
+ * @macro
+ *
+ * The default header table size.
+ */
+#define NGHTTP2_DEFAULT_HEADER_TABLE_SIZE (1 << 12)
+
+/**
+ * @macro
+ *
+ * The client magic string, which is the first 24 bytes byte string of
+ * client connection preface.
+ */
+#define NGHTTP2_CLIENT_MAGIC "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
+
+/**
+ * @macro
+ *
+ * The length of :macro:`NGHTTP2_CLIENT_MAGIC`.
+ */
+#define NGHTTP2_CLIENT_MAGIC_LEN 24
+
+/**
+ * @macro
+ *
+ * The default max number of settings per SETTINGS frame
+ */
+#define NGHTTP2_DEFAULT_MAX_SETTINGS 32
+
+/**
+ * @enum
+ *
+ * Error codes used in this library. The code range is [-999, -500],
+ * inclusive. The following values are defined:
+ */
+typedef enum {
+ /**
+ * Invalid argument passed.
+ */
+ NGHTTP2_ERR_INVALID_ARGUMENT = -501,
+ /**
+ * Out of buffer space.
+ */
+ NGHTTP2_ERR_BUFFER_ERROR = -502,
+ /**
+ * The specified protocol version is not supported.
+ */
+ NGHTTP2_ERR_UNSUPPORTED_VERSION = -503,
+ /**
+ * Used as a return value from :type:`nghttp2_send_callback`,
+ * :type:`nghttp2_recv_callback` and
+ * :type:`nghttp2_send_data_callback` to indicate that the operation
+ * would block.
+ */
+ NGHTTP2_ERR_WOULDBLOCK = -504,
+ /**
+ * General protocol error
+ */
+ NGHTTP2_ERR_PROTO = -505,
+ /**
+ * The frame is invalid.
+ */
+ NGHTTP2_ERR_INVALID_FRAME = -506,
+ /**
+ * The peer performed a shutdown on the connection.
+ */
+ NGHTTP2_ERR_EOF = -507,
+ /**
+ * Used as a return value from
+ * :func:`nghttp2_data_source_read_callback` to indicate that data
+ * transfer is postponed. See
+ * :func:`nghttp2_data_source_read_callback` for details.
+ */
+ NGHTTP2_ERR_DEFERRED = -508,
+ /**
+ * Stream ID has reached the maximum value. Therefore no stream ID
+ * is available.
+ */
+ NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE = -509,
+ /**
+ * The stream is already closed; or the stream ID is invalid.
+ */
+ NGHTTP2_ERR_STREAM_CLOSED = -510,
+ /**
+ * RST_STREAM has been added to the outbound queue. The stream is
+ * in closing state.
+ */
+ NGHTTP2_ERR_STREAM_CLOSING = -511,
+ /**
+ * The transmission is not allowed for this stream (e.g., a frame
+ * with END_STREAM flag set has already sent).
+ */
+ NGHTTP2_ERR_STREAM_SHUT_WR = -512,
+ /**
+ * The stream ID is invalid.
+ */
+ NGHTTP2_ERR_INVALID_STREAM_ID = -513,
+ /**
+ * The state of the stream is not valid (e.g., DATA cannot be sent
+ * to the stream if response HEADERS has not been sent).
+ */
+ NGHTTP2_ERR_INVALID_STREAM_STATE = -514,
+ /**
+ * Another DATA frame has already been deferred.
+ */
+ NGHTTP2_ERR_DEFERRED_DATA_EXIST = -515,
+ /**
+ * Starting new stream is not allowed (e.g., GOAWAY has been sent
+ * and/or received).
+ */
+ NGHTTP2_ERR_START_STREAM_NOT_ALLOWED = -516,
+ /**
+ * GOAWAY has already been sent.
+ */
+ NGHTTP2_ERR_GOAWAY_ALREADY_SENT = -517,
+ /**
+ * The received frame contains the invalid header block (e.g., There
+ * are duplicate header names; or the header names are not encoded
+ * in US-ASCII character set and not lower cased; or the header name
+ * is zero-length string; or the header value contains multiple
+ * in-sequence NUL bytes).
+ */
+ NGHTTP2_ERR_INVALID_HEADER_BLOCK = -518,
+ /**
+ * Indicates that the context is not suitable to perform the
+ * requested operation.
+ */
+ NGHTTP2_ERR_INVALID_STATE = -519,
+ /**
+ * The user callback function failed due to the temporal error.
+ */
+ NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE = -521,
+ /**
+ * The length of the frame is invalid, either too large or too small.
+ */
+ NGHTTP2_ERR_FRAME_SIZE_ERROR = -522,
+ /**
+ * Header block inflate/deflate error.
+ */
+ NGHTTP2_ERR_HEADER_COMP = -523,
+ /**
+ * Flow control error
+ */
+ NGHTTP2_ERR_FLOW_CONTROL = -524,
+ /**
+ * Insufficient buffer size given to function.
+ */
+ NGHTTP2_ERR_INSUFF_BUFSIZE = -525,
+ /**
+ * Callback was paused by the application
+ */
+ NGHTTP2_ERR_PAUSE = -526,
+ /**
+ * There are too many in-flight SETTING frame and no more
+ * transmission of SETTINGS is allowed.
+ */
+ NGHTTP2_ERR_TOO_MANY_INFLIGHT_SETTINGS = -527,
+ /**
+ * The server push is disabled.
+ */
+ NGHTTP2_ERR_PUSH_DISABLED = -528,
+ /**
+ * DATA or HEADERS frame for a given stream has been already
+ * submitted and has not been fully processed yet. Application
+ * should wait for the transmission of the previously submitted
+ * frame before submitting another.
+ */
+ NGHTTP2_ERR_DATA_EXIST = -529,
+ /**
+ * The current session is closing due to a connection error or
+ * `nghttp2_session_terminate_session()` is called.
+ */
+ NGHTTP2_ERR_SESSION_CLOSING = -530,
+ /**
+ * Invalid HTTP header field was received and stream is going to be
+ * closed.
+ */
+ NGHTTP2_ERR_HTTP_HEADER = -531,
+ /**
+ * Violation in HTTP messaging rule.
+ */
+ NGHTTP2_ERR_HTTP_MESSAGING = -532,
+ /**
+ * Stream was refused.
+ */
+ NGHTTP2_ERR_REFUSED_STREAM = -533,
+ /**
+ * Unexpected internal error, but recovered.
+ */
+ NGHTTP2_ERR_INTERNAL = -534,
+ /**
+ * Indicates that a processing was canceled.
+ */
+ NGHTTP2_ERR_CANCEL = -535,
+ /**
+ * When a local endpoint expects to receive SETTINGS frame, it
+ * receives an other type of frame.
+ */
+ NGHTTP2_ERR_SETTINGS_EXPECTED = -536,
+ /**
+ * When a local endpoint receives too many settings entries
+ * in a single SETTINGS frame.
+ */
+ NGHTTP2_ERR_TOO_MANY_SETTINGS = -537,
+ /**
+ * The errors < :enum:`nghttp2_error.NGHTTP2_ERR_FATAL` mean that
+ * the library is under unexpected condition and processing was
+ * terminated (e.g., out of memory). If application receives this
+ * error code, it must stop using that :type:`nghttp2_session`
+ * object and only allowed operation for that object is deallocate
+ * it using `nghttp2_session_del()`.
+ */
+ NGHTTP2_ERR_FATAL = -900,
+ /**
+ * Out of memory. This is a fatal error.
+ */
+ NGHTTP2_ERR_NOMEM = -901,
+ /**
+ * The user callback function failed. This is a fatal error.
+ */
+ NGHTTP2_ERR_CALLBACK_FAILURE = -902,
+ /**
+ * Invalid client magic (see :macro:`NGHTTP2_CLIENT_MAGIC`) was
+ * received and further processing is not possible.
+ */
+ NGHTTP2_ERR_BAD_CLIENT_MAGIC = -903,
+ /**
+ * Possible flooding by peer was detected in this HTTP/2 session.
+ * Flooding is measured by how many PING and SETTINGS frames with
+ * ACK flag set are queued for transmission. These frames are
+ * response for the peer initiated frames, and peer can cause memory
+ * exhaustion on server side to send these frames forever and does
+ * not read network.
+ */
+ NGHTTP2_ERR_FLOODED = -904
+} nghttp2_error;
+
+/**
+ * @struct
+ *
+ * The object representing single contiguous buffer.
+ */
+typedef struct {
+ /**
+ * The pointer to the buffer.
+ */
+ uint8_t *base;
+ /**
+ * The length of the buffer.
+ */
+ size_t len;
+} nghttp2_vec;
+
+struct nghttp2_rcbuf;
+
+/**
+ * @struct
+ *
+ * The object representing reference counted buffer. The details of
+ * this structure are intentionally hidden from the public API.
+ */
+typedef struct nghttp2_rcbuf nghttp2_rcbuf;
+
+/**
+ * @function
+ *
+ * Increments the reference count of |rcbuf| by 1.
+ */
+NGHTTP2_EXTERN void nghttp2_rcbuf_incref(nghttp2_rcbuf *rcbuf);
+
+/**
+ * @function
+ *
+ * Decrements the reference count of |rcbuf| by 1. If the reference
+ * count becomes zero, the object pointed by |rcbuf| will be freed.
+ * In this case, application must not use |rcbuf| again.
+ */
+NGHTTP2_EXTERN void nghttp2_rcbuf_decref(nghttp2_rcbuf *rcbuf);
+
+/**
+ * @function
+ *
+ * Returns the underlying buffer managed by |rcbuf|.
+ */
+NGHTTP2_EXTERN nghttp2_vec nghttp2_rcbuf_get_buf(nghttp2_rcbuf *rcbuf);
+
+/**
+ * @function
+ *
+ * Returns nonzero if the underlying buffer is statically allocated,
+ * and 0 otherwise. This can be useful for language bindings that wish
+ * to avoid creating duplicate strings for these buffers.
+ */
+NGHTTP2_EXTERN int nghttp2_rcbuf_is_static(const nghttp2_rcbuf *rcbuf);
+
+/**
+ * @enum
+ *
+ * The flags for header field name/value pair.
+ */
+typedef enum {
+ /**
+ * No flag set.
+ */
+ NGHTTP2_NV_FLAG_NONE = 0,
+ /**
+ * Indicates that this name/value pair must not be indexed ("Literal
+ * Header Field never Indexed" representation must be used in HPACK
+ * encoding). Other implementation calls this bit as "sensitive".
+ */
+ NGHTTP2_NV_FLAG_NO_INDEX = 0x01,
+ /**
+ * This flag is set solely by application. If this flag is set, the
+ * library does not make a copy of header field name. This could
+ * improve performance.
+ */
+ NGHTTP2_NV_FLAG_NO_COPY_NAME = 0x02,
+ /**
+ * This flag is set solely by application. If this flag is set, the
+ * library does not make a copy of header field value. This could
+ * improve performance.
+ */
+ NGHTTP2_NV_FLAG_NO_COPY_VALUE = 0x04
+} nghttp2_nv_flag;
+
+/**
+ * @struct
+ *
+ * The name/value pair, which mainly used to represent header fields.
+ */
+typedef struct {
+ /**
+ * The |name| byte string. If this struct is presented from library
+ * (e.g., :type:`nghttp2_on_frame_recv_callback`), |name| is
+ * guaranteed to be NULL-terminated. For some callbacks
+ * (:type:`nghttp2_before_frame_send_callback`,
+ * :type:`nghttp2_on_frame_send_callback`, and
+ * :type:`nghttp2_on_frame_not_send_callback`), it may not be
+ * NULL-terminated if header field is passed from application with
+ * the flag :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`).
+ * When application is constructing this struct, |name| is not
+ * required to be NULL-terminated.
+ */
+ uint8_t *name;
+ /**
+ * The |value| byte string. If this struct is presented from
+ * library (e.g., :type:`nghttp2_on_frame_recv_callback`), |value|
+ * is guaranteed to be NULL-terminated. For some callbacks
+ * (:type:`nghttp2_before_frame_send_callback`,
+ * :type:`nghttp2_on_frame_send_callback`, and
+ * :type:`nghttp2_on_frame_not_send_callback`), it may not be
+ * NULL-terminated if header field is passed from application with
+ * the flag :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE`).
+ * When application is constructing this struct, |value| is not
+ * required to be NULL-terminated.
+ */
+ uint8_t *value;
+ /**
+ * The length of the |name|, excluding terminating NULL.
+ */
+ size_t namelen;
+ /**
+ * The length of the |value|, excluding terminating NULL.
+ */
+ size_t valuelen;
+ /**
+ * Bitwise OR of one or more of :type:`nghttp2_nv_flag`.
+ */
+ uint8_t flags;
+} nghttp2_nv;
+
+/**
+ * @enum
+ *
+ * The frame types in HTTP/2 specification.
+ */
+typedef enum {
+ /**
+ * The DATA frame.
+ */
+ NGHTTP2_DATA = 0,
+ /**
+ * The HEADERS frame.
+ */
+ NGHTTP2_HEADERS = 0x01,
+ /**
+ * The PRIORITY frame.
+ */
+ NGHTTP2_PRIORITY = 0x02,
+ /**
+ * The RST_STREAM frame.
+ */
+ NGHTTP2_RST_STREAM = 0x03,
+ /**
+ * The SETTINGS frame.
+ */
+ NGHTTP2_SETTINGS = 0x04,
+ /**
+ * The PUSH_PROMISE frame.
+ */
+ NGHTTP2_PUSH_PROMISE = 0x05,
+ /**
+ * The PING frame.
+ */
+ NGHTTP2_PING = 0x06,
+ /**
+ * The GOAWAY frame.
+ */
+ NGHTTP2_GOAWAY = 0x07,
+ /**
+ * The WINDOW_UPDATE frame.
+ */
+ NGHTTP2_WINDOW_UPDATE = 0x08,
+ /**
+ * The CONTINUATION frame. This frame type won't be passed to any
+ * callbacks because the library processes this frame type and its
+ * preceding HEADERS/PUSH_PROMISE as a single frame.
+ */
+ NGHTTP2_CONTINUATION = 0x09,
+ /**
+ * The ALTSVC frame, which is defined in `RFC 7383
+ * <https://tools.ietf.org/html/rfc7838#section-4>`_.
+ */
+ NGHTTP2_ALTSVC = 0x0a,
+ /**
+ * The ORIGIN frame, which is defined by `RFC 8336
+ * <https://tools.ietf.org/html/rfc8336>`_.
+ */
+ NGHTTP2_ORIGIN = 0x0c
+} nghttp2_frame_type;
+
+/**
+ * @enum
+ *
+ * The flags for HTTP/2 frames. This enum defines all flags for all
+ * frames.
+ */
+typedef enum {
+ /**
+ * No flag set.
+ */
+ NGHTTP2_FLAG_NONE = 0,
+ /**
+ * The END_STREAM flag.
+ */
+ NGHTTP2_FLAG_END_STREAM = 0x01,
+ /**
+ * The END_HEADERS flag.
+ */
+ NGHTTP2_FLAG_END_HEADERS = 0x04,
+ /**
+ * The ACK flag.
+ */
+ NGHTTP2_FLAG_ACK = 0x01,
+ /**
+ * The PADDED flag.
+ */
+ NGHTTP2_FLAG_PADDED = 0x08,
+ /**
+ * The PRIORITY flag.
+ */
+ NGHTTP2_FLAG_PRIORITY = 0x20
+} nghttp2_flag;
+
+/**
+ * @enum
+ * The SETTINGS ID.
+ */
+typedef enum {
+ /**
+ * SETTINGS_HEADER_TABLE_SIZE
+ */
+ NGHTTP2_SETTINGS_HEADER_TABLE_SIZE = 0x01,
+ /**
+ * SETTINGS_ENABLE_PUSH
+ */
+ NGHTTP2_SETTINGS_ENABLE_PUSH = 0x02,
+ /**
+ * SETTINGS_MAX_CONCURRENT_STREAMS
+ */
+ NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 0x03,
+ /**
+ * SETTINGS_INITIAL_WINDOW_SIZE
+ */
+ NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE = 0x04,
+ /**
+ * SETTINGS_MAX_FRAME_SIZE
+ */
+ NGHTTP2_SETTINGS_MAX_FRAME_SIZE = 0x05,
+ /**
+ * SETTINGS_MAX_HEADER_LIST_SIZE
+ */
+ NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 0x06,
+ /**
+ * SETTINGS_ENABLE_CONNECT_PROTOCOL
+ * (`RFC 8441 <https://tools.ietf.org/html/rfc8441>`_)
+ */
+ NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL = 0x08
+} nghttp2_settings_id;
+/* Note: If we add SETTINGS, update the capacity of
+ NGHTTP2_INBOUND_NUM_IV as well */
+
+/**
+ * @macro
+ *
+ * .. warning::
+ *
+ * Deprecated. The initial max concurrent streams is 0xffffffffu.
+ *
+ * Default maximum number of incoming concurrent streams. Use
+ * `nghttp2_submit_settings()` with
+ * :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS`
+ * to change the maximum number of incoming concurrent streams.
+ *
+ * .. note::
+ *
+ * The maximum number of outgoing concurrent streams is 100 by
+ * default.
+ */
+#define NGHTTP2_INITIAL_MAX_CONCURRENT_STREAMS ((1U << 31) - 1)
+
+/**
+ * @enum
+ * The status codes for the RST_STREAM and GOAWAY frames.
+ */
+typedef enum {
+ /**
+ * No errors.
+ */
+ NGHTTP2_NO_ERROR = 0x00,
+ /**
+ * PROTOCOL_ERROR
+ */
+ NGHTTP2_PROTOCOL_ERROR = 0x01,
+ /**
+ * INTERNAL_ERROR
+ */
+ NGHTTP2_INTERNAL_ERROR = 0x02,
+ /**
+ * FLOW_CONTROL_ERROR
+ */
+ NGHTTP2_FLOW_CONTROL_ERROR = 0x03,
+ /**
+ * SETTINGS_TIMEOUT
+ */
+ NGHTTP2_SETTINGS_TIMEOUT = 0x04,
+ /**
+ * STREAM_CLOSED
+ */
+ NGHTTP2_STREAM_CLOSED = 0x05,
+ /**
+ * FRAME_SIZE_ERROR
+ */
+ NGHTTP2_FRAME_SIZE_ERROR = 0x06,
+ /**
+ * REFUSED_STREAM
+ */
+ NGHTTP2_REFUSED_STREAM = 0x07,
+ /**
+ * CANCEL
+ */
+ NGHTTP2_CANCEL = 0x08,
+ /**
+ * COMPRESSION_ERROR
+ */
+ NGHTTP2_COMPRESSION_ERROR = 0x09,
+ /**
+ * CONNECT_ERROR
+ */
+ NGHTTP2_CONNECT_ERROR = 0x0a,
+ /**
+ * ENHANCE_YOUR_CALM
+ */
+ NGHTTP2_ENHANCE_YOUR_CALM = 0x0b,
+ /**
+ * INADEQUATE_SECURITY
+ */
+ NGHTTP2_INADEQUATE_SECURITY = 0x0c,
+ /**
+ * HTTP_1_1_REQUIRED
+ */
+ NGHTTP2_HTTP_1_1_REQUIRED = 0x0d
+} nghttp2_error_code;
+
+/**
+ * @struct
+ * The frame header.
+ */
+typedef struct {
+ /**
+ * The length field of this frame, excluding frame header.
+ */
+ size_t length;
+ /**
+ * The stream identifier (aka, stream ID)
+ */
+ int32_t stream_id;
+ /**
+ * The type of this frame. See `nghttp2_frame_type`.
+ */
+ uint8_t type;
+ /**
+ * The flags.
+ */
+ uint8_t flags;
+ /**
+ * Reserved bit in frame header. Currently, this is always set to 0
+ * and application should not expect something useful in here.
+ */
+ uint8_t reserved;
+} nghttp2_frame_hd;
+
+/**
+ * @union
+ *
+ * This union represents the some kind of data source passed to
+ * :type:`nghttp2_data_source_read_callback`.
+ */
+typedef union {
+ /**
+ * The integer field, suitable for a file descriptor.
+ */
+ int fd;
+ /**
+ * The pointer to an arbitrary object.
+ */
+ void *ptr;
+} nghttp2_data_source;
+
+/**
+ * @enum
+ *
+ * The flags used to set in |data_flags| output parameter in
+ * :type:`nghttp2_data_source_read_callback`.
+ */
+typedef enum {
+ /**
+ * No flag set.
+ */
+ NGHTTP2_DATA_FLAG_NONE = 0,
+ /**
+ * Indicates EOF was sensed.
+ */
+ NGHTTP2_DATA_FLAG_EOF = 0x01,
+ /**
+ * Indicates that END_STREAM flag must not be set even if
+ * NGHTTP2_DATA_FLAG_EOF is set. Usually this flag is used to send
+ * trailer fields with `nghttp2_submit_request()` or
+ * `nghttp2_submit_response()`.
+ */
+ NGHTTP2_DATA_FLAG_NO_END_STREAM = 0x02,
+ /**
+ * Indicates that application will send complete DATA frame in
+ * :type:`nghttp2_send_data_callback`.
+ */
+ NGHTTP2_DATA_FLAG_NO_COPY = 0x04
+} nghttp2_data_flag;
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when the library wants to read data from
+ * the |source|. The read data is sent in the stream |stream_id|.
+ * The implementation of this function must read at most |length|
+ * bytes of data from |source| (or possibly other places) and store
+ * them in |buf| and return number of data stored in |buf|. If EOF is
+ * reached, set :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` flag
+ * in |*data_flags|.
+ *
+ * Sometime it is desirable to avoid copying data into |buf| and let
+ * application to send data directly. To achieve this, set
+ * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` to
+ * |*data_flags| (and possibly other flags, just like when we do
+ * copy), and return the number of bytes to send without copying data
+ * into |buf|. The library, seeing
+ * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY`, will invoke
+ * :type:`nghttp2_send_data_callback`. The application must send
+ * complete DATA frame in that callback.
+ *
+ * If this callback is set by `nghttp2_submit_request()`,
+ * `nghttp2_submit_response()` or `nghttp2_submit_headers()` and
+ * `nghttp2_submit_data()` with flag parameter
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` set, and
+ * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` flag is set to
+ * |*data_flags|, DATA frame will have END_STREAM flag set. Usually,
+ * this is expected behaviour and all are fine. One exception is send
+ * trailer fields. You cannot send trailer fields after sending frame
+ * with END_STREAM set. To avoid this problem, one can set
+ * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_END_STREAM` along
+ * with :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` to signal the
+ * library not to set END_STREAM in DATA frame. Then application can
+ * use `nghttp2_submit_trailer()` to send trailer fields.
+ * `nghttp2_submit_trailer()` can be called inside this callback.
+ *
+ * If the application wants to postpone DATA frames (e.g.,
+ * asynchronous I/O, or reading data blocks for long time), it is
+ * achieved by returning :enum:`nghttp2_error.NGHTTP2_ERR_DEFERRED`
+ * without reading any data in this invocation. The library removes
+ * DATA frame from the outgoing queue temporarily. To move back
+ * deferred DATA frame to outgoing queue, call
+ * `nghttp2_session_resume_data()`.
+ *
+ * By default, |length| is limited to 16KiB at maximum. If peer
+ * allows larger frames, application can enlarge transmission buffer
+ * size. See :type:`nghttp2_data_source_read_length_callback` for
+ * more details.
+ *
+ * If the application just wants to return from
+ * `nghttp2_session_send()` or `nghttp2_session_mem_send()` without
+ * sending anything, return :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE`.
+ *
+ * In case of error, there are 2 choices. Returning
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
+ * close the stream by issuing RST_STREAM with
+ * :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`. If a different
+ * error code is desirable, use `nghttp2_submit_rst_stream()` with a
+ * desired error code and then return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+ * Returning :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will
+ * signal the entire session failure.
+ */
+typedef ssize_t (*nghttp2_data_source_read_callback)(
+ nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t length,
+ uint32_t *data_flags, nghttp2_data_source *source, void *user_data);
+
+/**
+ * @struct
+ *
+ * This struct represents the data source and the way to read a chunk
+ * of data from it.
+ */
+typedef struct {
+ /**
+ * The data source.
+ */
+ nghttp2_data_source source;
+ /**
+ * The callback function to read a chunk of data from the |source|.
+ */
+ nghttp2_data_source_read_callback read_callback;
+} nghttp2_data_provider;
+
+/**
+ * @struct
+ *
+ * The DATA frame. The received data is delivered via
+ * :type:`nghttp2_on_data_chunk_recv_callback`.
+ */
+typedef struct {
+ nghttp2_frame_hd hd;
+ /**
+ * The length of the padding in this frame. This includes PAD_HIGH
+ * and PAD_LOW.
+ */
+ size_t padlen;
+} nghttp2_data;
+
+/**
+ * @enum
+ *
+ * The category of HEADERS, which indicates the role of the frame. In
+ * HTTP/2 spec, request, response, push response and other arbitrary
+ * headers (e.g., trailer fields) are all called just HEADERS. To
+ * give the application the role of incoming HEADERS frame, we define
+ * several categories.
+ */
+typedef enum {
+ /**
+ * The HEADERS frame is opening new stream, which is analogous to
+ * SYN_STREAM in SPDY.
+ */
+ NGHTTP2_HCAT_REQUEST = 0,
+ /**
+ * The HEADERS frame is the first response headers, which is
+ * analogous to SYN_REPLY in SPDY.
+ */
+ NGHTTP2_HCAT_RESPONSE = 1,
+ /**
+ * The HEADERS frame is the first headers sent against reserved
+ * stream.
+ */
+ NGHTTP2_HCAT_PUSH_RESPONSE = 2,
+ /**
+ * The HEADERS frame which does not apply for the above categories,
+ * which is analogous to HEADERS in SPDY. If non-final response
+ * (e.g., status 1xx) is used, final response HEADERS frame will be
+ * categorized here.
+ */
+ NGHTTP2_HCAT_HEADERS = 3
+} nghttp2_headers_category;
+
+/**
+ * @struct
+ *
+ * The structure to specify stream dependency.
+ */
+typedef struct {
+ /**
+ * The stream ID of the stream to depend on. Specifying 0 makes
+ * stream not depend any other stream.
+ */
+ int32_t stream_id;
+ /**
+ * The weight of this dependency.
+ */
+ int32_t weight;
+ /**
+ * nonzero means exclusive dependency
+ */
+ uint8_t exclusive;
+} nghttp2_priority_spec;
+
+/**
+ * @struct
+ *
+ * The HEADERS frame. It has the following members:
+ */
+typedef struct {
+ /**
+ * The frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The length of the padding in this frame. This includes PAD_HIGH
+ * and PAD_LOW.
+ */
+ size_t padlen;
+ /**
+ * The priority specification
+ */
+ nghttp2_priority_spec pri_spec;
+ /**
+ * The name/value pairs.
+ */
+ nghttp2_nv *nva;
+ /**
+ * The number of name/value pairs in |nva|.
+ */
+ size_t nvlen;
+ /**
+ * The category of this HEADERS frame.
+ */
+ nghttp2_headers_category cat;
+} nghttp2_headers;
+
+/**
+ * @struct
+ *
+ * The PRIORITY frame. It has the following members:
+ */
+typedef struct {
+ /**
+ * The frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The priority specification.
+ */
+ nghttp2_priority_spec pri_spec;
+} nghttp2_priority;
+
+/**
+ * @struct
+ *
+ * The RST_STREAM frame. It has the following members:
+ */
+typedef struct {
+ /**
+ * The frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The error code. See :type:`nghttp2_error_code`.
+ */
+ uint32_t error_code;
+} nghttp2_rst_stream;
+
+/**
+ * @struct
+ *
+ * The SETTINGS ID/Value pair. It has the following members:
+ */
+typedef struct {
+ /**
+ * The SETTINGS ID. See :type:`nghttp2_settings_id`.
+ */
+ int32_t settings_id;
+ /**
+ * The value of this entry.
+ */
+ uint32_t value;
+} nghttp2_settings_entry;
+
+/**
+ * @struct
+ *
+ * The SETTINGS frame. It has the following members:
+ */
+typedef struct {
+ /**
+ * The frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The number of SETTINGS ID/Value pairs in |iv|.
+ */
+ size_t niv;
+ /**
+ * The pointer to the array of SETTINGS ID/Value pair.
+ */
+ nghttp2_settings_entry *iv;
+} nghttp2_settings;
+
+/**
+ * @struct
+ *
+ * The PUSH_PROMISE frame. It has the following members:
+ */
+typedef struct {
+ /**
+ * The frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The length of the padding in this frame. This includes PAD_HIGH
+ * and PAD_LOW.
+ */
+ size_t padlen;
+ /**
+ * The name/value pairs.
+ */
+ nghttp2_nv *nva;
+ /**
+ * The number of name/value pairs in |nva|.
+ */
+ size_t nvlen;
+ /**
+ * The promised stream ID
+ */
+ int32_t promised_stream_id;
+ /**
+ * Reserved bit. Currently this is always set to 0 and application
+ * should not expect something useful in here.
+ */
+ uint8_t reserved;
+} nghttp2_push_promise;
+
+/**
+ * @struct
+ *
+ * The PING frame. It has the following members:
+ */
+typedef struct {
+ /**
+ * The frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The opaque data
+ */
+ uint8_t opaque_data[8];
+} nghttp2_ping;
+
+/**
+ * @struct
+ *
+ * The GOAWAY frame. It has the following members:
+ */
+typedef struct {
+ /**
+ * The frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The last stream stream ID.
+ */
+ int32_t last_stream_id;
+ /**
+ * The error code. See :type:`nghttp2_error_code`.
+ */
+ uint32_t error_code;
+ /**
+ * The additional debug data
+ */
+ uint8_t *opaque_data;
+ /**
+ * The length of |opaque_data| member.
+ */
+ size_t opaque_data_len;
+ /**
+ * Reserved bit. Currently this is always set to 0 and application
+ * should not expect something useful in here.
+ */
+ uint8_t reserved;
+} nghttp2_goaway;
+
+/**
+ * @struct
+ *
+ * The WINDOW_UPDATE frame. It has the following members:
+ */
+typedef struct {
+ /**
+ * The frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The window size increment.
+ */
+ int32_t window_size_increment;
+ /**
+ * Reserved bit. Currently this is always set to 0 and application
+ * should not expect something useful in here.
+ */
+ uint8_t reserved;
+} nghttp2_window_update;
+
+/**
+ * @struct
+ *
+ * The extension frame. It has following members:
+ */
+typedef struct {
+ /**
+ * The frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The pointer to extension payload. The exact pointer type is
+ * determined by hd.type.
+ *
+ * Currently, no extension is supported. This is a place holder for
+ * the future extensions.
+ */
+ void *payload;
+} nghttp2_extension;
+
+/**
+ * @union
+ *
+ * This union includes all frames to pass them to various function
+ * calls as nghttp2_frame type. The CONTINUATION frame is omitted
+ * from here because the library deals with it internally.
+ */
+typedef union {
+ /**
+ * The frame header, which is convenient to inspect frame header.
+ */
+ nghttp2_frame_hd hd;
+ /**
+ * The DATA frame.
+ */
+ nghttp2_data data;
+ /**
+ * The HEADERS frame.
+ */
+ nghttp2_headers headers;
+ /**
+ * The PRIORITY frame.
+ */
+ nghttp2_priority priority;
+ /**
+ * The RST_STREAM frame.
+ */
+ nghttp2_rst_stream rst_stream;
+ /**
+ * The SETTINGS frame.
+ */
+ nghttp2_settings settings;
+ /**
+ * The PUSH_PROMISE frame.
+ */
+ nghttp2_push_promise push_promise;
+ /**
+ * The PING frame.
+ */
+ nghttp2_ping ping;
+ /**
+ * The GOAWAY frame.
+ */
+ nghttp2_goaway goaway;
+ /**
+ * The WINDOW_UPDATE frame.
+ */
+ nghttp2_window_update window_update;
+ /**
+ * The extension frame.
+ */
+ nghttp2_extension ext;
+} nghttp2_frame;
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when |session| wants to send data to the
+ * remote peer. The implementation of this function must send at most
+ * |length| bytes of data stored in |data|. The |flags| is currently
+ * not used and always 0. It must return the number of bytes sent if
+ * it succeeds. If it cannot send any single byte without blocking,
+ * it must return :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`. For
+ * other errors, it must return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. The
+ * |user_data| pointer is the third argument passed in to the call to
+ * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
+ *
+ * This callback is required if the application uses
+ * `nghttp2_session_send()` to send data to the remote endpoint. If
+ * the application uses solely `nghttp2_session_mem_send()` instead,
+ * this callback function is unnecessary.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_send_callback()`.
+ *
+ * .. note::
+ *
+ * The |length| may be very small. If that is the case, and
+ * application disables Nagle algorithm (``TCP_NODELAY``), then just
+ * writing |data| to the network stack leads to very small packet,
+ * and it is very inefficient. An application should be responsible
+ * to buffer up small chunks of data as necessary to avoid this
+ * situation.
+ */
+typedef ssize_t (*nghttp2_send_callback)(nghttp2_session *session,
+ const uint8_t *data, size_t length,
+ int flags, void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when
+ * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` is used in
+ * :type:`nghttp2_data_source_read_callback` to send complete DATA
+ * frame.
+ *
+ * The |frame| is a DATA frame to send. The |framehd| is the
+ * serialized frame header (9 bytes). The |length| is the length of
+ * application data to send (this does not include padding). The
+ * |source| is the same pointer passed to
+ * :type:`nghttp2_data_source_read_callback`.
+ *
+ * The application first must send frame header |framehd| of length 9
+ * bytes. If ``frame->data.padlen > 0``, send 1 byte of value
+ * ``frame->data.padlen - 1``. Then send exactly |length| bytes of
+ * application data. Finally, if ``frame->data.padlen > 1``, send
+ * ``frame->data.padlen - 1`` bytes of zero as padding.
+ *
+ * The application has to send complete DATA frame in this callback.
+ * If all data were written successfully, return 0.
+ *
+ * If it cannot send any data at all, just return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`; the library will call
+ * this callback with the same parameters later (It is recommended to
+ * send complete DATA frame at once in this function to deal with
+ * error; if partial frame data has already sent, it is impossible to
+ * send another data in that state, and all we can do is tear down
+ * connection). When data is fully processed, but application wants
+ * to make `nghttp2_session_mem_send()` or `nghttp2_session_send()`
+ * return immediately without processing next frames, return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE`. If application decided to
+ * reset this stream, return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`, then
+ * the library will send RST_STREAM with INTERNAL_ERROR as error code.
+ * The application can also return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, which will
+ * result in connection closure. Returning any other value is treated
+ * as :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.
+ */
+typedef int (*nghttp2_send_data_callback)(nghttp2_session *session,
+ nghttp2_frame *frame,
+ const uint8_t *framehd, size_t length,
+ nghttp2_data_source *source,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when |session| wants to receive data from
+ * the remote peer. The implementation of this function must read at
+ * most |length| bytes of data and store it in |buf|. The |flags| is
+ * currently not used and always 0. It must return the number of
+ * bytes written in |buf| if it succeeds. If it cannot read any
+ * single byte without blocking, it must return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`. If it gets EOF
+ * before it reads any single byte, it must return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_EOF`. For other errors, it must
+ * return :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ * Returning 0 is treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`. The |user_data|
+ * pointer is the third argument passed in to the call to
+ * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
+ *
+ * This callback is required if the application uses
+ * `nghttp2_session_recv()` to receive data from the remote endpoint.
+ * If the application uses solely `nghttp2_session_mem_recv()`
+ * instead, this callback function is unnecessary.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_recv_callback()`.
+ */
+typedef ssize_t (*nghttp2_recv_callback)(nghttp2_session *session, uint8_t *buf,
+ size_t length, int flags,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked by `nghttp2_session_recv()` and
+ * `nghttp2_session_mem_recv()` when a frame is received. The
+ * |user_data| pointer is the third argument passed in to the call to
+ * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
+ *
+ * If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen``
+ * member of their data structure are always ``NULL`` and 0
+ * respectively. The header name/value pairs are emitted via
+ * :type:`nghttp2_on_header_callback`.
+ *
+ * For HEADERS, PUSH_PROMISE and DATA frames, this callback may be
+ * called after stream is closed (see
+ * :type:`nghttp2_on_stream_close_callback`). The application should
+ * check that stream is still alive using its own stream management or
+ * :func:`nghttp2_session_get_stream_user_data()`.
+ *
+ * Only HEADERS and DATA frame can signal the end of incoming data.
+ * If ``frame->hd.flags & NGHTTP2_FLAG_END_STREAM`` is nonzero, the
+ * |frame| is the last frame from the remote peer in this stream.
+ *
+ * This callback won't be called for CONTINUATION frames.
+ * HEADERS/PUSH_PROMISE + CONTINUATIONs are treated as single frame.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * If nonzero value is returned, it is treated as fatal error and
+ * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_on_frame_recv_callback()`.
+ */
+typedef int (*nghttp2_on_frame_recv_callback)(nghttp2_session *session,
+ const nghttp2_frame *frame,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked by `nghttp2_session_recv()` and
+ * `nghttp2_session_mem_recv()` when an invalid non-DATA frame is
+ * received. The error is indicated by the |lib_error_code|, which is
+ * one of the values defined in :type:`nghttp2_error`. When this
+ * callback function is invoked, the library automatically submits
+ * either RST_STREAM or GOAWAY frame. The |user_data| pointer is the
+ * third argument passed in to the call to
+ * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
+ *
+ * If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen``
+ * member of their data structure are always ``NULL`` and 0
+ * respectively.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * If nonzero is returned, it is treated as fatal error and
+ * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_on_invalid_frame_recv_callback()`.
+ */
+typedef int (*nghttp2_on_invalid_frame_recv_callback)(
+ nghttp2_session *session, const nghttp2_frame *frame, int lib_error_code,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when a chunk of data in DATA frame is
+ * received. The |stream_id| is the stream ID this DATA frame belongs
+ * to. The |flags| is the flags of DATA frame which this data chunk
+ * is contained. ``(flags & NGHTTP2_FLAG_END_STREAM) != 0`` does not
+ * necessarily mean this chunk of data is the last one in the stream.
+ * You should use :type:`nghttp2_on_frame_recv_callback` to know all
+ * data frames are received. The |user_data| pointer is the third
+ * argument passed in to the call to `nghttp2_session_client_new()` or
+ * `nghttp2_session_server_new()`.
+ *
+ * If the application uses `nghttp2_session_mem_recv()`, it can return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` to make
+ * `nghttp2_session_mem_recv()` return without processing further
+ * input bytes. The memory by pointed by the |data| is retained until
+ * `nghttp2_session_mem_recv()` or `nghttp2_session_recv()` is called.
+ * The application must retain the input bytes which was used to
+ * produce the |data| parameter, because it may refer to the memory
+ * region included in the input bytes.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * If nonzero is returned, it is treated as fatal error, and
+ * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_on_data_chunk_recv_callback()`.
+ */
+typedef int (*nghttp2_on_data_chunk_recv_callback)(nghttp2_session *session,
+ uint8_t flags,
+ int32_t stream_id,
+ const uint8_t *data,
+ size_t len, void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked just before the non-DATA frame |frame| is
+ * sent. The |user_data| pointer is the third argument passed in to
+ * the call to `nghttp2_session_client_new()` or
+ * `nghttp2_session_server_new()`.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * It can also return :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL` to
+ * cancel the transmission of the given frame.
+ *
+ * If there is a fatal error while executing this callback, the
+ * implementation should return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, which makes
+ * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * If the other value is returned, it is treated as if
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.
+ * But the implementation should not rely on this since the library
+ * may define new return value to extend its capability.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_before_frame_send_callback()`.
+ */
+typedef int (*nghttp2_before_frame_send_callback)(nghttp2_session *session,
+ const nghttp2_frame *frame,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked after the frame |frame| is sent. The
+ * |user_data| pointer is the third argument passed in to the call to
+ * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * If nonzero is returned, it is treated as fatal error and
+ * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_on_frame_send_callback()`.
+ */
+typedef int (*nghttp2_on_frame_send_callback)(nghttp2_session *session,
+ const nghttp2_frame *frame,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked after the non-DATA frame |frame| is not
+ * sent because of the error. The error is indicated by the
+ * |lib_error_code|, which is one of the values defined in
+ * :type:`nghttp2_error`. The |user_data| pointer is the third
+ * argument passed in to the call to `nghttp2_session_client_new()` or
+ * `nghttp2_session_server_new()`.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * If nonzero is returned, it is treated as fatal error and
+ * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * `nghttp2_session_get_stream_user_data()` can be used to get
+ * associated data.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_on_frame_not_send_callback()`.
+ */
+typedef int (*nghttp2_on_frame_not_send_callback)(nghttp2_session *session,
+ const nghttp2_frame *frame,
+ int lib_error_code,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when the stream |stream_id| is closed.
+ * The reason of closure is indicated by the |error_code|. The
+ * |error_code| is usually one of :enum:`nghttp2_error_code`, but that
+ * is not guaranteed. The stream_user_data, which was specified in
+ * `nghttp2_submit_request()` or `nghttp2_submit_headers()`, is still
+ * available in this function. The |user_data| pointer is the third
+ * argument passed in to the call to `nghttp2_session_client_new()` or
+ * `nghttp2_session_server_new()`.
+ *
+ * This function is also called for a stream in reserved state.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * If nonzero is returned, it is treated as fatal error and
+ * `nghttp2_session_recv()`, `nghttp2_session_mem_recv()`,
+ * `nghttp2_session_send()`, and `nghttp2_session_mem_send()`
+ * functions immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_on_stream_close_callback()`.
+ */
+typedef int (*nghttp2_on_stream_close_callback)(nghttp2_session *session,
+ int32_t stream_id,
+ uint32_t error_code,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when the reception of header block in
+ * HEADERS or PUSH_PROMISE is started. Each header name/value pair
+ * will be emitted by :type:`nghttp2_on_header_callback`.
+ *
+ * The ``frame->hd.flags`` may not have
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_HEADERS` flag set, which
+ * indicates that one or more CONTINUATION frames are involved. But
+ * the application does not need to care about that because the header
+ * name/value pairs are emitted transparently regardless of
+ * CONTINUATION frames.
+ *
+ * The server applications probably create an object to store
+ * information about new stream if ``frame->hd.type ==
+ * NGHTTP2_HEADERS`` and ``frame->headers.cat ==
+ * NGHTTP2_HCAT_REQUEST``. If |session| is configured as server side,
+ * ``frame->headers.cat`` is either ``NGHTTP2_HCAT_REQUEST``
+ * containing request headers or ``NGHTTP2_HCAT_HEADERS`` containing
+ * trailer fields and never get PUSH_PROMISE in this callback.
+ *
+ * For the client applications, ``frame->hd.type`` is either
+ * ``NGHTTP2_HEADERS`` or ``NGHTTP2_PUSH_PROMISE``. In case of
+ * ``NGHTTP2_HEADERS``, ``frame->headers.cat ==
+ * NGHTTP2_HCAT_RESPONSE`` means that it is the first response
+ * headers, but it may be non-final response which is indicated by 1xx
+ * status code. In this case, there may be zero or more HEADERS frame
+ * with ``frame->headers.cat == NGHTTP2_HCAT_HEADERS`` which has
+ * non-final response code and finally client gets exactly one HEADERS
+ * frame with ``frame->headers.cat == NGHTTP2_HCAT_HEADERS``
+ * containing final response headers (non-1xx status code). The
+ * trailer fields also has ``frame->headers.cat ==
+ * NGHTTP2_HCAT_HEADERS`` which does not contain any status code.
+ *
+ * Returning
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
+ * close the stream (promised stream if frame is PUSH_PROMISE) by
+ * issuing RST_STREAM with
+ * :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`. In this case,
+ * :type:`nghttp2_on_header_callback` and
+ * :type:`nghttp2_on_frame_recv_callback` will not be invoked. If a
+ * different error code is desirable, use
+ * `nghttp2_submit_rst_stream()` with a desired error code and then
+ * return :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+ * Again, use ``frame->push_promise.promised_stream_id`` as stream_id
+ * parameter in `nghttp2_submit_rst_stream()` if frame is
+ * PUSH_PROMISE.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * It can return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` to
+ * reset the stream (promised stream if frame is PUSH_PROMISE). For
+ * critical errors, it must return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. If the other
+ * value is returned, it is treated as if
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned. If
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
+ * `nghttp2_session_mem_recv()` function will immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_on_begin_headers_callback()`.
+ */
+typedef int (*nghttp2_on_begin_headers_callback)(nghttp2_session *session,
+ const nghttp2_frame *frame,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when a header name/value pair is received
+ * for the |frame|. The |name| of length |namelen| is header name.
+ * The |value| of length |valuelen| is header value. The |flags| is
+ * bitwise OR of one or more of :type:`nghttp2_nv_flag`.
+ *
+ * If :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_INDEX` is set in
+ * |flags|, the receiver must not index this name/value pair when
+ * forwarding it to the next hop. More specifically, "Literal Header
+ * Field never Indexed" representation must be used in HPACK encoding.
+ *
+ * When this callback is invoked, ``frame->hd.type`` is either
+ * :enum:`nghttp2_frame_type.NGHTTP2_HEADERS` or
+ * :enum:`nghttp2_frame_type.NGHTTP2_PUSH_PROMISE`. After all header
+ * name/value pairs are processed with this callback, and no error has
+ * been detected, :type:`nghttp2_on_frame_recv_callback` will be
+ * invoked. If there is an error in decompression,
+ * :type:`nghttp2_on_frame_recv_callback` for the |frame| will not be
+ * invoked.
+ *
+ * Both |name| and |value| are guaranteed to be NULL-terminated. The
+ * |namelen| and |valuelen| do not include terminal NULL. If
+ * `nghttp2_option_set_no_http_messaging()` is used with nonzero
+ * value, NULL character may be included in |name| or |value| before
+ * terminating NULL.
+ *
+ * Please note that unless `nghttp2_option_set_no_http_messaging()` is
+ * used, nghttp2 library does perform validation against the |name|
+ * and the |value| using `nghttp2_check_header_name()` and
+ * `nghttp2_check_header_value()`. In addition to this, nghttp2
+ * performs validation based on HTTP Messaging rule, which is briefly
+ * explained in :ref:`http-messaging` section.
+ *
+ * If the application uses `nghttp2_session_mem_recv()`, it can return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` to make
+ * `nghttp2_session_mem_recv()` return without processing further
+ * input bytes. The memory pointed by |frame|, |name| and |value|
+ * parameters are retained until `nghttp2_session_mem_recv()` or
+ * `nghttp2_session_recv()` is called. The application must retain
+ * the input bytes which was used to produce these parameters, because
+ * it may refer to the memory region included in the input bytes.
+ *
+ * Returning
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
+ * close the stream (promised stream if frame is PUSH_PROMISE) by
+ * issuing RST_STREAM with
+ * :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`. In this case,
+ * :type:`nghttp2_on_header_callback` and
+ * :type:`nghttp2_on_frame_recv_callback` will not be invoked. If a
+ * different error code is desirable, use
+ * `nghttp2_submit_rst_stream()` with a desired error code and then
+ * return :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+ * Again, use ``frame->push_promise.promised_stream_id`` as stream_id
+ * parameter in `nghttp2_submit_rst_stream()` if frame is
+ * PUSH_PROMISE.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * It may return :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` or
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`. For
+ * other critical failures, it must return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. If the other
+ * nonzero value is returned, it is treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. If
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
+ * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_on_header_callback()`.
+ *
+ * .. warning::
+ *
+ * Application should properly limit the total buffer size to store
+ * incoming header fields. Without it, peer may send large number
+ * of header fields or large header fields to cause out of memory in
+ * local endpoint. Due to how HPACK works, peer can do this
+ * effectively without using much memory on their own.
+ */
+typedef int (*nghttp2_on_header_callback)(nghttp2_session *session,
+ const nghttp2_frame *frame,
+ const uint8_t *name, size_t namelen,
+ const uint8_t *value, size_t valuelen,
+ uint8_t flags, void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when a header name/value pair is received
+ * for the |frame|. The |name| is header name. The |value| is header
+ * value. The |flags| is bitwise OR of one or more of
+ * :type:`nghttp2_nv_flag`.
+ *
+ * This callback behaves like :type:`nghttp2_on_header_callback`,
+ * except that |name| and |value| are stored in reference counted
+ * buffer. If application wishes to keep these references without
+ * copying them, use `nghttp2_rcbuf_incref()` to increment their
+ * reference count. It is the application's responsibility to call
+ * `nghttp2_rcbuf_decref()` if they called `nghttp2_rcbuf_incref()` so
+ * as not to leak memory. If the |session| is created by
+ * `nghttp2_session_server_new3()` or `nghttp2_session_client_new3()`,
+ * the function to free memory is the one belongs to the mem
+ * parameter. As long as this free function alives, |name| and
+ * |value| can live after |session| was destroyed.
+ */
+typedef int (*nghttp2_on_header_callback2)(nghttp2_session *session,
+ const nghttp2_frame *frame,
+ nghttp2_rcbuf *name,
+ nghttp2_rcbuf *value, uint8_t flags,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when a invalid header name/value pair is
+ * received for the |frame|.
+ *
+ * The parameter and behaviour are similar to
+ * :type:`nghttp2_on_header_callback`. The difference is that this
+ * callback is only invoked when a invalid header name/value pair is
+ * received which is treated as stream error if this callback is not
+ * set. Only invalid regular header field are passed to this
+ * callback. In other words, invalid pseudo header field is not
+ * passed to this callback. Also header fields which includes upper
+ * cased latter are also treated as error without passing them to this
+ * callback.
+ *
+ * This callback is only considered if HTTP messaging validation is
+ * turned on (which is on by default, see
+ * `nghttp2_option_set_no_http_messaging()`).
+ *
+ * With this callback, application inspects the incoming invalid
+ * field, and it also can reset stream from this callback by returning
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`. By
+ * default, the error code is
+ * :enum:`nghttp2_error_code.NGHTTP2_PROTOCOL_ERROR`. To change the
+ * error code, call `nghttp2_submit_rst_stream()` with the error code
+ * of choice in addition to returning
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+ *
+ * If 0 is returned, the header field is ignored, and the stream is
+ * not reset.
+ */
+typedef int (*nghttp2_on_invalid_header_callback)(
+ nghttp2_session *session, const nghttp2_frame *frame, const uint8_t *name,
+ size_t namelen, const uint8_t *value, size_t valuelen, uint8_t flags,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when a invalid header name/value pair is
+ * received for the |frame|.
+ *
+ * The parameter and behaviour are similar to
+ * :type:`nghttp2_on_header_callback2`. The difference is that this
+ * callback is only invoked when a invalid header name/value pair is
+ * received which is silently ignored if this callback is not set.
+ * Only invalid regular header field are passed to this callback. In
+ * other words, invalid pseudo header field is not passed to this
+ * callback. Also header fields which includes upper cased latter are
+ * also treated as error without passing them to this callback.
+ *
+ * This callback is only considered if HTTP messaging validation is
+ * turned on (which is on by default, see
+ * `nghttp2_option_set_no_http_messaging()`).
+ *
+ * With this callback, application inspects the incoming invalid
+ * field, and it also can reset stream from this callback by returning
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`. By
+ * default, the error code is
+ * :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`. To change the
+ * error code, call `nghttp2_submit_rst_stream()` with the error code
+ * of choice in addition to returning
+ * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+ */
+typedef int (*nghttp2_on_invalid_header_callback2)(
+ nghttp2_session *session, const nghttp2_frame *frame, nghttp2_rcbuf *name,
+ nghttp2_rcbuf *value, uint8_t flags, void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when the library asks application how
+ * many padding bytes are required for the transmission of the
+ * |frame|. The application must choose the total length of payload
+ * including padded bytes in range [frame->hd.length, max_payloadlen],
+ * inclusive. Choosing number not in this range will be treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. Returning
+ * ``frame->hd.length`` means no padding is added. Returning
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will make
+ * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_select_padding_callback()`.
+ */
+typedef ssize_t (*nghttp2_select_padding_callback)(nghttp2_session *session,
+ const nghttp2_frame *frame,
+ size_t max_payloadlen,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when library wants to get max length of
+ * data to send data to the remote peer. The implementation of this
+ * function should return a value in the following range. [1,
+ * min(|session_remote_window_size|, |stream_remote_window_size|,
+ * |remote_max_frame_size|)]. If a value greater than this range is
+ * returned than the max allow value will be used. Returning a value
+ * smaller than this range is treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. The
+ * |frame_type| is provided for future extensibility and identifies
+ * the type of frame (see :type:`nghttp2_frame_type`) for which to get
+ * the length for. Currently supported frame types are:
+ * :enum:`nghttp2_frame_type.NGHTTP2_DATA`.
+ *
+ * This callback can be used to control the length in bytes for which
+ * :type:`nghttp2_data_source_read_callback` is allowed to send to the
+ * remote endpoint. This callback is optional. Returning
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will signal the
+ * entire session failure.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_data_source_read_length_callback()`.
+ */
+typedef ssize_t (*nghttp2_data_source_read_length_callback)(
+ nghttp2_session *session, uint8_t frame_type, int32_t stream_id,
+ int32_t session_remote_window_size, int32_t stream_remote_window_size,
+ uint32_t remote_max_frame_size, void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when a frame header is received. The
+ * |hd| points to received frame header.
+ *
+ * Unlike :type:`nghttp2_on_frame_recv_callback`, this callback will
+ * also be called when frame header of CONTINUATION frame is received.
+ *
+ * If both :type:`nghttp2_on_begin_frame_callback` and
+ * :type:`nghttp2_on_begin_headers_callback` are set and HEADERS or
+ * PUSH_PROMISE is received, :type:`nghttp2_on_begin_frame_callback`
+ * will be called first.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * If nonzero value is returned, it is treated as fatal error and
+ * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ *
+ * To set this callback to :type:`nghttp2_session_callbacks`, use
+ * `nghttp2_session_callbacks_set_on_begin_frame_callback()`.
+ */
+typedef int (*nghttp2_on_begin_frame_callback)(nghttp2_session *session,
+ const nghttp2_frame_hd *hd,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when chunk of extension frame payload is
+ * received. The |hd| points to frame header. The received
+ * chunk is |data| of length |len|.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ *
+ * To abort processing this extension frame, return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL`.
+ *
+ * If fatal error occurred, application should return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. In this case,
+ * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. If the other
+ * values are returned, currently they are treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ */
+typedef int (*nghttp2_on_extension_chunk_recv_callback)(
+ nghttp2_session *session, const nghttp2_frame_hd *hd, const uint8_t *data,
+ size_t len, void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when library asks the application to
+ * unpack extension payload from its wire format. The extension
+ * payload has been passed to the application using
+ * :type:`nghttp2_on_extension_chunk_recv_callback`. The frame header
+ * is already unpacked by the library and provided as |hd|.
+ *
+ * To receive extension frames, the application must tell desired
+ * extension frame type to the library using
+ * `nghttp2_option_set_user_recv_extension_type()`.
+ *
+ * The implementation of this function may store the pointer to the
+ * created object as a result of unpacking in |*payload|, and returns
+ * 0. The pointer stored in |*payload| is opaque to the library, and
+ * the library does not own its pointer. |*payload| is initialized as
+ * ``NULL``. The |*payload| is available as ``frame->ext.payload`` in
+ * :type:`nghttp2_on_frame_recv_callback`. Therefore if application
+ * can free that memory inside :type:`nghttp2_on_frame_recv_callback`
+ * callback. Of course, application has a liberty not ot use
+ * |*payload|, and do its own mechanism to process extension frames.
+ *
+ * To abort processing this extension frame, return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL`.
+ *
+ * If fatal error occurred, application should return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. In this case,
+ * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. If the other
+ * values are returned, currently they are treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ */
+typedef int (*nghttp2_unpack_extension_callback)(nghttp2_session *session,
+ void **payload,
+ const nghttp2_frame_hd *hd,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when library asks the application to pack
+ * extension payload in its wire format. The frame header will be
+ * packed by library. Application must pack payload only.
+ * ``frame->ext.payload`` is the object passed to
+ * `nghttp2_submit_extension()` as payload parameter. Application
+ * must pack extension payload to the |buf| of its capacity |len|
+ * bytes. The |len| is at least 16KiB.
+ *
+ * The implementation of this function should return the number of
+ * bytes written into |buf| when it succeeds.
+ *
+ * To abort processing this extension frame, return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL`, and
+ * :type:`nghttp2_on_frame_not_send_callback` will be invoked.
+ *
+ * If fatal error occurred, application should return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. In this case,
+ * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
+ * immediately return
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. If the other
+ * values are returned, currently they are treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. If the return
+ * value is strictly larger than |len|, it is treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ */
+typedef ssize_t (*nghttp2_pack_extension_callback)(nghttp2_session *session,
+ uint8_t *buf, size_t len,
+ const nghttp2_frame *frame,
+ void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when library provides the error message
+ * intended for human consumption. This callback is solely for
+ * debugging purpose. The |msg| is typically NULL-terminated string
+ * of length |len|. |len| does not include the sentinel NULL
+ * character.
+ *
+ * This function is deprecated. The new application should use
+ * :type:`nghttp2_error_callback2`.
+ *
+ * The format of error message may change between nghttp2 library
+ * versions. The application should not depend on the particular
+ * format.
+ *
+ * Normally, application should return 0 from this callback. If fatal
+ * error occurred while doing something in this callback, application
+ * should return :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ * In this case, library will return immediately with return value
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. Currently, if
+ * nonzero value is returned from this callback, they are treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, but application
+ * should not rely on this details.
+ */
+typedef int (*nghttp2_error_callback)(nghttp2_session *session, const char *msg,
+ size_t len, void *user_data);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when library provides the error code, and
+ * message. This callback is solely for debugging purpose.
+ * |lib_error_code| is one of error code defined in
+ * :enum:`nghttp2_error`. The |msg| is typically NULL-terminated
+ * string of length |len|, and intended for human consumption. |len|
+ * does not include the sentinel NULL character.
+ *
+ * The format of error message may change between nghttp2 library
+ * versions. The application should not depend on the particular
+ * format.
+ *
+ * Normally, application should return 0 from this callback. If fatal
+ * error occurred while doing something in this callback, application
+ * should return :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
+ * In this case, library will return immediately with return value
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`. Currently, if
+ * nonzero value is returned from this callback, they are treated as
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, but application
+ * should not rely on this details.
+ */
+typedef int (*nghttp2_error_callback2)(nghttp2_session *session,
+ int lib_error_code, const char *msg,
+ size_t len, void *user_data);
+
+struct nghttp2_session_callbacks;
+
+/**
+ * @struct
+ *
+ * Callback functions for :type:`nghttp2_session`. The details of
+ * this structure are intentionally hidden from the public API.
+ */
+typedef struct nghttp2_session_callbacks nghttp2_session_callbacks;
+
+/**
+ * @function
+ *
+ * Initializes |*callbacks_ptr| with NULL values.
+ *
+ * The initialized object can be used when initializing multiple
+ * :type:`nghttp2_session` objects.
+ *
+ * When the application finished using this object, it can use
+ * `nghttp2_session_callbacks_del()` to free its memory.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_callbacks_new(nghttp2_session_callbacks **callbacks_ptr);
+
+/**
+ * @function
+ *
+ * Frees any resources allocated for |callbacks|. If |callbacks| is
+ * ``NULL``, this function does nothing.
+ */
+NGHTTP2_EXTERN void
+nghttp2_session_callbacks_del(nghttp2_session_callbacks *callbacks);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when a session wants to send data to
+ * the remote peer. This callback is not necessary if the application
+ * uses solely `nghttp2_session_mem_send()` to serialize data to
+ * transmit.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_send_callback(
+ nghttp2_session_callbacks *cbs, nghttp2_send_callback send_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when the a session wants to receive
+ * data from the remote peer. This callback is not necessary if the
+ * application uses solely `nghttp2_session_mem_recv()` to process
+ * received data.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_recv_callback(
+ nghttp2_session_callbacks *cbs, nghttp2_recv_callback recv_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked by `nghttp2_session_recv()` and
+ * `nghttp2_session_mem_recv()` when a frame is received.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_recv_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_frame_recv_callback on_frame_recv_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked by `nghttp2_session_recv()` and
+ * `nghttp2_session_mem_recv()` when an invalid non-DATA frame is
+ * received.
+ */
+NGHTTP2_EXTERN void
+nghttp2_session_callbacks_set_on_invalid_frame_recv_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_invalid_frame_recv_callback on_invalid_frame_recv_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when a chunk of data in DATA frame
+ * is received.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_data_chunk_recv_callback on_data_chunk_recv_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked before a non-DATA frame is sent.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_before_frame_send_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_before_frame_send_callback before_frame_send_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked after a frame is sent.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_send_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_frame_send_callback on_frame_send_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when a non-DATA frame is not sent
+ * because of an error.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_not_send_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_frame_not_send_callback on_frame_not_send_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when the stream is closed.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_stream_close_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_stream_close_callback on_stream_close_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when the reception of header block
+ * in HEADERS or PUSH_PROMISE is started.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_begin_headers_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_begin_headers_callback on_begin_headers_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when a header name/value pair is
+ * received. If both
+ * `nghttp2_session_callbacks_set_on_header_callback()` and
+ * `nghttp2_session_callbacks_set_on_header_callback2()` are used to
+ * set callbacks, the latter has the precedence.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_header_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_header_callback on_header_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when a header name/value pair is
+ * received.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_header_callback2(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_header_callback2 on_header_callback2);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when a invalid header name/value
+ * pair is received. If both
+ * `nghttp2_session_callbacks_set_on_invalid_header_callback()` and
+ * `nghttp2_session_callbacks_set_on_invalid_header_callback2()` are
+ * used to set callbacks, the latter takes the precedence.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_invalid_header_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_invalid_header_callback on_invalid_header_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when a invalid header name/value
+ * pair is received.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_invalid_header_callback2(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_invalid_header_callback2 on_invalid_header_callback2);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when the library asks application
+ * how many padding bytes are required for the transmission of the
+ * given frame.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_select_padding_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_select_padding_callback select_padding_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function determine the length allowed in
+ * :type:`nghttp2_data_source_read_callback`.
+ */
+NGHTTP2_EXTERN void
+nghttp2_session_callbacks_set_data_source_read_length_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_data_source_read_length_callback data_source_read_length_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when a frame header is received.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_begin_frame_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_begin_frame_callback on_begin_frame_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when
+ * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` is used in
+ * :type:`nghttp2_data_source_read_callback` to avoid data copy.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_send_data_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_send_data_callback send_data_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when the library asks the
+ * application to pack extension frame payload in wire format.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_pack_extension_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_pack_extension_callback pack_extension_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when the library asks the
+ * application to unpack extension frame payload from wire format.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_unpack_extension_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_unpack_extension_callback unpack_extension_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when chunk of extension frame
+ * payload is received.
+ */
+NGHTTP2_EXTERN void
+nghttp2_session_callbacks_set_on_extension_chunk_recv_callback(
+ nghttp2_session_callbacks *cbs,
+ nghttp2_on_extension_chunk_recv_callback on_extension_chunk_recv_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when library tells error message to
+ * the application.
+ *
+ * This function is deprecated. The new application should use
+ * `nghttp2_session_callbacks_set_error_callback2()`.
+ *
+ * If both :type:`nghttp2_error_callback` and
+ * :type:`nghttp2_error_callback2` are set, the latter takes
+ * precedence.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_error_callback(
+ nghttp2_session_callbacks *cbs, nghttp2_error_callback error_callback);
+
+/**
+ * @function
+ *
+ * Sets callback function invoked when library tells error code, and
+ * message to the application.
+ *
+ * If both :type:`nghttp2_error_callback` and
+ * :type:`nghttp2_error_callback2` are set, the latter takes
+ * precedence.
+ */
+NGHTTP2_EXTERN void nghttp2_session_callbacks_set_error_callback2(
+ nghttp2_session_callbacks *cbs, nghttp2_error_callback2 error_callback2);
+
+/**
+ * @functypedef
+ *
+ * Custom memory allocator to replace malloc(). The |mem_user_data|
+ * is the mem_user_data member of :type:`nghttp2_mem` structure.
+ */
+typedef void *(*nghttp2_malloc)(size_t size, void *mem_user_data);
+
+/**
+ * @functypedef
+ *
+ * Custom memory allocator to replace free(). The |mem_user_data| is
+ * the mem_user_data member of :type:`nghttp2_mem` structure.
+ */
+typedef void (*nghttp2_free)(void *ptr, void *mem_user_data);
+
+/**
+ * @functypedef
+ *
+ * Custom memory allocator to replace calloc(). The |mem_user_data|
+ * is the mem_user_data member of :type:`nghttp2_mem` structure.
+ */
+typedef void *(*nghttp2_calloc)(size_t nmemb, size_t size, void *mem_user_data);
+
+/**
+ * @functypedef
+ *
+ * Custom memory allocator to replace realloc(). The |mem_user_data|
+ * is the mem_user_data member of :type:`nghttp2_mem` structure.
+ */
+typedef void *(*nghttp2_realloc)(void *ptr, size_t size, void *mem_user_data);
+
+/**
+ * @struct
+ *
+ * Custom memory allocator functions and user defined pointer. The
+ * |mem_user_data| member is passed to each allocator function. This
+ * can be used, for example, to achieve per-session memory pool.
+ *
+ * In the following example code, ``my_malloc``, ``my_free``,
+ * ``my_calloc`` and ``my_realloc`` are the replacement of the
+ * standard allocators ``malloc``, ``free``, ``calloc`` and
+ * ``realloc`` respectively::
+ *
+ * void *my_malloc_cb(size_t size, void *mem_user_data) {
+ * return my_malloc(size);
+ * }
+ *
+ * void my_free_cb(void *ptr, void *mem_user_data) { my_free(ptr); }
+ *
+ * void *my_calloc_cb(size_t nmemb, size_t size, void *mem_user_data) {
+ * return my_calloc(nmemb, size);
+ * }
+ *
+ * void *my_realloc_cb(void *ptr, size_t size, void *mem_user_data) {
+ * return my_realloc(ptr, size);
+ * }
+ *
+ * void session_new() {
+ * nghttp2_session *session;
+ * nghttp2_session_callbacks *callbacks;
+ * nghttp2_mem mem = {NULL, my_malloc_cb, my_free_cb, my_calloc_cb,
+ * my_realloc_cb};
+ *
+ * ...
+ *
+ * nghttp2_session_client_new3(&session, callbacks, NULL, NULL, &mem);
+ *
+ * ...
+ * }
+ */
+typedef struct {
+ /**
+ * An arbitrary user supplied data. This is passed to each
+ * allocator function.
+ */
+ void *mem_user_data;
+ /**
+ * Custom allocator function to replace malloc().
+ */
+ nghttp2_malloc malloc;
+ /**
+ * Custom allocator function to replace free().
+ */
+ nghttp2_free free;
+ /**
+ * Custom allocator function to replace calloc().
+ */
+ nghttp2_calloc calloc;
+ /**
+ * Custom allocator function to replace realloc().
+ */
+ nghttp2_realloc realloc;
+} nghttp2_mem;
+
+struct nghttp2_option;
+
+/**
+ * @struct
+ *
+ * Configuration options for :type:`nghttp2_session`. The details of
+ * this structure are intentionally hidden from the public API.
+ */
+typedef struct nghttp2_option nghttp2_option;
+
+/**
+ * @function
+ *
+ * Initializes |*option_ptr| with default values.
+ *
+ * When the application finished using this object, it can use
+ * `nghttp2_option_del()` to free its memory.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int nghttp2_option_new(nghttp2_option **option_ptr);
+
+/**
+ * @function
+ *
+ * Frees any resources allocated for |option|. If |option| is
+ * ``NULL``, this function does nothing.
+ */
+NGHTTP2_EXTERN void nghttp2_option_del(nghttp2_option *option);
+
+/**
+ * @function
+ *
+ * This option prevents the library from sending WINDOW_UPDATE for a
+ * connection automatically. If this option is set to nonzero, the
+ * library won't send WINDOW_UPDATE for DATA until application calls
+ * `nghttp2_session_consume()` to indicate the consumed amount of
+ * data. Don't use `nghttp2_submit_window_update()` for this purpose.
+ * By default, this option is set to zero.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_no_auto_window_update(nghttp2_option *option, int val);
+
+/**
+ * @function
+ *
+ * This option sets the SETTINGS_MAX_CONCURRENT_STREAMS value of
+ * remote endpoint as if it is received in SETTINGS frame. Without
+ * specifying this option, the maximum number of outgoing concurrent
+ * streams is initially limited to 100 to avoid issues when the local
+ * endpoint submits lots of requests before receiving initial SETTINGS
+ * frame from the remote endpoint, since sending them at once to the
+ * remote endpoint could lead to rejection of some of the requests.
+ * This value will be overwritten when the local endpoint receives
+ * initial SETTINGS frame from the remote endpoint, either to the
+ * value advertised in SETTINGS_MAX_CONCURRENT_STREAMS or to the
+ * default value (unlimited) if none was advertised.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_peer_max_concurrent_streams(nghttp2_option *option,
+ uint32_t val);
+
+/**
+ * @function
+ *
+ * By default, nghttp2 library, if configured as server, requires
+ * first 24 bytes of client magic byte string (MAGIC). In most cases,
+ * this will simplify the implementation of server. But sometimes
+ * server may want to detect the application protocol based on first
+ * few bytes on clear text communication.
+ *
+ * If this option is used with nonzero |val|, nghttp2 library does not
+ * handle MAGIC. It still checks following SETTINGS frame. This
+ * means that applications should deal with MAGIC by themselves.
+ *
+ * If this option is not used or used with zero value, if MAGIC does
+ * not match :macro:`NGHTTP2_CLIENT_MAGIC`, `nghttp2_session_recv()`
+ * and `nghttp2_session_mem_recv()` will return error
+ * :enum:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`, which is fatal
+ * error.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_no_recv_client_magic(nghttp2_option *option, int val);
+
+/**
+ * @function
+ *
+ * By default, nghttp2 library enforces subset of HTTP Messaging rules
+ * described in `HTTP/2 specification, section 8
+ * <https://tools.ietf.org/html/rfc7540#section-8>`_. See
+ * :ref:`http-messaging` section for details. For those applications
+ * who use nghttp2 library as non-HTTP use, give nonzero to |val| to
+ * disable this enforcement. Please note that disabling this feature
+ * does not change the fundamental client and server model of HTTP.
+ * That is, even if the validation is disabled, only client can send
+ * requests.
+ */
+NGHTTP2_EXTERN void nghttp2_option_set_no_http_messaging(nghttp2_option *option,
+ int val);
+
+/**
+ * @function
+ *
+ * RFC 7540 does not enforce any limit on the number of incoming
+ * reserved streams (in RFC 7540 terms, streams in reserved (remote)
+ * state). This only affects client side, since only server can push
+ * streams. Malicious server can push arbitrary number of streams,
+ * and make client's memory exhausted. This option can set the
+ * maximum number of such incoming streams to avoid possible memory
+ * exhaustion. If this option is set, and pushed streams are
+ * automatically closed on reception, without calling user provided
+ * callback, if they exceed the given limit. The default value is
+ * 200. If session is configured as server side, this option has no
+ * effect. Server can control the number of streams to push.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_max_reserved_remote_streams(nghttp2_option *option,
+ uint32_t val);
+
+/**
+ * @function
+ *
+ * Sets extension frame type the application is willing to handle with
+ * user defined callbacks (see
+ * :type:`nghttp2_on_extension_chunk_recv_callback` and
+ * :type:`nghttp2_unpack_extension_callback`). The |type| is
+ * extension frame type, and must be strictly greater than 0x9.
+ * Otherwise, this function does nothing. The application can call
+ * this function multiple times to set more than one frame type to
+ * receive. The application does not have to call this function if it
+ * just sends extension frames.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_user_recv_extension_type(nghttp2_option *option,
+ uint8_t type);
+
+/**
+ * @function
+ *
+ * Sets extension frame type the application is willing to receive
+ * using builtin handler. The |type| is the extension frame type to
+ * receive, and must be strictly greater than 0x9. Otherwise, this
+ * function does nothing. The application can call this function
+ * multiple times to set more than one frame type to receive. The
+ * application does not have to call this function if it just sends
+ * extension frames.
+ *
+ * If same frame type is passed to both
+ * `nghttp2_option_set_builtin_recv_extension_type()` and
+ * `nghttp2_option_set_user_recv_extension_type()`, the latter takes
+ * precedence.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_builtin_recv_extension_type(nghttp2_option *option,
+ uint8_t type);
+
+/**
+ * @function
+ *
+ * This option prevents the library from sending PING frame with ACK
+ * flag set automatically when PING frame without ACK flag set is
+ * received. If this option is set to nonzero, the library won't send
+ * PING frame with ACK flag set in the response for incoming PING
+ * frame. The application can send PING frame with ACK flag set using
+ * `nghttp2_submit_ping()` with :enum:`nghttp2_flag.NGHTTP2_FLAG_ACK`
+ * as flags parameter.
+ */
+NGHTTP2_EXTERN void nghttp2_option_set_no_auto_ping_ack(nghttp2_option *option,
+ int val);
+
+/**
+ * @function
+ *
+ * This option sets the maximum length of header block (a set of
+ * header fields per one HEADERS frame) to send. The length of a
+ * given set of header fields is calculated using
+ * `nghttp2_hd_deflate_bound()`. The default value is 64KiB. If
+ * application attempts to send header fields larger than this limit,
+ * the transmission of the frame fails with error code
+ * :enum:`nghttp2_error.NGHTTP2_ERR_FRAME_SIZE_ERROR`.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_max_send_header_block_length(nghttp2_option *option,
+ size_t val);
+
+/**
+ * @function
+ *
+ * This option sets the maximum dynamic table size for deflating
+ * header fields. The default value is 4KiB. In HTTP/2, receiver of
+ * deflated header block can specify maximum dynamic table size. The
+ * actual maximum size is the minimum of the size receiver specified
+ * and this option value.
+ */
+NGHTTP2_EXTERN void
+nghttp2_option_set_max_deflate_dynamic_table_size(nghttp2_option *option,
+ size_t val);
+
+/**
+ * @function
+ *
+ * This option prevents the library from retaining closed streams to
+ * maintain the priority tree. If this option is set to nonzero,
+ * applications can discard closed stream completely to save memory.
+ */
+NGHTTP2_EXTERN void nghttp2_option_set_no_closed_streams(nghttp2_option *option,
+ int val);
+
+/**
+ * @function
+ *
+ * This function sets the maximum number of outgoing SETTINGS ACK and
+ * PING ACK frames retained in :type:`nghttp2_session` object. If
+ * more than those frames are retained, the peer is considered to be
+ * misbehaving and session will be closed. The default value is 1000.
+ */
+NGHTTP2_EXTERN void nghttp2_option_set_max_outbound_ack(nghttp2_option *option,
+ size_t val);
+
+/**
+ * @function
+ *
+ * This function sets the maximum number of SETTINGS entries per
+ * SETTINGS frame that will be accepted. If more than those entries
+ * are received, the peer is considered to be misbehaving and session
+ * will be closed. The default value is 32.
+ */
+NGHTTP2_EXTERN void nghttp2_option_set_max_settings(nghttp2_option *option,
+ size_t val);
+
+/**
+ * @function
+ *
+ * Initializes |*session_ptr| for client use. The all members of
+ * |callbacks| are copied to |*session_ptr|. Therefore |*session_ptr|
+ * does not store |callbacks|. The |user_data| is an arbitrary user
+ * supplied data, which will be passed to the callback functions.
+ *
+ * The :type:`nghttp2_send_callback` must be specified. If the
+ * application code uses `nghttp2_session_recv()`, the
+ * :type:`nghttp2_recv_callback` must be specified. The other members
+ * of |callbacks| can be ``NULL``.
+ *
+ * If this function fails, |*session_ptr| is left untouched.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_client_new(nghttp2_session **session_ptr,
+ const nghttp2_session_callbacks *callbacks,
+ void *user_data);
+
+/**
+ * @function
+ *
+ * Initializes |*session_ptr| for server use. The all members of
+ * |callbacks| are copied to |*session_ptr|. Therefore |*session_ptr|
+ * does not store |callbacks|. The |user_data| is an arbitrary user
+ * supplied data, which will be passed to the callback functions.
+ *
+ * The :type:`nghttp2_send_callback` must be specified. If the
+ * application code uses `nghttp2_session_recv()`, the
+ * :type:`nghttp2_recv_callback` must be specified. The other members
+ * of |callbacks| can be ``NULL``.
+ *
+ * If this function fails, |*session_ptr| is left untouched.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_server_new(nghttp2_session **session_ptr,
+ const nghttp2_session_callbacks *callbacks,
+ void *user_data);
+
+/**
+ * @function
+ *
+ * Like `nghttp2_session_client_new()`, but with additional options
+ * specified in the |option|.
+ *
+ * The |option| can be ``NULL`` and the call is equivalent to
+ * `nghttp2_session_client_new()`.
+ *
+ * This function does not take ownership |option|. The application is
+ * responsible for freeing |option| if it finishes using the object.
+ *
+ * The library code does not refer to |option| after this function
+ * returns.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_client_new2(nghttp2_session **session_ptr,
+ const nghttp2_session_callbacks *callbacks,
+ void *user_data, const nghttp2_option *option);
+
+/**
+ * @function
+ *
+ * Like `nghttp2_session_server_new()`, but with additional options
+ * specified in the |option|.
+ *
+ * The |option| can be ``NULL`` and the call is equivalent to
+ * `nghttp2_session_server_new()`.
+ *
+ * This function does not take ownership |option|. The application is
+ * responsible for freeing |option| if it finishes using the object.
+ *
+ * The library code does not refer to |option| after this function
+ * returns.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_server_new2(nghttp2_session **session_ptr,
+ const nghttp2_session_callbacks *callbacks,
+ void *user_data, const nghttp2_option *option);
+
+/**
+ * @function
+ *
+ * Like `nghttp2_session_client_new2()`, but with additional custom
+ * memory allocator specified in the |mem|.
+ *
+ * The |mem| can be ``NULL`` and the call is equivalent to
+ * `nghttp2_session_client_new2()`.
+ *
+ * This function does not take ownership |mem|. The application is
+ * responsible for freeing |mem|.
+ *
+ * The library code does not refer to |mem| pointer after this
+ * function returns, so the application can safely free it.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int nghttp2_session_client_new3(
+ nghttp2_session **session_ptr, const nghttp2_session_callbacks *callbacks,
+ void *user_data, const nghttp2_option *option, nghttp2_mem *mem);
+
+/**
+ * @function
+ *
+ * Like `nghttp2_session_server_new2()`, but with additional custom
+ * memory allocator specified in the |mem|.
+ *
+ * The |mem| can be ``NULL`` and the call is equivalent to
+ * `nghttp2_session_server_new2()`.
+ *
+ * This function does not take ownership |mem|. The application is
+ * responsible for freeing |mem|.
+ *
+ * The library code does not refer to |mem| pointer after this
+ * function returns, so the application can safely free it.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int nghttp2_session_server_new3(
+ nghttp2_session **session_ptr, const nghttp2_session_callbacks *callbacks,
+ void *user_data, const nghttp2_option *option, nghttp2_mem *mem);
+
+/**
+ * @function
+ *
+ * Frees any resources allocated for |session|. If |session| is
+ * ``NULL``, this function does nothing.
+ */
+NGHTTP2_EXTERN void nghttp2_session_del(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Sends pending frames to the remote peer.
+ *
+ * This function retrieves the highest prioritized frame from the
+ * outbound queue and sends it to the remote peer. It does this as
+ * many times as possible until the user callback
+ * :type:`nghttp2_send_callback` returns
+ * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`, the outbound queue
+ * becomes empty or flow control is triggered (remote window size
+ * becomes depleted or maximum number of concurrent streams is
+ * reached). This function calls several callback functions which are
+ * passed when initializing the |session|. Here is the simple time
+ * chart which tells when each callback is invoked:
+ *
+ * 1. Get the next frame to send from outbound queue.
+ *
+ * 2. Prepare transmission of the frame.
+ *
+ * 3. If the control frame cannot be sent because some preconditions
+ * are not met (e.g., request HEADERS cannot be sent after GOAWAY),
+ * :type:`nghttp2_on_frame_not_send_callback` is invoked. Abort
+ * the following steps.
+ *
+ * 4. If the frame is HEADERS, PUSH_PROMISE or DATA,
+ * :type:`nghttp2_select_padding_callback` is invoked.
+ *
+ * 5. If the frame is request HEADERS, the stream is opened here.
+ *
+ * 6. :type:`nghttp2_before_frame_send_callback` is invoked.
+ *
+ * 7. If :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL` is returned from
+ * :type:`nghttp2_before_frame_send_callback`, the current frame
+ * transmission is canceled, and
+ * :type:`nghttp2_on_frame_not_send_callback` is invoked. Abort
+ * the following steps.
+ *
+ * 8. :type:`nghttp2_send_callback` is invoked one or more times to
+ * send the frame.
+ *
+ * 9. :type:`nghttp2_on_frame_send_callback` is invoked.
+ *
+ * 10. If the transmission of the frame triggers closure of the
+ * stream, the stream is closed and
+ * :type:`nghttp2_on_stream_close_callback` is invoked.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
+ * The callback function failed.
+ */
+NGHTTP2_EXTERN int nghttp2_session_send(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns the serialized data to send.
+ *
+ * This function behaves like `nghttp2_session_send()` except that it
+ * does not use :type:`nghttp2_send_callback` to transmit data.
+ * Instead, it assigns the pointer to the serialized data to the
+ * |*data_ptr| and returns its length. The other callbacks are called
+ * in the same way as they are in `nghttp2_session_send()`.
+ *
+ * If no data is available to send, this function returns 0.
+ *
+ * This function may not return all serialized data in one invocation.
+ * To get all data, call this function repeatedly until it returns 0
+ * or one of negative error codes.
+ *
+ * The assigned |*data_ptr| is valid until the next call of
+ * `nghttp2_session_mem_send()` or `nghttp2_session_send()`.
+ *
+ * The caller must send all data before sending the next chunk of
+ * data.
+ *
+ * This function returns the length of the data pointed by the
+ * |*data_ptr| if it succeeds, or one of the following negative error
+ * codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ *
+ * .. note::
+ *
+ * This function may produce very small byte string. If that is the
+ * case, and application disables Nagle algorithm (``TCP_NODELAY``),
+ * then writing this small chunk leads to very small packet, and it
+ * is very inefficient. An application should be responsible to
+ * buffer up small chunks of data as necessary to avoid this
+ * situation.
+ */
+NGHTTP2_EXTERN ssize_t nghttp2_session_mem_send(nghttp2_session *session,
+ const uint8_t **data_ptr);
+
+/**
+ * @function
+ *
+ * Receives frames from the remote peer.
+ *
+ * This function receives as many frames as possible until the user
+ * callback :type:`nghttp2_recv_callback` returns
+ * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`. This function calls
+ * several callback functions which are passed when initializing the
+ * |session|. Here is the simple time chart which tells when each
+ * callback is invoked:
+ *
+ * 1. :type:`nghttp2_recv_callback` is invoked one or more times to
+ * receive frame header.
+ *
+ * 2. When frame header is received,
+ * :type:`nghttp2_on_begin_frame_callback` is invoked.
+ *
+ * 3. If the frame is DATA frame:
+ *
+ * 1. :type:`nghttp2_recv_callback` is invoked to receive DATA
+ * payload. For each chunk of data,
+ * :type:`nghttp2_on_data_chunk_recv_callback` is invoked.
+ *
+ * 2. If one DATA frame is completely received,
+ * :type:`nghttp2_on_frame_recv_callback` is invoked. If the
+ * reception of the frame triggers the closure of the stream,
+ * :type:`nghttp2_on_stream_close_callback` is invoked.
+ *
+ * 4. If the frame is the control frame:
+ *
+ * 1. :type:`nghttp2_recv_callback` is invoked one or more times to
+ * receive whole frame.
+ *
+ * 2. If the received frame is valid, then following actions are
+ * taken. If the frame is either HEADERS or PUSH_PROMISE,
+ * :type:`nghttp2_on_begin_headers_callback` is invoked. Then
+ * :type:`nghttp2_on_header_callback` is invoked for each header
+ * name/value pair. For invalid header field,
+ * :type:`nghttp2_on_invalid_header_callback` is called. After
+ * all name/value pairs are emitted successfully,
+ * :type:`nghttp2_on_frame_recv_callback` is invoked. For other
+ * frames, :type:`nghttp2_on_frame_recv_callback` is invoked.
+ * If the reception of the frame triggers the closure of the
+ * stream, :type:`nghttp2_on_stream_close_callback` is invoked.
+ *
+ * 3. If the received frame is unpacked but is interpreted as
+ * invalid, :type:`nghttp2_on_invalid_frame_recv_callback` is
+ * invoked.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_EOF`
+ * The remote peer did shutdown on the connection.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
+ * The callback function failed.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`
+ * Invalid client magic was detected. This error only returns
+ * when |session| was configured as server and
+ * `nghttp2_option_set_no_recv_client_magic()` is not used with
+ * nonzero value.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_FLOODED`
+ * Flooding was detected in this HTTP/2 session, and it must be
+ * closed. This is most likely caused by misbehaviour of peer.
+ */
+NGHTTP2_EXTERN int nghttp2_session_recv(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Processes data |in| as an input from the remote endpoint. The
+ * |inlen| indicates the number of bytes in the |in|.
+ *
+ * This function behaves like `nghttp2_session_recv()` except that it
+ * does not use :type:`nghttp2_recv_callback` to receive data; the
+ * |in| is the only data for the invocation of this function. If all
+ * bytes are processed, this function returns. The other callbacks
+ * are called in the same way as they are in `nghttp2_session_recv()`.
+ *
+ * In the current implementation, this function always tries to
+ * processes all input data unless either an error occurs or
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` is returned from
+ * :type:`nghttp2_on_header_callback` or
+ * :type:`nghttp2_on_data_chunk_recv_callback`. If
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` is used, the return value
+ * includes the number of bytes which was used to produce the data or
+ * frame for the callback.
+ *
+ * This function returns the number of processed bytes, or one of the
+ * following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
+ * The callback function failed.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`
+ * Invalid client magic was detected. This error only returns
+ * when |session| was configured as server and
+ * `nghttp2_option_set_no_recv_client_magic()` is not used with
+ * nonzero value.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_FLOODED`
+ * Flooding was detected in this HTTP/2 session, and it must be
+ * closed. This is most likely caused by misbehaviour of peer.
+ */
+NGHTTP2_EXTERN ssize_t nghttp2_session_mem_recv(nghttp2_session *session,
+ const uint8_t *in,
+ size_t inlen);
+
+/**
+ * @function
+ *
+ * Puts back previously deferred DATA frame in the stream |stream_id|
+ * to the outbound queue.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The stream does not exist; or no deferred data exist.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int nghttp2_session_resume_data(nghttp2_session *session,
+ int32_t stream_id);
+
+/**
+ * @function
+ *
+ * Returns nonzero value if |session| wants to receive data from the
+ * remote peer.
+ *
+ * If both `nghttp2_session_want_read()` and
+ * `nghttp2_session_want_write()` return 0, the application should
+ * drop the connection.
+ */
+NGHTTP2_EXTERN int nghttp2_session_want_read(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns nonzero value if |session| wants to send data to the remote
+ * peer.
+ *
+ * If both `nghttp2_session_want_read()` and
+ * `nghttp2_session_want_write()` return 0, the application should
+ * drop the connection.
+ */
+NGHTTP2_EXTERN int nghttp2_session_want_write(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns stream_user_data for the stream |stream_id|. The
+ * stream_user_data is provided by `nghttp2_submit_request()`,
+ * `nghttp2_submit_headers()` or
+ * `nghttp2_session_set_stream_user_data()`. Unless it is set using
+ * `nghttp2_session_set_stream_user_data()`, if the stream is
+ * initiated by the remote endpoint, stream_user_data is always
+ * ``NULL``. If the stream does not exist, this function returns
+ * ``NULL``.
+ */
+NGHTTP2_EXTERN void *
+nghttp2_session_get_stream_user_data(nghttp2_session *session,
+ int32_t stream_id);
+
+/**
+ * @function
+ *
+ * Sets the |stream_user_data| to the stream denoted by the
+ * |stream_id|. If a stream user data is already set to the stream,
+ * it is replaced with the |stream_user_data|. It is valid to specify
+ * ``NULL`` in the |stream_user_data|, which nullifies the associated
+ * data pointer.
+ *
+ * It is valid to set the |stream_user_data| to the stream reserved by
+ * PUSH_PROMISE frame.
+ *
+ * This function returns 0 if it succeeds, or one of following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The stream does not exist
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_set_stream_user_data(nghttp2_session *session,
+ int32_t stream_id, void *stream_user_data);
+
+/**
+ * @function
+ *
+ * Sets |user_data| to |session|, overwriting the existing user data
+ * specified in `nghttp2_session_client_new()`, or
+ * `nghttp2_session_server_new()`.
+ */
+NGHTTP2_EXTERN void nghttp2_session_set_user_data(nghttp2_session *session,
+ void *user_data);
+
+/**
+ * @function
+ *
+ * Returns the number of frames in the outbound queue. This does not
+ * include the deferred DATA frames.
+ */
+NGHTTP2_EXTERN size_t
+nghttp2_session_get_outbound_queue_size(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns the number of DATA payload in bytes received without
+ * WINDOW_UPDATE transmission for the stream |stream_id|. The local
+ * (receive) window size can be adjusted by
+ * `nghttp2_submit_window_update()`. This function takes into account
+ * that and returns effective data length. In particular, if the
+ * local window size is reduced by submitting negative
+ * window_size_increment with `nghttp2_submit_window_update()`, this
+ * function returns the number of bytes less than actually received.
+ *
+ * This function returns -1 if it fails.
+ */
+NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_effective_recv_data_length(
+ nghttp2_session *session, int32_t stream_id);
+
+/**
+ * @function
+ *
+ * Returns the local (receive) window size for the stream |stream_id|.
+ * The local window size can be adjusted by
+ * `nghttp2_submit_window_update()`. This function takes into account
+ * that and returns effective window size.
+ *
+ * This function does not take into account the amount of received
+ * data from the remote endpoint. Use
+ * `nghttp2_session_get_stream_local_window_size()` to know the amount
+ * of data the remote endpoint can send without receiving stream level
+ * WINDOW_UPDATE frame. Note that each stream is still subject to the
+ * connection level flow control.
+ *
+ * This function returns -1 if it fails.
+ */
+NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_effective_local_window_size(
+ nghttp2_session *session, int32_t stream_id);
+
+/**
+ * @function
+ *
+ * Returns the amount of flow-controlled payload (e.g., DATA) that the
+ * remote endpoint can send without receiving stream level
+ * WINDOW_UPDATE frame. It is also subject to the connection level
+ * flow control. So the actual amount of data to send is
+ * min(`nghttp2_session_get_stream_local_window_size()`,
+ * `nghttp2_session_get_local_window_size()`).
+ *
+ * This function returns -1 if it fails.
+ */
+NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_local_window_size(
+ nghttp2_session *session, int32_t stream_id);
+
+/**
+ * @function
+ *
+ * Returns the number of DATA payload in bytes received without
+ * WINDOW_UPDATE transmission for a connection. The local (receive)
+ * window size can be adjusted by `nghttp2_submit_window_update()`.
+ * This function takes into account that and returns effective data
+ * length. In particular, if the local window size is reduced by
+ * submitting negative window_size_increment with
+ * `nghttp2_submit_window_update()`, this function returns the number
+ * of bytes less than actually received.
+ *
+ * This function returns -1 if it fails.
+ */
+NGHTTP2_EXTERN int32_t
+nghttp2_session_get_effective_recv_data_length(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns the local (receive) window size for a connection. The
+ * local window size can be adjusted by
+ * `nghttp2_submit_window_update()`. This function takes into account
+ * that and returns effective window size.
+ *
+ * This function does not take into account the amount of received
+ * data from the remote endpoint. Use
+ * `nghttp2_session_get_local_window_size()` to know the amount of
+ * data the remote endpoint can send without receiving
+ * connection-level WINDOW_UPDATE frame. Note that each stream is
+ * still subject to the stream level flow control.
+ *
+ * This function returns -1 if it fails.
+ */
+NGHTTP2_EXTERN int32_t
+nghttp2_session_get_effective_local_window_size(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns the amount of flow-controlled payload (e.g., DATA) that the
+ * remote endpoint can send without receiving connection level
+ * WINDOW_UPDATE frame. Note that each stream is still subject to the
+ * stream level flow control (see
+ * `nghttp2_session_get_stream_local_window_size()`).
+ *
+ * This function returns -1 if it fails.
+ */
+NGHTTP2_EXTERN int32_t
+nghttp2_session_get_local_window_size(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns the remote window size for a given stream |stream_id|.
+ *
+ * This is the amount of flow-controlled payload (e.g., DATA) that the
+ * local endpoint can send without stream level WINDOW_UPDATE. There
+ * is also connection level flow control, so the effective size of
+ * payload that the local endpoint can actually send is
+ * min(`nghttp2_session_get_stream_remote_window_size()`,
+ * `nghttp2_session_get_remote_window_size()`).
+ *
+ * This function returns -1 if it fails.
+ */
+NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_remote_window_size(
+ nghttp2_session *session, int32_t stream_id);
+
+/**
+ * @function
+ *
+ * Returns the remote window size for a connection.
+ *
+ * This function always succeeds.
+ */
+NGHTTP2_EXTERN int32_t
+nghttp2_session_get_remote_window_size(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns 1 if local peer half closed the given stream |stream_id|.
+ * Returns 0 if it did not. Returns -1 if no such stream exists.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_get_stream_local_close(nghttp2_session *session,
+ int32_t stream_id);
+
+/**
+ * @function
+ *
+ * Returns 1 if remote peer half closed the given stream |stream_id|.
+ * Returns 0 if it did not. Returns -1 if no such stream exists.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_get_stream_remote_close(nghttp2_session *session,
+ int32_t stream_id);
+
+/**
+ * @function
+ *
+ * Returns the current dynamic table size of HPACK inflater, including
+ * the overhead 32 bytes per entry described in RFC 7541.
+ */
+NGHTTP2_EXTERN size_t
+nghttp2_session_get_hd_inflate_dynamic_table_size(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns the current dynamic table size of HPACK deflater including
+ * the overhead 32 bytes per entry described in RFC 7541.
+ */
+NGHTTP2_EXTERN size_t
+nghttp2_session_get_hd_deflate_dynamic_table_size(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Signals the session so that the connection should be terminated.
+ *
+ * The last stream ID is the minimum value between the stream ID of a
+ * stream for which :type:`nghttp2_on_frame_recv_callback` was called
+ * most recently and the last stream ID we have sent to the peer
+ * previously.
+ *
+ * The |error_code| is the error code of this GOAWAY frame. The
+ * pre-defined error code is one of :enum:`nghttp2_error_code`.
+ *
+ * After the transmission, both `nghttp2_session_want_read()` and
+ * `nghttp2_session_want_write()` return 0.
+ *
+ * This function should be called when the connection should be
+ * terminated after sending GOAWAY. If the remaining streams should
+ * be processed after GOAWAY, use `nghttp2_submit_goaway()` instead.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int nghttp2_session_terminate_session(nghttp2_session *session,
+ uint32_t error_code);
+
+/**
+ * @function
+ *
+ * Signals the session so that the connection should be terminated.
+ *
+ * This function behaves like `nghttp2_session_terminate_session()`,
+ * but the last stream ID can be specified by the application for fine
+ * grained control of stream. The HTTP/2 specification does not allow
+ * last_stream_id to be increased. So the actual value sent as
+ * last_stream_id is the minimum value between the given
+ * |last_stream_id| and the last_stream_id we have previously sent to
+ * the peer.
+ *
+ * The |last_stream_id| is peer's stream ID or 0. So if |session| is
+ * initialized as client, |last_stream_id| must be even or 0. If
+ * |session| is initialized as server, |last_stream_id| must be odd or
+ * 0.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |last_stream_id| is invalid.
+ */
+NGHTTP2_EXTERN int nghttp2_session_terminate_session2(nghttp2_session *session,
+ int32_t last_stream_id,
+ uint32_t error_code);
+
+/**
+ * @function
+ *
+ * Signals to the client that the server started graceful shutdown
+ * procedure.
+ *
+ * This function is only usable for server. If this function is
+ * called with client side session, this function returns
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
+ *
+ * To gracefully shutdown HTTP/2 session, server should call this
+ * function to send GOAWAY with last_stream_id (1u << 31) - 1. And
+ * after some delay (e.g., 1 RTT), send another GOAWAY with the stream
+ * ID that the server has some processing using
+ * `nghttp2_submit_goaway()`. See also
+ * `nghttp2_session_get_last_proc_stream_id()`.
+ *
+ * Unlike `nghttp2_submit_goaway()`, this function just sends GOAWAY
+ * and does nothing more. This is a mere indication to the client
+ * that session shutdown is imminent. The application should call
+ * `nghttp2_submit_goaway()` with appropriate last_stream_id after
+ * this call.
+ *
+ * If one or more GOAWAY frame have been already sent by either
+ * `nghttp2_submit_goaway()` or `nghttp2_session_terminate_session()`,
+ * this function has no effect.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ * The |session| is initialized as client.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_shutdown_notice(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns the value of SETTINGS |id| notified by a remote endpoint.
+ * The |id| must be one of values defined in
+ * :enum:`nghttp2_settings_id`.
+ */
+NGHTTP2_EXTERN uint32_t nghttp2_session_get_remote_settings(
+ nghttp2_session *session, nghttp2_settings_id id);
+
+/**
+ * @function
+ *
+ * Returns the value of SETTINGS |id| of local endpoint acknowledged
+ * by the remote endpoint. The |id| must be one of the values defined
+ * in :enum:`nghttp2_settings_id`.
+ */
+NGHTTP2_EXTERN uint32_t nghttp2_session_get_local_settings(
+ nghttp2_session *session, nghttp2_settings_id id);
+
+/**
+ * @function
+ *
+ * Tells the |session| that next stream ID is |next_stream_id|. The
+ * |next_stream_id| must be equal or greater than the value returned
+ * by `nghttp2_session_get_next_stream_id()`.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |next_stream_id| is strictly less than the value
+ * `nghttp2_session_get_next_stream_id()` returns; or
+ * |next_stream_id| is invalid (e.g., even integer for client, or
+ * odd integer for server).
+ */
+NGHTTP2_EXTERN int nghttp2_session_set_next_stream_id(nghttp2_session *session,
+ int32_t next_stream_id);
+
+/**
+ * @function
+ *
+ * Returns the next outgoing stream ID. Notice that return type is
+ * uint32_t. If we run out of stream ID for this session, this
+ * function returns 1 << 31.
+ */
+NGHTTP2_EXTERN uint32_t
+nghttp2_session_get_next_stream_id(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Tells the |session| that |size| bytes for a stream denoted by
+ * |stream_id| were consumed by application and are ready to
+ * WINDOW_UPDATE. The consumed bytes are counted towards both
+ * connection and stream level WINDOW_UPDATE (see
+ * `nghttp2_session_consume_connection()` and
+ * `nghttp2_session_consume_stream()` to update consumption
+ * independently). This function is intended to be used without
+ * automatic window update (see
+ * `nghttp2_option_set_no_auto_window_update()`).
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is 0.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ * Automatic WINDOW_UPDATE is not disabled.
+ */
+NGHTTP2_EXTERN int nghttp2_session_consume(nghttp2_session *session,
+ int32_t stream_id, size_t size);
+
+/**
+ * @function
+ *
+ * Like `nghttp2_session_consume()`, but this only tells library that
+ * |size| bytes were consumed only for connection level. Note that
+ * HTTP/2 maintains connection and stream level flow control windows
+ * independently.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ * Automatic WINDOW_UPDATE is not disabled.
+ */
+NGHTTP2_EXTERN int nghttp2_session_consume_connection(nghttp2_session *session,
+ size_t size);
+
+/**
+ * @function
+ *
+ * Like `nghttp2_session_consume()`, but this only tells library that
+ * |size| bytes were consumed only for stream denoted by |stream_id|.
+ * Note that HTTP/2 maintains connection and stream level flow control
+ * windows independently.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is 0.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ * Automatic WINDOW_UPDATE is not disabled.
+ */
+NGHTTP2_EXTERN int nghttp2_session_consume_stream(nghttp2_session *session,
+ int32_t stream_id,
+ size_t size);
+
+/**
+ * @function
+ *
+ * Changes priority of existing stream denoted by |stream_id|. The
+ * new priority specification is |pri_spec|.
+ *
+ * The priority is changed silently and instantly, and no PRIORITY
+ * frame will be sent to notify the peer of this change. This
+ * function may be useful for server to change the priority of pushed
+ * stream.
+ *
+ * If |session| is initialized as server, and ``pri_spec->stream_id``
+ * points to the idle stream, the idle stream is created if it does
+ * not exist. The created idle stream will depend on root stream
+ * (stream 0) with weight 16.
+ *
+ * Otherwise, if stream denoted by ``pri_spec->stream_id`` is not
+ * found, we use default priority instead of given |pri_spec|. That
+ * is make stream depend on root stream with weight 16.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * Attempted to depend on itself; or no stream exist for the given
+ * |stream_id|; or |stream_id| is 0
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_change_stream_priority(nghttp2_session *session,
+ int32_t stream_id,
+ const nghttp2_priority_spec *pri_spec);
+
+/**
+ * @function
+ *
+ * Creates idle stream with the given |stream_id|, and priority
+ * |pri_spec|.
+ *
+ * The stream creation is done without sending PRIORITY frame, which
+ * means that peer does not know about the existence of this idle
+ * stream in the local endpoint.
+ *
+ * RFC 7540 does not disallow the use of creation of idle stream with
+ * odd or even stream ID regardless of client or server. So this
+ * function can create odd or even stream ID regardless of client or
+ * server. But probably it is a bit safer to use the stream ID the
+ * local endpoint can initiate (in other words, use odd stream ID for
+ * client, and even stream ID for server), to avoid potential
+ * collision from peer's instruction. Also we can use
+ * `nghttp2_session_set_next_stream_id()` to avoid to open created
+ * idle streams accidentally if we follow this recommendation.
+ *
+ * If |session| is initialized as server, and ``pri_spec->stream_id``
+ * points to the idle stream, the idle stream is created if it does
+ * not exist. The created idle stream will depend on root stream
+ * (stream 0) with weight 16.
+ *
+ * Otherwise, if stream denoted by ``pri_spec->stream_id`` is not
+ * found, we use default priority instead of given |pri_spec|. That
+ * is make stream depend on root stream with weight 16.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * Attempted to depend on itself; or stream denoted by |stream_id|
+ * already exists; or |stream_id| cannot be used to create idle
+ * stream (in other words, local endpoint has already opened
+ * stream ID greater than or equal to the given stream ID; or
+ * |stream_id| is 0
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_create_idle_stream(nghttp2_session *session, int32_t stream_id,
+ const nghttp2_priority_spec *pri_spec);
+
+/**
+ * @function
+ *
+ * Performs post-process of HTTP Upgrade request. This function can
+ * be called from both client and server, but the behavior is very
+ * different in each other.
+ *
+ * .. warning::
+ *
+ * This function is deprecated in favor of
+ * `nghttp2_session_upgrade2()`, because this function lacks the
+ * parameter to tell the library the request method used in the
+ * original HTTP request. This information is required for client
+ * to validate actual response body length against content-length
+ * header field (see `nghttp2_option_set_no_http_messaging()`). If
+ * HEAD is used in request, the length of response body must be 0
+ * regardless of value included in content-length header field.
+ *
+ * If called from client side, the |settings_payload| must be the
+ * value sent in ``HTTP2-Settings`` header field and must be decoded
+ * by base64url decoder. The |settings_payloadlen| is the length of
+ * |settings_payload|. The |settings_payload| is unpacked and its
+ * setting values will be submitted using `nghttp2_submit_settings()`.
+ * This means that the client application code does not need to submit
+ * SETTINGS by itself. The stream with stream ID=1 is opened and the
+ * |stream_user_data| is used for its stream_user_data. The opened
+ * stream becomes half-closed (local) state.
+ *
+ * If called from server side, the |settings_payload| must be the
+ * value received in ``HTTP2-Settings`` header field and must be
+ * decoded by base64url decoder. The |settings_payloadlen| is the
+ * length of |settings_payload|. It is treated as if the SETTINGS
+ * frame with that payload is received. Thus, callback functions for
+ * the reception of SETTINGS frame will be invoked. The stream with
+ * stream ID=1 is opened. The |stream_user_data| is ignored. The
+ * opened stream becomes half-closed (remote).
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |settings_payload| is badly formed.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
+ * The stream ID 1 is already used or closed; or is not available.
+ */
+NGHTTP2_EXTERN int nghttp2_session_upgrade(nghttp2_session *session,
+ const uint8_t *settings_payload,
+ size_t settings_payloadlen,
+ void *stream_user_data);
+
+/**
+ * @function
+ *
+ * Performs post-process of HTTP Upgrade request. This function can
+ * be called from both client and server, but the behavior is very
+ * different in each other.
+ *
+ * If called from client side, the |settings_payload| must be the
+ * value sent in ``HTTP2-Settings`` header field and must be decoded
+ * by base64url decoder. The |settings_payloadlen| is the length of
+ * |settings_payload|. The |settings_payload| is unpacked and its
+ * setting values will be submitted using `nghttp2_submit_settings()`.
+ * This means that the client application code does not need to submit
+ * SETTINGS by itself. The stream with stream ID=1 is opened and the
+ * |stream_user_data| is used for its stream_user_data. The opened
+ * stream becomes half-closed (local) state.
+ *
+ * If called from server side, the |settings_payload| must be the
+ * value received in ``HTTP2-Settings`` header field and must be
+ * decoded by base64url decoder. The |settings_payloadlen| is the
+ * length of |settings_payload|. It is treated as if the SETTINGS
+ * frame with that payload is received. Thus, callback functions for
+ * the reception of SETTINGS frame will be invoked. The stream with
+ * stream ID=1 is opened. The |stream_user_data| is ignored. The
+ * opened stream becomes half-closed (remote).
+ *
+ * If the request method is HEAD, pass nonzero value to
+ * |head_request|. Otherwise, pass 0.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |settings_payload| is badly formed.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
+ * The stream ID 1 is already used or closed; or is not available.
+ */
+NGHTTP2_EXTERN int nghttp2_session_upgrade2(nghttp2_session *session,
+ const uint8_t *settings_payload,
+ size_t settings_payloadlen,
+ int head_request,
+ void *stream_user_data);
+
+/**
+ * @function
+ *
+ * Serializes the SETTINGS values |iv| in the |buf|. The size of the
+ * |buf| is specified by |buflen|. The number of entries in the |iv|
+ * array is given by |niv|. The required space in |buf| for the |niv|
+ * entries is ``6*niv`` bytes and if the given buffer is too small, an
+ * error is returned. This function is used mainly for creating a
+ * SETTINGS payload to be sent with the ``HTTP2-Settings`` header
+ * field in an HTTP Upgrade request. The data written in |buf| is NOT
+ * base64url encoded and the application is responsible for encoding.
+ *
+ * This function returns the number of bytes written in |buf|, or one
+ * of the following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |iv| contains duplicate settings ID or invalid value.
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
+ * The provided |buflen| size is too small to hold the output.
+ */
+NGHTTP2_EXTERN ssize_t nghttp2_pack_settings_payload(
+ uint8_t *buf, size_t buflen, const nghttp2_settings_entry *iv, size_t niv);
+
+/**
+ * @function
+ *
+ * Returns string describing the |lib_error_code|. The
+ * |lib_error_code| must be one of the :enum:`nghttp2_error`.
+ */
+NGHTTP2_EXTERN const char *nghttp2_strerror(int lib_error_code);
+
+/**
+ * @function
+ *
+ * Returns string representation of HTTP/2 error code |error_code|
+ * (e.g., ``PROTOCOL_ERROR`` is returned if ``error_code ==
+ * NGHTTP2_PROTOCOL_ERROR``). If string representation is unknown for
+ * given |error_code|, this function returns string ``unknown``.
+ */
+NGHTTP2_EXTERN const char *nghttp2_http2_strerror(uint32_t error_code);
+
+/**
+ * @function
+ *
+ * Initializes |pri_spec| with the |stream_id| of the stream to depend
+ * on with |weight| and its exclusive flag. If |exclusive| is
+ * nonzero, exclusive flag is set.
+ *
+ * The |weight| must be in [:macro:`NGHTTP2_MIN_WEIGHT`,
+ * :macro:`NGHTTP2_MAX_WEIGHT`], inclusive.
+ */
+NGHTTP2_EXTERN void nghttp2_priority_spec_init(nghttp2_priority_spec *pri_spec,
+ int32_t stream_id,
+ int32_t weight, int exclusive);
+
+/**
+ * @function
+ *
+ * Initializes |pri_spec| with the default values. The default values
+ * are: stream_id = 0, weight = :macro:`NGHTTP2_DEFAULT_WEIGHT` and
+ * exclusive = 0.
+ */
+NGHTTP2_EXTERN void
+nghttp2_priority_spec_default_init(nghttp2_priority_spec *pri_spec);
+
+/**
+ * @function
+ *
+ * Returns nonzero if the |pri_spec| is filled with default values.
+ */
+NGHTTP2_EXTERN int
+nghttp2_priority_spec_check_default(const nghttp2_priority_spec *pri_spec);
+
+/**
+ * @function
+ *
+ * Submits HEADERS frame and optionally one or more DATA frames.
+ *
+ * The |pri_spec| is priority specification of this request. ``NULL``
+ * means the default priority (see
+ * `nghttp2_priority_spec_default_init()`). To specify the priority,
+ * use `nghttp2_priority_spec_init()`. If |pri_spec| is not ``NULL``,
+ * this function will copy its data members.
+ *
+ * The ``pri_spec->weight`` must be in [:macro:`NGHTTP2_MIN_WEIGHT`,
+ * :macro:`NGHTTP2_MAX_WEIGHT`], inclusive. If ``pri_spec->weight``
+ * is strictly less than :macro:`NGHTTP2_MIN_WEIGHT`, it becomes
+ * :macro:`NGHTTP2_MIN_WEIGHT`. If it is strictly greater than
+ * :macro:`NGHTTP2_MAX_WEIGHT`, it becomes
+ * :macro:`NGHTTP2_MAX_WEIGHT`.
+ *
+ * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
+ * |nvlen| elements. The application is responsible to include
+ * required pseudo-header fields (header field whose name starts with
+ * ":") in |nva| and must place pseudo-headers before regular header
+ * fields.
+ *
+ * This function creates copies of all name/value pairs in |nva|. It
+ * also lower-cases all names in |nva|. The order of elements in
+ * |nva| is preserved. For header fields with
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+ * header field name and value are not copied respectively. With
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+ * is responsible to pass header field name in lowercase. The
+ * application should maintain the references to them until
+ * :type:`nghttp2_on_frame_send_callback` or
+ * :type:`nghttp2_on_frame_not_send_callback` is called.
+ *
+ * HTTP/2 specification has requirement about header fields in the
+ * request HEADERS. See the specification for more details.
+ *
+ * If |data_prd| is not ``NULL``, it provides data which will be sent
+ * in subsequent DATA frames. In this case, a method that allows
+ * request message bodies
+ * (https://tools.ietf.org/html/rfc7231#section-4) must be specified
+ * with ``:method`` key in |nva| (e.g. ``POST``). This function does
+ * not take ownership of the |data_prd|. The function copies the
+ * members of the |data_prd|. If |data_prd| is ``NULL``, HEADERS have
+ * END_STREAM set. The |stream_user_data| is data associated to the
+ * stream opened by this request and can be an arbitrary pointer,
+ * which can be retrieved later by
+ * `nghttp2_session_get_stream_user_data()`.
+ *
+ * This function returns assigned stream ID if it succeeds, or one of
+ * the following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
+ * No stream ID is available because maximum stream ID was
+ * reached.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * Trying to depend on itself (new stream ID equals
+ * ``pri_spec->stream_id``).
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
+ * The |session| is server session.
+ *
+ * .. warning::
+ *
+ * This function returns assigned stream ID if it succeeds. But
+ * that stream is not created yet. The application must not submit
+ * frame to that stream ID before
+ * :type:`nghttp2_before_frame_send_callback` is called for this
+ * frame. This means `nghttp2_session_get_stream_user_data()` does
+ * not work before the callback. But
+ * `nghttp2_session_set_stream_user_data()` handles this situation
+ * specially, and it can set data to a stream during this period.
+ *
+ */
+NGHTTP2_EXTERN int32_t nghttp2_submit_request(
+ nghttp2_session *session, const nghttp2_priority_spec *pri_spec,
+ const nghttp2_nv *nva, size_t nvlen, const nghttp2_data_provider *data_prd,
+ void *stream_user_data);
+
+/**
+ * @function
+ *
+ * Submits response HEADERS frame and optionally one or more DATA
+ * frames against the stream |stream_id|.
+ *
+ * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
+ * |nvlen| elements. The application is responsible to include
+ * required pseudo-header fields (header field whose name starts with
+ * ":") in |nva| and must place pseudo-headers before regular header
+ * fields.
+ *
+ * This function creates copies of all name/value pairs in |nva|. It
+ * also lower-cases all names in |nva|. The order of elements in
+ * |nva| is preserved. For header fields with
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+ * header field name and value are not copied respectively. With
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+ * is responsible to pass header field name in lowercase. The
+ * application should maintain the references to them until
+ * :type:`nghttp2_on_frame_send_callback` or
+ * :type:`nghttp2_on_frame_not_send_callback` is called.
+ *
+ * HTTP/2 specification has requirement about header fields in the
+ * response HEADERS. See the specification for more details.
+ *
+ * If |data_prd| is not ``NULL``, it provides data which will be sent
+ * in subsequent DATA frames. This function does not take ownership
+ * of the |data_prd|. The function copies the members of the
+ * |data_prd|. If |data_prd| is ``NULL``, HEADERS will have
+ * END_STREAM flag set.
+ *
+ * This method can be used as normal HTTP response and push response.
+ * When pushing a resource using this function, the |session| must be
+ * configured using `nghttp2_session_server_new()` or its variants and
+ * the target stream denoted by the |stream_id| must be reserved using
+ * `nghttp2_submit_push_promise()`.
+ *
+ * To send non-final response headers (e.g., HTTP status 101), don't
+ * use this function because this function half-closes the outbound
+ * stream. Instead, use `nghttp2_submit_headers()` for this purpose.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is 0.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
+ * DATA or HEADERS has been already submitted and not fully
+ * processed yet. Normally, this does not happen, but when
+ * application wrongly calls `nghttp2_submit_response()` twice,
+ * this may happen.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
+ * The |session| is client session.
+ *
+ * .. warning::
+ *
+ * Calling this function twice for the same stream ID may lead to
+ * program crash. It is generally considered to a programming error
+ * to commit response twice.
+ */
+NGHTTP2_EXTERN int
+nghttp2_submit_response(nghttp2_session *session, int32_t stream_id,
+ const nghttp2_nv *nva, size_t nvlen,
+ const nghttp2_data_provider *data_prd);
+
+/**
+ * @function
+ *
+ * Submits trailer fields HEADERS against the stream |stream_id|.
+ *
+ * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
+ * |nvlen| elements. The application must not include pseudo-header
+ * fields (headers whose names starts with ":") in |nva|.
+ *
+ * This function creates copies of all name/value pairs in |nva|. It
+ * also lower-cases all names in |nva|. The order of elements in
+ * |nva| is preserved. For header fields with
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+ * header field name and value are not copied respectively. With
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+ * is responsible to pass header field name in lowercase. The
+ * application should maintain the references to them until
+ * :type:`nghttp2_on_frame_send_callback` or
+ * :type:`nghttp2_on_frame_not_send_callback` is called.
+ *
+ * For server, trailer fields must follow response HEADERS or response
+ * DATA without END_STREAM flat set. The library does not enforce
+ * this requirement, and applications should do this for themselves.
+ * If `nghttp2_submit_trailer()` is called before any response HEADERS
+ * submission (usually by `nghttp2_submit_response()`), the content of
+ * |nva| will be sent as response headers, which will result in error.
+ *
+ * This function has the same effect with `nghttp2_submit_headers()`,
+ * with flags = :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` and both
+ * pri_spec and stream_user_data to NULL.
+ *
+ * To submit trailer fields after `nghttp2_submit_response()` is
+ * called, the application has to specify
+ * :type:`nghttp2_data_provider` to `nghttp2_submit_response()`.
+ * Inside of :type:`nghttp2_data_source_read_callback`, when setting
+ * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF`, also set
+ * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_END_STREAM`. After
+ * that, the application can send trailer fields using
+ * `nghttp2_submit_trailer()`. `nghttp2_submit_trailer()` can be used
+ * inside :type:`nghttp2_data_source_read_callback`.
+ *
+ * This function returns 0 if it succeeds and |stream_id| is -1.
+ * Otherwise, this function returns 0 if it succeeds, or one of the
+ * following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is 0.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_trailer(nghttp2_session *session,
+ int32_t stream_id,
+ const nghttp2_nv *nva, size_t nvlen);
+
+/**
+ * @function
+ *
+ * Submits HEADERS frame. The |flags| is bitwise OR of the
+ * following values:
+ *
+ * * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`
+ *
+ * If |flags| includes :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`,
+ * this frame has END_STREAM flag set.
+ *
+ * The library handles the CONTINUATION frame internally and it
+ * correctly sets END_HEADERS to the last sequence of the PUSH_PROMISE
+ * or CONTINUATION frame.
+ *
+ * If the |stream_id| is -1, this frame is assumed as request (i.e.,
+ * request HEADERS frame which opens new stream). In this case, the
+ * assigned stream ID will be returned. Otherwise, specify stream ID
+ * in |stream_id|.
+ *
+ * The |pri_spec| is priority specification of this request. ``NULL``
+ * means the default priority (see
+ * `nghttp2_priority_spec_default_init()`). To specify the priority,
+ * use `nghttp2_priority_spec_init()`. If |pri_spec| is not ``NULL``,
+ * this function will copy its data members.
+ *
+ * The ``pri_spec->weight`` must be in [:macro:`NGHTTP2_MIN_WEIGHT`,
+ * :macro:`NGHTTP2_MAX_WEIGHT`], inclusive. If ``pri_spec->weight``
+ * is strictly less than :macro:`NGHTTP2_MIN_WEIGHT`, it becomes
+ * :macro:`NGHTTP2_MIN_WEIGHT`. If it is strictly greater than
+ * :macro:`NGHTTP2_MAX_WEIGHT`, it becomes :macro:`NGHTTP2_MAX_WEIGHT`.
+ *
+ * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
+ * |nvlen| elements. The application is responsible to include
+ * required pseudo-header fields (header field whose name starts with
+ * ":") in |nva| and must place pseudo-headers before regular header
+ * fields.
+ *
+ * This function creates copies of all name/value pairs in |nva|. It
+ * also lower-cases all names in |nva|. The order of elements in
+ * |nva| is preserved. For header fields with
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+ * header field name and value are not copied respectively. With
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+ * is responsible to pass header field name in lowercase. The
+ * application should maintain the references to them until
+ * :type:`nghttp2_on_frame_send_callback` or
+ * :type:`nghttp2_on_frame_not_send_callback` is called.
+ *
+ * The |stream_user_data| is a pointer to an arbitrary data which is
+ * associated to the stream this frame will open. Therefore it is
+ * only used if this frame opens streams, in other words, it changes
+ * stream state from idle or reserved to open.
+ *
+ * This function is low-level in a sense that the application code can
+ * specify flags directly. For usual HTTP request,
+ * `nghttp2_submit_request()` is useful. Likewise, for HTTP response,
+ * prefer `nghttp2_submit_response()`.
+ *
+ * This function returns newly assigned stream ID if it succeeds and
+ * |stream_id| is -1. Otherwise, this function returns 0 if it
+ * succeeds, or one of the following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
+ * No stream ID is available because maximum stream ID was
+ * reached.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is 0; or trying to depend on itself (stream ID
+ * equals ``pri_spec->stream_id``).
+ * :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
+ * DATA or HEADERS has been already submitted and not fully
+ * processed yet. This happens if stream denoted by |stream_id|
+ * is in reserved state.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
+ * The |stream_id| is -1, and |session| is server session.
+ *
+ * .. warning::
+ *
+ * This function returns assigned stream ID if it succeeds and
+ * |stream_id| is -1. But that stream is not opened yet. The
+ * application must not submit frame to that stream ID before
+ * :type:`nghttp2_before_frame_send_callback` is called for this
+ * frame.
+ *
+ */
+NGHTTP2_EXTERN int32_t nghttp2_submit_headers(
+ nghttp2_session *session, uint8_t flags, int32_t stream_id,
+ const nghttp2_priority_spec *pri_spec, const nghttp2_nv *nva, size_t nvlen,
+ void *stream_user_data);
+
+/**
+ * @function
+ *
+ * Submits one or more DATA frames to the stream |stream_id|. The
+ * data to be sent are provided by |data_prd|. If |flags| contains
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`, the last DATA frame
+ * has END_STREAM flag set.
+ *
+ * This function does not take ownership of the |data_prd|. The
+ * function copies the members of the |data_prd|.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
+ * DATA or HEADERS has been already submitted and not fully
+ * processed yet.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is 0.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_CLOSED`
+ * The stream was already closed; or the |stream_id| is invalid.
+ *
+ * .. note::
+ *
+ * Currently, only one DATA or HEADERS is allowed for a stream at a
+ * time. Submitting these frames more than once before first DATA
+ * or HEADERS is finished results in
+ * :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST` error code. The
+ * earliest callback which tells that previous frame is done is
+ * :type:`nghttp2_on_frame_send_callback`. In side that callback,
+ * new data can be submitted using `nghttp2_submit_data()`. Of
+ * course, all data except for last one must not have
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` flag set in |flags|.
+ * This sounds a bit complicated, and we recommend to use
+ * `nghttp2_submit_request()` and `nghttp2_submit_response()` to
+ * avoid this cascading issue. The experience shows that for HTTP
+ * use, these two functions are enough to implement both client and
+ * server.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_data(nghttp2_session *session, uint8_t flags,
+ int32_t stream_id,
+ const nghttp2_data_provider *data_prd);
+
+/**
+ * @function
+ *
+ * Submits PRIORITY frame to change the priority of stream |stream_id|
+ * to the priority specification |pri_spec|.
+ *
+ * The |flags| is currently ignored and should be
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ *
+ * The |pri_spec| is priority specification of this request. ``NULL``
+ * is not allowed for this function. To specify the priority, use
+ * `nghttp2_priority_spec_init()`. This function will copy its data
+ * members.
+ *
+ * The ``pri_spec->weight`` must be in [:macro:`NGHTTP2_MIN_WEIGHT`,
+ * :macro:`NGHTTP2_MAX_WEIGHT`], inclusive. If ``pri_spec->weight``
+ * is strictly less than :macro:`NGHTTP2_MIN_WEIGHT`, it becomes
+ * :macro:`NGHTTP2_MIN_WEIGHT`. If it is strictly greater than
+ * :macro:`NGHTTP2_MAX_WEIGHT`, it becomes
+ * :macro:`NGHTTP2_MAX_WEIGHT`.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is 0; or the |pri_spec| is NULL; or trying to
+ * depend on itself.
+ */
+NGHTTP2_EXTERN int
+nghttp2_submit_priority(nghttp2_session *session, uint8_t flags,
+ int32_t stream_id,
+ const nghttp2_priority_spec *pri_spec);
+
+/**
+ * @function
+ *
+ * Submits RST_STREAM frame to cancel/reject the stream |stream_id|
+ * with the error code |error_code|.
+ *
+ * The pre-defined error code is one of :enum:`nghttp2_error_code`.
+ *
+ * The |flags| is currently ignored and should be
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is 0.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_rst_stream(nghttp2_session *session,
+ uint8_t flags, int32_t stream_id,
+ uint32_t error_code);
+
+/**
+ * @function
+ *
+ * Stores local settings and submits SETTINGS frame. The |iv| is the
+ * pointer to the array of :type:`nghttp2_settings_entry`. The |niv|
+ * indicates the number of :type:`nghttp2_settings_entry`.
+ *
+ * The |flags| is currently ignored and should be
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ *
+ * This function does not take ownership of the |iv|. This function
+ * copies all the elements in the |iv|.
+ *
+ * While updating individual stream's local window size, if the window
+ * size becomes strictly larger than NGHTTP2_MAX_WINDOW_SIZE,
+ * RST_STREAM is issued against such a stream.
+ *
+ * SETTINGS with :enum:`nghttp2_flag.NGHTTP2_FLAG_ACK` is
+ * automatically submitted by the library and application could not
+ * send it at its will.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |iv| contains invalid value (e.g., initial window size
+ * strictly greater than (1 << 31) - 1.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_settings(nghttp2_session *session,
+ uint8_t flags,
+ const nghttp2_settings_entry *iv,
+ size_t niv);
+
+/**
+ * @function
+ *
+ * Submits PUSH_PROMISE frame.
+ *
+ * The |flags| is currently ignored. The library handles the
+ * CONTINUATION frame internally and it correctly sets END_HEADERS to
+ * the last sequence of the PUSH_PROMISE or CONTINUATION frame.
+ *
+ * The |stream_id| must be client initiated stream ID.
+ *
+ * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
+ * |nvlen| elements. The application is responsible to include
+ * required pseudo-header fields (header field whose name starts with
+ * ":") in |nva| and must place pseudo-headers before regular header
+ * fields.
+ *
+ * This function creates copies of all name/value pairs in |nva|. It
+ * also lower-cases all names in |nva|. The order of elements in
+ * |nva| is preserved. For header fields with
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
+ * header field name and value are not copied respectively. With
+ * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
+ * is responsible to pass header field name in lowercase. The
+ * application should maintain the references to them until
+ * :type:`nghttp2_on_frame_send_callback` or
+ * :type:`nghttp2_on_frame_not_send_callback` is called.
+ *
+ * The |promised_stream_user_data| is a pointer to an arbitrary data
+ * which is associated to the promised stream this frame will open and
+ * make it in reserved state. It is available using
+ * `nghttp2_session_get_stream_user_data()`. The application can
+ * access it in :type:`nghttp2_before_frame_send_callback` and
+ * :type:`nghttp2_on_frame_send_callback` of this frame.
+ *
+ * The client side is not allowed to use this function.
+ *
+ * To submit response headers and data, use
+ * `nghttp2_submit_response()`.
+ *
+ * This function returns assigned promised stream ID if it succeeds,
+ * or one of the following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
+ * This function was invoked when |session| is initialized as
+ * client.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
+ * No stream ID is available because maximum stream ID was
+ * reached.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is 0; The |stream_id| does not designate stream
+ * that peer initiated.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_CLOSED`
+ * The stream was already closed; or the |stream_id| is invalid.
+ *
+ * .. warning::
+ *
+ * This function returns assigned promised stream ID if it succeeds.
+ * As of 1.16.0, stream object for pushed resource is created when
+ * this function succeeds. In that case, the application can submit
+ * push response for the promised frame.
+ *
+ * In 1.15.0 or prior versions, pushed stream is not opened yet when
+ * this function succeeds. The application must not submit frame to
+ * that stream ID before :type:`nghttp2_before_frame_send_callback`
+ * is called for this frame.
+ *
+ */
+NGHTTP2_EXTERN int32_t nghttp2_submit_push_promise(
+ nghttp2_session *session, uint8_t flags, int32_t stream_id,
+ const nghttp2_nv *nva, size_t nvlen, void *promised_stream_user_data);
+
+/**
+ * @function
+ *
+ * Submits PING frame. You don't have to send PING back when you
+ * received PING frame. The library automatically submits PING frame
+ * in this case.
+ *
+ * The |flags| is bitwise OR of 0 or more of the following value.
+ *
+ * * :enum:`nghttp2_flag.NGHTTP2_FLAG_ACK`
+ *
+ * Unless `nghttp2_option_set_no_auto_ping_ack()` is used, the |flags|
+ * should be :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ *
+ * If the |opaque_data| is non ``NULL``, then it should point to the 8
+ * bytes array of memory to specify opaque data to send with PING
+ * frame. If the |opaque_data| is ``NULL``, zero-cleared 8 bytes will
+ * be sent as opaque data.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_ping(nghttp2_session *session, uint8_t flags,
+ const uint8_t *opaque_data);
+
+/**
+ * @function
+ *
+ * Submits GOAWAY frame with the last stream ID |last_stream_id| and
+ * the error code |error_code|.
+ *
+ * The pre-defined error code is one of :enum:`nghttp2_error_code`.
+ *
+ * The |flags| is currently ignored and should be
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ *
+ * The |last_stream_id| is peer's stream ID or 0. So if |session| is
+ * initialized as client, |last_stream_id| must be even or 0. If
+ * |session| is initialized as server, |last_stream_id| must be odd or
+ * 0.
+ *
+ * The HTTP/2 specification says last_stream_id must not be increased
+ * from the value previously sent. So the actual value sent as
+ * last_stream_id is the minimum value between the given
+ * |last_stream_id| and the last_stream_id previously sent to the
+ * peer.
+ *
+ * If the |opaque_data| is not ``NULL`` and |opaque_data_len| is not
+ * zero, those data will be sent as additional debug data. The
+ * library makes a copy of the memory region pointed by |opaque_data|
+ * with the length |opaque_data_len|, so the caller does not need to
+ * keep this memory after the return of this function. If the
+ * |opaque_data_len| is 0, the |opaque_data| could be ``NULL``.
+ *
+ * After successful transmission of GOAWAY, following things happen.
+ * All incoming streams having strictly more than |last_stream_id| are
+ * closed. All incoming HEADERS which starts new stream are simply
+ * ignored. After all active streams are handled, both
+ * `nghttp2_session_want_read()` and `nghttp2_session_want_write()`
+ * return 0 and the application can close session.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |opaque_data_len| is too large; the |last_stream_id| is
+ * invalid.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_goaway(nghttp2_session *session,
+ uint8_t flags, int32_t last_stream_id,
+ uint32_t error_code,
+ const uint8_t *opaque_data,
+ size_t opaque_data_len);
+
+/**
+ * @function
+ *
+ * Returns the last stream ID of a stream for which
+ * :type:`nghttp2_on_frame_recv_callback` was invoked most recently.
+ * The returned value can be used as last_stream_id parameter for
+ * `nghttp2_submit_goaway()` and
+ * `nghttp2_session_terminate_session2()`.
+ *
+ * This function always succeeds.
+ */
+NGHTTP2_EXTERN int32_t
+nghttp2_session_get_last_proc_stream_id(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns nonzero if new request can be sent from local endpoint.
+ *
+ * This function return 0 if request is not allowed for this session.
+ * There are several reasons why request is not allowed. Some of the
+ * reasons are: session is server; stream ID has been spent; GOAWAY
+ * has been sent or received.
+ *
+ * The application can call `nghttp2_submit_request()` without
+ * consulting this function. In that case, `nghttp2_submit_request()`
+ * may return error. Or, request is failed to sent, and
+ * :type:`nghttp2_on_stream_close_callback` is called.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_check_request_allowed(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns nonzero if |session| is initialized as server side session.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_check_server_session(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Submits WINDOW_UPDATE frame.
+ *
+ * The |flags| is currently ignored and should be
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ *
+ * The |stream_id| is the stream ID to send this WINDOW_UPDATE. To
+ * send connection level WINDOW_UPDATE, specify 0 to |stream_id|.
+ *
+ * If the |window_size_increment| is positive, the WINDOW_UPDATE with
+ * that value as window_size_increment is queued. If the
+ * |window_size_increment| is larger than the received bytes from the
+ * remote endpoint, the local window size is increased by that
+ * difference. If the sole purpose is to increase the local window
+ * size, consider to use `nghttp2_session_set_local_window_size()`.
+ *
+ * If the |window_size_increment| is negative, the local window size
+ * is decreased by -|window_size_increment|. If automatic
+ * WINDOW_UPDATE is enabled
+ * (`nghttp2_option_set_no_auto_window_update()`), and the library
+ * decided that the WINDOW_UPDATE should be submitted, then
+ * WINDOW_UPDATE is queued with the current received bytes count. If
+ * the sole purpose is to decrease the local window size, consider to
+ * use `nghttp2_session_set_local_window_size()`.
+ *
+ * If the |window_size_increment| is 0, the function does nothing and
+ * returns 0.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_FLOW_CONTROL`
+ * The local window size overflow or gets negative.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_window_update(nghttp2_session *session,
+ uint8_t flags,
+ int32_t stream_id,
+ int32_t window_size_increment);
+
+/**
+ * @function
+ *
+ * Set local window size (local endpoints's window size) to the given
+ * |window_size| for the given stream denoted by |stream_id|. To
+ * change connection level window size, specify 0 to |stream_id|. To
+ * increase window size, this function may submit WINDOW_UPDATE frame
+ * to transmission queue.
+ *
+ * The |flags| is currently ignored and should be
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ *
+ * This sounds similar to `nghttp2_submit_window_update()`, but there
+ * are 2 differences. The first difference is that this function
+ * takes the absolute value of window size to set, rather than the
+ * delta. To change the window size, this may be easier to use since
+ * the application just declares the intended window size, rather than
+ * calculating delta. The second difference is that
+ * `nghttp2_submit_window_update()` affects the received bytes count
+ * which has not acked yet. By the specification of
+ * `nghttp2_submit_window_update()`, to strictly increase the local
+ * window size, we have to submit delta including all received bytes
+ * count, which might not be desirable in some cases. On the other
+ * hand, this function does not affect the received bytes count. It
+ * just sets the local window size to the given value.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The |stream_id| is negative.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int
+nghttp2_session_set_local_window_size(nghttp2_session *session, uint8_t flags,
+ int32_t stream_id, int32_t window_size);
+
+/**
+ * @function
+ *
+ * Submits extension frame.
+ *
+ * Application can pass arbitrary frame flags and stream ID in |flags|
+ * and |stream_id| respectively. The |payload| is opaque pointer, and
+ * it can be accessible though ``frame->ext.payload`` in
+ * :type:`nghttp2_pack_extension_callback`. The library will not own
+ * passed |payload| pointer.
+ *
+ * The application must set :type:`nghttp2_pack_extension_callback`
+ * using `nghttp2_session_callbacks_set_pack_extension_callback()`.
+ *
+ * The application should retain the memory pointed by |payload| until
+ * the transmission of extension frame is done (which is indicated by
+ * :type:`nghttp2_on_frame_send_callback`), or transmission fails
+ * (which is indicated by :type:`nghttp2_on_frame_not_send_callback`).
+ * If application does not touch this memory region after packing it
+ * into a wire format, application can free it inside
+ * :type:`nghttp2_pack_extension_callback`.
+ *
+ * The standard HTTP/2 frame cannot be sent with this function, so
+ * |type| must be strictly grater than 0x9. Otherwise, this function
+ * will fail with error code
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ * If :type:`nghttp2_pack_extension_callback` is not set.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * If |type| specifies standard HTTP/2 frame type. The frame
+ * types in the rage [0x0, 0x9], both inclusive, are standard
+ * HTTP/2 frame type, and cannot be sent using this function.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory
+ */
+NGHTTP2_EXTERN int nghttp2_submit_extension(nghttp2_session *session,
+ uint8_t type, uint8_t flags,
+ int32_t stream_id, void *payload);
+
+/**
+ * @struct
+ *
+ * The payload of ALTSVC frame. ALTSVC frame is a non-critical
+ * extension to HTTP/2. If this frame is received, and
+ * `nghttp2_option_set_user_recv_extension_type()` is not set, and
+ * `nghttp2_option_set_builtin_recv_extension_type()` is set for
+ * :enum:`nghttp2_frame_type.NGHTTP2_ALTSVC`,
+ * ``nghttp2_extension.payload`` will point to this struct.
+ *
+ * It has the following members:
+ */
+typedef struct {
+ /**
+ * The pointer to origin which this alternative service is
+ * associated with. This is not necessarily NULL-terminated.
+ */
+ uint8_t *origin;
+ /**
+ * The length of the |origin|.
+ */
+ size_t origin_len;
+ /**
+ * The pointer to Alt-Svc field value contained in ALTSVC frame.
+ * This is not necessarily NULL-terminated.
+ */
+ uint8_t *field_value;
+ /**
+ * The length of the |field_value|.
+ */
+ size_t field_value_len;
+} nghttp2_ext_altsvc;
+
+/**
+ * @function
+ *
+ * Submits ALTSVC frame.
+ *
+ * ALTSVC frame is a non-critical extension to HTTP/2, and defined in
+ * `RFC 7383 <https://tools.ietf.org/html/rfc7838#section-4>`_.
+ *
+ * The |flags| is currently ignored and should be
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ *
+ * The |origin| points to the origin this alternative service is
+ * associated with. The |origin_len| is the length of the origin. If
+ * |stream_id| is 0, the origin must be specified. If |stream_id| is
+ * not zero, the origin must be empty (in other words, |origin_len|
+ * must be 0).
+ *
+ * The ALTSVC frame is only usable from server side. If this function
+ * is invoked with client side session, this function returns
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ * The function is called from client side session
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * The sum of |origin_len| and |field_value_len| is larger than
+ * 16382; or |origin_len| is 0 while |stream_id| is 0; or
+ * |origin_len| is not 0 while |stream_id| is not 0.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_altsvc(nghttp2_session *session,
+ uint8_t flags, int32_t stream_id,
+ const uint8_t *origin,
+ size_t origin_len,
+ const uint8_t *field_value,
+ size_t field_value_len);
+
+/**
+ * @struct
+ *
+ * The single entry of an origin.
+ */
+typedef struct {
+ /**
+ * The pointer to origin. No validation is made against this field
+ * by the library. This is not necessarily NULL-terminated.
+ */
+ uint8_t *origin;
+ /**
+ * The length of the |origin|.
+ */
+ size_t origin_len;
+} nghttp2_origin_entry;
+
+/**
+ * @struct
+ *
+ * The payload of ORIGIN frame. ORIGIN frame is a non-critical
+ * extension to HTTP/2 and defined by `RFC 8336
+ * <https://tools.ietf.org/html/rfc8336>`_.
+ *
+ * If this frame is received, and
+ * `nghttp2_option_set_user_recv_extension_type()` is not set, and
+ * `nghttp2_option_set_builtin_recv_extension_type()` is set for
+ * :enum:`nghttp2_frame_type.NGHTTP2_ORIGIN`,
+ * ``nghttp2_extension.payload`` will point to this struct.
+ *
+ * It has the following members:
+ */
+typedef struct {
+ /**
+ * The number of origins contained in |ov|.
+ */
+ size_t nov;
+ /**
+ * The pointer to the array of origins contained in ORIGIN frame.
+ */
+ nghttp2_origin_entry *ov;
+} nghttp2_ext_origin;
+
+/**
+ * @function
+ *
+ * Submits ORIGIN frame.
+ *
+ * ORIGIN frame is a non-critical extension to HTTP/2 and defined by
+ * `RFC 8336 <https://tools.ietf.org/html/rfc8336>`_.
+ *
+ * The |flags| is currently ignored and should be
+ * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
+ *
+ * The |ov| points to the array of origins. The |nov| specifies the
+ * number of origins included in |ov|. This function creates copies
+ * of all elements in |ov|.
+ *
+ * The ORIGIN frame is only usable by a server. If this function is
+ * invoked with client side session, this function returns
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ * The function is called from client side session.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
+ * There are too many origins, or an origin is too large to fit
+ * into a default frame payload.
+ */
+NGHTTP2_EXTERN int nghttp2_submit_origin(nghttp2_session *session,
+ uint8_t flags,
+ const nghttp2_origin_entry *ov,
+ size_t nov);
+
+/**
+ * @function
+ *
+ * Compares ``lhs->name`` of length ``lhs->namelen`` bytes and
+ * ``rhs->name`` of length ``rhs->namelen`` bytes. Returns negative
+ * integer if ``lhs->name`` is found to be less than ``rhs->name``; or
+ * returns positive integer if ``lhs->name`` is found to be greater
+ * than ``rhs->name``; or returns 0 otherwise.
+ */
+NGHTTP2_EXTERN int nghttp2_nv_compare_name(const nghttp2_nv *lhs,
+ const nghttp2_nv *rhs);
+
+/**
+ * @function
+ *
+ * A helper function for dealing with NPN in client side or ALPN in
+ * server side. The |in| contains peer's protocol list in preferable
+ * order. The format of |in| is length-prefixed and not
+ * null-terminated. For example, ``h2`` and
+ * ``http/1.1`` stored in |in| like this::
+ *
+ * in[0] = 2
+ * in[1..2] = "h2"
+ * in[3] = 8
+ * in[4..11] = "http/1.1"
+ * inlen = 12
+ *
+ * The selection algorithm is as follows:
+ *
+ * 1. If peer's list contains HTTP/2 protocol the library supports,
+ * it is selected and returns 1. The following step is not taken.
+ *
+ * 2. If peer's list contains ``http/1.1``, this function selects
+ * ``http/1.1`` and returns 0. The following step is not taken.
+ *
+ * 3. This function selects nothing and returns -1 (So called
+ * non-overlap case). In this case, |out| and |outlen| are left
+ * untouched.
+ *
+ * Selecting ``h2`` means that ``h2`` is written into |*out| and its
+ * length (which is 2) is assigned to |*outlen|.
+ *
+ * For ALPN, refer to https://tools.ietf.org/html/rfc7301
+ *
+ * See http://technotes.googlecode.com/git/nextprotoneg.html for more
+ * details about NPN.
+ *
+ * For NPN, to use this method you should do something like::
+ *
+ * static int select_next_proto_cb(SSL* ssl,
+ * unsigned char **out,
+ * unsigned char *outlen,
+ * const unsigned char *in,
+ * unsigned int inlen,
+ * void *arg)
+ * {
+ * int rv;
+ * rv = nghttp2_select_next_protocol(out, outlen, in, inlen);
+ * if (rv == -1) {
+ * return SSL_TLSEXT_ERR_NOACK;
+ * }
+ * if (rv == 1) {
+ * ((MyType*)arg)->http2_selected = 1;
+ * }
+ * return SSL_TLSEXT_ERR_OK;
+ * }
+ * ...
+ * SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, my_obj);
+ *
+ */
+NGHTTP2_EXTERN int nghttp2_select_next_protocol(unsigned char **out,
+ unsigned char *outlen,
+ const unsigned char *in,
+ unsigned int inlen);
+
+/**
+ * @function
+ *
+ * Returns a pointer to a nghttp2_info struct with version information
+ * about the run-time library in use. The |least_version| argument
+ * can be set to a 24 bit numerical value for the least accepted
+ * version number and if the condition is not met, this function will
+ * return a ``NULL``. Pass in 0 to skip the version checking.
+ */
+NGHTTP2_EXTERN nghttp2_info *nghttp2_version(int least_version);
+
+/**
+ * @function
+ *
+ * Returns nonzero if the :type:`nghttp2_error` library error code
+ * |lib_error| is fatal.
+ */
+NGHTTP2_EXTERN int nghttp2_is_fatal(int lib_error_code);
+
+/**
+ * @function
+ *
+ * Returns nonzero if HTTP header field name |name| of length |len| is
+ * valid according to http://tools.ietf.org/html/rfc7230#section-3.2
+ *
+ * Because this is a header field name in HTTP2, the upper cased alphabet
+ * is treated as error.
+ */
+NGHTTP2_EXTERN int nghttp2_check_header_name(const uint8_t *name, size_t len);
+
+/**
+ * @function
+ *
+ * Returns nonzero if HTTP header field value |value| of length |len|
+ * is valid according to
+ * http://tools.ietf.org/html/rfc7230#section-3.2
+ */
+NGHTTP2_EXTERN int nghttp2_check_header_value(const uint8_t *value, size_t len);
+
+/**
+ * @function
+ *
+ * Returns nonzero if the |value| which is supposed to the value of
+ * :authority or host header field is valid according to
+ * https://tools.ietf.org/html/rfc3986#section-3.2
+ *
+ * |value| is valid if it merely consists of the allowed characters.
+ * In particular, it does not check whether |value| follows the syntax
+ * of authority.
+ */
+NGHTTP2_EXTERN int nghttp2_check_authority(const uint8_t *value, size_t len);
+
+/* HPACK API */
+
+struct nghttp2_hd_deflater;
+
+/**
+ * @struct
+ *
+ * HPACK deflater object.
+ */
+typedef struct nghttp2_hd_deflater nghttp2_hd_deflater;
+
+/**
+ * @function
+ *
+ * Initializes |*deflater_ptr| for deflating name/values pairs.
+ *
+ * The |max_deflate_dynamic_table_size| is the upper bound of header
+ * table size the deflater will use.
+ *
+ * If this function fails, |*deflater_ptr| is left untouched.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int
+nghttp2_hd_deflate_new(nghttp2_hd_deflater **deflater_ptr,
+ size_t max_deflate_dynamic_table_size);
+
+/**
+ * @function
+ *
+ * Like `nghttp2_hd_deflate_new()`, but with additional custom memory
+ * allocator specified in the |mem|.
+ *
+ * The |mem| can be ``NULL`` and the call is equivalent to
+ * `nghttp2_hd_deflate_new()`.
+ *
+ * This function does not take ownership |mem|. The application is
+ * responsible for freeing |mem|.
+ *
+ * The library code does not refer to |mem| pointer after this
+ * function returns, so the application can safely free it.
+ */
+NGHTTP2_EXTERN int
+nghttp2_hd_deflate_new2(nghttp2_hd_deflater **deflater_ptr,
+ size_t max_deflate_dynamic_table_size,
+ nghttp2_mem *mem);
+
+/**
+ * @function
+ *
+ * Deallocates any resources allocated for |deflater|.
+ */
+NGHTTP2_EXTERN void nghttp2_hd_deflate_del(nghttp2_hd_deflater *deflater);
+
+/**
+ * @function
+ *
+ * Changes header table size of the |deflater| to
+ * |settings_max_dynamic_table_size| bytes. This may trigger eviction
+ * in the dynamic table.
+ *
+ * The |settings_max_dynamic_table_size| should be the value received
+ * in SETTINGS_HEADER_TABLE_SIZE.
+ *
+ * The deflater never uses more memory than
+ * ``max_deflate_dynamic_table_size`` bytes specified in
+ * `nghttp2_hd_deflate_new()`. Therefore, if
+ * |settings_max_dynamic_table_size| >
+ * ``max_deflate_dynamic_table_size``, resulting maximum table size
+ * becomes ``max_deflate_dynamic_table_size``.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int
+nghttp2_hd_deflate_change_table_size(nghttp2_hd_deflater *deflater,
+ size_t settings_max_dynamic_table_size);
+
+/**
+ * @function
+ *
+ * Deflates the |nva|, which has the |nvlen| name/value pairs, into
+ * the |buf| of length |buflen|.
+ *
+ * If |buf| is not large enough to store the deflated header block,
+ * this function fails with
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`. The caller
+ * should use `nghttp2_hd_deflate_bound()` to know the upper bound of
+ * buffer size required to deflate given header name/value pairs.
+ *
+ * Once this function fails, subsequent call of this function always
+ * returns :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`.
+ *
+ * After this function returns, it is safe to delete the |nva|.
+ *
+ * This function returns the number of bytes written to |buf| if it
+ * succeeds, or one of the following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
+ * Deflation process has failed.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
+ * The provided |buflen| size is too small to hold the output.
+ */
+NGHTTP2_EXTERN ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater,
+ uint8_t *buf, size_t buflen,
+ const nghttp2_nv *nva,
+ size_t nvlen);
+
+/**
+ * @function
+ *
+ * Deflates the |nva|, which has the |nvlen| name/value pairs, into
+ * the |veclen| size of buf vector |vec|. The each size of buffer
+ * must be set in len field of :type:`nghttp2_vec`. If and only if
+ * one chunk is filled up completely, next chunk will be used. If
+ * |vec| is not large enough to store the deflated header block, this
+ * function fails with
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`. The caller
+ * should use `nghttp2_hd_deflate_bound()` to know the upper bound of
+ * buffer size required to deflate given header name/value pairs.
+ *
+ * Once this function fails, subsequent call of this function always
+ * returns :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`.
+ *
+ * After this function returns, it is safe to delete the |nva|.
+ *
+ * This function returns the number of bytes written to |vec| if it
+ * succeeds, or one of the following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
+ * Deflation process has failed.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
+ * The provided |buflen| size is too small to hold the output.
+ */
+NGHTTP2_EXTERN ssize_t nghttp2_hd_deflate_hd_vec(nghttp2_hd_deflater *deflater,
+ const nghttp2_vec *vec,
+ size_t veclen,
+ const nghttp2_nv *nva,
+ size_t nvlen);
+
+/**
+ * @function
+ *
+ * Returns an upper bound on the compressed size after deflation of
+ * |nva| of length |nvlen|.
+ */
+NGHTTP2_EXTERN size_t nghttp2_hd_deflate_bound(nghttp2_hd_deflater *deflater,
+ const nghttp2_nv *nva,
+ size_t nvlen);
+
+/**
+ * @function
+ *
+ * Returns the number of entries that header table of |deflater|
+ * contains. This is the sum of the number of static table and
+ * dynamic table, so the return value is at least 61.
+ */
+NGHTTP2_EXTERN
+size_t nghttp2_hd_deflate_get_num_table_entries(nghttp2_hd_deflater *deflater);
+
+/**
+ * @function
+ *
+ * Returns the table entry denoted by |idx| from header table of
+ * |deflater|. The |idx| is 1-based, and idx=1 returns first entry of
+ * static table. idx=62 returns first entry of dynamic table if it
+ * exists. Specifying idx=0 is error, and this function returns NULL.
+ * If |idx| is strictly greater than the number of entries the tables
+ * contain, this function returns NULL.
+ */
+NGHTTP2_EXTERN
+const nghttp2_nv *
+nghttp2_hd_deflate_get_table_entry(nghttp2_hd_deflater *deflater, size_t idx);
+
+/**
+ * @function
+ *
+ * Returns the used dynamic table size, including the overhead 32
+ * bytes per entry described in RFC 7541.
+ */
+NGHTTP2_EXTERN
+size_t nghttp2_hd_deflate_get_dynamic_table_size(nghttp2_hd_deflater *deflater);
+
+/**
+ * @function
+ *
+ * Returns the maximum dynamic table size.
+ */
+NGHTTP2_EXTERN
+size_t
+nghttp2_hd_deflate_get_max_dynamic_table_size(nghttp2_hd_deflater *deflater);
+
+struct nghttp2_hd_inflater;
+
+/**
+ * @struct
+ *
+ * HPACK inflater object.
+ */
+typedef struct nghttp2_hd_inflater nghttp2_hd_inflater;
+
+/**
+ * @function
+ *
+ * Initializes |*inflater_ptr| for inflating name/values pairs.
+ *
+ * If this function fails, |*inflater_ptr| is left untouched.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ */
+NGHTTP2_EXTERN int nghttp2_hd_inflate_new(nghttp2_hd_inflater **inflater_ptr);
+
+/**
+ * @function
+ *
+ * Like `nghttp2_hd_inflate_new()`, but with additional custom memory
+ * allocator specified in the |mem|.
+ *
+ * The |mem| can be ``NULL`` and the call is equivalent to
+ * `nghttp2_hd_inflate_new()`.
+ *
+ * This function does not take ownership |mem|. The application is
+ * responsible for freeing |mem|.
+ *
+ * The library code does not refer to |mem| pointer after this
+ * function returns, so the application can safely free it.
+ */
+NGHTTP2_EXTERN int nghttp2_hd_inflate_new2(nghttp2_hd_inflater **inflater_ptr,
+ nghttp2_mem *mem);
+
+/**
+ * @function
+ *
+ * Deallocates any resources allocated for |inflater|.
+ */
+NGHTTP2_EXTERN void nghttp2_hd_inflate_del(nghttp2_hd_inflater *inflater);
+
+/**
+ * @function
+ *
+ * Changes header table size in the |inflater|. This may trigger
+ * eviction in the dynamic table.
+ *
+ * The |settings_max_dynamic_table_size| should be the value
+ * transmitted in SETTINGS_HEADER_TABLE_SIZE.
+ *
+ * This function must not be called while header block is being
+ * inflated. In other words, this function must be called after
+ * initialization of |inflater|, but before calling
+ * `nghttp2_hd_inflate_hd2()`, or after
+ * `nghttp2_hd_inflate_end_headers()`. Otherwise,
+ * `NGHTTP2_ERR_INVALID_STATE` was returned.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
+ * The function is called while header block is being inflated.
+ * Probably, application missed to call
+ * `nghttp2_hd_inflate_end_headers()`.
+ */
+NGHTTP2_EXTERN int
+nghttp2_hd_inflate_change_table_size(nghttp2_hd_inflater *inflater,
+ size_t settings_max_dynamic_table_size);
+
+/**
+ * @enum
+ *
+ * The flags for header inflation.
+ */
+typedef enum {
+ /**
+ * No flag set.
+ */
+ NGHTTP2_HD_INFLATE_NONE = 0,
+ /**
+ * Indicates all headers were inflated.
+ */
+ NGHTTP2_HD_INFLATE_FINAL = 0x01,
+ /**
+ * Indicates a header was emitted.
+ */
+ NGHTTP2_HD_INFLATE_EMIT = 0x02
+} nghttp2_hd_inflate_flag;
+
+/**
+ * @function
+ *
+ * .. warning::
+ *
+ * Deprecated. Use `nghttp2_hd_inflate_hd2()` instead.
+ *
+ * Inflates name/value block stored in |in| with length |inlen|. This
+ * function performs decompression. For each successful emission of
+ * header name/value pair,
+ * :enum:`nghttp2_hd_inflate_flag.NGHTTP2_HD_INFLATE_EMIT` is set in
+ * |*inflate_flags| and name/value pair is assigned to the |nv_out|
+ * and the function returns. The caller must not free the members of
+ * |nv_out|.
+ *
+ * The |nv_out| may include pointers to the memory region in the |in|.
+ * The caller must retain the |in| while the |nv_out| is used.
+ *
+ * The application should call this function repeatedly until the
+ * ``(*inflate_flags) & NGHTTP2_HD_INFLATE_FINAL`` is nonzero and
+ * return value is non-negative. This means the all input values are
+ * processed successfully. Then the application must call
+ * `nghttp2_hd_inflate_end_headers()` to prepare for the next header
+ * block input.
+ *
+ * The caller can feed complete compressed header block. It also can
+ * feed it in several chunks. The caller must set |in_final| to
+ * nonzero if the given input is the last block of the compressed
+ * header.
+ *
+ * This function returns the number of bytes processed if it succeeds,
+ * or one of the following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
+ * Inflation process has failed.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_BUFFER_ERROR`
+ * The header field name or value is too large.
+ *
+ * Example follows::
+ *
+ * int inflate_header_block(nghttp2_hd_inflater *hd_inflater,
+ * uint8_t *in, size_t inlen, int final)
+ * {
+ * ssize_t rv;
+ *
+ * for(;;) {
+ * nghttp2_nv nv;
+ * int inflate_flags = 0;
+ *
+ * rv = nghttp2_hd_inflate_hd(hd_inflater, &nv, &inflate_flags,
+ * in, inlen, final);
+ *
+ * if(rv < 0) {
+ * fprintf(stderr, "inflate failed with error code %zd", rv);
+ * return -1;
+ * }
+ *
+ * in += rv;
+ * inlen -= rv;
+ *
+ * if(inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
+ * fwrite(nv.name, nv.namelen, 1, stderr);
+ * fprintf(stderr, ": ");
+ * fwrite(nv.value, nv.valuelen, 1, stderr);
+ * fprintf(stderr, "\n");
+ * }
+ * if(inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
+ * nghttp2_hd_inflate_end_headers(hd_inflater);
+ * break;
+ * }
+ * if((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 &&
+ * inlen == 0) {
+ * break;
+ * }
+ * }
+ *
+ * return 0;
+ * }
+ *
+ */
+NGHTTP2_EXTERN ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_inflater *inflater,
+ nghttp2_nv *nv_out,
+ int *inflate_flags, uint8_t *in,
+ size_t inlen, int in_final);
+
+/**
+ * @function
+ *
+ * Inflates name/value block stored in |in| with length |inlen|. This
+ * function performs decompression. For each successful emission of
+ * header name/value pair,
+ * :enum:`nghttp2_hd_inflate_flag.NGHTTP2_HD_INFLATE_EMIT` is set in
+ * |*inflate_flags| and name/value pair is assigned to the |nv_out|
+ * and the function returns. The caller must not free the members of
+ * |nv_out|.
+ *
+ * The |nv_out| may include pointers to the memory region in the |in|.
+ * The caller must retain the |in| while the |nv_out| is used.
+ *
+ * The application should call this function repeatedly until the
+ * ``(*inflate_flags) & NGHTTP2_HD_INFLATE_FINAL`` is nonzero and
+ * return value is non-negative. If that happens, all given input
+ * data (|inlen| bytes) are processed successfully. Then the
+ * application must call `nghttp2_hd_inflate_end_headers()` to prepare
+ * for the next header block input.
+ *
+ * In other words, if |in_final| is nonzero, and this function returns
+ * |inlen|, you can assert that
+ * :enum:`nghttp2_hd_inflate_final.NGHTTP2_HD_INFLATE_FINAL` is set in
+ * |*inflate_flags|.
+ *
+ * The caller can feed complete compressed header block. It also can
+ * feed it in several chunks. The caller must set |in_final| to
+ * nonzero if the given input is the last block of the compressed
+ * header.
+ *
+ * This function returns the number of bytes processed if it succeeds,
+ * or one of the following negative error codes:
+ *
+ * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
+ * Out of memory.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
+ * Inflation process has failed.
+ * :enum:`nghttp2_error.NGHTTP2_ERR_BUFFER_ERROR`
+ * The header field name or value is too large.
+ *
+ * Example follows::
+ *
+ * int inflate_header_block(nghttp2_hd_inflater *hd_inflater,
+ * uint8_t *in, size_t inlen, int final)
+ * {
+ * ssize_t rv;
+ *
+ * for(;;) {
+ * nghttp2_nv nv;
+ * int inflate_flags = 0;
+ *
+ * rv = nghttp2_hd_inflate_hd2(hd_inflater, &nv, &inflate_flags,
+ * in, inlen, final);
+ *
+ * if(rv < 0) {
+ * fprintf(stderr, "inflate failed with error code %zd", rv);
+ * return -1;
+ * }
+ *
+ * in += rv;
+ * inlen -= rv;
+ *
+ * if(inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
+ * fwrite(nv.name, nv.namelen, 1, stderr);
+ * fprintf(stderr, ": ");
+ * fwrite(nv.value, nv.valuelen, 1, stderr);
+ * fprintf(stderr, "\n");
+ * }
+ * if(inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
+ * nghttp2_hd_inflate_end_headers(hd_inflater);
+ * break;
+ * }
+ * if((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 &&
+ * inlen == 0) {
+ * break;
+ * }
+ * }
+ *
+ * return 0;
+ * }
+ *
+ */
+NGHTTP2_EXTERN ssize_t nghttp2_hd_inflate_hd2(nghttp2_hd_inflater *inflater,
+ nghttp2_nv *nv_out,
+ int *inflate_flags,
+ const uint8_t *in, size_t inlen,
+ int in_final);
+
+/**
+ * @function
+ *
+ * Signals the end of decompression for one header block.
+ *
+ * This function returns 0 if it succeeds. Currently this function
+ * always succeeds.
+ */
+NGHTTP2_EXTERN int
+nghttp2_hd_inflate_end_headers(nghttp2_hd_inflater *inflater);
+
+/**
+ * @function
+ *
+ * Returns the number of entries that header table of |inflater|
+ * contains. This is the sum of the number of static table and
+ * dynamic table, so the return value is at least 61.
+ */
+NGHTTP2_EXTERN
+size_t nghttp2_hd_inflate_get_num_table_entries(nghttp2_hd_inflater *inflater);
+
+/**
+ * @function
+ *
+ * Returns the table entry denoted by |idx| from header table of
+ * |inflater|. The |idx| is 1-based, and idx=1 returns first entry of
+ * static table. idx=62 returns first entry of dynamic table if it
+ * exists. Specifying idx=0 is error, and this function returns NULL.
+ * If |idx| is strictly greater than the number of entries the tables
+ * contain, this function returns NULL.
+ */
+NGHTTP2_EXTERN
+const nghttp2_nv *
+nghttp2_hd_inflate_get_table_entry(nghttp2_hd_inflater *inflater, size_t idx);
+
+/**
+ * @function
+ *
+ * Returns the used dynamic table size, including the overhead 32
+ * bytes per entry described in RFC 7541.
+ */
+NGHTTP2_EXTERN
+size_t nghttp2_hd_inflate_get_dynamic_table_size(nghttp2_hd_inflater *inflater);
+
+/**
+ * @function
+ *
+ * Returns the maximum dynamic table size.
+ */
+NGHTTP2_EXTERN
+size_t
+nghttp2_hd_inflate_get_max_dynamic_table_size(nghttp2_hd_inflater *inflater);
+
+struct nghttp2_stream;
+
+/**
+ * @struct
+ *
+ * The structure to represent HTTP/2 stream. The details of this
+ * structure are intentionally hidden from the public API.
+ */
+typedef struct nghttp2_stream nghttp2_stream;
+
+/**
+ * @function
+ *
+ * Returns pointer to :type:`nghttp2_stream` object denoted by
+ * |stream_id|. If stream was not found, returns NULL.
+ *
+ * Returns imaginary root stream (see
+ * `nghttp2_session_get_root_stream()`) if 0 is given in |stream_id|.
+ *
+ * Unless |stream_id| == 0, the returned pointer is valid until next
+ * call of `nghttp2_session_send()`, `nghttp2_session_mem_send()`,
+ * `nghttp2_session_recv()`, and `nghttp2_session_mem_recv()`.
+ */
+NGHTTP2_EXTERN nghttp2_stream *
+nghttp2_session_find_stream(nghttp2_session *session, int32_t stream_id);
+
+/**
+ * @enum
+ *
+ * State of stream as described in RFC 7540.
+ */
+typedef enum {
+ /**
+ * idle state.
+ */
+ NGHTTP2_STREAM_STATE_IDLE = 1,
+ /**
+ * open state.
+ */
+ NGHTTP2_STREAM_STATE_OPEN,
+ /**
+ * reserved (local) state.
+ */
+ NGHTTP2_STREAM_STATE_RESERVED_LOCAL,
+ /**
+ * reserved (remote) state.
+ */
+ NGHTTP2_STREAM_STATE_RESERVED_REMOTE,
+ /**
+ * half closed (local) state.
+ */
+ NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL,
+ /**
+ * half closed (remote) state.
+ */
+ NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE,
+ /**
+ * closed state.
+ */
+ NGHTTP2_STREAM_STATE_CLOSED
+} nghttp2_stream_proto_state;
+
+/**
+ * @function
+ *
+ * Returns state of |stream|. The root stream retrieved by
+ * `nghttp2_session_get_root_stream()` will have stream state
+ * :enum:`nghttp2_stream_proto_state.NGHTTP2_STREAM_STATE_IDLE`.
+ */
+NGHTTP2_EXTERN nghttp2_stream_proto_state
+nghttp2_stream_get_state(nghttp2_stream *stream);
+
+/**
+ * @function
+ *
+ * Returns root of dependency tree, which is imaginary stream with
+ * stream ID 0. The returned pointer is valid until |session| is
+ * freed by `nghttp2_session_del()`.
+ */
+NGHTTP2_EXTERN nghttp2_stream *
+nghttp2_session_get_root_stream(nghttp2_session *session);
+
+/**
+ * @function
+ *
+ * Returns the parent stream of |stream| in dependency tree. Returns
+ * NULL if there is no such stream.
+ */
+NGHTTP2_EXTERN nghttp2_stream *
+nghttp2_stream_get_parent(nghttp2_stream *stream);
+
+NGHTTP2_EXTERN int32_t nghttp2_stream_get_stream_id(nghttp2_stream *stream);
+
+/**
+ * @function
+ *
+ * Returns the next sibling stream of |stream| in dependency tree.
+ * Returns NULL if there is no such stream.
+ */
+NGHTTP2_EXTERN nghttp2_stream *
+nghttp2_stream_get_next_sibling(nghttp2_stream *stream);
+
+/**
+ * @function
+ *
+ * Returns the previous sibling stream of |stream| in dependency tree.
+ * Returns NULL if there is no such stream.
+ */
+NGHTTP2_EXTERN nghttp2_stream *
+nghttp2_stream_get_previous_sibling(nghttp2_stream *stream);
+
+/**
+ * @function
+ *
+ * Returns the first child stream of |stream| in dependency tree.
+ * Returns NULL if there is no such stream.
+ */
+NGHTTP2_EXTERN nghttp2_stream *
+nghttp2_stream_get_first_child(nghttp2_stream *stream);
+
+/**
+ * @function
+ *
+ * Returns dependency weight to the parent stream of |stream|.
+ */
+NGHTTP2_EXTERN int32_t nghttp2_stream_get_weight(nghttp2_stream *stream);
+
+/**
+ * @function
+ *
+ * Returns the sum of the weight for |stream|'s children.
+ */
+NGHTTP2_EXTERN int32_t
+nghttp2_stream_get_sum_dependency_weight(nghttp2_stream *stream);
+
+/**
+ * @functypedef
+ *
+ * Callback function invoked when the library outputs debug logging.
+ * The function is called with arguments suitable for ``vfprintf(3)``
+ *
+ * The debug output is only enabled if the library is built with
+ * ``DEBUGBUILD`` macro defined.
+ */
+typedef void (*nghttp2_debug_vprintf_callback)(const char *format,
+ va_list args);
+
+/**
+ * @function
+ *
+ * Sets a debug output callback called by the library when built with
+ * ``DEBUGBUILD`` macro defined. If this option is not used, debug
+ * log is written into standard error output.
+ *
+ * For builds without ``DEBUGBUILD`` macro defined, this function is
+ * noop.
+ *
+ * Note that building with ``DEBUGBUILD`` may cause significant
+ * performance penalty to libnghttp2 because of extra processing. It
+ * should be used for debugging purpose only.
+ *
+ * .. Warning::
+ *
+ * Building with ``DEBUGBUILD`` may cause significant performance
+ * penalty to libnghttp2 because of extra processing. It should be
+ * used for debugging purpose only. We write this two times because
+ * this is important.
+ */
+NGHTTP2_EXTERN void nghttp2_set_debug_vprintf_callback(
+ nghttp2_debug_vprintf_callback debug_vprintf_callback);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NGHTTP2_H */

gpac-2.0.0.tar.gz/extra_lib/include/nghttp2/nghttp2ver.h Added

@@ -0,0 +1,42 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef NGHTTP2VER_H
+#define NGHTTP2VER_H
+
+/**
+ * @macro
+ * Version number of the nghttp2 library release
+ */
+#define NGHTTP2_VERSION "1.43.90"
+
+/**
+ * @macro
+ * Numerical representation of the version number of the nghttp2 library
+ * release. This is a 24 bit number with 8 bits for major number, 8 bits
+ * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
+ */
+#define NGHTTP2_VERSION_NUM 0x012b5a
+
+#endif /* NGHTTP2VER_H */

gpac-1.0.1.tar.gz/gpac.spec -> gpac-2.0.0.tar.gz/gpac.spec Changed

@@ -1,11 +1,11 @@
 # $Id: gpac.spec,v 1.5 2008-12-02 18:04:42 jeanlf Exp $
 Summary: Framework for production, encoding, delivery and interactive playback of multimedia content
 Name: gpac
-Version: 1.0.1
-Release: 1.0.1
+Version: 2.0
+Release: 2.0
 License: LGPL
 Group: Applications/Multimedia
-Source0: gpac-1.0.1.tar.gz%{?_with_amr:Source1:http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-700.zip}
+Source0: gpac-2.0.tar.gz
 URL: http://gpac.io/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: SDL
@@ -31,12 +31,13 @@
 
 %description
 
-GPAC is a framework for production, encoding, delivery and interactive playback of multimedia content
+GPAC is a framework for production, encoding, delivery and interactive playback of multimedia content.
 
 GPAC supports many AV codecs, multimedia containers (MP4,fMP4, TS, avi, mov, mpg, mkv ...), complex presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D) and subtitles (SRT, WebVTT, TTXT/TX3G, TTML).
-Supported inputs and outputs are pipes, UDP/TCP/UN sockets, local files, HTTP, RTP/RTSP, TS demuxing (from file, IP or DVB4Linux), ATSC 3.0 ROUTE sessions, desktop grabbing, camera/microphone inputs and any input format supported by FFmpeg.
 
-GPAC features a highly configurable media processing pipeline, and can further be extended using JavaScript.
+Supported inputs and outputs are pipes, UDP/TCP/UN sockets, local files, HTTP, DASH/HLS, RTP/RTSP, MPEG-2 TS, ATSC 3.0 ROUTE sessions, desktop grabbing, camera/microphone inputs and any input format supported by FFmpeg.
+
+GPAC features a highly configurable media processing pipeline extensible through JavaScript, and can be embedded in Python or NodeJS applications.
 
 GPAC is licensed under the GNU Lesser General Public License.

gpac-1.0.1.tar.gz/include/gpac/00_doxy.h -> gpac-2.0.0.tar.gz/include/gpac/00_doxy.h Changed

@@ -80,7 +80,7 @@
 \defgroup jsapi_grp JavaScript APIs
 \brief JavaScript API available in GPAC
 
-Parts of the GPAC code can be scriptable using JavaScript. This part of the documentation describes the various APIs used in GPAC.
+Parts of the GPAC code can be modified at run-time using JavaScript. This part of the documentation describes the various APIs used in GPAC.
 
 For SVG and DOM scenegraph API, see https://www.w3.org/TR/SVGTiny12/svgudom.html.
 
@@ -102,6 +102,10 @@
 
 There is currently no support for non-local modules (http, https ...).
 
+The default GPAC compilation includes the following modules from QuickJS:
+- 'std': documentation https://bellard.org/quickjs/quickjs.html#std-module
+- 'os': documentation https://bellard.org/quickjs/quickjs.html#os-module (see below)
+
 GPAC constants used in the API (error code, property types, specific flags for functions) are exported:
 - using the same name as native code, e.g. GF_STATS_LOCAL, GF_FILTER_SAP_1, etc...
 - in the global object of the javascript context
@@ -112,5 +116,18 @@
 Types and interfaces are described using WebIDL, see https://heycam.github.io/webidl/, with some slight modifications.
 \warning These IDL files are only intended to document the APIs, and are likely useless for other purposes.
 
+
+Notes on QuickJS 'os' module support:
+- Workers are supported on OSX, Windows, iOS and Linux; final dereference of the worker object will end the worker thread.
+- On Windows, the `exec` function retuns an array rather than an int when run in asynchronous mode. The `waitpid` function will return an array where the first item is this pid object  when the process is over, to keep the same behavious as under non Windows systems.
+- On Windows, the `exec` function ignores `uid`, `gid` and user-specified stdin/stderr/stdout.
+
+
+\defgroup pyapi_grp Python APIs
+\brief Python API for using libgpac
+
+\defgroup nodejs_grp NodeJS  APIs
+\brief API for using libgpac in NodeJS
+
 */

gpac-1.0.1.tar.gz/include/gpac/Remotery.h -> gpac-2.0.0.tar.gz/include/gpac/Remotery.h Changed

gpac-1.0.1.tar.gz/include/gpac/avparse.h -> gpac-2.0.0.tar.gz/include/gpac/avparse.h Changed

@@ -54,6 +54,7 @@
 
 
 #include <gpac/bitstream.h>
+#include <gpac/mpeg4_odf.h>
 
 
 
@@ -118,6 +119,11 @@
 	Double fps;
 	/*! position of next object in the bitstream*/
 	u32 next_object_start;
+
+	/*! progressive video sequence */
+	Bool progresive;
+	/*! chroma format */
+	u8 chroma_fmt;
 } GF_M4VDecSpecInfo;
 
 
@@ -166,7 +172,7 @@
 \param time_inc set to the time increment since last frame
 \param size set to the size of the compressed frame
 \param start set to the position of the first byte in the buffer/bitstream
-\param is_coded set to 1 if frame is coded, 0 if skip frame
+\param is_coded set to 1 if frame is coded, 0 if skip frame, untouched if no frame found
 \return error if any
 */
 GF_Err gf_m4v_parse_frame(GF_M4VParser *m4v, GF_M4VDecSpecInfo *dsi, u8 *frame_type, u32 *time_inc, u64 *size, u64 *start, Bool *is_coded);
@@ -395,9 +401,10 @@
 /*! parse profile and level from a MHAS payload
 \param ptr the MHAS payhload
 \param size size of the MHAS payhload
+\param chan_layout set to the channel layout if found, 0 otherwise - optional, may be NULL
 \return the MHAS profile found, or -1 of not found
 */
-s32 gf_mpegh_get_mhas_pl(u8 *ptr, u32 size);
+s32 gf_mpegh_get_mhas_pl(u8 *ptr, u32 size, u64 *chan_layout);
 
 /*! reads a 32 bit sync safe integer of id3v2 from a bitstream object
 \param bs the bitstream object to use - has to be positioned on the start if an id3v2 size field
@@ -469,7 +476,9 @@
 	/*! DST*/
 	GF_M4A_DST = 35,
 	/*! ALS*/
-	GF_M4A_ALS = 36
+	GF_M4A_ALS = 36,
+	/*! USAC*/
+	GF_M4A_USAC = 42,
 };
 
 /*! AAC sample rates*/
@@ -482,7 +491,7 @@
 /*! AAC channel configurations*/
 static const u32 GF_M4ANumChannels[] =
 {
-	1, 2, 3, 4, 5, 6, 8, 2, 3, 4, 7, 8, 24, 8, 12, 10, 12, 14
+	1, 2, 3, 4, 5, 6, 8, 0, 0, 0, 7, 8, 0, 8, 0
 };
 
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -496,7 +505,7 @@
 /*! MPEG-4 Audio decoder specific info*/
 typedef struct
 {
-	/*Number of channels*/
+	/*Number of channels (NOT AAC channel confgiuration), 0 if unknown in which case program_config_element must be set*/
 	u32 nb_chan;
 	/*base audio object type*/
 	u32 base_object_type;
@@ -516,6 +525,8 @@
 	Bool has_ps;
 	/*audio Profile level indication*/
 	u8 audioPL;
+	/*channel configuration, only set when parsing (when writing, recomputed from nb_chan)*/
+	u32 chan_cfg;
 
 	/*set if program config element is present - members until end of struct are ignored/invalid if this is not set*/
 	Bool program_config_element_present;
@@ -575,6 +586,8 @@
 	u8 comment_field_bytes;
 	/*comment field*/
 	u8 comments[255];
+	//set after parsing program_config_element
+	u32 cpe_channels;
 } GF_M4ADecSpecInfo;
 
 /*! parses MPEG-4 audio dsi
@@ -590,27 +603,42 @@
 */
 u32 gf_m4a_get_profile(GF_M4ADecSpecInfo *cfg);
 
-/*! writes MPEG-4 audio dsi in a byte buffer
+/*! writes MPEG-4 audio dsi in a byte buffer - backward-compatible signaling extensions are not written
 \param cfg the configuration to write
 \param dsi set to the encoded buffer (to be freed by caller)
 \param dsi_size set to the size of the encoded buffer
 \return error code if any
 */
 GF_Err gf_m4a_write_config(GF_M4ADecSpecInfo *cfg, u8 **dsi, u32 *dsi_size);
-/*! writes MPEG-4 audio dsi in a bitstream object
+/*! writes MPEG-4 audio dsi in a bitstream object - backward-compatible signaling extensions are not written
 \param bs the bitstream object to write to
 \param cfg the configuration to write
 \return error code if any
 */
 GF_Err gf_m4a_write_config_bs(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg);
 /*! parses MPEG-4 audio dsi from bitstream
-\param bs the bitstream object to use (shall start in the begining of the dsi)
+\param bs the bitstream object to use (shall start in the beginning of the dsi)
 \param cfg will be filled with the parsed value
-\param size_known set to GF_TRUE if the bitstream contains the complete DSI (and only it)
+\param size_known set to GF_TRUE if the bitstream contains the complete DSI (and only it), to parse backward-compatible extensions
 \return error code if any
 */
 GF_Err gf_m4a_parse_config(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg, Bool size_known);
 
+
+/*! reads program config element of MPEG-4 audio dsi
+\param bs the bitstream object to use (shall start in the beginning of the dsi)
+\param cfg the config to fill
+\return error code if any
+*/
+GF_Err gf_m4a_parse_program_config_element(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg);
+
+/*! writes program config element of MPEG-4 audio dsi
+\param bs the bitstream object to use (shall start in the beginning of the dsi)
+\param cfg the config to write
+\return error code if any
+*/
+GF_Err gf_m4a_write_program_config_element_bs(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg);
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 /*! gets the name of a given MPEG-4 audio object type
@@ -626,28 +654,9 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-/*! AC-3 header*/
-typedef struct
-{
-	u8 fscod, bsid, bsmod, acmod, lfon, brcode;
-	u8 asvc, num_dep_sub;
-	u16 chan_loc;
-} GF_AC3StreamInfo;
-
-/*! AC-3 header*/
-typedef struct
-{
-	u32 bitrate;
-	u32 sample_rate;
-	u32 framesize;
-	u32 channels;
-	u16 substreams; //bit-mask, used for channel map > 5.1
-	/*only set if full parse*/
-	GF_AC3StreamInfo streams[8]; //0->7 sibstream ids
-	u8 nb_streams; //main and substream, only independent ones
-	//data rate in kbps
-	u32 data_rate;
-} GF_AC3Header;
+//! \cond old name
+typedef struct __ac3_config GF_AC3Header;
+//! \endcond 
 
 /*! parses an AC-3 header from a buffer
 \param buffer buffer to parse
@@ -657,21 +666,21 @@
 \param full_parse if GF_TRUE, complete parsing of the header will be done
 \return GF_TRUE if success
 */
-Bool gf_ac3_parser(u8 *buffer, u32 buffer_size, u32 *pos, GF_AC3Header *out_hdr, Bool full_parse);
+Bool gf_ac3_parser(u8 *buffer, u32 buffer_size, u32 *pos, GF_AC3Config *out_hdr, Bool full_parse);
 /*! parses an AC-3 header from a bitstream
 \param bs bitstream to parse
 \param hdr will be filled by parser
 \param full_parse if GF_TRUE, complete parsing of the header will be done
 \return GF_TRUE if success
 */
-Bool gf_ac3_parser_bs(GF_BitStream *bs, GF_AC3Header *hdr, Bool full_parse);
+Bool gf_ac3_parser_bs(GF_BitStream *bs, GF_AC3Config *hdr, Bool full_parse);
 /*! parses an EAC-3 header from a bitstream
 \param bs bitstream to parse
 \param hdr will be filled by parser
 \param full_parse if GF_TRUE, complete parsing of the header will be done
 \return GF_TRUE if success
 */
-Bool gf_eac3_parser_bs(GF_BitStream *bs, GF_AC3Header *hdr, Bool full_parse);
+Bool gf_eac3_parser_bs(GF_BitStream *bs, GF_AC3Config *hdr, Bool full_parse);
 /*! gets the number of channels in an AC3 frame
 \param acmod acmod of the associated frame header
 \return number of channels
@@ -715,8 +724,22 @@
 */
 GF_Err gf_hevc_get_sps_info(u8 *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d);
 
+/*! gets basic information from a VVC Sequence Parameter Set
+\param sps_data SPS NAL buffer
+\param sps_size size of buffer
+\param sps_id set to the ID
+\param width set to the width
+\param height set to the height
+\param par_n set to the pixel aspect ratio numerator
+\param par_d set to the pixel aspect ratio denominator
+\return error code if any
+*/
+GF_Err gf_vvc_get_sps_info(u8 *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d);
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
+const char *gf_vvc_get_profile_name(u8 video_prof);
+
 /*! gets chroma format name from MPEG chroma format
 \param chroma_format the chroma format to query (1: 420, 2: 422, 3: 444)
 \return the name of the format
@@ -727,11 +750,12 @@
 \return the name of the profile
 */
 const char *gf_avc_get_profile_name(u8 profile_idc);
-/*! checks if an AVC profile is a range extension profile
-\param profile_idc the PL indication
-\return GF_TRUE if given profile is in range extensions
+
+/*! checks if avcc extensions are used for this profile
+ param profile_idc the PL indication
+\return GF_TRUE if extensions must be written in avcc for the given profile
 */
-Bool gf_avc_is_rext_profile(u8 profile_idc);
+Bool gf_avcc_use_extensions(u8 profile_idc);
 
 /*! gets HEVC profile name from profile indication
 \param profile_idc the PL indication

gpac-1.0.1.tar.gz/include/gpac/bitstream.h -> gpac-2.0.0.tar.gz/include/gpac/bitstream.h Changed

@@ -104,6 +104,7 @@
 \brief bitstream destructor from file handle
 
 Deletes the bitstream object. If the buffer was created by the bitstream, it is deleted if still present.
+\warning If the bitstream was constructed from a FILE object in write mode, the FILE object MUST be closed after destructing the bitstream
 \param bs the target bitstream
  */
 void gf_bs_del(GF_BitStream *bs);
@@ -178,7 +179,7 @@
 /*!
 \brief data reading
 
-Reads a data buffer. Emultation prevention byte removal is not applied here !
+Reads a data buffer. Emultation prevention byte removal is NOT applied here
 \param bs the target bitstream
 \param data the data buffer to be filled
 \param nbBytes the amount of bytes to read
@@ -486,7 +487,7 @@
 \brief byte skipping
 
 Skips bytes in the bitstream. In Write mode, this will write the 0 integer value for memory-based bitstreams or seek the stream
- for file-based bitstream. In read mode, emultation prevention byte removal is not applied !
+ for file-based bitstream. In read mode, emultation prevention byte  is applied if enabled
 \param bs the target bitstream
 \param nbBytes the number of bytes to skip
  */
@@ -623,6 +624,26 @@
  */
 u64 gf_bs_get_cookie(GF_BitStream *bs);
 
+
+/*!
+\brief Marks overflow access
+
+Marks the bitstream as overflown (reading outside of buffer range). Marking is done automatically when reading but can be forced using this function.
+
+\param bs the target bitstream
+\param reset if GF_TRUE, reset overflown state, otherwise mark as overflown
+ */
+void gf_bs_mark_overflow(GF_BitStream *bs, Bool reset);
+
+/*!
+\brief Gets overflow state
+
+Gets overflow state of the bitstream
+\param bs the target bitstream
+\return 2 if an overflow was marked by user using \ref gf_bs_mark_overflow, 1 if an overflow occured, 0 otherwise
+ */
+u32 gf_bs_is_overflow(GF_BitStream *bs);
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-1.0.1.tar.gz/include/gpac/cache.h -> gpac-2.0.0.tar.gz/include/gpac/cache.h Changed

gpac-1.0.1.tar.gz/include/gpac/color.h -> gpac-2.0.0.tar.gz/include/gpac/color.h Changed

@@ -121,10 +121,10 @@
 The color type used in the GPAC framework represents colors in the form 0xAARRGGBB, with each component ranging from 0 to 255
 */
 typedef u32 GF_Color;
-/*!\hideinitializer color formating macro from alpha, red, green and blue components expressed as integers ranging from 0 to 255*/
+/*!\hideinitializer color formatting macro from alpha, red, green and blue components expressed as integers ranging from 0 to 255*/
 #define GF_COL_ARGB(a, r, g, b) (((u32) a)<<24 | ((u32) r)<<16 | ((u32) g)<<8 | ((u32) b))
 
-/*!\hideinitializer color formating macro from alpha, red, green and blue components expressed as fixed numbers ranging from 0 to \ref FIX_ONE*/
+/*!\hideinitializer color formatting macro from alpha, red, green and blue components expressed as fixed numbers ranging from 0 to \ref FIX_ONE*/
 #define GF_COL_ARGB_FIXED(_a, _r, _g, _b) GF_COL_ARGB(FIX2INT(255*(_a)), FIX2INT(255*(_r)), FIX2INT(255*(_g)), FIX2INT(255*(_b)))
 /*!\hideinitializer gets alpha component of a color*/
 #define GF_COL_A(c) (u8) ((c)>>24)
@@ -134,9 +134,9 @@
 #define GF_COL_G(c) (u8) ( ((c)>>8) & 0xFF)
 /*!\hideinitializer gets blue component of a color*/
 #define GF_COL_B(c) (u8) ( (c) & 0xFF)
-/*!\hideinitializer 16-bits color formating macro from red, green and blue components*/
+/*!\hideinitializer 16-bits color formatting macro from red, green and blue components*/
 #define GF_COL_565(r, g, b) (u16) (((r & 248)<<8) + ((g & 252)<<3) + (b>>3))
-/*!\hideinitializer 15-bits color formating macro from red, green and blue components*/
+/*!\hideinitializer 15-bits color formatting macro from red, green and blue components*/
 #define GF_COL_555(r, g, b) (u16) (((r & 248)<<7) + ((g & 248)<<2) + (b>>3))
 
 /*!\hideinitializer gets alpha component of a wide color*/

gpac-1.0.1.tar.gz/include/gpac/configuration.h -> gpac-2.0.0.tar.gz/include/gpac/configuration.h Changed

@@ -51,7 +51,7 @@
 #define GPAC_HAS_SSL
 
 #define GPAC_HAS_QJS
-//codecs  
+//codecs
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
 #define GPAC_HAS_LIBA52
@@ -65,6 +65,7 @@
 #define GPAC_HAS_XVID
 #define GPAC_HAS_FFMPEG
 #define GPAC_HAS_DTAPI
+#define GPAC_HAS_HTTP2
 
 /*IPv6 enabled - for win32, this is evaluated at compile time, !! do not uncomment !!*/
 
@@ -122,6 +123,7 @@
 #define GPAC_HAS_QJS
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
+#define GPAC_HAS_HTTP2
 
 /*Configuration for XCode OSX (not iOS) */
 #elif defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_CONFIG_IOS)
@@ -137,9 +139,12 @@
 #endif
 
 #define GPAC_HAS_QJS
+//#define GPAC_DISABLE_QJS_LIBC
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
 #define GPAC_HAS_GLU
+#define GPAC_HAS_VTB
+#define GPAC_HAS_HTTP2
 
 #define GPAC_MEMORY_TRACKING
 
@@ -176,6 +181,9 @@
 #define GPAC_HAS_IPV6
 #define GPAC_HAS_SSL
 #define GPAC_DISABLE_OGG
+#define GPAC_HAS_STRLCPY
+#define GPAC_HAS_VTB
+#define GPAC_HAS_HTTP2
 
 /*Configuration for Symbian*/
 #elif defined(__SYMBIAN32__)
@@ -335,4 +343,3 @@
 /*! @} */
 
 #endif		/*_GF_CONFIG_H_*/
-

gpac-1.0.1.tar.gz/include/gpac/constants.h -> gpac-2.0.0.tar.gz/include/gpac/constants.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / exported constants
@@ -112,6 +112,11 @@
  */
 const char *gf_stream_type_name(u32 streamType);
 
+/*! Gets the stream type short name based on stream type (usually the lower case value of the stream name)
+\param streamType stream type GF_STREAM_XXX as defined in constants.h
+\return NULL if unknown, otherwise value
+ */
+const char *gf_stream_type_short_name(u32 streamType);
 
 /*! Gets the stream type by name
 \param name name of the stream type to query
@@ -119,11 +124,6 @@
  */
 u32 gf_stream_type_by_name(const char *name);
 
-/*! Gets the list of names of all stream types defined
-\return names of all stream types defined
- */
-const char *gf_stream_type_all_names();
-
 /*! Enumerates defined stream types
 \param idx index of the stream type, 0-based
 \param name name of the stream type (used when parsing stream type from textual definition)
@@ -171,7 +171,7 @@
 
 	/*!32 bit ARGB. Component ordering in bytes is A-R-G-B.*/
 	GF_PIXEL_ARGB		=	GF_4CC('A','R','G','B'),
-	/*!32 bit RGBA (openGL like). Component ordering in bytes is R-G-B-A.*/
+	/*!32 bit RGBA (OpenGL like). Component ordering in bytes is R-G-B-A.*/
 	GF_PIXEL_RGBA		=	GF_4CC('R','G','B', 'A'),
 	/*!32 bit BGRA. Component ordering in bytes is B-G-R-A.*/
 	GF_PIXEL_BGRA		=	GF_4CC('B','G','R','A'),
@@ -191,7 +191,7 @@
 	GF_PIXEL_RGB_DEPTH = GF_4CC('R', 'G', 'B', 'd'),
 
 	/*!YUV packed 422 format*/
-	GF_PIXEL_YUYV		=	GF_4CC('Y','U','Y','2'),
+	GF_PIXEL_YUYV		=	GF_4CC('Y','U','Y','V'),
 	/*!YUV packed 422 format*/
 	GF_PIXEL_YVYU		=	GF_4CC('Y','V','Y','U'),
 	/*!YUV packed 422 format*/
@@ -199,8 +199,19 @@
 	/*!YUV packed 422 format*/
 	GF_PIXEL_VYUY		=	GF_4CC('V','Y','U','Y'),
 
+	/*!YUV packed 422 format 10 bits, little endian*/
+	GF_PIXEL_YUYV_10		=	GF_4CC('Y','U','Y','L'),
+	/*!YUV packed 422 format 10 bits, little endian*/
+	GF_PIXEL_YVYU_10		=	GF_4CC('Y','V','Y','L'),
+	/*!YUV packed 422 format 10 bits, little endian*/
+	GF_PIXEL_UYVY_10		=	GF_4CC('U','Y','V','L'),
+	/*!YUV packed 422 format 10 bits, little endian*/
+	GF_PIXEL_VYUY_10		=	GF_4CC('V','Y','U','L'),
+
 	/*!YUV planar format*/
-	GF_PIXEL_YUV		=	GF_4CC('Y','V','1','2'),
+	GF_PIXEL_YUV		=	GF_4CC('Y','U','1','2'),
+	/*!YVU planar format*/
+	GF_PIXEL_YVU		=	GF_4CC('Y','V','1','2'),
 	/*!YUV420p in 10 bits mode, little endian*/
 	GF_PIXEL_YUV_10	=	GF_4CC('Y','0','1','0'),
 	/*!YUV420p + Alpha plane*/
@@ -225,8 +236,14 @@
 	GF_PIXEL_YUV444		=	GF_4CC('Y','4','4','4'),
 	/*!444 YUV, 10 bits, little endian*/
 	GF_PIXEL_YUV444_10	=	GF_4CC('Y','4','1','0'),
-
-	/*!Unknown format exposed a single openGL texture to be consumed using samplerExternalOES*/
+	/*!444 YUV packed*/
+	GF_PIXEL_YUV444_PACK	=	GF_4CC('Y','4','4','p'),
+	/*!444 YUV+Alpha packed*/
+	GF_PIXEL_YUVA444_PACK	=	GF_4CC('Y','A','4','p'),
+	/*!444 YUV 10 bit packed*/
+	GF_PIXEL_YUV444_10_PACK	=	GF_4CC('Y','4','1','p'),
+
+	/*!Unknown format exposed a single OpenGL texture to be consumed using samplerExternalOES*/
 	GF_PIXEL_GL_EXTERNAL	=	GF_4CC('E','X','G','L')
 } GF_PixelFormat;
 
@@ -243,9 +260,16 @@
 */
 const char *gf_pixel_fmt_name(GF_PixelFormat pfmt);
 
+/*! checks if pixel format is known, does not throw error message
+\param pf_4cc pixel format code or 0
+\param pf_name pixel format name or short name or NULL
+\return GF_TRUE is format is known, GF_FALSE otherwise
+*/
+Bool gf_pixel_fmt_probe(GF_PixelFormat pf_4cc, const char *pf_name);
+
 /*! gets short name of pixel formats, as used for file extensions
 \param pfmt pixel format code
-\return pixel format short name
+\return pixel format short name, "unknown" if not found
 */
 const char *gf_pixel_fmt_sname(GF_PixelFormat pfmt);
 
@@ -254,9 +278,9 @@
 \param name name of the pixel format
 \param fileext file extension of the pixel format
 \param description description of the pixel format
-\return pixel format code, 0 if no more pixel formats are availble
+\return pixel format code, 0 if no more pixel formats are available
 */
-Bool gf_pixel_fmt_enum(u32 *idx, const char **name, const char **fileext, const char **description);
+GF_PixelFormat gf_pixel_fmt_enum(u32 *idx, const char **name, const char **fileext, const char **description);
 
 /*! gets the list of all supported pixel format names
 \return list of supported pixel format names
@@ -287,16 +311,45 @@
 */
 u32 gf_pixel_get_bytes_per_pixel(GF_PixelFormat pixfmt);
 
+/*! Gets the number of bits per component
+\param pixfmt  pixel format code
+\return number of bits per component
+*/
+u32 gf_pixel_is_wide_depth(GF_PixelFormat pixfmt);
+
 /*! Gets the number of component per pixel
 \param pixfmt  pixel format code
 \return number of bytes per pixel
 */
 u32 gf_pixel_get_nb_comp(GF_PixelFormat pixfmt);
 
+/*! Checks if  pixel format is transparent
+\param pixfmt  pixel format code
+\return GF_TRUE if alpha channel is present, GF_FALSE otherwise
+*/
+Bool gf_pixel_fmt_is_transparent(GF_PixelFormat pixfmt);
+
+/*! Checks if format is YUV
+\param pixfmt  pixel format code
+\return GF_TRUE is YUV format, GF_FALSE otherwise (greyscale or RGB)
+*/
+Bool gf_pixel_fmt_is_yuv(GF_PixelFormat pixfmt);
+
+/*! gets pixel format associated with a given uncompressed video QT code
+\param qt_code the desired QT/ISOBMFF uncompressed video code
+\return the corresponding pixel format, or 0 if unknown code
+*/
+GF_PixelFormat gf_pixel_fmt_from_qt_type(u32 qt_code);
+/*! gets QY code associated with a given pixel format
+\param pixfmt the desired pixel format
+\return the corresponding QT code, or 0 if no asociation
+*/
+u32 gf_pixel_fmt_to_qt_type(GF_PixelFormat pixfmt);
+
 /*!
 \brief Codec IDs
 
-Codec ID identifies the stream coding type. The enum is devided into values less than 255, which are equivalent to MPEG-4 systems ObjectTypeIndication. Other values are 4CCs, usually matching ISOMEDIA sample entry types*/
+Codec ID identifies the stream coding type. The enum is divided into values less than 255, which are equivalent to MPEG-4 systems ObjectTypeIndication. Other values are 4CCs, usually matching ISOMEDIA sample entry types*/
 typedef enum
 {
 	/*!Never used by PID declarations, but used by filters caps*/
@@ -364,7 +417,7 @@
 	GF_CODECID_MPEG2_PART3 = 0x69,
 	/*! codecid for MPEG-1 Video streams*/
 	GF_CODECID_MPEG1 = 0x6A,
-	/*! codecid for MPEG-1 Audio streams*/
+	/*! codecid for MPEG-1 Audio streams, layer 3*/
 	GF_CODECID_MPEG_AUDIO = 0x6B,
 	/*! codecid for JPEG streams*/
 	GF_CODECID_JPEG = 0x6C,
@@ -404,6 +457,8 @@
 	GF_CODECID_AC3 = GF_4CC('a','c','-','3'),
 	/*! codecid for enhanced AC-3 audio streams*/
 	GF_CODECID_EAC3 = GF_4CC('e','c','-','3'),
+	/*! codecid for Dolby TrueHS audio streams*/
+	GF_CODECID_TRUEHD = GF_4CC('m','l','p','a'),
 	/*! codecid for DRA audio streams*/
 	GF_CODECID_DRA = GF_4CC('d','r','a','1'),
 	/*! codecid for ITU G719 audio streams*/
@@ -448,7 +503,7 @@
 		\brief OGG DecoderConfig
 
 	 The DecoderConfig for theora, vorbis, flac and opus contains all intitialization ogg packets for the codec
-	  and is formated as follows:\n
+	  and is formatted as follows:\n
 	 \code
 	  while (dsi_size) {
 			bit(16) packet_size;
@@ -521,9 +576,24 @@
 
 	GF_CODECID_TMCD = GF_4CC('t','m','c','d'),
 
+	/*! codecid for FFV1*/
+	GF_CODECID_FFV1 = GF_4CC('f','f','v','1'),
 
 	GF_CODECID_FFMPEG = GF_4CC('F','F','I','D'),
 
+	/*! codecid for VVC video */
+	GF_CODECID_VVC = GF_4CC('v','v','c',' '),
+	GF_CODECID_VVC_SUBPIC = GF_4CC('v','v','c','s'),
+
+	/*! codecid for USAC / xHE-AACv2 audio */
+	GF_CODECID_USAC = GF_4CC('u','s','a','c'),
+
+	GF_CODECID_V210 = GF_4CC('v','2','1','0'),
+
+
+	/*! codecid for MPEG-1 Audio streams, layer 1*/
+	GF_CODECID_MPEG_AUDIO_L1 = GF_4CC('m','p','a','1'),
+
 	//fake codec IDs for RTP
 	GF_CODECID_FAKE_MP2T = GF_4CC('M','P','2','T')
 } GF_CodecID;
@@ -577,7 +647,7 @@
 \param cname target codec short name
 \return codecid codec ID
 */
-GF_CodecID gf_codec_parse(const char *cname);
+GF_CodecID gf_codecid_parse(const char *cname);
 
 /*! Gets the raw file ext (one or more, | separated) for the given codecid
 \param codecid codec ID
@@ -733,12 +803,18 @@
 	GF_AUDIO_FMT_U8 = 1,
 	/*! sample = signed short Little Endian, interleaved channels*/
 	GF_AUDIO_FMT_S16,
+	/*! sample = signed short Big Endian, interleaved channels*/
+	GF_AUDIO_FMT_S16_BE,
 	/*! sample = signed integer, interleaved channels*/
 	GF_AUDIO_FMT_S32,
 	/*! sample = 1 float, interleaved channels*/
 	GF_AUDIO_FMT_FLT,
 	/*! sample = 1 double, interleaved channels*/
 	GF_AUDIO_FMT_DBL,
+	/*! sample = signed integer, interleaved channels*/
+	GF_AUDIO_FMT_S24,
+	/*! not a format, indicates the value of last packed format*/
+	GF_AUDIO_FMT_LAST_PACKED,
 	/*! sample = unsigned byte, planar channels*/
 	GF_AUDIO_FMT_U8P,
 	/*! sample = signed short, planar channels*/
@@ -749,8 +825,6 @@
 	GF_AUDIO_FMT_FLTP,
 	/*! sample = 1 double, planar channels*/
 	GF_AUDIO_FMT_DBLP,
-	/*! sample = signed integer, interleaved channels*/
-	GF_AUDIO_FMT_S24,
 	/*! sample = signed integer, planar channels*/
 	GF_AUDIO_FMT_S24P,
 } GF_AudioFormat;
@@ -799,16 +873,22 @@
 
 /*! Returns audio format for raw audio ISOBMFF sample description type
 \param msubtype ISOBMFF sample description type
-\return the associated audio format of 0 if not known
+\return the associated audio format or 0 if not known
  */
 GF_AudioFormat gf_audio_fmt_from_isobmf(u32 msubtype);
 
+/*! Returns QTFF/ISOBMFF sample description 4CC of an audio format
+\param afmt audio format to query
+\return the associated 4CC or 0 if not known
+ */
+u32 gf_audio_fmt_to_isobmf(GF_AudioFormat afmt);
+
 /*! enumerates audio formats
 \param idx index of the audio format, 0-based
 \param name name of the audio format
 \param fileext file extension of the pixel format
 \param desc audio format description
-\return audio format or 0 if no more audio formats are availble
+\return audio format or 0 if no more audio formats are available
 */
 GF_AudioFormat gf_audio_fmt_enum(u32 *idx, const char **name, const char **fileext, const char **desc);
 
@@ -832,12 +912,44 @@
 */
 const char *gf_audio_fmt_get_layout_name_from_cicp(u32 cicp_layout);
 
+/*! get channel layout name
+\param chan_layout channel layout mask
+\return name of layout of "unknown" if unknown
+*/
+const char *gf_audio_fmt_get_layout_name(u64 chan_layout);
+
+
+/*! get channel layout from name
+\param name channel layout name
+\return channel layout mask
+*/
+u64 gf_audio_fmt_get_layout_from_name(const char *name);
+
 /*! get CICP layout value from channel layout mask 
 \param chan_layout channel layout mask
 \return CICP code point or 255 if unknown
 */
 u32 gf_audio_fmt_get_cicp_from_layout(u64 chan_layout);
 
+/*! get channel count from channel  layout
+\param chan_layout channel layout mask
+\return number of channels in this layout
+*/
+u32 gf_audio_fmt_get_num_channels_from_layout(u64 chan_layout);
+
+/*! get dloby chanmap value from cicp layout
+\param cicp_layout channel CICP layout
+\return dolby chanmap
+*/
+u16 gf_audio_fmt_get_dolby_chanmap(u32 cicp_layout);
+
+/*! enumerates CICP channel layout
+\param idx index of cicp layout value to query
+\param short_name set t o CICP name as used in GPAC - may be NULL
+\param ch_mask set t o audio channel mask, as used in GPAC - may be NULL
+\return CICP code point, or 0 if no more to enumerate*/
+u32 gf_audio_fmt_cicp_enum(u32 idx, const char **short_name, u64 *ch_mask);
+
 /*! Color primaries as defined by ISO/IEC 23001-8 / 23091-2
   */
 typedef enum
@@ -988,6 +1100,11 @@
 	GF_AVC_NALU_DV_RPU = 28,
 	/*! Dolby Vision EL */
 	GF_AVC_NALU_DV_EL = 30,
+
+	/*! NALU-FF extractor */
+	GF_AVC_NALU_FF_AGGREGATOR=30,
+	/*! NALU-FF aggregator */
+	GF_AVC_NALU_FF_EXTRACTOR=31,
 };
 
 
@@ -1016,6 +1133,10 @@
 	GF_AVC_TYPE2_SI = 9
 };
 
+/*! Scheme Type only used internally to signal HLS sample AES in TS */
+#define GF_HLS_SAMPLE_AES_SCHEME	GF_4CC('s','a','e','s')
+
+
 /*! HEVC NAL unit types */
 enum
 {
@@ -1077,6 +1198,12 @@
 	GF_HEVC_NALU_SEI_PREFIX = 39,
 	/*! suffix SEI message*/
 	GF_HEVC_NALU_SEI_SUFFIX = 40,
+
+	/*! NALU-FF aggregator */
+	GF_HEVC_NALU_FF_AGGREGATOR=48,
+	/*! NALU-FF extractor */
+	GF_HEVC_NALU_FF_EXTRACTOR=49,
+
 	/*! Dolby Vision RPU */
 	GF_HEVC_NALU_DV_RPU = 62,
 	/*! Dolby Vision EL */
@@ -1085,6 +1212,55 @@
 
 
 
+/*! VVC NAL unit types - vtm10) */
+enum
+{
+	/*! Trail N VVC slice*/
+	GF_VVC_NALU_SLICE_TRAIL = 0,
+	/*! STSA N VVC slice*/
+	GF_VVC_NALU_SLICE_STSA = 1,
+	/*! STSA N VVC slice*/
+	GF_VVC_NALU_SLICE_RADL = 2,
+	/*! STSA N VVC slice*/
+	GF_VVC_NALU_SLICE_RASL = 3,
+	/*! IDR with RADL VVC slice*/
+	GF_VVC_NALU_SLICE_IDR_W_RADL = 7,
+	/*! IDR DLP VVC slice*/
+	GF_VVC_NALU_SLICE_IDR_N_LP = 8,
+	/*! CRA VVC slice*/
+	GF_VVC_NALU_SLICE_CRA = 9,
+	/*! CRA VVC slice*/
+	GF_VVC_NALU_SLICE_GDR = 10,
+
+	/*! Operation Point Info */
+	GF_VVC_NALU_OPI = 12,
+	/*! Decode Parameter Set*/
+	GF_VVC_NALU_DEC_PARAM = 13,
+	/*! Video Parameter Set*/
+	GF_VVC_NALU_VID_PARAM = 14,
+	/*! Sequence Parameter Set*/
+	GF_VVC_NALU_SEQ_PARAM = 15,
+	/*! Picture Parameter Set*/
+	GF_VVC_NALU_PIC_PARAM = 16,
+	/*! APS prefix */
+	GF_VVC_NALU_APS_PREFIX = 17,
+	/*! APS suffix */
+	GF_VVC_NALU_APS_SUFFIX = 18,
+	/*! Picture Header*/
+	GF_VVC_NALU_PIC_HEADER = 19,
+	/*! AU delimiter*/
+	GF_VVC_NALU_ACCESS_UNIT = 20,
+	/*! End of sequence*/
+	GF_VVC_NALU_END_OF_SEQ = 21,
+	/*! End of stream*/
+	GF_VVC_NALU_END_OF_STREAM = 22,
+	/*! prefix SEI message*/
+	GF_VVC_NALU_SEI_PREFIX = 23,
+	/*! suffix SEI message*/
+	GF_VVC_NALU_SEI_SUFFIX = 24,
+	/*! Filler Data*/
+	GF_VVC_NALU_FILLER_DATA = 25,
+};
 /*! Number of defined QCELP rate sizes*/
 static const unsigned int GF_QCELP_RATE_TO_SIZE_NB = 7;
 /*! QCELP rate sizes - note that these sizes INCLUDE the rate_type header byte*/
@@ -1136,11 +1312,13 @@
 	GF_ID3V2_FRAME_SYTC = GF_4CC('S','Y','T','C'),
 	GF_ID3V2_FRAME_TALB = GF_4CC('T','A','L','B'),
 	GF_ID3V2_FRAME_TBPM = GF_4CC('T','B','P','M'),
+	GF_ID3V2_FRAME_TCAT = GF_4CC('T','C','A','T'),
 	GF_ID3V2_FRAME_TCMP = GF_4CC('T','C','M','P'),
 	GF_ID3V2_FRAME_TCOM = GF_4CC('T','C','O','M'),
 	GF_ID3V2_FRAME_TCON = GF_4CC('T','C','O','N'),
 	GF_ID3V2_FRAME_TCOP = GF_4CC('T','C','O','P'),
 	GF_ID3V2_FRAME_TDAT = GF_4CC('T','D','A','T'),
+	GF_ID3V2_FRAME_TDES = GF_4CC('T','D','E','S'),
 	GF_ID3V2_FRAME_TDLY = GF_4CC('T','D','L','Y'),
 	GF_ID3V2_FRAME_TDRC = GF_4CC('T','D','R','C'),
 	GF_ID3V2_FRAME_TENC = GF_4CC('T','E','N','C'),
@@ -1151,6 +1329,7 @@
 	GF_ID3V2_FRAME_TIT2 = GF_4CC('T','I','T','2'),
 	GF_ID3V2_FRAME_TIT3 = GF_4CC('T','I','T','3'),
 	GF_ID3V2_FRAME_TKEY = GF_4CC('T','K','E','Y'),
+	GF_ID3V2_FRAME_TKWD = GF_4CC('T','K','W','D'),
 	GF_ID3V2_FRAME_TLAN = GF_4CC('T','L','A','N'),
 	GF_ID3V2_FRAME_TLEN = GF_4CC('T','L','E','N'),
 	GF_ID3V2_FRAME_TMED = GF_4CC('T','M','E','D'),
@@ -1171,6 +1350,11 @@
 	GF_ID3V2_FRAME_TRSN = GF_4CC('T','R','S','N'),
 	GF_ID3V2_FRAME_TRSO = GF_4CC('T','R','S','O'),
 	GF_ID3V2_FRAME_TSIZ = GF_4CC('T','S','I','Z'),
+	GF_ID3V2_FRAME_TSO2 = GF_4CC('T','S','O','2'),
+	GF_ID3V2_FRAME_TSOA = GF_4CC('T','S','O','A'),
+	GF_ID3V2_FRAME_TSOC = GF_4CC('T','S','O','C'),
+	GF_ID3V2_FRAME_TSOT = GF_4CC('T','S','O','T'),
+	GF_ID3V2_FRAME_TSOP = GF_4CC('T','S','O','P'),
 	GF_ID3V2_FRAME_TSRC = GF_4CC('T','S','R','C'),
 	GF_ID3V2_FRAME_TSSE = GF_4CC('T','S','S','E'),
 	GF_ID3V2_FRAME_TYER = GF_4CC('T','Y','E','R'),
@@ -1194,14 +1378,24 @@
 {
 	/*! tag is a string*/
 	GF_ITAG_STR=0,
-	/*! tag is an int*/
-	GF_ITAG_INT,
-	/*! tag is a fraction*/
-	GF_ITAG_FRAC,
-	/*! tag is a boolean*/
+	/*! tag is an 8 bit int*/
+	GF_ITAG_INT8,
+	/*! tag is a 16 bit int*/
+	GF_ITAG_INT16,
+	/*! tag is a 32 bit int*/
+	GF_ITAG_INT32,
+	/*! tag is an 64 bits int*/
+	GF_ITAG_INT64,
+	/*! tag is a boolean (8bit) */
 	GF_ITAG_BOOL,
-	/*! tag is a string but name is matched as substring*/
-	GF_ITAG_SUBSTR,
+	/*! tag is ID3 genre tag, either 32 bit int or string*/
+	GF_ITAG_ID3_GENRE,
+	/*! tag is an fraction on 6 bytes (first 2 unused)*/
+	GF_ITAG_FRAC6,
+	/*! tag is an fraction on 8 bytes (first 2 and last 2 unused)*/
+	GF_ITAG_FRAC8,
+	/*! tag is a file*/
+	GF_ITAG_FILE,
 };
 /*! finds a tag by its ID3 value
  \param id3tag ID3 tag value
@@ -1223,9 +1417,9 @@
 
 /*! gets tag associated type
  \param tag_idx tag index
- \return corresponding tag type, 0 if error
+ \return corresponding tag type, -1 if error
 */
-u32 gf_itags_get_type(u32 tag_idx);
+s32 gf_itags_get_type(u32 tag_idx);
 
 /*! gets tag associated name
  \param tag_idx tag index
@@ -1233,6 +1427,12 @@
 */
 const char *gf_itags_get_name(u32 tag_idx);
 
+/*! gets tag associated alternative names
+ \param tag_idx tag index
+ \return corresponding tag name, NULL if none
+*/
+const char *gf_itags_get_alt_name(u32 tag_idx);
+
 /*! gets tag associated itunes tag
  \param tag_idx tag index
  \return corresponding itunes tag, 0 if error
@@ -1294,6 +1494,158 @@
 };
 
 
+/*! CICP code points for color primaries */
+enum
+{
+	GF_CICP_PRIM_RESERVED_0 = 0,
+	GF_CICP_PRIM_BT709,
+	GF_CICP_PRIM_UNSPECIFIED,
+	GF_CICP_PRIM_RESERVED_3,
+	GF_CICP_PRIM_BT470M,
+	GF_CICP_PRIM_BT470G,
+	GF_CICP_PRIM_SMPTE170,
+	GF_CICP_PRIM_SMPTE240,
+	GF_CICP_PRIM_FILM,
+	GF_CICP_PRIM_BT2020,
+	GF_CICP_PRIM_SMPTE428,
+	GF_CICP_PRIM_SMPTE431,
+	GF_CICP_PRIM_SMPTE432,
+
+	GF_CICP_PRIM_EBU3213=22,
+
+	GF_CICP_PRIM_LAST
+};
+
+/*! CICP code points for color transfer */
+enum
+{
+	GF_CICP_TRANSFER_RESERVED_0 = 0,
+	GF_CICP_TRANSFER_BT709,
+	GF_CICP_TRANSFER_UNSPECIFIED,
+	GF_CICP_TRANSFER_RESERVED_3,
+	GF_CICP_TRANSFER_BT470M,
+	GF_CICP_TRANSFER_BT470BG,
+	GF_CICP_TRANSFER_SMPTE170,
+	GF_CICP_TRANSFER_SMPTE240,
+	GF_CICP_TRANSFER_LINEAR,
+	GF_CICP_TRANSFER_LOG100,
+	GF_CICP_TRANSFER_LOG316,
+	GF_CICP_TRANSFER_IEC61966,
+	GF_CICP_TRANSFER_BT1361,
+	GF_CICP_TRANSFER_SRGB,
+	GF_CICP_TRANSFER_BT2020_10,
+	GF_CICP_TRANSFER_BT2020_12,
+	GF_CICP_TRANSFER_SMPTE2084,
+	GF_CICP_TRANSFER_SMPTE428,
+	GF_CICP_TRANSFER_STDB67, //prores only
+
+	GF_CICP_TRANSFER_LAST
+};
+
+
+/*! CICP code points for matrix coefficients */
+enum
+{
+	GF_CICP_MX_IDENTITY = 0,
+	GF_CICP_MX_BT709,
+	GF_CICP_MX_UNSPECIFIED,
+	GF_CICP_MX_RESERVED_3,
+	GF_CICP_MX_FCC47,
+	GF_CICP_MX_BT601_625,
+	GF_CICP_MX_SMPTE170,
+	GF_CICP_MX_SMPTE240,
+	GF_CICP_MX_YCgCo,
+	GF_CICP_MX_BT2020,
+	GF_CICP_MX_BT2020_CL,
+	GF_CICP_MX_YDzDx,
+
+	GF_CICP_MX_LAST
+	//the rest is reserved
+};
+
+/*! parse CICP color primaries
+ \param val CICP color primaries name
+\return 0xFFFFFFFF if error , value otherwise
+*/
+u32 gf_cicp_parse_color_primaries(const char *val);
+
+/*! get CICP color primaries name
+\param cicp_prim CICP color primaries code
+\return name or "unknown"" if error
+*/
+const char *gf_cicp_color_primaries_name(u32 cicp_prim);
+
+/*! get CICP color primaries names
+\return coma-separated list of GPAC names for CICP color primaries
+*/
+const char *gf_cicp_color_primaries_all_names();
+
+/*! parse CICP color transfer
+ \param val CICP color transfer name
+\return 0xFFFFFFFF if error , value otherwise
+*/
+u32 gf_cicp_parse_color_transfer(const char *val);
+
+/*! get CICP color transfer name
+\param cicp_trans CICP color transfer code
+\return name or "unknown"" if error
+*/
+const char *gf_cicp_color_transfer_name(u32 cicp_trans);
+
+/*! get CICP color transfer names
+\return coma-separated list of GPAC names for CICP color transfer
+*/
+const char *gf_cicp_color_transfer_all_names();
+
+/*! parse CICP color matrix coefficients
+ \param val CICP color matrix coefficients name
+\return 0xFFFFFFFF if error , value otherwise
+*/
+u32 gf_cicp_parse_color_matrix(const char *val);
+
+/*! get CICP color matrix coefficients name
+\param cicp_mx CICP color matrix coefficients code
+\return name or "unknown"" if error
+*/
+const char *gf_cicp_color_matrix_name(u32 cicp_mx);
+
+/*! get CICP color matrix names
+\return coma-separated list of GPAC names for CICP color matrix
+*/
+const char *gf_cicp_color_matrix_all_names();
+
+
+/*! stereo frame packing types */
+enum
+{
+	/*! monoscopic video*/
+	GF_STEREO_NONE = 0,
+	/*! left eye in top half of video, right eye in bottom half of video*/
+	GF_STEREO_TOP_BOTTOM,
+	/*! left eye in left half of video, right eye in right half of video*/
+	GF_STEREO_LEFT_RIGHT,
+	/*! stereo mapped through mesh*/
+	GF_STEREO_CUSTOM,
+	/*! left eye in right half of video, right eye in left half of video*/
+	GF_STEREO_RIGHT_LEFT,
+	/*! left eye in bottom half of video, right eye in top half of video*/
+	GF_STEREO_BOTTOM_TOP,
+};
+
+/*! 360 projection types */
+enum
+{
+	/*! flat video*/
+	GF_PROJ360_NONE = 0,
+	/*! cube map projection video is upper half: right, left, up, lower half: down, front, back*/
+	GF_PROJ360_CUBE_MAP,
+	/*! Equirectangular projection / video*/
+	GF_PROJ360_EQR,
+	/*! Mesh projection (not supported yet)*/
+	GF_PROJ360_MESH
+};
+
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-1.0.1.tar.gz/include/gpac/crypt.h -> gpac-2.0.0.tar.gz/include/gpac/crypt.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
-*			Copyright (c) Telecom ParisTech 2000-2019
+*			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 *  This file is part of GPAC / Crypto Tools sub-project
@@ -65,7 +65,9 @@
 	/*! CBC chaining mode*/
 	GF_CBC = 0,
 	/*! CTR chaining mode*/
-	GF_CTR = 1
+	GF_CTR = 1,
+	/*! ECB (no chaining), payload must be a multiple of 16-bytes blocks*/
+	GF_ECB = 2,
 } GF_CRYPTO_MODE;
 
 /*! Algorithm mode to use*/
@@ -113,7 +115,7 @@
 
 /*! gets the IV of the algorithm.
 The size will hold the size of the state and the state must have enough bytes to hold it (17 is enough for AES 128).
-In CTR mode, the first byte will be set to the counter value (number of bytes consummed in last block), or 0 if all bytes were consummed
+In CTR mode, the first byte will be set to the counter value (number of bytes consumed in last block), or 0 if all bytes were consumed
 \param gfc the target crytpo context
 \param iv filled with the current IV
 \param size will be set to the IV size (16 for AES CBC? 17 for AES CTR)

gpac-1.0.1.tar.gz/include/gpac/crypt_tools.h -> gpac-2.0.0.tar.gz/include/gpac/crypt_tools.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -67,6 +67,9 @@
 	GF_CRYPT_TYPE_ADOBE	= GF_4CC('a','d','k','m'),
 	/*! PIFF CTR-128 encryption*/
 	GF_CRYPT_TYPE_PIFF	= GF_4CC('p','i','f','f'),
+	/*! HLS Sample encryption*/
+	GF_CRYPT_TYPE_SAES	= GF_4CC('s','a','e','s'),
+
 };
 
 /*! Selective encryption modes */
@@ -92,6 +95,38 @@
 	GF_CRYPT_SELENC_CLEAR_FORCED,
 };
 
+/*! Key info structure, one per defined key in the DRM XML doc*/
+typedef struct
+{
+	//keep first 3 bin128 at the begining for data alignment
+	/*! KEY ID*/
+	bin128 KID;
+	/*! key value*/
+	bin128 key;
+	/*! constant IV or initial IV if not constant*/
+	u8 IV[16];
+
+	/*! hls_info defined*/
+	char *hls_info;
+	/*!IV size */
+	u8 IV_size;
+	/*! constant IV size */
+	u8 constant_IV_size;
+} GF_CryptKeyInfo;
+
+/*! key roll modes*/
+typedef enum
+{
+	/*! change keys every keyRoll AUs*/
+	GF_KEYROLL_SAMPLES = 0,
+	/*! roll keys at each SAP type 1 or 2 for streams with SAPs*/
+	GF_KEYROLL_SAPS,
+	/*! change keys every keyRoll DASH segments*/
+	GF_KEYROLL_SEGMENTS,
+	/*! change keys every keyRoll periods*/
+	GF_KEYROLL_PERIODS,
+} GF_KeyRollType;
+
 /*! Crypto information for one media stream*/
 typedef struct
 {
@@ -99,8 +134,6 @@
 	u32 scheme_type;
 	/*! ID of track / PID / ... to be encrypted*/
 	u32 trackID;
-	/*! Initialization vector of the first sample/AU in track/media for CENC. For IMA/OMA, the first 8 bytes contain the salt data.*/
-	unsigned char first_IV[16];
 	/*! URI of key management system / rightsIssuerURL*/
 	char *KMS_URI;
 	/*! Scheme URI or contentID for OMA*/
@@ -132,26 +165,22 @@
 	and also add support for multiple keys in ISMA ?*/
 	/*! default encryption state for samples*/
 	u32 IsEncrypted;
-	/*! size of init vector: 0, 8 or 16*/
-	u8 IV_size;
-	/*! number of KEY IDs and Keys defined*/
-	u32 KID_count;
-	/*! KEY IDs defined*/
-	bin128 *KIDs;
+	/*! number of defined keys*/
+	u32 nb_keys;
 	/*! keys defined*/
-	bin128 *keys;
+	GF_CryptKeyInfo *keys;
+
 	/*! default key index to use*/
 	u32 defaultKeyIdx;
-	/*! roll period of keys (change keys every keyRoll AUs)*/
+	/*! roll period of keys*/
 	u32 keyRoll;
+	/*! roll type */
+	GF_KeyRollType roll_type;
 	/*! number of bytes to leave in the clear for non NAL-based tracks. Only used in cbcs mode*/
 	u32 clear_bytes;
+
 	/*! CENS/CBCS pattern */
 	u8 crypt_byte_block, skip_byte_block;
-	/*! cponstant IV size */
-	u8 constant_IV_size;
-	/*! constant IV */
-	unsigned char constant_IV[16];
 
 	/* ! for avc1 ctr CENC edition 1 */
 	Bool allow_encrypted_slice_header;
@@ -169,6 +198,20 @@
 
 	/*! force using type set in XML rather than type indicated in file when decrypting*/
 	Bool force_type;
+
+	/*! generate random keys and key values*/
+	Bool rand_keys;
+
+	/*! randomly encrypts subsample if rand() % subs_rand is 0*/
+	u32 subs_rand;
+	/*! list of VCL NAL/OBU indices to encrypt, 1-based*/
+	char *subs_crypt;
+	/*! use multiple keys per sample*/
+	Bool multi_key;
+	/*! roll key over subsamples. If 0, roll by 1 every encrypted sample. If 1 (-1==0) disable key roll*/
+	u32 mkey_roll_plus_one;
+	/*!coma-separated list of indices of keys to use per subsample. Value 0 means keep clear. If less indices than subsamples, keep subsamples in clear*/
+	char *mkey_subs;
 } GF_TrackCryptInfo;
 
 /*! Crypto information*/
@@ -182,6 +225,8 @@
 	Bool has_common_key;
 	/*! intern to parser*/
 	Bool in_text_header;
+	/*! intern to parser*/
+	GF_Err last_parse_error;
 } GF_CryptInfo;
 
 /*! loads a given crypto configuration file. Full doc is available at https://gpac.wp.imt.fr/mp4box/encryption/common-encryption/

gpac-1.0.1.tar.gz/include/gpac/dash.h -> gpac-2.0.0.tar.gz/include/gpac/dash.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2012-2019
+ *			Copyright (c) Telecom ParisTech 2012-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Adaptive HTTP Streaming sub-project
@@ -45,6 +45,7 @@
 */
 
 #include <gpac/tools.h>
+#include <gpac/list.h>
 
 #ifndef GPAC_DISABLE_DASH_CLIENT
 
@@ -56,14 +57,14 @@
 /*!
 * All the possible Mime-types for M3U8 files
 */
-static const char * const GF_DASH_M3U8_MIME_TYPES[] = { "video/x-mpegurl", "audio/x-mpegurl", "application/x-mpegurl", "application/vnd.apple.mpegurl", NULL};
+static const char * const GF_DASH_M3U8_MIME_TYPES[] = { "video/x-mpegurl", "audio/x-mpegurl", "application/x-mpegURL", "application/vnd.apple.mpegURL", NULL};
 
 /*!
 * All the possible Mime-types for Smooth files
 */
 static const char * const GF_DASH_SMOOTH_MIME_TYPES[] = { "application/vnd.ms-sstr+xml", NULL};
 
-/*! DASH Event type. The DASH client communitcaes with the user through a callback mechanism using events*/
+/*! DASH Event type. The DASH client communicates with the user through a callback mechanism using events*/
 typedef enum
 {
 	/*! event sent if an error occurs when setting up manifest*/
@@ -74,7 +75,7 @@
 	GF_DASH_EVENT_PERIOD_SETUP_ERROR,
 	/*! event sent once the first segment of each selected group is fetched - user should load playback chain(s) at this point*/
 	GF_DASH_EVENT_CREATE_PLAYBACK,
-	/*! event sent when reseting groups at period switch or at exit - user should unload playback chain(s) at this point*/
+	/*! event sent when resetting groups at period switch or at exit - user should unload playback chain(s) at this point*/
 	GF_DASH_EVENT_DESTROY_PLAYBACK,
 	/*! event sent once a new segment becomes available*/
 	GF_DASH_EVENT_SEGMENT_AVAILABLE,
@@ -82,15 +83,15 @@
 	GF_DASH_EVENT_QUALITY_SWITCH,
 	/*! position in timeshift buffer has changed (eg, paused)*/
 	GF_DASH_EVENT_TIMESHIFT_UPDATE,
-	/*! event sent when timeshift buffer is overflown - the group_idx param contains the max number of dropped segments of all representations droped by the client, or -1 if play pos is ahead of live */
+	/*! event sent when timeshift buffer is overflown - the group_idx param contains the max number of dropped segments of all representations dropped by the client, or -1 if play pos is ahead of live */
 	GF_DASH_EVENT_TIMESHIFT_OVERFLOW,
-	/*! event send when we need the decoding statistics*/
+	/*! event sent when we need the decoding statistics*/
 	GF_DASH_EVENT_CODEC_STAT_QUERY,
-	/*! event send when no threading to trigger segment download abort*/
+	/*! event sent when no threading to trigger segment download abort*/
 	GF_DASH_EVENT_ABORT_DOWNLOAD,
-	/*! event send whenever cache is full, to allow client to dispatch any segment*/
+	/*! event sent whenever cache is full, to allow client to dispatch any segment*/
 	GF_DASH_EVENT_CACHE_FULL,
-	/*! event send when all groups are done in a period*/
+	/*! event sent when all groups are done in a period - if group_idx is 1, this announces a time discontinuity for next period*/
 	GF_DASH_EVENT_END_OF_PERIOD,
 } GF_DASHEventType;
 
@@ -148,6 +149,10 @@
 	u32 (*get_total_size)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
 	/*! get the total size on bytes for the session*/
 	u32 (*get_bytes_done)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+
+	/*! callback when manifest (DASH, HLS) or sub-playlist (HLS) is updated*/
+	void (*manifest_updated)(GF_DASHFileIO *dashio, const char *manifest_name, const char *local_path, s32 group_idx);
+
 };
 
 /*! DASH client object*/
@@ -168,31 +173,20 @@
 	GF_DASH_SELECT_BANDWIDTH_HIGHEST_TILES
 } GF_DASHInitialSelectionMode;
 
-/*! DASH client threading mode*/
-typedef enum
-{
-	/*! no threads used, gf_dash_process shall be called on regular basis*/
-	GF_DASH_THREAD_NONE = 0,
-	/*! single thread used for MPD and segment download*/
-	GF_DASH_THREAD_SINGLE,
-	/*! one thread for MPD and each independent representations*/
-	GF_DASH_THREAD_ALL
-} GF_DASHThreadMode;
 
 /*! create a new DASH client
 \param dash_io DASH callbacks to the user
-\param thread_mode threading mode of the dash client
 \param max_cache_duration maximum duration in milliseconds for the cached media. If less than \code mpd@minBufferTime \endcode , \code mpd@minBufferTime \endcode is used
-\param auto_switch_count forces representation switching every auto_switch_count segments, set to 0 to disable
+\param auto_switch_count forces representation switching (quality up if positive, down if negative) every auto_switch_count segments, set to 0 to disable
 \param keep_files do not delete files from the cache
 \param disable_switching turn off bandwidth switching algorithm
 \param first_select_mode indicates which representation to select upon startup
 \param initial_time_shift_value sets initial buffering: if between 0 and 100, this is a percentage of the time shift window of the session. If greater than 100, this is a time shift in milliseconds.
 \return a new DASH client
 */
-GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io, GF_DASHThreadMode thread_mode,
+GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io,
 u32 max_cache_duration,
- u32 auto_switch_count,
+ s32 auto_switch_count,
 Bool keep_files,
 Bool disable_switching,
 GF_DASHInitialSelectionMode first_select_mode,
@@ -232,6 +226,12 @@
 */
 Bool gf_dash_is_m3u8(GF_DashClient *dash);
 
+/*! tells whether we are playing some MS SmoothStreaming
+\param dash the target dash client
+\return GF_TRUE if the manifest is SmoothStreaming
+*/
+Bool gf_dash_is_smooth_streaming(GF_DashClient *dash);
+
 /*! gets title and source for this MPD
 \param dash the target dash client
 \param title set to the title of the manifest (may be NULL)
@@ -242,9 +242,8 @@
 /*! switches quality up or down
 \param dash the target dash client
 \param switch_up indicates if the quality should be increased (GF_TRUE) or decreased (GF_FALSE)
-\param force_immediate_switch if GF_TRUE, aborts all current downloads, remove downloaded segments not yet played and switch. Otherwise, existing switching will only happen once the existing downloaded segments have been played
 */
-void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up, Bool force_immediate_switch);
+void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up);
 
 /*! indicates whether the DASH client is running or not
 \param dash the target dash client
@@ -329,13 +328,33 @@
 */
 Bool gf_dash_is_group_selectable(GF_DashClient *dash, u32 group_idx);
 
-/*! selects a group for playback. If other groups are alternate to this group (through the group attribute), they are automatically deselected
+/*! selects a group for playback. If group selection is enabled, other groups are alternate to this group (through the group attribute), they are automatically deselected
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
 \param select if GF_TRUE, will select this group and disable any alternate group. If GF_FALSE, only deselects the group
 */
 void gf_dash_group_select(GF_DashClient *dash, u32 group_idx, Bool select);
 
+/*! gets group ID (through the group attribute), -1 if undefined
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return ID of the group
+*/
+s32 gf_dash_group_get_id(GF_DashClient *dash, u32 group_idx);
+
+/*! enables group selection through the group attribute
+\param dash the target dash client
+\param enable if GF_TRUE, group selection will be done whenever selecting a new group
+*/
+void gf_dash_enable_group_selection(GF_DashClient *dash, Bool enable);
+
+/*! checks if first segment (used to initialize) was an init segment or the first in a sequence (aka M2TS)
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return GF_TRUE if first segment was a media segment
+*/
+Bool gf_dash_group_init_segment_is_media(GF_DashClient *dash, u32 group_idx);
+
 /*! performs selection of representations based on language code
 \param dash the target dash client
 \param lang_code_rfc_5646 the language code used by the default group selection
@@ -362,10 +381,11 @@
 This is used for full segment encryption modes of MPEG-2 TS segments. key_IV is optional
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
+\param crypto_type set to 0 if no encryption in segments, 1 if full segment encryption, 2 if CENC/per-sample encryption is used - may be NULL
 \param key_IV set to the IV used for the first media segment (can be NULL)
-\return the key URL of the first media segment
+\return the key URL of the first media segment, either a URN or a resolved URL
 */
-const char *gf_dash_group_get_segment_init_keys(GF_DashClient *dash, u32 group_idx, bin128 *key_IV);
+const char *gf_dash_group_get_segment_init_keys(GF_DashClient *dash, u32 group_idx, u32 *crypto_type, bin128 *key_IV);
 
 /*! returns the language of the group
 \param dash the target dash client
@@ -384,7 +404,7 @@
 /*! gets time shift buffer depth of the group
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
-\return time shift buffer depth of the group, -1 means infinity
+\return time shift buffer depth in ms of the group, -1 means infinity
 */
 u32 gf_dash_group_get_time_shift_buffer_depth(GF_DashClient *dash, u32 group_idx);
 
@@ -473,26 +493,26 @@
 \param switching_end_range set to end byte offset of the switching segment if needed (optional, may be NULL)
 \param original_url set to original URL value of the segment (optional, may be NULL)
 \param has_next_segment set to GF_TRUE if next segment location is known (unthreaded mode) or next segment is downloaded (threaded mode) (optional, may be NULL)
-\param key_url set to the key URL of the next segment for MPEG-2 TS full segment encryption (optional, may be NULL)
+\param key_url set to the key URL of the next segment for MPEG-2 TS full segment encryption (optional, may be NULL). The URL is either a URN or a resolved URL
 \param key_IV set to the key initialization vector of the next segment for MPEG-2 TS full segment encryption (optional, may be NULL)
-\return GF_BUFFER_TOO_SMALL if no segment found, GF_EOS if end of session or error if any
+\return GF_BUFFER_TOO_SMALL if no segment found, GF_EOS if end of session, GF_URL_REMOVED if segment is disabled (but all output info is OK, this can be ignored and considered as GF_OK by the user) or error if any
 */
 GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 group_idx, u32 dependent_representation_index, const char **url, u64 *start_range, u64 *end_range,
 s32 *switching_index, const char **switching_url, u64 *switching_start_range, u64 *switching_end_range,
 const char **original_url, Bool *has_next_segment, const char **key_url, bin128 *key_IV);
 
-/*! same as gf_dash_group_get_next_segment_location but query the current downloaded segment
+/*! gets some info on the segment
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
-\param url set to the URL of the next segment
-\param switching_index set to the quality index of the segment (optional, may be NULL)
-\param switching_url set to the URL of the switching segment if needed (optional, may be NULL)
-\param original_url set to original URL value of the segment (optional, may be NULL)
-\param switched set to GF_TRUE if current segment being downloaded follows an aborted download (optional, may be NULL)
-\return GF_BUFFER_TOO_SMALL if no segment found, GF_EOS if end of session or error if any
+\param dependent_representation_index index of the dependent representation to query, 0-based
+\param seg_name set to the segment name, without base url - optional, may be NULL
+\param seg_number set to the segment number for $Number$ addressing - optional, may be NULL
+\param seg_time set to the segment start time - optional, may be NULL
+\param seg_dur_ms set to the segment estimated duration in ms - optional, may be NULL
+\param init_segment set to the init segment name, without base url - optional, may be NULL
+\return error if any, GF_BUFFER_TOO_SMALL if no segments queued for download
 */
-GF_EXPORT
-GF_Err gf_dash_group_probe_current_download_segment_location(GF_DashClient *dash, u32 group_idx, const char **url, s32 *switching_index, const char **switching_url, const char **original_url, Bool *switched);
+GF_Err gf_dash_group_next_seg_info(GF_DashClient *dash, u32 group_idx, u32 dependent_representation_index, const char **seg_name, u32 *seg_number, GF_Fraction64 *seg_time, u32 *seg_dur_ms, const char **init_segment);
 
 /*! checks if loop was detected in playback. This is mostly used for broadcast (eMBMS, ROUTE) based on pcap replay.
 \param dash the target dash client
@@ -501,35 +521,42 @@
 */
 Bool gf_dash_group_loop_detected(GF_DashClient *dash, u32 group_idx);
 
-/*! returns number of seconds at which playback shall start for the group in the current period.
-The first segment available for the period will be so that gf_dash_group_get_start_range is in this range after the caller
-adjusts it with PTO (eg the returned time is in period timeline, not media timeline)
+/*! checks if group is using low latency delivery.
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
-\return media playback start range in seconds*/
-Double gf_dash_group_get_start_range(GF_DashClient *dash, u32 group_idx);
+\return GF_TRUE if low latency is used, GF_FALSE otherwise
+*/
+Bool gf_dash_is_low_latency(GF_DashClient *dash, u32 group_idx);
 
-/*! discards the first media resource in the queue of this group
+/*! gets average duration of segments for the current rep.
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
+\param duration set to average segment duration
+\param timescale set to timescale used to exprss duration
+\return error if any
 */
-void gf_dash_group_discard_segment(GF_DashClient *dash, u32 group_idx);
+GF_Err gf_dash_group_get_segment_duration(GF_DashClient *dash, u32 group_idx, u32 *duration, u32 *timescale);
 
-/*! gets the number of media resources available in the cache for this group
+/*! gets ID of active representaion.
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
-\param group_is_done setto GF_TRUE if group is done playing
-\return number of segments ready
+\return ID of representation, NULL if error
 */
-u32 gf_dash_group_get_num_segments_ready(GF_DashClient *dash, u32 group_idx, Bool *group_is_done);
+const char *gf_dash_group_get_representation_id(GF_DashClient *dash, u32 group_idx);
 
-/*! get the maximum number of media resources that can be put in the cache for this group in threaded mode.
-In unthreaded mode, only the next URL is available and the caller is responsible for fetching the media
+/*! returns number of seconds at which playback shall start for the group in the current period.
+The first segment available for the period will be so that gf_dash_group_get_start_range is in this range after the caller
+adjusts it with PTO (eg the returned time is in period timeline, not media timeline)
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return media playback start range in seconds*/
+Double gf_dash_group_get_start_range(GF_DashClient *dash, u32 group_idx);
+
+/*! discards the first media resource in the queue of this group
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
-\return maximum number of cached segments
 */
-u32 gf_dash_group_get_max_segments_in_cache(GF_DashClient *dash, u32 group_idx);
+void gf_dash_group_discard_segment(GF_DashClient *dash, u32 group_idx);
 
 /*! indicates to the DASH engine that the group playback has been stopped by the user
 \param dash the target dash client
@@ -554,6 +581,13 @@
 */
 Bool gf_dash_in_last_period(GF_DashClient *dash, Bool check_eos);
 
+/*! checks if the group is playing
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return GF_TRUE if group is done playing
+*/
+Bool gf_dash_get_group_done(GF_DashClient *dash, u32 group_idx);
+
 /*! gets current period switching status for the session.
 \param dash the target dash client
 \return possible values:
@@ -612,9 +646,13 @@
 /*! updates media bandwidth for the given group. Only allowed for groups without dependencies to other groups
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
+\param bits_per_sec current download rate in bits per seconds
+\param total_bytes total size of segment being downloaded
+\param bytes_done number of bytes already downloaded in current segment
+\param us_since_start time elapsed in microseconds since segment has been scheduled for download
 \return error if any
 */
-GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 group_idx);
+GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 group_idx, u32 bits_per_sec, u64 total_bytes, u64 bytes_done, u64 us_since_start);
 
 /*! enables UTC drift computation using HTTP header "Server-UTC: UTC", where UTC is in ms
 \param dash the target dash client
@@ -634,6 +672,12 @@
 */
 u32 gf_dash_get_min_buffer_time(GF_DashClient *dash);
 
+/*! gets the maximum segment duration in session
+\param dash the target dash client
+\return the maximum segment duration in ms
+*/
+u32 gf_dash_get_max_segment_duration(GF_DashClient *dash);
+
 /*! gets the difference between the local UTC clock and the one reported by the server
 \param dash the target dash client
 \return difference in milliseconds
@@ -662,18 +706,19 @@
 */
 GF_Err gf_dash_set_min_timeout_between_404(GF_DashClient *dash, u32 min_timeout_between_404);
 
-/*! sets time in ms after which 404 request for a segment will indicate segment lost. The clien always retries for segment availability time + segment duration. This allows extanding slightly the probe time (used when segment durations varies, or for VBR broadcast). The default value is 100 ms.
+/*! sets time in ms after which 404 request for a segment will indicate segment lost. The client always retries for segment availability time + segment duration. This allows extending slightly the probe time (used when segment durations varies, or for VBR broadcast). The default value is 100 ms.
 \param dash the target dash client
 \param expire_after_ms delay in milliseconds
 \return error if any
 */
 GF_Err gf_dash_set_segment_expiration_threshold(GF_DashClient *dash, u32 expire_after_ms);
 
-/*! only enables the given group - this shall be set before calling \ref gf_dash_open. If group_idx is <0 (default) no groups will be disabled
+/*! only enables the given groups - this shall be set before calling \ref gf_dash_open. If NULL, no groups will be disabled
 \param dash the target dash client
-\param group_idx the 0-based index of the target group
+\param groups_idx list of 0-based index of the target groups to enable,
+\param nb_groups number of group indexes in list
 */
-void gf_dash_debug_group(GF_DashClient *dash, s32 group_idx);
+void gf_dash_debug_groups(GF_DashClient *dash, const u32 *groups_idx, u32 nb_groups);
 
 /*! split all adatation sets so that they contain only one representation (quality)
 \param dash the target dash client
@@ -717,6 +762,24 @@
 */
 void gf_dash_set_agressive_adaptation(GF_DashClient *dash, Bool enable_agressive_switch);
 
+/*! enables single-range requests for LL-HLS byterange, rather than issuing a request per PART. This assumes that:
+ - each URI in the different parts is the SAME
+ - byte ranges are contiguous in the URL
+
+Errors will be thrown if these are not met on future parts and merging will be disabled, however the scheduled buggy segment will NOT be disarded
+
+\param dash the target dash client
+\param enable_single_range if GF_TRUE, enables single range, otherwise disables it
+*/
+void gf_dash_enable_single_range_llhls(GF_DashClient *dash, Bool enable_single_range);
+
+/*! create a new DASH client
+\param dash the target dash cleint
+\param auto_switch_count forces representation switching (quality up if positive, down if negative) every auto_switch_count segments, set to 0 to disable
+\param auto_switch_loop if false (default when creating dasher), restart at lowest quality when higher quality is reached and vice-versa. If true, quality switches decreases then increase in loop
+*/
+void gf_dash_set_auto_switch(GF_DashClient *dash, s32 auto_switch_count, Bool auto_switch_loop);
+
 /*! returns active period start
 \param dash the target dash client
 \return period start in milliseconds
@@ -750,6 +813,7 @@
 void gf_dash_disable_speed_adaptation(GF_DashClient *dash, Bool disable);
 
 /*! DASH/HLS quality information structure*/
+//UPDATE DASHQualityInfoNat in libgpac.py whenever modifying this structure !!
 typedef struct
 {
 	/*! bandwidth in bits per second*/
@@ -767,9 +831,9 @@
 	/*! video interlaced flag*/
 	Bool interlaced;
 	/*! video framerate numerator*/
-	u32 fps_den;
-	/*! video framerate denominator*/
 	u32 fps_num;
+	/*! video framerate denominator*/
+	u32 fps_den;
 	/*! video sample aspect ratio numerator*/
 	u32 par_num;
 	/*! video sample aspect ratio denominator*/
@@ -782,6 +846,12 @@
 	Bool disabled;
 	/*! selected flag*/
 	Bool is_selected;
+	/*! AST offset in seconds, 0 if not low latency*/
+	Double ast_offset;
+	/*! average segment duration, 0 if unknown*/
+	Double average_duration;
+	/*! list of segmentURLs if known, NULL otherwise. Used for onDemand profile to get segment sizes*/
+	const GF_List *seg_urls;
 } GF_DASHQualityInfo;
 
 /*! gets information on a given quality
@@ -793,6 +863,15 @@
 */
 GF_Err gf_dash_group_get_quality_info(GF_DashClient *dash, u32 group_idx, u32 quality_idx, GF_DASHQualityInfo *quality);
 
+/*! gets segment template info used by group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param segment_timeline_timescale set to segment timeline timescale, or to 0 if no segment timeline
+\param init_url set to initialization URL (template, timeline or base URL for VoD) as indicated in manifest (no resolution to base URL)
+\return segment template, NULL if no templates used. Memory must be freed by caller
+*/
+char *gf_dash_group_get_template(GF_DashClient *dash, u32 group_idx, u32 *segment_timeline_timescale, const char **init_url);
+
 /*! checks automatic switching mode
 \param dash the target dash client
 \return GF_TRUE if automatic quality switching is enabled
@@ -821,13 +900,6 @@
 \return the current quality index for the given group*/
 s32 gf_dash_group_get_active_quality(GF_DashClient *dash, u32 group_idx);
 
-/*! gets download rate for a given group
-\param dash the target dash client
-\param group_idx the 0-based index of the target group
-\return download rate in bytes per second
-*/
-u32 gf_dash_group_get_download_rate(GF_DashClient *dash, u32 group_idx);
-
 /*! forces NTP of the DASH client to be the given NTP
 \param dash the target dash client
 \param server_ntp NTP timestamp to set as server clock
@@ -835,7 +907,7 @@
 void gf_dash_override_ntp(GF_DashClient *dash, u64 server_ntp);
 
 /*! Tile adaptation mode
-This mode specifies how bitrate is allocated accross tiles of the same video
+This mode specifies how bitrate is allocated across tiles of the same video
 */
 typedef enum
 {
@@ -866,6 +938,13 @@
 */
 void gf_dash_set_tile_adaptation_mode(GF_DashClient *dash, GF_DASHTileAdaptationMode mode, u32 tile_rate_decrease);
 
+
+/*! consider tile with highest quality degradation hints (not visible ones or not gazed at) as lost, triggering a GF_URL_REMOVE upon \ref gf_dash_group_get_next_segment_location calls. Mostly used to debug tiling adaptation
+\param dash the target dash client
+\param disable_tiles if GF_TRUE, tiles with highest quality degradation hints will not be played.
+*/
+void gf_dash_disable_low_quality_tiles(GF_DashClient *dash, Bool disable_tiles);
+
 /*! gets current tile adaptation mode
 \param dash the target dash client
 \return tile adaptation mode*/
@@ -932,6 +1011,13 @@
 */
 void gf_dash_set_period_xlink_query_string(GF_DashClient *dash, const char *query_string);
 
+/*! sets MPD chaining mode
+\param dash the target dash client
+\param chaining_mode if 0, no chaining. If 1, chain at end. If 2 chain on error or at end
+*/
+void gf_dash_set_chaining_mode(GF_DashClient *dash, u32 chaining_mode);
+
+
 /*! DASH client adaptation algorithm*/
 typedef enum {
 	/*! no adaptation*/
@@ -949,7 +1035,9 @@
 	/*! BOLA-U*/
 	GF_DASH_ALGO_BOLA_U,
 	/*! BOLA-O*/
-	GF_DASH_ALGO_BOLA_O
+	GF_DASH_ALGO_BOLA_O,
+	/*! Custom*/
+	GF_DASH_ALGO_CUSTOM
 } GF_DASHAdaptationAlgorithm;
 
 /*! sets dash adaptation algorithm. Cannot be called on an active session
@@ -961,26 +1049,28 @@
 /*! sets group download status of the last downloaded segment for non threaded modes
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
+\param dep_rep_idx the 0-based index of the current dependent rep
 \param err error status of the download, GF_OK if no error
 */
-void gf_dash_set_group_download_state(GF_DashClient *dash, u32 group_idx, GF_Err err);
+void gf_dash_set_group_download_state(GF_DashClient *dash, u32 group_idx, u32 dep_rep_idx, GF_Err err);
 
 /*! sets group download statistics of the last downloaded segment for non threaded modes
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
+\param dep_rep_idx the 0-based index of the dependent rep
 \param bytes_per_sec transfer rates in bytes per seconds
 \param file_size segment size in bytes
-\param bytes_done number of received bytes
 \param is_broadcast set to GF_TRUE if the file is received over a multicast/broadcast link such as eMBMS or ROUTE (i.e. file was pushed to cache)
+\param us_since_start time in microseconds since start of the download
 */
-void gf_dash_group_store_stats(GF_DashClient *dash, u32 group_idx, u32 bytes_per_sec, u32 file_size, u32 bytes_done, Bool is_broadcast);
+void gf_dash_group_store_stats(GF_DashClient *dash, u32 group_idx, u32 dep_rep_idx, u32 bytes_per_sec, u64 file_size, Bool is_broadcast, u64 us_since_start);
 
-/*! sets availabilityStartTime shift for ATSC. By default the ATSC tune-in is done by matching the last received segment name
-to the segment template and deriving the ATSC UTC reference from that. The function allows shifting the computed value by a given amount.
+/*! sets availabilityStartTime shift for ROUTE. By default the ROUTE tune-in is done by matching the last received segment name
+to the segment template and deriving the ROUTE UTC reference from that. The function allows shifting the computed value by a given amount.
 \param dash the target dash client
-\param ast_shift clock shift in milliseconds of the ATSC receiver tune-in. Positive values shift the clock in the future, negative ones in the past
+\param ast_shift clock shift in milliseconds of the ROUTE receiver tune-in. Positive values shift the clock in the future, negative ones in the past
 */
-void gf_dash_set_atsc_ast_shift(GF_DashClient *dash, u32 ast_shift);
+void gf_dash_set_route_ast_shift(GF_DashClient *dash, u32 ast_shift);
 
 /*! gets the minimum wait time before calling \ref gf_dash_process again for unthreaded mode
 \param dash the target dash client
@@ -991,9 +1081,85 @@
 /*! gets the adaptation set ID of a given group
 \param dash the target dash client
 \param group_idx the 0-based index of the target group
-\return the adaptation set ID
+\return the adaptation set ID, -1 if not set
 */
-u32 gf_dash_group_get_as_id(GF_DashClient *dash, u32 group_idx);
+s32 gf_dash_group_get_as_id(GF_DashClient *dash, u32 group_idx);
+
+/*! check if the group has an init segment associated
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return GF_TRUE if init segment is present, GF_FALSE otherwise
+*/
+Bool gf_dash_group_has_init_segment(GF_DashClient *dash, u32 group_idx);
+
+//any change to the structure below MUST be reflected in libgpac.py !!
+
+/*! Information passed to DASH custom algorithm*/
+typedef struct
+{
+	/*! last segment download rate in bits per second */
+	u32 download_rate;
+	/*! size of last downloaded segment*/
+	u32 file_size;
+	/*! current playback speed*/
+	Double speed;
+	/*! max supported playback speed according to associated decoder stats*/
+	Double max_available_speed;
+	/*! display width of the video in pixels, 0 if audio stream*/
+	u32 display_width;
+	/*! display height of the video in pixels, 0 if audio stream*/
+	u32 display_height;
+	/*! index of currently selected quality*/
+	u32 active_quality_idx;
+	/*! minimum buffer level in milliseconds below witch rebuffer will happen*/
+	u32 buffer_min_ms;
+	/*! maximum buffer level allowed in milliseconds. Packets won't get dropped if overflow, but the algorithm should try not to overflow this buffer*/
+	u32 buffer_max_ms;
+	/*! current buffer level in milliseconds*/
+	u32 buffer_occupancy_ms;
+	/*! degradation hint, 0 means no degradation, 100 means tile completely hidden*/
+	u32 quality_degradation_hint;
+	/*! cumulated download rate of all active groups - 0 means all files are local*/
+	u32 total_rate;
+} GF_DASHCustomAlgoInfo;
+
+/*! Callback function for custom rate adaptation
+\param udta user data
+\param group_idx index of group to adapt
+\param base_group_idx index of associated base group if group is a dependent group
+\param force_lower_complexity set to true if the dash client would like a lower complexity
+\param stats statistics for last downloaded segment
+\return value can be:
+- the index of the new quality to select (as listed in group.reps[])
+- `-1` to not take decision now and postpone it until dependent groups are done
+- `-2` to disable quality
+- any other negative value means error
+ */
+typedef s32 (*gf_dash_rate_adaptation)(void *udta, u32 group_idx, u32 base_group_idx, Bool force_lower_complexity, GF_DASHCustomAlgoInfo *stats);
+
+/*! Callback function for custom rate monitor, not final yet
+\param udta user data
+\param group_idx index of group to adapt
+\param bits_per_sec estimated download rate (not premultiplied by playback speed)
+\param total_bytes size of segment being downloaded, 0 if unknown
+\param bytes_done bytes received for segment
+\param us_since_start microseconds ellapse since segment was sheduled for download
+\param buffer_dur_ms current buffer duration in milliseconds
+\param current_seg_dur duration of segment being downloaded, 0 if unknown
+\return quality index (>=0) to switch to after abort, -1 to do nothing (no abort), -2 for internal algorithms having already setup the desired quality and requesting only abort
+ */
+typedef s32 (*gf_dash_download_monitor)(void *udta, u32 group_idx, u32 bits_per_sec, u64 total_bytes, u64 bytes_done, u64 us_since_start, u32 buffer_dur_ms, u32 current_seg_dur);
+
+
+/*! sets custom rate adaptation logic
+\param dash the target dash client
+\param udta user data to pass back to callback functions
+\param algo_custom rate adaptation custom logic
+\param download_monitor_custom download monitor custom logic
+ */
+void gf_dash_set_algo_custom(GF_DashClient *dash, void *udta,
+		gf_dash_rate_adaptation algo_custom,
+		gf_dash_download_monitor download_monitor_custom);
 
 
 #endif //GPAC_DISABLE_DASH_CLIENT

gpac-1.0.1.tar.gz/include/gpac/download.h -> gpac-2.0.0.tar.gz/include/gpac/download.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -154,13 +154,18 @@
 	/*!signal that the session has been deconnected*/
 	GF_NETIO_DISCONNECTED,
 	/*!downloader session failed (error code set) or done/destroyed (no error code)*/
-	GF_NETIO_STATE_ERROR
+	GF_NETIO_STATE_ERROR,
+	/*!signal that a new session is being requested on that same connection (h2, h3)
+	This is only used for server sessions*/
+	GF_NETIO_REQUEST_SESSION,
+	/*! stream has been canceled by remote peer*/
+	GF_NETIO_CANCEL_STREAM,
 } GF_NetIOStatus;
 
 /*!session download flags*/
 typedef enum
 {
-	/*!session is not threaded, the user must explicitely fetch the data , either with the function gf_dm_sess_fetch_data
+	/*!session is not threaded, the user must explicitly fetch the data , either with the function gf_dm_sess_fetch_data
 	or the function gf_dm_sess_process- if the session is threaded, the user must call gf_dm_sess_process to start the session*/
 	GF_NETIO_SESSION_NOT_THREADED = 1,
 	/*! session data is cached or not */
@@ -174,6 +179,8 @@
 	GF_NETIO_SESSION_MEMORY_CACHE = 1<<4,
 	/*! do not delete files after download*/
 	GF_NETIO_SESSION_KEEP_CACHE = 1<<5,
+	/*! do not delete files after download of first resource (used for init segments)*/
+	GF_NETIO_SESSION_KEEP_FIRST_CACHE = 1<<6,
 } GF_NetIOFlags;
 
 
@@ -384,7 +391,7 @@
 #ifndef GPAC_DISABLE_CORE_TOOLS
 /*!
 Downloads a file over the network using a download manager
-\param dm The download manager to use, function will use all associated cache ressources
+\param dm The download manager to use, function will use all associated cache resources
 \param url The url to download
 \param filename The filename to download
 \param start_range start position of a byte range
@@ -488,11 +495,12 @@
 
 Forces session to use memory storage for future downloads
 \param sess the current session
+\param force_cache_type if 1, cache will be kept even if session is reassigned. If 2, cache will ne kept for next resource downloaded, then no caching for subsequent resources (used for init segments)
 */
-void gf_dm_sess_force_memory_mode(GF_DownloadSession *sess);
+void gf_dm_sess_force_memory_mode(GF_DownloadSession *sess, u32 force_cache_type);
 
 /*!
-Registers a locacl cache provider (bypassing the http session), used when populating cache from input data (atsc for example)
+Registers a local cache provider (bypassing the http session), used when populating cache from input data (ROUTE for example)
 
 \param dm the download manager
 \param local_cache_url_provider_cbk callback function to the cache provider. The callback function shall return GF_TRUE if the requested URL is provided by this local cache
@@ -506,8 +514,7 @@
 
 \param dm the download manager
 \param szURL the URL this resource is caching
-\param data data of the resource
-\param size size of the resource
+\param blob blob object holding the data of the resource
 \param start_range start range of the data in the resource
 \param end_range start range of the data in the resource. If both start_range and end_range are 0, the data is the complete resource
 \param mime associated MIME type if any
@@ -515,7 +522,7 @@
 \param download_time_ms indicates the download time of the associated resource, if known, 0 otherwise.
 \return a cache entry structure
 */
-const DownloadedCacheEntry gf_dm_add_cache_entry(GF_DownloadManager *dm, const char *szURL, u8 *data, u64 size, u64 start_range, u64 end_range, const char *mime, Bool clone_memory, u32 download_time_ms);
+DownloadedCacheEntry gf_dm_add_cache_entry(GF_DownloadManager *dm, const char *szURL, GF_Blob *blob, u64 start_range, u64 end_range, const char *mime, Bool clone_memory, u32 download_time_ms);
 
 /*!
 Forces HTTP headers for a given cache entry

gpac-1.0.1.tar.gz/include/gpac/events.h -> gpac-2.0.0.tar.gz/include/gpac/events.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Events management
@@ -151,7 +151,7 @@
 
 	Bool disable_vsync;
 
-	// resources must be resetup before next render step (this is mainly due to discard all openGL textures and cached objects) - inly used when sent from plugin to term
+	// resources must be resetup before next render step (this is mainly due to discard all OpenGL textures and cached objects) - inly used when sent from plugin to term
 	Bool hw_reset;
 } GF_EventVideoSetup;
 
@@ -304,7 +304,7 @@
 	u8 type;
 	/*the URL the auth request is for*/
 	const char *site_url;
-	/*user name (provided buffer can hold 50 bytes). It may already be formated, or an empty ("") string*/
+	/*user name (provided buffer can hold 50 bytes). It may already be formatted, or an empty ("") string*/
 	char *user;
 	/*password (provided buffer can hold 50 bytes)*/
 	char *password;

gpac-1.0.1.tar.gz/include/gpac/evg.h -> gpac-2.0.0.tar.gz/include/gpac/evg.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Embedded Vector Graphics engine
@@ -132,7 +132,7 @@
 	GF_RASTER_HIGH_SPEED,
 	/*! raster should use fast mode and good quality if possible*/
 	GF_RASTER_MID,
-	/*! raster should use full antialiasing*/
+	/*! raster should use full antialiasing - this is the default for all new surfaces*/
 	GF_RASTER_HIGH_QUALITY
 } GF_RasterQuality;
 
@@ -154,6 +154,33 @@
 */
 GF_Err gf_evg_stencil_set_matrix(GF_EVGStencil *stencil, GF_Matrix2D *mat);
 
+/*! gets stencil transformation matrix
+\param stencil the target stencil
+\param mat the 2D matrix to fetch
+\return TRUE if resulting matrix is fetched, false otherwise (matrix is identity or does not apply to this stencil class)
+*/
+Bool gf_evg_stencil_get_matrix(GF_EVGStencil * stencil, GF_Matrix2D *mat);
+
+/*! sets stencil transformation matrix auto mode.
+
+When auto matrix mode is activated, the stencil matrix only describes texture mapping transform in uv space (normalized UV coordinates, OpenGL like),
+and final transformation to raster coordinates is done internally.
+When auto matrix mode is not activated,, the stencil matrix must describe the complete transformation from uv space to raster coordinates (consequently, the matrix usually includes the final path transformation).
+
+Stencils are by default created in auto matrix mode.
+
+\param stencil the target stencil
+\param auto_on  If true,  the surface current matrix will be added to the stencil matrix when drawing, otherwise the stencil matrix is in final surface coordinates
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_auto_matrix(GF_EVGStencil * stencil, Bool auto_on);
+
+/*! sets stencil transformation matrix auto mode.
+\param stencil the target stencil
+\return true if auto mode is enabled, false otherwise
+*/
+Bool gf_evg_stencil_get_auto_matrix(GF_EVGStencil * stencil);
+
 /*! gets stencil type
 \param stencil the target stencil
 \return stencil type
@@ -167,6 +194,12 @@
 */
 GF_Err gf_evg_stencil_set_brush_color(GF_EVGStencil *stencil, GF_Color color);
 
+/*! gets color for solid brush stencil
+\param stencil the target stencil
+\return the stencil color
+*/
+GF_Color gf_evg_stencil_get_brush_color(GF_EVGStencil * stencil);
+
 /*! sets gradient repeat mode for a gradient stencil
 \note this may be called before the gradient is setup
 \param stencil the target stencil
@@ -219,7 +252,7 @@
 */
 GF_Err gf_evg_stencil_push_gradient_interpolation(GF_EVGStencil *stencil, Fixed pos, GF_Color col);
 
-/*! sets global alpha blending level for a texture or gradient stencil
+/*! sets global alpha blending level for a stencil
 The alpha channel will be combined with the color matrix if any
 \warning do not use with solid brush stencil
 \param stencil the target stencil
@@ -228,6 +261,12 @@
 */
 GF_Err gf_evg_stencil_set_alpha(GF_EVGStencil *stencil, u8 alpha);
 
+/*! gets global alpha blending level of a stencil
+\param stencil the target stencil
+\return the alpha value between 0 (full transparency) and 255 (full opacityy)
+*/
+u8 gf_evg_stencil_get_alpha(GF_EVGStencil *stencil);
+
 /*! sets pixel data for a texture stencil
 \param stencil the target stencil
 \param pixels texture data starting from top row
@@ -287,6 +326,20 @@
 */
 GF_Err gf_evg_stencil_set_mapping(GF_EVGStencil *stencil, GF_TextureMapFlags map_mode);
 
+/*! sets padding color in RGBA
+ If texture repeat is disabled and pad color is set, this color is used when outside of image, otherwise pixel is fetch from image border
+\param stencil the target stencil
+\param pad_color color to use , 0 disables color padding
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_pad_color(GF_EVGStencil * stencil, GF_Color pad_color);
+
+/*! gets padding color in RGBA
+\param stencil the target stencil
+\return color  used , 0 if error
+*/
+u32 gf_evg_stencil_get_pad_color(GF_EVGStencil * stencil);
+
 /*! sets filtering mode for a texture stencil
 \param stencil the target stencil
 \param filter_mode texture filtering mode to set
@@ -295,14 +348,20 @@
 GF_Err gf_evg_stencil_set_filter(GF_EVGStencil *stencil, GF_TextureFilter filter_mode);
 
 /*! sets color matrix of a stencil
-\warning ignored for solid brush stencil
 \param stencil the target stencil
 \param cmat the color matrix to use. If NULL, resets current color matrix
 \return error if any
  */
 GF_Err gf_evg_stencil_set_color_matrix(GF_EVGStencil *stencil, GF_ColorMatrix *cmat);
 
-/*! gets pixel at given position (still experimental)
+/*! gets color matrix of a stencil
+\param stencil the target stencil
+\param cmat filled with current color matrix of stencil
+\return error if any
+ */
+GF_Err gf_evg_stencil_get_color_matrix(GF_EVGStencil *stencil, GF_ColorMatrix *cmat);
+
+/*! gets pixel at given position in ARGB format
 \param stencil the target stencil
 \param x horizontal coord
 \param y vertical coord
@@ -310,31 +369,47 @@
  */
 u32 gf_evg_stencil_get_pixel(GF_EVGStencil *stencil, s32 x, s32 y);
 
+/*! gets pixel at given position in AYUV format
+\param stencil the target stencil
+\param x horizontal coord
+\param y vertical coord
+\return pixel value
+ */
+u32 gf_evg_stencil_get_pixel_yuv(GF_EVGStencil *stencil, s32 x, s32 y);
+
+/*! gets pixel at given position in ARGB format for more than 8 bits textures
+\param stencil the target stencil
+\param x horizontal coord
+\param y vertical coord
+\return pixel value
+ */
+u64 gf_evg_stencil_get_pixel_wide(GF_EVGStencil *stencil, s32 x, s32 y);
+
+/*! gets pixel at given position in AYUV format for more than 8 bits textures
+\param stencil the target stencil
+\param x horizontal coord
+\param y vertical coord
+\return pixel value
+ */
+u64 gf_evg_stencil_get_pixel_yuv_wide(GF_EVGStencil *stencil, s32 x, s32 y);
+
 /*! gets ARGB pixel at a given position
  The position is given as normalize coordinates (between 0.0 and 1.0), {0.0,0.0} is top-left, {1.0,1.0} is bottom-right
 \param stencil the target stencil
 \param x horizontal coord
 \param y vertical coord
-\param r output r component
-\param g output g component
-\param b output b component
-\param a output a component
-\return error if any
+\return output r, r, g, a components
  */
-GF_Err gf_evg_stencil_get_pixel_f(GF_EVGStencil *stencil, Float x, Float y, Float *r, Float *g, Float *b, Float *a);
+GF_Vec4 gf_evg_stencil_get_pixel_f(GF_EVGStencil *stencil, Float x, Float y);
 
 /*! gets AYUV pixel at a given position
   The position is given as normalize coordinates (between 0.0 and 1.0), {0.0,0.0} is top-left, {1.0,1.0} is bottom-right
 \param stencil the target stencil
 \param x horizontal coord
 \param y vertical coord
-\param Y output y component
-\param U output u component
-\param V output v component
-\param A output a component
-\return error if any
+\return output y, u, v, a components
  */
-GF_Err gf_evg_stencil_get_pixel_yuv_f(GF_EVGStencil *stencil, Float x, Float y, Float *Y, Float *U, Float *V, Float *A);
+GF_Vec4 gf_evg_stencil_get_pixel_yuv_f(GF_EVGStencil *stencil, Float x, Float y);
 
 /*! creates a canvas surface object
 \param center_coords if GF_TRUE, indicates mathematical-like coord system (0,0) at the center of the canvas, otherwise indicates computer-like coord system (0,0) top-left corner
@@ -346,6 +421,12 @@
 */
 void gf_evg_surface_delete(GF_EVGSurface *surf);
 
+/*! enables threading on a canvas surface object (can only be called once per surface)
+\param surf the target surface
+\param nb_threads number of additional threads to use for rendering. -1 use all availables core
+\return error if any, GF_BAD_PARAM  if threading was already allocated, GF_IO_ERR if only one core available and nb_threads not assigned to a positive value*/
+GF_Err gf_evg_enable_threading(GF_EVGSurface *surf, s32 nb_threads);
+
 /*! attaches a surface object to a texture stencil object
 \param surf the surface object
 \param sten the stencil object (shll be a texture stencil)
@@ -372,6 +453,18 @@
 */
 GF_Err gf_evg_surface_set_raster_level(GF_EVGSurface *surf, GF_RasterQuality level);
 
+/*! gets rasterizer precision
+\param surf the surface object
+\return the raster quality level
+*/
+GF_RasterQuality gf_evg_surface_get_raster_level(GF_EVGSurface *surf);
+
+/*! Force next path fill to use antialias, reset at each  \ref gf_evg_surface_set_path
+\param surf the surface object
+\return error if any
+*/
+GF_Err gf_evg_surface_force_aa(GF_EVGSurface *surf);
+
 /*! sets the given matrix as the current transformations for all drawn paths
 \note this is only used for 2D rasterizer, and ignored in 3D mode
 \param surf the surface object
@@ -382,6 +475,13 @@
 
 /*! sets the given matrix as the current transformations for all drawn paths. The matrix shall be a projection matrix (ortho or perspective)
 with normalized coordinates in [-1,1]. It may also contain a modelview part.
+
+Perspective correct mapping is supported for textures and gradients:
+- the bottom-left corner of the path bounds is texture coordinate 0,0
+- the top-right corner of the path bounds is texture coordinate 1,1
+
+\warning When 3D matrices are used, filling a path shall be done with a stencil in auto matrix mode.
+
 \note this is only used for 2D rasterizer, and ignored in 3D mode
 \param surf the surface object
 \param mat the matrix to set; if NULL, resets the current transformation
@@ -397,6 +497,12 @@
 */
 GF_Err gf_evg_surface_set_clipper(GF_EVGSurface *surf, GF_IRect *rc);
 
+/*! checks if clipper is active
+\param surf the surface object
+\return GF_TRUE if clipper is active, GF_FALSE otherwise
+*/
+Bool gf_evg_surface_use_clipper(GF_EVGSurface *surf);
+
 /*! sets the given path as the current one for drawing
 \warning This will internally copy the path after transformation with the current transfom. Changing the surface transform will have no effect unless calling this function again.
 The clipper and stencil mode may be changed at will
@@ -413,11 +519,63 @@
 \note this can be called several times with the same current path
 \note this is only used for 2D rasterizer, and ignored in 3D mode
 \param surf the surface object
-\param stencil the stencil to use to fill a path
+\param stencil the stencil to use to fill a path, if NULL uses 2D shader if setup
 \return error if any
 */
 GF_Err gf_evg_surface_fill(GF_EVGSurface *surf, GF_EVGStencil *stencil);
 
+
+/*! Operands for multitexture operations*/
+typedef enum {
+	/*! no multitexture*/
+	GF_EVG_OPERAND_NONE = 0,
+	/*! mix texture 1 and texure 2 using coefficient in first param, returning tx1*coef + tx2*(1-coef) but forcing alpha to full opacity*/
+	GF_EVG_OPERAND_MIX,
+	/*! mix texture 1 and texure 2 using coefficient in first param, returning tx1*coef + tx2*(1-coef), including alpha channel */
+	GF_EVG_OPERAND_MIX_ALPHA,
+	/*! replace alpha of texture 1 with alpha of texture 2
+		if first param is 0 or not set, use alpha channel from texture 2
+		if first param is 1, use red channel from texture 2
+		if first param is 2, use green/Cb/U channel from texture 2
+		if first param is 3, use blue/Cr/V channel from texture 2
+	*/
+	GF_EVG_OPERAND_REPLACE_ALPHA,
+	/*! replace alpha of texture 1 with (1-alpha) of texture 2
+		if first param is 0 or not set, use alpha channel from texture 2
+		if first param is 1, use red/Y channel from texture 2
+		if first param is 2, use green/Cb/U channel from texture 2
+		if first param is 3, use blue/Cr/V channel from texture 2
+	*/
+	GF_EVG_OPERAND_REPLACE_ONE_MINUS_ALPHA,
+	/*! mix texture 1 and texure 2 using alpha coef of texture 3 but forcing alpha to full opacity
+		if first param is 0 or not set, use alpha channel from texture 3
+		if first param is 1, use red channel from texture 3
+		if first param is 2, use green/Cb/U channel from texture 3
+		if first param is 3, use blue/Cr/V channel from texture 3
+	*/
+	GF_EVG_OPERAND_MIX_DYN,
+	/*! mix texture 1 and texure 2 using alpha coef of texture 3, including alpha channel.
+		if first param is 0 or not set, use alpha channel from texture 3
+		if first param is 1, use red channel from texture 3
+		if first param is 2, use green/Cb/U channel from texture 3
+		if first param is 3, use blue/Cr/V channel from texture 3
+	*/
+	GF_EVG_OPERAND_MIX_DYN_ALPHA,
+	/*! use texture 1 for odd fill and texture 2 for even fill*/
+	GF_EVG_OPERAND_ODD_FILL,
+} GF_EVGMultiTextureMode;
+
+/*! draw (filling) the current path on a surface using a compinaison of  stencils and current clipper if any.
+\param surf the surface object
+\param operand stencil combine effect
+\param sten1 the first stencil to use, if NULL assumes shader and ignores operand
+\param sten2 the second stencil to use, may be NULL depending on operand
+\param sten3 the third stencil to use, may be NULL depending on operand
+\param params the parameters to control the operand
+\return error if any
+*/
+GF_Err gf_evg_surface_multi_fill(GF_EVGSurface *surf, GF_EVGMultiTextureMode operand, GF_EVGStencil *sten1, GF_EVGStencil *sten2, GF_EVGStencil *sten3, Float params[4]);
+
 /*! clears given pixel rectangle on a surface with the given color
 \warning this ignores any clipper set on the surface
 \param surf the surface object
@@ -510,10 +668,11 @@
 	GF_EVG_QUAD_STRIP,
 } GF_EVGPrimitiveType;
 
-/*! creates a new 3D software rasterizer
- \note use \ref gf_evg_surface_delete for destruction
- \return NULL if error*/
-GF_EVGSurface *gf_evg_surface3d_new();
+/*! enables  3D software rasterizer for surface
+ \param surf the target 3D surface
+ \return error if any*/
+GF_Err gf_evg_surface_enable_3d(GF_EVGSurface *surf);
+
 /*! sets projection matrix
  \note this is only used for 3D rasterizer, and fails 2D mode
  \param surf the target 3D surface
@@ -609,10 +768,12 @@
 {
 	/*! fragment is invalid (discarded or error) */
 	GF_EVG_FRAG_INVALID = 0,
-	/*! fragment is RGB */
+	/*! fragment is RGB float*/
 	GF_EVG_FRAG_RGB,
+	GF_EVG_FRAG_RGB_PACK,
 	/*! fragment is YUV */
 	GF_EVG_FRAG_YUV,
+	GF_EVG_FRAG_YUV_PACK,
 } GF_EVGFragmentType;
 
 /*! Parameters for the fragment callback */
@@ -624,36 +785,56 @@
 	Float screen_y;
 	/*! screen z in NDC - input param*/
 	Float screen_z;
-	/*! depth - input and output param*/
+	/*! depth - input and output param - 3D shaders only*/
 	Float depth;
-	/*! primitive index in the current \ref gf_evg_surface_draw_array call, 0 being the first primitive  - input param*/
+	/*! primitive index in the current \ref gf_evg_surface_draw_array call, 0 being the first primitive  - input param - 3D shaders only*/
 	u32 prim_index;
-	/*! index of first vertex in the current primitive  - input param*/
+	/*! index of first vertex in the current primitive  - input param - 3D shaders only*/
 	u32 idx1;
-	/*! index of second vertex in the current primitive (for lines or triangles/quads)  - input param*/
+	/*! index of second vertex in the current primitive (for lines or triangles/quads)  - input param - 3D shaders only*/
 	u32 idx2;
-	/*! index of third vertex in the current primitive (for triangles/quads)  - input param*/
+	/*! index of third vertex in the current primitive (for triangles/quads)  - input param - 3D shaders only*/
 	u32 idx3;
 
-	/*! primitive type  - input param*/
+	/*! primitive type  - input param - 3D shaders only*/
 	GF_EVGPrimitiveType ptype;
 
 	/*! fragment color, must be written if fragment is not discarded - output value*/
 	GF_Vec4 color;
+	/*! fragment color in pack 32 bit ARGB/AYUV*/
+	u32 color_pack;
+	/*! fragment color in pack 64 bit ARGB/AYUV*/
+	u64 color_pack_wide;
 	/*! fragment valid state - output value*/
 	GF_EVGFragmentType frag_valid;
 
 	/*vars for lerp*/
-	/*perspective correct interpolation is done according to openGL eq 14.9
+	/*perspective correct interpolation is done according to OpenGL eq 14.9
 		f = (a*fa/wa + b*fb/wb + c*fc/wc) / (a/w_a + b/w_b + c/w_c)
 	*/
-	/*! perspective corrected barycentric, eg bc1/q1, bc2/q2, bc3/q3
-		these are constant throughout the fragment*/
+	/*! perspective corrected barycentric, eg bc1/q1, bc2/q2, bc3/q3  - 3D shaders only*/
 	Float pbc1, pbc2, pbc3;
-	/*! perspective divider
+	/*! perspective divider - 3D shaders only
 	\note this is also 1/W of the fragment, eg opengl gl_fragCoord.w
 	*/
 	Float persp_denum;
+	/* private for shader, valid between \ref gf_evg_fragment_shader_init (init, cleanup) calls */
+	void *shader_udta;
+
+	/*! horizontal texture coordinate, 0 is left of image -   2D shaders only */
+	u32 tx_x;
+	/*! vertical texture coordinate, 0 is top of image -   2D shaders only */
+	u32 tx_y;
+	/*! texture width -  2D shaders only */
+	u32 tx_width;
+	/*! texture height -  2D shaders only */
+	u32 tx_height;
+
+	/*! coverage value between 0 and 0xFF -  2D shaders only */
+	u8 coverage;
+	/*! odd / even flag for path drawn with zero/non-zero fill rule -  2D shaders only */
+	u8 odd_flag;
+
 } GF_EVGFragmentParam;
 
 
@@ -680,14 +861,26 @@
  \param fragp fragment paramters
  \return GF_TRUE if success; GF_FALSE if error*/
 typedef Bool (*gf_evg_fragment_shader)(void *udta, GF_EVGFragmentParam *fragp);
-/*! assigns fragment shader to the rasterizer
-\note this is only used for 3D rasterizer, and fails 2D mode
+
+/*! callback type for fragment shader init, called once before each primitive - may be NULL
+ \param udta opaque data passed back to caller
+ \param fragp fragment paramters
+ \param th_id index of thread context
+ \param is_cleanup if TRUE indicates and of primitive rendering, otherwise begin
+ \return GF_TRUE if success; GF_FALSE if error*/
+typedef Bool (*gf_evg_fragment_shader_init)(void *udta, GF_EVGFragmentParam *fragp, u32 th_id, Bool is_cleanup);
+
+
+/*! assigns fragment shader to the rasterizer.
+\warning If multithread is enabled, the shader must be thread-safe
+This can be used for 3D and 2D modes. In 2D mode, texture coordinates are derived from path bounds
 \param surf the target 3D surface
 \param shader the fragment shader callback to use
+\param shader_init the fragment shader init callback to use
 \param shader_udta opaque data to pass to the callback function
 \return error if any
  */
-GF_Err gf_evg_surface_set_fragment_shader(GF_EVGSurface *surf, gf_evg_fragment_shader shader, void *shader_udta);
+GF_Err gf_evg_surface_set_fragment_shader(GF_EVGSurface *surf, gf_evg_fragment_shader shader, gf_evg_fragment_shader_init shader_init, void *shader_udta);
 
 /*! callback type for vertex shader
 \param udta opaque data passed back to caller
@@ -856,6 +1049,40 @@
 */
 u64 gf_evg_ayuv_to_argb_wide(GF_EVGSurface *surf, u64 col);
 
+/*! global alpha mask values */
+typedef enum
+{
+	/*! global alpha mask not used */
+	GF_EVGMASK_NONE = 0,
+	/*! subsequent draw operations will target the global alpha mask */
+	GF_EVGMASK_DRAW,
+	/*! subsequent draw operations will target the global alpha mask, but alpha mask is not cleared */
+	GF_EVGMASK_DRAW_NO_CLEAR,
+	/*! subsequent draw operations will be filtered with the global alpha mask */
+	GF_EVGMASK_USE,
+	/*! subsequent draw operations will be filtered with 1 minus the global alpha mask */
+	GF_EVGMASK_USE_INV,
+	/*! combine draw and use: the mask is set to 0xFF, each pixel drawn turns the mask value to 0 */
+	GF_EVGMASK_RECORD,
+} GF_EVGMaskMode;
+
+/*! sets global alpha mask mode
+
+The global alpha mask is an 8-bit alpha channel the size of the surface. Any resize operation on the surface will reset the alpha mask
+Typcial usage for the alpha mask is to setup the surface, use GF_EVGMASK_DRAW to draw your mask then GF_EVGMASK_USE to apply the mask on your draw calls
+
+Whenever the mask mode is changed to GF_EVGMASK_DRAW, the alpha masked is cleared
+\param surf the target surface
+\param mask_mode the current mask mode
+\return error if any
+*/
+GF_Err gf_evg_surface_set_mask_mode(GF_EVGSurface *surf, GF_EVGMaskMode mask_mode);
+
+/*! gets global alpha mask mode
+\param surf the target surface
+\return the current mask mode
+*/
+GF_EVGMaskMode gf_evg_surface_get_mask_mode(GF_EVGSurface *surf);
 
 /*! @} */

gpac-1.0.1.tar.gz/include/gpac/filters.h -> gpac-2.0.0.tar.gz/include/gpac/filters.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / filters sub-project
@@ -55,52 +55,53 @@
 API Documentation of the filter managment system of GPAC.
 
 The filter management in GPAC is built using the following core objects:
-- \ref GF_FilterSession in charge of
- loading filters from register, managing argument parsing and co
- resolving filter graphs to handle PID connection(s)
- tracking data packets and properties exchanged on PIDs
- scheduling tasks between filters
- ensuring thread-safe filter state: a filter may be called from any thread in the session (unless explicitely asked not to), but only by a single thread at any time.
+- \ref GF_FilterSession in charge of:
+ - loading filters from register, managing argument parsing and co
+ - resolving filter graphs to handle PID connection(s)
+ - tracking data packets and properties exchanged on PIDs
+ - scheduling tasks between filters
+ - ensuring thread-safe filter state: a filter may be called from any thread in the session (unless explicitly asked not to), but only by a single thread at any time.
 - \ref __gf_filter_register static structure describing possible entry points of the filter, possible arguments and input output PID capabilities.
 	Each filter share the same API (register definition) regardless of its type: source/sink, mux/demux, encode/decode, raw media processing, encoded media processing, ...
 - \ref GF_Filter is an instance of the filter register. A filter implementation typical tasks are:
- accepting new input PIDs (for non source filters)
- defining new output PIDs (for non sink filters), applying any property change due to filter processing
- consuming packets on the input PIDs
- dispatching packets on the output PIDs
+ - accepting new input PIDs (for non source filters)
+ - defining new output PIDs (for non sink filters), applying any property change due to filter processing
+ - consuming packets on the input PIDs
+ - dispatching packets on the output PIDs
 - \ref GF_FilterPid handling the connections between two filters.
-	PID natively supports fan-out (one filter PID connecting to multiple destinations).
-	A PID is in charge of dispatching packets to possible destinations and storing PID properties in sync with dispatched packets.
-	Whenever PID properties change, the next packet sent on that PID is associated with the new state, and the destination filter(s) will be called
+	- PID natively supports fan-out (one filter PID connecting to multiple destinations).
+	- A PID is in charge of dispatching packets to possible destinations and storing PID properties in sync with dispatched packets.
+	- Whenever PID properties change, the next packet sent on that PID is associated with the new state, and the destination filter(s) will be called
 	upon fetching the new packet. This is the one of the two reentrant code of a filter, the other one being the \ref GF_FEVT_INFO_UPDATE event.
-	When blocking mode is not disabled at the session filter, a PID is also in charge of managing its occupancy through either a number of packets or the
+	- When blocking mode is not disabled at the session filter, a PID is also in charge of managing its occupancy through either a number of packets or the
 	cumulated duration of the packets it is holding.
-	Whenever a PID holds too much data, it enters a blocking state. A filter with ALL its output PIDs in a blocked state won't be scheduled
+	- Whenever a PID holds too much data, it enters a blocking state. A filter with ALL its output PIDs in a blocked state won't be scheduled
 	for processing. This is a semi-blocking design, which imply that if a filter has one of its PIDs in a non blocking state, it will be scheduled for processing. If a PID has multiple destinations and one of the destination consumes faster than the other one, the filter is currently not blocking (this might change in the near future).
-	A PID is in charge of managing the packet references across filters, by performing memory management of allocated data packets
+	- A PID is in charge of managing the packet references across filters, by performing memory management of allocated data packets
 	 (avoid alloc/free at each packet but rather recycle the memory) and tracking shared packets references.
 - \ref GF_FilterPacket holding data to dispatch from a filter on a given PID.
-	Packets are always associated to a single output PID, ie it is not possible for a filter to send one packet to multiple PIDs, the data has to be cloned.
-	Packets have default attributes such as timestamps, size, random access status, start/end frame, etc, as well as optional properties.
-	All packets are reference counted.
-	A packet can hold allocated block on the output PID, a pointer to some filter internal data, a data reference to a single input packet, or a frame interface object used for accessing data or OpenGL textures of the emitting filter.
+	- Packets are always associated to a single output PID, ie it is not possible for a filter to send one packet to multiple PIDs, the data has to be cloned.
+	- Packets have default attributes such as timestamps, size, random access status, start/end frame, etc, as well as optional properties.
+	- All packets are reference counted.
+	- A packet can hold allocated block on the output PID, a pointer to some filter internal data, a data reference to a single input packet, or a frame interface object used for accessing data or OpenGL textures of the emitting filter.
 	Packets holding data references rather than copy are notified back to their creators upon destruction.
 - \ref __gf_prop_val holding various properties for a PID or a packet
-	Properties can be copied/merged between input and output PIDs, or input and output packets. These properties are reference counted.
-	Two kinds of properties are defined, built-in ones which use a 32 bit identifier (usually a four character code), and user properties identified by a string.
-	PID properties are defined by the filter creating the PID. They can be overridden/added after being set by the filter by specifying fragment properties
+	- Properties can be copied/merged between input and output PIDs, or input and output packets. These properties are reference counted.
+	- Two kinds of properties are defined, built-in ones which use a 32 bit identifier (usually a four character code), and user properties identified by a string.
+	- PID properties are defined by the filter creating the PID. They can be overridden/added after being set by the filter by specifying fragment properties
 	in the filter arguments. For example \code fin=src=myfile.foo:#FEXT=bar \endcode will override the file extension property (FEXT) foo to bar AFTER the PID is being defined.
 - \ref __gf_filter_event used to pass various events (play/stop/buffer requirements/...) up and down the filter chain.
 	This part of the API will likely change in the future, being merged with the global GF_Event of GPAC.
 
 
 GPAC comes with a set of built-in filters in libgpac. It is also possible to define external filters in dynamic libraries. GPAC will look for such libraries
- in folders listed in GPAC config file section core, key mod-dirs. The files SHALL be named gf_* and export a function called RegisterFilter
+ in default module folder and folders listed in GPAC config file section core, key mod-dirs. The files SHALL be named gf_* and export a function called RegisterFilter
 with the following prototype:
 
+
 \param fsess is set to NULL unless meta filters are listed, in which case the filter register should list all possible meta filters it supports
 \return a GF_FilterRegister structure used for instantiating the filter.
-const GF_FilterRegister *RegisterFilter(GF_FilterSession *fsess);
+\code const GF_FilterRegister *RegisterFilter(GF_FilterSession *fsess);\endcode
 
 */
 
@@ -203,42 +204,45 @@
 	GF_FS_SCHEDULER_DIRECT
 } GF_FilterSchedulerType;
 
-/*! Flag set to indicate meta filters should be loaded. A meta filter is a filter providing various subfilters.
-The subfilters are usually not exposed as filters, only the parent one is.
-When set, all subfilters are exposed. This should only be set when inspecting filters help*/
+/*! Flag set to indicate meta filters should be loaded. A meta filter is a filter providing various sub-filters.
+The sub-filters are usually not exposed as filters, only the parent one is.
+When set, all sub-filters are exposed. This should only be set when inspecting filters help*/
 #define GF_FS_FLAG_LOAD_META	1<<1
-/*! Flag set to disable the blocking mode of the filter session. The default is a semi-blocking mode, cf \ref gf_filter_pid_would_block*/
-#define GF_FS_FLAG_NO_BLOCKING	1<<2
+/*! Flag set to run session in non-blocking mode. Each call to \ref gf_fs_run will return as soon as there are no more pending tasks on the main thread */
+#define GF_FS_FLAG_NON_BLOCKING	1<<2
 /*! Flag set to disable internal caching of filter graph connections. If disabled, the graph will be recomputed at each link resolution (less memory occupancy but slower)*/
 #define GF_FS_FLAG_NO_GRAPH_CACHE	1<<3
-/*! Flag set to disable main thread. Such sessions shall be run using \ref gf_fs_run_step*/
-#define GF_FS_FLAG_NO_MAIN_THREAD	1<<4
 /*! Flag set to disable session regulation (no sleep)*/
-#define GF_FS_FLAG_NO_REGULATION	1<<5
+#define GF_FS_FLAG_NO_REGULATION	1<<4
 /*! Flag set to disable data probe*/
-#define GF_FS_FLAG_NO_PROBE	(1<<6)
+#define GF_FS_FLAG_NO_PROBE	(1<<5)
 /*! Flag set to disable source reassignment (e.g. switching from fin to ffdmx) in PID resolution*/
-#define GF_FS_FLAG_NO_REASSIGN	(1<<7)
+#define GF_FS_FLAG_NO_REASSIGN	(1<<6)
 /*! Flag set to print enabled/disabled edges for debug of PID resolution*/
-#define GF_FS_FLAG_PRINT_CONNECTIONS	(1<<8)
+#define GF_FS_FLAG_PRINT_CONNECTIONS	(1<<7)
 /*! Flag set to disable argument checking*/
-#define GF_FS_FLAG_NO_ARG_CHECK	(1<<9)
+#define GF_FS_FLAG_NO_ARG_CHECK	(1<<8)
 /*! Disables reservoir for packets and properties, uses much less memory but much more alloc/free*/
-#define GF_FS_FLAG_NO_RESERVOIR (1<<10)
-/*! Throws an error if any PID in the filter graph cannot be linked. The default behaviour is tu run the session even when some PIDs are not connected*/
-#define GF_FS_FLAG_FULL_LINK (1<<11)
+#define GF_FS_FLAG_NO_RESERVOIR (1<<9)
+/*! Throws an error if any PID in the filter graph cannot be linked. The default behavior is to run the session even when some PIDs are not connected*/
+#define GF_FS_FLAG_FULL_LINK (1<<10)
+/*! Flag set to disable implicit linking
+ By default the session runs in implicit linking when no link directives are set on any filter: linking aborts after the first successfull pid if destination is not a sink, or links only to sinks otherwise.
+ \note This implies that the order in which filters are added to the session matters
+*/
+#define GF_FS_FLAG_NO_IMPLICIT	(1<<11)
 
 /*! Creates a new filter session. This will also load all available filter registers not blacklisted.
 \param nb_threads number of extra threads to allocate. A negative value means all core used by session (eg nb_cores-1 extra threads)
 \param type scheduler type
 \param flags set of above flags for the session. Modes set by flags cannot be changed at runtime
-\param blacklist string containing comma-separated names of filters to disable
+\param blacklist string containing comma-separated names of filters to disable. If first character is '-', this describes a whitelist, i.e. only filters listed in this string will be allowed
 \return the created filter session
 */
 GF_FilterSession *gf_fs_new(s32 nb_threads, GF_FilterSchedulerType type, u32 flags, const char *blacklist);
 
 /*! Creates a new filter session, loading parameters from gpac config. This will also load all available filter registers not blacklisted.
-\param flags set of flags for the session. Only \ref GF_FS_FLAG_LOAD_META and \ref GF_FS_FLAG_NO_MAIN_THREAD are used, other flags
+\param flags set of flags for the session. Only \ref GF_FS_FLAG_LOAD_META, \ref GF_FS_FLAG_NON_BLOCKING , \ref GF_FS_FLAG_NO_GRAPH_CACHE and \ref GF_FS_FLAG_PRINT_CONNECTIONS are used, other flags are set from config file or command line
 \return the created filter session
 */
 GF_FilterSession *gf_fs_new_defaults(u32 flags);
@@ -248,7 +252,7 @@
 */
 void gf_fs_del(GF_FilterSession *session);
 /*! Loads a given filter by its register name. Filter are created using their register name, with options appended as a list of colon-separated Name=Value pairs.
-Value can be omitted for booleans, defaulting to true (eg :noedit). Using '!' before the name negates the result (eg :!moof_first).
+Value can be omitted for boolean, defaulting to true (eg :noedit). Using '!' before the name negates the result (eg :!moof_first).
 Name can be omitted for enumerations (eg :disp=pbo is equivalent to :pbo), provided that filter developers pay attention to not reuse enum names in one filter.
 
 \param session filter session
@@ -266,6 +270,10 @@
 Bool gf_fs_filter_exists(GF_FilterSession *session, const char *name);
 
 /*! Runs the session
+
+If the session is non-blocking ( created with \ref GF_FS_FLAG_NON_BLOCKING), process all tasks of oldest scheduled filter, process any pending PID connections and returns.
+Otherwise (session is blocking), runs until session is over or aborted.
+
 \param session filter session
 \return error if any, or GF_EOS. The last errors can be retrieved using \ref gf_fs_get_last_connect_error and \ref gf_fs_get_last_process_error
 */
@@ -310,12 +318,6 @@
 */
 u32 gf_fs_get_max_resolution_chain_length(GF_FilterSession *session);
 
-/*! Runs session in non blocking mode: process all tasks of oldest scheduled filter, process any pending PID connections and returns.
-This can only be used if the flag \ref GF_FS_FLAG_NO_MAIN_THREAD was specified at session creation time
-\param session filter session
-*/
-void gf_fs_run_step(GF_FilterSession *session);
-
 /*! Stops the session, waiting for all additional threads to complete
 \param session filter session
 \return error if any
@@ -352,7 +354,7 @@
 
 /*! Loads a destination filter from a URL and arguments
 \param session filter session
-\param url URL of the source to load. Can ba a local file name, a full path (/.., \\...) or a full URL with scheme (eg http://, tcp://)
+\param url URL of the source to load. Can be a local file name, a full path (/.., \\...) or a full URL with scheme (eg http://, tcp://)
 \param args arguments for the filter, see \ref gf_fs_load_filter
 \param parent_url parent URL of the source, or NULL if none
 \param err if not NULL, is set to error code if any
@@ -386,32 +388,50 @@
 
 /*! Posts a user task to the session
 \param session filter session
-\param task_execute the callback function for the task. The callback can return GF_TRUE to reschedule the task, in which case the task will be rescheduled
-immediately or after reschedule_ms.
+\param task_execute the callback function for the task. The callback can return:
+ - GF_FALSE to cancel the task
+ - GF_TRUE to reschedule the task, in which case the task will be rescheduled immediately or after reschedule_ms.
 \param udta_callback callback user data passed back to the task_execute function
 \param log_name log name of the task. If NULL, default is "user_task"
 \return the error code if any
 */
 GF_Err gf_fs_post_user_task(GF_FilterSession *session, Bool (*task_execute) (GF_FilterSession *fsess, void *callback, u32 *reschedule_ms), void *udta_callback, const char *log_name);
 
+/*! Session flush types*/
+typedef enum
+{
+	/*! Do not flush session: everything is discarded, potentially breaking output files*/
+	GF_FS_FLUSH_NONE=0,
+	/*! Flush all pending data before closing sessions: sources will be forced into end of stream and all emitted packets will be processed*/
+	GF_FS_FLUSH_ALL,
+	/*! Stop session (resetting buffers) and flush pipeline*/
+	GF_FS_FLUSH_FAST
+} GF_FSFlushType;
+
 /*! Aborts the session. This can be called within a callback task to stop the session. Do NOT use \ref gf_fs_stop from within a user task callback, this will deadlock the session
 \param session filter session
-\param do_flush if set to true, sources will be forced into end of stream and all emitted packets will be processed. Otherwise everything is discarded, potentially breaking output files
+\param flush_type flush method to use
 \return the error code if any
 */
-GF_Err gf_fs_abort(GF_FilterSession *session, Bool do_flush);
+GF_Err gf_fs_abort(GF_FilterSession *session, GF_FSFlushType flush_type);
 /*! Checks if the session is processing its last task. This can be called within a callback task to check if this is the last task, in order to avoid rescheduling the task
 \param session filter session
 \return GF_TRUE if no more task, GF_FALSE otherwise
 */
 Bool gf_fs_is_last_task(GF_FilterSession *session);
 
+/*! Checks if the session is in its final flush state (shutdown)
+\param session filter session
+\return GF_TRUE if no session is aborting, GF_FALSE otherwise
+*/
+Bool gf_fs_in_final_flush(GF_FilterSession *session);
+
 /*! Checks if a given MIME type is supported as input
 \param session filter session
 \param mime MIME type to query
 \return GF_TRUE if MIME is supported
 */
-Bool gf_fs_mime_supported(GF_FilterSession *session, const char *mime);
+Bool gf_fs_is_supported_mime(GF_FilterSession *session, const char *mime);
 
 
 /*! Sets UI callback event
@@ -431,6 +451,24 @@
 */
 void gf_fs_print_connections(GF_FilterSession *session);
 
+/*! Prints the list of filters not connected using \code LOG_APP@LOG_WARNING \endcode
+\param session filter session
+*/
+void gf_fs_print_non_connected(GF_FilterSession *session);
+
+/*! Prints the list of filters not connected using \code LOG_APP@LOG_WARNING \endcode
+\param session filter session
+\param ignore_sinks if set, do not warn if some sinks are not connected (mostly used for playback cases)
+*/
+void gf_fs_print_non_connected_ex(GF_FilterSession *session, Bool ignore_sinks);
+
+/*! Prints the list of arguments specified but not used by the filter session using \code LOG_APP@LOG_WARNING \endcode
+ \note This is simply a wrapper to \ref gf_fs_enum_unmapped_options
+\param session filter session
+\param ignore_args ignore unused arguments if present in this comma-seperated list - may be NULL
+*/
+void gf_fs_print_unused_args(GF_FilterSession *session, const char *ignore_args);
+
 /*! Prints all possible connections between filter registries to logs using \code LOG_APP@LOG_INFO \endcode
 \param session filter session
 \param filter_name if not null, only prints input connection for this filter register
@@ -456,7 +494,8 @@
 */
 void gf_fs_enable_reporting(GF_FilterSession *session, Bool reporting_on);
 
-/*! Locks global session mutex - mostly used to query filter reports and avoids concurrent destruction of a filter
+/*! Locks global session mutex - mostly used to query filter reports and avoids concurrent destruction of a filter.
+ When adding a filter in an already running session, the session must be locked if set_source is to be used.
 \param session filter session
 \param do_lock if GF_TRUE, session is locked, otherwise session is unlocked
 */
@@ -468,11 +507,18 @@
 */
 u32 gf_fs_get_filters_count(GF_FilterSession *session);
 
+/*! Gets a filter by its current index in the session
+\param session filter session
+\param idx index in the filter session
+\return filter, or NULL if none found
+*/
+GF_Filter *gf_fs_get_filter(GF_FilterSession *session, u32 idx);
+
 /*! Type of filter*/
 typedef enum
 {
-	/*! Unknown filter type*/
-	GF_FS_STATS_FILTER_UNKNOWN,
+	/*! Generic filter type accepting input(s) and producing output(s)*/
+	GF_FS_STATS_FILTER_GENERIC,
 	/*! raw input (file, socket, pipe) filter type*/
 	GF_FS_STATS_FILTER_RAWIN,
 	/*! demultiplexer filter type*/
@@ -540,7 +586,7 @@
 	u64 nb_out_pck;
 	/*!set to GF_TRUE if filter has seen end of stream*/
 	Bool in_eos;
-	/*!set to GF_TRUE if filter has seen end of stream*/
+	/*!set to the filter class type*/
 	GF_FSFilterType type;
 	/*!set to streamtype of output PID if single output, GF_STREAM_UNKNOWN otherwise*/
 	u32 stream_type;
@@ -548,7 +594,7 @@
 	u32 codecid;
 	/*! timestamp and timescale of last packet emitted on output pids*/
 	GF_Fraction64 last_ts_sent;
-	/*! timestamp and timescale of last packet droped on input pids*/
+	/*! timestamp and timescale of last packet dropped on input pids*/
 	GF_Fraction64 last_ts_drop;
 } GF_FilterStats;
 
@@ -565,7 +611,7 @@
 \param session filter session
 \param idx index of argument to query, 0 being first argument; this value is automatically incremented
 \param argname set to argument name
-\param argtype set to argument type: 0 was a filter param (eg:arg=val), 1 was a global arg (eg --arg=val) and 2 was a global meta arg (eg -+arg=val)
+\param argtype set to argument type: 0 was a filter param (eg :arg=val), 1 was a global arg (eg --arg=val) and 2 was a global meta arg (eg -+arg=val)
 \return GF_TRUE if success, GF_FALSE if nothing more to enumerate
 */
 Bool gf_fs_enum_unmapped_options(GF_FilterSession *session, u32 *idx, char **argname, u32 *argtype);
@@ -599,9 +645,70 @@
 */
 GF_Err gf_fs_load_script(GF_FilterSession *session, const char *jsfile);
 
+/*! get max download rate allowed by download manager
+\param session filter session
+\return max rate in bps
+*/
+u32 gf_fs_get_http_max_rate(GF_FilterSession *session);
+
+/*! set max download rate allowed by download manager
+\param session filter session
+\param rate max rate in bps
+\return error if any
+*/
+GF_Err gf_fs_set_http_max_rate(GF_FilterSession *session, u32 rate);
+
+
+/*! get current download rate of download manager, all active resources together
+\param session filter session
+\return current rate in bps
+*/
+u32 gf_fs_get_http_rate(GF_FilterSession *session);
+
+/*! check if a URL is likely to be supported
+\param session filter session
+\param url the URL to test
+\param parent_url the parent URL
+\return GF_TRUE if a filter for such a source could be loaded
+*/
+Bool gf_fs_is_supported_source(GF_FilterSession *session, const char *url, const char *parent_url);
+
+/*! callback functions for external monitoring of filter creation or destruction
+\param udta user data passed back to callback
+\param filter created or destroyed filter
+\param is_destroy if GF_TRUE, the filter is being destroyed, otherwise it is being created
+ */
+typedef	void (*gf_fs_on_filter_creation)(void *udta, GF_Filter *filter, Bool is_destroy);
+
+/*! assign callbacks for filter creation and destruction monitoring
+\param session filter session
+\param on_create_destroy filter creation/destruction callback, may be NULL
+\param udta user data for callbacks, may be NULL
+\param force_sync execute tasks involving filter creation/setup and user tasks on main thread
+\return error if any
+ */
+GF_Err gf_fs_set_filter_creation_callback(GF_FilterSession *session, gf_fs_on_filter_creation on_create_destroy, void *udta, Bool force_sync);
+
+/*! returns RT user data passed in \ref gf_fs_set_filter_creation_callback
+\param session filter session
+\return udta user data, NULL if error or none
+ */
+void *gf_fs_get_rt_udta(GF_FilterSession *session);
+
+/*! Fires an event on filter
+\param session filter session
+\param filter target filter - if NULL, event will be executed on all filters. Otherwise, the event will be executed directly if its type is \ref GF_FEVT_USER, and fired otherwise
+\param evt event to fire
+\param upstream if true, send event toward sinks, otherwise towards sources
+\return GF_TRUE if event was sent, GF_FALSE otherwise
+ */
+Bool gf_fs_fire_event(GF_FilterSession *session, GF_Filter *filter, GF_FilterEvent *evt, Bool upstream);
+
 /*! @} */
 
 
+
+
 /*!
 \addtogroup fs_props Filter Properties
 \ingroup filters_grp
@@ -612,70 +719,95 @@
 */
 
 /*! Property types*/
+
+//DO NOT MODIFY WITHOUT APPLYNG SIMILAR CHANGE TO share/python/libgpac.py
+//DO NOT CHANGE A VALUE ASSIGNMENT WITHOUT CHANGING GF_GSF_VERSION
+
 typedef enum
 {
 	/*! not allowed*/
-	GF_PROP_FORBIDEN=0,
+	GF_PROP_FORBIDEN	=	0,
 	/*! signed 32 bit integer*/
-	GF_PROP_SINT,
+	GF_PROP_SINT		=	1,
 	/*! unsigned 32 bit integer*/
-	GF_PROP_UINT,
+	GF_PROP_UINT		=	2,
 	/*! signed 64 bit integer*/
-	GF_PROP_LSINT,
+	GF_PROP_LSINT		=	3,
 	/*! unsigned 64 bit integer*/
-	GF_PROP_LUINT,
+	GF_PROP_LUINT		=	4,
 	/*! boolean*/
-	GF_PROP_BOOL,
+	GF_PROP_BOOL		=	5,
 	/*! 32 bit / 32 bit fraction*/
-	GF_PROP_FRACTION,
+	GF_PROP_FRACTION	=	6,
 	/*! 64 bit / 64 bit fraction*/
-	GF_PROP_FRACTION64,
+	GF_PROP_FRACTION64	=	7,
 	/*! float (Fixed) number*/
-	GF_PROP_FLOAT,
+	GF_PROP_FLOAT		=	8,
 	/*! double number*/
-	GF_PROP_DOUBLE,
+	GF_PROP_DOUBLE		=	9,
 	/*! 2D signed integer vector*/
-	GF_PROP_VEC2I,
+	GF_PROP_VEC2I		=	10,
 	/*! 2D double number vector*/
-	GF_PROP_VEC2,
+	GF_PROP_VEC2		=	11,
 	/*! 3D signed integer vector*/
-	GF_PROP_VEC3I,
-	/*! 3D double number vector*/
-	GF_PROP_VEC3,
+	GF_PROP_VEC3I		=	12,
 	/*! 4D signed integer vector*/
-	GF_PROP_VEC4I,
-	/*! 4D double number vector*/
-	GF_PROP_VEC4,
-	/*! Video Pixel format*/
-	GF_PROP_PIXFMT,
-	/*! Audio PCM format*/
-	GF_PROP_PCMFMT,
+	GF_PROP_VEC4I		=	13,
 	/*! string property, memory is duplicated when setting the property and managed internally*/
-	GF_PROP_STRING,
+	GF_PROP_STRING		=	14,
 	/*! string property, memory is NOT duplicated when setting the property but is then managed (and free) internally.
-	Only used when setting a property, the type then defaults to GF_PROP_STRING*/
-	GF_PROP_STRING_NO_COPY,
+	Only used when setting a property, the type then defaults to GF_PROP_STRING
+	DO NOT USE the associate string field upon return from setting the property, it might have been destroyed*/
+	GF_PROP_STRING_NO_COPY=	15,
 	/*! data property, memory is duplicated when setting the property and managed internally*/
-	GF_PROP_DATA,
+	GF_PROP_DATA		=	16,
 	/*! const string property, memory is NOT duplicated when setting the property, stays user-managed*/
-	GF_PROP_NAME,
+	GF_PROP_NAME		=	17,
 	/*! data property, memory is NOT duplicated when setting the property but is then managed (and free) internally.
-	Only used when setting a property, the type then defaults to GF_PROP_DATA*/
-	GF_PROP_DATA_NO_COPY,
+	Only used when setting a property, the type then defaults to GF_PROP_DATA
+	DO NOT USE the associate data field upon return from setting the property, it might have been destroyed*/
+	GF_PROP_DATA_NO_COPY=	18,
 	/*! const data property, memory is NOT duplicated when setting the property, stays user-managed*/
-	GF_PROP_CONST_DATA,
+	GF_PROP_CONST_DATA	=	19,
 	/*! user-managed pointer*/
-	GF_PROP_POINTER,
-	/*! string list, memory is NOT duplicated when setting the property, the GF_List * of
-	the passed property is directly assigned to the new property and will be and managed internally (freed by the filter session)*/
-	GF_PROP_STRING_LIST,
+	GF_PROP_POINTER		=	20,
+	/*! string list, memory is NOT duplicated when setting the property, the passed array is directly assigned to the new property and will be and managed internally (freed by the filter session)
+	DO NOT USE the associate string array field upon return from setting the property, it might have been destroyed*/
+	GF_PROP_STRING_LIST	=	21,
 	/*! unsigned 32 bit integer list, memory is ALWAYS duplicated when setting the property*/
-	GF_PROP_UINT_LIST,
+	GF_PROP_UINT_LIST	=	22,
+	/*! signed 32 bit integer list, memory is ALWAYS duplicated when setting the property*/
+	GF_PROP_SINT_LIST	=	23,
+	/*! 2D signed integer vector list, memory is ALWAYS duplicated when setting the property*/
+	GF_PROP_VEC2I_LIST	=	24,
+	/*! 4CC on unsigned 32 bit integer*/
+	GF_PROP_4CC			=	25,
+	/*! 4CC list on unsigned 32 bit integer, memory is ALWAYS duplicated when setting the property*/
+	GF_PROP_4CC_LIST			=	26,
 
+	/*! last non-enum property*/
+	GF_PROP_LAST_NON_ENUM,
+
+	/*! All constants are defined after this - constants are stored as u32*/
+	GF_PROP_FIRST_ENUM	=	40, //GSF will code prop type using vlen, try to keep all values between 1 and 127 to only use 1 byte
+
+	/*! Video Pixel format*/
+	GF_PROP_PIXFMT			=	GF_PROP_FIRST_ENUM,
+	/*! Audio PCM format*/
+	GF_PROP_PCMFMT			=	GF_PROP_FIRST_ENUM+1,
+	/*! CICP Color Primaries*/
+	GF_PROP_CICP_COL_PRIM	=	GF_PROP_FIRST_ENUM+2,
+	/*! CICP Color Transfer Characteristics*/
+	GF_PROP_CICP_COL_TFC	=	GF_PROP_FIRST_ENUM+3,
+	/*! CICP Color Matrix*/
+	GF_PROP_CICP_COL_MX		=	GF_PROP_FIRST_ENUM+4,
 	/*! not allowed*/
-	GF_PROP_LAST_DEFINED,
+	GF_PROP_LAST_DEFINED
 } GF_PropType;
 
+/*! GSF version (coded on 8 bits in gsf format) */
+#define GF_GSF_VERSION	2
+
 /*! Data property*/
 typedef struct
 {
@@ -685,15 +817,6 @@
 	u32 size;
 } GF_PropData;
 
-/*! List of unsigned int property*/
-typedef struct
-{
-	/*! array of unsigned integers */
-	u32 *vals;
-	/*! number of items in array */
-	u32 nb_items;
-} GF_PropUIntList;
-
 /*! 2D signed integer vector property*/
 typedef struct
 {
@@ -703,6 +826,7 @@
 	s32 y;
 } GF_PropVec2i;
 
+
 /*! 2D double number vector property*/
 typedef struct
 {
@@ -723,17 +847,6 @@
 	s32 z;
 } GF_PropVec3i;
 
-/*! 3D double number vector property*/
-typedef struct
-{
-	/*! x coord */
-	Double x;
-	/*! y coord */
-	Double y;
-	/*! z coord */
-	Double z;
-} GF_PropVec3;
-
 /*! 4D signed integer vector property*/
 typedef struct
 {
@@ -747,18 +860,42 @@
 	s32 w;
 } GF_PropVec4i;
 
-/*! 4D double number vector property*/
+
+/*! List of strings property - do not change field order !*/
 typedef struct
 {
-	/*! x coord */
-	Double x;
-	/*! y coord */
-	Double y;
-	/*! z coord */
-	Double z;
-	/*! w coord */
-	Double w;
-} GF_PropVec4;
+	/*! array of unsigned integers */
+	char **vals;
+	/*! number of items in array */
+	u32 nb_items;
+} GF_PropStringList;
+
+/*! List of unsigned int property - do not change field order !*/
+typedef struct
+{
+	/*! array of unsigned integers */
+	u32 *vals;
+	/*! number of items in array */
+	u32 nb_items;
+} GF_PropUIntList;
+
+/*! List of signed int property - do not change field order !*/
+typedef struct
+{
+	/*! array of signed integers */
+	s32 *vals;
+	/*! number of items in array */
+	u32 nb_items;
+} GF_PropIntList;
+
+/*! List of unsigned int property*/
+typedef struct
+{
+	/*! array of vec2i */
+	GF_PropVec2i *vals;
+	/*! number of items in array */
+	u32 nb_items;
+} GF_PropVec2iList;
 
 /*! Property value used by PIDs and packets*/
 struct __gf_prop_val
@@ -791,12 +928,8 @@
 		GF_PropVec2 vec2;
 		/*! 3D signed integer vector value of property */
 		GF_PropVec3i vec3i;
-		/*! 3D double vector value of property */
-		GF_PropVec3 vec3;
 		/*! 4D signed integer vector value of property */
 		GF_PropVec4i vec4i;
-		/*! 4D double vector value of property */
-		GF_PropVec4 vec4;
 		/*! data value of property. For non const data type, the memory is freed by filter session.
 		Otherwise caller is responsible to free it at end of filter/session*/
 		GF_PropData data;
@@ -805,9 +938,13 @@
 		/*! pointer value of property */
 		void *ptr;
 		/*! string list value of property - memory is handled by filter session (always copy)*/
-		GF_List *string_list;
+		GF_PropStringList string_list;
 		/*! unsigned integer list value of property - memory is handled by filter session (always copy)*/
 		GF_PropUIntList uint_list;
+		/*! signed integer list value of property - memory is handled by filter session (always copy)*/
+		GF_PropIntList sint_list;
+		/*! vec2i list value of property - memory is handled by filter session (always copy)*/
+		GF_PropVec2iList v2i_list;
 	} value;
 };
 
@@ -842,6 +979,7 @@
 	GF_PROP_PID_PLAYBACK_MODE = GF_4CC('P','B','K','M'),
 	GF_PROP_PID_SCALABLE = GF_4CC('S','C','A','L'),
 	GF_PROP_PID_TILE_BASE = GF_4CC('S','A','B','T'),
+	GF_PROP_PID_TILE_ID = GF_4CC('P','T','I','D'),
 	GF_PROP_PID_LANGUAGE = GF_4CC('L','A','N','G'),
 	GF_PROP_PID_SERVICE_NAME = GF_4CC('S','N','A','M'),
 	GF_PROP_PID_SERVICE_PROVIDER = GF_4CC('S','P','R','O'),
@@ -855,6 +993,7 @@
 	GF_PROP_PID_UNFRAMED_FULL_AU = GF_4CC('P','F','R','F'),
 	GF_PROP_PID_DURATION = GF_4CC('P','D','U','R'),
 	GF_PROP_PID_NB_FRAMES = GF_4CC('N','F','R','M'),
+	GF_PROP_PID_FRAME_OFFSET = GF_4CC('F','R','M','O'),
 	GF_PROP_PID_FRAME_SIZE = GF_4CC('C','F','R','S'),
 	GF_PROP_PID_TIMESHIFT_DEPTH = GF_4CC('P','T','S','D'),
 	GF_PROP_PID_TIMESHIFT_TIME = GF_4CC('P','T','S','T'),
@@ -874,6 +1013,7 @@
 	GF_PROP_PID_UNFRAMED_LATM = GF_4CC('L','A','T','M'),
 	GF_PROP_PID_DELAY = GF_4CC('M','D','L','Y'),
 	GF_PROP_PID_CTS_SHIFT = GF_4CC('M','D','T','S'),
+	GF_PROP_PID_NO_PRIMING = GF_4CC('A','S','K','P'),
 	GF_PROP_PID_WIDTH = GF_4CC('W','I','D','T'),
 	GF_PROP_PID_HEIGHT = GF_4CC('H','E','I','G'),
 	GF_PROP_PID_PIXFMT = GF_4CC('P','F','M','T'),
@@ -898,9 +1038,17 @@
 	GF_PROP_PID_SRD_REF = GF_4CC('S','R','D','R'),
 	GF_PROP_PID_SRD_MAP = GF_4CC('S','R','D','M'),
 	GF_PROP_PID_ALPHA = GF_4CC('V','A','L','P'),
+	GF_PROP_PID_MIRROR = GF_4CC('V','M','I','R'),
+	GF_PROP_PID_ROTATE = GF_4CC('V','R','O','T'),
+	GF_PROP_PID_CLAP_W = GF_4CC('C','L','P','W'),
+	GF_PROP_PID_CLAP_H = GF_4CC('C','L','P','H'),
+	GF_PROP_PID_CLAP_X = GF_4CC('C','L','P','X'),
+	GF_PROP_PID_CLAP_Y = GF_4CC('C','L','P','Y'),
+	GF_PROP_PID_NUM_VIEWS = GF_4CC('P','N','B','V'),
 	GF_PROP_PID_DOLBY_VISION = GF_4CC('D','O','V','I'),
 	GF_PROP_PID_BITRATE = GF_4CC('R','A','T','E'),
 	GF_PROP_PID_MAXRATE = GF_4CC('M','R','A','T'),
+	GF_PROP_PID_TARGET_RATE = GF_4CC('T','B','R','T'),
 	GF_PROP_PID_DBSIZE = GF_4CC('D','B','S','Z'),
 	GF_PROP_PID_MEDIA_DATA_SIZE = GF_4CC('M','D','S','Z'),
 	GF_PROP_PID_CAN_DATAREF = GF_4CC('D','R','E','F'),
@@ -950,9 +1098,7 @@
 	GF_PROP_PID_OMA_PREVIEW_RANGE = GF_4CC('O','D','P','R'),
 	GF_PROP_PID_CENC_PSSH = GF_4CC('P','S','S','H'),
 	GF_PROP_PCK_CENC_SAI = GF_4CC('S','A','I','S'),
-	GF_PROP_PID_KID = GF_4CC('S','K','I','D'),
-	GF_PROP_PID_CENC_IV_SIZE = GF_4CC('S','A','I','V'),
-	GF_PROP_PID_CENC_IV_CONST = GF_4CC('C','B','I','V'),
+	GF_PROP_PID_CENC_KEY_INFO = GF_4CC('C','B','I','V'),
 	GF_PROP_PID_CENC_PATTERN = GF_4CC('C','P','T','R'),
 	GF_PROP_PID_CENC_STORE = GF_4CC('C','S','T','R'),
 	GF_PROP_PID_CENC_STSD_MODE = GF_4CC('C','S','T','M'),
@@ -964,6 +1110,8 @@
 	GF_PROP_PCK_IDXFILENAME = GF_4CC('I','N','A','M'),
 	GF_PROP_PCK_FILESUF = GF_4CC('F','S','U','F'),
 	GF_PROP_PCK_EODS = GF_4CC('E','O','D','S'),
+	GF_PROP_PCK_CUE_START = GF_4CC('P','C','U','S'),
+
 	GF_PROP_PID_MAX_FRAME_SIZE = GF_4CC('M','F','R','S'),
 	GF_PROP_PID_AVG_FRAME_SIZE = GF_4CC('A','F','R','S'),
 	GF_PROP_PID_MAX_TS_DELTA = GF_4CC('M','T','S','D'),
@@ -976,6 +1124,9 @@
 	GF_PROP_PID_ISOM_HANDLER = GF_4CC('I','H','D','L'),
 	GF_PROP_PID_ISOM_TRACK_FLAGS = GF_4CC('I','T','K','F'),
 	GF_PROP_PID_ISOM_TRACK_MATRIX = GF_4CC('I','T','K','M'),
+	GF_PROP_PID_ISOM_ALT_GROUP = GF_4CC('I','A','L','G'),
+	GF_PROP_PID_ISOM_FORCE_NEGCTTS = GF_4CC('I','F','N','C'),
+	GF_PROP_PID_DISABLED = GF_4CC('I','T','K','D'),
 	GF_PROP_PID_PERIOD_ID = GF_4CC('P','E','I','D'),
 	GF_PROP_PID_PERIOD_START = GF_4CC('P','E','S','T'),
 	GF_PROP_PID_PERIOD_DUR = GF_4CC('P','E','D','U'),
@@ -999,6 +1150,8 @@
 	GF_PROP_PID_CLAMP_DUR = GF_4CC('D','C','M','D'),
 	GF_PROP_PID_HLS_PLAYLIST = GF_4CC('H','L','V','P'),
 	GF_PROP_PID_HLS_GROUPID = GF_4CC('H','L','G','I'),
+	GF_PROP_PID_HLS_EXT_MASTER = GF_4CC('H','L','M','X'),
+	GF_PROP_PID_HLS_EXT_VARIANT = GF_4CC('H','L','V','X'),
 	GF_PROP_PID_DASH_CUE = GF_4CC('D','C','U','E'),
 	GF_PROP_PID_DASH_SEGMENTS = GF_4CC('D','C','N','S'),
 	GF_PROP_PID_CODEC = GF_4CC('C','O','D','S'),
@@ -1007,24 +1160,86 @@
 
 	GF_PROP_PID_PRIMARY_ITEM = GF_4CC('P','I','T','M'),
 
+	GF_PROP_PID_PLAY_BUFFER = GF_4CC('P','B','P','L'),
+	GF_PROP_PID_MAX_BUFFER = GF_4CC('P','B','M','X'),
+	GF_PROP_PID_RE_BUFFER = GF_4CC('P','B','R','E'),
+	GF_PROP_PID_VIEW_IDX = GF_4CC('V','I','D','X'),
+
 	GF_PROP_PID_COLR_PRIMARIES = GF_4CC('C','P','R','M'),
 	GF_PROP_PID_COLR_TRANSFER = GF_4CC('C','T','R','C'),
 	GF_PROP_PID_COLR_MX = GF_4CC('C','M','X','C'),
 	GF_PROP_PID_COLR_RANGE = GF_4CC('C','F','R','A'),
+	GF_PROP_PID_COLR_CHROMAFMT = GF_4CC('C','F','M','T'),
 	GF_PROP_PID_COLR_CHROMALOC = GF_4CC('C','L','O','C'),
-	GF_PROP_PID_COLR_SPACE = GF_4CC('C','S','P','C'),
+	GF_PROP_PID_CONTENT_LIGHT_LEVEL = GF_4CC('C','L','L','I'),
+	GF_PROP_PID_MASTER_DISPLAY_COLOUR = GF_4CC('M','D','C','V'),
 	GF_PROP_PID_SRC_MAGIC = GF_4CC('P','S','M','G'),
 	GF_PROP_PID_MUX_INDEX = GF_4CC('T','I','D','X'),
 	GF_PROP_NO_TS_LOOP = GF_4CC('N','T','S','L'),
+	GF_PROP_PID_MHA_COMPATIBLE_PROFILES = GF_4CC('M','H','C','P'),
 	GF_PROP_PCK_FRAG_START = GF_4CC('P','F','R','B'),
 	GF_PROP_PCK_FRAG_RANGE = GF_4CC('P','F','R','R'),
 	GF_PROP_PCK_SIDX_RANGE = GF_4CC('P','F','S','R'),
 	GF_PROP_PCK_MOOF_TEMPLATE = GF_4CC('M','F','T','P'),
+	GF_PROP_PCK_INIT = GF_4CC('P','C','K','I'),
 	GF_PROP_PID_RAWGRAB = GF_4CC('P','G','R','B'),
 	GF_PROP_PID_KEEP_AFTER_EOS = GF_4CC('P','K','A','E'),
 	GF_PROP_PID_COVER_ART = GF_4CC('P','C','O','V'),
+	GF_PROP_PID_ORIG_FRAG_URL = GF_4CC('O','F','R','A'),
+
+	GF_PROP_PID_ROUTE_IP = GF_4CC('R','S','I','P'),
+	GF_PROP_PID_ROUTE_PORT = GF_4CC('R','S','P','N'),
+	GF_PROP_PID_ROUTE_NAME = GF_4CC('R','S','F','N'),
+	GF_PROP_PID_ROUTE_CAROUSEL = GF_4CC('R','S','C','R'),
+	GF_PROP_PID_ROUTE_SENDTIME = GF_4CC('R','S','S','T'),
+
+	GF_PROP_PID_STEREO_TYPE = GF_4CC('P','S','T','T'),
+	GF_PROP_PID_PROJECTION_TYPE = GF_4CC('P','P','J','T'),
+	GF_PROP_PID_VR_POSE = GF_4CC('P','P','O','S'),
+	GF_PROP_PID_CUBE_MAP_PAD = GF_4CC('P','C','M','P'),
+	GF_PROP_PID_EQR_CLAMP = GF_4CC('P','E','Q','C'),
+
+	GF_PROP_PID_SCENE_NODE = GF_4CC('P','S','N','D'),
+	GF_PROP_PID_ORIG_CRYPT_SCHEME = GF_4CC('P','O','C','S'),
+	GF_PROP_PID_TIMESHIFT_SEGS = GF_4CC('P','T','S','N'),
+
+
+	//internal for HLS playlist reference, gives a unique ID identifying media mux, and indicated in packets carrying child playlists
+	GF_PROP_PCK_HLS_REF = GF_4CC('H','P','L','R'),
+	//internal for HLS low latency
+	GF_PROP_PID_LLHLS = GF_4CC('H','L','S','L'),
+	GF_PROP_PCK_HLS_FRAG_NUM = GF_4CC('H','L','S','N'),
+	//we also use this property on PID to signal sample-accurate seek info is present
+	GF_PROP_PCK_SKIP_BEGIN = GF_4CC('P','C','K','S'),
+	GF_PROP_PCK_SKIP_PRES = GF_4CC('P','C','K','D'),
+	//internal for DASH forward mode
+	GF_PROP_PID_DASH_FWD = GF_4CC('D','F','W','D'),
+	GF_PROP_PCK_DASH_MANIFEST = GF_4CC('D','M','P','D'),
+	GF_PROP_PCK_HLS_VARIANT = GF_4CC('D','H','L','V'),
+	GF_PROP_PID_DASH_PERIOD_START = GF_4CC('D','P','S','T'),
+	GF_PROP_PCK_HLS_VARIANT_NAME = GF_4CC('D','H','L','N'),
+	GF_PROP_PID_HLS_KMS = GF_4CC('H','L','S','K'),
+	GF_PROP_PID_HLS_IV = GF_4CC('H','L','S','I'),
 	//internal property indicating pointer to associated GF_DownloadSession
-	GF_PROP_PID_DOWNLOAD_SESSION = GF_4CC('G','H','T','T')
+	GF_PROP_PID_DOWNLOAD_SESSION = GF_4CC('G','H','T','T'),
+
+	//PID has temi information
+	GF_PROP_PID_HAS_TEMI = GF_4CC('P','T','E','M'),
+	//PID has no init segment associated (file foward mode of dasher)
+	GF_PROP_PID_NO_INIT = GF_4CC('P','N','I','N'),
+
+	GF_PROP_PID_IS_MANIFEST = GF_4CC('P','H','S','M'),
+
+	GF_PROP_PCK_XPS_MASK = GF_4CC('P','X','P','M'),
+	GF_PROP_PCK_END_RANGE = GF_4CC('P','C','E','R'),
+
+	/*! Internal property used for FFMPEG codec ID
+
+	Property can be:
+	- pointer to codec context: only for ffdmx with old ffmpeg versions)
+	- uint: AVCODEC_ID_* ffdmx with newer versions or ffenc output
+	*/
+	GF_PROP_PID_FFMPEG_CODEC_ID = GF_4CC('F','C','I','D'),
 };
 
 /*! Block patching requirements for FILE pids, as signaled by GF_PROP_PID_DISABLE_PROGRESSIVE
@@ -1050,12 +1265,19 @@
 u32 gf_props_4cc_get_type(u32 prop_4cc);
 
 /*! Checks if two properties are equal
-\param p1 first property to compare
-\param p2 second property to compare
+\param p1 first property to compare - shall not be NULL
+\param p2 second property to compare - shall not be NULL
 \return GF_TRUE if properties are equal, GF_FALSE otherwise
 */
 Bool gf_props_equal(const GF_PropertyValue *p1, const GF_PropertyValue *p2);
 
+/*! Same as \ref gf_props_equal but do not match string with value "*" to string with value different from "*"
+\param p1 first property to compare - shall not be NULL
+\param p2 second property to compare - shall not be NULL
+\return GF_TRUE if properties are equal, GF_FALSE otherwise
+*/
+Bool gf_props_equal_strict(const GF_PropertyValue *p1, const GF_PropertyValue *p2);
+
 /*! Gets the readable name for a property type
 \param type property type
 \return readable name
@@ -1074,13 +1296,45 @@
 */
 GF_PropType gf_props_parse_type(const char *name);
 
+/*! Check if a property type is an enum type
+\param type property type
+\return GF_TRUE if constant, GF_FALSE otherwise
+*/
+Bool gf_props_type_is_enum(GF_PropType type);
+
+/*! Parse a enum type property string
+\param type property type
+\param value value to parse
+\return value, 0xFFFFFFFF if error
+*/
+u32 gf_props_parse_enum(u32 type, const char *value);
+
+/*! Get the name of a constant type property value
+\param type property type
+\param value value of constant
+\return value, 0xFFFFFFFF if error
+*/
+const char *gf_props_enum_name(u32 type, u32 value);
+
+/*! Get the possible names of an enum type property
+\param type property type
+\return comma-seperated list of possible values
+*/
+const char *gf_props_enum_all_names(u32 type);
+
+/*! Get the base type of a property type. Properties with same base type can be safely type-casted
+\param type property type
+\return base property type
+*/
+u32 gf_props_get_base_type(u32 type);
+
 
 /*! Parses a property value from string
 \param type property type to parse
 \param name property name to parse (for logs)
 \param value string containing the value to parse
 \param enum_values string containig enum_values, or NULL. enum_values are used for unsigned int properties, take the form "a|b|c" and resolve to 0|1|2.
-\param list_sep_char value of the list seperator character to use
+\param list_sep_char value of the list separator character to use
 \return the parsed property value
 */
 GF_PropertyValue gf_props_parse_value(u32 type, const char *name, const char *value, const char *enum_values, char list_sep_char);
@@ -1088,23 +1342,34 @@
 /*! Maximum string size to use when dumping a property*/
 #define GF_PROP_DUMP_ARG_SIZE	100
 
+/*! Data property dump mode*/
+typedef enum
+{
+	/*! do not dump data*/
+	GF_PROP_DUMP_DATA_NONE=0,
+	/*! dump data if less than 40 bytes, otherwise dump ptr address and CRC*/
+	GF_PROP_DUMP_DATA_INFO,
+	/*! dump data to parsable property, as ADDRESS+'@'+POINTER*/
+	GF_PROP_DUMP_DATA_PTR,
+} GF_PropDumDataMode;
+
 /*! Dumps a property value to string
 \param att property value
 \param dump buffer holding the resulting value for types requiring string conversions (integers, ...)
-\param dump_data if set data will be dumped in hexadecimal. Otherwise, data buffer is not dumped
+\param dump_data_mode data dump mode
 \param min_max_enum optional, gives the min/max or enum string when the property is a filter argument
 \return string
 */
-const char *gf_props_dump_val(const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], Bool dump_data, const char *min_max_enum);
+const char *gf_props_dump_val(const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], GF_PropDumDataMode dump_data_mode, const char *min_max_enum);
 
 /*! Dumps a property value to string, resolving any built-in types (pix formats, codec id, ...)
 \param p4cc property 4CC
 \param att property value
 \param dump buffer holding the resulting value for types requiring string conversions (integers, ...)
-\param dump_data if set data will be dumped in hexadecimal. Otherwise, data buffer is not dumped
+\param dump_data_mode data dump mode
 \return string
 */
-const char *gf_props_dump(u32 p4cc, const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], Bool dump_data);
+const char *gf_props_dump(u32 p4cc, const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], GF_PropDumDataMode dump_data_mode);
 
 /*! Resets a property value, freeing allocated data or strings depending on the property type
 \param prop property 4CC
@@ -1148,10 +1413,15 @@
 */
 u8 gf_props_4cc_get_flags(u32 prop_4cc);
 
+
 /*! Helper macro to set signed int property */
 #define PROP_SINT(_val) (GF_PropertyValue){.type=GF_PROP_SINT, .value.sint = _val}
 /*! Helper macro to set unsigned int property */
 #define PROP_UINT(_val) (GF_PropertyValue){.type=GF_PROP_UINT, .value.uint = _val}
+/*! Helper macro to set an enum property */
+#define PROP_ENUM(_val, _type) (GF_PropertyValue){.type=_type, .value.uint = _val}
+/*! Helper macro to set 4CC unsigned int property */
+#define PROP_4CC(_val) (GF_PropertyValue){.type=GF_PROP_4CC, .value.uint = _val}
 /*! Helper macro to set long signed int property */
 #define PROP_LONGSINT(_val) (GF_PropertyValue){.type=GF_PROP_LSINT, .value.longsint = _val}
 /*! Helper macro to set long unsigned int property */
@@ -1188,14 +1458,12 @@
 #define PROP_VEC2(_val) (GF_PropertyValue){.type=GF_PROP_VEC2, .value.vec2 = _val}
 /*! Helper macro to set 2D integer vector property */
 #define PROP_VEC2I(_val) (GF_PropertyValue){.type=GF_PROP_VEC2I, .value.vec2i = _val}
-/*! Helper macro to set 2D integer vector property from intergers*/
+/*! Helper macro to set 2D integer vector property from integers*/
 #define PROP_VEC2I_INT(_x, _y) (GF_PropertyValue){.type=GF_PROP_VEC2I, .value.vec2i.x = _x, .value.vec2i.y = _y}
-/*! Helper macro to set 3D float vector property */
-#define PROP_VEC3(_val) (GF_PropertyValue){.type=GF_PROP_VEC3, .value.vec3 = _val}
 /*! Helper macro to set 3D integer vector property */
 #define PROP_VEC3I(_val) (GF_PropertyValue){.type=GF_PROP_VEC3I, .value.vec3i = _val}
-/*! Helper macro to set 4D float vector property */
-#define PROP_VEC4(_val) (GF_PropertyValue){.type=GF_PROP_VEC4, .value.vec4 = _val}
+/*! Helper macro to set 3D integer vector property from integers*/
+#define PROP_VEC3I_INT(_x, _y, _z) (GF_PropertyValue){.type=GF_PROP_VEC3I, .value.vec3i.x = _x, .value.vec3i.y = _y, .value.vec3i.z = _z}
 /*! Helper macro to set 4D integer vector property */
 #define PROP_VEC4I(_val) (GF_PropertyValue){.type=GF_PROP_VEC4I, .value.vec4i = _val}
 /*! Helper macro to set 4D integer vector property from integers */
@@ -1275,8 +1543,16 @@
 	GF_FEVT_USER,
 	/*! PLAY hint event, used to signal if block dispatch is needed or not for the source*/
 	GF_FEVT_PLAY_HINT,
-	/*! file delete event, sent upstream by dahser to notify file deletion*/
+	/*! file delete event, sent upstream by dasher to notify file deletion, downstream by flist to ask for file deletion. The associated file processing (reading, writing) MUST be done when firing this event*/
 	GF_FEVT_FILE_DELETE,
+
+	/*! DASH fragment (cmaf chunk) size info, sent down from muxers to manifest generators*/
+	GF_FEVT_FRAGMENT_SIZE,
+
+	/*! Encoder hints*/
+	GF_FEVT_ENCODE_HINTS,
+	/*! NTP source clock send by other services (eg from TS to dash using TEMI) */
+	GF_FEVT_NTP_REF,
 } GF_FEventType;
 
 /*! type: the type of the event*/
@@ -1296,36 +1572,42 @@
 	FILTER_EVENT_BASE
 } GF_FEVT_Base;
 
-/*! Event structure for GF_FEVT_PLAY, GF_FEVT_SET_SPEED*/
+/*! Event structure for GF_FEVT_PLAY, GF_FEVT_SET_SPEED, GF_FEVT_PLAY_HINT, GF_FEVT_STOP*/
 typedef struct
 {
 	FILTER_EVENT_BASE
 
-	/*! params for : ranges in sec - if range is <0, it means end of file (eg [2, -1] with speed>0 means 2 +oo) */
-	Double start_range, end_range;
-	/*! params for GF_NET_CHAN_PLAY and GF_NET_CHAN_SPEED*/
+	/*!GF_FEVT_PLAY only, play range in sec - if range is <0, it means end of file (eg [2, -1] with speed>0 means 2 +oo) */
+	Double start_range;
+	/*!GF_FEVT_PLAY only, send range in sec - if range is less than start, ignored*/
+	Double end_range;
+	/*! params for GF_FEVT_PLAY and GF_FEVT_SET_SPEED*/
 	Double speed;
 
-	/*! indicates playback should start from given packet number - used by dasher when reloading sources*/
+	/*! GF_FEVT_PLAY only, indicates playback should start from given packet number - used by dasher when reloading sources*/
 	u32 from_pck;
 
-	/*! set when PLAY event is sent upstream to audio out, indicates HW buffer reset*/
+	/*! GF_FEVT_PLAY only, set when PLAY event is sent upstream to audio out, indicates HW buffer reset*/
 	u8 hw_buffer_reset;
-	/*! params for GF_FEVT_PLAY only: indicates this is the first PLAY on an element inserted from bcast*/
+	/*! GF_FEVT_PLAY only: indicates this is the first PLAY on an element inserted from bcast*/
 	u8 initial_broadcast_play;
-	/*! params for GF_NET_CHAN_PLAY only
+	/*! params for GF_FEVT_PLAY only
 		0: range is in media time
 		1: range is in timesatmps
 		2: range is in media time but timestamps should not be shifted (hybrid dash only for now)
 	*/
 	u8 timestamp_based;
-	/*! indicates the consumer only cares for the full file, not packets*/
+	/*! GF_FEVT_PLAY only, indicates the consumer only cares for the full file, not packets*/
 	u8 full_file_only;
-	/*! indicates any current download should be aborted*/
+	/*!
+	 for GF_FEVT_PLAY: indicates any current download should be aborted
+	 for GF_FEVT_PLAY_HINT if upstream event: indicates a HAS segment switch has occured (used by tileagg to flush reassembly buffers)
+	 for GF_FEVT_STOP: indicates the source filter has already received stop/play events and cancel event just before source
+	*/
 	u8 forced_dash_segment_switch;
-	/*! indicates non ref frames should be drawn for faster processing*/
+	/*! GF_FEVT_PLAY only, indicates non ref frames should be drawn for faster processing*/
 	u8 drop_non_ref;
-	/*! indicates that a demuxer must not forward this event as a source seek because seek has already been done
+	/*! GF_FEVT_PLAY only, indicates that a demuxer must not forward this event as a source seek because seek has already been done
 	(typically this play request is a segment play and byte range access within the file has already been performed by DASH client)*/
 	u8 no_byterange_forward;
 } GF_FEVT_Play;
@@ -1339,13 +1621,13 @@
 	u64 start_offset;
 	/*! end offset in source*/
 	u64 end_offset;
-	/*! new path to switch to*/
+	/*! GF_FEVT_SOURCE_SWITCH only, new path to switch to*/
 	const char *source_switch;
-	/*! indicates previous source was a DASH init segment and should be kept in memory cache*/
-	u8 previous_is_init_segment;
-	/*! ignore cache expiration directive for HTTP*/
+	/*!GF_FEVT_SOURCE_SWITCH only, indicates source is a DASH init segment and should be kept in memory cache*/
+	u8 is_init_segment;
+	/*!GF_FEVT_SOURCE_SWITCH only, ignore cache expiration directive for HTTP*/
 	u8 skip_cache_expiration;
-	/*! hint block size for source, might not be respected*/
+	/*! GF_FEVT_SOURCE_SEEK only, hint block size for source, might not be respected*/
 	u32 hint_block_size;
 } GF_FEVT_SourceSeek;
 
@@ -1355,8 +1637,6 @@
 	FILTER_EVENT_BASE
 	/*! URL of segment this info is for, or NULL if single file*/
 	const char *seg_url;
-	/*! global sidx is signaled using is_init=1 and range in idx range*/
-	Bool is_init;
 	/*! media start range in segment file*/
 	u64 media_range_start;
 	/*! media end range in segment file*/
@@ -1365,8 +1645,28 @@
 	u64 idx_range_start;
 	/*! index end range in segment file*/
 	u64 idx_range_end;
+	/*! global sidx is signaled using is_init=1 and range in idx range*/
+	u8 is_init;
+	/*! if global sidx, indicates if this is is an insertion and that byte range previously received should be shifted*/
+	u8 is_shift;
 } GF_FEVT_SegmentSize;
 
+/*! Event structure for GF_FEVT_FRAGMENT_SIZE*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+	/*! set to TRUE if last fragment in segment*/
+	Bool is_last;
+	/*! media start range in segment file*/
+	u64 offset;
+	/*! media end range in segment file*/
+	u64 size;
+	/*! media duration of fragment*/
+	GF_Fraction64 duration;
+	/*! fragment contains an IDR*/
+	Bool independent;
+} GF_FEVT_FragmentSize;
+
 /*! Event structure for GF_FEVT_ATTACH_SCENE and GF_FEVT_RESET_SCENE
 For GF_FEVT_RESET_SCENE, THIS IS A DIRECT FILTER CALL NOT THREADSAFE, filters processing this event SHALL run on the main thread*/
 typedef struct
@@ -1374,6 +1674,8 @@
 	FILTER_EVENT_BASE
 	/*! Pointer to a GF_ObjectManager structure for this PID*/
 	void *object_manager;
+	/*! Pointer to a GF_Node structure for this PID if node decoder pid*/
+	void *node;
 } GF_FEVT_AttachScene;
 
 /*! Event structure for GF_FEVT_QUALITY_SWITCH*/
@@ -1405,7 +1707,7 @@
 typedef struct
 {
 	FILTER_EVENT_BASE
-	/*! URL to delete*/
+	/*! URL to delete, or "__gpac_self__" when asking source filter to delete file */
 	const char *url;
 } GF_FEVT_FileDelete;
 
@@ -1417,7 +1719,7 @@
 	u32 min_x, max_x, min_y, max_y;
 	/*! if set, only min_x, min_y are used and indicate the gaze direction in pixels in the visual with/height frame (0,0) being top-left*/
 	Bool is_gaze;
-} GF_FEVT_VisibililityHint;
+} GF_FEVT_VisibilityHint;
 
 
 /*! Event structure for GF_FEVT_BUFFER_REQ*/
@@ -1427,18 +1729,42 @@
 	/*! indicates the max buffer to set on PID - the buffer is only activated on PIDs connected to decoders*/
 	u32 max_buffer_us;
 	/*! indicates the max playout buffer to set on PID (buffer level triggering playback)
-		Note: this is not used internally by the blocking mechanisms, but may be needed by other filters to take decisions
+		\note This is not used internally by the blocking mechanisms, but may be needed by other filters to take decisions
 	*/
 	u32 max_playout_us;
 	/*! indicates the min playout buffer to set on PID (buffer level triggering rebuffering)
-		Note: this is not used internally by the blocking mechanisms, but may be needed by other filters to take decisions
+		\note This is not used internally by the blocking mechanisms, but may be needed by other filters to take decisions
 	*/
 	u32 min_playout_us;
 	/*! if set, only the PID target of the event will have the buffer req set; otherwise, the buffer requirement event is passed down the chain until a raw media PID is found or a decoder is found. Used for muxers*/
 	Bool pid_only;
 } GF_FEVT_BufferRequirement;
 
-/*! Event object*/
+
+/*! Event structure for GF_FEVT_ENCODE_HINT*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+
+	/*! duration of intra (IDR, closed GOP) as expected by the dasher */
+	GF_Fraction intra_period;
+
+} GF_FEVT_EncodeHints;
+
+
+/*! Event structure for GF_FEVT_NTP_REF*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+
+	/*! 64 bit NTP timestamp */
+	u64 ntp;
+
+} GF_FEVT_NTPRef;
+
+/*!
+Filter Event object
+ */
 union __gf_filter_event
 {
 	GF_FEVT_Base base;
@@ -1447,10 +1773,13 @@
 	GF_FEVT_AttachScene attach_scene;
 	GF_FEVT_Event user_event;
 	GF_FEVT_QualitySwitch quality_switch;
-	GF_FEVT_VisibililityHint visibility_hint;
+	GF_FEVT_VisibilityHint visibility_hint;
 	GF_FEVT_BufferRequirement buffer_req;
 	GF_FEVT_SegmentSize seg_size;
+	GF_FEVT_FragmentSize frag_size;
 	GF_FEVT_FileDelete file_del;
+	GF_FEVT_EncodeHints encode_hints;
+	GF_FEVT_NTPRef ntp;
 };
 
 /*! Gets readable name for event type
@@ -1471,7 +1800,7 @@
 The API for filters documents declaration of filters, their creation and functions available to interact with the filter session.
 The gf_filter_* functions shall only be called from within a given filter, this filter being the target of the function. This is not checked at runtime.
 
-Calling these functions on other filters will result in unpredictable behaviour, very likely crashes in multi-threading conditions.
+Calling these functions on other filters will result in unpredictable behavior, very likely crashes in multi-threading conditions.
 
 A filter is instanciated through a filter register. The register holds entry points to a filter, arguments of a filter (basically property values) and capabilities.
 
@@ -1510,6 +1839,14 @@
 	GF_FS_ARG_META = 1<<5,
 	/*! internal flag used by meta filters (ffmpeg & co) to indicate the description of the argument is a dynamic allocated memory*/
 	GF_FS_ARG_META_ALLOC = 1<<6,
+	/*! internal flag used by filters acting as sinks (gsfmx in file mode) to allow retrieving dst url but avoid being used as direct sinks*/
+	GF_FS_ARG_SINK_ALIAS = 1<<7,
+	/*! if set indicates that the argument is updatable only as a direct synchronous call (typically used for shared data).
+		If so, the value will only be updated if the update directly targets the filter, and the global filter mutex will be locked before calling update_arg.
+		It is however recommended for the calling app to lock the target filter whenever shared data is modified (see vout filter overlay argument for example)
+		The filter should lock itself whenever appropriate using \ref gf_filter_lock
+	*/
+	GF_FS_ARG_UPDATE_SYNC = 1<<8,
 } GF_FSArgumentFlags;
 
 /*! Structure holding arguments for a filter*/
@@ -1560,6 +1897,8 @@
 #define CAP_SINT(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_SINT, .value.sint = _b}, .flags=(_f) }
 /*! Shortcut macro to assign unsigned integer capability type*/
 #define CAP_UINT(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_UINT, .value.uint = _b}, .flags=(_f) }
+/*! Shortcut macro to assign unsigned integer capability type*/
+#define CAP_4CC(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_4CC, .value.uint = _b}, .flags=(_f) }
 /*! Shortcut macro to assign signed long integer capability type*/
 #define CAP_LSINT(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_LSINT, .value.longsint = _b}, .flags=(_f) }
 /*! Shortcut macro to assign unsigned long integer capability type*/
@@ -1628,6 +1967,8 @@
 #define GF_CAPS_INPUT_OUTPUT	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_OUTPUT)
 /*! Shortcut macro to set for optional input and output capability flags*/
 #define GF_CAPS_INPUT_OUTPUT_OPT	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_OPTIONAL)
+/*! Shortcut macro to set for excluded input capability flags*/
+#define GF_CAPS_IN_OUT_EXCLUDED	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_EXCLUDED)
 
 /*! Filter capability description*/
 typedef struct
@@ -1669,12 +2010,69 @@
 */
 void gf_filter_set_session_caps(GF_Filter *filter, GF_FilterSessionCaps *caps);
 
+/*! Check if the filter is an instance of a filter register
+\param filter filter to test
+\param freg filter register to test
+\return GF_TRUE if filter is an instance of this register, GF_FALSE otehrwise
+*/
+Bool gf_filter_is_instance_of(GF_Filter *filter, const GF_FilterRegister *freg);
+
+
+/*! Aborts a filter, discarding and stopping all input PIDs and sending EOS on all output PIDs
+\param filter filter to abort
+*/
+void gf_filter_abort(GF_Filter *filter);
+
+
+/*! Locks a filter. A filter should only lock itself when using updatable arguments of type GF_FS_ARG_UPDATE_SYNC
+\param filter filter to lock
+\param do_lock if GF_TRUE, locks the filter global mutex, otherwise unlocks it
+*/
+void gf_filter_lock(GF_Filter *filter, Bool do_lock);
+
+
+
+/*! Lock global filter session. This is needed when assigning source IDs after a connect source or destination to the loaded source to connect in an async way
+\param filter target filter
+\param do_lock if GF_TRUE, locks the filter session global mutex, otherwise unlocks it
+*/
+void gf_filter_lock_all(GF_Filter *filter, Bool do_lock);
+
+/*! Force all output pids created for this filter to require a source ID for linking.
+
+ This is used by filters loading subchains to enforce that filters from these subchain only connect to each other or the target filter but not other filters outside this chain.
+ Filters using this function must setup source IDs on filters of the sunchain(s) they load.
+
+\param filter target filter
+*/
+void gf_filter_require_source_id(GF_Filter *filter);
+
+/*! Sets opaque runtime data for filter - used by bindings
+\param filter target filter
+\param udta data to set
+\return error if any
+*/
+GF_Err gf_filter_set_rt_udta(GF_Filter *filter, void *udta);
+/*! Gets opaque runtime data for filter - used by bindings
+\param filter target filter
+\return associated data or NULL
+*/
+void *gf_filter_get_rt_udta(GF_Filter *filter);
+
+
 /*! Filter probe score, used when probing a URL/MIME or when probing formats from data*/
 typedef enum
 {
 	/*! (de)mux format is not supported*/
 	GF_FPROBE_NOT_SUPPORTED = 0,
-	/*! (de)mux format is supported with potentially missing features*/
+	/*!
+		For demux only: format is maybe a match but garbage data was found at the start
+	*/
+	GF_FPROBE_MAYBE_NOT_SUPPORTED,
+	/*!
+		- for demux: format is maybe a match and can maybe be demuxed
+		- for mux: format is supported with potentially missing features
+	*/
 	GF_FPROBE_MAYBE_SUPPORTED,
 	/*! (de)mux format is supported*/
 	GF_FPROBE_SUPPORTED,
@@ -1719,26 +2117,30 @@
 	GF_FS_REG_HIDE_WEIGHT = 1<<4,
 	/*! Usually set for filters acting as sources but without exposing an src argument. This prevents throwing warnings on arguments not handled by the filter*/
 	GF_FS_REG_ACT_AS_SOURCE = 1<<5,
-	/*! Indicates the filter is likely to block for a long time (typically, network IO).
-	In multithread mode, this prevents the filter to be scheduled on the main thread, blocking video or audio output.
-	Ignored in single thread mode.*/
-	GF_FS_REG_BLOCKING = 1<<6,
+	/*! Indicates the filter can connect to another instance of the same class (avoids cyclic detection in linker graph)
+	Filters of the same class can only connect directly to each other if the destination filter is explictly loaded */
+	GF_FS_REG_ALLOW_CYCLIC = 1<<6,
 	/*! Indicates the filter PIDs may be dynamically added during process (e.g.M2TS, GSF, etc).
 	This will prevent deactivating a filter when none of its output PIDs are connected*/
 	GF_FS_REG_DYNAMIC_PIDS = 1<<7,
 	/*! Indicates the filter is a script-based filter. The registry is not valid until the script is loaded*/
 	GF_FS_REG_SCRIPT = 1<<8,
-	/*! Indicates the filter is a meta filter, wrapping various underlying filters (e.g., FFmpeg)*/
+	/*! Indicates the filter is a meta filter, wrapping various underlying filters (e.g. FFmpeg)*/
 	GF_FS_REG_META = 1<<9,
-	/*! Indicates that this filter, when dynamically loaded, allows the link resolver to redirect PID connection to this filter rather than to its next explicetly loaded filter in the chain.
+	/*! Indicates that this filter, when dynamically loaded, allows the link resolver to redirect PID connection to this filter rather than to its next explicitly loaded filter in the chain.
 		This is typically used by mux filters
 	*/
 	GF_FS_REG_DYNAMIC_REDIRECT = 1<<10,
 	/*! Indicates the filter requires graph resolver (typically because it creates new destinations/sinks at run time)*/
 	GF_FS_REG_REQUIRES_RESOLVER = 1<<11,
+	/*!
+		For sink filters, indicates the filter forces remux of input PIDs of type GF_STREAM_FILE (prevents direct file copy)
+		For source filters, indicates the PIDs should be remuxed to a destination filter with force remux set
+	*/
+	GF_FS_REG_FORCE_REMUX = 1<<12,
 
-	/*! flag dynamically set at runtime for registries loaded through shared libraries*/
-	GF_FS_REG_DYNLIB = 0x80000000
+	/*! flag dynamically set at runtime for custom filters*/
+	GF_FS_REG_CUSTOM = 0x40000000,
 } GF_FSRegisterFlags;
 
 /*! The filter register. Registries are loaded once at the start of the session and shall never be modified after that.
@@ -1767,7 +2169,8 @@
 	const GF_FilterArgs *args;
 
 	/*! mandatory - callback for filter processing
-		This function is called whenever packets are available on the input PID and buffer space is available on the output.
+
+	This function is called whenever packets are available on the input PID and buffer space is available on the output.
 	The session will by default monitor a filter for errors, and throw en error if a filter is not consuming nor producing packets for a given amount of process calls.
 	In some cases, it might be needed to not consume nor produce a packet for a given time (for example, waiting for a packet drop before reconfiguring a filter).
 	A filter must signal this using \ref gf_filter_ask_rt_reschedule, possibly with no timeout.
@@ -1778,19 +2181,23 @@
 	*/
 	GF_Err (*process)(GF_Filter *filter);
 
-	/*! optional for sources, mandatory for filters and sinks - callback for PID update may be called several times
+	/*! optional for sources, mandatory for filters and sinks (any filter with an input cap set) - callback for PID update may be called several times
 	on the same PID if PID config is changed.
 	Since discontinuities may happen at any time, and a filter may fetch packets in burst,
-	this function may be called while the filter is calling \ref gf_filter_pid_get_packet (this is the only reentrant call for filters)
+	this function may be called while the filter is calling \ref gf_filter_pid_get_packet (this is the only reentrant call for filters).
+	If an error is returned, the PID object shall no longer be used by the filter.
 
 	\param filter the target filter
 	\param PID the input PID to configure
 	\param is_remove indicates the input PID is removed
 	\return error if any.
-	a return error of GF_REQUIRES_NEW_INSTANCE indicates the PID cannot be processed in this instance but could be in a clone of the filter.
-	a return error of GF_FILTER_NOT_SUPPORTED indicates the PID cannot be processed and no alternate chain resolution would help
-	a return error of GF_BAD_PARAM indicates the PID cannot be processed and no alternate chain resolution would help, and throws a log error message
-	ano other return error will trigger a reconfigure of the chain to find another filter unless disabled at session level.
+	- a return error of GF_REQUIRES_NEW_INSTANCE indicates the PID cannot be processed in this instance but could be in a clone of the filter.
+	- a return error of GF_FILTER_NOT_SUPPORTED indicates the PID cannot be processed and no alternate chain resolution would help
+	- a return error of GF_EOS silently discard the input pid (same as GF_FILTER_NOT_SUPPORTED but does not throw error)
+	- a return error of GF_BAD_PARAM, GF_SERVICE_ERROR or GF_REMOTE_SERVICE_ERROR indicates the PID cannot be processed and no alternate chain resolution would help, and throws a log error message
+	- any other return error will trigger a reconfigure of the chain to find another filter unless disabled at session level.
+
+	If an error is returned when (re)configuring a pid, the function is called again with is_remove set to GF_TRUE
 	*/
 	GF_Err (*configure_pid)(GF_Filter *filter, GF_FilterPid *PID, Bool is_remove);
 
@@ -1807,7 +2214,7 @@
 
 	/*! optional - callback for arguments update. If GF_OK is returned, the filter private stack is updated accordingly.
 	If function is NULL, all updatable arguments will be changed in the filter private stack without the filter being notified.
-	If argument is a meta argument, it is the filter responsability to handle the update, as meta arguments do not live on the filter provate stack.
+	If argument is a meta argument, it is the filter responsability to handle the update, as meta arguments do not live on the filter private stack.
 	If the filter is a meta filter and argument is not declared in the argument list, the function is always called.
 
 	\param filter the target filter
@@ -1818,8 +2225,8 @@
 	GF_Err (*update_arg)(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val);
 
 	/*! optional - process a given event. Retruns TRUE if the event has to be canceled, FALSE otherwise
-		If a downstream (towards source) event is not canceled, it will be forwarded to each input PID of the filter.
-		If you need to forward the event only to one input pid, send a copy of the event to the desired input and cancel the event.
+		- If a downstream (towards source) event is not canceled, it will be forwarded to each input PID of the filter.
+		- If you need to forward the event only to one input pid, send a copy of the event to the desired input and cancel the event.
 	\param filter the target filter
 	\param evt the event to process
 	\return GF_TRUE if the event should be canceled, GF_FALSE otherwise
@@ -1846,7 +2253,7 @@
 	/*! optional, usually set by demuxers. This function probes the mime type of a data chunk, usually located at the start of the file.
 	This function is called once the source is open, but is never called on an instanciated filter. The returned mime type (if any) is then used instead of the file extension
 	for solving filter graph.
-	Note: demux filters should always exposed 2 input caps bundle, one for specifiying input cap by file extension and one for specifying input cap by mime type.
+	\note Demux filters should always exposed 2 input caps bundle, one for specifying input cap by file extension and one for specifying input cap by mime type.
 	\param data data to probe
 	\param size size of the data to probe
 	\param score set to the probe score. Initially set to \ref GF_FPROBE_NOT_SUPPORTED before calling the function. If you are certain of the data type, use \ref GF_FPROBE_SUPPORTED, if unsure use \ref GF_FPROBE_MAYBE_SUPPORTED. If the format cannot be probed (bad design), set it to \ref GF_FPROBE_EXT_MATCH
@@ -1855,7 +2262,7 @@
 	const char * (*probe_data)(const u8 *data, u32 size, GF_FilterProbeScore *score);
 
 	/*! for filters having the same match of input capabilities for a PID, the filter with priority at the lowest value will be used
-	scalable decoders should use high values, so that they are only selected when enhancement layers are present*/
+	\note Scalable decoders should use high values, so that they are only selected when enhancement layers are present*/
 	u8 priority;
 
 	/*! optional for dynamic filter registries. Dynamic registries may declare any number of registries. The register_free function will be called to cleanup any allocated memory
@@ -1891,7 +2298,7 @@
 
 
 	/*! version of the filter, usually only for external libs
-		Note: If this strings starts with "! " it indicates an error message at load time of the registry. This should only be set when \code gf_opts_get_bool("temp", "gendoc"); \endcode returns true, indicating the filter session is only loaded for documentation purposes (man/md generation and command line help).
+		\note If this strings starts with "! " it indicates an error message at load time of the registry. This should only be set when \code gf_opts_get_bool("temp", "gendoc"); \endcode returns true, indicating the filter session is only loaded for documentation purposes (man/md generation and command line help).
 	*/
 	const char *version;
 #ifndef GPAC_DISABLE_DOC
@@ -1906,16 +2313,19 @@
 		- shall not use markdown
 		- first line if present is author name and should be normally capitalized
 		- second line if present is comma-separated list of contact info (eg http://foo.bar,mailto:foo@bar.com)
+
+		If first character is a `-`, this field is interpreted as a configuration info (typically for meta filters such as ffmpeg).
 	*/
 	const char *author;
 	/*! help of the filter. Conventions:
-		- describe any non-obvious behaviour of the filter here
+		- describe any non-obvious behavior of the filter here
 		- markdown is allowed. Use '`' for code, "__" for italic, "**" for bold and "~~" for strikethrough.
 		- mardown top-level sections shall use '#', second level '##', and so on
 		- mardown bullet lists shall use "- ", " - " etc...
 		- notes shall be identifed as a line starting with "Note: "
 		- warnings shall be identifed as a line starting with "Warning: "
-		- the sequence "[-" is reserved for option links. It is formated as:
+		- examples shall be identifed as a line starting with "EX "
+		- the sequence "[-" is reserved for option links. It is formatted as:
 		 		- "[-OPT]()": link to self page for option OPT
 		 		- "[-OPT](LINK)": link to other page for option OPT.
 			LINK can be:
@@ -1973,6 +2383,9 @@
 struct _gf_ft_mgr *gf_filter_get_font_manager(GF_Filter *filter);
 
 /*! Asks task reschedule for a given delay. There is no guarantee that the task will be recalled at exactly the desired delay
+
+ The function can be called several times while in process, the smallest reschedule time will be kept.
+ 
 \param filter target filter
 \param us_until_next number of microseconds to wait before recalling this task
 */
@@ -1998,10 +2411,10 @@
 /*! Sets callback function on source filter setup failure
 \param filter target filter
 \param source_filter the source filter to monitor
-\param on_setup_error callback function to call upon source setup error
+\param on_setup_error callback function to call upon source setup error - the callback can return GF_TRUE to cancel error reporting
 \param udta user data passed back to the task function
 */
-void gf_filter_set_setup_failure_callback(GF_Filter *filter, GF_Filter *source_filter, void (*on_setup_error)(GF_Filter *f, void *on_setup_error_udta, GF_Err e), void *udta);
+void gf_filter_set_setup_failure_callback(GF_Filter *filter, GF_Filter *source_filter, Bool (*on_setup_error)(GF_Filter *f, void *on_setup_error_udta, GF_Err e), void *udta);
 
 /*! Notify a filter setup error. This is typically called when a source filter or a filter having accepted input PIDs detects an issue.
 For a source filter (no input PID), the failure callback will be called if any, and the filter will be removed.
@@ -2056,8 +2469,7 @@
 
 
 /*! Connects a source to this filter.
-Note:
-Any filter loaded between the source and the calling filter will not use argument inheritance from the caller.
+\note Any filter loaded between the source and the calling filter will not use argument inheritance from the caller.
 
 \param filter the target filter
 \param url url of source to connect to, with optional arguments.
@@ -2143,6 +2555,9 @@
 
 /*! Explicitly assigns a source ID to a filter. This shall be called before connecting the link_from filter
 If no ID is assigned to the linked filter, a dynamic one in the form of _%08X_ (using the filter mem address) will be used
+
+\warning In multithreaded sessions, the session must be locked before the filter creation step and unlocked after calling this function, otherwise graph resolution might happen before \ref gf_filter_set_source is called
+
 \param filter the target filter
 \param link_from the filter to link from
 \param link_ext any link extensions allowed in link syntax:
@@ -2157,9 +2572,19 @@
 */
 GF_Err gf_filter_set_source(GF_Filter *filter, GF_Filter *link_from, const char *link_ext);
 
+/*! Similar to \ref gf_filter_set_source
+ This should be used on source filters when the calling filter is expected to have more possible sources added in the future, thereby dynamically changing its source IDs.
+ Typically the compositor running the GUI is one such filter. This variant will make sure the sourceID used in the adaptation chain is always the ID of the source and not the source ID of the calling filter
+\param filter the target filter
+\param link_from the filter to link from
+\param link_ext any link extensions allowed in link syntax:
+\return error code if any
+*/
+GF_Err gf_filter_set_source_restricted(GF_Filter *filter, GF_Filter *link_from, const char *link_ext);
+
 /*! Explicitly reset sourceID of a filter. This shall be called before connecting the filter (eg creating PIDs).
 
- This is mostly used to reset a source ID of a filter created from a destination (e.g., dasher creating muxers from the MPD URL) where the destination arguments could have sourceIDs specified/
+ This is mostly used to reset a source ID of a filter created from a destination (e.g. dasher creating muxers from the MPD URL) where the destination arguments could have sourceIDs specified/
 
 \param filter the target filter
 */
@@ -2178,8 +2603,19 @@
 */
 const char *gf_filter_get_id(GF_Filter *filter);
 
+/*! Indicates the filter is a likely to block for a long time (typically, network IO).
+In multithread mode, this prevents the filter to be scheduled on the main thread, blocking video or audio output.
+By default, all filters are created as non-blocking.
+
+\param filter the target filter
+\param is_blocking if GF_TRUE, indicates the filter is likely to block
+*/
+void gf_filter_set_blocking(GF_Filter *filter, Bool is_blocking);
+
+/*! Overrides the filter caps with new caps for this instance. Typically used when an option of the filter changes the capabilities
+
+The new caps are only taken into account for future graph resolutions, any current link from/to the target filter will not be re-solved when calling this function.
 
-/*! Overrides the filter register caps with new caps for this instance. Typically used when an option of the filter changes the capabilities
 \param filter the target filter
 \param caps the new set of capabilities to use for the filter. These are NOT copied and shall be valid for the lifetime of the filter
 \param nb_caps number of capabilities set
@@ -2187,6 +2623,12 @@
 */
 GF_Err gf_filter_override_caps(GF_Filter *filter, const GF_FilterCapability *caps, u32 nb_caps );
 
+/*! Indicates this filter acts as a sink and will be used as such in graph resolution. Such filters must provide a use_alias function in their registry.
+\param filter the target filter
+\return error code if any
+*/
+GF_Err gf_filter_act_as_sink(GF_Filter *filter);
+
 /*! Filter session separator set query*/
 typedef enum
 {
@@ -2202,7 +2644,7 @@
 	GF_FS_SEP_NEG,
 } GF_FilterSessionSepType;
 
-/*! Queries the character code used as a given separator type in argument names. Used for formating arguments when loading sources and destinations from inside a filter
+/*! Queries the character code used as a given separator type in argument names. Used for formatting arguments when loading sources and destinations from inside a filter
 \param filter the target filter
 \param sep_type the separator type to query
 \return character code of the separator
@@ -2221,6 +2663,12 @@
 */
 char *gf_filter_get_dst_name(GF_Filter *filter);
 
+/*! Get the filter arguments.
+\param filter the target filter
+\return the argument string of the filter
+*/
+const char *gf_filter_get_src_args(GF_Filter *filter);
+
 /*! Sends an event on all input PIDs (downstream) or on all output PIDs (upstream)
 \param filter the target filter
 \param evt the event to send
@@ -2244,9 +2692,9 @@
 GF_Err gf_filter_set_event_target(GF_Filter *filter, Bool enable_events);
 
 /*! Looks for a built-in property value marked as informative on a filter on all PIDs (inputs and output)
-This is a recursive call on both input and ouput chain.
+This is a recursive call on both input and output chain.
 There is no guarantee that a queried property will still be valid at the setter side upon returning the call, the setter could have
-already reassigned it to NULL. To avoids random behaviour, the property returned is reference counted so that it is not
+already reassigned it to NULL. To avoids random behavior, the property returned is reference counted so that it is not
 destroyed by the setter while the caller uses it.
 
 Properties retrieved shall be released using \ref gf_filter_release_property. Failure to do so will cause memory leaks in the program.
@@ -2279,7 +2727,7 @@
 const GF_PropertyValue *gf_filter_get_info(GF_Filter *filter, u32 prop_4cc, GF_PropertyEntry **propentry);
 
 /*! Looks for a property value on a filter on all PIDs (inputs and output).
-This is a recursive call on both input and ouput chain
+This is a recursive call on both input and output chain
 Properties retrieved shall be released using \ref gf_filter_release_property. See \ref gf_filter_pid_get_info for more details.
 \param filter the target filter
 \param prop_name the name of the property to fetch
@@ -2289,7 +2737,7 @@
 const GF_PropertyValue *gf_filter_get_info_str(GF_Filter *filter, const char *prop_name, GF_PropertyEntry **propentry);
 
 /*! Release a property previously queried, only used for []_get_info_[] functions.
-This is a recursive call on both input and ouput chain
+This is a recursive call on both input and output chain
 \param propentry the property reference object to be released
 */
 void gf_filter_release_property(GF_PropertyEntry *propentry);
@@ -2340,7 +2788,7 @@
 /*! Forwards an event to the filter session
 \param filter filter object
 \param evt the event forwarded
-\param consumed if set, indicates the event was already consummed/processed before forwarding
+\param consumed if set, indicates the event was already consumed/processed before forwarding
 \param skip_user if set, indicates the event should only be dispatched to event listeners.
 Otherwise, if a user is assigned to the session, the event is forwarded to the user
 \return the error code if any
@@ -2363,7 +2811,7 @@
 /*! Gets a filter argument value as string for a given argument name..
 \param filter filter object
 \param arg_name name of the filter argument
-\param dump buffer in which any formating of argument value will take place
+\param dump buffer in which any formatting of argument value will take place
 \return the string value of the argument, or NULL if argument is not found or is invalid
 */
 const char *gf_filter_get_arg_str(GF_Filter *filter, const char *arg_name, char dump[GF_PROP_DUMP_ARG_SIZE]);
@@ -2393,23 +2841,23 @@
 Bool gf_filter_ui_event(GF_Filter *filter, GF_Event *uievt);
 
 
-/*! Registers filter as an openGL provider. This is only used by sink filters creating a openGL context, to avoid creating another context. Filters registered as OpenGL providers will run on the main thread.
+/*! Registers filter as an OpenGL provider. This is only used by sink filters creating a OpenGL context, to avoid creating another context. Filters registered as OpenGL providers will run on the main thread.
 \param filter filter providing OpenGL context
 \param do_register if TRUE the filter carries a valid gl context, if FALSE the filter no longer carries a valid GL context
 */
 void gf_filter_register_opengl_provider(GF_Filter *filter, Bool do_register);
 
-/*! Requests openGL support for this filter. If no OpenGL providers exist, a default provider will be created (GL context creation on hidden window). Filters requiring OpenGL will run on the main thread.
+/*! Requests OpenGL support for this filter. If no OpenGL providers exist, a default provider will be created (GL context creation on hidden window). Filters requiring OpenGL will run on the main thread.
 
-\note Filters using openGL should not assume any persistent GL state among calls. Other filters using openGL might change the openGL context state (depth test, viewport, alpha blending, culling, etc...).
+\note Filters using OpenGL should not assume any persistent GL state among calls. Other filters using OpenGL might change the OpenGL context state (depth test, viewport, alpha blending, culling, etc...).
 
 \param filter filter providing OpenGL context
 \return error code if any
 */
 GF_Err gf_filter_request_opengl(GF_Filter *filter);
 
-/*! Sets openGL context active for this filter.
-\note There may be several openGL context created in the filter session, depending on activated filters. A filter using openGL must call this function before issuing any openGL calls
+/*! Sets OpenGL context active for this filter.
+\note There may be several OpenGL context created in the filter session, depending on activated filters. A filter using OpenGL must call this function before issuing any OpenGL calls
 
 \param filter filter asking for OpenGL context activation
 \return error code if any
@@ -2420,7 +2868,7 @@
 /*! Count the number of source filters for the given filter matching the given protocol type.
 \param filter filter to inspect
 \param protocol_scheme scheme of the protocol to test, without ://, eg "http", "rtp", "https"
-\param expand_proto if set to GF_TRUE, any source protocol with a name begining like protocol_scheme will be matched. For example, use this with "http" to match all http and https schemes.
+\param expand_proto if set to GF_TRUE, any source protocol with a name beginning like protocol_scheme will be matched. For example, use this with "http" to match all http and https schemes.
 \param enum_pids user function to enumerate PIDs against which the source should be checked . If not set, all source filters will be checked.
 \param udta user data for the callback function
 \return the number of source filters matched by protocols
@@ -2439,7 +2887,7 @@
 
 /*! Checks if some PIDs are still not connected in the graph originating at filter. This is typically used by filters dynamically loading source filters to make sure all PIDs from the source are connected.
 
-NOTE: this does not guarantee that no other PID remove or configure will happen later on, this depends on the source type and is unknown by GPAC's filter architecture.
+\note This does not guarantee that no other PID remove or configure will happen later on, this depends on the source type and is unknown by GPAC's filter architecture.
 \param filter target filter
 \param stop_at_filter check connections until this filter. If NULL, connections are checked until upper (sink) end of graph
 \return GF_TRUE if any filter in the path has pending PID connections
@@ -2493,12 +2941,13 @@
 */
 Bool gf_filter_end_of_session(GF_Filter *filter);
 
-/*! used by meta-filters (ffmpeg and co) to report an option was set but not used by the filter. This is needed since these filters might not
+/*! used by meta-filters (ffmpeg and co) to report used/unused options. This is needed since these filters might not
 know the set of available options at initialize() time.
 \param filter target filter
 \param arg name of the argument not used/found
+\param was_found indicate that this option was found
 */
-void gf_filter_report_unused_meta_option(GF_Filter *filter, const char *arg);
+void gf_filter_report_meta_option(GF_Filter *filter, const char *arg, Bool was_found);
 
 /*! used by script to set a per-instance description
 \param filter target filter
@@ -2567,8 +3016,14 @@
 */
 GF_FilterArgs *gf_filter_get_args(GF_Filter *filter);
 
+/*! get per-instance caps
+\param filter target filter
+\param nb_caps set to the number of caps
+\return the filter instance caps if any, NULL otherwise
+*/
+const GF_FilterCapability *gf_filter_get_caps(GF_Filter *filter, u32 *nb_caps);
 
-/*! probes mime type of a given block of data (should be begining of file )
+/*! probes mime type of a given block of data (should be beginning of file )
 \param filter target filter
 \param data buffer to probe
 \param size size of buffer
@@ -2597,6 +3052,76 @@
 */
 GF_Err gf_filter_get_stats(GF_Filter *filter, GF_FilterStats *stats);
 
+
+/*! Enumerates default arguments of a filter
+\param filter filter session
+\param idx the 0-based index of the argument to query
+\return the argument definition, or NULL if error
+*/
+const GF_FilterArgs *gf_filter_enumerate_args(GF_Filter *filter, u32 idx);
+
+
+/*! Reslves URL against locales settings
+\param filter filter
+\param service_url URL of service to relocate
+\param parent_url parent URL of service
+\param out_relocated_url - must be GF_MAX_PATH size
+\param out_localized_url - must be GF_MAX_PATH size
+\return GF_TRUE if success
+*/
+Bool gf_filter_relocate_url(GF_Filter *filter, const char *service_url, const char *parent_url, char *out_relocated_url, char *out_localized_url);
+
+
+/*! Returns the register of a given filter
+\param filter target filter
+\return the register object, or NULL if error
+*/
+const GF_FilterRegister *gf_filter_get_register(GF_Filter *filter);
+
+/*! Prints all possible connections between filter registries for a loaded filter using \code LOG_APP@LOG_INFO \endcode
+\param filter filter object
+\param print_fn optional callback function for print, otherwise print to stderr
+*/
+void gf_filter_print_all_connections(GF_Filter *filter, void (*print_fn)(FILE *output, GF_SysPrintArgFlags flags, const char *fmt, ...) );
+
+/*! Force a filter to run on main thread.
+
+\param filter filter object
+\param do_tag if GF_TRUE, tags filter to run on main thread, otherwise untags filters
+
+\warning There shall be at most as many with do_tag=GF_FALSE as there were calls with do_tag=GF_TRUE
+*/
+void gf_filter_force_main_thread(GF_Filter *filter, Bool do_tag);
+
+/*! Check if a filter is a sink, i.e. it has no output capabilities.
+ \note a filter may have no outputs but still not be a sink due to dynamic nature of filter linking
+\param filter target filter
+\return GF_TRUE if filter is a sink, GF_FALSE otherwise
+*/
+Bool gf_filter_is_sink(GF_Filter *filter);
+
+/*! Check if a filter is a source, i.e. it has no input capabilities
+ \note a filter may have no inputs but still not be a source, typically the case for some custom filters loading their sources dynamically
+\param filter target filter
+\return GF_TRUE if filter is a source, GF_FALSE otherwise
+*/
+Bool gf_filter_is_source(GF_Filter *filter);
+
+/*! Tags a filter in a given subsession, ignored in non-implicit mode.
+
+If sourceIDs are used on destination filter, subsession and source IDs are ignored.
+If filters do not have the same subsession ID, they cannot link to each
+If filters do not have the same sourceID, they cannot link to each other except if destination is a sink
+
+\note In non-implicit mode, subsession tagging must be done through filter option :FS=
+
+\param filter target filter
+\param subsession_id subsession identifier
+\param source_id subsession identifier
+\return error if any
+*/
+GF_Err gf_filter_tag_subsession(GF_Filter *filter, u32 subsession_id, u32 source_id);
+
 /*! @} */
 
 
@@ -2652,14 +3177,16 @@
 \param out_pid the output PID to create or update. If no referer PID, a new PID will be created otherwise the PID will be updated
 \return error code if any
 */
-GF_Err gf_filter_pid_raw_new(GF_Filter *filter, const char *url, const char *local_file, const char *mime_type, const char *fext, u8 *probe_data, u32 probe_size, Bool trust_mime, GF_FilterPid **out_pid);
+GF_Err gf_filter_pid_raw_new(GF_Filter *filter, const char *url, const char *local_file, const char *mime_type, const char *fext, const u8 *probe_data, u32 probe_size, Bool trust_mime, GF_FilterPid **out_pid);
 
 /*! Sets a new property on an output PID for built-in property names.
-Previous properties (ones set before last packet dispatch) will still be valid. Property with same type/name will be reassigned
-You need to remove them one by one using \ref gf_filter_pid_set_property with NULL property, or reset the properties with \ref gf_filter_pid_reset_properties.
 Setting a new property will trigger a PID reconfigure at the consumption point of the next dispatched packet.
+Previous properties (ones set before last packet dispatch) will still be valid. You can remove any of them using \ref gf_filter_pid_set_property with NULL property, or reset the properties with \ref gf_filter_pid_reset_properties.
+There cannot be two instances of a property a given type/name:
+- If a property with same type/name exists and has the same value, assignment will be skipped: this avoids triggering PID reconfiguration when not needed. In that case, if the property contains memory to be passed to the filter session, this memory will be destroyed (eg GF_PROP_STRING_NO_COPY, GF_PROP_DATA_NO_COPY, GF_PROP_STRING_LIST).
+- If the values differ, the property will be reassigned. There cannot be tow instances of a proerty value with a given type/name.
 
-Warning: changing a property before the final end of stream (i.e. if no more packets are sent) will have no effect. You must use \ref gf_filter_pid_set_info and \ref gf_filter_pid_get_info for this.
+Warning: changing a property at the final end of stream (i.e. if no more packets are sent) will have no effect. You must use \ref gf_filter_pid_set_info and \ref gf_filter_pid_get_info for this.
 
 \param PID the target filter PID
 \param prop_4cc the built-in property code to modify
@@ -2687,8 +3214,10 @@
 /*! Sets a new info property on an output PID for built-in property names.
 Similar to \ref gf_filter_pid_set_property, but infos are not copied up the chain and to not trigger PID reconfiguration.
 First packet dispatched after calling this function will be marked, and its fetching by the consuming filter will trigger a process_event notification.
-If the consumming filter copies properties from source packet to output packet, the flag will be passed to such new output packet.
-Note: any property type can be used for info, except \ref GF_PROP_POINTER.
+If the consuming filter copies properties from source packet to output packet, the flag will be passed to such new output packet.
+
+If an info property with same type/name exists and has the same value, assignment will be skipped. In that case, if the property contains memory to be passed to the filter session, this memory will be destroyed (eg GF_PROP_STRING_NO_COPY, GF_PROP_DATA_NO_COPY, GF_PROP_STRING_LIST).
+
 
 \param PID the target filter PID
 \param prop_4cc the built-in property code to modify
@@ -2727,6 +3256,19 @@
 */
 void *gf_filter_pid_get_udta(GF_FilterPid *PID);
 
+/*! get user 32-bits flags
+\param PID the target filter PID
+\return flags
+*/
+u32 gf_filter_pid_get_udta_flags(GF_FilterPid *PID);
+
+/*! set user 32-bits flags
+\param PID the target filter PID
+\param flags the flags (replaces the entire flags))
+\return error if any
+*/
+GF_Err gf_filter_pid_set_udta_flags(GF_FilterPid *PID, u32 flags);
+
 /*! Gets PID name. Mostly used for logging purposes
 \param PID the target filter PID
 \param name the new PID name. function ignored if NULL.
@@ -2747,11 +3289,12 @@
 
 /*! Gets the source arguments of the PID, walking down the chain until the source filter
 \param PID the target filter PID
+\param for_unicity if GF_TRUE, will return the arguments of the first filter responsible for a fan-out leading to this PID
 \return argument of the source filter
 */
-const char *gf_filter_pid_orig_src_args(GF_FilterPid *PID);
+const char *gf_filter_pid_orig_src_args(GF_FilterPid *PID, Bool for_unicity);
 
-/*! Gets the source filter name or class name for the PID, walking down the chain until the source filter (ony the first input PID of each filter is used).
+/*! Gets the source filter name or class name for the PID, walking down the chain until the source filter (only the first input PID of each filter is used).
 \param PID the target filter PID
 \return argument of the source filter
 */
@@ -2783,6 +3326,13 @@
 */
 Bool gf_filter_pid_is_filter_in_parents(GF_FilterPid *PID, GF_Filter *filter);
 
+/*! Checks if a given PID has a common filter with another PID in the parent graph
+\param PID the target filter PID
+\param other_pid the other PID to check
+\return GF_TRUE if a filter is found that is outputing these two PIDs, GF_FALSE otherwise
+*/
+Bool gf_filter_pid_share_origin(GF_FilterPid *PID, GF_FilterPid *other_pid);
+
 /*! Gets current buffer levels of the PID
 \param PID the target filter PID
 \param max_units maximum number of packets allowed - can be 0 if buffer is measured in time
@@ -2798,6 +3348,15 @@
 */
 void gf_filter_pid_set_loose_connect(GF_FilterPid *PID);
 
+/*! Adds PID properties from textual description - this does not reset the PID properties
+\param PID the target filter PID
+\param args one or more serialized properties to set, as documented in gpac -h doc
+\param direct_merge if true, next packet to be sent will not trigger a property change
+\param use_default_seps if GF_TRUE, the serialized properties are using the default separator set, otherwise they are using the current separator set of the session
+\return Error if any
+*/
+GF_Err gf_filter_pid_push_properties(GF_FilterPid *PID, char *args, Bool direct_merge, Bool use_default_seps);
+
 
 /*! Negotiate a given property on an input PID for built-in properties
 Filters may accept some PID connection but may need an adaptaion chain to be able to process packets, eg change pixel format or sample rate
@@ -2830,7 +3389,7 @@
 
 /*! Queries a negotiated built-in capability on an output PID
 Filters may check if a property negotiation was done on an output PID, and check the property value.
-This can be done on an output PID in a filter->reconfigure_output if the filter accpets caps negotiation
+This can be done on an output PID in a filter->reconfigure_output if the filter accepts caps negotiation
 This can be done on an input PID in a generic reconfigure_pid
 
 \param PID the target filter PID
@@ -2950,7 +3509,7 @@
 /*! Gets a built-in property of the PID
 Warning: properties are only valid until the next configure_pid is called. Attempting to use a property
 value (either the pointer or one of the value) queried before the current configure_pid will result in
- unpredictable behaviour, potentially crashes.
+ unpredictable behavior, potentially crashes.
 \param PID the target filter PID
 \param prop_4cc the code of the built-in property to retrieve
 \return the property if found or NULL otherwise
@@ -3012,7 +3571,7 @@
 */
 const GF_PropertyValue *gf_filter_pid_get_info(GF_FilterPid *PID, u32 prop_4cc, GF_PropertyEntry **propentry);
 
-/*! Looks for a property value on a PIDs. This is a recursive call on both input and ouput chain
+/*! Looks for a property value on a PIDs. This is a recursive call on both input and output chain
 Properties retrieved shall be released using \ref gf_filter_release_property. See \ref gf_filter_pid_get_info for more details.
 \param PID the target filter PID to query
 \param prop_name the name of the property to fetch
@@ -3034,9 +3593,15 @@
 */
 Bool gf_filter_pid_has_seen_eos(GF_FilterPid *PID);
 
+/*! Checks for end of stream has been signaled a PID. Contrary to \ref gf_filter_pid_has_seen_eos this is not a recursive call and only checks the given pid.
+\param PID the target filter PID
+\return GF_TRUE if end of stream was signaled for that pid (there may be pending packets in queue)
+*/
+Bool gf_filter_pid_eos_received(GF_FilterPid *PID);
+
 /*! Checks for end of stream signaling on a PID.
 \param PID the target filter PID
-\return GF_TRUE if end of stream was signaled on that PID
+\return GF_TRUE if end of stream is set on that PID (no more packet in queue)
 */
 Bool gf_filter_pid_is_eos(GF_FilterPid *PID);
 
@@ -3081,7 +3646,7 @@
 /*! Checks if the PID would enter a blocking state if a new packet is sent.
 This function should be called by eg demuxers to regulate the rate at which they send packets
 
-Note: PIDs are never fully blocking in GPAC, a filter requesting an output packet should usually get one unless something goes wrong
+\note PIDs are never fully blocking in GPAC, a filter requesting an output packet should usually get one unless something goes wrong
 \param PID the target filter PID
 \return GF_TRUE if PID would enter blocking state , GF_FALSE otherwise
 */
@@ -3094,7 +3659,7 @@
 u32 gf_filter_pid_get_timescale(GF_FilterPid *PID);
 
 /*! Clears the end of stream flag on a PID.
-Note: the end of stream is automatically cleared when a new packet is dispatched; This function is used to clear it asap, before next packet dispacth (period switch in dash for example).
+\note The end of stream is automatically cleared when a new packet is dispatched; This function is used to clear it asap, before next packet dispacth (period switch in dash for example).
 \param PID the target filter PID
 \param all_pids if sets, clear end oof stream for all PIDs coming from the same filter as the target PID
 */
@@ -3132,11 +3697,23 @@
 GF_Err gf_filter_pid_resolve_file_template(GF_FilterPid *PID, char szTemplate[GF_MAX_PATH], char szFinalName[GF_MAX_PATH], u32 file_number, const char *file_suffix);
 
 
+/*! Same as \ref gf_filter_pid_resolve_file_template but overrides file name with given name
+\param PID the target filter PID
+\param szTemplate source template to solve
+\param szFinalName buffer for final name
+\param file_number number of file to use
+\param file_suffix if not null, will be appended after the value of the §File$ keyword if present
+\param file_name if not null, will be used instead of PID URL or local path
+\return error if any
+*/
+GF_Err gf_filter_pid_resolve_file_template_ex(GF_FilterPid *PID, char szTemplate[GF_MAX_PATH], char szFinalName[GF_MAX_PATH], u32 file_number, const char *file_suffix, const char *file_name);
+
+
 /*! Sets discard mode on or off on an input PID. When discard is on, all input packets for this PID are no longer dispatched.
 
 This only affect the current PID, not the source filter(s) for that PID.
 
-PID reconfigurations are still forwarded to the filter, so that a filter may decide to re-enable regular mode.
+PID reconfigurations are still forwarded to the filter, so that a filter may decide to re-enable regular mode. Packets sent after a PID reconfiguration are kept until the PID is reconfigured, and discarded if the PID is still in discard mode.
 
 This is typically needed for filters that stop consuming data for a while (dash forced period duration for example) but may resume
 consumption later on (stream moving from period 1 to period 2 for example).
@@ -3226,6 +3803,37 @@
 */
 void *gf_filter_pid_get_alias_udta(GF_FilterPid *PID);
 
+/*! Gets the filter owning the input PID
+\param PID the target filter PID
+\return the filter owning the PID or NULL if error
+*/
+GF_Filter *gf_filter_pid_get_source_filter(GF_FilterPid *PID);
+
+/*! Enumerates the destination filters of an output PID
+\param PID the target filter PID
+\param idx the target destination index
+\return the destination filter for the given index, or NULL if error
+*/
+GF_Filter *gf_filter_pid_enum_destinations(GF_FilterPid *PID, u32 idx);
+
+/*! Ignore this PID in blocking mode estimations.
+
+This is typically used when a filter consumes N pids, with some at very low frequency for which an empty queue should not imply unblocking the filter to refill the queue.
+
+\param PID the target filter PID
+\param do_ignore if GF_TRUE, the PID will not be considered when trying to unblock the filter
+\return error if any
+*/
+GF_Err gf_filter_pid_ignore_blocking(GF_FilterPid *PID, Bool do_ignore);
+
+/*! Gets next estimated time on this PID, ie last_pck(DTS+dur) or last_pck(CTS+dur)
+
+\param PID the target filter PID
+\return GF_FILTER_NO_TS or estimated time
+*/
+u64 gf_filter_pid_get_next_ts(GF_FilterPid *PID);
+
+
 /*! @} */
 
 
@@ -3248,18 +3856,26 @@
 In order to handle reordering of packets, it is possible to keep references to either packets (may block the filter chain), or packet properties.
 
 Packets shall always be dispatched in their processing order (decode order). If reordering upon reception is needed, or AU interleaving is used, a filter SHALL do the reordering.
-However, packets do not have to be send in their creation order: a created packet is not assigned to PID buffers until it is send.
+However, packets do not have to be send in their creation order: a created packet is not assigned to PID buffers until it is sent.
 
 @{
 */
 
 
 /*! Keeps a reference to the given input packet. The packet shall be released at some point using \ref gf_filter_pck_unref
+
+ Filters keeping reference to packets should check if the packet is a blocking reference using gf_filter_pck_is_blocking_ref. If this is the case, the input chain will likely be blocked until the packet reference is released.
 \param pck the target input packet
 \return error if any
 */
 GF_Err gf_filter_pck_ref(GF_FilterPacket **pck);
 
+/*! Same as \ref gf_filter_pck_ref but doesn't use pointer to packet
+\param pck the target input packet
+\return the new reference to the packet
+*/
+GF_FilterPacket *gf_filter_pck_ref_ex(GF_FilterPacket *pck);
+
 /*! Remove a reference to the given input packet. The packet might be destroyed after that call.
 \param pck the target input packet
 */
@@ -3279,7 +3895,7 @@
 \param PID the target output PID
 \param data_size the desired size of the packet - can be changed later
 \param data set to the writable buffer of the created packet
-\return new packet or NULL if error
+\return new packet or NULL if allocation error or not an output PID
 */
 GF_FilterPacket *gf_filter_pck_new_alloc(GF_FilterPid *PID, u32 data_size, u8 **data);
 
@@ -3290,19 +3906,19 @@
 \param data the data block to dispatch
 \param data_size the size of the data block to dispatch
 \param destruct the callback function used to destroy the packet when no longer used - may be NULL
-\return new packet or NULL if error
+\return new packet or NULL if allocation error or not an output PID
 */
 GF_FilterPacket *gf_filter_pck_new_shared(GF_FilterPid *PID, const u8 *data, u32 data_size, gf_fsess_packet_destructor destruct);
 
 /*! Allocates a new packet on the output PID referencing data of some input packet.
 The packet has by default no DTS, no CTS, no duration framing set to full frame (start=end=1) and all other flags set to 0 (including SAP type).
 \param PID the target output PID
-\param data the data block to dispatch - if NULL, the entire data of the source packet is used
-\param data_size the size of the data block to dispatch - if 0, the entire data of the source packet is used
+\param data_offset offset in the source data block
+\param data_size the size of the data block to dispatch - if 0, the entire data of the source packet beginning at offset is used
 \param source_packet the source packet this data belongs to (at least from the filter point of view).
-\return new packet or NULL if error
+\return new packet or NULL if allocation error or not an output PID
 */
-GF_FilterPacket *gf_filter_pck_new_ref(GF_FilterPid *PID, const u8 *data, u32 data_size, GF_FilterPacket *source_packet);
+GF_FilterPacket *gf_filter_pck_new_ref(GF_FilterPid *PID, u32 data_offset, u32 data_size, GF_FilterPacket *source_packet);
 
 /*! Allocates a new packet on the output PID with associated allocated data.
 The packet has by default no DTS, no CTS, no duration framing set to full frame (start=end=1) and all other flags set to 0 (including SAP type).
@@ -3310,7 +3926,7 @@
 \param data_size the desired size of the packet - can be changed later
 \param data set to the writable buffer of the created packet
 \param destruct the callback function used to destroy the packet when no longer used - may be NULL
-\return new packet or NULL if error
+\return new packet or NULL if allocation error or not an output PID
 */
 GF_FilterPacket *gf_filter_pck_new_alloc_destructor(GF_FilterPid *PID, u32 data_size, u8 **data, gf_fsess_packet_destructor destruct);
 
@@ -3322,7 +3938,7 @@
 \param PID the target output PID
 \param pck_source the desired source packet to clone
 \param data set to the writable buffer of the created packet
-\return new packet or NULL if error
+\return new packet or NULL if allocation error or not an output PID
 */
 GF_FilterPacket *gf_filter_pck_new_clone(GF_FilterPid *PID, GF_FilterPacket *pck_source, u8 **data);
 
@@ -3330,10 +3946,25 @@
 \param PID the target output PID
 \param pck_source the desired source packet to clone
 \param data set to the writable buffer of the created packet
-\return new packet or NULL if error
+\return new packet or NULL if allocation error or not an output PID
 */
 GF_FilterPacket *gf_filter_pck_new_copy(GF_FilterPid *PID, GF_FilterPacket *pck_source, u8 **data);
 
+/*! Creates a read-only detached copy of a packet from a source packet and copy all source properties to output.
+
+If the source packet uses a frame interface object or has no associated data, returns a copy of the packet.
+If the source packet is referenced more than once (ie more than just the caller), a new packet on the output PID is allocated with source data copied.
+Otherwise, the source data is assigned to the output packet.
+
+This is typically called by filters requiring read access to data for packets using frame interfaces
+\warning The cloned packet will not have any dynamic properties set.
+
+\param pck_source the target source packet
+\param cached_pck if not NULL, will try to reuse this packet if possible (if not possible, this packet will be destroyed)
+\return new packet or NULL if allocation error or not an output PID
+*/
+GF_FilterPacket *gf_filter_pck_dangling_copy(GF_FilterPacket *pck_source, GF_FilterPacket *cached_pck);
+
 /*! Marks memory of a shared packet as non-writable. By default \ref gf_filter_pck_new_shared and \ref gf_filter_pck_new_ref allow
 write access to internal memory in case the packet can be cloned (single reference used). If your filter relies on the content of the shared
 memory for its internal state, packet must be marked as read-only to avoid later state corruption.
@@ -3394,6 +4025,15 @@
 */
 GF_Err gf_filter_pck_set_property_dyn(GF_FilterPacket *pck, char *name, const GF_PropertyValue *value);
 
+/*! Checks if a packet has properties other than packet built-in ones
+
+ This is typically needed to decide whether a packet with no data should be forwarded or not
+
+\param pck the target packet
+\return GF_TRUE if packet has properties, GF_FALSE otherwise
+*/
+Bool gf_filter_pck_has_properties(GF_FilterPacket *pck);
+
 /*! Merge properties of source packet into destination packet but does NOT reset destination packet properties
 \param pck_src source packet
 \param pck_dst destination packet
@@ -3575,6 +4215,8 @@
 inserting bytes located at gf_filter_pck_get_byte_offset in file if the interlaced flag of the packet is set.
 If the corrupted flag is set, this indicates the data will be replaced later on.
 A seek packet is not meant to be displayed but is needed for decoding.
+\note If a packet is partially skiped but completely decoded, it shall not be marked as seek but have the property "SkipBegin" set.
+\note Raw audio packets MUST be split at the proper boundary
 \param pck target packet
 \param is_seek indicates packet is seek frame
 \return error code if any
@@ -3663,16 +4305,16 @@
 */
 GF_FilterClockType gf_filter_pck_get_clock_type(GF_FilterPacket *pck);
 
-/*! Sets packet carrousel info
+/*! Sets packet carousel info
 \param pck target packet
-\param version_number carrousel version number associated with this data chunk
+\param version_number carousel version number associated with this data chunk
 \return error code if any
 */
 GF_Err gf_filter_pck_set_carousel_version(GF_FilterPacket *pck, u8 version_number);
 
-/*! Gets packet carrousel info
+/*! Gets packet carousel info
 \param pck target packet
-\return version_number carrousel version number associated with this data chunk
+\return version_number carousel version number associated with this data chunk
 */
 u8 gf_filter_pck_get_carousel_version(GF_FilterPacket *pck);
 
@@ -3724,7 +4366,7 @@
 
 /*! Gets packet sequence number info
 \param pck target packet
-\return version_number carrousel version number associated with this data chunk
+\return sequence number associated with this packet
 */
 u32 gf_filter_pck_get_seq_num(GF_FilterPacket *pck);
 
@@ -3786,7 +4428,7 @@
 
 /*! Gets a frame interface associated with a packet if any.
 
-Consummers will typically first check if the packet has associated data using \ref gf_filter_pck_get_data.
+Consumers will typically first check if the packet has associated data using \ref gf_filter_pck_get_data.
 
 \param pck the target packet
 \return the associated frame interface object if any, or NULL otherwise
@@ -3803,6 +4445,79 @@
 
 /*! @} */
 
+
+/*!
+\addtogroup fs_props Filter Properties
+\ingroup filters__cust_grp
+\brief Custom Filter
+
+Custom filters are filters created by the app with no associated registry.
+The app is responsible for assigning capabilities to the filter, and setting callback functions.
+Each callback is optionnal, but a custom filter should at least have a process callback, and a configure_pid callback if not a source filter.
+
+Custom filters do not have any arguments exposed, and cannot be selected for sink or source filters.
+If your app requires custom I/Os for source or sinks, use \ref GF_FileIO.
+@{
+ */
+
+/*! Loads custom filter
+\param session filter session
+\param name name of filter to use - optional, may be NULL
+\param flags flags for filter registry, currently only GF_FS_REG_MAIN_THREAD is used
+\param e set to the error code if any - optional, may be NULL
+\return filter or NULL if error
+*/
+GF_Filter *gf_fs_new_filter(GF_FilterSession *session, const char *name, u32 flags, GF_Err *e);
+
+/*! Push a new capability for a custom filter
+\param filter the target filter
+\param code the capability code - cf \ref GF_FilterCapability
+\param value the capability value - cf \ref GF_FilterCapability
+\param name the capability name - cf \ref GF_FilterCapability
+\param flags the capability flags - cf \ref GF_FilterCapability
+\param priority the capability priority - cf \ref GF_FilterCapability
+\return error if any
+ */
+GF_Err gf_filter_push_caps(GF_Filter *filter, u32 code, GF_PropertyValue *value, const char *name, u32 flags, u8 priority);
+
+/*! Set the process function for a custom filter
+\param filter the target filter
+\param process_cbk the process callback, may be NULL - cf process in \ref __gf_filter_register
+\return error if any
+ */
+GF_Err gf_filter_set_process_ckb(GF_Filter *filter, GF_Err (*process_cbk)(GF_Filter *filter) );
+
+/*! Set the PID configuration function for a custom filter
+\param filter the target filter
+\param configure_cbk the configure callback, may be NULL - cf configure_pid in \ref __gf_filter_register
+\return error if any
+ */
+GF_Err gf_filter_set_configure_ckb(GF_Filter *filter, GF_Err (*configure_cbk)(GF_Filter *filter, GF_FilterPid *PID, Bool is_remove) );
+
+/*! Set the process event function for a custom filter
+\param filter the target filter
+\param process_event_cbk the process event callback, may be NULL - cf process_event in \ref __gf_filter_register
+\return error if any
+ */
+GF_Err gf_filter_set_process_event_ckb(GF_Filter *filter, Bool (*process_event_cbk)(GF_Filter *filter, const GF_FilterEvent *evt) );
+
+/*! Set the reconfigure output function for a custom filter
+\param filter the target filter
+\param reconfigure_output_cbk the reconfigure callback, may be NULL - cf reconfigure_output_cbk in \ref __gf_filter_register
+\return error if any
+ */
+GF_Err gf_filter_set_reconfigure_output_ckb(GF_Filter *filter, GF_Err (*reconfigure_output_cbk)(GF_Filter *filter, GF_FilterPid *PID) );
+
+/*! Set the data prober function for a custom filter
+\param filter the target filter
+\param probe_data_cbk the data prober callback , may be NULL- cf probe_data in \ref __gf_filter_register
+\return error if any
+ */
+GF_Err gf_filter_set_probe_data_cbk(GF_Filter *filter, const char * (*probe_data_cbk)(const u8 *data, u32 size, GF_FilterProbeScore *score) );
+
+
+/*! @} */
+
 #ifdef __cplusplus
 }
 #endif

gpac-1.0.1.tar.gz/include/gpac/ietf.h -> gpac-2.0.0.tar.gz/include/gpac/ietf.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -114,7 +114,7 @@
 	NC_RTSP_Option_not_support	=	551,
 };
 
-/*! Gives string descritpion of error code
+/*! Gives string description of error code
 \param ErrCode the RTSP error code
 \return the description of the RTSP error code
 */
@@ -139,7 +139,7 @@
 } GF_RTSPRange;
 
 /*! parses a Range line and returns range header structure. This can be used for RTSP extension of SDP
-Note: Only support for npt for now
+\note Only support for npt for now
 \param range_buf the range string
 \return a newly allocated RTSP range
 */
@@ -293,6 +293,9 @@
 	/*user data: this is never touched by the lib, its intend is to help stacking
 	RTSP commands in your app*/
 	void *user_data;
+	/*user flags: this is never touched by the lib, its intend is to help stacking
+	RTSP commands in your app*/
+	u32 user_flags;
 
 
 	/*
@@ -454,7 +457,7 @@
 
 
 /*! resets state machine, invalidate SessionID
-NOTE: RFC2326 requires that the session is reseted when all RTP streams
+\note RFC2326 requires that the session is reseted when all RTP streams
 are closed. As this lib doesn't maintain the number of valid streams
 you MUST call reset when all your streams are shutdown (either requested through
 TEARDOWN or signaled through RTCP BYE packets for RTP, or any other signaling means
@@ -715,7 +718,7 @@
 /*! initializes the RTP channel.
 \param ch the target RTP channel
 \param UDPBufferSize UDP stack buffer size if configurable by OS/ISP - ignored otherwise
-NOTE: on WinCE devices, this is not configurable on an app bases but for the whole OS
+\note On WinCE devices, this is not configurable on an app bases but for the whole OS
 you must update the device registry with:
 \code
 	[HKEY_LOCAL_MACHINE\Comm\Afd]
@@ -826,7 +829,8 @@
 
 /*! computes and send Receiver report.
 If the channel is a TCP channel, you must specify
-the callback function. NOTE: many RTP implementation do NOT process RTCP info received on TCP...
+the callback function.
+\note Many RTP implementation do NOT process RTCP info received on TCP...
 the lib will decide whether the report shall be sent or not, therefore you should call
 this function at regular times
 \param ch the target RTP channel
@@ -925,7 +929,7 @@
 
 					SDP LIBRARY EXPORTS
 
-		  Note: SDP is mainly a text protocol with
+		  SDP is mainly a text protocol with
 	well defined containers. The following structures are used to write / read
 	SDP informations, and the library also provides consistency checking
 
@@ -1053,10 +1057,10 @@
 	u32 PortNumber;
 	/*number of ports described. If >= 2, the next media(s) in the SDP will be configured
 	to use the next tuple (for RTP). If 0 or 1, ignored
-	Note: this is used for scalable media: PortNumber indicates the port of the base
+	\note This is used for scalable media: PortNumber indicates the port of the base
 	media and NumPorts the ports||total number of the upper layers*/
 	u32 NumPorts;
-	/*currently ony "RTP/AVP" and "udp" defined*/
+	/*currently only "RTP/AVP" and "udp" defined*/
 	char *Profile;
 
 	/*list of GF_SDPConnection's. A media can have several connection in case of scalable content*/
@@ -1069,7 +1073,7 @@
 	GF_List *FMTP;
 
 	/*for RTP this is PayloadType, but can be opaque (string) depending on the app.
-	Formated as XX WW QQ FF
+	Formatted as XX WW QQ FF
 	When reading the SDP, the payloads defined in RTPMap are removed from this list
 	When writing the SDP for RTP, you should only specify static payload types here,
 	as dynamic ones are stored in RTPMaps and automatically written*/
@@ -1153,7 +1157,7 @@
 GF_SDPInfo *gf_sdp_info_new();
 /*! destrucs an SDP info
   Memory Consideration: the destructors free all non-NULL string. You should therefore
-  be carefull while (de-)assigning the strings. The function gf_sdp_info_parse() performs a complete
+  be careful while (de-)assigning the strings. The function gf_sdp_info_parse() performs a complete
   reset of the GF_SDPInfo
 
 \param sdp the target SDP to destroy
@@ -1397,13 +1401,15 @@
 	GF_RTP_PAYT_AC3,
 	/*use H264-SVC transport*/
 	GF_RTP_PAYT_H264_SVC,
-	/*use HEVC/H265 transport - no RFC yet, only draft*/
+	/*use HEVC/H265 transport (RFC 7798)*/
 	GF_RTP_PAYT_HEVC,
 	GF_RTP_PAYT_LHVC,
 #if GPAC_ENABLE_3GPP_DIMS_RTP
 	/*use 3GPP DIMS format*/
 	GF_RTP_PAYT_3GPP_DIMS,
 #endif
+	/*use VVC transport (no RFC yet)*/
+	GF_RTP_PAYT_VVC,
 };
 
 
@@ -1464,7 +1470,7 @@
 \param avgSize average size of an AU. This is not always known (real-time encoding).
 In this case you should specify a rough compute indicating how many packets could be
 stored per RTP packet. for ex AAC stereo at 44100 k / 64kbps , one AU ~= 380 bytes
-so 3 AUs for 1500 MTU is ok - BE CAREFULL: MultiSL adds some SL info on top of the 12
+so 3 AUs for 1500 MTU is ok - BE CAREFUL: MultiSL adds some SL info on top of the 12
 byte RTP header so you should specify a smaller size
 The packetizer will ALWAYS make sure there's no pb storing the packets so specifying
 more will result in a slight overhead in the SL mapping but the gain to singleSL

gpac-1.0.1.tar.gz/include/gpac/internal/avilib.h -> gpac-2.0.0.tar.gz/include/gpac/internal/avilib.h Changed

gpac-1.0.1.tar.gz/include/gpac/internal/bifs_dev.h -> gpac-2.0.0.tar.gz/include/gpac/internal/bifs_dev.h Changed

gpac-1.0.1.tar.gz/include/gpac/internal/compositor_dev.h -> gpac-2.0.0.tar.gz/include/gpac/internal/compositor_dev.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Rendering sub-project
@@ -150,6 +150,12 @@
 
 #define DOUBLECLICK_TIME_MS		250
 
+enum
+{
+	TILE_DEBUG_NONE=0,
+	TILE_DEBUG_PARTIAL,
+	TILE_DEBUG_FULL
+};
 
 enum
 {
@@ -205,6 +211,9 @@
 	u32 drv;
 	GF_Err last_error;
 
+	//filter mode, we can be a source for our built-in URLs
+	char *src;
+
 	/*audio renderer*/
 	struct _audio_render *audio_renderer;
 	/*video out*/
@@ -242,7 +251,7 @@
 	GF_List *textures;
 	Bool texture_inserted;
 
-	/*all textures to be destroyed (needed for openGL context ...)*/
+	/*all textures to be destroyed (needed for OpenGL context ...)*/
 	GF_List *textures_gc;
 
 	/*event queue*/
@@ -270,6 +279,8 @@
 	Bool bench_mode;
 	//0: no frame pending, 1: frame pending, needs clock increase, 2: frames are pending but one frame has been decoded, do not increase clock
 	u32 force_bench_frame;
+	//number of audio frames sent in call to send_frame
+	u32 audio_frames_sent;
 
 	u32 frame_time[GF_SR_FPS_COMPUTE_SIZE];
 	u32 frame_dur[GF_SR_FPS_COMPUTE_SIZE];
@@ -290,7 +301,7 @@
 	Bool amc, async;
 	u32 asr, ach, alayout, afmt, asize, avol, apan, abuf;
 	Double max_aspeed, max_vspeed;
-	u32 buf, rbuf, mbuf, ntpsync;
+	u32 buffer, rbuffer, mbuffer, ntpsync;
 	
 	u32 ogl, mode2d;
 
@@ -358,6 +369,8 @@
 	/*count number of initialized sensors*/
 	u32 interaction_sensors;
 
+	//in player mode, exit if set
+	//in non player mode, check for eos
 	u32 check_eos_state;
 	u32 last_check_pass;
 
@@ -427,7 +440,7 @@
 
 	/*to copy!*/
 	u32 nbviews, stereo, camlay;
-	Bool rview;
+	Bool rview, dbgpack;
 	Fixed dispdist;
 	char *mvshader;
 
@@ -582,7 +595,7 @@
 	If not set video is written through glDrawPixels with bitmap (slow scaling), or converted to
 	po2 texture*/
 	Bool epow2;
-	/*use openGL for outline rather than vectorial ones*/
+	/*use OpenGL for outline rather than vectorial ones*/
 	Bool linegl;
 	/*disable RECT extensions (except for Bitmap...)*/
 	Bool rext;
@@ -643,8 +656,8 @@
 	u8 *screen_buffer, *line_buffer;
 	u32 screen_buffer_alloc_size;
 
-	u32 tvtn, tvtt;
-	Bool tvtd, tvtf;
+	u32 tvtn, tvtt, tvtd;
+	Bool tvtf;
 	u32 vrhud_mode;
 	Fixed fov;
 
@@ -1124,7 +1137,7 @@
 
 	/*layer traversal state:
 		set to the first traversed layer3D when picking
-		set to the current layer3D traversed when rendering 3D to an offscreen bitmap. This alows other
+		set to the current layer3D traversed when rendering 3D to an offscreen bitmap. This allows other
 			nodes (typically bindables) seting the layer dirty flags to force a redraw
 	*/
 	GF_Node *layer3d;
@@ -1176,6 +1189,7 @@
 	Bool forced_layout;
 	//updated at each frame, used if frame fetch returns NULL
 	Bool is_buffering;
+	Bool is_eos;
 } GF_AudioInterface;
 
 typedef struct __audiomix GF_AudioMixer;
@@ -1198,14 +1212,15 @@
 /*retrieves mixer cfg*/
 void gf_mixer_get_config(GF_AudioMixer *am, u32 *outSR, u32 *outCH, u32 *outFMT, u64 *outChCfg);
 /*called by audio renderer in case the hardware used a different setup than requested*/
-void gf_mixer_set_config(GF_AudioMixer *am, u32 outSR, u32 outCH, u32 outFMT, u64 ch_cfg);
+GF_Err gf_mixer_set_config(GF_AudioMixer *am, u32 outSR, u32 outCH, u32 outFMT, u64 ch_cfg);
 Bool gf_mixer_is_src_present(GF_AudioMixer *am, GF_AudioInterface *ifce);
 u32 gf_mixer_get_src_count(GF_AudioMixer *am);
-void gf_mixer_force_chanel_out(GF_AudioMixer *am, u32 num_channels);
+GF_Err gf_mixer_force_channel_out(GF_AudioMixer *am, u32 num_channels);
 u32 gf_mixer_get_block_align(GF_AudioMixer *am);
 Bool gf_mixer_must_reconfig(GF_AudioMixer *am);
 Bool gf_mixer_empty(GF_AudioMixer *am);
 Bool gf_mixer_buffering(GF_AudioMixer *am);
+Bool gf_mixer_is_eos(GF_AudioMixer *am);
 
 //#define ENABLE_AOUT
 
@@ -1245,8 +1260,8 @@
 
 	u32 audio_delay, volume, pan, mute;
 
-	//set when output is not realtime
-	Bool non_rt_output;
+	//set when output is not realtime - set to 2 will indicate end of session
+	u32 non_rt_output;
 
 	Fixed yaw, pitch, roll;
 
@@ -1495,7 +1510,9 @@
 	/*span is in the current text selection*/
 	GF_TEXT_SPAN_RIGHT_TO_LEFT = 1<<3,
 	/*span is in the current text selection*/
-	GF_TEXT_SPAN_SELECTED = 1<<4
+	GF_TEXT_SPAN_SELECTED = 1<<4,
+	/*span is strikeout*/
+	GF_TEXT_SPAN_STRIKEOUT = 1<<5
 };
 
 typedef struct __text_span
@@ -1633,7 +1650,7 @@
 /*destroy service*/
 void gf_scene_ns_del(GF_SceneNamespace *ns, GF_Scene *scene);
 
-void gf_scene_ns_connect_object(GF_Scene *scene, GF_ObjectManager *odm, char *serviceURL, char *parent_url);
+void gf_scene_ns_connect_object(GF_Scene *scene, GF_ObjectManager *odm, char *serviceURL, char *parent_url, GF_SceneNamespace *parent_ns);
 
 
 
@@ -1656,7 +1673,7 @@
 	both external resources (urls) and ODs sent in MPEG-4 systems*/
 	GF_List *resources;
 
-	/*list of GF_MediaObject - these are the links betwwen scene nodes (URL, xlink:href) and media resources.
+	/*list of GF_MediaObject - these are the links between scene nodes (URL, xlink:href) and media resources.
 	We need this link because of MPEG-4 Systems, where an OD (media resource) can be removed or replaced by the server
 	without the scene being modified*/
 	GF_List *scene_objects;
@@ -1780,10 +1797,10 @@
 
 void gf_scene_remove_object(GF_Scene *scene, GF_ObjectManager *odm, u32 for_shutdown);
 /*browse all (media) channels and send buffering info to the app*/
-void gf_scene_buffering_info(GF_Scene *scene);
+void gf_scene_buffering_info(GF_Scene *scene, Bool rebuffer_done);
 void gf_scene_attach_to_compositor(GF_Scene *scene);
 struct _mediaobj *gf_scene_get_media_object(GF_Scene *scene, MFURL *url, u32 obj_type_hint, Bool lock_timelines);
-struct _mediaobj *gf_scene_get_media_object_ex(GF_Scene *scene, MFURL *url, u32 obj_type_hint, Bool lock_timelines, struct _mediaobj *sync_ref, Bool force_new_if_not_attached, GF_Node *node_ptr);
+struct _mediaobj *gf_scene_get_media_object_ex(GF_Scene *scene, MFURL *url, u32 obj_type_hint, Bool lock_timelines, struct _mediaobj *sync_ref, Bool force_new_if_not_attached, GF_Node *node_ptr, GF_Scene *original_parent_scene);
 void gf_scene_setup_object(GF_Scene *scene, GF_ObjectManager *odm);
 /*updates scene duration based on sub objects*/
 void gf_scene_set_duration(GF_Scene *scene);
@@ -1817,7 +1834,7 @@
 //If @check_buffering is 1, returns 1 if no clock is buffering, 0 otheriwse
 Bool gf_scene_check_clocks(GF_SceneNamespace *ns, GF_Scene *scene, Bool check_buffering);
 
-void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *dom_evt, GF_Err code, Bool no_queueing);
+void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *dom_evt, GF_Err code, Bool no_queuing);
 
 void gf_scene_mpeg4_inline_restart(GF_Scene *scene);
 void gf_scene_mpeg4_inline_check_restart(GF_Scene *scene);
@@ -1852,65 +1869,45 @@
 Bool gf_mo_is_same_url(GF_MediaObject *obj, MFURL *an_url, Bool *keep_fragment, u32 obj_hint_type);
 
 void gf_mo_update_caps(GF_MediaObject *mo);
+void gf_mo_update_caps_ex(GF_MediaObject *mo, Bool check_unchanged);
 
 
 const char *gf_scene_get_fragment_uri(GF_Node *node);
 void gf_scene_set_fragment_uri(GF_Node *node, const char *uri);
 
 
-#if FILTER_FIXME
-
-
-/*URI relocators are used for containers like zip or ISO FF with file items. The relocator
-is in charge of translating the URI, potentially extracting the associated resource and sending
-back the new (local or not) URI. Only the interface is defined, URI translators are free to derive from them
-
-relocate a URI - if NULL is returned, this relocator is not concerned with the URI
-otherwise returns the translated URI
-*/
-
-#define GF_TERM_URI_RELOCATOR	\
-	Bool (*relocate_uri)(void *__self, const char *parent_uri, const char *uri, char *out_relocated_uri, char *out_localized_uri);		\
-
-typedef struct __gf_uri_relocator GF_URIRelocator;
-
-struct __gf_uri_relocator
-{
-	GF_TERM_URI_RELOCATOR
-};
-
+/*GF_NET_ASSOCIATED_CONTENT_TIMING*/
 typedef struct
 {
-	GF_TERM_URI_RELOCATOR
-	GF_Terminal *term;
-	char *szAbsRelocatedPath;
-} GF_TermLocales;
-
-#define	MAX_SHORTCUTS	200
-
-typedef struct
-{
-	u8 code;
-	u8 mods;
-	u8 action;
-} GF_Shortcut;
+	u32 timeline_id;
+	u32 media_timescale;
+	u64 media_timestamp;
+	//for now only used in MPEG-2, so media_pts is in 90khz scale
+	u64 media_pts;
+	Bool force_reload;
+	Bool is_paused;
+	Bool is_discontinuity;
+	u64 ntp;
+} GF_AssociatedContentTiming;
 
 typedef struct
 {
-	void *udta;
-	/*called when an event should be filtered
-	*/
-	Bool (*on_event)(void *udta, GF_Event *evt, Bool consumed_by_compositor);
-} GF_TermEventFilter;
-
-GF_Err gf_term_add_event_filter(GF_Terminal *terminal, GF_TermEventFilter *ef);
-GF_Err gf_term_remove_event_filter(GF_Terminal *terminal, GF_TermEventFilter *ef);
+	//negative values mean "timeline is ready no need for timing message"
+	s32 timeline_id;
+	const char *external_URL;
+	Bool is_announce, is_splicing;
+	Bool reload_external;
+	Bool enable_if_defined;
+	Bool disable_if_defined;
+	GF_Fraction activation_countdown;
+	//start and end times of splicing if any
+	Double splice_start_time, splice_end_time;
+	Bool splice_time_pts;
+} GF_AssociatedContentLocation;
 
 void gf_scene_register_associated_media(GF_Scene *scene, GF_AssociatedContentLocation *addon_info);
 void gf_scene_notify_associated_media_timeline(GF_Scene *scene, GF_AssociatedContentTiming *addon_time);
 
-#endif
-
 
 /*clock*/
 struct _object_clock
@@ -2032,6 +2029,10 @@
 
 	/*flag indicates the odm is a target passthrough*/
 	GF_ODM_PASSTHROUGH = (1<<15),
+	/*flag indicates the clock is shared between tiles and a play should not trigger a rebuffer*/
+	GF_ODM_TILED_SHARED_CLOCK = (1<<16),
+	/*flag indicates TEMI info is associated with PID*/
+	GF_ODM_HAS_TEMI = (1<<17),
 };
 
 enum
@@ -2084,6 +2085,9 @@
 	u32 ID;
 	u32 pid_id; //esid for clock solving
 
+	//MPEG-4 OD descriptor
+	GF_ObjectDescriptor *OD;
+
 	//parent service ID as defined from input
 	u32 ServiceID;
 	Bool hybrid_layered_coded;
@@ -2094,7 +2098,7 @@
 	Bool clock_inherited;
 	//0 or 1, except for IOD where we may have several BIFS/OD streams
 	u32 nb_buffering, nb_rebuffer;
-	u32 buffer_max_us, buffer_min_us, buffer_playout_us;
+	u32 buffer_max_ms, buffer_min_ms, buffer_playout_ms;
 	Bool blocking_media;
 
 	//internal hash for source allowing to distinguish input PIDs sources
@@ -2128,7 +2132,8 @@
 	u32 timeshift_depth;
 
 	u32 action_type;
-	s32 delay;
+	//delay in PID timescale
+	s64 timestamp_offset;
 	
 	Fixed set_speed;
 	Bool disable_buffer_at_next_play;
@@ -2139,7 +2144,7 @@
 #ifndef GPAC_DISABLE_VRML
 	/*the one and only media control currently attached to this object*/
 	struct _media_control *media_ctrl;
-	/*the list of media control controling the object*/
+	/*the list of media control controlling the object*/
 	GF_List *mc_stack;
 	/*the media sensor(s) attached to this object*/
 	GF_List *ms_stack;
@@ -2149,8 +2154,6 @@
 	GF_AddonMedia *addon;
 	//set for objects splicing the main content, indicates the media type (usually in @codec but no codec created for splicing)
 	u32 splice_addon_mtype;
-	//set to true if this is a scalable addon for an existing object
-	Bool scalable_addon;
 
 	//for a regular ODM, this indicates that the current scalable_odm associated
 	struct _od_manager *upper_layer_odm;
@@ -2175,7 +2178,7 @@
 /*setup OD*/
 void gf_odm_setup_object(GF_ObjectManager *odm, GF_SceneNamespace *parent_ns, GF_FilterPid *for_pid);
 
-void gf_odm_setup_remote_object(GF_ObjectManager *odm, GF_SceneNamespace *parent_ns, char *remote_url);
+void gf_odm_setup_remote_object(GF_ObjectManager *odm, GF_SceneNamespace *parent_ns, char *remote_url, Bool for_addon);
 
 /*disctonnect OD and removes it if desired (otherwise only STOP is propagated)*/
 void gf_odm_disconnect(GF_ObjectManager *odman, u32 do_remove);
@@ -2226,6 +2229,8 @@
 
 void gf_odm_check_clock_mediatime(GF_ObjectManager *odm);
 
+void gf_odm_addon_setup(GF_ObjectManager *odm);
+
 
 /*!
 *	Media Object types
@@ -2255,6 +2260,17 @@
 /*! All Media Objects inserted through URLs and not MPEG-4 OD Framework use this ODID*/
 #define GF_MEDIA_EXTERNAL_ID		1050
 
+enum
+{
+	//no connection error, no frames seen in input pipeline
+	MO_CONNECT_OK=0,
+	//no connection error, frames seen in input pipeline but no frame yet available for object
+	MO_CONNECT_BUFFERING,
+	//explicit source setup failure
+	MO_CONNECT_FAILED,
+	//timeout of input pipeline (no frames seen after compositor->timeout ms)
+	MO_CONNECT_TIMEOUT
+};
 
 /*GF_MediaObject: link between real object manager and scene. although there is a one-to-one mapping between a
 MediaObject and an ObjectManager, we have to keep them separated in order to handle OD remove commands which destroy
@@ -2320,6 +2336,7 @@
 	u64 channel_config;
 	Bool planar_audio;
 	u32 srd_x, srd_y, srd_w, srd_h, srd_full_w, srd_full_h;
+	u32 flip, rotate;
 
 	u32 quality_degradation_hint;
 	u32 nb_views;
@@ -2327,7 +2344,8 @@
 	u32 view_min_x, view_max_x, view_min_y, view_max_y;
 	GF_FilterFrameInterface *frame_ifce;
 
-	Bool connect_failure;
+	Float c_x, c_y, c_w, c_h;
+	u32 connect_state;
 };
 
 GF_MediaObject *gf_mo_new();
@@ -2335,7 +2353,7 @@
 
 /*media access events */
 void gf_odm_service_media_event(GF_ObjectManager *odm, GF_EventType event_type);
-void gf_odm_service_media_event_with_download(GF_ObjectManager *odm, GF_EventType event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec);
+void gf_odm_service_media_event_with_download(GF_ObjectManager *odm, GF_EventType event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec, u32 buffer_level_plus_one, u32 min_buffer_time);
 
 /*checks the URL and returns the ODID (MPEG-4 od://) or GF_MEDIA_EXTERNAL_ID for all regular URLs*/
 u32 gf_mo_get_od_id(MFURL *url);
@@ -2353,8 +2371,8 @@
 
 //returns media time in sec for the addon - timestamp_based is set to 1 if no timeline has been found (eg sync is based on direct timestamp comp)
 Double gf_scene_adjust_time_for_addon(GF_AddonMedia *addon, Double clock_time, u8 *timestamp_based);
-s64 gf_scene_adjust_timestamp_for_addon(GF_AddonMedia *addon, u64 orig_ts);
-void gf_scene_select_scalable_addon(GF_Scene *scene, GF_ObjectManager *odm);
+s64 gf_scene_adjust_timestamp_for_addon(GF_AddonMedia *addon, u64 orig_ts_ms);
+
 /*check if the associated addon has to be restarted, based on the timestamp of the main media (used for scalable addons only). Returns 1 if the addon has been restarted*/
 Bool gf_scene_check_addon_restart(GF_AddonMedia *addon, u64 cts, u64 dts);
 
@@ -2423,8 +2441,8 @@
 
 /*post extended user mouse interaction to terminal
 	X and Y are point coordinates in the display expressed in 2D coord system top-left (0,0), Y increasing towards bottom
-	@xxx_but_down: specifiy whether the mouse button is down(2) or up (1), 0 if unchanged
-	@wheel: specifiy current wheel inc (0: unchanged , +1 for one wheel delta forward, -1 for one wheel delta backward)
+	@xxx_but_down: specify whether the mouse button is down(2) or up (1), 0 if unchanged
+	@wheel: specify current wheel inc (0: unchanged , +1 for one wheel delta forward, -1 for one wheel delta backward)
 */
 /*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
 void gf_sc_input_sensor_mouse_input(GF_Compositor *compositor, GF_EventMouse *event);
@@ -2516,7 +2534,7 @@
 
 	/*stream object list (segments)*/
 	GF_List *seg;
-	/*current active segment index (ie, controling the PLAY range of the media)*/
+	/*current active segment index (ie, controlling the PLAY range of the media)*/
 	u32 current_seg;
 } MediaControlStack;
 void InitMediaControl(GF_Scene *scene, GF_Node *node);

gpac-1.0.1.tar.gz/include/gpac/internal/ietf_dev.h -> gpac-2.0.0.tar.gz/include/gpac/internal/ietf_dev.h Changed

gpac-1.0.1.tar.gz/include/gpac/internal/isomedia_dev.h -> gpac-2.0.0.tar.gz/include/gpac/internal/isomedia_dev.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -86,6 +86,7 @@
 	GF_ISOM_BOX_TYPE_UDTA	= GF_4CC( 'u', 'd', 't', 'a' ),
 	GF_ISOM_BOX_TYPE_VMHD	= GF_4CC( 'v', 'm', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_FTYP	= GF_4CC( 'f', 't', 'y', 'p' ),
+	GF_ISOM_BOX_TYPE_OTYP	= GF_4CC( 'o', 't', 'y', 'p' ),
 	GF_ISOM_BOX_TYPE_PADB	= GF_4CC( 'p', 'a', 'd', 'b' ),
 	GF_ISOM_BOX_TYPE_PDIN	= GF_4CC( 'p', 'd', 'i', 'n' ),
 	GF_ISOM_BOX_TYPE_SDTP	= GF_4CC( 's', 'd', 't', 'p' ),
@@ -98,6 +99,7 @@
 	GF_ISOM_BOX_TYPE_MFRA	= GF_4CC( 'm', 'f', 'r', 'a' ),
 	GF_ISOM_BOX_TYPE_MFRO	= GF_4CC( 'm', 'f', 'r', 'o' ),
 	GF_ISOM_BOX_TYPE_TFRA	= GF_4CC( 't', 'f', 'r', 'a' ),
+	GF_ISOM_BOX_TYPE_CSGP	= GF_4CC( 'c', 's', 'g', 'p'),
 
 	GF_ISOM_BOX_TYPE_TENC	= GF_4CC( 't', 'e', 'n', 'c' ),
 
@@ -191,6 +193,12 @@
 
 	GF_ISOM_BOX_TYPE_LHVC	= GF_4CC( 'l', 'h', 'v', 'C' ),
 
+	GF_ISOM_BOX_TYPE_VVC1	= GF_4CC( 'v', 'v', 'c', '1' ),
+	GF_ISOM_BOX_TYPE_VVI1	= GF_4CC( 'v', 'v', 'i', '1' ),
+	GF_ISOM_BOX_TYPE_VVCC	= GF_4CC( 'v', 'v', 'c', 'C' ),
+	GF_ISOM_BOX_TYPE_VVS1	= GF_4CC( 'v', 'v', 's', '1' ),
+	GF_ISOM_BOX_TYPE_VVNC	= GF_4CC( 'v', 'v', 'n', 'C' ),
+
 	GF_ISOM_BOX_TYPE_AV1C = GF_4CC('a', 'v', '1', 'C'),
 	GF_ISOM_BOX_TYPE_AV01 = GF_4CC('a', 'v', '0', '1'),
 
@@ -336,28 +344,6 @@
 	/* Apple extensions */
 
 	GF_ISOM_BOX_TYPE_ILST	= GF_4CC( 'i', 'l', 's', 't' ),
-	GF_ISOM_BOX_TYPE_0xA9NAM	= GF_4CC( 0xA9, 'n', 'a', 'm' ),
-	GF_ISOM_BOX_TYPE_0xA9CMT	= GF_4CC( 0xA9, 'c', 'm', 't' ),
-	GF_ISOM_BOX_TYPE_0xA9DAY	= GF_4CC( 0xA9, 'd', 'a', 'y' ),
-	GF_ISOM_BOX_TYPE_0xA9ART	= GF_4CC( 0xA9, 'A', 'R', 'T' ),
-	GF_ISOM_BOX_TYPE_0xA9TRK	= GF_4CC( 0xA9, 't', 'r', 'k' ),
-	GF_ISOM_BOX_TYPE_0xA9ALB	= GF_4CC( 0xA9, 'a', 'l', 'b' ),
-	GF_ISOM_BOX_TYPE_0xA9COM	= GF_4CC( 0xA9, 'c', 'o', 'm' ),
-	GF_ISOM_BOX_TYPE_0xA9WRT	= GF_4CC( 0xA9, 'w', 'r', 't' ),
-	GF_ISOM_BOX_TYPE_0xA9TOO	= GF_4CC( 0xA9, 't', 'o', 'o' ),
-	GF_ISOM_BOX_TYPE_0xA9CPY	= GF_4CC( 0xA9, 'c', 'p', 'y' ),
-	GF_ISOM_BOX_TYPE_0xA9DES	= GF_4CC( 0xA9, 'd', 'e', 's' ),
-	GF_ISOM_BOX_TYPE_0xA9GEN	= GF_4CC( 0xA9, 'g', 'e', 'n' ),
-	GF_ISOM_BOX_TYPE_0xA9GRP	= GF_4CC( 0xA9, 'g', 'r', 'p' ),
-	GF_ISOM_BOX_TYPE_0xA9ENC	= GF_4CC( 0xA9, 'e', 'n', 'c' ),
-	GF_ISOM_BOX_TYPE_aART		= GF_4CC( 'a', 'A', 'R', 'T' ),
-	GF_ISOM_BOX_TYPE_PGAP = GF_4CC( 'p', 'g', 'a', 'p' ),
-	GF_ISOM_BOX_TYPE_GNRE	= GF_4CC( 'g', 'n', 'r', 'e' ),
-	GF_ISOM_BOX_TYPE_DISK	= GF_4CC( 'd', 'i', 's', 'k' ),
-	GF_ISOM_BOX_TYPE_TRKN	= GF_4CC( 't', 'r', 'k', 'n' ),
-	GF_ISOM_BOX_TYPE_TMPO	= GF_4CC( 't', 'm', 'p', 'o' ),
-	GF_ISOM_BOX_TYPE_CPIL	= GF_4CC( 'c', 'p', 'i', 'l' ),
-	GF_ISOM_BOX_TYPE_COVR	= GF_4CC( 'c', 'o', 'v', 'r' ),
 	GF_ISOM_BOX_TYPE_iTunesSpecificInfo	= GF_4CC( '-', '-', '-', '-' ),
 	GF_ISOM_BOX_TYPE_DATA	= GF_4CC( 'd', 'a', 't', 'a' ),
 
@@ -385,7 +371,14 @@
 	GF_ISOM_BOX_TYPE_EC3	= GF_4CC( 'e', 'c', '-', '3' ),
 	GF_ISOM_BOX_TYPE_DEC3	= GF_4CC( 'd', 'e', 'c', '3' ),
 	GF_ISOM_BOX_TYPE_DVCC	= GF_4CC( 'd', 'v', 'c', 'C' ),
+	GF_ISOM_BOX_TYPE_DVVC	= GF_4CC( 'd', 'v', 'v', 'C' ),
+	GF_ISOM_BOX_TYPE_DVH1	= GF_4CC( 'd', 'v', 'h', '1' ),
 	GF_ISOM_BOX_TYPE_DVHE	= GF_4CC( 'd', 'v', 'h', 'e' ),
+	GF_ISOM_BOX_TYPE_DVA1	= GF_4CC( 'd', 'v', 'a', '1' ),
+	GF_ISOM_BOX_TYPE_DVAV	= GF_4CC( 'd', 'v', 'a', 'v' ),
+	GF_ISOM_BOX_TYPE_DAV1	= GF_4CC( 'd', 'a', 'v', '1' ),
+	GF_ISOM_BOX_TYPE_MLPA	= GF_4CC( 'm', 'l', 'p', 'a' ),
+	GF_ISOM_BOX_TYPE_DMLP	= GF_4CC( 'd', 'm', 'l', 'p' ),
 
 	GF_ISOM_BOX_TYPE_SUBS	= GF_4CC( 's', 'u', 'b', 's' ),
 
@@ -406,6 +399,7 @@
 
 	GF_ISOM_BOX_TYPE_STXT	= GF_4CC( 's', 't', 'x', 't' ),
 	GF_ISOM_BOX_TYPE_TXTC	= GF_4CC( 't', 'x', 't', 'C' ),
+	GF_ISOM_BOX_TYPE_MIME	= GF_4CC( 'm', 'i', 'm', 'e' ),
 
 	GF_ISOM_BOX_TYPE_PRFT = GF_4CC( 'p', 'r', 'f', 't' ),
 
@@ -415,6 +409,7 @@
 	GF_ISOM_BOX_TYPE_PIXI = GF_4CC( 'p', 'i', 'x', 'i' ),
 	GF_ISOM_BOX_TYPE_RLOC = GF_4CC( 'r', 'l', 'o', 'c' ),
 	GF_ISOM_BOX_TYPE_IROT = GF_4CC( 'i', 'r', 'o', 't' ),
+	GF_ISOM_BOX_TYPE_IMIR = GF_4CC( 'i', 'm', 'i', 'r' ),
 	GF_ISOM_BOX_TYPE_IPCO = GF_4CC( 'i', 'p', 'c', 'o' ),
 	GF_ISOM_BOX_TYPE_IPRP = GF_4CC( 'i', 'p', 'r', 'p' ),
 	GF_ISOM_BOX_TYPE_IPMA = GF_4CC( 'i', 'p', 'm', 'a' ),
@@ -424,11 +419,17 @@
 	GF_ISOM_BOX_TYPE_AUXI	= GF_4CC( 'a', 'u', 'x', 'i' ),
 	GF_ISOM_BOX_TYPE_OINF	= GF_4CC( 'o', 'i', 'n', 'f' ),
 	GF_ISOM_BOX_TYPE_TOLS	= GF_4CC( 't', 'o', 'l', 's' ),
+	GF_ISOM_BOX_TYPE_IENC	= GF_4CC( 'i', 'e', 'n', 'c' ),
+	GF_ISOM_BOX_TYPE_IAUX 	= GF_4CC('i', 'a', 'u', 'x'),
 
 	/* MIAF Boxes */
 	GF_ISOM_BOX_TYPE_CLLI	= GF_4CC('c', 'l', 'l', 'i'),
 	GF_ISOM_BOX_TYPE_MDCV	= GF_4CC('m', 'd', 'c', 'v'),
 
+	/* AVIF Boxes */
+	GF_ISOM_BOX_TYPE_A1LX = GF_4CC('a', '1', 'l', 'x'),
+	GF_ISOM_BOX_TYPE_A1OP = GF_4CC('a', '1', 'o', 'p'),
+
 	GF_ISOM_BOX_TYPE_ALTR	= GF_4CC( 'a', 'l', 't', 'r' ),
 
 	/*ALL INTERNAL BOXES - NEVER WRITTEN TO FILE!!*/
@@ -496,6 +497,7 @@
 	GF_ISOM_BOX_TYPE_MHM1 	= GF_4CC('m','h','m','1'),
 	GF_ISOM_BOX_TYPE_MHM2 	= GF_4CC('m','h','m','2'),
 	GF_ISOM_BOX_TYPE_MHAC 	= GF_4CC('m','h','a','C'),
+	GF_ISOM_BOX_TYPE_MHAP 	= GF_4CC('m','h','a','P'),
 
 	GF_ISOM_BOX_TYPE_IPCM 	= GF_4CC('i','p','c','m'),
 	GF_ISOM_BOX_TYPE_FPCM 	= GF_4CC('f','p','c','m'),
@@ -512,16 +514,36 @@
 	GF_QT_SUBTYPE_RAW_AUD 	= GF_4CC('Q','T','R','A'),
 	GF_QT_SUBTYPE_RAW_VID 	= GF_4CC('Q','T','R','V'),
 
+	GF_ISOM_BOX_TYPE_XTRA	= GF_4CC( 'X', 't', 'r', 'a' ),
+
+	GF_ISOM_BOX_TYPE_ST3D	= GF_4CC( 's', 't', '3', 'd' ),
+	GF_ISOM_BOX_TYPE_SV3D	= GF_4CC( 's', 'v', '3', 'd' ),
+	GF_ISOM_BOX_TYPE_SVHD	= GF_4CC( 's', 'v', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_PROJ	= GF_4CC( 'p', 'r', 'o', 'j' ),
+	GF_ISOM_BOX_TYPE_PRHD	= GF_4CC( 'p', 'r', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_CBMP	= GF_4CC( 'c', 'b', 'm', 'p' ),
+	GF_ISOM_BOX_TYPE_EQUI	= GF_4CC( 'e', 'q', 'u', 'i' ),
+	GF_ISOM_BOX_TYPE_MSHP	= GF_4CC( 'm', 's', 'h', 'p' ),
+	GF_ISOM_BOX_TYPE_MESH	= GF_4CC( 'm', 'e', 's', 'h' ),
 
+
+	GF_ISOM_BOX_TYPE_AVCE	= GF_4CC( 'a', 'v', 'c', 'E' ),
+	GF_ISOM_BOX_TYPE_HVCE	= GF_4CC( 'h', 'v', 'c', 'E' ),
+
+	//opaque data container
+	GF_ISOM_BOX_TYPE_GDAT	= GF_4CC( 'g', 'd', 'a', 't' ),
 };
 
 enum
 {
-	GF_ISOM_SAMPLE_ENTRY_UNKN = 0,
+	//can be safely type-casted to sample entry
+	GF_ISOM_SAMPLE_ENTRY_GENERIC = 0,
+	//can be safely type-casted to Video sample entry
 	GF_ISOM_SAMPLE_ENTRY_VIDEO = GF_4CC('v','i','d','e'),
+	//can be safely type-casted to Audio sample entry
 	GF_ISOM_SAMPLE_ENTRY_AUDIO = GF_4CC('a','u','d','i'),
-	GF_ISOM_SAMPLE_ENTRY_MP4S = GF_4CC('m','p','4','s')
-
+	//can be safely type-casted to mpeg systems sample entry
+	GF_ISOM_SAMPLE_ENTRY_MP4S = GF_4CC('m','p','4','s'),
 };
 
 
@@ -542,6 +564,7 @@
 //internal flags (up to 16)
 //if flag is set, position checking of child boxes is ignored
 #define GF_ISOM_ORDER_FREEZE 1
+#define GF_ISOM_BOX_COMPRESSED 2
 
 	/*the default size is 64, cause we need to handle large boxes...
 
@@ -597,6 +620,21 @@
 		}\
 		__ptr->size -= bytes; \
 
+#define ISOM_DECREASE_SIZE_GOTO_EXIT(__ptr, bytes)	if (__ptr->size < (bytes) ) {\
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isom] not enough bytes in box %s: %d left, reading %d (file %s, line %d)\n", gf_4cc_to_str(__ptr->type), (u32) __ptr->size, (bytes), __FILE__, __LINE__ )); \
+			e = GF_ISOM_INVALID_FILE; \
+			goto exit;\
+		}\
+		__ptr->size -= bytes; \
+
+
+#define ISOM_DECREASE_SIZE_NO_ERR(__ptr, bytes)	if (__ptr->size < (bytes) ) {\
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isom] not enough bytes in box %s: %d left, reading %d (file %s, line %d), skipping box\n", gf_4cc_to_str(__ptr->type), (u32) __ptr->size, (bytes), __FILE__, __LINE__ )); \
+			return GF_OK; \
+		}\
+		__ptr->size -= bytes; \
+
+
 /*constructor*/
 GF_Box *gf_isom_box_new(u32 boxType);
 //some boxes may have different syntax based on container. Use this constructor for this case
@@ -610,8 +648,8 @@
 GF_Err gf_isom_clone_box(GF_Box *src, GF_Box **dst);
 
 GF_Err gf_isom_box_parse(GF_Box **outBox, GF_BitStream *bs);
-GF_Err gf_isom_box_array_read(GF_Box *s, GF_BitStream *bs, GF_Err (*check_child_box)(GF_Box *par, GF_Box *b));
-GF_Err gf_isom_box_array_read_ex(GF_Box *parent, GF_BitStream *bs, GF_Err (*check_child_box)(GF_Box *par, GF_Box *b), u32 parent_type);
+GF_Err gf_isom_box_array_read(GF_Box *s, GF_BitStream *bs);
+GF_Err gf_isom_box_array_read_ex(GF_Box *parent, GF_BitStream *bs, u32 parent_type);
 
 GF_Err gf_isom_box_parse_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type, Bool is_root_box);
 
@@ -622,6 +660,7 @@
 //writes box header then version+flags
 GF_Err gf_isom_full_box_write(GF_Box *s, GF_BitStream *bs);
 
+void gf_isom_box_array_reset(GF_List *boxlist);
 void gf_isom_box_array_del(GF_List *child_boxes);
 GF_Err gf_isom_box_array_write(GF_Box *parent, GF_List *list, GF_BitStream *bs);
 GF_Err gf_isom_box_array_size(GF_Box *parent, GF_List *list);
@@ -636,6 +675,26 @@
 
 void gf_isom_box_freeze_order(GF_Box *box);
 
+#define BOX_FIELD_ASSIGN(_field, _box_cast) \
+	if (is_rem) {\
+		ptr->_field = NULL;\
+		return GF_OK;\
+	} else {\
+		if (ptr->_field) ERROR_ON_DUPLICATED_BOX(a, ptr)\
+		ptr->_field = (_box_cast *)a;\
+	}
+
+#define BOX_FIELD_LIST_ASSIGN(_field) \
+	if (is_rem) {\
+		gf_list_del_item(ptr->_field, a);\
+	} else {\
+		if (!ptr->_field) ptr->_field = gf_list_new();\
+		GF_Err _e = gf_list_add(ptr->_field, a);\
+		if (_e) return _e;\
+	}
+
+
+void gf_isom_box_remove_from_parent(GF_Box *parent_box, GF_Box *box);
 
 typedef struct
 {
@@ -686,6 +745,9 @@
 	u8 *data;
 	u32 dataSize;
 	u32 original_4cc;
+	u32 sai_type, sai_aux_info;
+	u64 sai_offset;
+	struct _gf_saio_box *saio_box;
 } GF_UnknownBox;
 
 typedef struct
@@ -860,6 +922,7 @@
 
 	u64 magic;
 	u32 index;
+	u32 nb_base_refs;
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	u64 first_dts_chunk;
@@ -870,11 +933,17 @@
 #endif
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	//dts value when at refererence fragment start (first frag ever or first after a table reset), usually current segment start
 	u64 dts_at_seg_start;
+	//number of samples at refererence fragment start (first frag ever or first after a table reset), usually current segment start
 	u32 sample_count_at_seg_start;
 	Bool first_traf_merged;
 	Bool present_in_scalable_segment;
 	u32 current_traf_stsd_idx;
+
+	u64 last_tfxd_value;
+	struct __traf_mss_timeref_box *tfrf;
+	u64 dts_at_next_frag_start;
 #endif
 } GF_TrackBox;
 
@@ -1090,8 +1159,8 @@
 	u32 r_currentEntryIndex;
 	u32 r_FirstSampleInEntry;
 
-	//stats for read
-	s32 max_ts_delta;
+	s32 max_cts_delta;
+	u32 sample_num_max_cts_delta;
 } GF_CompositionOffsetBox;
 
 
@@ -1268,9 +1337,9 @@
 	u32 cleanApertureWidthD;
 	u32 cleanApertureHeightN;
 	u32 cleanApertureHeightD;
-	u32 horizOffN;
+	s32 horizOffN;
 	u32 horizOffD;
-	u32 vertOffN;
+	s32 vertOffN;
 	u32 vertOffD;
 } GF_CleanApertureBox;
 
@@ -1352,9 +1421,6 @@
 void gf_isom_video_sample_entry_size(GF_VisualSampleEntryBox *ent);
 #endif
 
-void gf_isom_sample_entry_predestroy(GF_SampleEntryBox *ptr);
-
-
 GF_Box *gf_isom_box_find_child(GF_List *parent_child_list, u32 code);
 void gf_isom_box_del_parent(GF_List **parent_child_list, GF_Box*b);
 GF_Box *gf_isom_box_new_parent(GF_List **parent_child_list, u32 code);
@@ -1374,6 +1440,19 @@
 
 typedef struct
 {
+	GF_ISOM_FULL_BOX
+	GF_VVCConfig *config;
+} GF_VVCConfigurationBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u8 nal_unit_size;
+} GF_VVCNaluConfigurationBox;
+
+
+typedef struct
+{
 	GF_ISOM_BOX
 	GF_AV1Config *config;
 } GF_AV1ConfigurationBox;
@@ -1456,6 +1535,8 @@
 	/*hevc extension*/
 	GF_HEVCConfigurationBox *hevc_config;
 	GF_HEVCConfigurationBox *lhvc_config;
+	/*vvc extension*/
+	GF_VVCConfigurationBox *vvc_config;
 	/*av1 extension*/
 	GF_AV1ConfigurationBox *av1_config;
 	/*vp8-9 extension*/
@@ -1534,6 +1615,16 @@
 	GF_AC3Config cfg;
 } GF_AC3ConfigBox;
 
+
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 format_info;
+	u16 peak_data_rate;
+} GF_TrueHDConfigBox;
+
+
 typedef struct
 {
 	GF_ISOM_FULL_BOX
@@ -1543,6 +1634,42 @@
 
 typedef struct
 {
+	GF_ISOM_FULL_BOX
+	u8 stereo_type;
+} GF_Stereo3DBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	char *string;
+} GF_SphericalVideoInfoBox;
+
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	s32 yaw;
+	s32 pitch;
+	s32 roll;
+} GF_ProjectionHeaderBox;
+
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	//cube map
+	u32 layout;
+	s32 padding;
+	//EQR
+	u32 bounds_top, bounds_bottom, bounds_left, bounds_right;
+	//mesh
+	u32 crc;
+	s32 encoding_4cc;
+
+} GF_ProjectionTypeBox;
+
+typedef struct
+{
 	GF_ISOM_BOX
 
 	/*OpusSpecificBox*/
@@ -1576,6 +1703,14 @@
 
 typedef struct
 {
+	GF_ISOM_BOX
+	u8 num_profiles;
+	u8 *compat_profiles;
+} GF_MHACompatibleProfilesBox;
+
+
+typedef struct
+{
 	GF_ISOM_FULL_BOX
 	u8 format_flags;
 	u8 PCM_sample_size;
@@ -1594,6 +1729,9 @@
 	//for AC3/EC3 audio
 	GF_AC3ConfigBox *cfg_ac3;
 
+	//for AC3/EC3 audio
+	GF_TrueHDConfigBox *cfg_mlp;
+
 	//for Opus
 	GF_OpusSpecificBox *cfg_opus;
 
@@ -1877,7 +2015,7 @@
 	u32 cached_prev_size;
 } GF_SampleAuxiliaryInfoSizeBox;
 
-typedef struct
+typedef struct _gf_saio_box
 {
 	GF_ISOM_FULL_BOX
 
@@ -1893,6 +2031,8 @@
 
 	u32 total_size;
 	u8 *cached_data;
+
+	GF_UnknownBox *sai_data;
 } GF_SampleAuxiliaryInfoOffsetBox;
 
 typedef struct
@@ -1935,6 +2075,7 @@
 	GF_List *sub_samples;
 
 	GF_List *sampleGroups;
+	GF_List *compactSampleGroups;
 	GF_List *sampleGroupsDescription;
 	u32 nb_sgpd_in_stbl;
 	u32 nb_stbl_boxes;
@@ -1942,7 +2083,7 @@
 	GF_List *sai_sizes;
 	GF_List *sai_offsets;
 
-	u32 MaxSamplePerChunk, MaxChunkSize;
+	u32 MaxSamplePerChunk, MaxChunkSize, MaxChunkDur;
 	u16 groupID;
 	u16 trackPriority;
 	u32 currentEntryIndex;
@@ -1950,9 +2091,10 @@
 	Bool no_sync_found;
 
 	u32 r_last_chunk_num, r_last_sample_num, r_last_offset_in_chunk;
+	u8 patch_piff_psec;
 } GF_SampleTableBox;
 
-GF_Err stbl_AppendTrafMap(GF_SampleTableBox *stbl, Bool is_seg_start, u64 seg_start_offset, u64 frag_start_offset, u8 *moof_template, u32 moof_template_size, u64 sidx_start, u64 sidx_end);
+GF_Err stbl_AppendTrafMap(GF_SampleTableBox *stbl, Bool is_seg_start, u64 seg_start_offset, u64 frag_start_offset, u8 *moof_template, u32 moof_template_size, u64 sidx_start, u64 sidx_end, u32 nb_pack_samples);
 
 typedef struct __tag_media_info_box
 {
@@ -2253,6 +2395,8 @@
 	char *full_path;
 	// if not 0, full_path is actually the data to write.
 	u32 data_len;
+
+	u32 tk_id, sample_num, ref_it_id;
 } GF_ItemInfoEntryBox;
 
 typedef struct
@@ -2280,6 +2424,9 @@
 {
 	GF_ISOM_BOX
 	u32 data_format;
+	//if the sample entry is a generic sample entry (data_format==GNRX), this is the underlying 4CC
+	//otherwise this is 0
+	u32 gnr_type;
 } GF_OriginalFormatBox;
 
 typedef struct
@@ -2374,6 +2521,9 @@
 	GF_IPMPControlBox *IPMP_control;
 	GF_ItemPropertiesBox *item_props;
 	GF_ItemReferenceBox *item_refs;
+	GF_GroupListBox *groups_list;
+
+	u8 use_item_sample_sharing, use_item_item_sharing;
 } GF_MetaBox;
 
 typedef struct
@@ -2455,6 +2605,10 @@
 	//temp storage of prft box
 	GF_ISOTrackID reference_track_ID;
 	u64 ntp, timestamp;
+
+	//emsg to inject before moof, not part of the moof hierarchy !
+
+	GF_List *emsgs;
 } GF_MovieFragmentBox;
 
 
@@ -2503,6 +2657,7 @@
 	GF_List *sub_samples;
 
 	GF_List *sampleGroups;
+	GF_List *compactSampleGroups;
 	GF_List *sampleGroupsDescription;
 
 	GF_List *sai_sizes;
@@ -2511,6 +2666,7 @@
 	//can be senc or PIFF psec
 	struct __sample_encryption_box *sample_encryption;
 	struct __traf_mss_timeext_box *tfxd; /*similar to PRFT but for Smooth Streaming*/
+	struct __traf_mss_timeref_box *tfrf;
 
 	/*when data caching is on*/
 	u32 DataCache;
@@ -2528,6 +2684,9 @@
 	u8 force_new_trun;
 	u8 IFrameSwitching;
 	u8 use_sdtp;
+	u8 truns_first;
+	u8 truns_v1;
+	u8 large_tfdt;
 } GF_TrackFragmentBox;
 
 GF_TrackFragmentBox *gf_isom_get_traf(GF_ISOFile *mov, GF_ISOTrackID TrackID);
@@ -2884,8 +3043,8 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
-	u8 baseLocation[256];
-	u8 basePurlLocation[256];
+	u8 baseLocation[257];
+	u8 basePurlLocation[257];
 } GF_BaseLocationBox;
 
 typedef struct
@@ -3083,7 +3242,7 @@
 	GF_List *quality_entry_table;
 	char *drm_data;
 	char *meta_data;
-	//entries in these two lists are NOT registered with the box child_boxes because of the inbetween 8 bits !!
+	//entries in these two lists are NOT registered with the box child_boxes because of the in-between 8 bits !!
 	u8 segment_run_table_count;
 	GF_List *segment_run_table_entries;
 	u8 fragment_run_table_count;
@@ -3148,6 +3307,23 @@
 
 typedef struct
 {
+	u32 length;
+	u32 sample_count;
+	u32 *sample_group_description_indices;
+} GF_CompactSampleGroupPattern;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 grouping_type;
+	u32 grouping_type_parameter;
+
+	u32 pattern_count;
+	GF_CompactSampleGroupPattern *patterns;
+} GF_CompactSampleGroupBox;
+
+typedef struct
+{
 	GF_ISOM_FULL_BOX
 	u32 grouping_type;
 	u32 default_length;
@@ -3273,7 +3449,31 @@
 	u8 dimension_identifier[16];
 } LHEVC_DependentLayer;
 
+typedef struct
+{
+	u8 subpic_id_len_minus1;
+	u16 subpic_id_bit_pos;
+	u8 start_code_emul_flag;
+	u8 pps_sps_subpic_id_flag;
+	u8 xps_id;
+} GF_VVCSubpicIDRewritingInfo;
 
+/*SubpictureOrder - 'spor' type*/
+typedef struct
+{
+	Bool subpic_id_info_flag;
+	u16 num_subpic_ref_idx;
+	u16 *subp_track_ref_idx;
+	GF_VVCSubpicIDRewritingInfo spinfo;
+} GF_SubpictureOrderEntry;
+
+/*SubpictureLayoutMap - 'sulm' type*/
+typedef struct
+{
+	u32 groupID_info_4cc;
+	u32 nb_entries;
+	u16 *groupIDs;
+} GF_SubpictureLayoutMapEntry;
 
 /*
 		CENC stuff
@@ -3284,10 +3484,8 @@
 {
 	u8 crypt_byte_block, skip_byte_block;
 	u8 IsProtected;
-	u8 Per_Sample_IV_size;
-	u8 constant_IV_size;
-	bin128 KID;
-	bin128 constant_IV;
+	u8 *key_info;
+	u32 key_info_size;
 } GF_CENCSampleEncryptionGroupEntry;
 
 typedef struct
@@ -3299,6 +3497,7 @@
 	bin128 *KIDs;
 	u32 private_data_size;
 	u8 *private_data;
+	u8 moof_defined;
 } GF_ProtectionSystemHeaderBox;
 
 typedef struct __cenc_tenc_box
@@ -3307,10 +3506,9 @@
 
 	u8 crypt_byte_block, skip_byte_block;
 	u8 isProtected;
-	u8 Per_Sample_IV_Size;
-	bin128 KID;
-	u8 constant_IV_size;
-	bin128 constant_IV;
+
+	//single key
+	u8 key_info[37];
 } GF_TrackEncryptionBox;
 
 typedef struct __piff_tenc_box
@@ -3320,8 +3518,7 @@
 	u32 flags;
 
 	u32 AlgorithmID;
-	u8 IV_size;
-	bin128 KID;
+	u8 key_info[20];
 } GF_PIFFTrackEncryptionBox;
 
 typedef struct
@@ -3342,7 +3539,8 @@
 	/*u8 version; field in included in base box version */
 	u32 flags;
 
-	Bool is_piff;
+	//0: regular senc, 1: PIFF PSEC, 2: MS senc with version 1 (not compatible with ISOBMFF senc v1)
+	u32 piff_type;
 
 	GF_List *samp_aux_info; /*GF_CENCSampleAuxInfo*/
 	u64 bs_offset;
@@ -3373,20 +3571,48 @@
 	u64 fragment_duration_in_track_timescale;
 } GF_MSSTimeExtBox;
 
+typedef struct
+{
+	u64 absolute_time_in_track_timescale;
+	u64 fragment_duration_in_track_timescale;
+} GF_MSSTimeEntry;
+
+typedef struct __traf_mss_timeref_box
+{
+	GF_ISOM_UUID_BOX
+	/*u8 version; field in included in base box version */
+	u32 flags;
+
+	u32 frags_count;
+	GF_MSSTimeEntry *frags;
+
+} GF_MSSTimeRefBox;
+
+
+
 GF_SampleEncryptionBox *gf_isom_create_piff_psec_box(u8 version, u32 flags, u32 AlgorithmID, u8 IV_size, bin128 KID);
 GF_SampleEncryptionBox * gf_isom_create_samp_enc_box(u8 version, u32 flags);
 
-void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID, u8 *constant_IV_size, bin128 *constant_IV, u8 *crypt_byte_block, u8 *skip_byte_block);
+void gf_isom_cenc_get_default_info_internal(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
 
 
+GF_Err gf_isom_get_sample_cenc_info_internal(GF_TrackBox *trak,
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *IV_size, bin128 *KID, u8 *crypt_byte_block, u8 *skip_byte_block, u8 *constant_IV_size, bin128 *constant_IV);
-GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *ptr);
+	GF_TrackFragmentBox *traf,
 #else
-GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, void *traf, uGF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *IV_size, bin128 *KID,
-										u8 *crypt_byte_block, u8 *skip_byte_block, u8 *constant_IV_size, bin128 *constant_IV);
-GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, void *traf, GF_SampleEncryptionBox *ptr);
+	void *traf,
 #endif
+	GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
+
+
+GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak,
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	GF_TrackFragmentBox *traf,
+#else
+	void *traf,
+#endif
+	GF_SampleEncryptionBox *ptr);
+
 
 /*
 	Boxes for Adobe's protection scheme
@@ -3471,6 +3697,11 @@
 	u8 angle;
 } GF_ImageRotationBox;
 
+typedef struct {
+	GF_ISOM_BOX
+	u8 axis;
+} GF_ImageMirrorBox;
+
 typedef struct
 {
 	u8 essential;
@@ -3488,6 +3719,17 @@
 	GF_List *entries;
 } GF_ItemPropertyAssociationBox;
 
+typedef struct {
+	GF_ISOM_BOX
+	u8 large_size;
+	u32 layer_size[3];
+} GF_AV1LayeredImageIndexingPropertyBox;
+
+typedef struct {
+	GF_ISOM_BOX
+	u8 op_index;
+} GF_AV1OperatingPointSelectorPropertyBox;
+
 
 typedef struct {
 	GF_ISOM_FULL_BOX
@@ -3498,6 +3740,20 @@
 
 typedef struct {
 	GF_ISOM_FULL_BOX
+	u8 skip_byte_block, crypt_byte_block;
+	u8 *key_info;
+	u32 key_info_size;
+} GF_ItemEncryptionPropertyBox;
+
+
+typedef struct {
+	GF_ISOM_FULL_BOX
+	u32 aux_info_type;
+	u32 aux_info_parameter;
+} GF_AuxiliaryInfoPropertyBox;
+
+typedef struct {
+	GF_ISOM_FULL_BOX
 
 	GF_OperatingPointsInformation *oinf;
 } GF_OINFPropertyBox;
@@ -3604,6 +3860,25 @@
 } FDItemInformationBox;
 
 
+
+typedef struct
+{
+	char *name;
+	u32 flags;
+	u16 prop_type;
+
+	u32 prop_size;
+	u8 *prop_value; //most of the time, utf16 with trailing \0\0
+} GF_XtraTag;
+
+typedef struct
+{
+	GF_ISOM_BOX
+
+	GF_List *tags;
+} GF_XtraBox;
+
+
 /*
 		Data Map (media storage) stuff
 */
@@ -3655,6 +3930,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	char *temp_file;
 #endif
+	GF_Blob *blob;
 } GF_FileDataMap;
 
 /*file mapping handler. used if supported, only on read mode for complete files (not in file download)*/
@@ -3720,6 +3996,7 @@
 	GF_ISOM_FRAG_READ_DEBUG		=	0x02,
 };
 
+
 /*this is our movie object*/
 struct __tag_isom {
 	/*the last fatal error*/
@@ -3749,6 +4026,8 @@
 	u8 convert_streaming_text;
 	u8 is_jp2;
 	u8 force_co64;
+	u8 disable_odf_translate;
+	u8 disable_brand_rewrite;
 	u64 next_flush_chunk_time;
 	Bool keep_utc;
 	/*main boxes for fast access*/
@@ -3758,6 +4037,9 @@
 	GF_MediaDataBox *mdat;
 	/*file brand (since v2, NULL means mp4 v1)*/
 	GF_FileTypeBox *brand;
+	/*original file type box if any*/
+	GF_Box *otyp;
+
 	/*progressive download info*/
 	GF_ProgressiveDownloadBox *pdin;
 	/*meta box if any*/
@@ -3766,16 +4048,15 @@
 	s64 read_byte_offset;
 	u64 bytes_removed;
 
-	Bool disable_odf_translate;
-
 	GF_ISOCompressMode compress_mode;
-	Bool force_compress;
+	u32 compress_flags;
 
 	void (*progress_cbk)(void *udta, u64 nb_done, u64 nb_total);
 	void *progress_cbk_udta;
 
+	u32 FragmentsFlags;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	u32 FragmentsFlags, NextMoofNumber;
+	u32 NextMoofNumber;
 	/*active fragment*/
 	GF_MovieFragmentBox *moof;
 	/*in WRITE mode, this is the current MDAT where data is written*/
@@ -3786,6 +4067,8 @@
 	GF_List *moof_list;
 	Bool use_segments, moof_first, append_segment, styp_written, force_moof_base_offset;
 
+	GF_List *emsgs;
+
 	/*used when building single-indexed self initializing media segments*/
 	GF_SegmentIndexBox *root_sidx;
 	u64 root_sidx_offset;
@@ -3801,6 +4084,7 @@
 	u32 single_moof_state;
 
 	Bool sample_groups_in_traf;
+	Bool force_sidx_v1;
 
 	/* optional mfra box used in write mode */
 	GF_MovieFragmentRandomAccessBox *mfra;
@@ -3818,6 +4102,7 @@
 	GF_SegmentIndexBox *main_sidx;
 	u64 main_sidx_end_pos;
 
+	Bool has_pssh_moof;
 #endif
 	GF_ProducerReferenceTimeBox *last_producer_ref_time;
 
@@ -3840,6 +4125,10 @@
 	u32 block_buffer_size;
 
 	u32 nb_box_init_seg;
+
+	Bool no_inplace_rewrite;
+	u32 padding;
+	u64 original_moov_offset, original_meta_offset, first_data_toplevel_offset, first_data_toplevel_size;
 };
 
 /*time function*/
@@ -3858,6 +4147,9 @@
 GF_ISOFile *gf_isom_open_file(const char *fileName, GF_ISOOpenMode OpenMode, const char *tmp_dir);
 /*close and delete a movie*/
 void gf_isom_delete_movie(GF_ISOFile *mov);
+void gf_isom_meta_restore_items_ref(GF_ISOFile *file, GF_MetaBox *meta);
+
+GF_MetaBox *gf_isom_get_meta(GF_ISOFile *file, Bool root_meta, u32 track_num);
 
 /*StreamDescription reconstruction Functions*/
 GF_Err GetESD(GF_MovieBox *moov, GF_ISOTrackID trackID, u32 StreamDescIndex, GF_ESD **outESD);
@@ -3927,6 +4219,9 @@
 
 GF_UserDataMap *udta_getEntry(GF_UserDataBox *ptr, u32 box_type, bin128 *uuid);
 
+
+GF_Err gf_isom_set_sample_group_description_internal(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size, Bool check_access);
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err FlushCaptureMode(GF_ISOFile *movie);
@@ -3971,7 +4266,7 @@
 /*writing of the final chunk info in edit mode*/
 GF_Err stbl_SetChunkAndOffset(GF_SampleTableBox *stbl, u32 sampleNumber, u32 StreamDescIndex, GF_SampleToChunkBox *the_stsc, GF_Box **the_stco, u64 data_offset, Bool forceNewChunk, u32 nb_samp);
 /*EDIT LIST functions*/
-GF_EdtsEntry *CreateEditEntry(u64 EditDuration, u64 MediaTime, u8 EditMode);
+GF_EdtsEntry *CreateEditEntry(u64 EditDuration, u64 MediaTime, u32 MediaRate, u8 EditMode);
 
 GF_Err stbl_SetRedundant(GF_SampleTableBox *stbl, u32 sampleNumber);
 GF_Err stbl_AddRedundant(GF_SampleTableBox *stbl, u32 sampleNumber);
@@ -3992,11 +4287,12 @@
 GF_Err gf_isom_close_fragments(GF_ISOFile *movie);
 #endif
 
-GF_Err gf_isom_flush_sidx(GF_ISOFile *movie, u32 sidx_max_size, Bool exact_range);
+GF_Err gf_isom_flush_sidx(GF_ISOFile *movie, u32 sidx_max_size, Bool force_v1);
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type);
+void sgpd_del_entry(u32 grouping_type, void *entry);
 
 GF_DefaultSampleGroupDescriptionEntry * gf_isom_get_sample_group_info_entry(GF_ISOFile *the_file, GF_TrackBox *trak, u32 grouping_type, u32 sample_description_index, u32 *default_index, GF_SampleGroupDescriptionBox **out_sgdp);
 
@@ -4008,22 +4304,22 @@
 u32 GetHintFormat(GF_TrackBox *trak);
 
 /*locate a box by its type or UUID*/
-GF_ItemListBox *gf_ismo_locate_box(GF_List *list, u32 boxType, bin128 UUID);
+GF_ItemListBox *gf_isom_locate_box(GF_List *list, u32 boxType, bin128 UUID);
 
-GF_Err moov_on_child_box(GF_Box *ptr, GF_Box *a);
-GF_Err trak_on_child_box(GF_Box *ptr, GF_Box *a);
-GF_Err mvex_on_child_box(GF_Box *ptr, GF_Box *a);
-GF_Err stsd_on_child_box(GF_Box *ptr, GF_Box *a);
-GF_Err hnti_on_child_box(GF_Box *hnti, GF_Box *a);
-GF_Err udta_on_child_box(GF_Box *ptr, GF_Box *a);
-GF_Err edts_on_child_box(GF_Box *s, GF_Box *a);
+GF_Err moov_on_child_box(GF_Box *ptr, GF_Box *a, Bool is_rem);
+GF_Err trak_on_child_box(GF_Box *ptr, GF_Box *a, Bool is_rem);
+GF_Err mvex_on_child_box(GF_Box *ptr, GF_Box *a, Bool is_rem);
+GF_Err stsd_on_child_box(GF_Box *ptr, GF_Box *a, Bool is_rem);
+GF_Err hnti_on_child_box(GF_Box *hnti, GF_Box *a, Bool is_rem);
+GF_Err udta_on_child_box(GF_Box *ptr, GF_Box *a, Bool is_rem);
+GF_Err edts_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem);
 GF_Err stdp_box_read(GF_Box *s, GF_BitStream *bs);
-GF_Err stbl_on_child_box(GF_Box *ptr, GF_Box *a);
+GF_Err stbl_on_child_box(GF_Box *ptr, GF_Box *a, Bool is_rem);
 GF_Err sdtp_box_read(GF_Box *s, GF_BitStream *bs);
-GF_Err dinf_on_child_box(GF_Box *s, GF_Box *a);
-GF_Err minf_on_child_box(GF_Box *s, GF_Box *a);
-GF_Err mdia_on_child_box(GF_Box *s, GF_Box *a);
-GF_Err traf_on_child_box(GF_Box *s, GF_Box *a);
+GF_Err dinf_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem);
+GF_Err minf_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem);
+GF_Err mdia_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem);
+GF_Err traf_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem);
 
 /*rewrites avcC based on the given esd - this destroys the esd*/
 GF_Err AVC_HEVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd);
@@ -4040,14 +4336,40 @@
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 Bool gf_isom_cenc_has_saiz_saio_traf(GF_TrackFragmentBox *traf, u32 scheme_type);
-void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 len, Bool saio_32bits);
+void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 len, Bool saio_32bits, Bool use_mkey);
 #endif
-GF_Err gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u64 offset, u32 len);
+GF_Err gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u32 sample_number, u64 offset, u32 len);
 
 void gf_isom_parse_trif_info(const u8 *data, u32 size, u32 *id, u32 *independent, Bool *full_picture, u32 *x, u32 *y, u32 *w, u32 *h);
 
 Bool gf_isom_is_encrypted_entry(u32 entryType);
 
+//too export in constants
+Bool gf_cenc_validate_key_info(const u8 *key_info, u32 key_info_size);
+
+GF_Err gf_isom_add_sample_aux_info_internal(GF_TrackBox *trak, void *_traf, u32 sampleNumber, u32 aux_type, u32 aux_info, u8 *data, u32 size);
+
+
+/*! CENC auxiliary info*/
+typedef struct __cenc_sample_aux_info
+{
+	u8 *cenc_data;
+	u32 cenc_data_size;
+ 	/*! flag set if sample is clear - it MUST NOT be written to file*/
+	u8 isNotProtected;
+
+	/*! key info, for dump only (not valid otherwise)*/
+	const u8 *key_info;
+	u32 key_info_size;
+} GF_CENCSampleAuxInfo;
+
+
+/*! destroys a CENC sample auxiliary structure
+\param samp_aux_info the target auxiliary buffer
+*/
+void gf_isom_cenc_samp_aux_info_del(GF_CENCSampleAuxInfo *samp_aux_info);
+
+
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
 /*
@@ -4342,10 +4664,10 @@
 void gf_isom_registry_disable(u32 boxCode, Bool disable);
 
 /*Apple extensions*/
-GF_MetaBox *gf_isom_apple_get_meta_extensions(GF_ISOFile *mov);
+GF_Box *gf_isom_get_meta_extensions(GF_ISOFile *mov, Bool for_xtra);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_MetaBox *gf_isom_apple_create_meta_extensions(GF_ISOFile *mov);
+GF_Box *gf_isom_create_meta_extensions(GF_ISOFile *mov, Bool for_xtra);
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
@@ -4360,7 +4682,7 @@
 
 GF_Err gf_isom_read_null_terminated_string(GF_Box *s, GF_BitStream *bs, u64 size, char **out_str);
 
-GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_MovieFragmentBox *moof, u64 moof_offset, s32 compresed_diff, u64 *cumulated_offset, Bool is_first_merge);
+GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_MovieFragmentBox *moof, u64 moof_offset, s32 compresed_diff, u64 *cumulated_offset);
 
 
 #endif //GPAC_DISABLE_ISOM

gpac-1.0.1.tar.gz/include/gpac/internal/m3u8.h -> gpac-2.0.0.tar.gz/include/gpac/internal/m3u8.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *					Authors: Pierre Souchay - Jean Le Feuvre - Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2010-2012, Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-2021
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -45,6 +45,7 @@
 	int current_media_seq;
 	int media_seq_min;
 	int media_seq_max;
+	int discontinuity;
 	double target_duration;
 	double computed_duration;
 	Bool is_ended;
@@ -54,7 +55,7 @@
 
 typedef enum e_playlistElementType  { TYPE_PLAYLIST, TYPE_MEDIA, TYPE_UNKNOWN } PlaylistElementType;
 
-typedef enum e_playlistElementDRMMethod { DRM_NONE, DRM_AES_128 } PlaylistElementDRMMethod;
+typedef enum e_playlistElementDRMMethod { DRM_NONE, DRM_AES_128, DRM_CENC } PlaylistElementDRMMethod;
 
 typedef enum _e_MediaType {
 	MEDIA_TYPE_UNKNOWN         = 0,
@@ -71,7 +72,7 @@
 	MediaType media_type;
 	double duration_info;
 	u64 byte_range_start, byte_range_end;
-	int bandwidth, width, height;
+	int bandwidth, width, height, low_lat_chunk, independent_chunk;
 	char *title;
 	char *codecs;
 	char *language;
@@ -80,8 +81,9 @@
 	char *url;
 	char *init_segment_url;
 	u64 init_byte_range_start, init_byte_range_end;
+	//informative UTC start time
 	u64 utc_start_time;
-
+	u32 discontinuity;
 	PlaylistElementDRMMethod drm_method;
 	char *key_uri;
 	bin128 key_iv;
@@ -108,7 +110,7 @@
 	GF_List *streams; /*Stream*/
 	int current_stream;
 	Bool playlist_needs_refresh;
-	Bool independent_segments;
+	Bool independent_segments, low_latency;
 };
 typedef struct s_masterPlaylist MasterPlaylist;
 
@@ -129,9 +131,10 @@
 \param baseURL base URL of the playlist
 \param in_program in which the playlist is parsed
 \param sub_playlist existing subplaylist element in the playlist in which the playlist is parsed
+\param is_master set to true to indicate if this is the root playlist
 \param GF_OK if playlist valid
  */
-GF_Err gf_m3u8_parse_sub_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL, Stream *in_program, PlaylistElement *sub_playlist);
+GF_Err gf_m3u8_parse_sub_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL, Stream *in_program, PlaylistElement *sub_playlist, Bool is_master);
 
 /**
  * Deletes the given MasterPlaylist and all of its sub elements

gpac-1.0.1.tar.gz/include/gpac/internal/media_dev.h -> gpac-2.0.0.tar.gz/include/gpac/internal/media_dev.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -43,6 +43,15 @@
 GF_Err gf_import_message(GF_MediaImporter *import, GF_Err e, char *format, ...);
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
+
+typedef struct
+{
+	Bool override;
+	u16 colour_primaries, transfer_characteristics, matrix_coefficients;
+	Bool full_range;
+} COLR;
+
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 
 u32 gf_latm_get_value(GF_BitStream *bs);
@@ -63,10 +72,11 @@
 u32 gf_media_nalu_emulation_bytes_remove_count(const u8 *buffer, u32 nal_size);
 u32 gf_media_nalu_remove_emulation_bytes(const u8 *buffer_src, u8 *buffer_dst, u32 nal_size);
 
-u32 gf_bs_get_ue(GF_BitStream *bs);
-s32 gf_bs_get_se(GF_BitStream *bs);
-void gf_bs_set_ue(GF_BitStream *bs, u32 num);
-void gf_bs_set_se(GF_BitStream *bs, s32 num);
+u32 gf_bs_read_ue(GF_BitStream *bs);
+s32 gf_bs_read_se(GF_BitStream *bs);
+void gf_bs_write_ue(GF_BitStream *bs, u32 num);
+void gf_bs_write_se(GF_BitStream *bs, s32 num);
+
 
 enum
 {
@@ -205,7 +215,7 @@
 
 	AVC_SPS *sps;
 	AVC_PPS *pps;
-	SVC_NALUHeader NalHeader;
+	SVC_NALUHeader svc_nalhdr;
 } AVCSliceInfo;
 
 
@@ -263,29 +273,72 @@
 
 
 /*return sps ID or -1 if error*/
-s32 gf_media_avc_read_sps(const u8 *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos);
-s32 gf_media_avc_read_sps_bs(GF_BitStream *bs, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos);
+s32 gf_avc_read_sps(const u8 *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos);
+s32 gf_avc_read_sps_bs(GF_BitStream *bs, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos);
 /*return pps ID or -1 if error*/
-s32 gf_media_avc_read_pps(const u8 *pps_data, u32 pps_size, AVCState *avc);
-s32 gf_media_avc_read_pps_bs(GF_BitStream *bs, AVCState *avc);
+s32 gf_avc_read_pps(const u8 *pps_data, u32 pps_size, AVCState *avc);
+s32 gf_avc_read_pps_bs(GF_BitStream *bs, AVCState *avc);
 
 /*is slice containing intra MB only*/
-Bool gf_media_avc_slice_is_intra(AVCState *avc);
+Bool gf_avc_slice_is_intra(AVCState *avc);
 /*parses NALU, updates avc state and returns:
 	1 if NALU part of new frame
 	0 if NALU part of prev frame
 	-1 if bitstream error
 */
-s32 gf_media_avc_parse_nalu(GF_BitStream *bs, AVCState *avc);
+s32 gf_avc_parse_nalu(GF_BitStream *bs, AVCState *avc);
 /*remove SEI messages not allowed in MP4*/
 /*nota: 'buffer' remains unmodified but cannot be set const*/
-u32 gf_media_avc_reformat_sei(u8 *buffer, u32 nal_size, Bool isobmf_rewrite, AVCState *avc);
+u32 gf_avc_reformat_sei(u8 *buffer, u32 nal_size, Bool isobmf_rewrite, AVCState *avc);
 
 #ifndef GPAC_DISABLE_ISOM
-GF_Err gf_media_avc_change_par(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d);
-GF_Err gf_media_hevc_change_par(GF_HEVCConfig *hvcc, s32 ar_n, s32 ar_d);
+
+GF_Err gf_media_get_color_info(GF_ISOFile *file, u32 track, u32 sampleDescriptionIndex, u32 *colour_type, u16 *colour_primaries, u16 *transfer_characteristics, u16 *matrix_coefficients, Bool *full_range_flag);
+
+/*! VUI modification parameters*/
+typedef struct
+{
+	/*! if true, the structure members will be updated to the actual values written or present in bitstream. If still -1, info was not written in bitstream*/
+	Bool update;
+	/*! pixel aspect ratio num
+	a value of 0 in ar_num or ar_den removes PAR
+	a value of -1 in ar_num or ar_den keeps PAR from bitstream
+	positive values change PAR
+	*/
+	s32 ar_num;
+	/*! pixel aspect ratio den*/
+	s32 ar_den;
+
+	//if set all video info is removed
+	Bool remove_video_info;
+	//new fullrange, -1 to use info from bitstream
+	s32 fullrange;
+	//new vidformat flag, -1 to use info from bitstream
+	s32 video_format;
+	//new color primaries flag, -1 to use info from bitstream
+	s32 color_prim;
+	//new color transfer characteristics flag, -1 to use info from bitstream
+	s32 color_tfc;
+	//new color matrix flag, -1 to use info from bitstream
+	s32 color_matrix;
+} GF_VUIInfo;
+
+GF_Err gf_avc_change_vui(GF_AVCConfig *avcc, GF_VUIInfo *vui_info);
+
+//shortucts for the above for API compatibility
+GF_Err gf_avc_change_par(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d);
+GF_Err gf_avc_change_color(GF_AVCConfig *avcc, s32 fullrange, s32 vidformat, s32 colorprim, s32 transfer, s32 colmatrix);
+
+GF_Err gf_hevc_change_vui(GF_HEVCConfig *hvcc, GF_VUIInfo *vui);
+//shortcut for the above for API compatibility
+GF_Err gf_hevc_change_par(GF_HEVCConfig *hvcc, s32 ar_n, s32 ar_d);
+GF_Err gf_hevc_change_color(GF_HEVCConfig *hvcc, s32 fullrange, s32 vidformat, s32 colorprim, s32 transfer, s32 colmatrix);
 #endif
 
+GF_Err gf_vvc_change_vui(GF_VVCConfig *cfg, GF_VUIInfo *vui);
+//shortcut for the above for API compatibility
+GF_Err gf_vvc_change_par(GF_VVCConfig *cfg, s32 ar_n, s32 ar_d);
+GF_Err gf_vvc_change_color(GF_VVCConfig *cfg, s32 fullrange, s32 vidformat, s32 colorprim, s32 transfer, s32 colmatrix);
 
 
 typedef struct
@@ -411,7 +464,7 @@
 typedef struct
 {
 	u16 avg_bit_rate, max_bit_rate, avg_pic_rate;
-	u8 constand_pic_rate_idc;
+	u8 constant_pic_rate_idc;
 } HEVC_RateInfo;
 
 
@@ -430,6 +483,7 @@
 	HEVC_ProfileTierLevel ptl;
 
 	HEVC_SublayerPTL sub_ptl[8];
+	//this is not parsed yet (in VPS VUI)
 	HEVC_RateInfo rates[8];
 
 
@@ -515,9 +569,9 @@
 	s32 last_parsed_sps_id;
 	s32 last_parsed_pps_id;
 
-	// Dolby Vision
-	Bool dv_rpu;
-	Bool dv_el;
+	u8 clli_data[4];
+	u8 mdcv_data[24];
+	u8 clli_valid, mdcv_valid;
 } HEVCState;
 
 typedef struct hevc_combine{
@@ -532,35 +586,263 @@
 	GF_HEVC_SLICE_TYPE_P = 1,
 	GF_HEVC_SLICE_TYPE_I = 2,
 };
-s32 gf_media_hevc_read_vps(u8 *data, u32 size, HEVCState *hevc);
-s32 gf_media_hevc_read_vps_bs(GF_BitStream *bs, HEVCState *hevc);
-s32 gf_media_hevc_read_sps(u8 *data, u32 size, HEVCState *hevc);
-s32 gf_media_hevc_read_sps_bs(GF_BitStream *bs, HEVCState *hevc);
-s32 gf_media_hevc_read_pps(u8 *data, u32 size, HEVCState *hevc);
-s32 gf_media_hevc_read_pps_bs(GF_BitStream *bs, HEVCState *hevc);
-s32 gf_media_hevc_parse_nalu(u8 *data, u32 size, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id);
-Bool gf_media_hevc_slice_is_intra(HEVCState *hevc);
-Bool gf_media_hevc_slice_is_IDR(HEVCState *hevc);
+s32 gf_hevc_read_vps(u8 *data, u32 size, HEVCState *hevc);
+s32 gf_hevc_read_vps_bs(GF_BitStream *bs, HEVCState *hevc);
+s32 gf_hevc_read_sps(u8 *data, u32 size, HEVCState *hevc);
+s32 gf_hevc_read_sps_bs(GF_BitStream *bs, HEVCState *hevc);
+s32 gf_hevc_read_pps(u8 *data, u32 size, HEVCState *hevc);
+s32 gf_hevc_read_pps_bs(GF_BitStream *bs, HEVCState *hevc);
+s32 gf_hevc_parse_nalu(u8 *data, u32 size, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id);
+Bool gf_hevc_slice_is_intra(HEVCState *hevc);
+Bool gf_hevc_slice_is_IDR(HEVCState *hevc);
 //parses VPS and rewrites data buffer after removing VPS extension
-s32 gf_media_hevc_read_vps_ex(u8 *data, u32 *size, HEVCState *hevc, Bool remove_extensions);
+s32 gf_hevc_read_vps_ex(u8 *data, u32 *size, HEVCState *hevc, Bool remove_extensions);
 
-void gf_media_hevc_parse_ps(GF_HEVCConfig* hevccfg, HEVCState* hevc, u32 nal_type);
-s32 gf_media_hevc_parse_nalu_bs(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id);
+void gf_hevc_parse_ps(GF_HEVCConfig* hevccfg, HEVCState* hevc, u32 nal_type);
+s32 gf_hevc_parse_nalu_bs(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id);
 
 GF_Err gf_hevc_get_sps_info_with_state(HEVCState *hevc_state, u8 *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d);
 
 /*parses HEVC SEI and fill state accordingly*/
-void gf_media_hevc_parse_sei(char* buffer, u32 nal_size, HEVCState *hevc);
+void gf_hevc_parse_sei(char* buffer, u32 nal_size, HEVCState *hevc);
+
+
+
+enum
+{
+	GF_VVC_SLICE_TYPE_B = 0,
+	GF_VVC_SLICE_TYPE_P = 1,
+	GF_VVC_SLICE_TYPE_I = 2,
+	GF_VVC_SLICE_TYPE_UNKNOWN = 10,
+};
+
+#define VVC_MAX_REF_PICS	29
+
+#define VVC_RPL_ST 0
+#define VVC_RPL_LT 1
+#define VVC_RPL_IL 2
+
+typedef struct
+{
+	u32 num_ref_entries;
+	u32 nb_short_term_pictures, nb_long_term_pictures, nb_inter_layer_pictures;
+
+	u8 ref_pic_type[VVC_MAX_REF_PICS];
+//	u32 ref_pic_id[VVC_MAX_REF_PICS];
+//	s32 poc[VVC_MAX_REF_PICS];
+//	u32 nb_active_pics;
+//	u8 delta_poc_msb_present[VVC_MAX_REF_PICS];
+//	s32 delta_poc_msb_cycle_lt[VVC_MAX_REF_PICS];
+	u8 ltrp_in_header_flag;
+//	u32 inter_layer_ref_pic_id[VVC_MAX_REF_PICS];
+} VVC_RefPicList;
+
+#define MAX_TILE_COLS 30
+#define MAX_TILE_ROWS 33
+
+typedef struct
+{
+	s32 id;
+	u32 vps_id;
+	u8 state;
+
+	//all flags needed for further PPS , picture header or slice header parsing
+	u8 max_sublayers, chroma_format_idc, log2_ctu_size, sps_ptl_dpb_hrd_params_present_flag;
+	u8 gdr_enabled, ref_pic_resampling, res_change_in_clvs, explicit_scaling_list_enabled_flag;
+	u8 virtual_boundaries_enabled_flag, virtual_boundaries_present_flag, joint_cbcr_enabled_flag;
+	u8 dep_quant_enabled_flag, sign_data_hiding_enabled_flag, transform_skip_enabled_flag;
+	u8 ph_num_extra_bits, sh_num_extra_bits, partition_constraints_override_enabled_flag;
+	u8 alf_enabled_flag, ccalf_enabled_flag, lmcs_enabled_flag, long_term_ref_pics_flag, inter_layer_prediction_enabled_flag;
+	u8 weighted_pred_flag, weighted_bipred_flag, temporal_mvp_enabled_flag, mmvd_fullpel_only_enabled_flag, bdof_control_present_in_ph_flag;
+	u8 dmvr_control_present_in_ph_flag, prof_control_present_in_ph_flag, sao_enabled_flag, idr_rpl_present_flag;
+	u8 entry_point_offsets_present_flag, entropy_coding_sync_enabled_flag;
+
+	u8 conf_window;
+	u32 cw_left, cw_right, cw_top, cw_bottom;
+
+	//subpic info, not fully implemented yet
+	u8 subpic_info_present, independent_subpic_flags, subpic_same_size, subpicid_mapping_explicit, subpicid_mapping_present;
+	u32 nb_subpics; //up to 600
+	u32 subpicid_len;
 
+	Bool has_timing_info;
+	u32 num_units_in_tick, time_scale;
+	u32 width, height;
+
+	u32 bitdepth;
+
+	//POC compute
+	u8 log2_max_poc_lsb, poc_msb_cycle_flag;
+	u32 poc_msb_cycle_len;
+
+	//reference picture lists
+	u32 num_ref_pic_lists[2];
+	VVC_RefPicList rps[2][64];
+
+	//VUI
+	u8 aspect_ratio_info_present_flag;
+	u8 sar_idc;
+	u16 sar_width, sar_height;
+
+	u8 overscan_info_present_flag;
+	u8 video_signal_type_present_flag;
+	u8 video_format;
+	u8 video_full_range_flag;
 
-GF_Err gf_media_parse_ivf_file_header(GF_BitStream *bs, u32 *width, u32*height, u32 *codec_fourcc, u32 *frame_rate, u32 *time_scale, u32 *num_frames);
+	u8 colour_description_present_flag;
+	u8 colour_primaries;
+	u8 transfer_characteristics;
+	u8 matrix_coefficients;
+
+	//SPS range extensions, not yet parsed
+	u8 ts_residual_coding_rice_present_in_sh_flag, reverse_last_sig_coeff_enabled_flag;
+} VVC_SPS;
+
+typedef struct
+{
+	s32 id;
+	u32 sps_id;
+	u8 state;
+	//all flags needed for further picture header or slice header parsing
+	u8 mixed_nal_types, output_flag_present_flag, no_pic_partition_flag, subpic_id_mapping_present_flag, rect_slice_flag;
+	u8 alf_info_in_ph_flag, rpl_info_in_ph_flag, cu_qp_delta_enabled_flag, cu_chroma_qp_offset_list_enabled_flag, weighted_pred_flag;
+	u8 weighted_bipred_flag, wp_info_in_ph_flag, qp_delta_info_in_ph_flag, sao_info_in_ph_flag, dbf_info_in_ph_flag;
+	u8 deblocking_filter_disabled_flag, deblocking_filter_override_enabled_flag, chroma_tool_offsets_present_flag;
+	u8 slice_chroma_qp_offsets_present_flag, picture_header_extension_present_flag, rpl1_idx_present_flag;
+	u8 cabac_init_present_flag, slice_header_extension_present_flag, single_slice_per_subpic_flag;
+
+	u32 num_ref_idx_default_active[2];
+	u32 num_tiles_in_pic, num_tile_rows, num_tile_cols, slice_address_len, num_slices_in_pic;
+
+	u32 width, height;
+	u8 conf_window;
+	u32 cw_left, cw_right, cw_top, cw_bottom;
+
+	//tile info
+	u32 tile_rows_height_ctb[MAX_TILE_ROWS];
+	u32 tile_cols_width_ctb[MAX_TILE_COLS];
+	u32 pic_width_in_ctbsY, pic_height_in_ctbsY;
+} VVC_PPS;
+
+#define VVC_MAX_LAYERS	4
+#define VVC_MAX_NUM_LAYER_SETS 1024
+
+
+typedef struct
+{
+	u8 profile_present_flag, level_present_flag;
+	u8 sublayer_level_idc;
+
+} VVC_SublayerPTL;
+
+typedef struct
+{
+	u8 pt_present;
+	u8 ptl_max_tid;
+
+	u8 general_profile_idc, general_tier_flag, general_level_idc, frame_only_constraint, multilayer_enabled;
+	VVC_SublayerPTL sub_ptl[8];
+
+	u8 num_sub_profiles;
+	u32 sub_profile_idc[255];
+
+	u8 gci_present;
+	//holds 81 bits, the last byte contains the remainder (low bit set, not high)
+	u8 gci[12];
+} VVC_ProfileTierLevel;
+
+typedef struct
+{
+	s32 id;
+	u8 state;
+
+	HEVC_RateInfo rates[8];
+	u32 max_layers, max_sub_layers;
+	Bool all_layers_independent, each_layer_is_ols;
+	u32 max_layer_id; //, num_layer_sets;
+
+	u16 num_ptl; //max 256
+	VVC_ProfileTierLevel ptl[256];
+} VVC_VPS;
+
+typedef struct
+{
+	u8 nal_unit_type;
+	u32 frame_num, poc_lsb, slice_type;
+
+	u8 poc_msb_cycle_present_flag;
+	s32 poc;
+	u32 poc_msb, poc_msb_cycle, poc_msb_prev, poc_lsb_prev, frame_num_prev;
+
+	VVC_SPS *sps;
+	VVC_PPS *pps;
+
+	u8 picture_header_in_slice_header_flag, inter_slice_allowed_flag, intra_slice_allowed_flag;
+	u8 irap_or_gdr_pic;
+	u8 non_ref_pic;
+	u8 gdr_pic;
+	u32 gdr_recovery_count;
+	u8 recovery_point_valid, lmcs_enabled_flag, explicit_scaling_list_enabled_flag, temporal_mvp_enabled_flag;
+
+	u8 prev_layer_id_plus1;
+	u8 compute_poc_defer;
+
+	//picture header RPL state
+	VVC_RefPicList ph_rpl[2];
+	s32 ph_rpl_idx[2];
+
+	//slive RPL state
+	VVC_RefPicList rpl[2];
+	s32 rpl_idx[2];
+
+	//slice header size in bytes
+	u32 payload_start_offset;
+} VVCSliceInfo;
+
+/*TODO once we add HLS parsing (FDIS) */
+typedef struct _vvc_state
+{
+	s8 sps_active_idx;	/*currently active sps; must be initalized to -1 in order to discard not yet decodable SEIs*/
+
+	//-1 or the value of the vps/sps/pps ID of the nal just parsed
+	s32 last_parsed_vps_id;
+	s32 last_parsed_sps_id;
+	s32 last_parsed_pps_id;
+	s32 last_parsed_aps_id;
+
+	VVC_SPS sps[16];
+	VVC_PPS pps[64];
+	VVC_VPS vps[16];
+
+	VVCSliceInfo s_info;
+
+	//0: minimal parsing, used by most tools. Slice header and picture header are skipped
+	//1: full parsing, error check: used to retrieve end of slice header
+	//2: full parsing, no error check (used by dumpers)
+	u32 parse_mode;
+
+
+	u8 clli_data[4];
+	u8 mdcv_data[24];
+	u8 clli_valid, mdcv_valid;
+} VVCState;
+
+s32 gf_vvc_parse_nalu_bs(GF_BitStream *bs, VVCState *vvc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id);
+void gf_vvc_parse_sei(char* buffer, u32 nal_size, VVCState *vvc);
+Bool gf_vvc_slice_is_ref(VVCState *vvc);
+s32 gf_vvc_parse_nalu(u8 *data, u32 size, VVCState *vvc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id);
+
+void gf_vvc_parse_ps(GF_VVCConfig* hevccfg, VVCState* vvc, u32 nal_type);
+
+
+GF_Err gf_media_parse_ivf_file_header(GF_BitStream *bs, u32 *width, u32*height, u32 *codec_fourcc, u32 *timebase_num, u32 *timebase_den, u32 *num_frames);
 
 
 
 #define VP9_MAX_FRAMES_IN_SUPERFRAME 16
 
-GF_Err gf_media_vp9_parse_sample(GF_BitStream *bs, GF_VPConfig *vp9_cfg, Bool *key_frame, u32 *FrameWidth, u32 *FrameHeight, u32 *renderWidth, u32 *renderHeight);
-GF_Err gf_media_vp9_parse_superframe(GF_BitStream *bs, u64 ivf_frame_size, u32 *num_frames_in_superframe, u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME], u32 *superframe_index_size);
+GF_Err gf_vp9_parse_sample(GF_BitStream *bs, GF_VPConfig *vp9_cfg, Bool *key_frame, u32 *FrameWidth, u32 *FrameHeight, u32 *renderWidth, u32 *renderHeight);
+GF_Err gf_vp9_parse_superframe(GF_BitStream *bs, u64 ivf_frame_size, u32 *num_frames_in_superframe, u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME], u32 *superframe_index_size);
 
 
 
@@ -616,7 +898,7 @@
 	Bool mem_mode;
 	/*bitstream object for mem mode - this bitstream is NOT destroyed by gf_av1_reset_state(state, GF_TRUE) */
 	GF_BitStream *bs;
-	Bool bs_overread, unframed;
+	Bool unframed;
 	u8 *frame_obus;
 	u32 frame_obus_alloc;
 
@@ -626,6 +908,7 @@
 	Bool decoder_model_info_present_flag;
 	u16 OperatingPointIdc;
 	u32 width, height, UpscaledWidth;
+	u32 sequence_width, sequence_height;
 	u32 tb_num, tb_den;
 
 	Bool use_128x128_superblock;
@@ -679,21 +962,40 @@
 	AV1GMParams SavedGmParams[AV1_NUM_REF_FRAMES];
 	u8 RefFrameType[AV1_NUM_REF_FRAMES];
 
+	u32 RefUpscaledWidth[AV1_NUM_REF_FRAMES];
+	u32 RefFrameHeight[AV1_NUM_REF_FRAMES];
+
 	/*frame parsing state*/
 	AV1StateFrame frame_state;
+
+	/*layer sizes for AVIF a1lx*/
+	u32 layer_size[4];
+
+
+	u8 clli_data[4];
+	u8 mdcv_data[24];
+	u8 clli_valid, mdcv_valid;
+
 } AV1State;
 
 GF_Err aom_av1_parse_temporal_unit_from_section5(GF_BitStream *bs, AV1State *state);
 GF_Err aom_av1_parse_temporal_unit_from_annexb(GF_BitStream *bs, AV1State *state);
 GF_Err aom_av1_parse_temporal_unit_from_ivf(GF_BitStream *bs, AV1State *state);
 
+/*may return GF_BUFFER_TOO_SMALL if not enough bytes*/
 GF_Err gf_media_parse_ivf_frame_header(GF_BitStream *bs, u64 *frame_size, u64 *pts);
 
 Bool gf_media_probe_ivf(GF_BitStream *bs);
 Bool gf_media_aom_probe_annexb(GF_BitStream *bs);
 
-/*parses one OBU*/
-GF_Err gf_media_aom_av1_parse_obu(GF_BitStream *bs, ObuType *obu_type, u64 *obu_size, u32 *obu_hdr_size, AV1State *state);
+/*parses one OBU
+\param bs bitstream object
+\param obu_type OBU type
+\param obu_size As an input the size of the input OBU (needed when obu_size is not coded). As an output the coded obu_size value.
+\param obu_hdr_size OBU header size
+\param state the frame parser
+*/
+GF_Err gf_av1_parse_obu(GF_BitStream *bs, ObuType *obu_type, u64 *obu_size, u32 *obu_hdr_size, AV1State *state);
 
 Bool av1_is_obu_header(ObuType obu_type);

gpac-1.0.1.tar.gz/include/gpac/internal/mesh.h -> gpac-2.0.0.tar.gz/include/gpac/internal/mesh.h Changed

gpac-1.0.1.tar.gz/include/gpac/internal/odf_parse_common.h -> gpac-2.0.0.tar.gz/include/gpac/internal/odf_parse_common.h Changed

gpac-1.0.1.tar.gz/include/gpac/internal/scenegraph_dev.h -> gpac-2.0.0.tar.gz/include/gpac/internal/scenegraph_dev.h Changed

@@ -280,6 +280,7 @@
 
 	u32 (*get_element_class)(GF_Node *n);
 	u32 (*get_document_class)(GF_SceneGraph *n);
+	struct __gf_filter_session *attached_session;
 #endif
 };
 
@@ -305,8 +306,10 @@
 struct _route
 {
 	u8 is_setup;
-	/*set to true for proto IS fields*/
+	/*set to 1 for proto IS fields*/
 	u8 IS_route;
+	/*set to 1 for JS route to fun*/
+	u8 script_route;
 
 	u32 ID;
 	char *name;
@@ -496,7 +499,7 @@
 	/*Prototype interface for coding and field addressing*/
 	GF_Proto *proto_interface;
 
-	/*proto implementation at run-time (aka the state of the nodes may differ accross
+	/*proto implementation at run-time (aka the state of the nodes may differ across
 	different instances of the proto)*/
 	GF_List *fields;
 
@@ -677,7 +680,7 @@
 	SMIL_Interval *current_interval;
 	SMIL_Interval *next_interval;
 
-	/* Evaluation of animations is postponed untill tree traversal, so that inherit values can be computed
+	/* Evaluation of animations is postponed until tree traversal, so that inherit values can be computed
 	Other timed elements (audio, video, animation) are evaluated directly and do not require
 	scene tree traversal.*/
 	Bool postpone;
@@ -942,7 +945,7 @@
 GF_DOMHandler *gf_dom_listener_build_ex(GF_Node *node, u32 event_type, u32 event_parameter, GF_Node *handler, GF_Node **out_listener);
 
 void	gf_dom_event_dump_listeners(GF_Node *n, FILE *f);
-void	gf_dom_event_remove_all_listeners(GF_DOMEventTarget *event_target);
+void	gf_dom_event_remove_all_listeners(GF_DOMEventTarget *event_target, GF_SceneGraph *sg);
 void	gf_dom_event_target_del(GF_DOMEventTarget *target);
 GF_Err	gf_dom_event_remove_listener_from_parent(GF_DOMEventTarget *event_target, GF_Node *listener);

gpac-1.0.1.tar.gz/include/gpac/internal/swf_dev.h -> gpac-2.0.0.tar.gz/include/gpac/internal/swf_dev.h Changed

gpac-1.0.1.tar.gz/include/gpac/isomedia.h -> gpac-2.0.0.tar.gz/include/gpac/isomedia.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -142,8 +142,16 @@
 	GF_ISOM_REF_LYRA = GF_4CC( 'l', 'y', 'r', 'a' ),
 	/*! File Delivery Item Information Extension */
 	GF_ISOM_REF_FDEL = GF_4CC( 'f', 'd', 'e', 'l' ),
+#ifdef GF_ENABLE_CTRN
 	/*! Track fragment inherit */
 	GF_ISOM_REF_TRIN = GF_4CC( 't', 'r', 'i', 'n' ),
+#endif
+
+	/*! Item auxiliary reference */
+	GF_ISOM_REF_AUXR = GF_4CC( 'a', 'u', 'x', 'r' ),
+
+	/*! ref type for the VVC subpicture tracks*/
+	GF_ISOM_REF_SUBPIC = GF_4CC( 's', 'u', 'b', 'p' ),
 };
 
 /*! Track Edit list type*/
@@ -226,6 +234,12 @@
 	GF_ISOM_SUBTYPE_LHE1			= GF_4CC( 'l', 'h', 'e', '1' ),
 	GF_ISOM_SUBTYPE_HVT1			= GF_4CC( 'h', 'v', 't', '1' ),
 
+	/*VVC media types*/
+	GF_ISOM_SUBTYPE_VVC1			= GF_4CC( 'v', 'v', 'c', '1' ),
+	GF_ISOM_SUBTYPE_VVI1			= GF_4CC( 'v', 'v', 'i', '1' ),
+	GF_ISOM_SUBTYPE_VVS1			= GF_4CC( 'v', 'v', 's', '1' ),
+	GF_ISOM_SUBTYPE_VVCN			= GF_4CC( 'v', 'v', 'c', 'N' ),
+
 	/*AV1 media type*/
 	GF_ISOM_SUBTYPE_AV01 = GF_4CC('a', 'v', '0', '1'),
 
@@ -240,6 +254,10 @@
 
 	/* Dolby Vision */
 	GF_ISOM_SUBTYPE_DVHE = GF_4CC('d', 'v', 'h', 'e'),
+	GF_ISOM_SUBTYPE_DVH1 = GF_4CC('d', 'v', 'h', '1'),
+	GF_ISOM_SUBTYPE_DVA1 = GF_4CC('d', 'v', 'a', '1'),
+	GF_ISOM_SUBTYPE_DVAV = GF_4CC('d', 'v', 'a', 'v'),
+	GF_ISOM_SUBTYPE_DAV1 = GF_4CC('d', 'a', 'v', '1'),
 
 	/*3GPP(2) extension subtypes*/
 	GF_ISOM_SUBTYPE_3GP_H263	= GF_4CC( 's', '2', '6', '3' ),
@@ -255,6 +273,8 @@
 	GF_ISOM_SUBTYPE_AC3			= GF_4CC( 'a', 'c', '-', '3' ),
 	GF_ISOM_SUBTYPE_EC3			= GF_4CC( 'e', 'c', '-', '3' ),
 	GF_ISOM_SUBTYPE_MP3			= GF_4CC( '.', 'm', 'p', '3' ),
+	GF_ISOM_SUBTYPE_MLPA		= GF_4CC( 'm', 'l', 'p', 'a' ),
+
 	GF_ISOM_SUBTYPE_MP4A		= GF_4CC( 'm', 'p', '4', 'a' ),
 	GF_ISOM_SUBTYPE_MP4S		= GF_4CC( 'm', 'p', '4', 's' ),
 
@@ -300,6 +320,7 @@
 	GF_ISOM_SUBTYPE_RICC 		= GF_4CC( 'r', 'I', 'C', 'C' ),
 
 	/* QT audio codecs */
+	//this one is also used for 24bit RGB
 	GF_QT_SUBTYPE_RAW	= GF_4CC('r','a','w',' '),
 	GF_QT_SUBTYPE_TWOS 	= GF_4CC('t','w','o','s'),
 	GF_QT_SUBTYPE_SOWT 	= GF_4CC('s','o','w','t'),
@@ -325,11 +346,27 @@
 	GF_QT_SUBTYPE_APCS	= GF_4CC( 'a', 'p', 'c', 's' ),
 	GF_QT_SUBTYPE_AP4X	= GF_4CC( 'a', 'p', '4', 'x' ),
 	GF_QT_SUBTYPE_AP4H	= GF_4CC( 'a', 'p', '4', 'h' ),
-	GF_QT_SUBTYPE_YUV422 	= GF_4CC('y','u','v','2'),
-//	GF_QT_SUBTYPE_YUV422 	= GF_4CC('2','v','u','Y'),
-	GF_QT_SUBTYPE_YUV444 	= GF_4CC('v','3','0','8'),
-	GF_QT_SUBTYPE_YUV422_10 	= GF_4CC('v','2','1','0'),
-	GF_QT_SUBTYPE_YUV444_10 	= GF_4CC('v','4','1','0'),
+	GF_QT_SUBTYPE_YUYV = GF_4CC('y','u','v','2'),
+	GF_QT_SUBTYPE_UYVY = GF_4CC('2','v','u','y'),
+	GF_QT_SUBTYPE_YUV444 = GF_4CC('v','3','0','8'),
+	GF_QT_SUBTYPE_YUVA444 = GF_4CC('v','4','0','8'),
+	GF_QT_SUBTYPE_YUV422_10 = GF_4CC('v','2','1','0'),
+	GF_QT_SUBTYPE_YUV444_10 = GF_4CC('v','4','1','0'),
+	GF_QT_SUBTYPE_YUV422_16 = GF_4CC('v','2','1','6'),
+	GF_QT_SUBTYPE_YUV420 = GF_4CC('j','4','2','0'),
+	GF_QT_SUBTYPE_I420 = GF_4CC('I','4','2','0'),
+	GF_QT_SUBTYPE_IYUV = GF_4CC('I','Y','U','V'),
+	GF_QT_SUBTYPE_YV12 = GF_4CC('y','v','1','2'),
+	GF_QT_SUBTYPE_YVYU = GF_4CC('Y','V','Y','U'),
+	GF_QT_SUBTYPE_RGBA = GF_4CC('R','G','B','A'),
+	GF_QT_SUBTYPE_ABGR = GF_4CC('A','B','G','R'),
+
+	GF_ISOM_SUBTYPE_FFV1		= GF_4CC( 'F', 'F', 'V', '1' ),
+
+	GF_ISOM_ITEM_TYPE_AUXI 	= GF_4CC('a', 'u', 'x', 'i'),
+
+	GF_QT_SUBTYPE_TMCD = GF_4CC( 't', 'm', 'c', 'd' ),
+
 };
 
 
@@ -388,11 +425,14 @@
 	/*file complying to the generic ISO Media File (base specification ISO/IEC 14496-12) + support for version 1*/
 	GF_ISOM_BRAND_ISO4 = GF_4CC( 'i', 's', 'o', '4' ),
 	/* Image File Format */
+	GF_ISOM_BRAND_HEIF = GF_4CC('h', 'e', 'i', 'f'),
 	GF_ISOM_BRAND_MIF1 = GF_4CC('m', 'i', 'f', '1'),
 	GF_ISOM_BRAND_HEIC = GF_4CC('h', 'e', 'i', 'c'),
 	GF_ISOM_BRAND_HEIM = GF_4CC('h', 'e', 'i', 'm'),
 	GF_ISOM_BRAND_AVIF = GF_4CC('a', 'v', 'i', 'f'),
 	GF_ISOM_BRAND_AVCI = GF_4CC('a', 'v', 'c', 'i'),
+	GF_ISOM_BRAND_VVIC = GF_4CC('v', 'v', 'i', 'c'),
+
 	/*other iso media brands */
 	GF_ISOM_BRAND_ISO1 = GF_4CC( 'i', 's', 'o', '1' ),
 	GF_ISOM_BRAND_ISO3 = GF_4CC( 'i', 's', 'o', '3' ),
@@ -444,6 +484,10 @@
 	/* Subsegment Index Segment used to index MPEG-2 TS based Media Segments */
 	GF_ISOM_BRAND_SSSS = GF_4CC('s','s','s','s'),
 
+	/* CMAF brand */
+	GF_ISOM_BRAND_CMFC = GF_4CC('c','m','f','c'),
+	/* CMAF brand with neg ctts */
+	GF_ISOM_BRAND_CMF2 = GF_4CC('c','m','f','2'),
 
 	/* from ismacryp.c */
 	/* OMA DCF DRM Format 2.0 (OMA-TS-DRM-DCF-V2_0-20060303-A) */
@@ -451,6 +495,10 @@
 	/* OMA PDCF DRM Format 2.1 (OMA-TS-DRM-DCF-V2_1-20070724-C) */
 	GF_ISOM_BRAND_OPF2 = GF_4CC('o','p','f','2'),
 
+	/* compressed brand*/
+	GF_ISOM_BRAND_COMP = GF_4CC( 'c', 'o', 'm', 'p' ),
+	GF_ISOM_BRAND_ISOC = GF_4CC( 'i', 's', 'o', 'C' ),
+
 };
 
 /*! sample roll information type*/
@@ -530,9 +578,8 @@
 \return the newly allocated ISO sample*/
 GF_ISOSample *gf_isom_sample_new();
 
-/*! delete a sample. NOTE:the buffer content will be destroyed by default.
-if you wish to keep the buffer, set dataLength to 0 in the sample
-before deleting it
+/*! delete a sample.
+\note The buffer content will be destroyed by default. If you wish to keep the buffer, set dataLength to 0 in the sample before deleting it
 the pointer is set to NULL after deletion
 \param samp pointer to the target ISO sample
 */
@@ -565,6 +612,10 @@
 	GF_ISOM_WRITE_EDIT,
 	/*! Opens an existing file and keep fragment information*/
 	GF_ISOM_OPEN_KEEP_FRAGMENTS,
+	/*! Opens an existing file in READ ONLY mode but enables most of the file edit functions except fragmentation
+	Samples may be added to the file in this mode, they will be stored in memory
+	*/
+	GF_ISOM_OPEN_READ_EDIT,
 } GF_ISOOpenMode;
 
 /*! indicates if target file is an IsoMedia file
@@ -592,8 +643,7 @@
 If fileName is NULL data will be written in memory ; write with gf_isom_write() ; use gf_isom_get_bs() to get the data ; use gf_isom_delete() to delete the internal data.
 \param fileName name of the file to open, , gmem:// or gfio:// resource. The special name "_gpac_isobmff_redirect" is used to indicate that segment shall be written to a memory buffer passed to callback function set through \ref gf_isom_set_write_callback.
 \param OpenMode file opening mode
-\param tmp_dir for the 2 edit modes only, specifies a location for temp file. If NULL, the library will use the default
-OS temporary file management schemes.
+\param tmp_dir for the 2 edit modes only, specifies a location for temp file. If NULL, the library will use the default libgpac temporary file management schemes.
 \return the created ISO file if no error
 */
 GF_ISOFile *gf_isom_open(const char *fileName, GF_ISOOpenMode OpenMode, const char *tmp_dir);
@@ -611,7 +661,7 @@
 
 /*! gets the last fatal error that occured in the file
 ANY FUNCTION OF THIS API WON'T BE PROCESSED IF THE FILE HAS AN ERROR
-Note: some function may return an error while the movie has no error
+\note Some function may return an error while the movie has no error
 the last error is a FatalError, and is not always set if a bad
 param is specified...
 \param isom_file the target ISO file
@@ -678,7 +728,7 @@
 
 /*! when reading a file, indicates that file data is missing the indicated bytes
 \param isom_file the target ISO file
-\param byte_offset number of bytes not present at the begining of the file
+\param byte_offset number of bytes not present at the beginning of the file
 \return error if any
 */
 GF_Err gf_isom_set_byte_offset(GF_ISOFile *isom_file, s64 byte_offset);
@@ -764,6 +814,16 @@
 */
 GF_Err gf_isom_get_creation_time(GF_ISOFile *isom_file, u64 *creationTime, u64 *modificationTime);
 
+
+/*! gets the creation info of the movie
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param creationTime set to the creation time of the movie
+\param modificationTime set to the modification time of the movie
+\return error if any
+*/
+GF_Err gf_isom_get_track_creation_time(GF_ISOFile *isom_file, u32 trackNumber, u64 *creationTime, u64 *modificationTime);
+
 /*! gets the ID of a track
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -837,11 +897,11 @@
 \return the sample description index, or 0 if error or if empty*/
 u32 gf_isom_get_sample_description_index(GF_ISOFile *isom_file, u32 trackNumber, u64 for_time);
 
-/*! checks if a sample stream descritpion is self-contained (samples located in the file)
+/*! checks if a sample stream description is self-contained (samples located in the file)
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param sampleDescriptionIndex the target sample description index (1-based)
-\return GF_TRUE if samples refering to the given stream description are present in the file, GF_FALSE otherwise*/
+\return GF_TRUE if samples referring to the given stream description are present in the file, GF_FALSE otherwise*/
 Bool gf_isom_is_self_contained(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
 /*! gets the media duration (without edit) based on sample table
@@ -943,7 +1003,7 @@
 /*! sets sample padding bytes when reading a sample
 It may be desired to fetch samples with a bigger allocated buffer than their real size, in case the decoder
 reads more data than available. This sets the amount of extra bytes to allocate when reading samples from this track
-NOTE: the dataLength of the sample does NOT include padding
+\note The dataLength of the sample does NOT include padding
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param padding_bytes the amount of bytes to add at the end of a sample data buffer
@@ -981,7 +1041,7 @@
 \param sampleNumber the desired sample number (1-based index)
 \param sampleDescriptionIndex set to the sample description index corresponding to this sample (optional, can be NULL)
 \param data_offset set to the sample start offset in file (optional, can be NULL)
-\note: when both sampleDescriptionIndex and data_offset are NULL, only DTS, CTS_Offset and RAP indications are retrieved (faster)
+\note When both sampleDescriptionIndex and data_offset are NULL, only DTS, CTS_Offset and RAP indications are retrieved (faster)
 \return the ISO sample without data or NULL if not found or end of stream or incomplete file. Use \ref gf_isom_last_error to check the error code
 */
 GF_ISOSample *gf_isom_get_sample_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex, u64 *data_offset);
@@ -992,7 +1052,7 @@
 \param sampleNumber the desired sample number (1-based index)
 \param sampleDescriptionIndex set to the sample description index corresponding to this sample (optional, can be NULL)
 \param data_offset set to the sample start offset in file (optional, can be NULL)
-\note: when both sampleDescriptionIndex and data_offset are NULL, only DTS, CTS_Offset and RAP indications are retrieved (faster)
+\note When both sampleDescriptionIndex and data_offset are NULL, only DTS, CTS_Offset and RAP indications are retrieved (faster)
 \param static_sample a caller-allocated ISO sample to use as the returned sample
 \return the ISO sample without data or NULL if not found or end of stream or incomplete file. Use \ref gf_isom_last_error to check the error code
 \note If the function returns NULL, the static_sample and its associated data if any are NOT destroyed
@@ -1068,7 +1128,7 @@
 
 /*! gets a sample given a desired decoding time and set the sampleDescriptionIndex of this sample
 
-WARNING: the sample may not be sync even though the sync was requested (depends on the media and the editList)
+\warning The sample may not be sync even though the sync was requested (depends on the media and the editList)
 the SampleNum is optional. If non-NULL, will contain the sampleNumber
 
 \param isom_file the target ISO file
@@ -1092,6 +1152,16 @@
 */
 u32 gf_isom_get_sample_from_dts(GF_ISOFile *isom_file, u32 trackNumber, u64 dts);
 
+
+/*! enumerates the type and references IDs of a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param idx 0-based index of reference to query
+\param referenceType set to the four character code of the reference entry
+\param referenceCount set to the number of track ID references for the reference entry
+\return list of track IDs, NULL if no references - do NOT modify !*/
+const GF_ISOTrackID *gf_isom_enum_track_references(GF_ISOFile *isom_file, u32 trackNumber, u32 idx, u32 *referenceType, u32 *referenceCount);
+
 /*! get the number of track references of a track for a given ReferenceType
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -1132,9 +1202,9 @@
 if no sample is playing, an empty sample is returned with no data and a DTS set to MovieTime when searching in sync modes
 if no sample is playing, the closest sample in the edit time-line is returned when searching in regular modes
 
-WARNING: the sample may not be sync even though the sync was requested (depends on the media and the editList)
+\warning The sample may not be sync even though the sync was requested (depends on the media and the editList)
 
-Note: this function will handle re-timestamping the sample according to the mapping of the media time-line
+\note This function will handle re-timestamping the sample according to the mapping of the media time-line
 on the track time-line. The sample TSs (DTS / CTS offset) are expressed in MEDIA TIME SCALE
 (to match the media stream TS resolution as indicated in media header / SLConfig)
 
@@ -1416,6 +1486,64 @@
 \return error if any*/
 GF_Err gf_isom_get_color_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *colour_type, u16 *colour_primaries, u16 *transfer_characteristics, u16 *matrix_coefficients, Bool *full_range_flag);
 
+
+/*! gets clean aperture (crop window, see ISO/IEC 14496-12) for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\param cleanApertureWidthN set to nominator of clean aperture horizontal size, may be NULL
+\param cleanApertureWidthD set to denominator of clean aperture horizontal size, may be NULL
+\param cleanApertureHeightN set to nominator of clean aperture vertical size, may be NULL
+\param cleanApertureHeightD set to denominator of clean aperture vertical size, may be NULL
+\param horizOffN set to nominator of horizontal offset of clean aperture center minus (width-1)/2 (eg 0 sets center to center of video), may be NULL
+\param horizOffD set to denominator of horizontal offset of clean aperture center minus (width-1)/2 (eg 0 sets center to center of video), may be NULL
+\param vertOffN set to nominator of vertical offset of clean aperture center minus (height-1)/2 (eg 0 sets center to center of video), may be NULL
+\param vertOffD set to denominator of vertical offset of clean aperture center minus (height-1)/2 (eg 0 sets center to center of video), may be NULL
+\return error if any
+*/
+GF_Err gf_isom_get_clean_aperture(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *cleanApertureWidthN, u32 *cleanApertureWidthD, u32 *cleanApertureHeightN, u32 *cleanApertureHeightD, s32 *horizOffN, u32 *horizOffD, s32 *vertOffN, u32 *vertOffD);
+
+/*! content light level info*/
+typedef struct {
+	/*! max content ligth level*/
+	u16 max_content_light_level;
+	/*! max picture average ligth level*/
+	u16 max_pic_average_light_level;
+} GF_ContentLightLevelInfo;
+
+/*! mastering display colour volume info*/
+typedef struct {
+	/*! display primaries*/
+	struct {
+		u16 x;
+		u16 y;
+	} display_primaries[3];
+	/*! X white point*/
+	u16 white_point_x;
+	/*! Y white point*/
+	u16 white_point_y;
+	u32 max_display_mastering_luminance;
+	/*! min display mastering luminance*/
+	u32 min_display_mastering_luminance;
+} GF_MasteringDisplayColourVolumeInfo;
+
+/*! gets master display colour info if any
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\return the mdcv info, or NULL if none or not a valid video track
+*/
+const GF_MasteringDisplayColourVolumeInfo *gf_isom_get_mastering_display_colour_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets content light level info if any
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\return the clli info, or NULL if none or not a valid video track
+*/
+const GF_ContentLightLevelInfo *gf_isom_get_content_light_level_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+
 /*! gets the media language code of a track
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -1446,6 +1574,14 @@
 */
 u64 gf_isom_get_track_magic(GF_ISOFile *isom_file, u32 trackNumber);
 
+/*! gets track group ID of a given track group type for this track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param track_group_type the target track group type
+\return the track group ID, 0 if not found
+*/
+u32 gf_isom_get_track_group(GF_ISOFile *isom_file, u32 trackNumber, u32 track_group_type);
+
 /*! checks if file is a single AV file with max one audio, one video, one text and basic od/bifs
 \param isom_file the target ISO file
 \return GF_TRUE if file is single AV, GF_FALSE otherwise
@@ -1533,7 +1669,6 @@
 */
 GF_Err gf_isom_purge_samples(GF_ISOFile *isom_file, u32 trackNumber, u32 nb_samples);
 
-
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
 /*! dumps file structures into XML trace file
@@ -1548,6 +1683,40 @@
 #endif /*GPAC_DISABLE_ISOM_DUMP*/
 
 
+/*! gets number of chunks in track
+\param isom_file the target ISO file
+\param trackNumber the desired track to purge
+\return number of chunks in track
+*/
+u32 gf_isom_get_chunk_count(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets info for a given chunk in track
+\param isom_file the target ISO file
+\param trackNumber the desired track to purge
+\param chunkNumber the 1-based index of the desired chunk
+\param chunk_offset set to the chunk offset in bytes from start of file
+\param first_sample_num set to the sample number of the first sample in the chunk
+\param sample_per_chunk set to number of samples per chunk
+\param sample_desc_idx set to sample desc index of samples of this chunk
+\param cache_1 updated by function at each call. May be NULL (slower). Must be set to 0 if not querying consecutive chunks
+\param cache_2 updated by function at each call. May be NULL (slower). Must be set to 0 if not querying consecutive chunks
+\return error if any
+*/
+GF_Err gf_isom_get_chunk_info(GF_ISOFile *isom_file, u32 trackNumber, u32 chunkNumber, u64 *chunk_offset, u32 *first_sample_num, u32 *sample_per_chunk, u32 *sample_desc_idx, u32 *cache_1, u32 *cache_2);
+
+
+/*! gets the file offset of the first usable byte of the first mdat box in the file
+\param isom_file the target ISO file
+\return byte offset
+*/
+u64 gf_isom_get_first_mdat_start(GF_ISOFile *isom_file);
+
+/*! gets the size of all skip, free and wide boxes present in the file and bytes skipped during parsing (assumes a single file was opened)
+\param isom_file the target ISO file
+\return size
+*/
+u64 gf_isom_get_unused_box_bytes(GF_ISOFile *isom_file);
+
 /*! @} */
 
 
@@ -1600,6 +1769,12 @@
 */
 void gf_isom_keep_utc_times(GF_ISOFile *isom_file, Bool keep_utc);
 
+/*! Checks if UTC keeping is enabled
+\param isom_file the target ISO file
+\return GF_TRUE if UTC keeping is enabled
+*/
+Bool gf_isom_has_keep_utc_times(GF_ISOFile *isom_file);
+
 /*! sets the timescale of the movie. This rescales times expressed in movie timescale in edit lists and mvex boxes
 \param isom_file the target ISO file
 \param timeScale the target timescale
@@ -1636,7 +1811,7 @@
 u32 gf_isom_new_track_from_template(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u32 MediaType, u32 TimeScale, u8 *tk_box, u32 tk_box_size, Bool udta_only);
 
 /*! removes a track - internal cross dependencies will be updated.
-WARNING: any OD streams with references to this track through ODUpdate, ESDUpdate, ESDRemove commands
+\warning Any OD streams with references to this track through ODUpdate, ESDUpdate, ESDRemove commands
 will be rewritten
 \param isom_file the target ISO file
 \param trackNumber the target track to remove file
@@ -1656,13 +1831,27 @@
 typedef enum
 {
 	/*! set flags, erasing previous value*/
-	GF_ISOM_TKFLAGS_SET = 0,
+	GF_ISOM_TKFLAGS_SET = 1,
 	/*! add flags*/
 	GF_ISOM_TKFLAGS_REM,
 	/*! remove flags*/
 	GF_ISOM_TKFLAGS_ADD,
 } GF_ISOMTrackFlagOp;
 
+
+/*! Track header flags*/
+enum
+{
+	/*! track is enabled */
+	GF_ISOM_TK_ENABLED = 1,
+	/*! track is in regular presentation*/
+	GF_ISOM_TK_IN_MOVIE = 1<<1,
+	/*! track is in preview*/
+	GF_ISOM_TK_IN_PREVIEW = 1<<2,
+	/*! track size is an aspect ratio indicator only*/
+	GF_ISOM_TK_SIZE_IS_AR = 1<<3
+};
+
 /*! toggles track flags on or off
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -1672,20 +1861,31 @@
 */
 GF_Err gf_isom_set_track_flags(GF_ISOFile *isom_file, u32 trackNumber, u32 flags, GF_ISOMTrackFlagOp op);
 
-/*! sets creationTime and modificationTime of the movie to the specified date
+/*! sets creationTime and modificationTime of the movie to the specified dates (no validty check)
+\param isom_file the target ISO file
+\param create_time the new creation time
+\param modif_time the new modification time
+\return error if any
+*/
+GF_Err gf_isom_set_creation_time(GF_ISOFile *isom_file, u64 create_time, u64 modif_time);
+
+/*! sets creationTime and modificationTime of the track to the specified dates
 \param isom_file the target ISO file
-\param time the new time
+\param trackNumber the target track
+\param create_time the new creation time
+\param modif_time the new modification time
 \return error if any
 */
-GF_Err gf_isom_set_creation_time(GF_ISOFile *isom_file, u64 time);
+GF_Err gf_isom_set_track_creation_time(GF_ISOFile *isom_file, u32 trackNumber, u64 create_time, u64 modif_time);
 
-/*! sets creationTime and modificationTime of the track to the specified date
+/*! sets creationTime and modificationTime of the track media header to the specified dates
 \param isom_file the target ISO file
 \param trackNumber the target track
-\param time the new time
+\param create_time the new creation time
+\param modif_time the new modification time
 \return error if any
 */
-GF_Err gf_isom_set_track_creation_time(GF_ISOFile *isom_file,u32 trackNumber, u64 time);
+GF_Err gf_isom_set_media_creation_time(GF_ISOFile *isom_file, u32 trackNumber, u64 create_time, u64 modif_time);
 
 /*! changes the ID of a track - all track references present in the file are updated
 \param isom_file the target ISO file
@@ -1787,7 +1987,7 @@
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param referenceType the four character code of the reference
-\param ReferencedTrackID the ID of the track refered to
+\param ReferencedTrackID the ID of the track referred to
 \return error if any
 */
 GF_Err gf_isom_set_track_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 referenceType, GF_ISOTrackID ReferencedTrackID);
@@ -1799,6 +1999,21 @@
 */
 GF_Err gf_isom_remove_track_references(GF_ISOFile *isom_file, u32 trackNumber);
 
+/*! removes any track reference poiting to a non-existing track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_purge_track_reference(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! removes all track references of a given type
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param ref_type the reference type to remove
+\return error if any
+*/
+GF_Err gf_isom_remove_track_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 ref_type);
+
 /*! sets track handler name.
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -1850,16 +2065,35 @@
 */
 GF_Err gf_isom_remove_sample(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber);
 
+
 /*! changes media time scale
 
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param new_timescale the new timescale to set
 \param new_tsinc if not 0, changes sample duration and composition offsets to new_tsinc/new_timescale. If non-constant sample dur is used, uses the samllest sample dur in the track. Otherwise, only changes the timescale
-\param force_rescale if set to GF_TRUE, only the media timescale is changed but media times are not updated. Ignored if new_tsinc is not 0.
+\param force_rescale_type type fo rescaling, Ignored if new_tsinc is not 0:
+ - if set to 0, rescale timings.
+ - if set to 1, only the media timescale is changed but media times are not updated.
+ - if set to 2, media timescale is updated if new_timescale is set, and all sample durations are set to new_tsinc
 \return GF_EOS if no action taken (same config), or error if any
 */
-GF_Err gf_isom_set_media_timescale(GF_ISOFile *isom_file, u32 trackNumber, u32 new_timescale, u32 new_tsinc, Bool force_rescale);
+GF_Err gf_isom_set_media_timescale(GF_ISOFile *isom_file, u32 trackNumber, u32 new_timescale, u32 new_tsinc, u32 force_rescale_type);
+
+
+
+/*! adds sample auxiliary data
+
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the sample number. Must be equal or larger to last auxiliary
+\param aux_type auxiliary sample data type, shall not be 0
+\param aux_info auxiliary sample data specific info type, may be 0
+\param data data to add
+\param size size of data to add
+\return error if any
+*/
+GF_Err gf_isom_add_sample_aux_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 aux_type, u32 aux_info, u8 *data, u32 size);
 
 /*! sets the save file name of the (edited) movie.
 If the movie is edited, the default fileName is the open name suffixed with an internally defined extension "%p_isotmp")"
@@ -1897,26 +2131,35 @@
 typedef enum
 {
 	/*! no compression is used*/
-	GF_ISO_COMP_NONE=0,
+	GF_ISOM_COMP_NONE=0,
 	/*! only moov box is compressed*/
-	GF_ISO_COMP_MOOV,
+	GF_ISOM_COMP_MOOV,
 	/*! only moof boxes are compressed*/
-	GF_ISO_COMP_MOOF,
+	GF_ISOM_COMP_MOOF,
 	/*! only moof and sidx boxes are compressed*/
-	GF_ISO_COMP_MOOF_SIDX,
+	GF_ISOM_COMP_MOOF_SIDX,
 	/*! only moof, sidx and ssix boxes are compressed*/
-	GF_ISO_COMP_MOOF_SSIX,
+	GF_ISOM_COMP_MOOF_SSIX,
 	/*! all (moov, moof, sidx and ssix) boxes are compressed*/
-	GF_ISO_COMP_ALL,
+	GF_ISOM_COMP_ALL,
 } GF_ISOCompressMode;
 
+enum
+{
+	/*! forces compressed box even if compress size is larger than uncompressed size*/
+	GF_ISOM_COMP_FORCE_ALL	=	0x01,
+	/*! wraps ftyp in otyp*/
+	GF_ISOM_COMP_WRAP_FTYPE	=	0x02,
+};
+
+
 /*! sets compression mode of file
 \param isom_file the target ISO file
 \param compress_mode the desired compress mode
-\param force_compress forces compressed box even if compress size is larger than uncompressed size
+\param compress_flags compress mode flags
 \return error if any
 */
-GF_Err gf_isom_enable_compression(GF_ISOFile *isom_file, GF_ISOCompressMode compress_mode, Bool force_compress);
+GF_Err gf_isom_enable_compression(GF_ISOFile *isom_file, GF_ISOCompressMode compress_mode, u32 compress_flags);
 
 /*! sets the copyright in one language
 \param isom_file the target ISO file
@@ -1945,7 +2188,7 @@
 GF_Err gf_isom_remove_track_kind(GF_ISOFile *isom_file, u32 trackNumber, const char *schemeURI, const char *value);
 
 /*! changes the handler type of the media
-\warning this may completely breaks the parsing of the media track
+\warning This may completely breaks the parsing of the media track
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param new_type the new handler four character type
@@ -1954,7 +2197,7 @@
 GF_Err gf_isom_set_media_type(GF_ISOFile *isom_file, u32 trackNumber, u32 new_type);
 
 /*! changes the type of the sampleDescriptionBox
-\warning this may completely breaks the parsing of the media track
+\warning This may completely breaks the parsing of the media track
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param sampleDescriptionIndex the target sample description index
@@ -2002,10 +2245,29 @@
 \param EditDuration the duration of the edit in movie timecale
 \param MediaTime the corresponding media time of the start of the edit, in media timescale. -1 for empty edits
 \param EditMode the edit mode
-\return error if any
+\return error if any, GF_EOS if empty edit was inserted 
 */
 GF_Err gf_isom_set_edit(GF_ISOFile *isom_file, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, GF_ISOEditType EditMode);
 
+
+
+/*! updates or inserts a new edit in the track time line. Edits are used to modify
+the media normal timing. EditTime and EditDuration are expressed in movie timescale
+\note If a segment with EditTime already exists, it is erase
+\note If there is a segment before this new one, its duration is adjust to match EditTime of the new segment
+\warning The first segment always have an EditTime of 0. You should insert an empty or dwelled segment first
+
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param EditTime the start of the edit in movie timescale
+\param EditDuration the duration of the edit in movie timecale
+\param MediaTime the corresponding media time of the start of the edit, in media timescale. -1 for empty edits
+\param MediaRate a 16.16 rate (0x10000 means normal playback)
+\return error if any
+*/
+GF_Err gf_isom_set_edit_with_rate(GF_ISOFile *isom_file, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, u32 MediaRate);
+
+
 /*! same as \ref gf_isom_set_edit except only modifies duration type and mediaType
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -2078,6 +2340,13 @@
 */
 GF_Err gf_isom_use_compact_size(GF_ISOFile *isom_file, u32 trackNumber, Bool CompactionOn);
 
+/*! disabled brand rewrite for file, usually done for temporary import in an existing file
+\param isom_file the target ISO file
+\param do_disable if true, brand rewrite is disabled, otherwise enabled
+\return error if any
+*/
+GF_Err gf_isom_disable_brand_rewrite(GF_ISOFile *isom_file, Bool do_disable);
+
 /*! sets the brand of the movie
 \note this automatically adds the major brand to the set of alternate brands if not present
 \param isom_file the target ISO file
@@ -2102,6 +2371,13 @@
 */
 GF_Err gf_isom_reset_alt_brands(GF_ISOFile *isom_file);
 
+/*! removes all alternate brands except major brand
+\param isom_file the target ISO file
+\param leave_empty if GF_TRUE, does not create a default alternate brand matching the major brand
+\return error if any
+*/
+GF_Err gf_isom_reset_alt_brands_ex(GF_ISOFile *isom_file, Bool leave_empty);
+
 /*! set sample dependency flags - see ISO/IEC 14496-12 and \ref gf_filter_pck_set_dependency_flags
 \param isom_file the target ISO file
 \param trackNumber the target track number
@@ -2165,21 +2441,21 @@
 */
 GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, s32 hSpacing, s32 vSpacing, Bool force_par);
 
-/*! sets clean apperture (crop window, see ISO/IEC 14496-12) for a sample description
+/*! sets clean aperture (crop window, see ISO/IEC 14496-12) for a sample description
 \param isom_file the target ISO file
 \param trackNumber the target track number
 \param sampleDescriptionIndex the target sample description index
-\param cleanApertureWidthN nominator of clean apperture horizontal size
-\param cleanApertureWidthD denominator of clean apperture horizontal size
-\param cleanApertureHeightN nominator of clean apperture vertical size
-\param cleanApertureHeightD denominator of clean apperture vertical size
-\param horizOffN nominator of horizontal offset of clean apperture center minus (width-1)/2 (eg 0 sets center to center of video)
-\param horizOffD denominator of horizontal offset of clean apperture center minus (width-1)/2 (eg 0 sets center to center of video)
-\param vertOffN nominator of vertical offset of clean apperture center minus (height-1)/2 (eg 0 sets center to center of video)
-\param vertOffD denominator of vertical offset of clean apperture center minus (height-1)/2 (eg 0 sets center to center of video)
+\param cleanApertureWidthN nominator of clean aperture horizontal size
+\param cleanApertureWidthD denominator of clean aperture horizontal size
+\param cleanApertureHeightN nominator of clean aperture vertical size
+\param cleanApertureHeightD denominator of clean aperture vertical size
+\param horizOffN nominator of horizontal offset of clean aperture center minus (width-1)/2 (eg 0 sets center to center of video)
+\param horizOffD denominator of horizontal offset of clean aperture center minus (width-1)/2 (eg 0 sets center to center of video)
+\param vertOffN nominator of vertical offset of clean aperture center minus (height-1)/2 (eg 0 sets center to center of video)
+\param vertOffD denominator of vertical offset of clean aperture center minus (height-1)/2 (eg 0 sets center to center of video)
 \return error if any
 */
-GF_Err gf_isom_set_clean_aperture(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 cleanApertureWidthN, u32 cleanApertureWidthD, u32 cleanApertureHeightN, u32 cleanApertureHeightD, u32 horizOffN, u32 horizOffD, u32 vertOffN, u32 vertOffD);
+GF_Err gf_isom_set_clean_aperture(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 cleanApertureWidthN, u32 cleanApertureWidthD, u32 cleanApertureHeightN, u32 cleanApertureHeightD, s32 horizOffN, u32 horizOffD, s32 vertOffN, u32 vertOffD);
 
 /*! updates track aperture information for QT/ProRes
 \param isom_file the target ISO file
@@ -2189,37 +2465,13 @@
 */
 GF_Err gf_isom_update_aperture_info(GF_ISOFile *isom_file, u32 trackNumber, Bool remove);
 
-/*! content light level info*/
-typedef struct {
-	/*! max content ligth level*/
-	u16 max_content_light_level;
-	/*! max picture average ligth level*/
-	u16 max_pic_average_light_level;
-} GF_ContentLightLevelInfo;
-
-/*! mastering display colour volume info*/
-typedef struct {
-	/*! display primaries*/
-	struct {
-		u16 x;
-		u16 y;
-	} display_primaries[3];
-	/*! X white point*/
-	u16 white_point_x;
-	/*! Y white point*/
-	u16 white_point_y;
-	u32 max_display_mastering_luminance;
-	/*! min display mastering luminance*/
-	u32 min_display_mastering_luminance;
-} GF_MasteringDisplayColourVolumeInfo;
-
 
 /*! sets high dynamic range information for a sample description
 \param isom_file the target ISO file
 \param trackNumber the target track number
 \param sampleDescriptionIndex the target sample description index
-\param mdcv the mastering display colour volume to set
-\param clli the content light level to set
+\param mdcv the mastering display colour volume to set, if NULL removes the info
+\param clli the content light level to set, if NULL removes the info
 \return error if any
 */
 GF_Err gf_isom_set_high_dynamic_range_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_MasteringDisplayColourVolumeInfo *mdcv, GF_ContentLightLevelInfo *clli);
@@ -2228,10 +2480,10 @@
 \param isom_file the target ISO file
 \param trackNumber the target track number
 \param sampleDescriptionIndex the target sample description index
-\param dv_profile the Dolby Vision profile
+\param dvcc the Dolby Vision configuration
 \return error if any
 */
-GF_Err gf_isom_set_dolby_vision_profile(GF_ISOFile* isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 dv_profile);
+GF_Err gf_isom_set_dolby_vision_profile(GF_ISOFile* isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_DOVIDecoderConfigurationRecord *dvcc);
 
 
 /*! sets image sequence coding constraints (mostly used for HEIF image files)
@@ -2414,7 +2666,9 @@
 	/*! set this flag to keep data reference entries while cloning track*/
 	GF_ISOM_CLONE_TRACK_KEEP_DREF = 1,
 	/*! set this flag to avoid cloning track as a QT track while cloning track*/
-	GF_ISOM_CLONE_TRACK_NO_QT = 1<<1
+	GF_ISOM_CLONE_TRACK_NO_QT = 1<<1,
+	/*! drop track ID while importing*/
+	GF_ISOM_CLONE_TRACK_DROP_ID = 1<<2
 } GF_ISOTrackCloneFlags;
 
 /*! clones a track. This clones everything except media data and sample info (DTS, CTS, RAPs, etc...), and also clones sample descriptions
@@ -2459,6 +2713,14 @@
 */
 GF_Err gf_isom_hint_max_chunk_size(GF_ISOFile *isom_file, u32 trackNumber, u32 maxChunkSize);
 
+/*! sets the maximum chunk duration for a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param maxChunkDur the maximum chunk duration in media timescale
+\return error if any
+*/
+GF_Err gf_isom_hint_max_chunk_duration(GF_ISOFile *isom_file, u32 trackNumber, u32 maxChunkDur);
+
 /*! sets up interleaving for storage (shortcut for storeage mode + interleave_time)
 \param isom_file the target ISO file
 \param TimeInSec the desired interleaving time in seconds
@@ -2466,6 +2728,13 @@
 */
 GF_Err gf_isom_make_interleave(GF_ISOFile *isom_file, Double TimeInSec);
 
+/*! sets up interleaving for storage (shortcut for storeage mode + interleave_time)
+\param isom_file the target ISO file
+\param fTimeInSec the desired interleaving time in seconds, as a fraction
+\return error if any
+*/
+GF_Err gf_isom_make_interleave_ex(GF_ISOFile *isom_file, GF_Fraction *fTimeInSec);
+
 /*! sets progress callback when writing a file
 \param isom_file the target ISO file
 \param progress_cbk the progress callback function
@@ -2487,6 +2756,35 @@
 			void *usr_data,
 			u32 block_size);
 
+/*! checks if file will use in-place rewriting or not
+\param isom_file the target ISO file
+\return GF_TRUE if in-place rewrite is used, GF_FALSE otherwise
+*/
+Bool gf_isom_is_inplace_rewrite(GF_ISOFile *isom_file);
+
+/*! Disables inplace rewrite. Once in-place rewrite is disabled, the file can no longer be rewrittten in place.
+
+ In-place rewriting allows editing the file structure (ftyp, moov and meta boxes) without modifying the media data size.
+
+ In-place rewriting is disabled for any of the following:
+ - specifying a storage mode using \ref gf_isom_set_storage_mode
+ - removing or adding tracks or items
+ - removing, adding or updating samples
+ - using stdout, redirect file "_gpac_isobmff_redirect", memory file " gmem://"
+
+In-place rewriting is enabled by default on files open in edit mode.
+
+\param isom_file the target ISO file
+*/
+void gf_isom_disable_inplace_rewrite(GF_ISOFile *isom_file);
+
+/*! sets amount of bytes to reserve after moov for future in-place editing. This may be ignored depending on the final write mode
+\param isom_file the target ISO file
+\param padding amount of bytes to reserve
+\return error if any
+*/
+GF_Err gf_isom_set_inplace_padding(GF_ISOFile *isom_file, u32 padding);
+
 /*! @} */
 
 #endif // GPAC_DISABLE_ISOM_WRITE
@@ -2587,7 +2885,7 @@
 \param ProfileLevel the profile and level value to set
 \return error if any
 */
-GF_Err gf_isom_set_pl_indication(GF_ISOFile *isom_file, u8 PL_Code, GF_ISOProfileLevelType ProfileLevel);
+GF_Err gf_isom_set_pl_indication(GF_ISOFile *isom_file, GF_ISOProfileLevelType PL_Code, u8 ProfileLevel);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 /*! sets the rootOD ID of the movie if you need it. By default, movies are created without root ODs
@@ -2599,7 +2897,7 @@
 GF_Err gf_isom_set_root_od_id(GF_ISOFile *isom_file, u32 OD_ID);
 
 /*! sets the rootOD URL of the movie if you need it (only needed to create an empty file pointing
-to external ressource)
+to external resource)
 \note Use for MPEG-4 Systems only
 \param isom_file the target ISO file
 \param url_string the URL to assign to the root OD/IOD
@@ -2758,6 +3056,8 @@
 	u8 *extension_buf;
 	/*optional, sample description specific size*/
 	u32 extension_buf_size;
+	/*optional, wraps sample description specific data into a box if given type*/
+	u32 ext_box_wrap;
 } GF_GenericSampleDescription;
 
 /*! gets an unknown sample description
@@ -3016,6 +3316,35 @@
 */
 GF_HEVCConfig *gf_isom_lhvc_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
+/*! VVC family type*/
+typedef enum
+{
+	/*! not an VVC codec*/
+	GF_ISOM_VVCTYPE_NONE=0,
+	/*! VVC only*/
+	GF_ISOM_VVCTYPE_ONLY,
+	/*! VVC subpicture track*/
+	GF_ISOM_VVCTYPE_SUBPIC,
+	/*! VVC non-VCL only*/
+	GF_ISOM_VVCTYPE_NVCL,
+} GF_ISOMVVCType;
+
+/*! gets the VVC family type for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\return the type of VVC media
+*/
+GF_ISOMVVCType gf_isom_get_vvc_type(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets VVC config for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\return the VVC config - user is responsible for deleting it
+*/
+GF_VVCConfig *gf_isom_vvc_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
 /*! gets AV1 config for a sample description
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -3126,7 +3455,7 @@
 */
 GF_Err gf_isom_svc_config_update(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_AVCConfig *cfg, Bool is_additional);
 /*! deletes an SVC sample description
-\warning associated samples if any are NOT deleted
+\warning Associated samples if any are NOT deleted
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param sampleDescriptionIndex the target sample description index to delete
@@ -3156,7 +3485,7 @@
 GF_Err gf_isom_mvc_config_update(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_AVCConfig *cfg, Bool is_additional);
 
 /*! deletes an MVC sample description
-\warning associated samples if any are NOT deleted
+\warning Associated samples if any are NOT deleted
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param sampleDescriptionIndex the target sample description index to delete
@@ -3243,7 +3572,7 @@
 GF_Err gf_isom_lhvc_config_update(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_HEVCConfig *cfg, GF_ISOMLHEVCTrackType track_type);
 
 /*! sets nalu size length
-\warning any previously added samples must be rewritten by the caller
+\warning Any previously added samples must be rewritten by the caller
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param sampleDescriptionIndex the target sample description index to update
@@ -3252,6 +3581,36 @@
 */
 GF_Err gf_isom_set_nalu_length_field(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 nalu_size_length);
 
+
+/*! creates a new VVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param cfg the VVC config for this sample description
+\param URLname URL value of the data reference, NULL if no data reference (media in the file)
+\param URNname URN value of the data reference, NULL if no data reference (media in the file)
+\param outDescriptionIndex set to the index of the created sample description
+\return error if any
+*/
+GF_Err gf_isom_vvc_config_new(GF_ISOFile *isom_file, u32 trackNumber, GF_VVCConfig *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+
+/*! sets vvi1 entry type (inband SPS/PPS) instead of vvc1 (SPS/PPS in hvcC box)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param keep_xps if set to GF_TRUE, keeps parameter set in the configuration record otherwise removes them
+\return error if any
+*/
+GF_Err gf_isom_vvc_set_inband_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, Bool keep_xps);
+
+/*! updates vvcC configuration
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param cfg new config to set
+\return error if any
+*/
+GF_Err gf_isom_vvc_config_update(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_VVCConfig *cfg);
+
 /*! creates new VPx config
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -3329,42 +3688,6 @@
 GF_Err gf_isom_new_dims_description(GF_ISOFile *isom_file, u32 trackNumber, GF_DIMSDescription *desc, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-/*! AC-3 config record extension for EAC-3 - see dolby specs*/
-struct __ec3_stream
-{
-	/*! AC3 fs code*/
-	u8 fscod;
-	/*! AC3 bsid code*/
-	u8 bsid;
-	/*! AC3 bs mode*/
-	u8 bsmod;
-	/*! AC3 ac mode*/
-	u8 acmod;
-	/*! LF on*/
-	u8 lfon;
-	/*! asvc mode, only for EC3*/
-	u8 asvc;
-	/*! deps, only for EC3*/
-	u8 nb_dep_sub;
-	/*! channel loc, only for EC3*/
-	u8 chan_loc;
-};
-
-/*! AC3 config record*/
-typedef struct
-{
-	/*! indicates if ec3*/
-	u8 is_ec3;
-	/*! number of streams :
-		1 for AC3
-		max 8 for EC3, main stream is included
-	*/
-	u8 nb_streams;
-	/*! if AC3 this is the bitrate code, otherwise cumulated data rate of EC3 streams*/
-	u16 brcode;
-	struct __ec3_stream streams[8];
-} GF_AC3Config;
-
 /*! gets an AC3 sample description
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -3373,15 +3696,6 @@
 */
 GF_AC3Config *gf_isom_ac3_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
-/*! parses an AC3/EC3 sample description
-\param dsi the encoded config
-\param dsi_len the encoded config size
-\param is_ec3 indicates that the encoded config is for an EC3 track
-\param cfg the AC3/EC3 confgi to fill
-\return Error if any
-*/
-GF_Err gf_isom_ac3_config_parse(u8 *dsi, u32 dsi_len, Bool is_ec3, GF_AC3Config *cfg);
-
 #ifndef GPAC_DISABLE_ISOM_WRITE
 /*! creates an AC3 sample description
 \param isom_file the target ISO file
@@ -3395,6 +3709,30 @@
 GF_Err gf_isom_ac3_config_new(GF_ISOFile *isom_file, u32 trackNumber, GF_AC3Config *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+/*! gets TrueHD sample description info
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param format_info set to the format info - may be NULL
+\param peak_data_rate set to the peak data rate info - may be NULL
+\return error if any
+*/
+GF_Err gf_isom_truehd_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *format_info, u32 *peak_data_rate);
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! creates a FLAC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param URLname URL value of the data reference, NULL if no data reference (media in the file)
+\param URNname URN value of the data reference, NULL if no data reference (media in the file)
+\param format_info TrueHD format info
+\param peak_data_rate TrueHD peak data rate
+\param outDescriptionIndex set to the index of the created sample description
+\return error if any
+*/
+GF_Err gf_isom_truehd_config_new(GF_ISOFile *isom_file, u32 trackNumber, char *URLname, char *URNname, u32 format_info, u32 peak_data_rate, u32 *outDescriptionIndex);
+#endif
+
 /*! gets a FLAC sample description
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -3484,6 +3822,91 @@
 */
 GF_Err gf_isom_get_pcm_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *flags, u32 *pcm_size);
 
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+/*! creates a MPHA sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param URLname URL value of the data reference, NULL if no data reference (media in the file)
+\param URNname URN value of the data reference, NULL if no data reference (media in the file)
+\param outDescriptionIndex set to the index of the created sample description
+\param dsi the MPEGH audio config (payload of mhaC box): byte[0]=1 (config version) ,byte[1]=ProfileLevel, byte[2]=channel layout, byte[3],byte[4]: the size of what follows the rest being a mpegh3daConfig
+\param dsi_size the size of the MPEGH audio config
+\return error if any
+*/
+GF_Err gf_isom_new_mpha_description(GF_ISOFile *isom_file, u32 trackNumber, const char *URLname, const char *URNname, u32 *outDescriptionIndex, u8 *dsi, u32 dsi_size);
+#endif
+
+/*! gets compatible profile list for mpegh entry
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param nb_compatible_profiles set to the number of compatible profiles returned
+\return array of compatible profiles, NULL if none found
+*/
+const u8 *gf_isom_get_mpegh_compatible_profiles(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *nb_compatible_profiles);
+
+
+
+/*! structure holding youtube 360 video info
+- cf https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md#stereoscopic-3d-video-box-st3d
+ */
+typedef struct
+{
+	/*! stereo type holding youtube 360 video info*/
+	u32 stereo_type;
+	/*! 0: unknown (not present), 1: cube map, 2: EQR, 3: mesh*/
+	u32 projection_type;
+	/*! metadata about 3D software creator*/
+	const char *meta_data;
+	/*! indicate default pause is present*/
+	Bool pose_present;
+	/*! default pause yaw as 16.16 fixed point*/
+	u32 yaw;
+	/*! default pause pitch as 16.16 fixed point*/
+	u32 pitch;
+	/*! default pause roll as 16.16 fixed point*/
+	u32 roll;
+
+	/*! cube map layout*/
+	u32 layout;
+	/*! cube map padding*/
+	u32 padding;
+
+	/*! EQR top crop pos in frame, in pixels*/
+	u32 top;
+	/*! EQR bottom crop pos in frame, in pixels*/
+	u32 bottom;
+	/*! EQR left crop pos in frame, in pixels*/
+	u32 left;
+	/*! EQR right crop pos in frame, in pixels*/
+	u32 right;
+
+} GF_ISOM_Y3D_Info;
+
+
+/*! gets youtube 3D/360 info
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param info filled with 3D info
+\return error if any, GF_NOT_FOUND if no 3D/360 or setero info
+*/
+GF_Err gf_isom_get_y3d_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_ISOM_Y3D_Info *info);
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! sets youtube 3D/360 info
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param info 3D info to set
+\return error if any
+*/
+GF_Err gf_isom_set_y3d_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_ISOM_Y3D_Info *info);
+#endif
+
 /*! @} */
 
 
@@ -3535,6 +3958,15 @@
 */
 u32 gf_isom_segment_get_track_fragment_decode_time(GF_ISOFile *isom_file, u32 moof_index, u32 traf_index, u64 *decode_time);
 
+/*! get the movie fragment size, i.e. the size of moof, mdat and related boxes before moof/mdat
+
+\param isom_file the target ISO file
+\param moof_index the target movie fragment (1-based index)
+\param moof_size set to moof box size, may be NULL
+\return the movie fragemnt size
+*/
+u64 gf_isom_segment_get_fragment_size(GF_ISOFile *isom_file, u32 moof_index, u32 *moof_size);
+
 /*! enables single moof mode. In single moof mode, file is parsed only one moof/mdat at a time
 in order to proceed to next moof, \ref gf_isom_reset_data_offset must be called to parse the next moof
 \param isom_file the target ISO file
@@ -3584,6 +4016,13 @@
 */
 u64 gf_isom_get_current_tfdt(GF_ISOFile *isom_file, u32 trackNumber);
 
+/*! gets the estimated DTS of the first sample of the next segment for SmoothStreaming files (no tfdt, no tfxd)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the next track fragment decode time in media timescale
+*/
+u64 gf_isom_get_smooth_next_tfdt(GF_ISOFile *isom_file, u32 trackNumber);
+
 /*! checks if the movie is a smooth streaming recomputed initial movie
 \param isom_file the target ISO file
 \return GF_TRUE if the file init segment (moov) was generated from external meta-data (smooth streaming)
@@ -3634,8 +4073,8 @@
 	/*! mdat end offset*/
 	u64 mdat_end;
 	/*segment start offset plus one:
-		0 if regular fragment, 1 if dash sedment, offset indicates start of segment (styp or sidx)
-		if sidx, it is writtent in the moof_template
+		0 if regular fragment, 1 if dash segment, offset indicates start of segment (styp or sidx)
+		if sidx, it is written in the moof_template
 	*/
 	u64 seg_start_plus_one;
 
@@ -3677,7 +4116,7 @@
 
 /*! releases current movie segment. This closes the associated file IO object.
 \note seeking in the file is no longer possible when tables are rested
-\warning the sample count is not reseted after the release of tables. use \ref gf_isom_reset_tables for this
+\warning The sample count is not reseted after the release of tables. use \ref gf_isom_reset_tables for this
 
 \param isom_file the target ISO file
 \param reset_tables if set, sample information for all tracks setup as segment are destroyed, along with all PSSH boxes. This allows keeping the memory footprint low when playing segments.
@@ -3768,7 +4207,7 @@
 				User Data Manipulation
 
 You can add specific typed data to either a track or the movie: the UserData
-	The type must be formated as a FourCC if you have a registered 4CC type
+	The type must be formatted as a FourCC if you have a registered 4CC type
 	but the usual is to set a UUID (128 bit ID for box type) which never conflict
 	with existing structures in the format
 		To manipulate a UUID user data set the UserDataType to 0 and specify a valid UUID.
@@ -3927,7 +4366,7 @@
 									Bool force_traf_flags);
 
 /*! changes the default parameters of an existing trak fragment
-\warning should not be used if samples have already been added
+\warning This should not be used if samples have already been added
 
 \param isom_file the target ISO file
 \param TrackID ID of the target track
@@ -3960,9 +4399,10 @@
 /*! sets the duration of the movie in case of movie fragments
 \param isom_file the target ISO file
 \param duration the complete duration (movie and all fragments) in movie timescale
+\param remove_mehd force removal of mehd box, only setting mvhd.duration to 0
 \return error if any
 */
-GF_Err gf_isom_set_movie_duration(GF_ISOFile *isom_file, u64 duration);
+GF_Err gf_isom_set_movie_duration(GF_ISOFile *isom_file, u64 duration, Bool remove_mehd);
 
 /*! fragment creatio option*/
 typedef enum
@@ -4125,6 +4565,14 @@
 	This will enable data cache
 	param: interleave ID*/
 	GF_ISOM_TRUN_SET_INTERLEAVE_ID,
+	/*! store truns before sample encryption and sample groups info
+ 	param: 1 to store before and follow CMAF (recommended?) order, 0, to store after*/
+	GF_ISOM_TRAF_TRUNS_FIRST,
+	/*! forces trun v1
+	param: on/off (0/1)*/
+	GF_ISOM_TRAF_TRUN_V1,
+	/*force usage of 64 bits in tfdt and in per-segment sidx*/
+	GF_ISOM_TRAF_USE_LARGE_TFDT
 } GF_ISOTrackFragmentOption;
 
 /*! sets a track fragment option. Options can be set at the beginning of each new fragment only, and for the
@@ -4155,7 +4603,7 @@
 u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundantCoding);
 
 /*! appends data into last sample of track for video fragments/other media
-\warning this shall not be used with OD tracks
+\warning This shall not be used with OD tracks
 \param isom_file the target ISO file
 \param TrackID destination track
 \param data the data to append
@@ -4169,14 +4617,14 @@
 /*! sets side information for common encryption for the last added sample
 \param isom_file the target ISO file
 \param trackID the ID of the target track
-\param IV_size the size of the init vector (8 or 16 bytes)
 \param sai_b buffer containing the SAI information of the sample
-\param sai_b_size size of the SAI buffer. If sai_b is NULL, this indicates the original sample size, and an SAI will be created describing the proper byte ranges if use_subsample is set
+\param sai_b_size size of the SAI buffer. If sai_b is NULL or sai_b_size is 0, add a clear SAI data
 \param use_subsample indicates if the media uses CENC subsamples
 \param use_saio_32bit indicates if 32-bit saio shall be used
+\param use_multikey indicates if multikey is in use (required to tag saiz/saio boxes)
 \return error if any
 */
-GF_Err gf_isom_fragment_set_cenc_sai(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u32 IV_size, u8 *sai_b, u32 sai_b_size, Bool use_subsample, Bool use_saio_32bit);
+GF_Err gf_isom_fragment_set_cenc_sai(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u8 *sai_b, u32 sai_b_size, Bool use_subsample, Bool use_saio_32bit, Bool use_multikey);
 /*! clones PSSH data between two files
 \param dst_file the target ISO file
 \param src_file the source ISO file
@@ -4218,6 +4666,21 @@
 GF_Err gf_isom_fragment_set_sample_flags(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u32 is_leading, u32 dependsOn, u32 dependedOn, u32 redundant);
 
 
+
+/*! adds sample auxiliary data
+
+\param isom_file the target ISO file
+\param trackID the ID of the target track
+\param sample_number_in_frag the sample number in the current fragment. Must be equal or larger to last auxiliary added
+\param aux_type auxiliary sample data type, shall not be 0
+\param aux_info auxiliary sample data specific info type, may be 0
+\param data data to add
+\param size size of data to add
+\return error if any
+*/
+GF_Err gf_isom_fragment_set_sample_aux_info(GF_ISOFile *isom_file, u32 trackID, u32 sample_number_in_frag, u32 aux_type, u32 aux_info, u8 *data, u32 size);
+
+
 /*! sets the number of the next moof to be produced
 \param isom_file the target ISO file
 \param value the number of the next moof
@@ -4298,19 +4761,19 @@
 /*! adds a blank chunk of data in the sample that is skipped while streaming
 \param isom_file the target ISO file
 \param trackNumber the target hint track
-\param AtBegin indicates if the blank chunk should be at the end or at the begining of the hint packet
+\param AtBegin indicates if the blank chunk should be at the end or at the beginning of the hint packet
 \return error if any
 */
 GF_Err gf_isom_hint_blank_data(GF_ISOFile *isom_file, u32 trackNumber, u8 AtBegin);
 
 /*! adds a chunk of data in the packet that is directly copied while streaming
-NOTE: dataLength MUST BE <= 14 bytes, and you should only use this function
+\note DataLength MUST BE <= 14 bytes, and you should only use this function
 to add small blocks of data (encrypted parts, specific headers, ...)
 \param isom_file the target ISO file
 \param trackNumber the target hint track
 \param data buffer to add to the RTP packet
 \param dataLength size of buffer to add to the RTP packet
-\param AtBegin indicates if the blank chunk should be at the end or at the begining of the hint packet
+\param AtBegin indicates if the blank chunk should be at the end or at the beginning of the hint packet
 \return error if any
 */
 GF_Err gf_isom_hint_direct_data(GF_ISOFile *isom_file, u32 trackNumber, u8 *data, u32 dataLength, u8 AtBegin);
@@ -4328,7 +4791,7 @@
 (useful to store en encrypted version of a packet only available while streaming)
 	In this case, set SourceTrackID to the HintTrack ID and SampleNumber to 0
 	In this case, the DataOffset MUST BE NULL and length will indicate the extra_data size
-\param AtBegin indicates if the blank chunk should be at the end or at the begining of the hint packet
+\param AtBegin indicates if the blank chunk should be at the end or at the beginning of the hint packet
 \return error if any
 */
 GF_Err gf_isom_hint_sample_data(GF_ISOFile *isom_file, u32 trackNumber, GF_ISOTrackID SourceTrackID, u32 SampleNumber, u16 DataLength, u32 offsetInSample, u8 *extra_data, u8 AtBegin);
@@ -4342,7 +4805,7 @@
 \param sampleDescriptionIndex the index of the stream description in the desired track
 \param DataLength the length of bytes to copy in the packet
 \param offsetInDescription the offset in bytes in the description at which to begin copying data. Since it is far from being obvious / interoperable what this offset is, we recommend not using this function and injecting the data instead using \ref gf_isom_hint_direct_data.
-\param AtBegin indicates if the blank chunk should be at the end or at the begining of the hint packet
+\param AtBegin indicates if the blank chunk should be at the end or at the beginning of the hint packet
 \return error if any
 */
 GF_Err gf_isom_hint_sample_description_data(GF_ISOFile *isom_file, u32 trackNumber, GF_ISOTrackID SourceTrackID, u32 sampleDescriptionIndex, u16 DataLength, u32 offsetInDescription, u8 AtBegin);
@@ -4435,7 +4898,7 @@
 GF_Err gf_isom_sdp_clean_track(GF_ISOFile *isom_file, u32 trackNumber);
 
 /*! adds an SDP line to the SDP container at the movie level (presentation SDP info)
-NOTE: the CRLF end of line for SDP is automatically inserted
+\note The CRLF end of line for SDP is automatically inserted
 \param isom_file the target ISO file
 \param text the SDP text to add the target hint track
 \return error if any
@@ -4465,16 +4928,16 @@
 
 /*! gets SDP info at the movie level
 \param isom_file the target ISO file
-\param sdp set to the sdp text - do not modify
-\param length set to the sdp length
+\param sdp set to the sdp text, including a null-terminating character - do not modify
+\param length set to the sdp length, not including the null-terminating character
 \return error if any
 */
 GF_Err gf_isom_sdp_get(GF_ISOFile *isom_file, const char **sdp, u32 *length);
 /*! gets SDP info at the track level
 \param isom_file the target ISO file
 \param trackNumber the target track
-\param sdp set to the sdp text - do not modify
-\param length set to the sdp length
+\param sdp set to the sdp text, including a null-terminating character - do not modify
+\param length set to the sdp length, not including the null-terminating character
 \return error if any
 */
 GF_Err gf_isom_sdp_track_get(GF_ISOFile *isom_file, u32 trackNumber, const char **sdp, u32 *length);
@@ -4547,7 +5010,7 @@
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param sampleDescriptionIndex the sample description index
-\param sidx_offset if 0, the sidx will NOT be written before the encoded TX3G. If not 0, the sidx will be written before the encoded TX3G, with the given offset. Offset sshould be at least 128 for most commmon usage of TX3G (RTP, MPEG-4 timed text, etc)
+\param sidx_offset if 0, the sidx will NOT be written before the encoded TX3G. If not 0, the sidx will be written before the encoded TX3G, with the given offset. Offset sshould be at least 128 for most common usage of TX3G (RTP, MPEG-4 timed text, etc)
 \param tx3g set to a newly allocated buffer containing the encoded tx3g - to be freed by caller
 \param tx3g_size set to the size of the encoded config
 \return error if any
@@ -4651,6 +5114,26 @@
 #endif // GPAC_DISABLE_ISOM_WRITE
 
 
+/*! gets MIME parameters (type/subtype + codecs and profiles) associated with a sample descritpion
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\return MIME param if present, NULL otherwise
+*/
+const char *gf_isom_subtitle_get_mime(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! gets MIME parameters associated with a sample descritpion
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param full_mime MIME param (type/subtype + codecs and profiles) to set, if NULL removes MIME parameter info
+\return error if any
+*/
+GF_Err gf_isom_subtitle_set_mime(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, const char *full_mime);
+#endif
+
+
 /*! gets XML metadata for a sample description
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -4855,6 +5338,7 @@
 */
 GF_Err gf_isom_xml_subtitle_sample_add_text(GF_GenericSubtitleSample *subt_samp, char *text_data, u32 text_len);
 
+
 #endif	/*GPAC_DISABLE_ISOM_WRITE*/
 
 /*! @} */
@@ -4892,6 +5376,8 @@
 	GF_ISOM_CBCS_SCHEME	= GF_4CC('c','b','c','s'),
 	/*! PIFF Scheme Type in the SchemeTypeInfoBox */
 	GF_ISOM_PIFF_SCHEME	= GF_4CC('p','i','f','f'),
+	/*! CENC sensitive encryption */
+	GF_ISOM_SVE1_SCHEME	= GF_4CC('s','v','e','1'),
 };
 
 /*! checks if a track is encrypted or protected
@@ -5029,28 +5515,6 @@
 */
 GF_Err gf_isom_get_original_format_type(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat);
 
-/*! CENC subsample entry*/
-typedef struct
-{
-	/*! size of bytes in clear - 16 bit stored but we use 32*/
-	u32 bytes_clear_data;
-	/*! size of bytes encrypted*/
-	u32 bytes_encrypted_data;
-} GF_CENCSubSampleEntry;
-
-/*! CENC auxiliary info*/
-typedef struct __cenc_sample_aux_info
-{
- 	/*! IV size: 0, 8 or 16; it MUST NOT be written to file*/
-	u8 IV_size;
- 	/*! IV can be 0, 64 or 128 bits - if 64, bytes 0-7 are used and 8-15 are 0-padded*/
-	bin128 IV;
-	/*! number of subsamples*/
-	u16 subsample_count;
-	/*! subsamples*/
-	GF_CENCSubSampleEntry *subsamples;
-} GF_CENCSampleAuxInfo;
-
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 /*! creates ISMACryp protection info for a sample description
@@ -5112,30 +5576,36 @@
 */
 GF_Err gf_isom_set_generic_protection(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 scheme_type, u32 scheme_version, char *scheme_uri, char *kms_URI);
 
-/*! allocates storage for CENC side data in a senc or UUID box
+/*! allocates storage for CENC side data in a senc box
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_cenc_allocate_storage(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! allocates storage for CENC side data in a PIFF senc UUID box
 \param isom_file the target ISO file
 \param trackNumber the target track
-\param container_type the code of the container (currently 'senc' for CENC or 'PSEC' for smooth)
 \param AlgorithmID algorith ID, usually 0
 \param IV_size the size of the init vector
 \param KID the default Key ID
 \return error if any
 */
-GF_Err gf_isom_cenc_allocate_storage(GF_ISOFile *isom_file, u32 trackNumber, u32 container_type, u32 AlgorithmID, u8 IV_size, bin128 KID);
+GF_Err gf_isom_piff_allocate_storage(GF_ISOFile *isom_file, u32 trackNumber, u32 AlgorithmID, u8 IV_size, bin128 KID);
+
 
 /*! adds cenc SAI for the last sample added to a track
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param container_type the code of the container (currently 'senc' for CENC or 'PSEC' for smooth)
-\param IV_size the size of the init vector
 \param buf the SAI buffer
-\param len the size of the SAI buffer. If buf is NULL but len is given, this adds an unencrypted entry. otherwise, buf && len represent the sai cenc info to add
+\param len the size of the SAI buffer. If buf is NULL or len is 0, this adds an unencrypted entry (not written to file)
 \param use_subsamples if GF_TRUE, the media format uses CENC subsamples
-\param clear_IV the IV used for clear samples (when buf is null)
 \param use_saio_32bit forces usage of 32-bit saio boxes
+\param is_multi_key indicates if multi key is in use (required to tag saio and saiz boxes)
 \return error if any
 */
-GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *isom_file, u32 trackNumber, u32 container_type, u8 IV_size, u8 *buf, u32 len, Bool use_subsamples, u8 *clear_IV, Bool use_saio_32bit);
+GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *isom_file, u32 trackNumber, u32 container_type, u8 *buf, u32 len, Bool use_subsamples, Bool use_saio_32bit, Bool is_multi_key);
 
 
 
@@ -5146,18 +5616,35 @@
 \param scheme_type 4CC of protection scheme (GF_ISOM_ISMACRYP_SCHEME = iAEC in ISMACryp 1.0)
 \param scheme_version version of protection scheme (1 in ISMACryp 1.0)
 \param default_IsEncrypted default isEncrypted flag
-\param default_IV_size default IV size flag
-\param default_KID default key ID used
 \param default_crypt_byte_block default crypt block size for pattern encryption
 \param default_skip_byte_block default skip block size for pattern encryption
-\param default_constant_IV_size default constant IV size
-\param default_constant_IV default constant IV
+\param key_info key descriptor formatted as a multi-key info (cf GF_PROP_PID_CENC_KEY)
+\param key_info_size key descriptor size
 \return error if any
 */
 GF_Err gf_isom_set_cenc_protection(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 scheme_type,
- u32 scheme_version, u32 default_IsEncrypted, u8 default_IV_size, bin128 default_KID,
-								 u8 default_crypt_byte_block, u8 default_skip_byte_block,
-								 u8 default_constant_IV_size, bin128 default_constant_IV);
+ u32 scheme_version, u32 default_IsEncrypted, u8 default_crypt_byte_block, u8 default_skip_byte_block,
+								 u8 *key_info, u32 key_info_size);
+
+
+/*! creates CENC protection for a multi-key sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\param scheme_type 4CC of protection scheme (GF_ISOM_ISMACRYP_SCHEME = iAEC in ISMACryp 1.0)
+\param scheme_version version of protection scheme (1 in ISMACryp 1.0)
+\param default_IsEncrypted default isEncrypted flag
+\param default_crypt_byte_block default crypt block size for pattern encryption
+\param default_skip_byte_block default skip block size for pattern encryption
+\param key_info key info (cf CENC and GF_PROP_PID_CENC_KEY)
+\param key_info_size key info size
+\return error if any
+*/
+GF_Err gf_isom_set_cenc_protection_mkey(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 scheme_type,
+ u32 scheme_version, u32 default_IsEncrypted, u8 default_crypt_byte_block, u8 default_skip_byte_block,
+								 u8 *key_info, u32 key_info_size);
+
+
 /*! adds PSSH info for a file, can be called several time per system ID
 \param isom_file the target ISO file
 \param systemID the ID of the protection system
@@ -5166,10 +5653,10 @@
 \param KID the list of key IDs
 \param data opaque data for the protection system
 \param len size of the opaque data
-\param use_piff if GF_TRUE, use PIFF pssh UUID box when creating the pssh
+\param pssh_mode 0: regular PSSH in moov, 1: PIFF PSSH in moov, 2: regular PSSH in meta
 \return error if any
 */
-GF_Err gf_cenc_set_pssh(GF_ISOFile *isom_file, bin128 systemID, u32 version, u32 KID_count, bin128 *KID, u8 *data, u32 len, Bool use_piff);
+GF_Err gf_cenc_set_pssh(GF_ISOFile *isom_file, bin128 systemID, u32 version, u32 KID_count, bin128 *KID, u8 *data, u32 len, u32 pssh_mode);
 
 /*! removes CENC senc box info
 \param isom_file the target ISO file
@@ -5236,29 +5723,13 @@
 \param outOriginalFormat set to orginal unprotected media format
 \param outSchemeType set to 4CC of protection scheme (GF_ISOM_ISMACRYP_SCHEME = iAEC in ISMACryp 1.0)
 \param outSchemeVersion set to version of protection scheme (1 in ISMACryp 1.0)
-\param outIVLength set to the IV size in bytes
 \return error if any
 */
-GF_Err gf_isom_get_cenc_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, u32 *outIVLength);
+GF_Err gf_isom_get_cenc_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion);
 
-/*! destroys a CENC sample auxiliary structure
-\param samp_aux_info the target auxiliary buffer
-*/
-void gf_isom_cenc_samp_aux_info_del(GF_CENCSampleAuxInfo *samp_aux_info);
-
-/*! gets CENC auxiliary info of a sample
-\param isom_file the target ISO file
-\param trackNumber the target track
-\param sampleNumber the target sample
-\param sampleDescIndex the target sample description index
-\param sai set to the auxiliary info - shall be freeed by caller
-\param container_type set to type of box which contains the sample auxiliary information. Now we have two type: GF_ISOM_BOX_UUID_PSEC and GF_ISOM_BOX_TYPE_SENC
-\return error if any
-*/
-GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 sampleDescIndex, GF_CENCSampleAuxInfo **sai, u32 *container_type);
 
 /*! gets CENC auxiliary info of a sample as a buffer
-\note the serialized buffer format is IV on IV_size bytes, then subsample count if any an [clear_bytes(u16), crypt_bytes(u32)] subsamples
+\note the serialized buffer format is exactly a CencSampleAuxiliaryDataFormat
 
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -5269,7 +5740,7 @@
 \param outSize set to the size of the serialized buffer. If an existing buffer was passed, the passed value shall be the allocated buffer size (the returned value is still the buffer size)
 \return error if any
 */
-GF_Err gf_isom_cenc_get_sample_aux_info_buffer(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 sampleDescIndex, u32 *container_type, u8 **out_buffer, u32 *outSize);
+GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 sampleDescIndex, u32 *container_type, u8 **out_buffer, u32 *outSize);
 
 /*! gets CENC default info for a sample description
 \param isom_file the target ISO file
@@ -5277,23 +5748,14 @@
 \param sampleDescriptionIndex the sample description index
 \param container_type set to the container type of SAI data
 \param default_IsEncrypted set to default isEncrypted flag
-\param default_IV_size set to default IV size flag
-\param default_KID set to default key ID used
-\param constant_IV_size set to default constant IV size
-\param constant_IV set to default constant IV
 \param crypt_byte_block set to default crypt block size for pattern encryption
 \param skip_byte_block set to default skip block size for pattern encryption
+\param key_info set to multikey descriptor (cf CENC and GF_PROP_PID_CENC_KEY)
+\param key_info_size set to multikey descriptor size
+\return error if any
 */
-void gf_isom_cenc_get_default_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID, u8 *constant_IV_size, bin128 *constant_IV, u8 *crypt_byte_block, u8 *skip_byte_block);
+GF_Err gf_isom_cenc_get_default_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
 
-
-/*! checks if CENC protection uses pattern encryption
-\param isom_file the target ISO file
-\param trackNumber the target track
-\param sampleDescriptionIndex the sample description index
-\return GF_TRUE if protection uses pattern encryption
-*/
-Bool gf_isom_cenc_is_pattern_mode(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 /*! gets the number of PSSH defined
 \param isom_file the target ISO file
 \return number of PSSH defined
@@ -5336,16 +5798,13 @@
 \param trackNumber the target track
 \param sampleNumber the target sample number
 \param IsEncrypted set to GF_TRUE if the sample is encrypted, GF_FALSE otherwise (optional can be NULL)
-\param IV_size set to IV size in bytes used for the sample (optional can be NULL)
-\param KID set to key ID used for the sample (optional can be NULL)
 \param crypt_byte_block set to crypt block count for pattern encryption (optional can be NULL)
 \param skip_byte_block set to skip block count for pattern encryption (optional can be NULL)
-\param constant_IV_size set to constant IV size (optional can be NULL)
-\param constant_IV set to constant IV (optional can be NULL)
+\param key_info set to key descriptor (cf GF_PROP_PID_CENC_KEY)
+\param key_info_size set to key descriptor size
 \return error if any
 */
-GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, Bool *IsEncrypted, u8 *IV_size, bin128 *KID, u8 *crypt_byte_block, u8 *skip_byte_block, u8 *constant_IV_size, bin128 *constant_IV);
-
+GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
 
 /*! @} */
 
@@ -5397,7 +5856,8 @@
 \param item_num 1-based index of item to query
 \param itemID set to item ID in file (optional, can be NULL)
 \param type set to item 4CC type
-\param protection_idx set to the 1-based index of the protection in used, 0 if not protected
+\param protection_scheme set to 0 if not protected, or scheme type used if item is protected. If protected but scheme type not present, set to 'unkw'
+\param protection_scheme_version set to 0 if not protected, or scheme version used if item is protected
 \param is_self_reference set to item is the file itself
 \param item_name set to the item name (optional, can be NULL)
 \param item_mime_type set to the item mime type (optional, can be NULL)
@@ -5407,10 +5867,19 @@
 \return error if any
 */
 GF_Err gf_isom_get_meta_item_info(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_num,
- u32 *itemID, u32 *type, u32 *protection_idx, Bool *is_self_reference,
+ u32 *itemID, u32 *type, u32 *protection_scheme, u32 *protection_scheme_version, Bool *is_self_reference,
 const char **item_name, const char **item_mime_type, const char **item_encoding,
 const char **item_url, const char **item_urn);
 
+/*! gets item flags for the givesn item
+
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
+\param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param item_num 1-based index of item to query
+\return item flags
+*/
+GF_Err gf_isom_get_meta_item_flags(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_num);
 
 /*! gets item index from item ID
 \param isom_file the target ISO file
@@ -5445,6 +5914,27 @@
 */
 GF_Err gf_isom_extract_meta_item_mem(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_id, u8 **out_data, u32 *out_size, u32 *out_alloc_size, const char **mime_type, Bool use_annex_b);
 
+
+/*! fetch CENC info for an item
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
+\param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param item_id the ID of the item to dump
+\param is_protected set to GF_TRUE if item is protected
+\param skip_byte_block set to skip_byte_block or 0 if no pattern
+\param crypt_byte_block set to crypt_byte_block or 0 if no pattern
+\param key_info set to key info
+\param key_info_size set to key info size
+\param aux_info_type_parameter set to the CENC auxiliary type param of SAI data
+\param sai_out_data set to allocated buffer containing the item, shall be freeed by user - may be NULL to only retrieve the info
+\param sai_out_size set to the size of the allocated buffer - may be NULL if sai_out_data is NULL
+\param sai_out_alloc_size set to the allocated size of the buffer (this allows passing an existing buffer without always reallocating it) - may be NULL if sai_out_data is NULL
+\return error if any
+*/
+GF_Err gf_isom_extract_meta_item_get_cenc_info(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_id, Bool *is_protected,
+	u8 *skip_byte_block, u8 *crypt_byte_block, const u8 **key_info, u32 *key_info_size, u32 *aux_info_type_parameter,
+	u8 **sai_out_data, u32 *sai_out_size, u32 *sai_out_alloc_size);
+
 /*! gets primary item ID
 \param isom_file the target ISO file
 \param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
@@ -5452,6 +5942,25 @@
 \return primary item ID, 0 if none found (primary can also be stored through meta XML)*/
 u32 gf_isom_get_meta_primary_item_id(GF_ISOFile *isom_file, Bool root_meta, u32 track_num);
 
+/*! gets number of references of a given type from a given item ID
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
+\param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param from_id item ID to check
+\param type reference type to check
+\return number of referenced items*/
+u32 gf_isom_meta_get_item_ref_count(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 from_id, u32 type);
+
+/*! gets ID of reference of a given type and index from a given item ID
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
+\param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param from_id item ID to check
+\param type reference type to check
+\param ref_idx 1-based index of reference to check
+\return ID if the referred item*/
+u32 gf_isom_meta_get_item_ref_id(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 from_id, u32 type, u32 ref_idx);
+
 /*! item tile mode*/
 typedef enum {
 	/*! not a tile item*/
@@ -5466,6 +5975,25 @@
 	TILE_ITEM_SINGLE
 } GF_TileItemMode;
 
+/*! Image overlay offset properties*/
+typedef struct {
+	u32 horizontal;
+	u32 vertical;
+} GF_ImageItemOverlayOffset;
+
+/*! Image protection item properties*/
+typedef struct
+{
+	u32 scheme_type;
+	u32 scheme_version;
+	u8 crypt_byte_block;
+	u8 skip_byte_block;
+	const u8 *key_info;
+	u32 key_info_size;
+	const u8 *sai_data;
+	u32 sai_data_size;
+} GF_ImageItemProtection;
+
 /*! Image item properties*/
 typedef struct
 {
@@ -5483,8 +6011,13 @@
 	u32 vOffset;
 	/*! angle in radians*/
 	u32 angle;
+	/*! mirroring axis: 0 = not set, 1 = vertical, 2 = horizontal*/
+	u32 mirror;
 	/*! hidden flag*/
 	Bool hidden;
+	/*! clean aperture */
+	u32 clap_wnum, clap_wden, clap_hnum, clap_hden, clap_hoden, clap_voden;
+	s32 clap_honum, clap_vonum;
 	/*! pointer to configuration box*/
 	void *config;
 	/*! tile item mode*/
@@ -5492,15 +6025,56 @@
 	/*! tile number */
 	u32 single_tile_number;
 	/*! time for importing*/
-	double time;
+	Double time;
+	/*! end time for importing*/
+	Double end_time;
+	/*! step time between imports*/
+	Double step_time;
+	/*! sample num for importing*/
+	u32 sample_num;
 	/*! file containg iCC data for importing*/
 	char iccPath[GF_MAX_PATH];
 	/*! is alpha*/
 	Bool alpha;
+	/*! is depth*/
+	Bool depth;
 	/*! number of channels*/
 	u8 num_channels;
 	/*! bits per channels in bits*/
-	u8 bits_per_channel[3];
+	u32 bits_per_channel[3];
+	/*! number of columns in grid*/
+	u32 num_grid_columns;
+	/*! number of rows in grid*/
+	u32 num_grid_rows;
+	/*! number of overlayed images*/
+	u32 overlay_count;
+	/*! overlay offsets*/
+	GF_ImageItemOverlayOffset *overlay_offsets;
+	/*! canvas overlay color*/
+	u32 overlay_canvas_fill_value_r;
+	u32 overlay_canvas_fill_value_g;
+	u32 overlay_canvas_fill_value_b;
+	u32 overlay_canvas_fill_value_a;
+	/*! protection info, NULL if item is not protected*/
+	GF_ImageItemProtection *cenc_info;
+	/*! If set, reference image from sample sample_num (same file data used for sample and item)*/
+	Bool use_reference;
+	/*ID of item to use as source*/
+	u32 item_ref_id;
+	/*if set, copy all properties of source item*/
+	Bool copy_props;
+	/*only set when importing non-ref from ISOBMF*/
+	GF_ISOFile *src_file;
+	Bool auto_grid;
+	Double auto_grid_ratio;
+	/*AV1 layer sizes except last layer - set during import*/
+	u32 av1_layer_size[3];
+	/*AV1 operation point index*/
+	u8 av1_op_index;
+
+	const char *aux_urn;
+	const u8 *aux_data;
+	u32 aux_data_len;
 } GF_ImageItemProperties;
 
 
@@ -5583,7 +6157,7 @@
 \param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
 \param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
 \param item_name name of the item
-\param item_id ID of the item, can be 0
+\param item_id ID of the item, can be NULL, can be 0 in input, set to item ID after call
 \param item_type four character code of item type
 \param mime_type mime type of the item, can be NULL
 \param content_encoding content encoding of the item, can be NULL
@@ -5593,7 +6167,56 @@
 \param item_extent_refs list of item extend description, or NULL
 \return error if any
 */
-GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, const char *item_name, u32 item_id, u32 item_type, const char *mime_type, const char *content_encoding, GF_ImageItemProperties *image_props, char *data, u32 data_len, GF_List *item_extent_refs);
+GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, const char *item_name, u32 *item_id, u32 item_type, const char *mime_type, const char *content_encoding, GF_ImageItemProperties *image_props, char *data, u32 data_len, GF_List *item_extent_refs);
+
+/*! adds an item to a meta box as a reference to a sample
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
+\param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param item_name name of the item
+\param item_id ID of the item, can be 0
+\param item_type four character code of item type
+\param mime_type mime type of the item, can be NULL
+\param content_encoding content encoding of the item, can be NULL
+\param image_props image properties information for image items
+\param tk_id source track ID
+\param sample_num number of sample to reference
+\return error if any
+*/
+GF_Err gf_isom_add_meta_item_sample_ref(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, const char *item_name, u32 *item_id, u32 item_type, const char *mime_type, const char *content_encoding, GF_ImageItemProperties *image_props, GF_ISOTrackID tk_id, u32 sample_num);
+
+/*! creates an image grid item
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if meta_track_number is 0
+\param meta_track_number if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param item_name name of the item
+\param item_id ID of the item, can be 0
+\param image_props image properties information for image items
+\return error if any
+*/
+GF_Err gf_isom_iff_create_image_grid_item(GF_ISOFile *isom_file, Bool root_meta, u32 meta_track_number, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props);
+
+/*! creates an image overlay item
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if meta_track_number is 0
+\param meta_track_number if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param item_name name of the item
+\param item_id ID of the item, can be 0
+\param image_props image properties information for image items
+\return error if any
+*/
+GF_Err gf_isom_iff_create_image_overlay_item(GF_ISOFile *isom_file, Bool root_meta, u32 meta_track_number, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props);
+
+/*! creates an image identity item
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if meta_track_number is 0
+\param meta_track_number if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param item_name name of the item
+\param item_id ID of the item, can be 0
+\param image_props image properties information for image items
+\return error if any
+*/
+GF_Err gf_isom_iff_create_image_identity_item(GF_ISOFile *isom_file, Bool root_meta, u32 meta_track_number, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props);
 
 /*! creates image item(s) from samples of a media track
 \param isom_file the target ISO file
@@ -5613,9 +6236,11 @@
 \param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
 \param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
 \param item_num 1-based index of the item to remove
+\param keep_refs do not modify item reference, typically used when replacing an item
+\param keep_props keep property association for properties with 4CC listed in keep_props (coma-seprated list)
 \return error if any
 */
-GF_Err gf_isom_remove_meta_item(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_num);
+GF_Err gf_isom_remove_meta_item(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_num, Bool keep_refs, const char *keep_props);
 
 /*! sets the given item as the primary one
 \warning This SHALL NOT be used if the meta has a valid XML data
@@ -5639,9 +6264,20 @@
 */
 GF_Err gf_isom_meta_add_item_ref(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 from_id, u32 to_id, u32 type, u64 *ref_index);
 
+/*! adds the item to the given group
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
+\param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param item_id ID of item to add
+\param group_id ID of group, 0 if needs to be determined from the file
+\param group_type four character code of group
+\return error if any
+*/
+GF_Err gf_isom_meta_add_item_group(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_id, u32 group_id, u32 group_type);
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-/*!
+/*! gets image item properties
 \param isom_file the target ISO file
 \param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
 \param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
@@ -5666,28 +6302,87 @@
 	/*probe is only used to check if iTunes info are present*/
 	GF_ISOM_ITUNE_PROBE = 0,
 	/*all is only used to remove all tags*/
-	GF_ISOM_ITUNE_ALL = 1,
-	GF_ISOM_ITUNE_ALBUM	= GF_4CC( 0xA9, 'a', 'l', 'b' ),
-	GF_ISOM_ITUNE_ARTIST = GF_4CC( 0xA9, 'A', 'R', 'T' ),
-	GF_ISOM_ITUNE_COMMENT = GF_4CC( 0xA9, 'c', 'm', 't' ),
-	GF_ISOM_ITUNE_COMPILATION = GF_4CC( 'c', 'p', 'i', 'l' ),
-	GF_ISOM_ITUNE_COMPOSER = GF_4CC( 0xA9, 'c', 'o', 'm' ),
-	GF_ISOM_ITUNE_COVER_ART = GF_4CC( 'c', 'o', 'v', 'r' ),
-	GF_ISOM_ITUNE_CREATED = GF_4CC( 0xA9, 'd', 'a', 'y' ),
-	GF_ISOM_ITUNE_DISK = GF_4CC( 'd', 'i', 's', 'k' ),
-	GF_ISOM_ITUNE_TOOL = GF_4CC( 0xA9, 't', 'o', 'o' ),
-	GF_ISOM_ITUNE_GENRE = GF_4CC( 'g', 'n', 'r', 'e' ),
-	GF_ISOM_ITUNE_GROUP = GF_4CC( 0xA9, 'g', 'r', 'p' ),
-	GF_ISOM_ITUNE_ITUNES_DATA = GF_4CC( '-', '-', '-', '-' ),
-	GF_ISOM_ITUNE_NAME = GF_4CC( 0xA9, 'n', 'a', 'm' ),
-	GF_ISOM_ITUNE_TEMPO = GF_4CC( 't', 'm', 'p', 'o' ),
-	GF_ISOM_ITUNE_TRACK = GF_4CC( 0xA9, 't', 'r', 'k' ),
-	GF_ISOM_ITUNE_TRACKNUMBER = GF_4CC( 't', 'r', 'k', 'n' ),
-	GF_ISOM_ITUNE_WRITER = GF_4CC( 0xA9, 'w', 'r', 't' ),
-	GF_ISOM_ITUNE_ENCODER = GF_4CC( 0xA9, 'e', 'n', 'c' ),
-	GF_ISOM_ITUNE_ALBUM_ARTIST = GF_4CC( 'a', 'A', 'R', 'T' ),
-	GF_ISOM_ITUNE_GAPLESS = GF_4CC( 'p', 'g', 'a', 'p' ),
-	GF_ISOM_ITUNE_CONDUCTOR = GF_4CC( 0xA9, 'c', 'o', 'n' ),
+	GF_ISOM_ITUNE_RESET = 1,
+	GF_ISOM_ITUNE_NAME 				= GF_4CC( 0xA9, 'n', 'a', 'm' ),
+	GF_ISOM_ITUNE_ARTIST 			= GF_4CC( 0xA9, 'A', 'R', 'T' ),
+	GF_ISOM_ITUNE_ALBUM_ARTIST 		= GF_4CC( 'a', 'A', 'R', 'T' ),
+	GF_ISOM_ITUNE_ALBUM				= GF_4CC( 0xA9, 'a', 'l', 'b' ),
+	GF_ISOM_ITUNE_GROUP 			= GF_4CC( 0xA9, 'g', 'r', 'p' ),
+	GF_ISOM_ITUNE_WRITER 			= GF_4CC( 0xA9, 'w', 'r', 't' ),
+	GF_ISOM_ITUNE_COMMENT 			= GF_4CC( 0xA9, 'c', 'm', 't' ),
+	GF_ISOM_ITUNE_GENRE_USER		= GF_4CC( 0xA9, 'g', 'n', 'r'),
+	GF_ISOM_ITUNE_GENRE 			= GF_4CC( 'g', 'n', 'r', 'e' ),
+	GF_ISOM_ITUNE_CREATED 			= GF_4CC( 0xA9, 'd', 'a', 'y' ),
+	GF_ISOM_ITUNE_TRACKNUMBER 		= GF_4CC( 't', 'r', 'k', 'n' ),
+	GF_ISOM_ITUNE_DISK 				= GF_4CC( 'd', 'i', 's', 'k' ),
+	GF_ISOM_ITUNE_TEMPO 			= GF_4CC( 't', 'm', 'p', 'o' ),
+	GF_ISOM_ITUNE_COMPILATION 		= GF_4CC( 'c', 'p', 'i', 'l' ),
+	GF_ISOM_ITUNE_TV_SHOW 			= GF_4CC( 't', 'v', 's', 'h'),
+	GF_ISOM_ITUNE_TV_EPISODE 		= GF_4CC( 't', 'v', 'e', 'n'),
+	GF_ISOM_ITUNE_TV_SEASON 		= GF_4CC( 't', 'v', 's', 'n'),
+	GF_ISOM_ITUNE_TV_EPISODE_NUM 	= GF_4CC( 't', 'v', 'e', 's'),
+	GF_ISOM_ITUNE_TV_NETWORK 		= GF_4CC( 't', 'v', 'n', 'n'),
+	GF_ISOM_ITUNE_DESCRIPTION	 	= GF_4CC( 'd', 'e', 's', 'c' ),
+	GF_ISOM_ITUNE_LONG_DESCRIPTION	= GF_4CC( 'l', 'd', 'e', 's'),
+	GF_ISOM_ITUNE_LYRICS 			= GF_4CC( 0xA9, 'l', 'y', 'r' ),
+	GF_ISOM_ITUNE_SORT_NAME 		= GF_4CC( 's', 'o', 'n', 'm' ),
+	GF_ISOM_ITUNE_SORT_ARTIST 		= GF_4CC( 's', 'o', 'a', 'r' ),
+	GF_ISOM_ITUNE_SORT_ALB_ARTIST 	= GF_4CC( 's', 'o', 'a', 'a' ),
+	GF_ISOM_ITUNE_SORT_ALBUM	 	= GF_4CC( 's', 'o', 'a', 'l' ),
+	GF_ISOM_ITUNE_SORT_COMPOSER	 	= GF_4CC( 's', 'o', 'c', 'o' ),
+	GF_ISOM_ITUNE_SORT_SHOW	 		= GF_4CC( 's', 'o', 's', 'n' ),
+	GF_ISOM_ITUNE_COVER_ART 		= GF_4CC( 'c', 'o', 'v', 'r' ),
+	GF_ISOM_ITUNE_COPYRIGHT 		= GF_4CC( 'c', 'p', 'r', 't' ),
+	GF_ISOM_ITUNE_TOOL 				= GF_4CC( 0xA9, 't', 'o', 'o' ),
+	GF_ISOM_ITUNE_ENCODER 			= GF_4CC( 0xA9, 'e', 'n', 'c' ),
+	GF_ISOM_ITUNE_PURCHASE_DATE 	= GF_4CC( 'p', 'u', 'r', 'd' ),
+	GF_ISOM_ITUNE_PODCAST		 	= GF_4CC( 'p', 'c', 's', 't' ),
+	GF_ISOM_ITUNE_PODCAST_URL	 	= GF_4CC( 'p', 'u', 'r', 'l' ),
+	GF_ISOM_ITUNE_KEYWORDS 			= GF_4CC( 'k', 'y', 'y', 'w'),
+	GF_ISOM_ITUNE_CATEGORY 			= GF_4CC( 'c', 'a', 't', 'g'),
+	GF_ISOM_ITUNE_HD_VIDEO 			= GF_4CC( 'h', 'd', 'v', 'd'),
+	GF_ISOM_ITUNE_MEDIA_TYPE 		= GF_4CC( 's', 't', 'i', 'k'),
+	GF_ISOM_ITUNE_RATING	 		= GF_4CC( 'r', 't', 'n', 'g'),
+	GF_ISOM_ITUNE_GAPLESS 			= GF_4CC( 'p', 'g', 'a', 'p' ),
+	GF_ISOM_ITUNE_COMPOSER 		= GF_4CC( 0xA9, 'c', 'o', 'm' ),
+	GF_ISOM_ITUNE_TRACK 		= GF_4CC( 0xA9, 't', 'r', 'k' ),
+	GF_ISOM_ITUNE_CONDUCTOR 	= GF_4CC( 0xA9, 'c', 'o', 'n' ),
+
+	GF_ISOM_ITUNE_ART_DIRECTOR 	= GF_4CC( 0xA9, 'a', 'r', 'd' ),
+	GF_ISOM_ITUNE_ARRANGER	 	= GF_4CC( 0xA9, 'a', 'r', 'g' ),
+	GF_ISOM_ITUNE_LYRICIST	 	= GF_4CC( 0xA9, 'a', 'u', 't' ),
+	GF_ISOM_ITUNE_COPY_ACK	 	= GF_4CC( 0xA9, 'c', 'a', 'k' ),
+	GF_ISOM_ITUNE_SONG_DESC	 	= GF_4CC( 0xA9, 'd', 'e', 's' ),
+	GF_ISOM_ITUNE_DIRECTOR	 	= GF_4CC( 0xA9, 'd', 'i', 'r' ),
+	GF_ISOM_ITUNE_EQ_PRESET	 	= GF_4CC( 0xA9, 'e', 'q', 'u' ),
+	GF_ISOM_ITUNE_LINER_NOTES 	= GF_4CC( 0xA9, 'l', 'n', 't' ),
+	GF_ISOM_ITUNE_REC_COMPANY 	= GF_4CC( 0xA9, 'm', 'a', 'k' ),
+	GF_ISOM_ITUNE_ORIG_ARTIST 	= GF_4CC( 0xA9, 'o', 'p', 'e' ),
+	GF_ISOM_ITUNE_PHONO_RIGHTS 	= GF_4CC( 0xA9, 'p', 'h', 'g' ),
+	GF_ISOM_ITUNE_PRODUCER	 	= GF_4CC( 0xA9, 'p', 'r', 'd' ),
+	GF_ISOM_ITUNE_PERFORMER	 	= GF_4CC( 0xA9, 'p', 'r', 'f' ),
+	GF_ISOM_ITUNE_PUBLISHER	 	= GF_4CC( 0xA9, 'p', 'u', 'b' ),
+	GF_ISOM_ITUNE_SOUND_ENG	 	= GF_4CC( 0xA9, 's', 'n', 'e' ),
+	GF_ISOM_ITUNE_SOLOIST	 	= GF_4CC( 0xA9, 's', 'o', 'l' ),
+	GF_ISOM_ITUNE_CREDITS	 	= GF_4CC( 0xA9, 's', 'r', 'c' ),
+	GF_ISOM_ITUNE_THANKS	 	= GF_4CC( 0xA9, 't', 'h', 'x' ),
+	GF_ISOM_ITUNE_ONLINE	 	= GF_4CC( 0xA9, 'u', 'r', 'l' ),
+	GF_ISOM_ITUNE_EXEC_PRODUCER	= GF_4CC( 0xA9, 'x', 'p', 'd' ),
+
+
+	GF_ISOM_ITUNE_ITUNES_DATA 	= GF_4CC( '-', '-', '-', '-' ),
+
+	/* not mapped:
+Purchase Account 	apID 	UTF-8 string 		iTunesAccount (read only)
+Account Type 	akID 	8-bit integer 	Identifies the iTunes Store account type 	iTunesAccountType (read only)
+	cnID 	32-bit integer 	iTunes Catalog ID, used for combing SD and HD encodes in iTunes 	cnID
+Country Code 	sfID 	32-bit integer 	Identifies in which iTunes Store a file was bought 	iTunesCountry (read only)
+	atID 	32-bit integer 	Use? 	atID
+	plID 	64-bit integer 	Use?
+	geID 	32-bit integer 	Use? 	geID
+	©st3 	UTF-8 string 	Use?
+	*/
+
 } GF_ISOiTunesTag;
 
 /*! gets the given itunes tag info.
@@ -5701,18 +6396,57 @@
 */
 GF_Err gf_isom_apple_get_tag(GF_ISOFile *isom_file, GF_ISOiTunesTag tag, const u8 **data, u32 *data_len);
 
+/*! enumerate itunes tags.
+
+\param isom_file the target ISO file
+\param idx 0-based index of the tag to get
+\param out_tag set to the tag code
+\param data set to the tag data pointer - do not modify
+\param data_len set to the size of the tag data. Data is set to NULL and data_size to 1 if the associated tag has no data
+\param out_int_val set to the int/bool/frac numerator type for known tags, in which case data is set to NULL
+\param out_int_val2 set to the frac denominator for known tags, in which case data is set to NULL
+\param out_flags set to the flags value of the data container box
+\return error if any (GF_URL_ERROR if no more tags)
+*/
+GF_Err gf_isom_apple_enum_tag(GF_ISOFile *isom_file, u32 idx, GF_ISOiTunesTag *out_tag, const u8 **data, u32 *data_len, u64 *out_int_val, u32 *out_int_val2, u32 *out_flags);
+
+
+/*! enumerate WMA tags.
+
+\param isom_file the target ISO file
+\param idx 0-based index of the tag to get
+\param out_tag set to the tag name
+\param data set to the tag data pointer - do not modify
+\param data_len set to the size of the tag data
+\param version set to the WMA tag version
+\param data_type set to the WMA data type
+\return error if any (GF_URL_ERROR if no more tags)
+*/
+GF_Err gf_isom_wma_enum_tag(GF_ISOFile *isom_file, u32 idx, char **out_tag, const u8 **data, u32 *data_len, u32 *version, u32 *data_type);
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 /*! sets the given tag info.
 
-\warning For 'genre', data may be NULL in which case the genre ID taken from the data_len parameter
-
 \param isom_file the target ISO file
 \param tag the tag to set
-\param data tag data buffer
-\param data_len size of the tag data buffer. If data and data_len are 0, removes the given tag
+\param data tag data buffer or string to parse
+\param data_len size of the tag data buffer. If data is NULL and and data_len not 0, removes the given tag
+\param int_val value for integer/boolean tags. If data and data_len are set, parse data as string to get the value
+\param int_val2 value for fractional tags. If data and data_len are set, parse data as string to get the value
+\return error if any
+*/
+GF_Err gf_isom_apple_set_tag(GF_ISOFile *isom_file, GF_ISOiTunesTag tag, const u8 *data, u32 data_len, u64 int_val, u32 int_val2);
+
+
+/*! sets the given WMA tag info (only string tags are supported).
+
+\param isom_file the target ISO file
+\param name name of the tag to set
+\param value string value to set
 \return error if any
 */
-GF_Err gf_isom_apple_set_tag(GF_ISOFile *isom_file, GF_ISOiTunesTag tag, const u8 *data, u32 data_len);
+GF_Err gf_isom_wma_set_tag(GF_ISOFile *isom_file, char *name, char *value);
+
 
 /*! sets compatibility tag on AVC tracks (needed by iPod to play files... hurray for standards)
 \param isom_file the target ISO file
@@ -5720,6 +6454,7 @@
 \return error if any
 */
 GF_Err gf_isom_set_ipod_compatible(GF_ISOFile *isom_file, u32 trackNumber);
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 /*! @} */
@@ -5812,7 +6547,7 @@
 /*! checks if a sample has subsample information
 \param isom_file the target ISO file
 \param trackNumber the target track
-\param sampleNumber the target sample number
+\param sampleNumber the target sample number. Set to 0 to check for presence of subsample info (will return 1 or 0 in this case)
 \param flags the subsample flags to query (may be 0)
 \return the number of subsamples in the given sample for the given flags*/
 u32 gf_isom_sample_has_subsamples(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 flags);
@@ -5898,7 +6633,9 @@
 	GF_ISOM_SAMPLE_GROUP_VIPR = GF_4CC( 'v', 'i', 'p', 'r'), //p15
 	GF_ISOM_SAMPLE_GROUP_LBLI = GF_4CC( 'l', 'b', 'l', 'i'), //p15
 	GF_ISOM_SAMPLE_GROUP_3GAG = GF_4CC( '3', 'g', 'a', 'g'), //3gpp
-	GF_ISOM_SAMPLE_GROUP_AVCB = GF_4CC( 'a', 'v', 'c', 'b'), //3gpp
+	GF_ISOM_SAMPLE_GROUP_AVCB = GF_4CC( 'a', 'v', 'c', 'b'), //avif
+	GF_ISOM_SAMPLE_GROUP_SPOR = GF_4CC( 's', 'p', 'o', 'r'), //p15
+	GF_ISOM_SAMPLE_GROUP_SULM = GF_4CC( 's', 'u', 'l', 'm'), //p15
 };
 
 /*! gets 'rap ' and 'roll' group info for the given sample
@@ -5906,7 +6643,7 @@
 \param trackNumber the target track
 \param sampleNumber the target sample number
 \param is_rap set to GF_TRUE if sample is a rap (open gop), GF_FALSE otherwise
-\param has_roll set to GF_ISOM_SAMPLE_ROLL if sample has roll information, GF_ISOM_SAMPLE_PREROLL if sample has preroll information, GF_ISOM_SAMPLE_ROLL_NONE otherwise
+\param roll_type set to GF_ISOM_SAMPLE_ROLL if sample has roll information, GF_ISOM_SAMPLE_PREROLL if sample has preroll information, GF_ISOM_SAMPLE_ROLL_NONE otherwise
 \param roll_distance if sample has roll information, set to roll distance
 \return error if any*/
 GF_Err gf_isom_get_sample_rap_roll_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, Bool *is_rap, GF_ISOSampleRollType *roll_type, s32 *roll_distance);
@@ -5915,13 +6652,24 @@
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param sample_group_description_index index of sample group description entry to query
-\param grouping_type four character code of grouping typpe of sample group description to query
+\param grouping_type four character code of grouping type of sample group description to query
 \param default_index set to the default index for this sample group description if any, 0 otherwise (no defaults)
 \param data set to the internal sample group description data buffer
 \param size set to size of the sample group description data buffer
 \return GF_TRUE if found, GF_FALSE otherwise*/
 Bool gf_isom_get_sample_group_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sample_group_description_index, u32 grouping_type, u32 *default_index, const u8 **data, u32 *size);
 
+/*! gets sample group description index for a given sample and grouping type.
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sample_number sample number to query
+\param grouping_type four character code of grouping type of sample group description to query
+\param grouping_type_parameter grouping type parameter of sample group description to query
+\param sampleGroupDescIndex set to the 1-based sample group description index, or 0 if no sample group of this type is associated
+\return error if any
+*/
+GF_Err gf_isom_get_sample_to_group_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, u32 *sampleGroupDescIndex);
+
 /*! checks if a track as a CENC seig sample group used for key rolling
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -5944,10 +6692,36 @@
 Bool gf_isom_get_tile_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sample_group_description_index, u32 *default_sample_group_index, u32 *id, u32 *independent, Bool *full_frame, u32 *x, u32 *y, u32 *w, u32 *h);
 
 
+/*! enumerates custom sample groups (not natively supported by this library) for a given sample
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sample_number the target sample
+\param sgrp_idx the current index. Must be et to 0 on first call, incremented by this call on each success, must not be NULL
+\param sgrp_type set to the grouping type, or set to 0 if no more sample group descriptions, must not be NULL
+\param sgrp_parameter set to the grouping_type_parameter or 0 if not defined
+\param sgrp_data set to the sample group description data
+\param sgrp_size set to the sample group description size
+\return error if any
+*/
+GF_Err gf_isom_enum_sample_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sample_number, u32 *sgrp_idx, u32 *sgrp_type, u32 *sgrp_parameter, const u8 **sgrp_data, u32 *sgrp_size);
+
+/*! enumerates custom sample auxiliary data (not natively supported by this library) for a given sample
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sample_number the target sample
+\param sai_idx the current index. Must be et to 0 on first call, incremented by this call on each success, must not be NULL
+\param sai_type set to the grouping type, or set to 0 if no more sample group descriptions, must not be NULL
+\param sai_parameter set to the grouping_type_parameter or 0 if not defined
+\param sai_data set (allocated) to the sample group description data, must not be NULL and must be freed by caller
+\param sgrp_size set to the sample group description size, must not be NULL
+\return error if any
+*/
+GF_Err gf_isom_enum_sample_aux_data(GF_ISOFile *isom_file, u32 trackNumber, u32 sample_number, u32 *sai_idx, u32 *sai_type, u32 *sai_parameter, u8 **sai_data, u32 *sai_size);
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 /*! sets rap flag for sample_number - this is used by non-IDR RAPs in AVC (also in USAC) were SYNC flag (stss table) cannot be used
-\warning sample group info MUST be added in order (no insertion in the tables)
+\warning Sample group info MUST be added in order (no insertion in the tables)
 
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -5960,10 +6734,10 @@
 
 /*! sets roll_distance info for sample_number (number of frames before (<0) or after (>0) this sample to have a complete refresh of the decoded data (used by GDR in AVC)
 
-\warning sample group info MUST be added in order (no insertion in the tables)
+\warning Sample group info MUST be added in order (no insertion in the tables)
 \param isom_file the target ISO file
 \param trackNumber the target track
-\param sampleNumber the target sample number
+\param sampleNumber the target sample number. If 0, assumes last added sample. If 0xFFFFFFFF, marks all samples as belonging to the roll group
 \param roll_type indicates the sample roll recovery type
 \param roll_distance indicates the roll distance before a correct decoding is produced
 \return error if any
@@ -5975,15 +6749,14 @@
 \param trackNumber the target track
 \param sampleNumber the target sample number
 \param isEncrypted isEncrypted flag
-\param IV_size IV size, can be 0 if not encrypted
-\param KeyID key ID used
 \param crypt_byte_block crypt block size for pattern encryption, can be 0
 \param skip_byte_block skip block size for pattern encryption, can be 0
-\param constant_IV_size constant IV size, can be 0
-\param constant_IV constant IV, can be 0
+\param key_info multikey descriptor (cf CENC and GF_PROP_PID_CENC_KEY)
+\param key_info_size multikey descriptor size
 \return error if any
 */
-GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u8 isEncrypted, u8 IV_size, bin128 KeyID, u8 crypt_byte_block, u8 skip_byte_block, u8 constant_IV_size, bin128 constant_IV);
+GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u8 isEncrypted, u8 crypt_byte_block, u8 skip_byte_block, u8 *key_info, u32 key_info_size);
+
 
 /*! sets a sample using the default CENC parameters in a CENC saig sample group SEIG, creating a sample group description if needed (when seig is already defined)
 \param isom_file the target ISO file
@@ -6013,6 +6786,19 @@
 */
 GF_Err gf_isom_remove_sample_group(GF_ISOFile *isom_file, u32 trackNumber, u32 grouping_type);
 
+/*! adds the given blob as a sample group description entry of the given grouping type for the given sample.
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the target sample number.Use 0 for setting sample group info to last sample in a track fragment
+\param grouping_type the four character code of the grouping type
+\param grouping_type_parameter associated grouping type parameter (usually 0)
+\param data the payload of the sample group description
+\param data_size the size of the payload
+\return error if any
+*/
+GF_Err gf_isom_set_sample_group_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size);
+
+
 /*! adds a sample to the given sample group
 \param isom_file the target ISO file
 \param trackNumber the target track

gpac-1.0.1.tar.gz/include/gpac/main.h -> gpac-2.0.0.tar.gz/include/gpac/main.h Changed

@@ -39,7 +39,7 @@
 \addtogroup sysmain_grp
 @{
 
-Thiis section decribes functions useful when developping an application using libgpac such as:
+Thiis section decribes functions useful when developing an application using libgpac such as:
 - quick UTF8 conversion of arguments for main() on windows
 - setting, checking and printing libgpac arguments as given from command line
 */
@@ -57,16 +57,17 @@
 {\
 	int i;\
 	int res;\
-	size_t len;\
-	size_t res_len;\
+	u32 len;\
+	u32 res_len;\
 	char **argv;\
 	argv = (char **)malloc(argc*sizeof(wchar_t *));\
 	for (i = 0; i < argc; i++) {\
 		wchar_t *src_str = wargv[i];\
 		len = UTF8_MAX_BYTES_PER_CHAR*gf_utf8_wcslen(wargv[i]);\
 		argv[i] = (char *)malloc(len + 1);\
-		res_len = gf_utf8_wcstombs(argv[i], len, &src_str);\
-		argv[i][res_len] = 0;\
+		res_len = gf_utf8_wcstombs(argv[i], len, (const unsigned short **) &src_str);\
+		if (res_len != GF_UTF8_FAIL)\
+			argv[i][res_len] = 0;\
 		if (res_len > len) {\
 			fprintf(stderr, "Length allocated for conversion of wide char to UTF-8 not sufficient\n");\
 			return -1;\
@@ -90,23 +91,29 @@
 
 #endif //win32
 
-/*! structure holding a gpac arg (not a filter arg)*/
+/*! macro defining fields of a libgpac arg (not a filter arg)*/
+#define GF_GPAC_ARG_BASE \
+	/*! name of arg*/ \
+	const char *name; \
+	/*! alternate name of arg*/ \
+	const char *altname; \
+	/*! description of arg*/ \
+	const char *description; \
+	/*! default value of arg*/ \
+	const char *val; \
+	/*! possible value of arg*/ \
+	const char *values; \
+	/*! argument type for UI construction - note that argument values are not parsed and shall be set as strings*/ \
+	u16 type; \
+	/*! argument flags*/ \
+	u16 flags; \
+
+
+/*! structure holding a libgpac arg (not a filter arg)*/
 typedef struct
 {
-	/*! name of arg*/
-	const char *name;
-	/*! alternate name of arg*/
-	const char *altname;
-	/*! description of arg*/
-	const char *description;
-	/*! default value of arg*/
-	const char *val;
-	/*! possible value of arg*/
-	const char *values;
-	/*! argument type for UI construction - note that argument values are not parsed and shall be set as strings*/
-	u16 type;
-	/*! argument flags*/
-	u16 flags;
+	/*! base structure, shall always be placed first if you extend args in your application*/
+	GF_GPAC_ARG_BASE
 } GF_GPACArg;
 
 //these 3 values match argument hints of filters
@@ -135,6 +142,8 @@
 #define GF_ARG_SUBSYS_TEXT 		(1<<11)
 /*! argument applies to the remotery subsystem*/
 #define GF_ARG_SUBSYS_RMT 		(1<<12)
+/*! argument belongs to hack tools, usually never used*/
+#define GF_ARG_SUBSYS_HACKS 		(1<<13)
 
 /*! argument is a boolean*/
 #define GF_ARG_BOOL		0
@@ -146,6 +155,12 @@
 #define GF_ARG_STRING	3
 /*! argument is a camma-separated list of strings*/
 #define GF_ARG_STRINGS	4
+/*! argument is a custom arg, default value contains the syntax of the argument*/
+#define GF_ARG_4CC		5
+/*! argument is a custom arg, default value contains the syntax of the argument*/
+#define GF_ARG_4CCS		6
+/*! argument is a custom arg, default value contains the syntax of the argument*/
+#define GF_ARG_CUSTOM	7
 
 /*! macros for defining a GF_GPACArg argument*/
 #define GF_DEF_ARG(_a, _b, _c, _d, _e, _f, _g) {_a, _b, _c, _d, _e, _f, _g}
@@ -160,7 +175,7 @@
 u32 gf_sys_is_gpac_arg(const char *arg_name);
 
 /*! parses config string and update config accordingly
-\param opt_string section/key/val formatted as Section:Key (discard key), Section:Key=null (discard key), Section:Key=Val (set key) or Section:*=null (discard section)
+\param opt_string section/key/val formatted as Section:Key (discard key), Section:Key=null (discard key), Section:Key=Val (set key) or Section=null (discard section)
 \return GF_TRUE if update is OK, GF_FALSE otherwise*/
 Bool gf_sys_set_cfg_option(const char *opt_string);
 
@@ -177,18 +192,18 @@
 	GF_ARGMODE_ALL
 } GF_SysArgMode;
 
-/*! flags for help formating*/
+/*! flags for help formatting*/
 typedef enum
 {
 	/*! first word in format string should be highlighted */
 	GF_PRINTARG_HIGHLIGHT_FIRST = 1,
 	/*! prints instead of new line*/
 	GF_PRINTARG_NL_TO_BR = 1<<1,
-	/*! first word in format string is an option descritptor*/
+	/*! first word in format string is an option descripttor*/
 	GF_PRINTARG_OPT_DESC = 1<<2,
 	/*! the format string is an application string, not a gpac core one*/
 	GF_PRINTARG_IS_APP = 1<<3,
-	/*! insert an extra '-' at the begining*/
+	/*! insert an extra '-' at the beginning*/
 	GF_PRINTARG_ADD_DASH = 1<<4,
 	/*! do not insert '-' before arg name*/
 	GF_PRINTARG_NO_DASH = 1<<5,

gpac-1.0.1.tar.gz/include/gpac/maths.h -> gpac-2.0.0.tar.gz/include/gpac/maths.h Changed

@@ -47,7 +47,7 @@
 This section documents the math and trigo functions used in the GPAC framework. GPAC can be compiled with
  fixed-point support, representing float values on a 16.16 signed integer, which implies a developer
  must take care of float computations when using GPAC.\n
- A developper should not need to know in which mode the framework has been compiled as long as he uses
+ A developer should not need to know in which mode the framework has been compiled as long as he uses
  the math functions of GPAC which work in both float and fixed-point mode.\n
  Using fixed-point version is decided at compilation time and cannot be changed. The feature is signaled
  through the GPAC_FIXED_POINT macro: when defined, GPAC has been compiled in fixed-point mode
@@ -327,6 +327,15 @@
 Bool gf_rect_equal(GF_Rect *rc1, GF_Rect *rc2);
 
 /*!
+\brief rectangle intersection
+
+Intersects two rectangle.
+\param rc1 rectangle to use, updated to intersection result
+\param rc2 second rectangle to use
+*/
+void gf_rect_intersect(GF_Rect *rc1, GF_Rect *rc2);
+
+/*!
 \brief pixel-aligned rectangle
 
 Pixel-aligned rectangle used in the GPAC framework. This is usually needed for 2D drawing algorithms.

gpac-1.0.1.tar.gz/include/gpac/media_tools.h -> gpac-2.0.0.tar.gz/include/gpac/media_tools.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Authoring Tools sub-project
@@ -107,6 +107,21 @@
 */
 GF_Err gf_media_change_par(GF_ISOFile *isom_file, u32 trackNumber, s32 ar_num, s32 ar_den, Bool force_par, Bool rewrite_par);
 
+/*! Changes color property of the media (bitstream rewrite) - only AVC/H264 supported for now. See CICP for value types
+Negative values keep source settings for the corresponding flags.
+If source stream has no VUI info, create one and set corresponding flags to specified values.
+In this case, any other flags are set to preferred values (typically, flag=0 or value=undef).
+\param isom_file target ISOBMF file
+\param trackNumber target track
+\param fullrange fullrange flag
+\param video_format video format type
+\param color_primaries color primaries
+\param transfer transfer characteristics
+\param color_matrix olor matrix
+\return error if any
+*/
+GF_Err gf_media_change_color(GF_ISOFile *isom_file, u32 trackNumber, s32 fullrange, s32 video_format, s32 color_primaries, s32 transfer, s32 color_matrix);
+
 /*!
 *Removes all non rap samples (sync and other RAP sample group info) from the track.
 \param isom_file target ISOBMF file
@@ -123,6 +138,17 @@
 */
 void gf_media_update_bitrate(GF_ISOFile *isom_file, u32 trackNumber);
 
+
+/*! gets AV1 scalable layer byte offsets of a sample for a1lx box
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sample_number the target sample to query
+\param op_index AV1 operating point index to retrieve sizes for
+\param layer_size returned 3 layer sizes (4th is implied, see a1lx spec)
+\return error if any
+*/
+GF_Err gf_media_av1_layer_size_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sample_number, u8 op_index, u32 layer_size[3]);
+
 #endif
 
 /*! @} */
@@ -151,7 +177,7 @@
 	otherwise it is added with the requested ESID if non-0, otherwise the new trackID is stored in ESID
 	if use_data_ref is set, data is only referenced in the file
 	if duration is not 0, only the first duration seconds are imported
-	NOTE: if an ESD is specified, its decoderSpecificInfo is also updated
+	\note If an ESD is specified, its decoderSpecificInfo is also updated
 
 */
 
@@ -383,29 +409,49 @@
 	const char *filter_src_opts;
 	/*! any filter options to pass to sink*/
 	const char *filter_dst_opts;
-	/*! filter chain to insert before destination, formated as f1[:args]@@f2[:args] options to pass to sink*/
+	/*! filter chain to insert before destination, formatted as "f1[:args]@f2[:args]" options to pass to sink*/
 	const char *filter_chain;
+	Bool is_chain_old_syntax;
 
-
+	/*! force mode for the created ISOBMFF sample entry*/
 	GF_AudioSampleEntryImportMode asemode;
 
-	Bool audio_roll_change;
-	s16 audio_roll;
-
+	/*! indicate to tag the imported media as an alpha channel stream*/
 	Bool is_alpha;
+	/*! keep AU delimiter in file if allowed by specification*/
 	Bool keep_audelim;
+	/*! import as NAL-based video using inband parameter sets*/
 	u32 xps_inband;
+	/*! flag for session stats and graph dumping*/
 	u32 print_stats_graph;
+	/*! target program ID of source MPEG-2 stream to import*/
 	u32 prog_id;
 
+	/*! target timescale to set*/
+	s32 moov_timescale;
+
+	/*! value for created track
+		0: let importer decide
+		0xFFFFFFFF: try to keep source ID
+		other value: trackk ID value
+	*/
+	u32 target_trackID;
+
 	/*magic number for identifying source, will be set to the destination track. Only the low 32 bits are used
 	the high 32 bits are updated by the importer as follows:
 		1<<33: if bit is set, source was an isobmff file
 	*/
 	u64 source_magic;
+	/*! the session in which to add the importer (for -new-fs option only). If null, the importer runs its own session right away*/
 	GF_FilterSession *run_in_session;
+	/*! muxer arguments when running multiple importers in one session*/
 	char *update_mux_args;
+	/*! muxer source ID argument when running multiple importers in one session*/
+	char *update_mux_sid;
+	/*! index of source importer when running multiple importers in one session*/
 	u32 track_index;
+	/*! target start time in source*/
+	Double start_time;
 } GF_MediaImporter;
 
 /*!
@@ -475,10 +521,11 @@
 \param isom_file the target ISOBMF file
 \param trackNumber the target track
 \param profile the new profile to set
+\param compat profile compatibility flag for H264
 \param level the new level to set
 \return error if any
 */
-GF_Err gf_media_change_pl(GF_ISOFile *isom_file, u32 trackNumber, u32 profile, u32 level);
+GF_Err gf_media_change_pl(GF_ISOFile *isom_file, u32 trackNumber, u32 profile, u32 compat, u32 level);
 
 /*!
 Rewrite NAL-based samples (AVC/HEVC/...) samples if nalu size_length has to be changed
@@ -514,7 +561,7 @@
 	GF_LHVC_EXTRACTORS_ON,
 	/*! don't use extractors and keep base track inband/outofband param set signaling*/
 	GF_LHVC_EXTRACTORS_OFF,
-	/*! don't use extractors and force inband signaling in enhancement layer (for ATSC3)*/
+	/*! don't use extractors and force inband signaling in enhancement layer*/
 	GF_LHVC_EXTRACTORS_OFF_FORCE_INBAND
 } GF_LHVCExtractoreMode;
 
@@ -570,14 +617,14 @@
 {
 	/*! source file to be used*/
 	char *file_name;
-	/*! ID of the representation. If not set, assigned automatically*/
+	/*! ID of the representation, may be NULL (assigned by dasher)*/
 	char *representationID;
-	/*! ID of the period. If not set, assigned automatically*/
+	/*! ID of the period, may be NULL (assigned by dasher)*/
 	char *periodID;
-	/*! ID of the adaptation set. If not set, assigned automatically.*/
+	/*! ID of the adaptation set, may be 0 (assigned by dasher)*/
 	u32 asID;
 	/*! forced media duration.*/
-	Double media_duration;
+	GF_Fraction64 media_duration;
 	/*! number of base URLs in the baseURL structure*/
 	u32 nb_baseURL;
 	/*! list of baseURL to be used for this representation*/
@@ -607,9 +654,9 @@
 	/*! forces bandwidth in bits per seconds of the source media. If 0, computed from file */
 	u32 bandwidth;
 	/*! forced period duration (used when using empty periods or xlink periods without content)*/
-	Double period_duration;
+	GF_Fraction period_duration;
 	/*! forced dash target duration for this rep*/
-	Double dash_duration;
+	GF_Fraction dash_duration;
 	/*! sets default start number for this representation. if not set, assigned automatically */
 	u32 startNumber; 	//TODO: start number, template
 	/*! overrides template for this input*/
@@ -653,6 +700,8 @@
 	GF_DASH_PROFILE_AVC264_LIVE,
 	/*! industry profile DASH-IF ISOBMFF onDemand */
 	GF_DASH_PROFILE_AVC264_ONDEMAND,
+	/*! industry profile DASH-IF ISOBMFF low latency */
+	GF_DASH_PROFILE_DASHIF_LL,
 } GF_DashProfile;
 
 
@@ -668,6 +717,8 @@
 	GF_DASH_BSMODE_NONE,
 	/*! always inband parameter sets */
 	GF_DASH_BSMODE_INBAND,
+	/*! out of band parameter sets except PPS and APS, used for VVC */
+	GF_DASH_BSMODE_INBAND_PPS,
 	/*! attempts to merge parameter sets in a single sample entry */
 	GF_DASH_BSMODE_MERGED,
 	/*! parameter sets are in different sample entries */
@@ -714,7 +765,7 @@
 Create a new DASH segmenter
 \param mpdName target MPD file name, cannot be changed
 \param profile target DASH profile, cannot be changed
-\param tmp_dir temp dir for file generation, OS NULL for default
+\param tmp_dir temp dir for file generation, if NULL uses libgpac default
 \param timescale timescale used to specif most of the dash timings. If 0, 1000 is used
 \param dasher_context_file config file used to store the context of the DASH segmenter. This allows destroying the segmenter and restarting it later on with the right DASH segquence numbers, MPD and and timing info
 \return the DASH segmenter object
@@ -815,7 +866,7 @@
 GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Double default_fragment_duration, Double sub_duration);
 
 /*!
- Enables spliting at RAP boundaries
+ Enables splitting at RAP boundaries
 \param dasher the DASH segmenter object
 \param segments_start_with_rap segments will be split at RAP boundaries
 \param fragments_start_with_rap fragments will be split at RAP boundaries
@@ -989,6 +1040,15 @@
 */
 GF_Err gf_dasher_set_split_mode(GF_DASHSegmenter *dasher, GF_DASH_SplitMode split_mode);
 
+
+/*!
+ Enable/Disable last segment merging (disabled by default).
+ *	\param dasher the DASH segmenter object
+ *	\param merge_last_seg if true, last segment is merged into previous if duration less than half target dur
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_last_segment_merge(GF_DASHSegmenter *dasher, Bool merge_last_seg);
+
 /*!
 Sets m3u8 file name - if not set, no m3u8 output
 \param dasher the DASH segmenter object
@@ -1047,6 +1107,14 @@
 */
 GF_Err gf_dasher_print_session_info(GF_DASHSegmenter *dasher, u32 fs_print_flags);
 
+/*!
+ Keeps UTC creation and modification dates from sources, if any (default is no)
+\param dasher the DASH segmenter object
+\param keep_utc if GF_TRUE, keeps UTC times
+\return error if any
+*/
+GF_Err gf_dasher_keep_source_utc(GF_DASHSegmenter *dasher, Bool keep_utc);
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 /*!
 save file as fragmented movie
@@ -1088,12 +1156,12 @@
 	GF_EXPORT_RAW_SAMPLES = (1<<1),
 	/*! NHNT format (any MPEG-4 media)*/
 	GF_EXPORT_NHNT = (1<<2),
-	/*! AVI (MPEG4 video and AVC tracks only)*/
-	GF_EXPORT_AVI = (1<<3),
+	/*! full remux of source file - equivalent to `gpac -i in_name:FID=1 reframer:FID=2:SID=1 -o out_name:SID=2` */
+	GF_EXPORT_REMUX = (1<<3),
 	/*! MP4 (all except OD)*/
 	GF_EXPORT_MP4 = (1<<4),
-	/*! AVI->RAW to dump video (trackID=1) or audio (trackID>=2)*/
-	GF_EXPORT_AVI_NATIVE = (1<<5),
+	/*! currently unused*/
+	GF_EXPORT_UNUSED = (1<<4),
 	/*! NHML format (any media)*/
 	GF_EXPORT_NHML = (1<<6),
 	/*! SAF format*/
@@ -1123,7 +1191,7 @@
 	/*! Experimental Streaming Instructions */
 	GF_EXPORT_SIX = (1<<16),
 
-	/*! ony probes extraction format*/
+	/*! only probes extraction format*/
 	GF_EXPORT_PROBE_ONLY = (1<<30),
 	/*when set by user during export, will abort*/
 	GF_EXPORT_DO_ABORT = 0x80000000 //(1<<31)
@@ -1148,7 +1216,10 @@
 	char *in_name;
 	/*! optional FILE for output*/
 	FILE *dump_file;
+	/*! filter session dump flags*/
 	u32 print_stats_graph;
+	/*! track type: 0: none specified, 1: video, 2: audio*/
+	u32 track_type;
 } GF_MediaExporter;
 
 /*!
@@ -1373,6 +1444,16 @@
 */
 void gf_media_get_video_timing(Double fps, u32 *timescale, u32 *ts_inc);
 
+/*! gets dolby vision level
+ \param width width in pixels of video
+ \param height height in pixels of video
+ \param fps_num framerate numerator
+ \param fps_den framerate denominator
+ \param codecid GPAC codec ID
+ \return dv level
+*/
+u32 gf_dolby_vision_level(u32 width, u32 height, u64 fps_num, u64 fps_den, u32 codecid);
+
 #ifdef __cplusplus
 }
 #endif

gpac-1.0.1.tar.gz/include/gpac/mediaobject.h -> gpac-2.0.0.tar.gz/include/gpac/mediaobject.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Stream Management sub-project
@@ -42,7 +42,7 @@
 \ingroup playback_grp
 \brief Interface between compositor and decoding engine for media data access.
 
-This section documents the API betwwen the compositor of GPAC and the decoding engine (terminal)
+This section documents the API between the compositor of GPAC and the decoding engine (terminal)
 
 @{
 */
@@ -55,8 +55,8 @@
 
 opaque handler for all natural media objects (audio, video, image) so that compositor and systems engine
 are not too tied up.
-	NOTE: the media object location relies on the node parent graph (this is to deal with namespaces in OD framework)
-therefore it is the task of the media management app to setup clear links between the scene graph and its ressources
+	\note The media object location relies on the node parent graph (this is to deal with namespaces in OD framework)
+therefore it is the task of the media management app to setup clear links between the scene graph and its resources
 (but this is not mandatory, cf URLs in VRML )
 */
 typedef struct _mediaobj GF_MediaObject;
@@ -112,7 +112,7 @@
 */
 
 /*! sets speed of media - speed is not always applied, depending on media control settings.
-NOTE: audio pitching is the responsability of the rendering app
+\note audio pitching is the responsability of the rendering app
 \param mo the target media object
 \param speed the playback speed to set
 */
@@ -229,21 +229,16 @@
 \param stride set to stride in bytes for visual objects with data frame, 0 if unknown
 \param pixel_ar set to the pixel aspect ratio as \code (PAR_NUM<<16)|PAR_DEN \endcode
 \param pixelFormat set to the pixel format of the video
-\param is_flipped set to GF_TRUE if the pixels are vertically flipped (happens when reading back openGL textures)
+\param is_flipped set to GF_TRUE if the pixels are vertically flipped (happens when reading back OpenGL textures)
 \return GF_TRUE if success*/
 Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped);
 
 /*! gets number of views for 3D video object
 \param mo the target media object
-\param nb_views set to the number of views in the object
+\param nb_views set to the number of views in the object, vertically packed
 */
 void gf_mo_get_nb_views(GF_MediaObject *mo, u32 *nb_views);
 
-/*! gets number of layers for 2D scalable video object
-\param mo the target media object
-\param nb_layers set to the number of layers in the object
-*/
-void gf_mo_get_nb_layers(GF_MediaObject *mo, u32 *nb_layers);
 /*! gets visual information of a media object
 \param mo the target media object
 \param sample_rate set to the sampling frequency of the object
@@ -269,7 +264,7 @@
 {
 	/*used by animation stream to remove TEXT from display upon delete and URL change*/
 	GF_MO_DISPLAY_REMOVE = (1<<1),
-	/*used when resyncing a stream (droping late frames)*/
+	/*used when resyncing a stream (dropping late frames)*/
 	GF_MO_IN_RESYNC = (1<<2),
 } GF_MOUserFlags;
 /*! sets flags on a media object

gpac-1.0.1.tar.gz/include/gpac/module.h -> gpac-2.0.0.tar.gz/include/gpac/module.h Changed

gpac-1.0.1.tar.gz/include/gpac/modules/audio_out.h -> gpac-2.0.0.tar.gz/include/gpac/modules/audio_out.h Changed

gpac-1.0.1.tar.gz/include/gpac/modules/codec.h -> gpac-2.0.0.tar.gz/include/gpac/modules/codec.h Changed

gpac-1.0.1.tar.gz/include/gpac/modules/video_out.h -> gpac-2.0.0.tar.gz/include/gpac/modules/video_out.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / modules interfaces
@@ -101,9 +101,9 @@
 	the app accesses to the surface through the GF_VideoSurface handler.
 	The module may support HW blitting of RGB or YUV data to backbuffer.
 
-	** the 3D video output only handles window management and openGL contexts setup.
+	** the 3D video output only handles window management and OpenGL contexts setup.
 	The context shall be setup in Resize and SetFullScreen calls which are always happening in the main
-	rendering thread. This will take care of openGL context issues with multithreading
+	rendering thread. This will take care of OpenGL context issues with multithreading
 
 	By default all modules are required to be setup in 2D. If 3D is needed, a GF_EVENT_VIDEO_SETUP will
 	be sent with the desired configuration.
@@ -125,7 +125,7 @@
 
 	/*flush video: the video shall be presented to screen
 	the destination area to update is in client display coordinates (0,0) being top-left, (w,h) bottom-right
-	Note: dest is always NULL in 3D mode (buffer flip only)*/
+	\note dest is always NULL in 3D mode (buffer flip only)*/
 	GF_Err (*Flush) (struct _video_out *vout, GF_Window *dest);
 
 	GF_Err (*SetFullScreen) (struct _video_out *vout, Bool fs_on, u32 *new_disp_width, u32 *new_disp_height);

gpac-1.0.1.tar.gz/include/gpac/mpd.h -> gpac-2.0.0.tar.gz/include/gpac/mpd.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre - Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2010-2012
+ *			Copyright (c) Telecom ParisTech 2010-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
@@ -109,16 +109,10 @@
 The children list is NULL if no extensions were found, otherwise it is a list of GF_XMLNode
 */
 #define MPD_EXTENSIBLE	\
-	GF_List *attributes;	\
-	GF_List *children;	\
+	GF_List *x_attributes;	\
+	GF_List *x_children;	\
 
-/*! basic extensible MPD element*/
-typedef struct
-{
-	MPD_EXTENSIBLE
-} GF_MPD_ExtensibleVirtual;
-
-/*! basic extensible MPD descritpor*/
+/*! basic extensible MPD descriptor*/
 typedef struct
 {
 	MPD_EXTENSIBLE
@@ -210,15 +204,6 @@
 	s64 mediaOffset;
 } GF_MPD_ISOBMFInfo;
 
-
-/*! other XML descriptors*/
-typedef struct
-{
-	/*! list of XML descriptors*/
-	char *xml_desc;
-} GF_MPD_other_descriptors;
-
-
 /*! macro for MPD segment base*/
 #define GF_MPD_SEGMENT_BASE	\
 	u32 timescale;	\
@@ -274,8 +259,16 @@
 	char *key_url;
 	/*! key IV of segment, HLS only*/
 	bin128 key_iv;
-	/*! UTC start time of segment, HLS only*/
-	u64 hls_utc_start_time;
+	/*! sequence number of segment, HLS only*/
+	u32 hls_seq_num;
+	/*! informative UTC start time of segment, HLS only*/
+	u64 hls_utc_time;
+	/*! 0: full segment, 1: LL-HLS part, 2: independent LL-HLS part */
+	u8 hls_ll_chunk_type;
+	/*! merge flag for byte-range subsegs 0: cannot merge, 1: can merge */
+	u8 can_merge;
+	/*! merge flag for byte-range subsegs 0: cannot merge, 1: can merge */
+	u8 is_first_part;
 } GF_MPD_SegmentURL;
 
 /*! SegmentList*/
@@ -290,10 +283,12 @@
 	/*! xlink evaluation on load if set, otherwise on use*/
 	Bool xlink_actuate_on_load;
 
-	/*! GPAC intenral, number of consecutive xlink while solving*/
+	/*! GPAC internal, number of consecutive xlink while solving*/
 	u32 consecutive_xlink_count;
-	/*! GPAC intenral, we store the segment template here*/
+	/*! GPAC internal, we store the segment template here*/
 	char *dasher_segment_name;
+	/*! GPAC internal, we store the previous xlink before resolution*/
+	char *previous_xlink_href;
 } GF_MPD_SegmentList;
 
 /*! SegmentTemplate*/
@@ -309,6 +304,9 @@
 	char *initialization;
 	/*! bitstream switching segment template*/
 	char *bitstream_switching;
+
+	/*! internal, for HLS generation*/
+	const char *hls_init_name;
 } GF_MPD_SegmentTemplate;
 
 /*! MPD scan types*/
@@ -337,6 +335,8 @@
 	codecs
 */
 #define GF_MPD_COMMON_ATTRIBUTES_ELEMENTS	\
+	GF_List *x_attributes;	\
+	GF_List *x_children;	\
 	char *profiles;	\
 	u32 width;	\
 	u32 height;	\
@@ -389,7 +389,7 @@
 	char *wallclock;
 	/*! presentation time in timescale of the Representation*/
 	u64 presentation_time;
-	/*! UTC timing desc if any/*/
+	/*! UTC timing desc if any */
 	GF_MPD_Descriptor *utc_timing;
 } GF_MPD_ProducerReferenceTime;
 
@@ -440,8 +440,18 @@
 	u32 enhancement_rep_index_plus_one;
 	/*! set to true if the representation comes from a broadcast link (ATSC3, eMBMS)*/
 	Bool broadcast_flag;
+
+	/*! if set indicates the associated representations use vvc rpr switching*/
+	Bool vvc_rpr_switch;
+
+	/*! start of segment name in full url*/
+	const char *init_seg_name_start;
 	/*! opaque data*/
 	void *udta;
+	/*! SHA1 digest for xlinks / m3u8*/
+	u8 xlink_digest[GF_SHA1_DIGEST_SIZE];
+	/*! set to TRUE if not modified in the update of an xlink*/
+	Bool not_modified;
 } GF_DASH_RepresentationPlayback;
 
 /*! segment context used by the dasher, GPAC internal*/
@@ -450,9 +460,9 @@
 	/*! ID of active period*/
 	char *period_id;
 	/*! start of active period*/
-	Double period_start;
+	GF_Fraction64 period_start;
 	/*! duration of active period*/
-	Double period_duration;
+	GF_Fraction64 period_duration;
 	/*! if GF_TRUE, representation is over*/
 	Bool done;
 	/*! niumber of last packet processed (to resume dashing)*/
@@ -478,7 +488,7 @@
 	/*! indicates if uses multi PID (eg, multiple sample descriptions in init segment)*/
 	Bool multi_pids;
 	/*! target segment duration for this stream*/
-	Double dash_dur;
+	GF_Fraction dash_dur;
 	/*! estimated next segment start time in MPD timescale*/
 	u64 next_seg_start;
 	/*! first CTS of stream in stream timescale*/
@@ -513,6 +523,19 @@
 	Bool subdur_forced;
 } GF_DASH_SegmenterContext;
 
+/*! fragment context info for LL-HLS*/
+typedef struct
+{
+	/*! frag offset in bytes*/
+	u64 offset;
+	/*! frag size in bytes*/
+	u64 size;
+	/*! frag duration in representation timescale*/
+	u32 duration;
+	/*! fragment contains an IDR*/
+	Bool independent;
+} GF_DASH_FragmentContext;
+
 /*! Segment context - GPAC internal, used to produce HLS manifests and segment lists/timeline*/
 typedef struct
 {
@@ -534,6 +557,20 @@
 	u64 index_offset;
 	/*! segment number */
 	u32 seg_num;
+	/*! number of fragment infos */
+	u32 nb_frags;
+	/*! number of fragment infos */
+	GF_DASH_FragmentContext *frags;
+	/*! HLS LL signaling - 0: disabled, 1: byte range, 2: files */
+	u32 llhls_mode;
+	/*! HLS LL segment done */
+	Bool llhls_done;
+	/*! HLS set to TRUE if encrypted */
+	Bool encrypted;
+	/*! HLS key params (URI and co)*/
+	char *hls_key_uri;
+	/*! HLS IV*/
+	bin128 hls_iv;
 } GF_DASH_SegmentContext;
 
 /*! Representation*/
@@ -563,9 +600,6 @@
 	/*! number of subrepresentation*/
 	GF_List *sub_representations;
 
-	/*! other MPD descriptors*/
-	GF_List *other_descriptors;
-
 	/*! all the below members are GPAC internal*/
 
 	/*! GPAC playback implementation*/
@@ -574,6 +608,10 @@
 	u32 m3u8_media_seq_min;
 	/*! internal, HLS: max sequence number of segments in playlist*/
 	u32 m3u8_media_seq_max;
+	/*! internal, HLS: indicate this is a low latency rep*/
+	u32 m3u8_low_latency;
+	/*! internal, HLS:  sequence number of last indeendent  segment or PART in playlist*/
+	u32 m3u8_media_seq_indep_last;
 
 	/*! GPAC dasher context*/
 	GF_DASH_SegmenterContext *dasher_ctx;
@@ -586,7 +624,7 @@
 	/*! segment manifest timescale (for HLS)*/
 	u32 timescale_mpd;
 	/*! dash duration*/
-	Double dash_dur;
+	GF_Fraction dash_dur;
 	/*! init segment name for HLS single file*/
 	const char *hls_single_file_name;
 	/*! number of audio channels - HLS only*/
@@ -602,6 +640,19 @@
 	char *m3u8_var_name;
 	/*! temp file for m3u8 generation*/
 	FILE *m3u8_var_file;
+
+	/*! for m3u8: 0: not encrypted, 1: full segment, 2: CENC*/
+	u8 crypto_type;
+	u8 def_kms_used;
+
+	u32 nb_hls_master_tags;
+	const char **hls_master_tags;
+
+	u32 nb_hls_variant_tags;
+	const char **hls_variant_tags;
+
+	/*! target part (cmaf chunk) duration for HLS LL*/
+	Double hls_ll_part_dur;
 } GF_MPD_Representation;
 
 /*! AdaptationSet*/
@@ -609,8 +660,8 @@
 {
 	/*! inherits common attributes*/
 	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
-	/*! ID of this set*/
-	u32 id;
+	/*! ID of this set, -1 if not set*/
+	s32 id;
 	/*! group ID for this set, default value is -1: not set in MPD*/
 	s32 group;
 	/*! language*/
@@ -668,11 +719,23 @@
 	char *xlink_href;
 	/*! xlink evaluation on load if set, otherwise on use*/
 	Bool xlink_actuate_on_load;
-	/*! other descriptors*/
-	GF_List *other_descriptors;
 
 	/*! user private, eg used by dasher*/
 	void *udta;
+
+	/*! mpegh compatible profile hack*/
+	u32 nb_alt_mha_profiles, *alt_mha_profiles;
+	Bool alt_mha_profiles_only;
+
+	/*! max number of valid chunks in smooth manifest*/
+	u32 smooth_max_chunks;
+
+	/*! INTRA-ONLY trick mode*/
+	Bool intra_only;
+	/*! adaptation set uses HLS LL*/
+	Bool use_hls_ll;
+	/*target fragment duration*/
+	Double hls_ll_target_frag_dur;
 } GF_MPD_AdaptationSet;
 
 /*! MPD offering type*/
@@ -688,6 +751,9 @@
 /*! Period*/
 typedef struct
 {
+	/*! inherits from extensible*/
+	MPD_EXTENSIBLE
+
 	/*! ID of period*/
 	char *ID;
 	/*! start time in milliseconds, relative to the start of the MPD */
@@ -714,17 +780,26 @@
 	/*! xlink evaluation on load if set, otherwise on use*/
 	Bool xlink_actuate_on_load;
 
-	/*! other descriptors*/
-	GF_List *other_descriptors;
-	/*! original xlink URL before resolution, used to identify already resolved xlinks in MPD updates - GPAC internal*/
+	/*! original xlink URL before resolution - GPAC internal. Used to
+		- identify already resolved xlinks in MPD updates
+		- resolve URLs in remote period if no baseURL is explictly listed
+	*/
 	char *origin_base_url;
+	/*! broken/ignored xlink, used to identify ignored xlinks in MPD updates  - GPAC internal*/
+	char *broken_xlink;
 	/*! type of the period - GPAC internal*/
 	GF_MPD_Type type;
+
+	/*! period is preroll - test only, GPAC internal*/
+	Bool is_preroll;
 } GF_MPD_Period;
 
 /*! Program info*/
 typedef struct
 {
+	/*! inherits from extensible*/
+	MPD_EXTENSIBLE
+
 	/*! languae*/
 	char *lang;
 	/*! title*/
@@ -783,10 +858,15 @@
 	/*! set during parsing, to set during authoring, won't be freed by GPAC*/
 	const char *xml_namespace;
 
-	/*! UTC timing desc if any/*/
+	/*! UTC timing desc if any */
 	GF_List *utc_timings;
+	/*! Essential properties */
+	GF_List *essential_properties;
+	/*! Supplemental properties */
+	GF_List *supplemental_properties;
 
 	/* internal variables for dasher*/
+	Bool inject_service_desc;
 
 	/*! dasher init NTP clock in ms - GPAC internal*/
 	u64 gpac_init_ntp_ms;
@@ -803,6 +883,15 @@
 	Bool create_m3u8_files;
 	/*! indicates to insert clock reference in variant playlists*/
 	Bool m3u8_time;
+	/*! indicates  LL-HLS forced generation. 0: regular write, 1: write as byterange, 2: write as independent files*/
+	u32 force_llhls_mode;
+	/*! HLS extensions to append in the master playlist*/
+	u32 nb_hls_ext_master;
+	const char **hls_ext_master;
+	/*! if true inject EXT-X-PRELOAD-HINT*/
+	Bool llhls_preload;
+	/*! if true inject EXT-X-RENDITION-REPORT*/
+	Bool llhls_rendition_reports;
 } GF_MPD;
 
 /*! parses an MPD Element (and subtree) from DOM
@@ -927,7 +1016,7 @@
 \param reload_count number of times the manifest was reloaded
 \param mimeTypeForM3U8Segments default mime type for the segments in case not found in the m3u8
 \param do_import if GF_TRUE, will try to load the media segments to extract more info
-\param use_mpd_templates if GF_TRUE, will use MPD SegmentTemplate instead of SegmentList
+\param use_mpd_templates if GF_TRUE, will use MPD SegmentTemplate instead of SegmentList (only if parse_sub_playlist is GF_TRUE)
 \param use_segment_timeline if GF_TRUE, uses SegmentTimeline to describe the varying duration of segments
 \param getter HTTP interface object
 \param mpd MPD structure to fill, or NULL if converting to file
@@ -939,12 +1028,14 @@
 
 /*! solves an m3u8 xlink on a representation, and fills the SegmentList accordingly
 \param rep the target representation
+\param base_url base URL of master manifest (representation xlink is likely relative to this URL)
 \param getter HTTP interface object
 \param is_static set to GF_TRUE if the variant subplaylist is on demand
 \param duration set to the duration of the parsed subplaylist
-\return error if any
+\param signature SHA1 digest of last solved version, updated if changed
+\return error if any, GF_EOS if no changes
 */
-GF_Err gf_m3u8_solve_representation_xlink(GF_MPD_Representation *rep, GF_FileDownload *getter, Bool *is_static, u64 *duration);
+GF_Err gf_m3u8_solve_representation_xlink(GF_MPD_Representation *rep, const char *base_url, GF_FileDownload *getter, Bool *is_static, u64 *duration, u8 signature[GF_SHA1_DIGEST_SIZE]);
 
 /*! creates a segment list from a remote segment list DOM root
 \param mpd the target MPD to write
@@ -965,7 +1056,7 @@
 \param segment_list the segment list to delete*/
 void gf_mpd_delete_segment_list(GF_MPD_SegmentList *segment_list);
 
-/*! deletes a list content and optionaly destructs the list
+/*! deletes a list content and optionally destructs the list
 \param list the target list
 \param __destructor the destructor function to use to destroy list items
 \param reset_only  if GF_TRUE, does not destroy the target list
@@ -1012,6 +1103,8 @@
 	GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE,
 	/*! same as GF_MPD_RESOLVE_URL_MEDIA but does not use startNumber*/
 	GF_MPD_RESOLVE_URL_MEDIA_NOSTART,
+	/*! same as GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE but ignores base URL*/
+	GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE_NO_BASE,
 } GF_MPD_URLResolveType;
 
 /*! resolves a URL based for a given segment, based on the MPD url, the type of resolution
@@ -1031,10 +1124,12 @@
 \param is_in_base_url set to GF_TRUE if the resuloved URL is a sub-part of the baseURL (optional, may be NULL)
 \param out_key_url set to the key URL for the segment for HLS (optional, may be NULL)
 \param key_iv set to the key IV for the segment for HLS (optional, may be NULL)
+\param out_start_number set to the start_number used (optional, may be NULL)
+
 \return error if any
 */
 GF_Err gf_mpd_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, const char *mpd_url, u32 base_url_index, GF_MPD_URLResolveType resolve_type, u32 item_index, u32 nb_segments_removed,
-                          char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url, char **out_key_url, bin128 *key_iv);
+                          char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url, char **out_key_url, bin128 *key_iv, u32 *out_start_number);
 
 /*! get duration of the presentation
 \param mpd the target MPD
@@ -1123,12 +1218,19 @@
 \param stream_id the ID of the stream for which we load cues (typically, TrackID or GF_PROP_PID_ID)
 \param cues_timescale set to the timescale used in the cues document
 \param use_edit_list set to GF_TRUE if the cts values of cues have edit list applied (i.e. are ISOBMFF presentation times)
+\param ts_offset set to the timestamp offset to subtract from DTS/CTS values
 \param out_cues set to a newly allocated list of cues, to free by the caller
 \param nb_cues set to the number of cues parsed
 \return error if any
 */
-GF_Err gf_mpd_load_cues(const char *cues_file, u32 stream_id, u32 *cues_timescale, Bool *use_edit_list, GF_DASHCueInfo **out_cues, u32 *nb_cues);
+GF_Err gf_mpd_load_cues(const char *cues_file, u32 stream_id, u32 *cues_timescale, Bool *use_edit_list, s32 *ts_offset, GF_DASHCueInfo **out_cues, u32 *nb_cues);
 
+/*! gets first MPD descriptor from descriptor list for a given scheme_id
+\param desclist list of MPD Descriptors
+\param scheme_id scheme ID to look for
+\return descriptor if found, NUL otherwise
+*/
+GF_MPD_Descriptor *gf_mpd_get_descriptor(GF_List *desclist, char *scheme_id);
 
 /*! @} */
 #endif /*GPAC_DISABLE_CORE_TOOLS*/

gpac-1.0.1.tar.gz/include/gpac/mpeg4_odf.h -> gpac-2.0.0.tar.gz/include/gpac/mpeg4_odf.h Changed

@@ -155,7 +155,7 @@
 
 
 /*!	default descriptor.
-	NOTE: The decoderSpecificInfo is used as a default desc with tag 0x05 */
+	\note The decoderSpecificInfo is used as a default desc with tag 0x05 */
 typedef struct
 {
 	BASE_DESCRIPTOR
@@ -183,7 +183,7 @@
 	GF_List *extensionDescriptors;
 	/*MPEG-2 (or other service mux formats) service ID*/
 	u32 ServiceID;
-	/*for ATSC, instructs client to keep OD alive even though URL string is set*/
+	/*for ROUTE, instructs client to keep OD alive even though URL string is set*/
 	Bool RedirectOnly;
 	/*set to true for fake remote ODs in BT/XMT (remote ODs created for OD with ESD with MuxInfo)*/
 	Bool fake_remote;
@@ -205,7 +205,7 @@
 	GF_List *extensionDescriptors;
 	/*MPEG-2 (or other service mux formats) service ID*/
 	u16 ServiceID;
-	/*for ATSC, instructs client to keep OD alive even though URL string is set*/
+	/*for ROUTE, instructs client to keep OD alive even though URL string is set*/
 	Bool RedirectOnly;
 	/*set to true for fake remote ODs in BT/XMT (remote ODs created for OD with ESD with MuxInfo)*/
 	Bool fake_remote;
@@ -235,7 +235,7 @@
 
 	/*MPEG-2 (or other service mux formats) service ID*/
 	u32 ServiceID;
-	/*for ATSC, instructs client to keep OD alive even though URL string is set*/
+	/*for ROUTE, instructs client to keep OD alive even though URL string is set*/
 	Bool RedirectOnly;
 	/*set to true for fake remote ODs in BT/XMT (remote ODs created for OD with ESD with MuxInfo)*/
 	Bool fake_remote;
@@ -425,10 +425,16 @@
 /*! flags for text style*/
 enum
 {
+	/*! normal*/
 	GF_TXT_STYLE_NORMAL = 0,
+	/*! bold*/
 	GF_TXT_STYLE_BOLD = 1,
-	GF_TXT_STYLE_ITALIC = 2,
-	GF_TXT_STYLE_UNDERLINED = 4
+	/*! italic*/
+	GF_TXT_STYLE_ITALIC = 1<<1,
+	/*! underlined*/
+	GF_TXT_STYLE_UNDERLINED = 1<<2,
+	/*! strikethrough - not 3GPP/QT defined, GPAC only*/
+	GF_TXT_STYLE_STRIKETHROUGH = 1<<3,
 };
 
 /*! text style record*/
@@ -849,7 +855,7 @@
 } GF_ContentCreatorInfo;
 
 /*! Content Creator Name GF_Descriptor
-NOTE: the desctructor will delete all the items in the list
+\note The desctructor will delete all the items in the list
 (GF_ContentCreatorInfo items) */
 typedef struct {
 	BASE_DESCRIPTOR
@@ -915,15 +921,21 @@
 	u8 profileLevelIndicationIndex;
 } GF_PL_IDX;
 
-/*! used for storing AVC sequenceParameterSetNALUnit and pictureParameterSetNALUnit*/
+/*! used for storing NALU-based parameter set in AVC/HEVC/VVC configuration record*/
 typedef struct
 {
+	/*! size of nal*/
 	u16 size;
+	/*! nal data*/
 	u8 *data;
-	/* used of AVC/SVC detection */
+	/*! ID of param set, used by some importers but not written in file*/
 	s32 id;
+	/*! CRC of nal, used by some importers but not written in file*/
 	u32 crc;
-} GF_AVCConfigSlot;
+} GF_NALUFFParam;
+
+/*! pre v1.1 naming of NALU config record*/
+typedef GF_NALUFFParam GF_AVCConfigSlot;
 
 /*! AVC config record - not a real MPEG-4 descriptor
 */
@@ -959,7 +971,10 @@
 	u8 type;
 	u8 array_completeness;
 	GF_List *nalus;
-} GF_HEVCParamArray;
+} GF_NALUFFParamArray;
+
+/*! pre v1.1 naming of NALU param array*/
+typedef GF_NALUFFParamArray GF_HEVCParamArray;
 
 /*! HEVC config record - not a real MPEG-4 descriptor*/
 typedef struct
@@ -1002,6 +1017,41 @@
 
 } GF_HEVCConfig;
 
+
+
+/*! VVC config record - not a real MPEG-4 descriptor*/
+typedef struct
+{
+	u8 general_profile_idc;
+	u8 general_tier_flag;
+	u8 general_sub_profile_idc;
+	u8 num_constraint_info;
+	u8 *general_constraint_info;
+	u8 general_level_idc;
+
+	u8 ptl_sublayer_present_mask;
+	u8 sublayer_level_idc[8];
+
+	u8 chroma_format;
+	u8 bit_depth;
+	u16 avgFrameRate;
+	u8 constantFrameRate;
+	u8 numTemporalLayers;
+	u16 maxPictureWidth, maxPictureHeight;
+
+	Bool ptl_present, ptl_frame_only_constraint, ptl_multilayer_enabled;
+	u8 num_sub_profiles;
+	u32 *sub_profiles_idc;
+
+	u16 ols_idx;
+	u8 nal_unit_size;
+
+	GF_List *param_array;
+
+	Bool write_annex_b;
+} GF_VVCConfig;
+
+
 /*! used for storing AV1 OBUs*/
 typedef struct
 {
@@ -1056,7 +1106,7 @@
 	int RefFrameHeight[VP9_NUM_REF_FRAMES];
 } GF_VPConfig;
 
-/*! DolbyVision config dvcC */
+/*! DolbyVision config dvcC/dvvC */
 typedef struct {
 	u8 dv_version_major;
 	u8 dv_version_minor;
@@ -1065,7 +1115,12 @@
 	Bool rpu_present_flag;
 	Bool el_present_flag;
 	Bool bl_present_flag;
-	//const unsigned int (32)[5] reserved = 0;
+	u8 dv_bl_signal_compatibility_id; //4 bits
+	//const unsigned int (28) reserved = 0;
+	//const unsigned int (32)[4] reserved = 0;
+
+	//internal, force dvhe or dvh1 signaling
+	u8 force_dv;
 } GF_DOVIDecoderConfigurationRecord;
 
 /*! Media Segment Descriptor used for Media Control Extensions*/
@@ -1284,7 +1339,7 @@
 \return error if any
 */
 GF_Err gf_odf_get_laser_config(GF_DefaultDescriptor *dsi, GF_LASERConfig *cfg);
-/*! sepcial function for authoring - convert DSI to TextConfig
+/*! special function for authoring - convert DSI to TextConfig
 \param data TEXT decoder config block
 \param data_len TEXT decoder config block size
 \param codecid TEXT codecid/object type indication
@@ -1380,6 +1435,42 @@
 GF_HEVCConfig *gf_odf_hevc_cfg_read(u8 *dsi, u32 dsi_size, Bool is_lhvc);
 
 
+/*! VVC config constructor
+\return the created VVC config*/
+GF_VVCConfig *gf_odf_vvc_cfg_new();
+
+/*! VVC config destructor
+\param cfg the VVC config to destroy*/
+void gf_odf_vvc_cfg_del(GF_VVCConfig *cfg);
+
+/*! writes GF_VVCConfig as MPEG-4 DSI in a bitstream object
+\param cfg the VVC config to encode
+\param bs output bitstream object in which the config is written
+\return error if any
+ */
+GF_Err gf_odf_vvc_cfg_write_bs(GF_VVCConfig *cfg, GF_BitStream *bs);
+
+/*! writes GF_VVCConfig as MPEG-4 DSI
+\param cfg the VVC config to encode
+\param outData encoded dsi buffer - it is the caller responsability to free this
+\param outSize encoded dsi buffer size
+\return error if any
+ */
+GF_Err gf_odf_vvc_cfg_write(GF_VVCConfig *cfg, u8 **outData, u32 *outSize);
+
+/*! gets GF_VVCConfig from bitstream MPEG-4 DSI
+\param bs bitstream containing the encoded VVC decoder specific info
+\return the decoded VVC config
+ */
+GF_VVCConfig *gf_odf_vvc_cfg_read_bs(GF_BitStream *bs);
+
+/*! gets GF_VVCConfig from MPEG-4 DSI
+\param dsi encoded VVC decoder specific info
+\param dsi_size encoded VVC decoder specific info size
+\return the decoded VVC config
+ */
+GF_VVCConfig *gf_odf_vvc_cfg_read(u8 *dsi, u32 dsi_size);
+
 /*! AV1 config constructor
 \return the created AV1 config*/
 GF_AV1Config *gf_odf_av1_cfg_new();
@@ -1474,6 +1565,87 @@
 \param cfg the DolbyVision config to destroy*/
 void gf_odf_dovi_cfg_del(GF_DOVIDecoderConfigurationRecord *cfg);
 
+
+/*! AC-3 config record extension for EAC-3 - see dolby specs*/
+typedef struct __ec3_stream
+{
+	/*! AC3 fs code*/
+	u8 fscod;
+	/*! AC3 bsid code*/
+	u8 bsid;
+	/*! AC3 bs mode*/
+	u8 bsmod;
+	/*! AC3 ac mode*/
+	u8 acmod;
+	/*! LF on*/
+	u8 lfon;
+	/*! asvc mode, only for EC3*/
+	u8 asvc;
+	/*! deps, only for EC3*/
+	u8 nb_dep_sub;
+	/*! channel loc, only for EC3*/
+	u8 chan_loc;
+} GF_AC3StreamInfo;
+
+/*! AC3 config record*/
+typedef struct __ac3_config
+{
+	/*! indicates if ec3*/
+	u8 is_ec3;
+	/*! if AC3 this is the bitrate code, otherwise cumulated data rate of EC3 streams*/
+	u16 brcode;
+	/*! number of streams :
+		1 for AC3
+		max 8 for EC3, main stream is included
+	*/
+	u8 nb_streams;
+	/*! streams info*/
+	GF_AC3StreamInfo streams[8];
+
+	//! \cond used in parsing not part of the AC3 config record
+	u32 bitrate;
+	u32 sample_rate;
+	u32 framesize;
+	u32 channels;
+	u16 substreams; //bit-mask, used for channel map > 5.1
+
+	//! \endcond private
+
+} GF_AC3Config;
+
+
+/*! writes Dolby AC3/EAC3 config to buffer
+\param cfg the Dolby AC3 config to write
+\param bs the bitstream object in which to write the config
+\return error if any
+*/
+GF_Err gf_odf_ac3_cfg_write_bs(GF_AC3Config *cfg, GF_BitStream *bs);
+/*! writes Dolby AC3/EAC3 config to buffer
+\param cfg the Dolby AC3 config to write
+\param data set to created output buffer, must be freed by caller
+\param size set to created output buffer size
+\return error if any
+*/
+GF_Err gf_odf_ac3_cfg_write(GF_AC3Config *cfg, u8 **data, u32 *size);
+
+
+/*! parses an AC3/EC3 sample description
+\param dsi the encoded config
+\param dsi_len the encoded config size
+\param is_ec3 indicates that the encoded config is for an EC3 track
+\param cfg the AC3/EC3 config to fill
+\return Error if any
+*/
+GF_Err gf_odf_ac3_config_parse(u8 *dsi, u32 dsi_len, Bool is_ec3, GF_AC3Config *cfg);
+
+/*! parses an AC3/EC3 sample description from bitstream
+\param bs the bitstream object
+\param is_ec3 indicates that the encoded config is for an EC3 track
+\param cfg the AC3/EC3 config to fill
+\return Error if any
+*/
+GF_Err gf_odf_ac3_config_parse_bs(GF_BitStream *bs, Bool is_ec3, GF_AC3Config *cfg);
+
 /*! destroy the descriptors in a list but not the list
 \param descList descriptor list to destroy
 \return error if any

gpac-1.0.1.tar.gz/include/gpac/mpegts.h -> gpac-2.0.0.tar.gz/include/gpac/mpegts.h Changed

@@ -97,6 +97,8 @@
 	/* ... */
 	GF_M2TS_MPEG4_ODUPDATE_DESCRIPTOR			= 0x35,
 
+	GF_M2TS_HEVC_VIDEO_DESCRIPTOR			= 0x38,
+
 	/* 0x2D - 0x3F - ISO/IEC 13818-6 values */
 	/* 0x40 - 0xFF - User Private values */
 	GF_M2TS_DVB_NETWORK_NAME_DESCRIPTOR			= 0x40,
@@ -137,6 +139,8 @@
 	/* ... */
 	GF_M2TS_DVB_EAC3_DESCRIPTOR				= 0x7A,
 	GF_M2TS_DVB_LOGICAL_CHANNEL_DESCRIPTOR = 0x83,
+
+	GF_M2TS_DOLBY_VISION_DESCRIPTOR = 0xB0
 };
 
 /*! Reserved PID values */
@@ -215,62 +219,81 @@
 /*! MPEG-2 TS Media types*/
 typedef enum
 {
-	GF_M2TS_VIDEO_MPEG1				= 0x01,
-	GF_M2TS_VIDEO_MPEG2				= 0x02,
-	GF_M2TS_AUDIO_MPEG1				= 0x03,
-	GF_M2TS_AUDIO_MPEG2				= 0x04,
-	GF_M2TS_PRIVATE_SECTION			= 0x05,
-	GF_M2TS_PRIVATE_DATA			= 0x06,
-	GF_M2TS_MHEG					= 0x07,
-	GF_M2TS_13818_1_DSMCC			= 0x08,
-	GF_M2TS_H222_1					= 0x09,
-	GF_M2TS_13818_6_ANNEX_A			= 0x0A,
-	GF_M2TS_13818_6_ANNEX_B			= 0x0B,
-	GF_M2TS_13818_6_ANNEX_C			= 0x0C,
-	GF_M2TS_13818_6_ANNEX_D			= 0x0D,
-	GF_M2TS_13818_1_AUXILIARY		= 0x0E,
-	GF_M2TS_AUDIO_AAC				= 0x0F,
-	GF_M2TS_VIDEO_MPEG4				= 0x10,
-	GF_M2TS_AUDIO_LATM_AAC			= 0x11,
-
-	GF_M2TS_SYSTEMS_MPEG4_PES		= 0x12,
-	GF_M2TS_SYSTEMS_MPEG4_SECTIONS	= 0x13,
-
-	GF_M2TS_METADATA_PES			= 0x15,
-
-	GF_M2TS_VIDEO_H264				= 0x1B,
-	GF_M2TS_VIDEO_SVC				= 0x1F,
-	GF_M2TS_VIDEO_HEVC				= 0x24,
-	GF_M2TS_VIDEO_HEVC_TEMPORAL		= 0x25,
-	GF_M2TS_VIDEO_MVCD				= 0x26,
-	GF_M2TS_TEMI					= 0x27,
-	GF_M2TS_VIDEO_SHVC				= 0x28,
-	GF_M2TS_VIDEO_SHVC_TEMPORAL		= 0x29,
-	GF_M2TS_VIDEO_MHVC				= 0x2A,
-	GF_M2TS_VIDEO_MHVC_TEMPORAL		= 0x2B,
-
-	GF_M2TS_GREEN					= 0x2C,
-	GF_M2TS_MHAS_MAIN				= 0x2D,
-	GF_M2TS_MHAS_AUX				= 0x2E,
-
-	GF_M2TS_QUALITY_SEC				= 0x2F,
-	GF_M2TS_MORE_SEC				= 0x30,
-
-	GF_M2TS_VIDEO_HEVC_MCTS			= 0x31,
-
+	GF_M2TS_VIDEO_MPEG1						= 0x01,
+	GF_M2TS_VIDEO_MPEG2						= 0x02,
+	GF_M2TS_AUDIO_MPEG1						= 0x03,
+	GF_M2TS_AUDIO_MPEG2						= 0x04,
+	GF_M2TS_PRIVATE_SECTION					= 0x05,
+	GF_M2TS_PRIVATE_DATA					= 0x06,
+	GF_M2TS_MHEG							= 0x07,
+	GF_M2TS_13818_1_DSMCC					= 0x08,
+	GF_M2TS_H222_1							= 0x09,
+	GF_M2TS_13818_6_ANNEX_A					= 0x0A,
+	GF_M2TS_13818_6_ANNEX_B					= 0x0B,
+	GF_M2TS_13818_6_ANNEX_C					= 0x0C,
+	GF_M2TS_13818_6_ANNEX_D					= 0x0D,
+	GF_M2TS_13818_1_AUXILIARY				= 0x0E,
+	GF_M2TS_AUDIO_AAC						= 0x0F,
+	GF_M2TS_VIDEO_MPEG4						= 0x10,
+	GF_M2TS_AUDIO_LATM_AAC					= 0x11,
+	GF_M2TS_SYSTEMS_MPEG4_PES				= 0x12,
+	GF_M2TS_SYSTEMS_MPEG4_SECTIONS			= 0x13,
+	GF_M2TS_SYNC_DOWNLOAD_PROTOCOL			= 0x14,
+	GF_M2TS_METADATA_PES					= 0x15,
+	GF_M2TS_METADATA_SECTION				= 0x16,
+	GF_M2TS_METADATA_DATA_CAROUSEL			= 0x17,
+	GF_M2TS_METADATA_OBJECT_CAROUSEL		= 0x18,
+	GF_M2TS_METADATA_SYNC_DOWNLOAD_PROTOCOL	= 0x19,
+	GF_M2TS_IPMP							= 0x1A,
+	GF_M2TS_VIDEO_H264						= 0x1B,
+	GF_M2TS_MPEG4_AUDIO_NO_SYNTAX			= 0x1C,
+	GF_M2TS_MPEG4_TEXT						= 0x1D,
+	GF_M2TS_AUX_VIDEO_23002_2				= 0x1E,
+	GF_M2TS_VIDEO_SVC						= 0x1F,
+	GF_M2TS_VIDEO_MVC						= 0x20,
+	GF_M2TS_VIDEO_15444_1					= 0x21,
+	GF_M2TS_VIDEO_MPEG2_ADD_STEREO			= 0x22,
+	GF_M2TS_VIDEO_H264_ADD_STEREO			= 0x23,
+	GF_M2TS_VIDEO_HEVC						= 0x24,
+	GF_M2TS_VIDEO_HEVC_TEMPORAL				= 0x25,
+	GF_M2TS_VIDEO_MVCD						= 0x26,
+	GF_M2TS_TEMI							= 0x27,
+	GF_M2TS_VIDEO_SHVC						= 0x28,
+	GF_M2TS_VIDEO_SHVC_TEMPORAL				= 0x29,
+	GF_M2TS_VIDEO_MHVC						= 0x2A,
+	GF_M2TS_VIDEO_MHVC_TEMPORAL				= 0x2B,
+	GF_M2TS_GREEN							= 0x2C,
+	GF_M2TS_MHAS_MAIN						= 0x2D,
+	GF_M2TS_MHAS_AUX						= 0x2E,
+	GF_M2TS_QUALITY_SEC 					= 0x2F,
+	GF_M2TS_MORE_SEC					 	= 0x30,
+	GF_M2TS_VIDEO_HEVC_MCTS					= 0x31,
+	GF_M2TS_JPEG_XS							= 0x32,
+	GF_M2TS_VIDEO_VVC						= 0x33,
+	GF_M2TS_VIDEO_VVC_TEMPORAL				= 0x34,
+
+	GF_M2TS_HLS_AC3_CRYPT		= 0xc1,
+	GF_M2TS_HLS_EC3_CRYPT		= 0xc2,
+	GF_M2TS_HLS_AAC_CRYPT		= 0xcf,
+	GF_M2TS_HLS_AVC_CRYPT		= 0xdb,
+
+	/*the rest is internal use*/
+
+	GF_M2TS_VIDEO_VC1				= 0xEA,
 	GF_M2TS_VIDEO_DCII				= 0x80,
 	GF_M2TS_AUDIO_AC3				= 0x81,
-	GF_M2TS_AUDIO_DTS				= 0x8A,
+	GF_M2TS_AUDIO_DTS				= 0x82,
+	GF_M2TS_AUDIO_TRUEHD			= 0x83,
+	GF_M2TS_AUDIO_EC3				= 0x84,
 	GF_M2TS_MPE_SECTIONS = 0x90,
 	GF_M2TS_SUBTITLE_DVB			= 0x100,
-
-	/*internal use*/
-	GF_M2TS_AUDIO_EC3				= 0x150,
-	GF_M2TS_VIDEO_VC1				= 0x151,
+	GF_M2TS_AUDIO_OPUS				= 0x101,
+	
 	GF_M2TS_DVB_TELETEXT			= 0x152,
 	GF_M2TS_DVB_VBI					= 0x153,
 	GF_M2TS_DVB_SUBTITLE			= 0x154,
 	GF_M2TS_METADATA_ID3_HLS		= 0x155,
+
 } GF_M2TSStreamType;
 
 
@@ -278,7 +301,15 @@
 enum
 {
 	GF_M2TS_RA_STREAM_AC3	= GF_4CC('A','C','-','3'),
+	GF_M2TS_RA_STREAM_EAC3	= GF_4CC('E','A','C','3'),
 	GF_M2TS_RA_STREAM_VC1	= GF_4CC('V','C','-','1'),
+	GF_M2TS_RA_STREAM_HEVC	= GF_4CC('H','E','V','C'),
+	GF_M2TS_RA_STREAM_DTS1	= GF_4CC('D','T','S','1'),
+	GF_M2TS_RA_STREAM_DTS2	= GF_4CC('D','T','S','2'),
+	GF_M2TS_RA_STREAM_DTS3	= GF_4CC('D','T','S','3'),
+	GF_M2TS_RA_STREAM_OPUS	= GF_4CC('O','p','u','s'),
+	GF_M2TS_RA_STREAM_DOVI	= GF_4CC('D','O','V','I'),
+
 
 	GF_M2TS_RA_STREAM_GPAC	= GF_4CC('G','P','A','C')
 };
@@ -462,7 +493,9 @@
 	/*! a TEMI locator has been found or repeated*/
 	GF_M2TS_EVT_TEMI_LOCATION,
 	/*! a TEMI timecode has been found*/
-	GF_M2TS_EVT_TEMI_TIMECODE
+	GF_M2TS_EVT_TEMI_TIMECODE,
+	/*! a stream is about to be removed - - associated parameter: pointer to GF_M2TS_ES being removed*/
+	GF_M2TS_EVT_STREAM_REMOVED
 };
 
 /*! table parsing state*/
@@ -592,7 +625,7 @@
 	const char *external_URL;
 	Bool is_announce, is_splicing;
 	Bool reload_external;
-	Double activation_countdown;
+	GF_Fraction activation_countdown;
 } GF_M2TS_TemiLocationDescriptor;
 
 /*! MPEG-2 TS demuxer TEMI timecode*/
@@ -687,7 +720,9 @@
 	/*! flag used to signal next discontinuity on stream should be ignored*/
 	GF_M2TS_ES_IGNORE_NEXT_DISCONTINUITY = 1<<17,
 	/*! flag used by importers/readers to mark streams that have been seen already in PMT process (update/found)*/
-	GF_M2TS_ES_ALREADY_DECLARED = 1<<18
+	GF_M2TS_ES_ALREADY_DECLARED = 1<<18,
+	/*! flag indicates TEMI info is declared on this stream*/
+	GF_M2TS_ES_TEMI_INFO = 1<<19
 };
 
 /*! macro for abstract Section/PES stream object, only used for type casting*/
@@ -702,6 +737,7 @@
 			void *user; \
 			GF_List *props; \
 			u64 first_dts; \
+			Bool is_seg_start; \
 			u32 service_id;
 
 /*! abstract Section/PES stream object*/
@@ -822,7 +858,7 @@
 
 	/*! PES reframer callback. If NULL, pes processing is skiped
 
-	returns the number of bytes NOT consummed from the input data buffer - these bytes are kept when reassembling the next PES packet*/
+	returns the number of bytes NOT consumed from the input data buffer - these bytes are kept when reassembling the next PES packet*/
 	u32 (*reframe)(struct tag_m2ts_demux *ts, struct tag_m2ts_pes *pes, Bool same_pts, u8 *data, u32 data_len, GF_M2TS_PESHeader *hdr);
 
 	/*! DVB subtitling info*/
@@ -841,6 +877,10 @@
 	GF_M2TS_TemiTimecodeDescriptor temi_tc;
 	/*! flag set to indicate a TEMI descriptor should be flushed with next packet*/
 	Bool temi_pending;
+	/*! flag set to indicate the last PES packet was not flushed (HLS) to avoid warning on same PTS/DTS used*/
+	Bool is_resume;
+	/*! DolbiVison info, last byte set to 1 if non-compatible signaling*/
+	u8 dv_info[25];
 } GF_M2TS_PES;
 
 /*! reserved streamID for PES headers*/
@@ -1114,6 +1154,12 @@
 \param demux the target MPEG-2 TS demultiplexer
 */
 void gf_m2ts_reset_parsers(GF_M2TS_Demuxer *demux);
+
+/*! set all streams is_seg_start variable to GF_TRUE
+\param demux the target MPEG-2 TS demultiplexer
+*/
+void gf_m2ts_mark_seg_start(GF_M2TS_Demuxer *demux);
+
 /*! resets all parsers (PES, sections) of a given program
 \param demux the target MPEG-2 TS demultiplexer
 \param program the target MPEG-2 TS program
@@ -1149,13 +1195,15 @@
 /*! flushes a given stream. This is used to flush internal demultiplexer buffers on end of stream
 \param demux the target MPEG-2 demultiplexer
 \param pes the target stream to flush
+\param force_flush if GF_TRUE, flushes all streams, otherwise do not flush stream with known PES length and not yet completed (for HLS)
 */
-void gf_m2ts_flush_pes(GF_M2TS_Demuxer *demux, GF_M2TS_PES *pes);
+void gf_m2ts_flush_pes(GF_M2TS_Demuxer *demux, GF_M2TS_PES *pes, Bool force_flush);
 
 /*! flushes all streams in the mux. This is used to flush internal demultiplexer buffers on end of stream
 \param demux the target MPEG-2 demultiplexer
+\param no_force_flush do not force a flush of incomplete PES (used for HLS)
 */
-void gf_m2ts_flush_all(GF_M2TS_Demuxer *demux);
+void gf_m2ts_flush_all(GF_M2TS_Demuxer *demux, Bool no_force_flush);
 
 
 /*! MPEG-2 TS packet header*/
@@ -1233,7 +1281,7 @@
 \brief Basic stream interface API used by MPEG-2 TS muxer.
 
 This section documents the ES interface used by the MPEG-2 TS muxer. This interface is used to
-describe streams and packets consummed by the TS muxer independently from the rest of GPAC (filter packets)
+describe streams and packets consumed by the TS muxer independently from the rest of GPAC (filter packets)
 
 @{
 */
@@ -1343,6 +1391,12 @@
 	GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS =	1<<3,
 	/*! stream is not signaled through MPEG-4 Systems (OD stream) */
 	GF_ESI_AAC_USE_LATM =	1<<4,
+	/*! temporrary end of stream (flush of segment)*/
+	GF_ESI_STREAM_FLUSH	=	1<<5,
+	/*! stream uses HLS SAES encryption*/
+	GF_ESI_STREAM_HLS_SAES	=	1<<6,
+	/*! stream uses non-backward DolbyVision signaling*/
+	GF_ESI_FORCE_DOLBY_VISION = 1<<7,
 };
 
 /*! elementary stream information*/
@@ -1385,6 +1439,11 @@
 	void *output_udta;
 	/*! stream dependency ID*/
 	u32 depends_on_stream;
+
+	/*! dv info, not valid if first byte not 1*/
+	u8 dv_info[24];
+
+	u32 ra_code;
 } GF_ESInterface;
 
 /*! @} */
@@ -1487,8 +1546,6 @@
 	Bool pcr_only_mode;
 	/*! tables for section PIDs*/
 	GF_M2TS_Mux_Table *tables;
-	/*! init verision of table*/
-	u8 initial_version_number;
 	/*! total table sizes for bitrate estimation (PMT/PAT/...)*/
 	u32 total_table_size;
 	/*! current table - used for on-the-fly packetization of sections */
@@ -1499,6 +1556,10 @@
 	u32 current_section_offset;
 	/*! carousel rate in ms*/
 	u32 refresh_rate_ms;
+	/*! init verision of table*/
+	u8 initial_version_number;
+	/*! PES version of transport for this codec type is forced*/
+	u8 force_pes;
 	/*! table needs updating*/
 	Bool table_needs_update;
 	/*! table needs send*/
@@ -1532,8 +1593,10 @@
 	u32 next_payload_size;
 	/*! number of bytes to copy from next packet*/
 	u32 copy_from_next_packets;
-	/*! size of nex next payload, 0 if unknown*/
+	/*! size of next next payload, 0 if unknown*/
 	u32 next_next_payload_size;
+	/*! size of next next next payload, 0 if unknown*/
+	u32 next_next_next_payload_size;
 	/*! size of packetized packet*/
 	u32 pes_data_len;
 	/*! remaining bytes to send as TS packets*/
@@ -1590,6 +1653,9 @@
 	u32 pck_sap_type;
 	/*! packet SAP time (=PTS) when segmenting the TS*/
 	u64 pck_sap_time;
+
+	/*! last process result*/
+	u32 process_res;
 } GF_M2TS_Mux_Stream;
 
 /*! MPEG-4 systems signaling mode*/
@@ -1598,7 +1664,7 @@
 	GF_M2TS_MPEG4_SIGNALING_NONE = 0,
 	/*! Full MPEG-4 signaling*/
 	GF_M2TS_MPEG4_SIGNALING_FULL,
-	/*MPEG-4 over MPEG-2 profile where PES media streams may be refered to by the scene without SL-packetization*/
+	/*MPEG-4 over MPEG-2 profile where PES media streams may be referred to by the scene without SL-packetization*/
 	GF_M2TS_MPEG4_SIGNALING_SCENE
 };
 
@@ -1749,7 +1815,9 @@
 
 	/*! static write bitstream object for formatting packets*/
 	GF_BitStream *pck_bs;
-	/*set to TRUE if the packet output is the first packet of a SAP AU (used when dashing)*/
+	/*! PID to watch for SAP insertions*/
+	u32 ref_pid;
+	/* if the packet output starts (first PES) with the first packet of a SAP AU (used when dashing), set to TRUE*/
 	Bool sap_inserted;
 	/*! SAP time (used when dashing)*/
 	u64 sap_time;
@@ -1860,7 +1928,7 @@
 \return packet produced or NULL if error or idle
 */
 const u8 *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, GF_M2TSMuxState *status, u32 *usec_till_next);
-/*! gets the system clock of the multiplexer (time ellapsed since start)
+/*! gets the system clock of the multiplexer (time elapsed since start)
 \param muxer the target MPEG-2 TS multiplexer
 \return system clock of the multiplexer in milliseconds
 */

gpac-1.0.1.tar.gz/include/gpac/network.h -> gpac-2.0.0.tar.gz/include/gpac/network.h Changed

@@ -114,6 +114,16 @@
 char *gf_url_percent_encode(const char *path);
 
 /*!
+\brief URL decoding
+
+Decodes URL by  % encodings with the  special characters they correspond to
+\param path encoded URL of the service
+\return decoded path name , or NULL if error
+ \note the returned string must be freed by user
+ */
+char *gf_url_percent_decode(const char *path);
+
+/*!
 \brief URL to file system
 
 Converts a local URL to a file system value. Removes all white spaces and similar
@@ -124,12 +134,16 @@
 /*!
 \brief get first after a filename/path
 
-Returns a pointer to the first colon at the end of a filename or URL, if any
+Returns a pointer to the first colon at the end of a filename or URL, if any.
+
+If assign_sep is specified, for example '=', the function will make sure that the colon is after the file extension if found and that '=' is not present between colon and file ext.
+This is used to parse 'a:b.mp4:c' (expected result ':c...' and not ':b...') vs 'a:b=c.mp4' ' (expected result ':b') 
+
 \param URL path or URL to inspect
+\param assign_sep value of assignment operand character. If 0, only checks for colon, otherwise chec that no assign sep or colon is present before file extension, if present
 \return position of first colon, or NULL
 */
-char* gf_url_colon_suffix(const char* URL);
-
+char* gf_url_colon_suffix(const char* URL, char assign_sep);
 
 /*!
 \brief Extract resource name from URL
@@ -141,14 +155,13 @@
 const char *gf_url_get_resource_name(const char *url);
 
 /*!
-\brief Extract resource path from URL
+\brief Gets  resource path from URL
 
-Extracts the reource path from the URL
+Gets the resource path and name from the URL, stripping scheme, server ID, port...
 \param url input url
-\param res_path buffer for resulting path storage
-\return 1 if path was extracted, 0 if url is a single file name.
+\return the extracted path, or the original path if no scheme indication, or NULL of no path
  */
-Bool gf_url_get_resource_path(const char *url, char *res_path);
+const char *gf_url_get_path(const char *url);
 
 /*! @} */
 
@@ -594,6 +607,26 @@
  */
 GF_Err gf_sk_probe(GF_Socket *sock);
 
+
+/*! socket selection mode*/
+typedef enum
+{
+	/*! select for both read and write operations */
+	GF_SK_SELECT_BOTH=0,
+	/*! select for both read operations */
+	GF_SK_SELECT_READ,
+	/*! select for both write operations */
+	GF_SK_SELECT_WRITE,
+} GF_SockSelectMode;
+
+/*!
+Checks if socket can is ready for read or write
+\param sock the socket object
+\param mode the operation mode desired
+\return GF_OK if ready, GF_IP_SOCK_WOULD_BLOCK if not ready, otherwise error if any (GF_IP_CONNECTION_CLOSED if connection is closed)
+ */
+GF_Err gf_sk_select(GF_Socket *sock, GF_SockSelectMode mode);
+
 /*! @} */
 
 /*!
@@ -625,17 +658,6 @@
  */
 void gf_sk_group_unregister(GF_SockGroup *sg, GF_Socket *sk);
 
-/*! socket selection mode*/
-typedef enum
-{
-	/*! select for both read and write operations */
-	GF_SK_SELECT_BOTH=0,
-	/*! select for both read operations */
-	GF_SK_SELECT_READ,
-	/*! select for both write operations */
-	GF_SK_SELECT_WRITE,
-} GF_SockSelectMode;
-
 /*!
 Performs a select (wait) on the socket group
 \param sg socket group object

gpac-1.0.1.tar.gz/include/gpac/nodes_svg.h -> gpac-2.0.0.tar.gz/include/gpac/nodes_svg.h Changed

gpac-1.0.1.tar.gz/include/gpac/options.h -> gpac-2.0.0.tar.gz/include/gpac/options.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Stream Management sub-project
@@ -198,7 +198,7 @@
 	GF_BACK_CULL_OFF = 0,
 	/*! backface culliong enabled*/
 	GF_BACK_CULL_ON,
-	/*! backface culling enabled alos for transparent meshes*/
+	/*! backface culling enabled also for transparent meshes*/
 	GF_BACK_CULL_ALPHA,
 };
 
@@ -295,7 +295,7 @@
 	GF_OPT_FORCE_AUDIO_CONFIG,
 
 	/*!		3D ONLY OPTIONS		*/
-	/*! set/get raster outline flag (value: boolean) - when set, no vectorial outlining is done, only openGL raster outline*/
+	/*! set/get raster outline flag (value: boolean) - when set, no vectorial outlining is done, only OpenGL raster outline*/
 	GF_OPT_RASTER_OUTLINES,
 	/*! set/get pow2 emulation flag (value: boolean) - when set, video textures with non power of 2 dimensions
 	are emulated as pow2 by expanding the video buffer (image is not scaled). Otherwise the entire image

gpac-1.0.1.tar.gz/include/gpac/path2d.h -> gpac-2.0.0.tar.gz/include/gpac/path2d.h Changed

gpac-2.0.0.tar.gz/include/gpac/route.h Added

@@ -0,0 +1,300 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ * This file is part of GPAC / ROUTE (ATSC3, DVB-I) demuxer
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _GF_ROUTE_H_
+#define _GF_ROUTE_H_
+
+#include <gpac/tools.h>
+
+#ifndef GPAC_DISABLE_ROUTE
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+\file <gpac/route.h>
+\brief Specific extensions for ROUTE ( ATSC3, DVB-I) protocol
+*/
+
+/*!
+\addtogroup route_grp ROUTE
+\ingroup media_grp
+\brief ROUTE ATSC 3.0 reciever
+
+The ROUTE receiver implements part of the ATSC 3.0 specification, mostly low-level signaling and ROUTE reception.
+It gathers objects from a ROUTE session and sends them back to the user through a callback, or deletes them if no callback is sent.
+The route demuxer does not try to repairing files, it is the user responsability to do so.
+
+@{
+*/
+
+
+/*! ATSC3.0 bootstrap address for LLS*/
+#define GF_ATSC_MCAST_ADDR	"224.0.23.60"
+/*! ATSC3.0 bootstrap port for LLS*/
+#define GF_ATSC_MCAST_PORT	4937
+
+/*!The GF_ROUTEDmx object.*/
+typedef struct __gf_routedmx GF_ROUTEDmx;
+
+/*!The types of events used to communicate withe the demuxer user.*/
+typedef enum
+{
+	/*! A new service detected, service ID is in evt_param, no file info*/
+	GF_ROUTE_EVT_SERVICE_FOUND = 0,
+	/*! Service scan completed, no evt_param, no file info*/
+	GF_ROUTE_EVT_SERVICE_SCAN,
+	/*! New MPD available for service, service ID is in evt_param, no file info*/
+	GF_ROUTE_EVT_MPD,
+	/*! static file update (with predefined TOI), service ID is in evt_param*/
+	GF_ROUTE_EVT_FILE,
+	/*! Segment reception, identified through a file template, service ID is in evt_param*/
+	GF_ROUTE_EVT_DYN_SEG,
+ /*! fragment reception (part of a segment), identified through a file template, service ID is in evt_param
+ \note The data is always beginning at the start of the object
+ */
+ GF_ROUTE_EVT_DYN_SEG_FRAG,
+ /*! Object deletion (only for dynamic TOIs), used to notify the cache that an object is no longer available. File info only contains the filename being removed*/
+ GF_ROUTE_EVT_FILE_DELETE,
+} GF_ROUTEEventType;
+
+enum
+{
+	/*No-operation extension header*/
+	GF_LCT_EXT_NOP = 0,
+	/*Authentication extension header*/
+	GF_LCT_EXT_AUTH = 1,
+	/*Time extension header*/
+	GF_LCT_EXT_TIME = 2,
+	/*FEC object transmission information extension header*/
+	GF_LCT_EXT_FTI = 64,
+	/*Extension header for FDT - FLUTE*/
+	GF_LCT_EXT_FDT = 192,
+	/*Extension header for FDT content encoding - FLUTE*/
+	GF_LCT_EXT_CENC = 193,
+	/*TOL extension header - ROUTE - 24 bit payload*/
+	GF_LCT_EXT_TOL24 = 194,
+	/*TOL extension header - ROUTE - HEL + 28 bit payload*/
+	GF_LCT_EXT_TOL48 = 67,
+};
+
+/*! LCT fragment information*/
+typedef struct
+{
+ /*! offset in bytes of fragment in object / file*/
+ u32 offset;
+ /*! size in bytes of fragment in object / file*/
+ u32 size;
+} GF_LCTFragInfo;
+
+
+/*! Structure used to communicate file objects properties to the user*/
+typedef struct
+{
+	/*! original file name*/
+	const char *filename;
+	/*! blob data pointer*/
+	GF_Blob *blob;
+ /*! total size of object if known, 0 otherwise*/
+ u32 total_size;
+	/*! object TSI*/
+	u32 tsi;
+	/*! object TOI*/
+	u32 toi;
+	/*! download time in ms*/
+	u32 download_ms;
+	/*! flag set if file content has been modified - not set for GF_ROUTE_EVT_DYN_SEG (always true)*/
+	Bool updated;
+ 
+ /*! number of fragments, only set for GF_ROUTE_EVT_DYN_SEG*/
+ u32 nb_frags;
+ /*! fragment info, only set for GF_ROUTE_EVT_DYN_SEG*/
+ GF_LCTFragInfo *frags;
+	
+	/*! user data set to current object after callback, and passed back on next callbacks on same object
+	 Only used for GF_ROUTE_EVT_FILE, GF_ROUTE_EVT_DYN_SEG, GF_ROUTE_EVT_DYN_SEG_FRAG and GF_ROUTE_EVT_FILE_DELETE
+	 */
+	void *udta;
+} GF_ROUTEEventFileInfo;
+
+/*! Creates a new ROUTE ATSC3.0 demultiplexer
+\param ifce network interface to monitor, NULL for INADDR_ANY
+\param sock_buffer_size default buffer size for the udp sockets. If 0, uses 0x2000
+ \param on_event the user callback function
+ \param udta the user data passed back by the callback
+\return the ROUTE demultiplexer created
+*/
+GF_ROUTEDmx *gf_route_atsc_dmx_new(const char *ifce, u32 sock_buffer_size, void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo), void *udta);
+
+/*! Creates a new ROUTE demultiplexer
+\param ip IP address of ROUTE session
+\param port port of ROUTE session
+\param ifce network interface to monitor, NULL for INADDR_ANY
+\param sock_buffer_size default buffer size for the udp sockets. If 0, uses 0x2000
+ \param on_event the user callback function
+ \param udta the user data passed back by the callback
+\return the ROUTE demultiplexer created
+*/
+GF_ROUTEDmx *gf_route_dmx_new(const char *ip, u32 port, const char *ifce, u32 sock_buffer_size, void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo), void *udta);
+
+/*! Deletes an ROUTE demultiplexer
+\param routedmx the ROUTE demultiplexer to delete
+*/
+void gf_route_dmx_del(GF_ROUTEDmx *routedmx);
+
+/*! Processes demultiplexing, returns when nothing to read
+\param routedmx the ROUTE demultiplexer
+\return error code if any, GF_IP_NETWORK_EMPTY if nothing was read
+ */
+GF_Err gf_route_dmx_process(GF_ROUTEDmx *routedmx);
+
+
+/*! Sets reordering on.
+\param routedmx the ROUTE demultiplexer
+\param force_reorder if TRUE, the order flag in ROUTE/LCT is ignored and objects are gathered for the given time. Otherwise, if order flag is set in ROUTE/LCT, an object is considered done as soon as a new object starts
+\param timeout_ms maximum delay to wait before considering the object is done when ROUTE/LCT order is not used. A value of 0 implies waiting forever (default value is 5s).
+\return error code if any
+ */
+GF_Err gf_route_set_reorder(GF_ROUTEDmx *routedmx, Bool force_reorder, u32 timeout_ms);
+
+/*! Allow segments to be sent while being downloaded.
+ 
+\note Files with a static TOI association are always sent once completely received, other files using TOI templating may be sent while being received if enabled. The data sent is always contiguous data since the beginning of the file in that case.
+ 
+\param routedmx the ROUTE demultiplexer
+\param allow_progressive if TRUE, fragments of segments will be sent during download
+\return error code if any
+ */
+GF_Err gf_route_set_allow_progressive_dispatch(GF_ROUTEDmx *routedmx, Bool allow_progressive);
+
+/*! Sets the service ID to tune into for ATSC 3.0
+\param routedmx the ROUTE demultiplexer
+\param service_id ID of the service to tune in. 0 means no service, 0xFFFFFFFF means all services and 0xFFFFFFFE means first service found
+\param tune_others if set, will tune all non-selected services to get the MPD, but won't receive any media data
+\return error code if any
+ */
+GF_Err gf_route_atsc3_tune_in(GF_ROUTEDmx *routedmx, u32 service_id, Bool tune_others);
+
+
+/*! Gets the number of objects currently loaded in the service
+\param routedmx the ROUTE demultiplexer
+\param service_id ID of the service to query
+\return number of objects in service
+ */
+u32 gf_route_dmx_get_object_count(GF_ROUTEDmx *routedmx, u32 service_id);
+
+/*! Removes an object with a given filename
+\param routedmx the ROUTE demultiplexer
+\param service_id ID of the service to query
+\param fileName name of the file associated with the object
+\param purge_previous if set, indicates that all objects with the same TSI and a TOI less than TOI of the deleted object will be removed
+\return error if any, GF_NOT_FOUND if no such object
+ */
+GF_Err gf_route_dmx_remove_object_by_name(GF_ROUTEDmx *routedmx, u32 service_id, char *fileName, Bool purge_previous);
+
+/*! Flags an object to be kept until \ref gf_route_dmx_remove_object_by_name is called
+\param routedmx the ROUTE demultiplexer
+\param service_id ID of the service to query
+\param fileName name of the file associated with the object
+\return error if any, GF_NOT_FOUND if no such object
+ */
+GF_Err gf_route_dmx_force_keep_object_by_name(GF_ROUTEDmx *routedmx, u32 service_id, char *fileName);
+
+/*! Removes the first object loaded in the service
+\param routedmx the ROUTE demultiplexer
+\param service_id ID of the service to query
+\return GF_TRUE if success, GF_FALSE if no object could be removed (the object is in download)
+ */
+Bool gf_route_dmx_remove_first_object(GF_ROUTEDmx *routedmx, u32 service_id);
+
+/*! Checks existence of a service for atsc 3.0
+\param routedmx the ROUTE demultiplexer
+\param service_id ID of the service to query
+\return true if service is found, false otherwise
+ */
+Bool gf_route_dmx_find_atsc3_service(GF_ROUTEDmx *routedmx, u32 service_id);
+
+/*! Removes all non-signaling objects (ie TSI!=0), keeping only init segments and currently/last downloaded objects
+\note this is mostly useful in case of looping session, or at MPD switch boundaries
+\param routedmx the ROUTE demultiplexer
+\param service_id ID of the service to cleanup
+ */
+void gf_route_dmx_purge_objects(GF_ROUTEDmx *routedmx, u32 service_id);
+
+
+/*! Gets high resolution system time clock of the first packet received
+\param routedmx the ROUTE demultiplexer
+\return system clock in microseconds of first packet received
+ */
+u64 gf_route_dmx_get_first_packet_time(GF_ROUTEDmx *routedmx);
+
+/*! Gets high resolution system time clock of the last packet received
+\param routedmx the ROUTE demultiplexer
+\return system clock in microseconds of last packet received
+ */
+u64 gf_route_dmx_get_last_packet_time(GF_ROUTEDmx *routedmx);
+
+/*! Gets the number of packets received since start of the session, for all active services
+\param routedmx the ROUTE demultiplexer
+\return number of packets received
+ */
+u64 gf_route_dmx_get_nb_packets(GF_ROUTEDmx *routedmx);
+
+/*! Gets the number of bytes received since start of the session, for all active services
+\param routedmx the ROUTE demultiplexer
+\return number of bytes received
+ */
+u64 gf_route_dmx_get_recv_bytes(GF_ROUTEDmx *routedmx);
+
+/*! Gather only objects with given TSI (for debug purposes)
+\param routedmx the ROUTE demultiplexer
+\param tsi the target TSI, 0 for no filtering
+ */
+void gf_route_dmx_debug_tsi(GF_ROUTEDmx *routedmx, u32 tsi);
+
+/*! Sets udta for given service id
+\param routedmx the ROUTE demultiplexer
+\param service_id the target service
+\param udta the target user data
+ */
+void gf_route_dmx_set_service_udta(GF_ROUTEDmx *routedmx, u32 service_id, void *udta);
+
+/*! Gets udta for given service id
+\param routedmx the ROUTE demultiplexer
+\param service_id the target service
+\return the user data associated with the service
+ */
+void *gf_route_dmx_get_service_udta(GF_ROUTEDmx *routedmx, u32 service_id);
+
+/*! @} */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GPAC_DISABLE_ROUTE */
+
+#endif	//_GF_ROUTE_H_
+

gpac-1.0.1.tar.gz/include/gpac/scene_engine.h -> gpac-2.0.0.tar.gz/include/gpac/scene_engine.h Changed

gpac-1.0.1.tar.gz/include/gpac/scene_manager.h -> gpac-2.0.0.tar.gz/include/gpac/scene_manager.h Changed

gpac-1.0.1.tar.gz/include/gpac/scenegraph.h -> gpac-2.0.0.tar.gz/include/gpac/scenegraph.h Changed

@@ -343,7 +343,7 @@
 	/*flag set whenever a field of the node has been modified*/
 	GF_SG_NODE_DIRTY = 1,
 	/*flag set whenever a child node of this node has been modified
-	NOTE: unloaded extern protos always invalidate their parent subgraph to get a chance
+	\note Unloaded extern protos always invalidate their parent subgraph to get a chance
 	of being loaded. It is the user responsability to clear the CHILD_DIRTY flag before traversing
 	if relying on this flag for sub-tree discarding (eg, culling or similar)*/
 	GF_SG_CHILD_DIRTY = 1<<1,
@@ -426,8 +426,7 @@
 
 
 /*! Node Field/attribute information for VRML/BIFS/SVG
-Note:
-all scene graph implementations should answer node field query with this interface.
+\note all scene graph implementations should answer node field query with this interface.
 In case an implementation does not use this:
 	- the implementation shall handle the parent node dirty flag itself most of the time
 	- the implementation shall NOT allow referencing of a graph node in a parent graph node (when inlining
@@ -488,7 +487,7 @@
 /*! creates a sub scene graph (typically used with Inline node): independent graph with same private stack,
 and user callbacks as parent. All routes triggered in this subgraph are executed in the parent graph (this
 means you only have to activate routes on the main graph)
-NOTE: the resulting graph is not destroyed when the parent graph is
+\note The resulting graph is not destroyed when the parent graph is
 \param scene the parent scene graph
 \return a new scene graph
 */
@@ -972,7 +971,7 @@
 		s32 send_event_y;
 	};
 	Bool aggregated;
-	/*some commands need to never be applied; for instance when building an aggregate carrousel*/
+	/*some commands need to never be applied; for instance when building an aggregate carousel*/
 	Bool never_apply;
 } GF_Command;
 
@@ -1008,13 +1007,6 @@
 \return new commandFieldInfo structure*/
 GF_CommandField *gf_sg_command_field_new(GF_Command *com);
 
-/*! executes JS code in the root context of the scene graph
-\param sg the target scene graph where to execute the script
-\param com javascript code to execute
-\return error if any
-*/
-GF_Err gf_scene_execute_script(GF_SceneGraph *sg, const char *com);
-
 /*! XML node from DOM parser */
 typedef struct _xml_node *GF_DOMXMLNODE;

gpac-1.0.1.tar.gz/include/gpac/scenegraph_svg.h -> gpac-2.0.0.tar.gz/include/gpac/scenegraph_svg.h Changed

gpac-1.0.1.tar.gz/include/gpac/scenegraph_vrml.h -> gpac-2.0.0.tar.gz/include/gpac/scenegraph_vrml.h Changed

gpac-1.0.1.tar.gz/include/gpac/setup.h -> gpac-2.0.0.tar.gz/include/gpac/setup.h Changed

@@ -180,7 +180,7 @@
 /*! default path separator of the current platform*/
 #define GF_PATH_SEPARATOR	'\\'
 
-/*we must explicitely export our functions...*/
+/*we must explicitly export our functions...*/
 
 /*! macro for cross-platform signaling of exported function of libgpac*/
 #define GF_EXPORT EXPORT_C
@@ -432,12 +432,21 @@
 
 #if (defined (WIN32) || defined (_WIN32_WCE)) && (defined(__MINGW32__) || !defined(__GNUC__))
 
-/*! macro for cross-platform suffix used for formating s64 integers in logs and printf routines*/
+#if defined(__MINGW32__)
+/*! macro for cross-platform suffix used for formatting s64 integers in logs and printf routines*/
+#define LLD_SUF "lld"
+/*! macro for cross-platform suffix used for formatting u64 integers in logs and printf routines*/
+#define LLU_SUF "llu"
+/*! macro for cross-platform suffix used for formatting u64 integers as hex in logs and printf routines*/
+#define LLX_SUF "llx"
+#else
+/*! macro for cross-platform suffix used for formatting s64 integers in logs and printf routines*/
 #define LLD_SUF "I64d"
-/*! macro for cross-platform suffix used for formating u64 integers in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers in logs and printf routines*/
 #define LLU_SUF "I64u"
-/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers as hex in logs and printf routines*/
 #define LLX_SUF "I64x"
+#endif
 
 #ifdef _WIN64
 /*! macro for cross-platform casting a pointer to an integer*/
@@ -449,11 +458,11 @@
 
 #elif defined (__SYMBIAN32__)
 
-/*! macro for cross-platform suffix used for formating s64 integers in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting s64 integers in logs and printf routines*/
 #define LLD_SUF "d"
-/*! macro for cross-platform suffix used for formating u64 integers in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers in logs and printf routines*/
 #define LLU_SUF "u"
-/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers as hex in logs and printf routines*/
 #define LLX_SUF "x"
 
 /*! macro for cross-platform casting a pointer to an integer*/
@@ -462,11 +471,11 @@
 /*seems that even though _LP64 is defined in OSX, %ll modifiers are still needed*/
 #elif defined(__DARWIN__) || defined(__APPLE__)
 
-/*! macro for cross-platform suffix used for formating s64 integers in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting s64 integers in logs and printf routines*/
 #define LLD_SUF "lld"
-/*! macro for cross-platform suffix used for formating u64 integers in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers in logs and printf routines*/
 #define LLU_SUF "llu"
-/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers as hex in logs and printf routines*/
 #define LLX_SUF "llx"
 
 #ifdef __LP64__ /* Mac OS 64 bits */
@@ -479,11 +488,11 @@
 
 #elif defined(_LP64) /*Unix 64 bits*/
 
-/*! macro for cross-platform suffix used for formating s64 integers in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting s64 integers in logs and printf routines*/
 #define LLD_SUF "ld"
-/*! macro for cross-platform suffix used for formating u64 integers in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers in logs and printf routines*/
 #define LLU_SUF "lu"
-/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers as hex in logs and printf routines*/
 #define LLX_SUF "lx"
 
 /*! macro for cross-platform casting a pointer to an integer*/
@@ -491,11 +500,11 @@
 
 #else /*Unix 32 bits*/
 
-/*! macro for cross-platform suffix used for formating s64 integers in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting s64 integers in logs and printf routines*/
 #define LLD_SUF "lld"
-/*! macro for cross-platform suffix used for formating u64 integers in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers in logs and printf routines*/
 #define LLU_SUF "llu"
-/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+/*! macro for cross-platform suffix used for formatting u64 integers as hex in logs and printf routines*/
 #define LLX_SUF "llx"
 
 /*! macro for cross-platform casting a pointer to an integer*/
@@ -654,7 +663,7 @@
 \brief Memory management
 
 GPAC can use its own memory tracker, depending on compilation option. It is recommended to use only the functions
-defined in this section to allocate and free memory whenever developping within the GPAC library.
+defined in this section to allocate and free memory whenever developing within the GPAC library.
 
 \warning these functions shall only be used after initializing the library using \ref gf_sys_init
 @{
@@ -691,14 +700,14 @@
 
 /*! allocates memory, shall be freed using \ref gf_free
 \param size same as malloc()
-\return adress of allocated block
+\return address of allocated block
 */
 void* gf_malloc(size_t size);
 
 /*! allocates memory array, shall be freed using \ref gf_free
 \param num same as calloc()
 \param size_of same as calloc()
-\return adress of allocated block
+\return address of allocated block
 */
 void* gf_calloc(size_t num, size_t size_of);
 
@@ -711,7 +720,7 @@
 /*! reallocates memory, shall be freed using \ref gf_free
 \param ptr same as realloc()
 \param size same as realloc()
-\return adress of reallocated block
+\return address of reallocated block
 */
 void* gf_realloc(void *ptr, size_t size);
 
@@ -721,6 +730,13 @@
 
 /*end GPAC memory tracking*/
 
+/*! copy source string to destination, ensuring 0-terminated string result
+\param dst  destination buffer
+\param src  source buffer
+\param dsize size of destination buffer
+\return same as strlcpy
+*/
+size_t gf_strlcpy(char *dst, const char *src, size_t dsize);
 
 #ifdef __cplusplus
 }

gpac-1.0.1.tar.gz/include/gpac/svg_types.h -> gpac-2.0.0.tar.gz/include/gpac/svg_types.h Changed

@@ -110,6 +110,7 @@
 	SMIL_Accumulate_datatype,
 	SMIL_Restart_datatype,
 	SMIL_Fill_datatype,
+	SVG_ClipPath_datatype,
 
 	SVG_LAST_U8_PROPERTY,
 
@@ -176,6 +177,9 @@
 	LASeR_Size_datatype,
 
 	SVG_Matrix2D_datatype,
+
+	/*internal type for node list*/
+	SVG_NodeList_datatype
 };
 
 //! @cond Doxygen_Suppress
@@ -378,7 +382,7 @@
 } XMLRI;
 
 /*! XML IDREF object
-	Note: the same structure is used to watch for IDREF changes (LASeR node replace)
+	\note the same structure is used to watch for IDREF changes (LASeR node replace)
 */
 typedef struct __xml_ri XML_IDREF;
 
@@ -894,7 +898,7 @@
 /*! DOM Event phase*/
 typedef u8 XMLEV_Phase;
 
-/*! SMIL sync behaviour types */
+/*! SMIL sync behavior types */
 enum {
 	SMIL_SYNCBEHAVIOR_INHERIT		= 0,
 	/*LASeR order*/
@@ -903,7 +907,7 @@
 	SMIL_SYNCBEHAVIOR_INDEPENDENT,
 	SMIL_SYNCBEHAVIOR_LOCKED,
 };
-/*! SMIL sync behaviour*/
+/*! SMIL sync behavior*/
 typedef u8 SMIL_SyncBehavior;
 
 /*! SMIL sync tolerance types */
@@ -977,7 +981,7 @@
 /*! SVG initial visibility*/
 typedef u8 SVG_InitialVisibility;
 
-/*! SVG transform behaviour types */
+/*! SVG transform behavior types */
 enum {
 	SVG_TRANSFORMBEHAVIOR_GEOMETRIC = 0,
 	SVG_TRANSFORMBEHAVIOR_PINNED,
@@ -985,7 +989,7 @@
 	SVG_TRANSFORMBEHAVIOR_PINNED270,
 	SVG_TRANSFORMBEHAVIOR_PINNED90,
 };
-/*! SVG transform behaviour*/
+/*! SVG transform behavior*/
 typedef u8 SVG_TransformBehavior;
 
 /*! SVG overlay types */
@@ -1026,6 +1030,12 @@
 /*! SVG spread method*/
 typedef u8 SVG_SpreadMethod;
 
+/*! SVG clip-path attribute*/
+typedef struct
+{
+	XMLRI target;
+} SVG_ClipPath;
+
 /*! LASeR choice types */
 enum {
 	LASeR_CHOICE_ALL   = 0,

gpac-1.0.1.tar.gz/include/gpac/term_info.h -> gpac-2.0.0.tar.gz/include/gpac/term_info.h Changed

@@ -171,9 +171,10 @@
 	u32 au_duration;
 	u32 nb_iraps;
 	s32 ntp_diff;
+	//0 if mono, 2 or more otherwise
+	u32 nb_views;
 
-	/*set if ISMACryp present on the object - will need refinement for IPMPX...
-	0: not protected - 1: protected and OK - 2: protected and DRM failed*/
+	/*4CC of original protection scheme used*/
 	u32 protection;
 
 	u32 lang;
@@ -260,7 +261,7 @@
 
 /*! retrieves world info of the scene of an object.
 \param term the target terminal
-\param scene_od the object manager to query. If this is an inlined OD, the world info of the inlined content is retrieved. If NULL, the world info of the main scene is retrieved
+\param scene_od the object manager to query. If this is an inline OD, the world info of the inline content is retrieved. If NULL, the world info of the main scene is retrieved
 \param descriptions any textual descriptions is stored here (const strings not allocated, do NOT modify)
 \return NULL if no WorldInfo available or world title if available
 */
@@ -272,7 +273,7 @@
 \param filename sets to the complete filename (rad + ext) and shall be destroyed by caller (optional can be NULL)
 \param xml_dump if GF_TRUE, duimps using XML format (XMT-A, X3D) for scene graphs having both XML and simple text representations
 \param skip_proto is GF_TRUE, proto declarations are not dumped
-\param odm if this is an inlined OD, the inlined scene is dumped; if this is NULL, the main scene is dumped; otherwise the parent scene is dumped
+\param odm if this is an inline OD, the inline scene is dumped; if this is NULL, the main scene is dumped; otherwise the parent scene is dumped
 \return error if any
 */
 GF_Err gf_term_dump_scene(GF_Terminal *term, char *rad_name, char **filename, Bool xml_dump, Bool skip_proto, GF_ObjectManager *odm);

gpac-1.0.1.tar.gz/include/gpac/terminal.h -> gpac-2.0.0.tar.gz/include/gpac/terminal.h Changed

@@ -123,7 +123,7 @@
 
 /*! gets elapsed time since loading of the scene - may be different from scene time when seeking or live content
 \param term the target terminal
-\return time ellapsed in milliseconds
+\return time elapsed in milliseconds
 */
 u32 gf_term_get_elapsed_time_in_ms(GF_Terminal *term);
 
@@ -202,13 +202,6 @@
 \return error if any
 */
 GF_Err gf_term_get_visual_output_size(GF_Terminal *term, u32 *width, u32 *height);
-
-/*! process shortcuts for key events
-\param term the target terminal
-\param ev the event to process
-*/
-void gf_term_process_shortcut(GF_Terminal *term, GF_Event *ev);
-
 /*! sets playback speed
 \param term the target terminal
 \param speed the requested speed
@@ -267,7 +260,7 @@
 /*! post user interaction to terminal
 \param term the target terminal
 \param event the event to post
-\return GF_TRUE if event was directly consummed
+\return GF_TRUE if event was directly consumed
 */
 Bool gf_term_user_event(GF_Terminal *term, GF_Event *event);
 
@@ -275,7 +268,7 @@
 \warning NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)
 \param term the target terminal
 \param evt the event to post
-\return GF_TRUE if event was directly consummed
+\return GF_TRUE if event was directly consumed
 */
 Bool gf_term_send_event(GF_Terminal *term, GF_Event *evt);

gpac-1.0.1.tar.gz/include/gpac/thread.h -> gpac-2.0.0.tar.gz/include/gpac/thread.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -64,7 +64,7 @@
 
 
 //atomic ref_count++ / ref_count--
-#if defined(WIN32) || defined(_WIN32_WCE)
+#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
 #include <windows.h>
 #include <winbase.h>
 
@@ -74,11 +74,11 @@
 #define safe_int_dec(__v) InterlockedDecrement((int *) (__v))
 /*! atomic integer addition */
 #define safe_int_add(__v, inc_val) InterlockedAdd((int *) (__v), inc_val)
-/*! atomic integer substraction */
+/*! atomic integer subtraction */
 #define safe_int_sub(__v, dec_val) InterlockedAdd((int *) (__v), -dec_val)
 /*! atomic large integer addition */
 #define safe_int64_add(__v, inc_val) InterlockedAdd64((LONG64 *) (__v), inc_val)
-/*! atomic large integer substraction */
+/*! atomic large integer subtraction */
 #define safe_int64_sub(__v, dec_val) InterlockedAdd64((LONG64 *) (__v), -dec_val)
 
 #else
@@ -91,11 +91,11 @@
 #define safe_int_dec(__v) __atomic_sub_fetch((int *) (__v), 1, __ATOMIC_SEQ_CST)
 /*! atomic integer addition */
 #define safe_int_add(__v, inc_val) __atomic_add_fetch((int *) (__v), inc_val, __ATOMIC_SEQ_CST)
-/*! atomic integer substraction */
+/*! atomic integer subtraction */
 #define safe_int_sub(__v, dec_val) __atomic_sub_fetch((int *) (__v), dec_val, __ATOMIC_SEQ_CST)
 /*! atomic large integer addition */
 #define safe_int64_add(__v, inc_val) __atomic_add_fetch((int64_t *) (__v), inc_val, __ATOMIC_SEQ_CST)
-/*! atomic large integer substraction */
+/*! atomic large integer subtraction */
 #define safe_int64_sub(__v, dec_val) __atomic_sub_fetch((int64_t *) (__v), dec_val, __ATOMIC_SEQ_CST)
 
 #else
@@ -106,11 +106,11 @@
 #define safe_int_dec(__v) __sync_sub_and_fetch((int *) (__v), 1)
 /*! atomic integer addition */
 #define safe_int_add(__v, inc_val) __sync_add_and_fetch((int *) (__v), inc_val)
-/*! atomic integer substraction */
+/*! atomic integer subtraction */
 #define safe_int_sub(__v, dec_val) __sync_sub_and_fetch((int *) (__v), dec_val)
 /*! atomic large integer addition */
 #define safe_int64_add(__v, inc_val) __sync_add_and_fetch((int64_t *) (__v), inc_val)
-/*! atomic large integer substraction */
+/*! atomic large integer subtraction */
 #define safe_int64_sub(__v, dec_val) __sync_sub_and_fetch((int64_t *) (__v), dec_val)
 
 #endif //GPAC_NEED_LIBATOMIC
@@ -266,30 +266,30 @@
 \brief mutex denstructor
 
 Destroys a mutex object. This will wait for the mutex to be released if needed.
-\param mx the mutex object
+\param mx the mutex object, may be NULL
 */
 void gf_mx_del(GF_Mutex *mx);
 /*!
 \brief mutex locking
 
 Locks the mutex object, making sure that another thread locking this mutex cannot execute until the mutex is unlocked.
-\param mx the mutex object
-\return 1 if success, 0 if error locking the mutex (which should never happen)
+\param mx the mutex object, may be NULL
+\return 1 if success or mutex is NULL, 0 if error locking the mutex (which should never happen)
 */
 u32 gf_mx_p(GF_Mutex *mx);
 /*!
 \brief mutex unlocking
 
 Unlocks the mutex object, allowing other threads waiting on this mutex to continue their execution
-\param mx the mutex object
+\param mx the mutex object, may be NULL
 */
 void gf_mx_v(GF_Mutex *mx);
 /*!
 \brief mutex non-blocking lock
 
 Attemps to lock the mutex object without blocking until the object is released.
-\param mx the mutex object
-\return GF_TRUE if the mutex has been successfully locked, in which case it shall then be unlocked, or GF_FALSE if the mutex is locked by another thread.
+\param mx the mutex object, may be NULL
+\return GF_TRUE if the mutex has been successfully locked or if the mutex is NULL, in which case it shall then be unlocked, or GF_FALSE if the mutex is locked by another thread.
 */
 Bool gf_mx_try_lock(GF_Mutex *mx);
 
@@ -297,8 +297,8 @@
 \brief get mutex number of locks
 
 Returns the number of locks on the mutex if the caller thread is holding the mutex.
-\param mx the mutex object
-\return -1 if the mutex is not hold by the calling thread, or the number of locks (possibly 0) otherwise.
+\param mx the mutex object, may be NULL
+\return -1 if the mutex is not hold by the calling thread, or the number of locks (possibly 0) otherwise. Returns 0 if mutex is NULL
 */
 s32 gf_mx_get_num_locks(GF_Mutex *mx);
 
@@ -309,7 +309,7 @@
 \brief Semaphore
 
 
-The semaphore object allows controling how portions of the code (typically access to variables) are
+The semaphore object allows controlling how portions of the code (typically access to variables) are
 executed by two threads (or a thread and the main process) at the same time. The best image for a semaphore is a limited set
 of money coins (always easy to understand hmm?). If no money is in the set, nobody can buy anything until a coin is put back in the set.
 When the set is full, the money is wasted (call it "the bank"...).

gpac-1.0.1.tar.gz/include/gpac/tools.h -> gpac-2.0.0.tar.gz/include/gpac/tools.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -67,7 +67,7 @@
 \brief 4CC Formatting
 \hideinitializer
 
-Macro formating a 4-character code (or 4CC) "abcd" as 0xAABBCCDD
+Macro formatting a 4-character code (or 4CC) "abcd" as 0xAABBCCDD
 */
 #ifndef GF_4CC
 #define GF_4CC(a,b,c,d) ((((u32)a)<<24)|(((u32)b)<<16)|(((u32)c)<<8)|((u32)d))
@@ -82,6 +82,12 @@
 */
 const char *gf_4cc_to_str(u32 type);
 
+/*! converts a 4CC string to its 32 bits value
+\param val four character string
+\return code value or 0 if error
+*/
+u32 gf_4cc_parse(const char *val);
+
 /*! @} */
 
 /*!
@@ -131,7 +137,7 @@
 	GF_SCRIPT_ERROR							= -8,
 	/*! Buffer is too small to contain decoded data. Decoders shall use this error whenever they need to resize their output memory buffers*/
 	GF_BUFFER_TOO_SMALL						= -9,
-	/*! Bitstream is not compliant to the specfication it refers to*/
+	/*! The bitstream is not compliant to the specfication it refers to*/
 	GF_NON_COMPLIANT_BITSTREAM				= -10,
 	/*! No filter could be found to handle the desired media type*/
 	GF_FILTER_NOT_FOUND						= -11,
@@ -143,6 +149,9 @@
 	GF_REMOTE_SERVICE_ERROR					= -14,
 	/*! The desired stream could not be found in the service*/
 	GF_STREAM_NOT_FOUND						= -15,
+ /*! The URL no longer exists*/
+ GF_URL_REMOVED = -16,
+
 	/*! The IsoMedia file is not a valid one*/
 	GF_ISOM_INVALID_FILE					= -20,
 	/*! The IsoMedia file is not complete. Either the file is being downloaded, or it has been truncated*/
@@ -218,9 +227,9 @@
 Macro allocating memory and zero-ing it
 */
 #define GF_SAFEALLOC(__ptr, __struct) {\
-		__ptr = (__struct *) gf_malloc(sizeof(__struct));\
+		(__ptr) = (__struct *) gf_malloc(sizeof(__struct));\
 		if (__ptr) {\
-			memset((void *) __ptr, 0, sizeof(__struct));\
+			memset((void *) (__ptr), 0, sizeof(__struct));\
 		}\
 	}
 
@@ -231,9 +240,9 @@
 Macro allocating memory for n structures and zero-ing it
 */
 #define GF_SAFE_ALLOC_N(__ptr, __n, __struct) {\
-		__ptr = (__struct *) gf_malloc( __n * sizeof(__struct));\
+		(__ptr) = (__struct *) gf_malloc( __n * sizeof(__struct));\
 		if (__ptr) {\
-			memset((void *) __ptr, 0, __n * sizeof(__struct));\
+			memset((void *) (__ptr), 0, __n * sizeof(__struct));\
 		}\
 	}
 
@@ -249,6 +258,121 @@
 */
 GF_Err gf_dynstrcat(char **str, const char *to_append, const char *sep);
 
+
+/*!
+\brief fraction parsing
+
+Parse a 64 bit fraction from string
+\param str string to parse
+\param frac fraction to fill
+\return GF_TRUE if success, GF_FALSE otherwise ( fraction being set to {0,0} )
+ */
+Bool gf_parse_lfrac(const char *str, GF_Fraction64 *frac);
+
+/*!
+\brief fraction parsing
+
+Parse a 32 bit fraction from string
+\param str string to parse
+\param frac fraction to fill
+\return GF_TRUE if success, GF_FALSE otherwise ( fraction being set to {0,0} )
+ */
+Bool gf_parse_frac(const char *str, GF_Fraction *frac);
+
+/*!
+\brief search string without case
+
+Search a aubstring in a string witout checking for case
+\param text text to search
+\param subtext string to find
+\param subtext_len length of string to find
+\return GF_TRUE if success, GF_FALSE otherwise
+ */
+Bool gf_strnistr(const char *text, const char *subtext, u32 subtext_len);
+
+
+/*!
+\brief safe timestamp rescale
+
+Rescale a 64 bit timestamp value to new timescale, i.e. performs value * new_timescale / timescale
+\param value value to rescale. A value of -1 means no timestamp defined and is returned unmodified
+\param timescale timescale of value. Assumed to be less than 0xFFFFFFFF
+\param new_timescale new timescale? Assumed to be less than 0xFFFFFFFF
+\return new value
+ */
+u64 gf_timestamp_rescale(u64 value, u64 timescale, u64 new_timescale);
+
+/*!
+\brief safe signed timestamp rescale
+
+Rescale a 64 bit timestamp value to new timescale, i.e. performs value * new_timescale / timescale
+\param value value to rescale
+\param timescale timescale of value. Assumed to be less than 0xFFFFFFFF
+\param new_timescale new timescale. Assumed to be less than 0xFFFFFFFF
+\return new value
+ */
+s64 gf_timestamp_rescale_signed(s64 value, u64 timescale, u64 new_timescale);
+
+/*!
+\brief compare timestamps
+
+Compares two timestamps
+\param value1 value to rescale
+\param timescale1 timescale of value. Assumed to be less than 0xFFFFFFFF
+\param value2 value to rescale
+\param timescale2 timescale of value. Assumed to be less than 0xFFFFFFFF
+\return GF_TRUE if (value1 / timescale1) is stricly less than (value2 / timescale2)
+ */
+Bool gf_timestamp_less(u64 value1, u64 timescale1, u64 value2, u64 timescale2);
+
+/*!
+\brief compare timestamps
+
+Compares two timestamps
+\param value1 value to rescale
+\param timescale1 timescale of value. Assumed to be less than 0xFFFFFFFF
+\param value2 value to rescale
+\param timescale2 timescale of value. Assumed to be less than 0xFFFFFFFF
+\return GF_TRUE if (value1 / timescale1) is stricly less than or equal to (value2 / timescale2)
+ */
+Bool gf_timestamp_less_or_equal(u64 value1, u64 timescale1, u64 value2, u64 timescale2);
+
+/*!
+\brief compare timestamps
+
+Compares two timestamps
+\param value1 value to rescale
+\param timescale1 timescale of value. Assumed to be less than 0xFFFFFFFF
+\param value2 value to rescale
+\param timescale2 timescale of value. Assumed to be less than 0xFFFFFFFF
+\return GF_TRUE if (value1 / timescale1) is stricly greater than (value2 / timescale2)
+ */
+Bool gf_timestamp_greater(u64 value1, u64 timescale1, u64 value2, u64 timescale2);
+
+/*!
+\brief compare timestamps
+
+Compares two timestamps
+\param value1 value to rescale
+\param timescale1 timescale of value. Assumed to be less than 0xFFFFFFFF
+\param value2 value to rescale
+\param timescale2 timescale of value. Assumed to be less than 0xFFFFFFFF
+\return GF_TRUE if (value1 / timescale1) is stricly greater than or equal to (value2 / timescale2)
+ */
+Bool gf_timestamp_greater_or_equal(u64 value1, u64 timescale1, u64 value2, u64 timescale2);
+
+/*!
+\brief compare timestamps
+
+Compares two timestamps
+\param value1 value to rescale
+\param timescale1 timescale of value. Assumed to be less than 0xFFFFFFFF
+\param value2 value to rescale
+\param timescale2 timescale of value. Assumed to be less than 0xFFFFFFFF
+\return GF_TRUE if (value1 / timescale1) is equal to (value2 / timescale2)
+ */
+Bool gf_timestamp_equal(u64 value1, u64 timescale1, u64 value2, u64 timescale2);
+
 /*! @} */
 
 /*!
@@ -298,7 +422,7 @@
 GF_Err gf_sys_init(GF_MemTrackerType mem_tracker_type, const char *profile);
 /*!
 \brief System closing
-Closes the system high-resolution clock and any CPU associated ressources.
+Closes the system high-resolution clock and any CPU associated resources.
 \note This can be called several times but the system will be closed when no more users are counted.
 */
 void gf_sys_close();
@@ -308,7 +432,7 @@
 
 Sets the user app arguments (used by GUI mode)
 \param argc Number of arguments
-\param argv Array of arguments
+\param argv Array of arguments - the first string is ignored (considered to be the executable name)
 \return error code if any, GF_OK otherwise
 */
 GF_Err gf_sys_set_args(s32 argc, const char **argv);
@@ -338,6 +462,14 @@
 */
 const char *gf_sys_get_arg(u32 arg);
 
+/*!
+\brief Locate a global filter arg
+
+Looks for a filter option specified as global argument
+\param arg name of option to search, without "--" or "-+" specififers
+\return argument value string, empty string for booleans or NULL if not found
+ */
+const char *gf_sys_find_global_arg(const char *arg);
 
 /*!
 \brief Mark arg as used
@@ -507,13 +639,13 @@
 \brief Log exits at first error assignment
 
 When GF_LOG_ERROR happens, program leaves with instruction exit(1);
-\param strict strict behaviour when encoutering a serious error.
+\param strict strict behavior when encoutering a serious error.
 \return old value before the call.
 */
 Bool gf_log_set_strict_error(Bool strict);
 
 /*!
-\brief gets string-formated log tools
+\brief gets string-formatted log tools
 
 Gets the string-formatted log tools and levels. Returned string shall be freed by the caller.
 \return string-formatted log tools.
@@ -540,15 +672,11 @@
 	GF_LOG_HTTP,
 	/*! Log message from the RTP/RTCP stack (TS info) and packet structure & hinting (debug)*/
 	GF_LOG_RTP,
-	/*! Log message from authoring subsystem (file manip, import/export)*/
-	GF_LOG_AUTHOR,
-	/*! Log message from the sync layer of the terminal*/
-	GF_LOG_SYNC,
 	/*! Log message from a codec*/
 	GF_LOG_CODEC,
-	/*! Log message from any XML parser (context loading, etc)*/
+	/*! Log message from any textual (XML, ...) parser (context loading, etc)*/
 	GF_LOG_PARSER,
-	/*! Log message from the terminal/compositor, indicating media object state*/
+	/*! Generic log message from a filter (not from filter core library)*/
 	GF_LOG_MEDIA,
 	/*! Log message from the scene graph/scene manager (handling of nodes and attribute modif, DOM core)*/
 	GF_LOG_SCENE,
@@ -558,14 +686,14 @@
 	GF_LOG_INTERACT,
 	/*! Log message from compositor*/
 	GF_LOG_COMPOSE,
+	/*! Log message from the terminal/compositor, indicating media object state*/
+	GF_LOG_COMPTIME,
 	/*! Log for video object cache */
 	GF_LOG_CACHE,
 	/*! Log message from multimedia I/O devices (audio/video input/output, ...)*/
 	GF_LOG_MMIO,
 	/*! Log for runtime info (times, memory, CPU usage)*/
 	GF_LOG_RTI,
-	/*! Log for SMIL timing and animation*/
-	GF_LOG_SMIL,
 	/*! Log for memory tracker*/
 	GF_LOG_MEMORY,
 	/*! Log for audio compositor*/
@@ -578,12 +706,12 @@
 	GF_LOG_CONDITION,
 	/*! Log for all HTTP streaming */
 	GF_LOG_DASH,
-	/*! Log for all messages coming from filters */
+	/*! Log for all messages from filter core library (not from a filter) */
 	GF_LOG_FILTER,
 	/*! Log for filter scheduler only */
 	GF_LOG_SCHEDULER,
-	/*! Log for all ATSC3 message */
-	GF_LOG_ATSC,
+	/*! Log for all ROUTE message */
+	GF_LOG_ROUTE,
 	/*! Log for all messages coming from GF_Terminal or script alert()*/
 	GF_LOG_CONSOLE,
 	/*! Log for all messages coming the application, not used by libgpac or the modules*/
@@ -632,9 +760,9 @@
 \cond DUMMY_DOXY_SECTION
 */
 #ifndef GPAC_DISABLE_LOG
-/*note:
-		to turn log on, change to GPAC_ENABLE_LOG
-		to turn log off, change to GPAC_DISABLE_LOG
+/*\note
+	- to turn log on, change to GPAC_ENABLE_LOG
+	- to turn log off, change to GPAC_DISABLE_LOG
 	this is needed by configure+sed to modify this file directly
 */
 #define GPAC_ENABLE_LOG
@@ -846,6 +974,13 @@
 */
 GF_Err gf_bin128_parse(const char *string, bin128 value);
 
+
+enum
+{
+ GF_BLOB_IN_TRANSFER = 1,
+ GF_BLOB_CORRUPTED = 1<<1,
+};
+
 /*!
 * Blob structure used to pass data pointer around
 */
@@ -855,16 +990,28 @@
 	u8 *data;
 	/*! size of blob */
 	u32 size;
+ /*! blob flags */
+ u32 flags;
+ /*! blob mutex for multi-thread access */
+ struct __tag_mutex *mx;
 } GF_Blob;
 
 /*!
- * Retrieves data associated with a blob url
+ * Retrieves data associated with a blob url. If success, \ref gf_blob_release must be called after this
 \param blob_url URL of blob object (ie gmem://%p)
 \param out_data if success, set to blob data pointer
 \param out_size if success, set to blob data size
+\param blob_flags if success, set to blob flags - may be NULL
+\return error code
+ */
+GF_Err gf_blob_get(const char *blob_url, u8 **out_data, u32 *out_size, u32 *blob_flags);
+
+/*!
+ * Releases blob data
+\param blob_url URL of blob object (ie gmem://%p)
 \return error code
 */
-GF_Err gf_blob_get_data(const char *blob_url, u8 **out_data, u32 *out_size);
+GF_Err gf_blob_release(const char *blob_url);
 
 /*!
 \addtogroup time_grp
@@ -919,7 +1066,7 @@
 \brief converts an ntp timestamp into UTC time in milliseconds
 
 Converts NTP 64-bit timestamp to UTC clock in milliseconds
-\u64 ntp NTP timestamp
+\param ntp NTP timestamp
 \return UTC time in milliseconds
 */
 u64 gf_net_ntp_to_utc(u64 ntp);
@@ -958,6 +1105,14 @@
 s32 gf_net_get_timezone();
 
 /*!
+\brief gets timezone daylight saving time status
+
+Gets timezone daylight saving time
+\return GF_TRUE if DST is active
+ */
+Bool gf_net_time_is_dst();
+
+/*!
 \brief gets time from UTC timestamp
 
 Gets time from UTC timestamp
@@ -1131,7 +1286,7 @@
 \param DirPathName the dir path name.
 \return error if any
 */
-GF_Err gf_cleanup_dir(const char* DirPathName);
+GF_Err gf_dir_cleanup(const char* DirPathName);
 
 
 /**
@@ -1274,10 +1429,11 @@
 \param file_name same as fopen
 \param parent_url URL of parent file. If not a file io wrapper (gfio://), the function is equivalent to gf_fopen
 \param mode same as fopen
+\param no_warn if GF_TRUE, do not throw log message if failure
 \return stream handle of the file object
 \note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
 \return stream habdle of the file or file IO object*/
-FILE *gf_fopen_ex(const char *file_name, const char *parent_url, const char *mode);
+FILE *gf_fopen_ex(const char *file_name, const char *parent_url, const char *mode, Bool no_warn);
 
 /*!
 \brief file closing
@@ -1323,7 +1479,6 @@
 */
 char* gf_file_ext_start(const char* filename);
 
-
 /*!\brief FileEnum info object
 
 The FileEnumInfo object is used to get file attributes upon enumeration of a directory.
@@ -1403,7 +1558,7 @@
 /*!
 \brief File Modification Time
 
-Gets the modification time of the given file. The exact meaning of this value is system dependent
+Gets the UTC modification time of the given file in microseconds
 \param filename file to check
 \return modification time of the file
 */
@@ -1433,11 +1588,12 @@
 /*! open proc for memory file IO
 \param fileio_ref reference file_io. A file can be opened multiple times for the same reference, your code must handle this
 \param url target file name.
-\param mode opening mode of file, same as fopen mode. The following additionnal modes are defined:
+\param mode opening mode of file, same as fopen mode. The following additional modes are defined:
 	- "ref": indicates this FileIO object is used by some part of the code and must not be destroyed upon closing of the file. Associated URL is null
 	- "unref": indicates this FileIO object is not used by some part of the code and may be destroyed if no more references to this object are set. Associated URL is null
 	- "url": indicates to create a new FileIO object for the given URL without opening the output file. The resulting FileIO object must be garbage collected by the app in case its is never used by the callers
 	- "probe": checks if the file exists, but no need to open the file. The function should return NULL in this case. If file does not exist, set out_error to GF_URL_ERROR
+	- "close": indicates the fileIO object is being closed (fclose)
 \param out_error must be set to error code if any (never NULL)
 \return the opened GF_FileIO if success, or NULL otherwise
 */
@@ -1556,6 +1712,22 @@
 */
 GF_FileIO *gf_fileio_open_url(GF_FileIO *fileio, const char *url, const char *mode, GF_Err *out_err);
 
+
+/*! Tags a FileIO object to be accessed from main thread only
+\param fileio target file IO object
+\return error if any
+*/
+GF_Err gf_fileio_tag_main_thread(GF_FileIO *fileio);
+
+/*! Check if a FileIO object is to be accessed from main thread only
+
+ \note Filters accessing FileIO objects by other means that a filter option must manually tag themselves as main thread, potentially rescheduling a configure call to next process. Not doing so can result in binding crashes in multi-threaded mode.
+
+\param url target url
+\return GF_TRUE if object is tagged for main thread, GF_FALSE otherwise
+*/
+Bool gf_fileio_is_main_thread(const char *url);
+
 /*! Gets GF_FileIO object from its URL
 The url uses the protocol scheme "gfio://"
 \param url the URL of the File IO object
@@ -1564,7 +1736,7 @@
 GF_FileIO *gf_fileio_from_url(const char *url);
 
 /*! Constructs a new GF_FileIO object from a URL
- The url can be absolute or relative to the parent GF_FileIO. This is typcically needed by filters (dash input, dasher, NHML/NHNT writers...) generating or consuming additionnal files associated with the main file IO object but being written or read by other filters.
+ The url can be absolute or relative to the parent GF_FileIO. This is typcically needed by filters (dash input, dasher, NHML/NHNT writers...) generating or consuming additional files associated with the main file IO object but being written or read by other filters.
 The function will not open the associated resource, only create the file IO wrapper for later usage
 If you need to create a new fileIO to be opened immediately, use \ref gf_fopen_ex.
 
@@ -1769,6 +1941,13 @@
 */
 GF_Err gf_sha1_file(const char *filename, u8 digest[GF_SHA1_DIGEST_SIZE]);
 
+/*! gets SHA1 message digest of a opened file
+\param file handle to open file
+\param digest buffer to store message digest
+\return error if any
+*/
+GF_Err gf_sha1_file_ptr(FILE *file, u8 digest[GF_SHA1_DIGEST_SIZE] );
+
 /*! gets SHA-1 of input buffer
 \param buf input buffer to hash
 \param buflen sizeo of input buffer in bytes
@@ -1909,8 +2088,8 @@
 void gf_fm_request_call(u32 type, u32 param, int *value);
 #endif //GPAC_CONFIG_ANDROID
 
-/*to call whenever the OpenGL library is opened - this function is needed to bind openGL and remotery, and to load
-openGL extensions on windows
+/*to call whenever the OpenGL library is opened - this function is needed to bind OpenGL and remotery, and to load
+OpenGL extensions on windows
 not exported, and not included in src/compositor/gl_inc.h since it may be needed even when no OpenGL 
 calls are made by the caller*/
 void gf_opengl_init();
@@ -1937,6 +2116,7 @@
 	Bool is_yuv;
 	u32 bit_depth, uv_w, uv_h;
 	u32 scale_10bit;
+	u32 init_active_texture;
 
 	u32 gl_format;
 	u32 bytes_per_pix;
@@ -1947,13 +2127,18 @@
 	struct _gf_filter_frame_interface *frame_ifce;
 	Bool first_tx_load;
 
-	//PBO state - must be managed by caller, especially if using seperated push and texImg steps through gf_gl_txw_setup calls
+	//PBO state - must be managed by caller, especially if using separated push and texImg steps through gf_gl_txw_setup calls
 	GF_GLPBOState pbo_state;
 	Bool flip;
+	//YUV is full video range
+	Bool fullrange;
+	s32 mx_cicp;
+
+	u32 last_program;
 } GF_GLTextureWrapper;
 
-Bool gf_gl_txw_insert_fragment_shader(u32 pix_fmt, const char *tx_name, char **f_source);
-Bool gf_gl_txw_setup(GF_GLTextureWrapper *tx, u32 pix_fmt, u32 width, u32 height, u32 stride, u32 uv_stride, Bool linear_interp, struct _gf_filter_frame_interface *frame_ifce);
+Bool gf_gl_txw_insert_fragment_shader(u32 pix_fmt, const char *tx_name, char **f_source, Bool y_flip);
+Bool gf_gl_txw_setup(GF_GLTextureWrapper *tx, u32 pix_fmt, u32 width, u32 height, u32 stride, u32 uv_stride, Bool linear_interp, struct _gf_filter_frame_interface *frame_ifce, Bool full_range, s32 matrix_coef_or_neg);
 Bool gf_gl_txw_upload(GF_GLTextureWrapper *tx, const u8 *data, struct _gf_filter_frame_interface *frame_ifce);
 Bool gf_gl_txw_bind(GF_GLTextureWrapper *tx, const char *tx_name, u32 gl_program, u32 texture_unit);
 void gf_gl_txw_reset(GF_GLTextureWrapper *tx);

gpac-1.0.1.tar.gz/include/gpac/utf.h -> gpac-2.0.0.tar.gz/include/gpac/utf.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -49,6 +49,8 @@
 
 #include <gpac/tools.h>
 
+/*! error code for UTF-8 conversion errors*/
+#define GF_UTF8_FAIL	0xFFFFFFFF
 /*!
 \brief wide-char to multibyte conversion
 
@@ -56,9 +58,9 @@
 \param dst multibyte destination buffer
 \param dst_len multibyte destination buffer size
 \param srcp address of the wide-char string. This will be set to the next char to be converted in the input buffer if not enough space in the destination, or NULL if conversion was completed.
-\return length (in byte) of the multibyte string or -1 if error.
+\return length (in byte) of the multibyte string or GF_UTF8_FAIL if error.
 */
-size_t gf_utf8_wcstombs(char* dst, size_t dst_len, const unsigned short** srcp);
+u32 gf_utf8_wcstombs(char* dst, size_t dst_len, const unsigned short** srcp);
 
 /*!
 \brief multibyte to wide-char conversion
@@ -67,9 +69,9 @@
 \param dst wide-char destination buffer
 \param dst_len wide-char destination buffer size
 \param srcp address of the multibyte character buffer. This will be set to the next char to be converted in the input buffer if not enough space in the destination, or NULL if conversion was completed.
-\return length (in unsigned short) of the wide-char string or -1 if error.
+\return length (in unsigned short) of the wide-char string or GF_UTF8_FAIL if error.
 */
-size_t gf_utf8_mbstowcs(unsigned short* dst, size_t dst_len, const char** srcp);
+u32 gf_utf8_mbstowcs(unsigned short* dst, size_t dst_len, const char** srcp);
 
 /*!
 \brief wide-char string length
@@ -78,19 +80,31 @@
 \param s the wide-char string
 \return the wide-char string length
 */
-size_t gf_utf8_wcslen(const unsigned short *s);
+u32 gf_utf8_wcslen(const unsigned short *s);
 
 /*!
 \brief returns a UTF8 string from a string started with BOM
 
-Returns the length in character of a wide-char string
+Returns UTF8 from data
 \param data the string or wide-char string
 \param size of the data buffer
 size of the data buffer
-\param out_ptr set to an allocated buffer if needed for conversion, shall be destroyed by caller
-\return the UTF8 string corresponding
+\param out_ptr set to an allocated buffer if needed for conversion, shall be destroyed by caller. Must not be NULL
+\param result set to resulting UTF8 string. Must not be NULL
+\return error if any: GF_IO_ERR if UTF decode error or GF_BAD_PARAM
 */
-char *gf_utf_get_utf8_string_from_bom(u8 *data, u32 size, char **out_ptr);
+GF_Err gf_utf_get_utf8_string_from_bom(const u8 *data, u32 size, char **out_ptr, char **result);
+
+/*!
+\brief Checks validity of a UTF8 string
+
+Checks if a given byte sequence is a valid UTF-8 encoding
+\param data the byte equence buffer
+\param size the length of the byte sequence
+\return GF_TRUE if valid UTF8, GF_FALSE otherwise
+ */
+Bool gf_utf8_is_legal(const u8 *data, u32 size);
+
 
 /*!
 \brief string bidi reordering
@@ -103,7 +117,7 @@
 Bool gf_utf8_reorder_bidi(u16 *utf_string, u32 len);
 
 /*! maximum character size in bytes*/
-static const size_t UTF8_MAX_BYTES_PER_CHAR = 4;
+static const u32 UTF8_MAX_BYTES_PER_CHAR = 4;
 
 
 /*!

gpac-1.0.1.tar.gz/include/gpac/version.h -> gpac-2.0.0.tar.gz/include/gpac/version.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2012-2019
+ *			Copyright (c) Telecom ParisTech 2012-2022
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -42,11 +42,13 @@
  * SONAME versions must be digits (not strings)
  */
 /*! Macro giving GPAC version name expressed as a printable string*/
-#define GPAC_VERSION          "1.0.1"
+#define GPAC_VERSION          "2.0"
+
+// WARNING: when bumping, reflect the changes in share/python/libgpac.py !!
 /*! ABI Major number of libgpac */
-#define GPAC_VERSION_MAJOR 10
+#define GPAC_VERSION_MAJOR 11
 /*! ABI Minor number of libgpac */
-#define GPAC_VERSION_MINOR 1
+#define GPAC_VERSION_MINOR 0
 /*! ABI Micro number of libgpac */
 #define GPAC_VERSION_MICRO 0
 
@@ -65,6 +67,18 @@
 */
 const char *gf_gpac_copyright_cite();
 
+/*!gets libgpac ABI major version
+\return major number of libgpac ABI version*/
+u32 gf_gpac_abi_major();
+
+/*!gets libgpac ABI minor version
+\return minor number of libgpac ABI version*/
+u32 gf_gpac_abi_minor();
+
+/*!gets libgpac ABI major version
+\return micro number of libgpac ABI version*/
+u32 gf_gpac_abi_micro();
+
 /*! @} */
 
 #endif //_GF_VERSION_H

gpac-1.0.1.tar.gz/include/gpac/webvtt.h -> gpac-2.0.0.tar.gz/include/gpac/webvtt.h Changed

gpac-1.0.1.tar.gz/include/gpac/xml.h -> gpac-2.0.0.tar.gz/include/gpac/xml.h Changed

@@ -51,7 +51,7 @@
 \ingroup xml_grp
 \defgroup dom_grp DOM Parsing
 \ingroup xml_grp
-\defgroup xmlb_grp XML Binary Formating
+\defgroup xmlb_grp XML Binary Formatting
 \ingroup xml_grp
 */
 
@@ -99,6 +99,8 @@
 	GF_List *attributes;
 	/*! list of children nodes of the node, for XML node type only*/
 	GF_List *content;
+	/*! original pos in parent (used for DASH MPD)*/
+	u32 orig_pos;
 } GF_XMLNode;
 
 /*! @} */
@@ -295,13 +297,28 @@
 */
 GF_XMLNode *gf_xml_dom_get_root_idx(GF_DOMParser *parser, u32 idx);
 
+/*! Gets the root node of the document and assign the parser root to NULL.
+\param parser the DOM parser to use
+\return the root element at the given index, or NULL if error. The element must be freed by the caller
+*/
+GF_XMLNode *gf_xml_dom_detach_root(GF_DOMParser *parser);
 
 /*! Serialize a node to a string
 \param node the node to flush
 \param content_only Whether to include or not the parent node
+\param no_escape if set, disable escape of XML reserved chars (<,>,",') in text nodes
 \return The resulting serialization. The string has to be freed with gf_free
 */
-char *gf_xml_dom_serialize(GF_XMLNode *node, Bool content_only);
+char *gf_xml_dom_serialize(GF_XMLNode *node, Bool content_only, Bool no_escape);
+
+
+/*! Serialize a root document node - same as \ref gf_xml_dom_serialize but insert \code <?xml version="1.0" encoding="UTF-8"?> \endcode at beginning
+\param node the node to flush
+\param content_only Whether to include or not the parent node
+\param no_escape if set, disable escape of XML reserved chars (<,>,",') in text nodes
+\return The resulting serialization. The string has to be freed with gf_free
+ */
+char *gf_xml_dom_serialize_root(GF_XMLNode *node, Bool content_only, Bool no_escape);
 
 /*! Get the root element -- the only top level element -- of the document.
 \param parser the DOM structure
@@ -324,17 +341,6 @@
 */
 GF_Err gf_xml_dom_append_child(GF_XMLNode *node, GF_XMLNode *child);
 
-/*!
-\brief Removes the node to the list of children of this node.
-
-Removes the node to the list of children of this node.
-\warning Doesn't free the memory of the removed children.
-
-\param node the GF_XMLNode node
-\param child the GF_XMLNode child to remove
-\return Error code if any, otherwise GF_OK
- */
-GF_Err gf_xml_dom_rem_child(GF_XMLNode *node, GF_XMLNode *child);
 
 /*! Destroys a node, its attributes and its children
 
@@ -342,6 +348,14 @@
 */
 void gf_xml_dom_node_del(GF_XMLNode *node);
 
+/*! Reset a node
+
+\param node the node to reset
+\param reset_attribs if GF_TRUE, reset all node attributes
+\param reset_children if GF_TRUE, reset all node children
+ */
+void gf_xml_dom_node_reset(GF_XMLNode *node, Bool reset_attribs, Bool reset_children);
+
 
 /*! Gets the element and check that the namespace is known ('xmlns'-only supported for now)
 \param n the node to process

gpac-2.0.0.tar.gz/manifest.rc Added

gpac-1.0.1.tar.gz/mkdmg.sh -> gpac-2.0.0.tar.gz/mkdmg.sh Changed

@@ -69,12 +69,13 @@
 
 cd ../../../..
 
-echo Copying GUI
+echo Copying shared resources
 rsync -r --exclude=.git $source_path/share/res ./tmpdmg/GPAC.app/Contents/MacOS/share/
 rsync -r --exclude=.git $source_path/share/gui ./tmpdmg/GPAC.app/Contents/MacOS/share/
 rsync -r --exclude=.git $source_path/share/vis ./tmpdmg/GPAC.app/Contents/MacOS/share/
 rsync -r --exclude=.git $source_path/share/shaders ./tmpdmg/GPAC.app/Contents/MacOS/share/
 rsync -r --exclude=.git $source_path/share/scripts ./tmpdmg/GPAC.app/Contents/MacOS/share/
+rsync -r --exclude=.git $source_path/share/python ./tmpdmg/GPAC.app/Contents/MacOS/share/
 cp $source_path/share/default.cfg ./tmpdmg/GPAC.app/Contents/MacOS/share/
 
 echo Building DMG
@@ -94,7 +95,7 @@
 	full_version="$full_version-rev$rev"
 else
 	#if no revision can be extracted, use date
- 	$rev = $(date +%Y%m%d)
+ 	rev = $(date +%Y%m%d)
 fi
 
 sed 's/<string>.*<\/string>/<string>'"$version"'<\/string>/' tmpdmg/GPAC.app/Contents/Info.plist > tmpdmg/GPAC.app/Contents/Info.plist.new && sed 's/<string>.*<\/string>/<string>'"$rev"'<\/string>/' tmpdmg/GPAC.app/Contents/Info.plist.new > tmpdmg/GPAC.app/Contents/Info.plist && rm tmpdmg/GPAC.app/Contents/Info.plist.new

gpac-1.0.1.tar.gz/modules/dektec_out/dektec_video_decl.c -> gpac-2.0.0.tar.gz/modules/dektec_out/dektec_video_decl.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Romain Bouqueau, Jean Le Feuvre
-*			Copyright (c) 2014-2016 GPAC Licensing
+*			Copyright (c) 2014-2022 GPAC Licensing
 *			Copyright (c) 2016-2020 Telecom Paris
 *					All rights reserved
 *
@@ -32,6 +32,10 @@
 #else
 #define OFFS(_n)	#_n, -1
 
+static GF_Err dtout_config_dummy(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	return GF_OK;
+}
 static GF_Err dtout_process_dummy(GF_Filter *filter)
 {
 	return GF_OK;
@@ -40,12 +44,12 @@
 
 static const GF_FilterArgs DTOutArgs[] =
 {
-	{ OFFS(bus), "PCI bus number - if not set, device discovery is used", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(slot), "PCI bus number - if not set, device discovery is used", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT },
+	{ OFFS(bus), "PCI bus number. If not set, device discovery is used", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(slot), "PCI bus number. If not set, device discovery is used", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT },
 	{ OFFS(fps), "default FPS to use if input stream fps cannot be detected", GF_PROP_FRACTION, "30/1", NULL, GF_FS_ARG_HINT_ADVANCED },
 	{ OFFS(clip), "clip YUV data to valid SDI range, slower", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED },
 	{ OFFS(port), "set sdi output port of card", GF_PROP_UINT, "1", NULL, GF_FS_ARG_HINT_ADVANCED },
-	{ OFFS(start), "set playback start offset, [-1, 0] means percent of media dur, eg -1 == dur", GF_PROP_DOUBLE, "0.0", NULL, GF_FS_ARG_HINT_NORMAL },
+	{ OFFS(start), "set playback start offset, [-1, 0] means percent of media dur, e.g. -1 == dur", GF_PROP_DOUBLE, "0.0", NULL, GF_FS_ARG_HINT_NORMAL },
 	{ 0 }
 };
 
@@ -100,9 +104,11 @@
 	DTOutRegister.configure_pid = dtout_configure_pid;
 	DTOutRegister.process = dtout_process;
 #else
+	DTOutRegister.configure_pid = dtout_config_dummy;
 	DTOutRegister.process = dtout_process_dummy;
 
 #ifdef GPAC_ENABLE_COVERAGE
+	dtout_config_dummy(NULL, NULL, GF_FALSE);
 	dtout_process_dummy(NULL);
 #endif

gpac-1.0.1.tar.gz/modules/dektec_out/out_dektec.vcxproj -> gpac-2.0.0.tar.gz/modules/dektec_out/out_dektec.vcxproj Changed

@@ -132,6 +132,7 @@
 </Link>
 <Manifest>
 <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
 </Manifest>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -177,6 +178,7 @@
 </Link>
 <Manifest>
 <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
 </Manifest>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -227,6 +229,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
@@ -270,6 +275,9 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\modules\dektec_out\dektec_video.cpp" />

gpac-1.0.1.tar.gz/modules/deprecated/old_arch/ffmpeg_in/ffmpeg_demux.c -> gpac-2.0.0.tar.gz/modules/deprecated/old_arch/ffmpeg_in/ffmpeg_demux.c Changed

gpac-1.0.1.tar.gz/modules/deprecated/old_arch/freenect/freenect.c -> gpac-2.0.0.tar.gz/modules/deprecated/old_arch/freenect/freenect.c Changed

gpac-1.0.1.tar.gz/modules/droid_out/droid_vout.c -> gpac-2.0.0.tar.gz/modules/droid_out/droid_vout.c Changed

gpac-1.0.1.tar.gz/modules/dx_hw/dx_hw.rc -> gpac-2.0.0.tar.gz/modules/dx_hw/dx_hw.rc Changed

@@ -7,19 +7,17 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "windows.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Français (France) resources
+// French (France) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -32,13 +30,18 @@
     "resource.h\0"
 END
 
-
 3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
 END
 
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""windows.h""\r\n"
+    "\0"
+END
+
 #endif    // APSTUDIO_INVOKED
 
 
@@ -48,8 +51,10 @@
 //
 
 IDC_HAND_PTR            CURSOR                  "hand.cur"
+
 IDC_COLLIDE             CURSOR                  "collide.cur"
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -58,7 +63,8 @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_OSMO_ICON           ICON                    "../../share/doc/osmo4.ico"
-#endif    // Français (France) resources
+
+#endif    // French (France) resources
 /////////////////////////////////////////////////////////////////////////////

gpac-1.0.1.tar.gz/modules/dx_hw/dx_window.c -> gpac-2.0.0.tar.gz/modules/dx_hw/dx_window.c Changed

gpac-1.0.1.tar.gz/modules/ft_font/ft_font.c -> gpac-2.0.0.tar.gz/modules/ft_font/ft_font.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / FreeType font engine module
@@ -56,6 +56,7 @@
 
 	/*default fonts*/
 	char *font_serif, *font_sans, *font_fixed, *font_default;
+	Bool cache_checked;
 } FTBuilder;
 
 static const char * BEST_FIXED_FONTS[] = {
@@ -123,7 +124,7 @@
 	GF_FontReader *dr = cbck;
 	FTBuilder *ftpriv = dr->udta;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[FreeType] Enumerating font %s (%s)\n", file_name, file_path));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[FreeType] Enumerating font %s (%s)\n", file_name, file_path));
 
 	if (FT_New_Face(ftpriv->library, file_path, 0, & face )) return 0;
 	if (!face || !face->family_name) return 0;
@@ -198,7 +199,7 @@
 
 static Bool ft_enum_fonts_dir(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
 {
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[FreeType] Scanning directory %s (%s)\n", file_name, file_path));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[FreeType] Scanning directory %s (%s)\n", file_name, file_path));
 	gf_enum_directory(file_path, 0, ft_enum_fonts, cbck, "ttf;ttc");
 	return (gf_enum_directory(file_path, 1, ft_enum_fonts_dir, cbck, NULL)==GF_OK) ? GF_FALSE : GF_TRUE;
 }
@@ -209,9 +210,12 @@
 	u32 i, count;
 	FTBuilder *ftpriv = (FTBuilder *)dr->udta;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[FreeType] Rescaning %d font directories\n", gf_list_count(ftpriv->font_dirs) ));
+	ftpriv->cache_checked = GF_TRUE;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[FreeType] Rescaning %d font directories\n", gf_list_count(ftpriv->font_dirs) ));
 
 	gf_opts_del_section("FontCache");
+	gf_opts_del_section("temp_freetype");
 	gf_opts_set_key("core", "rescan-fonts", "no");
 
 	if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);
@@ -297,7 +301,7 @@
 	gf_opts_set_key("FontCache", "FontSerif", ftpriv->font_serif);
 	gf_opts_set_key("FontCache", "FontSans", ftpriv->font_sans);
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[FreeType] Font directories scanned\n"));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[FreeType] Font directories scanned\n"));
 }
 
 
@@ -305,20 +309,31 @@
 static GF_Err ft_init_font_engine(GF_FontReader *dr)
 {
 	const char *sOpt;
-	Bool rescan = GF_FALSE;
+	u32 rescan = 0;
+	GF_Err e;
 	FTBuilder *ftpriv = (FTBuilder *)dr->udta;
 
-	sOpt = gf_opts_get_key("core", "font-dirs");
-	if (!sOpt) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[FreeType] No fonts directory indicated!"));
-		return GF_BAD_PARAM;
-	}
 	/*inits freetype*/
 	if (FT_Init_FreeType(&ftpriv->library) ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[FreeType] Cannot initialize FreeType\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[FreeType] Cannot initialize FreeType\n"));
 		return GF_IO_ERR;
 	}
 
+	if (!gf_opts_get_key_count("FontCache"))
+		rescan = 1;
+	else {
+		sOpt = gf_opts_get_key("core", "rescan-fonts");
+		if (!sOpt || !strcmp(sOpt, "yes") )
+			rescan = 1;
+	}
+
+rescan_font_dirs:
+	sOpt = gf_opts_get_key("core", "font-dirs");
+	if (!sOpt) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[FreeType] No fonts directory indicated!"));
+		return GF_BAD_PARAM;
+	}
+
 	while (sOpt) {
 		char dir[GF_MAX_PATH];
 		char *sep = (char *) strchr(sOpt, ',');
@@ -341,14 +356,8 @@
 		sep[0] = ',';
 		sOpt = sep+1;
 	}
-	if (!gf_opts_get_key_count("FontCache"))
-		rescan = GF_TRUE;
-	else {
-		sOpt = gf_opts_get_key("core", "rescan-fonts");
-		if (!sOpt || !strcmp(sOpt, "yes") )
-			rescan = GF_TRUE;
-	}
 
+rescan_fonts:
 	if (rescan)
 		ft_rescan_fonts(dr);
 
@@ -366,7 +375,53 @@
 		sOpt = gf_opts_get_key("FontCache", "FontFixed");
 		ftpriv->font_fixed = gf_strdup(sOpt ? sOpt : "");
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[FreeType] Init OK - %d font directory (first %s)\n", gf_list_count(ftpriv->font_dirs), gf_list_get(ftpriv->font_dirs, 0) ));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[FreeType] Init OK - %d font directory (first %s)\n", gf_list_count(ftpriv->font_dirs), gf_list_get(ftpriv->font_dirs, 0) ));
+
+	e = dr->set_font(dr, ftpriv->font_serif, 0);
+	if (!e) e = dr->set_font(dr, ftpriv->font_sans, 0);
+	if (!e) e = dr->set_font(dr, ftpriv->font_fixed, 0);
+	if (!e) return GF_OK;
+
+	if (rescan==3)
+		return e;
+
+	if (ftpriv->font_serif) gf_free(ftpriv->font_serif);
+	ftpriv->font_serif = NULL;
+	if (ftpriv->font_sans) gf_free(ftpriv->font_sans);
+	ftpriv->font_sans = NULL;
+	if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);
+	ftpriv->font_fixed = NULL;
+
+	//error and we rescanned font dirs, restore default fonts
+	if (e && ftpriv->cache_checked)
+		rescan = 2;
+
+	if (!rescan) {
+		sOpt = gf_opts_get_key("core", "font-dirs");
+		rescan = 2;
+		if (sOpt) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MODULE, ("[FreeType] Default fonts not valid, rescanning font directories %s\n", sOpt));
+			goto rescan_fonts;
+		}
+	}
+	if (rescan==2) {
+		void gf_get_default_font_dir(char szPath[GF_MAX_PATH]);
+		
+		char szPath[GF_MAX_PATH];
+		//check if font directory is default one, if not reset and rescan
+		gf_get_default_font_dir(szPath);
+		sOpt = gf_opts_get_key("core", "font-dirs");
+		if (sOpt && !strcmp(sOpt, szPath))
+			return e;
+
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MODULE, ("[FreeType] No fonts found in %s, restoring default directories %s and rescanning\n", sOpt, szPath));
+		gf_opts_set_key("core", "font-dirs", szPath);
+		rescan = 3;
+		while (gf_list_count(ftpriv->font_dirs)) {
+			gf_free(gf_list_pop_back(ftpriv->font_dirs));
+		}
+		goto rescan_font_dirs;
+	}
 
 	return GF_OK;
 }
@@ -441,6 +496,7 @@
 	char *fname;
 	char *fontName;
 	const char *opt;
+	Bool is_def_font = GF_FALSE;
 	FTBuilder *ftpriv = (FTBuilder *)dr->udta;
 
 	fontName = (char *) OrigFontName;
@@ -451,21 +507,33 @@
 
 	if (!fontName || !strlen(fontName) || !stricmp(fontName, "SERIF")) {
 		fontName = ftpriv->font_serif;
+		is_def_font = GF_TRUE;
+		OrigFontName = "";
 	}
 	else if (!stricmp(fontName, "SANS") || !stricmp(fontName, "sans-serif")) {
 		fontName = ftpriv->font_sans;
+		is_def_font = GF_TRUE;
+		OrigFontName = "SANS";
 	}
 	else if (!stricmp(fontName, "TYPEWRITER") || !stricmp(fontName, "monospace")) {
 		fontName = ftpriv->font_fixed;
+		is_def_font = GF_TRUE;
+		OrigFontName = "TYPEWRITER";
 	}
 
 	/*first look in loaded fonts*/
 	ftpriv->active_face = ft_font_in_cache(ftpriv, fontName, styles);
 	if (ftpriv->active_face) return GF_OK;
 
-	/*check cfg file - gf_free(type is slow at loading fonts so we keep the (font name + styles)=fontfile associations
-	in the cfg file*/
-	if (!fontName || !strlen(fontName)) return GF_NOT_SUPPORTED;
+	//we likely have a problem with the font cache, rebuild if
+	if (!fontName || !strlen(fontName)) {
+		if (is_def_font && !ftpriv->cache_checked) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[FreeType] No default font set, rescanning fonts\n"));
+			ft_rescan_fonts(dr);
+			return ft_set_font(dr, OrigFontName, styles);
+		}
+		return GF_NOT_SUPPORTED;
+	}
 	fname = gf_malloc(sizeof(char) * (strlen(fontName) + 50));
 
 	{
@@ -500,7 +568,7 @@
 		}
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[FreeType] Font %s (%s) not found\n", fontName, fname));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[FreeType] Font %s (%s) not found\n", fontName, fname));
 	gf_free(fname);
 	gf_opts_set_key("temp_freetype", OrigFontName, "not found");
 	return GF_NOT_SUPPORTED;
@@ -525,7 +593,6 @@
 
 static GF_Err ft_get_glyphs(GF_FontReader *dr, const char *utf_string, u32 *glyph_buffer, u32 *io_glyph_buffer_size, const char *xml_lang, Bool *is_rtl)
 {
-	size_t _len;
 	u32 len;
 	u32 i;
 	u16 *conv;
@@ -545,9 +612,8 @@
 		*io_glyph_buffer_size = len+1;
 		return GF_BUFFER_TOO_SMALL;
 	}
-	_len = gf_utf8_mbstowcs((u16*) glyph_buffer, *io_glyph_buffer_size, (const char **) &utf8);
-	if (_len==(size_t)-1) return GF_IO_ERR;
-	len = (u32) _len;
+	len = gf_utf8_mbstowcs((u16*) glyph_buffer, *io_glyph_buffer_size, (const char **) &utf8);
+	if (len == GF_UTF8_FAIL) return GF_IO_ERR;
 	if (utf8) return GF_IO_ERR;
 
 	/*perform bidi relayout*/
@@ -634,7 +700,7 @@
 	glyph_idx = FT_Get_Char_Index(ftpriv->active_face, glyph_name);
 	/*missing glyph*/
 	if (!glyph_idx) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[FreeType] Glyph not found for char %d in font %s (style %s)\n", glyph_name, ftpriv->active_face->family_name, ftpriv->active_face->style_name));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MODULE, ("[FreeType] Glyph not found for char %d in font %s (style %s)\n", glyph_name, ftpriv->active_face->family_name, ftpriv->active_face->style_name));
 		return NULL;
 	}

gpac-1.0.1.tar.gz/modules/jack/jack.c -> gpac-2.0.0.tar.gz/modules/jack/jack.c Changed

gpac-1.0.1.tar.gz/modules/sdl_out/video.c -> gpac-2.0.0.tar.gz/modules/sdl_out/video.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre - Romain Bouqueau
-*			Copyright (c) Telecom ParisTech 2000-2020
+*			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 *  This file is part of GPAC / SDL audio and video module
@@ -731,8 +731,10 @@
 
 #if SDL_VERSION_ATLEAST(1, 2, 10)
 	vinf = SDL_GetVideoInfo();
-	dr->max_screen_width = vinf->current_w;
-	dr->max_screen_height = vinf->current_h;
+	if (vinf) {
+		dr->max_screen_width = vinf->current_w;
+		dr->max_screen_height = vinf->current_h;
+	}
 	dr->max_screen_bpp = 8;
 #else
 	{
@@ -1553,7 +1555,7 @@
 	break;
 	case GF_EVENT_SHOWHIDE:
 		/*the only way to have proper show/hide with SDL is to shutdown the video system and reset it up
-		which we don't want to do since the setup MUST occur in the rendering thread for some configs (openGL)*/
+		which we don't want to do since the setup MUST occur in the rendering thread for some configs (OpenGL)*/
 		return GF_NOT_SUPPORTED;
 	case GF_EVENT_SIZE:
 	{
@@ -1776,9 +1778,12 @@
 		break;
 	case GF_PIXEL_YUV:
 		pool = &ctx->pool_yuv;
-		format=SDL_PIXELFORMAT_YV12;
 		format=SDL_PIXELFORMAT_IYUV;
 		break;
+	case GF_PIXEL_YVU:
+		pool = &ctx->pool_yuv;
+		format=SDL_PIXELFORMAT_YV12;
+		break;
 	case GF_PIXEL_YUV422:
 	case GF_PIXEL_YUV444:
 	case GF_PIXEL_YUV444_10:

gpac-2.0.0.tar.gz/modules/test_filter Added

gpac-2.0.0.tar.gz/modules/test_filter/Makefile Added

gpac-2.0.0.tar.gz/modules/test_filter/test_filter.c Added

@@ -0,0 +1,115 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2010-2021
+ *					All rights reserved
+ *
+ * This file is part of GPAC / test sink filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <gpac/filters.h>
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+
+
+typedef struct
+{
+	Bool opt1;
+} TestContext;
+
+
+static GF_Err testfilter_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	TestContext *ctx = (TestContext *)gf_filter_get_udta(filter);
+	//if first time we see the pid, send a play event 
+	TestContext *pctx = (TestContext *)gf_filter_pid_get_udta(pid);
+	if (!pctx && !is_remove) {
+		GF_FilterEvent evt;
+		gf_filter_pid_set_udta(pid, ctx);
+		GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+		gf_filter_pid_send_event(pid, &evt);
+	}
+
+	return GF_OK;
+}
+
+
+static Bool testfilter_process_event(GF_Filter *filter, const GF_FilterEvent *fevt)
+{
+	return GF_FALSE;
+}
+
+
+static GF_Err testfilter_process(GF_Filter *filter)
+{
+	u32 i, count = gf_filter_get_ipid_count(filter);
+	for (i = 0; i < count; i++) {
+		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
+		gf_filter_pid_drop_packet(pid);
+	}
+	return GF_OK;
+}
+
+static GF_Err testfilter_initialize(GF_Filter *filter)
+{
+	TestContext *ctx = (TestContext *) gf_filter_get_udta(filter);
+	return GF_OK;
+}
+
+static void testfilter_finalize(GF_Filter *filter)
+{
+	TestContext *ctx = (TestContext *) gf_filter_get_udta(filter);
+}
+
+static const GF_FilterCapability TestFilterCaps[] =
+{
+	//anything but file
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE)
+};
+
+#define OFFS(_n)	#_n, offsetof(TestContext, _n)
+
+static const GF_FilterArgs TestFilterArgs[] =
+{
+	{ OFFS(opt1), "some boolean option", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+GF_FilterRegister TestFilterRegister = {
+	.name = "testfilter",
+	GF_FS_SET_DESCRIPTION("Test Filter")
+	GF_FS_SET_HELP("This filter tests loading of filters from dynmaic libraries")
+	.private_size = sizeof(TestContext),
+	SETCAPS(TestFilterCaps),
+	.args = TestFilterArgs,
+	.initialize = testfilter_initialize,
+	.finalize = testfilter_finalize,
+	.configure_pid = testfilter_configure_pid,
+	.process = testfilter_process,
+	.process_event = testfilter_process_event,
+};
+
+GPAC_MODULE_EXPORT
+GF_FilterRegister *RegisterFilter(GF_FilterSession *session)
+{
+	return &TestFilterRegister;
+}
+

gpac-2.0.0.tar.gz/modules/test_filter/test_filter.vcxproj Added

@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{042D3628-67F3-4B6C-8CC0-CD9AFA526974}</ProjectGuid>
+ <RootNamespace>test_filter</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ <ProjectName>test_filter</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gf_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gf_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gf_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gf_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/test_filter_deb/test_filter.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gf_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gf_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/test_filter_deb/test_filter.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gf_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gf_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Manifest>
+ <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/test_filter_rel/test_filter.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gf_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gf_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/test_filter_rel/test_filter.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gf_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gf_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <Manifest>
+ <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\filter_export.cpp" />
+ <ClCompile Include="..\..\modules\test_filter\test_filter.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\build\msvc14\libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

gpac-1.0.1.tar.gz/modules/validator/validator.c -> gpac-2.0.0.tar.gz/modules/validator/validator.c Changed

@@ -1,8 +1,8 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2010-2020
+ *			Authors: Cyril Concolato, Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2010-2022
  *			All rights reserved
  *
  *  This file is part of GPAC / Test Suite Validator Recorder sub-project
@@ -84,7 +84,7 @@
 	GF_XMLAttribute *att;
 	GF_SAFEALLOC(snap_node, GF_XMLNode);
 	if (!snap_node) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate snapshot\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate snapshot\n"));
 		return;
 	}
 	snap_node->name = gf_strdup("snapshot");
@@ -92,7 +92,7 @@
 
 	att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 	if (!att) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate snapshot\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate snapshot\n"));
 		return;
 	}
 	att->name = gf_strdup("time");
@@ -102,7 +102,7 @@
 	
 	att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 	if (!att) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate snapshot\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate snapshot\n"));
 		return;
 	}
 	att->name = gf_strdup("image");
@@ -113,7 +113,7 @@
 	/* adding an extra text node for line break in serialization */
 	GF_SAFEALLOC(snap_node, GF_XMLNode);
 	if (!snap_node) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate snapshot\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate snapshot\n"));
 		return;
 	}
 	snap_node->type = GF_XML_TEXT_TYPE;
@@ -331,7 +331,7 @@
 
 	GF_SAFEALLOC(evt_node, GF_XMLNode);
 	if (!evt_node) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event\n"));
 		return;
 	}
 
@@ -361,7 +361,7 @@
 
 	att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 	if (!att) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event time\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event time\n"));
 		return;
 	}
 	att->name = gf_strdup("time");
@@ -380,7 +380,7 @@
 		if (event->type == GF_EVENT_MOUSEDOWN || event->type == GF_EVENT_MOUSEUP) {
 			att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 			if (!att) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 				return;
 			}
 			att->name = gf_strdup("button");
@@ -399,7 +399,7 @@
 		}
 		att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 		if (!att) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 			return;
 		}
 		att->name = gf_strdup("x");
@@ -409,7 +409,7 @@
 
 		att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 		if (!att) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 			return;
 		}
 		att->name = gf_strdup("y");
@@ -419,7 +419,7 @@
 		if (event->type == GF_EVENT_MOUSEWHEEL) {
 			att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 			if (!att) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 				return;
 			}
 			att->name = gf_strdup("wheel_pos");
@@ -430,7 +430,7 @@
 		if (event->mouse.key_states & GF_KEY_MOD_SHIFT) {
 			att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 			if (!att) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 				return;
 			}
 			att->name = gf_strdup("shift");
@@ -440,7 +440,7 @@
 		if (event->mouse.key_states & GF_KEY_MOD_CTRL) {
 			att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 			if (!att) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 				return;
 			}
 			att->name = gf_strdup("ctrl");
@@ -450,7 +450,7 @@
 		if (event->mouse.key_states & GF_KEY_MOD_ALT) {
 			att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 			if (!att) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 				return;
 			}
 			att->name = gf_strdup("alt");
@@ -464,7 +464,7 @@
 	case GF_EVENT_LONGKEYPRESS:
 		att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 		if (!att) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 			return;
 		}
 		att->name = gf_strdup("key_identifier");
@@ -475,7 +475,7 @@
 		if (event->key.flags & GF_KEY_MOD_SHIFT) {
 			att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 			if (!att) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 				return;
 			}
 			att->name = gf_strdup("shift");
@@ -485,7 +485,7 @@
 		if (event->key.flags & GF_KEY_MOD_CTRL) {
 			att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 			if (!att) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 				return;
 			}
 			att->name = gf_strdup("ctrl");
@@ -495,7 +495,7 @@
 		if (event->key.flags & GF_KEY_MOD_ALT) {
 			att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 			if (!att) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 				return;
 			}
 			att->name = gf_strdup("alt");
@@ -506,7 +506,7 @@
 	case GF_EVENT_TEXTINPUT:
 		att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 		if (!att) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event info\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event info\n"));
 			return;
 		}
 		att->name = gf_strdup("unicode-char");
@@ -519,7 +519,7 @@
 	/* adding an extra text node for line break in serialization */
 	GF_SAFEALLOC(evt_node, GF_XMLNode);
 	if (!evt_node) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate event\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate event\n"));
 		return;
 	}
 	evt_node->type = GF_XML_TEXT_TYPE;
@@ -632,7 +632,7 @@
 			char *xvl_content;
 			char result_filename[GF_MAX_PATH];
 			char *dot;
-			xvl_content = gf_xml_dom_serialize(validator->xvl_node, GF_FALSE);
+			xvl_content = gf_xml_dom_serialize(validator->xvl_node, GF_FALSE, GF_FALSE);
 			dot = gf_file_ext_start(validator->xvl_filename);
 			dot[0] = 0;
 			sprintf(result_filename, "%s-result.xml", validator->xvl_filename);
@@ -692,7 +692,7 @@
 		if (validator->is_recording) {
 			GF_SAFEALLOC(validator->xvs_node, GF_XMLNode);
 			if (!validator->xvs_node) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate root node\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate root node\n"));
 				return 0;
 			}
 			
@@ -753,7 +753,7 @@
 		/* adding an extra text node for line break in serialization */
 		GF_SAFEALLOC(node, GF_XMLNode);
 		if (!node) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate node\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate node\n"));
 			return GF_FALSE;
 		}
 		node->type = GF_XML_TEXT_TYPE;
@@ -789,7 +789,7 @@
                 if (!att_file) {
                     GF_SAFEALLOC(att, GF_XMLAttribute);
 					if (!att) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate file attribute\n"));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate file attribute\n"));
 						return;
 					}
                     att->name = gf_strdup("file");
@@ -806,7 +806,7 @@
                     att->value = gf_strdup(validator->test_filename);
                 }
             }
-			xvs_content = gf_xml_dom_serialize(validator->xvs_node, GF_FALSE);
+			xvs_content = gf_xml_dom_serialize(validator->xvs_node, GF_FALSE, GF_FALSE);
 			xvs_fp = gf_fopen(validator->xvs_filename, "wt");
 			gf_fwrite(xvs_content, strlen(xvs_content), xvs_fp);
 			gf_fclose(xvs_fp);
@@ -831,7 +831,7 @@
 				if (!att_result) {
 					GF_SAFEALLOC(att_result, GF_XMLAttribute);
 					if (!att_result) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate result attribute\n"));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Failed to allocate result attribute\n"));
 						return;
 					}
 					att_result->name = gf_strdup("result");

gpac-1.0.1.tar.gz/modules/x11_out/x11_out.c -> gpac-2.0.0.tar.gz/modules/x11_out/x11_out.c Changed

@@ -137,7 +137,7 @@
 		formats = XvListImageFormats(xwin->display, adaptors[i].base_id, &num_formats);
 
 		for (j=0; j<num_formats && (selected_port == -1 ); j++) {
-			XvAttribute *attr;
+			XvAttribute *attr=NULL;
 			int k, nb_attributes;
 			u32 pformat = X11_GetPixelFormat(formats[j].id);
 
@@ -161,6 +161,11 @@
 									}
 					*/
 				}
+				if (attr) {
+					free(attr);
+					attr=NULL;
+				}
+
 				if (check_color && !has_color_key) continue;
 
 				if (XvGrabPort(xwin->display, port, CurrentTime) == Success) {
@@ -235,7 +240,7 @@
 	}
 
 	/*different size, recreate an image*/
-	if ((xwin->overlay->width != video_src->width) || (xwin->overlay->height != video_src->height)) {
+	if (xwin->overlay && ((xwin->overlay->width != video_src->width) || (xwin->overlay->height != video_src->height))) {
 		XFree(xwin->overlay);
 		xwin->overlay = XvCreateImage(xwin->display, xwin->xvport, xwin->xv_pf_format, NULL, video_src->width, video_src->height);
 		if (!xwin->overlay) return GF_IO_ERR;
@@ -1022,6 +1027,13 @@
 		XSetInputFocus(xWindow->display, xWindow->full_wnd, RevertToNone, CurrentTime);
 		XRaiseWindow(xWindow->display, xWindow->full_wnd);
 		XGrabKeyboard(xWindow->display, xWindow->full_wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime);
+
+		GF_Event evt;
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_SIZE;
+		evt.size.width = xWindow->w_width;
+		evt.size.height = xWindow->w_height;
+		vout->on_event(vout->evt_cbk_hdl, &evt);
 	} else {
 		*screen_width = xWindow->store_width;
 		*screen_height = xWindow->store_height;
@@ -1033,6 +1045,13 @@
 		/*looks like this makes osmozilla crash*/
 		//if (xWindow->par_wnd) XSetInputFocus(xWindow->display, xWindow->wnd, RevertToNone, CurrentTime);
 
+		GF_Event evt;
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_SIZE;
+		evt.size.width = xWindow->w_width;
+		evt.size.height = xWindow->w_height;
+		vout->on_event(vout->evt_cbk_hdl, &evt);
+
 		/*backbuffer resize will be done right after this is called */
 	}
 #ifdef GPAC_HAS_OPENGL
@@ -1159,12 +1178,12 @@
 		break;
 	case 24:
 #ifdef GPAC_BIG_ENDIAN
-		if (xWindow->visual->red_mask==0x00FF0000)	
+		if (xWindow->visual->red_mask==0x00FF0000)
 			xWindow->pixel_format = GF_PIXEL_RGB;
 		else
 			xWindow->pixel_format = GF_PIXEL_BGR;
 #else
-		if (xWindow->visual->red_mask==0x00FF0000)	
+		if (xWindow->visual->red_mask==0x00FF0000)
 			xWindow->pixel_format = GF_PIXEL_BGR;
 		else
 			xWindow->pixel_format = GF_PIXEL_RGB;

gpac-1.0.1.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi -> gpac-2.0.0.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi Changed

gpac-1.0.1.tar.gz/share/default.cfg -> gpac-2.0.0.tar.gz/share/default.cfg Changed

gpac-1.0.1.tar.gz/share/deprecated/iphone_wm_gui.js -> gpac-2.0.0.tar.gz/share/deprecated/iphone_wm_gui.js Changed

gpac-1.0.1.tar.gz/share/doc/CODING_STYLE -> gpac-2.0.0.tar.gz/share/doc/CODING_STYLE Changed

gpac-1.0.1.tar.gz/share/doc/configuration.html -> gpac-2.0.0.tar.gz/share/doc/configuration.html Changed

gpac-1.0.1.tar.gz/share/doc/doxyfile -> gpac-2.0.0.tar.gz/share/doc/doxyfile Changed

@@ -776,7 +776,7 @@
 # Note: If this tag is empty the current directory is searched.
 
 #for some weird reason on OSX enumeration does not work properly, add IDL files by hand
-INPUT=../../include/gpac/ ../../README.md ../../share/doc/idl/core.idl ../../share/doc/idl/jsf.idl ../../share/doc/idl/xhr.idl ../../share/doc/idl/evg.idl ../../share/doc/idl/scenejs.idl ../../share/doc/idl/storage.idl ../../share/doc/idl/webgl.idl ../../share/doc/idl/filtersession.idl
+INPUT=../../include/gpac/ ../../README.md ../../share/doc/idl/core.idl ../../share/doc/idl/jsf.idl ../../share/doc/idl/xhr.idl ../../share/doc/idl/evg.idl ../../share/doc/idl/scenejs.idl ../../share/doc/idl/storage.idl ../../share/doc/idl/webgl.idl ../../share/doc/idl/filtersession.idl ../../share/doc/idl/dash_algo.idl  ../../share/doc/idl/nodejs.idl ../../share/python/libgpac.py
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

gpac-1.0.1.tar.gz/share/doc/idl/core.idl -> gpac-2.0.0.tar.gz/share/doc/idl/core.idl Changed

@@ -80,7 +80,7 @@
 \param filter the filter for file extensions. If "dir", only enumerate directories
 \param go_up if true, enumerate parent directory or root (/).
 \return array of FileInformation interface*/
-Array enum_directory(DOMString dir, optional DOMString filter=null, optional DOMString filter=null, optional bool go_up=false);
+Array enum_directory(DOMString dir, optional DOMString filter=null, optional bool go_up=false);
 
 
 /*! get system clock in milliseconds - see \ref gf_sys_clock
@@ -93,6 +93,16 @@
 */
 unsigned long long clock_us();
 
+/*! sleep for a given time - see \ref gf_sleep
+\param sleep sleep value in milliseconds
+*/
+void sleep(optional unsigned long sleep = 0);
+
+/*! exit gpac process
+\param ret_code exit return code
+*/
+void exit(optional unsigned long ret_code = 0);
+
 /*! convert a 4CC code to its string representation - see \ref gf_4cc_to_str
 \param value the 4CC code to convert
 \return string representation
@@ -143,12 +153,31 @@
 */
 unsigned long long get_utc(DOMString date);
 
+/*! gets NTP 64-bit timestamp - see \ref gf_net_get_ntp_ts
+\return NTP 64 bit timestamp as fraction, 'n' continaing seconds, 'd' containing fractional part
+*/
+Fraction get_ntp();
+
+
+/*! shifts an NTP 64-bit timestamp by the given number of microseconds 
+\param ntp source NTP 
+\param microseconds number of microseconds to add (positive) or remove (negative)
+\return adjusted NTP 64 bit timestamp as fraction, 'n' continaing seconds, 'd' containing fractional part
+*/
+Fraction ntp_shift(Fraction ntp, long microseconds);
+
 /*! gets CRC32 of an arraybuffer - see \ref gf_crc_32
 \param abuf array buffer
 \return CRC32 of the data
 */
 unsigned long crc32(ArrayBuffer abuf);
 
+/*! gets CRC32 of a string - see \ref gf_crc_32
+\param str string buffer
+\return CRC32 of the string
+*/
+unsigned long crc32(DOMString str);
+
 /*! gets SHA1 digest of an arraybuffer - see \ref gf_sha1_file
 \param fname name of file to hash
 \return ArrayBuffer containing SHA1 of the file data
@@ -163,9 +192,10 @@
 
 /*! loads file content into an array buffer - see \ref gf_file_load_data
 \param fname name of file to load
-\return ArrayBuffer containing data of the file
+\param as_utf8 load as UTF8 string
+\return ArrayBuffer containing data of the file or UTF8 string
 */
-ArrayBuffer load_file(DOMString fname);
+ArrayBuffer load_file(DOMString fname, optional boolean as_utf8=false);
 
 /*! compress using deflate() an array buffer
 \param in_data input data to compress
@@ -196,7 +226,7 @@
 */
 boolean dir_exists(DOMString dirname);
 
-/*! remove files in directory - cf \ref gf_cleanup_dir
+/*! remove files in directory - cf \ref gf_dir_cleanup
 \param dirname name of directory
 */
 void dir_clean(DOMString dirname);
@@ -230,7 +260,7 @@
 */
 unsigned long long mod_time(DOMString filename);
 
-/*! get file modification time - cf \ref gf_file_modification_time
+/*! rename/move file - cf \ref gf_file_move
 \param filename name of file
 \param newname new name of the file
 */
@@ -298,6 +328,64 @@
 */
 unsigned long ntohs(unsigned long value);
 
+/*! gets size in bytes of an image of given size and pixel format
+\param pix_fmt pixel format name
+\param width image width in pixels
+\param height image height in pixels
+\return size in bytes
+*/
+unsigned long pixfmt_size(DOMString pix_fmt, unsigned long width, unsigned long height);
+
+/*! checks if pixel format is potentially transparent (uses alpha)
+\param pcm_fmt PCM format name
+\return true if transparent, false otherwise
+*/
+unsigned long pixfmt_transparent(DOMString pcm_fmt);
+
+/*! gets size in bytes of an audio sample in the given format
+\param pcm_fmt PCM format name
+\return size in bytes
+*/
+unsigned long pcmfmt_depth(DOMString pcm_fmt);
+
+
+/*! interpolates colors
+\param interp interpolation fraction between 0 and 1
+\param color1 first color to use
+\param color2 second color to use
+\return component-wise interpolated color, i.e. \code color1.COMP * (1-interp) + color2.comp * interp \endcode
+*/
+DOMString color_lerp(double interp, DOMString color1, DOMString color2);
+
+/*! gets color component
+\param color color to use
+\param comp_idx component idx, 0 for alpha, 1 for red, 2 for green 3 for blue
+\return the component value normalized between 0 and 1
+*/
+double color_component(DOMString color, unsigned long comp_idx);
+
+/*! concatenates URLs
+\param parent parent URL
+\param URL URL to concatenate
+\return the resolved URL
+*/
+DOMString url_cat(DOMString parent, DOMString URL);
+
+/*! gets union of two rectangles
+\param r1 first rectangle
+\param r2 second rectangle
+\return union rectangle
+*/
+Rect rect_union(Rect r1, Rect r2);
+
+/*! gets intersection of two rectangles
+\param r1 first rectangle
+\param r2 second rectangle
+\return intersection rectangle
+*/
+Rect rect_intersect(Rect r1, Rect r2);
+
+
 /*! number of cores */
 attribute readonly unsigned long nb_cores;
 
@@ -437,7 +525,7 @@
 	boolean system;
 	/*! file size in bytes*/
 	unsigned long long size;
-	/*! last modification UTC time*/
+	/*! last modification UTC time in microseconds*/
 	unsigned long long last_modified;
 };
 
@@ -481,6 +569,14 @@
 */
 unsigned long read(ArrayBuffer buf, optional unsigned long nb_bytes=0);
 
+
+/*! seek into file - see \ref gf_fseek
+\param offset offset in file
+\param whence seek origin
+\return -1 if error, 0 otherwise
+*/
+long seek(unsigned long long offset, long whence);
+
 /*! get a string from a file, stopping at first new line character found - see \ref gf_fgets
 \return string read
 */
@@ -755,6 +851,59 @@
 
 }
 
+/*! fraction object*/
+interface Fraction {
+/*! numerator*/
+long n;
+/*! denumerator*/
+unsigned long d;
+};
+
+
+/*! FileIO object
+
+A FileIO object wraps calls to file IO, allowing the script to feed GPAC files not present on disk, or have GPAC create files in JS memory.
+
+Whenever a file is opened, a new JS object of type FileIO is created and passed as "this" in the specified open, close, read, write, seek, tell, eof callbacks.
+
+Any URL relative to the reference URL provided will be solved against the parent FileIO, resulting in additionnals open() calls.
+
+Warning: this is work in progress
+*/
+interface FileIO {
+
+/*! constructor for a FileIO
+\param reference_url the base URL this FileIO wraps
+\param open the open function callback, shall not be NULL. The callback is "boolean open(DOMString url, DOMString mode); ", with mode a fopen mode and the return value true indicates success
+\param close the close function callback, shall not be NULL. The callback is "close();"
+\param write the write function callback, shall not be NULL if read is NULL. The callback is "unsigned long write(ArrayBuffer ab);", where ab is the buffer to write and the return value the number of bytes written
+\param read the read function callback, shall not be NULL if write is NULL. The callback is "unsigned long read(ArrayBuffer ab);", where ab is the buffer to fill and the return value the number of bytes read
+\param seek the seek function callback, shall not be NULL. The callback is "unsigned long seek(unsigned long long pos, unsigned long whence);", as in \ref gf_fseek
+\param tell the seek function callback, shall not be NULL. The callback is "unsigned long long tell();", as in \ref gf_ftell
+\param eof the end of file function callback, shall not be NULL. The callback is "boolean eof();", as in \ref gf_feof
+\param exists the file existence probing function callback, shall not be NULL. The callback is "boolean exists(DOMString URL);", returns true if file exists (for read access). The "this" object is the constructed FileIO on this callback.
+*/
+File(DOMString reference_url, function open, function close, function write, function read, function seek, function tell, function eof, function exists);
+
+/*! protects the FileIO factory, preventing it to be deleted until destroy is called
+This is needded in case a FileIO URL is used several time in a session (re-injecting a source), as libgpac will otherwise destroy the
+underlying FileIO factory when no more files are associated with it
+*/
+void protect();
+
+/*! destroy the underlying FileIO, if not already destroyed. If \ref protect is used, this function MUST be called before exiting gpac*/
+void destroy();
+
+/*! get the gfio:// URL associated with the fileIO object */
+attribute readonly DOMString url;
+
+/*! get the underlying resource URL associated with the fileIO object */
+attribute readonly DOMString resource_url;
+
+/*! the parent FileIO object (the one constructed by the script) for this FileIO instance*/
+attribute readonly FileIO parent;
+
+};

gpac-2.0.0.tar.gz/share/doc/idl/dash_algo.idl Added

@@ -0,0 +1,252 @@
+/*
+\file
+\brief silence !
+*/
+
+typedef char *DOMString;
+
+/*!
+
+\defgroup dash_grp JS DASH Adaptation API
+\ingroup jsapi_grp
+\brief JavaScript API for DASH client adaptation algorithm.
+
+This section documents the JavaScript API available for implementing your own adaptation logic in GPAC DASH client.
+
+The algorithm is chosen using the option `algo` of the dashin filter :
+```
+gpac -i source.mpd:algo=myalgo.js vout
+//or
+gpac -i source.mpd --algo=myalgo.js vout
+```
+
+The loaded JavaScript context has all JS modules available in GPAC, except WebGL. 
+
+It is also possible to bind the custom agorithm from a JSFilterSession using JSFSFilter.bind
+@{
+
+*/
+
+/*! global context property representing the one and only JSDASHClient object attached to the loaded script*/
+attribute JSDASHClient dashin;
+
+/*!\brief JSDASHClient API
+
+The JSDASHClient interface has a single instance exposed to the script under the name "dashin".
+It implements callbacks from the DASH client.
+The object can also be bound to a running filter using JSFSFilter.bind
+*/
+interface JSDASHClient {
+
+/*! indicate a new group is being created
+\note this function is optional
+\param group group being created, can be kept for future use
+*/
+attribute void new_group(JSDASHGroup group);
+
+/*! indicate the period has changed
+\note this function is optional
+\param reset_type indicates the type of reset:
+	- 0: end of period, groups are no longer valid
+	- 1: start of a static period
+	- 2: start of a dynamic (live) period
+*/
+attribute void period_reset(unsigned long reset_type);
+
+/*! perform rate adaptation on the given group (AdaptationSet in DASH, corresponds to one adaptable media)
+\param group_idx index of group on which to perform adaptation
+\param base_group_idx index of associated base group (usually same as group, differs in tiling mode),
+\param force_lower_complexity set to true if the dash client would like a lower complexity 
+\param stats current statistics for the group JSDASHStats
+
+\return value can be:
+- the index of the new quality to select (as listed in group.reps[])
+- -1 to not take decision now
+- -2 to disable the group (debug, will drop segment)
+- other negative values are handled as error
+*/
+attribute int rate_adaptation(unsigned long group_idx, unsigned long base_group_idx, Boolean force_lower_complexity, JSDASHStats stats);
+
+/*! monitor download of the current segment in a group
+\note this function is optional
+\param group_idx index of group on which to perform adaptation
+\param stats current download statistics for the group JSDASHDownloadStats
+
+\return integer value indicating the action to take. Return value can be:
+- `-1` to continue download
+- `-2` to abort download but without retrying to download the same segment at lower quality
+- the index of the new quality to download for the same segment index (same time)
+*/
+attribute int download_monitor(unsigned long group_idx, JSDASHDownloadStats stats);
+
+};
+
+
+/*!\brief JSDASHGroup API
+
+The JSDASHGroup object provides a description of a group (AdaptationSet in DASH), and its available qualities.
+*/
+interface JSDASHGroup {
+
+/*! group index, as used in rate_adaptation callback*/
+attribute readonly unsigned long idx;
+
+/*! group duration in milliseconds, 0 if unknown (live) */
+attribute readonly unsigned long long duration;
+
+
+/*! Spatial Relationship Description, or null if none*/
+attribute readonly JSDASHSRD SRD;
+
+/*! list of available qualites, array of JSDASHQuality objects*/
+attribute readonly Array qualities;
+
+};
+
+/*!\brief JSDASHQuality Object
+
+The JSDASHQuality object provides a description of a quality (Representation in DASH).
+*/
+interface JSDASHQuality {
+
+/*! ID (Representation ID) */
+attribute readonly DOMString ID;
+
+/*! MIME type */
+attribute readonly DOMString mime;
+
+/*! codec parameter */
+attribute readonly DOMString codec;
+
+/*! average bitrate in bits per second*/
+attribute readonly unsigned long bitrate;
+
+/*! if true, the quality is disabled (cannot be played)*/
+attribute readonly boolean disabled;
+
+/*! video width in pixels*/
+attribute readonly unsigned long width;
+
+/*! video height in pixels*/
+attribute readonly unsigned long height;
+
+/*! video frame rate*/
+attribute readonly Fraction fps;
+
+/*! video sample aspect ratio*/
+attribute readonly Fraction sar;
+
+/*! audio samplerate*/
+attribute readonly unsigned long samplerate;
+
+/*! audio number of channels*/
+attribute readonly unsigned long channels;
+
+/*! DASH AST offset for low-latency, 0 otherwise*/
+attribute readonly double ast_offset;
+
+/*! size of all segments in this quality for onDemand profiles. If unknown, set to null*/
+attribute readonly Array sizes;
+};
+
+
+
+/*!\brief JSDASHStats API
+
+The JSDASHStats object provides a description of current group state before adaptation logic
+*/
+interface JSDASHStats {
+
+/*! last segment download rate in bits per second*/
+attribute readonly unsigned long rate;
+
+/*! last segment size in bytes*/
+attribute readonly unsigned long filesize;
+
+/*! current playback speed*/
+attribute readonly float speed;
+
+/*! max supported playback speed computed from associated decoder runtime statistics, 0 if unknown*/
+attribute readonly float max_speed;
+
+/*! display width of the object in pixels, 0 if no video in object*/
+attribute readonly unsigned long display_width;
+
+/*! display height of the object in pixels, 0 if no video in object*/
+attribute readonly unsigned long display_height;
+
+/*! index of active quality at the time the algo is run*/
+attribute readonly unsigned long active_quality;
+
+/*! minimum buffer level in milliseconds below witch rebuffer will happen*/
+attribute readonly unsigned long buffer_min;
+
+/*! maximum buffer level allowed in milliseconds. Packets won't get dropped if overflow, but the algorithm should try not to overflow this buffer*/
+attribute readonly unsigned long buffer_max;
+
+/*! current buffer level in milliseconds*/
+attribute readonly unsigned long buffer;
+};
+
+
+
+/*!\brief JSDASHDownloadStats API
+
+The JSDASHDownloadStats object provides a description of current segment download statistics for a group
+*/
+interface JSDASHDownloadStats {
+
+/*! current estimated download speed in bits per second*/
+attribute readonly unsigned long bits_per_second;
+
+/*! total bytes to download*/
+attribute readonly unsigned long long total_bytes;
+
+/*! bytes downloaded*/
+attribute readonly unsigned long long bytes_done;
+
+/*! time in microsecond since segment was scheduled for download*/
+attribute readonly unsigned long long us_since_start;
+
+/*! buffer duration in milliseconds*/
+attribute readonly unsigned long buffer_duration;
+
+/*! duration of segment being downloaded, 0 if unknown*/
+attribute readonly unsigned long current_segment_duration;
+
+};
+
+
+
+/*!\brief JSDASHSRD
+
+The JSDASHSRD object provides the SRD description of a group.
+*/
+interface JSDASHSRD {
+
+/*! ID of SRD source - all SRD with same source describe the same video composition, possibly with different grid sizes*/
+attribute readonly unsigned long ID;
+
+
+/*! X coordinate of SRD for this tile*/
+attribute readonly long x;
+
+/*! Y coordinate of SRD for this tile*/
+attribute readonly long y;
+
+/*! width of SRD for this tile - 0 for tile base track*/
+attribute readonly long w;
+
+/*! height of SRD for this tile - 0 for tile base track*/
+attribute readonly long h;
+
+/*! total width of SRD descriptor for this tile*/
+attribute readonly long fw;
+
+/*! total height of SRD descriptor for this tile*/
+attribute readonly long fh;
+};
+
+
+/*! @} */
+

gpac-1.0.1.tar.gz/share/doc/idl/evg.idl -> gpac-2.0.0.tar.gz/share/doc/idl/evg.idl Changed

@@ -36,6 +36,30 @@
 Whenever using an object as a parameter to a function, only the parameter names as listed in the corresponding interface object are checked. The name of the interface is not, and it usually does not define any constructor.
 
 \note Although 10-bit raster is supported for YUV formats (framebuffer and textures), colors are internally handled as 8-bits for solid brush and gradients. This will be updated in the near future.
+
+
+
+
+The 3D extension of Canvas object can be used to draw vectorial 3D meshes and 2D paths.
+
+\warning The 3D rasterizer is much much slower than WebGL as it is only software and not realy optimized, do not use it for complex 3D scenes.
+
+\warning The 3D rasterizer is still an experimental project: it might not be completely stable and its API may change a lot in the near future.
+
+
+The 3D rasterizer can however be useful when drawing simple 3D objects over an existing video, as it avoids GPU transfers of the frame data.
+
+The rasterizer supports:
+- points, lines, triangles, quads, strips and fans
+- 2D texturing using RGBA or YUVA colorspace
+- perspective correct interpolation
+- simple antialiasing
+- depth buffer (float only)
+- rasterizing in YUVA or RGBA space
+- a simple shading language for both vertex and fragment processing
+
+The rasterizer does not claim compliancy to any GPU specification, and will likely produce different results than WebGL.
+
 @{
 
 
@@ -73,13 +97,30 @@
 \note A same path can be drawn several times with different clipper, null means no clipper. Clipper applies to both fill and clear functions*/
 writeonly IRect clipper;
 
+/*! true if cliper is active on canvas*/
+readonly boolean has_clipper;
+
 /*! composite operation for alpha surfaces - see \ref gf_evg_surface_set_composite_mode*/
 attribute unsigned long compositeOperation;
 
+
+/*! AA level of canvas - see \ref gf_evg_surface_get_raster_level and \ref gf_evg_surface_set_raster_level
+\note This is always equal to GF_RASTER_HIGH_QUALITY when the path drawn is a text object*/
+attribute unsigned long level;
+
 /*! alpha custom callback composite operation for alpha surfaces - see \ref gf_evg_surface_set_alpha_callback
 Default is undefined at creation time*/
 attribute AlphaCallback on_alpha;
 
+
+/*! set to true of canvas is a YUV-based format, false if RGB-based format*/
+readonly attribute boolean is_yuv;
+
+/*! number of bits per component (8, 10, etc)*/
+readonly attribute unsigned long depth;
+
+
+
 /*! clears the canvas with the given color - see \ref gf_evg_surface_clear
 \note Omitting the last values will assume 0xFF for alpha, and 0 for other values. 
 \param rc the rectangle to clear, in pixel coordinates
@@ -92,12 +133,12 @@
 
 /*! clears the canvas with the given color. See \ref gf_evg_surface_clear
 \param rc the rectangle to clear, in pixel coordinates
-\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
+\param color an HTML/SVG color name or an HTML color value formatted as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
 void clear(IRect rc, DOMString color);
 
 /*! clears the canvas with the given color. See \ref gf_evg_surface_clear
 \param rc the rectangle to clear, in pixel coordinates
-\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
+\param color an HTML/SVG color name or an HTML color value formatted as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
 void clear(IRect rc, DOMString color);
 
 /*! clears the canvas with the given color
@@ -112,7 +153,7 @@
 
 /*! clears the canvas with the given color. See \ref gf_evg_surface_clear
 \param rc the rectangle to clear, in pixel coordinates
-\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
+\param color an HTML/SVG color name or an HTML color value formatted as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
 void clearf(IRect rc, DOMString color);
 
 /*! fills the path with the given solid brush or gradient stencil - see \ref gf_evg_surface_fill
@@ -123,11 +164,42 @@
 \param texture the texture to use*/
 void fill(Texture texture);
 
+/*! fills the path with the given texture(s) - see \ref gf_evg_surface_multi_fill
+\param operand multitexture operand to use
+\param param float or float array used to control multitexture effect
+\param texture1 the texture or stencil to use as main texture
+\param texture2 the texture or stencil to use as secondary texture
+\param texture3 the texture or stencil to use as third texture
+*/
+void fill(GF_EVGMultiTextureMode operand, optional float param=0, Texture texture1, optional Texture texture2=null, optional Texture texture3=null);
+
 /*! reassign internal data (typically at each new packet)
 \warning This assumes the data layout has not changed (width, height, pixel format, strides). If these are modified, create a new canvas.
 \param data the buffer to use*/
 void reassign(ArrayBuffer data);
 
+
+/*! blits a texture pixel data onto the surface
+\warning All texture properties (matrix, color matrix, ...) and canvas properties (path, matrix...) are ignored.
+\warning This does not perform alpha blending.
+
+The blit operations are usually faster than path fill operations, but only operate on axis-aligned rectangles.
+
+\param texture the texture to use for pixel source
+\param dst_wnd the destination rectangle in canvas, must be completely included in canvas. Point{0,0} is top-left and {width,height} is bottom right
+\param src_wnd the source rectangle from the texture, must be completely included in texture. Point{0,0} is top-left and {width,height} is bottom right
+\param params the blit operation parameters. If null, let FFMPEG decide
+*/
+void blit(Texture texture, optional IRect dst_wnd=null, optional IRect src_wnd=null, optional BlitParameters params=null);
+
+
+/*! enables threading in rasterizer - see \ref gf_evg_enable_threading
+\param nb_threads the number of extra threads to use, negative values means all cores*/
+void enable_threading(optional int nb_threads=-1);
+
+/*! enables 3D extensions in rasterizer - see \ref gf_evg_surface_enable_3d*/
+void enable_3d();
+
 /*! converts YUV color to RGB
 \param as_array if true, the return object is an array of 4 components, otherwise it is a Vec4f object
 \param y Y component value
@@ -162,6 +234,87 @@
 */
 Object toYUV(optional bool as_array=false, Vec4f color);
 
+
+
+/*! fragment shader to use, set to NULL to disable pixel writing.*/
+Shader fragment;
+/*! vertex shader to use, set to NULL to disable vertex shading, in which case the currently defined projection and modelview matrices will be used*/
+Shader vertex;
+/*! set face orientation to counter-clockwise or clockwise (see \ref gf_evg_surface_set_ccw)*/
+writeonly boolean ccw;
+/*! backface culling enabled (see \ref gf_evg_surface_set_backcull), default is true*/
+writeonly boolean backcull;
+/*! antialiased enabled (see \ref gf_evg_surface_set_antialias), default is true*/
+writeonly boolean antialias;
+/*! min depth (see \ref gf_evg_surface_set_min_depth), default is 0*/
+writeonly float min_depth;
+/*! max depth (see \ref gf_evg_surface_set_max_depth), default is 1.0*/
+writeonly float max_depth;
+/*! point size (see \ref gf_evg_surface_set_point_size), default is 1.0*/
+writeonly float point_size;
+/*! point smoothing enabled (see \ref gf_evg_surface_set_point_smooth), default is false*/
+writeonly boolean point_smooth;
+/*! line size (see \ref gf_evg_surface_set_line_size), default is 1.0*/
+writeonly float line_size;
+/*! clip zero enabled (see \ref gf_evg_surface_set_clip_zero), default is false*/
+writeonly boolean clip_zero;
+/*! depth test mode (see \ref gf_evg_set_depth_test), default is GF_EVGDEPTH_LESS*/
+writeonly GF_EVGDepthTest depth_test;
+/*! write depth buffer enabled (see \ref gf_evg_surface_write_depth), default is true*/
+writeonly boolean write_depth;
+/*! depth buffer (see \ref gf_evg_surface_set_depth_buffer). \warning Default is null*/
+Float32Buffer depth_buffer;
+
+/*! sets current projection matrix to use
+\param projection_matrix the 16 float coeficients of the matrix, column-first. When using Matrix object, you can pass Matrix.m
+*/
+void projection(Float32Buffer projection_matrix);
+/*! sets current modelview matrix to use
+\param modelview_matrix the 16 float coeficients of the matrix, column-first. When using Matrix object, you can pass Matrix.m
+*/
+void modelview(Float32Buffer modelview_matrix);
+
+/*! draws a set of primitives (see \ref gf_evg_surface_draw_array)
+\param indices array of indices in the vertex buffer for the primitives to draw
+\param vertices the vertices to use
+\param primitive_type the type of primitive to draw
+\param nb_components the number of components per vertex (eg, 2, 3)
+*/
+void draw_array(Int32Buffer indices, Float32Buffer vertices, optional GF_EVGPrimitiveType primitive_type=GF_EVG_TRIANGLES, optional long nb_components=3);
+
+/*! draws a path (see \ref gf_evg_surface_draw_path)
+\param path the path to draw
+\param z the z value to assign to points in the path
+*/
+void draw_path(Path path, optional float z=0);
+/*! draws a text (see \ref gf_evg_surface_draw_path)
+\param text the text to draw
+\param z the z value to assign to points in the text's path
+*/
+void draw_path(Text text, optional float z=0);
+
+/*! clears the depth buffer (see \ref gf_evg_surface_clear_depth)
+\param depth the depth value to set
+*/
+void clear_depth(float depth);
+
+/*! sets the viewport (see \ref gf_evg_surface_viewport)
+\param x the horizontal coordinate of the top-left corner of the viewport
+\param y the vertical coordinate of the top-left corner of the viewport
+\param width the width of the viewport
+\param height the height of the viewport
+
+*/
+void viewport(long x, long y, long width, long height);
+
+/*! sets the viewport to full canvas {0,0,width,height} (see \ref gf_evg_surface_viewport)*/
+void viewport();
+
+/*! creats a new shader
+\return the new shader
+\param shader_type the desired shader type*/
+Shader new_shader(ShaderType shader_type);
+
 };
 
 
@@ -228,10 +381,17 @@
 	readonly attribute boolean empty;
 	/*! if true, path will use zero_non_zero fill rule otherwise odd/even rule*/
 	readonly attribute boolean zero_fill;
+
+	/*! if true, path will use odd/even rule but fill only even parts*/
+	readonly attribute boolean even_fill;
+
 	/*! bounds of path - see \ref gf_path_get_bounds*/
 	readonly attribute Rect bounds;
 	/*! control bounds of path - see \ref gf_path_get_control_bounds*/
 	readonly attribute Rect ctrl_bounds;
+	/*! set to true if path is a rectangle/square*/
+	readonly attribute boolean is_rectangle;
+
 
 	/*! checks if point is over a path - see \ref gf_path_point_over
 	\param pt point to test
@@ -252,8 +412,9 @@
 
 	/*! adds a path to the path - see \ref gf_path_add_subpath
 	\param subpath path to add
+	\param mx matrix to apply to path
 	\return the path*/
-	Path add_path(Path subpath);
+	Path add_path(Path subpath, optional Matrix2D mx=null);
 
 	/*! adds an arc to the path - see \ref gf_path_add_arc
 	\param radius radius of the arc
@@ -381,6 +542,11 @@
 	*/
 	Path outline(PenSettings ps);
 
+	/*! transforms a path - see \ref gf_path_add_subpath
+	\param mx matrix to apply to path
+	\return the new transformed path*/
+	Path transform(Matrix2D mx);
+
 };
 
 /*! Pen settings, see \ref GF_PenSettings*/
@@ -452,6 +618,8 @@
 	attribute double tx;
 	/*! matrix is identity*/
 	attribute boolean identity;
+	/*! indicates matrix is a 2D matrix*/
+	attribute const boolean is3D = false;
 
 	/*! get scale part of the matrix after decomposition - see \ref gf_mx2d_decompose
 	\return {x, y} object, or null if matrix cannot be decomposed*/
@@ -466,20 +634,23 @@
 	/*! inverse matrix - see \ref gf_mx2d_inverse
 	\return the matrix*/
 	Matrix2D inverse();
-	/*! copies the matrix 
+	/*! copies the matrix
 	\return the new copy matrix*/
 	Matrix2D copy();
+	/*! copies from a matrix
+	\param from the matrix to copy from*/
+	void copy(Matrix2D from);
 	/*! adds a matrix - see \ref gf_mx2d_add_matrix and \ref gf_mx2d_pre_multiply
 	\param mx the matrix to multiply 
 	\param premultiply if true, performs \code mx * this \endcode, otherwise \code this * mx \endcode 
 	\return the matrix*/
 	Matrix2D add(Matrix2D mx, optional boolean premultiply=false);
-	/*! add a translation - see \ref gf_mx2d_add_rotation
+	/*! add a translation - see \ref gf_mx2d_add_translation
 	\param x horizontal translation
 	\param y vertical translation
 	\return the matrix*/	
 	Matrix2D translate(double x, double y);
-	/*! add a translation - see \ref gf_mx2d_add_rotation
+	/*! add a translation - see \ref gf_mx2d_add_translation
 	\param vec translation vector
 	\return the matrix*/	
 	Matrix2D translate(Point2D vec);
@@ -588,7 +759,7 @@
 	ColorMatrix multiply(ColorWatrix with);
 	
 	/*! apply a color transformation as 8bit RGB
-	\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB
+	\param color an HTML/SVG color name or an HTML color value formatted as \$RRGGBB, \#RRGGBB or 0xRRGGBB
 	\return transformed color*/
 	Color apply(DOMString color);
 
@@ -598,7 +769,7 @@
 	Color apply(Color color);
 
 	/*! apply a color transformation as float RGB
-	\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB
+	\param color an HTML/SVG color name or an HTML color value formatted as \$RRGGBB, \#RRGGBB or 0xRRGGBB
 	\return transformed color*/
 	Colorf applyf(DOMString color);
 
@@ -647,15 +818,20 @@
 	writeonly unsigned long pad;
 	/*! color matrix for gradient stencils. Setting to null resets the matrix*/
 	writeonly unsigned long cmx;
-	/*! matrix for gradient stencils. Setting to null resets the matrix*/
-	writeonly unsigned long mx;
+	/*! matrix for gradient stencils. Setting to null resets the matrix
+	\warning this is a copy of the associated matrix, not a live object*/
+	attribute Matrix2D mx;
+	/*! true if stencil is a solid color brush, false for gradient stencils*/
+	attribute readonly boolean solid_brush;
+	/*! automatic matrix mode, see \ref gf_evg_stencil_set_auto_matrix*/
+	attribute boolean auto_mx;
 
 	/*! set color for solid brush stencil
 	\param color the color to set*/
 	void set_color(Color color);
 
 	/*! set color for solid brush stencil
-	\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
+	\param color an HTML/SVG color name or an HTML color value formatted as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
 	void set_color(DOMString color);
 
 	/*! set color for solid brush stencil - see \ref gf_evg_stencil_set_brush_color.
@@ -680,13 +856,21 @@
 	*/
 	void set_colorf(double r, double g, double b, double a);
 
-	/*! sets alpha value for stencil. The alpha is is multiplied with the alpha component of the solid brush or gradient color
+	/*! get color for solid brush stencil
+	\return color string*/
+	DOMString get_color();
+
+	/*! sets alpha value for stencil. The alpha is multiplied with the alpha component of the solid brush or gradient color
 	\param alpha the alpha to set, between 0 and 255*/
 	void set_alpha(unsigned long alpha);
 
-	/*! sets alpha value for stencil. The alpha is is multiplied with the alpha component of the solid brush or gradient color
+	/*! sets alpha value for stencil. The alpha is multiplied with the alpha component of the solid brush or gradient color
 	\param alpha the alpha to set, between 0.0 and 1.0*/
-	void set_alpha(double alpha);
+	void set_alphaf(double alpha);
+
+	/*! gets alpha value for stencil
+	\return alpha value, between 0.0 and 1.0*/
+	double get_alphaf();
 
 	/*! sets linear gradient start and end point. If end point is omitted, sets gradient line betwee {0,0} and start. Coordinates are given in surface coordinates, not object coordinates. See \ref gf_evg_stencil_set_linear_gradient
 	\note Point2D can be replaced with 2 number x, y, i.e. these syntaxes are all equivalent:
@@ -719,7 +903,7 @@
 
 	/*! defines a new stop color for the gradient. Stops must be declared in order on the gradient. See \ref gf_evg_stencil_push_gradient_interpolation
 	\param pos position between 0.0 and 1.0
-	\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB
+	\param color an HTML/SVG color name or an HTML color value formatted as \$RRGGBB, \#RRGGBB or 0xRRGGBB
 	*/
 	void set_stop(double pos, DOMString color);
 
@@ -778,7 +962,9 @@
 	*/
 	Texture(ArrayBuffer img_data);
 
-	/*! parametric texture constructor. A parametric texture gets its pixel values from a javascript callback function, the resulting value being blended according to the antialiasing level of the pixel. This allows creating rather complex custom textures, in a fashion similar to fragment shaders. 
+	/*! parametric texture constructor. A parametric texture gets its pixel values from a javascript callback function, the resulting value being blended according to the antialiasing level of the pixel. This allows creating rather complex custom textures, in a fashion similar to fragment shaders.
+	\warning Parametric textures in JS cannot use multithreaded canvas, use 2D shaders for that.
+	
 	\param width width of the texture
 	\param height height of the texture
 	\param pixfmt pixel format of the texture
@@ -799,12 +985,17 @@
 	*/
 	Texture(FilterPacket packet);
 
+	/*! Empty texture constructor. This is usually needed async texture load.
+	*/
+	Texture();
+
 	/*! filtering mode - see \ref gf_evg_stencil_set_filter*/
 	writeonly unsigned long filtering;
 	/*! color matrix - see \ref gf_evg_stencil_set_color_matrix. Setting to null resets the color matrix*/
 	writeonly ColorMatrix cmx;
-	/*! matrix - see \ref gf_evg_stencil_set_matrix. Setting to null resets the matrix*/
-	writeonly Matrix2D mx;
+	/*! matrix - see \ref gf_evg_stencil_set_matrix. Setting to null resets the matrix
+	\warning: this is a copy of the associated matrix, not a live object*/
+	attribute Matrix2D mx;
 	/*! horizontal repeat flag*/
 	attribute boolean repeat_s;
 	/*! vertical repeat flag*/
@@ -824,15 +1015,16 @@
 	readonly attribute ArrayBuffet data;
 
 
-	/*! sets alpha value for stencil. The alpha is is multiplied with the alpha component of the solid brush or gradient color
+	/*! sets alpha value for stencil. The alpha is multiplied with the alpha component of the solid brush or gradient color
 	\param alpha the alpha to set, between 0 and 255*/
 	void set_alpha(unsigned long alpha);
 
-	/*! sets alpha value for stencil. The alpha is is multiplied with the alpha component of the solid brush or gradient color
+	/*! sets alpha value for stencil. The alpha is multiplied with the alpha component of the solid brush or gradient color
 	\param alpha the alpha to set, between 0.0 and 1.0*/
-	void set_alpha(double alpha);
+	void set_alphaf(double alpha);
 
 	/*! converts texture from RGB/YUV to new HSV texture
+	\warning the texture format will still be RGB (or RGBA if the source has alpha), in packed format
 	\warning experimental, slow
 	\return new texture*/
 	Texture rgb2hsv();
@@ -842,23 +1034,17 @@
 	\return new texture*/
 	Texture hsv2rgb();
 
-	/*! converts texture from HSV to new RGB texture
-	\warning experimental, slow
-	\return new texture*/
-	Texture hsv2rgb();
-
 	/*! converts texture from RGB to new YUV texture
 	\warning experimental, slow
 	This function can be used to convert an RGB texture to a YUV one, typically for rasterizing an RGB static texture over a YUV video (avoids performing the RGB to YUV conversion at each frame)
-	\warning the texture format will still be RGB (or RGBA if the source has alpha), in packed format
-	\param surf the target surface, can be a Canvas or a Canvas3D object 
+	\param surf the target Canvas
 	\return new texture*/
 	Texture rgb2yuv(Canvas surf);
 
 	/*! converts texture from YUV to new RGB texture
 	\warning experimental, slow
 	This function can be used to convert a YUV texture to an RGB one, typically for rasterizing a YUV static texture over an RGB video (avoids performing the TYV to RGB conversion at each frame)
-	\param surf the target surface, can be a Canvas or a Canvas3D object 
+	\param surf the target Canvas
 	\return new texture*/
 	Texture yuv2rgb(Canvas surf);
 
@@ -875,6 +1061,46 @@
 	\return new texture*/
 	Texture split(unsigned long idx);
 
+	/*! updates pixel data of texture using source packet
+	\param packet the new packet to use for the texture
+	*/
+	void update(FilterPacket packet);
+
+	/*! load local file into texture. Only JPEG and PNG local files are supported.
+	\param filename file name on local drive
+	\param is_rel_script if true, indicates the file path is relative to the script location. Otherwise it is relative to the current directory
+	*/
+	load(DOMString filename, optional boolean is_rel_script=false);
+
+	/*! load file data into texture. Only JPEG and PNG data are supported.
+	\param img_data image file data
+	*/
+	load(ArrayBuffer img_data);
+
+	/*! Makes the texture a named texture for WebGL.
+
+	If a texImage2D is done with a named EVG texture:
+		- the associated WebGL texture becomes a named texture
+		- any update() on the EVG texture will update the WebGL texture.
+
+	\warning The shaders must be (re)compiled after the first update() on the texture.
+
+	\param name the named texture to use.
+	*/
+	set_named(DOMString name);
+
+	/*! Sets padding color for texture - see \ref gf_evg_stencil_set_pad_color
+
+	The parameters can also be 4 doubles, an array of 4 doubles or an object with 'r', 'g', 'b', 'a' properties. In these cases, the component values must be between 0 and 1
+	\param color the color to use.
+	*/
+	set_pad_color(DOMString color);
+
+	/*! gets padding color associated for texture
+	\return the color used to pad or null if none.
+	*/
+	DOMString get_pad_color();
+
 
 	/*! gets RGB pixel value in a texture
 	\param s horizontal normalized texture coordinate of pixel, between 0 (left) and 1.0 (right)
@@ -902,17 +1128,18 @@
 	attribute unsigned long h;
 	/*! kernel normalization. If 0 or undefined, no normalization is applied*/
 	attribute unsigned long norm;
-	/*! kernel coeficients. The coeficients are unsigned intergers, and there shall be at least w * h coefficients*/
+	/*! kernel coeficients. The coeficients are unsigned integers, and there shall be at least w * h coefficients*/
 	attribute Array k;
 };
 
 /*! Text object*/
 interface Text {
-	/*! constructor. The default text is created with a font size of 12, horizontal drawing, start alignment and alphabetic baseline.
-	\param font font name to use*/
-	Text(optional DOMString font=null);
-	/*! font name*/
-	attribute DOMString font;
+	/*! constructor. The default text is created with a font size of 12, horizontal drawing, start alignment and alphabetic baseline.*/
+	Text();
+	/*! font name - array or single string value. If array, fonts in array will be checked until one is found
+		The text must be set again whenever the font is changing !
+	*/
+	attribute Array font;
 	/*! font name*/
 	attribute double fontsize;
 	/*! align flag for horizontal positioning (see Canvas2D). Alignment is computed on maximum text line width after application of maxWidth if any/needed
@@ -954,7 +1181,7 @@
 	Each element is treated as follows:
 	 - transformed to string, whether it is a string, number, object / array
 	 - split in one or several text lines, scanning new line character 'CR'
-	 - each line of text is then transformed into a graphicsl path with the current text settings.
+	 - each line of text is then transformed into a graphics path with the current text settings.
 	*/
 	void set_text(...);
 
@@ -991,6 +1218,8 @@
 	unsigned long max_advance_h;
 	/*! max vertical advance of any glyphs in font*/
 	unsigned long max_advance_v;
+	/*! set to true if text is right to left, false otherwise*/
+	boolean right_to_left;
 };
 
 
@@ -1022,6 +1251,9 @@
 interface Matrix {
 /*! indicates if matrix is identity. If set to true, resets matrix*/
 attribute boolean identity;
+/*! indicates matrix is a 3D matrix*/
+attribute const boolean is3D = true;
+
 /*! float buffer of coeficients (typically use matrix.m to pass matrices uniforms)*/
 attribute Array<float> m;
 /*! yaw value of matrix*/
@@ -1121,7 +1353,7 @@
 \param z_far max depth coordinate of viewport
 \return the matrix object
 */
-Matrix ortho(float left, float right, float top, float bottom, float z_near, float z_far);
+Matrix ortho(float left, float right, float bottom, float top, float z_near, float z_far);
 
 /*! loads a perspective projection matrix
 \param fov camera field of view angle in radian
@@ -1199,203 +1431,6 @@
 };
 
 
-/*! The Canvas3D object is used to draw vectorial 3D meshes and 2D paths. 
-
-\warning The 3D rasterizer is much much slower than WebGL as it is only software and not realy optimized, do not use it for complex 3D scenes.
-
-
-\warning The 3D rasterizer is still an experimental project: it might not be completely stable and its API may change a lot in the near future.
-
-
-The 3D rasterizer can however be useful when drawing simple 3D objects over an existing video, as it avoids GPU transfers of the frame data.
-
-The rasterizer supports:
-- points, lines, triangles, quads, strips and fans
-- 2D texturing using RGBA or YUVA colorspace
-- perspective correct interpolation
-- simple antialiasing
-- depth buffer (float only)
-- rasterizing in YUVA or RGBA space
-- a simple shading language for both vertex and fragment processing
-
-The rasterizer does not claim compliancy to any GPU specification, and will likely produce different results than WebGL.
-
- */
-interface Canvas3D {
-	/*! Canvas3D constructor. The canvas memory is owned by the canvas object
-	\param width the width in pixels of the canvas
-	\param height the height in pixels of the canvas
-	\param pixfmt the pixel fomat of the canvas
-	 */
-	Canvas3D(unsigned long width, unsigned long height, DOMString pixfmt);
-	/*! Canvas constructor
-	\param width the width in pixels of the canvas
-	\param height the height in pixels of the canvas
-	\param pixfmt the pixel fomat of the canvas
-	\param data the data buffer on which to write. The size shall be greater than the size required for the given size and pixel format.
-	\param stride horizontal stride in pixel of the data
-	\param stride_uv horizontal stride in pixel of the data for the U and V planes
-	 */
-	Canvas3D(unsigned long width, unsigned long height, DOMString pixfmt, ArrayBuffer data, optional unsigned long stride=0, optional unsigned long stride_uv=0);
-
-/*! clipper in pixel coordinates - see \ref gf_evg_surface_set_clipper
-\note A same path can be drawn several times with different clipper, null means no clipper. Clipper applies to both fill and clear functions*/
-writeonly IRect clipper;
-/*! fragment shader to use, set to NULL to disable pixel writing.*/
-Shader fragment;
-/*! vertex shader to use, set to NULL to disable vertex shading, in which case the currently defined projection and modelview matrices will be used*/
-Shader vertex;
-/*! set face orientation to counter-clockwise or clockwise (see \ref gf_evg_surface_set_ccw)*/
-writeonly boolean ccw;
-/*! backface culling enabled (see \ref gf_evg_surface_set_backcull), default is true*/
-writeonly boolean backcull;
-/*! antialiased enabled (see \ref gf_evg_surface_set_antialias), default is true*/
-writeonly boolean antialias;
-/*! min depth (see \ref gf_evg_surface_set_min_depth), default is 0*/
-writeonly float min_depth;
-/*! max depth (see \ref gf_evg_surface_set_max_depth), default is 1.0*/
-writeonly float max_depth;
-/*! point size (see \ref gf_evg_surface_set_point_size), default is 1.0*/
-writeonly float point_size;
-/*! point smoothing enabled (see \ref gf_evg_surface_set_point_smooth), default is false*/
-writeonly boolean point_smooth;
-/*! line size (see \ref gf_evg_surface_set_line_size), default is 1.0*/
-writeonly float line_size;
-/*! clip zero enabled (see \ref gf_evg_surface_set_clip_zero), default is false*/
-writeonly boolean clip_zero;
-/*! depth test mode (see \ref gf_evg_set_depth_test), default is GF_EVGDEPTH_LESS*/
-writeonly GF_EVGDepthTest depth_test;
-/*! write depth buffer enabled (see \ref gf_evg_surface_write_depth), default is true*/
-writeonly boolean write_depth;
-/*! depth buffer (see \ref gf_evg_surface_set_depth_buffer). \warning Default is null*/
-Float32Buffer depth_buffer;
-
-/*! clears the canvas with the given color - see \ref gf_evg_surface_clear
-\note Omitting the last values will assume 0xFF for alpha, and 0 for other values. 
-\param rc the rectangle to clear, in pixel coordinates
-\param r red value, between 0 and 255
-\param g green value, between 0 and 255
-\param b blue value, between 0 and 255
-\param a alpha value, between 0 and 255
-*/
-void clear(IRect rc, unsigned long r, unsigned long g, unsigned long b, unsigned long a);
-
-/*! clears the canvas with the given color. See \ref gf_evg_surface_clear
-\param rc the rectangle to clear, in pixel coordinates
-\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
-void clear(IRect rc, DOMString color);
-
-/*! clears the canvas with the given color. See \ref gf_evg_surface_clear
-\param rc the rectangle to clear, in pixel coordinates
-\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
-void clear(IRect rc, DOMString color);
-
-/*! clears the canvas with the given color
-\note Omitting the last values will assume 1.0 for alpha, and 0.0 for other values. See \ref gf_evg_surface_clear
-\param rc the rectangle to clear, in pixel coordinates
-\param r red value, between 0.0 and 1.0
-\param g green value, between 0.0 and 1.0
-\param b blue value, between 0.0 and 1.0
-\param a alpha value, between 0.0 and 1.0
-*/
-void clearf(IRect rc, double r, double g, double b, double a);
-
-/*! clears the canvas with the given color. See \ref gf_evg_surface_clear
-\param rc the rectangle to clear, in pixel coordinates
-\param color an HTML/SVG color name or an HTML color value formated as \$RRGGBB, \#RRGGBB or 0xRRGGBB*/
-void clearf(IRect rc, DOMString color);
-
-/*! reassign internal data (typically at each new packet)
-\warning This assumes the data layout has not changed (width, height, pixel format, strides). If these are modified, create a new canvas.
-\param data the buffer to use*/
-void reassign(ArrayBuffer data);
-
-/*! converts YUV color to RGB
-\param as_array if true, the return object is an array of 4 components, otherwise it is a Vec4f object
-\param y Y component value
-\param u Cb/U component value
-\param v Cr/V component value
-\param a alpha value, not modified
-\return the converted value
-*/
-Object toRGB(optional bool as_array=false, Float y, Float u, Float v, optional Float a=1.0);
-
-/*! converts YUV color to RGB
-\param as_array if true, the return object is an array of 4 components, otherwise it is a Vec4f object
-\param color the YUV value to convert
-\return the converted value
-*/
-Object toRGB(optional bool as_array=false, Vec4f color);
-
-/*! converts RGB color to YUV
-\param as_array if true, the return object is an array of 4 components, otherwise it is Vec4f object
-\param r red component value
-\param g green component value
-\param b blue component value
-\param a alpha value, not modified
-\return the converted value
-*/
-Object toYUV(optional bool as_array=false, Float r, Float g, Float b, optional Float a=1.0);
-
-/*! converts RGB color to YUV
-\param as_array if true, the return object is an array of 4 components, otherwise it is a Vec4f object
-\param color the RGB value to convert
-\return the converted value
-*/
-Object toYUV(optional bool as_array=false, Vec4f color);
-
-
-/*! sets current projection matrix to use
-\param projection_matrix the 16 float coeficients of the matrix, column-first. When using Matrix object, you can pass Matrix.m
-*/
-void projection(Float32Buffer projection_matrix);
-/*! sets current modelview matrix to use
-\param modelview_matrix the 16 float coeficients of the matrix, column-first. When using Matrix object, you can pass Matrix.m
-*/
-void modelview(Float32Buffer modelview_matrix);
-
-/*! draws a set of primitives (see \ref gf_evg_surface_draw_array)
-\param indices array of indices in the vertex buffer for the primitives to draw
-\param vertices the vertices to use
-\param primitive_type the type of primitive to draw
-\param nb_components the number of components per vertex (eg, 2, 3)
-*/
-void draw_array(Int32Buffer indices, Float32Buffer vertices, optional GF_EVGPrimitiveType primitive_type=GF_EVG_TRIANGLES, optional long nb_components=3);
-
-/*! draws a path (see \ref gf_evg_surface_draw_path)
-\param path the path to draw
-\param z the z value to assign to points in the path
-*/
-void draw_path(Path path, optional float z=0);
-/*! draws a text (see \ref gf_evg_surface_draw_path)
-\param text the text to draw
-\param z the z value to assign to points in the text's path
-*/
-void draw_path(Text text, optional float z=0);
-
-/*! clears the depth buffer (see \ref gf_evg_surface_clear_depth)
-\param depth the depth value to set
-*/
-void clear_depth(float depth);
-
-/*! sets the viewport (see \ref gf_evg_surface_viewport)
-\param x the horizontal coordinate of the top-left corner of the viewport
-\param y the vertical coordinate of the top-left corner of the viewport
-\param width the width of the viewport
-\param height the height of the viewport
-
-*/
-void viewport(long x, long y, long width, long height);
-
-/*! sets the viewport to full canvas {0,0,width,height} (see \ref gf_evg_surface_viewport)*/
-void viewport();
-
-/*! creats a new shader
-\return the new shader
-\param shader_type the desired shader type*/
-Shader new_shader(ShaderType shader_type);
-};
-
 /*! defined shader types*/
 typedef enum
 {
@@ -1468,7 +1503,7 @@
 - variables can be defined as uniforms, and updated whenever needed
 - upon executing the shader, the instructions are processed in order
 
-Local variables are untyped, except for reserved variables. The type is infered whenever the variable is assigned or modified, thus a same variable can change type during the execution of the shader. 
+Local variables are untyped, except for reserved variables. The type is inferred whenever the variable is assigned or modified, thus a same variable can change type during the execution of the shader. 
 Upon assigning, the type of the source variable is inferred as follows:
 - Javascript bool and integer are converted to integer type
 - Javascript float is converted to float type
@@ -1506,8 +1541,14 @@
 fragDepth | float | the fragment depth value - can be overwritten by shader 
 fragZ | float | the fragment Z coordinate
 fragW | float | the fragment W coordinate
+txCoord | float | the texture coordinates for 2D shaders
+txCoordi | ints | the integer texture coordinates for 2D shaders
+fragOdd | boolean | the odd/even flag of 2D path for 2D shaders
 
 
+\note
+`txCoordi` is used to fetch the pixel value as int. This is quite experimental, and should only be used to assign fragRGBA or fragYUVA.
+
 # Vertex shader reserved variables 
 
 These variables names are reserved in a vertex shader, and their type cannot be modified:
@@ -1601,7 +1642,7 @@
 'sign' | any | none | assigns sign vector of rv1 to left value - cf GLSL
 'floor' | any | none | assigns floor(rv1) to left value
 'ceil' | any | none | assigns ceil(rv1) to left value
-'fract' | any | none | assigns fractionnal part of rv1 to left value - cf GLSL
+'fract' | any | none | assigns fractional part of rv1 to left value - cf GLSL
 'mod' | any | any | assigns modulo of rv1 by rv2 to left value - cf GLSL
 'min' | any | any | assigns minimum of rv1 and rv2 to left value - cf GLSL
 'max' | any | any | assigns maximum of rv1 and rv2 to left value - cf GLSL
@@ -1629,8 +1670,8 @@
 # Conditions
 
 Conditions are expressed with the following keywords:
-- 'if' : takes 3 additionnal parameters `left`, `operand`and `right` and evaluates the condition
-- 'elseif' : takes 3 additionnal parameters `left`, `operand` and `right` and evaluates the condition
+- 'if' : takes 3 additional parameters `left`, `operand`and `right` and evaluates the condition
+- 'elseif' : takes 3 additional parameters `left`, `operand` and `right` and evaluates the condition
 - 'else': no additional parameters
 - 'end': no additional parameters
 
@@ -1694,7 +1735,7 @@
 shader.push('elseif', 'my_var.x', '<=', '.uniform');
 shader.push('goto', '.label_start'); //go to the instruction at position label_start
 shader.push('else');
-shader.push('goto', 0); //go to begining of the instruction stack
+shader.push('goto', 0); //go to beginning of the instruction stack
 shader.label_end = shader.push('end');
 ...
 \endcode
@@ -1768,7 +1809,7 @@
 - When a `samplerYUV` call is made on a RGB texture, conversion is performed
 - Otherwise, no conversion is done
 
-The `toRGB` and `toYUV` operations can also be used to convert between color space, but precomputed values should be prefered. 
+The `toRGB` and `toYUV` operations can also be used to convert between color space, but precomputed values should be preferred. 
 
 */
 interface Shader {
@@ -1825,4 +1866,55 @@
 long PixelSize(DOMString pixel_format);
 
 
+/*! Parameter object for canvas texture blit */
+interface BlitParameters
+{
+	/*! name of the scale mode - see `gpac -hx ffsws`. If undefined, let FFMPEG decide*/
+	DOMString mode;
+	/*! first parameter of scale mode, if any*/
+	double p1;
+	/*! second parameter of scale mode, if any*/
+	double p2;
+};
+
+
+/*! Mesh object to describe 3D graphics.
+\warning This is a work in progress, API will likely change soon
+*/
+interface Mesh {
+	/*! Constructs an empty mesh*/
+	Mesh();
+
+	/*! Constructs a mesh from a path
+	\param path 2D path to use as source
+	*/
+	Mesh(Path path);
+
+	/*! Updates underlying OpenGL vertex buffer objects*/
+	void update_gl();
+	/*! Draw mesh using current program
+	\param vertex_attrib_location uniform location of vertex buffer attribute in program
+	*/
+	void draw(unsigned long vertex_attrib_location);
+	/*! Draw mesh using current program
+	\param vertex_attrib_location uniform location of vertex buffer attribute in program
+	\param texture_attrib_location uniform location of texture coordinate buffer attribute in program
+	*/
+	void draw(unsigned long vertex_attrib_location, unsigned long texture_attrib_location);
+	/*! Draw mesh using current program
+	\param vertex_attrib_location uniform location of vertex buffer attribute in program
+	\param normal_attrib_location uniform location of normal buffer attribute in program
+	\param texture_attrib_location uniform location of texture coordinate buffer attribute in program
+	*/
+	void draw(unsigned long vertex_attrib_location, unsigned long normal_attrib_location, unsigned long texture_attrib_location);
+	/*! Draw mesh using current program
+	\param vertex_attrib_location uniform location of vertex buffer attribute in program
+	\param normal_attrib_location uniform location of normal buffer attribute in program
+	\param color_attrib_location uniform location of color buffer attribute in program
+	\param texture_attrib_location uniform location of texture coordinate buffer attribute in program
+	*/
+	void draw(unsigned long vertex_attrib_location, unsigned long normal_attrib_location, unsigned long color_attrib_location, unsigned long texture_attrib_location);
+
+};
+
 /*! @} */

gpac-1.0.1.tar.gz/share/doc/idl/filtersession.idl -> gpac-2.0.0.tar.gz/share/doc/idl/filtersession.idl Changed

@@ -48,9 +48,9 @@
 void post_task(function task_callback, optional DOMString task_name=null);
 
 /*! aborts the filter session - see \ref gf_fs_abort
-\param do_flush if true, wait for all packets currently pending to be processed before closing the session
+\param flush_type if true, wait for all packets currently pending to be processed before closing the session
 */
-void abort(optional boolean do_flush=false);
+void abort(optional unsigned long flush_type=0);
 
 /*! locks the filter session - see \ref gf_fs_lock_filters. When the session is locked, tasks are suspended and filters cannot be destroyed.
 The session only needs to be locked when enumerating filters
@@ -64,11 +64,11 @@
 */
 JSFSFilter get_filter(unsigned long index);
 
-/*! returns the JSFSFilter object for a given filter \ref iname. 
+/*! returns the JSFSFilter object for a given filter iname. 
 \param iname the iname of filter to query 
 \return the filter object, null if none found
 */
-JSFSFilter get_filter(unsigned long index);
+JSFSFilter get_filter(DOMString iname);
 
 /*! sends the given string to the remotery client(s)
 \param command the command to send
@@ -80,24 +80,31 @@
 \param callback the callback function to call. This function takes one parameter which is the text being received
 \return error code if any
 */
-void rmt_set_fun(function callback);
+void set_rmt_fun(function callback);
 
 /*! inserts a filter in graph
+
 \param filter_to_add string describin the filter to add, can be in the form "src=" for sources, "dst=" for sinks or regular string for filters.
 \param link_from filter used as source for the created filters - see \ref gf_filter_set_source
 \param link_args arguments for the link (used to assign new filter SID - see \ref gf_filter_set_source
+\param relative_to_script if false, URLs for source and sinks filters are relative to the current working directory, if true they are relative to the script path
 \return new filter created
 */
-JSFSFilter add_filter(DOMString filter_to_add, optional JSFSFilter link_from=null, optional DOMString link_args=null);
+JSFSFilter add_filter(DOMString filter_to_add, optional JSFSFilter link_from=null, optional DOMString link_args=null, optional boolean relative_to_script=false);
 
-/*! sets callback function to get notifications upon each new filter creation. The callback function is passed a single parameter, the filter object*/
+/*! sets callback function to get notifications upon each new filter creation.
+\param callback callback function - it is passed a single parameter, the filter object
+*/
 void set_new_filter_fun(function callback);
 
-/*! sets callback function to get notifications upon each filter destruction. The callback function is passed a single parameter, the filter object*/
+/*! sets callback function to get notifications upon each filter destruction.
+\param callback the callback function - it is passed a single parameter, the filter object
+*/
 void set_del_filter_fun(function callback);
 
-/*! sets callback function to get events being sent back to application (see \ref gf_fs_set_ui_callback). The callback function will have a single parameter set, an event instance of FilterEvent interface. The return value of the function should be as indicated for each event type*/
-boolean set_event_fun(function callback);
+/*! sets callback function to get events being sent back to application (see \ref gf_fs_set_ui_callback). 
+\param callback callback function - it is passed a single parameter set, an event instance of FilterEvent interface. The return value of the function should be as indicated for each event type*/
+void set_event_fun(function callback);
 
 /*! fires a given event on all registered user event if no filter is specified, or on the filter
 \param evt the event to send
@@ -110,6 +117,14 @@
 \param enable enables reporting if true*/
 void reporting(boolean enable);
 
+/*! creates a new custom JS filter. This filter will share the same script context as the filter session script - see \ref JSFilter
+\note A custom filter cannot use default arguments, and will not have the initialize callback function called.
+
+\param name name for the filter
+\return new filter
+*/
+JSFilter new_filter(DOMString name=null);
+
 /*! number of filters in the session - see \ref gf_fs_get_filters_count. 
 This number is only valid when session is locked*/
 attribute long nb_filters;
@@ -117,12 +132,23 @@
 /*! check if the calling task is the last task in the session - see \ref gf_fs_is_last_task*/
 readonly attribute boolean last_task;
 
-/*! max capped HTTP download rate - used for DASH simulations mostly*/
+/*! max capped HTTP download rate in bps - used for DASH simulations mostly*/
 attribute unsigned long http_max_bitrate;
 
-/*! current http download rate averaged on all active resources*/
+/*! current http download rate averaged on all active resources in bps*/
 readonly attribute unsigned long http_bitrate;
 
+/*! set to true if no PID initialization task (connections) is pending*/
+readonly attribute boolean connected;
+
+/*! last process error, cf gf_fs_get_last_process_error*/
+readonly attribute boolean last_process_error;
+/*! last connection error, cf gf_fs_get_last_connect_error*/
+readonly attribute boolean last_connect_error;
+
+/*! File path of source script*/
+readonly attribute DOMString jspath;
+
 };
 
 
@@ -148,7 +174,7 @@
 attribute readonly boolean alias;
 /*! set to the arguments passed to the filter, null if none*/
 attribute readonly DOMString args;
-/*! set to true if filter was dynamically loaded during graph resolution, false if filter was explicetly loaded by user/app*/
+/*! set to true if filter was dynamically loaded during graph resolution, false if filter was explicitly loaded by user/app*/
 attribute readonly boolean dynamic;
 /*! set to true if filter is done processing and will soon be removed*/
 attribute readonly boolean done;
@@ -182,16 +208,22 @@
 attribute boolean event_target;
 
 /*! set to max timestamp of last packet sent by the filter, or null if not available*/
-attribute boolean last_ts_sent;
+attribute Fraction last_ts_sent;
 
 /*! set to max timestamp of last packet dropped by the filter, or null if not available*/
-attribute boolean last_ts_drop;
+attribute Fraction last_ts_drop;
 
 /*! Checks if a filter is valid or if it has been destroyed. Any query on a destroyed filter will raise an exception.
 \return true if the filter has been destroyed, false otherwise*/
 boolean is_destroyed();
 
 /*! Gets properties on input pid
+This function accepts the following extra names (not property names) to query PID status:
+- buffer: return the PID buffer level in microsecond
+- buffer_total: return the cumulated buffer from source to PID level in microsecond
+- name: return the PID name
+- eos: return true if PID is in EOS state
+
 \param idx the index of the input pid to query
 \param name name of the property to query
 \return property value, or null if not found
@@ -235,9 +267,15 @@
 */
 Array all_args(optional boolean value_only=true);
 
+/*! Gets value of a given argument of the filter
+\param arg_name argument name
+\return property value, or null 
+*/
+FilterProperty get_arg(DOMString arg_name);
+
 /*! sends argument update to filter
 \param arg_name name of argument to update
-\param arg_val value of argument to update
+\param arg_val value of argument to update. Can be a string or a native type which will be serialized based on the argument type
 */
 void update(DOMString arg_name, DOMString arg_val);
 
@@ -248,7 +286,18 @@
 \param filter_to_add string describing the filter to add, can be in the form "src=" for sources, "dst=" for sinks or regular string for filters.
 \param link_args specify any additional arguments to pass to the SID option of the new filter - see \ref gf_filter_set_source
 */
-void insert(DOMString filter_to_add, optional DOMString link_args=NULL);
+void insert(DOMString filter_to_add, optional DOMString link_args=null);
+
+/*! binds a JSObject with underlying filter javascript extensions, if any. Currently only dashin filter has such an extension (see \ref JSDASHClient).
+This will throw an exception if failure or no JS binding available
+\param obj the JS object to use as interface for the underlying filter script
+*/
+void bind(Object obj);
+
+/*! locks a filter. This should only be used when updating sync arguments of the filter - see \ref gf_filter_lock.
+\param do_lock if true, locks the filter global mutex, otherwise unlocks it.
+*/
+void lock(boolean do_lock);
 
 };
 
@@ -267,6 +316,8 @@
 optional attribute DOMString default;
 /*! argument can be updated*/
 optional attribute boolean update;
+/*! argument can be updated in synchronous way only, and filter must be locked whenever shared data is modified*/
+optional attribute boolean update_sync;
 /*! indicate the UI level of the argument - string can be undefined, "advanced" or "expert"*/
 optional attribute DOMString hint;

gpac-1.0.1.tar.gz/share/doc/idl/jsf.idl -> gpac-2.0.0.tar.gz/share/doc/idl/jsf.idl Changed

@@ -134,9 +134,13 @@
 readonly attribute unsigned long long connections_pending;
 /*! internal name - this can only be set and modified by JS API and allows for filter identification from JS*/
 attribute DOMString iname;
+/*! requires source ID for the filter - see \ref gf_filter_require_source_id*/
+writeonly unsigned boolean require_source_id;
+/*! gets JS path*/
+readonly attribute DOMString jspath;
 
 
-/*! sets filter desciption as visible when checking filter info
+/*! sets filter description as visible when checking filter info
 \param description description of filter*/
 void set_desc(DOMString description);
 /*! sets filter author as visible when checking filter info
@@ -164,11 +168,13 @@
 /*! sets the name of the filter, used for logs
 \param name the filter name
 */
-void set_name(DOMString name)
+void set_name(DOMString name);
+
 /*! creates a new PID - see \ref gf_filter_pid_new
 \return the new PID object
 */
 FilterPid new_pid();
+
 /*! sends an event on the filter - see \ref gf_filter_send_event
 \param evt the event to send
 \param upstream sends the evnet upstream
@@ -187,13 +193,7 @@
 \param mime the mime type to query
 \return true if supported
 */
-boolean is_supported_mime(DOMStrin mime);
-
-/*! disables data probing  if a MIME type is supported - see \ref gf_filter_is_supported_mime
-\param mime the mime type to query
-\return true if supported
-*/
-boolean is_supported_mime(DOMStrin mime);
+boolean is_supported_mime(DOMString mime);
 
 /*! update filter status string - see \ref gf_filter_update_status
 \param status the status string, may be null to reset the status string
@@ -241,6 +241,16 @@
 */
 void send_update(DOMString filter_id, DOMString arg_name, DOMString arg_value, long propagate_mask);
 
+/*! locks filter session - see \ref gf_filter_lock_all
+\param do_lock if true locks filter
+*/
+void lock_all(boolean do_lock);
+
+/*! locks a filter - see \ref gf_filter_lock
+\param do_lock if true locks filter
+*/
+void lock(boolean do_lock);
+
 /*! adds a source filter in the media session - see \ref gf_filter_connect_source
 \param source URL of source to load
 \param parent URL of parent, used as baseURL for the source. May be NULL
@@ -275,6 +285,25 @@
 */
 void block_eos(boolean do_block);
 
+/*! aborts the filter - see \ref gf_filter_abort*/
+void abort();
+
+
+/*! assigns source name to a filter - see \ref gf_filter_set_source
+\param from a Filter or a FilterInstance object to set a a source for this filter
+\param source_id the source ID to assign
+*/
+void set_source(Filter from, optional DOMString source_id=null);
+
+/*! assigns restricted source name to a filter - see \ref gf_filter_set_source_restricted
+\param from a Filter or a FilterInstance object to set a a source for this filter
+\param source_id the source ID to assign
+*/
+void set_source_restricted(Filter from, optional DOMString source_id=null);
+
+/*! reset source identifier for the filter - see \ref gf_filter_reset_source*/
+void reset_source();
+
 };
 
 /*! FilterInstance wraps the set of functions available for filters loaded by the script*/
@@ -313,6 +342,12 @@
 */
 void set_source(Filter from, optional DOMString source_id=null);
 
+/*! assigns restricted source name to a filter - see \ref gf_filter_set_source_restricted
+\param from a Filter or a FilterInstance object to set a a source for this filter
+\param source_id the source ID to assign
+*/
+void set_source_restricted(Filter from, optional DOMString source_id=null);
+
 /*! removes a source filter - see \ref gf_filter_remove_src*/
 void remove();
 
@@ -336,6 +371,20 @@
 
 /*! reset source identifier for the filter - see \ref gf_filter_reset_source*/
 void reset_source();
+
+/*! indicates if filter is likely blocking or not - see \ref gf_filter_set_blocking
+\param is_blocking if true, indicates the filter is likely to block upon process*/
+void set_blocking(boolean is_blocking);
+
+/*! filter name*/
+attribute readonly DOMString name;
+
+/*! filter type (registry name)*/
+attribute readonly DOMString type;
+
+/*! internal name - this can only be set and modified by JS API and allows for filter identification from JS*/
+attribute DOMString iname;
+
 };
 
 /*! The FilterPid object is a binding for \ref GF_FilterPid*/
@@ -347,6 +396,8 @@
 attribute boolean eos;
 /*! end of stream pending state - see \ref gf_filter_pid_has_seen_eos*/
 readonly attribute boolean eos_seen;
+/*! end of stream pending state - see \ref gf_filter_pid_eos_received*/
+readonly attribute boolean eos_received;
 /*! blocking state - see \ref gf_filter_pid_would_block*/
 readonly attribute boolean would_block;
 /*! name of parent filter*/
@@ -357,6 +408,8 @@
 readonly attribute DOMString args;
 /*! argument of source filter*/
 readonly attribute DOMString src_args;
+/*! argument of source filter or first filter responsible for a fan-out*/
+readonly attribute DOMString unicity_args;
 /*! max buffer requirement of the pid - see \ref gf_filter_pid_get_max_buffer and \ref gf_filter_pid_set_max_buffer*/
 attribute long max_buffer;
 /*! enables loose connect of the pid - see \ref gf_filter_pid_set_loose_connect*/
@@ -391,6 +444,8 @@
 readonly attribute unsigned long min_pck_dur;
 /*! playing state - see \ref gf_filter_pid_is_playing*/
 readonly attribute unsigned long playing;
+/*! next estimated timestamp, or null if not computable - see \ref gf_filter_pid_get_next_ts*/
+readonly attribute boolean next_ts;
 
 /*! sends an event on the pid - see \ref gf_filter_pid_send_event
 \param evt the event to send*/
@@ -432,12 +487,12 @@
 */
 void drop_packet();
 
-/*! checks if a filter is in parent chain of pid - see \ref gf_filter_pid_get_buffer_occupancy
+/*! checks if a filter is in parent chain of pid - see \ref gf_filter_pid_is_filter_in_parents
 \param filter filter to check
 \return true if in parent chain*/
 boolean is_filter_in_parents(GF_Filter filter);
 
-/*! gets buffer occupancy - see \ref gf_filter_pid_is_filter_in_parents
+/*! gets buffer occupancy - see \ref gf_filter_pid_get_buffer_occupancy
 \param filter the Filter or FilterInstance object to check 
 \return a buffer occupancy object:
 \code
@@ -450,7 +505,7 @@
 }
 \endcode
 */
-boolean is_filter_in_parents(GF_Filter filter);
+boolean get_buffer_occupancy(GF_Filter filter);
 
 /*! clears EOS on pid - see \ref gf_filter_pid_clear_eos*/
 void clear_eos();
@@ -516,8 +571,13 @@
 Object get_clock_info();
 
 /*! sets property on a pid - see \ref gf_filter_pid_set_property and \ref gf_filter_pid_set_property_str
+
+\note if the name identifies the SenderNTP or ReceiverNTP properties:
+- if the value is 'true', the property is set to the current NTP timestamp
+- if the value is an object with properties 'n' and 'd', NTP timestamp is computed using 'n' as seconds and 'd' as fractional part
+
 \param name the ID or name of the builtin property
-\param prop the property to set
+\param prop the property to set. If not set, removes the property.
 \param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
 */
 void set_prop(DOMString name, FilterProperty prop, optional boolean is_user=false);
@@ -546,6 +606,12 @@
 */
 void copy_props(FilterPid from);
 
+
+/*! ignore this pid in blocking computations - see gf_filter_pid_ignore_blocking*
+\param do_ignore if true, pid is not used in blocking mode evaluation
+*/
+void ignore_blocking(optional boolean do_ignore=true);
+
 /*! creates a new output packet with no associated data
 \return new packet or null*/
 FilterPacket new_packet();
@@ -648,9 +714,13 @@
 	\warning This arraybuffer will be detached whenever the packet data is modified for a destination packet
 */
 readonly attribute ArrayBuffer data;
+
 /*! set to true if data of the packet is available through a GF_FilterFrameInterface object*/
 readonly attribute boolean frame_ifce;
 
+/*! set to true if packet has properties other than default ones - see gf_filter_pck_has_properties*/
+readonly attribute boolean has_properties;
+
 /*! sets packet readonly - see gf_filter_pck_set_readonly*/
 void set_readonly();
 
@@ -729,6 +799,17 @@
 */
 void copy_props(FilterPacket from);
 
+/*! creates a new packet cloning a source packet - see \ref gf_filter_pck_dangling_copy.
+
+The resulting packet is in read/write mode and may have its own memory allocated.
+This is typically used by sink filters wishing to access underling GPU data of a packet using frame interface.
+The resulting packet can be explicitly discarded using \ref discard, otherwise will be garrbage collected.
+
+\param cached_pck if set, will be reuse for creation of new packet. This can greatly reduce memory allocations
+\return the new FilterPacket or None if failure or None if failure ( if grabbing the frame into a local copy failed)
+*/
+void clone(optional FilterPacket cached_pck = null);
+
 };
 
 /*! FilterEvent expose a filter event object, either for processing a received event or triggering a new event.
@@ -801,15 +882,15 @@
 /*! quality switch - see \ref GF_FEVT_QualitySwitch*/
 attribute unsigned long quality_degradation;
 
-/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+/*! visibility hint - see \ref GF_FEVT_VisibilityHint*/
 attribute unsigned long min_x;
-/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+/*! visibility hint - see \ref GF_FEVT_VisibilityHint*/
 attribute unsigned long min_y;
-/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+/*! visibility hint - see \ref GF_FEVT_VisibilityHint*/
 attribute unsigned long max_x;
-/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+/*! visibility hint - see \ref GF_FEVT_VisibilityHint*/
 attribute unsigned long max_y;
-/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+/*! visibility hint - see \ref GF_FEVT_VisibilityHint*/
 attribute boolean is_gaze;
 
 /*! buffer reqs - see \ref GF_FEVT_BufferRequirement*/
@@ -886,9 +967,11 @@
     /*! type of the argument*/
     attribute unsigned long type;
     /*! default value of the argument*/
-    optional attribute DOMString default=null;
+    optional attribute DOMString def=null;
     /*! min/max or enum values of the argument*/
     optional attribute DOMString minmax_enum=null;
+    /*! argument hint type: "advanced", "expert", "hide" or null*/
+    optional attribute DOMString hint=null;
 };
 
 /*! interface used to describe filter capability*/
@@ -915,12 +998,11 @@
 
 GF_PROP_PID_CODECID: string containing the codec name\n
 GF_PROP_PID_STREAM_TYPE: string containing the stream type name\n
-GF_PROP_PID_AUDIO_FORMAT: string containing the audio format name\n
-GF_PROP_PID_PIXFMT: string containing the pixel format name\n
 \n
 Other properties are mapped by property type:\n
 GF_PROP_BOOL: boolean\n
 GF_PROP_UINT: integer\n
+GF_PROP_4CC: string\n
 GF_PROP_SINT: integer\n
 GF_PROP_LUINT: large integer\n
 GF_PROP_LSINT: large integer\n
@@ -930,14 +1012,14 @@
 GF_PROP_STRING_NO_COPY: string\n
 GF_PROP_VEC2: object with number properties "x" and "y"\n
 GF_PROP_VEC2I: object with integer properties "x" and "y"\n
-GF_PROP_VEC3: object with number properties "x", "y" and "z"\n
 GF_PROP_VEC3I: object with integer properties "x", "y" and "z"\n
-GF_PROP_VEC4: object with number properties "x", "y", "z" and "w"\n
 GF_PROP_VEC4I: object with integer properties "x", "y", "z" and "w"\n
 GF_PROP_FRACTION: object with integer properties "n" and "d", representing fraction n/d\n
 GF_PROP_FRACTION64: object with large integer properties "n" and "d", representing fraction n/d\n
 GF_PROP_UINT_LIST: array of integers\n
+GF_PROP_4CC_LIST: array of strings\n
 GF_PROP_STRING_LIST: array of strings\n
+All enumeration properties (pixel format, audio format, etc): string\n
 */
 typedef Object FilterProperty;

gpac-2.0.0.tar.gz/share/doc/idl/nodejs.idl Added

@@ -0,0 +1,1492 @@
+/*
+\file
+\brief silence !
+*/
+
+typedef char *DOMString;
+
+/*!
+
+\defgroup nodegpac_grp GPAC module exports
+\ingroup nodejs_grp
+\brief Exported symbols for GPAC NodeJS.
+
+This section documents the JavaScript API used to query the filter session.
+
+Unless explictly stated, errors are handled through exceptions.
+
+All constants from GPAC are exported in the module object (e.g. use gpac.GF_Err ...) 
+
+
+The API is very close to the GPAC python bindings.
+
+
+@{
+
+*/
+
+
+/*! initialize libgpac - see \ref gf_sys_init
+
+When loading the module, libgpac is innitialized with no memory tracking and the default profile. Use this function only if you need to change these settings. This must be called before any other calls to gpac.
+
+\param mem_track mem tracker mode
+\param profile profile name, null for default
+\return
+*/
+void init(unsigned long mem_track=0, DOMString profile=null);
+
+/*! convert error value to string message
+\param err gpac error code (int)
+\return string
+*/
+DOMString e2s(long err);
+
+/*! set log tools and levels - see \ref gf_log_set_tools_levels
+\note Make sure you have destroyed all associated gpac resources before calling this !
+
+\param logs
+\param reset if true, resets all logs to default
+\return
+*/
+void set_logs(DOMString logs, boolean reset=false);
+
+/*! get clock - see \ref gf_sys_clock
+\return clock in milliseconds
+*/
+unsigned long sys_clock();
+
+/*! get high res clock - see \ref gf_sys_clock_high_res
+\return clock in microseconds
+*/
+unsigned long long sys_clock_high_res();
+
+/*! set libgpac arguments - see \ref gf_sys_set_args
+\param args Array of strings, the first string is ignored (considered to be the executable name)
+*/
+void set_args(Array args);
+
+/*! set profiler (Remotery) callback - see \ref gf_sys_profiler_set_callback
+\param callback function for Remotery message, takes a single string parameter and no return values
+*/
+void set_rmt_fun(function callback);
+
+/*! send message to profiler (Remotery) - see \ref gf_sys_profiler_send
+\param text text to send
+*/
+void rmt_send(DOMString text);
+
+/*! check if profiler (Remotery) sampling is enabled - see \ref gf_sys_profiler_sampling_enabled
+\return true if enabled, false otherwise
+*/
+boolean rmt_on();
+
+/*! enable or disable sampling in profiler (Remotery) - see \ref gf_sys_profiler_enable_sampling
+\param do_enable enable or disable sampling
+*/
+void rmt_enable(boolean do_enable);
+
+/*! GPAC event proc callback, initially set to null
+\param evt the user event being dispatched
+\return true to cancel the event
+*/
+boolean on_event(_FilterEvent evt);
+
+/*! libgpac version */
+attribute readonly DOMString version;
+
+/*! libgpac copyright notice */
+attribute readonly DOMString copyright;
+
+/*! libgpac full copyright notice*/
+attribute readonly DOMString copyright_cite;
+
+/*! libgpac major ABI - see \ref gf_gpac_abi_major */
+attribute readonly unsigned long abi_major;
+
+/*! libgpac minor ABI - see \ref gf_gpac_abi_minor */
+attribute readonly unsigned long abi_minor;
+
+/*! libgpac micro ABI - see \ref gf_gpac_abi_micro */
+attribute readonly unsigned long abi_micro;
+
+/*! filter session constructor*/
+attribute _FilterSession FilterSession;
+
+/*! filter session constructor*/
+attribute _FilterEvent FilterEvent;
+
+/*! FileIO constructor*/
+attribute _FileIO FileIO;
+
+/*! @} */
+
+
+
+/*!
+
+\defgroup nodefs_grp FilterSession class
+\ingroup nodejs_grp
+\brief FilterSession management
+
+See \ref GF_FilterSession
+
+The default behaviour is to run the session in blocking mode, which will prevent executing anything until the end of a session.
+While this may be OK for workers or simple applications, it is obviously problematic if you have async tasks to be performed by your node app.
+
+An example approach for by-passing this is to create the session in non-blocking mode and use a recursive promise to run the session:
+\code
+
+//create session in non-blocking mode:
+let	fs = new gpac.FilterSession(gpac.GF_FS_FLAG_NON_BLOCKING);
+
+//setup your filters
+
+
+//Run session as Promise
+const FilterSessionPromise = (fs_run_task) => {
+ var fsrun_promise = () => {
+ return (fs.last_task==false) ? fs_run_task().then(fsrun_promise) : Promise.resolve();
+ }
+ return fsrun_promise();
+};
+
+const run_task = () => {
+	return new Promise((resolve, reject) => {
+	 resolve( fs.run_step() );
+	});
+}
+FilterSessionPromise(run_task).then( ).finally( ()=> { console.log('session is done'); } ) );
+
+console.log('Entering NodeJS EventLoop');
+
+\endcode
+
+
+The filter session supports multithreaded mode, using e.g.
+\code gpac.set_args(["", "-threads=N"]);
+\endcode
+However it is currently not capable of running asynchronous callbacks into Node.
+
+The consequences are:
+- any custom JS filter will run on the main thread (EventLoop or worker thread)
+- any packet dispatched by a custom filter and requiring a JS callback upon packet destruction (shared data dispatch) will force filters consuming these packets to run on the main thread as well.
+- any filter assigned with a JS binding (only `dashin` for now) will be scheduled on the main thread
+
+For better multithreaded usage, it is therefore not recommended to use packets with shared JS data.
+
+
+By default the filter session will run with implicit linking.
+
+@{
+
+*/
+
+/*! FilterSession object*/
+interface _FilterSession {
+
+/*! constructor for filter session - see \ref gf_fs_new_defaults. Other options MUST be passed as libgpac options using \ref set_args 
+\param flags session flags
+*/
+FilterSession(unsigned long flags=0);
+
+/*! set to true if this is the last task running, readonly - see \ref gf_fs_is_last_task*/
+attribute readonly boolean last_task;
+
+/*! number of filters in session, readonly - see \ref gf_fs_get_filters_count*/
+attribute readonly unsigned long nb_filters;
+
+/*! current HTTP cumulated download rate, readonly - see \ref gf_fs_get_http_rate*/
+attribute readonly unsigned long http_bitrate;
+
+/*! HTTP max download rate - see \ref gf_fs_get_http_max_rate and \ref gf_fs_set_http_max_rate*/
+attribute unsigned long http_max_bitrate;
+
+/*! callback used whenever a new filter is added, initially set to null
+\param filter _Filter object being added
+*/
+void on_filter_new(_Filter filter);
+
+/*! callback used whenever a filter is destroyed, typically used by classes deriving from _FilterSession, initially set to null
+\param filter _Filter object being removed
+*/
+void on_filter_del(_Filter filter);
+
+/*! run the session - see \ref gf_fs_run */
+void run();
+
+/*! load source filter - see \ref gf_fs_load_source
+\param URL source URL to load
+\param parentURL URL of parent resource for relative path resolution
+\return new _Filter object
+*/
+_Filter load_src(DOMString URL, DOMString parentURL=null);
+
+/*! load destination filter - see \ref gf_fs_load_destination
+\param URL source URL to load
+\param parentURL URL of parent resource for relative path resolution
+\return new _Filter object
+*/
+_Filter load_dst(DOMString URL, DOMString parentURL=null);
+
+/*! load a filter - see \ref gf_fs_load_filter
+\param fname filter name and options
+\return new _Filter object
+*/
+_Filter load(DOMString fname);
+
+/*! post a user task to the filter sesison - see \ref gf_fs_post_user_task
+
+The task object must have an execute callback with no parameter and returning false to cancel the task or the reschedule time in milliseconds 
+
+\param task task object to post
+*/
+void post_task(Object task);
+
+/*! abort the session - see \ref gf_fs_abort
+\param flush pipeline flush mode before abort
+*/
+void abort(unsigned long flush=GF_FS_FLUSH_NONE);
+
+/*! get a filter by index - see \ref gf_fs_get_filter
+\param index index of filter
+\return _Filter object
+*/
+_Filter get_filter(unsigned long index);
+
+/*! lock the session - see \ref gf_fs_lock_filters
+\param lock if True, locks otherwise unlocks
+*/
+void lock(boolean lock);
+
+/*! enable status reporting by filters - see \ref gf_fs_enable_reporting
+\param do_report if True, enables reporting
+*/
+void reporting(boolean do_report);
+
+/*! print statistics on stderr - see \ref gf_fs_print_stats*/
+void print_stats();
+
+/*! print graph on stderr - see \ref gf_fs_print_connections*/
+void print_graph();
+
+
+/*! fire an event on the given filter if any, or on any filter accepting user events
+\param evt FilterEvent to fire
+\param filter _Filter to use as target
+\param upstream if true, walks the chain towards the sink, otehrwise towards the source
+*/
+void fire_event(FilterEvent evt, _Filter filter=null, boolean upstream=false);
+
+/*! checks if a given mime is supported - see \ref gf_fs_is_supported_mime
+\param mime mime type to check
+\return true or false
+*/
+boolean is_supported_mime(DOMString mime);
+
+/*! checks if a given source URL is supported - see \ref gf_fs_is_supported_source
+\param url URL to check
+\param parent parent URL for relative URLs
+\return true or false
+*/
+boolean is_supported_source(DOMString url, DOMString parent=null);
+
+/*! creates a new custom filter to be filled by JS code - see \ref gf_fs_new_filter
+
+\note Custom filters are always created with the flag GF_FS_REG_MAIN_THREAD set, so that they always run in the main thread
+
+\param name name for the filter
+\param flags filter flags
+\return new custom filter
+*/
+CustomFilter new_filter(DOMString name="Custom", unsigend long flags=0);
+
+};
+
+/*! @} */
+
+/*!
+
+\defgroup nodefilter_grp Filter class
+\ingroup nodejs_grp
+\brief Filter management
+
+See \ref GF_Filter
+
+@{
+*/
+/*! Filter object*/
+interface _Filter {
+
+/*! name of the filter, readonly - see \ref gf_filter_get_name*/
+attribute readonly DOMString name;
+
+/*! ID of the filter, readonly - see \ref gf_filter_get_id*/
+attribute readonly DOMString ID;
+
+/*! number of input pids for that filter, readonly - see \ref gf_filter_get_ipid_count*/
+attribute readonly unsigned long nb_ipid;
+
+/*! number of output pids for that filter, readonly - see \ref gf_filter_get_opid_count*/
+attribute readonly unsigned long nb_opid;
+
+
+/*! remove this filter - see \ref gf_filter_remove*/
+void remove();
+
+/*! send option update to this filter - see \ref gf_fs_send_update
+\param name name of option
+\param value value of option
+*/
+void update(DOMString name, DOMString value);
+
+
+/*! set a given filter as source for this filter - see \ref gf_filter_set_source
+\note Setting a source will force the filter session linker to run in explicit linking mode.
+\param src source filter
+\param link_args link options
+*/
+void set_source(_Filter src, DOMString link_args=null);
+
+/*! set a given filter as restricted source for this filter - see \ref gf_filter_set_source_restricted
+\note Setting a source will force the filter session linker to run in explicit linking mode.
+\param src source filter
+\param link_args link options
+*/
+void set_source_restricted(_Filter src, DOMString link_args=null);
+
+/*! insert a given filter after this filter - see \ref gf_filter_set_source and \ref gf_filter_reconnect_output
+\param f _Filter to insert
+\param link_args link options
+*/
+void insert(_Filter f, DOMString link_args=null);
+
+/*! get an input pid property by name
+\param idx index of input pid
+\param prop_name name of property
+\return property value or None if not found
+*/
+PropertyValue ipid_prop(unsigned long idx, DOMStreing prop_name);
+
+/*! enumerate an input pid properties
+\param idx index of input pid
+\param callback_fun callback function taking three parameters, prop_name (string), propval (PropertyValue) and proptype (int, GPAC property data type)
+*/
+void ipid_enum_props(unsigned long idx, function callback_fun);
+
+/*! get an output pid property by name
+\param idx index of output pid
+\param prop_name name of property
+\return property value or null if not found
+*/
+PropertyValue opid_prop(unsigned long idx, DOMString prop_name);
+
+/*! enumerate an output pid properties
+\param idx index of output pid
+\param callback_fun callback function taking three parameters, prop_name (string), propval (PPropertyValue) and proptype (int, GPAC property data type)
+*/
+void opid_enum_props(unsigned long idx, function callback_fun);
+
+/*! gets the filter at the source of an input pid
+\param idx index of input PID
+\return filter or null if error
+*/
+_Filter ipid_source(unsigned long idx);
+
+/*! gets the list of destination filters of an output pid
+\param idx index of output PID
+\return list of _Filter
+*/
+Array opid_sinks(unsigned long idx);
+
+/*! gets all defined options / arguments for a filter
+\return list of FilterArg
+*/
+Array all_args();
+
+/*! gets a property info on a filter - see \ref gf_filter_get_info and \ref gf_filter_get_info_str
+\param info_name property to query
+\return property value or None if not found
+*/
+PropertyValue get_info(DOMString info_name);
+
+/*! gets the statistics of a filter - see \ref gf_filter_get_stats
+\return stats object*/
+FilterStatistics get_statistics();
+
+/*! enforces sourceID to be present for output pids of this filter - see \ref gf_filter_require_source_id*/
+void require_source_id();
+
+/*! Binds the given object to the underlying filter for callbacks override - only supported by DASH demuxer for the current time
+
+For DASH, the object must derive implement the methods of the \ref _DASHCustomAlgorithm interface
+
+\param interf interface object to bind
+*/
+void bind(object interf);
+
+};
+
+/*! Statistics object for filter as defined in libgpac.
+
+Fields have the same types, names and semantics as \ref GF_FilterStats, except:
+- filter which is not present,
+- filter_alias which is exposed as a boolean.
+*/
+interface FilterStatistics {
+	
+};
+
+
+/*! PropertyValue for filter, PIDs and packets are passed as 
+:
+- native JS types for integers and strings
+- nFraction for 32 and 64 bit fractions
+- Vec2 for 2D float and interger vectors
+- Vec3 for 3D interger vectors
+- Vec4 for 4D interger vectors
+- ArrayBuffer for data, with data being copied
+- Array of above types for list properties
+
+Pointer properties are passed back as "INTERNAL_POINTER" string and cannot be set.
+
+Properties corresponding to constants are usually passed as strings, for example `StreamType`, `CodecID`, `PixelFormat`, `AudioFormat`.
+*/
+interface PropertyValue {
+	
+};
+
+/*! fraction object */
+interface nFraction {
+	/*! integer or long long numerator*/
+	number num;
+	/*! unsigned integer or unsigned long long denominator*/
+	number den;
+};
+
+/*! 2D vector object */
+interface Vec2 {
+	/*! integer or float X value*/
+	number x;
+	/*! integer or float Y value*/
+	number y;
+};
+
+/*! 3D vector object */
+interface Vec3 {
+	/*! X value */
+	long x;
+	/*! Y value */
+	long y;
+	/*! Z value */
+	long z;
+};
+
+/*! 4D vector object */
+interface Vec4 {
+	/*! X value */
+	long x;
+	/*! Y value */
+	long y;
+	/*! Z value */
+	long z;
+	/*! W value */
+	long w;
+};
+
+
+/*! @} */
+
+/*!
+
+\defgroup nodefiltercust_grp CustomFilter class
+\ingroup nodejs_grp
+\brief User-defined filters
+
+A custom filter allows your application to interact closely with the media pipeline, but cannot be used in graph resolution.
+Custom filters can be sources, sinks, or intermediate filters. The following limitations however exist:
+- custom filters will not be cloned
+- custom filters cannot be used as sources of filters loading a source filter graph dynamically, such as the dashin filter.
+- custom filters cannot be used as destination of filters loading a destination filter graph dynamically, such as the dasher filters.
+
+A custom filter must implement the \ref CustomFilter class, and optionally provide the following methods
+- configure_pid: callback for PID configuration, mandatory if your filter is not a source
+- process: callback for processing
+- process_event: callback for processing and event
+- reconfigure_output: callback for output reconfiguration (PID capability negociation)
+
+A custom filter must also declare its capabilities, input and output, using push_cap method 
+\code
+
+let fs = new gpac.FilterSession();
+let cust = fs.new_filter("NodeJS_Test");
+
+//we accept any number of input pids
+cust.set_max_pids(-1);
+cust.pids = [];
+
+cust.push_cap('StreamType', 'Visual', gpac.GF_CAPS_INPUT);
+cust.push_cap('StreamType', 'Audio', gpac.GF_CAPS_INPUT);
+
+cust.configure_pid = function(pid, is_remove)
+{
+	if (this.pids.indexOf(pid) < 0) {
+		this.pids.push(pid);
+		console.log('New PID !');
+	} else if (is_remove) {
+		console.log('PID remove !');
+	} else {
+		console.log('PID reconfigure !');
+	}
+	return gpac.GF_OK;
+}
+
+cust.process = function() {
+	let nb_eos=0;
+
+	this.pids.forEach(pid =>{
+		if (pid.eos) {
+			nb_eos++;
+			return;
+		}
+		let pck = pid.get_packet();
+		if (!pck) return;
+		//do something
+
+		//done
+		pid.drop_packet();
+		return;
+	}
+	if (nb_eos == this.pids.length)
+		return gpac.GF_EOS;
+
+	return gpac.GF_OK;
+}
+cust.process_event = function(evt)
+{
+	//do something, return true to cancel event
+
+	return false;
+}
+\endcode
+
+
+See \ref GF_Filter
+
+@{
+*/
+
+/*! Custom filter object*/
+interface CustomFilter {
+
+/*! filter blocking is enabled - see \ref gf_filter_block_enabled*/
+attribute readonly boolean block_enabled;
+
+/*! maximum output buffer time - see \ref gf_filter_get_output_buffer_max*/
+attribute readonly unsigned long output_buffer;
+
+/*! maximum plyaout buffer time - see \ref gf_filter_get_output_buffer_max*/
+attribute readonly unsigned long playout_buffer;
+
+/*! all sinks are done for this filter - see \ref gf_filter_all_sinks_done*/
+attribute readonly boolean sinks_done;
+
+/*! number of queued events on the filter - see \ref gf_filter_get_num_events_queued*/
+attribute readonly unsigned long nb_evts_queued;
+
+/*! clock hint value in microseconds - see \ref gf_filter_get_clock_hint*/
+attribute readonly unsigned long long clock_hint_time;
+
+/*! clock hint media time as fraction - see \ref gf_filter_get_clock_hint*/
+attribute readonly nFraction clock_hint_mediatime;
+
+/*! indicating connections are pending on the filter, readonly - see \ref gf_filter_connections_pending*/
+attribute readonly boolean connections_pending;
+
+
+
+/*! callback used whenever a new filter pid is configured, initially set to null
+\param pid the PID to configure
+\param is_remove set to true if PID is being removed
+\return error code
+
+\warning the return value SHALL be set
+*/
+GF_Err configure_pid(_FilterPid pid, boolean is_remove);
+
+/*! callback used by the filter to process data, initially set to null
+\return error code
+
+\warning the return value SHALL be set
+*/
+GF_Err process();
+
+/*! callback used whenever a new filter is added, initially set to null
+\param event the event being processed (read-only)
+\return true to cancel the event, false otherwise
+
+\warning the return value SHALL be set
+*/
+boolean process_event(_FilterEvent event);
+
+/*! callback used whenever an output pid is to be reconfigured (capability negotiation), initially set to null
+\param opid the filter output pid to reconfigure
+\return error if any, usualy GF_NOT_SUPPORTED if capability cannot be changed
+
+\warning the return value SHALL be set
+*/
+GF_Err reconfigure_output(_FilterPid *opid);
+
+
+
+/*! push a capability in the current capability bundle - see \ref gf_filter_push_caps
+\param pcode capability name
+\param prop capability value
+\param flag capability flags (input, output, etc)
+\param priority capability priority
+\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+*/
+void push_cap(DOMString pcode, PropertyValue prop, unsigned long flag, unsigned long priority=0, unsigned long custom_type=0);
+
+/*! create a new output pid for this filter - see \ref gf_filter_pid_new
+\return _FilterPid object
+*/
+_FilterPid new_pid();
+
+/*! update filter status - see \ref gf_filter_update_status
+\param status status
+\param percent progress in per 10000
+*/
+void update_status(DOMString status, unsigned long percent=0);
+
+/*! reschedule the filter after a given delay - see \ref gf_filter_ask_rt_reschedule and \ref gf_filter_post_process_task
+\param when delay in microseconds
+*/
+void reschedule(unsigned long when=0);
+
+/*! notify an internal failure of the filter has happend - see \ref gf_filter_notification_failure and \ref gf_filter_setup_failure
+\param err the failure reason (gpac error code, int)
+\param error_type the failure notification type. Can be one of:
+	- GF_SETUP_ERROR: notification is a setup error, the filter chain was never connected
+	- GF_NOTIF_ERROR: notification is an error but keep the filter chain connected
+	- GF_NOTIF_ERROR_AND_DISCONNECT: notification is an error and disconnect the filter chain
+*/
+void notify_failure(GF_Err err, unsigned long error_type=GF_SETUP_ERROR);
+
+/*! make the filter sticky - see \ref gf_filter_make_sticky*/
+void make_sticky();
+
+/*! prevent blocking on the filter - see \ref gf_filter_prevent_blocking
+\param enable if true, blocking prevention is enabled
+*/
+void prevent_blocking(boolean enable);
+
+/*! block eos signaling on the filter - see \ref gf_filter_block_eos
+\param enable if true, eos blocking is enabled
+*/
+void block_eos(boolean enable);
+
+/*! set maximum number of extra pids accepted by this filter - see \ref gf_filter_set_max_extra_input_pids
+\param max_pids number of extra pids, -1 for no limits
+*/
+void set_max_pids(long max_pids);
+
+/*! set clock hint - see \ref gf_filter_hint_single_clock
+\param clock_us clock in microseconds
+\param media_time media time as nFraction
+*/
+void hint_clock(unsigned long long clock_us, nFraction media_time);
+
+
+};
+
+
+/*! Custom filter PID object*/
+interface _FilterPid {
+
+
+/*! name of the PID - see \ref gf_filter_pid_get_name and \ref gf_filter_pid_set_name*/
+attribute DOMString name;
+
+/*! name of the parent filter - see \ref gf_filter_pid_get_filter_name*/
+attribute readonly DOMString filter_name;
+
+/*! end of stream property of PID - see \ref gf_filter_pid_is_eos and \ref gf_filter_pid_set_eos*/
+attribute boolean eos;
+
+/*! True if end of stream was seen in the chain but has not yet reached the filter - see \ref gf_filter_pid_has_seen_eos*/
+attribute readonly boolean has_seen_eos;
+
+/*! True if end of stream was seen on the input PID but some packets are still to be processed - see \ref gf_filter_pid_eos_received*/
+attribute readonly boolean eos_received;
+
+/*! True if PID would block - see \ref gf_filter_pid_would_block*/
+attribute readonly boolean would_block;
+
+/*! maximum buffer of PID in microseconds - see \ref gf_filter_pid_get_max_buffer and \ref gf_filter_pid_set_max_buffer*/
+attribute unsigned long long max_buffer;
+
+/*! buffer of PID in microseconds - see \ref gf_filter_pid_query_buffer_duration*/
+attribute readonly unsigned long long buffer;
+
+/*! True if buffer is full - see \ref gf_filter_pid_query_buffer_duration*/
+attribute readonly boolean buffer_full;
+
+/*! True if no pending packet - see \ref gf_filter_pid_first_packet_is_empty*/
+attribute readonly boolean first_empty;
+
+/*! value of CTS of first pending packet, null if none - see \ref gf_filter_pid_get_first_packet_cts*/
+attribute readonly unsigned long long first_cts;
+
+/*! number of queued packets for input pid - see \ref gf_filter_pid_get_packet_count*/
+attribute readonly unsigned long self.nb_pck_queued;
+
+/*! timescale of pid - see \ref gf_filter_pid_get_timescale*/
+attribute readonly unsigned long timescale;
+
+/*! minimum packet duration (in timescale) of pid - see \ref gf_filter_pid_get_min_pck_duration*/
+attribute readonly unsigned long min_pck_dur;
+
+/*! True if PID is playing - see \ref gf_filter_pid_is_playing*/
+attribute readonly boolean playing;
+
+/*! Next estimated timestamp on pid - see \ref gf_filter_pid_get_next_ts*/
+attribute readonly unsigned long long next_ts;
+
+
+
+/*! send an event on the pid - see \ref gf_filter_pid_send_event
+\param evt filter event to send
+*/
+void send_event(_FilterEvent evt);
+
+/*! removes this output pid - see \ref gf_filter_pid_remove*/
+void remove();
+
+/*! enumerates property on pid
+\param callback_obj callback object to use, must have a 'on_prop_enum' method defined taking three parameters, prop_name (string), propval (PropertyValue) and ptype (int, GPAC property data type)
+*/
+void enum_props(function callback_obj);
+
+/*! get a PID property
+\param pname property name
+\return property value or null if not found
+*/
+PropertyValue get_prop(DOMString pname);
+
+/*! get a PID info
+\param pname property name
+\return property value or null if not found
+*/
+PropertyValue get_info(DOMString pname);
+
+/*! get first packet of input PID - see gf_filter_pid_get_packet
+\return packet or null if no packet available
+*/
+_FilterPacket get_packet();
+
+/*! drops (removes) the first packet of input PID - see \ref gf_filter_pid_drop_packet
+*/
+void drop_packet();
+
+/*! copy property of given PID to the current pid - see \ref gf_filter_pid_copy_properties
+\param ipid filter pid to copy from
+*/
+void copy_props(_FilterPid ipid);
+
+/*! removes all properties of the current pid - see \ref gf_filter_pid_reset_properties*/
+void reset_props(self);
+
+/*! forward a packet on the current pid - see \ref gf_filter_pck_forward
+\param ipck packet to forward
+*/
+void forward(_FilterPacket ipck);
+
+/*! set a property the current pid - see \ref gf_filter_pid_set_property and \ref gf_filter_pid_set_property_str
+\param pcode property type
+\param prop property value to set, or null to remove property
+\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+*/
+void set_prop(DOMString pcode, PropertyValue prop, unsigend long custom_type);
+
+/*! set a info property the current pid - see \ref gf_filter_pid_set_info and \ref gf_filter_pid_set_info_str
+\param pcode property type
+\param prop property value to set, or null to remove property
+\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+*/
+void set_info(DOMString pcode, PropertyValue prop, unsigned long custom_type=0);
+
+/*! clears EOS on the current PID - see \ref gf_filter_pid_clear_eos
+\param all_pids if true, clears eos on all input pids
+*/
+void clear_eos(boolean all_pids);
+
+/*! check PID properties match capability of filter - see \ref gf_filter_pid_check_caps*/
+void check_caps();
+
+/*! discard blocking mode on PID - see \ref gf_filter_pid_discard_block*/
+void discard_block();
+
+/*! allow direct dispatch of output to destinations - see \ref gf_filter_pid_allow_direct_dispatch*/
+void allow_direct_dispatch();
+
+/*! get current clock type info - see \ref gf_filter_pid_get_clock_info
+\return clock type 
+*/
+unsigned long get_clock_type();
+
+/*! get current clock time stamp - see \ref gf_filter_pid_get_clock_info
+\return clock timestamp
+*/
+_Fraction get_clock_timestamp();
+
+/*! check if a filter is in the parent filter chain of the pid - see \ref gf_filter_pid_is_filter_in_parents
+\param filter filter to check
+\return true or false
+*/
+boolean is_filter_in_parents(_Filter filter);
+
+/*! get buffer occupancy - see \ref gf_filter_pid_get_buffer_occupancy
+\return buffer occupancy object
+*/
+_BufferOccupancy get_buffer_occupancy();
+
+/*! sets loose connect mode - see \ref gf_filter_pid_set_loose_connect*/
+void loose_connect();
+
+/*! sets framing mode - see \ref gf_filter_pid_set_framing_mode
+\param framed if true, complete frames only will be delivered on the pid
+*/
+void set_framing(boolean framed);
+
+/*! sets clock mode - see \ref gf_filter_pid_set_clock_mode
+#\param cmode clock mode operation of filter
+*/
+void set_clock_mode(boolean cmode);
+
+/*! sets discard mode - see \ref gf_filter_pid_set_discard
+\param do_discard if True, discard is on
+*/
+void set_discard(boolean do_discard);
+
+/*! enforces sourceID to be present for output pids of this filter - see \ref gf_filter_pid_require_source_id*/
+void require_source_id();
+
+/*! sets DTS recomputing mode - see \ref gf_filter_pid_recompute_dts
+\param do_compute if True, DTS are recomputed
+*/
+void recompute_dts(boolean do_compute);
+
+/*! queries a capability property on output PID - see \ref gf_filter_pid_caps_query and \ref gf_filter_pid_caps_query_str
+\param pcode property to check
+\return property value if found, null otherwise
+*/
+PropertyValue query_cap(DOMString pcode);
+
+/*! negociates a capability property on input PID - see \ref gf_filter_pid_negociate_property and \ref gf_filter_pid_negociate_property_dyn
+\param pcode property to negotiate
+\param prop property to negotiate
+\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+*/
+void negociate_cap(DOMString pcode, PropertyValue prop, unsigned long custom_type=0);
+
+/*! resolves a template string - see \ref gf_filter_pid_resolve_file_template
+\param template the template string
+\param file_idx the file index
+\param suffix the file suffix
+\return the resolved template string
+*/
+DOMString resolve_template(DOMString template, unsigned long file_idx=0, DOMString suffix=null);
+
+/*! creates a new packet referring to an existing packet - see \ref gf_filter_pck_new_ref
+\param ipck the input (referenced) packet
+\param size the data size of the new packet
+\param offset the offset in the original data
+\return the new FilterPacket or None if failure
+*/
+_FilterPacket new_pck_ref(_FilterPacket ipck, unsigned long size=0, unsigned long offset=0);
+
+
+/*! creates a new packet of the given size, allocating memory in libgpac - see \ref gf_filter_pck_new_alloc
+\param size the data size of the new packet
+\return the new FilterPacket or None if failure
+*/
+_FilterPacket new_pck(unsigned long size=0);
+
+/*! creates a new packet sharing memory of the filter - see \ref gf_filter_pck_new_shared
+The filter object must have a `packet_release` method with arguments [ FilterPid, FilterPacket ] 
+\param data the data to use
+\return the new FilterPacket or None if failure
+*/
+_FilterPacket new_pck_shared(ArrayBuffer data);
+
+/*! creates a new packet copying a source packet - see \ref gf_filter_pck_new_copy
+\param ipck the FilterPacket to copy
+\return the new FilterPacket or None if failure
+*/
+_FilterPacket new_pck_copy(_FilterPacket ipck);
+
+/*! creates a new packet cloning a source packet - see \ref gf_filter_pck_new_clone
+\param ipck the FilterPacket to clone
+\return the new FilterPacket or None if failure
+*/
+_FilterPacket new_pck_clone(_FilterPacket ipck);
+
+};
+
+/*! buffer occupancy descriptor*/
+interface _BufferOccupancy
+{
+/*! maximum number of packets (partial or full AU) allowed in buffer*/
+unsigned long max_units;
+
+/*! number of block allowed in buffer*/
+unsigned long nb_pck;
+
+/*! maximum buffer duration in microseconds*/
+unsigned long max_dur;
+
+/*! buffer duration in microseconds*/
+unsigned long dur;
+
+/*! if true, the session has been aborted and this is the final flush for this buffer*/
+boolean is_final_flush;
+	
+};
+
+/*! filter packet for custom filters
+
+Unless specified, properties are all read-only for input packets, and read/write for output packets.
+*/
+interface _FilterPacket
+{
+
+/*! Decode Timestamp, or null not set - see \ref gf_filter_pck_get_dts and \ref gf_filter_pck_set_dts*/
+attribute unsigned long long dts;
+
+/*! Compose Timestamp or null if not set - see \ref gf_filter_pck_get_cts and \ref gf_filter_pck_set_cts*/
+attribute unsigned long long cts;
+
+/*! SAP type - see \ref gf_filter_pck_get_sap and \ref gf_filter_pck_set_sap*/
+attribute unsigned long sap;
+
+/*! Duration - see \ref gf_filter_pck_get_duration and \ref gf_filter_pck_set_duration*/
+attribute unsigned long dur;
+
+/*! Size of packet data, readonly*/
+attribute unsigned long size;
+
+/*! Packet data - see \ref gf_filter_pck_get_data
+The property MUST be treated as readonly (shall not be set). For non-refs output packets, content of the array buffer can be modified
+
+\warning The array buffer is not tracked and is live to avoid doing a memory copy. This means you SHALL NOT access this ArrayBuffer once the packet is discarded (drop without ref, final unref, send)
+*/
+attribute ArrayBuffer data;
+
+/*! frame start - see \ref gf_filter_pck_get_framing and \ref gf_filter_pck_set_framing*/
+attribute boolean start;
+
+#/*! frame end - see \ref gf_filter_pck_get_framing and \ref gf_filter_pck_set_framing*/
+attribute boolean end;
+
+/*! associated timescale, readonly - see \ref gf_filter_pck_get_timescale*/
+attribute unsigned long timescale;
+
+/*! Interlaced flags - see \ref gf_filter_pck_get_interlaced and \ref gf_filter_pck_set_interlaced*/
+attribute unsigned long interlaced;
+
+/*! Corrupted flag - see \ref gf_filter_pck_get_corrupted and \ref gf_filter_pck_set_corrupted*/
+attribute boolean corrupted;
+
+#/*! Seek flag - see \ref gf_filter_pck_get_seek_flag and \ref gf_filter_pck_set_seek_flag*/
+attribute boolean seek;
+
+/*! Byte offset or null if not set - see \ref gf_filter_pck_get_byte_offset and \ref gf_filter_pck_set_byte_offset*/
+attribute unsigned long long byte_offset;
+
+/*! Roll info - see \ref gf_filter_pck_get_roll_info and \ref gf_filter_pck_set_roll_info*/
+attribute long roll;
+
+/*! Encryption flags - see \ref gf_filter_pck_get_crypt_flags and \ref gf_filter_pck_set_crypt_flags*/
+attribute unsigned long crypt;
+
+/*! Clock reference flag - see \ref gf_filter_pck_get_clock_type and \ref gf_filter_pck_set_clock_type*/
+attribute unsigned long clock;
+
+/*! Carousel version - see \ref gf_filter_pck_get_carousel_version and \ref gf_filter_pck_set_carousel_version*/
+attribute unsigned long carousel;
+
+/*! Sequence number - see \ref gf_filter_pck_get_seq_num and \ref gf_filter_pck_set_seq_num*/
+attribute unsigned long seqnum;
+
+/*! Dependency flags - see \ref gf_filter_pck_get_dependency_flags and \ref gf_filter_pck_set_dependency_flags*/
+attribute unsigned long deps;
+
+/*! true if packet holds a GF_FrameInterface object and not a data packet - always readonly*/
+attribute readonly boolean frame_ifce;
+
+/*! true if packet is a blocking reference - see \ref gf_filter_pck_is_blocking_ref - always readonly*/
+attribute readonly boolean blocking_ref;
+
+
+/*! enumerate an packet properties
+\param callback_obj callback object to use, must have a 'on_prop_enum' method defined taking three parameters, prop_name (string), propval (PropertyValue) and ptype (int, GPAC property data type)
+*/
+void enum_props(function callback_obj);
+
+/*! get a packet property - see \ref gf_filter_pck_get_property and \ref gf_filter_pck_get_property_str
+\param prop_name name of property to get
+\return property value, or None if not found
+*/
+PropertyValue get_prop(DOMString prop_name);
+
+/*! increase packet reference count - see \ref gf_filter_pck_ref_ex*/
+void ref();
+
+/*! decrease packet reference count - see \ref gf_filter_pck_unref*/
+void unref();
+
+/*! discard an output packet instead of sending it - see \ref gf_filter_pck_discard*/
+void discard();
+
+/*! creates a new packet cloning a source packet - see \ref gf_filter_pck_dangling_copy.
+The resulting packet is read/write mode and may have its own memory allocated.
+This is typically used by sink filters wishing to access underling GPU data of a packet using frame interface.
+the resulting packet can be explicitly discarded using \ref discard, otherwise will be garrbage collected.
+\param cached_pck if set, will be reuse for creation of new packet. This can greatly reduce memory allocations
+\return the new FilterPacket or None if failure or None if failure ( if grabbing the frame into a local copy failed)
+*/
+_FilterPacket clone(_FilterPacket cached_pck=null);
+
+/*! mark an output packet as readonly - see \ref gf_filter_pck_set_readonly*/
+void readonly();
+
+/*! send the packet - see \ref gf_filter_pck_send*/
+void send();
+
+/*! copy properties of source packet in this packet - see \ref gf_filter_pck_merge_properties
+\param ipck source packet*/
+void copy_props(_FilterPacket ipck);
+
+/*! set property in this packet - see \ref gf_filter_pck_set_property and \ref gf_filter_pck_set_property_str
+\param pcode name of property
+\param prop property value to set, or null to remove property
+\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+*/
+void set_prop(DOMString pcode, PropertyValue prop, unsigned long custom_type=0);
+
+/*! truncates an output packet to the given size - see \ref gf_filter_pck_truncate
+\param size new size of packet
+*/
+void truncate(unsigned long size);
+};
+
+
+/*! event object for filters and GPAC event proc.
+
+The variables defined have the same names as the fields in the various unions of \ref __gf_filter_event.
+
+The variables are defined depending on the event type.
+
+Additional variables are defined:
+- name: string decribing the event type
+- ui_type: integer giving the UI event type (see \ref GF_Event)
+- ui_name: string decribing the UI event type
+
+Events properties are read-only for input events and read/write for events created by the JS code.
+*/
+interface _FilterEvent
+{
+	
+};
+
+
+/*! @} */
+
+
+
+/*!
+
+\defgroup nodedash_grp DASHAlgorithm interface
+\ingroup nodejs_grp
+\brief DASH and HLS user-defined rate adaptation algorithms
+
+
+The DASH demuxer can be provided with a custom JS algorithm, provided as an object implementing the the DASHAlgorithm interface.
+
+When running the session in multithreaded mode, the dash demuxer will always be scheduled on the main thread if a custom algorithm is bound.
+
+@{
+
+*/
+
+/*! interface for custom DASH algorithms
+
+Callbacks may be changed at runtime, however if the object passed to initialize the binding has no on_download_monitor function, rate monitoring will be disabled for the binding*/
+interface _DASHCustomAlgorithm 
+{
+
+/*! Callback (optional) called upon a period reset.
+\param reset_type indicate the type of period reset. Values can be:
+ - 0: end of period (groups are no longer valid)
+ - 1: start of a static period
+ - 2: start of a dynamic (live) period
+*/
+void on_period_reset(unsigned long reset_type);
+
+
+/*! Callback (optional) called when a new group (adaptation set) is created
+\param group the newly created dash group
+*/
+void on_new_group(_DASHGroup group);
+
+/*! Callback (mandatory) called at the end of the segment download to perform rate adaptation
+\param group the group on which to perform adaptation
+\param base_group the associated base group (tiling only), or None if no base group
+\param force_low_complexity indicates that the client would like a lower complexity (typically because it is dropping frames)
+\param stats the statistics for the downloaded segment
+\return value can be:
+ - new quality index,
+ - -1 to take no decision
+ - -2 to disable quality (debug, will drop segment)
+ - other negative values are handled as error
+*/
+long on_rate_adaptation(_DASHGroup group, _DASHGroup base_group, boolean force_low_complexity, _DASHGroupStatistics stats);
+
+/*! Callback (optional) called on regular basis during a segment download
+\param group the group associated with the current download
+\param stats the current statistics for the download
+\return value can be:
+ - `-1` to continue download
+ - `-2` to abort download but without retrying to downloading the same segment at lower quality
+ - the index of the new quality to download for the same segment index (same time)
+*/
+long on_download_monitor(_DASHGroup group, _DASHGroupDownloadStatistics stats);
+
+
+};
+
+
+/*! interface for custom DASH groups*/
+interface _DASHGroup 
+{
+
+/*! Index of group, as used in callbacks */
+attribute readonly idx;
+
+/*! List of _DASHQualityInfo for group*/
+attribute readonly Array qualities;
+
+/*! period duration in milliseconds, 0 if unknwon*/
+attribute readonly unsigned long duration;
+
+/*! SRD object or null if no SRD defined*/
+_DASHSRD SRD;
+};
+
+/*! interface for custom DASH groups*/
+interface _DASHQualityInfo 
+{
+
+/*! bandwidth in bits per second*/
+attribute readonly unsigned long bandwidth;
+
+/*! ID (representation ID in DASH)*/
+attribute readonly DOMString ID;
+
+/*! MIME type*/
+attribute readonly DOMString mime;
+
+/*! codec parameter string*/
+attribute readonly DOMString codec;
+
+/*! width in pixels, 0 if not visual*/
+attribute readonly unsigned long width;
+
+/*! height in pixels, 0 if not visual*/
+attribute readonly unsigned long height;
+
+/*! interlaced flag, false 0 if not visual*/
+attribute readonly boolean interlaced;
+
+/*! Frame Rate (Fraction), 0/0 if not visual*/
+attribute readonly _Fraction fps;
+
+/*! Sample Aspect Ration (Fraction), 0/0 if not visual*/
+attribute readonly _Fraction sar;
+
+/*! Samplerate, 0 if not audio*/
+attribute readonly unsigned long sample_rate;
+
+/*! Number of channels, 0 if not audio*/
+attribute readonly unsigned long nb_channels;
+
+/*! set to true if quality is disabled (no playback support)*/
+attribute readonly disabled disabled;
+
+/*! set to true if quality is selected*/
+attribute readonly boolean is_selected;
+
+/*! AST offset for DASH low latency mode, 0 otherwise*/
+attribute readonly double ast_offset;
+
+/*! Average segment duration in seconds, 0 if unknown*/
+attribute readonly double avg_duration;
+
+/*! list of segment _DASHSegmentInfo for onDemand profiles or empty otherwise*/
+attribute readonly Array sizes;
+
+};
+
+/*! segemnt size info*/
+interface _DASHSegmentInfo 
+{
+/*! segemnt size*/
+attribute readonly unsigned long long size;
+/*! segemnt duration*/
+attribute readonly unsigned long duration;
+};
+
+/*! statistics for rate adaptation*/
+interface _DASHGroupStatistics
+{
+/*! download rate of last segment in bits per second, divided by current playback speed*/
+attribute readonly unsigned long download_rate;
+
+/*! size of last segment in bytes*/
+attribute readonly unsigned long file_size;
+
+/*! current playback speed*/
+attribute readonly double speed;
+
+/*! max playback speed based on associated codec runtime statistics*/
+attribute readonly double max_available_speed;
+
+/*! display width in pixels of object*/
+attribute readonly unsigned long display_width;
+
+/*! display height in pixels of object*/
+attribute readonly unsigned long display_height;
+
+/*! index of current quality*/
+attribute readonly unsigned long active_quality_idx;
+
+/*! minimum buffer in milliseconds, below witch rebuffer occurs*/
+attribute readonly unsigned long buffer_min;
+
+/*! maximum buffer in milliseconds, algorithm should not fill more than this*/
+attribute readonly unsigned long self.buffer_max;
+
+/*! current buffer in milliseconds*/
+attribute readonly unsigned long self.buffer;
+
+/*! degradation hint, 0 means no degradation, 100 means tile completely hidden*/
+attribute readonly unsigned long self.quality_degradation_hint;
+
+/*! cumulated download rate of all active groups - 0 means all files are local*/
+attribute readonly unsigned long self.total_rate;
+
+};
+
+/*! statistics for download monitoring*/
+interface _DASHGroupStatistics
+{
+
+/*! download rate of last segment in bits per second*/
+attribute readonly unsigned long bits_per_sec;
+
+/*! total number of bytes in segment*/
+attribute readonly unsigned long total_bytes;
+
+/*! number of downloaded bytes from segment (starting from first byte)*/
+attribute readonly unsigned long long bytes_done;
+
+/*! number of microseconds elapsed since segment was scheduled for download*/
+attribute readonly unsigned longlong time_since_start;
+
+/*! current buffer length in milliseconds*/
+attribute readonly unsigned long buffer_dur;
+
+/*! duration of segment being downloaded, in milliseconds - 0 if unknown*/
+attribute readonly unsigned long current_seg_dur;
+	
+};
+
+/*! Spacial Relationship Descriptor for DASH group*/
+interface _DASHSRD
+{
+/*! X coordinate of SRD for this tile*/
+attribute readonly unsigned long x;
+
+/*! Y coordinate of SRD for this tile*/
+attribute readonly unsigned long y;
+
+/*! width of SRD for this tile - 0 for tile base track*/
+attribute readonly unsigned long w;
+
+/*! height of SRD for this tile - 0 for tile base track*/
+attribute readonly unsigned long h;
+
+/*! total width of SRD descriptor for this tile*/
+attribute readonly unsigned long fw;
+
+/*! total height of SRD descriptor for this tile*/
+attribute readonly unsigned long fh;
+	
+};
+
+
+/*! @} */
+
+
+
+/*!
+
+\defgroup fileio_grp FileIO interface
+\ingroup nodejs_grp
+\brief File IO wrapper
+
+
+FileIO allows redirecting calls to file access (open, close, read, write) to NodeJS rather than using system calls.
+
+This allows generating content in NodeJS without any disk IO, or passing NodeJS data as input to GPAC without intermediate file.
+
+See \ref GF_FileIO for more details
+
+A FileIO object is constructed from the URL to wrap and a factory object with callbacks used to access the file.
+For example, to wrap a file for input:
+\code
+//create the FileIO factory
+let factory = {
+open: function(url, mode) { ... },
+close: function() { ... },
+read: function(buffer) { ... },
+seek: function(position, whence) { ... },
+tell: function() { ... },
+eof: function() { ... }
+};
+
+//create the FileIO
+let fio = new FileIO("somefile.mp4", factory_obj);
+
+//load a source filter using this FileIO
+let src = filter_sess.load_src(fio.url);
+
+\endcode
+
+\warning All callbacks of the factory object MUST perform synchronously
+
+The URL passed to the constructor indentifies the file name wrapped.
+
+
+Some file types, such as HLS or DASH manifest, may imply reading or writing several files.
+To handle these cases, a new JS object is created for each call to open().
+
+\warning This object is an empty JS object, not a clone of the factory object (difference with Python bindings).
+
+All FileIO callbacks will be done in the main thread.
+
+
+@{
+
+*/
+
+/*! interface for customFileIO object
+*/
+interface _FileIO
+{
+
+/*! constructor for FileIO object - see \ref gf_fileio_new
+
+\param url URL to wrap, either source or destination
+\param factory factory for object creation
+\param direct_mem if true, the buffer passed to read and write callbacks is only a wrapper around GPAC internal mem and is no longer valid at the end of the call (detached). If false, the buffer passed is a copy (slower).
+
+\note For NAPI less than 7, direct_mem is forced to false.
+*/
+FileIO(DOMString url, _FileIOFactory factory, boolean direct_mem=true);
+
+/*! gfio:// url corresponding to the fileIO object. This is the URL that must be passed to filter arguments*/
+attribute readonly DOMString url;
+};
+
+
+/*! interface object for file IO*/
+interface _FileIOFactory
+{
+
+/*! open a URL
+\param URL the final URL to open
+\param mode the open mode as in \ref gf_fopen
+\param parent the parent _FileIO object
+\return true if success, false if error
+
+\note When opening a file, a new empty object is created and open is called with `this` being the new object. The object will be kept live until the file is closed.
+
+\note There is no guarantee that the URL is checked for existence before calling open
+
+\note There is no guarantee that the first call to open is on the URL provided for the constructor (e.g. for DASH generation, this will depend on the DASH profile used which may require to write the manifest after one or more segments)
+
+\warning This callback MUST be provided in the factory object
+*/
+boolean open(DOMString URL, DOMString mode, _FileIO parent);
+
+/*! close the file object
+
+\warning This callback MUST be provided in the factory object
+*/
+void close();
+
+
+/*! read the file object from its current position
+\param buffer the buffer to read
+\return the number of bytes read into the buffer
+
+This callback can be omitted for write-only files
+*/
+unsigned long read(Uint8Array buffer);
+
+/*! write the file object from its current position
+\param buffer the buffer to read
+\return the number of bytes written to file
+
+This callback can be omitted for read-only files
+*/
+unsigned long write(Uint8Array buffer);
+
+/*! seek the file object - see \ref gf_fseek
+\param position the position in the file
+\param whence the offset in the file (0: begin, 1: current position, 2: end)
+\return 0 if no error, error code otherwise
+
+\warning This callback MUST be provided in the factory object
+*/
+unsigned long seek(unsigned long long position, unsigned long whence);
+
+/*! get position in the file object - see \ref gf_ftell
+\return position in the file
+
+\warning This callback MUST be provided in the factory object
+*/
+unsigned long long tell();
+
+
+/*! check if file position is at end of file - see \ref gf_feof
+\return true if end of file is reached, false otherwise
+
+\warning This callback MUST be provided in the factory object
+*/
+boolean eof();
+
+/*! check if the given file exists - see \ref gf_file_exists
+\param URL the final URL to open
+\return true if file exists, false otherwise
+*/
+boolean exists(DOMString URL);
+
+};
+
+
+/*! @} */
+
+

gpac-1.0.1.tar.gz/share/doc/idl/webgl.idl -> gpac-2.0.0.tar.gz/share/doc/idl/webgl.idl Changed

@@ -30,7 +30,6 @@
 
 The API implements most of WebGL 1.0 context calls. What is not supported:
 - premultiplied alpha (gl.GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL & co)
-- flip (gl.UNPACK_FLIP_Y_WEBGL), this must be done in the shader
 - WebGL extensions (gl.getExtension)
 
 # WebGL Context 
@@ -46,11 +45,11 @@
 
 The WebGL API in GPAC work by default on offscreen framebuffer objects: 
 - the color attachment is always a texture object, RGBA 32 bits or RGB 24 bits (see WebGLContextAttributes)
-- the depth attachment is a renderbuffer by default and cannot be exported; this behaviour can be changed by setting the "depth" attribute of the WebGLContextAttributes object to "texture" before creation, thereby creating a depth texture attachment; the format is 24 bit precision integer (desktop) or 16 bit precision integer (iOS, Android). 
+- the depth attachment is a renderbuffer by default and cannot be exported; this behavior can be changed by setting the "depth" attribute of the WebGLContextAttributes object to "texture" before creation, thereby creating a depth texture attachment; the format is 24 bit precision integer (desktop) or 16 bit precision integer (iOS, Android). 
 
 The underlying framebuffer color texture attachment and if enabled, depth texture attachment, can be dispatched as a GPAC packet using \ref FilterPid.new_packet; this allows forwarding a framebuffer data to other filters without having to copy to system memory the framebuffer content.
 
-When forwarding a framebuffer, it is recommended not to draw anything nor activate GL context until all references of the packet holding the framebuffer are consummed. A callback function is used for that, see example below.
+When forwarding a framebuffer, it is recommended not to draw anything nor activate GL context until all references of the packet holding the framebuffer are consumed. A callback function is used for that, see example below.
 
 \note you can always use glReadPixels to read back the framebuffer and send packets using the usual FilterPacket tools.
 
@@ -395,10 +394,11 @@
 	void texImage2D(GLenum target, GLint level, GLint internalformat, GLenum format, GLenum type, FilterPacket source);
 
 	/*! creates a named texture
-	\param name the name of the texture
+ \param name the name of the texture - if `null`, generates name
+ \param vcfg video config options - if null, default are assumed (everything unspecified, no full range)
 	\return a new named texture
 	*/
-	NamedTexture createTexture(DOMString name);
+	NamedTexture createTexture(DOMString name, optional VideoColorConfig vcfg = null);
 
 	/*!
 	\param target ignored, default to gl.TEXTURE_2D
@@ -406,9 +406,15 @@
 	*/
 	void bindTexture(GLenum target, NamedTexture texture);
 
+	/*! get the name of a named texture
+	\param texture target named texture
+	\return name of texture
+	*/
+	DOMString textureName(NamedTexture texture);
+
 
 /*!
- \param use_gl_exts if true, queries all extensions supported by the underlying openGL implementation. Otherwise, queries only supported WebGL extensions (none at the moment)
+ \param use_gl_exts if true, queries all extensions supported by the underlying OpenGL implementation. Otherwise, queries only supported WebGL extensions (none at the moment)
 \return an array of strings, each entry being the name of a supported extension
 */
 sequence<DOMString>? getSupportedExtensions(optional boolean use_gl_exts=false);
@@ -416,7 +422,7 @@
 
 /*! Named texture object, see \ref webgl_grp*/
 interface NamedTexture {
-/*! number of underlying textures. This can be usefull when doing multi-texturing to get the next texture unit slot:
+/*! number of underlying textures. This can be useful when doing multi-texturing to get the next texture unit slot:
 \code
 nextActiveTexture = gl.TEXTURE0 + named_tx.nb_textures;
 \endcode
@@ -441,13 +447,23 @@
 
 };
 
+
+/*! Video color space config for named textures*/
+interface VideoColorConfig {
+/*! fullrange video flag*/
+attribute boolean fullrange;
+/*! GPAC name for CICP MatrixCoeficients, or interger value*/
+attribute DOMString matrix; 
+};
+
+
 /*! The FilterPid object is extended as follows*/
 interface FilterPid {
 
 /*! creates a new output packet using the underlying texture attachement of the context as a texture source (see GF_FilterFrameInterface).
 \warning This will throw an error if called more than once on a given context but the associated packet has not been consumed yet!
 \param gl the WebGL context used to create the packet. 
-\param on_frame_consumed a callback function notified when the associated packet has been consummed
+\param on_frame_consumed a callback function notified when the associated packet has been consumed
 \param use_depth if set, uses the depth framebuffer attachment if enabled rather than the texture. See \ref WebGLContext
 \return new packet or null with exception*/
 FilterPacket new_packet(WebGLContext gl, function on_frame_consumed, optional boolean use_depth);

gpac-1.0.1.tar.gz/share/doc/man/gpac-filters.1 -> gpac-2.0.0.tar.gz/share/doc/man/gpac-filters.1 Changed

@@ -22,7 +22,19 @@
 .br
 
 .br
-The inspect filter can be used to dump pid and packets. It may also be used to check parts of payload of the packets. The default options inspect only pid changes.
+The inspect filter can be used to dump PID and packets. It may also be used to check parts of payload of the packets.
+.br
+
+.br
+The default options inspect only PID changes.
+.br
+If .I full is not set, .I mode=frame is forced and PID properties are formatted in human-readable form, one PID per line.
+.br
+Otherwise, all properties are dumped.
+.br
+Note: specifying .I xml, .I analyze, .I fmt or using -for-test will force .I full to true.
+.br
+
 .br
 The packet inspector can be configured to dump specific properties of packets using .I fmt.
 .br
@@ -48,11 +60,11 @@
 .br
 * frame_full: complete AU
 .br
- * frame_start: begining of frame
+ * frame_start: beginning of frame
 .br
 * frame_end: end of frame
 .br
- * frame_cont: frame continuation (not begining, not end)
+ * frame_cont: frame continuation (not beginning, not end)
 .br
 * sap or rap: SAP type of the frame
 .br
@@ -68,19 +80,19 @@
 .br
 * crypt: crypt flag
 .br
-* vers: carrousel version number
+* vers: carousel version number
 .br
 * size: size of packet
 .br
-* crc: 32 bit CRC of packet
+* csize: total size of packets received so far
 .br
-* lf: insert linefeed
+* crc: 32 bit CRC of packet
 .br
-* cr: insert carriage return
+* lf or n: insert new line
 .br
 * t: insert tab
 .br
-* data: hex dump of packet ( WARNING, BIG OUTPUT !! )
+* data: hex dump of packet (big output!)
 .br
 * lp: leading picture flag
 .br
@@ -92,6 +104,12 @@
 .br
 * ck: clock type used for PCR discontinuities
 .br
+* pcr: MPEG-2 TS last PCR, n/a if not available
+.br
+* pcrd: difference between last PCR and decoding time, n/a if no PCR available
+.br
+* pcrc: difference between last PCR and composition time, n/a if no PCR available
+.br
 * P4CC: 4CC of packet property
 .br
 * PropName: Name of packet property
@@ -112,7 +130,7 @@
 .br
 
 .br
-An unrecognized keywork or missing property will resolve to an empty string.
+An unrecognized keyword or missing property will resolve to an empty string.
 .br
 
 .br
@@ -120,12 +138,10 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
-log (str, default: stderr, minmax: fileName, stderr, stdout or null): set inspect log filename
+log (str, default: stdout, minmax: fileName, stderr, stdout or null): set inspect log filename
 .br
 mode (enum, default: pck): dump mode
 .br
@@ -135,47 +151,63 @@
 .br
 * frame: force reframer
 .br
-* raw: dump source packets without demuxing
+* raw: dump source packets without demultiplexing
 .br
 
 .br
-interleave (bool, default: true): dump packets as they are received on each pid. If false, report per pid is generated
+interleave (bool, default: true): dump packets as they are received on each PID. If false, logs are reported for each PID at end of session
 .br
 deep (bool, default: false, updatable): dump packets along with PID state change, implied when .I fmt is set
 .br
-props (bool, default: true, updatable): dump packet properties, ignored when .I fmt is set (see filter help)
+props (bool, default: true, updatable): dump packet properties, ignored when .I fmt is set
 .br
-dump_data (bool, default: false, updatable): enable full data dump (WARNING heavy!), ignored when .I fmt is set (see filter help)
+dump_data (bool, default: false, updatable): enable full data dump (very large output), ignored when .I fmt is set
 .br
-fmt (str, updatable): set packet dump format (see filter help)
+fmt (str, updatable): set packet dump format
 .br
-hdr (bool, default: true): print a header corresponding to fmt string without '$ 'or "pid."
+hdr (bool, default: true): print a header corresponding to fmt string without '$' or "pid"
 .br
-allp (bool, default: false): analyse for the entire duration, rather than stoping when all pids are found
+allp (bool, default: false): analyse for the entire duration, rather than stopping when all PIDs are found
 .br
 info (bool, default: false, updatable): monitor PID info changes
 .br
+full (bool, default: false, updatable): full dump of PID properties (always on if XML)
+.br
 pcr (bool, default: false, updatable): dump M2TS PCR info
 .br
-speed (dbl, default: 1.0): set playback command speed. If speed is negative and start is 0, start is set to -1
+speed (dbl, default: 1.0): set playback command speed. If negative and start is 0, start is set to -1
 .br
-start (dbl, default: 0.0): set playback start offset. Negative value means percent of media dur with -1 <=> dur
+start (dbl, default: 0.0): set playback start offset. A negative value means percent of media duration with -1 equal to duration
 .br
 dur (frac, default: 0/0): set inspect duration
 .br
-analyze (bool, default: false, updatable): analyze sample content (NALU, OBU)
+analyze (enum, default: off, updatable): analyze sample content (NALU, OBU)
+.br
+* off: no analyzing
+.br
+* on: simple analyzing
+.br
+* bs: log bitstream syntax (all elements read from bitstream)
+.br
+* full: log bitstream syntax and bit sizes signaled as (N) after field value, except 1-bit fields (omitted)
+.br
+
 .br
 xml (bool, default: false, updatable): use xml formatting (implied if (-analyze]() is set) and disable .I fmt
 .br
+crc (bool, default: false, updatable): dump crc of samples of subsamples (NALU or OBU) when analyzing
+.br
 fftmcd (bool, default: false, updatable): consider timecodes use ffmpeg-compatible signaling rather than QT compliant one
 .br
 dtype (bool, default: false, updatable): dump property type
 .br
+buffer (uint, default: 0): set buffer in ms (mostly used for testing DASH algo)
+.br
 test (enum, default: no, updatable): skip predefined set of properties, used for test mode
 .br
 * no: no properties skipped
 .br
-* noprop: all properties/info changes on pid are skipped, only packets are dumped
+* noprop: all properties/info changes on PID are skipped, only packets are dumped
 .br
 * network: URL/path dump, cache state, file size properties skipped (used for hashing network results)
 .br
@@ -185,6 +217,10 @@
 .br
 * encx: same as encode and skip bitrates, media data size and co
 .br
+* nocrc: disable packet CRC dump
+.br
+* nobr: skip bitrate
+.br
 
 .br
 
@@ -196,76 +232,20 @@
 .br
 
 .br
-The Probe filter is used by applications (typically MP4Box) to query demuxed pids available in a source chain.
-.br
-The filter does not produce any output nor feedback, it is up to the app developper to query input pids of the prober and take appropriated decisions.
+The Probe filter is used by applications (typically MP4Box) to query demultiplexed PIDs (audio, video, ...) available in a source chain.
 .br
 
 .br
-.SH Options (expert):
-.LP
-.br
-log (str, default: stderr, minmax: fileName, stderr, stdout or null): set inspect log filename
-.br
-mode (enum, default: pck): dump mode
-.br
-* pck: dump full packet
-.br
-* blk: dump packets before reconstruction
-.br
-* frame: force reframer
+The filter outputs the number of input PIDs in the file specified by .I log.
 .br
-* raw: dump source packets without demuxing
+It is up to the app developer to query input PIDs of the prober and take appropriated decisions.
 .br
 
 .br
-interleave (bool, default: true): dump packets as they are received on each pid. If false, report per pid is generated
-.br
-deep (bool, default: false, updatable): dump packets along with PID state change, implied when .I fmt is set
-.br
-props (bool, default: true, updatable): dump packet properties, ignored when .I fmt is set (see filter help)
-.br
-dump_data (bool, default: false, updatable): enable full data dump (WARNING heavy!), ignored when .I fmt is set (see filter help)
-.br
-fmt (str, updatable): set packet dump format (see filter help)
-.br
-hdr (bool, default: true): print a header corresponding to fmt string without '$ 'or "pid."
-.br
-allp (bool, default: false): analyse for the entire duration, rather than stoping when all pids are found
-.br
-info (bool, default: false, updatable): monitor PID info changes
-.br
-pcr (bool, default: false, updatable): dump M2TS PCR info
-.br
-speed (dbl, default: 1.0): set playback command speed. If speed is negative and start is 0, start is set to -1
-.br
-start (dbl, default: 0.0): set playback start offset. Negative value means percent of media dur with -1 <=> dur
-.br
-dur (frac, default: 0/0): set inspect duration
-.br
-analyze (bool, default: false, updatable): analyze sample content (NALU, OBU)
-.br
-xml (bool, default: false, updatable): use xml formatting (implied if (-analyze]() is set) and disable .I fmt
-.br
-fftmcd (bool, default: false, updatable): consider timecodes use ffmpeg-compatible signaling rather than QT compliant one
-.br
-dtype (bool, default: false, updatable): dump property type
-.br
-test (enum, default: no, updatable): skip predefined set of properties, used for test mode
-.br
-* no: no properties skipped
-.br
-* noprop: all properties/info changes on pid are skipped, only packets are dumped
-.br
-* network: URL/path dump, cache state, file size properties skipped (used for hashing network results)
-.br
-* netx: same as network but skip track duration and templates (used for hashing progressive load of fmp4)
-.br
-* encode: same as network plus skip decoder config (used for hashing encoding results)
-.br
-* encx: same as encode and skip bitrates, media data size and co
+.SH Options (expert):
+.LP
 .br
-
+log (str, default: stdout, minmax: fileName, stderr, stdout or null): set probe log filename to print number of streams
 .br
 
 .br
@@ -287,7 +267,7 @@
 .br
 In this mode, the compositor acts as a pseudo-sink for the video side and creates its own output window.
 .br
-The video frames are dispatched to the output video pid in the form of frame pointers requiring later GPU read if used.
+The video frames are dispatched to the output video PID in the form of frame pointers requiring later GPU read if used.
 .br
 The audio part acts as a regular filter, potentially mixing and resampling the audio inputs to generate its output.
 .br
@@ -300,19 +280,19 @@
 .br
 In this mode, the compositor acts as a regular filter generating frames based on the loaded scene.
 .br
-It will generate its outputs based on the input video frames and will not process any user event.
+It will generate its outputs based on the input video frames, and will process user event sent by consuming filter(s).
 .br
 If no input video frames (e.g. pure BIFS / SVG / VRML), the filter will generate frames based on the .I fps, at constant or variable frame rate.
 .br
 It will stop generating frames as soon as all input streams are done, unless extended/reduced by .I dur.
 .br
-If audio streams are loaded, an audio output pid is created.
+If audio streams are loaded, an audio output PID is created.
 .br
 
 .br
 The default output pixel format in filter mode is:
 .br
-- rgb when the filter is explictly loaded by the application
+- rgb when the filter is explicitly loaded by the application
 .br
 - rgba when the filter is loaded during a link resolution
 .br
@@ -322,9 +302,9 @@
 .br
 In filter-only mode, the special URL gpid:// is used to locate PIDs in the scene description, in order to design scenes independently from source media.
 .br
-When such a pid is associated to a Background2D node in BIFS (no SVG mapping yet), the compositor operates in passthrough mode.
+When such a PID is associated to a Background2D node in BIFS (no SVG mapping yet), the compositor operates in pass-through mode.
 .br
-In this mode, only new input frames on the passthrough pid will generate new frames, and the scene clock matches the input packet time.
+In this mode, only new input frames on the pass-through PID will generate new frames, and the scene clock matches the input packet time.
 .br
 The output size and pixel format will be set to the input size and pixel format, unless specified otherwise in the filter options.
 .br
@@ -332,7 +312,7 @@
 .br
 If only 2D graphics are used and display driver is not forced, 2D rasterizer will happen in the output pixel format (including YUV pixel formats).
 .br
-In this case, inplace processing (rasterizing over the input frame data) will be used whenever allowed by input data.
+In this case, in-place processing (rasterizing over the input frame data) will be used whenever allowed by input data.
 .br
 
 .br
@@ -343,11 +323,39 @@
 .SH Specific URL syntaxes
 .LP
 .br
-The compositor accepts any URL type supported by GPAC. It also accepts the following syntaxes for URLs:
+The compositor accepts any URL type supported by GPAC. It also accepts the following schemes for URLs:
+.br
+* views:// : creates an auto-stereo scene of N views from views://v1::.::vN
+.br
+* mosaic:// : creates a mosaic of N views from mosaic://v1::.::vN
+.br
+
+.br
+For both syntaxes, vN can be any type of URL supported by GPAC.
+.br
+For views:// syntax, the number of rendered views is set by .I nbviews:
+.br
+- If the URL gives less views than rendered, the views will be repeated
+.br
+- If the URL gives more views than rendered, the extra views will be ignored
+.br
+
+.br
+The compositor can act as a source filter when the .I src option is explicitly set, independently from the operating mode:
+.br
+Example
+.br
+gpac compositor:src=source.mp4 vout
+.br
+
+.br
+
+.br
+The compositor can act as a source filter when the source url uses one of the compositor built-in protocol schemes:
 .br
-* views: creates an auto-stereo scene of N views from views://v1:.:vN. vN can be any type of URL supported by GPAC.
+Example
 .br
-* mosaic: creates a mosaic of N views from mosaic://v1:.:vN. vN can be any type of URL supported by GPAC.
+gpac -i mosaic://URL1:URL2 vout
 .br
 
 .br
@@ -376,9 +384,9 @@
 .br
 bc (uint, default: 0, updatable): default background color to use when displaying transparent images or video with no scene composition instructions
 .br
-yuvhw (bool, default: true, updatable): enable YUV hardware for 2D blits
+yuvhw (bool, default: true, updatable): enable YUV hardware for 2D blit
 .br
-blitp (bool, default: true, updatable): partial hardware blits (if not set, will force more redraw)
+blitp (bool, default: true, updatable): partial hardware blit. If not set, will force more redraw
 .br
 softblt (bool, default: true): enable software blit/stretch in 2D. If disabled, vector graphics rasterizer will always be used
 .br
@@ -390,9 +398,9 @@
 .br
 * no: disable bounding box
 .br
-* box: draws a rectangle (2D) or box (3D mode)
+* box: draws a rectangle (2D) or box (3D)
 .br
-* aabb: draws axis-aligned bounding-box tree (3D only)
+* aabb: draws axis-aligned bounding-box tree (3D) or rectangle (2D)
 .br
 
 .br
@@ -408,7 +416,7 @@
 .br
 out8b (bool, default: false, updatable): convert 10-bit video to 8 bit texture before GPU upload
 .br
-drop (bool, default: false, updatable): drop late frame when drawing. By default frames are not droped until a heavy desync of 1 sec is observed
+drop (bool, default: false, updatable): drop late frame when drawing. If not set, frames are not dropped until a desynchronization of 1 second or more is observed
 .br
 sclock (bool, default: false, updatable): force synchronizing all streams on a single clock
 .br
@@ -416,15 +424,15 @@
 .br
 ckey (uint, default: 0, updatable): color key to use in windowless mode (0xFFRRGGBB). GPAC currently does not support true alpha blitting to desktop due to limitations in most windowing toolkit, it therefore uses color keying mechanism. The alpha part of the key is used for global transparency of the output, if supported
 .br
-timeout (uint, default: 10000, updatable): timeout in ms after which a source is considered dead
+timeout (uint, default: 10000, updatable): timeout in ms after which a source is considered dead (0 disable timeout)
 .br
 fps (frac, default: 30/1, updatable): simulation frame rate when animation-only sources are played (ignored when video is present)
 .br
-timescale (uint, default: 0, updatable): timescale used for output packets when no input video pid. A value of 0 means fps numerator
+timescale (uint, default: 0, updatable): timescale used for output packets when no input video PID. A value of 0 means fps numerator
 .br
-autofps (bool, default: true): use video input fps for output. If no video or not set, uses .I fps. Ignored in player mode
+autofps (bool, default: true): use video input fps for output, ignored in player mode. If no video or not set, uses .I fps
 .br
-vfr (bool, default: false): only emit frames when changes are detected. Always true in player mode and when filter is dynamically loaded
+vfr (bool, default: false): only emit frames when changes are detected. (always true in player mode and when filter is dynamically loaded)
 .br
 dur (dbl, default: 0, updatable): duration of generation. Mostly used when no video input is present. Negative values mean number of frames, positive values duration in second, 0 stops as soon as all streams are done
 .br
@@ -432,29 +440,29 @@
 .br
 mode2d (enum, default: defer, updatable): specify whether immediate drawing should be used or not
 .br
-* immediate: the screen is completely redrawn at each frame (always on if passthrough mode is detected)
+* immediate: the screen is completely redrawn at each frame (always on if pass-through mode is detected)
 .br
 * defer: object positioning is tracked from frame to frame and dirty rectangles info is collected in order to redraw the minimal amount of the screen buffer
 .br
-* debug: only renders changed areas, reseting other areas
+* debug: only renders changed areas, resetting other areas
 .br
 Whether the setting is applied or not depends on the graphics module and player mode
 .br
 
 .br
-amc (bool, default: true): audio multichannel support; if disabled always downmix to stereo. Useful if the multichannel output does not work properly
+amc (bool, default: true): audio multichannel support; if disabled always down-mix to stereo. Useful if the multichannel output does not work properly
 .br
-asr (uint, default: 0): force output sample rate - 0 for auto
+asr (uint, default: 0): force output sample rate (0 for auto)
 .br
-ach (uint, default: 0): force output channels - 0 for auto
+ach (uint, default: 0): force output channels (0 for auto)
 .br
-alayout (uint, default: 0): force output channel layout - 0 for auto
+alayout (uint, default: 0): force output channel layout (0 for auto)
 .br
-afmt (afmt, default: s16, minmax: none,u8,s16,s24,s32,flt,dbl,u8p,s16p,s24p,s32p,fltp,dblp): force output channel format - 0 for auto
+afmt (afmt, default: s16, minmax: none,u8,s16,s16b,s24,s32,flt,dbl,u8p,s16p,s24p,s32p,fltp,dblp): force output channel format (0 for auto)
 .br
 asize (uint, default: 1024): audio output packet size in samples
 .br
-abuf (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
+abuf (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
 .br
 avol (uint, default: 100, updatable): audio volume in percent
 .br
@@ -462,25 +470,25 @@
 .br
 async (bool, default: true, updatable): audio resynchronization; if disabled, audio data is never dropped but may get out of sync
 .br
-max_aspeed (dbl, default: 2.0, updatable): silence audio if playback speed is greater than sepcified value
+max_aspeed (dbl, default: 2.0, updatable): silence audio if playback speed is greater than specified value
 .br
-max_vspeed (dbl, default: 4.0, updatable): move to i-frame only decoding if playback speed is greater than sepcified value
+max_vspeed (dbl, default: 4.0, updatable): move to i-frame only decoding if playback speed is greater than specified value
 .br
-buf (uint, default: 3000, updatable): playout buffer in ms. overridden by BufferLenth property of input pid
+buffer (uint, default: 3000, updatable): playout buffer in ms (overridden by BufferLength property of input PID)
 .br
-rbuf (uint, default: 1000, updatable): rebuffer trigger in ms. overridden by RebufferLenth property of input pid
+rbuffer (uint, default: 1000, updatable): rebuffer trigger in ms (overridden by RebufferLength property of input PID)
 .br
-mbuf (uint, default: 3000, updatable): max buffer in ms (must be greater than playout buffer). overridden by BufferMaxOccupancy property of input pid
+mbuffer (uint, default: 3000, updatable): max buffer in ms, must be greater than playout buffer (overridden by BufferMaxOccupancy property of input PID)
 .br
 ntpsync (uint, default: 0, updatable): ntp resync threshold in ms (drops frame if their NTP is more than the given threshold above local ntp), 0 disables ntp drop
 .br
 nojs (bool, default: false): disable javascript
 .br
-noback (bool, default: false): ignore background nodes and viewport fill (usefull when dumping to PNG)
+noback (bool, default: false): ignore background nodes and viewport fill (useful when dumping to PNG)
 .br
 ogl (enum, default: auto, updatable): specify 2D rendering mode
 .br
-* auto: automatically decides betwwen on, off and hybrid based on content
+* auto: automatically decides between on, off and hybrid based on content
 .br
 * off: disables OpenGL; 3D will not be rendered
 .br
@@ -500,7 +508,7 @@
 .br
 * fly: 3D world fly (no ground detection)
 .br
-* pan: 2D/3D world zomm/pan
+* pan: 2D/3D world zoom/pan
 .br
 * game: 3D world game (mouse gives walk direction)
 .br
@@ -516,12 +524,14 @@
 .br
 linegl (bool, default: false, updatable): indicate that outlining shall be done through OpenGL pen width rather than vectorial outlining
 .br
-epow2 (bool, default: true, updatable): emulate power-of-2 textures for openGL (old hardware). Ignored if OpenGL rectangular texture extension is enabled
+epow2 (bool, default: true, updatable): emulate power-of-2 textures for OpenGL (old hardware). Ignored if OpenGL rectangular texture extension is enabled
 .br
 * yes: video texture is not resized but emulated with padding. This usually speeds up video mapping on shapes but disables texture transformations
 .br
 * no: video is resized to a power of 2 texture when mapping to a shape
 .br
+
+.br
 paa (bool, default: false, updatable): indicate whether polygon antialiasing should be used in full antialiasing mode. If not set, only lines and points antialiasing are used
 .br
 bcull (enum, default: on, updatable): indicate whether backface culling shall be disable or not
@@ -574,6 +584,8 @@
 .br
 stereo (enum, default: none, updatable): stereo output type. If your graphic card does not support OpenGL shaders, only top and side modes will be available
 .br
+* none: no stereo
+.br
 * side: images are displayed side by side from left to right
 .br
 * top: images are displayed from top (laft view) to bottom (right view)
@@ -618,15 +630,25 @@
 .br
 
 .br
-iod (flt, default: 6.4, updatable): inter-occular distance (eye separation) in cm (distance between the cameras). 
+iod (flt, default: 6.4, updatable): inter-ocular distance (eye separation) in cm (distance between the cameras). 
 .br
 rview (bool, default: false, updatable): reverse view order
 .br
-tvtn (uint, default: 30, updatable): number of point sampling for tile visibility algo
+dbgpack (bool, default: false, updatable): view packed stereo video as single image (show all)
+.br
+tvtn (uint, default: 30, updatable): number of point sampling for tile visibility algorithm
+.br
+tvtt (uint, default: 8, updatable): number of points above which the tile is considered visible
 .br
-tvtt (uint, default: 0, updatable): number of points above which the tile is considered visible
+tvtd (enum, default: off, updatable): debug tiles and full coverage SRD
 .br
-tvtd (bool, default: false, updatable): disable the tile having full coverage of the SRD, only displaying partial tiles
+* off: regular draw
+.br
+* partial: only displaying partial tiles, not the full sphere video
+.br
+* full: only display the full sphere video
+.br
+
 .br
 tvtf (bool, default: false, updatable): force all tiles to be considered visible, regardless of viewpoint
 .br
@@ -636,7 +658,7 @@
 .br
 fragshader (str): path to fragment shader file
 .br
-autocal (bool, default: false, updatable): auto callibration of znear/zfar in depth rendering mode
+autocal (bool, default: false, updatable): auto calibration of znear/zfar in depth rendering mode
 .br
 dispdepth (sint, default: -1, updatable): display depth, negative value uses default screen height
 .br
@@ -650,7 +672,7 @@
 .br
 dbgpvr (flt, default: 0, updatable): debug scene used by PVR addon
 .br
-player (enum, default: no): set compositor in player mode, see filter help
+player (enum, default: no): set compositor in player mode
 .br
 * no: regular mode
 .br
@@ -662,28 +684,38 @@
 .br
 noaudio (bool, default: false): disable audio output
 .br
-opfmt (pfmt, default: none, minmax: none,yuv420,yuv420_10,yuv422,yuv422_10,yuv444,yuv444_10,uyvy,vyuy,yuyv,yvyu,nv12,nv21,nv1l,nv2l,yuva,yuvd,yuv444a,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,rgbs,rgbas): pixel format to use for output. Ignored in .I player mode
+opfmt (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,yuv444ap,yuv444p_10,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,rgbs,rgbas): pixel format to use for output. Ignored in .I player mode
 .br
-drv (enum, default: auto): indicate if graphics driver should be used. Ignored in player mode
+drv (enum, default: auto): indicate if graphics driver should be used
 .br
-* no: never loads a graphics driver (software blitting used, no 3D possible)
+* no: never loads a graphics driver, software blit is used, no 3D possible (in player mode, disables OpenGL)
 .br
-* yes: always loads a graphics driver. Output pixel format will be RGB
+* yes: always loads a graphics driver, output pixel format will be RGB (in player mode, same as auto)
 .br
 * auto: decides based on the loaded content
 .br
 
 .br
+src (cstr): URL of source content
+.br
+gaze_x (sint, default: 0, updatable): horizontal gaze coordinate (0=left, width=right)
+.br
+gaze_y (sint, default: 0, updatable): vertical gaze coordinate (0=top, height=bottom)
+.br
+gazer_enabled (bool, default: false, updatable): enable gaze event dispatch
+.br
 
 .br
 .SH mp4dmx
 .LP
 .br
-Description: ISOBMFF/QT demuxer
+Description: ISOBMFF/QT demultiplexer
 .br
 
 .br
-This filter demultiplexes ISOBMF and QT files (regular or fragmented).
+This filter demultiplexes ISOBMF and QT files.
+.br
+Input ISOBMFF/QT can be regular or fragmented, and available as files or as raw bytestream.
 .br
 .SH Track Selection
 .LP
@@ -715,7 +747,7 @@
 .br
 * smode=single: resolves all extractors to extract a single bitstream from a scalable set. The highest level is used
 .br
-In this mode, there is no enhancement decoder config, only a base one resulting from the merge of the configs
+In this mode, there is no enhancement decoder config, only a base one resulting from the merge of the layers configurations
 .br
 * smode=split: all extractors are removed and every track of the scalable set is declared. In this mode, each enhancement track has no base decoder config
 .br
@@ -729,14 +761,12 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
-src (cstr): location of source content
+src (cstr): local file name of source content (only used when explicitly loading the filter)
 .br
-allt (bool, default: false): load all tracks even if unknown
+allt (bool, default: false): load all tracks even if unknown media type
 .br
 noedit (bool, default: false): do not use edit lists
 .br
@@ -754,15 +784,17 @@
 .br
 
 .br
-alltk (bool, default: false): declare all tracks even disabled ones
+alltk (bool, default: false): declare disabled tracks
 .br
 frame_size (uint, default: 1024): frame size for raw audio samples (dispatches frame_size samples per packet)
 .br
-expart (bool, default: false): expose cover art as a dedicated video pid
+expart (bool, default: false): expose cover art as a dedicated video PID
 .br
 sigfrag (bool, default: false): signal fragment and segment boundaries of source on output packets
 .br
-tkid (str): declare only track based on given param- integer value: declares track with the given ID
+tkid (str): declare only track based on given param
+.br
+* integer value: declares track with the given ID
 .br
 * audio: declares first audio track
 .br
@@ -770,18 +802,32 @@
 .br
 * 4CC: declares first track with matching 4CC for handler type
 .br
-stsd (uint, default: 0): only extract sample mapped to the given sample desciption index. 0 means no filter
+
+.br
+stsd (uint, default: 0): only extract sample mapped to the given sample description index (0 means extract all)
 .br
 nocrypt (bool): signal encrypted tracks as non encrypted (mostly used for export)
 .br
-mstore_size (uint, default: 1000000): target buffer size in bytes
+mstore_size (uint, default: 1000000): target buffer size in bytes when reading from memory stream (pipe etc...)
 .br
-mstore_purge (uint, default: 50000): minimum size in bytes between memory purges when reading from memory stream (pipe etc...), 0 means purge as soon as possible
+mstore_purge (uint, default: 50000): minimum size in bytes between memory purges when reading from memory stream, 0 means purge as soon as possible
 .br
 mstore_samples (uint, default: 50): minimum number of samples to be present before purging sample tables when reading from memory stream (pipe etc...), 0 means purge as soon as possible
 .br
 strtxt (bool, default: false): load text tracks (apple/tx3g) as MPEG-4 streaming text tracks
 .br
+xps_check (enum, default: auto): parameter sets extraction mode from AVC/HEVC/VVC samples
+.br
+* keep: do not inspect sample (assumes input file is compliant when generating DASH/HLS/CMAF)
+.br
+* rem: removes all inband xPS and notify configuration changes accordingly
+.br
+* auto: resolves to keep for smode=splix (dasher mode), rem otherwise
+.br
+
+.br
+nodata (bool, default: false): do not load sample data
+.br
 
 .br
 .SH bifsdec
@@ -791,7 +837,9 @@
 .br
 
 .br
-This filter decodes MPEG-4 BIFS frames directly into the scene graph of the compositor. It cannot be used to dump BIFS content.
+This filter decodes MPEG-4 BIFS binary frames directly into the scene graph of the compositor.
+.br
+Note: This filter cannot be used to dump BIFS content to text or xml, use MP4Box for that.
 .br
 
 .br
@@ -806,7 +854,9 @@
 .br
 
 .br
-This filter decodes MPEG-4 OD frames directly into the scene manager of the compositor. It cannot be used to dump OD content.
+This filter decodes MPEG-4 OD binary frames directly into the scene manager of the compositor.
+.br
+Note: This filter cannot be used to dump OD content to text or xml, use MP4Box for that.
 .br
 
 .br
@@ -833,7 +883,7 @@
 .br
 The special file name rand is used to generate random data.
 .br
-The special file name randsc is used to generate random data with fake startcodes (0x000001).
+The special file name randsc is used to generate random data with 0x000001 start-code prefix.
 .br
 
 .br
@@ -841,12 +891,10 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
-src (cstr): location of source content
+src (cstr): location of source file
 .br
 block_size (uint, default: 0): block size used to read file. 0 means 5000 if file less than 500m, 1M otherwise
 .br
@@ -865,16 +913,18 @@
 .br
 
 .br
-This filter parses MPEG-4 BIFS (BT and XMT), VRML97 and X3D (wrl and XML) files directly into the scene graph of the compositor. It cannot be used to dump content.
+This filter parses MPEG-4 BIFS (BT and XMT), VRML97 and X3D (wrl and XML) files directly into the scene graph of the compositor.
+.br
+
+.br
+When .I sax_dur=N is set, the filter will do a progressive load of the source and cancel current loading when processing time is higher than N.
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-progressive (bool, default: false): enable progressive loading
-.br
-sax_dur (uint, default: 1000): loading duration for SAX parsing (XMT), 0 disables SAX parsing
+sax_dur (uint, default: 0): duration for SAX parsing (XMT), 0 disables SAX parsing
 .br
 
 .br
@@ -898,7 +948,7 @@
 .SH Options (expert):
 .LP
 .br
-src (cstr): location of source content
+src (cstr): URL of source content
 .br
 block_size (uint, default: 100000): block size used to read file
 .br
@@ -910,8 +960,12 @@
 .br
 * mem: stores to memory, discard once session is no longer used
 .br
+* mem_keep: stores to memory, keep after session is reassigned but move to mem after first download
+.br
 * none: no cache
 .br
+* none_keep: stores to memory, keep after session is reassigned but move to none after first download
+.br
 
 .br
 range (lfrac, default: 0-0): set byte range, as fraction
@@ -929,7 +983,11 @@
 .br
 
 .br
-This filter parses SVG files directly into the scene graph of the compositor. It cannot be used to dump content.
+This filter parses SVG files directly into the scene graph of the compositor.
+.br
+
+.br
+When .I sax_dur=N is set, the filter will do a progressive load of the source and cancel current loading when processing time is higher than N.
 .br
 
 .br
@@ -951,8 +1009,7 @@
 .br
 
 .br
-.SH Options (expert):
-.LP
+No options
 .br
 
 .br
@@ -1011,7 +1068,9 @@
 .br
 
 .br
-expart (bool, default: false): expose pictures as a dedicated video pid
+expart (bool, default: false): expose pictures as a dedicated video PID
+.br
+aacchcfg (sint, default: 0): set AAC channel configuration to this value if missing from ADTS header, use negative value to always override
 .br
 
 .br
@@ -1051,7 +1110,9 @@
 .br
 index (dbl, default: 1.0): indexing window length
 .br
-expart (bool, default: false): expose pictures as a dedicated video pid
+expart (bool, default: false): expose pictures as a dedicated video PID
+.br
+forcemp3 (bool, default: true): force mp3 signaling for MPEG-2 Audio layer 3
 .br
 
 .br
@@ -1182,7 +1243,7 @@
 .SH oggdmx
 .LP
 .br
-Description: OGG demuxer
+Description: OGG demultiplexer
 .br
 
 .br
@@ -1193,7 +1254,9 @@
 .SH Options (expert):
 .LP
 .br
-index (dbl, default: 1.0): indexing window length (unimplemented, only 0 disables stream probing for duration), 
+index (dbl, default: 1.0): indexing window length (not implemented), use 0 to disable stream probing for duration), 
+.br
+expart (bool, default: false): expose pictures as a dedicated video PID
 .br
 
 .br
@@ -1230,7 +1293,7 @@
 .SH m2tsdmx
 .LP
 .br
-Description: MPEG-2 TS demuxer
+Description: MPEG-2 TS demultiplexer
 .br
 
 .br
@@ -1247,6 +1310,8 @@
 .br
 seeksrc (bool, default: true): seek local source file back to origin once all programs are setup
 .br
+sigfrag (bool, default: false): signal segment boundaries on output packets for DASH or HLS sources
+.br
 
 .br
 .SH sockin
@@ -1274,18 +1339,24 @@
 .br
 
 .br
-On OSX with VM packet replay you will need to force multicast routing, eg: route add -net 239.255.1.4/32 -interface vboxnet0
+When ports are specified in the URL and the default option separators are used (see gpac -h doc), the URL must either:
+.br
+- have a trailing '/', e.g. udp://localhost:1234/[:opts]
+.br
+- use gpac separator, e.g. udp://localhost:1234[:gpac:opts]
+.br
+
+.br
+On OSX with VM packet replay you will need to force multicast routing, e.g. route add -net 239.255.1.4/32 -interface vboxnet0
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-src (cstr): location of source content
-.br
-block_size (uint, default: 10000): block size used to read socket
+src (cstr): address of source content
 .br
-sockbuf (uint, default: 65536): socket max buffer size
+block_size (uint, default: 0x60000): block size used to read socket
 .br
 port (uint, default: 1234): default port if not specified
 .br
@@ -1305,7 +1376,7 @@
 .br
 block (bool, default: false): set blocking mode for socket(s)
 .br
-timeout (uint, default: 5000): set timeout in ms for UDP socket(s)
+timeout (uint, default: 10000): set timeout in ms for UDP socket(s), 0 to disable timeout
 .br
 reorder_pck (uint, default: 100): number of packets delay for RTP reordering (M2TS over RTP) 
 .br
@@ -1322,12 +1393,20 @@
 .br
 Experimental DVB support for linux, requires a channel config file through .I chcfg
 .br
+ 
+.br
+The URL syntax is dvb://CHANNAME[@FRONTEND], with:
+.br
+ * CHANNAME: the channel name as listed in the channel config file
+.br
+ * frontend: the index of the DVB adapter to use (optional, default is 0)
+.br
 
 .br
 .SH Options (expert):
 .LP
 .br
-src (cstr): location of source content
+src (cstr): URL of source content
 .br
 block_size (uint, default: 65536): block size used to read file
 .br
@@ -1357,7 +1436,7 @@
 .br
 
 .br
-This filter decodes MPEG-2, H263, AVC|H264 and HEVC streams through VideoToolBox. It allows GPU frame dispatch or direct frame copy.
+This filter decodes video streams through OSX/iOS VideoToolBox (MPEG-2, H263, AVC|H264, HEVC, ProRes). It allows GPU frame dispatch or direct frame copy.
 .br
 
 .br
@@ -1366,9 +1445,9 @@
 .br
 reorder (uint, default: 6): number of frames to wait for temporal re-ordering
 .br
-no_copy (bool, default: true): dispatch VTB frames into filter chain (no copy)
+no_copy (bool, default: true): dispatch decoded frames as OpenGL textures (true) or as copied packets (false) 
 .br
-ofmt (pfmt, default: nv12): set default pixel format for decoded video. If not matched default to nv12
+ofmt (pfmt, default: nv12): set default pixel format for decoded video. If not found, fall back to nv12
 .br
 disable_hw (bool, default: false): disable hardware decoding
 .br
@@ -1399,7 +1478,9 @@
 .br
 
 .br
-This filter decodes MPEG-4 LASeR frames directly into the scene graph of the compositor. It cannot be used to dump LASeR content.
+This filter decodes MPEG-4 LASeR binary frames directly into the scene graph of the compositor.
+.br
+Note: This filter cannot be used to dump LASeR content to text or xml, use MP4Box for that.
 .br
 
 .br
@@ -1410,7 +1491,7 @@
 .SH safdmx
 .LP
 .br
-Description: SAF demuxer
+Description: SAF demultiplexer
 .br
 
 .br
@@ -1429,32 +1510,181 @@
 .br
 
 .br
-This filter reads MPEG-DASH, HLS and MS Smooth (on demand only for now) manifests and produces media PIDs and frames.
+This filter reads MPEG-DASH, HLS and MS Smooth manifests.
+.br
+
+.br
+.SH Regular mode
+.LP
+.br
+This is the default mode, in which the filter produces media PIDs and frames from sources indicated in the manifest.
+.br
+The default behavior is to perform adaptation according to .I algo, but the filter can:
+.br
+- run with no adaptation, to grab maximum quality.
+.br
+Example
+.br
+gpac -i MANIFEST_URL:algo=none:start_with=max_bw -o dest.mp4
+.br
+
+.br
+- run with no adaptation, fetching all qualities.
+.br
+Example
+.br
+gpac -i MANIFEST_URL:split_as -o dst=$File$.mp4:clone
+.br
+
+.br
+
+.br
+.SH File mode
+.LP
+.br
+When .I forward is set to file, the client forwards media files without demultiplexing them.
+.br
+This is mostly used to expose the DASH session to a file server such as ROUTE or HTTP.
+.br
+In this mode, the manifest is forwarded as an output PID.
+.br
+Warning: This mode cannot be set through inheritance as it changes the link capabilities of the filter. The filter MUST be explicitly declared.
+.br
+
+.br
+To expose a live DASH session to route:
+.br
+Example
+.br
+gpac -i MANIFEST_URL dashin:forward=file -o route://225.0.0.1:8000/
+.br
+
+.br
+
+.br
+Note: This mode used to be trigger by .I filemode option, still recognized.
+.br
+
+.br
+If the source has dependent media streams (scalability) and all qualities and initialization segments need to be forwarded, add .I split_as.
+.br
+
+.br
+.SH Segment bound modes
+.LP
+.br
+When .I forward is set to segb or mani, the client forwards media frames (after demultiplexing) together with segment and fragment boundaries of source files.
+.br
+
+.br
+This mode can be used to process media data and regenerate the same manifest/segmentation.
+.br
+
+.br
+Example
+.br
+gpac -i MANIFEST_URL:forward=mani cecrypt:cfile=DRM.xml -o encrypted/live.mpd:pssh=mv
+.br
+
+.br
+This will encrypt an existing DASH session, inject PSSH in manifest and segments.
+.br
+
+.br
+Example
+.br
+gpac -i MANIFEST_URL:forward=segb cecrypt:cfile=DRM.xml -o encrypted/live.m3u8
+.br
+
+.br
+This will encrypt an existing DASH session and republish it as HLS, using same segment names and boundaries.
+.br
+
+.br
+This mode will force .I noseek=true to ensure the first segment fetched is complete, and .I split_as=true to fetch all qualities.
+.br
+
+.br
+Each first packet of a segment will have the following properties attached:
+.br
+* `CueStart`: indicate this is a segment start
+.br
+* `FileNumber`: current segment number
+.br
+* `FileName`: current segment file name without manifest base url
+.br
+* `DFPStart`: set with value 0 if this is the first packet in the period, absent otherwise
+.br
+
+.br
+If .I forward is set to mani, the first packet of a segment dispatched after a manifest update will also carry the manifest payload as a property:
+.br
+* `DFManifest`: contains main manifest (MPD, M3U8 master)
+.br
+* `DFVariant`: contains list of HLS child playlists as strings for the given quality
+.br
+* `DFVariantName`: contains list of associated HLS child playlists name, in same order as manifests in DFVariant
+.br
+
+.br
+Each output PID will have the following properties assigned:
+.br
+* `DFMode`: set to 1 for segb or 2 for mani
+.br
+* `DCue`: set to inband
+.br
+* `DFPStart`: set to current period start value
+.br
+* `FileName`: set to associated init segment if any
+.br
+* `Representation`: set to the associated representation ID in the manifest
+.br
+* `DashDur`: set to the average segment duration as indicated in the manifest
+.br
+* `source_template`: set to true to indicate the source template is known
+.br
+* `stl_timescale`: timescale used by SegmentTimeline, or 0 if no SegmentTimeline
+.br
+* `init_url`: unresolved intialization URL (as it appears in the manifest)
+.br
+* `manifest_url`: manifest URL
+.br
+
+.br
+When the dasher is used together with this mode, this will force all generated segments to have the same name, duration and fragmentation properties as the input ones. It is therefore not recommended for sessions stored/generated on local storage to generate the output in the same directory.
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-auto_switch (uint, default: 0): switch quality every N segments, disabled if 0
+auto_switch (sint, default: 0): switch quality every N segments
+.br
+* positive: go to higher quality or loop to lowest
+.br
+* negative: go to lower quality or loop to highest
+.br
+* 0: disabled
+.br
+
 .br
 segstore (enum, default: mem): enable file caching
 .br
 * mem: all files are stored in memory, no disk IO
 .br
-* file: files are stored to disk but discarded once played
+* disk: files are stored to disk but discarded once played
 .br
 * cache: all files are stored to disk and kept
 .br
 
 .br
-algo (enum, default: gbuf): adaptation algorithm to use
+algo (str, default: gbuf, minmax: none|grate|gbuf|bba0|bolaf|bolab|bolau|bolao|JS): adaptation algorithm to use
 .br
 * none: no adaptation logic
 .br
-* grate: GAPC legacy algo based on available rate
+* grate: GPAC legacy algo based on available rate
 .br
-* gbuf: GAPC legacy algo based on buffer occupancy
+* gbuf: GPAC legacy algo based on buffer occupancy
 .br
 * bba0: BBA-0
 .br
@@ -1466,6 +1696,8 @@
 .br
 * bolao: BOLA-O
 .br
+* JS: use file JS (either with specified path or in $GSHARE/scripts/) for algo (.js extension may be omitted)
+.br
 
 .br
 start_with (enum, default: max_bw): initial selection criteria
@@ -1476,33 +1708,39 @@
 .br
 * min_bw: start with lowest bitrate
 .br
-* max_bw: start with highest bitrate; for tiles are used, all low priority tiles will have the lower (below max) bandwidth selected
+* max_bw: start with highest bitrate; if tiles are used, all low priority tiles will have the lower (below max) bandwidth selected
 .br
-* max_bw_tiles: start with highest bitrate; for tiles all low priority tiles will have their lowest bandwidth selected
+* max_bw_tiles: start with highest bitrate; if tiles are used, all low priority tiles will have their lowest bandwidth selected
 .br
 
 .br
 max_res (bool, default: true): use max media resolution to configure display
 .br
-immediate (bool, default: false): when interactive switching is requested and immediate is set, the buffer segments are trashed
-.br
 abort (bool, default: false): allow abort during a segment download
 .br
-use_bmin (bool, default: false): use the indicated min buffer time of the MPD if true, otherwise uses default player settings
+use_bmin (enum, default: auto): playout buffer handling
+.br
+* no: use default player settings
+.br
+* auto: notify player of segment duration if not low latency
+.br
+* mpd: use the indicated min buffer time of the MPD
+.br
+
 .br
 shift_utc (sint, default: 0): shift DASH UTC clock in ms
 .br
-atsc_shift (sint, default: 0): shift ATSC requests time by given ms
+route_shift (sint, default: 0): shift ROUTE requests time by given ms
 .br
-server_utc (bool, default: yes): use ServerUTC: or Date: http headers instead of local UTC
+server_utc (bool, default: yes): use ServerUTC or Date HTTP headers instead of local UTC
 .br
 screen_res (bool, default: yes): use screen resolution in selection phase
 .br
-init_timeshift (uint, default: 0): set initial timshift in ms (if >0) or in per-cent of timeshift buffer (if <0)
+init_timeshift (sint, default: 0): set initial timeshift in ms (if >0) or in per-cent of timeshift buffer (if <0)
 .br
 tile_mode (enum, default: none): tile adaptation mode
 .br
-* none: bitrate is shared equaly accross all tiles
+* none: bitrate is shared equally across all tiles
 .br
 * rows: bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row
 .br
@@ -1524,15 +1762,15 @@
 .br
 tiles_rate (uint, default: 100): indicate the amount of bandwidth to use at each quality level. The rate is recursively applied at each level, e.g. if 50%, Level1 gets 50%, level2 gets 25%, ... If 100, automatic rate allocation will be done by maximizing the quality in order of priority. If 0, bitstream will not be smoothed across tiles/qualities, and concurrency may happen between different media
 .br
-delay40X (uint, default: 500): delay in millisconds to wait between two 40X on the same segment
+delay40X (uint, default: 500): delay in milliseconds to wait between two 40X on the same segment
 .br
-exp_threshold (uint, default: 100): delay in millisconds to wait after the segment AvailabilityEndDate before considering the segment lost
+exp_threshold (uint, default: 100): delay in milliseconds to wait after the segment AvailabilityEndDate before considering the segment lost
 .br
 switch_count (uint, default: 1): indicate how many segments the client shall wait before switching up bandwidth. If 0, switch will happen as soon as the bandwidth is enough, but this is more prone to network variations
 .br
-aggressive (bool, default: no): if enabled, switching algo targets the closest bandwidth fitting the available download rate. If no, switching algo targets the lowest bitrate representation that is above the currently played (eg does not try to switch to max bandwidth)
+aggressive (bool, default: no): if enabled, switching algo targets the closest bandwidth fitting the available download rate. If no, switching algo targets the lowest bitrate representation that is above the currently played (e.g. does not try to switch to max bandwidth)
 .br
-debug_as (uint, default: -1): play only the adaptation set indicated by its index in the MPD; if negative, all sets are used
+debug_as (uintl): play only the adaptation sets indicated by their indices (0-based) in the MPD
 .br
 speedadapt (bool, default: no): enable adaptation based on playback speed
 .br
@@ -1540,20 +1778,54 @@
 .br
 query (str): set query string (without initial '?') to append to xlink of periods
 .br
-split_as (bool, default: no): separate all qualities into different adaptation sets and stream all qualities
+split_as (bool, default: no): separate all qualities into different adaptation sets and stream all qualities. Dependent representations (scalable) are treated as independent
 .br
 noseek (bool, default: no): disable seeking of initial segment(s) in dynamic mode (useful when UTC clocks do not match)
 .br
+bwcheck (uint, default: 5): minimum time in milliseconds between two bandwidth checks when allowing segment download abort
+.br
 lowlat (enum, default: early): segment scheduling policy in low latency mode
 .br
 * no: disable low latency
 .br
 * strict: strict respect of AST offset in low latency
 .br
-* early: allow fetching segments earlier than their AST in low latency when input demux is empty
+* early: allow fetching segments earlier than their AST in low latency when input PID is empty
 .br
 
 .br
+forward (enum, default: none): segment forwarding mode
+.br
+* none: regular DASH read
+.br
+* file: do not demultiplex files and forward them as file PIDs (imply segstore=mem)
+.br
+* segb: turn on .I split_as, segment and fragment bounds signaling (sigfrag) in sources and DASH cue insertion
+.br
+* mani: same as segb and also forward manifests
+.br
+
+.br
+fmodefwd (bool, default: yes): forward packet rather than copy them in file forward mode. Packet copy might improve performances in low latency mode
+.br
+skip_lqt (bool, default: no): disable decoding of tiles with highest degradation hints (not visible, not gazed at) for debug purposes
+.br
+llhls_merge (bool, default: yes): merge LL-HLS byte range parts into a single open byte range request
+.br
+groupsel (bool, default: no): select groups based on language (by default all playable groups are exposed)
+.br
+chain_mode (enum, default: on): MPD chaining mode
+.br
+* off: do not use MPD chaining
+.br
+* on: use MPD chaining once over, fallback if MPD load failure
+.br
+* error: use MPD chaining once over or if error (MPD or segment download)
+.br
+
+.br
+asloop (bool, default: false): when auto switch is enabled, iterates back and forth from highest to lowest qualities
+.br
 
 .br
 .SH cdcrypt
@@ -1563,20 +1835,44 @@
 .br
 
 .br
-The CENC decryptor supports decrypting CENC, ISMA and Adobe streams. It uses a configuration file for retrieving keys.
+The CENC decryptor supports decrypting CENC, ISMA, HLS Sample-AES (MPEG2 ts) and Adobe streams.
+.br
+
+.br
+For HLS, key is retrieved according to the key URI in the manifest.
+.br
+Otherwise, the filter uses a configuration file.
 .br
 The syntax is available at https://wiki.gpac.io/Common-Encryption
 .br
-The file can be set per PID using the property DecryptInfo (highest priority), CryptInfo (lower priority) or set at the filter level using .I cfile (lowest priority).
+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 .I cfile (lowest priority).
 .br
-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 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.
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-cfile (str): crypt file location - see filter help
+cfile (str): crypt file location
+.br
+decrypt (enum, default: full): decrypt mode (CENC only)
+.br
+* full: decrypt everything, throwing error if keys are not found
+.br
+* nokey: decrypt everything for which a key is found, skip decryption otherwise
+.br
+* skip: decrypt nothing
+.br
+
+.br
+drop_keys (uintl): consider keys with given 1-based indexes as not available (multi-key debug)
+.br
+kids (strl): define KIDs. If keys is empty, consider keys with given KID (as hex string) as not available (debug)
+.br
+keys (strl): define key values for each of the specified KID
+.br
+hls_cenc_patch_iv (bool, default: false): ignore IV updates in some broken HLS+CENC streams
 .br
 
 .br
@@ -1593,54 +1889,54 @@
 .br
 The DRM config file can be set per PID using the property CryptInfo, or set at the filter level using .I cfile.
 .br
-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.
+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).
 .br
-If no DRM config file is defined for a given PID, this PID will not be encrypted, or an error will be thrown if .I allc is specified.
+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.
 .br
-
+If no DRM config file is defined for a given PID, this PID will not be encrypted, or an error will be thrown if .I allc is specified.
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-cfile (str): crypt file location - see filter help
+cfile (str): crypt file location
 .br
-allc (str): throw error if no DRM config file is found for a PID - see filter help
+allc (bool): throw error if no DRM config file is found for a PID
 .br
 
 .br
 .SH mp4mx
 .LP
 .br
-Description: ISOBMFF/QT muxer
+Description: ISOBMFF/QT multiplexer
 .br
 
 .br
-Muxes file according to ISOBMFF (14496-12 and derived specifications) or QuickTime
+This filter multiplexes streams to ISOBMFF (14496-12 and derived specifications) or QuickTime
 .br
 
 .br
 .SH Tracks and Items
 .LP
 .br
-By default all input PIDs with ItemID property set are muxed as items, otherwise they are muxed as tracks.
+By default all input PIDs with ItemID property set are multiplexed as items, otherwise they are multiplexed as tracks.
 .br
-To prevent source items to be muxed as items, use .I -itemid option from ISOBMF demuxer.
+To prevent source items to be multiplexed as items, use .I -itemid option from ISOBMFF demultiplexer.
 .br
 Example
 .br
--i source.mp4:itemid=false -o file.mp4
+gpac -i source.mp4:itemid=false -o file.mp4
 .br
 
 .br
 
 .br
-To force non-item streams to be muxed as items, use #ItemID option on that PID:
+To force non-item streams to be multiplexed as items, use #ItemID option on that PID:
 .br
 Example
 .br
--i source.jpg:#ItemID=1 -o file.mp4
+gpac -i source.jpg:#ItemID=1 -o file.mp4
 .br
 
 .br
@@ -1649,17 +1945,17 @@
 .SH Storage
 .LP
 .br
-The .I store option allows controling if the file is fragmented ot not, and when not fragmented, how interleaving is done. For cases where disk requirements are tight and fragmentation cannot be used, it is recommended to use either flat or fstart modes.
+The .I store option allows controlling if the file is fragmented or not, and when not fragmented, how interleaving is done. For cases where disk requirements are tight and fragmentation cannot be used, it is recommended to use either flat or fstart modes.
 .br
 
 .br
-The .I vodcache option allows controling how DASH onDemand segments are generated:
+The .I vodcache option allows controlling how DASH onDemand segments are generated:
 .br
 - If set to on, file data is stored to a temporary file on disk and flushed upon completion, no padding is present.
 .br
 - If set to insert, SIDX/SSIX will be injected upon completion of the file by shifting bytes in file. In this case, no padding is required but this might not be compatible with all output sinks and will take longer to write the file.
 .br
-- If set to replace, SIDX/SSIX size will be estimated based on duration and DASH segment length, and padding will be used in the file before the final SIDX. If input pids have the properties DSegs set, this will be as the number of segments.
+- If set to replace, SIDX/SSIX size will be estimated based on duration and DASH segment length, and padding will be used in the file before the final SIDX. If input PIDs have the properties DSegs set, this will used be as the number of segments.
 .br
 The on and insert modes will produce exactly the same file, while the mode replace may inject a free box before the sidx.
 .br
@@ -1676,7 +1972,7 @@
 .br
 Example
 .br
-src=source:#boxpatch=myfile.xml dst=mux.mp4
+gpac -i source:#boxpatch=myfile.xml -o mux.mp4
 .br
 
 .br
@@ -1684,7 +1980,7 @@
 .br
 Example
 .br
-src=source:1ItemID=1:#boxpatch=myfile.xml dst=mux.mp4
+gpac -i source:1ItemID=1:#boxpatch=myfile.xml -o mux.mp4
 .br
 
 .br
@@ -1699,25 +1995,85 @@
 .SH Tagging
 .LP
 .br
-When tagging is enabled, the filter will watch the property CoverArt and all custom properties on incoming pid.
+When tagging is enabled, the filter will watch the property CoverArt and all custom properties on incoming PID.
 .br
-The built-in tag names are album, artist, comment, complilation, composer, year, disk, tool, genre, contentgroup, title, tempo, track, tracknum, writer, encoder, album_artist, gapless, conductor.
+The built-in tag names are indicated by MP4Box -h tags.
 .br
 Other tag class may be specified using tag_NAME property names, and will be added if .I tags is set to all using:
 .br
 - NAME as a box 4CC if NAME is four characters long
 .br
+- NAME as a box 4CC if NAME is 3 characters long, and will be prefixed by 0xA9
+.br
 - the CRC32 of the NAME as a box 4CC if NAME is not four characters long
 .br
 
 .br
+.SH User data
+.LP
+.br
+The filter will look for the following PID properties to create user data entries:
+.br
+* `udtab`: set the track user-data box to the property value which must be a serialized box array blob
+.br
+* `mudtab`: set the movie user-data box to the property value which must be a serialized box array blob
+.br
+* `udta_U4CC`: set track user-data box entry of type U4CC to property value
+.br
+* `mudta_U4CC`: set movie user-data box entry of type U4CC to property value
+.br
+ 
+.br
+Example
+.br
+gpac -i src.mp4:#udta_tagc='My Awesome Tag' -o tag.mp4
+.br
+gpac -i src.mp4:#mudtab=data@box.bin -o tag.mp4
+.br
+
+.br
+ 
+.br
+.SH Custom sample group descriptions and sample auxiliary info
+.LP
+.br
+The filter watches the following custom data properties on incoming packets:
+.br
+* `grp_A4CC`: maps packet to sample group description of type A4CC and entry set to property payload
+.br
+* `grp_A4CC_param`: same as above and sets sample to group grouping_type_parameter to param
+.br
+* `sai_A4CC`: adds property payload as sample auxiliary information of type A4CC
+.br
+* `sai_A4CC_param`: same as above and sets aux_info_type_parameterto param
+.br
+ 
+.br
+The property grp_EMSG consists in one or more EventMessageBox as defined in MPEG-DASH.
+.br
+- in fragmented mode, presence of these boxes in a packet will start a new fragment, with the boxes written before the moof
+.br
+- in regular mode, an internal sample group of type EMSG is currently used for emsg box storage
+.br
+ 
+.br
 .SH Notes
 .LP
 .br
-The filter watches the property FileNumber on incoming packets to create new files or new segments in DASH mode.
+The filter watches the property FileNumber on incoming packets to create new files (regular mode) or new segments (DASH mode).
+.br
+ 
+.br
+The filter watches the property DSIWrap (4CC as int or string) on incoming PID to wrap decoder configuration in a box of given type (unknonw wraping)
+.br
+Example
+.br
+-i unkn.mkv:#ISOMSubtype=VIUK:#DSIWrap=cfgv -o t.mp4
 .br
 
 .br
+This will wrap the uknown stream using VIUK code point in stsd and wrap any decoder configuration data in a cfgv box.
+.br
 
 .br
 .SH Options (expert):
@@ -1725,7 +2081,7 @@
 .br
 m4sys (bool, default: false): force MPEG-4 Systems signaling of tracks
 .br
-dref (bool, default: false): only references data from source file - not compatible with all media sources
+dref (bool, default: false): only reference data from source file - not compatible with all media sources
 .br
 ctmode (enum, default: edit): set composition offset mode for video tracks
 .br
@@ -1737,7 +2093,7 @@
 .br
 
 .br
-idur (frac, default: 0): only import the specified duration. If negative, specify the number of coded frames to import
+dur (frac, default: 0): only import the specified duration. If negative, specify the number of coded frames to import
 .br
 pack3gp (uint, default: 1): pack a given number of 3GPP audio frames in one sample
 .br
@@ -1745,16 +2101,20 @@
 .br
 pack_nal (bool, default: false): repack NALU size length to minimum possible size for NALU-based video (AVC/HEVC/...)
 .br
-xps_inband (enum, default: no): use inband (in sample data) param set for NALU-based video (AVC/HEVC/...)
+xps_inband (enum, default: no): use inband (in sample data) parameter set for NALU-based video (AVC/HEVC/...)
+.br
+* no: parameter sets are not inband, several sample descriptions might be created
 .br
-* no: paramater sets are not inband, several sample descriptions might be created
+* pps: picture parameter sets are inband, all other parameter sets are in sample description
 .br
-* all: paramater sets are inband, no param sets in sample description
+* all: parameter sets are inband, no parameter sets in sample description
 .br
-* both: paramater sets are inband, signaled as inband, and also first set is kept in sample descripton
+* both: parameter sets are inband, signaled as inband, and also first set is kept in sample description
 .br
 * mix: creates non-standard files using single sample entry with first PSs found, and moves other PS inband
 .br
+* auto: keep source config, or defaults to no if source is not ISOBMFF
+.br
 
 .br
 store (enum, default: inter): file storage mode
@@ -1769,16 +2129,18 @@
 .br
 * frag: fragments the file using cdur duration
 .br
-* sfrag: framents the file using cdur duration but adjusting to start with SAP1/3
+* sfrag: fragments the file using cdur duration but adjusting to start with SAP1/3
 .br
 
 .br
-cdur (dbl, default: -1.0): chunk duration for interleaving and fragmentation modes
+cdur (frac, default: -1/1): chunk duration for flat and interleaving modes or fragment duration for fragmentation modes
 .br
 * 0: no specific interleaving but moov first
 .br
 * negative: defaults to 1.0 unless overridden by storage profile
 .br
+
+.br
 moovts (sint, default: 600): timescale to use for movie. A negative value picks the media timescale of the first track added
 .br
 moof_first (bool, default: true): generate fragments starting with moof then mdat
@@ -1787,27 +2149,27 @@
 .br
 fsap (bool, default: true): split truns in video fragments at SAPs to reduce file size
 .br
-subs_sidx (sint, default: -1): number of subsegments per sidx. negative value disables sidx, -2 removes sidx if present in source pid
+subs_sidx (sint, default: -1): number of subsegments per sidx. negative value disables sidx, -2 removes sidx if present in source PID
 .br
-m4cc (str): 4 character code of empty box to appen at the end of a segment
+m4cc (str): 4 character code of empty box to append at the end of a segment
 .br
 chain_sidx (bool, default: false): use daisy-chaining of SIDX
 .br
 msn (uint, default: 1): sequence number of first moof to N
 .br
-msninc (uint, default: 1): sequence number increase between moofs
+msninc (uint, default: 1): sequence number increase between moof boxes
 .br
-tfdt (lfrac, default: 0): set TFDT of first traf
+tfdt (lfrac, default: 0): set initial decode time (tfdt) of first traf
 .br
-tfdt_traf (bool, default: false): set TFDT in each traf
+tfdt_traf (bool, default: false): force tfdt box in each traf
 .br
 nofragdef (bool, default: false): disable default flags in fragments
 .br
-straf (bool, default: false): use a single traf per moov (smooth streaming and co)
+straf (bool, default: false): use a single traf per moof (smooth streaming and co)
 .br
 strun (bool, default: false): use a single trun per traf (smooth streaming and co)
 .br
-psshs (enum, default: moov): set PSSH boxes store mode
+psshs (enum, default: moov): set pssh boxes store mode
 .br
 * moof: in first moof of each segments
 .br
@@ -1819,7 +2181,7 @@
 .br
 sgpd_traf (bool, default: false): store sample group descriptions in traf (duplicated for each traf). If not used, sample group descriptions are stored in the movie box
 .br
-vodcache (enum, default: replace): enable temp storage for VoD dash modes - see filter help
+vodcache (enum, default: replace): enable temp storage for VoD dash modes
 .br
 * on: use temp storage of complete file for sidx and ssix injection
 .br
@@ -1851,15 +2213,13 @@
 .br
 
 .br
-tmpd (str): set temp directory for intermediate file(s)
-.br
-mvex (bool, default: false): set mvex after tracks
+mvex (bool, default: false): set mvex boxes after trak boxes
 .br
-sdtp_traf (enum, default: no): use sdtp in traf rather than using flags in trun sample entries
+sdtp_traf (enum, default: no): use sdtp box in traf box rather than using flags in trun sample entries
 .br
 * no: do not use sdtp
 .br
-* sdtp: use sdtp box to indicate sample dependencies and don't write info in trun sample flags
+* sdtp: use sdtp box to indicate sample dependencies and do not write info in trun sample flags
 .br
 * both: use sdtp box to indicate sample dependencies and also write info in trun sample flags
 .br
@@ -1871,9 +2231,9 @@
 .br
 btrt (bool, default: true): set btrt box in sample description
 .br
-styp (str): set segment styp major brand to the given 4CC[.version]
+styp (str): set segment styp major brand (and optionally version) to the given 4CC[.version]
 .br
-mediats (sint, default: 0): set media timescale. A value of 0 means inherit from pid, a value of -1 means derive from samplerate or frame rate
+mediats (sint, default: 0): set media timescale. A value of 0 means inherit from PID, a value of -1 means derive from samplerate or frame rate
 .br
 ase (enum, default: v0): set audio sample entry mode for more than stereo layouts
 .br
@@ -1887,7 +2247,7 @@
 .br
 
 .br
-ssix (bool, default: false): create ssix when sidx is present, level 1 mappping I-frames byte ranges, level 0xFF mapping the rest
+ssix (bool, default: false): create ssix box when sidx box is present, level 1 mapping I-frames byte ranges, level 0xFF mapping the rest
 .br
 ccst (bool, default: false): insert coding constraint box for video tracks
 .br
@@ -1895,7 +2255,11 @@
 .br
 noroll (bool, default: false): disable roll sample grouping
 .br
-saio32 (bool, default: false): set single segment mode for dash
+norap (bool, default: false): disable rap sample grouping
+.br
+saio32 (bool, default: false): use 32 bit offset for side data location instead of 64 bit offset
+.br
+tfdt64 (bool, default: false): use 64 bit tfdt and sidx even for 32 bits timestamps
 .br
 compress (enum, default: no): set top-level box compression mode
 .br
@@ -1915,7 +2279,11 @@
 .br
 fcomp (bool, default: false): force using compress box even when compressed size is larger than uncompressed
 .br
-trun_inter (bool, default: false): interleave samples in trun based on the temporal level, the lowest level are stored first - this will create as many trun as required
+otyp (bool, default: false): inject original file type when using compressed boxes
+.br
+trun_inter (bool, default: false): interleave samples in trun based on the temporal level, the lowest level are stored first (this will create as many trun boxes as required)
+.br
+truns_first (bool, default: false): store track runs before sample group description and sample encryption information
 .br
 block_size (uint, default: 10000): target output block size, 0 for default internal value (10k)
 .br
@@ -1925,9 +2293,11 @@
 .br
 mfra (bool, default: false): enable movie fragment random access when fragmenting (ignored when dashing)
 .br
-forcesync (bool, default: false): force all SAP types to be considered sync samples (might produce non-conformant files)
+forcesync (bool, default: false): force all SAP types to be considered sync samples (might produce non-compliant files)
+.br
+refrag (bool, default: false): use track fragment defaults from initial file if any rather than computing them from PID properties (used when processing standalone segments/fragments)
 .br
-tags (enum, default: strict): tag injection mode
+itags (enum, default: strict): tag injection mode
 .br
 * none: do not inject tags
 .br
@@ -1937,6 +2307,22 @@
 .br
 
 .br
+keep_utc (bool, default: false): force all new files and tracks to keep the source UTC creation and modification times
+.br
+pps_inband (bool, default: no): when .I xps_inband is set, inject PPS in each non SAP 1/2/3 sample
+.br
+moovpad (uint, default: 0): insert free box of given size after moov for future in-place editing
+.br
+cmaf (enum, default: no): use CMAF guidelines (turns on mvex, truns_first, strun, straf, tfdt_traf, chain_sidx and restricts subs_sidx to -1 or 0)
+.br
+* no: CMAF not enforced
+.br
+* cmfc: use CMAF cmfc guidelines
+.br
+* cmf2: use CMAF cmf2 guidelines (turns on nofragdef)
+.br
+
+.br
 
 .br
 .SH rfqcp
@@ -1975,6 +2361,8 @@
 .br
 index (dbl, default: 1.0): indexing window length
 .br
+notime (bool, default: false): ignore input timestamps, rebuild from 0
+.br
 
 .br
 .SH rfmpgvid
@@ -1986,7 +2374,7 @@
 .br
 This filter parses MPEG-1/2 and MPEG-4 part 2 video files/data and outputs corresponding video PID and frames.
 .br
-Note: The demux uses negative CTS offsets: CTS is corrrect, but some frames may have DTS greater than CTS.
+Note: The filter uses negative CTS offsets: CTS is correct, but some frames may have DTS greater than CTS.
 .br
 
 .br
@@ -2001,6 +2389,8 @@
 .br
 importer (bool, default: false): compatibility with old importer, displays import results
 .br
+notime (bool, default: false): ignore input timestamps, rebuild from 0
+.br
 
 .br
 .SH nhntr
@@ -2016,12 +2406,10 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
-reframe (bool, default: false): force reparsing of referenced content
+reframe (bool, default: false): force re-parsing of referenced content
 .br
 index (dbl, default: 1.0): indexing window length
 .br
@@ -2030,7 +2418,7 @@
 .SH nhmlr
 .LP
 .br
-Description: NHML parser
+Description: NHML reader
 .br
 
 .br
@@ -2040,12 +2428,10 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
-reframe (bool, default: false): force reparsing of referenced content
+reframe (bool, default: false): force re-parsing of referenced content
 .br
 index (dbl, default: 1.0): indexing window length
 .br
@@ -2060,9 +2446,9 @@
 .br
 This filter parses AVC|H264 and HEVC files/data and outputs corresponding video PID and frames.
 .br
-This demuxer only produces ISOBMFF-compatible output: start codes are removed, NALU length field added and avcC/hvcC config created.
+This filter produces ISOBMFF-compatible output: start codes are removed, NALU length field added and avcC/hvcC config created.
 .br
-Note: The demux uses negative CTS offsets: CTS is corrrect, but some frames may have DTS greater than CTS.
+Note: The filter uses negative CTS offsets: CTS is correct, but some frames may have DTS greater than CTS.
 .br
 
 .br
@@ -2071,7 +2457,7 @@
 .br
 fps (frac, default: 0/1000): import frame rate (0 default to FPS from bitstream or 25 Hz)
 .br
-index (dbl, default: -1.0): indexing window length. If 0, bitstream is not probed for duration. A negative value skips the indexing if the source file is larger than 100M (slows down importers) unless a play with start range > 0 is issued, otherwise uses the positive value
+index (dbl, default: -1.0): indexing window length. If 0, bitstream is not probed for duration. A negative value skips the indexing if the source file is larger than 100M (slows down importers) unless a play with start range > 0 is issued
 .br
 explicit (bool, default: false): use explicit layered (SVC/LHVC) import
 .br
@@ -2097,22 +2483,68 @@
 .br
 subsamples (bool, default: false): import subsamples information
 .br
-deps (bool, default: false): import samples dependencies information
+deps (bool, default: false): import sample dependency information
 .br
 seirw (bool, default: true): rewrite AVC sei messages for ISOBMFF constraints
 .br
 audelim (bool, default: false): keep Access Unit delimiter in payload
 .br
+notime (bool, default: false): ignore input timestamps, rebuild from 0
+.br
+dv_mode (enum, default: auto): signaling for DolbyVision
+.br
+* none: never signal DV profile
+.br
+* auto: signal DV profile if RPU or EL are found
+.br
+* force: always signal DV profile
+.br
+* clean: do not signal and remove RPU and EL NAL units
+.br
+* single: remove EL NAL units
+.br
+
+.br
+dv_profile (uint, default: 5): profile for DolbyVision (currently defined profiles are 4, 5, 7, 8, 9)
+.br
+dv_compatid (enum, default: none): cross-compatibility ID for DolbyVision
+.br
+* none: do not signal compatibility
+.br
+* hdr10: CTA HDR10, as specified by EBU TR 03
+.br
+* bt709: SDR BT.709
+.br
+* hlg709: HLG BT.709 gamut in ITU-R BT.2020
+.br
+* hlg2100: HLG BT.2100 gamut in ITU-R BT.2020
+.br
+* bt2020: SDR BT.2020
+.br
+* brd: Ultra HD Blu-ray Disc HDR
+.br
+
+.br
+bsdbg (enum, default: off): debug NAL parsing in parser@debug logs
+.br
+* off: not enabled
+.br
+* on: enabled
+.br
+* full: enable with number of bits dumped
+.br
+
+.br
 
 .br
 .SH m2psdmx
 .LP
 .br
-Description: MPEG PS demuxer
+Description: MPEG PS demultiplexer
 .br
 
 .br
-This filter demultiplexes MPEG-2 program stream files/data to produce media PIDs and frames.
+This filter demultiplexes MPEG-2 program streams to produce media PIDs and frames.
 .br
 
 .br
@@ -2123,11 +2555,11 @@
 .SH avidmx
 .LP
 .br
-Description: AVI demuxer
+Description: AVI demultiplexer
 .br
 
 .br
-This filter demultiplexes AVI files/data to produce media PIDs and frames.
+This filter demultiplexes AVI files to produce media PIDs and frames.
 .br
 
 .br
@@ -2147,9 +2579,82 @@
 .br
 
 .br
-This filter reads subtitle data (srt/webvtt/ttxt/sub) to produce media PIDs and frames.
+This filter reads subtitle data from input file PID to produce subtitle frames on a single PID.
 .br
-The TTXT documentation is available at https://wiki.gpac.io/TTXT-Format-Documentation
+The filter supports the following formats:
+.br
+* SRT: https://en.wikipedia.org/wiki/SubRip
+.br
+* WebVTT: https://www.w3.org/TR/webvtt1/
+.br
+* TTXT: https://wiki.gpac.io/TTXT-Format-Documentation
+.br
+* QT 3GPP Text XML (TexML): Apple QT6, likely deprecated
+.br
+* TTML: https://www.w3.org/TR/ttml2/
+.br
+* SUB: one subtitle per line formatted as {start_frame}{end_frame}text
+.br
+
+.br
+Input files must be in UTF-8 or UTF-16 format, with or without BOM. The internal frame format is: 
+.br
+* WebVTT (and srt if desired): ISO/IEC 14496-30 VTT cues
+.br
+* TTML: ISO/IEC 14496-30 XML subtitles
+.br
+* Others: 3GPP/QT Timed Text
+.br
+
+.br
+.SH TTML Support
+.LP
+.br
+The .I ttml_dur option controls how the TTML document is split into packets:
+.br
+- if negative (default), TTML document is split in independent time segments by inspecting all overlapping subtitles in the body
+.br
+- if 0, the input document is not split, forwarded as a single frame with CTS matching the first active time in document and a duration equal to the document duration
+.br
+- if >0, the input document is not split, forwarded as a single frame with CTS=0 and the specified duration in timescale units.
+.br
+
+.br
+By default, media resources are kept as declared in TTML2 documents.
+.br
+
+.br
+.I ttml_embed can be used to embed inside the TTML sample the resources in <head> or <body>:
+.br
+- for <source>, <image>, <audio>, , local URIs indicated in src will be loaded and src rewritten.
+.br
+- for <data> with base64 coding, the data will be decoded, <data> element removed and parent <source> rewritten with src attribute inserted.
+.br
+
+.br
+The embedded data is added as a subsample to the TTML frame, and the referring elements will use src=urn:mpeg:14496-30:N with N the index of the subsample.
+.br
+
+.br
+A subtitle zero may be specified using .I ttml_zero. This will remove all subtitles before the given time T0, and rewrite each subtitle begin/end T to T-T0 using millisecond accuracy.
+.br
+Warning: Original time formatting (tick, frames/subframe ...) will be lost when this option is used, converted to HH:MM:SS.ms.
+.br
+
+.br
+The subtitle zero time must be prefixed with T when the option is not set as a global argument:
+.br
+Example
+.br
+gpac -i test.ttml:ttml_zero=T10:00:00 [...]
+.br
+MP4Box -add test.ttml:sopt:ttml_zero=T10:00:00 [...]
+.br
+gpac -i test.ttml --ttml_zero=10:00:00 [...]
+.br
+gpac -i test.ttml --ttml_zero=T10:00:00 [...]
+.br
+MP4Box -add test.ttml --ttml_zero=10:00:00 [...]
 .br
 
 .br
@@ -2164,15 +2669,15 @@
 .br
 noflush (bool, default: false): skip final sample flush for srt
 .br
-fontname (str): default font to use
+fontname (str): default font
 .br
 fontsize (uint, default: 18): default font size
 .br
-lang (str): default language to use
+lang (str): default language
 .br
-width (uint, default: 0): default width of text area, set to 0 to resolve against visual PIDs
+width (uint, default: 0): default width of text area
 .br
-height (uint, default: 0): default height of text area, set to 0 to resolve against visual PIDs
+height (uint, default: 0): default height of text area
 .br
 txtx (uint, default: 0): default horizontal offset of text area: -1 (left), 0 (center) or 1 (right)
 .br
@@ -2182,6 +2687,12 @@
 .br
 timescale (uint, default: 1000): default timescale of the PID
 .br
+ttml_dur (sint, default: -1): force single sample mode
+.br
+ttml_embed (bool, default: false): force embedding TTML resources
+.br
+ttml_zero (str): set subtitle zero time for TTML
+.br
 
 .br
 .SH ttxtdec
@@ -2197,8 +2708,6 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
@@ -2232,11 +2741,11 @@
 .br
 script (str, default: $GSHARE/scripts/webvtt-renderer.js): location of WebVTT SVG JS renderer
 .br
-font (str, default: SANS, updatable): font to use
+font (str, default: SANS, updatable): font
 .br
-fontSize (flt, default: 20, updatable): font size to use
+fontSize (flt, default: 20, updatable): font size
 .br
-color (str, default: white, updatable): color to use
+color (str, default: white, updatable): text color
 .br
 lineSpacing (flt, default: 1.0, updatable): line spacing as scaling factor to font size
 .br
@@ -2270,11 +2779,11 @@
 .br
 script (str, default: $GSHARE/scripts/ttml-renderer.js): location of TTML SVG JS renderer
 .br
-font (str, default: SANS, updatable): font to use
+font (str, default: SANS, updatable): font
 .br
-fontSize (flt, default: 20, updatable): font size to use
+fontSize (flt, default: 20, updatable): font size
 .br
-color (str, default: white, updatable): color to use
+color (str, default: white, updatable): text color
 .br
 valign (enum, default: bottom, updatable): vertical alignment
 .br
@@ -2315,7 +2824,7 @@
 .br
 
 .br
-The filter produces either media PIDs and compressed media frames, or file PIDs and multiplex data (e.g., MPEG-2 TS).
+The filter produces either PIDs with media frames, or file PIDs with multiplexed data (e.g. MPEG-2 TS).
 .br
 
 .br
@@ -2324,7 +2833,7 @@
 .br
 src (cstr): location of source content (SDP, RTP or RTSP URL)
 .br
-firstport (uint, default: 0): default first port number to use. 0 lets the filter decide
+firstport (uint, default: 0): default first port number to use (0 lets the filter decide)
 .br
 ifce (str): default interface IP to use for multicast. If NULL, the default system interface will be used
 .br
@@ -2332,9 +2841,9 @@
 .br
 reorder_len (uint, default: 1000): reorder length in packets
 .br
-reorder_delay (uint, default: 50): max delay in RTP reorderer, packets will be dispatched after that
+reorder_delay (uint, default: 50): max delay in RTP re-orderer, packets will be dispatched after that
 .br
-block_size (uint, default: 0x200000): buffer size fur RTP/UDP or RTSP when interleaved
+block_size (uint, default: 0x200000): buffer size for RTP/UDP or RTSP when interleaved
 .br
 disable_rtcp (bool, default: false): disable RTCP reporting
 .br
@@ -2342,7 +2851,7 @@
 .br
 force_mcast (str): force multicast on indicated IP in RTSP setup
 .br
-use_client_ports (bool, default: false): force using client ports (hack for some RTSP servers overriding client ports)
+use_client_ports (bool, default: false): force using client ports (hack for some RTSP servers overriding client ports)
 .br
 bandwidth (uint, default: 0): set bandwidth param for RTSP requests
 .br
@@ -2356,24 +2865,32 @@
 .br
 rtsp_timeout (uint, default: 3000): default timeout before considering RTSP is down
 .br
-rtcp_timeout (uint, default: 5000): default timeout for RTCP trafic in ms. After this timeout, playback will start unsync. If 0 always wait for RTCP
+rtcp_timeout (uint, default: 5000): default timeout for RTCP traffic in ms. After this timeout, playback will start out of sync. If 0 always wait for RTCP
 .br
 autortsp (bool, default: true): automatically reconfig RTSP interleaving if UDP timeout
 .br
-first_packet_drop (uint, default: 0): set number of first RTP packet to drop - 0 if no drop
+first_packet_drop (uint, default: 0): set number of first RTP packet to drop (0 if no drop)
 .br
-frequency_drop (uint, default: 0): drop 1 out of N packet - 0 disable droping
+frequency_drop (uint, default: 0): drop 1 out of N packet (0 disable dropping)
 .br
 user_agent (str, default: $GUA): user agent string, by default solved from GPAC preferences
 .br
 languages (str, default: $GLANG): user languages, by default solved from GPAC preferences
 .br
-stats (uint, default: 500): update statistics to the user every given MS, 0 disables reporting
+stats (uint, default: 500): update statistics to the user every given MS (0 disables reporting)
 .br
-max_sleep (sint, default: 1000): set max sleep in milliseconds. A negative value -N means to always sleep for N ms, a positive value N means to sleep at most N ms but will sleep less if frame duration is shorter
+max_sleep (sint, default: 1000): set max sleep in milliseconds:
+.br
+- a negative value -N means to always sleep for N ms
+.br
+- a positive value N means to sleep at most N ms but will sleep less if frame duration is shorter
+.br
+
 .br
 rtcpsync (bool, default: true): use RTCP to adjust synchronization
 .br
+forceagg (bool, default: false): force RTSP control aggregation (patch for buggy servers)
+.br
 
 .br
 .SH fout
@@ -2383,36 +2900,74 @@
 .br
 
 .br
-The file output filter is used to write output to disk, and does not produce any output PID.
+This filter is used to write data to disk, and does not produce any output PID.
 .br
-It can work as a null sink when its destination is null, dropping all input packets. In this case it accepts ANY type of input pid, not just file ones.
+In regular mode, the filter only accept PID of type file. It will dump to file incoming packets (stream type file), starting a new file for each packet having a frame_start flag set, unless operating in .I cat mode.
 .br
-In regular mode, the filter only accept pid of type file. It will dump to file incomming packets (stream type file), starting a new file for each packet having a frame_start flag set, unless operating in .I cat mode.
+If the output file name is std or stdout, writes to stdout.
 .br
-The ouput file name can use gpac templating mechanism, see gpac -h doc.The filter watches the property FileNumber on incoming packets to create new files.
+The output file name can use gpac templating mechanism, see gpac -h doc.The filter watches the property FileNumber on incoming packets to create new files.
 .br
 
 .br
+.SH Discard sink mode
+.LP
+.br
+When the destination is null, the filter is a sink dropping all input packets.
+.br
+In this case it accepts ANY type of input PID, not just file ones.
+.br
+
+.br
+.SH HTTP streaming recording
+.LP
+.br
+When recording a DASH or HLS session, the number of segments to keep per quality can be set using .I max_cache_segs.
+.br
+- value 0 keeps everything (default behaviour)
+.br
+- a negative value N will keep -N files regardless of the time-shift buffer value
+.br
+- a positive value N will keep MAX(N, time-shift buffer) files
+.br
+
+.br
+Example
+.br
+gpac -i LIVE_MPD dashin:forward=file -o rec/$File$:max_cache_segs=3
+.br
+
+.br
+This will force keeping a maximum of 3 media segments while recording the DASH session.
+.br
 
 .br
 .SH Options (expert):
 .LP
 .br
-dst (cstr): location of destination file - see filter help 
+dst (cstr): location of destination file
 .br
 append (bool, default: false): open in append mode
 .br
 dynext (bool, default: false): indicate the file extension is set by filter chain, not dst
 .br
-start (dbl, default: 0.0): set playback start offset. Negative value means percent of media dur with -1 <=> dur
+start (dbl, default: 0.0): set playback start offset. A negative value means percent of media duration with -1 equal to duration
 .br
-speed (dbl, default: 1.0): set playback speed when vsync is on. If speed is negative and start is 0, start is set to -1
+speed (dbl, default: 1.0): set playback speed when vsync is on. If negative and start is 0, start is set to -1
 .br
 ext (cstr): set extension for graph resolution, regardless of file extension
 .br
 mime (cstr): set mime type for graph resolution
 .br
-cat (bool, default: false): cat each file of input pid rather than creating one file per filename
+cat (enum, default: none): cat each file of input PID rather than creating one file per filename
+.br
+* none: never cat files
+.br
+* auto: only cat if files have same names
+.br
+* all: always cat regardless of file names
+.br
+
 .br
 ow (bool, default: true): overwrite output if existing
 .br
@@ -2420,6 +2975,8 @@
 .br
 redund (bool, default: false): keep redundant packet in output file
 .br
+max_cache_segs (sint, default: 0): maximum number of segments cached per HAS quality when recording live sessions (0 means no limit)
+.br
 
 .br
 .SH uflatm
@@ -2466,6 +3023,24 @@
 .br
 
 .br
+.SH ufmhas
+.LP
+.br
+Description: MHAS writer
+.br
+
+.br
+This filter converts MPEG-H Audio streams into MHAS encapsulated data.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+syncp (bool, default: yes): if set, insert sync packet at each frame, otherwise only at SAP
+.br
+
+.br
 .SH reframer
 .LP
 .br
@@ -2473,9 +3048,9 @@
 .br
 
 .br
-This filter provides various compressed domain tools on inputs:
+This filter provides various tools on inputs:
 .br
-- ensure reframing
+- ensure reframing (1 packet = 1 Access Unit)
 .br
 - optionally force decoding
 .br
@@ -2483,11 +3058,13 @@
 .br
 - packet filtering based on SAP types or frame numbers
 .br
-- time-range extraction and spliting
+- time-range extraction and splitting
+.br
+ 
 .br
-This filter forces input pids to be properly framed (1 packet = 1 Access Unit).
+This filter forces input PIDs to be properly framed (1 packet = 1 Access Unit).
 .br
-It is typcially needed to force remultiplexing in file to file operations when source and destination files use the same format.
+It is typically needed to force remultiplexing in file to file operations when source and destination files use the same format.
 .br
 
 .br
@@ -2505,7 +3082,7 @@
 .br
 This filter can keep only specific Access Units of the source using .I frames option.
 .br
-For example, this can be used to extract only specific key frame of a video to create a HEIF collection.
+For example, this can be used to extract only specific key pictures of a video to create a HEIF collection.
 .br
 
 .br
@@ -2516,7 +3093,7 @@
 .br
 Example
 .br
-gpac src=m.mp4 reframer:raw @ [dst]
+gpac -i m.mp4 reframer:raw=av [dst]
 .br
 
 .br
@@ -2529,7 +3106,7 @@
 .br
 Example
 .br
-gpac src=m.mp4 reframer:rt=on @ dst=live.mpd:dynamic
+gpac -i m.mp4 reframer:rt=on -o live.mpd:dynamic
 .br
 
 .br
@@ -2542,23 +3119,27 @@
 .br
 The formats allowed for times specifiers are:
 .br
-* 'T'H:M:S: specify time in hours, minutes, seconds
+* 'T'H:M:S, 'T'M:S: specify time in hours, minutes, seconds
 .br
-* 'T'H:M:S.MS: specify time in hours, minutes, seconds and milliseconds
+* 'T'H:M:S.MS, 'T'M:S.MS, 'T'S.MS: specify time in hours, minutes, seconds and milliseconds
 .br
-* INT: specify time in millisecond
+* INT, FLOAT: specify time in seconds
 .br
 * NUM/DEN: specify time in seconds as fraction
 .br
-* FNUM: specify time as frame number
+* 'F'NUM: specify time as frame number
+.br
+ 
 .br
 In this mode, the timestamps are rewritten to form a continuous timeline.
 .br
-When multiple ranges are given, the filter will try to seek if supported by source.
+When multiple ranges are given, the filter will try to seek if needed and supported by source.
+.br
+
 .br
 Example
 .br
-gpac src=m.mp4 reframer:xs=T00:00:10,T00:01:10,T00:02:00:xs=T00:00:20,T00:01:20 [dst]
+gpac -i m.mp4 reframer:xs=T00:00:10,T00:01:10,T00:02:00:xe=T00:00:20,T00:01:20 [dst]
 .br
 
 .br
@@ -2566,19 +3147,45 @@
 .br
 
 .br
+If no end range is found for a given start range:
+.br
+- if a following start range is set, the end range is set to this next start
+.br
+- otherwise, the end range is open
+.br
+
+.br
+Example
+.br
+gpac -i m.mp4 reframer:xs=0,10,25:xe=5 [dst]
+.br
+
+.br
+This will extract the time ranges [0s,5s], [10s,25s] and all media starting from 25s
+.br
+Example
+.br
+gpac -i m.mp4 reframer:xs=0,10,25 [dst]
+.br
+
+.br
+This will extract the time ranges [0s,10s], [10s,25s] and all media starting from 25s
+.br
+
+.br
 It is possible to signal range boundaries in output packets using .I splitrange.
 .br
-This will expose on the first packet of each range in each pid the following properties:
+This will expose on the first packet of each range in each PID the following properties:
 .br
-* FileNumber: starting at 1 for the first range, to be used as replacement for $num$ in templates
+* `FileNumber`: starting at 1 for the first range, to be used as replacement for $num$ in templates
 .br
-* FileSuffix: corresponding to StartRange_EndRange or StartRange for open ranges, to be used as replacement for $FS$ in templates
+* `FileSuffix`: corresponding to StartRange_EndRange or StartRange for open ranges, to be used as replacement for $FS$ in templates
 .br
 
 .br
 Example
 .br
-gpac src=m.mp4 reframer:xs=T00:00:10,T00:01:10:xe=T00:00:20:splitrange -o dump_$FS$.264
+gpac -i m.mp4 reframer:xs=T00:00:10,T00:01:10:xe=T00:00:20:splitrange -o dump_$FS$.264 [dst]
 .br
 
 .br
@@ -2588,6 +3195,52 @@
 .br
 
 .br
+It is possible to modify PID properties per range using .I props. Each set of property must be specified using the active separator set.
+.br
+Warning: The option must be escaped using double separators in order to be parsed properly.
+.br
+Example
+.br
+gpac -i m.mp4 reframer:xs=0,30::props=#Period=P1,#Period=P2:#foo=bar [dst]
+.br
+
+.br
+This will assign to output PIDs
+.br
+* during the range [0,30]: property Period to P1
+.br
+* during the range [30, end]: properties Period to P2 and property foo to bar
+.br
+
+.br
+For uncompressed audio PIDs, input frame will be split to closest audio sample number.
+.br
+
+.br
+When .I xround is set to seek, the following applies:
+.br
+- a single range shall be specified
+.br
+- the first I-frame preceding or matching the range start is used as split point
+.br
+- all packets before range start are marked as seek points
+.br
+- packets overlapping range start are forwarded with a SkipBegin property set to the amount of media to skip
+.br
+- packets overlapping range end are forwarded with an adjusted duration to match the range end
+.br
+This mode is typically used to extract a range in a frame/sample accurate way, rather than a GOP-aligned way.
+.br
+
+.br
+When .I xround is not set to seek, compressed audio streams will still use seek mode.
+.br
+Consequently, these streams will have modified edit lists in ISOBMFF which might not be properly handled by players.
+.br
+This can be avoided using .I no_audio_seek, but this will introduce audio delay.
+.br
+
+.br
 .SH Other split actions
 .LP
 .br
@@ -2595,13 +3248,13 @@
 .br
 The additional formats allowed for .I xs option are:
 .br
-* 'SAP': split source at each SAP/RAP
+* `SAP`: split source at each SAP/RAP
 .br
-* 'D'VAL: split source by chunks of VAL ms
+* `D`VAL: split source by chunks of VAL ms
 .br
-* 'D'NUM/DEN: split source by chunks of NUM/DEN seconds
+* `D`NUM/DEN: split source by chunks of NUM/DEN seconds
 .br
-* 'S'VAL: split source by chunks of estimated size VAL bytes, VAL can use property multipliers
+* `S`VAL: split source by chunks of estimated size VAL bytes (can use property multipliers, e.g. m)
 .br
 
 .br
@@ -2609,8 +3262,6 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
@@ -2620,35 +3271,47 @@
 .br
 * off: disables real-time regulation
 .br
-* on: enables real-time regulation, one clock per pid
+* on: enables real-time regulation, one clock per PID
 .br
-* sync: enables real-time regulation one clock for all pids
+* sync: enables real-time regulation one clock for all PIDs
 .br
 
 .br
-saps (uintl, minmax: 0|1|2|3|4): drop non-SAP packets, off by default. The list gives the SAP types (0,1,2,3,4) to forward. Note that forwarding only sap 0 will break the decoding
+saps (uintl, minmax: 0|1|2|3|4): list of SAP types (0,1,2,3,4) to forward, other packets are dropped (forwarding only sap 0 will break the decoding)
 .br
 
 .br
 refs (bool, default: false): forward only frames used as reference frames, if indicated in the input stream
 .br
-speed (dbl, default: 1.0): speed for real-time regulation mode - only positive value
+speed (dbl, default: 1.0): speed for real-time regulation mode
+.br
+raw (enum, default: no): force input AV streams to be in raw format
 .br
-raw (bool, default: false): force input streams to be in raw format (i.e. forces decoding of input)
+* no: do not force decoding of inputs
 .br
-frames (uintl): drop all except listed frames (first being 1), off by default
+* av: force decoding of audio and video inputs
 .br
-xs (strl): extraction start time(s), see filter help
+* a: force decoding of audio inputs
+.br
+* v: force decoding of video inputs
+.br
+
+.br
+frames (uintl): drop all except listed frames (first being 1)
+.br
+xs (strl): extraction start time(s)
 .br
 xe (strl): extraction end time(s). If less values than start times, the last time interval extracted is an open range
 .br
-xround (enum, default: before): adjustment of extraction start range I-frame
+xround (enum, default: before): adjust start time of extraction range to I-frame
+.br
+* before: use first I-frame preceding or matching range start
 .br
-* before: use first I-frame preceeding or equal to start range
+* seek: see filter help
 .br
-* after: use first I-frame (if any) following or equal to start range
+* after: use first I-frame (if any) following or matching range start
 .br
-* closest: use I-frame closest to start range
+* closest: use I-frame closest to range start
 .br
 
 .br
@@ -2658,7 +3321,15 @@
 .br
 splitrange (bool, default: false): signal file boundary at each extraction first packet for template-base file generation
 .br
-seeksafe (dbl, default: 10.0): rewind play requests by given seconds (to make sur I-frame preceeding start is catched)
+seeksafe (dbl, default: 10.0): rewind play requests by given seconds (to make sur I-frame preceding start is catched)
+.br
+tcmdrw (bool, default: true): rewrite TCMD samples when splitting
+.br
+props (strl): extra output PID properties per extraction range
+.br
+no_audio_seek (bool, default: false): disable seek mode on audio streams (no change of priming duration)
+.br
+probe_ref (bool, default: false): allow extracted range to be longer in case of B-frames with reference frames presented outside of range
 .br
 
 .br
@@ -2671,7 +3342,7 @@
 .br
 Generic single stream to file converter, used when extracting/converting PIDs.
 .br
-The writegen filter should usually not be explicetly loaded without a source ID specified, since the filter would likely match any pid connection.
+The writegen filter should usually not be explicitly loaded without a source ID specified, since the filter would likely match any PID connection.
 .br
 
 .br
@@ -2680,9 +3351,9 @@
 .br
 exporter (bool, default: false): compatibility with old exporter, displays export results
 .br
-pfmt (pfmt, default: none, minmax: none,yuv420,yuv420_10,yuv422,yuv422_10,yuv444,yuv444_10,uyvy,vyuy,yuyv,yvyu,nv12,nv21,nv1l,nv2l,yuva,yuvd,yuv444a,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,rgbs,rgbas): pixel format for raw extract. If not set, derived from extension
+pfmt (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,yuv444ap,yuv444p_10,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,rgbs,rgbas): pixel format for raw extract. If not set, derived from extension
 .br
-afmt (afmt, default: none, minmax: none,u8,s16,s24,s32,flt,dbl,u8p,s16p,s24p,s32p,fltp,dblp): audio format for raw extract. If not set, derived from extension
+afmt (afmt, default: none, minmax: none,u8,s16,s16b,s24,s32,flt,dbl,u8p,s16p,s24p,s32p,fltp,dblp): audio format for raw extract. If not set, derived from extension
 .br
 decinfo (enum, default: auto): decoder config insert mode
 .br
@@ -2698,7 +3369,7 @@
 .br
 split (bool, default: false): force one file per decoded frame
 .br
-frame (bool, default: false): force single frame dump with no rewrite. In this mode, all codecids are supported
+frame (bool, default: false): force single frame dump with no rewrite. In this mode, all codec types are supported
 .br
 sstart (uint, default: 0): start number of frame to forward. If 0, all samples are forwarded
 .br
@@ -2706,6 +3377,8 @@
 .br
 dur (frac, default: 0): duration of media to forward after first sample. If 0, all samples are forwarded
 .br
+merge_region (bool, default: false): merge TTML regions with same ID while reassembling TTML doc
+.br
 
 .br
 .SH ufnalu
@@ -2726,7 +3399,7 @@
 .br
 extract (enum, default: all): layer extraction mode
 .br
-* full: extracts all layers
+* all: extracts all layers
 .br
 * base: extract base layer only
 .br
@@ -2736,6 +3409,8 @@
 .br
 delim (bool, default: true): insert AU Delimiter NAL
 .br
+pps_inband (bool, default: false): inject PPS at each non SAP frame, ignored if rcfg is not set
+.br
 
 .br
 .SH writeqcp
@@ -2745,7 +3420,7 @@
 .br
 
 .br
-This filter converts a single stream to a QCP output file.
+This filter converts a single QCELP, EVRC or MSV stream to a QCP output file.
 .br
 
 .br
@@ -2763,7 +3438,7 @@
 .br
 
 .br
-This filter converts a single stream to a WebVTT output file.
+This filter converts a single ISOBMFF WebVTT stream to a WebVTT output file.
 .br
 
 .br
@@ -2789,8 +3464,6 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
@@ -2813,8 +3486,6 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
@@ -2822,7 +3493,7 @@
 .br
 dims (bool, default: false): use DIMS mode
 .br
-name (str): set output name of files produced (needed media/info files refered to from XML
+name (str): set output name of media and info files produced
 .br
 nhmlonly (bool, default: false): only dump NHML info, not media
 .br
@@ -2843,11 +3514,11 @@
 .SH vobsubdmx
 .LP
 .br
-Description: VobSub demuxer
+Description: VobSub parser
 .br
 
 .br
-This filter demultiplexes VobSub files/data to produce media PIDs and frames.
+This filter parses VobSub files/data to produce media PIDs and frames.
 .br
 
 .br
@@ -2861,7 +3532,7 @@
 .SH avimx
 .LP
 .br
-Description: AVI muxer
+Description: AVI multiplexer
 .br
 
 .br
@@ -2877,6 +3548,12 @@
 .br
 
 .br
+The filter will look for property AVIType set on the input stream.
+.br
+The value can either be a 4CC or a string, indicating the mux format for the PID.
+.br
+If the string is prefixed with + and the decoder configuration is present and formatted as an ISOBMFF box, the box header will be removed.
+.br
 
 .br
 .SH Options (expert):
@@ -2899,7 +3576,15 @@
 .br
 
 .br
-This filter outputs a single uncompressed audio PID to a soundcard.
+This filter writes a single uncompressed audio input PID to a sound card or other audio output device.
+.br
+
+.br
+The longer the audio buffering .I bdur is, the longer the audio latency will be (pause/resume). The quality of fast forward audio playback will also be degraded when using large audio buffers.
+.br
+
+.br
+If .I clock is set, the filter will report system time (in us) and corresponding packet CTS for other filters to use for AV sync.
 .br
 
 .br
@@ -2908,28 +3593,36 @@
 .br
 drv (cstr): audio driver name
 .br
-bnum (uint, default: 2): number of audio buffers - 0 for auto
+bnum (uint, default: 2): number of audio buffers (0 for auto)
 .br
-bdur (uint, default: 100): total duration of all buffers in ms - 0 for auto. The longer the audio buffer is, the longer the audio latency will be (pause/resume). The quality of fast forward audio playback will also be degradated when using large audio buffers
+bdur (uint, default: 100): total duration of all buffers in ms (0 for auto)
 .br
 threaded (bool, default: true): force dedicated thread creation if sound card driver is not threaded
 .br
 dur (frac, default: 0): only play the specified duration
 .br
-clock (bool, default: true): hint audio clock for this stream (reports system time and CTS), for other filters to use
+clock (bool, default: true): hint audio clock for this stream
 .br
-speed (dbl, default: 1.0): set playback speed. If speed is negative and start is 0, start is set to -1
+speed (dbl, default: 1.0, updatable): set playback speed. If speed is negative and start is 0, start is set to -1
 .br
-start (dbl, default: 0.0): set playback start offset. Negative value means percent of media dur with -1 <=> dur
+start (dbl, default: 0.0, updatable): set playback start offset. A negative value means percent of media duration with -1 equal to duration
 .br
 vol (uint, default: 100, minmax: 0-100, updatable): set default audio volume, as a percentage between 0 and 100
 .br
 pan (uint, default: 50, minmax: 0-100, updatable): set stereo pan, as a percentage between 0 and 100, 50 being centered
 .br
-buffer (uint, default: 200): set buffer in ms
+buffer (uint, default: 200): set playout buffer in ms
+.br
+mbuffer (uint, default: 0): set max buffer occupancy in ms. If less than buffer, use buffer
+.br
+rbuffer (uint, default: 0, updatable): rebuffer trigger in ms. If 0 or more than buffer, disable rebuffering
 .br
 adelay (frac, default: 0, updatable): set audio delay in sec
 .br
+buffer_done (bool): buffer done indication (readonly, for user app)
+.br
+rebuffer (luint): system time in us at which last rebuffer started, 0 if not rebuffering (readonly, for user app)
+.br
 
 .br
 .SH ufm4v
@@ -2939,7 +3632,7 @@
 .br
 
 .br
-This filter converts MPEG-4 part 2 visual streams into dumpable format (reinsert decoder config).
+This filter converts MPEG-4 part 2 visual streams into writable format (reinsert decoder config).
 .br
 
 .br
@@ -2964,11 +3657,13 @@
 .SH Options (expert):
 .LP
 .br
-ch (uint, default: 0): desired number of output audio channels - 0 for auto
+och (uint, default: 0): desired number of output audio channels (0 for auto)
+.br
+osr (uint, default: 0): desired sample rate of output audio (0 for auto)
 .br
-sr (uint, default: 0): desired sample rate of output audio - 0 for auto
+ofmt (afmt, default: none): desired format of output audio (none for auto)
 .br
-fmt (afmt, default: none): desired format of output audio - none for auto
+olayout (str, minmax: mono,stereo,3/0.0,3/1.0,3/2.0,3/2.1,5/2.1,1+1,2/1.0,2/2.0,3/3.1,3/4.1,11/11.2,5/2.1,5/5.2,5/4.1,6/5.1,6/7.1,5/6.1,7/6.1): desired CICP layout of output audio (null for auto)
 .br
 
 .br
@@ -2979,7 +3674,7 @@
 .br
 
 .br
-This filter displays a single visual pid in a window.
+This filter displays a single visual input PID in a window.
 .br
 The window is created unless a window handle (HWND, xWindow, etc) is indicated in the config file ( [Temp]OSWnd=ptr).
 .br
@@ -2987,9 +3682,9 @@
 .br
 The video output module can be further configured (see GPAC core help).
 .br
-The filter can use openGL or 2D blitter of the graphics card, depending on the OS support.
+The filter can use OpenGL or 2D blit of the graphics card, depending on the OS support.
 .br
-The filter can be used do dump frames as written on the grapics card.
+The filter can be used do dump frames as written by the graphics card (GPU read-back) using .I dumpframes.
 .br
 In this case, the window is not visible and only the listed frames are drawn to the GPU.
 .br
@@ -2997,8 +3692,6 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
@@ -3006,7 +3699,7 @@
 .br
 vsync (bool, default: true): enable video screen sync
 .br
-drop (bool, default: false): enable droping late frames
+drop (bool, default: false, updatable): enable dropping late frames
 .br
 disp (enum, default: gl): display mode
 .br
@@ -3020,19 +3713,25 @@
 .br
 
 .br
-start (dbl, default: 0.0): set playback start offset. Negative value means percent of media dur with -1 <=> dur
+start (dbl, default: 0.0, updatable): set playback start offset. A negative value means percent of media duration with -1 equal to duration
 .br
 dur (lfrac, default: 0): only play the specified duration
 .br
-speed (dbl, default: 1.0): set playback speed when vsync is on. If speed is negative and start is 0, start is set to -1
+speed (dbl, default: 1.0, updatable): set playback speed when vsync is on. If speed is negative and start is 0, start is set to -1
 .br
-hold (dbl, default: 1.0): number of seconds to hold display for single-frame streams. A negative value force a hold on last frame for single or multi-frames streams
+hold (dbl, default: 1.0): number of seconds to hold display for single-frame streams (a negative value force a hold on last frame for single or multi-frames streams)
 .br
 linear (bool, default: false): use linear filtering instead of nearest pixel for GL mode
 .br
 back (uint, default: 0x808080): back color for transparent images
 .br
-wsize (v2di, default: -1x-1): default init window size. 0x0 holds the window size of the first frame. Negative values indicate video media size
+wsize (v2di, default: -1x-1): default init window size
+.br
+- 0x0 holds the window size of the first frame
+.br
+- negative values indicate video media size
+.br
+
 .br
 wpos (v2di, default: -1x-1): default position (0,0 top-left)
 .br
@@ -3040,13 +3739,49 @@
 .br
 hide (bool, default: false): hide output window
 .br
-fullscreen (bool, default: false): use fullcreen
+fullscreen (bool, default: false, updatable): use fullscreen
 .br
-buffer (uint, default: 100): set buffer in ms
+buffer (uint, default: 100): set playout buffer in ms
 .br
-dumpframes (uintl): ordered list of frames to dump, 1 being first frame - see filter help. Special value 0 means dump all frames
+mbuffer (uint, default: 0): set max buffer occupancy in ms. If less than buffer, use buffer
 .br
-out (str, default: dump): radical of dump frame filenames. If no extension is provided, frames are exported as $OUT_%d.PFMT
+rbuffer (uint, default: 0, updatable): rebuffer trigger in ms. If 0 or more than buffer, disable rebuffering
+.br
+dumpframes (uintl): ordered list of frames to dump, 1 being first frame. Special value 0 means dump all frames
+.br
+out (str, default: dump): radical of dump frame filenames. If no extension provided, frames are exported as $OUT_%d.PFMT
+.br
+owsize (v2di): output window size (readonly)
+.br
+buffer_done (bool): buffer done indication (readonly)
+.br
+rebuffer (luint): system time in us at which last rebuffer started, 0 if not rebuffering (readonly)
+.br
+vflip (enum, default: no, updatable): flip video (GL only)
+.br
+* no: no flipping
+.br
+* v: vertical flip
+.br
+* h: horizontal flip
+.br
+* vh: horizontal and vertical
+.br
+* hv: same as vh
+.br
+
+.br
+vrot (enum, default: 0, updatable): rotate video by given angle
+.br
+* 0: no rotation
+.br
+* 90: rotate 90 degree counter clockwise
+.br
+* 180: rotate 180 degree
+.br
+* 270: rotate 90 degree clockwise
+.br
+
 .br
 
 .br
@@ -3089,7 +3824,7 @@
 .br
 
 .br
-Filter used to flip video frames vertically, horizontally, in both directions or no flip
+This filter flips uncompressed video frames vertically, horizontally, in both directions or no flip
 .br
 
 .br
@@ -3121,12 +3856,16 @@
 .br
 
 .br
+The filter also parses YUV4MPEG format.
+.br
+
+.br
 .SH Options (expert):
 .LP
 .br
 size (v2di, default: 0x0): source video resolution
 .br
-spfmt (pfmt, default: none, minmax: none,yuv420,yuv420_10,yuv422,yuv422_10,yuv444,yuv444_10,uyvy,vyuy,yuyv,yvyu,nv12,nv21,nv1l,nv2l,yuva,yuvd,yuv444a,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,rgbs,rgbas): source pixel format. When not set, derived from file extension
+spfmt (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,yuv444ap,yuv444p_10,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,rgbs,rgbas): source pixel format. When not set, derived from file extension
 .br
 fps (frac, default: 25/1): number of frames per second
 .br
@@ -3150,7 +3889,7 @@
 .br
 sr (uint, default: 44100): sample rate
 .br
-safmt (afmt, default: none, minmax: none,u8,s16,s24,s32,flt,dbl,u8p,s16p,s24p,s32p,fltp,dblp): audio format
+safmt (afmt, default: none, minmax: none,u8,s16,s16b,s24,s32,flt,dbl,u8p,s16p,s24p,s32p,fltp,dblp): audio format
 .br
 ch (uint, default: 2): number of channels
 .br
@@ -3234,7 +3973,7 @@
 .br
 The filter loads any source supported by GPAC: remote or local files or streaming sessions (TS, RTP, DASH or other).
 .br
-The filter forces input demultiplex and recomputes the input timestamps into a continuous timeline.
+The filter demultiplexes inputs and recomputes input timestamps into a continuous timeline.
 .br
 At each new source, the filter tries to remap input PIDs to already declared output PIDs of the same type, if any, or declares new output PIDs otherwise. If no input PID matches the type of an output, no packets are send for that PID.
 .br
@@ -3243,15 +3982,15 @@
 .SH Source list mode
 .LP
 .br
-The source list mode is activated by using flist:srcs=f1[,f2], where f1 can be a file or a directory to enum.
+The source list mode is activated by using flist:srcs=f1[,f2], where f1 can be a file or a directory to enumerate.
 .br
-The syntax for directory enum is:
+The syntax for directory enumeration is:
 .br
-* dir/*: enumerates everything in dir
+* dir, dir/ or dir/*: enumerates everything in directory dir
 .br
-* foo/*.png: enumerates all files with extension png in foo
+* foo/*.png: enumerates all files with extension png in directory foo
 .br
-* foo/*.png;*.jpg: enumerates all files with extension png or jpg in foo
+* foo/*.png;*.jpg: enumerates all files with extension png or jpg in directory foo
 .br
 
 .br
@@ -3271,14 +4010,42 @@
 .br
 
 .br
+When sorting by names:
+.br
+- shorter filenames are inserted before longer filenames
+.br
+- alphabetical sorting is used if same filename length
+.br
+
+.br
 .SH Playlist mode
 .LP
 .br
-The playlist mode is activated when opening a playlist file (extension txt or m3u).
+The playlist mode is activated when opening a playlist file (m3u format, utf-8 encoding, no BOM, default extensions m3u, txt or pl).
+.br
+In this mode, directives can be given in a comment line, i.e. a line starting with # before the line with the file name.
+.br
+Lines stating with ## are ignored.
+.br
+
+.br
+The playlist file is refreshed whenever the next source has to be reloaded in order to allow for dynamic pushing of sources in the playlist.
+.br
+If the last URL played cannot be found in the playlist, the first URL in the playlist file will be loaded.
+.br
+
+.br
+When .I ka is used to keep refreshing the playlist on regular basis, the playlist must end with a new line.
 .br
-In this mode, directives can be given in a comment line, i.e. a line starting with '#' before the line with the file name.
+Playlist refreshing will abort:
 .br
-The following directives, separated with space or comma, are supported:
+- if the input playlist has a line not ending with a LF (\n) character, in order to avoid asynchronous issues when reading the playlist.
+.br
+- if the input playlist has not been modified for the .I timeout option value (infinite by default).
+.br
+.SS Playlist directives
+.br
+A playlist directive line can contain zero or more directives, separated with space. The following directives are supported:
 .br
 * repeat=N: repeats N times the content (hence played N+1).
 .br
@@ -3286,40 +4053,224 @@
 .br
 * stop=T: stops source playback after T seconds (double format only). This works on any source (implemented independently from seek support).
 .br
-* cat: specifies that the following entry should be concatenated to the previous source rather than opening a new source. This can optionnally specify a byte range if desired, otherwise the full file is concatenated.
+* cat: specifies that the following entry should be concatenated to the previous source rather than opening a new source. This can optionally specify a byte range if desired, otherwise the full file is concatenated.
+.br
+Note: When sources are ISOBMFF files or segments on local storage or GF_FileIO objects, the concatenation will be automatically detected.
 .br
 * srange=T: when cat is set, indicates the start T (64 bit decimal, default 0) of the byte range from the next entry to concatenate.
 .br
 * send=T: when cat is set, indicates the end T (64 bit decimal, default 0) of the byte range from the next entry to concatenate.
 .br
+* props=STR: assigns properties described in STR to all PIDs coming from the listed sources on next line. STR is formatted according to gpac -h doc using the default parameter set.
+.br
+* del: specifies that the source file(s) must be deleted once processed, true by default if .I fdel is set.
+.br
+* out=V: specifies splicing start time (cf below).
+.br
+* in=V: specifies splicing end time (cf below).
+.br
+* nosync: prevents timestamp adjustments when joining sources (implied if cat is set).
+.br
+* keep: keeps spliced period in output (cf below).
+.br
+* mark: only inject marker for the splice period and do not load any replacement content (cf below).
+.br
+* sprops=STR: assigns properties described in STR to all PIDs of the main content during a splice (cf below). STR is formatted according to gpac -h doc using the default parameter set.
+.br
 
 .br
-Note: When sources are ISOBMFF files or segments on local storage or GF_FileIO objects, the concatenation will be automatically detected.
+The following global options (applying to the filter, not the sources) may also be set in the playlist:
+.br
+* ka=N: force .I ka option to N millisecond refresh.
+.br
+* floop=N: set .I floop option from within playlist.
+.br
+* raw: set .I raw option from within playlist.
 .br
 
 .br
+The default behavior when joining sources is to realign the timeline origin of the new source to the maximum time in all PIDs of the previous sources.
+.br
+This may create gaps in the timeline in case previous source PIDs are not of equal duration (quite common with most audio codecs).
+.br
+Using nosync directive will disable this realignment and provide a continuous timeline but may introduce synchronization errors depending in the source encoding (use with caution).
+.br
+.SS Source syntax
+.br
 The source lines follow the usual source syntax, see gpac -h.
 .br
-Additional pid properties can be added per source (see gpac -h doc), but are valid only for the current source, and reset at next source.
+Additional PID properties can be added per source (see gpac -h doc), but are valid only for the current source, and reset at next source.
+.br
+The loaded sources do not inherit arguments from the parent playlist filter.
 .br
 
 .br
 The URL given can either be a single URL, or a list of URLs separated by " && " to load several sources for the active entry.
 .br
+Warning: There shall not be any other space/tab characters between sources.
+.br
 Example
 .br
 audio.mp4 && video.mp4
 .br
 
 .br
+.SS Source with filter chains
+.br
+Each URL can be followed by a chain of one or more filters, using the @ link directive as used in gpac (see gpac -h doc).
+.br
+A negative link index (e.g. @-1) can be used to setup a new filter chain starting from the last specified source in the line.
+.br
+Warning: There shall be a single character, with value space (' '), before and after each link directive.
+.br
+
+.br
+Example
+.br
+src.mp4 @ reframer:rt=on
+.br
 
 .br
-The playlist file is refreshed whenever the next source has to be reloaded in order to allow for dynamic pushing of sources in the playlist.
+This will inject a reframer with real-time regulation between source and flist filter.
 .br
-If the last URL played cannot be found in the playlist, the first URL in the playlist file will be loaded.
+Example
+.br
+src.mp4 @ reframer:saps=1 @1 reframer:saps=0,2,3
+.br
+src.mp4 @ reframer:saps=1 @-1 reframer:saps=0,2,3
+.br
+
+.br
+This will inject a reframer filtering only SAP1 frames and a reframer filtering only non-SAP1 frames between source and flist filter
+.br
+
+.br
+Link options can be specified (see gpac -h doc).
+.br
+Example
+.br
+src.mp4 @#video reframer:rt=on
+.br
+
+.br
+This will inject a reframer with real-time regulation between video PID of source and flist filter.
 .br
 
 .br
+When using filter chains, the flist filter will only accept PIDs from the last declared filter in the chain.
+.br
+In order to accept other PIDs from the source, you must specify a final link directive with no following filter.
+.br
+Example
+.br
+src.mp4 @#video reframer:rt=on @-1#audio
+.br
+
+.br
+This will inject a reframer with real-time regulation between video PID of source and flist filter, and will also allow audio PIDs from source to connect to flist filter.
+.br
+
+.br
+The empty link directive can also be used on the last declared filter
+.br
+Example
+.br
+src.mp4 @ reframer:rt=on @#audio
+.br
+
+.br
+This will inject a reframer with real-time regulation between source and flist filter and only connect audio PIDs to flist filter.
+.br
+.SS Splicing
+.br
+The playlist can be used to splice content with other content following a media in the playlist.
+.br
+A source item is declared as main media in a splice operation if and only if it has an out directive set (possibly empty).
+.br
+Directive can be used for the main media except concatenation directives.
+.br
+
+.br
+The splicing operations do not alter media frames and do not perform uncompressed domain operations such as cross-fade or mixing.
+.br
+
+.br
+The out (resp. in) directive specifies the media splice start (resp. end) time. The value can be formatted as follows:
+.br
+* empty: the time is not yet assigned
+.br
+* `now`: the time is resolved to the next SAP point in the media
+.br
+* integer, float or fraction: set time in seconds
+.br
+* `+VAL`: used for in only, specify the end point as delta in seconds from the start point (VAL can be integer, float or fraction)
+.br
+* DATE: set splice time according to wall clock DATE, formatted as an XSD dateTime
+.br
+The splice times (except wall clock) are expressed in the source (main media) timing, not the reconstructed output timeline.
+.br
+
+.br
+When a splice begins (out time reached), the source items following the main media are played until the end of the splice or the end of the main media.
+.br
+Sources used during the splice period can use directives such as start, dur or repeat.
+.br
+
+.br
+Once a splice is done (in time reached), the main media out splice time is reset to undefined.
+.br
+
+.br
+When the main media has undefined out or in splice times, the playlist is reloaded at each new main media packet to check for resolved values.
+.br
+- out can only be modified when no splice is active, otherwise it is ignored. If modified, it resets the next source to play to be the one following the modified main media.
+.br
+- in can only be modified when a splice is active with an undefined end time, otherwise it is ignored.
+.br
+
+.br
+When the main media is over:
+.br
+- if repeat directive is set, the main media is repeated, in and out set to their initial values and the next splicing content is the one following the main content,
+.br
+- otherwise, the next source queued is the one following the last source played during the last splice period.
+.br
+
+.br
+It is allowed to defined several main media in the playlist, but a main media is not allowed as media for a splice period.
+.br
+
+.br
+The filter will look for the property Period on the output PIDs of the main media for multi-period DASH.
+.br
+If found, _N is appended to the period ID, with N starting from 1 and increased at each main media resume.
+.br
+If no Period property is set on main or spliced media, period switch can still be forced using .I -pswitch DASH option.
+.br
+
+.br
+If mark directive is set for a main media, no content replacement is done and the splice boundaries will be signaled in the main media.
+.br
+If keep directive is set for a main media, the main media is forwarded along with the replacement content.
+.br
+When mark or keep directives are set, it is possible to alter the PID properties of the main media using sprops directive.
+.br
+
+.br
+Example
+.br
+#out=2 in=4 mark sprops=#xlink=http://foo.bar/
+.br
+src:#Period=main
+.br
+
+.br
+This will inject property xlink on the output PIDs in the splice zone (corresponding to period main_2) but not in the rest of the main media.
+.br
+
+.br
+Directives mark, keep and sprops are reset at the end of the splice period.
+.br
 
 .br
 .SH Options (expert):
@@ -3327,15 +4278,17 @@
 .br
 floop (sint, default: 0): loop playlist/list of files, 0 for one time, n for n+1 times, -1 for indefinitely
 .br
-srcs (strl): list of files to play - see filter help
+srcs (strl): list of files to play
+.br
+fdur (frac, default: 1/25): frame duration for source files with a single frame (0/NaN fraction means reuse source timing which is usually not set!)
 .br
-fdur (frac, default: 1/25): for source files with a single frame, sets frame duration. 0/NaN fraction means reuse source timing which is usually not set!
+revert (bool, default: false): revert list of files (.I srcs, not playlist)
 .br
-revert (bool, default: false): revert list of files (not playlist)
+timescale (uint, default: 0): force output timescale on all PIDs (0 uses the timescale of the first PID found)
 .br
-timescale (uint, default: 0): force output timescale on all pids. 0 uses the timescale of the first pid found
+ka (uint, default: 0): keep playlist alive (disable loop), waiting for a new input to be added or #end directive to end playlist. The value specifies the refresh rate in ms
 .br
-ka (uint, default: 0): keep playlist alive (disable loop), waiting the for a new input to be added or #end to end playlist. The value specify the refresh rate in ms
+timeout (luint, default: -1): timeout in ms after which the playlist is considered dead (-1 means indefinitely)
 .br
 fsort (enum, default: no): sort list of files
 .br
@@ -3347,7 +4300,23 @@
 .br
 * date: sort by increasing modification time
 .br
-* datex: sort by increasing modification time - see filter help
+* datex: sort by increasing modification time
+.br
+
+.br
+sigcues (bool, default: false): inject CueStart property at each source begin (new or repeated) for DASHing
+.br
+fdel (bool, default: false): delete source files after processing in playlist mode (does not delete the playlist)
+.br
+raw (enum, default: no): force input AV streams to be in raw format
+.br
+* no: do not force decoding of inputs
+.br
+* av: force decoding of audio and video inputs
+.br
+* a: force decoding of audio inputs
+.br
+* v: force decoding of video inputs
 .br
 
 .br
@@ -3356,13 +4325,20 @@
 .SH m2tsmx
 .LP
 .br
-Description: MPEG-2 TS muxer
+Description: MPEG-2 TS multiplexer
 .br
 
 .br
-GPAC TS multiplexer selects M2TS PID for media streams using the PID of the PMT plus the stream index.
+This filter multiplexes one or more input PIDs into a MPEG-2 Transport Stream multiplex.
+.br
+
+.br
+.SH PID selection
+.LP
 .br
-For example, default config creates the first program with a PMT PID 100, the first stream will have a PID of 101.
+The MPEG-2 TS multiplexer assigns M2TS PID for media streams using the PID of the PMT plus the stream index.
+.br
+For example, the default config creates the first program with a PMT PID 100, the first stream will have a PID of 101.
 .br
 Streams are grouped in programs based on input PID property ServiceID if present. If absent, stream will go in the program with service ID as indicated by .I sid option.
 .br
@@ -3389,7 +4365,7 @@
 .br
 Each TEMI description is formatted as ID_OR_URL or #OPT1[#OPT2]#ID_OR_URL. Options are:
 .br
-* S`N`: gives number N indicating the target serviceID
+* S`N`: indicate the target service with ID N
 .br
 * T`N`: set timescale to use (default: PID timescale)
 .br
@@ -3409,7 +4385,7 @@
 .br
 * N: only insert for stream with index N (0-based) in the program.
 .br
-* L`N`: set 64bit timecode signaling. Possible values are:
+* L`C`: set 64bit timecode signaling. Possible values for C are:
 .br
 * `A`: automatic switch between 32 and 64 bit depending on timecode value (default if not specified).
 .br
@@ -3419,7 +4395,7 @@
 .br
 * N: insert NTP timestamp in TEMI timeline descriptor
 .br
-* ID_OR_URL: If number, indicates the TEMI ID to use for external timeline. Otherwise, gives the URL to insert
+* ID_OR_URL: If number, indicate the TEMI ID to use for external timeline. Otherwise, give the URL to insert
 .br
 
 .br
@@ -3467,21 +4443,31 @@
 .br
 Warning: multipliers (k,m,g) are not supported in TEMI options.
 .br
-.SH Notes
+.SH Adaptive Streaming
 .LP
 .br
-In DASH mode, the PCR is always initialized at 0, and .I flush_rap is automatically set.
+In DASH and HLS mode:
+.br
+- the PCR is always initialized at 0, and .I flush_rap is automatically set.
 .br
-The filter watches the property FileNumber on incoming packets to create new files or new segments in DASH mode.
+- unless nb_pack is specified, 200 TS packets will be used as pack output in DASH mode.
+.br
+- pes_pack=none is forced since some demultiplexers have issues with non-aligned ADTS PES.
 .br
 
 .br
+The filter watches the property FileNumber on incoming packets to create new files, or new segments in DASH mode.
+.br
+The filter will look for property M2TSRA set on the input stream.
+.br
+The value can either be a 4CC or a string, indicating the MP2G-2 TS Registration tag for unknwon media types.
+.br
 
 .br
 .SH Options (expert):
 .LP
 .br
-breq (uint, default: 100): buffer requirements in ms for input pids
+breq (uint, default: 100): buffer requirements in ms for input PIDs
 .br
 pmt_id (uint, default: 100): define the ID of the first PMT to use in the mux
 .br
@@ -3493,7 +4479,7 @@
 .br
 first_pts (luint, default: 0): force PTS value of first packet, in 90kHz
 .br
-pcr_offset (luint, default: -1): offset all timestamps from PCR by V, in 90kHz. Default value is computed based on input media
+pcr_offset (luint, default: -1): offset all timestamps from PCR by V, in 90kHz (default value is computed based on input media)
 .br
 mpeg4 (enum, default: none): force usage of MPEG-4 signaling (IOD and SL Config)
 .br
@@ -3509,9 +4495,9 @@
 .br
 disc (bool, default: false): set the discontinuity marker for the first packet of each stream
 .br
-repeat_rate (uint, default: 0): interval in ms between two carousel send for MPEG-4 systems. Is overridden by carousel duration PID property if defined
+repeat_rate (uint, default: 0): interval in ms between two carousel send for MPEG-4 systems (overridden by CarouselRate PID property if defined)
 .br
-repeat_img (uint, default: 0): interval in ms between re-sending (as PES) of single-image streams. If 0, image data is sent once only
+repeat_img (uint, default: 0): interval in ms between re-sending (as PES) of single-image streams (if 0, image data is sent once only)
 .br
 max_pcr (uint, default: 100): set max interval in ms between 2 PCR
 .br
@@ -3543,23 +4529,23 @@
 .br
 pcr_only (bool, default: false): enable PCR-only TS packets
 .br
-pcr_init (lsint, default: -1): set initial PCR value for the programs. Negative value implies random value is picked
+pcr_init (lsint, default: -1): set initial PCR value for the programs. A negative value means random value is picked
 .br
-sid (uint, default: 0): set service ID for the program - see filter help
+sid (uint, default: 0): set service ID for the program
 .br
-name (str): set service name for the program - see filter help
+name (str): set service name for the program
 .br
-provider (str): set service provider name for the program - see filter help
+provider (str): set service provider name for the program
 .br
-sdt_rate (uint, default: 0): interval in ms between two DVB SDT tables. If 0, SDT is disabled
+sdt_rate (uint, default: 0): interval in ms between two DVB SDT tables (if 0, SDT is disabled)
 .br
-temi (str): insert TEMI time codes in adaptation field - see filter help
+temi (str): insert TEMI time codes in adaptation field
 .br
 log_freq (uint, default: 500): delay between logs for realtime mux
 .br
 latm (bool, default: false): use LATM AAC encapsulation instead of regular ADTS
 .br
-subs_sidx (sint, default: -1): number of subsegments per sidx. negative value disables sidx
+subs_sidx (sint, default: -1): number of subsegments per sidx (negative value disables sidx)
 .br
 
 .br
@@ -3570,9 +4556,6 @@
 .br
 
 .br
-.SH GPAC DASH and HLS segmenter
-.LP
-.br
 This filter provides segmentation and manifest generation for MPEG-DASH and HLS formats.
 .br
 The segmenter currently supports:
@@ -3597,13 +4580,11 @@
 .br
 Example
 .br
-src=file.mp4 reframer:rt=on @ -o live.mpd:dmode=dynamic
+gpac -i file.mp4 reframer:rt=on -o live.mpd:dmode=dynamic
 .br
 
 .br
-.P
-.B
-Template strings
+.SS Template strings
 .br
 The segmenter uses templates to derive output file names, regardless of the DASH mode (even when templates are not used). The default one is $File$_dash for ondemand and single file modes, and $File$_$Number$ for separate segment files
 .br
@@ -3613,7 +4594,7 @@
 .br
 
 .br
-If input is foo.mp4 with 640x360 video, this will resolve in Great_foo_640_$Number$ for the DASH template.
+If input is foo.mp4 with 640x360 video resolution, this will resolve in Great_foo_640_$Number$ for the DASH template.
 .br
 Example
 .br
@@ -3621,7 +4602,7 @@
 .br
 
 .br
-If input is foo.mp4 with 640x360 video, this will resolve in Great_foo_640.mp4 for onDemand case.
+If input is foo.mp4 with 640x360 video resolution, this will resolve in Great_foo_640.mp4 for onDemand case.
 .br
 
 .br
@@ -3657,35 +4638,45 @@
 .br
 
 .br
-.P
-.B
-PID assignment and configuration
+.SS PID assignment and configuration
 .br
-To assign PIDs into periods and adaptation sets and configure the session, the segmenter looks for the following properties on each input pid:
+To assign PIDs into periods and adaptation sets and configure the session, the segmenter looks for the following properties on each input PID:
 .br
-* Representation: assigns representation ID to input pid. If not set, the default behaviour is to have each media component in different adaptation sets. Setting the RepresentationID allows explicit multiplexing of the source(s)
+* `Representation`: assigns representation ID to input PID. If not set, the default behavior is to have each media component in different adaptation sets. Setting the Representation allows explicit multiplexing of the source(s)
 .br
-* Period: assigns period ID to input pid. If not set, the default behaviour is to have all media in the same period with the same start time
+* `Period`: assigns period ID to input PID. If not set, the default behavior is to have all media in the same period with the same start time
 .br
-* PStart: assigns period start. If not set, 0 is assumed, and periods appear in the Period ID declaration order. If negative, this gives the period order (-1 first, then -2 ...). If positive, this gives the true start time and will abort DASHing at period end
+* `PStart`: assigns period start. If not set, 0 is assumed, and periods appear in the Period ID declaration order. If negative, this gives the period order (-1 first, then -2 ...). If positive, this gives the true start time and will abort DASHing at period end
 .br
 Note: When both positive and negative values are found, the by-order periods (negative) will be inserted AFTER the timed period (positive)
 .br
-* ASID: assigns parent adaptation set ID. If not 0, only sources with same AS ID will be in the same adaptation set
+* `ASID`: assigns parent adaptation set ID. If not 0, only sources with same AS ID will be in the same adaptation set
 .br
 Note: If multiple streams in source, only the first stream will have an AS ID assigned
 .br
-* xlink: for remote periods, only checked for null pid
+* `xlink`: for remote periods, only checked for null PID
+.br
+* `Role`, `PDesc`, `ASDesc`, `ASCDesc`, `RDesc`: various descriptors to set for period, AS or representation
+.br
+* `BUrl`: overrides segmenter [-base] with a set of BaseURLs to use for the PID (per representation)
+.br
+* `Template`: overrides segmenter .I template for this PID
+.br
+* `DashDur`: overrides segmenter segment duration for this PID
 .br
-* Role, PDesc, ASDesc, ASCDesc, RDesc: various descriptors to set for period, AS or representation
+* `StartNumber`: sets the start number for the first segment in the PID, default is 1
 .br
-* BUrl: overrides segmenter [-base] with a set of BaseURLs to use for the pid (per representation)
+* `IntraOnly`: indicates input PID follows HLS EXT-X-I-FRAMES-ONLY guidelines
 .br
-* Template: overrides segmenter .I template for this PID
+* `CropOrigin`: indicates x and y coordinates of video for SRD (size is video size)
 .br
-* DashDur: overrides segmenter segment duration for this PID
+* `SRD`: indicates SRD position and size of video for SRD, ignored if CropOrigin is set
 .br
-* StartNumber: sets the start number for the first segment in the PID, default is 1
+* `SRDRef`: indicates global width and height of SRD, ignored if CropOrigin is set
+.br
+* `HLSMExt`: list of extensions to add to master playlist entries, ['foo','bar=val'] added as ,foo,bar=val
+.br
+* `HLSVExt`: list of extensions to add to variant playlist, ['#foo','#bar=val'] added as #foo \n #bar=val
 .br
 * Non-dash properties: Bitrate, SAR, Language, Width, Height, SampleRate, NumChannels, Language, ID, DependencyID, FPS, Interlaced, Codec. These properties are used to setup each representation and can be overridden on input PIDs using the general PID property settings (cf global help).
 .br
@@ -3693,7 +4684,7 @@
 .br
 Example
 .br
-src=test.mp4:#Bitrate=1M dst=test.mpd
+gpac -i test.mp4:#Bitrate=1M -o test.mpd
 .br
 
 .br
@@ -3701,23 +4692,23 @@
 .br
 Example
 .br
-src=muxav.mp4 dst=test.mpd
+gpac -i muxav.mp4 -o test.mpd
 .br
 
 .br
-This will create unmuxed DASH segments.
+This will create un-multiplexed DASH segments.
 .br
 Example
 .br
-src=muxav.mp4:#Representation=1 dst=test.mpd
+gpac -i muxav.mp4:#Representation=1 -o test.mpd
 .br
 
 .br
-This will create muxed DASH segments.
+This will create multiplexed DASH segments.
 .br
 Example
 .br
-src=m1.mp4 src=m2.mp4:#Period=Yep dst=test.mpd
+gpac -i m1.mp4 -i m2.mp4:#Period=Yep -o test.mpd
 .br
 
 .br
@@ -3725,7 +4716,7 @@
 .br
 Example
 .br
-src=m1.mp4:#BUrl=http://foo/bar dst=test.mpd
+gpac -i m1.mp4:#BUrl=http://foo/bar -o test.mpd
 .br
 
 .br
@@ -3733,7 +4724,7 @@
 .br
 Example
 .br
-src=m1.mp4:#ASCDesc=<ElemName val="attval">text</ElemName> dst=test.mpd
+gpac -i m1.mp4:#ASCDesc=<ElemName val="attval">text</ElemName> -o test.mpd
 .br
 
 .br
@@ -3745,7 +4736,7 @@
 .br
 Example
 .br
-src=m1.mp4:#RDesc=<Elem attribute="1"/>,<Elem2>text</Elem2> dst=test.mpd
+gpac -i m1.mp4:#RDesc=<Elem attribute="1"/>,<Elem2>text</Elem2> -o test.mpd
 .br
 
 .br
@@ -3753,7 +4744,7 @@
 .br
 Example
 .br
-src=video.mp4:#Template=foo$Number$ src=audio.mp4:#Template=bar$Number$ dst=test.mpd
+gpac -i video.mp4:#Template=foo$Number$ -i audio.mp4:#Template=bar$Number$ -o test.mpd
 .br
 
 .br
@@ -3761,7 +4752,7 @@
 .br
 Example
 .br
-src=null:#xlink=http://foo/bar.xml:#PDur=4 src=m.mp4:#PStart=-1
+gpac -i null:#xlink=http://foo/bar.xml:#PDur=4 -i m.mp4:#PStart=-1 -o test.mpd
 .br
 
 .br
@@ -3769,35 +4760,41 @@
 .br
 Example
 .br
-src=null:#xlink=http://foo/bar.xml:#PStart=6 src=m.mp4
+gpac -i null:#xlink=http://foo/bar.xml:#PStart=6 -i m.mp4 -o test.mpd
+.br
+
+.br
+This will create an MPD with first a regular period, dashing only 6s of content, then a remote one.
+.br
+Example
+.br
+gpac -i v1:#SRD=0x0x1280x360:#SRDRef=1280x720 -i v2:#SRD=0x360x1280x360 -o test.mpd
 .br
 
 .br
-This will create an MPD with first a regular period, dashing ony 6s of content, then a remote one.
+This will layout the v2 below v1 using a global SRD size of 1280x720.
 .br
 
 .br
-The segmenter will create muxing filter chains for each representation and will reassign PID IDs so that each media component (video, audio, ...) in an adaptation set has the same ID.
+The segmenter will create multiplexing filter chains for each representation and will reassign PID IDs so that each media component (video, audio, ...) in an adaptation set has the same ID.
 .br
 
 .br
-For HLS, the output pid will deliver the master playlist and the variant playlists.
+For HLS, the output PID will deliver the master playlist and the variant playlists.
 .br
 The default variant playlist are $NAME_$N.m3u8, where $NAME is the radical of the output file name and $N is the 1-based index of the variant.
 .br
 
 .br
-.P
-.B
-Segmentation
+.SS Segmentation
 .br
 The default behavior of the segmenter is to estimate the theoretical start time of each segment based on target segment duration, and start a new segment when a packet with SAP type 1,2,3 or 4 with time greater than the theoretical time is found.
 .br
 This behavior can be changed to find the best SAP packet around a segment theoretical boundary using .I sbound:
 .br
-* closest mode: the segment will start at the closest SAP of the theoretical boundary
+* `closest` mode: the segment will start at the closest SAP of the theoretical boundary
 .br
-* in mode: the segment will start at or before the theoretical boundary
+* `in` mode: the segment will start at or before the theoretical boundary
 .br
 Warning: These modes will introduce delay in the segmenter (typically buffering of one GOP) and should not be used for low-latency modes.
 .br
@@ -3809,39 +4806,141 @@
 .br
 
 .br
-.P
-.B
-Cue-driven segmentation
+.SS Dynamic (real-time live) Mode
+.br
+The dasher does not perform real-time regulation by default.
+.br
+For regular segmentation, you should enable segment regulation .I sreg if your sources are not real-time.
+.br
+Example
+.br
+gpac -i source.mp4 -o live.mpd:segdur=2:profile=live:dmode=dynamic:sreg
+.br
+
+.br
+
+.br
+For low latency segmentation with fMP4, you will need to specify the following options:
+.br
+* cdur: set the fMP4 fragment duration
+.br
+* asto: set the availability time offset for DASH. This value should be equal or slightly greater than segment duration minus cdur
+.br
+* llhls: enable low latency for HLS
+.br
+If your sources are not real-time, insert a reframer filter with real-time regulation
+.br
+Example
+.br
+gpac -i source.mp4 reframer:rt=on -o live.mpd:segdur=2:cdur=0.2:asto=1.8:profile=live:dmode=dynamic
+.br
+
+.br
+This will create DASH segments of 2 seconds made of fragments of 200 ms and indicate to the client that requests can be made 1.8 seconds earlier than segment complete availability on server.
+.br
+Example
+.br
+gpac -i source.mp4 reframer:rt=on -o live.m3u8:segdur=2:cdur=0.2:llhls=br:dmode=dynamic
+.br
+
+.br
+This will create DASH segments of 2 seconds made of fragments of 200 ms and produce HLS low latency parts using byte ranges in the final segment.
+.br
+Example
+.br
+gpac -i source.mp4 reframer:rt=on -o live.m3u8:segdur=2:cdur=0.2:llhls=sf:dmode=dynamic
+.br
+
+.br
+This will create DASH segments of 2 seconds made of fragments of 200 ms and produce HLS low latency parts using dedicated files.
+.br
+
+.br
+You can combine LL-HLS and DASH-LL generation:
+.br
+Example
+.br
+gpac -i source.mp4 reframer:rt=on -o live.mpd:dual:segdur=2:cdur=0.2:asto=1.8:llhls=br:profile=live:dmode=dynamic
+.br
+
+.br
+
+.br
+For DASH, the filter will use the local clock for UTC anchor points in DASH.
+.br
+The filter can fetch and signal clock in other ways using .I utcs.
+.br
+Example
+.br
+[opts]:utcs=inband
+.br
+
+.br
+This will use the local clock and insert in the MPD a UTCTiming descriptor containing the local clock.
+.br
+Example
+.br
+[opts]::utcs=http://time.akamai.com[::opts]
+.br
+
+.br
+This will fetch time from http://time.akamai.com, use it as the UTC reference for segment generation and insert in the MPD a UTCTiming descriptor containing the time server URL.
+.br
+Note: if not set as a global option using --utcs=, you must escape the url using double :: or use other separators.
+.br
+
+.br
+.SS Cue-driven segmentation
 .br
-The segmenter can take a list of instructions, or Cues, to use for the segmentation process, in which case only these are used to derive segment boundaries.
+The segmenter can take a list of instructions, or Cues, to use for the segmentation process, in which case only these are used to derive segment boundaries. Cues can be set through XML files or injected in input packets.
+.br
+
 .br
 Cue files can be specified for the entire segmenter, or per PID using DashCue property.
 .br
 Cues are given in an XML file with a root element called <DASHCues>, with currently no attribute specified. The children are one or more <Stream> elements, with attributes:
 .br
-* id: integer for stream/track/pid ID
+* id: integer for stream/track/PID ID
 .br
 * timescale: integer giving the units of following timestamps
 .br
 * mode: if present and value is edit, the timestamp are in presentation time (edit list applied) otherwise they are in media time
 .br
+* ts_offset: integer giving a value (in timescale) to subtract to the DTS/CTS values listed
+.br
 
 .br
 The children of <Stream> are one or more <Cue> elements, with attributes:
 .br
-* sample: integer giving the sample/frame number of a sample at which spliting shall happen
+* sample: integer giving the sample/frame number of a sample at which splitting shall happen
 .br
-* dts: long integer giving the decoding time stamp of a sample at which spliting shall happen
+* dts: long integer giving the decoding time stamp of a sample at which splitting shall happen
 .br
-* cts: long integer giving the composition / presentation time stamp of a sample at which spliting shall happen
+* cts: long integer giving the composition / presentation time stamp of a sample at which splitting shall happen
 .br
 Warning: Cues shall be listed in decoding order.
 .br
 
 .br
-.P
-.B
-Manifest Generation only mode
+If the DashCue property of a PID equals inband, the PID will be segmented according to the CueStart property of input packets.
+.br
+This feature is typically combined with a list of files as input:
+.br
+Example
+.br
+gpac -i list.m3u:sigcues -o res/live.mpd
+.br
+
+.br
+This will load the flist filter in cue mode, generating continuous timelines from the sources and injecting a CueStart property at each new file.
+.br
+
+.br
+If the .I cues option equals none, the DashCue property of input PIDs will be ignored.
+.br
+
+.br
+.SS Manifest Generation only mode
 .br
 The segmenter can be used to generate manifests from already fragmented ISOBMFF inputs using .I sigfrag.
 .br
@@ -3873,7 +4972,7 @@
 .br
 Example
 .br
--i ondemand_src.mp4 -o dash.mpd:sigfrag:profile=onDemand
+gpac -i ondemand_src.mp4 -o dash.mpd:sigfrag:profile=onDemand
 .br
 
 .br
@@ -3881,7 +4980,7 @@
 .br
 Example
 .br
--i ondemand_src.mp4 -o dash.m3u8:sigfrag
+gpac -i ondemand_src.mp4 -o dash.m3u8:sigfrag
 .br
 
 .br
@@ -3889,7 +4988,7 @@
 .br
 Example
 .br
--i seglist.txt -o dash.mpd:sigfrag
+gpac -i seglist.txt -o dash.mpd:sigfrag
 .br
 
 .br
@@ -3897,7 +4996,7 @@
 .br
 Example
 .br
--i seglist.txt:Template=$XInit=init$$q1/$Number$ -o dash.mpd:sigfrag:profile=live
+gpac -i seglist.txt:Template=$XInit=init$$q1/$Number$ -o dash.mpd:sigfrag:profile=live
 .br
 
 .br
@@ -3905,11 +5004,59 @@
 .br
 
 .br
-.P
-.B
-Muxer development considerations
+.SS Cue Generation only mode
+.br
+The segmenter can be used to only generate segment boundaries from a set of inputs using .I gencues, without generating manifests or output files.
+.br
+In this mode, output PIDs are declared directly rather than redirected to media segment files.
 .br
-Output muxers allowing segmented output must obey the following:
+The segmentation logic is not changed, and packets are forwarded with the same information and timing as in regular mode.
+.br
+
+.br
+Output PIDs are forwarded with DashCue=inband property, so that any subsequent dasher follows the same segmentation process (see above).
+.br
+
+.br
+The first packet in a segment has:
+.br
+- property FileNumber (and, if multiple files, FileName) set as usual
+.br
+- property CueStart set
+.br
+- property DFPStart=0 set if this is the first packet in a period
+.br
+
+.br
+This mode can be used to pre-segment the streams for later processing that must take place before final dashing.
+.br
+Example
+.br
+gpac -i source.mp4 dasher:gencues cecrypt:cfile=roll_seg.xml -o live.mpd
+.br
+
+.br
+This will allow the encrypter to locate dash boundaries and roll keys at segment boundaries.
+.br
+Example
+.br
+gpac -i s1.mp4 -i s2.mp4:#CryptInfo=clear:#Period=3 -i s3.mp4:#Period=3 dasher:gencues cecrypt:cfile=roll_period.xml -o live.mpd
+.br
+
+.br
+If the DRM file uses keyRoll=period, this will generate:
+.br
+- first period crypted with one key
+.br
+- second period clear
+.br
+- third period crypted with another key
+.br
+
+.br
+.SS Multiplexer development considerations
+.br
+Output multiplexers allowing segmented output must obey the following:
 .br
 - inspect packet properties
 .br
@@ -3917,19 +5064,19 @@
 .br
 * FileName: if set, indicate the file name. If not present, output shall be a single file. This is only set for packet carrying the FileNumber property, and only on one PID (usually the first) for multiplexed outputs
 .br
- * IDXName: gives the optional index name (if not present, index shall be in the same file as dash segment). Only used for MPEG-2 TS for now
+ * IDXName: gives the optional index name. If not present, index shall be in the same file as dash segment. Only used for MPEG-2 TS for now
 .br
- * EODS: property is set on packets with no payload and no timestamp to signal the end of a DASH segment. This is only used when stoping/resuming the segmentation process, in order to flush segments without dispatching an EOS (see .I subdur )
+ * EODS: property is set on packets with no payload and no timestamp to signal the end of a DASH segment. This is only used when stopping/resuming the segmentation process, in order to flush segments without dispatching an EOS (see .I subdur )
 .br
 - for each segment done, send a downstream event on the first connected PID signaling the size of the segment and the size of its index if any
 .br
-- for muxers with init data, send a downstream event signaling the size of the init and the size of the global index if any
+- for multiplexers with init data, send a downstream event signaling the size of the init and the size of the global index if any
 .br
-- the following filter options are passed to muxers, which should declare them as arguments:
+- the following filter options are passed to multiplexers, which should declare them as arguments:
 .br
- * noinit: disables output of init segment for the muxer (used to handle bitstream switching with single init in DASH)
+ * noinit: disables output of init segment for the multiplexer (used to handle bitstream switching with single init in DASH)
 .br
- * frag: indicates muxer shall use fragmented format (used for ISOBMFF mostly)
+ * frag: indicates multiplexer shall use fragmented format (used for ISOBMFF mostly)
 .br
 * subs_sidx=0: indicates an SIDX shall be generated - only added if not already specified by user
 .br
@@ -3939,20 +5086,20 @@
 .br
 
 .br
-The segmenter will add the following properties to the output PIDs:
+The segmenter adds the following properties to the output PIDs:
 .br
 * DashMode: identifies VoD (single file with global index) or regular DASH mode used by segmenter
 .br
 * DashDur: identifies target DASH segment duration - this can be used to estimate the SIDX size for example
 .br
-
+* LLHLS: identifies LLHLS is used; the multiplexer must send fragment size events back to the dasher, and set LLHLSFragNum on the first packet of each fragment
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-segdur (dbl, default: 0.0): target segment duration in seconds. A value less than or equal to 0 means to 1.0 second
+segdur (frac, default: 0/0): target segment duration in seconds. A value less than or equal to 0 means to 1.0 second
 .br
 tpl (bool, default: true): use template mode (multiple segment, template URLs)
 .br
@@ -3974,11 +5121,11 @@
 .br
 align (bool, default: true): enable segment time alignment between representations
 .br
-sap (bool, default: true): enable spliting segments at SAP boundaries
+sap (bool, default: true): enable splitting segments at SAP boundaries
 .br
 mix_codecs (bool, default: false): enable mixing different codecs in an adaptation set
 .br
-ntp (enum, default: rem): insert/override NTP clock at the begining of each segment
+ntp (enum, default: rem): insert/override NTP clock at the beginning of each segment
 .br
 * rem: removes NTP from all input packets
 .br
@@ -3990,8 +5137,6 @@
 .br
 no_sar (bool, default: false): do not check for identical sample aspect ratio for adaptation sets
 .br
-m2ts (bool, default: false): generate MPEG-2 TS output
-.br
 bs_switch (enum, default: def): bitstream switching mode (single init segment)
 .br
 * def: resolves to off for onDemand and inband for live
@@ -4002,13 +5147,15 @@
 .br
 * inband: moves decoder config inband if possible
 .br
+* pps: moves PPS and APS inband, keep VPS,SPS and DCI out of band (used for VVC RPR)
+.br
 * force: enables it even if only one representation
 .br
 * multi: uses multiple stsd entries in ISOBMFF
 .br
 
 .br
-template (str): template string to use to generate segment name - see filter help
+template (str): template string to use to generate segment name
 .br
 segext (str): file extension to use for segments
 .br
@@ -4024,12 +5171,16 @@
 .br
 * webm: uses WebM format
 .br
-* raw: uses raw media format (disables muxed representations)
+* ogg: uses OGG format
+.br
+* raw: uses raw media format (disables multiplexed representations)
 .br
 * auto: guess format based on extension, default to mp4 if no extension
 .br
 
 .br
+rawsub (bool, default: no): use raw subtitle format instead of encapsulating in container
+.br
 asto (dbl, default: 0): availabilityStartTimeOffset to use in seconds. A negative value simply increases the AST, a positive value sets the ASToffset to representations
 .br
 profile (enum, default: auto): target DASH profile. This will set default option values to ensure conformance to the desired profile. For MPEG-2 TS, only main and live are used, others default to main
@@ -4050,6 +5201,8 @@
 .br
 * dashavc264.onDemand: DASH-IF onDemand profile
 .br
+* dashif.ll: DASH IF low-latency profile (set UTC server to time.akamai.com if none set)
+.br
 
 .br
 profX (str): list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used
@@ -4080,7 +5233,9 @@
 .br
 
 .br
-buf (sint, default: -100): min buffer duration in ms. negative value means percent of segment duration (eg -150 = 1.5*seg_dur)
+buf (sint, default: -100): min buffer duration in ms. negative value means percent of segment duration (e.g. -150 = 1.5*seg_dur)
+.br
+spd (sint, default: 0): suggested presentation delay in ms
 .br
 timescale (sint, default: 0): set timescale for timeline and segment list/template. A value of 0 picks up the first timescale of the first stream in an adaptation set. A negative value forces using stream timescales for each timed element (multiplication of segment list/template/timelines). A positive value enforces the MPD timescale
 .br
@@ -4102,13 +5257,13 @@
 .br
 base (strl): set base URLs of MPD
 .br
-refresh (dbl, default: 0): refresh rate for dynamic manifests, in seconds. A negative value sets the MPD duration. If 0, uses dash duration
+refresh (dbl, default: 0): refresh rate for dynamic manifests, in seconds (a negative value sets the MPD duration, value 0 uses dash duration)
 .br
-tsb (dbl, default: 30): time-shift buffer depth in seconds. A negative value means infinity
+tsb (dbl, default: 30): time-shift buffer depth in seconds (a negative value means infinity)
 .br
 subdur (dbl, default: 0): maximum duration of the input file to be segmented. This does not change the segment duration, segmentation stops once segments produced exceeded the duration
 .br
-ast (str): set start date (as xs:date, eg YYYY-MM-DDTHH:MM:SSZ) for live mode. Default is now. !! Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size !!
+ast (str): set start date (as xs:date, e.g. YYYY-MM-DDTHH:MM:SSZ) for live mode. Default is now. !! Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size !!
 .br
 state (str): path to file used to store/reload state info when simulating live. This is stored as a valid MPD with GPAC XML extensions
 .br
@@ -4118,9 +5273,9 @@
 .br
 hlsc (bool, default: false): insert clock reference in variant playlist in live HLS
 .br
-cues (str): set cue file - see filter help
+cues (str): set cue file
 .br
-strict_cues (bool, default: false): strict mode for cues, complains if spliting is not on SAP type 1/2/3 or if unused cue is found
+strict_cues (bool, default: false): strict mode for cues, complains if splitting is not on SAP type 1/2/3 or if unused cue is found
 .br
 strict_sap (enum, default: off): strict mode for sap
 .br
@@ -4134,13 +5289,13 @@
 .br
 subs_sidx (sint, default: -1): number of subsegments per sidx. negative value disables sidx. Only used to inherit sidx option of destination
 .br
-cmpd (bool, default: false): skip line feed and spaces in MPD XML for more compacity
+cmpd (bool, default: false): skip line feed and spaces in MPD XML for compactness
 .br
 styp (str): indicate the 4CC to use for styp boxes when using ISOBMFF output
 .br
 dual (bool): indicate to produce both MPD and M3U files
 .br
-sigfrag (bool): use manifest generation only mode - see filter help
+sigfrag (bool): use manifest generation only mode
 .br
 sbound (enum, default: out): indicate how the theoretical segment start TSS (= segment_number * duration) should be handled
 .br
@@ -4160,11 +5315,63 @@
 .br
 - otherwise in dynamic mode without context, do not generate segments ahead of time
 .br
+
+.br
 scope_deps (bool, default: true): scope PID dependencies to be within source. If disabled, PID dependencies will be checked across all input PIDs regardless of their sources
 .br
 utcs (str): URL to use as time server / UTCTiming source. Special value inband enables inband UTC (same as publishTime), special prefix xsd@ uses xsDateTime schemeURI rather than ISO
 .br
-force_flush (bool, default: false): force generating a single segment for each input. This can be usefull in batch mode when average source duration is known and used as segment duration but actual duration may sometimes be greater
+force_flush (bool, default: false): force generating a single segment for each input. This can be useful in batch mode when average source duration is known and used as segment duration but actual duration may sometimes be greater
+.br
+last_seg_merge (bool, default: false): force merging last segment if less than half the target duration
+.br
+mha_compat (enum, default: no): adaptation set generation mode for compatible MPEG-H Audio profile
+.br
+* no: only generate the adaptation set for the main profile
+.br
+* comp: only generate the adaptation sets for all compatible profiles
+.br
+* all: generate the adaptation set for the main profile and all compatible profiles
+.br
+
+.br
+mname (str): output manifest name for ATSC3 multiplexing
+.br
+llhls (enum, default: off): HLS low latency type
+.br
+* off: do not use LL-HLS
+.br
+* br: use LL-HLS with byte-range for segment parts, pointing to full segment (DASH-LL compatible)
+.br
+* sf: use separate files for segment parts (post-fixed .1, .2 etc.)
+.br
+* brsf: generate two sets of manifest, one for byte-range and one for files (_IF added before extension of manifest)
+.br
+
+.br
+hlsdrm (str): cryp file info for HLS full segment encryption
+.br
+hlsx (strl): list of string to append to master HLS header before variants with ['#foo','#bar=val'] added as #foo \n #bar=val
+.br
+ll_preload_hint (bool, default: true): inject preload hint for LL-HLS
+.br
+ll_rend_rep (bool, default: true): inject rendition reports for LL-HLS
+.br
+cmaf (enum, default: no): use cmaf guidelines
+.br
+* no: CMAF not enforced
+.br
+* cmfc: use CMAF cmfc guidelines
+.br
+* cmf2: use CMAF cmf2 guidelines
+.br
+
+.br
+chain (str): URL of next MPD for regular chaining
+.br
+chain_fbk (str): URL of fallback MPD
+.br
+gencues (bool, default: false): only insert segment boundaries and do not generate manifests
 .br
 
 .br
@@ -4175,14 +5382,54 @@
 .br
 
 .br
-This filter reaggregates a set of split tiled HEVC streams (hvt1 or hvt2 in isobmff) into a single HEVC stream.
+This filter aggregates a set of split tiled HEVC streams (hvt1 or hvt2 in ISOBMFF) into a single HEVC stream.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+tiledrop (uintl, updatable): specify indexes of tiles to drop
+.br
+ttimeout (uint, default: 10000, updatable): number of milliseconds to wait until considering a tile packet lost, 0 waits forever
+.br
+
+.br
+.SH tilesplit
+.LP
+.br
+Description: HEVC tile bitstream splitter
+.br
+
+.br
+This filter splits an HEVC tiled stream into tiled HEVC streams (hvt1 or hvt2 in ISOBMFF).
+.br
+The filter will move to passthrough mode if the bitstream is not tiled.
+.br
+If the Bitrate property is set on the input PID, the output tile PIDs will have a bitrate set to (Bitrate - 10k)/nb_opids, 10 kbps being reserved for the base.
+.br
+
+.br
+Each tile PID will be assigned the following properties:
+.br
+* `ID`: equal to the base PID ID (same as input) plus the 1-based index of the tile in raster scan order.
+.br
+* `TileID`: equal to the 1-based index of the tile in raster scan order.
+.br
+
+.br
+Warning: The filter does not check if tiles are independently-coded (MCTS) !
+.br
+
+.br
+Warning: Support for dynamic changes of tiling grid has not been tested !
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-tiledrop (uintl, default: , updatable): specify indexes of tiles to drop
+tiledrop (uintl, updatable): specify indexes of tiles to drop (0-based, in tile raster scan order)
 .br
 
 .br
@@ -4206,16 +5453,12 @@
 .SH stdin pipe
 .LP
 .br
-The filter can handle reading from stdin, by using -or stdin as input file name.
+The filter can handle reading from stdin, by using - or stdin as input file name.
 .br
 Example
 .br
 gpac -i - vout
 .br
-
-.br
-Example
-.br
 gpac -i stdin vout
 .br
 
@@ -4225,22 +5468,14 @@
 .SH Named pipes
 .LP
 .br
-The filter can handle reading from named pipes. The associated protocol scheme is pipe:// when loaded as a generic input (eg, -i pipe://URL where URL is a relative or absolute pipe name).
+The filter can handle reading from named pipes. The associated protocol scheme is pipe:// when loaded as a generic input (e.g. -i pipe://URL where URL is a relative or absolute pipe name).
 .br
 On Windows hosts, the default pipe prefix is \\.\pipe\gpac\ if no prefix is set.
 .br
-Example
-.br
 dst=mypipe resolves in \\.\pipe\gpac\mypipe
 .br
-
-.br
-Example
-.br
 dst=\\.\pipe\myapp\mypipe resolves in \\.\pipe\myapp\mypipe
 .br
-
-.br
 Any destination name starting with \\ is used as is, with \ translated in /.
 .br
 
@@ -4253,26 +5488,32 @@
 .br
 On non windows hosts, the created pipe will delete the pipe file upon filter destruction.
 .br
-
+ 
 .br
-Input pipes can be setup to run forever using .I ka. In this case, any potential pipe close on the writing side and end of stream will only be triggered upon session close.
+Input pipes can be setup to run forever using .I ka. In this case:
 .br
-This can be useful to pipe raw streams from different process into gpac:
+- any potential pipe close on the writing side will be ignored
 .br
-Receiver side: gpac -i pipe://mypipe:ext=.264:mkp:ka
+- end of stream will be triggered upon pipe close if .I sigeos is set
 .br
-Sender side: cat raw1.264 > mypipe && gpac -i raw2.264 -o pipe://mypipe:ext=.264
+- final end of stream will be triggered upon session close.
 .br
-The pipe input can be created in blocking mode or non-blocking mode. If the filter creates the pipe, blocking mode is always enabled.
+ 
 .br
-
+This can be useful to pipe raw streams from different process into gpac:
+.br
+* Receiver side: gpac -i pipe://mypipe:ext=.264:mkp:ka
+.br
+* Sender side: cat raw1.264 > mypipe && gpac -i raw2.264 -o pipe://mypipe:ext=.264 
+.br
+The pipe input can be created in blocking mode or non-blocking mode.
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-src (cstr): location of source content
+src (cstr): name of source pipe
 .br
 block_size (uint, default: 5000): buffer size used to read pipe
 .br
@@ -4280,11 +5521,13 @@
 .br
 mime (str): indicate mime type of pipe data
 .br
-blk (bool, default: false): open pipe in block mode - see filter help
+blk (bool, default: false): open pipe in block mode
 .br
-ka (bool, default: false): keep-alive pipe when end of input is detected - see filter help
+ka (bool, default: false): keep-alive pipe when end of input is detected
 .br
-mkp (bool, default: false): create pipe if not found - see filter help
+mkp (bool, default: false): create pipe if not found
+.br
+sigeos (bool, default: false): signal end of stream whenever a pipe breaks in keep-alive mode
 .br
 
 .br
@@ -4299,7 +5542,7 @@
 .br
 Warning: Output pipes do not currently support non blocking mode.
 .br
-The assoicated protocol scheme is pipe:// when loaded as a generic output (eg, -o pipe://URL where URL is a relative or absolute pipe name).
+The associated protocol scheme is pipe:// when loaded as a generic output (e.g. -o pipe://URL where URL is a relative or absolute pipe name).
 .br
 Data format of the pipe shall be specified using extension (either in filename or through .I ext option) or MIME type through .I mime
 .br
@@ -4309,18 +5552,10 @@
 .br
 On Windows hosts, the default pipe prefix is \\.\pipe\gpac\ if no prefix is set 
 .br
-Example
-.br
 dst=mypipe resolves in \\.\pipe\gpac\mypipe
 .br
-
-.br
-Example
-.br
 dst=\\.\pipe\myapp\mypipe resolves in \\.\pipe\myapp\mypipe
 .br
-
-.br
 Any destination name starting with \\ is used as is, with \ translated in /
 .br
 
@@ -4334,7 +5569,7 @@
 .SH Options (expert):
 .LP
 .br
-dst (cstr): location of destination file
+dst (cstr): name of destination pipe
 .br
 ext (str): indicate file extension of pipe data
 .br
@@ -4342,11 +5577,11 @@
 .br
 dynext (bool, default: false): indicate the file extension is set by filter chain, not dst
 .br
-start (dbl, default: 0.0): set playback start offset. Negative value means percent of media dur with -1 <=> dur
+start (dbl, default: 0.0): set playback start offset. A negative value means percent of media duration with -1 equal to duration
 .br
-speed (dbl, default: 1.0): set playback speed. If speed is negative and start is 0, start is set to -1
+speed (dbl, default: 1.0): set playback speed. If negative and start is 0, start is set to -1
 .br
-mkp (bool, default: false): create pipe if not found - see filter help
+mkp (bool, default: false): create pipe if not found
 .br
 block_size (uint, default: 5000): buffer size used to write to pipe, windows only
 .br
@@ -4355,23 +5590,26 @@
 .SH gsfmx
 .LP
 .br
-Description: GSF Muxer
+Description: GSF Multiplexer
 .br
 
 .br
-This filter provides GSF (GPAC Super/Simple/Serialized/Stream/State Format) multiplexing.
+This filter provides GSF (GPAC Serialized Format) multiplexing.
 .br
 It serializes the stream states (config/reconfig/info update/remove/eos) and packets of input PIDs. This allows either saving to file a session, or forwarding the state/data of streams to another instance of GPAC using either pipes or sockets. Upstream events are not serialized.
 .br
 
 .br
-The default behaviour does not insert sequence numbers. When running over general protocols not ensuring packet order, this should be inserted.
+The default behavior does not insert sequence numbers. When running over general protocols not ensuring packet order, this should be inserted.
 .br
-The serializer sends tune-in packets (global and per pid) at the requested carousel rate - if 0, no carousel. These packets are marked as redundant so that they can be discarded by output filters if needed.
+The serializer sends tune-in packets (global and per PID) at the requested carousel rate - if 0, no carousel. These packets are marked as redundant so that they can be discarded by output filters if needed.
 .br
 
 .br
-The stream format can be encrypted in AES 128 CBC mode. For all packets, the packet header (header, size, frame size/block offset and optional seq num) are in the clear and the followings byte until the last byte of the last multiple of block size (16) fitting in the payload are encrypted.
+.SH Encryption
+.LP
+.br
+The stream format can be encrypted in AES 128 CBC mode. For all packets, the packet header (header, size, frame size/block offset and optional seq num) are in the clear and the following bytes until the last byte of the last multiple of block size (16) fitting in the payload are encrypted.
 .br
 For data packets, each fragment is encrypted individually to avoid error propagation in case of losses.
 .br
@@ -4383,7 +5621,10 @@
 .br
 
 .br
-The header/tunein packet may get quite big when all pid properties are kept. In order to help reduce its size, the .I minp option can be used: this will remove all built-in properties marked as dropable (cf property help) as well as all non built-in properties.
+.SH Filtering properties
+.LP
+.br
+The header/tunein packet may get quite big when all PID properties are kept. In order to help reduce its size, the .I minp option can be used: this will remove all built-in properties marked as droppable (cf property help) as well as all non built-in properties.
 .br
 The .I skp option may also be used to specify which property to drop:
 .br
@@ -4397,8 +5638,43 @@
 .br
 
 .br
+.SH File mode
+.LP
+.br
+By default the filter only accepts framed media streams as input PID, not files. This can be changed by explicitly loading the filter with .I ext or .I dst set.
+.br
+Example
+.br
+gpac -i source.mp4 gsfmx:dst=manifest.mpd -o dump.gsf
+.br
+
+.br
+This will DASH the source and store every files produced as PIDs in the GSF mux.
+.br
+In order to demultiplex such a file, the gsfdmxfilter will likely need to be explicitly loaded:
+.br
+Example
+.br
+gpac -i mux.gsf gsfdmx -o dump/$File$:dynext:clone
+.br
+
+.br
+This will extract all files from the GSF mux.
+.br
 
 .br
+By default when working in file mode, the filter only accepts PIDs of type file as input.
+.br
+To allow a mix of files and streams, use .I mixed:
+.br
+Example
+.br
+gpac -i source.mp4 gsfmx:dst=manifest.mpd:mixed -o dump.gsf
+.br
+
+.br
+This will DASH the source, store the manifest file and the media streams with their packet properties in the GSF mux.
+.br
 
 .br
 .SH Options (expert):
@@ -4422,40 +5698,46 @@
 .br
 
 .br
-key (mem): encrypt packets using given key - see filter helps
+key (mem): encrypt packets using given key
 .br
 IV (mem): set IV for encryption - a constant IV is used to keep packet overhead small (cbcs-like)
 .br
-pattern (frac, default: 1/0): set nb crypt / nb_skip block pattern. default is all encrypted
+pattern (frac, default: 1/0): set nb_crypt / nb_skip block pattern. default is all encrypted
 .br
 mpck (uint, default: 0): set max packet size. 0 means no fragmentation (each AU is sent in one packet)
 .br
 magic (str): magic string to append in setup packet
 .br
-skp (str): comma separated list of pid property names to skip - see filter help
+skp (str): comma separated list of PID property names to skip
 .br
-minp (bool, default: false): include only the minimum set of properties required for stream processing - see filter help
+minp (bool, default: false): include only the minimum set of properties required for stream processing
 .br
-crate (dbl, default: 0): carousel period for tune-in info in seconds - see filter help
+crate (dbl, default: 0): carousel period for tune-in info in seconds
+.br
+ext (str): file extension for file mode
+.br
+dst (str): target URL in file mode
+.br
+mixed (bool, default: false): allow GSF to contain both files and media streams
 .br
 
 .br
 .SH gsfdmx
 .LP
 .br
-Description: GSF Demuxer
+Description: GSF demultiplexer
 .br
 
 .br
-This filter provides GSF (GPAC Super/Simple/Serialized/Stream/State Format) demultiplexing.
+This filter provides GSF (GPAC Serialized Format) demultiplexing.
 .br
-It deserializes the stream states (config/reconfig/info update/remove/eos) and packets of input PIDs.
+It de-serializes the stream states (config/reconfig/info update/remove/eos) and packets in the GSF bytestream.
 .br
 This allows either reading a session saved to file, or receiving the state/data of streams from another instance of GPAC using either pipes or sockets
 .br
 
 .br
-The stream format can be encrypted in AES 128 CBC mode, in which case the demux filters must be given a 128 bit key.
+The stream format can be encrypted in AES 128 CBC mode, in which case the demultiplexing filter must be given a 128 bit key.
 .br
 
 .br
@@ -4481,11 +5763,11 @@
 .br
 This filter handles generic output sockets (mono-directional) in blocking mode only.
 .br
-The filter can work in server mode, waiting for source connections, or or in client mode, directly connecting.
+The filter can work in server mode, waiting for source connections, or in client mode, directly connecting to a server.
 .br
 In server mode, the filter can be instructed to keep running at the end of the stream.
 .br
-In server mode, the default behaviour is to keep input packets when no more clients are connected; this can be adjusted though the .I kp option, however there is no realtime regulation of how fast packets are droped.
+In server mode, the default behavior is to keep input packets when no more clients are connected; this can be adjusted though the .I kp option, however there is no realtime regulation of how fast packets are dropped.
 .br
 If your sources are not real time, consider adding a real-time scheduler in the chain (cf reframer filter), or set the send .I rate option.
 .br
@@ -4501,9 +5783,17 @@
 .br
 
 .br
+When ports are specified in the URL and the default option separators are used (see gpac -h doc), the URL must either:
+.br
+- have a trailing '/', e.g. udp://localhost:1234/[:opts]
+.br
+- use gpac escape, e.g. udp://localhost:1234[:gpac:opts]
+.br
+
+.br
 The socket output can be configured to drop or revert packet order for test purposes.
 .br
-For both mode, a window size in packets is specified as the drop/revert fraction denominator, and the index of the packet to drop/revert is given as the numerator/
+A window size in packets is specified as the drop/revert fraction denominator, and the index of the packet to drop/revert is given as the numerator/
 .br
 If the numerator is 0, a packet is randomly chosen in that window.
 .br
@@ -4525,14 +5815,10 @@
 .br
 
 .br
-
-.br
-
-.br
 .SH Options (expert):
 .LP
 .br
-dst (cstr): location of destination file
+dst (cstr): URL of destination
 .br
 sockbuf (uint, default: 65536): block size used to read file
 .br
@@ -4540,9 +5826,9 @@
 .br
 ifce (cstr): default multicast interface
 .br
-ext (str): file extension of pipe data - see filter help
+ext (str): file extension of pipe data
 .br
-mime (str): mime type of pipe data - see filter help
+mime (str): mime type of pipe data
 .br
 listen (bool, default: false): indicate the output socket works in server mode
 .br
@@ -4552,15 +5838,17 @@
 .br
 kp (bool, default: true): keep packets in queue if no more clients
 .br
-start (dbl, default: 0.0): set playback start offset. Negative value means percent of media dur with -1 <=> dur
+start (dbl, default: 0.0): set playback start offset. A negative value means percent of media duration with -1 equal to duration
 .br
-speed (dbl, default: 1.0): set playback speed. If speed is negative and start is 0, start is set to -1
+speed (dbl, default: 1.0): set playback speed. If negative and start is 0, start is set to -1
 .br
 rate (uint, default: 0): set send rate in bps, disabled by default (as fast as possible)
 .br
-pckr (frac, default: 0/0): reverse packet every N - see filter help
+pckr (frac, default: 0/0): reverse packet every N
+.br
+pckd (frac, default: 0/0): drop packet every N
 .br
-pckd (frac, default: 0/0): drop packet every N - see filter help
+ttl (uint, default: 0, minmax: 0-127): multicast TTL
 .br
 
 .br
@@ -4580,11 +5868,25 @@
 .br
 fps (frac, default: 0/1000): import frame rate (0 default to FPS from bitstream or 25 Hz)
 .br
-index (dbl, default: -1.0): indexing window length. If 0, bitstream is not probed for duration. A negative value skips the indexing if the source file is larger than 100M (slows down importers) unless a play with start range > 0 is issued, otherwise uses the positive value
+index (dbl, default: -1.0): indexing window length. If 0, bitstream is not probed for duration. A negative value skips the indexing if the source file is larger than 100M (slows down importers) unless a play with start range > 0 is issued
 .br
 importer (bool, default: false): compatibility with old importer
 .br
-deps (bool, default: false): import samples dependencies information
+deps (bool, default: false): import sample dependency information
+.br
+notime (bool, default: false): ignore input timestamps, rebuild from 0
+.br
+temporal_delim (bool, default: false): keep temporal delimiters in reconstructed frames
+.br
+bsdbg (enum, default: off): debug NAL parsing in parser@debug logs
+.br
+* off: not enabled
+.br
+* on: enabled
+.br
+* full: enable with number of bits dumped
+.br
+
 .br
 
 .br
@@ -4595,7 +5897,11 @@
 .br
 
 .br
-This filter is used to rewrite AV1 OBU bitstream into IVF, annex B or OBU sequence, reinserting the temporal delimiter OBU.
+This filter rewrites VPx or AV1 bitstreams into a IVF, annexB or OBU sequence.
+.br
+The temporal delimiter OBU is re-inserted in annexB (.av1 and .av1bfiles, with obu_size set) and OBU sequences (.obufiles, without obu_size)
+.br
+Note: VP8/9 codecs will only use IVF output (equivalent to file extension .ivf or :ext=ivf set on output).
 .br
 
 .br
@@ -4613,7 +5919,7 @@
 .br
 
 .br
-This filter decodes MPEG-2, MPEG-4 Part 2, AVC|H264 and HEVC streams through NVideia decoder. It allows GPU frame dispatch or direct frame copy.
+This filter decodes MPEG-2, MPEG-4 Part 2, AVC|H264 and HEVC streams through NVidia decoder. It allows GPU frame dispatch or direct frame copy.
 .br
 
 .br
@@ -4638,7 +5944,7 @@
 .br
 * cuda: use a CUDA-based decoder if faster than dedicated engines
 .br
-* dxva: go through DXVA internally if possible (requires D3D9 interop)
+* dxva: go through DXVA internally if possible (requires D3D9)
 .br
 
 .br
@@ -4646,7 +5952,7 @@
 .br
 * copy: each frame is copied and dispatched
 .br
-* single: frame data is only retrieved when used, single memory space for all frames (not safe if multiple consummers)
+* single: frame data is only retrieved when used, single memory space for all frames (not safe if multiple consumers)
 .br
 * gl: frame data is mapped to an OpenGL texture
 .br
@@ -4654,52 +5960,66 @@
 .br
 
 .br
-.SH atscin
+.SH routein
 .LP
 .br
-Description: ATSC input
+Description: ROUTE input
 .br
 
 .br
-This filter is a receiver for ATSC 3.0 ROUTE sessions. Source is identified using the string atsc://.
+This filter is a receiver for ROUTE sessions (ATSC 3.0 and generic ROUTE).
+.br
+- ATSC 3.0 mode is identified by the URL atsc://.
+.br
+- Generic ROUTE mode is identified by the URL route://IP:PORT.
+.br
+
 .br
 The filter can work in cached mode, source mode or standalone mode.
 .br
 .SH Cached mode
 .LP
 .br
-The cached mode is the default filter behaviour. It populates GPAC HTTP Cache with the recieved files, using http://gpatsc/serviceN/ as service root, N being the ATSC service ID.
+The cached mode is the default filter behavior. It populates GPAC HTTP Cache with the received files, using http://groute/serviceN/ as service root, N being the ROUTE service ID.
 .br
-In cached mode, repeated files are always send.
+In cached mode, repeated files are always pushed to cache.
+.br
+The maximum number of media segment objects in cache per service is defined by .I nbcached; this is a safety used to force object removal in case DASH client timing is wrong and some files are never requested at cache level.
 .br
 
 .br
 The cached MPD is assigned the following headers:
 .br
-* x-dash-atsc: integer value, indicates the ATSC service ID.
+* `x-route`: integer value, indicates the ROUTE service ID.
+.br
+* `x-route-first-seg`: string value, indicates the name of the first segment (completely or currently being) retrieved from the broadcast.
 .br
-* x-dash-first-seg: string value, indicates the name of the first segment completely retrieved from the broadcast.
+* `x-route-ll`: boolean value, if yes indicates that the indicated first segment is currently being received (low latency signaling).
 .br
-* x-atsc-loop: boolean value, if yes indicates a loop in the service has been detected (usually pcap replay loop).
+* `x-route-loop`: boolean value, if yes indicates a loop in the service has been detected (usually pcap replay loop).
 .br
 
 .br
 The cached files are assigned the following headers:
 .br
-* x-atsc: boolean value, if yes indicates the file comes from an ATSC session.
+* `x-route`: boolean value, if yes indicates the file comes from an ROUTE session.
+.br
+
+.br
+If .I max_segs is set, file deletion event will be triggered in the filter chain.
 .br
 
 .br
 .SH Source mode
 .LP
 .br
-In source mode, the filter outputs files on a single output pid of type file. The files are dispatched once fully received, the output pid carries a sequence of complete files. Repeated files are not sent unless requested.
+In source mode, the filter outputs files on a single output PID of type file. The files are dispatched once fully received, the output PID carries a sequence of complete files. Repeated files are not sent unless requested.
 .br
-If needed, one pid per TSI can be used rather than a single pid. This avoids mixing files of different mime types on the same pid (e.g. mpd and isobmff).
+If needed, one PID per TSI can be used rather than a single PID. This avoids mixing files of different mime types on the same PID (e.g. HAS manifest and ISOBMFF).
 .br
 Example
 .br
-gpac -i atsc://cache=false -o $ServiceID$/$File$:dynext
+gpac -i atsc://gcache=false -o $ServiceID$/$File$:dynext
 .br
 
 .br
@@ -4707,14 +6027,18 @@
 .br
 
 .br
+If .I max_segs is set, file deletion event will be triggered in the filter chain.
+.br
+
+.br
 .SH Standalone mode
 .LP
 .br
-In standalone mode, the filter does not produce any output pid and writes received files to the .I odir directory.
+In standalone mode, the filter does not produce any output PID and writes received files to the .I odir directory.
 .br
 Example
 .br
-gpac -i atsc://odir=output
+gpac -i atsc://:odir=output
 .br
 
 .br
@@ -4722,12 +6046,31 @@
 .br
 
 .br
+If .I max_segs is set, old files will be deleted.
+.br
+
+.br
+.SH File Repair
+.LP
+.br
+In case of losses or incomplete segment reception (during tune-in), the files are patched as follows:
+.br
+* MPEG-2 TS: all lost ranges are adjusted to 188-bytes boundaries, and transformed into NULL TS packets.
+.br
+* ISOBMFF: all top-level boxes are scanned, and incomplete boxes are transformed in free boxes, except mdat kept as is if .I repair is set to simple.
+.br
+
+.br
+If .I kc option is set, corrupted files will be kept. If .I fullseg is not set and files are only partially received, they will be kept.
+.br
+
+.br
 .SH Interface setup
 .LP
 .br
 On some systems (OSX), when using VM packet replay, you may need to force multicast routing on your local interface.
 .br
-You will have to do this for the base ATSC3 multicast (224.0.23.60):
+For ATSC, you will have to do this for the base signaling multicast (224.0.23.60):
 .br
 Example
 .br
@@ -4735,7 +6078,7 @@
 .br
 
 .br
-and on each service multicast:
+Then for each ROUTE service in the multicast:
 .br
 Example
 .br
@@ -4745,41 +6088,55 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
-src (cstr): location of source content - see filter help
+src (cstr): URL of source content
 .br
 ifce (str): default interface to use for multicast. If NULL, the default system interface will be used
 .br
-gcache (bool, default: true): indicate the files should populate GPAC HTTP cache - see filter help
+gcache (bool, default: true): indicate the files should populate GPAC HTTP cache
 .br
-tunein (sint, default: -2): service ID to bootstrap on. 0 means tune to no service, -1 tune all services -2 means tune on first service found
+tunein (sint, default: -2): service ID to bootstrap on for ATSC 3.0 mode (0 means tune to no service, -1 tune all services -2 means tune on first service found)
 .br
 buffer (uint, default: 0x80000): receive buffer size to use in bytes
 .br
 timeout (uint, default: 5000): timeout in ms after which tunein fails
 .br
+nbcached (uint, default: 8): number of segments to keep in cache per service
+.br
 kc (bool, default: false): keep corrupted file
 .br
-sr (bool, default: true): skip repeated files - ignored in cache mode
+skipr (bool, default: true): skip repeated files (ignored in cache mode)
 .br
-stsi (bool, default: false): define one output pid per tsi/serviceID - ignored in cache mode, see filter help
+stsi (bool, default: false): define one output PID per tsi/serviceID (ignored in cache mode)
 .br
 stats (uint, default: 1000): log statistics at the given rate in ms (0 disables stats)
 .br
 tsidbg (uint, default: 0): gather only objects with given TSI (debug)
 .br
-max_segs (uint, default: 0): maximum number of segments to keep - ignored in cache mode
+max_segs (uint, default: 0): maximum number of segments to keep on disk
 .br
-odir (str): output directory for stand-alone mode - see filter help
+odir (str): output directory for standalone mode
 .br
 reorder (bool, default: false): ignore order flag in ROUTE/LCT packets, avoiding considering object done when TOI changes
 .br
 rtimeout (uint, default: 5000): default timeout in ms to wait when gathering out-of-order packets
 .br
+fullseg (bool, default: false): only dispatch full segments in cache mode (always true for other modes)
+.br
+repair (enum, default: simple): repair mode for corrupted files
+.br
+* no: no repair is performed
+.br
+* simple: simple repair is performed (incomplete mdat boxes will be kept)
+.br
+* strict: incomplete mdat boxes will be lost as well as preceding moof boxes
+.br
+* full: HTTP-based repair, not yet implemented
+.br
+
+.br
 
 .br
 .SH rtpout
@@ -4794,12 +6151,12 @@
 .SH SDP mode
 .LP
 .br
-When the destination url is an SDP, the filter outputs an SDP on a file pid and streams RTP packets over UDP, starting from the indicated .I port.
+When the destination URL is an SDP, the filter outputs an SDP on a file PID and streams RTP packets over UDP, starting from the indicated .I port.
 .br
 .SH Direct RTP mode
 .LP
 .br
-When the destination url uses the protocol scheme rtp://IP:PORT, the filter does not output any SDP and streams a single input over RTP, using PORT indicated in the destination URL, or the first .I port configured.
+When the destination URL uses the protocol scheme rtp://IP:PORT, the filter does not output any SDP and streams a single input over RTP, using PORT indicated in the destination URL, or the first .I port configured.
 .br
 In this mode, it is usually needed to specify the desired format using .I ext or .I mime.
 .br
@@ -4820,18 +6177,16 @@
 .br
 - first initialize the clock by:
 .br
- - computing the smallest timestamp for all input pids
+ - computing the smallest timestamp for all input PIDs
 .br
- - mapping this media time to the system clock
+ - mapping this media time to the system clock
 .br
-- determine the earliest packet to send next on each input pid, adding .I delay if any
+- determine the earliest packet to send next on each input PID, adding .I delay if any
 .br
 - finally compare the packet mapped timestamp TS to the system clock SC. When TS - SC is less than .I tt, the RTP packets for the source packet are sent
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
@@ -4841,15 +6196,15 @@
 .br
 loop (bool, default: true): loop all streams in session (not always possible depending on source type)
 .br
-mpeg4 (bool, default: false): send all streams using MPEG-4 generic payload format if posible
+mpeg4 (bool, default: false): send all streams using MPEG-4 generic payload format if possible
 .br
 mtu (uint, default: 1460): size of RTP MTU in bytes
 .br
-ttl (uint, default: 2): time-to-live for muticast packets
+ttl (uint, default: 2): time-to-live for multicast packets
 .br
-ifce (str): default network inteface to use
+ifce (str): default network interface to use
 .br
-payt (uint, default: 96, minmax: 96-127): payload type to use for dynamic configs
+payt (uint, default: 96, minmax: 96-127): payload type to use for dynamic decoder configurations
 .br
 delay (sint, default: 0): send delay for packet (negative means send earlier)
 .br
@@ -4857,17 +6212,17 @@
 .br
 runfor (sint, default: -1): run for the given time in ms. Negative value means run for ever (if loop) or source duration, 0 only outputs the sdp
 .br
-tso (sint, default: -1): set timestamp offset in microsecs. Negative value means random initial timestamp
+tso (sint, default: -1): set timestamp offset in microseconds. Negative value means random initial timestamp
 .br
 xps (bool, default: false): force parameter set injection at each SAP. If not set, only inject if different from SDP ones
 .br
 latm (bool, default: false): use latm for AAC payload format
 .br
-dst (cstr): URL for direct RTP mode - see filter help
+dst (cstr): URL for direct RTP mode
 .br
-ext (str): file extension for direct RTP mode - see filter help
+ext (str): file extension for direct RTP mode
 .br
-mime (cstr): set mime type for direct RTP mode - see filter help
+mime (cstr): set mime type for direct RTP mode
 .br
 
 .br
@@ -4884,7 +6239,7 @@
 .br
 Only aggregated control is supported for PLAY and PAUSE, PAUSE/PLAY on single stream is not supported.
 .br
-The server only runs on TCP, and handles request in sequence (will not probe for commands until previous response was sent).
+The server only runs on TCP, and handles request in sequence: it will not probe for commands until previous response is sent.
 .br
 The server supports both RTP over UDP delivery and RTP interleaved over RTSP delivery.
 .br
@@ -4896,11 +6251,7 @@
 .br
 gpac -i source -o rtsp://myip/sessionname
 .br
-
-.br
-Example
-.br
-gpac -i source dst=rtsp://myip/sessionname
+gpac -i source -o rtsp://myip/sessionname
 .br
 
 .br
@@ -4946,12 +6297,10 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
-dst (cstr): location of destination file - see filter help 
+dst (cstr): location of destination resource
 .br
 port (uint, default: 554): server port
 .br
@@ -4959,21 +6308,21 @@
 .br
 mtu (uint, default: 1460): size of RTP MTU in bytes
 .br
-ttl (uint, default: 0): time-to-live for muticast packets. A value of 0 uses client requested TTL, or 1
+ttl (uint, default: 0): time-to-live for multicast packets (a value of 0 uses client requested TTL, or 1)
 .br
-ifce (str): default network inteface to use
+ifce (str): default network interface to use
 .br
-payt (uint, default: 96, minmax: 96-127): payload type to use for dynamic configs
+payt (uint, default: 96, minmax: 96-127): payload type to use for dynamic decoder configurations
 .br
-mpeg4 (bool, default: false): send all streams using MPEG-4 generic payload format if posible
+mpeg4 (bool, default: false): send all streams using MPEG-4 generic payload format if possible
 .br
 delay (sint, default: 0): send delay for packet (negative means send earlier)
 .br
-tt (uint, default: 1000): time tolerance in microseconds. Whenever schedule time minus realtime is below this value, the packet is sent right away
+tt (uint, default: 1000): time tolerance in microsecond (whenever schedule time minus realtime is below this value, the packet is sent right away)
 .br
-runfor (sint, default: -1): run the session for the given time in ms. Negative value means run for ever (if loop) or source duration, 0 only outputs the sdp
+runfor (sint, default: -1): run the session for the given time in ms. A negative value means run for ever if loop or source duration, value 0 only outputs the sdp
 .br
-tso (sint, default: -1): set timestamp offset in microsecs. Negative value means random initial timestamp
+tso (sint, default: -1): set timestamp offset in microseconds (negative value means random initial timestamp)
 .br
 xps (bool, default: false): force parameter set injection at each SAP. If not set, only inject if different from SDP ones
 .br
@@ -4989,9 +6338,9 @@
 .br
 close (bool, default: true): close RTSP connection after each request, except when RTP over RTSP is used
 .br
-loop (bool, default: true): loop all streams in session (not always possible depending on source type) - see filter help
+loop (bool, default: true): loop all streams in session (not always possible depending on source type)
 .br
-dynurl (bool, default: false): allow dynamic service assembly - see filter help
+dynurl (bool, default: false): allow dynamic service assembly
 .br
 mcast (enum, default: off): control multicast setup of a session
 .br
@@ -5026,7 +6375,7 @@
 .br
 
 .br
-The server currently handles GET, HEAD, PUT, POST, DELETE methods.
+The server currently handles GET, HEAD, PUT, POST, DELETE methods, and basic OPTIONS support.
 .br
 Single or multiple byte ranges are supported for both GET and PUT/POST methods, in all server modes.
 .br
@@ -5059,7 +6408,7 @@
 .SH Simple HTTP server
 .LP
 .br
-In this mode, the filter doesn't need any input connection and exposes all files in the directories given by .I rdirs.
+In this mode, the filter does not need any input connection and exposes all files in the directories given by .I rdirs.
 .br
 PUT and POST methods are only supported if a write directory is specified by .I wdir option.
 .br
@@ -5098,9 +6447,9 @@
 .br
 In this mode, the filter will forward input PIDs to connected clients, trashing the data if no client is connected unless .I hold is specified.
 .br
-The filter doesn't use any read directory in this mode.
+The filter does not use any read directory in this mode.
 .br
-This mode is mostly usefull to setup live HTTP streaming of media sessions such as MP3, MPEG-2 TS or other muxed representations:
+This mode is mostly useful to setup live HTTP streaming of media sessions such as MP3, MPEG-2 TS or other multiplexed representations:
 .br
 Example
 .br
@@ -5114,7 +6463,7 @@
 .br
 Example
 .br
-gpac -i MP3_SOURCE reframer:rt=on @ -o http://localhost/live.mp3
+gpac -i MP3_SOURCE reframer:rt=on -o http://localhost/live.mp3
 .br
 
 .br
@@ -5124,7 +6473,7 @@
 .br
 In this mode, ICECast meta-data can be inserted using .I ice. The default inserted values are ice-audio-info, icy-br, icy-pub (set to 1) and icy-name if input ServiceName property is set.
 .br
-The server will also look for any property called ice-* on the input pid and inject them.
+The server will also look for any property called ice-* on the input PID and inject them.
 .br
 Example
 .br
@@ -5147,7 +6496,7 @@
 .br
 - send the content using HTTP chunk transfer mode, starting with what is already written on disk
 .br
- - push remaining data to the client as soon as recieved while writing it to disk, until source file is done
+ - push remaining data to the client as soon as received while writing it to disk, until source file is done
 .br
 - If not so, the server will simply send the file from the disk as a regular HTTP session, without chunk transfer.
 .br
@@ -5157,11 +6506,27 @@
 .br
 Example
 .br
-gpac -i SOURCE reframer:rt=on @ -o http://localhost:8080/live.mpd --rdirs=temp --dmode=dynamic --cdur=0.1
+gpac -i SOURCE reframer:rt=on -o http://localhost:8080/live.mpd --rdirs=temp --dmode=dynamic --cdur=0.1
 .br
 
 .br
-In this example, a real-time dynamic DASH session with chunks of 100ms is created, outputing files in temp. A client connecting to the live edge will receive segments as they are produced using HTTP chunk transfer.
+In this example, a real-time dynamic DASH session with chunks of 100ms is created, writing files to temp. A client connecting to the live edge will receive segments as they are produced using HTTP chunk transfer.
+.br
+ 
+.br
+The server can store incoming files to memory mode by setting the read directory to gmem.
+.br
+In this mode, .I max_cache_segs is always at least 1.
+.br
+ 
+.br
+If .I max_cache_segs valeu N is not 0, each incoming PID will store at most:
+.br
+- MIN(N, time-shift depth) files if stored in memory
+.br
+- MAX(N, time-shift depth) files if stored locally and N is positive
+.br
+- -N files if stored locally and N is negative
 .br
 
 .br
@@ -5212,22 +6577,45 @@
 .br
 The server currently only operates in either HTTPS or HTTP mode and cannot run both modes at the same time. You will need to use two httpout filters for this, one operating in HTTPS and one operating in HTTP.
 .br
+ 
+.br
+.SH Multiple destinations on single server
+.LP
+.br
+When running in server mode, multiple HTTP outputs with same URL/port may be used:
+.br
+- the first loaded HTTP output filter with same URL/port will be reused
+.br
+- all httpout options of subsequent httpout filters, except .I dst will be ignored, other options will be inherited as usual
+.br
 
 .br
+Example
+.br
+gpac -i dash.mpd dashin:forward=file:SID=D1 dashin:forward=segb:SID=D2 -o http://localhost:80/live.mpd:SID=D1:rdirs=dash -o http://localhost:80/live_rw.mpd:SID=D2:sigfrag
+.br
+
+.br
+This will:
+.br
+- load the HTTP server and forward (through D1) the dash session to this server using live.mpd as manifest name
+.br
+- reuse the HTTP server and regenerate the manifest (through D2 and sigfrag option), using live_rw.mpd as manifest name
+.br
 
 .br
 .SH Options (expert):
 .LP
 .br
-dst (cstr): location of destination file - see filter help 
+dst (cstr): location of destination resource
 .br
-port (uint, default: 80): server port
+port (uint, default: 0): server port
 .br
-ifce (str): default network inteface to use
+ifce (str): default network interface to use
 .br
-rdirs (strl): list of directories to expose for read - see filter help
+rdirs (strl): list of directories to expose for read
 .br
-wdir (str): directory to expose for write - see filter help
+wdir (str): directory to expose for write
 .br
 cert (str): certificate file in PEM format to use for TLS mode
 .br
@@ -5241,23 +6629,23 @@
 .br
 maxc (uint, default: 100): maximum number of connections, 0 is unlimited
 .br
-maxp (uint, default: 6): maximum number of connections for one peer, 0 is unlimited
+maxp (uint, default: 6): maximum number of connections for one peer (0 is unlimited)
 .br
-cache_control (str): specify the Cache-Control string to add; none disable ETag
+cache_control (str): specify the Cache-Control string to add (none disable cache control and ETag)
 .br
 hold (bool, default: false): hold packets until one client connects
 .br
-hmode (enum, default: default): filter operation mode, ignored if .I wdir is set. See filter help for more details. Mode can be
+hmode (enum, default: default): filter operation mode, ignored if .I wdir is set
 .br
-* default: run in server mode (see filter help)
+* default: run in server mode
 .br
-* push: run in client mode using PUT or POST (see filter help)
+* push: run in client mode using PUT or POST
 .br
 * source: use server as source filter on incoming PUT/POST
 .br
 
 .br
-timeout (uint, default: 30): timeout in seconds for persistent connections; 0 disable timeout
+timeout (uint, default: 30): timeout in seconds for persistent connections (0 disable timeout)
 .br
 ext (cstr): set extension for graph resolution, regardless of file extension
 .br
@@ -5271,18 +6659,30 @@
 .br
 sutc (bool, default: false): insert server UTC in response headers as Server-UTC: VAL_IN_MS
 .br
-cors (bool, default: false): insert CORS header allowing all domains
+cors (enum, default: auto): insert CORS header allowing all domains
+.br
+* off: disable CORS
+.br
+* on: enable CORS
+.br
+* auto: enable CORS when Origin is found in request
+.br
+
+.br
+reqlog (str): provide short log of the requests indicated in this option (comma separated list, * for all) regardless of HTTP log settings. Value REC logs file writing start/end
+.br
+ice (bool, default: false): insert ICE meta-data in response headers in sink mode
 .br
-reqlog (str): provide short log of the requests indicated in this option (comma separated list, * for all) regardless of HTTP log settings
+max_client_errors (uint, default: 20): force disconnection after specified number of consecutive errors from HTTTP 1.1 client (ignored in H/2 or when close is set)
 .br
-ice (bool, default: false): insert ICE meta-data in response headers in sink mode - see filter help
+max_cache_segs (sint, default: 5): maximum number of segments cached per HAS quality (see filter help)
 .br
 
 .br
 .SH hevcsplit
 .LP
 .br
-Description: HEVC tile spliter
+Description: HEVC tile splitter
 .br
 
 .br
@@ -5292,8 +6692,7 @@
 .br
 
 .br
-.SH Options (expert):
-.LP
+No options
 .br
 
 .br
@@ -5314,19 +6713,15 @@
 .br
 The filter will check the SPS and PPS configurations of input PID and warn if they are not aligned but will still process them unless .I strict is set.
 .br
-The filter assumes that all input PIDs are synchronized (frames share the same timestamp) and will reassemble frames with the same dts. If pids are of unequal duration, the filter will drop frames as soon as one pid is over.
+The filter assumes that all input PIDs are synchronized (frames share the same timestamp) and will reassemble frames with the same decode time. If PIDs are of unequal duration, the filter will drop frames as soon as one PID is over.
 .br
-.P
-.B
-Implicit Positioning
+.SS Implicit Positioning
 .br
-In implicit positioning, results may vary based on the order of input pids declaration.
+In implicit positioning, results may vary based on the order of input PIDs declaration.
 .br
 In this mode the filter will automatically allocate new columns for tiles with height not a multiple of max CU height.
 .br
-.P
-.B
-Explicit Positioning
+.SS Explicit Positioning
 .br
 In explicit positioning, the CropOrigin property on input PIDs is used to setup the tile grid. In this case, tiles shall not overlap in the final output.
 .br
@@ -5334,7 +6729,7 @@
 .br
 If positive coordinates are used, they specify absolute positioning in pixels of the tiles. The coordinates are automatically adjusted to the next multiple of max CU width and height.
 .br
-If negative coordinates are used, they specify relative positioning (eg 0x-1 indicates to place the tile below the tile 0x0).
+If negative coordinates are used, they specify relative positioning (e.g. 0x-1 indicates to place the tile below the tile 0x0).
 .br
 In this mode, it is the caller responsibility to set coordinates so that all tiles in a column have the same width and only the last row/column uses non-multiple of max CU width/height values. The filter will complain and abort if this is not respected.
 .br
@@ -5344,17 +6739,15 @@
 .br
 
 .br
-.P
-.B
-Spatial Relationship Description (SRD)
+.SS Spatial Relationship Description (SRD)
 .br
 
 .br
-The filter will create an SRDMap property in the output PID if SRDRef and SRDor CropOrigin are set on all input PIDs.
+The filter will create an SRDMap property in the output PID if SRDRef and SRD or CropOrigin are set on all input PIDs.
 .br
 The SRDMap allows forwarding the logical sources SRD in the merged PID.
 .br
-The output pid SRDRef is set to the output video size.
+The output PID SRDRef is set to the output video size.
 .br
 The input SRDRef and SRD are usually specified in DASH MPD, but can be manually assigned to inputs.
 .br
@@ -5362,7 +6755,8 @@
 .br
 - SRD gives the size and position of the input in the original video, expressed in SRDRef referential of the input.
 .br
-The inputs do not need to have matching SRDRef.EX src1:SRD=0x0x640x480:SRDRef=1280x720
+The inputs do not need to have matching SRDRef
+.EX src1:SRD=0x0x640x480:SRDRef=1280x720
 .br
 This indicates that src1 contains a video located at 0,0, with a size of 640x480 pixels in a virtual source of 1280x720 pixels.
 .br
@@ -5376,12 +6770,14 @@
 .br
 
 .br
-Each merged input is described by 8 intergers in the output SRDMap:
+Each merged input is described by 8 integers in the output SRDMap:
 .br
 - the source SRD is rescaled in the output SRDRef to form the first part (4 integers) of the SRDMap (i.e. where was the input ?)
 .br
 - the source location in the reconstructed video forms the second part (4 integers) of the SRDMap (i.e. where are the input pixels in the output ?)
 .br
+ 
+.br
 Assuming the two sources are encoded at 320x240 and merged as src2 above src1, the output will be a 320x480 video with a SRDMap of {0,160,160,240,0,0,320,240,0,0,160,240,0,240,320,240}
 .br
 Note: merged inputs are always listed in SRDMap in their tile order in the output bitstream.
@@ -5404,12 +6800,10 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
-strict (bool, default: false): strict comparison of SPS and PPS of input pids - see filter help
+strict (bool, default: false): strict comparison of SPS and PPS of input PIDs
 .br
 mrows (bool, default: false): signal multiple rows in tile grid when possible
 .br
@@ -5433,6 +6827,34 @@
 .br
 
 .br
+.SH rfmhas
+.LP
+.br
+Description: MPEH-H Audio Stream reframer
+.br
+
+.br
+This filter parses MHAS files/data and outputs corresponding audio PID and frames.
+.br
+By default, the filter expects a MHAS stream with SYNC packets set, otherwise tune-in will fail. Using .I nosync=false can help parsing bitstreams with no SYNC packets.
+.br
+The default behavior is to dispatch a framed MHAS bitstream. To demultiplex into a raw MPEG-H Audio, use .I mpha.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+index (dbl, default: 1.0): indexing window length
+.br
+mpha (bool, default: false): demultiplex MHAS and only forward audio frames
+.br
+pcksync (uint, default: 4): number of unknown packets to tolerate before considering sync is lost
+.br
+nosync (bool, default: true): initial sync state
+.br
+
+.br
 .SH rfprores
 .LP
 .br
@@ -5451,7 +6873,9 @@
 .br
 findex (bool, default: true): index frames. If true, filter will be able to work in rewind mode
 .br
-cid (str): set QT 4CC for the imported media. If not set, defaults to 'ap4h' for YUV444 or 'apch' for YUV422
+cid (str): set QT 4CC for the imported media. If not set, default is 'ap4h' for YUV444 and 'apch' for YUV422
+.br
+notime (bool, default: false): ignore input timestamps, rebuild from 0
 .br
 
 .br
@@ -5464,9 +6888,9 @@
 .br
 This filter splits an MPEG-2 transport stream into several single program transport streams.
 .br
-Only the PAT table is rewritten, the CAT table, PMT and all program streams are forwarded as is.
+Only the PAT table is rewritten, other tables (PAT, PMT) and streams (PES) are forwarded as is.
 .br
-In .I full mode, global DVB tables of the input multiplex are forwarded to each output mux; otherwise these tables are discarded.
+If .I dvb is set, global DVB tables of the input multiplex are forwarded to each output mux; otherwise these tables are discarded.
 .br
 
 .br
@@ -5492,15 +6916,35 @@
 .br
 This filter rewrites some metadata of various bitstream formats.
 .br
-The filter can currently modify the following properties in the bitstream:
+The filter can currently modify the following properties in video bitstreams:
+.br
+- MPEG-4 Visual:
+.br
+ - sample aspect ratio
+.br
+ - profile and level
+.br
+- AVC|H264, HEVC and VVC:
+.br
+ - sample aspect ratio
+.br
+ - profile, level, profile compatibility
+.br
+ - video format, video fullrange
 .br
-* MPEG-4 Visual: aspect ratio and profile/level
+ - color primaries, transfer characteristics and matrix coefficients (or remove all info)
 .br
-* AVC|H264: aspect ratio, profile, level, profile compatibility
+- ProRes:
 .br
-* HEVC: aspect ratio
+ - sample aspect ratio
 .br
-* ProRes: aspect ratio, color primaries, transfer characteristics and matrix coefficients
+ - color primaries, transfer characteristics and matrix coefficients
+.br
+ 
+.br
+Values are by default initialized to -1, implying to keep the related info (present or not) in the bitstream.
+.br
+A .I sar value of 0/0 will remove sample aspect ratio info from bitstream if possible.
 .br
 
 .br
@@ -5508,56 +6952,200 @@
 .br
 * HEVC: profile IDC, profile space, general compatibility flags
 .br
-
+* VVC: profile IDC, general profile and level indication
+.br
+ 
+.br
+The filter will work in passthrough mode for all other codecs and media types.
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-sar (frac, default: 0/0, updatable): aspect ratio to rewrite
+cprim (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
 .br
-m4vpl (sint, default: -1, updatable): set ProfileLevel for MPEG-4 video part two
+ctfc (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
+.br
+cmx (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
+.br
+sar (frac, default: -1/-1, updatable): aspect ratio to rewrite
 .br
-clrp (str, updatable): color primaries according to ISO/IEC 23001-8 / 23091-2. Value can be the integer value or (case insensitive) BT709, BT601-625, BT601-525, BT2020, P3 or P3-D65
+m4vpl (sint, default: -1, updatable): set ProfileLevel for MPEG-4 video part two
 .br
-txchar (str, updatable): transfer characteristics according to ISO/IEC 23001-8 / 23091-2. Value can be the integer value or (case insensitive) BT709, ST2084 or STDB67
+fullrange (bool, default: false, updatable): video full range flag
 .br
-mxcoef (str, updatable): matrix coeficients according to ISO/IEC 23001-8 / 23091-2. Value can be the integer value or (case insensitive) BT709, BT601 or BT2020
+novsi (bool, default: false, updatable): remove video_signal_type from VUI in AVC|H264 and HEVC
 .br
 prof (sint, default: -1, updatable): profile indication for AVC|H264
 .br
-lev (sint, default: -1, updatable): level indication for AVC|H264
+lev (sint, default: -1, updatable): level indication for AVC|H264, level_idc for VVC
 .br
 pcomp (sint, default: -1, updatable): profile compatibility for AVC|H264
 .br
-pidc (sint, default: -1, updatable): profile IDC for HEVC
+pidc (sint, default: -1, updatable): profile IDC for HEVC and VVC
 .br
 pspace (sint, default: -1, updatable): profile space for HEVC
 .br
 gpcflags (sint, default: -1, updatable): general compatibility flags for HEVC
 .br
-remsei (bool, default: false, updatable): remove SEI messages from bitstream
+rmsei (bool, default: false, updatable): remove SEI messages from bitstream for AVC|H264, HEVC and VVC
+.br
+vidfmt (enum, default: -1, updatable): video format for AVC|H264, HEVC and VVC (component|pal|ntsc|secam|mac|undef)
+.br
+
+.br
+
+.br
+.SH bssplit
+.LP
+.br
+Description: Compressed layered bitstream splitter
+.br
+
+.br
+This filter splits input stream by layers and sublayers
+.br
+
+.br
+The filter supports AVC|H264, HEVC and VVC stream splitting and is pass-through for other codec types.
+.br
+
+.br
+Splitting is based on temporalID value (start from 1) and layerID value (start from 0).
+.br
+For AVC|H264, layerID is the dependency value, or quality value if svcqid is set.
+.br
+
+.br
+Each input stream is filtered according to the ltid option as follows:
+.br
+* no value set: input stream is split by layerID, i.e. each layer creates an output
+.br
+* `all`: input stream is split by layerID and temporalID, i.e. each {layerID,temporalID} creates an output
+.br
+* `lID`: input stream is split according to layer lID value, and temporalID is ignored
+.br
+* `.tID`: input stream is split according to temporal sub-layer tID value and layerID is ignored
+.br
+* `lID.tID`: input stream is split according to layer lID and sub-layer tID values
+.br
+
+.br
+Note: A tID value of 0 in ltid is equivalent to value 1.
+.br
+
+.br
+Multiple values can be given in ltid, in which case each value gives the maximum {layerID,temporalID} values for the current layer.
+.br
+A few examples on an input with 2 layers each with 2 temporal sublayers:
+.br
+* `ltid=0.2`: this will split the stream in:
+.br
+ - one stream with {lID=0,tID=1} and {lID=0,tID=2} NAL units
+.br
+ - one stream with all other layers/substreams
+.br
+* `ltid=0.1,1.1`: this will split the stream in:
+.br
+ - one stream with {lID=0,tID=1} NAL units
+.br
+ - one stream with {lID=0,tID=2}, {lID=1,tID=1} NAL units
+.br
+ - one stream with the rest {lID=0,tID=2}, {lID=1,tID=2} NAL units
+.br
+* `ltid=0.1,0.2`: this will split the stream in:
+.br
+ - one stream with {lID=0,tID=1} NAL units
+.br
+ - one stream with {lID=0,tID=2} NAL units
+.br
+ - one stream with the rest {lID=1,tID=1}, {lID=1,tID=2} NAL units
+.br
+
+.br
+The filter can also be used on AVC and HEVC DolbyVision streams to split base stream and DV RPU/EL.
+.br
+
+.br
+The filter does not create aggregator or extractor NAL units.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+ltid (strl): temporal and layer ID of output streams
+.br
+svcqid (bool, default: false): use qualityID instead of dependencyID for SVC splitting
+.br
+sig_ltid (bool, default: false): signal maximum temporal (max_temporal_id) and layer ID (max_layer_id) of output streams (mostly used for debug)
+.br
+
+.br
+.SH bsagg
+.LP
+.br
+Description: Compressed layered bitstream aggregator
+.br
+
+.br
+This filter aggregates layers and sublayers into a single output PID.
+.br
+
+.br
+The filter supports AVC|H264, HEVC and VVC stream reconstruction, and is passthrough for other codec types.
+.br
+
+.br
+Aggregation is based on temporalID value (start from 1) and layerID value (start from 0).
+.br
+For AVC|H264, layerID is the dependency value, or quality value if svcqid is set.
+.br
+
+.br
+The filter can also be used on AVC and HEVC DolbyVision dual-streams to aggregate base stream and DV RPU/EL.
+.br
+
+.br
+The filter does not forward aggregator or extractor NAL units.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+svcqid (bool, default: false): use qualityID instead of dependencyID for SVC splitting
 .br
 
 .br
 .SH ffdmx
 .LP
 .br
-Description: FFMPEG demuxer
+Description: FFMPEG demultiplexer
 .br
-Version: Lavf58.42.101
+Version: Lavf59.17.102
 .br
 
 .br
-See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+This filter demultiplexes an input file or open a source protocol using FFMPEG.
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.
+.br
+To list all supported demultiplexers for your GPAC build, use gpac -h ffdmx:*.
+.br
+This will list both supported input formats and protocols.
+.br
+Input protocols are listed with Description: Input protocol, and the subclass name identifies the protocol scheme.
+.br
+For example, if ffdmx:rtmp is listed as input protocol, this means rtmp:// source URLs are supported.
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-src (cstr): location of source content
+src (cstr): URL of source content
 .br
 * (str): any possible options defined for AVFormatContext and sub-classes. See gpac -hx ffdmx and gpac -hx ffdmx:*
 .br
@@ -5568,17 +7156,54 @@
 .br
 Description: FFMPEG decoder
 .br
-Version: Lavc58.81.100
+Version: Lavc59.21.100
 .br
 
 .br
-See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+This filter decodes audio and video streams using FFMPEG.
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.
+.br
+To list all supported decoders for your GPAC build, use gpac -h ffdec:*.
+.br
+
+.br
+Options can be passed from prompt using --OPT=VAL
+.br
+The default threading mode is to let libavcodec decide how many threads to use. To enforce single thread, use --threads=1
+.br
+
+.br
+.SH Codec Map
+.LP
+.br
+The .I ffcmap option allows specifying FFMPEG codecs for codecs not supported by GPAC.
+.br
+Each entry in the list is formated as GID@name or GID@+name, with:
+.br
+* GID: 4CC or 32 bit identifier of codec ID, as indicated by gpac -i source inspect:full
+.br
+* name: FFMPEG codec name
+.br
+* `+': is set and extra data is set and formatted as an ISOBMFF box, removes box header
+.br
+
+.br
+Example
+.br
+gpac -i source --ffcmap=BKV1@binkvideo vout
+.br
+
+.br
+This will map an ISOBMFF track declared with coding type BKV1 to binkvideo.
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
+ffcmap (strl): codec map
+.br
 * (str): any possible options defined for AVCodecContext and sub-classes. See gpac -hx ffdec and gpac -hx ffdec:*
 .br
 
@@ -5588,25 +7213,52 @@
 .br
 Description: FFMPEG AV Capture
 .br
-Version: Lavd58.9.103
+Version: Lavd59.5.100
+.br
+
+.br
+Reads from audio/video capture devices using FFMPEG.
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.
+.br
+To list all supported grabbers for your GPAC build, use gpac -h ffavin:*.
 .br
 
 .br
+.SH Device identification
+.LP
+.br
 Typical classes are dshow on windows, avfoundation on OSX, video4linux2 or x11grab on linux
 .br
 
 .br
 Typical device name can be the webcam name:
 .br
-FaceTime HD Camera on OSX, device name on windows, /dev/video0 on linux
+- FaceTime HD Camera on OSX, device name on windows, /dev/video0 on linux
 .br
-screen-capture-recorder, see http://screencapturer.sf.net/ on windows
+- screen-capture-recorder, see http://screencapturer.sf.net/ on windows
 .br
-Capture screen 0 on OSX (0=first screen), or screenN for short
+- Capture screen 0 on OSX (0=first screen), or screenN for short
 .br
-X display name (eg :0.0) on linux
+- X display name (e.g. :0.0) on linux
 .br
-See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+
+.br
+The general mapping from ffmpeg command line is:
+.br
+- ffmpeg -f maps to .I fmt option
+.br
+- ffmpeg -i maps to .I dev option
+.br
+
+.br
+Example
+.br
+ffmpeg -f libndi_newtek -i MY_NDI_TEST ...
+.br
+gpac -i av://:fmt=libndi_newtek:dev=MY_NDI_TEST ...
+.br
+
 .br
 
 .br
@@ -5615,9 +7267,9 @@
 .br
 src (str): url of device, video://, audio:// or av://
 .br
-fmt (str): name of device class - see filter help. If not set, defaults to first device class
+fmt (str): name of device class. If not set, defaults to first device class
 .br
-dev (str, default: 0): name of device or index of device - see filter help
+dev (str, default: 0): name of device or index of device
 .br
 copy (enum, default: A): set copy mode of raw frames
 .br
@@ -5633,11 +7285,11 @@
 .br
 sclock (bool, default: false): use system clock (us) instead of device timestamp (for buggy devices)
 .br
-probes (uint, default: 10, minmax: 0-100): probe a given number of video frames before emitting - this usually helps with bad timing of the first frames
+probes (uint, default: 10, minmax: 0-100): probe a given number of video frames before emitting (this usually helps with bad timing of the first frames)
 .br
 block_size (uint, default: 4096): block size used to read file when using avio context
 .br
-* (str): any possible options defined for AVInputFormat and AVFormatContext. See gpac -hx ffavin and gpac -hx ffavin:*
+* (str): any possible options defined for AVInputFormat and AVFormatContext (see gpac -hx ffavin and gpac -hx ffavin:*)
 .br
 
 .br
@@ -5646,15 +7298,71 @@
 .br
 Description: FFMPEG video rescaler
 .br
-Version: SwS5.6.101
+Version: SwS6.5.100
+.br
+
+.br
+This filter rescales raw video data using FFMPEG to the specified size and pixel format.
+.br
+.SS Output size assignment
+.br
+If .I osize is {0,0}, the output dimensions will be set to the input size, and input aspect ratio will be ignored.
+.br
+
+.br
+If .I osize is {0,H} (resp. {W,0}), the output width (resp. height) will be set to respect input aspect ratio. If .I keepar=nosrc, input sample aspect ratio is ignored.
+.br
+.SS Aspect Ratio and Sample Aspect Ratio
+.br
+When output sample aspect ratio is set, the output dimensions are divided by the output sample aspect ratio.
+.br
+Example
+.br
+ffsws:osize=288x240:osar=3/2
 .br
 
 .br
-For bicubic, to tune the shape of the basis function, .I p1 tunes f(1) and .I p2 f´(1)
+The output dimensions will be 192x240.
 .br
-For gauss .I p1 tunes the exponent and thus cutoff frequency
+
+.br
+When aspect ratio is not kept (.I keepar=off):
+.br
+- source is resampled to desired dimensions
 .br
-For lanczos .I p1 tunes the width of the window function
+- if output aspect ratio is not set, output will use source sample aspect ratio
+.br
+
+.br
+When aspect ratio is partially kept (.I keepar=nosrc):
+.br
+- resampling is done on the input data without taking input sample aspect ratio into account
+.br
+- if output sample aspect ratio is not set (.I osar=0/N), source aspect ratio is forwarded to output.
+.br
+
+.br
+When aspect ratio is fully kept (.I keepar=full), output aspect ratio is force to 1/1 if not set.
+.br
+
+.br
+When sample aspect ratio is kept, the filter will:
+.br
+- center the rescaled input frame on the output frame
+.br
+- fill extra pixels with .I padclr
+.br
+
+.br
+.SS Algorithms options
+.br
+- for bicubic, to tune the shape of the basis function, .I p1 tunes f(1) and .I p2 f´(1)
+.br
+- for gauss .I p1 tunes the exponent and thus cutoff frequency
+.br
+- for lanczos .I p1 tunes the width of the window function
+.br
+
 .br
 See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
 .br
@@ -5663,17 +7371,43 @@
 .SH Options (expert):
 .LP
 .br
-osize (v2di): osize of output video. When not set, input osize is used
+osize (v2di): osize of output video
+.br
+ofmt (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,yuv444ap,yuv444p_10,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,rgbs,rgbas): pixel format for output video. When not set, input format is used
+.br
+scale (enum, default: bicubic): scaling mode (see filter help) (fastbilinear|bilinear|bicubic|X|point|area|bicublin|gauss|sinc|lanzcos|spline)
+.br
+
+.br
+p1 (dbl, default: +I): scaling algo param1
+.br
+p2 (dbl, default: +I): scaling algo param2
+.br
+ofr (bool, default: false): force output full range
+.br
+brightness (bool, default: 0): 16.16 fixed point brightness correction, 0 means use default
+.br
+contrast (uint, default: 0): 16.16 fixed point brightness correction, 0 means use default
+.br
+saturation (uint, default: 0): 16.16 fixed point brightness correction, 0 means use default
+.br
+otable (sintl): the yuv2rgb coefficients describing the output yuv space, normally ff_yuv2rgb_coeffs[x], use default if not set
+.br
+itable (sintl): the yuv2rgb coefficients describing the input yuv space, normally ff_yuv2rgb_coeffs[x], use default if not set
+.br
+keepar (enum, default: off): keep aspect ratio
+.br
+* off: ignore aspect ratio
 .br
-ofmt (pfmt, default: none, minmax: none,yuv420,yuv420_10,yuv422,yuv422_10,yuv444,yuv444_10,uyvy,vyuy,yuyv,yvyu,nv12,nv21,nv1l,nv2l,yuva,yuvd,yuv444a,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,rgbs,rgbas): pixel format for output video. When not set, input format is used
+* full: respect aspect ratio, applying input sample aspect ratio info
 .br
-scale (enum, default: bicubic): scaling mode - see filter info
+* nosrc: respect aspect ratio but ignore input sample aspect ratio
 .br
 
 .br
-p1 (dbl, default: +I): scaling algo param1 - see filter info
+padclr (str, default: black): clear color when aspect ration preservation is used
 .br
-p2 (dbl, default: +I): scaling algo param2 - see filter info
+osar (frac, default: 0/1): force output pixel aspect ratio
 .br
 
 .br
@@ -5682,38 +7416,60 @@
 .br
 Description: FFMPEG encoder
 .br
-Version: Lavc58.81.100
+Version: Lavc59.21.100
 .br
 
 .br
-Encodes audio and video streams.
+This filter encodes audio and video streams using FFMPEG.
 .br
-See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.
+.br
+To list all supported encoders for your GPAC build, use gpac -h ffenc:*.
+.br
+
+.br
+The filter will try to resolve the codec name in .I c against a libavcodec codec name (e.g. libx264) and use it if found.
+.br
+If not found, it will consider the name to be a GPAC codec name and find a codec for it. In that case, if no pixel format is given, codecs will be enumerated to find a matching pixel format.
+.br
+
+.br
+Options can be passed from prompt using --OPT=VAL (global options) or appending ::OPT=VAL to the desired encoder filter.
+.br
+
 .br
-Note: if no codec is explicited through .I ffc option and no pixel format is given, codecs will be enumerated to find a matching pixel format.
+The filter will look for property TargetRate on input PID to set the desired bitrate per PID.
 .br
 
 .br
-The encoder will force a closed gop boundary at each packet with a FileNumber property set.
+The filter will force a closed gop boundary:
+.br
+- at each packet with a FileNumber property set or a CueStart property set to true.
+.br
+- if .I fintra and .I rc is set.
 .br
 
 .br
+When forcing a closed GOP boundary, the filter will flush, destroy and recreate the encoder to make sure a clean context is used, as currently many encoders in libavcodec do not support clean reset when forcing picture types.
+.br
+If .I fintra is not set and the output of the encoder is a DASH session in live profile without segment timeline, .I fintra will be set to the target segment duration and .I rc will be set.
+.br
 
 .br
 .SH Options (expert):
 .LP
 .br
-c (str): codec identifier. Can be any supported GPAC ID or ffmpeg ID or filter subclass name
+c (str): codec identifier. Can be any supported GPAC codec name or ffmpeg codec name
 .br
 pfmt (pfmt, default: none): pixel format for input video. When not set, input format is used
 .br
-fintra (frac, default: 0): force intra / IDR frames at the given period in sec, eg fintra=60000/1001 will force an intra every 2 seconds on 29.97 fps video; ignored for audio
+fintra (frac, default: -1/1): force intra / IDR frames at the given period in sec, e.g. fintra=2 will force an intra every 2 seconds and fintra=1001/1000 will force an intra every 30 frames on 30000/1001=29.97 fps video; ignored for audio
 .br
 all_intra (bool, default: false, updatable): only produce intra frames
 .br
 ls (bool, default: false): log stats
 .br
-ffc (str): ffmpeg codec name. This allows enforcing a given codec if multiple codecs support the codec ID set (eg aac vs vo_aacenc)
+rc (bool, default: false): reset encoder when forcing intra frame (some encoders might not support intra frame forcing)
 .br
 * (str): any possible options defined for AVCodecContext and sub-classes. see gpac -hx ffenc and gpac -hx ffenc:*
 .br
@@ -5722,19 +7478,25 @@
 .SH ffmx
 .LP
 .br
-Description: FFMPEG muxer
+Description: FFMPEG multiplexer
 .br
-Version: Lavf58.42.101
+Version: Lavf59.17.102
 .br
 
 .br
-FFMPEG output for files and streamers.
+Multiplexes files and open output protocols using FFMPEG.
 .br
-See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.
+.br
+To list all supported multiplexers for your GPAC build, use gpac -h ffmx:*.This will list both supported output formats and protocols.
+.br
+Output protocols are listed with Description: Output protocol, and the subclass name identifies the protocol scheme.
+.br
+For example, if ffmx:rtmp is listed as output protocol, this means rtmp:// destination URLs are supported.
 .br
 
 .br
-Note: Some URL formats may not be sufficient to derive the multiplexing format, you must then use .I ffmt to specify the desired format.
+Some URL formats may not be sufficient to derive the multiplexing format, you must then use .I ffmt to specify the desired format.
 .br
 
 .br
@@ -5746,20 +7508,18 @@
 .br
 
 .br
-
-.br
 .SH Options (expert):
 .LP
 .br
-dst (cstr): location of source content
+dst (cstr): location of destination file or remote URL
 .br
-start (dbl, default: 0.0): set playback start offset. Negative value means percent of media dur with -1 <=> dur
+start (dbl, default: 0.0): set playback start offset. A negative value means percent of media duration with -1 equal to duration
 .br
-speed (dbl, default: 1.0): set playback speed. If speed is negative and start is 0, start is set to -1
+speed (dbl, default: 1.0): set playback speed. If negative and start is 0, start is set to -1
 .br
 interleave (bool, default: true): write frame in interleave mode
 .br
-nodisc (bool, default: false): ignore stream configuration changes while muxing, may result in broken streams
+nodisc (bool, default: false): ignore stream configuration changes while multiplexing, may result in broken streams
 .br
 mime (cstr): set mime type for graph resolution
 .br
@@ -5769,7 +7529,7 @@
 .br
 block_size (uint, default: 4096): block size used to read file when using avio context
 .br
-* (str): any possible options defined for AVFormatContext and sub-classes. See gpac -hx ffmx and gpac -hx ffmx:*
+* (str): any possible options defined for AVFormatContext and sub-classes (see gpac -hx ffmx and gpac -hx ffmx:*)
 .br
 
 .br
@@ -5778,11 +7538,15 @@
 .br
 Description: FFMPEG AVFilter
 .br
-Version: Lavf58.42.101
+Version: Lavf59.17.102
 .br
 
 .br
-This filter provides libavfilter raw audio and video tools. See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+This filter provides libavfilter raw audio and video tools.
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+.br
+To list all supported avfilters for your GPAC build, use gpac -h ffavf:*.
 .br
 
 .br
@@ -5826,7 +7590,7 @@
 .br
 Example
 .br
-src=video:#ffid=a src=logo:#ffid=b ffavf::f=[a][b]overlay=main_w-overlay_w-10:main_h-overlay_h-10
+gpac -i video:#ffid=a -i logo:#ffid=b ffavf::f=[a][b]overlay=main_w-overlay_w-10:main_h-overlay_h-10 vout
 .br
 
 .br
@@ -5844,15 +7608,15 @@
 .br
 Example
 .br
-src=source ffavf::f=split inspect:SID=#ffid=out0 vout#SID=out1
+gpac -i source ffavf::f=split inspect:SID=#ffid=out0 vout#SID=out1
 .br
 
 .br
 In this example:
 .br
-- the spliter produces 2 video streams out0 and out1
+- the splitter produces 2 video streams out0 and out1
 .br
-- the inspecter only process stream with ffid out0
+- the inspector only process stream with ffid out0
 .br
 - the video output only displays stream with ffid out1
 .br
@@ -5873,14 +7637,10 @@
 .br
 
 .br
-
-.br
-
-.br
 .SH Options (expert):
 .LP
 .br
-f (str): filter or filter chain description - see filter help
+f (str): filter or filter chain description
 .br
 pfmt (pfmt, default: none): pixel format of output. If not set, let AVFilter decide
 .br
@@ -5890,9 +7650,9 @@
 .br
 ch (uint, default: 0): number of channels of output. If not set, let AVFilter decide
 .br
-dump (bool, default: false, updatable): dump graph as log madia@info or stderr if not set
+dump (bool, default: false, updatable): dump graph as log media@info or stderr if not set
 .br
-* (str): any possible options defined for AVFilter and sub-classes. See gpac -hx ffavf and gpac -hx ffavf:*
+* (str): any possible options defined for AVFilter and sub-classes (see gpac -hx ffavf and gpac -hx ffavf:*)
 .br
 
 .br
@@ -5911,14 +7671,412 @@
 .br
 
 .br
+.SH Options (expert):
+.LP
+.br
+js (cstr): location of script source
+.br
+* (str): any possible options defined for the script (see gpac -hx jsf:js=$YOURSCRIPT or gpac -hx $YOURSCRIPT)
+.br
+
+.br
+.SH routeout
+.LP
+.br
+Description: ROUTE output
+.br
+
+.br
+The ROUTE output filter is used to distribute a live file-based session using ROUTE.
+.br
+The filter supports DASH and HLS inputs, ATSC3.0 signaling and generic ROUTE signaling.
+.br
+
+.br
+The filter is identified using the following URL schemes:
+.br
+* `atsc://`: session is a full ATSC 3.0 session
+.br
+* `route://IP:port`: session is a ROUTE session running on given multicast IP and port
+.br
+
+.br
+The filter only accepts input PIDs of type FILE.
+.br
+- HAS Manifests files are detected by file extension and/or MIME types, and sent as part of the signaling bundle or as LCT object files for HLS child playlists.
+.br
+- HAS Media segments are detected using the OrigStreamType property, and send as LCT object files using the DASH template string.
+.br
+- A PID without OrigStreamType property set is delivered as a regular LCT object file (called raw hereafter).
+.br
+ 
+.br
+For raw file PIDs, the filter will look for the following properties:
+.br
+* `ROUTEName`: set resource name. If not found, uses basename of URL
+.br
+* `ROUTECarousel`: set repeat period. If not found, uses .I carousel. If 0, the file is only sent once
+.br
+* `ROUTEUpload`: set resource upload time. If not found, uses .I carousel. If 0, the file will be sent as fast as possible.
+.br
+
+.br
+When DASHing for ROUTE or single service ATSC, a file extension, either in .I dst or in .I ext, may be used to identify the HAS session type (DASH or HLS).
+.br
+Example
+.br
+"route://IP:PORT/manifest.mpd", "route://IP:PORT/:ext=mpd"
+.br
+
+.br
+
+.br
+When DASHing for multi-service ATSC, forcing an extension will force all service to use the same formats.
+.br
+Example
+.br
+"atsc://:ext=mpd", "route://IP:PORT/manifest.mpd"
+.br
+
+.br
+If multiple services with different formats are needed, you will need to explicit your filters:
+.br
+Example
+.br
+gpac -i DASH_URL:#ServiceID=1 dashin:forward=file:FID=1 -i HLS_URL:#ServiceID=2 dashin:forward=file:FID=2 -o atsc://:SID=1,2
+.br
+gpac -i MOVIE1:#ServiceID=1 dasher:FID=1:mname=manifest.mpd -i MOVIE2:#ServiceID=2 dasher:FID=2:mname=manifest.m3u8 -o atsc://:SID=1,2
+.br
+
+.br
+
+.br
+Warning: When forwarding an existing DASH/HLS session, do NOT set any extension or manifest name.
+.br
+
+.br
+By default, all streams in a service are assigned to a single route session, and differentiated by ROUTE TSI (see .I splitlct).
+.br
+TSI are assigned as follows:
+.br
+- signaling TSI is always 0
+.br
+- raw files are assigned TSI 1 and increasing number of TOI
+.br
+- otherwise, the first PID found is assigned TSI 10, the second TSI 20 etc ...
+.br
+
+.br
+Init segments and HLS child playlists are sent before each new segment, independently of .I carousel.
+.br
+.SH ATSC 3.0 mode
+.LP
+.br
+In this mode, the filter allows multiple service multiplexing, identified through the ServiceID property.
+.br
+By default, a single multicast IP is used for route sessions, each service will be assigned a different port.
+.br
+The filter will look for ROUTEIP and ROUTEPort properties on the incoming PID. If not found, the default .I ip and .I port will be used.
+.br
+
+.br
+The ATSC short service name can be set using PID property ShortServiceName. If not found, ServiceName is checked, otherwise default to GPAC.
+.br
+
+.br
+.SH ROUTE mode
+.LP
+.br
+In this mode, only a single service can be distributed by the ROUTE session.
+.br
+Note: .I ip is ignored, and .I first_port is used if no port is specified in .I dst.
+.br
+The ROUTE session will include a multi-part MIME unsigned package containing manifest and S-TSID, sent on TSI=0.
+.br
+
+.br
+.SH Low latency mode
+.LP
+.br
+When using low-latency mode, the input media segments are not re-assembled in a single packet but are instead sent as they are received.
+.br
+In order for the real-time scheduling of data chunks to work, each fragment of the segment should have a CTS and timestamp describing its timing.
+.br
+If this is not the case (typically when used with an existing DASH session in file mode), the scheduler will estimate CTS and duration based on the stream bitrate and segment duration. The indicated bitrate is increased by .I brinc percent for safety.
+.br
+If this fails, the filter will trigger warnings and send as fast as possible.
+.br
+Note: The LCT objects are sent with no length (TOL header) assigned until the final segment size is known, potentially leading to a final 0-size LCT fragment signaling only the final size.
+.br
+
+.br
+.SH Examples
+.LP
+.br
+Since the ROUTE filter only consumes files, it is required to insert:
+.br
+- the dash demultiplexer in file forwarding mode when loading a DASH session
+.br
+- the dash multiplexer when creating a DASH session
+.br
+
+.br
+Multiplexing an existing DASH session in route:
+.br
+Example
+.br
+gpac -i source.mpd dashin:forward=file -o route://225.1.1.0:6000/
+.br
+
+.br
+Multiplexing an existing DASH session in atsc:
+.br
+Example
+.br
+gpac -i source.mpd dashin:forward=file -o atsc://
+.br
+
+.br
+Dashing and multiplexing in route:
+.br
+Example
+.br
+gpac -i source.mp4 dasher:profile=live -o route://225.1.1.0:6000/manifest.mpd
+.br
+
+.br
+Dashing and multiplexing in route Low Latency:
+.br
+Example
+.br
+gpac -i source.mp4 dasher -o route://225.1.1.0:6000/manifest.mpd:profile=live:cdur=0.2:llmode
+.br
+
+.br
+
+.br
+Sending a single file in ROUTE using half a second upload time, 2 seconds carousel:
+.br
+Example
+.br
+gpac -i URL:#ROUTEUpload=0.5:#ROUTECarousel=2 -o route://225.1.1.0:6000/
+.br
+
+.br
+
+.br
+Common mistakes:
+.br
+Example
+.br
+gpac -i source.mpd -o route://225.1.1.0:6000/
+.br
+
+.br
+This will only send the manifest file as a regular object and will not load the dash session.
+.br
+Example
+.br
+gpac -i source.mpd dashin:forward=file -o route://225.1.1.0:6000/manifest.mpd
+.br
+
+.br
+This will force the ROUTE multiplexer to only accept .mpd files, and will drop all segment files (same if .I ext is used).
+.br
+Example
+.br
+gpac -i source.mpd dasher -o route://225.1.1.0:6000/
+.br
+gpac -i source.mpd dasher -o route://225.1.1.0:6000/manifest.mpd
+.br
+
+.br
+These will demultiplex the input, re-dash it and send the output of the dasher to ROUTE
+.br
 
 .br
 .SH Options (expert):
 .LP
 .br
-js (cstr): location of script source
+dst (cstr): destination URL
 .br
-* (str): any possible options defined for the script. See gpac -hx jsf:js=$YOURSCRIPT
+ext (cstr): set extension for graph resolution, regardless of file extension
+.br
+mime (cstr): set mime type for graph resolution
+.br
+ifce (str): default interface to use for multicast. If NULL, the default system interface will be used
+.br
+carousel (uint, default: 1000): carousel period in ms for repeating signaling and raw file data
+.br
+first_port (uint, default: 6000): port number of first ROUTE session in ATSC mode
+.br
+ip (str, default: 225.1.1.0): multicast IP address for ROUTE session in ATSC mode
+.br
+ttl (uint, default: 0): time-to-live for multicast packets
+.br
+bsid (uint, default: 800): ID for ATSC broadcast stream
+.br
+mtu (uint, default: 1472): size of LCT MTU in bytes
+.br
+splitlct (enum, default: off): split mode for LCT channels
+.br
+* off: all streams are in the same LCT channel
+.br
+* type: each new stream type results in a new LCT channel
+.br
+* all: all streams are in dedicated LCT channel, the first stream being used for STSID signaling
+.br
+
+.br
+korean (bool, default: false): use Korean version of ATSC 3.0 spec instead of US
+.br
+llmode (bool, default: false): use low-latency mode
+.br
+brinc (uint, default: 10): bitrate increase in percent when estimating timing in low latency mode
+.br
+noreg (bool, default: false): disable rate regulation for media segments, pushing them as fast as received
+.br
+runfor (uint, default: 0): run for the given time in ms
+.br
+
+.br
+.SH rftruehd
+.LP
+.br
+Description: TrueHD reframer
+.br
+
+.br
+This filter parses Dolby TrueHD files/data and outputs corresponding audio PID and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+index (dbl, default: 1.0): indexing window length
+.br
+
+.br
+.SH cryptin
+.LP
+.br
+Description: CryptFile input
+.br
+
+.br
+This filter dispatch raw blocks from encrypted files with AES 128 CBC in PKCS7 to clear input files
+.br
+
+.br
+The filter is automatically loaded by the DASH/HLS demultiplexer and should not be explicitly loaded by your application.
+.br
+
+.br
+The filter accepts URL with scheme gcryp://URL, where URL is the URL to decrypt.
+.br
+
+.br
+The filter can process http(s) and local file key URLs (setup through HLS manifest), and expects a full key (16 bytes) as result of resource fetching.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+src (cstr): location of source file
+.br
+fullfile (bool, default: false): reassemble full file before decryption
+.br
+
+.br
+.SH cryptout
+.LP
+.br
+Description: CryptFile output
+.br
+
+.br
+This filter dispatch raw blocks from clear input files to encrypted files with AES 128 CBC in PKCS7
+.br
+
+.br
+The filter is automatically loaded by the DASH/HLS multiplexer and should not be explicitly loaded by your application.
+.br
+
+.br
+The filter accepts URL with scheme gcryp://URL, where URL is the URL to encrypt.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+dst (cstr): location of source file
+.br
+fullfile (bool, default: false): reassemble full file before decryption
+.br
+
+.br
+.SH restamp
+.LP
+.br
+Description: Packet timestamp rewriter
+.br
+
+.br
+This filter rewrites timing (offsets and rate) of packets.
+.br
+
+.br
+The specified delay per stream class can be either positive (stream presented later) or negative (stream presented sooner).
+.br
+
+.br
+The specified .I fps can be either 0, positive or negative.
+.br
+- if 0 or if the stream is audio, stream rate is not modified.
+.br
+- otherwise if negative, stream rate is multiplied by -fps.num/fps.den.
+.br
+- otherwise if positive and the stream is not video, stream rate is not modified.
+.br
+- otherwise (video PID), constant frame rate is assumed and:
+.br
+ - if .I rawv=no, video frame rate is changed to the specified rate (speed-up or slow-down).
+.br
+ - if .I rawv=force, input video stream is decoded and video frames are dropped/copied to match the new rate.
+.br
+ - if .I rawv=dyn, input video stream is decoded if not all-intra and video frames are dropped/copied to match the new rate.
+.br
+
+.br
+Note: frames are simply copied or dropped with no motion compensation.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+fps (frac, default: 0/1): target fps
+.br
+delay_v (frac, default: 0/1, updatable): delay to add to video streams
+.br
+delay_a (frac, default: 0/1, updatable): delay to add to audio streams
+.br
+delay_t (frac, default: 0/1, updatable): delay to add to text streams
+.br
+delay_o (frac, default: 0/1, updatable): delay to add to other streams
+.br
+rawv (enum, default: no): copy video frames
+.br
+* no: no raw frame copy/drop
+.br
+* force: force decoding all video streams
+.br
+* dyn: decoding video streams if not all intra
+.br
+
 .br
 
 .br
@@ -5936,9 +8094,9 @@
 .SH Options (expert):
 .LP
 .br
-bus (sint, default: -1): PCI bus number - if not set, device discovery is used
+bus (sint, default: -1): PCI bus number. If not set, device discovery is used
 .br
-slot (sint, default: -1): PCI bus number - if not set, device discovery is used
+slot (sint, default: -1): PCI bus number. If not set, device discovery is used
 .br
 fps (frac, default: 30/1): default FPS to use if input stream fps cannot be detected
 .br
@@ -5946,7 +8104,7 @@
 .br
 port (uint, default: 1): set sdi output port of card
 .br
-start (dbl, default: 0.0): set playback start offset, [-1, 0] means percent of media dur, eg -1 == dur
+start (dbl, default: 0.0): set playback start offset, [-1, 0] means percent of media dur, e.g. -1 == dur
 .br
 
 .br
@@ -5974,7 +8132,7 @@
 .br
 
 .br
-nb_threads (uint, default: 0): set number of threads. If 0, uses number of cores minus one
+nb_threads (uint, default: 0): set number of threads (if 0, uses number of cores minus one)
 .br
 no_copy (bool, default: false): directly dispatch internal decoded frame without copy
 .br
@@ -5982,12 +8140,1914 @@
 .br
 seek_reset (bool, default: false): reset decoder when seeking
 .br
-force_stereo (bool, default: false): force stereo output for multiview (top-bottom only)
+force_stereo (bool, default: true): use stereo output for multiview (top-bottom only)
 .br
 reset_switch (bool, default: false): reset decoder at config change
 .br
 
 .br
+.SH avmix
+.LP
+.br
+Description: Audio Video Mixer
+.br
+Author: GPAC team
+.br
+
+.br
+AVMix is an audio video mixer controlled by an updatable JSON playlist format. The filter can be used to:
+.br
+- schedule video sequence(s) over time
+.br
+- mix videos together
+.br
+- layout of multiple videos
+.br
+- overlay images, text and graphics over source videos
+.br
+
+.br
+All input streams are decoded prior to entering the mixer.
+.br
+- audio streams are mixed in software
+.br
+- video streams are composed according to the gpu option
+.br
+- other stream types are not yet supported
+.br
+
+.br
+OpenGL hardware acceleration can be used, but the supported feature set is currently not the same with or without GPU.
+.br
+
+.br
+In software mode, the mixer will detect whether any of the currently active video sources can be used as a base canvas for the output to save processing time.
+.br
+The default behavior is to do this detection only at the first generated frame, use dynpfmt to modify this.
+.br
+
+.br
+The filter can be extended through JavaScript modules. Currently only scenes and transition effects use this feature.
+.br
+
+.br
+.SH Live vs offline
+.LP
+.br
+
+.br
+When operating offline, the mixer will wait for video frames to be ready for 10 times lwait. After this timeout, the filter will abort if no input is available.
+.br
+This implies that there shall always be a media to compose, i.e. no "holes" in the timeline.
+.br
+Note: The playlist is still refreshed in offline mode.
+.br
+
+.br
+When operating live, the mixer will initially wait for video frames to be ready for lwait seconds. After this initial timeout, the output frames will indicate:
+.br
+- 'No signal' if no input is available (no source frames) or no scene is defined
+.br
+- 'Signal lost' if no new input data has been received for lwait on a source
+.br
+
+.br
+.SH Playlist Format
+.LP
+.br
+.SS Overview
+.br
+The main components in a playlist are:
+.br
+* Media sources and sequences: each source is described by one or more URL to the media data, and each sequence is a set of sources to be played continuously 
+.br
+* Transitions: sources in a sequence can be combined using transitions
+.br
+* Scenes: a scene describes one graphical object to put on screen and if and how input video are mapped on objects
+.br
+* Groups: a group is a hierarchy of scenes and groups with positioning properties, and can also be used to create offscreen images reused by other elements
+.br
+* Timers: a timer can be used to animate scene parameters in various fashions
+.br
+
+.br
+The playlist content shall be either a single JSON object or an array of JSON objects, hereafter called root objects.
+.br
+Root objects types can be indicated through a type property:
+.br
+* seq: a sequence object
+.br
+* url: a source object (if used as root, a default sequence object will be created)
+.br
+* scene: a scene object
+.br
+* group: a group object
+.br
+* timer: a timer object
+.br
+* script: a script object
+.br
+* config: a config object
+.br
+* watch: a watcher object
+.br
+* style: a style object
+.br
+
+.br
+Except for style, the type property of root objects is usually not needed as the parser guesses the object types from its properties.
+.br
+
+.br
+A root object with a property skip set to anything but 0 or false is ignored.
+.br
+Within a group hierarchy, any scene or group object with a property skip set to anything but 0 or false is ignored.
+.br
+
+.br
+Any unrecognized property not starting with _ will be reported as warning.
+.br
+
+.br
+.SS Colors
+.br
+Colors are handled as strings, formatted as:
+.br
+- the DOM color name (see gpac -h colors)
+.br
+- HTML codes $RRGGBB or #RRGGBB
+.br
+- RGB hex vales 0xRRGGBB
+.br
+- RGBA hex values 0xAARRGGBB
+.br
+- the color none is 0x00000000, its signification depends on the object using it.
+.br
+
+.br
+If JS code needs to manipulate colors, use sys.color_lerp and sys.color_component functions.
+.br
+
+.br
+.SS JS Hooks
+.br
+
+.br
+Some object types allow for custom JS code to be executed. 
+.br
+The script code can either be the value of the property, or located in a file indicated in the property. 
+.br
+The code is turned into a function (i.e. new Function(args, js_code)) upon initial playlist parsing or reload, hereafter called JSFun.
+.br
+The JSFun arguments and return value are dependent on the parent object type.
+.br
+The parent object is exposed as this in JSFun and can be used to store context information for the JS code.
+.br
+
+.br
+The code can use the global functions and modules defined, especially:
+.br
+* sys: GPAC system module
+.br
+* evg: GPAC EVG module
+.br
+* os: QuickJS OS module 
+.br
+* video_playing: video playing state
+.br
+* audio_playing: audio playing state
+.br
+* video_time: output video time
+.br
+* video_timescale: output video timescale
+.br
+* video_width: output video width
+.br
+* video_height: output video height
+.br
+* audio_time: output audio time
+.br
+* audio_timescale: output audio timescale
+.br
+* samplerate: output audio samplerate
+.br
+* channels: output audio channels
+.br
+* current_utc_clock: current UTC clock in ms
+.br
+* get_media_time: gets media time of output (no argument) or of source with id matching the first argument. Return
+.br
+ * -4: not found
+.br
+ * -3: not playing
+.br
+ * -2: in prefetch
+.br
+ * -1: timing not yet known
+.br
+ * value: media time in seconds (float)
+.br
+* resolve_url: resolves URL given in first argument against media playlist URL and returns the resolved url (string)
+.br
+* get_scene(id): gets scene with given ID
+.br
+* get_group(id): gets group with given ID
+.br
+* mouse_over(evt): returns scene under mouse described by a GPAC event, or null if no scene (picking for scenes with perspective projection is not supported)
+.br
+* mouse_over(x, y): returns scene under coordinates {x, y} in pixels, {0,0} representing the center of the frame, x axis oriented towards the right and y axis oriented towards the top
+.br
+
+.br
+Scene and group options must be accessed through getters and setters:
+.br
+* scene.get(prop_name): gets the scene option
+.br
+* scene.set(prop_name, value): sets the scene option
+.br
+* group.get(prop_name): gets the group option
+.br
+* group.set(prop_name, value): sets the group option
+.br
+
+.br
+Warning: Results are undefined if JS code modifies the scene/group objects in any other way.
+.br
+
+.br
+Other playlist objects (as well as scene and group objects) can be queried using query_element(ID, propName) or modified using update_element(ID, propName, value) (see playlist update below). 
+.br
+
+.br
+Warning: There is no protection of global variables and state, write your script carefully!
+.br
+
+.br
+Additionally, scripts executed within scene modules can modify the internal playlist using:
+.br
+* remove_element(ID): removes a scene, group, sequence, timer, script or watcher with given ID from playlist
+.br
+* parse_element(JSON): parses a root playlist element and add it to the current playlist
+.br
+* parse_scene(JSON, parent): parses a scene and add it to parent group if not null or root otherwise
+.br
+* parse_group(JSON, parent): parses a group and add it to parent group if not null or root otherwise
+.br
+* reload_playlist(JSON): parses a new playlist (an empty JSON array will reset the playlist). If the calling scene is no longer in the resulting scene tree, it will be added to the root of the scene tree.
+.br
+
+.br
+All these playlist-related functions must be called within the update() callback of the scene module.
+.br
+
+.br
+.SS Sequences
+.br
+.P
+.B
+Properties for sequence objects:
+.br
+ * id (null): sequence identifier
+.br
+ * loop (0): number of loops for the sequence (0 means no loop, -1 will loop forever)
+.br
+ * start (0): sequence start time (see notes). If negative, the sequence is not active
+.br
+ * stop (0): sequence stop time (see notes). If less than start, the sequence will stop only when over
+.br
+ * transition (null): a transition object to apply between sources of the sequence
+.br
+ * seq ([]): array of one or more source objects
+.br
+
+.br
+.P
+.B
+Notes
+.br
+Media source timing does not depend on the media being used by a scene or not, it is only governed by the sequence parameters.
+.br
+This means that a sequence not used by any active scene will not be rendered (video nor audio).
+.br
+
+.br
+The syntax for start and stop fields is:
+.br
+* `now`: resolves to current UTC clock in live mode, and to 0 for non-live mode
+.br
+* date: converted to UTC date in live mode, and to 0 for non-live mode
+.br
+* N: converted to current utc clock plus N seconds UTC
+.br
+* "N": converted to current utc clock plus N seconds UTC
+.br
+
+.br
+.SS Sources
+.br
+.P
+.B
+Properties for source objects
+.br
+* id (null): source identifier, used when reloading the playlist
+.br
+* src ([]): list of sourceURL describing the URLs to play. Multiple sources will be played in parallel
+.br
+* start (0.0): media start time in source
+.br
+* stop (0.0): media stop time in source, ignored if less than or equal to start
+.br
+* mix (true): if true, apply sequence transition or mix effect ratio as audio volume. Otherwise volume is not modified by transitions.
+.br
+* fade ('inout'): indicate how audio should be faded at stream start/end:
+.br
+ * in: audio fade-in when playing first frame
+.br
+ * out: audio fade-out when playing last frame
+.br
+ * inout: both fade-in and fade-out are enabled
+.br
+ * other: no audio fade
+.br
+* keep_alive (false): if using a dedicated gpac process for one or more input, relaunch process(es) at source end if exit code is greater than 2 or if not responding after rtimeout
+.br
+* seek (false): if true and keep_alive is active, adjust start according to the time elapsed since source start when relaunching process(es)
+.br
+* prefetch (500): prefetch duration in ms (play before start time of source), 0 for no prefetch
+.br
+
+.br
+.SS Source Locations
+.br
+.P
+.B
+Properties for sourceURL objects
+.br
+* id (null): source URL identifier, used when reloading the playlist
+.br
+* in (null): input URL or filter chain to load as string. Words starting with - are ignored. The first entry must specify a source URL, and additional filters and links can be specified using @N[#LINKOPT] and @@N[#LINKOPT] syntax, as in gpac
+.br
+* port (null): input port for source. Possible values are:
+.br
+ * pipe: launch a gpac process to play the source using GSF format over pipe
+.br
+ * tcp, tcpu: launch a gpac process to play the source using GSF format over TCP socket (tcp) or unix domain TCP socket (tcpu)
+.br
+ * not specified or empty string: loads source using the current process
+.br
+ * other: use value as input filter declaration and launch in as a dedicated process (e.g. in="ffmpeg ..." port="pipe://...")
+.br
+* opts (null): options for the gpac process instance when using a dedicated gpac process, ignored otherwise
+.br
+* media ('all'): filter input media by type, a for audio, v for video, t for text (several characters allowed, e.g. av or va), all accept all input media
+.br
+* raw (true): indicate if input port is decoded AV (true) or compressed AV (false) when using a dedicated gpac process, ignored otherwise
+.br
+
+.br
+.P
+.B
+Notes
+.br
+When launching a child process, the input filter is created first and the child process launched afterwards.
+.br
+
+.br
+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.
+.br
+
+.br
+.SS 2D and 3D transformation
+.br
+.P
+.B
+Common properties for group and scene objects
+.br
+* active (true): indicate if the object is active or not. An inactive object will not be refreshed nor rendered
+.br
+* x (0): horizontal translation
+.br
+* y (0): vertical translation
+.br
+* cx (0): horizontal coordinate of rotation center
+.br
+* cy (0): vertical coordinate of rotation center
+.br
+* units ('rel'): unit type for x, y, cx, cy, width and height. Possible values are:
+.br
+ * rel: units are expressed in percent of current reference (see below)
+.br
+ * pix: units are expressed in pixels
+.br
+* rotation (0): rotation angle of the scene in degrees
+.br
+* hscale (1): horizontal scaling factor to apply to the group
+.br
+* vscale (1): vertical skewing factor to apply to the scene
+.br
+* hskew (0): horizontal skewing factor to apply to the scene
+.br
+* vskew (0): vertical skewing factor to apply to the scene
+.br
+* zorder (0): display order of the scene or of the offscreen group (ignored for regular groups)
+.br
+* untransform (false): if true, reset parent tree matrix to identity before computing matrix
+.br
+* mxjs (null): JS code for matrix evaluation
+.br
+* z (0): depth translation
+.br
+* cz (0): depth coordinate of rotation center
+.br
+* zscale (1): depth scaling factor to apply to the group
+.br
+* orientation ([0, 0, 1, 0]): scale along the given orientation axis [x, y, z, angle] - see VRML scaleOrientation
+.br
+* axis ([0, 0, 1]): rotation axis
+.br
+* position ([0, 0, auto]): camera location
+.br
+* target ([0, 0, 0]): point where the camera is looking
+.br
+* up ([0, 1, 0]): camera up vector
+.br
+* viewport ([0, 0, 100, 100]): viewport for camera
+.br
+* fov (45): field of view in degrees
+.br
+* ar (0): camera aspect ratio, 0 means default
+.br
+* znear (0): near Z plane distance, 0 means default
+.br
+* zfar (0): far Z plane distance, 0 means default
+.br
+
+.br
+.P
+.B
+Coordinate System
+.br
+Each group or scene is specified in a local coordinate system for which:
+.br
+- {0,0} represents the center
+.br
+- X values increase to the right
+.br
+- Y values increase to the top
+.br
+- Z values increase towards the eye of a viewer (Z=X^Y)
+.br
+
+.br
+The 2D local transformation matrix is computed as rotate(cx, cy, rotation) * hskew * vskew * scale(hscale, vscale) * translate(x, y).
+.br
+The 3D local transformation matrix is computed as translate(x, y, z) * rotate(cx, cy, cz, rotation) * scale(hscale, vscale, zscale). Skewing is not supported for 3D.
+.br
+
+.br
+The default unit system (rel) is relative to the current established reference space:
+.br
+- by default, the reference space is {output_width, output_height}, the origin {0,0} being the center of the output frame 
+.br
+- any group with reference=true, width>0 and height>0 establishes a new reference space {group.width, group.height}
+.br
+
+.br
+Inside a reference space R, relative coordinates are interpreted as follows:
+.br
+- For horizontal coordinates, 0 means center, -50 means left edge (-R.width/2), 50 means right edge (+R.width/2).
+.br
+- For vertical coordinates, 0 means center, -50 means bottom edge (-R.height/2), 50 means top edge (+R.height/2).
+.br
+- For width, 100 means R.width.
+.br
+- For height, 100 means R.height.
+.br
+- For depth (z and cz) coordinates, the value is a percent of the reference height (+R.height).
+.br
+
+.br
+If width=height, the width is set to the computed height of the object.
+.br
+If height=width, the height is set to the computed width of the object.
+.br
+For x property, the following special values are defined:
+.br
+- y will set the value to the computed y of the object.
+.br
+- -y will set the value to the computed -y of the object.
+.br
+For y property, the following special values are defined:
+.br
+- x will set the value to the computed x of the object.
+.br
+- -x will set the value to the computed -x of the object.
+.br
+
+.br
+Changing reference is typically needed when creating offscreen groups, so that children relative coordinates are resolved against the offscreen canvas size.
+.br
+
+.br
+The selection between 2D and 3D is done automatically based on z, cz, axis and orientation values.
+.br
+The default projection is:
+.br
+- viewport is the entire output frame
+.br
+- field of view is PI/4 and aspect ratio is output width/height
+.br
+- zNear is 0.1 and zFar is 10 times maximum(output width, output height)
+.br
+- camera up direction is Y axis and camera distance is so that a rectangle facing the camera with z=0 and size equal to output size covers exactly the output frame.
+.br
+- depth buffer is disabled
+.br
+
+.br
+The default projection can be changed by setting camera properties at group or scene level. When set on a group, all children of the group will use the given camera properties (camera parameters on children are ignored).
+.br
+The viewport parameter is specified as an array [x, y, w, h], where:
+.br
+* x: horizontal coordinate of the viewport center, in group or scene units, or 'y' to use y value, or '-y' to use -y value.
+.br
+* y: vertical coordinate of the viewport center, in group or scene units, or 'x' to use x value, or '-x' to use -x value.
+.br
+* w: width of the viewport, in group or scene units, or 'height' to use h value.
+.br
+* h: height of the viewport, in group or scene units, or 'width' to use w value.
+.br
+
+.br
+.P
+.B
+z-ordering
+.br
+zorder specifies the display order of the element in the offscreen canvas of the enclosing offscreen group, or on the output frame if no offscreen group in parent tree.
+.br
+This order is independent of the parent group z-ordering. This allows moving objects of a group up and down the display stack without modifying the groups.
+.br
+
+.br
+.P
+.B
+Coordinate modifications through JS
+.br
+The JSFun specified in mxjs has a single parameter tr.
+.br
+
+.br
+The tr parameter is an object containing the following variables that the code can modify:
+.br
+* x, y, z, cx, cy, cz, hscale, vscale, zscale, hskew, vskew, rotation, untransform, axis, orientation: these values are initialized to the current group values in local coordinate system units
+.br
+* update: if set to true, the object matrix will be recomputed at each frame even if no change in the group or scene parameters (always enforced to true if use is set)
+.br
+* depth: for groups with use, indicates the recursion level of the used element. A value of 0 indicates this is a direct render of the element, otherwise it is a render through use
+.br
+
+.br
+The JSFun may return false to indicate that the scene should be considered as inactive. Any other return value (undefined or not false) will mark the scene as active.
+.br
+
+.br
+EX: "mxjs": "tr.rotation = (get_media_time() % 8) * 360 / 8; tr.update=true;"
+.br
+
+.br
+.SS Grouping
+.br
+.P
+.B
+Properties for group objects
+.br
+* id (null): group identifier
+.br
+* scenes ([]): zero or more group or scene objects, cannot be animated or updated
+.br
+* opacity (1): group opacity
+.br
+* offscreen ('none'): set group in offscreen mode, cannot be animated or updated. An offscreen mode is not directly visible but can be used in some texture operations. Possible values are:
+.br
+ * none: regular group
+.br
+ * mask: offscreen surface is alpha+grey
+.br
+ * color: offscreen surface is alpha+colors or colors if back_color is set
+.br
+ * dual: same as color but allows group to be displayed
+.br
+* scaler (1): when opacity or offscreen rendering is used, offscreen canvas size is divided by this factor (>=1)
+.br
+* back_color ('none'): when opacity or offscreen rendering is used, fill offscreen canvas with the given color.
+.br
+* width (-1): when opacity or offscreen rendering is used, limit offscreen width to given value (see below)
+.br
+* height (-1): when opacity or offscreen rendering is used, limit offscreen height to given value (see below)
+.br
+* use (null): id of group or scene to re-use
+.br
+* use_depth (-1): number of recursion allowed for the used element, negative means global max branch depth as indicated by maxdepth
+.br
+* reverse (false): reverse scenes order before draw
+.br
+* reference (false): group is a reference space for relative coordinate of children nodes 
+.br
+
+.br
+.P
+.B
+Notes
+.br
+The maximum depth of a branch in the scene graph is maxdepth (traversing aborts after this limit).
+.br
+
+.br
+In offscreen mode, the bounds of the enclosed objects are computed to allocate the offscreen surface, unless width and height are both greater or equal to 0.
+.br
+Enforcing offscreen size is useful when generating textures for later effects.
+.br
+
+.br
+Offscreen rendering is always done in software.
+.br
+
+.br
+When enforcing scaler>1 on a group with opacity==1, offscreen rendering will be used and the scaler applied.
+.br
+
+.br
+When enforcing width and height on a group with opacity<1, the display may be truncated if children objects are out of the offscreen canvas bounds.
+.br
+
+.br
+.SS Scenes
+.br
+.P
+.B
+Properties for scene objects
+.br
+* id (null): scene identifier
+.br
+* js ('shape'): scene type, either builtin (see below) or path to a JS module, cannot be animated or updated
+.br
+* sources ([]): list of identifiers of sequences or offscreen groups used by this scene
+.br
+* width (-1): width of the scene, -1 means reference space width
+.br
+* height (-1): height of the scene, -1 means reference space height
+.br
+* mix (null): a transition object to apply if more than one source is set, ignored otherwise
+.br
+* mix_ratio (-1): mix ratio for transition effect, <=0 means first source only, >=1 means second source only
+.br
+* volume (1.0): audio volume (0: silence, 1: input volume), this value is not clamped by the mixer.
+.br
+* fade ('inout'): indicate how audio should be faded at scene activate/deactivate:
+.br
+ * in: audio fade-in when playing first frame after scene activation
+.br
+ * out: audio fade-out when playing last frame at scene activation
+.br
+ * inout: both fade-in and fade-out are enabled
+.br
+ * other: no audio fade
+.br
+* styles ([]): list of style IDs to use
+.br
+- any other property exposed by the underlying scene JS module.
+.br
+
+.br
+.P
+.B
+Notes
+.br
+Inputs to a scene, whether sequence or offscreen group, must be declared prior to the scene itself.
+.br
+
+.br
+A default scene will be injected if none is found when initially loading the playlist. If you need to start with an empty output, use a scene with no sequence associated.
+.br
+
+.br
+.SS Transitions and Mixing effects
+.br
+.P
+.B
+JSON syntax
+.br
+Properties for transition objects:
+.br
+* id (null): transition identifier
+.br
+* type: transition type, either builtin (see below) or path to a JS module
+.br
+* dur: transition duration (transitions always end at source stop time). Ignored if transition is specified for a scene mix.
+.br
+* fun (null): JS code modifying the ratio effect
+.br
+- any other property exposed by the underlying transition module.
+.br
+
+.br
+.P
+.B
+Notes
+.br
+A sequence of two media with playback duration (as indicated in source) of D1 and D2 using a transition of duration DT will result in a sequence lasting D1 + D2 - DT.
+.br
+
+.br
+The JSFun specified by fun takes one argument ratio and must return the recomputed ratio.
+.br
+
+.br
+Example
+.br
+"fun": "return ratio*ratio;"
+.br
+
+.br
+
+.br
+.SS Timers and animations
+.br
+.P
+.B
+Properties for timer objects
+.br
+* id (null): id of the timer
+.br
+* dur (0): duration of the timer in seconds
+.br
+* loop (false): loops timer when stop is not set
+.br
+* pause (false): pause timer
+.br
+* start (-1): start time (see notes), negative value means inactive
+.br
+* stop (-1): stop time (see notes), ignored if less than start
+.br
+* keys ([]): list of keys used for interpolation, ordered list between 0.0 and 1.0
+.br
+* anims ([]): list of animation objects
+.br
+
+.br
+.P
+.B
+Properties for animation objects
+.br
+* values ([]): list of values to interpolate, there must be as many values as there are keys
+.br
+* color (false): indicate the values are color (as strings)
+.br
+* angle (false): indicate the interpolation factor is an angle in degree, to convert to radians (interpolation ratio multiplied by PI and divided by 180) before interpolation
+.br
+* mode ('linear') : interpolation mode:
+.br
+ * linear: linear interpolation between the values
+.br
+ * discrete: do not interpolate
+.br
+ * other: JS code modifying the interpolation ratio
+.br
+* postfun (null): JS code modifying the interpolation result
+.br
+* end ('freeze'): behavior at end of animation:
+.br
+ * freeze: keep last animated values
+.br
+ * restore: restore targets to their initial values
+.br
+* targets ([]): list of strings indicating targets properties to modify. Syntax is:
+.br
+ * ID@option: modifies property option of object with given ID
+.br
+ * ID@option[IDX]: modifies value at index IDX of array property option of object with given ID
+.br
+
+.br
+.P
+.B
+Notes
+.br
+Currently, only scene, group, transition and script objects can be modified through timers (see playlist updates).
+.br
+
+.br
+The syntax for start and stop fields is:
+.br
+* `now`: resolves to current UTC clock in live mode, and to 0 for non-live mode
+.br
+* date: converted to UTC date in live mode, and to 0 for non-live mode
+.br
+* N: converted to UTC clock at init plus N seconds for timer objects (absolute offset from timeline init)
+.br
+* "N": converted to current UTC clock plus N seconds (relative offset from current time) with N a positive or negative number
+.br
+
+.br
+The JSFun specified by mode has one input parameter interp equal to the interpolation factor and must return the new interpolation factor.
+.br
+Example
+.br
+"mode":"return interp*interp;" 
+.br
+
+.br
+
+.br
+The JSFun specified by postfun has two input parameters res (the current interplation result) and interp (the interpolation factor), and must return the new interpolated value.
+.br
+Example
+.br
+"postfun": "if (interp<0.5) return res*res; return res;" 
+.br
+
+.br
+
+.br
+.SS Scripts
+.br
+.P
+.B
+Properties for script objects
+.br
+* id (null): id of the script
+.br
+* script (null): JavaScript code or path to JavaScript file to execute, cannot be animated or updated
+.br
+* active (true): indicate if script is active or not
+.br
+
+.br
+.P
+.B
+Notes
+.br
+
+.br
+Script objects allow read and write access to the playlist from script. They currently can only be used to modify scenes and groups and to activate/deactivate other scripts.
+.br
+
+.br
+The JSFun function specified by fun has no input parameter. The return value (default 0) is the number of seconds (float) to wait until next evaluation of the script.
+.br
+
+.br
+EX: { "script": "let s=get_scene('s1'); let rot = s.get('rotation'); rot += 10; s.set('rotation', rot); return 2;" }
+.br
+This will change scene s1 rotation every 2 seconds 
+.br
+
+.br
+.SS Watchers
+.br
+.P
+.B
+Properties for watcher objects
+.br
+* id (null): ID of the watcher
+.br
+* active (true): indicate if watcher is active or not
+.br
+* watch (""): element watched, formatted as ID@prop, with ID the element ID and prop the property name to watch
+.br
+* target (""): action for watcher. Allowed syntaxes are:
+.br
+ * `ID@prop`, `ID@prop[idx]`: copy value to property prop of the element ID (potentially at index idx if specified for arrays)
+.br
+ * `ID.fun_name`: call function fun_name exported from scene module ID, using three arguments ['value', 'watchID', 'watchPropName'], no return value check
+.br
+ * otherwise: action must be JS code, and the resulting JSFun has one argument value containing the watched value, and no return value check
+.br
+* with (undefined): for targets in the form ID@prop, use this value instead of the watched value
+.br
+
+.br
+.P
+.B
+Notes
+.br
+
+.br
+A watcher can be used to monitor changes in an object in the playlist.
+.br
+Any object property that can be animated or updated can be monitored by a watcher.
+.br
+
+.br
+In addition, the following virtual properties (cannot be read or write) can be watched:
+.br
+* sequence.active: value is set to true when sequence is activated, and false when deactivated
+.br
+* source.active: value is set to true when source playback starts, and false when source playback stops
+.br
+* timer.active: value is set to true when timer starts, and false when timer stops
+.br
+
+.br
+Only the active property can be animated or updated in a watcher.
+.br
+
+.br
+Example
+.br
+{'watch': 's1@rotation', 'target': 's2@rotation'}
+.br
+
+.br
+This will copy s1.rotation to s2.rotation.
+.br
+
+.br
+Example
+.br
+{'watch': 's1@rotation', 'target': 'get_scene('s2').set('rotation', -value); }
+.br
+
+.br
+This will copy the -1*s1.rotation to s2.rotation.
+.br
+
+.br
+.P
+.B
+Watching UI events
+.br
+
+.br
+Watchers can also be used to monitor GPAC user events by setting watch to:
+.br
+- an event name to monitor, one of keydown, keyup, mousemove, mouseup, mousedown, wheel, textInput
+.br
+- events to monitor all events (including internal events).
+.br
+
+.br
+For keyup and keydown events, the key code to watch may additionally be given in parenthesis, e.g. 'watch': 'keyup(T)'.
+.br
+
+.br
+Note: User events are only sent if the output of the filter is consumed by the vout filter.
+.br
+
+.br
+When event monitoring is used, the target must be a javascript callback (i.e. it cannot be ID@prop).
+.br
+The javascript function will be called with a single argument evt containing the GPAC event.
+.br
+
+.br
+Example
+.br
+{'watch': 'mousemove', 'target': 'let s = mouse_over(evt); get_scene('s2').set('fill', (s && (s.id=='s1') ? 'white' : 'black' );'}
+.br
+
+.br
+This will set s1 fill color to white of mouse is over s2 and to black otherwise.
+.br
+
+.br
+.SS Styles
+.br
+.P
+.B
+Properties for style objects
+.br
+* id (null): ID of the style
+.br
+* forced (false): always apply style even when no modifications
+.br
+* other: any property to share between scene
+.br
+
+.br
+.P
+.B
+Notes
+.br
+
+.br
+A style object allows scenes to share the same values for a given set of properties.
+.br
+
+.br
+If a scene property has the same name as a style property, the scene property is replaced by the style property.
+.br
+Styles only apply to scene properties as follows:
+.br
+- volume, fade, mix_ratio can use style
+.br
+- all options defined by the scene module can use style
+.br
+- transformation or other scene properties cannot use style
+.br
+
+.br
+Properties of a style object can be animated or updated, but a style object cannot be watched.
+.br
+
+.br
+Styles are applied to each associated scene in order of declaration, e.g. ['st1', 'st2'] and ['st2', 'st1'] will likely give different results.
+.br
+
+.br
+If force is not set for a style, the style is only applied after being modified (load, animation, update); if a scene uses ['st1', 'st2'] and only st1 is
+.br
+modified (animation, update), st2 will only be applied once.
+.br
+
+.br
+.SS Filter configuration
+.br
+The playlist may specify configuration options of the filter, using a root object of type 'config':
+.br
+- property names are the same as the filter options
+.br
+- property values are given in the native type, or as strings for fractions (format N/D), vectors (format WxH) or enums
+.br
+- each declared property overrides the filter option of the same name (whether default or set at filter creation)
+.br
+
+.br
+A configuration object in the playlist is only parsed when initially loading the playlist, and ignored when reloading it.
+.br
+
+.br
+The following additional properties are defined for testing:
+.br
+* reload_tests([]): list of playlists to reload
+.br
+* reload_timeout(1.0): timeout in seconds before playlist reload
+.br
+* reload_loop (0): number of times to repeat the reload tests (not including original playlist which is not reloaded)
+.br
+
+.br
+.SS Playlist modification
+.br
+The playlist file can be modified at any time.
+.br
+Objects are identified across playlist reloads through their id property.
+.br
+Objects that are not present after reloading a playlist are removed from the mixer. This implies that reloading a playlist will recreate most objects with no ID associated.
+.br
+
+.br
+A sequence object modified between two reloads is refreshed, except for its start field if sequence active.
+.br
+
+.br
+A source object shall have the same parent sequence between two reloads. Any modification on the object will only be taken into consideration when (re)loading the source.
+.br
+
+.br
+A sourceURL object is not tracked for modification, only evaluated when activating the parent source object.
+.br
+
+.br
+A scene or group object modified between two reloads is notified of each changed value.
+.br
+
+.br
+A timer object modified between two reloads is shut down and restarted. Consequently, animation objects are not tracked between reloads.
+.br
+
+.br
+A transition object may change between two reloads, but any modification on the object will only be taken into consideration when restarting the effect.
+.br
+
+.br
+A script object modified between two reloads has its code re-evaluated
+.br
+
+.br
+A watcher object modified between two reloads has its watch source and code re-evaluated
+.br
+
+.br
+A style object is not tracked (all styles are reloaded when reloading a playlist).
+.br
+
+.br
+.SS Playlist example
+.br
+
+.br
+The following is an example playlist using a sequence of two videos with a mix transition and an animated video area:
+.br
+
+.br
+Example
+.br
+[
+.br
+ {"id": "seq1", "loop": -1, "start": 0, "seq":
+.br
+ [
+.br
+ { "id": "V1", "src": [{"in": "s1.mp4"}], "start": 60, "stop": 80},
+.br
+ { "id": "V2", "src": [{"in": "s2.mp4"}], "stop": 100}
+.br
+ ],
+.br
+ "transition": { "dur": 1, "type": "mix"}
+.br
+ },
+.br
+ {"id": "scene1", "sources": ["seq1"]},
+.br
+ {"start": 0, "dur": 10, "keys": [0, 1], "anims":
+.br
+ [
+.br
+ {"values": [50, 0], "targets": ["scene1@x", "scene1@y"]},
+.br
+ {"values": [0, 100], "targets": ["scene1@width", "scene1@height"]}
+.br
+ ]
+.br
+ }
+.br
+]
+.br
+
+.br
+
+.br
+.SH Updates Format
+.LP
+.br
+
+.br
+Updates can be sent to modify the playlist, rather than reloading the entire playlist.
+.br
+Updates are read from a separate file specified in updates, inactive by default.
+.br
+
+.br
+Warning: The updates file is only read when modified AFTER the initialization of the filter.
+.br
+
+.br
+The updates file content shall be either a single JSON object or an array of JSON objects.
+.br
+The properties of these objects are:
+.br
+* skip: if true or 1, ignores the update, otherwise apply it
+.br
+* replace: string identifying the target replacement. Syntax is:
+.br
+ * ID@name: indicate property name of element with given ID to replace
+.br
+ * ID@name[idx]: indicate the index in the property name of element with given ID to replace
+.br
+* with: replacement value, must be of the same type as the target value.
+.br
+
+.br
+An id property cannot be updated.
+.br
+
+.br
+The following playlist elements of a playlist can be updated:
+.br
+* scene: all properties except js and read-only module properties
+.br
+* group: all properties except scenes and offscreen
+.br
+* sequence: start, stop, loop and transition properties
+.br
+* timer: start, stop, loop, pause and dur properties
+.br
+* transition: all properties
+.br
+ * for sequence transitions: most of these properties will only be updated at next reload
+.br
+ * for active scene transitions: whether these changes are applied right away depend on the transition module
+.br
+
+.br
+Example
+.br
+[
+.br
+ {"replace": "scene1@x", "with": 20},
+.br
+ {"replace": "seq1@start", "with": "now"}
+.br
+ }
+.br
+]
+.br
+
+.br
+
+.br
+.SH Scene modules
+.LP
+.br
+.SS Scene mask
+.br
+This scene sets the canvas alpha mask mode.
+.br
+
+.br
+The canvas alpha mask is always full screen.
+.br
+
+.br
+In software mode, combining mask effect in record mode and reverse group drawing allows drawing front to back while writing pixels only once.
+.br
+
+.br
+Options:
+.br
+* mode ('off'): if set, reset clipper otherwise set it to scene position and size
+.br
+ * off: mask is disabled
+.br
+ * on: mask is enabled and cleared, further draw operations will take place on mask
+.br
+ * onkeep: mask is enabled but not cleared, further draw operations will take place on mask
+.br
+ * use: mask is enabled, further draw operations will be filtered by mask
+.br
+ * use_inv: mask is enabled, further draw operations will be filtered by 1-mask
+.br
+ * rec: mask is in record mode, further draw operations will be drawn on output and will set mask value to 0 
+.br
+ 
+.br
+.SS Scene clear
+.br
+This scene clears the canvas area covered by the scene with a given color. 
+.br
+
+.br
+The default clear color of the mixer is black.
+.br
+
+.br
+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.
+.br
+
+.br
+Options:
+.br
+* color ('none'): clear color
+.br
+.SS Scene clip
+.br
+This scene resets the canvas clipper or sets the canvas clipper to the scene area.
+.br
+
+.br
+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.
+.br
+
+.br
+Clippers are handled through a stack, resetting the clipper pops the stack and restores previous clipper.
+.br
+If a clipper is already defined when setting the clipper, the clipper set is the intersection of the two clippers.
+.br
+
+.br
+Options:
+.br
+* reset (false): if set, reset clipper otherwise set it to scene position and size
+.br
+* stack (true): if false, clipper is set/reset independently of the clipper stack (no intersection, no push/pop of the stack)
+.br
+.SS Scene shape
+.br
+This scene can be used to setup a shape, its outline and specify the fill and strike modes.
+.br
+Supported shapes include:
+.br
+- a variety of rectangles, ellipse and other polygons
+.br
+- custom paths specified from JS
+.br
+- text
+.br
+
+.br
+The color modes for shapes and outlines include:
+.br
+- texturing using data from input media streams (shape fill only)
+.br
+- texturing using local JPEG and PNG files (shape fill only)
+.br
+- solid color
+.br
+- linear and radial gradients
+.br
+
+.br
+The default scene is optimized to fallback to fast blit when no transformations are used on a straight rectangle shape.
+.br
+
+.br
+All options can be updated at run time.
+.br
+
+.br
+The module accepts 0, 1 or 2 sequences as input.
+.br
+
+.br
+Color replacement operations can be specified for base scenes using source videos by specifying the replace option. The replacement source is:
+.br
+- the image data if img is set, potentially altered using *_rep options
+.br
+- otherwise a linear gradient if fill=linear or a radial gradient if fill=radial (NOT supported in GPU mode, use an offscreen group for this).
+.br
+
+.br
+Warning: Color replacement operations cannot be used with transition or mix effects.
+.br
+
+.br
+.SS Text options 
+.br
+
+.br
+Text can be loaded from file if text[0] is an existing local file.
+.br
+By default all lines are loaded. The number of loaded lines can be specified using text[1] as follows:
+.br
+* 0 or not present: all lines are loaded
+.br
+* N > 0: only keep the last N lines
+.br
+* N < 0: only keep the first N lines
+.br
+
+.br
+Text loaded from file will be refreshed whenever the file is modified.
+.br
+
+.br
+Predefined keywords can be used in input text, identified as $KEYWORD$. The following keywords (case insensitive) are defined:
+.br
+* time: replaced by UTC date
+.br
+* ltime: replaced by locale date
+.br
+* date: replaced by date (Y/M/D)
+.br
+* ldate: replaced by locale date (Y/M/D)
+.br
+* mtime: replaced by output media time 
+.br
+* mtime_SRC: replaced by media time of input source SRC 
+.br
+* cpu: replaced by current CPU usage of process
+.br
+* mem: replaced by current memory usage of process
+.br
+* version: replaced by GPAC version
+.br
+* fversion: replaced by GPAC full version
+.br
+
+.br
+.SS Custom paths
+.br
+
+.br
+Custom paths (shapes) can be created through JS code indicated in 'shape', either inline or through a file.
+.br
+The following GPAC JS modules are imported:
+.br
+ - Sys as sys
+.br
+ - All EVG as evg
+.br
+ - os form QuickJS
+.br
+
+.br
+See https://doxygen.gpac.io for more information on EVG and Sys JS APIs.
+.br
+
+.br
+The code is exposed the scene as this. The variable this.path is created, representing an empty path.
+.br
+Example
+.br
+"shape": "this.path.add_rectangle(0, 0, this.width, this.height); let el = new evg.Path().ellipse(0, 0, this.width, this.height/3); this.path.add_path(el);"
+.br
+
+.br
+
+.br
+The default behaviour is to use the shape width and height as reference size for texture mapping.
+.br
+If your custom path is textured, with bounding rectangle size different from the indicated shape size, set the variable this.tx_adjust to true.
+.br
+
+.br
+In the previous example, the texture mapping will not be impacted by the custom path size.
+.br
+
+.br
+Example
+.br
+"shape": "this.path.add_rectangle(0, 0, this.width, this.height); let el = new evg.Path().ellipse(0, 0, this.width, this.height/3); this.path.add_path(el); this.tx_adjust = true;"
+.br
+
+.br
+In this example, the texture mapping will be adjusted to the desired size.
+.br
+
+.br
+The global variables and functions are available (c.f. gpac -h avmix:global):
+.br
+ * get_media_time(): return media time in seconds (float) of output
+.br
+ * get_media_time(SRC): get time of source with id SRC, return -4 if not found, -3 if not playing, -2 if in prefetch, -1 if timing not yet known, media time in seconds (float) otherwise
+.br
+ * current_utc_clock: current UTC time in ms
+.br
+ * video_time: output video time
+.br
+ * video_timescale: output video timescale
+.br
+ * video_width: output video width
+.br
+ * video_height: output video height
+.br
+
+.br
+If your path needs to be reevaluated on regular basis, set the value this.reload to the timeout to next reload, in milliseconds.
+.br
+
+.br
+Options:
+.br
+* rx (0): horizontal radius for rounded rect in percent of object width if positive, in absolute value if negative, value y means use ry
+.br
+* ry (0): vertical radius for rounded rect in percent of object height if positive, in absolute value if negative, value x means use rx
+.br
+* tl (1): top-left corner scaler (positive, 0 disables corner)
+.br
+* bl (1): bottom-left corner scaler (positive, 0 disables corner)
+.br
+* tr (1): top-right corner scaler (positive, 0 disables corner)
+.br
+* br (1): bottom-right corner scaler (positive, 0 disables corner)
+.br
+* rs (false): repeat texture horizontally
+.br
+* rt (false): repeat texture vertically
+.br
+* keep_ar (true): keep aspect ratio
+.br
+* pad_color ('none'): color to use for texture padding if rs or rt are false. Use none to use texture edge, 0x00FFFFFF for transparent (always enforced if source is transparent)
+.br
+* txmx ([]): texture matrix - all 6 coefficients must be set, i.e. [xx xy tx yx yy ty]
+.br
+* cmx ([]): color transform - all 20 coefficients must be set in order, i.e. [Mrr, Mrg, Mrb, Mra, Tr, Mgr, Mgg ...]
+.br
+* line_width (0): line width in percent of width if positive, or absolute value if negative
+.br
+* line_color ('white'): line color, linear for linear gradient and radial for radial gradient
+.br
+* line_pos ('center'): line/shape positioning. Possible values are:
+.br
+ * center: line is centered around shape
+.br
+ * outside: line is outside the shape
+.br
+ * inside: line is inside the shape
+.br
+* line_dash ('plain'): line dashing mode. Possible values are:
+.br
+ * plain: no dash
+.br
+ * dash: predefined dash pattern is used
+.br
+ * dot: predefined dot pattern is used
+.br
+ * dashdot: predefined dash-dot pattern is used
+.br
+ * dashdashdot: predefined dash-dash-dot pattern is used
+.br
+ * dashdotdot: predefined dash-dot-dot pattern is used
+.br
+* dashes ([]): dash/dot pattern lengths for custom dashes (these will be multiplied by line size)
+.br
+* cap ('flat'): line end style. Possible values are:
+.br
+ * flat: flat end
+.br
+ * round: round end
+.br
+ * square: square end (extends limit compared to flat)
+.br
+ * triangle: triangle end
+.br
+* join ('miter'): line joint style. Possible values are:
+.br
+ * miter: miter join (straight lines)
+.br
+ * round: round join
+.br
+ * bevel: bevel join
+.br
+ * bevelmiter: bevel+miter join
+.br
+* miter_limit (2): miter limit for joint styles
+.br
+* dash_length (-1): length of path to outline, negative values mean full path
+.br
+* dash_offset (0): offset in path at which the outline starts
+.br
+* blit (true): use blit if possible, otherwise EVG texturing. If disabled, always use texturing
+.br
+* fill ('none'): fill color if used without sources, linear for linear gradient and radial for radial gradient
+.br
+* img (''): image for scene without sources or when replace is set. Accepts either a path to a local image (JPG or PNG), the ID of an offscreen group or the ID of a sequence
+.br
+* alpha (1): global texture transparency
+.br
+* replace (''): if img or fill is set and shape is using source, set multi texture option. Possible modes are:
+.br
+ * a, r, g or b: replace alpha source component by indicated component from img . If prefix - is set, replace by one minus the indicated component
+.br
+ * m: mix using mix_ratio the color components of source and img and set alpha to full opacity
+.br
+ * M: mix using mix_ratio all components of source and img, including alpha
+.br
+ * xC: mix source 1 and source 2 using img component C (a, r, g or b) and force alpha to full opacity
+.br
+ * XC: mix source 1 and source 2 using img component C (a, r, g or b), including alpha
+.br
+
+.br
+* shape ('rect'): shape type. Possible values are:
+.br
+ * rect: rounded rectangle
+.br
+ * square: square using smaller width/height value
+.br
+ * ellipse: ellipse
+.br
+ * circle: circle using smaller width/height value
+.br
+ * rhombus: axis-aligned rhombus
+.br
+ * text: force text mode even if text field is empty
+.br
+ * rects: same as rounded rectangle but use straight lines for corners
+.br
+ * other value: JS code for custom path creation, either string or local file name (dynamic reload possible)
+.br
+* grad_p ([]): gradient positions between 0 and 1
+.br
+* grad_c ([]): gradient colors for each position, as strings
+.br
+* grad_start ([]): start point for linear gradient or center point for radial gradient
+.br
+* grad_end ([]): end point for linear gradient or radius value for radial gradient
+.br
+* grad_focal ([]): focal point for radial gradient
+.br
+* grad_mode ('pad'): gradient mode. Possible values are:
+.br
+ * pad: color padding outside of gradient bounds
+.br
+ * spread: mirror gradient outside of bounds
+.br
+ * repeat: repeat gradient outside of bounds
+.br
+* text ([]): text lines (UTF-8 only). If not empty, force shape=text
+.br
+* font ([]): font name(s)
+.br
+* size (20): font size in percent of height (horizontal text) or width (vertical text), or absolute value if negative
+.br
+* baseline ('alphabetic'): baseline position. Possible values are:
+.br
+ * alphabetic: alphabetic position of baseline
+.br
+ * top: baseline at top of EM Box
+.br
+ * hanging: reserved, not implemented
+.br
+ * middle: baseline at middle of EM Box
+.br
+ * ideograph: reserved, not implemented
+.br
+ * bottom: baseline at bottom of EM Box
+.br
+* align ('center'): horizontal text alignment. Possible values are:
+.br
+ * center: center of shape
+.br
+ * start: start of shape (left or right depending on text direction)
+.br
+ * end: end of shape (right or left depending on text direction)
+.br
+ * left: left of shape
+.br
+ * right: right of shape
+.br
+* spacing (0): line spacing in percent of height (horizontal text) or width (vertical text), or absolute value if negative
+.br
+* bold (false): use bold version of font
+.br
+* italic (false): use italic version of font
+.br
+* underline (false): underline text
+.br
+* vertical (false): draw text vertically
+.br
+* flip (false): flip text vertically
+.br
+* extend (0): maximum text width in percent of width (for horizontal) or height (for vertical), or absolute value if negative
+.br
+* keep_ar_rep (true): same as keep_ar for local image in replace mode
+.br
+* txmx_rep ([]): same as txmx for local image in replace mode
+.br
+* cmx_rep ([]): same as cmx for local image in replace mode
+.br
+* pad_color_rep ('none'): same as pad_color for local image in replace mode
+.br
+* rs_rep (false): same as rs for local image in replace mode
+.br
+* rt_rep (false): same as rt for local image in replace mode
+.br
+.SH Transition modules
+.LP
+.br
+.SS Transition gltrans - GPU only
+.br
+This transition module wraps gl-transitions, see https://gl-transitions.com/ and gpac -h avmix:gltrans for builtin transitions
+.br
+Options:
+.br
+* fx (''): effect name for built-in effects, or path to gl-transition GLSL file
+.br
+.SS Transition swipe - software/GPU
+.br
+This transition performs simple 2D affine transformations for source videos transitions, with configurable effect origin
+.br
+Options:
+.br
+* from ('left'): direction of video 2 entry. Possible values are:
+.br
+ * left: from left to right edges
+.br
+ * right: from right to left edges
+.br
+ * top: from top to bottom edges
+.br
+ * bottom: from bottom to top edges
+.br
+ * topleft: from top-left to bottom-right corners
+.br
+ * topright: from top-right to bottom-left corners
+.br
+ * bottomleft: from bottom-left to top-right corners
+.br
+ * bottomright: from bottom-right to top-left corners
+.br
+
+.br
+* mode ('slide'): how video 2 entry impacts video 1. Possible values are:
+.br
+ * slide: video 1 position is not modified
+.br
+ * push: video 2 pushes video 1 away
+.br
+ * squeeze: video 2 squeezes video 1 along opposite edge
+.br
+ * grow: video 2 size increases, video 1 not modified
+.br
+ * swap: video 2 size increases, video 1 size decreases
+.br
+
+.br
+.SS Transition mix - software/GPU
+.br
+This transition performs cross-fade of source videos
+.br
+.SS Transition fade - software/GPU
+.br
+This transition performs fade to/from color of source videos
+.br
+Options:
+.br
+* color ('black'): fade color
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+pl (str, default: avmix.json): local playlist file to load
+.br
+live (bool, default: true): live mode
+.br
+gpu (enum, default: off): enable GPU usage
+.br
+ * off: no GPU
+.br
+ * mix: only render textured path to GPU, use software rasterizer for the outlines, solid fills and gradients
+.br
+ * all: try to use GPU for everything
+.br
+
+.br
+thread (sint, default: -1): use threads for software rasterizer (-1 for all available cores)
+.br
+lwait (uint, default: 1000): timeout in ms before considering no signal is present
+.br
+ltimeout (uint, default: 4000): timeout in ms before restarting child processes
+.br
+maxdur (dbl, default: 0): run for given seconds and exit, will not abort if 0 (used for live mode tests)
+.br
+updates (str): local JSON files for playlist updates
+.br
+maxdepth (uint, default: 100): maximum depth of a branch in the scene graph
+.br
+vsize (v2d, default: 1920x1080): output video size
+.br
+fps (frac, default: 25): output video frame rate
+.br
+pfmt (pfmt, default: yuv): output pixel format. Use rgba in GPU mode to force alpha channel
+.br
+dynpfmt (enum, default: init): allow dynamic change of output pixel format in software mode
+.br
+ * off: pixel format is forced to desired value
+.br
+ * init: pixel format is forced to format of fullscreen input in first generated frame
+.br
+ * all: pixel format changes each time a full-screen input PID at same resolution is used
+.br
+
+.br
+sr (uint, default: 44100): output audio sample rate
+.br
+ch (uint, default: 2): number of output audio channels
+.br
+afmt (afmt, default: s16): output audio format (only s16, s32, flt and dbl are supported)
+.br
+alen (uint, default: 1024): default number of samples per frame
+.br
+
+.br
+.SH avgen
+.LP
+.br
+Description: AV Counter Generator
+.br
+Version: 1.0
+.br
+Author: GPAC Team
+.br
+
+.br
+This filter generates AV streams representing a counter. Streams can be enabled or disabled using .I type.
+.br
+The filter is software-based and does not use GPU.
+.br
+
+.br
+When .I adjust is set, the first video frame is adjusted such that a full circle happens at each exact second according to the system UTC clock.
+.br
+By default, video UTC and date are computed at each frame generation from current clock and not from frame number.
+.br
+This will result in broken timing when playing at speeds other than 1.0.
+.br
+This can be changed using .I lock.
+.br
+
+.br
+Audio beep is generated every second, with octave (2xfreq) of even beep used every 10 seconds.
+.br
+When video is generated, beep is synchronized to video at each exact second.
+.br
+
+.br
+If NTP injection is used, each video packet (but not audio ones) has a SenderNTP property set; if video is not used, each audio packet has a SenderNTP property set.
+.br
+
+.br
+.SH Multiple output stream generation
+.LP
+.br
+More than one output size can be specified. This will result in multiple sources being generated, one per size.
+.br
+A size can be specified more than once, resulting in packet references when .I copy is not set, or full copies otherwise.
+.br
+Target encoding bitrates can be assigned to each output using .I rates. This can be useful when generating dash:
+.br
+Example
+.br
+gpac avgen:sizes=1280x720,1920x1080:rates=2M,5M c=aac:FID=1 c=264:FID=2:clone -o live.mpd:SID=1,2
+.br
+
+.br
+
+.br
+.SH Multiview generation
+.LP
+.br
+In multiview mode, only the animated counter will move in depth backward and forward, as indicated by the .I disparity value.
+.br
+When .I pack is set, a packed stereo couple is generated for each video packet.
+.br
+Otherwise, when .I views is greater than 2, each view is generated on a dedicated output PID with the property ViewIdx set in [1, views].
+.br
+Multi-view output forces usage of .I copy mode.
+.br
+
+.br
+.SH PID Naming
+.LP
+.br
+The audio PID is assigned the name audio and ID 1.
+.br
+If a single video PID is produced, it is assigned the name video and ID 2.
+.br
+If multiple video PIDs are produced, they are assigned the names videoN and ID N+1, N in [1, sizes].
+.br
+If multiple .I views are generated, they are assigned the names videoN_vK and ID N*views+K-1, N in [1, sizes], K in [1, views].
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+type (enum, default: av): output selection
+.br
+* a: audio only
+.br
+* v: video only
+.br
+* av: audio and video
+.br
+
+.br
+freq (uint, default: 440): frequency of beep
+.br
+freq2 (uint, default: 659): frequency of odd beep
+.br
+sr (uint, default: 44100): output samplerate
+.br
+flen (uint, default: 1024): output frame length in samples
+.br
+ch (uint, default: 1): number of channels
+.br
+alter (bool, default: false): beep alternatively on each channel
+.br
+blen (uint, default: 50): length of beep in milliseconds
+.br
+fps (frac, default: 25): video frame rate
+.br
+sizes (v2il, default: 1280x720): video size in pixels
+.br
+pfmt (pfmt, default: yuv): output pixel format
+.br
+lock (bool, default: false): lock timing to video generation
+.br
+dyn (bool, default: true): move bottom banner
+.br
+ntp (bool, default: true): send NTP along with packets
+.br
+copy (bool, default: false): copy the framebuffer into each video packet instead of using packet references
+.br
+dur (frac, default: 0/0): run for the given time in second
+.br
+adjust (bool, default: true): adjust start time to synchronize counter and UTC
+.br
+pack (enum, default: no): packing mode for stereo views
+.br
+ * no: no packing
+.br
+ * ss: side by side packing, forces .I views to 2
+.br
+ * tb: top-bottom packing, forces .I views to 2
+.br
+
+.br
+disparity (uint, default: 20): disparity in pixels between left-most and right-most views
+.br
+views (uint, default: 1): number of views
+.br
+rates (strl): number of target bitrates to assign, one per size
+.br
+
+.br
 .SH EXAMPLES
 .TP
 Basic and advanced examples are available at https://wiki.gpac.io/Filters
@@ -5995,11 +10055,11 @@
 .LP
 Authors: GPAC developers, see git repo history (-log)
 .br
-For bug reports, feature requests, more information and source code, visit http://github.com/gpac/gpac
+For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
 .br
-build: 1.0.1-rev0-g7c36b3027-master
+build: 1.1.0-DEV-rev1777-gb91a8dad3-master
 .br
-Copyright: (c) 2000-2020 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+Copyright: (c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
 .br
 .SH SEE ALSO
 .LP

gpac-1.0.1.tar.gz/share/doc/man/gpac.1 -> gpac-2.0.0.tar.gz/share/doc/man/gpac.1 Changed

@@ -13,17 +13,15 @@
 .br
 
 .br
-FILTER: a single filter declaration (eg, -i file, -o dump, inspect, ...), see gpac -h doc.
+FILTER: a single filter declaration (e.g., -i file, -o dump, inspect, ...), see gpac -h doc.
 .br
-[LINK]: a link instruction (eg, @, @2, @2#StreamType=Visual, ...), see gpac -h doc.
+[LINK]: a link instruction (e.g., @, @2, @2#StreamType=Visual, ...), see gpac -h doc.
 .br
 [options]: one or more option strings, each starting with a - character.
 .br
   - an option using a single - indicates an option of gpac (see gpac -hx) or of libgpac (see gpac -hx core)
 .br
-  - an option using -- indicates a global filter option, for example --block_size=1000 (see gpac -h doc)
-.br
-  - an option using -+ indicates a global meta-filter filter (eg FFMPEG) option, for example -+profile=Baseline (see gpac -h doc)
+  - an option using -- indicates a global filter or meta-filter (e.g. FFMPEG) option, e.g. --block_size=1000 or --profile=Baseline (see gpac -h doc)
 .br
   
 .br
@@ -35,6 +33,10 @@
 .br
 
 .br
+The session can be interrupted at any time using ctrl+c, which can also be used to toggle global reporting.
+.br
+
+.br
 The possible options for gpac are:
 .br
 
@@ -70,6 +72,16 @@
 run for the given amount of milliseconds and exit with no cleanup
 .br
 .TP
+.B \-runfors (int)
+.br
+run for the given amount of milliseconds and exit with segfault (tests)
+.br
+.TP
+.B \-runforl (int)
+.br
+run for the given amount of milliseconds and wait forever at end (tests)
+.br
+.TP
 .B \-stats
 .br
 print stats after execution
@@ -91,7 +103,7 @@
 .br
 * r: runtime reporting
 .br
-* r=FA[,FB]: runtime reporting but only print given filters, eg r=mp4mxfor ISOBMFF muxer only
+* r=FA[,FB]: runtime reporting but only print given filters, e.g. r=mp4mx for ISOBMFF multiplexer only
 .br
 * r=: only print final report
 .br
@@ -133,6 +145,16 @@
 specify an output file to wrap as GF_FileIO object (testing of GF_FileIO)
 .br
 .TP
+.B \-cl
+.br
+force complete mode when no link directive are set - see filters help (-h doc)
+.br
+.TP
+.B \-step
+.br
+test step mode in non-blocking session
+.br
+.TP
 .B \-h,-help,-ha,-hx,-hh (string)
 .br
 print help. Use -help or -h for basic options, -ha for advanced options, -hx for expert options and -hh for all.  
@@ -163,15 +185,19 @@
 .br
 * props: print the supported builtin PID and packet properties
 .br
+* props PNAME: print the supported builtin PID and packet properties mentioning PNAME
+.br
 * colors: print the builtin color names and their values
 .br
-* links: print possible connections between each supported filters
+* layouts: print the builtin CICP audio channel layout names and their values
+.br
+* links: print possible connections between each supported filters (use -hx to view src->dst cap bundle detail)
 .br
 * links FNAME: print sources and sinks for filter FNAME (either builtin or JS filter)
 .br
 * FNAME: print filter FNAME info (multiple FNAME can be given)
 .br
-  - For meta-filters, use FNAME:INST, eg ffavin:avfoundation
+  - For meta-filters, use FNAME:INST, e.g. ffavin:avfoundation
 .br
   - Use * to print info on all filters (big output!), *:* to print info on all filters including meta filter instances (really big output!)
 .br
@@ -231,7 +257,7 @@
 .TP
 .B \-xopt
 .br
-do not throw error on any unrecognized options following this option - used to pass arguments to GUI
+unrecognized options and filters declaration following this option are ignored - used to pass arguments to GUI
 .br
 
 .br
@@ -249,7 +275,7 @@
 .TP
 .B \-full-link
 .br
-throw error if any pid in the filter graph cannot be linked
+throw error if any PID in the filter graph cannot be linked
 .br
 .TP
 .B \-no-block (Enum, default: no)
@@ -258,7 +284,7 @@
 .br
 * no: enable blocking mode
 .br
-* fanout: disable blocking on fanout, unblocking the PID as soon as one of its destinations requires a packet
+* fanout: disable blocking on fan-out, unblocking the PID as soon as one of its destinations requires a packet
 .br
 * all: disable blocking
 .br
@@ -270,7 +296,7 @@
 .TP
 .B \-no-reassign
 .br
-disable source filter reassignment in pid graph resolution
+disable source filter reassignment in PID graph resolution
 .br
 .TP
 .B \-sched (Enum, default: free)
@@ -290,7 +316,7 @@
 .TP
 .B \-max-chain (int, default: 6)
 .br
-set maximum chain length when resolving filter links. Default value covers for [ in -> ] demux -> reframe -> decode -> encode -> reframe -> mux [ -> out]. Filter chains loaded for adaptation (eg pixel format change) are loaded after the link resolution. Setting the value to 0 disables dynamic link resolution. You will have to specify the entire chain manually
+set maximum chain length when resolving filter links. Default value covers for [ in -> ] dmx -> reframe -> decode -> encode -> reframe -> mx [ -> out]. Filter chains loaded for adaptation (e.g. pixel format change) are loaded after the link resolution. Setting the value to 0 disables dynamic link resolution. You will have to specify the entire chain manually
 .br
 .TP
 .B \-max-sleep (int, default: 50)
@@ -315,7 +341,7 @@
 .TP
 .B \-blacklist (string)
 .br
-blacklist the filters listed in the given string (comma-separated list)
+blacklist the filters listed in the given string (comma-separated list). If first character is '-', this is a whitelist, i.e. only filters listed in the given string will be allowed
 .br
 .TP
 .B \-no-graph-cache
@@ -375,10 +401,12 @@
 .br
 * forward index: a strictly positive integer, 1 being the first argument after the alias
 .br
-* backward index: the value 'n' (or 'N') to indicate the last argument on the command line. This can be followed by -x to rewind arguments (eg @{n-1} is the before last argument)
+* backward index: the value 'n' (or 'N') to indicate the last argument on the command line. This can be followed by -x to rewind arguments (e.g. @{n-1} is the before last argument)
 .br
 
 .br
+Before solving aliases, all option arguments are moved at the beginging of the command line. This implies that alias arguments cannot be options.
+.br
 Arguments not used by any aliases are kept on the command line, other ones are removed
 .br
 
@@ -413,7 +441,7 @@
 .br
 
 .br
-The command gpac plist f1 f2 f3 expands to gpac aout vout plist:srcs="f1,f2,f3"  
+The command gpac plist f1 f2 f3 expands to gpac aout vout flist:srcs="f1,f2,f3"  
 .br
 
 .br
@@ -464,7 +492,7 @@
 .SH Filter options in configuration
 .LP
 .br
-It is possible to alter the default value of a filter option by modifing the configuration file. Filter foo options are stored in section [filter@foo], using option name and value as key-value pair. Options specified through the configuration file do not take precedence over options specified at prompt or through alias.
+It is possible to alter the default value of a filter option by modifying the configuration file. Filter foo options are stored in section [filter@foo], using option name and value as key-value pair. Options specified through the configuration file do not take precedence over options specified at prompt or through alias.
 .br
 Example
 .br
@@ -501,11 +529,11 @@
 .br
 Warning: This syntax only applies to regular filter options. It cannot be used with builtin shortcuts (gfreg, enc, ...).
 .br
-Meta-filter options can be set in the same way using the syntax -+OPT_NAME=VAL.
+Meta-filter options can be set in the same way using the syntax --OPT_NAME=VAL.
 .br
 Example
 .br
--+profile=Baseline -i file.cmp -o dump.264
+--profile=Baseline -i file.cmp -o dump.264
 .br
 
 .br
@@ -513,7 +541,7 @@
 .br
   
 .br
-For both syntax, it is possible to specify the filter registry name of the option, using --FNAME@OPTNAME=VAL.
+For both syntax, it is possible to specify the filter registry name of the option, using --FNAME:OPTNAME=VAL or --FNAME@OPTNAME=VAL.
 .br
 In this case the option will only be set for filters which are instances of registry FNAME. This is used when several registries use same option names.
 .br
@@ -539,6 +567,11 @@
 disable all messages, including errors
 .br
 .TP
+.B \-proglf
+.br
+use new line at each progress messages
+.br
+.TP
 .B \-strict-error,-se
 .br
 exit after the first error is reported
@@ -551,7 +584,7 @@
 .TP
 .B \-mod-dirs (string list)
 .br
-set module directories
+set additional module directories as a semi-colon ; separated list
 .br
 .TP
 .B \-js-dirs (string list)
@@ -566,7 +599,7 @@
 .TP
 .B \-ifce (string)
 .br
-set default multicast interface through interface IP address
+set default multicast interface through interface IP address (default is 127.0.0.1)
 .br
 .TP
 .B \-lang (string)
@@ -576,13 +609,19 @@
 .TP
 .B \-cfg,-opt (string)
 .br
-set configuration file value. The string parameter can be formatted as:
+get or set configuration file value. The string parameter can be formatted as:
 .br
 * `section:key=val`: set the key to a new value
 .br
 * `section:key=null`, `section:key`: remove the key
 .br
-* `section:*=null`: remove the section
+* `section=null`: remove the section
+.br
+* no argument: print the entire configuration file
+.br
+* `section`: print the given section
+.br
+* `section:key`: print the given key in section (section can be set to *)- *:key: print the given key in all sections
 .br
 .TP
 .B \-no-save
@@ -597,7 +636,7 @@
 .TP
 .B \-for-test
 .br
-disable all creation/modif dates and GPAC versions in files
+disable all creation/modification dates and GPAC versions in files
 .br
 .TP
 .B \-old-arch
@@ -615,6 +654,16 @@
 cache size for bitstream read and write from file (0 disable cache, slower IOs)
 .br
 .TP
+.B \-no-check
+.br
+disable compliance tests for inputs (ISOBMFF for now). This will likely result in random crashes
+.br
+.TP
+.B \-unhandled-rejection
+.br
+dump unhandled promise rejections
+.br
+.TP
 .B \-cache (string)
 .br
 cache directory location
@@ -647,7 +696,7 @@
 .TP
 .B \-offline-cache
 .br
-enable offline HTTP caching (no revalidation of existing resource in cache)
+enable offline HTTP caching (no re-validation of existing resource in cache)
 .br
 .TP
 .B \-clean-cache
@@ -670,6 +719,11 @@
 set HTTP/RTSP request timeout in milliseconds
 .br
 .TP
+.B \-no-timeout
+.br
+ignore HTTP 1.1 timeout in keep-alive
+.br
+.TP
 .B \-broken-cert
 .br
 enable accepting broken SSL certificates
@@ -700,6 +754,26 @@
 force using threads for async download requests rather than session scheduler
 .br
 .TP
+.B \-cte-rate-wnd (int, default: 20)
+.br
+set window analysis length in milliseconds for chunk-transfer encoding rate estimation
+.br
+.TP
+.B \-no-h2
+.br
+disable HTTP2
+.br
+.TP
+.B \-no-h2c
+.br
+disable HTTP2 upgrade (i.e. over non-TLS)
+.br
+.TP
+.B \-h2-copy
+.br
+enable intermediate copy of data in nghttp2 (default is disabled but may report as broken frames in wireshark)
+.br
+.TP
 .B \-dbg-edges
 .br
 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)
@@ -707,7 +781,7 @@
 .TP
 .B \-full-link
 .br
-throw error if any pid in the filter graph cannot be linked
+throw error if any PID in the filter graph cannot be linked
 .br
 .TP
 .B \-no-block (Enum, default: no)
@@ -716,7 +790,7 @@
 .br
 * no: enable blocking mode
 .br
-* fanout: disable blocking on fanout, unblocking the PID as soon as one of its destinations requires a packet
+* fanout: disable blocking on fan-out, unblocking the PID as soon as one of its destinations requires a packet
 .br
 * all: disable blocking
 .br
@@ -728,7 +802,7 @@
 .TP
 .B \-no-reassign
 .br
-disable source filter reassignment in pid graph resolution
+disable source filter reassignment in PID graph resolution
 .br
 .TP
 .B \-sched (Enum, default: free)
@@ -748,7 +822,7 @@
 .TP
 .B \-max-chain (int, default: 6)
 .br
-set maximum chain length when resolving filter links. Default value covers for [ in -> ] demux -> reframe -> decode -> encode -> reframe -> mux [ -> out]. Filter chains loaded for adaptation (eg pixel format change) are loaded after the link resolution. Setting the value to 0 disables dynamic link resolution. You will have to specify the entire chain manually
+set maximum chain length when resolving filter links. Default value covers for [ in -> ] dmx -> reframe -> decode -> encode -> reframe -> mx [ -> out]. Filter chains loaded for adaptation (e.g. pixel format change) are loaded after the link resolution. Setting the value to 0 disables dynamic link resolution. You will have to specify the entire chain manually
 .br
 .TP
 .B \-max-sleep (int, default: 50)
@@ -773,7 +847,7 @@
 .TP
 .B \-blacklist (string)
 .br
-blacklist the filters listed in the given string (comma-separated list)
+blacklist the filters listed in the given string (comma-separated list). If first character is '-', this is a whitelist, i.e. only filters listed in the given string will be allowed
 .br
 .TP
 .B \-no-graph-cache
@@ -804,7 +878,7 @@
 .TP
 .B \-pref-yuv4cc (string)
 .br
-set prefered YUV 4CC for overlays (used by DirectX only)
+set preferred YUV 4CC for overlays (used by DirectX only)
 .br
 .TP
 .B \-offscreen-yuv
@@ -819,17 +893,17 @@
 .TP
 .B \-gl-bits-comp (int, default: 8)
 .br
-number of bits per color component in openGL
+number of bits per color component in OpenGL
 .br
 .TP
 .B \-gl-bits-depth (int, default: 16)
 .br
-number of bits for depth buffer in openGL
+number of bits for depth buffer in OpenGL
 .br
 .TP
 .B \-gl-doublebuf
 .br
-enable openGL double buffering
+enable OpenGL double buffering
 .br
 .TP
 .B \-sdl-defer
@@ -849,7 +923,7 @@
 .TP
 .B \-video-output (string)
 .br
-indicate the name of the video output module to use (see gpac -h modules). The reserved name glfbo is used in player mode to draw in the openGL texture identified by .I glfbo-txid.  In this mode, the application is responsible for sending event to the terminal
+indicate the name of the video output module to use (see gpac -h modules). The reserved name glfbo is used in player mode to draw in the OpenGL texture identified by .I glfbo-txid.  In this mode, the application is responsible for sending event to the terminal
 .br
 .TP
 .B \-audio-output (string)
@@ -892,6 +966,11 @@
 wait for SVG fonts to be loaded before displaying frames
 .br
 .TP
+.B \-webvtt-hours
+.br
+force writing hour when serializing WebVTT
+.br
+.TP
 .B \-rmt
 .br
 enable profiling through Remotery. A copy of Remotery visualizer is in gpac/share/vis, usually installed in /usr/share/gpac/vis or Program Files/GPAC/vis
@@ -936,6 +1015,21 @@
 .br
 make remotery sample opengl calls
 .br
+.TP
+.B \-m2ts-vvc-old
+.br
+hack for old TS streams using 0x32 for VVC instead of 0x33
+.br
+.TP
+.B \-piff-force-subsamples
+.br
+hack for PIFF PSEC files generated by 0.9.0 and 1.0 MP4Box with wrong subsample_count inserted for audio
+.br
+.TP
+.B \-vvdec-annexb
+.br
+hack for old vvdec+libavcodec supporting only annexB format
+.br
 .SH libgpac logs options:
 .LP
 .br
@@ -957,12 +1051,12 @@
 .TP
 .B \-log-clock,-lc
 .br
-log time in micro sec since start time of GPAC before each log line
+log time in micro sec since start time of GPAC before each log line except for app tool
 .br
 .TP
 .B \-log-utc,-lu
 .br
-log UTC time in ms before each log line
+log UTC time in ms before each log line except for app tool
 .br
 .TP
 .B \-logs (string)
@@ -973,7 +1067,7 @@
 .br
 You can independently log different tools involved in a session.  
 .br
-log_args is formatted as a ':'-separated list of toolX[:toolZ]@levelX  
+log_args is formatted as a colon (':') separated list of toolX[:toolZ]@levelX  
 .br
 levelX can be one of:
 .br
@@ -987,61 +1081,61 @@
 .br
 * debug: logs all messages
 .br
+
+.br
 toolX can be one of:
 .br
 * core: libgpac core
 .br
-* coding: bitstream formats (audio, video, scene)
-.br
-* container: container formats (ISO File, MPEG-2 TS, AVI, ...)
+* mutex: log all mutex calls
 .br
-* network: network data except RTP trafic
+* mem: GPAC memory tracker
 .br
-* http: HTTP trafic
+* module: GPAC modules (av out, font engine, 2D rasterizer)
 .br
-* rtp: RTP trafic
+* filter: filter session debugging
 .br
-* author: authoring tools (hint, import, export)
+* sched: filter session scheduler debugging
 .br
-* sync: terminal sync layer
+* codec: codec messages (used by encoder and decoder filters)
 .br
-* codec: terminal codec messages
+* coding: bitstream formats (audio, video, scene)
 .br
-* parser: scene parsers (svg, xmt, bt) and other
+* container: container formats (ISO File, MPEG-2 TS, AVI, ...) and multiplexer/demultiplexer filters
 .br
-* media: terminal media object management
+* network: TCP/UDP sockets and TLS
 .br
-* scene: scene graph and scene manager
+* http: HTTP traffic
 .br
-* script: scripting engine messages
+* cache: HTTP cache subsystem
 .br
-* interact: interaction engine (events, scripts, etc)
+* rtp: RTP traffic
 .br
-* smil: SMIL timing engine
+* dash: HTTP streaming logs
 .br
-* compose: composition engine (2D, 3D, etc)
+* route: ROUTE (ATSC3) debugging
 .br
-* mmio: Audio/Video HW I/O management
+* media: messages from generic filters and reframer/rewriter filters
 .br
-* rti: various run-time stats
+* parser: textual parsers (svg, xmt, bt, ...)
 .br
-* cache: HTTP cache subsystem
+* mmio: I/O management (AV devices, file, pipes, OpenGL)
 .br
-* audio: Audio renderer and mixers
+* audio: audio renderer/mixer/output
 .br
-* mem: GPAC memory tracker
+* script: script engine except console log
 .br
-* dash: HTTP streaming logs
+* console: script console log
 .br
-* module: GPAC modules (av out, font engine, 2D rasterizer)
+* scene: scene graph and scene manager
 .br
-* filter: filters debugging
+* compose: composition engine (2D, 3D, etc)
 .br
-* sched: filter session scheduler debugging
+* ctime: media and SMIL timing info from composition engine
 .br
-* mutex: log all mutex calls
+* interact: interaction messages (UI events and triggered DOM events and VRML route)
 .br
-* atsc: ATSC3 debugging
+* rti: run-time stats of compositor
 .br
 * all: all tools logged - other tools can be specified afterwards.  
 .br
@@ -1049,67 +1143,72 @@
 .br
 The special keyword strict can be set to exit at first error.  
 .br
+
+.br
 Example
 .br
--logs all@info:dash@debug:ncl
+-logs=all@info:dash@debug:ncl
 .br
 
 .br
 This moves all log to info level, dash to debug level and disable color logs
 .br
+.TP
+.B \-proglf
+.br
+use new line at each progress messages
+.br
 .SH General
 .LP
 .br
-Filters are configurable processing units consuming and producing data packets. These packets are carried between filters through a data channel called pid. A PID is in charge of allocating/tracking data packets, and passing the packets to the destination filter(s). A filter output PID may be connected to zero or more filters. This fan-out is handled internally by GPAC (no such thing as a tee filter in GPAC).
+Filters are configurable processing units consuming and producing data packets. These packets are carried between filters through a data channel called PID. A PID is in charge of allocating/tracking data packets, and passing the packets to the destination filter(s). A filter output PID may be connected to zero or more filters. This fan-out is handled internally by GPAC (no such thing as a tee filter in GPAC).
 .br
 Note: When a PID cannot be connected to any filter, a warning is thrown and all packets dispatched on this PID will be destroyed. The session may however still run, unless .I -full-link is set.
 .br
   
 .br
-Each output PID carries a set of properties describing the data it delivers (eg width, height, codec, ...). Properties can be built-in (identified by a 4 character code abcd, see properties (-h props) ), or user-defined (identified by a string). Each PID tracks its properties changes and triggers filter reconfiguration during packet processing. This allows the filter chain to be reconfigured at run time, potentially reloading part of the chain (eg unload a video decoder when switching from compressed to uncompressed sources).
-.br
-  
-.br
-Each filter exposes one or more sets of capabilities, called capability bundle, which are property type and values that must be matched or excluded by connecting PIDs.
+Each output PID carries a set of properties describing the data it delivers (e.g. width, height, codec, ...). Properties can be built-in (see gpac -h props ), or user-defined. Each PID tracks its properties changes and triggers filter reconfiguration during packet processing. This allows the filter chain to be reconfigured at run time, potentially reloading part of the chain (e.g. unload a video decoder when switching from compressed to uncompressed sources).
 .br
   
 .br
-Each filter exposes a set of argument to configure itself, using property types and values described as strings formated with separators. This help is given with default separator sets :=#,@ to specify filters, properties and options. Use .I -seps to change them.
+Each filter exposes a set of argument to configure itself, using property types and values described as strings formatted with separators. This help is given with default separator sets :=#,@ to specify filters, properties and options. Use .I -seps to change them.
 .br
-.SH Property format
+.SH Property and filter option format
 .LP
 .br
-* boolean: formatted as yes|true|1 or no|false|0
+* boolean: formatted as yes,true,1 or no,false,0
 .br
 * enumeration (for filter arguments only): must use the syntax given in the argument description, otherwise value 0 (first in enum) is assumed.
 .br
-*  1-dimension (numbers, floats, ints...): formatted as value[unit], where unit can be k|K (x1000) or m|M (x1000000) or g|G (x1000000000). For such properties, value +I means maximum possible value, -I minimum possible value.
+* 1-dimension (numbers, floats, ints...): formatted as value[unit], where unit can be k,K (x 1000) or m,M (x 1000000) or g,G (x 1000000000) or sec (x 1000) or min (x 60000). +I means max float/int/uint value, -I min float/int/uint value.
 .br
 * fraction: formatted as num/den or num-den or num, in which case the denominator is 1 if num is an integer, or 1000000 if num is a floating-point value.
 .br
-* unsigned 32 bit integer: formated as number or hexadecimal using the format 0xAABBCCDD.
+* unsigned 32 bit integer: formatted as number or hexadecimal using the format 0xAABBCCDD.
 .br
 * N-dimension (vectors): formatted as DIM1xDIM2[xDIM3[xDIM4]] values, without unit multiplier.
 .br
 * string: formatted as:
 .br
- * `value`: copies value to string.
+  * `value`: copies value to string.
 .br
- * `file@FILE`: load string from local FILE (opened in binary mode).
+  * `file@FILE`: load string from local FILE (opened in binary mode).
 .br
- * `bxml@FILE`: binarize XML from local FILE and set property type to data - see https://wiki.gpac.io/NHML-Format.
+  * `bxml@FILE`: binarize XML from local FILE and set property type to data - see https://wiki.gpac.io/NHML-Format.
 .br
 * data: formatted as:
 .br
- * `size@address`: constant data block, not internally copied; size gives the size of the block, address the data pointer.
+  * `size@address`: constant data block, not internally copied; size gives the size of the block, address the data pointer.
 .br
- * `0xBYTESTRING`: data block specified in hexadecimal, internally copied.
+  * `0xBYTESTRING`: data block specified in hexadecimal, internally copied.
 .br
- * `file@FILE`: load data from local FILE (opened in binary mode).
+  * `file@FILE`: load data from local FILE (opened in binary mode).
 .br
- * `bxml@FILE`: binarize XML from local FILE - see https://wiki.gpac.io/NHML-Format.
+  * `bxml@FILE`: binarize XML from local FILE - see https://wiki.gpac.io/NHML-Format.
 .br
-* pointer: are formatted as address giving the pointer address (32 or 64 bit depending on platforms).
+  * `b64@DATA`: load data from base-64 encoded DATA.
+.br
+* pointer: pointer address as formatted by %p in C.
 .br
 * string lists: formatted as val1,val2[,...]. Each value can also use file@FILE syntax.
 .br
@@ -1120,21 +1219,19 @@
 .SH Filter declaration [FILTER]
 .LP
 .br
-.P
-.B
-Generic declaration
+.SS Generic declaration
 .br
 Each filter is declared by its name, with optional filter arguments appended as a list of colon-separated name=value pairs. Additional syntax is provided for:
 .br
-* boolean: value can be omitted, defaulting to true (eg :noedit). Using ! before the name negates the result (eg :!moof_first)
+* boolean: value can be omitted, defaulting to true (e.g. :noedit). Using ! before the name negates the result (e.g. :!moof_first)
 .br
-* enumerations: name can be omitted (eg :disp=pbo is equivalent to :pbo), provided that filter developers pay attention to not reuse enumeration names in the same filter.
+* enumerations: name can be omitted, e.g. :disp=pbo is equivalent to :pbo.
 .br
 
 .br
   
 .br
-When string parameters are used (eg URLs), it is recommended to escape the string using the keyword gpac.  
+When string parameters are used (e.g. URLs), it is recommended to escape the string using the keyword gpac.  
 .br
 Example
 .br
@@ -1152,7 +1249,7 @@
 .br
 This will fail to extract it and keep :opt=VAL as part of the URL.
 .br
-The escape mechanism is not needed for local source, for which file existence is probed during argument parsing. It is also not needed for builtin procotol handlers (avin://, video://, audio://, pipe://)
+The escape mechanism is not needed for local source, for which file existence is probed during argument parsing. It is also not needed for builtin protocol handlers (avin://, video://, audio://, pipe://)
 .br
 For tcp:// and udp:// protocols, the escape is not needed if a trailing / is appended after the port number.
 .br
@@ -1172,11 +1269,11 @@
 .br
 This will extract the URL and options.
 .br
-Note: one trick to avoid the escape sequence is to declare the URLs option at the end, eg f1:opt1=foo:url=http://bar, provided you have only one URL parameter to specify on the filter.
+Note: one trick to avoid the escape sequence is to declare the URLs option at the end, e.g. f1:opt1=foo:url=http://bar, provided you have only one URL parameter to specify on the filter.
 .br
 
 .br
-It is possible to disable option parsing (for string options) by duplicating the seperator.
+It is possible to disable option parsing (for string options) by duplicating the separator.
 .br
 Example
 .br
@@ -1188,11 +1285,7 @@
 .br
   
 .br
-A filter may be assigned a name (for inspection purposes) using :N=name option. This name is not used in link resolution and may be changed at runtime by the filter instance.
-.br
-.P
-.B
-Source and Sink filters
+.SS Source and Sink filters
 .br
 Source and sink filters do not need to be addressed by the filter name, specifying src= or dst= instead is enough. You can also use the syntax -src URL or -i URL for sources and -dst URL or -o URL for destination, this allows prompt completion in shells.
 .br
@@ -1220,9 +1313,9 @@
 .br
 The src= and dst= syntaxes can also be used in alias for dynamic argument cloning (see gpac -hx alias).
 .br
-.P
-.B
-Forcing specific filters
+
+.br
+.SS Forcing specific filters
 .br
 There is a special option called gfreg which allows specifying preferred filters to use when handling URLs.
 .br
@@ -1236,13 +1329,11 @@
 .br
 This can be used to test a specific filter when alternate filter chains are possible.
 .br
-.P
-.B
-Specifying encoders and decoders
+.SS Specifying encoders and decoders
 .br
-By default filters chain will be resolved without any decoding/encoding if the destination accepts the desired format. Otherwise, decoders/encoders will be dynamically loaded to perform the conversion, unless dynamic resolution is disabled. There is a special shorcut filter name for encoders enc allowing to match a filter providing the desired encoding. The parameters for enc are:
+By default filters chain will be resolved without any decoding/encoding if the destination accepts the desired format. Otherwise, decoders/encoders will be dynamically loaded to perform the conversion, unless dynamic resolution is disabled. There is a special shortcut filter name for encoders enc allowing to match a filter providing the desired encoding. The parameters for enc are:
 .br
-* c=NAME: identifes the desired codec. NAME can be the gpac codec name or the encoder instance for ffmpeg/others
+* c=NAME: identifies the desired codec. NAME can be the GPAC codec name or the encoder instance for ffmpeg/others
 .br
 * b=UINT, rate=UINT, bitrate=UINT: indicates the bitrate in bits per second
 .br
@@ -1254,13 +1345,15 @@
 .br
 
 .br
-  
-.br
 Other options will be passed to the filter if it accepts generic argument parsing (as is the case for ffmpeg).
 .br
+The shortcut syntax c=TYPE (e.g. c=aac:opts) is also supported.
+.br
+
+.br
 Example
 .br
-src=dump.yuv:size=320x240:fps=25 enc:c=avc:b=150000:g=50:cgop=true:fast=true dst=raw.264
+gpac -i dump.yuv:size=320x240:fps=25 enc:c=avc:b=150000:g=50:cgop=true:fast=true -o raw.264
 .br
 
 .br
@@ -1272,7 +1365,7 @@
 .br
 Example
 .br
-src=file.mp4 reframer:raw @ -o null
+gpac -i file.mp4 reframer:raw=av -o null
 .br
 
 .br
@@ -1280,7 +1373,9 @@
 .br
 
 .br
-When a filter uses an option defined as a string using the same separator character as gpac, you can either modify the set of separators, or escape the seperator by duplicating it. The options enclosed by duplicated separator are not parsed. This is mostly used for meta filters, such as ffmpeg, to pass options to subfilters such as libx264 (cf x264opts parameter).
+.SS Escaping option separators
+.br
+When a filter uses an option defined as a string using the same separator character as gpac, you can either modify the set of separators, or escape the separator by duplicating it. The options enclosed by duplicated separator are not parsed. This is mostly used for meta filters, such as ffmpeg, to pass options to sub-filters such as libx264 (cf x264opts parameter).
 .br
 Example
 .br
@@ -1306,62 +1401,194 @@
 .br
 This will set option a to foo, b to bar:c and the option d to fun on the filter.
 .br
-.SH Expliciting links between filters [LINK]
+
+.br
+.SH Filter linking [LINK]
 .LP
 .br
-.P
-.B
-Quick links
+
+.br
+Each filter exposes one or more sets of capabilities, called capability bundle, which are property type and values that must be matched or excluded by connecting PIDs.
+.br
+To check the possible sources and destination for a filter FNAME, use gpac -h links FNAME
+.br
+
+.br
+The filter graph resolver uses this information together with the PID properties to link the different filters.
+.br
+
+.br
+Link directives, when provided, specify which source a filter can accept connections from.
+.br
+They do not specify which destination a filter can connect to.
+.br
+
+.br
+.SS Default filter linking
+.br
+When no link instructions are given (see below), the default linking strategy used is either implicit mode (default in gpac) or complete mode (if .I -cl is set).
+.br
+Each PID is checked for possible connection to all defined filters, in their declaration order.
+.br
+For each filter DST accepting a connection from the PID, directly or with intermediate filters:
+.br
+- if DST filter has link directives, use them to allow or reject PID connection.
+.br
+- otherwise, if complete mode is enabled, allow connection.
+.br
+- otherwise (implicit mode):
 .br
-Link between filters may be manually specified. The syntax is an @ character optionaly followed by an integer (0 if omitted). This indicates which filter previously specified at prompt should be link to the next filter listed. The optional integer is a 0-based index to the previous filter declarations, 0 indicating the previous filter declaration, 1 the one before the previous delaration, ...).
+ - if DST is not a sink and is the first matching filter with no link directive, allow connection.
 .br
-Only the last link directive occuring before a filter is used to setup links for that filter.
+ - otherwise, if DST is not a sink and is not the first matching filter with no link directive, reject connection.
+.br
+ - otherwise (DST is a sink) and no previous connections to a non-sink filter, allow connection.
+.br
+
 .br
 Example
 .br
-fA fB @1 fC
+gpac -i file.mp4 c=avc -o output
+.br
+
+.br
+With this setup in implicit mode:
+.br
+- if the file has a video PID, it will connect to enc but not to output. The output PID of enc will connect to output.
+.br
+- if the file has other PIDs than video, they will connect to output, since this enc filter accepts only video.
+.br
+
+.br
+Example
+.br
+gpac -cl -i file.mp4 c=avc -o output
+.br
+
+.br
+With this setup in complete mode:
+.br
+- if the file has a video PID, it will connect both to enc and to output, and the output PID of enc will connect to output.
+.br
+- if the file has other PIDs than video, they will connect to output.
+.br
+
+.br
+Furthermore in implicit mode, filter connections are restricted to filters defined between the last source and the sink(s).
+.br
+Example
+.br
+gpac -i video1 reframer:saps=1 -i video2 ffsws:osize=128x72 -o output
 .br
 
 .br
-This indicates to direct fA outputs to fC.
+This will connect:
+.br
+- video1 to reframer then reframer to output but will prevent reframer to ffsws connection.
+.br
+- video2 to ffsws then ffsws to output but will prevent video2 to reframer connection.
+.br
+
 .br
 Example
 .br
-fA fB @1 @0 fC
+gpac -i video1 -i video2 reframer:saps=1 ffsws:osize=128x72 -o output
+.br
+
+.br
+This will connect video1 AND video2 to reframer->ffsws->output
 .br
 
 .br
-This indicates to direct fB outputs to fC, @1 is ignored.
+The implicit mode allows specifying linear processing chains (no PID fan-out except for final output(s)) without link directives, simplifying command lines for common cases.
+.br
+Warning: Argument order really matters in implicit mode!
+.br
+
+.br
+Example
+.br
+gpac -i file.mp4 c=avc c=aac -o output
 .br
 
 .br
-If no link directives are given, the links will be dynamically solved to fullfill as many connections as possible (see below).
+If the file has a video PID, it will connect to c=avc but not to output. The output PID of c=avc will connect to output.
 .br
-Warning: This means that fA fB fC and fA fB @ fC will likely not give the same result.
+If the file has an audio PID, it will connect to c=aac but not to output. The output PID of c=aac will connect to output.
+.br
+If the file has other PIDs than audio or video, they will connect to output.
 .br
 
 .br
-.P
-.B
-Complex links
+Example
+.br
+gpac -i file.mp4 ffswf=osize:128x72 c=avc resample=osr=48k c=aac -o output
+.br
+
 .br
-The link directive is just a quick shortcut to set the following arguments:
+This will force:
 .br
-- FID=name, which assigns an identifier to the filter
+- SRC(video)->ffsws->enc(video)->output and prevent SRC(video)->output, SRC(video)->enc(video) and ffsws->output connections which would happen in complete mode.
 .br
-- SID=name1[,name2...], which set a list of filter identifiers , or sourceIDs, restricting the list of possible inputs for a filter.
+- SRC(audio)->resample->enc(audio)->output and prevent SRC(audio)->output, SRC(audio)->enc(audio) and resample->output connections which would happen in complete mode.
 .br
 
 .br
+.SS Quick links
+.br
+Link between filters may be manually specified. The syntax is an @ character optionally followed by an integer (0 if omitted).
+.br
+This indicates that the following filter specified at prompt should be linked only to a previous listed filter.
+.br
+The optional integer is a 0-based index to the previous filter declarations, 0 indicating the previous filter declaration, 1 the one before the previous declaration, ...).
+.br
+If @@ is used instead of @, the optional integer gives the filter index starting from the first filter (index 0) specified in command line.
+.br
+Several link directives can be given for a filter.
+.br
 Example
 .br
 fA fB @1 fC
 .br
 
 .br
-This is equivalent to fA:FID=1 fB fC:SID=1.
+This indicates that fC only accepts inputs from fA.
+.br
+Example
+.br
+fA fB fC @1 @0 fD
+.br
+
+.br
+This indicates that fD only accepts inputs from fB and fC.
+.br
+Example
+.br
+fA fB fC ... @@1 fZ
+.br
+
+.br
+This indicates that fZ only accepts inputs from fB.
+.br
+
+.br
+.SS Complex links
+.br
+The @ link directive is just a quick shortcut to set the following filter arguments:
+.br
+* FID=name: assigns an identifier to the filter
+.br
+* SID=name1[,name2...]: sets a list of filter identifiers, or sourceIDs, restricting the list of possible inputs for a filter.
+.br
+
+.br
+Example
 .br
-Link directives specify which source a filter can accept connections from. They do not specifiy which destination a filter can connect to.
+fA fB @1 fC
+.br
+
+.br
+This is equivalent to fA:FID=1 fB fC:SID=1.
 .br
 Example
 .br
@@ -1369,7 +1596,7 @@
 .br
 
 .br
-This indicates that fC only accpets input from fA, but fB might accept inputs from fA.
+This indicates that fC only accepts input from fA, but fB might accept inputs from fA.
 .br
 Example
 .br
@@ -1381,15 +1608,19 @@
 .br
 Note: A filter with sourceID set cannot get input from filters with no IDs.
 .br
+
+.br
 A sourceID name can be further extended using fragment identifier (# by default):
 .br
 * name#PIDNAME: accepts only PID(s) with name PIDNAME
 .br
 * name#TYPE: accepts only PIDs of matching media type. TYPE can be audio, video, scene, text, font, meta
 .br
-* name#TYPEN: accepts only Nth PID of matching type from source
+* name#TYPEN: accepts only N (1-based index) PID of matching type from source (e.g. video2 to only accept second video PID)
+.br
+* name#TAG=VAL: accepts the PID if its parent filter has no tag or a tag matching VAL
 .br
-* name#P4CC=VAL: accepts only PIDs with property matching VAL.
+* name#P4CC=VAL: accepts only PIDs with builtin property of type P4CC and value VAL.
 .br
 * name#PName=VAL: same as above, using the builtin name corresponding to the property.
 .br
@@ -1401,7 +1632,7 @@
 .br
 
 .br
-The following modifiers for comparisons are allowed (for both P4CC=, PName= and AnyName=):
+The following modifiers for comparisons are allowed (for any fragment format using =):
 .br
 * name#P4CC=!VAL: accepts only PIDs with property NOT matching VAL.
 .br
@@ -1417,10 +1648,6 @@
 .br
 fA fB:SID=*#ServiceID=2
 .br
-
-.br
-Example
-.br
 fA fB:SID=#ServiceID=2
 .br
 
@@ -1435,11 +1662,11 @@
 .br
 
 .br
-This indicates to direct fA video outputs to fC.
+This indicates that fC only accepts inputs from fA, and of type video.
 .br
 Example
 .br
-src=img.heif @#ItemID=200 vout
+gpac -i img.heif @#ItemID=200 vout
 .br
 
 .br
@@ -1447,7 +1674,7 @@
 .br
 Example
 .br
-src=vid.mp4 @#PID=1 vout
+gpac -i vid.mp4 @#PID=1 vout
 .br
 
 .br
@@ -1455,7 +1682,7 @@
 .br
 Example
 .br
-src=vid.mp4 @#Width=640 vout
+gpac -i vid.mp4 @#Width=640 vout
 .br
 
 .br
@@ -1463,7 +1690,7 @@
 .br
 Example
 .br
-src=vid.mp4 @#Width-640 vout
+gpac -i vid.mp4 @#Width-640 vout
 .br
 
 .br
@@ -1471,7 +1698,7 @@
 .br
 Example
 .br
-src=vid.mp4 @#ID=ItemID#ItemNumber=1 vout
+gpac -i vid.mp4 @#ID=ItemID#ItemNumber=1 vout
 .br
 
 .br
@@ -1483,7 +1710,7 @@
 .br
 Example
 .br
-src=vid.mp4 @#Width=640#Height+380 vout
+gpac -i vid.mp4 @#Width=640#Height+380 vout
 .br
 
 .br
@@ -1491,23 +1718,83 @@
 .br
 
 .br
-Warning: If a filter PID gets connected to a loaded filter, no further dynamic link resolution will be done to connect it to other filters, unless sourceIDs are set. Link directives should be carfully setup.
+Warning: If a PID directly connects to one or more explicitly loaded filters, no further dynamic link resolution will be done to connect it to other filters with no sourceID set. Link directives should be carefully setup.
+.br
+Example
+.br
+fA @ reframer fB
+.br
+
+.br
+If fB accepts inputs provided by fA but reframer does not, this will link fA PID to fB filter since fB has no sourceID.
+.br
+Since the PID is connected, the filter engine will not try to solve a link between fA and reframer.
+.br
+
+.br
+An exception is made for local files: by default, a local file destination will force a remultiplex of input PIDs from a local file.
+.br
+Example
+.br
+gpac -i file.mp4 -o dump.mp4
+.br
+
+.br
+This will prevent direct connection of PID of type file to dst file.mp4, remultiplexing the file.
+.br
+
+.br
+The special option nomux is used to allow direct connections (ignored for non-sink filters).
+.br
+Example
+.br
+gpac -i file.mp4 -o dump.mp4:nomux
+.br
+
+.br
+This will result in a direct file copy.
+.br
+
+.br
+This only applies to local files destination. For pipes, sockets or other file outputs (HTTP, ROUTE):
+.br
+- direct copy is enabled by default
+.br
+- nomux=0 can be used to force remultiplex
+.br
+
+.br
+.SS Sub-session tagging
+.br
+Filters may be assigned to a sub-session using :FS=N, with N a positive integer.
+.br
+Filters belonging to different sub-sessions may only link to each-other:
+.br
+- if explicitly allowed through sourceID directives (@ or SID)
+.br
+- or if they have the same sub-session identifier
+.br
+
+.br
+This is mostly used for implicit mode in gpac: each first source filter specified after a sink filter will trigger a new sub-session.
 .br
 Example
 .br
-src=file.mp4 @ reframer dst=dump.mp4
+gpac -i in1.mp4 -i in2.mp4 -o out1.mp4 -o out2.mp4
 .br
 
 .br
-This will link src file.mp4 PID (type file) to dst dump.mp4filter (type file) because dst has no sourceID and therefore will accept input from src. Since the PID is connected, the filter engine will not try to solve a link between src and reframer. The result is a direct copy of the source file, reframer being unused.
+This will result in both inputs multiplexed in both outputs.
 .br
 Example
 .br
-src=file.mp4 reframer @ dst=dump.mp4
+gpac -i in1.mp4 -o out1.mp4 -i in2.mp4 -o out2.mp4
 .br
 
 .br
-This will force dst to accept only from reframer, a muxer will be loaded to solve this link, and src PID will be linked to reframer (no source ID), loading a demuxer to solve the link. The result is a complete remux of the source file.
+This will result in in1 mixed to out1 and in2 mixed to out2, these last two filters belonging to a different sub-session.
+.br
+
 .br
 .SH Arguments inheriting
 .LP
@@ -1516,7 +1803,7 @@
 .br
 Example
 .br
-src=file.mp4:OPT dst=file.aac dst=file.264
+gpac -i file.mp4:OPT -o file.aac -o file.264
 .br
 
 .br
@@ -1524,7 +1811,7 @@
 .br
 Example
 .br
-src=file.mp4 dst=file.aac:OPT dst=file.264
+gpac -i file.mp4 -o file.aac:OPT -o file.264
 .br
 
 .br
@@ -1534,7 +1821,7 @@
 .br
 Example
 .br
-src=file.mp4 fout:OPTFOO:dst=file.aac:OPTBAR
+gpac -i file.mp4 fout:OPTFOO:dst=file.aac:OPTBAR
 .br
 
 .br
@@ -1544,30 +1831,40 @@
 .br
 Example
 .br
-src=file.mp4 dst=file.aac:OPTFOO:gfloc:OPTBAR dst=file.264
+gpac -i file.mp4 -o file.aac:OPTFOO:gfloc:OPTBAR -o file.264
 .br
 
 .br
-This will pass the :OPTFOO to all filters loaded between file.mp4source and file.aac destination, but not OPTBAR
+This will pass :OPTFOO to all filters loaded between file.mp4 source and file.aac destination, but not OPTBAR
 .br
 Arguments are by default tracked to check if they were used by the filter chain, and a warning is thrown if this is not the case.
 .br
-It may be usefull to specify arguments which may not be consumed depending on the graph resolution; the specific keyword gfopt indicates that arguments after the keyword will not be tracked.
+It may be useful to specify arguments which may not be consumed depending on the graph resolution; the specific keyword gfopt indicates that arguments after the keyword will not be tracked.
 .br
 Example
 .br
-src=file.mp4 dst=file.aac:OPTFOO:gfopt:OPTBAR dst=file.264
+gpac -i file.mp4 -o file.aac:OPTFOO:gfopt:OPTBAR -o file.264
 .br
 
 .br
 This will warn if OPTFOO is not consumed, but will not track OPTBAR.
 .br
+  
+.br
+A filter may be assigned a name (for inspection purposes, not inherited) using :N=name option. This name is not used in link resolution and may be changed at runtime by the filter instance.
+.br
+  
+.br
+A filter may be assigned a tag (any string) using :TAG=name option. This tag does not need to be unique, and can be used to exclude filter in link resolution. Tags are not inherited, therefore dynamically loaded filters never have a tag.
+.br
+  
+.br
 .SH URL templating
 .LP
 .br
-Destination URLs can be templated using the same mechanism as MPEG-DASH, where $KEYWORD$ is replaced in the template with the resolved value and $KEYWORD%%0Nd$ is replaced in the template with the resolved integer, padded with N zeros if needed. $$ is an escape for $
+Destination URLs can be dynamically constructed using templates. Pattern $KEYWORD$ is replaced in the template with the resolved value and $KEYWORD%%0Nd$ is replaced in the template with the resolved integer, padded with up to N zeros if needed.
 .br
-KEYWORD is case sensitive, and may be present multiple times in the string. Supported KEYWORD are:
+KEYWORD is case sensitive, and may be present multiple times in the string. Supported KEYWORD:
 .br
 * num: replaced by file number if defined, 0 otherwise
 .br
@@ -1575,7 +1872,9 @@
 .br
 * URL: URL of source file
 .br
-* File: path on disk for source file
+* File: path on disk for source file; if not found, use URL if set, or PID name otherwise
+.br
+* Type: name of stream type of PID (video, audio ...)
 .br
 * p4cc=ABCD: uses PID property with 4CC value ABCD
 .br
@@ -1583,28 +1882,30 @@
 .br
 * OTHER: locates property 4CC for the given name, or property name if no 4CC matches.
 .br
-
-.br
   
 .br
+$$ is an escape for $
+.br
+
+.br
 Templating can be useful when encoding several qualities in one pass.
 .br
 Example
 .br
-src=dump.yuv:size=640x360 vcrop:wnd=0x0x320x180 enc:c=avc:b=1M @2 enc:c=avc:b=750k dst=dump_$CropOrigin$x$Width$x$Height$.264:clone
+gpac -i dump.yuv:size=640x360 vcrop:wnd=0x0x320x180 c=avc:b=1M @2 c=avc:b=750k -o dump_$CropOrigin$x$Width$x$Height$.264:clone
 .br
 
 .br
-This will create a croped version of the source, encoded in AVC at 1M, and a full version of the content in AVC at 750k. Outputs will be dump_0x0x320x180.264 for the croped version and dump_0x0x640x360.264 for the non-croped one.
+This will create a cropped version of the source, encoded in AVC at 1M, and a full version of the content in AVC at 750k. Outputs will be dump_0x0x320x180.264 for the cropped version and dump_0x0x640x360.264 for the non-cropped one.
 .br
 .SH Cloning filters
 .LP
 .br
-When a filter accepts a single connection and has a connected input, it is no longer available for dynamic resolution. There may be cases where this behaviour is undesired. Take a HEIF file with N items and do:
+When a filter accepts a single connection and has a connected input, it is no longer available for dynamic resolution. There may be cases where this behavior is undesired. Take a HEIF file with N items and do:
 .br
 Example
 .br
-src=img.heif dst=dump_$ItemID$.jpg
+gpac -i img.heif -o dump_$ItemID$.jpg
 .br
 
 .br
@@ -1612,45 +1913,87 @@
 .br
 Other items will not be connected since the destination only accepts one input PID.
 .br
-There is a special option clone allowing destination filters (and only them) to be cloned with the same arguments:
+There is a special option clone allowing filters to be cloned with the same arguments. The cloned filters have the same ID as the original one.
 .br
 Example
 .br
-src=img.heif dst=dump_$ItemID$.jpg:clone
+gpac -i img.heif -o dump_$ItemID$.jpg:clone
 .br
 
 .br
 In this case, the destination will be cloned for each item, and all will be exported to different JPEGs thanks to URL templating.
 .br
+Example
+.br
+gpac -i vid.mpd c=avc:FID=1:clone -o transcode.mpd:SID=1
+.br
+
+.br
+In this case, the encoder will be cloned for each video PIDs in the source, and the destination will only use PIDs coming from the encoders.
+.br
+
+.br
+When implicit linking is enabled, all filters are by default clonable. This allows duplicating the processing for each PIDs of the same type.
+.br
+Example
+.br
+gpac -i dual_audio resample:osr=48k c=aac -o dst
+.br
+
+.br
+The resampler filter will be cloned for each audio PID, and the encoder will be cloned for each resampler output.
+.br
+You can explicitly deactivate the cloning instructions:
+.br
+Example
+.br
+gpac -i dual_audio resample:osr=48k:clone=0 c=aac -o dst
+.br
+
+.br
+The first audio will connect to the resample filter, the second to the enc filter and the resample output will connect to a clone of the enc filter.
+.br
+
+.br
 .SH Templating filter chains
 .LP
 .br
-There can be cases where the number of desired outputs depends on the source content, for example dumping a multiplex of N services into N files. When the destination involves multiplexing the input PIDs, the :cloneoption is not enough since the muxer will always accept the input PIDs.
+There can be cases where the number of desired outputs depends on the source content, for example dumping a multiplex of N services into N files. When the destination involves multiplexing the input PIDs, the :clone option is not enough since the multiplexer will always accept the input PIDs.
 .br
 To handle this, it is possible to use a PID property name in the sourceID of a filter with the value * or an empty value. In this case, whenever a new PID with a new value for the property is found, the filter with such sourceID will be dynamically cloned.
 .br
-Warning: This feature should only be called with a single property set to * per source ID, results are undefined otherwise.
+Warning: This feature should only be called with a single property set to * (or empty) per source ID, results are undefined otherwise.
 .br
 Example
 .br
-src=source.ts dst=file_$ServiceID$.mp4:SID=*#ServiceID=*
+gpac -i source.ts -o file_$ServiceID$.mp4:SID=*#ServiceID=*
+.br
+gpac -i source.ts -o file_$ServiceID$.mp4:SID=#ServiceID=
+.br
+
+.br
+In this case, each new ServiceID value found when connecting PIDs to the destination will create a new destination file.
 .br
 
 .br
+Cloning in implicit linking mode applies to output as well:
+.br
 Example
 .br
-src=source.ts dst=file_$ServiceID$.mp4:SID=#ServiceID=
+gpac -i dual_audio -o dst_$PID$.aac
 .br
 
 .br
-In this case, each new ServiceID value found when connecting PIDs to the destination will create a new destination file.
+Each audio track will be dumped to aac (potentially reencoding if needed).
+.br
+
 .br
 .SH Assigning PID properties
 .LP
 .br
-It is possible to define properties on output PIDs that will be declared by a filter. This allows tagging parts of the graph with different properties than other parts (for example ServiceID). The syntax is the same as filter option, and uses the fragment separator to identify properties, eg #Name=Value.
+It is possible to define properties on output PIDs that will be declared by a filter. This allows tagging parts of the graph with different properties than other parts (for example ServiceID). The syntax is the same as filter option, and uses the fragment separator to identify properties, e.g. #Name=Value.
 .br
-This sets output PIDs property (4cc, built-in name or any name) to the given value. Value can be omitted for booleans (defaults to true, eg :#Alpha).
+This sets output PIDs property (4cc, built-in name or any name) to the given value. Value can be omitted for boolean (defaults to true, e.g. :#Alpha).
 .br
 Non built-in properties are parsed as follows:
 .br
@@ -1662,19 +2005,27 @@
 .br
 - TYPE@FOO will be parsed according to TYPE. If the type is not recognized, the entire value is copied as string. See gpac -h props for defined types.
 .br
-Warning: Properties are not filtered and override the properties of the filter's output PIDs, be carefull not to break the session by overriding core properties such as width/height/samplerate/... !
+
+.br
+User-assigned PID properties on filter fA will be inherited by all filters dynamically loaded to solve fA -> fB connection.
+.br
+If fB also has user-assigned PID properties, these only apply starting from fB in the chain and are not inherited by filters between fA and fB.
+.br
+
+.br
+Warning: Properties are not filtered and override the properties of the filter's output PIDs, be careful not to break the session by overriding core properties such as width/height/samplerate/... !
 .br
 Example
 .br
--i v1.mp4:#ServiceID=4 -i v2.mp4:#ServiceID=2 -o dump.ts
+gpac -i v1.mp4:#ServiceID=4 -i v2.mp4:#ServiceID=2 -o dump.ts
 .br
 
 .br
-This will mux the streams in dump.ts, using ServiceID 4 for PIDs from v1.mp4 and ServiceID 2 for PIDs from v2.mp4.
+This will multiplex the streams in dump.ts, using ServiceID 4 for PIDs from v1.mp4 and ServiceID 2 for PIDs from v2.mp4.
 .br
 
 .br
-PID properties may be conditionally assigned by checking other PID properties. The syntax uses paranthesis (not configurable) after the property assignment sign:
+PID properties may be conditionally assigned by checking other PID properties. The syntax uses parenthesis (not configurable) after the property assignment sign:
 .br
 #Prop=(CP=CV)VAL
 .br
@@ -1729,7 +2080,7 @@
 .br
 An option file is a simple text file containing one or more options or PID properties on one or more lines.
 .br
-A line begining with "//" is a comment and is ignored.
+A line beginning with "//" is a comment and is ignored.
 .br
 Options in an option file may point to other option files, with a maximum redirection level of 5.
 .br
@@ -1737,7 +2088,7 @@
 .br
 Example
 .br
-src=source.mp4:myopts.txt:foo=bar dst
+gpac -i source.mp4:myopts.txt:foo=bar -o dst
 .br
 
 .br
@@ -1752,9 +2103,9 @@
 .br
 Defined keywords:
 .br
-* $GSHARE: replaced by system path to GPAC shared directory (e.g. /usr/share)
+* $GSHARE: replaced by system path to GPAC shared directory (e.g. /usr/share/gpac)
 .br
-* $GJS: replaced by the first path specified by global config option .I -js-dirs that contains the file name following the macro, e.g. $GJS/source.js
+* $GJS: replaced by the first path from global share directory and paths set through .I -js-dirs that contains the file name following the macro, e.g. $GJS/source.js
 .br
 * $GLANG: replaced by the global config language option .I -lang
 .br
@@ -1774,10 +2125,38 @@
 .br
 This will dump first service in dump_10.ts, second service in dump_12.ts, etc...
 .br
+
+.br
+As seen previously, the following options may be set on any filter, but are not visible in individual filter help:
+.br
+* FID: filter identifier
+.br
+* SID: filter source(s)
+.br
+* N: filter name
+.br
+* FS: sub-session identifier
+.br
+* TAG: filter tag
+.br
+* clone: filter cloning flag
+.br
+* nomux: enable/disable direct file copy
+.br
+* gfreg: preferred filter registry names for link solving
+.br
+* gfloc: following options are local to filter declaration (not inherited)
+.br
+* gfopt: following options are not tracked
+.br
+* gpac: argument separator for URLs
+.br
+
+.br
 .SH External filters
 .LP
 .br
-GPAC comes with a set of built-in filters in libgpac. It may also load external filters in dynamic libraries, located in folders listed in .I -mod-dirs option. The files shall be named gf_* and shall export a single function returning a filter register - see libgpac documentation for more details.
+GPAC comes with a set of built-in filters in libgpac. It may also load external filters in dynamic libraries, located in default module folder or folders listed in .I -mod-dirs option. The files shall be named gf_* and shall export a single function RegisterFilter returning a filter register - see libgpac documentation for more details.
 .br
 
 .br
@@ -1837,9 +2216,9 @@
 2D 32-bit integer vector
 .br
 .TP
-.B v2df
+.B v2d
 .br
-2D 32-bit float vector
+2D 64-bit float vector
 .br
 .TP
 .B v3di
@@ -1847,31 +2226,11 @@
 3D 32-bit integer vector
 .br
 .TP
-.B v3df
-.br
-3D 32-bit float vector
-.br
-.TP
 .B v4di
 .br
 4D 32-bit integer vector
 .br
 .TP
-.B v4df
-.br
-4D 32-bit float vector
-.br
-.TP
-.B pfmt
-.br
-raw pixel format
-.br
-.TP
-.B afmt
-.br
-raw audio format
-.br
-.TP
 .B str
 .br
 UTF-8 string
@@ -1901,13 +2260,61 @@
 .br
 UTF-8 string list
 .br
-
+.TP
+.B uintl
+.br
+unsigned 32 bit integer list
+.br
+.TP
+.B sintl
+.br
+signed 32 bit integer list
+.br
+.TP
+.B v2il
+.br
+2D 32-bit integer vector list
+.br
+.TP
+.B 4cc
+.br
+Four character code
+.br
+.TP
+.B 4ccl
+.br
+four-character codes list
+.br
+.TP
+.B pfmt
+.br
+raw pixel format
+.br
+.TP
+.B afmt
+.br
+raw audio format
+.br
+.TP
+.B cprm
+.br
+color primaries, string or int value from ISO/IEC 23091-2
+.br
+.TP
+.B ctfc
+.br
+color transfer characteristics, string or int value from ISO/IEC 23091-2
+.br
+.TP
+.B cmxc
+.br
+color matrix coefficients, string or int value from ISO/IEC 23091-2
 .br
 
 .br
 Built-in properties for PIDs and packets listed as Name (4CC type FLAGS): description
 .br
-FLAGS can be D (dropable - see GSF mux filter help), P (packet property)
+FLAGS can be D (droppable - see GSF multiplexer filter help), P (packet property)
 .br
 .TP
 .B ID (PIDI,uint,  )
@@ -1917,7 +2324,7 @@
 .TP
 .B ESID (ESID,uint,D )
 .br
-MPEG-4 ESID of pid
+MPEG-4 ESID of PID
 .br
 .TP
 .B ItemID (ITID,uint,  )
@@ -1942,17 +2349,17 @@
 .TP
 .B ClockID (CKID,uint,D )
 .br
-ID of clock reference pid
+ID of clock reference PID
 .br
 .TP
 .B DependencyID (DPID,uint,  )
 .br
-ID of layer dependended on
+ID of layer depended on
 .br
 .TP
 .B SubLayer (DPSL,bool,  )
 .br
-pid is a sublayer of the stream depended on rather than an enhancement layer
+PID is a sublayer of the stream depended on rather than an enhancement layer
 .br
 .TP
 .B PlaybackMode (PBKM,uint,D )
@@ -1978,6 +2385,11 @@
 Tile base stream
 .br
 .TP
+.B TileID (PTID,uint,  )
+.br
+ID of the tile for hvt1/hvt2 PIDs
+.br
+.TP
 .B Language (LANG,cstr,  )
 .br
 Language code: ISO639 2/3 character code or RFC 4646
@@ -1998,12 +2410,12 @@
 Media stream type
 .br
 .TP
-.B StreamSubtype (PSST,uint,D )
+.B StreamSubtype (PSST,4cc,D )
 .br
-Media subtype 4CC (auxiliary, pic sequence, etc ..)
+Media subtype 4CC (auxiliary, pic sequence, etc ..), matches ISOM handler type
 .br
 .TP
-.B ISOMSubtype (PIST,uint,D )
+.B ISOMSubtype (PIST,4cc,D )
 .br
 ISOM media subtype 4CC (avc1 avc2...)
 .br
@@ -2020,22 +2432,22 @@
 .TP
 .B InitialObjectDescriptor (PIOD,bool,  )
 .br
-Indicates if pid is declared in the IOD for MPEG-4
+PID is declared in the IOD for MPEG-4
 .br
 .TP
 .B Unframed (PFRM,bool,  )
 .br
-Indicates that the media data is not framed, i.e. each packet is not a complete AU/frame or is not in internal format (eg annexB for avc/hevc, adts for aac)
+The media data is not framed, i.e. each packet is not a complete AU/frame or is not in internal format (e.g. annexB for avc/hevc, adts for aac)
 .br
 .TP
 .B UnframedAU (PFRF,bool,  )
 .br
-Indicates that the unframed media still has correct AU boundaries: one packet is one full AU, but the packet format might not be the internal one (eg annexB for avc/hevc, adts for aac)
+The unframed media still has correct AU boundaries: one packet is one full AU, but the packet format might not be the internal one (e.g. annexB for avc/hevc, adts for aac)
 .br
 .TP
 .B LATM (LATM,bool,  )
 .br
-Indicates media is unframed AAC in LATM format
+Media is unframed AAC in LATM format
 .br
 .TP
 .B Duration (PDUR,lfrac,  )
@@ -2048,6 +2460,11 @@
 Number of frames in the stream
 .br
 .TP
+.B FrameOffset (FRMO,uint,D )
+.br
+Index of first frame in the stream (used for reporting)
+.br
+.TP
 .B ConstantFrameSize (CFRS,uint,  )
 .br
 Size of the frames for constant frame size streams
@@ -2060,12 +2477,12 @@
 .TP
 .B TimeshiftTime (PTST,dbl,D )
 .br
-Time in the timeshift buffer in seconds - changes are signaled through pid info (no reconfigure)
+Time in the timeshift buffer in seconds - changes are signaled through PID info (no reconfigure)
 .br
 .TP
 .B TimeshiftState (PTSS,uint,D )
 .br
-State of timeshift buffer: 0 is OK, 1 is underflow, 2 is overflow - changes are signaled through pid info (no reconfigure)
+State of timeshift buffer: 0 is OK, 1 is underflow, 2 is overflow - changes are signaled through PID info (no reconfigure)
 .br
 .TP
 .B Timescale (TIMS,uint,  )
@@ -2128,7 +2545,7 @@
 Audio playback speed, only used for audio output reconfiguration
 .br
 .TP
-.B Delay (MDLY,sint,  )
+.B Delay (MDLY,lsint,  )
 .br
 Delay of presentation compared to composition timestamps, in media timescale. Positive value imply holding (delaying) the stream. Negative value imply skipping the beginning of stream
 .br
@@ -2138,6 +2555,11 @@
 CTS offset to apply in case of negative ctts
 .br
 .TP
+.B SkipPriming (ASKP,bool,  )
+.br
+Audio priming shall not to be removed when initializing decoding
+.br
+.TP
 .B Width (WIDT,uint,  )
 .br
 Visual Width (video / text / graphics)
@@ -2190,7 +2612,7 @@
 .TP
 .B SAR (PSAR,frac,  )
 .br
-Sample (ie pixel) aspect ratio
+Sample (i.e. pixel) aspect ratio
 .br
 .TP
 .B PAR (VPAR,frac,D )
@@ -2208,7 +2630,7 @@
 Maximum height (video / text / graphics) of all enhancement layers
 .br
 .TP
-.B ZOrder (VZIX,uint,  )
+.B ZOrder (VZIX,sint,  )
 .br
 Z-order of the video, from 0 (first) to max int (last)
 .br
@@ -2225,7 +2647,7 @@
 .TP
 .B Hidden (HIDE,bool,  )
 .br
-Indicates the PID is hidden in visual/audio rendering
+PID is hidden in visual/audio rendering
 .br
 .TP
 .B CropOrigin (VCXY,v2di,  )
@@ -2259,7 +2681,42 @@
 .TP
 .B Alpha (VALP,bool,  )
 .br
-Indicates the video in this pid is an alpha map
+Video in this PID is an alpha map
+.br
+.TP
+.B Mirror (VMIR,uint,  )
+.br
+Mirror mode (0: no mirror, 1: along Y-axis, 2: along X-axis)
+.br
+.TP
+.B Rotate (VROT,uint,  )
+.br
+Video rotation as value*90 degree anti-clockwise
+.br
+.TP
+.B ClapW (CLPW,frac,  )
+.br
+Width of clean aperture in luma pixels
+.br
+.TP
+.B ClapH (CLPH,frac,  )
+.br
+Height of clean aperture in luma pixels
+.br
+.TP
+.B ClapX (CLPX,frac,  )
+.br
+Horizontal offset of clean aperture center in luma pixels, 0 at image center
+.br
+.TP
+.B ClapY (CLPY,frac,  )
+.br
+Vertical offset of clean aperture center in luma pixels, 0 at image center
+.br
+.TP
+.B NumViews (PNBV,uint,  )
+.br
+Number of views packed in a frame (top-to-bottom only)
 .br
 .TP
 .B Bitrate (RATE,uint,  )
@@ -2272,6 +2729,11 @@
 Max bitrate in bps
 .br
 .TP
+.B TargetRate (TBRT,uint,  )
+.br
+Target bitrate in bps, used to setup encoders
+.br
+.TP
 .B DBSize (DBSZ,uint,  )
 .br
 Decode buffer size in bytes
@@ -2319,12 +2781,12 @@
 .TP
 .B Cached (CACH,bool,D )
 .br
-indicates the file is completely cached
+File is completely cached
 .br
 .TP
 .B DownloadRate (DLBW,uint,D )
 .br
-Dowload rate of resource in bits per second - changes are signaled through pid info (no reconfigure)
+Download rate of resource in bits per second - changes are signaled through PID info (no reconfigure)
 .br
 .TP
 .B DownloadSize (DLSZ,luint,D )
@@ -2334,7 +2796,7 @@
 .TP
 .B DownBytes (DLBD,luint,D )
 .br
-Number of bytes downloaded - changes are signaled through pid info (no reconfigure)
+Number of bytes downloaded - changes are signaled through PID info (no reconfigure)
 .br
 .TP
 .B ByteRange (FBRA,lfrac,D )
@@ -2344,27 +2806,27 @@
 .TP
 .B DisableProgressive (NPRG,uint,  )
 .br
-indicates that some blocks in file need patching (replace or insertion) upon closing, potentially disabling progressive upload
+Some blocks in file need patching (replace or insertion) upon closing, potentially disabling progressive upload
 .br
 .TP
-.B IsoAltBrands (ABRD,uintl,D )
+.B IsoAltBrands (ABRD,4ccl,D )
 .br
-indicates ISOBMFF brands associated with PID/file
+ISOBMFF brands associated with PID/file
 .br
 .TP
-.B IsoBrand (MBRD,uint,D )
+.B IsoBrand (MBRD,4cc,D )
 .br
-indicates ISOBMFF major brand associated with PID/file
+ISOBMFF major brand associated with PID/file
 .br
 .TP
 .B MovieTime (MHTS,lfrac,D )
 .br
-indicates ISOBMFF movie header duration and timescale
+ISOBMFF movie header duration and timescale
 .br
 .TP
 .B HasSync (PSYN,bool,D )
 .br
-indicates ISOBMFF track has sync points
+PID has sync points
 .br
 .TP
 .B ServiceWidth (DWDT,uint,D )
@@ -2407,7 +2869,7 @@
 Audio thread priority
 .br
 .TP
-.B ProtectionScheme (SCHT,uint,  )
+.B ProtectionScheme (SCHT,4cc,  )
 .br
 Protection scheme type (4CC) used
 .br
@@ -2429,7 +2891,7 @@
 .TP
 .B SelectiveEncryption (ISSE,bool,  )
 .br
-Indicates if ISMA/OMA selective encryption is used
+ISMA/OMA selective encryption is used
 .br
 .TP
 .B IVLength (ISIV,uint,  )
@@ -2464,12 +2926,12 @@
 .TP
 .B CryptInfo (ECRI,str,D )
 .br
-URL (local file only) of crypt info file for this pid
+URL (local file only) of crypt info file for this PID, use clear to force passthrough
 .br
 .TP
 .B DecryptInfo (EDRI,str,D )
 .br
-URL (local file only) of crypt info file for this pid - see decrypter help
+URL (local file only) of crypt info file for this PID - see decrypter help
 .br
 .TP
 .B SenderNTP (NTPS,luint,DP)
@@ -2484,7 +2946,7 @@
 .TP
 .B Encrypted (EPCK,bool,  )
 .br
-Packets for the stream are by default encrypted (however the encryption state is carried in packet crypt flags) - changes are signaled through pid_set_info (no reconfigure)
+Packets for the stream are by default encrypted (however the encryption state is carried in packet crypt flags) - changes are signaled through PID info change (no reconfigure)
 .br
 .TP
 .B OMAPreview (ODPR,luint,  )
@@ -2499,22 +2961,34 @@
 .TP
 .B CENC_SAI (SAIS,mem, P)
 .br
-CENC SAI for the packet, formated as (char(IV_Size))IV(u16)NbSubSamples [(u16)ClearBytes(u32)CryptedBytes]
+CENC SAI for the packet, formatted as (char(IV_Size))IV(u16)NbSubSamples [(u16)ClearBytes(u32)CryptedBytes]
 .br
 .TP
-.B KID (SKID,mem,  )
+.B KeyInfo (CBIV,mem,  )
 .br
-Key ID for packets of the PID - changes are signaled through pid_set_info (no reconfigure)
+Multi key info formatted as:
 .br
-.TP
-.B IVSize (SAIV,uint,  )
+ is_mkey(u8);
 .br
-IV size for packets of the PID
+nb_keys(u16);
 .br
-.TP
-.B ConstantIV (CBIV,mem,  )
+[
+.br
+	IV_size(u8);
+.br
+	KID(bin128);
 .br
-Constant IV for packets of the PID
+	if (!IV_size) {;
+.br
+		const_IV_size(u8);
+.br
+		constIV(const_IV_size);
+.br
+}
+.br
+]
+.br
+
 .br
 .TP
 .B CENCPattern (CPTR,frac,  )
@@ -2522,7 +2996,7 @@
 CENC crypt pattern, CENC pattern, skip as frac.num crypt as frac.den
 .br
 .TP
-.B CENCStore (CSTR,uint,  )
+.B CENCStore (CSTR,4cc,  )
 .br
 Storage location 4CC of SAI data
 .br
@@ -2550,7 +3024,7 @@
 .TP
 .B NALUMaxSize (NALS,uint,  )
 .br
-Max size of NAL units in stream - changes are signaled through pid_set_info (no reconfigure)
+Max size of NAL units in stream - changes are signaled through PID info change (no reconfigure)
 .br
 .TP
 .B FileNumber (FNUM,uint, P)
@@ -2578,52 +3052,57 @@
 End of DASH segment
 .br
 .TP
+.B CueStart (PCUS,bool, P)
+.br
+Set on packets marking the beginning of a DASH/HLS segment for cue-driven segmentation - see dasher help
+.br
+.TP
 .B MaxFrameSize (MFRS,uint,D )
 .br
-Max size of frame in stream - changes are signaled through pid_set_info (no reconfigure)
+Max size of frame in stream - changes are signaled through PID info change (no reconfigure)
 .br
 .TP
 .B AvgFrameSize (AFRS,uint,D )
 .br
-Average size of frame in stream (isobmff only, static property)
+Average size of frame in stream (ISOBMFF only, static property)
 .br
 .TP
 .B MaxTSDelta (MTSD,uint,D )
 .br
-Maximum DTS delta between frames (isobmff only, static property)
+Maximum DTS delta between frames (ISOBMFF only, static property)
 .br
 .TP
 .B MaxCTSOffset (MCTO,uint,D )
 .br
-Maximum absolute CTS offset (isobmff only, static property)
+Maximum absolute CTS offset (ISOBMFF only, static property)
 .br
 .TP
 .B ConstantDuration (SCTD,uint,D )
 .br
-Constant duration of samples, 0 means variable duration (isobmff only, static property)
+Constant duration of samples, 0 means variable duration (ISOBMFF only, static property)
 .br
 .TP
 .B TrackTemplate (ITKT,mem,D )
 .br
-ISOBMFF serialized track box for this PID, without any sample info (empty stbl and empty dref) - used by isomuxer to reinject specific boxes of input ISOBMFF track
+ISOBMFF serialized track box for this PID, without any sample info (empty stbl and empty dref)
 .br
 .TP
 .B TrexTemplate (ITXT,mem,D )
 .br
-ISOBMFF serialized trex box for this PID - used by isomuxer to remux empty init segments
+ISOBMFF serialized trex box for this PID
 .br
 .TP
 .B STSDTemplate (ISTD,mem,D )
 .br
-ISOBMFF serialized sample description box (stsd entry) for this PID - used by isomuxer to reinject specific boxes of input ISOBMFF track
+ISOBMFF serialized sample description box (stsd entry) for this PID
 .br
 .TP
 .B MovieUserData (IMUD,mem,D )
 .br
-ISOBMFF serialized moov UDTA and other moov-level boxes (list) for this PID - used by isomuxer to reinject specific boxes of input ISOBMFF moov
+ISOBMFF serialized moov UDTA and other moov-level boxes (list) for this PID
 .br
 .TP
-.B TrackHandler (IHDL,str,D )
+.B HandlerName (IHDL,str,D )
 .br
 ISOBMFF track handler name
 .br
@@ -2633,22 +3112,37 @@
 ISOBMFF track header flags
 .br
 .TP
-.B TrackMatrix (ITKM,uintl,D )
+.B TrackMatrix (ITKM,sintl,D )
 .br
 ISOBMFF track header matrix
 .br
 .TP
+.B AltGroup (IALG,uint,D )
+.br
+ISOBMFF alt group ID
+.br
+.TP
+.B ForceNCTTS (IFNC,bool,D )
+.br
+ISOBMFF force negative CTS offsets
+.br
+.TP
+.B Disable (ITKD,bool,D )
+.br
+ISOBMFF disable flag
+.br
+.TP
 .B Period (PEID,str,D )
 .br
 ID of DASH period
 .br
 .TP
-.B PStart (PEST,dbl,D )
+.B PStart (PEST,lfrac,D )
 .br
 DASH Period start - cf dasher help
 .br
 .TP
-.B PDur (PEDU,dbl,D )
+.B PDur (PEDU,lfrac,D )
 .br
 DASH Period duration - cf dasher help
 .br
@@ -2670,52 +3164,52 @@
 .TP
 .B DashMode (DMOD,uint,D )
 .br
-DASH mode to be used by muxer if any, set by dasher. 0 is no DASH, 1 is regular DASH, 2 is VoD
+DASH mode to be used by multiplexer if any, set by dasher. 0 is no DASH, 1 is regular DASH, 2 is VoD
 .br
 .TP
-.B DashDur (DDUR,dbl,D )
+.B DashDur (DDUR,frac,D )
 .br
-DASH target segment duration in seconds to muxer if any, set by dasher
+DASH target segment duration in seconds
 .br
 .TP
 .B Role (ROLE,strl,D )
 .br
-List of roles for this pid
+List of roles for this PID, where each role string can be a DASH role, a URN:role-value or any other string (this will throw a warning and use a custom URI for the role)
 .br
 .TP
 .B PDesc (PDES,strl,D )
 .br
-List of descriptors for the DASH period containing this pid
+List of descriptors for the DASH period containing this PID
 .br
 .TP
 .B ASDesc (ACDS,strl,D )
 .br
-List of conditional descriptors for the DASH AdaptationSet containing this pid. If a pid with the same property type but different value is found, the pids will be in different AdaptationSets
+List of conditional descriptors for the DASH AdaptationSet containing this PID. If a PID with the same property type but different value is found, the PIDs will be in different AdaptationSets
 .br
 .TP
 .B ASCDesc (AADS,strl,D )
 .br
-List of common descriptors for the DASH AdaptationSet containing this pid
+List of common descriptors for the DASH AdaptationSet containing this PID
 .br
 .TP
 .B RDesc (RDES,strl,D )
 .br
-List of descriptors for the DASH Representation containing this pid
+List of descriptors for the DASH Representation containing this PID
 .br
 .TP
 .B BUrl (BURL,strl,D )
 .br
-List of base URLs for this pid
+List of base URLs for this PID
 .br
 .TP
-.B Template (DTPL,str,D )
+.B Template (DTPL,str,  )
 .br
-Template to use for DASH generation for this pid
+Template to use for DASH generation for this PID
 .br
 .TP
-.B StartNumber (DRSN,uint,D )
+.B StartNumber (DRSN,uint,  )
 .br
-Start number to use for this pid - cf dasher help
+Start number to use for this PID - cf dasher help
 .br
 .TP
 .B xlink (XLNK,str,D )
@@ -2723,9 +3217,9 @@
 Remote period URL for DASH - cf dasher help
 .br
 .TP
-.B CDur (DCMD,dbl,D )
+.B ClampDur (DCMD,lfrac,D )
 .br
-Max media duration to process from pid in DASH mode
+Max media duration to process from PID in DASH mode
 .br
 .TP
 .B HLSPL (HLVP,str,D )
@@ -2738,9 +3232,19 @@
 Name of HLS Group of a stream
 .br
 .TP
+.B HLSMExt (HLMX,strl,D )
+.br
+List of extensions to add to the master playlist for this PID
+.br
+.TP
+.B HLSVExt (HLVX,strl,D )
+.br
+List of extensions to add to the variant playlist for this PID
+.br
+.TP
 .B DCue (DCUE,str,D )
 .br
-Name of a cue list file for this pid - see dasher help
+Name of a cue list file for this PID - see dasher help
 .br
 .TP
 .B DSegs (DCNS,uint,D )
@@ -2750,97 +3254,297 @@
 .TP
 .B Codec (CODS,str,D )
 .br
-codec parameter string to force. If starting with '.', appended to ISOBMF code point; otherwise replace the codec string
+codec parameter string to force. If starting with '.', appended to ISOBMFF code point; otherwise replace the codec string
 .br
 .TP
 .B SingleScale (DSTS,bool,D )
 .br
-Indicates the movie header should use the media timescale of the first track added
+Movie header should use the media timescale of the first track added
 .br
 .TP
 .B RequireReorder (PUDP,bool,D )
 .br
-Indicates the PID packets come from source with losses and reordering happening (UDP)
+PID packets come from source with losses and reordering happening (UDP)
 .br
 .TP
 .B Primary (PITM,bool,D )
 .br
-Indicates this is a primary item in isobmf
+Primary item in ISOBMFF
+.br
+.TP
+.B DFMode (DFWD,uint,D )
+.br
+DASH forward mode is used for this PID. If 2, the manifest is also carried in packet propery
+.br
+.TP
+.B DFManifest (DMPD,str,D )
+.br
+Value of manifest in forward mode
+.br
+.TP
+.B DFVariant (DHLV,strl,D )
+.br
+Value of variant playlist in forward mode
 .br
 .TP
-.B ColorPrimaries (CPRM,uint,D )
+.B DFVariantName (DHLN,strl,D )
 .br
-Indicate color primaries for a visual pid (see ISO/IEC 23001-8 / 23091-2)
+Value of variant playlist name in forward mode
 .br
 .TP
-.B ColorTransfer (CTRC,uint,D )
+.B DFPStart (DPST,luint,D )
 .br
-Indicate color transfer characteristics for a visual pid (see ISO/IEC 23001-8 / 23091-2)
+Value of active period start time in forward mode
 .br
 .TP
-.B ColorMatrixCoef (CMXC,uint,D )
+.B HLSKey (HLSK,str,  )
 .br
-Indicate color matrix coeficient for a visual pid (see ISO/IEC 23001-8 / 23091-2)
+URI, KEYFORMAT and KEYFORMATVERSIONS for HLS full segment encryption creation, Key URI otherwise ( decoding and sample-AES)
 .br
 .TP
-.B FullRange (CFRA,uint,D )
+.B HLSIV (HLSI,mem,  )
 .br
-Indicate color full range flag for a visual pid (see ISO/IEC 23001-8 / 23091-2)
+Init Vector for HLS decode
+.br
+.TP
+.B ColorPrimaries (CPRM,cprm,D )
+.br
+Color primaries
+.br
+.TP
+.B ColorTransfer (CTRC,ctfc,D )
+.br
+Color transfer characteristics
+.br
+.TP
+.B ColorMatrix (CMXC,cmxc,D )
+.br
+Color matrix coefficient
+.br
+.TP
+.B FullRange (CFRA,bool,D )
+.br
+Color full range flag
+.br
+.TP
+.B Chroma (CFMT,uint,D )
+.br
+Chroma format (see ISO/IEC 23001-8 / 23091-2)
 .br
 .TP
 .B ChromaLoc (CLOC,uint,D )
 .br
-Indicate chrom location for a visual pid (see ISO/IEC 23001-8 / 23091-2)
+Chroma location (see ISO/IEC 23001-8 / 23091-2)
+.br
+.TP
+.B ContentLightLevel (CLLI,mem,D )
+.br
+Content light level, payload of clli box (see ISO/IEC 14496-12), can be set as a list of 2 integers in fragment declaration (e.g. "=max_cll,max_pic_avg_ll")
+.br
+.TP
+.B MasterDisplayColour (MDCV,mem,D )
+.br
+Master display colour info, payload of mdcv box (see ISO/IEC 14496-12), can be set as a list of 10 integers in fragment declaration (e.g. "=dpx0,dpy0,dpx1,dpy1,dpx2,dpy2,wpx,wpy,max,min")
 .br
 .TP
 .B SrcMagic (PSMG,luint,D )
 .br
-Indicate a magic number to store in the track, only used by importers
+Magic number to store in the track, only used by importers
 .br
 .TP
 .B MuxIndex (TIDX,luint,D )
 .br
-Indicate target track index in destination file, stored by lowest value first (not set by demuxers)
+Target track index in destination file, stored by lowest value first (not set by demultiplexers)
 .br
 .TP
 .B NoTSLoop (NTSL,bool,  )
 .br
-Indicate the timestamps on this PID are adjusted in case of loops (used by TS muxer output)
+Timestamps on this PID are adjusted in case of loops (used by TS multiplexer output)
 .br
 .TP
-.B FragStart (PFRB,uint,D )
+.B MHAProfiles (MHCP,uintl,D )
 .br
-Indicate if packet is a fragment start (value 1) or a segment start (value 2)
+List of compatible profiles for this MPEG-H Audio object
 .br
 .TP
-.B FragRange (PFRR,lfrac,D )
+.B FragStart (PFRB,uint,DP)
 .br
-Indicate start and end position in bytes of fragment if packet is a fragment or segment start
+Packet is a fragment start (value 1) or a segment start (value 2)
 .br
 .TP
-.B SIDXRange (PFSR,lfrac,D )
+.B FragRange (PFRR,lfrac,DP)
 .br
-Indicate start and end position in bytes of sidx if packet is a fragment or segment start
+Start and end position in bytes of fragment if packet is a fragment or segment start
 .br
 .TP
-.B MoofTemplate (MFTP,mem,D )
+.B SIDXRange (PFSR,lfrac,DP)
+.br
+Start and end position in bytes of sidx if packet is a fragment or segment start
+.br
+.TP
+.B MoofTemplate (MFTP,mem,DP)
 .br
 Serialized moof box corresponding to the start of a movie fragment or segment (with styp and optionally sidx)
 .br
 .TP
+.B InitSeg (PCKI,bool, P)
+.br
+Set to true if packet is a complete DASH init segment file
+.br
+.TP
 .B RawGrab (PGRB,bool,D )
 .br
-Indicate PID is a raw media grabber (webcam, microphone, etc...)
+PID is a raw media grabber (webcam, microphone, etc...)
 .br
 .TP
 .B KeepAfterEOS (PKAE,bool,D )
 .br
-Indicate the PID must be kept alive after EOS (LASeR and BIFS)
+PID must be kept alive after EOS (LASeR and BIFS)
 .br
 .TP
 .B CoverArt (PCOV,mem,D )
 .br
-Indicate PID cover art image data. If associated data is NULL, the data is carried in the PID
+PID cover art image data. If associated data is NULL, the data is carried in the PID
+.br
+.TP
+.B BufferLength (PBPL,uint,D )
+.br
+Playout buffer in ms
+.br
+.TP
+.B MaxBuffer (PBMX,uint,D )
+.br
+Maximum buffer occupancy in ms
+.br
+.TP
+.B ReBuffer (PBRE,uint,D )
+.br
+Rebuffer threshold in ms, 0 disable rebuffering
+.br
+.TP
+.B ViewIdx (VIDX,uint,D )
+.br
+View index for multiview (1 being left)
+.br
+.TP
+.B FragURL (OFRA,str,D )
+.br
+Fragment URL (without '#') of original URL (used by some filters to set the property on media PIDs)
+.br
+.TP
+.B ROUTEIP (RSIP,str,D )
+.br
+ROUTE session IP address
+.br
+.TP
+.B ROUTEPort (RSPN,uint,D )
+.br
+ROUTE session port number
+.br
+.TP
+.B ROUTEName (RSFN,str,D )
+.br
+Name (location) of raw file to advertise in ROUTE session
+.br
+.TP
+.B ROUTECarousel (RSCR,frac,D )
+.br
+Carousel period in seconds of raw file in ROUTE session
+.br
+.TP
+.B ROUTEUpload (RSST,frac,D )
+.br
+Upload time in seconds of raw file in ROUTE session
+.br
+.TP
+.B Stereo (PSTT,uint,D )
+.br
+Stereo type of video
+.br
+.TP
+.B Projection (PPJT,uint,D )
+.br
+Projection type of video
+.br
+.TP
+.B InitalPose (PPOS,v3di,D )
+.br
+Initial pose for 360 video, in degrees expressed as 16.16 bits (x is yaw, y is pitch, z is roll)
+.br
+.TP
+.B CMPad (PCMP,uint,D )
+.br
+Number of pixels to pad from edge of each face in cube map
+.br
+.TP
+.B EQRClamp (PEQC,v4di,D )
+.br
+Clamping of frame for EQR as 0.32 fixed point (x is top, y is bottom, z is left and w is right)
+.br
+.TP
+.B SceneNode (PSND,bool,  )
+.br
+PID is a scene node decoder (AFX BitWrapper in BIFS)
+.br
+.TP
+.B OrigCryptoScheme (POCS,uint,  )
+.br
+Original crypto scheme on a decrypted PID
+.br
+.TP
+.B TSBSegs (PTSN,uint,D )
+.br
+Time shift in number of segments for HAS streams, only set by dashin and dasher filters
+.br
+.TP
+.B IsManifest (PHSM,bool,D )
+.br
+PID is a HAS manifest
+.br
+.TP
+.B SkipBegin (PCKS,uint, P)
+.br
+Amount of media to skip from beginning of packet in PID timescale
+.br
+.TP
+.B SkipPres (PCKD,bool, P)
+.br
+Packet and any following with CTS greater than this packet shall not be presented (used by reframer to create edit lists)
+.br
+.TP
+.B HLSRef (HPLR,luint,DP)
+.br
+HLS playlist reference, gives a unique ID identifying media mux, and indicated in packets carrying child playlists
+.br
+.TP
+.B LLHLS (HLSL,uint,D )
+.br
+HLS low latency mode
+.br
+.TP
+.B LLHLSFragNum (HLSN,uint, P)
+.br
+LLHLS fragment number
+.br
+.TP
+.B DownloadSession (GHTT,ptr,D )
+.br
+Pointer to download session
+.br
+.TP
+.B HasTemi (PTEM,bool,D )
+.br
+TEMI present flag
+.br
+.TP
+.B XPSMask (PXPM,uint,DP)
+.br
+Parameter set mask
+.br
+.TP
+.B RangeEnd (PCER,bool, P)
+.br
+Signal packet is the last in the desired play range
 .br
 .SH Pixel formats
 .LP
@@ -2851,6 +3555,11 @@
 Planar YUV 420 8 bit
 .br
 .TP
+.B yvu420 (ext *.yvu)
+.br
+Planar YVU 420 8 bit
+.br
+.TP
 .B yuv420_10 (ext *.yuvl)
 .br
 Planar YUV 420 10 bit
@@ -2878,32 +3587,52 @@
 .TP
 .B uyvy (ext *.uyvy)
 .br
-Planar UYVY 422 8 bit
+Packed UYVY 422 8 bit
 .br
 .TP
 .B vyuy (ext *.vyuy)
 .br
-Planar VYUV 422 8 bit
+Packed VYUV 422 8 bit
 .br
 .TP
 .B yuyv (ext *.yuyv)
 .br
-Planar YUYV 422 8 bit
+Packed YUYV 422 8 bit
 .br
 .TP
 .B yvyu (ext *.yvyu)
 .br
-Planar YVYU 422 8 bit
+Packed YVYU 422 8 bit
+.br
+.TP
+.B uyvl (ext *.uyvl)
+.br
+Packed UYVY 422 10->16 bit
+.br
+.TP
+.B vyul (ext *.vyul)
+.br
+Packed VYUV 422 10->16 bit
+.br
+.TP
+.B yuyl (ext *.yuyl)
+.br
+Packed YUYV 422 10->16 bit
+.br
+.TP
+.B yvyl (ext *.yvyl)
+.br
+Packed YVYU 422 10->16 bit
 .br
 .TP
 .B nv12 (ext *.nv12)
 .br
-Semi-planar YUV 420 8 bit, Y plane and UV plane
+Semi-planar YUV 420 8 bit, Y plane and UV packed plane
 .br
 .TP
 .B nv21 (ext *.nv21)
 .br
-Semi-planar YUV 420 8 bit, Y plane and VU plane
+Semi-planar YUV 420 8 bit, Y plane and VU packed plane
 .br
 .TP
 .B nv1l (ext *.nv1l)
@@ -2931,6 +3660,21 @@
 Planar YUV+alpha 444 8 bit
 .br
 .TP
+.B yuv444p (ext *.yv4p)
+.br
+Packed YUV 444 8 bit
+.br
+.TP
+.B yuv444ap (ext *.y4ap)
+.br
+Packed YUV+alpha 444 8 bit
+.br
+.TP
+.B yuv444p_10 (ext *.y4lp)
+.br
+Packed YUV 444 10 bit
+.br
+.TP
 .B grey (ext *.grey)
 .br
 Greyscale 8 bit
@@ -3055,6 +3799,11 @@
 16 bit PCM Little Endian
 .br
 .TP
+.B s16b (ext *.pcmb)
+.br
+16 bit PCM Big Endian
+.br
+.TP
 .B s24 (ext *.s24)
 .br
 24 bit PCM
@@ -3246,7 +3995,7 @@
 MPEG-4 Simple Aggregation Format
 .br
 .TP
-.B cmp|m4vp2
+.B cmp|m4ve|m4v
 .br
 MPEG-4 Visual part 2
 .br
@@ -3328,7 +4077,7 @@
 .TP
 .B jp2|j2k
 .br
-JPEG200 Image
+JPEG2000 Image
 .br
 .TP
 .B aac
@@ -3356,11 +4105,16 @@
 MPEG-1 Audio
 .br
 .TP
-.B mp3|m2a
+.B mp2
 .br
 MPEG-2 Audio
 .br
 .TP
+.B mp1
+.br
+MPEG-1 Audio Layer 1
+.br
+.TP
 .B h263
 .br
 H263 Video
@@ -3426,6 +4180,11 @@
 Enhanced AC3 Audio
 .br
 .TP
+.B mlp
+.br
+Dolby TrueHD
+.br
+.TP
 .B dra
 .br
 DRA Audio
@@ -3646,7 +4405,7 @@
 VP10 Video
 .br
 .TP
-.B mpha
+.B mhas
 .br
 MPEG-H Audio
 .br
@@ -3695,6 +4454,134 @@
 .br
 QT TimeCode
 .br
+.TP
+.B vvc|266|h266
+.br
+VVC Video
+.br
+.TP
+.B vvs1
+.br
+VVC Subpicture Video
+.br
+.TP
+.B usac|xheaac
+.br
+xHEAAC / USAC Audio
+.br
+.TP
+.B v210
+.br
+v210 YUV 422 10 bits
+.br
+.TP
+.B ffv1
+.br
+FFMPEG Video Codec 1
+.br
+.SH Stream types
+.LP
+.br
+.TP
+.B mono (int 1)
+.br
+Layout 0x0000000000000004
+.br
+.TP
+.B stereo (int 2)
+.br
+Layout 0x0000000000000003
+.br
+.TP
+.B 3/0.0 (int 3)
+.br
+Layout 0x0000000000000007
+.br
+.TP
+.B 3/1.0 (int 4)
+.br
+Layout 0x0000000000000407
+.br
+.TP
+.B 3/2.0 (int 5)
+.br
+Layout 0x0000000000000307
+.br
+.TP
+.B 3/2.1 (int 6)
+.br
+Layout 0x000000000000030f
+.br
+.TP
+.B 5/2.1 (int 7)
+.br
+Layout 0x000000000000030f
+.br
+.TP
+.B 1+1 (int 8)
+.br
+Layout 0x0000000000000003
+.br
+.TP
+.B 2/1.0 (int 9)
+.br
+Layout 0x0000000000000403
+.br
+.TP
+.B 2/2.0 (int 10)
+.br
+Layout 0x0000000000000033
+.br
+.TP
+.B 3/3.1 (int 11)
+.br
+Layout 0x000000000000043f
+.br
+.TP
+.B 3/4.1 (int 12)
+.br
+Layout 0x000000000000033f
+.br
+.TP
+.B 11/11.2 (int 13)
+.br
+Layout 0x000000003ffe67cf
+.br
+.TP
+.B 5/2.1 (int 14)
+.br
+Layout 0x000000000006030f
+.br
+.TP
+.B 5/5.2 (int 15)
+.br
+Layout 0x000000000606630f
+.br
+.TP
+.B 5/4.1 (int 16)
+.br
+Layout 0x000000000036003f
+.br
+.TP
+.B 6/5.1 (int 17)
+.br
+Layout 0x00000000023e003f
+.br
+.TP
+.B 6/7.1 (int 18)
+.br
+Layout 0x00000600023e003f
+.br
+.TP
+.B 5/6.1 (int 19)
+.br
+Layout 0x000000000036630f
+.br
+.TP
+.B 7/6.1 (int 20)
+.br
+Layout 0x000000600036630f
+.br
 .SH EXAMPLES
 .TP
 Basic and advanced examples are available at https://wiki.gpac.io/Filters
@@ -3702,11 +4589,11 @@
 .LP
 Authors: GPAC developers, see git repo history (-log)
 .br
-For bug reports, feature requests, more information and source code, visit http://github.com/gpac/gpac
+For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
 .br
-build: 1.0.1-rev0-g7c36b3027-master
+build: 1.1.0-DEV-rev1777-gb91a8dad3-master
 .br
-Copyright: (c) 2000-2020 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+Copyright: (c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
 .br
 .SH SEE ALSO
 .LP

gpac-1.0.1.tar.gz/share/doc/man/mp4box.1 -> gpac-2.0.0.tar.gz/share/doc/man/mp4box.1 Changed

@@ -12,35 +12,28 @@
 .SH General Options
 .LP
 .br
-MP4Box is a multimedia packager, with a vast number of functionalities: conversion, splitting, hinting, dumping, DASH-ing, encryption and others.
+MP4Box is a multimedia packager, with a vast number of functionalities: conversion, splitting, hinting, dumping, DASH-ing, encryption, transcoding and others.
 .br
 MP4Box provides a large set of options, classified by categories (see .I -h). These options do not follow any particular ordering.
 .br
-MP4Box performs in-place rewrite of IsoMedia files (the input file is overwritten). You can change this behaviour by using the .I out option.
-.br
-MP4Box stores by default the file with 0.5 second interleaving and meta-data (moov...) at the beginning, making it suitable for HTTP streaming. This may however takes longer to store the file, use .I flat to change this behaviour.
+ 
 .br
-MP4Box usually generates a temporary file when creating a new IsoMedia file. The location of this temporary file is OS-dependent, and it may happen that the drive/partition the temporary file is created on has not enough space or no write access. In such a case, you can specify a temporary file location with .I tmp.
+By default, MP4Box rewrites the input file. You can change this behavior by using the .I out option.
 .br
-Note: Track operations identify tracks through their ID (usually refered as tkID in the help), not their order.
+MP4Box stores by default the file with 0.5 second interleaving and meta-data (moov ...) at the beginning, making it suitable for HTTP download-and-play. This may however takes longer to store the file, use .I flat to change this behavior.
 .br
-Option values:
-.br
-Unless specified otherwise, an option of type integer expects a trackID value following it.An option of type boolean expects no following value. 
+ 
 .br
-.SH File Splitting and Concatenation
-.LP
+MP4Box usually generates a temporary file when creating a new IsoMedia file. The location of this temporary file is OS-dependent, and it may happen that the drive/partition the temporary file is created on has not enough space or no write access. In such a case, you can specify a temporary file location with .I tmp.
 .br
-MP4Box can split IsoMedia files by size, duration or extract a given part of the file to new IsoMedia file(s). This process requires that at most one track in the input file has non random-access points (typically one video track at most). This process will also ignore all MPEG-4 Systems tracks and hint tracks, but will try to split private media tracks.
+ 
 .br
-Note: The input file must have enough random access points in order to be split. This may not be the case with some video files where only the very first sample of the video track is a key frame (many 3GP files with H263 video are recorded that way). In order to split such files you will have to use a real video editor and re-encode the content.
+Option values:
 .br
-Note: You can add media to a file and split it in the same pass. In this case, the destination file (the one which would be obtained without spliting) will not be stored.
+Unless specified otherwise, an option of type integer expects a trackID value following it.An option of type boolean expects no following value.Note: Track operations identify tracks through their ID (usually referred to as tkID in the help), not their order.
 .br
 
 .br
-Options:
-.br
 .TP
 .B \-mem-track
 .br
@@ -52,7 +45,7 @@
 enable memory tracker with stack dumping
 .br
 .TP
-.B \-p
+.B \-p (string)
 .br
 use indicated profile for the global GPAC config. If not found, config file is created. If a file path is indicated, this will load profile from that file. Otherwise, this will create a directory of the specified name and store new config there. Reserved name 0 means a new profile, not stored to disk. Works using -p=NAME or -p NAME
 .br
@@ -64,10 +57,10 @@
 .TP
 .B \-old-inter (number)
 .br
-same as .I inter but wihout drift correction
+same as .I inter but without drift correction
 .br
 .TP
-.B \-tight (number)
+.B \-tight
 .br
 tight interleaving (sample based) of the file. This reduces disk seek operations but increases file size
 .br
@@ -84,12 +77,7 @@
 .TP
 .B \-out (string)
 .br
-specify output file name. By default input file is overwritten
-.br
-.TP
-.B \-tmp (string)
-.br
-specify directory for temporary file creation
+specify ISOBMFF output file name. By default input file is overwritten
 .br
 .TP
 .B \-co64
@@ -107,7 +95,7 @@
 force creation of a new destination file without temp file but interleaving support
 .br
 .TP
-.B \-no-sys
+.B \-no-sys,-nosys
 .br
 remove all MPEG-4 Systems info except IOD, kept for profiles. This is the default when creating regular AV content
 .br
@@ -169,7 +157,15 @@
 .TP
 .B \-chap (string)
 .br
-set chapter information from given file
+set chapter information from given file. The following formats are supported (but cannot be mixed) in the chapter text file:
+.br
+ * ZoomPlayer: AddChapter(nb_frames,chapter name), AddChapterBySeconds(nb_sec,chapter name) and AddChapterByTime(h,m,s,chapter name) with 1 chapter per line
+.br
+ * Time codes: h:m:s chapter_name, h:m:s:ms chapter_name and h:m:s.ms chapter_name with 1 chapter per line
+.br
+ * SMPTE codes: h:m:s;nb_f/fps chapter_name and h:m:s;nb_f chapter_name with nb_f the number of frames and fps the framerate with 1 chapter per line
+.br
+ * Common syntax: CHAPTERX=h:m:s[:ms or .ms] on first line and CHAPTERXNAME=name on next line (reverse order accepted)
 .br
 .TP
 .B \-chapqt (string)
@@ -177,12 +173,12 @@
 set chapter information from given file, using QT signaling for text tracks
 .br
 .TP
-.B \-set-track-id id1:id2 (string)
+.B \-set-track-id id1:id2
 .br
 change id of track with id1 to id2
 .br
 .TP
-.B \-swap-track-id id1:id2 (string)
+.B \-swap-track-id id1:id2
 .br
 swap the id between tracks with id1 to id2
 .br
@@ -217,17 +213,17 @@
 set movie timescale to given value (ticks per second)
 .br
 .TP
-.B \-lang [tkID=]LAN (string)
+.B \-lang [tkID=]LAN
 .br
 set language. LAN is the BCP-47 code (eng, en-UK, ...). If no track ID is given, sets language to all tracks
 .br
 .TP
-.B \-delay tkID=TIME (string)
+.B \-delay tkID=TIME
 .br
-set track start delay in ms
+set track start delay (>0) or initial skip (<0) in ms or in fractional seconds (N/D)
 .br
 .TP
-.B \-par tkID=PAR (string)
+.B \-par tkID=PAR
 .br
 set visual track pixel aspect ratio. PAR is:
 .br
@@ -242,7 +238,7 @@
 * force: force 1:1 PAR in track, do not modify the bitstream
 .br
 .TP
-.B \-clap tkID=CLAP (string)
+.B \-clap tkID=CLAP
 .br
 set visual track clean aperture. CLAP is Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd or none
 .br
@@ -253,53 +249,29 @@
 
 .br
 .TP
-.B \-mx tkID=MX (string)
-.br
-set track matrix, with MX is M1:M2:M3:M4:M5:M6:M7:M8:M9 in 16.16 fixed point intergers or hexa
-.br
-.TP
-.B \-name tkID=NAME (string)
-.br
-set track handler name to NAME (UTF-8 string)
-.br
-.TP
-.B \-itags tag1[:tag2] (string)
-.br
-set iTunes tags to file, see .I tag-list
-.br
-.TP
-.B \-tag-list
+.B \-mx tkID=MX
 .br
-print the set of supported iTunes tags
+set track matrix, with MX is M1:M2:M3:M4:M5:M6:M7:M8:M9 in 16.16 fixed point integers or hexa
 .br
 .TP
-.B \-split (string)
-.br
-split in files of given max duration
-.br
-.TP
-.B \-split-size,-splits (string)
+.B \-kind tkID=schemeURI=value
 .br
-split in files of given max size (in kb)
+set kind for the track or for all tracks using all=schemeURI=value
 .br
 .TP
-.B \-split-rap,-splitr (string)
+.B \-kind-rem tkID=schemeURI=value
 .br
-split in files at each new RAP
+remove kind if given schemeID for the track or for all tracks with all=schemeURI=value
 .br
 .TP
-.B \-split-chunk,-splitx VAL (string)
-.br
-extract a new file from source. VAL can be formated as:
-.br
-* `S:E`: S (number of seconds) to E with E a number (in seconds), end or end-N, N number of seconds before the end
+.B \-name tkID=NAME
 .br
-* `S-E`: start and end dates, each formatted as HH:MM:SS.ms or MM:SS.ms
+set track handler name to NAME (UTF-8 string)
 .br
 .TP
-.B \-splitz S:E (string)
+.B \-itags (string)
 .br
-same as -split-chunk, but adjust the end time to be before the last RAP sample
+set iTunes tags to file, see -h tags
 .br
 .TP
 .B \-group-add (string)
@@ -330,31 +302,23 @@
 .br
 remove the track's group
 .br
-
-.br
 .TP
 .B \-group-clean
 .br
 remove all group information from all tracks
 .br
-
-.br
 .TP
-.B \-ref id:XXXX:refID (string)
+.B \-ref id:XXXX:refID
 .br
 add a reference of type 4CC from track ID to track refID
 .br
-
-.br
 .TP
 .B \-keep-utc
 .br
 keep UTC timing in the file after edit
 .br
-
-.br
 .TP
-.B \-udta tkID:[OPTS] (string)
+.B \-udta tkID:[OPTS]
 .br
 set udta for given track or movie if tkID is 0. OPTS is a colon separated list of:
 .br
@@ -368,38 +332,85 @@
 .br
 * src=base64,DATA: base64 encoded udta data (will be stored in a single box of type CODE)
 .br
+* str=STRING: use the given string as payload for the udta box
+.br
 Note: If no source is set, UDTA of type CODE will be removed
 .br
 
 .br
 .TP
-.B \-patch [tkID=]FILE (string)
+.B \-patch [tkID=]FILE
 .br
 apply box patch described in FILE, for given trackID if set
 .br
-
-.br
 .TP
 .B \-bo
 .br
 freeze the order of boxes in input file
 .br
-
-.br
 .TP
 .B \-init-seg (string)
 .br
 use the given file as an init segment for dumping or for encryption
 .br
-
-.br
 .TP
 .B \-zmov
 .br
 compress movie box according to ISOBMFF box compression
 .br
+.TP
+.B \-xmov
+.br
+same as zmov and wraps ftyp in otyp
+.br
+.TP
+.B \-edits tkID=EDITS
+.br
+set edit list. The following syntax is used (no separators between entries):
+.br
+ * `r`: removes all edits
+.br
+ * `eSTART`: add empty edit with given start time. START can be
+.br
+ - VAL: start time in seconds (int, double, fraction), media duration used as edit duration
+.br
+ - VAL-DUR: start time and duration in seconds (int, double, fraction)
+.br
+ * `eSTART,MEDIA[,RATE]`: add regular edit with given start, media start time in seconds (int, double, fraction) and rate (fraction or INT)
+.br
+ * Examples: 
+.br
+ - re0-5e5-3,4: remove edits, add empty edit at 0s for 5s, then add regular edit at 5s for 3s starting at 4s in media track
+.br
+ - re0-4,0,0.5: remove edits, add single edit at 0s for 4s starting at 0s in media track and playing at speed 0.5
+.br
 
 .br
+.TP
+.B \-moovpad (int)
+.br
+specify amount of padding to keep after moov box for later inplace editing - if 0, moov padding is disabled
+.br
+.TP
+.B \-no-inplace
+.br
+disable inplace rewrite
+.br
+.TP
+.B \-hdr (string)
+.br
+update HDR information based on given XML, 'none' removes HDR info
+.br
+.TP
+.B \-time [tkID=]DAY/MONTH/YEAR-H:M:S
+.br
+set movie or track creation time
+.br
+.TP
+.B \-mtime tkID=DAY/MONTH/YEAR-H:M:S
+.br
+set media creation time
+.br
 .SH Extracting Options
 .LP
 .br
@@ -417,7 +428,7 @@
 .TP
 .B \-raws (string)
 .br
-extract each sample of the given track to a file. Use tkID:Nto extract the Nth sample
+extract each sample of the given track to a file. Use tkID:N to extract the Nth sample
 .br
 .TP
 .B \-nhnt (int)
@@ -445,29 +456,24 @@
 extract given track as raw media in experimental XML streaming instructions
 .br
 .TP
-.B \-avi (int)
+.B \-mux (string)
 .br
-extract given track to an avi file
+multiplex input file to given destination
 .br
 .TP
-.B \-avi (int)
+.B \-qcp (int)
 .br
 same as .I raw but defaults to QCP file for EVRC/SMV
 .br
 .TP
-.B \-aviraw (string, values: video|audio)
-.br
-extract AVI track in raw format; parameter can be video, audioor audioN
-.br
-.TP
 .B \-saf
 .br
-remux file to SAF multiplex
+multiplex input file to SAF multiplex
 .br
 .TP
 .B \-dvbhdemux
 .br
-demux DVB-H file into IP Datagrams sent on the network
+demultiplex DVB-H file into IP Datagrams sent on the network
 .br
 .TP
 .B \-raw-layer (int)
@@ -479,6 +485,13 @@
 .br
 extract file IOD in raw format
 .br
+.TP
+.B \-mpd (string)
+.br
+convert given HLS or smooth manifest (local or remote http) to MPD. 
+.br
+Warning: This is not compatible with other DASH options and does not convert associated segments
+.br
 .SH DASH Options
 .LP
 .br
@@ -486,7 +499,7 @@
 .br
 - the dasher `gpac -h dash` filter documentation
 .br
-- [[online DASH Intro doc|DASH Introduction]].
+- [[DASH wiki|DASH-intro]].
 .br
 
 .br
@@ -503,9 +516,9 @@
 .br
 * #audio: only use the first audio track from the source file
 .br
-* :id=NAME: set the representation ID to NAME. Reserved value NULL disables representation ID for multiplexed inputs
+* :id=NAME: set the representation ID to NAME. Reserved value NULL disables representation ID for multiplexed inputs. If not set, a default value is computed and all selected tracks from the source will be in the same output multiplex.
 .br
-* :dur=VALUE: process VALUE seconds from the media. If VALUE is longer than media duration, last sample duration is extended.
+* :dur=VALUE: process VALUE seconds (fraction) from the media. If VALUE is longer than media duration, last sample duration is extended.
 .br
 * :period=NAME: set the representation's period to NAME. Multiple periods may be used. Periods appear in the MPD in the same order as specified with this option
 .br
@@ -515,9 +528,9 @@
 .br
 * :bandwidth=VALUE: set the representation's bandwidth to a given value
 .br
-* :pdur=VALUE: increase the duration of this period by the given duration in seconds (alias for period_duration:VALUE). This is only used when no input media is specified (remote period insertion), eg :period=X:xlink=Z:pdur=Y
+* :pdur=VALUE: sets the duration of the associated period to VALUE seconds (fraction) (alias for period_duration:VALUE). This is only used when no input media is specified (remote period insertion), e.g. :period=X:xlink=Z:pdur=Y
 .br
-* :duration=VALUE: override target DASH segment duration for this input
+* :ddur=VALUE: override target DASH segment duration to VALUE seconds (fraction) for this input (alias for duration:VALUE)
 .br
 * :xlink=VALUE: set the xlink value for the period containing this element. Only the xlink declared on the first rep of a period will be used
 .br
@@ -537,33 +550,46 @@
 .br
 * :trackID=N: only use the track ID N from the source file
 .br
-* @@f1[:args][@@fN:args]: set a filter chain to insert between the source and the dasher. Each filter in the chain is formatted as a regular filter, see filter doc `gpac -h doc`. If several filters are set, they will be chained in the given order.
+* @f1[:args][@fN:args][@@fK:args]: set a filter chain to insert between the source and the dasher. Each filter in the chain is formatted as a regular filter, see filter doc `gpac -h doc`. If several filters are set:
+.br
+ - they will be chained in the given order if separated by a single @
+.br
+ - a new filter chain will be created if separated by a double @@. In this case, no representation ID is assigned to the source.
+.br
+Example
+.br
+source.mp4:@c=avc:b=1M@@c=avc:b=500k
 .br
 
 .br
-Note: @@f must be placed after all other options.
+This will load a filter chain with two encoders connected to the source and to the dasher.
+.br
+Example
+.br
+source.mp4:@c=avc:b=1M@c=avc:b=500k
 .br
 
 .br
-.SH Options
-.LP
+This will load a filter chain with the second encoder connected to the output of the first (!!).
 .br
-.TP
-.B \-mpd (string)
+
 .br
-convert given HLS or smooth manifest (local or remote http) to MPD. 
+Note: @f must be placed after all other options.
 .br
-Warning: This is not compatible with other DASH options and does not convert associated segments
+
+.br
+.SH Options
+.LP
 .br
 .TP
-.B \-dash,--dash-strict (number)
+.B \-dash (number)
 .br
 create DASH from input files with given segment (subsegment for onDemand profile) duration in ms
 .br
 .TP
 .B \-dash-live (number)
 .br
-generate a live DASH session using the given segment duration in ms; using -dash-live=Fwill also write the live context to F. MP4Box will run the live session until q is pressed or a fatal error occurs
+generate a live DASH session using the given segment duration in ms; using -dash-live=F will also write the live context to F. MP4Box will run the live session until q is pressed or a fatal error occurs
 .br
 .TP
 .B \-ddbg-live (number)
@@ -581,14 +607,9 @@
 specify the output MPD file name
 .br
 .TP
-.B \-tmp (string)
+.B \-profile,-dash-profile (string)
 .br
-specify directory for temporary file creation
-.br
-.TP
-.B \-profile (string, values: onDemand|live|main|simple|full|hbbtv1.5:live|dashavc264:live|dashavc264:onDemand)
-.br
-specify the target DASH profile, and set default options to ensure conformance to the desired profile. Default profile is full in static mode, live in dynamic mode
+specify the target DASH profile, and set default options to ensure conformance to the desired profile. Default profile is full in static mode, live in dynamic mode (old syntax using :live instead of .live as separator still possible). Defined values are onDemand, live, main, simple, full, hbbtv1.5.live, dashavc264.live, dashavc264.onDemand, dashif.ll
 .br
 .TP
 .B \-profile-ext (string)
@@ -644,9 +665,9 @@
 use SegmentTimeline when generating segments
 .br
 .TP
-.B \-segment-marker MARK (string)
+.B \-segment-marker (string)
 .br
-add a box of type MARK (4CC) at the end of each DASH segment
+add a box of given type (4CC) at the end of each DASH segment
 .br
 .TP
 .B \-insert-utc
@@ -691,12 +712,12 @@
 use dynamic MPD type instead of static
 .br
 .TP
-.B \-last-dynamic (string)
+.B \-last-dynamic
 .br
 same as .I dynamic but close the period (insert lmsg brand if needed and update duration)
 .br
 .TP
-.B \-mpd-duration (number, default: 0)
+.B \-mpd-duration (number)
 .br
 set the duration in second of a live session (if 0, you must use .I mpd-refresh)
 .br
@@ -706,12 +727,12 @@
 specify MPD update time in seconds
 .br
 .TP
-.B \-time-shift (number)
+.B \-time-shift (int)
 .br
 specify MPD time shift buffer depth in seconds, -1 to keep all files)
 .br
 .TP
-.B \-subdur (int)
+.B \-subdur (number)
 .br
 specify maximum duration in ms of the input file to be dashed in LIVE or context mode. This does not change the segment duration, but stops dashing once segments produced exceeded the duration. If there is not enough samples to finish a segment, data is looped unless .I no-loop is used which triggers a period end
 .br
@@ -726,14 +747,14 @@
 specify MPD min buffer time in ms
 .br
 .TP
-.B \-ast-offset (int, default: 0)
+.B \-ast-offset (int)
 .br
 specify MPD AvailabilityStartTime offset in ms if positive, or availabilityTimeOffset of each representation if negative
 .br
 .TP
 .B \-dash-scale (int)
 .br
-specify that timing for .I dash and .I frag are expressed in given timexale (units per seconds)
+specify that timing for .I dash, .I dash-live, .I subdur and .I do_frag are expressed in given timescale (units per seconds) rather than ms
 .br
 .TP
 .B \-mem-frags
@@ -741,7 +762,7 @@
 fragmentation happens in memory rather than on disk before flushing to disk
 .br
 .TP
-.B \-pssh (Enum)
+.B \-pssh (int)
 .br
 set pssh store mode
 .br
@@ -766,13 +787,13 @@
 store mvex box after trak boxes within the moov box. If not set, mvex is before
 .br
 .TP
-.B \-sdtp-traf (Enum)
+.B \-sdtp-traf (int)
 .br
 use sdtp box in traf (Smooth-like)
 .br
 * no: do not use sdtp
 .br
-* sdtp: use sdtp box to indicate sample dependencies and don't write info in trun sample flags
+* sdtp: use sdtp box to indicate sample dependencies and do not write info in trun sample flags
 .br
 * both: use sdtp box to indicate sample dependencies and also write info in trun sample flags
 .br
@@ -804,7 +825,7 @@
 segmentation will use the closest frame to the segment boundary (before or after)
 .br
 .TP
-.B \-subsegs-per-sidx (int)
+.B \-subsegs-per-sidx,-frags-per-sidx (int)
 .br
 set the number of subsegments to be written in each SIDX box
 .br
@@ -823,6 +844,11 @@
 use SegmentTemplate instead of explicit sources in segments. Ignored if segments are stored in the output file
 .br
 .TP
+.B \-url-template-sim
+.br
+use SegmentTemplate simulation while converting HLS to MPD
+.br
+.TP
 .B \-daisy-chain
 .br
 use daisy-chain SIDX instead of hierarchical. Ignored if frags/sidx is 0
@@ -850,6 +876,8 @@
 .br
 * no: use one init segment per quality
 .br
+* pps: use out of band VPS,SPS,DCI, inband for PPS,APS and a single init segment
+.br
 * single: to test with single input
 .br
 .TP
@@ -888,7 +916,7 @@
 when using fragments in live mode, flush fragments according to their timing
 .br
 .TP
-.B \-cp-location (string, values: as|rep&#x8;oth)
+.B \-cp-location (string)
 .br
 set ContentProtection element location
 .br
@@ -901,7 +929,7 @@
 .TP
 .B \-start-date (string)
 .br
-for live mode, set start date (as xs:date, eg YYYY-MM-DDTHH:MM:SSZ). Default is current UTC
+for live mode, set start date (as xs:date, e.g. YYYY-MM-DDTHH:MM:SSZ). Default is current UTC
 .br
 Warning: Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size
 .br
@@ -915,6 +943,119 @@
 .br
 throw error if something is wrong while parsing cues or applying cue-based segmentation
 .br
+.TP
+.B \-merge-last-seg
+.br
+merge last segment if shorter than half the target duration
+.br
+ 
+.br
+.SH File splitting
+.LP
+.br
+MP4Box can split input files by size, duration or extract a given part of the file to new IsoMedia file(s).
+.br
+This requires that at most one track in the input file has non random-access points (typically one video track at most).
+.br
+Splitting will ignore all MPEG-4 Systems tracks and hint tracks, but will try to split private media tracks.
+.br
+The input file must have enough random access points in order to be split. If this is not the case, you will have to re-encode the content.
+.br
+You can add media to a file and split it in the same pass. In this case, the destination file (the one which would be obtained without splitting) will not be stored.
+.br
+ 
+.br
+Time ranges are specified as follows:
+.br
+* `S-E`: S start and E end times, formatted as HH:MM:SS.ms, MM:SS.ms or time in seconds (int, double, fraction)
+.br
+* `S:E`: S start time and E end times in seconds (int, double, fraction)
+.br
+* `S:end` or `S:end-N`: S start time in seconds (int, double), N number of seconds (int, double) before the end
+.br
+ 
+.br
+MP4Box splitting runs a filter session using the reframer filter as follows:
+.br
+- splitrange option of the reframer is always set
+.br
+- source is demultiplexed with alltk option set
+.br
+- start and end ranges are passed to xs and xe options of the reframer
+.br
+- for -splitz, options xadjust and xround=after are enforced
+.br
+- for -splitg, options xadjust and xround=before are enforced
+.br
+- for -splitf, option xround=seek is enforced and propbe_refset if not specified at prompt
+.br
+- for -splitx, option xround=closest and propbe_ref are enforced if not specified at prompt
+.br
+ 
+.br
+The default output storage mode is to full interleave and will require a temp file for each output. This behavior can be modified using -flat, -newfs, -inter and -frag.
+.br
+The output file name(s) can be specified using -out and templates (e.g. -out split$num%04d$.mp4 produces split0001.mp4, split0002.mp4, ...).
+.br
+ 
+.br
+.TP
+.B \-split (string)
+.br
+split in files of given max duration (float number) in seconds. A trailing unit can be specified:
+.br
+* `M`, `m`: duration is in minutes
+.br
+* `H`, `h`: size is in hours
+.br
+.TP
+.B \-split-rap,-splitr (string)
+.br
+split in files at each new RAP
+.br
+.TP
+.B \-split-size,-splits (string)
+.br
+split in files of given max size (integer number) in kilobytes. A trailing unit can be specified:
+.br
+* `M`, `m`: size is in megabytes
+.br
+* `G`, `g`: size is in gigabytes
+.br
+.TP
+.B \-split-chunk,-splitx (string)
+.br
+extract the specified time range as follows:
+.br
+- the start time is moved to the RAP sample closest to the specified start time
+.br
+- the end time is kept as requested
+.br
+.TP
+.B \-splitz (string)
+.br
+extract the specified time range so that ranges A:B and B:C share exactly the same boundary B:
+.br
+- the start time is moved to the RAP sample at or after the specified start time
+.br
+- the end time is moved to the frame preceding the RAP sample at or following the specified end time
+.br
+.TP
+.B \-splitg (string)
+.br
+extract the specified time range as follows:
+.br
+- the start time is moved to the RAP sample at or before the specified start time
+.br
+- the end time is moved to the frame preceding the RAP sample at or following the specified end time
+.br
+.TP
+.B \-splitf (string)
+.br
+extract the specified time range and insert edits such that the extracted output is exactly the specified range
+.br
+
+.br
 .SH File Dumping
 .LP
 .br
@@ -927,14 +1068,14 @@
 Options:
 .br
 .TP
-.B \-stdb
+.B \-std
 .br
 dump/write to stdout and assume stdout is opened in binary mode
 .br
 .TP
 .B \-stdb
 .br
-dump/write to stdout and try to reopen stdout in binary mode
+dump/write to stdout and try to reopen stdout in binary mode
 .br
 .TP
 .B \-tracks
@@ -944,7 +1085,7 @@
 .TP
 .B \-info (string)
 .br
-print movie info (no parameter) or track info with specified ID
+print movie info (no parameter) or track extended info with specified ID
 .br
 .TP
 .B \-infon (string)
@@ -952,7 +1093,12 @@
 print track info for given track number, 1 being the first track in the file
 .br
 .TP
-.B \-diso
+.B \-infox
+.br
+print movie and track extended info (same as -info N for each track)
+.br
+.TP
+.B \-diso,-dmp4
 .br
 dump IsoMedia file boxes in XML output
 .br
@@ -992,7 +1138,7 @@
 dump scene to X3D XML format
 .br
 .TP
-.B \-x3dc
+.B \-x3dv
 .br
 dump scene to X3D VRML format
 .br
@@ -1002,6 +1148,11 @@
 dump scene to LASeR XML (XSR) format
 .br
 .TP
+.B \-svg
+.br
+dump scene to SVG
+.br
+.TP
 .B \-drtp
 .br
 dump rtp hint samples structure to XML output
@@ -1019,7 +1170,7 @@
 .TP
 .B \-dtsc
 .br
-same as .I dts but analyse each sample for duplicated dts/cts (slow !)
+same as .I dts but analyses each sample for duplicated dts/cts (slow !)
 .br
 .TP
 .B \-dtsxc
@@ -1069,7 +1220,7 @@
 .TP
 .B \-dsapd (int)
 .br
-same as .I dsap but only print DTS, -dsapp to only print presentation time
+same as .I dsap but only print DTS
 .br
 .TP
 .B \-dsapp (int)
@@ -1082,6 +1233,11 @@
 dump ISMACryp samples structure to XML output
 .br
 .TP
+.B \-dchunk
+.br
+dump chunk info
+.br
+.TP
 .B \-dump-cover
 .br
 extract cover art
@@ -1102,9 +1258,9 @@
 extract chapter file as zoom format
 .br
 .TP
-.B \-dump-udta [tkID:]4cc (string)
+.B \-dump-udta [tkID:]4cc
 .br
-extract udta for the given 4CC. If tkID is given, dumps from UDTA of the given track ID, otherwise moov is used
+extract user data for the given 4CC. If tkID is given, dumps from UDTA of the given track ID, otherwise moov is used
 .br
 .TP
 .B \-mergevtt
@@ -1117,27 +1273,22 @@
 convert input subtitle to GPAC TTXT format if no parameter. Otherwise, dump given text track to GPAC TTXT format
 .br
 .TP
-.B \-srt
+.B \-srt (int)
 .br
 convert input subtitle to SRT format if no parameter. Otherwise, dump given text track to SRT format
 .br
 .TP
-.B \-rip-mpd
-.br
-download manifest and segments of an MPD. Does not work with live sessions
-.br
-.TP
-.B \-stat
+.B \-nstat
 .br
 generate node/field statistics for scene
 .br
 .TP
-.B \-stats
+.B \-nstats
 .br
 generate node/field statistics per Access Unit
 .br
 .TP
-.B \-statx
+.B \-nstatx
 .br
 generate node/field statistics for scene after each AU
 .br
@@ -1149,7 +1300,17 @@
 .TP
 .B \-comp (string)
 .br
-replace with compressed version all top level box types given as parameter, formated as orig_4cc_1=comp_4cc_1[,orig_4cc_2=comp_4cc_2]
+replace with compressed version all top level box types given as parameter, formatted as orig_4cc_1=comp_4cc_1[,orig_4cc_2=comp_4cc_2]
+.br
+.TP
+.B \-topcount (string)
+.br
+print to stdout the number of top-level boxes matching box types given as parameter, formatted as 4cc_1,4cc_2N
+.br
+.TP
+.B \-topsize (string)
+.br
+print to stdout the number of bytes of top-level boxes matching types given as parameter, formatted as 4cc_1,4cc_2N or all for all boxes
 .br
 .TP
 .B \-bin
@@ -1157,14 +1318,34 @@
 convert input XML file using NHML bitstream syntax to binary
 .br
 .TP
-.B \-topcount (string)
+.B \-mpd-rip
 .br
-print to stdout the number of top-level boxes matching box types given as parameter, formated as 4cc_1,4cc_2N
+fetch MPD and segment to disk
 .br
 .TP
-.B \-topsize (string)
+.B \-udp-write (string, default: IP[:port])
+.br
+write input name to UDP (default port 2345)
+.br
+.TP
+.B \-raw-cat (string)
+.br
+raw concatenation of given file with input file
 .br
-print to stdout the number of bytes of top-level boxes matching types given as parameter, formated as 4cc_1,4cc_2N or all for all boxes
+.TP
+.B \-wget (string)
+.br
+fetch resource from http(s) URL
+.br
+.TP
+.B \-dm2ts
+.br
+dump timing of an input MPEG-2 TS stream sample timing
+.br
+.TP
+.B \-check-xml
+.br
+check XML output format for -dnal*, -diso* and -dxml options
 .br
 .SH Importing Options
 .LP
@@ -1172,7 +1353,7 @@
 .SH File importing
 .LP
 .br
-Syntax is .I add / .I cat filename[#FRAGMENT][:opt1...:optN=val]
+Syntax is .I add / .I cat URL[#FRAGMENT][:opt1...:optN=val]
 .br
 This process will create the destination file if not existing, and add the track(s) to it. If you wish to always create a new destination file, add .I -new.
 .br
@@ -1180,7 +1361,7 @@
 .br
 
 .br
-To select a desired media track from a source, a fragment identifier '#' can be specified, bfore any other options. The following syntax is used:
+To select a desired media track from a source, a fragment identifier '#' can be specified, before any other options. The following syntax is used:
 .br
 * `#video`: adds the first video track found in source
 .br
@@ -1204,32 +1385,62 @@
 .br
 
 .br
-If you wish to create an interleaved new file with no temporary storage, use the .I -newfs option. The interleaving might not be as precise as when using .I new since it is dependent on muxer input scheduling (each execution might lead to a slightly different result). Additionally in this mode: 
+If you wish to create an interleaved new file with no temporary storage, use the .I -newfs option. The interleaving might not be as precise as when using .I new since it is dependent on multiplexer input scheduling (each execution might lead to a slightly different result). Additionally in this mode: 
+.br
+ - Some multiplexing options (marked with X below) will be activated for all inputs (e.g. it is not possible to import one AVC track with xps_inband and another without).
 .br
- - Some muxing options (marked with X below) will be activated for all inputs (e.g it is not possible to import one AVC track with xps_inband and another without).
+ - Some multiplexing options (marked as D below) cannot be used as they require temporary storage for file edition.
 .br
- - Some muxing options (marked as D below) cannot be used as they require temporary storage for file edition.
+ - Usage of .I cat is possible, but concatenated sources will not be interleaved in the output. If you wish to perform more complex cat/add operations without temp file, use a playlist.
+.br
+ 
+.br
+Source URL can be any URL supported by GPAC, not limited to local files.
+.br
+ 
 .br
- - Usage of .I cat is possible, but concatenated sources will not be interleaved in the output. If you wish to perforom more complex cat/add operations without temp file, use the gpac application.
+Note: When importing SRT or SUB files, MP4Box will choose default layout options to make the subtitle appear at the bottom of the video. You SHOULD NOT import such files before any video track is added to the destination file, otherwise the results will likely not be useful (default SRT/SUB importing uses default serif font, fontSize 18 and display size 400x60). For more details, check TTXT doc.
 .br
 
 .br
-Note: MP4Box cannot start importing from a random point in the input, it always import from the begining. If you wish to import from another point in the source, use the gpac application.
+When importing several tracks/sources in one pass, all options will be applied if relevant to each source. These options are set for all imported streams. If you need to specify these options per stream, set per-file options using the syntax -add stream[:opt1:...:optN].
+.br
+ 
+.br
+The import file name may be set to empty or self, indicating that the import options should be applied to the destination file track(s).
+.br
+Example
+.br
+-add self:moovts=-1:noedit src.mp4
+.br
+
+.br
+This will apply moovts and noedit option to all tracks in src.mp4
+.br
+Example
+.br
+-add self#2:moovts=-1:noedit src.mp4
+.br
+
+.br
+This will apply moovts and noedit option to track with ID=2 in src.mp4
+.br
+Only per-file options marked with a S are possible in this mode.
 .br
 
 .br
-Note: When importing SRT or SUB files, MP4Box will choose default layout options to make the subtitle appear at the bottom of the video. You SHOULD NOT import such files before any video track is added to the destination file, otherwise the results will likelly not be useful (default SRT/SUB importing uses default serif font, fontSize 18 and display size 400x60). For more details, check TTXT doc.
+When importing an ISOBMFF/QT file, only options marked as C or S can be used.
 .br
 
 .br
-When importing several tracks/sources in one pass, all options will be applied if relevant to each source. These options are set for all imported streams. If you need to specify these options par stream, set per-file options using the syntax -add stream[:opt1:...:optN]. Allowed per-file options:
+Allowed per-file options:
 .br
 
 .br
 .TP
 .B dur (int)
 .br
-X import only the specified duration from the media. Value can be:
+XC import only the specified duration from the media. Value can be:
 .br
 * positive float: specifies duration in seconds
 .br
@@ -1238,34 +1449,39 @@
 * negative integer: specifies duration in number of coded frames
 .br
 .TP
+.B start (number)
+.br
+C target start time in source media, may not be supported depending on the source
+.br
+.TP
 .B lang (string)
 .br
-set imported media language code
+S set imported media language code
 .br
 .TP
 .B delay (int)
 .br
-set imported media initial delay in ms
+S set imported media initial delay (>0) or initial skip (<0) in ms or as fractional seconds (N/D)
 .br
 .TP
 .B par (string)
 .br
-set visual pixel aspect ratio (see .I -par )
+S set visual pixel aspect ratio (see .I -par )
 .br
 .TP
 .B clap (string)
 .br
-set visual clean aperture (see .I -clap )
+S set visual clean aperture (see .I -clap )
 .br
 .TP
 .B mx (string)
 .br
-set track matrix (see .I -mx )
+S set track matrix (see .I -mx )
 .br
 .TP
 .B name (string)
 .br
-set track handler name
+S set track handler name
 .br
 .TP
 .B ext (string)
@@ -1275,17 +1491,27 @@
 .TP
 .B hdlr (string)
 .br
-set track handler type to the given code point (4CC)
+S set track handler type to the given code point (4CC)
+.br
+.TP
+.B stype (string)
+.br
+S force sample description type to given code point (4CC), may likely break the file
+.br
+.TP
+.B tkhd (int)
+.br
+S set track header flags has hex integer or as comma-separated list of enable, movie, preview, size_ar keywords (use tkhd+=FLAGS to add and tkhd-=FLAGS to remove)
 .br
 .TP
 .B disable
 .br
-disable imported track(s)
+S disable imported track(s), use disable=no to force enabling a disabled track
 .br
 .TP
 .B group (int)
 .br
-add the track as part of the G alternate group. If G is 0, the first available GroupID will be picked
+S add the track as part of the G alternate group. If G is 0, the first available GroupID will be picked
 .br
 .TP
 .B fps (string)
@@ -1295,12 +1521,12 @@
 .TP
 .B rap
 .br
-D import only RAP samples
+DS import only RAP samples
 .br
 .TP
 .B refs
 .br
-D import only reference pictures
+DS import only reference pictures
 .br
 .TP
 .B trailing
@@ -1315,12 +1541,12 @@
 .TP
 .B dref
 .br
-X same as .I dref
+XC same as .I dref
 .br
 .TP
 .B keep_refs
 .br
-keep track reference when importing a single track
+C keep track reference when importing a single track
 .br
 .TP
 .B nodrop
@@ -1360,7 +1586,7 @@
 .TP
 .B asemode (string)
 .br
-X set the mode to create the AudioSampleEntry. Value can be:
+XS set the mode to create the AudioSampleEntry. Value can be:
 .br
 * v0-bs: use MPEG AudioSampleEntry v0 and the channel count from the bitstream (even if greater than 2) - default
 .br
@@ -1373,7 +1599,17 @@
 .TP
 .B audio_roll (int)
 .br
-add a roll sample group with roll_distance N
+S add a roll sample group with roll_distance N for audio tracks
+.br
+.TP
+.B roll (int)
+.br
+S add a roll sample group with roll_distance N
+.br
+.TP
+.B proll (int)
+.br
+S add a preroll sample group with roll_distance N
 .br
 .TP
 .B mpeg4
@@ -1398,7 +1634,7 @@
 .TP
 .B svcmode (string)
 .br
-D set SVC/LHVC import mode. Value can be:
+DS set SVC/LHVC import mode. Value can be:
 .br
 * split: each layer is in its own track
 .br
@@ -1413,7 +1649,7 @@
 .TP
 .B temporal (string)
 .br
-D set HEVC/LHVC temporal sublayer import mode. Value can be:
+DS set HEVC/LHVC temporal sublayer import mode. Value can be:
 .br
 * split: each sublayer is in its own track
 .br
@@ -1434,24 +1670,24 @@
 .TP
 .B ccst
 .br
-add default HEIF ccst box to visual sample entry
+S add default HEIF ccst box to visual sample entry
 .br
 .TP
 .B forcesync
 .br
-force non IDR samples with I slices to be marked as sync points (AVC GDR)
+force non IDR samples with I slices (OpenGOP or GDR) to be marked as sync points
 .br
 Warning: RESULTING FILE IS NOT COMPLIANT WITH THE SPEC but will fix seeking in most players
 .br
 .TP
 .B xps_inband
 .br
-X set xPS inband for AVC/H264 and HEVC (for reverse operation, re-import from raw media)
+XC set xPS inband for AVC/H264 and HEVC (for reverse operation, re-import from raw media)
 .br
 .TP
 .B xps_inbandx
 .br
-X same as xps_inband and also keep first xPS in sample desciption
+XC same as xps_inband and also keep first xPS in sample description
 .br
 .TP
 .B au_delim
@@ -1471,83 +1707,87 @@
 .TP
 .B tiles
 .br
-add HEVC tiles signaling and NALU maps without splitting the tiles into different tile tracks
+S add HEVC tiles signaling and NALU maps without splitting the tiles into different tile tracks
 .br
 .TP
 .B split_tiles
 .br
-D split HEVC tiles into different tile tracks, one tile (or all tiles of one slice) per track
+DS split HEVC tiles into different tile tracks, one tile (or all tiles of one slice) per track
 .br
 .TP
 .B negctts
 .br
-use negative CTS-DTS offsets (ISO4 brand)
+S use negative CTS-DTS offsets (ISO4 brand). Use negctts=no to force using positive offset on existing track
 .br
 .TP
 .B chap
 .br
-specify the track is a chapter track
+S specify the track is a chapter track
 .br
 .TP
 .B chapter (string)
 .br
-add a single chapter (old nero format) with given name lasting the entire file
+S add a single chapter (old nero format) with given name lasting the entire file
 .br
 .TP
 .B chapfile (string)
 .br
-add a chapter file (old nero format)
+S add a chapter file (old nero format)
 .br
 .TP
 .B layout (string)
 .br
-specify the track layout as WxHxXxY
+S specify the track layout as WxH[xXxY][xLAYER]. If W (resp H) is 0, the max width (resp height) of the tracks in the file are used
 .br
- * if W (resp H) = 0: the max width (resp height) of the tracks in the file are used
+.TP
+.B rescale (int)
 .br
- * if Y=-1: the layout is moved to the bottom of the track area
-.br
- * X and Y can be omitted: :layout=WxH
+S force media timescale to TS (int or fraction) and change the media duration
 .br
 .TP
-.B rescale (int)
+.B sampdur (int)
 .br
-force media timescale to TS !! changes the media duration
+S force all samples duration (D) or sample durations and media timescale (D/TS), used to patch CFR files with broken timings
 .br
 .TP
 .B timescale (int)
 .br
-set imported media timescale to TS
+S set imported media timescale to TS
 .br
 .TP
 .B moovts (int)
 .br
-set movie timescale to TS. A negative value picks the media timescale of the first track imported
+S set movie timescale to TS. A negative value picks the media timescale of the first track imported
 .br
 .TP
 .B noedit
 .br
-X do not set edit list when importing B-frames video tracks
+XS do not set edit list when importing B-frames video tracks
 .br
 .TP
 .B rvc (string)
 .br
-set RVC configuration for the media
+S set RVC configuration for the media
 .br
 .TP
 .B fmt (string)
 .br
-override format detection with given format (cf BT/XMTA doc)
+override format detection with given format - disable data probing and force ext option on source
 .br
 .TP
 .B profile (int)
 .br
-override AVC profile
+S override AVC profile. Integer value, or high444, high, extended, main, baseline
 .br
 .TP
 .B level (int)
 .br
-override AVC level
+S override AVC level, if value < 6, interpreted as decimal expression
+.br
+.TP
+.B compat (int)
+.br
+S force the profile compatibility flags for the H.264 content
 .br
 .TP
 .B novpsext
@@ -1638,7 +1878,7 @@
 .TP
 .B kind (string)
 .br
-set kind for the track as schemeURI=value
+S set kind for the track as schemeURI=value
 .br
 .TP
 .B txtflags (int)
@@ -1653,7 +1893,7 @@
 .TP
 .B stz2
 .br
-use compact size table (for low-bitrates)
+S use compact size table (for low-bitrates)
 .br
 .TP
 .B bitdepth (int)
@@ -1663,25 +1903,65 @@
 .TP
 .B colr (string)
 .br
-set color profile for imported video content (see ISO/IEC 23001-8). Value is formatted as:
+S set color profile for imported video content (see ISO/IEC 23001-8). Value is formatted as:
 .br
- * nclc,p,t,m: with p colour primary, t transfer characteristics and m matrix coef
+ * nclc,p,t,m: with p colour primary (int or string), t transfer characteristics (int or string) and m matrix coef (int or string)
 .br
- * nclx,p,t,m,r: same as nclx with r full range flag
+ * nclx,p,t,m,r: same as nclx with r full range flag (yes, on or no, off)
 .br
 * prof,path: with path indicating the file containing the ICC color profile
 .br
 * rICC,path: with path indicating the file containing the restricted ICC color profile
 .br
+ * 'none': removes color info
+.br
 .TP
-.B dv-profile (int)
+.B hdr (string)
 .br
-set the Dolby Vision profile
+S set HDR info on track (see .I -hdr ), 'none' removes HDR info
+.br
+.TP
+.B dv-profile (string)
+.br
+S set the Dolby Vision profile on imported track
+.br
+- Profile is an integer, or none to remove DV signaling
+.br
+- Profile can be suffixed with compatibility ID, e.g. 5.hdr10
+.br
+- Allowed compatibility ID are none, hdr10, bt709, hlg709, hlg2100, bt2020, brd, or integer value as per DV spec
+.br
+- Profile can be prefixed with 'f' to force DV codec type signaling, e.g. f8.2
+.br
+.TP
+.B fullrange (string)
+.br
+S force the video fullrange type in VUI for the AVC|H264 content (value yes, on or no, off)
+.br
+.TP
+.B videofmt (string)
+.br
+S force the video format in VUI for AVC|H264 and HEVC content, value can be component, pal, ntsc, secam, mac, undef
+.br
+.TP
+.B colorprim (string)
+.br
+S force the colour primaries in VUI for AVC|H264 and HEVC (int or string, cf -h cicp)
+.br
+.TP
+.B colortfc (string)
+.br
+S force transfer characteristics in VUI for AVC|H264 and HEVC (int or string, cf -h cicp)
+.br
+.TP
+.B colormx (string)
+.br
+S force the matrix coefficients in VUI for the AVC|H264 and HEVC content (int or string, cf -h cicp)
 .br
 .TP
 .B tc (string)
 .br
-inject a single QT timecode. Value is formated as:
+S inject a single QT timecode. Value is formatted as:
 .br
 * [d]FPS[/FPS_den],h,m,s,f[,framespertick]: optional drop flag, framerate (integer or fractional), hours, minutes, seconds and frame number
 .br
@@ -1690,9 +1970,14 @@
 * : the framespertick is optional and defaults to round(framerate); it indicates the number of frames per counter tick
 .br
 .TP
+.B edits (string)
+.br
+S override edit list, same syntax as .I edits
+.br
+.TP
 .B lastsampdur (string)
 .br
-set duration of the last sample. Value is formated as:
+S set duration of the last sample. Value is formatted as:
 .br
 * no value: use the previous sample duration
 .br
@@ -1701,14 +1986,25 @@
 * N/D: indicate the duration as fractional second
 .br
 .TP
-.B fstat
+.B ID (int)
+.br
+S set target ID
+.br
+ - a value of 0 (default) will try to keep source track ID
+.br
+ - a value of -1 will ignore source track ID
+.br
+ - other value will try to set track ID to this value if no other track with same ID is present
+.br
+.TP
+.B stats,-fstat
 .br
-print filter session stats after import
+C print filter session stats after import
 .br
 .TP
-.B fgraph
+.B graph,-fgraph
 .br
-print filter session graph after import
+C print filter session graph after import
 .br
 .TP
 .B sopt:[OPTS]
@@ -1721,13 +2017,13 @@
 X set OPTS as additional arguments to destination filter. OPTS can be any usual filter argument, see filter doc `gpac -h doc`
 .br
 .TP
-.B @@f1[:args][@@fN:args]
+.B @f1[:args][@fN:args]
 .br
-set a filter chain to insert before the muxer. Each filter in the chain is formatted as a regular filter, see filter doc `gpac -h doc`. If several filters are set, they will be chained in the given order. The last filter shall not have any Filter ID specified
+set a filter chain to insert before the multiplexer. Each filter in the chain is formatted as a regular filter, see filter doc `gpac -h doc`. A @@ separator starts a new chain (see DASH help). The last filter in each chain shall not have any ID specified
 .br
 
 .br
-Note: sopt, dopt and @@f must be placed after all other options.
+Note: sopt, dopt and @f must be placed after all other options.
 .br
 .SH Global import options
 .LP
@@ -1735,12 +2031,12 @@
 .TP
 .B \-add (string)
 .br
-add given file tracks to file. Multiple inputs can be specified using +, eg -add url1+url2
+add given file tracks to file. Multiple inputs can be specified using +, e.g. -add url1+url2
 .br
 .TP
 .B \-cat (string)
 .br
-concatenate given file samples to file, creating tracks if needed. Multiple inputs can be specified using +(eg -cat url1+url2). 
+concatenate given file samples to file, creating tracks if needed. Multiple inputs can be specified using +, e.g/ -cat url1+url2. 
 .br
 Note: This aligns initial timestamp of the file to be concatenated
 .br
@@ -1757,12 +2053,12 @@
 Note: Each listed file is concatenated as if called with -cat
 .br
 .TP
-.B \-unalign-cat (string)
+.B \-unalign-cat
 .br
-do not attempt to align timestamps of samples inbetween tracks
+do not attempt to align timestamps of samples in-between tracks
 .br
 .TP
-.B \-force-cat (string)
+.B \-force-cat
 .br
 skip media configuration check when concatenating file. 
 .br
@@ -1776,12 +2072,12 @@
 .TP
 .B \-dref
 .br
-keep media data in original file using data referencing. The resulting file only contains the meta-data of the presentation (frame sizes, timing, etc...) and references media data in the original file. This is extremely useful when developping content, since importing and storage of the MP4 file is much faster and the resulting file much smaller. 
+keep media data in original file using data referencing. The resulting file only contains the meta-data of the presentation (frame sizes, timing, etc...) and references media data in the original file. This is extremely useful when developing content, since importing and storage of the MP4 file is much faster and the resulting file much smaller. 
 .br
-Note: Data referencing may fail on some files because it requires the framed data (eg an IsoMedia sample) to be continuous in the original file, which is not always the case depending on the original interleaving or bitstream format (AVC or HEVC cannot use this option)
+Note: Data referencing may fail on some files because it requires the framed data (e.g. an IsoMedia sample) to be continuous in the original file, which is not always the case depending on the original interleaving or bitstream format (AVC or HEVC cannot use this option)
 .br
 .TP
-.B \-no-drop
+.B \-no-drop,-nodrop
 .br
 force constant FPS when importing AVI video
 .br
@@ -1816,9 +2112,9 @@
 oversample SBR import (SBR AAC, PS AAC and oversampled SBR cannot be detected at import time)
 .br
 .TP
-.B \-fps (string, default: 25)
+.B \-fps (string)
 .br
-force frame rate for video and SUB subtitles import to the given value, expressed as a number or as timescale-increment. 
+force frame rate for video and SUB subtitles import to the given value, expressed as a number, as TS-inc or TS/inc. 
 .br
 Note: For raw H263 import, default FPS is 15, otherwise 25. This is ignored for ISOBMFF import, use :rescale option for that
 .br
@@ -1861,7 +2157,7 @@
 copy media data to hint track rather than reference (speeds up server but takes much more space)
 .br
 .TP
-.B \-multi [maxptime] (int)
+.B \-multi [maxptime]
 .br
 enable frame concatenation in RTP packets if possible (with max duration 100 ms or maxptime ms if given)
 .br
@@ -1888,7 +2184,7 @@
 .TP
 .B \-add-sdp (string)
 .br
-add given SDP string to hint track (tkID:string) or movie (string)
+add given SDP string to movie (string) or track (tkID:string), tkID being the track ID or the hint track ID
 .br
 .TP
 .B \-no-offset
@@ -1938,9 +2234,7 @@
 .SH MPEG-4 Scene Encoding Options
 .LP
 .br
-.P
-.B
-General considerations
+.SS General considerations
 .br
 MP4Box supports encoding and decoding of of BT, XMT, VRML and (partially) X3D formats int MPEG-4 BIFS, and encoding and decoding of XSR and SVG into MPEG-4 LASeR
 .br
@@ -1948,13 +2242,11 @@
 .br
 See https://wiki.gpac.io/MPEG-4-BIFS-Textual-Format and related pages.
 .br
-.P
-.B
-Scene Random Access
+.SS Scene Random Access
 .br
 MP4Box can encode BIFS or LASeR streams and insert random access points at a given frequency. This is useful when packaging content for broadcast, where users will not turn in the scene at the same time. In MPEG-4 terminology, this is called the scene carousel.## BIFS Chunk Processing
 .br
-The BIFS chunk encoding mode alows encoding single BIFS access units from an initial context and a set of commands.
+The BIFS chunk encoding mode allows encoding single BIFS access units from an initial context and a set of commands.
 .br
 The generated AUs are raw BIFS (not SL-packetized), in files called FILE-ESID-AUIDX.bifs, with FILE the basename of the input file.
 .br
@@ -1969,7 +2261,7 @@
 .TP
 .B \-mp4
 .br
-specify input file is for encoding
+specify input file is for BIFS/LASeR encoding
 .br
 .TP
 .B \-def
@@ -1979,12 +2271,17 @@
 .TP
 .B \-sync (int)
 .br
-force BIFS sync sample generation every given time in ms (cannot be used with .I shadow )
+force BIFS sync sample generation every given time in ms (cannot be used with .I shadow or .I carousel )
 .br
 .TP
 .B \-shadow (int)
 .br
-force BIFS sync shadow sample generation every given time in ms (cannot be used with .I sync )
+force BIFS sync shadow sample generation every given time in ms (cannot be used with .I sync or .I carousel )
+.br
+.TP
+.B \-carousel (int)
+.br
+use BIFS carousel (cannot be used with .I sync or .I shadow )
 .br
 .TP
 .B \-sclog
@@ -2009,7 +2306,7 @@
 .TP
 .B \-resolution (int)
 .br
-resolution factor (-8 to 7, default 0) for LASeR encoding, and all coords are multiplied by 2^res before truncation (LASeR encoding)
+resolution factor (-8 to 7, default 0) for LASeR encoding, and all coordinates are multiplied by 2^res before truncation (LASeR encoding)
 .br
 .TP
 .B \-coord-bits (int)
@@ -2024,7 +2321,12 @@
 .TP
 .B \-auto-quant (int)
 .br
-resolution is given as if using -resolution but coord-bits and scale-bits are infered (LASeR encoding)
+resolution is given as if using .I resolution but coord-bits and scale-bits are inferred (LASeR encoding)
+.br
+.TP
+.B \-global-quant (int)
+.br
+resolution is given as if using .I resolution but the res is inferred (BIFS encoding)
 .br
 .SH Encryption/Decryption Options
 .LP
@@ -2033,6 +2335,8 @@
 .br
 It requires a specific XML file called CryptFile, whose syntax is available at https://wiki.gpac.io/Common-Encryption
 .br
+Image files (HEIF) can also be crypted / decrypted, using CENC only.
+.br
 
 .br
 Options:
@@ -2048,9 +2352,9 @@
 decrypt the input file, potentially using the given CryptFile. If CryptFile is not given, will fail if the key management system is not supported
 .br
 .TP
-.B \-set-kms (string)
+.B \-set-kms tkID=kms_uri
 .br
-change ISMA/OMA KMS location for all tracks, or for a given one if ID=kms_uri is used
+change ISMA/OMA KMS location for a given track or for all tracks if all= is used
 .br
 .SH Meta and HEIF Options
 .LP
@@ -2059,12 +2363,12 @@
 .br
 
 .br
-These information can be stored at the file root level, as is the case for HEIF/IFF and MPEG-21 file formats, or at the moovie or track level for a regular movie. 
+These information can be stored at the file root level, as is the case for HEIF/IFF and MPEG-21 file formats, or at the movie or track level for a regular movie. 
 .br
 
 .br
 .TP
-.B \-set-meta ABCD[:tk=tkID] (string)
+.B \-set-meta ABCD[:tk=tkID]
 .br
 set meta box type, with ABCD the four char meta type (NULL or 0 to remove meta)
 .br
@@ -2075,7 +2379,7 @@
 * tkID != 0: use meta of given track
 .br
 .TP
-.B \-add-items (string)
+.B \-add-item (string)
 .br
 add resource to meta, with parameter syntax file_path[:opt1:optN]
 .br
@@ -2083,72 +2387,125 @@
 .br
 * tk=tkID: meta location (file, moov, track)
 .br
-* name=str: item name
+* name=str: item name, none if not set
 .br
 * type=itype: item 4cc type (not needed if mime is provided)
 .br
-* mime=mtype: item mime type
+* mime=mtype: item mime type, none if not set
 .br
-* encoding=enctype: item content-encoding type
+* encoding=enctype: item content-encoding type, none if not set
 .br
 * id=ID: item ID
 .br
-* ref=4cc,id: reference of type 4cc to an other item
+* ref=4cc,id: reference of type 4cc to an other item (can be set multiple times)
+.br
+* group=id,type: indicate the id and type of an alternate group for this item
+.br
+* replace: replace existing item by new item
 .br
 .TP
 .B \-add-image (string)
 .br
-add the given file (with parameters) as HEIF image item. Same syntax as .I add-item
+add the given file as HEIF image item, with parameter syntax file_path[:opt1:optN]. If filepath is omitted, source is the input MP4 file
 .br
-* name=str: see .I add-item
+* name, id, ref: see .I add-item
 .br
-* id=id: see .I add-item
+* primary: indicate that this item should be the primary item
 .br
-* ref=4cc, id: see .I add-item
+* time=t[-e][/i]: use the next sync sample after time t (float, in sec, default 0). A negative time imports ALL intra frames as items
 .br
-* primary: indicate that this item should be the primary item
+ - If e is set (float, in sec), import all sync samples between t and e
 .br
-* time=t: use the next sync sample after time t (float, in sec, default 0). A negative time imports ALL frames as items
+ - If i is set (float, in sec), sets time increment between samples to import
 .br
 * split_tiles: for an HEVC tiled image, each tile is stored as a separate item
 .br
+* image-size=wxh: force setting the image size and ignoring the bitstream info, used for grid, overlay and identity derived images also
+.br
 * rotation=a: set the rotation angle for this image to 90*a degrees anti-clockwise
 .br
+* mirror-axis=axis: set the mirror axis: vertical, horizontal
+.br
+* clap=Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd: see track clap
+.br
+* image-pasp=axb: force the aspect ratio of the image
+.br
+* image-pixi=(a|a,b,c): force the bit depth (1 or 3 channels)
+.br
 * hidden: indicate that this image item should be hidden
 .br
-* icc_path: path to icc to add as colr
+* icc_path: path to icc data to add as color info
 .br
 * alpha: indicate that the image is an alpha image (should use ref=auxl also)
 .br
-- any other option will be passed as options to the media importer, see .I add
+* depth: indicate that the image is a depth image (should use ref=auxl also)
+.br
+* it=ID: indicate the item ID of the source item to import
+.br
+* itp=ID: same as it= but copy over all properties of the source item
+.br
+* tk=tkID: indicate the track ID of the source sample. If 0, uses the first video track in the file
+.br
+* samp=N: indicate the sample number of the source sample
+.br
+* ref: do not copy the data but refer to the final sample/item location, ignored if filepath is set
+.br
+* agrid[=AR]: creates an automatic grid from the image items present in the file, in their declaration order. The grid will try to have AR aspect ratio if specified (float), or the aspect ratio of the source otherwise. The grid will be the primary item and all other images will be hidden
+.br
+* av1_op_index: select the AV1 operating point to use via a1op box
+.br
+* replace: replace existing image by new image, keeping props listed in keep_props
+.br
+* keep_props=4CCs: coma-separated list of properties types to keep when replacing the image, e.g. keep_props=auxC
+.br
+* auxt=URN: mark image as auxiliary using given URN
+.br
+* auxd=FILE: use data from FILE as auxiliary extensions (cf auxC box)
+.br
+- any other options will be passed as options to the media importer, see .I add
+.br
+.TP
+.B \-add-derived-image (string)
+.br
+create an image grid, overlay or identity item, with parameter syntax :type=(grid|iovl|iden)[:opt1:optN]
+.br
+* image-grid-size=rxc: set the number of rows and columns of the grid
+.br
+* image-overlay-offsets=h,v[,h,v]*: set the horizontal and vertical offsets of the images in the overlay
+.br
+* image-overlay-color=r,g,b,a: set the canvas color of the overlay [0-65535]
+.br
+- any other options from .I add-image can be used
+.br
+
 .br
 .TP
-.B \-rem-item item_ID[:tk=tkID] (string)
+.B \-rem-item,-rem-image item_ID[:tk=tkID]
 .br
 remove resource from meta
 .br
 .TP
-.B \-set-primary item_ID[:tk=tkID] (string)
+.B \-set-primary item_ID[:tk=tkID]
 .br
 set item as primary for meta
 .br
 .TP
-.B \-set-xml xml_file_path[:tk=tkID][:binary] (string)
+.B \-set-xml xml_file_path[:tk=tkID][:binary]
 .br
 set meta XML data
 .br
 .TP
-.B \-rem-xml [tk=tkID] (string)
+.B \-rem-xml [tk=tkID]
 .br
 remove meta XML data
 .br
 .TP
-.B \-dump-xml file_path[:tk=tkID] (string)
+.B \-dump-xml file_path[:tk=tkID]
 .br
 dump meta XML to file
 .br
 .TP
-.B \-dump-item item_ID[:tk=tkID][:path=fileName] (string)
+.B \-dump-item item_ID[:tk=tkID][:path=fileName]
 .br
 dump item to file
 .br
@@ -2158,7 +2515,7 @@
 package input XML file into an ISO container, all media referenced except hyperlinks are added to file
 .br
 .TP
-.B \-package (string)
+.B \-mgt (string)
 .br
 package input XML file into an MPEG-U widget with ISO container, all files contained in the current folder are added to the widget package
 .br
@@ -2216,20 +2573,190 @@
 support for lines transparency and scalability
 .br
 .TP
+.B \-ic2d
+.br
+use indexed curve 2D hardcoded proto
+.br
+.TP
+.B \-same-app
+.br
+appearance nodes are reused
+.br
+.TP
 .B \-flatten (number)
 .br
-complementary angle below which 2 lines are merged, value 0means no flattening
+complementary angle below which 2 lines are merged, value 0 means no flattening
+.br
+.SH Tagging support
+.LP
+.br
+Tags are specified as a colon-separated list tag_name=tag_value[:tag2=val2]
+.br
+Setting a tag with no value or value NULL removes the tag.
+.br
+Special tag value clear (or reset) removes all tags.
+.br
+Unsupported tags can be added using their four character code as a tag name, and string value will be assumed.
+.br
+If the tag name length is 3, the prefix 0xA9 is used to create the four character code.
+.br
+ 
+.br
+Tags can also be loaded from a text file using -itags filename. The file must be in UTF8 with:
+.br
+- lines starting with tag_name=value specify the start of a tag
+.br
+- other lines specify the remainder of the last declared tag
+.br
+ 
+.br
+If tag name starts with WM/, the tag is added to Xtra box (WMA tag, string only).
+.br
+ 
+.br
+Supported tag names, values, types, aliases:
+.br
+title (A9nam) string (alias name)
+.br
+artist (A9ART) string
+.br
+album_artist (aART) string (alias albumArtist)
+.br
+album (A9alb) string
+.br
+group (A9grp) string (alias grouping)
+.br
+composer (A9com) string
+.br
+writer (A9wrt) string
+.br
+conductor (A9con) string
+.br
+comment (A9cmt) string (alias comments)
+.br
+genre (gnre) string (ID3 genre tag)
+.br
+created (A9day) string (alias releaseDate)
+.br
+track (A9trk) string
+.br
+tracknum (trkn) fraction (syntax: A/B or A, B will be 0)
+.br
+disk (disk) fraction (syntax: A/B or A, B will be 0)
+.br
+tempo (tmpo) integer
+.br
+compilation (cpil) bool (yes or no)
+.br
+show (tvsh) string (alias tvShow)
+.br
+episode_id (tven) string (alias tvEpisodeID)
+.br
+season (tvsn) integer (alias tvSeason)
+.br
+episode (tves) integer (alias tvEPisode)
+.br
+network (tvnn) string (alias tvNetwork)
+.br
+sdesc (desc) string (alias description)
+.br
+ldesc (ldes) string (alias longDescription)
+.br
+lyrics (A9lyr) string
+.br
+sort_name (sonm) string (alias sortName)
+.br
+sort_artist (soar) string (alias sortArtist)
+.br
+sort_album_artist (soaa) string (alias sortAlbumArtist)
+.br
+sort_album (soal) string (alias sortAlbum)
+.br
+sort_composer (soco) string (alias sortComposer)
+.br
+sort_show (sosn) string (alias sortShow)
+.br
+cover (covr) file path (alias artwork)
+.br
+copyright (cprt) string
+.br
+tool (A9too) string (alias encodingTool)
+.br
+encoder (A9enc) string (alias encodedBy)
+.br
+pdate (purd) string (alias purchaseDate)
+.br
+podcast (pcst) bool (yes or no)
+.br
+url (purl) string (alias podcastURL)
+.br
+keywords (kyyw) string
+.br
+category (catg) string
+.br
+hdvideo (hdvd) integer
+.br
+media (stik) integer (alias mediaType)
+.br
+rating (rtng) integer (alias contentRating)
+.br
+gapless (pgap) bool (yes or no)
+.br
+art_director (A9ard) string
+.br
+arranger (A9arg) string
+.br
+lyricist (A9aut) string
+.br
+acknowledgement (A9cak) string
+.br
+song_description (A9des) string
+.br
+director (A9dir) string
+.br
+equalizer (A9equ) string
+.br
+liner (A9lnt) string
+.br
+record_company (A9mak) string
+.br
+original_artist (A9ope) string
+.br
+phono_rights (A9phg) string
+.br
+producer (A9prd) string
+.br
+performer (A9prf) string
+.br
+publisher (A9pub) string
+.br
+sound_engineer (A9sne) string
+.br
+soloist (A9sol) string
+.br
+credits (A9src) string
+.br
+thanks (A9thx) string
+.br
+online_info (A9url) string
+.br
+exec_producer (A9xpd) string
 .br
 .SH Live Scene Encoder Options
 .LP
 .br
-The options shall be specified as òpt_name=opt_val.
+The options shall be specified as opt_name=opt_val.
 .br
 Options:
 .br
 
 .br
 .TP
+.B \-live
+.br
+enable live BIFS/LASeR encoder
+.br
+.TP
 .B \-dst (string)
 .br
 destination IP
@@ -2301,16 +2828,16 @@
 .br
 .SH EXAMPLES
 .TP
-Basic and advanced examples are available at https://wiki.gpac.io/MP4Box-Introduction
+Basic and advanced examples are available at https://wiki.gpac.io/MP4Box
 .SH MORE
 .LP
 Authors: GPAC developers, see git repo history (-log)
 .br
-For bug reports, feature requests, more information and source code, visit http://github.com/gpac/gpac
+For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
 .br
-build: 1.0.1-rev0-g7c36b3027-master
+build: 1.1.0-DEV-rev1777-gb91a8dad3-master
 .br
-Copyright: (c) 2000-2020 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+Copyright: (c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
 .br
 .SH SEE ALSO
 .LP

gpac-1.0.1.tar.gz/share/doc/man/mp4client.1 -> gpac-2.0.0.tar.gz/share/doc/man/mp4client.1 Changed

gpac-2.0.0.tar.gz/share/gpac.desktop Added

gpac-1.0.1.tar.gz/share/gui/extensions/player/fileopen.js -> gpac-2.0.0.tar.gz/share/gui/extensions/player/fileopen.js Changed

gpac-1.0.1.tar.gz/share/gui/extensions/player/player.js -> gpac-2.0.0.tar.gz/share/gui/extensions/player/player.js Changed

@@ -31,7 +31,7 @@
 time_in_tsb: 0,
 muted: 0,
 file_open_dlg: false,
- stoped_url: null,
+ stopped_url: null,
 initial_service_id: 0,
 default_addon: null,
 history: [],
@@ -304,11 +304,22 @@
 w = evt.width;
 h = evt.height;
 
- if (w > scene.screen_width) w = scene.screen_width;
- if (h > scene.screen_height) h = scene.screen_height;
+ if (w > scene.screen_width) {
+					h *= scene.screen_width;
+					h /= w;
+					w = scene.screen_width;
+ }
+ if (h > scene.screen_height) {
+					w *= scene.screen_height;
+					w /= h;
+					h = scene.screen_height;
+				}
 
-				if (w<this.extension.def_width)
+				if (w<this.extension.def_width) {
+ h *= this.extension.def_width;
+ h /= w;
 w = this.extension.def_width;
+				}
 
 gwlog(l_deb, 'set output size to ' + w + 'x' + h);
 scene.set_size(w, h);
@@ -352,8 +363,6 @@
 this.movie.children[0].on_media_progress = function (evt) {
 if (evt.buffering) {
 this.extension.show_buffer(evt.bufferLevel);
- this.extension.controler.layout();
-
 }
 if (evt.total) {
 var percent_dload = 100 * evt.loaded / evt.total;
@@ -991,12 +1000,15 @@
 		
 if (!this.movie) {
 this.init_extension();
-
 //check our args
 var i;
- var url_arg = null;
+ //get URL when loading compositor in GUI mode with src option set
+ var url_arg = scene.get_option('temp', 'gui_load_url');
 var prog_name = Sys.args[0]; 
 var check_gpac_args = 1;
+ if (url_arg && (url_arg.indexOf('://') < 0) )
+ url_arg = 'gpac://' + url_arg;
+
 //check mp4client or MP4Client
 if (prog_name && (prog_name.indexOf('lient')>=0))
 check_gpac_args = 0;
@@ -1301,7 +1313,7 @@
 
 if (state == this.GF_STATE_STOP) {
 if (this.stats_wnd) this.stats_wnd.close_all();
- this.stoped_url = '' + this.current_url;
+ this.stopped_url = '' + this.current_url;
 if (this.controlled_renderer) this.controlled_renderer.Stop();
 else {
 this.set_movie_url('');
@@ -1339,13 +1351,13 @@
 			return;
 }
 //we are playing, resume from stop if needed
- if (this.stoped_url) {
+ if (this.stopped_url) {
 if (this.controlled_renderer) {
 this.controlled_renderer.Play();
 } else {
- this.set_movie_url(this.stoped_url, true);
+ this.set_movie_url(this.stopped_url, true);
 }
- this.stoped_url = null;
+ this.stopped_url = null;
 //not in trick mode, next pause/play will restart from current time
 if (state != this.GF_STATE_TRICK)
 this.movie_control.mediaStartTime = -1;
@@ -1429,7 +1441,7 @@
 
 this.default_addon = null;
 this.root_odm = null;
- this.stoped_url = null;
+ this.stopped_url = null;
 
 /*create a temp inline holding the previous scene, use it as the main movie and use the old inline to test the resource. 
 This avoids messing up with event targets already setup*/

gpac-1.0.1.tar.gz/share/gui/extensions/player/stats.js -> gpac-2.0.0.tar.gz/share/gui/extensions/player/stats.js Changed

@@ -29,6 +29,7 @@
 var nb_http = root_odm.nb_http;
 var nb_buffering = 0;
 var nb_ntp_diff = 0;
+ var nb_qualities = 0;
 var srd_obj = null;
 
 wnd.has_select = false;
@@ -45,7 +46,7 @@
 		}
 
 var label = '' + m.type;
-		if (m.dependent_group_id) label += '(Dep. Group)';
+		if (m.dependent_group_id) label += '(dep grp#' + m.dependent_group_id + ')';
 else if (m.scalable_enhancement) label += ' (Enh. Layer)';
 else if (m.width) label += ' (' + m.width + 'x' + m.height + ')';
 else if (m.samplerate) label += ' (' + m.samplerate + ' Hz ' + m.channels + ' channels)';
@@ -63,6 +64,7 @@
 		}
 
 if (num_qualities > 1) {
+ nb_qualities++;
 wnd.has_select = true;
 m.gui.select_label = gw_new_button(wnd.area, 'Quality');
 m.gui.select_label.odm = m;
@@ -280,7 +282,7 @@
 if (bw < 8000) label += '' + bw + ' Kbps';
 else label += '' + Math.round(bw / 1000) + ' Mbps';
 }
- var sender_diff = odm.ntp_sender_diff;
+ var sender_diff = m.ntp_sender_diff;
 if (sender_diff != null) {
 label += '\n'
 label += 'NTP transmission diff: ' + sender_diff + ' ms'; 
@@ -288,6 +290,10 @@
 
 label += '\n'
 label += 'Codec: ' + m.codec;
+ if (odm.nb_views) {
+ label += '\n'
+ label += 'Nb Views: ' + odm.nb_views;
+ }
 
 label += '\n'
 
@@ -528,7 +534,11 @@
 wnd.s_bw = null;
 }
 wnd.s_bitrate = wnd.plot.add_serie('Rate', 'Kbps', 0, 0.8, 0);
- wnd.s_quality = wnd.plot.add_serie('Quality', 'Kbps', 1, 0.65, 0);
+ if (nb_qualities) 
+ wnd.s_quality = wnd.plot.add_serie('Quality', 'Kbps', 1, 0.65, 0);
+ else
+ wnd.s_quality = null;
+
 if (nb_buffering)
 wnd.s_buf = wnd.plot.add_serie('Buffer', 'ms', 0, 0, 0.8);
 else
@@ -564,7 +574,9 @@
 }
 this.s_cpu.refresh_serie(ext.stats_data, 'time', 'cpu', length, 10);
 this.s_mem.refresh_serie(ext.stats_data, 'time', 'memory', length, 6);
- this.s_quality.refresh_serie(ext.stats_data, 'time', 'quality', length, 2.5);
+ if (this.s_quality) {
+ this.s_quality.refresh_serie(ext.stats_data, 'time', 'quality', length, 2.5);
+ }
 }
 
 wnd.quality_changed = function () {

gpac-1.0.1.tar.gz/share/gui/gwlib.js -> gpac-2.0.0.tar.gz/share/gui/gwlib.js Changed

gpac-1.0.1.tar.gz/share/lang/fr.txt -> gpac-2.0.0.tar.gz/share/lang/fr.txt Changed

@@ -122,7 +122,7 @@
 Cela encode un ficher YUV 25 fps en AVC à 175 kbps avec une durée de GOP de 2 secondes, en utilisant des paramètres de codage fast et GOP fermé de ffmpeg.
 
 Note: l'opération inverse (forcer un décodage) est possible en utilisant le filtre reframer:
-EX: src=fichier.mp4 reframer:raw @ -o null
+EX: src=fichier.mp4 reframer:raw=av @ -o null
 Cela forcera le décodage du média à partir du fichier et jettera le résultat (par exemple, pour un benchmark du décodeur)
 
 Expliciter des liens entre les filtres [LINK]
@@ -277,8 +277,8 @@
 	core: libgpac core
 	coding: bitstream formats (audio, video, scene)
 	container: container formats (ISO File, MPEG-2 TS, AVI, ...)
-	network: network data sauf trafic RTP
-	rtp: trafic rtp
+	network: network data sauf traffic RTP
+	rtp: traffic rtp
 	author: outils de création (hint, import, export)
 	sync: messages de synchro
 	codec: messages des encodeurs/décodeurs
@@ -344,7 +344,7 @@
 maxrate_crc=1922316623
 no-cache=désactive la mise en cache HTTP
 no-cache_crc=3498973804
-offline-cache=active la mise en cache HTTP hors connexion (pas de revalidation des ressources existantes avec le serveur)
+offline-cache=active la mise en cache HTTP hors connexion (pas de revalidation des resources existantes avec le serveur)
 offline-cache_crc=2358998211
 clean-cache=indique si le cache HTTP doit être propre au lancement / à la sortie
 clean-cache_crc=3957340416
@@ -403,15 +403,15 @@
 offscreen-yuv_crc=3163794729
 overlay-color-key=indique la couleur à utiliser pour l'incrustation YUV, format hexadécimal
 overlay-color-key_crc=1982790583
-gl-offscreen=@indique le mode openGL pour le rendu hors écran.
+gl-offscreen=@indique le mode OpenGL pour le rendu hors écran.
 	Window: Une fenêtre cachée est utilisée pour effectuer un rendu hors écran. Selon votre pilote vidéo et votre configuration X11, cela peut ne pas fonctionner.
 	VisibleWindow: une fenêtre visible est utilisée pour effectuer un rendu hors écran. Cela peut être utile lors du débogage
 	Pixmap: Un Pixmap X11 est utilisé pour effectuer un rendu hors écran. Selon votre pilote vidéo et votre configuration X11, cela peut ne pas fonctionner et même planter le lecteur.
 	PBuffer: utilise opengl PBuffers pour le dessin, pas toujours supporté@
 gl-offscreen_crc=2846403537
-gl-bits-comp=nombre de bits par composante de couleur dans openGL
+gl-bits-comp=nombre de bits par composante de couleur dans OpenGL
 gl-bits-comp_crc=1796229199
-gl-bits-depth=nombre de bits pour le tampon de profondeur dans openGL
+gl-bits-depth=nombre de bits pour le tampon de profondeur dans OpenGL
 gl-bits-depth_crc=2302848994
 gl-doublebuf=active le double buffer OpenGL
 gl-doublebuf_crc=4108413565
@@ -596,11 +596,11 @@
 Cached_crc=3151091158
 DownloadRate=Vitesse de téléchargement en bits/s - les modifications sont signalées via pid info (pas de reconfiguration)
 DownloadRate_crc=3036537463
-DownloadSize=Taille de la ressource en octets
+DownloadSize=Taille de la resource en octets
 DownloadSize_crc=3043116296
 DownBytes=Nombre d'octets téléchargés - les modifications sont signalées via pid info (pas de reconfiguration)
 DownBytes_crc=4224364036
-ByteRange=Plage d'octets de la ressource associée en octets. Si non specifiée, les données représentent tout le fichier.
+ByteRange=Plage d'octets de la resource associée en octets. Si non specifiée, les données représentent tout le fichier.
 ByteRange_crc=589585796
 DisableProgressive=le flux/fichier ne peut pas être poussé/stocké progressivement car les premiers blocs doivent être ré-écrits à la fermeture
 DisableProgressive_crc=1253734822
@@ -612,11 +612,11 @@
 ServiceWidth_crc=365048394
 ServiceHeight=Hauteur d'affichage du service
 ServiceHeight_crc=3683000823
-CarouselRate=Taux de répétition en ms pour les données carrousel éventuelles
+CarouselRate=Taux de répétition en ms pour les données carousel éventuelles
 CarouselRate_crc=2407619266
 UTC=date et heure UTC du PID
 UTC_crc=1412134201
-UTCTimestamp=Horodatage enéchelle de temps du flux correspondant à la date et à l'heure UTC
+UTCTimestamp=Horodatage en échelle de temps du flux correspondant à la date et à l'heure UTC
 UTCTimestamp_crc=2648424488
 AudioVolume=Volume audio
 AudioVolume_crc=2905216846
@@ -750,7 +750,7 @@
 	bo: byte offset in source, N/A if not available
 	roll: roll info
 	crypt: crypt flag
-	vers: carrousel version number
+	vers: carousel version number
 	size: size of packet
 	crc: 32 bit CRC of packet
 	lf: insert linefeed
@@ -863,7 +863,7 @@
 fsize_crc=4245810103
 mode2d=specifies whether immediate drawing should be used or not. In immediate mode, the screen is completely redrawn at each frame. In defer mode object positioning is tracked from frame to frame and dirty rectangles info is collected in order to redraw the minimal amount of the screen buffer. Whether the setting is applied or not depends on the graphics module (currently all modules handle both mode). debug mode only renders changed areas.
 mode2d_crc=384263271
-amc=audio multichannel support; if disabled always downmix to stereo. usefull if the multichannel output doesn't work properly
+amc=audio multichannel support; if disabled always downmix to stereo. useful if the multichannel output doesn't work properly
 amc_crc=1601428466
 asr=forces output sample rate - 0 for auto
 asr_crc=1603958301
@@ -897,7 +897,7 @@
 nav_crc=4231320967
 linegl=specifies that outlining shall be done through OpenGL pen width rather than vectorial outlining
 linegl_crc=4224418980
-epow2=@emulate power-of-2 textures for openGL (old hardware). Ignored if OpenGL rectangular texture extension is enabled
+epow2=@emulate power-of-2 textures for OpenGL (old hardware). Ignored if OpenGL rectangular texture extension is enabled
 	yes: video texture is not resized but emulated with padding. This usually speeds up video mapping on shapes but disables texture transformations
 	no: video is resized to a power of 2 texture when mapping to a shape@
 epow2_crc=2327000520
@@ -1240,7 +1240,7 @@
 timeshift=Sets initial timshift in ms (if >0) or in %% of timeshift buffer (if <0)
 timeshift_crc=3110845565
 tile_mode=@Sets tile adaptiaion mode:
-	none: bitrate is shared equaly accross all tiles
+	none: bitrate is shared equaly across all tiles
 	rows: bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row
 	rrows: bitrate decreases for each row of tiles starting from the bottom, same rate for each tile on the row
 	mrows: bitrate decreased for top and bottom rows only, same rate for each tile on the row
@@ -1524,13 +1524,13 @@
 udp_timeout_crc=2324324210
 rtsp_timeout=Default timeout before considering RTSP is down
 rtsp_timeout_crc=2959531576
-rtcp_timeout=Default timeout for RTCP trafic in ms. After this timeout, playback will start unsync. If 0 always wait for RTCP
+rtcp_timeout=Default timeout for RTCP traffic in ms. After this timeout, playback will start unsync. If 0 always wait for RTCP
 rtcp_timeout_crc=2760381520
 autortsp=Automatically reconfig RTSP interleaving if UDP timeout
 autortsp_crc=682354717
 first_packet_drop=Sets number of first RTP packet to drop - 0 if no drop
 first_packet_drop_crc=134810345
-frequency_drop=Drop 1 out of N packet - 0 disable droping
+frequency_drop=Drop 1 out of N packet - 0 disable dropping
 frequency_drop_crc=3638295141
 user_agent=User agent string, by default solved from GPAC preferences
 user_agent_crc=4142140091
@@ -1543,7 +1543,7 @@
 desc_crc=320552344
 help=@The file output filter can work as a null sink when its destination is "null", dropping all input packets. In this case it accepts ANY type of input pid, not just file ones.
 In regular mode, the filter will dump to file incomming packets (stream type file), starting a new file for each packet having a start block set, unless operating in cat mode.
-The ouput file name can use gpac templating mechanism, see gpac help.@
+The output file name can use gpac templating mechanism, see gpac help.@
 help_crc=606079466
 dst=location of destination file - see filter help 
 dst_crc=2944539646
@@ -1639,7 +1639,7 @@
 exporter_crc=4138638672
 dims=Uses DIMS mode
 dims_crc=1900107902
-name=Sets output name of files produced (needed media/info files refered to from XML
+name=Sets output name of files produced (needed media/info files referred to from XML
 name_crc=943156470
 nhmlonly=Only dumps NHML info, not media
 nhmlonly_crc=1508283746
@@ -1697,7 +1697,7 @@
 drv_crc=1693149976
 vsync=enables video screen sync
 vsync_crc=2823729754
-drop=enables droping late frames
+drop=enables dropping late frames
 drop_crc=1318529139
 disp=Display mode, gl: OpenGL, pbo: OpenGL with PBO, blit: 2D HW blit, soft: software blit
 disp_crc=2153025248
@@ -1789,7 +1789,7 @@
 		This works on any source (implemented independetly from seek support)
 
 The source lines follow the usual source syntax, see main help
-		Additionnal pid properties can be added per source, but are valid only for the current source, and reset at next source
+		additional pid properties can be added per source, but are valid only for the current source, and reset at next source
 The playlist file is refreshed whenever the next source has to be reloaded in order to allow for dynamic pushing of sources in the playlist
 If the last URL played cannot be found in the playlist, the first URL in the playlist file will be loaded
 @
@@ -1903,7 +1903,7 @@
 	$Time$ is replaced by segment start time
 	$Bandwidth$ is replaced by representation bandwidth.
 
-Additionnal replacement strings (not DASH, not generic GPAC replacements but may occur multiple times in template):
+additional replacement strings (not DASH, not generic GPAC replacements but may occur multiple times in template):
 	$Init=NAME$ is replaced by NAME for init segment, ignored otherwise
 	$Index=NAME$ is replaced by NAME for index segments, ignored otherwise
 	$Path=PATH$ is replaced by PATH when creating segments, ignored otherwise
@@ -1911,8 +1911,8 @@
 	$DS$ (Dash Suffix) is replaced by "_trackN" in case the source is an AV multiplex, or kept empty otherwise
 
 To assign PIDs into periods and adaptation sets and configure the session, the dasher looks for the following properties on each input pid:
-	Representation: assigns representation ID to input pid. If not set, the default behaviour is to have each media component in different adaptation sets. Setting the RepresentationID allows explicit multiplexing of the source(s)
-	Period: assigns period ID to input pid. If not set, the default behaviour is to have all media in the same period with the same start time
+	Representation: assigns representation ID to input pid. If not set, the default behavior is to have each media component in different adaptation sets. Setting the RepresentationID allows explicit multiplexing of the source(s)
+	Period: assigns period ID to input pid. If not set, the default behavior is to have all media in the same period with the same start time
 	PStart: assigns period start. If not set, 0 is assumed, and periods appear in the Period ID declaration order. If negative, this gives the period order (-1 first, then -2 ...). If positive, this gives the true start time and will abort DASHing at period end
 		When both positive and negative values are found, the by-order periods (negative) will be inserted AFTER the timed period (positive)
 	ASID: assigns parent adaptation set ID. If not 0, only sources with same AS ID will be in the same adaptation set
@@ -1960,9 +1960,9 @@
 	"timescale":integer giving the units of following timestamps
 	"mode": if present and value is "edit", the timestamp are in presentation time (edit list applied). Otherwise they are in media time
 The children of <Stream> are <Cue> elements, with attributes:
-	"sample": integer giving the sample/frame number of a sample at which spliting shall happen
-	"dts": long integer giving the decoding time stamp of a sample at which spliting shall happen
-	"cts": long integer giving the composition / presentation time stamp of a sample at which spliting shall happen
+	"sample": integer giving the sample/frame number of a sample at which splitting shall happen
+	"dts": long integer giving the decoding time stamp of a sample at which splitting shall happen
+	"cts": long integer giving the composition / presentation time stamp of a sample at which splitting shall happen
 WARNING: cues shall be listed in decoding order. Cue files can be specified for the entire dasher, or per PID using DashCue property.
 
 Note to developpers: output muxers allowing segmented output must obey the following:
@@ -1974,7 +1974,7 @@
 		"FileName" property is only on one PID (usually the first) for multiplexed outputs
 	"IDXName" gives the optional index name (if not present, index shall be in the same file as dash segment). Only used for MPEG-2 TS for now
 		"EODS" property is set on packets with no DATA, no TS to signal the end of a DASH segment
-			This is only used when stoping/resuming the segmentation process, in order to flush segments without dispatching an EOS (see dasher "subdur" option)
+			This is only used when stopping/resuming the segmentation process, in order to flush segments without dispatching an EOS (see dasher "subdur" option)
 * for each segment done, send a downstream event on the first connected PID signaling the size of the segment and the size of its index if any
 * for muxers with init data, send a downstream event signaling the size of the init and the size of the global index if any
 * the following filter options are passed to muxers, which should declare them as arguments:
@@ -2003,11 +2003,11 @@
 sfile_crc=2818224601
 align=Enables segment time alignment between representations
 align_crc=2358410793
-sap=Enables spliting segments at SAP boundaries
+sap=Enables splitting segments at SAP boundaries
 sap_crc=1678442801
 mix_codecs=Enables mixing different codecs in an adaptation set
 mix_codecs_crc=3192116776
-ntp=Inserts/overrides NTP clock at the begining of each segment. rem removes NTP from all input packets. yes inserts NTP at each segment start. keep leaves input packet NTP untouched.
+ntp=Inserts/overrides NTP clock at the beginning of each segment. rem removes NTP from all input packets. yes inserts NTP at each segment start. keep leaves input packet NTP untouched.
 ntp_crc=1312122791
 no_sar=Does not check for identical sample aspect ratio for adaptation sets
 no_sar_crc=2264793386
@@ -2095,7 +2095,7 @@
 hlsc_crc=2539913156
 cues=sets cue file - see filter help
 cues_crc=3959109360
-strict_cues=strict mode for cues, complains if spliting is not on SAP type 1/2/3 or if unused cue is found
+strict_cues=strict mode for cues, complains if splitting is not on SAP type 1/2/3 or if unused cue is found
 strict_cues_crc=4206252436
 subs_sidx=number of subsegments per sidx. negative value disables sidx. Only used to inherit sidx option of destination
 subs_sidx_crc=462930136
@@ -2131,7 +2131,7 @@
 On non windows hosts, the created pipe will delete the pipe file upon filter destruction
 
 Input pipes can be setup to run forever using the ka option. In this case, end of stream will never be triggered
-This can be usefull to pipe raw streams from different process into gpac:
+This can be useful to pipe raw streams from different process into gpac:
 Receiver side: gpac -i pipe://mypipe:ext=.264:mkp:ka
 Sender side: cat raw1.264 > mypipe && gpac -i raw2.264 -o pipe://mypipe:ext=.264@
 help_crc=2923617023
@@ -2187,7 +2187,7 @@
 desc_crc=2320300515
 help=@This filter serializes the streams states (config/reconfig/info update/remove/eos) and packets of input PIDs. This allows either saving to file a session, or forwarding the state/data of streams to another instance of GPAC using either pipes or sockets. Upstream events are not serialized.
 
-The default behaviour does not insert sequence numbers. When running over general protocols not ensuring packet order, this should be inserted.
+The default behavior does not insert sequence numbers. When running over general protocols not ensuring packet order, this should be inserted.
 The serializer sends tune-in packets (global and per pid) at the requested carousel rate - if 0, no carousel. These packets are marked as redundant so that they can be discarded by output filters if needed
 
 The stream format can be encrypted in AES 128 CBC mode. For all packets, the packet header (header, size, frame size/block offset and optionnal seq num) are in the clear and the followings byte until the last byte of the last multiple of block size (16) fitting in the payload are encrypted.
@@ -2252,7 +2252,7 @@
 help=@This filter handles generic output sockets (mono-directionnal) in blocking mode only.
 The filter can work in server mode, waiting for source connections, or can directly connect
 In server mode, the filter can be instructed to keep running at the end of the stream
-In server mode, the default behaviour is to keep input packets when no more clients are connected; this can be adjusted though the kp option, however there is no realtime regulation of how fast packets are droped.
+In server mode, the default behavior is to keep input packets when no more clients are connected; this can be adjusted though the kp option, however there is no realtime regulation of how fast packets are droped.
 If your sources are not real time, consider adding a real-time scheduler in the chain (cf reframer filter), or set the send rate option
 
 Your platform supports unix domain sockets, use tcpu://NAME and udpu://NAME
@@ -2316,7 +2316,7 @@
 desc=ATSC input
 desc_crc=2310180652
 help=@This filter is a receiver for ATSC 3.0 ROUTE sessions. Source is identified using the string atsc://.
-The default behaviour is to populate GPAC HTTP cache with the recieved files, using "http://gpatsc/serviceN/" as service root, N being the ATSC service ID.
+The default behavior is to populate GPAC HTTP cache with the recieved files, using "http://gpatsc/serviceN/" as service root, N being the ATSC service ID.
 In cache mode, repeated files are always send.
 The cached MPD is assigned the following headers:
 	"x-dash-atsc: N" indicates the ATSC service ID
@@ -2325,7 +2325,7 @@
 The cached files are assigned the following headers:
 	"x-atsc: yes" indicates the file comes from an ATSC session
 
-This behaviour can be changed by disabling the cache, in which case the filter will output files on a single output pid of type "file". The files are dispatched once fully received, the output pid carries a sequence of complete files. Repeated files are not repeated unless requested.
+This behavior can be changed by disabling the cache, in which case the filter will output files on a single output pid of type "file". The files are dispatched once fully received, the output pid carries a sequence of complete files. Repeated files are not repeated unless requested.
 If needed, one pid per TSI can be used rather than a single pid. This avoids mixing files of different mime types on the same pid (e.g. mpd and isobmff).
 
 On OSX with VM packet replay you will need to force multicast routing, eg: "route add -net 239.255.1.4/32 -interface vboxnet0"@

gpac-2.0.0.tar.gz/share/nodejs Added

gpac-2.0.0.tar.gz/share/nodejs/binding.gyp Added

gpac-2.0.0.tar.gz/share/nodejs/index.js Added

gpac-2.0.0.tar.gz/share/nodejs/package.json Added

gpac-2.0.0.tar.gz/share/nodejs/src Added

gpac-2.0.0.tar.gz/share/nodejs/src/gpac_napi.c Added

@@ -0,0 +1,6066 @@
+	/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2021-2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / NodeJS module
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terfsess of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "gpac_napi.h"
+
+#include <gpac/thread.h>
+#include <gpac/dash.h>
+#include <gpac/mpd.h>
+#include <gpac/network.h>
+
+#ifndef GPAC_DISABLE_SVG
+#include <gpac/scenegraph_svg.h>
+#endif
+
+
+typedef struct
+{
+	Bool is_init;
+	u32 str_buf_alloc;
+	char *str_buf;
+
+	u32 nb_args;
+	char **argv;
+
+	napi_async_context rmt_ctx;
+	napi_ref rmt_ref;
+
+	u32 main_thid;
+	GF_List *rmt_messages;
+	struct _napi_session *fs_rmt_handler;
+	Bool rmt_task_scheduled;
+} GPAC_NAPI;
+
+#define GF_SETUP_ERROR	0
+#define GF_NOTIF_ERROR	1
+#define GF_NOTIF_ERROR_AND_DISCONNECT	2
+
+typedef struct _napi_session
+{
+	GF_FilterSession *fs;
+	napi_async_context async_ctx;
+	napi_env env;
+	napi_ref ref;
+	GF_List *defer_filters;
+	Bool blocking;
+} NAPI_Session;
+
+
+typedef struct
+{
+	napi_ref ref;
+	GF_FilterPacket *pck;
+	u8 is_src, readonly, dangling;
+	napi_ref shared_ab_ref, shared_destructor_ref;
+	GF_List *pid_refs;
+} NAPI_FilterPacket;
+
+typedef struct
+{
+	GF_Filter *f;
+	GF_FilterSession *fs;
+	napi_ref ref;
+	napi_env env;
+
+	Bool is_custom;
+	napi_async_context async_ctx;
+
+	napi_ref binding_ref;
+	void *binding_stack;
+} NAPI_Filter;
+
+/*for custom filters only*/
+typedef struct
+{
+	GF_Filter *f;
+	GF_FilterPid *pid;
+
+	napi_ref ref;
+
+	NAPI_FilterPacket *napi_pck;
+	GF_List *pck_refs;
+} NAPI_FilterPid;
+
+typedef struct
+{
+	napi_ref ref;
+	napi_env env;
+	napi_ref groups;
+} NAPI_Dash;
+
+
+#define NAPI_GPAC \
+	GPAC_NAPI *gpac;\
+	if ( napi_get_instance_data(env, (void **) &gpac) != napi_ok) { \
+		napi_throw_error(env, NULL, "Cannot get GPAC NAPI instance"); \
+		return NULL;\
+	}
+
+napi_value filter_enum_pid_props(napi_env env, napi_value cbk_fun, GF_FilterPid *pid);
+napi_value filter_get_pid_property(napi_env env, char *pname, GF_FilterPid *pid, Bool is_info);
+napi_value fs_wrap_filter(napi_env env, GF_FilterSession *fs, GF_Filter *filter);
+napi_status prop_from_napi(napi_env env, napi_value prop, u32 p4cc, char *pname, u32 custom_type, GF_PropertyValue *p);
+napi_value prop_to_napi(napi_env env, const GF_PropertyValue *p, u32 p4cc);
+napi_value frac_to_napi(napi_env env, const GF_Fraction *frac);
+napi_value frac64_to_napi(napi_env env, const GF_Fraction64 *frac);
+
+NAPI_FilterPacket *wrap_filter_packet(napi_env env, GF_FilterPacket *pck, Bool is_src);
+napi_value wrap_filterevent(napi_env env, GF_FilterEvent *evt, napi_value *for_val);
+
+napi_type_tag filtersession_tag = {0x475041434e4f4445, 0x2053455353494f4e};
+napi_type_tag filter_tag = {0x475041434e4f4445, 0x2046494c54455220};
+napi_type_tag filterpid_tag = {0x475041434e4f4445, 0x46696c7472506964};
+napi_type_tag filterpck_tag = {0x475041434e4f4445, 0x47465041434b4554};
+napi_type_tag filterevent_tag = {0x475041434e4f4445, 0x4746464556454e54};
+napi_type_tag dashbind_tag = {0x475041434e4f4445, 0x44415348494e4a53};
+napi_type_tag fileio_tag = {0x475041434e4f4445, 0x474646494c45494f};
+
+napi_value dashin_bind(napi_env env, napi_callback_info info);
+void dashin_detach_binding(NAPI_Filter *napi_f);
+
+
+void dummy_finalize(napi_env env, void* finalize_data, void* finalize_hint)
+{
+}
+
+napi_value gpac_init(napi_env env, napi_callback_info info)
+{
+	NAPI_GPAC
+	NARG_ARGS(2, 0)
+
+	NARG_U32(mem_track, 0, 0);
+	NARG_STR(profile, 1, NULL);
+
+	if (!gpac->is_init) {
+		//copy profile as we will destroy gpac->str_buf
+		if (profile) profile = strdup(profile);
+		if (gpac->str_buf) gf_free(gpac->str_buf);
+		gpac->str_buf = NULL;
+		gpac->str_buf_alloc = 0;
+		gf_sys_close(mem_track, profile);
+		gf_sys_init(mem_track, profile);
+		gpac->is_init = GF_TRUE;
+		if (profile) free(profile);
+	} else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[NAPI] libgpac already initialized, ignoring init(%d, %s)\n", mem_track, profile ? profile : "NULL"));
+	}
+	return NULL;
+}
+
+napi_value gpac_e2s(napi_env env, napi_callback_info info)
+{
+	napi_value val;
+	NARG_ARGS(1, 1)
+	NARG_S32(e, 0, 0);
+	NAPI_CALL( napi_create_string_utf8(env, gf_error_to_string(e), NAPI_AUTO_LENGTH, &val) );
+	return val;
+}
+
+napi_value gpac_set_logs(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS(2, 1)
+	NARG_STR(logs, 0, NULL);
+	NARG_BOOL(reset, 1, GF_FALSE);
+	gf_log_set_tools_levels(logs, reset);
+	return NULL;
+}
+
+napi_value gpac_sys_clock(napi_env env, napi_callback_info info)
+{
+	napi_status status;
+	napi_value val;
+	NAPI_CALL( napi_create_uint32(env, gf_sys_clock(), &val) );
+	return val;
+}
+
+napi_value gpac_sys_clock_high_res(napi_env env, napi_callback_info info)
+{
+	napi_status status;
+	napi_value val;
+	NAPI_CALL( napi_create_bigint_uint64(env, gf_sys_clock_high_res(), &val) );
+	return val;
+}
+
+void gpac_rmt_callback_exec(napi_env env, GPAC_NAPI *gpac)
+{
+	napi_status status;
+	napi_value global, fun_val;
+
+	status = napi_get_global(env, &global);
+	if (status == napi_ok)
+		status = napi_get_reference_value(env, gpac->rmt_ref, &fun_val);
+
+	if (status == napi_ok) {
+		while (gf_list_count(gpac->rmt_messages)) {
+			napi_value res, arg;
+			char *msg = gf_list_pop_front(gpac->rmt_messages);
+
+			status = napi_create_string_utf8(env, msg, NAPI_AUTO_LENGTH, &arg);
+			if (status == napi_ok)
+				status = napi_make_callback(env, gpac->rmt_ctx, global, fun_val, 1, &arg, &res);
+
+			gf_free(msg);
+		}
+	}
+}
+
+Bool fs_flush_rmt(GF_FilterSession *fsess, void *callback, u32 *reschedule_ms)
+{
+	NAPI_Session *napi_fs = callback;
+	GPAC_NAPI *gpac=NULL;
+	napi_get_instance_data(napi_fs->env, (void **) &gpac);
+	if (!gpac) return GF_FALSE;
+
+	gpac_rmt_callback_exec(napi_fs->env, gpac);
+	if (!gf_list_count(gpac->rmt_messages)) {
+		gpac->rmt_task_scheduled = GF_FALSE;
+		return GF_FALSE;
+	}
+	*reschedule_ms = 10;
+	return GF_TRUE;
+}
+
+void gpac_rmt_callback(void *udta, const char *message)
+{
+	GPAC_NAPI *gpac=NULL;
+	napi_get_instance_data((napi_env) udta, (void **) &gpac);
+	if (!gpac) return;
+
+	if (!gpac->rmt_messages) gpac->rmt_messages = gf_list_new();
+	gf_list_add(gpac->rmt_messages, gf_strdup(message) );
+
+	//session is running in blocking mode, schedule task to call NodeJS from main thread
+	if (gpac->fs_rmt_handler && !gpac->rmt_task_scheduled) {
+		gpac->rmt_task_scheduled = GF_TRUE;
+		gf_fs_post_user_task(gpac->fs_rmt_handler->fs, fs_flush_rmt, gpac->fs_rmt_handler, "RemoteryFlush");
+	}
+}
+
+
+napi_value gpac_set_rmt_fun(napi_env env, napi_callback_info info)
+{
+	NAPI_GPAC
+	napi_value global, name;
+	NARG_ARGS(1, 0)
+
+	gpac->is_init = GF_TRUE;
+	if (!argc) {
+		if (gpac->rmt_ctx) {
+			uint32_t res;
+			napi_async_destroy(env, gpac->rmt_ctx);
+			napi_reference_unref(env, gpac->rmt_ref, &res);
+			napi_delete_reference(env, gpac->rmt_ref);
+			gpac->rmt_ctx = NULL;
+		}
+		gf_sys_profiler_set_callback(NULL, NULL);
+		return NULL;
+	}
+
+	NAPI_CALL( napi_get_global(env, &global) );
+	NAPI_CALL( napi_create_string_utf8(env, "GPAC_RemoteryCallback", NAPI_AUTO_LENGTH, &name) );
+	NAPI_CALL( napi_async_init(env, global, name, &gpac->rmt_ctx) )
+
+	gf_sys_profiler_set_callback(env, gpac_rmt_callback);
+	napi_create_reference(env, argv[0], 1, &gpac->rmt_ref);
+	return NULL;
+}
+napi_value gpac_rmt_send(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS(1, 1)
+	NARG_STR(msg, 0, NULL);
+	if (msg)
+		gf_sys_profiler_send(msg);
+	return NULL;
+}
+
+napi_value gpac_rmt_on(napi_env env, napi_callback_info info)
+{
+	napi_status status;
+	napi_value val;
+	NAPI_CALL( napi_get_boolean(env, gf_sys_profiler_sampling_enabled(), &val) );
+	return val;
+}
+
+napi_value gpac_rmt_enable(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS(1, 1)
+	NARG_BOOL(val, 0, GF_FALSE);
+	NAPI_GPAC
+	gpac->is_init = GF_TRUE;
+	gf_sys_profiler_enable_sampling(val);
+	return NULL;
+}
+
+
+napi_value gpac_set_args(napi_env env, napi_callback_info info)
+{
+	NAPI_GPAC
+	bool is_array;
+	u32 i, nb_items=0;
+	napi_value val;
+	NARG_ARGS(1, 1)
+
+	gpac->is_init = GF_TRUE;
+
+	NAPI_CALL( napi_is_array(env, argv[0], &is_array) );
+	if (!is_array) {
+		napi_throw_error(env, NULL, "NAPI call failed");
+		return NULL;
+	}
+	NAPI_CALL( napi_get_array_length(env, argv[0], &nb_items) );
+
+	if (!nb_items) return NULL;
+	if (gpac->argv) {
+		for (i=0; i<gpac->nb_args; i++) {
+			gf_free(gpac->argv[i]);
+		}
+		gf_free(gpac->argv);
+	}
+	gpac->argv = gf_malloc(sizeof(char *) * nb_items);
+	gpac->nb_args = nb_items;
+	for (i=0; i<gpac->nb_args; i++) {
+		size_t size;
+		NAPI_CALL( napi_get_element(env, argv[0], i, &val) );
+		NAPI_CALL( napi_get_value_string_utf8(env, val, NULL, 0, &size) );
+		gpac->argv[i] = gf_malloc(sizeof(char) * (size+1) );
+		NAPI_CALL( napi_get_value_string_utf8(env, val, gpac->argv[i], size+1, &size) );
+		gpac->argv[i][size]=0;
+	}
+	gf_sys_set_args(gpac->nb_args, (const char **) gpac->argv);
+	return NULL;
+}
+
+
+static void gpac_napi_finalize(napi_env env, void* finalize_data, void* finalize_hint)
+{
+	GPAC_NAPI *inst = finalize_data;
+
+	if (inst->nb_args) {
+		u32 i;
+		for (i=0; i<inst->nb_args; i++) {
+			gf_free(inst->argv[i]);
+		}
+		gf_free(inst->argv);
+	}
+
+	napi_delete_reference(env, inst->rmt_ref);
+	if (inst->str_buf) gf_free(inst->str_buf);
+	if (inst->rmt_messages) {
+		while (gf_list_count(inst->rmt_messages)) {
+			char *msg = gf_list_pop_back(inst->rmt_messages);
+			gf_free(msg);
+		}
+		gf_list_del(inst->rmt_messages);
+	}
+	//close gpac
+	gf_sys_close();
+
+#if defined(GPAC_MEMORY_TRACKING)
+	if (gf_memory_size() || gf_file_handles_count()) {
+		gf_log_set_tools_levels("mem@info", GF_FALSE);
+		gf_memory_print();
+	}
+#endif
+
+	//not allocated using gf_malloc !!
+	free(inst);
+}
+
+#define FILTERPCK\
+	NAPI_FilterPacket *napi_pck=NULL;\
+	GF_FilterPacket *pck=NULL;\
+	bool _tag;\
+	NAPI_CALL( napi_check_object_type_tag(env, this_val, &filterpck_tag, &_tag) );\
+	if (!_tag) {\
+		napi_throw_error(env, NULL, "Not a FilterPacket object");\
+		return NULL;\
+	}\
+	NAPI_CALL( napi_unwrap(env, this_val, (void**) &napi_pck) );\
+	pck = napi_pck->pck;\
+	if (!pck) {\
+		napi_throw_error(env, NULL, napi_pck->is_src ? "Detached packet, already drop" : "Detached packet, already sent");\
+		return NULL;\
+	}\
+
+
+static u32 FS_PROP_PCK_DTS = 0;
+static u32 FS_PROP_PCK_CTS = 1;
+static u32 FS_PROP_PCK_SAP = 2;
+static u32 FS_PROP_PCK_DUR = 3;
+static u32 FS_PROP_PCK_SIZE = 4;
+static u32 FS_PROP_PCK_DATA = 5;
+static u32 FS_PROP_PCK_START = 6;
+static u32 FS_PROP_PCK_END = 7;
+static u32 FS_PROP_PCK_TIMESCALE = 8;
+static u32 FS_PROP_PCK_INTERLACED = 9;
+static u32 FS_PROP_PCK_CORRUPTED = 10;
+static u32 FS_PROP_PCK_SEEK = 11;
+static u32 FS_PROP_PCK_BYTE_OFFSET = 12;
+static u32 FS_PROP_PCK_ROLL = 13;
+static u32 FS_PROP_PCK_CRYPT = 14;
+static u32 FS_PROP_PCK_CLOCK = 15;
+static u32 FS_PROP_PCK_CAROUSEL = 16;
+static u32 FS_PROP_PCK_SEQNUM = 17;
+static u32 FS_PROP_PCK_DEPS = 18;
+static u32 FS_PROP_PCK_FRAME_IFCE = 19;
+static u32 FS_PROP_PCK_BLOCKING = 20;
+
+napi_value filterpck_getter(napi_env env, napi_callback_info info)
+{
+	void *magic;
+	napi_status status;
+	napi_value this_val, ret;
+	NAPI_CALL(napi_get_cb_info(env, info, NULL, NULL, &this_val, &magic) );
+	FILTERPCK
+
+	if (magic == &FS_PROP_PCK_DTS) {
+		u64 dts = gf_filter_pck_get_dts(pck);
+		if (dts==GF_FILTER_NO_TS) {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		} else {
+			NAPI_CALL( napi_create_int64(env, (s64) dts, &ret) );
+		}
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_CTS) {
+		u64 cts = gf_filter_pck_get_cts(pck);
+		if (cts==GF_FILTER_NO_TS) {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		} else {
+			NAPI_CALL( napi_create_int64(env, (s64) cts, &ret) );
+		}
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_SAP) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pck_get_sap(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_DUR) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pck_get_duration(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_SIZE) {
+		u32 size;
+		gf_filter_pck_get_data(pck, &size);
+		NAPI_CALL( napi_create_uint32(env, size, &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_DATA) {
+		u32 size;
+		u8 *data = (u8 *) gf_filter_pck_get_data(pck, &size);
+		if (!data) {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		} else {
+			//TODO, mark as readonly using napi_pck->readonly !!
+			NAPI_CALL(napi_create_external_arraybuffer(env, data, size, dummy_finalize, NULL, &ret) );
+		}
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_START) {
+		Bool s, e;
+		gf_filter_pck_get_framing(pck, &s, &e);
+		NAPI_CALL( napi_get_boolean(env, s, &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_END) {
+		Bool s, e;
+		gf_filter_pck_get_framing(pck, &s, &e);
+		NAPI_CALL( napi_get_boolean(env, e, &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_TIMESCALE) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pck_get_timescale(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_INTERLACED) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pck_get_interlaced(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_CORRUPTED) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pck_get_corrupted(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_SEEK) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pck_get_seek_flag(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_BYTE_OFFSET) {
+		u64 bo = gf_filter_pck_get_byte_offset(pck);
+		if (bo==GF_FILTER_NO_BO) {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		} else {
+			NAPI_CALL( napi_create_int64(env, (s64) bo, &ret) );
+		}
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_ROLL) {
+		NAPI_CALL( napi_create_int32(env, gf_filter_pck_get_roll_info(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_CRYPT) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pck_get_crypt_flags(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_CLOCK) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pck_get_clock_type(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_CAROUSEL) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pck_get_carousel_version(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_SEQNUM) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pck_get_seq_num(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_DEPS) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pck_get_dependency_flags(pck), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_FRAME_IFCE) {
+		NAPI_CALL( napi_get_boolean(env, (gf_filter_pck_get_frame_interface(pck)!=NULL), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PCK_BLOCKING) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pck_is_blocking_ref(pck), &ret) );
+		return ret;
+	}
+	return NULL;
+}
+
+napi_value filterpck_setter(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS_MAGIC(1, 1)
+	FILTERPCK
+
+	if (magic && napi_pck->is_src) {
+		napi_throw_error(env, NULL, "Cannot set property on input packet");
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_DTS) {
+		u64 dts;
+		napi_valuetype rtype;
+		napi_typeof(env, argv[0], &rtype);
+		if (rtype == napi_null) {
+			dts = GF_FILTER_NO_TS;
+		} else {
+			NAPI_CALL( napi_get_value_int64(env, argv[0], (s64 *) &dts) );
+		}
+		gf_filter_pck_set_dts(pck, dts);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_CTS) {
+		u64 cts;
+		napi_valuetype rtype;
+		napi_typeof(env, argv[0], &rtype);
+		if (rtype == napi_null) {
+			cts = GF_FILTER_NO_TS;
+		} else {
+			NAPI_CALL( napi_get_value_int64(env, argv[0], (s64 *) &cts) );
+		}
+		gf_filter_pck_set_dts(pck, cts);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_SAP) {
+		NARG_U32(sap, 0, 0)
+		gf_filter_pck_set_sap(pck, sap);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_DUR) {
+		NARG_U32(dur, 0, 0)
+		gf_filter_pck_set_duration(pck, dur);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_SIZE) {
+		napi_throw_error(env, NULL, "Cannot set size property");
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_DATA) {
+		napi_throw_error(env, NULL, "Cannot set data property");
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_START) {
+		NARG_BOOL(start, 0, 0);
+		Bool s, e;
+		gf_filter_pck_get_framing(pck, &s, &e);
+		gf_filter_pck_set_framing(pck, start, e);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_END) {
+		NARG_BOOL(end, 0, 0);
+		Bool s, e;
+		gf_filter_pck_get_framing(pck, &s, &e);
+		gf_filter_pck_set_framing(pck, s, end);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_TIMESCALE) {
+		napi_throw_error(env, NULL, "Cannot set timescale on output packet");
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_INTERLACED) {
+		NARG_BOOL(ilced, 0, 0);
+		gf_filter_pck_set_interlaced(pck, ilced);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_CORRUPTED) {
+		NARG_BOOL(corr, 0, 0);
+		gf_filter_pck_set_interlaced(pck, corr);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_SEEK) {
+		NARG_BOOL(seek, 0, 0);
+		gf_filter_pck_set_interlaced(pck, seek);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_BYTE_OFFSET) {
+		u64 bo;
+		napi_valuetype rtype;
+		napi_typeof(env, argv[0], &rtype);
+		if (rtype == napi_null) {
+			bo = GF_FILTER_NO_BO;
+		} else {
+			NAPI_CALL( napi_get_value_int64(env, argv[0], (s64 *) &bo) );
+		}
+		gf_filter_pck_set_byte_offset(pck, bo);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_ROLL) {
+		NARG_U32(roll, 0, 0);
+		gf_filter_pck_set_interlaced(pck, roll);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_CRYPT) {
+		NARG_U32(crypt, 0, 0);
+		gf_filter_pck_set_interlaced(pck, crypt);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_CLOCK) {
+		NARG_U32(clock, 0, 0);
+		gf_filter_pck_set_clock_type(pck, clock);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_CAROUSEL) {
+		NARG_U32(carv, 0, 0);
+		gf_filter_pck_set_carousel_version(pck, carv);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_SEQNUM) {
+		NARG_U32(seqnum, 0, 0);
+		gf_filter_pck_set_seq_num(pck, seqnum);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PCK_DEPS) {
+		NARG_U32(deps, 0, 0);
+		gf_filter_pck_set_dependency_flags(pck, deps);
+		return NULL;
+	}
+	return NULL;
+}
+
+
+napi_value filterpck_enum_props(napi_env env, napi_callback_info info)
+{
+	napi_value global;
+	NARG_ARGS_THIS(1, 1)
+	FILTERPCK
+
+	napi_valuetype rtype;
+	napi_typeof(env, argv[0], &rtype);
+	if (rtype != napi_function) {
+		napi_throw_error(env, NULL, "property enumerator is not a function");
+		return NULL;
+	}
+
+	NAPI_CALL( napi_get_global(env, &global) );
+	u32 prop_idx=0;
+	while (1) {
+		napi_handle_scope scope_h;
+		u32 p4cc=0;
+		napi_value fun_args[3], res;
+		const char *pname = NULL;
+		const GF_PropertyValue *prop = gf_filter_pck_enum_properties(pck, &prop_idx, &p4cc, &pname);
+		if (!prop) break;
+
+		NAPI_CALL(napi_open_handle_scope(env, &scope_h) );
+
+		if (p4cc) {
+			pname = gf_props_4cc_get_name(p4cc);
+			if (!pname) pname = gf_4cc_to_str(p4cc);
+		}
+
+		NAPI_CALL( napi_create_string_utf8(env, pname, NAPI_AUTO_LENGTH, &fun_args[0]) );
+		fun_args[1] = prop_to_napi(env, prop, p4cc);
+		NAPI_CALL( napi_create_int32(env, prop->type, &fun_args[2]) );
+
+		NAPI_CALL(napi_call_function(env, global, argv[0], 3, fun_args, &res) );
+		NAPI_CALL(napi_close_handle_scope(env, scope_h) );
+	}
+	return NULL;
+}
+
+
+napi_value filterpck_get_prop(napi_env env, napi_callback_info info)
+{
+	const GF_PropertyValue *prop = NULL;
+	NARG_ARGS_THIS(1, 1)
+	FILTERPCK
+
+	NARG_STR(pname, 0, NULL);
+
+	u32 p4cc = gf_props_get_id(pname);
+
+	if (p4cc)
+		prop = gf_filter_pck_get_property(pck, p4cc);
+	else
+		prop = gf_filter_pck_get_property_str(pck, pname);
+
+	if (!prop) {
+		napi_value res;
+		NAPI_CALL(napi_get_null(env, &res) );
+		return res;
+	}
+	return prop_to_napi(env, prop, p4cc);
+}
+
+napi_value filterpck_ref(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPCK
+	//if dangling, no ref
+	if (napi_pck->dangling) return NULL;
+	napi_pck->pck = gf_filter_pck_ref_ex(napi_pck->pck);
+	//add ref
+	u32 nbrefs;
+	napi_reference_ref(env, napi_pck->ref, &nbrefs);
+	return NULL;
+}
+napi_value filterpck_unref(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPCK
+	//if dangling, no ref
+	if (napi_pck->dangling) return NULL;
+	gf_filter_pck_unref(pck);
+	//remove ref
+	u32 nbrefs;
+	napi_reference_unref(env, napi_pck->ref, &nbrefs);
+	if (!nbrefs)
+		napi_pck->pck = NULL;
+	return NULL;
+}
+napi_value filterpck_discard(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPCK
+
+	//if dangling, accept discard as a way to free memory
+	if (napi_pck->is_src && !napi_pck->dangling) {
+		napi_throw_error(env, NULL, "Cannot discard an input packet");
+		return NULL;
+	}
+	gf_filter_pck_discard(pck);
+
+	//detach
+	u32 rcount;
+	napi_reference_unref(env, napi_pck->ref, &rcount);
+	napi_delete_reference(env, napi_pck->ref);
+	napi_pck->ref = NULL;
+	napi_pck->pck = NULL;
+	return NULL;
+}
+
+napi_value filterpck_clone(napi_env env, napi_callback_info info)
+{
+	napi_value ret;
+	NARG_ARGS_THIS(1, 0)
+	FILTERPCK
+	GF_FilterPacket *cached_pck=NULL;
+	NAPI_FilterPacket *napi_cached_pck=NULL;
+	GF_FilterPacket *clone=NULL;
+
+	if (argc>=1) {
+		napi_valuetype rtype;
+		napi_typeof(env, argv[0], &rtype);
+		if (rtype == napi_object) {
+			NAPI_CALL( napi_check_object_type_tag(env, argv[0], &filterpck_tag, &_tag) );
+			if (!_tag) {
+				napi_throw_error(env, NULL, "Cached packet is not a FilterPacket object");
+				return NULL;
+			}
+			NAPI_CALL( napi_unwrap(env, argv[0], (void**) &napi_cached_pck) );
+			cached_pck = napi_cached_pck->pck;
+		}
+	}
+
+	clone = gf_filter_pck_dangling_copy(pck, cached_pck);
+	if (!clone) {
+		napi_throw_error(env, NULL, "Failed to clone packet");
+		return NULL;
+	}
+	//same packet used, return same object
+	if (clone == cached_pck) {
+		NAPI_CALL( napi_get_reference_value(env, napi_cached_pck->ref, &ret) );
+		return ret;
+	}
+	//discard previous napi_cached_pck
+	if (napi_cached_pck) {
+		u32 nbrefs;
+		napi_reference_unref(env, napi_cached_pck->ref, &nbrefs);
+		napi_delete_reference(env, napi_cached_pck->ref);
+		napi_cached_pck->ref = NULL;
+		//napi_cached_pck will be freed when GC collects previous cached_pck
+	}
+
+	NAPI_FilterPacket *napi_cloned = wrap_filter_packet(env, clone, GF_FALSE);
+	if (!napi_cloned) {
+		napi_throw_error(env, NULL, "Failed to clone packet");
+		return NULL;
+	}
+	napi_cloned->readonly = 0;
+	napi_cloned->dangling = 1;
+	NAPI_CALL( napi_get_reference_value(env, napi_cloned->ref, &ret) );
+	return ret;
+}
+
+napi_value filterpck_readonly(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPCK
+	if (napi_pck->is_src) {
+		napi_throw_error(env, NULL, "Cannot set readonly mode for input packet");
+		return NULL;
+	}
+	gf_filter_pck_set_readonly(pck);
+	return NULL;
+}
+napi_value filterpck_send(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPCK
+	if (napi_pck->is_src) {
+		napi_throw_error(env, NULL, "Cannot send an input packet");
+		return NULL;
+	}
+	gf_filter_pck_send(pck);
+
+	//detach
+	u32 rcount;
+	napi_reference_unref(env, napi_pck->ref, &rcount);
+	if (!rcount) {
+		napi_delete_reference(env, napi_pck->ref);
+		napi_pck->ref = NULL;
+	}
+	napi_pck->pck = NULL;
+	return NULL;
+}
+
+
+napi_value filterpck_copy_props(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 1)
+	FILTERPCK
+	GF_FilterPacket *from_pck=NULL;
+	NAPI_FilterPacket *napi_from_pck=NULL;
+	if (napi_pck->is_src) {
+		napi_throw_error(env, NULL, "Cannot copy properties on input packet");
+		return NULL;
+	}
+
+	NAPI_CALL( napi_check_object_type_tag(env, argv[0], &filterpck_tag, &_tag) );
+	if (!_tag) {
+		napi_throw_error(env, NULL, "No packet to copy properties from");
+		return NULL;
+	}
+	NAPI_CALL( napi_unwrap(env, argv[0], (void**) &napi_from_pck) );
+	from_pck = napi_from_pck->pck;
+
+	gf_filter_pck_merge_properties(from_pck, pck);
+	return NULL;
+}
+
+
+napi_value filterpck_set_prop(napi_env env, napi_callback_info info)
+{
+	Bool is_null = GF_FALSE;
+	u32 p4cc;
+	GF_Err e;
+	GF_PropertyValue p;
+	NARG_ARGS_THIS(3, 1)
+	FILTERPCK
+	if (napi_pck->is_src) {
+		napi_throw_error(env, NULL, "Cannot set property on input packet");
+		return NULL;
+	}
+
+	NARG_STR(pname, 0, NULL);
+	if (!pname) return NULL;
+
+	p4cc = gf_props_get_id(pname);
+
+	if (argc==1) {
+		is_null = GF_TRUE;
+	} else {
+		napi_valuetype rtype;
+		napi_typeof(env, argv[1], &rtype);
+		if (rtype == napi_null)
+			is_null = GF_TRUE;
+		else {
+			NARG_U32(custom_type,2,0)
+			status = prop_from_napi(env, argv[1], p4cc, pname, custom_type, &p);
+			if (status != napi_ok) {
+				napi_throw_error(env, NULL, "Cannot set packet property, invalid property value");
+				return NULL;
+			}
+		}
+	}
+	if (p4cc) {
+		e = gf_filter_pck_set_property(pck, p4cc, is_null ? NULL : &p);
+	} else {
+		e = gf_filter_pck_set_property_str(pck, pname, is_null ? NULL : &p);
+	}
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Cannot set packet property");
+	}
+	if (!is_null) {
+		gf_props_reset_single(&p);
+	}
+	return NULL;
+}
+
+napi_value filterpck_truncate(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 1)
+	FILTERPCK
+
+	if (napi_pck->is_src) {
+		napi_throw_error(env, NULL, "Cannot truncate an input packet");
+		return NULL;
+	}
+	NARG_U32(size, 0, 0)
+	gf_filter_pck_truncate(pck, size);
+	return NULL;
+}
+
+
+static u32 FS_PROP_PID_NAME = 0;
+static u32 FS_PROP_PID_FILTERNAME = 1;
+static u32 FS_PROP_PID_EOS = 2;
+static u32 FS_PROP_PID_HAS_SEEN_EOS = 3;
+static u32 FS_PROP_PID_HAS_RECEIVED = 4;
+static u32 FS_PROP_PID_WOULD_BLOCK = 5;
+static u32 FS_PROP_PID_MAX_BUFFER = 6;
+static u32 FS_PROP_PID_BUFFER = 7;
+static u32 FS_PROP_PID_BUFFER_FULL = 8;
+static u32 FS_PROP_PID_FIRST_EMPTY = 9;
+static u32 FS_PROP_PID_FIRST_CTS = 10;
+static u32 FS_PROP_PID_NB_PCK_QUEUED = 11;
+static u32 FS_PROP_PID_TIMESCALE = 12;
+static u32 FS_PROP_PID_MIN_PCK_DUR = 13;
+static u32 FS_PROP_PID_PLAYING = 14;
+static u32 FS_PROP_PID_NEXT_TS = 15;
+
+#define FILTERPID\
+	GF_FilterPid *pid=NULL;\
+	bool _tag;\
+	NAPI_CALL( napi_check_object_type_tag(env, this_val, &filterpid_tag, &_tag) );\
+	if (!_tag) {\
+		napi_throw_error(env, NULL, "Not a FilterPid object");\
+		return NULL;\
+	}\
+	NAPI_CALL( napi_unwrap(env, this_val, (void**) &pid) );\
+
+napi_value filterpid_getter(napi_env env, napi_callback_info info)
+{
+	void *magic;
+	napi_status status;
+	napi_value this_val, ret;
+	NAPI_CALL(napi_get_cb_info(env, info, NULL, NULL, &this_val, &magic) );
+	FILTERPID
+
+	if (magic == &FS_PROP_PID_NAME) {
+		const char *fname = gf_filter_pid_get_name(pid);
+		if (fname) {
+			NAPI_CALL( napi_create_string_utf8(env, fname, NAPI_AUTO_LENGTH, &ret) );
+		} else {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		}
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_FILTERNAME) {
+		const char *fname = gf_filter_pid_get_filter_name(pid);
+		if (fname) {
+			NAPI_CALL( napi_create_string_utf8(env, fname, NAPI_AUTO_LENGTH, &ret) );
+		} else {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		}
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_EOS) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pid_is_eos(pid), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_HAS_SEEN_EOS) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pid_has_seen_eos(pid), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_HAS_RECEIVED) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pid_eos_received(pid), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_WOULD_BLOCK) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pid_would_block(pid), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_MAX_BUFFER) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pid_get_max_buffer(pid), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_BUFFER) {
+		NAPI_CALL( napi_create_int64(env, (s64) gf_filter_pid_query_buffer_duration(pid, GF_FALSE), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_BUFFER_FULL) {
+		u64 dur = gf_filter_pid_query_buffer_duration(pid, GF_TRUE);
+		NAPI_CALL( napi_get_boolean(env, (dur ? 1 : 0), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_FIRST_EMPTY) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pid_first_packet_is_empty(pid), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_FIRST_CTS) {
+		u64 cts;
+		if (!gf_filter_pid_get_first_packet_cts(pid, &cts)) {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		} else if (cts == GF_FILTER_NO_TS) {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		} else {
+			NAPI_CALL( napi_create_int64(env, (s64) cts, &ret) );
+		}
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_NB_PCK_QUEUED) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pid_get_packet_count(pid), &ret) );
+ return ret;
+	}
+	if (magic == &FS_PROP_PID_TIMESCALE) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pid_get_timescale(pid), &ret) );
+ return ret;
+	}
+	if (magic == &FS_PROP_PID_MIN_PCK_DUR) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_pid_get_min_pck_duration(pid), &ret) );
+ return ret;
+	}
+	if (magic == &FS_PROP_PID_PLAYING) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_pid_is_playing(pid), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_PID_NEXT_TS) {
+		u64 cts = gf_filter_pid_get_next_ts(pid);
+		if (cts == GF_FILTER_NO_TS) {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		} else {
+			NAPI_CALL( napi_create_int64(env, (s64) cts, &ret) );
+		}
+ return ret;
+	}
+	return NULL;
+}
+
+napi_value filterpid_setter(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS_MAGIC(1, 1)
+	FILTERPID
+
+	if (magic == &FS_PROP_PID_NAME) {
+		NARG_STR(name, 0, NULL)
+		gf_filter_pid_set_name(pid, name);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PID_EOS) {
+		NARG_BOOL(val, 0, GF_FALSE)
+		if (val) gf_filter_pid_set_eos(pid);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PID_MAX_BUFFER) {
+		NARG_U32(val, 0, 0)
+		gf_filter_pid_set_max_buffer(pid, val);
+		return NULL;
+	}
+	if (magic == &FS_PROP_PID_BUFFER) {
+		NARG_U32(val, 0, 0)
+		gf_filter_pid_set_max_buffer(pid, val);
+		return NULL;
+	}
+	return NULL;
+}
+
+
+napi_value filterpid_remove(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPID
+	gf_filter_pid_remove(pid);
+	return NULL;
+}
+
+napi_value filterpid_enum_props(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	return filter_enum_pid_props(env, argv[0], pid);
+}
+
+napi_value filterpid_get_prop(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	NARG_STR(pname, 0, NULL)
+	return filter_get_pid_property(env, pname, pid, GF_FALSE);
+}
+napi_value filterpid_get_info(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	NARG_STR(pname, 0, NULL)
+	return filter_get_pid_property(env, pname, pid, GF_TRUE);
+}
+
+napi_value filterpid_copy_props(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	GF_FilterPid *ipid=NULL;
+	NAPI_CALL( napi_check_object_type_tag(env, argv[0], &filterpid_tag, &_tag) );
+	if (!_tag) {
+		napi_throw_error(env, NULL, "Not a FilterPid object");
+		return NULL;
+	}
+	NAPI_CALL( napi_unwrap(env, argv[0], (void**) &ipid) );
+
+	e = gf_filter_pid_copy_properties(pid, ipid);
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Cannot copy PID properties");
+	}
+	return NULL;
+}
+
+napi_value filterpid_reset_props(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	e = gf_filter_pid_reset_properties(pid);
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Cannot reset PID properties");
+	}
+	return NULL;
+}
+
+napi_value filterpid_set_prop_internal(napi_env env, napi_callback_info info, Bool is_info)
+{
+	GF_PropertyValue p;
+	GF_Err e;
+	u32 p4cc=0;
+	Bool is_null=GF_FALSE;
+	NARG_ARGS_THIS(3,1)
+	FILTERPID
+
+	NARG_STR(pname, 0, NULL);
+	if (!pname) return NULL;
+
+	p4cc = gf_props_get_id(pname);
+
+	if (argc==1) {
+		is_null = GF_TRUE;
+	} else {
+		napi_valuetype rtype;
+		napi_typeof(env, argv[1], &rtype);
+		if (rtype == napi_null)
+			is_null = GF_TRUE;
+		else {
+			NARG_U32(custom_type,2,0)
+			status = prop_from_napi(env, argv[1], p4cc, pname, custom_type, &p);
+			if (status != napi_ok) {
+				napi_throw_error(env, NULL, "Cannot set PID property, invalid property value");
+				return NULL;
+			}
+		}
+	}
+	if (p4cc) {
+		if (is_info) {
+			e = gf_filter_pid_set_info(pid, p4cc, is_null ? NULL : &p);
+		} else {
+			e = gf_filter_pid_set_property(pid, p4cc, is_null ? NULL : &p);
+		}
+	} else {
+		if (is_info) {
+			e = gf_filter_pid_set_info_str(pid, pname, is_null ? NULL : &p);
+		} else {
+			e = gf_filter_pid_set_property_str(pid, pname, is_null ? NULL : &p);
+		}
+	}
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Cannot set PID property");
+	}
+	if (!is_null) {
+		gf_props_reset_single(&p);
+	}
+	return NULL;
+}
+
+napi_value filterpid_set_prop(napi_env env, napi_callback_info info)
+{
+	return filterpid_set_prop_internal(env, info, GF_FALSE);
+}
+napi_value filterpid_set_info(napi_env env, napi_callback_info info)
+{
+	return filterpid_set_prop_internal(env, info, GF_TRUE);
+}
+
+napi_value filterpid_clear_eos(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,0)
+	FILTERPID
+	NARG_BOOL(all_pids, 0, GF_FALSE);
+	gf_filter_pid_clear_eos(pid, all_pids);
+	return NULL;
+}
+napi_value filterpid_check_caps(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPID
+	gf_filter_pid_check_caps(pid);
+	return NULL;
+}
+napi_value filterpid_discard_block(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPID
+	gf_filter_pid_discard_block(pid);
+	return NULL;
+}
+napi_value filterpid_allow_direct_dispatch(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPID
+	gf_filter_pid_allow_direct_dispatch(pid);
+	return NULL;
+}
+napi_value filterpid_get_clock_type(napi_env env, napi_callback_info info)
+{
+	napi_value ret;
+	NARG_THIS
+	FILTERPID
+	NAPI_CALL( napi_create_uint32(env, gf_filter_pid_get_clock_info(pid, NULL, NULL), &ret) );
+	return ret;
+}
+
+napi_value filterpid_get_clock_timestamp(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPID
+	u64 ts;
+	u32 scale;
+	gf_filter_pid_get_clock_info(pid, &ts, &scale);
+	GF_Fraction64 frac = {ts, scale};
+	return frac64_to_napi(env, &frac);
+}
+
+napi_value filterpid_is_filter_in_parents(napi_env env, napi_callback_info info)
+{
+	napi_value ret;
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	GF_Filter *f=NULL;
+	NAPI_CALL( napi_check_object_type_tag(env, argv[0], &filter_tag, &_tag) );
+	if (!_tag) {
+		napi_throw_error(env, NULL, "Not a Filter object");
+		return NULL;
+	}
+	NAPI_CALL( napi_unwrap(env, argv[0], (void**) &f) );
+	NAPI_CALL( napi_get_boolean(env, gf_filter_pid_is_filter_in_parents(pid, f), &ret) );
+	return ret;
+}
+
+
+napi_value filterpid_get_buffer_occupancy(napi_env env, napi_callback_info info)
+{
+	napi_property_descriptor p_desc = {.attributes=napi_enumerable};
+	napi_value obj;
+	NARG_THIS
+	FILTERPID
+
+	u32 max_units = 0, nb_pck = 0, max_dur = 0, dur = 0;
+	Bool in_final_flush = gf_filter_pid_get_buffer_occupancy(pid, &max_units, &nb_pck, &max_dur, &dur);
+	in_final_flush = ! in_final_flush;
+
+	NAPI_CALL(napi_create_object(env, &obj) );
+
+#define SET_VAL(_val) \
+	p_desc.utf8name = #_val; \
+	NAPI_CALL(napi_create_uint32(env, _val, &p_desc.value) ); \
+	NAPI_CALL(napi_define_properties(env, obj, 1, &p_desc) ); \
+
+	SET_VAL(max_units);
+	SET_VAL(nb_pck);
+	SET_VAL(max_dur);
+	SET_VAL(dur);
+
+	p_desc.utf8name = "is_final_flush";
+	NAPI_CALL(napi_get_boolean(env, in_final_flush, &p_desc.value) );
+	NAPI_CALL(napi_define_properties(env, obj, 1, &p_desc) );
+	return obj;
+}
+
+napi_value filterpid_loose_connect(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPID
+	gf_filter_pid_set_loose_connect(pid);
+	return NULL;
+}
+
+napi_value filterpid_set_framing(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,0)
+	FILTERPID
+	NARG_BOOL(framed, 0, GF_TRUE);
+	gf_filter_pid_set_framing_mode(pid, framed);
+	return NULL;
+}
+napi_value filterpid_set_clock_mode(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	NARG_U32(ck_mode, 0, 0);
+	gf_filter_pid_set_clock_mode(pid, ck_mode);
+	return NULL;
+}
+napi_value filterpid_set_discard(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	NARG_BOOL(do_discard, 0, GF_TRUE);
+	gf_filter_pid_set_discard(pid, do_discard);
+	return NULL;
+}
+napi_value filterpid_require_source_id(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	NARG_THIS
+	FILTERPID
+	e = gf_filter_pid_require_source_id(pid);
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Failed to require sourceID for PID");
+	}
+	return NULL;
+}
+napi_value filterpid_recompute_dts(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	NARG_BOOL(do_recompute, 0, GF_TRUE);
+	gf_filter_pid_recompute_dts(pid, do_recompute);
+	return NULL;
+}
+
+napi_value filterpid_resolve_template(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	char szTpl[GF_MAX_PATH];
+	NARG_ARGS_THIS(3,1)
+	napi_value ret;
+	FILTERPID
+
+	NARG_U32(file_idx, 1, 0);
+	NARG_STR(suffix, 2, NULL);
+	if (suffix) suffix = gf_strdup(suffix);
+
+	NARG_STR(template, 0, NULL);
+	if (!template) {
+		napi_throw_error(env, NULL, "No template provided");
+		if (suffix) gf_free(suffix);
+		return NULL;
+	}
+
+	e = gf_filter_pid_resolve_file_template(pid, szTpl, template, file_idx, suffix);
+	if (suffix) gf_free(suffix);
+
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Failed to resolve template for PID");
+	}
+	NAPI_CALL( napi_create_string_utf8(env, szTpl, NAPI_AUTO_LENGTH, &ret) );
+	return ret;
+}
+
+napi_value filterpid_query_cap(napi_env env, napi_callback_info info)
+{
+	napi_value ret;
+	u32 p4cc;
+	const GF_PropertyValue *cap=NULL;
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	NARG_STR(pname, 0, NULL);
+	if (!pname) return NULL;
+
+	p4cc = gf_props_get_id(pname);
+	if (p4cc) {
+		cap = gf_filter_pid_caps_query(pid, p4cc);
+	} else {
+		cap = gf_filter_pid_caps_query_str(pid, pname);
+	}
+	if (cap) return prop_to_napi(env, cap, p4cc);
+
+	NAPI_CALL(napi_get_null(env, &ret));
+	return ret;
+}
+
+napi_value filterpid_negociate_cap(napi_env env, napi_callback_info info)
+{
+	u32 p4cc;
+	GF_Err e;
+	GF_PropertyValue p;
+	NARG_ARGS_THIS(3,2)
+	FILTERPID
+	NARG_STR(pname, 0, NULL);
+	if (!pname) return NULL;
+	p4cc = gf_props_get_id(pname);
+	NARG_U32(custom_type, 2, 0);
+
+	NAPI_CALL( prop_from_napi(env, argv[1], p4cc, pname, custom_type, &p) );
+
+	if (p4cc) {
+		e = gf_filter_pid_negociate_property(pid, p4cc, &p);
+	} else {
+		e = gf_filter_pid_negociate_property_dyn(pid, pname, &p);
+	}
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Failed to negociate cap for PID");
+	}
+	gf_props_reset_single(&p);
+	return NULL;
+}
+
+void napi_pck_del(napi_env env, void *finalize_data, void* finalize_hint)
+{
+	NAPI_FilterPacket *napi_pck = (NAPI_FilterPacket *)finalize_data;
+	//output packet not sent or dangling packet, discard it
+	if (napi_pck->pck && (!napi_pck->is_src || napi_pck->dangling) )
+		gf_filter_pck_discard(napi_pck->pck);
+
+	//we still have a ref and a packet, unref - this cleans up calls to pck.ref() without pck.unref()
+	//not true for dangling copy
+	if (!napi_pck->dangling && napi_pck->ref && napi_pck->pck) {
+		gf_filter_pck_unref(napi_pck->pck);
+	}
+	//if pid is still alive, remove ourselves
+	//this is needed because the GC for this packet might happen before the GC for the session/custom filter
+	//so we need to make sure we won't call the shared destructor callback
+	if (napi_pck->pid_refs) {
+		gf_list_del_item(napi_pck->pid_refs, napi_pck);
+	}
+	gf_free(napi_pck);
+}
+
+NAPI_FilterPacket *wrap_filter_packet(napi_env env, GF_FilterPacket *pck, Bool is_src)
+{
+	napi_value pck_obj;
+	NAPI_FilterPacket *napi_pck;
+
+	GF_SAFEALLOC(napi_pck, NAPI_FilterPacket);
+	if (!napi_pck) {
+		return NULL;
+	}
+	napi_pck->pck = pck;
+	napi_pck->is_src = is_src ? 1 : 0;
+	//all packets are read-only by default
+	napi_pck->readonly = 1;
+	napi_create_object(env, &pck_obj);
+	napi_create_reference(env, pck_obj, 1, &napi_pck->ref);
+	napi_type_tag_object(env, pck_obj, &filterpck_tag);
+
+	//define all props for custom filter
+	napi_property_descriptor filterpck_properties[] = {
+		{ "dts", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_DTS},
+		{ "cts", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_CTS},
+		{ "sap", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_SAP},
+		{ "dur", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_DUR},
+		{ "size", NULL, NULL, filterpck_getter, NULL, NULL, napi_enumerable, &FS_PROP_PCK_SIZE},
+		{ "data", NULL, NULL, filterpck_getter, NULL, NULL, napi_enumerable, &FS_PROP_PCK_DATA},
+		{ "start", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_START},
+		{ "end", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_END},
+		{ "timescale", NULL, NULL, filterpck_getter, NULL, NULL, napi_enumerable, &FS_PROP_PCK_TIMESCALE},
+		{ "interlaced", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_INTERLACED},
+		{ "corrupted", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_CORRUPTED},
+		{ "seek", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_SEEK},
+		{ "byte_offset", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_BYTE_OFFSET},
+		{ "roll", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_ROLL},
+		{ "crypt", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_CRYPT},
+		{ "clock", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_CLOCK},
+		{ "carousel", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_CAROUSEL},
+		{ "seqnum", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_SEQNUM},
+		{ "deps", NULL, NULL, filterpck_getter, filterpck_setter, NULL, napi_enumerable, &FS_PROP_PCK_DEPS},
+		{ "frame_ifce", NULL, NULL, filterpck_getter, NULL, NULL, napi_enumerable, &FS_PROP_PCK_FRAME_IFCE},
+		{ "blocking", NULL, NULL, filterpck_getter, NULL, NULL, napi_enumerable, &FS_PROP_PCK_BLOCKING},
+
+		{ "enum_props", 0, filterpck_enum_props, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_prop", 0, filterpck_get_prop, 0, 0, 0, napi_enumerable, 0 },
+		{ "ref", 0, filterpck_ref, 0, 0, 0, napi_enumerable, 0 },
+		{ "unref", 0, filterpck_unref, 0, 0, 0, napi_enumerable, 0 },
+		{ "discard", 0, filterpck_discard, 0, 0, 0, napi_enumerable, 0 },
+		{ "clone", 0, filterpck_clone, 0, 0, 0, napi_enumerable, 0 },
+		{ "readonly", 0, filterpck_readonly, 0, 0, 0, napi_enumerable, 0 },
+		{ "send", 0, filterpck_send, 0, 0, 0, napi_enumerable, 0 },
+		{ "copy_props", 0, filterpck_copy_props, 0, 0, 0, napi_enumerable, 0 },
+		{ "set_prop", 0, filterpck_set_prop, 0, 0, 0, napi_enumerable, 0 },
+		{ "truncate", 0, filterpck_truncate, 0, 0, 0, napi_enumerable, 0 },
+	};
+
+	napi_define_properties(env, pck_obj, sizeof(filterpck_properties)/sizeof(napi_property_descriptor), filterpck_properties);
+
+	napi_wrap(env, pck_obj, napi_pck, napi_pck_del, NULL, NULL);
+	return napi_pck;
+}
+
+napi_value filterpid_get_packet(napi_env env, napi_callback_info info)
+{
+	napi_value ret;
+	NARG_THIS
+	FILTERPID
+	GF_FilterPacket *pck;
+	NAPI_FilterPid *napi_pid = gf_filter_pid_get_udta(pid);
+
+	if (napi_pid->napi_pck) {
+		NAPI_CALL( napi_get_reference_value(env, napi_pid->napi_pck->ref, &ret) );
+		return ret;
+	}
+	pck = gf_filter_pid_get_packet(pid);
+	if (!pck) {
+		NAPI_CALL(napi_get_null(env, &ret));
+		return ret;
+	}
+	//create pck object
+	napi_pid->napi_pck = wrap_filter_packet(env, pck, GF_TRUE);
+	NAPI_CALL( napi_get_reference_value(env, napi_pid->napi_pck->ref, &ret) );
+	return ret;
+}
+
+napi_value filterpid_drop_packet(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTERPID
+	NAPI_FilterPid *napi_pid = gf_filter_pid_get_udta(pid);
+
+	if (!napi_pid->napi_pck) {
+		return NULL;
+	}
+	u32 rcount;
+	napi_reference_unref(env, napi_pid->napi_pck->ref, &rcount);
+	if (!rcount) {
+		napi_delete_reference(env, napi_pid->napi_pck->ref);
+		napi_pid->napi_pck->ref = NULL;
+		napi_pid->napi_pck->pck = NULL;
+	}
+	napi_pid->napi_pck = NULL;
+
+	gf_filter_pid_drop_packet(pid);
+	return NULL;
+}
+
+
+napi_value filterpid_send_event(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	GF_FilterEvent *evt=NULL;
+	NAPI_CALL( napi_check_object_type_tag(env, argv[0], &filterevent_tag, &_tag) );
+	if (!_tag) {
+		napi_throw_error(env, NULL, "Not a FilterEvent object");
+		return NULL;
+	}
+	NAPI_CALL( napi_unwrap(env, argv[0], (void**) &evt) );
+	evt->base.on_pid = pid;
+	gf_filter_pid_send_event(pid, evt);
+	return NULL;
+}
+
+napi_value filterpid_forward(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+	NAPI_FilterPacket *napi_pck=NULL;
+	NAPI_CALL( napi_check_object_type_tag(env, argv[0], &filterpck_tag, &_tag) );
+	if (!_tag) {
+		napi_throw_error(env, NULL, "Not a FilterPacket object");
+		return NULL;
+	}
+	NAPI_CALL( napi_unwrap(env, argv[0], (void**) &napi_pck) );
+	if (napi_pck->pck) {
+ GF_Err e = gf_filter_pck_forward(napi_pck->pck, pid);
+		if (e) {
+			napi_throw_error(env, gf_error_to_string(e), "Failed to forward packet");
+		}
+	}
+	return NULL;
+}
+
+napi_value filterpid_new_pck(napi_env env, napi_callback_info info)
+{
+	napi_value ret;
+	NARG_ARGS_THIS(1,0)
+	FILTERPID
+
+	NARG_U32(size, 0, 0)
+	GF_FilterPacket *pck = gf_filter_pck_new_alloc(pid, size, NULL);
+	if (!pck) {
+		napi_throw_error(env, NULL, "Failed to create new packet");
+		return NULL;
+	}
+	NAPI_FilterPacket *napi_pck = wrap_filter_packet(env, pck, GF_FALSE);
+	if (!napi_pck) {
+		napi_throw_error(env, NULL, "Failed to create new packet");
+		return NULL;
+	}
+	napi_pck->readonly = 0;
+	NAPI_CALL( napi_get_reference_value(env, napi_pck->ref, &ret) );
+	return ret;
+}
+
+napi_value filterpid_new_pck_ref(napi_env env, napi_callback_info info)
+{
+	napi_value ret;
+	NARG_ARGS_THIS(3,1)
+	FILTERPID
+
+	NAPI_FilterPacket *napi_pck=NULL;
+	GF_FilterPacket *ipck=NULL;
+	NAPI_CALL( napi_check_object_type_tag(env, argv[0], &filterpck_tag, &_tag) );
+	if (!_tag) {
+		napi_throw_error(env, NULL, "Not a FilterPacket object");
+		return NULL;
+	}
+	NAPI_CALL( napi_unwrap(env, argv[0], (void**) &napi_pck) );
+	ipck = napi_pck->pck;
+	if (!ipck) {
+		napi_throw_error(env, NULL, napi_pck->is_src ? "Detached packet, already drop" : "Detached packet, already sent");
+		return NULL;
+	}
+
+	NARG_U32(size, 1, 0)
+	NARG_U32(offset, 2, 0)
+
+	GF_FilterPacket *pck = gf_filter_pck_new_ref(pid, offset, size, ipck);
+	if (!pck) {
+		napi_throw_error(env, NULL, "Failed to create new packet");
+		return NULL;
+	}
+	napi_pck = wrap_filter_packet(env, pck, GF_FALSE);
+	if (!napi_pck) {
+		napi_throw_error(env, NULL, "Failed to create new packet");
+		return NULL;
+	}
+	NAPI_CALL( napi_get_reference_value(env, napi_pck->ref, &ret) );
+	return ret;
+}
+
+void filter_cbk_release_packet(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	NAPI_Filter *napi_f = gf_filter_get_rt_udta(filter);
+	NAPI_FilterPacket *napi_pck = NULL;
+	NAPI_FilterPid *napi_pid = gf_filter_pid_get_udta(pid);
+
+	napi_pck = gf_list_pop_front(napi_pid->pck_refs);
+	if (!napi_pck) return;
+
+	if (napi_pck->shared_destructor_ref) {
+		napi_value fun, obj, res;
+		napi_get_reference_value(napi_f->env, napi_pck->shared_destructor_ref, &fun);
+		napi_get_global(napi_f->env, &obj);
+		napi_make_callback(napi_f->env, napi_f->async_ctx, obj, fun, 0, NULL, &res);
+	}
+
+	u32 rcount;
+
+	//unref arraybuffer
+	napi_reference_unref(napi_f->env, napi_pck->shared_ab_ref, &rcount);
+	napi_delete_reference(napi_f->env, napi_pck->shared_ab_ref);
+
+	//unref destructor
+	if (napi_pck->shared_destructor_ref) {
+		napi_reference_unref(napi_f->env, napi_pck->shared_ab_ref, &rcount);
+		napi_delete_reference(napi_f->env, napi_pck->shared_ab_ref);
+	}
+
+	//unref packet
+	napi_reference_unref(napi_f->env, napi_pck->ref, &rcount);
+	if (rcount==0) {
+		napi_delete_reference(napi_f->env, napi_pck->ref);
+		napi_pck->ref = NULL;
+		napi_pck->pck = NULL;
+	}
+
+}
+
+napi_value filterpid_new_pck_shared(napi_env env, napi_callback_info info)
+{
+	Bool has_destructor=GF_FALSE;
+	napi_value ret;
+	GF_Err e;
+	NARG_ARGS_THIS(2,1)
+	FILTERPID
+
+	if (argc>1) {
+		napi_valuetype rtype;
+		napi_typeof(env, argv[1], &rtype);
+		if (rtype != napi_function) {
+			napi_throw_error(env, NULL, "destructor is not a function");
+			return NULL;
+		}
+		has_destructor = GF_TRUE;
+	}
+
+	NAPI_FilterPid *napi_pid = gf_filter_pid_get_udta(pid);
+
+	Bool is_ab=GF_FALSE;
+	NAPI_CALL(napi_is_arraybuffer(env, argv[0], (bool*) &is_ab) );
+	if (!is_ab) {
+		napi_throw_error(env, NULL, "not an array buffer");
+		return NULL;
+	}
+
+	u8 *data_p=NULL;
+	size_t data_len=0;
+	NAPI_CALL(napi_get_arraybuffer_info(env, argv[0], (void **)&data_p, &data_len) );
+
+	GF_FilterPacket *pck = gf_filter_pck_new_shared(pid, data_p, data_len, filter_cbk_release_packet);
+	if (!pck) {
+		napi_throw_error(env, NULL, "Failed to create new packet");
+		return NULL;
+	}
+	NAPI_FilterPacket *napi_pck = wrap_filter_packet(env, pck, GF_FALSE);
+	if (!napi_pck) goto err_exit;
+
+	if (!napi_pid->pck_refs) {
+		napi_pid->pck_refs = gf_list_new();
+		if (!napi_pid->pck_refs) goto err_exit;
+	}
+	e = gf_list_add(napi_pid->pck_refs, napi_pck);
+	if (e) goto err_exit;
+
+	//ref packet to avoid destruction
+	u32 nbrefs;
+	status = napi_reference_ref(env, napi_pck->ref, &nbrefs);
+	if (status!=napi_ok) goto err_exit;
+	//ref array buffer
+	status = napi_create_reference(env, argv[0], 1, &napi_pck->shared_ab_ref);
+	if (status!=napi_ok) goto err_exit;
+	if (has_destructor) {
+		status = napi_create_reference(env, argv[1], 1, &napi_pck->shared_destructor_ref);
+		if (status!=napi_ok) goto err_exit;
+	}
+
+	napi_pck->readonly = 0;
+	status = napi_get_reference_value(env, napi_pck->ref, &ret);
+	if (status == napi_ok) {
+		napi_pck->pid_refs = napi_pid->pck_refs;
+		return ret;
+	}
+
+err_exit:
+	if (pck) gf_filter_pck_discard(pck);
+	if (napi_pck) gf_list_del_item(napi_pid->pck_refs, napi_pck);
+
+	napi_throw_error(env, NULL, "Failed to create new packet");
+	return NULL;
+
+}
+
+napi_value filterpid_new_pck_copy_clone(napi_env env, napi_callback_info info, Bool is_clone)
+{
+	napi_value ret;
+	NARG_ARGS_THIS(1,1)
+	FILTERPID
+
+	NAPI_FilterPacket *napi_pck=NULL;
+	GF_FilterPacket *ipck=NULL;
+	NAPI_CALL( napi_check_object_type_tag(env, argv[0], &filterpck_tag, &_tag) );
+	if (!_tag) {
+		napi_throw_error(env, NULL, "Not a FilterPacket object");
+		return NULL;
+	}
+	NAPI_CALL( napi_unwrap(env, argv[0], (void**) &napi_pck) );
+	ipck = napi_pck ? napi_pck->pck : NULL;
+	if (!ipck) {
+		napi_throw_error(env, NULL, napi_pck->is_src ? "Detached packet, already drop" : "Detached packet, already sent");
+		return NULL;
+	}
+
+	GF_FilterPacket *pck;
+	if (is_clone)
+		pck = gf_filter_pck_new_clone(pid, ipck, NULL);
+	else
+		pck = gf_filter_pck_new_copy(pid, ipck, NULL);
+
+	if (!pck) {
+		napi_throw_error(env, NULL, "Failed to create new packet");
+		return NULL;
+	}
+	napi_pck = wrap_filter_packet(env, pck, GF_FALSE);
+	if (!napi_pck) {
+		napi_throw_error(env, NULL, "Failed to create new packet");
+		return NULL;
+	}
+	napi_pck->readonly = 0;
+	NAPI_CALL( napi_get_reference_value(env, napi_pck->ref, &ret) );
+	return ret;
+}
+napi_value filterpid_new_pck_copy(napi_env env, napi_callback_info info)
+{
+	return filterpid_new_pck_copy_clone(env, info, GF_FALSE);
+}
+napi_value filterpid_new_pck_clone(napi_env env, napi_callback_info info)
+{
+	return filterpid_new_pck_copy_clone(env, info, GF_TRUE);
+}
+
+
+static u32 FILTER_PROP_NAME = 0;
+static u32 FILTER_PROP_ID = 1;
+static u32 FILTER_PROP_IPIDS = 2;
+static u32 FILTER_PROP_OPIDS = 3;
+
+#define FILTER\
+	GF_Filter *f=NULL;\
+	bool _tag;\
+	NAPI_CALL( napi_check_object_type_tag(env, this_val, &filter_tag, &_tag) );\
+	if (!_tag) {\
+		napi_throw_error(env, NULL, "Not a Filter object");\
+		return NULL;\
+	}\
+	NAPI_CALL( napi_unwrap(env, this_val, (void**) &f) );\
+
+#define FILTER_CUST\
+	NAPI_Filter *napi_f = (NAPI_Filter *) gf_filter_get_rt_udta(f);\
+	if (!napi_f->is_custom) {\
+		napi_throw_error(env, NULL, "Not a custom Filter object");\
+		return NULL;\
+	}\
+
+
+#define FILTER_ARG(_name, _argidx)\
+	GF_Filter *_name=NULL;\
+	bool _fa_tag;\
+	NAPI_CALL( napi_check_object_type_tag(env, argv[_argidx], &filter_tag, &_fa_tag) );\
+	if (!_fa_tag) {\
+		napi_throw_error(env, NULL, "Not a Filter object");\
+		return NULL;\
+	}\
+	NAPI_CALL( napi_unwrap(env, argv[_argidx], (void**) &_name) );\
+
+napi_value filter_getter(napi_env env, napi_callback_info info)
+{
+	void *magic;
+	napi_status status;
+	napi_value this_val, ret;
+	NAPI_CALL(napi_get_cb_info(env, info, NULL, NULL, &this_val, &magic) );
+	FILTER
+
+	if (magic == &FILTER_PROP_NAME) {
+		const char *fname = gf_filter_get_name(f);
+		if (!fname) return NULL;
+		NAPI_CALL( napi_create_string_utf8(env, fname, NAPI_AUTO_LENGTH, &ret) );
+		return ret;
+	}
+	if (magic == &FILTER_PROP_ID) {
+		const char *fid = gf_filter_get_name(f);
+		if (!fid) return NULL;
+		NAPI_CALL( napi_create_string_utf8(env, fid, NAPI_AUTO_LENGTH, &ret) );
+		return ret;
+	}
+	if (magic == &FILTER_PROP_IPIDS) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_get_ipid_count(f), &ret) );
+		return ret;
+	}
+	if (magic == &FILTER_PROP_OPIDS) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_get_opid_count(f), &ret) );
+		return ret;
+	}
+
+	return NULL;
+}
+
+napi_value filter_setter(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS_MAGIC(1, 1)
+	FILTER
+
+	if (magic == &FILTER_PROP_NAME) {
+		NARG_STR(name, 0, NULL);
+		gf_filter_set_name(f, name);
+		return NULL;
+	}
+	return NULL;
+}
+
+napi_value filter_remove(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTER
+	gf_filter_remove(f);
+	return NULL;
+}
+napi_value filter_update(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(2, 2)
+	FILTER
+	NARG_STR(name, 0, NULL);
+	NARG_STR_ALLOC(value, 1, NULL);
+
+	gf_fs_send_update(NULL, NULL, f, name, value, 0);
+	if (value) gf_free(value);
+	return NULL;
+}
+napi_value filter_set_source_internal(napi_env env, napi_callback_info info, Bool is_restricted)
+{
+	GF_Err e;
+	NARG_ARGS_THIS(2, 1)
+	FILTER
+	FILTER_ARG(src_f, 0)
+
+	NARG_STR(link_ext, 1, NULL);
+
+	if (is_restricted)
+		e = gf_filter_set_source_restricted(f, src_f, link_ext);
+	else
+		e = gf_filter_set_source(f, src_f, link_ext);
+
+	if (e)
+		napi_throw_error(env, gf_error_to_string(e), "Failed to set source");
+	return NULL;
+}
+napi_value filter_set_source(napi_env env, napi_callback_info info)
+{
+	return filter_set_source_internal(env, info, GF_FALSE);
+}
+napi_value filter_set_source_restricted(napi_env env, napi_callback_info info)
+{
+	return filter_set_source_internal(env, info, GF_TRUE);
+}
+napi_value filter_insert(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	NARG_ARGS_THIS(2, 1)
+	FILTER
+	FILTER_ARG(ins_f, 0)
+	NARG_STR(link_ext, 1, NULL);
+
+	e = gf_filter_set_source(f, ins_f, link_ext);
+	if (e)
+		napi_throw_error(env, gf_error_to_string(e), "Failed to set source");
+	else
+		gf_filter_reconnect_output(f);
+	return NULL;
+}
+
+napi_value filter_require_source_id(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTER
+	gf_filter_require_source_id(f);
+	return NULL;
+}
+
+
+napi_value filter_bind(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1,1)
+	FILTER
+
+	napi_valuetype rtype;
+	napi_typeof(env, argv[0], &rtype);
+	if (rtype != napi_object) {
+		napi_throw_error(env, NULL, "Binding not an object");
+		return NULL;
+	}
+
+	const char *fname = gf_filter_get_name(f);
+	if (fname && !strcmp(fname, "dashin")) {
+		return dashin_bind(env, info);
+
+	}
+	napi_throw_error(env, NULL, "Failed to bind to filter, not dashin filter");
+	return NULL;
+}
+
+
+napi_value frac_to_napi(napi_env env, const GF_Fraction *frac)
+{
+	napi_value val, res;
+	napi_status status;
+	NAPI_CALL(napi_create_object(env, &res) );
+	NAPI_CALL(napi_create_int32(env, frac->num, &val) );
+	NAPI_CALL(napi_set_named_property(env, res, "num", val) );
+	NAPI_CALL(napi_create_uint32(env, frac->den, &val) );
+	NAPI_CALL(napi_set_named_property(env, res, "den", val) );
+	return res;
+}
+napi_value frac64_to_napi(napi_env env, const GF_Fraction64 *frac)
+{
+	napi_value val, res;
+	napi_status status;
+	NAPI_CALL(napi_create_object(env, &res) );
+	NAPI_CALL(napi_create_int64(env, frac->num, &val) );
+	NAPI_CALL(napi_set_named_property(env, res, "num", val) );
+	NAPI_CALL(napi_create_int64(env, frac->den, &val) );
+	NAPI_CALL(napi_set_named_property(env, res, "den", val) );
+	return res;
+}
+napi_status frac_from_napi(napi_env env, napi_value prop, GF_Fraction *frac)
+{
+	napi_status status;
+	Bool has_p;
+	napi_value v;
+	GET_PROP_FIELD_S32("num", "Fraction", frac->num)
+	GET_PROP_FIELD_U32("den", "Fraction", frac->den)
+	return napi_ok;
+}
+
+napi_status frac64_from_napi(napi_env env, napi_value prop, GF_Fraction64 *frac)
+{
+	napi_status status;
+	napi_value v;
+	Bool has_p;
+	GET_PROP_FIELD_S64("num", "Fraction64", frac->num)
+	GET_PROP_FIELD_U64("den", "Fraction64", frac->den)
+	return napi_ok;
+}
+
+napi_value filter_get_statistics(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	GF_FilterStats stats;
+	napi_value res, val;
+	NARG_THIS
+	FILTER
+
+	e = gf_filter_get_stats(f, &stats);
+ 	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Failed to get filter stats");
+		return NULL;
+	}
+	NAPI_CALL(napi_create_object(env, &res) );
+
+#define SET_BOOL(_val) \
+	NAPI_CALL(napi_get_boolean(env, stats._val ? true : false, &val) ); \
+	NAPI_CALL(napi_set_named_property(env, res, #_val, val) );
+
+#define SET_U32(_val) \
+	NAPI_CALL(napi_create_uint32(env, stats._val, &val) ); \
+	NAPI_CALL(napi_set_named_property(env, res, #_val, val) );
+
+#define SET_U64(_val) \
+	NAPI_CALL(napi_create_int64(env, stats._val, &val) ); \
+	NAPI_CALL(napi_set_named_property(env, res, #_val, val) );
+
+#define SET_S64(_val) \
+	NAPI_CALL(napi_create_int64(env, stats._val, &val) ); \
+	NAPI_CALL(napi_set_named_property(env, res, #_val, val) );
+
+#define SET_S32(_val) \
+	NAPI_CALL(napi_create_int32(env, stats._val, &val) ); \
+	NAPI_CALL(napi_set_named_property(env, res, #_val, val) );
+
+#define SET_STR(_val) \
+	if (stats._val) {\
+		NAPI_CALL( napi_create_string_utf8(env, stats._val, NAPI_AUTO_LENGTH, &val) );\
+	} else {\
+		napi_get_null(env, &val);\
+	}\
+	NAPI_CALL(napi_set_named_property(env, res, #_val, val) );
+
+	NAPI_CALL(napi_get_boolean(env, stats.filter_alias ? true : false, &val) );
+	NAPI_CALL(napi_set_named_property(env, res, "filter_alias", val) );
+	if (stats.filter_alias) {
+		return res;
+	}
+	SET_U64(nb_tasks_done)
+	SET_U64(nb_pck_processed)
+	SET_U64(nb_bytes_processed)
+	SET_U64(nb_pck_sent)
+	SET_U64(nb_hw_pck_sent)
+	SET_U32(nb_errors)
+	SET_U64(nb_bytes_sent)
+	SET_U64(time_process)
+	SET_S32(percent)
+	SET_STR(status)
+	SET_BOOL(report_updated)
+	SET_STR(name)
+	SET_STR(reg_name)
+	SET_STR(filter_id)
+	SET_BOOL(done)
+	SET_U32(nb_pid_in)
+	SET_U64(nb_in_pck)
+	SET_U32(nb_pid_out)
+	SET_U64(nb_out_pck)
+	SET_BOOL(in_eos)
+	SET_U32(type)
+
+	NAPI_CALL( napi_create_string_utf8(env, gf_stream_type_name(stats.stream_type), NAPI_AUTO_LENGTH, &val) );
+	NAPI_CALL(napi_set_named_property(env, res, "streamtype", val) );
+
+	char *sep = NULL;
+	const char *codecid = gf_codecid_file_ext(stats.codecid);
+	if (codecid) sep = strchr(codecid, '|');
+	if (sep) {
+		NAPI_CALL( napi_create_string_utf8(env, codecid, sep-codecid, &val) );
+	} else {
+		NAPI_CALL( napi_create_string_utf8(env, codecid, NAPI_AUTO_LENGTH, &val) );
+	}
+	NAPI_CALL(napi_set_named_property(env, res, "codecid", val) );
+
+	NAPI_CALL(napi_set_named_property(env, res, "last_ts_sent", frac64_to_napi(env, &stats.last_ts_sent)) );
+	NAPI_CALL(napi_set_named_property(env, res, "last_ts_drop", frac64_to_napi(env, &stats.last_ts_drop)) );
+	return res;
+}
+
+
+napi_value prop_to_napi(napi_env env, const GF_PropertyValue *p, u32 p4cc)
+{
+	napi_value res, val;
+	u32 i;
+	napi_status status;
+
+
+	if (gf_props_type_is_enum(p->type)) {
+		NAPI_CALL( napi_create_string_utf8(env, gf_props_enum_name(p->type, p->value.uint), NAPI_AUTO_LENGTH, &res) );
+		return res;
+	}
+
+	switch (p->type) {
+	case GF_PROP_BOOL:
+		NAPI_CALL(napi_get_boolean(env, p->value.boolean ? true : false, &res) );
+		return res;
+	case GF_PROP_SINT:
+		NAPI_CALL(napi_create_int32(env, p->value.sint, &res) );
+		return res;
+	case GF_PROP_UINT:
+ if (p4cc== GF_PROP_PID_STREAM_TYPE) {
+			NAPI_CALL( napi_create_string_utf8(env, gf_stream_type_name(p->value.uint), NAPI_AUTO_LENGTH, &res) );
+			return res;
+		}
+ if (p4cc== GF_PROP_PID_PIXFMT) {
+			NAPI_CALL( napi_create_string_utf8(env, gf_pixel_fmt_sname(p->value.uint), NAPI_AUTO_LENGTH, &res) );
+			return res;
+		}
+ if (p4cc== GF_PROP_PID_CODECID) {
+			char *sep=NULL;
+			const char *codecid = gf_codecid_file_ext(p->value.uint);
+			if (codecid) sep = strchr(codecid, '|');
+			if (sep) {
+				NAPI_CALL( napi_create_string_utf8(env, codecid, sep-codecid, &res) );
+			} else {
+				NAPI_CALL( napi_create_string_utf8(env, codecid, NAPI_AUTO_LENGTH, &res) );
+			}
+			return res;
+		}
+		NAPI_CALL(napi_create_uint32(env, p->value.uint, &res) );
+		return res;
+	case GF_PROP_LSINT:
+		NAPI_CALL(napi_create_int64(env, p->value.longsint, &res) );
+		return res;
+	case GF_PROP_LUINT:
+		NAPI_CALL(napi_create_int64(env, p->value.longuint, &res) );
+		return res;
+	case GF_PROP_FRACTION:
+		return frac_to_napi(env, &p->value.frac);
+	case GF_PROP_FRACTION64:
+		return frac64_to_napi(env, &p->value.lfrac);
+	case GF_PROP_FLOAT:
+		NAPI_CALL(napi_create_double(env, (double) FIX2FLT(p->value.fnumber), &res) );
+		return res;
+	case GF_PROP_DOUBLE:
+		NAPI_CALL(napi_create_double(env, p->value.number, &res) );
+		return res;
+	case GF_PROP_STRING:
+	case GF_PROP_NAME:
+		if (p->value.string) {
+			NAPI_CALL( napi_create_string_utf8(env, p->value.string, NAPI_AUTO_LENGTH, &res) );
+		} else {
+			napi_get_null(env, &res);
+		}
+		return res;
+	case GF_PROP_4CC:
+		NAPI_CALL( napi_create_string_utf8(env, gf_4cc_to_str(p->value.uint), NAPI_AUTO_LENGTH, &res) );
+		return res;
+
+	case GF_PROP_VEC2I:
+		NAPI_CALL(napi_create_object(env, &res) );
+		NAPI_CALL(napi_create_int32(env, p->value.vec2i.x, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "x", val) );
+		NAPI_CALL(napi_create_int32(env, p->value.vec2i.y, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "y", val) );
+		return res;
+	case GF_PROP_VEC2:
+		NAPI_CALL(napi_create_object(env, &res) );
+		NAPI_CALL(napi_create_double(env, p->value.vec2.x, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "x", val) );
+		NAPI_CALL(napi_create_double(env, p->value.vec2.y, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "y", val) );
+		return res;
+	case GF_PROP_VEC3I:
+		NAPI_CALL(napi_create_object(env, &res) );
+		NAPI_CALL(napi_create_int32(env, p->value.vec3i.x, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "x", val) );
+		NAPI_CALL(napi_create_int32(env, p->value.vec3i.y, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "y", val) );
+		NAPI_CALL(napi_create_int32(env, p->value.vec3i.z, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "z", val) );
+		return res;
+	case GF_PROP_VEC4I:
+		NAPI_CALL(napi_create_object(env, &res) );
+		NAPI_CALL(napi_create_int32(env, p->value.vec3i.x, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "x", val) );
+		NAPI_CALL(napi_create_int32(env, p->value.vec3i.y, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "y", val) );
+		NAPI_CALL(napi_create_int32(env, p->value.vec3i.z, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "z", val) );
+		NAPI_CALL(napi_create_int32(env, p->value.vec3i.z, &val) );
+		NAPI_CALL(napi_set_named_property(env, res, "w", val) );
+		return res;
+	case GF_PROP_DATA:
+	case GF_PROP_DATA_NO_COPY:
+	case GF_PROP_CONST_DATA:
+		if (p->value.data.ptr) {
+#if 0
+			NAPI_CALL(napi_create_external_arraybuffer(env, p->value.data.ptr, p->value.data.size, dummy_finalize, NULL, &res) );
+#else
+			u8 *output;
+			NAPI_CALL(napi_create_buffer(env, p->value.data.size, (void**) &output, &res) );
+			memcpy(output, p->value.data.ptr, p->value.data.size);
+#endif
+		} else {
+			napi_get_null(env, &res);
+		}
+		return res;
+	case GF_PROP_POINTER:
+		NAPI_CALL( napi_create_string_utf8(env, "INTERNAL_POINTER", NAPI_AUTO_LENGTH, &res) );
+		return res;
+	case GF_PROP_UINT_LIST:
+		NAPI_CALL(napi_create_array_with_length(env, p->value.uint_list.nb_items, &res) );
+		for (i=0; i<p->value.uint_list.nb_items; i++) {
+			NAPI_CALL(napi_create_uint32(env, p->value.uint_list.vals[i], &val) );
+			NAPI_CALL(napi_set_element(env, res, i, val) );
+		}
+		return res;
+	case GF_PROP_SINT_LIST:
+		NAPI_CALL(napi_create_array_with_length(env, p->value.sint_list.nb_items, &res) );
+		for (i=0; i<p->value.uint_list.nb_items; i++) {
+			NAPI_CALL(napi_create_int32(env, p->value.sint_list.vals[i], &val) );
+			NAPI_CALL(napi_set_element(env, res, i, val) );
+		}
+		return res;
+	case GF_PROP_STRING_LIST:
+		NAPI_CALL(napi_create_array_with_length(env, p->value.string_list.nb_items, &res) );
+		for (i=0; i<p->value.string_list.nb_items; i++) {
+			if (p->value.string_list.vals[i]) {
+				NAPI_CALL( napi_create_string_utf8(env, p->value.string_list.vals[i], NAPI_AUTO_LENGTH, &val) );
+			} else {
+				napi_get_null(env, &val);
+			}
+			NAPI_CALL(napi_set_element(env, res, i, val) );
+		}
+		return res;
+	case GF_PROP_4CC_LIST:
+		NAPI_CALL(napi_create_array_with_length(env, p->value.uint_list.nb_items, &res) );
+		for (i=0; i<p->value.uint_list.nb_items; i++) {
+			NAPI_CALL( napi_create_string_utf8(env, gf_4cc_to_str(p->value.uint_list.vals[i]), NAPI_AUTO_LENGTH, &val) );
+			NAPI_CALL(napi_set_element(env, res, i, val) );
+		}
+		return res;
+	case GF_PROP_VEC2I_LIST:
+		NAPI_CALL(napi_create_array_with_length(env, p->value.v2i_list.nb_items, &res) );
+		for (i=0; i<p->value.v2i_list.nb_items; i++) {
+			napi_value item;
+			NAPI_CALL(napi_create_object(env, &item) );
+			NAPI_CALL(napi_create_int32(env, p->value.v2i_list.vals[i].x, &val) );
+			NAPI_CALL(napi_set_named_property(env, item, "x", val) );
+			NAPI_CALL(napi_create_int32(env, p->value.v2i_list.vals[i].y, &val) );
+			NAPI_CALL(napi_set_named_property(env, item, "y", val) );
+			NAPI_CALL(napi_set_element(env, res, i, item) );
+		}
+		return res;
+	default:
+		napi_throw_error(env, NULL, "unknown property type");
+		return NULL;
+	}
+}
+
+napi_status napi_get_str(napi_env env, napi_value val, char **ostr)
+{
+	GPAC_NAPI *gpac;
+	size_t s;
+	napi_status status;
+	status = napi_get_instance_data(env, (void **) &gpac);
+	if (status != napi_ok) return status;
+
+	napi_valuetype vtype;
+	status = napi_typeof(env, val, &vtype);
+	if (status != napi_ok) return status;
+	if (vtype == napi_null) {
+		*ostr = NULL;
+		return napi_ok;
+	}
+
+	status = napi_get_value_string_utf8(env, val, NULL, 0, &s);
+	if (status != napi_ok) return status;
+
+	if (s+1 > gpac->str_buf_alloc) {
+		gpac->str_buf = gf_realloc(gpac->str_buf, sizeof(char) * (s+1));
+		if (!gpac->str_buf) {
+			napi_throw_error(env, NULL, "Out of memory");
+			return napi_generic_failure;
+		}
+		gpac->str_buf_alloc = s+1;
+	}
+	status = napi_get_value_string_utf8(env, val, gpac->str_buf, gpac->str_buf_alloc, &s);
+	if (status != napi_ok) return status;
+	gpac->str_buf[s]=0;
+	*ostr = gpac->str_buf;
+	return napi_ok;
+}
+
+napi_status prop_from_napi(napi_env env, napi_value prop, u32 p4cc, char *pname, u32 custom_type, GF_PropertyValue *p)
+{
+	char *str;
+	napi_status status;
+	Bool has_p;
+	napi_value v;
+
+	memset(p, 0, sizeof(GF_PropertyValue));
+	if (!p4cc) {
+		if (!custom_type) {
+ p->type = GF_PROP_STRING;
+ status = napi_get_str(env, prop, &str);
+			if (status != napi_ok) return status;
+ p->value.string = str ? gf_strdup(str) : NULL;
+ return napi_ok;
+		}
+ p->type = custom_type;
+	} else {
+		p->type = gf_props_4cc_get_type(p4cc);
+	}
+
+ if (p4cc == GF_PROP_PID_STREAM_TYPE) {
+		status = napi_get_str(env, prop, &str);
+		if (status != napi_ok) return status;
+		if (!str) {
+			napi_throw_error(env, NULL, "Invalid StreamType");
+			return napi_generic_failure;
+		}
+ p->value.uint = gf_stream_type_by_name( str );
+ return napi_ok;
+	}
+ if (p4cc == GF_PROP_PID_CODECID) {
+		status = napi_get_str(env, prop, &str);
+		if (status != napi_ok) return status;
+		if (!str) {
+			napi_throw_error(env, NULL, "Invalid CodecID");
+			return napi_generic_failure;
+		}
+ p->value.uint = gf_codecid_parse( str );
+ return napi_ok;
+	}
+	if (gf_props_type_is_enum(p->type)) {
+		status = napi_get_str(env, prop, &str);
+		if (status != napi_ok) return status;
+		if (!str) {
+			napi_throw_error(env, NULL, "Invalid Enum");
+			return napi_generic_failure;
+		}
+		p->value.uint = gf_props_parse_enum(p->type, str);
+ return napi_ok;
+	}
+	if (p->type==GF_PROP_SINT) {
+		return napi_get_value_int32(env, prop, &p->value.sint);
+	}
+	if (p->type==GF_PROP_UINT) {
+		return napi_get_value_uint32(env, prop, &p->value.uint);
+	}
+	if (p->type==GF_PROP_4CC) {
+		status = napi_get_str(env, prop, &str);
+		if (status != napi_ok) return status;
+		if (!str) {
+			napi_throw_error(env, NULL, "Invalid 4CC");
+			return napi_generic_failure;
+		}
+		p->value.uint = gf_4cc_parse(str);
+		return napi_ok;
+	}
+	if (p->type==GF_PROP_LSINT) {
+		return napi_get_value_int64(env, prop, &p->value.longsint);
+	}
+	if (p->type==GF_PROP_LUINT) {
+		return napi_get_value_int64(env, prop, (s64 *) &p->value.longuint);
+	}
+	if (p->type==GF_PROP_BOOL) {
+		bool val;
+		status = napi_get_value_bool(env, prop, &val);
+		p->value.boolean = val ? GF_TRUE : GF_FALSE;
+		return status;
+	}
+
+	if (p->type==GF_PROP_FRACTION) {
+		GET_PROP_FIELD_S32("num", "Fraction", p->value.frac.num)
+		GET_PROP_FIELD_U32("den", "Fraction", p->value.frac.den)
+		return napi_ok;
+	}
+	if (p->type==GF_PROP_FRACTION64) {
+		GET_PROP_FIELD_S64("num", "Fraction64", p->value.lfrac.num)
+		GET_PROP_FIELD_U64("den", "Fraction64", p->value.lfrac.den)
+		return napi_ok;
+	}
+	if (p->type==GF_PROP_FLOAT) {
+		Double n;
+		status = napi_get_value_double(env, prop, &n);
+		p->value.fnumber = FLT2FIX(n);
+		return status;
+	}
+	if (p->type==GF_PROP_DOUBLE) {
+		return napi_get_value_double(env, prop, &p->value.number);
+	}
+	if (p->type==GF_PROP_VEC2I) {
+		GET_PROP_FIELD_S32("x", "Vec2i", p->value.vec2i.x)
+		GET_PROP_FIELD_S32("y", "Vec2i", p->value.vec2i.y)
+		return napi_ok;
+	}
+	if (p->type==GF_PROP_VEC2) {
+		GET_PROP_FIELD_FLT("x", "Vec2", p->value.vec2.x)
+		GET_PROP_FIELD_FLT("y", "Vec2", p->value.vec2.y)
+		return napi_ok;
+	}
+	if (p->type==GF_PROP_VEC3I) {
+		GET_PROP_FIELD_S32("x", "Vec3i", p->value.vec3i.x)
+		GET_PROP_FIELD_S32("y", "Vec3i", p->value.vec3i.y)
+		GET_PROP_FIELD_S32("z", "Vec3i", p->value.vec3i.z)
+		return napi_ok;
+	}
+	if (p->type==GF_PROP_VEC4I) {
+		GET_PROP_FIELD_S32("x", "Vec4i", p->value.vec4i.x)
+		GET_PROP_FIELD_S32("y", "Vec4i", p->value.vec4i.y)
+		GET_PROP_FIELD_S32("z", "Vec4i", p->value.vec4i.z)
+		GET_PROP_FIELD_S32("w", "Vec4i", p->value.vec4i.w)
+		return napi_ok;
+	}
+	if ((p->type==GF_PROP_STRING) || (p->type==GF_PROP_STRING_NO_COPY) || (p->type==GF_PROP_NAME)) {
+		status = napi_get_str(env, prop, &str);
+		if (status != napi_ok) return status;
+		p->value.string = str ? gf_strdup(p->value.string) : NULL;
+		return napi_ok;
+	}
+	if ((p->type==GF_PROP_DATA) || (p->type==GF_PROP_DATA_NO_COPY) || (p->type==GF_PROP_CONST_DATA)) {
+		napi_throw_error(env, NULL, "Setting data property from JS not yet implemented");
+		return napi_generic_failure;
+	}
+	if (p->type==GF_PROP_POINTER) {
+		napi_throw_error(env, NULL, "Setting pointer property from JS not supported");
+		return napi_generic_failure;
+	}
+
+	if ((p->type==GF_PROP_UINT_LIST) || (p->type==GF_PROP_4CC_LIST)
+		|| (p->type==GF_PROP_SINT_LIST) || (p->type==GF_PROP_VEC2I_LIST)
+ 		|| (p->type==GF_PROP_STRING_LIST)
+	) {
+		Bool is_array;
+		u32 i, nb_items;
+		size_t size;
+		status = napi_is_array(env, prop, (bool *) &is_array);
+		if (!is_array) {
+			napi_throw_error(env, NULL, "Property value not an array");
+			return napi_generic_failure;
+		}
+		//use uint list for nb_items
+		status = napi_get_array_length(env, prop, &nb_items);
+		p->value.uint_list.nb_items = nb_items;
+		if (!p->value.uint_list.nb_items) {
+			p->value.uint_list.vals = NULL;
+			return status;
+		}
+		if (p->type==GF_PROP_STRING_LIST) size = sizeof(char *) * nb_items;
+		else if (p->type==GF_PROP_VEC2I_LIST) size = sizeof(GF_PropVec2i) * nb_items;
+		else size = sizeof(u32) * nb_items;
+
+		p->value.uint_list.vals = gf_malloc(size);
+		if (!p->value.uint_list.vals) {
+			napi_throw_error(env, NULL, "Failed to allocate property");
+			return napi_generic_failure;
+		}
+		memset(p->value.uint_list.vals, 0, size);
+
+		for (i=0; i<nb_items; i++) {
+			napi_value val;
+			status = napi_get_element(env, prop, i, &val);
+			if (status != napi_ok) return status;
+
+			if (p->type==GF_PROP_STRING_LIST) {
+				napi_valuetype vtype;
+				napi_typeof(env, val, &vtype);
+				if (vtype == napi_null) {
+					p->value.string_list.vals[i] = NULL;
+				} else {
+					status = napi_get_value_string_utf8(env, val, NULL, 0, &size);
+					if (status != napi_ok) return status;
+					p->value.string_list.vals[i] = gf_malloc(sizeof(char) * (size+1) );
+					if (!p->value.string_list.vals[i]) return napi_generic_failure;
+					status = napi_get_value_string_utf8(env, val, p->value.string_list.vals[i], size+1, &size);
+					if (status != napi_ok) return status;
+					p->value.string_list.vals[i] [size]=0;
+				}
+			}
+			else if (p->type==GF_PROP_VEC2I_LIST) {
+				GET_PROP_FIELD_S32("x", "Vec2i", p->value.v2i_list.vals[i].x)
+				GET_PROP_FIELD_S32("y", "Vec2i", p->value.v2i_list.vals[i].y)
+			} else if (p->type==GF_PROP_SINT_LIST) {
+				status = napi_get_value_int32(env, val, &p->value.sint_list.vals[i]);
+				if (status != napi_ok) return status;
+			} else if (p->type==GF_PROP_UINT_LIST) {
+				status = napi_get_value_uint32(env, val, &p->value.uint_list.vals[i]);
+				if (status != napi_ok) return status;
+			} else if (p->type==GF_PROP_4CC_LIST) {
+				status = napi_get_str(env, prop, &str);
+				if (status != napi_ok) return status;
+				if (str && (strlen(str)==4)) {
+					p->value.uint_list.vals[i] = GF_4CC(str[0], str[1], str[2], str[3]);
+				} else {
+					napi_throw_error(env, NULL, "Invalid 4CC, needs 4 characters");
+					return napi_generic_failure;
+				}
+				if (status != napi_ok) return status;
+			}
+		}
+	}
+
+	napi_throw_error(env, NULL, "Unsupported property type");
+	return napi_generic_failure;
+}
+
+napi_value filter_enum_pid_props(napi_env env, napi_value cbk_fun, GF_FilterPid *pid)
+{
+	napi_value res, global;
+	napi_status status;
+	napi_valuetype rtype;
+	napi_typeof(env, cbk_fun, &rtype);
+	if (rtype != napi_function) {
+		napi_throw_error(env, NULL, "property enumerator is not a function");
+		return NULL;
+	}
+
+	NAPI_CALL( napi_get_global(env, &global) );
+	u32 prop_idx=0;
+	while (1) {
+		napi_handle_scope scope_h;
+		u32 p4cc=0;
+		napi_value fun_args[3];
+		const char *pname = NULL;
+		const GF_PropertyValue *prop = gf_filter_pid_enum_properties(pid, &prop_idx, &p4cc, &pname);
+		if (!prop) break;
+
+		NAPI_CALL(napi_open_handle_scope(env, &scope_h) );
+
+		if (p4cc) {
+			pname = gf_props_4cc_get_name(p4cc);
+			if (!pname) pname = gf_4cc_to_str(p4cc);
+		}
+
+		NAPI_CALL( napi_create_string_utf8(env, pname, NAPI_AUTO_LENGTH, &fun_args[0]) );
+		fun_args[1] = prop_to_napi(env, prop, p4cc);
+		NAPI_CALL( napi_create_int32(env, prop->type, &fun_args[2]) );
+
+		NAPI_CALL(napi_call_function(env, global, cbk_fun, 3, fun_args, &res) );
+		NAPI_CALL(napi_close_handle_scope(env, scope_h) );
+	}
+	return NULL;
+}
+
+napi_value filter_iopid_enum_props(napi_env env, napi_callback_info info, Bool is_opid)
+{
+	GF_FilterPid *pid=NULL;
+	NARG_ARGS_THIS(2, 2)
+	FILTER
+	NARG_U32(idx, 0, 0)
+
+	if (is_opid) {
+		pid = gf_filter_get_opid(f, idx);
+	} else {
+		pid = gf_filter_get_ipid(f, idx);
+	}
+	if (!pid) {
+		napi_throw_error(env, NULL, "Invalid PID index");
+		return NULL;
+	}
+	return filter_enum_pid_props(env, argv[1], pid);
+}
+
+napi_value filter_ipid_enum_props(napi_env env, napi_callback_info info)
+{
+	return filter_iopid_enum_props(env, info, GF_FALSE);
+}
+napi_value filter_opid_enum_props(napi_env env, napi_callback_info info)
+{
+	return filter_iopid_enum_props(env, info, GF_TRUE);
+}
+
+napi_value filter_get_pid_property(napi_env env, char *pname, GF_FilterPid *pid, Bool is_info)
+{
+	napi_status status;
+	napi_value res;
+	GF_PropertyEntry *pe=NULL;
+	u32 p4cc = gf_props_get_id(pname);
+	const GF_PropertyValue *prop = NULL;
+
+	if (is_info) {
+		if (p4cc)
+			prop = gf_filter_pid_get_info(pid, p4cc, &pe);
+		else
+			prop = gf_filter_pid_get_info_str(pid, pname, &pe);
+	} else {
+		if (p4cc)
+			prop = gf_filter_pid_get_property(pid, p4cc);
+		else
+			prop = gf_filter_pid_get_property_str(pid, pname);
+	}
+	if (!prop) {
+		napi_value res;
+		NAPI_CALL(napi_get_null(env, &res) );
+		return res;
+	}
+	res = prop_to_napi(env, prop, p4cc);
+	gf_filter_release_property(pe);
+	return res;
+}
+
+napi_value filter_iopid_prop(napi_env env, napi_callback_info info, Bool is_opid)
+{
+	GF_FilterPid *pid=NULL;
+	NARG_ARGS_THIS(2, 2)
+	FILTER
+	NARG_U32(idx, 0, 0)
+	NARG_STR(name, 1, 0)
+
+	if (is_opid) {
+		pid = gf_filter_get_opid(f, idx);
+	} else {
+		pid = gf_filter_get_ipid(f, idx);
+	}
+	if (!pid) {
+		napi_throw_error(env, NULL, "Invalid PID index");
+		return NULL;
+	}
+	return filter_get_pid_property(env, name, pid, GF_FALSE);
+}
+napi_value filter_ipid_prop(napi_env env, napi_callback_info info)
+{
+	return filter_iopid_prop(env, info, GF_FALSE);
+}
+napi_value filter_opid_prop(napi_env env, napi_callback_info info)
+{
+	return filter_iopid_prop(env, info, GF_TRUE);
+}
+
+napi_value filter_ipid_source(napi_env env, napi_callback_info info)
+{
+	GF_FilterPid *pid=NULL;
+	NARG_ARGS_THIS(1, 1)
+	FILTER
+	NARG_U32(idx, 0, 0)
+
+	pid = gf_filter_get_ipid(f, idx);
+	if (!pid) {
+		napi_throw_error(env, NULL, "Invalid PID index");
+		return NULL;
+	}
+	GF_Filter *f_src = gf_filter_pid_get_source_filter(pid);
+
+	NAPI_Filter *napi_f = (NAPI_Filter *) gf_filter_get_rt_udta(f);
+	return fs_wrap_filter(env, napi_f->fs, f_src);
+}
+
+napi_value filter_opid_sinks(napi_env env, napi_callback_info info)
+{
+	napi_value res;
+	u32 i;
+	GF_FilterPid *pid=NULL;
+	NARG_ARGS_THIS(1, 1)
+	FILTER
+	NARG_U32(idx, 0, 0)
+
+	pid = gf_filter_get_opid(f, idx);
+	if (!pid) {
+		napi_throw_error(env, NULL, "Invalid PID index");
+		return NULL;
+	}
+	NAPI_CALL(napi_create_array(env, &res) );
+
+	NAPI_Filter *napi_f = (NAPI_Filter *) gf_filter_get_rt_udta(f);
+	i=0;
+	while (1) {
+		GF_Filter *f_dst = gf_filter_pid_enum_destinations(pid, i);
+		if (!f_dst) break;
+
+		NAPI_CALL(napi_set_element(env, res, i, fs_wrap_filter(env, napi_f->fs, f_dst) ) );
+		i++;
+	}
+	return res;
+}
+
+napi_value filter_get_info(napi_env env, napi_callback_info info)
+{
+	napi_value res;
+	u32 p4cc;
+	NARG_ARGS_THIS(1, 1)
+	FILTER
+	NARG_STR(prop_name, 0, NULL);
+
+	const GF_PropertyValue *prop;
+	GF_PropertyEntry *pe=NULL;
+	p4cc =gf_props_get_id(prop_name);
+	if (p4cc) {
+		prop = gf_filter_get_info(f, p4cc, &pe);
+	} else {
+		prop = gf_filter_get_info_str(f, prop_name, &pe);
+	}
+	if (prop) {
+		res = prop_to_napi(env, prop, p4cc);
+	} else {
+		NAPI_CALL( napi_get_null(env, &res) );
+	}
+	gf_filter_release_property(pe);
+	return res;
+}
+
+napi_value filter_all_args(napi_env env, napi_callback_info info)
+{
+	napi_value res;
+	u32 a_idx;
+	NARG_THIS
+	FILTER
+
+	NAPI_CALL(napi_create_array(env, &res) );
+	a_idx=0;
+	while (1) {
+		napi_value n_arg, val;
+		const GF_FilterArgs *arg = gf_filter_enumerate_args(f, a_idx);
+		if (!arg) break;
+
+		NAPI_CALL(napi_create_object(env, &n_arg) );
+
+		NAPI_CALL( napi_create_string_utf8(env, arg->arg_name, NAPI_AUTO_LENGTH, &val) );
+		NAPI_CALL(napi_set_named_property(env, n_arg, "name", val) );
+		NAPI_CALL( napi_create_string_utf8(env, arg->arg_desc, NAPI_AUTO_LENGTH, &val) );
+		NAPI_CALL(napi_set_named_property(env, n_arg, "desc", val) );
+		NAPI_CALL( napi_create_int32(env, arg->arg_type, &val) );
+		NAPI_CALL(napi_set_named_property(env, n_arg, "type", val) );
+
+		if (arg->arg_default_val) {
+			NAPI_CALL( napi_create_string_utf8(env, arg->arg_default_val, NAPI_AUTO_LENGTH, &val) );
+		} else {
+			NAPI_CALL( napi_get_null(env, &val) );
+		}
+		NAPI_CALL(napi_set_named_property(env, n_arg, "default", val) );
+
+		if (arg->min_max_enum) {
+			NAPI_CALL( napi_create_string_utf8(env, arg->min_max_enum, NAPI_AUTO_LENGTH, &val) );
+		} else {
+			NAPI_CALL( napi_get_null(env, &val) );
+		}
+		NAPI_CALL(napi_set_named_property(env, n_arg, "min_max_enum", val) );
+
+		NAPI_CALL( napi_create_int32(env, arg->flags, &val) );
+		NAPI_CALL(napi_set_named_property(env, n_arg, "flags", val) );
+
+		NAPI_CALL(napi_set_element(env, res, a_idx, n_arg) );
+		a_idx++;
+	}
+	return res;
+}
+
+/* custom filters*/
+static GF_Err napi_filter_cbk_process(GF_Filter *filter)
+{
+	napi_status status;
+	napi_value obj, fun_val, res;
+	NAPI_Filter *napi_f = gf_filter_get_rt_udta(filter);
+	if (!napi_f) return GF_SERVICE_ERROR;
+
+	napi_get_reference_value(napi_f->env, napi_f->ref, &obj);
+	Bool has_fun = GF_FALSE;
+	napi_has_named_property(napi_f->env, obj, "process", (bool *) &has_fun);
+	if (!has_fun) return GF_EOS;
+
+	status = napi_get_named_property(napi_f->env, obj, "process", &fun_val);
+	if (status != napi_ok) return GF_BAD_PARAM;
+
+	status = napi_make_callback(napi_f->env, napi_f->async_ctx, obj, fun_val, 0, NULL, &res);
+
+	GF_Err e = GF_OK;
+	napi_get_value_int32(napi_f->env, res, &e);
+	return e;
+}
+
+void filter_inputpid_finalize(napi_env env, void* finalize_data, void* finalize_hint)
+{
+	//finalize_hint contains napi_pid
+	NAPI_FilterPid *napi_pid = (NAPI_FilterPid *)finalize_hint;
+	gf_free(napi_pid);
+}
+
+static NAPI_FilterPid *wrap_filter_pid(napi_env env, GF_Filter *filter, GF_FilterPid *pid, Bool is_input)
+{
+	NAPI_FilterPid *napi_pid;
+	napi_value pid_obj;
+
+	GF_SAFEALLOC(napi_pid, NAPI_FilterPid);
+	if (!napi_pid) {
+		return NULL;
+	}
+	gf_filter_pid_set_udta(pid, napi_pid);
+	napi_pid->f = filter;
+	napi_pid->pid = pid;
+
+	napi_create_object(env, &pid_obj);
+	napi_create_reference(env, pid_obj, 1, &napi_pid->ref);
+	napi_type_tag_object(env, pid_obj, &filterpid_tag);
+
+	napi_wrap(env, pid_obj, pid, is_input ? filter_inputpid_finalize : dummy_finalize, napi_pid, NULL);
+
+	//define all props for custom filter
+	napi_property_descriptor filterpid_properties[] = {
+		{ "name", NULL, NULL, filterpid_getter, filterpid_setter, NULL, napi_enumerable, &FS_PROP_PID_NAME},
+		{ "filter_name", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_FILTERNAME},
+		{ "eos", NULL, NULL, filterpid_getter, filterpid_setter, NULL, napi_enumerable, &FS_PROP_PID_EOS},
+		{ "has_seen_eos", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_HAS_SEEN_EOS},
+		{ "eos_received", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_HAS_RECEIVED},
+		{ "would_block", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_WOULD_BLOCK},
+		{ "max_buffer", NULL, NULL, filterpid_getter, filterpid_setter, NULL, napi_enumerable, &FS_PROP_PID_MAX_BUFFER},
+		{ "buffer", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_BUFFER},
+		{ "buffer_full", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_BUFFER_FULL},
+		{ "first_empty", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_FIRST_EMPTY},
+		{ "first_cts", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_FIRST_CTS},
+		{ "nb_pck_queued", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_NB_PCK_QUEUED},
+		{ "timescale", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_TIMESCALE},
+		{ "min_pck_dur", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_MIN_PCK_DUR},
+		{ "playing", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_PLAYING},
+		{ "next_ts", NULL, NULL, filterpid_getter, NULL, NULL, napi_enumerable, &FS_PROP_PID_NEXT_TS},
+
+		{ "remove", 0, filterpid_remove, 0, 0, 0, napi_enumerable, 0 },
+		{ "enum_props", 0, filterpid_enum_props, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_prop", 0, filterpid_get_prop, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_info", 0, filterpid_get_info, 0, 0, 0, napi_enumerable, 0 },
+		{ "copy_props", 0, filterpid_copy_props, 0, 0, 0, napi_enumerable, 0 },
+		{ "reset_props", 0, filterpid_reset_props, 0, 0, 0, napi_enumerable, 0 },
+		{ "set_prop", 0, filterpid_set_prop, 0, 0, 0, napi_enumerable, 0 },
+		{ "set_info", 0, filterpid_set_info, 0, 0, 0, napi_enumerable, 0 },
+		{ "clear_eos", 0, filterpid_clear_eos, 0, 0, 0, napi_enumerable, 0 },
+		{ "check_caps", 0, filterpid_check_caps, 0, 0, 0, napi_enumerable, 0 },
+		{ "discard_block", 0, filterpid_discard_block, 0, 0, 0, napi_enumerable, 0 },
+		{ "allow_direct_dispatch", 0, filterpid_allow_direct_dispatch, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_clock_type", 0, filterpid_get_clock_type, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_clock_timestamp", 0, filterpid_get_clock_timestamp, 0, 0, 0, napi_enumerable, 0 },
+		{ "is_filter_in_parents", 0, filterpid_is_filter_in_parents, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_buffer_occupancy", 0, filterpid_get_buffer_occupancy, 0, 0, 0, napi_enumerable, 0 },
+		{ "loose_connect", 0, filterpid_loose_connect, 0, 0, 0, napi_enumerable, 0 },
+		{ "set_framing", 0, filterpid_set_framing, 0, 0, 0, napi_enumerable, 0 },
+		{ "set_clock_mode", 0, filterpid_set_clock_mode, 0, 0, 0, napi_enumerable, 0 },
+		{ "set_discard", 0, filterpid_set_discard, 0, 0, 0, napi_enumerable, 0 },
+		{ "require_source_id", 0, filterpid_require_source_id, 0, 0, 0, napi_enumerable, 0 },
+		{ "recompute_dts", 0, filterpid_recompute_dts, 0, 0, 0, napi_enumerable, 0 },
+		{ "resolve_template", 0, filterpid_resolve_template, 0, 0, 0, napi_enumerable, 0 },
+		{ "query_cap", 0, filterpid_query_cap, 0, 0, 0, napi_enumerable, 0 },
+		{ "negociate_cap", 0, filterpid_negociate_cap, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_packet", 0, filterpid_get_packet, 0, 0, 0, napi_enumerable, 0 },
+		{ "drop_packet", 0, filterpid_drop_packet, 0, 0, 0, napi_enumerable, 0 },
+		{ "send_event", 0, filterpid_send_event, 0, 0, 0, napi_enumerable, 0 },
+		{ "forward", 0, filterpid_forward, 0, 0, 0, napi_enumerable, 0 },
+		{ "new_pck", 0, filterpid_new_pck, 0, 0, 0, napi_enumerable, 0 },
+		{ "new_pck_ref", 0, filterpid_new_pck_ref, 0, 0, 0, napi_enumerable, 0 },
+		{ "new_pck_shared", 0, filterpid_new_pck_shared, 0, 0, 0, napi_enumerable, 0 },
+		{ "new_pck_copy", 0, filterpid_new_pck_copy, 0, 0, 0, napi_enumerable, 0 },
+		{ "new_pck_clone", 0, filterpid_new_pck_clone, 0, 0, 0, napi_enumerable, 0 },
+	};
+
+	napi_define_properties(env, pid_obj, sizeof(filterpid_properties)/sizeof(napi_property_descriptor), filterpid_properties);
+
+	return napi_pid;
+}
+static GF_Err napi_filter_cbk_configure(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_Err e=GF_OK;
+	napi_value args[2];
+	napi_status status;
+	napi_value obj, fun_val, res;
+	NAPI_Filter *napi_f = gf_filter_get_rt_udta(filter);
+	Bool has_fun = GF_FALSE;
+	if (!napi_f) return GF_SERVICE_ERROR;
+
+	napi_get_reference_value(napi_f->env, napi_f->ref, &obj);
+
+	NAPI_FilterPid *napi_pid = gf_filter_pid_get_udta(pid);
+
+	napi_has_named_property(napi_f->env, obj, "configure_pid", (bool *) &has_fun);
+	if (has_fun) {
+		status = napi_get_named_property(napi_f->env, obj, "configure_pid", &fun_val);
+		if (status != napi_ok) has_fun = GF_FALSE;
+	}
+
+	if (is_remove) {
+		if (napi_pid) {
+			if (has_fun) {
+				napi_get_reference_value(napi_f->env, napi_pid->ref, &args[0]);
+				napi_get_boolean(napi_f->env, (bool) 1, &args[1]);
+				status = napi_make_callback(napi_f->env, napi_f->async_ctx, obj, fun_val, 2, args, &res);
+				status = napi_get_value_int32(napi_f->env, res, &e);
+			}
+			u32 rcount;
+			napi_reference_unref(napi_f->env, napi_pid->ref, &rcount);
+			napi_delete_reference(napi_f->env, napi_pid->ref);
+			napi_pid->pid = NULL;
+			gf_filter_pid_set_udta(pid, NULL);
+		}
+		return e;
+	}
+	if (!napi_pid) {
+		napi_pid = wrap_filter_pid(napi_f->env, filter, pid, GF_TRUE);
+		if (!napi_pid) return GF_OUT_OF_MEM;
+	}
+
+	if (has_fun) {
+		napi_get_reference_value(napi_f->env, napi_pid->ref, &args[0]);
+		napi_get_boolean(napi_f->env, (bool) 0, &args[1]);
+		status = napi_make_callback(napi_f->env, napi_f->async_ctx, obj, fun_val, 2, args, &res);
+		status = napi_get_value_int32(napi_f->env, res, &e);
+	}
+
+	return e;
+}
+static GF_Err napi_filter_cbk_reconfigure_output(GF_Filter *filter, GF_FilterPid *pid)
+{
+	GF_Err e=GF_OK;
+	napi_value args[1];
+	napi_status status;
+	napi_value obj, fun_val, res;
+	NAPI_Filter *napi_f = gf_filter_get_rt_udta(filter);
+	Bool has_fun = GF_FALSE;
+	if (!napi_f) return GF_SERVICE_ERROR;
+
+	napi_get_reference_value(napi_f->env, napi_f->ref, &obj);
+
+	NAPI_FilterPid *napi_pid = gf_filter_pid_get_udta(pid);
+	if (!napi_pid) return GF_SERVICE_ERROR;
+
+	napi_has_named_property(napi_f->env, obj, "reconfigure_output", (bool *) &has_fun);
+	if (has_fun) {
+		status = napi_get_named_property(napi_f->env, obj, "reconfigure_output", &fun_val);
+		if (status != napi_ok) has_fun = GF_FALSE;
+	}
+	//by default return not supported
+	e = GF_NOT_SUPPORTED;
+	if (has_fun) {
+		napi_get_reference_value(napi_f->env, napi_pid->ref, &args[0]);
+		status = napi_make_callback(napi_f->env, napi_f->async_ctx, obj, fun_val, 1, args, &res);
+		status = napi_get_value_int32(napi_f->env, res, &e);
+	}
+	return e;
+}
+
+static Bool napi_filter_cbk_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	napi_status status;
+	napi_value obj, fun_val, arg, res;
+	NAPI_Filter *napi_f = gf_filter_get_rt_udta(filter);
+	if (!napi_f) return GF_FALSE;
+
+	napi_get_reference_value(napi_f->env, napi_f->ref, &obj);
+	Bool has_fun = GF_FALSE;
+	napi_has_named_property(napi_f->env, obj, "process_event", (bool *) &has_fun);
+	if (!has_fun) return GF_FALSE;
+
+	status = napi_get_named_property(napi_f->env, obj, "process_event", &fun_val);
+	if (status != napi_ok) return GF_BAD_PARAM;
+
+	arg = wrap_filterevent(napi_f->env, (GF_FilterEvent *)evt, NULL);
+	status = napi_make_callback(napi_f->env, napi_f->async_ctx, obj, fun_val, 1, &arg, &res);
+
+	bool ret = GF_FALSE;
+	napi_get_value_bool(napi_f->env, res, &ret);
+	return ret ? GF_TRUE : GF_FALSE;
+}
+
+static u32 FS_PROP_CUST_BLOCK_ENABLED = 0;
+static u32 FS_PROP_CUST_OUTPUT_BUFFER = 1;
+static u32 FS_PROP_CUST_PLAYOUT_BUFFER = 2;
+static u32 FS_PROP_CUST_SINKS_DONE = 3;
+static u32 FS_PROP_CUST_EVTS_QUEUED = 4;
+static u32 FS_PROP_CUST_CK_HINT_TIME = 5;
+static u32 FS_PROP_CUST_CK_HINT_MEDIATIME = 6;
+static u32 FS_PROP_CUST_CONNECTIONS_PENDING = 7;
+
+napi_value filter_cust_getter(napi_env env, napi_callback_info info)
+{
+	void *magic;
+	napi_status status;
+	napi_value this_val, ret;
+	NAPI_CALL(napi_get_cb_info(env, info, NULL, NULL, &this_val, &magic) );
+	FILTER
+	FILTER_CUST
+
+	if (magic == &FS_PROP_CUST_BLOCK_ENABLED) {
+		NAPI_CALL( napi_get_boolean(env, (bool) gf_filter_block_enabled(f), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_CUST_OUTPUT_BUFFER) {
+		u32 val;
+		gf_filter_get_output_buffer_max(f, &val, NULL);
+		NAPI_CALL( napi_create_uint32(env, val, &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_CUST_PLAYOUT_BUFFER) {
+		u32 val;
+		gf_filter_get_output_buffer_max(f, NULL, &val);
+		NAPI_CALL( napi_create_uint32(env, val, &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_CUST_SINKS_DONE) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_all_sinks_done(f), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_CUST_EVTS_QUEUED) {
+		NAPI_CALL( napi_create_uint32(env, gf_filter_get_num_events_queued(f), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_CUST_CK_HINT_TIME) {
+ u64 val;
+ gf_filter_get_clock_hint(f, &val, NULL);
+		NAPI_CALL( napi_create_int64(env, val, &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_CUST_CK_HINT_MEDIATIME) {
+ GF_Fraction64 val;
+ gf_filter_get_clock_hint(f, NULL, &val);
+ ret = frac64_to_napi(env, &val);
+		return ret;
+	}
+	if (magic == &FS_PROP_CUST_CONNECTIONS_PENDING) {
+		NAPI_CALL( napi_get_boolean(env, gf_filter_connections_pending(f), &ret) );
+		return ret;
+	}
+	return NULL;
+}
+
+napi_value filter_push_cap(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	char *pname=NULL;
+	u32 p4cc=0;
+	GF_PropertyValue prop;
+	NARG_ARGS_THIS(5, 3)
+	FILTER
+	FILTER_CUST
+
+	napi_valuetype rtype;
+	napi_typeof(env, argv[0], &rtype);
+	if (rtype == napi_string) {
+		NARG_STR(prop_name, 0, NULL)
+		pname = prop_name;
+		p4cc = gf_props_get_id(pname);
+	} else {
+		NARG_U32(pcode, 0, 0)
+		p4cc = pcode;
+	}
+	NARG_U32(flags, 2, 0)
+	NARG_U32(priority, 3, 0)
+	NARG_U32(custom_type, 4, 0)
+
+	if (p4cc) pname = NULL;
+
+	//clone prop name as prop from napi may reuse the global arg buffer
+	if (pname) pname = gf_strdup(pname);
+	//convert napi_prop to prop
+	status = prop_from_napi(env, argv[1], p4cc, pname, custom_type, &prop);
+	if (status == napi_ok) {
+		e = gf_filter_push_caps(f, p4cc, &prop, pname, flags, priority);
+	} else {
+		e = GF_BAD_PARAM;
+	}
+	if (pname) gf_free(pname);
+	//do not reset property, it is now owned by filter
+
+ 	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Error assigning cap");
+	}
+	return NULL;
+}
+
+napi_value filter_update_status(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(2, 1)
+	FILTER
+	FILTER_CUST
+
+	NARG_STR(fstatus, 0, NULL)
+	NARG_U32(percent, 1, 0)
+	gf_filter_update_status(f, percent, fstatus);
+	return NULL;
+}
+
+napi_value filter_reschedule(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 0)
+	FILTER
+	FILTER_CUST
+	NARG_U32(when, 0, 0)
+
+	if (when)
+		gf_filter_ask_rt_reschedule(f, when);
+	else
+		gf_filter_post_process_task(f);
+	return NULL;
+}
+
+napi_value filter_notify_failure(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(2, 1)
+	FILTER
+	FILTER_CUST
+	NARG_S32(err, 0, 0)
+	NARG_U32(type, 1, GF_SETUP_ERROR)
+
+	if (type==GF_NOTIF_ERROR)
+		gf_filter_notification_failure(f, err, GF_FALSE);
+	else if (type==GF_NOTIF_ERROR_AND_DISCONNECT)
+		gf_filter_notification_failure(f, err, GF_TRUE);
+	else
+		gf_filter_setup_failure(f, err);
+	return NULL;
+}
+
+
+napi_value filter_make_sticky(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTER
+	FILTER_CUST
+	gf_filter_make_sticky(f);
+	return NULL;
+}
+
+napi_value filter_prevent_blocking(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 1)
+	FILTER
+	FILTER_CUST
+	NARG_BOOL(enable, 0, 0)
+	gf_filter_prevent_blocking(f, enable);
+	return NULL;
+}
+napi_value filter_block_eos(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 1)
+	FILTER
+	FILTER_CUST
+	NARG_BOOL(enable, 0, 0)
+	gf_filter_block_eos(f, enable);
+	return NULL;
+}
+napi_value filter_set_max_pids(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 1)
+	FILTER
+	FILTER_CUST
+	NARG_U32(max_extra_pids, 0, 0)
+	gf_filter_set_max_extra_input_pids(f, max_extra_pids);
+	return NULL;
+}
+napi_value filter_hint_clock(napi_env env, napi_callback_info info)
+{
+	GF_Fraction64 frac;
+	NARG_ARGS_THIS(2, 2)
+	FILTER
+	FILTER_CUST
+	NARG_U64(clock_us, 0, 0)
+	NAPI_CALL(frac64_from_napi(env, argv[1], &frac) );
+
+	gf_filter_hint_single_clock(f, clock_us, frac);
+	return NULL;
+}
+
+napi_value filter_new_pid(napi_env env, napi_callback_info info)
+{
+	napi_value ret;
+	NARG_THIS
+	FILTER
+	FILTER_CUST
+
+	GF_FilterPid *opid = gf_filter_pid_new(f);
+	if (!opid) {
+		napi_throw_error(env, NULL, "Failed to create new output PID");
+		return NULL;
+	}
+
+	NAPI_FilterPid *napi_pid = wrap_filter_pid(env, f, opid, GF_FALSE);
+	if (!napi_pid) {
+		napi_throw_error(env, NULL, "Failed to create new output PID");
+		return NULL;
+	}
+	napi_get_reference_value(env, napi_pid->ref, &ret);
+	return ret;
+}
+
+napi_value filter_print_connections(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTER
+	FILTER_CUST
+	gf_filter_print_all_connections(f, NULL);
+	return NULL;
+}
+
+
+#define FILTER_SESSION\
+	GF_FilterSession *fs;\
+	bool _tag;\
+	NAPI_CALL( napi_unwrap(env, this_val, (void**) &fs) );\
+	NAPI_CALL( napi_check_object_type_tag(env, this_val, &filtersession_tag, &_tag) );\
+	if (!_tag) {\
+		napi_throw_error(env, NULL, "Not a FilterSession object");\
+		return NULL;\
+	}\
+
+
+static u32 FS_PROP_LAST_TASK = 0;
+static u32 FS_PROP_NB_FILTERS = 1;
+static u32 FS_PROP_HTTP_RATE = 2;
+static u32 FS_PROP_MAX_HTTP_RATE = 3;
+
+napi_value fs_getter(napi_env env, napi_callback_info info)
+{
+	void *magic;
+	napi_status status;
+	napi_value this_val, ret;
+	NAPI_CALL(napi_get_cb_info(env, info, NULL, NULL, &this_val, &magic) );
+	FILTER_SESSION
+
+	if (magic == &FS_PROP_LAST_TASK) {
+		NAPI_CALL( napi_get_boolean(env, (bool) gf_fs_is_last_task(fs), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_NB_FILTERS) {
+		NAPI_CALL( napi_create_uint32(env, gf_fs_get_filters_count(fs), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_HTTP_RATE) {
+		NAPI_CALL( napi_create_uint32(env, gf_fs_get_http_rate(fs), &ret) );
+		return ret;
+	}
+	if (magic == &FS_PROP_MAX_HTTP_RATE) {
+		NAPI_CALL( napi_create_uint32(env, gf_fs_get_http_max_rate(fs), &ret) );
+		return ret;
+	}
+	return NULL;
+}
+
+napi_value fs_setter(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS_MAGIC(1, 1)
+	FILTER_SESSION
+
+	if (magic == &FS_PROP_MAX_HTTP_RATE) {
+		NARG_U32(new_rate, 0, 0);
+		gf_fs_set_http_max_rate(fs, new_rate);
+		return NULL;
+	}
+	return NULL;
+}
+
+napi_value fs_run(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	NARG_THIS
+	FILTER_SESSION
+	NAPI_GPAC
+	NAPI_Session *napi_fs = gf_fs_get_rt_udta(fs);
+
+	if (napi_fs->blocking) {
+		//session is running in blocking mode, schedule task to call NodeJS from main thread
+		if (gpac->rmt_ref) {
+			gpac->fs_rmt_handler = napi_fs;
+			gpac->rmt_task_scheduled = GF_TRUE;
+			gf_fs_post_user_task(fs, fs_flush_rmt, napi_fs, "RemoteryFlush");
+		}
+		e = gf_fs_run(fs);
+
+		gpac->fs_rmt_handler = NULL;
+	} else {
+		e = gf_fs_run(fs);
+
+		//flush rmt events
+		if (gpac->rmt_ref)
+			gpac_rmt_callback_exec(env, gpac);
+	}
+
+	if (e>=GF_OK) {
+		e = gf_fs_get_last_connect_error(fs);
+		if (e>=GF_OK)
+			e = gf_fs_get_last_process_error(fs);
+	}
+	if (e<0)
+		napi_throw_error(env, gf_error_to_string(e), "Error running session");\
+
+
+	while (gf_list_count(napi_fs->defer_filters)) {
+		GF_Filter *filter = gf_list_pop_front(napi_fs->defer_filters);
+		const char *fname = "on_filter_new";
+		Bool has_fun = GF_FALSE;
+		napi_has_named_property(env, this_val, fname, (bool *) &has_fun);
+		if (has_fun) {
+			napi_value fun_val;
+			status = napi_get_named_property(env, this_val, fname, &fun_val);
+			if (status == napi_ok) {
+				napi_value res, arg = fs_wrap_filter(env, napi_fs->fs, filter);
+				status = napi_make_callback(env, napi_fs->async_ctx, this_val, fun_val, 1, &arg, &res);
+			}
+		}
+	}
+	return NULL;
+}
+
+napi_value fs_wrap_filter(napi_env env, GF_FilterSession *fs, GF_Filter *filter)
+{
+	napi_status status;
+	napi_value obj;
+	NAPI_Filter *napi_f = gf_filter_get_rt_udta(filter);
+
+	if (!filter) {
+		NAPI_CALL( napi_get_null(env, &obj) );
+		return obj;
+	}
+
+	napi_property_descriptor filter_properties[] = {
+		{ "name", NULL, NULL, filter_getter, filter_setter, NULL, napi_enumerable, &FILTER_PROP_NAME},
+		{ "ID", NULL, NULL, filter_getter, NULL, NULL, napi_enumerable, &FILTER_PROP_ID},
+		{ "nb_ipid", NULL, NULL, filter_getter, NULL, NULL, napi_enumerable, &FILTER_PROP_IPIDS},
+		{ "nb_opid", NULL, NULL, filter_getter, NULL, NULL, napi_enumerable, &FILTER_PROP_OPIDS},
+		{ "remove", 0, filter_remove, 0, 0, 0, napi_enumerable, 0 },
+		{ "update", 0, filter_update, 0, 0, 0, napi_enumerable, 0 },
+		{ "set_source", 0, filter_set_source, 0, 0, 0, napi_enumerable, 0 },
+		{ "set_source_restricted", 0, filter_set_source_restricted, 0, 0, 0, napi_enumerable, 0 },
+		{ "insert", 0, filter_insert, 0, 0, 0, napi_enumerable, 0 },
+		{ "ipid_prop", 0, filter_ipid_prop, 0, 0, 0, napi_enumerable, 0 },
+		{ "ipid_enum_props", 0, filter_ipid_enum_props, 0, 0, 0, napi_enumerable, 0 },
+		{ "opid_prop", 0, filter_opid_prop, 0, 0, 0, napi_enumerable, 0 },
+		{ "opid_enum_props", 0, filter_opid_enum_props, 0, 0, 0, napi_enumerable, 0 },
+		{ "ipid_source", 0, filter_ipid_source, 0, 0, 0, napi_enumerable, 0 },
+		{ "opid_sinks", 0, filter_opid_sinks, 0, 0, 0, napi_enumerable, 0 },
+		{ "all_args", 0, filter_all_args, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_info", 0, filter_get_info, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_statistics", 0, filter_get_statistics, 0, 0, 0, napi_enumerable, 0 },
+		{ "require_source_id", 0, filter_require_source_id, 0, 0, 0, napi_enumerable, 0 },
+		{ "bind", 0, filter_bind, 0, 0, 0, napi_enumerable, 0 },
+	};
+
+	if (napi_f) {
+		NAPI_CALL ( napi_get_reference_value(env, napi_f->ref, &obj) );
+		return obj;
+	}
+
+	GF_SAFEALLOC(napi_f, NAPI_Filter);
+	napi_f->f = filter;
+	napi_f->fs = fs;
+	napi_f->env = env;
+
+	NAPI_CALL( napi_create_object(env, &obj) );
+	NAPI_CALL( napi_define_properties(env, obj, sizeof(filter_properties)/sizeof(napi_property_descriptor), filter_properties) );
+	NAPI_CALL( napi_create_reference(env, obj, 1, &napi_f->ref) );
+	NAPI_CALL( napi_type_tag_object(env, obj, &filter_tag) );
+
+	NAPI_CALL( napi_wrap(env, obj, filter, dummy_finalize, NULL, NULL) );
+
+	gf_filter_set_rt_udta(filter, napi_f);
+	return obj;
+}
+
+
+napi_value fs_load_src_dst(napi_env env, napi_callback_info info, Bool is_source)
+{
+	GF_Err e;
+	NARG_ARGS_THIS(2, 1)
+	FILTER_SESSION
+	NARG_STR(url, 0, NULL)
+
+	if (!url) {
+		napi_throw_error(env, NULL, "Missing URL");
+		return NULL;
+	}
+	NARG_STR_ALLOC(parent_url, 1, NULL);
+
+	GF_Filter *filter;
+	if (is_source)
+		filter = gf_fs_load_source(fs, url, NULL, parent_url, &e);
+	else
+		filter = gf_fs_load_destination(fs, url, NULL, parent_url, &e);
+
+	if (parent_url) gf_free(parent_url);
+
+	if (e<0)
+		napi_throw_error(env, gf_error_to_string(e), is_source ? "Failed to load source filter" : "Failed to load destination filter");
+
+	return fs_wrap_filter(env, fs, filter);
+}
+
+napi_value fs_load_src(napi_env env, napi_callback_info info)
+{
+	return fs_load_src_dst(env, info, GF_TRUE);
+}
+napi_value fs_load_dst(napi_env env, napi_callback_info info)
+{
+	return fs_load_src_dst(env, info, GF_FALSE);
+}
+
+napi_value fs_load_filter(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	NARG_ARGS_THIS(1, 1)
+	FILTER_SESSION
+	NARG_STR(url, 0, NULL)
+
+	GF_Filter *filter = gf_fs_load_filter(fs, url, &e);
+
+	if (e<0)
+		napi_throw_error(env, gf_error_to_string(e), "Failed to load filter");
+
+	return fs_wrap_filter(env, fs, filter);
+}
+
+typedef struct
+{
+	napi_async_context ctx;
+	napi_ref ref;
+	napi_env env;
+	NAPI_Session *napi_fs;
+} NAPI_Task;
+
+Bool fs_task_exec(GF_FilterSession *fsess, void *callback, u32 *reschedule_ms)
+{
+	Bool ret = GF_TRUE;
+	napi_status status;
+	napi_value res, obj_val, fun_val;
+	NAPI_Task *task = (NAPI_Task *) callback;
+	napi_env env = (napi_env) task->env;
+
+	status = napi_get_reference_value(env, task->ref, &obj_val);
+	if (status != napi_ok) goto exit;
+	status = napi_get_named_property(env, obj_val, "execute", &fun_val);
+	if (status != napi_ok) goto exit;
+
+	status = napi_make_callback(env, task->napi_fs->async_ctx, obj_val, fun_val, 0, NULL, &res);
+	if (status != napi_ok) goto exit;
+
+	napi_valuetype rtype;
+	napi_typeof(env, res, &rtype);
+	if (rtype == napi_boolean) {
+		bool val;
+		status = napi_get_value_bool(env, res, &val);
+		ret = val ? GF_TRUE : GF_FALSE;
+	} else if ((rtype==napi_number) || (rtype==napi_bigint)) {
+		status = napi_get_value_uint32(env, res, reschedule_ms);
+		if (status == napi_ok)
+			ret = GF_TRUE;
+	} else {
+		ret = GF_FALSE;
+	}
+
+exit:
+	if (status != napi_ok) {
+		napi_throw_error(env, NULL, "Failed to execute task");
+	}
+
+	if (gf_fs_in_final_flush(fsess))
+		ret = GF_FALSE;
+
+	if (!ret) {
+		u32 rcount;
+		napi_reference_unref(env, task->ref, &rcount);
+		napi_delete_reference(env, task->ref);
+		gf_free(task);
+	}
+	return ret;
+}
+
+napi_value fs_post_task(napi_env env, napi_callback_info info)
+{
+	napi_value global, fun_name, fun_val;
+	NARG_ARGS_THIS(2, 1)
+	FILTER_SESSION
+	NARG_STR(log_name, 1, "NapiTask");
+
+	NAPI_CALL( napi_create_string_utf8(env, "execute", NAPI_AUTO_LENGTH, &fun_name) );
+	status = napi_get_property(env, argv[0], fun_name, &fun_val);
+	if (status != napi_ok) {
+		napi_throw_error(env, NULL, "No execute method on object");
+		return NULL;
+	}
+	napi_valuetype rtype;
+	napi_typeof(env, fun_val, &rtype);
+	if (rtype != napi_function) {
+		napi_throw_error(env, NULL, "property execute is not a function");
+		return NULL;
+	}
+
+	NAPI_Task *task;
+	GF_SAFEALLOC(task, NAPI_Task);
+	if (!task) {
+		napi_throw_error(env, NULL, "Failed to allocate task");
+		return NULL;
+	}
+	task->napi_fs = gf_fs_get_rt_udta(fs);
+
+	NAPI_CALL( napi_get_global(env, &global) );
+	NAPI_CALL( napi_create_string_utf8(env, "TaskExecute", NAPI_AUTO_LENGTH, &fun_name) );
+
+	status = napi_create_reference(env, argv[0], 1, &task->ref);
+	task->env = env;
+	gf_fs_post_user_task(fs, fs_task_exec, task, log_name);
+
+	return NULL;
+}
+
+napi_value fs_abort(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 0)
+	FILTER_SESSION
+	NARG_U32(flush, 0, 0);
+	gf_fs_abort(fs, flush);
+	return NULL;
+}
+
+napi_value fs_lock(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 1)
+	FILTER_SESSION
+	NARG_BOOL(lock, 0, 0);
+	gf_fs_lock_filters(fs, lock);
+	return NULL;
+}
+napi_value fs_reporting(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 1)
+	FILTER_SESSION
+	NARG_BOOL(do_report, 0, 0);
+	gf_fs_enable_reporting(fs, do_report);
+	return NULL;
+}
+
+napi_value fs_print_stats(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTER_SESSION
+	gf_fs_print_stats(fs);
+	return NULL;
+}
+
+napi_value fs_print_graph(napi_env env, napi_callback_info info)
+{
+	NARG_THIS
+	FILTER_SESSION
+	gf_fs_print_connections(fs);
+	return NULL;
+}
+napi_value fs_get_filter(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS(1, 1)
+	FILTER_SESSION
+	NARG_U32(fidx, 0, 0);
+
+	GF_Filter *f = gf_fs_get_filter(fs, fidx);
+	if (!f) {
+		napi_throw_error(env, NULL, "Invalid filter index");
+		return NULL;
+	}
+	return fs_wrap_filter(env, fs, f);
+}
+
+napi_value fs_fire_event(napi_env env, napi_callback_info info)
+{
+	Bool res;
+	napi_value ret;
+	GF_Filter *f = NULL;
+	GF_FilterEvent *evt = NULL;
+	NARG_ARGS_THIS(3, 1)
+	FILTER_SESSION
+
+
+	NAPI_CALL( napi_check_object_type_tag(env, argv[0], &filterevent_tag, &_tag) );
+	if (!_tag) {
+		napi_throw_error(env, NULL, "Not a FilterEvent object");
+		return NULL;
+	}
+	NAPI_CALL( napi_unwrap(env, argv[0], (void**) &evt) );
+
+	if (argc>1) {
+		NAPI_CALL( napi_check_object_type_tag(env, argv[1], &filter_tag, &_tag) );
+		if (!_tag) {
+			napi_throw_error(env, NULL, "Not a Filter object");
+			return NULL;
+		}
+		NAPI_CALL( napi_unwrap(env, argv[1], (void**) &f) );
+	}
+
+	NARG_BOOL(upstream, 2, GF_FALSE);
+
+	res = gf_fs_fire_event(fs, f, evt, upstream);
+	NAPI_CALL(napi_get_boolean(env, res, &ret) );
+	return ret;
+}
+
+
+napi_value fs_is_supported_mime(napi_env env, napi_callback_info info)
+{
+	napi_value val;
+	NARG_ARGS_THIS(1, 1)
+	FILTER_SESSION
+	NARG_STR(mime, 0, NULL);
+
+	NAPI_CALL( napi_get_boolean(env, gf_fs_is_supported_mime(fs, mime), &val) );
+	return val;
+}
+
+napi_value fs_is_supported_source(napi_env env, napi_callback_info info)
+{
+	bool is_ok;
+	napi_value val;
+	NARG_ARGS_THIS(2, 1)
+	FILTER_SESSION
+
+	NARG_STR(url, 0, NULL);
+	NARG_STR_ALLOC(parent_url, 1, NULL);
+	is_ok = gf_fs_is_supported_source(fs, url, parent_url);
+	if (parent_url) gf_free(parent_url);
+
+	NAPI_CALL( napi_get_boolean(env, is_ok, &val) );
+	return val;
+}
+
+
+napi_value fs_new_filter(napi_env env, napi_callback_info info)
+{
+	NAPI_Filter *napi_f=NULL;
+	GF_Err e=GF_OK;
+	napi_value obj, async_name;
+	NARG_ARGS_THIS(2, 0)
+	FILTER_SESSION
+	NARG_STR(fname, 0, "Custom");
+	NARG_U32(flags, 1, 0);
+
+	GF_Filter *new_f = gf_fs_new_filter(fs, fname, flags | GF_FS_REG_MAIN_THREAD, &e);
+	if (!new_f) {
+		napi_throw_error(env, gf_error_to_string(e), "Failed to create custom filter");
+		return NULL;
+	}
+	//inherit from regular filter
+	obj = fs_wrap_filter(env, fs, new_f);
+	napi_f = gf_filter_get_rt_udta(new_f);
+
+	napi_f->is_custom = GF_TRUE;
+
+	//define all props for custom filter
+	napi_property_descriptor curstom_filter_properties[] = {
+		{ "block_enabled", NULL, NULL, filter_cust_getter, NULL, NULL, napi_enumerable, &FS_PROP_CUST_BLOCK_ENABLED},
+		{ "output_buffer", NULL, NULL, filter_cust_getter, NULL, NULL, napi_enumerable, &FS_PROP_CUST_OUTPUT_BUFFER},
+		{ "playout_buffer", NULL, NULL, filter_cust_getter, NULL, NULL, napi_enumerable, &FS_PROP_CUST_PLAYOUT_BUFFER},
+		{ "sinks_done", NULL, NULL, filter_cust_getter, NULL, NULL, napi_enumerable, &FS_PROP_CUST_SINKS_DONE},
+		{ "nb_evts_queued", NULL, NULL, filter_cust_getter, NULL, NULL, napi_enumerable, &FS_PROP_CUST_EVTS_QUEUED},
+		{ "clock_hint_time", NULL, NULL, filter_cust_getter, NULL, NULL, napi_enumerable, &FS_PROP_CUST_CK_HINT_TIME},
+		{ "clock_hint_mediatime", NULL, NULL, filter_cust_getter, NULL, NULL, napi_enumerable, &FS_PROP_CUST_CK_HINT_MEDIATIME},
+		{ "connections_pending", NULL, NULL, filter_cust_getter, NULL, NULL, napi_enumerable, &FS_PROP_CUST_CONNECTIONS_PENDING},
+
+		{ "push_cap", 0, filter_push_cap, 0, 0, 0, napi_enumerable, 0 },
+		{ "update_status", 0, filter_update_status, 0, 0, 0, napi_enumerable, 0 },
+		{ "reschedule", 0, filter_reschedule, 0, 0, 0, napi_enumerable, 0 },
+		{ "notify_failure", 0, filter_notify_failure, 0, 0, 0, napi_enumerable, 0 },
+		{ "make_sticky", 0, filter_make_sticky, 0, 0, 0, napi_enumerable, 0 },
+		{ "prevent_blocking", 0, filter_prevent_blocking, 0, 0, 0, napi_enumerable, 0 },
+		{ "block_eos", 0, filter_block_eos, 0, 0, 0, napi_enumerable, 0 },
+		{ "set_max_pids", 0, filter_set_max_pids, 0, 0, 0, napi_enumerable, 0 },
+		{ "hint_clock", 0, filter_hint_clock, 0, 0, 0, napi_enumerable, 0 },
+		{ "new_pid", 0, filter_new_pid, 0, 0, 0, napi_enumerable, 0 },
+		{ "print_connections", 0, filter_print_connections, 0, 0, 0, napi_enumerable, 0 },
+
+	};
+
+	NAPI_CALL(napi_define_properties(env, obj, sizeof(curstom_filter_properties)/sizeof(napi_property_descriptor), curstom_filter_properties) );
+
+	//setup callbacks
+	e = gf_filter_set_configure_ckb(new_f, napi_filter_cbk_configure);
+	if (!e) e = gf_filter_set_process_ckb(new_f, napi_filter_cbk_process);
+	if (!e) e = gf_filter_set_process_event_ckb(new_f, napi_filter_cbk_process_event);
+	if (!e) e = gf_filter_set_reconfigure_output_ckb(new_f, napi_filter_cbk_reconfigure_output);
+
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Failed to assign custom filter callbacks");
+		return NULL;
+	}
+
+	NAPI_CALL( napi_create_string_utf8(env, "AsyncFilterTask", NAPI_AUTO_LENGTH, &async_name) );
+	NAPI_CALL( napi_async_init(env, obj, async_name, &napi_f->async_ctx) );
+	return obj;
+}
+
+
+
+void del_fs(napi_env env, void* finalize_data, void* finalize_hint)
+{
+	GF_FilterSession *fs = (GF_FilterSession *)finalize_data;
+	NAPI_Session *napi_fs = gf_fs_get_rt_udta(fs);
+
+	if (napi_fs) {
+		u32 rcount;
+		napi_reference_unref(env, napi_fs->ref, &rcount);
+		napi_delete_reference(env, napi_fs->ref);
+		napi_async_destroy(env, napi_fs->async_ctx);
+		napi_fs->ref = NULL;
+		napi_fs->async_ctx = NULL;
+	}
+
+	gf_fs_del(fs);
+
+	if (napi_fs) {
+		if (napi_fs->defer_filters) gf_list_del(napi_fs->defer_filters);
+		gf_free(napi_fs);
+	}
+}
+
+void fs_on_filter_creation(void *udta, GF_Filter *filter, Bool is_destroy)
+{
+	napi_value fs_val, fun_val;
+	napi_status status;
+	NAPI_Session *napi_fs = (NAPI_Session *)udta;
+	NAPI_Filter *napi_f = (NAPI_Filter *) gf_filter_get_rt_udta(filter);
+	napi_env env = napi_fs->env;
+
+	//set to NULL means final nodeJS addon shutdown, do not notify
+	
+	if (napi_fs->async_ctx != NULL) {
+		GPAC_NAPI *gpac;
+		if ( napi_get_instance_data(env, (void **) &gpac) != napi_ok) {
+			return;
+		}
+		//creation callback are not guaranteed to run in main thread, defer notif to end of fs.run()
+		if (!is_destroy && (gpac->main_thid != gf_th_id() ) ) {
+			if (!napi_fs->defer_filters) napi_fs->defer_filters = gf_list_new();
+			gf_list_add(napi_fs->defer_filters, filter);
+			return;
+		}
+		//destroy callbacks are always scheduled on main thread, but remove filter if in pending list
+		if (is_destroy)
+			gf_list_del_item(napi_fs->defer_filters, filter);
+
+		status = napi_get_reference_value(env, napi_fs->ref, &fs_val);
+		if (status == napi_ok) {
+			const char *fname = is_destroy ? "on_filter_del" : "on_filter_new";
+			Bool has_fun = GF_FALSE;
+			napi_has_named_property(env, fs_val, fname, (bool *) &has_fun);
+			if (has_fun) {
+				status = napi_get_named_property(env, fs_val, fname, &fun_val);
+				if (status == napi_ok) {
+					napi_value res, arg = fs_wrap_filter(env, napi_fs->fs, filter);
+					status = napi_make_callback(env, napi_fs->async_ctx, fs_val, fun_val, 1, &arg, &res);
+				}
+			}
+		}
+	}
+
+	if (is_destroy && napi_f) {
+		u32 rcount;
+		gf_filter_set_rt_udta(filter, NULL);
+		napi_reference_unref(napi_f->env, napi_f->ref, &rcount);
+		napi_delete_reference(napi_f->env, napi_f->ref);
+
+		//extenral object was bound, destroy ref
+		if (napi_f->binding_ref != NULL) {
+			const char *fname = gf_filter_get_name(filter);
+			if (fname && !strcmp(fname, "dashin"))
+				dashin_detach_binding(napi_f);
+
+			napi_reference_unref(napi_f->env, napi_f->binding_ref, &rcount);
+			napi_delete_reference(napi_f->env, napi_f->binding_ref);
+		}
+
+		//cleanup our bindings, we don't use finalizer as we don't know the order of destruction
+		if (napi_f->is_custom) {
+			u32 i, pids = gf_filter_get_opid_count(filter);
+			for (i=0; i<pids; i++) {
+				GF_FilterPid *pid = gf_filter_get_opid(filter, i);
+				NAPI_FilterPid *napi_pid = (NAPI_FilterPid *) gf_filter_pid_get_udta(pid);
+				if (napi_pid) {
+					if (napi_pid->pck_refs) {
+						while (gf_list_count(napi_pid->pck_refs)) {
+							NAPI_FilterPacket *napi_pck = gf_list_pop_back(napi_pid->pck_refs);
+							napi_pck->pid_refs = NULL;
+						}
+						gf_list_del(napi_pid->pck_refs);
+					}
+					gf_free(napi_pid);
+				}
+			}
+		}
+		gf_free(napi_f);
+	}
+}
+
+Bool napi_gpac_event_proc(void *udta, GF_Event *event)
+{
+	napi_status status;
+	bool has_fun;
+	GF_FilterEvent fevt;
+	napi_value fs_val, fun_val, evt, res;
+	GPAC_NAPI *gpac;
+	NAPI_Session *napi_fs = (NAPI_Session *) udta;
+
+
+	status = napi_get_instance_data(napi_fs->env, (void **) &gpac);
+	if (status != napi_ok) return GF_FALSE;
+
+	if (gpac->main_thid != gf_th_id()) {
+#ifndef GPAC_DISABLE_SVG
+		GF_LOG(GF_LOG_WARNING, GF_LOG_SCRIPT, ("[NodeJS] GPAC main event callback from different thread not implemented, ignoring event %s\n", gf_dom_event_get_name(event->type) ));
+#else
+		GF_LOG(GF_LOG_WARNING, GF_LOG_SCRIPT, ("[NodeJS] GPAC main event callback from different thread not implemented, ignoring event %d\n", event->type));
+#endif
+
+		return GF_FALSE;
+	}
+
+	status = napi_get_reference_value(napi_fs->env, napi_fs->ref, &fs_val);
+	if (status != napi_ok) return GF_FALSE;
+	napi_has_named_property(napi_fs->env, fs_val, "on_event", (bool *) &has_fun);
+	if (!has_fun) return GF_FALSE;
+	status = napi_get_named_property(napi_fs->env, fs_val, "on_event", &fun_val);
+	if (status != napi_ok) return GF_FALSE;
+
+	fevt.base.type = GF_FEVT_USER;
+	fevt.base.on_pid = NULL;
+	fevt.user_event.event = *event;
+	evt = wrap_filterevent(napi_fs->env, &fevt, NULL);
+
+	//make event
+	status = napi_make_callback(napi_fs->env, napi_fs->async_ctx, fs_val, fun_val, 1, &evt, &res);
+	if (status != napi_ok) return GF_FALSE;
+
+	napi_get_value_bool(napi_fs->env, res, &has_fun);
+	return has_fun ? GF_TRUE : GF_FALSE;
+}
+
+napi_value new_fs(napi_env env, napi_callback_info info)
+{
+	NAPI_Session *napi_fs;
+	napi_value fun_name;
+	NARG_ARGS_THIS(1, 0);
+
+	NARG_U32(flags, 0, 0);
+
+	NAPI_GPAC
+	gpac->is_init = GF_TRUE;
+
+	GF_SAFEALLOC(napi_fs, NAPI_Session);
+	if (!napi_fs) {
+		napi_throw_error(env, NULL, "Failed to allocate filter session");
+		return NULL;
+	}
+
+	GF_FilterSession *fs = gf_fs_new_defaults(flags);
+	if (!fs) {
+		gf_free(napi_fs);
+		napi_throw_error(env, NULL, "Failed to allocate filter session");
+		return NULL;
+	}
+	NAPI_CALL( napi_wrap(env, this_val, fs, del_fs, NULL, NULL) );
+
+	NAPI_CALL( napi_type_tag_object(env, this_val, &filtersession_tag) );
+
+	napi_fs->fs = fs;
+	napi_fs->env = env;
+	//we force all setup tasks on main thread, async IO with node is not implemented yet here
+	gf_fs_set_filter_creation_callback(fs, fs_on_filter_creation, napi_fs, GF_TRUE);
+
+	NAPI_CALL( napi_create_reference(env, this_val, 1, &napi_fs->ref) );
+
+	NAPI_CALL( napi_create_string_utf8(env, "AsyncFilterSessionTask", NAPI_AUTO_LENGTH, &fun_name) );
+	NAPI_CALL( napi_async_init(env, this_val, fun_name, &napi_fs->async_ctx) );
+
+
+	gf_fs_set_ui_callback(fs, napi_gpac_event_proc, napi_fs);
+
+	if (! (flags & GF_FS_FLAG_NON_BLOCKING))
+		napi_fs->blocking = GF_TRUE;
+
+	return this_val;
+}
+
+napi_status init_fs_class(napi_env env, napi_value exports, GPAC_NAPI *inst)
+{
+	napi_status status;
+	napi_property_descriptor fs_properties[] = {
+		{ "last_task", NULL, NULL, fs_getter, NULL, NULL, napi_enumerable, &FS_PROP_LAST_TASK},
+		{ "nb_filters", NULL, NULL, fs_getter, NULL, NULL, napi_enumerable, &FS_PROP_NB_FILTERS},
+		{ "http_bitrate", NULL, NULL, fs_getter, NULL, NULL, napi_enumerable, &FS_PROP_HTTP_RATE},
+		{ "http_max_bitrate", NULL, NULL, fs_getter, fs_setter, NULL, napi_enumerable, &FS_PROP_MAX_HTTP_RATE},
+
+		{ "run", 0, fs_run, 0, 0, 0, napi_enumerable, 0 },
+		{ "load_src", 0, fs_load_src, 0, 0, 0, napi_enumerable, 0 },
+		{ "load_dst", 0, fs_load_dst, 0, 0, 0, napi_enumerable, 0 },
+		{ "load", 0, fs_load_filter, 0, 0, 0, napi_enumerable, 0 },
+		{ "post_task", 0, fs_post_task, 0, 0, 0, napi_enumerable, 0 },
+		{ "abort", 0, fs_abort, 0, 0, 0, napi_enumerable, 0 },
+		{ "lock", 0, fs_lock, 0, 0, 0, napi_enumerable, 0 },
+		//TODO move as attrib
+		{ "reporting", 0, fs_reporting, 0, 0, 0, napi_enumerable, 0 },
+		{ "print_stats", 0, fs_print_stats, 0, 0, 0, napi_enumerable, 0 },
+		{ "print_graph", 0, fs_print_graph, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_filter", 0, fs_get_filter, 0, 0, 0, napi_enumerable, 0 },
+		{ "fire_event", 0, fs_fire_event, 0, 0, 0, napi_enumerable, 0 },
+		{ "is_supported_mime", 0, fs_is_supported_mime, 0, 0, 0, napi_enumerable, 0 },
+		{ "is_supported_source", 0, fs_is_supported_source, 0, 0, 0, napi_enumerable, 0 },
+		{ "new_filter", 0, fs_new_filter, 0, 0, 0, napi_enumerable, 0 },
+	};
+
+	napi_value cons;
+	status = napi_define_class(env, "FilterSession", NAPI_AUTO_LENGTH , new_fs, NULL, sizeof(fs_properties)/sizeof(napi_property_descriptor), fs_properties, &cons);
+	if (status != napi_ok) return status;
+
+	status = napi_set_named_property(env, exports, "FilterSession", cons);
+	if (status != napi_ok) return status;
+
+	return napi_ok;
+}
+
+static u32 FEVT_PROP_TYPE = 0;
+static u32 FEVT_PROP_START_RANGE = 1;
+static u32 FEVT_PROP_END_RANGE = 2;
+static u32 FEVT_PROP_SPEED = 3;
+static u32 FEVT_PROP_FROM_PCK = 4;
+static u32 FEVT_PROP_HW_BUFFER_RESET = 5;
+static u32 FEVT_PROP_INITIAL_BCAST = 6;
+static u32 FEVT_PROP_TS_BASED = 7;
+static u32 FEVT_PROP_FULL_FILE_ONLY = 8;
+static u32 FEVT_PROP_FORCED_DASH_SWITCH = 9;
+static u32 FEVT_PROP_DROP_NON_REF = 10;
+static u32 FEVT_PROP_NO_BYTERANGE = 11;
+static u32 FEVT_PROP_START_OFFSET = 12;
+static u32 FEVT_PROP_END_OFFSET = 13;
+static u32 FEVT_PROP_HINT_BLOCK_SIZE = 14;
+static u32 FEVT_PROP_SOURCE_SWITCH = 15;
+static u32 FEVT_PROP_SWITCH_IS_INIT_SEG = 16;
+static u32 FEVT_PROP_SKIP_CACHE_EXP = 17;
+static u32 FEVT_PROP_SSIZE_URL = 18;
+static u32 FEVT_PROP_SSIZE_MEDIA_START = 19;
+static u32 FEVT_PROP_SSIZE_MEDIA_END = 20;
+static u32 FEVT_PROP_SSIZE_IDX_START = 21;
+static u32 FEVT_PROP_SSIZE_IDX_END = 22;
+static u32 FEVT_PROP_SSIZE_IS_INIT = 23;
+static u32 FEVT_PROP_SSIZE_IS_SHIFT = 24;
+static u32 FEVT_PROP_QS_UP = 25;
+static u32 FEVT_PROP_QS_DEP_GROUP_IDX = 26;
+static u32 FEVT_PROP_QS_QIDX = 27;
+static u32 FEVT_PROP_QS_TILEMODE = 28;
+static u32 FEVT_PROP_QS_DEGRADATION = 29;
+static u32 FEVT_PROP_MIN_X = 30;
+static u32 FEVT_PROP_MIN_Y = 31;
+static u32 FEVT_PROP_MAX_X = 32;
+static u32 FEVT_PROP_MAX_Y = 33;
+static u32 FEVT_PROP_IS_GAZE = 34;
+static u32 FEVT_PROP_MAX_BUFFER = 35;
+static u32 FEVT_PROP_MAX_PLAYOUT = 36;
+static u32 FEVT_PROP_MIN_PLAYOUT = 37;
+static u32 FEVT_PROP_PID_ONLY = 38;
+static u32 FEVT_PROP_UI_MOUSE_X = 39;
+static u32 FEVT_PROP_UI_MOUSE_Y = 40;
+static u32 FEVT_PROP_UI_MOUSE_WHEEL = 41;
+static u32 FEVT_PROP_UI_MOUSE_BUTTON = 42;
+static u32 FEVT_PROP_UI_MT_ROTATE = 43;
+static u32 FEVT_PROP_UI_MT_PINCH = 44;
+static u32 FEVT_PROP_UI_MT_FINGERS = 45;
+static u32 FEVT_PROP_UI_KEY_CODE = 46;
+static u32 FEVT_PROP_UI_KEY_NAME = 47;
+static u32 FEVT_PROP_UI_KEY_MODS = 48;
+static u32 FEVT_PROP_UI_KEY_HW = 49;
+static u32 FEVT_PROP_UI_SHOWTYPE = 50;
+static u32 FEVT_PROP_UI_CLIPBOARD = 51;
+static u32 FEVT_PROP_UI_WIDTH = 52;
+static u32 FEVT_PROP_UI_HEIGHT = 53;
+static u32 FEVT_PROP_UI_MOVE_X = 54;
+static u32 FEVT_PROP_UI_MOVE_Y = 55;
+static u32 FEVT_PROP_UI_MOVE_RELATIVE = 56;
+static u32 FEVT_PROP_UI_MOVE_ALIGNX = 57;
+static u32 FEVT_PROP_UI_MOVE_ALIGNY = 58;
+static u32 FEVT_PROP_UI_CAPTION = 59;
+static u32 FEVT_PROP_FILE_DEL = 60;
+static u32 FEVT_PROP_UI_TYPE = 61;
+static u32 FEVT_PROP_NTP_REF = 62;
+static u32 FEVT_PROP_NAME = 63;
+static u32 FEVT_PROP_UI_NAME = 64;
+static u32 FEVT_PROP_PID = 65;
+
+
+#define FILTEREVENT\
+	GF_FilterEvent *evt=NULL;\
+	bool _tag;\
+	NAPI_CALL( napi_check_object_type_tag(env, this_val, &filterevent_tag, &_tag) );\
+	if (!_tag) {\
+		napi_throw_error(env, NULL, "Not a FilterEvent object");\
+		return NULL;\
+	}\
+	NAPI_CALL( napi_unwrap(env, this_val, (void**) &evt) );\
+
+
+#define ALL_EVENT_FIELDS	\
+	EVT_DBL(FEVT_PROP_START_RANGE, evt->play.start_range);\
+	EVT_DBL(FEVT_PROP_END_RANGE, evt->play.end_range);\
+	EVT_DBL(FEVT_PROP_SPEED, evt->play.speed);\
+	EVT_U32(FEVT_PROP_FROM_PCK, evt->play.from_pck);\
+	EVT_BOOL(FEVT_PROP_HW_BUFFER_RESET, evt->play.hw_buffer_reset);\
+	EVT_BOOL(FEVT_PROP_INITIAL_BCAST, evt->play.initial_broadcast_play);\
+	EVT_U32(FEVT_PROP_TS_BASED, evt->play.timestamp_based);\
+	EVT_BOOL(FEVT_PROP_FULL_FILE_ONLY, evt->play.full_file_only);\
+	EVT_BOOL(FEVT_PROP_FORCED_DASH_SWITCH, evt->play.forced_dash_segment_switch);\
+	EVT_BOOL(FEVT_PROP_DROP_NON_REF, evt->play.drop_non_ref);\
+	EVT_BOOL(FEVT_PROP_NO_BYTERANGE, evt->play.no_byterange_forward);\
+	EVT_U64(FEVT_PROP_START_OFFSET, evt->seek.start_offset);\
+	EVT_U64(FEVT_PROP_END_OFFSET, evt->seek.end_offset);\
+	EVT_U32(FEVT_PROP_HINT_BLOCK_SIZE, evt->seek.hint_block_size);\
+	EVT_STR(FEVT_PROP_SOURCE_SWITCH, evt->seek.source_switch);\
+	EVT_BOOL(FEVT_PROP_SWITCH_IS_INIT_SEG, evt->seek.is_init_segment);\
+	EVT_BOOL(FEVT_PROP_SKIP_CACHE_EXP, evt->seek.skip_cache_expiration);\
+	EVT_STR(FEVT_PROP_SSIZE_URL, evt->seg_size.seg_url);\
+	EVT_U64(FEVT_PROP_SSIZE_MEDIA_START, evt->seg_size.media_range_start);\
+	EVT_U64(FEVT_PROP_SSIZE_MEDIA_END, evt->seg_size.media_range_end);\
+	EVT_U64(FEVT_PROP_SSIZE_IDX_START, evt->seg_size.idx_range_start);\
+	EVT_U64(FEVT_PROP_SSIZE_IDX_END, evt->seg_size.idx_range_end);\
+	EVT_BOOL(FEVT_PROP_SSIZE_IS_INIT, evt->seg_size.is_init);\
+	EVT_BOOL(FEVT_PROP_SSIZE_IS_SHIFT, evt->seg_size.is_shift);\
+	EVT_BOOL(FEVT_PROP_QS_UP, evt->quality_switch.up);\
+	EVT_U32(FEVT_PROP_QS_DEP_GROUP_IDX, evt->quality_switch.dependent_group_index);\
+	EVT_S32(FEVT_PROP_QS_QIDX, evt->quality_switch.q_idx);\
+	EVT_U32(FEVT_PROP_QS_TILEMODE, evt->quality_switch.set_tile_mode_plus_one);\
+	EVT_U32(FEVT_PROP_QS_DEGRADATION, evt->quality_switch.quality_degradation);\
+	EVT_U32(FEVT_PROP_MIN_X, evt->visibility_hint.min_x);\
+	EVT_U32(FEVT_PROP_MIN_Y, evt->visibility_hint.min_y);\
+	EVT_U32(FEVT_PROP_MAX_X, evt->visibility_hint.max_x);\
+	EVT_U32(FEVT_PROP_MAX_Y, evt->visibility_hint.max_y);\
+	EVT_BOOL(FEVT_PROP_IS_GAZE, evt->visibility_hint.is_gaze);\
+	EVT_U32(FEVT_PROP_MAX_BUFFER, evt->buffer_req.max_buffer_us);\
+	EVT_U32(FEVT_PROP_MAX_PLAYOUT, evt->buffer_req.max_playout_us);\
+	EVT_U32(FEVT_PROP_MIN_PLAYOUT, evt->buffer_req.min_playout_us);\
+	EVT_BOOL(FEVT_PROP_PID_ONLY, evt->buffer_req.pid_only);\
+	EVT_STR(FEVT_PROP_FILE_DEL, evt->file_del.url);\
+	EVT_U64(FEVT_PROP_NTP_REF, evt->ntp.ntp);\
+	EVT_U32(FEVT_PROP_UI_TYPE, evt->user_event.event.type);\
+	if (evt->user_event.event.type==GF_EVENT_MULTITOUCH) {\
+		EVT_FIX(FEVT_PROP_UI_MOUSE_X, evt->user_event.event.mtouch.x);\
+		EVT_FIX(FEVT_PROP_UI_MOUSE_Y, evt->user_event.event.mtouch.y);\
+	} else {\
+		EVT_S32(FEVT_PROP_UI_MOUSE_X, evt->user_event.event.mouse.x);\
+		EVT_S32(FEVT_PROP_UI_MOUSE_Y, evt->user_event.event.mouse.y);\
+	}\
+	EVT_FIX(FEVT_PROP_UI_MOUSE_WHEEL, evt->user_event.event.mouse.wheel_pos);\
+	EVT_U32(FEVT_PROP_UI_MOUSE_BUTTON, evt->user_event.event.mouse.button);\
+	if (evt->user_event.event.type<=GF_EVENT_MOUSEWHEEL) {\
+		EVT_U32(FEVT_PROP_UI_KEY_MODS, evt->user_event.event.mouse.key_states);\
+	} else {\
+		EVT_U32(FEVT_PROP_UI_KEY_MODS, evt->user_event.event.key.flags);\
+	}\
+	EVT_FIX(FEVT_PROP_UI_MT_ROTATE, evt->user_event.event.mtouch.rotation);\
+	EVT_FIX(FEVT_PROP_UI_MT_PINCH, evt->user_event.event.mtouch.pinch);\
+	EVT_U32(FEVT_PROP_UI_MT_FINGERS, evt->user_event.event.mtouch.num_fingers);\
+	EVT_U32(FEVT_PROP_UI_KEY_CODE, evt->user_event.event.key.key_code);\
+	EVT_U32(FEVT_PROP_UI_KEY_HW, evt->user_event.event.key.hw_code);\
+	EVT_STR(FEVT_PROP_UI_CLIPBOARD, evt->user_event.event.clipboard.text);\
+	EVT_U32(FEVT_PROP_UI_WIDTH, evt->user_event.event.size.width);\
+	EVT_U32(FEVT_PROP_UI_HEIGHT, evt->user_event.event.size.height);\
+	EVT_U32(FEVT_PROP_UI_SHOWTYPE, evt->user_event.event.show.show_type);\
+	EVT_S32(FEVT_PROP_UI_MOVE_X, evt->user_event.event.move.x);\
+	EVT_S32(FEVT_PROP_UI_MOVE_Y, evt->user_event.event.move.y);\
+	EVT_U32(FEVT_PROP_UI_MOVE_RELATIVE, evt->user_event.event.move.relative);\
+	EVT_U32(FEVT_PROP_UI_MOVE_ALIGNX, evt->user_event.event.move.align_x);\
+	EVT_U32(FEVT_PROP_UI_MOVE_ALIGNY, evt->user_event.event.move.align_y);\
+	EVT_STR(FEVT_PROP_UI_CAPTION, evt->user_event.event.caption.caption);\
+
+napi_value fevt_getter(napi_env env, napi_callback_info info)
+{
+	void *magic;
+	napi_status status;
+	napi_value this_val, ret;
+	NAPI_CALL(napi_get_cb_info(env, info, NULL, NULL, &this_val, &magic) );
+	FILTEREVENT
+
+#define EVT_DBL(_magic_val, _field) \
+	if (magic == &_magic_val) {\
+		NAPI_CALL( napi_create_double(env, _field, &ret) );\
+		return ret;\
+	}
+
+#define EVT_FIX(_magic_val, _field) \
+	if (magic == &_magic_val) {\
+		NAPI_CALL( napi_create_double(env, FIX2FLT(_field), &ret) );\
+		return ret;\
+	}
+
+#define EVT_U32(_magic_val, _field) \
+	if (magic == &_magic_val) {\
+		NAPI_CALL( napi_create_uint32(env, (u32) _field, &ret) );\
+		return ret;\
+	}
+
+#define EVT_S32(_magic_val, _field) \
+	if (magic == &_magic_val) {\
+		NAPI_CALL( napi_create_int32(env, (s32) _field, &ret) );\
+		return ret;\
+	}
+
+#define EVT_STR(_magic_val, _field) \
+	if (magic == &_magic_val) {\
+		if (_field) {\
+			NAPI_CALL( napi_create_string_utf8(env, _field, NAPI_AUTO_LENGTH, &ret) );\
+		} else {\
+			NAPI_CALL( napi_get_null(env, &ret) );\
+		}\
+		return ret;\
+	}
+
+#define EVT_U64(_magic_val, _field) \
+	if (magic == &_magic_val) {\
+		NAPI_CALL( napi_create_int64(env, (s64) _field, &ret) );\
+		return ret;\
+	}
+
+#define EVT_BOOL(_magic_val, _field) \
+	if (magic == &_magic_val) {\
+		NAPI_CALL( napi_get_boolean(env, (bool) _field, &ret) );\
+		return ret;\
+	}
+
+	//read-only props
+	EVT_U32(FEVT_PROP_TYPE, evt->base.type);
+	EVT_STR(FEVT_PROP_NAME, gf_filter_event_name(evt->base.type) );
+#ifndef GPAC_DISABLE_SVG
+	EVT_STR(FEVT_PROP_UI_NAME, gf_dom_event_get_name(evt->user_event.event.type) );
+#endif
+
+	//all read/write props
+	ALL_EVENT_FIELDS
+
+	//custom fileds
+#ifndef GPAC_DISABLE_SVG
+	EVT_STR(FEVT_PROP_UI_KEY_NAME, gf_dom_get_key_name(evt->user_event.event.key.key_code));
+#endif
+
+	if (magic == &FEVT_PROP_PID) {
+		NAPI_FilterPid *napi_pid = evt->base.on_pid ? gf_filter_pid_get_udta(evt->base.on_pid) : NULL;
+
+		if (napi_pid) {
+			napi_get_reference_value(env, napi_pid->ref, &ret);
+		} else {
+			NAPI_CALL( napi_get_null(env, &ret) );
+		}
+		return ret;
+	}
+
+
+#undef EVT_DBL
+#undef EVT_FIX
+#undef EVT_U32
+#undef EVT_S32
+#undef EVT_STR
+#undef EVT_U64
+#undef EVT_BOOL
+
+	return NULL;
+}
+
+napi_value fevt_setter(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS_THIS_MAGIC(1, 1)
+	FILTEREVENT
+
+#define	EVT_U32(_magic_val, _field)\
+	if (magic == &_magic_val) {\
+		NARG_U32(val, 0, 0);\
+		_field = val;\
+		return NULL;\
+	}
+
+#define	EVT_S32(_magic_val, _field)\
+	if (magic == &_magic_val) {\
+		NARG_S32(val, 0, 0);\
+		_field = val;\
+		return NULL;\
+	}
+
+#define	EVT_U64(_magic_val, _field)\
+	if (magic == &_magic_val) {\
+		NARG_U64(val, 0, 0);\
+		_field = val;\
+		return NULL;\
+	}
+
+#define	EVT_BOOL(_magic_val, _field)\
+	if (magic == &_magic_val) {\
+		NARG_BOOL(val, 0, 0);\
+		_field = val;\
+		return NULL;\
+	}
+
+#define	EVT_DBL(_magic_val, _field)\
+	if (magic == &_magic_val) {\
+		NARG_DBL(val, 0, 0);\
+		_field = val;\
+		return NULL;\
+	}
+
+#define	EVT_FIX(_magic_val, _field)\
+	if (magic == &_magic_val) {\
+		NARG_DBL(val, 0, 0);\
+		_field = FLT2FIX(val);\
+		return NULL;\
+	}
+
+#define	EVT_STR(_magic_val, _field)\
+	if (magic == &_magic_val) {\
+		NARG_STR(val, 0, 0);\
+		_field = val;\
+		return NULL;\
+	}
+
+	//all read/write props
+	ALL_EVENT_FIELDS
+
+	//custom fields
+#ifndef GPAC_DISABLE_SVG
+	if (magic == &FEVT_PROP_UI_KEY_NAME) {
+		NARG_STR(val, 0, 0);
+		evt->user_event.event.key.key_code = gf_dom_get_key_type(val);
+		return NULL;
+	}
+#endif
+	return NULL;
+}
+
+
+void del_evt(napi_env env, void* finalize_data, void* finalize_hint)
+{
+	GF_FilterEvent *fevt = (GF_FilterEvent *)finalize_data;
+	gf_free(fevt);
+}
+
+napi_value wrap_filterevent(napi_env env, GF_FilterEvent *evt, napi_value *for_val)
+{
+	napi_status status;
+	napi_value obj;
+	if (for_val) {
+		obj = *for_val;
+	} else {
+		NAPI_CALL(napi_create_object(env, &obj) );
+	}
+	napi_callback evt_set = for_val ? fevt_setter : NULL;
+
+	napi_property_descriptor fevt_base_properties[] = {
+		{ "type", NULL, NULL, fevt_getter, NULL, NULL, napi_enumerable, &FEVT_PROP_TYPE},
+		{ "pid", NULL, NULL, fevt_getter, NULL, NULL, napi_enumerable, &FEVT_PROP_PID},
+		{ "name", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_NAME},
+	};
+	NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_base_properties)/sizeof(napi_property_descriptor), fevt_base_properties) );
+
+
+	//define properties based on event type
+	if (evt->base.type == GF_FEVT_PLAY) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "start_range", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_START_RANGE},
+			{ "end_range", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_END_RANGE},
+			{ "speed", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SPEED},
+			{ "from_pck", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_FROM_PCK},
+			{ "hw_buffer_reset", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_HW_BUFFER_RESET},
+			{ "initial_broadcast_play", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_INITIAL_BCAST},
+			{ "timestamp_based", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_TS_BASED},
+			{ "full_file_only", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_FULL_FILE_ONLY},
+			{ "forced_dash_segment_switch", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_FORCED_DASH_SWITCH},
+			{ "drop_non_ref", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_DROP_NON_REF},
+			{ "no_byterange_forward", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_NO_BYTERANGE},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_SET_SPEED) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "speed", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SPEED},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if ((evt->base.type == GF_FEVT_STOP) || (evt->base.type == GF_FEVT_PLAY_HINT)) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "forced_dash_segment_switch", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_FORCED_DASH_SWITCH},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_SOURCE_SEEK) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "start_offset", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_START_OFFSET},
+			{ "end_offset", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_END_OFFSET},
+			{ "hint_block_size", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_HINT_BLOCK_SIZE},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_SOURCE_SWITCH) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "start_offset", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_START_OFFSET},
+			{ "end_offset", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_END_OFFSET},
+			{ "source_switch", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SOURCE_SWITCH},
+			{ "is_init_segment", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SWITCH_IS_INIT_SEG},
+			{ "skip_cache_expiration", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SKIP_CACHE_EXP},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_SEGMENT_SIZE) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "seg_url", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SSIZE_URL},
+			{ "media_range_start", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SSIZE_MEDIA_START},
+			{ "media_range_end", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SSIZE_MEDIA_END},
+			{ "idx_range_start", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SSIZE_IDX_START},
+			{ "idx_range_end", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SSIZE_IDX_END},
+			{ "is_init", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SSIZE_IS_INIT},
+			{ "is_shift", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_SSIZE_IS_SHIFT},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_QUALITY_SWITCH) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "up", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_QS_UP},
+			{ "dependent_group_index", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_QS_DEP_GROUP_IDX},
+			{ "q_idx", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_QS_QIDX},
+			{ "set_tile_mode_plus_one", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_QS_TILEMODE},
+			{ "quality_degradation", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_QS_DEGRADATION},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_VISIBILITY_HINT) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "min_x", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_MIN_X},
+			{ "max_x", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_MIN_Y},
+			{ "min_y", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_MAX_X},
+			{ "max_y", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_MAX_Y},
+			{ "is_gaze", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_IS_GAZE},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_BUFFER_REQ) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "max_buffer_us", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_MAX_BUFFER},
+			{ "max_playout_us", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_MAX_PLAYOUT},
+			{ "min_playout_us", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_MIN_PLAYOUT},
+			{ "pid_only", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_PID_ONLY},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_USER) {
+		u32 ui_type = evt->user_event.event.type;
+
+		napi_property_descriptor fevt_ui_properties[] = {
+			{ "ui_type", NULL, NULL, fevt_getter, NULL, NULL, napi_enumerable, &FEVT_PROP_UI_TYPE},
+#ifndef GPAC_DISABLE_SVG
+			{ "ui_name", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_NAME},
+#endif
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_ui_properties)/sizeof(napi_property_descriptor), fevt_ui_properties) );
+
+		switch (ui_type) {
+		case GF_EVENT_CLICK:
+		case GF_EVENT_MOUSEUP:
+		case GF_EVENT_MOUSEDOWN:
+		case GF_EVENT_MOUSEOVER:
+		case GF_EVENT_MOUSEOUT:
+		case GF_EVENT_MOUSEMOVE:
+		case GF_EVENT_MOUSEWHEEL:
+		{
+			napi_property_descriptor fevt_properties[] = {
+				{ "mouse_x", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOUSE_X},
+				{ "mouse_y", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOUSE_Y},
+				{ "wheel", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOUSE_WHEEL},
+				{ "button", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOUSE_BUTTON},
+			};
+			NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+		}
+			break;
+		case GF_EVENT_MULTITOUCH:
+		{
+			napi_property_descriptor fevt_properties[] = {
+				{ "mt_x", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOUSE_X},
+				{ "mt_y", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOUSE_Y},
+				{ "mt_rotate", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MT_ROTATE},
+				{ "mt_pinch", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MT_PINCH},
+				{ "mt_fingers", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MT_FINGERS},
+			};
+			NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+		}
+			break;
+
+		case GF_EVENT_KEYUP:
+		case GF_EVENT_KEYDOWN:
+		case GF_EVENT_LONGKEYPRESS:
+		case GF_EVENT_TEXTINPUT:
+		{
+			napi_property_descriptor fevt_properties[] = {
+				{ "keycode", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_KEY_CODE},
+#ifndef GPAC_DISABLE_SVG
+				{ "keyname", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_KEY_NAME},
+#endif
+				{ "keymods", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_KEY_MODS},
+				{ "hwkey", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_KEY_HW},
+			};
+			NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+		}
+			break;
+		case GF_EVENT_PASTE_TEXT:
+		case GF_EVENT_COPY_TEXT:
+		{
+			napi_property_descriptor fevt_properties[] = {
+				{ "clipboard", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_CLIPBOARD},
+			};
+			NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+		}
+			break;
+		case GF_EVENT_SIZE:
+		{
+			napi_property_descriptor fevt_properties[] = {
+				{ "width", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_WIDTH},
+				{ "height", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_HEIGHT},
+			};
+			NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+		}
+			break;
+		case GF_EVENT_MOVE:
+		{
+			napi_property_descriptor fevt_properties[] = {
+				{ "move_x", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOVE_X},
+				{ "move_y", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOVE_Y},
+				{ "showtype", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_SHOWTYPE},
+				{ "move_relative", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOVE_RELATIVE},
+				{ "move_alignx", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOVE_ALIGNX},
+				{ "move_aligny", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_MOVE_ALIGNY},
+			};
+			NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+		}
+			break;
+		case GF_EVENT_SET_CAPTION:
+		{
+			napi_property_descriptor fevt_properties[] = {
+				{ "caption", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_UI_CAPTION},
+			};
+			NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+		}
+			break;
+		default:
+			break;
+		}
+	}
+	else if (evt->base.type == GF_FEVT_PLAY_HINT) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "full_file_only", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_FULL_FILE_ONLY},
+			{ "forced_dash_segment_switch", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_FORCED_DASH_SWITCH},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_FILE_DELETE) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "url", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_FILE_DEL},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	else if (evt->base.type == GF_FEVT_NTP_REF) {
+		napi_property_descriptor fevt_properties[] = {
+			{ "ntp", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_NTP_REF},
+		};
+		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
+	}
+	//other events don't have any attributes
+
+	NAPI_CALL( napi_wrap(env, obj, evt, for_val ? del_evt : NULL, NULL, NULL) );
+	NAPI_CALL( napi_type_tag_object(env, obj, &filterevent_tag) );
+
+	return obj;
+}
+napi_value new_fevt(napi_env env, napi_callback_info info)
+{
+	GF_FilterEvent *evt;
+	NARG_ARGS_THIS(2, 1);
+	NARG_U32(type, 0, 0);
+
+	NAPI_GPAC
+	gpac->is_init = GF_TRUE;
+
+	if (type==GF_FEVT_USER) {
+		if (argc<2) {
+			napi_throw_error(env, NULL, "User event type must be specified");
+			return NULL;
+		}
+	}
+	GF_SAFEALLOC(evt, GF_FilterEvent)
+	if (!evt) {
+		napi_throw_error(env, NULL, "Failed to allocate filter event");
+		return NULL;
+	}
+	NAPI_CALL( napi_get_value_uint32(env, argv[0], &evt->base.type) );
+	if (type==GF_FEVT_USER) {
+		u32 val;
+		NAPI_CALL( napi_get_value_uint32(env, argv[1], &val) );
+		evt->user_event.event.type = (u8) val;
+	}
+
+	return wrap_filterevent(env, evt, &this_val);
+}
+
+
+napi_status init_fevt_class(napi_env env, napi_value exports, GPAC_NAPI *inst)
+{
+	napi_status status;
+	napi_value cons;
+	status = napi_define_class(env, "FilterEvent", NAPI_AUTO_LENGTH , new_fevt, NULL, 0, NULL, &cons);
+	if (status != napi_ok) return status;
+	return napi_set_named_property(env, exports, "FilterEvent", cons);
+}
+
+
+static napi_status InitConstants(napi_env env, napi_value exports);
+napi_status init_fio_class(napi_env env, napi_value exports, GPAC_NAPI *inst);
+
+napi_value Init(napi_env env, napi_value exports)
+{
+	GPAC_NAPI *inst;
+	napi_status status;
+	napi_property_descriptor p_desc = {.attributes=napi_enumerable};
+
+	//don't use gf_malloc here !!
+	inst = malloc(sizeof(GPAC_NAPI));
+	if (!inst) {
+		napi_throw_error(env, NULL, "Failed to allocate GPAC NAPI context");
+		return NULL;
+	}
+	memset(inst, 0, sizeof(GPAC_NAPI));
+	NAPI_CALL( napi_set_instance_data(env, inst, gpac_napi_finalize, NULL) );
+
+	NAPI_CALL(InitConstants(env, exports) );
+
+#define DEF_FUN(_name, _fun) \
+	p_desc.utf8name = _name; \
+	NAPI_CALL( napi_create_function(env, NULL, 0, _fun, NULL, &p_desc.value) ); \
+	NAPI_CALL( napi_define_properties(env, exports, 1, &p_desc) );
+
+	/*function exports*/
+	DEF_FUN("init", gpac_init);
+	DEF_FUN("e2s", gpac_e2s);
+	DEF_FUN("set_logs", gpac_set_logs);
+	DEF_FUN("set_args", gpac_set_args);
+	DEF_FUN("sys_clock", gpac_sys_clock);
+	DEF_FUN("sys_clock_high_res", gpac_sys_clock_high_res);
+
+	DEF_FUN("set_rmt_fun", gpac_set_rmt_fun);
+	DEF_FUN("rmt_send", gpac_rmt_send);
+	DEF_FUN("rmt_on", gpac_rmt_on);
+	DEF_FUN("rmt_enable", gpac_rmt_enable);
+
+
+	status = init_fs_class(env, exports, inst);
+	if (status != napi_ok) return NULL;
+
+	status = init_fevt_class(env, exports, inst);
+	if (status != napi_ok) return NULL;
+
+	status = init_fio_class(env, exports, inst);
+	if (status != napi_ok) return NULL;
+
+	inst->main_thid = gf_th_id();
+
+	//default init
+	gf_sys_init(0, NULL);
+	return exports;
+}
+
+NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)
+
+
+static napi_status InitConstants(napi_env env, napi_value exports)
+{
+	napi_status status;
+	napi_property_descriptor p_desc = {.attributes=napi_enumerable};
+
+#define DEF_CONST_STR(_name, _fun) \
+	p_desc.utf8name = _name; \
+	status = napi_create_string_utf8(env, _fun, NAPI_AUTO_LENGTH, &p_desc.value);\
+	if (status != napi_ok) return status;\
+	status = napi_define_properties(env, exports, 1, &p_desc); \
+	if (status != napi_ok) return status;\
+
+#define DEF_CONST_INT(_name, _fun) \
+	p_desc.utf8name = _name; \
+	status = napi_create_int32(env, _fun, &p_desc.value); \
+	if (status != napi_ok) return status;\
+	status = napi_define_properties(env, exports, 1, &p_desc);\
+	if (status != napi_ok) return status;\
+
+#define DEF_CONST(_const) \
+	p_desc.utf8name = #_const; \
+	status = napi_create_int32(env, _const, &p_desc.value); \
+	if (status != napi_ok) return status;\
+	status = napi_define_properties(env, exports, 1, &p_desc);\
+	if (status != napi_ok) return status;\
+
+
+	/*symbol exports*/
+	DEF_CONST_STR("version", gf_gpac_version() );
+	DEF_CONST_STR("copyright", gf_gpac_copyright() );
+	DEF_CONST_STR("copyright_cite", gf_gpac_copyright_cite() );
+
+	DEF_CONST_INT("abi_major", gf_gpac_abi_major() );
+	DEF_CONST_INT("abi_minor", gf_gpac_abi_minor() );
+	DEF_CONST_INT("abi_micro", gf_gpac_abi_micro() );
+
+	DEF_CONST(GF_LOG_ERROR)
+	DEF_CONST(GF_LOG_WARNING)
+	DEF_CONST(GF_LOG_INFO)
+	DEF_CONST(GF_LOG_DEBUG)
+
+	DEF_CONST(GF_PROP_BOOL)
+	DEF_CONST(GF_PROP_UINT)
+	DEF_CONST(GF_PROP_SINT)
+	DEF_CONST(GF_PROP_LUINT)
+	DEF_CONST(GF_PROP_LSINT)
+	DEF_CONST(GF_PROP_FRACTION)
+	DEF_CONST(GF_PROP_FRACTION64)
+	DEF_CONST(GF_PROP_FLOAT)
+	DEF_CONST(GF_PROP_DOUBLE)
+	DEF_CONST(GF_PROP_VEC2I)
+	DEF_CONST(GF_PROP_VEC2)
+	DEF_CONST(GF_PROP_VEC3I)
+	DEF_CONST(GF_PROP_VEC4I)
+	DEF_CONST(GF_PROP_STRING)
+	DEF_CONST(GF_PROP_STRING_NO_COPY)
+	DEF_CONST(GF_PROP_DATA)
+	DEF_CONST(GF_PROP_NAME)
+	DEF_CONST(GF_PROP_DATA_NO_COPY)
+	DEF_CONST(GF_PROP_CONST_DATA)
+	DEF_CONST(GF_PROP_POINTER)
+	DEF_CONST(GF_PROP_STRING_LIST)
+	DEF_CONST(GF_PROP_UINT_LIST)
+	DEF_CONST(GF_PROP_SINT_LIST)
+	DEF_CONST(GF_PROP_VEC2I_LIST)
+	DEF_CONST(GF_PROP_4CC)
+	DEF_CONST(GF_PROP_4CC_LIST)
+
+	DEF_CONST(GF_PROP_PIXFMT)
+	DEF_CONST(GF_PROP_PCMFMT)
+	DEF_CONST(GF_PROP_CICP_COL_PRIM)
+	DEF_CONST(GF_PROP_CICP_COL_TFC)
+	DEF_CONST(GF_PROP_CICP_COL_MX)
+
+
+	DEF_CONST(GF_FEVT_PLAY)
+	DEF_CONST(GF_FEVT_SET_SPEED)
+	DEF_CONST(GF_FEVT_STOP)
+	DEF_CONST(GF_FEVT_PAUSE)
+	DEF_CONST(GF_FEVT_RESUME)
+	DEF_CONST(GF_FEVT_SOURCE_SEEK)
+	DEF_CONST(GF_FEVT_SOURCE_SWITCH)
+	DEF_CONST(GF_FEVT_SEGMENT_SIZE)
+	DEF_CONST(GF_FEVT_QUALITY_SWITCH)
+	DEF_CONST(GF_FEVT_VISIBILITY_HINT)
+	DEF_CONST(GF_FEVT_INFO_UPDATE)
+	DEF_CONST(GF_FEVT_BUFFER_REQ)
+	DEF_CONST(GF_FEVT_CAPS_CHANGE)
+	DEF_CONST(GF_FEVT_CONNECT_FAIL)
+	DEF_CONST(GF_FEVT_USER)
+	DEF_CONST(GF_FEVT_PLAY_HINT)
+	DEF_CONST(GF_FEVT_FILE_DELETE)
+
+	DEF_CONST(GF_STATS_LOCAL)
+	DEF_CONST(GF_STATS_LOCAL_INPUTS)
+	DEF_CONST(GF_STATS_DECODER_SINK)
+	DEF_CONST(GF_STATS_DECODER_SOURCE)
+	DEF_CONST(GF_STATS_ENCODER_SINK)
+	DEF_CONST(GF_STATS_ENCODER_SOURCE)
+
+	DEF_CONST(GF_FILTER_CLOCK_NONE)
+	DEF_CONST(GF_FILTER_CLOCK_PCR)
+	DEF_CONST(GF_FILTER_CLOCK_PCR_DISC)
+
+	DEF_CONST(GF_FILTER_SAP_NONE)
+	DEF_CONST(GF_FILTER_SAP_1)
+	DEF_CONST(GF_FILTER_SAP_2)
+	DEF_CONST(GF_FILTER_SAP_3)
+	DEF_CONST(GF_FILTER_SAP_4)
+	DEF_CONST(GF_FILTER_SAP_4_PROL)
+
+	DEF_CONST(GF_EOS);
+	DEF_CONST(GF_OK)
+	DEF_CONST(GF_BAD_PARAM)
+	DEF_CONST(GF_OUT_OF_MEM)
+	DEF_CONST(GF_IO_ERR)
+	DEF_CONST(GF_NOT_SUPPORTED)
+	DEF_CONST(GF_CORRUPTED_DATA)
+	DEF_CONST(GF_SG_UNKNOWN_NODE)
+	DEF_CONST(GF_SG_INVALID_PROTO)
+	DEF_CONST(GF_SCRIPT_ERROR)
+	DEF_CONST(GF_BUFFER_TOO_SMALL)
+	DEF_CONST(GF_NON_COMPLIANT_BITSTREAM)
+	DEF_CONST(GF_FILTER_NOT_FOUND)
+	DEF_CONST(GF_URL_ERROR)
+	DEF_CONST(GF_SERVICE_ERROR)
+	DEF_CONST(GF_REMOTE_SERVICE_ERROR)
+	DEF_CONST(GF_STREAM_NOT_FOUND)
+	DEF_CONST(GF_ISOM_INVALID_FILE)
+	DEF_CONST(GF_ISOM_INCOMPLETE_FILE)
+	DEF_CONST(GF_ISOM_INVALID_MEDIA)
+	DEF_CONST(GF_ISOM_INVALID_MODE)
+	DEF_CONST(GF_ISOM_UNKNOWN_DATA_REF)
+	DEF_CONST(GF_ODF_INVALID_DESCRIPTOR)
+	DEF_CONST(GF_ODF_FORBIDDEN_DESCRIPTOR)
+	DEF_CONST(GF_ODF_INVALID_COMMAND)
+	DEF_CONST(GF_BIFS_UNKNOWN_VERSION)
+	DEF_CONST(GF_IP_ADDRESS_NOT_FOUND)
+	DEF_CONST(GF_IP_CONNECTION_FAILURE)
+	DEF_CONST(GF_IP_NETWORK_FAILURE)
+	DEF_CONST(GF_IP_CONNECTION_CLOSED)
+	DEF_CONST(GF_IP_NETWORK_EMPTY)
+	DEF_CONST(GF_IP_SOCK_WOULD_BLOCK)
+	DEF_CONST(GF_IP_UDP_TIMEOUT)
+	DEF_CONST(GF_AUTHENTICATION_FAILURE)
+	DEF_CONST(GF_SCRIPT_NOT_READY)
+	DEF_CONST(GF_INVALID_CONFIGURATION)
+	DEF_CONST(GF_NOT_FOUND)
+	DEF_CONST(GF_PROFILE_NOT_SUPPORTED)
+	DEF_CONST(GF_REQUIRES_NEW_INSTANCE)
+	DEF_CONST(GF_FILTER_NOT_SUPPORTED)
+
+
+	DEF_CONST(GF_FILTER_UPDATE_DOWNSTREAM)
+	DEF_CONST(GF_FILTER_UPDATE_UPSTREAM)
+
+	DEF_CONST(GF_EVENT_CLICK)
+	DEF_CONST(GF_EVENT_MOUSEUP)
+	DEF_CONST(GF_EVENT_MOUSEDOWN)
+	DEF_CONST(GF_EVENT_MOUSEMOVE)
+	DEF_CONST(GF_EVENT_MOUSEWHEEL)
+	DEF_CONST(GF_EVENT_DBLCLICK)
+	DEF_CONST(GF_EVENT_MULTITOUCH)
+	DEF_CONST(GF_EVENT_KEYUP)
+	DEF_CONST(GF_EVENT_KEYDOWN)
+	DEF_CONST(GF_EVENT_TEXTINPUT)
+	DEF_CONST(GF_EVENT_DROPFILE)
+	DEF_CONST(GF_EVENT_TIMESHIFT_DEPTH)
+	DEF_CONST(GF_EVENT_TIMESHIFT_UPDATE)
+	DEF_CONST(GF_EVENT_TIMESHIFT_OVERFLOW)
+	DEF_CONST(GF_EVENT_TIMESHIFT_UNDERRUN)
+	DEF_CONST(GF_EVENT_PASTE_TEXT)
+	DEF_CONST(GF_EVENT_COPY_TEXT)
+	DEF_CONST(GF_EVENT_SIZE)
+	DEF_CONST(GF_EVENT_SHOWHIDE)
+	DEF_CONST(GF_EVENT_MOVE)
+	DEF_CONST(GF_EVENT_SET_CAPTION)
+	DEF_CONST(GF_EVENT_REFRESH)
+	DEF_CONST(GF_EVENT_QUIT)
+
+	DEF_CONST(GF_KEY_UNIDENTIFIED)
+	DEF_CONST(GF_KEY_ACCEPT)
+	DEF_CONST(GF_KEY_AGAIN)
+	DEF_CONST(GF_KEY_ALLCANDIDATES)
+	DEF_CONST(GF_KEY_ALPHANUM)
+	DEF_CONST(GF_KEY_ALT)
+	DEF_CONST(GF_KEY_ALTGRAPH)
+	DEF_CONST(GF_KEY_APPS)
+	DEF_CONST(GF_KEY_ATTN)
+	DEF_CONST(GF_KEY_BROWSERBACK)
+	DEF_CONST(GF_KEY_BROWSERFAVORITES)
+	DEF_CONST(GF_KEY_BROWSERFORWARD)
+	DEF_CONST(GF_KEY_BROWSERHOME)
+	DEF_CONST(GF_KEY_BROWSERREFRESH)
+	DEF_CONST(GF_KEY_BROWSERSEARCH)
+	DEF_CONST(GF_KEY_BROWSERSTOP)
+	DEF_CONST(GF_KEY_CAPSLOCK)
+	DEF_CONST(GF_KEY_CLEAR)
+	DEF_CONST(GF_KEY_CODEINPUT)
+	DEF_CONST(GF_KEY_COMPOSE)
+	DEF_CONST(GF_KEY_CONTROL)
+	DEF_CONST(GF_KEY_CRSEL)
+	DEF_CONST(GF_KEY_CONVERT)
+	DEF_CONST(GF_KEY_COPY)
+	DEF_CONST(GF_KEY_CUT)
+	DEF_CONST(GF_KEY_DOWN)
+	DEF_CONST(GF_KEY_END)
+	DEF_CONST(GF_KEY_ENTER)
+	DEF_CONST(GF_KEY_ERASEEOF)
+	DEF_CONST(GF_KEY_EXECUTE)
+	DEF_CONST(GF_KEY_EXSEL)
+	DEF_CONST(GF_KEY_F1)
+	DEF_CONST(GF_KEY_F2)
+	DEF_CONST(GF_KEY_F3)
+	DEF_CONST(GF_KEY_F4)
+	DEF_CONST(GF_KEY_F5)
+	DEF_CONST(GF_KEY_F6)
+	DEF_CONST(GF_KEY_F7)
+	DEF_CONST(GF_KEY_F8)
+	DEF_CONST(GF_KEY_F9)
+	DEF_CONST(GF_KEY_F10)
+	DEF_CONST(GF_KEY_F11)
+	DEF_CONST(GF_KEY_F12)
+	DEF_CONST(GF_KEY_F13)
+	DEF_CONST(GF_KEY_F14)
+	DEF_CONST(GF_KEY_F15)
+	DEF_CONST(GF_KEY_F16)
+	DEF_CONST(GF_KEY_F17)
+	DEF_CONST(GF_KEY_F18)
+	DEF_CONST(GF_KEY_F19)
+	DEF_CONST(GF_KEY_F20)
+	DEF_CONST(GF_KEY_F21)
+	DEF_CONST(GF_KEY_F22)
+	DEF_CONST(GF_KEY_F23)
+	DEF_CONST(GF_KEY_F24)
+	DEF_CONST(GF_KEY_FINALMODE)
+	DEF_CONST(GF_KEY_FIND)
+	DEF_CONST(GF_KEY_FULLWIDTH)
+	DEF_CONST(GF_KEY_HALFWIDTH)
+	DEF_CONST(GF_KEY_HANGULMODE)
+	DEF_CONST(GF_KEY_HANJAMODE)
+	DEF_CONST(GF_KEY_HELP)
+	DEF_CONST(GF_KEY_HIRAGANA)
+	DEF_CONST(GF_KEY_HOME)
+	DEF_CONST(GF_KEY_INSERT)
+	DEF_CONST(GF_KEY_JAPANESEHIRAGANA)
+	DEF_CONST(GF_KEY_JAPANESEKATAKANA)
+	DEF_CONST(GF_KEY_JAPANESEROMAJI)
+	DEF_CONST(GF_KEY_JUNJAMODE)
+	DEF_CONST(GF_KEY_KANAMODE)
+	DEF_CONST(GF_KEY_KANJIMODE)
+	DEF_CONST(GF_KEY_KATAKANA)
+	DEF_CONST(GF_KEY_LAUNCHAPPLICATION1)
+	DEF_CONST(GF_KEY_LAUNCHAPPLICATION2)
+	DEF_CONST(GF_KEY_LAUNCHMAIL)
+	DEF_CONST(GF_KEY_LEFT)
+	DEF_CONST(GF_KEY_META)
+	DEF_CONST(GF_KEY_MEDIANEXTTRACK)
+	DEF_CONST(GF_KEY_MEDIAPLAYPAUSE)
+	DEF_CONST(GF_KEY_MEDIAPREVIOUSTRACK)
+	DEF_CONST(GF_KEY_MEDIASTOP)
+	DEF_CONST(GF_KEY_MODECHANGE)
+	DEF_CONST(GF_KEY_NONCONVERT)
+	DEF_CONST(GF_KEY_NUMLOCK)
+	DEF_CONST(GF_KEY_PAGEDOWN)
+	DEF_CONST(GF_KEY_PAGEUP)
+	DEF_CONST(GF_KEY_PASTE)
+	DEF_CONST(GF_KEY_PAUSE)
+	DEF_CONST(GF_KEY_PLAY)
+	DEF_CONST(GF_KEY_PREVIOUSCANDIDATE)
+	DEF_CONST(GF_KEY_PRINTSCREEN)
+	DEF_CONST(GF_KEY_PROCESS)
+	DEF_CONST(GF_KEY_PROPS)
+	DEF_CONST(GF_KEY_RIGHT)
+	DEF_CONST(GF_KEY_ROMANCHARACTERS)
+	DEF_CONST(GF_KEY_SCROLL)
+	DEF_CONST(GF_KEY_SELECT)
+	DEF_CONST(GF_KEY_SELECTMEDIA)
+	DEF_CONST(GF_KEY_SHIFT)
+	DEF_CONST(GF_KEY_STOP)
+	DEF_CONST(GF_KEY_UP)
+	DEF_CONST(GF_KEY_UNDO)
+	DEF_CONST(GF_KEY_VOLUMEDOWN)
+	DEF_CONST(GF_KEY_VOLUMEMUTE)
+	DEF_CONST(GF_KEY_VOLUMEUP)
+	DEF_CONST(GF_KEY_WIN)
+	DEF_CONST(GF_KEY_ZOOM)
+	DEF_CONST(GF_KEY_BACKSPACE)
+	DEF_CONST(GF_KEY_TAB)
+	DEF_CONST(GF_KEY_CANCEL)
+	DEF_CONST(GF_KEY_ESCAPE)
+	DEF_CONST(GF_KEY_SPACE)
+	DEF_CONST(GF_KEY_EXCLAMATION)
+	DEF_CONST(GF_KEY_QUOTATION)
+	DEF_CONST(GF_KEY_NUMBER)
+	DEF_CONST(GF_KEY_DOLLAR)
+	DEF_CONST(GF_KEY_AMPERSAND)
+	DEF_CONST(GF_KEY_APOSTROPHE)
+	DEF_CONST(GF_KEY_LEFTPARENTHESIS)
+	DEF_CONST(GF_KEY_RIGHTPARENTHESIS)
+	DEF_CONST(GF_KEY_STAR)
+	DEF_CONST(GF_KEY_PLUS)
+	DEF_CONST(GF_KEY_COMMA)
+	DEF_CONST(GF_KEY_HYPHEN)
+	DEF_CONST(GF_KEY_FULLSTOP)
+	DEF_CONST(GF_KEY_SLASH)
+	DEF_CONST(GF_KEY_0)
+	DEF_CONST(GF_KEY_1)
+	DEF_CONST(GF_KEY_2)
+	DEF_CONST(GF_KEY_3)
+	DEF_CONST(GF_KEY_4)
+	DEF_CONST(GF_KEY_5)
+	DEF_CONST(GF_KEY_6)
+	DEF_CONST(GF_KEY_7)
+	DEF_CONST(GF_KEY_8)
+	DEF_CONST(GF_KEY_9)
+	DEF_CONST(GF_KEY_COLON)
+	DEF_CONST(GF_KEY_SEMICOLON)
+	DEF_CONST(GF_KEY_LESSTHAN)
+	DEF_CONST(GF_KEY_EQUALS)
+	DEF_CONST(GF_KEY_GREATERTHAN)
+	DEF_CONST(GF_KEY_QUESTION)
+	DEF_CONST(GF_KEY_AT)
+	DEF_CONST(GF_KEY_A)
+	DEF_CONST(GF_KEY_B)
+	DEF_CONST(GF_KEY_C)
+	DEF_CONST(GF_KEY_D)
+	DEF_CONST(GF_KEY_E)
+	DEF_CONST(GF_KEY_F)
+	DEF_CONST(GF_KEY_G)
+	DEF_CONST(GF_KEY_H)
+	DEF_CONST(GF_KEY_I)
+	DEF_CONST(GF_KEY_J)
+	DEF_CONST(GF_KEY_K)
+	DEF_CONST(GF_KEY_L)
+	DEF_CONST(GF_KEY_M)
+	DEF_CONST(GF_KEY_N)
+	DEF_CONST(GF_KEY_O)
+	DEF_CONST(GF_KEY_P)
+	DEF_CONST(GF_KEY_Q)
+	DEF_CONST(GF_KEY_R)
+	DEF_CONST(GF_KEY_S)
+	DEF_CONST(GF_KEY_T)
+	DEF_CONST(GF_KEY_U)
+	DEF_CONST(GF_KEY_V)
+	DEF_CONST(GF_KEY_W)
+	DEF_CONST(GF_KEY_X)
+	DEF_CONST(GF_KEY_Y)
+	DEF_CONST(GF_KEY_Z)
+	DEF_CONST(GF_KEY_LEFTSQUAREBRACKET)
+	DEF_CONST(GF_KEY_BACKSLASH)
+	DEF_CONST(GF_KEY_RIGHTSQUAREBRACKET)
+	DEF_CONST(GF_KEY_CIRCUM)
+	DEF_CONST(GF_KEY_UNDERSCORE)
+	DEF_CONST(GF_KEY_GRAVEACCENT)
+	DEF_CONST(GF_KEY_LEFTCURLYBRACKET)
+	DEF_CONST(GF_KEY_PIPE)
+	DEF_CONST(GF_KEY_RIGHTCURLYBRACKET)
+	DEF_CONST(GF_KEY_DEL)
+	DEF_CONST(GF_KEY_INVERTEXCLAMATION)
+	DEF_CONST(GF_KEY_DEADGRAVE)
+	DEF_CONST(GF_KEY_DEADEACUTE)
+	DEF_CONST(GF_KEY_DEADCIRCUM)
+	DEF_CONST(GF_KEY_DEADTILDE)
+	DEF_CONST(GF_KEY_DEADMACRON)
+	DEF_CONST(GF_KEY_DEADBREVE)
+	DEF_CONST(GF_KEY_DEADABOVEDOT)
+	DEF_CONST(GF_KEY_DEADDIARESIS)
+	DEF_CONST(GF_KEY_DEADRINGABOVE)
+	DEF_CONST(GF_KEY_DEADDOUBLEACUTE)
+	DEF_CONST(GF_KEY_DEADCARON)
+	DEF_CONST(GF_KEY_DEADCEDILLA)
+	DEF_CONST(GF_KEY_DEADOGONEK)
+	DEF_CONST(GF_KEY_DEADIOTA)
+	DEF_CONST(GF_KEY_EURO)
+	DEF_CONST(GF_KEY_DEADVOICESOUND)
+	DEF_CONST(GF_KEY_DEADSEMIVOICESOUND)
+	DEF_CONST(GF_KEY_CHANNELUP)
+	DEF_CONST(GF_KEY_CHANNELDOWN)
+	DEF_CONST(GF_KEY_TEXT)
+	DEF_CONST(GF_KEY_INFO)
+	DEF_CONST(GF_KEY_EPG)
+	DEF_CONST(GF_KEY_RECORD)
+	DEF_CONST(GF_KEY_BEGINPAGE)
+	DEF_CONST(GF_KEY_CELL_SOFT1)
+	DEF_CONST(GF_KEY_CELL_SOFT2)
+	DEF_CONST(GF_KEY_JOYSTICK)
+
+	DEF_CONST(GF_KEY_MOD_SHIFT)
+	DEF_CONST(GF_KEY_MOD_CTRL)
+	DEF_CONST(GF_KEY_MOD_ALT)
+	DEF_CONST(GF_KEY_EXT_NUMPAD)
+	DEF_CONST(GF_KEY_EXT_LEFT)
+	DEF_CONST(GF_KEY_EXT_RIGHT)
+
+	DEF_CONST(GF_MemTrackerNone)
+	DEF_CONST(GF_MemTrackerSimple)
+	DEF_CONST(GF_MemTrackerBackTrace)
+
+	DEF_CONST(GF_FS_SCHEDULER_LOCK_FREE)
+	DEF_CONST(GF_FS_SCHEDULER_LOCK)
+	DEF_CONST(GF_FS_SCHEDULER_LOCK_FREE_X)
+	DEF_CONST(GF_FS_SCHEDULER_LOCK_FORCE)
+	DEF_CONST(GF_FS_SCHEDULER_DIRECT)
+
+	DEF_CONST(GF_FS_FLAG_LOAD_META)
+	DEF_CONST(GF_FS_FLAG_NON_BLOCKING)
+	DEF_CONST(GF_FS_FLAG_NO_GRAPH_CACHE)
+	DEF_CONST(GF_FS_FLAG_NO_REGULATION)
+	DEF_CONST(GF_FS_FLAG_NO_PROBE)
+	DEF_CONST(GF_FS_FLAG_NO_REASSIGN)
+	DEF_CONST(GF_FS_FLAG_PRINT_CONNECTIONS)
+	DEF_CONST(GF_FS_FLAG_NO_ARG_CHECK)
+	DEF_CONST(GF_FS_FLAG_NO_RESERVOIR)
+	DEF_CONST(GF_FS_FLAG_FULL_LINK)
+	DEF_CONST(GF_FS_FLAG_NO_IMPLICIT)
+
+
+	DEF_CONST(GF_PROP_FORBIDEN)
+	DEF_CONST(GF_PROP_SINT)
+	DEF_CONST(GF_PROP_UINT)
+	DEF_CONST(GF_PROP_LSINT)
+	DEF_CONST(GF_PROP_LUINT)
+	DEF_CONST(GF_PROP_BOOL)
+	DEF_CONST(GF_PROP_FRACTION)
+	DEF_CONST(GF_PROP_FRACTION64)
+	DEF_CONST(GF_PROP_FLOAT)
+	DEF_CONST(GF_PROP_DOUBLE)
+	DEF_CONST(GF_PROP_VEC2I)
+	DEF_CONST(GF_PROP_VEC2)
+	DEF_CONST(GF_PROP_VEC3I)
+	DEF_CONST(GF_PROP_VEC4I)
+	DEF_CONST(GF_PROP_STRING)
+	DEF_CONST(GF_PROP_STRING_NO_COPY)
+	DEF_CONST(GF_PROP_DATA)
+	DEF_CONST(GF_PROP_NAME)
+	DEF_CONST(GF_PROP_DATA_NO_COPY)
+	DEF_CONST(GF_PROP_CONST_DATA)
+	DEF_CONST(GF_PROP_POINTER)
+	DEF_CONST(GF_PROP_STRING_LIST)
+	DEF_CONST(GF_PROP_UINT_LIST)
+	DEF_CONST(GF_PROP_SINT_LIST)
+	DEF_CONST(GF_PROP_VEC2I_LIST)
+	DEF_CONST(GF_PROP_4CC)
+	DEF_CONST(GF_PROP_4CC_LIST)
+	DEF_CONST(GF_PROP_FIRST_ENUM)
+	DEF_CONST(GF_PROP_PIXFMT)
+	DEF_CONST(GF_PROP_PCMFMT)
+	DEF_CONST(GF_PROP_CICP_COL_PRIM)
+	DEF_CONST(GF_PROP_CICP_COL_TFC)
+	DEF_CONST(GF_PROP_CICP_COL_MX)
+
+	DEF_CONST(GF_FS_ARG_HINT_NORMAL)
+	DEF_CONST(GF_FS_ARG_HINT_ADVANCED)
+	DEF_CONST(GF_FS_ARG_HINT_EXPERT)
+	DEF_CONST(GF_FS_ARG_HINT_HIDE)
+	DEF_CONST(GF_FS_ARG_UPDATE)
+	DEF_CONST(GF_FS_ARG_META)
+	DEF_CONST(GF_FS_ARG_META_ALLOC)
+	DEF_CONST(GF_FS_ARG_SINK_ALIAS)
+
+	DEF_CONST(GF_CAPFLAG_IN_BUNDLE)
+	DEF_CONST(GF_CAPFLAG_INPUT)
+	DEF_CONST(GF_CAPFLAG_OUTPUT)
+	DEF_CONST(GF_CAPFLAG_EXCLUDED)
+	DEF_CONST(GF_CAPFLAG_LOADED_FILTER)
+	DEF_CONST(GF_CAPFLAG_STATIC)
+	DEF_CONST(GF_CAPFLAG_OPTIONAL)
+	DEF_CONST(GF_CAPS_INPUT)
+	DEF_CONST(GF_CAPS_INPUT_OPT)
+	DEF_CONST(GF_CAPS_INPUT_STATIC)
+	DEF_CONST(GF_CAPS_INPUT_STATIC_OPT)
+	DEF_CONST(GF_CAPS_INPUT_EXCLUDED)
+	DEF_CONST(GF_CAPS_INPUT_LOADED_FILTER)
+	DEF_CONST(GF_CAPS_OUTPUT)
+	DEF_CONST(GF_CAPS_OUTPUT_LOADED_FILTER)
+	DEF_CONST(GF_CAPS_OUTPUT_EXCLUDED)
+	DEF_CONST(GF_CAPS_OUTPUT_STATIC)
+	DEF_CONST(GF_CAPS_OUTPUT_STATIC_EXCLUDED)
+	DEF_CONST(GF_CAPS_INPUT_OUTPUT)
+	DEF_CONST(GF_CAPS_INPUT_OUTPUT_OPT)
+
+	DEF_CONST(GF_FS_FLUSH_NONE)
+	DEF_CONST(GF_FS_FLUSH_ALL)
+	DEF_CONST(GF_FS_FLUSH_FAST)
+
+	DEF_CONST(GF_SETUP_ERROR)
+	DEF_CONST(GF_NOTIF_ERROR)
+	DEF_CONST(GF_NOTIF_ERROR_AND_DISCONNECT)
+
+	return napi_ok;
+}
+
+
+void dashbind_finalize(napi_env env, void* finalize_data, void* finalize_hint)
+{
+	NAPI_Dash *napi_dash = (NAPI_Dash *)finalize_data;
+return;
+	u32 rcount;
+	napi_reference_unref(env, napi_dash->groups, &rcount);
+	napi_delete_reference(env, napi_dash->groups);
+	napi_dash->groups = NULL;
+
+	napi_reference_unref(env, napi_dash->ref, &rcount);
+	napi_delete_reference(env, napi_dash->ref);
+	napi_dash->ref = NULL;
+
+	/*destruction not done here*/
+}
+
+void dashbind_period_reset(void *udta, u32 type)
+{
+	napi_status status;
+	napi_value obj, fun_val, res;
+	NAPI_Dash *napi_dash = (NAPI_Dash *)udta;
+
+	napi_get_reference_value(napi_dash->env, napi_dash->ref, &obj);
+	Bool has_fun = GF_FALSE;
+	napi_has_named_property(napi_dash->env, obj, "on_period_reset", (bool *) &has_fun);
+	if (has_fun) {
+		status = napi_get_named_property(napi_dash->env, obj, "on_period_reset", &fun_val);
+		if (status!=napi_ok) has_fun = GF_FALSE;
+	}
+
+	if (!has_fun) return;
+
+	napi_value arg;
+	napi_create_uint32(napi_dash->env, type, &arg);
+	napi_call_function(napi_dash->env, obj, fun_val, 1, &arg, &res);
+}
+
+void dashbind_new_group(void *udta, u32 group_idx, void *_dash)
+{
+	napi_property_descriptor p_desc = {.attributes=napi_enumerable};
+	napi_status status;
+	napi_value obj, group, groups, qualities, fun_val, res;
+	NAPI_Dash *napi_dash = (NAPI_Dash *)udta;
+	napi_env env = napi_dash->env;
+	GF_DashClient *dash = (GF_DashClient *) _dash;
+
+	napi_create_object(env, &group);
+
+	napi_get_reference_value(napi_dash->env, napi_dash->groups, &groups);
+	napi_set_element(env, groups, group_idx, group);
+
+	p_desc.utf8name = "idx";
+	napi_create_uint32(env, group_idx, &p_desc.value);
+	napi_define_properties(env, group, 1, &p_desc);
+
+	p_desc.utf8name = "duration";
+	napi_create_int64(env, (s64) gf_dash_get_period_duration(dash), &p_desc.value);
+	napi_define_properties(env, group, 1, &p_desc);
+
+	p_desc.utf8name = "qualities";
+	napi_create_array(env, &p_desc.value);
+	napi_define_properties(env, group, 1, &p_desc);
+	qualities = p_desc.value;
+
+	u32 i, nb_qualities = gf_dash_group_get_num_qualities(dash, group_idx);
+	for (i=0; i<nb_qualities; i++) {
+		napi_value q, segs;
+		GF_DASHQualityInfo qinfo;
+		gf_dash_group_get_quality_info(dash, group_idx, i, &qinfo);
+
+		napi_create_object(env, &q);
+
+
+#define QSET_U32(_val) \
+		p_desc.utf8name = #_val;\
+		napi_create_uint32(env, qinfo._val, &p_desc.value); \
+		napi_define_properties(env, q, 1, &p_desc);
+
+#define QSET_BOOL(_val) \
+		p_desc.utf8name = #_val;\
+		napi_get_boolean(env, qinfo._val ? true : false, &p_desc.value); \
+		napi_define_properties(env, q, 1, &p_desc);
+
+#define QSET_STR(_val) \
+		p_desc.utf8name = #_val;\
+		if (qinfo._val) {\
+			napi_create_string_utf8(env, qinfo._val, NAPI_AUTO_LENGTH, &p_desc.value);\
+		} else {\
+			napi_get_null(env, &p_desc.value);\
+		}\
+		napi_define_properties(env, q, 1, &p_desc);
+
+#define QSET_DOUBLE(_val) \
+		p_desc.utf8name = #_val;\
+		napi_create_double(env, qinfo._val ? true : false, &p_desc.value); \
+		napi_define_properties(env, q, 1, &p_desc);
+
+
+		QSET_U32(bandwidth)
+		QSET_STR(ID)
+		QSET_STR(mime)
+		QSET_STR(codec)
+		QSET_U32(width)
+		QSET_U32(height)
+		QSET_BOOL(interlaced)
+
+		p_desc.utf8name = "fps";
+		GF_Fraction frac = {qinfo.fps_num, qinfo.fps_den};
+		p_desc.value = frac_to_napi(env, &frac);
+		napi_define_properties(env, q, 1, &p_desc);
+
+		p_desc.utf8name = "sar";
+		frac.num = qinfo.par_num;
+		frac.den = qinfo.par_den;
+		p_desc.value = frac_to_napi(env, &frac);
+		napi_define_properties(env, q, 1, &p_desc);
+
+		QSET_U32(sample_rate)
+		QSET_U32(nb_channels)
+		QSET_BOOL(disabled)
+		QSET_BOOL(is_selected)
+		QSET_DOUBLE(ast_offset)
+		QSET_DOUBLE(average_duration)
+
+		p_desc.utf8name = "sizes";
+		napi_create_array(env, &p_desc.value);
+		napi_define_properties(env, q, 1, &p_desc);
+		segs = p_desc.value;
+
+		/*! list of segmentURLs if known, NULL otherwise. Used for onDemand profile to get segment sizes*/
+		if (qinfo.seg_urls) {
+			u32 j, nb_segs=gf_list_count(qinfo.seg_urls);
+			for (j=0; j<nb_segs; j++) {
+				napi_value si;
+				GF_MPD_SegmentURL *surl = gf_list_get((GF_List *) qinfo.seg_urls, j);
+
+				napi_create_object(env, &si);
+				napi_set_element(env, segs, j, si);
+				p_desc.utf8name = "size";
+				napi_create_int64(env, (1 + surl->media_range->end_range - surl->media_range->start_range), &p_desc.value);
+				napi_define_properties(env, si, 1, &p_desc);
+
+				p_desc.utf8name = "duration";
+				napi_create_uint32(env, surl->duration, &p_desc.value);
+				napi_define_properties(env, si, 1, &p_desc);
+			}
+		}
+		napi_set_element(env, qualities, i, q);
+	}
+
+	//create srd
+	p_desc.utf8name = "SRD";
+	u32 id, x, y, w, h, fw, fh;
+	if (gf_dash_group_get_srd_info(dash, group_idx, &id, &x, &y, &w, &h, &fw, &fh)) {
+		napi_value srd, val;
+		napi_create_object(env, &srd);
+		p_desc.value = srd;
+
+#define SRD_U32(_val) \
+		napi_create_uint32(env, _val, &val);\
+		napi_set_named_property(env, srd, #_val, val); \
+
+		SRD_U32(id)
+		SRD_U32(x)
+		SRD_U32(y)
+		SRD_U32(w)
+		SRD_U32(h)
+		SRD_U32(fw)
+		SRD_U32(fh)
+
+	} else {
+		napi_get_null(env, &p_desc.value);
+	}
+	napi_define_properties(env, group, 1, &p_desc);
+
+	napi_get_reference_value(napi_dash->env, napi_dash->ref, &obj);
+	Bool has_fun = GF_FALSE;
+	napi_has_named_property(napi_dash->env, obj, "on_new_group", (bool *) &has_fun);
+	if (has_fun) {
+		status = napi_get_named_property(napi_dash->env, obj, "on_new_group", &fun_val);
+		if (status!=napi_ok) has_fun = GF_FALSE;
+	}
+
+	if (has_fun) {
+		napi_call_function(napi_dash->env, obj, fun_val, 1, &group, &res);
+	}
+}
+
+s32 dashbind_rate_adaptation(void *udta, u32 group_idx, u32 base_group_idx, Bool force_low_complex, void *_stats)
+{
+	napi_status status;
+	napi_value obj, fun_val, groups, res, st, val;
+	GF_DASHCustomAlgoInfo *stats = (GF_DASHCustomAlgoInfo *)_stats;
+	NAPI_Dash *napi_dash = (NAPI_Dash *)udta;
+	napi_env env = napi_dash->env;
+
+	napi_get_reference_value(napi_dash->env, napi_dash->ref, &obj);
+	Bool has_fun = GF_FALSE;
+	napi_has_named_property(napi_dash->env, obj, "on_rate_adaptation", (bool *) &has_fun);
+	if (has_fun) {
+		status = napi_get_named_property(napi_dash->env, obj, "on_rate_adaptation", &fun_val);
+		if (status!=napi_ok) has_fun = GF_FALSE;
+	}
+
+	if (!has_fun) return -1;
+
+	u32 i, nb_groups;
+	napi_get_reference_value(env, napi_dash->groups, &groups);
+	napi_get_named_property(env, groups, "length", &res);
+	napi_get_value_uint32(env, res, &nb_groups);
+
+	napi_value args[4];
+	napi_get_null(env, &args[0]);
+	napi_get_null(env, &args[1]);
+	for (i=0; i<nb_groups;i++) {
+		u32 g_idx=0;
+		napi_value group;
+		napi_get_element(env, groups, i, &group);
+		napi_get_named_property(env, group, "idx", &res);
+		napi_get_value_uint32(env, res, &g_idx);
+		if (g_idx==group_idx) args[0] = group;
+		else if (g_idx==base_group_idx) args[1] = group;
+	}
+	napi_get_boolean(env, force_low_complex ? true : false, &args[2]);
+
+	napi_create_object(env, &st);
+	args[3] = st;
+
+
+#define SSET_U32(_val) \
+		napi_create_uint32(env, stats->_val, &val);\
+		napi_set_named_property(env, st, #_val, val); \
+
+#define SSET_DOUBLE(_val) \
+		napi_create_double(env, stats->_val, &val);\
+		napi_set_named_property(env, st, #_val, val); \
+
+	SSET_U32(download_rate);
+	SSET_U32(file_size);
+	SSET_DOUBLE(speed);
+	SSET_DOUBLE(max_available_speed);
+	SSET_U32(display_width);
+	SSET_U32(display_height);
+	SSET_U32(active_quality_idx);
+	SSET_U32(buffer_min_ms);
+	SSET_U32(buffer_max_ms);
+	SSET_U32(buffer_occupancy_ms);
+	SSET_U32(quality_degradation_hint);
+	SSET_U32(total_rate);
+	napi_call_function(napi_dash->env, obj, fun_val, 4, args, &res);
+
+	s32 ret_val=-1;
+	napi_get_value_int32(env, res, &ret_val);
+	return ret_val;
+}
+
+typedef struct
+{
+	u32 bits_per_sec;
+	u64 total_bytes;
+	u64 bytes_done;
+	u64 us_since_start;
+	u32 buffer_dur;
+	u32 current_seg_dur;
+} GF_DASHDownloadStats;
+
+s32 dashbind_download_monitor(void *udta, u32 group_idx, void *_stats)
+{
+	napi_status status;
+	napi_value obj, fun_val, groups, res, st, val;
+	GF_DASHDownloadStats *stats = (GF_DASHDownloadStats *)_stats;
+	NAPI_Dash *napi_dash = (NAPI_Dash *)udta;
+	napi_env env = napi_dash->env;
+
+	napi_get_reference_value(napi_dash->env, napi_dash->ref, &obj);
+	Bool has_fun = GF_FALSE;
+	napi_has_named_property(napi_dash->env, obj, "on_download_monitor", (bool *) &has_fun);
+	if (has_fun) {
+		status = napi_get_named_property(napi_dash->env, obj, "on_download_monitor", &fun_val);
+		if (status!=napi_ok) has_fun = GF_FALSE;
+	}
+
+	if (!has_fun) return -1;
+
+	u32 i, nb_groups;
+	napi_get_reference_value(env, napi_dash->groups, &groups);
+	napi_get_named_property(env, groups, "length", &res);
+	napi_get_value_uint32(env, res, &nb_groups);
+
+	napi_value args[2];
+	napi_get_null(env, &args[0]);
+	for (i=0; i<nb_groups;i++) {
+		u32 g_idx=0;
+		napi_value group;
+		napi_get_element(env, groups, i, &group);
+		napi_get_named_property(env, group, "idx", &res);
+		napi_get_value_uint32(env, res, &g_idx);
+		if (g_idx==group_idx) {
+			args[0] = group;
+			break;
+		}
+	}
+	napi_create_object(env, &st);
+	args[1] = st;
+
+#define DSSET_U32(_val) \
+		napi_create_uint32(env, stats->_val, &val);\
+		napi_set_named_property(env, st, #_val, val); \
+
+#define DSSET_U64(_val) \
+		napi_create_int64(env, (s64) stats->_val, &val);\
+		napi_set_named_property(env, st, #_val, val); \
+
+	DSSET_U32(bits_per_sec);
+	DSSET_U64(total_bytes);
+	DSSET_U64(bytes_done);
+	DSSET_U64(us_since_start);
+	DSSET_U32(buffer_dur);
+	DSSET_U32(current_seg_dur);
+
+	napi_call_function(napi_dash->env, obj, fun_val, 2, args, &res);
+
+	s32 ret_val=-1;
+	napi_get_value_int32(env, res, &ret_val);
+	return ret_val;
+}
+/*currently not exposed by filter.h*/
+GF_Err gf_filter_bind_dash_algo_callbacks(GF_Filter *filter, void *udta,
+		void (*period_reset)(void *rate_adaptation, u32 type),
+		void (*new_group)(void *udta, u32 group_idx, void *dash),
+		s32 (*rate_adaptation)(void *udta, u32 group_idx, u32 base_group_idx, Bool force_low_complex, void *stats),
+		s32 (*download_monitor)(void *udta, u32 group_idx, void *stats)
+	);
+
+napi_value dashin_bind(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	napi_value val;
+	NAPI_Dash *napi_dash;
+
+	NARG_ARGS_THIS(1,1)
+	FILTER
+
+	GF_SAFEALLOC(napi_dash, NAPI_Dash);
+	if (!napi_dash) {
+		napi_throw_error(env, NULL, "Failed to allocate dashin binding");
+		return NULL;
+	}
+
+
+	NAPI_Filter *napi_f = (NAPI_Filter *) gf_filter_get_rt_udta(f);
+	napi_create_reference(env, argv[0], 1, &napi_f->binding_ref);
+	napi_dash->ref = napi_f->binding_ref;
+	napi_dash->env = env;
+	napi_f->binding_stack = napi_dash;
+
+	napi_create_array(env, &val);
+	napi_create_reference(env, val, 1, &napi_dash->groups);
+
+	napi_type_tag_object(env, argv[0], &dashbind_tag);
+	NAPI_CALL( napi_wrap(env, argv[0], napi_dash, dashbind_finalize, NULL, NULL) );
+
+	Bool has_fun = GF_FALSE;
+	napi_has_named_property(napi_f->env, argv[0], "on_download_monitor", (bool *) &has_fun);
+	e = gf_filter_bind_dash_algo_callbacks(f, napi_dash, dashbind_period_reset, dashbind_new_group, dashbind_rate_adaptation, has_fun ? dashbind_download_monitor : NULL);
+	if (e) {
+		u32 rcount;
+		napi_reference_unref(env, napi_f->binding_ref, &rcount);
+		napi_delete_reference(env, napi_f->binding_ref);
+		napi_f->binding_ref = NULL;
+		napi_f->binding_stack = NULL;
+		gf_free(napi_dash);
+
+		napi_throw_error(env, gf_error_to_string(e), "Failed to bind dashin callbacks");
+		return NULL;
+	}
+	//tag dasher filter to run on main thread only
+	gf_filter_force_main_thread(napi_f->f, GF_TRUE);
+	return NULL;
+}
+
+void dashin_detach_binding(NAPI_Filter *napi_f)
+{
+	NAPI_Dash *napi_dash = (NAPI_Dash *) napi_f->binding_stack;
+	if (!napi_dash) return;
+	gf_free(napi_dash);
+}
+
+typedef struct _napi_fio
+{
+	//points to factory object (passed in FileIO constructor)
+	struct _napi_fio *factory;
+	GF_FileIO *gfio;
+	napi_ref ref;
+	u32 nb_refs;
+
+	//for root only
+	napi_env env;
+	GF_List *pending_urls;
+	//GF_List *gc_exclude;
+	u32 all_refs;
+	napi_ref root_ref;
+	napi_async_context async_ctx;
+	Bool direct_mem;
+} NAPI_FileIO;
+
+static u32 FIO_PROP_URL = 0;
+
+#define FILEIO\
+	NAPI_FileIO *napi_fio=NULL;\
+	bool _tag;\
+	NAPI_CALL( napi_check_object_type_tag(env, this_val, &fileio_tag, &_tag) );\
+	if (!_tag) {\
+		napi_throw_error(env, NULL, "Not a FileIO object");\
+		return NULL;\
+	}\
+	NAPI_CALL( napi_unwrap(env, this_val, (void**) &napi_fio) );\
+
+napi_value fio_getter(napi_env env, napi_callback_info info)
+{
+	void *magic;
+	napi_status status;
+	napi_value this_val, ret;
+	NAPI_CALL(napi_get_cb_info(env, info, NULL, NULL, &this_val, &magic) );
+	FILEIO
+
+	if (magic == &FIO_PROP_URL) {
+		NAPI_CALL( napi_create_string_utf8(env, gf_fileio_url(napi_fio->gfio), NAPI_AUTO_LENGTH, &ret) );
+		return ret;
+	}
+	return NULL;
+}
+
+static GF_Err gfio_seek(GF_FileIO *fileio, u64 offset, s32 whence)
+{
+	napi_status status;
+	s32 rval;
+	napi_value args[2], fact_obj, obj, fun_val, res;
+	NAPI_FileIO *napi_fio = gf_fileio_get_udta(fileio);
+	napi_env env = napi_fio->factory->env;
+
+	//get fun and target this
+	napi_get_reference_value(env, napi_fio->factory->root_ref, &fact_obj);
+	status = napi_get_named_property(env, fact_obj, "seek", &fun_val);
+	if (status!=napi_ok) {
+		return GF_NOT_SUPPORTED;
+	}
+	napi_get_reference_value(env, napi_fio->ref, &obj);
+
+	//create args
+	status = napi_create_int64(env, (s64) offset, &args[0]);
+	if (status != napi_ok) {
+		return -1;
+	}
+	status = napi_create_uint32(env, whence, &args[1]);
+	if (status != napi_ok) {
+		return -1;
+	}
+
+	//call
+	status = napi_make_callback(env, napi_fio->factory->async_ctx, obj, fun_val, 2, args, &res);
+	if (status!=napi_ok) {
+		return -1;
+	}
+	status = napi_get_value_int32(env, res, &rval);
+	if (status!=napi_ok) {
+		return -1;
+	}
+ return rval;
+}
+
+/*
+	ultimately we would like node to read/write directly to/from our buffer,
+	however this currently crashes node
+		https://github.com/nodejs/node/pull/33321#issuecomment-630905537
+
+	"If you use napi_create_external_buffer() a second time on the same pointer without waiting for the buffer created from the first time to be released, you’ll get a crash"
+
+	the same applies with napi_create_external_arraybuffer(), and we are usually called
+	with the same internal buffer pointer for read or write methods
+
+	until fixed, we create a different buffer and do a memcpy...
+*/
+
+static u32 gfio_read(GF_FileIO *fileio, u8 *buffer, u32 bytes)
+{
+	napi_status status;
+	u32 nb_bytes;
+	void *buf_data=NULL;
+
+	napi_value arg, ab, fact_obj, obj, fun_val, res;
+	NAPI_FileIO *napi_fio = gf_fileio_get_udta(fileio);
+	napi_env env = napi_fio->factory->env;
+
+	//get fun and target this
+	status = napi_get_reference_value(env, napi_fio->factory->root_ref, &fact_obj);
+	if (status!=napi_ok) return 0;
+	status = napi_get_named_property(env, fact_obj, "read", &fun_val);
+	if (status!=napi_ok) return 0;
+	status = napi_get_reference_value(env, napi_fio->ref, &obj);
+	if (status!=napi_ok) return 0;
+
+	//create arg
+#if NAPI_VERSION >= 7
+	if (napi_fio->factory->direct_mem)
+		status = napi_create_external_arraybuffer(env, buffer, bytes, NULL, NULL, &ab);
+	else
+#endif
+		status = napi_create_arraybuffer(env, bytes, &buf_data, &ab);
+
+	if (status==napi_ok)
+		status = napi_create_typedarray(env, napi_uint8_array, bytes, ab, 0, &arg);
+
+	//call
+	if (status==napi_ok)
+		status = napi_make_callback(env, napi_fio->factory->async_ctx, obj, fun_val, 1, &arg, &res);
+
+	if (status==napi_ok)
+		status = napi_get_value_uint32(env, res, &nb_bytes);
+
+	if ((status==napi_ok) && !napi_fio->factory->direct_mem && buf_data && nb_bytes)
+		memcpy(buffer, buf_data, nb_bytes);
+
+#if NAPI_VERSION >= 7
+	//detach array buffer
+	if (napi_fio->factory->direct_mem)
+		napi_detach_arraybuffer(env, ab);
+#endif
+
+	if (status!=napi_ok) return 0;
+ return nb_bytes;
+}
+
+static u32 gfio_write(GF_FileIO *fileio, u8 *buffer, u32 bytes)
+{
+	napi_status status;
+	u32 nb_bytes;
+
+	napi_value arg, ab, fact_obj, obj, fun_val, res;
+	NAPI_FileIO *napi_fio = gf_fileio_get_udta(fileio);
+	napi_env env = napi_fio->factory->env;
+
+	//get fun and target this
+	status = napi_get_reference_value(env, napi_fio->factory->root_ref, &fact_obj);
+	if (status!=napi_ok) return 0;
+	status = napi_get_named_property(env, fact_obj, "write", &fun_val);
+	if (status!=napi_ok) return 0;
+	status = napi_get_reference_value(env, napi_fio->ref, &obj);
+	if (status!=napi_ok) return 0;
+
+	//create arg
+#if NAPI_VERSION >= 7
+	if (napi_fio->factory->direct_mem) {
+		status = napi_create_external_arraybuffer(env, buffer, bytes, NULL, NULL, &ab);
+	} else
+#endif
+	{
+		void *buf_data=NULL;
+		status = napi_create_arraybuffer(env, bytes, &buf_data, &ab);
+		if (status == napi_ok) {
+			memcpy(buf_data, buffer, bytes);
+		}
+	}
+
+	if (status==napi_ok)
+		status = napi_create_typedarray(env, napi_uint8_array, bytes, ab, 0, &arg);
+
+	//call
+	if (status==napi_ok)
+		status = napi_make_callback(env, napi_fio->factory->async_ctx, obj, fun_val, 1, &arg, &res);
+
+	if (status==napi_ok)
+		status = napi_get_value_uint32(env, res, &nb_bytes);
+
+#if NAPI_VERSION >= 7
+	//detach arraybuffer
+	if (napi_fio->factory->direct_mem)
+		napi_detach_arraybuffer(env, ab);
+#endif
+
+	if (status!=napi_ok) return 0;
+
+ return nb_bytes;
+}
+
+static s64 gfio_tell(GF_FileIO *fileio)
+{
+	napi_status status;
+	s64 pos;
+	napi_value fact_obj, obj, fun_val, res;
+	NAPI_FileIO *napi_fio = gf_fileio_get_udta(fileio);
+	napi_env env = napi_fio->factory->env;
+
+	//get fun and target this
+	napi_get_reference_value(env, napi_fio->factory->root_ref, &fact_obj);
+	status = napi_get_named_property(env, fact_obj, "tell", &fun_val);
+	if (status!=napi_ok) {
+		return -1;
+	}
+	napi_get_reference_value(env, napi_fio->ref, &obj);
+
+	//call
+	status = napi_make_callback(env, napi_fio->factory->async_ctx, obj, fun_val, 0, NULL, &res);
+	if (status!=napi_ok) {
+		return -1;
+	}
+	status = napi_get_value_int64(env, res, &pos);
+	if (status!=napi_ok) {
+		return -1;
+	}
+ return pos;
+}
+
+static Bool gfio_eof(GF_FileIO *fileio)
+{
+	napi_status status;
+	bool is_eof;
+	napi_value fact_obj, obj, fun_val, res;
+	NAPI_FileIO *napi_fio = gf_fileio_get_udta(fileio);
+	napi_env env = napi_fio->factory->env;
+
+	//get fun and target this
+	napi_get_reference_value(env, napi_fio->factory->root_ref, &fact_obj);
+	status = napi_get_named_property(env, fact_obj, "eof", &fun_val);
+	if (status!=napi_ok) {
+		return GF_FALSE;
+	}
+	napi_get_reference_value(env, napi_fio->ref, &obj);
+
+	//call
+	status = napi_make_callback(env, napi_fio->factory->async_ctx, obj, fun_val, 0, NULL, &res);
+	if (status!=napi_ok) {
+		return GF_FALSE;
+	}
+	status = napi_get_value_bool(env, res, &is_eof);
+	if (status!=napi_ok) {
+		return -1;
+	}
+ return is_eof ? GF_TRUE : GF_FALSE;
+}
+
+static GF_FileIO *gfio_open(GF_FileIO *fileio_ref, const char *url, const char *mode, GF_Err *out_error)
+{
+	napi_status status;
+	char *fio_url = NULL;
+	Bool do_delete = GF_FALSE;
+	napi_value args[3], fact_obj, obj, fun_val, res;
+	NAPI_FileIO *napi_fio = gf_fileio_get_udta(fileio_ref);
+	napi_env env = napi_fio->factory->env;
+	NAPI_GPAC
+
+ *out_error = GF_OK;
+
+	//make sure we are called from main thread
+	if (gpac->main_thid != gf_th_id()) {
+		*out_error = GF_NOT_SUPPORTED;
+		return NULL;
+	}
+
+ if (!strcmp(mode, "url")) {
+ NAPI_FileIO *new_gfio;
+ char *path = gf_url_concatenate(gf_fileio_resource_url(fileio_ref), url);
+ GF_SAFEALLOC(new_gfio, NAPI_FileIO);
+ if (!new_gfio) {
+			*out_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
+		new_gfio->factory = napi_fio->factory;
+		new_gfio->gfio = gf_fileio_new(path, new_gfio, gfio_open, gfio_seek, gfio_read, gfio_write, gfio_tell, gfio_eof, NULL);
+		gf_free(path);
+
+		if (!new_gfio->gfio) {
+			gf_free(new_gfio);
+			*out_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
+		gf_fileio_tag_main_thread(new_gfio->gfio);
+		gf_list_add(napi_fio->factory->pending_urls, new_gfio);
+ //fio_ref.factory.gc_exclude.append(new_gfio)
+ napi_fio->factory->all_refs += 1;
+ return new_gfio->gfio;
+	}
+	if (!strcmp(mode, "ref")) {
+		napi_fio->nb_refs += 1;
+		napi_fio->factory->all_refs += 1;
+ return fileio_ref;
+	}
+
+	if (!strcmp(mode, "probe")) {
+		bool exists;
+		//get fun and target this
+		napi_get_reference_value(env, napi_fio->factory->root_ref, &fact_obj);
+		status = napi_get_named_property(env, fact_obj, "exists", &fun_val);
+		if (status!=napi_ok) return NULL;
+
+		//create arg
+		status = napi_create_string_utf8(env, url, NAPI_AUTO_LENGTH, &args[0]);
+		if (status!=napi_ok) return NULL;
+
+		//call
+		status = napi_make_callback(env, napi_fio->factory->async_ctx, fact_obj, fun_val, 1, &args[0], &res);
+		if (status!=napi_ok) return NULL;
+
+		status = napi_get_value_bool(env, res, &exists);
+		if (status!=napi_ok) return NULL;
+
+		if (!exists) *out_error = GF_URL_ERROR;
+		return NULL;
+	}
+
+	if (!strcmp(mode, "unref")) {
+		napi_fio->nb_refs -= 1;
+		napi_fio->factory->all_refs -= 1;
+		if (napi_fio->nb_refs) return fileio_ref;
+		do_delete = GF_TRUE;
+	}
+
+	if (!strcmp(mode, "close")) {
+		if (napi_fio->ref != NULL) {
+			//get fun and target this
+			napi_get_reference_value(env, napi_fio->factory->root_ref, &fact_obj);
+			status = napi_get_named_property(env, fact_obj, "close", &fun_val);
+			napi_get_reference_value(env, napi_fio->ref, &obj);
+			status = napi_make_callback(env, napi_fio->factory->async_ctx, obj, fun_val, 0, NULL, &res);
+ napi_fio->factory->all_refs -= 1;
+		}
+
+ if (napi_fio->nb_refs) return NULL;
+ do_delete = GF_TRUE;
+	}
+
+ if (do_delete) {
+		uint32_t res;
+		NAPI_FileIO *factory = napi_fio->factory;
+ //file no longer used, can now be garbage collected
+ //fio_ref.factory.gc_exclude.remove(fio_ref)
+
+ if (napi_fio->factory != napi_fio) {
+ gf_fileio_del(napi_fio->gfio);
+			napi_get_reference_value(env, napi_fio->ref, &obj);
+			napi_reference_unref(env, napi_fio->ref, &res);
+			napi_delete_reference(env, napi_fio->ref);
+			gf_free(napi_fio);
+		}
+
+		//final cleanup
+ if (!factory->all_refs && !gf_list_count(factory->pending_urls)) { // and not len(fio_ref.factory.gc_exclude):
+ gf_fileio_del(factory->gfio);
+			napi_get_reference_value(env, factory->ref, &obj);
+			napi_reference_unref(env, factory->ref, &res);
+			napi_delete_reference(env, factory->ref);
+
+			napi_get_reference_value(env, factory->root_ref, &obj);
+			napi_wrap(env, obj, NULL, NULL, NULL, NULL);
+			napi_reference_unref(env, factory->root_ref, &res);
+			napi_delete_reference(env, factory->root_ref);
+			gf_list_del(factory->pending_urls);
+			gf_free(factory);
+		}
+ return NULL;
+	}
+
+
+	//this is an open() call, check if associated object exists, if not so we can use this instance
+	NAPI_FileIO *fio = NULL;
+	if (napi_fio->ref == NULL) {
+		fio = napi_fio;
+		if (gf_list_find(napi_fio->factory->pending_urls, napi_fio)>=0) {
+			napi_fio->factory->all_refs -= 1;
+			gf_list_del_item(napi_fio->factory->pending_urls, napi_fio);
+		}
+	}
+
+	//check in pending urls
+ if (fio == NULL) {
+		u32 i, count = gf_list_count(napi_fio->factory->pending_urls);
+		for (i=0; i<count; i++) {
+			NAPI_FileIO *afio = gf_list_get(napi_fio->factory->pending_urls, i);
+ const char *a_url = gf_fileio_resource_url(afio->gfio);
+ if (!strcmp(a_url, url)) {
+ napi_fio->factory->all_refs -= 1;
+ gf_list_rem(napi_fio->factory->pending_urls, i);
+ fio = afio;
+ break;
+			}
+		}
+	}
+	//we need to create a new FileIO
+	Bool created = (fio==NULL) ? GF_TRUE : GF_FALSE;
+
+	//read url, translate
+	if (!strncmp(url, "gfio://", 7)) {
+		url = gf_fileio_translate_url(url);
+	}
+	//if we create a new FileIO, we need to resolve url, against parent URL
+	else if (created) {
+		fio_url = gf_url_concatenate(gf_fileio_resource_url(napi_fio->gfio), url);
+		url = fio_url;
+	}
+
+	//create new FileIO
+	if (fio==NULL) {
+ GF_SAFEALLOC(fio, NAPI_FileIO);
+ if (!fio) {
+			*out_error = GF_OUT_OF_MEM;
+			gf_free(fio_url);
+			return NULL;
+		}
+		fio->factory = napi_fio->factory;
+		fio->gfio = gf_fileio_new((char *) url, fio, gfio_open, gfio_seek, gfio_read, gfio_write, gfio_tell, gfio_eof, NULL);
+
+		if (!fio->gfio) {
+			gf_free(fio);
+			gf_free(fio_url);
+			*out_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
+		gf_fileio_tag_main_thread(fio->gfio);
+	}
+
+ //create object, direct copy of the object passed at construction
+	napi_create_object(env, &obj);
+	napi_create_reference(env, obj, 1, &fio->ref);
+
+
+	//get fun and target this
+	napi_get_reference_value(env, napi_fio->factory->root_ref, &fact_obj);
+	status = napi_get_named_property(env, fact_obj, "open", &fun_val);
+	if (status==napi_ok) {
+	//create arg
+	status = napi_create_string_utf8(env, url, NAPI_AUTO_LENGTH, &args[0]);
+	}
+
+	if (status==napi_ok) {
+	status = napi_create_string_utf8(env, mode, NAPI_AUTO_LENGTH, &args[1]);
+	}
+
+	args[2] = fact_obj;
+
+	//call
+	if (status==napi_ok) {
+	status = napi_make_callback(env, napi_fio->factory->async_ctx, obj, fun_val, 3, args, &res);
+	}
+
+	bool open_res = false;
+	if (status==napi_ok) {
+	status = napi_get_value_bool(env, res, &open_res);
+	}
+
+	if (fio_url) gf_free(fio_url);
+
+	if (open_res) {
+		//if not fio in fio.factory.gc_exclude:
+		// fio.factory.gc_exclude.append(fio)
+		fio->factory->all_refs += 1;
+		return fio->gfio;
+	}
+
+ //failure to open a new created object, remove FileIO and let the object be garbage collected
+ if (created) {
+		gf_fileio_del(fio->gfio);
+ fio->gfio = NULL;
+	}
+	*out_error = GF_URL_ERROR;
+	return NULL;
+}
+
+void del_fio(napi_env env, void* finalize_data, void* finalize_hint)
+{
+}
+
+napi_value new_fio(napi_env env, napi_callback_info info)
+{
+	napi_value fact_obj, fun_val;
+	NAPI_FileIO *napi_fio;
+	NARG_ARGS_THIS(3, 2);
+	NARG_STR(url, 0, NULL);
+	NARG_BOOL(direct_mem, 2, GF_TRUE);
+
+	NAPI_GPAC
+	gpac->is_init = GF_TRUE;
+
+#if NAPI_VERSION < 7
+	direct_mem = GF_FALSE;
+#endif
+
+	if (!url) {
+		napi_throw_error(env, NULL, "FileIO must be constructed with a non-null URL");
+		return NULL;
+	}
+	napi_valuetype rtype;
+	fact_obj = argv[1];
+	napi_typeof(env, fact_obj, &rtype);
+	if (rtype != napi_object) {
+		napi_throw_error(env, NULL, "factory is not an object");
+		return NULL;
+	}
+	status = napi_get_named_property(env, fact_obj, "open", &fun_val);
+	if (status != napi_ok) {
+		napi_throw_error(env, NULL, "factory has no open function");
+		return NULL;
+	}
+	status = napi_get_named_property(env, fact_obj, "close", &fun_val);
+	if (status != napi_ok) {
+		napi_throw_error(env, NULL, "factory has no close function");
+		return NULL;
+	}
+
+	GF_SAFEALLOC(napi_fio, NAPI_FileIO);
+	if (!napi_fio) {
+		napi_throw_error(env, NULL, "Failed to allocate FileIO");
+		return NULL;
+	}
+
+	napi_fio->gfio = gf_fileio_new(url, napi_fio, gfio_open, gfio_seek, gfio_read, gfio_write, gfio_tell, gfio_eof, NULL);
+	if (!napi_fio->gfio) {
+		gf_free(napi_fio);
+		napi_throw_error(env, NULL, "Failed to allocate FileIO");
+		return NULL;
+	}
+	gf_fileio_tag_main_thread(napi_fio->gfio);
+
+	napi_create_reference(env, fact_obj, 1, &napi_fio->root_ref);
+	napi_fio->env = env;
+	napi_fio->factory = napi_fio;
+	napi_fio->pending_urls = gf_list_new();
+	napi_fio->direct_mem = direct_mem;
+
+	napi_value async_name;
+	napi_create_string_utf8(env, "AsyncFileIO", NAPI_AUTO_LENGTH, &async_name);
+	napi_async_init(env, this_val, async_name, &napi_fio->async_ctx);
+
+
+	napi_property_descriptor fio_base_properties[] = {
+		{ "url", NULL, NULL, fio_getter, NULL, NULL, napi_enumerable, &FIO_PROP_URL},
+	};
+	NAPI_CALL( napi_define_properties(env, this_val, sizeof(fio_base_properties)/sizeof(napi_property_descriptor), fio_base_properties) );
+
+
+	NAPI_CALL( napi_wrap(env, this_val, napi_fio, del_fio, NULL, NULL) );
+	NAPI_CALL( napi_type_tag_object(env, this_val, &fileio_tag) );
+
+	return this_val;
+}
+
+
+napi_status init_fio_class(napi_env env, napi_value exports, GPAC_NAPI *inst)
+{
+	napi_status status;
+	napi_value cons;
+	status = napi_define_class(env, "FileIO", NAPI_AUTO_LENGTH , new_fio, NULL, 0, NULL, &cons);
+	if (status != napi_ok) return status;
+	return napi_set_named_property(env, exports, "FileIO", cons);
+}

gpac-2.0.0.tar.gz/share/nodejs/src/gpac_napi.h Added

@@ -0,0 +1,246 @@
+	/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2021-2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / NodeJS module
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terfsess of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _GPAC_NAPI_H
+#define _GPAC_NAPI_H
+
+#include <node_api.h>
+
+#include <gpac/tools.h>
+#include <gpac/filters.h>
+#include <gpac/version.h>
+
+
+#define NAPI_CALL(_a) \
+		status = _a ; \
+		if (status != napi_ok) { \
+			napi_throw_error(env, NULL, "NAPI call failed"); \
+			return NULL;\
+		}
+
+#define NARG_ARGS(_N, _MIN) \
+	napi_status status; \
+	size_t argc = _N;\
+	napi_value argv[_N];\
+	status = napi_get_cb_info(env, info, &argc, argv, NULL, NULL);\
+	if (status != napi_ok) {\
+		napi_throw_error(env, NULL, "Failed to parse arguments");\
+		return NULL;\
+	}\
+	if (argc+1<_MIN+1) {\
+		napi_throw_error(env, NULL, "Not enough arguments");\
+		return NULL;\
+	}\
+
+#define NARG_ARGS_THIS(_N, _MIN) \
+	napi_status status; \
+	napi_value this_val;\
+	size_t argc = _N;\
+	napi_value argv[_N];\
+	status = napi_get_cb_info(env, info, &argc, argv, &this_val, NULL);\
+	if (status != napi_ok) {\
+		napi_throw_error(env, NULL, "Failed to parse arguments");\
+		return NULL;\
+	}\
+	if (argc+1<_MIN+1) {\
+		napi_throw_error(env, NULL, "Not enough arguments");\
+		return NULL;\
+	}\
+
+#define NARG_ARGS_THIS_MAGIC(_N, _MIN) \
+	napi_status status; \
+	napi_value this_val;\
+	void *magic=NULL;\
+	size_t argc = _N;\
+	napi_value argv[_N];\
+	status = napi_get_cb_info(env, info, &argc, argv, &this_val, &magic);\
+	if ((status != napi_ok) || !magic) {\
+		napi_throw_error(env, NULL, "Failed to parse arguments");\
+		return NULL;\
+	}\
+	if (argc+1<_MIN+1) {\
+		napi_throw_error(env, NULL, "Not enough arguments");\
+		return NULL;\
+	}\
+	else if (argc>_N) {\
+		GF_LOG(GF_LOG_WARNING, GF_LOG_SCRIPT, ("[NodeJS] Too many arguments\n"));\
+	}\
+
+#define NARG_THIS\
+	napi_status status;\
+	napi_value this_val;\
+	NAPI_CALL(napi_get_cb_info(env, info, NULL, NULL, &this_val, NULL) );
+
+
+#define NARG_U32(_val, _argidx, def_val) \
+	u32 _val;\
+	if (_argidx<argc) { \
+		NAPI_CALL( napi_get_value_uint32(env, argv[_argidx], &_val) ); \
+	} else { \
+		_val = def_val; \
+	}
+
+#define NARG_U64(_val, _argidx, def_val) \
+	u64 _val;\
+	if (_argidx<argc) { \
+		NAPI_CALL( napi_get_value_int64(env, argv[_argidx], (s64*) &_val) ); \
+	} else { \
+		_val = def_val; \
+	}
+
+#define NARG_S32(_val, _argidx, def_val) \
+	s32 _val;\
+	if (_argidx<argc) { \
+		NAPI_CALL( napi_get_value_int32(env, argv[_argidx], &_val) ); \
+	} else { \
+		_val = def_val; \
+	}
+
+#define NARG_BOOL(_val, _argidx, def_val) \
+	Bool _val;\
+	if (_argidx<argc) { \
+		NAPI_CALL( napi_get_value_bool(env, argv[_argidx], (bool *) &_val) ); \
+	} else { \
+		_val = def_val; \
+	}
+
+#define NARG_DBL(_val, _argidx, def_val) \
+	Double _val;\
+	if (_argidx<argc) { \
+		NAPI_CALL( napi_get_value_double(env, argv[_argidx], &_val) ); \
+	} else { \
+		_val = def_val; \
+	}
+
+#define NARG_STR(_val, _argidx, _def_val) \
+	char *_val;\
+	if (_argidx<argc) { \
+		GPAC_NAPI *gpac; \
+		NAPI_CALL( napi_get_instance_data(env, (void **) &gpac) ); \
+		size_t s;\
+		napi_valuetype vtype;\
+		NAPI_CALL( napi_typeof(env, argv[_argidx], &vtype) );\
+ 		if (vtype == napi_null) {\
+			_val = NULL;\
+		} else {\
+			NAPI_CALL( napi_get_value_string_utf8(env, argv[_argidx], NULL, 0, &s) ); \
+			if (s+1 > gpac->str_buf_alloc) {\
+				gpac->str_buf = gf_realloc(gpac->str_buf, sizeof(char) * (s+1)); \
+				if (!gpac->str_buf) {\
+					napi_throw_error(env, NULL, "Out of memory");\
+					return NULL;\
+				}\
+				gpac->str_buf_alloc = s+1;\
+			}\
+			NAPI_CALL( napi_get_value_string_utf8(env, argv[_argidx], gpac->str_buf, gpac->str_buf_alloc, &s) ); \
+			gpac->str_buf[s]=0;\
+			_val = gpac->str_buf; \
+		}\
+	} else { \
+		_val = _def_val; \
+	}
+
+#define NARG_STR_ALLOC(_val, _argidx, _def_val) \
+	char *_val;\
+	if (_argidx<argc) { \
+		GPAC_NAPI *gpac; \
+		NAPI_CALL( napi_get_instance_data(env, (void **) &gpac) ); \
+		size_t s;\
+		napi_valuetype vtype;\
+		NAPI_CALL( napi_typeof(env, argv[_argidx], &vtype) );\
+ 		if (vtype == napi_null) {\
+			_val = NULL;\
+		} else {\
+			NAPI_CALL( napi_get_value_string_utf8(env, argv[_argidx], NULL, 0, &s) ); \
+			_val = gf_malloc(sizeof(char) + (s+1)); \
+			if (!_val) {\
+				napi_throw_error(env, NULL, "Out of memory");\
+				return NULL;\
+			}\
+			status = napi_get_value_string_utf8(env, argv[_argidx], _val, s+1, &s); \
+			_val[s]=0;\
+		}\
+	} else { \
+		_val = _def_val ? gf_strdup(_def_val) : NULL; \
+	}
+
+#define GET_PROP_FIELD_S32(_name, _class, _target) \
+		status = napi_has_named_property(env, prop, _name, (bool *) &has_p); \
+		if (has_p) status = napi_get_named_property(env, prop, _name, &v); \
+		if (status==napi_ok) { \
+			status = napi_get_value_int32(env, v, &_target); \
+			if (status) return status;\
+		} else { \
+			napi_throw_error(env, NULL, _class" missing "_name" property"); \
+			return status; \
+		}
+
+#define GET_PROP_FIELD_U32(_name, _class, _target) \
+		status = napi_has_named_property(env, prop, _name, (bool *) &has_p); \
+		if (has_p) status = napi_get_named_property(env, prop, _name, &v); \
+		if (status==napi_ok) { \
+			status = napi_get_value_uint32(env, v, &_target); \
+			if (status) return status;\
+		} else { \
+			napi_throw_error(env, NULL, _class" missing "_name" property"); \
+			return status; \
+		}
+
+#define GET_PROP_FIELD_S64(_name, _class, _target) \
+		status = napi_has_named_property(env, prop, _name, (bool *) &has_p); \
+		if (has_p) status = napi_get_named_property(env, prop, _name, &v); \
+		if (status==napi_ok) { \
+			status = napi_get_value_int64(env, v, &_target); \
+			if (status) return status;\
+		} else { \
+			napi_throw_error(env, NULL, _class" missing "_name" property"); \
+			return status; \
+		}
+
+#define GET_PROP_FIELD_U64(_name, _class, _target) \
+		status = napi_has_named_property(env, prop, _name, (bool *) &has_p); \
+		if (has_p) status = napi_get_named_property(env, prop, _name, &v); \
+		if (status==napi_ok) { \
+			status = napi_get_value_int64(env, v, (s64 *) &_target); \
+			if (status) return status;\
+		} else { \
+			napi_throw_error(env, NULL, _class" missing "_name" property"); \
+			return status; \
+		}
+
+#define GET_PROP_FIELD_FLT(_name, _class, _target) \
+		status = napi_has_named_property(env, prop, _name, (bool *) &has_p); \
+		if (has_p) status = napi_get_named_property(env, prop, _name, &v); \
+		if (status==napi_ok) { \
+			Double n;\
+			status = napi_get_value_double(env, v, &n); \
+			if (status) return status;\
+			_target = FLT2FIX(n);\
+		} else { \
+			napi_throw_error(env, NULL, _class" missing "_name" property"); \
+			return status; \
+		}
+
+#endif //_GPAC_NAPI_H

gpac-2.0.0.tar.gz/share/nodejs/test Added

gpac-2.0.0.tar.gz/share/nodejs/test/gpac.js Added

@@ -0,0 +1,602 @@
+const gpac = require('..');
+const filesys = require('fs');
+
+
+//run in blocking mode
+const RUN_SYNC=0;
+//run in step mode but blocking node eventloop
+const RUN_STEP=1;
+//run in step mode and not blocking node eventloop
+const RUN_PROMISE=2;
+
+//test simple session, no custom filters
+const TEST_SIMPLE=0;
+//test sink
+const TEST_SINK=1;
+//test forward
+const TEST_FORWARD=2;
+
+let run_mode=RUN_SYNC;
+let test_task=false;
+let run_task_dur=0;
+let test_type=TEST_SIMPLE;
+let FILTERS=[];
+let SINKS=[];
+let SRCS=[];
+let memtrack=0;
+let is_verbose=false;
+let start_time=0;
+let custom_dash=false;
+
+let fileio_sources=false;
+let fileio_sinks=false;
+
+const PCKFWD_REF=0;
+const PCKFWD_ALLOC=1;
+const PCKFWD_SHARED=2;
+const PCKFWD_CLONE=3;
+const PCKFWD_COPY=4;
+const PCKFWD_FWD=5;
+const PCKFWD_ALL=6;
+
+
+let pck_fwd_mode=PCKFWD_FWD;
+
+print_usage = () => {
+	console.log("node gpac.js [options]");
+	console.log();
+	console.log("This scripts tests usage of GPAC NodeJS bindings.\n\nPossible options are:");
+	console.log("-run=MODE: runs in given MODE:");
+	console.log("\tsync (default): blocking filter session, Node EventLoop blocked");
+	console.log("\tstep: non-blocking filter session, Node EventLoop blocked");
+	console.log("\tasync: non-blocking filter session as promise, Node EventLoop active");
+	console.log("-cust=MODE: custom JS filter test mode:");
+	console.log("\tsimple (default): runs source(s), sink(s) and filters");
+	console.log("\tsink: runs source(s) into custom JS filter sink");
+	console.log("\tfwd: runs source(s) into custom JS filter forwarding to sink(s) (-dst=) or to filter(s) (-f=)");
+	console.log("-fwd=MODE: packet forward mode for forward test mode:");
+	console.log("\tfwd (default): uses packet forwarding");
+	console.log("\tref: uses packet reference");
+	console.log("\talloc: copies data");
+	console.log("\tshared: use shared JS data and JS destruction callbacks");
+	console.log("\tclone: uses packet cloning");
+	console.log("\tcopy: uses packet copy");
+	console.log("\tall: cycles through all above modes");
+
+	console.log("-src=URL: adds a source URL. Can be set multiple times for multiple sources");
+	console.log("-dst=URL: adds a destination URL. Can be set multiple times for multiple sinks");
+	console.log("-f=FILTER: adds a filter (e.g. 'avgen'). Can be set multiple times for filters, cf `gpac -h doc` for link options");
+	console.log("-mt: enables GPAC memory tracking");
+	console.log("-p=PROF: sets profile to PROF");
+	console.log("-ib: enables FileIO wrapper for source(s)");
+	console.log("-ob: enables FileIO wrapper for sink(s)");
+	console.log("-task=N: runs user test task every second for N seconds (0 means until end)");
+	console.log("-play=N: overrides PLAY event in forward mode to the given start time in seconds");
+	console.log("-cdash: test custom DASH algo");
+	console.log("-v: enables info dump, property dump for PIDs and packets");
+	console.log("-h: prints help");
+	console.log();
+	console.log("Other options will be passed to GPAC");
+	console.log();
+	console.log("Examples");
+	console.log("- Play MyURL to aout and vout:\nnode gpac.js -src=MyURL -f=aout -f=vout\n");
+	console.log("- Remux MyURL to DASH and HLS (assumes directory dash exists):\nnode gpac.js -src=MyURL -dst=dash/live.mpd:dual\n");
+	console.log("- Run avgen to aout and vout:\nnode gpac.js -f=avgen -f=aout -f=vout\n");
+	console.log("- Play MyURL into custom node filter then to aout and vout:\nnode gpac.js -cust=fwd -src=MyURL -f=aout -f=vout\n");
+	console.log("- Play MyURL into custom node filter, get input file from NodeJS, keep node eventloop active and use 2 extra threads:\nnode gpac.js -run=async -threads=2 -cust=fwd -ib -src=MyURL -f=aout -f=vout\n");
+	console.log();
+	console.log('GPAC NodeJS version ' + gpac.version + ' libgpac ' + gpac.abi_major + ':' + gpac.abi_minor + '.' + gpac.abi_micro);
+	console.log('' + gpac.copyright_cite);
+	process.exit(0);
+}
+bad_param = (v) => {
+	console.log(v);
+	process.exit(1);
+};
+
+let other_args=['nodegpac'];
+
+if (is_verbose)
+	console.log('GPAC NodeJS version ' + gpac.version + ' libgpac ' + gpac.abi_major + ':' + gpac.abi_minor + '.' + gpac.abi_micro);
+
+let fio_factory = {
+	open: function(url, mode) {
+
+		this.file = null;
+		this.size = 0;
+		this.position = 0;
+		this.read_mode = false;
+		this.is_eof = false;
+		this.url = url;
+		mode = mode.replace('b', '');
+		mode = mode.replace('t', '');
+
+		try {
+			this.file = filesys.openSync(url, mode);
+		} catch (e) {
+			console.log('Fail to open ' + url + ' in mode ' + mode + ': ' + e);
+			return false;
+		}
+		if (mode.indexOf('w')<0) {
+			let stats = filesys.fstatSync(this.file);
+			this.size = stats.size;
+			if (mode.indexOf('a+')>=0) {
+				this.position = this.size;
+			}
+			this.read_mode = true;
+		}
+		return true;
+	},
+	close: function() {
+		filesys.closeSync(this.file);
+		this.file = null;
+	},
+	read: function(buf) {
+		let nb_bytes = 0;
+		try {
+			nb_bytes = filesys.readSync(this.file, buf, 0, buf.length, this.position);
+		} catch (e) {
+			console.log('read error: ' + e);
+			return 0;
+		}
+		if (!nb_bytes) this.is_eof = true;
+		this.position += nb_bytes;
+		return nb_bytes;
+	},
+	write: function(buf) {
+		let nb_bytes = filesys.writeSync(this.file, buf, 0, buf.length, this.position);
+		if (this.position == this.size) {
+			this.size += nb_bytes;
+		}
+		this.position += nb_bytes;
+		return nb_bytes;
+	},
+	seek: function(pos, whence) {
+		this.is_eof = false;
+		if (pos<0) return -1;
+		//seek set
+		if (whence==0) {
+			this.position = pos;
+		}
+		//seek cur
+		else if (whence==1) {
+			this.position += pos;
+		}
+		//seek end
+		else if (whence==2) {
+			if (this.size < pos) return -1;
+			this.position = this.size - pos;
+		} else {
+			return -1;
+		}
+		return 0;
+	},
+	tell: function() {
+		return this.position;
+	},
+	eof: function() {
+		return this.is_eof;
+	},
+	exists: function(url) {
+		try {
+			filesys.accessSync(url);
+		} catch (err) {
+			return false;
+		}
+		return true;
+	}
+};
+
+
+function push_source(url)
+{
+	if (fileio_sources) {
+		let fio = new gpac.FileIO(url, fio_factory);
+		url = fio.url;
+	}
+	SRCS.push(url);
+}
+
+function push_sink(url)
+{
+	if (fileio_sinks) {
+		let fio = new gpac.FileIO(url, fio_factory);
+		url = fio.url;
+	}
+	SINKS.push(url);
+}
+
+//first pass, init libgpac mem track and profile if set
+//this must be done before any new constructor (FileIO, FilterSession) otherwise it is ignored
+let profile=null;
+let args = process.argv.splice(1);
+args.forEach( val => {
+	if (val=='-h') print_usage();
+	else if (val == '-mt') memtrack = gpac.GF_MemTrackerSimple;
+	else if (val.startsWith('-p=')) {
+		profile = val.substring(3);
+	}
+});
+
+if (memtrack || profile)
+	gpac.init(memtrack, profile);
+
+//second pass, parse all other args
+args.forEach( val => {
+	if (val=='-h') { }
+	else if (val=='-mt') { }
+	else if (val.startsWith('-p=')) { }
+
+	else if (val=='-run=sync') run_mode=RUN_SYNC;
+	else if (val=='-run=step') run_mode=RUN_STEP;
+	else if (val=='-run=async') run_mode=RUN_PROMISE;
+	else if (val.startsWith('-run=')) { bad_param("Unknown run mode "+val); }
+
+	else if (val=='-cust=simple') test_type=TEST_SIMPLE;
+	else if (val=='-cust=sink') test_type=TEST_SINK;
+	else if (val=='-cust=fwd') test_type=TEST_FORWARD;
+	else if (val.startsWith('-cust=')) { bad_param("Unknown custom test mode "+val); }
+
+	else if (val=='-fwd=fwd') pck_fwd_mode=PCKFWD_FWD;
+	else if (val=='-fwd=ref') pck_fwd_mode=PCKFWD_REF;
+	else if (val=='-fwd=alloc') pck_fwd_mode=PCKFWD_ALLOC;
+	else if (val=='-fwd=shared') pck_fwd_mode=PCKFWD_SHARED;
+	else if (val=='-fwd=copy') pck_fwd_mode=PCKFWD_COPY;
+	else if (val=='-fwd=clone') pck_fwd_mode=PCKFWD_CLONE;
+	else if (val=='-fwd=all') pck_fwd_mode=PCKFWD_ALL;
+	else if (val.startsWith('-fwd=')) { bad_param("Unknown packet forward mode "+val); }
+
+	else if (val=='-task') { test_task = true; run_task_dur = -1; }
+	else if (val.startsWith('-task=')) {
+		run_task_dur = parseInt(val.substring(6));
+		if (run_task_dur == 0) run_task_dur = -1;
+		test_task = true;
+	}
+	else if (val.startsWith('-src=')) { push_source( val.substring(5) ); }
+	else if (val.startsWith('-dst=')) { push_sink( val.substring(5) ); }
+	else if (val.startsWith('-f=')) { FILTERS.push( val.substring(3) ); }
+	else if (val == '-v') is_verbose = true;
+	else if (val.startsWith('-play=')) {
+		start_time = parseFloat(val.substring(6));
+	}
+	else if (val == '-ib') fileio_sources = true;
+	else if (val == '-ob') fileio_sinks = true;
+	else if (val == '-cdash') custom_dash = true;
+
+	else if (val.startsWith('-')) {
+		other_args.push(val);
+	}
+});
+
+if (other_args.length > 1)
+	gpac.set_args(other_args);
+
+if (!SRCS.length && !SINKS.length && !FILTERS.length) {
+	console.log("No source, destination or filter specified, check usage (-h)");
+	process.exit(1);
+}
+
+let dash_algo = null;
+if (custom_dash) {
+	dash_algo = {
+		on_period_reset: function(type) {
+			console.log('period reset type ' + type);
+		},
+		on_new_group: function(group) {
+			console.log('Got new group ' + JSON.stringify(group) );
+		},
+		on_rate_adaptation: function(group, base_group, force_lower_complexity, stats) {
+			console.log('Rate adaptation on group ' + group.idx + ' - stats ' + JSON.stringify(stats) );
+			return 0;
+		},
+		on_download_monitor: function(group, stats) {
+			console.log('Download monitor on group ' + group.idx + ' - stats ' + JSON.stringify(stats) );
+			return -1;
+		}
+	};
+}
+
+
+gpac.set_rmt_fun( (msg) => {
+	console.log('RMT got message ' + msg);
+	gpac.rmt_send('ACK for ' + msg);
+}); 
+
+let fs;
+if (run_mode==RUN_SYNC) {
+	fs = new gpac.FilterSession();
+} else {
+	fs = new gpac.FilterSession(gpac.GF_FS_FLAG_NON_BLOCKING);
+}
+
+fs.on_filter_new = function(f)
+{
+	if (is_verbose) 
+		console.log('New filter created: ' + f.name);
+	if (dash_algo && (f.name=="dashin")) {
+		try {
+			f.bind(dash_algo);
+		} catch (e) {
+			console.log('Failed to bind dash algo: ' + e);
+		}
+	}
+}
+fs.on_filter_del = function(f) {
+	if (is_verbose) 
+		console.log('Filter deleted: ' + f.name);
+}
+
+
+if (is_verbose) {
+	console.log('Error code GF_URL_ERROR means ' + gpac.e2s(gpac.GF_URL_ERROR) );
+	console.log('Supported mime video/mp4: ' + fs.is_supported_mime('video/mp4') );
+	if (SRCS.length)
+		console.log('Supported file ' + SRCS[0] + ': ' + fs.is_supported_source(SRCS[0]) );
+}
+
+
+if (test_task) {
+	t = {};
+	t.nb_tasks = 0;
+	t.execute = function() {
+		if (fs.last_task) {
+			return false;
+		}
+		this.nb_tasks++;
+		if (run_task_dur > 0) {
+			run_task_dur -= 1;
+			if (run_task_dur <= 0) {
+				console.log('Last task run #' + this.nb_tasks);
+				return false;
+			}
+		}
+		console.log('Task run #' + this.nb_tasks);
+		return 1000;
+	}
+	fs.post_task(t);
+}
+
+fs.on_event = function(evt)
+{
+	//console.log('FS event ' + JSON.stringify(evt) );
+	if (evt.ui_type == gpac.GF_EVENT_QUIT) {
+		fs.abort(gpac.GF_FS_FLUSH_NONE);
+		return true;
+	}
+	return false;
+}
+
+//load sources
+SRCS.forEach( src => {
+	console.log('Loading source URL ' + src);
+	src_f = fs.load_src(src);
+});
+
+const dump_prop = (type, val, ptype) => {
+	if (ptype==gpac.GF_PROP_DATA)
+		console.log('\t' + type + ': raw data');
+	else if (typeof val == 'object')
+		console.log('\t' + type + ': ' + JSON.stringify(val) );
+	else
+		console.log('\t' + type + ': ' + val + ' (' + (typeof val) + ')');
+}
+
+//load custom filter
+let cust = null;
+if (test_type != TEST_SIMPLE) {
+	cust = fs.new_filter("NodeJS_Test");
+	//we accept any number of input pids
+	cust.set_max_pids(-1);
+	cust.pids = [];
+
+	if (test_type == TEST_FORWARD) {
+		cust.push_cap('StreamType', 'Visual', gpac.GF_CAPS_INPUT_OUTPUT);
+		cust.push_cap('StreamType', 'Audio', gpac.GF_CAPS_INPUT_OUTPUT);
+	} else {
+		cust.push_cap('StreamType', 'Visual', gpac.GF_CAPS_INPUT);
+		cust.push_cap('StreamType', 'Audio', gpac.GF_CAPS_INPUT);
+	}
+
+	cust.configure_pid = function(pid, is_remove)
+	{
+		if (this.pids.indexOf(pid) < 0) {
+			this.pids.push(pid);
+			pid.nb_pck = 0;
+
+			if (test_type == TEST_SINK) {
+				let evt = new gpac.FilterEvent(gpac.GF_FEVT_PLAY);
+				pid.send_event(evt);
+				if (is_verbose) {
+					console.log('Input PID Props: ');
+					pid.enum_props( dump_prop );
+				}
+				pid.opid = null;
+			}
+
+			else {
+				//create output pid
+				pid.opid = this.new_pid();
+				pid.opid.copy_props(pid);
+				if (is_verbose) {
+					console.log('Output PID props: ');
+					pid.opid.enum_props( dump_prop );
+				}
+			}
+		} else if (is_remove) {
+			console.log('PID remove !');
+		} else {
+			console.log('PID reconfigure !');
+			pid.opid.copy_props(pid);
+		}
+		return gpac.GF_OK;
+	}
+	cust.pck_clone_cache = null;
+	if (pck_fwd_mode==PCKFWD_ALL) {
+		cust.fwd_mode = 0;
+		cust.fwd_loop = true;
+	} else {
+		cust.fwd_mode = pck_fwd_mode;
+		cust.fwd_loop = false;
+	}
+
+	cust.process = function() {
+		let nb_eos=0;
+
+		this.pids.forEach(pid =>{
+			if (pid.eos) {
+				nb_eos++;
+				if (pid.opid) pid.opid.eos = true;
+				return;
+			}
+			//begin of packet fetch loop
+			while (1) {
+
+			let pck = pid.get_packet();
+			if (!pck) return;
+
+			if (is_verbose) {
+				console.log('PCK props: ' + JSON.stringify(pck) );
+				pck.enum_props( dump_prop );
+			}
+			pid.nb_pck ++;
+			if (test_type == TEST_SINK) {
+				pid.drop_packet();
+				continue;
+			}
+			//send by reference
+			if (this.fwd_mode==PCKFWD_REF) {
+				let dst = pid.opid.new_pck_ref(pck);
+				dst.copy_props(pck);
+				dst.send();
+			}
+			//full copy mode
+			else if (this.fwd_mode==PCKFWD_ALLOC) {
+				let dst = pid.opid.new_pck(pck.size);
+				dst.copy_props(pck);
+				new Uint8Array(dst.data).set(new Uint8Array(pck.data));
+				dst.send();
+			}
+			//keep ref to packet and send new packet using shared data
+			else if (this.fwd_mode==PCKFWD_SHARED) {
+				/*
+					Ultimately we would like to test ab = pck.data + pck.ref() and pck.unref() in destructor
+					however this crashes node:
+						https://github.com/node-ffi-napi/ref-napi/issues/54
+				*/
+				let ab = new ArrayBuffer(pck.size);
+				new Uint8Array(ab).set(new Uint8Array(pck.data));
+				//keep ref
+				pck.ref();
+				let dst = pid.opid.new_pck_shared(ab, () => { pck.unref();});
+				dst.copy_props(pck);
+				dst.send();
+			}
+			//pck_clone
+			else if (this.fwd_mode==PCKFWD_CLONE) {
+				let dst = pid.opid.new_pck_clone(pck);
+				dst.send();
+			}
+			//pck_copy
+			else if (this.fwd_mode==PCKFWD_COPY) {
+				let dst = pid.opid.new_pck_copy(pck);
+				dst.send();
+			} else {
+				pid.opid.forward(pck);
+			}
+			if (this.fwd_loop) {
+				this.fwd_mode++;
+				if (this.fwd_mode==6) this.fwd_mode=0;
+			}
+			pid.drop_packet();
+			} //end of packet fetch loop
+		});
+
+		if (nb_eos == this.pids.length)
+			return gpac.GF_EOS;
+
+		return gpac.GF_OK;
+	}
+	cust.process_event = function(evt)
+	{
+		//shortcut play event, canceling it and sending a play event with a different start
+		if ((evt.type==gpac.GF_FEVT_PLAY) && start_time) {
+			let anevt = new gpac.FilterEvent(gpac.GF_FEVT_PLAY);
+			anevt.start_range = start_time;
+			this.pids.forEach(pid => pid.send_event(anevt));
+			return true;
+		}
+		return false;
+	}
+}
+
+//load sinks
+if (test_type != TEST_SINK) {
+	SINKS.forEach( sink => {
+		console.log('Loading dest ' + sink);
+		let sink_f = fs.load_dst(sink);
+		//set sink source to be our custom filter
+		if (cust && !FILTERS.length)
+			sink_f.set_source(cust);
+	});
+}
+
+//load filters
+FILTERS.forEach( fname => {
+	console.log('Loading filter ' + fname);
+	let f = fs.load(fname);
+
+	if (test_type != TEST_SINK) {
+		//set source to be our custom filter
+		if (cust && !SINKS.length)
+			f.set_source(cust);
+	}
+});
+
+//print custom filter connections
+if (cust && is_verbose) {
+	console.log('CustomFilter connections ');
+	cust.print_connections();
+}
+
+console.log('');
+
+const session_done = () => {
+	console.log('Session done running, graph: ');
+	fs.print_graph();
+};
+
+//runin sync mode
+if (run_mode==RUN_SYNC) {
+	console.log('Running in blocking mode');
+	fs.run();
+	session_done();
+	return;
+}
+
+//runin step mode
+if (run_mode==RUN_STEP) {
+	console.log('Running in non-blocking mode');
+	while (true) {
+		fs.run();
+		if (fs.last_task) break;
+	}
+	session_done();
+	return;
+}
+
+//Run session step as Promise
+const FilterSessionPromise = (fs_run_task) => {
+ var fsrun_promise = () => {
+ return (fs.last_task==false) ? fs_run_task().then(fsrun_promise) : Promise.resolve();
+ }
+ return fsrun_promise();
+};
+
+const run_task = () => {
+	return new Promise((resolve, reject) => {
+	 resolve( fs.run() );
+	});
+}
+FilterSessionPromise(run_task).then( ).finally( session_done );
+
+console.log('Entering NodeJS EventLoop');

gpac-2.0.0.tar.gz/share/python Added

gpac-2.0.0.tar.gz/share/python/libgpac.py Added

@@ -0,0 +1,4500 @@
+#
+# GPAC - Multimedia Framework C SDK
+#
+# Authors: Jean Le Feuvre
+# Copyright (c) Telecom Paris 2020-2022
+# All rights reserved
+#
+# Python ctypes bindings for GPAC (core initialization and filters API only)
+#
+# GPAC is free software; you can redistribute it and/or modify
+# it under the terfsess of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GPAC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; see the file COPYING. If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+
+## 
+# \defgroup pyapi_grp Python APIs
+# \brief Python API for libgpac.
+#
+# # Foreword
+# This module provides [ctypes](https://docs.python.org/3/library/ctypes.html) bindings for libgpac. These bindings currently allow:
+# - initializing libgpac, setting global arguments for the library
+# - creation, running and destruction of a filter session in blocking mode or non-blocking mode
+# - inspection of filters in a session
+# - user tasks scheduling
+# - Creation of custom filters in Python
+#
+# \note This is an initial work and more bindings might be needed, feel free to contribute/PR on https://github.com/gpac/gpac
+#
+# # Error handling
+#
+# Errors are handled through raising exceptions, except callback methods wich must return a \ref GF_Err value. 
+# # Properties handling
+#
+# Properties types are automatically converted to and from string. If the property name is not a built-in property type, the property is assumed to be a user-defined property. 
+# For example, when querying or setting a stream type property, use the property name `StreamType`.
+# See [`gpac -h props`](https://github.com/gpac/gpac/wiki/filters_properties) for the complete list of built-in property names.
+#
+# Properties values are automatically converted to or from python types whenever possible. Types with no python equivalent (vectors, fractions) are defined as classes in python.
+# For example:
+# - when setting a UIntList property, pass a python list of ints 
+# - when reading a UIntList property, a python list of ints will be returned 
+# - when setting a PropVec2i property, pass a PropVec2i object 
+# - when setting a PropVec2iList property, pass a python list of PropVec2i 
+#
+# 4CCs are handled as strings in python, and list of 4CCs are handled as list of strings
+#
+# The following builtin property types are always handled as strings in Python instead of int in libgpac :
+# - StreamType: string containing the streamtype name
+# - CodecID: string containing the codec name
+# - Enumeration properties (PixelFormat, AudioFormat, ...): string containing the corresponding name
+#
+# # Basic setup
+#
+# You can initialize libgpac before any other calls to set memory tracker or profile. When importing the module, libgpac is by default initialized with no memory tracking and using the default profile.
+# You currently must uninintialize it after everything gpac-related is done.
+# You also must destroy explicitly the filter session, as otherwise the garbage collection on the filter session object could happen after libgpac shutdown and will likely crash
+#
+# \code
+# import libgpac as gpac
+# gpac.init()
+# #create a session in blocking mode
+# fs = gpac.FilterSession()
+# #setup all your filters
+# ...
+# #run the session
+# fs.run()
+# fs.delete()
+# gpac.close()
+# \endcode
+#
+# You can specify global options of libgpac and filters (e.g. --opt) by assigning arguments to libgpac:
+# \code
+# #set global arguments, here inherited from command line
+# gpac.set_args(sys.argv)
+# \endcode
+#
+# You can also specify the log levels you want
+# \code
+# gpac.set_logs("all@info")
+# \endcode
+# # Session using built-in filters
+#
+# Filters are loaded as usual in gpac as a string description
+# \code
+# src = fs.load_src("$URL:opt:opt2=val")
+# dst = fs.load_dst("$URL2:opt3:opt4=val")
+# f = fs.load("filtername:optX")
+# \endcode
+#
+# By default the filter session will run with implicit linking.
+#
+# It is possible to assign sources of a filter (much like the `@` command in `gpac`):
+# \code
+# dst.set_source(f)
+# \endcode
+#
+#
+# # Posting user tasks
+# 
+# You can post tasks to the session scheduler to get called back (useful when running the session in blocking mode)
+# Tasks must derive FilterTask class and implement their own `execute` method
+# \code
+# class MyTask(FilterTask): 
+# def exectute(self):
+# do_something()
+# #last scheduled task (session is over), abort
+# if self.session.last_task:
+# return -1 
+# //keep task active, reschedule in 500 ms 
+# return 500 
+#
+# task = MyTask('CustomTask')
+# fs.post_task(task)
+# \endcode
+#
+# # Creating custom filters
+#
+# A custom filter allows your application to interact closely with the media pipeline, but cannot be used in graph resolution.
+# Custom filters can be sources, sinks, or intermediate filters. The following limitations however exist:
+#- custom filters will not be cloned
+#- custom filters cannot be used as sources of filters loading a source filter graph dynamically, such as the dashin filter.
+#- custom filters cannot be used as destination of filters loading a destination filter graph dynamically, such as the dasher filters.
+#
+# A custom filter must implement the \ref FilterCustom class, and optionally provide the following methods
+# - configure_pid: callback for PID configuration, mandatory if your filter is not a source
+# - process: callback for processing
+# - process_event: callback for processing and event
+# - probe_data: callback for probing a data format
+# - reconfigure_output: callback for output reconfiguration (PID capability negociation)
+#
+# A custom filter must also declare its capabilities, input and output, using push_cap method 
+# \code
+# class MyFilter(FilterTask): 
+# def __init__(self, session):
+# # !! call constructor of parent class first !!
+# gpac.FilterCustom.__init__(self, session, "PYnspect")
+# #indicate what we accept and produce - this can be done either in the constructor or after, but before calling \ref run or \ref run_step 
+# #here we indicate we accept anything of type visual, and produce anything of type visual
+# self.push_cap("StreamType", "Visual", gpac.GF_CAPS_INPUT_OUTPUT)
+#
+# #we accept input pids, we must configure them
+# #def configure_pid(self, pid, is_remove):
+# #do something, return value is a GF_Err value
+# #pid being removed
+# if is_remove:
+# #pid being reconfigured
+# elif pid in self.ipids:
+# #pid first connection
+# else:
+#
+# #process
+# #def process(self):
+# #do something, return value is a GF_Err value
+#
+# #process_event takes a \ref FilterEvent parameter
+# #def process_event(self, evt):
+# #do something, return value is True (cancelled) or False
+#
+# #probe_data takes a NumPy array if numpy is available (and _size can be ignored) or a POINTER(c_ubyte) otherwise
+# #def probe_data(self, data, _size):
+# #do something, return value is mime type or None
+#
+# #probe_data takes the target output pid as parameter
+# #def reconfigure_output(self, opid):
+# #do something, return value is a GF_Err value
+#
+# \endcode
+#
+# \note
+# The \ref FilterCustom object has a list of input and output PIDs created. Before a callback to configure_pid, the input PID is not registered to the list 
+# of input PIDs if this is the first time the PID is configured.
+#
+# \code
+# src = fs.load_src("$URL:opt:opt2=val")
+# dst = fs.load_dst("$URL2:opt3:opt4=val")
+# #load a custom filter
+# my_filter = MyFilter(fs)
+# #make sure dst only consumes from our custom filter
+# dst.set_source(f)
+# \endcode
+# @{
+#
+
+
+## 
+# \defgroup pycore_grp libgpac core tools
+# \ingroup pyapi_grp Python APIs
+# \brief Core tools for libgpac.
+#
+# @{
+
+
+from ctypes import *
+from ctypes.util import find_library
+import datetime
+import types
+import os
+import copy
+
+## set to True if numpy was successfully loaded
+##\hideinitializer
+numpy_support=True
+
+try:
+ import numpy as np
+except ImportError:
+ numpy_support = False
+ print("\nWARNING! numpy not present, packet data type is ctypes POINTER(c_ubyte)\n")
+
+##ctypes instance of libgpac
+##\hideinitializer
+_libgpac=None
+
+## \cond private
+#load libgpac
+try:
+ dll_path = find_library("libgpac.dll")
+ if not dll_path:
+ raise OSError("No libgpac.dll")
+
+ _libgpac = cdll.LoadLibrary(os.path.abspath(dll_path))
+except OSError:
+ try:
+ _libgpac = cdll.LoadLibrary("libgpac.so")
+ except OSError:
+ try:
+ _libgpac = cdll.LoadLibrary("libgpac.dylib")
+ except OSError:
+ print('Failed to locate libgpac (.so/.dll/.dylib) - make sure it is in your system path')
+ os._exit(1)
+
+#change this to reflect API we encapsulate. An incomatibility in either of these will throw a warning
+GF_ABI_MAJOR=11
+GF_ABI_MINOR=0
+
+gpac_abi_major=_libgpac.gf_gpac_abi_major()
+gpac_abi_minor=_libgpac.gf_gpac_abi_minor()
+
+## \endcond private
+
+## Set to true if mismatch was detected between the ABI version the Python wrapper was designed and the libgpac shared library ABI version
+# A warning is thrown if mismatched, but it is left up to the pythin script to decide whether it still wants to use libgpac wrapper
+_libgpac_abi_mismatch=False
+
+## \cond private
+if (gpac_abi_major != GF_ABI_MAJOR) or (gpac_abi_minor != GF_ABI_MINOR):
+ abi_mismatch=True
+ print('WARNING: this python wrapper is for GPAC ABI ' + str(GF_ABI_MAJOR) + '.' + str(GF_ABI_MINOR) + ' but native libgpac ABI is ' + str(gpac_abi_major) + '.' + str(gpac_abi_minor) + '\n\tUndefined behavior or crashes might happen, please update libgpac.py')
+
+## \endcond private
+
+#
+# Type definitions
+#
+
+##\cond private
+_gf_filter_session = c_void_p
+_gf_filter = c_void_p
+_gf_filter_pid = c_void_p
+_gf_filter_packet = c_void_p
+_gf_property_entry = c_void_p
+_gf_list = c_void_p
+gf_bool = c_uint
+
+##\endcond
+
+
+
+
+##\cond private
+#error to string helper
+_libgpac.gf_error_to_string.argtypes = [c_int]
+_libgpac.gf_error_to_string.restype = c_char_p
+ 
+_libgpac.gf_gpac_version.restype = c_char_p
+_libgpac.gf_gpac_copyright.restype = c_char_p
+_libgpac.gf_gpac_copyright_cite.restype = c_char_p
+
+_libgpac.gf_sys_set_args.argtypes = [c_int, POINTER(POINTER(c_char))]
+
+_libgpac.gf_sys_init.argtypes = [c_int, c_char_p]
+_libgpac.gf_log_set_tools_levels.argtypes = [c_char_p, c_int]
+_libgpac.gf_props_get_type_name.argtypes = [c_uint]
+_libgpac.gf_props_get_type_name.restype = c_char_p
+
+_libgpac.gf_sys_clock.restype = c_uint
+_libgpac.gf_sys_clock_high_res.restype = c_ulonglong
+
+_libgpac.gf_sys_profiler_send.argtypes = [c_char_p]
+_libgpac.gf_sys_profiler_sampling_enabled.restype = gf_bool
+_libgpac.gf_sys_profiler_enable_sampling.argtypes = [gf_bool]
+
+_libgpac.gf_4cc_to_str.argtypes = [c_uint]
+_libgpac.gf_4cc_to_str.restype = c_char_p
+
+_libgpac.gf_4cc_parse.argtypes = [c_char_p]
+_libgpac.gf_4cc_parse.restype = c_uint
+
+_libgpac.gf_sleep.argtypes = [c_uint]
+_libgpac.gf_sleep.restype = c_uint
+
+#default init of libgpac
+_libgpac.user_init = False
+err = _libgpac.gf_sys_init(0, None)
+if err<0:
+	raise Exception('Failed to initialize libgpac: ' + e2s(err))
+
+#\endcond
+
+##libgpac version (string)
+#\hideinitializer
+version = _libgpac.gf_gpac_version().decode("utf-8")
+##libgpac copyright notice (string)
+#\hideinitializer
+copyright = _libgpac.gf_gpac_copyright().decode("utf-8")
+##libgpac full copyright notice (string)
+#\hideinitializer
+copyright_cite = _libgpac.gf_gpac_copyright_cite().decode("utf-8")
+
+## convert error value to string message
+# \param err gpac error code (int)
+# \return string
+def e2s(err):
+ return _libgpac.gf_error_to_string(err).decode('utf-8')
+
+
+## initialize libgpac - see \ref gf_sys_init
+# \param mem_track
+# \param profile
+# \return
+#
+def init(mem_track=0, profile=None):
+ if _libgpac.user_init:
+ return
+ _libgpac.user_init = True
+ _libgpac.gf_sys_close()
+ err = _libgpac.gf_sys_init(mem_track, profile)
+ if err<0:
+ raise Exception('Failed to initialize libgpac: ' + e2s(err))
+
+
+## close libgpac - see \ref gf_sys_close
+# \note Make sure you have destroyed all associated gpac resources before calling this !
+# \return
+#
+def close():
+ _libgpac.gf_sys_close()
+ if hasattr(_libgpac, 'gf_memory_size'):
+ if _libgpac.gf_memory_size() or _libgpac.gf_file_handles_count():
+ set_logs("mem@info")
+ _libgpac.gf_memory_print()
+ return 2
+ return 0
+
+## set log tools and levels - see \ref gf_log_set_tools_levels
+# \note Make sure you have destroyed all associated gpac resources before calling this !
+# \param logs
+# \param reset if true, resets all logs to default
+# \return
+def set_logs(logs, reset=False):
+ _libgpac.gf_log_set_tools_levels(logs.encode('utf-8'), reset)
+
+## get clock - see \ref gf_sys_clock
+# \return clock in milliseconds
+def sys_clock():
+ return _libgpac.gf_sys_clock()
+
+## get high res clock - see \ref gf_sys_clock_high_res
+# \return clock in microseconds
+def sys_clock_high_res():
+ return _libgpac.gf_sys_clock_high_res()
+
+##\cond private
+
+#keep args at libgpac level to avoid python GC
+_libgpac._args=None
+
+##\endcond private
+
+## set libgpac arguments - see \ref gf_sys_set_args
+# \param args list of strings, the first string is ignored (considered to be the executable name)
+# \return
+def set_args(args):
+ _libgpac.user_init = True
+ nb_args = len(args)
+ _libgpac._args = (POINTER(c_char)*nb_args)()
+ for i, arg in enumerate(args):
+ enc_arg = arg.encode('utf-8')
+ _libgpac._args[i] = create_string_buffer(enc_arg)
+ _libgpac.gf_sys_set_args(nb_args, cast(_libgpac._args, POINTER(POINTER(c_char))) )
+
+
+##\cond private
+_libgpac.gf_sys_profiler_set_callback.argtypes = [py_object, c_void_p]
+@CFUNCTYPE(c_int, c_void_p, c_char_p)
+def rmt_fun_cbk(_udta, text):
+ obj = cast(_udta, py_object).value
+ obj.on_rmt_event(text.decode('utf-8'))
+ return 0
+##\endcond private
+
+
+## set profiler (Remotery) callback - see \ref gf_sys_profiler_set_callback
+# \param callback_obj object to call back, must have a method `on_rmt_event` taking a single string parameter
+# \return True if success, False if no Remotery support
+def set_rmt_fun(callback_obj):
+ _libgpac.user_init = True
+ if hasattr(callback_obj, 'on_rmt_event')==False:
+ raise Exception('No on_rmt_event function on callback')
+ err = _libgpac.gf_sys_profiler_set_callback(py_object(callback_obj), rmt_fun_cbk)
+ if err<0:
+ return False
+ return True
+
+## send message to profiler (Remotery) - see \ref gf_sys_profiler_send
+# \param text text to send
+# \return True if success, False if no Remotery support
+def rmt_send(text):
+ err = _libgpac.gf_sys_profiler_send(text.encode('utf-8'))
+ if err<0:
+ return False
+ return True
+
+## check if profiler (Remotery) sampling is enabled - see \ref gf_sys_profiler_sampling_enabled
+# \return True if enabled, False otherwise
+def rmt_on():
+ return _libgpac.gf_sys_profiler_sampling_enabled()
+
+## enable or disable sampling in profiler (Remotery) - see \ref gf_sys_profiler_enable_sampling
+# \param value enable or disable sampling
+# \return
+def rmt_enable(value):
+ _libgpac.user_init = True
+ _libgpac.gf_sys_profiler_enable_sampling(value)
+ 
+
+## sleep for given time in milliseconds
+# \param value time to sleep
+# \return
+def sleep(value):
+ _libgpac.gf_sleep(value)
+
+
+## @}
+
+
+## 
+# \defgroup pystruct_grp Structure Wrappers
+# \ingroup pyapi_grp
+# \brief Python Structures 
+#
+# Python Wrappers for gpac C structures used in this API
+#
+# @{
+
+## fraction object, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_Fraction
+class Fraction(Structure):
+ ## \cond private
+ def __init(self, num, den):
+ self.num = num
+ self.den = den
+ _fields_ = [ ("num", c_int), ("den", c_uint)]
+ def __str__(self):
+ return str(self.num)+'/' + str(self.den)
+ ## \endcond
+
+## large fraction object, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_Fraction64
+class Fraction64(Structure):
+ ## \cond private
+ _fields_ = [("num", c_longlong), ("den", c_ulonglong)]
+ def __str__(self):
+ return str(self.num)+'/' + str(self.den)
+ ## \endcond
+
+## filter statistics object, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FilterStats
+class FilterStats(Structure):
+ ## \cond private
+	_fields_ = [
+		("filter", _gf_filter),
+		("filter_alias", _gf_filter),
+		("nb_tasks_done", c_ulonglong),
+		("nb_pck_processed", c_ulonglong),
+		("nb_bytes_processed", c_ulonglong),
+		("nb_pck_sent", c_ulonglong),
+		("nb_hw_pck_sent", c_ulonglong),
+		("nb_errors", c_uint),
+		("nb_bytes_sent", c_ulonglong),
+		("time_process", c_ulonglong),
+		("percent", c_int),
+		("status", c_char_p),
+		("report_updated", gf_bool),
+		("name", c_char_p),
+		("reg_name", c_char_p),
+		("filter_id", c_char_p),
+		("done", gf_bool),
+		("nb_pid_in", c_uint),
+		("nb_in_pck", c_ulonglong),
+		("nb_pid_out", c_uint),
+		("nb_out_pck", c_ulonglong),
+		("in_eos", gf_bool),
+		("type", c_int),
+		("stream_type", c_int),
+		("codecid", c_int),
+		("last_ts_sent", Fraction64),
+		("last_ts_drop", Fraction64)
+	]
+ ## \endcond
+
+## filter argument object, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FilterArgs
+class FilterArg(Structure):
+ ## \cond private
+ _fields_ = [
+ ("name", c_char_p),
+ ("reserved", c_int),
+ ("description", c_char_p),
+ ("type", c_int),
+ ("default", c_char_p),
+ ("min_max_enum", c_char_p),
+ ("flags", c_uint)
+ ]
+ def __str__(self):
+ res = '- ' + self.name.decode('utf-8') + ' (' + _libgpac.gf_props_get_type_name(self.type).decode('utf-8') + '): ' + self.description.decode('utf-8')
+ if self.default or self.min_max_enum:
+ res += ' ('
+ if self.default:
+ res += 'default: ' + self.default.decode('utf-8')
+ if self.min_max_enum:
+ res += ' min_max_enum: ' + self.min_max_enum.decode('utf-8')
+ res += ')'
+ return res
+ ## \endcond
+
+## filter prop type, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_PropVec2i
+class PropVec2i(Structure):
+ ## \cond private
+ _fields_ = [("x", c_int), ("y", c_int)]
+ def __str__(self):
+ return str(self.x)+'x' + str(self.y)
+ ## \endcond
+
+## filter prop type, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_PropVec2
+class PropVec2(Structure):
+ ## \cond private
+ _fields_ = [("x", c_double),("y", c_double)]
+ def __str__(self):
+ return str(self.x)+'x' + str(self.y)
+ ## \endcond
+
+## filter prop type, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_PropVec3i
+class PropVec3i(Structure):
+ ## \cond private
+ _fields_ = [("x", c_int), ("y", c_int), ("z", c_int)]
+ def __str__(self):
+ return str(self.x)+'x' + str(self.y)+'x' + str(self.z)
+ ## \endcond
+
+## filter prop type, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_PropVec4i
+class PropVec4i(Structure):
+ ## \cond private
+ _fields_ = [("x", c_int), ("y", c_int), ("z", c_int), ("w", c_int)]
+ def __str__(self):
+ return str(self.x)+'x' + str(self.y)+'x' + str(self.z)+'x' + str(self.w)
+ ## \endcond
+
+## filter prop type, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_PropData
+class PropData(Structure):
+ ## \cond private
+ _fields_ = [("ptr", c_void_p), ("size", c_uint)]
+ def __str__(self):
+ return 'data,size:'+str(self.size)
+ ## \endcond
+
+## filter prop type, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_PropUIntList
+class PropStringList(Structure):
+ ## \cond private
+ _fields_ = [("vals", POINTER(c_char_p)), ("nb_items", c_uint)]
+ def __str__(self):
+ res=''
+ for i in range(self.nb_items):
+ if i:
+ res += ','
+ res += self.vals[i].decode('utf-8')
+ return res
+ ## \endcond private
+
+## \cond private
+
+## filter prop type, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_PropUIntList
+class PropUIntList(Structure):
+ _fields_ = [("vals", POINTER(c_uint)), ("nb_items", c_uint)]
+ def __str__(self):
+ res=''
+ for i in range(self.nb_items):
+ if i:
+ res += ','
+ res += str(self.vals[i])
+ return res
+
+## filter prop type, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_PropIntList
+class PropIntList(Structure):
+ _fields_ = [("vals", POINTER(c_int)), ("nb_items", c_uint)]
+ def __str__(self):
+ res=''
+ for i in range(self.nb_items):
+ if i:
+ res += ','
+ res += str(self.vals[i])
+ return res
+
+## filter prop type, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_PropVec2iList
+class PropVec2iList(Structure):
+ _fields_ = [("vals", POINTER(PropVec2i)), ("nb_items", c_uint)]
+ def __str__(self):
+ res=''
+ for i in range(self.nb_items):
+ if i:
+ res += ','
+ res += str(self.vals[i].x) + 'x' + str(self.vals[i].y)
+ return res
+
+## filter property union value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as GF_PropertyValue
+class PropertyValueUnion(Union):
+	_fields_ = [
+		("longuint", c_ulonglong),
+		("longsint", c_longlong),
+		("sint", c_int),
+		("uint", c_uint),
+		("boolean", gf_bool),
+		("frac", Fraction),
+		("lfrac", Fraction64),
+		("fnumber", c_float),
+		("number", c_double),
+		("vec2i", PropVec2i),
+		("vec2", PropVec2),
+		("vec3i", PropVec3i),
+		("vec4i", PropVec3i),
+		("data", PropData),
+		("string", c_char_p),
+		("ptr", c_void_p),
+ ("string_list", PropStringList),
+ ("uint_list", PropUIntList),
+		("sint_list", PropIntList),
+		("v2i_list", PropVec2iList)
+	]
+
+## filter property value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as GF_PropertyValue
+class PropertyValue(Structure):
+	_fields_ = [
+		("type", c_uint),
+		("value", PropertyValueUnion)
+	]
+
+## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_Base
+class FEVT_Base(Structure):
+ ## \cond private
+ _fields_ = [("type", c_uint), ("on_pid", _gf_filter_pid)]
+ ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_Play
+class FEVT_Play(Structure):
+ ## \cond private
+ _fields_ = [
+ ("type", c_uint),
+ ("on_pid", _gf_filter_pid),
+ ("start_range", c_double),
+ ("end_range", c_double),
+ ("speed", c_double),
+ ("from_pck", c_uint),
+ ("hw_buffer_reset", c_ubyte),
+ ("initial_broadcast_play", c_ubyte),
+ ("timestamp_based", c_ubyte),
+ ("full_file_only", c_ubyte),
+ ("forced_dash_segment_switch", c_ubyte),
+ ("drop_non_ref", c_ubyte),
+ ("no_byterange_forward", c_ubyte)
+ ]
+ ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_SourceSeek
+class FEVT_SourceSeek(Structure):
+ ## \cond private
+ _fields_ = [
+ ("type", c_uint),
+ ("on_pid", _gf_filter_pid),
+ ("start_offset", c_ulonglong),
+ ("end_offset", c_ulonglong),
+ ("source_switch", c_char_p),
+ ("is_init_segment", c_ubyte),
+ ("skip_cache_expiration", c_ubyte),
+ ("hint_block_size", c_uint)
+ ]
+ ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_SegmentSize
+class FEVT_SegmentSize(Structure):
+ ## \cond private
+ _fields_ = [
+ ("type", c_uint),
+ ("on_pid", _gf_filter_pid),
+ ("seg_url", c_char_p),
+ ("is_init", gf_bool),
+ ("media_range_start", c_ulonglong),
+ ("media_range_end", c_ulonglong),
+ ("idx_range_start", c_ulonglong),
+ ("idx_range_end", c_ulonglong)
+ ]
+ ## \endcond
+
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_AttachScene
+class FEVT_AttachScene(Structure):
+ ## \cond private
+ _fields_ = [
+ ("type", c_uint),
+ ("on_pid", _gf_filter_pid),
+ ("odm", c_void_p),
+ ("node", c_void_p)
+ ]
+ ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_QualitySwitch
+class FEVT_QualitySwitch(Structure):
+ ## \cond private
+ _fields_ = [
+ ("type", c_uint),
+ ("on_pid", _gf_filter_pid),
+ ("up", gf_bool),
+ ("dependent_group_index", c_uint),
+ ("q_idx", c_int),
+ ("set_tile_mode_plus_one", c_uint),
+ ("quality_degradation", c_uint)
+ ]
+ ## \endcond
+
+#TODO GF_FEVT_Event;
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_FileDelete
+class FEVT_FileDelete(Structure):
+ ## \cond private
+ _fields_ = [
+ ("type", c_uint),
+ ("on_pid", _gf_filter_pid),
+ ("url", c_char_p)
+ ]
+ ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_VisibilityHint
+class FEVT_VisibilityHint(Structure):
+ ## \cond private
+ _fields_ = [
+ ("type", c_uint),
+ ("on_pid", _gf_filter_pid),
+ ("min_x", c_uint),
+ ("max_x", c_uint),
+ ("min_y", c_uint),
+ ("max_y", c_uint),
+ ("is_gaze", gf_bool)
+ ]
+ ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_BufferRequirement
+class FEVT_BufferRequirement(Structure):
+ ## \cond private
+ _fields_ = [
+ ("type", c_uint),
+ ("on_pid", _gf_filter_pid),
+ ("max_buffer_us", c_uint),
+ ("max_playout_us", c_uint),
+ ("min_playout_us", c_uint),
+ ("pid_only", gf_bool)
+ ]
+ ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as GF_FilterEvent
+class FilterEvent(Union):
+ ## constructor
+ #\param type type of event
+ def __init__(self, type=0):
+ self.base.type = type
+ ## \cond private
+ _libgpac.user_init = True
+
+ _fields_ = [
+ ("base", FEVT_Base),
+ ("play", FEVT_Play),
+ ("seek", FEVT_SourceSeek),
+ ("attach_scene", FEVT_AttachScene),
+ #("user_event", FEVT_Event,
+ ("quality_switch", FEVT_QualitySwitch),
+ ("visibility_hint", FEVT_VisibilityHint),
+ ("buffer_req", FEVT_BufferRequirement),
+ ("seg_size", FEVT_SegmentSize),
+ ("file_del", FEVT_FileDelete)
+ ]
+ ## \endcond
+
+
+## Buffer occupancy object 
+class BufferOccupancy:
+ ##\cond private
+ def __init__(self, max_units, nb_pck, max_dur, dur, is_final_flush):
+ ##\endcond
+ ##maximum number of packets (partial or full AU) allowed in buffer
+ self.max_units = max_units
+ ##number of block allowed in buffer
+ self.nb_pck = nb_pck
+ ##maximum buffer duration in microseconds
+ self.max_dur = max_dur
+ ## buffer duration in microseconds
+ self.dur = dur
+ ##if true, the session has been aborted and this is the final flush for this buffer
+ self.is_final_flush = is_final_flush
+
+
+## @}
+
+
+## 
+# \defgroup pycst_grp Constants
+# \ingroup pyapi_grp
+# \brief Constants definitions
+#
+# Python Wrappers for gpac C constants used in this API
+#
+# @{
+
+
+# scheduler type definitions
+##\hideinitializer
+#see \ref GF_FS_SCHEDULER_LOCK_FREE
+GF_FS_SCHEDULER_LOCK_FREE=0
+##\hideinitializer
+##see \ref GF_FS_SCHEDULER_LOCK
+GF_FS_SCHEDULER_LOCK=1
+##\hideinitializer
+##see \ref GF_FS_SCHEDULER_LOCK_FREE_X
+GF_FS_SCHEDULER_LOCK_FREE_X=2
+##\hideinitializer
+##see \ref GF_FS_SCHEDULER_LOCK_FORCE
+GF_FS_SCHEDULER_LOCK_FORCE=3
+##\hideinitializer
+##see \ref GF_FS_SCHEDULER_DIRECT
+GF_FS_SCHEDULER_DIRECT=4
+
+#session flags
+##\hideinitializer
+#see \ref GF_FS_FLAG_LOAD_META
+GF_FS_FLAG_LOAD_META=1<<1
+##\hideinitializer
+#see \ref GF_FS_FLAG_NON_BLOCKING
+GF_FS_FLAG_NON_BLOCKING=1<<2
+##\hideinitializer
+#see \ref GF_FS_FLAG_NO_GRAPH_CACHE
+GF_FS_FLAG_NO_GRAPH_CACHE=1<<3
+##\hideinitializer
+#see \ref GF_FS_FLAG_NO_REGULATION
+GF_FS_FLAG_NO_REGULATION=1<<4
+##\hideinitializer
+#see \ref GF_FS_FLAG_NO_PROBE
+GF_FS_FLAG_NO_PROBE=1<<5
+##\hideinitializer
+#see \ref GF_FS_FLAG_NO_REASSIGN
+GF_FS_FLAG_NO_REASSIGN=1<<6
+##\hideinitializer
+#see \ref GF_FS_FLAG_PRINT_CONNECTIONS
+GF_FS_FLAG_PRINT_CONNECTIONS=1<<7
+##\hideinitializer
+#see \ref GF_FS_FLAG_NO_ARG_CHECK
+GF_FS_FLAG_NO_ARG_CHECK=1<<8
+##\hideinitializer
+#see \ref GF_FS_FLAG_NO_RESERVOIR
+GF_FS_FLAG_NO_RESERVOIR=1<<0
+##\hideinitializer
+#see \ref GF_FS_FLAG_FULL_LINK
+GF_FS_FLAG_FULL_LINK=1<<10
+##\hideinitializer
+#see \ref GF_FS_FLAG_NO_IMPLICIT
+GF_FS_FLAG_NO_IMPLICIT=1<<11
+
+
+##\hideinitializer
+#see \ref GF_PROP_FORBIDEN
+GF_PROP_FORBIDEN=0
+##\hideinitializer
+#see \ref GF_PROP_SINT
+GF_PROP_SINT=1
+##\hideinitializer
+#see \ref GF_PROP_UINT
+GF_PROP_UINT=2
+##\hideinitializer
+#see \ref GF_PROP_LSINT
+GF_PROP_LSINT=3
+##\hideinitializer
+#see \ref GF_PROP_LUINT
+GF_PROP_LUINT=4
+##\hideinitializer
+#see \ref GF_PROP_BOOL
+GF_PROP_BOOL=5
+##\hideinitializer
+#see \ref GF_PROP_FRACTION
+GF_PROP_FRACTION=6
+##\hideinitializer
+#see \ref GF_PROP_FRACTION64
+GF_PROP_FRACTION64=7
+##\hideinitializer
+#see \ref GF_PROP_FLOAT
+GF_PROP_FLOAT=8
+##\hideinitializer
+#see \ref GF_PROP_DOUBLE
+GF_PROP_DOUBLE=9
+##\hideinitializer
+#see \ref GF_PROP_VEC2I
+GF_PROP_VEC2I=10
+##\hideinitializer
+#see \ref GF_PROP_VEC2
+GF_PROP_VEC2=11
+##\hideinitializer
+#see \ref GF_PROP_VEC3I
+GF_PROP_VEC3I=12
+##\hideinitializer
+#see \ref GF_PROP_VEC4I
+GF_PROP_VEC4I=13
+##\hideinitializer
+#see \ref GF_PROP_STRING
+GF_PROP_STRING=14
+##\hideinitializer
+#see \ref GF_PROP_STRING_NO_COPY
+GF_PROP_STRING_NO_COPY=15
+##\hideinitializer
+#see \ref GF_PROP_DATA
+GF_PROP_DATA=16
+##\hideinitializer
+#see \ref GF_PROP_NAME
+GF_PROP_NAME=17
+##\hideinitializer
+#see \ref GF_PROP_DATA_NO_COPY
+GF_PROP_DATA_NO_COPY=18
+##\hideinitializer
+#see \ref GF_PROP_CONST_DATA
+GF_PROP_CONST_DATA=19
+##\hideinitializer
+#see \ref GF_PROP_POINTER
+GF_PROP_POINTER=20
+##\hideinitializer
+#see \ref GF_PROP_STRING_LIST
+GF_PROP_STRING_LIST=21
+##\hideinitializer
+#see \ref GF_PROP_UINT_LIST
+GF_PROP_UINT_LIST=22
+##\hideinitializer
+#see \ref GF_PROP_SINT_LIST
+GF_PROP_SINT_LIST=23
+##\hideinitializer
+#see \ref GF_PROP_VEC2I_LIST
+GF_PROP_VEC2I_LIST=24
+##\hideinitializer
+#see \ref GF_PROP_4CC
+GF_PROP_4CC=25
+##\hideinitializer
+#see \ref GF_PROP_4CC_LIST
+GF_PROP_4CC_LIST=26
+
+##\hideinitializer
+#see \ref GF_PROP_FIRST_ENUM
+GF_PROP_FIRST_ENUM=40
+##\hideinitializer
+#see \ref GF_PROP_PIXFMT
+GF_PROP_PIXFMT=GF_PROP_FIRST_ENUM
+##\hideinitializer
+#see \ref GF_PROP_PCMFMT
+GF_PROP_PCMFMT=GF_PROP_FIRST_ENUM+1
+##\hideinitializer
+#see \ref GF_PROP_CICP_COL_PRIM
+GF_PROP_CICP_COL_PRIM=GF_PROP_FIRST_ENUM+2
+##\hideinitializer
+#see \ref GF_PROP_CICP_COL_TFC
+GF_PROP_CICP_COL_TFC=GF_PROP_FIRST_ENUM+3
+##\hideinitializer
+#see \ref GF_PROP_CICP_COL_MX
+GF_PROP_CICP_COL_MX=GF_PROP_FIRST_ENUM+4
+
+##\hideinitializer
+#see GF_FEVT_PLAY
+GF_FEVT_PLAY = 1
+##\hideinitializer
+#see GF_FEVT_SET_SPEED
+GF_FEVT_SET_SPEED = 2
+##\hideinitializer
+#see GF_FEVT_STOP
+GF_FEVT_STOP = 3
+##\hideinitializer
+#see GF_FEVT_PAUSE
+GF_FEVT_PAUSE = 4
+##\hideinitializer
+#see GF_FEVT_RESUME
+GF_FEVT_RESUME = 5
+##\hideinitializer
+#see GF_FEVT_SOURCE_SEEK
+GF_FEVT_SOURCE_SEEK = 6
+##\hideinitializer
+#see GF_FEVT_SOURCE_SWITCH
+GF_FEVT_SOURCE_SWITCH = 7
+##\hideinitializer
+#see GF_FEVT_SEGMENT_SIZE
+GF_FEVT_SEGMENT_SIZE = 8
+##\hideinitializer
+#see GF_FEVT_ATTACH_SCENE
+GF_FEVT_ATTACH_SCENE = 9
+##\hideinitializer
+#see GF_FEVT_RESET_SCENE
+GF_FEVT_RESET_SCENE = 10
+##\hideinitializer
+#see GF_FEVT_QUALITY_SWITCH
+GF_FEVT_QUALITY_SWITCH = 11
+##\hideinitializer
+#see GF_FEVT_VISIBILITY_HINT
+GF_FEVT_VISIBILITY_HINT = 12
+##\hideinitializer
+#see GF_FEVT_INFO_UPDATE
+GF_FEVT_INFO_UPDATE = 13
+##\hideinitializer
+#see GF_FEVT_BUFFER_REQ
+GF_FEVT_BUFFER_REQ = 14
+##\hideinitializer
+#see GF_FEVT_CAPS_CHANGE
+GF_FEVT_CAPS_CHANGE = 15
+##\hideinitializer
+#see GF_FEVT_CONNECT_FAIL
+GF_FEVT_CONNECT_FAIL = 16
+##\hideinitializer
+#see GF_FEVT_USER
+GF_FEVT_USER = 17
+##\hideinitializer
+#see GF_FEVT_PLAY_HINT
+GF_FEVT_PLAY_HINT = 18
+##\hideinitializer
+#see GF_FEVT_FILE_DELETE
+GF_FEVT_FILE_DELETE = 19
+
+
+##\hideinitializer
+#see GF_FS_ARG_HINT_NORMAL
+GF_FS_ARG_HINT_NORMAL = 0
+##\hideinitializer
+#see GF_FS_ARG_HINT_ADVANCED
+GF_FS_ARG_HINT_ADVANCED = 1<<1
+##\hideinitializer
+#see GF_FS_ARG_HINT_EXPERT
+GF_FS_ARG_HINT_EXPERT = 1<<2
+##\hideinitializer
+#see GF_FS_ARG_HINT_HIDE
+GF_FS_ARG_HINT_HIDE = 1<<3
+##\hideinitializer
+#see GF_FS_ARG_UPDATE
+GF_FS_ARG_UPDATE = 1<<4
+##\hideinitializer
+#see GF_FS_ARG_META
+GF_FS_ARG_META = 1<<5
+##\hideinitializer
+#see GF_FS_ARG_META_ALLOC
+GF_FS_ARG_META_ALLOC = 1<<6
+##\hideinitializer
+#see GF_FS_ARG_SINK_ALIAS
+GF_FS_ARG_SINK_ALIAS = 1<<7
+
+
+##\hideinitializer
+#see GF_CAPFLAG_IN_BUNDLE
+GF_CAPFLAG_IN_BUNDLE = 1
+##\hideinitializer
+#see GF_CAPFLAG_INPUT
+GF_CAPFLAG_INPUT = 1<<1
+##\hideinitializer
+#see GF_CAPFLAG_OUTPUT
+GF_CAPFLAG_OUTPUT = 1<<2
+##\hideinitializer
+#see GF_CAPFLAG_EXCLUDED
+GF_CAPFLAG_EXCLUDED = 1<<3
+##\hideinitializer
+#see GF_CAPFLAG_LOADED_FILTER
+GF_CAPFLAG_LOADED_FILTER = 1<<4
+##\hideinitializer
+#see GF_CAPFLAG_STATIC
+GF_CAPFLAG_STATIC = 1<<5
+##\hideinitializer
+#see GF_CAPFLAG_OPTIONAL
+GF_CAPFLAG_OPTIONAL = 1<<6
+
+#helpers
+##\hideinitializer
+#see GF_CAPS_INPUT
+GF_CAPS_INPUT = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT)
+##\hideinitializer
+#see GF_CAPS_INPUT_OPT
+GF_CAPS_INPUT_OPT = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_OPTIONAL)
+##\hideinitializer
+#see GF_CAPS_INPUT_STATIC
+GF_CAPS_INPUT_STATIC = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_STATIC)
+##\hideinitializer
+#see GF_CAPS_INPUT_STATIC_OPT
+GF_CAPS_INPUT_STATIC_OPT = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_STATIC|GF_CAPFLAG_OPTIONAL)
+##\hideinitializer
+#see GF_CAPS_INPUT_EXCLUDED
+GF_CAPS_INPUT_EXCLUDED = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_EXCLUDED)
+##\hideinitializer
+#see GF_CAPS_INPUT_LOADED_FILTER
+GF_CAPS_INPUT_LOADED_FILTER = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_LOADED_FILTER)
+##\hideinitializer
+#see GF_CAPS_OUTPUT
+GF_CAPS_OUTPUT = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT)
+##\hideinitializer
+#see GF_CAPS_OUTPUT_LOADED_FILTER
+GF_CAPS_OUTPUT_LOADED_FILTER = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_LOADED_FILTER)
+##\hideinitializer
+#see GF_CAPS_OUTPUT_EXCLUDED
+GF_CAPS_OUTPUT_EXCLUDED = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_EXCLUDED)
+##\hideinitializer
+#see GF_CAPS_OUTPUT_STATIC
+GF_CAPS_OUTPUT_STATIC = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_STATIC)
+##\hideinitializer
+#see GF_CAPS_OUTPUT_STATIC_EXCLUDED
+GF_CAPS_OUTPUT_STATIC_EXCLUDED = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_STATIC)
+##\hideinitializer
+#see GF_CAPS_INPUT_OUTPUT
+GF_CAPS_INPUT_OUTPUT = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_OUTPUT)
+##\hideinitializer
+#see GF_CAPS_INPUT_OUTPUT_OPT
+GF_CAPS_INPUT_OUTPUT_OPT = (GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_OPTIONAL)
+
+
+##\hideinitializer
+#see \ref GF_SCRIPT_INFO
+GF_SCRIPT_INFO = 3
+##\hideinitializer
+#see \ref GF_PENDING_PACKET
+GF_PENDING_PACKET = 2
+##\hideinitializer
+#see \ref GF_EOS
+GF_EOS = 1
+##\hideinitializer
+#see \ref GF_OK
+GF_OK = 0
+##\hideinitializer
+#see \ref GF_BAD_PARAM
+GF_BAD_PARAM = -1
+##\hideinitializer
+#see \ref GF_OUT_OF_MEM
+GF_OUT_OF_MEM = -2
+##\hideinitializer
+#see \ref GF_IO_ERR
+GF_IO_ERR = -3
+##\hideinitializer
+#see \ref GF_NOT_SUPPORTED
+GF_NOT_SUPPORTED = -4
+##\hideinitializer
+#see \ref GF_CORRUPTED_DATA
+GF_CORRUPTED_DATA = -5
+##\hideinitializer
+#see \ref GF_SCRIPT_ERROR
+GF_SCRIPT_ERROR = -8
+##\hideinitializer
+#see \ref GF_BUFFER_TOO_SMALL
+GF_BUFFER_TOO_SMALL = -9
+##\hideinitializer
+#see \ref GF_NON_COMPLIANT_BITSTREAM
+GF_NON_COMPLIANT_BITSTREAM = -10
+##\hideinitializer
+#see \ref GF_FILTER_NOT_FOUND
+GF_FILTER_NOT_FOUND = -11
+##\hideinitializer
+#see \ref GF_URL_ERROR
+GF_URL_ERROR = -12
+##\hideinitializer
+#see \ref GF_SERVICE_ERROR
+GF_SERVICE_ERROR = -13
+##\hideinitializer
+#see \ref GF_REMOTE_SERVICE_ERROR
+GF_REMOTE_SERVICE_ERROR = -14
+##\hideinitializer
+#see \ref GF_STREAM_NOT_FOUND
+GF_STREAM_NOT_FOUND = -15
+##\hideinitializer
+#see \ref GF_URL_REMOVED
+GF_URL_REMOVED = -16
+##\hideinitializer
+#see \ref GF_IP_ADDRESS_NOT_FOUND
+GF_IP_ADDRESS_NOT_FOUND = -40
+##\hideinitializer
+#see \ref GF_IP_CONNECTION_FAILURE
+GF_IP_CONNECTION_FAILURE = -41
+##\hideinitializer
+#see \ref GF_IP_NETWORK_FAILURE
+GF_IP_NETWORK_FAILURE = -42
+##\hideinitializer
+#see \ref GF_IP_CONNECTION_CLOSED
+GF_IP_CONNECTION_CLOSED = -43
+##\hideinitializer
+#see \ref GF_IP_NETWORK_EMPTY
+GF_IP_NETWORK_EMPTY = -44
+##\hideinitializer
+#see \ref GF_IP_SOCK_WOULD_BLOCK
+GF_IP_SOCK_WOULD_BLOCK = -45
+##\hideinitializer
+#see \ref GF_IP_UDP_TIMEOUT
+GF_IP_UDP_TIMEOUT = -46
+##\hideinitializer
+#see \ref GF_AUTHENTICATION_FAILURE
+GF_AUTHENTICATION_FAILURE = -50
+##\hideinitializer
+#see \ref GF_SCRIPT_NOT_READY
+GF_SCRIPT_NOT_READY = -51
+##\hideinitializer
+#see \ref GF_INVALID_CONFIGURATION
+GF_INVALID_CONFIGURATION = -52
+##\hideinitializer
+#see \ref GF_NOT_FOUND
+GF_NOT_FOUND = -53
+##\hideinitializer
+#see \ref GF_PROFILE_NOT_SUPPORTED
+GF_PROFILE_NOT_SUPPORTED = -54
+##\hideinitializer
+#see \ref GF_REQUIRES_NEW_INSTANCE
+GF_REQUIRES_NEW_INSTANCE = -56
+##\hideinitializer
+#see \ref GF_FILTER_NOT_SUPPORTED
+GF_FILTER_NOT_SUPPORTED = -57
+
+##notification is a setup error, the filter chain was never connected
+GF_SETUP_ERROR=0
+##notification is an error but keep the filter chain connected
+GF_NOTIF_ERROR=1
+##notification is an error and disconnect the filter chain
+GF_NOTIF_ERROR_AND_DISCONNECT=2
+
+
+##Do not flush session: everything is discarded, potentially breaking output files
+GF_FS_FLUSH_NONE=0,
+##Flush all pending data before closing sessions: sources will be forced into end of stream and all emitted packets will be processed
+GF_FS_FLUSH_ALL=1
+##Stop session (resetting buffers) and flush pipeline
+GF_FS_FLUSH_FAST=2
+
+## @}
+
+##\cond private
+
+_gf_filter_session = c_void_p
+_gf_filter = c_void_p
+_gf_filter_pid = c_void_p
+
+#
+# filter session bindings
+#
+
+_libgpac.gf_fs_new.argtypes = [c_int, c_int, c_int, c_char_p]
+_libgpac.gf_fs_new.restype = _gf_filter_session
+
+_libgpac.gf_fs_del.argtypes = [_gf_filter_session]
+_libgpac.gf_fs_del.restype = None
+
+_libgpac.gf_fs_run.argtypes = [_gf_filter_session]
+
+_libgpac.gf_fs_load_source.argtypes = [_gf_filter_session, c_char_p, c_char_p, c_char_p, POINTER(c_int)]
+_libgpac.gf_fs_load_source.restype = _gf_filter
+
+_libgpac.gf_fs_load_destination.argtypes = [_gf_filter_session, c_char_p, c_char_p, c_char_p, POINTER(c_int)]
+_libgpac.gf_fs_load_destination.restype = _gf_filter
+
+_libgpac.gf_fs_load_filter.argtypes = [_gf_filter_session, c_char_p, POINTER(c_int)]
+_libgpac.gf_fs_load_filter.restype = _gf_filter
+
+_libgpac.gf_fs_new_filter.argtypes = [_gf_filter_session, c_char_p, c_uint, POINTER(c_int)]
+_libgpac.gf_fs_new_filter.restype = _gf_filter
+
+
+_libgpac.gf_fs_post_user_task.argtypes = [_gf_filter_session, c_void_p, py_object, c_char_p]
+_libgpac.gf_fs_post_user_task.restype = c_int
+
+_libgpac.gf_fs_is_last_task.argtypes = [_gf_filter_session]
+_libgpac.gf_fs_is_last_task.restype = gf_bool
+
+_libgpac.gf_fs_get_filters_count.argtypes = [_gf_filter_session]
+_libgpac.gf_fs_get_filter.argtypes = [_gf_filter_session, c_int]
+_libgpac.gf_fs_get_filter.restype = _gf_filter
+
+_libgpac.gf_fs_abort.argtypes = [_gf_filter_session, c_int]
+
+_libgpac.gf_fs_get_http_max_rate.argtypes = [_gf_filter_session]
+_libgpac.gf_fs_get_http_rate.argtypes = [_gf_filter_session]
+_libgpac.gf_fs_set_http_max_rate.argtypes = [_gf_filter_session, c_uint]
+
+_libgpac.gf_fs_lock_filters.argtypes = [_gf_filter_session, gf_bool]
+_libgpac.gf_fs_enable_reporting.argtypes = [_gf_filter_session, gf_bool]
+
+_libgpac.gf_fs_print_stats.argtypes = [_gf_filter_session]
+_libgpac.gf_fs_print_connections.argtypes = [_gf_filter_session]
+
+_libgpac.gf_fs_fire_event.argtypes = [_gf_filter_session, _gf_filter, POINTER(FilterEvent), gf_bool]
+_libgpac.gf_fs_fire_event.restype = gf_bool
+
+_libgpac.gf_fs_is_supported_mime.argtypes = [_gf_filter_session, c_char_p]
+_libgpac.gf_fs_is_supported_mime.restype = gf_bool
+
+_libgpac.gf_fs_is_supported_mime.argtypes = [_gf_filter_session, c_char_p]
+_libgpac.gf_fs_is_supported_mime.restype = gf_bool
+
+_libgpac.gf_fs_is_supported_source.argtypes = [_gf_filter_session, c_char_p, c_char_p]
+_libgpac.gf_fs_is_supported_source.restype = gf_bool
+
+_libgpac.gf_pixel_fmt_sname.argtypes = [c_uint]
+_libgpac.gf_pixel_fmt_sname.restype = c_char_p
+
+
+@CFUNCTYPE(c_int, _gf_filter_session, c_void_p, POINTER(c_uint))
+def fs_task_fun(sess, cbk, resched):
+ obj = cast(cbk, py_object).value
+ res = obj.execute()
+ if res==None or res<0:
+ obj.session.rem_task(obj)
+ return 0
+ resched.contents.value=res
+ return 1
+
+
+
+_libgpac.gf_fs_set_filter_creation_callback.argtypes = [_gf_filter_session, c_void_p, py_object, gf_bool]
+@CFUNCTYPE(c_int, c_void_p, _gf_filter, gf_bool)
+def on_filter_new_del(cbk, _filter, is_del):
+ sess = cast(cbk, py_object).value
+ f = sess._to_filter(_filter)
+ if is_del:
+ if hasattr(sess, 'on_filter_del'):
+ sess.on_filter_del(f)
+ sess._filters.remove(f)
+ elif hasattr(sess, 'on_filter_new'):
+ sess.on_filter_new(f)
+
+ return 0
+
+##\endcond
+
+
+## Task object for user callbacks from libgpac scheduler 
+class FilterTask:
+ ## constructor for tasks
+ #\param name name of the task (used for logging)
+ def __init__(self, name):
+ ##Task name
+ #\hideinitializer
+ self.name = name
+ ##Filter session
+ #\hideinitializer
+ self.session = None
+ ## task execution function
+ #\return -1 or less to remove the task from the scheduler, 0 or more to indicate the number of milliseconds to wait before calling the task again
+ def execute(self):
+ return -1
+
+
+## filter session object - see \ref GF_FilterSession
+class FilterSession:
+ ## constructor for filter session - see \ref gf_fs_new
+ #\param flags session flags (int)
+ #\param blacklist list of blacklisted filters
+ #\param nb_threads number of threads to use (int)
+ #\param sched_type session scheduler type
+ def __init__(self, flags=0, blacklist=None, nb_threads=0, sched_type=0):
+ ##\cond private
+ _libgpac.user_init = True
+ self._sess = None
+ if blacklist:
+ self._sess = _libgpac.gf_fs_new(nb_threads, sched_type, flags, blacklist.encode('utf-8'))
+ else:
+ self._sess = _libgpac.gf_fs_new(nb_threads, sched_type, flags, None)
+ if not self._sess:
+ raise Exception('Failed to create new filter session')
+ self._filters = []
+ self._tasks = []
+ #for now force sync user tasks and filter management to run on main thread, not tested otherwise
+ _libgpac.gf_fs_set_filter_creation_callback(self._sess, on_filter_new_del, py_object(self), True)
+
+ ##\endcond
+ #hack for doxygen to generate member vars (not support for parsing @property)
+ if 0:
+ ##set to true if this is the last task running, readonly - see \ref gf_fs_is_last_task
+ self.last_task=0
+ ##number of filters in session, readonly - see \ref gf_fs_get_filters_count
+ self.nb_filters=0
+ ##current HTTP cumulated download rate, readonly - see \ref gf_fs_get_http_rate
+ self.http_bitrate=0
+ ##HTTP max download rate - see \ref gf_fs_get_http_max_rate and \ref gf_fs_set_http_max_rate
+ self.http_max_bitrate=0
+
+
+ ## delete an existing filter session - see \ref gf_fs_del
+ #\warning The filter session must be explicitly destroyed if close (\ref gf_sys_close) is called after that 
+ #\return
+ def delete(self):
+ ##\cond private
+ if self._sess:
+ _libgpac.gf_fs_del(self._sess)
+ self._sess=None
+ ##\endcond private
+
+ ## called whenever a new filter is added, typically used by classes deriving from FilterSession
+ #\param filter Filter object being added
+ #\return
+ def on_filter_new(self, filter):
+ pass
+
+ ## called whenever a filter is destroyed, typically used by classes deriving from FilterSession
+ #\param filter Filter object being removed
+ #\return
+ def on_filter_del(self, filter):
+ pass
+
+ ##\cond private
+ def _to_filter(self, f):
+ for i, a_f in enumerate(self._filters):
+ if a_f._filter == f:
+ return a_f
+ filter = Filter(self, f)
+ self._filters.append(filter)
+ return filter
+ ##\endcond private
+
+ ##run the session - see \ref gf_fs_run
+ #\return
+ def run(self):
+ err = _libgpac.gf_fs_run(self._sess)
+ if err<0: 
+ raise Exception('Failed to run session: ' + e2s(err))
+
+ ##load source filter - see \ref gf_fs_load_source
+ #\param URL source URL to load
+ #\param parentURL URL of parent resource for relative path resolution
+ #\return new Filter object
+ def load_src(self, URL, parentURL=None):
+ errp = c_int(0)
+ if parentURL:
+ filter = _libgpac.gf_fs_load_source(self._sess, URL.encode('utf-8'), None, parentURL.encode('utf-8'), byref(errp))
+ else:
+ filter = _libgpac.gf_fs_load_source(self._sess, URL.encode('utf-8'), None, None, byref(errp))
+ err = errp.value
+ if err<0: 
+ raise Exception('Failed to load source filter ' + URL + ': ' + e2s(err))
+ return self._to_filter(filter)
+
+ ##load destination filter - see \ref gf_fs_load_destination
+ #\param URL source URL to load
+ #\param parentURL URL of parent resource for relative path resolution
+ #\return new Filter object
+ def load_dst(self, URL, parentURL=None):
+ errp = c_int(0)
+ if parentURL:
+ filter = _libgpac.gf_fs_load_destination(self._sess, URL.encode('utf-8'), None, parentURL.encode('utf-8'), byref(errp))
+ else:
+ filter = _libgpac.gf_fs_load_destination(self._sess, URL.encode('utf-8'), None, None, byref(errp))
+ err = errp.value
+ if err<0: 
+ raise Exception('Failed to load destination filter ' + URL + ': ' + e2s(err))
+ return self._to_filter(filter)
+
+
+ ##load a filter - see \ref gf_fs_load_filter
+ #\param fname filter name and options
+ #\return new Filter object
+ def load(self, fname):
+ errp = c_int(0)
+ filter = _libgpac.gf_fs_load_filter(self._sess, fname.encode('utf-8'), byref(errp))
+ err = errp.value
+ if err<0: 
+ raise Exception('Failed to load filter ' + fname + ': ' + e2s(err))
+ return self._to_filter(filter)
+
+ ##post a user task to the filter sesison - see \ref gf_fs_post_user_task
+ #\param task task object to post
+ #\return
+ def post(self, task):
+ task.session = self
+ err = _libgpac.gf_fs_post_user_task(self._sess, fs_task_fun, py_object(task), task.name.encode('utf-8'))
+ if err<0: 
+ raise Exception('Failed to post task ' + task.name + ': ' + e2s(err))
+ self._tasks.append(task)
+
+ ##\cond private
+ #\return
+ def rem_task(self, task):
+ task.session = None
+ self._tasks.remove(task)
+ ##\endcond
+
+ ##abort the session - see \ref gf_fs_abort
+ #\param flush flush pipeline before abort
+ #\return
+ def abort(self, flush=0):
+ _libgpac.gf_fs_abort(self._sess, flush)
+ 
+ ##get a filter by index - see \ref gf_fs_get_filter
+ #\param index index of filter
+ #\return Filter object
+ def get_filter(self, index):
+ f = _libgpac.gf_fs_get_filter(self._sess, index)
+ if not f:
+ raise Exception('Failed to get filter at index ' + str(index) )
+ return self._to_filter(f)
+
+ 
+ ##lock the session - see \ref gf_fs_lock_filters
+ #\param lock if True, locks otherwise unlocks
+ #\return
+ def lock(self, lock):
+ _libgpac.gf_fs_lock_filters(self._sess, lock)
+
+ ##enable status reporting by filters - see \ref gf_fs_enable_reporting
+ #\param do_report if True, enables reporting
+ #\return
+ def reporting(self, do_report):
+ _libgpac.gf_fs_enable_reporting(self._sess, do_report)
+
+ ##print statistics on stderr - see \ref gf_fs_print_stats
+ #\return
+ def print_stats(self):
+ _libgpac.gf_fs_print_stats(self._sess)
+
+ ##print graph on stderr - see \ref gf_fs_print_connections
+ #\return
+ def print_graph(self):
+ _libgpac.gf_fs_print_connections(self._sess)
+
+ ##fire an event on the given filter if any, or on any filter accepting user events
+ # \param evt FilterEvent to fire
+ # \param filter Filter to use as target
+ # \param upstream if true, walks the chain towards the sink, otehrwise towards the source
+ #\return
+ def fire_event(self, evt, filter=None, upstream=False):
+ if filter:
+ return _libgpac.gf_fs_fire_event(self._sess, filter._filter, byref(evt), upstream)
+ return _libgpac.gf_fs_fire_event(self._sess, None, byref(evt), upstream)
+
+ ##checks if a given mime is supported - see \ref gf_fs_is_supported_mime
+ # \param mime mime type to check
+ # \return true or false
+ def is_supported_mime(self, mime):
+ return _libgpac.gf_fs_is_supported_mime(self._sess, mime.encode('utf-8'))
+
+ ##checks if a given source URL is supported - see \ref gf_fs_is_supported_source
+ # \param url URL to check
+ # \param parent parent URL for relative URLs
+ # \return true or false
+ def is_supported_source(self, url, parent=None):
+ if parent:
+ return _libgpac.gf_fs_is_supported_source(self._sess, url.encode('utf-8'), parent.encode('utf-8'))
+ return _libgpac.gf_fs_is_supported_source(self._sess, url.encode('utf-8'), None)
+
+
+ ##\cond private: until end, properties
+ @property
+ def last_task(self):
+ if _libgpac.gf_fs_is_last_task(self._sess):
+ return True
+ return False
+
+ @property
+ def nb_filters(self):
+ return _libgpac.gf_fs_get_filters_count(self._sess)
+
+ @property
+ def http_bitrate(self):
+ return _libgpac.gf_fs_get_http_rate(self._sess)
+ 
+ @property
+ def http_max_bitrate(self):
+ return _libgpac.gf_fs_get_http_max_rate(self._sess)
+
+ @http_max_bitrate.setter
+ def http_max_bitrate(self, value):
+ return _libgpac.gf_fs_set_http_max_rate(self._sess, value)
+
+ ##\endcond
+
+
+ #TODO
+ #global session: session caps ?
+
+ #missing features available in JSFilterSession API but with no native direct equivalents:
+ #set_new_filter_fun, set_del_filter_fun, set_event_fun
+
+
+
+## \cond private
+#
+# filter bindings
+#
+_libgpac.gf_filter_get_name.argtypes = [_gf_filter]
+_libgpac.gf_filter_get_name.restype = c_char_p
+_libgpac.gf_filter_get_id.argtypes = [_gf_filter]
+_libgpac.gf_filter_get_id.restype = c_char_p
+_libgpac.gf_filter_get_ipid_count.argtypes = [_gf_filter]
+_libgpac.gf_filter_get_opid_count.argtypes = [_gf_filter]
+
+
+
+_libgpac.gf_filter_get_stats.argtypes = [_gf_filter, POINTER(FilterStats)]
+_libgpac.gf_filter_remove.argtypes = [_gf_filter]
+_libgpac.gf_fs_send_update.argtypes = [_gf_filter_session, c_char_p, _gf_filter, c_char_p, c_char_p, c_uint]
+_libgpac.gf_filter_set_source.argtypes = [_gf_filter, _gf_filter, c_char_p]
+_libgpac.gf_filter_set_source_restricted.argtypes = [_gf_filter, _gf_filter, c_char_p]
+_libgpac.gf_filter_reconnect_output.argtypes = [_gf_filter]
+
+_libgpac.gf_props_get_id.argtypes = [c_char_p]
+_libgpac.gf_filter_get_ipid.argtypes = [_gf_filter, c_uint]
+_libgpac.gf_filter_get_ipid.restype = _gf_filter_pid
+_libgpac.gf_filter_get_opid.argtypes = [_gf_filter, c_uint]
+_libgpac.gf_filter_get_opid.restype = _gf_filter_pid
+_libgpac.gf_filter_pid_get_property.argtypes = [_gf_filter_pid, c_uint]
+_libgpac.gf_filter_pid_get_property.restype = POINTER(PropertyValue)
+_libgpac.gf_filter_pid_get_property_str.argtypes = [_gf_filter_pid, c_char_p]
+_libgpac.gf_filter_pid_get_property_str.restype = POINTER(PropertyValue)
+
+_libgpac.gf_filter_pid_get_info.argtypes = [_gf_filter_pid, c_uint, POINTER(POINTER(_gf_property_entry))]
+_libgpac.gf_filter_pid_get_info.restype = POINTER(PropertyValue)
+_libgpac.gf_filter_pid_get_info_str.argtypes = [_gf_filter_pid, c_char_p, POINTER(POINTER(_gf_property_entry))]
+_libgpac.gf_filter_pid_get_info_str.restype = POINTER(PropertyValue)
+_libgpac.gf_filter_release_property.argtypes = [POINTER(_gf_property_entry)]
+
+_libgpac.gf_props_type_is_enum.argtypes = [c_uint]
+_libgpac.gf_props_type_is_enum.restype = c_int
+
+_libgpac.gf_props_parse_enum.argtypes = [c_uint, c_char_p]
+_libgpac.gf_props_parse_enum.restype = c_uint
+
+_libgpac.gf_pixel_fmt_name.argtypes = [c_uint]
+_libgpac.gf_pixel_fmt_name.restype = c_char_p
+
+_libgpac.gf_audio_fmt_name.argtypes = [c_uint]
+_libgpac.gf_audio_fmt_name.restype = c_char_p
+
+_libgpac.gf_filter_pid_enum_properties.argtypes = [_gf_filter_pid, POINTER(c_uint), POINTER(c_uint), POINTER(c_char_p)]
+_libgpac.gf_filter_pid_enum_properties.restype = POINTER(PropertyValue)
+
+_libgpac.gf_props_4cc_get_name.argtypes = [c_uint]
+_libgpac.gf_props_4cc_get_name.restype = c_char_p
+
+_libgpac.gf_stream_type_name.argtypes = [c_uint]
+_libgpac.gf_stream_type_name.restype = c_char_p
+
+_libgpac.gf_codecid_file_ext.argtypes = [c_uint]
+_libgpac.gf_codecid_file_ext.restype = c_char_p
+
+_libgpac.gf_filter_pid_get_source_filter.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_get_source_filter.restype = _gf_filter
+
+_libgpac.gf_filter_pid_enum_destinations.argtypes = [_gf_filter_pid, c_uint]
+_libgpac.gf_filter_pid_enum_destinations.restype = _gf_filter
+
+_libgpac.gf_filter_enumerate_args.argtypes = [_gf_filter, c_uint]
+_libgpac.gf_filter_enumerate_args.restype = POINTER(FilterArg)
+
+_libgpac.gf_filter_get_info.argtypes = [_gf_filter, c_uint, POINTER(POINTER(_gf_property_entry))]
+_libgpac.gf_filter_get_info.restype = POINTER(PropertyValue)
+_libgpac.gf_filter_get_info_str.argtypes = [_gf_filter, c_char_p, POINTER(POINTER(_gf_property_entry))]
+_libgpac.gf_filter_get_info_str.restype = POINTER(PropertyValue)
+
+_libgpac.gf_filter_require_source_id.argtypes = [_gf_filter]
+
+_libgpac.gf_filter_bind_dash_algo_callbacks.argtypes = [_gf_filter, py_object, c_void_p, c_void_p, c_void_p, c_void_p]
+@CFUNCTYPE(c_int, c_void_p, c_uint)
+def dash_period_reset(cbk, reset_type):
+ obj = cast(cbk, py_object).value
+ if hasattr(obj, 'on_period_reset'):
+ obj.on_period_reset(reset_type)
+ if not reset_type:
+ obj.groups = []
+ return 0
+
+class DASHQualityInfoNat(Structure):
+ _fields_ = [
+ ("bandwidth", c_uint),
+ ("ID", c_char_p),
+ ("mime", c_char_p),
+ ("codec", c_char_p),
+ ("width", c_uint),
+ ("height", c_uint),
+ ("interlaced", gf_bool),
+ ("fps_num", c_uint),
+ ("fps_den", c_uint),
+ ("sar_num", c_uint),
+ ("sar_den", c_uint),
+ ("sample_rate", c_uint),
+ ("nb_channels", c_uint),
+ ("disabled", gf_bool),
+ ("is_selected", gf_bool),
+ ("ast_offset", c_double),
+ ("avg_duration", c_double),
+ ("sizes", _gf_list),
+ ]
+
+class DASHByteRange(Structure):
+ _fields_ = [
+ ("start", c_ulonglong),
+ ("end", c_ulonglong)
+ ]
+
+class DASHSegURL(Structure):
+ _fields_ = [
+ ("media", c_char_p),
+ ("media_range", POINTER(DASHByteRange))
+ #ignore the rest
+ ]
+
+
+_libgpac.gf_dash_group_get_num_qualities.argtypes = [c_void_p, c_uint]
+_libgpac.gf_dash_get_period_duration.argtypes = [c_void_p]
+_libgpac.gf_dash_group_get_quality_info.argtypes = [c_void_p, c_uint, c_uint, POINTER(DASHQualityInfoNat) ]
+
+_libgpac.gf_dash_group_get_srd_info.argtypes = [c_void_p, c_uint, POINTER(c_uint), POINTER(c_uint), POINTER(c_uint), POINTER(c_uint), POINTER(c_uint), POINTER(c_uint), POINTER(c_uint) ]
+
+_libgpac.gf_list_count.argtypes = [c_void_p]
+_libgpac.gf_list_count.restype = c_uint
+
+_libgpac.gf_list_get.argtypes = [c_void_p, c_uint]
+_libgpac.gf_list_get.restype = c_void_p
+
+
+## \endcond
+
+## 
+# \defgroup pydash_grp DASH custom algorithm
+# \ingroup pyapi_grp
+# \brief Python API for libgpac.
+#
+# @{
+
+## DASH media quality information (Representation info)
+class DASHQualityInfo:
+ ## \cond priv
+ def __init__(self, qinfon):
+ ## \endcond
+ ## bandwidth in bits per second
+ self.bandwidth = qinfon.bandwidth
+ ## ID (representation ID in DASH)
+ self.ID = qinfon.ID.decode('utf-8')
+ ## MIME type
+ self.mime = qinfon.mime.decode('utf-8')
+ ## codec parameter string
+ self.codec = qinfon.codec.decode('utf-8')
+ ## width in pixels, 0 if not visual
+ self.width = qinfon.width
+ ## height in pixels, 0 if not visual
+ self.height = qinfon.height
+ ## interlaced flag, false 0 if not visual
+ self.interlaced = qinfon.interlaced
+ ## Frame Rate (Fraction), 0/0 if not visual
+ self.fps = Fraction(qinfon.fps_num, qinfon.fps_den)
+ ## Sample Aspect Ration (Fraction), 0/0 if not visual
+ self.sar = Fraction(qinfon.sar_num, qinfon.sar_den)
+ ## Samplerate, 0 if not audio
+ self.sample_rate = qinfon.sample_rate
+ ## Number of channels, 0 if not audio
+ self.nb_channels = qinfon.nb_channels
+ ## set to true if quality is disabled (no playback support)
+ self.disabled = qinfon.disabled
+ ## set to true if quality is selected
+ self.is_selected = qinfon.is_selected
+ ## AST offset for DASH low latency mode, 0 otherwise
+ self.ast_offset = qinfon.ast_offset
+ ## Average segment duration in seconds, 0 if unknown
+ self.avg_duration = qinfon.avg_duration
+ ## list of segment sizes for VoD cases, None otherwise or if unknown
+ self.sizes = None
+ ## \cond priv
+ if qinfon.sizes == None:
+ return
+ count = _libgpac.gf_list_count(qinfon.sizes)
+ self.sizes = []
+ for i in range(count):
+ surl = cast(_libgpac.gf_list_get(qinfon.sizes, i), POINTER(DASHSegURL)).contents
+ self.sizes.append( surl.media_range.contents.end - surl.media_range.contents.start + 1)
+ ## \endcond priv
+
+##DASH Spatial Relation Descriptor object, used for tiling
+class DASHSRD:
+ ## \cond priv
+ def __init__(self, id, x, y, w, h, fw, fh):
+ ## \endcond
+ ## ID of SRD source - all SRD with same source describe the same video composition, possibly with different grid sizes
+ self.id = id
+ ## X coordinate of SRD for this tile
+ self.x = x
+ ## Y coordinate of SRD for this tile
+ self.y = y
+ ## width of SRD for this tile - 0 for tile base track
+ self.w = w
+ ## height of SRD for this tile - 0 for tile base track
+ self.h = h
+ ## total width of SRD descriptor for this tile
+ self.fw = fw
+ ## total height of SRD descriptor for this tile
+ self.fh = fh
+
+##\cond priv
+def make_srd(dashptr, groupidx):
+ srd_id=c_uint(0)
+ srd_x=c_uint(0)
+ srd_y=c_uint(0)
+ srd_w=c_uint(0)
+ srd_h=c_uint(0)
+ srd_fw=c_uint(0)
+ srd_fh=c_uint(0)
+ _libgpac.gf_dash_group_get_srd_info(dashptr, groupidx, byref(srd_id), byref(srd_x), byref(srd_y), byref(srd_w), byref(srd_h), byref(srd_fw), byref(srd_fh) )
+ if not srd_fw.value or not srd_fh.value:
+ return None
+ return DASHSRD(srd_id.value, srd_x.value, srd_y.value, srd_w.value, srd_h.value, srd_fw.value, srd_fh.value)
+
+##\endcond
+
+## DASH group object
+class DASHGroup:
+ ## \cond priv
+ def __init__(self, ptr_dash, groupidx):
+ ## \endcond
+ ## Index of group, as used in callbacks
+ self.idx = groupidx
+ ## List of DASHQualityInfo for group
+ self.qualities = []
+ ## period duration in milliseconds, 0 if unknwon
+ self.duration = _libgpac.gf_dash_get_period_duration(ptr_dash)
+ ## SRD object or None if no SRD defined
+ self.SRD = make_srd(ptr_dash, groupidx)
+ ## \cond priv
+ self._dash = ptr_dash
+ nb_qualities = _libgpac.gf_dash_group_get_num_qualities(ptr_dash, groupidx)
+ for i in range(nb_qualities):
+ qinfo = DASHQualityInfoNat()
+ _libgpac.gf_dash_group_get_quality_info(ptr_dash, groupidx, i, byref(qinfo))
+
+ self.qualities.append( DASHQualityInfo(qinfo) )
+ ## \endcond
+
+## DASH groups statistics object
+class DASHGroupStatistics(Structure):
+ ## \cond priv
+ def __init__(self):
+ ## \endcond
+ ##download rate of last segment in bits per second, divided by current playback speed
+ self.download_rate = 0
+ ##size of last segment in bytes
+ self.filesize = 0
+ ##current playback speed
+ self.speed = 0
+ ##max playback speed based on associated codec runtime statistics
+ self.max_available_speed = 0
+ ##display width in pixels of object
+ self.display_width = 0
+ ##display height in pixels of object
+ self.display_height = 0
+ ##index of current quality
+ self.active_quality_idx = 0
+ ##minimum buffer in milliseconds, below witch rebuffer occurs
+ self.buffer_min = 0
+ ##maximum buffer in milliseconds, algorithm should not fill more than this
+ self.buffer_max = 0
+ ##current buffer in milliseconds
+ self.buffer = 0
+ ##degradation hint, 0 means no degradation, 100 means tile completely hidden
+ self.quality_degradation_hint = 0
+ ##cumulated download rate of all active groups - 0 means all files are local
+ self.total_rate = 0
+
+ ## \cond private
+ _fields_ = [
+ ("download_rate", c_uint),
+ ("filesize", c_uint),
+ ("speed", c_double),
+ ("max_available_speed", c_double),
+ ("display_width", c_uint),
+ ("display_height", c_uint),
+ ("active_quality_idx", c_uint),
+ ("buffer_min", c_uint),
+ ("buffer_max", c_uint),
+ ("buffer", c_uint),
+ ("degradation_hint", c_uint),
+ ("total_rate", c_uint)
+ ]
+ def __str__(self):
+ res = 'active_quality_idx ' + str(self.active_quality_idx)
+ res += ' rate ' + str(self.download_rate) + ' speed ' + str(self.speed) + ' max_speed ' + str(self.max_available_speed)
+ res += ' display_width ' + str(self.display_width) + ' display_height ' + str(self.display_height)
+ res += ' buffer_min ' + str(self.buffer_min) + ' buffer_max ' + str(self.buffer_max) + ' buffer ' + str(self.buffer)
+ return res
+ ## \endcond
+
+## DASH group current segment download statistics object
+class DASHGroupDownloadStatistics(Structure):
+ ## \cond priv
+ def __init__(self):
+ ## \endcond
+ ##download rate of last segment in bits per second
+ self.bits_per_sec = 0
+ ##total number of bytes in segment
+ self.total_bytes = 0
+ ##number of downloaded bytes from segment (starting from first byte)
+ self.bytes_done = 0
+ ##number of microseconds elapsed since segment was scheduled for download
+ self.time_since_start = 0
+ ##current buffer length in milliseconds
+ self.buffer_dur = 0
+ ##duration of segment being downloaded, in milliseconds - 0 if unknown
+ self.current_seg_dur = 0
+
+ ## \cond private
+ _fields_ = [
+ ("bits_per_sec", c_uint),
+ ("total_bytes", c_ulonglong),
+ ("bytes_done", c_ulonglong),
+ ("time_since_start", c_ulonglong),
+ ("buffer_dur", c_uint),
+ ("current_seg_dur", c_uint),
+ ]
+
+ def __str__(self):
+ res = 'bits_per_sec ' + str(self.bits_per_sec)
+ res += ' - total_bytes ' + str(self.total_bytes) + ' bytes_done ' + str(self.bytes_done)
+ res += ' - time_since_start ' + str(self.time_since_start) + ' us - buffer_dur ' + str(self.buffer_dur) + ' ms - current_seg_dur ' + str(self.current_seg_dur) + ' ms'
+ return res
+ ## \endcond
+
+
+
+## DASH custom algo
+# Upon successful binding to the dashin filter, the object will be assigned a list member called `groups`, containing the declared group for the active period
+class DASHCustomAlgorithm:
+
+ ##Callback (optional) called upon a period reset.
+ #\param reset_type indicate the type of period reset. Values can be:
+ # - 0: end of period (groups are no longer valid)
+ # - 1: start of a static period
+ # - 2: start of a dynamic (live) period
+ #\return 
+ def on_period_reset(self, reset_type):
+ pass
+
+ ##Callback (optional) called when a new group (adaptation set) is created
+ #\param group the newly created \ref DASHGroup
+ #\return 
+ def on_new_group(self, group):
+ pass
+
+
+ ##Callback (mandatory) called at the end of the segment download to perform rate adaptation
+ #\param group the \ref DASHGroup on which to perform adaptation
+ #\param base_group the associated base \ref DASHGroup (tiling only), or None if no base group
+ #\param force_low_complexity indicates that the client would like a lower complexity (typically because it is dropping frames)
+ #\param stats the \ref DASHGroupStatistics for the downloaded segment
+ #\return value can be:
+ # - new quality index,
+ # - -1 to take no decision
+ # - -2 to disable quality (debug, will drop segment)
+ # - other negative values are handled as error
+ def on_rate_adaptation(self, group, base_group, force_low_complexity, stats):
+ pass
+
+ ##Callback (optional) called on regular basis during a segment download
+ #\param group the \ref DASHGroup associated with the current download
+ #\param stats the \ref DASHGroupDownloadStatistics for the download
+ #\return value can be:
+ # - `-1` to continue download
+ # - `-2` to abort download but without retrying to downloading the same segment at lower quality
+ # - the index of the new quality to download for the same segment index (same time)
+ def on_download_monitor(self, group, stats):
+ pass
+
+## @}
+
+
+## \cond priv
+
+
+@CFUNCTYPE(c_int, c_void_p, c_uint, c_void_p)
+def dash_group_new(cbk, groupidx, _dashobj):
+ obj = cast(cbk, py_object).value
+ if not hasattr(obj, 'on_new_group'):
+ return 0
+ new_group = DASHGroup(_dashobj, groupidx)
+ obj.groups.append(new_group)
+ obj.on_new_group(new_group)
+ return 0
+
+
+
+@CFUNCTYPE(c_int, c_void_p, c_uint, c_uint, gf_bool, POINTER(DASHGroupStatistics))
+def dash_rate_adaptation(cbk, groupidx, base_groupidx, force_low_complex, stats):
+ obj = cast(cbk, py_object).value
+ group = None
+ base_group = None
+ for i in range(len(obj.groups)):
+ if obj.groups[i].idx==groupidx:
+ group = obj.groups[i]
+ if obj.groups[i].idx==base_groupidx:
+ base_group = obj.groups[i]
+
+ return obj.on_rate_adaptation(group, base_group, force_low_complex, stats.contents)
+
+
+@CFUNCTYPE(c_int, c_void_p, c_uint, POINTER(DASHGroupDownloadStatistics))
+def dash_download_monitor(cbk, groupidx, stats):
+ obj = cast(cbk, py_object).value
+ group = None
+ for i in range(len(obj.groups)):
+ if obj.groups[i].idx==groupidx:
+ group = obj.groups[i]
+ break
+
+ return obj.on_download_monitor(group, stats.contents)
+
+
+def _prop_to_python(pname, prop):
+ type = prop.type
+
+ if type==GF_PROP_SINT:
+ return prop.value.sint
+ if type==GF_PROP_UINT:
+ if pname=="StreamType":
+ return _libgpac.gf_stream_type_name(prop.value.uint).decode('utf-8')
+ if pname=="PixelFormat":
+ return _libgpac.gf_pixel_fmt_sname(prop.value.uint).decode('utf-8')
+ if pname=="CodecID":
+ cid = _libgpac.gf_codecid_file_ext(prop.value.uint).decode('utf-8')
+ names=cid.split('|')
+ return names[0]
+ return prop.value.uint
+
+ if _libgpac.gf_props_type_is_enum(type):
+ pname = _libgpac.gf_props_enum_name(type, prop.value.uint)
+ return pname.decode('utf-8')
+
+ if type==GF_PROP_4CC:
+ return _libgpac.gf_4cc_to_str(prop.value.uint).decode('utf-8')
+ if type==GF_PROP_LSINT:
+ return prop.value.longsint
+ if type==GF_PROP_LUINT:
+ return prop.value.longuint
+ if type==GF_PROP_BOOL:
+ return prop.value.boolean
+ if type==GF_PROP_FRACTION:
+ return prop.value.frac
+ if type==GF_PROP_FRACTION64:
+ return prop.value.lfrac
+ if type==GF_PROP_FLOAT:
+ return prop.value.fnumber
+ if type==GF_PROP_DOUBLE:
+ return prop.value.number
+ if type==GF_PROP_VEC2I:
+ return prop.value.vec2i
+ if type==GF_PROP_VEC2:
+ return prop.value.vec2
+ if type==GF_PROP_VEC3I:
+ return prop.value.vec3i
+ if type==GF_PROP_VEC4I:
+ return prop.value.vec4i
+ if type==GF_PROP_STRING or type==GF_PROP_STRING_NO_COPY or type==GF_PROP_NAME:
+ return prop.value.string.decode('utf-8')
+ if type==GF_PROP_DATA or type==GF_PROP_DATA_NO_COPY or type==GF_PROP_CONST_DATA:
+ return prop.value.data
+ if type==GF_PROP_POINTER:
+ return prop.value.ptr
+ if type==GF_PROP_STRING_LIST:
+ res = []
+ for i in range(prop.value.string_list.nb_items):
+ val = prop.value.string_list.vals[i].decode('utf-8')
+ res.append(val)
+ return res
+ if type==GF_PROP_UINT_LIST:
+ res = []
+ for i in range(prop.value.uint_list.nb_items):
+ val = prop.value.uint_list.vals[i]
+ res.append(val)
+ return res
+ if type==GF_PROP_4CC_LIST:
+ res = []
+ for i in range(prop.value.uint_list.nb_items):
+ val = _libgpac.gf_4cc_to_str(prop.value.uint).decode('utf-8')
+ res.append(val)
+ return res
+ if type==GF_PROP_SINT_LIST:
+ res = []
+ for i in range(prop.value.uint_list.nb_items):
+ val = prop.value.sint_list.vals[i]
+ res.append(val)
+ return res
+ if type==GF_PROP_VEC2I_LIST:
+ res = []
+ for i in range(prop.value.v2i_list.nb_items):
+ val = prop.value.v2i_list.vals[i]
+ res.append(val)
+ return res
+
+ raise Exception('Unknown property type ' + str(type))
+
+## \endcond
+
+
+## filter object
+class Filter:
+ ## \cond private
+ def __init__(self, session, filter):
+ self._filter = filter
+ self._session = session
+ ## \endcond
+ #hack for doxygen to generate member vars (not support for parsing @property)
+ if 0:
+ ##name of the filter, readonly - see \ref gf_filter_get_name
+ #\hideinitializer
+ self.name=0
+ ##ID of the filter, readonly - see \ref gf_filter_get_id
+ #\hideinitializer
+ self.ID=0
+ ##number of input pids for that filter, readonly - see \ref gf_filter_get_ipid_count
+ #\hideinitializer
+ self.nb_ipid=0
+ ##number of output pids for that filter, readonly - see \ref gf_filter_get_opid_count
+ #\hideinitializer
+ self.nb_opid=0
+
+
+ ## \cond private
+ def __str__(self):
+ return self.name
+ ## \endcond
+
+ ## remove this filter - see \ref gf_filter_remove
+ #\return
+ def remove(self):
+ _libgpac.gf_filter_remove(self._filter)
+
+ ## send option update to this filter - see \ref gf_fs_send_update
+ #\param name name of option (string)
+ #\param value value of option (string)
+ #\return
+ def update(self, name, value):
+ _libgpac.gf_fs_send_update(None, None, self._filter, name, value, 0)
+
+ ## set a given filter as source for this filter - see \ref gf_filter_set_source
+ #
+ #\note Setting a source will force the filter session linker to run in explicit linking mode.
+ #\param f source Filter
+ #\param link_args link options (string)
+ #\return
+ def set_source(self, f, link_args=None):
+ if f:
+ _libgpac.gf_filter_set_source(self._filter, f._filter, link_args)
+
+ ## set a given filter as restricted source for this filter - see \ref gf_filter_set_source_restricted
+ #\param f source Filter
+ #\param link_args link options (string)
+ #\return
+ def set_source_restricted(self, f, link_args=None):
+ if f:
+ _libgpac.gf_filter_set_source_restricted(self._filter, f._filter, link_args)
+
+
+ ## insert a given filter after this filter - see \ref gf_filter_set_source and \ref gf_filter_reconnect_output
+ #\param f Filter to insert
+ #\param link_args link options (string)
+ #\return
+ def insert(self, f, link_args=None):
+ if f:
+ _libgpac.gf_filter_set_source(f._filter, self._filter, link_args)
+ _libgpac.gf_filter_reconnect_output(f._filter)
+
+ ## \cond private
+ def _pid_prop_ex(self, prop_name, pid, IsInfo):
+ _name = prop_name.encode('utf-8')
+ p4cc = _libgpac.gf_props_get_id(_name)
+ if IsInfo:
+ pe = POINTER(_gf_property_entry)()
+ if p4cc:
+ prop = _libgpac.gf_filter_pid_get_info(pid, p4cc, byref(pe))
+ else:
+ prop = _libgpac.gf_filter_pid_get_info_str(pid, _name, byref(pe))
+ if prop:
+ res = _prop_to_python(prop_name, prop.contents)
+ _libgpac.gf_filter_release_property(pe)
+ return res
+ return None
+
+ if p4cc:
+ prop = _libgpac.gf_filter_pid_get_property(pid, p4cc)
+ else:
+ prop = _libgpac.gf_filter_pid_get_property_str(pid, _name)
+ if prop:
+ return _prop_to_python(prop_name, prop.contents)
+ return None
+
+ def _pid_prop(self, idx, prop_name, IsInput):
+ if IsInput:
+ pid = _libgpac.gf_filter_get_ipid(self._filter, idx)
+ else:
+ pid = _libgpac.gf_filter_get_opid(self._filter, idx)
+ if not pid:
+ raise Exception('No PID with index ' + str(idx) + ' in filter ' + self.name )
+ return self._pid_prop_ex(self, prop_name, pid, False)
+
+ def _pid_enum_props_ex(self, callback_obj, _pid):
+ if hasattr(callback_obj, 'on_prop_enum')==False:
+ raise Exception('No on_prop_enum function on callback')
+
+ pidx=c_uint(0)
+ while True:
+ _p4cc=c_uint(0)
+ _pname=c_char_p(0)
+ prop = _libgpac.gf_filter_pid_enum_properties(_pid, byref(pidx), byref(_p4cc), byref(_pname))
+ if prop:
+ p4cc=_p4cc.value
+ pname=None
+ if _pname:
+ pname=_pname.value.decode('utf-8')
+ else:
+ pname=_libgpac.gf_props_4cc_get_name(p4cc).decode('utf-8')
+ pval = _prop_to_python(pname, prop.contents)
+ callback_obj.on_prop_enum(pname, pval)
+ else:
+ break
+
+ def _pid_enum_props(self, idx, callback_obj, IsInput):
+ if IsInput:
+ pid = _libgpac.gf_filter_get_ipid(self._filter, idx)
+ else:
+ pid = _libgpac.gf_filter_get_opid(self._filter, idx)
+
+ if not pid:
+ raise Exception('No PID with index ' + str(idx) + ' in filter ' + self.name )
+
+ self._pid_enum_props_ex(callback_obj, pid)
+
+ ## \endcond 
+
+ ##get an input pid property by name
+ #\param idx index of input pid
+ #\param prop_name name of property
+ #\return property value or None if not found
+ def ipid_prop(self, idx, prop_name):
+ return self._pid_prop(idx, prop_name, True)
+ ##enumerate an input pid properties
+ #\param idx index of input pid
+ #\param callback_obj callback object to use, must have a 'on_prop_enum' method defined taking two parameters, prop_name(string) and propval(property value)
+ #\return
+ def ipid_enum_props(self, idx, callback_obj):
+ self._pid_enum_props(idx, callback_obj, True)
+ ##get an output pid property by name
+ #\param idx index of output pid
+ #\param prop_name name of property
+ #\return property value or None if not found
+ def opid_prop(self, idx, prop_name):
+ return self._pid_prop(idx, prop_name, False)
+ ##enumerate an output pid properties
+ #\param idx index of output pid
+ #\param callback_obj callback object to use, must have a 'on_prop_enum' method defined taking two parameters, prop_name(string) and propval(property value)
+ #\return
+ def opid_enum_props(self, idx, callback_obj):
+ self._pid_enum_props(idx, callback_obj, False)
+
+ ##gets the filter at the source of an input pid
+ #\param idx index of input PID
+ #\return Filter or None if error
+ def ipid_source(self, idx):
+ pid = _libgpac.gf_filter_get_ipid(self._filter, idx)
+ if not pid:
+ raise Exception('No PID with index ' + str(idx) + ' in filter ' + self.name )
+ f = _libgpac.gf_filter_pid_get_source_filter(pid)
+ if not f:
+ return None
+ return self._session._to_filter(f)
+
+ ##gets the list of destination filters of an output pid
+ #\param idx index of output PID
+ #\return list of Filter
+ def opid_sinks(self, idx):
+ pid = _libgpac.gf_filter_get_opid(self._filter, idx)
+ if not pid:
+ raise Exception('No PID with index ' + str(idx) + ' in filter ' + self.name )
+ res=[]
+ f_idx=0
+ while True:
+ f = _libgpac.gf_filter_pid_enum_destinations(pid, f_idx)
+ f_idx+=1 
+ if f==None:
+ break
+ filter = self._session._to_filter(f)
+ res.append(filter)
+ return res
+
+ ##gets all defined options / arguments for a filter
+ #\return list of FilterArg
+ def all_args(self):
+ res=[]
+ a_idx=0
+ while True:
+ arg = _libgpac.gf_filter_enumerate_args(self._filter, a_idx)
+ if arg:
+ arg_val = arg.contents
+ res.append(arg_val)
+ else:
+ break
+ a_idx+=1
+ return res
+
+ ##gets a property info on a filter - see \ref gf_filter_get_info and \ref gf_filter_get_info_str
+ #\param prop_name property to query
+ #\return property value or None if not found
+ def get_info(self, prop_name):
+ _name = prop_name.encode('utf-8')
+ p4cc = _libgpac.gf_props_get_id(_name)
+ pe = POINTER(_gf_property_entry)()
+ if p4cc:
+ prop = _libgpac.gf_filter_get_info(self._filter, p4cc, byref(pe))
+ else:
+ prop = _libgpac.gf_filter_get_info_str(self._filter, _name, byref(pe))
+ if prop:
+ res = _prop_to_python(prop_name, prop.contents)
+ _libgpac.gf_filter_release_property(pe)
+ return res
+ return None
+
+ ##Gets the statistics of a filter - see \ref gf_filter_get_stats
+ #\return FilterStats object
+ def get_statistics(self):
+ stats = FilterStats()
+ err = _libgpac.gf_filter_get_stats(self._filter, byref(stats))
+ if err<0: 
+ raise Exception('Failed to fetch filter stats: ' + e2s(err))
+ return stats
+
+ ##enforces sourceID to be present for output pids of this filter - see \ref gf_filter_require_source_id
+ #\return
+ def require_source_id(self):
+ err = _libgpac.gf_filter_require_source_id(self._filter)
+ if err<0:
+ raise Exception('Failed to require sourceID for filter: ' + e2s(err))
+ return
+
+ ##\cond private
+ def _bind_dash_algo(self, object):
+ if not hasattr(object, 'on_rate_adaptation'):
+ raise Exception('Missing on_rate_adaptation member function on object, cannot bind')
+ object.groups = []
+ if hasattr(object, 'on_download_monitor'):
+ err = _libgpac.gf_filter_bind_dash_algo_callbacks(self._filter, py_object(object), dash_period_reset, dash_group_new, dash_rate_adaptation, dash_download_monitor)
+ else:
+ err = _libgpac.gf_filter_bind_dash_algo_callbacks(self._filter, py_object(object), dash_period_reset, dash_group_new, dash_rate_adaptation, None)
+ if err<0: 
+ raise Exception('Failed to bind dash algo: ' + e2s(err))
+ return 0
+ ##\endcond private
+
+
+ ## \brief binds a given object to the filter
+ #
+ #Binds the given object to the underlying filter for callbacks override - only supported by DASH demuxer for the current time
+ #
+ #For DASH, the object must derive from or implement the methods of the \ref DASHCustomAlgorithm class:
+ #
+ #\param object object to bind
+ #\return
+ def bind(self, object):
+ if self.name=="dashin":
+ return self._bind_dash_algo(object)
+ raise Exception('No possible binding to filter class ' + self.name)
+
+ ##\cond private: until end, properties
+
+ @property
+ def name(self):
+ return _libgpac.gf_filter_get_name(self._filter).decode('utf-8')
+
+ @property
+ def ID(self):
+ return _libgpac.gf_filter_get_id(self._filter).decode('utf-8')
+
+ @property
+ def nb_ipid(self):
+ return _libgpac.gf_filter_get_ipid_count(self._filter)
+
+ @property
+ def nb_opid(self):
+ return _libgpac.gf_filter_get_opid_count(self._filter)
+
+ ##\endcond 
+
+
+
+##\cond private
+
+#
+# custom filter bindings
+#
+
+_libgpac.gf_filter_push_caps.argtypes = [_gf_filter, c_uint, POINTER(PropertyValue), c_char_p, c_uint, c_uint]
+_libgpac.gf_props_4cc_get_type.argtypes = [c_uint]
+_libgpac.gf_stream_type_by_name.argtypes = [c_char_p]
+_libgpac.gf_stream_type_by_name.restype = c_uint
+
+_libgpac.gf_codecid_parse.argtypes = [c_char_p]
+_libgpac.gf_codecid_parse.restype = c_uint
+
+_libgpac.gf_pixel_fmt_parse.argtypes = [c_char_p]
+_libgpac.gf_pixel_fmt_parse.restype = c_uint
+
+_libgpac.gf_audio_fmt_parse.argtypes = [c_char_p]
+_libgpac.gf_audio_fmt_parse.restype = c_uint
+
+_libgpac.gf_cicp_color_primaries_name.argtypes = [c_uint]
+_libgpac.gf_cicp_color_primaries_name.restype = c_char_p
+_libgpac.gf_cicp_color_transfer_name.argtypes = [c_uint]
+_libgpac.gf_cicp_color_transfer_name.restype = c_char_p
+_libgpac.gf_cicp_color_matrix_name.argtypes = [c_uint]
+_libgpac.gf_cicp_color_matrix_name.restype = c_char_p
+
+_libgpac.gf_cicp_parse_color_primaries.argtypes = [c_char_p]
+_libgpac.gf_cicp_parse_color_primaries.restype = c_uint
+_libgpac.gf_cicp_parse_color_transfer.argtypes = [c_char_p]
+_libgpac.gf_cicp_parse_color_transfer.restype = c_uint
+_libgpac.gf_cicp_parse_color_matrix.argtypes = [c_char_p]
+_libgpac.gf_cicp_parse_color_matrix.restype = c_uint
+
+
+
+def _make_prop(prop4cc, propname, prop, custom_type=0):
+ prop_val = PropertyValue()
+ if prop4cc==0:
+ if not custom_type:
+ prop_val.type = GF_PROP_STRING
+ prop_val.value.string = str(prop).encode('utf-8')
+ return prop_val
+ type = custom_type
+ else:
+ type = _libgpac.gf_props_4cc_get_type(prop4cc)
+
+ prop_val.type = type
+ if propname=="StreamType":
+ prop_val.value.uint = _libgpac.gf_stream_type_by_name(prop.encode('utf-8'))
+ return prop_val
+ elif propname=="CodecID":
+ prop_val.value.uint = _libgpac.gf_codecid_parse(prop.encode('utf-8'))
+ return prop_val
+
+ if type==GF_PROP_SINT:
+ prop_val.value.sint = prop
+ elif type==GF_PROP_UINT:
+ prop_val.value.uint = prop
+ elif type==GF_PROP_4CC:
+ prop_val.value.uint = _libgpac.gf_4cc_parse(prop.encode('utf-8'))
+ elif type==GF_PROP_LSINT:
+ prop_val.value.longsint = prop
+ elif type==GF_PROP_LUINT:
+ prop_val.value.longuint = prop
+ elif type==GF_PROP_BOOL:
+ prop_val.value.boolean = prop
+ elif type==GF_PROP_FRACTION:
+ if hasattr(prop, 'den') and hasattr(prop, 'num'):
+ prop_val.value.frac.num = prop.num
+ prop_val.value.frac.den = prop.den
+ elif is_integer(prop):
+ prop_val.value.frac.num = prop
+ prop_val.value.frac.den = 1
+ else:
+ prop_val.value.frac.num = 1000*prop
+ prop_val.value.frac.den = 1000
+ elif type==GF_PROP_FRACTION64:
+ if hasattr(prop, 'den') and hasattr(prop, 'num'):
+ prop_val.value.lfrac.num = prop.num
+ prop_val.value.lfrac.den = prop.den
+ elif is_integer(prop):
+ prop_val.value.lfrac.num = prop
+ prop_val.value.lfrac.den = 1
+ else:
+ prop_val.value.lfrac.num = 1000000*prop
+ prop_val.value.lfrac.den = 1000000
+ elif type==GF_PROP_FLOAT:
+ prop_val.value.fnumber = prop
+ elif type==GF_PROP_DOUBLE:
+ prop_val.value.number = prop
+ elif type==GF_PROP_VEC2I:
+ if hasattr(prop, 'x') and hasattr(prop, 'y'):
+ prop_val.value.vec2i.x = prop.x
+ prop_val.value.vec2i.y = prop.y
+ else:
+ raise Exception('Invalid property value for vec2i: ' + str(prop))
+ elif type==GF_PROP_VEC2:
+ if hasattr(prop, 'x') and hasattr(prop, 'y'):
+ prop_val.value.vec2.x = prop.x
+ prop_val.value.vec2.y = prop.y
+ else:
+ raise Exception('Invalid property value for vec2: ' + str(prop))
+ elif type==GF_PROP_VEC3I:
+ if hasattr(prop, 'x') and hasattr(prop, 'y') and hasattr(prop, 'z'):
+ prop_val.value.vec3i.x = prop.x
+ prop_val.value.vec3i.y = prop.y
+ prop_val.value.vec3i.z = prop.z
+ else:
+ raise Exception('Invalid property value for vec3i: ' + str(prop))
+ elif type==GF_PROP_VEC4I:
+ if hasattr(prop, 'x') and hasattr(prop, 'y') and hasattr(prop, 'z') and hasattr(prop, 'w'):
+ prop_val.value.vec4i.x = prop.x
+ prop_val.value.vec4i.y = prop.y
+ prop_val.value.vec4i.z = prop.z
+ prop_val.value.vec4i.w = prop.w
+ else:
+ raise Exception('Invalid property value for vec4i: ' + str(prop))
+ elif type==GF_PROP_STRING or type==GF_PROP_STRING_NO_COPY or type==GF_PROP_NAME:
+ prop_val.value.string = str(prop).encode('utf-8')
+ elif type==GF_PROP_DATA or type==GF_PROP_DATA_NO_COPY or type==GF_PROP_CONST_DATA:
+ raise Exception('Setting data property from python not yet implemented !')
+ elif type==GF_PROP_POINTER:
+ raise Exception('Setting pointer property from python not yet implemented !')
+ elif type==GF_PROP_STRING_LIST:
+ if isinstance(prop, list)==False:
+ raise Exception('Property is not a list')
+ prop_val.value.string_list.nb_items = len(prop)
+ prop_val.value.string_list.vals = (ctypes.c_char_p * len(prop))
+ i=0
+ for str in list:
+ prop_val.value.string_list.vals[i] = str.encode('utf-8')
+ i+=1
+ elif type==GF_PROP_UINT_LIST:
+ if isinstance(prop, list)==False:
+ raise Exception('Property is not a list')
+ prop_val.value.uint_list.nb_items = len(prop)
+ prop_val.value.uint_list.vals = (ctypes.c_uint * len(prop))(*prop)
+ elif type==GF_PROP_4CC_LIST:
+ if isinstance(prop, list)==False:
+ raise Exception('Property is not a list')
+ prop_val.value.uint_list.nb_items = len(prop)
+ prop_val.value.uint_list.vals = (ctypes.c_uint * len(prop))
+ i=0
+ for str in list:
+ prop_val.value.uint_list.vals[i] = _libgpac.gf_4cc_parse( str.encode('utf-8') )
+ i+=1
+ elif type==GF_PROP_SINT_LIST:
+ if isinstance(prop, list)==False:
+ raise Exception('Property is not a list')
+ prop_val.value.sint_list.nb_items = len(prop)
+ prop_val.value.sint_list.vals = (ctypes.c_int * len(prop))(*prop)
+ elif type==GF_PROP_VEC2I_LIST:
+ if isinstance(prop, list)==False:
+ raise Exception('Property is not a list')
+ prop_val.value.sint_list.nb_items = len(prop)
+ prop_val.value.v2i_list.vals = (GF_PropVec2i * len(prop))
+ for i in range (len(prop)):
+ prop_val.value.v2i_list.vals[i].x = prop[i].x
+ prop_val.value.v2i_list.vals[i].y = prop[i].y
+
+ elif _libgpac.gf_props_type_is_enum(type):
+ prop_val.value.uint = _libgpac.gf_props_parse_enum(type, prop.encode('utf-8'))
+ return prop_val
+ else:
+ raise Exception('Unsupported property type ' + str(type) )
+
+ return prop_val
+
+
+_libgpac.gf_filter_set_rt_udta.argtypes = [_gf_filter, py_object]
+_libgpac.gf_filter_get_rt_udta.argtypes = [_gf_filter]
+_libgpac.gf_filter_get_rt_udta.restype = c_void_p
+
+_libgpac.gf_filter_pid_set_udta.argtypes = [_gf_filter, py_object]
+_libgpac.gf_filter_pid_get_udta.argtypes = [_gf_filter]
+_libgpac.gf_filter_pid_get_udta.restype = c_void_p
+
+_libgpac.gf_filter_pid_send_event.argtypes = [_gf_filter_pid, POINTER(FilterEvent)]
+
+
+_libgpac.gf_filter_set_configure_ckb.argtypes = [_gf_filter, c_void_p]
+@CFUNCTYPE(c_int, _gf_filter, _gf_filter_pid, gf_bool)
+def filter_cbk_configure(_f, _pid, is_remove):
+ obj = _libgpac.gf_filter_get_rt_udta(_f)
+ filter = cast(obj, py_object).value
+ obj = _libgpac.gf_filter_pid_get_udta(_pid)
+ if obj:
+ pid_obj = cast(obj, py_object).value
+ else:
+ pid_obj=None
+
+ first=True
+ if pid_obj:
+ first=False
+ else:
+ pid_obj = FilterPid(filter, _pid, True)
+ _libgpac.gf_filter_pid_set_udta(_pid, py_object(pid_obj))
+ res = filter.configure_pid(pid_obj, is_remove)
+
+ if is_remove:
+ _libgpac.gf_filter_pid_set_udta(_pid, None)
+ filter.ipids.remove(pid_obj)
+ return
+
+ if first:
+ filter.ipids.append(pid_obj)
+
+ return res
+
+
+_libgpac.gf_filter_set_process_ckb.argtypes = [_gf_filter, c_void_p]
+@CFUNCTYPE(c_int, _gf_filter)
+def filter_cbk_process(_f):
+ obj = _libgpac.gf_filter_get_rt_udta(_f)
+ filter = cast(obj, py_object).value
+ return filter.process()
+
+_libgpac.gf_filter_set_process_event_ckb.argtypes = [_gf_filter, c_void_p]
+@CFUNCTYPE(c_int, _gf_filter, POINTER(FilterEvent) )
+def filter_cbk_process_event(_f, _evt):
+ obj = _libgpac.gf_filter_get_rt_udta(_f)
+ filter = cast(obj, py_object).value
+ res = filter.process_event(_evt.contents)
+ if res:
+ return 1
+ return 0
+
+_libgpac.gf_filter_set_probe_data_cbk.argtypes = [_gf_filter, c_void_p]
+@CFUNCTYPE(c_int, POINTER(c_ubyte), c_uint, POINTER(c_uint) )
+def filter_cbk_probe_data(_data, _size, _probe):
+ obj = _libgpac.gf_filter_get_rt_udta(_f)
+ filter = cast(obj, py_object).value
+ if numpy_support:
+ ar_data = np.ctypeslib.as_array(_data, (_size,))
+ ar_data.flags.writeable=False
+ res = filter.probe_data(ar_data, _size)
+ else:
+ res = filter.probe_data(_data, _size)
+ if res==None:
+ _probe.contents=0
+ return None
+ _probe.contents=2 #GF_FPROBE_MAYBE_SUPPORTED
+ return res.encode('utf-8')
+
+
+_libgpac.gf_filter_set_reconfigure_output_ckb.argtypes = [_gf_filter, c_void_p]
+@CFUNCTYPE(c_int, _gf_filter, _gf_filter_pid )
+def filter_cbk_reconfigure_output(_f, _pid):
+ obj = _libgpac.gf_filter_get_rt_udta(_f)
+ filter = cast(obj, py_object).value
+ obj = _libgpac.gf_filter_pid_get_udta(_pid)
+ if obj:
+ pid_obj = cast(obj, py_object).value
+ else:
+ pid_obj=None
+ if pid_obj:
+ return filter.reconfigure_output(_f)
+ raise Exception('Reconfigure on unknown output pid !')
+
+
+_libgpac.gf_filter_pid_get_packet.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_get_packet.restype = _gf_filter_packet
+
+_libgpac.gf_filter_pid_drop_packet.argtypes = [_gf_filter_pid]
+
+_libgpac.gf_filter_pid_new.argtypes = [_gf_filter]
+_libgpac.gf_filter_pid_new.restype = _gf_filter_pid
+
+_libgpac.gf_filter_update_status.argtypes = [_gf_filter, c_uint, c_char_p]
+
+_libgpac.gf_filter_ask_rt_reschedule.argtypes = [_gf_filter]
+_libgpac.gf_filter_post_process_task.argtypes = [_gf_filter]
+
+
+_libgpac.gf_filter_ask_rt_reschedule.argtypes = [_gf_filter, c_int, gf_bool]
+_libgpac.gf_filter_setup_failure.argtypes = [_gf_filter, c_int]
+_libgpac.gf_filter_make_sticky.argtypes = [_gf_filter]
+_libgpac.gf_filter_prevent_blocking.argtypes = [_gf_filter, gf_bool]
+_libgpac.gf_filter_block_eos.argtypes = [_gf_filter, gf_bool]
+_libgpac.gf_filter_set_max_extra_input_pids.argtypes = [_gf_filter, c_uint]
+_libgpac.gf_filter_block_enabled.argtypes = [_gf_filter]
+_libgpac.gf_filter_block_enabled.restype = gf_bool
+_libgpac.gf_filter_get_output_buffer_max.argtypes = [_gf_filter, POINTER(c_uint), POINTER(c_uint)]
+_libgpac.gf_filter_all_sinks_done.argtypes = [_gf_filter]
+_libgpac.gf_filter_all_sinks_done.restype = gf_bool
+_libgpac.gf_filter_get_num_events_queued.argtypes = [_gf_filter]
+
+_libgpac.gf_filter_get_clock_hint.argtypes = [_gf_filter, POINTER(c_ulonglong), POINTER(Fraction64)]
+_libgpac.gf_filter_connections_pending.argtypes = [_gf_filter]
+_libgpac.gf_filter_connections_pending.restype = gf_bool
+_libgpac.gf_filter_hint_single_clock.argtypes = [_gf_filter, c_ulonglong, Fraction64]
+
+GF_FS_REG_MAIN_THREAD=1<<1
+
+##\endcond
+
+## Base class used to create custom filters in python
+class FilterCustom(Filter):
+
+ ##constructor, see \ref gf_fs_new_filter
+ #\param session FilterSession object
+ #\param fname name of the filter
+ #\param flags flags for the filter
+ def __init__(self, session, fname="Custom", flags=0):
+ errp = c_int(0)
+ _filter = _libgpac.gf_fs_new_filter(session._sess, fname.encode('utf-8'), flags | GF_FS_REG_MAIN_THREAD, byref(errp))
+ err = errp.value
+ if err<0: 
+ raise Exception('Failed to create filter ' + URL + ': ' + e2s(err))
+ #create base class
+ Filter.__init__(self, session, _filter)
+ #register with our filter bank
+ session._filters.append(self)
+
+ #setup callback udta and callback functions
+ _libgpac.gf_filter_set_rt_udta(_filter, py_object(self) )
+ if hasattr(self, 'configure_pid'):
+ _libgpac.gf_filter_set_configure_ckb(self._filter, filter_cbk_configure)
+
+ if hasattr(self, 'process'):
+ _libgpac.gf_filter_set_process_ckb(self._filter, filter_cbk_process)
+
+ if hasattr(self, 'process_event'):
+ _libgpac.gf_filter_set_process_event_ckb(self._filter, filter_cbk_process_event)
+
+ if hasattr(self, 'probe_data'):
+ _libgpac.gf_filter_set_probe_data_ckb(self._filter, filter_cbk_probe_data)
+
+ if hasattr(self, 'reconfigure_output'):
+ _libgpac.gf_filter_set_reconfigure_output_ckb(self._filter, filter_cbk_reconfigure_output)
+
+ ##List of input FilterPid
+ self.ipids=[]
+ ##List of output FilterPid
+ self.opids=[]
+
+ #hack for doxygen to generate member vars (not support for parsing @property)
+ if 0:
+ ##filter blocking is enabled, readonly - see \ref gf_filter_block_enabled
+ #\hideinitializer
+ self.block_enabled=0
+ ##maximum output buffer time, readonly - see \ref gf_filter_get_output_buffer_max
+ #\hideinitializer
+ self.output_buffer=0
+ ##maximum plyaout buffer time, readonly - see \ref gf_filter_get_output_buffer_max
+ #\hideinitializer
+ self.playout_buffer=0
+ ##all sinks are done for this filter, readonly - see \ref gf_filter_all_sinks_done
+ #\hideinitializer
+ self.sinks_done=0
+ ##number of queued events on the filter, readonly - see \ref gf_filter_get_num_events_queued
+ #\hideinitializer
+ self.nb_evts_queued=0
+ ##clock hint value in microseconds, readonly - see \ref gf_filter_get_clock_hint
+ #\hideinitializer
+ self.clock_hint_time=0
+ ##clock hint media time as Fraction64, readonly - see \ref gf_filter_get_clock_hint
+ #\hideinitializer
+ self.clock_hint_mediatime=0
+ ##boolean indicating connections are pending on the filter, readonly - see \ref gf_filter_connections_pending
+ #\hideinitializer
+ self.connections_pending=0
+
+
+
+ ##push a capability in the current capability bundle - see \ref gf_filter_push_caps
+ #\param pcode capability name (property type)
+ #\param prop capability value
+ #\param flag capability flags (input, output, etc)
+ #\param priority capability priority
+ #\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+ #\return
+ def push_cap(self, pcode, prop, flag, priority=0, custom_type=0):
+ prop_4cc = pcode
+ prop_name = None
+ if isinstance(pcode, str):
+ _pname = pcode.encode('utf-8')
+ prop_4cc = _libgpac.gf_props_get_id(_pname)
+ if prop_4cc==0:
+ prop_name = _pname
+
+ prop_val = _make_prop(prop_4cc, pcode, prop, custom_type)
+ err = _libgpac.gf_filter_push_caps(self._filter, prop_4cc, byref(prop_val), prop_name, flag, priority)
+ if err<0: 
+ raise Exception('Failed to push cap: ' + e2s(err))
+
+ ##create a new output pid for this filter - see \ref gf_filter_pid_new
+ #\return FilterPid object
+ def new_pid(self):
+ _pid = _libgpac.gf_filter_pid_new(self._filter)
+ if _pid:
+ pid_obj = FilterPid(self, _pid, False)
+ _libgpac.gf_filter_pid_set_udta(_pid, py_object(pid_obj))
+ self.opids.append(pid_obj)
+ pid_obj.pck_refs = []
+ return pid_obj
+ raise Exception('Failed to create output pid')
+
+ ##update filter status - see \ref gf_filter_update_status
+ #\param status status string
+ #\param percent progress in per 10000, int
+ #\return
+ def update_status(self, status, percent):
+ _libgpac.gf_filter_update_status(self._filter, percent, status.encode('utf-8'))
+
+ ##reschedule the filter after a given delay - see \ref gf_filter_ask_rt_reschedule and \ref gf_filter_post_process_task
+ #\param when delay in microseconds
+ #\return
+ def reschedule(self, when=0):
+ if when:
+ _libgpac.gf_filter_ask_rt_reschedule(self._filter, when)
+ else:
+ _libgpac.gf_filter_post_process_task(self._filter)
+
+ ##notify an internal failure of the filter has happend - see \ref gf_filter_notification_failure and \ref gf_filter_setup_failure
+ #\param err the failure reason (gpac error code, int)
+ #\param error_type the failure notification type
+ #\return
+ def notify_failure(self, err, error_type=GF_SETUP_ERROR):
+ if error_type==GF_NOTIF_ERROR:
+ _libgpac.gf_filter_notification_failure(self._filter, err, False)
+ elif error_type==GF_NOTIF_ERROR_AND_DISCONNECT:
+ _libgpac.gf_filter_notification_failure(self._filter, err, True)
+ else:
+ _libgpac.gf_filter_setup_failure(self._filter, err)
+
+ ##make the filter sticky - see \ref gf_filter_make_sticky
+ #\return
+ def make_sticky(self):
+ _libgpac.gf_filter_make_sticky(self._filter)
+
+ ##prevent blocking on the filter - see \ref gf_filter_prevent_blocking
+ #\param enable if True, blocking prevention is enabled
+ #\return
+ def prevent_blocking(self, enable):
+ _libgpac.gf_filter_prevent_blocking(self._filter, enable)
+
+ ##block eos signaling on the filter - see \ref gf_filter_block_eos
+ #\param enable if True, eos blocking is enabled
+ #\return
+ def block_eos(self, enable):
+ _libgpac.gf_filter_block_eos(self._filter, enable)
+
+ ##set maximum number of extra pids accepted by this filter - see \ref gf_filter_set_max_extra_input_pids
+ #\param max_pids number of extra pids
+ #\return
+ def set_max_pids(self, max_pids):
+ _libgpac.gf_filter_set_max_extra_input_pids(self._filter, max_pids)
+
+ ##set clock hint - see \ref gf_filter_hint_single_clock
+ #\param clock_us clock in microseconds
+ #\param media_time media time as Fraction64
+ #\return
+ def hint_clock(self, clock_us, media_time):
+ _libgpac.gf_filter_hint_single_clock(self._filter, clock_us, media_time)
+
+
+ ##\cond private: until end, properties
+
+ @property
+ def block_enabled(self):
+ return _libgpac.gf_filter_block_enabled(self._filter)
+
+ @property
+ def output_buffer(self):
+ val = c_uint(0)
+ _libgpac.gf_filter_get_output_buffer_max(self._filter, byref(val), None)
+ return val.value
+
+ @property
+ def playout_buffer(self):
+ val = c_uint(0)
+ _libgpac.gf_filter_get_output_buffer_max(self._filter, None, byref(val))
+ return val.value
+
+ @property
+ def sinks_done(self):
+ return _libgpac.gf_filter_all_sinks_done(self._filter)
+
+ @property
+ def nb_evts_queued(self):
+ return _libgpac.gf_filter_get_num_events_queued(self._filter)
+
+ @property 
+ def clock_hint_time(self):
+ val = c_ulonglong(0)
+ _libgpac.gf_filter_get_clock_hint(self._filter, byref(val), None)
+ return val.value
+
+ @property 
+ def clock_hint_mediatime(self):
+ val = Fraction64
+ _libgpac.gf_filter_get_clock_hint(self._filter, None, byref(val))
+ return val.value
+
+ @property 
+ def connections_pending(self):
+ return _libgpac.gf_filter_connections_pending(self._filter)
+
+ ##\endcond
+
+ #todo
+ #add_source, add_destination, add_filter: not needed, acces to filter session
+
+
+
+#
+# filter PID bindings
+#
+
+## \cond private
+_libgpac.gf_filter_pid_copy_properties.argtypes = [_gf_filter_pid, _gf_filter_pid]
+_libgpac.gf_filter_pck_forward.argtypes = [_gf_filter_packet, _gf_filter_pid]
+
+_libgpac.gf_filter_pid_set_property.argtypes = [_gf_filter_pid, c_uint, POINTER(PropertyValue)]
+_libgpac.gf_filter_pid_set_property_str.argtypes = [_gf_filter_pid, c_char_p, POINTER(PropertyValue)]
+_libgpac.gf_filter_pid_set_info.argtypes = [_gf_filter_pid, c_uint, POINTER(PropertyValue)]
+_libgpac.gf_filter_pid_set_info_str.argtypes = [_gf_filter_pid, c_char_p, POINTER(PropertyValue)]
+_libgpac.gf_filter_pid_clear_eos.argtypes = [_gf_filter_pid, gf_bool]
+_libgpac.gf_filter_pid_check_caps.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_check_caps.restype = gf_bool
+_libgpac.gf_filter_pid_discard_block.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_allow_direct_dispatch.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_reset_properties.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_get_clock_info.argtypes = [_gf_filter_pid, POINTER(c_longlong), POINTER(c_uint)]
+_libgpac.gf_filter_pid_remove.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_is_filter_in_parents.argtypes = [_gf_filter_pid, _gf_filter]
+_libgpac.gf_filter_pid_is_filter_in_parents.restype = gf_bool
+
+_libgpac.gf_filter_pid_get_name.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_get_name.restype = c_char_p
+_libgpac.gf_filter_pid_set_name.argtypes = [_gf_filter_pid, c_char_p]
+
+_libgpac.gf_filter_pid_is_eos.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_is_eos.restype = gf_bool
+_libgpac.gf_filter_pid_set_eos.argtypes = [_gf_filter_pid]
+
+_libgpac.gf_filter_pid_has_seen_eos.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_has_seen_eos.restype = gf_bool
+
+_libgpac.gf_filter_pid_eos_received.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_eos_received.restype = gf_bool
+
+_libgpac.gf_filter_pid_would_block.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_would_block.restype = gf_bool
+_libgpac.gf_filter_pid_set_loose_connect.argtypes = [_gf_filter_pid]
+
+_libgpac.gf_filter_pid_set_framing_mode.argtypes = [_gf_filter_pid, gf_bool]
+
+_libgpac.gf_filter_pid_get_max_buffer.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_get_max_buffer.restype = c_uint
+_libgpac.gf_filter_pid_set_max_buffer.argtypes = [_gf_filter_pid, c_uint]
+
+_libgpac.gf_filter_pid_query_buffer_duration.argtypes = [_gf_filter_pid, gf_bool]
+_libgpac.gf_filter_pid_query_buffer_duration.restype = c_ulonglong
+
+_libgpac.gf_filter_pid_first_packet_is_empty.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_first_packet_is_empty.restype = gf_bool
+
+_libgpac.gf_filter_pid_get_first_packet_cts.argtypes = [_gf_filter_pid, POINTER(c_ulonglong)]
+_libgpac.gf_filter_pid_get_first_packet_cts.restype = gf_bool
+
+_libgpac.gf_filter_pid_get_packet_count.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_get_timescale.argtypes = [_gf_filter_pid]
+
+_libgpac.gf_filter_pid_set_clock_mode.argtypes = [_gf_filter_pid, gf_bool]
+_libgpac.gf_filter_pid_set_discard.argtypes = [_gf_filter_pid, gf_bool]
+
+_libgpac.gf_filter_pid_require_source_id.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_recompute_dts.argtypes = [_gf_filter_pid, gf_bool]
+
+
+_libgpac.gf_filter_pid_get_min_pck_duration.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_is_playing.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_is_playing.restype = gf_bool
+
+_libgpac.gf_filter_pid_get_filter_name.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_get_filter_name.restype = c_char_p
+
+_libgpac.gf_filter_pid_get_next_ts.argtypes = [_gf_filter_pid]
+_libgpac.gf_filter_pid_get_next_ts.restype = c_longlong
+
+
+_libgpac.gf_filter_pid_caps_query.argtypes = [_gf_filter_pid, c_uint]
+_libgpac.gf_filter_pid_caps_query.restype = POINTER(PropertyValue)
+_libgpac.gf_filter_pid_caps_query_str.argtypes = [_gf_filter_pid, c_char_p]
+_libgpac.gf_filter_pid_caps_query_str.restype = POINTER(PropertyValue)
+
+_libgpac.gf_filter_pid_negociate_property.argtypes = [_gf_filter_pid, c_uint, POINTER(PropertyValue)]
+_libgpac.gf_filter_pid_negociate_property_dyn.argtypes = [_gf_filter_pid, c_char_p, POINTER(PropertyValue)]
+
+_libgpac.gf_filter_pck_new_ref.argtypes = [_gf_filter_pid, c_uint, c_uint, _gf_filter_packet]
+_libgpac.gf_filter_pck_new_ref.restype = _gf_filter_packet
+
+_libgpac.gf_filter_pck_new_alloc.argtypes = [_gf_filter_pid, c_uint, POINTER(c_void_p)]
+_libgpac.gf_filter_pck_new_alloc.restype = _gf_filter_packet
+
+_libgpac.gf_filter_pck_new_clone.argtypes = [_gf_filter_pid, _gf_filter_packet, POINTER(c_void_p)]
+_libgpac.gf_filter_pck_new_clone.restype = _gf_filter_packet
+_libgpac.gf_filter_pck_new_copy.argtypes = [_gf_filter_pid, _gf_filter_packet, POINTER(c_void_p)]
+_libgpac.gf_filter_pck_new_copy.restype = _gf_filter_packet
+
+## \endcond private
+
+
+## \cond private
+
+#callback for packet destruction
+
+_libgpac.gf_filter_pck_new_shared.argtypes = [_gf_filter_pid, POINTER(c_ubyte), c_uint, c_void_p]
+_libgpac.gf_filter_pck_new_shared.restype = _gf_filter_packet
+
+@CFUNCTYPE(c_int, _gf_filter, _gf_filter_pid, _gf_filter_packet)
+def filter_cbk_release_packet(_f, _pid, _pck):
+ obj = _libgpac.gf_filter_get_rt_udta(_f)
+ filter = cast(obj, py_object).value
+ pck_obj=None
+ obj = _libgpac.gf_filter_pid_get_udta(_pid)
+ if obj:
+ pid_obj = cast(obj, py_object).value
+ else:
+ raise Exception('Unknwon PID on packet destruction callback')
+
+ for pck in pid_obj.pck_refs:
+ if pck._pck==_pck:
+ pck_obj = pck
+ break
+
+ if not pck_obj:
+ raise Exception('Unknwon packet on packet destruction callback')
+ pid_obj.pck_refs.remove(pck_obj)
+ filter.packet_release(pid_obj, pck_obj)
+ return 0
+
+## \endcond private
+
+## Object representing a PID of a custom filter
+class FilterPid:
+ ## \cond private
+ def __init__(self, filter, pid, IsInput):
+ self._filter = filter
+ self._pid = pid
+ self._cur_pck = None
+ self._input = IsInput
+ ## \endcond
+ #hack for doxygen to generate member vars (not support for parsing @property)
+ if 0:
+ ##name of the PID - see \ref gf_filter_pid_get_name and \ref gf_filter_pid_set_name
+ #\hideinitializer
+ self.name=0
+ ##name of the parent filter, readonly - see \ref gf_filter_pid_get_filter_name
+ #\hideinitializer
+ self.filter_name=0
+ ##end of stream property of PID - see \ref gf_filter_pid_is_eos and \ref gf_filter_pid_set_eos
+ #\hideinitializer
+ self.eos=0
+ ##True if end of stream was seen in the chain but has not yet reached the filter, readonly - see \ref gf_filter_pid_has_seen_eos
+ #\hideinitializer
+ self.has_seen_eos=0
+ ##True if end of stream was seen on the input PID but some packets are still to be processed, readonly - see \ref gf_filter_pid_eos_received
+ #\hideinitializer
+ self.eos_received=0
+ ##True if PID would block, readonly - see \ref gf_filter_pid_would_block
+ #\hideinitializer
+ self.would_block=0
+ ##maximum buffer of PID in microseconds - see \ref gf_filter_pid_get_max_buffer and \ref gf_filter_pid_set_max_buffer
+ #\hideinitializer
+ self.max_buffer=0
+ ##buffer of PID in microseconds, readonly - see \ref gf_filter_pid_query_buffer_duration
+ #\hideinitializer
+ self.buffer=0
+ ##True if buffer is full, readonly - see \ref gf_filter_pid_query_buffer_duration
+ #\hideinitializer
+ self.buffer_full=0
+ ##True if no pending packet, readonly - see \ref gf_filter_pid_first_packet_is_empty
+ #\hideinitializer
+ self.first_empty=0
+ ##value of CTS of first pending packet, None if none, readonly - see \ref gf_filter_pid_get_first_packet_cts
+ #\hideinitializer
+ self.first_cts=0
+ ##number of queued packets for input pid, readonly - see \ref gf_filter_pid_get_packet_count
+ #\hideinitializer
+ self.nb_pck_queued=0
+ ##timescale of pid, readonly - see \ref gf_filter_pid_get_timescale
+ #\hideinitializer
+ self.timescale=0
+ ##minimum packet duration (in timescale) of pid, readonly - see \ref gf_filter_pid_get_min_pck_duration
+ #\hideinitializer
+ self.min_pck_dur=0
+ ##True if PID is playing, readonly - see \ref gf_filter_pid_is_playing
+ #\hideinitializer
+ self.playing=0
+ ##Next estimated timestamp on pid, readonly - see \ref gf_filter_pid_get_next_ts
+ #\hideinitializer
+ self.next_ts=0
+
+
+ ##send an event on the pid - see \ref gf_filter_pid_send_event
+ #\param evt FilterEvent to send
+ #\return
+ def send_event(self, evt):
+ evt.base.on_pid = self._pid
+ _libgpac.gf_filter_pid_send_event(self._pid, byref(evt))
+
+ ##removes this output pid - see \ref gf_filter_pid_remove
+ #\return
+ def remove(self):
+ if self._input:
+ raise Exception('Cannot remove input pid')
+ return
+ _libgpac.gf_filter_pid_remove(self._pid)
+
+ ##enumerates property on pid
+ #\param callback_obj callback object to use, must have a 'on_prop_enum' method defined taking two parameters, prop_name(string) and propval(property value)
+ #\return
+ def enum_props(self, callback_obj):
+ self._filter._pid_enum_props_ex(callback_obj, self._pid)
+
+ ##get a PID property
+ #\param pname property name
+ #\return property value or None if not found
+ def get_prop(self, pname):
+ return self._filter._pid_prop_ex(pname, self._pid, False)
+
+ ##get a PID info
+ #\param pname property name
+ #\return property value or None if not found
+ def get_info(self, pname):
+ return self._filter._pid_prop_ex(pname, self._pid, True)
+
+ ##get first packet of input PID - see gf_filter_pid_get_packet
+ #\return FilterPacket or None if no packet available
+ def get_packet(self):
+ ##\cond private
+ if self._cur_pck:
+ return self._cur_pck
+ pck = _libgpac.gf_filter_pid_get_packet(self._pid)
+ if pck:
+ self._cur_pck = FilterPacket(pck, True)
+ return self._cur_pck
+ ##\endcond
+
+ ##drops (removes) the first packet of input PID - see \ref gf_filter_pid_drop_packet
+ #\return
+ def drop_packet(self):
+ ##\cond private
+ if self._cur_pck:
+ self._cur_pck = None
+ _libgpac.gf_filter_pid_drop_packet(self._pid)
+ ##\endcond
+
+ ##copy property of given PID to the current pid - see \ref gf_filter_pid_copy_properties
+ #\param ipid FilterPid to copy from
+ #\return
+ def copy_props(self, ipid):
+ if self._input:
+ raise Exception('Cannot copy properties on input PID')
+ return
+ if ipid==None:
+ return
+ err = _libgpac.gf_filter_pid_copy_properties(self._pid, ipid._pid)
+ if err<0:
+ raise Exception('Cannot copy properties: ' + e2s(err) )
+ 
+ ##removes all properties of the current pid - see \ref gf_filter_pid_reset_properties
+ #\return
+ def reset_props(self):
+ if self._input:
+ raise Exception('Cannot reset properties on input PID')
+ return
+ _libgpac.gf_filter_pid_reset_properties(self._pid)
+
+ ##forward a packet on the current pid - see \ref gf_filter_pck_forward
+ #\param ipck packet to forward
+ #\return
+ def forward(self, ipck):
+ if self._input:
+ raise Exception('Cannot copy properties on input PID')
+ return
+ if ipck==None:
+ return
+ _libgpac.gf_filter_pck_forward(ipck._pck, self._pid)
+
+ ##set a property the current pid - see \ref gf_filter_pid_set_property and \ref gf_filter_pid_set_property_str
+ #\param pcode property type
+ #\param prop property value to set
+ #\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+ #\return
+ def set_prop(self, pcode, prop, custom_type=0):
+ if self._input:
+ raise Exception('Cannot set properties on input PID')
+ return
+ prop_4cc = pcode
+ prop_name = None
+ if isinstance(pcode, str):
+ _pname = pcode.encode('utf-8')
+ prop_4cc = _libgpac.gf_props_get_id(_pname)
+ if prop_4cc==0:
+ prop_name = _pname
+
+ if prop==None:
+ if prop_4cc:
+ _libgpac.gf_filter_pid_set_property(self._pid, prop_4cc, None)
+ else:
+ _libgpac.gf_filter_pid_set_property_str(self._pid, prop_name, None)
+ return
+
+ prop_val = _make_prop(prop_4cc, pcode, prop, custom_type)
+ if prop_4cc:
+ _libgpac.gf_filter_pid_set_property(self._pid, prop_4cc, byref(prop_val))
+ else:
+ _libgpac.gf_filter_pid_set_property_str(self._pid, prop_name, byref(prop_val))
+
+ ##set a info property the current pid - see \ref gf_filter_pid_set_info and \ref gf_filter_pid_set_info_str
+ #\param pcode property type
+ #\param prop property value to set
+ #\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+ #\return
+ def set_info(self, pcode, prop, custom_type=0):
+ if self._input:
+ raise Exception('Cannot set info on input PID')
+ return
+ prop_4cc = pcode
+ prop_name = None
+ if isinstance(pcode, str):
+ _pname = pcode.encode('utf-8')
+ prop_4cc = _libgpac.gf_props_get_id(_pname)
+ if prop_4cc==0:
+ prop_name = _pname
+
+ if prop==None:
+ if prop_4cc:
+ _libgpac.gf_filter_pid_set_info(self._pid, prop_4cc, None)
+ else:
+ _libgpac.gf_filter_pid_set_info_str(self._pid, prop_name, None)
+ return
+
+ prop_val = _make_prop(prop_4cc, pcode, prop, custom_type)
+ if prop_4cc:
+ _libgpac.gf_filter_pid_set_info(self._pid, prop_4cc, byref(prop_val))
+ else:
+ _libgpac.gf_filter_pid_set_info_str(self._pid, prop_name, byref(prop_val))
+
+ ##clears EOS on the current PID - see \ref gf_filter_pid_clear_eos
+ #\param all_pids if True, clears eos on all input pids
+ #\return
+ def clear_eos(self, all_pids):
+ _libgpac.gf_filter_pid_clear_eos(self._pid, all_pids)
+
+ ##check PID properties match capability of filter - see \ref gf_filter_pid_check_caps
+ #\return
+ def check_caps(self):
+ return _libgpac.gf_filter_pid_check_caps(self._pid)
+
+ ##discard blocking mode on PID - see \ref gf_filter_pid_discard_block
+ #\return
+ def discard_block(self):
+ _libgpac.gf_filter_pid_discard_block(self._pid)
+
+ ##allow direct dispatch of output to destinations - see \ref gf_filter_pid_allow_direct_dispatch
+ #\return
+ def allow_direct_dispatch(self):
+ _libgpac.gf_filter_pid_allow_direct_dispatch(self._pid)
+
+ ##get current clock type info - see \ref gf_filter_pid_get_clock_info
+ #\return clock type (int)
+ def get_clock_type(self):
+ return _libgpac.gf_filter_pid_get_clock_info(self._pid, None, None)
+
+ ##get current clock time stamp - see \ref gf_filter_pid_get_clock_info
+ #\return clock timestamp (Fraction64)
+ def get_clock_timestamp(self):
+ timestamp = c_longlong(0)
+ timescale = c_uint(0)
+ _libgpac.gf_filter_pid_get_clock_info(self._pid, byref(timestamp), byref(timescale))
+ v = Fraction64()
+ v.value.num = timestamp.value
+ v.value.den = timescale.value
+ return v
+
+ ##check if a filter is in the parent filter chain of the pid - see \ref gf_filter_pid_is_filter_in_parents
+ #\param filter Filter to check
+ #\return True or False
+ def is_filter_in_parents(self, filter):
+ return _libgpac.gf_filter_pid_is_filter_in_parents(self._pid, filter._f)
+
+ ##get buffer occupancy - see \ref gf_filter_pid_get_buffer_occupancy
+ #\return BufferOccupancy object
+ def get_buffer_occupancy(self):
+ max_units = c_uint(0)
+ nb_pck = c_uint(0)
+ max_dur = c_uint(0)
+ dur = c_uint(0)
+ in_final_flush = _libgpac.gf_filter_pid_get_buffer_occupancy(self._pid, byref(max_units), byref(nb_pck), byref(max_dur), byref(dur) )
+ in_final_flush = not in_final_flush
+ return BufferOccupancy(max_units, nb_pck, max_dur, dur, not_in_final_flush)
+
+ ##sets loose connect mode - see \ref gf_filter_pid_set_loose_connect
+ #\return
+ def loose_connect(self):
+ _libgpac.gf_filter_pid_set_loose_connect(self._pid)
+
+ ##sets framing mode - see \ref gf_filter_pid_set_framing_mode
+ #\param framed if True, complete frames only will be delivered on the pid
+ #\return
+ def set_framing(self, framed):
+ _libgpac.gf_filter_pid_set_framing_mode(self._pid, framed)
+
+ ##sets clock mode - see \ref gf_filter_pid_set_clock_mode
+ #\param cmode clock mode operation of filter
+ #\return
+ def set_clock_mode(self, cmode):
+ _libgpac.gf_filter_pid_set_clock_mode(self._pid, cmode)
+
+ ##sets discard mode - see \ref gf_filter_pid_set_discard
+ #\param do_discard if True, discard is on
+ #\return
+ def set_discard(self, do_discard):
+ _libgpac.gf_filter_pid_set_discard(self._pid, do_discard)
+
+ ##enforces sourceID to be present for output pids of this filter - see \ref gf_filter_pid_require_source_id
+ #\return
+ def require_source_id(self):
+ err = _libgpac.gf_filter_pid_require_source_id(self._pid)
+ if err<0:
+ raise Exception('Failed to require sourceID for pid: ' + e2s(err))
+ return
+
+ ##sets DTS recomputing mode - see \ref gf_filter_pid_recompute_dts
+ #\param do_compute if True, DTS are recomputed
+ #\return
+ def recompute_dts(self, do_compute):
+ _libgpac.gf_filter_pid_recompute_dts(self._pid, do_compute)
+
+ ##queries a capability property on output PID - see \ref gf_filter_pid_caps_query and \ref gf_filter_pid_caps_query_str
+ #\param pcode property to check
+ #\return property value if found, None otherwise
+ def query_cap(self, pcode):
+ if self._input:
+ raise Exception('Cannot query caps on input PID')
+ return
+ prop_4cc = pcode
+ prop_name = None
+ if isinstance(pcode, str):
+ _pname = pcode.encode('utf-8')
+ prop_4cc = _libgpac.gf_props_get_id(_pname)
+ if prop_4cc==0:
+ prop_name = _pname
+
+ if prop_4cc:
+ prop_val = _libgpac.gf_filter_pid_caps_query(self._pid, prop_4cc)
+ else:
+ prop_val = _libgpac.gf_filter_pid_caps_query_str(self._pid, _pname)
+
+ if prop_val:
+ return _prop_to_python(pname, prop.contents)
+ return None
+
+ ##negociates a capability property on input PID - see \ref gf_filter_pid_negociate_property and \ref gf_filter_pid_negociate_property_dyn
+ #\param pcode property to negotiate
+ #\param prop property to negotiate
+ #\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+ #\return
+ def negociate_cap(self, pcode, prop, custom_type=0):
+ if not self._input:
+ raise Exception('Cannot negociate caps on output PID')
+ return
+ prop_4cc = pcode
+ prop_name = None
+ if isinstance(pcode, str):
+ _pname = pcode.encode('utf-8')
+ prop_4cc = _libgpac.gf_props_get_id(_pname)
+ if prop_4cc==0:
+ prop_name = _pname
+
+ prop_val = _make_prop(prop_4cc, pcode, prop, custom_type)
+ if prop_4cc:
+ _libgpac.gf_filter_pid_negociate_property(self._pid, prop_4cc, byref(prop_val))
+ else:
+ _libgpac.gf_filter_pid_negociate_property_dyn(self._pid, prop_name, byref(prop_val))
+
+ ##resolves a template string - see \ref gf_filter_pid_resolve_file_template
+ #\param template the template string
+ #\param file_idx the file index
+ #\param suffix the file suffix
+ #\return the resolved template string
+ def resolve_template(self, template, file_idx=0, suffix=None):
+ res = create_string_buffer(2000)
+ err = _libgpac.gf_filter_pid_resolve_file_template(self._pid, res, template.encode('utf-8'), file_idx, suffix)
+ if err<0:
+ raise Exception('Cannot resolve file template ' + template + ': ' + e2s(err))
+ return res.raw.decode('utf-8')
+
+ ##creates a new packet referring to an existing packet - see \ref gf_filter_pck_new_ref
+ #\param ipck the input (referenced) packet
+ #\param size the data size of the new packet
+ #\param offset the offset in the original data
+ #\return the new FilterPacket or None if failure
+ def new_pck_ref(self, ipck, size=0, offset=0):
+ if ipck==None:
+ raise Exception('NULL input packet in new_pck_ref !')
+ _pck = _libgpac.gf_filter_pck_new_ref(self._pid, offset, size, ipck._pck)
+ if _pck:
+ return FilterPacket(_pck, False)
+ return None
+
+ ##creates a new packet of the given size, allocating memory in libgpac - see \ref gf_filter_pck_new_alloc
+ #\param size the data size of the new packet
+ #\return the new FilterPacket or None if failure
+ def new_pck(self, size=0):
+ _pck = _libgpac.gf_filter_pck_new_alloc(self._pid, size, None)
+ if _pck:
+ pck = FilterPacket(_pck, False)
+ pck._readonly = False
+ return pck
+ return None
+
+ ##creates a new packet sharing memory of the filter - see \ref gf_filter_pck_new_shared
+ #The filter object must have a `packet_release` method with arguments [ FilterPid, FilterPacket ] 
+ #\param data the data to use. If NumPy is detected, accept a NP Array. Otherwise data is type casted into POINTER(c_ubyte)
+ #\return the new FilterPacket or None if failure
+ def new_pck_shared(self, data):
+ data_p = None
+ data_len = 0
+ readonly=False
+ if not hasattr(self._filter, 'packet_release'):
+ raise Exception('Filter ' + self._filter.name + ' has no packet_release callback function defined')
+
+ if numpy_support and isinstance(data, np.ndarray):
+ data_p = data.ctypes.data_as(POINTER(c_ubyte))
+ data_len = data.size * data.itemsize
+ readonly = not data.flags.writeable
+ else:
+ data_p = cast(data, POINTER(c_ubyte) )
+ data_len = len(data)
+
+ if not data_p:
+ raise Exception('Unknown data reference class ' + data.__class__.__name__)
+
+ _pck = _libgpac.gf_filter_pck_new_shared(self._pid, data_p, data_len, filter_cbk_release_packet)
+ if _pck:
+ pck = FilterPacket(_pck, False)
+ pck._readonly = readonly
+ self.pck_refs.append(pck)
+ return pck
+ return None
+
+ ##creates a new packet copying a source packet - see \ref gf_filter_pck_new_copy
+ #\param ipck the FilterPacket to copy
+ #\return the new FilterPacket or None if failure
+ def new_pck_copy(self, ipck):
+ if ipck==None:
+ raise Exception('NULL input packet in new_pck_copy !')
+ _pck = _libgpac.gf_filter_pck_new_copy(self._pid, ipck._pck, None)
+ if _pck:
+ pck = FilterPacket(_pck, False)
+ pck._readonly = False
+ return pck
+ return None
+
+ ##creates a new packet cloning a source packet - see \ref gf_filter_pck_new_clone
+ #\param ipck the FilterPacket to clone
+ #\return the new FilterPacket or None if failure
+ def new_pck_clone(self, ipck):
+ if ipck==None:
+ raise Exception('NULL input packet in new_pck_clone !')
+ _pck = _libgpac.gf_filter_pck_new_clone(self._pid, ipck._pck, None)
+ if _pck:
+ pck = FilterPacket(_pck, False)
+ pck._readonly = False
+ return pck
+ return None
+
+ ##\cond private: until end, properties
+ ##name of the PID - see \ref gf_filter_pid_get_name and \ref gf_filter_pid_set_name
+ #\return
+ @property
+ def name(self):
+ return _libgpac.gf_filter_pid_get_name(self._pid).decode('utf-8')
+
+ ##\cond private
+ @name.setter
+ def name(self, val):
+ _libgpac.gf_filter_pid_set_name(self._pid, val.encode('utf-8'))
+ ##\endcond
+
+ ##name of the parent filter - see \ref gf_filter_pid_get_filter_name
+ #\return
+ @property
+ def filter_name(self):
+ return _libgpac.gf_filter_pid_get_filter_name(self._pid).decode('utf-8')
+
+ ##end of stream property of PID - see \ref gf_filter_pid_is_eos and \ref gf_filter_pid_set_eos
+ #\return
+ @property
+ def eos(self):
+ return _libgpac.gf_filter_pid_is_eos(self._pid)
+
+ ##\cond private
+ @eos.setter
+ def eos(self, Value):
+ _libgpac.gf_filter_pid_set_eos(self._pid)
+ ##\endcond private
+
+ ##True if end of stream was seen in the chain but not yet reached by the filter - see \ref gf_filter_pid_has_seen_eos
+ #\return
+ @property
+ def has_seen_eos(self):
+ return _libgpac.gf_filter_pid_has_seen_eos(self._pid)
+
+ ##True if end of stream was seen on pid but some packets are still pending - see \ref gf_filter_pid_eos_received
+ #\return
+ @property
+ def eos_receievd(self):
+ return _libgpac.gf_filter_pid_eos_received(self._pid)
+
+ ##True if PID would block - see \ref gf_filter_pid_would_block
+ #\return
+ @property
+ def would_block(self):
+ return _libgpac.gf_filter_pid_would_block(self._pid)
+
+ ##maximum buffer of PID in microseconds - see \ref gf_filter_pid_get_max_buffer and \ref gf_filter_pid_set_max_buffer
+ #\return
+ @property
+ def max_buffer(self):
+ return _libgpac.gf_filter_pid_get_max_buffer(self._pid)
+
+ ##\cond private
+ @max_buffer.setter
+ def max_buffer(self, value):
+ return _libgpac.gf_filter_pid_set_max_buffer(self._pid, value)
+ ##\endcond
+
+ ##buffer of PID in microseconds - see \ref gf_filter_pid_query_buffer_duration
+ #\return
+ @property
+ def buffer(self):
+ return _libgpac.gf_filter_pid_query_buffer_duration(self._pid, False)
+
+ ##True if buffer is full - see \ref gf_filter_pid_query_buffer_duration
+ #\return
+ @property
+ def buffer_full(self):
+ dur = _libgpac.gf_filter_pid_query_buffer_duration(self._pid, True)
+ if dur:
+ return True
+ else:
+ return False
+
+ ##True if no pending packet - see \ref gf_filter_pid_first_packet_is_empty
+ #\return
+ @property
+ def first_empty(self):
+ return _libgpac.gf_filter_pid_first_packet_is_empty(self._pid)
+
+ ##value of CTS of first pending packet, None if none - see \ref gf_filter_pid_get_first_packet_cts
+ #\return
+ @property
+ def first_cts(self):
+ cts = c_ulonglong(0)
+ res = _libgpac.gf_filter_pid_get_first_packet_cts(self._pid, byref(cts))
+ if not res:
+ return None
+ return cts.value
+
+ ##number of queued packets for input pid - see \ref gf_filter_pid_get_packet_count
+ #\return
+ @property
+ def nb_pck_queued(self):
+ return _libgpac.gf_filter_pid_get_packet_count(self._pid)
+
+ ##timescale of pid - see \ref gf_filter_pid_get_timescale
+ #\return
+ @property
+ def timescale(self):
+ return _libgpac.gf_filter_pid_get_timescale(self._pid)
+
+ ##minimum packet duration (in timescale) of pid - see \ref gf_filter_pid_get_min_pck_duration
+ #\return
+ @property
+ def min_pck_dur(self):
+ return _libgpac.gf_filter_pid_get_min_pck_duration(self._pid)
+
+ ##True if PID is playing - see \ref gf_filter_pid_is_playing
+ #\return
+ @property
+ def playing(self):
+ return _libgpac.gf_filter_pid_is_playing(self._pid)
+
+ #\return
+ @property
+ def next_ts(self):
+ return _libgpac.gf_filter_pid_get_next_ts(self._pid)
+
+ ##\endcond
+
+ #vars:
+ #src_name, args, src_args, src_url, dst_url: probably not needed since the entire session is exposed to the custom filter
+
+
+
+
+#
+# filter packet bindings
+#
+
+##\cond private
+
+#getters
+_libgpac.gf_filter_pck_get_dts.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_dts.restype = c_ulonglong
+_libgpac.gf_filter_pck_set_dts.argtypes = [_gf_filter_packet, c_ulonglong]
+
+_libgpac.gf_filter_pck_get_cts.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_cts.restype = c_ulonglong
+_libgpac.gf_filter_pck_set_cts.argtypes = [_gf_filter_packet, c_ulonglong]
+
+_libgpac.gf_filter_pck_get_sap.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_sap.restype = c_uint
+_libgpac.gf_filter_pck_set_sap.argtypes = [_gf_filter_packet, c_uint]
+
+_libgpac.gf_filter_pck_get_duration.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_duration.restype = c_uint
+_libgpac.gf_filter_pck_set_duration.argtypes = [_gf_filter_packet, c_uint]
+
+_libgpac.gf_filter_pck_get_data.argtypes = [_gf_filter_packet, POINTER(c_uint)]
+_libgpac.gf_filter_pck_get_data.restype = POINTER(c_ubyte)
+
+_libgpac.gf_filter_pck_get_framing.argtypes = [_gf_filter_packet, POINTER(gf_bool), POINTER(gf_bool)]
+_libgpac.gf_filter_pck_set_framing.argtypes = [_gf_filter_packet, gf_bool, gf_bool]
+
+_libgpac.gf_filter_pck_get_timescale.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_timescale.restype = c_uint
+
+_libgpac.gf_filter_pck_get_interlaced.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_interlaced.restype = c_uint
+_libgpac.gf_filter_pck_set_interlaced.argtypes = [_gf_filter_packet, c_uint]
+
+_libgpac.gf_filter_pck_get_corrupted.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_corrupted.restype = gf_bool
+_libgpac.gf_filter_pck_set_corrupted.argtypes = [_gf_filter_packet, gf_bool]
+
+_libgpac.gf_filter_pck_get_seek_flag.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_seek_flag.restype = gf_bool
+_libgpac.gf_filter_pck_set_seek_flag.argtypes = [_gf_filter_packet, gf_bool]
+
+_libgpac.gf_filter_pck_get_byte_offset.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_byte_offset.restype = c_ulonglong
+_libgpac.gf_filter_pck_set_byte_offset.argtypes = [_gf_filter_packet, c_ulonglong]
+
+_libgpac.gf_filter_pck_get_roll_info.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_roll_info.restype = c_short
+_libgpac.gf_filter_pck_set_roll_info.argtypes = [_gf_filter_packet, c_short]
+
+_libgpac.gf_filter_pck_get_crypt_flags.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_crypt_flags.restype = c_uint
+_libgpac.gf_filter_pck_set_crypt_flags.argtypes = [_gf_filter_packet, c_uint]
+
+_libgpac.gf_filter_pck_get_clock_type.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_clock_type.restype = c_uint
+_libgpac.gf_filter_pck_set_clock_type.argtypes = [_gf_filter_packet, c_uint]
+
+_libgpac.gf_filter_pck_get_carousel_version.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_carousel_version.restype = c_uint
+_libgpac.gf_filter_pck_set_carousel_version.argtypes = [_gf_filter_packet, c_uint]
+
+_libgpac.gf_filter_pck_get_seq_num.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_seq_num.restype = c_uint
+_libgpac.gf_filter_pck_set_seq_num.argtypes = [_gf_filter_packet, c_uint]
+
+_libgpac.gf_filter_pck_get_dependency_flags.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_dependency_flags.restype = c_uint
+_libgpac.gf_filter_pck_set_dependency_flags.argtypes = [_gf_filter_packet, c_uint]
+
+_libgpac.gf_filter_pck_get_frame_interface.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_get_frame_interface.restype = c_void_p
+
+_libgpac.gf_filter_pck_is_blocking_ref.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_is_blocking_ref.restype = gf_bool
+
+_libgpac.gf_filter_pck_has_properties.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_has_properties.restype = gf_bool
+
+_libgpac.gf_filter_pck_enum_properties.argtypes = [_gf_filter_packet, POINTER(c_uint), POINTER(c_uint), POINTER(c_char_p)]
+_libgpac.gf_filter_pck_enum_properties.restype = POINTER(PropertyValue)
+
+_libgpac.gf_filter_pck_get_property.argtypes = [_gf_filter_packet, c_uint]
+_libgpac.gf_filter_pck_get_property.restype = POINTER(PropertyValue)
+_libgpac.gf_filter_pck_get_property_str.argtypes = [_gf_filter_packet, c_char_p]
+_libgpac.gf_filter_pck_get_property_str.restype = POINTER(PropertyValue)
+
+_libgpac.gf_filter_pck_ref_ex.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_ref_ex.restype = _gf_filter_packet
+_libgpac.gf_filter_pck_unref.argtypes = [_gf_filter_packet]
+
+_libgpac.gf_filter_pck_discard.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_set_readonly.argtypes = [_gf_filter_packet]
+_libgpac.gf_filter_pck_send.argtypes = [_gf_filter_packet]
+
+_libgpac.gf_filter_pck_merge_properties.argtypes = [_gf_filter_packet, _gf_filter_packet]
+
+_libgpac.gf_filter_pck_set_property.argtypes = [_gf_filter_packet, c_uint, POINTER(PropertyValue)]
+_libgpac.gf_filter_pck_set_property_str.argtypes = [_gf_filter_packet, c_char_p, POINTER(PropertyValue)]
+_libgpac.gf_filter_pck_truncate.argtypes = [_gf_filter_packet, c_uint]
+
+_libgpac.gf_filter_pck_dangling_copy.argtypes = [_gf_filter_packet, _gf_filter_packet]
+_libgpac.gf_filter_pck_dangling_copy.restype = _gf_filter_packet
+
+##\endcond private
+
+##filter packet object
+class FilterPacket:
+ ##\cond private
+ def __init__(self, pck, is_src):
+ self._pck = pck
+ self._is_src = is_src
+ self._readonly = True
+ ##\endcond private
+ #hack for doxygen to generate member vars (not support for parsing @property)
+ if 0:
+ ##Decode Timestamp - see \ref gf_filter_pck_get_dts and \ref gf_filter_pck_set_dts
+ #\hideinitializer
+ self.dts=0
+ ##Compose Timestamp - see \ref gf_filter_pck_get_cts and \ref gf_filter_pck_set_cts
+ #\hideinitializer
+ self.cts=0
+ ##SAP type - see \ref gf_filter_pck_get_sap and \ref gf_filter_pck_set_sap
+ #\hideinitializer
+ self.sap=0
+ ##Duration - see \ref gf_filter_pck_get_duration and \ref gf_filter_pck_set_duration
+ #\hideinitializer
+ self.dur=0
+ ##Size of packet data, readonly
+ #\hideinitializer
+ self.size=0
+ ##Packet data - see \ref gf_filter_pck_get_data
+ #If NumPy is available, the data is returned as a np Array, otherwise it is a POINTER(c_ubyte) object
+ #The property is readonly (cannot be set) but content can be modified for non-refs output packets
+ #\hideinitializer
+ self.data=0
+ ##frame start - see \ref gf_filter_pck_get_framing and \ref gf_filter_pck_set_framing
+ #\hideinitializer
+ self.start=0
+ ##frame end - see \ref gf_filter_pck_get_framing and \ref gf_filter_pck_set_framing
+ #\hideinitializer
+ self.end=0
+ ##associated timescale, readonly - see \ref gf_filter_pck_get_timescale
+ #\hideinitializer
+ self.timescale=0
+ ##Interlaced flags - see \ref gf_filter_pck_get_interlaced and \ref gf_filter_pck_set_interlaced
+ #\hideinitializer
+ self.interlaced=0
+ ##Corrupted flag - see \ref gf_filter_pck_get_corrupted and \ref gf_filter_pck_set_corrupted
+ #\hideinitializer
+ self.corrupted=0
+ ##Seek flag - see \ref gf_filter_pck_get_seek_flag and \ref gf_filter_pck_set_seek_flag
+ #\hideinitializer
+ self.seek=0
+ ##Byte offset - see \ref gf_filter_pck_get_byte_offset and \ref gf_filter_pck_set_byte_offset
+ #\hideinitializer
+ self.byte_offset=0
+ ##Roll info - see \ref gf_filter_pck_get_roll_info and \ref gf_filter_pck_set_roll_info
+ #\hideinitializer
+ self.roll=0
+ ##Encryption flags - see \ref gf_filter_pck_get_crypt_flags and \ref gf_filter_pck_set_crypt_flags
+ #\hideinitializer
+ self.crypt=0
+ ##Clock reference flag - see \ref gf_filter_pck_get_clock_type and \ref gf_filter_pck_set_clock_type
+ #\hideinitializer
+ self.clock=0
+ ##Carousel version - see \ref gf_filter_pck_get_carousel_version and \ref gf_filter_pck_set_carousel_version
+ #\hideinitializer
+ self.carousel=0
+ ##Sequence number - see \ref gf_filter_pck_get_seq_num and \ref gf_filter_pck_set_seq_num
+ #\hideinitializer
+ self.seqnum=0
+ ##Dependency flags - see \ref gf_filter_pck_get_dependency_flags and \ref gf_filter_pck_set_dependency_flags
+ #\hideinitializer
+ self.deps=0
+ ##true if packet holds a GF_FrameInterface object and not a data packet, readonly
+ #\hideinitializer
+ self.frame_ifce=0
+ ##Custom properties present, readonly - see \ref gf_filter_pck_has_properties
+ #\hideinitializer
+ self.has_properties=0
+ ##true if packet is a blocking reference, readonly - see \ref gf_filter_pck_is_blocking_ref
+ #\hideinitializer
+ self.blocking_ref=0
+
+ ##enumerate an packet properties
+ #\param callback_obj callback object to use, must have a 'on_prop_enum' method defined taking two parameters, prop_name(string) and propval
+ #\return
+ def enum_props(self, callback_obj):
+ if not hasattr(callback_obj, 'on_prop_enum'):
+ return
+
+ pidx=c_uint(0)
+ while True:
+ _p4cc=c_uint(0)
+ _pname=c_char_p(0)
+ prop = _libgpac.gf_filter_pck_enum_properties(self._pck, byref(pidx), byref(_p4cc), byref(_pname))
+ if prop:
+ p4cc=_p4cc.value
+ pname=None
+ if _pname:
+ pname=_pname.value.decode('utf-8')
+ else:
+ pname=_libgpac.gf_props_4cc_get_name(p4cc).decode('utf-8')
+ pval = _prop_to_python(pname, prop.contents)
+ callback_obj.on_prop_enum(pname, pval)
+ else:
+ break
+
+ ##get a packet property - see \ref gf_filter_pck_get_property and \ref gf_filter_pck_get_property_str
+ #\param prop_name name of property to get
+ #\return property value, or None if not found
+ def get_prop(self, prop_name):
+ _name = prop_name.encode('utf-8')
+ p4cc = _libgpac.gf_props_get_id(_name)
+ if p4cc:
+ prop = _libgpac.gf_filter_pck_get_property(self._pck, p4cc)
+ else:
+ prop = _libgpac.gf_filter_pck_get_property_str(self._pck, _name)
+ if prop:
+ return _prop_to_python(prop_name, prop.contents)
+ return None
+
+ ##increase packet reference count - see \ref gf_filter_pck_ref_ex
+ #\return
+ def ref(self):
+ ##\cond private
+ self._pck = _libgpac.gf_filter_pck_ref_ex(self._pck)
+ ##\endcond private
+
+ ##decrease packet reference count - see \ref gf_filter_pck_unref
+ #\return
+ def unref(self):
+ _libgpac.gf_filter_pck_unref(self._pck)
+
+
+ ##discard an output packet instead of sending it - see \ref gf_filter_pck_discard
+ #\return
+ def discard(self):
+ ##\cond private
+ if self._is_src:
+ raise Exception('Cannot discard on source packet')
+ _libgpac.gf_filter_pck_discard(self._pck)
+ self._pck = None
+ ##\endcond private
+
+ ##creates a new packet cloning a source packet - see \ref gf_filter_pck_dangling_copy.
+ #The resulting packet is read/write mode and may have its own memory allocated.
+ #This is typically used by sink filters wishing to access underling GPU data of a packet using frame interface.
+ #the resulting packet can be explicitly discarded using \ref discard, otherwise will be garrbage collected.
+ #\param cached_pck if set, will be reuse for creation of new packet. This can greatly reduce memory allocations
+ #\return the new FilterPacket or None if failure or None if failure ( if grabbing the frame into a local copy failed)
+ def clone(self, cached_pck=None):
+ if cached_pck:
+ _pck = _libgpac.gf_filter_pck_dangling_copy(self._pck, cached_pck._pck)
+ else:
+ _pck = _libgpac.gf_filter_pck_dangling_copy(self._pck, None)
+
+ if _pck:
+ pck = FilterPacket(_pck, False)
+ pck._readonly = False
+ return pck
+ return None
+
+
+ ##mark an output packet as readonly - see \ref gf_filter_pck_set_readonly
+ #\return
+ def readonly(self):
+ if self._is_src:
+ raise Exception('Cannot set readonly on source packet')
+ _libgpac.gf_filter_pck_set_readonly(self._pck)
+
+ ##send the packet - see \ref gf_filter_pck_send
+ #\return
+ def send(self):
+ if self._is_src:
+ raise Exception('Cannot send on source packet')
+ _libgpac.gf_filter_pck_send(self._pck)
+
+ ##copy properties of source packet in this packet - see \ref gf_filter_pck_merge_properties
+ #\param ipck source packet
+ #\return
+ def copy_props(self, ipck):
+ if self._is_src:
+ raise Exception('Cannot copy properties on source packet')
+ if ipck==None:
+ return
+ err = _libgpac.gf_filter_pck_merge_properties(ipck._pck, self._pck)
+ if err<0:
+ raise Exception('Cannot copy properties: ' + e2s(err) )
+
+ ##set property in this packet - see \ref gf_filter_pck_set_property and \ref gf_filter_pck_set_property_str
+ #\param pcode name of property
+ #\param prop property value
+ #\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
+ #\return
+ def set_prop(self, pcode, prop, custom_type=0):
+ if self._is_src:
+ raise Exception('Cannot copy properties on source packet')
+ prop_4cc = pcode
+ prop_name = None
+ if isinstance(pcode, str):
+ _pname = pcode.encode('utf-8')
+ prop_4cc = _libgpac.gf_props_get_id(_pname)
+ if prop_4cc==0:
+ prop_name = _pname
+
+ if prop==None:
+ if prop_4cc:
+ _libgpac.gf_filter_pck_set_property(self._pck, prop_4cc, None)
+ else:
+ _libgpac.gf_filter_pck_set_property_str(self._pck, prop_name, None)
+ return
+
+ prop_val = _make_prop(prop_4cc, pcode, prop, custom_type)
+ if prop_4cc:
+ _libgpac.gf_filter_pck_set_property(self._pck, prop_4cc, byref(prop_val))
+ else:
+ _libgpac.gf_filter_pck_set_property_str(self._pck, prop_name, byref(prop_val))
+
+ ##truncates an output packet to the given size - see \ref gf_filter_pck_truncate
+ #\param size new size of packet
+ #\return
+ def truncate(self, size):
+ if self._is_src:
+ raise Exception('Cannot truncate an source packet')
+ _libgpac.gf_filter_pck_truncate(self._pck, size)
+
+ ##\cond private: until end, all packet properties
+ @property
+ def blocking_ref(self):
+ return _libgpac.gf_filter_pck_is_blocking_ref(self._pck)
+
+ @property
+ def dts(self):
+ return _libgpac.gf_filter_pck_get_dts(self._pck)
+
+ @dts.setter
+ def dts(self, val):
+ if self._is_src:
+ raise Exception('Cannot set DTS on source packet')
+ _libgpac.gf_filter_pck_set_dts(self._pck, val)
+
+ @property
+ def cts(self):
+ return _libgpac.gf_filter_pck_get_cts(self._pck)
+
+ @cts.setter
+ def cts(self, val):
+ if self._is_src:
+ raise Exception('Cannot set CTS on source packet')
+ return _libgpac.gf_filter_pck_set_cts(self._pck, val)
+
+ @property
+ def sap(self):
+ return _libgpac.gf_filter_pck_get_sap(self._pck)
+
+ @sap.setter
+ def sap(self, val):
+ if self._is_src:
+ raise Exception('Cannot set SAP on source packet')
+ return _libgpac.gf_filter_pck_set_sap(self._pck, val)
+
+ @property
+ def dur(self):
+ return _libgpac.gf_filter_pck_get_duration(self._pck)
+
+ @dur.setter
+ def dur(self, val):
+ if self._is_src:
+ raise Exception('Cannot set duration on source packet')
+ return _libgpac.gf_filter_pck_set_duration(self._pck, val)
+
+ @property
+ def size(self):
+ size = c_uint(0)
+ _libgpac.gf_filter_pck_get_data(self._pck, byref(size))
+ return size.value
+
+ @property
+ def data(self):
+ size = c_uint(0)
+ data = _libgpac.gf_filter_pck_get_data(self._pck, byref(size))
+ if not data:
+ return None
+
+ if numpy_support:
+ data = np.ctypeslib.as_array(data, (size.value,))
+ if self._readonly:
+ data.flags.writeable=False
+ return data 
+
+ @property
+ def start(self):
+ start = gf_bool(False)
+ end = gf_bool(False)
+ _libgpac.gf_filter_pck_get_framing(self._pck, byref(start), byref(end))
+ return start.value
+
+ @start.setter
+ def start(self, value):
+ if self._is_src:
+ raise Exception('Cannot set framing on source packet')
+ start = gf_bool(False)
+ end = gf_bool(False)
+ _libgpac.gf_filter_pck_get_framing(self._pck, byref(start), byref(end))
+ _libgpac.gf_filter_pck_set_framing(self._pck, value, end.value)
+
+ @property
+ def end(self):
+ start = gf_bool(False)
+ end = gf_bool(False)
+ _libgpac.gf_filter_pck_get_framing(self._pck, byref(start), byref(end))
+ return end.value
+
+ @end.setter
+ def end(self, value):
+ if self._is_src:
+ raise Exception('Cannot set framing on source packet')
+ start = gf_bool(False)
+ end = gf_bool(False)
+ _libgpac.gf_filter_pck_get_framing(self._pck, byref(start), byref(end))
+ _libgpac.gf_filter_pck_set_framing(self._pck, start.value, value)
+
+ @property
+ def timescale(self):
+ return _libgpac.gf_filter_pck_get_timescale(self._pck)
+
+ @property
+ def interlaced(self):
+ return _libgpac.gf_filter_pck_get_interlaced(self._pck)
+
+ @interlaced.setter
+ def interlaced(self, value):
+ if self._is_src:
+ raise Exception('Cannot set interlaced on source packet')
+ return _libgpac.gf_filter_pck_set_interlaced(self._pck, value)
+
+ @property
+ def corrupted(self):
+ return _libgpac.gf_filter_pck_get_corrupted(self._pck)
+
+ @corrupted.setter
+ def corrupted(self, value):
+ if self._is_src:
+ raise Exception('Cannot set corrupted on source packet')
+ return _libgpac.gf_filter_pck_set_corrupted(self._pck, value)
+
+ @property
+ def seek(self):
+ return _libgpac.gf_filter_pck_get_seek_flag(self._pck)
+
+ @seek.setter
+ def seek(self, value):
+ if self._is_src:
+ raise Exception('Cannot set seek on source packet')
+ return _libgpac.gf_filter_pck_set_seek_flag(self._pck, value)
+
+ @property
+ def byte_offset(self):
+ return _libgpac.gf_filter_pck_get_byte_offset(self._pck)
+
+ @byte_offset.setter
+ def byte_offset(self, value):
+ if self._is_src:
+ raise Exception('Cannot set byte offset on source packet')
+ return _libgpac.gf_filter_pck_set_byte_offset(self._pck, value)
+
+ @property
+ def roll(self):
+ return _libgpac.gf_filter_pck_get_roll_info(self._pck)
+
+ @roll.setter
+ def roll(self):
+ if self._is_src:
+ raise Exception('Cannot set roll on source packet')
+ return _libgpac.gf_filter_pck_set_roll_info(self._pck, value)
+
+ @property
+ def crypt(self):
+ return _libgpac.gf_filter_pck_get_crypt_flags(self._pck)
+
+ @crypt.setter
+ def crypt(self, value):
+ if self._is_src:
+ raise Exception('Cannot set crypt on source packet')
+ return _libgpac.gf_filter_pck_set_crypt_flags(self._pck, value)
+
+ @property
+ def clock(self):
+ return _libgpac.gf_filter_pck_get_clock_type(self._pck)
+
+ @clock.setter
+ def clock(self, value):
+ if self._is_src:
+ raise Exception('Cannot set clock on source packet')
+ return _libgpac.gf_filter_pck_set_clock_type(self._pck, value)
+
+ @property
+ def carousel(self):
+ return _libgpac.gf_filter_pck_get_carousel_version(self._pck)
+
+ @carousel.setter
+ def carousel(self, value):
+ if self._is_src:
+ raise Exception('Cannot set carousel on source packet')
+ return _libgpac.gf_filter_pck_set_carousel_version(self._pck, value)
+
+ @property
+ def seqnum(self):
+ return _libgpac.gf_filter_pck_get_seq_num(self._pck)
+
+ @seqnum.setter
+ def seqnum(self):
+ if self._is_src:
+ raise Exception('Cannot set segnum on source packet')
+ return _libgpac.gf_filter_pck_set_seq_num(self._pck, value)
+
+ @property
+ def deps(self):
+ return _libgpac.gf_filter_pck_get_dependency_flags(self._pck)
+
+ @deps.setter
+ def deps(self, value):
+ if self._is_src:
+ raise Exception('Cannot set deps on source packet')
+ return _libgpac.gf_filter_pck_set_dependency_flags(self._pck, value)
+
+ @property
+ def has_properties(self):
+ if _libgpac.gf_filter_pck_has_properties(self._pck):
+ return True
+ return False
+
+ @property
+ def frame_ifce(self):
+ p = _libgpac.gf_filter_pck_get_frame_interface(self._pck)
+ if p:
+ return True
+ return False
+
+ ##\endcond private
+
+ #todo
+ #append ?
+
+## @}
+
+
+##\cond private
+_gf_fileio = c_void_p
+_libgpac.gf_fileio_new.argtypes = [c_char_p, py_object, c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_void_p]
+_libgpac.gf_fileio_new.restype = _gf_fileio
+
+_libgpac.gf_fileio_url.argtypes = [_gf_fileio]
+_libgpac.gf_fileio_url.restype = c_char_p
+
+_libgpac.gf_fileio_resource_url.argtypes = [_gf_fileio]
+_libgpac.gf_fileio_resource_url.restype = c_char_p
+
+_libgpac.gf_fileio_translate_url.argtypes = [c_char_p]
+_libgpac.gf_fileio_translate_url.restype = c_char_p
+
+_libgpac.gf_fileio_get_udta.argtypes = [_gf_fileio]
+_libgpac.gf_fileio_get_udta.restype = c_void_p
+
+_libgpac.gf_fileio_del.argtypes = [_gf_fileio]
+
+_libgpac.gf_fileio_tag_main_thread.argtypes = [_gf_fileio]
+
+#wraps gf_url_concatenate to be able to free the value
+#we declare a void * return value
+_libgpac.gf_url_concatenate.argtypes = [c_char_p, c_char_p]
+_libgpac.gf_url_concatenate.restype = c_void_p
+_libgpac.gf_url_free.argtypes = [c_void_p]
+
+def url_concatenate(_parent, _url):
+	#this is c_void_p
+	_path = _libgpac.gf_url_concatenate(_parent, _url)
+	if _path==None:
+		raise Exception('Failed to concatenate path, out of memory')
+	#this is a string
+	path = cast(_path, c_char_p).value.decode('utf-8')
+	#we still have the pointer, we can free it
+	_libgpac.gf_url_free(_path)
+	return path
+
+#fio open callback
+@CFUNCTYPE(_gf_fileio, _gf_fileio, c_char_p, c_char_p, POINTER(c_int))
+def fileio_cbk_open(_fio_ref, _url, _mode, error):
+ fio_ref = cast(_libgpac.gf_fileio_get_udta(_fio_ref), py_object).value
+ mode = _mode.decode('utf-8')
+ error.contents.value=GF_OK
+ if mode=="url":
+ path = url_concatenate(_libgpac.gf_fileio_resource_url(_fio_ref), _url);
+ new_gfio = FileIO(path, fio_ref)
+ fio_ref.factory.pending_urls.append(new_gfio)
+ #prevent garbage collection
+ fio_ref.factory.gc_exclude.append(new_gfio)
+ fio_ref.factory.all_refs+=1
+ return new_gfio._gf_fio
+
+ if mode=="ref":
+ fio_ref.nb_refs+=1
+ fio_ref.factory.all_refs+=1
+ return _fio_ref
+
+ if mode=="probe":
+ if not hasattr(fio_ref.factory.root_obj, 'exists'):
+ return None
+ if not fio_ref.factory.root_obj.exists(url):
+ error.contents.value=GF_URL_ERROR
+ return None
+
+ do_delete=False
+ if mode=="unref":
+ fio_ref.nb_refs-=1
+ fio_ref.factory.all_refs-=1
+ if fio_ref.nb_refs:
+ return _fio_ref
+ do_delete=True
+
+ if mode=="close":
+ if fio_ref.py_obj != None:
+ fio_ref.py_obj.close()
+ fio_ref.factory.all_refs-=1
+
+ if fio_ref.nb_refs:
+ return None
+ do_delete=True
+
+ if do_delete:
+ #file no longer used, can now be garbage collected
+ fio_ref.factory.gc_exclude.remove(fio_ref)
+
+ if not fio_ref.factory == fio_ref:
+ _libgpac.gf_fileio_del(fio_ref._gf_fio)
+ fio_ref._gf_fio = None
+
+ if not fio_ref.factory.all_refs and not len(fio_ref.factory.pending_urls) and not len(fio_ref.factory.gc_exclude):
+ _libgpac.gf_fileio_del(fio_ref.factory._gf_fio)
+ fio_ref.factory._gf_fio = None
+ fio_ref.factory.root_obj = None
+ return None
+
+
+	#this is an open() call
+ fio_url = _url.decode('utf-8')
+
+	#check if associated object exists, if not so we can use this instance
+ fio = None
+ if fio_ref.py_obj == None:
+ fio = fio_ref
+ if fio_ref in fio_ref.factory.pending_urls:
+ fio_ref.factory.all_refs-=1
+ fio_ref.factory.pending_urls.remove(fio_ref)
+
+	#check in pending urls
+ if fio == None:
+ for afio in fio_ref.factory.pending_urls:
+ a_url = _libgpac.gf_fileio_resource_url(afio._gf_fio).decode('utf-8')
+ if a_url == fio_url:
+ fio_ref.factory.all_refs-=1
+ fio_ref.factory.pending_urls.remove(afio)
+ fio = afio
+ break;
+
+	#we need to create a new FileIO
+ created=False
+ if fio==None:
+ created=True
+
+	#read url, translate
+ if fio_url.startswith('gfio://')==True:
+ fio_url = _libgpac.gf_fileio_translate_url(_url).decode('utf-8')
+	#if we create a new FileIO, we need to resolve url, against parent URL
+ elif created:
+ fio_url = url_concatenate(_libgpac.gf_fileio_resource_url(fio_ref._gf_fio), _url)
+
+ if fio==None:
+ fio = FileIO(fio_url, fio_ref)
+
+ #create object, direct copy of the object passed at construction
+ fio.py_obj = copy.copy(fio.factory.root_obj)
+ res = fio.py_obj.open(fio_url, mode)
+
+ if res==True:
+ if not fio in fio.factory.gc_exclude:
+ fio.factory.gc_exclude.append(fio)
+ fio.factory.all_refs+=1
+ return fio._gf_fio
+
+ #failure to open a new created object, remove FileIO and let the object be garbage collected
+ if created:
+ _libgpac.gf_fileio_del(fio._gf_fio)
+ fio._gf_fio = None
+
+ error.contents.value=GF_URL_ERROR
+ return None
+
+#fio write callback
+@CFUNCTYPE(c_uint, _gf_fileio, POINTER(c_ubyte), c_uint)
+def fileio_cbk_write(_fio, buf, size):
+ fio = cast(_libgpac.gf_fileio_get_udta(_fio), py_object).value
+ if numpy_support:
+ ar_data = np.ctypeslib.as_array(buf, shape=(size,))
+ ar_data.flags.writeable=False
+ return fio.py_obj.write(ar_data, size)
+ return fio.py_obj.write(buf, size)
+
+#fio read callback
+@CFUNCTYPE(c_uint, _gf_fileio, POINTER(c_ubyte), c_uint)
+def fileio_cbk_read(_fio, buf, size):
+ fio = cast(_libgpac.gf_fileio_get_udta(_fio), py_object).value
+ if numpy_support:
+ ar_data = np.ctypeslib.as_array(buf, shape=(size,))
+ ar_data.flags.writeable=True
+ return fio.py_obj.read(ar_data, size)
+ return fio.py_obj.read(buf, size)
+
+#fio seek callback
+@CFUNCTYPE(c_uint, _gf_fileio, c_ulonglong, c_int)
+def fileio_cbk_seek(_fio, pos, whence):
+ fio = cast(_libgpac.gf_fileio_get_udta(_fio), py_object).value
+ return fio.py_obj.seek(pos, whence)
+
+#fio tell callback
+@CFUNCTYPE(c_ulonglong, _gf_fileio)
+def fileio_cbk_tell(_fio):
+ fio = cast(_libgpac.gf_fileio_get_udta(_fio), py_object).value
+ return fio.py_obj.tell()
+
+#fio eof callback
+@CFUNCTYPE(gf_bool, _gf_fileio)
+def fileio_cbk_eof(_fio):
+ fio = cast(_libgpac.gf_fileio_get_udta(_fio), py_object).value
+ return fio.py_obj.eof()
+
+
+
+##\endcond private
+
+##
+# \defgroup pyfileio_grp libgpac core tools
+# \ingroup pycore_grp Python APIs
+# \brief FileIO tools for libgpac.
+#
+# @{
+
+
+## FileIO object for file IO callbacks from libgpac
+#
+#
+# The FileIO object is used to create input or output interfaces in which GPAC will read or write.
+# This allows generating content in python without any disk IO, or passing python data as input to GPAC without intermediate file.
+#
+# This object passed to the FileIO constructor must implement the following callbacks:
+#
+# \code boolean open(string URL, string mode)\endcode
+#Opens the file in read or write mode.
+#- URL: string containing file to open
+#- mode: open mode (same as fopen)
+#- return true if success, false otherwise
+#
+#\note There is no guarantee that the URL is checked for existence before calling open
+#\note There is no guarantee that the first call to open is on the URL provided for the constructor (e.g. for DASH generation, this will depend on the DASH profile used which may require to write the manifest after one or more segments)
+#
+# \code void close()\endcode
+#Closes the file
+#
+# \code int write(numpy buffer, unsigned long size)\endcode
+#Writes the file
+#- buffer: numpy array to fill if numpy support, ctypes.c_ubyte otherwise
+#- size: number of bytes to write starting from first byte in buffer
+#- return number of bytes writen, at most the size of the array
+#
+# \code int read(numy buffer, unsigned long size)\endcode
+#Reads the file
+#- buffer: numpy array to read if numpy support, ctypes.c_ubyte otherwise
+#- size: number of bytes to read
+#- return number of bytes read, at most the size of the array
+#
+# \code void seek(unsigned long long pos, int whence)\endcode
+#Seeks current position in file (same as fopen)
+#- pos: position
+#- whence: origin of the position
+#- return 0 if no error, error code otherwise
+#
+# \code unsigned long long tell()\endcode
+#Gets current position in file (same as ftell)
+#- pos: position
+#- return current position
+#
+# \code boolean eof()\endcode
+#Checks if the current position is at the end of the file (same as feof)
+#- return true if file end reached, false otherwise
+#
+# \code boolean exists(string URL)\endcode
+#Checks if the given URL exists. This callback is optional
+#- return true if associated URL exists, false otherwise
+#
+#\warning All these callbacks MUST perform synchronously
+#
+# The URL passed to the constructor indentifies the file name wrapped.
+# Some file types such as HLS or DASH manifest may imply reading or writing several files.
+# To handle these cases, the object passed to the constructor will be cloned for each call to open().
+#
+#\warning This object is a shallow copy of the factory object, not an empty object (difference with NodeJS bindings).
+#
+# All FileIO callbacks will be done in the main thread.
+#
+class FileIO:
+	## constructor for FileIO
+	#\param url url for this fileIO factory
+	#\param obj instance of the class used for IOs. This instance will be cloned (shallow copy) for each new file to open
+	def __init__(self, url, obj):
+		if 0:
+			## the underlying gfio:// URL to be provided to GPAC
+			self.url = 0
+
+##\cond private
+		_libgpac.user_init = True
+		self.nb_refs=0
+		self.py_obj = None
+		#this is internal constructor call from open
+		if obj.__class__.__name__=="FileIO":
+			self.factory = obj.factory
+		#this is regular constructor call
+		else:
+			if hasattr(obj, 'open')==False:
+				raise Exception('No open function on FileIO callback')
+			if hasattr(obj, 'close')==False:
+				raise Exception('No close function on FileIO callback')
+			if hasattr(obj, 'write')==False:
+				raise Exception('No write function on FileIO callback')
+			if hasattr(obj, 'read')==False:
+				raise Exception('No read function on FileIO callback')
+			if hasattr(obj, 'seek')==False:
+				raise Exception('No see function on FileIO callback')
+			if hasattr(obj, 'tell')==False:
+				raise Exception('No tell function on FileIO callback')
+			self.factory = self
+			self.factory.all_refs=0
+			self.factory.pending_urls=[]
+			#keep all created file IOs still useful here to prevent garbage collection
+			self.factory.gc_exclude=[]
+			self.factory.root_obj = obj
+
+		self._gf_fio = _libgpac.gf_fileio_new(url.encode('utf-8'), py_object(self), fileio_cbk_open, fileio_cbk_seek, fileio_cbk_read, fileio_cbk_write, fileio_cbk_tell, fileio_cbk_eof, None )
+		if self._gf_fio==None:
+			raise Exception('Failed to create FileIO for ' + url)
+		#ask for all file IOs to happen on main thread
+		_libgpac.gf_fileio_tag_main_thread(self._gf_fio)
+
+	@property
+	def url(self):
+		_url = _libgpac.gf_fileio_url(self._gf_fio)
+		if _url==None:
+			return None
+		return _url.decode('utf-8')
+##\endcond private
+
+## @}
+#

gpac-2.0.0.tar.gz/share/res/gpac_highres.png Added

gpac-2.0.0.tar.gz/share/scripts/custom_dash.js Added

@@ -0,0 +1,68 @@
+
+/*dummy rate adaptation for DASH client */
+
+import { Sys as sys } from 'gpaccore'
+
+_gpac_log_name="";
+
+print("Hello DASH custom algo !");
+
+let groups = [];
+
+function get_group(group_idx) 
+{
+	for (let i=0; i < groups.length; i++) {
+		if (groups[i].idx == group_idx)
+			return groups[i];
+	}
+
+	return null;
+}
+
+let nb_adapt=0;
+
+dashin.rate_adaptation = function (group_idx, base_group_idx, force_lower_complexity, stats)
+{
+//	print(`Getting called in custom algo ! group ${group_idx} base_group ${base_group_idx} force_lower_complexity ${force_lower_complexity}`);
+//	print('Stats: ' + JSON.stringify(stats));
+
+	let g = get_group(group_idx);
+	if (!g) return -1;
+
+	if (g.SRD && !g.SRD.w) {
+		nb_adapt++;
+		print('\n\nnb_adapt ' + nb_adapt);
+	}
+	else if (g.SRD && g.SRD.w) {
+		//if (!g.SRD.x || !g.SRD.y) {
+		if (stats.degradation_hint) {
+			print('disabling hidden tile ' + g.SRD.x + 'x' + g.SRD.y);
+			return -2;
+		}
+		print('use high quality for tile ' + g.SRD.x + 'x' + g.SRD.y);
+		return 1;
+	}
+	//always use lowest quality
+	return 0;
+}
+
+
+dashin.new_group = function (group)
+{
+	print("New group: " + JSON.stringify(group));
+	//remember the group (adaptation set in dash)
+	groups.push(group);
+}
+
+dashin.period_reset = function (reset_type)
+{
+	print("Period reset type " + reset_type);
+	if (!reset_type)
+		groups = [];
+}
+
+dashin.download_monitor = function (group_idx, stats)
+{
+	print("Download info " + JSON.stringify(stats));
+	return -1;
+}

gpac-2.0.0.tar.gz/share/scripts/jsf Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avgen Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avgen/init.js Added

@@ -0,0 +1,772 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2020
+ *					All rights reserved
+ *
+ * This file is part of GPAC / AVGenerator filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+import * as evg from 'evg'
+import { Sys as sys } from 'gpaccore'
+
+filter.pids = [];
+
+filter.set_name("avgen");
+filter.set_desc("AV Counter Generator");
+filter.set_version("1.0");
+filter.set_author("GPAC Team");
+filter.set_help(
+"This filter generates AV streams representing a counter. Streams can be enabled or disabled using [-type]().\n"
++"The filter is software-based and does not use GPU.\n"
++"\n"
++"When [-adjust]() is set, the first video frame is adjusted such that a full circle happens at each exact second according to the system UTC clock.\n"
++"By default, video UTC and date are computed at each frame generation from current clock and not from frame number.\n"
++"This will result in broken timing when playing at speeds other than 1.0.\n"
++"This can be changed using [-lock]().\n"
++"\n"
++"Audio beep is generated every second, with octave (2xfreq) of even beep used every 10 seconds.\n"
++"When video is generated, beep is synchronized to video at each exact second.\n"
++"\n"
++"If NTP injection is used, each video packet (but not audio ones) has a `SenderNTP` property set; if video is not used, each audio packet has a `SenderNTP` property set.\n"
++"\n"
++"# Multiple output stream generation\n"
++"More than one output size can be specified. This will result in multiple sources being generated, one per size.\n"
++"A size can be specified more than once, resulting in packet references when [-copy]() is not set, or full copies otherwise.\n"
++"Target encoding bitrates can be assigned to each output using [-rates](). This can be useful when generating dash:\n"
++"EX gpac avgen:sizes=1280x720,1920x1080:rates=2M,5M c=aac:FID=1 c=264:FID=2:clone -o live.mpd:SID=1,2\n"
++"\n"
++"# Multiview generation\n"
++"In multiview mode, only the animated counter will move in depth backward and forward, as indicated by the [-disparity]() value.\n"
++"When [-pack]() is set, a packed stereo couple is generated for each video packet.\n"
++"Otherwise, when [-views]() is greater than 2, each view is generated on a dedicated output PID with the property `ViewIdx` set in [1, views].\n"
++"Multi-view output forces usage of [-copy]() mode.\n"
++"\n"
++"# PID Naming\n"
++"The audio PID is assigned the name `audio` and ID `1`.\n"
++"If a single video PID is produced, it is assigned the name `video` and ID `2`.\n"
++"If multiple video PIDs are produced, they are assigned the names `videoN` and ID `N+1`, N in [1, sizes].\n"
++"If multiple [-views]() are generated, they are assigned the names `videoN_vK` and ID `N*views+K-1`, N in [1, sizes], K in [1, views].\n"
+);
+
+filter.set_arg({ name: "type", desc: "output selection\n- a: audio only\n- v: video only\n- av: audio and video", type: GF_PROP_UINT, def: "av", minmax_enum: "a|v|av"} );
+filter.set_arg({ name: "freq", desc: "frequency of beep", type: GF_PROP_UINT, def: "440"} );
+filter.set_arg({ name: "freq2", desc: "frequency of odd beep", type: GF_PROP_UINT, def: "659"} );
+filter.set_arg({ name: "sr", desc: "output samplerate", type: GF_PROP_UINT, def: "44100"} );
+filter.set_arg({ name: "flen", desc: "output frame length in samples", type: GF_PROP_UINT, def: "1024"} );
+filter.set_arg({ name: "ch", desc: "number of channels", type: GF_PROP_UINT, def: "1"} );
+filter.set_arg({ name: "alter", desc: "beep alternatively on each channel", type: GF_PROP_BOOL, def: "false"} );
+filter.set_arg({ name: "blen", desc: "length of beep in milliseconds", type: GF_PROP_UINT, def: "50"} );
+filter.set_arg({ name: "fps", desc: "video frame rate", type: GF_PROP_FRACTION, def: "25"} );
+filter.set_arg({ name: "sizes", desc: "video size in pixels", type: GF_PROP_VEC2I_LIST, def: "1280x720"} );
+filter.set_arg({ name: "pfmt", desc: "output pixel format", type: GF_PROP_PIXFMT, def: "yuv"} );
+filter.set_arg({ name: "lock", desc: "lock timing to video generation", type: GF_PROP_BOOL, def: "false"} );
+filter.set_arg({ name: "dyn", desc: "move bottom banner", type: GF_PROP_BOOL, def: "true"} );
+filter.set_arg({ name: "ntp", desc: "send NTP along with packets", type: GF_PROP_BOOL, def: "true"} );
+filter.set_arg({ name: "copy", desc: "copy the framebuffer into each video packet instead of using packet references", type: GF_PROP_BOOL, def: "false"} );
+filter.set_arg({ name: "dur", desc: "run for the given time in second", type: GF_PROP_FRACTION, def: "0/0"} );
+filter.set_arg({ name: "adjust", desc: "adjust start time to synchronize counter and UTC", type: GF_PROP_BOOL, def: "true"} );
+filter.set_arg({ name: "pack", desc: "packing mode for stereo views\n - no: no packing\n - ss: side by side packing, forces [-views]() to 2\n - tb: top-bottom packing, forces [-views]() to 2", type: GF_PROP_UINT, def: "no", minmax_enum: "no|ss|tb"} );
+filter.set_arg({ name: "disparity", desc: "disparity in pixels between left-most and right-most views", type: GF_PROP_UINT, def: "20"} );
+filter.set_arg({ name: "views", desc: "number of views", type: GF_PROP_UINT, def: "1"} );
+filter.set_arg({ name: "rates", desc: "number of target bitrates to assign, one per size", type: GF_PROP_STRING_LIST} );
+
+let audio_osize=0;
+let audio_cts=0;
+let audio_pid = null;
+let audio_pos=0;
+let nb_secs=0;
+let audio_odd=0;
+let audio_10s=1;
+let audio_beep_len=0;
+let audio_playing=false;
+let audio_in_beep=false;
+let audio_beep_ch=0;
+
+let videos = [];
+let video_cts=0;
+let video_frame=0;
+
+let brush = new evg.SolidBrush();
+let video_playing=false;
+let start_date = 0;
+let banner = 'many thanks to QuickJS, FreeType, OpenSSL, SDL, FFmpeg, OpenHEVC, libjpeg, libpng, faad2, libmad, a52dec, xvid, OGG ...';
+let frame_offset = 0;
+let nb_frame_init = 0;
+let utc_init = 0;
+let ntp_init = 0;
+
+/*create a text*/
+let text = new evg.Text();
+text.font = 'SANS';
+text.fontsize = 20;
+text.baseline = GF_TEXT_BASELINE_HANGING;
+text.align=GF_TEXT_ALIGN_CENTER;
+text.lineSpacing=0;
+
+filter.frame_pending = 0;
+
+filter.initialize = function() {
+
+	if (filter.type != 1) {
+		this.set_cap({id: "StreamType", value: "Audio", output: true} );	
+	}
+	if (filter.type != 0) {
+		this.set_cap({id: "StreamType", value: "Video", output: true} );
+	}
+	this.set_cap({id: "CodecID", value: "raw", output: true} );
+
+	//setup audio
+	if (filter.type != 1) {
+		audio_pid = this.new_pid();
+		audio_pid.set_prop('StreamType', 'Audio');
+		audio_pid.set_prop('CodecID', 'raw');
+		audio_pid.set_prop('SampleRate', filter.sr);
+		audio_pid.set_prop('NumChannels', filter.ch);
+		audio_pid.set_prop('Timescale', filter.sr);
+		audio_pid.set_prop('AudioFormat', 'flt');
+		audio_pid.set_prop('Cached', true);
+		audio_pid.name = "audio";
+		audio_pid.set_prop('ID', 1);
+		if (!filter.freq)
+			filter.freq = 440;
+
+		if (!filter.freq2)
+			filter.freq2 = filter.freq;
+
+		audio_osize = 4 * filter.flen * filter.ch;
+		audio_beep_len = filter.sr * filter.blen / 1000;
+	}
+
+	if (!filter.sizes || !filter.sizes.length)
+		filter.type = 0;
+
+	//setup video
+	if (filter.type != 0) {
+		let assign_rates = false;
+		//single view output if packed modes
+		if (filter.pack) filter.views = 1;
+		else if (!filter.views) filter.views = 1;
+
+		if (filter.rates && filter.rates.length) {
+			if (filter.rates.length == filter.sizes.length) {
+				assign_rates = true;
+			} else {
+				print(3, "Number of rates differ from number of video sizes, not assigning rates");
+			}
+		}
+
+		for (let vid=0; vid<filter.sizes.length; vid++) {
+			//setup one source
+			let vsrc = {};
+			vsrc.canvas=null;
+			vsrc.video_buffer=null;
+			vsrc.video_tcard_height=0;
+			vsrc.video_pids = [];
+			vsrc.forward_srcs = [];
+			vsrc.init_banner_done = false;
+			vsrc.w = filter.sizes[vid].x;
+			vsrc.h = filter.sizes[vid].y;
+			vsrc.is_forward = false;
+
+			for (let prev_vid=0; prev_vid<videos.length; prev_vid++) {
+				let a_vid = videos[prev_vid];
+				if ((a_vid.w == vsrc.w) && (a_vid.h == vsrc.h)) {
+					a_vid.forward_srcs.push(vsrc);
+					vsrc.is_forward = true;
+				}
+			}
+			videos.push(vsrc);
+			for (let view=0; view<filter.views; view++) {
+				let vpid = this.new_pid();
+				vpid.set_prop('StreamType', 'Video');
+				vpid.set_prop('CodecID', 'raw');
+				vpid.set_prop('FPS', filter.fps);
+				vpid.set_prop('Timescale', filter.fps.n);
+				vpid.set_prop('PixelFormat', filter.pfmt);
+				vpid.set_prop('Width', vsrc.w);
+				vpid.set_prop('Stride', vsrc.w);
+				vpid.set_prop('Height', vsrc.h);
+				vpid.set_prop('Cached', true);
+
+				if (assign_rates) {
+					vpid.set_prop('TargetRate', filter.rates[vid]);
+				}
+
+				let name = "video";
+				if (filter.sizes.length>1)
+					name += "" + (vid+1)*filter.views;
+
+				if (filter.views>1) {
+					vpid.name = name+"_v" + (view+1);
+					vpid.set_prop('ViewIdx', (view+1));
+					filter.copy = true;
+				} else {
+					vpid.name = name;
+				}
+				vpid.set_prop('ID', 1 + (vid+1)*filter.views + view);
+				vsrc.video_pids.push(vpid);
+			}
+
+			if (vsrc.is_forward) continue;
+
+			let osize = sys.pixfmt_size(filter.pfmt, vsrc.w, vsrc.h);
+			vsrc.video_buffer = new ArrayBuffer(osize);
+			vsrc.canvas = new evg.Canvas(vsrc.w, vsrc.h, filter.pfmt, vsrc.video_buffer);
+			vsrc.canvas.centered = true;
+			//clear to black and write our static content
+			vsrc.canvas.clearf('black');
+			vsrc.banner_fontsize = vsrc.h / 36;
+			vsrc.txt_fontsize = 20;
+
+			let tx_card = new evg.Texture("testcard.png", true);
+			let tx_gpac = new evg.Texture("$GSHARE/res/gpac_highres.png", false);
+			tx_card.repeat_s = true;
+			tx_card.repeat_t = true;
+			tx_gpac.repeat_s = true;
+			tx_gpac.repeat_t = true;
+
+			put_image(vsrc, tx_card, true, true);
+			put_image(vsrc, tx_gpac, false, true);
+			if (filter.pack) {
+				put_image(vsrc, tx_card, true, false);
+				put_image(vsrc, tx_gpac, false, false);
+			}
+			text.align=GF_TEXT_ALIGN_LEFT;
+		}
+	}
+}
+
+function put_image(vsrc, tx, is_testcard, is_first)
+{
+
+	let disp_w = vsrc.w;
+	let disp_h = vsrc.h;
+	let t_x = 0;
+	let t_y = 0;
+	if (filter.pack==1) {
+		if (is_first) {
+			t_x = -disp_w/2;
+		} else {
+			t_x = disp_w/2;
+		}
+	}
+	else if (filter.pack==2) {
+		if (is_first) {
+			t_y = disp_h/2;
+		} else {
+			t_y = -disp_h/2;
+		}
+	}
+
+	let path = new evg.Path();
+	let scale;
+	if (is_testcard) {
+		scale = disp_w/2 / tx.width;
+	} else {		
+		scale = disp_w/6 / tx.width;
+	}
+	let rw = scale * tx.width;
+	let rh = scale * tx.height;
+
+	let mmx = new evg.Matrix2D();
+	if (filter.pack==1)
+		mmx.scale(0.5, 1);
+	else if (filter.pack==2)
+		mmx.scale(1, 0.5);
+	vsrc.canvas.matrix = mmx;
+	mmx.scale(scale, scale);
+	let ox, oy;
+	//testcard in top-left quarter of image
+	if (is_testcard) {
+		ox = t_x - disp_w/2;
+		oy = t_y + disp_h/2;
+		vsrc.video_tcard_height = rh;
+		if (filter.pack==2)
+			vsrc.video_tcard_height /= 2;
+	}
+	//logo & text in top-right quarter
+	else {
+		ox = t_x + disp_w/2 - rw;
+		oy = t_y + disp_h/2;
+	}
+	path.rectangle(ox, oy, rw, rh);
+	mmx.identity = true;
+	if (filter.pack==1)
+		mmx.scale(0.5, 1);
+	else if (filter.pack==2)
+		mmx.scale(1, 0.5);
+	mmx.scale(scale, scale);
+
+	if (filter.pack==2)
+		mmx.translate(ox, oy/2);
+	else
+		mmx.translate(ox, oy);
+
+	vsrc.canvas.path = path;
+	//put a gradient behind gpac transparent logo
+	if (!is_testcard) {
+		if (filter.pack) {
+			brush.set_color('white');
+			vsrc.canvas.fill(brush);
+		} else {
+			let ch = 0.8;
+			let grad = new evg.RadialGradient();
+			grad.set_points(ox+rw/2, oy-rh/2, ox+0.46*rw, oy-0.44*rh, rw/2, rh/2);
+			grad.set_stopf(0.0, ch, ch, ch, 0.0);
+			grad.set_stopf(0.5, ch, ch, ch, 1.0);
+			grad.set_stopf(0.65, 1.0, ch, ch, 1.0);
+			grad.set_stopf(0.8, ch, ch, ch, 1.0);
+			grad.set_stopf(1.0, 0.0, 0.0, 0.0, 0.0);
+			grad.mode = GF_GRADIENT_MODE_SPREAD;
+			vsrc.canvas.fill(grad);
+		}
+	}
+	tx.mx = mmx;
+	tx.auto_mx=false;
+	vsrc.canvas.fill(tx);
+
+	if (is_testcard) return;
+
+	/*create a text*/
+	text.fontsize = rh/9;
+	text.align=GF_TEXT_ALIGN_CENTER;
+	let vprop = '' + vsrc.w + 'x' + vsrc.h + '@';
+	let fps = filter.fps.n / filter.fps.d;
+	let ifps = Math.floor(fps);
+	if (ifps==fps) fps = ifps;
+	else fps = Math.floor(100*fps) / 100;
+
+	vprop += '' + fps + ' FPS';
+	text.set_text(['GPAC AV Generator', 'v'+sys.version_full, ' ', 'UTC Locked: ' + (filter.lock ? 'yes' : 'no'), ' ', vprop]);
+
+	mmx.identity = true;
+	mmx.translate(t_x+10, oy-rh/5);
+	if (filter.pack==1)
+		mmx.scale(0.5, 1);
+	else if (filter.pack==2)
+		mmx.scale(1, 0.5);
+	vsrc.canvas.matrix = mmx;
+	vsrc.canvas.path = text;
+	brush.set_color('white');
+	vsrc.canvas.fill(brush);
+
+	vsrc.txt_fontsize = rh/7;
+}
+
+filter.process_event = function(pid, evt)
+{
+	if (evt.type == GF_FEVT_STOP) {
+		if (pid === audio_pid) audio_playing = false;
+		else video_playing = false;
+	} 
+	else if (evt.type == GF_FEVT_PLAY) {
+		if (pid === audio_pid) audio_playing = true;
+		else video_playing = true;
+		filter.reschedule();
+	} 
+}
+
+filter.process = function()
+{
+	if (!audio_playing && !video_playing) return GF_EOS;
+
+	//start by processing video, adjusting start time
+	if (video_playing) 
+		process_video();
+
+	if (audio_playing)
+		process_audio();
+	return GF_OK;
+}
+
+function process_audio()
+{
+	if (!audio_pid || audio_pid.would_block)
+		return;
+
+	let pck = audio_pid.new_packet(audio_osize);
+
+	let farray = new Float32Array(pck.data);
+	for (let i=0; i<filter.flen; i++) {
+		let idx;
+		let samp = 0;
+		let cur_pos = audio_pos - nb_secs*filter.sr; 
+		if (cur_pos < 0) {}
+		else if (cur_pos > audio_beep_len) {
+			if (audio_in_beep) {
+				audio_beep_ch ++;
+				if (audio_beep_ch==filter.ch) audio_beep_ch = 0;
+			}
+			audio_in_beep = false;
+		}
+		else {
+			audio_in_beep = true;
+			if (audio_odd) {
+				samp = Math.sin( audio_pos * 2 * Math.PI * filter.freq2 / filter.sr);
+			} else if (audio_10s) {
+				samp = Math.sin( audio_pos * 2 * Math.PI * 2 * filter.freq / filter.sr);
+			} else {
+				samp = Math.sin( audio_pos * 2 * Math.PI * filter.freq / filter.sr);
+			}
+			//triangle amplitude
+			let scaler = 0.5 - cur_pos / audio_beep_len;
+			if (scaler>=0) scaler = (0.5 - scaler) * 2;
+			else scaler = (scaler+0.5) * 2;
+			samp *= scaler;
+		}
+		idx = filter.ch * i;
+		for (let k=0; k<filter.ch; k++) {
+			if (filter.alter && (audio_beep_ch!=k)) {
+				farray[idx + k] = 0;
+			} else {
+				farray[idx + k] = samp;
+			}
+		}
+		audio_pos++;
+		if (cur_pos >= filter.sr) {
+			nb_secs++;
+			audio_odd = (nb_secs % 2);
+			audio_10s = ! (nb_secs % 10);
+		}
+	}
+
+	/*set packet properties and send it*/
+	pck.cts = audio_cts;
+	pck.dur = filter.flen;
+	pck.sap = GF_FILTER_SAP_1;
+	
+	//when prop value is set to true for 'SenderNTP', automatically set 
+	if (!videos.length && filter.ntp)
+		pck.set_prop('SenderNTP', true);
+	pck.send();
+	audio_cts += filter.flen;
+
+	if (filter.dur.d) {
+		if (audio_cts * filter.dur.d >= filter.sr * filter.dur.n) {
+			audio_playing = false;
+			audio_pid.eos = true;
+		}
+	}
+}
+
+function process_video()
+{
+	if (!filter.copy) {
+		if (filter.frame_pending)
+			return;
+	}
+
+	let date = new Date();
+	let utc, ntp;
+	//remember start date for lock, and compute initial offset in cycles so that we reach tull cycle at each second
+	if (!start_date) {
+		start_date = date.getTime(); 
+		let ms_init = date.getMilliseconds();
+		if (filter.adjust) {
+			frame_offset = filter.fps.n * ms_init / 1000;
+
+			//in audio samples
+			audio_pos = Math.floor(ms_init * filter.sr / 1000);
+	
+			//move to nb frames
+			nb_frame_init = Math.floor(frame_offset / filter.fps.d);
+			frame_offset = filter.fps.d * nb_frame_init;
+		}
+		utc_init = sys.get_utc();
+		ntp_init = sys.get_ntp();
+		utc = utc_init;
+		ntp = ntp_init;
+	}
+	else if (filter.lock) {
+		let elapsed_us = (1000000 * video_cts) / filter.fps.n;
+		let elapsed_ms = Math.floor(elapsed_us / 1000);
+		date.setTime(start_date + elapsed_ms);
+		utc = utc_init + elapsed_ms;
+		ntp = sys.ntp_shift(ntp_init, elapsed_us);
+	} else {
+		utc = sys.get_utc();
+		ntp = sys.get_ntp();
+	}
+
+	let time = (video_cts + frame_offset) / filter.fps.n;
+	let sec = Math.floor(time);
+	let col_idx = sec % 2;
+	let cycle_time = time;
+	while (cycle_time>=1) cycle_time -= 1;
+
+
+	let ms = time - sec;
+	let h = Math.floor(sec / 3600);
+	let m = Math.floor(sec / 60 - h*60);
+	let s = Math.floor(sec - h*3600 - m * 60);
+	//adjusted nb frames, reset cycle time
+	let nbf = Math.floor( ((video_cts + frame_offset) - sec * filter.fps.n) / filter.fps.d );
+	if (!nbf) cycle_time = 0;
+
+	let col = (!cycle_time && !(sec % 10)) ? 'slateblue' : 'black';
+
+	for (let vid=0; vid<videos.length; vid++) {
+		let vsrc = videos[vid];
+		if (vsrc.is_forward) continue;
+
+		for (let i=0; i<filter.views; i++) {
+			let vpid = vsrc.video_pids[i];
+			if (filter.copy && vpid.would_block)
+				continue;
+
+			let nb_pack_views = filter.pack ? 2 : 1;
+			for (let j=0; j<nb_pack_views; j++) {
+				draw_view(vsrc, i+j, col, col_idx, cycle_time, h, m, s, nbf, video_frame, date, utc, ntp);
+			}
+
+			if (!vsrc.init_banner_done) {
+				vsrc.init_banner_done = true;
+			}
+		
+			let forward_idx = 0;
+			let a_src = vsrc;
+			while (a_src) {
+				let pck = null;
+				if (filter.copy) {
+					pck = vpid.new_packet(vsrc.video_buffer);
+					filter.frame_pending = 0;
+				} else {
+					pck = vpid.new_packet(vsrc.video_buffer, true, () => { filter.frame_pending--; } );
+					filter.frame_pending ++;
+				}
+				/*set packet properties and send it*/
+				pck.cts = video_cts;
+				pck.dur = filter.fps.d;
+				pck.sap = GF_FILTER_SAP_1;
+				if (filter.ntp)
+					pck.set_prop('SenderNTP', ntp);
+				pck.send();
+				a_src = null;
+				if (forward_idx < vsrc.forward_srcs.length) {
+					a_src = vsrc.forward_srcs[forward_idx];
+					forward_idx++;
+					vpid = a_src.video_pids[i];
+				} else {
+					break;
+				}
+			}
+		}
+	}
+
+	video_cts += filter.fps.d;
+	video_frame++;
+
+	if (filter.dur.d && (video_cts * filter.dur.d >= filter.fps.n * filter.dur.n)) {
+		print("done playing, cts " + video_cts);
+		video_playing = false;
+		for (let vid=0; vid<videos.length; vid++) {
+			let vsrc = videos[vid];
+			for (let i=0; i<filter.views; i++) {
+				vsrc.video_pids[i].eos = true;
+			}
+		}
+	}
+}
+
+function draw_view(vsrc, view_idx, col, col_idx, cycle_time, h, m, s, nbf, video_frame, date, utc, ntp)
+{
+	let disp_w = vsrc.w;
+	let disp_h = vsrc.h;
+	let t_x = 0;
+	let t_y = 0;
+	let r = disp_h/4;
+	if (filter.pack==1) {
+		disp_w /= 2;
+		if (!view_idx) {
+			t_x = -disp_w/2;
+		} else {
+			t_x = disp_w/2;
+		}
+	}
+	else if (filter.pack==2) {
+		disp_h /= 2;
+		if (!view_idx) {
+			t_y = disp_h/2;
+		} else {
+			t_y = -disp_h/2;
+		}
+	}
+
+
+	let clear_crop = filter.dyn ? 0 : 3*vsrc.banner_fontsize;
+	if (view_idx && !filter.pack)
+		clear_crop = 3*vsrc.banner_fontsize;
+
+	let remain_y = disp_h - vsrc.video_tcard_height;
+	//clear bottom-left
+	if (!view_idx || filter.pack)
+		vsrc.canvas.clearf({x: t_x -disp_w/2-2,y: t_y - remain_y/2, w: disp_w/2+4, h: remain_y - clear_crop}, 'black');
+	//clear circle
+	vsrc.canvas.clearf({x: t_x + 1, y: t_y + disp_h/5, w:disp_w/2, h: 7*disp_h/10 - clear_crop}, col);
+
+	let cx = t_x + disp_w/4;
+	let cy = t_y - disp_h/4 + disp_h/5;
+
+
+	let disparity = 0;
+	if (filter.pack || (filter.views>1)) {
+		let num_views = filter.pack ? 2 : filter.views;
+		//disparity of first view
+		let d = (cycle_time-0.5) * filter.disparity;
+		if (col_idx) {
+			d *= -1;
+		}
+		let dstep = -2*d / (num_views-1);
+		disparity = d + view_idx * dstep;
+	}
+
+	let mx = new evg.Matrix2D();
+	if (filter.pack==1)
+		mx.scale(0.5, 1);
+	else if (filter.pack==2)
+		mx.scale(1, 0.5);
+	mx.translate(cx + disparity, cy);
+	vsrc.canvas.matrix = mx;
+
+	let path = new evg.Path();
+
+	if (col_idx) {
+		brush.set_color('white');
+	} else {		
+		brush.set_color('grey');
+	}
+	path.ellipse(0, 0, 2*r, 2*r);
+	vsrc.canvas.path = path;
+	vsrc.canvas.fill(brush);
+	
+	if (cycle_time) {
+		path.reset();
+		let start = Math.PI/2 - cycle_time * 2 * Math.PI;
+		path.arc(r/2, start, Math.PI/2, 2);
+	} else {
+		col_idx = !col_idx;		
+	}
+
+	if (col_idx) {
+		brush.set_color('grey');
+	} else {		
+		brush.set_color('white');
+	}
+	vsrc.canvas.path = path;
+	vsrc.canvas.fill(brush);
+
+	text.align=GF_TEXT_ALIGN_LEFT;
+	text.fontsize = vsrc.txt_fontsize;
+
+	let t = 'Time: ';
+	if (h<10) t = t+'0'+h;
+	else t = t+''+h;
+	
+	if (m<10) t = t+':0'+m;
+	else t = t + ':' + m;
+
+	if (s<10) t = t+':0'+s;
+	else t = t+':'+s;
+
+	if (nbf<10) t = t+'/0'+nbf;
+	else t = t+'/'+nbf;
+
+	text.set_text(['Frame: '+(video_frame+nb_frame_init), t]);
+
+	if (filter.pack || (filter.views>1)) {
+		mx.identity = true;
+		mx.translate(-r/2, -1.2*r);
+		if (filter.pack==1)
+			mx.scale(0.5, 1);
+		else if (filter.pack==2)
+			mx.scale(1, 0.5);
+		mx.translate(cx, cy);
+	} else {
+		mx.translate(-r, -1.2*r);
+	}
+
+
+	vsrc.canvas.matrix = mx;
+	vsrc.canvas.path = text;
+	brush.set_color('white');
+	vsrc.canvas.fill(brush);
+
+	//non packed, Nth view: no changes
+	if (view_idx && !filter.pack)
+		return;
+
+	text.set_text([' Date: ' + date.toUTCString(), ' Local: ' + date], ' UTC (ms): ' + utc, ' NTP (s.f): ' + ntp.n + '.' + ntp.d.toString(16) );
+
+	mx.identity = true;
+	if (filter.pack==1)
+		mx.scale(0.5, 1);
+	else if (filter.pack==2)
+		mx.scale(1, 0.5);
+	mx.translate(t_x -disp_w/2, t_y - disp_h/4);
+	vsrc.canvas.matrix = mx;
+	vsrc.canvas.path = text;
+	brush.set_color('white');
+	vsrc.canvas.fill(brush);
+
+	if (!filter.dyn && vsrc.init_banner_done) 
+		return;
+
+	if (filter.pack==1)
+		vsrc.canvas.clipper = {x:t_x - disp_w/2,y:0, w: disp_w, h: filter.h };
+
+	let pos_x = (video_frame+nb_frame_init) % (16 * filter.fps.n);
+	pos_x /= 10*filter.fps.n;
+	pos_x = - (pos_x + 0.25) * disp_w;
+	if (!filter.dyn) {
+		pos_x = pos_x - 2*disp_w/5;
+		text.align=GF_TEXT_ALIGN_CENTER;
+	}
+	text.fontsize = vsrc.banner_fontsize;
+	text.bold = true;
+	text.italic = true;
+	mx.identity = true;
+	if (filter.pack==1)
+		mx.scale(0.5, 1);
+	else if (filter.pack==2)
+		mx.scale(1, 0.5);
+
+	if (!filter.dyn) {
+		text.set_text([sys.copyright, banner]);
+		mx.translate(0, text.fontsize/2);
+	} else {
+		text.set_text([sys.copyright + ' - ' + banner]);
+	}
+	mx.translate(t_x + pos_x, t_y -disp_h/2 + text.fontsize);
+
+	vsrc.canvas.matrix = mx;
+	vsrc.canvas.path = text;
+	brush.set_color('red');
+	vsrc.canvas.fill(brush);
+	brush.set_color('white');
+	mx.translate(-1, 1);
+	vsrc.canvas.matrix = mx;
+	vsrc.canvas.fill(brush);
+	text.bold = false;
+	text.italic = false;
+	text.fontsize = vsrc.txt_fontsize;
+
+	vsrc.canvas.clipper = null;
+}
+

gpac-2.0.0.tar.gz/share/scripts/jsf/avgen/testcard.png Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/help.js Added

@@ -0,0 +1,572 @@
+
+export const help = `AVMix is an audio video mixer controlled by an updatable JSON playlist format. The filter can be used to:
+- schedule video sequence(s) over time
+- mix videos together
+- layout of multiple videos
+- overlay images, text and graphics over source videos
+
+All input streams are decoded prior to entering the mixer.
+- audio streams are mixed in software
+- video streams are composed according to the \`gpu\` option
+- other stream types are not yet supported
+
+OpenGL hardware acceleration can be used, but the supported feature set is currently not the same with or without GPU.
+
+In software mode, the mixer will detect whether any of the currently active video sources can be used as a base canvas for the output to save processing time.
+The default behavior is to do this detection only at the first generated frame, use \`dynpfmt\` to modify this.
+
+The filter can be extended through JavaScript modules. Currently only scenes and transition effects use this feature.
+
+
+# Live vs offline
+
+When operating offline, the mixer will wait for video frames to be ready for 10 times \`lwait\`. After this timeout, the filter will abort if no input is available.
+This implies that there shall always be a media to compose, i.e. no "holes" in the timeline.
+Note: The playlist is still refreshed in offline mode.
+
+
+When operating live, the mixer will initially wait for video frames to be ready for \`lwait\` seconds. After this initial timeout, the output frames will indicate:
+- 'No signal' if no input is available (no source frames) or no scene is defined
+- 'Signal lost' if no new input data has been received for \`lwait\` on a source
+`;
+
+export const help_playlist = `
+# Playlist Format
+## Overview
+The main components in a playlist are:
+- Media sources and sequences: each source is described by one or more URL to the media data, and each sequence is a set of sources to be played continuously 
+- Transitions: sources in a sequence can be combined using transitions
+- Scenes: a scene describes one graphical object to put on screen and if and how input video are mapped on objects
+- Groups: a group is a hierarchy of scenes and groups with positioning properties, and can also be used to create offscreen images reused by other elements
+- Timers: a timer can be used to animate scene parameters in various fashions
+
+The playlist content shall be either a single JSON object or an array of JSON objects, hereafter called root objects.
+Root objects types can be indicated through a \`type\` property:
+- seq: a \`sequence\` object
+- url: a \`source\` object (if used as root, a default \`sequence\` object will be created)
+- scene: a \`scene\` object
+- group: a \`group\` object
+- timer: a \`timer\` object
+- script: a \`script\` object
+- config: a \`config\` object
+- watch: a \`watcher\` object
+- style: a \`style\` object
+
+Except for \`style\`, the \`type\` property of root objects is usually not needed as the parser guesses the object types from its properties.
+
+
+A root object with a property \`skip\` set to anything but \`0\` or \`false\` is ignored.
+Within a \`group\` hierarchy, any \`scene\` or \`group\` object with a property \`skip\` set to anything but \`0\` or \`false\` is ignored.
+
+Any unrecognized property not starting with \`_\` will be reported as warning.
+
+## Colors
+Colors are handled as strings, formatted as:
+- the DOM color name (see \`gpac -h colors\`)
+- HTML codes \`$RRGGBB\` or \`#RRGGBB\`
+- RGB hex vales \`0xRRGGBB\`
+- RGBA hex values \`0xAARRGGBB\`
+- the color \`none\` is \`0x00000000\`, its signification depends on the object using it.
+
+If JS code needs to manipulate colors, use sys.color_lerp and sys.color_component functions.
+
+
+## JS Hooks
+
+Some object types allow for custom JS code to be executed. 
+The script code can either be the value of the property, or located in a file indicated in the property. 
+The code is turned into a function (i.e. \`new Function(args, js_code)\`) upon initial playlist parsing or reload, hereafter called \`JSFun\`.
+The \`JSFun\` arguments and return value are dependent on the parent object type.
+The parent object is exposed as \`this\` in \`JSFun\` and can be used to store context information for the JS code.
+
+The code can use the global functions and modules defined, especially:
+- sys: GPAC system module
+- evg: GPAC EVG module
+- os: QuickJS OS module 
+- video_playing: video playing state
+- audio_playing: audio playing state
+- video_time: output video time
+- video_timescale: output video timescale
+- video_width: output video width
+- video_height: output video height
+- audio_time: output audio time
+- audio_timescale: output audio timescale
+- samplerate: output audio samplerate
+- channels: output audio channels
+- current_utc_clock: current UTC clock in ms
+- get_media_time: gets media time of output (no argument) or of source with id matching the first argument. Return
+ - -4: not found
+ - -3: not playing
+ - -2: in prefetch
+ - -1: timing not yet known
+ - value: media time in seconds (float)
+- resolve_url: resolves URL given in first argument against media playlist URL and returns the resolved url (string)
+- get_scene(id): gets scene with given ID
+- get_group(id): gets group with given ID
+- mouse_over(evt): returns scene under mouse described by a GPAC event, or null if no scene (picking for scenes with perspective projection is not supported)
+- mouse_over(x, y): returns scene under coordinates {x, y} in pixels, {0,0} representing the center of the frame, x axis oriented towards the right and y axis oriented towards the top
+
+Scene and group options must be accessed through getters and setters:
+- scene.get(prop_name): gets the scene option
+- scene.set(prop_name, value): sets the scene option
+- group.get(prop_name): gets the group option
+- group.set(prop_name, value): sets the group option
+
+Warning: Results are undefined if JS code modifies the scene/group objects in any other way.
+
+Other playlist objects (as well as scene and group objects) can be queried using \`query_element(ID, propName)\` or modified using \`update_element(ID, propName, value)\` (see playlist update below). 
+
+Warning: There is no protection of global variables and state, write your script carefully!
+
+Additionally, scripts executed within scene modules can modify the internal playlist using:
+- remove_element(ID): removes a scene, group, sequence, timer, script or watcher with given ID from playlist
+- parse_element(JSON): parses a root playlist element and add it to the current playlist
+- parse_scene(JSON, parent): parses a scene and add it to \`parent\` group if not null or root otherwise
+- parse_group(JSON, parent): parses a group and add it to \`parent\` group if not null or root otherwise
+- reload_playlist(JSON): parses a new playlist (an empty JSON array will reset the playlist). If the calling scene is no longer in the resulting scene tree, it will be added to the root of the scene tree.
+
+All these playlist-related functions must be called within the update() callback of the scene module.
+
+## Sequences
+### Properties for \`sequence\` objects:
+ - id (null): sequence identifier
+ - loop (0): number of loops for the sequence (0 means no loop, -1 will loop forever)
+ - start (0): sequence start time (see notes). If negative, the sequence is not active
+ - stop (0): sequence stop time (see notes). If less than \`start\`, the sequence will stop only when over
+ - transition (null): a \`transition\` object to apply between sources of the sequence
+ - seq ([]): array of one or more \`source\` objects
+
+### Notes
+Media source timing does not depend on the media being used by a scene or not, it is only governed by the \`sequence\` parameters.
+This means that a \`sequence\` not used by any active scene will not be rendered (video nor audio).
+
+The syntax for \`start\` and \`stop\` fields is:
+- \`now\`: resolves to current UTC clock in \`live\` mode, and to 0 for non-live mode
+- date: converted to UTC date in \`live\` mode, and to 0 for non-live mode
+- N: converted to current utc clock plus N seconds UTC
+- "N": converted to current utc clock plus N seconds UTC
+
+
+## Sources
+### Properties for \`source\` objects
+- id (null): source identifier, used when reloading the playlist
+- src ([]): list of \`sourceURL\` describing the URLs to play. Multiple sources will be played in parallel
+- start (0.0): media start time in source
+- stop (0.0): media stop time in source, ignored if less than or equal to \`start\`
+- mix (true): if true, apply sequence transition or mix effect ratio as audio volume. Otherwise volume is not modified by transitions.
+- fade ('inout'): indicate how audio should be faded at stream start/end:
+ - in: audio fade-in when playing first frame
+ - out: audio fade-out when playing last frame
+ - inout: both fade-in and fade-out are enabled
+ - other: no audio fade
+- keep_alive (false): if using a dedicated gpac process for one or more input, relaunch process(es) at source end if exit code is greater than 2 or if not responding after \`rtimeout\`
+- seek (false): if true and \`keep_alive\` is active, adjust \`start\` according to the time elapsed since source start when relaunching process(es)
+- prefetch (500): prefetch duration in ms (play before start time of source), 0 for no prefetch
+
+## Source Locations
+### Properties for \`sourceURL\` objects
+- id (null): source URL identifier, used when reloading the playlist
+- in (null): input URL or filter chain to load as string. Words starting with \`-\` are ignored. The first entry must specify a source URL, and additional filters and links can be specified using \`@N[#LINKOPT]\` and \`@@N[#LINKOPT]\` syntax, as in gpac
+- port (null): input port for source. Possible values are:
+ - pipe: launch a gpac process to play the source using GSF format over pipe
+ - tcp, tcpu: launch a gpac process to play the source using GSF format over TCP socket (\`tcp\`) or unix domain TCP socket (\`tcpu\`)
+ - not specified or empty string: loads source using the current process
+ - other: use value as input filter declaration and launch \`in\` as a dedicated process (e.g. \`in="ffmpeg ..." port="pipe://..."\`)
+- opts (null): options for the gpac process instance when using a dedicated gpac process, ignored otherwise
+- media ('all'): filter input media by type, \`a\` for audio, \`v\` for video, \`t\` for text (several characters allowed, e.g. \`av\` or \`va\`), \`all\` accept all input media
+- raw (true): indicate if input port is decoded AV (true) or compressed AV (false) when using a dedicated gpac process, ignored otherwise
+
+### Notes
+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.
+
+## 2D and 3D transformation
+### Common properties for \`group\` and \`scene\` objects
+- active (true): indicate if the object is active or not. An inactive object will not be refreshed nor rendered
+- x (0): horizontal translation
+- y (0): vertical translation
+- cx (0): horizontal coordinate of rotation center
+- cy (0): vertical coordinate of rotation center
+- units ('rel'): unit type for \`x\`, \`y\`, \`cx\`, \`cy\`, \`width\` and \`height\`. Possible values are:
+ - rel: units are expressed in percent of current reference (see below)
+ - pix: units are expressed in pixels
+- rotation (0): rotation angle of the scene in degrees
+- hscale (1): horizontal scaling factor to apply to the group
+- vscale (1): vertical skewing factor to apply to the scene
+- hskew (0): horizontal skewing factor to apply to the scene
+- vskew (0): vertical skewing factor to apply to the scene
+- zorder (0): display order of the scene or of the offscreen group (ignored for regular groups)
+- untransform (false): if true, reset parent tree matrix to identity before computing matrix
+- mxjs (null): JS code for matrix evaluation
+- z (0): depth translation
+- cz (0): depth coordinate of rotation center
+- zscale (1): depth scaling factor to apply to the group
+- orientation ([0, 0, 1, 0]): scale along the given orientation axis [x, y, z, angle] - see VRML \`scaleOrientation\`
+- axis ([0, 0, 1]): rotation axis
+- position ([0, 0, auto]): camera location
+- target ([0, 0, 0]): point where the camera is looking
+- up ([0, 1, 0]): camera up vector
+- viewport ([0, 0, 100, 100]): viewport for camera
+- fov (45): field of view in degrees
+- ar (0): camera aspect ratio, 0 means default
+- znear (0): near Z plane distance, 0 means default
+- zfar (0): far Z plane distance, 0 means default
+
+
+### Coordinate System
+Each group or scene is specified in a local coordinate system for which:
+- {0,0} represents the center
+- X values increase to the right
+- Y values increase to the top
+- Z values increase towards the eye of a viewer (Z=X^Y)
+
+The 2D local transformation matrix is computed as \`rotate(cx, cy, rotation)\` * \`hskew\` * \`vskew\` * \`scale(hscale, vscale)\` * \`translate(x, y)\`.
+The 3D local transformation matrix is computed as \`translate(x, y, z)\` * \`rotate(cx, cy, cz, rotation)\` * \`scale(hscale, vscale, zscale)\`. Skewing is not supported for 3D.
+
+The default unit system (\`rel\`) is relative to the current established reference space:
+- by default, the reference space is \`{output_width, output_height}\`, the origin {0,0} being the center of the output frame 
+- any group with \`reference=true\`, \`width>0\` and \`height>0\` establishes a new reference space \`{group.width, group.height}\`
+
+Inside a reference space \`R\`, relative coordinates are interpreted as follows:
+- For horizontal coordinates, 0 means center, -50 means left edge (\`-R.width/2\`), 50 means right edge (\`+R.width/2\`).
+- For vertical coordinates, 0 means center, -50 means bottom edge (\`-R.height/2\`), 50 means top edge (\`+R.height/2\`).
+- For \`width\`, 100 means \`R.width\`.
+- For \`height\`, 100 means \`R.height\`.
+- For depth (z and cz) coordinates, the value is a percent of the reference height (\`+R.height\`).
+
+If \`width=height\`, the width is set to the computed height of the object.
+If \`height=width\`, the height is set to the computed width of the object.
+For \`x\` property, the following special values are defined:
+- \`y\` will set the value to the computed \`y\` of the object.
+- \`-y\` will set the value to the computed \`-y\` of the object.
+For \`y\` property, the following special values are defined:
+- \`x\` will set the value to the computed \`x\` of the object.
+- \`-x\` will set the value to the computed \`-x\` of the object.
+
+
+Changing reference is typically needed when creating offscreen groups, so that children relative coordinates are resolved against the offscreen canvas size.
+
+The selection between 2D and 3D is done automatically based on \`z\`, \`cz\`, \`axis\` and \`orientation\` values.
+The default projection is:
+- viewport is the entire output frame
+- field of view is PI/4 and aspect ratio is output width/height
+- zNear is 0.1 and zFar is 10 times maximum(output width, output height)
+- camera up direction is Y axis and camera distance is so that a rectangle facing the camera with \`z=0\` and size equal to output size covers exactly the output frame.
+- depth buffer is disabled
+
+The default projection can be changed by setting camera properties at group or scene level. When set on a group, all children of the group will use the given camera properties (camera parameters on children are ignored).
+The \`viewport\` parameter is specified as an array \`[x, y, w, h]\`, where:
+- x: horizontal coordinate of the viewport center, in group or scene units, or 'y' to use \`y\` value, or '-y' to use -\`y\` value.
+- y: vertical coordinate of the viewport center, in group or scene units, or 'x' to use \`x\` value, or '-x' to use -\`x\` value.
+- w: width of the viewport, in group or scene units, or 'height' to use \`h\` value.
+- h: height of the viewport, in group or scene units, or 'width' to use \`w\` value.
+
+### z-ordering
+\`zorder\` specifies the display order of the element in the offscreen canvas of the enclosing offscreen group, or on the output frame if no offscreen group in parent tree.
+This order is independent of the parent group z-ordering. This allows moving objects of a group up and down the display stack without modifying the groups.
+
+### Coordinate modifications through JS
+The \`JSFun\` specified in \`mxjs\` has a single parameter \`tr\`.
+
+The \`tr\` parameter is an object containing the following variables that the code can modify:
+- x, y, z, cx, cy, cz, hscale, vscale, zscale, hskew, vskew, rotation, untransform, axis, orientation: these values are initialized to the current group values in local coordinate system units
+- update: if set to true, the object matrix will be recomputed at each frame even if no change in the group or scene parameters (always enforced to true if \`use\` is set)
+- depth: for groups with \`use\`, indicates the recursion level of the used element. A value of 0 indicates this is a direct render of the element, otherwise it is a render through \`use\`
+
+The \`JSFun\` may return false to indicate that the scene should be considered as inactive. Any other return value (undefined or not false) will mark the scene as active.
+
+EX: "mxjs": "tr.rotation = (get_media_time() % 8) * 360 / 8; tr.update=true;"
+
+
+## Grouping
+### Properties for \`group\` objects
+- id (null): group identifier
+- scenes ([]): zero or more \`group\` or \`scene\` objects, cannot be animated or updated
+- opacity (1): group opacity
+- offscreen ('none'): set group in offscreen mode, cannot be animated or updated. An offscreen mode is not directly visible but can be used in some texture operations. Possible values are:
+ - none: regular group
+ - mask: offscreen surface is alpha+grey
+ - color: offscreen surface is alpha+colors or colors if \`back_color\` is set
+ - dual: same as \`color\` but allows group to be displayed
+- scaler (1): when opacity or offscreen rendering is used, offscreen canvas size is divided by this factor (>=1)
+- back_color ('none'): when opacity or offscreen rendering is used, fill offscreen canvas with the given color.
+- width (-1): when opacity or offscreen rendering is used, limit offscreen width to given value (see below)
+- height (-1): when opacity or offscreen rendering is used, limit offscreen height to given value (see below)
+- use (null): id of group or scene to re-use
+- use_depth (-1): number of recursion allowed for the used element, negative means global max branch depth as indicated by \`maxdepth\`
+- reverse (false): reverse scenes order before draw
+- reference (false): group is a reference space for relative coordinate of children nodes 
+
+### Notes
+The maximum depth of a branch in the scene graph is \`maxdepth\` (traversing aborts after this limit).
+
+In offscreen mode, the bounds of the enclosed objects are computed to allocate the offscreen surface, unless \`width\` and \`height\` are both greater or equal to 0.
+Enforcing offscreen size is useful when generating textures for later effects.
+
+Offscreen rendering is always done in software.
+
+When enforcing \`scaler>1\` on a group with \`opacity==1\`, offscreen rendering will be used and the scaler applied.
+
+When enforcing \`width\` and \`height\` on a group with \`opacity<1\`, the display may be truncated if children objects are out of the offscreen canvas bounds.
+
+## Scenes
+### Properties for \`scene\` objects
+- id (null): scene identifier
+- js ('shape'): scene type, either builtin (see below) or path to a JS module, cannot be animated or updated
+- sources ([]): list of identifiers of sequences or offscreen groups used by this scene
+- width (-1): width of the scene, -1 means reference space width
+- height (-1): height of the scene, -1 means reference space height
+- mix (null): a \`transition\` object to apply if more than one source is set, ignored otherwise
+- mix_ratio (-1): mix ratio for transition effect, <=0 means first source only, >=1 means second source only
+- volume (1.0): audio volume (0: silence, 1: input volume), this value is not clamped by the mixer.
+- fade ('inout'): indicate how audio should be faded at scene activate/deactivate:
+ - in: audio fade-in when playing first frame after scene activation
+ - out: audio fade-out when playing last frame at scene activation
+ - inout: both fade-in and fade-out are enabled
+ - other: no audio fade
+- styles ([]): list of style IDs to use
+- any other property exposed by the underlying scene JS module.
+
+### Notes
+Inputs to a scene, whether \`sequence\` or offscreen \`group\`, must be declared prior to the scene itself.
+
+A default scene will be injected if none is found when initially loading the playlist. If you need to start with an empty output, use a scene with no sequence associated.
+
+## Transitions and Mixing effects
+### JSON syntax
+Properties for \`transition\` objects:
+- id (null): transition identifier
+- type: transition type, either builtin (see below) or path to a JS module
+- dur: transition duration (transitions always end at source stop time). Ignored if transition is specified for a scene \`mix\`.
+- fun (null): JS code modifying the ratio effect
+- any other property exposed by the underlying transition module.
+
+### Notes
+A \`sequence\` of two media with playback duration (as indicated in \`source\`) of D1 and D2 using a transition of duration DT will result in a sequence lasting \`D1 + D2 - DT\`.
+
+The \`JSFun\` specified by \`fun\` takes one argument \`ratio\` and must return the recomputed ratio.
+
+EX "fun": "return ratio*ratio;"
+
+
+## Timers and animations
+### Properties for \`timer\` objects
+- id (null): id of the timer
+- dur (0): duration of the timer in seconds
+- loop (false): loops timer when \`stop\` is not set
+- pause (false): pause timer
+- start (-1): start time (see notes), negative value means inactive
+- stop (-1): stop time (see notes), ignored if less than \`start\`
+- keys ([]): list of keys used for interpolation, ordered list between 0.0 and 1.0
+- anims ([]): list of \`animation\` objects
+
+### Properties for \`animation\` objects
+- values ([]): list of values to interpolate, there must be as many values as there are keys
+- color (false): indicate the values are color (as strings)
+- angle (false): indicate the interpolation factor is an angle in degree, to convert to radians (interpolation ratio multiplied by PI and divided by 180) before interpolation
+- mode ('linear') : interpolation mode:
+ - linear: linear interpolation between the values
+ - discrete: do not interpolate
+ - other: JS code modifying the interpolation ratio
+- postfun (null): JS code modifying the interpolation result
+- end ('freeze'): behavior at end of animation:
+ - freeze: keep last animated values
+ - restore: restore targets to their initial values
+- targets ([]): list of strings indicating targets properties to modify. Syntax is:
+ - ID@option: modifies property \`option\` of object with given ID
+ - ID@option[IDX]: modifies value at index \`IDX\` of array property \`option\` of object with given ID
+
+### Notes
+Currently, only \`scene\`, \`group\`, \`transition\` and \`script\` objects can be modified through timers (see playlist updates).
+
+The syntax for \`start\` and \`stop\` fields is:
+- \`now\`: resolves to current UTC clock in \`live\` mode, and to 0 for non-live mode
+- date: converted to UTC date in \`live\` mode, and to 0 for non-live mode
+- N: converted to UTC clock at init plus N seconds for \`timer\` objects (absolute offset from timeline init)
+- "N": converted to current UTC clock plus N seconds (relative offset from current time) with N a positive or negative number
+
+The \`JSFun\` specified by \`mode\` has one input parameter \`interp\` equal to the interpolation factor and must return the new interpolation factor.
+EX "mode":"return interp*interp;" 
+
+The \`JSFun\` specified by \`postfun\` has two input parameters \`res\` (the current interplation result) and \`interp\` (the interpolation factor), and must return the new interpolated value.
+EX "postfun": "if (interp<0.5) return res*res; return res;" 
+
+## Scripts
+### Properties for \`script\` objects
+- id (null): id of the script
+- script (null): JavaScript code or path to JavaScript file to execute, cannot be animated or updated
+- active (true): indicate if script is active or not
+
+
+### Notes
+
+Script objects allow read and write access to the playlist from script. They currently can only be used to modify scenes and groups and to activate/deactivate other scripts.
+
+The \`JSFun\` function specified by \`fun\` has no input parameter. The return value (default 0) is the number of seconds (float) to wait until next evaluation of the script.
+
+EX: { "script": "let s=get_scene('s1'); let rot = s.get('rotation'); rot += 10; s.set('rotation', rot); return 2;" }
+This will change scene \`s1\` rotation every 2 seconds 
+
+
+## Watchers
+### Properties for \`watcher\` objects
+- id (null): ID of the watcher
+- active (true): indicate if watcher is active or not
+- watch (""): element watched, formatted as \`ID@prop\`, with \`ID\` the element ID and \`prop\` the property name to watch
+- target (""): action for watcher. Allowed syntaxes are:
+ - \`ID@prop\`, \`ID@prop[idx]\`: copy value to property \`prop\` of the element \`ID\` (potentially at index \`idx\` if specified for arrays)
+ - \`ID.fun_name\`: call function \`fun_name\` exported from scene module \`ID\`, using three arguments ['value', 'watchID', 'watchPropName'], no return value check
+ - otherwise: action must be JS code, and the resulting \`JSFun\` has one argument \`value\` containing the watched value, and no return value check
+- with (undefined): for targets in the form \`ID@prop\`, use this value instead of the watched value
+
+### Notes
+
+A watcher can be used to monitor changes in an object in the playlist.
+Any object property that can be animated or updated can be monitored by a watcher.
+
+In addition, the following virtual properties (cannot be read or write) can be watched:
+- sequence.active: value is set to true when sequence is activated, and false when deactivated
+- source.active: value is set to true when source playback starts, and false when source playback stops
+- timer.active: value is set to true when timer starts, and false when timer stops
+
+Only the \`active\` property can be animated or updated in a watcher.
+
+EX {'watch': 's1@rotation', 'target': 's2@rotation'}
+This will copy s1.rotation to s2.rotation.
+
+EX {'watch': 's1@rotation', 'target': 'get_scene('s2').set('rotation', -value); }
+This will copy the -1*s1.rotation to s2.rotation.
+
+### Watching UI events
+
+Watchers can also be used to monitor GPAC user events by setting \`watch\` to:
+- an event name to monitor, one of \`keydown\`, \`keyup\`, \`mousemove\`, \`mouseup\`, \`mousedown\`, \`wheel\`, \`textInput\`
+- \`events\` to monitor all events (including internal events).
+
+For \`keyup\` and \`keydown\` events, the key code to watch may additionally be given in parenthesis, e.g. \`'watch': 'keyup(T)'\`.
+
+Note: User events are only sent if the output of the filter is consumed by the [vout](vout) filter.
+
+When event monitoring is used, the \`target\` must be a javascript callback (i.e. it cannot be \`ID@prop\`).
+The javascript function will be called with a single argument \`evt\` containing the GPAC event.
+
+EX {'watch': 'mousemove', 'target': 'let s = mouse_over(evt); get_scene('s2').set('fill', (s && (s.id=='s1') ? 'white' : 'black' );'}
+This will set s1 fill color to white of mouse is over s2 and to black otherwise.
+
+## Styles
+### Properties for \`style\` objects
+- id (null): ID of the style
+- forced (false): always apply style even when no modifications
+- other: any property to share between scene
+
+### Notes
+
+A style object allows scenes to share the same values for a given set of properties.
+
+If a scene property has the same name as a style property, the scene property is replaced by the style property.
+Styles only apply to scene properties as follows:
+- volume, fade, mix_ratio can use style
+- all options defined by the scene module can use style
+- transformation or other scene properties cannot use style
+
+Properties of a style object can be animated or updated, but a style object cannot be watched.
+
+Styles are applied to each associated scene in order of declaration, e.g. \`['st1', 'st2']\` and \`['st2', 'st1']\` will likely give different results.
+
+If \`force\` is not set for a style, the style is only applied after being modified (load, animation, update); if a scene uses \`['st1', 'st2']\` and only \`st1\` is
+modified (animation, update), \`st2\` will only be applied once.
+
+## Filter configuration
+The playlist may specify configuration options of the filter, using a root object of type \'config\':
+- property names are the same as the filter options
+- property values are given in the native type, or as strings for fractions (format \`N/D\`), vectors (format \`WxH\`) or enums
+- each declared property overrides the filter option of the same name (whether default or set at filter creation)
+
+A configuration object in the playlist is only parsed when initially loading the playlist, and ignored when reloading it.
+
+The following additional properties are defined for testing:
+- reload_tests([]): list of playlists to reload
+- reload_timeout(1.0): timeout in seconds before playlist reload
+- reload_loop (0): number of times to repeat the reload tests (not including original playlist which is not reloaded)
+
+## Playlist modification
+The playlist file can be modified at any time.
+Objects are identified across playlist reloads through their \`id\` property.
+Objects that are not present after reloading a playlist are removed from the mixer. This implies that reloading a playlist will recreate most objects with no ID associated.
+
+A \`sequence\` object modified between two reloads is refreshed, except for its \`start\` field if sequence active.
+
+A \`source\` object shall have the same parent sequence between two reloads. Any modification on the object will only be taken into consideration when (re)loading the source.
+
+A \`sourceURL\` object is not tracked for modification, only evaluated when activating the parent \`source\` object.
+
+A \`scene\` or \`group\` object modified between two reloads is notified of each changed value.
+
+A \`timer\` object modified between two reloads is shut down and restarted. Consequently, \`animation\` objects are not tracked between reloads.
+
+A \`transition\` object may change between two reloads, but any modification on the object will only be taken into consideration when restarting the effect.
+
+A \`script\` object modified between two reloads has its code re-evaluated
+
+A \`watcher\` object modified between two reloads has its watch source and code re-evaluated
+
+A \`style\` object is not tracked (all styles are reloaded when reloading a playlist).
+
+## Playlist example
+
+The following is an example playlist using a sequence of two videos with a mix transition and an animated video area:
+
+EX [
+EX {"id": "seq1", "loop": -1, "start": 0, "seq":
+EX [
+EX { "id": "V1", "src": [{"in": "s1.mp4"}], "start": 60, "stop": 80},
+EX { "id": "V2", "src": [{"in": "s2.mp4"}], "stop": 100}
+EX ],
+EX "transition": { "dur": 1, "type": "mix"}
+EX },
+EX {"id": "scene1", "sources": ["seq1"]},
+EX {"start": 0, "dur": 10, "keys": [0, 1], "anims":
+EX [
+EX {"values": [50, 0], "targets": ["scene1@x", "scene1@y"]},
+EX {"values": [0, 100], "targets": ["scene1@width", "scene1@height"]}
+EX ]
+EX }
+EX ]
+
+
+# Updates Format
+
+Updates can be sent to modify the playlist, rather than reloading the entire playlist.
+Updates are read from a separate file specified in \`updates\`, inactive by default.
+
+Warning: The \`updates\` file is only read when modified __AFTER__ the initialization of the filter.
+
+The \`updates\` file content shall be either a single JSON object or an array of JSON objects.
+The properties of these objects are:
+- skip: if true or 1, ignores the update, otherwise apply it
+- replace: string identifying the target replacement. Syntax is:
+ - ID@name: indicate property name of element with given ID to replace
+ - ID@name[idx]: indicate the index in the property name of element with given ID to replace
+- with: replacement value, must be of the same type as the target value.
+
+An \`id\` property cannot be updated.
+
+The following playlist elements of a playlist can be updated:
+- scene: all properties except \`js\` and read-only module properties
+- group: all properties except \`scenes\` and \`offscreen\`
+- sequence: \`start\`, \`stop\`, \`loop\` and \`transition\` properties
+- timer: \`start\`, \`stop\`, \`loop\`, \`pause\` and \`dur\` properties
+- transition: all properties
+ - for sequence transitions: most of these properties will only be updated at next reload
+ - for active scene transitions: whether these changes are applied right away depend on the transition module
+
+
+EX [
+EX {"replace": "scene1@x", "with": 20},
+EX {"replace": "seq1@start", "with": "now"}
+EX }
+EX ]
+
+`;
+

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/init.js Added

@@ -0,0 +1,7989 @@
+import {WebGLContext} from 'webgl'
+import * as evg from 'evg'
+import { Sys as sys } from 'gpaccore'
+import { AudioMixer as amix } from 'gpaccore'
+import * as os from 'os'
+
+
+const UPDATE_PID = 1;
+const UPDATE_SIZE = 1<<1;
+const UPDATE_POS = 1<<2;
+const UPDATE_CHILD = 1<<3;
+const UPDATE_ALLOW_STRING = 1<<4;
+const UPDATE_FX = 1<<5;
+
+/*
+	global modules imported for our imported modules
+*/
+globalThis.sys = sys;
+globalThis.evg = evg;
+globalThis.os = os;
+
+/*
+	global variables for our imported modules
+*/
+
+//video playing state
+globalThis.video_playing = false;
+//audio playing state
+globalThis.audio_playing = false;
+//output video time
+globalThis.video_time = 0;
+//output video timescale
+globalThis.video_timescale = 0;
+//output video width
+globalThis.video_width = 0;
+//output video height
+globalThis.video_height = 0;
+//output audio time
+globalThis.audio_time = 0;
+//output audio timescale
+globalThis.audio_timescale = 0;
+//output audio samplerate
+globalThis.samplerate =0;
+//output audio channels
+globalThis.channels =0;
+//current UTC clock in ms
+globalThis.current_utc_clock = Date.now();
+//is the canvas YUV or not ? This is used at least by scenes/shape.js to cache RGB static textures to YUV
+globalThis.canvas_yuv = false;
+//scene update flag indicating the pid has been reconfigured
+globalThis.UPDATE_PID = UPDATE_PID;
+//scene update flag indicating the scene size has changed
+globalThis.UPDATE_SIZE = UPDATE_SIZE;
+//scene update flag indicating the scene properties other than size have changed
+globalThis.UPDATE_POS = UPDATE_POS;
+//scene update allows string for number
+globalThis.UPDATE_ALLOW_STRING = UPDATE_ALLOW_STRING;
+//scene update flag indicating that if a property with this flag is changed, mix and transition effects must be recomputed (used for OpenGL shader setup)
+globalThis.UPDATE_FX = UPDATE_FX;
+//indicates if GPU (WebGL) is used
+globalThis.use_gpu = false;
+//indicates if EVG blit is enabled
+globalThis.blit_enabled = evg.BlitEnabled;
+
+/*
+	global functions for our imported modules
+*/
+/*gets media time of output (no args) or of source of given id. Return
+ -4 if not found
+ -3 if not playing
+ -2 if in prefetch
+ -1 if timing not yet known
+ media time in seconds (float) otherwise
+*/
+globalThis.get_media_time = get_media_time;
+/*resolves URL against media playlist URL. Returns resolved url (string)*/
+globalThis.resolve_url = resolve_url;
+
+
+/*
+	global functions for canvas access
+
+Each scene module is associated an array of PidLink objects.
+Each transition module is passed an array of PidLink objects.
+
+A PidLink object has the following properties:
+- pid: associated input visual pid, null if source is an offscreen group
+- texture: associated input visual texture (constructed by avmix, but customized by each module)
+
+The pid of a PidLink shall not be modified. The following variables can be checked for a pid:
+- pck: current pck if any
+- frame_ts: current frame timestamp in output video timescale
+- rotate: video Rotation property
+- Mirror: video Mirror property 
+
+Each scene must implement:
+- update(): check value of this.update_flag to see if scene has to be rebuild
+- fullscreen(): return index of pidlink from inputs which is fullscreen (occupies the entire scene area), or -1 if none
+- identity(): return true if scene is identity: scene shows exactly the video witout any change in aspect ratio
+- is_opaque(): return true if scene is opaque (entire scene area covered and not transparent), false otherwise
+- draw(canvas): draw scene on canvas. The canvas can be EVG canvas or WebGL. All texture parameters modification (repeat flags, alpha, matrix, etc) must be done in this call, as the same texture may be used by different scenes
+
+Note: scenes setup to skip drawing and forward input (fullscreen, opaque, identity) must check this.force_draw is not set to true, indicating
+that the scene shall be drawn (due to canvas pixel format change for example)
+
+Note: scenes using canvas.blit must use the provided variable this.screen_rect corresponding to the blit area on canvas, {x,y}={0,0} at top-left. If null, this means blit cannot be used (rotations & co)
+
+
+*/
+
+/*clears canvas - function shall only be used inside scene.draw()
+\param color: color to use
+\param clip clipper to use (type IRect) , or null/not specified
+*/
+globalThis.canvas_clear = canvas_clear;
+/*sets axis-aligned clipper on canvas - function shall only be used inside scene.draw()
+\param clip clipper to use (type IRect), or null to reset
+\param use_stack if true, push and intersect the stack if clipper set or pop if clipper not set, otherwise change clipper directly without checking the clipper stack
+*/
+globalThis.canvas_set_clipper = canvas_set_clipper;
+/*draws path on canvas - function shall only be used inside scene.draw()
+\param path path (type Path) to draw
+\param stencil stencil to use (type Texture or Stencil)
+*/
+globalThis.canvas_draw = canvas_draw;
+/*blits image on canvas - function shall only be used inside scene.draw()
+\param texture texture to blit (type Texture)
+\param dst_rc destination window (type IRect)
+*/
+globalThis.canvas_blit = canvas_blit;
+/*texture path on canvas - function shall only be used inside scene.draw()
+The input textures are fteched from the sequences associated with the scene 
+\param path path (type Path) to draw
+\param op_type (=0) multitexture operand type
+\param op_param (=0) multitexture operand param
+\param op_param (=null) multitexture second texture
+*/
+globalThis.canvas_draw_sources = canvas_draw_sources;
+
+/*sets mask mode on canvas (2D or 3D) - function shall only be used inside scene.draw()
+\param mode EVG mask mode
+*/
+globalThis.canvas_set_mask_mode = canvas_set_mask_mode;
+
+/*gets texture associated with an offscreen group, typically used in scene.update()
+\param group_id ID of offscreen group
+\return associated texture or null if not found ot not offscreen
+*/
+globalThis.get_group_texture = get_group_texture;
+
+/*gets texture associated with a sequence, typically used in scene.update() and scene.draw()
+\param group_id ID of offscreen group
+\return associated texture or null if not found ot not offscreen
+*/
+globalThis.get_sequence_texture = get_sequence_texture;
+
+/*gets screen rectangle (axis-aligned bounds) in pixels for a given path. Shall only be used inside scene.draw()
+\param path the path to check
+\return rectangle object or null if error
+*/
+globalThis.get_screen_rect = get_screen_rect;
+
+
+/*gets a scene by ID
+\param id ID of the scene
+\return scene object or null if error
+*/
+globalThis.get_scene = get_scene;
+
+/*gets a group by ID
+\param id ID of the group
+\return group object or null if error
+*/
+globalThis.get_group = get_group;
+
+/*removes a scene, group or sequence from playlist
+
+The caller must be a scene module, in update callback.
+
+\param id_or_elem ID of the object or object itself
+*/
+globalThis.remove_element = remove_element_mod;
+
+
+/*parses a root playlist element and add it to the current playlist
+
+The caller must be a scene module, in update callback.
+
+\param elt JSON object
+*/
+globalThis.parse_element = parse_playlist_element_mod;
+
+/*parses a scene
+
+The caller must be a scene module, in update callback.
+
+\param elt JSON object for the scene
+\param parent parent group, NULL if at root of scene tree
+\return scene object or null if error
+
+Warning: the return value may get remove later on if underlying module loading fails
+*/
+globalThis.parse_scene = parse_scene_mod;
+
+/*parses a group
+
+The caller must be a scene module, in update callback.
+
+\param elt JSON object for the group
+\param parent parent group, NULL if at root of scene tree
+\return group object or null if error
+*/
+globalThis.parse_group = parse_group_mod;
+
+/*parses a new playlist
+
+The caller must be a scene module, in update callback.
+
+If the calling scene is no longer in the resulting scene tree, it will be added to the root of the scene tree.
+
+\param pl JSON playlist object, use empty array to reset
+*/
+globalThis.reload_playlist = reload_playlist;
+
+/*update an element
+
+The caller must be a scene module, in update callback.
+
+\param ID ID of element to update
+\param property name of the property to update
+\param value new value to set
+\return true if success, false otherwise
+*/
+globalThis.update_element = update_element_mod;
+
+/*queries a property of an element
+
+The caller must be a scene module, in update callback.
+
+\param ID element ID
+\param property name of property to query
+\return property if success, undefined otherwise
+*/
+globalThis.query_element = query_element_mod;
+
+/*checks if a given point is over a scene
+\param evt GPAC mouse event
+
+or
+
+\param x x-coordinate of the point in output reference sapce in pixels (0 means center, x increase towards right)
+\param y y-coordinate of the point in output reference sapce in pixels (0 means center, y increase towards top)
+
+\return scene object under the mouse, or null if none
+*/
+globalThis.mouse_over = mouse_over_mod;
+
+
+//metadata
+filter.set_name("AVMix");
+filter.set_desc("Audio Video Mixer");
+filter.set_author("GPAC team");
+
+//global options
+filter.set_arg({ name: "pl", desc: "local playlist file to load", type: GF_PROP_STRING, def: "avmix.json" } );
+filter.set_arg({ name: "live", desc: "live mode", type: GF_PROP_BOOL, def: "true"} );
+filter.set_arg({ name: "gpu", desc: `enable GPU usage
+ - off: no GPU
+ - mix: only render textured path to GPU, use software rasterizer for the outlines, solid fills and gradients
+ - all: try to use GPU for everything`, type: GF_PROP_UINT, def: "off", minmax_enum: 'off|mix|all', hint:"advanced"} );
+filter.set_arg({ name: "thread", desc: "use threads for software rasterizer (-1 for all available cores)", type: GF_PROP_SINT, def: "-1", hint:"expert"} );
+filter.set_arg({ name: "lwait", desc: "timeout in ms before considering no signal is present", type: GF_PROP_UINT, def: "1000", hint:"expert"} );
+filter.set_arg({ name: "ltimeout", desc: "timeout in ms before restarting child processes", type: GF_PROP_UINT, def: "4000", hint:"expert"} );
+filter.set_arg({ name: "maxdur", desc: "run for given seconds and exit, will not abort if 0 (used for live mode tests)", type: GF_PROP_DOUBLE, def: "0", hint:"expert"} );
+filter.set_arg({ name: "updates", desc: "local JSON files for playlist updates", type: GF_PROP_STRING, hint:"advanced"} );
+filter.set_arg({ name: "maxdepth", desc: "maximum depth of a branch in the scene graph", type: GF_PROP_UINT, def: "100", hint:"expert"} );
+
+//video output options
+filter.set_arg({ name: "vsize", desc: "output video size", type: GF_PROP_VEC2, def: "1920x1080"} );
+filter.set_arg({ name: "fps", desc: "output video frame rate", type: GF_PROP_FRACTION, def: "25"} );
+filter.set_arg({ name: "pfmt", desc: "output pixel format. Use \`rgba\` in GPU mode to force alpha channel", type: GF_PROP_PIXFMT, def: "yuv"} );
+filter.set_arg({ name: "dynpfmt", desc: `allow dynamic change of output pixel format in software mode
+ - off: pixel format is forced to desired value
+ - init: pixel format is forced to format of fullscreen input in first generated frame
+ - all: pixel format changes each time a full-screen input PID at same resolution is used`, type: GF_PROP_UINT, def: "init", minmax_enum: 'off|init|all', hint:"expert"} );
+
+//audio output options
+filter.set_arg({ name: "sr", desc: "output audio sample rate", type: GF_PROP_UINT, def: "44100"} );
+filter.set_arg({ name: "ch", desc: "number of output audio channels", type: GF_PROP_UINT, def: "2"} );
+filter.set_arg({ name: "afmt", desc: "output audio format (only s16, s32, flt and dbl are supported)", type: GF_PROP_PCMFMT, def: "s16"} );
+filter.set_arg({ name: "alen", desc: "default number of samples per frame", type: GF_PROP_UINT, def: "1024", hint:"expert"} );
+
+filter.max_pids = -1;
+filter.make_sticky();
+filter.maxdur=0;
+
+let sources = [];
+let reload_tests=null;
+let reload_timeout=1.0;
+let reload_loop=false;
+let reload_idx=0;
+
+let last_modification = 0;
+let last_updates_modification = 0;
+let init_utc = 0;
+let init_clock_us = 0;
+
+const TYPE_UNHANDLED = 0;
+const TYPE_VIDEO = 1;
+const TYPE_AUDIO = 2;
+
+let playlist_url = null;
+
+let active_scene = null;
+let scene_in_update = null;
+
+const SCENE_GL_NONE=0;
+const SCENE_GL_ANY=1;
+const SCENE_GL_ONLY=2;
+
+
+let terminated = false;
+
+let back_color = 'black';
+
+let playlist_loaded = false;
+
+filter.set_cap({id: "StreamType", value: "Visual", inout: true} );
+filter.set_cap({id: "StreamType", value: "Audio", inout: true} );
+filter.set_cap({id: "CodecID", value: "raw", inout: true} );
+
+let modules_pending = 0;
+
+let webgl = null;
+filter.frame_pending=false;
+let single_mod_help=false;
+let mod_help_short=false;
+
+const GROUP_OST_NONE = 0;
+const GROUP_OST_DUAL = 1;
+const GROUP_OST_MASK = 2;
+const GROUP_OST_COLOR = 3;
+
+const UNIT_RELATIVE = 0;
+const UNIT_PIXEL = 1;
+
+
+function build_help_mod(obj, name, mod_type, index)
+{
+	name = name.split('.')[0];
+	let rad = '';
+	if (mod_type==0) {
+		if (!index) {
+			filter._help += (mod_help_short ? '\n' : '# ' ) + 'Scene modules\n';
+		}
+		rad = 'Scene';
+	}
+	else if (mod_type==1) {
+		if (!index) {
+			filter._help += (mod_help_short ? '\n' : '# ' ) + 'Transition modules\n';
+		}
+		rad = 'Transition';
+	}
+
+	if (mod_help_short) {
+		filter._help += ' - ' + name + ': ' + obj.description + '\n';
+		filter.set_help(filter._help);
+		return;
+	} 
+
+	filter._help += (single_mod_help ? '# ' : '## ') + rad + ' `' + name + '`';
+	if (mod_type==1) {
+		let inst = obj.load();
+		if (typeof inst.get_shader_src == 'function') {
+ 		if (typeof inst.setup != 'function') {
+				filter._help += ' - GPU only';
+ 		} else {
+				filter._help += ' - software/GPU'; 			
+ 		}
+		} else {
+				filter._help += ' - software only'; 						
+		}
+	}
+	filter._help += '\n' + obj.help + '\n';
+
+	if (obj.options.length)
+		filter._help += 'Options:\n';
+	for (let i=0; i<obj.options.length; i++) {
+		let opt = obj.options[i];
+		if (typeof opt.name == 'undefined') continue;
+		if (typeof opt.desc == 'undefined') continue;
+
+		filter._help += '- ' + opt.name;
+		let opts = "";
+		if (typeof opt.value != 'undefined') {
+			if (Array.isArray(opt.value)) {
+				opts+='[]';
+			} else if (typeof opt.value!='string') {
+				opts+=opt.value;
+			} else /*if (opt.value.length)*/ {
+				opts+='\''+opt.value+'\'';
+			}
+		}
+		if (mod_type==0) {
+			if ((typeof opt.dirty == 'undefined') || (opt.dirty==-1)) {
+				opts+=', not updatable';
+			}
+		}
+
+		if (opts.length)
+			filter._help += ' (' + opts + ')';
+
+		filter._help += ': ' + opt.desc;
+		filter._help += '\n';
+	}
+	filter.set_help(filter._help);
+}
+
+function build_help(obj, playlist_only)
+{
+	let path = filter.jspath;
+	if (playlist_only) {
+		filter._help = obj.help_playlist + '\n';
+		filter.set_help(filter._help);
+		return;
+	}
+
+	filter._help = obj.help + '\n';
+	if (mod_help_short) {
+		filter._help += '# More info\n';
+		filter._help += 'For playlist syntax, use `gpac -h avmix:playlist`\n';
+		filter._help += 'For module `NAME`, use `gpac -h avmix:NAME`\n';
+		filter._help += 'For global variables available to modules, use `gpac -h avmix:global`\n';
+		filter._help += '# Available modules\n';
+	} else {
+		filter._help += obj.help_playlist + '\n';
+	}
+
+	let	scripts = sys.enum_directory(path+'scenes/', "*.js");
+	for (let i=0; i<scripts.length; i++) {
+		let name = scripts[i].name;
+		import('./scenes/' + name).then(obj => { build_help_mod(obj, name, 0, i); }).catch(err => {});
+	}
+	scripts = sys.enum_directory(path+'transitions/', "*.js");
+	for (let i=0; i<scripts.length; i++) {
+		let name = scripts[i].name;
+		import('./transitions/' + name).then(obj => { build_help_mod(obj, name, 1, i); }).catch(err => {});
+	}
+	filter.set_help(filter._help);
+}
+
+filter.initialize = function() 
+{
+	let gpac_help = sys.get_opt("temp", "gpac-help");
+	let gpac_doc = (sys.get_opt("temp", "gendoc") == "yes") ? true : false;
+	if (gpac_help || gpac_doc) {
+		let args = sys.args;
+		globalThis.help_mod = gpac_doc ? null : sys.get_opt("temp", "gpac-js-help");
+
+		if (help_mod) {
+			let name;
+			let path = filter.jspath;
+			let	script = path+'scenes/'+help_mod+'.js';
+			filter._help = '';
+			single_mod_help = true;
+			if (help_mod == 'global') {
+				filter._help = 'Global JS properties available:\n';
+				for (var propertyName in globalThis) {
+					//skip GPAC constants
+					if (propertyName.startsWith('GF_')) continue;
+					if (propertyName.startsWith('JSF_')) continue;
+
+					filter._help += '- ' + propertyName+ ': type ' + (typeof globalThis[propertyName]) + '\n';
+				}
+				filter.set_help(filter._help);
+				return GF_OK;
+			}
+			if (help_mod == 'playlist') {
+				import("./help.js").then(obj => { build_help(obj, true); }).catch(err => {});
+				return GF_OK;
+			}
+
+			if (sys.file_exists(script)) {
+				name = help_mod + '.js';
+				import('./scenes/' + name).then(obj => { build_help_mod(obj, name, 0, 1); }).catch(err => {});
+				return GF_OK;
+			} 
+			script = path+'transitions/'+help_mod+'.js';
+			if (sys.file_exists(script)) {
+				name = help_mod + '.js';
+				import('./transitions/' + name).then(obj => { build_help_mod(obj, name, 1, 1); }).catch(err => {});
+				return GF_OK;
+			}
+			print(GF_LOG_ERROR, 'No such module ' + help_mod + ' path ' + script);
+			return GF_OK;
+		}
+		if ((gpac_help == "h") || (gpac_help == "ha"))
+			mod_help_short = !gpac_doc;
+		import("./help.js").then(obj => { build_help(obj, false); }).catch(err => {});
+		return GF_OK;
+	}
+
+	if (!this.pl) {
+		print(GF_LOG_ERROR, "No playlist specified, cannot run");
+		return GF_BAD_PARAM;
+	}
+	if (!sys.file_exists(filter.pl)) {
+		print(GF_LOG_ERROR, "Playlist " + filter.pl + " not found, cannot run");
+		return GF_BAD_PARAM;
+	}
+
+	playlist_url = filter.pl.slice();
+	let cwd = os.getcwd()[0] + '/';
+	playlist_url = sys.url_cat(cwd, playlist_url);
+
+	if (!load_playlist())
+		return GF_BAD_PARAM;
+	playlist_loaded = true;
+
+	if (filter.updates) {
+		last_updates_modification = sys.mod_time(filter.updates);
+	}
+
+	if (filter.live) {
+		init_utc = sys.get_utc();
+		init_clock_us = sys.clock_us();
+	}
+	if (filter.maxdepth<=0)
+		filter.maxdepth = 100;
+
+	if (this.gpu) {
+		video_width = filter.vsize.x;
+		video_height = filter.vsize.y;
+			try {
+				webgl = new WebGLContext(video_width, video_height);
+				//by default do not output alpha channel
+				if (filter.pfmt != 'rgba')
+					filter.pfmt = 'rgb';
+				globalThis.use_gpu = true;
+				globalThis.blit_enabled = false;
+			} catch (e) {
+				print(GF_LOG_ERROR, "Failed to initialize WebGL, disabling GPU support");
+				this.gpu = 0;
+				globalThis.use_gpu = false;
+				globalThis.blit_enabled = evg.BlitEnabled;
+			}
+	}
+
+	configure_vout();
+	configure_aout();
+
+	if (!filter.ltimeout)
+			filter.ltimeout = 1000;
+	
+	if (filter.lwait > filter.ltimeout)
+		filter.lwait = filter.ltimeout;
+}
+
+
+let pids=[];
+let vout = null;
+let aout = null;
+
+let video_frame_dur_us = 0;
+let video_max_resched_dur_us = 0;
+let audio_frame_dur_us = 0;
+let audio_max_resched_dur_us = 0;
+
+let video_pfmt =0;
+let vout_size =0;
+let canvas = null;
+let canvas_offscreen = null;
+let canvas_reconfig = false;
+let video_time_inc =0;
+
+let audio_afmt =0;
+let sample_size=0;
+let max_aframe_size=0;
+const sample_per_frame=1024;
+let chan_buffer = null;
+
+let sequences = [];
+
+//static top-level group
+let root_scene = {};
+root_scene.scenes = [];
+root_scene.parent = null;
+root_scene.update_flag = 0;
+
+let wait_for_pids = 0;
+let wait_pid_play = 0;
+let live_forced_play = false;
+
+let use_canvas_3d = false;
+
+let defaultOrthoProjectionMatrix = null;
+
+let audio_mix = null;
+let generate_default_scene = true;
+
+
+
+function configure_vout()
+{
+	if (!filter.vsize.x || !filter.vsize.y) {
+		if (vout) vout.remove();
+		vout = null;	
+		return;
+	}
+	if (filter.gpu) {
+		print(GF_LOG_INFO, (filter.live ? 'Live ' : '' ) + 'Video output ' + filter.vsize.x + 'x' + filter.vsize.y + ' FPS ' + filter.fps.n + '/' + filter.fps.d + ' OpenGL pixfmt ' + filter.pfmt);
+	} else {
+		print(GF_LOG_INFO, (filter.live ? 'Live ' : '' ) + 'Video output ' + filter.vsize.x + 'x' + filter.vsize.y + ' FPS ' + filter.fps.n + '/' + filter.fps.d + ' pixfmt ' + filter.pfmt);
+	}
+
+	if (!vout) {
+		vout = filter.new_pid();
+		vout.name = "video";
+		wait_pid_play++;
+	} else if ((video_width==filter.vsize.x) && (video_height==filter.vsize.y) && (video_pfmt===filter.pfmt)) {
+		return;
+	}
+	video_width = filter.vsize.x;
+	video_height = filter.vsize.y;
+	video_pfmt = filter.pfmt;
+
+	vout.set_prop('StreamType', 'Visual');
+	vout.set_prop('Width', video_width);
+	vout.set_prop('Height', video_height);
+	vout.set_prop('PixelFormat', video_pfmt);
+	vout.set_prop('CodecID', 'raw');
+	vout.set_prop('FPS', filter.fps);
+	video_timescale = filter.fps.n;
+	video_time_inc = filter.fps.d;
+	video_frame_dur_us = 1000000 * video_time_inc / video_timescale;
+	video_max_resched_dur_us = video_frame_dur_us/3;
+	vout.set_prop('Timescale', filter.fps.n);
+	//do not buffer output, this would trigger block on vout and break sync
+	vout.set_prop('BufferLength', 0);
+
+	if (sys.pixfmt_transparent(video_pfmt)) {
+		print(GF_LOG_INFO, 'Enabling alpha on video output');
+		back_color = 'none';
+	}
+
+	if (!webgl)
+		set_canvas_yuv(video_pfmt);
+
+	vout_size = sys.pixfmt_size(filter.pfmt, filter.vsize.x, filter.vsize.y);
+	canvas_reconfig = true;
+
+	defaultOrthoProjectionMatrix = new evg.Matrix().ortho(-video_width/2, video_width/2, -video_height/2, video_height/2, 1, -1);
+}
+
+function configure_aout()
+{
+	if (!filter.sr || !filter.ch) {
+		if (aout) aout.remove();
+		aout = null;	
+		return;
+	}
+	print(GF_LOG_INFO, (filter.live ? 'Live ' : '' ) + 'Audio output ' + filter.sr + ' Hz ' + filter.ch + ' Channels');
+
+	if (!aout) {
+		aout = filter.new_pid();
+		aout.name = "audio";
+		wait_pid_play++;
+	} else if ((samplerate==filter.sr) && (channels==filter.ch) && (audio_sfmt===filter.afmt)) {
+		return;
+	}
+	samplerate = filter.sr;
+	channels = filter.ch;
+	audio_afmt = filter.afmt;
+
+	aout.set_prop('StreamType', 'Audio');
+	aout.set_prop('SampleRate', samplerate);
+	aout.set_prop('NumChannels', channels);
+	aout.set_prop('AudioFormat', audio_afmt);
+	aout.set_prop('CodecID', 'raw');
+	audio_timescale = samplerate;
+	aout.set_prop('Timescale', audio_timescale);
+	//do not send clock hints for aout, this would trigger block on vout and break sync
+	aout.set_prop('BufferLength', 0);
+
+	sample_size = sys.pcmfmt_depth(audio_afmt);
+	max_aframe_size = sample_size * channels * sample_per_frame;
+	chan_buffer = new Float32Array(channels);
+
+	if (audio_afmt === 's32') {
+		filter.get_sample = function(buf, idx) { return buf.getInt32(idx, true) / 4294967295; };
+		filter.set_sample = function(buf, idx, val) { return buf.setInt32(idx, val * 4294967295, true); };
+	} else if (audio_afmt === 's16') {
+		filter.get_sample = function(buf, idx) { return buf.getInt16(idx, true) / 65535; };
+		filter.set_sample = function(buf, idx, val) { return buf.setInt16(idx, val*65535, true); };
+	} else if (audio_afmt === 'flt') {
+		filter.get_sample = function(buf, idx) { return buf.getFloat32(idx); };
+		filter.set_sample = function(buf, idx, val) { return buf.setFloat32(idx, val); };
+	} else if (audio_afmt === 'dbl') {
+		filter.get_sample = function(buf, idx) { return buf.getFloat64(idx); };
+		filter.set_sample = function(buf, idx, val) { return buf.setFloat64(idx, val); };
+	} else {
+		print(GF_LOG_ERROR, 'Unsupported sample format ' + audio_afmt);
+		sys.exit(1);
+	}
+ if (!filter.alen) filter.alen = 100;
+
+ //above 20 samples consider this is a time discontinuity
+ //use 50 max samples for cross-fade
+ audio_mix = new amix(audio_afmt, channels, 20, 50);
+
+	audio_frame_dur_us = 1000000 * filter.alen / audio_timescale;
+	audio_max_resched_dur_us = audio_frame_dur_us/3;
+}
+
+filter.configure_pid = function(pid) 
+{
+	if (pids.indexOf(pid)<0) {
+		pids.push(pid);
+		pid.skipped = false;
+		let s = get_source_by_pid(pid);
+		if (s) {
+			s.pids.push(pid);
+			pid.source = s;
+			if (s.playing) play_pid(pid, s);
+			pid.pck = null;
+			pid.old_timescale = pid.timescale;
+			pid.is_blocking = false;
+			pid.done = false;
+			pid.fade = 0;
+			pid.active = false;
+			pid.texture = null;
+			pid.audio_fade = null;
+			s.timeline_init = false;
+			pid.last_pck_time = /*	current_utc_clock =*/ Date.now();
+		} else {
+			if (!pid.skipped) {
+				print(GF_LOG_ERROR, 'PID ' + pid.name + ' coming from unknown source !');
+				return GF_FILTER_NOT_SUPPORTED;
+			}
+			return GF_EOS;
+		}
+	}
+
+	let p = pid.get_prop('StreamType');
+	let ts = 0;
+	if (p == 'Visual') {
+		pid.pfmt = pid.get_prop('PixelFormat');
+		pid.type = TYPE_VIDEO;
+		ts = video_timescale;
+
+		pid.width = pid.get_prop('Width');
+		pid.height = pid.get_prop('Height');
+		pid.reconfigure = true;
+		pid.mirror = pid.get_prop('Mirror');
+		pid.rotate = pid.get_prop('Rotate');
+	}	
+	else if (p == 'Audio') {
+		pid.type = TYPE_AUDIO;
+		pid.data = null;
+		ts = audio_timescale;
+
+		pid.channels = pid.get_prop('NumChannels');
+		pid.afmt = pid.get_prop('AudioFormat');
+		let sr = pid.get_prop('SampleRate');
+		if ((sr != filter.sr) || (pid.afmt != filter.afmt)) {
+			pid.negociate_prop('SampleRate', filter.sr);
+			pid.negociate_prop('AudioFormat', filter.afmt);
+		}
+
+		pid.ch_buf = new Float32Array(pid.channels);
+		pid.samples_used = 0;
+		pid.last_sample_time = 0;
+	} else {
+		pid.type = TYPE_UNHANDLED;
+	}
+
+	if (pid.timescale != ts) {
+		pid.translate_timestamp = function(value) {
+			value -= pid.init_ts;
+			value *= ts;
+			value /= pid.timescale;
+			value += pid.init_clock;
+			return value;
+		};
+	} else {
+		pid.translate_timestamp = function(value) {
+			value -= pid.init_ts;
+			value += pid.init_clock;
+			return value;
+		};
+	}
+
+ let dur = pid.get_prop('Duration');
+ if (dur && dur.d && (dur.n > pid.source.duration * dur.d))
+ 		pid.source.duration = dur.n / dur.d;
+
+	if (pid.old_timescale != pid.timescale) {
+		//todo
+		pid.old_timescale = pid.timescale;
+	}
+	do_traverse(root_scene, scene => {
+		scene.sequences.forEach(seq => {
+			//this is an offscreen group
+			if (typeof seq.offscreen != 'undefined') return;
+
+			seq.sources.forEach(src => {
+				if (pid.source === src) scene.resetup_pids = true;
+			}); 
+		}); 
+	});
+}
+
+filter.remove_pid = function(pid) 
+{
+	let index = pids.indexOf(pid);
+	if (pid.pck) {
+		pid.pck.unref();
+		pid.pck = null;
+	}
+ if (index < 0) return;
+ pids.splice(index, 1);
+
+	do_traverse(root_scene, scene => {
+		for (let i=0; i<scene.mod.pids.length; i++) {
+			let pid_link = scene.mod.pids[i];
+			if (pid_link.pid === pid) {
+				scene.mod.pids.splice(i, 1);
+				scene.resetup_pids = true;
+				break;
+			}
+		}
+		for (let i=0; i<scene.apids.length; i++) {
+			let pid_link = scene.apids[i];
+			if (pid_link.pid === pid) {
+				scene.resetup_pids = true;
+				break;
+			}
+		} 
+	});
+}
+
+filter.update_arg = function(name, val)
+{
+}
+
+filter.process_event = function(pid, evt)
+{
+	if (evt.type == GF_FEVT_USER) {
+
+		event_watchers.forEach(watcher => {
+			if ((watcher.evt>0) && (watcher.evt != evt.ui_type)) return;
+
+			if (watcher.evt_param && (watcher.evt_param != sys.keyname(evt.keycode) ) ) return;
+
+			if (watcher.mode==2) {
+				watcher.fun.apply(watcher, [evt]);
+			} else if (watcher.mode==3) {
+				if (watcher.scene.mod && (typeof watcher.scene.mod[watcher.target] == 'function')) {
+					watcher.scene.mod[watcher.target].apply(watcher.scene.mod, [evt]);
+				}
+			}
+		});
+		return;
+	}
+
+	if (evt.type == GF_FEVT_STOP) { 
+		if (pid==aout) {
+			audio_playing = false;
+			if (!wait_pid_play) aout.eos = true;
+		}
+		else if (pid==vout) {
+			video_playing = false;
+			if (!wait_pid_play) vout.eos = true;
+		}
+
+		if (!audio_playing && !video_playing && !wait_pid_play) {
+			do_terminate();
+
+			//last stop, don't cancel
+			if (!wait_pid_play) return false;
+		}
+		return true;
+	} 
+	if (evt.type == GF_FEVT_PLAY) { 
+		if (pid==aout) {
+			audio_playing = true;
+		} else if (pid==vout) {
+			video_playing = true;
+		}
+		terminated = false;
+		if (wait_pid_play)
+			wait_pid_play--;
+		return true;
+	}
+	//cancel all other events	
+	return true;
+}
+
+let last_forward_pixfmt = 0;
+let video_inputs_ready, audio_inputs_ready;
+
+let blocking_ref_pids = [];
+let purge_sources = [];
+
+
+function do_traverse(elm, fun)
+{
+	if (Array.isArray(elm.scenes)) {
+		for (let i=0; i<elm.scenes.length; i++) {
+			let scene = elm.scenes[i];
+			let res = do_traverse(scene, fun);
+			if (res == true) {
+				return;
+			}
+		}
+	} else {
+		fun(elm);
+	}
+}
+
+
+function do_traverse_all(elm, fun)
+{
+	let ret = fun(elm) || false;
+	if (ret == true) return;
+
+	if (Array.isArray(elm.scenes)) {
+		elm.scenes.forEach(scene => {
+			do_traverse_all(scene, fun);
+		});
+	}
+}
+
+let indent=0;
+function do_traverse_all_indent(elm, fun)
+{
+	let ret = fun(elm) || false;
+	if (ret == true) return;
+
+	if (Array.isArray(elm.scenes)) {
+		indent++;
+		elm.scenes.forEach(scene => {
+			do_traverse_all_indent(scene, fun);
+		});
+		indent--;
+	}
+}
+
+function do_terminate()
+{
+	terminated = true;
+	pids.forEach(pid => {
+		if (pid.pck) {
+			pid.pck.unref();
+			pid.pck = null;
+		}
+		pid.send_event( new FilterEvent(GF_FEVT_STOP) ); 
+		pid.discard = true;
+	});
+	root_scene.scenes.length = 0;
+	sources.forEach(s => { stop_source(s, true); });
+	filter.abort();
+}
+
+let do_audio=false;
+let next_audio_gen_time = 0;
+let next_video_gen_time = 0;
+
+let last_pl_test_switch = 0;
+
+filter.process = function()
+{
+	let do_video = false;
+	if (terminated)
+		return GF_EOS;
+
+	if (filter.maxdur && (video_time || audio_time) ) {
+		let abort = true;
+		if (video_playing && (video_time < filter.maxdur*video_timescale)) abort = false;
+		if (audio_playing && (audio_time < filter.maxdur*audio_timescale)) abort = false;
+		if (wait_for_pids) abort = false;
+		if (abort) {
+			print(GF_LOG_INFO, 'maxdur ' + filter.maxdur + ' reached, quit - video time ' + video_time + '/' + video_timescale + ' - audio time ' + audio_time + '/' + audio_timescale);
+			do_terminate();
+			return;
+		}
+	}
+
+	if (vout && video_playing) {
+		//if no audio or video behind audio, generate frame if not blocking
+		if (!audio_playing || (audio_time * video_timescale >= video_time * audio_timescale)) {
+			if (!vout.would_block && !filter.frame_pending) {
+				do_video = true;
+			}
+		}
+		//audio ahead of next video frame, don't do audio - if not generating video, do nothing 
+		if (!do_video && (!audio_playing || (audio_time * video_timescale > (video_time+video_time_inc) * audio_timescale))) {
+			//notfiy we are still alive
+			filter.reschedule(0);
+			if (filter.live) {
+				let now = sys.clock_us();
+				let next_time = (next_video_gen_time<next_audio_gen_time) ? next_video_gen_time : next_audio_gen_time;
+
+				let diff = next_time - now;
+				if (diff>1000)
+					filter.reschedule(diff);
+			}
+			return;
+		}
+	}
+
+	current_utc_clock = Date.now();
+
+	if (reload_tests && (reload_idx<reload_tests.length) ) {
+		if (last_pl_test_switch + reload_timeout*video_timescale < video_time) {
+			last_pl_test_switch = video_time;
+			filter.pl = sys.url_cat(filter.pl, reload_tests[reload_idx]);
+			last_modification = 0;
+			reload_idx++;
+			if (reload_idx>=reload_tests.length) {
+				if (reload_loop>=0) {
+					reload_loop --;
+					if (reload_loop<0) reload_loop=0;
+				}
+				if (reload_loop) reload_idx=0;
+			}
+		}
+	}
+	load_playlist();
+	load_updates();
+	//modules are pending, wait for fail/success - async cannot wait here because QuickJS will only try to load the modules once out of JS functions
+	if (modules_pending)
+		return GF_OK;
+
+	//we had pending events, waiting for import module resolutions, flush them
+	if (watchers_defered.length) {
+		flush_watchers();
+	}
+
+
+	video_inputs_ready = video_playing;
+	audio_inputs_ready = audio_playing;
+	inactive_sources = 0;
+	blocking_ref_pids.length = 0;
+	sources.forEach(fetch_source);
+
+	if (wait_for_pids) {
+		let lwait = filter.lwait;
+		if (!filter.live) lwait *= 10;
+		if (current_utc_clock - wait_for_pids > lwait) {
+			if (filter.live) {
+				print(GF_LOG_WARNING, 'No input connection after ' + (current_utc_clock - wait_for_pids) + ' ms, starting');
+				wait_for_pids = 0;
+				live_forced_play = true;
+			} else {
+				print(GF_LOG_ERROR, 'No input connection after ' + (current_utc_clock - wait_for_pids) + ' ms, aborting');
+				do_terminate();
+				return;
+			}
+		}
+		if (filter.connections_pending) {
+			filter.reschedule(1000);
+			return;
+		}
+		wait_for_pids = 0;
+	}
+
+	if (inactive_sources == sources.length) {
+		if (filter.live) {
+			//inactive, reschedule in 2 ms. A better way would be to compute next activation time
+			filter.reschedule(2000);
+			//but do generate frame
+		} else {
+			if (vout) vout.eos = true;
+			if (aout) aout.eos = true;
+			do_terminate();
+			print(GF_LOG_INFO, 'sources are over, quit');
+			return GF_EOS;
+		}
+	}
+
+	timers.forEach(update_timer);
+	update_scripts();
+
+	if (filter.maxdur && (video_time >= filter.maxdur*video_timescale)) {
+		if (do_video) {
+			//no longer generating video, increase time for audio generation
+			video_time += video_time_inc;
+			do_video = false;
+		}
+	}
+
+	do_audio = (aout && audio_playing) ? true : false;
+	if (vout && video_playing) {
+		if (do_video) {
+			process_video();
+		}
+		//this typically happens upon init
+		if (audio_playing && (audio_time * video_timescale > (video_time+video_time_inc) * audio_timescale)) {
+			return;
+		}
+	}
+
+	if (filter.maxdur && (audio_time >= filter.maxdur*audio_timescale)) {
+		do_audio = false;
+	}
+
+	if (do_audio) {
+		process_audio();
+		if (!video_playing) {
+			video_time = audio_time * video_timescale;
+			video_time /= audio_timescale;
+		}
+	}
+
+	blocking_ref_pids.forEach(pid => {
+		pid.pck.unref();
+		pid.pck = null;
+	});
+	purge_sources.forEach(s => {
+		sources.splice(sources.indexOf(s), 1);
+	});
+	purge_sources.length = 0;
+}
+
+function scene_resetup_pids(scene)
+{
+	//purge pid links
+	scene.mod.pids.length = 0;
+	scene.apids.length = 0;
+
+	let prefetching = [];
+	//check all pids from sources
+	scene.sequences.forEach(seq => {
+		//this is an offscreen group
+		if (typeof seq.offscreen != 'undefined') {
+			let pid_link = {};
+			pid_link.pid = null;
+			pid_link.sequence = null;
+			pid_link.texture = seq.texture;
+			scene.mod.pids.push(pid_link);
+			return;
+		}
+
+		seq.sources.forEach(src => {
+			if (src.in_prefetch) return;
+			src.pids.forEach(pid => {	
+
+				//check audio pids
+		 if (pid.type == TYPE_AUDIO) {
+					scene.apids.push(pid);
+					return;
+		 }
+
+				//only check for video pids
+		 if (pid.type != TYPE_VIDEO)
+					return;
+
+				//add pid link
+				let pid_link = {};
+				pid_link.pid = pid;
+				pid_link.texture = null;
+				pid_link.sequence = seq;
+				if (pid.source.next_in_transition)
+					prefetching.push(pid_link);
+				else
+					scene.mod.pids.push(pid_link);
+			});
+		}); 
+	});
+
+	prefetching.forEach(pid_link => {
+		print(GF_LOG_DEBUG, 'transitioning to ' + pid_link.pid.source.logname + '.' + pid_link.pid.name);
+		scene.mod.pids.push(pid_link);
+	});
+
+	scene.mod.pids.forEach(pid_link => {
+		if (pid_link.pid)
+			print(GF_LOG_DEBUG, 'created PID link for ' + pid_link.pid.source.logname + '.' + pid_link.pid.name);
+	});
+
+}
+
+function create_pid_texture(pid)
+{
+	pid.texture = new evg.Texture(pid.pck);
+	pid.texture._gl_modified = true;
+	pid.texture.last_frame_ts = pid.frame_ts;
+}
+
+function scene_update_visual_pids(scene)
+{
+	let ready = true;
+	scene.mod.pids.forEach(pidlink => {
+		//offscreen group
+		if (!pidlink.pid) return;
+
+		if (!pidlink.pid.pck) {
+			if (pidlink.pid.source.in_prefetch) {
+				return;			
+			}
+			if (pidlink.pid.source.no_signal) {
+				if (pidlink.texture) return;
+			}
+			ready = false;
+			return;
+		}
+
+		//create texture object at PID level, so we don't end up uploading twice the same data to gpu
+		if (!pidlink.pid.texture) {
+			if (!pidlink.pid.pck) {
+				ready = false;
+				return;				
+			}
+			create_pid_texture(pidlink.pid);
+		}
+
+		if (!pidlink.texture) {
+			pidlink.texture = pidlink.pid.texture;
+			scene.mod.update_flag |= UPDATE_SIZE;
+		} else if (pidlink.pid.frame_ts != pidlink.texture.last_frame_ts) {
+			pidlink.texture.update(pidlink.pid.pck);
+		 pidlink.texture._gl_modified = true;
+		 pidlink.texture.last_frame_ts = pidlink.pid.frame_ts;
+		}
+	});
+	return ready;
+}
+
+
+let round_scene_size = 0;
+
+let global_transform = new evg.Matrix2D();
+let global_branch_depth = 0;
+let active_camera = null;
+
+function update_scene_matrix(scene)
+{
+	let x=scene.x, y=scene.y, z=scene.z, cx=scene.cx, cy=scene.cy, cz=scene.cz;
+	let rotation = scene.rotation;
+	let hskew = scene.hskew;
+	let vskew = scene.vskew;
+	let hscale = scene.hscale;
+	let vscale = scene.vscale;
+	let zscale = scene.zscale;
+	let axis = scene.axis;
+	let orientation = scene.orientation;
+
+	if (scene.untransform)	
+		scene.mx_untransform = true;
+	else if (scene.mx_untransform)
+		scene.mx_untransform = false;
+
+	//compute absolute values
+	if (scene.units == UNIT_RELATIVE) {
+		if (typeof x == 'number')
+			x = x * reference_width/100;
+		if (typeof y == 'number')
+			y = y * reference_height/100;
+		cx = cx * reference_width/100;
+		cy = cy * reference_height/100;
+
+		z = z * reference_height/100;
+		cz = cz * reference_height/100;
+	}
+	//apply special values
+	if (x == "y") x = y;
+	else if (x == "-y") x = -y;
+
+	if (y == "x") y = x;
+	else if (y == "-x") y = -x;
+
+	scene.mx.identity = true;
+
+	try {
+		if (scene.mxjs) {
+			let is_ok = true;
+			let mx_state = {
+					x: x, y: y, z: z,
+					cx: cx, cy: cy, cz,
+					rotation: rotation,
+					hscale: hscale, vscale: vscale, zscale: zscale,
+					hskew: hskew, vskew: vskew,
+					axis: axis,
+					orientation: orientation,
+
+					untransform: scene.mx_untransform, update:false, depth: scene.current_depth
+			};
+
+			let res = scene.mxjs.apply(scene, [mx_state]);
+			if (mx_state.update) scene.update_flag = UPDATE_CHILD;
+			if ((typeof res == 'boolean') && !res) {
+				return false;
+			}
+			scene.mx_untransform = mx_state.untransform ? true : false;
+
+			if (typeof mx_state.x == 'number') x = mx_state.x;
+			else is_ok = false;
+			if (typeof mx_state.y == 'number') y = mx_state.y;
+			else is_ok = false;
+			if (typeof mx_state.z == 'number') z = mx_state.z;
+			else is_ok = false;
+
+			if (typeof mx_state.cx == 'number') cx = mx_state.cx;
+			else is_ok = false;
+			if (typeof mx_state.cy == 'number') cy = mx_state.cy;
+			else is_ok = false;
+			if (typeof mx_state.cz == 'number') cz = mx_state.cz;
+			else is_ok = false;
+
+			if (typeof mx_state.rotation == 'number') rotation = mx_state.rotation;
+			else is_ok = false;
+
+			if (typeof mx_state.hscale == 'number') hscale = mx_state.hscale;
+			else is_ok = false;
+			if (typeof mx_state.vscale == 'number') vscale = mx_state.vscale;
+			else is_ok = false;
+			if (typeof mx_state.zscale == 'number') zscale = mx_state.zscale;
+			else is_ok = false;
+
+			if (typeof mx_state.hskew == 'number') hskew = mx_state.hskew;
+			else is_ok = false;
+			if (typeof mx_state.vskew == 'number') vskew = mx_state.vskew;
+			else is_ok = false;
+
+			if (!mx_state.axis || Array.isArray(mx_state.axis)) axis = mx_state.axis;
+			else is_ok = false;
+			if (!mx_state.orientation || Array.isArray(mx_state.orientation)) orientation = mx_state.orientation;
+			else is_ok = false;
+
+			if (!is_ok) {
+				print(GF_LOG_ERROR, 'Error processing mxjs, result not a valid object');
+				scene.mxjs = null;
+			}
+		}
+	} catch (e) {
+		print(GF_LOG_ERROR, 'Error processing mxjs : ' + e);
+		scene.mxjs = null;
+	}
+
+	//validate axis, if 0,0,1 move to null (no 3D rotation)
+	if (axis) {
+		if (axis.length!=3) axis = null;
+		else if (!axis[0] && !axis[1] && (axis[2]>0)) axis = null;
+	}
+
+	//validate orientation, if no angle, move to null (no 3D oriented scaling)
+	if (orientation) {
+		if (orientation.length!=4) orientation = null;
+		else if (!orientation[3]) orientation = null;
+	}
+
+	let is_3d = false;
+	if (z || cz
+		|| (zscale != 1)
+		|| orientation
+		|| axis
+	) {
+		is_3d = true;
+	}
+
+	if (!is_3d) {
+		if (scene.mx.is3D) scene.mx = new evg.Matrix2D();
+		scene.mx.rotate(cx, cy, rotation * Math.PI / 180);
+		if (hskew) scene.mx.skew_x(hskew);
+		if (vskew) scene.mx.skew_y(vskew);
+		scene.mx.scale(hscale, vscale);
+		scene.mx.translate(x, y);
+		return true;
+	}
+	//3D matrix
+	if (!scene.mx.is3D) scene.mx = new evg.Matrix();
+	if (x || y || scene.z)
+		scene.mx.translate(x, y, z);
+
+	let recenter = (cx || cy || cz) ? 1 : 0;
+	if (recenter)
+		scene.mx.translate(cx, cy, cz);
+
+	if (rotation && axis) scene.mx.rotate(axis[0], axis[1], axis[2], rotation * Math.PI / 180);
+	let	scale_rot = (orientation && orientation[3]) ? 1 : 0;
+	if (scale_rot)
+		scene.mx.rotate(orientation[0], orientation[1], orientation[2], orientation[3] * Math.PI / 180);
+
+	if ((hscale != 1) || (vscale != 1) || (zscale != 1))
+		scene.mx.scale(hscale, vscale, zscale);
+	if (scale_rot)
+		scene.mx.rotate(orientation[0], orientation[1], orientation[2], -orientation[3] * Math.PI / 180);
+
+	if (recenter)
+		scene.mx.translate(-cx, -cy, -cz);
+	return true;
+}
+
+function get_dim(scene, is_width)
+{
+	let val;
+	if (is_width) {
+		val = scene.width;
+		if (val == -1) return reference_width;
+		if (val == "height") {
+			if (scene.height == "width") return 0;
+			return get_dim(scene, false);
+		}
+		if (scene.units == UNIT_RELATIVE)
+			return val * reference_width / 100;
+		return val;
+	}
+
+	val = scene.height;
+	if (val == -1) return reference_height;
+	if (val == "width") {
+		if (scene.width == "height") return 0;
+		return get_dim(scene, true);
+	}
+	if (scene.units == UNIT_RELATIVE)
+		return val * reference_height / 100;
+	return val;
+}
+
+let group_bounds = null;
+
+let reference_width = 0;
+let reference_height = 0;
+
+function group_draw_offscreen(group)
+{
+	//store display list and canvas state
+	let has_opaque_bck = has_opaque;
+	let	display_list_bck = display_list;
+	let global_transform_copy = global_transform.copy();
+	let use_gpu_bck = globalThis.use_gpu;
+	let canvas_bck = canvas;
+	let webgl_bck = webgl;
+	let round_scene_bck = round_scene_size;
+	let group_bounds_bck = group_bounds;
+	//reset state
+	globalThis.use_gpu = false;
+	globalThis.blit_enabled = false;
+	global_transform.identity = true;
+	display_list = [];
+	webgl = null;
+	round_scene_size = 0;
+
+	//traverse while collecting bounds
+	group_bounds = {x: 0,x: 0,w: 0,h: 0,}
+
+
+	let ref_width_bck = reference_width;
+	let ref_height_bck = reference_height;
+	if (group.reference && (group.width>=0) && (group.height>=0)) {
+		let rw = get_dim(group, true);
+		let rh = get_dim(group, false);
+		reference_width = rw;
+		reference_height = rh;
+	}
+
+	group.scenes.forEach(scene => do_traverse_all(scene, update_scene));
+
+	reference_width = ref_width_bck;
+	reference_height = ref_height_bck;
+
+	group.skip_draw = false;
+	if ((group_bounds.w <= 0) || (group_bounds.h <= 0) || (group.width==0) || (group.height==0)) {
+		group.skip_draw = true;
+	}
+
+	let old_w, old_h;
+	if (group.canvas_offscreen) {
+		old_w = group.canvas_offscreen.width;
+		old_h = group.canvas_offscreen.height;
+	} else {
+		old_w = 0;
+		old_h = 0;
+	}
+
+	let scaler = group.scaler;
+	if (scaler<1) scaler = 1;
+	let inv_scaler = 1.0 / scaler;
+
+	let new_w = group_bounds.w;
+	let new_h = group_bounds.h;
+
+	if ((group.width>=0) && (group.height>=0)) {
+		new_w = get_dim(group, true);
+		new_h = get_dim(group, false);
+	}
+	if (new_w>video_width) new_w = video_width;
+	if (new_h>video_height) new_h = video_height;
+
+	new_w = Math.ceil(new_w / scaler);
+	new_h = Math.ceil(new_h / scaler);
+	while (new_w % 2) new_w++;
+	while (new_h % 2) new_h++;
+
+	if ((new_w != old_w) || (new_h != old_h)) {
+		let pf;
+		let old_pf = group.prev_pixfmt || '';
+		let alpha=true;
+		if (group.offscreen==GROUP_OST_MASK) {
+			pf = 'algr';
+		} else {
+	 let a = sys.color_component(group.back_color, 0);
+			if (a == 1.0) {
+				pf = canvas_yuv ? 'yuv4' : 'rgb';
+				alpha = false;
+			}
+			else
+				pf = canvas_yuv ? 'y4ap' : 'rgba';
+		}
+		print(GF_LOG_DEBUG, 'Offscreen group ' + group.id + ' creating offscreen canvas ' + new_w + 'x' + new_h + ' pfmt ' + pf + ' scaler ' + scaler);
+
+		group.canvas_offscreen = new evg.Canvas(new_w, new_h, pf);
+		if (!group.canvas_offscreen) return;
+
+		//don't delete texure once created, it might be used by some scenes
+		if (!group.texture)
+			group.texture = new evg.Texture(group.canvas_offscreen);
+		else
+			group.texture.update(group.canvas_offscreen);
+
+		if (!group.texture) return;
+		group.texture.set_pad_color(group.back_color);
+
+		group.texture.filtering = (scaler > 1) ? GF_TEXTURE_FILTER_HIGH_QUALITY : GF_TEXTURE_FILTER_HIGH_SPEED;
+
+		let mx = new evg.Matrix2D();
+		group.texture_mx = mx;
+
+		group.texture.repeat_s = false;
+		group.texture.repeat_t = false;
+
+		group.path = new evg.Path().rectangle(0, 0, new_w * scaler, new_h * scaler, true);
+
+		group.prev_pixfmt = pf;
+		//texture size changed but not pix format, keep opengl shader otherwise reset it
+		if (pf != old_pf)
+			group.texture._gl_texture = null;
+	}
+
+	if (!group.canvas_offscreen) return;
+
+	print(GF_LOG_DEBUG, 'Redrawing offscreen group ' + group.id);
+	group.tr_x = group_bounds.x + group_bounds.w/2;
+	group.tr_y = group_bounds.y - group_bounds.h/2;
+
+	global_transform.translate(-group.tr_x, -group.tr_y);
+	display_list.forEach(scene => {
+		scene.mx.add(global_transform, true);
+		scene.mx.scale(inv_scaler, inv_scaler);
+	});
+
+	canvas = group.canvas_offscreen;
+	canvas.clipper = null;
+	canvas.clear(group.back_color);
+
+	draw_display_list_2d();
+
+	//restore state
+	global_transform.copy(global_transform_copy);
+	has_opaque = has_opaque_bck;
+	display_list = display_list_bck;
+
+	globalThis.use_gpu = use_gpu_bck;
+	globalThis.blit_enabled = use_gpu_bck ? false : evg.BlitEnabled;
+	canvas = canvas_bck;
+	webgl = webgl_bck;
+	round_scene_size = round_scene_bck;
+	group_bounds = group_bounds_bck;
+
+	group.texture._gl_modified = true;
+}
+
+
+function check_camera(group)
+{
+	if (group.position) return group;
+	if (group.target) return group;
+	if (group.up) return group;
+	if (group.viewport) return group;
+	if (group.fov != 45) return group;
+	if (group.ar && (group.ar * video_height != video_width)) return group;
+	if ((group.znear != 0) || (group.zfar != 0)) return group;
+	return null;
+}
+
+let dummy_mx = new evg.Matrix2D();
+
+function update_group(group)
+{
+	let invalidate_offscreen = false;
+	let draw_regular = true;
+
+	if (group.update_flag) {
+		if (group.update_flag & UPDATE_CHILD)
+				invalidate_offscreen = true;
+
+		group.update_flag = 0;
+
+		if (!update_scene_matrix(group))
+			return;
+	} else if (group.use && group.mxjs) {
+		if (!update_scene_matrix(group))
+			return;
+	}
+
+	if ( (group.opacity<1) || (group.scaler>1) || (group.offscreen>GROUP_OST_NONE)) {
+		if (invalidate_offscreen) {
+			group_draw_offscreen(group);
+		}
+		if (group.offscreen > GROUP_OST_DUAL) return;
+
+		//we fail at setting up group opacity, use regular draw
+		if (group.canvas_offscreen) draw_regular = false;
+	}
+
+	//regular traversal
+	if (draw_regular) {
+		if (global_branch_depth > filter.maxdepth) {
+			print(GF_LOG_ERROR, 'Maximum depth ' + filter.maxdepth + ' reached, aborting scene traversal - try increasing using --maxdepth=N');
+			return;
+		}
+
+		//we need a copy at each level
+		let global_transform_copy = global_transform.copy();
+		let last_camera = active_camera;
+		let current_camera = check_camera(group);
+		if (current_camera) active_camera = current_camera;
+
+		if ((group.mx.is3D || current_camera) && !global_transform.is3D) {
+			global_transform = new evg.Matrix(global_transform_copy);
+		}
+
+		if (!group.mx_untransform)
+			global_transform.add(group.mx, true);
+		else
+			global_transform.copy(group.mx);
+
+		global_branch_depth ++;
+
+		let first_obj = display_list.length;
+
+		let ref_width_bck = reference_width;
+		let ref_height_bck = reference_height;
+		if (group.reference && (group.width>=0) && (group.height>=0)) {
+			let rw = get_dim(group, true);
+			let rh = get_dim(group, false);
+			reference_width = rw;
+			reference_height = rh;
+		}
+
+		if (group.use) {
+			let target = get_scene(group.use);
+			if (!target) target = get_group(group.use);
+			if (target) {
+				if ((group.use_depth<0) || (group.use_depth>group.current_depth)) {
+					group.current_depth++;
+					do_traverse_all(target, update_scene);
+					group.current_depth--;
+				}
+			}
+		} else {
+			group.scenes.forEach(scene => do_traverse_all(scene, update_scene));
+		}
+
+		global_transform = global_transform_copy;
+		global_branch_depth --;
+
+		if (current_camera) active_camera = last_camera;
+		reference_width = ref_width_bck;
+		reference_height = ref_height_bck;
+
+		let last_obj = display_list.length;
+		if (group.reverse && (last_obj>first_obj)) {
+			let trunc_display_list = display_list.splice(first_obj, last_obj-first_obj);
+			trunc_display_list.reverse.apply(trunc_display_list);
+			display_list.push.apply(display_list, trunc_display_list);
+		}
+
+		return;
+	}
+
+	if (group.skip_draw) return;
+
+ //update matrix, opacity and push group to display list
+	if (!update_scene_matrix(group))
+		return;
+
+	dummy_mx.identity = true;
+	dummy_mx.translate(group.tr_x, group.tr_y);
+	group.mx.add(dummy_mx, true);
+
+	if (!group.mx_untransform)
+		group.mx.add(global_transform);
+
+	let draw_ctx = {};
+	draw_ctx.mx = group.mx.copy();
+	draw_ctx.screen_rect = null; //TODO
+	draw_ctx.scene = null;
+	draw_ctx.group = group;
+	draw_ctx.opaque_pid = null;
+	draw_ctx.is_opaque = false;
+	draw_ctx.zorder = group.zorder;
+	draw_ctx.camera = check_camera(group);
+
+	display_list.push(draw_ctx);
+
+}
+
+function update_scene(scene)
+{
+	//this is a group
+	if (Array.isArray(scene.scenes)) {
+		if (scene.active)
+			update_group(scene);
+		//abort traversing, it is done in update_group
+		return true;
+	}
+
+	if (!scene.active) {
+		return;
+	}
+
+	//apply styles if any
+	scene.styles.forEach(sid => {
+		let style = get_element_by_id(sid, styles);
+		if (!style) return;
+		if (!style.updated && !style.forced) return;
+		for (var x in style ) {
+			if (typeof scene.mod[x] != undefined) {
+				scene.set(x, style[x]);
+			}
+		}
+	});
+
+	//recreate our set of inputs for the scene if any
+	if (scene.resetup_pids) {
+		scene_resetup_pids(scene);
+		scene.resetup_pids = false;
+		scene.mod.update_flag |= UPDATE_PID;
+	}
+	//not ready
+	if (!scene_update_visual_pids(scene)) return;
+
+	//compute scene size in pixels
+	let sw = get_dim(scene, true);
+	let sh = get_dim(scene, false);
+	if ((scene.mod.width != sw) || (scene.mod.height != sh)) {
+		scene.mod.width = sw;
+		scene.mod.height = sh;
+		scene.mod.update_flag |= UPDATE_SIZE;
+	}
+
+	if (scene.mod.update_flag)
+		scene.gl_uniforms_reload = true;
+	else if (scene.gl_uniforms_reload) 
+		scene.gl_uniforms_reload = false;
+
+
+	if (scene.mod.update_flag & UPDATE_FX) {
+		scene.transition = null;
+		scene.gl_program = null;
+	}
+
+	//update the matrix
+	if (!update_scene_matrix(scene))
+		return;
+
+	if (!scene.mx_untransform) {
+		if (!scene.mx.is3D && global_transform.is3D)
+				scene.mx = new evg.Matrix(scene.mx);
+
+		scene.mx.add(global_transform);
+	}
+
+
+	//update the scene
+	scene.mod.force_draw = false;
+	scene_in_update = scene;
+	let res = scene.mod.update();
+	scene_in_update = null;
+	if (!res) return;
+	if (res==2) has_clip_mask = true;
+
+
+	let cover_type = 0;
+	let use_rotation = false;
+	if (scene.mx.is3D) {
+		use_rotation = true;
+	} else {
+		if (!scene.mx.xx || !scene.mx.yy) return;
+		if ((scene.mx.xx<0) || (scene.mx.yy<0) || (scene.mx.xy) || (scene.mx.yx)) use_rotation = true;
+	}
+
+	scene.mod.screen_rect = null;
+
+	let rc = {x: - scene.mod.width/2, y : scene.mod.height/2, w: scene.mod.width, h: scene.mod.height};
+	rc = scene.mx.apply(rc);
+
+	if (group_bounds) {
+			group_bounds = sys.rect_union(group_bounds, rc);
+	}
+
+	//if final matrix has rotation
+	if (use_rotation) {
+			cover_type = 0;
+	} else {
+		let can_blit = false;
+
+		if ((rc.w == video_width)
+				&& (rc.h == video_height)
+				&& (rc.x == -video_width/2)
+				&& (rc.y == video_height/2)
+		) {
+			can_blit = true;
+			cover_type = 1;
+		}
+		else if ((rc.w > video_width)
+				&& (rc.h > video_height)
+				&& (rc.x <= -video_width/2)
+				&& (rc.y >= video_height/2)
+				&& (rc.x+rc.w >= video_width/2)
+				&& (rc.y - rc.h <= -video_height/2)
+		) {
+			cover_type = 2;
+		}
+
+		if ((rc.x >= -video_width/2)
+			&& (rc.y <= video_height/2)
+			&& (rc.x+rc.w <= video_width/2)
+			&& (rc.y - rc.h >= -video_height/2)
+		) {
+			can_blit = true;
+		}
+
+		if (can_blit) {
+			rc.x += video_width/2;
+			rc.y = video_height/2 - rc.y;
+
+			rc.x = Math.floor(rc.x);
+			rc.y = Math.floor(rc.y);
+			rc.w = Math.floor(rc.w);
+			rc.h = Math.floor(rc.h);
+			scene.mod.screen_rect = rc;
+		}
+	}
+
+	let opaque_pid = null;
+	let is_opaque = false;
+
+	if (!has_clip_mask && cover_type) {
+		let opaque_pid_idx = scene.mod.fullscreen();
+		if (scene.sequences.length && !scene.mod.pids.length) {
+		} else if ((scene.sequences.length>1) && scene.transition) {
+		} else {
+			if ((opaque_pid_idx>=0) && (opaque_pid_idx<scene.mod.pids.length)) {
+				opaque_pid = scene.mod.pids[opaque_pid_idx].pid;
+			}
+
+			if (!opaque_pid) {
+				is_opaque = scene.mod.is_opaque() || false;
+			} else {
+				//disable reuse if transition
+				if (opaque_pid.source.sequence.transition_state) {
+					opaque_pid = null;
+					is_opaque = false;
+				}
+			}
+		}
+	}
+
+	if (opaque_pid) {
+		has_opaque = true;
+		if (pids.indexOf(opaque_pid) < 0) {
+			print(GF_LOG_WARNING, 'Broken scene ' + scene.id + ' returned fullscreen pid not in PID list');
+			scene.active = false;
+			return;
+		}
+	} else if (!use_rotation && is_opaque) {
+		has_opaque = true;
+	} else {
+		is_opaque = false;
+	}
+
+	let draw_ctx = {};
+	draw_ctx.mx = scene.mx.copy();
+	draw_ctx.screen_rect = scene.mod.screen_rect;
+	draw_ctx.scene = scene;
+	draw_ctx.group = null;
+	draw_ctx.opaque_pid = opaque_pid;
+	draw_ctx.is_opaque = is_opaque;
+	draw_ctx.zorder = scene.zorder;
+	draw_ctx.camera = check_camera(scene);
+	if (!draw_ctx.camera) draw_ctx.camera = active_camera;
+
+	display_list.push(draw_ctx);
+}
+
+function set_canvas_yuv(pfmt)
+{
+	globalThis.canvas_yuv = sys.pixfmt_yuv(pfmt);
+	round_scene_size = 0;
+	if (canvas_yuv) {
+		if (pfmt == 'yuv4') {}
+		else if (pfmt =='yp4l') {}
+		else if (pfmt =='yp4a') {}
+		else if (pfmt =='yv4p') {}
+		else if (pfmt =='y4ap') {}
+		else if (pfmt =='y4lp') {}
+		else if ((pfmt == 'yuv2')
+			|| (pfmt == 'yp2l')
+			|| (pfmt == 'uyvy')
+			|| (pfmt == 'vyuy')
+			|| (pfmt == 'yuyv')
+			|| (pfmt == 'yvyu')
+			|| (pfmt == 'uyvl')
+			|| (pfmt == 'vyul')
+			|| (pfmt == 'yuyl')
+			|| (pfmt == 'yvyl')
+		) {
+			round_scene_size = 1;
+		}
+		else {
+			round_scene_size = 2;
+		}
+	}
+
+}
+
+let prev_display_list = [];
+let display_list = [];
+let has_clip_mask = false;
+let has_opaque = false;
+
+function set_active_scene(ctx)
+{
+	active_camera = null;
+	if (ctx.group) {
+		ctx.group.mx.copy(ctx.mx);
+		active_camera = ctx.camera;
+		active_scene = null;
+		return true;
+	}
+	if (ctx.scene) {
+		ctx.scene.mx.copy(ctx.mx);
+		ctx.scene.mod.screen_rect = ctx.screen_rect;
+		active_camera = ctx.camera;
+		active_scene = ctx.scene;
+		return true;
+	}
+	return false;
+}
+
+function round_rect(rc_in)
+{
+	let rc = rc_in;
+	if (rc.x % 2) { rc.x--; rc.w++; }
+	if (rc.w % 2) rc.w--;
+	//only round y for 420 & co
+	if (round_scene_size==2) {
+		if (rc.y % 2) { rc.y--; rc.h++; }
+		if (rc.h % 2) rc.h--;
+	}
+	return rc;
+}
+
+let mask_mode = 0;
+
+function draw_display_list_2d()
+{
+	display_list.forEach(ctx => {
+			if (!set_active_scene(ctx)) return;
+
+			//offscreen group
+			if (ctx.group) {
+				//only used to get the matrix
+				active_scene = ctx;
+				ctx.group.texture.mx = ctx.group.texture_mx;
+				ctx.group.texture.set_alphaf(ctx.group.opacity);
+				canvas_draw(ctx.group.path, ctx.group.texture, true);
+				return;
+			}
+			let scene = ctx.scene;
+
+			if (mask_mode) {
+				scene.mod.screen_rect = null;
+			} else if (round_scene_size && scene.sequences.length && scene.mod.screen_rect) {
+				scene.mod.screen_rect = round_rect(scene.mod.screen_rect);
+			}
+
+			if (1) {
+					scene.mod.draw(canvas);
+			} else {
+				try {
+					scene.mod.draw(canvas);
+				} catch (e) {
+					print(GF_LOG_ERROR, 'Error during scene ' + scene.id + ' draw, disabling scene - error was ');
+					scene.active = false;
+				}
+			}
+
+		canvas.matrix = null;
+		canvas.path = null;
+		//do not reset clipper
+	});
+}
+
+
+function process_video()
+{
+	if (!video_inputs_ready) {
+		if (!video_time && !live_forced_play) {
+			print(GF_LOG_DEBUG, 'video not init');
+			do_audio = false;
+			return;
+		}
+		if (!filter.live) {
+			print(GF_LOG_DEBUG, 'waiting for video frame');
+			return;
+		}
+	}
+
+	if (filter.live) {
+		let now = sys.clock_us();
+		let vtime = init_clock_us + 1000000 * (video_time+1) * video_time_inc / video_timescale;
+
+		if (vtime < now) {
+			if (!video_inputs_ready)
+				print(pids.length ? GF_LOG_WARNING : GF_LOG_DEBUG, 'video input frame(s) not ready but output frame due since ' + (now - vtime) + ' us, forcing generation');
+		} else if (vtime - now > video_frame_dur_us) {
+			let next = vtime - now;
+			if (next > video_max_resched_dur_us) next = video_max_resched_dur_us;
+			//first reset any timeout set previously (due do source not being ready)
+			filter.reschedule(0);
+			//then set our real timeout
+			filter.reschedule(next);
+			print(GF_LOG_DEBUG, 'video output frame due in ' + (vtime - now) + ' us, waiting ' + next);
+			return;
+		}
+	}
+
+ display_list.length = 0;
+ has_clip_mask = false;
+	has_opaque = false;
+	reference_width = video_width;
+	reference_height = video_height;
+	active_camera = null;
+	global_transform.identity = true;
+	root_scene.scenes.forEach(elm => do_traverse_all(elm, update_scene) );
+
+ //sort display list - BROKEN if multiple scene instances
+ display_list.sort( (e1, e2) => { return e1.zorder - e2.zorder ; } );
+
+	let pid_background = null;
+	let pid_background_forward = false;
+
+	let frame = null;
+	let pfmt = video_pfmt;
+	let restore_pfmt = false;
+ //reverse browse
+	if (has_opaque) {
+		for (let i=display_list.length; i>0; i--) {
+			let ctx = display_list[i-1];
+
+			if (ctx.opaque_pid || ctx.is_opaque) {
+				display_list = display_list.splice(i-1);
+			}
+
+			if (ctx.opaque_pid) {
+				pid_background = ctx.opaque_pid;
+				pid_background_forward = (ctx.scene && ctx.scene.mod.identity()) || false;
+
+				if (!pid_background.pck) {
+					pid_background_forward = false;
+					pid_background = null;
+					has_opaque = false;
+					if (ctx.scene) ctx.scene.mod.force_draw = true;
+				}
+				break;
+			}
+			if (ctx.is_opaque) {
+				break;
+			}
+		}
+	}
+
+
+	if (!filter.gpu && has_opaque) {
+		if (display_list.length>1)
+			pid_background_forward = false;
+
+		//init canvas 2D from this packet
+		if (pid_background && (pid_background.width==video_width) && (pid_background.height==video_height)) {
+			//mismatch in pixel format cannot reuse packet
+			if (!filter.dynpfmt && (pid_background.pfmt != video_pfmt)) {
+				pid_background_forward = false;
+				display_list[0].scene.mod.force_draw = true;
+			} else {
+		 	if (last_forward_pixfmt != pid_background.pfmt) {
+					last_forward_pixfmt = pid_background.pfmt;
+					canvas_reconfig = true;
+					if (last_forward_pixfmt != video_pfmt) {
+						print(GF_LOG_DEBUG, 'reconfiguring output video pixel format to ' + last_forward_pixfmt);
+						vout.set_prop('PixelFormat', last_forward_pixfmt);
+						vout.set_prop('Stride', pid_background.get_prop('Stride') );
+						vout.set_prop('StrideUV', pid_background.get_prop('StrideUV') );
+					}
+				}
+				pfmt = last_forward_pixfmt;
+				if (pid_background_forward) {
+					//direct ref
+					frame = vout.new_packet(pid_background.pck);
+					print(GF_LOG_DEBUG, 'forwarding packet from source ' + pid_background.source.logname);
+				} else {
+					//copy packet (we may need to reuse source packet at next frame)
+					frame = vout.new_packet(pid_background.pck, false, true);
+					print(GF_LOG_DEBUG, 'copying packet from source ' + pid_background.source.logname);
+				}
+			}
+			if (filter.dynpfmt==1) {
+				if (last_forward_pixfmt) {
+					video_pfmt = last_forward_pixfmt;
+				}
+				print(GF_LOG_INFO, 'Video output format will be ' + video_pfmt);
+				filter.dynpfmt = 0;
+			}
+		} else {
+			if (last_forward_pixfmt && (last_forward_pixfmt != video_pfmt))
+					restore_pfmt = true;
+		}
+
+	} else if (last_forward_pixfmt && (last_forward_pixfmt != video_pfmt)) {
+		restore_pfmt = true;
+	}
+
+	if (restore_pfmt) {
+		vout.set_prop('PixelFormat', video_pfmt);
+		vout.set_prop('Stride', null);
+		vout.set_prop('StrideUV', null);
+		last_forward_pixfmt = 0;
+		canvas_reconfig = true;
+	}			
+
+	clip_stack.length = 0;
+	global_branch_depth = 0;
+ if (filter.gpu) {
+
+		webgl.activate(true);
+
+
+	 webgl.viewport(0, 0, video_width, video_height);
+	 webgl.clearDepth(1.0);
+ 	webgl.enable(webgl.DEPTH_TEST);
+ 	webgl.enable(webgl.BLEND);
+ 	webgl.blendFunc(webgl.SRC_ALPHA, webgl.ONE_MINUS_SRC_ALPHA);
+ 	webgl.depthFunc(webgl.LEQUAL);
+ 	webgl.clear(webgl.DEPTH_BUFFER_BIT);
+
+		if (!has_opaque) {
+			let a = sys.color_component(back_color, 0);
+			let r = sys.color_component(back_color, 1);
+			let g = sys.color_component(back_color, 2);
+			let b = sys.color_component(back_color, 3);
+	 	webgl.clearColor(r, g, b, a);
+		 webgl.clear(webgl.COLOR_BUFFER_BIT);
+		}
+
+	 wgl_clipper = null;
+
+	 if (!display_list.length) {
+			active_scene = null;
+			draw_scene_no_signal(null);
+		} else {
+			display_list.forEach(ctx => {
+				if (!set_active_scene(ctx)) return;
+
+				//offscreen group
+				if (ctx.group) {
+					//only used to get the matrix
+					active_scene = ctx;
+					ctx.group.texture.mx = ctx.group.texture_mx;
+					ctx.group.texture.set_alphaf(ctx.group.opacity);
+					canvas_draw(ctx.group.path, ctx.group.texture, true);
+					return;
+				}
+
+				if (ctx.scene.gl_type == SCENE_GL_NONE) {
+					ctx.scene.mod.draw();
+				} else {
+					ctx.scene.mod.draw_gl(webgl);
+				}
+			});
+		}
+
+
+		canvas_offscreen_deactivate();
+
+	 webgl.disable(webgl.SCISSOR_TEST);
+
+		webgl.flush();
+		webgl.activate(false);
+
+		frame = vout.new_packet(webgl, () => { filter.frame_pending=false; } );
+		filter.frame_pending = true;
+ } else {
+		if (!frame) {
+			frame = vout.new_packet(vout_size);
+			print(GF_LOG_DEBUG, 'allocating packet for framebuffer');
+		}
+
+		if (!pid_background_forward) {
+			if (!canvas) {
+				try {
+					canvas = new evg.Canvas(video_width, video_height, pfmt, frame.data);
+				} catch (e) {
+					print(GF_LOG_ERROR, 'Failed to create canvas: ' + e);
+					do_terminate();
+					return;
+				}
+
+				if (filter.thread) {
+					canvas.enable_threading(filter.thread);
+				}
+				if (use_canvas_3d)
+					canvas.enable_3d();
+
+				if (typeof canvas.blit != 'function')
+					globalThis.blit_enabled = false;
+				else if (!globalThis.use_gpu)
+					globalThis.blit_enabled = evg.BlitEnabled;
+
+				canvas.pix_fmt = pfmt;
+				set_canvas_yuv(pfmt);
+			} else if (canvas_reconfig) {
+				canvas_reconfig = false;	
+				try {
+					canvas.reassign(video_width, video_height, pfmt, frame.data);
+				} catch (e) {
+					print(GF_LOG_ERROR, 'Failed to reassign canvas: ' + e);
+					do_terminate();
+					return;
+				}
+
+				canvas.pix_fmt = pfmt;
+				set_canvas_yuv(pfmt);
+			} else {		
+				canvas.reassign(frame.data);
+			}
+
+			//reset clipper
+			canvas.clipper = null;
+
+			if (!has_opaque) {
+				print(GF_LOG_DEBUG, 'canvas clear to ' + back_color);
+				canvas.clear(back_color);
+			}
+
+		 if (!display_list.length) {
+				active_scene = null;
+				draw_scene_no_signal(null);
+			} else {
+				draw_display_list_2d();
+			}
+		}
+ }
+
+	frame.cts = frame.dts = video_time;
+	frame.dur = video_time_inc;
+	frame.sap = GF_FILTER_SAP_1;
+	frame.send();
+
+	if (filter.live) {
+		let now = sys.clock_us();
+		if (!video_time) {
+			init_utc = sys.get_utc();
+			init_clock_us = now;
+		}
+		let vtime = init_clock_us + 1000000*video_time * filter.fps.d / filter.fps.n;
+		if (vtime + video_frame_dur_us < now) {
+			print(GF_LOG_WARNING, 'sent video frame TS ' + (video_time) + '/' + video_timescale + ' too late by ' + Math.ceil(now - vtime - video_frame_dur_us) + ' us');
+		} else if (vtime < now) {
+			print(GF_LOG_DEBUG, 'sent video frame TS ' + (video_time) + '/' + video_timescale + ' (' + Math.ceil(now-vtime) + ' us early)');
+		} else {
+			print(GF_LOG_DEBUG, 'sent video frame TS ' + (video_time) + '/' + video_timescale);
+		}
+		next_video_gen_time = vtime + video_frame_dur_us;
+	} else {
+			print(GF_LOG_DEBUG, 'sent video frame TS ' + (video_time) + '/' + video_timescale);		
+	}
+
+	video_time += video_time_inc;
+
+	let old_prev = prev_display_list;
+	prev_display_list = display_list;
+	display_list = old_prev;
+	display_list.length = 0;
+
+	styles.forEach(style => {
+		style.updated = false;
+	});
+}
+
+function process_audio()
+{
+	let nb_samples = 0;
+	let i,j,k, nb_active_audio=0;
+	let mix_pids = [];
+
+	//if video is playing and not blocking, process audio event if blocking - this avoids cases where output frames are consumed by burst
+	//and the video burst happens befor the audio burst: we need to send video to fill the burst then unblock audio, but video won't be procesed
+	//if audio is blocking... 
+	if (aout.would_block && (!video_playing || vout.would_block)) {
+		return;
+	}
+
+	if (!audio_inputs_ready) {
+		if (!audio_time && !live_forced_play)
+			return;
+	}
+	if (!video_playing && filter.live) {
+		let now = sys.clock_us();
+		let atime = init_clock_us + 1000000 * (audio_time) / audio_timescale;
+
+		if (atime - now > audio_frame_dur_us) {
+			print(GF_LOG_DEBUG, 'audio output frame due in ' + (atime - now) + ' us, waiting');
+			let next = atime - now;
+			if (next > audio_max_resched_dur_us) next = audio_max_resched_dur_us;
+			filter.reschedule(next);
+			return;
+		}
+
+	}
+
+	pids.forEach(pid => {
+		if (pid.type != TYPE_AUDIO) return;
+		if (!pid.source.playing) return;
+		if (pid.source.disabled) return;
+		if (pid.eos) return;
+		if (pid.done) return;
+		nb_active_audio++;
+		if (!pid.pck) return;
+		let samp_avail = pid.nb_samples - pid.samples_used;
+		if (!nb_samples || (samp_avail<nb_samples)) nb_samples = samp_avail;
+		mix_pids.push(pid);
+		if (!pid.data) {
+			pid.data = pid.pck.data;
+		}
+		//default is mute
+		pid.volume = 0;
+		pid.detached = true;
+	});
+
+	if (nb_samples > filter.alen)
+		nb_samples = filter.alen;
+
+
+	let aframe = null;
+	let empty=false;
+
+	if (!nb_samples) {
+		//todo - check if we need to move forward after some time (and drop input), to allow holes in timeline
+		if (nb_active_audio) {
+			if (!filter.live) {
+				print(GF_LOG_DEBUG, 'waiting for audio frame');
+				return;
+			}
+			let atime = init_clock_us + (audio_time + 2*filter.alen)*1000000/filter.sr;
+			let now = sys.clock_us();
+			if (atime >= now) {
+				print(GF_LOG_DEBUG, 'waiting for audio frame');
+				return;
+			}
+			print(GF_LOG_WARNING, 'empty audio input but audio frame due since ' + Math.ceil(now-atime) + ' us');
+		}
+
+		//send an empty packet of 100 samples
+		aframe = aout.new_packet(channels * filter.alen);
+		let output = new Uint16Array(aframe.data);
+		output.fill(0);
+		empty=true;
+		nb_samples = filter.alen;
+	} else {
+
+		//apply volume per scene
+		do_traverse(root_scene, scene => {
+			scene.apids.forEach(pid => {
+				pid.detached = false;
+				if (pid.source.mix)
+					pid.volume = scene.mod.volume * pid.source.mix_volume;
+				else
+					pid.volume = scene.mod.volume;
+
+				//scene inactive
+				if (!scene.active) {
+					//pid was active, either mute or fade to 0
+					if (pid.active) {
+						if ((scene.mod.fade=='out') || (scene.mod.fade=='inout')) {
+							pid.fade = 2; //fade to 0
+						} else {
+							pid.volume = 0;
+						}
+						pid.active = false;
+					} else {
+						pid.volume = 0;
+					}
+				}
+				//scene active, pid was inactive: use full volume and fade from to 0
+				else if (!pid.active) {
+					if ((scene.mod.fade=='in') || (scene.mod.fade=='inout')) {
+						pid.fade = 1; //fade from 0
+					}
+					pid.active = true;
+					//remember audio fade type
+					pid.audio_fade = scene.mod.fade;
+				}
+			});
+		});
+
+		//also do a fadeout for pids no longer active
+		mix_pids.forEach(pid => {
+			if (!pid.detached || !pid.active) return;
+			if ((pid.audio_fade=='out') || (pid.audio_fade=='inout')) {
+				pid.fade = 2; //fade to 0
+			}
+			pid.active = false;
+		});
+
+		aframe = aout.new_packet(nb_samples * channels * sample_size);
+
+		audio_mix.mix(audio_time, aframe.data, mix_pids);
+
+		mix_pids.forEach(pid => {
+			if (pid.nb_samples <= pid.samples_used) {
+				pid.nb_samples = 0;
+				pid.samples_used = 0;
+				pid.pck.unref();
+				pid.pck = null;
+				pid.data = null;
+				pid.fade = 0;
+			}
+		});
+	}
+
+	aframe.cts = audio_time;
+	aframe.dur = nb_samples;
+	aframe.sap = GF_FILTER_SAP_1;
+	aframe.send();
+
+	let msg = 'sent ' + (empty ? 'empty ' : '') + 'audio frame TS ' + (audio_time) + '/' + audio_timescale;
+
+	if (filter.live) {
+		let now = sys.clock_us();
+		if (!audio_time && !video_playing) {
+			init_utc = sys.get_utc();
+			init_clock_us = now;
+		}
+
+		let atime = init_clock_us + 1000000*audio_time/audio_timescale;
+		if (atime + nb_samples < now) {
+			print(GF_LOG_WARNING, msg + ' too late by ' + Math.ceil(now - atime - nb_samples) + ' us');
+		} else if (atime < now) {
+			print(GF_LOG_DEBUG, msg + ' (' + (now-atime) + ' us early)');
+		} else {
+			print(GF_LOG_DEBUG, msg);
+		}
+		next_audio_gen_time = atime + audio_frame_dur_us;
+	} else {
+			print((empty && nb_active_audio) ? GF_LOG_ERROR : GF_LOG_DEBUG, msg);
+	}
+
+	audio_time += nb_samples;
+}
+
+let inactive_sources = 0;
+
+function next_source(s, prefetch_check)
+{
+	let next_src_idx = -1;
+	let src_idx = s.sequence.sources.indexOf(s);
+	if (src_idx<0) {
+		print(GF_LOG_WARNING, 'source ' + s.logname + ' was removed from parent sequence while active');
+		if (s.sequence.sources.length)
+			next_src_idx = 0;
+	} else if (src_idx +1 < s.sequence.sources.length) {
+		next_src_idx = src_idx+1;
+	} else if (s.sequence.loop != 0) {
+		if (!prefetch_check && (s.sequence.loop > 0))
+			s.sequence.loop -= 1;
+		next_src_idx = 0;
+	}
+
+	let next_src = null;
+	if (next_src_idx>=0) {
+		for (let i=next_src_idx; i<s.sequence.sources.length; i++) {
+			next_src = s.sequence.sources[i];
+			if (!next_src.disabled) break;
+			next_src = null;
+		}
+		if (!next_src && next_src_idx) {
+			for (let i=0; i<s.sequence.sources.length; i++) {
+				next_src = s.sequence.sources[i];
+				if (!next_src.disabled) break;
+				next_src = null;
+			}
+		}
+		if (!next_src) {
+			print(GF_LOG_INFO, 'All sources in sequence disabled !');
+			s.sequence.active_state = 2;
+			if (s.sequence.id)
+				trigger_watcher(s.sequence, 'active', false);
+		}
+	}
+	return next_src;
+}
+
+function sequence_over(s, force_seq_reload)
+{
+	let is_transition_start = false;
+	if (s.sequence.transition_state == 2) {
+		is_transition_start = true;
+		s.sequence.transition_state = 3;
+	}
+	//error loading transition, reset state
+	else if (s.sequence.transition_state == 4) {
+		s.sequence.transition_state = 0;
+		s.video_time_at_init = 0;
+		s.sequence.sources.forEach(src => { src.next_in_transition = false;});
+	}
+	//end of transition, reset state and return (next is already loaded)
+	else if (s.sequence.transition_state == 3) {
+		s.sequence.transition_state = 0;
+		print(GF_LOG_INFO, 'End of transition for sequence ' + s.sequence.id);
+		do_traverse(root_scene, scene => {
+			if (scene.sequences.indexOf(s.sequence) >= 0) {
+				scene.resetup_pids = true;
+			}
+		});
+		s.sequence.sources.forEach(src => { src.next_in_transition = false;});
+		print(GF_LOG_INFO, 'stopping source ' + s.logname);
+ 	s.video_time_at_init = 0;
+		stop_source(s, true);
+		return;
+	}
+
+	s.video_time_at_init = 0;
+
+	while (1) {
+
+	//no packets for the desired time range
+	if (!s.timeline_init && s.sequence.start_offset) {
+		let dur = s.duration;
+		if (s.media_stop > s.media_start)
+			 dur = s.media_stop - s.media_start;
+		if (dur < s.sequence.start_offset) {
+			s.sequence.start_offset -= dur;
+		} else {
+			print(GF_LOG_DEBUG, 'reset sequence start offset ' + s.sequence.start_offset + ' to 0 - ' + s.duration);
+			s.sequence.start_offset = 0;
+		}
+	}
+
+	let next_src = next_source(s, false);
+	let is_same_source = (next_src === s) ? true : false;
+	if (force_seq_reload)
+		is_same_source = false;
+
+	if (!is_transition_start) {
+		print(GF_LOG_DEBUG, 'source ' + s.logname + ' is over, sequence start offset ' + s.sequence.start_offset);
+		if (!is_same_source)
+			stop_source(s, true);
+
+		//transition has been started so next source is loaded, only reset scene pids
+		if (s.sequence.transition_state==3) {
+			do_traverse(root_scene, scene => {
+				if (scene.sequences.indexOf(s.sequence) >= 0) {
+						scene.resetup_pids = true;
+						print(GF_LOG_DEBUG, 'end of transition, scene PID resetup');
+				}
+			});
+			s.sequence.transition_state = 0;
+			return;
+		}
+	}
+
+	if (next_src) {
+		if (next_src.in_prefetch) {
+			print(GF_LOG_INFO, 'End of prefetch for ' + next_src.logname);
+			next_src.in_prefetch = 0;
+			next_src.pids.forEach(pid => {
+				if (pid.type==TYPE_VIDEO) {
+					let pck = pid.get_packet();
+					print(GF_LOG_DEBUG,'got packet during prefetch: ' + ((pck==null) ? 'no' : 'yes'));
+				}
+			});
+
+			do_traverse(root_scene, scene => {
+				if (scene.sequences.indexOf(s.sequence) >= 0) {
+						scene.resetup_pids = true;
+						print(GF_LOG_DEBUG, 'end of prefetch, scene PID resetup');
+				}
+			});
+
+		} else {
+			print(GF_LOG_DEBUG, 'load next in sequence ' + next_src.logname);
+			let dur = next_src.duration;
+			if (next_src.media_stop > next_src.media_start)
+					dur = next_src.media_stop - next_src.media_start;
+			if (dur && (dur < s.sequence.start_offset)) {
+				print(GF_LOG_DEBUG, 'source ' + next_src.logname + ' will end before sequence start offset ' + s.sequence.start_offset + ' - skipping');
+				s = next_src;
+				continue;	
+			}
+
+			if (!is_same_source) {
+				open_source(next_src);
+			} else {
+				stop_source(next_src, false);
+			}
+			play_source(next_src);
+		}
+	} else if (! is_transition_start) {
+		inactive_sources++;
+		print(GF_LOG_DEBUG, 'sequence over');
+	}
+	return;
+
+	}
+}
+
+function fetch_source(s)
+{
+	let wait_audio=0, wait_video=0;
+	if (s.disabled) {
+		inactive_sources++;
+		return;
+	}
+	if (s.removed) {
+		inactive_sources++;
+		return;
+	}
+
+	//check if source must be started
+	if (!s.playing) {
+		if (!s.sequence.active_state && (s.sequence.start_time>0) && (s.sequence.start_time <= current_utc_clock + s.prefetch_ms)) {
+			s.sequence.start_offset = (current_utc_clock + s.prefetch_ms - s.sequence.start_time ) / 1000.0;
+			if (s.sequence.start_offset<0.1) s.sequence.start_offset = 0;
+			s.sequence.active_state = 1;
+			if (s.sequence.id)
+				trigger_watcher(s.sequence, 'active', true);
+
+			print(GF_LOG_DEBUG, 'Starting sequence start offset ' + s.sequence.start_offset + ' - ' + s.sequence.start_time + ' - UTC ' + current_utc_clock);
+
+			if (s.media_start + s.media_stop < s.sequence.start_offset) {
+					print(GF_LOG_DEBUG, 'source ' + s.logname + ' will end before sequence start_offset, skipping source ');
+					s.sequence.start_offset -= s.media_start + s.media_stop;
+					inactive_sources++;
+					sequence_over(s, false);
+					return;
+			} else {
+				open_source(s);
+				play_source(s);
+				if (current_utc_clock < s.sequence.start_time) {
+						s.in_prefetch = 2;
+						inactive_sources++;
+						return;
+				}
+			}
+		} else {
+			inactive_sources++;
+			return;
+		}
+	}
+	if (s.in_prefetch) {
+		if ((s.in_prefetch==2) && (s.sequence.start_time>0) && (s.sequence.start_time <= current_utc_clock)) {
+			s.in_prefetch = 0;
+			print(GF_LOG_DEBUG, 'end of prefetch for ' + s.logname + ' , scene PID resetup');
+			do_traverse(root_scene, scene => {
+				if (scene.sequences.indexOf(s.sequence) >= 0) {
+						scene.resetup_pids = true;
+				}
+			});
+		} else {
+			inactive_sources++;
+			return;		
+		}
+	}
+
+	//done with sequence
+	if ((s.sequence.active_state==1) && (s.sequence.stop_time>0) && (s.sequence.stop_time <= current_utc_clock)) {
+	 	s.video_time_at_init = 0;
+			stop_source(s, true);
+			s.sequence.transition_state = 0;
+			do_traverse(root_scene, scene => {
+				if (scene.sequences.indexOf(s.sequence) >= 0) {
+					scene.resetup_pids = true;
+				}
+			});
+			s.sequence.sources.forEach(src => { src.next_in_transition = false;});
+			inactive_sources++;
+			print(GF_LOG_INFO, 'End of sequence ' + s.sequence.id + ' at ' + (current_utc_clock-s.sequence.stop_time));
+			s.sequence.active_state = 2;
+			if (s.sequence.id)
+				trigger_watcher(s.sequence, 'active', false);
+			return;
+	}
+
+	let min_cts = 0;
+	let min_timescale = 0;
+	let nb_over = 0;
+	let nb_active = 0;
+	let force_seq_over = false;
+
+ let source_restart = false;
+ s.no_signal = 0;
+
+	s.pids.forEach(pid => {
+		if (pid.done) {
+				nb_over++;
+				return;
+		}
+		while (1) {
+
+		let pck = pid.get_packet();
+		if (!pck) {
+			let force_wait_pid = !filter.live;
+			if (pid.eos) {
+				pid.done = true;
+				nb_over++;
+				return;
+			}
+			
+			let tdiff = current_utc_clock - pid.last_pck_time;
+			if (tdiff > filter.lwait) {
+				force_wait_pid = false;
+				if (s.no_signal < tdiff) s.no_signal = tdiff;
+				//for video pid, drop ref !
+				if (pid.pck) {
+						pid.pck.unref();
+						pid.pck = null;
+				}
+				if (current_utc_clock - pid.last_pck_time > filter.ltimeout) {
+					s.timeline_init = false;
+					if (s.has_ka_process) {
+						pid.source.src.forEach(src => {
+							if (!src.process_id) return;
+							let res = os.waitpid(src.process_id, os.WNOHANG);
+							let msg = (res[0] == src.process_id) ? ('exited with code ' + res[1]) : 'not responding, restarting';
+							print(GF_LOG_ERROR, 'Process for source ' + pid.source.logname + ' (' + src.in + ') ' + msg);
+							source_restart = true;
+						});
+					}
+				}
+				return;
+			} 
+
+			if (force_wait_pid || !pid.pck) {
+				if (pid.type==TYPE_VIDEO)
+					wait_video = true;
+				else
+					wait_audio = true;
+			} 
+			return;
+		}
+		if (pid.type==TYPE_UNHANDLED) {
+			pid.drop_packet();
+			return;
+		}
+
+		//we got a packet, if first one init clock
+		if (!s.timeline_init) {
+			if (!min_timescale || (min_cts * pid.timescale > pck.cts * min_timescale)) {
+				min_cts = pck.cts;
+				min_timescale = pid.timescale;
+			}
+			return;
+		}
+
+		//source is active (has packets)
+		nb_active++;
+
+		if (!s.sequence.prefetch_check) {
+			let check_end = s.duration;
+			if ((s.media_stop>s.media_start) && (s.media_stop<s.duration)) check_end = s.media_stop;
+
+			if ((s.sequence.transition_state<=1) && s.sequence.transition_effect && next_source(s, true) ) {
+				let dur = s.sequence.transition_effect.dur || 0;
+				if (dur) {
+					s.sequence.transition_state = 1;
+					s.sequence.transition_dur = dur;
+
+					if (check_end > dur) check_end -= dur;
+					else {
+						check_end = 0;
+					}
+				}
+			}
+
+			if (check_end>0) {
+				if ((pck.cts - pid.init_ts) > (s.transition_offset + check_end - s.media_start - s.prefetch_sec) * pid.timescale) {
+					let next_src = next_source(s, true);
+					s.sequence.start_offset = 0;
+					if (next_src && (next_src != s)) {
+						print(GF_LOG_INFO, 'time to prefetch next source ' + next_src.logname + ' in sequence ' + s.sequence.id + ' - end time: ' + (check_end - s.media_start), pck.cts, pid.init_ts, pid.timescale, s.transition_offset);
+						open_source(next_src);
+						play_source(next_src);
+						next_src.in_prefetch = 1;
+						if ((!s.sequence.transition_state<=1) && s.sequence.transition_effect) {
+							next_src.transition_offset = s.sequence.transition_dur;
+							next_src.next_in_transition = true;
+						}
+					}
+					s.sequence.prefetch_check = true;
+				}
+			}
+		}
+		//except for video, check this packet is not out of play range
+		if ((s.media_stop>s.media_start) && (pid.type != TYPE_VIDEO)) {
+			if ((pck.cts - pid.init_ts) > (s.transition_offset + s.media_stop - s.media_start) * pid.timescale) {
+				pid.drop_packet();
+				pid.done = true;
+				pid.send_event( new FilterEvent(GF_FEVT_STOP) );
+				nb_over++;
+				return;
+			}
+		}
+
+		if (s.sequence.transition_state==1) {
+			let check_end = s.duration;
+			if ((s.media_stop>s.media_start) && (s.media_stop<s.duration)) check_end = s.media_stop;
+
+			if (check_end > s.sequence.transition_dur)
+				check_end -= s.sequence.transition_dur;
+			else {
+				check_end = 0;
+			}
+
+			if ((pck.cts - pid.init_ts) >= (s.transition_offset + check_end - s.media_start) * pid.timescale) {
+				if (load_transition(s.sequence)) {
+					s.next_in_transition = false;
+					print(GF_LOG_INFO, 'time to activate transition in sequence ' + s.sequence.id + ' end_time: ' + (check_end - s.media_start) + ' cts ' + pck.cts + ' init_cts ' + pid.init_ts);
+					s.sequence.transition_state = 2;
+					s.sequence.transition_start = video_time;
+				} else {
+					//error
+					s.sequence.transition_state = 4;
+				}
+			}
+		}
+
+		if (!pid.pck) {
+			pid.pck = pck.ref();
+			pid.drop_packet();
+			pid.frame_ts = pid.translate_timestamp(pid.pck.cts);
+			if (pid.pck.blocking_ref) {
+				blocking_ref_pids.push(pid);
+				pid.is_blocking = true;
+			}
+			pck = null;
+		}
+
+		pid.last_pck_time = current_utc_clock;
+
+		if (pid.type==TYPE_AUDIO) {
+			if (!audio_playing) {
+				//audio not playing, discard packet if time before current video time
+				if (pid.frame_ts * video_timescale < video_time * pid.timescale) {
+					pid.pck.unref();
+					pid.pck=null;
+					continue;
+				}
+			}
+
+			if ( (s.media_stop>s.media_start) && ((pid.pck.cts + pid.pck.dur) >= s.media_stop * pid.timescale)) {
+				let diff_samples = Math.floor(s.media_stop * audio_timescale);
+				if (audio_timescale == pid.timescale) {
+					diff_samples -= Math.floor(pid.pck.cts);
+				} else {
+					diff_samples -= Math.floor(pid.pck.cts * audio_timescale / pid.timescale);
+				}
+				if (diff_samples>0) {
+					pid.nb_samples = diff_samples;
+					if ((pid.source.audio_fade=='out') || (pid.source.audio_fade=='inout')) {
+						pid.fade = 2; //fade to 0
+					}
+					print(GF_LOG_DEBUG, 'End of playback pending for ' + pid.source.logname + ' - samples left ' + diff_samples);
+				} else {
+					//we are done
+					pid.pck.unref();
+					pid.pck = null;
+					pid.done = true;
+					pid.send_event( new FilterEvent(GF_FEVT_STOP) );
+					nb_over++;
+					print(GF_LOG_DEBUG, 'End of playback reached for ' + pid.source.logname);
+				}
+			} else {
+				pid.nb_samples = pid.pck.size / pid.channels / sample_size;
+			}
+			return;
+		}
+		else if (pid.type!=TYPE_VIDEO) {
+			return;
+		}
+		if (!video_playing) {
+			if (pid.frame_ts * audio_timescale < audio_time * pid.timescale) {
+				pid.pck.unref();
+				pid.pck=null;
+				continue;
+			}
+		}
+
+		//check closest frame
+		while (1) {
+			pck = pid.get_packet();
+			if (!pck) break;
+			let next_ts = pid.translate_timestamp(pck.cts);
+			if (next_ts > video_time) {
+				let diff_next = next_ts - video_time;
+				let diff_cur = video_time - pid.frame_ts;
+				if (diff_next > diff_cur)
+					break;
+			}
+
+			pid.pck.unref();
+			pid.pck = pck.ref();
+			pid.drop_packet();
+			pid.frame_ts = next_ts;
+		}
+		//if current frame is out of play range (>=), consider source done
+		if (s.media_stop>s.media_start) {
+			if ((pid.pck.cts - pid.init_ts) >= (s.transition_offset + s.media_stop - s.media_start) * pid.timescale) {
+				pid.drop_packet();
+				pid.done = true;
+				pid.send_event( new FilterEvent(GF_FEVT_STOP) );
+				nb_over++;
+				return;
+			}
+		}
+
+		print(GF_LOG_DEBUG, 'Video from ' + s.logname + ' will draw pck CTS ' + pid.pck.cts + ' translated ' + pid.frame_ts + ' video time ' + video_time);
+		return;
+	}
+	});
+	//done fetching pids
+
+	if (s.pids.length && (nb_over == s.pids.length)) {
+		print(GF_LOG_INFO, 'source ' + s.logname + ' is over - transition state: ' + s.sequence.transition_state);
+		nb_over = 1;
+		let relaunch=false;
+		s.src.forEach(src => {
+			if (!src.process_id) return;
+			let res = os.waitpid(src.process_id, os.WNOHANG);
+			//child process is dead, if error >2, relaunch if keep alive
+			if (res[0] == src.process_id) {
+				if (res[1]>2) {
+					print(GF_LOG_WARNING, 'Child process for src ' + s.logname + ' exit with error ' + res[1] + (s.keep_alive ? ", restarting source" : "") );
+					relaunch = s.keep_alive ? 1 : 0;
+				}
+			}
+			//process is still alive but we are done 
+			else if (!source_restart) {
+				print(GF_LOG_INFO, 'Child process for src ' + s.logname + ' still alive but eos notified');
+			}
+		});
+
+		if (relaunch) {
+			source_restart = true;
+		}
+ } else if (!s.pids.length && s.has_ka_process) {
+ 	nb_over = 0;
+	 s.src.forEach(src => {
+			if (src.process_id) {
+				let res = os.waitpid(src.process_id, os.WNOHANG);
+				if (res[0] == src.process_id) {
+					print(GF_LOG_ERROR, 'Child process creation failed for source ' + src.in + ' - removing');
+					nb_over ++;
+				}
+			}
+	 });
+	 if (nb_over == s.src.length) {
+	 	nb_over = 1;
+	 	force_seq_over = true;
+	 } else {
+	 	nb_over = 0;
+	 }
+	} else {		
+		nb_over = 0;
+	}
+
+	if (!nb_active && source_restart) {
+		nb_over=0;
+		s.timeline_init=0;
+		stop_source(s, true);
+		open_source(s);
+		play_source(s);
+		video_inputs_ready = false;
+	}
+
+	//source is playing but no packets, we need to force reschedule to probe for no signal, we do that every second
+	if (!nb_active && !nb_over) {
+		filter.reschedule(1000);
+	}
+	if (!s.timeline_init && !nb_over) {
+		if (s.no_signal) {
+			return;
+		}
+		//no pids yet
+		if (!min_timescale) {
+			video_inputs_ready = audio_inputs_ready = false;
+			return;
+		}
+		if (wait_video || wait_audio) {
+			if (wait_video) video_inputs_ready = false;
+			if (wait_audio) audio_inputs_ready = false;
+			return;
+		}
+
+		print(GF_LOG_DEBUG, 'clock is init for source ' + s.logname + ' using TS ' + min_cts + '/' + min_timescale);
+		s.pids.forEach(pid => {
+			pid.init_ts = min_cts;
+			if (min_timescale != pid.timescale) {
+				pid.init_ts *= pid.timescale;
+				pid.init_ts /= min_timescale;
+			}
+			if (pid.type==TYPE_VIDEO) {
+				pid.init_clock = video_time;
+			} else {
+				pid.init_clock = audio_time;
+				if ((pid.source.audio_fade=='in') || (pid.source.audio_fade=='inout')) {
+					pid.fade = 1; //fade from 0
+				}
+			}
+			print(GF_LOG_DEBUG, 'PID ' + s.logname + '.' + pid.name + ' clock init TS ' + pid.init_ts + ' clock value ' + pid.init_clock);
+		});
+		s.timeline_init = true;
+
+		if (s.seek && !s.video_time_at_init) 
+			s.video_time_at_init = video_time+1;
+
+		fetch_source(s);
+	}
+
+	if (!force_seq_over && (!s.pids.length || !nb_over)) {
+		if (s.sequence.transition_state == 2) {
+			print(GF_LOG_DEBUG, 'activating next source for transition in sequence ' + s.sequence.id);
+			sequence_over(s, false);
+		}
+		//active sources and waiting for inputs
+		else if (s.pids.length) {
+			if (wait_video) video_inputs_ready = false;
+			if (wait_audio) audio_inputs_ready = false;			
+		}
+		return;
+	}
+
+	sequence_over(s, force_seq_over);
+	//try at least one cycle before generating the frame
+	video_inputs_ready = false;
+
+	//we are done
+	if (s.removed) {
+		print(GF_LOG_INFO, 'schedule for remove source ' + s.logname);
+		purge_sources.push(s);
+	}
+}
+
+
+function get_source(id, src)
+{
+	for (let i=0; i<sources.length; i++) {
+		let elem = sources[i]; 
+		if (id && (elem.id == id)) return elem;
+		if (src && (elem.src.length == src.length)) {
+			let diff = false;
+			elem.src.forEach( (v, index) => {
+				if (!(v.in === src[index].in)) diff = true; // Romain: if sources have the same input name they are discarded!!
+				let id1 = v.id || 0;
+				let id2 = src[index].id || 0;
+				if (id1 && id2 && !(id1 === id2)) diff = true;
+			} );
+			if (!diff) return elem;
+		}
+	}
+	return null;
+}
+
+function get_source_by_pid(pid)
+{
+	let type = pid.get_prop("StreamType");
+	let res = null;
+	sources.forEach( elem => { 
+		elem.fsrc.forEach( (f, index) => {
+			if (!pid.is_filter_in_parents(f)) return;
+
+			if ((f.media_type=="all") 
+				|| ((type=='Visual') && (f.media_type.indexOf('v')>=0))
+				|| ((type=='Audio') && (f.media_type.indexOf('a')>=0))
+				|| ((type=='Text') && (f.media_type.indexOf('t')>=0)) 
+			) {
+				pid.skipped = false;
+				res = elem;
+			} else {
+				pid.skipped = true;
+			}
+
+		} );
+	} );
+	return res;
+}
+
+
+function play_pid(pid, source) {
+	let evt = new FilterEvent(GF_FEVT_PLAY);
+	evt.start_range = source.media_start + source.sequence.start_offset;
+	if (source.video_time_at_init) {
+		evt.start_range += (video_time - (source.video_time_at_init-1)) / video_timescale;
+	} 
+
+	pid.done = false;
+	print(GF_LOG_DEBUG, 'Playing PID ' + source.logname + '.' + pid.name + ' @start=' + evt.start_range);
+	pid.send_event(evt);
+}
+
+function play_source(s)
+{
+	if (s.playing) {
+		print(GF_LOG_ERROR, 'Source is already playing ' + s.logname);
+		return;
+	}
+	print(GF_LOG_DEBUG, 'Playing source ' + s.logname);
+	if (!s.sequence.active_state)
+		trigger_watcher(s.sequence, 'active', true);
+	s.sequence.active_state = 1;
+	s.playing = true;
+	trigger_watcher(s, "active", true);
+	s.timeline_init = false;
+	s.pids.forEach(pid => { play_pid(pid, s); });
+}
+
+function stop_source(s, is_remove)
+{
+	if (s.playing) {
+		s.playing = false;
+		trigger_watcher(s, "active", false);
+		s.sequence.prefetch_check = false;
+		s.timeline_init=0;
+
+		print(GF_LOG_DEBUG, 'Stoping source ' + s.logname);
+	 s.src.forEach(src => {
+			if (src.process_id) {
+				let res = os.waitpid(src.process_id, os.WNOHANG);
+				if (res[0] != src.process_id) {
+					print(GF_LOG_DEBUG, 'killing process for source ' + src.in);
+					os.kill(src.process_id, os.SIGABRT);
+				}
+				if (src.local_pipe) {
+					try {
+						sys.del(src.local_pipe);
+					} catch (e) {
+
+					}
+					src.local_pipe = null;
+				}
+			}
+			src.process_id = null;
+	 });
+
+		s.pids.forEach(pid => {
+			if (pid.pck) {
+					pid.pck.unref();
+					pid.pck = null;
+			}
+			pid.send_event( new FilterEvent(GF_FEVT_STOP) ); 
+		});
+	}
+
+	if (!is_remove) return;
+
+	print(GF_LOG_DEBUG, 'Removing source ' + s.logname);
+	s.fsrc.forEach( f => {
+		f.remove();
+	});
+	s.fsrc.length = 0;
+	s.pids.length = 0;
+	s.opened = false;
+}
+
+function disable_source(s)
+{
+	s.disabled = true;
+	if (!s.sequence.active_state)
+		trigger_watcher(s.sequence, 'active', false);
+
+	s.sequence.active_state = 0;
+	s.fsrc.forEach( f => {
+		f.remove();
+	});
+	s.fsrc = [];
+	s.pids = [];
+	print(GF_LOG_DEBUG, 'Disabling source ' + s.logname);
+}
+
+let current_pipe = 1;
+let current_port = 2000;
+
+function apply_links(links, target, fchain)
+{
+	let broken_links=false;
+	links.forEach(link => {
+
+	let link_arg = "";
+	let link_idx = 0;
+	let link_start = false;
+	if (link.startsWith("@@")) {
+		link = link.slice(2);
+	} else {
+		link = link.slice(1);
+	}
+
+	let sep = link.indexOf('#');
+	if (sep<0) {
+		if (link.length) 
+			link_idx = parseInt(link);
+	} else {
+		let vals = arg.slice(sep);
+		link_idx = parseInt(vals[0]);
+		link_arg = vals[1];
+	}
+
+	if (!link_start) link_idx = fchain.length - link_idx - 1;
+	if ((link_idx<0) || (link_idx>=fchain.length)) {
+		print(GF_LOG_ERROR, 'Wrong filter index ' + link_idx + ' in link directive ' + link);
+		broken_links = true;
+		return;
+	} 
+	let f_src = fchain[link_idx];
+
+	if (target) {
+		target.set_source(f_src, link_arg);
+	} else {
+		filter.set_source_restricted(f_src, link_arg);
+	}
+
+	});
+	return broken_links;
+}
+
+function open_source(s)
+{
+	if (s.opened) return;
+	s.opened = true;
+	s.sequence.prefetch_check = false;
+//	filter.reset_source();
+	wait_for_pids = current_utc_clock;
+
+ s.has_ka_process = false;
+	s.src.forEach(src => {
+
+	let f, args, i;
+	let port="";
+	let opts="";
+	let append_filter = null;
+	let local_filter = null;
+	if (typeof src.port == 'string') port = src.port;
+	if (typeof src.opts == 'string') opts = src.opts;
+	let use_raw = (typeof src.raw == 'boolean') ? src.raw : true;
+
+	src.local_pipe = null;
+	src.process_id = null;
+	if (port.length) {
+		let do_cat_url = true;
+		let src_url = "";
+		let rfopts = "reframer";
+		if (use_raw) {			
+			rfopts += ":raw=av";
+		}
+		//use real-time regulation
+		if (filter.live) {
+			rfopts += ":rt=on";
+		}
+
+		if (port==='pipe') {
+			src.local_pipe = "gpipe_avmix_" + current_pipe;
+			local_filter = "pipe://" + src.local_pipe + ":mkp:sigeos:block_size=10M";
+			if (s.keep_alive) {
+				local_filter += ':ka';
+			 s.has_ka_process = true;
+			}
+			append_filter = rfopts + " @ dst=pipe://" + src.local_pipe + ':block_size=10M';
+			current_pipe++;
+			src_url += "gpac src=";
+		}
+		else if ((port==='tcp') || (port==='tcpu')) {
+			local_filter = port+"://127.0.0.1:" + current_port + "/:listen";				
+			if (s.keep_alive) {
+				local_filter += ':ka';
+			 s.has_ka_process = true;
+			}
+			append_filter = rfopts + " @ dst=" + port + "://127.0.0.1:" + current_port + '/';
+			current_port++;
+			src_url += "gpac src=";
+		}
+		else {
+			local_filter = port;
+			do_cat_url = false;
+		}
+		//URL relative to playlist
+		if (do_cat_url) {
+
+			let idx = -1;
+			let search=" :#?";
+			for (let ci=0; ci<src.in.length; ci++) {
+				let c = src.in.charAt(ci);
+				if (search.indexOf(c) >= 0) {
+					idx=ci;
+					break;
+				}
+			}
+			let cat_url;
+			if (idx>=0) {
+				cat_url = src.in.slice(0, idx); 
+			} else {
+				cat_url = src.in; 			
+			}
+			cat_url = sys.url_cat(filter.pl, cat_url);
+			if (idx>=0) {
+				cat_url += src.in.slice(idx); 
+			}
+			src_url += cat_url;
+		} else {
+			src_url += src.in;
+		}
+
+		if (append_filter) {
+			src_url += ' ' + append_filter+':ext=gsf';
+			if ((s.media_start>0) || s.video_time_at_init) {
+				let start = s.media_start;
+				if (s.video_time_at_init)
+						start += (video_time - (s.video_time_at_init-1)) / video_timescale;
+				src_url += ':start=' + start;
+			}
+
+			if (opts.length)
+				src_url += ' ' + opts;
+		}
+
+		filter.lock_all(true);
+		try { 
+			f = filter.add_source(local_filter);
+		} catch (e) {
+			print(GF_LOG_ERROR, 'Add source ' + local_filter + ' failed: ' + e);
+			disable_source(s);
+			filter.lock_all(false);
+			return;		
+		}
+		filter.set_source(f);
+		filter.lock_all(false);
+
+		if (typeof src.media != 'string') f.media_type = "all";
+		else f.media_type = src.media;
+
+		s.fsrc.push(f);
+
+		args = src_url.split(' ');
+		try {
+			src.process_id = os.exec(args, {block: false} );
+		} catch (e) {
+			print(GF_LOG_ERROR, 'Failed to launch process for ' + args + ': ' + e);
+		}
+		print(GF_LOG_INFO, 'Launch process for ' + args + ' OK');
+		return;
+	} 
+
+	//local load
+	filter.lock_all(true);
+	//parse command line
+	args = src.in.split(' ');
+	args = args.filter(function(item){return item;}); 
+	let links = [];
+	let fchain = [];
+	let prev_f = null;
+	for (i=0; i<args.length; i++) {
+		let arg = args[i];
+		if (arg.charAt(0) === "-")
+			continue;
+
+		if (arg.charAt(0) === "@") {
+			links.push(arg);
+			continue;
+		}
+
+		try { 
+			if (prev_f) {
+				f = filter.add_filter(arg);
+			} else {
+				//relative to playlist
+				f = filter.add_source(arg, filter.pl);
+				links.length = 0;
+			}
+		} catch (e) {
+			print(GF_LOG_ERROR, 'Add ' + (prev_f ? 'filter' : 'source') + ' ' + arg + ' failed: ' + e);
+			disable_source(s);
+			filter.lock_all(false);
+			return;		
+		}
+
+		//setup links
+		if (apply_links(links, f, fchain)) {
+			disable_source(s);
+			filter.lock_all(false);
+			return;					
+		}
+
+		//add to chain
+		fchain.push(f);
+		//remember source filters
+		if (!prev_f) {
+			if (typeof src.media != 'string') f.media_type = "all";
+			else f.media_type = src.media;
+			s.fsrc.push(f);
+		}
+
+		prev_f = f;
+		links.length = 0;
+	}
+	if (links.length) {
+		//setup links
+		if (apply_links(links, null, fchain)) {
+			disable_source(s);
+			filter.lock_all(false);
+			return;					
+		}
+		prev_f = null;	
+	}
+	if (prev_f) {
+		filter.set_source_restricted(prev_f);
+	}
+
+	filter.lock_all(false);
+	});
+}
+
+function get_sequence(seq_id)
+{
+	for (let i=0; i<sequences.length; i++) {
+		if (sequences[i].id === seq_id) return sequences[i];
+	}
+	return null;
+}
+
+function get_sequence_by_json(seq_pl)
+{
+	let id = (seq_pl==null) ? "_seq_default" : seq_pl.id;
+	for (let i=0; i<sequences.length; i++) {
+		if (sequences[i].id === id) return sequences[i];
+	}
+	let seq = {};
+	seq.id = id;
+	seq.watchers = null;
+	seq.pl_update = true;
+	seq.active_state = 0;
+	seq.start_time = 0;
+	seq.stop_time = 0;
+	seq.duration = 0;
+	seq.start_offset = 0;
+	seq.prefetch_check = false;
+	seq.loop = false;
+
+	seq.sources = [];
+	seq.transition_state = 0;
+	seq.transition_effect = null;
+	seq.transition = null;
+	seq.crc = 0;
+	sequences.push(seq);
+	print(GF_LOG_DEBUG, 'creating new sequence ID ' + id);
+	return seq;
+}
+
+function parse_source_opts(src, pl_el)
+{
+	src.media_start = pl_el.start || 0;
+	src.media_stop = pl_el.stop || 0;
+	src.audio_fade = pl_el.fade || "inout";
+	if (typeof pl_el.mix == 'boolean')
+		src.mix = pl_el.mix;
+	else
+		src.mix = true;
+
+	src.seek = pl_el.seek || false;
+	if (typeof pl_el.prefetch_ms == 'number') src.prefetch_ms = pl_el.prefetch;
+	else src.prefetch_ms = 500;
+	src.prefetch_sec = src.prefetch_ms / 1000;
+}
+
+function push_source(el, id, seq)
+{
+	let s = {};
+	s.id = id || "";
+	s.src = el.src;
+	s.watchers = null;
+	s.fsrc = [];
+	s.pids = [];
+	s.timeline_init=false;
+	s.playing = false;
+	s.duration = 0;
+	s.disabled = false;
+	s.opened = false;
+	s.in_prefetch = 0;
+	s.next_in_transition = false;
+	s.transition_offset = 0;
+	s.removed = 0;
+	s.mix_volume = 1.0;
+	s.keep_alive = el.keep_alive || false;
+	s.video_time_at_init = 0;
+
+	sources.push(s);
+	if (s.id==="") {
+		s.logname = el.src[0].in.split('\\').pop().split('/').pop(); 
+	} else {
+		s.logname = s.id; 
+	}
+	let parent_seq = get_sequence_by_json(seq);
+
+	s.pl_update = true;
+	parent_seq.sources.push(s);
+	s.sequence = parent_seq;
+
+	parse_source_opts(s, el);
+
+	let do_start = (parent_seq.sources.length==1) ? true : false;
+	if (parent_seq.start_time <0) {
+			do_start = false;
+	} else if (parent_seq.start_time > 0) {
+			do_start = false;
+//	} else if (parent_seq.start_time>0) {
+//			parent_seq.start_offset = (current_utc_clock - parent_seq.start_time) / 1000.0;
+	}
+
+	if (do_start) {
+		print(GF_LOG_DEBUG, 'open and play source');
+		open_source(s);
+		play_source(s);
+	} else {
+		print(GF_LOG_DEBUG, 'queue source in seq');		
+	}
+}
+
+function parse_url(src_pl, seq_pl)
+{
+	if (!validate_source(src_pl))
+		return;
+
+	let id = src_pl.id || 0;
+
+	let src = get_source(id, src_pl.src);
+	if (!src) {
+		push_source(src_pl, id, seq_pl);
+	} else {
+		let par_seq = get_sequence_by_json(seq_pl);
+		if (src.sequence != par_seq) {
+			print(GF_LOG_ERROR, 'source update cannot change parent sequence, ignoring');
+			return;
+		}
+		src.pl_update = true;
+
+		src.src = src_pl.src;
+		parse_source_opts(src, src_pl);
+	}
+}
+
+function validate_source(pl)
+{
+	let valid=true;
+	if (typeof pl.src == 'undefined') {
+		print(GF_LOG_ERROR, 'Source element without `src`, ignoring URL element');
+		return false;
+	}
+	pl.src.forEach(s => {
+		if (typeof s.in == 'undefined') {
+			print(GF_LOG_ERROR, 'Source element without input URL, ignoring URL element');
+			valid=false;
+			return;
+		}
+	});
+	if (!valid)
+		return false;
+
+	for (var propertyName in pl) {
+		if (propertyName == 'id') continue;
+		if (propertyName == 'src') continue;
+		if (propertyName == 'start') continue;
+		if (propertyName == 'stop') continue;
+		if (propertyName == 'volume') continue;
+		if (propertyName == 'mix') continue;
+		if (propertyName == 'fade') continue;
+		if (propertyName == 'keep_alive') continue;
+		if (propertyName == 'seek') continue;
+
+		if (propertyName.charAt(0) == '_') continue;
+
+		print(GF_LOG_WARNING, 'Unrecognized option ' + propertyName + ' in source ' + JSON.stringify(pl) );
+	}
+
+	pl.src.forEach(s => {
+		for (var propertyName in s) {
+			if (propertyName == 'id') continue;
+			if (propertyName == 'port') continue;
+			if (propertyName == 'in') continue;
+			if (propertyName == 'opts') continue;
+			if (propertyName == 'media') continue;
+			if (propertyName == 'raw') continue;
+			if (propertyName.charAt(0) == '_') continue;
+
+			print(GF_LOG_WARNING, 'Unrecognized option ' + propertyName + ' in sourceURL ' + JSON.stringify(pl) );
+		}
+	});
+
+	return true;
+}
+
+function validate_seq(pl)
+{
+	let valid=true;
+	pl.seq.forEach(s => {
+		if (!validate_source(s)) {
+			valid=false;
+			return;
+		}
+	});
+	if (!valid) return false;
+
+	for (var propertyName in pl) {
+		if (propertyName == 'id') continue;
+		if (propertyName == 'loop') continue;
+		if (propertyName == 'start') continue;
+		if (propertyName == 'stop') continue;
+		if (propertyName == 'transition') continue;
+		if (propertyName == 'seq') continue;
+		if (propertyName == 'skip') continue;
+		if (propertyName.charAt(0) == '_') continue;
+
+		print(GF_LOG_WARNING, 'Unrecognized option ' + propertyName + ' in sequence ' + JSON.stringify(pl) );
+	}
+
+	return true;
+}
+
+function parse_seq(pl)
+{
+	if (!validate_seq(pl))
+		return;
+
+	let seq = get_sequence_by_json(pl);
+	//got new seg
+	seq.pl_update = true;
+
+	let crc = sys.crc32(JSON.stringify(pl));
+	if (crc != seq.crc) {
+		seq.crc = crc;
+	} else {
+		seq.sources.forEach(s => {
+			s.pl_update = true;
+		});
+		return;
+	}
+
+ //parse UTC start time
+	if (seq.start_time<=0) {
+		seq.start_time = parse_date_time(pl.start, true);
+		if (seq.start_time<0) 
+			seq.start_time = -1;
+	}
+
+	seq.stop_time = parse_date_time(pl.stop, true);
+	if ((seq.stop_time<0) || (seq.stop_time<=seq.start_time)) 
+		seq.stop_time = -1;
+
+	seq.transition_effect = pl.transition || null;
+
+	seq.loop = pl.loop || 0;
+	if (seq.loop && (typeof pl.loop == 'boolean'))
+		seq.loop = -1;
+	pl.seq.forEach( p => { parse_url(p, pl); });
+
+
+	if (seq.id && scene_in_update) {
+		//we are called from a module, force seting up scenes using this sequence
+		do_traverse(root_scene, scene => {
+			let is_match = false;
+			//either removed or not yet loaded
+			if (!scene.mod) return;
+
+			scene.sources.forEach( seq_id => {
+				if (seq_id == seq.id) is_match = true;
+			});
+			if (is_match) {
+				setup_scene(scene, scene.sources, null);
+			}
+		});
+	}
+}
+
+function validate_scene(pl)
+{
+	if (typeof pl.js == 'undefined') {
+		pl.js = 'shape';
+	}
+	else if (typeof pl.js != 'string') {
+		print(GF_LOG_WARNING, 'Invalid scene.js, expecting string - ignoring element ' + JSON.stringify(pl) );
+		return false;
+	}
+	if (Array.isArray(pl.sources)) {
+		for (let i=0; i<pl.sources.length; i++) {
+			let s_id = pl.sources[i];			
+			if (typeof s_id != 'string') {
+				print(GF_LOG_WARNING, 'Invalid scene.sources element ' + s_id + ', expecting string - ignoring element ' + JSON.stringify(pl) );
+				return false;
+			}
+			let src = get_sequence(s_id);
+			if (!src) {
+				src = get_group(s_id);
+				if (src && (src.offscreen==GROUP_OST_NONE)) src = null;
+			}
+			if (!src) {
+				print(GF_LOG_WARNING, 'Invalid scene.sources element ' + s_id + ', source sequence not found - ignoring element ' + JSON.stringify(pl) );
+				return false;
+			}
+		}
+	} else if (typeof pl.sources !== 'undefined') {
+			print(GF_LOG_WARNING, 'Invalid scene.sources element invalid, expecting undefined or string array - ignoring element ' + JSON.stringify(pl) );
+	}
+
+	let scene_id = pl.id || null;
+	if (scene_id) {
+		let nb_scenes=0;
+		do_traverse(root_scene, s => {
+			if (s.id === scene_id) nb_scenes++;
+		});
+		if (nb_scenes>1) {
+			print(GF_LOG_WARNING, 'More than one scene defined with the same id ' + scene_id + ', ignoring element ' + JSON.stringify(pl) );
+			return false;
+		}
+	}
+	return true;
+}
+
+
+function get_element_by_id(elem_id, list)
+{
+	if (!elem_id) return null;
+
+	for (let i=0; i<list.length; i++) {
+		let e = list[i];
+		if (elem_id==e.id)
+				return e;
+	}
+	return null;
+}
+
+
+let ID_scenes = [];
+
+function get_scene(scene_id)
+{
+	return get_element_by_id(scene_id, ID_scenes);
+}
+
+function check_transition(fx_id)
+{
+	let fx = null;
+
+	do_traverse(root_scene, scene => {
+		if (fx || !scene.transition_effect) return;
+
+		let a_fx_id = scene.transition_effect.id || null;
+		if (a_fx_id && (fx_id==a_fx_id)) {
+			fx = scene.transition_effect;
+		}
+	});
+	if (fx != null) return true;
+	return false;
+}
+
+function get_a_trans(obj, fx_id, get_json)
+{
+	if (!obj.transition_effect) return null;
+
+	let a_fx_id = obj.transition_effect.id || null;
+	if (a_fx_id && (fx_id==a_fx_id)) {
+		return get_json ? obj.transition_effect : obj.transition;
+	}
+	return null;
+}
+
+function get_transition(fx_id, get_json)
+{
+	let tr = null;
+	do_traverse(root_scene, scene => {
+		if (tr) return;
+		tr = get_a_trans(scene, fx_id, get_json);
+	});
+	if (tr) return tr;
+
+	for (let i=0; i<sequences.length; i++) {
+		tr = get_a_trans(sequences[i], fx_id, get_json);
+		if (tr) return tr;
+	}
+	return null;
+}
+
+
+function parse_scene(pl, parent)
+{
+	if (!validate_scene(pl))
+		return null;
+
+	if (pl.skip || false)
+		return null;
+
+	let scene_id = pl.id || null;
+	let scene = get_scene(scene_id);
+	if (!scene) {
+		if (typeof pl.sources == 'undefined') pl.sources = [];
+
+		create_scene(pl.sources, pl, parent);
+	} else if (scene.pl_update) {
+		print(GF_LOG_WARNING, "Multiple scenes with id `" + scene_id + "` defined, ignoring subsequent declarations");
+		return null;
+	} else {
+		scene.pl_update = true;
+		if (parent) parent.scenes.push(scene);
+		else root_scene.scenes.push(scene);
+		set_scene_options(scene, pl);
+
+		return scene;
+	}
+}
+
+function parse_config(pl)
+{
+	for (var propertyName in pl) {
+		if (propertyName == 'gpu') {
+			if (pl.gpu=='off') filter.gpu = 0;
+			else if (pl.gpu=='mix') filter.gpu = 1;
+			else if (pl.gpu=='all') filter.gpu = 2;
+			else print(GF_LOG_WARNING, "Wrong syntax for option \`gpu\` in playlist config, ignoring");
+		}
+		else if (propertyName == 'vsize') {
+			var s = pl.vsize.split('x');
+			if (s.length==2) {
+				filter.vsize.x = parseInt(s[0]);
+				filter.vsize.y = parseInt(s[1]);
+			}	
+			else print(GF_LOG_WARNING, "Wrong syntax for option \`vsize\` in playlist config, ignoring");
+		}
+		else if (propertyName == 'fps') {
+			if (typeof pl.fps == 'string') {
+				var fps = pl.fps.split('/');
+				filter.fps.n = parseInt(fps[0]);
+				filter.fps.d = (fps.length>2) ? parseInt(fps[1]) : 1;
+			} else if (typeof pl.fps == 'number') {
+				filter.fps.n = pl.fps;
+				filter.fps.d = 1;
+			}	
+			else print(GF_LOG_WARNING, "Wrong syntax for option \`fps\` in playlist config, ignoring");
+		}
+		else if (propertyName == 'dynpfmt') {
+			if (pl.dynpfmt=='off') filter.dynpfmt=0;
+			else if (pl.dynpfmt=='init') filter.dynpfmt=1;
+			else if (pl.dynpfmt=='all') filter.dynpfmt=2;
+			else print(GF_LOG_WARNING, "Wrong syntax for option \`dynpfmt\` in playlist, ignoring");
+		}
+		else if (propertyName == 'pfmt') filter.pfmt = pl.pfmt;
+		else if (propertyName == 'afmt') filter.afmt = pl.afmt;
+		else if ( (propertyName == 'thread') || (propertyName == 'lwait') || (propertyName == 'ltimeout')
+			 || (propertyName == 'sr') || (propertyName == 'ch') || (propertyName == 'alen') || (propertyName == 'maxdur')
+		) {
+			if (typeof pl[propertyName] != 'number') print(GF_LOG_WARNING, "Expecting number for option \`" + propertyName + "\` in playlist config, ignoring");
+			else filter[propertyName] = pl[propertyName];
+		}
+		else if (propertyName == 'live') {
+			if ((typeof pl[propertyName] != 'number') && (typeof pl[propertyName] != 'boolean')) print(GF_LOG_WARNING, "Expecting boolean for option \`" + propertyName + "\` in playlist config, ignoring");
+			else filter[propertyName] = pl[propertyName];
+		}
+		else if ((propertyName == 'pfmt') || (propertyName == 'afmt')) {
+			if (typeof pl[propertyName] != 'string') print(GF_LOG_WARNING, "Expecting string for option \`" + propertyName + "\` in playlist config, ignoring");
+			else filter[propertyName] = pl[propertyName];
+		}
+		else if (propertyName == 'reload_tests') {
+			if (Array.isArray(pl.reload_tests) && (typeof pl.reload_tests[0] == 'string') ) {
+				reload_tests = pl.reload_tests;
+			}
+			else if (typeof pl.reload_tests == 'string') {
+				reload_tests = [];
+				reload_tests.push(pl.reload_tests);
+			} else {
+				print(GF_LOG_WARNING, 'Expecting string or string array for option ' + propertyName + ' in playlist config, ignoring');
+			}
+		}
+		else if ((propertyName == 'reload_timeout') || (propertyName == 'reload_loop')) {
+			if (typeof pl[propertyName] != 'number') print(GF_LOG_WARNING, "Expecting number for option \`" + propertyName + "\` in playlist config, ignoring");
+			else if (propertyName == 'reload_timeout') reload_timeout = pl.reload_timeout;
+			else if (propertyName == 'reload_loop') reload_loop = pl.reload_loop;
+		}
+		else if (propertyName == 'type' ) {}
+		else if (propertyName.charAt(0) != '_') {
+			print(GF_LOG_WARNING, 'Unrecognized option ' + propertyName + ' in playlist config ' + JSON.stringify(pl) );
+		}
+	}
+}
+
+function is_scene_pl(pl)
+{
+		if (Array.isArray(pl.sources)
+		|| (typeof pl.js == 'string')
+		|| (typeof pl.x == 'number')
+		|| (typeof pl.y == 'number')
+		|| (typeof pl.width == 'number')
+		|| (typeof pl.height == 'number')
+	)
+		return true;
+
+	return false;
+}
+
+function validate_group(pl)
+{
+	let valid=true;
+
+	if (Array.isArray(pl.scenes)) {
+		pl.scenes.forEach(s => {
+			if (Array.isArray(s.scenes)) {
+				if (!validate_group(s))
+					valid = false;
+			}
+			else if (is_scene_pl(s)) {
+				if (!validate_scene(s))
+					valid = false;
+			}
+		});
+	}
+
+	if (!valid) return false;
+
+	for (var propertyName in pl) {
+		if (propertyName == 'id') continue;
+		if (propertyName == 'skip') continue;
+		if (group_get_update_type(propertyName, false) >= -1) continue;
+		if (propertyName.charAt(0) == '_') continue;
+
+		print(GF_LOG_WARNING, 'Unrecognized option ' + propertyName + ' in group ' + JSON.stringify(pl) );
+	}
+
+	return true;
+}
+
+let ID_groups = [];
+
+function get_group(group_id)
+{
+	return get_element_by_id(group_id, ID_groups);
+}
+
+
+const group_transform_props = [
+	{ name: "active", def_val: true, update_flag: 0},
+	{ name: "zorder", def_val: 0, update_flag: 0},
+	{ name: "x", def_val: 0, update_flag: UPDATE_POS|UPDATE_ALLOW_STRING},
+	{ name: "y", def_val: 0, update_flag: UPDATE_POS|UPDATE_ALLOW_STRING},
+	{ name: "rotation", def_val: 0, update_flag: UPDATE_POS},
+	{ name: "cx", def_val: 0, update_flag: UPDATE_POS},
+	{ name: "cy", def_val: 0, update_flag: UPDATE_POS},
+	{ name: "hskew", def_val: 0, update_flag: UPDATE_POS},
+	{ name: "vskew", def_val: 0, update_flag: UPDATE_POS},
+	{ name: "vscale", def_val: 1, update_flag: UPDATE_POS},
+	{ name: "hscale", def_val: 1, update_flag: UPDATE_POS},
+	{ name: "untransform", def_val: false, update_flag: UPDATE_POS},
+	{ name: "units", def_val: null, update_flag: -1},
+	{ name: "mxjs", def_val: null, update_flag: -1},
+	{ name: "z", def_val: 0, update_flag: UPDATE_CHILD},
+	{ name: "cz", def_val: 0, update_flag: UPDATE_CHILD},
+	{ name: "zscale", def_val: 1, update_flag: UPDATE_CHILD},
+	{ name: "orientation", def_val: null, update_flag: UPDATE_CHILD},
+	{ name: "axis", def_val: null, update_flag: UPDATE_CHILD},
+	{ name: "position", def_val: null, update_flag: UPDATE_CHILD},
+	{ name: "target", def_val: null, update_flag: UPDATE_CHILD},
+	{ name: "up", def_val: null, update_flag: UPDATE_CHILD},
+	{ name: "viewport", def_val: null, update_flag: UPDATE_CHILD|UPDATE_ALLOW_STRING},
+	{ name: "fov", def_val: 45, update_flag: UPDATE_CHILD},
+	{ name: "ar", def_val: 0, update_flag: UPDATE_CHILD},
+	{ name: "znear", def_val: 0, update_flag: UPDATE_CHILD},
+	{ name: "zfar", def_val: 0, update_flag: UPDATE_CHILD},
+];
+
+
+const group_props = [
+ //first three are not updatable and no default value
+	{ name: "scenes", def_val: null, update_flag: -1},
+	{ name: "offscreen", def_val: null, update_flag: -1},
+	{ name: "use", def_val: null, update_flag: -1},
+
+	{ name: "opacity", def_val: 1, update_flag: UPDATE_CHILD},
+	{ name: "scaler", def_val: 1, update_flag: UPDATE_CHILD},
+	{ name: "back_color", def_val: 'none', update_flag: UPDATE_CHILD},
+	{ name: "width", def_val: -1, update_flag: UPDATE_CHILD|UPDATE_ALLOW_STRING},
+	{ name: "height", def_val: -1, update_flag: UPDATE_CHILD|UPDATE_ALLOW_STRING},
+	{ name: "use_depth", def_val: -1, update_flag: UPDATE_CHILD},
+	{ name: "reverse", def_val: false, update_flag: UPDATE_CHILD},
+	{ name: "reference", def_val: false, update_flag: UPDATE_CHILD},
+];
+
+
+function parse_group_transform(scene, params)
+{
+	scene.position = null;
+	scene.target = null;
+	scene.up = null;
+	scene.viewport = null;
+
+	group_transform_props.forEach(o => {
+		parse_val(params, o.name, scene, o.def_val, o.update_flag);
+	});
+
+	scene.units = UNIT_RELATIVE;
+	if (typeof params.units == 'string') {
+		if (params.units == 'pix') scene.units = UNIT_PIXEL;
+		else if (params.units == 'rel') scene.units = UNIT_RELATIVE;
+		else {
+			print(GF_LOG_WARNING, 'Invalid unit type ' + params.units + ', using relative');
+		}
+	}
+	scene.mx_untransform = false;
+	scene.mxjs = (typeof params.mxjs == 'string') ? fn_from_script(['tr'], params.mxjs) : null;
+}
+
+function group_get_update_type(prop_name, transform_only)
+{
+	let i;
+
+	for (i=0; i<group_transform_props.length; i++) {
+		if (group_transform_props[i].name == prop_name) return group_transform_props[i].update_flag;
+	}
+	if (transform_only) return -2;
+
+	for (i=0; i<group_props.length; i++) {
+		if (group_props[i].name == prop_name) return group_props[i].update_flag;
+	}
+	return -2;
+}
+
+function parse_group(pl, parent)
+{
+	if (!validate_group(pl))
+		return null;
+
+	if (pl.skip || false)
+		return null;
+
+	let group_id = pl.id || null;
+	let group = get_group(group_id);
+	if (!group) {
+		group = {};
+		group.watchers = null;
+		group.id = group_id;
+		group.scenes = [];
+		group.parent = parent;
+		group.current_depth = 0;
+
+		if (group_id) ID_groups.push(group);
+		group.mx = new evg.Matrix2D();
+		group.offscreen_canvas = null;
+		group.update_flag = UPDATE_CHILD;
+
+		group.get = function(prop) {
+			if (typeof this[prop] != 'undefined') return this[prop];
+			return undefined;
+		}
+		group.set = function(prop, val) {
+			let update_type = group_get_update_type(prop, false);
+			//no modifications allowed or not defined 
+			if (update_type<0) {
+				return;
+			}
+
+			let allow_string = (update_type & UPDATE_ALLOW_STRING) ? true : false;
+			update_type &= ~UPDATE_ALLOW_STRING;
+
+			if ((this[prop] != val) && check_prop_type(typeof this[prop], typeof val, allow_string)) {
+				this.update_flag |= update_type;
+				this[prop] = val;
+				if (update_type)
+					invalidate_parent(this);
+				trigger_watcher(group, prop, val);
+			}
+		}
+	} else if (group.pl_update) {
+		print(GF_LOG_WARNING, "Multiple groups with id `" + group_id + "` defined, ignoring subsequent declarations");
+		return null;
+	}
+	group.pl_update = true;
+
+	group.update_flag |= UPDATE_POS;
+
+	group_props.forEach(o => {
+		if (o.def_val == null) return;
+			parse_val(pl, o.name, group, o.def_val, o.update_flag);
+	});
+	parse_group_transform(group, pl);
+
+	//ad-hoc parsing for offscreen
+	group.offscreen = GROUP_OST_NONE;
+	if (typeof pl.offscreen == 'string') {
+		if (pl.offscreen == 'mask') group.offscreen = GROUP_OST_MASK;
+		else if (pl.offscreen == 'color') group.offscreen = GROUP_OST_COLOR;
+		else if (pl.offscreen == 'dual') group.offscreen = GROUP_OST_DUAL;
+		else if (pl.offscreen == 'none') group.offscreen = GROUP_OST_NONE;
+		else {
+			print(GF_LOG_WARNING, "Unknown group offscreen mode `" + pl.offscreen + "`, ignoring");
+		}
+	}
+	//ad-hoc parsing for use
+	group.use = (typeof pl.use == 'string') ? pl.use : null;
+
+	//tag all scenes with ID as not present
+	group.scenes.forEach(scene => {
+		scene.pl_update = false;
+	});
+
+	group.scenes.length = 0;
+
+	//parse
+	if (! group.use) {
+		pl.scenes.forEach(s => {
+			if (Array.isArray(s.scenes) || (typeof s.use == 'string')) {
+				parse_group(s, group);
+			}
+			else if (is_scene_pl(s)) {
+				parse_scene(s, group);
+			}
+		});
+	}
+
+	if (parent) {
+		parent.scenes.push(group);
+	} else {
+		root_scene.scenes.push(group);
+	}
+	return group;
+}
+
+let user_scripts=[];
+
+function get_script(id)
+{
+	return get_element_by_id(id, user_scripts);
+}
+
+function fn_from_script(args, jscode)
+{
+	let url = sys.url_cat(playlist_url, jscode);
+	if (sys.file_exists(url)) {
+		return new Function(args, sys.load_file(url, true) );
+	} else {
+		return new Function(args, jscode);		
+	}
+}
+
+function parse_script(pl)
+{
+	if (typeof pl.script != 'string') {
+		print(GF_LOG_WARNING, 'Unrecognized script ' + JSON.stringify(pl) );
+		return;
+	}
+	if (pl.skip || false) 
+		return;
+
+	let id = pl.id || null;
+	let script_obj = id ? get_script(id) : null;
+	if (!script_obj) {
+		script_obj = {};
+		script_obj.watchers = null;
+		script_obj.id = id;
+		user_scripts.push(script_obj);
+	}	else if (script_obj.pl_update) {
+		print(GF_LOG_WARNING, "Multiple scripts with id `" + id + "` defined, ignoring subsequent declarations");
+		return null;
+	}
+	
+	script_obj.pl_update = true;
+	script_obj.next_time = 0;
+
+	if (typeof pl.active == 'boolean')
+		script_obj.active = pl.active;
+	else
+		script_obj.active = true;
+
+	try {
+		script_obj.run_script = fn_from_script([], pl.script);
+	} catch (err) {
+		print(GF_LOG_ERROR, 'Invalid script ' + pl.script + ' : ' + err);
+		script_obj.run_script = null;
+	}
+
+	for (var propertyName in pl) {
+		if (propertyName == 'skip') continue;
+		if (propertyName == 'id') continue;
+		if (propertyName == 'active') continue;
+		if (propertyName == 'script') continue;
+		if (propertyName.charAt(0) == '_') continue;
+
+		print(GF_LOG_WARNING, 'Unrecognized option ' + propertyName + ' in script ' + JSON.stringify(pl) );
+	}
+
+	return;
+}
+
+function update_scripts()
+{
+	for (let i=0; i<user_scripts.length; i++) {
+		let script = user_scripts[i];
+		if (!script.active) continue;
+
+		if (!script.run_script) {
+			user_scripts.splice(i, 1);
+			i--;
+			continue;
+		}
+
+		if (script.next_time) {
+			if (video_playing && (script.next_time>video_time)) continue;
+			if (audio_playing && (script.next_time>audio_time)) continue;
+		} 
+
+		try {
+			let res = script.run_script.apply(script, []) || 0;
+			if (typeof res == 'number') {
+				if (res<0) res=0;
+
+				if (video_playing) res = video_time + res*video_timescale;
+				else res = audio_time + res*audio_timescale;
+			}
+			script.next_time = res;
+		} catch (err) {
+			user_scripts.splice(i, 1);
+			i--;
+			print(GF_LOG_ERROR, 'Error executing script ' + JSON.stringify(script.run_script) + ' : ' + err + ' - removing');
+		}
+	}
+}
+
+function validate_watcher(pl)
+{
+	let valid=true;
+	if ( typeof pl.watch != 'string') {
+		print(GF_LOG_ERROR, 'Watcher watch must be a string, ignoring ' + JSON.stringify(pl) );
+		return false;
+	}
+	if (pl.watch != 'events') {
+		let evt = pl.watch.split('(');
+		if (sys.get_event_type(evt[0]) ) {
+		}
+		else if (pl.watch.indexOf('@') < 0) {
+			print(GF_LOG_ERROR, 'Watcher watch must be in the form `ID@field`, ignoring ' + JSON.stringify(pl) );
+			return false;
+		}
+	}
+	if ( typeof pl.target != 'string') {
+		print(GF_LOG_ERROR, 'Watcher target must be an array, ignoring ' + JSON.stringify(pl) );
+		return false;
+	}
+	if ((typeof pl.mode != 'string') && (typeof pl.mode != 'undefined')) {
+		print(GF_LOG_ERROR, 'Watcher target must be an array, ignoring ' + JSON.stringify(pl) );
+		return false;
+	}
+	if ((pl.mode == 'set') && (pl.target.indexOf('@') < 0)) {
+		print(GF_LOG_ERROR, 'Watcher target must be in the form `ID@field`, ignoring ' + JSON.stringify(pl) );
+		return false;
+	}
+	return valid;
+}
+
+let watchers=[];
+let defer_parse_watchers = null;
+let watchers_defered = [];
+let event_watchers=[];
+
+function remove_watcher(watcher, parent_only)
+{
+	let idx;
+	if (watcher.parent) {
+		idx = watcher.parent.watchers.indexOf(watcher);
+		if (idx>=0) watcher.parent.watchers.splice(idx, 1);
+
+		if (watcher.parent.watchers.length == 0) {
+			watcher.parent.watchers = null;
+		}
+		watcher.parent = null;
+	} else if (watcher.evt != 0) {
+		idx = event_watchers.indexOf(watcher);
+		if (idx>=0) event_watchers.splice(idx, 1);
+	}
+
+	if (!parent_only) {
+		idx = watchers.indexOf(watcher);
+		if (idx>=0) watchers.splice(idx, 1);
+	}
+}
+
+
+function parse_watcher(pl)
+{
+	if (!validate_watcher(pl))
+		return;
+
+	if (pl.skip || false)
+		return;
+
+	let do_register = false;
+	let id = pl.id || null;
+	let watcher = id ? get_element_by_id(id, watchers) : null;
+	if (!watcher) {
+		watcher = {}
+		watcher.id = id;
+		watcher.evt = 0;
+		do_register = true;
+		watcher.parent = null;
+	}	else if (watcher.pl_update) {
+		print(GF_LOG_WARNING, "Multiple watchers with id `" + id + "` defined, ignoring subsequent declarations");
+		return null;
+	}
+	watcher.pl_update = true;
+
+	if (typeof pl.active == 'boolean')
+		watcher.active = pl.active;
+	else
+		watcher.active = true;
+
+
+	for (var propertyName in pl) {
+		if (propertyName == 'skip') continue;
+		if (propertyName == 'id') continue;
+		if (propertyName == 'active') continue;
+		if (propertyName == 'watch') continue;
+		if (propertyName == 'mode') continue;
+		if (propertyName == 'target') continue;
+		if (propertyName == 'with') continue;
+		if (propertyName.charAt(0) == '_') continue;
+
+		print(GF_LOG_WARNING, 'Unrecognized option ' + propertyName + ' in script ' + JSON.stringify(pl) );
+	}
+
+	let elem = null;
+	if (pl.watch.indexOf('@')>=0) {
+		let vals = pl.watch.split("@");
+		let s_id = vals[0];
+
+		elem = get_scene(s_id);
+		if (!elem) elem = get_group(s_id);
+		if (!elem) elem = get_script(s_id);
+		if (!elem) elem = get_timer(s_id);
+		if (!elem) elem = get_sequence(s_id);
+		if (!elem) elem = get_source(s_id);
+
+		if (!elem) {
+			print(GF_LOG_WARNING, 'No watchable element with ID ' + s_id + ' discarding watcher');
+			remove_watcher(watcher, false);
+			return;
+		}
+
+		//parent changed
+		if (watcher.src_id && s_id && (watcher.src_id != s_id)) {
+			remove_watcher(watcher, true);
+		}
+		watcher.src_id = s_id;
+		watcher.src_field = vals[1];
+		watcher.evt = 0;
+	} else {
+		let evt = pl.watch.split('(');
+		remove_watcher(watcher, true);
+		watcher.src_id = null;
+
+		if (evt != 'events') {
+			watcher.evt = sys.get_event_type(evt[0]);
+			if (!watcher.evt) {
+				print(GF_LOG_WARNING, 'Unkown event type ' + pl.watch + ' discarding watcher');
+				remove_watcher(watcher, false);
+				return;
+			}
+			if (evt.length>1) {
+				evt = evt[1].split(')');
+				watcher.evt_param = evt[0];
+			} else {
+				watcher.evt_param = 0;
+			}
+		} else {
+			watcher.evt = -1;
+			watcher.evt_param = 0;
+		}
+	}
+
+	let vals = [];
+	if (pl.target.indexOf(' ')>=0) {}
+	else if (pl.target.indexOf(')')>=0) {}
+	else if (pl.target.indexOf('(')>=0) {}
+	else vals = pl.target.split('.');
+
+	if (vals.length==2) {
+		let target_scene = get_scene(vals[0]);
+		if (!target_scene) {
+			print(GF_LOG_WARNING, 'Cannot find scene for target ' + pl.target + ', discarding watcher');
+			remove_watcher(watcher);
+			return;
+		}
+		watcher.mode = 3;
+		watcher.scene = target_scene;
+		watcher.target = vals[1];
+	} else {
+		let is_script = false;
+		let vals = pl.target.split('@');
+		if (vals.length>1) {
+			if (vals.length>2) is_script = true;
+			else if (vals[1].indexOf(' ')>=0) is_script = true;
+			else if (vals[1].indexOf('{')>=0) is_script = true;
+			else if (vals[1].indexOf('}')>=0) is_script = true;
+			else if (vals[1].indexOf('[')>=0) is_script = true;
+			else if (vals[1].indexOf(']')>=0) is_script = true;
+			else if (vals[1].indexOf('()')>=0) is_script = true;
+			else if (vals[1].indexOf(')')>=0) is_script = true;
+			else if (vals[1].indexOf('.')>=0) is_script = true;
+		} else if (vals.length==1) {
+			is_script = true;
+		}
+
+		if (is_script) {
+			watcher.mode = 2;
+			if (watcher.evt)
+				watcher.fun = fn_from_script(['evt'], pl.target);
+			else
+				watcher.fun = fn_from_script(['value'], pl.target);
+
+			if (!watcher.fun) {
+				print(GF_LOG_WARNING, 'Cannot parse action function ' + pl.target + ', discardinf watcher');
+				remove_watcher(watcher);
+				return;
+			}
+		} else {
+			if (watcher.evt) {
+				print(GF_LOG_WARNING, 'Cannot use target `ID@property` for event watchers, discarding watcher');
+				remove_watcher(watcher, false);
+				return;
+			}
+			watcher.mode = 0;
+			watcher.target = pl.target;
+			if (typeof pl.with != 'undefined') {
+				watcher.with = pl.with;
+				watcher.mode = 1;
+			}
+		}
+	}
+
+	if (do_register)
+		watchers.push(watcher);
+
+	if (elem) {
+		if (!elem.watchers)
+			elem.watchers = [];
+		elem.watchers.push(watcher);
+		watcher.parent = elem;
+	} else {
+		if (watcher.evt)
+			event_watchers.push(watcher);
+	}
+	return;
+}
+
+function flush_watchers()
+{
+	watchers_defered.forEach(evt => {
+		trigger_watcher(evt.elem, evt.prop, evt.val);
+	});
+	watchers_defered.length = 0;
+}
+
+function trigger_watcher(src, prop_name, value)
+{
+	if (defer_parse_watchers) {
+		let evt = {elem: src, prop: prop_name, val: value};
+		watchers_defered.push(evt);
+		return;
+	}
+
+	if (!src.watchers) return;
+
+	src.watchers.forEach(watcher => {
+		if (!watcher.active) return;
+
+		if (watcher.src_field != prop_name) return;
+
+		if (watcher.in_callback) {
+			print(GF_LOG_WARNING, 'recursive call for watcher ' + watcher.id + ' value was ' + src.id + '@' + prop_name+ '=' + value + ', ignoring');
+			return;
+		}
+		watcher.in_callback = true;
+		if (watcher.mode==0) {
+			let cmd = {replace: watcher.target, with: value};
+			parse_update_elem(cmd);
+		} else if (watcher.mode==1) {
+			let cmd = {replace: watcher.target, with: watcher.with};
+			parse_update_elem(cmd);
+		} else if (watcher.mode==2) {
+			try {
+				watcher.fun.apply(watcher, [value]);
+			} catch (err) {
+				print(GF_LOG_ERROR, 'Error executing action function: ' + err);
+			}
+		} else if (watcher.mode==3) {
+			if (watcher.scene.mod) {
+				if (typeof watcher.scene.mod[watcher.target] == 'function') {
+					watcher.scene.mod[watcher.target].apply(watcher.scene.mod, [value, src.id, prop_name]);
+				}
+			}
+		}
+		watcher.in_callback = false;
+
+	});
+}
+
+let styles=[];
+
+function parse_style(pl)
+{
+	if (pl.skip || false)
+		return;
+
+	let id = pl.id || null;
+	if (!id) return;
+	let style = get_element_by_id(id, styles);
+	if (style) {
+		print(GF_LOG_WARNING, "Multiple styles with id `" + id + "` defined, ignoring subsequent declarations");
+		return;
+	}
+	pl.forced = pl.forced || false;
+	pl.updated = true;
+	styles.push(pl);
+}
+
+
+function parse_playlist_element(pl)
+{
+	let type = pl.type || null;
+
+	if (pl.skip || false)
+		return;
+
+	//guess type of root elements
+	if (Array.isArray(pl.src))
+		type = 'url';
+
+	if (Array.isArray(pl.seq))
+		type = 'seq';
+
+	if (is_scene_pl(pl))
+		type = 'scene';
+
+	if (Array.isArray(pl.scenes) || (typeof pl.use == 'string'))
+		type = 'group';
+
+	if (Array.isArray(pl.keys) || Array.isArray(pl.anims))
+		type = 'timer';
+
+	if (typeof pl.script == 'string')
+		type = 'script';
+
+	if (typeof pl.watch == 'string')
+		type = 'watch';
+
+	//try config last
+	if ((typeof pl.reload_timeout != 'undefined') || (typeof pl.reload_loop != 'undefined'))
+		type = 'config';
+
+	if (!type) {
+		let nb_props = 0;
+		for (var propertyName in pl) {
+			if (typeof filter[propertyName] != 'undefined') {
+				nb_props++;
+			}
+		}
+		if (nb_props)
+			type = 'config';
+	}
+
+
+	if (type==='url') {
+		parse_url(pl, null);
+	} else if (type==='seq') {
+		parse_seq(pl);
+	} else if (type==='scene') {
+		parse_scene(pl, null);
+	} else if (type==='group') {
+		parse_group(pl, null);
+	} else if (type==='timer') {
+		parse_timer(pl);
+	} else if (type==='script') {
+			parse_script(pl);
+	} else if (type==='watch') {
+		if (defer_parse_watchers)
+			defer_parse_watchers.push(pl);
+		else
+			parse_watcher(pl);
+	} else if (type==='config') {
+		if (!playlist_loaded) {
+			parse_config(pl);
+		}	
+	} else if (type==='style') {
+		parse_style(pl);
+	} else {
+		print(GF_LOG_WARNING, 'Root element type ' + type + ' not defined, ignoring element ' + JSON.stringify(pl) );
+	}
+}
+
+function cleanup_list(type)
+{
+	let ID_list = null;
+	let log_name = null;
+	if (!type) { ID_list = ID_scenes; log_name = 'Scene'; }
+	else if (type==1) { ID_list = ID_groups; log_name = 'Group'; }
+	else if (type==2) { ID_list = user_scripts; log_name = 'Script'; }
+	else if (type==3) { ID_list = watchers; log_name = 'Watcher'; }
+	else if (type==4) { ID_list = timers; log_name = 'Timer'; }
+	else
+			return;
+
+	for (let i=0; i<ID_list.length; i++) {
+		let s = ID_list[i];
+		if (s.pl_update) continue;
+
+		if (s.id)
+			print(GF_LOG_INFO, log_name + ' ' + s.id + ' removed');
+		else
+			print(GF_LOG_INFO, log_name + ' removed');
+
+		ID_list.splice(i, 1);
+		i--;
+
+		//group
+		if (type==1) {
+			let len_before = ID_list.length;
+			remove_scene_or_group(s);
+			//cleanup of subtree removed a group with ID, restart
+			if (len_before != ID_list.length) {
+				i=-1;
+			}
+		}
+		//watcher
+		else if (type==3) {
+			remove_watcher(s, true);
+		}
+	}
+}
+
+function load_playlist()
+{
+	let pl = null;
+	if (arguments.length==1) {
+		pl = arguments[0];
+		if (!Array.isArray(pl))
+			return;
+	}
+
+	if (!pl) {
+		let last_mtime = sys.mod_time(filter.pl);
+		if (!last_mtime || (last_mtime == last_modification))
+			return true;
+
+		print(GF_LOG_DEBUG, last_modification ? 'refreshing JSON config' : 'loading JSON config')
+
+		let f = sys.load_file(filter.pl, true);
+		if (!f) return true;
+
+		current_utc_clock = Date.now();
+
+		try {
+			pl = JSON.parse(f);
+		} catch (e) {
+			print(GF_LOG_ERROR, "Invalid JSON playlist specified: " + e);
+			last_modification = last_mtime;
+			return false;
+		}
+		last_modification = last_mtime;
+	}
+
+	print(GF_LOG_DEBUG, 'Playlist is ' + JSON.stringify(pl) );
+
+	//mark all our objects present
+	sequences.forEach(seq => {
+		seq.pl_update = false;
+		seq.sources.forEach(src => {
+			src.pl_update = false;
+		});
+	});
+
+	//mark all scenes with ID as not updated
+	ID_scenes.forEach(scene => { scene.pl_update = false; });
+	if (scene_in_update) scene_in_update.pl_update = true;
+
+	//mark all groups with ID as not updated
+	ID_groups.forEach(group => { group.pl_update = false; });
+
+	//mark all scripts as not updated
+	user_scripts.forEach(o => { o.pl_update = false; });
+	//mark all watchers as not updated
+	watchers.forEach(o => { o.pl_update = false; });
+	//mark all timers as not updated
+	timers.forEach(o => { o.pl_update = false; });
+
+	//reset styles
+	styles.length = 0;
+
+	//reset root
+	root_scene.scenes.length = 0;
+	watchers_defered.length = 0;
+	defer_parse_watchers = [];
+
+	if (Array.isArray(pl) ) {
+		pl.forEach(parse_playlist_element);
+	} else {
+		parse_playlist_element(pl);
+	}
+
+	//cleanup sources no longer in use
+	//we don't use cleanup_list because we don't remove the source right away, this is done at next fetch_source
+	for (let i=0; i<sources.length; i++) {
+		let s = sources[i];
+		if (s.pl_update) continue;
+		let idx = s.sequence.sources.indexOf(s);
+		if (idx>=0) {
+	 		s.sequence.sources.splice(idx, 1);
+		}
+		print(GF_LOG_INFO, 'Source ' + s.logname + ' removed');
+ 		s.removed = true;
+	}
+
+	//cleanup scenes no longer in use
+	cleanup_list(0);
+	//cleanup groups no longer in use
+	cleanup_list(1);
+	//cleanup scripts no longer in use
+	cleanup_list(2);
+	//cleanup watchers no longer in use
+	cleanup_list(3);
+	//cleanup timers no longer in use
+	cleanup_list(4);
+
+	defer_parse_watchers.forEach( parse_watcher );
+	defer_parse_watchers = null;
+
+	if (scene_in_update) {
+		if (!scene_in_update.parent && (root_scene.scenes.indexOf(scene_in_update) < 0)) {
+			root_scene.scenes.push(scene_in_update);
+		}
+	}
+
+	if (root_scene.scenes.length) {
+		generate_default_scene = false;
+	}
+
+	//create default scene if needed
+	if (!root_scene.scenes.length && sources.length && generate_default_scene) {
+		print(GF_LOG_INFO, 'No scenes defined, generating default one');
+		create_scene(null, {"id": "_gpac_scene_default", "js": "shape"}, null);
+	}
+	return true;
+}
+
+function parse_val(params, name, scene_obj, def_val, update_type)
+{
+	let new_val;
+	let prop_set = (typeof scene_obj[name] == 'undefined') ? false : true;
+
+	if (typeof params[name] == 'undefined') {
+		//first setup, use default value
+		if (! prop_set)
+			new_val = def_val;
+		else
+			return;
+	} else if (!Array.isArray(params[name]) && (typeof params[name] == 'object')) {
+		return;
+	} else {		
+		new_val = params[name];
+	}
+
+	//any change to these properties will require a PID reconfig of the scene
+	if (prop_set && (new_val != scene_obj[name])) {
+		//scene obj
+		if (typeof scene_obj.mod == 'object')
+			scene_obj.mod.update_flag |= update_type;
+		else
+			scene_obj.update_flag |= update_type;
+	}
+	scene_obj[name] = new_val;
+}
+
+
+
+
+const scene_props = [
+	{ name: "js", def_val: null, update_flag: -1, is_mod: false},
+	{ name: "sources", def_val: null, update_flag: -1, is_mod: false},
+	{ name: "mix", def_val: null, update_flag: -1, is_mod: false},
+	{ name: "styles", def_val: [], update_flag: 0, is_mod: false},
+
+	{ name: "width", def_val: -1, update_flag: UPDATE_SIZE, is_mod: false},
+	{ name: "height", def_val: -1, update_flag: UPDATE_SIZE, is_mod: false},
+	{ name: "volume", def_val: 1, update_flag: 0, is_mod: true},
+	{ name: "fade", def_val: "inout", update_flag: 0, is_mod: true},
+	{ name: "mix_ratio", def_val: 0, update_flag: 0, is_mod: true},
+];
+
+function scene_get_update_type(prop_name)
+{
+	let i;
+	for (i=0; i<scene_props.length; i++) {
+		if (scene_props[i].name == prop_name) return scene_props[i].update_flag;
+	}
+	return -2;
+}
+
+function scene_is_mod_option(prop_name)
+{
+	let i;
+	for (i=0; i<scene_props.length; i++) {
+		if (scene_props[i].name == prop_name) return scene_props[i].is_mod;
+	}
+	return -2;
+}
+function scene_mod_option_update_time(scene, prop_name)
+{
+	if (!scene.options) return -2;
+	for (let i=0; i<scene.options.length; i++) {
+		let o = scene.options[i];
+		if (o.name != prop_name) continue;
+		if (typeof o.dirty == 'number')
+			return o.dirty;
+		return -1;
+	}
+	return -2;
+}
+
+
+function set_scene_options(scene, params)
+{
+	//scene has been removed (duplicated ids)
+	if (!scene.mod) return;
+
+	scene_props.forEach(o => {
+		if (o.def_val != null) {
+			if (o.is_mod)
+				parse_val(params, o.name, scene.mod, o.def_val, o.update_flag);
+			else {
+				parse_val(params, o.name, scene, o.def_val, o.update_flag);
+			}
+		}
+	});
+
+	//common with group
+	parse_group_transform(scene, params);
+
+	//parse module options
+	if (scene.options) {
+		scene.options.forEach( o => {
+				if (typeof o.name == 'undefined') return;
+				if (typeof o.value == 'undefined') return;
+				let prop_set = (typeof scene.mod[o.name] == 'undefined') ? false : true;
+				let mix_strings = o.dirty || 0;
+				mix_strings = mix_strings & UPDATE_ALLOW_STRING;
+
+				if (params && check_prop_type(typeof params[o.name], typeof o.value, mix_strings) ) {
+					if (prop_set && (scene.mod[o.name] != params[o.name])) {
+						let modif = true;
+						if (Array.isArray(o.value) && (scene.mod[o.name].length == params[o.name].length)) {
+							modif = false;
+							for (let i=0; i<scene.mod[o.name].length; i++) {
+								if (scene.mod[o.name][i] != params[o.name][i]) {
+									modif=true;
+									break;
+								}
+							}
+						}
+						if (modif) {
+							let update_type = o.dirty || UPDATE_SIZE;
+							scene.mod.update_flag |= update_type;
+						}
+					}
+					scene.mod[o.name] = params[o.name];
+					return;
+				}
+				if (params && (typeof params[o.name] == 'string') && (typeof o.value == 'number') ) {
+					 let val = globalThis[params[o.name] ];
+					 if (typeof val == typeof o.value) {
+							if (prop_set && (scene.mod[o.name] != val)) {
+								let update_type = o.dirty || UPDATE_SIZE;
+								scene.mod.update_flag |= update_type;
+							}
+	 						scene.mod[o.name] = val;
+	 						return;
+					 }
+				}
+				//allow string to string array
+				if (Array.isArray(o.value) && o.value.length && (typeof params[o.name] == 'string') && (typeof o.value[0] == 'string') ) {
+						let update_type = o.dirty || UPDATE_SIZE;
+						scene.mod.update_flag |= update_type;
+ 						scene.mod[o.name] = [ params[o.name] ];
+ 						return;
+				}
+				if (params && (typeof params[o.name] != 'undefined') ) {
+					print(GF_LOG_WARNING, 'Type mismatch for scene parameter ' + o.name + ': expecting ' + typeof o.value + ' got ' + params[o.name] + (prop_set ? ' - ignoring update' : ' - using default value'));
+				}
+				//set default value
+				if (prop_set) return;
+				scene.mod[o.name] = o.value;
+		});
+	}
+
+	for (var propertyName in params) {
+		//defined ones at module level
+		if (typeof scene.mod[propertyName] != 'undefined') continue;
+		//defined ones at scene level
+		if (scene_get_update_type(propertyName) > -2) continue;
+		if (group_get_update_type(propertyName, true) > -2) continue;
+		if (propertyName == 'id') continue;
+		if (propertyName == 'skip') continue;
+		if (propertyName.charAt(0) == '_') continue;
+
+		if (scene.options && (typeof scene.mod[propertyName] != 'undefined')) continue;
+
+		print(GF_LOG_WARNING, 'Unrecognized scene option ' + propertyName + ' for ' + scene.id + ' ');
+	}
+
+	//check if we have a mix instruction
+	if (!scene.sequences || (scene.sequences.length<=1)) {
+		scene.transition_effect = null;
+		scene.transition = null;
+	} else {
+		let old_fx = scene.transition_effect;
+		scene.transition_effect = params.mix || null;
+
+		if (old_fx && scene.transition_effect && (scene.transition_effect.type != old_fx.type)) {
+			scene.transition = null;
+		}
+
+		if (!scene.transition && scene.transition_effect) {
+			scene.transition_state = 0;
+			load_transition(scene);
+		}
+	}
+}
+
+function setup_scene(scene, seq_ids, params)
+{
+
+	scene.sequences = [];
+	scene.resetup_pids = true;
+	scene.mod.pids = [];
+	scene.apids = [];
+	scene.transition_effect = null;
+	scene.mod.mix_ratio = 0;
+	scene.transition = null;
+
+	scene.sources = seq_ids;
+
+	//default scene
+	if (!seq_ids) {
+		scene.sequences.push( sequences[0] );
+	} else if (typeof seq_ids != 'undefined') {
+		seq_ids.forEach(sid =>{
+			let s = get_sequence(sid);
+			if (!s) {
+				s = get_group(sid);
+				if (s && (s.offscreen == GROUP_OST_NONE)) s = null;
+			}
+			if (s)
+				scene.sequences.push(s);
+		}); 
+	}
+
+	scene.mod.update_flag = UPDATE_PID;
+	if (params)
+		set_scene_options(scene, params);
+}
+
+function remove_scene_or_group(elmt)
+{
+	let par = elmt.parent ? elmt.parent : root_scene;
+ let index = par.scenes.indexOf(elmt);
+ if (index > -1) par.scenes.splice(index, 1);
+
+ if (elmt.id) {
+		//traverse down tree, remove all elements with ID
+		do_traverse_all(elmt, e => {
+			e.parent = null;
+			if (!e.id) return;
+			let id_list = Array.isArray(e.scenes) ? ID_groups : ID_scenes;
+			let index = id_list.indexOf(e);
+			if (index > -1) id_list.splice(index, 1);
+		});
+ }
+}
+
+
+function create_scene(seq_ids, params, parent)
+{
+	let script_src = sys.url_cat(playlist_url, params.js);
+
+
+	if (! sys.file_exists(script_src)) {
+		script_src = filter.jspath + 'scenes/' + params.js + '.js';
+
+		if (! sys.file_exists(script_src)) {
+			print(GF_LOG_ERROR, 'No such scene file ' + script_src);
+			return null;
+		}
+	}
+
+	modules_pending ++;
+	let scene = {};
+	scene.id = params.id || null;
+	scene.watchers = null;
+	scene.pl_update = true;
+	scene.mod = null;
+	scene.sequences = [];
+	scene.transition_effect = params.mix || null;
+	scene.gl_type = SCENE_GL_NONE;
+	scene.parent = parent;
+	scene.mx = new evg.Matrix2D();
+
+	scene.get = function(prop) {
+		if (typeof this[prop] != 'undefined') return this[prop];
+		if (typeof this.mod[prop] != 'undefined') return this.mod[prop];
+		return undefined;
+	}
+
+	scene.set = function(prop, val) {
+		let obj = this;
+
+		//special handling of scenes
+		if (prop=='sources') {
+			if (Array.isArray(val)) {
+				setup_scene(obj, val, null);
+			}
+			return;
+		}
+		let update_type = group_get_update_type(prop, true);
+
+		if (update_type==-2) {
+			update_type = scene_mod_option_update_time(this, prop);
+			if (update_type>=0) {
+				obj = this.mod;
+			} else if (update_type==-2) {
+				update_type = scene_get_update_type(prop);
+				if ((update_type>=0) && scene_is_mod_option(prop)) {
+					obj = this.mod;
+				}
+			}
+		}
+		
+		//no modifications allowed or not defined 
+		if (update_type<0) {
+			return;
+		}
+
+		let allow_string = (update_type & UPDATE_ALLOW_STRING) ? true : false;
+		update_type &= ~UPDATE_ALLOW_STRING;
+
+		if ((obj[prop] != val) && check_prop_type(typeof obj[prop], typeof val, allow_string)) {
+			obj.update_flag |= update_type;
+			obj[prop] = val;
+			if (update_type)
+				invalidate_parent(this);
+			trigger_watcher(scene, prop, val);
+		}
+	}
+
+	if (parent)
+		parent.scenes.push(scene);
+	else
+		root_scene.scenes.push(scene);
+
+	if (scene.id)
+		ID_scenes.push(scene);
+
+	import(script_src)
+		 .then(obj => {
+		 		modules_pending--;
+		 		print(GF_LOG_DEBUG, 'Module ' + script_src + ' loaded');
+		 		scene.mod = obj.load();
+					scene.mod.id = scene.id || "unknown";
+
+		 		if (typeof scene.mod.fullscreen != 'function')
+		 				scene.mod.fullscreen = function () { return -1; };
+
+		 		if (typeof scene.mod.is_opaque != 'function')
+		 				scene.mod.is_opaque = function () { return false; };
+
+		 		if (typeof scene.mod.identity != 'function')
+		 				scene.mod.identity = function () { return false; };
+
+		 		let has_draw = (typeof scene.mod.draw == 'function') ? true : false;
+		 		let has_draw_gl = (typeof scene.mod.draw_gl == 'function') ? true : false;
+		 		if (!has_draw && !has_draw_gl) {
+		 				scene.mod.draw = function (canvas) {};
+		 		} else if (has_draw && !has_draw_gl) {
+		 			scene.gl_type = SCENE_GL_NONE;
+		 		} else if (has_draw_gl) {
+		 			if (!has_draw) {
+			 			scene.gl_type = SCENE_GL_ONLY;
+		 				scene.mod.draw = function (canvas) {};
+		 				if (!filter.gpu) {
+								print(GF_LOG_ERROR, 'GPU not enabled but required for scene ' + params.js + ' - disabling scene');
+								remove_scene_or_group(scene);
+								return;
+		 				}
+		 			} else {
+			 			scene.gl_type = SCENE_GL_ANY;
+		 			}
+		 		}
+
+		 		scene.options = obj.options || null;
+		 		setup_scene(scene, seq_ids, params);
+		 })
+		 .catch(err => {
+		 		modules_pending--;
+					print(GF_LOG_ERROR, "Failed to load scene " + params.js + ' (' + script_src + '): ' + err);
+					remove_scene_or_group(scene);
+		 });
+
+	//fixme, we need promises here
+	return scene;
+}
+
+let timers=[];
+
+function validate_timer(pl)
+{
+	let valid=true;
+	if (! Array.isArray(pl.keys)) {
+		print(GF_LOG_ERROR, 'Timer keys must be an array, ignoring ' + JSON.stringify(pl) );
+		return false;
+	}
+	if (pl.keys.length<=1) {
+		print(GF_LOG_ERROR, 'Timer keys must be at least two, ignoring ' + JSON.stringify(pl) );
+		return false;
+	}
+	if (! Array.isArray(pl.anims)) {
+		print(GF_LOG_ERROR, 'Timer anims must be an array, ignoring ' + JSON.stringify(pl) );
+		return false;
+	}
+
+	let last_val = -1;
+	pl.keys.forEach (v => { 
+			if (typeof v != 'number') valid=false;
+			if (last_val<0) {
+				if (v) valid = false;
+			}
+			else if (last_val >= v) valid = false;
+			last_val = v;
+	})
+	if (!valid) {
+		print(GF_LOG_ERROR, 'Timer keys must be numbers, from 0 to 1 in ascending order, ignoring ' + JSON.stringify(pl) );
+		return false;
+	}
+	pl.anims.forEach(anim => {
+		if (typeof anim != 'object') {
+			print(GF_LOG_ERROR, 'Timer anims must be objects not ' + typeof anim + ', ignoring ' + JSON.stringify(pl) );
+			valid = false;
+			return;
+		}
+		if (! Array.isArray(anim.values) || ! Array.isArray(anim.targets)) {
+			print(GF_LOG_ERROR, 'Timer anims values / targets must be an array, ignoring ' + JSON.stringify(pl) );
+			valid = false;
+			return;
+		}
+		if (anim.values.length != pl.keys.length) {
+			print(GF_LOG_ERROR, 'Timer anims values must be in same quantity as keys, ignoring ' + JSON.stringify(pl) );
+			valid = false;
+			return;
+		}
+		anim.values.forEach(val => {
+			if (typeof val != 'string' && typeof val != 'number' && typeof val != 'boolean' && !Array.isArray(val)) {
+				print(GF_LOG_ERROR, 'Timer anims values must be string or numbers, ignoring ' + JSON.stringify(pl) );
+				valid = false;
+				return;
+			}
+		});
+		anim.targets.forEach(val => {
+			if (typeof val != 'string') {
+				print(GF_LOG_ERROR, 'Timer anims targets must be strings, ignoring ' + JSON.stringify(pl) );
+				valid = false;
+				return;
+			}
+			if (val.indexOf('@') < 0) {
+				print(GF_LOG_ERROR, 'Timer anims targets must be in the form ID@field, ignoring ' + JSON.stringify(pl) );
+				valid = false;
+				return;
+			}
+		});
+	});
+	if (!valid) return false;
+
+	for (var propertyName in pl) {
+		if (propertyName == 'id') continue;
+		if (propertyName == 'dur') continue;
+		if (propertyName == 'loop') continue;
+		if (propertyName == 'start') continue;
+		if (propertyName == 'stop') continue;
+		if (propertyName == 'keys') continue;
+		if (propertyName == 'anims') continue;
+		if (propertyName == 'pause') continue;
+		if (propertyName.charAt(0) == '_') continue;
+
+		print(GF_LOG_WARNING, 'Unrecognized option ' + propertyName + ' in timer ' + JSON.stringify(pl) );
+	}
+	pl.anims.forEach(anim => {
+		for (var propertyName in anim) {
+			if (propertyName == 'values') continue;
+			if (propertyName == 'color') continue;
+			if (propertyName == 'angle') continue;
+			if (propertyName == 'mode') continue;
+			if (propertyName == 'postfun') continue;
+			if (propertyName == 'end') continue;
+			if (propertyName == 'targets') continue;
+			if (propertyName.charAt(0) == '_') continue;
+
+			print(GF_LOG_WARNING, 'Unrecognized option ' + propertyName + ' in timer anim ' + JSON.stringify(anim) );
+		}
+	});
+
+	return true;
+}	
+
+function parse_date_time(d, for_seq)
+{
+	let res = -1;
+	if (typeof d == 'string') {
+		//float as string means offset to current time, wether live or offline
+		if (d.indexOf(':')<0) {
+			res = parseFloat(d);
+			//NaN
+			if (res != res)
+				res = -1;
+			else {
+				let now = for_seq ? current_utc_clock : (init_utc + video_time * 1000 / video_timescale);
+				res = now + 1000 * res;
+			}
+		} else if (filter.live) {
+			if (d === 'now') {
+				res = current_utc_clock;
+			} else {
+				res = Date.parse(d);
+				//NaN
+				if (res != res)
+					res = -1;
+			}
+		} else {
+			print(GF_LOG_INFO, 'Date ' + d + ' found start/stop but non-live mode used, will use 0');
+			res = 0;
+		}
+	} else if (typeof d == 'number') {
+		if (d >= 0) {
+			if (for_seq && !d) {
+				res = filter.live ? 0 : 0;
+			} else {
+				res = (for_seq ? current_utc_clock : init_utc) + 1000 * d;
+			}
+		}
+	} else if (typeof d == 'undefined') {
+		res = for_seq ? 0 : init_utc;
+	}
+	return res;
+}
+
+function parse_timer(pl)
+{
+	if (!validate_timer(pl)) 
+		return;
+
+	let eval_start_time = false;
+	let timer_id = pl.id || null;
+	let timer = timer_id ? get_timer(timer_id) : null;
+
+	if (!timer) {
+		timer = {};
+		timer.watchers = null;
+		timers.push(timer);
+		eval_start_time = true;
+		timer.active_state = 0;
+		timer.is_paused = false;
+		timer.id = timer_id;
+		timer.crc = 0;
+	}	else if (timer.pl_update) {
+		print(GF_LOG_WARNING, "Multiple timers with id `" + timer_id + "` defined, ignoring subsequent declarations");
+		return null;
+	}
+	timer.pl_update = true;
+
+	let crc = sys.crc32(JSON.stringify(pl));
+	if (crc != timer.crc) {
+		//we don't track changes of the timer, we blindly replace it 
+		if (timer.crc)
+				timer_restore(timer);
+		
+		timer.crc = crc;
+	} else {
+		return;
+	}
+
+	timer.keys = pl.keys;	
+	timer.anims = [];
+	pl.anims.forEach(anim =>{
+		let a = {};
+		a.values = anim.values;
+		a.color = anim.color || false;
+		a.mode = 0;
+		a.fun = null;
+		if (typeof anim.mode == 'string') {
+			if (anim.mode == "discrete") a.mode = 1;
+			else if (anim.mode == "linear") a.mode = 0;
+			else {
+				a.mode = 2;
+				a.fun = fn_from_script(['interp'], anim.mode);
+			}
+		} 
+		
+		a.postfun = (typeof anim.postfun == 'string') ? fn_from_script(['res', 'interp'], anim.postfun) : null;
+
+		let mod = anim.end || "freeze";
+		a.restore = 0;
+		if (typeof mod == 'string') {
+			if (pl.mod == 'freeze') {}
+			else if (mod == 'restore') { a.restore = 1; }
+		}
+
+		a.angle = anim.angle || false;
+
+		a.targets = [];
+		anim.targets.forEach( t => {
+			let vals = t.split("@");
+			let tar = {};
+			tar.id = vals[0];
+			tar.scene = get_scene(vals[0]);
+			tar.group = get_group(vals[0]);
+			tar.script = get_script(vals[0]);
+			tar.watcher = get_element_by_id(vals[0], watchers);
+			tar.style = get_element_by_id(vals[0], styles);
+			tar.fx = null;
+			tar.fx_obj = null;
+			if (!tar.scene && !tar.group && check_transition(vals[0]))
+				tar.fx = vals[0];
+
+			if (!tar.scene && !tar.group && !tar.fx && !tar.script && !tar.style) {
+				print(GF_LOG_ERROR, 'No object with ID ' + vals[0] + ' found, ignoring target');
+				return;
+			}
+
+			tar.field = vals[1];
+
+			if (tar.field=="id") {
+				print(GF_LOG_ERROR, 'ID cannot be animated, ignoring target');
+				return;
+			}
+
+			tar.scene_obj = false;
+
+			//indexed anim
+			if (tar.field.indexOf('[')>0) {
+				vals = tar.field.split('[');
+				tar.field = vals[0];
+				let idx = vals[1].split(']');
+				tar.idx = parseInt(idx[0]);
+			} else {
+				tar.idx = -1;
+			}
+
+			if (tar.scene) {
+				if (tar.field == 'sources') {
+					tar.update_type = UPDATE_PID;
+				} else {
+					//check transform props
+					tar.update_type = group_get_update_type(tar.field, true);
+					if (tar.update_type>=0)
+							tar.scene_obj = true;
+				}
+
+				//check scene (not module) props
+				if (tar.update_type == -2) {
+					tar.update_type = scene_get_update_type(tar.field);
+					if ((tar.update_type>=0) && !scene_is_mod_option(tar.field))
+						tar.scene_obj = true;
+				}
+				if ((tar.update_type == -2) && tar.scene && !tar.scene.mod) {
+					//scene module not loaded, defer
+					tar.update_type = -3;
+				}
+				else if ((tar.update_type == -2) && tar.scene && tar.scene.options) {
+					tar.update_type = scene_mod_option_update_time(tar.scene, tar.field);
+				}
+			} else if (tar.group) {
+				tar.update_type = group_get_update_type(tar.field, false);
+			} else if (tar.script) {
+				if (tar.field!="active") {
+					print(GF_LOG_ERROR, 'Property ' + tar.field + ' of script cannot be animated, ignoring target');
+					return;
+				}
+				tar.update_type = 0;
+			} else if (tar.watcher) {
+				if (tar.field!="active") {
+					print(GF_LOG_ERROR, 'Property ' + tar.field + ' of watcher cannot be animated, ignoring target');
+					return;
+				}
+				tar.update_type = 0;
+			} else if (tar.style) {
+				tar.update_type = 0;
+			} else {
+				tar.update_type = UPDATE_SIZE;
+			}
+
+			if (tar.update_type == -2) {
+				print(GF_LOG_ERROR, 'No property ' + tar.field + ' in ' + (tar.scene ? 'scene' : 'group') + ', ignoring target');
+				return;
+			}
+			if (tar.update_type == -1) {
+				print(GF_LOG_ERROR, 'Property ' + tar.field + ' in ' + (tar.scene ? 'scene' : 'group') + ' cannot be updated, ignoring target');
+				return;
+			}
+
+			a.targets.push(tar);
+		});
+		timer.anims.push(a);
+	}); 
+
+	timer.loop = pl.loop || false;
+	timer.pause = pl.pause || false;
+
+	if (timer.active_state!=1) {
+		eval_start_time = true;
+	}
+
+	if (eval_start_time) {
+		timer.duration = pl.dur || 0;
+		timer.start_time = parse_date_time(pl.start, false);
+	}
+
+	timer.stop_time = parse_date_time(pl.stop, false);
+	if (timer.stop_time<=timer.start_time)
+		timer.stop_time = -1;
+
+	if (!timer.duration) timer.active_state = 2;
+}
+
+function timer_restore(timer)
+{
+	//restore values
+	timer.anims.forEach(anim => {
+		if (anim.restore != 1) return;
+
+		anim.targets.forEach(target => {
+			if (!target.scene) return;
+			let scene = target.scene.mod;
+
+			if (target.idx>=0) {
+				if (Array.isArray(scene[target.field])) {
+					scene.update_flag |= target.update_type;
+					scene[target.field][target.idx] = target.orig_value;
+				}
+			} else {
+				scene.update_flag |= target.update_type;
+				scene[target.field] = target.orig_value;
+			}
+		});
+	});
+}
+
+function invalidate_parent(elm)
+{
+	while (elm.parent) {
+		elm.parent.update_flag |= UPDATE_CHILD;
+		elm = elm.parent;
+	}
+}
+
+function get_timer(timer_id)
+{
+	return get_element_by_id(timer_id, timers);
+}
+
+function update_timer(timer)
+{
+	let do_store=false;
+
+	if (timer.active_state == 2) return;
+
+	let now = init_utc + video_time * 1000 / video_timescale;
+	if ((timer.start_time<0) || (timer.start_time > now)) {
+		return;
+	}
+
+	if (!timer.active_state) {
+		timer.active_state = 1;
+		trigger_watcher(timer, "active", true);
+		timer.activation_time = video_time;
+		do_store = true;
+	}
+
+	if (timer.pause) {
+		if (!timer.is_paused) {
+			timer.pause_time = video_time;
+			timer.is_paused = true;
+		}
+		return;
+	} else if (timer.is_paused) {
+		timer.activation_time += video_time - timer.pause_time;
+		timer.is_paused = false;
+	}
+
+	let frac = (video_time - timer.activation_time) * video_time_inc / video_timescale;
+	
+	if (frac > timer.duration) {
+		if (!timer.loop && (timer.stop_time<0) ) {
+			timer.active_state = 2;
+			trigger_watcher(timer, "active", false);
+		} else {
+			while (frac > timer.duration) frac -= timer.duration;
+		}
+	}
+	if ((timer.stop_time > timer.start_time) && (timer.stop_time <= now)) {
+		timer.active_state = 2;
+		trigger_watcher(timer, "active", false);
+	}
+
+	if (timer.active_state == 2) {
+		timer_restore(timer);
+		return;
+	}
+
+	frac /= timer.duration;
+	let s_key = timer.keys[0];
+	let e_key = 1;
+	let k_idx = 0;
+	for (let i=1; i<timer.keys.length; i++) {
+			if (frac <= timer.keys[i]) {
+				e_key = timer.keys[i];
+				break;
+			}
+			s_key = timer.keys[i];
+			k_idx = i;
+	}
+
+	let interpolate = (frac - s_key) / (e_key - s_key);
+
+	timer.anims.forEach(anim => {
+		let res = 0;
+		let value1 = anim.values[k_idx];
+		let value2 = anim.values[k_idx+1];
+		let interp = interpolate;
+
+		if (anim.angle) { interp *= Math.PI; interp /= 180; }
+
+		else if (anim.fun != null) {
+				try {
+					interp = anim.fun.apply(anim, [interp]);
+					if (typeof interp != 'number')
+						throw 'Interpolation function result is not a number !';
+				} catch (e) {
+					print(GF_LOG_ERROR, "Error processing anim fun " + anim.fun + ': ' + e);
+					anim.fun = null;
+					return;
+				}
+				if (interp<0) interp=0;
+				else if (interp>1) interp=1;
+		}
+
+		if (anim.mode==1) {
+			res = value1;
+			if (anim.postfun) {
+				try {
+					res = anim.postfun.apply(anim, [res, interp]);
+				} catch (e) {
+					print(GF_LOG_ERROR, "Error processing anim postfun " + anim.postfun + ': ' + e);
+					anim.postfun = null;
+				}
+			}
+		}
+		else if (anim.color) {
+			res = sys.color_lerp(interp, value1, value2);
+		}
+		else if (typeof value1 != 'number') res = value1;
+		else if (typeof value2 != 'number') res = value1;
+		else {
+			res = interp * value2 + (1-interp) * value1;
+
+			if (anim.postfun) {
+				try {
+					res = anim.postfun.apply(anim, [res, interp]);
+				} catch (e) {
+					print(GF_LOG_ERROR, "Error processing anim postfun " + anim.postfun + ': ' + e);
+					anim.postfun = null;
+				}
+			}
+		}
+
+		for (let i=0; i<anim.targets.length; i++) {
+			let target = anim.targets[i];
+			let watch_src=null;
+
+			let anim_obj = null;
+
+			if (target.scene) {
+				anim_obj = target.scene.mod;
+				watch_src = target.scene;
+			}
+			else if (target.group) {
+				anim_obj = target.group;
+			}
+			else if (target.fx) {
+				if (!target.fx_obj) {
+					target.fx_obj = get_transition(target.fx, false);
+					if (!target.fx_obj) {
+						print(GF_LOG_WARNING, 'No transition with target ' + target.field + ' found, removing target');
+						anim.targets.splice(i, 1);
+						i--;
+						continue;
+					}
+				}
+				anim_obj = target.fx_obj.mod;
+			}
+			else if (target.script) {
+				anim_obj = target.script;
+			}
+			else if (target.style) {
+				anim_obj = target.style;
+			}
+			else if (target.watcher) {
+				anim_obj = target.watcher;
+			}
+
+			if (!anim_obj) {
+				print(GF_LOG_WARNING, 'Animation target ' + target.field + ' not found, removing target');
+				anim.targets.splice(i, 1);
+				i--;
+				continue;
+			}
+
+			if (target.scene_obj) {
+				anim_obj = target.scene;
+			}
+
+			if (typeof anim_obj[target.field] == 'undefined') {
+				//special case for scene, some options are not in the scene module
+				if (target.scene && ((target.update_type==UPDATE_PID) || (typeof target.scene[target.field] != 'undefined'))) {
+					anim_obj = target.scene;
+				}
+				//otherwise error except for style
+				else if (!target.style) {
+					print(GF_LOG_WARNING, 'No property named ' + target.field + ' in target obj ID ' + target.id + ', removing target');
+					anim.targets.splice(i, 1);
+					i--;
+					continue;
+				}
+			}
+			let update_type = target.update_type;
+
+			//update type was defered (scene not loaded)
+			if ((update_type == -3) && target.scene) {
+				if (typeof target.scene.mod[target.field] != 'undefined') {
+					update_type = scene_mod_option_update_time(target.scene, target.field);
+				}
+				if (update_type<0) {
+					print(GF_LOG_WARNING, 'No property named ' + target.field + ' in target obj ID ' + target.id + ', removing target');
+					anim.targets.splice(i, 1);
+					i--;
+					continue;
+				}
+				target.update_type = update_type;
+			}
+
+
+			let allow_string = (update_type & UPDATE_ALLOW_STRING) ? true : false;
+			update_type &= ~UPDATE_ALLOW_STRING;
+
+			let final = res;
+			if (!watch_src) watch_src = anim_obj;
+
+			if (target.idx>=0) {
+				if (Array.isArray(anim_obj[target.field])
+					&& (target.idx<anim_obj[target.field].length)
+					&& (typeof anim_obj[target.field][target.idx] == typeof final)
+				) {
+					if (do_store) {
+						target.orig_value = anim_obj[target.field][target.idx];
+					}
+					if ((anim_obj[target.field][target.idx] != final)) {
+						anim_obj.update_flag |= update_type;
+						anim_obj[target.field][target.idx] = final;
+						if (update_type)
+							invalidate_parent(target.scene || target.group);
+
+						trigger_watcher(watch_src, target.field, anim_obj[target.field]);
+					}
+				}
+			}
+			//we don't check type for style objects, and check ot for others
+			else if (target.style || check_prop_type(typeof anim_obj[target.field], typeof final, allow_string)) {
+				if (do_store) {
+					target.orig_value = anim_obj[target.field];
+				}
+				if ((anim_obj[target.field] != final)) {
+					print(GF_LOG_DEBUG, 'update ' + target.id + '.' + target.field + ' to ' + final);
+					if (update_type == UPDATE_PID) {
+						setup_scene(target.scene, final, null);
+					} else {
+						anim_obj.update_flag |= update_type;
+						anim_obj[target.field] = final;
+
+						if (target.style)
+							target.style.updated = true;
+						else if (update_type)
+							invalidate_parent(target.group || target.scene);
+					}
+					trigger_watcher(watch_src, target.field, anim_obj[target.field]);
+				}
+			} else {
+				print(GF_LOG_WARNING, 'Anim type mismatch for ' + target.field + ' got ' + typeof final + ' expecting ' + typeof anim_obj[target.field] + ', ignoring');
+			}
+		};
+
+	});
+}
+
+
+function clip_to_output(clip)
+{
+	let rc = {};
+	rc.x = clip.x - clip.w/2;
+	rc.y = clip.y + clip.h/2;
+	rc.w = clip.w;
+	rc.h = clip.h;
+	rc = active_scene.mx.apply(rc);
+
+	rc.x = Math.floor(rc.x);
+	rc.y = Math.floor(rc.y);
+	rc.w = Math.floor(rc.w);
+	rc.h = Math.floor(rc.h);
+	if (!webgl) return round_rect(rc);
+	return rc;
+}
+
+function canvas_clear(color, clip)
+{
+	if (!active_scene) return;
+	if (active_scene.mx.is3D) {
+		print(GF_LOG_ERROR, 'Cannot clear canvas in 3D context');
+		return;
+	}
+
+	clip = clip_to_output(clip);
+
+	if (webgl) {
+		let a = sys.color_component(color, 0);
+		let r = sys.color_component(color, 1);
+		let g = sys.color_component(color, 2);
+		let b = sys.color_component(color, 3);
+
+		webgl.clearColor(r, g, b, a);
+
+		webgl.enable(webgl.SCISSOR_TEST);
+		webgl.scissor(video_width/2 + clip.x, clip.y - clip.h + video_height/2, clip.w, clip.h);
+		webgl.clear(webgl.COLOR_BUFFER_BIT);
+		webgl.disable(webgl.SCISSOR_TEST);
+
+	} else {
+		canvas.clear(clip, color);
+	}
+}
+
+let wgl_clipper = null;
+
+let clip_stack = [];
+function canvas_set_clipper(clip, use_stack)
+{
+	if (!active_scene) return;
+	if (active_scene.mx.is3D) {
+		print(GF_LOG_ERROR, 'Cannot set clipper in 3D context');
+		return;
+	}
+
+	if (use_stack) {
+		if (!clip) {
+			clip_stack.pop();
+			clip = clip_stack.length ? clip_stack[clip_stack.length - 1] : null;
+		} else {
+			clip = clip_to_output(clip);
+
+			if (clip_stack.length) {
+				let prev_clip = clip_stack[clip_stack.length - 1];
+				clip = sys.rect_intersect(prev_clip, clip);
+			}
+			clip_stack.push(clip);
+		}
+	} else {
+		if (clip)
+			clip = clip_to_output(clip);
+	}
+	if (webgl) {
+		wgl_clipper = clip;
+	} else {
+		canvas.clipper = clip;
+	}
+}
+
+let mask_canvas = null;
+let mask_canvas_data = null;
+let mask_texture = null;
+let mask_gl_stencil = null;
+
+function canvas_set_mask_mode(mode)
+{
+		if (use_gpu) {
+			if (mode) {
+				if (!mask_canvas_data) {
+					mask_canvas_data = new ArrayBuffer(video_width * video_height);
+					mask_canvas = new evg.Canvas(video_width, video_height, "grey", mask_canvas_data);
+					mask_texture = webgl.createTexture();
+
+					webgl.bindTexture(webgl.TEXTURE_2D, mask_texture);
+					webgl.texParameteri(webgl.TEXTURE_2D, webgl.TEXTURE_WRAP_S, webgl.CLAMP_TO_EDGE);
+					webgl.texParameteri(webgl.TEXTURE_2D, webgl.TEXTURE_WRAP_T, webgl.CLAMP_TO_EDGE);
+					webgl.texParameteri(webgl.TEXTURE_2D, webgl.TEXTURE_MIN_FILTER, webgl.LINEAR);
+					webgl.texParameteri(webgl.TEXTURE_2D, webgl.TEXTURE_MAG_FILTER, webgl.LINEAR);
+					webgl.texImage2D(webgl.TEXTURE_2D, 0, webgl.LUMINANCE, video_width, video_height, 0, webgl.LUMINANCE, webgl.UNSIGNED_BYTE, mask_canvas_data);
+					webgl.bindTexture(webgl.TEXTURE_2D, 0);
+
+					mask_gl_stencil = new evg.SolidBrush();
+					mask_gl_stencil.set_color("black");
+				}
+				let clear = null;
+				if (mode == GF_EVGMASK_DRAW) {
+					clear = 'black';
+				}
+				else if (mode == GF_EVGMASK_RECORD) {
+					clear = 'white';
+				}
+				else if (mode == GF_EVGMASK_DRAW_NO_CLEAR) {
+					mode = GF_EVGMASK_DRAW;
+				}
+
+				if (clear) {
+					mask_canvas.clear(clear);
+				}
+			}
+		} else {
+			canvas.mask_mode = mode;
+		}
+
+		mask_mode = mode;
+}
+
+
+let canvas_offscreen_active = false;
+
+function flush_offscreen_canvas()
+{
+ 	canvas_offscreen._gl_texture.upload(canvas_offscreen._evg_texture);
+
+ let glprog = canvas_offscreen._gl_program;
+ webgl.useProgram(glprog.program);
+
+ webgl.viewport(0, 0, video_width, video_height);
+
+ //set video texture
+ webgl.activeTexture(webgl.TEXTURE0);
+ webgl.bindTexture(webgl.TEXTURE_2D, canvas_offscreen._gl_texture);
+	webgl.uniform1i(glprog.textures[0].sampler, 0);
+
+	canvas_offscreen._mesh.draw(webgl, glprog.attribLocations.vertexPosition, glprog.attribLocations.textureCoord);
+
+ webgl.useProgram(null);
+}
+
+function canvas_offscreen_activate()
+{
+	if (canvas_offscreen_active) return true;
+
+	if (!canvas_offscreen) {
+		canvas_offscreen = new evg.Canvas(video_width, video_height, 'rgba');
+		if (!canvas_offscreen) return false;
+		canvas_offscreen._evg_texture = new evg.Texture(canvas_offscreen);
+		if (!canvas_offscreen._evg_texture) return false;
+
+		canvas_offscreen._gl_texture = webgl.createTexture(null);
+		if (!canvas_offscreen._gl_texture) return false;
+		canvas_offscreen._gl_tx_id = webgl.textureName(canvas_offscreen._gl_texture);
+
+
+	 	canvas_offscreen._gl_texture.upload(canvas_offscreen._evg_texture);
+
+		let path = new evg.Path().rectangle(0, 0, video_width, video_height, true);
+		canvas_offscreen._mesh = new evg.Mesh(path);
+		if (!canvas_offscreen._mesh) return;
+		canvas_offscreen._mesh.update_gl();
+
+ 	canvas_offscreen._gl_program = setup_webgl_program(vs_source, fs_source, canvas_offscreen._gl_tx_id);
+	}
+	canvas_offscreen.clearf(0, 0, 0, 0);
+	canvas_offscreen_active = true;
+	return true;
+}
+
+function canvas_offscreen_deactivate()
+{
+	if (!canvas_offscreen_active) return;
+
+	canvas_offscreen_active = false;
+	flush_offscreen_canvas();
+}
+
+let no_signal_text = null;
+let no_signal_brush = new evg.SolidBrush();
+let no_signal_path = null;
+let no_signal_outline = null;
+
+let no_signal_transform = new evg.Matrix2D();
+
+function draw_scene_no_signal()
+{
+	if (!no_signal_path) no_signal_path = new evg.Text();
+
+	let text = no_signal_path;
+	let h = active_scene ? active_scene.mod.height : video_height;
+	let w = active_scene ? active_scene.mod.width : video_width;
+	text.fontsize = h / 20;
+ text.font = ['SANS'];
+ text.align = GF_TEXT_ALIGN_LEFT;
+	text.baseline = GF_TEXT_BASELINE_TOP;
+
+	text.maxWidth = w;
+	let d = new Date();
+	if (no_signal_text==null) {
+		//let version = 'GPAC '+sys.version + ' API '+sys.version_major+'.'+sys.version_minor+'.'+sys.version_micro;
+		let version = 'GPAC ' + (sys.test_mode ? 'Test Mode' : sys.version_full);
+		no_signal_text = ['No input', '', version, '(c) 2000-2021 Telecom Paris'];
+	}
+	let s1 = null;
+	if (active_scene && active_scene.mod.pids.length) {
+		if (sys.test_mode) 
+			s1 = 'Signal lost';
+		else
+			s1 = 'Signal lost (' + Math.floor(active_scene.mod.pids[0].pid.source.no_signal/1000) + ' s)';
+	} else {
+		s1 = 'No input';
+	}
+	let s2 = sys.test_mode ? 'Date' : d.toUTCString();
+	if ((s1 !== no_signal_text[0]) || (s2 !== no_signal_text[1])) {
+		no_signal_text[0] = s1;
+		no_signal_text[1] = s2;
+	 text.set_text(no_signal_text);
+	 no_signal_outline = null;
+	}
+
+	if (active_scene)
+		no_signal_transform.copy(global_transform)
+	else
+		no_signal_transform.identity = true;
+
+ no_signal_transform.translate(-w/2, 0);
+
+ if (!no_signal_outline) {
+ 	no_signal_outline = text.get_path().outline( { width: 6, align: GF_PATH_LINE_CENTER, cap: GF_LINE_CAP_ROUND, join: GF_LINE_JOIN_ROUND } );
+ }
+ no_signal_brush.set_color('black');
+
+ let scene = active_scene;
+ active_scene = null;
+	canvas_draw(no_signal_outline, no_signal_brush, true);
+
+/* no_signal_brush.set_color('black');
+	canvas_draw(text, mx, no_signal_brush, true);
+ mx.translate(-2, 2);
+*/
+ no_signal_brush.set_color('white');
+	canvas_draw(text, no_signal_brush, true);
+
+ active_scene = scene;
+}
+
+
+function push_texture_uniforms(tx, prog_tx_uni)
+{
+	let mx2d = tx.mx || null;
+	const txmx = mx2d ? new evg.Matrix(mx2d) : new evg.Matrix();
+	webgl.uniformMatrix4fv(prog_tx_uni.matrix, false, txmx.m);
+
+	webgl.uniform1f(prog_tx_uni.alpha, tx.get_alphaf() );
+
+	let cmx_val = tx.cmx;
+	if (cmx_val.identity) {
+		 webgl.uniform1i(prog_tx_uni.cmx_use, 0);
+	} else {
+		let cmx_mul = [];
+		cmx_mul.length = 16;
+
+		cmx_mul[0] = cmx_val.rr; cmx_mul[1] = cmx_val.rg; cmx_mul[2] = cmx_val.rb; cmx_mul[3] = cmx_val.ra;
+		cmx_mul[4] = cmx_val.gr; cmx_mul[5] = cmx_val.gg; cmx_mul[6] = cmx_val.gb; cmx_mul[7] = cmx_val.ga;
+		cmx_mul[8] = cmx_val.br; cmx_mul[9] = cmx_val.bg; cmx_mul[10] = cmx_val.bb; cmx_mul[11] = cmx_val.ba;
+		cmx_mul[12] = cmx_val.ar; cmx_mul[13] = cmx_val.ag; cmx_mul[14] = cmx_val.ab; cmx_mul[15] = cmx_val.aa;
+
+		webgl.uniformMatrix4fv(prog_tx_uni.cmx_mul, false, cmx_mul);
+		webgl.uniform4f(prog_tx_uni.cmx_add, cmx_val.tr, cmx_val.tg, cmx_val.tb, cmx_val.ta);
+		webgl.uniform1i(prog_tx_uni.cmx_use, 1);
+	}
+
+	if (prog_tx_uni.r_s) {
+	 webgl.uniform1i(prog_tx_uni.r_s, tx.repeat_s);
+	 webgl.uniform1i(prog_tx_uni.r_t, tx.repeat_t);
+
+
+		let color = tx.get_pad_color();
+		let a = sys.color_component(color, 0);
+		let r = sys.color_component(color, 1);
+		let g = sys.color_component(color, 2);
+		let b = sys.color_component(color, 3);
+		webgl.uniform4f(prog_tx_uni.pad_color, r, g, b, a);
+	}
+}
+
+function canvas_set_matrix(cnv, mx, prog_info)
+{
+	if (!mx.is3D) {
+		if (cnv) {
+			cnv.matrix = mx;
+		} else {
+			const modelViewMatrix = new evg.Matrix(mx);
+			webgl.uniformMatrix4fv(prog_info.modelViewMatrix, false, modelViewMatrix.m);
+		}
+		return;
+	}
+ let fieldOfView = active_camera ? (active_camera.fov*Math.PI / 180) : (Math.PI / 4);
+ let aspect = (active_camera && active_camera.ar) ? active_camera.ar : (video_width / video_height);
+ let zNear = (active_camera && active_camera.znear) ? active_camera.znear : 0.1;
+ let zFar = (active_camera && active_camera.zfar) ? active_camera.zfar : (10 * (video_width>video_height ? video_width : video_height));
+
+ //pick view distance so that with no transformation, a rectangular scene with size 100%x100% is exactly fullscreen 
+	let final_z = video_height/2 / Math.tan(fieldOfView/2);
+	let pos = {x:0, y:0, z: final_z};
+	let center = {x:0, y:0, z: 0};
+	let up = {x:0, y:1, z: 0};
+
+ if (active_camera) {
+		if (active_camera.position && (active_camera.position.length==3)) {
+			pos.x = active_camera.position[0];
+			pos.y = active_camera.position[1];
+			pos.z = active_camera.position[2];
+		}
+		if (active_camera.target && (active_camera.target.length==3)) {
+			center.x = active_camera.target[0];
+			center.y = active_camera.target[1];
+			center.z = active_camera.target[2];
+		}
+		if (active_camera.up && (active_camera.up.length==3)) {
+			up.x = active_camera.up[0];
+			up.y = active_camera.up[1];
+			up.z = active_camera.up[2];
+		}
+	}
+
+ let projectionMatrix = new evg.Matrix().perspective(fieldOfView, aspect, zNear, zFar);
+ let modelViewMatrix = new evg.Matrix();
+
+ modelViewMatrix.lookat(pos, center, up);
+
+ modelViewMatrix.add(mx);
+
+ if (cnv) {
+	 projectionMatrix.add(modelViewMatrix, true);
+	 cnv.matrix3d = projectionMatrix;
+ }
+ //webgl
+ else {
+		webgl.uniformMatrix4fv(prog_info.projectionMatrix, false, projectionMatrix.m);
+	 webgl.uniformMatrix4fv(prog_info.modelViewMatrix, false, modelViewMatrix.m);
+ }
+
+ if (active_camera && active_camera.viewport && (active_camera.viewport.length==4)) {
+		let vp_x = active_camera.viewport[0];
+		let vp_y = active_camera.viewport[1];
+		let vp_w = active_camera.viewport[2];
+		let vp_h = active_camera.viewport[3];
+		if (active_camera.units == UNIT_RELATIVE) {
+			if (typeof vp_x == 'number') vp_x = vp_x * video_width / 100;
+			if (typeof vp_y == 'number') vp_y = vp_y * video_height / 100;
+			if (typeof vp_w == 'number') vp_w = vp_w * video_width / 100;
+			if (typeof vp_h == 'number') vp_h = vp_h * video_height / 100;
+		}
+
+		if (vp_x == 'y') vp_x = vp_y;
+		else if (vp_x == '-y') vp_x = -vp_y;
+		if (vp_y == 'x') vp_y = vp_x;
+		else if (vp_y == '-x') vp_y = -vp_x;
+		if (vp_w == 'height') vp_w = vp_h;
+		if (vp_h == 'width') vp_h = vp_w;
+
+		vp_x = video_width/2 + vp_x - vp_w/2;
+		vp_y = video_height/2 + vp_y - vp_h/2;
+
+	 if (cnv) {
+			vp_y = video_height - vp_y - vp_h;
+
+			if (round_scene_size) {
+				if (vp_x % 2) { vp_x--; vp_w++; };
+				if (vp_w % 2) vp_w--;
+				if (round_scene_size==2) {
+					if (vp_y % 2) { vp_y--; vp_h++; };
+					if (vp_h % 2) vp_h--;
+				}
+			}
+			cnv.viewport(vp_x, vp_y, vp_w, vp_h);
+	 } else {
+		 webgl.viewport(vp_x, vp_y, vp_w, vp_h);
+	 }
+ }
+
+}
+
+function canvas_draw(path, stencil)
+{
+	let uniform_reload = false;
+	//regular call
+	if (arguments.length==2) {
+		if (!path)
+			return;
+		if (!stencil) {
+			//this only happens if no more input pids for scene
+			draw_scene_no_signal();
+			return;
+		}
+		if (active_scene.mod.pids.length && active_scene.mod.pids[0].pid && active_scene.mod.pids[0].pid.source.no_signal) {
+			draw_scene_no_signal();
+			return;		
+		}
+		uniform_reload = active_scene.gl_uniforms_reload;
+	} else {
+		//group or no signal, always reload uniforms
+		uniform_reload = true;
+	}
+
+	let matrix = active_scene ? active_scene.mx : no_signal_transform;
+
+	if (!webgl) {
+	 canvas.path = path;
+	 canvas_set_matrix(canvas, matrix);
+	 canvas.fill(stencil);
+	 return;
+	}
+
+	let is_texture = stencil.width || 0;
+	let is_text = path.fontsize || 0;
+	let use_soft_raster = false;
+	if (!is_texture) {
+		if (stencil.solid_brush) {
+			use_soft_raster = (filter.gpu==2) ? false : true;
+		}
+		//we don't support gradients on GPU for now
+		else use_soft_raster = true;
+	}
+	//we only draw text through software rasterizer
+	else if (is_text) use_soft_raster = true;
+
+	if (mask_mode) {
+		use_soft_raster = false;
+	}
+
+	if (use_soft_raster) {
+		canvas_offscreen_activate();
+		if (canvas_offscreen.mask_mode != mask_mode) {
+			canvas_offscreen.mask_mode = mask_mode;
+		}
+	 canvas_offscreen.path = path;
+	 canvas_set_matrix(canvas_offscreen, matrix);
+	 canvas_offscreen.fill(stencil);
+		return;
+	}
+
+	canvas_offscreen_deactivate();
+
+	let mesh = path.mesh || null;
+	if (!mesh) {
+		mesh = path.mesh = new evg.Mesh(path);
+		if (!path.mesh) return;
+		path.mesh.update_gl();
+	}
+
+	if (is_texture) {
+		let texture = stencil._gl_texture || null;
+		if (!texture) {
+			stencil._gl_texture = webgl.createTexture(null);
+			if (!stencil._gl_texture) return;
+			stencil._gl_tx_id = webgl.textureName(stencil._gl_texture);
+
+			if (stencil._gl_program) {
+				stencil._gl_program = null;
+				print(GF_LOG_INFO, 'texture format change, reloading GLSL shader');
+			}
+			stencil._gl_modified = true;
+		}
+
+		if (stencil._gl_modified == true) {
+			webgl.bindTexture(webgl.TEXTURE_2D, stencil._gl_texture);
+	 stencil._gl_texture.upload(stencil);
+			stencil._gl_modified = false;
+		}
+	}
+
+	let prog_info = stencil._gl_program || null;
+ if (!stencil._gl_program) {
+		if (is_texture) {
+			let color_mx = stencil.cmx;
+			if (color_mx.identity) color_mx = null;
+
+			let fs_src = fs_source;
+
+			prog_info = stencil._gl_program = setup_webgl_program(vs_source, fs_src, stencil._gl_tx_id);
+			if (!stencil._gl_program) {
+				filter.abort();
+				return;
+			}
+		} else {
+			prog_info = stencil._gl_program = setup_webgl_program(vs_const_col, fs_const_col, null);
+			if (!stencil._gl_program) {
+				filter.abort();
+				return;
+			}
+		}
+		webgl.useProgram(prog_info.program);
+		webgl.uniform1f(prog_info.mask_w, video_width);
+		webgl.uniform1f(prog_info.mask_h, video_height);
+	}
+
+	let use_mask = 0;
+	if (mask_mode==GF_EVGMASK_DRAW) {
+	 mask_canvas.path = path;
+	 canvas_set_matrix(mask_canvas, matrix);
+	 mask_canvas.fill(stencil);
+		return;
+	}
+	else if ((mask_mode==GF_EVGMASK_USE) || (mask_mode==GF_EVGMASK_RECORD)) {
+	 use_mask = 1;
+	} else if (mask_mode==GF_EVGMASK_USE_INV) {
+	 use_mask = 2;
+	}
+
+ webgl.useProgram(prog_info.program);
+
+ webgl.viewport(0, 0, video_width, video_height);
+
+ if (wgl_clipper) {
+		webgl.enable(webgl.SCISSOR_TEST);
+
+		webgl.scissor(video_width/2 + wgl_clipper.x, wgl_clipper.y - wgl_clipper.h + video_height/2, wgl_clipper.w, wgl_clipper.h);
+ } else {
+		webgl.disable(webgl.SCISSOR_TEST);
+ }
+
+ //set transform
+	canvas_set_matrix(null, matrix, prog_info);
+
+ //set mask
+ webgl.uniform1i(prog_info.mask_mode, use_mask);
+
+	if (use_mask) {
+		let tx_slot = is_texture ? stencil._gl_texture.nb_textures : 0;
+
+	 webgl.activeTexture(webgl.TEXTURE0 + tx_slot);
+		webgl.bindTexture(webgl.TEXTURE_2D, mask_texture);
+		//not a named texture
+		webgl.texSubImage2D(webgl.TEXTURE_2D, 0, 0, 0, video_width, video_height,webgl.LUMINANCE, webgl.UNSIGNED_BYTE, mask_canvas_data);
+		webgl.uniform1i(prog_info.mask_tx, tx_slot);
+	}
+
+ if (is_texture) {
+		if (uniform_reload) {
+			push_texture_uniforms(stencil, prog_info.textures[0]);
+		}
+
+	 //set video texture
+	 webgl.activeTexture(webgl.TEXTURE0);
+	 webgl.bindTexture(webgl.TEXTURE_2D, stencil._gl_texture);
+		webgl.uniform1i(prog_info.textures[0].sampler, 0);
+
+		mesh.draw(webgl, prog_info.attribLocations.vertexPosition, prog_info.attribLocations.textureCoord);
+ } else {
+		if (uniform_reload) {
+			let color = stencil.get_color();
+			let alpha = stencil.get_alphaf();
+			let a = sys.color_component(color, 0) * alpha;
+			let r = sys.color_component(color, 1);
+			let g = sys.color_component(color, 2);
+			let b = sys.color_component(color, 3);
+			webgl.uniform4f(prog_info.color, r, g, b, a);
+		}
+
+		mesh.draw(webgl, prog_info.attribLocations.vertexPosition);
+ }
+ webgl.useProgram(null);
+	webgl.disable(webgl.SCISSOR_TEST);
+
+	//record mode, also draw using black stencil on mask canvas
+	if (mask_mode==GF_EVGMASK_RECORD) {
+	 mask_canvas.path = path;
+	 canvas_set_matrix(mask_canvas, matrix);
+	 mask_canvas.fill(mask_gl_stencil);
+	}
+}
+
+const transition_vs_source = `
+attribute vec4 aVertexPosition;
+attribute vec2 aTextureCoord;
+uniform mat4 uModelViewMatrix;
+uniform mat4 uProjectionMatrix;
+varying vec2 txcoord_from;
+varying vec2 txcoord_to;
+uniform mat4 textureMatrixFrom;
+uniform mat4 textureMatrixTo;
+void main() {
+ gl_Position = uProjectionMatrix * uModelViewMatrix * aVertexPosition;
+	txcoord_from = vec2(textureMatrixFrom * vec4(aTextureCoord.x, aTextureCoord.y, 0, 1) );
+	txcoord_to = vec2(textureMatrixTo * vec4(aTextureCoord.x, aTextureCoord.y, 0, 1) );
+}
+`;
+
+const single_in_op_vs_source = `
+attribute vec4 aVertexPosition;
+attribute vec2 aTextureCoord;
+uniform mat4 uModelViewMatrix;
+uniform mat4 uProjectionMatrix;
+varying vec2 txcoord_from;
+varying vec2 txcoord_op;
+uniform mat4 textureMatrixFrom;
+uniform mat4 textureMatrixOp;
+void main() {
+ gl_Position = uProjectionMatrix * uModelViewMatrix * aVertexPosition;
+	txcoord_from = vec2(textureMatrixFrom * vec4(aTextureCoord.x, aTextureCoord.y, 0, 1) );
+	txcoord_op = vec2(textureMatrixOp * vec4(aTextureCoord.x, aTextureCoord.y, 0, 1) );
+}
+`;
+
+
+const dual_in_op_vs_source = `
+attribute vec4 aVertexPosition;
+attribute vec2 aTextureCoord;
+uniform mat4 uModelViewMatrix;
+uniform mat4 uProjectionMatrix;
+varying vec2 txcoord_from;
+varying vec2 txcoord_to;
+varying vec2 txcoord_op;
+uniform mat4 textureMatrixFrom;
+uniform mat4 textureMatrixTo;
+uniform mat4 textureMatrixOp;
+void main() {
+ gl_Position = uProjectionMatrix * uModelViewMatrix * aVertexPosition;
+	txcoord_from = vec2(textureMatrixFrom * vec4(aTextureCoord.x, aTextureCoord.y, 0, 1) );
+	txcoord_to = vec2(textureMatrixTo * vec4(aTextureCoord.x, aTextureCoord.y, 0, 1) );
+	txcoord_op = vec2(textureMatrixOp * vec4(aTextureCoord.x, aTextureCoord.y, 0, 1) );
+}
+`;
+
+const fs_trans_source_prefix = `
+uniform sampler2D mask_tx;
+uniform int mask_mode;
+uniform float mask_w, mask_h;
+
+uniform vec4 pad_color;
+uniform bool r_s, r_t;
+uniform float ratio;
+uniform float video_ar;
+
+varying vec2 txcoord_from;
+uniform sampler2D maintx1;
+uniform float _alpha_from;
+uniform bool cmx1_use;
+uniform mat4 cmx1_mul;
+uniform vec4 cmx1_add;
+
+varying vec2 txcoord_to;
+uniform sampler2D maintx2;
+uniform float _alpha_to;
+uniform bool cmx2_use;
+uniform mat4 cmx2_mul;
+uniform vec4 cmx2_add;
+
+vec4 get_pixel_from(vec2 tx_coord)
+{
+	vec4 col;
+	if (!r_s && ((tx_coord.s<0.0) || (tx_coord.s>1.0))) {
+		col = pad_color;
+	} else if (!r_t && ((tx_coord.t<0.0) || (tx_coord.t>1.0))) {
+		col = pad_color;
+	} else {
+		vec2 tx = tx_coord;
+		while (tx.s<0.0) tx.s+= 1.0;
+		tx.s = mod(tx.s, 1.0);
+		while (tx.t<0.0) tx.t+= 1.0;
+		tx.t = mod(tx.t, 1.0);
+
+		col = texture2D(maintx1, tx);
+	}
+	if (cmx1_use) {
+		col = cmx1_mul * col;
+		col += cmx1_add;
+		col = clamp(col, 0.0, 1.0);
+	}
+	col.a *= _alpha_from;
+	return col;
+}
+
+vec4 get_pixel_to(vec2 tx_coord)
+{
+	vec4 col;
+	if (!r_s && ((tx_coord.s<0.0) || (tx_coord.s>1.0))) {
+		col = pad_color;
+	} else if (!r_t && ((tx_coord.t<0.0) || (tx_coord.t>1.0))) {
+		col = pad_color;
+	} else {
+		vec2 tx = tx_coord;
+		while (tx.s<0.0) tx.s+= 1.0;
+		tx.s = mod(tx.s, 1.0);
+		while (tx.t<0.0) tx.t+= 1.0;
+		tx.t = mod(tx.t, 1.0);
+
+		col = texture2D(maintx2, tx);
+	}
+	if (cmx2_use) {
+		col = cmx2_mul * col;
+		col += cmx2_add;
+		col = clamp(col, 0.0, 1.0);
+	}
+	col.a *= _alpha_to;
+	return col;
+}
+
+`;
+
+const fs_single_in_op_source_prefix = `
+uniform sampler2D mask_tx;
+uniform int mask_mode;
+uniform float mask_w, mask_h;
+
+varying vec2 txcoord_from;
+uniform sampler2D maintx1;
+uniform float _alpha_from;
+uniform bool cmx1_use;
+uniform mat4 cmx1_mul;
+uniform vec4 cmx1_add;
+
+uniform vec4 pad_color;
+uniform bool r_s, r_t;
+uniform float ratio;
+
+vec4 get_pixel_from(vec2 tx_coord)
+{
+	vec4 col;
+	if (!r_s && ((tx_coord.s<0.0) || (tx_coord.s>1.0))) {
+		col = pad_color;
+	} else if (!r_t && ((tx_coord.t<0.0) || (tx_coord.t>1.0))) {
+		col = pad_color;
+	} else {
+		vec2 tx = tx_coord;
+		while (tx.s<0.0) tx.s+= 1.0;
+		tx.s = mod(tx.s, 1.0);
+		while (tx.t<0.0) tx.t+= 1.0;
+		tx.t = mod(tx.t, 1.0);
+
+		col = texture2D(maintx1, tx);
+	}
+	if (cmx1_use) {
+		col = cmx1_mul * col;
+		col += cmx1_add;
+		col = clamp(col, 0.0, 1.0);
+	}
+	col.a *= _alpha_from;
+	return col;
+}
+
+`;
+
+
+function canvas_draw_sources(path)
+{
+	let scene = active_scene;
+	let pids = scene.mod.pids;
+
+	let op_type = 0;
+	let op_param = 0;
+	let op_tx = null;
+	if (arguments.length == 4) {
+		op_type = arguments[1];
+		op_param = arguments[2];
+		op_tx = arguments[3];
+	}
+
+
+	if (pids.length==0) {
+		print(GF_LOG_ERROR, 'Broken scene ' + scene.id + ': call to draw_sources without any source pid !');
+		scene.active=false;
+		return;
+	}
+	if ((pids.length==1) && !op_type) {
+		let tx = pids[0].texture;
+		//should not happen
+		if (!tx) return;
+
+		canvas_draw(path, tx);
+	 return; 
+	}
+
+	if (pids[0].pid.source.no_signal) {
+		draw_scene_no_signal();
+		return;
+	}
+
+	if (op_type) {
+	 if ((op_type == GF_EVG_OPERAND_MIX_DYN) || (op_type == GF_EVG_OPERAND_MIX_DYN_ALPHA)) {
+			if (pids.length<=1) {
+				print(GF_LOG_WARNING, 'Canvas multitexture fill with 3 textures but only 2 textures provided');
+				canvas_draw(path, pids[0].texture);
+				return;
+			}
+		}
+
+		if (!use_gpu) {
+			let mx = op_tx.mx;
+
+			canvas_set_matrix(canvas, active_scene.mx);
+		 canvas.path = path;
+		 if ((op_type == GF_EVG_OPERAND_MIX_DYN) || (op_type == GF_EVG_OPERAND_MIX_DYN_ALPHA)) {
+			 canvas.fill(op_type, [op_param], pids[0].texture, pids[1].texture, op_tx);
+		 } else {
+			 canvas.fill(op_type, [op_param], pids[0].texture, op_tx);
+		 }
+			return;
+		}
+	}
+
+	if (pids[0].pid && pids[0].pid.source.sequence.transition_state==4) {
+		print(GF_LOG_DEBUG, 'transition in error, using simple draw');
+		canvas_draw(path, pids[0].texture);
+		return;
+	}
+
+	if (!op_type && pids[1].pid && pids[1].pid.source.no_signal) {
+		draw_scene_no_signal();
+		return;
+	}
+
+	let transition = null;
+	let seq = null;
+	let ratio = 0;
+
+	if (pids[0].pid.source.sequence.transition_state==3) {
+		seq = pids[0].pid.source.sequence;
+		transition = seq.transition;
+
+		let time = video_time - seq.transition_start;
+		//in sec
+		time /= video_timescale;
+
+		//as fraction
+		ratio = time / seq.transition_dur;
+	} else if (scene.transition) {
+		let skip_tansition = !use_gpu;
+		transition = scene.transition;
+		ratio = scene.mod.mix_ratio;
+		if (ratio<0) ratio = 0;
+		else if (ratio>1) ratio = 1;
+
+		if (pids[0].pid) pids[0].pid.source.mix_volume = 1-ratio;
+		if (pids[1].pid) pids[1].pid.source.mix_volume = ratio;
+
+		if (scene.transition_state==4) {
+			if (ratio>0.5) ratio = 1;
+			else ratio = 0;
+			skip_tansition = true;
+		}
+
+		//for gpu we must setup the program and use it
+		if (skip_tansition) {
+			if (ratio==0) {
+				canvas_draw(path, pids[0].texture);
+				return;
+			}
+			if (ratio==1) {
+				canvas_draw(path, pids[1].texture);
+				return;
+			}
+		}
+	}
+
+	if (!op_type && !transition) {
+		canvas_draw(path, pids[0].texture);
+		return;
+	}
+
+	if (transition && transition.fun) {
+		let old_ratio = ratio;
+		try {
+			ratio = transition.fun.apply(transition, [ratio]);
+			if (typeof ratio != 'number')
+				throw 'Ratio function result is not a number !';
+		} catch (e) {
+			print(GF_LOG_WARNING, 'Error processing transition fun ' + transition.fun + ': ' + e);
+			transition.fun = null;
+		}
+		if (!old_ratio) ratio = 0;
+		else if (!old_ratio==1) ratio = 1;
+	}
+
+	if (!use_gpu) {
+		if (!pids[0].texture || !pids[1].texture) {
+			canvas_draw(path, pids[0].texture);
+			return;
+		}
+		canvas_set_matrix(canvas, active_scene.mx);
+
+		transition.mod.apply(canvas, ratio, path, pids);
+		return;
+	}
+
+	//gpu: create mesh, bind textures, call apply and draw mesh
+
+	let use_mask = 0;
+	if ((mask_mode==GF_EVGMASK_DRAW) || (mask_mode==GF_EVGMASK_RECORD)) {
+	 mask_canvas.path = path;
+	 canvas_set_matrix(mask_canvas, matrix);
+	 mask_canvas.fill(pids[0].texture);
+	 if (mask_mode==GF_EVGMASK_DRAW) return;
+	 use_mask = 1;
+	}
+	else if (mask_mode==GF_EVGMASK_USE) {
+	 use_mask = 1;
+	} else if (mask_mode==GF_EVGMASK_USE_INV) {
+	 use_mask = 2;
+	}
+
+	canvas_offscreen_deactivate();
+
+	let mesh = path.mesh || null;
+	if (!mesh) {
+		mesh = path.mesh = new evg.Mesh(path);
+		if (!path.mesh) return;
+		path.mesh.update_gl();
+	}
+
+	//setup all textures
+	let tx_slot = 0;
+	let all_textures = [];
+	pids.forEach (pid => {
+			all_textures.push(pid.texture);
+	});
+	if (op_tx)
+		all_textures.push(op_tx);
+
+	all_textures.forEach (tx => {
+		let texture = tx._gl_texture || null;
+
+		webgl.activeTexture(webgl.TEXTURE0 + tx_slot);
+
+		if (!texture) {
+			tx._gl_texture = webgl.createTexture(null);
+			if (!tx._gl_texture) return;
+			tx._gl_tx_id = webgl.textureName(tx._gl_texture);
+
+			if (transition && transition.gl_program) {
+				print(GF_LOG_INFO, 'texture format changed, reloading GLSL program');
+				transition.gl_program = null;
+			}
+			if (active_scene && active_scene.gl_program) {
+				print(GF_LOG_INFO, 'texture format changed, reloading GLSL program');
+				active_scene.gl_program = null;
+			}
+			tx._gl_modified = true;
+		}
+		//upload data if modified
+		if (tx._gl_modified == true) {
+			webgl.bindTexture(webgl.TEXTURE_2D, tx._gl_texture);
+			tx._gl_texture.upload(tx);
+			tx._gl_modified = false;
+		}
+
+		tx_slot += tx._gl_texture.nb_textures;
+	});
+
+
+	//check program is still OK
+	let prog_info;
+	if (transition) {
+		prog_info = transition.gl_program || null;
+	} else {
+		prog_info = active_scene.gl_program || null;
+	}
+
+	//create program
+	if (!prog_info) {
+		let frag_source;
+		let has_dual_in = false;
+		let op_tx_reuse = 0;
+		let tx_source = '';
+		let vertex_src;
+
+		if (transition) {
+			tx_source = transition.mod.get_shader_src( pids[0].texture );
+			if (typeof tx_source != 'string') {
+				print(GF_LOG_ERROR, 'Aborting transition, invalid shader source ' + tx_source);
+				if (seq)
+					seq.transition_state = 4;
+				else
+					scene.transition_state = 4;
+				return;
+			}
+
+			let first_uni = tx_source.indexOf('uniform');
+			if (first_uni>0) {
+				let head = tx_source.slice(0, first_uni);
+				let tail = tx_source.slice(first_uni);
+				frag_source = head + fs_trans_source_prefix + tail;
+			} else {
+				frag_source = fs_trans_source_prefix + tx_source;
+			}
+			has_dual_in = true;
+
+			vertex_src = transition_vs_source;
+		} else {
+			 if ((op_type == GF_EVG_OPERAND_MIX_DYN) || (op_type == GF_EVG_OPERAND_MIX_DYN_ALPHA)) {
+					has_dual_in = true;
+					frag_source = fs_trans_source_prefix;
+					vertex_src = dual_in_op_vs_source;
+				} else {
+					frag_source = fs_single_in_op_source_prefix;
+					vertex_src = single_in_op_vs_source;
+				}
+		}
+
+		//replace maintx1 by first texture name
+		frag_source = frag_source.replaceAll('maintx1', pids[0].texture._gl_tx_id);
+
+		//replace maintx2 by second texture name
+		if (has_dual_in)
+			frag_source = frag_source.replaceAll('maintx2', pids[1].texture._gl_tx_id);
+
+
+		//replace op
+		if (!transition) {
+			if (op_tx._gl_tx_id == pids[0].texture._gl_tx_id) {
+				op_tx_reuse = 1;
+				frag_source += `
+vec4 gf_apply_effect()
+{
+	vec4 col_1 = get_pixel_from(txcoord_from);
+	vec4 col_op = col_1;
+`;
+
+			} else if (has_dual_in && (op_tx._gl_tx_id == pids[1].texture._gl_tx_id)) {
+				op_tx_reuse = 2;
+				frag_source += `
+vec4 gf_apply_effect()
+{
+	vec4 col_1 = get_pixel_from(txcoord_from);
+`;
+
+			} else {
+				frag_source += `
+varying vec2 txcoord_op;
+uniform sampler2D optx;
+uniform float _alpha_op;
+uniform bool r_s_op, r_t_op;
+uniform vec4 pad_color_op;
+
+uniform bool cmx_op_use;
+uniform mat4 cmx_op_mul;
+uniform vec4 cmx_op_add;
+
+vec4 get_pixel_op(vec2 tx_coord)
+{
+	vec4 col;
+	if (!r_s_op && ((tx_coord.s<0.0) || (tx_coord.s>1.0))) {
+		col = pad_color_op;
+	} else if (!r_t_op && ((tx_coord.t<0.0) || (tx_coord.t>1.0))) {
+		col = pad_color_op;
+	} else {
+		vec2 tx = tx_coord;
+		while (tx.s<0.0) tx.s+= 1.0;
+		tx.s = mod(tx.s, 1.0);
+		while (tx.t<0.0) tx.t+= 1.0;
+		tx.t = mod(tx.t, 1.0);
+
+		col = texture2D(optx, tx);
+	}
+	if (cmx_op_use) {
+		col = cmx_op_mul * col;
+		col += cmx_op_add;
+		col = clamp(col, 0.0, 1.0);
+	}
+	col.a *= _alpha_op;
+	return col;
+}
+
+vec4 gf_apply_effect()
+{
+	vec4 col_1 = get_pixel_from(txcoord_from);
+	vec4 col_op = get_pixel_op(txcoord_op);
+`;
+				frag_source = frag_source.replaceAll('optx', op_tx._gl_tx_id);
+			}
+
+			if (has_dual_in) {
+				frag_source += `	vec4 col_2 = get_pixel_to(txcoord_to);
+`;
+				if (op_tx_reuse == 2) {
+					frag_source += `	vec4 col_op = col_2;
+`;
+				}
+			}
+
+			if ((op_type == GF_EVG_OPERAND_REPLACE_ALPHA) || (op_type == GF_EVG_OPERAND_REPLACE_ONE_MINUS_ALPHA)
+				|| (op_type == GF_EVG_OPERAND_MIX_DYN) || (op_type == GF_EVG_OPERAND_MIX_DYN_ALPHA)
+			) {
+				let rep = 'a';
+				if (op_param >= 3) rep = 'b';
+				else if (op_param >= 2) rep = 'g';
+				else if (op_param >= 1) rep = 'r';
+
+				if (op_type == GF_EVG_OPERAND_REPLACE_ALPHA)
+					frag_source += `	col_1.a = col_op.`+rep+`;`;
+				else if (op_type == GF_EVG_OPERAND_REPLACE_ONE_MINUS_ALPHA)
+					frag_source += `	col_1.a = 1.0 - col_op.`+rep+`;`;
+				else if (op_type == GF_EVG_OPERAND_MIX_DYN)
+					frag_source += `	col_1 = mix(col_1, col_2, col_op.`+rep+`); col_1.a = 1.0;`;
+				else //(op_type == GF_EVG_OPERAND_MIX_DYN)
+					frag_source += `	col_1 = mix(col_1, col_2, col_op.`+rep+`);`;
+			} else if (op_type == GF_EVG_OPERAND_MIX) {
+				frag_source += `	col_1 = mix(col_1, col_op, ratio); col_1.a = 1.0;`;
+			} else if (op_type == GF_EVG_OPERAND_MIX_ALPHA) {
+				frag_source += `	col_1 = mix(col_1, col_op, ratio);`;
+			}
+
+			frag_source += `
+	return col_1;
+}
+`;
+		}
+
+		frag_source += `
+void main() {
+	if (mask_mode>0) {
+		vec2 mask_uv = vec2(gl_FragCoord.x/mask_w, 1.0 - gl_FragCoord.t/mask_h);
+		vec4 mask = texture2D(mask_tx, mask_uv);
+		vec4 col = gf_apply_effect();
+
+		if (mask_mode>1)
+			col.a *= (1.0-mask.r);
+		else
+			col.a *= mask.r;
+
+	 gl_FragColor = col;
+	} else {
+		gl_FragColor = gf_apply_effect();
+	}
+}
+`
+
+		const shaderProgram = webgl_init_shaders(vertex_src, frag_source, null);
+		if (!shaderProgram) {
+			print(GF_LOG_ERROR, 'shader creation failed, aborting transition');
+			if (seq)
+				seq.transition_state = 4;
+			else
+				scene.transition_state = 4;
+			return;
+		}
+
+		prog_info = {
+			program: shaderProgram,
+			vertexPosition: webgl.getAttribLocation(shaderProgram, 'aVertexPosition'),
+			textureCoord: webgl.getAttribLocation(shaderProgram, 'aTextureCoord'),
+			projectionMatrix: webgl.getUniformLocation(shaderProgram, 'uProjectionMatrix'),
+			modelViewMatrix: webgl.getUniformLocation(shaderProgram, 'uModelViewMatrix'),
+			mask_mode: webgl.getUniformLocation(shaderProgram, 'mask_mode'),
+			mask_tx: webgl.getUniformLocation(shaderProgram, 'mask_tx'),
+			mask_w: webgl.getUniformLocation(shaderProgram, 'mask_w'),
+			mask_h: webgl.getUniformLocation(shaderProgram, 'mask_h'),
+			ratio: webgl.getUniformLocation(shaderProgram, 'ratio'),
+			//used by gl-transitions
+			video_ar: webgl.getUniformLocation(shaderProgram, 'video_ar'),
+			textures: [
+				{
+					sampler: webgl.getUniformLocation(shaderProgram, pids[0].texture._gl_tx_id),
+			 matrix: webgl.getUniformLocation(shaderProgram, 'textureMatrixFrom'),
+			 alpha: webgl.getUniformLocation(shaderProgram, '_alpha_from'),
+					cmx_use: webgl.getUniformLocation(shaderProgram, 'cmx1_use'),
+					cmx_mul: webgl.getUniformLocation(shaderProgram, 'cmx1_mul'),
+					cmx_add: webgl.getUniformLocation(shaderProgram, 'cmx1_add'),
+					r_s: webgl.getUniformLocation(shaderProgram, 'r_s'),
+					r_t: webgl.getUniformLocation(shaderProgram, 'r_t'),
+					pad_color: webgl.getUniformLocation(shaderProgram, 'pad_color'),
+				}
+				]
+		};
+
+		if (has_dual_in) {
+			prog_info.textures.push(
+				{
+					sampler: webgl.getUniformLocation(shaderProgram, pids[1].texture._gl_tx_id),
+			 matrix: webgl.getUniformLocation(shaderProgram, 'textureMatrixTo'),
+			 alpha: webgl.getUniformLocation(shaderProgram, '_alpha_to'),
+					cmx_use: webgl.getUniformLocation(shaderProgram, 'cmx2_use'),
+					cmx_mul: webgl.getUniformLocation(shaderProgram, 'cmx2_mul'),
+					cmx_add: webgl.getUniformLocation(shaderProgram, 'cmx2_add'),
+					r_s: null,
+					r_t: null,
+					pad_color: null,
+				} );
+		}
+
+		prog_info.op_texture = null;
+		if (!transition && op_tx) {
+				if (op_tx_reuse) {
+					prog_info.op_texture = null;
+				} else {
+					prog_info.op_texture = {
+						sampler: webgl.getUniformLocation(shaderProgram, op_tx._gl_tx_id),
+				 matrix: webgl.getUniformLocation(shaderProgram, 'textureMatrixOp'),
+				 alpha: webgl.getUniformLocation(shaderProgram, '_alpha_op'),
+						cmx_use: webgl.getUniformLocation(shaderProgram, 'cmx_op_use'),
+						cmx_mul: webgl.getUniformLocation(shaderProgram, 'cmx_op_mul'),
+						cmx_add: webgl.getUniformLocation(shaderProgram, 'cmx_op_add'),
+				 r_s: webgl.getUniformLocation(shaderProgram, 'r_s_op'),
+				 r_t: webgl.getUniformLocation(shaderProgram, 'r_t_op'),
+				 pad_color: webgl.getUniformLocation(shaderProgram, 'pad_color_op'),
+					};
+				}
+		}
+
+
+		if (transition)
+			transition.gl_program = prog_info;
+		else
+			active_scene.gl_program = prog_info;
+
+		webgl.useProgram(prog_info.program);
+		webgl.uniformMatrix4fv(prog_info.projectionMatrix, false, defaultOrthoProjectionMatrix.m);
+	 webgl.uniform1f(prog_info.mask_w, video_width);
+	 webgl.uniform1f(prog_info.mask_h, video_height);
+
+		if (transition) {
+			let nb_in_tx = has_dual_in ? 2 : 1;
+			tx_slot = 0;
+			for (let i=0; i<nb_in_tx; i++) {
+				let pid = pids[i];
+				tx_slot += pid.texture._gl_texture.nb_textures;
+			}
+			transition.mod.setup_gl(webgl, shaderProgram, prog_info.ratio, tx_slot);
+		}
+
+		if (prog_info.video_ar)
+			webgl.uniform1f(prog_info.video_ar, pids[0].texture.width / pids[0].texture.height);
+
+		active_scene.gl_uniforms_reload = true;
+	}
+
+	webgl.useProgram(prog_info.program);
+	webgl.viewport(0, 0, video_width, video_height);
+
+	let nb_in_tx = (transition || (prog_info.textures.length==2)) ? 2 : 1;
+
+ if (wgl_clipper) {
+		webgl.enable(webgl.SCISSOR_TEST);
+		webgl.scissor(video_width/2 + wgl_clipper.x, wgl_clipper.y - wgl_clipper.h + video_height/2, wgl_clipper.w, wgl_clipper.h);
+ } else {
+		webgl.disable(webgl.SCISSOR_TEST);
+ }
+
+	//set transform
+	canvas_set_matrix(null, active_scene.mx, prog_info);
+
+	if (!transition) ratio = active_scene.mod.mix_ratio;
+
+	webgl.uniform1f(prog_info.ratio, ratio);
+
+	tx_slot = 0;
+	//set alpha and texture transforms per pid - 2 max
+	for (let i=0; i<nb_in_tx; i++) {
+		let pid = pids[i];
+
+		if (active_scene.gl_uniforms_reload) {
+			push_texture_uniforms(pid.texture, prog_info.textures[i]);
+	 }
+
+		webgl.activeTexture(webgl.TEXTURE0 + tx_slot);
+		//and bind our named texture (this will setup active texture slots)
+		webgl.bindTexture(webgl.TEXTURE_2D, pid.texture._gl_texture);
+		webgl.uniform1i(prog_info.textures[i].sampler, tx_slot);
+
+		tx_slot += pid.texture._gl_texture.nb_textures;
+	}
+
+	//set op texture
+	if (op_tx && prog_info.op_texture) {
+		if (active_scene.gl_uniforms_reload) {
+			push_texture_uniforms(op_tx, prog_info.op_texture);
+		}
+
+		webgl.activeTexture(webgl.TEXTURE0 + tx_slot);
+		//and bind our named texture (this will setup active texture slots)
+		webgl.bindTexture(webgl.TEXTURE_2D, op_tx._gl_texture);
+		webgl.uniform1i(prog_info.op_texture.sampler, tx_slot);
+
+		tx_slot += op_tx._gl_texture.nb_textures;
+	}
+
+ //set mask
+ webgl.uniform1i(prog_info.mask_mode, use_mask);
+	if (use_mask) {
+	 webgl.activeTexture(webgl.TEXTURE0 + tx_slot);
+		webgl.bindTexture(webgl.TEXTURE_2D, mask_texture);
+		//not a named texture
+		webgl.texSubImage2D(webgl.TEXTURE_2D, 0, 0, 0, video_width, video_height,webgl.LUMINANCE, webgl.UNSIGNED_BYTE, mask_canvas_data);
+		webgl.uniform1i(prog_info.mask_tx, tx_slot);
+	}
+
+	//apply transition, ie set uniforms
+	if (transition) {
+		transition.mod.apply(webgl, ratio, path, pids);
+	}
+
+	mesh.draw(webgl, prog_info.vertexPosition, prog_info.textureCoord);
+	webgl.useProgram(null);
+}
+
+
+function canvas_blit(stencil, dst_rc)
+{
+	if (webgl) {
+			print(GF_LOG_ERROR, 'Broken scene ' + active_scene.id + ': call to blit in GPU context');
+			active_scene.active=false;
+			return;
+	}
+ canvas.blit(stencil, dst_rc, null);
+}
+
+
+
+const vs_source = `
+attribute vec4 aVertexPosition;
+attribute vec2 aTextureCoord;
+uniform mat4 uModelViewMatrix;
+uniform mat4 uProjectionMatrix;
+uniform mat4 textureMatrix;
+varying vec2 vTextureCoord;
+
+void main() {
+ gl_Position = uProjectionMatrix * uModelViewMatrix * aVertexPosition;
+	vTextureCoord = vec2(textureMatrix * vec4(aTextureCoord.x, aTextureCoord.y, 0, 1) );
+}
+`;
+
+const fs_source = `
+uniform sampler2D mask_tx;
+uniform int mask_mode;
+uniform float mask_w, mask_h;
+
+uniform bool r_s, r_t;
+uniform vec4 pad_color;
+varying vec2 vTextureCoord;
+uniform sampler2D maintx;
+uniform float alpha;
+uniform bool cmx_use;
+uniform mat4 cmx_mul;
+uniform vec4 cmx_add;
+void main(void) {
+
+	vec4 col;
+	if (!r_s && ((vTextureCoord.s<0.0) || (vTextureCoord.s>1.0))) {
+		col = pad_color;
+	} else if (!r_t && ((vTextureCoord.t<0.0) || (vTextureCoord.t>1.0))) {
+		col = pad_color;
+	} else {
+		vec2 tx = vTextureCoord;
+		while (tx.s<0.0) tx.s+= 1.0;
+		tx.s = mod(tx.s, 1.0);
+		while (tx.t<0.0) tx.t+= 1.0;
+		tx.t = mod(tx.t, 1.0);
+
+		col = texture2D(maintx, tx);
+	}
+	if (cmx_use) {
+		col = cmx_mul * col;
+		col += cmx_add;
+		col = clamp(col, 0.0, 1.0);
+	}
+	col.a *= alpha;
+
+	if (mask_mode>0) {
+		vec2 mask_uv = vec2(gl_FragCoord.x/mask_w, 1.0 - gl_FragCoord.t/mask_h);
+		vec4 mask = texture2D(mask_tx, mask_uv);
+		float m;
+		if (mask_mode>1)
+			col.a *= (1.0-mask.r);
+		else
+			col.a *= mask.r;
+	}
+ gl_FragColor = col;
+}
+`;
+
+
+const vs_const_col = `
+attribute vec4 aVertexPosition;
+uniform mat4 uModelViewMatrix;
+uniform mat4 uProjectionMatrix;
+
+void main() {
+ gl_Position = uProjectionMatrix * uModelViewMatrix * aVertexPosition;
+}
+`;
+
+
+const fs_const_col = `
+uniform sampler2D mask_tx;
+uniform int mask_mode;
+uniform float mask_w, mask_h;
+
+uniform vec4 color;
+void main(void) {
+
+	if (mask_mode>0) {
+		vec4 col = color;
+		vec2 mask_uv = vec2(gl_FragCoord.x/mask_w, 1.0 - gl_FragCoord.t/mask_h);
+		vec4 mask = texture2D(mask_tx, mask_uv);
+		if (mask_mode>1)
+			col.a *= (1.0-mask.r);
+		else
+			col.a *= mask.r;
+
+	 gl_FragColor = col;
+	} else {
+	 gl_FragColor = color;
+	}
+}
+`;
+
+
+function webgl_load_shader(type, source, tx_name) {
+ const shader = webgl.createShader(type);
+
+ if (tx_name) {
+ 	source = source.replaceAll('maintx', tx_name);
+ }
+ webgl.shaderSource(shader, source);
+ webgl.compileShader(shader);
+ if (!webgl.getShaderParameter(shader, webgl.COMPILE_STATUS)) {
+ print(GF_LOG_ERROR, 'An error occurred compiling the shaders ' + type + ' : ' + webgl.getShaderInfoLog(shader));
+ print(GF_LOG_WARNING, 'Shader was \n' + source);
+ webgl.deleteShader(shader);
+ return null;
+ }
+ return shader;
+}
+
+function webgl_init_shaders(vsSource, fsSource, tx_name) {
+ const vertexShader = webgl_load_shader(webgl.VERTEX_SHADER, vsSource, null);
+ const fragmentShader = webgl_load_shader(webgl.FRAGMENT_SHADER, fsSource, tx_name);
+
+ if (!vertexShader || !fragmentShader) return null;
+
+ const shaderProgram = webgl.createProgram();
+ webgl.attachShader(shaderProgram, vertexShader);
+ webgl.attachShader(shaderProgram, fragmentShader);
+ webgl.linkProgram(shaderProgram);
+
+ if (!webgl.getProgramParameter(shaderProgram, webgl.LINK_STATUS)) {
+ print(GF_LOG_ERROR, 'Unable to initialize the shader program: ' + webgl.getProgramInfoLog(shaderProgram));
+ return null;
+ }
+ return shaderProgram;
+}
+
+
+function setup_webgl_program(vsSource, fsSource, tx_name)
+{
+ const shaderProgram = webgl_init_shaders(vsSource, fsSource, tx_name);
+ let prog = {
+ program: shaderProgram,
+ attribLocations: {
+ vertexPosition: webgl.getAttribLocation(shaderProgram, 'aVertexPosition'),
+ },
+ projectionMatrix: webgl.getUniformLocation(shaderProgram, 'uProjectionMatrix'),
+ modelViewMatrix: webgl.getUniformLocation(shaderProgram, 'uModelViewMatrix'),
+ mask_mode: webgl.getUniformLocation(shaderProgram, 'mask_mode'),
+ mask_w: webgl.getUniformLocation(shaderProgram, 'mask_w'),
+ mask_h: webgl.getUniformLocation(shaderProgram, 'mask_h'),
+		mask_tx: webgl.getUniformLocation(shaderProgram, "mask_tx")
+ };
+
+ if (tx_name) {
+ 	prog.attribLocations.textureCoord = webgl.getAttribLocation(shaderProgram, 'aTextureCoord');
+ 	prog.textures = [
+			{
+				sampler: webgl.getUniformLocation(shaderProgram, tx_name),
+				matrix: webgl.getUniformLocation(shaderProgram, 'textureMatrix'),
+				alpha: webgl.getUniformLocation(shaderProgram, 'alpha'),
+				r_s: webgl.getUniformLocation(shaderProgram, 'r_s'),
+				r_t: webgl.getUniformLocation(shaderProgram, 'r_t'),
+				pad_color: webgl.getUniformLocation(shaderProgram, 'pad_color'),
+				cmx_use: webgl.getUniformLocation(shaderProgram, 'cmx_use'),
+				cmx_mul: webgl.getUniformLocation(shaderProgram, 'cmx_mul'),
+				cmx_add: webgl.getUniformLocation(shaderProgram, 'cmx_add'),
+			}
+		];
+ } else {
+ prog.color = webgl.getUniformLocation(shaderProgram, 'color');
+ }
+
+ //load default texture matrix (identity)
+ webgl.useProgram(shaderProgram);
+	let ident = new evg.Matrix();
+	webgl.uniformMatrix4fv(prog.modelViewMatrix, false, ident.m);
+ webgl.uniformMatrix4fv(prog.projectionMatrix, false, defaultOrthoProjectionMatrix.m);
+ webgl.uniform1i(prog.mask_mode, 0);
+ if (tx_name) {
+	 webgl.uniformMatrix4fv(prog.textures[0].matrix, false, ident.m);
+	 webgl.uniform1f(prog.textures[0].alpha, 1.0);
+	 webgl.uniform1i(prog.textures[0].cmx_use, 0);
+	}
+ webgl.useProgram(null);
+
+ return prog;
+}
+
+
+function apply_transition_options(seq, opts, strict)
+{
+	//parse all params
+	opts.forEach(o => {
+		seq.transition.mod[o.name] = o.value;
+		let typ = typeof seq.transition_effect[o.name];
+		if (typ != 'undefined') {
+			if (typ == typeof o.value) {
+				if (strict && Array.isArray(o.value) ) {
+					if (o.value.length == seq.transition_effect[o.name].length) {
+						seq.transition.mod[o.name] = seq.transition_effect[o.name];
+					} else {
+						print(GF_LOG_WARNING, 'Array length mismatch for transition ' + seq.transition.type + '.' + o.name + ': got ' + seq.transition_effect[o.name].length + ', expecting ' + o.value.length + ', ignoring');
+					}
+				} else {
+					seq.transition.mod[o.name] = seq.transition_effect[o.name];
+				}
+			} else {
+				print(GF_LOG_WARNING, 'Type mismatch for transition ' + seq.transition.type + '.' + o.name + ': got ' + typ + ', expecting ' + typeof o.value + ', ignoring');
+			}
+		}
+	});
+}
+
+function setup_transition(seq)
+{
+	/*builtin parameters*/
+	seq.transition.fun = (typeof seq.transition_effect.fun == 'string') ? fn_from_script(['ratio'], seq.transition_effect.fun) : null;
+	seq.transition.id = (typeof seq.transition_effect.id == 'string') ? seq.transition_effect.id : null;
+
+	seq.transition.mod.update_flag = 0;
+	//parse all params
+	apply_transition_options(seq, seq.transition.options, false);
+
+	//parse all per-instance params
+	if (Array.isArray(seq.transition.mod.options)) {
+		apply_transition_options(seq, seq.transition.mod.options, true);
+	}
+
+	for (var propertyName in seq.transition_effect) {
+		if (propertyName == 'type') continue;
+		if (propertyName == 'dur') continue;
+		if (propertyName == 'fun') continue;
+		if (propertyName == 'id') continue;
+		if (propertyName.charAt(0) == '_') continue;
+		if (typeof seq.transition.mod[propertyName] != 'undefined') continue;
+
+		print(GF_LOG_WARNING, 'Unrecognized transition option ' + propertyName + ' for ' + seq.transition.type);
+	}
+	seq.transition.gl_program = null;
+	if (!use_gpu)
+		seq.transition.mod.setup();
+}
+
+function default_transition(canvas, ratio, path, pids)
+{
+		canvas_draw(path, pids[0].texture);
+}
+
+function load_transition(seq)
+{
+	let type = seq.transition_effect.type || null;
+	if (!type) return false;
+
+	let script_src = sys.url_cat(playlist_url, type);
+	if (! sys.file_exists(script_src)) {
+		script_src = filter.jspath + 'transitions/' + type + '.js';
+
+		if (! sys.file_exists(script_src)) {
+			print(GF_LOG_ERROR, 'No such transition effect ' + script_src);
+			return false;
+		}
+	}
+
+	if (seq.transition && (seq.transition.type == type)) {
+		setup_transition(seq);
+		return true;
+	}
+
+
+	modules_pending ++;
+	seq.transition = {};
+	seq.transition.type = type;
+
+	import(script_src)
+		 .then(obj => {
+		 		modules_pending--;
+		 		print(GF_LOG_DEBUG, 'Module ' + script_src + ' loaded');
+					seq.transition.mod = obj.load(seq.transition_effect);
+
+		 		let has_gl = 0;
+
+		 		//can do gl
+		 		if (typeof seq.transition.mod.get_shader_src == 'function') {
+		 			has_gl = 1;
+			 		if (typeof seq.transition.mod.setup != 'function')
+			 			has_gl = 2;
+		 		}
+
+		 		if (use_gpu) {
+		 			if (!has_gl) {
+		 				seq.transition_state = 4;
+		 				print(GF_LOG_WARNING, 'Transition ' + type + ' cannot run in GPU mode, disabling');
+		 				return;
+		 			}
+			 		if (typeof seq.transition.mod.setup_gl != 'function')
+			 				seq.transition.mod.setup_gl = function () {};
+		 		} else {
+		 			if (has_gl==2) {
+		 				seq.transition_state = 4;
+		 				print(GF_LOG_WARNING, 'Transition ' + type + ' cannot run in non-GPU mode, disabling');
+		 				return;
+			 		} else if (typeof seq.transition.mod.setup != 'function') {
+				 		print(GF_LOG_ERROR, "Missing setup function for transition '" + type + "', disabling transition");
+				 		seq.transition_state = 4;
+				 		return;
+			 		}
+		 		}
+
+		 		if (typeof seq.transition.mod.apply != 'function')
+		 				seq.transition.mod.apply = default_transition;
+
+		 		seq.transition.options = obj.options || null;
+		 		setup_transition(seq);
+		 })
+		 .catch(err => {
+		 		modules_pending--;
+		 		print(GF_LOG_ERROR, "Failed to load transition '" + type + "': " + err);
+		 		seq.transition_state = 4;
+		 });
+
+	return true;
+}
+
+
+function get_media_time()
+{
+	let media_time = -4;
+	if ((arguments.length == 1) && arguments[0]) {
+		let s = get_source(arguments[0], null);
+		if (!s) return -4;
+		if (!s.playing) return -3;
+		if (s.in_prefetch) return -1;
+		if (!s.timeline_init) return -2;
+
+		media_time = s.pids[0].pck.cts / s.pids[0].timescale;
+	} else if (video_playing) {
+		media_time = video_time / video_timescale;
+	} else {
+		media_time = audio_time / audio_timescale;
+	}
+	return media_time;
+}
+
+function resolve_url(url)
+{
+	return sys.url_cat(playlist_url, url);
+}
+
+function apply_transition_update(transition, prop_name, value)
+{
+	if ((prop_name=='dur')) {
+		if (typeof value == 'number') {
+			transition.dur = value;
+		} else {
+			print(GF_LOG_ERROR, 'Wrong type ' + typeof value + ' for transition.dur');
+			return false;
+		}
+	}
+	else if ((prop_name=='type')) {
+		if (typeof value == 'string') {
+			transition.type = value;
+		} else {
+			print(GF_LOG_ERROR, 'Wrong type ' + typeof value + ' for transition.type');
+			return false;
+		}
+	} else {
+		//blindly updat the transition
+		transition[prop_name] = value;
+	}
+	return true;
+}
+
+function check_prop_type(orig, final, allow_string)
+{
+	if (orig == final) return true;
+	if (! allow_string) return false;
+	if ((final != 'number') && (final != 'string')) return false;
+	if ((orig != 'number') && (orig != 'string')) return false;
+	return true;
+}
+
+function parse_update_elem(pl, array)
+{
+	if (pl.skip || false)
+		return true;
+
+	if (typeof pl.replace != 'string') {
+		print(GF_LOG_WARNING, "Invalid replace command " + JSON.stringify(pl));
+		return false;
+	}
+	if (typeof pl.with == 'undefined') {
+		print(GF_LOG_WARNING, "Invalid replace command " + JSON.stringify(pl));
+		return false;
+	}
+	let src = pl.replace.split('@');
+	if (src.length != 2) {
+		print(GF_LOG_WARNING, "Invalid replace syntax " + src + ', expecting \`ID@name\`');
+		return false;
+	}
+	let prop_name = src[1];
+	src = src[0];
+	let field_idx=-1;
+
+	if (prop_name.indexOf('[')>0) {
+		let vals = prop_name.split('[');
+		prop_name = vals[0];
+		let idx = vals[1].split(']');
+		field_idx = parseInt(idx[0]);
+	}
+
+	if (prop_name=='id') {
+		print(GF_LOG_WARNING, "ID property cannot be updated");
+		return false;
+	}
+
+	//locate scene, transition or group
+	let scene = get_scene(src);
+	let transition = scene ? null : get_transition(src, false);
+	let group = (scene || transition) ? null : get_group(src);
+	if (scene || transition || group) {
+		let mod = scene ? scene.mod : (transition ? transition.mod : group);
+
+		//if transition we must modify the source (transition effect) since this is the object being reloaded
+		//do this even when the transition is active
+		if (transition) {
+			apply_transition_update(get_transition(src, true), prop_name, pl.with);
+		}
+
+		let update_type = -2;
+
+		let logname='';
+		if (scene) {
+
+			if (prop_name == "sources") {
+				update_type = UPDATE_PID;
+				mod = scene;
+			} else {
+				//module options
+				update_type = scene_mod_option_update_time(scene, prop_name);
+			}
+
+			//transformation options
+			if (update_type==-2) {
+				update_type = group_get_update_type(prop_name, true);
+				mod = scene;
+			}
+
+			if (update_type==-2) {
+				//scene options, not module ones
+				update_type = scene_get_update_type(prop_name);
+				if (update_type>=0) {
+					if (!scene_is_mod_option(prop_name))
+						mod = scene;
+				}
+			}
+			logname = 'scene ' + src;
+		} else if (group) {
+			update_type = group_get_update_type(prop_name, false);
+			logname = 'group ' + src;
+		}
+		//transition updates use a single invalidate flag
+		else {
+			//for now we allow all modifications (they are evaluated when reloading the transition)
+			update_type = UPDATE_SIZE;
+			logname = 'transition ' + src;
+		}
+
+		if (update_type==-2) {
+			print(GF_LOG_ERROR, 'No property ' + prop_name + ' in ' + logname + ', ignoring');
+			return false;
+		}
+		if (update_type==-2) {
+			print(GF_LOG_ERROR, 'Property ' + prop_name + ' in ' + logname + ' cannot be updated');
+			return false;
+		}
+
+		let prop_type = typeof mod[prop_name];
+		if (prop_type == 'undefined') {
+			if (!transition) {
+				print(GF_LOG_WARNING, 'No property ' + prop_name + ' in scene ' + src);
+			}
+			return false;
+		}
+
+		let res = pl.with;
+		let allow_string = (update_type & UPDATE_ALLOW_STRING) ? true : false;
+		update_type &= ~UPDATE_ALLOW_STRING;
+
+		if (Array.isArray(mod[prop_name]) && (field_idx>=0)) {
+			if (field_idx >= mod[prop_name].length) {
+				print(GF_LOG_WARNING, 'Field index ' + field_idx + ' greater than number of elements ' + mod[prop_name].length + ' in property ' + prop_name);
+				return;
+			} else if (typeof res == typeof mod[prop_name][0]) {
+				if (mod[prop_name][field_idx] != res) {
+					if (update_type==UPDATE_PID) {
+						mod[prop_name][field_idx] = res;
+						setup_scene(scene, mod[prop_name], null);
+					} else {
+						mod.update_flag |= update_type;
+						mod[prop_name][field_idx] = res;
+						if (update_type && (scene||group))
+							invalidate_parent(scene || group);
+					}
+				}
+				trigger_watcher(scene || transition || group , prop_name, mod[prop_name][field_idx]);
+			} else {
+				print(GF_LOG_WARNING, 'Property ' + prop_name + ' type is ' + (typeof mod[prop_name][0]) + ' but replacement value type is ' + rep_type);
+				return false;
+			}
+		} else {
+			let res_type = typeof res;
+			if (!check_prop_type(prop_type, res_type, allow_string)) {
+				print(GF_LOG_ERROR, 'Property ' + prop_name + ' type is ' + prop_type + ' but replacement value type is ' + res_type + ', ignoring');
+				return false;
+			}
+
+			if (mod[prop_name] != res) {
+				if (update_type==UPDATE_PID) {
+					setup_scene(scene, res, null);
+				} else {
+					mod.update_flag |= update_type;
+					mod[prop_name] = res;
+					if (update_type && (scene||group))
+						invalidate_parent(scene || group);
+				}
+				trigger_watcher(scene || transition || group, prop_name, res);
+			}
+		}
+		return true;
+	}
+
+
+	//locate timer
+	let timer = get_timer(src);
+	if (timer) {
+		if (prop_name == 'start') {
+			if (timer.active_state == 1) {
+				print(GF_LOG_WARNING, 'Cannot modify start time of active timer');
+				return false;
+			}
+			timer.start_time = parse_date_time(pl.with, false);
+			timer.active_state = 0;
+			timer.stop_time = 0;
+		}
+		else if (prop_name == 'stop') {
+			timer.stop_time = parse_date_time(pl.with, false);
+		} else if (prop_name == 'loop') {
+			if (typeof pl.with == 'boolean') {
+				timer.loop = pl.with ? -1 : 0;
+			} else if (typeof pl.with == 'number') {
+				timer.loop = pl.with;
+			} else {
+				print(GF_LOG_WARNING, 'Wrong type ' + (typeof pl.with) + ' for timer.loop');
+				return false;
+			}
+		} else if (prop_name == 'dur') {
+			if (typeof pl.with == 'number') {
+				timer.duration = pl.with;
+			} else {
+				print(GF_LOG_WARNING, 'Wrong type ' + (typeof pl.with) + ' for timer.dur');
+				return false;
+			}
+		} else if (prop_name == 'pause') {
+			if (typeof pl.with == 'boolean') {
+				timer.pause = pl.with;
+			} else {
+				print(GF_LOG_WARNING, 'Wrong type ' + (typeof pl.with) + ' for timer.pause');
+				return false;
+			}
+		} else if (typeof timer[prop_name] != 'undefined') {
+			print(GF_LOG_WARNING, 'Property ' + prop_name + ' of timer not updatable');
+				return false;
+		} else {
+			print(GF_LOG_WARNING, 'Unknown timer property ' + prop_name);
+				return false;
+		}
+		trigger_watcher(timer, prop_name, timer[prop_name]);
+		return true;
+	}
+
+	//locate sequence
+	let seq = get_sequence(src);
+	if (seq) {
+		if (prop_name == 'start') {
+			if (seq.active_state==1) {
+				print(GF_LOG_WARNING, 'Cannot modify start of active sequence');
+				return false;
+			} else {
+				seq.start_time = parse_date_time(pl.with, true);
+				seq.active_state = 0;
+				seq.stop_time = 0;
+			}
+		}
+		else if (prop_name == 'stop') {
+			seq.stop_time = parse_date_time(pl.with, false);
+			if ((seq.stop_time<0) || (seq.stop_time<=seq.start_time))
+				seq.stop_time = -1;
+		} else if (prop_name == 'loop') {
+			if (typeof pl.with == 'boolean') {
+				seq.loop = pl.with ? -1 : 0;
+			} else if (typeof pl.with == 'number') {
+				seq.loop = pl.with;
+			} else {
+				print(GF_LOG_WARNING, 'Wrong type ' + (typeof pl.with) + ' for sequence.loop');
+				return false;
+			}
+		} else if (prop_name == 'transition') {
+			if (typeof pl.with == 'object') {
+				seq.transition_effect = pl.with;
+			} else {
+				print(GF_LOG_WARNING, 'Wrong type ' + (typeof pl.with) + ' for sequence.transition');
+				return false;
+			}
+		} else if (typeof seq[prop_name] != 'undefined') {
+			print(GF_LOG_WARNING, 'Property ' + prop_name + ' of sequence not updatable');
+			return false;
+		} else {
+			print(GF_LOG_WARNING, 'Unknown sequence property ' + prop_name);
+			return false;
+		}
+		trigger_watcher(seq, prop_name, timer[prop_name]);
+		return true;
+	}
+	//try inactive transition
+	transition = get_transition(src, true);
+	if (transition) {
+		return apply_transition_update(transition, prop_name, pl.with);
+	}
+
+	//try scripts and watchers, only active property
+	let script=get_script(src);
+	let log_name='script';
+	if (!script) {
+		script=get_element_by_id(src, watchers);
+		log_name='watcher';
+	}
+	if (script) {
+		if (prop_name == 'active') {
+			if (typeof pl.with == 'boolean') {
+				script.active = pl.with;
+			} else {
+				print(GF_LOG_WARNING, 'Wrong type ' + (typeof pl.with) + ' for ' + log_name + '.active');
+				return false;
+			}
+		} else {
+			print(GF_LOG_WARNING, 'Property ' + prop_name + ' of ' + log_name + ' not updatable');
+			return false;
+		}
+		trigger_watcher(script, prop_name, timer[prop_name]);
+		return true;
+	}
+
+	//try styles and watchers, only active property
+	let style = get_element_by_id(src, styles);
+	if (style) {
+		style[prop_name] = pl.with;
+		style.updated = true;
+		return true;
+	}
+
+	print(GF_LOG_WARNING, "No updatable element with id " + src + ' found');
+	return false;
+}
+
+function load_updates()
+{
+	if (!filter.updates) return;
+
+	let last_mtime = sys.mod_time(filter.updates);
+	if (!last_mtime || (last_mtime == last_updates_modification))
+		return;
+
+	last_updates_modification = last_mtime;
+
+	let f = sys.load_file(filter.updates, true);
+	if (!f) return;
+
+	let pl;
+	try {
+		pl = JSON.parse(f);
+	} catch (e) {
+		print(GF_LOG_WARNING, "Invalid JSON update playlist specified: " + e);
+		return false;
+	}
+
+	print(GF_LOG_DEBUG, 'Playlist update is ' + JSON.stringify(pl) );
+
+	if (Array.isArray(pl) ) {
+		pl.forEach(parse_update_elem);
+	} else {
+		parse_update_elem(pl);
+	}
+}
+
+
+function get_sequence_texture(seq_id)
+{
+	let seq = get_sequence(seq_id);
+	if (!seq) return null;
+	let active_src = null;
+	seq.sources.forEach(s => {
+			if (s.playing) active_src = s;
+	});
+	if (!active_src) return null;
+	let active_pid = null;
+	active_src.pids.forEach(p => {
+		if ((p.type == TYPE_VIDEO) && p.pck) active_pid = p;
+	});
+	if (!active_pid) return null;
+
+	if (!active_pid.texture) {
+		create_pid_texture(active_pid);
+	} else if (active_pid.frame_ts != active_pid.texture.last_frame_ts) {
+		active_pid.texture.update(active_pid.pck);
+	 active_pid.texture._gl_modified = true;
+	 active_pid.texture.last_frame_ts = active_pid.frame_ts;
+	 }
+	return active_pid.texture;
+}
+
+function get_group_texture(group_id)
+{
+	let group = get_group(group_id);
+	if (!group || (group.offscreen==GROUP_OST_NONE)) return null;
+	if (!group.canvas_offscreen) {
+		group_draw_offscreen(group);
+	}
+	return group.texture;
+}
+
+function get_screen_rect(path)
+{
+	if (!active_scene || !path) return null;
+	if (active_scene.mx.is3D) return null;
+	let rc = active_scene.mx.apply(path.bounds);
+
+	rc.x += video_width/2;
+	rc.y = video_height/2 - rc.y;
+
+	rc.x = Math.floor(rc.x);
+	rc.y = Math.floor(rc.y);
+	rc.w = Math.floor(rc.w);
+	rc.h = Math.floor(rc.h);
+
+	return round_rect(rc);
+}
+
+
+function reload_playlist(content)
+{
+	if (!scene_in_update) {
+		print(GF_LOG_ERROR, "reload_playlist called outside of module.update() callback, ignoring");
+		return;
+	}
+	load_playlist(content);
+
+	display_list.length = 0;
+}
+
+function parse_group_mod(content, parent)
+{
+	if (!scene_in_update) {
+		print(GF_LOG_ERROR, "parse_group called outside of module.update() callback, ignoring");
+		return;
+	}
+	parse_group(content, parent);
+}
+function parse_scene_mod(content, parent)
+{
+	if (!scene_in_update) {
+		print(GF_LOG_ERROR, "parse_scene called outside of module.update() callback, ignoring");
+		return;
+	}
+	parse_scene(content, parent);
+}
+
+function parse_playlist_element_mod(content)
+{
+	if (!scene_in_update) {
+		print(GF_LOG_ERROR, "parse_playlist_element called outside of module.update() callback, ignoring");
+		return;
+	}
+	parse_playlist_element(content);
+}
+
+function remove_element_mod(elmt)
+{
+	if (!scene_in_update) {
+		print(GF_LOG_ERROR, "remove_element called outside of module.update() callback, ignoring");
+		return;
+	}
+
+	if (typeof elmt == 'string') {
+		let the_elem = get_group(elmt);
+		if (!the_elem)
+				the_elem = get_scene(elmt);
+		if (!the_elem)
+				the_elem = get_sequence(elmt);
+		if (!the_elem)
+				the_elem = get_timer(elmt);
+		if (!the_elem)
+				the_elem = get_script(elmt);
+		if (!the_elem)
+				the_elem = get_element_by_id(elmt, watchers);
+
+		elmt = the_elem;
+	}
+	if (! elmt) return;
+
+	//group
+	if (elmt.scenes) {
+		remove_scene_or_group(elmt);
+		return;
+	}
+	//scene
+	if (Array.isArray(elmt.sources) && Array.isArray(elmt.sequences)) {
+		remove_scene_or_group(elmt);
+		return;
+	}
+	//sequence
+	if (Array.isArray(elmt.sources)) {
+		let idx = sequences.indexOf(elmt);
+		if (idx>=0) sequences.splice(idx, 1);
+
+		sources.forEach(s => {
+			if (s.sequence != elmt) return;
+			stop_source(s, true);
+			s.removed = true;
+		});
+	}
+	//timer
+	if (Array.isArray(elmt.keys)) {
+		let idx = timers.indexOf(elmt);
+		if (idx>=0) timers.splice(idx, 1);
+		timer_restore(elmt);
+	}
+	//scripts
+	if (typeof elmt.script == 'function') {
+		let idx = user_scripts.indexOf(elmt);
+		if (idx>=0) user_scripts.splice(idx, 1);
+	}
+	//watcher
+	if (typeof elmt.target == 'string') {
+		remove_watcher(elmt, false);
+	}
+}
+
+
+function update_element_mod(id, prop, value)
+{
+	let update = { replace: id+'@'+prop, with: value};
+	return parse_update_elem(update);
+}
+
+
+function query_element_mod(id, prop)
+{
+	let elt = get_scene(id);
+	if (elt) {
+		if (elt.mod && typeof elt.mod[prop] != 'undefined') return elt.mod[prop];
+		if (typeof elt[prop] != 'undefined') return elt[prop];
+		return undefined;
+	}
+	elt = get_group(id);
+	if (elt) {
+		if (typeof elt[prop] != 'undefined') return elt[prop];
+		return undefined;
+	}
+	elt = get_timer(id);
+	if (elt) {
+		if (typeof elt[prop] != 'undefined') return elt[prop];
+		return undefined;
+	}
+	elt = get_script(id);
+	if (elt) {
+		if (typeof elt[prop] != 'undefined') return elt[prop];
+		return undefined;
+	}
+	elt = get_sequence(id);
+	if (elt) {
+		if (typeof elt[prop] != 'undefined') return elt[prop];
+		return undefined;
+	}
+	return undefined;
+}
+
+function mouse_over_mod()
+{
+	if (!arguments.length) return null;
+	let x, y;
+
+	if (typeof (arguments[0]) == 'object') {
+		let evt = arguments[0];
+		x = evt.mouse_x;
+		y = evt.mouse_y;
+		x -= video_width/2;
+		y = video_height/2 - y;
+	} else if (arguments.length==2) {
+		x = arguments[0];
+		y = arguments[1];
+	}
+
+	let len = prev_display_list.length;
+	let pt = {x: x, y: y};
+
+	for (let i=0; i<len; i++) {
+		let ctx = prev_display_list[len-i-1];
+		if (ctx.mx.is3D) {
+			continue;
+		}
+
+		let inv_mx = ctx.mx.copy().inverse();
+		let a_pt = inv_mx.apply(pt);
+		let w = ctx.scene.mod.width;
+		let h = ctx.scene.mod.height;
+
+		if (a_pt.x < -w/2) continue;
+		if (a_pt.x > w/2) continue;
+		if (a_pt.y < -h/2) continue;
+		if (a_pt.y > h/2) continue;
+
+		//offscreen group
+		if (ctx.group) {
+			return ctx.group;
+		}
+		let over = false;
+		if (typeof ctx.scene.mod.point_over == 'function') {
+			over = ctx.scene.mod.point_over(a_pt.x, a_pt.y);
+		}
+		if (over) return ctx.scene;
+	}
+	return null;
+}
+

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/scenes Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/scenes/clear.js Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/scenes/clip.js Added

@@ -0,0 +1,42 @@
+import * as evg from 'evg'
+
+
+export const description = "Screen clip";
+
+export const help = `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.
+`;
+
+export const options = [
+ {name:"reset", value: false, desc: "if set, reset clipper otherwise set it to scene position and size", dirty: UPDATE_SIZE},
+ {name:"stack", value: true, desc: "if false, clipper is set/reset independently of the clipper stack (no intersection, no push/pop of the stack)", dirty: UPDATE_SIZE},
+ {}
+];
+
+
+export function load() { return {
+
+update: function() {
+  if (this.update_flag) {
+    this.clip = {};
+    this.clip.x = 0;
+    this.clip.y = 0;
+    this.clip.w = this.width;
+    this.clip.h = this.height;
+  }
+  return this.reset ? 1 : 2; 
+},
+fullscreen: function() { return -1; },
+identity: function() { return false; },
+
+draw: function(canvas)
+{
+  canvas_set_clipper(this.reset ? null : this.clip, this.stack);
+}
+
+
+}; }

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/scenes/mask.js Added

@@ -0,0 +1,55 @@
+import * as evg from 'evg'
+
+
+export const description = "Screen mask";
+
+export const help = `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.
+`;
+
+export const options = [
+ {name:"mode", value: "off", desc: `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 
+ `, dirty: UPDATE_SIZE},
+ {}
+];
+
+
+export function load() { return {
+
+_mode: 0,
+update: function() {
+
+  if (this.update_flag) {
+    if (this.mode=="off") this._mode = GF_EVGMASK_NONE;
+    else if (this.mode=="on") this._mode = GF_EVGMASK_DRAW;
+    else if (this.mode=="onkeep") this._mode = GF_EVGMASK_DRAW_NO_CLEAR;
+    else if (this.mode=="use") this._mode = GF_EVGMASK_USE;
+    else if (this.mode=="use_inv") this._mode = GF_EVGMASK_USE_INV;
+    else if (this.mode=="rec") this._mode = GF_EVGMASK_RECORD;
+    else this._mode = 0;
+
+    this.update_flag = 0;
+  }
+
+  if (!this._mode) return 2;
+  return 2; 
+},
+fullscreen: function() { return -1; },
+identity: function() { return false; },
+is_opaque: function() { return false; },
+draw: function(canvas)
+{
+  canvas_set_mask_mode(this._mode);
+}
+
+
+}; }

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/scenes/shape.js Added

@@ -0,0 +1,1196 @@
+import * as evg from 'evg'
+
+export const description = `Draw video, shape, text, shape outline...`;
+
+export const help = `This scene can be used to setup a shape, its outline and specify the fill and strike modes.
+Supported shapes include:
+- a variety of rectangles, ellipse and other polygons
+- custom paths specified from JS
+- text
+
+The color modes for shapes and outlines include:
+- texturing using data from input media streams (shape fill only)
+- texturing using local JPEG and PNG files (shape fill only)
+- solid color
+- linear and radial gradients
+
+The default scene is optimized to fallback to fast blit when no transformations are used on a straight rectangle shape.
+
+All options can be updated at run time.
+
+The module accepts 0, 1 or 2 sequences as input.
+
+Color replacement operations can be specified for base scenes using source videos by specifying the \`replace\` option. The replacement source is:
+- the image data if \`img\` is set, potentially altered using \`*_rep\` options
+- otherwise a linear gradient if \`fill=linear\` or a radial gradient if \`fill=radial\` (NOT supported in GPU mode, use an offscreen group for this).
+
+Warning: Color replacement operations cannot be used with transition or mix effects.
+
+## Text options 
+
+Text can be loaded from file if \`text[0]\` is an existing local file.
+By default all lines are loaded. The number of loaded lines can be specified using \`text[1]\` as follows:
+- 0 or not present: all lines are loaded
+- N > 0: only keep the last N lines
+- N < 0: only keep the first N lines
+
+Text loaded from file will be refreshed whenever the file is modified.
+
+Predefined keywords can be used in input text, identified as \`$KEYWORD$\`. The following keywords (case insensitive) are defined:
+- time: replaced by UTC date
+- ltime: replaced by locale date
+- date: replaced by date (Y/M/D)
+- ldate: replaced by locale date (Y/M/D)
+- mtime: replaced by output media time 
+- mtime_SRC: replaced by media time of input source \`SRC\` 
+- cpu: replaced by current CPU usage of process
+- mem: replaced by current memory usage of process
+- version: replaced by GPAC version
+- fversion: replaced by GPAC full version
+
+## Custom paths
+
+Custom paths (shapes) can be created through JS code indicated in \'shape\', either inline or through a file.
+The following GPAC JS modules are imported:
+ - \`Sys\` as \`sys\`
+ - All EVG as \`evg\`
+ - \`os\` form QuickJS
+
+See [https://doxygen.gpac.io]() for more information on EVG and Sys JS APIs.
+
+The code is exposed the scene as \`this\`. The variable \`this.path\` is created, representing an empty path.
+EX "shape": "this.path.add_rectangle(0, 0, this.width, this.height); let el = new evg.Path().ellipse(0, 0, this.width, this.height/3); this.path.add_path(el);"
+
+The default behaviour is to use the shape width and height as reference size for texture mapping.
+If your custom path is textured, with bounding rectangle size different from the indicated shape size, set the variable \`this.tx_adjust\` to true.
+
+In the previous example, the texture mapping will not be impacted by the custom path size.
+
+EX "shape": "this.path.add_rectangle(0, 0, this.width, this.height); let el = new evg.Path().ellipse(0, 0, this.width, this.height/3); this.path.add_path(el); this.tx_adjust = true;"
+In this example, the texture mapping will be adjusted to the desired size.
+
+
+The global variables and functions are available (c.f. \`gpac -h avmix:global\`):
+ - get_media_time(): return media time in seconds (float) of output
+ - get_media_time(SRC): get time of source with id \`SRC\`, return -4 if not found, -3 if not playing, -2 if in prefetch, -1 if timing not yet known, media time in seconds (float) otherwise
+ - current_utc_clock: current UTC time in ms
+ - video_time: output video time
+ - video_timescale: output video timescale
+ - video_width: output video width
+ - video_height: output video height
+
+If your path needs to be reevaluated on regular basis, set the value \`this.reload\` to the timeout to next reload, in milliseconds.
+`;
+
+//first 6 flags are defined by avmix
+const UPDATE_LINE = 1<<6;
+const UPDATE_COLOR = 1<<7;
+
+export const options = [
+ {name:"rx", value: 0, desc: "horizontal radius for rounded rect in percent of object width if positive, in absolute value if negative, value `y` means use `ry`", dirty: UPDATE_SIZE|UPDATE_ALLOW_STRING},
+ {name:"ry", value: 0, desc: "vertical radius for rounded rect in percent of object height if positive, in absolute value if negative, value `x` means use `rx`", dirty: UPDATE_SIZE|UPDATE_ALLOW_STRING},
+ {name:"tl", value: 1.0, desc: "top-left corner scaler (positive, 0 disables corner)", dirty: UPDATE_SIZE},
+ {name:"bl", value: 1.0, desc: "bottom-left corner scaler (positive, 0 disables corner)", dirty: UPDATE_SIZE},
+ {name:"tr", value: 1.0, desc: "top-right corner scaler (positive, 0 disables corner)", dirty: UPDATE_SIZE},
+ {name:"br", value: 1.0, desc: "bottom-right corner scaler (positive, 0 disables corner)", dirty: UPDATE_SIZE},
+ {name:"rs", value: false, desc: "repeat texture horizontally", dirty: UPDATE_SIZE},
+ {name:"rt", value: false, desc: "repeat texture vertically", dirty: UPDATE_SIZE},
+ {name:"keep_ar", value: true, desc: "keep aspect ratio", dirty: UPDATE_POS},
+ {name:"pad_color", value: "none", desc: `color to use for texture padding if \`rs\` or \`rt\` are false. Use \`none\` to use texture edge, \`0x00FFFFFF\` for transparent (always enforced if source is transparent)`, dirty: UPDATE_POS},
+ {name:"txmx", value: [], desc: "texture matrix - all 6 coefficients must be set, i.e. [xx xy tx yx yy ty]", dirty: UPDATE_POS},
+ {name:"cmx", value: [], desc: "color transform - all 20 coefficients must be set in order, i.e. [Mrr, Mrg, Mrb, Mra, Tr, Mgr, Mgg ...]", dirty: UPDATE_POS},
+ {name:"line_width", value: 0, desc: "line width in percent of width if positive, or absolute value if negative", dirty: UPDATE_LINE},
+ {name:"line_color", value: "white", desc: "line color, `linear` for linear gradient and `radial` for radial gradient", dirty: UPDATE_LINE},
+ {name:"line_pos", value: 'center', desc: `line/shape positioning. Possible values are:
+ - center: line is centered around shape
+ - outside: line is outside the shape
+ - inside: line is inside the shape`, dirty: UPDATE_LINE},
+ {name:"line_dash", value: 'plain', desc: `line dashing mode. Possible values are:
+ - plain: no dash
+ - dash: predefined dash pattern is used
+ - dot: predefined dot pattern is used
+ - dashdot: predefined dash-dot pattern is used
+ - dashdashdot: predefined dash-dash-dot pattern is used
+ - dashdotdot: predefined dash-dot-dot pattern is used`, dirty: UPDATE_LINE},
+ {name:"dashes", value:[], desc: "dash/dot pattern lengths for custom dashes (these will be multiplied by line size)", dirty: UPDATE_LINE},
+ {name:"cap", value: 'flat', desc: `line end style. Possible values are:
+ - flat: flat end
+ - round: round end
+ - square: square end (extends limit compared to flat)
+ - triangle: triangle end`, dirty: UPDATE_LINE},
+ {name:"join", value: 'miter', desc: `line joint style. Possible values are:
+ - miter: miter join (straight lines)
+ - round: round join
+ - bevel: bevel join
+ - bevelmiter: bevel+miter join`, dirty: UPDATE_LINE},
+ {name:"miter_limit", value: 2, desc: "miter limit for joint styles", dirty: UPDATE_LINE},
+ {name:"dash_length", value: -1.0, desc: "length of path to outline, negative values mean full path", dirty: UPDATE_LINE},
+ {name:"dash_offset", value: 0.0, desc: "offset in path at which the outline starts", dirty: UPDATE_LINE},
+ {name:"blit", value: true, desc: "use blit if possible, otherwise EVG texturing. If disabled, always use texturing", dirty: UPDATE_SIZE},
+ {name:"fill", value: "none", desc: "fill color if used without sources, `linear` for linear gradient and `radial` for radial gradient", dirty: UPDATE_COLOR},
+ {name:"img", value: "", desc: `image for scene without sources or when \`replace\` is set. Accepts either a path to a local image (JPG or PNG), the ID of an offscreen group or the ID of a sequence`, dirty: UPDATE_POS|UPDATE_FX},
+ {name:"alpha", value: 1, desc: "global texture transparency", dirty: UPDATE_COLOR},
+ {name:"replace", value: "", desc: `if \`img\` or \`fill\` is set and shape is using source, set multi texture option. Possible modes are:
+ - a, r, g or b: replace alpha source component by indicated component from \`img\` . If prefix \`-\` is set, replace by one minus the indicated component
+ - m: mix using \`mix_ratio\` the color components of source and \`img\` and set alpha to full opacity
+ - M: mix using \`mix_ratio\` all components of source and \`img\`, including alpha
+ - xC: mix source 1 and source 2 using \`img\` component \`C\` (\`a\`, \`r\`, \`g\` or \`b\`) and force alpha to full opacity
+ - XC: mix source 1 and source 2 using \`img\` component \`C\` (\`a\`, \`r\`, \`g\` or \`b\`), including alpha
+`, dirty: UPDATE_SIZE},
+ {name:"shape", value: "rect", desc: `shape type. Possible values are:
+ - rect: rounded rectangle
+ - square: square using smaller width/height value
+ - ellipse: ellipse
+ - circle: circle using smaller width/height value
+ - rhombus: axis-aligned rhombus
+ - text: force text mode even if text field is empty
+ - rects: same as rounded rectangle but use straight lines for corners
+ - other value: JS code for custom path creation, either string or local file name (dynamic reload possible)`, dirty: UPDATE_SIZE},
+ {name:"grad_p", value: [], desc: "gradient positions between 0 and 1", dirty: UPDATE_COLOR},
+ {name:"grad_c", value: [], desc: "gradient colors for each position, as strings", dirty: UPDATE_COLOR},
+ {name:"grad_start", value: [0, 0], desc: "start point for linear gradient or center point for radial gradient", dirty: UPDATE_COLOR},
+ {name:"grad_end", value: [0, 0], desc: "end point for linear gradient or radius value for radial gradient", dirty: UPDATE_COLOR},
+ {name:"grad_focal", value: [0, 0], desc: "focal point for radial gradient", dirty: UPDATE_COLOR},
+ {name:"grad_mode", value: 'pad', desc: `gradient mode. Possible values are:
+ - pad: color padding outside of gradient bounds
+ - spread: mirror gradient outside of bounds
+ - repeat: repeat gradient outside of bounds`, dirty: UPDATE_COLOR},
+ {name:"text", value: [], desc: "text lines (UTF-8 only). If not empty, force \`shape=text\`", dirty: UPDATE_SIZE},
+ {name:"font", value: ["SANS"], desc: "font name(s)", dirty: UPDATE_SIZE},
+ {name:"size", value: 20, desc: "font size in percent of height (horizontal text) or width (vertical text), or absolute value if negative", dirty: UPDATE_SIZE},
+ {name:"baseline", value: 'alphabetic', desc: `baseline position. Possible values are:
+ - alphabetic: alphabetic position of baseline
+ - top: baseline at top of EM Box
+ - hanging: reserved, __not implemented__
+ - middle: baseline at middle of EM Box
+ - ideograph: reserved, __not implemented__
+ - bottom: baseline at bottom of EM Box`, dirty: UPDATE_SIZE},
+ {name:"align", value: 'center', desc: `horizontal text alignment. Possible values are:
+ - center: center of shape
+ - start: start of shape (left or right depending on text direction)
+ - end: end of shape (right or left depending on text direction)
+ - left: left of shape
+ - right: right of shape`, dirty: UPDATE_SIZE},
+ {name:"spacing", value: 0, desc: "line spacing in percent of height (horizontal text) or width (vertical text), or absolute value if negative", dirty: UPDATE_SIZE},
+ {name:"bold", value: false, desc: "use bold version of font", dirty: UPDATE_SIZE},
+ {name:"italic", value: false, desc: "use italic version of font", dirty: UPDATE_SIZE},
+ {name:"underline", value: false, desc: "underline text", dirty: UPDATE_SIZE},
+ {name:"vertical", value: false, desc: "draw text vertically", dirty: UPDATE_SIZE},
+ {name:"flip", value: false, desc: "flip text vertically", dirty: UPDATE_SIZE},
+ {name:"extend", value: 0, desc: "maximum text width in percent of width (for horizontal) or height (for vertical), or absolute value if negative", dirty: UPDATE_SIZE},
+
+ {name:"keep_ar_rep", value: true, desc: "same as `keep_ar` for local image in replace mode", dirty: UPDATE_POS},
+ {name:"txmx_rep", value: [], desc: "same as `txmx` for local image in replace mode", dirty: UPDATE_POS},
+ {name:"cmx_rep", value: [], desc: "same as `cmx` for local image in replace mode", dirty: UPDATE_POS},
+ {name:"pad_color_rep", value: "none", desc: "same as `pad_color` for local image in replace mode", dirty: UPDATE_POS},
+ {name:"rs_rep", value: false, desc: "same as `rs` for local image in replace mode", dirty: UPDATE_POS},
+ {name:"rt_rep", value: false, desc: "same as `rt` for local image in replace mode", dirty: UPDATE_POS},
+
+ {}
+];
+
+
+function make_rounded_rect(is_straight)
+{
+ var hw, hh, rx_bl, ry_bl, rx_br, ry_br, rx_tl, ry_tl, rx_tr, ry_tr, rx, ry;
+ 
+ hw = this.width / 2;
+ hh = this.height / 2;
+
+ /*compute default rx/ry*/
+ rx = ry = 0;
+ if (typeof this.rx == 'number') {
+ if (this.rx >=0 )
+ rx = this.rx * this.width / 100;
+ else
+ rx = this.rx;
+ }
+ if (typeof this.ry == 'number') {
+ if (this.ry>=0) {
+ ry = this.ry * this.height / 100;
+ } else {
+ ry = this.ry;
+ }
+ }
+ if (this.rx == 'y') rx = ry;
+ if (this.ry == 'x') ry = rx;
+
+ if (rx >= hw) rx = hw;
+ if (ry >= hh) ry = hh;
+ rx_bl = rx_br = rx_tl = rx_tr = rx;
+ ry_bl = ry_br = ry_tl = ry_tr = ry;
+
+ rx_tl *= this.tl;
+ ry_tl *= this.tl;
+ rx_tr *= this.tr;
+ ry_tr *= this.tr;
+ rx_bl *= this.bl;
+ ry_bl *= this.bl;
+ rx_br *= this.br;
+ ry_br *= this.br;
+
+ this.path.move_to(hw - rx_tr, hh);
+
+ if (is_straight)
+ this.path.line_to(hw, hh - ry_tr);
+ else
+ this.path.quadratic_to(hw, hh, hw, hh - ry_tr);
+
+ this.path.line_to(hw, -hh + ry_br);
+
+ if (is_straight)
+ this.path.line_to(hw - rx_br, -hh);
+ else
+ this.path.quadratic_to(hw, -hh, hw - rx_br, -hh);
+
+ this.path.line_to(-hw + rx_bl, -hh);
+
+ if (is_straight)
+ this.path.line_to(-hw, -hh + ry_bl);
+ else
+ this.path.quadratic_to(-hw, -hh, -hw, -hh + ry_bl);
+
+ this.path.line_to(-hw, hh - ry_tl);
+
+ if (is_straight)
+ this.path.line_to(-hw + rx_tl, hh);
+ else
+ this.path.quadratic_to(-hw, hh, -hw + rx_tl, hh);
+
+ this.path.close();
+}
+
+function create_brush(color)
+{
+ let stencil = null;
+
+ if (color=='none') return null;
+
+ if ((color=='linear') || (color=='radial') ) {
+ let s_x, s_y, e_x, e_y, f_x, f_y;
+ s_x = this.grad_start[0];
+ s_y = this.grad_start[1];
+ e_x = this.grad_end[0];
+ e_y = this.grad_end[1];
+ f_x = this.grad_focal[0];
+ f_y = this.grad_focal[1];
+
+ if (color=='linear') {
+ if ((s_x==e_x) && (s_y==e_y) && (s_x==0) && (s_y==0)) {
+ e_x = 1;
+ }
+ stencil = new evg.LinearGradient();
+ stencil.set_points(s_x, s_y, e_x, e_y);
+ } else {
+ if ((s_x==e_x) && (s_y==e_y) && (s_x==0) && (s_y==0)) {
+ s_x = f_x = 0.5;
+ s_y = f_y = 0.5;
+ e_x = 0.5;
+ e_y = 0.5;
+ }
+
+ stencil = new evg.RadialGradient();
+ stencil.set_points(s_x, s_y, f_x, f_y, e_x, e_y);
+ }
+ let maxg = this.grad_p.length;
+ if (this.grad_c.length < maxg) maxg = this.grad_c.length;
+ for (let i=0; i<maxg; i++) {
+ stencil.set_stop(this.grad_p[i], this.grad_c[i]);
+ }
+ stencil.set_alphaf(this.alpha);
+
+ if (this.grad_mode == 'pad') stencil.pad = GF_GRADIENT_MODE_PAD;
+ else if (this.grad_mode == 'spread') stencil.pad = GF_GRADIENT_MODE_SPREAD;
+ else stencil.pad = GF_GRADIENT_MODE_REPEAT;
+
+ let txmx = null;
+ if (this.txmx && this.txmx.length==6) {
+ txmx = new evg.Matrix2D(this.txmx[0], this.txmx[1], this.txmx[2], this.txmx[3], this.txmx[4], this.txmx[5]);
+ } else {
+ txmx = new evg.Matrix2D(); 
+ }
+ stencil.mx = txmx;
+ } else {
+ stencil = new evg.SolidBrush();
+ stencil.set_color(color);
+ stencil.set_alphaf(this.alpha);
+ }
+ return stencil;
+}
+
+function setup_texture(pid_link)
+{
+ let texture = pid_link ? pid_link.texture : this.local_stencil;
+ let pid = pid_link ? pid_link.pid : null;
+ let txmx_pid = (pid_link || !this.replace_op) ? this.txmx : this.txmx_rep;
+ let keep_ar_pid = (pid_link || !this.replace_op) ? this.keep_ar : this.keep_ar_rep;
+ let cmx_pid = (pid_link || !this.replace_op) ? this.cmx : this.cmx_rep;
+ let pad_color_pid = (pid_link || !this.replace_op) ? this.pad_color : this.pad_color_rep;
+ let rs_pid = (pid_link || !this.replace_op) ? this.rs : this.rs_rep;
+ let rt_pid = (pid_link || !this.replace_op) ? this.rt : this.rt_rep;
+
+ if (!texture) {
+ print(GF_LOG_ERROR, 'Scene ' + this.id + ' missing texture !');
+ return;
+ }
+ let txmx;
+ if (txmx_pid && Array.isArray(txmx_pid) && (txmx_pid.length==6)) {
+ txmx = new evg.Matrix2D(txmx_pid[0], txmx_pid[1], txmx_pid[2], txmx_pid[3], txmx_pid[4], txmx_pid[5]);
+ } else {
+ txmx = new evg.Matrix2D(); 
+ }
+
+ let scale_tx_sw = 1;
+ let scale_tx_sh = 1;
+ let trans_tx_x = 0;
+ let trans_tx_y = 0;
+ let sw = this.sw;
+ let sh = this.sh;
+ let sw_o = this.sw;
+ let sh_o = this.sh;
+ let tx_w = texture.width;
+ let tx_h = texture.height;
+ let rotated = 0;
+ let mirrored = 0;
+
+ let tx_info = {};
+ if (pid_link) {
+ pid_link.tx_info = tx_info;
+ } else {
+ this.replace_tx_info = tx_info;
+ }
+
+ if (!txmx.identity && !pid_link && this.replace_op) { 
+ tx_info.repeat_s = true;
+ tx_info.repeat_t = true;
+ keep_ar_pid = false;
+ } else {
+ tx_info.repeat_s = rs_pid;
+ tx_info.repeat_t = rt_pid;
+ }
+ tx_info.pad_color = null;
+
+ let mxflip = new evg.Matrix2D();
+
+ if (pid && pid.mirror) {
+ mirrored = pid.mirror;
+ if (pid.mirror==1) mxflip.scale(-1, 1);
+ else if (pid.mirror==2) mxflip.scale(1, -1);
+ else if (pid.mirror==3) {
+ mxflip.scale(-1, 1);
+ mxflip.scale(1, -1);
+ }
+ }
+
+ if (pid && pid.rotate) {
+ rotated = pid.rotate;
+ if ((pid.rotate==1) || (pid.rotate==3)) {
+ tx_w = texture.height;
+ tx_h = texture.width;
+ }
+ if (pid.rotate==3) mxflip.rotate(0, 0, -Math.PI/2);
+ else if (pid.rotate==2) mxflip.rotate(0, 0, Math.PI);
+ else if (pid.rotate==1) mxflip.rotate(0, 0, Math.PI/2);
+ }
+
+ txmx.add(mxflip);
+
+ if (keep_ar_pid) {
+ if (sw * tx_h < sh * tx_w) {
+ sh = sw * tx_h / tx_w;
+ } else if (sw * tx_h > sh * tx_w) {
+ sw = sh * tx_w / tx_h;
+ }
+ }
+ this.blit_path = null;
+ if ((sw != sw_o) || (sh != sh_o)) {
+ this.can_reuse = false;
+ scale_tx_sw = sw_o / sw;
+ trans_tx_x = (sw - sw_o)/sw/2;
+ scale_tx_sh = sh_o / sh;
+ trans_tx_y = (sh - sh_o)/sh/2;
+
+ if (!rs_pid || !rt_pid) {
+ if (pid_link || !this.use_mix) {
+ if (pad_color_pid == "none") {
+ tx_info.pad_color = "none";
+ //no padding asked, no repeat s/t or transform and path is a rectangle, define a new path with the new coords to blit
+ if ((this.pids.length<=1) && (this.path.is_rectangle) && txmx.identity) {
+ this.blit_path = new evg.Path().rectangle(0, 0, sw, sh, true);
+ } else {
+ this.use_blit = false;
+ }
+ } else {
+ this.use_blit = false;
+ tx_info.pad_color = pad_color_pid;
+ let a = sys.color_component(pad_color_pid, 0);
+ if (a < 1.0) this.opaque = false;
+ }
+ }
+ } else {
+ this.use_blit = false;
+ }
+ }
+
+ if (!txmx.identity) {
+ this.use_blit = false;
+ this.can_reuse = false;
+ }
+
+ //set texture matrix matrix
+ tx_info.mx = new evg.Matrix2D();
+ tx_info.mx.scale(scale_tx_sw, scale_tx_sh);
+ tx_info.mx.translate(trans_tx_x, trans_tx_y);
+ tx_info.mx.add(txmx);
+
+ if (rotated==0) {
+ if (mirrored==2) tx_info.mx.translate(0, 1);
+ else if (mirrored==3) tx_info.mx.translate(1, 1);
+ else if (mirrored==1) tx_info.mx.translate(1, 0);
+ else tx_info.mx.translate(0, 0);
+ }
+ else if (rotated==1) {
+ if (mirrored==2) tx_info.mx.translate(0, 0);
+ else if (mirrored==3) tx_info.mx.translate(0, 1);
+ else if (mirrored==1) tx_info.mx.translate(1, 1);
+ else tx_info.mx.translate(1, 0);
+ }
+ else if (rotated==2) {
+ if (mirrored==2) tx_info.mx.translate(1, 0);
+ else if (mirrored==3) tx_info.mx.translate(0, 0);
+ else if (mirrored==1) tx_info.mx.translate(0, 1);
+ else tx_info.mx.translate(1, 1);
+ }
+ else { // (rotated==3) 
+ if (mirrored==2) tx_info.mx.translate(1, 1);
+ else if (mirrored==3) tx_info.mx.translate(1, 0);
+ else if (mirrored==1) tx_info.mx.translate(0, 0);
+ else tx_info.mx.translate(0, 1);
+ }
+
+
+ if (pid) {
+ if ((tx_w != this.sw) || (tx_h != this.sh)) {
+ this.can_reuse=false;
+ }
+ }
+ if (this.alpha < 1) {
+ this.use_blit = false;
+ this.opaque = false;
+ tx_info.alpha = this.alpha;
+ } else {
+ tx_info.alpha = 1;
+ }
+
+ tx_info.cmx = null;
+ if (cmx_pid && (cmx_pid.length==20)) {
+ let cmx = new evg.ColorMatrix(cmx_pid);
+ if (!cmx.identity) {
+ this.can_reuse = false;
+ this.use_blit = false;
+ tx_info.cmx = cmx;
+ }
+ }
+}
+
+function set_text(txt)
+{
+ let final_text = [];
+
+ txt.forEach( line => {
+ if (line.indexOf('$') < 0) {
+ final_text.push(line);
+ return;
+ }
+ let first_is_sep = (line.charAt(0)=='$') ? true : false; 
+ let last_is_sep = (line.charAt(line.length-1)=='$') ? true : false; 
+ let split_text = line.split('$');
+ let len = split_text.length;
+ let new_line='';
+
+ split_text.forEach( (item, index) => {
+ if (!index && !first_is_sep) {
+ new_line += item;
+ return;
+ }
+ if (!last_is_sep && (index==len-1)) {
+ new_line += item;
+ return;
+ }
+ let timeout=0;
+ let kword = item.toLowerCase();
+ if (kword=='time') {
+ item = new Date().toUTCString();
+ timeout = 1000;
+ }
+ else if (kword=='ltime') {
+ item = new Date().toLocaleString();
+ timeout = 1000;
+ }
+ else if (kword=='date') {
+ item = new Date().toDateString();
+ timeout = 1000 * 3600 * 24;
+ }
+ else if (kword=='ldate') {
+ item = new Date().toLocaleDateString();
+ timeout = 1000 * 3600 * 24;
+ }
+ else if (kword.startsWith('mtime')) {
+ let time;
+ if (kword.startsWith('mtime_')) {
+ let src = item.substring(6);
+ time = get_media_time( src );
+ } else {
+ time = get_media_time();
+ }
+ if (time == -4) {
+ item = 'not found';
+ } else if (time==-3) {
+ item = 'not playing';
+ } else if (time==-2) {
+ item = 'initializing';
+ } else if (time==-1) {
+ item = 'prefetching';
+ } else {
+ time *= 1000;
+ let time_s = Math.floor(time/1000);
+ let h = Math.floor(time_s/3600);
+ let m = Math.floor(time_s/60 - h*60);
+ let s = Math.floor((time_s - h*3600 - m*60));
+ item = ((h<10) ? '0' : '') + h + ((m<10) ? ':0' : ':') + m + ((s<10) ? ':0' : ':') + s + '.';
+ time = Math.floor(time - time_s*1000);
+ if (time < 10) item += '00';
+ else if (time < 100) item += '0';
+ item += time;
+ }
+ timeout = 30;
+ }
+ else if (kword=='cpu') {
+ item = '' + sys.process_cpu_usage;
+ timeout = 500;
+ }
+ else if (kword=='mem') {
+ item = '' + Math.floor(sys.process_memory/1000000) + ' MB';
+ timeout = 500;
+ }
+ else if (kword=='version') {
+ item = sys.version;
+ }
+ else if (kword=='fversion') {
+ item = sys.version_full;
+ }
+ new_line += item;
+
+ if (timeout) { 
+ if (!this.reload) this.reload = timeout;
+ else if (timeout < this.reload) this.reload = timeout;
+ }
+ });
+
+ final_text.push(new_line); 
+ });
+ this.path.set_text(final_text);
+}
+
+function set_texture_params(texture, tx_info)
+{
+ texture.repeat_s = tx_info.repeat_s;
+ texture.repeat_t = tx_info.repeat_t;
+ texture.set_alphaf(tx_info.alpha);
+ texture.set_pad_color(tx_info.pad_color);
+ texture.mx = tx_info.mx;
+ texture.cmx = tx_info.cmx;
+}
+
+export function load() {
+ return {
+
+local_stencil: null,
+local_stencil_type: 0,
+path: null,
+mx: null,
+last_img: "",
+dyn_text: null,
+dyn_path: null,
+last_path_time: 0,
+last_text_time: 0,
+reload: 0,
+
+update: function() {
+
+ if (this.update_flag & UPDATE_PID) {
+ if (this.pids.length) {
+ this.is_texture=true;
+ } else {
+ this.update_flag = UPDATE_SIZE;
+ this.is_texture=false;
+ }
+ }
+
+ if (this.reload && (this.reload < current_utc_clock)) { 
+ this.update_flag = UPDATE_SIZE;
+ }
+ else if (this.dyn_text && (this.last_text_time < sys.mod_time(this.dyn_text))) {
+ this.update_flag = UPDATE_SIZE;
+ }
+ else if (this.last_path_time && (this.last_path_time < sys.mod_time(this.dyn_path))) {
+ this.update_flag = UPDATE_SIZE;
+ }
+
+ if (!this.update_flag) return 1;
+
+ this.replace_op = 0;
+ this.replace_op_img = false;
+ this.replace_par = 0;
+ this.use_mix = false;
+ this.replace_tx_info = null;
+
+ let rep = this.replace;
+ let op = GF_EVG_OPERAND_REPLACE_ALPHA;
+
+ if (rep[0]=='-') {
+ op = GF_EVG_OPERAND_REPLACE_ONE_MINUS_ALPHA;
+ rep = rep.substring(1);
+ }
+ else if (rep[0]=='x') {
+ op = GF_EVG_OPERAND_MIX_DYN;
+ rep = rep.substring(1);
+ }
+ else if (rep[0]=='X') {
+ op = GF_EVG_OPERAND_MIX_DYN_ALPHA;
+ rep = rep.substring(1);
+ }
+
+ if (rep=="m") { this.replace_op = GF_EVG_OPERAND_MIX; this.use_mix = true; }
+ else if (rep=="M") { this.replace_op = GF_EVG_OPERAND_MIX_ALPHA; this.use_mix = true; }
+ else if (rep=="a") { this.replace_op = op; }
+ else if (rep=="r") { this.replace_op = op; this.replace_par = 1; }
+ else if (rep=="g") { this.replace_op = op; this.replace_par = 2; }
+ else if (rep=="b") { this.replace_op = op; this.replace_par = 3; }
+
+ //no associated sources, use image if set
+ let reset_local_stencil = true;
+ if ((!this.pids.length || this.replace_op) && this.img.length) {
+ if (this.img != this.last_img) this.local_stencil = null;
+ this.last_img = this.img;
+
+
+ if (!this.local_stencil) {
+ this.local_stencil_type = 0;
+ try {
+ this.local_stencil = get_group_texture(this.img);
+ if (this.local_stencil) {
+ this.local_stencil_type = 1;
+ } else {
+ this.local_stencil = get_sequence_texture(this.img);
+ if (this.local_stencil) {
+ this.local_stencil_type = 2;
+ } else {
+ let url = resolve_url(this.img);
+ this.local_stencil = new evg.Texture(url, false);
+ //when using mask from main scene, let the mask decide
+ this.local_stencil.filtering = GF_TEXTURE_FILTER_HIGH_QUALITY;
+ }
+ }
+ this.is_texture = true;
+ if (this.replace_op) this.replace_op_img = true;
+ reset_local_stencil = false;
+ } catch (e) {
+ if (this.replace_op) {
+ print(GF_LOG_WARNING, 'Failed to load image ' + this.img + ': ' + e + ' - ignoring component replacement');
+ if (!this.pids.length) this.is_texture = false;
+ this.replace_op = 0;
+ this.replace_op_img = false;
+ } else {
+ print(GF_LOG_WARNING, 'Failed to load image ' + this.img + ': ' + e + ' - will use color fill');
+ if (!this.pids.length) this.is_texture = false;
+ }
+ }
+ } else {
+ reset_local_stencil = false;
+ }
+ }
+ //no change in img, don't reset local stencil
+ else if (this.img == this.last_img) {
+ reset_local_stencil = false;
+ }
+ if (this.replace_op && !this.img.length) {
+ if ((this.fill == 'linear') || (this.fill == 'radial')) {}
+ else this.replace_op = 0;
+ }
+
+ //update color but local stencil is a gradient, rebuild gradient
+ if ((this.update_flag & UPDATE_COLOR) && (!this.local_stencil || !this.local_stencil.solid_brush)) {
+ this.update_flag |= UPDATE_POS;
+ this.update_flag &= UPDATE_COLOR;
+ }
+
+ //update our objects
+
+ this.opaque = false;
+ this.use_blit = false;
+ this.can_reuse = this.pids.length ? true : false;
+ this.sw = this.width;
+ this.sh = this.height;
+ this.is_text = false;
+
+ if (!this.path || (this.update_flag & UPDATE_SIZE)) {
+ let path_loaded = false;
+ this.path = new evg.Path();
+
+ this.reload = 0;
+
+ if ((this.shape == 'text') || this.text.length) {
+ this.is_text = true;
+
+ if ((this.text.length == 1) || (this.text.length == 2)) {
+ let url = resolve_url(this.text[0]);
+ if (sys.file_exists(url)) {
+ this.dyn_text = url;
+ }
+ }
+ /*create a text*/
+ this.path = new evg.Text();
+
+ this.path.font = this.font;
+ this._font_size = 0;
+ if (this.size<0)
+ this.path.fontsize = this._font_size = -this.size;
+ else
+ this.path.fontsize = this._font_size = this.size * (this.vertical ? this.width : this.height) / 100;
+ 
+ if (this.spacing<0)
+ this.path.lineSpacing = -this.spacing;
+ else
+ this.path.lineSpacing = this.spacing * (this.vertical ? this.width : this.height) / 100;
+ 
+
+ if (this.baseline=='top') this.path.baseline = GF_TEXT_BASELINE_TOP;
+ else if (this.baseline=='hanging') this.path.baseline = GF_TEXT_BASELINE_HANGING;
+ else if (this.baseline=='middle') this.path.baseline = GF_TEXT_BASELINE_MIDDLE;
+ else if (this.baseline=='ideographic') this.path.baseline = GF_TEXT_BASELINE_IDEOGRAPHIC;
+ else if (this.baseline=='bottom') this.path.baseline = GF_TEXT_BASELINE_BOTTOM;
+ else this.path.baseline = GF_TEXT_BASELINE_ALPHABETIC;
+
+ if (this.align == 'start') this.path.align = GF_TEXT_ALIGN_START;
+ else if (this.align == 'end') this.path.align = GF_TEXT_ALIGN_END;
+ else if (this.align == 'left') this.path.align = GF_TEXT_ALIGN_LEFT;
+ else if (this.align == 'right') this.path.align = GF_TEXT_ALIGN_RIGHT;
+ else this.path.align = GF_TEXT_ALIGN_CENTER;
+
+ this.path.bold = this.bold;
+ this.path.italic = this.italic;
+ this.path.underline = this.underline;
+ this.path.horizontal = !this.vertical;
+ this.path.flip = this.flip;
+ this.path.maxWidth = 0;
+ if (this.extend) {
+ if (this.extend>0)
+ this.path.maxWidth = this.extend * (this.vertical ? this.height : this.width) / 100;
+ else
+ this.path.maxWidth = this.extend;
+ }
+
+ if (this.dyn_text) {
+ let txt = sys.load_file(this.dyn_text, true);
+ if (this.text.length==2) {
+ txt = txt.split(/\r?\n/);
+ let nb_items = this.text[1];
+ if (nb_items>0) {
+ var n = txt.length - nb_items;
+ txt.splice(0, txt.length - nb_items);
+ } else { 
+ var n = txt.length + nb_items;
+ txt.splice(-nb_items, txt.length + nb_items);
+ }
+ } else {
+ txt = [txt];
+ }
+ set_text.apply(this, [txt]);
+ this.last_text_time = sys.mod_time(this.dyn_text);
+ } else {
+ set_text.apply(this, [this.text]);
+ }
+
+ //apply alignment
+ let tsize = this.path.measure();
+ let text_mx = new evg.Matrix2D();
+ if (this.vertical) {
+ let align_type = 0; //0: top, 1: center, 2: bottom
+ if ((this.align == 'end') || (this.align == 'right')) align_type = 2;
+ else if (this.align == 'center') align_type = 1;
+
+ if (align_type==0) {
+ text_mx.translate(0, this.sh/2 - this._font_size);
+ }
+ else if (align_type==1) {
+ text_mx.translate(0, tsize.height/2);
+ }
+ else if (align_type==2) {
+ text_mx.translate(0, -this.sh/2 + tsize.height);
+ }
+ } else {
+ let align_type = 0; //0: left, 1: center, 2: right
+ if ((this.align == 'start') && tsize.right_to_left) align_type = 2;
+ else if ((this.align == 'end') && !tsize.right_to_left) align_type = 2;
+ else if (this.align == 'right') align_type = 2;
+ else if (this.align == 'center') align_type = 1;
+
+ if (align_type==0) {
+ text_mx.translate(-this.sw/2, 0);
+ }
+ else if (align_type==1) {
+ text_mx.translate(-tsize.width/2, 0);
+ }
+ else if (align_type==2) {
+ text_mx.translate(this.sw/2 - tsize.width, 0);
+ }
+ }
+ //trash text, keep path only
+ this.path = this.path.get_path().transform(text_mx);
+
+ path_loaded = true;
+ } else if (this.shape == 'rect') {
+
+ } else if (this.shape == 'square') {
+ if (this.sh<this.sw) this.sw = this.sh;
+ else this.sh = this.sw;
+ this.path.rectangle(0, 0, this.sw, this.sh, true);
+ path_loaded = true;
+ } else if (this.shape == 'circle') {
+ if (this.sh<this.sw) this.sw = this.sh;
+ else this.sh = this.sw;
+ this.path.ellipse(0, 0, this.sw, this.sh);
+ path_loaded = true;
+ } else if (this.shape == 'ellipse') {
+ this.path.ellipse(0, 0, this.sw, this.sh);
+ path_loaded = true;
+ } else if (this.shape == 'rhombus') {
+ let hsw = this.sw/2;
+ let hsh = this.sh/2;
+ this.path.move_to(this.sw, 0);
+ this.path.line_to(0, this.sh);
+ this.path.line_to(-this.sw, 0);
+ this.path.line_to(0, -this.sh);
+ path_loaded = true;
+ } else if (this.shape == 'rects') {
+ path_loaded = true;
+ make_rounded_rect.apply(this, [true]);
+ } else {
+ try {
+ let url = resolve_url(this.shape);
+ this.tx_adjust=false;
+ if (sys.file_exists(url)) {
+ let f = new Function([], sys.load_file(url, true) );
+ let res = f.apply(this, []);
+ if (typeof res == 'number') this.reload = res;
+ path_loaded = true;
+ this.dyn_path = url;
+ this.last_path_time = sys.mod_time(url);
+ } else {
+ let f = new Function([], this.shape);
+ let res = f.apply(this, []);
+ if (typeof res == 'number') this.reload = res;
+ path_loaded = true;
+ this.dyn_path = null;
+ }
+ if (this.tx_adjust) {
+ let rc = this.path.bounds;
+ this.sw = rc.w;
+ this.sh = rc.h;
+ }
+ } catch (e) {
+ print(GF_LOG_ERROR, "Failed to load path: " + e + " - using default");
+ }
+ }
+
+ if (path_loaded) {
+ }
+ else if ((!this.rx && !this.ry) || (!this.tl && !this.tr && !this.bl && !this.br)) {
+ this.path.rectangle(0, 0, this.sw, this.sh, true);
+ }
+ else if ((this.rx == 50) && (this.ry == 50) && this.tl && this.tr && this.bl && this.br) {
+ this.path.ellipse(0, 0, this.sw, this.sh);
+ } else {
+ make_rounded_rect.apply(this, [false]);
+ }
+ if (this.reload) {
+ this.reload += current_utc_clock;
+ }
+
+ //force setup of textures of outline
+ this.update_flag = UPDATE_POS;
+ //force loading of outline
+ this.outline = null;
+ }
+
+ if (this.path.is_rectangle) {
+ this.opaque = true;
+ this.use_blit = blit_enabled ? this.blit : null;
+ }
+
+ if (reset_local_stencil) {
+ this.local_stencil = null;
+ }
+
+ if (this.update_flag & UPDATE_POS) {
+ //setup textures
+ if (this.is_texture) {
+ if (this.pids.length) {
+ this.pids.forEach(p => {
+ setup_texture.apply(this, [p]);
+ });
+ if ((this.pids.length>1) || use_gpu)
+ this.can_reuse = false;
+ }
+
+ //image case
+ if (!this.pids.length || this.replace_op_img) {
+ setup_texture.apply(this, [null]);
+ if (this.replace_op) {
+ this.can_reuse = false;
+ this.use_blit = false;
+ }
+ }
+
+ if (!this.replace_op_img && this.replace_op) {
+ this.can_reuse = false;
+ this.use_blit = false;
+ this.local_stencil = create_brush.apply(this, [this.fill]);
+ }
+
+ } else {
+ this.can_reuse = false;
+ this.use_blit = false;
+ this.local_stencil = create_brush.apply(this, [this.fill]);
+ //no fill specified, no input pids, consider this is no signal but we need to clear canvas
+ if (!this.local_stencil)
+ this.opaque = false;
+ }
+ }
+
+ if (!this.outline || (this.update_flag & UPDATE_LINE)) {
+ if (this.line_width) {
+ let lwidth = (this.line_width<0) ? (-this.line_width) : (this.line_width*this.sw / 100);
+ let pen_settings = {
+ width: lwidth,
+ dash: this.line_dash,
+ miter: this.miter_limit,
+ offset: this.dash_offset,
+ length: this.dash_length,
+ dashes: this.dashes
+ };
+ if (this.line_pos=='outside') pen_settings.align = GF_PATH_LINE_OUTSIDE;
+ else if (this.line_pos=='inside') pen_settings.align = GF_PATH_LINE_INSIDE;
+ else pen_settings.align = GF_PATH_LINE_CENTER;
+
+ if (this.line_dash=='dash') pen_settings.dash = GF_DASH_STYLE_DASH;
+ else if (this.line_dash=='dot') pen_settings.dash = GF_DASH_STYLE_DOT;
+ else if (this.line_dash=='dashdot') pen_settings.dash = GF_DASH_STYLE_DASH_DOT;
+ else if (this.line_dash=='dashdashdot') pen_settings.dash = GF_DASH_STYLE_DASH_DASH_DOT;
+ else if (this.line_dash=='dashdotdot') pen_settings.dash = GF_DASH_STYLE_DASH_DOT_DOT;
+ else pen_settings.dash = GF_DASH_STYLE_PLAIN;
+
+ if (this.cap=='round') pen_settings.cap = GF_LINE_CAP_ROUND;
+ else if (this.cap=='square') pen_settings.cap = GF_LINE_CAP_SQUARE;
+ else if (this.cap=='triangle') pen_settings.cap = GF_LINE_CAP_TRIANGLE;
+ else pen_settings.cap = GF_LINE_CAP_FLAT;
+
+ if (this.join=='round') pen_settings.join = GF_LINE_JOIN_ROUND;
+ else if (this.join=='bevel') pen_settings.join = GF_LINE_JOIN_BEVEL;
+ else if (this.join=='bevelmiter') pen_settings.join = GF_LINE_JOIN_MITER_SVG;
+ else pen_settings.join = GF_LINE_JOIN_MITER;
+
+ this.outline = this.path.outline(pen_settings);
+ this.outline_brush = create_brush.apply(this, [this.line_color]);
+ } else {
+ this.outline=null;
+ this.outline_brush = null;
+ }
+ }
+
+ if (this.update_flag & UPDATE_COLOR) {
+ if (this.outline_brush) this.outline_brush.set_color(this.line_color);
+ if (!this.is_texture && this.local_stencil) {
+ this.local_stencil.set_color(this.fill);
+ this.local_stencil.set_alphaf(this.alpha);
+ }
+ }
+ this.pids.forEach( pid_link => {
+ pid_link.tx_info.alpha = this.alpha;
+ if (this.alpha<1) {
+ this.can_reuse = false;
+ this.use_blit = false;
+ this.opaque = false; 
+ }
+ });
+
+ this.update_flag = 0;
+
+ if (this.pids.length>1) {
+ //todo, get info from transition to check if we can blit / reuse source
+ if (this.mix_ratio < 0) {
+ this.can_reuse = false;
+ this.use_blit = false;
+ }
+ }
+ if (this.replace_op) {
+ this.can_reuse = false;
+ this.use_blit = false;
+ this.opaque = false;
+ }
+
+ if (this.pids.length) {
+ if (this.can_reuse) {
+ print(GF_LOG_DEBUG, 'Shape ' + this.id + ' setup done: may reuse src as vout framebuffer');
+ } else {
+ print(GF_LOG_DEBUG, 'Shape ' + this.id + ' setup done: draw using texture' + (this.use_blit ? ' or blit ' : '') + (this.opaque ? ', opaque' : ', transparent' ) );
+ }
+ } else {
+ this.can_reuse = false;
+ this.use_blit = false;
+ print(GF_LOG_DEBUG, 'Shape ' + this.id + ' setup done: ' + (this.is_texture ? 'image fill' : 'solid color fill') );
+ if (this.is_texture && sys.pixfmt_transparent(this.local_stencil.pixfmt)) {
+ this.opaque = false;
+ }
+ }
+
+ this.no_draw = false;
+ return 1;
+},
+
+fullscreen: function()
+{
+ this.no_draw = false;
+ if (this.opaque && this.can_reuse) {
+ if (this.pids.length>1) {
+ if (this.mix_ratio == 0) {
+ this.no_draw = true;
+ return 0;
+ }
+ else if (this.mix_ratio == 1) {
+ this.no_draw = true;
+ return 1;
+ }
+ return -1;
+ } else {
+ this.no_draw = true;
+ return 0;
+ }
+ }
+
+ return -1;
+},
+
+identity: function() {
+ if (this.no_draw && !this.outline) 
+ return true;
+ return false;
+},
+is_opaque: function() {
+ return this.blit_path ? false : this.opaque;
+},
+
+
+draw: function(canvas)
+{
+ if (!this.no_draw || this.force_draw) {
+ let blit_rect = this.screen_rect;
+ let blit_tx = this.pids.length ? this.pids[0].texture : null;
+ let do_blit = (blit_rect && this.use_blit && !use_gpu) ? true : false;;
+
+ if (do_blit) {
+ //if 2 inputs, only blit if one or the other
+ if ((this.pids.length==2)) {
+ if (this.mix_ratio == 0) {
+ } else if (this.mix_ratio == 1) {
+ blit_tx = this.pids[1].texture;
+ } else {
+ do_blit = false;
+ }
+ }
+ //if more than 2 inputs, cannot blit
+ else if (this.pids.length>2) {
+ do_blit = false;
+ }
+ if (do_blit && sys.test_mode) {
+ if (this.screen_rect.w != blit_tx.width) do_blit = false;
+ if (this.screen_rect.h != blit_tx.height) do_blit = false;
+ }
+ }
+ if (do_blit && this.blit_path) {
+ blit_rect = get_screen_rect(this.blit_path);
+ if (!blit_rect) do_blit = false;
+ }
+
+ if (do_blit) {
+ try {
+ canvas_blit(blit_tx, blit_rect);
+ } catch (e) {
+ this.use_blit = false;
+ do_blit = false;
+ }
+ }
+
+ if (!do_blit) {
+ let tx = null;
+ if (!this.pids.length || this.replace_op_img) {
+ tx = this.local_stencil;
+ //img points to a seq, update texture (since sequence might have multiple sources)
+ if (this.local_stencil_type==2) {
+ tx = get_sequence_texture(this.img);
+ }
+
+ if (canvas_yuv && this.is_texture && !use_gpu && !this.local_stencil_type) {
+ if (this.yuv_cache_texture == null) {
+ this.yuv_cache_texture = this.local_stencil.rgb2yuv(canvas);
+ }
+ tx = this.yuv_cache_texture;
+ }
+ }
+ if (this.replace_op && !this.replace_op_img) {
+ tx = this.local_stencil;
+ }
+
+ let skip_op = false;
+ //update texture params
+ this.pids.forEach( pid_link => {
+ set_texture_params(pid_link.texture, pid_link.tx_info);
+ if (pid_link.texture == tx) skip_op = true;
+ });
+
+ if (tx && this.replace_tx_info && !skip_op) {
+ set_texture_params(tx, this.replace_tx_info);
+ }
+
+ if (!this.pids.length) {
+ if (tx)
+ canvas_draw(this.path, tx);
+ } else if (this.replace_op && tx) {
+ let replace_par = this.replace_par;
+ if (this.use_mix)
+ replace_par = this.mix_ratio;
+ canvas_draw_sources(this.path, this.replace_op, replace_par, tx);
+ } else {
+ canvas_draw_sources(this.path);
+ }
+ }
+ }
+
+ this.no_draw = false;
+ if (this.outline) {
+ canvas_draw(this.outline, this.outline_brush);
+ }
+
+},
+
+
+point_over: function(pt_x, pt_y)
+{
+ if (this.blit_path)
+ return this.blit_path.point_over(pt_x, pt_y);
+
+ return this.path.point_over(pt_x, pt_y);
+},
+
+}; }

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/fade.js Added

@@ -0,0 +1,82 @@
+
+export const description = "Color fading";
+export const help = "This transition performs fade to/from color of source videos";
+
+export const options = [
+ {name:"color", value: "black", desc: "fade color"},
+ {}
+];
+
+
+export function load() { return {
+
+stencil: null,
+uni_ratio: null,
+uni_use_from: null,
+
+setup: function()
+{
+ this.stencil = new evg.SolidBrush();
+ this.stencil.set_color(this.color);
+},
+
+setup_gl: function(webgl, program, ratio_uniform, first_available_texture_unit)
+{
+ this.uni_ratio =webgl.getUniformLocation(program, 'ratio');
+ this.uni_use_from =webgl.getUniformLocation(program, 'use_from');
+
+ let col_uni = webgl.getUniformLocation(program, 'color');
+ let a = sys.color_component(this.color, 0);
+ let r = sys.color_component(this.color, 1);
+ let g = sys.color_component(this.color, 2);
+ let b = sys.color_component(this.color, 3);
+
+ webgl.uniform4f(col_uni, r, g, b, a);
+
+},
+
+apply: function(canvas, ratio, path, pids)
+{
+ let tx;
+ let use_from = true;
+ ratio -= 0.5;
+ if (ratio<0) {
+ tx = pids[0].texture;
+ ratio = 0.5 + ratio;
+ ratio *= 2;
+ } else {
+ tx = pids[1].texture;
+ ratio = 0.5 - ratio;
+ ratio *= 2;
+ use_from = false;
+ }
+
+ if (use_gpu) {
+ canvas.uniform1f(this.uni_ratio, ratio);
+ canvas.uniform1i(this.uni_use_from, use_from);
+
+ } else {
+ canvas.path = path;
+ canvas.fill(GF_EVG_OPERAND_MIX, ratio, tx, this.stencil);
+ }
+},
+
+
+get_shader_src: function()
+{
+
+ return `
+ uniform vec4 color;
+ uniform bool use_from;
+ vec4 gf_apply_effect() {
+ vec4 col_src;
+ if (use_from) col_src = get_pixel_from(txcoord_from);
+ else col_src = get_pixel_to(txcoord_to);
+
+ return mix(col_src, color, ratio);
+ }
+ `;
+}
+
+
+}; }

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/Bounce.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/BowTieHorizontal.glsl Added

@@ -0,0 +1,120 @@
+// Author: huynx
+// License: MIT
+
+vec2 bottom_left = vec2(0.0, 1.0);
+vec2 bottom_right = vec2(1.0, 1.0);
+vec2 top_left = vec2(0.0, 0.0);
+vec2 top_right = vec2(1.0, 0.0);
+vec2 center = vec2(0.5, 0.5);
+
+float check(vec2 p1, vec2 p2, vec2 p3)
+{
+ return (p1.x - p3.x) * (p2.y - p3.y) - (p2.x - p3.x) * (p1.y - p3.y);
+}
+
+bool PointInTriangle (vec2 pt, vec2 p1, vec2 p2, vec2 p3)
+{
+ bool b1, b2, b3;
+ b1 = check(pt, p1, p2) < 0.0;
+ b2 = check(pt, p2, p3) < 0.0;
+ b3 = check(pt, p3, p1) < 0.0;
+ return ((b1 == b2) && (b2 == b3));
+}
+
+bool in_left_triangle(vec2 p){
+ vec2 vertex1, vertex2, vertex3;
+ vertex1 = vec2(progress, 0.5);
+ vertex2 = vec2(0.0, 0.5-progress);
+ vertex3 = vec2(0.0, 0.5+progress);
+ if (PointInTriangle(p, vertex1, vertex2, vertex3))
+ {
+ return true;
+ }
+ return false;
+}
+
+bool in_right_triangle(vec2 p){
+ vec2 vertex1, vertex2, vertex3;
+ vertex1 = vec2(1.0-progress, 0.5);
+ vertex2 = vec2(1.0, 0.5-progress);
+ vertex3 = vec2(1.0, 0.5+progress);
+ if (PointInTriangle(p, vertex1, vertex2, vertex3))
+ {
+ return true;
+ }
+ return false;
+}
+
+float blur_edge(vec2 bot1, vec2 bot2, vec2 top, vec2 testPt)
+{
+ vec2 lineDir = bot1 - top;
+ vec2 perpDir = vec2(lineDir.y, -lineDir.x);
+ vec2 dirToPt1 = bot1 - testPt;
+ float dist1 = abs(dot(normalize(perpDir), dirToPt1));
+ 
+ lineDir = bot2 - top;
+ perpDir = vec2(lineDir.y, -lineDir.x);
+ dirToPt1 = bot2 - testPt;
+ float min_dist = min(abs(dot(normalize(perpDir), dirToPt1)), dist1);
+ 
+ if (min_dist < 0.005) {
+ return min_dist / 0.005;
+ }
+ else {
+ return 1.0;
+ };
+}
+
+
+vec4 transition (vec2 uv) {
+ if (in_left_triangle(uv))
+ {
+ if (progress < 0.1)
+ {
+ return getFromColor(uv);
+ }
+ if (uv.x < 0.5)
+ {
+ vec2 vertex1 = vec2(progress, 0.5);
+ vec2 vertex2 = vec2(0.0, 0.5-progress);
+ vec2 vertex3 = vec2(0.0, 0.5+progress);
+ return mix(
+ getFromColor(uv),
+ getToColor(uv),
+ blur_edge(vertex2, vertex3, vertex1, uv)
+ );
+ }
+ else
+ {
+ if (progress > 0.0)
+ {
+ return getToColor(uv);
+ }
+ else
+ {
+ return getFromColor(uv);
+ }
+ } 
+ }
+ else if (in_right_triangle(uv))
+ {
+ if (uv.x >= 0.5)
+ {
+ vec2 vertex1 = vec2(1.0-progress, 0.5);
+ vec2 vertex2 = vec2(1.0, 0.5-progress);
+ vec2 vertex3 = vec2(1.0, 0.5+progress);
+ return mix(
+ getFromColor(uv),
+ getToColor(uv),
+ blur_edge(vertex2, vertex3, vertex1, uv)
+ ); 
+ }
+ else
+ {
+ return getFromColor(uv);
+ }
+ }
+ else {
+ return getFromColor(uv);
+ }
+}
\ No newline at end of file

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/BowTieVertical.glsl Added

@@ -0,0 +1,114 @@
+// Author: huynx
+// License: MIT
+
+float check(vec2 p1, vec2 p2, vec2 p3)
+{
+ return (p1.x - p3.x) * (p2.y - p3.y) - (p2.x - p3.x) * (p1.y - p3.y);
+}
+
+bool PointInTriangle (vec2 pt, vec2 p1, vec2 p2, vec2 p3)
+{
+ bool b1, b2, b3;
+ b1 = check(pt, p1, p2) < 0.0;
+ b2 = check(pt, p2, p3) < 0.0;
+ b3 = check(pt, p3, p1) < 0.0;
+ return ((b1 == b2) && (b2 == b3));
+}
+
+bool in_top_triangle(vec2 p){
+ vec2 vertex1, vertex2, vertex3;
+ vertex1 = vec2(0.5, progress);
+ vertex2 = vec2(0.5-progress, 0.0);
+ vertex3 = vec2(0.5+progress, 0.0);
+ if (PointInTriangle(p, vertex1, vertex2, vertex3))
+ {
+ return true;
+ }
+ return false;
+}
+
+bool in_bottom_triangle(vec2 p){
+ vec2 vertex1, vertex2, vertex3;
+ vertex1 = vec2(0.5, 1.0 - progress);
+ vertex2 = vec2(0.5-progress, 1.0);
+ vertex3 = vec2(0.5+progress, 1.0);
+ if (PointInTriangle(p, vertex1, vertex2, vertex3))
+ {
+ return true;
+ }
+ return false;
+}
+
+float blur_edge(vec2 bot1, vec2 bot2, vec2 top, vec2 testPt)
+{
+ vec2 lineDir = bot1 - top;
+ vec2 perpDir = vec2(lineDir.y, -lineDir.x);
+ vec2 dirToPt1 = bot1 - testPt;
+ float dist1 = abs(dot(normalize(perpDir), dirToPt1));
+ 
+ lineDir = bot2 - top;
+ perpDir = vec2(lineDir.y, -lineDir.x);
+ dirToPt1 = bot2 - testPt;
+ float min_dist = min(abs(dot(normalize(perpDir), dirToPt1)), dist1);
+ 
+ if (min_dist < 0.005) {
+ return min_dist / 0.005;
+ }
+ else {
+ return 1.0;
+ };
+}
+
+
+vec4 transition (vec2 uv) {
+ if (in_top_triangle(uv))
+ {
+ if (progress < 0.1)
+ {
+ return getFromColor(uv);
+ }
+ if (uv.y < 0.5)
+ {
+ vec2 vertex1 = vec2(0.5, progress);
+ vec2 vertex2 = vec2(0.5-progress, 0.0);
+ vec2 vertex3 = vec2(0.5+progress, 0.0);
+ return mix(
+ getFromColor(uv),
+ getToColor(uv),
+ blur_edge(vertex2, vertex3, vertex1, uv)
+ );
+ }
+ else
+ {
+ if (progress > 0.0)
+ {
+ return getToColor(uv);
+ }
+ else
+ {
+ return getFromColor(uv);
+ }
+ } 
+ }
+ else if (in_bottom_triangle(uv))
+ {
+ if (uv.y >= 0.5)
+ {
+ vec2 vertex1 = vec2(0.5, 1.0-progress);
+ vec2 vertex2 = vec2(0.5-progress, 1.0);
+ vec2 vertex3 = vec2(0.5+progress, 1.0);
+ return mix(
+ getFromColor(uv),
+ getToColor(uv),
+ blur_edge(vertex2, vertex3, vertex1, uv)
+ ); 
+ }
+ else
+ {
+ return getFromColor(uv);
+ }
+ }
+ else {
+ return getFromColor(uv);
+ }
+}
\ No newline at end of file

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/BowTieWithParameter.glsl Added

@@ -0,0 +1,70 @@
+// Author:KMojek
+// License: MIT
+
+uniform float adjust; // = 0.5;
+uniform bool reverse; // = false;
+
+float check(vec2 p1, vec2 p2, vec2 p3)
+{
+ return (p1.x - p3.x) * (p2.y - p3.y) - (p2.x - p3.x) * (p1.y - p3.y);
+}
+
+bool pointInTriangle(vec2 pt, vec2 p1, vec2 p2, vec2 p3)
+{
+
+ bool b1 = check(pt, p1, p2) < 0.0;
+ bool b2 = check(pt, p2, p3) < 0.0;
+ bool b3 = check(pt, p3, p1) < 0.0;
+ return b1 == b2 && b2 == b3;
+}
+
+const float height = 0.5;
+
+vec4 transition_firstHalf( vec2 uv, float prog )
+{
+ if ( uv.y < 0.5 )
+ {
+ vec2 botLeft = vec2( -0., prog-height );
+ vec2 botRight = vec2( 1., prog-height );
+ vec2 tip = vec2( adjust, prog );
+ if ( pointInTriangle( uv, botLeft, botRight, tip ) )
+ return getToColor(uv);
+ }
+ else
+ {
+ vec2 topLeft = vec2( -0., 1.-prog+height );
+ vec2 topRight = vec2( 1., 1.-prog+height );
+ vec2 tip = vec2( adjust, 1.-prog );
+ if ( pointInTriangle( uv, topLeft, topRight, tip ) )
+ return getToColor( uv );
+ }
+ return getFromColor( uv );
+}
+
+vec4 transition_secondHalf( vec2 uv, float prog )
+{
+ if ( uv.x > adjust )
+ {
+ vec2 top = vec2( prog + height, 1. );
+ vec2 bot = vec2( prog + height, -0. );
+ vec2 tip = vec2( mix( adjust, 1.0, 2.0 * (prog - 0.5) ), 0.5 );
+ if ( pointInTriangle( uv, top, bot, tip) )
+ return getFromColor( uv );
+ }
+ else
+ {
+ vec2 top = vec2( 1.0-prog - height, 1. );
+ vec2 bot = vec2( 1.0-prog - height, -0. );
+ vec2 tip = vec2( mix( adjust, 0.0, 2.0 * (prog - 0.5) ), 0.5 );
+ if ( pointInTriangle( uv, top, bot, tip) )
+ return getFromColor( uv );
+ }
+ return getToColor( uv );
+}
+
+vec4 transition (vec2 uv) {
+ if ( reverse )
+ return ( progress < 0.5 ) ? transition_secondHalf( uv, 1.-progress ) : transition_firstHalf( uv, 1.-progress );
+ else
+ return ( progress < 0.5 ) ? transition_firstHalf( uv, progress ) : transition_secondHalf( uv, progress );
+}
\ No newline at end of file

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/ButterflyWaveScrawler.glsl Added

@@ -0,0 +1,28 @@
+// Author: mandubian
+// License: MIT
+uniform float amplitude; // = 1.0
+uniform float waves; // = 30.0
+uniform float colorSeparation; // = 0.3
+float PI = 3.14159265358979323846264;
+float compute(vec2 p, float progress, vec2 center) {
+vec2 o = p*sin(progress * amplitude)-center;
+// horizontal vector
+vec2 h = vec2(1., 0.);
+// butterfly polar function (don't ask me why this one :))
+float theta = acos(dot(o, h)) * waves;
+return (exp(cos(theta)) - 2.*cos(4.*theta) + pow(sin((2.*theta - PI) / 24.), 5.)) / 10.;
+}
+vec4 transition(vec2 uv) {
+  vec2 p = uv.xy / vec2(1.0).xy;
+  float inv = 1. - progress;
+  vec2 dir = p - vec2(.5);
+  float dist = length(dir);
+  float disp = compute(p, progress, vec2(0.5, 0.5)) ;
+  vec4 texTo = getToColor(p + inv*disp);
+  vec4 texFrom = vec4(
+  getFromColor(p + progress*disp*(1.0 - colorSeparation)).r,
+  getFromColor(p + progress*disp).g,
+  getFromColor(p + progress*disp*(1.0 + colorSeparation)).b,
+  1.0);
+  return texTo*progress + texFrom*inv;
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/CircleCrop.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/ColourDistance.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/CrazyParametricFun.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/CrossZoom.glsl Added

@@ -0,0 +1,64 @@
+// License: MIT
+// Author: rectalogic
+// ported by gre from https://gist.github.com/rectalogic/b86b90161503a0023231
+
+// Converted from https://github.com/rectalogic/rendermix-basic-effects/blob/master/assets/com/rendermix/CrossZoom/CrossZoom.frag
+// Which is based on https://github.com/evanw/glfx.js/blob/master/src/filters/blur/zoomblur.js
+// With additional easing functions from https://github.com/rectalogic/rendermix-basic-effects/blob/master/assets/com/rendermix/Easing/Easing.glsllib
+
+uniform float strength; // = 0.4
+
+const float PI = 3.141592653589793;
+
+float Linear_ease(in float begin, in float change, in float duration, in float time) {
+ return change * time / duration + begin;
+}
+
+float Exponential_easeInOut(in float begin, in float change, in float duration, in float time) {
+ if (time == 0.0)
+ return begin;
+ else if (time == duration)
+ return begin + change;
+ time = time / (duration / 2.0);
+ if (time < 1.0)
+ return change / 2.0 * pow(2.0, 10.0 * (time - 1.0)) + begin;
+ return change / 2.0 * (-pow(2.0, -10.0 * (time - 1.0)) + 2.0) + begin;
+}
+
+float Sinusoidal_easeInOut(in float begin, in float change, in float duration, in float time) {
+ return -change / 2.0 * (cos(PI * time / duration) - 1.0) + begin;
+}
+
+float rand (vec2 co) {
+ return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
+}
+
+vec3 crossFade(in vec2 uv, in float dissolve) {
+ return mix(getFromColor(uv).rgb, getToColor(uv).rgb, dissolve);
+}
+
+vec4 transition(vec2 uv) {
+ vec2 texCoord = uv.xy / vec2(1.0).xy;
+
+ // Linear interpolate center across center half of the image
+ vec2 center = vec2(Linear_ease(0.25, 0.5, 1.0, progress), 0.5);
+ float dissolve = Exponential_easeInOut(0.0, 1.0, 1.0, progress);
+
+ // Mirrored sinusoidal loop. 0->strength then strength->0
+ float strength = Sinusoidal_easeInOut(0.0, strength, 0.5, progress);
+
+ vec3 color = vec3(0.0);
+ float total = 0.0;
+ vec2 toCenter = center - texCoord;
+
+ /* randomize the lookup values to hide the fixed number of samples */
+ float offset = rand(uv);
+
+ for (float t = 0.0; t <= 40.0; t++) {
+ float percent = (t + offset) / 40.0;
+ float weight = 4.0 * (percent - percent * percent);
+ color += crossFade(texCoord + toCenter * percent * strength, dissolve) * weight;
+ total += weight;
+ }
+ return vec4(color / total, 1.0);
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/Directional.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/DoomScreenTransition.glsl Added

@@ -0,0 +1,59 @@
+// Author: Zeh Fernando
+// License: MIT
+
+
+// Transition parameters --------
+
+// Number of total bars/columns
+uniform int bars; // = 30
+
+// Multiplier for speed ratio. 0 = no variation when going down, higher = some elements go much faster
+uniform float amplitude; // = 2
+
+// Further variations in speed. 0 = no noise, 1 = super noisy (ignore frequency)
+uniform float noise; // = 0.1
+
+// Speed variation horizontally. the bigger the value, the shorter the waves
+uniform float frequency; // = 0.5
+
+// How much the bars seem to "run" from the middle of the screen first (sticking to the sides). 0 = no drip, 1 = curved drip
+uniform float dripScale; // = 0.5
+
+
+// The code proper --------
+
+float rand(int num) {
+ return fract(mod(float(num) * 67123.313, 12.0) * sin(float(num) * 10.3) * cos(float(num)));
+}
+
+float wave(int num) {
+ float fn = float(num) * frequency * 0.1 * float(bars);
+ return cos(fn * 0.5) * cos(fn * 0.13) * sin((fn+10.0) * 0.3) / 2.0 + 0.5;
+}
+
+float drip(int num) {
+ return sin(float(num) / float(bars - 1) * 3.141592) * dripScale;
+}
+
+float pos(int num) {
+ return (noise == 0.0 ? wave(num) : mix(wave(num), rand(num), noise)) + (dripScale == 0.0 ? 0.0 : drip(num));
+}
+
+vec4 transition(vec2 uv) {
+ int bar = int(uv.x * (float(bars)));
+ float scale = 1.0 + pos(bar) * amplitude;
+ float phase = progress * scale;
+ float posY = uv.y / vec2(1.0).y;
+ vec2 p;
+ vec4 c;
+ if (phase + posY < 1.0) {
+ p = vec2(uv.x, uv.y + mix(0.0, vec2(1.0).y, phase)) / vec2(1.0).xy;
+ c = getFromColor(p);
+ } else {
+ p = uv.xy / vec2(1.0).xy;
+ c = getToColor(p);
+ }
+
+ // Finally, apply the color
+ return c;
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/Dreamy.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/DreamyZoom.glsl Added

@@ -0,0 +1,40 @@
+// Author: Zeh Fernando
+// License: MIT
+
+// Definitions --------
+#define DEG2RAD 0.03926990816987241548078304229099 // 1/180*PI
+
+
+// Transition parameters --------
+
+// In degrees
+uniform float rotation; // = 6
+
+// Multiplier
+uniform float scale; // = 1.2
+
+
+// The code proper --------
+
+vec4 transition(vec2 uv) {
+ // Massage parameters
+ float phase = progress < 0.5 ? progress * 2.0 : (progress - 0.5) * 2.0;
+ float angleOffset = progress < 0.5 ? mix(0.0, rotation * DEG2RAD, phase) : mix(-rotation * DEG2RAD, 0.0, phase);
+ float newScale = progress < 0.5 ? mix(1.0, scale, phase) : mix(scale, 1.0, phase);
+ 
+ vec2 center = vec2(0, 0);
+
+ // Calculate the source point
+ vec2 assumedCenter = vec2(0.5, 0.5);
+ vec2 p = (uv.xy - vec2(0.5, 0.5)) / newScale * vec2(ratio, 1.0);
+
+ // This can probably be optimized (with distance())
+ float angle = atan(p.y, p.x) + angleOffset;
+ float dist = distance(center, p);
+ p.x = cos(angle) * dist / ratio + 0.5;
+ p.y = sin(angle) * dist + 0.5;
+ vec4 c = progress < 0.5 ? getFromColor(p) : getToColor(p);
+
+ // Finally, apply the color
+ return c + (progress < 0.5 ? mix(0.0, 1.0, phase) : mix(1.0, 0.0, phase));
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/FilmBurn.glsl Added

@@ -0,0 +1,59 @@
+// author: Anastasia Dunbar
+// license: MIT
+uniform float Seed; // = 2.31
+float sigmoid(float x, float a) {
+ float b = pow(x*2.,a)/2.;
+ if (x > .5) {
+ b = 1.-pow(2.-(x*2.),a)/2.;
+ }
+	return b;
+}
+float rand(float co){
+ return fract(sin((co*24.9898)+Seed)*43758.5453);
+}
+float rand(vec2 co){
+ return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
+}
+float apow(float a,float b) { return pow(abs(a),b)*sign(b); }
+vec3 pow3(vec3 a,vec3 b) { return vec3(apow(a.r,b.r),apow(a.g,b.g),apow(a.b,b.b)); }
+float smooth_mix(float a,float b,float c) { return mix(a,b,sigmoid(c,2.)); }
+float random(vec2 co, float shft){
+ co += 10.;
+ return smooth_mix(fract(sin(dot(co.xy ,vec2(12.9898+(floor(shft)*.5),78.233+Seed))) * 43758.5453),fract(sin(dot(co.xy ,vec2(12.9898+(floor(shft+1.)*.5),78.233+Seed))) * 43758.5453),fract(shft));
+}
+float smooth_random(vec2 co, float shft) {
+	return smooth_mix(smooth_mix(random(floor(co),shft),random(floor(co+vec2(1.,0.)),shft),fract(co.x)),smooth_mix(random(floor(co+vec2(0.,1.)),shft),random(floor(co+vec2(1.,1.)),shft),fract(co.x)),fract(co.y));
+}
+vec4 texture(vec2 p) {
+ return mix(getFromColor(p), getToColor(p), sigmoid(progress,10.));
+}
+#define pi 3.14159265358979323
+#define clamps(x) clamp(x,0.,1.)
+
+vec4 transition(vec2 p) {
+ vec3 f = vec3(0.);
+ for (float i = 0.; i < 13.; i++) {
+ f += sin(((p.x*rand(i)*6.)+(progress*8.))+rand(i+1.43))*sin(((p.y*rand(i+4.4)*6.)+(progress*6.))+rand(i+2.4));
+ f += 1.-clamps(length(p-vec2(smooth_random(vec2(progress*1.3),i+1.),smooth_random(vec2(progress*.5),i+6.25)))*mix(20.,70.,rand(i)));
+ }
+ f += 4.;
+ f /= 11.;
+ f = pow3(f*vec3(1.,0.7,0.6),vec3(1.,2.-sin(progress*pi),1.3));
+ f *= sin(progress*pi);
+ 
+ p -= .5;
+ p *= 1.+(smooth_random(vec2(progress*5.),6.3)*sin(progress*pi)*.05);
+ p += .5;
+ 
+ vec4 blurred_image = vec4(0.);
+ float bluramount = sin(progress*pi)*.03;
+ #define repeats 50.
+ for (float i = 0.; i < repeats; i++) { 
+ vec2 q = vec2(cos(degrees((i/repeats)*360.)),sin(degrees((i/repeats)*360.))) * (rand(vec2(i,p.x+p.y))+bluramount); 
+ vec2 uv2 = p+(q*bluramount);
+ blurred_image += texture(uv2);
+ }
+ blurred_image /= repeats;
+ 
+ return blurred_image+vec4(f,0.);
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/GlitchDisplace.glsl Added

@@ -0,0 +1,79 @@
+// Author: Matt DesLauriers
+// License: MIT
+
+//#ifdef GL_ES
+//precision highp float;
+//#endif
+
+float random(vec2 co)
+{
+ float a = 12.9898;
+ float b = 78.233;
+ float c = 43758.5453;
+ float dt= dot(co.xy ,vec2(a,b));
+ float sn= mod(dt,3.14);
+ return fract(sin(sn) * c);
+}
+float voronoi( in vec2 x ) {
+ vec2 p = floor( x );
+ vec2 f = fract( x );
+ float res = 8.0;
+ for( float j=-1.; j<=1.; j++ )
+ for( float i=-1.; i<=1.; i++ ) {
+ vec2 b = vec2( i, j );
+ vec2 r = b - f + random( p + b );
+ float d = dot( r, r );
+ res = min( res, d );
+ }
+ return sqrt( res );
+}
+
+vec2 displace(vec4 tex, vec2 texCoord, float dotDepth, float textureDepth, float strength) {
+ float b = voronoi(.003 * texCoord + 2.0);
+ float g = voronoi(0.2 * texCoord);
+ float r = voronoi(texCoord - 1.0);
+ vec4 dt = tex * 1.0;
+ vec4 dis = dt * dotDepth + 1.0 - tex * textureDepth;
+
+ dis.x = dis.x - 1.0 + textureDepth*dotDepth;
+ dis.y = dis.y - 1.0 + textureDepth*dotDepth;
+ dis.x *= strength;
+ dis.y *= strength;
+ vec2 res_uv = texCoord ;
+ res_uv.x = res_uv.x + dis.x - 0.0;
+ res_uv.y = res_uv.y + dis.y;
+ return res_uv;
+}
+
+float ease1(float t) {
+ return t == 0.0 || t == 1.0
+ ? t
+ : t < 0.5
+ ? +0.5 * pow(2.0, (20.0 * t) - 10.0)
+ : -0.5 * pow(2.0, 10.0 - (t * 20.0)) + 1.0;
+}
+float ease2(float t) {
+ return t == 1.0 ? t : 1.0 - pow(2.0, -10.0 * t);
+}
+
+
+
+vec4 transition(vec2 uv) {
+ vec2 p = uv.xy / vec2(1.0).xy;
+ vec4 color1 = getFromColor(p);
+ vec4 color2 = getToColor(p);
+ vec2 disp = displace(color1, p, 0.33, 0.7, 1.0-ease1(progress));
+ vec2 disp2 = displace(color2, p, 0.33, 0.5, ease2(progress));
+ vec4 dColor1 = getToColor(disp);
+ vec4 dColor2 = getFromColor(disp2);
+ float val = ease1(progress);
+ vec3 gray = vec3(dot(min(dColor2, dColor1).rgb, vec3(0.299, 0.587, 0.114)));
+ dColor2 = vec4(gray, 1.0);
+ dColor2 *= 2.0;
+ color1 = mix(color1, dColor2, smoothstep(0.0, 0.5, progress));
+ color2 = mix(color2, dColor1, smoothstep(1.0, 0.5, progress));
+ return mix(color1, color2, val);
+ //gl_FragColor = mix(gl_FragColor, dColor, smoothstep(0.0, 0.5, progress));
+
+ //gl_FragColor = mix(texture2D(from, p), texture2D(to, p), progress);
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/GlitchMemories.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/GridFlip.glsl Added

@@ -0,0 +1,72 @@
+// License: MIT
+// Author: TimDonselaar
+// ported by gre from https://gist.github.com/TimDonselaar/9bcd1c4b5934ba60087bdb55c2ea92e5
+
+uniform ivec2 size; // = ivec2(4)
+uniform float pause; // = 0.1
+uniform float dividerWidth; // = 0.05
+uniform vec4 bgcolor; // = vec4(0.0, 0.0, 0.0, 1.0)
+uniform float randomness; // = 0.1
+ 
+float rand (vec2 co) {
+ return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
+}
+
+float getDelta(vec2 p) {
+ vec2 rectanglePos = floor(vec2(size) * p);
+ vec2 rectangleSize = vec2(1.0 / vec2(size).x, 1.0 / vec2(size).y);
+ float top = rectangleSize.y * (rectanglePos.y + 1.0);
+ float bottom = rectangleSize.y * rectanglePos.y;
+ float left = rectangleSize.x * rectanglePos.x;
+ float right = rectangleSize.x * (rectanglePos.x + 1.0);
+ float minX = min(abs(p.x - left), abs(p.x - right));
+ float minY = min(abs(p.y - top), abs(p.y - bottom));
+ return min(minX, minY);
+}
+
+float getDividerSize() {
+ vec2 rectangleSize = vec2(1.0 / vec2(size).x, 1.0 / vec2(size).y);
+ return min(rectangleSize.x, rectangleSize.y) * dividerWidth;
+}
+
+vec4 transition(vec2 p) {
+ if(progress < pause) {
+ float currentProg = progress / pause;
+ float a = 1.0;
+ if(getDelta(p) < getDividerSize()) {
+ a = 1.0 - currentProg;
+ }
+ return mix(bgcolor, getFromColor(p), a);
+ }
+ else if(progress < 1.0 - pause){
+ if(getDelta(p) < getDividerSize()) {
+ return bgcolor;
+ } else {
+ float currentProg = (progress - pause) / (1.0 - pause * 2.0);
+ vec2 q = p;
+ vec2 rectanglePos = floor(vec2(size) * q);
+ 
+ float r = rand(rectanglePos) - randomness;
+ float cp = smoothstep(0.0, 1.0 - r, currentProg);
+ 
+ float rectangleSize = 1.0 / vec2(size).x;
+ float delta = rectanglePos.x * rectangleSize;
+ float offset = rectangleSize / 2.0 + delta;
+ 
+ p.x = (p.x - offset)/abs(cp - 0.5)*0.5 + offset;
+ vec4 a = getFromColor(p);
+ vec4 b = getToColor(p);
+ 
+ float s = step(abs(vec2(size).x * (q.x - delta) - 0.5), abs(cp - 0.5));
+ return mix(bgcolor, mix(b, a, step(cp, 0.5)), s);
+ }
+ }
+ else {
+ float currentProg = (progress - 1.0 + pause) / pause;
+ float a = 1.0;
+ if(getDelta(p) < getDividerSize()) {
+ a = currentProg;
+ }
+ return mix(bgcolor, getToColor(p), a);
+ }
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/InvertedPageCurl.glsl Added

@@ -0,0 +1,214 @@
+// author: Hewlett-Packard
+// license: BSD 3 Clause
+// Adapted by Sergey Kosarevsky from:
+// http://rectalogic.github.io/webvfx/examples_2transition-shader-pagecurl_8html-example.html
+
+/*
+Copyright (c) 2010 Hewlett-Packard Development Company, L.P. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of Hewlett-Packard nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+in vec2 texCoord;
+*/
+
+const float MIN_AMOUNT = -0.16;
+const float MAX_AMOUNT = 1.5;
+float amount = progress * (MAX_AMOUNT - MIN_AMOUNT) + MIN_AMOUNT;
+
+const float PI = 3.141592653589793;
+
+const float scale = 512.0;
+const float sharpness = 3.0;
+
+float cylinderCenter = amount;
+// 360 degrees * amount
+float cylinderAngle = 2.0 * PI * amount;
+
+const float cylinderRadius = 1.0 / PI / 2.0;
+
+vec3 hitPoint(float hitAngle, float yc, vec3 point, mat3 rrotation)
+{
+ float hitPoint = hitAngle / (2.0 * PI);
+ point.y = hitPoint;
+ return rrotation * point;
+}
+
+vec4 antiAlias(vec4 color1, vec4 color2, float distanc)
+{
+ distanc *= scale;
+ if (distanc < 0.0) return color2;
+ if (distanc > 2.0) return color1;
+ float dd = pow(1.0 - distanc / 2.0, sharpness);
+ return ((color2 - color1) * dd) + color1;
+}
+
+float distanceToEdge(vec3 point)
+{
+ float dx = abs(point.x > 0.5 ? 1.0 - point.x : point.x);
+ float dy = abs(point.y > 0.5 ? 1.0 - point.y : point.y);
+ if (point.x < 0.0) dx = -point.x;
+ if (point.x > 1.0) dx = point.x - 1.0;
+ if (point.y < 0.0) dy = -point.y;
+ if (point.y > 1.0) dy = point.y - 1.0;
+ if ((point.x < 0.0 || point.x > 1.0) && (point.y < 0.0 || point.y > 1.0)) return sqrt(dx * dx + dy * dy);
+ return min(dx, dy);
+}
+
+vec4 seeThrough(float yc, vec2 p, mat3 rotation, mat3 rrotation)
+{
+ float hitAngle = PI - (acos(yc / cylinderRadius) - cylinderAngle);
+ vec3 point = hitPoint(hitAngle, yc, rotation * vec3(p, 1.0), rrotation);
+ if (yc <= 0.0 && (point.x < 0.0 || point.y < 0.0 || point.x > 1.0 || point.y > 1.0))
+ {
+ return getToColor(p);
+ }
+
+ if (yc > 0.0) return getFromColor(p);
+
+ vec4 color = getFromColor(point.xy);
+ vec4 tcolor = vec4(0.0);
+
+ return antiAlias(color, tcolor, distanceToEdge(point));
+}
+
+vec4 seeThroughWithShadow(float yc, vec2 p, vec3 point, mat3 rotation, mat3 rrotation)
+{
+ float shadow = distanceToEdge(point) * 30.0;
+ shadow = (1.0 - shadow) / 3.0;
+
+ if (shadow < 0.0) shadow = 0.0; else shadow *= amount;
+
+ vec4 shadowColor = seeThrough(yc, p, rotation, rrotation);
+ shadowColor.r -= shadow;
+ shadowColor.g -= shadow;
+ shadowColor.b -= shadow;
+
+ return shadowColor;
+}
+
+vec4 backside(float yc, vec3 point)
+{
+ vec4 color = getFromColor(point.xy);
+ float gray = (color.r + color.b + color.g) / 15.0;
+ gray += (8.0 / 10.0) * (pow(1.0 - abs(yc / cylinderRadius), 2.0 / 10.0) / 2.0 + (5.0 / 10.0));
+ color.rgb = vec3(gray);
+ return color;
+}
+
+vec4 behindSurface(vec2 p, float yc, vec3 point, mat3 rrotation)
+{
+ float shado = (1.0 - ((-cylinderRadius - yc) / amount * 7.0)) / 6.0;
+ shado *= 1.0 - abs(point.x - 0.5);
+
+ yc = (-cylinderRadius - cylinderRadius - yc);
+
+ float hitAngle = (acos(yc / cylinderRadius) + cylinderAngle) - PI;
+ point = hitPoint(hitAngle, yc, point, rrotation);
+
+ if (yc < 0.0 && point.x >= 0.0 && point.y >= 0.0 && point.x <= 1.0 && point.y <= 1.0 && (hitAngle < PI || amount > 0.5))
+ {
+ shado = 1.0 - (sqrt(pow(point.x - 0.5, 2.0) + pow(point.y - 0.5, 2.0)) / (71.0 / 100.0));
+ shado *= pow(-yc / cylinderRadius, 3.0);
+ shado *= 0.5;
+ }
+ else
+ {
+ shado = 0.0;
+ }
+ return vec4(getToColor(p).rgb - shado, 1.0);
+}
+
+vec4 transition(vec2 p) {
+
+ const float angle = 100.0 * PI / 180.0;
+ float c = cos(-angle);
+ float s = sin(-angle);
+
+ mat3 rotation = mat3( c, s, 0,
+ -s, c, 0,
+ -0.801, 0.8900, 1
+ );
+ c = cos(angle);
+ s = sin(angle);
+
+ mat3 rrotation = mat3(	c, s, 0,
+ -s, c, 0,
+ 0.98500, 0.985, 1
+ );
+
+ vec3 point = rotation * vec3(p, 1.0);
+
+ float yc = point.y - cylinderCenter;
+
+ if (yc < -cylinderRadius)
+ {
+ // Behind surface
+ return behindSurface(p,yc, point, rrotation);
+ }
+
+ if (yc > cylinderRadius)
+ {
+ // Flat surface
+ return getFromColor(p);
+ }
+
+ float hitAngle = (acos(yc / cylinderRadius) + cylinderAngle) - PI;
+
+ float hitAngleMod = mod(hitAngle, 2.0 * PI);
+ if ((hitAngleMod > PI && amount < 0.5) || (hitAngleMod > PI/2.0 && amount < 0.0))
+ {
+ return seeThrough(yc, p, rotation, rrotation);
+ }
+
+ point = hitPoint(hitAngle, yc, point, rrotation);
+
+ if (point.x < 0.0 || point.y < 0.0 || point.x > 1.0 || point.y > 1.0)
+ {
+ return seeThroughWithShadow(yc, p, point, rotation, rrotation);
+ }
+
+ vec4 color = backside(yc, point);
+
+ vec4 otherColor;
+ if (yc < 0.0)
+ {
+ float shado = 1.0 - (sqrt(pow(point.x - 0.5, 2.0) + pow(point.y - 0.5, 2.0)) / 0.71);
+ shado *= pow(-yc / cylinderRadius, 3.0);
+ shado *= 0.5;
+ otherColor = vec4(0.0, 0.0, 0.0, shado);
+ }
+ else
+ {
+ otherColor = getFromColor(p);
+ }
+
+ color = antiAlias(color, otherColor, cylinderRadius - abs(yc));
+
+ vec4 cl = seeThroughWithShadow(yc, p, point, rotation, rrotation);
+ float dist = distanceToEdge(point);
+
+ return antiAlias(color, cl, dist);
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/LeftRight.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/LinearBlur.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/Mosaic.glsl Added

@@ -0,0 +1,42 @@
+// License: MIT
+// Author: Xaychru
+// ported by gre from https://gist.github.com/Xaychru/130bb7b7affedbda9df5
+
+#define PI 3.14159265358979323
+#define POW2(X) X*X
+#define POW3(X) X*X*X
+uniform int endx; // = 2
+uniform int endy; // = -1
+
+float Rand(vec2 v) {
+  return fract(sin(dot(v.xy ,vec2(12.9898,78.233))) * 43758.5453);
+}
+vec2 Rotate(vec2 v, float a) {
+  mat2 rm = mat2(cos(a), -sin(a),
+                 sin(a), cos(a));
+  return rm*v;
+}
+float CosInterpolation(float x) {
+  return -cos(x*PI)/2.+.5;
+}
+vec4 transition(vec2 uv) {
+  vec2 p = uv.xy / vec2(1.0).xy - .5;
+  vec2 rp = p;
+  float rpr = (progress*2.-1.);
+  float z = -(rpr*rpr*2.) + 3.;
+  float az = abs(z);
+  rp *= az;
+  rp += mix(vec2(.5, .5), vec2(float(endx) + .5, float(endy) + .5), POW2(CosInterpolation(progress)));
+  vec2 mrp = mod(rp, 1.);
+  vec2 crp = rp;
+  bool onEnd = int(floor(crp.x))==endx&&int(floor(crp.y))==endy;
+  if(!onEnd) {
+    float ang = float(int(Rand(floor(crp))*4.))*.5*PI;
+    mrp = vec2(.5) + Rotate(mrp-vec2(.5), ang);
+  }
+  if(onEnd || Rand(floor(crp))>.5) {
+    return getToColor(mrp);
+  } else {
+    return getFromColor(mrp);
+  }
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/PolkaDotsCurtain.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/Radial.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/SimpleZoom.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/StereoViewer.glsl Added

@@ -0,0 +1,210 @@
+// Tunable parameters
+// How much to zoom (out) for the effect ~ 0.5 - 1.0
+uniform float zoom; // = 0.88
+// Corner radius as a fraction of the image height
+uniform float corner_radius; // = 0.22
+
+// author: Ted Schundler
+// license: BSD 2 Clause
+// Free for use and modification by anyone with credit
+
+// Copyright (c) 2016, Theodore K Schundler
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+///////////////////////////////////////////////////////////////////////////////
+// Stereo Viewer Toy Transition //
+// //
+// Inspired by ViewMaster / Image3D image viewer devices. //
+// This effect is similar to what you see when you press the device's lever. //
+// There is a quick zoom in / out to make the transition 'valid' for GLSL.io //
+///////////////////////////////////////////////////////////////////////////////
+
+const vec4 black = vec4(0.0, 0.0, 0.0, 1.0);
+const vec2 c00 = vec2(0.0, 0.0); // the four corner points
+const vec2 c01 = vec2(0.0, 1.0);
+const vec2 c11 = vec2(1.0, 1.0);
+const vec2 c10 = vec2(1.0, 0.0);
+
+// Check if a point is within a given corner
+bool in_corner(vec2 p, vec2 corner, vec2 radius) {
+ // determine the direction we want to be filled
+ vec2 axis = (c11 - corner) - corner;
+
+ // warp the point so we are always testing the bottom left point with the
+ // circle centered on the origin
+ p = p - (corner + axis * radius);
+ p *= axis / radius;
+ return (p.x > 0.0 && p.y > -1.0) || (p.y > 0.0 && p.x > -1.0) || dot(p, p) < 1.0;
+}
+
+// Check all four corners
+// return a float for v2 for anti-aliasing?
+bool test_rounded_mask(vec2 p, vec2 corner_size) {
+ return
+ in_corner(p, c00, corner_size) &&
+ in_corner(p, c01, corner_size) &&
+ in_corner(p, c10, corner_size) &&
+ in_corner(p, c11, corner_size);
+}
+
+// Screen blend mode - https://en.wikipedia.org/wiki/Blend_modes
+// This more closely approximates what you see than linear blending
+vec4 screen(vec4 a, vec4 b) {
+ return 1.0 - (1.0 - a) * (1.0 -b);
+}
+
+// Given RGBA, find a value that when screened with itself
+// will yield the original value.
+vec4 unscreen(vec4 c) {
+ return 1.0 - sqrt(1.0 - c);
+}
+
+// Grab a pixel, only if it isn't masked out by the rounded corners
+vec4 sample_with_corners_from(vec2 p, vec2 corner_size) {
+ p = (p - 0.5) / zoom + 0.5;
+ if (!test_rounded_mask(p, corner_size)) {
+ return black;
+ }
+ return unscreen(getFromColor(p));
+}
+
+vec4 sample_with_corners_to(vec2 p, vec2 corner_size) {
+ p = (p - 0.5) / zoom + 0.5;
+ if (!test_rounded_mask(p, corner_size)) {
+ return black;
+ }
+ return unscreen(getToColor(p));
+}
+
+// special sampling used when zooming - extra zoom parameter and don't unscreen
+vec4 simple_sample_with_corners_from(vec2 p, vec2 corner_size, float zoom_amt) {
+ p = (p - 0.5) / (1.0 - zoom_amt + zoom * zoom_amt) + 0.5;
+ if (!test_rounded_mask(p, corner_size)) {
+ return black;
+ }
+ return getFromColor(p);
+}
+
+vec4 simple_sample_with_corners_to(vec2 p, vec2 corner_size, float zoom_amt) {
+ p = (p - 0.5) / (1.0 - zoom_amt + zoom * zoom_amt) + 0.5;
+ if (!test_rounded_mask(p, corner_size)) {
+ return black;
+ }
+ return getToColor(p);
+}
+
+// Basic 2D affine transform matrix helpers
+// These really shouldn't be used in a fragment shader - I should work out the
+// the math for a translate & rotate function as a pair of dot products instead
+
+mat3 rotate2d(float angle, float ratio) {
+ float s = sin(angle);
+ float c = cos(angle);
+ return mat3(
+ c, s ,0.0,
+ -s, c, 0.0,
+ 0.0, 0.0, 1.0);
+}
+
+mat3 translate2d(float x, float y) {
+ return mat3(
+ 1.0, 0.0, 0,
+ 0.0, 1.0, 0,
+ -x, -y, 1.0);
+}
+
+mat3 scale2d(float x, float y) {
+ return mat3(
+ x, 0.0, 0,
+ 0.0, y, 0,
+ 0, 0, 1.0);
+}
+
+// Split an image and rotate one up and one down along off screen pivot points
+vec4 get_cross_rotated(vec3 p3, float angle, vec2 corner_size, float ratio) {
+ angle = angle * angle; // easing
+ angle /= 2.4; // works out to be a good number of radians
+
+ mat3 center_and_scale = translate2d(-0.5, -0.5) * scale2d(1.0, ratio);
+ mat3 unscale_and_uncenter = scale2d(1.0, 1.0/ratio) * translate2d(0.5,0.5);
+ mat3 slide_left = translate2d(-2.0,0.0);
+ mat3 slide_right = translate2d(2.0,0.0);
+ mat3 rotate = rotate2d(angle, ratio);
+
+ mat3 op_a = center_and_scale * slide_right * rotate * slide_left * unscale_and_uncenter;
+ mat3 op_b = center_and_scale * slide_left * rotate * slide_right * unscale_and_uncenter;
+
+ vec4 a = sample_with_corners_from((op_a * p3).xy, corner_size);
+ vec4 b = sample_with_corners_from((op_b * p3).xy, corner_size);
+
+ return screen(a, b);
+}
+
+// Image stays put, but this time move two masks
+vec4 get_cross_masked(vec3 p3, float angle, vec2 corner_size, float ratio) {
+ angle = 1.0 - angle;
+ angle = angle * angle; // easing
+ angle /= 2.4;
+
+ vec4 img;
+
+ mat3 center_and_scale = translate2d(-0.5, -0.5) * scale2d(1.0, ratio);
+ mat3 unscale_and_uncenter = scale2d(1.0 / zoom, 1.0 / (zoom * ratio)) * translate2d(0.5,0.5);
+ mat3 slide_left = translate2d(-2.0,0.0);
+ mat3 slide_right = translate2d(2.0,0.0);
+ mat3 rotate = rotate2d(angle, ratio);
+
+ mat3 op_a = center_and_scale * slide_right * rotate * slide_left * unscale_and_uncenter;
+ mat3 op_b = center_and_scale * slide_left * rotate * slide_right * unscale_and_uncenter;
+
+ bool mask_a = test_rounded_mask((op_a * p3).xy, corner_size);
+ bool mask_b = test_rounded_mask((op_b * p3).xy, corner_size);
+
+ if (mask_a || mask_b) {
+ img = sample_with_corners_to(p3.xy, corner_size);
+ return screen(mask_a ? img : black, mask_b ? img : black);
+ } else {
+ return black;
+ }
+}
+
+vec4 transition(vec2 uv) {
+ float a;
+ vec2 p=uv.xy/vec2(1.0).xy;
+ vec3 p3 = vec3(p.xy, 1.0); // for 2D matrix transforms
+
+ // corner is warped to represent to size after mapping to 1.0, 1.0
+ vec2 corner_size = vec2(corner_radius / ratio, corner_radius);
+
+ if (progress <= 0.0) {
+ // 0.0: start with the base frame always
+ return getFromColor(p);
+ } else if (progress < 0.1) {
+ // 0.0-0.1: zoom out and add rounded corners
+ a = progress / 0.1;
+ return simple_sample_with_corners_from(p, corner_size * a, a);
+ } else if (progress < 0.48) {
+ // 0.1-0.48: Split original image apart
+ a = (progress - 0.1)/0.38;
+ return get_cross_rotated(p3, a, corner_size, ratio);
+ } else if (progress < 0.9) {
+ // 0.48-0.52: black
+ // 0.52 - 0.9: unmask new image
+ return get_cross_masked(p3, (progress - 0.52)/0.38, corner_size, ratio);
+ } else if (progress < 1.0) {
+ // zoom out and add rounded corners
+ a = (1.0 - progress) / 0.1;
+ return simple_sample_with_corners_to(p, corner_size * a, a);
+ } else {
+ // 1.0 end with base frame
+ return getToColor(p);
+ }
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/Swirl.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/TVStatic.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/TopBottom.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/WaterDrop.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/ZoomInCircles.glsl Added

@@ -0,0 +1,38 @@
+// License: MIT
+// Author: dycm8009
+// ported by gre from https://gist.github.com/dycm8009/948e99b1800e81ad909a
+
+vec2 zoom(vec2 uv, float amount) {
+ return 0.5 + ((uv - 0.5) * amount);	
+}
+
+vec2 ratio2 = vec2(1.0, 1.0 / ratio);
+
+vec4 transition(vec2 uv) {
+ // TODO: some timing are hardcoded but should be one or many parameters
+ // TODO: should also be able to configure how much circles
+ // TODO: if() branching should be avoided when possible, prefer use of step() & other functions
+ vec2 r = 2.0 * ((vec2(uv.xy) - 0.5) * ratio2);
+ float pro = progress / 0.8;
+ float z = pro * 0.2;
+ float t = 0.0;
+ if (pro > 1.0) {
+ z = 0.2 + (pro - 1.0) * 5.;
+ t = clamp((progress - 0.8) / 0.07, 0.0, 1.0);
+ }
+ if (length(r) < 0.5+z) {
+ // uv = zoom(uv, 0.9 - 0.1 * pro);
+ }
+ else if (length(r) < 0.8+z*1.5) {
+ uv = zoom(uv, 1.0 - 0.15 * pro);
+ t = t * 0.5;
+ }
+ else if (length(r) < 1.2+z*2.5) {
+ uv = zoom(uv, 1.0 - 0.2 * pro);
+ t = t * 0.2;
+ }
+ else {
+ uv = zoom(uv, 1.0 - 0.25 * pro);
+ }
+ return mix(getFromColor(uv), getToColor(uv), t);
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/angular.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/burn.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/cannabisleaf.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/circle.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/circleopen.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/colorphase.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/crosshatch.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/crosswarp.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/cube.glsl Added

@@ -0,0 +1,66 @@
+// Author: gre
+// License: MIT
+uniform float persp; // = 0.7
+uniform float unzoom; // = 0.3
+uniform float reflection; // = 0.4
+uniform float floating; // = 3.0
+
+vec2 project (vec2 p) {
+ return p * vec2(1.0, -1.2) + vec2(0.0, -floating/100.);
+}
+
+bool inBounds (vec2 p) {
+ return all(lessThan(vec2(0.0), p)) && all(lessThan(p, vec2(1.0)));
+}
+
+vec4 bgColor (vec2 p, vec2 pfr, vec2 pto) {
+ vec4 c = vec4(0.0, 0.0, 0.0, 1.0);
+ pfr = project(pfr);
+ // FIXME avoid branching might help perf!
+ if (inBounds(pfr)) {
+ c += mix(vec4(0.0), getFromColor(pfr), reflection * mix(1.0, 0.0, pfr.y));
+ }
+ pto = project(pto);
+ if (inBounds(pto)) {
+ c += mix(vec4(0.0), getToColor(pto), reflection * mix(1.0, 0.0, pto.y));
+ }
+ return c;
+}
+
+// p : the position
+// persp : the perspective in [ 0, 1 ]
+// center : the xcenter in [0, 1] \ 0.5 excluded
+vec2 xskew (vec2 p, float persp, float center) {
+ float x = mix(p.x, 1.0-p.x, center);
+ return (
+ (
+ vec2( x, (p.y - 0.5*(1.0-persp) * x) / (1.0+(persp-1.0)*x) )
+ - vec2(0.5-distance(center, 0.5), 0.0)
+ )
+ * vec2(0.5 / distance(center, 0.5) * (center<0.5 ? 1.0 : -1.0), 1.0)
+ + vec2(center<0.5 ? 0.0 : 1.0, 0.0)
+ );
+}
+
+vec4 transition(vec2 op) {
+ float uz = unzoom * 2.0*(0.5-distance(0.5, progress));
+ vec2 p = -uz*0.5+(1.0+uz) * op;
+ vec2 fromP = xskew(
+ (p - vec2(progress, 0.0)) / vec2(1.0-progress, 1.0),
+ 1.0-mix(progress, 0.0, persp),
+ 0.0
+ );
+ vec2 toP = xskew(
+ p / vec2(progress, 1.0),
+ mix(pow(progress, 2.0), 1.0, persp),
+ 1.0
+ );
+ // FIXME avoid branching might help perf!
+ if (inBounds(fromP)) {
+ return getFromColor(fromP);
+ }
+ else if (inBounds(toP)) {
+ return getToColor(toP);
+ }
+ return bgColor(op, fromP, toP);
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/directional-easing.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/directionalwarp.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/directionalwipe.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/displacement.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/doorway.glsl Added

@@ -0,0 +1,50 @@
+// author: gre
+// License: MIT 
+uniform float reflection; // = 0.4
+uniform float perspective; // = 0.4
+uniform float depth; // = 3
+
+const vec4 black = vec4(0.0, 0.0, 0.0, 1.0);
+const vec2 boundMin = vec2(0.0, 0.0);
+const vec2 boundMax = vec2(1.0, 1.0);
+
+bool inBounds (vec2 p) {
+  return all(lessThan(boundMin, p)) && all(lessThan(p, boundMax));
+}
+
+vec2 project (vec2 p) {
+  return p * vec2(1.0, -1.2) + vec2(0.0, -0.02);
+}
+
+vec4 bgColor (vec2 p, vec2 pto) {
+  vec4 c = black;
+  pto = project(pto);
+  if (inBounds(pto)) {
+    c += mix(black, getToColor(pto), reflection * mix(1.0, 0.0, pto.y));
+  }
+  return c;
+}
+
+
+vec4 transition (vec2 p) {
+  vec2 pfr = vec2(-1.), pto = vec2(-1.);
+  float middleSlit = 2.0 * abs(p.x-0.5) - progress;
+  if (middleSlit > 0.0) {
+    pfr = p + (p.x > 0.5 ? -1.0 : 1.0) * vec2(0.5*progress, 0.0);
+    float d = 1.0/(1.0+perspective*progress*(1.0-middleSlit));
+    pfr.y -= d/2.;
+    pfr.y *= d;
+    pfr.y += d/2.;
+  }
+  float size = mix(1.0, depth, 1.-progress);
+  pto = (p + vec2(-0.5, -0.5)) * vec2(size, size) + vec2(0.5, 0.5);
+  if (inBounds(pfr)) {
+    return getFromColor(pfr);
+  }
+  else if (inBounds(pto)) {
+    return getToColor(pto);
+  }
+  else {
+    return bgColor(p, pto);
+  }
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/fade.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/fadecolor.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/fadegrayscale.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/flyeye.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/heart.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/hexagonalize.glsl Added

@@ -0,0 +1,74 @@
+// Author: Fernando Kuteken
+// License: MIT
+// Hexagonal math from: http://www.redblobgames.com/grids/hexagons/
+
+uniform int steps; // = 50;
+uniform float horizontalHexagons; //= 20;
+
+struct Hexagon {
+  float q;
+  float r;
+  float s;
+};
+
+Hexagon createHexagon(float q, float r){
+  Hexagon hex;
+  hex.q = q;
+  hex.r = r;
+  hex.s = -q - r;
+  return hex;
+}
+
+Hexagon roundHexagon(Hexagon hex){
+  
+  float q = floor(hex.q + 0.5);
+  float r = floor(hex.r + 0.5);
+  float s = floor(hex.s + 0.5);
+
+  float deltaQ = abs(q - hex.q);
+  float deltaR = abs(r - hex.r);
+  float deltaS = abs(s - hex.s);
+
+  if (deltaQ > deltaR && deltaQ > deltaS)
+    q = -r - s;
+  else if (deltaR > deltaS)
+    r = -q - s;
+  else
+    s = -q - r;
+
+  return createHexagon(q, r);
+}
+
+Hexagon hexagonFromPoint(vec2 point, float size) {
+  
+  point.y /= ratio;
+  point = (point - 0.5) / size;
+  
+  float q = (sqrt(3.0) / 3.0) * point.x + (-1.0 / 3.0) * point.y;
+  float r = 0.0 * point.x + 2.0 / 3.0 * point.y;
+
+  Hexagon hex = createHexagon(q, r);
+  return roundHexagon(hex);
+  
+}
+
+vec2 pointFromHexagon(Hexagon hex, float size) {
+  
+  float x = (sqrt(3.0) * hex.q + (sqrt(3.0) / 2.0) * hex.r) * size + 0.5;
+  float y = (0.0 * hex.q + (3.0 / 2.0) * hex.r) * size + 0.5;
+  
+  return vec2(x, y * ratio);
+}
+
+vec4 transition (vec2 uv) {
+  
+  float dist = 2.0 * min(progress, 1.0 - progress);
+  dist = steps > 0 ? ceil(dist * float(steps)) / float(steps) : dist;
+  
+  float size = (sqrt(3.0) / 3.0) * dist / horizontalHexagons;
+  
+  vec2 point = dist > 0.0 ? pointFromHexagon(hexagonFromPoint(uv, size), size) : uv;
+
+  return mix(getFromColor(point), getToColor(point), progress);
+  
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/kaleidoscope.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/luma.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/luminance_melt.glsl Added

@@ -0,0 +1,126 @@
+// Author: 0gust1
+// License: MIT
+//My own first transition — based on crosshatch code (from pthrasher), using simplex noise formula (copied and pasted)
+//-> cooler with high contrasted images (isolated dark subject on light background f.e.)
+//TODO : try to rebase it on DoomTransition (from zeh)?
+//optimizations :
+//luminance (see http://stackoverflow.com/questions/596216/formula-to-determine-brightness-of-rgb-color#answer-596241)
+// Y = (R+R+B+G+G+G)/6
+//or Y = (R+R+R+B+G+G+G+G)>>3 
+
+
+//direction of movement : 0 : up, 1, down
+uniform bool direction; // = 1 
+//luminance threshold
+uniform float l_threshold; // = 0.8 
+//does the movement takes effect above or below luminance threshold ?
+uniform bool above; // = false 
+
+
+//Random function borrowed from everywhere
+float rand(vec2 co){
+ return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
+}
+
+
+// Simplex noise :
+// Description : Array and textureless GLSL 2D simplex noise function.
+// Author : Ian McEwan, Ashima Arts.
+// Maintainer : ijm
+// Lastmod : 20110822 (ijm)
+// License : MIT 
+// 2011 Ashima Arts. All rights reserved.
+// Distributed under the MIT License. See LICENSE file.
+// https://github.com/ashima/webgl-noise
+// 
+
+vec3 mod289(vec3 x) {
+ return x - floor(x * (1.0 / 289.0)) * 289.0;
+}
+
+vec2 mod289(vec2 x) {
+ return x - floor(x * (1.0 / 289.0)) * 289.0;
+}
+
+vec3 permute(vec3 x) {
+ return mod289(((x*34.0)+1.0)*x);
+}
+
+float snoise(vec2 v)
+ {
+ const vec4 C = vec4(0.211324865405187, // (3.0-sqrt(3.0))/6.0
+ 0.366025403784439, // 0.5*(sqrt(3.0)-1.0)
+ -0.577350269189626, // -1.0 + 2.0 * C.x
+ 0.024390243902439); // 1.0 / 41.0
+// First corner
+ vec2 i = floor(v + dot(v, C.yy) );
+ vec2 x0 = v - i + dot(i, C.xx);
+
+// Other corners
+ vec2 i1;
+ //i1.x = step( x0.y, x0.x ); // x0.x > x0.y ? 1.0 : 0.0
+ //i1.y = 1.0 - i1.x;
+ i1 = (x0.x > x0.y) ? vec2(1.0, 0.0) : vec2(0.0, 1.0);
+ // x0 = x0 - 0.0 + 0.0 * C.xx ;
+ // x1 = x0 - i1 + 1.0 * C.xx ;
+ // x2 = x0 - 1.0 + 2.0 * C.xx ;
+ vec4 x12 = x0.xyxy + C.xxzz;
+ x12.xy -= i1;
+
+// Permutations
+ i = mod289(i); // Avoid truncation effects in permutation
+ vec3 p = permute( permute( i.y + vec3(0.0, i1.y, 1.0 ))
+		+ i.x + vec3(0.0, i1.x, 1.0 ));
+
+ vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x12.xy,x12.xy), dot(x12.zw,x12.zw)), 0.0);
+ m = m*m ;
+ m = m*m ;
+
+// Gradients: 41 points uniformly over a line, mapped onto a diamond.
+// The ring size 17*17 = 289 is close to a multiple of 41 (41*7 = 287)
+
+ vec3 x = 2.0 * fract(p * C.www) - 1.0;
+ vec3 h = abs(x) - 0.5;
+ vec3 ox = floor(x + 0.5);
+ vec3 a0 = x - ox;
+
+// Normalise gradients implicitly by scaling m
+// Approximation of: m *= inversesqrt( a0*a0 + h*h );
+ m *= 1.79284291400159 - 0.85373472095314 * ( a0*a0 + h*h );
+
+// Compute final noise value at P
+ vec3 g;
+ g.x = a0.x * x0.x + h.x * x0.y;
+ g.yz = a0.yz * x12.xz + h.yz * x12.yw;
+ return 130.0 * dot(m, g);
+}
+
+// Simplex noise -- end
+
+float luminance(vec4 color){
+ //(0.299*R + 0.587*G + 0.114*B)
+ return color.r*0.299+color.g*0.587+color.b*0.114;
+}
+
+vec2 center = vec2(1.0, direction);
+
+vec4 transition(vec2 uv) {
+ vec2 p = uv.xy / vec2(1.0).xy;
+ if (progress == 0.0) {
+ return getFromColor(p);
+ } else if (progress == 1.0) {
+ return getToColor(p);
+ } else {
+ float x = progress;
+ float dist = distance(center, p)- progress*exp(snoise(vec2(p.x, 0.0)));
+ float r = x - rand(vec2(p.x, 0.1));
+ float m;
+ if(above){
+ m = dist <= r && luminance(getFromColor(p))>l_threshold ? 1.0 : (progress*progress*progress);
+ }
+ else{
+ m = dist <= r && luminance(getFromColor(p))<l_threshold ? 1.0 : (progress*progress*progress); 
+ }
+ return mix(getFromColor(p), getToColor(p), m); 
+ }
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/morph.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/multiply_blend.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/perlin.glsl Added

@@ -0,0 +1,64 @@
+// Author: Rich Harris
+// License: MIT
+
+//#ifdef GL_ES
+//precision highp float;
+//#endif
+
+uniform float scale; // = 4.0
+uniform float smoothness; // = 0.01
+
+uniform float seed; // = 12.9898
+
+// http://byteblacksmith.com/improvements-to-the-canonical-one-liner-glsl-rand-for-opengl-es-2-0/
+float random(vec2 co)
+{
+    float a = seed;
+    float b = 78.233;
+    float c = 43758.5453;
+    float dt= dot(co.xy ,vec2(a,b));
+    float sn= mod(dt,3.14);
+    return fract(sin(sn) * c);
+}
+
+// 2D Noise based on Morgan McGuire @morgan3d
+// https://www.shadertoy.com/view/4dS3Wd
+float noise (in vec2 st) {
+    vec2 i = floor(st);
+    vec2 f = fract(st);
+
+    // Four corners in 2D of a tile
+    float a = random(i);
+    float b = random(i + vec2(1.0, 0.0));
+    float c = random(i + vec2(0.0, 1.0));
+    float d = random(i + vec2(1.0, 1.0));
+
+    // Smooth Interpolation
+
+    // Cubic Hermine Curve.  Same as SmoothStep()
+    vec2 u = f*f*(3.0-2.0*f);
+    // u = smoothstep(0.,1.,f);
+
+    // Mix 4 coorners porcentages
+    return mix(a, b, u.x) +
+            (c - a)* u.y * (1.0 - u.x) +
+            (d - b) * u.x * u.y;
+}
+
+vec4 transition (vec2 uv) {
+  vec4 from = getFromColor(uv);
+  vec4 to = getToColor(uv);
+  float n = noise(uv * scale);
+
+  float p = mix(-smoothness, 1.0 + smoothness, progress);
+  float lower = p - smoothness;
+  float higher = p + smoothness;
+
+  float q = smoothstep(lower, higher, n);
+
+  return mix(
+    from,
+    to,
+    1.0 - q
+  );
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/pinwheel.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/pixelize.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/polar_function.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/randomNoisex.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/randomsquares.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/ripple.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/rotateTransition.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/rotate_scale_fade.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/squareswire.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/squeeze.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/swap.glsl Added

@@ -0,0 +1,59 @@
+// Author: gre
+// License: MIT
+// General parameters
+uniform float reflection; // = 0.4
+uniform float perspective; // = 0.2
+uniform float depth; // = 3.0
+ 
+const vec4 black = vec4(0.0, 0.0, 0.0, 1.0);
+const vec2 boundMin = vec2(0.0, 0.0);
+const vec2 boundMax = vec2(1.0, 1.0);
+ 
+bool inBounds (vec2 p) {
+ return all(lessThan(boundMin, p)) && all(lessThan(p, boundMax));
+}
+ 
+vec2 project (vec2 p) {
+ return p * vec2(1.0, -1.2) + vec2(0.0, -0.02);
+}
+ 
+vec4 bgColor (vec2 p, vec2 pfr, vec2 pto) {
+ vec4 c = black;
+ pfr = project(pfr);
+ if (inBounds(pfr)) {
+ c += mix(black, getFromColor(pfr), reflection * mix(1.0, 0.0, pfr.y));
+ }
+ pto = project(pto);
+ if (inBounds(pto)) {
+ c += mix(black, getToColor(pto), reflection * mix(1.0, 0.0, pto.y));
+ }
+ return c;
+}
+ 
+vec4 transition(vec2 p) {
+ vec2 pfr, pto = vec2(-1.);
+ 
+ float size = mix(1.0, depth, progress);
+ float persp = perspective * progress;
+ pfr = (p + vec2(-0.0, -0.5)) * vec2(size/(1.0-perspective*progress), size/(1.0-size*persp*p.x)) + vec2(0.0, 0.5);
+ 
+ size = mix(1.0, depth, 1.-progress);
+ persp = perspective * (1.-progress);
+ pto = (p + vec2(-1.0, -0.5)) * vec2(size/(1.0-perspective*(1.0-progress)), size/(1.0-size*persp*(0.5-p.x))) + vec2(1.0, 0.5);
+
+ if (progress < 0.5) {
+ if (inBounds(pfr)) {
+ return getFromColor(pfr);
+ }
+ if (inBounds(pto)) {
+ return getToColor(pto);
+ } 
+ }
+ if (inBounds(pto)) {
+ return getToColor(pto);
+ }
+ if (inBounds(pfr)) {
+ return getFromColor(pfr);
+ }
+ return bgColor(p, pfr, pto);
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/tangentMotionBlur.glsl Added

@@ -0,0 +1,139 @@
+
+// License: MIT
+// Author: chenkai
+// ported from https://codertw.com/%E7%A8%8B%E5%BC%8F%E8%AA%9E%E8%A8%80/671116/
+
+float rand (vec2 co) {
+ return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
+}
+ 
+// motion blur for texture from
+vec4 motionBlurFrom(vec2 _st, vec2 speed) {
+ vec2 texCoord = _st.xy / vec2(1.0).xy;
+ vec3 color = vec3(0.0);
+ float total = 0.0;
+ float offset = rand(_st);
+ for (float t = 0.0; t <= 20.0; t++) {
+ float percent = (t + offset) / 20.0;
+ float weight = 4.0 * (percent - percent * percent);
+ vec2 newuv = texCoord + speed * percent;
+ newuv = fract(newuv);
+ color += getFromColor(newuv).rgb * weight;
+ total += weight;
+ }
+ return vec4(color / total, 1.0);
+}
+
+// motion blur for texture to
+vec4 motionBlurTo(vec2 _st, vec2 speed) {
+ vec2 texCoord = _st.xy / vec2(1.0).xy;
+ vec3 color = vec3(0.0);
+ float total = 0.0;
+ float offset = rand(_st);
+ for (float t = 0.0; t <= 20.0; t++) {
+ float percent = (t + offset) / 20.0;
+ float weight = 4.0 * (percent - percent * percent);
+ vec2 newuv = texCoord + speed * percent;
+ newuv = fract(newuv);
+ color += getToColor(newuv).rgb * weight;
+ total += weight;
+ }
+ return vec4(color / total, 1.0);
+}
+
+
+// bezier in gpu
+float A(float aA1, float aA2) {
+ return 1.0 - 3.0 * aA2 + 3.0 * aA1;
+}
+float B(float aA1, float aA2) {
+ return 3.0 * aA2 - 6.0 * aA1;
+}
+float C(float aA1) {
+ return 3.0 * aA1;
+}
+float GetSlope(float aT, float aA1, float aA2) {
+ return 3.0 * A(aA1, aA2)*aT*aT + 2.0 * B(aA1, aA2) * aT + C(aA1);
+}
+float CalcBezier(float aT, float aA1, float aA2) {
+ return ((A(aA1, aA2)*aT + B(aA1, aA2))*aT + C(aA1))*aT;
+}
+float GetTForX(float aX, float mX1, float mX2) {
+ // iteration to solve
+ float aGuessT = aX;
+ for (int i = 0; i < 4; ++i) {
+ float currentSlope = GetSlope(aGuessT, mX1, mX2);
+ if (currentSlope == 0.0) return aGuessT;
+ float currentX = CalcBezier(aGuessT, mX1, mX2) - aX;
+ aGuessT -= currentX / currentSlope;
+ }
+ return aGuessT;
+}
+float KeySpline(float aX, float mX1, float mY1, float mX2, float mY2) {
+ if (mX1 == mY1 && mX2 == mY2) return aX; // linear
+ return CalcBezier(GetTForX(aX, mX1, mX2), mY1, mY2); // x to t, t to y
+}
+
+// norm distribution
+float normpdf(float x) {
+ return exp(-20.*pow(x-.5,2.));
+}
+
+vec2 rotateUv(vec2 uv, float angle, vec2 anchor, float zDirection) {
+ uv = uv - anchor; // anchor to origin
+ float s = sin(angle);
+	float c = cos(angle);
+	mat2 m = mat2(c, -s, s, c);
+ uv = m * uv;
+ uv += anchor; // anchor back
+ return uv;
+}
+
+
+
+vec4 transition (vec2 uv) {
+ 
+ vec2 iResolution = vec2(100.0, 100.0); // screen size
+ 
+ vec2 myst = uv;
+ float ratio = iResolution.x / iResolution.y; // screen ratio
+ float animationTime = progress; //getAnimationTime();
+ float easingTime = KeySpline(animationTime, .68,.01,.17,.98);
+ float blur = normpdf(easingTime);
+ float r = 0.;
+ float rotation = 180./180.*3.14159;
+ if (easingTime <= .5) {
+ r = rotation * easingTime;
+ } else {
+ r = -rotation + rotation * easingTime;
+ }
+
+ // rotation for current frame
+ vec2 mystCurrent = myst;
+ mystCurrent.y *= 1./ratio;
+ mystCurrent = rotateUv(mystCurrent, r, vec2(1., 0.), -1.);
+ mystCurrent.y *= ratio;
+ 
+ // frame timeInterval by fps=30
+ float timeInterval = 0.0167*2.0;
+ if (easingTime <= .5) {
+ r = rotation * (easingTime+timeInterval);
+ } else {
+ r = -rotation + rotation * (easingTime+timeInterval);
+ }
+ 
+ // rotation for next frame
+ vec2 mystNext = myst;
+ mystNext.y *= 1./ratio;
+ mystNext = rotateUv(mystNext, r, vec2(1., 0.), -1.);
+ mystNext.y *= ratio;
+ 
+ // get speed at tagent direction
+ vec2 speed = (mystNext - mystCurrent) / timeInterval * blur * 0.5;
+ if (easingTime <= .5) {
+ return motionBlurFrom(mystCurrent, speed);
+ } else {
+ return motionBlurTo(mystCurrent, speed);
+ }
+}
+

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/undulatingBurnOut.glsl Added

@@ -0,0 +1,47 @@
+// License: MIT
+// Author: pthrasher
+// adapted by gre from https://gist.github.com/pthrasher/8e6226b215548ba12734
+
+uniform float smoothness; // = 0.03
+uniform vec2 center; // = vec2(0.5)
+uniform vec3 color; // = vec3(0.0)
+
+const float M_PI = 3.14159265358979323846;
+
+float quadraticInOut(float t) {
+ float p = 2.0 * t * t;
+ return t < 0.5 ? p : -p + (4.0 * t) - 1.0;
+}
+
+float getGradient(float r, float dist) {
+ float d = r - dist;
+ return mix(
+ smoothstep(-smoothness, 0.0, r - dist * (1.0 + smoothness)),
+ -1.0 - step(0.005, d),
+ step(-0.005, d) * step(d, 0.01)
+ );
+}
+
+float getWave(vec2 p){
+ vec2 _p = p - center; // offset from center
+ float rads = atan(_p.y, _p.x);
+ float degs = degrees(rads) + 180.0;
+ vec2 range = vec2(0.0, M_PI * 30.0);
+ vec2 domain = vec2(0.0, 360.0);
+ float ratio = (M_PI * 30.0) / 360.0;
+ degs = degs * ratio;
+ float x = progress;
+ float magnitude = mix(0.02, 0.09, smoothstep(0.0, 1.0, x));
+ float offset = mix(40.0, 30.0, smoothstep(0.0, 1.0, x));
+ float ease_degs = quadraticInOut(sin(degs));
+ float deg_wave_pos = (ease_degs * magnitude) * sin(x * offset);
+ return x + deg_wave_pos;
+}
+
+vec4 transition(vec2 p) {
+ float dist = distance(center, p);
+ float m = getGradient(getWave(p), dist);
+ vec4 cfrom = getFromColor(p);
+ vec4 cto = getToColor(p);
+ return mix(mix(cfrom, cto, m), mix(cfrom, vec4(color, 1.0), 0.75), step(m, -2.0));
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/wind.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/windowblinds.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/windowslice.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/wipeDown.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/wipeLeft.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/wipeRight.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gl-transitions/wipeUp.glsl Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/gltrans.js Added

@@ -0,0 +1,277 @@
+export const description = "Wrapper for gl-transitions";
+
+
+function load_fx(fx_name, local_dist)
+{
+ let fx_obj = {uniforms: [], frag_shader: null, author: null, license: null};
+
+
+ let fx_file;
+ if (local_dist)
+ fx_file = filter.jspath + 'transitions/gl-transitions/' + fx_name + '.glsl';
+ else
+ fx_file = fx_name;
+
+ let source = sys.load_file(fx_file, true);
+ if (!source || !source.length) return null;
+
+ let lines = source.split('\n');
+
+ lines.forEach( line => {
+ let idx;
+ while (line.charAt(0) ==' ') {
+ line = line.slice(1);
+ }
+ if (!line.length) return;
+
+ if (!fx_obj.author) {
+ idx = line.indexOf('uthor');
+ if (idx>0) {
+ fx_obj.author = line.slice(idx+6);
+ while (fx_obj.author.charAt(0) == ' ') {
+ fx_obj.author = fx_obj.author.slice(1);
+ } 
+ return;
+ }
+ }
+ if (!fx_obj.license) {
+ idx = line.indexOf('icense');
+ if (idx>0) {
+ fx_obj.license = line.slice(idx+7);
+ while (fx_obj.license.charAt(0) == ' ') {
+ fx_obj.license = fx_obj.license.slice(1);
+ } 
+ return;
+ }
+ }
+
+ if (! line.startsWith('uniform')) return;
+
+ let code = line.split(' ');
+ let uni = {};
+ uni.type = code[1];
+ uni.name = code[2].split(';');
+ uni.name = uni.name[0];
+ 
+ code = line.split('=');
+ let value = code[1];
+ if (typeof value != 'string') {
+ uni.value = null;
+ if (uni.type != 'sampler2D') {
+ print(GF_LOG_ERROR, 'Uniform with no default value: ' + line);
+ }
+ } else {
+ while (value.charAt(0) ==' ') {
+ value = value.slice(1);
+ }
+
+ if (uni.type == 'bool') {
+ if (value=='true') uni.value = true;
+ else uni.value = false;
+ } else if (uni.type == 'int') {
+ uni.value = Number.parseInt(value);
+ } else if (uni.type == 'float') {
+ uni.value = Number.parseFloat(value);
+ } else if ((uni.type == 'vec2') || (uni.type == 'vec3') || (uni.type == 'vec4')
+ || (uni.type == 'ivec2') || (uni.type == 'ivec3') || (uni.type == 'ivec4')
+ ) {
+ idx = value.indexOf(uni.type);
+ let type_len = uni.type.length;
+ let oval = value;
+ let nb_vals = 2;
+ if (uni.type.indexOf('3')>0) nb_vals = 3;
+ else if (uni.type.indexOf('4')>0) nb_vals = 4;
+
+ if (idx>=0) {
+ value = value.slice(idx+type_len+1);
+ value = value.split(')');
+ value = value[0].split(',');
+ uni.value = [];
+ value.forEach( v => {
+ let f = Number.parseFloat(v);
+ uni.value.push(f);
+ });
+
+ while (uni.value.length < nb_vals) {
+ if (value.length==1) {
+ uni.value.push(uni.value[0]);
+ } else {
+ print(GF_LOG_WARNING, 'Not enough scalars for uniform type ' + uni.type + ' - value ' + value + ', padding with 0');
+ uni.value.push(0);
+ }
+ }
+ uni.value.length = nb_vals;
+ //safety check
+ for (idx=0; idx<nb_vals; idx++) {
+ if (uni.value[idx] != uni.value[idx]) {
+ print(GF_LOG_ERROR, 'Error parsing value ' + oval + ' for type ' + uni.type + ': got NaN, forcing to 0');
+ uni.value[idx] = 0;
+ }
+ }
+ } else {
+ print(GF_LOG_ERROR, 'Wrong format for uniform type ' + uni.type + ' - value ' + value);
+ }
+ } else {
+ print(GF_LOG_ERROR, 'Uniform type not handled: ' + uni.type + ' - value ' + value);
+ }
+ }
+ fx_obj.uniforms.push(uni);
+ });
+
+ source = source.replaceAll('getFromColor', 'get_pixel_from');
+ source = source.replaceAll('getToColor', 'get_pixel_to');
+ source = source.replaceAll(/\bratio\b/g, 'video_ar');
+ source = source.replaceAll(/\bprogress\b/g, 'ratio');
+
+ source += `
+
+vec4 gf_apply_effect() {
+ return transition(txcoord_from);
+}
+`;
+
+ fx_obj.frag_shader = source;
+ return fx_obj;
+}
+
+
+export let help='';
+
+let myhelp = globalThis.help_mod || null;
+let full_help=false;
+if (myhelp == 'gltrans') {
+ full_help=true;
+} 
+//don't print in md or man for the time being
+else if (sys.get_opt("temp", "gendoc") == "yes") {
+// full_help=true;
+}
+
+
+if (full_help) {
+
+help = `This transition module wraps gl-transitions, see https://gl-transitions.com/
+
+## Available effects
+`;
+
+//load all modules
+let effects = sys.enum_directory(filter.jspath+'transitions/gl-transitions/', "*.glsl");
+effects.forEach( fx_file => {
+ let name = fx_file.name.split('.')[0];
+ let fx;
+ try {
+ fx = load_fx(name, true);
+ } catch (e) {
+ print(GF_LOG_ERROR, 'Failed to load gl transition ' + name + ': ' + e);
+ return;
+ }
+
+ if (!fx) return;
+
+ help += name;
+ if (fx.author || fx.license) {
+ help += ' (';
+ if (fx.author) help += 'author: ' + fx.author;
+ if (fx.license) help += ', license: ' + fx.license;
+ help += ')';
+ }
+ help += '\n';
+
+ fx.uniforms.forEach(uni =>{
+ help += ' - ' + uni.name + ' (' + uni.type + '): ' + uni.value + '\n';
+ });
+ help += '\n';
+
+});
+
+} else {
+
+help = "This transition module wraps gl-transitions, see https://gl-transitions.com/ and `gpac -h avmix:gltrans` for builtin transitions";
+
+}
+
+export const options = [
+ {name:"fx", value: "", desc: "effect name for built-in effects, or path to gl-transition GLSL file"},
+ {}
+];
+
+
+
+export function load()
+{
+ let fx;
+ if (arguments.length) {
+ let local_dist = true;
+ let args = arguments[0];
+ let fx_name = args.fx || null;
+ if (!fx_name) return null;
+ if (fx_name.indexOf('.') >= 0) {
+ fx_name = resolve_url(fx_name);
+ local_dist = false;
+ }
+ fx = load_fx(fx_name, false);
+ if (!fx) return null;
+ } else {
+ fx = {uniforms: [], frag_shader: null, author: null, license: null};
+ }
+
+ return {
+
+setup_gl: function(webgl, program, first_available_texture_unit)
+{
+
+ this.options.forEach( uni => {
+ uni.loc = webgl.getUniformLocation(program, uni.name);
+ if (uni.loc==null) {
+ print(GF_LOG_ERROR, 'No uniform for ' + uni.name);
+ return;
+ }
+ this.update_flag = UPDATE_SIZE;
+ });
+},
+
+apply: function(webgl, ratio, path, pids)
+{
+ if (!this.update_flag) return;
+ this.update_flag = 0;
+
+ this.options.forEach( uni => {
+ let value = this[uni.name] || uni.value;
+ if (!uni.loc) return;
+
+ if (uni.type=='bool') {
+ webgl.uniform1i(uni.loc, value);
+ } else if (uni.type=='int') {
+ webgl.uniform1i(uni.loc, value);
+ } else if (uni.type=='float') {
+ webgl.uniform1f(uni.loc, value);
+ } else if (uni.type=='vec2') {
+ webgl.uniform2f(uni.loc, value[0], value[1]);
+ } else if (uni.type=='vec3') {
+ webgl.uniform3f(uni.loc, value[0], value[1], value[2]);
+ } else if (uni.type=='vec4') {
+ webgl.uniform4f(uni.loc, value[0], value[1], value[2], value[3]);
+ } else if (uni.type=='ivec2') {
+ webgl.uniform2i(uni.loc, value[0], value[1]);
+ } else if (uni.type=='ivec3') {
+ webgl.uniform3i(uni.loc, value[0], value[1], value[2]);
+ } else if (uni.type=='ivec4') {
+ webgl.uniform4i(uni.loc, value[0], value[1], value[2], value[3]);
+ } else {
+ print(GF_LOG_WARNING, 'uniform type ' + uni.type + ' updating not supported yet');
+ return;
+ }
+ });
+},
+
+get_shader_src: function()
+{
+ return this.frag_shader;
+},
+
+frag_shader: fx.frag_shader,
+
+options: fx.uniforms
+}; 
+}

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/mix.js Added

gpac-2.0.0.tar.gz/share/scripts/jsf/avmix/transitions/swipe.js Added

@@ -0,0 +1,544 @@
+export const description = "Video swipe";
+
+export const help = "This transition performs simple 2D affine transformations for source videos transitions, with configurable effect origin";
+
+
+export const options = [
+ {name:"from", value: "left", desc: `direction of video 2 entry. Possible values are:
+  - left: from left to right edges
+  - right: from right to left edges
+  - top: from top to bottom edges
+  - bottom: from bottom to top edges
+  - topleft: from top-left to bottom-right corners
+  - topright: from top-right to bottom-left corners
+  - bottomleft: from bottom-left to top-right corners
+  - bottomright: from bottom-right to top-left corners
+`},
+ {name:"mode", value: "slide", desc: `how video 2 entry impacts video 1. Possible values are:
+  - slide: video 1 position is not modified
+  - push: video 2 pushes video 1 away
+  - squeeze: video 2 squeezes video 1 along opposite edge
+  - grow: video 2 size increases, video 1 not modified
+  - swap: video 2 size increases, video 1 size decreases
+`},
+ {}
+];
+
+
+export function load() { return {
+
+h_mode: 0,
+v_mode: 0,
+mod: 0,
+
+setup: function()
+{
+    if (this.mode == "push") this.mod = 1;
+    else if (this.mode == "squeeze") this.mod = 2;
+    else if (this.mode == "grow") this.mod = 3;
+    else if (this.mode == "swap") this.mod = 4;
+    else this.mod = 0;
+
+    this.h_mode = 0;
+    this.v_mode = 0;
+    if (this.from == "left") this.h_mode = 1;
+    else if (this.from == "right") this.h_mode = 2;
+    else if (this.from == "top") this.v_mode = 1;
+    else if (this.from == "bottom") this.v_mode = 2;
+    else if (this.from == "topleft") {
+      this.h_mode = 1;
+      this.v_mode = 1;
+    }
+    else if (this.from == "topright") {
+      this.h_mode = 2;
+      this.v_mode = 1;
+    }
+    else if (this.from == "bottomleft") {
+      this.h_mode = 1;
+      this.v_mode = 2;
+    }
+    else if (this.from == "bottomright") {
+      this.h_mode = 2;
+      this.v_mode = 2;
+    }
+},
+
+apply: function(canvas, ratio, path, pids)
+{
+  if (use_gpu) {
+    this.apply_gl(canvas, ratio, path, pids);
+    return;
+  }
+
+  let rc = path.bounds;
+  if (typeof rc == 'undefined') return;
+
+  let new_w = rc.w;
+  let new_h = rc.h;
+  let new_x = 0;
+  let new_y = 0;
+
+  //left
+  if (this.h_mode == 1) {
+    new_x = -rc.w/2 + rc.w*ratio/2;
+    new_w = rc.w*ratio;
+  }
+  //right
+  else if (this.h_mode == 2) {
+    new_x = rc.w/2 - rc.w*ratio/2;
+    new_w = rc.w*ratio;
+  }
+
+  //top
+  if (this.v_mode==1) {
+    new_y = rc.h/2 - rc.h*ratio/2;
+    new_h = rc.h*ratio;
+  }
+  //bottom
+  else if (this.v_mode==2) {
+    new_y = -rc.h/2 + rc.h*ratio/2;
+    new_h = rc.h*ratio;
+  }
+
+  let new_path = path.clone();
+
+  //add rectangle to path
+  new_path.rectangle(new_x, new_y, new_w, new_h, true);
+  //use zero-nonzero fill
+  new_path.zero_fill = true;
+
+
+  if (! this.mod) {
+    canvas.path = new_path;
+    canvas.fill(GF_EVG_OPERAND_ODD_FILL, ratio, pids[0].texture, pids[1].texture);
+    return;
+
+  }
+
+  let mx1_bck = pids[0].texture.mx;
+  let mx2_bck = pids[1].texture.mx;
+
+  let mx1 = mx1_bck.copy();
+  let mx2 = mx2_bck.copy();
+
+  let t_x1 = 0;
+  let t_y1 = 0;
+  let t_x2 = 0;
+  let t_y2 = 0;
+
+  let c_x1 = 0.5;
+  let c_y1 = 0.5;
+  let c_x2 = 0.5;
+  let c_y2 = 0.5;
+
+  //left
+  if (this.h_mode==1) {
+    t_x1 = ratio;
+    c_x1 -= 0.5;
+    t_x2 = (ratio-1);
+    c_x2 += 0.5;
+  }
+  //right
+  else if (this.h_mode==2) {
+    t_x1 = -ratio;
+    c_x1 += 0.5;
+    t_x2 = -(ratio-1);
+    c_x2 -= 0.5;
+  }
+
+  //top
+  if (this.v_mode==1) {
+    t_y1 = -ratio;
+    c_y1 -= 0.5;
+    t_y2 = -(ratio-1);
+    c_y2 += 0.5;
+  }
+  //bottom
+  else if (this.v_mode==2) {
+    t_y1 = ratio;
+    c_y1 += 0.5;
+    t_y2 = (ratio-1);
+    c_y2 -= 0.5;
+  }
+
+  mx1.translate(-t_x1, t_y1);
+  mx2.translate(-t_x2, t_y2);
+
+  if ((this.mod == 2) || (this.mod == 4)) {
+    mx1.translate(-c_x1, -c_y1);
+    mx1.scale( 1 / (1-ratio), 1/(1-ratio) );
+    mx1.translate(c_x1, c_y1);
+  }
+
+  if ((this.mod == 3) || (this.mod == 4)) {
+    mx2.translate(-c_x2, -c_y2);
+    mx2.scale(1/ratio, 1/ratio);
+    mx2.translate(c_x2, c_y2);
+  }
+
+
+  let pad1_bck = pids[0].texture.get_pad_color();
+  let pad2_bck = pids[1].texture.get_pad_color();
+  let pad_col = pad1_bck || pad2_bck || 'black';
+
+  //pad with the same color !
+  pids[0].texture.set_pad_color(pad_col);
+  pids[1].texture.set_pad_color(pad_col);
+
+  pids[0].texture.mx = mx1;
+  pids[1].texture.mx = mx2;
+
+  canvas.path = new_path;
+  canvas.fill(GF_EVG_OPERAND_ODD_FILL, ratio, pids[0].texture, pids[1].texture);
+
+
+  pids[0].texture.set_pad_color(pad1_bck);
+  pids[1].texture.set_pad_color(pad2_bck);
+
+  pids[0].texture.mx = mx1_bck;
+  pids[1].texture.mx = mx2_bck;
+},
+
+pad_col_uni: null,
+pad_col: null,
+
+setup_gl: function(webgl, program, first_available_texture_unit)
+{
+  this.pad_col_uni = webgl.getUniformLocation(program, 'swipe_pad_color');
+  this.pad_col = null;
+},
+
+apply_gl: function(webgl, ratio, path,  pids)
+{
+   if (!this.pad_col_uni) return;
+  let pad1_bck = pids[0].texture.get_pad_color() || 'black';
+  if (this.pad_col !== pad1_bck) {
+    let a = sys.color_component(pad1_bck, 0);
+    let r = sys.color_component(pad1_bck, 1);
+    let g = sys.color_component(pad1_bck, 2);
+    let b = sys.color_component(pad1_bck, 3);
+
+    webgl.uniform4f(this.pad_col_uni, r, g, b, a);
+    this.pad_col = pad1_bck;
+  } 
+},
+
+get_shader_src: function()
+{
+  this.setup();
+
+
+
+  let frag_src = `vec4 gf_apply_effect() {
+     vec2 p = txcoord_from.xy;
+     vec2 p_to = txcoord_to.xy;
+     `;
+  
+  if (this.mod==0) {
+    frag_src += `
+      vec2 txcf = p;
+      vec2 txct = p_to;
+    `;
+  }
+  let use_pad = false;
+
+  if (this.h_mode == 1) {
+    //topleft
+    if (this.v_mode == 1) {
+      frag_src += 'float myratio = step(0.0 + p.x, ratio) * step(0.0 + p.y, ratio);';
+
+      if (this.mod) {
+        use_pad = true;
+        frag_src += `
+vec2 txcf = vec2(p.x - ratio, p.y - ratio);
+vec2 txct = vec2(1.0 + p_to.x - ratio, 1.0 + p_to.y - ratio);
+float is_in = (myratio==0.0) ? step(1.0, txct.x) * step(1.0, txct.y) : 1.0;
+`;
+      }
+      if ((this.mod==2) || (this.mod==4)) {
+        frag_src += `
+txcf /= (1.0-ratio);
+is_in *= (myratio==0.0) ? step(txcf.y, 1.0) * step(0.0, txcf.y) : 1.0;
+`;
+      }
+      if ((this.mod==3) || (this.mod==4)) {
+        frag_src += `
+txct.x -= 1.0;
+txct.y -= 1.0;
+txct /= ratio;
+txct.x += 1.0;
+txct.y += 1.0;
+is_in *= (myratio>0.0) ? step(0.0, txct.y) * step(txct.y, 1.0) : 1.0;
+`;
+      }
+    }
+    //bottomleft
+    else if (this.v_mode == 2) {
+      frag_src += 'float myratio = step(0.0 + p.x, ratio) * step(1.0 - p.y, ratio);';
+
+      if (this.mod) {
+        use_pad = true;
+        frag_src += `
+vec2 txcf = vec2(p.x - ratio, p.y + ratio);
+vec2 txct = vec2(1.0 + p_to.x - ratio, p_to.y + ratio - 1.0);
+float is_in = (myratio==0.0) ? step(1.0, txct.x) * step(txct.y, 0.0) : 1.0;
+`;
+      }
+      if ((this.mod==2) || (this.mod==4)) {
+        frag_src += `
+txcf.y -= 1.0;
+txcf /= (1.0-ratio);
+txcf.y += 1.0;
+is_in *= (myratio==0.0) ? step(txcf.y, 1.0) * step(0.0, txcf.y) : 1.0;
+`;
+      }
+      if ((this.mod==3) || (this.mod==4)) {
+        frag_src += `
+txct.x -= 1.0;
+txct /= ratio;
+txct.x += 1.0;
+is_in *= (myratio>0.0) ? step(0.0, txct.y) * step(txct.y, 1.0) : 1.0;
+`;
+      }
+    }
+    //left
+    else {
+      frag_src += 'float myratio = step(0.0 + p.x, ratio);';
+      if (this.mod) {
+        frag_src += `
+vec2 txcf = vec2(p.x - ratio, p.y);
+vec2 txct = vec2(1.0 + p_to.x - ratio, p_to.y);
+`;
+      }
+      if (this.mod>1) {
+        frag_src += `
+float is_in;
+`;
+        use_pad = true;
+      }
+      if ((this.mod==2) || (this.mod==4)) {
+        frag_src += `
+txcf.y -= 0.5;
+txcf /= (1.0-ratio);
+txcf.y += 0.5;
+is_in = (myratio==0.0) ? step(txcf.y, 1.0) * step(0.0, txcf.y) : 1.0;
+`;
+      }
+      if ((this.mod==3) || (this.mod==4)) {
+        let op = (this.mod==4) ? '*=' : '='; 
+        frag_src += `
+txct.x -= 1.0;
+txct.y -= 0.5;
+txct /= ratio;
+txct.x += 1.0;
+txct.y += 0.5;
+is_in `+ op + ` (myratio>0.0) ? step(0.0, txct.y) * step(txct.y, 1.0) : 1.0;
+`;
+      }
+    }
+  }
+  else if (this.h_mode == 2) {
+    //topright
+    if (this.v_mode == 1) {
+      frag_src += 'float myratio = step(1.0 - p.x, ratio) * step(0.0 + p.y, ratio);';
+      if (this.mod) {
+        use_pad = true;
+        frag_src += `
+vec2 txcf = vec2(p.x + ratio, p.y - ratio);
+vec2 txct = vec2(p_to.x + ratio - 1.0, 1.0 + p_to.y - ratio);
+float is_in = (myratio==0.0) ? step(txct.x, 0.0) * step(1.0, txct.y) : 1.0;
+`;
+      }
+      if ((this.mod==2) || (this.mod==4)) {
+        frag_src += `
+txcf.x -= 1.0;
+txcf /= (1.0-ratio);
+txcf.x += 1.0;
+is_in *= (myratio==0.0) ? step(txcf.y, 1.0) * step(0.0, txcf.y) : 1.0;
+`;
+      }
+      if ((this.mod==3) || (this.mod==4)) {
+        frag_src += `
+txct.y -= 1.0;
+txct /= ratio;
+txct.y += 1.0;
+is_in *= (myratio>0.0) ? step(0.0, txct.y) * step(txct.y, 1.0) : 1.0;
+`;
+      }
+    }
+    //bottomright
+    else if (this.v_mode == 2) {
+      frag_src += 'float myratio = step(1.0 - p.x, ratio) * step(1.0 - p.y, ratio);';
+      if (this.mod) {
+        use_pad = true;
+        frag_src += `
+vec2 txcf = vec2(p.x + ratio, p.y + ratio);
+vec2 txct = vec2(p_to.x + ratio - 1.0, p_to.y + ratio - 1.0);
+float is_in = (myratio==0.0) ? step(txct.x, 0.0) * step(txct.y, 0.0) : 1.0;
+`;
+      }
+      if (this.mod==2) {
+        frag_src += `
+txcf.x -= 1.0;
+txcf.y -= 1.0;
+txcf /= (1.0-ratio);
+txcf.x += 1.0;
+txcf.y += 1.0;
+is_in *= (myratio==0.0) ? step(txcf.y, 1.0) * step(0.0, txcf.y) : 1.0;
+`;
+      }
+      if (this.mod==3) {
+        frag_src += `
+txct /= ratio;
+is_in *= (myratio>0.0) ? step(0.0, txct.y) * step(txct.y, 1.0) : 1.0;
+`;
+      }
+      if (this.mod==4) {
+        frag_src += `
+txcf.x -= 1.0;
+txcf.y -= 1.0;
+txcf /= (1.0-ratio);
+txcf.x += 1.0;
+txcf.y += 1.0;
+is_in *= (myratio==0.0) ? step(txcf.y, 1.0) * step(0.0, txcf.y) : 1.0;
+txct /= ratio;
+is_in *= (myratio>0.0) ? step(0.0, txct.y) * step(txct.y, 1.0) : 1.0;
+`;
+      }
+    }
+    //right
+    else {
+      frag_src += 'float myratio = step(1.0 - p.x, ratio);';
+      if (this.mod) {
+        frag_src += `
+vec2 txcf = vec2(p.x + ratio, p.y);
+vec2 txct = vec2(p_to.x + ratio - 1.0, p_to.y);
+`;
+      }
+      if (this.mod>1) {
+        frag_src += `
+float is_in;
+`;
+        use_pad = true;
+      }
+      if ((this.mod==2) || (this.mod==4)) {
+        frag_src += `
+txcf.x -= 1.0;
+txcf.y -= 0.5;
+txcf /= (1.0-ratio);
+txcf.x += 1.0;
+txcf.y += 0.5;
+is_in = (myratio==0.0) ? step(txcf.y, 1.0) * step(0.0, txcf.y) : 1.0;
+`;
+      }
+      if ((this.mod==3) || (this.mod==4)) {
+        let op = (this.mod==4) ? '*=' : '='; 
+        frag_src += `
+txct.y -= 0.5;
+txct /= ratio;
+txct.y += 0.5;
+is_in `+ op + ` (myratio>0.0) ? step(0.0, txct.y) * step(txct.y, 1.0) : 1.0;
+`;
+      }
+    }
+  }
+  //top
+  else if (this.v_mode == 1) {
+    frag_src += 'float myratio = step(0.0 + p.y, ratio);';
+    if (this.mod) {
+      frag_src += `
+vec2 txcf = vec2(p.x, p.y - ratio);
+vec2 txct = vec2(p_to.x, 1.0 + p_to.y - ratio);
+`;
+    }
+    if (this.mod>1) {
+        frag_src += `
+float is_in;
+`;
+      use_pad = true;
+    }
+
+    if ((this.mod==2) || (this.mod==4)) {
+        frag_src += `
+txcf.x -= 0.5;
+txcf /= (1.0-ratio);
+txcf.x += 0.5;
+is_in = (myratio==0.0) ? step(0.0, txcf.x) * step(txcf.x, 1.0) : 1.0;
+`;
+    }
+    if ((this.mod==3) || (this.mod==4)) {
+      let op = (this.mod==4) ? '*=' : '=';
+      frag_src += `
+txct.x -= 0.5;
+txct.y -= 1.0;
+txct /= ratio;
+txct.x += 0.5;
+txct.y += 1.0;
+is_in ` + op +` (myratio>0.0) ? step( 0.0, txct.x) * step(txct.x, 1.0) : 1.0;
+`;
+    }
+  }
+  //bottom
+  else if (this.v_mode == 2) {
+    frag_src += 'float myratio = step(1.0 - p.y, ratio);';
+    if (this.mod) {
+      frag_src += `
+vec2 txcf = vec2(p.x, p.y + ratio);
+vec2 txct = vec2(p_to.x, p_to.y + ratio - 1.0);
+`;
+    }
+    if (this.mod>1) {
+      frag_src += `
+float is_in;
+`;
+      use_pad = true;
+    }
+    if ((this.mod==2) || (this.mod==4)) {
+        frag_src += `
+txcf.x -= 0.5;
+txcf.y -= 1.0;
+txcf /= (1.0-ratio);
+txcf.x += 0.5;
+txcf.y += 1.0;
+is_in = (myratio==0.0) ? step(0.0, txcf.x) * step(txcf.x, 1.0) : 1.0;
+`;
+    }
+    if ((this.mod==3) || (this.mod==4)) {
+      let op = (this.mod==4) ? '*=' : '=';
+      frag_src += `
+txct.x -= 0.5;
+txct /= ratio;
+txct.x += 0.5;
+is_in `+ op + `(myratio>0.0) ? step( 0.0, txct.x) * step(txct.x, 1.0) : 1.0;
+`;
+    }
+  } else {
+    frag_src += 'float myratio = ratio;';      
+  }
+  frag_src += `
+    vec4 col_from = get_pixel_from(txcf.xy);
+    vec4 col_to = get_pixel_to(txct.xy);`;
+
+  if (use_pad) {
+    frag_src += `
+      is_in = (is_in==0.0) ? 0.0 : 1.0;
+      return mix(swipe_pad_color, mix(col_from, col_to, myratio), is_in);
+    }`;
+  } else {
+    frag_src += `
+      return mix(col_from, col_to, myratio);
+    }`;
+
+  }
+
+  if (use_pad) {
+    frag_src = 'uniform vec4 swipe_pad_color;\n' + frag_src;
+  }
+
+
+  return frag_src;
+}
+
+
+
+}; }

gpac-2.0.0.tar.gz/share/scripts/vout.js Added

@@ -0,0 +1,883 @@
+
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2020-2021
+ *					All rights reserved
+ *
+ * This file is part of GPAC / vout default ui
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+/*very simple controller for vout and vout+aout allowing stats display and playback control */
+
+import * as evg from 'evg'
+import { Sys as sys } from 'gpaccore'
+
+_gpac_log_name="";
+
+print("Type 'h' in window for command list");
+
+let aout = null
+let vout = null
+
+let i;
+for (i=0; i< session.nb_filters; i++) {
+ 	let f = session.get_filter(i);
+ 	if (f.type==="aout") aout = f;
+ 	else if (f.type==="vout") vout = f;
+}
+
+let speed=0;
+let drop=0;
+let paused=0;
+let duration=-1
+let fullscreen = false;
+
+let audio_only = false;
+let ol_buffer = null;
+let ol_canvas = null;
+let ol_width = 200;
+let ol_height = 20;
+
+let text = new evg.Text();
+text.font = 'SERIF';
+text.fontsize = 20;
+text.baseline = GF_TEXT_BASELINE_HANGING;
+text.align = GF_TEXT_ALIGN_LEFT;
+text.lineSpacing = 20;
+
+const OL_NONE = 0;
+const OL_HELP = 1;
+const OL_STATS = 2;
+const OL_PLAY = 3;
+let overlay_type = OL_NONE;
+
+let brush = new evg.SolidBrush();
+brush.set_color('white');
+
+let disp_size = null;
+let task_reschedule = 500;
+let rot = 0;
+let flip = 0;
+
+let do_coverage=0;
+if (sys.get_opt('temp', 'vout_cov') == 'yes') do_coverage = 1;
+
+function setup_overlay()
+{
+	let target_width=ol_width;
+	let target_height=ol_height;
+
+	disp_size = vout.get_arg('owsize');
+	if (disp_size==null) return false;
+	if (audio_only && !disp_size.x) {
+		disp_size = {"x": 320, "y": 80};
+	}
+
+	task_reschedule = 500;
+	switch (overlay_type) {
+	case OL_HELP:
+		target_width = Math.floor(disp_size.x/2);
+		target_height = Math.floor( (shortcuts.length+2) * 30);
+		break;
+	case OL_PLAY:
+		target_width = Math.floor(disp_size.x/2);
+		target_height = Math.floor( 60);
+		task_reschedule = 500;
+		break;
+	case OL_STATS:
+		target_width = Math.floor(disp_size.x/2);
+		target_height = Math.floor(disp_size.y/2);
+		task_reschedule = 250;
+		break;
+	default:
+		if (!ol_width)
+				ol_width = Math.floor(disp_size.x/3);
+		if (!ol_height)
+			ol_height = Math.floor(disp_size.y/4);
+		break;
+	}
+	init_wnd=true;
+
+	if (audio_only) {
+		target_width = ol_width = disp_size.x;
+		target_height = ol_height = disp_size.y;
+	}
+	while (target_width%2) target_width--;
+	while (target_height%2) target_height--;
+
+	if ((ol_width!=target_width) || (ol_height!=target_height)) {
+		ol_buffer = null;
+		ol_width = target_width;
+		ol_height = target_height;
+	}
+	if (ol_buffer) return true;
+	ol_buffer = new ArrayBuffer(ol_width*ol_height*4);
+	ol_canvas = new evg.Canvas(ol_width, ol_height, 'rgba', ol_buffer);
+	ol_canvas.clearf(0.2, 0.2, 0.2, 0.6);
+	return true;
+}
+
+if (vout) {
+	speed = vout.get_arg('speed');
+	drop = vout.get_arg('drop');
+	fullscreen = vout.get_arg('fullscreen');
+
+	session.post_task( () => {
+		if (session.last_task) {
+			return false;
+		}
+		if (vout.nb_ipid) {
+			audio_only=false;
+			return false;
+		}
+		if (aout) {
+			if (!aout.nb_ipid || !session.connected) {
+				return 100;
+			}
+
+			if (!audio_only) {
+				overlay_type=OL_PLAY;
+				audio_only=true;
+				toggle_overlay();
+			}
+		}
+		return false;
+	}, "check_vout_pids");
+}
+
+session.set_event_fun( (evt)=> {
+	if (evt.type != GF_FEVT_USER) return 0;
+
+	switch (evt.ui_type) {
+	case GF_EVENT_MOUSEDOWN:
+		break;
+
+	case GF_EVENT_MOUSEUP:
+		if (overlay_type==OL_PLAY) 
+			if (prog_interact(evt)) return 0;
+		if (ol_visible) {
+			toggle_overlay();
+		} else if (!audio_only) {
+			overlay_type=OL_PLAY;
+			toggle_overlay();
+		}
+		break;
+
+	case GF_EVENT_KEYDOWN:
+		process_keyboard(evt);
+		break;
+	case GF_EVENT_SIZE:
+		if (do_coverage) {
+			overlay_type=OL_PLAY;
+			ol_visible=true;
+			if (do_coverage==1) {
+				do_coverage = 0;
+				coverage_tests();
+			}
+		}
+		if (ol_visible) {
+			let old_type = overlay_type;
+			vout.lock(true);
+			toggle_overlay();
+			overlay_type = old_type;
+			toggle_overlay();
+			vout.update('oldata', ol_buffer);
+			vout.lock(false);
+		}
+		break;
+	default:
+	}
+	return 0;
+}
+);
+
+function coverage_tests()
+{
+	print('coverage tests');
+	if (aout) aout.update('speed', '1');
+	let evt = new FilterEvent(GF_FEVT_QUALITY_SWITCH);
+	evt.up = true;
+	let src = vout.ipid_source(0);
+	session.fire_event(evt, src);
+	evt.up = false;
+	session.fire_event(evt, src);
+}
+
+
+function check_duration()
+{
+	if (duration!=-1) return (duration>=0) ? true : false;
+	let dur;
+	if (audio_only)
+		dur = aout.ipid_props(0, 'Duration');
+	else
+		dur = vout.ipid_props(0, 'Duration');
+	if (dur==null) return;
+	duration = dur.n;
+	duration /= dur.d;
+	return true;
+}
+
+function do_seek(val, mods, absolute)
+{
+	if (! check_duration())
+		return;
+
+	let seek_to=-1;
+	if (!absolute) {
+		if (mods & GF_KEY_MOD_CTRL) val *= 30; 
+		else if (mods & GF_KEY_MOD_SHIFT) val *= 10;
+		seek_to = duration * val / 100;
+	}
+	//in seconds
+	else {
+		//30smin
+		if (mods & GF_KEY_MOD_CTRL) val *= 1800;
+		//10min
+		else if (mods & GF_KEY_MOD_SHIFT) val *= 600;
+		//30s
+		else val *= 30;
+		seek_to = val;
+	}
+
+
+	let last_ts_f = vout.last_ts_drop;
+	if (last_ts_f==null) return;
+
+	let last_ts = last_ts_f.n;
+	last_ts /= last_ts_f.d;
+	last_ts += seek_to;	
+	if (last_ts<0) last_ts = 0;
+	else if (last_ts>duration) last_ts = duration-10;
+	
+	vout.update('start', ''+last_ts);
+	if (aout) aout.update('start', '' + last_ts);
+}
+
+let init_wnd=false;
+function update_help()
+{
+	let args = []; //['Shortcuts for vout', ' '];
+
+	shortcuts.forEach( (key) => {
+		args.push( '' + sys.keyname(key.code) + ': ' + key.desc);
+	});
+	if (audio_only)
+		text.fontsize = 20;
+	else
+		text.fontsize = Math.floor(0.6*ol_height/args.length);
+	text.set_text(args);
+
+	//lock vout since we will modify data of the canvas
+	vout.lock(true);
+
+	if (init_wnd && audio_only) {
+		let txtdim = text.measure();
+
+		ol_width = Math.floor(txtdim.width*1.2);
+		while (ol_width%2) ol_width--;
+		ol_height = Math.floor(txtdim.height*1.2);
+		while (ol_height%2) ol_height--;
+		ol_buffer = new ArrayBuffer(ol_width*ol_height*4);
+		ol_canvas = new evg.Canvas(ol_width, ol_height, 'rgba', ol_buffer);
+		vout.update('olsize', ''+ol_width+'x'+ol_height);
+		vout.update('olwnd', '0x0x'+ol_width+'x'+ol_height);
+		init_wnd=false;
+	}
+
+	ol_canvas.clearf(0.2, 0.2, 0.2, 0.6);
+	let mx = new evg.Matrix2D();
+	mx.translate(-ol_width/2, ol_height/3);
+	ol_canvas.matrix = mx;
+	ol_canvas.path = text;
+	ol_canvas.fill(brush);
+
+
+	overlay_type=OL_NONE;
+	vout.update('oldata', ol_buffer);
+	vout.lock(false);
+}
+
+let progress_bar_path=null;
+let prog_ox=0;
+let prog_length=0;
+let reverse=false;
+
+function prog_interact(evt)
+{
+	let ret = audio_only ? true : false;
+	let x = evt.mouse_x - disp_size.x/2;
+	let y = disp_size.y - evt.mouse_y - ol_height/2;
+
+	if (x<-ol_width/2) return ret;
+	if (x>ol_width/2) return ret;
+	if (y>ol_height/2) return ret;
+
+	if (!check_duration())
+		return true;
+
+	if (!progress_bar_path.point_over(x, y)) {
+		x -= prog_ox;
+		x /= prog_length;
+		x += 0.5;
+		if (x>1) reverse = !reverse;
+		return true;
+	}
+
+	x -= prog_ox;
+	x /= prog_length;
+	x += 0.5;
+	x *= duration;
+	if (audio_only) {
+		aout.update('start', '' + x);
+	} else {
+		vout.update('start', '' + x);
+		if (aout) aout.update('start', '' + x);
+	}
+	return true;
+}
+
+function update_play()
+{
+	if (init_wnd) {
+		let pos = '0x' + Math.floor(ol_height/2 - disp_size.y/2) + 'x'+ol_width+'x'+ol_height;
+		vout.update('olwnd', pos);
+		init_wnd=false;
+		progress_bar_path=null;
+	}
+
+	ol_canvas.clearf(0.2, 0.2, 0.2, 0.6);
+	let length = ol_width - 20;
+	let last_ts_f = vout.last_ts_drop;
+	if (!last_ts_f && aout)
+		last_ts_f = aout.last_ts_drop;
+	if (!last_ts_f) {
+		return;
+	}
+
+	let has_dur = check_duration();
+	if (!has_dur) reverse = false;
+
+	let h, m, s;
+	let last_ts = last_ts_f.n;
+	last_ts /= last_ts_f.d;
+
+	if (reverse) last_ts = duration - last_ts;
+
+	h = Math.floor(last_ts/3600);
+	m = Math.floor(last_ts/60 - h*60);
+	s = Math.floor(last_ts - h*360) - m*60;
+	let str = reverse ? '-' : ' ';
+
+	if (duration>=3600) {
+		if (h<10) str+='0';
+		str+=h+':';
+	}
+	if (m<10) str+='0';
+	str+=m+':';
+	if (s<10) str+='0';
+	str+=s;
+	let fs = Math.floor(0.5*ol_height);
+	if (fs > 60) fs=60;
+	text.fontsize = fs; 
+	text.set_text(str);
+	let mx = new evg.Matrix2D();
+	if (has_dur)
+		mx.translate(ol_width/2 - str.length * text.fontsize/2, -10);
+	else
+		mx.translate(- str.length * text.fontsize/3, -10);
+	ol_canvas.matrix = mx;
+	ol_canvas.path = text;
+	ol_canvas.fill(brush);
+	length -= str.length * text.fontsize/2;
+	
+
+	if (has_dur) {
+		if (!progress_bar_path) {
+			prog_length = length;
+			prog_ox = 10 + (length - ol_width) / 2;
+			progress_bar_path = new evg.Path();
+			progress_bar_path.rectangle(prog_ox, 0, prog_length, 20, true);
+		}
+		ol_canvas.matrix = null;
+		ol_canvas.path = progress_bar_path;
+		brush.set_color('grey');
+		ol_canvas.fill(brush);
+
+		let	progress_path = new evg.Path();
+		let progress = (last_ts_f.n/last_ts_f.d) / duration;
+		brush.set_color('white');
+		progress_path.rectangle(prog_ox - prog_length/2, 9, prog_length*progress, 18, false);
+		ol_canvas.path = progress_path;
+		ol_canvas.fill(brush);
+	}
+
+	if (paused || (speed != 1)) {
+		text.fontsize = 16; 
+		if (paused)
+			text.set_text((paused==2) ? 'Step mode' : 'Paused');
+		else
+			text.set_text('Speed: ' + speed);
+		let mx = new evg.Matrix2D();
+		mx.translate(0, ol_height/4);
+		ol_canvas.matrix = mx;
+		ol_canvas.path = text;
+		brush.set_color('cyan');
+		ol_canvas.fill(brush);
+		brush.set_color('white');
+	}
+	//we could lock vout to avoid any tearing ...
+	vout.update('oldata', ol_buffer);
+}
+
+function build_graph(f, str, str_list, fdone)
+{
+	let i, j, num_tiles=0;
+	if (!f.nb_opid) {
+		str += '->' + f.name;
+		str_list.push(str);
+		str = '';
+		fdone.push(f);
+		return;
+	}
+	if (fdone.indexOf(f)>=0) {
+		str += '->' + f.name;
+		str_list.push(str);
+		str = '';
+		return;
+	}
+
+	let len=0;
+	if (!str.length) str = f.name;
+	else str += '->' + f.name;
+	text.set_text(str);
+	len = text.measure().width;
+
+	for (i=0; i<f.nb_opid; i++) {
+		let sinks = f.opid_sinks(i);
+		let sub_len=0;
+		let sub_str;
+
+		let p = f.opid_props(i, 'CodecID');
+		if (p == 'hvt1') {
+			if (num_tiles) continue;
+			num_tiles++;
+			for (j=i+1; j<f.nb_opid; j++) {
+				let p = f.opid_props(j, 'CodecID');
+				if (p == 'hvt1')
+					num_tiles++;
+			}
+		}
+
+		if (i) {
+			str=' ';
+			let k=0;
+			while (1) { 
+				text.set_text(str);
+				let slen = text.measure().width;
+				if (slen >= len) break;
+				str += ' ';
+			}
+		}
+		sub_str = str;
+		if (f.nb_opid>1) {
+			if (num_tiles>1) {
+				sub_str += '#tilePIDs[' + num_tiles + ']';
+			} else {
+				sub_str += '#' + f.opid_props(i, 'name');
+			}
+		}
+
+		if (!sinks.length) {
+			str_list.push(sub_str + ': Not connected');
+			continue;
+		}
+
+		for (j=0; j<sinks.length; j++) {
+			let sf = sinks[j];
+
+			if (!j) {
+				text.set_text(sub_str);
+				sub_len = text.measure().width;
+			} else {
+				sub_str=' ';
+				let k=0;
+				while (1) { 
+					text.set_text(sub_str);
+					let slen = text.measure().width;
+					if (slen >= sub_len) break;
+					sub_str += ' ';
+				}
+			}
+			build_graph(sinks[j], sub_str, str_list, fdone);
+		}
+	}
+	fdone.push(f);
+}
+
+let stats_translate_y=0;
+let stats_graph = [];
+
+function update_stats()
+{
+	let stats = [];
+
+	let sys_info='CPU: '+sys.process_cpu_usage + ' Mem: ' + Math.floor(sys.process_memory/1000000) + ' MB';
+	if (session.http_bitrate) {
+		let r = session.http_bitrate;
+		sys_info += ' HTTP: '; 
+		if (r>1000000) sys_info += '' + Math.floor(r/100000) / 10 + ' mbps';
+		else if (r>1000) sys_info += '' + Math.floor(r/100) / 10 + ' kbps';
+		else sys_info += '' + r + ' bps';
+	}
+	stats.push(sys_info);
+//	stats.push(' ');
+
+	let i;
+	for (i=0; i< session.nb_filters; i++) {
+	 	let f = session.get_filter(i);
+	 	//only output filters (no out, single in) 
+	 	if ((f.nb_ipid!=1) || f.nb_opid) continue;
+
+		let str = f.streamtype;
+		let src = f.ipid_source(0);
+		let names = src.name.split(':');
+
+		str += ' (' + names[0];
+		let decrate = src.pck_done;
+		if (!decrate) decrate = src.pck_sent + src.pck_ifce_sent;
+		decrate /= src.time/1000000;
+		decrate = Math.floor(decrate);
+		str += ') ' + decrate + ' f/s';
+		let p = f.ipid_props(0, 'Width');
+		if (p) {
+			str += ' ' + p;
+			p = f.ipid_props(0, 'Height');
+			str += 'x' + p;
+			p = f.ipid_props(0, 'FPS');
+			if (p) {
+				let fps = Math.floor(p.n/p.d);
+				if (fps * p.d == p.n)
+					str += '@' + fps;
+				else
+					str += '@' + p.n + '/'+p.d;
+			}
+			p = f.ipid_props(0, 'SAR');
+			if (p) str += ' SAR ' + p.n + '/' + p.d;			
+		} else {
+			p = f.ipid_props(0, 'SampleRate');
+			if (p) {
+				str += ' ' + p;
+				p = f.ipid_props(0, 'Channels');
+				if (p) str += ' ' + p;
+				p = f.ipid_props(0, 'ChannelLayout');
+				if (p) str += ' ' + p;
+			} 
+		}
+
+		let buffer = f.ipid_props(0, 'buffer')/1000;
+		let rebuf = 0;
+		if (audio_only) {
+			rebuf = aout.get_arg('rebuffer');			
+		}
+		else {
+			rebuf = vout.get_arg('rebuffer');
+		}
+		if (rebuf>0) {
+			let play_buf = audio_only ? aout.get_arg('buffer') : vout.get_arg('buffer');
+			let pc = Math.floor(100 * buffer / play_buf);
+			str += ' - rebuffering ' + pc + ' %';
+		} else {
+			str += ' - buffer ' + Math.floor(f.ipid_props(0, 'buffer')/1000) + ' ms';
+		}
+		stats.push(str);
+	}
+
+//	stats.push(' ');
+
+	//recompute graph only when initializing the window
+	if (init_wnd)
+		stats_graph = [];
+
+	if (! stats_graph.length) {
+		let fdone = [];
+		//browse all sources, and build graph
+		for (i=0; i< session.nb_filters; i++) {
+		 	let f = session.get_filter(i);
+		 	//source filter: no input and outputs
+		 	if (f.nb_ipid || !f.nb_opid) continue;
+
+		 	build_graph(f, '', stats_graph, fdone);
+		}
+		let not_done = [];
+		for (i=0; i< session.nb_filters; i++) {
+		 	let f = session.get_filter(i);
+		 	if (f.alias) continue;
+
+		 	if (fdone.indexOf(f)<0)
+		 		not_done.push(f);
+		 }
+		 if (not_done.length) {
+			stats.push(' ');
+		 	let str = "Filters not connected:";
+		 	not_done.forEach(f => { str += ' '+f.name;});
+			stats.push(str);
+		 }
+	 }
+
+	 //push graph to stats string array
+	 stats_graph.forEach(str => { stats.push(str);});
+
+
+	text.fontsize = 20; 
+	text.set_text(stats);
+
+	if (init_wnd) {
+		let txtdim = text.measure();
+
+		ol_width = Math.floor(txtdim.width*1.2);
+		while (ol_width%2) ol_width--;
+		ol_height = Math.floor(txtdim.height*1.4);
+		while (ol_height%2) ol_height--;
+		//we resize / realloc the overlay buffer, lock vout and update it
+		vout.lock(true);
+		ol_buffer = new ArrayBuffer(ol_width*ol_height*4);
+		ol_canvas = new evg.Canvas(ol_width, ol_height, 'rgba', ol_buffer);
+		vout.update('olsize', ''+ol_width+'x'+ol_height);
+		stats_translate_y = txtdim.height/2;
+		vout.update('oldata', ol_buffer);
+		vout.lock(false);
+
+		let pos;
+		if (audio_only)
+			pos = '0x0x'+ol_width+'x'+ol_height;
+		else
+			pos = ''+ Math.floor(ol_width/2 - disp_size.x/2) + 'x' + Math.floor(ol_height/2 - disp_size.y/2) + 'x'+ol_width+'x'+ol_height;
+		vout.update('olwnd', pos);
+		init_wnd=false;
+	}
+
+	ol_canvas.clearf(0.2, 0.2, 0.2, 0.6);
+
+	let mx = new evg.Matrix2D();
+	mx.translate(-ol_width/2, stats_translate_y);
+	ol_canvas.matrix = mx;
+	ol_canvas.path = text;
+	ol_canvas.fill(brush);
+	//we could lock vout to avoid any tearing ...
+	vout.update('oldata', ol_buffer);
+}
+
+
+function update_overlay()
+{
+	if (overlay_type==OL_NONE) return;
+
+	//help screen
+	if (overlay_type==OL_HELP) {
+		update_help();
+		return;
+	}
+	//play screen
+	if (overlay_type==OL_PLAY) {
+		update_play();
+	}
+	//play screen
+	if (overlay_type==OL_STATS) {
+		update_stats();
+	}
+}
+
+let ol_visible=false;
+let oltask_scheduled=false;
+
+function toggle_overlay()
+{
+	ol_visible = !ol_visible;
+	if (!ol_visible) {
+		//we don't lock vout because the overlay buffer is still valid
+		vout.update('oldata', null);
+		overlay_type=OL_NONE;
+		return;
+	}
+	//we will potentially destroy the previous overlay bffer, lock vout
+	vout.lock(true);
+	if (!setup_overlay()) {
+		vout.lock(false);
+		return;
+	}
+
+	vout.update('olwnd', '0x0x'+ol_width+'x'+ol_height);
+	vout.update('olsize', ''+ol_width+'x'+ol_height);
+	vout.update('oldata', ol_buffer);
+	vout.lock(false);
+	if (!oltask_scheduled) {
+		session.post_task( () => {
+			oltask_scheduled=false;
+			if (audio_only && aout.ipid_props(0, 'eos') ) {
+				//we don't lock vout because the overlay buffer is still valid
+				vout.update('oldata', null);
+				return false;
+			}
+			if (session.last_task) {
+				return false;
+			}
+			update_overlay();
+			if (!ol_visible) return false;
+			if (overlay_type==OL_NONE) return false;
+			oltask_scheduled=true;
+			return task_reschedule;
+		}, "overlay_update");
+	}
+}
+
+let shortcuts = [
+	{ "code": GF_KEY_B, "desc": "speeds up by 2"},
+	{ "code": GF_KEY_V, "desc": "speeds down by 2"},
+	{ "code": GF_KEY_N, "desc": "normal play speed"},
+	{ "code": GF_KEY_SPACE, "desc": "pause/resume"},
+	{ "code": GF_KEY_S, "desc": "step one frame"},
+	{ "code": GF_KEY_RIGHT, "desc": "seek forward by 1%, 10% if alt down, 30% if ctrl down"},
+	{ "code": GF_KEY_LEFT, "desc": "seek backward "},
+	{ "code": GF_KEY_UP, "desc": "seek forward by 30s, 10m if alt down, 30m if ctrl down"},
+	{ "code": GF_KEY_DOWN, "desc": "seek backward"},
+	{ "code": GF_KEY_F, "desc": "fullscreen mode"},
+	{ "code": GF_KEY_I, "desc": "show info and statistics"},
+	{ "code": GF_KEY_P, "desc": "show playback info"},
+	{ "code": GF_KEY_M, "desc": "flip video"},
+	{ "code": GF_KEY_R, "desc": "rotate video by 90 degree"},
+];
+
+function set_speed(speed)
+{
+	if (audio_only) aout.update('speed', ''+speed);
+	else {
+		vout.update('speed', ''+speed);
+		if (aout) aout.update('speed', ''+speed);
+
+		if (speed>2) vout.update('drop', '1');
+		else if (speed<=1) vout.update('drop', ''+drop);
+
+	}
+}
+
+function process_keyboard(evt)
+{
+	switch (evt.keycode) {
+	case GF_KEY_B:
+		if (evt.keymods & GF_KEY_MOD_SHIFT) speed *= 1.2;
+		else speed *= 2;
+		set_speed(speed);
+		return;
+	case GF_KEY_V:
+		if (evt.keymods & GF_KEY_MOD_SHIFT) speed /= 1.2;
+		else speed /= 2;
+		set_speed(speed);
+		return;
+	case GF_KEY_N:
+		speed = 1;
+		set_speed(speed);
+		return;
+	case GF_KEY_SPACE:
+		paused = !paused;
+		set_speed(paused ? 0 : speed);
+		return;
+	case GF_KEY_S:
+		paused = 2;
+		vout.update('step', '1');
+		if (aout) aout.update('speed', '0');
+		check_duration();
+		return;
+	case GF_KEY_RIGHT:
+		do_seek(1, evt.keymods, false);
+		return;
+	case GF_KEY_LEFT:
+		do_seek(-1, evt.keymods, false);
+		return;
+	case GF_KEY_UP:
+		do_seek(1, evt.keymods, true);
+		return;
+	case GF_KEY_DOWN:
+		do_seek(-1, evt.keymods, true);
+		return;
+
+	case GF_KEY_F:
+		if (audio_only) return;
+		fullscreen = !fullscreen;
+		vout.update('fullscreen', ''+fullscreen);
+		return;
+
+	case GF_KEY_H:
+		//hide player
+		if (audio_only && (overlay_type==OL_PLAY)) {
+			toggle_overlay();
+		}
+		overlay_type=OL_HELP;
+		toggle_overlay();
+		//show player player
+		if (!ol_visible && audio_only) {
+			overlay_type=OL_PLAY;
+			toggle_overlay();
+		}
+		return;
+	case GF_KEY_I:
+		//hide player
+		if (audio_only && (overlay_type==OL_PLAY)) {
+			toggle_overlay();
+		}
+		overlay_type=OL_STATS;
+		toggle_overlay();
+		//show player player
+		if (!ol_visible && audio_only) {
+			overlay_type=OL_PLAY;
+			toggle_overlay();
+		}
+		return;
+	case GF_KEY_P:
+		//do not untoggle for audio only
+		if (audio_only) return;
+		overlay_type=OL_PLAY;
+		if (!ol_visible) init_wnd=true;
+		toggle_overlay();
+		return;
+	case GF_KEY_R:
+		if (audio_only) return;
+		rot = vout.get_arg('vrot');
+		rot++;
+		if (rot==4) rot = 0;
+		if (!rot) vout.update('vrot', '0');
+		else if (rot==1) vout.update('vrot', '90');
+		else if (rot==2) vout.update('vrot', '180');
+		else vout.update('vrot', '270');
+		return;
+	case GF_KEY_M:
+		if (audio_only) return;
+		flip = vout.get_arg('vflip');
+		flip++;
+		if (flip==4) flip = 0;
+		if (!flip) vout.update('vflip', 'no');
+		else if (flip==1) vout.update('vflip', 'v');
+		else if (flip==2) vout.update('vflip', 'h');
+		else vout.update('vflip', 'vh');
+		return;
+	default:
+		break;
+	}
+}

gpac-1.0.1.tar.gz/share/scripts/webvtt-renderer.js -> gpac-2.0.0.tar.gz/share/scripts/webvtt-renderer.js Changed

gpac-1.0.1.tar.gz/share/vis/Code/Console.js -> gpac-2.0.0.tar.gz/share/vis/Code/Console.js Changed

gpac-1.0.1.tar.gz/share/vis/extern/BrowserLib/WindowManager/Styles/WindowManager.css -> gpac-2.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Styles/WindowManager.css Changed

gpac-1.0.1.tar.gz/src/Makefile -> gpac-2.0.0.tar.gz/src/Makefile Changed

@@ -23,7 +23,7 @@
 ifeq ($(DISABLE_PLAYER),no)
 LIBGPAC_UTILS+=utils/uni_bidi.o utils/unicode.o
 endif
-LIBGPAC_UTILS+=utils/os_module.o utils/module.o utils/path2d.o utils/path2d_stroker.o 
+LIBGPAC_UTILS+=utils/os_module.o utils/module.o utils/path2d.o utils/path2d_stroker.o
 
 ## libgpac objects gathering: src/ietf
 LIBGPAC_IETF=
@@ -34,7 +34,8 @@
 ## libgpac objects gathering: src/bifs
 LIBGPAC_BIFS=
 ifeq ($(DISABLE_BIFS),no)
-LIBGPAC_BIFS=bifs/arith_decoder.o bifs/bifs_codec.o bifs/bifs_node_tables.o bifs/com_dec.o bifs/com_enc.o bifs/conditional.o bifs/field_decode.o bifs/field_encode.o bifs/memory_decoder.o bifs/predictive_mffield.o bifs/quantize.o bifs/script_dec.o bifs/script_enc.o bifs/unquantize.o
+LIBGPAC_BIFS=bifs/bifs_codec.o bifs/bifs_node_tables.o bifs/com_dec.o bifs/com_enc.o bifs/conditional.o bifs/field_decode.o bifs/field_encode.o bifs/memory_decoder.o bifs/quantize.o bifs/script_dec.o bifs/script_enc.o bifs/unquantize.o
+#LIBGPAC_BIFS+=bifs/arith_decoder.o bifs/predictive_mffield.o
 endif
 
 ## libgpac objects gathering: src/isomedia
@@ -48,16 +49,16 @@
 
 
 ## libgpac objects gathering: src/odf
-LIBGPAC_ODF=odf/desc_private.o odf/descriptors.o odf/odf_code.o odf/odf_codec.o odf/odf_command.o odf/qos.o odf/slc.o
+LIBGPAC_ODF=odf/desc_private.o odf/descriptors.o odf/odf_code.o odf/odf_codec.o odf/odf_command.o odf/slc.o
 ifeq ($(MINIMAL_OD),no)
-LIBGPAC_ODF+=odf/ipmpx_code.o odf/oci_codec.o
+#LIBGPAC_ODF+=odf/qos.o odf/ipmpx_code.o odf/oci_codec.o
 
 ifeq ($(DISABLE_OD_DUMP),no)
-LIBGPAC_ODF+=odf/ipmpx_dump.o
+#LIBGPAC_ODF+=odf/ipmpx_dump.o
 endif
 
 ifeq ($(DISABLE_OD_PARSE),no)
-LIBGPAC_ODF+=odf/ipmpx_parse.o
+#LIBGPAC_ODF+=odf/ipmpx_parse.o
 endif
 
 endif
@@ -75,13 +76,18 @@
 ## libgpac objects gathering: src/crypto
 LIBGPAC_CRYPTO=
 ifeq ($(DISABLE_CRYPTO),no)
-LIBGPAC_CRYPTO+=crypto/g_crypt.o crypto/g_crypt_openssl.o crypto/g_crypt_tinyaes.o crypto/tiny_aes.o
+LIBGPAC_CRYPTO+=crypto/g_crypt.o
+ifeq ($(HAS_OPENSSL), no)
+LIBGPAC_CRYPTO+=crypto/g_crypt_tinyaes.o crypto/tiny_aes.o
+else
+LIBGPAC_CRYPTO+=crypto/g_crypt_openssl.o
+endif
 endif
 
 LIBGPAC_EVG=evg/ftgrays.o evg/raster3d.o evg/raster_565.o evg/raster_argb.o evg/raster_rgb.o evg/raster_yuv.o evg/stencil.o evg/surface.o
 
 ## libgpac objects gathering: src/media tools
-LIBGPAC_MEDIATOOLS=media_tools/isom_tools.o media_tools/dash_segmenter.o media_tools/av_parsers.o media_tools/atsc_dmx.o
+LIBGPAC_MEDIATOOLS=media_tools/isom_tools.o media_tools/dash_segmenter.o media_tools/av_parsers.o media_tools/route_dmx.o
 
 ifeq ($(DISABLE_AV_PARSERS),no)
 LIBGPAC_MEDIATOOLS+=media_tools/img.o
@@ -138,10 +144,16 @@
 LIBGPAC_FILTERS=filter_core/filter_pck.o filter_core/filter_pid.o filter_core/filter_props.o filter_core/filter_queue.o filter_core/filter_session.o filter_core/filter_register.o filter_core/filter.o filter_core/filter_session_js.o
 
 LIBGPAC_QUICKJS=
+LIBGPAC_JSMODS=
+JSMODS_CFLAGS=
 ifeq ($(CONFIG_JS),yes)
-LIBGPAC_QUICKJS=quickjs/cutils.o quickjs/libbf.o quickjs/libregexp.o quickjs/libunicode.o quickjs/quickjs.o
-LIBGPAC_QUICKJS+=jsmods/core.o jsmods/evg.o jsmods/scene_js.o jsmods/storage.o jsmods/webgl.o jsmods/xhr.o
+LIBGPAC_QUICKJS=quickjs/cutils.o quickjs/libbf.o quickjs/libregexp.o quickjs/libunicode.o quickjs/quickjs.o quickjs/quickjs-libc.o
+LIBGPAC_JSMODS+=jsmods/core.o jsmods/evg.o jsmods/scene_js.o jsmods/storage.o jsmods/webgl.o jsmods/xhr.o
+ifneq ($(CONFIG_FFMPEG),no)
+JSMODS_CFLAGS+=$(ffmpeg_cflags)
 endif
+endif
+
 
 
 ## libgpac objects gathering: src/scene_manager
@@ -185,10 +197,11 @@
 
 
 ## libgpac objects gathering: src/compositor
-LIBGPAC_COMPOSITOR=compositor/audio_input.o compositor/audio_mixer.o compositor/audio_render.o compositor/bindable.o compositor/camera.o compositor/compositor.o compositor/compositor_2d.o compositor/compositor_3d.o compositor/compositor_node_init.o compositor/drawable.o compositor/events.o compositor/font_engine.o compositor/hc_flash_shape.o compositor/hardcoded_protos.o compositor/mesh.o compositor/mesh_collide.o compositor/mesh_tesselate.o compositor/mpeg4_animstream.o compositor/mpeg4_audio.o compositor/mpeg4_background.o compositor/mpeg4_background2d.o compositor/mpeg4_bitmap.o compositor/mpeg4_composite.o compositor/mpeg4_form.o compositor/mpeg4_geometry_2d.o compositor/mpeg4_geometry_3d.o compositor/mpeg4_geometry_ifs2d.o compositor/mpeg4_geometry_ils2d.o compositor/mpeg4_gradients.o compositor/mpeg4_grouping.o compositor/mpeg4_grouping_2d.o compositor/mpeg4_grouping_3d.o compositor/mpeg4_layer_2d.o compositor/mpeg4_layer_3d.o compositor/mpeg4_layout.o compositor/mpeg4_lighting.o compositor/mpeg4_path_layout.o compositor/mpeg4_sensors.o compositor/mpeg4_sound.o compositor/mpeg4_text.o compositor/mpeg4_textures.o compositor/mpeg4_timesensor.o compositor/mpeg4_viewport.o compositor/navigate.o compositor/offscreen_cache.o compositor/svg_base.o compositor/svg_filters.o compositor/svg_font.o compositor/svg_geometry.o compositor/svg_grouping.o compositor/svg_media.o compositor/svg_paint_servers.o compositor/svg_text.o compositor/texturing.o compositor/texturing_gl.o compositor/visual_manager.o compositor/visual_manager_2d.o compositor/visual_manager_2d_draw.o compositor/visual_manager_3d.o compositor/visual_manager_3d_gl.o compositor/x3d_geometry.o compositor/clock.o compositor/mpeg4_inputsensor.o compositor/mpeg4_mediacontrol.o compositor/media_object.o compositor/mpeg4_mediasensor.o compositor/mpeg4_inline.o compositor/scene_ns.o compositor/object_manager.o compositor/scene.o compositor/svg_external.o compositor/scene_node_init.o
+LIBGPAC_COMPOSITOR=compositor/audio_input.o compositor/audio_mixer.o compositor/audio_render.o compositor/bindable.o compositor/camera.o compositor/compositor.o compositor/compositor_2d.o compositor/compositor_3d.o compositor/compositor_node_init.o compositor/drawable.o compositor/events.o compositor/font_engine.o compositor/hardcoded_protos.o compositor/mesh.o compositor/mesh_collide.o compositor/mesh_tesselate.o compositor/mpeg4_animstream.o compositor/mpeg4_audio.o compositor/mpeg4_background.o compositor/mpeg4_background2d.o compositor/mpeg4_bitmap.o compositor/mpeg4_composite.o compositor/mpeg4_form.o compositor/mpeg4_geometry_2d.o compositor/mpeg4_geometry_3d.o compositor/mpeg4_geometry_ifs2d.o compositor/mpeg4_geometry_ils2d.o compositor/mpeg4_gradients.o compositor/mpeg4_grouping.o compositor/mpeg4_grouping_2d.o compositor/mpeg4_grouping_3d.o compositor/mpeg4_layer_2d.o compositor/mpeg4_layer_3d.o compositor/mpeg4_layout.o compositor/mpeg4_lighting.o compositor/mpeg4_path_layout.o compositor/mpeg4_sensors.o compositor/mpeg4_sound.o compositor/mpeg4_text.o compositor/mpeg4_textures.o compositor/mpeg4_timesensor.o compositor/mpeg4_viewport.o compositor/navigate.o compositor/offscreen_cache.o compositor/svg_base.o compositor/svg_font.o compositor/svg_geometry.o compositor/svg_grouping.o compositor/svg_media.o compositor/svg_paint_servers.o compositor/svg_text.o compositor/texturing.o compositor/texturing_gl.o compositor/visual_manager.o compositor/visual_manager_2d.o compositor/visual_manager_2d_draw.o compositor/visual_manager_3d.o compositor/visual_manager_3d_gl.o compositor/x3d_geometry.o compositor/clock.o compositor/mpeg4_inputsensor.o compositor/mpeg4_mediacontrol.o compositor/media_object.o compositor/mpeg4_mediasensor.o compositor/mpeg4_inline.o compositor/scene_ns.o compositor/object_manager.o compositor/scene.o compositor/svg_external.o compositor/scene_node_init.o
+#LIBGPAC_COMPOSITOR+=compositor/hc_flash_shape.o compositor/svg_filters.o
 
 ifeq ($(DISABLE_PLAYER),yes)
-LIBGPAC_COMPOSITOR=compositor/font_engine.o 
+LIBGPAC_COMPOSITOR=compositor/font_engine.o
 LIBGPAC_TERMINAL=
 endif
 ifeq ($(DISABLE_SCENEGRAPH),yes)
@@ -207,7 +220,7 @@
 endif
 
 ## libgpac objects gathering:
-OBJS=$(LIBGPAC_UTILS) $(LIBGPAC_CRYPTO) $(LIBGPAC_SCENE) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ISOM) $(LIBGPAC_ODF) $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) $(LIBGPAC_COMPOSITOR) $(LIBGPAC_LASER) $(LIBGPAC_EVG) $(LIBGPAC_FILTERS) $(LIBGPAC_FILTERS_SVC)  $(LIBGPAC_QUICKJS)
+OBJS=$(LIBGPAC_UTILS) $(LIBGPAC_CRYPTO) $(LIBGPAC_SCENE) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ISOM) $(LIBGPAC_ODF) $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) $(LIBGPAC_COMPOSITOR) $(LIBGPAC_LASER) $(LIBGPAC_EVG) $(LIBGPAC_FILTERS) $(LIBGPAC_FILTERS_SVC) $(LIBGPAC_FILTERS_OHEVC) $(LIBGPAC_QUICKJS) $(LIBGPAC_JSMODS)
 
 SCENEGRAPH_CFLAGS=
 MEDIATOOLS_CFLAGS=$(JS_FLAGS)
@@ -215,13 +228,16 @@
 ##include static modules and other deps for libgpac
 include ../static.mak
 
-LIBGPAC_FILTERS+=filters/bsrw.o filters/compose.o filters/dasher.o filters/dec_ac52.o filters/dec_bifs.o filters/dec_faad.o filters/dec_img.o filters/dec_j2k.o filters/dec_laser.o filters/dec_mad.o filters/dec_mediacodec.o filters/dec_nvdec.o filters/dec_nvdec_sdk.o filters/dec_odf.o filters/dec_theora.o filters/dec_ttml.o filters/dec_ttxt.o filters/dec_vorbis.o filters/dec_vtb.o filters/dec_webvtt.o filters/dec_xvid.o filters/decrypt_cenc_isma.o filters/dmx_avi.o filters/dmx_dash.o filters/dmx_gsf.o filters/dmx_m2ts.o filters/dmx_mpegps.o filters/dmx_nhml.o filters/dmx_nhnt.o filters/dmx_ogg.o filters/dmx_saf.o filters/dmx_vobsub.o filters/enc_jpg.o filters/enc_png.o filters/encrypt_cenc_isma.o filters/ff_common.o filters/ff_avf.o filters/ff_dec.o filters/ff_dmx.o filters/ff_enc.o filters/ff_rescale.o filters/ff_mx.o filters/filelist.o filters/hevcmerge.o filters/hevcsplit.o filters/in_atsc.o filters/in_dvb4linux.o filters/in_file.o filters/in_http.o filters/in_pipe.o filters/in_rtp.o filters/in_rtp_rtsp.o filters/in_rtp_sdp.o filters/in_rtp_signaling.o filters/in_rtp_stream.o filters/in_sock.o filters/inspect.o filters/isoffin_load.o filters/isoffin_read.o filters/isoffin_read_ch.o filters/jsfilter.o filters/load_bt_xmt.o filters/load_svg.o filters/load_text.o filters/mux_avi.o filters/mux_gsf.o filters/mux_isom.o filters/mux_ts.o filters/out_audio.o  filters/out_file.o filters/out_http.o filters/out_pipe.o filters/out_rtp.o filters/out_rtsp.o filters/out_sock.o filters/out_video.o filters/reframer.o filters/reframe_ac3.o filters/reframe_adts.o filters/reframe_latm.o filters/reframe_amr.o filters/reframe_av1.o filters/reframe_flac.o filters/reframe_h263.o filters/reframe_img.o filters/reframe_mp3.o filters/reframe_mpgvid.o filters/reframe_nalu.o filters/reframe_prores.o filters/reframe_qcp.o filters/reframe_rawvid.o filters/reframe_rawpcm.o filters/resample_audio.o filters/tileagg.o filters/tssplit.o filters/unit_test_filter.o filters/rewind.o filters/rewrite_adts.o filters/rewrite_mp4v.o filters/rewrite_nalu.o filters/rewrite_obu.o filters/vflip.o filters/vcrop.o filters/write_generic.o filters/write_nhml.o filters/write_nhnt.o filters/write_qcp.o filters/write_vtt.o ../modules/dektec_out/dektec_video_decl.o
+LIBGPAC_FILTERS+=filters/bs_agg.o filters/bs_split.o filters/bsrw.o filters/compose.o filters/dasher.o filters/dec_ac52.o filters/dec_bifs.o filters/dec_faad.o filters/dec_img.o filters/dec_j2k.o filters/dec_laser.o filters/dec_mad.o filters/dec_mediacodec.o filters/dec_nvdec.o filters/dec_nvdec_sdk.o filters/dec_odf.o filters/dec_theora.o filters/dec_ttml.o filters/dec_ttxt.o filters/dec_vorbis.o filters/dec_vtb.o filters/dec_webvtt.o filters/dec_xvid.o filters/decrypt_cenc_isma.o filters/dmx_avi.o filters/dmx_dash.o filters/dmx_gsf.o filters/dmx_m2ts.o filters/dmx_mpegps.o filters/dmx_nhml.o filters/dmx_nhnt.o filters/dmx_ogg.o filters/dmx_saf.o filters/dmx_vobsub.o filters/enc_jpg.o filters/enc_png.o filters/encrypt_cenc_isma.o filters/ff_common.o filters/ff_avf.o filters/ff_dec.o filters/ff_dmx.o filters/ff_enc.o filters/ff_rescale.o filters/ff_mx.o filters/filelist.o filters/hevcmerge.o filters/hevcsplit.o filters/in_dvb4linux.o filters/in_file.o filters/in_http.o filters/in_pipe.o filters/in_route.o filters/in_rtp.o filters/in_rtp_rtsp.o filters/in_rtp_sdp.o filters/in_rtp_signaling.o filters/in_rtp_stream.o filters/in_sock.o filters/inspect.o filters/io_fcryp.o filters/isoffin_load.o filters/isoffin_read.o filters/isoffin_read_ch.o filters/jsfilter.o filters/load_bt_xmt.o filters/load_svg.o filters/load_text.o filters/mux_avi.o filters/mux_gsf.o filters/mux_isom.o filters/mux_ts.o filters/out_audio.o  filters/out_file.o filters/out_http.o filters/out_pipe.o filters/out_route.o filters/out_rtp.o filters/out_rtsp.o filters/out_sock.o filters/out_video.o filters/reframer.o filters/reframe_ac3.o filters/reframe_adts.o filters/reframe_latm.o filters/reframe_amr.o filters/reframe_av1.o filters/reframe_flac.o filters/reframe_h263.o filters/reframe_img.o filters/reframe_mhas.o filters/reframe_mp3.o filters/reframe_mpgvid.o filters/reframe_nalu.o filters/reframe_prores.o filters/reframe_qcp.o filters/reframe_rawvid.o filters/reframe_rawpcm.o filters/reframe_truehd.o filters/resample_audio.o filters/restamp.o  filters/tileagg.o filters/tilesplit.o filters/tssplit.o filters/unit_test_filter.o filters/rewind.o filters/rewrite_adts.o filters/rewrite_mhas.o filters/rewrite_mp4v.o filters/rewrite_nalu.o filters/rewrite_obu.o filters/vflip.o filters/vcrop.o filters/write_generic.o filters/write_nhml.o filters/write_nhnt.o filters/write_qcp.o filters/write_vtt.o ../modules/dektec_out/dektec_video_decl.o
+
 
-FILTERS_CFLAGS+=$(JS_FLAGS)
 
-LIBGPAC_FILTERS_OHEVC+=filters/dec_openhevc.o
+FILTERS_CFLAGS+=$(JS_FLAGS)
 
+ifeq ($(STATIC_MODULES),yes)
+LIBGPAC_FILTERS_OHEVC=filters/dec_openhevc.o
 FILTERS_OHEVC_CFLAGS=$(OHEVC_CFLAGS)
+endif
 
 LIBGPAC_FILTERS_SVC+=filters/dec_opensvc.o
 
@@ -234,18 +250,30 @@
 
 ifneq ($(CONFIG_FAAD),no)
 EXTRALIBS+=-lfaad
+ifeq ($(CONFIG_FAAD),local)
+CFLAGS+= -I"$(LOCAL_INC_PATH)"
+endif
 endif
 
 ifneq ($(CONFIG_MAD),no)
 EXTRALIBS+=-lmad
+ifeq ($(CONFIG_MAD),local)
+CFLAGS+= -I"$(LOCAL_INC_PATH)"
+endif
 endif
 
 ifneq ($(CONFIG_XVID),no)
 EXTRALIBS+=-lxvidcore
+ifeq ($(CONFIG_XVID),local)
+CFLAGS+= -I"$(LOCAL_INC_PATH)"
+endif
 endif
 
 ifneq ($(CONFIG_A52),no)
 EXTRALIBS+=-la52
+ifeq ($(CONFIG_A52),local)
+CFLAGS+= -I"$(LOCAL_INC_PATH)"
+endif
 endif
 
 ifneq ($(CONFIG_VORBIS),no)
@@ -279,6 +307,15 @@
 EXTRALIBS+=$(vtb_ldflags)
 endif
 
+ifneq ($(CONFIG_NGHTTP2),no)
+EXTRALIBS+=$(NGHTTP2_LDFLAGS)
+ifeq ($(CONFIG_NGHTTP2),local)
+CFLAGS+= -I"$(LOCAL_INC_PATH)"
+else
+CFLAGS+=$(NGHTTP2_CFLAGS)
+endif
+endif
+
 
 
 ##libgpac library output
@@ -309,8 +346,6 @@
 
 lib: ../bin/gcc/$(LIB)
 
-#there's a bunch of warnings in there, get rid of them
-crypto: CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include"
 crypto: $(LIBGPAC_CRYPTO)
 
 scenegraph: CFLAGS += $(SCENEGRAPH_CFLAGS)
@@ -341,10 +376,15 @@
 filters_svc: $(LIBGPAC_FILTERS_SVC)
 .deps/filters/dec_opensvc.dep: CFLAGS += $(FILTERS_SVC_CFLAGS)
 
+jsmods: CFLAGS += $(JSMODS_CFLAGS)
+jsmods: $(LIBGPAC_JSMODS)
+.deps/jsmods/%: CFLAGS += $(JSMODS_CFLAGS)
+.deps/jsmods/%: CFLAGS += $(JSMODS_CFLAGS)
+
 
-../bin/gcc/$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph media_tools crypto filters filters_ohevc filters_svc $(OBJS)
-	@echo "OBJS $(OBJS)"
-	@echo "LIBS $(EXTRALIBS)"
+../bin/gcc/$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph media_tools crypto filters filters_ohevc filters_svc jsmods $(OBJS)
+#	@echo "OBJS $(OBJS)"
+#	@echo "LIBS $(EXTRALIBS)"
 
 ifeq ($(CONFIG_DARWIN),yes)

gpac-1.0.1.tar.gz/src/bifs/bifs_codec.c -> gpac-2.0.0.tar.gz/src/bifs/bifs_codec.c Changed

@@ -211,6 +211,17 @@
 #endif
 
 
+void command_buffers_del(GF_List *command_buffers)
+{
+	while (gf_list_count(command_buffers)) {
+		CommandBufferItem *cbi = (CommandBufferItem *)gf_list_get(command_buffers, 0);
+		gf_node_unregister(cbi->node, NULL);
+		gf_free(cbi);
+		gf_list_rem(command_buffers, 0);
+	}
+	gf_list_del(command_buffers);
+}
+
 GF_EXPORT
 void gf_bifs_decoder_del(GF_BifsDecoder *codec)
 {
@@ -225,19 +236,15 @@
 	}
 	gf_list_del(codec->streamInfo);
 
-	while (gf_list_count(codec->command_buffers)) {
-		CommandBufferItem *cbi = (CommandBufferItem *)gf_list_get(codec->command_buffers, 0);
-		gf_free(cbi);
-		gf_list_rem(codec->command_buffers, 0);
-	}
-	gf_list_del(codec->command_buffers);
+	command_buffers_del(codec->command_buffers);
+
 	gf_free(codec);
 }
 
 
 void BD_EndOfStream(void *co)
 {
-	((GF_BifsDecoder *) co)->LastError = GF_IO_ERR;
+	((GF_BifsDecoder *) co)->LastError = GF_NON_COMPLIANT_BITSTREAM;
 }
 
 void gf_bs_set_eos_callback(GF_BitStream *bs, void (*EndOfStream)(void *par), void *par);
@@ -511,6 +518,8 @@
 #endif
 		return gf_sg_script_get_field_index(Node, inField, IndexMode, allField);
 	default:
+		if (inField >= gf_sg_mpeg4_node_get_field_count(Node, IndexMode))
+			return GF_NON_COMPLIANT_BITSTREAM;
 		return gf_sg_mpeg4_node_get_field_index(Node, inField, IndexMode, allField);
 	}
 }

gpac-1.0.1.tar.gz/src/bifs/com_dec.c -> gpac-2.0.0.tar.gz/src/bifs/com_dec.c Changed

@@ -35,14 +35,24 @@
 
 
 
-void gf_bifs_dec_name(GF_BitStream *bs, char *name)
+void gf_bifs_dec_name(GF_BitStream *bs, char *name, u32 size)
 {
+	Bool error = GF_FALSE;
 	u32 i = 0;
 	while (1) {
-		name[i] = gf_bs_read_int(bs, 8);
-		if (!name[i]) break;
+		char c = gf_bs_read_int(bs, 8);
+		if (i<size)
+			name[i] = c;
+		else {
+			error = GF_TRUE;
+		}
+		if (!c) break;
 		i++;
 	}
+	if (error) {
+		name[size-1] = 0;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BIFS] name too long %d bytes but max size %d, truncating\n", i, size));
+	}
 }
 
 
@@ -779,7 +789,7 @@
 {
 	GF_Err e;
 	u32 NodeID, ind, field_ind, NumBits;
-	GF_Node *node, *prev_node;
+	GF_Node *node;
 	GF_ChildNodeItem *prev_child;
 	GF_FieldInfo field;
 
@@ -794,20 +804,16 @@
 	e = gf_node_get_field(node, field_ind, &field);
 	if (e) return e;
 
-	prev_node = NULL;
 	prev_child = NULL;
-	/*store prev SF node*/
-	if (field.fieldType == GF_SG_VRML_SFNODE) {
-		prev_node = *((GF_Node **) field.far_ptr);
-	}
 	/*store prev MFNode content*/
-	else if (field.fieldType == GF_SG_VRML_MFNODE) {
+	if (field.fieldType == GF_SG_VRML_MFNODE) {
 		prev_child = * ((GF_ChildNodeItem **) field.far_ptr);
 		* ((GF_ChildNodeItem **) field.far_ptr) = NULL;
 	}
 	/*regular field*/
 	else if (!gf_sg_vrml_is_sf_field(field.fieldType)) {
-		gf_sg_vrml_mf_reset(field.far_ptr, field.fieldType);
+		e = gf_sg_vrml_mf_reset(field.far_ptr, field.fieldType);
+		if (e) return e;
 	}
 
 	/*parse the field*/
@@ -815,9 +821,7 @@
 	e = gf_bifs_dec_field(codec, bs, node, &field, GF_FALSE);
 	codec->is_com_dec = GF_FALSE;
 	/*remove prev nodes*/
-	if (field.fieldType == GF_SG_VRML_SFNODE) {
-		if (prev_node) e = gf_node_unregister(prev_node, node);
-	} else if (field.fieldType == GF_SG_VRML_MFNODE) {
+	if (field.fieldType == GF_SG_VRML_MFNODE) {
 		gf_node_unregister_children(node, prev_child);
 	}
 	if (!e) gf_bifs_check_field_change(node, &field);
@@ -989,12 +993,13 @@
 	return GF_OK;
 }
 
+void command_buffers_del(GF_List *command_buffers);
 
 /*if parent is non-NULL, we are in a proto code parsing, otherwise this is a top-level proto*/
 GF_Err gf_bifs_dec_proto_list(GF_BifsDecoder * codec, GF_BitStream *bs, GF_List *proto_list)
 {
 	u8 flag, field_type, event_type, useQuant, useAnim, f;
-	u32 i, NbRoutes, ID, numProtos, numFields, count, qpsftype, QP_Type, NumBits;
+	u32 i, NbRoutes, ID, numProtos, numFields, count, qpsftype, QP_Type, NumBits, nb_cmd_bufs;
 	GF_Node *node;
 	char name[1000];
 	GF_ProtoFieldInterface *proto_field;
@@ -1011,6 +1016,7 @@
 	ParentProto = codec->pCurrentProto;
 	e = GF_OK;
 
+	nb_cmd_bufs = gf_list_count(codec->command_buffers);
 	numProtos = 0;
 	proto = NULL;
 	flag = gf_bs_read_int(bs, 1);
@@ -1022,7 +1028,7 @@
 		ID = gf_bs_read_int(bs, codec->info->config.ProtoIDBits);
 
 		if (codec->UseName) {
-			gf_bifs_dec_name(bs, name);
+			gf_bifs_dec_name(bs, name, 1000);
 		} else {
 			sprintf(name, "Proto%d", gf_list_count(codec->current_graph->protos) );
 		}
@@ -1046,7 +1052,7 @@
 			field_type = gf_bs_read_int(bs, 6);
 
 			if (codec->UseName) {
-				gf_bifs_dec_name(bs, name);
+				gf_bifs_dec_name(bs, name, 1000);
 			} else {
 				sprintf(name, "_field%d", numFields);
 			}
@@ -1116,9 +1122,19 @@
 		}
 		/*get proto code*/
 		else {
+			//scope command buffer solving by proto nodes - cf poc in #2040
+			//this means that any pending command buffer not solved at the end of a proto declaration is
+			//a falty one
+			GF_List *old_cb = codec->command_buffers;
+			codec->command_buffers = gf_list_new();
+			
 			/*parse sub-proto list - subprotos are ALWAYS registered with parent proto graph*/
 			e = gf_bifs_dec_proto_list(codec, bs, NULL);
-			if (e) goto exit;
+			if (e) {
+				command_buffers_del(codec->command_buffers);
+				codec->command_buffers = old_cb;
+				goto exit;
+			}
 
 			flag = 1;
 
@@ -1128,6 +1144,8 @@
 				if (!node) {
 					if (codec->LastError) {
 						e = codec->LastError;
+						command_buffers_del(codec->command_buffers);
+						codec->command_buffers = old_cb;
 						goto exit;
 					} else {
 						flag = gf_bs_read_int(bs, 1);
@@ -1135,8 +1153,11 @@
 					}
 				}
 				e = gf_node_register(node, NULL);
-				if (e) goto exit;
-
+				if (e) {
+					command_buffers_del(codec->command_buffers);
+					codec->command_buffers = old_cb;
+					goto exit;
+				}
 				//Ivica patch - Flush immediately because of proto instantiation
 				gf_bifs_flush_command_list(codec);
 
@@ -1144,6 +1165,9 @@
 				flag = gf_bs_read_int(bs, 1);
 			}
 
+			command_buffers_del(codec->command_buffers);
+			codec->command_buffers = old_cb;
+
 			/*routes*/
 			flag = gf_bs_read_int(bs, 1);
 			if (flag) {
@@ -1240,6 +1264,15 @@
 	if (e) {
 		if (proto) {
 			if (proto_list) gf_list_del_item(proto_list, proto);
+
+			//remove all command buffers inserted while decoding the proto list
+			u32 new_cmd_bufs = gf_list_count(codec->command_buffers);
+			while (nb_cmd_bufs < new_cmd_bufs) {
+				new_cmd_bufs--;
+				CommandBufferItem *cbi = gf_list_pop_back(codec->command_buffers);
+				gf_node_unregister(cbi->node, NULL);
+				gf_free(cbi);
+			}
 			gf_sg_proto_del(proto);
 		}
 		codec->current_graph = rootSG;
@@ -1266,7 +1299,7 @@
 	/*def'ed route*/
 	if (flag) {
 		RouteID = 1 + gf_bs_read_int(bs, codec->info->config.RouteIDBits);
-		if (codec->UseName) gf_bifs_dec_name(bs, name);
+		if (codec->UseName) gf_bifs_dec_name(bs, name, 1000);
 	}
 	/*origin*/
 	node_id = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
@@ -1318,7 +1351,8 @@
 	e = gf_bifs_dec_proto_list(codec, bs, proto_list);
 	if (e) goto exit;
 
-	assert(codec->pCurrentProto==NULL);
+	//cannot have replace scene in a proto
+	if (codec->pCurrentProto) return GF_NON_COMPLIANT_BITSTREAM;
 	/*Parse the top node - always of type SFTopNode*/
 	root = gf_bifs_dec_node(codec, bs, NDT_SFTopNode);
 	if (!root && codec->LastError) {

gpac-1.0.1.tar.gz/src/bifs/field_decode.c -> gpac-2.0.0.tar.gz/src/bifs/field_decode.c Changed

@@ -177,7 +177,10 @@
 	}
 	break;
 	case GF_SG_VRML_SFIMAGE:
-		if (((SFImage *)field->far_ptr)->pixels) gf_free(((SFImage *)field->far_ptr)->pixels);
+		if (((SFImage *)field->far_ptr)->pixels) {
+			gf_free(((SFImage *)field->far_ptr)->pixels);
+			((SFImage *)field->far_ptr)->pixels = NULL;
+		}
 		w = gf_bs_read_int(bs, 12);
 		h = gf_bs_read_int(bs, 12);
 		length = gf_bs_read_int(bs, 2);
@@ -232,12 +235,33 @@
 		if (codec->dec_memory_mode || (node->sgprivate->tag==TAG_MPEG4_InputSensor)) {
 			CommandBufferItem *cbi = (CommandBufferItem *)gf_malloc(sizeof(CommandBufferItem));
 			cbi->node = node;
+			gf_node_register(cbi->node, NULL);
 			cbi->cb = sfcb;
 			gf_list_add(codec->command_buffers, cbi);
 		}
 	}
 	break;
 	case GF_SG_VRML_SFNODE:
+		//if not memory dec mode, unregister previous node
+		//otherwise the field points to the memory command internal field
+		if (!is_mem_com) {
+			GF_Node *old_node = *((GF_Node **) field->far_ptr);
+			if (old_node != NULL) {
+				u32 i, count = gf_list_count(codec->command_buffers);
+				for (i=0; i<count; i++) {
+					CommandBufferItem *cbi = (CommandBufferItem*) gf_list_get(codec->command_buffers, i);
+					if (cbi->node == old_node) {
+						gf_list_rem(codec->command_buffers, i);
+						i--;
+						count--;
+						gf_node_unregister(cbi->node, NULL);
+						gf_free(cbi);
+					}
+				}
+				gf_node_unregister(old_node, node);
+				 *((GF_Node **) field->far_ptr) = NULL;
+			}
+		}
 		//for nodes the field ptr is a ptr to the field, which is a node ptr ;)
 		new_node = gf_bifs_dec_node(codec, bs, field->NDTtype);
 		if (new_node) {
@@ -249,7 +273,7 @@
 		break;
 	case GF_SG_VRML_SFSCRIPT:
 #ifdef GPAC_HAS_QJS
-		codec->LastError = SFScript_Parse(codec, (SFScript*)field->far_ptr, bs, node);
+		codec->LastError = node ? SFScript_Parse(codec, (SFScript*)field->far_ptr, bs, node) : GF_NON_COMPLIANT_BITSTREAM;
 #else
 		return GF_NOT_SUPPORTED;
 #endif
@@ -288,6 +312,7 @@
 	sffield.fieldIndex = field->fieldIndex;
 	sffield.fieldType = gf_sg_vrml_get_sf_type(field->fieldType);
 	sffield.NDTtype = field->NDTtype;
+	sffield.name = field->name;
 
 	nbF = 0;
 	qp_on = qp_local = 0;
@@ -377,6 +402,7 @@
 	sffield.fieldIndex = field->fieldIndex;
 	sffield.fieldType = gf_sg_vrml_get_sf_type(field->fieldType);
 	sffield.NDTtype = field->NDTtype;
+	sffield.name = field->name;
 
 	initial_qp = qp_local = qp_on = 0;
 
@@ -413,7 +439,7 @@
 					if (gf_node_get_tag(new_node) == TAG_MPEG4_QuantizationParameter) {
 						qp_local = ((M_QuantizationParameter *)new_node)->isLocal;
 						/*we have a QP in the same scope, remove previous
-						NB: we assume this is the right behaviour, the spec doesn't say
+						NB: we assume this is the right behavior, the spec doesn't say
 						whether QP is cumulative or not*/
 						if (qp_on) gf_bifs_dec_qp_remove(codec, GF_FALSE);
 
@@ -498,7 +524,8 @@
 				* (GF_ChildNodeItem **)field->far_ptr = NULL;
 			} else {
 				//remove all items of the MFField
-				gf_sg_vrml_mf_reset(field->far_ptr, field->fieldType);
+				e = gf_sg_vrml_mf_reset(field->far_ptr, field->fieldType);
+				if (e) return e;
 			}
 		}
 
@@ -530,7 +557,7 @@
 			} else {
 				e = BD_DecMFFieldVec(codec, bs, node, field, is_mem_com);
 			}
-			if (e) return e;
+			if (e) return codec->LastError = e;
 		}
 	}
 	return GF_OK;
@@ -803,7 +830,7 @@
 	if ((node_tag == TAG_MPEG4_IndexedFaceSet) && codec->info->config.Use3DMeshCoding) {
 		if (gf_bs_read_int(bs, 1)) {
 			/*nodeID = 1 + */gf_bs_read_int(bs, codec->info->config.NodeIDBits);
-			if (codec->UseName) gf_bifs_dec_name(bs, name);
+			if (codec->UseName) gf_bifs_dec_name(bs, name, 1000);
 		}
 		/*parse the 3DMesh node*/
 		return NULL;
@@ -822,7 +849,7 @@
 			return NULL;
 		}
 		nodeID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
-		if (codec->UseName) gf_bifs_dec_name(bs, name);
+		if (codec->UseName) gf_bifs_dec_name(bs, name, 1000);
 	}
 
 	new_node = NULL;
@@ -870,19 +897,6 @@
 		return NULL;
 	}
 
-	/*VRML: "The transformation hierarchy shall be a directed acyclic graph; results are undefined if a node
-	in the transformation hierarchy is its own ancestor"
-	that's good, because the scene graph can't handle cyclic graphs (destroy will never be called).
-	We therefore only register the node once parsed*/
-	if (nodeID) {
-		if (strlen(name)) {
-			gf_node_set_id(new_node, nodeID, name);
-		} else {
-			gf_node_set_id(new_node, nodeID, NULL);
-		}
-	}
-
-
 	/*update default time fields except in proto parsing*/
 	if (!codec->pCurrentProto) UpdateTimeNode(codec, new_node);
 	/*nodes are only init outside protos, nodes internal to protos are never intialized */
@@ -917,6 +931,18 @@
 		return NULL;
 	}
 
+	/*VRML: "The transformation hierarchy shall be a directed acyclic graph; results are undefined if a node
+	in the transformation hierarchy is its own ancestor"
+	that's good, because the scene graph can't handle cyclic graphs (destroy will never be called).
+	We therefore only register the node once parsed*/
+	if (nodeID) {
+		if (strlen(name)) {
+			gf_node_set_id(new_node, nodeID, name);
+		} else {
+			gf_node_set_id(new_node, nodeID, NULL);
+		}
+	}
+
 	if (!skip_init)
 		gf_node_init(new_node);

gpac-1.0.1.tar.gz/src/bifs/field_encode.c -> gpac-2.0.0.tar.gz/src/bifs/field_encode.c Changed

gpac-1.0.1.tar.gz/src/bifs/memory_decoder.c -> gpac-2.0.0.tar.gz/src/bifs/memory_decoder.c Changed

@@ -531,7 +531,7 @@
 	/*def'ed route*/
 	if (flag) {
 		RouteID = 1 + gf_bs_read_int(bs, codec->info->config.RouteIDBits);
-		if (codec->UseName) gf_bifs_dec_name(bs, name);
+		if (codec->UseName) gf_bifs_dec_name(bs, name, 1000);
 	}
 	/*origin*/
 	node_id = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
@@ -890,6 +890,8 @@
 	GF_Err e;
 	go = 1;
 	e = GF_OK;
+	GF_SceneGraph *cur_graph = codec->current_graph;
+	GF_Proto *cur_proto = codec->pCurrentProto;
 
 	codec->LastError = GF_OK;
 	while (go) {
@@ -908,18 +910,21 @@
 			e = BM_SceneReplace(codec, bs, com_list);
 			break;
 		}
-		if (e) return e;
+		if (e) break;
 		go = gf_bs_read_int(bs, 1);
 	}
 	while (gf_list_count(codec->QPs)) {
 		gf_bifs_dec_qp_remove(codec, GF_TRUE);
 	}
-	return GF_OK;
+
+	codec->current_graph = cur_graph;
+	codec->pCurrentProto = cur_proto;
+	return e;
 }
 
 void BM_EndOfStream(void *co)
 {
-	((GF_BifsDecoder *) co)->LastError = GF_IO_ERR;
+	((GF_BifsDecoder *) co)->LastError = GF_NON_COMPLIANT_BITSTREAM;
 }
 
 void gf_bs_set_eos_callback(GF_BitStream *bs, void (*EndOfStream)(void *par), void *par);
@@ -930,12 +935,19 @@
 	GF_BitStream *bs;
 	GF_Err e;
 	CommandBufferItem *cbi;
+	GF_SceneGraph *prev_root = codec->current_graph;
+	M_QuantizationParameter *prev_qp = codec->ActiveQP;
+	u32 prev_qp_count = gf_list_count(codec->QPs);
 	u32 NbPass = gf_list_count(codec->command_buffers);
+
+
+	codec->ActiveQP = NULL;
 	GF_List *nextPass = gf_list_new();
 	while (NbPass) {
 		while (gf_list_count(codec->command_buffers)) {
 			cbi = (CommandBufferItem *)gf_list_get(codec->command_buffers, 0);
 			gf_list_rem(codec->command_buffers, 0);
+
 			codec->current_graph = gf_node_get_graph(cbi->node);
 			e = GF_OK;
 			if (cbi->cb->bufferSize) {
@@ -945,6 +957,7 @@
 				gf_bs_del(bs);
 			}
 			if (!e) {
+				gf_node_unregister(cbi->node, NULL);
 				gf_free(cbi);
 				continue;
 			}
@@ -959,6 +972,7 @@
 					for (i=0; i<gf_list_count(codec->command_buffers); i++) {
 						CommandBufferItem *cbi2 = (CommandBufferItem *)gf_list_get(codec->command_buffers, i);
 						if (cbi2->cb == cf->field_ptr) {
+							gf_node_unregister(cbi2->node, NULL);
 							gf_free(cbi2);
 							gf_list_rem(codec->command_buffers, i);
 							i--;
@@ -978,9 +992,17 @@
 		}
 		NbPass --;
 		if (NbPass > gf_list_count(codec->command_buffers)) NbPass = gf_list_count(codec->command_buffers);
+
+		//restore QP state
+		while (gf_list_count(codec->QPs) > prev_qp_count) {
+			gf_list_rem(codec->QPs, 0); //QPs are inserted at head of list
+		}
+		codec->ActiveQP = NULL;
 		codec->LastError = GF_OK;
 	}
 	gf_list_del(nextPass);
+	codec->current_graph = prev_root;
+	codec->ActiveQP = prev_qp;
 	return GF_OK;
 }
 
@@ -1016,6 +1038,7 @@
 	/*if err or not reset conditionals*/
 	while (gf_list_count(codec->command_buffers)) {
 		CommandBufferItem *cbi = (CommandBufferItem *)gf_list_get(codec->command_buffers, 0);
+		gf_node_unregister(cbi->node, NULL);
 		gf_free(cbi);
 		gf_list_rem(codec->command_buffers, 0);
 	}

gpac-1.0.1.tar.gz/src/bifs/script_dec.c -> gpac-2.0.0.tar.gz/src/bifs/script_dec.c Changed

@@ -72,13 +72,13 @@
 	char *new_str;
 	if (!str) return;
 	if (strlen(parser->string) + strlen(str) >= parser->length) {
-		parser->length += PARSER_STEP_ALLOC;
+		parser->length = (u32) ( strlen(parser->string) + strlen(str) + PARSER_STEP_ALLOC );
 		new_str = (char *)gf_malloc(sizeof(char)*parser->length);
 		strcpy(new_str, parser->string);
 		gf_free(parser->string);
 		parser->string = new_str;
 	}
-	strcat(parser->string, str);
+	strncat(parser->string, str, parser->length - strlen(parser->string) - 1);
 }
 
 static void SFS_AddInt(ScriptParser *parser, s32 val)
@@ -105,7 +105,7 @@
 
 	eventType = gf_bs_read_int(parser->bs, 2);
 	fieldType = gf_bs_read_int(parser->bs, 6);
-	gf_bifs_dec_name(parser->bs, name);
+	gf_bifs_dec_name(parser->bs, name, 1000);
 	field = gf_sg_script_field_new(parser->script, eventType, fieldType, name);
 	if (!field) return GF_NON_COMPLIANT_BITSTREAM;
 
@@ -244,7 +244,7 @@
 	}
 	//parse
 	else {
-		gf_bifs_dec_name(parser->bs, name);
+		gf_bifs_dec_name(parser->bs, name, 500);
 		gf_list_add(parser->identifiers, gf_strdup(name));
 		SFS_AddString(parser, name);
 	}
@@ -672,7 +672,7 @@
 		SFS_StatementBlock(parser, GF_TRUE);
 		break;
 	default:
-		assert(0);
+		parser->codec->LastError = GF_NON_COMPLIANT_BITSTREAM;
 		break;
 	}
 }
@@ -769,7 +769,7 @@
 {
 	char name[1000];
 	if (parser->codec->LastError) return;
-	gf_bifs_dec_name(parser->bs, name);
+	gf_bifs_dec_name(parser->bs, name, 1000);
 	SFS_AddString(parser, name);
 }

gpac-1.0.1.tar.gz/src/bifs/unquantize.c -> gpac-2.0.0.tar.gz/src/bifs/unquantize.c Changed

gpac-1.0.1.tar.gz/src/compositor/audio_input.c -> gpac-2.0.0.tar.gz/src/compositor/audio_input.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -54,6 +54,7 @@
 	if (done != ai->stream_finished) {
 		gf_sc_invalidate(ai->compositor, NULL);
 	}
+	ai->input_ifce.is_eos = ai->stream_finished;
 
 	/*no more data or not enough data, reset syncro drift*/
 	if (!frame) {
@@ -61,7 +62,10 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[Audio Input] No data in audio object\n"));
 		}
 		gf_mo_adjust_clock(ai->stream, 0);
-		ai->input_ifce.is_buffering = gf_mo_is_buffering(ai->stream);
+		if (!ai->stream_finished && !ai->compositor->player)
+			ai->input_ifce.is_buffering = GF_TRUE;
+		else
+			ai->input_ifce.is_buffering = gf_mo_is_buffering(ai->stream);
 		*size = 0;
 		return NULL;
 	}
@@ -91,11 +95,11 @@
 		diff = ABS(drift_old);
 		diff -= ABS(drift);
 		if (diff < 0) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[Audio Input] in clock discontinuity: drift old clock %d new clock %d - disabling clock adjustment\n", drift_old, drift));
+			GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[Audio Input] in clock discontinuity: drift old clock %d new clock %d - disabling clock adjustment\n", drift_old, drift));
 			drift = 0;
 			audio_delay_ms = 0;
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[Audio Input] end of clock discontinuity: drift old clock %d new clock %d\n", drift_old, drift));
+			GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[Audio Input] end of clock discontinuity: drift old clock %d new clock %d\n", drift_old, drift));
 			ai->stream->odm->prev_clock_at_discontinuity_plus_one = 0;
 			if (drift<0) {
 				drift = 0;

gpac-1.0.1.tar.gz/src/compositor/audio_mixer.c -> gpac-2.0.0.tar.gz/src/compositor/audio_mixer.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -29,7 +29,7 @@
 	Notes about the mixer:
 	1- spatialization is out of scope for the mixer (eg that's the sound node responsability)
 	2- mixing is performed by resampling input source & deinterleaving its channels into dedicated buffer.
-	We could directly deinterleave in the main mixer ouput buffer, but this would prevent any future
+	We could directly deinterleave in the main mixer output buffer, but this would prevent any future
 	gain correction.
 */
 typedef struct
@@ -47,6 +47,9 @@
 
 	u32 in_bytes_used, out_samples_written, out_samples_to_write;
 
+	u32 out_samples_pos, in_samples_pos, scaled_sr, bytes_p_samp;
+	u32 ratio_aligned;
+
 	Fixed speed;
 	Fixed pan[GF_AUDIO_MIXER_MAX_CHANNELS];
 
@@ -71,6 +74,7 @@
 	Bool must_reconfig;
 	Bool isEmpty;
 	Bool source_buffering;
+	u32 nb_eos;
 	/*set to non null if this outputs directly to the driver, in which case audio formats have to be checked*/
 	struct _audio_render *ar;
 
@@ -155,10 +159,15 @@
 	return gf_list_count(am->sources);
 }
 
-void gf_mixer_force_chanel_out(GF_AudioMixer *am, u32 num_channels)
+GF_Err gf_mixer_force_channel_out(GF_AudioMixer *am, u32 num_channels)
 {
+	if (num_channels > GF_AUDIO_MIXER_MAX_CHANNELS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("[AudioMixer] Number of output channels %d higher than max channels supported %d\n", num_channels, GF_AUDIO_MIXER_MAX_CHANNELS));
+		return GF_NOT_SUPPORTED;
+	}
 	am->force_channel_out = GF_TRUE;
 	am->nb_channels = num_channels;
+	return GF_OK;
 }
 
 u32 gf_mixer_get_block_align(GF_AudioMixer *am)
@@ -190,6 +199,12 @@
 }
 
 GF_EXPORT
+Bool gf_mixer_is_eos(GF_AudioMixer *am)
+{
+	return am->nb_eos == gf_list_count(am->sources) ? GF_TRUE : GF_FALSE;
+}
+
+GF_EXPORT
 void gf_mixer_add_input(GF_AudioMixer *am, GF_AudioInterface *src)
 {
 	MixerInput *in;
@@ -250,33 +265,43 @@
 }
 
 GF_EXPORT
-void gf_mixer_set_config(GF_AudioMixer *am, u32 outSR, u32 outCH, u32 outFMT, u64 outChCfg)
+GF_Err gf_mixer_set_config(GF_AudioMixer *am, u32 outSR, u32 outCH, u32 outFMT, u64 outChCfg)
 {
 	if ((am->afmt == outFMT) && (am->nb_channels == outCH)
-	 && (am->sample_rate==outSR) && (am->channel_layout == outChCfg)) return;
+	 && (am->sample_rate==outSR) && (am->channel_layout == outChCfg)) return GF_OK;
 
+	if (outCH > GF_AUDIO_MIXER_MAX_CHANNELS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("[AudioMixer] Number of output channels %d higher than max channels supported %d\n", outCH, GF_AUDIO_MIXER_MAX_CHANNELS));
+		return GF_NOT_SUPPORTED;
+	}
+	if (!outSR) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("[AudioMixer] Invalid output sample rate 0\n"));
+		return GF_NOT_SUPPORTED;
+	}
 	gf_mixer_lock(am, GF_TRUE);
 	am->afmt = outFMT;
 	am->bit_depth = gf_audio_fmt_bit_depth(am->afmt);
-	if (!am->force_channel_out) am->nb_channels = outCH;
+	if (!am->force_channel_out)
+		am->nb_channels = outCH;
 	if (get_best_samplerate(am, &outSR, &outCH, &outFMT) == GF_OK) {
 		am->sample_rate = outSR;
 		if (outCH>2) am->channel_layout = outChCfg;
 		else if (outCH==2) am->channel_layout = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
-		else am->channel_layout = GF_AUDIO_CH_FRONT_LEFT;
+		else am->channel_layout = GF_AUDIO_CH_FRONT_CENTER;
 	}
 	/*if main mixer recfg output*/
 	if (am->ar)	am->ar->need_reconfig = GF_TRUE;
 	am->must_reconfig = GF_FALSE;
 	gf_mixer_lock(am, GF_FALSE);
+	return GF_OK;
 }
 
 static GFINLINE s32 make_s24_int(u8 *ptr)
 {
-	s32 val;
-	s16 res;
-	memcpy(&res, ptr+1, 2);
-	val = res * 256;
+	s32 val = (s8) ptr[2];
+	val *= 256;
+	val |= ptr[1];
+	val *= 256;
 	val |= ptr[0];
 	return val;
 }
@@ -287,13 +312,41 @@
 
 s32 input_sample_s32(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
+#ifdef GPAC_BIG_ENDIAN
+	u8 *src = data + 2*(sample_offset*nb_ch + channel);
+	s32 res = src[4];
+	res<<=8;
+	res |= src[3];
+	res<<=8;
+	res |= src[2];
+	res<<=8;
+	res |= src[1];
+	res<<=8;
+	res |= src[0];
+	return res;
+#else
 	s32 *src = (s32 *)data;
 	return src[sample_offset*nb_ch + channel];
+#endif
 }
 s32 input_sample_s32p(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
+#ifdef GPAC_BIG_ENDIAN
+	u8 *src = data + 4 * (sample_offset + planar_stride*channel/4);
+	s32 res = src[4];
+	res<<=8;
+	res |= src[3];
+	res<<=8;
+	res |= src[2];
+	res<<=8;
+	res |= src[1];
+	res<<=8;
+	res |= src[0];
+	return res;
+#else
 	s32 *src = (s32 *)data;
 	return src[sample_offset + planar_stride*channel/4];
+#endif
 }
 s32 input_sample_s24(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
@@ -335,15 +388,46 @@
 }
 s32 input_sample_s16(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
+#ifdef GPAC_BIG_ENDIAN
+	u8 *src = data + 2*(sample_offset*nb_ch + channel);
+	s16 res = src[1];
+	res<<=8;
+	res |= src[0];
+	return ((s32)res) * MIX_S16_SCALE;
+#else
 	s16 *src = (s16 *)data;
 	s32 res = src[sample_offset*nb_ch + channel];
 	return res * MIX_S16_SCALE;
+#endif
 }
+s32 input_sample_s16_be(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
+{
+#ifdef GPAC_BIG_ENDIAN
+	s16 *src = (s16 *)data;
+	s32 res = src[sample_offset*nb_ch + channel];
+	return res * MIX_S16_SCALE;
+#else
+	u8 *src = data + 2*(sample_offset*nb_ch + channel);
+	s16 res = src[0];
+	res<<=8;
+	res |= src[1];
+	return ((s32)res) * MIX_S16_SCALE;
+#endif
+}
+
 s32 input_sample_s16p(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
+#ifdef GPAC_BIG_ENDIAN
+	u8 *src = data + 2 * (sample_offset + planar_stride*channel / 2);
+	s16 res = src[1];
+	res<<=8;
+	res |= src[0];
+	return ((s32)res) * MIX_S16_SCALE;
+#else
 	s16 *src = (s16 *)data;
 	s32 res = src[sample_offset + planar_stride*channel / 2];
 	return res * MIX_S16_SCALE;
+#endif
 }
 s32 input_sample_u8(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
@@ -391,6 +475,9 @@
 	case GF_AUDIO_FMT_S16:
 		in->get_sample = input_sample_s16;
 		break;
+	case GF_AUDIO_FMT_S16_BE:
+		in->get_sample = input_sample_s16_be;
+		break;
 	case GF_AUDIO_FMT_S16P:
 		in->get_sample = input_sample_s16p;
 		break;
@@ -424,7 +511,6 @@
 	max_channels = am->nb_channels;
 	max_afmt = am->afmt;
 	cfg_changed = 0;
-//	max_sample_rate = am->sample_rate;
 	max_sample_rate = 0;
 
 	ch_layout = 0;
@@ -488,7 +574,8 @@
 
 		/*cfg has changed, we must reconfig everything*/
 		if (cfg_changed || (max_sample_rate != am->sample_rate) ) {
-			in->has_prev = GF_FALSE;
+			in->ratio_aligned = 0;
+			in->bit_depth = 0;
 			memset(&in->last_channels, 0, sizeof(s32)*GF_AUDIO_MIXER_MAX_CHANNELS);
 		}
 	}
@@ -578,7 +665,8 @@
 		}
 	} else if (nb_in==2) {
 		if (nb_out==1) {
-			inChan[0] = (inChan[0]+inChan[1])/2;
+			s64 sum = (s64)inChan[0] + (s64) inChan[1];
+			inChan[0] = (s32) (sum/2);
 		} else {
 			for (i=2; i<nb_out; i++) inChan[i] = 0;
 		}
@@ -652,59 +740,100 @@
 	}
 }
 
+#define RESAMPLE_SCALER	1000
+
 static void gf_mixer_fetch_input(GF_AudioMixer *am, MixerInput *in, u32 audio_delay)
 {
-	u32 i, j, in_ch, out_ch, prev, next, src_samp, ratio, src_size;
+	u32 j, in_ch, out_ch, prev, next, src_samp, src_size;
 	Bool use_prev;
 	u32 planar_stride=0;
 	s8 *in_data;
 	s32 frac, inChan[GF_AUDIO_MIXER_MAX_CHANNELS], inChanNext[GF_AUDIO_MIXER_MAX_CHANNELS];
 
-	in_data = (s8 *) in->src->FetchFrame(in->src->callback, &src_size, &planar_stride, audio_delay);
-	if (!in_data || !src_size) {
-		in->has_prev = GF_FALSE;
-		/*done, stop fill*/
-		in->out_samples_to_write = 0;
-		return;
-	}
-	
-	ratio = (u32) (in->src->samplerate * FIX2INT(255*in->speed) / am->sample_rate);
-	src_samp = (u32) (src_size * 8 / in->bit_depth / in->src->chan);
 	in_ch = in->src->chan;
 	out_ch = am->nb_channels;
+	use_prev = in->has_prev;
 
-	/*just in case, if only 1 sample available in src, copy over and discard frame since we cannot
-	interpolate audio*/
-	if (src_samp==1) {
-		in->has_prev = GF_TRUE;
-		for (j=0; j<in_ch; j++) {
-			in->last_channels[j] = in->get_sample(in_data, in_ch, 0, j, planar_stride);
+	in_data = (s8 *) in->src->FetchFrame(in->src->callback, &src_size, &planar_stride, audio_delay);
+	if (!in_data || !src_size) {
+		if (in->src->is_eos)
+			am->nb_eos++;
+		else if (in->src->is_buffering)
+			am->source_buffering = GF_TRUE;
+		//end of stream, flush if needed
+		if (in->src->is_eos && use_prev) {
+
+		} else {
+			/*done, stop fill*/
+			in->out_samples_to_write = 0;
+			return;
 		}
-		in->in_bytes_used = src_size;
-		return;
 	}
 
-	/*while space to fill and input data, convert*/
-	use_prev = in->has_prev;
+	//config changed, recompute our values
+	if (!in->ratio_aligned) {
+		u32 ratio = (u32) (in->src->samplerate * FIX2INT(255*in->speed) / am->sample_rate);
+		if (ratio % 255) in->ratio_aligned = 2;
+		else in->ratio_aligned = 1;
+
+		in->in_samples_pos = in->out_samples_pos = 0;
+		in->scaled_sr = FIX2INT(in->src->samplerate * in->speed);
+
+		in->bytes_p_samp = in->bit_depth * in->src->chan / 8;
+	}
+	src_samp = (u32) (src_size / in->bytes_p_samp);
+
+
 	memset(inChan, 0, sizeof(s32)*GF_AUDIO_MIXER_MAX_CHANNELS);
 	memset(inChanNext, 0, sizeof(s32)*GF_AUDIO_MIXER_MAX_CHANNELS);
-	i = 0;
+
+	/*while output not full and input data, convert*/
 	next = prev = 0;
 	while (1) {
-		prev = (u32) (i*ratio) / 255;
-		if (prev>=src_samp) break;
+		u64 src_pos, src_pos_unscale, lfrac;
+		src_pos_unscale = in->out_samples_pos;
+		src_pos_unscale *= in->scaled_sr;
+		src_pos = src_pos_unscale;
+		src_pos /= am->sample_rate;
+		lfrac = src_pos_unscale - src_pos * am->sample_rate;
+		lfrac *= RESAMPLE_SCALER;
+		frac = (s32) (lfrac / am->sample_rate);
+
+		if (src_samp) {
+			if (src_pos < in->in_samples_pos) {
+				use_prev = GF_TRUE;
+				prev = 0;
+				next = 0;
+			} else {
+				prev = (u32) (src_pos - in->in_samples_pos);
+				next = prev+1;
+			}
+
+			if (prev>=src_samp)
+				break;
+			if (frac && (next>=src_samp))
+				break;
 
-		next = prev+1;
-		frac = (i*ratio) - 255*prev;
-		if (frac && (next==src_samp)) break;
-		if (use_prev && prev)
-			use_prev = GF_FALSE;
+			if (use_prev && prev)
+				use_prev = GF_FALSE;
+
+		}
+		//end of stream, no fraction
+		else {
+			if (!frac || (src_pos >= in->in_samples_pos)) {
+				//so that next call will trigger EOS for this stream
+				in->has_prev = GF_FALSE;
+				in->in_bytes_used = src_size + 1;
+				return;
+			}
+			frac = 0;
+		}
 
 		for (j = 0; j < in_ch; j++) {
 			inChan[j] = use_prev ? in->last_channels[j] : in->get_sample(in_data, in_ch, prev, j, planar_stride);
 			if (frac) {
 				inChanNext[j] = in->get_sample(in_data, in_ch, next, j, planar_stride);
-				inChan[j] = (s32) ( ( ((s64) inChanNext[j])*frac + ((s64)inChan[j])*(255-frac)) / 255 );
+				inChan[j] = (s32) ( ( ((s64) inChanNext[j])*frac + ((s64)inChan[j])*(RESAMPLE_SCALER-frac)) / RESAMPLE_SCALER );
 			}
 			//don't apply pan when forced layout is used
 			if (!in->src->forced_layout && (in->pan[j]!=FIX_ONE) ) {
@@ -723,44 +852,57 @@
 			for (j=0; j<out_ch ; j++) {
 				*(in->ch_buf[j] + in->out_samples_written) = 0;
 			}
-
 		}
-		
+
 		in->out_samples_written ++;
-		if (in->out_samples_written == in->out_samples_to_write) break;
-		i++;
+		in->out_samples_pos ++;
+		if (in->out_samples_written == in->out_samples_to_write)
+			break;
 	}
+	//eos
+	if (!src_samp)
+		return;
 
-	if (!(ratio%255)) {
+	if (in->ratio_aligned==1) {
 		in->has_prev = GF_FALSE;
 		if (next==src_samp) {
 			in->in_bytes_used = src_size;
 		} else {
-			in->in_bytes_used = MIN(src_size, prev * in->bit_depth * in->src->chan / 8);
+			in->in_bytes_used = MIN(src_size, prev * in->bytes_p_samp);
 		}
 	} else {
+		in->in_bytes_used = (prev+1) * in->bytes_p_samp;
 		in->has_prev = GF_TRUE;
-		if (next==src_samp) {
-			for (j=0; j<in_ch; j++) in->last_channels[j] = inChanNext[j];
+
+		if (in->in_bytes_used >= src_size) {
 			in->in_bytes_used = src_size;
+			for (j=0; j<in_ch; j++) in->last_channels[j] = inChanNext[j];
 		} else {
-			in->in_bytes_used = prev * in->bit_depth * in->src->chan / 8;
-			if (in->in_bytes_used>src_size) {
-				in->in_bytes_used = src_size;
-				for (j=0; j<in_ch; j++) in->last_channels[j] = inChanNext[j];
-			} else {
-				u32 idx;
-				idx = (prev>=src_samp) ? (src_samp-1) : prev;
-				for (j=0; j<in_ch; j++) {
-					in->last_channels[j] = in->get_sample(in_data, in_ch, idx, j, planar_stride);
-				}
+			u32 idx;
+			idx = (prev >= src_samp) ? (src_samp-1) : (prev);
+			for (j=0; j<in_ch; j++) {
+				in->last_channels[j] = in->get_sample(in_data, in_ch, idx, j, planar_stride);
 			}
 		}
 	}
+	in->in_samples_pos += in->in_bytes_used / in->bytes_p_samp;
+
+	/*skip full seconds done*/
+	while ((in->in_samples_pos >= in->scaled_sr) && (in->out_samples_pos >= am->sample_rate)) {
+		in->in_samples_pos -= in->scaled_sr;
+		in->out_samples_pos -= am->sample_rate;
+	}
+
 	/*cf below, make sure we call release*/
 	in->in_bytes_used += 1;
 }
 
+#ifdef GPAC_BIG_ENDIAN
+#endif
+
+#define swap_16(x) (( (x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff))
+#define swap_32(x) (swap_16(x) << 16 | swap_16((x) >> 16))
+
 GF_EXPORT
 u32 gf_mixer_get_output(GF_AudioMixer *am, void *buffer, u32 buffer_size, u32 delay)
 {
@@ -772,6 +914,7 @@
 	char *data, *ptr;
 
 	am->source_buffering = GF_FALSE;
+	am->nb_eos = 0;
 	//reset buffer whatever the state of the mixer is
 	memset(buffer, 0, buffer_size);
 
@@ -792,11 +935,17 @@
 	single_source = (MixerInput *) gf_list_get(am->sources, 0);
 	/*if cfg changed or unknown, reconfigure the mixer if the audio renderer is attached. Otherwise, the mixer config never changes internally*/
 	if (!single_source->src->GetConfig(single_source->src, GF_FALSE)) {
+		single_source->ratio_aligned = 0;
+		single_source->bit_depth = 0;
 		if (am->ar) {
 			am->must_reconfig = GF_TRUE;
 			gf_mixer_reconfig(am);
 			gf_mixer_lock(am, GF_FALSE);
 			return 0;
+		} else {
+			gf_mixer_reconfig(am);
+			gf_mixer_lock(am, GF_FALSE);
+			return 0;
 		}
 	}
 
@@ -821,7 +970,10 @@
 		size = 0;
 		data = single_source->src->FetchFrame(single_source->src->callback, &size, &planar_stride, delay);
 		if (!data || !size) {
-			am->source_buffering = single_source->src->is_buffering;
+			if (single_source->src->is_eos)
+				am->nb_eos++;
+			else
+				am->source_buffering = single_source->src->is_buffering;
 			break;
 		}
 		/*don't copy more than possible*/
@@ -862,19 +1014,24 @@
 	single_source = NULL;
 	force_mix = GF_FALSE;
 	for (i=0; i<count; i++) {
+		Fixed speed;
 		in = (MixerInput *)gf_list_get(am->sources, i);
 		in->muted = in->src->IsMuted(in->src->callback);
-		if (in->muted) continue;
 		if (!in->bit_depth) gf_am_configure_source(in);
 
 		if (in->buffer_size < nb_samples) {
 			for (j=0; j<GF_AUDIO_MIXER_MAX_CHANNELS; j++) {
 				in->ch_buf[j] = (s32 *) gf_realloc(in->ch_buf[j], sizeof(s32) * nb_samples);
+				memset(in->ch_buf[j], 0, sizeof(s32) * nb_samples);
 			}
 			in->buffer_size = nb_samples;
 		}
-		in->speed = in->src->GetSpeed(in->src->callback);
-		if (in->speed<0) in->speed *= -1;
+		speed = in->src->GetSpeed(in->src->callback);
+		if (speed != in->speed) {
+			in->speed = speed;
+			if (in->speed<0) in->speed *= -1;
+			in->ratio_aligned = 0;
+		}
 		in->out_samples_written = 0;
 		in->in_bytes_used = 0;
 
@@ -895,23 +1052,23 @@
 
 		if (in->speed==0) {
 			in->out_samples_to_write = 0;
+			in->out_samples_written = 0;
 		} else {
 			assert(in->src->samplerate);
 			in->out_samples_to_write = nb_samples;
-			if (in->src->IsMuted(in->src->callback)) {
-				memset(in->pan, 0, sizeof(Fixed)*GF_AUDIO_MIXER_MAX_CHANNELS);
-			} else {
-				if (!force_mix && !in->src->GetChannelVolume(in->src->callback, in->pan)) {
-					/*track first active source with same cfg as mixer*/
-					if (!single_source && (in->src->samplerate == am->sample_rate)
-					 && (in->src->chan == am->nb_channels)
-					 && (in->speed == FIX_ONE)
-					 && (in->src->afmt == am->afmt)
-					 )
-						single_source = in;
-				}
+
+			if (!force_mix && !in->src->GetChannelVolume(in->src->callback, in->pan)) {
+				/*track first active source with same cfg as mixer*/
+				if (!single_source && (in->src->samplerate == am->sample_rate)
+						&& (in->src->chan == am->nb_channels)
+						&& (in->speed == FIX_ONE)
+						&& !in->muted
+						&& (in->src->afmt == am->afmt)
+				 )
+					single_source = in;
 			}
-			nb_act_src ++;
+			if (!in->muted)
+				nb_act_src ++;
 		}
 	}
 	if (!nb_act_src) {
@@ -931,10 +1088,7 @@
 		/*fill*/
 		for (i=0; i<count; i++) {
 			in = (MixerInput *)gf_list_get(am->sources, i);
-			if (in->muted) {
-				in->out_samples_to_write = 0;
-				continue;
-			}
+
 			if (in->out_samples_to_write > in->out_samples_written) {
 				gf_mixer_fetch_input(am, in, delay /*+ 8000 * i / am->bits_per_sample / am->sample_rate / am->nb_channels*/ );
 				if (in->out_samples_to_write > in->out_samples_written) nb_to_fill++;
@@ -943,8 +1097,7 @@
 		/*release - this is done in 2 steps in case 2 audio object use the same source...*/
 		for (i=0; i<count; i++) {
 			in = (MixerInput *)gf_list_get(am->sources, i);
-			if (in->muted) continue;
-			if (in->in_bytes_used) in->src->ReleaseFrame(in->src->callback, in->in_bytes_used-1);
+			if (in->in_bytes_used>1) in->src->ReleaseFrame(in->src->callback, in->in_bytes_used-1);
 			in->in_bytes_used = 0;
 		}
 		if (!nb_to_fill) break;
@@ -959,11 +1112,16 @@
 		u32 k;
 		out_mix = am->output;
 		in = (MixerInput *)gf_list_get(am->sources, i);
-		if (!in->out_samples_written) continue;
+		if (!in->out_samples_written || in->muted) continue;
+
 		/*only write what has been filled in the source buffer (may be less than output size)*/
 		for (j = 0; j < in->out_samples_written; j++) {
 			for (k = 0; k < am->nb_channels; k++) {
-				(*out_mix) += *(in->ch_buf[k] + j);
+				s64 oval = (*out_mix);
+				oval += *(in->ch_buf[k] + j);
+				if (oval>GF_INT_MAX) oval = GF_INT_MAX;
+				else if (oval<GF_INT_MIN) oval = GF_INT_MIN;
+				(*out_mix) = (s32) oval;
 				out_mix += 1;
 			}
 		}
@@ -984,7 +1142,11 @@
 		for (i = 0; i < nb_written; i++) {
 			for (j = 0; j < am->nb_channels; j++) {
 				s32 samp = (*out_mix);
+#ifdef GPAC_BIG_ENDIAN
+				(*out_s32) = swap_32(samp);
+#else
 				(*out_s32) = samp;
+#endif
 				out_s32 += 1;
 				out_mix += 1;
 			}
@@ -996,7 +1158,11 @@
 			out_mix = am->output + j;
 			for (i = 0; i < nb_written; i++) {
 				s32 samp = (*out_mix);
+#ifdef GPAC_BIG_ENDIAN
+				(*out_s32) = swap_32(samp);
+#else
 				(*out_s32) = samp;
+#endif
 				out_s32 += 1;
 				out_mix += am->nb_channels;
 			}
@@ -1053,11 +1219,9 @@
 		for (i = 0; i<nb_written; i++) {
 			for (j = 0; j<am->nb_channels; j++) {
 				s32 samp = (*out_mix);
-//				char samp_c[4];
 				samp /= MIX_S24_SCALE;
 				if (samp > GF_S24_MAX) samp = GF_S24_MAX;
 				else if (samp < GF_S24_MIN) samp = GF_S24_MIN;
-//				memcpy(samp_c, &samp, 3);
 				out_s24[2] = (samp>>16) & 0xFF;
 				out_s24[1] = (samp>>8) & 0xFF;
 				out_s24[0] = samp & 0xFF;
@@ -1071,17 +1235,12 @@
 			out_mix = am->output + j;
 			for (i = 0; i<nb_written; i++) {
 				s32 samp = (*out_mix);
-				char s16tmp[2];
-				u8 lsb;
 				samp /= MIX_S24_SCALE;
 				if (samp > GF_S24_MAX) samp = GF_S24_MAX;
 				else if (samp < GF_S24_MIN) samp = GF_S24_MIN;
-				lsb = (samp) & 0xFF;
-				samp >>= 8;
-//				*((s16 *) (out_s24 +1) ) = (s16)samp;
-				*((s16 *) s16tmp) = (s16)samp;
-				memcpy(out_s24 +1, s16tmp, 2);
-				out_s24[0] = lsb;
+				out_s24[2] = (samp>>16) & 0xFF;
+				out_s24[1] = (samp>>8) & 0xFF;
+				out_s24[0] = samp & 0xFF;
 				out_s24 += 3;
 				out_mix += am->nb_channels;
 			}
@@ -1094,7 +1253,12 @@
 				samp /= MIX_S16_SCALE;
 				if (samp > GF_SHORT_MAX) samp = GF_SHORT_MAX;
 				else if (samp < GF_SHORT_MIN) samp = GF_SHORT_MIN;
+
+#ifdef GPAC_BIG_ENDIAN
+				(*out_s16) = swap_16(samp);
+#else
 				(*out_s16) = samp;
+#endif
 				out_s16 += 1;
 				out_mix += 1;
 			}
@@ -1108,7 +1272,11 @@
 				samp /= MIX_S16_SCALE;
 				if (samp > GF_SHORT_MAX) samp = GF_SHORT_MAX;
 				else if (samp < GF_SHORT_MIN) samp = GF_SHORT_MIN;
+#ifdef GPAC_BIG_ENDIAN
+				(*out_s16) = swap_16(samp);
+#else
 				(*out_s16) = samp;
+#endif
 				out_s16 += 1;
 				out_mix += am->nb_channels;
 			}

gpac-1.0.1.tar.gz/src/compositor/audio_render.c -> gpac-2.0.0.tar.gz/src/compositor/audio_render.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -49,6 +49,12 @@
 	a_fmt = ar->compositor->afmt;
 	nb_chan = ar->compositor->ach;
 	ch_cfg = ar->compositor->alayout;
+
+	if (nb_chan && !ch_cfg) {
+		u32 cicp = gf_audio_fmt_get_cicp_layout(nb_chan, 0, 0);
+		ch_cfg = gf_audio_fmt_get_layout_from_cicp(cicp);
+	}
+
 	bsize = ar->compositor->asize;
 	if (!bsize) bsize = 1024;
 
@@ -102,9 +108,11 @@
 		GF_FilterPacket *pck;
 		//issue a dummy packet to tag the point at which we reconfigured
 		pck = gf_filter_pck_new_shared(ar->aout, (u8 *) ar, 0, gf_ar_rcfg_done);
+		if (!pck) return GF_OUT_OF_MEM;
 		ar->wait_for_rcfg ++;
 		gf_filter_pck_set_readonly(pck);
 		gf_filter_pck_send(pck);
+		ar->compositor->audio_frames_sent++;
 	}
 	return GF_OK;
 }
@@ -120,7 +128,7 @@
 				GF_FEVT_INIT(evt, GF_FEVT_STOP, ar->aout);
 				gf_filter_pid_send_event(ar->aout, &evt);
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[Audio] pausing master clock - time "LLD" (sys time "LLD")\n", ar->freeze_time, gf_sys_clock_high_res()));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Audio] pausing master clock - time "LLD" (sys time "LLD")\n", ar->freeze_time, gf_sys_clock_high_res()));
 			ar->Frozen = GF_TRUE;
 		}
 	} else {
@@ -132,7 +140,7 @@
 			}
 
 			ar->start_time += gf_sys_clock_high_res() - ar->freeze_time;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[Audio] resuming master clock - new time "LLD" (sys time "LLD") \n", ar->start_time, gf_sys_clock_high_res()));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Audio] resuming master clock - new time "LLD" (sys time "LLD") \n", ar->start_time, gf_sys_clock_high_res()));
 			ar->Frozen = GF_FALSE;
 		}
 	}
@@ -149,7 +157,7 @@
 	ar->compositor = compositor;
 
 	ar->mixer = gf_mixer_new(ar);
-	ar->non_rt_output = GF_TRUE;
+	ar->non_rt_output = 1;
 	ar->volume = MIN(100, compositor->avol);
 	ar->pan = MIN(100, compositor->apan);
 	if (! (init_flags & GF_TERM_NO_AUDIO) ) {
@@ -283,6 +291,8 @@
 	u32 written, max_send=100;
 	u64 now = gf_sys_clock_high_res();
 
+	ar->compositor->audio_frames_sent = 0;
+
 	if (!ar->aout) {
 		if (ar->compositor->player) {
 			ar->current_time = (u32) ( (now - ar->start_time)/1000);
@@ -293,7 +303,7 @@
 	if (ar->need_reconfig) return;
 	if (ar->Frozen) return;
 
-	//reconfiguration is pending, wait for the packet issued at reconfig to be consummed before issuing any new frame
+	//reconfiguration is pending, wait for the packet issued at reconfig to be consumed before issuing any new frame
 	if (ar->wait_for_rcfg) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[Compositor] Waiting for audio output reconfiguration\n"));
 		return;
@@ -343,13 +353,33 @@
 		gf_mixer_lock(ar->mixer, GF_FALSE);
 
 		if (!written) {
-			if (!ar->non_rt_output) written = ar->buffer_size;
-			else if (ar->scene_ready && ar->nb_audio_objects && !gf_mixer_buffering(ar->mixer) ) written = ar->buffer_size;
-			else {
+			if (!ar->non_rt_output) {
+				written = ar->buffer_size;
+			} else if ((ar->non_rt_output==1) && ar->scene_ready
+				&& ar->nb_audio_objects
+				&& !gf_mixer_buffering(ar->mixer)
+				&& !gf_mixer_is_eos(ar->mixer)
+			) {
+				written = ar->buffer_size;
+			} else {
 				gf_filter_pck_truncate(pck, 0);
 				gf_filter_pck_discard(pck);
+
+				if (ar->non_rt_output==2) {
+					//stop sending packets
+					gf_filter_pid_set_eos(ar->aout);
+					//and update clock based on wall clock to flush video
+					if (ar->compositor->player) {
+						ar->current_time = (u32) ( (now - ar->start_time)/1000);
+					}
+				}
+				if (gf_mixer_buffering(ar->mixer))
+					ar->compositor->audio_frames_sent++;
+
 				break;
 			}
+		} else {
+			ar->compositor->audio_frames_sent++;
 		}
 
 		if (written<ar->buffer_size) {

gpac-1.0.1.tar.gz/src/compositor/compositor.c -> gpac-2.0.0.tar.gz/src/compositor/compositor.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -54,7 +54,7 @@
 		if (!compositor->skip_flush)
 			compositor->skip_flush = 2;
 
-		//if in openGL mode ignore refresh events (content of the window is still OK). This is only used for overlays in 2d
+		//if in OpenGL mode ignore refresh events (content of the window is still OK). This is only used for overlays in 2d
 		if (!compositor->frame_draw_type
 #ifndef GPAC_DISABLE_3D
 		 && !compositor->visual->type_3d && !compositor->hybrid_opengl
@@ -117,7 +117,7 @@
 - audio: since the audio compositor may not be threaded, it must be reconfigured by another thread otherwise
 we lock the audio module
 - video: this is typical to OpenGL&co: multithreaded is forbidden, so resizing/fullscreen MUST be done by the same
-thread accessing the HW ressources
+thread accessing the HW resources
 */
 static void gf_sc_reconfig_task(GF_Compositor *compositor)
 {
@@ -478,8 +478,10 @@
 		vi->height = compositor->display_height;
 		gf_pixel_get_size_info(pfmt, compositor->display_width, compositor->display_height, NULL, &vi->pitch_y, NULL, NULL, NULL);
 		if (compositor->passthrough_txh && !compositor->passthrough_txh->frame_ifce && (pfmt == compositor->passthrough_txh->pixelformat)) {
-			if (!compositor->passthrough_pck)
+			if (!compositor->passthrough_pck) {
 				compositor->passthrough_pck = gf_filter_pck_new_clone(compositor->vout, compositor->passthrough_txh->stream->pck, &compositor->passthrough_data);
+				if (!compositor->passthrough_pck) return GF_OUT_OF_MEM;
+			}
 
 			vi->video_buffer = compositor->passthrough_data;
 			vi->pitch_y = compositor->passthrough_txh->stride;
@@ -756,7 +758,7 @@
 	if (!compositor->player)
 		compositor->init_flags = GF_TERM_INIT_HIDE;
 
-	if (gf_opts_get_bool("temp", "gpac-help")) {
+	if (gf_opts_get_key("temp", "gpac-help")) {
 		compositor->init_flags |= GF_TERM_NO_VIDEO | GF_TERM_NO_AUDIO;
 	}
 
@@ -962,7 +964,7 @@
 
 	if (compositor->focus_highlight) {
 		gf_node_unregister(compositor->focus_highlight->node, NULL);
-		drawable_del_ex(compositor->focus_highlight, compositor);
+		drawable_del_ex(compositor->focus_highlight, compositor, GF_FALSE);
 	}
 	if (compositor->selected_text) gf_free(compositor->selected_text);
 	if (compositor->sel_buffer) gf_free(compositor->sel_buffer);
@@ -1251,7 +1253,6 @@
 	compositor->grab_use = NULL;
 	compositor->focus_node = NULL;
 	compositor->focus_text_type = 0;
-	compositor->frame_number = 0;
 	if (compositor->video_memory!=2)
 		compositor->video_memory = compositor->was_system_memory ? 0 : 1;
 	compositor->rotation = 0;
@@ -1285,11 +1286,11 @@
 	}
 
 	if (compositor->audio_renderer && (compositor->scene != scene_graph)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Reseting audio compositor\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] resetting audio compositor\n"));
 		gf_sc_ar_reset(compositor->audio_renderer);
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Reseting event queue\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] resetting event queue\n"));
 	gf_mx_p(compositor->evq_mx);
 	while (gf_list_count(compositor->event_queue)) {
 		GF_QueuedEvent *qev = (GF_QueuedEvent*)gf_list_get(compositor->event_queue, 0);
@@ -1298,7 +1299,7 @@
 	}
 	gf_mx_v(compositor->evq_mx);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Reseting compositor module\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] resetting compositor module\n"));
 	/*reset main surface*/
 	gf_sc_reset(compositor, scene_graph ? 1 : 0);
 
@@ -1409,10 +1410,16 @@
 			if (!compositor->os_wnd) {
 				/*only notify user if we are attached to a window*/
 				//do_notif = 0;
-				if (compositor->video_out->max_screen_width && (width > compositor->video_out->max_screen_width))
+				if (compositor->video_out->max_screen_width && (width > compositor->video_out->max_screen_width)) {
+					height *= compositor->video_out->max_screen_width;
+					height /= width;
 					width = compositor->video_out->max_screen_width;
-				if (compositor->video_out->max_screen_height && (height > compositor->video_out->max_screen_height))
+				}
+				if (compositor->video_out->max_screen_height && (height > compositor->video_out->max_screen_height)) {
+					width *= compositor->video_out->max_screen_height;
+					width /= height;
 					height = compositor->video_out->max_screen_height;
+				}
 
 				gf_sc_set_size(compositor,width, height);
 			}
@@ -1477,7 +1484,6 @@
 	/*EXTRA CARE HERE: the caller (user app) is likely a different thread than the compositor one, and depending on window
 	manager we may get called here as a result of a message sent to user but not yet returned */
 	lock_ok = gf_mx_try_lock(compositor->mx);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("line %d lock_ok %d\n", __LINE__, lock_ok));
 
 	compositor->new_width = NewWidth;
 	compositor->new_height = NewHeight;
@@ -1521,7 +1527,7 @@
 
 	if (! (compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL)) {
 		if (compositor->player && (compositor->ogl > GF_SC_GLMODE_OFF)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] OpenGL mode requested but no opengl-capable output - disabling openGL\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] OpenGL mode requested but no opengl-capable output - disabling OpenGL\n"));
 		}
 		compositor->force_opengl_2d = 0;
 		compositor->autoconfig_opengl = 0;
@@ -1584,7 +1590,7 @@
 
 #endif //GPAC_DISABLE_3D
 
-	/*load defer mode only once hybrid_opengl is known. If no hybrid openGL and no backbuffer 2D, disable defer rendering*/
+	/*load defer mode only once hybrid_opengl is known. If no hybrid OpenGL and no backbuffer 2D, disable defer rendering*/
 	if (!compositor->hybrid_opengl && compositor->video_out->hw_caps & GF_VIDEO_HW_DIRECT_ONLY) {
 		compositor->traverse_state->immediate_draw = 1;
 	} else {
@@ -2468,6 +2474,7 @@
 
 	gf_sc_texture_cleanup_hw(compositor);
 
+	compositor->frame_was_produced = GF_FALSE;
 	/*first thing to do, let the video output handle user event if it is not threaded*/
 	compositor->video_out->ProcessEvent(compositor->video_out, NULL);
 
@@ -2647,7 +2654,7 @@
 		if (compositor->reset_graphics && txh->tx_io) gf_sc_texture_reset(txh);
 		txh->update_texture_fcnt(txh);
 
-		if (!txh->stream_finished) {
+		if (!txh->stream_finished && txh->is_open) {
 			u32 d = gf_mo_get_min_frame_dur(txh->stream);
 			if (d && (d < frame_duration)) frame_duration = d;
 			//if the texture needs update (new frame), compute its timestamp in system timebase
@@ -2655,6 +2662,10 @@
 				u32 ts = gf_mo_map_timestamp_to_sys_clock(txh->stream, txh->stream->timestamp);
 				if (ts<frame_ts) frame_ts = ts;
 			}
+			//VFR and one frame is pending
+			else if (compositor->vfr && (compositor->ms_until_next_frame>0) && (compositor->ms_until_next_frame!=GF_INT_MAX)) {
+				compositor->frame_draw_type = GF_SC_DRAW_FRAME;
+			}
 			all_tx_done=0;
 		}
 	}
@@ -2691,6 +2702,8 @@
 	//it may happen that we have a reconfigure request at this stage, especially if updating one of the textures
 	//forced a relayout - do it right away
 	if (compositor->msg_type) {
+		//release textures !
+		compositor_release_textures(compositor, GF_FALSE);
 		gf_sc_lock(compositor, 0);
 		return;
 	}
@@ -2742,10 +2755,11 @@
 	/*setup root visual BEFORE updating the composite textures (since they may depend on root setup)*/
 	gf_sc_setup_root_visual(compositor, gf_sg_get_root_node(compositor->scene));
 
-	/*setup display before updating composite textures (some may require a valid openGL context)*/
+	/*setup display before updating composite textures (some may require a valid OpenGL context)*/
 	gf_sc_recompute_ar(compositor, gf_sg_get_root_node(compositor->scene) );
 
 	if (compositor->video_setup_failed)	{
+		compositor_release_textures(compositor, GF_FALSE);
 		gf_sc_lock(compositor, 0);
 		return;
 	}
@@ -2776,6 +2790,7 @@
 	if (compositor->msg_type) {
 		//reset AR recompute flag, it will be reset when msg is handled
 		compositor->recompute_ar = 0;
+		compositor_release_textures(compositor, GF_FALSE);
 		gf_sc_lock(compositor, 0);
 		return;
 	}
@@ -2798,7 +2813,6 @@
 
 	if (!compositor->player) {
 		if (compositor->check_eos_state<=1) {
-			compositor->check_eos_state = 0;
 			/*check if we have to force a frame dispatch */
 
 			//no passthrough texture
@@ -2832,6 +2846,8 @@
 					compositor->check_eos_state = 2;
 				}
 			}
+			if (compositor->frame_draw_type==GF_SC_DRAW_FRAME)
+				compositor->check_eos_state = 0;
 		}
 
 	}
@@ -2872,10 +2888,14 @@
 				emit_frame = GF_FALSE;
 				compositor->last_error = GF_OK;
 			}
-			else if (!scene_drawn) emit_frame = GF_FALSE;
-			else if (compositor->frame_draw_type) emit_frame = GF_FALSE;
-			else if (compositor->fonts_pending>0) emit_frame = GF_FALSE;
-			else emit_frame = GF_TRUE;
+			else if (!scene_drawn)
+				emit_frame = GF_FALSE;
+			else if (compositor->frame_draw_type)
+				emit_frame = GF_FALSE;
+			else if (compositor->fonts_pending>0)
+				emit_frame = GF_FALSE;
+			else
+				emit_frame = GF_TRUE;
 
 #ifdef GPAC_CONFIG_ANDROID
 if (!emit_frame && scene_drawn) {
@@ -2918,6 +2938,12 @@
 					pck = gf_filter_pck_new_frame_interface(compositor->vout, &compositor->frame_ifce, gf_sc_frame_ifce_done);
 				}
 
+				if (!pck) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate output video packet\n"));
+					compositor_release_textures(compositor, frame_drawn);
+					gf_sc_lock(compositor, 0);
+					return;
+				}
 				if (compositor->passthrough_txh) {
 					gf_filter_pck_merge_properties(compositor->passthrough_txh->stream->pck, pck);
 					pck_frame_ts = gf_filter_pck_get_cts(compositor->passthrough_txh->stream->pck);
@@ -2933,15 +2959,15 @@
 				}
 			}
 			if (pck_frame_ts) {
-				u64 ts = pck_frame_ts;
-				ts *= 1000;
-				ts /= compositor->passthrough_timescale;
+				u64 ts = gf_timestamp_rescale(pck_frame_ts, compositor->passthrough_timescale, 1000);
 				frame_ts = (u32) ts;
 			}
 			gf_filter_pck_send(pck);
 			gf_sc_ar_update_video_clock(compositor->audio_renderer, frame_ts);
 
 			if (!compositor->player) {
+				//in regular mode don't change fps once we sent one frame
+				compositor->autofps = GF_FALSE;
 				if (compositor->passthrough_txh) {
 					// update clock if not buffering
 					if (!gf_mo_is_buffering(compositor->passthrough_txh->stream))
@@ -2970,6 +2996,7 @@
 					compositor->scene_sampled_clock = (u32) res;
 				}
 				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Send video frame TS %u (%u ms) - next frame scene clock %d ms - passthrough %p\n", frame_ts, (frame_ts*1000)/compositor->fps.num, compositor->scene_sampled_clock, compositor->passthrough_txh));
+				compositor->frame_was_produced = GF_TRUE;
 			} else {
 				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Send video frame TS %u - AR clock %d\n", frame_ts, compositor->audio_renderer->current_time));
 			 	if (compositor->bench_mode) {
@@ -3002,14 +3029,14 @@
 
 #ifndef GPAC_DISABLE_LOG
 		flush_time = gf_sys_clock() - flush_time;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Compositor] done flushing frame in %d ms\n", flush_time));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Compositor] done flushing frame in %d ms\n", flush_time));
 #endif
 
 		visual_2d_draw_overlays(compositor->visual);
 		compositor->last_had_overlays = compositor->visual->has_overlays;
 
 		if (!textures_released) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Compositor] Releasing textures after flush\n" ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Compositor] Releasing textures after flush\n" ));
 			compositor_release_textures(compositor, frame_drawn);
 		}
 
@@ -3050,6 +3077,9 @@
 				assert(res >= compositor->scene_sampled_clock);
 				compositor->scene_sampled_clock = (u32) res;
 			}
+
+			if (compositor->check_eos_state && all_tx_done && !has_timed_nodes)
+				compositor->check_eos_state = 2;
 		}
 	}
 	compositor->reset_graphics = 0;
@@ -3097,7 +3127,7 @@
 	if (compositor->no_regulation)
 		return;
 
-	/*we are in bench mode, just release for a moment the composition, oherwise we will constantly lock the compositor wich may have impact on scene decoding*/
+	/*we are in bench mode, just release for a moment the composition, oherwise we will constantly lock the compositor which may have impact on scene decoding*/
 	if (compositor->bench_mode) {
 		gf_sleep(0);
 		return;
@@ -3215,7 +3245,7 @@
 #endif
 		}
 #if !defined(GPAC_DISABLE_X3D) && !defined(GPAC_DISABLE_3D)
-		/*if the inlined root node is a 3D one except Layer3D and we are not in a 3D context, insert
+		/*if the inline root node is a 3D one except Layer3D and we are not in a 3D context, insert
 		a Layer3D at the root*/
 		else if (!tr_state->visual->type_3d && ((tag==TAG_MPEG4_Group) || (tag==TAG_X3D_Group))) {
 			new_tag = TAG_MPEG4_Layer3D;
@@ -3414,11 +3444,11 @@
 	}
 	break;
 	case GF_EVENT_SIZE:
-		/*user consummed the resize event, do nothing*/
+		/*user consumed the resize event, do nothing*/
 		if ( gf_sc_send_event(compositor, event) )
 			return GF_TRUE;
 
-		/*not consummed and compositor "owns" the output window (created by the output module), resize*/
+		/*not consumed and compositor "owns" the output window (created by the output module), resize*/
 		if (!compositor->os_wnd) {
 			/*EXTRA CARE HERE: the caller (video output) is likely a different thread than the compositor one, and the
 			compositor may be locked on the video output (flush or whatever)!!
@@ -3477,7 +3507,6 @@
 				compositor->key_states &= ~GF_KEY_MOD_ALT;
 			}
 			break;
-
 		}
 
 		ret = GF_FALSE;
@@ -3517,6 +3546,11 @@
 			event->clipboard.text = NULL;
 		}
 		break;
+	case GF_EVENT_QUIT:
+		if (compositor->audio_renderer)
+			compositor->audio_renderer->non_rt_output = 2;
+		compositor->check_eos_state = 1;
+		return gf_sc_send_event(compositor, event);
 	/*when we process events we don't forward them to the user*/
 	default:
 		return gf_sc_send_event(compositor, event);
@@ -3765,7 +3799,7 @@
 const char *gf_sc_get_selected_text(GF_Compositor *compositor)
 {
 	const u16 *srcp;
-	size_t len;
+	u32 len;
 	if (compositor->store_text_state != GF_SC_TSEL_FROZEN) return NULL;
 
 	gf_sc_lock(compositor, GF_TRUE);
@@ -3785,7 +3819,7 @@
 	if (compositor->selected_text) gf_free(compositor->selected_text);
 	compositor->selected_text = gf_malloc(sizeof(char)*2*compositor->sel_buffer_len);
 	len = gf_utf8_wcstombs((char *) compositor->selected_text, 2*compositor->sel_buffer_len, &srcp);
-	if ((s32)len<0) len = 0;
+	if (len == GF_UTF8_FAIL) len = 0;
 	compositor->selected_text[len] = 0;
 	gf_sc_lock(compositor, GF_FALSE);

gpac-1.0.1.tar.gz/src/compositor/compositor_2d.c -> gpac-2.0.0.tar.gz/src/compositor/compositor_2d.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -446,7 +446,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Bliting frame (CTS %d) %d ms too late\n", txh->last_frame_time, ck - txh->last_frame_time ));
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[2D Blitter] At %u Blit texture (CTS %u) %d ms after due date - blit in %d ms - average push time %d ms\n", ck, txh->last_frame_time, ck - txh->last_frame_time, push_time, txh->upload_time / txh->nb_frames));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[2D Blitter] At %u Blit texture (CTS %u) %d ms after due date - blit in %d ms - average push time %d ms\n", ck, txh->last_frame_time, ck - txh->last_frame_time, push_time, txh->upload_time / txh->nb_frames));
 #endif
 }
 
@@ -654,22 +654,11 @@
 			if (hw_caps & GF_VIDEO_HW_HAS_RGBA)
 				use_soft_stretch = GF_FALSE;
 			break;
-		case GF_PIXEL_YUV:
-		case GF_PIXEL_YVYU:
-		case GF_PIXEL_YUYV:
-		case GF_PIXEL_YUVD:
-		case GF_PIXEL_YUV422:
-		case GF_PIXEL_YUV444:
-		case GF_PIXEL_YUV444_10:
-		case GF_PIXEL_YUV422_10:
-		case GF_PIXEL_YUV_10:
-		case GF_PIXEL_NV12:
-		case GF_PIXEL_NV12_10:
-		case GF_PIXEL_NV21:
-			if (hw_caps & GF_VIDEO_HW_HAS_YUV) use_soft_stretch = GF_FALSE;
-			else if (hw_caps & GF_VIDEO_HW_HAS_YUV_OVERLAY) overlay_type = 1;
-			break;
 		default:
+			if (gf_pixel_fmt_is_yuv(txh->pixelformat)) {
+				if (hw_caps & GF_VIDEO_HW_HAS_YUV) use_soft_stretch = GF_FALSE;
+				else if (hw_caps & GF_VIDEO_HW_HAS_YUV_OVERLAY) overlay_type = 1;
+			}
 			break;
 		}
 		/*disable based on settings*/
@@ -720,6 +709,8 @@
 	video_src.height = txh->height;
 	video_src.width = txh->width;
 	video_src.pitch_x = 0;
+	if (!txh->stride)
+		gf_pixel_get_size_info(txh->pixelformat, txh->width, txh->height, NULL, &txh->stride, NULL, NULL, NULL);
 	video_src.pitch_y = txh->stride;
 	video_src.pixel_format = txh->pixelformat;
 #ifdef GF_SR_USE_DEPTH
@@ -1423,11 +1414,8 @@
 					gf_irect_intersect(&ctx->bi->clip, &the_clip);
 					tr_state->ctx = ctx;
 
-					if (ctx->drawable->flags & DRAWABLE_USE_TRAVERSE_DRAW) {
-						gf_node_traverse(ctx->drawable->node, tr_state);
-					} else {
-						drawable_draw(ctx->drawable, tr_state);
-					}
+					call_drawable_draw(ctx, tr_state, GF_FALSE);
+
 					ctx->bi->clip = prev_clip;
 				}
 				ctx = ctx->next;

gpac-1.0.1.tar.gz/src/compositor/compositor_3d.c -> gpac-2.0.0.tar.gz/src/compositor/compositor_3d.c Changed

gpac-1.0.1.tar.gz/src/compositor/compositor_node_init.c -> gpac-2.0.0.tar.gz/src/compositor/compositor_node_init.c Changed

gpac-1.0.1.tar.gz/src/compositor/drawable.c -> gpac-2.0.0.tar.gz/src/compositor/drawable.c Changed

@@ -36,6 +36,23 @@
 	visual_2d_draw_path(tr_state->visual, tr_state->ctx->drawable->path, tr_state->ctx, NULL, NULL, tr_state);
 }
 
+void call_drawable_draw(DrawableContext *ctx, GF_TraverseState *tr_state, Bool set_cyclic)
+{
+	if (ctx->cliper) {
+		gf_node_traverse(ctx->cliper, tr_state);
+	}
+
+	if (ctx->drawable->flags & DRAWABLE_USE_TRAVERSE_DRAW) {
+		if (set_cyclic)
+			gf_node_allow_cyclic_traverse(ctx->drawable->node);
+		gf_node_traverse(ctx->drawable->node, tr_state);
+	} else {
+		drawable_draw(ctx->drawable, tr_state);
+	}
+	if (ctx->cliper)
+		gf_evg_surface_set_mask_mode(tr_state->visual->raster_surface, GF_EVGMASK_NONE);
+}
+
 /*default point_over routine*/
 #ifndef GPAC_DISABLE_VRML
 void vrml_drawable_pick(Drawable *drawable, GF_TraverseState *tr_state)
@@ -115,6 +132,16 @@
 }
 #endif /*GPAC_DISABLE_VRML*/
 
+void drawable_init_ex(Drawable *tmp)
+{
+	tmp->path = gf_path_new();
+	GF_SAFEALLOC(tmp->dri, DRInfo);
+	if (tmp->dri) {
+		/*allocate a default bounds container*/
+		GF_SAFEALLOC(tmp->dri->current_bounds, BoundInfo);
+	}
+}
+
 Drawable *drawable_new()
 {
 	Drawable *tmp;
@@ -164,7 +191,7 @@
 	}
 }
 
-void drawable_del_ex(Drawable *dr, GF_Compositor *compositor)
+void drawable_del_ex(Drawable *dr, GF_Compositor *compositor, Bool no_free)
 {
 	StrikeInfo2D *si;
 	DRInfo *dri;
@@ -230,13 +257,14 @@
 		delete_strikeinfo2d(si);
 		si = next;
 	}
-	gf_free(dr);
+	if (!no_free)
+		gf_free(dr);
 }
 
 void drawable_del(Drawable *dr)
 {
 	GF_Compositor *compositor = gf_sc_get_compositor(dr->node);
-	drawable_del_ex(dr, compositor);
+	drawable_del_ex(dr, compositor, GF_FALSE);
 }
 void drawable_node_del(GF_Node *node)
 {
@@ -682,11 +710,11 @@
 			if (!ctx->aspect.fill_texture->transparent && (alpha==0xFF) && !ctx->aspect.fill_texture->compute_gradient_matrix && (drawable->flags & DRAWABLE_HYBGL_INIT)) {
 				ctx->flags |= CTX_HYBOGL_NO_CLEAR;
 			}
-			//otherwise, we need to redraw all object below, wether they changed ot not, because we have erased this part of the canvas
+			//otherwise, we need to redraw all object below, whether they changed ot not, because we have erased this part of the canvas
 			else {
 				ctx->flags |= CTX_TEXTURE_DIRTY;
 			}
-			//wait untill we have something to draw to decide that the texture is ready, otherwise we will not clear the canvas when texture is ready
+			//wait until we have something to draw to decide that the texture is ready, otherwise we will not clear the canvas when texture is ready
 			if (ctx->aspect.fill_texture->compute_gradient_matrix || ctx->aspect.fill_texture->data)
 				texture_ready=1;
 		}
@@ -704,11 +732,11 @@
 			u8 alpha = GF_COL_A(ctx->aspect.line_color);
 			if (!ctx->aspect.line_texture->transparent && (alpha==0xFF) && !ctx->aspect.line_texture->compute_gradient_matrix && (drawable->flags & DRAWABLE_HYBGL_INIT))
 				ctx->flags |= CTX_HYBOGL_NO_CLEAR;
-			//otherwise, we need to redraw all object below, wether they changed ot not, bacause we have erased this part of the canvas
+			//otherwise, we need to redraw all object below, whether they changed ot not, bacause we have erased this part of the canvas
 			else
 				ctx->flags |= CTX_TEXTURE_DIRTY;
 
-			//wait untill we have something to draw to decide that the texture is ready, otherwise we will not clear the canvas when texture is ready
+			//wait until we have something to draw to decide that the texture is ready, otherwise we will not clear the canvas when texture is ready
 			if (ctx->aspect.line_texture->compute_gradient_matrix || ctx->aspect.line_texture->data)
 				texture_ready=1;
 		}
@@ -848,12 +876,7 @@
 		tr_state->traversing_mode = TRAVERSE_DRAW_2D;
 		tr_state->ctx = ctx;
 
-		if (ctx->drawable->flags & DRAWABLE_USE_TRAVERSE_DRAW) {
-			gf_node_allow_cyclic_traverse(ctx->drawable->node);
-			gf_node_traverse(ctx->drawable->node, tr_state);
-		} else {
-			drawable_draw(ctx->drawable, tr_state);
-		}
+		call_drawable_draw(ctx, tr_state, GF_TRUE);
 
 		tr_state->ctx = NULL;
 		tr_state->traversing_mode = TRAVERSE_SORT;
@@ -890,17 +913,13 @@
 	asp->line_scale = MAX(gf_divfix(tr_state->visual->compositor->scale_x, rc.width), gf_divfix(tr_state->visual->compositor->scale_y, rc.height));
 }
 
-//#define REMOVE_UNUSED_CTX
 void drawable_finalize_sort_ex(DrawableContext *ctx, GF_TraverseState *tr_state, GF_Rect *orig_bounds, Bool skip_focus)
 {
-#ifdef REMVE_UNUSED_CTX
 	Bool can_remove = 0;
-#endif
 	Fixed pw;
 	GF_Rect unclip, store_orig_bounds;
 	GF_Node *appear = tr_state->override_appearance ? tr_state->override_appearance : tr_state->appear;
 
-
 	drawable_check_bounds(ctx, tr_state->visual);
 
 	if (orig_bounds) {
@@ -957,19 +976,13 @@
 		ctx->bi->clip.width = 0;
 	}
 
-#ifdef REMVE_UNUSED_CTX
 	can_remove = drawable_finalize_end(ctx, tr_state);
-#else
-	drawable_finalize_end(ctx, tr_state);
-#endif
 	if (ctx->drawable && !skip_focus)
 		drawable_check_focus_highlight(ctx->drawable->node, tr_state, &store_orig_bounds);
 
 	/*remove if this is the last context*/
-#ifdef REMVE_UNUSED_CTX
 	if (can_remove && (tr_state->visual->cur_context == ctx))
 		tr_state->visual->cur_context->drawable = NULL;
-#endif
 }
 
 void drawable_finalize_sort(struct _drawable_context *ctx, GF_TraverseState *tr_state, GF_Rect *orig_bounds)
@@ -1481,15 +1494,22 @@
 #endif
 }
 
-DrawableContext *drawable_init_context_svg(Drawable *drawable, GF_TraverseState *tr_state)
+DrawableContext *drawable_init_context_svg(Drawable *drawable, GF_TraverseState *tr_state, SVG_ClipPath *clip_path)
 {
 	DrawableContext *ctx;
 	assert(tr_state->visual);
 
+	if (clip_path && !clip_path->target.target) {
+		clip_path->target.target = clip_path->target.string ? gf_sg_find_node_by_name(tr_state->visual->compositor->scene, clip_path->target.string+1) : NULL;
+		if (!clip_path->target.target) clip_path = NULL;
+	}
+
 #ifndef GPAC_DISABLE_VRML
 	/*setup SVG based on override appearance node */
 	if (tr_state->override_appearance) {
-		return drawable_init_context_mpeg4(drawable, tr_state);
+		ctx = drawable_init_context_mpeg4(drawable, tr_state);
+		if (ctx && clip_path) ctx->cliper = (GF_Node*)clip_path->target.target;
+		return ctx;
 	}
 #endif
 
@@ -1503,6 +1523,7 @@
 	gf_mx2d_copy(ctx->transform, tr_state->transform);
 
 	ctx->drawable = drawable;
+	if (clip_path) ctx->cliper = (GF_Node*)clip_path->target.target;
 
 	if (tr_state->invalidate_all || svg_appearance_flag_dirty(tr_state->svg_flags)) {
 		ctx->flags |= CTX_APP_DIRTY;

gpac-1.0.1.tar.gz/src/compositor/drawable.h -> gpac-2.0.0.tar.gz/src/compositor/drawable.h Changed

@@ -120,11 +120,14 @@
 /*construction destruction*/
 Drawable *drawable_new();
 void drawable_del(Drawable *dr);
-void drawable_del_ex(Drawable *dr, GF_Compositor *compositor);
+void drawable_del_ex(Drawable *dr, GF_Compositor *compositor, Bool no_free);
 
 /*cleans up the drawable attached to the node*/
 void drawable_node_del(GF_Node *node);
 
+/*init drawable structure when stack extends drawable (text, bitmap)*/
+void drawable_init_ex(Drawable *tmp);
+
 
 /*
 decide whether drawing is needed or not based on visual settings and parent node - must be called
@@ -150,7 +153,7 @@
 void drawable_check_focus_highlight(GF_Node *node, GF_TraverseState *tr_state, GF_Rect *orig_bounds);
 
 /*reset the highlight state (bounds) if associated with the current node. This is automatically called
-whenever reseting a drawable but must be called when a grouping node is modified*/
+whenever resetting a drawable but must be called when a grouping node is modified*/
 void drawable_reset_group_highlight(GF_TraverseState *tr_state, GF_Node *n);
 
 /*move current bounds to previous bounds for given target visual manager - called BEFORE updating the visual manager
@@ -260,6 +263,8 @@
 	*/
 	GF_Node *appear;
 
+	GF_Node *cliper;
+
 #ifdef GF_SR_USE_DEPTH
 	//local gain and offset
 	Fixed depth_gain, depth_offset;
@@ -278,13 +283,15 @@
 #endif
 
 /*inits context for SVG - may return NULL if the node doesn't have to be drawn*/
-DrawableContext *drawable_init_context_svg(Drawable *drawable, GF_TraverseState *tr_state);
+DrawableContext *drawable_init_context_svg(Drawable *drawable, GF_TraverseState *tr_state, SVG_ClipPath *clip_path);
 
 /*base draw function for 2D objects (texturing, fill and strike)
 	in 2D, the current context is passed in the traversing state
 */
 void drawable_draw(Drawable *drawable, GF_TraverseState *tr_state);
 
+void call_drawable_draw(DrawableContext *ctx, GF_TraverseState *tr_state, Bool set_cyclic);
+
 /*picking function for VRML-based scene graphs*/
 void vrml_drawable_pick(Drawable *drawable, GF_TraverseState *tr_state);

gpac-1.0.1.tar.gz/src/compositor/events.c -> gpac-2.0.0.tar.gz/src/compositor/events.c Changed

@@ -86,11 +86,12 @@
 	}
 	if (compositor->sel_buffer_len) {
 		char *txt;
-		size_t len;
+		u32 len;
 		const u16 *lptr;
 		txt = (char*)gf_malloc(sizeof(char)*2*compositor->sel_buffer_len);
 		lptr = compositor->sel_buffer;
 		len = gf_utf8_wcstombs(txt, 2*compositor->sel_buffer_len, &lptr);
+		if (len == GF_UTF8_FAIL) len = 0;
 		txt[len] = 0;
 		*compositor->edited_text = gf_strdup(txt);
 		gf_free(txt);
@@ -134,18 +135,19 @@
 GF_Err gf_sc_paste_text(GF_Compositor *compositor, const char *text)
 {
 	u16 *conv_buf;
-	size_t len;
+	u32 len;
 	if (!compositor->sel_buffer || !compositor->edited_text) return GF_BAD_PARAM;
 	if (!text) return GF_OK;
-	len = strlen(text);
+	len = (u32) strlen(text);
 	if (!len) return GF_OK;
 
 	gf_sc_lock(compositor, GF_TRUE);
 
 	conv_buf = (u16*)gf_malloc(sizeof(u16)*(len+1));
 	len = gf_utf8_mbstowcs(conv_buf, len, &text);
+	if (len == GF_UTF8_FAIL) return GF_IO_ERR;
 
-	compositor->sel_buffer_alloc += (u32) len;
+	compositor->sel_buffer_alloc += len;
 	if (compositor->sel_buffer_len == compositor->sel_buffer_alloc)
 		compositor->sel_buffer_alloc++;
 
@@ -153,8 +155,8 @@
 	memmove(&compositor->sel_buffer[compositor->caret_pos+len], &compositor->sel_buffer[compositor->caret_pos], sizeof(u16)*(compositor->sel_buffer_len-compositor->caret_pos));
 	memcpy(&compositor->sel_buffer[compositor->caret_pos], conv_buf, sizeof(u16)*len);
 	gf_free(conv_buf);
-	compositor->sel_buffer_len += (u32) len;
-	compositor->caret_pos += (u32) len;
+	compositor->sel_buffer_len += len;
+	compositor->caret_pos += len;
 	compositor->sel_buffer[compositor->sel_buffer_len]=0;
 	flush_text_node_edit(compositor, GF_FALSE);
 	gf_sc_lock(compositor, GF_FALSE);
@@ -280,7 +282,7 @@
 							gf_node_list_insert_child(&children, t, pos);
 							res = &((GF_DOMText *)child->node)->textContent;
 						} else {
-							size_t len;
+							u32 len;
 							GF_DOMText *cur;
 
 							gf_node_list_insert_child(&children, t, pos+1);
@@ -298,6 +300,7 @@
 							cur->textContent = (char*)gf_malloc(sizeof(char)*(len+1));
 							srcp = compositor->sel_buffer;
 							len = gf_utf8_wcstombs(cur->textContent, len, &srcp);
+							if (len == GF_UTF8_FAIL) len = 0;
 							cur->textContent[len] = 0;
 							compositor->sel_buffer[compositor->caret_pos] = end;
 
@@ -306,6 +309,7 @@
 								ntext->textContent = (char*)gf_malloc(sizeof(char)*(len+1));
 								srcp = compositor->sel_buffer + compositor->caret_pos + 1;
 								len = gf_utf8_wcstombs(ntext->textContent, len, &srcp);
+								if (len == GF_UTF8_FAIL) len = 0;
 								ntext->textContent[len] = 0;
 							} else {
 								ntext->textContent = gf_strdup("");
@@ -369,15 +373,17 @@
 		compositor->sel_buffer = (u16*)gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
 
 		if (caret_pos>=0) {
-			size_t l = gf_utf8_mbstowcs(compositor->sel_buffer, compositor->sel_buffer_alloc, &src);
-			compositor->sel_buffer_len = (u32) l;
+			u32 l = gf_utf8_mbstowcs(compositor->sel_buffer, compositor->sel_buffer_alloc, &src);
+			if (l == GF_UTF8_FAIL) return GF_FALSE;
+			compositor->sel_buffer_len = l;
 			memmove(&compositor->sel_buffer[caret_pos+1], &compositor->sel_buffer[caret_pos], sizeof(u16)*(compositor->sel_buffer_len-caret_pos));
 			compositor->sel_buffer[caret_pos] = GF_CARET_CHAR;
 			compositor->caret_pos = caret_pos;
 
 		} else {
-			size_t l = gf_utf8_mbstowcs(compositor->sel_buffer, compositor->sel_buffer_alloc, &src);
-			compositor->sel_buffer_len = (u32) l;
+			u32 l = gf_utf8_mbstowcs(compositor->sel_buffer, compositor->sel_buffer_alloc, &src);
+			if (l == GF_UTF8_FAIL) return GF_FALSE;
+			compositor->sel_buffer_len = l;
 			compositor->sel_buffer[compositor->sel_buffer_len] = GF_CARET_CHAR;
 			compositor->caret_pos = compositor->sel_buffer_len;
 		}
@@ -900,7 +906,7 @@
 		if (keynav) gf_sc_change_key_navigator(compositor, keynav);
 
 		/*call the sensor LAST, as this may triger a destroy of the scene the sensor is in
-		this is only true for anchors, as other other sensors output events are queued as routes untill next pass*/
+		this is only true for anchors, as other other sensors output events are queued as routes until next pass*/
 		res += hs->OnUserEvent(hs, GF_TRUE, GF_FALSE, ev, compositor);
 		if (stype == TAG_MPEG4_Anchor) check_anchor = GF_TRUE;
 #ifndef GPAC_DISABLE_X3D
@@ -989,7 +995,7 @@
 	}
 	if (res) {
 		GF_SceneGraph *sg;
-		/*apply event cascade - this is needed for cases where several events are processed inbetween
+		/*apply event cascade - this is needed for cases where several events are processed between
 		2 simulation tick. If we don't flush the routes stack, the result will likely be wrong
 		*/
 		gf_sg_activate_routes(compositor->scene);

gpac-1.0.1.tar.gz/src/compositor/font_engine.c -> gpac-2.0.0.tar.gz/src/compositor/font_engine.c Changed

@@ -183,6 +183,7 @@
 		GF_Font *best_font = NULL;
 		GF_Font *font = fm->font;
 		font_name = alt_fonts[i];
+		if (!font_name) font_name = "SANS";
 
 		if (!stricmp(font_name, "SERIF")) {
 			opt = gf_opts_get_key("FontCache", "FontSerif");
@@ -410,6 +411,7 @@
 //	span->lang = xml_lang;
 	if (fliped_text) span->flags |= GF_TEXT_SPAN_FLIP;
 	if (styles & GF_FONT_UNDERLINED) span->flags |= GF_TEXT_SPAN_UNDERLINE;
+	if (styles & GF_FONT_STRIKEOUT) span->flags |= GF_TEXT_SPAN_STRIKEOUT;
 	span->nb_glyphs = len;
 	span->glyphs = gf_malloc(sizeof(void *)*len);
 	if (needs_x_offset) {
@@ -1060,7 +1062,7 @@
 	ctx->aspect.line_scale = lscale;
 }
 
-void gf_font_underline_span(GF_TraverseState *tr_state, GF_TextSpan *span, DrawableContext *ctx)
+void gf_font_underline_span(GF_TraverseState *tr_state, GF_TextSpan *span, DrawableContext *ctx, Bool is_strikeout)
 {
 	GF_Matrix2D mx, m;
 	u32 col;
@@ -1075,6 +1077,9 @@
 	else
 		diff = sx * (- span->font->ascent + span->font->underline);
 
+	if (is_strikeout)
+		diff = 2*diff/3;
+
 	gf_mx2d_init(m);
 	gf_mx2d_add_scale(&m, span->bounds.width, FIX_ONE);
 	gf_mx2d_add_translation(&m, span->bounds.x + span->bounds.width / 2, span->bounds.y+diff);
@@ -1331,7 +1336,8 @@
 		} else {
 			gf_font_span_draw_2d(tr_state, span, ctx, bounds);
 		}
-		if (span->anchor || (span->flags & GF_TEXT_SPAN_UNDERLINE) ) gf_font_underline_span(tr_state, span, ctx);
+		if (span->anchor || (span->flags & GF_TEXT_SPAN_UNDERLINE) ) gf_font_underline_span(tr_state, span, ctx, GF_FALSE);
+		if (span->flags & GF_TEXT_SPAN_STRIKEOUT) gf_font_underline_span(tr_state, span, ctx, GF_TRUE);
 		if (ctx->sub_path_index) break;
 	}
 	if (is_rv) tr_state->ctx->aspect.fill_color = hl_color;

gpac-1.0.1.tar.gz/src/compositor/hardcoded_protos.c -> gpac-2.0.0.tar.gz/src/compositor/hardcoded_protos.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -1162,7 +1162,7 @@
 }
 
 
-/*CustomTexture: tests defining new (openGL) textures*/
+/*CustomTexture: tests defining new (OpenGL) textures*/
 typedef struct
 {
     BASE_NODE
@@ -1210,7 +1210,7 @@
 static void CustomTexture_update(GF_TextureHandler *txh)
 {
 #ifndef GPAC_DISABLE_3D
-    u8 data[12];
+    u8 data[16];
 #endif
     CustomTextureStack *stack = gf_node_get_private(txh->owner);
     //alloc texture
@@ -1226,7 +1226,7 @@
     if (! gf_sc_texture_get_gl_id(txh)) {
         
         //setup some defaults (these two vars are used to setup internal texture format)
-        //in our case we only want to test openGL so no need to fill in the texture width/height stride
+        //in our case we only want to test OpenGL so no need to fill in the texture width/height stride
         //since we will upload ourselves the texture
         txh->transparent = 0;
         txh->pixelformat = GF_PIXEL_RGB;
@@ -1350,7 +1350,9 @@
 		
 		if (tr_state->traversing_mode==TRAVERSE_DRAW_3D) {
 			Bool visible = GF_FALSE;
-
+#ifndef GPAC_DISABLE_LOG
+			const char *pid_name = gf_filter_pid_get_name(txh->stream->odm->pid);
+#endif
 			if (! tr_state->camera_was_dirty && !mesh_was_reset) {
 				visible = (stack->mesh->flags & MESH_WAS_VISIBLE) ? GF_TRUE : GF_FALSE;
 			} else if ((vrinfo.srd_w==vrinfo.srd_max_x) && (vrinfo.srd_h==vrinfo.srd_max_y)) {
@@ -1390,7 +1392,7 @@
 				}
 				if (nb_visible > min_visible_threshold) 
 					visible = GF_TRUE;
-				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d Partial sphere is %s - %d sample points visible out of %d\n", txh->stream->OD_ID, visible ? "visible" : "hidden",  nb_visible, i));
+				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %s Partial sphere is %s - %d sample points visible out of %d\n", pid_name, visible ? "visible" : "hidden",  nb_visible, i));
 			}
 
 			if (visible) {
@@ -1411,7 +1413,7 @@
 				visual_3d_setup_ray(tr_state->visual, tr_state, gx, gy);
 				visual_3d_vrml_drawable_pick(node, tr_state, stack->mesh, NULL);
 				if (tr_state->visual->compositor->hit_node) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d Partial sphere is under gaze coord %d %d\n", txh->stream->OD_ID, tr_state->visual->compositor->gaze_x, tr_state->visual->compositor->gaze_y));
+					GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %s Partial sphere is under gaze coord %d %d\n", pid_name, tr_state->visual->compositor->gaze_x, tr_state->visual->compositor->gaze_y));
 
 					tr_state->visual->compositor->hit_node = NULL;
 				} else {
@@ -1423,23 +1425,29 @@
 			if (vrinfo.has_full_coverage) {
 				if (visible) {
 					if (!txh->is_open) {
-						GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d stoped on visible partial sphere - starting it\n", txh->stream->OD_ID));
+						GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %s stopped on visible partial sphere - starting it\n", pid_name));
 						assert(txh->stream && txh->stream->odm);
 						txh->stream->odm->disable_buffer_at_next_play = GF_TRUE;
-
-						gf_sc_texture_play(txh, NULL);
+						txh->stream->odm->flags |= GF_ODM_TILED_SHARED_CLOCK;
+						gf_sc_texture_play_from_to(txh, NULL, -1, -1, 1, 0);
 					}
+
 					if (txh->data) {
+						Bool do_show = GF_TRUE;
+						Bool is_full_cover =  (vrinfo.srd_w == vrinfo.srd_max_x) ? GF_TRUE : GF_FALSE;
 						visual_3d_enable_depth_buffer(tr_state->visual, GF_FALSE);
 						visual_3d_enable_antialias(tr_state->visual, GF_FALSE);
-						if (!tr_state->visual->compositor->tvtd || (vrinfo.srd_w != vrinfo.srd_max_x)) {
+						if ((tr_state->visual->compositor->tvtd == TILE_DEBUG_FULL) && !is_full_cover) do_show = GF_FALSE;
+						else if ((tr_state->visual->compositor->tvtd == TILE_DEBUG_PARTIAL) && is_full_cover) do_show = GF_FALSE;
+
+						if (do_show) {
 							visual_3d_draw(tr_state, stack->mesh);
 						}
 						visual_3d_enable_depth_buffer(tr_state->visual, GF_TRUE);
 					}
 				} else {
 					if (txh->is_open) {
-						GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d playing on hidden partial sphere - stoping it\n", txh->stream->OD_ID));
+						GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %s playing on hidden partial sphere - stopping it\n", pid_name));
 						gf_sc_texture_stop_no_unregister(txh);
 					}
 				}

gpac-1.0.1.tar.gz/src/compositor/media_object.c -> gpac-2.0.0.tar.gz/src/compositor/media_object.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -183,7 +183,7 @@
 	while (scene->secondary_resource && scene->root_od->parentscene)
 		scene = scene->root_od->parentscene;
 
-	res = gf_scene_get_media_object_ex(scene, url, obj_type, lock_timelines, syncRef, force_new_res, node);
+	res = gf_scene_get_media_object_ex(scene, url, obj_type, lock_timelines, syncRef, force_new_res, node, NULL);
 	return res;
 }
 
@@ -212,7 +212,7 @@
 {
 	if ((mo->type != GF_MEDIA_OBJECT_VIDEO) && (mo->type!=GF_MEDIA_OBJECT_TEXT)) return GF_FALSE;
 
-	if (mo->config_changed) {
+	if (mo->config_changed || !mo->width || !mo->height) {
 		gf_mo_update_caps(mo);
 	}
 	if (width) *width = mo->width;
@@ -231,13 +231,6 @@
 }
 
 GF_EXPORT
-
-void gf_mo_get_nb_layers(GF_MediaObject *mo, u32 *nb_layers)
-{
-	if (mo) *nb_layers = mo->nb_layers;
-}
-
-GF_EXPORT
 Bool gf_mo_get_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u64 *channel_config, Bool *forced_layout)
 {
 	if (!mo->odm || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return GF_FALSE;
@@ -257,7 +250,7 @@
 
 	if (mo->odm->ambi_ch_id) {
 		if (mo->num_channels>1) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d]: tagged as ambisonic channel %d but has %d channels, ignoring ambisonic tag\n", mo->odm->ID, mo->odm->ambi_ch_id, mo->num_channels ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME, ("[ODM%d]: tagged as ambisonic channel %d but has %d channels, ignoring ambisonic tag\n", mo->odm->ID, mo->odm->ambi_ch_id, mo->num_channels ));
 		} else {
 			if (num_channels) *num_channels = 1;
 			if (channel_config) *channel_config = (u64) ( 1 << (mo->odm->ambi_ch_id - 1) );
@@ -270,7 +263,7 @@
 }
 
 
-void gf_mo_update_caps(GF_MediaObject *mo)
+void gf_mo_update_caps_ex(GF_MediaObject *mo, Bool check_unchanged)
 {
 	Bool changed = GF_FALSE;
 	const GF_PropertyValue *v, *v2;
@@ -281,11 +274,15 @@
 #define UPDATE_CAP(_code, _field) \
 		v = gf_filter_pid_get_property(mo->odm->pid, _code);\
 		if (v) {\
-			if (mo->_field && (mo->_field != v->value.uint)) changed=GF_TRUE;\
+			if (mo->_field != v->value.uint) changed=GF_TRUE;\
 			mo->_field = v->value.uint;\
+		} else if (mo->_field) {\
+			changed=GF_TRUE;\
+			mo->_field=0;\
 		}\
 
 	if (mo->odm->type==GF_STREAM_VISUAL) {
+		Bool check_mx = GF_TRUE;
 
 		UPDATE_CAP(GF_PROP_PID_WIDTH, width)
 		UPDATE_CAP(GF_PROP_PID_HEIGHT, height)
@@ -293,6 +290,35 @@
 		UPDATE_CAP(GF_PROP_PID_PIXFMT, pixelformat)
 		UPDATE_CAP(GF_PROP_PID_BITRATE, bitrate)
 
+		UPDATE_CAP(GF_PROP_PID_ROTATE, rotate)
+		if (v) check_mx = GF_FALSE;
+
+		UPDATE_CAP(GF_PROP_PID_MIRROR, flip)
+		if (v) check_mx = GF_FALSE;
+
+		if (check_mx) {
+			v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_ISOM_TRACK_MATRIX);
+			if (v) {
+				GF_Err gf_prop_matrix_decompose(const GF_PropertyValue *p, u32 *flip_mode, u32 *rot_mode);
+				u32 flip, rotate;
+
+				if (gf_prop_matrix_decompose(v, &flip, &rotate)==GF_OK) {
+					if (flip != mo->flip) {
+						mo->flip = flip;
+						changed = GF_TRUE;
+					}
+					if (rotate != mo->rotate) {
+						mo->rotate = rotate;
+						changed = GF_TRUE;
+					}
+				}
+			} else {
+				if (mo->flip || mo->rotate) changed = GF_TRUE;
+				mo->flip = 0;
+				mo->rotate = 0;
+			}
+		}
+
 		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_SAR);
 		if (v) {
 			u32 n_par = (v->value.frac.num) << 16 | (v->value.frac.den);
@@ -343,6 +369,20 @@
 				mo->srd_full_h = v2->value.vec2i.y;
 			}
 		}
+
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_NUM_VIEWS);
+		mo->nb_views = v ? v->value.uint : 0;
+
+		mo->c_w = mo->c_h = mo->c_x = mo->c_y = 0;
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_CLAP_W);
+		if (v && v->value.frac.den) { mo->c_w = (Float) v->value.frac.num; mo->c_w /= v->value.frac.den; }
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_CLAP_H);
+		if (v && v->value.frac.den) { mo->c_h = (Float) v->value.frac.num; mo->c_h /= v->value.frac.den; }
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_CLAP_X);
+		if (v && v->value.frac.den) { mo->c_x = (Float) v->value.frac.num; mo->c_x /= v->value.frac.den; }
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_CLAP_Y);
+		if (v && v->value.frac.den) { mo->c_y = (Float) v->value.frac.num; mo->c_y /= v->value.frac.den; }
+
 	} else if (mo->odm->type==GF_STREAM_AUDIO) {
 		UPDATE_CAP(GF_PROP_PID_SAMPLE_RATE, sample_rate)
 		UPDATE_CAP(GF_PROP_PID_NUM_CHANNELS, num_channels)
@@ -366,7 +406,7 @@
 	} else if (mo->odm->type==GF_STREAM_TEXT) {
 		//nothing to do
 	} else {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("Unknwon scene object type %d\n", mo->odm->type));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME, ("Unknwon scene object type %d\n", mo->odm->type));
 	}
 
 	if (changed) {
@@ -375,26 +415,101 @@
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_QUALITY_SWITCHED;
 		gf_sc_send_event(scene->compositor, &evt);
+	} else if (check_unchanged) {
+		//reset config changed if nothing changed, this avoid resetting up texture or mixer input
+		mo->config_changed = GF_FALSE;
 	}
 }
+void gf_mo_update_caps(GF_MediaObject *mo)
+{
+	gf_mo_update_caps_ex(mo, GF_FALSE);
 
+}
 static u64 convert_ts_to_ms(GF_MediaObject *mo, u64 ts, u32 timescale, Bool *discard)
 {
-	if (mo->odm->delay) {
-		if (mo->odm->delay >= 0) {
-			ts += mo->odm->delay;
-		} else if (ts < (u64) -mo->odm->delay) {
+	if (mo->odm->timestamp_offset) {
+		if (mo->odm->timestamp_offset >= 0) {
+			ts += mo->odm->timestamp_offset;
+		} else if (ts < (u64) -mo->odm->timestamp_offset) {
 			*discard = GF_TRUE;
 			return 0;
 		} else {
-			ts -= -mo->odm->delay;
+			ts -= -mo->odm->timestamp_offset;
+		}
+	}
+
+	ts = gf_timestamp_rescale(ts, timescale, 1000);
+	
+	//if addon, translate back into main content timing
+	if (mo->odm->parentscene && mo->odm->parentscene->root_od->addon) {
+		if (!mo->odm->parentscene->root_od->addon->timeline_ready) {
+			ts = 0;
+		} else {
+			s64 res = gf_scene_adjust_timestamp_for_addon(mo->odm->parentscene->root_od->addon, ts);
+			if (res<0) res=0;
+			ts = (u64) res;
 		}
 	}
-	ts *= 1000;
-	ts /= timescale;
 	return ts;
 }
 
+
+static void check_temi(GF_MediaObject *mo)
+{
+	u32 idx=0;
+	if (!(mo->odm->flags & GF_ODM_HAS_TEMI)) return;
+
+	while (1) {
+		const GF_PropertyValue *p;
+		u32 p4cc = 0;
+		const char *pname = NULL;
+		p = gf_filter_pck_enum_properties(mo->pck, &idx, &p4cc, &pname);
+		if (!p) break;
+		if (!pname) continue;
+		if (p->type != GF_PROP_DATA) continue;
+		if (!strncmp(pname, "temi_l:", 7)) {
+			GF_AssociatedContentLocation temi_l;
+			u8 *data = p->value.data.ptr;
+			u32 len = (u32) strlen(data);
+			memset(&temi_l, 0, sizeof(GF_AssociatedContentLocation));
+			temi_l.timeline_id = atoi(pname+7);
+			temi_l.is_announce = (data[len+1] & 0x80) ? GF_TRUE : GF_FALSE;
+			temi_l.is_splicing = (data[len+1] & 0x40) ? GF_TRUE : GF_FALSE;
+			temi_l.reload_external = (data[len+1] & 0x20) ? GF_TRUE : GF_FALSE;
+			if (temi_l.is_announce) {
+				temi_l.activation_countdown.den = GF_4CC(data[len+2], data[len+3], data[len+4], data[len+5]);
+				temi_l.activation_countdown.num = GF_4CC(data[len+6], data[len+7], data[len+8], data[len+9]);
+			}
+			temi_l.external_URL = data;
+
+			gf_scene_register_associated_media(mo->odm->subscene ? mo->odm->subscene : mo->odm->parentscene, &temi_l);
+			continue;
+		}
+		if (!strncmp(pname, "temi_t:", 7)) {
+			GF_BitStream *bs;
+			GF_AssociatedContentTiming temi_t;
+			memset(&temi_t, 0, sizeof(GF_AssociatedContentTiming));
+			temi_t.timeline_id = atoi(pname+7);
+			bs = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
+			temi_t.media_timescale = gf_bs_read_u32(bs);
+			temi_t.media_timestamp = gf_bs_read_u64(bs);
+			temi_t.media_pts = gf_bs_read_u64(bs);
+			temi_t.force_reload = gf_bs_read_int(bs, 1);
+			temi_t.is_paused = gf_bs_read_int(bs, 1);
+			temi_t.is_discontinuity = gf_bs_read_int(bs, 1);
+			temi_t.ntp = gf_bs_read_int(bs, 1);
+			gf_bs_read_int(bs, 4);
+			if (temi_t.ntp)
+				temi_t.ntp = gf_bs_read_u64(bs);
+
+			gf_bs_del(bs);
+
+			gf_scene_notify_associated_media_timeline(mo->odm->subscene ? mo->odm->subscene : mo->odm->parentscene, &temi_t);
+			continue;
+		}
+	}
+}
+
 GF_EXPORT
 u8 *gf_mo_fetch_data(GF_MediaObject *mo, GF_MOFetchMode resync, u32 upload_time_ms, Bool *eos, u32 *timestamp, u32 *size, s32 *ms_until_pres, s32 *ms_until_next, GF_FilterFrameInterface **outFrame, u32 *planar_size)
 {
@@ -421,7 +536,7 @@
 
 	/*if frame locked return it*/
 	if (mo->nb_fetch) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] ODM %d: CU already fetched, returning\n", mo->odm->ID));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d] ODM %d: CU already fetched, returning\n", mo->odm->ID));
 		mo->nb_fetch ++;
 		if (planar_size) *planar_size = mo->framesize / mo->num_channels;
 		return mo->frame;
@@ -433,9 +548,16 @@
 	}
 
 	if ( gf_odm_check_buffering(mo->odm, NULL) ) {
-		//if buffering, first frame fetched and still buffering return
-		if (mo->first_frame_fetched && mo->odm->nb_buffering)
+		//special flag set for tiles only, return NULL until we are done buffering
+		if (mo->odm->flags & GF_ODM_TILED_SHARED_CLOCK) {
+			return NULL;
+		}
+		if (mo->type==GF_MEDIA_OBJECT_AUDIO)
 			return NULL;
+		//if buffering, first frame fetched and still buffering return last frame
+		if (mo->first_frame_fetched && mo->odm->nb_buffering) {
+			return mo->frame_ifce ? (u8 *) mo->frame_ifce : mo->frame;
+		}
 	}
 
 retry:
@@ -458,18 +580,18 @@
 		} else {
 			gf_filter_pck_ref(&mo->pck);
 			gf_filter_pid_drop_packet(mo->odm->pid);
+			check_temi(mo);
 		}
 		is_first = GF_TRUE;
 	}
 	assert(mo->pck);
 	mo->first_frame_fetched = GF_TRUE;
-	mo->is_eos = GF_FALSE;
-
+	*eos = mo->is_eos = GF_FALSE;
 
 	/*not running and no resync (ie audio)*/
 	if (!gf_clock_is_started(mo->odm->ck)) {
 		if (!resync) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] ODM %d: CB not running, returning\n", mo->odm->ID));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d] ODM %d: CB not running, returning\n", mo->odm->ID));
 			return NULL;
 		} else if (mo->odm->ck->nb_buffering && mo->odm->type==GF_STREAM_AUDIO) {
 			return NULL;
@@ -505,11 +627,12 @@
 		} else {
 			if (gf_filter_pid_is_eos(mo->odm->pid)) {
 				if (!mo->is_eos) {
-					mo->is_eos = GF_TRUE;
-					*eos = mo->is_eos;
+					*eos = mo->is_eos = GF_TRUE;
 					mediasensor_update_timing(mo->odm, GF_TRUE);
 					gf_odm_on_eos(mo->odm, mo->odm->pid);
 					force_decode_mode=0;
+					if (!mo->pck)
+						goto retry;
 				}
 				break;
 			}
@@ -520,7 +643,7 @@
 		gf_filter_pid_try_pull(mo->odm->pid);
 	}
 	if (!retry_pull && (force_decode_mode==1)) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] At %d could not force a pull from pid - POTENTIAL blank frame after TS %u\n", mo->odm->ID, gf_clock_time(mo->odm->ck), mo->timestamp));
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d] At %d could not force a pull from pid - POTENTIAL blank frame after TS %u\n", mo->odm->ID, gf_clock_time(mo->odm->ck), mo->timestamp));
 	}
 
 	/*resync*/
@@ -543,11 +666,11 @@
 		if (ABS(diff_pck_old) > ABS(diff_pck_new)) {
 			//don't reset discontinuity flag for audio
 			if (resync>GF_MO_FETCH) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[ODM%d] end of clock discontinuity: diff pck TS to old clock %d to new clock %d\n", mo->odm->ID, diff_pck_old, diff_pck_new));
+				GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d] end of clock discontinuity: diff pck TS to old clock %d to new clock %d\n", mo->odm->ID, diff_pck_old, diff_pck_new));
 				mo->odm->prev_clock_at_discontinuity_plus_one = 0;
 			}
 		} else if (diff_old < diff_new) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[ODM%d] in clock discontinuity: time since fetch old clock %d new clock %d\n", mo->odm->ID, diff_old, diff_new));
+			GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d] in clock discontinuity: time since fetch old clock %d new clock %d\n", mo->odm->ID, diff_old, diff_new));
 
 			obj_time = old_timebase_time;
 		}
@@ -558,7 +681,7 @@
 	if ((mo->odm->ck->speed == FIX_ONE)
 		&& (mo->type==GF_MEDIA_OBJECT_VIDEO)
 		//if no buffer playout we are in low latency configuration, don"t skip resync
-		&& mo->odm->buffer_playout_us
+		&& mo->odm->buffer_playout_ms
 	) {
 		assert(mo->odm->parentscene);
 		if (! mo->odm->parentscene->compositor->drop) {
@@ -578,7 +701,7 @@
 			else if (next_ts + 300 >= obj_time) {
 				skip_resync = GF_TRUE;
 			} else if (next_ts) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[ODM%d] At %u frame TS %u next frame TS %d too late in no-drop mode, enabling drop - resync mode %d\n", mo->odm->ID, obj_time, pck_ts, next_ts, resync));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d] At %u frame TS %u next frame TS %d too late in no-drop mode, enabling drop - resync mode %d\n", mo->odm->ID, obj_time, pck_ts, next_ts, resync));
 				mo->flags |= GF_MO_IN_RESYNC;
 			}
 		}
@@ -597,7 +720,7 @@
 			//drop current and go to next - we use the same loop as regular resync below
 			resync = GF_MO_FETCH_RESYNC;
 			move_to_next_only = GF_TRUE;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] Switching to CU CTS %u (next %d) now %u\n", mo->odm->ID, pck_ts, next_ts, obj_time));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d] Switching to CU CTS %u (next %d) now %u\n", mo->odm->ID, pck_ts, next_ts, obj_time));
 		}
 	}
 	if (resync!=GF_MO_FETCH) {
@@ -607,7 +730,7 @@
 				if (mo->odm->ck->speed > 0 ? pck_ts >= obj_time : pck_ts <= obj_time )
 					break;
 
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] Try to drop frame TS %u next frame TS %u obj time %u\n", mo->odm->ID, pck_ts, next_ts, obj_time));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d] Try to drop frame TS %u next frame TS %u obj time %u\n", mo->odm->ID, pck_ts, next_ts, obj_time));
 
 				//nothing ready yet
 				if ( gf_filter_pid_first_packet_is_empty(mo->odm->pid) ) {
@@ -622,7 +745,7 @@
 
 				nb_dropped ++;
 				if (nb_dropped>=1) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %u dropped frame TS %u\n", mo->odm->ID, obj_time, pck_ts));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d] At OTB %u dropped frame TS %u\n", mo->odm->ID, obj_time, pck_ts));
 
 					mo->odm->nb_dropped++;
 				}
@@ -631,7 +754,9 @@
 			//delete our packet
 			gf_filter_pck_unref(mo->pck);
 			mo->pck = gf_filter_pid_get_packet(mo->odm->pid);
+			assert(mo->pck);
 			gf_filter_pck_ref( &mo->pck);
+			check_temi(mo);
 
 			pck_ts = convert_ts_to_ms(mo, gf_filter_pck_get_cts(mo->pck), timescale, &discard);
 			//drop next packet from pid
@@ -642,7 +767,7 @@
 				s32 diff_pck_new = (s32) pck_ts - (s32) obj_time_orig;
 
 				if (ABS(diff_pck_old) > ABS(diff_pck_new)) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[ODM%d] end of clock discontinuity, moving from old time base %d to new %d\n", mo->odm->ID, obj_time, obj_time_orig));
+					GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d] end of clock discontinuity, moving from old time base %d to new %d\n", mo->odm->ID, obj_time, obj_time_orig));
 					obj_time = obj_time_orig;
 					mo->odm->prev_clock_at_discontinuity_plus_one = 0;
 				}
@@ -661,15 +786,16 @@
 	mo->frame = (char *) gf_filter_pck_get_data(mo->pck, &mo->size);
 	mo->framesize = mo->size - mo->RenderedLength;
 
-	//planar mode, RenderedLength correspond to all channels, so move frame pointer
-	//to first sample non consumed = RenderedLength/nb_channels
-	if (mo->planar_audio) {
-		mo->frame += mo->RenderedLength / mo->num_channels;
-	} else {
-		mo->frame += mo->RenderedLength;
+	if (mo->type == GF_MEDIA_OBJECT_AUDIO) {
+		//planar mode, RenderedLength correspond to all channels, so move frame pointer
+		//to first sample non consumed = RenderedLength/nb_channels
+		if (mo->planar_audio) {
+			mo->frame += mo->RenderedLength / mo->num_channels;
+		} else {
+			mo->frame += mo->RenderedLength;
+		}
 	}
 	mo->frame_ifce = gf_filter_pck_get_frame_interface(mo->pck);
-//	mo->media_frame = CU->frame;
 
 	diff = (s32) ( (mo->speed >= 0) ? ( (s64) pck_ts - (s64) obj_time) : ( (s64) obj_time - (s64) pck_ts) );
 	mo->ms_until_pres = FIX2INT(diff * mo->speed);
@@ -720,7 +846,7 @@
 			mediasensor_update_timing(mo->odm, GF_FALSE);
 #endif
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d (%s)] At OTB %u fetch frame TS %u size %d (previous TS %u) - %d unit in CB - UTC "LLU" ms - %d ms until CTS is due - %d ms until next frame\n", mo->odm->ID, mo->odm->scene_ns->url, gf_clock_time(mo->odm->ck), pck_ts, mo->framesize, mo->timestamp, gf_filter_pid_get_packet_count(mo->odm->pid), gf_net_get_utc(), mo->ms_until_pres, mo->ms_until_next ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d (%s)] At OTB %u fetch frame TS %u size %d (previous TS %u) - %d unit in CB - UTC "LLU" ms - %d ms until CTS is due - %d ms until next frame\n", mo->odm->ID, mo->odm->scene_ns->url, gf_clock_time(mo->odm->ck), pck_ts, mo->framesize, mo->timestamp, gf_filter_pid_get_packet_count(mo->odm->pid), gf_net_get_utc(), mo->ms_until_pres, mo->ms_until_next ));
 
 		v = gf_filter_pck_get_property(mo->pck, GF_PROP_PCK_SENDER_NTP);
 		if (v) {
@@ -739,7 +865,7 @@
 				mo->odm->last_drawn_frame_ntp_diff -= v->value.sint;
 			}
 			gf_filter_release_property(pe);
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d (%s)] Frame TS %u NTP diff with sender %d ms\n", mo->odm->ID, mo->odm->scene_ns->url, pck_ts, mo->odm->last_drawn_frame_ntp_diff));
+			GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d (%s)] Frame TS %u NTP diff with sender %d ms\n", mo->odm->ID, mo->odm->scene_ns->url, pck_ts, mo->odm->last_drawn_frame_ntp_diff));
 
 			if (mo->odm->parentscene->compositor->ntpsync
 				&& (mo->odm->last_drawn_frame_ntp_diff > (s32) mo->odm->parentscene->compositor->ntpsync)
@@ -759,7 +885,7 @@
 		//already rendered the last frame, consider we no longer have pending late frame on this stream
 		mo->ms_until_pres = 0;
 	} else {
-//		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d (%s)] At OTB %u same frame fetch TS %u\n", mo->odm->ID, mo->odm->net_service->url, obj_time, CU->TS ));
+//		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d (%s)] At OTB %u same frame fetch TS %u\n", mo->odm->ID, mo->odm->net_service->url, obj_time, CU->TS ));
 
 		//if paused force a high value for next frame
 		if (!gf_clock_is_started(mo->odm->ck)) {
@@ -767,7 +893,7 @@
 		}
 	}
 
-	/*also adjust CU time based on consummed bytes in input, since some codecs output very large audio chunks*/
+	/*also adjust CU time based on consumed bytes in input, since some codecs output very large audio chunks*/
 	if (mo->bytes_per_sec) mo->timestamp += mo->RenderedLength * 1000 / mo->bytes_per_sec;
 
 	if (mo->odm->parentscene->compositor->bench_mode) {
@@ -785,12 +911,13 @@
 	if (ms_until_pres) *ms_until_pres = mo->ms_until_pres;
 	if (ms_until_next) *ms_until_next = mo->ms_until_next;
 	if (outFrame) *outFrame = mo->frame_ifce;
-	if (planar_size) *planar_size = mo->framesize / mo->num_channels;
+	//planar size is computed based on original size, not framesize (= size - renderedLength)
+	if (planar_size) *planar_size = mo->size / mo->num_channels;
 
 //	gf_odm_service_media_event(mo->odm, GF_EVENT_MEDIA_TIME_UPDATE);
 
 	if (mo->frame_ifce)
-		return (char *) mo->frame_ifce;
+		return (u8 *) mo->frame_ifce;
 
 	return mo->frame;
 }
@@ -837,7 +964,7 @@
 		if (drop_mode) {
 			gf_filter_pck_unref(mo->pck);
 			mo->pck = NULL;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %u released frame TS %u\n", mo->odm->ID,gf_clock_time(mo->odm->ck), mo->timestamp));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d] At OTB %u released frame TS %u\n", mo->odm->ID,gf_clock_time(mo->odm->ck), mo->timestamp));
 		} else {
 			/*we cannot drop since we don't know the speed of the playback (which can even be frame by frame)*/
 		}
@@ -874,7 +1001,7 @@
 				return;
 			}
 		}
-		if (mo->odm->flags & GF_ODM_NO_TIME_CTRL) {
+		if ( (mo->odm->flags & GF_ODM_NO_TIME_CTRL) || (clipBegin<0) ) {
 			mo->odm->media_start_time = 0;
 		} else {
 			mo->odm->media_start_time = (u64) (clipBegin*1000);
@@ -922,6 +1049,11 @@
 			return;
 		}
 
+		if (mo->pck) {
+			gf_filter_pck_unref(mo->pck);
+			mo->pck = NULL;
+		}
+
 		/*signal STOP request*/
 		if ((mo->OD_ID==GF_MEDIA_EXTERNAL_ID) || (mo->odm && mo->odm->ID && (mo->odm->ID==GF_MEDIA_EXTERNAL_ID))) {
 			gf_odm_disconnect(mo->odm, 2);
@@ -953,6 +1085,10 @@
 		}
 	}
 	/*all other cases, call restart to take into account clock references*/
+	mo->first_frame_fetched = GF_FALSE;
+	mo->is_eos = GF_FALSE;
+	mo->ms_until_next = 0;
+	mo->ms_until_pres = 0;
 	mediacontrol_restart(mo->odm);
 }
 
@@ -987,7 +1123,7 @@
 				j++;
 			}
 			j = sscanf(s_url, "%u", &tmpid);
-			/*be carefull, an url like "11-regression-test.mp4" will return 1 on sscanf :)*/
+			/*be careful, an url like "11-regression-test.mp4" will return 1 on sscanf :)*/
 			if (j==1) {
 				char szURL[20];
 				sprintf(szURL, "%u", tmpid);
@@ -1061,14 +1197,14 @@
 			}
 
 			scene = gf_scene_get_root_scene(obj->odm->parentscene ? obj->odm->parentscene : obj->odm->subscene);
-			while ( (sns = (GF_SceneNamespace*) gf_list_enum(scene->namespaces, &j) ) ) {
-				/*sub-service of an existing service - don't touch any fragment*/
-#ifdef FILTER_FIXME
-				if (gf_term_service_can_handle_url(sns, an_url->vals[i].url)) {
-					*keep_fragment = GF_TRUE;
-					return GF_FALSE;
+			if (scene->root_od->scene_ns && scene->root_od->scene_ns->url) {
+				while ( (sns = (GF_SceneNamespace*) gf_list_enum(scene->namespaces, &j) ) ) {
+					/*sub-service of an existing service - don't touch any fragment*/
+					if (gf_filter_is_supported_source(scene->compositor->filter, an_url->vals[i].url, scene->root_od->scene_ns->url)) {
+						*keep_fragment = GF_TRUE;
+						return GF_FALSE;
+					}
 				}
-#endif
 			}
 		}
 	}
@@ -1335,9 +1471,7 @@
 GF_EXPORT
 u32 gf_mo_has_audio(GF_MediaObject *mo)
 {
-#ifdef FILTER_FIXME
 	char *sub_url;
-#endif
 	u32 i;
 	GF_SceneNamespace *ns;
 	GF_Scene *scene;
@@ -1347,22 +1481,19 @@
 
 	ns = mo->odm->scene_ns;
 	scene = mo->odm->parentscene;
-#ifdef FILTER_FIXME
 	sub_url = strchr(ns->url, '#');
-#endif
+
 	for (i=0; i<gf_list_count(scene->resources); i++) {
 		GF_ObjectManager *odm = (GF_ObjectManager *)gf_list_get(scene->resources, i);
 		if (odm->scene_ns != ns) continue;
 		//object already associated
 		if (odm->mo) continue;
 
-#ifdef FILTER_FIXME
 		if (sub_url) {
 			char *ext = mo->URLs.count ? mo->URLs.vals[0].url : NULL;
 			if (ext) ext = strchr(ext, '#');
 			if (!ext || strcmp(sub_url, ext)) continue;
 		}
-#endif
 		/*we have one audio object not bound with the scene from the same service, let's use it*/
 		if (odm->type == GF_STREAM_AUDIO) return 1;
 	}

gpac-1.0.1.tar.gz/src/compositor/mesh.c -> gpac-2.0.0.tar.gz/src/compositor/mesh.c Changed

@@ -35,7 +35,7 @@
 /*for GPAC_HAS_GLU and glDeleteBuffersARB */
 #include "gl_inc.h"
 
-/*when highspeeds, amount of subdivisions for bezier and ellipse will be devided by this factor*/
+/*when highspeeds, amount of subdivisions for bezier and ellipse will be divided by this factor*/
 #define HIGH_SPEED_RATIO	2
 
 
@@ -708,24 +708,70 @@
 	if (radius != FIX_ONE) gf_mesh_build_aabbtree(mesh);
 }
 
-void mesh_new_rectangle(GF_Mesh *mesh, SFVec2f size, SFVec2f *orig, Bool flip)
+void mesh_new_rectangle_ex(GF_Mesh *mesh, SFVec2f size, SFVec2f *orig, u32 flip, u32 rotate)
 {
-	Fixed tmin, tmax;
 	Fixed x = - size.x / 2;
 	Fixed y = size.y / 2;
+	u32 i;
+	Bool flip_h = GF_FALSE;
+	Bool flip_v = GF_FALSE;
+
+	Fixed textureCoords[] = {
+		0, 0,
+		FIX_ONE, 0,
+		FIX_ONE, FIX_ONE,
+		0, FIX_ONE
+	};
+
 	if (orig) {
 		x = orig->x;
 		y = orig->y;
 	}
 	mesh_reset(mesh);
 
-	tmin = flip ? FIX_ONE : 0;
-	tmax = flip ? 0 : FIX_ONE;
+	switch (flip) {
+	case 2:
+		flip_v = GF_TRUE;
+		break;
+	case 1:
+		flip_h = GF_TRUE;
+		break;
+	case 3:
+		flip_v = GF_TRUE;
+		flip_h = GF_TRUE;
+		break;
+	}
+
+	if (flip_h) {
+		Fixed v = textureCoords[0];
+		textureCoords[0] = textureCoords[2] = textureCoords[4];
+		textureCoords[4] = textureCoords[6] = v;
+	}
+	if (flip_v) {
+		Fixed v = textureCoords[1];
+		textureCoords[1] = textureCoords[3] = textureCoords[5];
+		textureCoords[5] = textureCoords[7] = v;
+	}
+
+	for (i=0; i < rotate; i++) {
+		Fixed vx = textureCoords[4];
+		Fixed vy = textureCoords[5];
+
+		textureCoords[4] = textureCoords[2];
+		textureCoords[5] = textureCoords[3];
+		textureCoords[2] = textureCoords[0];
+		textureCoords[3] = textureCoords[1];
+		textureCoords[0] = textureCoords[6];
+		textureCoords[1] = textureCoords[7];
+		textureCoords[6] = vx;
+		textureCoords[7] = vy;
+	}
+
 
-	mesh_set_vertex(mesh, x, y-size.y, 0, 0, 0, FIX_ONE, 0, tmin);
-	mesh_set_vertex(mesh, x+size.x, y-size.y, 0, 0, 0, FIX_ONE, FIX_ONE, tmin);
-	mesh_set_vertex(mesh, x+size.x, y, 0, 0, 0, FIX_ONE, FIX_ONE, tmax);
-	mesh_set_vertex(mesh, x, y, 0, 0, 0, FIX_ONE, 0, tmax);
+	mesh_set_vertex(mesh, x, y-size.y, 0, 0, 0, FIX_ONE, textureCoords[0], textureCoords[1]);
+	mesh_set_vertex(mesh, x+size.x, y-size.y, 0, 0, 0, FIX_ONE, textureCoords[2], textureCoords[3]);
+	mesh_set_vertex(mesh, x+size.x, y, 0, 0, 0, FIX_ONE, textureCoords[4], textureCoords[5]);
+	mesh_set_vertex(mesh, x, y, 0, 0, 0, FIX_ONE, textureCoords[6], textureCoords[7]);
 
 	mesh_set_triangle(mesh, 0, 1, 2);
 	mesh_set_triangle(mesh, 0, 2, 3);
@@ -741,6 +787,11 @@
 	gf_bbox_refresh(&mesh->bounds);
 }
 
+void mesh_new_rectangle(GF_Mesh *mesh, SFVec2f size, SFVec2f *orig, Bool flip)
+{
+	mesh_new_rectangle_ex(mesh, size, orig, flip ? 2 : 0, 0);
+
+}
 #define ELLIPSE_SUBDIV		32
 void mesh_new_ellipse(GF_Mesh *mesh, Fixed a_dia, Fixed b_dia, Bool low_res)
 {

gpac-1.0.1.tar.gz/src/compositor/mpeg4_audio.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_audio.c Changed

@@ -46,6 +46,7 @@
 static void audioclip_deactivate(AudioClipStack *st, M_AudioClip *ac)
 {
 	gf_sc_audio_stop(&st->input);
+	gf_sc_audio_unregister(&st->input);
 	ac->isActive = 0;
 	gf_node_event_out((GF_Node *)ac, 7/*"isActive"*/);
 
@@ -368,7 +369,7 @@
 
 	if (update_mixer) {
 		gf_mixer_remove_all(st->am);
-		gf_mixer_force_chanel_out(st->am, ab->numChan);
+		gf_mixer_force_channel_out(st->am, ab->numChan);
 	}
 
 	while (gf_list_count(st->new_inputs)) {
@@ -380,7 +381,7 @@
 	gf_mixer_lock(st->am, GF_FALSE);
 	tr_state->audio_parent = parent;
 
-	/*Note the audio buffer is ALWAYS registered untill destroyed since buffer filling shall happen even when inactive*/
+	/*Note the audio buffer is ALWAYS registered until destroyed since buffer filling shall happen even when inactive*/
 	if (!st->output.register_with_parent || !st->output.register_with_renderer)
 		gf_sc_audio_register(&st->output, tr_state);
 
@@ -536,6 +537,7 @@
 			aifc->afmt = GF_AUDIO_FMT_U8;
 			break;
 		case GF_AUDIO_FMT_S16P:
+		case GF_AUDIO_FMT_S16_BE:
 			aifc->afmt = GF_AUDIO_FMT_S16;
 			break;
 		case GF_AUDIO_FMT_S24P:

gpac-1.0.1.tar.gz/src/compositor/mpeg4_background.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_background.c Changed

gpac-1.0.1.tar.gz/src/compositor/mpeg4_bitmap.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_bitmap.c Changed

@@ -33,7 +33,7 @@
 
 typedef struct _bitmap_stack
 {
-	Drawable *graph;
+	Drawable s_graph;
 	/*cached size for 3D mode*/
 	SFVec2f size, scale;
 	u32 prev_tx_w, prev_tx_h;
@@ -46,6 +46,7 @@
 {
 	GF_TextureHandler *txh;
 	Fixed sx, sy;
+	u32 w, h;
 	SFVec2f size;
 
 	M_Bitmap *bmp = (M_Bitmap *)node;
@@ -62,15 +63,28 @@
 		if (notify_changes) gf_node_dirty_set(node, 0, 1);
 		return;
 	}
+
+	w = txh->width;
+	h = txh->height;
+	if (txh->stream && txh->stream->c_w && txh->stream->c_h) {
+		w = (u32) txh->stream->c_w;
+		h = (u32) txh->stream->c_h;
+	}
+	if (txh->stream && ((txh->stream->rotate==1) || (txh->stream->rotate==3))) {
+		u32 t = w;
+		w = h;
+		h = t;
+	}
+
 	/*no change in scale and same texture size*/
-	if ((st->scale.x==bmp->scale.x) && (st->scale.y==bmp->scale.y) && (st->prev_tx_w == txh->width) && (st->prev_tx_h == txh->height)) {
+	if ((st->scale.x==bmp->scale.x) && (st->scale.y==bmp->scale.y) && (st->prev_tx_w == w) && (st->prev_tx_h == h)) {
 		*out_rc = st->rc;
 		gf_node_dirty_clear(node, 0);
 		return;
 	}
 
-	st->prev_tx_w = txh->width;
-	st->prev_tx_h = txh->height;
+	st->prev_tx_w = w;
+	st->prev_tx_h = h;
 
 	sx = bmp->scale.x;
 	if (sx<0) sx = FIX_ONE;
@@ -81,13 +95,13 @@
 	compositor_adjust_scale(txh->owner, &sx, &sy);
 
 	/*check size change*/
-	size.x = gf_mulfix(INT2FIX(txh->width),sx);
-	size.y = gf_mulfix(INT2FIX(txh->height),sy);
+	size.x = gf_mulfix(INT2FIX(w),sx);
+	size.y = gf_mulfix(INT2FIX(h),sy);
 	/*if we have a PAR update it!!*/
 	if (txh->pixel_ar) {
 		u32 n = (txh->pixel_ar>>16) & 0xFFFF;
 		u32 d = (txh->pixel_ar) & 0xFFFF;
-		size.x = gf_mulfix(INT2FIX( (txh->width * n) / d),sx);
+		size.x = gf_mulfix(INT2FIX( (w * n) / d),sx);
 	}
 
 
@@ -107,8 +121,8 @@
 	if (notify_changes) gf_node_dirty_set(node, 0, 1);
 
 	/*get size with scale*/
-	drawable_reset_path(st->graph);
-	gf_path_add_rect_center(st->graph->path, 0, 0, st->size.x, st->size.y);
+	drawable_reset_path(&st->s_graph);
+	gf_path_add_rect_center(st->s_graph.path, 0, 0, st->size.x, st->size.y);
 }
 
 #ifndef GPAC_DISABLE_3D
@@ -144,7 +158,7 @@
 		}
 	}
 
-	compositor_3d_draw_bitmap(st->graph, &asp, tr_state, st->size.x, st->size.y, bmp->scale.x, bmp->scale.y);
+	compositor_3d_draw_bitmap(&st->s_graph, &asp, tr_state, st->size.x, st->size.y, bmp->scale.x, bmp->scale.y);
 
 	tr_state->col_key = NULL;
 }
@@ -186,12 +200,12 @@
 		gf_mx2d_inverse(&_mat);
 		gf_mx2d_apply_rect(&_mat, &rc);
 		if ((st->unclip_rc.width != rc.width) || (st->unclip_rc.height != rc.height)) {
-			drawable_reset_path(st->graph);
-			gf_path_add_rect_center(st->graph->path, 0, 0, rc.width, rc.height);
+			drawable_reset_path(&st->s_graph);
+			gf_path_add_rect_center(st->s_graph.path, 0, 0, rc.width, rc.height);
 			st->unclip_rc = rc;
 		}
 		ctx->flags |= CTX_NO_ANTIALIAS;
-		visual_2d_texture_path(tr_state->visual, st->graph->path, ctx, tr_state);
+		visual_2d_texture_path(tr_state->visual, st->s_graph.path, ctx, tr_state);
 	}
 	tr_state->col_key = NULL;
 }
@@ -205,11 +219,11 @@
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
 
 	if (is_destroy) {
-		drawable_del(st->graph);
+		drawable_del_ex(&st->s_graph, gf_sc_get_compositor(node), GF_TRUE);
 		gf_free(st);
 		return;
 	}
-	if (! rectangle_check_adaptation(node, st->graph, tr_state))
+	if (! rectangle_check_adaptation(node, &st->s_graph, tr_state))
 		return;
 
 	switch (tr_state->traversing_mode) {
@@ -223,7 +237,7 @@
 #endif
 	case TRAVERSE_PICK:
 		//drawable_pick(st->graph, tr_state);
-		vrml_drawable_pick(st->graph, tr_state);
+		vrml_drawable_pick(&st->s_graph, tr_state);
 		return;
 	case TRAVERSE_GET_BOUNDS:
 		Bitmap_BuildGraph(node, st, tr_state, &tr_state->bounds,
@@ -248,7 +262,7 @@
 	Bitmap_BuildGraph(node, st, tr_state, &rc, 1);
 	if (!rc.width || !rc.height) return;
 
-	ctx = drawable_init_context_mpeg4(st->graph, tr_state);
+	ctx = drawable_init_context_mpeg4(&st->s_graph, tr_state);
 	if (!ctx || !ctx->aspect.fill_texture ) {
 		visual_2d_remove_last_context(tr_state->visual);
 		return;
@@ -298,9 +312,9 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate bitmap stack\n"));
 		return;
 	}
-	st->graph = drawable_new();
-	st->graph->node = node;
-	st->graph->flags = DRAWABLE_USE_TRAVERSE_DRAW;
+	drawable_init_ex(&st->s_graph);
+	st->s_graph.node = node;
+	st->s_graph.flags = DRAWABLE_USE_TRAVERSE_DRAW;
 	gf_node_set_private(node, st);
 	gf_node_set_callback_function(node, TraverseBitmap);
 }

gpac-1.0.1.tar.gz/src/compositor/mpeg4_composite.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_composite.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -88,6 +88,7 @@
 	st = (CompositeTextureStack *) gf_node_get_private(visual->offscreen);
 
 	if (!compositor_texture_rectangles(visual, ctx->aspect.fill_texture, &ctx->bi->clip, &ctx->bi->unclip, &src_wnd, &dst_wnd, &use_blit, &has_scale)) return 1;
+	if (! ctx->aspect.fill_texture->data) return 0;
 
 	memset(&video_src, 0, sizeof(GF_VideoSurface));
 	video_src.height = ctx->aspect.fill_texture->height;
@@ -433,7 +434,7 @@
 					&& ((compositor->offscreen_width < st->txh.width) || (compositor->offscreen_height < st->txh.height))
 				) {
 
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Offscreen OpenGL is not possible if no openGL context is created - use hybridGL mode for compositor\n"));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Offscreen OpenGL is not possible if no OpenGL context is created - use hybridGL mode for compositor\n"));
 					st->unsupported = GF_TRUE;
 				}
 			} else {
@@ -503,6 +504,9 @@
 	memset(st->tr_state, 0, sizeof(GF_TraverseState));
 	st->tr_state->vrml_sensors = sensor_bck;
 	st->tr_state->visual = st->visual;
+#ifndef GPAC_DISABLE_3D
+	st->tr_state->camera = &st->visual->camera;
+#endif
 	st->tr_state->invalidate_all = invalidate_all;
 
 	st->tr_state->immediate_draw = st->visual->compositor->traverse_state->immediate_draw;

gpac-1.0.1.tar.gz/src/compositor/mpeg4_geometry_2d.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_geometry_2d.c Changed

gpac-1.0.1.tar.gz/src/compositor/mpeg4_geometry_ils2d.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_geometry_ils2d.c Changed

gpac-1.0.1.tar.gz/src/compositor/mpeg4_gradients.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_gradients.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -149,7 +149,7 @@
 	/*translate to the center of the bounds*/
 	gf_mx2d_add_translation(mat, gf_divfix(bounds->x, bounds->width), gf_divfix(bounds->y - bounds->height, bounds->height));
 	/*scale back to object coordinates - the gradient is still specified in texture coordinates
-	i order to avoid overflows in fixed point*/
+	in order to avoid overflows in fixed point*/
 	gf_mx2d_add_scale(mat, bounds->width, bounds->height);
 
 	gf_evg_stencil_set_linear_gradient(stencil, lg->startPoint.x, lg->startPoint.y, lg->endPoint.x, lg->endPoint.y);
@@ -291,6 +291,7 @@
 	/*back to GL bottom->up order*/
 	gf_mx2d_add_scale(&mat, FIX_ONE, -FIX_ONE);
 	gf_evg_stencil_set_matrix(stenc, &mat);
+	gf_evg_stencil_set_auto_matrix(stenc, GF_FALSE);
 
 	gf_evg_surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
 	gf_evg_surface_set_path(surface, path);
@@ -491,6 +492,7 @@
 	/*back to GL bottom->up order*/
 	gf_mx2d_add_scale(&mat, FIX_ONE, -FIX_ONE);
 	gf_evg_stencil_set_matrix(stenc, &mat);
+	gf_evg_stencil_set_auto_matrix(stenc, GF_FALSE);
 
 	gf_evg_surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
 	gf_evg_surface_set_path(surface, path);
@@ -598,10 +600,11 @@
 	GradientGetMatrix((GF_Node *) rg->transform, mat);
 
 	gf_evg_stencil_set_radial_gradient(stencil, rg->center.x, rg->center.y, rg->focalPoint.x, rg->focalPoint.y, rg->radius, rg->radius);
+
 	/*move to center of bounds*/
 	gf_mx2d_add_translation(mat, gf_divfix(bounds->x, bounds->width), gf_divfix(bounds->y - bounds->height, bounds->height));
 	/*scale back to object coordinates - the gradient is still specified in texture coordinates
-	i order to avoid overflows in fixed point*/
+	in order to avoid overflows in fixed point*/
 	gf_mx2d_add_scale(mat, bounds->width, bounds->height);
 }

gpac-1.0.1.tar.gz/src/compositor/mpeg4_inline.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_inline.c Changed

@@ -58,8 +58,12 @@
 	parent = (GF_Scene *)gf_sg_get_private(graph);
 	if (!parent) return GF_FALSE;
 
-	mo = gf_scene_get_media_object_ex(parent, &root->url, GF_MEDIA_OBJECT_SCENE, GF_FALSE, NULL, GF_FALSE, (GF_Node*)root);
+	mo = gf_scene_get_media_object_ex(parent, &root->url, GF_MEDIA_OBJECT_SCENE, GF_FALSE, NULL, GF_FALSE, (GF_Node*)root, NULL);
 	if (!mo) return GF_FALSE;
+	if (mo->connect_state > MO_CONNECT_BUFFERING) {
+		gf_sg_vrml_mf_reset(&root->url, GF_SG_VRML_MFURL);
+		return GF_FALSE;
+	}
 	//invalidate as soon as we have an mo (eg something is attached to the scene)
 	gf_sc_invalidate(parent->compositor, NULL);
 
@@ -267,7 +271,7 @@
 				/*this is unspecified in the spec: whenever an inline not using the
 				OD framework is destroyed, destroy the associated resource*/
 				if (mo->OD_ID == GF_MEDIA_EXTERNAL_ID) {
-					/*get parent scene and remove MediaObject in case the ressource
+					/*get parent scene and remove MediaObject in case the resource
 					gets re-requested later on*/
 					GF_Scene *parent_scene = (GF_Scene *)gf_sg_get_private(gf_node_get_graph((GF_Node *) n) );
 					if (gf_list_del_item(parent_scene->scene_objects, mo)>=0) {
@@ -292,6 +296,9 @@
 	//if no private scene is associated	get the node parent graph, retrieve the IS and find the OD
 	if (!scene) {
 		M_Inline *inl = (M_Inline *)n;
+		if (!inl->url.count)
+			return;
+
 		gf_inline_set_scene(inl);
 		scene = (GF_Scene *)gf_node_get_private(n);
 		if (!scene) {
@@ -309,11 +316,14 @@
 
 	/*if not attached return (attaching the graph cannot be done in render since render is not called while unattached :) */
 	if (!scene->graph_attached) {
-		/*just like protos, we must invalidate parent graph until attached*/
-		gf_node_dirty_set(n, 0, GF_TRUE);
-		//and request bew anim frame until attached
-		if (scene->object_attached)
-			gf_sc_invalidate(scene->compositor, NULL);
+		M_Inline *inl = (M_Inline *)n;
+		if (inl->url.count) {
+			/*just like protos, we must invalidate parent graph until attached*/
+			gf_node_dirty_set(n, 0, GF_TRUE);
+			//and request bew anim frame until attached
+			if (scene->object_attached)
+				gf_sc_invalidate(scene->compositor, NULL);
+		}
 		return;
 	}
 	/*clear dirty flags for any sub-inlines, bitmaps or protos*/
@@ -433,7 +443,7 @@
 
 	if (!lib_url || !lib_url->count) return NULL;
 
-	/*internal, don't waste ressources*/
+	/*internal, don't waste resources*/
 	if (gf_inline_is_hardcoded_proto(scene->compositor, lib_url)) return NULL;
 
 	i=0;
@@ -454,7 +464,6 @@
 }
 
 
-GF_EXPORT
 Bool gf_inline_is_default_viewpoint(GF_Node *node)
 {
 	const char *nname, *seg_name;

gpac-1.0.1.tar.gz/src/compositor/mpeg4_inputsensor.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_inputsensor.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -356,13 +356,14 @@
 		field1->eventType = field2->eventType = 0;
 		is_ctx->enteredText[is_ctx->text_len] = (short) '\0';
 
-		len = (u32) gf_utf8_wcslen(is_ctx->enteredText);
+		len = gf_utf8_wcslen(is_ctx->enteredText);
 		if (len && (is_ctx->enteredText[len-1] == is_ctx->termChar)) {
 			ptr = is_ctx->enteredText;
-			len = (u32) gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
+			len = gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
+			if (len == GF_UTF8_FAIL) len = 1;
 			if (outText->buffer) gf_free(outText->buffer);
 			outText->buffer = (char*)gf_malloc(sizeof(char) * (len));
-			memcpy(outText->buffer, tmp_utf8, sizeof(char) * len-1);
+			memcpy(outText->buffer, tmp_utf8, sizeof(char) * (len-1) );
 			outText->buffer[len-1] = 0;
 			if (inText->buffer) gf_free(inText->buffer);
 			inText->buffer = NULL;
@@ -381,7 +382,8 @@
 			}
 			is_ctx->text_len = len;
 			ptr = is_ctx->enteredText;
-			len = (u32) gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
+			len = gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
+			if (len == GF_UTF8_FAIL) len = 0;
 			if (inText->buffer) gf_free(inText->buffer);
 			inText->buffer = (char*)gf_malloc(sizeof(char) * (len+1));
 			memcpy(inText->buffer, tmp_utf8, sizeof(char) * len);
@@ -508,7 +510,7 @@
 	ISStack *stack;
 	GF_SAFEALLOC(stack, ISStack);
 	if (!stack) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Terminal] Failed to allocate input sensor stack\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Compositor] Failed to allocate input sensor stack\n"));
 		return;
 	}
 	stack->is = (M_InputSensor *) node;
@@ -793,7 +795,8 @@
 			tc[0] = keyPressed;
 			tc[1] = 0;
 			ptr = tc;
-			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
+			len = gf_utf8_wcstombs(szStr, 10, &ptr);
+			if (len == GF_UTF8_FAIL) len = 0;
 			n->keyPress.buffer = (char*)gf_malloc(sizeof(char) * (len+1));
 			memcpy(n->keyPress.buffer, szStr, sizeof(char) * len);
 			n->keyPress.buffer[len] = 0;
@@ -804,7 +807,8 @@
 			tc[0] = keyReleased;
 			tc[1] = 0;
 			ptr = tc;
-			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
+			len = gf_utf8_wcstombs(szStr, 10, &ptr);
+			if (len == GF_UTF8_FAIL) len = 0;
 			n->keyRelease.buffer = (char*)gf_malloc(sizeof(char) * (len+1));
 			memcpy(n->keyRelease.buffer, szStr, sizeof(char) * len);
 			n->keyRelease.buffer[len] = 0;
@@ -900,7 +904,8 @@
 				st->text_len -= 1;
 				st->enteredText[st->text_len] = 0;
 				ptr = st->enteredText;
-				len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
+				len = gf_utf8_wcstombs(szStr, 10, &ptr);
+				if (len == GF_UTF8_FAIL) len = 0;
 				if (n->enteredText.buffer) gf_free(n->enteredText.buffer);
 				szStr[len] = 0;
 				n->enteredText.buffer = gf_strdup(szStr);
@@ -918,7 +923,8 @@
 			st->text_len += 1;
 			st->enteredText[st->text_len] = 0;
 			ptr = st->enteredText;
-			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
+			len = gf_utf8_wcstombs(szStr, 10, &ptr);
+			if (len == GF_UTF8_FAIL) len = 0;
 			if (n->enteredText.buffer) gf_free(n->enteredText.buffer);
 			szStr[len] = 0;
 			n->enteredText.buffer = gf_strdup(szStr);
@@ -960,7 +966,7 @@
 	StringSensorStack*st;
 	GF_SAFEALLOC(st, StringSensorStack)
 	if (!st) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Terminal] Failed to allocate string sensor stack\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Compositor] Failed to allocate string sensor stack\n"));
 		return;
 	}
 	st->compositor = scene->compositor;

gpac-1.0.1.tar.gz/src/compositor/mpeg4_layer_2d.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_layer_2d.c Changed

gpac-1.0.1.tar.gz/src/compositor/mpeg4_mediacontrol.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_mediacontrol.c Changed

@@ -1,10 +1,8 @@
-
-
 /*
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -412,6 +410,12 @@
 			stack->changed = 0;
 			return;
 		}
+		if (stack->stream->connect_state > MO_CONNECT_BUFFERING) {
+			gf_sg_vrml_mf_reset(&stack->control->url, GF_SG_VRML_MFURL);
+			stack->enabled = GF_FALSE;
+			stack->stream = NULL;
+			return;
+		}
 		stack->ck = gf_odm_get_media_clock(stack->stream->odm);
 		/*OD not ready yet*/
 		if (!stack->ck) {
@@ -430,7 +434,7 @@
 		stack->current_seg = 0;
 
 		/*we shouldn't have to restart unless start/stop times have been changed, which is tested below*/
-		need_restart = 0;
+		need_restart = (stack->stream->odm->state==GF_ODM_STATE_PLAY) ? 1 : 0;
 	}
 
 	if ((stack->is_init && !stack->changed) || !stack->control->enabled || !stack->stream) return;
@@ -438,8 +442,10 @@
 
 	/*if not previously enabled and now enabled, switch all other controls off and reactivate*/
 	if (!stack->enabled) {
+		Bool restart;
 		stack->enabled = 1;
-		need_restart = gf_odm_switch_mediacontrol(stack->stream->odm, stack);
+		restart = gf_odm_switch_mediacontrol(stack->stream->odm, stack);
+		if (restart) need_restart = 1;
 	}
 
 	stack->changed = 0;
@@ -522,7 +528,7 @@
 	MediaControlStack *stack;
 	GF_SAFEALLOC(stack, MediaControlStack);
 	if (!stack) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Terminal] Failed to allocate media control stack\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Compositor] Failed to allocate media control stack\n"));
 		return;
 	}
 	stack->changed = 1;

gpac-1.0.1.tar.gz/src/compositor/mpeg4_mediasensor.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_mediasensor.c Changed

gpac-1.0.1.tar.gz/src/compositor/mpeg4_text.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_text.c Changed

@@ -50,7 +50,7 @@
 /*exported to access the strike list ...*/
 typedef struct
 {
-	Drawable *graph;
+	struct _drawable s_graph;
 	Fixed ascent, descent;
 	GF_List *spans;
 	GF_Rect bounds;
@@ -68,7 +68,7 @@
 		gf_font_manager_delete_span(compositor->font_manager, span);
 	}
 	stack->bounds.width = stack->bounds.height = 0;
-	drawable_reset_path(stack->graph);
+	drawable_reset_path(&stack->s_graph);
 }
 
 
@@ -93,6 +93,7 @@
 		if (strstr(fs->style.buffer, "BOLD") || strstr(fs->style.buffer, "bold")) styles |= GF_FONT_WEIGHT_BOLD;
 		if (strstr(fs->style.buffer, "ITALIC") || strstr(fs->style.buffer, "italic")) styles |= GF_FONT_ITALIC;
 		if (strstr(fs->style.buffer, "UNDERLINED") || strstr(fs->style.buffer, "underlined")) styles |= GF_FONT_UNDERLINED;
+		if (strstr(fs->style.buffer, "STRIKETHROUGH") || strstr(fs->style.buffer, "strikethrough")) styles |= GF_FONT_STRIKEOUT;
 	}
 
 	font = gf_font_manager_set_font(ft_mgr, fs ? fs->family.vals : NULL, fs ? fs->family.count : 0, styles);
@@ -226,6 +227,7 @@
 		if (strstr(fs->style.buffer, "BOLD") || strstr(fs->style.buffer, "bold")) styles |= GF_FONT_WEIGHT_BOLD;
 		if (strstr(fs->style.buffer, "ITALIC") || strstr(fs->style.buffer, "italic")) styles |= GF_FONT_ITALIC;
 		if (strstr(fs->style.buffer, "UNDERLINED") || strstr(fs->style.buffer, "underlined")) styles |= GF_FONT_UNDERLINED;
+		if (strstr(fs->style.buffer, "STRIKETHROUGH") || strstr(fs->style.buffer, "strikethrough")) styles |= GF_FONT_STRIKEOUT;
 	}
 
 	font = gf_font_manager_set_font(ft_mgr, fs ? fs->family.vals : NULL, fs ? fs->family.count : 0, styles);
@@ -241,11 +243,13 @@
 
 	if (maxExtent<0) {
 		trim_tspan = gf_font_manager_create_span(ft_mgr, font, "...", fontSize, GF_FALSE, GF_FALSE, GF_FALSE, NULL, GF_FALSE, styles, (GF_Node*)txt);
-		for (i=0; i<trim_tspan->nb_glyphs; i++) {
-			if (horizontal) {
-				trim_size += trim_tspan->glyphs[i] ? trim_tspan->glyphs[i]->horiz_advance : trim_tspan->font->max_advance_h;
-			} else {
-				trim_size += trim_tspan->glyphs[i] ? trim_tspan->glyphs[i]->vert_advance : trim_tspan->font->max_advance_v;
+		if (trim_tspan) {
+			for (i=0; i<trim_tspan->nb_glyphs; i++) {
+				if (horizontal) {
+					trim_size += trim_tspan->glyphs[i] ? trim_tspan->glyphs[i]->horiz_advance : trim_tspan->font->max_advance_h;
+				} else {
+					trim_size += trim_tspan->glyphs[i] ? trim_tspan->glyphs[i]->vert_advance : trim_tspan->font->max_advance_v;
+				}
 			}
 		}
 	}
@@ -565,11 +569,11 @@
 		text_clean_paths(tr_state->visual->compositor, stack);
 		build_text(stack, (M_Text*)node, tr_state);
 		gf_node_dirty_clear(node, 0);
-		drawable_mark_modified(stack->graph, tr_state);
+		drawable_mark_modified(&stack->s_graph, tr_state);
 	}
 
 	if (tr_state->visual->compositor->edited_text && (tr_state->visual->compositor->focus_node==node)) {
-		drawable_mark_modified(stack->graph, tr_state);
+		drawable_mark_modified(&stack->s_graph, tr_state);
 		tr_state->visual->has_text_edit = GF_TRUE;
 		if (!stack->bounds.width) stack->bounds.width = INT2FIX(1)/100;
 		if (!stack->bounds.height) stack->bounds.height = INT2FIX(1)/100;
@@ -585,8 +589,9 @@
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
 
 	if (is_destroy) {
-		text_clean_paths(gf_sc_get_compositor(n), st);
-		drawable_del(st->graph);
+		GF_Compositor *compositor = gf_sc_get_compositor(n);
+		text_clean_paths(compositor, st);
+		drawable_del_ex(&st->s_graph, compositor, GF_TRUE);
 		gf_list_del(st->spans);
 		gf_free(st);
 		return;
@@ -636,7 +641,7 @@
 	if (tr_state->visual->type_3d) return;
 #endif
 
-	ctx = drawable_init_context_mpeg4(st->graph, tr_state);
+	ctx = drawable_init_context_mpeg4(&st->s_graph, tr_state);
 	if (!ctx) return;
 	ctx->sub_path_index = tr_state->text_split_idx;
 
@@ -685,9 +690,9 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate text stack\n"));
 		return;
 	}
-	stack->graph = drawable_new();
-	stack->graph->node = node;
-	stack->graph->flags = DRAWABLE_USE_TRAVERSE_DRAW;
+	drawable_init_ex(&stack->s_graph);
+	stack->s_graph.node = node;
+	stack->s_graph.flags = DRAWABLE_USE_TRAVERSE_DRAW;
 	stack->ascent = stack->descent = 0;
 	stack->spans = gf_list_new();
 	stack->texture_text_flag = 0;
@@ -709,7 +714,7 @@
 		ParentNode2D *parent = tr_state->parent;
 		tr_state->parent = NULL;
 		text_clean_paths(tr_state->visual->compositor, st);
-		drawable_reset_path(st->graph);
+		drawable_reset_path(&st->s_graph);
 		gf_node_dirty_clear(node, 0);
 		build_text(st, (M_Text *)node, tr_state);
 		tr_state->parent = parent;

gpac-1.0.1.tar.gz/src/compositor/mpeg4_textures.c -> gpac-2.0.0.tar.gz/src/compositor/mpeg4_textures.c Changed

gpac-1.0.1.tar.gz/src/compositor/navigate.c -> gpac-2.0.0.tar.gz/src/compositor/navigate.c Changed

@@ -558,7 +558,7 @@
 					/*+ or - 10 cm*/
 					compositor->focdist += INT2FIX(key_inv);
 					cam->flags |= CAM_IS_DIRTY;
-					fprintf(stderr, "AutoStereo view distance %f - focus %f\n", FIX2FLT(compositor->video_out->dispdist)/100, FIX2FLT(compositor->focdist)/100);
+					GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("AutoStereo view distance %f - focus %f\n", FIX2FLT(compositor->video_out->dispdist)/100, FIX2FLT(compositor->focdist)/100));
 					gf_sc_invalidate(compositor, NULL);
 					return 1;
 				}
@@ -598,7 +598,7 @@
 			if (keys & GF_KEY_MOD_ALT) {
 				if ( (keys & GF_KEY_MOD_SHIFT) && (compositor->visual->nb_views > 1) ) {
 					compositor->interoccular_offset += FLT2FIX(0.5) * key_inv;
-					fprintf(stderr, "AutoStereo interoccular distance %f\n", FIX2FLT(compositor->iod + compositor->interoccular_offset));
+					GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("AutoStereo interoccular distance %f\n", FIX2FLT(compositor->iod + compositor->interoccular_offset)));
 					cam->flags |= CAM_IS_DIRTY;
 					gf_sc_invalidate(compositor, NULL);
 					return 1;
@@ -651,7 +651,8 @@
 			break;
 		case GF_KEY_D:
 			if (keys & GF_KEY_MOD_CTRL) {
-				compositor->tvtd = !compositor->tvtd;
+				if (compositor->tvtd==TILE_DEBUG_FULL) compositor->tvtd = 0;
+				else compositor->tvtd ++;
 				gf_sc_invalidate(compositor, NULL);
 				return 1;
 			}

gpac-1.0.1.tar.gz/src/compositor/nodes_stacks.h -> gpac-2.0.0.tar.gz/src/compositor/nodes_stacks.h Changed

gpac-1.0.1.tar.gz/src/compositor/object_manager.c -> gpac-2.0.0.tar.gz/src/compositor/object_manager.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -102,6 +102,10 @@
 		}
 		gf_list_del(odm->extra_pids);
 	}
+
+	if (odm->OD)
+		gf_odf_desc_del((GF_Descriptor *)odm->OD);
+
 	gf_free(odm);
 }
 
@@ -289,17 +293,17 @@
 }
 
 
-void gf_odm_setup_remote_object(GF_ObjectManager *odm, GF_SceneNamespace *parent_ns, char *remote_url)
+void gf_odm_setup_remote_object(GF_ObjectManager *odm, GF_SceneNamespace *parent_ns, char *remote_url, Bool for_addon)
 {
 	char *parent_url = NULL;
 	if (!remote_url) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] No URL specified for remote object - ignoring object setup\n", odm->ID));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME, ("[ODM%d] No URL specified for remote object - ignoring object setup\n", odm->ID));
 		return;
 	}
 
 	if (!odm->scene_ns) {
 		if (odm->flags & GF_ODM_DESTROYED) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Object has been scheduled for destruction - ignoring object setup\n", odm->ID));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME, ("[ODM%d] Object has been scheduled for destruction - ignoring object setup\n", odm->ID));
 			return;
 		}
 
@@ -314,13 +318,13 @@
 
 	//detach it
 	odm->scene_ns = NULL;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] Object redirection to %s (MO %08x)\n", odm->ID, remote_url, odm->mo));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d] Object redirection to %s (MO %08x)\n", odm->ID, remote_url, odm->mo));
 
 	/*if object is a scene, create the inline before connecting the object.
 		This is needed in order to register the nodes using the resource for event
 		propagation (stored at the inline level)
 	*/
-	if (odm->mo && (odm->mo->type==GF_MEDIA_OBJECT_SCENE)) {
+	if (odm->mo && (odm->mo->type==GF_MEDIA_OBJECT_SCENE) && !odm->subscene) {
 		odm->subscene = gf_scene_new(NULL, odm->parentscene);
 		odm->subscene->root_od = odm;
 		//scenes are by default dynamic
@@ -336,7 +340,7 @@
 	}
 	odm->flags |= GF_ODM_NOT_IN_OD_STREAM;
 	odm->ServiceID = 0;
-	gf_scene_ns_connect_object(odm->subscene ? odm->subscene : odm->parentscene, odm, remote_url, parent_url);
+	gf_scene_ns_connect_object(odm->subscene ? odm->subscene : odm->parentscene, odm, remote_url, parent_url, for_addon ? parent_ns : NULL);
 }
 
 GF_EXPORT
@@ -346,7 +350,7 @@
 
 	if (!odm->scene_ns) {
 		if (odm->flags & GF_ODM_DESTROYED) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Object has been scheduled for destruction - ignoring object setup\n", odm->ID));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME, ("[ODM%d] Object has been scheduled for destruction - ignoring object setup\n", odm->ID));
 			return;
 		}
 		odm->scene_ns = parent_ns;
@@ -369,31 +373,31 @@
 		assert(odm->subscene->root_od==odm);
 		odm->subscene->is_dynamic_scene = GF_TRUE;
 	} else if (odm->pid) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Setting up object streams\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Terminal] Setting up object streams\n"));
 
 		e = gf_odm_setup_pid(odm, for_pid);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Service %s PID %s Setup Failure: %s", odm->scene_ns->url, gf_filter_pid_get_name(for_pid ? for_pid : odm->pid), gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("Service %s PID %s Setup Failure: %s", odm->scene_ns->url, gf_filter_pid_get_name(for_pid ? for_pid : odm->pid), gf_error_to_string(e) ));
 		}
 	}
 
-	if (odm->pid && !odm->buffer_playout_us) {
+	if (odm->pid && !odm->buffer_playout_ms) {
 		GF_FilterEvent evt;
 		const GF_PropertyValue *prop;
 		u32 tsdepth=0;
 		GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
 
-		odm->buffer_playout_us = scene->compositor->buf * 1000;
-		odm->buffer_min_us = scene->compositor->rbuf * 1000;
-		odm->buffer_max_us = scene->compositor->mbuf * 1000;
+		odm->buffer_playout_ms = scene->compositor->buffer;
+		odm->buffer_min_ms = scene->compositor->rbuffer;
+		odm->buffer_max_ms = scene->compositor->mbuffer;
 
 		//check the same on the pid
-		prop = gf_filter_pid_get_property_str(for_pid ? for_pid : odm->pid, "BufferLength");
-		if (prop) odm->buffer_playout_us = prop->value.uint;
-		prop = gf_filter_pid_get_property_str(for_pid ? for_pid : odm->pid, "RebufferLength");
-		if (prop) odm->buffer_min_us = prop->value.uint;
-		prop = gf_filter_pid_get_property_str(for_pid ? for_pid : odm->pid, "BufferMaxOccupancy");
-		if (prop) odm->buffer_max_us = prop->value.uint;
+		prop = gf_filter_pid_get_property(for_pid ? for_pid : odm->pid, GF_PROP_PID_PLAY_BUFFER);
+		if (prop) odm->buffer_playout_ms = prop->value.uint;
+		prop = gf_filter_pid_get_property(for_pid ? for_pid : odm->pid, GF_PROP_PID_RE_BUFFER);
+		if (prop) odm->buffer_min_ms = prop->value.uint;
+		prop = gf_filter_pid_get_property(for_pid ? for_pid : odm->pid, GF_PROP_PID_MAX_BUFFER);
+		if (prop) odm->buffer_max_ms = prop->value.uint;
 
 		prop = gf_filter_pid_get_property(for_pid ? for_pid : odm->pid, GF_PROP_PID_TIMESHIFT_DEPTH);
 		if (prop && prop->value.frac.den) {
@@ -401,44 +405,49 @@
 		}
 		gf_odm_set_timeshift_depth(odm, tsdepth);
 
-		if (odm->buffer_playout_us > odm->buffer_max_us) odm->buffer_max_us = odm->buffer_playout_us;
+		if (odm->buffer_playout_ms > odm->buffer_max_ms) odm->buffer_max_ms = odm->buffer_playout_ms;
 
 		prop = gf_filter_pid_get_property(for_pid ? for_pid : odm->pid, GF_PROP_PID_FILE_CACHED);
-		if (prop) {
-			odm->buffer_playout_us = odm->buffer_max_us = 1000;
-			odm->buffer_min_us = 0;
+		if (prop && prop->value.boolean) {
+			odm->buffer_playout_ms = odm->buffer_max_ms = 1; //1 ms
+			odm->buffer_min_ms = 0;
 		}
+
 		GF_FEVT_INIT(evt, GF_FEVT_BUFFER_REQ, for_pid ? for_pid : odm->pid);
-		evt.buffer_req.max_buffer_us = odm->buffer_max_us;
-		evt.buffer_req.min_playout_us = odm->buffer_min_us;
-		evt.buffer_req.max_playout_us = odm->buffer_playout_us;
+		evt.buffer_req.max_buffer_us = odm->buffer_max_ms * 1000;
+		evt.buffer_req.min_playout_us = odm->buffer_min_ms * 1000;
+		evt.buffer_req.max_playout_us = odm->buffer_playout_ms * 1000;
 		gf_filter_pid_send_event(NULL, &evt);
 
-		if (odm->buffer_min_us>evt.buffer_req.max_playout_us)
-			odm->buffer_min_us = 0;
+		if (odm->buffer_min_ms * 1000 > evt.buffer_req.max_playout_us)
+			odm->buffer_min_ms = 0;
 	}
 
-
 	/*setup mediaobject info except for top-level OD*/
 	if (odm->parentscene) {
 		GF_Event evt;
 
 		//this may result in an attempt to lock the compositor, so release the net MX before
-		if (!odm->scalable_addon) {
-			gf_scene_setup_object(odm->parentscene, odm);
-		}
+		gf_scene_setup_object(odm->parentscene, odm);
 
 		/*setup node decoder*/
-#if FILTER_FIXME
-		if (odm->mo && odm->codec && odm->codec->decio && (odm->codec->decio->InterfaceType==GF_NODE_DECODER_INTERFACE) ) {
-			GF_NodeDecoder *ndec = (GF_NodeDecoder *) odm->codec->decio;
-			GF_Node *n = gf_event_target_get_node(gf_mo_event_target_get(odm->mo, 0));
-			if (n) ndec->AttachNode(ndec, n);
-
-			/*not clear in the spec how the streams attached to AFX are started - default to "right now"*/
-			gf_odm_start(odm);
+		if (odm->pid && (odm->type==GF_STREAM_SCENE)) {
+			const GF_PropertyValue *p = gf_filter_pid_get_property(odm->pid, GF_PROP_PID_SCENE_NODE);
+			if (p && p->value.boolean) {
+				GF_FilterEvent fevt;
+				void gf_filter_pid_exec_event(GF_FilterPid *pid, GF_FilterEvent *evt);
+
+				GF_Node *n = gf_event_target_get_node(gf_mo_event_target_get(odm->mo, 0));
+				GF_FEVT_INIT(fevt, GF_FEVT_ATTACH_SCENE, odm->pid);
+				fevt.attach_scene.object_manager = odm;
+				fevt.attach_scene.node = n;
+				gf_filter_pid_exec_event(odm->pid, &fevt);
+
+				/*not clear in the spec how the streams attached to AFX are started - default to "right now"*/
+				gf_odm_start(odm);
+			}
 		}
-#endif
+
 		if (odm->pid && (odm->pid==for_pid)) {
 			evt.type = GF_EVENT_CONNECT;
 			evt.connect.is_connected = GF_TRUE;
@@ -447,7 +456,7 @@
 	} else if (odm->pid==for_pid) {
 		/*othewise send a connect ack for top level*/
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM] Root object connected (%s) !\n", odm->scene_ns->url));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM] Root object connected (%s) !\n", odm->scene_ns->url));
 		if (odm->subscene) {
 			GF_Event evt;
 			evt.type = GF_EVENT_CONNECT;
@@ -492,7 +501,7 @@
 			odm->flags |= GF_ODM_INITIAL_BROADCAST_PLAY;
 			odm->parentscene->selected_service_id = odm->ServiceID;
 
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] Inserted from input service %s - forcing play\n", odm->ID, odm->scene_ns->url));
+			GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d] Inserted from input service %s - forcing play\n", odm->ID, odm->scene_ns->url));
 			odm->flags &= ~GF_ODM_NOT_SETUP;
 			gf_odm_start(odm);
 		}
@@ -604,7 +613,7 @@
 		}
 		if (ck)
 			goto clock_setup;
-		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM] Cannot inherit timeline from parent scene for scene %s - new clock will be created\n", odm->scene_ns->url));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME, ("[ODM] Cannot inherit timeline from parent scene for scene %s - new clock will be created\n", odm->scene_ns->url));
 	}
 
 	/*get clocks namespace (eg, parent scene)*/
@@ -623,7 +632,7 @@
 		ck = (GF_Clock*)gf_list_get(ck_namespace, 0);
 		OD_OCR_ID = ck->clock_id;
 	}
-	/*for dynamic scene, force all streams to be sync on main OD stream (one timeline, no need to reload ressources)*/
+	/*for dynamic scene, force all streams to be sync on main OD stream (one timeline, no need to reload resources)*/
 	else if (odm->parentscene && odm->parentscene->is_dynamic_scene && !odm->subscene) {
 		GF_ObjectManager *parent_od = odm->parentscene->root_od;
 		if (parent_od->scene_ns && parent_od->scene_ns->clocks && (gf_list_count(parent_od->scene_ns->clocks)==1)) {
@@ -676,13 +685,13 @@
 	odm->clock_inherited = clock_inherited;
 
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
-	if (prop) {
-		odm->delay = prop->value.sint;
-		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
-		if (prop) {
-			odm->delay *= 1000;
-			odm->delay /= (s32) prop->value.uint;
-		}
+	odm->timestamp_offset = prop ? prop->value.longsint : 0;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	//if offset greater than 30sec, move it down to [0s,1s] range to avoid presenting nothing
+	if ((odm->timestamp_offset > 0) && (prop && prop->value.uint) && (odm->timestamp_offset > 30 * prop->value.uint)
+	) {
+		u64 to_rem = odm->timestamp_offset / prop->value.uint;
+		odm->timestamp_offset -= to_rem * prop->value.uint;
 	}
 
 	gf_odm_update_duration(odm, pid);
@@ -708,6 +717,13 @@
 		/*update scene duration*/
 		gf_scene_set_duration(odm->subscene ? odm->subscene : odm->parentscene);
 	}
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_HAS_TEMI);
+	if (prop && prop->value.boolean)
+		odm->flags |= GF_ODM_HAS_TEMI;
+	else
+		odm->flags &= ~GF_ODM_HAS_TEMI;
+
 }
 
 /*this is the tricky part: make sure the net is locked before doing anything since an async service
@@ -769,7 +785,7 @@
 		return;
 	}
 
-	if ( !(odm->flags & GF_ODM_INHERIT_TIMELINE) && odm->owns_clock ) {
+	if ( !(odm->flags & (GF_ODM_INHERIT_TIMELINE|GF_ODM_TILED_SHARED_CLOCK) ) && odm->owns_clock ) {
 		gf_clock_reset(clock);
 	}
 
@@ -825,11 +841,6 @@
 
 		if (ck_time<0)
 			ck_time=0;
-
-		if (odm->scalable_addon) {
-			//this is a scalable extension to an object in the parent scene
-			gf_scene_select_scalable_addon(odm->parentscene->root_od->parentscene, odm);
-		}
 	}
 
 	com.play.start_range = ck_time;
@@ -911,15 +922,17 @@
 		}
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] PID %s: At OTB %u requesting PLAY from %g to %g (clock init %d) - speed %g\n", odm->ID, odm->scene_ns->url, gf_filter_pid_get_name(odm->pid), gf_clock_time(clock), com.play.start_range, com.play.end_range, clock->clock_init, com.play.speed));
+	GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d %s] PID %s: At OTB %u requesting PLAY from %g to %g (clock init %d) - speed %g\n", odm->ID, odm->scene_ns->url, gf_filter_pid_get_name(odm->pid), gf_clock_time(clock), com.play.start_range, com.play.end_range, clock->clock_init, com.play.speed));
 
 
 	if (odm->state != GF_ODM_STATE_PLAY) {
 		odm->state = GF_ODM_STATE_PLAY;
+
 		odm->nb_buffering ++;
 		scene->nb_buffering++;
 		//start buffering
 		gf_clock_buffer_on(odm->ck);
+
 		odm->has_seen_eos = GF_FALSE;
 
 		if ((odm->type!=GF_STREAM_VISUAL) && (odm->type!=GF_STREAM_AUDIO)) {
@@ -937,6 +950,7 @@
 				xpid->state = GF_ODM_STATE_PLAY;
 				com.base.on_pid = xpid->pid;
 				odm->has_seen_eos = GF_FALSE;
+
 				odm->nb_buffering ++;
 				scene->nb_buffering++;
 				//start buffering
@@ -992,7 +1006,7 @@
 	odm->flags &= ~GF_ODM_PREFETCH;
 	
 	//root ODs of dynamic scene may not have seen play/pause request
-	if (!odm->state && !odm->scalable_addon && (!odm->subscene || !odm->subscene->is_dynamic_scene) ) return;
+	if (!odm->state && (!odm->subscene || !odm->subscene->is_dynamic_scene) ) return;
 
 	//PID not yet attached, mark as state_stop and wait for error or OK
 	if (!odm->pid ) {
@@ -1017,7 +1031,7 @@
 	odm->has_seen_eos = GF_FALSE;
 	odm->state = GF_ODM_STATE_STOP;
 	GF_FEVT_INIT(com, GF_FEVT_STOP, odm->pid)
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] PID %s At OTB %u requesting STOP\n", odm->ID, odm->scene_ns->url, gf_filter_pid_get_name(odm->pid), odm->ck ? gf_clock_time(odm->ck) : 0 ));
+	GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d %s] PID %s At OTB %u requesting STOP\n", odm->ID, odm->scene_ns->url, gf_filter_pid_get_name(odm->pid), odm->ck ? gf_clock_time(odm->ck) : 0 ));
 
 	gf_filter_pid_send_event(odm->pid, &com);
 	gf_list_del_item(scene->compositor->systems_pids, odm->pid);
@@ -1042,7 +1056,7 @@
 			odm->nb_buffering --;
 		}
 		if (!scene->nb_buffering) {
-			gf_scene_buffering_info(scene);
+			gf_scene_buffering_info(scene, GF_TRUE);
 		}
 	}
 
@@ -1218,11 +1232,14 @@
 	odm->flags |= GF_ODM_PAUSED;
 
 	//cleanup - we need to enter in stop state for broadcast modes
-	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
+	if (odm->flags & GF_ODM_NO_TIME_CTRL) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME, ("[ODM%d %s] PID %s: no time control available in source filter, will not pause\n", odm->ID, odm->scene_ns->url, gf_filter_pid_get_name(odm->pid)));
+		return;
+	}
 
 	scene = gf_scene_get_root_scene(scene);
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] PID %s: At OTB %u requesting PAUSE (clock init %d)\n", odm->ID, odm->scene_ns->url, gf_filter_pid_get_name(odm->pid), gf_clock_time(odm->ck), odm->ck->clock_init ));
+	GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d %s] PID %s: At OTB %u requesting PAUSE (clock init %d)\n", odm->ID, odm->scene_ns->url, gf_filter_pid_get_name(odm->pid), gf_clock_time(odm->ck), odm->ck->clock_init ));
 
 	GF_FEVT_INIT(com, GF_FEVT_PAUSE, odm->pid);
 	gf_clock_pause(odm->ck);
@@ -1288,7 +1305,7 @@
 	ctrl = gf_odm_get_mediacontrol(odm);
 #endif
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] CH%d: At OTB %u requesting RESUME (clock init %d)\n", odm->ID, odm->scene_ns->url, gf_filter_pid_get_name(odm->pid), gf_clock_time(odm->ck), odm->ck->clock_init ));
+	GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[ODM%d %s] CH%d: At OTB %u requesting RESUME (clock init %d)\n", odm->ID, odm->scene_ns->url, gf_filter_pid_get_name(odm->pid), gf_clock_time(odm->ck), odm->ck->clock_init ));
 
 	GF_FEVT_INIT(com, GF_FEVT_RESUME, odm->pid);
 	com.play.speed = odm->ck->speed;
@@ -1358,7 +1375,6 @@
 
 GF_Segment *gf_odm_find_segment(GF_ObjectManager *odm, char *descName)
 {
-#if FILTER_FIXME
 	GF_Segment *desc;
 	u32 i = 0;
 	if (!odm->OD) return NULL;
@@ -1366,15 +1382,12 @@
 		if (desc->tag != GF_ODF_SEGMENT_TAG) continue;
 		if (!stricmp(desc->SegmentName, descName)) return desc;
 	}
-#endif
 	return NULL;
 }
 
-#if FILTER_FIXME
 static void gf_odm_insert_segment(GF_ObjectManager *odm, GF_Segment *seg, GF_List *list)
 {
 	/*this reorders segments when inserting into list - I believe this is not compliant*/
-#if 0
 	GF_Segment *desc;
 	u32 i = 0;
 	while ((desc = gf_list_enum(list, &i))) {
@@ -1384,15 +1397,12 @@
 			return;
 		}
 	}
-#endif
 	gf_list_add(list, seg);
 }
-#endif
 
 /*add segment descriptor and sort them*/
 void gf_odm_init_segments(GF_ObjectManager *odm, GF_List *list, MFURL *url)
 {
-#if FILTER_FIXME
 	char *str, *sep;
 	char seg1[1024], seg2[1024], seg_url[4096];
 	GF_Segment *first_seg, *last_seg, *seg;
@@ -1441,13 +1451,12 @@
 			gf_odm_insert_segment(odm, seg, list);
 		}
 	}
-#endif
 }
 
 static Bool odm_update_buffer(GF_Scene *scene, GF_ObjectManager *odm, GF_FilterPid *pid, Bool *signal_eob)
 {
 	u32 timescale;
-	u64 buffer_duration = gf_filter_pid_query_buffer_duration(pid, GF_TRUE);
+	u64 buffer_duration = gf_filter_pid_query_buffer_duration(pid, GF_FALSE)/1000;
 	if (odm->ck && ! odm->ck->clock_init) {
 		u64 time;
 		GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
@@ -1458,15 +1467,15 @@
 		if (time==GF_FILTER_NO_TS) time = gf_filter_pck_get_dts(pck);
 		if (time==GF_FILTER_NO_TS) {
 			//this usually happens with BT/XMT playback
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("No timestamp on first packet, using 0\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("No timestamp on first packet, using 0\n"));
 			time = 0;
 		}
-		if (odm->delay<0) {
-			if (time < (u64) -odm->delay) {
+		if (odm->timestamp_offset<0) {
+			if (time < (u64) -odm->timestamp_offset) {
 				gf_filter_pid_drop_packet(pid);
 				return GF_TRUE;
 			}
-			time-= -odm->delay;
+			time-= -odm->timestamp_offset;
 		}
 
 		time *= 1000;
@@ -1484,7 +1493,7 @@
 	}
 
 	//TODO abort buffering when errors are found on the input chain !!
-	if (odm->blocking_media || (buffer_duration >= odm->buffer_playout_us)) {
+	if (odm->blocking_media || (buffer_duration >= odm->buffer_playout_ms)) {
 		odm->nb_buffering --;
 		assert(scene->nb_buffering);
 		scene->nb_buffering--;
@@ -1521,6 +1530,7 @@
 	GF_FilterClockType ck_type;
 	u64 clock_reference;
 	GF_FilterPacket *pck;
+	Bool check_disc = GF_TRUE;
 
 	assert(odm);
 
@@ -1561,9 +1571,9 @@
 			if (an_odm->nb_buffering)
 	 			odm_update_buffer(scene, an_odm, an_odm->pid, &signal_eob);
 		}
-	} else if (!odm->blocking_media && odm->buffer_min_us && odm->pid && odm->ck && odm->ck->clock_init && !gf_filter_pid_has_seen_eos(odm->pid) ) {
-		u64 buffer_duration = gf_filter_pid_query_buffer_duration(odm->pid, GF_TRUE);
-		if (buffer_duration < odm->buffer_min_us) {
+	} else if (!odm->blocking_media && odm->buffer_min_ms && odm->pid && odm->ck && odm->ck->clock_init && !gf_filter_pid_has_seen_eos(odm->pid) ) {
+		u64 buffer_duration = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE)/1000;
+		if (buffer_duration < odm->buffer_min_ms) {
 			gf_clock_buffer_on(odm->ck);
 			odm->nb_buffering++;
 			odm->nb_rebuffer++;
@@ -1573,10 +1583,12 @@
 	}
 
 	if (scene->nb_buffering || signal_eob)
-		gf_scene_buffering_info(scene);
+		gf_scene_buffering_info(scene, GF_FALSE);
 
+	if (odm->parentscene && odm->parentscene->root_od->addon)
+		check_disc = GF_FALSE;
 	//handle both PCR discontinuities or TS looping when no PCR disc is present/signaled
-	if (pck) {
+	if (pck && check_disc) {
 		s32 diff=0;
 		u64 pck_time = 0;
 		u32 clock_time = gf_clock_time(odm->ck);
@@ -1584,9 +1596,9 @@
 		if (ck_type) {
 			clock_reference *= 1000;
 			clock_reference /= timescale;
-			diff = (s32) clock_time + odm->buffer_playout_us/1000;
+			diff = (s32) clock_time + odm->buffer_playout_ms;
 			diff -= (s32) clock_reference;
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("Clock %d (ODM %d) reference found "LLU" ms clock time %d ms - diff %d - type %d\n", odm->ck->clock_id, odm->ID, clock_reference, clock_time, diff, ck_type));
+			GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("Clock %d (ODM %d) reference found "LLU" ms clock time %d ms - diff %d - type %d\n", odm->ck->clock_id, odm->ID, clock_reference, clock_time, diff, ck_type));
 
 			//if explicit clock discontinuity, mark clock
 			if (ck_type==GF_FILTER_CLOCK_PCR_DISC)
@@ -1601,7 +1613,7 @@
 			diff = (u32) ((u64) clock_time - pck_time);
 			diff_to = odm->ck->ocr_discontinuity_time ? 500 : 8000;
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("Clock %d (ODM %d) pck time %d - clock ref "LLU" clock time %d - diff %d vs %d\n", odm->ck->clock_id, odm->ID, pck_time, clock_reference, clock_time, diff, diff_to));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("Clock %d (ODM %d) pck time %d - clock ref "LLU" clock time %d - diff %d vs %d\n", odm->ck->clock_id, odm->ID, pck_time, clock_reference, clock_time, diff, diff_to));
 
 		//we have a valid TS for the packet, and the CTS diff to the current clock is larget than 8 sec, check for discontinuities
 		//it may happen that video is sent up to 4 or 5 seconds ahead of the PCR in some systems, 8 sec should be enough
@@ -1617,7 +1629,7 @@
 			if (diff_pck_old_clock > diff_pck_new_clock) {
 				u32 i, count;
 				GF_Scene *in_scene = odm->subscene ? odm->subscene : odm->parentscene;
-				GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("Clock %d (ODM %d) discontinuity detected "LLU" clock time %d - diff %d - type %d - pck time "LLU"\n", odm->ck->clock_id, odm->ID, clock_reference, clock_time, diff, ck_type, pck_time-1));
+				GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("Clock %d (ODM %d) discontinuity detected "LLU" clock time %d - diff %d - type %d - pck time "LLU"\n", odm->ck->clock_id, odm->ID, clock_reference, clock_time, diff, ck_type, pck_time-1));
 
 				count = gf_list_count(in_scene->resources);
 				for (i=0; i<count; i++) {
@@ -1636,8 +1648,9 @@
 		if (ck_type==GF_FILTER_CLOCK_PCR_DISC)
 			odm->ck->ocr_discontinuity_time = (u32) (1 + clock_reference);
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("Clock %d (ODM %d) received "LLU" type %d clock time %d no pending packets\n", odm->ck->clock_id, odm->ID, clock_reference, ck_type, gf_clock_time(odm->ck)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("Clock %d (ODM %d) received "LLU" type %d clock time %d no pending packets\n", odm->ck->clock_id, odm->ID, clock_reference, ck_type, gf_clock_time(odm->ck)));
 	}
+	//only send event when playing
 	if (!odm->ck->nb_buffering) {
 		gf_odm_service_media_event(odm, GF_EVENT_MEDIA_PROGRESS);
 	}
@@ -1653,7 +1666,7 @@
 
 	if (!odm->pid) return;
 	if (odm->scene_ns != scene_ns) return;
-	if (! odm->buffer_playout_us) {
+	if (! odm->buffer_playout_ms) {
 		media_event->bufferValid = GF_FALSE;
 		return;
 	}
@@ -1661,34 +1674,33 @@
 	if (odm->nb_buffering)
 		media_event->bufferValid = GF_TRUE;
 
-	buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE);
-	if (buf_val > odm->buffer_max_us) buf_val = odm->buffer_max_us;
-	val = (u32) ((buf_val * 100) / odm->buffer_max_us);
+	buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE)/1000;
+	if (buf_val > odm->buffer_max_ms) buf_val = odm->buffer_max_ms;
+	val = (u32) ((buf_val * 100) / odm->buffer_playout_ms);
 	if (*min_buffer > val) (*min_buffer) = val;
 
-	if (*min_time > (u32) buf_val / 1000)
-		*min_time = (u32) buf_val / 1000;
+	if (*min_time > (u32) buf_val)
+		*min_time = (u32) buf_val;
 
 	i=0;
 	while ((xpid = gf_list_enum(odm->extra_pids, &i))) {
 
-		buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE);
-		if (buf_val > odm->buffer_max_us) buf_val = odm->buffer_max_us;
-		val = (u32) ((buf_val * 100) / odm->buffer_playout_us);
+		buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE)/1000;
+		if (buf_val > odm->buffer_max_ms) buf_val = odm->buffer_max_ms;
+		val = (u32) ((buf_val * 100) / odm->buffer_playout_ms);
 		if (*min_buffer > val) (*min_buffer) = val;
 
-		if (*min_time > (u32) buf_val / 1000)
-			*min_time = (u32) buf_val / 1000;
+		if (*min_time > (u32) buf_val)
+			*min_time = (u32) buf_val;
 	}
 }
 #endif
 
-void gf_odm_service_media_event_with_download(GF_ObjectManager *odm, GF_EventType event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec)
+void gf_odm_service_media_event_with_download(GF_ObjectManager *odm, GF_EventType event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec, u32 buffer_level_plus_one, u32 min_buffer_time)
 {
 #ifndef GPAC_DISABLE_SVG
 	u32 i, count, min_buffer, min_time;
 	GF_DOM_Event evt;
-	GF_ObjectManager *an_od;
 	GF_Scene *scene;
 
 	if (!odm || !odm->scene_ns) return;
@@ -1715,18 +1727,27 @@
 	evt.media_event.bufferValid = GF_FALSE;
 	evt.media_event.session_name = odm->scene_ns->url;
 
-	min_time = min_buffer = (u32) -1;
 	scene = odm->subscene ? odm->subscene : odm->parentscene;
 	if (!scene) return;
-	
-	/*get buffering on root OD*/
-	gf_odm_collect_buffer_info(odm->scene_ns, scene->root_od, &evt.media_event, &min_time, &min_buffer);
 
-	/*get buffering on all ODs*/
-	i=0;
-	while ((an_od = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-		if (odm->scene_ns == an_od->scene_ns)
-			gf_odm_collect_buffer_info(odm->scene_ns, an_od, &evt.media_event, &min_time, &min_buffer);
+	if (!buffer_level_plus_one) {
+		GF_ObjectManager *an_od;
+		min_time = min_buffer = (u32) -1;
+
+		/*get buffering on root OD*/
+		if (!scene->is_dynamic_scene)
+			gf_odm_collect_buffer_info(odm->scene_ns, scene->root_od, &evt.media_event, &min_time, &min_buffer);
+
+		/*get buffering on all ODs*/
+		i=0;
+		while ((an_od = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+			if (odm->scene_ns == an_od->scene_ns)
+				gf_odm_collect_buffer_info(odm->scene_ns, an_od, &evt.media_event, &min_time, &min_buffer);
+		}
+	} else {
+		min_buffer = buffer_level_plus_one - 1;
+		min_time = min_buffer_time;
+		evt.media_event.bufferValid = GF_TRUE;
 	}
 
 	if (min_buffer != (u32) -1) {
@@ -1734,6 +1755,7 @@
 	}
 	if (min_time != (u32) -1)
 		evt.media_event.remaining_time = INT2FIX(min_time) / 60;
+
 	evt.media_event.status = 0;
 	evt.media_event.loaded_size = loaded_size;
 	evt.media_event.total_size = total_size;
@@ -1758,7 +1780,7 @@
 
 void gf_odm_service_media_event(GF_ObjectManager *odm, GF_EventType event_type)
 {
-	gf_odm_service_media_event_with_download(odm, event_type, 0, 0, 0);
+	gf_odm_service_media_event_with_download(odm, event_type, 0, 0, 0, 0, 0);
 }
 
 Bool gf_odm_stop_or_destroy(GF_ObjectManager *odm)
@@ -1778,10 +1800,10 @@
 }
 
 
-static void get_codec_stats(GF_FilterPid *pid, GF_MediaInfo *info)
+static void get_codec_stats(GF_FilterPid *pid, GF_MediaInfo *info, Bool scalable_addon)
 {
 	GF_FilterPidStatistics stats;
-	gf_filter_pid_get_statistics(pid, &stats, GF_STATS_LOCAL_INPUTS);
+	gf_filter_pid_get_statistics(pid, &stats, scalable_addon ? GF_STATS_LOCAL : GF_STATS_LOCAL_INPUTS);
 
 	info->avg_bitrate = stats.avgerage_bitrate;
 	info->max_bitrate = stats.max_bitrate;
@@ -1805,6 +1827,7 @@
 	const GF_PropertyValue *prop;
 	GF_ObjectManager *an_odm;
 	GF_FilterPid *pid;
+	GF_ObjectManager *scalable_addon_par = NULL;
 
 	if (!odm || !info) return GF_BAD_PARAM;
 	memset(info, 0, sizeof(GF_MediaInfo));
@@ -1825,6 +1848,29 @@
 		pid = an_odm->pid;
 	}
 
+	if (odm->subscene && !odm->pid && odm->addon && !gf_list_count(odm->subscene->resources)) {
+		GF_FilterPid *gf_filter_pid_first_pid_for_source(GF_FilterPid *pid, GF_Filter *source);
+		u32 i;
+		for (i=0; i<gf_list_count(odm->parentscene->resources); i++) {
+			GF_ObjectManager *par_odm = gf_list_get(odm->parentscene->resources, i);
+			if (!par_odm->pid) continue;
+			pid = gf_filter_pid_first_pid_for_source(par_odm->pid, odm->addon->root_od->scene_ns->source_filter);
+			if (!pid) continue;
+			if (!odm->ID) {
+				info->ServiceID = odm->ServiceID = par_odm->ServiceID;
+				prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+				if (prop) info->pid_id = odm->pid_id = odm->ID = prop->value.uint;
+				prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+				if (prop) info->od_type = odm->type = prop->value.uint;
+
+				odm->buffer_max_ms = par_odm->buffer_max_ms;
+				odm->buffer_min_ms = par_odm->buffer_min_ms;
+			}
+			scalable_addon_par = par_odm;
+			break;
+		}
+	}
+
 	if (pid) {
 		/*since we don't remove ODs that failed setup, check for clock*/
 		if (odm->ck) {
@@ -1855,6 +1901,9 @@
 		GF_Clock *ck;
 
 		ck = gf_odm_get_media_clock(odm);
+		if (scalable_addon_par)
+			ck = scalable_addon_par->ck;
+
 		/*no clock means setup failed*/
 		if (!ck) {
 			info->status = 4;
@@ -1868,12 +1917,14 @@
 
 			if (pid)
 				info->buffer = (u32) gf_filter_pid_query_buffer_duration(pid, GF_FALSE) / 1000;
-			info->max_buffer = odm->buffer_max_us / 1000;
-			info->min_buffer = odm->buffer_min_us / 1000;
+			info->max_buffer = odm->buffer_max_ms;
+			info->min_buffer = odm->buffer_min_ms;
+		}
 
-#ifdef FILTER_FIXME
-			info->protection = ch->ipmp_tool ? 1 : 2;
-#endif
+		if (odm->pid) {
+			prop = gf_filter_pid_get_property(odm->pid, GF_PROP_PID_ORIG_CRYPT_SCHEME);
+			if (prop)
+				info->protection = prop->value.uint;
 		}
 	}
 
@@ -1889,31 +1940,54 @@
 	}
 
 	if (pid) {
-		info->codec_name = gf_filter_pid_get_filter_name(pid);
+		info->codec_name = gf_filter_pid_get_filter_name(scalable_addon_par ? scalable_addon_par->pid : pid);
 		info->od_type = odm->type;
 
 		gf_filter_pid_get_buffer_occupancy(pid, &info->cb_max_count, &info->cb_unit_count, NULL, NULL);
 
-		get_codec_stats(pid, info);
+		get_codec_stats(pid, info, scalable_addon_par ? GF_TRUE : GF_FALSE);
 
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_LANGUAGE);
 		if (prop) info->lang_code = prop->value.string;
+
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_VIEWS);
+		if (prop && (prop->value.uint>1)) info->nb_views = prop->value.uint;
 	}
 
-	if (odm->subscene) {
-		gf_sg_get_scene_size_info(odm->subscene->graph, &info->width, &info->height);
-	} else if (odm->mo) {
+	if (!scalable_addon_par) {
+		if (odm->subscene) {
+			gf_sg_get_scene_size_info(odm->subscene->graph, &info->width, &info->height);
+		} else if (odm->mo) {
+			switch (info->od_type) {
+			case GF_STREAM_VISUAL:
+				gf_mo_get_visual_info(odm->mo, &info->width, &info->height, NULL, &info->par, &info->pixelFormat, NULL);
+				break;
+			case GF_STREAM_AUDIO:
+				gf_mo_get_audio_info(odm->mo, &info->sample_rate, &info->afmt, &info->num_channels, NULL, NULL);
+				info->clock_drift = 0;
+				break;
+			case GF_STREAM_TEXT:
+				gf_mo_get_visual_info(odm->mo, &info->width, &info->height, NULL, NULL, NULL, NULL);
+				break;
+			}
+		}
+	} else {
 		switch (info->od_type) {
 		case GF_STREAM_VISUAL:
-			gf_mo_get_visual_info(odm->mo, &info->width, &info->height, NULL, &info->par, &info->pixelFormat, NULL);
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+			if (prop) info->width = prop->value.uint;
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+			if (prop) info->height = prop->value.uint;
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
+			if (prop) info->par = (prop->value.frac.num) << 16 | (prop->value.frac.den);
 			break;
 		case GF_STREAM_AUDIO:
-			gf_mo_get_audio_info(odm->mo, &info->sample_rate, &info->afmt, &info->num_channels, NULL, NULL);
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+			if (prop) info->sample_rate = prop->value.uint;
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+			if (prop) info->num_channels = prop->value.uint;
 			info->clock_drift = 0;
 			break;
-		case GF_STREAM_TEXT:
-			gf_mo_get_visual_info(odm->mo, &info->width, &info->height, NULL, NULL, NULL, NULL);
-			break;
 		}
 	}

gpac-1.0.1.tar.gz/src/compositor/offscreen_cache.c -> gpac-2.0.0.tar.gz/src/compositor/offscreen_cache.c Changed

gpac-1.0.1.tar.gz/src/compositor/scene.c -> gpac-2.0.0.tar.gz/src/compositor/scene.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -180,9 +180,8 @@
 	if (type==GF_JSAPI_OP_RESOLVE_URI) {
 		char *url;
 		char new_url[GF_MAX_PATH];
-#ifdef FILTER_FIXME
 		char localized_url[GF_MAX_PATH];
-#endif
+
 		Bool result=GF_FALSE;
 		GF_Scene *a_scene = (GF_Scene *)gf_sg_get_private(gf_node_get_graph(n));
 		url = (char *)param->uri.url;
@@ -193,9 +192,8 @@
 		}
 
 		new_url[0]=0;
-#ifdef FILTER_FIXME
-		result = gf_term_relocate_url(term, url, a_scene->root_od->net_service->url, new_url, localized_url);
-#endif
+		result = gf_filter_relocate_url(a_scene->compositor->filter, url, a_scene->root_od->scene_ns->url, new_url, localized_url);
+
 		if (result) param->uri.url = gf_strdup(new_url);
 		else param->uri.url = gf_url_concatenate(a_scene->root_od->scene_ns->url, url);
 		return 1;
@@ -424,7 +422,7 @@
 	GF_MediaObject *obj;
 	GF_ObjectManager *odm;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] disconnecting\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Scene] disconnecting\n"));
 
 
 	/*force unregistering of inline nodes (for safety)*/
@@ -496,7 +494,7 @@
 
 	gf_scene_reset_addons(scene);
 
-	/*release the scene - at this stage, we no longer have any node stack refering to our media objects */
+	/*release the scene - at this stage, we no longer have any node stack referring to our media objects */
 
 	gf_sc_node_destroy(scene->compositor, NULL, scene->graph);
 	gf_sg_reset(scene->graph);
@@ -553,7 +551,7 @@
 	scene->object_attached = 0;
 }
 
-static void gf_scene_insert_object(GF_Scene *scene, GF_MediaObject *mo, Bool lock_timelines, GF_MediaObject *sync_ref, Bool keep_fragment, GF_Scene *original_parent_scene)
+static void gf_scene_insert_object(GF_Scene *scene, GF_MediaObject *mo, Bool lock_timelines, GF_MediaObject *sync_ref, Bool keep_fragment, GF_Scene *original_parent_scene, Bool for_addon)
 {
 	GF_ObjectManager *odm;
 	char *url, *final_url;
@@ -585,10 +583,10 @@
 	/*HACK - temp storage of sync ref*/
 	if (sync_ref) odm->sync_ref = sync_ref;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] Inserting new MediaObject %08x for resource %s\n", odm->mo, url));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Scene] Inserting new MediaObject %08x for resource %s\n", odm->mo, url));
 	gf_list_add(scene->resources, odm);
 
-	gf_odm_setup_remote_object(odm, original_parent_scene ? original_parent_scene->root_od->scene_ns : NULL, final_url);
+	gf_odm_setup_remote_object(odm, original_parent_scene ? original_parent_scene->root_od->scene_ns : NULL, final_url, for_addon);
 }
 
 static void gf_scene_reinsert_object(GF_Scene *scene, GF_MediaObject *mo)
@@ -600,7 +598,7 @@
 	mo->URLs.vals[mo->URLs.count-1].url = NULL;
 	mo->URLs.count-=1;
 	/*FIXME - we should re-ananlyse whether the fragment is important or not ...*/
-	gf_scene_insert_object(scene, mo, GF_FALSE, NULL, GF_FALSE, NULL);
+	gf_scene_insert_object(scene, mo, GF_FALSE, NULL, GF_FALSE, NULL, GF_FALSE);
 }
 
 
@@ -611,7 +609,7 @@
 
 	gf_list_del_item(scene->resources, odm);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] removing ODM %d\n", odm->ID ));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Scene] removing ODM %d\n", odm->ID ));
 
 
 	i=0;
@@ -692,43 +690,49 @@
 
 			if ((discard_obj==1) && !obj->num_open) {
 				gf_list_rem(scene->scene_objects, i-1);
+				i--;
 				gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
 				gf_mo_del(obj);
 			}
-			return;
+//			return;
 		}
 	}
 }
 
 
 //browse all channels and update buffering info
-void gf_scene_buffering_info(GF_Scene *scene)
+void gf_scene_buffering_info(GF_Scene *scene, Bool rebuffer_done)
 {
 	GF_ODMExtraPid *xpid;
 	u32 i, j;
-	u64 max_buffer, cur_buffer, max_buff_val=0;
+	u64 max_buffer, cur_buffer, min_time, max_buff_val=0;
 	u64 buf_val;
 	GF_Event evt;
 	GF_ObjectManager *odm;
 	if (!scene) return;
 
 	max_buffer = cur_buffer = 0;
+	min_time = (u64) -1;
 
 	/*get buffering on root OD*/
 	odm = scene->root_od;
-	if (odm->pid && odm->buffer_playout_us) {
-		if (max_buff_val < odm->buffer_playout_us)
-			max_buff_val = odm->buffer_playout_us;
+	if (!scene->is_dynamic_scene && odm->pid && odm->buffer_playout_ms) {
+		if (max_buff_val < odm->buffer_playout_ms)
+			max_buff_val = odm->buffer_playout_ms;
 
 		if (odm->nb_buffering) {
-			max_buffer += odm->buffer_playout_us;
-			buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE);
+			max_buffer += odm->buffer_playout_ms;
+			buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE) / 1000;
+			if (min_time>buf_val) min_time = buf_val;
+
 			if (buf_val > max_buffer) buf_val = max_buffer;
 			cur_buffer += (buf_val>0) ? buf_val : 1;
 			i=0;
 			while ((xpid = gf_list_enum(odm->extra_pids, &i))) {
-				max_buffer += odm->buffer_playout_us;
-				buf_val = gf_filter_pid_query_buffer_duration(xpid->pid, GF_FALSE);
+				max_buffer += odm->buffer_playout_ms;
+				buf_val = gf_filter_pid_query_buffer_duration(xpid->pid, GF_FALSE) / 1000;
+				if (min_time>buf_val) min_time = buf_val;
+
 				if (buf_val > max_buffer) buf_val = max_buffer;
 				cur_buffer += (buf_val>0) ? buf_val : 1;
 			}
@@ -738,20 +742,24 @@
 	/*get buffering on all ODs*/
 	i=0;
 	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-		if (!odm->buffer_playout_us) continue;
-		if (max_buff_val < odm->buffer_playout_us)
-			max_buff_val = odm->buffer_playout_us;
+		if (!odm->buffer_playout_ms) continue;
+		if (max_buff_val < odm->buffer_playout_ms)
+			max_buff_val = odm->buffer_playout_ms;
 
 		if (!odm->nb_buffering) continue;
 
-		max_buffer += odm->buffer_playout_us;
-		buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE);
+		max_buffer += odm->buffer_playout_ms;
+		buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE) / 1000;
+		if (min_time>buf_val) min_time = buf_val;
+
 		if (buf_val > max_buffer) buf_val = max_buffer;
 		cur_buffer += (buf_val>0) ? buf_val : 1;
 		j=0;
 		while ((xpid = gf_list_enum(odm->extra_pids, &j))) {
-			max_buffer += odm->buffer_playout_us;
-			buf_val = gf_filter_pid_query_buffer_duration(xpid->pid, GF_FALSE);
+			max_buffer += odm->buffer_playout_ms;
+			buf_val = gf_filter_pid_query_buffer_duration(xpid->pid, GF_FALSE) / 1000;
+			if (min_time>buf_val) min_time = buf_val;
+
 			if (buf_val > max_buffer) buf_val = max_buffer;
 			cur_buffer += (buf_val>0) ? buf_val : 1;
 		}
@@ -763,6 +771,11 @@
 	if (!scene->root_od->scene_ns)
 		return;
 
+	//if buffering, fire GF_EVENT_MEDIA_PROGRESS - use the min buffer we just computed
+	if ((rebuffer_done || scene->nb_buffering) && (max_buffer>0) ) {
+		gf_odm_service_media_event_with_download(scene->root_od, GF_EVENT_MEDIA_PROGRESS, 0, 0, 0, (u32) (100 * cur_buffer / max_buffer) + 1, (u32) min_time);
+	}
+
 	evt.type = GF_EVENT_PROGRESS;
 	evt.progress.progress_type = 0;
 	evt.progress.service = scene->root_od->scene_ns->url;
@@ -779,7 +792,7 @@
 
 
 
-void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *_event, GF_Err code, Bool no_queueing)
+void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *_event, GF_Err code, Bool no_queuing)
 {
 	/*fire resize event*/
 #ifndef GPAC_DISABLE_SVG
@@ -820,14 +833,14 @@
 		evt.error_state = code;
 	}
 	if (n) {
-		if (no_queueing) {
+		if (no_queuing) {
 			gf_dom_event_fire(n, dom_event);
 		} else {
 			gf_sc_queue_dom_event(scene->compositor, n, dom_event);
 		}
 	} else {
 		if (root) {
-			if (no_queueing) {
+			if (no_queuing) {
 				gf_dom_event_fire(root, dom_event);
 			} else {
 				gf_sc_queue_dom_event(scene->compositor, root, dom_event);
@@ -837,7 +850,7 @@
 		count=scene->root_od->mo ? gf_mo_event_target_count(scene->root_od->mo) : 0;
 		for (i=0; i<count; i++) {
 			GF_Node *an = gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, i));
-			if (no_queueing) {
+			if (no_queuing) {
 				gf_dom_event_fire(an, dom_event);
 			} else {
 				gf_sc_queue_dom_event(scene->compositor, an, dom_event);
@@ -873,6 +886,11 @@
 
 	/*main display scene, setup compositor*/
 	if (!scene->root_od->parentscene) {
+		//force a resize
+		if (gf_sg_get_scene_size_info(scene->graph, NULL, NULL)) {
+			scene->compositor->scene_width = 0;
+			scene->compositor->scene_height = 0;
+		}
 		gf_sc_set_scene(scene->compositor, scene->graph);
 	}
 	else {
@@ -915,11 +933,11 @@
 }
 
 GF_EXPORT
-GF_MediaObject *gf_scene_get_media_object_ex(GF_Scene *scene, MFURL *url, u32 obj_type_hint, Bool lock_timelines, GF_MediaObject *sync_ref, Bool force_new_if_not_attached, GF_Node *node)
+GF_MediaObject *gf_scene_get_media_object_ex(GF_Scene *scene, MFURL *url, u32 obj_type_hint, Bool lock_timelines, GF_MediaObject *sync_ref, Bool force_new_if_not_attached, GF_Node *node, GF_Scene *parent_scene_addon)
 {
 	GF_MediaObject *obj;
-	GF_Scene *original_parent_scene = NULL;
 	Bool keep_fragment = GF_TRUE;
+	GF_Scene *original_parent_scene = parent_scene_addon;
 	Bool first_pass = force_new_if_not_attached ? GF_FALSE : GF_TRUE;
 	u32 i, OD_ID;
 
@@ -1015,7 +1033,7 @@
 	gf_list_add(scene->scene_objects, obj);
 	if (OD_ID == GF_MEDIA_EXTERNAL_ID) {
 		gf_sg_vrml_copy_mfurl(&obj->URLs, url);
-		gf_scene_insert_object(scene, obj, lock_timelines, sync_ref, keep_fragment, original_parent_scene);
+		gf_scene_insert_object(scene, obj, lock_timelines, sync_ref, keep_fragment, original_parent_scene, parent_scene_addon ? GF_TRUE : GF_FALSE);
 		/*safety check!!!*/
 		if (gf_list_find(scene->scene_objects, obj)<0) {
 			return NULL;
@@ -1042,7 +1060,7 @@
 
 GF_MediaObject *gf_scene_get_media_object(GF_Scene *scene, MFURL *url, u32 obj_type_hint, Bool lock_timelines)
 {
-	return gf_scene_get_media_object_ex(scene, url, obj_type_hint, lock_timelines, NULL, GF_FALSE, NULL);
+	return gf_scene_get_media_object_ex(scene, url, obj_type_hint, lock_timelines, NULL, GF_FALSE, NULL, NULL);
 }
 
 
@@ -1050,12 +1068,22 @@
 {
 	u32 pixel_ar;
 	if (!gf_mo_get_visual_info(mo, w, h, NULL, &pixel_ar, NULL, NULL)) return;
+	if (mo->c_w && mo->c_h) {
+		*w = (u32) mo->c_w;
+		*h = (u32) mo->c_h;
+	}
 	if (pixel_ar) {
 		u32 n, d;
 		n = (pixel_ar>>16) & 0x0000FFFF;
 		d = (pixel_ar) & 0x0000FFFF;
 		*w = (*w * n) / d;
 	}
+	if ((mo->rotate==1) || (mo->rotate==3)) {
+		u32 t = *w;
+		*w = *h;
+		*h = t;
+	}
+
 #ifndef GPAC_DISABLE_3D
 	if (mo->odm) {
 		if (mo->odm->parentscene->compositor->fpack==GF_3D_STEREO_TOP) *h /= 2;
@@ -1071,7 +1099,7 @@
 	GF_MediaObject *obj;
 	u32 i;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] Setup object manager %d (MO %p)\n", odm->ID, odm->mo));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Scene] Setup object manager %d (MO %p)\n", odm->ID, odm->mo));
 
 	/*an object may already be assigned (when using ESD URLs, setup is performed twice)*/
 	if (odm->mo != NULL) goto existing;
@@ -1338,7 +1366,7 @@
 		count = gf_list_count(scene->resources);
 		for (i=0; i<count; i++) {
 			odm = (GF_ObjectManager*)gf_list_get(scene->resources, i);
-			if (odm->scalable_addon || !odm->ID)
+			if (!odm->ID)
 				continue;
 
 			if (type==GF_STREAM_TEXT) {
@@ -1430,7 +1458,7 @@
 	for (i=0; i<count; i++) {
 		const GF_PropertyValue *prop;
 		GF_ObjectManager *odm = gf_list_get(scene->resources, i);
-		if (!odm->mo) continue;
+		if (!odm->mo || !odm->pid) continue;
 
 		prop = gf_filter_pid_get_property_str(odm->pid, "MouseEvents");
 		if (prop && prop->value.boolean) {
@@ -1465,7 +1493,7 @@
 		if (url)
 			url->vals = gf_malloc(sizeof(SFURL));
 		if (!url || !url->vals) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate VR proto\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[Terminal] Failed to allocate VR proto\n"));
 			return NULL;
 		}
 		url->count=1;
@@ -1532,8 +1560,8 @@
 }
 /*regenerates the scene graph for dynamic scene.
 This will also try to reload any previously presented streams. Note that in the usual case the scene is generated
-just once when receiving the first OD AU (ressources are NOT destroyed when seeking), but since the network may need
-to update the OD ressources, we still take care of it*/
+just once when receiving the first OD AU (resources are NOT destroyed when seeking), but since the network may need
+to update the OD resources, we still take care of it*/
 void gf_scene_regenerate(GF_Scene *scene)
 {
 	GF_Node *n1, *n2;
@@ -1544,7 +1572,7 @@
 	M_Inline *dims;
 	if (scene->is_dynamic_scene != 1) return;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Inline] Regenerating scene graph for service %s\n", scene->root_od->scene_ns->url));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Inline] Regenerating scene graph for service %s\n", scene->root_od->scene_ns->url));
 
 	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
 
@@ -1845,12 +1873,10 @@
 	M_Inline *dscene = (M_Inline *) gf_sg_find_node_by_name(scene->graph, "ADDON_SCENE");
 
 	if (show_addons) {
-#ifdef FILTER_FIXME
 		GF_AssociatedContentLocation addon_info;
 		memset(&addon_info, 0, sizeof(GF_AssociatedContentLocation));
 		addon_info.timeline_id = -100;
 		gf_scene_register_associated_media(scene, &addon_info);
-#endif
 	} else {
 		gf_sg_vrml_mf_reset(&dscene->url, GF_SG_VRML_MFURL);
 	}
@@ -1958,7 +1984,7 @@
 				gf_odm_disconnect(odm, 2);
 			}
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Scene] Switching %s from service %d to service %d (media time %g)\n", scene->root_od->scene_ns->url, scene->selected_service_id, service_id, (Double)scene->root_od->media_start_time/1000.0));
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[Scene] Switching %s from service %d to service %d (media time %g)\n", scene->root_od->scene_ns->url, scene->selected_service_id, service_id, (Double)scene->root_od->media_start_time/1000.0));
 
 		scene->selected_service_id = service_id;
 		scene->audio_url.OD_ID = 0;
@@ -2291,14 +2317,14 @@
 	}
 
 	if (!restart_only) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Scene] Restarting from "LLD"\n", from_time));
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[Scene] Restarting from "LLD"\n", from_time));
 		/*reset clock*/
 		gf_clock_reset(ck);
 
 		//used by SVG for JSAPIs..;
 		if (!scene->is_dynamic_scene) gf_clock_set_time(ck, 0);
 	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Scene] Restarting scene from current clock %d\n", gf_clock_time(ck) ));
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[Scene] Restarting scene from current clock %d\n", gf_clock_time(ck) ));
 	}
 
 
@@ -2702,7 +2728,7 @@
 		char *sep;
 
 		if (use_old_syntax) {
-			sep = gf_url_colon_suffix(url_search);
+			sep = gf_url_colon_suffix(url_search, 0);
 		} else {
 			sep = strstr(url_search, "::");
 		}
@@ -2889,7 +2915,6 @@
 		gf_scene_reset_addon(addon, GF_FALSE);
 	}
 }
-#ifdef FILTER_FIXME
 
 static void load_associated_media(GF_Scene *scene, GF_AddonMedia *addon)
 {
@@ -2907,15 +2932,22 @@
 	//we may need to change the object type once we have more ideas what the external resource is about.
 	//By default we start with scene
 	//we force the timeline of the addon to be locked with the main scene
-	mo = gf_scene_get_media_object(scene, &url, GF_MEDIA_OBJECT_SCENE, GF_TRUE);
+	mo = gf_scene_get_media_object_ex(scene, &url, GF_MEDIA_OBJECT_SCENE, GF_TRUE, NULL, GF_FALSE, NULL, scene);
 
 	if (!mo || !mo->odm) {
-		assert(0);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[Compositor] Failed to load media addon %s\n", addon->url));
 		return;
 	}
 
 	addon->root_od = mo->odm;
 	mo->odm->addon = addon;
+	//force graph_attached for scalable cases where the inserted pid never connects to the compositor
+	if (mo->odm->subscene)
+		mo->odm->subscene->graph_attached = 1;
+
+	if (mo->odm->addon->addon_type == GF_ADDON_TYPE_ADDITIONAL) {
+		gf_scene_select_object(mo->odm->parentscene, mo->odm);
+	}
 }
 
 
@@ -2999,7 +3031,7 @@
 	if (!addon) {
 		GF_SAFEALLOC(addon, GF_AddonMedia);
 		if (!addon) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate media addon\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[Terminal] Failed to allocate media addon\n"));
 			return;
 		}
 		addon->timeline_id = addon_info->timeline_id;
@@ -3008,7 +3040,11 @@
 	}
 
 	addon->is_splicing = addon_info->is_splicing;
-	addon->activation_time = gf_scene_get_time(scene)+addon_info->activation_countdown;
+	addon->activation_time = gf_scene_get_time(scene);
+
+	if (addon_info->activation_countdown.den)
+		addon->activation_time += ((Double)addon_info->activation_countdown.num) / addon_info->activation_countdown.den;
+
 	addon->url = gf_strdup(addon_info->external_URL);
 	addon->media_timescale = 1;
 	addon->timeline_ready = (addon_info->timeline_id<0) ? 1 : 0;
@@ -3037,9 +3073,13 @@
 	//notify we found a new addon
 
 	if (! scene->root_od->parentscene) {
-		evt.type = GF_EVENT_ADDON_DETECTED;
-		evt.addon_connect.addon_url = addon->url;
-		addon->enabled = gf_sc_send_event(scene->compositor, &evt);
+		if (gf_sys_is_test_mode()) {
+			addon->enabled = GF_TRUE;
+		} else {
+			evt.type = GF_EVENT_ADDON_DETECTED;
+			evt.addon_connect.addon_url = addon->url;
+			addon->enabled = gf_sc_send_event(scene->compositor, &evt);
+		}
 
 		if (addon->timeline_ready)
 			load_associated_media(scene, addon);
@@ -3123,15 +3163,15 @@
 	}
 
 	//and forward ntp if any to underlying service
-	if (addon_time->ntp && addon->root_od && addon->root_od->net_service) {
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(com));
-		com.addon_time = *addon_time;
-		gf_term_service_command(addon->root_od->net_service, &com);
+	if (addon_time->ntp && addon->root_od && addon->root_od->pid) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_PLAY, addon->root_od->pid);
+		evt.ntp.ntp = addon_time->ntp;
+		gf_filter_pid_send_event(addon->root_od->pid, &evt);
 	}
 }
 
-#endif
+
 
 Bool gf_scene_check_addon_restart(GF_AddonMedia *addon, u64 cts, u64 dts)
 {
@@ -3218,110 +3258,6 @@
 	return media_ts_ms;
 }
 
-void gf_scene_select_scalable_addon(GF_Scene *scene, GF_ObjectManager *odm)
-{
-#ifdef FILTER_FIXME
-	Bool nalu_annex_b;
-	Bool force_attach=GF_FALSE;
-#endif
-	GF_ObjectManager *odm_base = NULL;
-	u32 i, count;
-
-	count = gf_list_count(scene->resources);
-	for (i=0; i<count; i++) {
-		odm_base = gf_list_get(scene->resources, i);
-		if ((odm->type==odm_base->type) && odm_base->ID)
-			break;
-		odm_base=NULL;
-		//todo
-		//1- check if we use compatible formats, for now we only do demos with hevc/lhvc
-		//2- check dependency IDs if any, for now we only do demos with 2 layers hevc/lhvc
-	}
-	if (!odm_base) return;
-
-	odm_base->upper_layer_odm = odm;
-	odm->lower_layer_odm = odm_base;
-
-	switch (odm_base->original_oti) {
-	case GF_CODECID_AVC:
-	case GF_CODECID_SVC:
-	case GF_CODECID_MVC:
-		switch (odm->original_oti) {
-		case GF_CODECID_LHVC:
-			if (!odm_base->hybrid_layered_coded) {
-#ifdef FILTER_FIXME
-				force_attach=GF_TRUE;
-#endif
-
-			}
-			odm_base->hybrid_layered_coded=GF_TRUE;
-			break;
-		}
-		break;
-	case GF_CODECID_HEVC:
-#ifdef FILTER_FIXME
-		force_attach=GF_TRUE;
-#endif
-		break;
-	}
-	odm->lower_layer_odm = odm_base;
-
-#ifdef FILTER_FIXME
-	GF_NetworkCommand com;
-
-	if (odm_base->upper_layer_odm) {
-		force_attach=GF_FALSE;
-	} else {
-		odm_base->upper_layer_odm = odm;
-	}
-	odm->lower_layer_odm = odm_base;
-
-	nalu_annex_b = 1;
-	if (base_ch->esd->decoderConfig->decoderSpecificInfo && base_ch->esd->decoderConfig->decoderSpecificInfo->dataLength)
-		nalu_annex_b = 0;
-
-	if (odm_base->hybrid_layered_coded && ch->esd->decoderConfig->decoderSpecificInfo && ch->esd->decoderConfig->decoderSpecificInfo->dataLength) {
-
-		nalu_annex_b = 0;
-		if (force_attach) {
-			odm_base->codec->decio->AttachStream(odm_base->codec->decio, ch->esd);
-		}
-	} else if (force_attach) {
-		//we force annexB mode, delete avcC/hvcC
-		if (nalu_annex_b && ch->esd->decoderConfig->decoderSpecificInfo) {
-			gf_odf_desc_del((GF_Descriptor *)ch->esd->decoderConfig->decoderSpecificInfo);
-			ch->esd->decoderConfig->decoderSpecificInfo=NULL;
-		}
-		odm_base->codec->decio->AttachStream(odm_base->codec->decio, ch->esd);
-	}
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_CHAN_NALU_MODE;
-	//force AnnexB mode and no sync sample seeking
-	com.nalu_mode.extract_mode = nalu_annex_b ? 2 : 0;
-	count = gf_list_count(odm->channels);
-	for (i=0; i<count; i++) {
-		com.base.on_channel = ch = gf_list_get(odm->channels, i);
-		//we must wait for RAP otherwise we won't be able to detect temporal scalability correctly
-		ch->stream_state = 1;
-		ch->media_padding_bytes = base_ch->media_padding_bytes;
-		gf_term_service_command(ch->service, &com);
-	}
-
-	caps.CapCode = GF_CODEC_MEDIA_SWITCH_QUALITY;
-	// splicing, signal to the base decoder that we will want low quality and wait for splice activation
-	if (odm->parentscene->root_od->addon->is_splicing) {
-		caps.cap.valueInt = 0;
-	}
-	//not splicing, signal to the base decoder that we will want full quality right now
-	else {
-		caps.cap.valueInt = 2;
-	}
-	odm_base->codec->decio->SetCapabilities(odm_base->codec->decio, caps);
-#endif
-}
-
-
 GF_EXPORT
 void gf_scene_switch_quality(GF_Scene *scene, Bool up)
 {
@@ -3352,14 +3288,5 @@
 		}
 		if (odm->subscene)
 			gf_scene_switch_quality(odm->subscene, up);
-
-#ifdef FILTER_FIXME
-		if (odm->scalable_addon) {
-			if (up)
-				gf_odm_start(odm, 0);
-			else
-				gf_odm_stop(odm, GF_FALSE);
-		}
-#endif
 	}
 }

gpac-1.0.1.tar.gz/src/compositor/scene_ns.c -> gpac-2.0.0.tar.gz/src/compositor/scene_ns.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -27,7 +27,7 @@
 #include <gpac/network.h>
 
 
-void scene_ns_on_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
+Bool scene_ns_on_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
 {
 	GF_SceneNamespace *scene_ns;
 	GF_Scene *scene;
@@ -38,11 +38,11 @@
 	scene = root->subscene ? root->subscene : root->parentscene;
 	assert(scene);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM] Service connection failure received from %s - %s\n", scene_ns->url, gf_error_to_string(err) ));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM] Service connection failure received from %s - %s\n", scene_ns->url, gf_error_to_string(err) ));
 
 	if (root->scene_ns->owner != root) {
 		gf_scene_message(scene, scene_ns->url, "Incompatible module type", GF_SERVICE_ERROR);
-		return;
+		return GF_FALSE;
 	}
 	/*this is service connection*/
 	gf_odm_service_media_event(root, GF_EVENT_MEDIA_SETUP_DONE);
@@ -53,7 +53,7 @@
 		snprintf(msg, sizeof(msg), "Cannot open %s", scene_ns->url);
 		gf_scene_message(scene, scene_ns->url, msg, err);
 
-		if (root->mo) root->mo->connect_failure = GF_TRUE;
+		if (root->mo) root->mo->connect_state = MO_CONNECT_FAILED;
 		gf_odm_service_media_event(root, GF_EVENT_ERROR);
 
 		/*destroy service only if attached*/
@@ -97,57 +97,13 @@
 				gf_scene_remove_object(root->parentscene, root, 0);
 				gf_odm_disconnect(root, 1);
 			}
-			return;
+			return GF_FALSE;
 		}
 	}
+	return GF_FALSE;
 }
 
 
-
-#ifdef FILTER_FIXME
-static void term_on_disconnect(GF_ClientService *service, LPNETCHANNEL netch, GF_Err response)
-{
-	GF_ObjectManager *root;
-	GF_Channel *ch;
-	GF_Terminal *term = service->term;
-
-	/*may be null upon destroy*/
-	root = service->owner;
-	if (root && (root->net_service != service)) {
-		if (root->net_service) gf_term_message(term, service->url, "Incompatible module type", GF_SERVICE_ERROR);
-		return;
-	}
-	//reset global seek time
-	if (term->root_scene && term->root_scene->root_od)
-		term->root_scene->root_od->media_start_time = 0;
-
-	/*this is service disconnect*/
-	if (!netch) {
-		if (service->subservice_disconnect) {
-			if (service->owner && service->subservice_disconnect==1) {
-				GF_Scene *scene = service->owner->subscene ? service->owner->subscene : service->owner->parentscene;
-				/*destroy all media*/
-				gf_scene_disconnect(scene, GF_TRUE);
-			}
-			return;
-		}
-		/*unregister from valid services*/
-		if (gf_list_del_item(term->net_services, service)>=0) {
-			/*and queue for destroy*/
-			gf_list_add(term->net_services_to_remove, service);
-		}
-		return;
-	}
-	/*this is channel disconnect*/
-
-	/*no notif in case of failure for disconnection*/
-	ch = gf_term_get_channel(service, netch);
-	if (!ch) return;
-	/*signal channel state*/
-	ch->es_state = GF_ESM_ES_DISCONNECTED;
-}
-#endif
-
 void gf_scene_insert_pid(GF_Scene *scene, GF_SceneNamespace *sns, GF_FilterPid *pid, Bool is_in_iod)
 {
 	u32 i, min_od_id;
@@ -161,11 +117,11 @@
 
 	root = sns->owner;
 	if (!root) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Service %s] has no root, aborting !\n", sns->url));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[Service %s] has no root, aborting !\n", sns->url));
 		return;
 	}
 	if (root->flags & GF_ODM_DESTROYED) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Service %s] root has been scheduled for destruction - aborting !\n", sns->url));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[Service %s] root has been scheduled for destruction - aborting !\n", sns->url));
 		return;
 	}
 	scene = root->subscene ? root->subscene : root->parentscene;
@@ -196,7 +152,7 @@
 		}
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Service %s] Adding new media\n", sns->url));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Service %s] Adding new media\n", sns->url));
 
 	/*object declared this way are not part of an OD stream and are considered as dynamic*/
 	/*	od->objectDescriptorID = GF_MEDIA_EXTERNAL_ID; */
@@ -206,9 +162,7 @@
 	odm = NULL;
 	min_od_id = 0;
 	for (i=0; i<gf_list_count(scene->scene_objects); i++) {
-#if FILTER_FIXME
 		char *frag = NULL;
-#endif
 		char *ext, *url;
 		u32 match_esid = 0;
 		Bool type_matched = GF_FALSE;
@@ -279,9 +233,7 @@
 
 		ext = strrchr(mo->URLs.vals[0].url, '#');
 		if (ext) {
-#if FILTER_FIXME
 			frag = strchr(ext, '=');
-#endif
 			ext[0] = 0;
 		}
 		url = mo->URLs.vals[0].url;
@@ -313,16 +265,16 @@
 		default:
 			continue;
 		}
-#if FILTER_FIXME
+
 		if (frag) {
 			u32 frag_id = 0;
-			u32 ID = od->objectDescriptorID;
-			if (ID==GF_MEDIA_EXTERNAL_ID) ID = esd->ESID;
+			u32 ID = mo->OD_ID;
+			if (ID==GF_MEDIA_EXTERNAL_ID) ID = pid_id;
 			frag++;
 			frag_id = atoi(frag);
 			if (ID!=frag_id) continue;
 		}
-#endif
+
 		the_mo = mo;
 		odm = mo->odm;
 		pid_odid = odm->ID = mo->OD_ID;
@@ -399,10 +351,9 @@
 
 	//we insert right away the PID as a new object if the scene is dynamic
 	//if the scene is not dynamic, we wait for the corresponding OD update
-	//FILTER_FIXME: needs rework to enable attaching subtitle to a non-dynamic scene
 	//otherwise if subscene, this is an IOD
 	if (odm->subscene || (odm->flags & GF_ODM_NOT_IN_OD_STREAM) ) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] setup object - MO %08x\n", odm->ID, odm->mo));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM%d] setup object - MO %08x\n", odm->ID, odm->mo));
 		gf_odm_setup_object(odm, sns, pid);
 	} else {
 		//cannot setup until we get the associated OD_Update
@@ -414,7 +365,7 @@
 		GF_Event evt;
 		root->scene_ns->connect_ack = GF_TRUE;
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM] Root object connected (%s) !\n", root->scene_ns->url));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[ODM] Root object connected (%s) !\n", root->scene_ns->url));
 
 		evt.type = GF_EVENT_CONNECT;
 		evt.connect.is_connected = GF_TRUE;
@@ -429,7 +380,7 @@
 
 	GF_SAFEALLOC(sns, GF_SceneNamespace);
 	if (!sns) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Compose] Failed to allocate namespace\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[Compose] Failed to allocate namespace\n"));
 		return NULL;
 	}
 	sns->owner = owner;
@@ -478,12 +429,17 @@
 }
 
 /*connects given OD manager to its URL*/
-void gf_scene_ns_connect_object(GF_Scene *scene, GF_ObjectManager *odm, char *serviceURL, char *parent_url)
+void gf_scene_ns_connect_object(GF_Scene *scene, GF_ObjectManager *odm, char *serviceURL, char *parent_url, GF_SceneNamespace *addon_parent_ns)
 {
 	GF_Err e;
 	char *frag;
+	char *url_with_args = NULL;
 	Bool reloc_result=GF_FALSE;
 
+ if (addon_parent_ns) {
+		parent_url = NULL;
+ }
+
 	/*check cache*/
 	if (parent_url) {
 		u32 i, count;
@@ -553,16 +509,47 @@
 		if (frag) frag[0] = '#';
 		return;
 	}
-	if (!parent_url && odm->parentscene && odm->parentscene->root_od->scene_ns)
+	if (!addon_parent_ns && !parent_url && odm->parentscene && odm->parentscene->root_od->scene_ns)
 		parent_url = odm->parentscene->root_od->scene_ns->url;
 
-	odm->scene_ns->source_filter = gf_filter_connect_source(scene->compositor->filter, serviceURL, parent_url, GF_FALSE, &e);
+	//we setup an addon, use the same filter chain (so copy source id) as orginial content
+	//so that any scalable streams in the addon can connect to decoders
+ if (addon_parent_ns) {
+		const char *fid = gf_filter_get_id(addon_parent_ns->source_filter);
+		if (fid) {
+			char szExt[100];
+			char sep_a = gf_filter_get_sep(scene->compositor->filter, GF_FS_SEP_ARGS);
+			char sep_v = gf_filter_get_sep(scene->compositor->filter, GF_FS_SEP_NAME);
+			gf_dynstrcat(&url_with_args, serviceURL, NULL);
+			sprintf(szExt, "%cgpac%cFID%c", sep_a, sep_a, sep_v);
+			gf_dynstrcat(&url_with_args, szExt, NULL);
+			gf_dynstrcat(&url_with_args, fid, NULL);
+		}
+	}
+
+	gf_filter_lock_all(scene->compositor->filter, GF_TRUE);
+	odm->scene_ns->source_filter = gf_filter_connect_source(scene->compositor->filter, url_with_args ? url_with_args : serviceURL, parent_url, GF_FALSE, &e);
+	if (url_with_args) gf_free(url_with_args);
 
 	if (frag) frag[0] = '#';
 	if (!odm->scene_ns->source_filter) {
 		Bool remove_scene=GF_FALSE;
 		GF_Scene *target_scene = odm->subscene ? NULL : odm->parentscene;
-		if (odm->mo) odm->mo->connect_failure = GF_TRUE;
+
+		gf_filter_lock_all(scene->compositor->filter, GF_FALSE);
+		if (!odm->mo && target_scene) {
+			u32 i;
+			for (i=0; i<gf_list_count(target_scene->scene_objects); i++) {
+				GF_MediaObject *mo = gf_list_get(target_scene->scene_objects, i);
+				if (mo->odm) continue;
+				if ((mo->OD_ID != GF_MEDIA_EXTERNAL_ID) && (mo->OD_ID==odm->ID)) {
+					odm->mo = mo;
+					mo->odm = odm;
+					break;
+				}
+			}
+		}
+		if (odm->mo) odm->mo->connect_state = MO_CONNECT_FAILED;
 		odm->skip_disconnect_state = 1;
 		//prevent scene from being disconnected - this can happen if a script catches the event and triggers a disonnection of the parent scene
 		if (target_scene) target_scene->root_od->skip_disconnect_state = 1;
@@ -581,32 +568,13 @@
 		}
 		return;
 	}
- //make sure we only connect this filter to ourselves 
- gf_filter_set_source(scene->compositor->filter, odm->scene_ns->source_filter, NULL);
- 
+ //make sure we only connect this filter to ourselves
+	gf_filter_set_source_restricted(scene->compositor->filter, odm->scene_ns->source_filter, NULL);
+
 	gf_filter_set_setup_failure_callback(scene->compositor->filter, odm->scene_ns->source_filter, scene_ns_on_setup_error, odm);
 
+	gf_filter_lock_all(scene->compositor->filter, GF_FALSE);
+
 	/*OK connect*/
 	gf_odm_service_media_event(odm, GF_EVENT_MEDIA_SETUP_BEGIN);
 }
-
-
-GF_EXPORT
-Bool gf_term_is_supported_url(GF_Terminal *term, const char *fileName, Bool use_parent_url, Bool no_mime_check)
-{
-#ifdef FILTER_FIXME
-	GF_InputService *ifce;
-	GF_Err e;
-	char *sURL;
-	char *mime=NULL;
-	char *parent_url = NULL;
-	if (use_parent_url && term->root_scene) parent_url = term->root_scene->root_od->net_service->url;
-
-	ifce = gf_term_can_handle_service(term, fileName, parent_url, no_mime_check, &sURL, &e, NULL, &mime);
-	if (!ifce) return 0;
-	gf_modules_close_interface((GF_BaseInterface *) ifce);
-	gf_free(sURL);
-	if (mime) gf_free(mime);
-#endif
-	return 1;
-}

gpac-1.0.1.tar.gz/src/compositor/svg_external.c -> gpac-2.0.0.tar.gz/src/compositor/svg_external.c Changed

gpac-1.0.1.tar.gz/src/compositor/svg_filters.c -> gpac-2.0.0.tar.gz/src/compositor/svg_filters.c Changed

gpac-1.0.1.tar.gz/src/compositor/svg_font.c -> gpac-2.0.0.tar.gz/src/compositor/svg_font.c Changed

@@ -44,7 +44,7 @@
 static GF_Err svg_font_get_glyphs(void *udta, const char *utf_string, u32 *glyph_buffer, u32 *io_glyph_buffer_size, const char *lang, Bool *is_rtl)
 {
 	u32 prev_c;
-	size_t len;
+	u32 len;
 	u32 i, gl_idx;
 	u16 *utf_res;
 	GF_Node *node = (GF_Node *)udta;
@@ -64,16 +64,16 @@
 	}
 
 	len = gf_utf8_mbstowcs((u16*) glyph_buffer, *io_glyph_buffer_size, (const char**)&utf8);
-	if (len == (size_t) -1) return GF_IO_ERR;
+	if (len == GF_UTF8_FAIL) return GF_IO_ERR;
 	/*should not happen*/
 	if (utf8) return GF_IO_ERR;
 
 	/*perform bidi relayout*/
 	utf_res = (u16 *) glyph_buffer;
-	*is_rtl = gf_utf8_reorder_bidi(utf_res, (u32) len);
+	*is_rtl = gf_utf8_reorder_bidi(utf_res, len);
 
 	/*move 16bit buffer to 32bit*/
-	for (i=(u32)len; i>0; i--) {
+	for (i=len; i>0; i--) {
 		glyph_buffer[i-1] = utf_res[i-1];
 	}
 
@@ -349,7 +349,7 @@
 {
 	u16 utf_name[20];
 	u8 *utf8;
-	size_t len;
+	u32 len;
 	GF_Rect rc;
 	GF_Glyph *glyph;
 	GF_Font *font;
@@ -377,6 +377,7 @@
 	if (!st) return;
 	utf8 = (u8 *) *atts.unicode;
 	len = gf_utf8_mbstowcs(utf_name, 200, (const char **) &utf8);
+	if (len == GF_UTF8_FAIL) return;
 	/*this is a single glyph*/
 	if (len==1) {
 		st->glyph.utf_name = utf_name[0];
@@ -485,16 +486,6 @@
 	return st->alias;
 }
 
-static GF_Err svg_font_uri_get_glyphs(void *udta, const char *utf_string, u32 *glyph_buffer, u32 *io_glyph_buffer_size, const char *lang, Bool *is_rtl)
-{
-	return GF_URL_ERROR;
-}
-
-static GF_Glyph *svg_font_uri_load_glyph(void *udta, u32 glyph_name)
-{
-	return NULL;
-}
-
 static void svg_traverse_font_face_uri(GF_Node *node, void *rs, Bool is_destroy)
 {
 	if (is_destroy) {
@@ -559,8 +550,6 @@
 
 	font->ft_mgr = compositor->font_manager;
 
-	font->get_glyphs = svg_font_uri_get_glyphs;
-	font->load_glyph = svg_font_uri_load_glyph;
 	font->get_alias = svg_font_uri_get_alias;
 	font->udta = node;
 	font->name = gf_strdup(atts.font_family->value);

gpac-1.0.1.tar.gz/src/compositor/svg_geometry.c -> gpac-2.0.0.tar.gz/src/compositor/svg_geometry.c Changed

gpac-1.0.1.tar.gz/src/compositor/svg_grouping.c -> gpac-2.0.0.tar.gz/src/compositor/svg_grouping.c Changed

@@ -392,7 +392,7 @@
 					gf_path_add_rect(stack->vp_fill->path, 0, 0, width, -height);
 				}
 
-				ctx = drawable_init_context_svg(stack->vp_fill, tr_state);
+				ctx = drawable_init_context_svg(stack->vp_fill, tr_state, NULL);
 				if (ctx) {
 					ctx->flags &= ~CTX_IS_TRANSPARENT;
 					ctx->aspect.pen_props.width = 0;
@@ -519,6 +519,7 @@
 	struct _group_cache *cache;
 #endif
 
+	Drawable *clip_drawable;
 } SVGgStack;
 
 static void svg_traverse_g(GF_Node *node, void *rs, Bool is_destroy)
@@ -540,6 +541,7 @@
 #else
 		if (group->cache) group_cache_del(group->cache);
 #endif
+		drawable_del(group->clip_drawable);
 		gf_free(group);
 		gf_sc_check_focus_upon_destroy(node);
 		return;
@@ -549,8 +551,21 @@
 #ifndef GPAC_DISABLE_3D
 	         || tr_state->traversing_mode == TRAVERSE_DRAW_3D
 #endif
-	        ) {
+	) {
 		SVGgStack *group = gf_node_get_private(node);
+
+		//clip path on group
+		if (tr_state->ctx->appear) {
+			//draw clip
+			if (tr_state->ctx->aspect.fill_color) {
+				gf_node_traverse(tr_state->ctx->appear, tr_state);
+			}
+			//reset clip
+			else {
+				gf_evg_surface_set_mask_mode(tr_state->visual->raster_surface, GF_EVGMASK_NONE);
+			}
+			return;
+		}
 		group_cache_draw(group->cache, tr_state);
 		return;
 	}
@@ -664,7 +679,36 @@
 				}
 			}
 #else
-			compositor_svg_traverse_children(((SVG_Element *)node)->children, tr_state);
+
+			SVG_ClipPath *cp = all_atts.clip_path;
+			if (cp && !cp->target.target) {
+				cp->target.target = cp->target.string ? gf_sg_find_node_by_name(tr_state->visual->compositor->scene, cp->target.string+1) : NULL;
+				if (!cp->target.target) cp = NULL;
+			}
+
+			//we handle group clip by faking a drawable the size of the viewport
+			//we insert one drawable doing the clipping, and one disabling it
+			if (cp && (tr_state->traversing_mode==TRAVERSE_SORT)) {
+				DrawableContext *ctx;
+				gf_path_reset(group->clip_drawable->path);
+				gf_path_add_rect(group->clip_drawable->path,
+					INT2FIX(tr_state->visual->top_clipper.x), INT2FIX(tr_state->visual->top_clipper.y),
+					INT2FIX(tr_state->visual->top_clipper.width), INT2FIX(tr_state->visual->top_clipper.height)
+				);
+				ctx = drawable_init_context_svg(group->clip_drawable, tr_state, NULL);
+				ctx->appear = (GF_Node *) cp->target.target;
+				ctx->aspect.fill_color = 0xFFFFFFFF;
+				drawable_finalize_sort(ctx, tr_state, NULL);
+
+				compositor_svg_traverse_children(((SVG_Element *)node)->children, tr_state);
+
+				ctx = drawable_init_context_svg(group->clip_drawable, tr_state, NULL);
+				ctx->appear = (GF_Node *) cp->target.target;
+				ctx->aspect.fill_color = 0;
+				drawable_finalize_sort(ctx, tr_state, NULL);
+			} else {
+				compositor_svg_traverse_children(((SVG_Element *)node)->children, tr_state);
+			}
 #endif
 		}
 		if (clear) gf_node_dirty_clear(node, 0);
@@ -690,6 +734,9 @@
 	GF_SAFEALLOC(stack, SVGgStack);
 	if (!stack) return;
 	gf_node_set_private(node, stack);
+	stack->clip_drawable = drawable_new();
+	stack->clip_drawable->node = node;
+	stack->clip_drawable->flags = DRAWABLE_USE_TRAVERSE_DRAW;
 
 	gf_node_set_callback_function(node, svg_traverse_g);
 }
@@ -733,7 +780,6 @@
 
 
 
-
 static void svg_traverse_switch(GF_Node *node, void *rs, Bool is_destroy)
 {
 	GF_Matrix2D backup_matrix;

gpac-1.0.1.tar.gz/src/compositor/svg_media.c -> gpac-2.0.0.tar.gz/src/compositor/svg_media.c Changed

gpac-1.0.1.tar.gz/src/compositor/svg_paint_servers.c -> gpac-2.0.0.tar.gz/src/compositor/svg_paint_servers.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato - Jean le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
+ *			Copyright (c) Telecom ParisTech 2005-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -445,6 +445,7 @@
 	}
 
 	gf_evg_stencil_set_matrix(stencil, &mat);
+	gf_evg_stencil_set_auto_matrix(stencil, GF_FALSE);
 	gf_evg_surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
 	gf_evg_surface_set_path(surface, path);
 	gf_evg_surface_fill(surface, stencil);
@@ -555,7 +556,7 @@
 		end.y = 0;
 	}
 
-	gf_evg_stencil_set_gradient_mode(stencil, (GF_GradientMode) all_atts.spreadMethod ? *(SVG_SpreadMethod*)all_atts.spreadMethod : 0);
+	gf_evg_stencil_set_gradient_mode(stencil, (GF_GradientMode) (all_atts.spreadMethod ? *(SVG_SpreadMethod*)all_atts.spreadMethod : 0) );
 
 
 	if (bounds && (!all_atts.gradientUnits || (*(SVG_GradientUnit*)all_atts.gradientUnits==SVG_GRADIENTUNITS_OBJECT)) ) {
@@ -660,7 +661,7 @@
 		center.y = FIX_ONE/2;
 	}
 
-	gf_evg_stencil_set_gradient_mode(stencil, (GF_GradientMode) all_atts.spreadMethod ? *(SVG_SpreadMethod*)all_atts.spreadMethod : 0);
+	gf_evg_stencil_set_gradient_mode(stencil, (GF_GradientMode) (all_atts.spreadMethod ? *(SVG_SpreadMethod*)all_atts.spreadMethod : 0));
 
 	if (all_atts.fx) {
 		focal.x = all_atts.fx->value;
@@ -802,6 +803,76 @@
 }
 
 
+static void svg_traverse_clip_path(GF_Node *node, void *rs, Bool is_destroy)
+{
+	u32 tr_mode_bck;
+	Bool immediate_bck;
+	DrawableContext *ctx_bck;
+	SVGPropertiesPointers *props_bck;
+	GF_Matrix2D mx_bck;
+	Bool is_first = GF_FALSE;
+	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
+	SVGPropertiesPointers *svg_props = gf_node_get_private(node);
+
+	if (is_destroy) {
+		gf_free(svg_props);
+		return;
+	}
+	if (tr_state->traversing_mode!=TRAVERSE_DRAW_2D) {
+		return;
+	}
+#ifndef GPAC_DISABLE_3D
+	if (tr_state->visual->type_3d && !tr_state->visual->compositor->hybrid_opengl) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] clipPath not supported in 3D mode, try using `--ogl=hybrid`\n"));
+		return;
+	}
+#endif
+	if (! tr_state->visual->CheckAttached(tr_state->visual) ) return;
+	if (!tr_state->ctx) return;
+
+	tr_mode_bck = tr_state->traversing_mode;
+	immediate_bck = tr_state->immediate_draw;
+	ctx_bck = tr_state->ctx;
+	props_bck = tr_state->svg_props;
+	gf_mx2d_copy(mx_bck, tr_state->transform);
+
+	//force immediate mode draw
+	tr_state->traversing_mode = TRAVERSE_SORT;
+	tr_state->immediate_draw = GF_TRUE;
+	gf_mx2d_copy(tr_state->transform, tr_state->ctx->transform);
+	tr_state->ctx = NULL;
+
+	if (gf_evg_surface_get_mask_mode(tr_state->visual->raster_surface)==GF_EVGMASK_NONE) {
+		is_first = GF_TRUE;
+		gf_evg_surface_set_mask_mode(tr_state->visual->raster_surface, GF_EVGMASK_DRAW);
+	}
+
+	tr_state->svg_props = svg_props;
+	gf_svg_properties_init_pointers(tr_state->svg_props);
+
+	compositor_svg_traverse_children(((SVG_Element *)node)->children, tr_state);
+
+	gf_svg_properties_reset_pointers(tr_state->svg_props);
+
+	if (is_first) {
+		gf_evg_surface_set_mask_mode(tr_state->visual->raster_surface, GF_EVGMASK_USE);
+	}
+
+	tr_state->traversing_mode = tr_mode_bck;
+	tr_state->immediate_draw = immediate_bck;
+	tr_state->ctx = ctx_bck;
+	tr_state->svg_props = props_bck;
+	gf_mx2d_copy(tr_state->transform, mx_bck);
+}
+
+void compositor_init_svg_clip_path(GF_Compositor *compositor, GF_Node *node)
+{
+	SVGPropertiesPointers *svg_props;
+	GF_SAFEALLOC(svg_props, SVGPropertiesPointers);
+	if (!svg_props) return;
+	gf_node_set_private(node, svg_props);
+	gf_node_set_callback_function(node, svg_traverse_clip_path);
+}
 #endif

gpac-1.0.1.tar.gz/src/compositor/svg_text.c -> gpac-2.0.0.tar.gz/src/compositor/svg_text.c Changed

@@ -1011,10 +1011,11 @@
 			tr_state->bounds = st->bounds;
 
 	} else if ((tr_state->traversing_mode == TRAVERSE_SORT)
-	           && !compositor_svg_is_display_off(tr_state->svg_props)
-	           && (*(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN)
-	          ) {
-		ctx = drawable_init_context_svg(st->drawable, tr_state);
+		&& !compositor_svg_is_display_off(tr_state->svg_props)
+		&& (*(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN)
+	  ) {
+		ctx = drawable_init_context_svg(st->drawable, tr_state, atts.clip_path);
+
 		if (ctx) svg_finalize_sort(ctx, st, tr_state);
 
 		/*and browse children*/
@@ -1206,7 +1207,8 @@
 	) {
 		child = ((GF_ParentNode *) tspan)->children;
 
-		ctx = drawable_init_context_svg(st->drawable, tr_state);
+		ctx = drawable_init_context_svg(st->drawable, tr_state, atts.clip_path);
+
 		if (ctx) svg_finalize_sort(ctx, st, tr_state);
 
 		while (child) {
@@ -1449,7 +1451,8 @@
 	            && (*(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN)
 	          ) {
 
-		ctx = drawable_init_context_svg(st->drawable, tr_state);
+		ctx = drawable_init_context_svg(st->drawable, tr_state, atts.clip_path);
+
 		if (ctx) svg_finalize_sort(ctx, st, tr_state);
 
 		child = ((GF_ParentNode *) text)->children;

gpac-1.0.1.tar.gz/src/compositor/texturing.c -> gpac-2.0.0.tar.gz/src/compositor/texturing.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -96,16 +96,12 @@
 		if (e != GF_OK) return e;
 	}
 	txh->is_open = 1;
-
+	txh->stream_finished = GF_FALSE;
 	/*request play*/
 	gf_mo_play(txh->stream, start_offset, end_offset, can_loop);
 
 	txh->last_frame_time = (u32) (-1);
 
-	//we need to rework the raw memory stuff to be transparent
-#ifdef FILTER_FIXME
-	txh->raw_memory = GF_FALSE;
-#endif
 	/*request play*/
 	return GF_OK;
 }
@@ -129,7 +125,7 @@
 void gf_sc_texture_stop_no_unregister(GF_TextureHandler *txh)
 {
 	if (!txh->is_open) return;
-	/*release texture WITHOUT droping frame*/
+	/*release texture WITHOUT dropping frame*/
 	if (txh->needs_release) {
 		gf_mo_release_data(txh->stream, 0xFFFFFFFF, 1);
 		txh->needs_release = 0;
@@ -147,7 +143,7 @@
 void gf_sc_texture_stop(GF_TextureHandler *txh)
 {
 	if (!txh->is_open) return;
-	/*release texture WITHOUT droping frame*/
+	/*release texture WITHOUT dropping frame*/
 	if (txh->needs_release) {
 		gf_mo_release_data(txh->stream, 0xFFFFFFFF, -1);
 		txh->needs_release = 0;
@@ -157,6 +153,7 @@
 	gf_mo_stop(&txh->stream);
 	if (!txh->stream) {
 		txh->data = NULL;
+		txh->frame_ifce = NULL;
 	}
 	txh->is_open = 0;
 
@@ -242,7 +239,6 @@
 	}
 	//if first frame use 20ms as upload time
 	push_time = txh->nb_frames ? txh->upload_time/txh->nb_frames : 20;
-	
 	txh->data = gf_mo_fetch_data(txh->stream, disable_resync ? GF_MO_FETCH : GF_MO_FETCH_RESYNC, push_time, &txh->stream_finished, &ts, &size, &ms_until_pres, &ms_until_next, &txh->frame_ifce, NULL);
 
 	if (txh->stream->config_changed) {
@@ -250,7 +246,7 @@
 	} else if (txh->data && size && txh->size && (size != txh->size)) {
 		needs_reload = 1;
 	}
-	
+
 	if (needs_reload) {
 		/*if we had a texture this means the object has changed - delete texture and resetup. Do not skip
 		texture update as this may lead to an empty rendering pass (blank frame for this object), especially in DASH*/
@@ -264,15 +260,28 @@
 
 	/*if no frame or muted don't draw*/
 	if (!txh->data && !txh->frame_ifce) {
-		GF_LOG(txh->stream->connect_failure ? GF_LOG_DEBUG : GF_LOG_INFO, GF_LOG_COMPOSE, ("[Texture %p] No output frame available \n", txh));
+		GF_LOG(txh->stream->connect_state ? GF_LOG_DEBUG : GF_LOG_INFO, GF_LOG_COMPOSE, ("[Texture %p] No output frame available \n", txh));
 
 		if (txh->compositor->use_step_mode || !txh->compositor->player) {
-			if (!txh->stream->connect_failure && ((s32)txh->last_frame_time<0) ) {
-				if (!txh->probe_time_ms) txh->probe_time_ms = gf_sys_clock();
-				else if (gf_sys_clock() - txh->probe_time_ms > txh->compositor->timeout / 2) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Texture %p] No output frame in %d ms, considering stream not available\n", txh, txh->compositor->timeout / 2));
-					txh->stream->connect_failure = GF_TRUE;
-					gf_sc_texture_stop_no_unregister(txh);
+			if (!txh->stream->connect_state && ((s32)txh->last_frame_time<0) ) {
+				//if we have anything bending in the source graph, reset timeout
+				//typical use case: a filter aggregates packets for a long time before dispatching
+				//example: tileagg+dash (cf issue #1934)
+				//warning, mo->odm can be null at this point (bifs & co)
+				u64 buffered = 0;
+				if (txh->stream->odm && txh->stream->odm->pid) {
+					buffered = gf_filter_pid_query_buffer_duration(txh->stream->odm->pid, GF_FALSE);
+					if (buffered) txh->stream->connect_state = MO_CONNECT_BUFFERING;
+				}
+
+				if (txh->compositor->timeout) {
+					if (buffered || !txh->probe_time_ms) {
+						txh->probe_time_ms = gf_sys_clock();
+					} else if (gf_sys_clock() - txh->probe_time_ms > txh->compositor->timeout) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Texture %p] No output frame in %d ms, considering stream not available\n", txh, txh->compositor->timeout));
+						txh->stream->connect_state = MO_CONNECT_TIMEOUT;
+						gf_sc_texture_stop_no_unregister(txh);
+					}
 				}
 				txh->compositor->ms_until_next_frame = -1;
 			}
@@ -299,7 +308,7 @@
 		}
 		return;
 	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[Texture %p] Updated new frame at clock time %d (%d ms) time %u ms\n", txh, gf_clock_time(txh->stream->odm->ck), gf_sys_clock(), ts));
+	GF_LOG(GF_LOG_INFO, GF_LOG_COMPTIME, ("[Texture %p] Updated new frame at clock time %d (%d ms) time %u ms\n", txh, gf_clock_time(txh->stream->odm->ck), gf_sys_clock(), ts));
 	txh->stream_finished = 0;
 	txh->needs_release = 1;
 	txh->last_frame_time = ts;

gpac-1.0.1.tar.gz/src/compositor/texturing_gl.c -> gpac-2.0.0.tar.gz/src/compositor/texturing_gl.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -465,6 +465,7 @@
 		break;
 #endif
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 case GF_PIXEL_YUV_10:
 	case GF_PIXEL_YUV422:
 	case GF_PIXEL_YUV422_10:
@@ -517,12 +518,22 @@
 	if (!txh->tx_io->tx.nb_textures) {
 		u32 pfmt = txh->pixelformat;
 		u32 stride = txh->stride;
+		Bool full_range = GF_FALSE;
+		s32 cmx = GF_CICP_MX_UNSPECIFIED;
+		if (txh->stream && txh->stream->odm && txh->stream->odm->pid) {
+			const GF_PropertyValue *p;
+			p = gf_filter_pid_get_property(txh->stream->odm->pid, GF_PROP_PID_COLR_RANGE);
+			if (p && p->value.boolean) full_range = GF_TRUE;
+			p = gf_filter_pid_get_property(txh->stream->odm->pid, GF_PROP_PID_COLR_MX);
+			if (p) cmx = p->value.uint;
+		}
+		
 		txh->tx_io->tx.pbo_state = (txh->compositor->gl_caps.pbo && txh->compositor->pbo) ? GF_GL_PBO_BOTH : GF_GL_PBO_NONE;
 		if (txh->tx_io->conv_format) {
 			stride = txh->tx_io->conv_stride;
 			pfmt = txh->tx_io->conv_format;
 		}
-		gf_gl_txw_setup(&txh->tx_io->tx, pfmt, txh->width, txh->height, stride, 0, GF_TRUE, NULL);
+		gf_gl_txw_setup(&txh->tx_io->tx, pfmt, txh->width, txh->height, stride, 0, GF_TRUE, txh->frame_ifce, full_range, cmx);
 	}
 	return 1;
 }
@@ -599,6 +610,7 @@
 		txh->tx_io->flags |= TX_IS_FLIPPED;
 		return 1;
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 	case GF_PIXEL_YUV_10:
 	case GF_PIXEL_YUV422:
 	case GF_PIXEL_YUV422_10:
@@ -659,6 +671,7 @@
 	switch (txh->pixelformat) {
 	case GF_PIXEL_YUYV:
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 	case GF_PIXEL_YUV_10:
 	case GF_PIXEL_YUV422:
 	case GF_PIXEL_YUV422_10:
@@ -726,16 +739,7 @@
 #ifndef GPAC_DISABLE_3D
 	char *data;
 	u32 pixel_format;
-	int nb_views = 1, nb_layers = 1;
 	u32 push_time;
-
-	if (txh->stream) {
-		gf_mo_get_nb_views(txh->stream, &nb_views);
-		gf_mo_get_nb_layers(txh->stream, &nb_layers);
-	}
-//	if (txh->frame_ifce || nb_views == 1) nb_frames = 1;
-//	else if (nb_layers) nb_frames = nb_layers;
-
 #endif
 
 	if (for2d) {
@@ -872,7 +876,7 @@
 	if (txh->stream) {
 		u32 ck;
 		gf_mo_get_object_time(txh->stream, &ck);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[GL Texture] Texture (CTS %u) %d ms after due date - Pushed %s in %d ms - average push time %d ms (PBO enabled %s)\n", txh->last_frame_time, ck - txh->last_frame_time, txh->tx_io->tx.is_yuv ? "YUV textures" : "texture", push_time, txh->upload_time / txh->nb_frames, txh->tx_io->tx.pbo_state ? "yes" : "no"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[GL Texture] Texture (CTS %u) %d ms after due date - Pushed %s in %d ms - average push time %d ms (PBO enabled %s)\n", txh->last_frame_time, ck - txh->last_frame_time, txh->tx_io->tx.is_yuv ? "YUV textures" : "texture", push_time, txh->upload_time / txh->nb_frames, txh->tx_io->tx.pbo_state ? "yes" : "no"));
 	}
 #endif
 	return 1;
@@ -1007,7 +1011,7 @@
 
 	if (txh->compositor->fbo_id) compositor_3d_enable_fbo(txh->compositor, GF_FALSE);
 
-	/*flip image because of openGL*/
+	/*flip image because of OpenGL*/
 	tmp = (char*)gf_malloc(sizeof(char)*txh->stride);
 	hy = txh->height/2;
 	for (i=0; i<hy; i++) {
@@ -1032,13 +1036,29 @@
 Bool gf_sc_texture_get_transform(GF_TextureHandler *txh, GF_Node *tx_transform, GF_Matrix *mx, Bool for_picking)
 {
 #ifndef GPAC_DISABLE_3D
-	int nb_views=1;
+	u32 nb_views=1;
 #endif
 	Bool ret = 0;
 	gf_mx_init(*mx);
 
 #ifndef GPAC_DISABLE_3D
-	gf_mo_get_nb_views(txh->stream, &nb_views);
+
+	if (txh->stream && txh->stream->c_w && txh->stream->c_h) {
+		Float c_x, c_y;
+		//clean aperture center in pixel coords
+		c_x = txh->width / 2 + txh->stream->c_x;
+		c_y = txh->height / 2 + txh->stream->c_y;
+		//left/top of clean aperture zone, in pixel coordinates
+		c_x -= txh->stream->c_w / 2;
+		c_y -= txh->stream->c_h / 2;
+
+		gf_mx_add_translation(mx, c_x / txh->width, c_y / txh->height, 0);
+		gf_mx_add_scale(mx, txh->stream->c_w / txh->width, txh->stream->c_h / txh->height, 1);
+		ret = 1;
+	}
+
+	if (!txh->compositor->dbgpack)
+		gf_mo_get_nb_views(txh->stream, &nb_views);
 
 #ifdef GPAC_CONFIG_ANDROID
 	if (txh->stream && txh->tx_io->gl_type == GL_TEXTURE_EXTERNAL_OES) {

gpac-1.0.1.tar.gz/src/compositor/visual_manager.h -> gpac-2.0.0.tar.gz/src/compositor/visual_manager.h Changed

gpac-1.0.1.tar.gz/src/compositor/visual_manager_2d.c -> gpac-2.0.0.tar.gz/src/compositor/visual_manager_2d.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -727,7 +727,7 @@
 			goto exit;
 		}
 
-		//openGL, force redraw of complete scene but signal we shoud only draw the background, not clear the canvas (nothing to redraw except GL textures)
+		//OpenGL, force redraw of complete scene but signal we shoud only draw the background, not clear the canvas (nothing to redraw except GL textures)
 		if (hyb_force_redraw) { 
 			hyb_force_background = 2;
 			ra_add(&visual->to_redraw, &visual->surf_rect);
@@ -761,7 +761,7 @@
 		bck_ctx->next = visual->context;
 		bck_ctx->flags |= CTX_BACKROUND_NOT_LAYER;
 
-		//for hybrid openGL, only redraw background but do not erase canvas
+		//for hybrid OpenGL, only redraw background but do not erase canvas
 		if (hyb_force_background==2)
 			bck_ctx->flags |= CTX_BACKROUND_NO_CLEAR;
 
@@ -774,13 +774,13 @@
 	{
 
 #ifndef GPAC_DISABLE_3D
-		//cleanup openGL screen
+		//cleanup OpenGL screen
 		if (visual->compositor->hybrid_opengl) {
 			compositor_2d_hybgl_clear_surface(tr_state->visual, NULL, 0, GF_FALSE);
 		}
 #endif
 
-		//and clean dirty rect - for hybrid openGL this will clear the canvas, otherwise the 2D backbuffer
+		//and clean dirty rect - for hybrid OpenGL this will clear the canvas, otherwise the 2D backbuffer
 		count = visual->to_redraw.count;
 		for (k=0; k<count; k++) {
 			GF_IRect rc;
@@ -807,7 +807,7 @@
 
 #ifndef GPAC_DISABLE_LOG
 	if (gf_log_tool_level_on(GF_LOG_COMPOSE, GF_LOG_DEBUG)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redraw %d / %d nodes (all: %s - %d dirty rects\n)", num_changed, num_nodes, redraw_all ? "yes" : "no", visual->to_redraw.count));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redraw %d / %d nodes (all: %s - %d dirty rects)\n", num_changed, num_nodes, redraw_all ? "yes" : "no", visual->to_redraw.count));
 		if (visual->to_redraw.count>1) GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("\n"));
 
 		for (i=0; i<visual->to_redraw.count; i++) {
@@ -827,12 +827,7 @@
 
 		/*if overlay we cannot remove the context and cannot draw directly*/
 		if (! visual_2d_overlaps_overlay(tr_state->visual, ctx, tr_state)) {
-
-			if (ctx->drawable->flags & DRAWABLE_USE_TRAVERSE_DRAW) {
-				gf_node_traverse(ctx->drawable->node, tr_state);
-			} else {
-				drawable_draw(ctx->drawable, tr_state);
-			}
+			call_drawable_draw(ctx, tr_state, GF_FALSE);
 		}
 		ctx = ctx->next;
 	}

gpac-1.0.1.tar.gz/src/compositor/visual_manager_2d_draw.c -> gpac-2.0.0.tar.gz/src/compositor/visual_manager_2d_draw.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -248,10 +248,10 @@
 	/*move to bottom-left corner of bounds */
 	if (ext_mx) gf_mx2d_add_matrix(&g_mat, ext_mx);
 	if (orig_bounds) gf_mx2d_add_translation(&g_mat, (orig_bounds->x), (orig_bounds->y - orig_bounds->height));
-
 	gf_mx2d_add_matrix(&g_mat, &ctx->transform);
 
 	gf_evg_stencil_set_matrix(stencil, &g_mat);
+	gf_evg_stencil_set_auto_matrix(stencil, GF_FALSE);
 	gf_evg_stencil_set_color_matrix(stencil, ctx->col_mat);
 
 	/*MPEG-4/VRML context or no fill info*/
@@ -307,6 +307,7 @@
 
 	/*set path transform, except for background2D node which is directly build in the final coord system*/
 	gf_evg_stencil_set_matrix(stencil, &gf_mx2d_txt);
+	gf_evg_stencil_set_auto_matrix(stencil, GF_FALSE);
 
 	alpha = GF_COL_A(txt_ctx->aspect.fill_color);
 	r = GF_COL_R(txt_ctx->aspect.fill_color);
@@ -551,6 +552,7 @@
 
 	/*set path transform*/
 	gf_evg_stencil_set_matrix(tx_raster, &mx_texture);
+	gf_evg_stencil_set_auto_matrix(tx_raster, GF_FALSE);
 
 
 	tx_tile = 0;

gpac-1.0.1.tar.gz/src/compositor/visual_manager_3d.c -> gpac-2.0.0.tar.gz/src/compositor/visual_manager_3d.c Changed

gpac-1.0.1.tar.gz/src/compositor/visual_manager_3d_gl.c -> gpac-2.0.0.tar.gz/src/compositor/visual_manager_3d_gl.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Compositor sub-project
@@ -476,7 +476,7 @@
 			gf_dynstrcat(&final_src, shader_src, NULL);
 
 			//add texture code
-			gf_gl_txw_insert_fragment_shader(pixfmt, "maintx", &final_src);
+			gf_gl_txw_insert_fragment_shader(pixfmt, "maintx", &final_src, GF_FALSE);
 
 			//append the rest
 			if (sep) {
@@ -2824,8 +2824,8 @@
 
 
 #ifdef MESH_USE_SFCOLOR
-		/*this is a real pain: we cannot "scale" colors through openGL, and our components are 16.16 (32 bytes) ranging
-		from [0 to 65536] mapping to [0, 1.0], but openGL assumes for s32 a range from [-2^31 2^31] mapping to [0, 1.0]
+		/*this is a real pain: we cannot "scale" colors through OpenGL, and our components are 16.16 (32 bytes) ranging
+		from [0 to 65536] mapping to [0, 1.0], but OpenGL assumes for s32 a range from [-2^31 2^31] mapping to [0, 1.0]
 		we must thus rebuild a dedicated array...*/
 		if (mesh->flags & MESH_HAS_ALPHA) {
 			u32 i;
@@ -3638,7 +3638,7 @@
 	}
 
 #ifndef GPAC_USE_TINYGL
-	/*flip image (openGL always handle image data bottom to top) */
+	/*flip image (OpenGL always handle image data bottom to top) */
 	u32 hy = fb->height/2;
 	for (i=0; i<hy; i++) {
 		memcpy(compositor->line_buffer, fb->video_buffer+ i*fb->pitch_y, fb->pitch_y);
@@ -3677,7 +3677,7 @@
 	glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, fb->video_buffer);
 	glDisable(GL_TEXTURE_2D);
 
-	/*flip image (openGL always handle image data bottom to top) */
+	/*flip image (OpenGL always handle image data bottom to top) */
 	tmp = (char*)gf_malloc(sizeof(char)*fb->pitch_y);
 	hy = fb->height/2;
 	for (i=0; i<hy; i++) {

gpac-1.0.1.tar.gz/src/crypto/g_crypt_openssl.c -> gpac-2.0.0.tar.gz/src/crypto/g_crypt_openssl.c Changed

@@ -1,8 +1,9 @@
 /*
 *			GPAC - Multimedia Framework C SDK
 *
-*			Authors: Rodolphe Fouquet
+*			Authors: Rodolphe Fouquet, Jean Le Feuvre
 *			Copyright (c) Motion Spell 2016
+* (c) Telecom Paris 2022
 *					All rights reserved
 *
 * This file is part of GPAC / crypto lib sub-project
@@ -190,6 +191,73 @@
 	return gf_crypt_crypt_openssl_ctr(td, ciphertext, len);
 }
 
+/* ECB */
+typedef struct {
+	AES_KEY key;
+} Openssl_ctx_ecb;
+
+/** CBC STUFF **/
+
+GF_Err gf_crypt_init_openssl_ecb(GF_Crypt* td, void *key, const void *iv)
+{
+	Openssl_ctx_ecb *ctx = (Openssl_ctx_ecb*)td->context;
+	if (!ctx) {
+		GF_SAFEALLOC(ctx, Openssl_ctx_ecb);
+		if (ctx == NULL) return GF_OUT_OF_MEM;
+		td->context = ctx;
+	}
+	return GF_OK;
+}
+
+void gf_crypt_deinit_openssl_ecb(GF_Crypt* td)
+{
+}
+
+void gf_set_key_openssl_ecb(GF_Crypt* td, void *key)
+{
+	Openssl_ctx_ecb* ctx = (Openssl_ctx_ecb*)td->context;
+	AES_set_encrypt_key(key, 128, &(ctx->key));
+	AES_set_decrypt_key(key, 128, &(ctx->key));
+}
+
+GF_Err gf_crypt_set_IV_openssl_ecb(GF_Crypt* td, const u8 *iv, u32 iv_size)
+{
+	return GF_OK;
+}
+
+GF_Err gf_crypt_get_IV_openssl_ecb(GF_Crypt* td, u8 *iv, u32 *iv_size)
+{
+	*iv_size = AES_BLOCK_SIZE;
+	memset(iv, 0, AES_BLOCK_SIZE);
+	return GF_OK;
+}
+
+GF_Err gf_crypt_crypt_openssl_ecb(GF_Crypt* td, u8 *plaintext, u32 len, u32 aes_crypt_type)
+{
+	Openssl_ctx_ecb* ctx = (Openssl_ctx_ecb*)td->context;
+	u32 iteration;
+	u32 numberOfIterations = len / AES_BLOCK_SIZE;
+	if (numberOfIterations * AES_BLOCK_SIZE < len) {
+		return GF_BAD_PARAM;
+	}
+
+	for (iteration = 0; iteration < numberOfIterations; ++iteration) {
+		AES_ecb_encrypt(plaintext + iteration*AES_BLOCK_SIZE, plaintext + iteration*AES_BLOCK_SIZE, &ctx->key, aes_crypt_type);
+	}
+	return GF_OK;
+}
+
+GF_Err gf_crypt_encrypt_openssl_ecb(GF_Crypt* td, u8 *plaintext, u32 len)
+{
+	return gf_crypt_crypt_openssl_ecb(td, plaintext, len, AES_ENCRYPT);
+}
+
+GF_Err gf_crypt_decrypt_openssl_ecb(GF_Crypt* td, u8 *ciphertext, u32 len)
+{
+	return gf_crypt_crypt_openssl_ecb(td, ciphertext, len, AES_DECRYPT);
+}
+
+
 
 GF_Err gf_crypt_open_open_openssl(GF_Crypt* td, GF_CRYPTO_MODE mode)
 {
@@ -213,6 +281,15 @@
 		td->_get_state = gf_crypt_get_IV_openssl_ctr;
 		td->_set_state = gf_crypt_set_IV_openssl_ctr;
 		break;
+	case GF_ECB:
+		td->_init_crypt = gf_crypt_init_openssl_ecb;
+		td->_deinit_crypt = gf_crypt_deinit_openssl_ecb;
+		td->_set_key = gf_set_key_openssl_ecb;
+		td->_crypt = gf_crypt_encrypt_openssl_ecb;
+		td->_decrypt = gf_crypt_decrypt_openssl_ecb;
+		td->_get_state = gf_crypt_get_IV_openssl_ecb;
+		td->_set_state = gf_crypt_set_IV_openssl_ecb;
+		break;
 	default:
 		return GF_BAD_PARAM;
 		break;

gpac-1.0.1.tar.gz/src/crypto/g_crypt_tinyaes.c -> gpac-2.0.0.tar.gz/src/crypto/g_crypt_tinyaes.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
-*			Copyright (c) Telecom ParisTech 2018
+*			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 *  This file is part of GPAC / crypto lib sub-project
@@ -165,6 +165,66 @@
 	return GF_OK;
 }
 
+/** ECB mode **/
+
+GF_Err gf_crypt_init_tinyaes_ecb(GF_Crypt* td, void *key, const void *iv)
+{
+	struct AES_ctx *ctx = (struct AES_ctx *)td->context;
+	if (!ctx) {
+		GF_SAFEALLOC(ctx, struct AES_ctx);
+		if (ctx == NULL) return GF_OUT_OF_MEM;
+		td->context = ctx;
+	}
+	AES_init_ctx(ctx, key);
+	return GF_OK;
+}
+
+void gf_crypt_deinit_tinyaes_ecb(GF_Crypt* td)
+{
+}
+
+void gf_set_key_tinyaes_ecb(GF_Crypt* td, void *key)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	AES_init_ctx(ctx, key);
+}
+
+GF_Err gf_crypt_set_IV_tinyaes_ecb(GF_Crypt* td, const u8 *iv, u32 iv_size)
+{
+	return GF_OK;
+}
+
+GF_Err gf_crypt_get_IV_tinyaes_ecb(GF_Crypt* td, u8 *iv, u32 *iv_size)
+{
+	*iv_size = AES_BLOCKLEN;
+	memset(iv, 0, AES_BLOCKLEN);
+	return GF_OK;
+}
+
+
+GF_Err gf_crypt_encrypt_tinyaes_ecb(GF_Crypt* td, u8 *plaintext, u32 len)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	if (len % AES_BLOCKLEN) return GF_BAD_PARAM;
+	while (len) {
+		AES_ECB_encrypt(ctx, plaintext);
+		plaintext += AES_BLOCKLEN;
+		len -= AES_BLOCKLEN;
+	}
+	return GF_OK;
+}
+
+GF_Err gf_crypt_decrypt_tinyaes_ecb(GF_Crypt* td, u8 *ciphertext, u32 len)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	if (len % AES_BLOCKLEN) return GF_BAD_PARAM;
+	while (len) {
+		AES_ECB_decrypt(ctx, ciphertext);
+		ciphertext += AES_BLOCKLEN;
+		len -= AES_BLOCKLEN;
+	}
+	return GF_OK;
+}
 
 GF_Err gf_crypt_open_open_tinyaes(GF_Crypt* td, GF_CRYPTO_MODE mode)
 {
@@ -188,6 +248,15 @@
 		td->_get_state = gf_crypt_get_IV_tinyaes_ctr;
 		td->_set_state = gf_crypt_set_IV_tinyaes_ctr;
 		break;
+	case GF_ECB:
+		td->_init_crypt = gf_crypt_init_tinyaes_ecb;
+		td->_deinit_crypt = gf_crypt_deinit_tinyaes_ecb;
+		td->_set_key = gf_set_key_tinyaes_ecb;
+		td->_crypt = gf_crypt_encrypt_tinyaes_ecb;
+		td->_decrypt = gf_crypt_decrypt_tinyaes_ecb;
+		td->_get_state = gf_crypt_get_IV_tinyaes_ecb;
+		td->_set_state = gf_crypt_set_IV_tinyaes_ecb;
+		break;
 	default:
 		return GF_BAD_PARAM;
 		break;

gpac-1.0.1.tar.gz/src/evg/ftgrays.c -> gpac-2.0.0.tar.gz/src/evg/ftgrays.c Changed

@@ -68,13 +68,13 @@
 #include "rast_soft.h"
 
 
-void gray_record_cell( TRaster *raster )
+void gray_record_cell(GF_EVGSurface *surf)
 {
-	if (( raster->area | raster->cover) && (raster->ey<raster->max_ey)) {
-		long y = raster->ey - raster->min_ey;
+	if (( surf->area | surf->cover) && (surf->ey<surf->max_ey)) {
+		long y = surf->ey - surf->min_ey;
 		if (y>=0) {
 			AACell *cell;
-			AAScanline *sl = &raster->scanlines[y];
+			AAScanline *sl = &surf->scanlines[y];
 
 			if (sl->num >= sl->alloc) {
 				sl->cells = (AACell*)gf_realloc(sl->cells, sizeof(AACell)* (sl->alloc + AA_CELL_STEP_ALLOC));
@@ -83,28 +83,28 @@
 			cell = &sl->cells[sl->num];
 			sl->num++;
 			/*clip cell */
-			if (raster->ex<raster->min_ex) cell->x = (TCoord) -1;
-			else if (raster->ex>raster->max_ex) cell->x = (TCoord) (raster->max_ex - raster->min_ex);
-			else cell->x = (TCoord)(raster->ex - raster->min_ex);
-			cell->area = raster->area;
-			cell->cover = raster->cover;
-			cell->idx1 = raster->idx1;
-			cell->idx2 = raster->idx2;
-
-			if (raster->first_scanline > (u32) y)
-				raster->first_scanline = y;
+			if (surf->ex<surf->min_ex) cell->x = (TCoord) -1;
+			else if (surf->ex>surf->max_ex) cell->x = (TCoord) (surf->max_ex - surf->min_ex);
+			else cell->x = (TCoord)(surf->ex - surf->min_ex);
+			cell->area = surf->area;
+			cell->cover = surf->cover;
+			cell->idx1 = surf->idx1;
+			cell->idx2 = surf->idx2;
+
+			if (surf->first_scanline > (u32) y)
+				surf->first_scanline = y;
 		}
 	}
 }
 
-void gray_set_cell( TRaster *raster, TCoord ex, TCoord ey )
+void gray_set_cell(GF_EVGSurface *surf, TCoord ex, TCoord ey )
 {
-	if ((raster->ex != ex) || (raster->ey != ey)) {
-		gray_record_cell(raster);
-		raster->ex = ex;
-		raster->ey = ey;
-		raster->area = 0;
-		raster->cover = 0;
+	if ((surf->ex != ex) || (surf->ey != ey)) {
+		gray_record_cell(surf);
+		surf->ex = ex;
+		surf->ey = ey;
+		surf->area = 0;
+		surf->cover = 0;
 	}
 }
 
@@ -124,27 +124,27 @@
 #endif
 }
 
-static GFINLINE int gray_move_to( EVG_Vector* to, EVG_Raster raster)
+static GFINLINE int gray_move_to(EVG_Vector *to, GF_EVGSurface *surf)
 {
 	TPos x, y;
 	TCoord ex, ey;
 
 	/* record current cell, if any */
-	gray_record_cell(raster);
+	gray_record_cell(surf);
 
-	evg_translate_point(raster->mx, to, &x, &y);
+	evg_translate_point(surf->mx, to, &x, &y);
 
 	ex = TRUNC(x);
 	ey = TRUNC(y);
-	if ( ex < raster->min_ex ) ex = (TCoord)(raster->min_ex - 1);
-	raster->area = 0;
-	raster->cover = 0;
-	gray_set_cell( raster, ex, ey );
+	if ( ex < surf->min_ex ) ex = (TCoord)(surf->min_ex - 1);
+	surf->area = 0;
+	surf->cover = 0;
+	gray_set_cell(surf, ex, ey );
 	if (ey<0) ey=0;
-	raster->last_ey = SUBPIXELS( ey );
+	surf->last_ey = SUBPIXELS( ey );
 
-	raster->x = x;
-	raster->y = y;
+	surf->x = x;
+	surf->y = y;
 	return 0;
 }
 
@@ -152,7 +152,7 @@
 /* */
 /* Render a scanline as one or more cells. */
 /* */
-static void gray_render_scanline( TRaster *raster, TCoord ey, TPos x1, TCoord y1, TPos x2, TCoord y2)
+static void gray_render_scanline(GF_EVGSurface *surf, TCoord ey, TPos x1, TCoord y1, TPos x2, TCoord y2)
 {
 	TCoord ex1, ex2, fx1, fx2, delta;
 	long p, first;
@@ -160,24 +160,31 @@
 	int incr, mod;
 
 	dx = x2 - x1;
-	ex1 = TRUNC( x1 ); /* if (ex1 >= raster->max_ex) ex1 = raster->max_ex-1; */
-	ex2 = TRUNC( x2 ); /* if (ex2 >= raster->max_ex) ex2 = raster->max_ex-1; */
-	if (ex1<0) ex1=0;
-	if (ex2<0) ex2=0;
-	fx1 = (TCoord)( x1 - SUBPIXELS( ex1 ) );
-	fx2 = (TCoord)( x2 - SUBPIXELS( ex2 ) );
-
+	ex1 = TRUNC( x1 ); /* if (ex1 >= surf->max_ex) ex1 = surf->max_ex-1; */
+	ex2 = TRUNC( x2 ); /* if (ex2 >= surf->max_ex) ex2 = surf->max_ex-1; */
+	if (ex1<0) {
+		ex1=0;
+		fx1 = (TCoord) 0;
+	} else {
+		fx1 = (TCoord)( x1 - SUBPIXELS( ex1 ) );
+	}
+	if (ex2<0) {
+		ex2=0;
+		fx2 = (TCoord) 0;
+	} else {
+		fx2 = (TCoord)( x2 - SUBPIXELS( ex2 ) );
+	}
 	/* trivial case. Happens often */
 	if ( y1 == y2 ) {
-		gray_set_cell( raster, ex2, ey );
+		gray_set_cell(surf, ex2, ey );
 		return;
 	}
 
 	/* everything is located in a single cell. That is easy! */
 	if ( ex1 == ex2 ) {
 		delta = y2 - y1;
-		raster->area += (TArea)( fx1 + fx2 ) * delta;
-		raster->cover += delta;
+		surf->area += (TArea)( fx1 + fx2 ) * delta;
+		surf->cover += delta;
 		return;
 	}
 
@@ -199,11 +206,11 @@
 		delta--;
 		mod += (TCoord)dx;
 	}
-	raster->area += (TArea)( fx1 + first ) * delta;
-	raster->cover += delta;
+	surf->area += (TArea)( fx1 + first ) * delta;
+	surf->cover += delta;
 
 	ex1 += incr;
-	gray_set_cell( raster, ex1, ey );
+	gray_set_cell(surf, ex1, ey );
 	y1 += delta;
 
 	if ( ex1 != ex2 ) {
@@ -225,23 +232,23 @@
 				delta++;
 			}
 
-			raster->area += (TArea)ONE_PIXEL * delta;
-			raster->cover += delta;
+			surf->area += (TArea)ONE_PIXEL * delta;
+			surf->cover += delta;
 			y1 += delta;
 			ex1 += incr;
-			gray_set_cell( raster, ex1, ey );
+			gray_set_cell(surf, ex1, ey );
 		}
 	}
 	delta = y2 - y1;
-	raster->area += (TArea)( fx2 + ONE_PIXEL - first ) * delta;
-	raster->cover += delta;
+	surf->area += (TArea)( fx2 + ONE_PIXEL - first ) * delta;
+	surf->cover += delta;
 }
 
 
 /*************************************************************************/
 /* */
 /* Render a given line as a series of scanlines. */
-void gray_render_line(TRaster *raster, TPos to_x, TPos to_y)
+void gray_render_line(GF_EVGSurface *surf, TPos to_x, TPos to_y)
 {
 	TCoord min, max;
 	TCoord ey1, ey2, fy1, fy2;
@@ -251,14 +258,14 @@
 	int delta, rem, mod, lift, incr;
 
 
-	ey1 = TRUNC( raster->last_ey );
-	ey2 = TRUNC( to_y ); /* if (ey2 >= raster->max_ey) ey2 = raster->max_ey-1; */
+	ey1 = TRUNC( surf->last_ey );
+	ey2 = TRUNC( to_y ); /* if (ey2 >= surf->max_ey) ey2 = surf->max_ey-1; */
 	if (ey2<0) ey2=0;
-	fy1 = (TCoord)( raster->y - raster->last_ey );
+	fy1 = (TCoord)( surf->y - surf->last_ey );
 	fy2 = (TCoord)( to_y - SUBPIXELS( ey2 ) );
 
-	dx = to_x - raster->x;
-	dy = to_y - raster->y;
+	dx = to_x - surf->x;
+	dy = to_y - surf->y;
 
 	/* perform vertical clipping */
 	min = ey1;
@@ -267,18 +274,25 @@
 		min = ey2;
 		max = ey1;
 	}
-	if ( min >= raster->max_ey || max < raster->min_ey ) goto End;
+	if ( min >= surf->max_ey || max < surf->min_ey ) goto End;
 
 	/* everything is on a single scanline */
 	if ( ey1 == ey2 ) {
-		gray_render_scanline( raster, ey1, raster->x, fy1, to_x, fy2 );
+		gray_render_scanline(surf, ey1, surf->x, fy1, to_x, fy2 );
 		goto End;
 	}
 	/* vertical line - avoid calling gray_render_scanline */
 	incr = 1;
 	if (dx == 0 ) {
-		TCoord ex = TRUNC( raster->x );
-		TCoord two_fx = (TCoord)( ( raster->x - SUBPIXELS( ex ) ) << 1 );
+		TCoord ex = TRUNC( surf->x );
+		TCoord tdiff;
+		if (ex<0) {
+			ex = 0;
+			tdiff=0;
+		} else {
+			tdiff = surf->x - SUBPIXELS( ex );
+		}
+		TCoord two_fx = (TCoord)( ( tdiff ) << 1 );
 		TPos area;
 
 		first = ONE_PIXEL;
@@ -288,23 +302,23 @@
 		}
 
 		delta = (int)( first - fy1 );
-		raster->area += (TArea)two_fx * delta;
-		raster->cover += delta;
+		surf->area += (TArea)two_fx * delta;
+		surf->cover += delta;
 		ey1 += incr;
 
-		gray_set_cell( raster, ex, ey1 );
+		gray_set_cell(surf, ex, ey1 );
 
 		delta = (int)( first + first - ONE_PIXEL );
 		area = (TArea)two_fx * delta;
 		while ( ey1 != ey2 ) {
-			raster->area += area;
-			raster->cover += delta;
+			surf->area += area;
+			surf->cover += delta;
 			ey1 += incr;
-			gray_set_cell( raster, ex, ey1 );
+			gray_set_cell(surf, ex, ey1 );
 		}
 		delta = (int)( fy2 - ONE_PIXEL + first );
-		raster->area += (TArea)two_fx * delta;
-		raster->cover += delta;
+		surf->area += (TArea)two_fx * delta;
+		surf->cover += delta;
 		goto End;
 	}
 	/* ok, we have to render several scanlines */
@@ -325,11 +339,11 @@
 		delta--;
 		mod += (TCoord)dy;
 	}
-	x = raster->x + delta;
-	gray_render_scanline( raster, ey1, raster->x, fy1, x, (TCoord)first );
+	x = surf->x + delta;
+	gray_render_scanline(surf, ey1, surf->x, fy1, x, (TCoord)first );
 
 	ey1 += incr;
-	gray_set_cell( raster, TRUNC( x ), ey1 );
+	gray_set_cell(surf, TRUNC( x ), ey1 );
 
 	if ( ey1 != ey2 ) {
 		p = ONE_PIXEL * dx;
@@ -350,25 +364,25 @@
 			}
 
 			x2 = x + delta;
-			gray_render_scanline( raster, ey1, x, (TCoord)( ONE_PIXEL - first ), x2, (TCoord)first );
+			gray_render_scanline(surf, ey1, x, (TCoord)( ONE_PIXEL - first ), x2, (TCoord)first );
 			x = x2;
 
 			ey1 += incr;
-			gray_set_cell( raster, TRUNC( x ), ey1 );
+			gray_set_cell(surf, TRUNC( x ), ey1 );
 		}
 	}
 
-	gray_render_scanline( raster, ey1, x, (TCoord)( ONE_PIXEL - first ), to_x, fy2 );
+	gray_render_scanline(surf, ey1, x, (TCoord)( ONE_PIXEL - first ), to_x, fy2 );
 
 End:
-	raster->x = to_x;
-	raster->y = to_y;
-	raster->last_ey = SUBPIXELS( ey2 );
+	surf->x = to_x;
+	surf->y = to_y;
+	surf->last_ey = SUBPIXELS( ey2 );
 }
 
 
 
-static int EVG_Outline_Decompose(EVG_Outline *outline, TRaster *user)
+static int EVG_Outline_Decompose(EVG_Outline *outline, GF_EVGSurface *surf)
 {
 	EVG_Vector v_start;
 	int n; /* index of contour in outline */
@@ -384,15 +398,15 @@
 		limit = outline->points + last;
 		v_start = outline->points[first];
 		point = outline->points + first;
-		gray_move_to(&v_start, user);
+		gray_move_to(&v_start, surf);
 		while ( point < limit ) {
 			point++;
-			evg_translate_point(user->mx, point, &_x, &_y);
-			gray_render_line(user, _x, _y);
+			evg_translate_point(surf->mx, point, &_x, &_y);
+			gray_render_line(surf, _x, _y);
 		}
 		/* close the contour with a line segment */
-		evg_translate_point(user->mx, &v_start, &_x, &_y);
-		gray_render_line(user, _x, _y);
+		evg_translate_point(surf->mx, &v_start, &_x, &_y);
+		gray_render_line(surf, _x, _y);
 		first = last + 1;
 	}
 	return 0;
@@ -495,15 +509,16 @@
 	}
 }
 
-static void gray_hline( TRaster *raster, TCoord x, TCoord y, TPos area, int acount, Bool zero_non_zero_rule, u32 idx1, u32 idx2)
+static void gray_hline(EVGRasterCtx *raster, TCoord x, TCoord y, TPos area, int acount, u32 fill_rule, u32 idx1, u32 idx2)
 {
 	int coverage;
 	EVG_Span* span;
 	int count;
+	int odd_flag = 1;
 
-	x += (TCoord)raster->min_ex;
-	if (x>=raster->max_ex) return;
-	y += (TCoord)raster->min_ey;
+	x += (TCoord)raster->surf->min_ex;
+	if (x>=raster->surf->max_ex) return;
+	y += (TCoord)raster->surf->min_ey;
 
 	/* compute the coverage line's coverage, depending on the */
 	/* outline fill rule */
@@ -515,35 +530,55 @@
 	if ( coverage < 0 )
 		coverage = -coverage;
 
-	if (zero_non_zero_rule) {
-		/* normal non-zero winding rule */
-		if ( coverage >= 256 )
-			coverage = 255;
-	} else {
-		coverage &= 511;
+	if (fill_rule) {
+		/* odd / even winding rule */
+		if ( coverage >= 256 ) {
+			coverage &= 511;
+
+			if ( coverage > 256 )
+				coverage = 512 - coverage;
+			else if ( coverage == 256 )
+				coverage = 255;
 
-		if ( coverage > 256 )
-			coverage = 512 - coverage;
-		else if ( coverage == 256 )
+			if (coverage!=255)
+				odd_flag = 0;
+
+			/* even only fill */
+			if (fill_rule==2) {
+				coverage = odd_flag ? 0 : (255-coverage);
+			} else {
+				coverage = 255;
+			}
+		}
+		else if (fill_rule==2) {
+			coverage = 255-coverage;
+		}
+	} else {
+		// normal non-zero winding rule
+		if ( coverage >= 256 )
 			coverage = 255;
 	}
 
+	if ((coverage < 0xFF) && (coverage > raster->surf->aa_level))
+		return;
+		
 	if (!coverage)
 		return;
 
 	/* see if we can add this span to the current list */
 	count = raster->num_gray_spans;
 	span = raster->gray_spans + count - 1;
-	if ( count > 0 &&
-			(int)span->x + span->len == (int)x &&
-			span->coverage == coverage )
-	{
+	if ( (count > 0)
+		&& ((int)span->x + span->len == (int)x)
+		&& (span->coverage == coverage )
+		&& (span->odd_flag == odd_flag )
+	) {
 		span->len = (unsigned short)( span->len + acount );
 		return;
 	}
 
 	if ((u32) count >= raster->max_gray_spans) {
-		raster->render_span(y, count, raster->gray_spans, raster->render_span_data );
+		raster->surf->render_span(y, count, raster->gray_spans, raster->surf, raster);
 		raster->num_gray_spans = 0;
 
 		span = raster->gray_spans;
@@ -560,12 +595,13 @@
 	span->x = (short)x;
 	span->len = (unsigned short)acount;
 	span->coverage = (unsigned char)coverage;
+	span->odd_flag = (unsigned char)odd_flag;
 	span->idx1 = idx1;
 	span->idx2 = idx2;
 	raster->num_gray_spans++;
 }
 
-void gray_sweep_line( TRaster *raster, AAScanline *sl, int y, Bool zero_non_zero_rule)
+void gray_sweep_line(EVGRasterCtx *raster, AAScanline *sl, int y, u32 fill_rule)
 {
 	TCoord cover;
 	AACell *start, *cur;
@@ -581,6 +617,7 @@
 		x = start->x;
 		area = start->area;
 		cover += start->cover;
+		assert(sl->num);
 		/* accumulate all start cells */
 		while(--sl->num) {
 			++cur ;
@@ -594,101 +631,256 @@
 		/* if the start cell has a non-null area, we must draw an */
 		/* individual gray pixel there */
 		if ( area && x >= 0 ) {
-			gray_hline( raster, x, y, cover * ( ONE_PIXEL * 2 ) - area, 1, zero_non_zero_rule, start->idx1, start->idx2);
+			gray_hline( raster, x, y, cover * ( ONE_PIXEL * 2 ) - area, 1, fill_rule, start->idx1, start->idx2);
 			x++;
 		}
 		if ( x < 0 ) x = 0;
 
 		/* draw a gray span between the start cell and the current one */
 		if ( cur->x > x )
-			gray_hline( raster, x, y, cover * ( ONE_PIXEL * 2 ), cur->x - x, zero_non_zero_rule, cur->idx1, cur->idx2);
+			gray_hline( raster, x, y, cover * ( ONE_PIXEL * 2 ), cur->x - x, fill_rule, cur->idx1, cur->idx2);
 	}
-	raster->render_span((int) (y + raster->min_ey), raster->num_gray_spans, raster->gray_spans, raster->render_span_data );
+	raster->surf->render_span((int) (y + raster->surf->min_ey), raster->num_gray_spans, raster->gray_spans, raster->surf, raster );
 }
 
+#define LINES_PER_THREAD	6
+static Bool th_fetch_lines(EVGRasterCtx *rctx)
+{
+	gf_mx_p(rctx->surf->raster_mutex);
+	if (!rctx->surf->last_dispatch_line) {
+		rctx->first_line = rctx->last_line = 0;
+		gf_mx_v(rctx->surf->raster_mutex);
+		return GF_FALSE;
+	}
+	rctx->first_line = rctx->surf->last_dispatch_line;
+	rctx->surf->last_dispatch_line += LINES_PER_THREAD;
+	if (rctx->surf->last_dispatch_line >= rctx->surf->max_line_y) {
+		rctx->surf->last_dispatch_line = 0;
+		rctx->last_line = rctx->surf->max_line_y;
+	} else {
+		rctx->last_line = rctx->surf->last_dispatch_line;
+	}
+	gf_mx_v(rctx->surf->raster_mutex);
+	return GF_TRUE;
+}
 
-int evg_raster_render(GF_EVGSurface *surf)
+u32 th_sweep_lines(void *par)
 {
-	Bool zero_non_zero_rule;
-	u32 i, size_y;
-	EVG_Raster raster = surf->raster;
-	EVG_Outline* outline = (EVG_Outline*)&surf->ftoutline;
+	EVGRasterCtx *rctx = par;
+
+	while (rctx->th_state == 1) {
+		u32 i, nb_lines=0;
+		u32 first_patch, last_patch;
+
+		//only for threads, wait for start raster event
+		if (rctx->th) {
+			//we are active, don't grab sema (final flush of sweep)
+			if (rctx->active) {
+				gf_sleep(0);
+				continue;
+			}
+			gf_sema_wait(rctx->surf->raster_sem);
+			if (!rctx->th_state) break;
+			rctx->active = GF_TRUE;
+		}
 
-	/* return immediately if the outline is empty */
-	if ( outline->n_points == 0 || outline->n_contours <= 0 ) return 0;
+		first_patch = 0xFFFFFFFF;
+		last_patch = 0;
+
+		while (1) {
+			/* sort each scanline and render it*/
+			for (i=rctx->first_line; i<rctx->last_line; i++) {
+				AAScanline *sl = &rctx->surf->scanlines[i];
+				if (sl->num) {
+					if (sl->num>1) gray_quick_sort(sl->cells, sl->num);
+					gray_sweep_line(rctx, sl, i, rctx->fill_rule);
+					sl->num = 0;
+				} else if (rctx->is_tri_raster) {
+					//if nothing on this line, we are done for this quad/triangle
+					break;
+				}
+				//only true if rctx->is_tri_raster is true
+				if (sl->pnum) {
+					if (first_patch > i) first_patch = i;
+					if (last_patch < i) last_patch = i;
+				}
+				nb_lines++;
+			}
+			if (!th_fetch_lines(rctx))
+				break;
+		}
+		gf_mx_p(rctx->surf->raster_mutex);
+		if (rctx->is_tri_raster) {
+			if (first_patch<rctx->surf->first_patch)
+				rctx->surf->first_patch = first_patch;
+			if (last_patch>rctx->surf->last_patch)
+				rctx->surf->last_patch = last_patch;
+		}
+		rctx->surf->pending_threads--;
+		gf_mx_v(rctx->surf->raster_mutex);
+
+		if (!rctx->th) break;
+	}
+	//we are done
+	rctx->th_state = 2;
+	return 0;
+}
 
-	raster->render_span = (EVG_Raster_Span_Func) surf->gray_spans;
-	raster->render_span_data = surf;
 
-	/* Set up state in the raster object */
-	raster->min_ex = surf->clip_xMin;
-	raster->min_ey = surf->clip_yMin;
-	raster->max_ex = surf->clip_xMax;
-	raster->max_ey = surf->clip_yMax;
+/* sort each scanline and render it*/
+GF_Err evg_sweep_lines(GF_EVGSurface *surf, u32 size_y, u32 fill_rule, Bool is_tri_raster, GF_EVGFragmentParam *fparam)
+{
+	u32 i;
 
-	raster->mx = surf->mx;
+	if (fparam) {
+		surf->raster_ctx.frag_param = *fparam;
+		if (surf->frag_shader_init)
+			surf->frag_shader_init(surf->frag_shader_udta, &surf->raster_ctx.frag_param, 0, GF_FALSE);
 
-	size_y = (u32) (raster->max_ey - raster->min_ey);
-	if (raster->max_lines < size_y) {
-		raster->scanlines = (AAScanline*)gf_realloc(raster->scanlines, sizeof(AAScanline)*size_y);
-		memset(&raster->scanlines[raster->max_lines], 0, sizeof(AAScanline)*(size_y-raster->max_lines) );
-		raster->max_lines = size_y;
+		//shaders are not thread-safe yet
+		for (i=0; i<surf->nb_threads; i++) {
+			surf->th_raster_ctx[i].frag_param = *fparam;
+			if (surf->frag_shader_init)
+				surf->frag_shader_init(surf->frag_shader_udta, &surf->th_raster_ctx[i].frag_param, i+1, GF_FALSE);
+		}
 	}
 
-	raster->ex = (int) (raster->max_ex+1);
-	raster->ey = (int) (raster->max_ey+1);
-	raster->cover = 0;
-	raster->area = 0;
-	raster->first_scanline = raster->max_ey;
+	if (!surf->nb_threads) {
+		for (i=surf->first_scanline; i<size_y; i++) {
+			AAScanline *sl = &surf->scanlines[i];
+			if (sl->num) {
+				if (sl->num>1) gray_quick_sort(sl->cells, sl->num);
+				gray_sweep_line(&surf->raster_ctx, sl, i, fill_rule);
+				sl->num = 0;
+			} else if (is_tri_raster) {
+				//if nothing on this line, we are done for this quad/triangle
+				break;
+			}
+			if (sl->pnum) {
+				if (surf->first_patch > i) surf->first_patch = i;
+				if (surf->last_patch < i) surf->last_patch = i;
+			}
+		}
+		return GF_OK;
+	}
 
-	EVG_Outline_Decompose(outline, raster);
-	gray_record_cell( raster );
+	surf->raster_ctx.fill_rule = fill_rule;
+	surf->raster_ctx.is_tri_raster = is_tri_raster ? 1 : 0;
+	surf->raster_ctx.first_line = surf->first_scanline;
+	surf->raster_ctx.last_line = surf->raster_ctx.first_line + LINES_PER_THREAD;
+	if (surf->raster_ctx.first_line%2) surf->raster_ctx.last_line++;
 
-	/*store odd/even rule*/
-	zero_non_zero_rule = (outline->flags & GF_PATH_FILL_ZERO_NONZERO) ? GF_TRUE : GF_FALSE;
-
-	/* sort each scanline and render it*/
-	for (i=raster->first_scanline; i<size_y; i++) {
-		AAScanline *sl = &raster->scanlines[i];
-		if (sl->num) {
-			if (sl->num>1) gray_quick_sort(sl->cells, sl->num);
-			gray_sweep_line(raster, sl, i, zero_non_zero_rule);
-			sl->num = 0;
+	if (surf->raster_ctx.last_line >= size_y) {
+		surf->raster_ctx.last_line = size_y;
+		surf->last_dispatch_line = 0;
+	}
+
+	surf->pending_threads = 1;
+	surf->max_line_y = size_y;
+
+	surf->last_dispatch_line = surf->raster_ctx.last_line;
+	for (i=0; i<surf->nb_threads; i++) {
+		EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+		surf->pending_threads++;
+
+		if (!surf->last_dispatch_line) {
+			rctx->first_line = 0;
+			rctx->last_line = 0;
+			continue;
+		}
+		rctx->first_line = surf->last_dispatch_line;
+		rctx->last_line = surf->last_dispatch_line + LINES_PER_THREAD;
+		if (rctx->last_line >= size_y) {
+			rctx->last_line = size_y;
+			surf->last_dispatch_line = 0;
+		} else {
+			surf->last_dispatch_line += LINES_PER_THREAD;
 		}
+		rctx->fill_rule = fill_rule;
+		rctx->is_tri_raster = is_tri_raster ? 1 : 0;
 	}
 
-	return 0;
-}
+	//notify semaphore
+	gf_sema_notify(surf->raster_sem, surf->nb_threads);
 
+	//run using caller process
+	surf->raster_ctx.th_state = 1;
+	th_sweep_lines(&surf->raster_ctx);
 
+	while (surf->pending_threads) {
+		gf_sleep(0);
+	}
 
+	//move all threads to inactive so that they grab the sema
+	for (i=0; i<surf->nb_threads; i++) {
+		EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+		rctx->active = GF_FALSE;
+	}
 
-EVG_Raster evg_raster_new()
-{
-	TRaster *raster;
-	GF_SAFEALLOC(raster , TRaster);
-	if (!raster) return NULL;
-	raster->max_gray_spans = raster->alloc_gray_spans = FT_MAX_GRAY_SPANS;
-	raster->gray_spans = gf_malloc(sizeof(EVG_Span)* raster->max_gray_spans);
-	if (!raster->gray_spans) {
-		gf_free(raster);
-		return NULL;
-	}
-	return raster;
+	if (fparam && surf->frag_shader_init) {
+		surf->frag_shader_init(surf->frag_shader_udta, &surf->raster_ctx.frag_param, 0, GF_TRUE);
+		for (i=0; i<surf->nb_threads; i++) {
+			surf->frag_shader_init(surf->frag_shader_udta, &surf->th_raster_ctx[i].frag_param, i+1, GF_TRUE);
+		}
+	}
+
+	return GF_OK;
 }
 
-void evg_raster_del(EVG_Raster raster)
+
+GF_Err evg_raster_render(GF_EVGSurface *surf)
 {
-	u32 i;
-	for (i=0; i<raster->max_lines; i++) {
-		gf_free(raster->scanlines[i].cells);
-		if (raster->scanlines[i].pixels)
-			gf_free(raster->scanlines[i].pixels);
+	u32 fill_rule = 0;
+	u32 size_y;
+	EVG_Outline* outline = (EVG_Outline*)&surf->ftoutline;
+
+	/* return immediately if the outline is empty */
+	if ( outline->n_points == 0 || outline->n_contours <= 0 ) return GF_OK;
+
+	/* Set up state in the raster object */
+	surf->min_ex = surf->clip_xMin;
+	surf->min_ey = surf->clip_yMin;
+	surf->max_ex = surf->clip_xMax;
+	surf->max_ey = surf->clip_yMax;
+	size_y = (u32) (surf->max_ey - surf->min_ey);
+	if (surf->max_lines < size_y) {
+		surf->scanlines = (AAScanline*)gf_realloc(surf->scanlines, sizeof(AAScanline)*size_y);
+		if (!surf->scanlines) return GF_OUT_OF_MEM;
+		memset(&surf->scanlines[surf->max_lines], 0, sizeof(AAScanline)*(size_y-surf->max_lines) );
+		surf->max_lines = size_y;
+	}
+
+	surf->ex = (int) (surf->max_ex+1);
+	surf->ey = (int) (surf->max_ey+1);
+	surf->cover = 0;
+	surf->area = 0;
+	surf->first_scanline = surf->max_ey;
+
+	EVG_Outline_Decompose(outline, surf);
+	gray_record_cell(surf);
+
+	/*store odd/even rule*/
+	if (outline->flags & GF_PATH_FILL_ZERO_NONZERO) fill_rule = 1;
+	else if (outline->flags & GF_PATH_FILL_EVEN) fill_rule = 2;
+
+	if (surf->mask_mode == GF_EVGMASK_RECORD) {
+		surf->render_span = evg_fill_span_mask;
+	} else {
+		surf->render_span = (EVG_SpanFunc) surf->fill_spans;
 	}
-	gf_free(raster->gray_spans);
 
-	gf_free(raster->scanlines);
-	gf_free(raster);
+	if ((void *) surf->sten == (void *) &surf->shader_sten) {
+		GF_EVGFragmentParam fparam;
+		memset(&fparam, 0, sizeof(GF_EVGFragmentParam));
+		fparam.tx_width = surf->shader_sten.width;
+		fparam.tx_height = surf->shader_sten.height;
+		return evg_sweep_lines(surf, size_y, fill_rule, GF_FALSE, &fparam);
+	}
+
+	return evg_sweep_lines(surf, size_y, fill_rule, GF_FALSE, NULL);
+
 }
 
+
+
 /* END */

gpac-1.0.1.tar.gz/src/evg/rast_soft.h -> gpac-2.0.0.tar.gz/src/evg/rast_soft.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / software 2D rasterizer
@@ -30,14 +30,18 @@
 
 #include <gpac/evg.h>
 
+typedef struct _traster_ctx EVGRasterCtx;
+
 /*base stencil stack*/
 #define EVGBASESTENCIL	\
-	u32 type;	\
-	void (*fill_run)(GF_EVGStencil *p, GF_EVGSurface *surf, s32 x, s32 y, u32 count);	\
+	void (*fill_run)(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 x, s32 y, u32 count);	\
 	GF_Matrix2D pmat;					\
 	GF_Matrix2D smat;					\
+	GF_Matrix2D smat_bck;					\
 	GF_Rect frame;					\
-	GF_ColorMatrix cmat;
+	GF_ColorMatrix cmat;\
+	u8 type;	\
+	u8 auto_mx; \
 
 
 
@@ -58,23 +62,20 @@
 	s32 flags; /*same as path flags*/
 } EVG_Outline;
 
-typedef struct TRaster_ *EVG_Raster;
-
 typedef struct EVG_Span_
 {
 	unsigned short x;
 	unsigned short len;
 	unsigned char coverage;
+	unsigned char odd_flag;
 	u32 idx1, idx2;
 } EVG_Span;
 
-typedef void (*EVG_SpanFunc)(int y, int count, EVG_Span *spans, void *user);
-#define EVG_Raster_Span_Func EVG_SpanFunc
+typedef void (*EVG_SpanFunc)(int y, int count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 
+GF_Err evg_sweep_lines(GF_EVGSurface *surf, u32 size_y, Bool zero_non_zero_rule, Bool is_tri_raster, GF_EVGFragmentParam *fparam);
 
-EVG_Raster evg_raster_new();
-void evg_raster_del(EVG_Raster raster);
-int evg_raster_render(GF_EVGSurface *surf);
+GF_Err evg_raster_render(GF_EVGSurface *surf);
 
 GF_Err evg_raster_render_path_3d(GF_EVGSurface *surf);
 GF_Err evg_raster_render3d(GF_EVGSurface *surf, u32 *indices, u32 nb_idx, Float *vertices, u32 nb_vertices, u32 nb_comp, GF_EVGPrimitiveType prim_type);
@@ -86,12 +87,9 @@
 	//depth buffer
 	Float *depth_buffer;
 
-	gf_evg_fragment_shader frag_shader;
-	void *frag_shader_udta;
 	gf_evg_vertex_shader vert_shader;
 	void *vert_shader_udta;
 	/*render state*/
-	u32 vp_x, vp_y, vp_w, vp_h;
 	Bool is_ccw;
 	Bool backface_cull;
 	Float max_depth;
@@ -104,21 +102,15 @@
 	Bool mode2d;
 	Bool clip_zero;
 	Float zw_factor, zw_offset;
+
 	/*internal variables for triangle rasterization*/
+	//primitive type
 	GF_EVGPrimitiveType prim_type;
-	GF_Vec4 s_v1, s_v2, s_v3;
-	Float area;
-	
-	Float s3_m_s2_x, s3_m_s2_y;
-	Float s1_m_s3_x, s1_m_s3_y;
-	Float s2_m_s1_x, s2_m_s1_y;
+	//radius for point
 	Float pt_radius;
-	Float v1v2_length, v1v3_length, v2v3_length;
-	GF_Vec v1v2, v1v3, v2v3;
-
+	//line length
+	Float v1v2_length;
 	struct _gf_evg_base_stencil yuv_sten;
-
-	u32 *pix_vals;
 } EVG_Surface3DExt;
 
 typedef enum
@@ -128,80 +120,16 @@
 	EVG_YUV
 } EVG_YUVType;
 
-/*the surface object - currently only ARGB/RGB32, RGB/BGR and RGB555/RGB565 supported*/
-struct _gf_evg_surface
-{
-	/*surface info*/
-	char *pixels;
-	u32 pixelFormat, BPP;
-	u32 width, height;
-	s32 pitch_x, pitch_y;
-	Bool center_coords;
-	Bool is_transparent;
-
-	/*color buffer for variable stencils - size of width * 32 bit for 8 bit surface or width * 64 otherwise*/
-	void *stencil_pix_run;
-
-	/*default texture filter level*/
-	u32 texture_filter;
 
-	u32 useClipper;
-	GF_IRect clipper;
-
-	GF_Rect path_bounds;
-
-	/*complete path transform (including page flipping/recenter)*/
-	GF_Matrix2D mat;
-
-	/*stencil currently used*/
-	GF_EVGStencil *sten;
-
-	void (*yuv_flush_uv)(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
-
-	GF_EVGCompositeMode comp_mode;
-
-	/*in solid color mode to speed things*/
-	u32 fill_col;
-	u64 fill_col_wide;
-	u32 grey_type;
-
-	/*FreeType raster*/
-	EVG_Raster raster;
-
-	/*FreeType outline (path converted to ft)*/
-	EVG_Outline ftoutline;
-
-	GF_Matrix2D *mx;
-	EVG_SpanFunc gray_spans;
-
-	void (*fill_single)(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
-	void (*fill_single_a)(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
-
-	s32 clip_xMin, clip_yMin, clip_xMax, clip_yMax;
-
-
-	u8 *uv_alpha;
-	u32 uv_alpha_alloc;
-
-	Bool swap_uv, not_8bits, is_422;
-	EVG_YUVType yuv_type;
-	u32 yuv_prof;
-
-	u32 idx_y1, idx_u, idx_v, idx_a, idx_g, idx_r, idx_b;
-
-	u8 (*get_alpha)(void *udta, u8 src_alpha, s32 x, s32 y);
-	void *get_alpha_udta;
-
-	Bool is_3d_matrix;
-	GF_Matrix mx3d;
-	EVG_Surface3DExt *ext3d;
-};
 
 /*solid color brush*/
 typedef struct
 {
 	EVGBASESTENCIL
 	GF_Color color;
+	u32 fill_col;
+	u64 fill_col_wide;
+	u8 alpha;
 } EVG_Brush;
 
 /*max number of interpolation points*/
@@ -265,29 +193,34 @@
 	Fixed cur_y, inc_x, inc_y;
 
 	u32 mod, filter;
-	u32 replace_col;
-	Bool cmat_is_replace;
 
+	u8 is_yuv;
 	u8 alpha;
-	Bool is_yuv;
-
-	Bool owns_texture;
+	u8 owns_texture;
+	u8 is_wide;
+	u8 is_transparent;
 
 	GF_ColorMatrix yuv_cmat;
 
-	u32 (*tx_get_pixel)(struct __evg_texture *_this, u32 x, u32 y);
-	u64 (*tx_get_pixel_wide)(struct __evg_texture *_this, u32 x, u32 y);
+	u32 (*tx_get_pixel)(struct __evg_texture *_this, u32 x, u32 y, EVGRasterCtx *rctx);
+	u64 (*tx_get_pixel_wide)(struct __evg_texture *_this, u32 x, u32 y, EVGRasterCtx *rctx);
 
 	gf_evg_texture_callback tx_callback;
 	void *tx_callback_udta;
 	Bool tx_callback_screen_coords;
+
+	u32 pad_rbg, fill_pad_color;
+	u64 fill_pad_color_wide;
 } EVG_Texture;
 
-#define GF_TEXTURE_FILTER_DEFAULT	GF_TEXTURE_FILTER_HIGH_SPEED
+/*return u32 * for 8 bits destination surfaces, u64 *for wide color destination surfaces*/
+void *evg_fill_run(GF_EVGStencil *p, EVGRasterCtx *rctx, EVG_Span *span, s32 y);
+void *evg_fill_run_mask(GF_EVGStencil *p, EVGRasterCtx *rctx, EVG_Span *span, s32 y);
+void *evg_fill_run_mask_inv(GF_EVGStencil *p, EVGRasterCtx *rctx, EVG_Span *span, s32 y);
 
-void evg_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, s32 x, s32 y, u32 count);
+void evg_fill_span_mask(int y, int count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 
-#define evg_make_col_wide(_a, _r, _g, _b)\
+#define GF_COLW_ARGB(_a, _r, _g, _b)\
 	((u64)(_a)) << 48 | ((u64)(_r))<<32 | ((u64)(_g))<<16 | ((u64)(_b))
 
 u64 evg_col_to_wide( u32 col);
@@ -296,99 +229,99 @@
 void evg_radial_init(EVG_RadialGradient *_this);
 void evg_texture_init(GF_EVGStencil *p, GF_EVGSurface *surf);
 
-void evg_argb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_argb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_argb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_argb_fill_erase(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_argb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_argb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_argb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_argb_fill_erase(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_argb(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
 
-void evg_rgbx_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_rgbx_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_rgbx_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_rgbx_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_rgbx_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_rgbx_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_rgbx(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
 
-void evg_rgb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_rgb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_rgb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_rgb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_rgb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_rgb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_rgb(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
 
-void evg_grey_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_grey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_grey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_grey_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_grey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_grey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_grey(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
 
-void evg_alphagrey_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_alphagrey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_alphagrey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_alphagrey_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_alphagrey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_alphagrey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_alphagrey(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
 
 void evg_make_ayuv_color_mx(GF_ColorMatrix *cmat, GF_ColorMatrix *yuv_cmat);
 
-void evg_yuv420p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuv420p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuv420p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_yuv420p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuv420p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuv420p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_yuv420p(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
-void evg_yuv420p_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
-void evg_yuv420p_flush_uv_var(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_yuv420p_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_yuv420p_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
 
 GF_Err evg_surface_clear_nv12(GF_EVGSurface *surf, GF_IRect rc, GF_Color col, Bool swap_uv);
-void evg_nv12_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
-void evg_nv12_flush_uv_var(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_nv12_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_nv12_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
 
 GF_Err evg_surface_clear_yuv422p(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
-void evg_yuv422p_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
-void evg_yuv422p_flush_uv_var(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_yuv422p_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_yuv422p_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
 
-void evg_yuv444p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuv444p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuv444p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_yuv444p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuv444p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuv444p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_yuv444p(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
 
-void evg_565_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_565_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_565_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_565_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_565_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_565_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_565(GF_EVGSurface *_this, GF_IRect rc, GF_Color col);
 
 
-void evg_444_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_444_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_444_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_444_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_444_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_444_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_444(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
 
-void evg_555_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_555_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_555_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_555_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_555_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_555_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_555(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
 
-void evg_user_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_user_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_user_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_user_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_user_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_user_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 
 
-void evg_yuyv_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuyv_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuyv_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_yuyv_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuyv_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuyv_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_yuyv(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col);
 
-void evg_yuv420p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuv420p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuv420p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_yuv420p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuv420p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuv420p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_yuv420p_10(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
-void evg_yuv420p_10_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
-void evg_yuv420p_10_flush_uv_var(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_yuv420p_10_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_yuv420p_10_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
 
 GF_Err evg_surface_clear_nv12_10(GF_EVGSurface *surf, GF_IRect rc, GF_Color col, Bool swap_uv);
-void evg_nv12_10_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
-void evg_nv12_10_flush_uv_var(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_nv12_10_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_nv12_10_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
 
 
 GF_Err evg_surface_clear_yuv422p_10(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
-void evg_yuv422p_10_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
-void evg_yuv422p_10_flush_uv_var(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_yuv422p_10_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+void evg_yuv422p_10_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
 
-void evg_yuv444p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuv444p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
-void evg_yuv444p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf);
+void evg_yuv444p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuv444p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
+void evg_yuv444p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 GF_Err evg_surface_clear_yuv444p_10(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
 
 
@@ -456,7 +389,7 @@
 
 
 /* maximal number of gray spans in a call to the span callback */
-#define FT_MAX_GRAY_SPANS 64
+#define FT_MAX_GRAY_SPANS 128
 
 #define AA_CELL_STEP_ALLOC	8
 
@@ -492,8 +425,121 @@
 } AAScanline;
 
 
-typedef struct TRaster_
+void gray_record_cell(GF_EVGSurface *surf);
+void gray_set_cell(GF_EVGSurface *surf, TCoord ex, TCoord ey);
+void gray_render_line(GF_EVGSurface *surf, TPos to_x, TPos to_y);
+
+#include <gpac/thread.h>
+
+struct _traster_ctx
+{
+	GF_Thread *th;
+	Bool active;
+	GF_EVGSurface *surf;
+	u32 first_line, last_line;
+
+	EVG_Span *gray_spans;
+	int num_gray_spans;
+	u32 max_gray_spans, alloc_gray_spans;
+
+	/*color buffer for variable stencils - size of surface->width * 32 bit for 8 bit surface or surface->width * 64 otherwise
+	in 3D we will store a complete line here*/
+	void *stencil_pix_run;
+
+	void *stencil_pix_run2;
+	void *stencil_pix_run3;
+
+	u8 *uv_alpha;
+
+	//for 3D
+	GF_EVGFragmentParam frag_param;
+	u32 fill_col;
+	u64 fill_col_wide;
+
+	//for 2D
+	u8 fill_rule;
+	//for YUV
+	u8 no_yuv_flush;
+	//for 3D
+	u8 is_tri_raster;
+
+	u8 th_state;
+};
+
+void evg_get_fragment(GF_EVGSurface *surf, EVGRasterCtx *rctx, Bool *is_transparent);
+
+/*the surface object - currently only ARGB/RGB32, RGB/BGR and RGB555/RGB565 supported*/
+struct _gf_evg_surface
 {
+	/*surface info*/
+	char *pixels;
+	u32 pixelFormat, BPP;
+	u32 width, height;
+	s32 pitch_x, pitch_y;
+	Bool center_coords;
+	Bool is_transparent;
+
+	int aa_level;
+	GF_RasterQuality qlevel;
+
+	u32 useClipper;
+	GF_IRect clipper;
+
+	GF_Rect path_bounds;
+
+	/*complete path transform (including page flipping/recenter)*/
+	GF_Matrix2D mat;
+
+	/*stencil currently used*/
+	GF_EVGStencil *sten;
+
+	GF_EVGStencil *sten2, *sten3;
+
+	void (*yuv_flush_uv)(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y);
+	u32 uv_alpha_alloc;
+
+	GF_EVGCompositeMode comp_mode;
+
+	/*in solid color mode to speed things*/
+	u32 fill_col;
+	u64 fill_col_wide;
+	u32 grey_type;
+
+	/*FreeType outline (path converted to ft)*/
+	EVG_Outline ftoutline;
+
+	GF_Matrix2D *mx;
+	//raw video pixel write callback
+	EVG_SpanFunc fill_spans;
+
+	void (*fill_single)(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
+	void (*fill_single_a)(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
+
+	s32 clip_xMin, clip_yMin, clip_xMax, clip_yMax;
+
+	Bool swap_uv, not_8bits, is_422;
+	EVG_YUVType yuv_type;
+	u32 yuv_prof;
+
+	u32 idx_y1, idx_u, idx_v, idx_a, idx_g, idx_r, idx_b;
+
+	u8 (*get_alpha)(void *udta, u8 src_alpha, s32 x, s32 y);
+	void *get_alpha_udta;
+
+	Bool is_3d_matrix;
+	GF_Matrix mx3d;
+	EVG_Surface3DExt *ext3d;
+
+	EVGRasterCtx raster_ctx;
+	EVGRasterCtx *th_raster_ctx;
+	u32 nb_threads;
+	GF_Mutex *raster_mutex;
+	GF_Semaphore *raster_sem;
+	u32 last_dispatch_line;
+	u32 pending_threads;
+	u32 max_line_y;
+
+	/*FreeType raster state*/
 	AAScanline *scanlines;
 	u32 max_lines;
 	TPos min_ex, max_ex, min_ey, max_ey;
@@ -503,22 +549,52 @@
 	int cover;
 	u32 idx1, idx2;
 
-	EVG_Span *gray_spans;
-	int num_gray_spans;
-	u32 max_gray_spans, alloc_gray_spans;
-	EVG_Raster_Span_Func render_span;
-	void *render_span_data;
-
 	u32 first_scanline;
 
-	GF_Matrix2D *mx;
-} TRaster;
+	u32 max_gray_spans;
+
+	Bool direct_yuv_3d;
+	Bool is_shader;
+	//for 2D set to fill_spans, for 3D set to EVG3D_SpanFunc
+	EVG_SpanFunc render_span;
+	u32 first_patch, last_patch;
+
+
+	gf_evg_fragment_shader frag_shader;
+	gf_evg_fragment_shader_init frag_shader_init;
+	void *frag_shader_udta;
+
+	struct __evg_texture shader_sten;
+	GF_Matrix2D shader_mx;
+
+
+	void (*update_run)(EVGRasterCtx *rctx, u32 count);
+
+	u32 odd_fill;
+	u32 mix_val;
+	u32 run_size;
+
+	void *(*fill_run)(GF_EVGStencil *p, EVGRasterCtx *rctx, EVG_Span *span, s32 y);
+
+	u8 *internal_mask;
+	u32 mask_mode;
+
+	u32 vp_x, vp_y, vp_w, vp_h;
+
+	//for 3D rasterization, for mesh or for path
+	//triangle area
+	Float tri_area;
+	//transformed triangle points in NDC
+	GF_Vec4 s_v1, s_v2, s_v3;
+	//precomputed variables for edge function
+	Float s3_m_s2_x, s3_m_s2_y, s1_m_s3_x, s1_m_s3_y, s2_m_s1_x, s2_m_s1_y;
+};
+
+
+u32 th_sweep_lines(void *par);
+
+GF_Err gf_evg_setup_multi_texture(GF_EVGSurface *surf, GF_EVGMultiTextureMode operand, GF_EVGStencil *sten2, GF_EVGStencil *sten3, Float *params);
 
-void gray_record_cell( TRaster *raster );
-void gray_set_cell( TRaster *raster, TCoord ex, TCoord ey );
-void gray_render_line(TRaster *raster, TPos to_x, TPos to_y);
-void gray_quick_sort( AACell *cells, int count);
-void gray_sweep_line( TRaster *raster, AAScanline *sl, int y, Bool zero_non_zero_rule);
 
 #endif

gpac-1.0.1.tar.gz/src/evg/raster3d.c -> gpac-2.0.0.tar.gz/src/evg/raster3d.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
-*			Copyright (c) Telecom ParisTech 2019
+*			Copyright (c) Telecom ParisTech 2019-2021
 *					All rights reserved
 *
 * This file is part of GPAC / software 3D rasterizer module
@@ -53,6 +53,15 @@
 #endif
 
 
+static float edgeFunction(const GF_Vec4 *a, const GF_Vec4 *b, const GF_Vec4 *c)
+{
+	return (c->x - a->x) * (b->y - a->y) - (c->y - a->y) * (b->x - a->x);
+}
+
+float edgeFunction_pre(const GF_Vec4 *a, const Float b_minus_a_x, const Float b_minus_a_y, const GF_Vec4 *c)
+{
+	return (c->x - a->x) * (b_minus_a_y) - (c->y - a->y) * (b_minus_a_x);
+}
 
 static GFINLINE Bool evg3d_persp_divide(GF_Vec4 *pt)
 {
@@ -67,36 +76,24 @@
 
 static GFINLINE void evg_ndc_to_raster(GF_EVGSurface *surf, GF_Vec4 *pt, TPos *x, TPos *y)
 {
+	if (!surf->vp_w || !surf->vp_h) {
+		surf->vp_w = surf->width;
+		surf->vp_h = surf->height;
+		surf->vp_x = surf->vp_y = 0;
+	}
 	//from [-1, 1] to [0,2] to [0,1] to [0,vp_width] to [vp left, vp right]
-	pt->x = (pt->x + FIX_ONE) / 2 * surf->width;
-	//idem but flip Y
-	pt->y = (FIX_ONE - (pt->y + FIX_ONE)/2) * surf->height;
-
-	//move Z from [-1, 1] to [min_depth, max_depth]
-	pt->z += FIX_ONE;
-	pt->z /= 2;
-
-#ifdef GPAC_FIXED_POINT
-	*x = UPSCALE(pt->x);
-	*y = UPSCALE(pt->y);
-#else
-	*x = (s32) (pt->x * ONE_PIXEL);
-	*y = (s32) (pt->y * ONE_PIXEL);
-#endif
-}
-static GFINLINE void evg3d_ndc_to_raster(GF_EVGSurface *surf, GF_Vec4 *pt, TPos *x, TPos *y)
-{
-	//from [-1, 1] to [0,2] to [0,1] to [0,vp_width] to [vp left, vp right]
-	pt->x = (pt->x + FIX_ONE) / 2 * surf->ext3d->vp_w + surf->ext3d->vp_x;
+	pt->x = (pt->x + FIX_ONE) / 2 * surf->vp_w + surf->vp_x;
 	//idem but flip Y
-	pt->y = (FIX_ONE - (pt->y + FIX_ONE)/2) * surf->ext3d->vp_h + surf->ext3d->vp_y;
+	pt->y = (FIX_ONE - (pt->y + FIX_ONE)/2) * surf->vp_h + surf->vp_y;
 	/*compute depth*/
-	if (!surf->ext3d->clip_zero) {
+	if (!surf->ext3d || !surf->ext3d->clip_zero) {
 		//move Z from [-1, 1] to [min_depth, max_depth]
 		pt->z += FIX_ONE;
 		pt->z /= 2;
 	}
-	pt->z = surf->ext3d->min_depth + pt->z * surf->ext3d->depth_range;
+
+	if (surf->ext3d)
+		pt->z = surf->ext3d->min_depth + pt->z * surf->ext3d->depth_range;
 
 #ifdef GPAC_FIXED_POINT
 	*x = UPSCALE(pt->x);
@@ -107,24 +104,24 @@
 #endif
 }
 
-static GFINLINE int gray3d_move_to(EVG_Raster raster, TPos x, TPos y)
+static GFINLINE int gray3d_move_to(GF_EVGSurface *surf, TPos x, TPos y)
 {
 	TCoord ex, ey;
 
 	/* record current cell, if any */
-	gray_record_cell(raster);
+	gray_record_cell(surf);
 
 	ex = TRUNC(x);
 	ey = TRUNC(y);
-	if ( ex < raster->min_ex ) ex = (TCoord)(raster->min_ex - 1);
-	raster->area = 0;
-	raster->cover = 0;
-	gray_set_cell( raster, ex, ey );
+	if ( ex < surf->min_ex ) ex = (TCoord)(surf->min_ex - 1);
+	surf->area = 0;
+	surf->cover = 0;
+	gray_set_cell(surf, ex, ey );
 	if (ey<0) ey=0;
-	raster->last_ey = SUBPIXELS( ey );
+	surf->last_ey = SUBPIXELS( ey );
 
-	raster->x = x;
-	raster->y = y;
+	surf->x = x;
+	surf->y = y;
 	return 0;
 }
 
@@ -135,32 +132,75 @@
 	int first; /* index of first point in contour */
 	TPos _x, _y, _sx, _sy;
 	GF_Vec dir;
-	u32 li, size_y;
-	EVG_Raster raster = surf->raster;
+	u32 size_y;
 	EVG_Outline *outline = &surf->ftoutline;
 
-	raster->render_span = (EVG_Raster_Span_Func) surf->gray_spans;
-	raster->render_span_data = surf;
-
 	/* Set up state in the raster object */
-	raster->min_ex = surf->clip_xMin;
-	raster->min_ey = surf->clip_yMin;
-	raster->max_ex = surf->clip_xMax;
-	raster->max_ey = surf->clip_yMax;
+	if (surf->vp_w && surf->vp_h) {
+		if ((u32) surf->clip_xMin < surf->vp_x)
+			surf->clip_xMin = surf->vp_x;
+		if ((u32) surf->clip_yMin < surf->vp_y)
+			surf->clip_yMin = surf->vp_y;
+		if ((u32) surf->clip_xMax > surf->vp_x + surf->vp_w)
+			surf->clip_xMax = surf->vp_x + surf->vp_w;
+		if ((u32) surf->clip_yMax > surf->vp_y + surf->vp_h)
+			surf->clip_yMax = surf->vp_y + surf->vp_h;
+	}
+	surf->min_ex = surf->clip_xMin;
+	surf->min_ey = surf->clip_yMin;
+	surf->max_ex = surf->clip_xMax;
+	surf->max_ey = surf->clip_yMax;
+
+	size_y = (u32) (surf->max_ey - surf->min_ey);
+	if ((u32) surf->max_lines < size_y) {
+		surf->scanlines = (AAScanline*)gf_realloc(surf->scanlines, sizeof(AAScanline)*size_y);
+		memset(&surf->scanlines[surf->max_lines], 0, sizeof(AAScanline)*(size_y - surf->max_lines) );
+		surf->max_lines = size_y;
+	}
 
+	surf->ex = (int) (surf->max_ex+1);
+	surf->ey = (int) (surf->max_ey+1);
+	surf->cover = 0;
+	surf->area = 0;
+	surf->first_scanline = surf->max_ey;
 
-	size_y = (u32) (raster->max_ey - raster->min_ey);
-	if ((u32) raster->max_lines < size_y) {
-		raster->scanlines = (AAScanline*)gf_realloc(raster->scanlines, sizeof(AAScanline)*size_y);
-		memset(&raster->scanlines[raster->max_lines], 0, sizeof(AAScanline)*(size_y-raster->max_lines) );
-		raster->max_lines = size_y;
-	}
+	//raster coordinates of points
+	TPos _x1, _y1, _x2, _y2, _x3, _y3;
+	/*vertices in raster/window space: x and y are in pixel space, z is [min_depth, max_depth]*/
+	GF_Vec4 s_pt1, s_pt2, s_pt3;
 
-	raster->ex = (int) (raster->max_ex+1);
-	raster->ey = (int) (raster->max_ey+1);
-	raster->cover = 0;
-	raster->area = 0;
-	raster->first_scanline = raster->max_ey;
+	/*get bounds, and compute interpolation from (top-left, top-right, bottom-right) vertices
+	they are only used for tx coord interpolation, using {0,0}, {1,0} and {0,1}
+	so that we flip y*/
+	GF_Rect rc = surf->path_bounds;
+	Float z = 0;
+	//rc.y is bottom
+	rc.y += rc.height;
+	s_pt1.x = rc.x; s_pt1.y = rc.y; s_pt1.z = z; s_pt1.q = 1;
+	s_pt2.x = rc.x + rc.width; s_pt2.y = rc.y; s_pt2.z = z; s_pt2.q = 1;
+	s_pt3.x = rc.x; s_pt3.y = rc.y - rc.height ; s_pt3.z = z; s_pt3.q = 1;
+
+	gf_mx_apply_vec_4x4(&surf->mx3d, &s_pt1);
+	evg3d_persp_divide(&s_pt1);
+	evg_ndc_to_raster(surf, &s_pt1, &_x1, &_y1);
+	gf_mx_apply_vec_4x4(&surf->mx3d, &s_pt2);
+	evg3d_persp_divide(&s_pt2);
+	evg_ndc_to_raster(surf, &s_pt2, &_x2, &_y2);
+	gf_mx_apply_vec_4x4(&surf->mx3d, &s_pt3);
+	evg3d_persp_divide(&s_pt3);
+	evg_ndc_to_raster(surf, &s_pt3, &_x3, &_y3);
+
+	//precompute triangle
+	surf->tri_area = edgeFunction(&s_pt1, &s_pt2, &s_pt3);
+	surf->s_v1 = s_pt1;
+	surf->s_v2 = s_pt2;
+	surf->s_v3 = s_pt3;
+	surf->s3_m_s2_x = surf->s_v3.x - surf->s_v2.x;
+	surf->s3_m_s2_y = surf->s_v3.y - surf->s_v2.y;
+	surf->s1_m_s3_x = surf->s_v1.x - surf->s_v3.x;
+	surf->s1_m_s3_y = surf->s_v1.y - surf->s_v3.y;
+	surf->s2_m_s1_x = surf->s_v2.x - surf->s_v1.x;
+	surf->s2_m_s1_y = surf->s_v2.y - surf->s_v1.y;
 
 	dir.x = dir.y = 0;
 	dir.z = -FIX_ONE;
@@ -185,7 +225,7 @@
 			continue;
 		}
 		evg_ndc_to_raster(surf, &pt, &_sx, &_sy);
-		gray3d_move_to(raster, _sx, _sy);
+		gray3d_move_to(surf, _sx, _sy);
 		while ( point < limit ) {
 			point++;
 
@@ -198,33 +238,27 @@
 				break;
 			}
 			evg_ndc_to_raster(surf, &pt, &_x, &_y);
-			gray_render_line(raster, _x, _y);
+			gray_render_line(surf, _x, _y);
 		}
-		gray_render_line(raster, _sx, _sy);
+		gray_render_line(surf, _sx, _sy);
 
 		first = last + 1;
 	}
 
-	gray_record_cell( raster );
-	/* sort each scanline and render it*/
-	for (li=raster->first_scanline; li<size_y; li++) {
-		AAScanline *sl = &raster->scanlines[li];
-		if (sl->num) {
-			if (sl->num>1) gray_quick_sort(sl->cells, sl->num);
-			gray_sweep_line(raster, sl, li, GF_TRUE);
-		}
-	}
-	return GF_OK;
-}
+	gray_record_cell( surf );
 
+	surf->render_span = (EVG_SpanFunc) surf->fill_spans;
+	return evg_sweep_lines(surf, size_y, GF_TRUE, GF_FALSE, NULL);
+}
 
-Bool evg3d_get_fragment(GF_EVGSurface *surf, GF_EVGFragmentParam *frag_param, Bool *is_transparent)
+void evg_get_fragment(GF_EVGSurface *surf, EVGRasterCtx *rctx, Bool *is_transparent)
 {
-	surf->fill_col = 0;
-	surf->fill_col_wide = 0;
-
-	if (!surf->ext3d->frag_shader(surf->ext3d->frag_shader_udta, frag_param))
-		return GF_FALSE;
+	if (!surf->frag_shader(surf->frag_shader_udta, &rctx->frag_param)) {
+		rctx->frag_param.frag_valid = 0;
+		rctx->fill_col = 0;
+		rctx->fill_col_wide = 0;
+		return;
+	}
 
 #if 0
 	frag_param->color.x = float_clamp(frag_param->color.x, 0.0, 1.0);
@@ -233,58 +267,71 @@
 	frag_param->color.q = float_clamp(frag_param->color.q, 0.0, 1.0);
 #endif
 
-	if (frag_param->color.q<1.0) *is_transparent = GF_TRUE;
-
 	if (surf->not_8bits) {
-		surf->fill_col_wide = evg_make_col_wide((u16) frag_param->color.q*0xFFFF, (u16) frag_param->color.x*0xFFFF, (u16) frag_param->color.y*0xFFFF, (u16) frag_param->color.z*0xFFFF);
+		if ((rctx->frag_param.frag_valid==GF_EVG_FRAG_RGB_PACK) || (rctx->frag_param.frag_valid==GF_EVG_FRAG_YUV_PACK)) {
+			if (rctx->frag_param.color_pack) {
+				u16 a = GF_COL_A(rctx->frag_param.color_pack); a *= 255;
+				u16 r = GF_COL_R(rctx->frag_param.color_pack); r *= 255;
+				u16 g = GF_COL_G(rctx->frag_param.color_pack); g *= 255;
+				u16 b = GF_COL_B(rctx->frag_param.color_pack); b *= 255;
+				rctx->fill_col_wide = GF_COLW_ARGB(a, r, g, b);
+			} else {
+				rctx->fill_col_wide = rctx->frag_param.color_pack_wide;
+			}
+		} else {
+			GF_Vec4 color = rctx->frag_param.color;
+			rctx->fill_col_wide = GF_COLW_ARGB((u16) color.q*0xFFFF, (u16) color.x*0xFFFF, (u16) color.y*0xFFFF, (u16) color.z*0xFFFF);
+		}
+		if (is_transparent && (GF_COLW_A(rctx->fill_col_wide) <0xFFFF))
+			*is_transparent=1;
 	} else {
-		u8 a = (u8) (frag_param->color.q*255);
-		u8 r = (u8) (frag_param->color.x*255);
-		u8 g = (u8) (frag_param->color.y*255);
-		u8 b = (u8) (frag_param->color.z*255);
-		surf->fill_col = GF_COL_ARGB(a, r, g, b);
+		if ((rctx->frag_param.frag_valid==GF_EVG_FRAG_RGB_PACK) || (rctx->frag_param.frag_valid==GF_EVG_FRAG_YUV_PACK)) {
+			if (rctx->frag_param.color_pack_wide) {
+				u16 a = GF_COLW_A(rctx->frag_param.color_pack_wide); a /= 255;
+				u16 r = GF_COLW_R(rctx->frag_param.color_pack_wide); r /= 255;
+				u16 g = GF_COLW_G(rctx->frag_param.color_pack_wide); g /= 255;
+				u16 b = GF_COLW_B(rctx->frag_param.color_pack_wide); b /= 255;
+				rctx->fill_col = GF_COL_ARGB(a, r, g, b);
+			} else {
+				rctx->fill_col = rctx->frag_param.color_pack;
+			}
+		} else {
+			GF_Vec4 color = rctx->frag_param.color;
+			u8 a = (u8) (color.q*255);
+			u8 r = (u8) (color.x*255);
+			u8 g = (u8) (color.y*255);
+			u8 b = (u8) (color.z*255);
+			rctx->fill_col = GF_COL_ARGB(a, r, g, b);
+		}
+		if (is_transparent && (GF_COL_A(rctx->fill_col) <0xFF))
+			*is_transparent=1;
 	}
 
 	if (surf->not_8bits) {
 		if (surf->yuv_type) {
-			if (frag_param->frag_valid==GF_EVG_FRAG_RGB) {
-				surf->fill_col_wide = gf_evg_argb_to_ayuv_wide(surf, surf->fill_col_wide);
+			if (rctx->frag_param.frag_valid==GF_EVG_FRAG_RGB) {
+				rctx->fill_col_wide = gf_evg_argb_to_ayuv_wide(surf, rctx->fill_col_wide);
 			}
 		} else {
-			if (frag_param->frag_valid==GF_EVG_FRAG_YUV) {
-				surf->fill_col_wide = gf_evg_ayuv_to_argb_wide(surf, surf->fill_col_wide);
+			if (rctx->frag_param.frag_valid==GF_EVG_FRAG_YUV) {
+				rctx->fill_col_wide = gf_evg_ayuv_to_argb_wide(surf, rctx->fill_col_wide);
 			}
 		}
 	} else {
 		if (surf->yuv_type) {
 			/*RGB frag*/
-			if (frag_param->frag_valid==GF_EVG_FRAG_RGB) {
-				surf->fill_col = gf_evg_argb_to_ayuv(surf, surf->fill_col);
+			if (rctx->frag_param.frag_valid==GF_EVG_FRAG_RGB) {
+				rctx->fill_col = gf_evg_argb_to_ayuv(surf, rctx->fill_col);
 			}
 		} else {
-			if (frag_param->frag_valid==GF_EVG_FRAG_YUV) {
-				surf->fill_col = gf_evg_ayuv_to_argb(surf, surf->fill_col);
+			if (rctx->frag_param.frag_valid==GF_EVG_FRAG_YUV) {
+				rctx->fill_col = gf_evg_ayuv_to_argb(surf, rctx->fill_col);
 			}
 		}
 	}
-	return GF_TRUE;
+	return;
 }
 
-static float edgeFunction(const GF_Vec4 *a, const GF_Vec4 *b, const GF_Vec4 *c)
-{
-	return (c->x - a->x) * (b->y - a->y) - (c->y - a->y) * (b->x - a->x);
-}
-
-static float edgeFunction_pre(const GF_Vec4 *a, const Float b_minus_a_x, const Float b_minus_a_y, const GF_Vec4 *c)
-{
-	return (c->x - a->x) * (b_minus_a_y) - (c->y - a->y) * (b_minus_a_x);
-}
-
-typedef struct
-{
-	GF_EVGSurface *surf;
-	GF_EVGFragmentParam frag_param;
-} EVGFragCallback;
 
 static void push_patch_pixel(AAScanline *sl, s32 x, u32 col, u8 coverage, Float depth, Float write_depth, u32 idx1, u32 idx2)
 {
@@ -348,15 +395,12 @@
 	}
 }
 
-void EVG3D_SpanFunc(int y, int count, EVG_Span *spans, void *user)
+void EVG3D_SpanFunc(int y, int count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	int i;
 	GF_Vec4 pix;
-	EVGFragCallback *fcbck = user;
-	GF_EVGSurface *surf = fcbck->surf;
 	EVG_Surface3DExt *s3d = surf->ext3d;
-	GF_EVGFragmentParam *frag_param = &fcbck->frag_param;
-	AAScanline *sl = &surf->raster->scanlines[y];
+	AAScanline *sl = &surf->scanlines[y];
 	Float *depth_line = s3d->depth_buffer ? &s3d->depth_buffer[y*surf->width] : NULL;
 	Float depth_buf_val;
 
@@ -389,8 +433,8 @@
 	if (s3d->prim_type==GF_EVG_POINTS) {
 		if (s3d->smooth_points) {
 			Float dx, dy;
-			dx = (Float)x - s3d->s_v1.x;
-			dy = (Float)y - s3d->s_v1.y;
+			dx = (Float)x - surf->s_v1.x;
+			dy = (Float)y - surf->s_v1.y;
 			dx *=dx;
 			dy *=dy;
 			if (dx+dy > s3d->pt_radius) {
@@ -398,7 +442,7 @@
 				continue;
 			}
 		}
-		depth = s3d->s_v1.z;
+		depth = surf->s_v1.z;
 
 		bc1 = bc2 = bc3 = 0;
 		if (coverage!=0xFF) {
@@ -407,123 +451,49 @@
 	} else if (s3d->prim_type==GF_EVG_LINES) {
 		GF_Vec pt;
 
-		gf_vec_diff(pt, pix, s3d->s_v1);
+		gf_vec_diff(pt, pix, surf->s_v1);
 		bc1 = gf_vec_len(pt);
 		bc1 /= s3d->v1v2_length;
 		bc1 = float_clamp(bc1, 0, 1);
 		bc2 = FIX_ONE - bc1;
-		depth = s3d->s_v1.z * bc1 + s3d->s_v2.z * bc2;
+		depth = surf->s_v1.z * bc1 + surf->s_v2.z * bc2;
 
 		bc3 = 0;
 		if (coverage!=0xFF) {
 			full_cover = GF_FALSE;
 		}
 	} else {
-		bc1 = edgeFunction_pre(&s3d->s_v2, s3d->s3_m_s2_x, s3d->s3_m_s2_y, &pix);
-		bc1 /= s3d->area;
-		bc2 = edgeFunction_pre(&s3d->s_v3, s3d->s1_m_s3_x, s3d->s1_m_s3_y, &pix);
-		bc2 /= s3d->area;
-		bc3 = edgeFunction_pre(&s3d->s_v1, s3d->s2_m_s1_x, s3d->s2_m_s1_y, &pix);
-		bc3 /= s3d->area;
-		//bc3 = 1.0 - bc1 - bc2;
+		bc1 = edgeFunction_pre(&surf->s_v2, surf->s3_m_s2_x, surf->s3_m_s2_y, &pix);
+		bc1 /= surf->tri_area;
+		bc2 = edgeFunction_pre(&surf->s_v3, surf->s1_m_s3_x, surf->s1_m_s3_y, &pix);
+		bc2 /= surf->tri_area;
 
 		/* in antialiased mode, we don't need to test for bc1>=0 && bc2>=0 && bc3>=0 (ie, is the pixel in the triangle),
 		because we already know the point is in the triangle since we are called back
 		in non-AA mode, coverage is forced to full pixel, and we check if we are or not in the triangle*/
-		if (s3d->disable_aa)
-		{
+		if (s3d->disable_aa) {
+			bc3 = edgeFunction_pre(&surf->s_v1, surf->s2_m_s1_x, surf->s2_m_s1_y, &pix);
+			bc3 /= surf->tri_area;
 			if ((bc1<0) || (bc2<0) || (bc3<0)) {
 				spans[i].coverage=0;
 				continue;
 			}
 		}
-		/*if coverage is not full, we are on a line - recompute the weights assuming the pixel is exactly on the line*/
-		else if (coverage!=0xFF) {
-
-		//results are not precise enough to give better results, we always clamp for now
-#if 0
-			if (!s3d->backface_cull) {
-
-#if 0
-				//method 1, find a subpixel in a 5x5 grid belonging to the triangle
-				GF_Vec4 subp;
-				u32 k, l;
-				subp.q = 1;
-				subp.z = 0;
-				Bool subp_found=GF_FALSE;
-				for (k=0; k<=4; k++) {
-					for (l=0; l<=4; l++) {
-						subp.x = (Float) x + 0.25*k;
-						subp.y = (Float) x + 0.25*l;
-						bc1 = edgeFunction_pre(&s3d->s_v2, s3d->s3_m_s2_x, s3d->s3_m_s2_y, &subp);
-						bc1 /= s3d->area;
-						bc2 = edgeFunction_pre(&s3d->s_v3, s3d->s1_m_s3_x, s3d->s1_m_s3_y, &subp);
-						bc2 /= s3d->area;
-						bc3 = 1.0 - bc1 - bc2;
-						if ((bc1<0) || (bc2<0) || (bc3<0)) continue;
-						subp_found = GF_TRUE;
-						break;
-					}
+		else {
+			bc3 = 1.0f - bc1 - bc2;
+			/*if coverage is not full, we are on a line - recompute the weights assuming the pixel is exactly on the line*/
+			if (coverage!=0xFF) {
+				if (!s3d->mode2d) {
+					bc1 = float_clamp(bc1, 0, 1);
+					bc2 = float_clamp(bc2, 0, 1);
+					bc3 = float_clamp(bc3, 0, 1);
 				}
-//				assert(subp_found);
 
-#else
-				//method 2, reproject point on triangle edges
-				GF_Vec pt;
-				u32 on_line = 0;
-
-				if ((bc1<0) || (bc2<0) || (bc3<0)) {
-					if ((bc1<0) && (bc2<0)) { bc3 = 1.0; bc1 = bc2 = 0; }
-					else if ((bc1<0) && (bc3<0)) { bc2 = 1.0; bc1 = bc3 = 0; }
-					else if ((bc2<0) && (bc3<0)) { bc1 = 1.0; bc2 = bc3 = 0; }
-					else if ((bc1<=bc2) && (bc1<=bc3)) on_line = 3;
-					else if ((bc2<=bc1) && (bc2<=bc3)) on_line = 2;
-					else if ((bc3<=bc1) && (bc3<=bc2)) on_line = 1;
-				}
-				//project pixel center on line v2v3
-				if (on_line==3) {
-					bc1 = 0;
-					gf_vec_diff(pt, pix, s3d->s_v2);
-					pt.z=0;
-					bc2 = gf_vec_dot(pt, s3d->v2v3);
-					bc2 /= s3d->v2v3_length;
-					bc3 = float_clamp(bc2, 0, 1);
-					bc2 = FIX_ONE - bc3;
-				}
-				//project pixel center on line v1v3
-				else if (on_line==2) {
-					bc2 = 0;
-					gf_vec_diff(pt, pix, s3d->s_v1);
-					pt.z=0;
-					bc1 = gf_vec_dot(pt, s3d->v1v3);
-					bc1 /= s3d->v1v3_length;
-					bc3 = float_clamp(bc1, 0, 1);
-					bc1 = FIX_ONE - bc3;
-				}
-				//project pixel center on line v1v2
-				else if (on_line==1) {
-					bc3 = 0;
-					gf_vec_diff(pt, pix, s3d->s_v1);
-					pt.z=0;
-					bc1 = gf_vec_dot(pt, s3d->v1v2);
-					bc1 /= s3d->v1v2_length;
-					bc2 = float_clamp(bc1, 0, 1);
-					bc1 = FIX_ONE - bc2;
-				}
-#endif
-
-			} else
-#endif
-			if (!s3d->mode2d) {
-				bc1 = float_clamp(bc1, 0, 1);
-				bc2 = float_clamp(bc2, 0, 1);
-				bc3 = float_clamp(bc3, 0, 1);
+				full_cover = GF_FALSE;
+				transparent = GF_TRUE;
 			}
-
-			full_cover = GF_FALSE;
-			transparent = GF_TRUE;
 		}
-		depth = s3d->s_v1.z * bc1 + s3d->s_v2.z * bc2 + s3d->s_v3.z * bc3;
+		depth = surf->s_v1.z * bc1 + surf->s_v2.z * bc2 + surf->s_v3.z * bc3;
 	}
 
 	//clip by depth
@@ -557,26 +527,27 @@
 		}
 	}
 
-	frag_param->screen_x = pix.x;
-	frag_param->screen_y = pix.y;
+	rctx->frag_param.screen_x = pix.x;
+	rctx->frag_param.screen_y = pix.y;
 	//compute Z window coord
-	frag_param->screen_z = s3d->zw_factor * depth + s3d->zw_offset;
-	frag_param->depth = depth;
-	frag_param->color.q = 1.0;
-	frag_param->frag_valid = 0;
+	rctx->frag_param.screen_z = s3d->zw_factor * depth + s3d->zw_offset;
+	rctx->frag_param.depth = depth;
+	rctx->frag_param.color.q = 1.0;
+	rctx->frag_param.frag_valid = 0;
 	/*perspective corrected barycentric, eg bc1/q1, bc2/q2, bc3/q3 - we already have store 1/q in the perspective divide step*/
-	frag_param->pbc1 = bc1*s3d->s_v1.q;
-	frag_param->pbc2 = bc2*s3d->s_v2.q;
-	frag_param->pbc3 = bc3*s3d->s_v3.q;
+	rctx->frag_param.pbc1 = bc1 * surf->s_v1.q;
+	rctx->frag_param.pbc2 = bc2 * surf->s_v2.q;
+	rctx->frag_param.pbc3 = bc3 * surf->s_v3.q;
 
-	frag_param->persp_denum = frag_param->pbc1 + frag_param->pbc2 + frag_param->pbc3;
+	rctx->frag_param.persp_denum = rctx->frag_param.pbc1 + rctx->frag_param.pbc2 + rctx->frag_param.pbc3;
 
-	if (!evg3d_get_fragment(surf, frag_param, &transparent)) {
+	evg_get_fragment(surf, rctx, &transparent);
+	if (!rctx->frag_param.frag_valid) {
 		spans[i].coverage=0;
 		continue;
 	}
 	if (!s3d->early_depth_test) {
-		if (! s3d->depth_test(depth_buf_val, frag_param->depth)) {
+		if (! s3d->depth_test(depth_buf_val, rctx->frag_param.depth)) {
 			spans[i].coverage=0;
 			continue;
 		}
@@ -602,7 +573,7 @@
 				coverage = 0xFF;
 			} else {
 				prev_partial->cover = ncov;
-				prev_partial->color = surf->fill_col;
+				prev_partial->color = rctx->fill_col;
 				spans[i].coverage=0;
 				continue;
 			}
@@ -614,7 +585,7 @@
 
 	//partial coverage, store
 	if (!full_cover && !s3d->mode2d) {
-		push_patch_pixel(sl, x, surf->fill_col, coverage, depth, depth_buf_val, spans[i].idx1, spans[i].idx2);
+		push_patch_pixel(sl, x, rctx->fill_col, coverage, depth, depth_buf_val, spans[i].idx1, spans[i].idx2);
 		spans[i].coverage=0;
 		continue;
 	}
@@ -622,30 +593,30 @@
 	else {
 		if (surf->fill_single) {
 			if (transparent) {
-				surf->fill_single_a(y, x, coverage, surf->fill_col, surf);
+				surf->fill_single_a(y, x, coverage, rctx->fill_col, surf);
 			} else {
-				surf->fill_single(y, x, surf->fill_col, surf);
+				surf->fill_single(y, x, rctx->fill_col, surf);
 			}
 		} else {
 			spans[i].coverage = 0xFF;
-			s3d->pix_vals[x] = surf->fill_col;
+			((u32 *)rctx->stencil_pix_run)[x] = rctx->fill_col;
 		}
 	}
 
 	//write depth
 	if (s3d->run_write_depth)
-		depth_line[x] = frag_param->depth;
+		depth_line[x] = rctx->frag_param.depth;
 
 
 		}	//end span.len loop
 	} //end spans count loop
 
 	if (!surf->fill_single) {
-		surf->gray_spans(y, count, spans, surf);
+		surf->fill_spans(y, count, spans, surf, rctx);
 	}
 }
 
-static GFINLINE Bool precompute_tri(EVG_Surface3DExt *s3d, EVGFragCallback *frag_ckck, TPos xmin, TPos xmax, TPos ymin, TPos ymax,
+static GFINLINE Bool precompute_tri(GF_EVGSurface *surf, GF_EVGFragmentParam *fparam, TPos xmin, TPos xmax, TPos ymin, TPos ymax,
 									TPos _x1, TPos _y1, TPos _x2, TPos _y2, TPos _x3, TPos _y3,
 									GF_Vec4 *s_pt1, GF_Vec4 *s_pt2, GF_Vec4 *s_pt3,
 									u32 vidx1, u32 vidx2, u32 vidx3
@@ -661,39 +632,25 @@
 	if ((_y1>=ymax) && (_y2>=ymax) && (_y3>=ymax))
 		return GF_FALSE;
 
-	s3d->area = edgeFunction(s_pt1, s_pt2, s_pt3);
-
-	s3d->s_v1 = *s_pt1;
-	s3d->s_v2 = *s_pt2;
-	s3d->s_v3 = *s_pt3;
-	frag_ckck->frag_param.idx1 = vidx1;
-	frag_ckck->frag_param.idx2 = vidx2;
-	frag_ckck->frag_param.idx3 = vidx3;
+	surf->tri_area = edgeFunction(s_pt1, s_pt2, s_pt3);
 
+	surf->s_v1 = *s_pt1;
+	surf->s_v2 = *s_pt2;
+	surf->s_v3 = *s_pt3;
 
 	//precompute a few things for this run
-	s3d->s3_m_s2_x = s3d->s_v3.x - s3d->s_v2.x;
-	s3d->s3_m_s2_y = s3d->s_v3.y - s3d->s_v2.y;
-	s3d->s1_m_s3_x = s3d->s_v1.x - s3d->s_v3.x;
-	s3d->s1_m_s3_y = s3d->s_v1.y - s3d->s_v3.y;
-	s3d->s2_m_s1_x = s3d->s_v2.x - s3d->s_v1.x;
-	s3d->s2_m_s1_y = s3d->s_v2.y - s3d->s_v1.y;
-
-	GF_Vec lv;
-	lv.z=0;
-	gf_vec_diff(lv, *s_pt2, *s_pt1);
-	s3d->v1v2_length = gf_vec_len(lv);
-	gf_vec_norm(&lv);
-	s3d->v1v2 = lv;
-	gf_vec_diff(lv, *s_pt3, *s_pt2);
-	s3d->v2v3_length = gf_vec_len(lv);
-	gf_vec_norm(&lv);
-	s3d->v2v3 = lv;
-	gf_vec_diff(lv, *s_pt3, *s_pt1);
-	s3d->v1v3_length = gf_vec_len(lv);
-	gf_vec_norm(&lv);
-	s3d->v1v3 = lv;
-
+	surf->s3_m_s2_x = surf->s_v3.x - surf->s_v2.x;
+	surf->s3_m_s2_y = surf->s_v3.y - surf->s_v2.y;
+	surf->s1_m_s3_x = surf->s_v1.x - surf->s_v3.x;
+	surf->s1_m_s3_y = surf->s_v1.y - surf->s_v3.y;
+	surf->s2_m_s1_x = surf->s_v2.x - surf->s_v1.x;
+	surf->s2_m_s1_y = surf->s_v2.y - surf->s_v1.y;
+
+	if (fparam) {
+		fparam->idx1 = vidx1;
+		fparam->idx2 = vidx2;
+		fparam->idx3 = vidx3;
+	}
 	return GF_TRUE;
 }
 
@@ -703,40 +660,37 @@
 	GF_Matrix projModeView;
 	EVG_Span span;
 	u32 is_strip_fan=0;
-	EVG_Raster raster = surf->raster;
 	EVG_Surface3DExt *s3d = surf->ext3d;
-	EVGFragCallback frag_ckck;
-	u32 first_patch, last_patch;
 	TPos xmin, xmax, ymin, ymax;
 	Bool glob_quad_done = GF_TRUE;
 	u32 prim_index=0;
+	GF_EVGFragmentParam fparam;
 	GF_EVGVertexParam vparam;
 	int hpw=0;
 	int hlw=0;
-	if (!surf->ext3d->frag_shader) return GF_BAD_PARAM;
+	if (!surf->frag_shader) return GF_BAD_PARAM;
 
-	raster->render_span = (EVG_Raster_Span_Func) EVG3D_SpanFunc;
-	raster->render_span_data = &frag_ckck;
+	surf->render_span = (EVG_SpanFunc) EVG3D_SpanFunc;
 
 	/* Set up state in the raster object */
-	raster->min_ex = surf->clip_xMin;
-	raster->min_ey = surf->clip_yMin;
-	raster->max_ex = surf->clip_xMax;
-	raster->max_ey = surf->clip_yMax;
+	surf->min_ex = surf->clip_xMin;
+	surf->min_ey = surf->clip_yMin;
+	surf->max_ex = surf->clip_xMax;
+	surf->max_ey = surf->clip_yMax;
 
 	s3d->run_write_depth = s3d->depth_buffer ? s3d->write_depth : GF_FALSE;
 
-	size_y = (u32) (raster->max_ey - raster->min_ey);
-	if (raster->max_lines < size_y) {
-		raster->scanlines = (AAScanline*)gf_realloc(raster->scanlines, sizeof(AAScanline)*size_y);
-		memset(&raster->scanlines[raster->max_lines], 0, sizeof(AAScanline)*(size_y-raster->max_lines) );
-		raster->max_lines = size_y;
+	size_y = (u32) (surf->max_ey - surf->min_ey);
+	if (surf->max_lines < size_y) {
+		surf->scanlines = (AAScanline*)gf_realloc(surf->scanlines, sizeof(AAScanline)*size_y);
+		memset(&surf->scanlines[surf->max_lines], 0, sizeof(AAScanline)*(size_y - surf->max_lines) );
+		surf->max_lines = size_y;
 	}
 	for (li=0; li<size_y; li++) {
-		raster->scanlines[li].pnum = 0;
+		surf->scanlines[li].pnum = 0;
 	}
-	first_patch = 0xFFFFFFFF;
-	last_patch = 0;
+	surf->first_patch = 0xFFFFFFFF;
+	surf->last_patch = 0;
 
 	gf_mx_copy(projModeView, s3d->proj);
 	gf_mx_add_matrix_4x4(&projModeView, &s3d->modelview);
@@ -784,15 +738,14 @@
 		return GF_BAD_PARAM;
 
 	s3d->prim_type = prim_type;
-	memset(&frag_ckck, 0, sizeof(EVGFragCallback));
-	frag_ckck.surf = surf;
-	frag_ckck.frag_param.ptype = prim_type;
-	frag_ckck.frag_param.prim_index = 0;
+	memset(&fparam, 0, sizeof(GF_EVGFragmentParam));
+	fparam.ptype = prim_type;
+	fparam.prim_index = 0;
 
-	xmin = raster->min_ex * ONE_PIXEL;
-	xmax = raster->max_ex * ONE_PIXEL;
-	ymin = raster->min_ey * ONE_PIXEL;
-	ymax = raster->max_ey * ONE_PIXEL;
+	xmin = surf->min_ex * ONE_PIXEL;
+	xmax = surf->max_ex * ONE_PIXEL;
+	ymin = surf->min_ey * ONE_PIXEL;
+	ymax = surf->max_ey * ONE_PIXEL;
 
 	//raster coordinates of points
 	TPos _x1=0, _y1=0, _x2=0, _y2=0, _x3=0, _y3=0, _x4=0, _y4=0, _prev_x2=0, _prev_y2=0;
@@ -845,7 +798,7 @@
 				vparam.vertex_idx = vidx2;
 				vparam.vertex_idx_in_prim = 1;
 				GETVEC(pt2, idx2)
-				evg3d_ndc_to_raster(surf, &s_pt2, &_x2, &_y2);
+				evg_ndc_to_raster(surf, &s_pt2, &_x2, &_y2);
 			}
 			//triangle strip
 			else if (is_strip_fan==1) {
@@ -867,7 +820,7 @@
 					vparam.vertex_idx = vidx3;
 					vparam.vertex_idx_in_prim = 2;
 					GETVEC(pt3, idx3)
-					evg3d_ndc_to_raster(surf, &s_pt3, &_x3, &_y3);
+					evg_ndc_to_raster(surf, &s_pt3, &_x3, &_y3);
 				}
 				//quad strip - since we draw [v1, v2, v3, v4] as 2 triangles [v1, v2, v3] and [v1, v3, v4]
 				// we only need to restore prev v2 as v1
@@ -882,7 +835,7 @@
 					vparam.vertex_idx = vidx4;
 					vparam.vertex_idx_in_prim = 3;
 					GETVEC(pt4, idx4)
-					evg3d_ndc_to_raster(surf, &s_pt4, &_x4, &_y4);
+					evg_ndc_to_raster(surf, &s_pt4, &_x4, &_y4);
 				}
 			}
 			//triangle fan
@@ -898,7 +851,7 @@
 				vparam.vertex_idx = vidx3;
 				vparam.vertex_idx_in_prim = 2;
 				GETVEC(pt3, idx3)
-				evg3d_ndc_to_raster(surf, &s_pt3, &_x3, &_y3);
+				evg_ndc_to_raster(surf, &s_pt3, &_x3, &_y3);
 			}
 		} else {
 			vidx1 = indices[i];
@@ -906,28 +859,28 @@
 			vparam.vertex_idx = vidx1;
 			vparam.vertex_idx_in_prim = 0;
 			GETVEC(pt1, idx1)
-			evg3d_ndc_to_raster(surf, &s_pt1, &_x1, &_y1);
+			evg_ndc_to_raster(surf, &s_pt1, &_x1, &_y1);
 			if (prim_type>=GF_EVG_LINES) {
 				vidx2 = indices[i+1];
 				idx2 = vidx2 * nb_comp;
 				vparam.vertex_idx = vidx2;
 				vparam.vertex_idx_in_prim = 1;
 				GETVEC(pt2, idx2)
-				evg3d_ndc_to_raster(surf, &s_pt2, &_x2, &_y2);
+				evg_ndc_to_raster(surf, &s_pt2, &_x2, &_y2);
 				if (prim_type>=GF_EVG_TRIANGLES) {
 					vidx3 = indices[i+2];
 					idx3 = vidx3 * nb_comp;
 					vparam.vertex_idx = vidx3;
 					vparam.vertex_idx_in_prim = 2;
 					GETVEC(pt3, idx3)
-					evg3d_ndc_to_raster(surf, &s_pt3, &_x3, &_y3);
+					evg_ndc_to_raster(surf, &s_pt3, &_x3, &_y3);
 					if (prim_type==GF_EVG_QUADS) {
 						vidx4 = indices[i+3];
 						idx4 = vidx4 * nb_comp;
 						vparam.vertex_idx = vidx4;
 						vparam.vertex_idx_in_prim = 3;
 						GETVEC(pt4, idx4)
-						evg3d_ndc_to_raster(surf, &s_pt4, &_x4, &_y4);
+						evg_ndc_to_raster(surf, &s_pt4, &_x4, &_y4);
 					}
 				}
 			}
@@ -935,94 +888,83 @@
 #undef GETVEC
 
 restart_quad:
-		raster->first_scanline = surf->height;
-		raster->ex = (int) (raster->max_ex+1);
-		raster->ey = (int) (raster->max_ey+1);
-		raster->cover = 0;
-		raster->area = 0;
+		surf->first_scanline = surf->height;
+		surf->ex = (int) (surf->max_ex+1);
+		surf->ey = (int) (surf->max_ey+1);
+		surf->cover = 0;
+		surf->area = 0;
 
 
 		if (prim_type>=GF_EVG_TRIANGLES) {
 
-			if (!precompute_tri(s3d, &frag_ckck, xmin, xmax, ymin, ymax, _x1, _y1, _x2, _y2, _x3, _y3, &s_pt1, &s_pt2, &s_pt3, vidx1, vidx2, vidx3))
+			if (!precompute_tri(surf, &fparam, xmin, xmax, ymin, ymax, _x1, _y1, _x2, _y2, _x3, _y3, &s_pt1, &s_pt2, &s_pt3, vidx1, vidx2, vidx3))
 				continue;
 
 			//check backcull
 			if (s3d->is_ccw) {
-				if (s3d->area<0) {
+				if (surf->tri_area<0) {
 					if (s3d->backface_cull)
 						continue;
 				}
 			} else {
-				if (s3d->area>0) {
+				if (surf->tri_area>0) {
 					if (s3d->backface_cull)
 						continue;
 				}
 			}
 		} else {
-			s3d->s_v1 = s_pt1;
-			frag_ckck.frag_param.idx1 = vidx1;
+			surf->s_v1 = s_pt1;
+			fparam.idx1 = vidx1;
 			if (prim_type==GF_EVG_LINES) {
 				GF_Vec lv;
-				s3d->s_v2 = s_pt2;
+				surf->s_v2 = s_pt2;
 				gf_vec_diff(lv, s_pt2, s_pt1);
 				lv.z=0;
 				s3d->v1v2_length = gf_vec_len(lv);
-				frag_ckck.frag_param.idx2 = vidx2;
+				fparam.idx2 = vidx2;
 			}
 		}
-		frag_ckck.frag_param.prim_index = prim_index-1;
+		fparam.prim_index = prim_index-1;
 
 		if (prim_type==GF_EVG_POINTS) {
-			raster->idx1 = raster->idx2 = idx1;
+			surf->idx1 = surf->idx2 = idx1;
 			//draw square
-			gray3d_move_to(raster, _x1-hpw, _y1-hpw);
-			gray_render_line(raster, _x1+hpw, _y1-hpw);
-			gray_render_line(raster, _x1+hpw, _y1+hpw);
-			gray_render_line(raster, _x1-hpw, _y1+hpw);
+			gray3d_move_to(surf, _x1-hpw, _y1-hpw);
+			gray_render_line(surf, _x1+hpw, _y1-hpw);
+			gray_render_line(surf, _x1+hpw, _y1+hpw);
+			gray_render_line(surf, _x1-hpw, _y1+hpw);
 			//and close
-			gray_render_line(raster, _x1-hpw, _y1-hpw);
-			gray_record_cell( raster );
+			gray_render_line(surf, _x1-hpw, _y1-hpw);
+			gray_record_cell(surf);
 		} else if (prim_type==GF_EVG_LINES) {
-			raster->idx1 = idx1;
-			raster->idx2 = idx2;
-			gray3d_move_to(raster, _x1+hlw, _y1+hlw);
-			gray_render_line(raster, _x1-hlw, _y1-hlw);
-			gray_render_line(raster, _x2-hlw, _y2-hlw);
-			gray_render_line(raster, _x2+hlw, _y2+hlw);
+			surf->idx1 = idx1;
+			surf->idx2 = idx2;
+			gray3d_move_to(surf, _x1+hlw, _y1+hlw);
+			gray_render_line(surf, _x1-hlw, _y1-hlw);
+			gray_render_line(surf, _x2-hlw, _y2-hlw);
+			gray_render_line(surf, _x2+hlw, _y2+hlw);
 			//and close
-			gray_render_line(raster, _x1+hlw, _y1+hlw);
-			gray_record_cell( raster );
+			gray_render_line(surf, _x1+hlw, _y1+hlw);
+			gray_record_cell(surf);
 		} else {
-			raster->idx1 = idx1;
-			raster->idx2 = idx2;
-			gray3d_move_to(raster, _x1, _y1);
-			gray_render_line(raster, _x2, _y2);
-			raster->idx1 = idx2;
-			raster->idx2 = idx3;
-			gray_render_line(raster, _x3, _y3);
+			surf->idx1 = idx1;
+			surf->idx2 = idx2;
+			gray3d_move_to(surf, _x1, _y1);
+			gray_render_line(surf, _x2, _y2);
+			surf->idx1 = idx2;
+			surf->idx2 = idx3;
+			gray_render_line(surf, _x3, _y3);
 
 			//and close
-			raster->idx1 = idx3;
-			raster->idx2 = idx1;
-			gray_render_line(raster, _x1, _y1);
-			gray_record_cell( raster );
+			surf->idx1 = idx3;
+			surf->idx2 = idx1;
+			gray_render_line(surf, _x1, _y1);
+			gray_record_cell(surf);
 		}
 
-		/* sort each scanline and render it*/
-		for (li=raster->first_scanline; li<size_y; li++) {
-			AAScanline *sl = &raster->scanlines[li];
-			//if nothing on this line, we are done for this primitive
-			if (!sl->num) break;
-
-			if (sl->num>1) gray_quick_sort(sl->cells, sl->num);
-			gray_sweep_line(raster, sl, li, GF_FALSE);
+		GF_Err e = evg_sweep_lines(surf, size_y, GF_FALSE, GF_TRUE, &fparam);
+		if (e) return e;
 
-			if (sl->pnum) {
-				if (first_patch>li) first_patch = li;
-				if (last_patch<li) last_patch = li;
-			}
-		}
 		if (!quad_done) {
 			if (is_strip_fan) {
 				_prev_x2 = _x2;
@@ -1039,16 +981,16 @@
 			s_pt3 = s_pt4;
 			vidx2 = vidx3;
 			vidx3 = vidx4;
-			s3d->s_v1 = s3d->s_v2;
-			s3d->s_v2 = s3d->s_v3;
+			surf->s_v1 = surf->s_v2;
+			surf->s_v2 = surf->s_v3;
 			goto restart_quad;
 		}
 	}
 
 	/*flush all partial fragments*/
 	span.len = 0;
-	for (li=first_patch; li<=last_patch; li++) {
-		AAScanline *sl = &raster->scanlines[li];
+	for (li=surf->first_patch; li<=surf->last_patch; li++) {
+		AAScanline *sl = &surf->scanlines[li];
 		Float *depth_line = &surf->ext3d->depth_buffer[li];
 		for (i=0; i<sl->pnum; i++) {
 			PatchPixel *pi = &sl->pixels[i];
@@ -1061,7 +1003,7 @@
 			} else {
 				span.coverage = pi->cover;
 				span.x = pi->x;
-				surf->gray_spans(li, 1, &span, surf);
+				surf->fill_spans(li, 1, &span, surf, &surf->raster_ctx);
 			}
 			if (surf->ext3d->run_write_depth)
 				depth_line[pi->x] = pi->depth;
@@ -1077,53 +1019,51 @@
 	int n; /* index of contour in outline */
 	int first; /* index of first point in contour */
 	TPos _x, _y, _sx, _sy;
-	u32 li, size_y;
-	EVG_Raster raster = surf->raster;
+	u32 size_y, fill_rule = 0;;
 	EVG_Outline *outline;
 	GF_Matrix projModeView;
+	GF_EVGFragmentParam fparam;
 	EVG_Surface3DExt *s3d = surf->ext3d;
-	EVGFragCallback frag_ckck;
 	u32 xmin, xmax, ymin, ymax;
 	GF_Err e;
 	GF_Rect rc;
 
-	if (!surf->ext3d->frag_shader) return GF_BAD_PARAM;
+	if (!surf->frag_shader) return GF_BAD_PARAM;
 
 	e = gf_evg_surface_set_path(surf, path);
 	if (e) return e;
 
 	outline = &surf->ftoutline;
 
-	raster->render_span = (EVG_Raster_Span_Func) EVG3D_SpanFunc;
-	raster->render_span_data = &frag_ckck;
+	surf->render_span = (EVG_SpanFunc) EVG3D_SpanFunc;
 
 	/* Set up state in the raster object */
-	raster->min_ex = surf->clip_xMin;
-	raster->min_ey = surf->clip_yMin;
-	raster->max_ex = surf->clip_xMax;
-	raster->max_ey = surf->clip_yMax;
+	surf->min_ex = surf->clip_xMin;
+	surf->min_ey = surf->clip_yMin;
+	surf->max_ex = surf->clip_xMax;
+	surf->max_ey = surf->clip_yMax;
 	s3d->run_write_depth = s3d->depth_buffer ? s3d->write_depth : GF_FALSE;
 
-	size_y = (u32) (raster->max_ey - raster->min_ey);
-	if (raster->max_lines < size_y) {
-		raster->scanlines = (AAScanline*)gf_realloc(raster->scanlines, sizeof(AAScanline)*size_y);
-		memset(&raster->scanlines[raster->max_lines], 0, sizeof(AAScanline)*(size_y-raster->max_lines) );
-		raster->max_lines = size_y;
+	size_y = (u32) (surf->max_ey - surf->min_ey);
+	if (surf->max_lines < size_y) {
+		surf->scanlines = (AAScanline*)gf_realloc(surf->scanlines, sizeof(AAScanline)*size_y);
+		if (!surf->scanlines) return GF_OUT_OF_MEM;
+		memset(&surf->scanlines[surf->max_lines], 0, sizeof(AAScanline)*(size_y-surf->max_lines) );
+		surf->max_lines = size_y;
 	}
 
 	gf_mx_copy(projModeView, s3d->proj);
 	gf_mx_add_matrix_4x4(&projModeView, &s3d->modelview);
 
 	s3d->prim_type = GF_EVG_TRIANGLES;
-	memset(&frag_ckck, 0, sizeof(EVGFragCallback));
-	frag_ckck.surf = surf;
-	frag_ckck.frag_param.ptype = GF_EVG_TRIANGLES;
-	frag_ckck.frag_param.prim_index = 0;
+	memset(&fparam, 0, sizeof(GF_EVGFragmentParam));
+	fparam.ptype = GF_EVG_TRIANGLES;
+	fparam.prim_index = 0;
 
-	xmin = raster->min_ex * ONE_PIXEL;
-	xmax = raster->max_ex * ONE_PIXEL;
-	ymin = raster->min_ey * ONE_PIXEL;
-	ymax = raster->max_ey * ONE_PIXEL;
+	xmin = surf->min_ex * ONE_PIXEL;
+	xmax = surf->max_ex * ONE_PIXEL;
+	ymin = surf->min_ey * ONE_PIXEL;
+	ymax = surf->max_ey * ONE_PIXEL;
 
 	//raster coordinates of points
 	TPos _x1, _y1, _x2, _y2, _x3, _y3;
@@ -1138,15 +1078,15 @@
 
 	gf_mx_apply_vec_4x4(&projModeView, &s_pt1);
 	evg3d_persp_divide(&s_pt1);
-	evg3d_ndc_to_raster(surf, &s_pt1, &_x1, &_y1);
+	evg_ndc_to_raster(surf, &s_pt1, &_x1, &_y1);
 	gf_mx_apply_vec_4x4(&projModeView, &s_pt2);
 	evg3d_persp_divide(&s_pt2);
-	evg3d_ndc_to_raster(surf, &s_pt2, &_x2, &_y2);
+	evg_ndc_to_raster(surf, &s_pt2, &_x2, &_y2);
 	gf_mx_apply_vec_4x4(&projModeView, &s_pt3);
 	evg3d_persp_divide(&s_pt3);
-	evg3d_ndc_to_raster(surf, &s_pt3, &_x3, &_y3);
+	evg_ndc_to_raster(surf, &s_pt3, &_x3, &_y3);
 
-	if (!precompute_tri(s3d, &frag_ckck, xmin, xmax, ymin, ymax, _x1, _y1, _x2, _y2, _x3, _y3, &s_pt1, &s_pt2, &s_pt3, 0, 1, 2))
+	if (!precompute_tri(surf, &fparam, xmin, xmax, ymin, ymax, _x1, _y1, _x2, _y2, _x3, _y3, &s_pt1, &s_pt2, &s_pt3, 0, 1, 2))
 		return GF_OK;
 
 	s3d->mode2d = GF_TRUE;
@@ -1169,8 +1109,8 @@
 		if (!evg3d_persp_divide(&pt)) {
 			continue;
 		}
-		evg3d_ndc_to_raster(surf, &pt, &_sx, &_sy);
-		gray3d_move_to(raster, _sx, _sy);
+		evg_ndc_to_raster(surf, &pt, &_sx, &_sy);
+		gray3d_move_to(surf, _sx, _sy);
 		while ( point < limit ) {
 			point++;
 
@@ -1182,42 +1122,22 @@
 			if (!evg3d_persp_divide(&pt)) {
 				break;
 			}
-			evg3d_ndc_to_raster(surf, &pt, &_x, &_y);
-			gray_render_line(raster, _x, _y);
+			evg_ndc_to_raster(surf, &pt, &_x, &_y);
+			gray_render_line(surf, _x, _y);
 		}
-		gray_render_line(raster, _sx, _sy);
+		gray_render_line(surf, _sx, _sy);
 
 		first = last + 1;
 	}
 
-	gray_record_cell( raster );
-	/* sort each scanline and render it*/
-	for (li=raster->first_scanline; li<size_y; li++) {
-		AAScanline *sl = &raster->scanlines[li];
-		if (sl->num) {
-			if (sl->num>1) gray_quick_sort(sl->cells, sl->num);
-			gray_sweep_line(raster, sl, li, GF_TRUE);
-		}
-	}
-	surf->ext3d->mode2d = GF_FALSE;
-	return GF_OK;
+	gray_record_cell(surf);
 
-}
-GF_Err evg_3d_resize(GF_EVGSurface *surf)
-{
-/*	surf->ext3d->depth_buffer = gf_realloc(surf->ext3d->depth_buffer, sizeof(Float)*surf->width*surf->height);
-	if (!surf->ext3d->depth_buffer) return GF_OUT_OF_MEM;
-*/
-	surf->ext3d->depth_buffer = NULL;
+	if (outline->flags & GF_PATH_FILL_ZERO_NONZERO) fill_rule = 1;
+	else if (outline->flags & GF_PATH_FILL_EVEN) fill_rule = 2;
+	e = evg_sweep_lines(surf, size_y, fill_rule, GF_FALSE, &fparam);
+	surf->ext3d->mode2d = GF_FALSE;
+	return e;
 
-	if (!surf->ext3d->vp_w || !surf->ext3d->vp_h) {
-		surf->ext3d->vp_x = 0;
-		surf->ext3d->vp_y = 0;
-		surf->ext3d->vp_w = surf->width;
-		surf->ext3d->vp_h = surf->height;
-	}
-	surf->ext3d->pix_vals = gf_realloc(surf->ext3d->pix_vals, sizeof(u32)*surf->width);
-	return GF_OK;
 }
 
 GF_EXPORT
@@ -1248,11 +1168,11 @@
 GF_EXPORT
 GF_Err gf_evg_surface_viewport(GF_EVGSurface *surf, u32 x, u32 y, u32 w, u32 h)
 {
-	if (!surf->ext3d) return GF_BAD_PARAM;
-	surf->ext3d->vp_x = x;
-	surf->ext3d->vp_y = y;
-	surf->ext3d->vp_w = w;
-	surf->ext3d->vp_h = h;
+	if (!surf) return GF_BAD_PARAM;
+	surf->vp_x = x;
+	surf->vp_y = y;
+	surf->vp_w = w;
+	surf->vp_h = h;
 	return GF_OK;
 }
 
@@ -1349,13 +1269,6 @@
 	return GF_OK;
 }
 
-static void yuv_3d_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
-{
-	u32 *data = surf->stencil_pix_run;
-	u32 *src = surf->ext3d->pix_vals + _x;
-
-	memcpy(data, src, sizeof(u32)*count);
-}
 
 EVG_Surface3DExt *evg_init_3d_surface(GF_EVGSurface *surf)
 {
@@ -1376,24 +1289,25 @@
 	ext3d->write_depth = GF_TRUE;
 	ext3d->early_depth_test = GF_TRUE;
 	ext3d->depth_test = depth_test_less;
-	ext3d->yuv_sten.fill_run = yuv_3d_fill_run;
 	evg_3d_update_depth_range(surf);
 	return ext3d;
 }
 
 
 
-GF_Err gf_evg_surface_set_fragment_shader(GF_EVGSurface *surf, gf_evg_fragment_shader shader, void *shader_udta)
+GF_Err gf_evg_surface_set_fragment_shader(GF_EVGSurface *surf, gf_evg_fragment_shader shader, gf_evg_fragment_shader_init shader_init, void *shader_udta)
 {
-	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
-	surf->ext3d->frag_shader = shader;
-	surf->ext3d->frag_shader_udta = shader_udta;
+	if (!surf) return GF_BAD_PARAM;
+	surf->frag_shader = shader;
+	surf->frag_shader_init = shader ? shader_init : NULL;
+	surf->frag_shader_udta = shader ? shader_udta : NULL;
 	return GF_OK;
 }
 
 GF_Err gf_evg_surface_disable_early_depth(GF_EVGSurface *surf, Bool disable)
 {
-	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	if (!surf) return GF_BAD_PARAM;
+	if (!surf->ext3d) return GF_OK;
 	surf->ext3d->early_depth_test = !disable;
 	return GF_OK;
 }

gpac-1.0.1.tar.gz/src/evg/raster_565.c -> gpac-2.0.0.tar.gz/src/evg/raster_565.c Changed

@@ -129,7 +129,7 @@
 }
 
 
-void evg_565_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_565_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 col = surf->fill_col;
 	u32 a, fin, col_no_a;
@@ -160,7 +160,7 @@
 	}
 }
 
-void evg_565_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_565_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
@@ -190,7 +190,7 @@
 }
 
 
-void evg_565_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_565_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	register s32 i;
@@ -201,9 +201,8 @@
 		register u32 len;
 		register u32 *col;
 		len = spans[i].len;
+		col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		col = surf->stencil_pix_run;
 		x = spans[i].x * surf->pitch_x;
 		while (len--) {
 			col_a = GF_COL_A(*col);
@@ -340,7 +339,7 @@
 	overmask_555(col, dst, coverage);
 }
 
-void evg_555_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_555_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 col = surf->fill_col;
 	u32 a, fin, col_no_a;
@@ -370,7 +369,7 @@
 	}
 }
 
-void evg_555_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_555_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
@@ -400,7 +399,7 @@
 }
 
 
-void evg_555_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_555_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = surf->pixels + y * surf->pitch_y;
 	s32 i;
@@ -411,9 +410,8 @@
 		u32 len;
 		u32 *col;
 		len = spans[i].len;
+		col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		col = surf->stencil_pix_run;
 		x = spans[i].x * surf->pitch_x;
 		while (len--) {
 			col_a = GF_COL_A(*col);
@@ -536,7 +534,7 @@
 	overmask_444(dst, col, coverage);
 }
 
-void evg_444_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_444_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 col = surf->fill_col;
 	u32 a, fin, col_no_a;
@@ -566,7 +564,7 @@
 	}
 }
 
-void evg_444_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_444_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
@@ -598,7 +596,7 @@
 }
 
 
-void evg_444_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_444_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = surf->pixels + y * surf->pitch_y;
 	s32 i;
@@ -609,9 +607,8 @@
 		u32 len;
 		u32 *col;
 		len = spans[i].len;
+		col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		col = surf->stencil_pix_run;
 		x = spans[i].x * surf->pitch_x;
 		while (len--) {
 			col_a = GF_COL_A(*col);

gpac-1.0.1.tar.gz/src/evg/raster_argb.c -> gpac-2.0.0.tar.gz/src/evg/raster_argb.c Changed

@@ -224,7 +224,7 @@
 }
 
 
-void evg_argb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_argb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 col = surf->fill_col;
 	u32 col_no_a;
@@ -247,7 +247,7 @@
 	}
 }
 
-void evg_argb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_argb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u32 a, fin, col_no_a;
@@ -275,7 +275,7 @@
 	}
 }
 
-void evg_argb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_argb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	s32 i;
@@ -287,9 +287,8 @@
 		u32 *col;
 		p = dst + spans[i].x * surf->pitch_x;
 		len = spans[i].len;
+		col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		col = surf->stencil_pix_run;
 		while (len--) {
 			//we must blend in all cases since we have to merge with the dst alpha
 			overmask_argb(*col, p, spanalpha, surf);
@@ -300,7 +299,7 @@
 }
 
 
-void evg_argb_fill_erase(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_argb_fill_erase(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	s32 i;
@@ -422,7 +421,7 @@
 	overmask_rgbx(col, dst, coverage, surf);
 }
 
-void evg_rgbx_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_rgbx_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 col = surf->fill_col;
 	u32 fin, col_no_a, spana;
@@ -455,7 +454,7 @@
 	}
 }
 
-void evg_rgbx_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_rgbx_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
@@ -485,7 +484,7 @@
 }
 
 
-void evg_rgbx_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_rgbx_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	s32 i;
@@ -496,9 +495,8 @@
 		u32 len;
 		u32 *col, _col;
 		len = spans[i].len;
+		col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		col = surf->stencil_pix_run;
 		x = spans[i].x * surf->pitch_x;
 		
 		while (len--) {
@@ -620,7 +618,7 @@
 	overmask_alphagrey(col, dst, coverage, surf->grey_type, surf->idx_g, surf->idx_a);
 }
 
-void evg_alphagrey_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_alphagrey_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 col = surf->fill_col;
 	u32 a;
@@ -651,7 +649,7 @@
 	}
 }
 
-void evg_alphagrey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_alphagrey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
@@ -682,7 +680,7 @@
 }
 
 
-void evg_alphagrey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_alphagrey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	s32 i;
@@ -693,10 +691,9 @@
 		u32 len;
 		u32 *col, _col;
 		len = spans[i].len;
+		col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
 		x = spans[i].x * surf->pitch_x;
-		col = surf->stencil_pix_run;
 		while (len--) {
 			_col = *col;
 			col_a = GF_COL_A(_col);

gpac-1.0.1.tar.gz/src/evg/raster_rgb.c -> gpac-2.0.0.tar.gz/src/evg/raster_rgb.c Changed

@@ -91,7 +91,7 @@
 	overmask_rgb(col, dst, coverage, surf);
 }
 
-void evg_rgb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_rgb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 col = surf->fill_col;
 	u8 *dst = surf->pixels + y * surf->pitch_y;
@@ -124,7 +124,7 @@
 	}
 }
 
-void evg_rgb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_rgb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
@@ -153,7 +153,7 @@
 }
 
 
-void evg_rgb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_rgb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = surf->pixels + y * surf->pitch_y;
 	s32 i;
@@ -164,9 +164,8 @@
 		u32 len;
 		u32 *col;
 		len = spans[i].len;
+		col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		col = surf->stencil_pix_run;
 		x = surf->pitch_x * spans[i].x;
 		while (len--) {
 			col_a = GF_COL_A(*col);
@@ -269,7 +268,7 @@
 	overmask_grey(col, dst, coverage, surf->grey_type);
 }
 
-void evg_grey_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_grey_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 col = surf->fill_col;
 	u32 c;
@@ -298,7 +297,7 @@
 	}
 }
 
-void evg_grey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_grey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = surf->pixels + y * surf->pitch_y;
 	u32 a, fin;
@@ -329,7 +328,7 @@
 }
 
 
-void evg_grey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_grey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u8 *dst = surf->pixels + y * surf->pitch_y;
 	s32 i;
@@ -340,9 +339,8 @@
 		u32 len;
 		u32 *col;
 		len = spans[i].len;
+		col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		col = surf->stencil_pix_run;
 		x = surf->pitch_x * spans[i].x;
 		while (len--) {
 			col_a = GF_COL_A(*col);

gpac-1.0.1.tar.gz/src/evg/raster_yuv.c -> gpac-2.0.0.tar.gz/src/evg/raster_yuv.c Changed

@@ -169,7 +169,7 @@
 #endif
 
 
-	return evg_make_col_wide(a, y, cb, cr);
+	return GF_COLW_ARGB(a, y, cb, cr);
 }
 u64 gf_evg_ayuv_to_argb_wide(GF_EVGSurface *surf, u64 col)
 {
@@ -203,9 +203,10 @@
 
 #endif
 
-	return evg_make_col_wide(a, r, g, b);
+	return GF_COLW_ARGB(a, r, g, b);
 }
 
+#if 0 //unused
 void evg_make_ayuv_color_mx(GF_ColorMatrix *cmat, GF_ColorMatrix *yuv_cmat)
 {
 	GF_ColorMatrix cmx_y2r, cmx_r2y;
@@ -252,7 +253,7 @@
 	gf_cmx_multiply(yuv_cmat, cmat);
 	gf_cmx_multiply(yuv_cmat, &cmx_y2r);
 }
-
+#endif
 
 /*
 			YUV420p part
@@ -277,20 +278,22 @@
 		count--;
 	}
 }
-void evg_yuv420p_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y)
+void evg_yuv420p_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y)
 {
 	u32 i, a;
-	char *pU = surf->pixels + surf->height *surf->pitch_y;
-	char *pV;
-	pU += y/2 * surf->pitch_y/2;
-	pV = pU + surf->height/2 * surf->pitch_y/2;
+	u8 *pU = rctx->surf->pixels + rctx->surf->height * rctx->surf->pitch_y;
+	u8 *pV;
+	pU += y/2 * rctx->surf->pitch_y/2;
+	pV = pU + rctx->surf->height/2 * rctx->surf->pitch_y/2;
+
+	//no need to swap u and V in const flush, they have been swaped when setting up the brush
 
 	//we are at an odd line, write uv
-	for (i=0; i<surf->width; i+=2) {
+	for (i=0; i<rctx->surf->width; i+=2) {
 		u8 dst;
 
 		//even line
-		a = surf->uv_alpha[i] + surf->uv_alpha[i+1];
+		a = rctx->uv_alpha[i] + rctx->uv_alpha[i+1];
 		//odd line
 		a += surf_uv_alpha[i] + surf_uv_alpha[i+1];
 
@@ -313,10 +316,10 @@
 			}
 		}
 	}
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, rctx->surf->uv_alpha_alloc);
 }
 
-void evg_yuv420p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv420p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	char *pY = surf->pixels;
 	u8 *surf_uv_alpha;
@@ -326,12 +329,12 @@
 
 	if (surf->is_422) {
 		write_uv = GF_TRUE;
-		surf_uv_alpha = surf->uv_alpha;
+		surf_uv_alpha = rctx->uv_alpha;
 	}
 	else if (write_uv) {
-		surf_uv_alpha = surf->uv_alpha + surf->width;
+		surf_uv_alpha = rctx->uv_alpha + surf->width;
 	} else {
-		surf_uv_alpha = surf->uv_alpha;
+		surf_uv_alpha = rctx->uv_alpha;
 	}
 
 	pY += y * surf->pitch_y;
@@ -359,13 +362,13 @@
 			memset(surf_uv_alpha + spans[i].x, 0xFF, spans[i].len);
 		}
 	}
-	if (write_uv) {
-		surf->yuv_flush_uv(surf, surf_uv_alpha, cu, cv, y);
+	if (write_uv && !rctx->no_yuv_flush) {
+		surf->yuv_flush_uv(surf, rctx, surf_uv_alpha, cu, cv, y);
 	}
 
 }
 
-void evg_yuv420p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv420p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 a;
 	char *pY = surf->pixels;
@@ -376,11 +379,11 @@
 
 	if (surf->is_422) {
 		write_uv = GF_TRUE;
-		surf_uv_alpha = surf->uv_alpha;
+		surf_uv_alpha = rctx->uv_alpha;
 	} else if (write_uv) {
-		surf_uv_alpha = surf->uv_alpha + surf->width;
+		surf_uv_alpha = rctx->uv_alpha + surf->width;
 	} else {
-		surf_uv_alpha = surf->uv_alpha;
+		surf_uv_alpha = rctx->uv_alpha;
 	}
 
 	pY += y * surf->pitch_y;
@@ -418,26 +421,32 @@
 		}
 	}
 	//we are at an odd line, write uv
-	if (write_uv)
-		surf->yuv_flush_uv(surf, surf_uv_alpha, cu, cv, y);
+	if (write_uv && !rctx->no_yuv_flush)
+		surf->yuv_flush_uv(surf, rctx, surf_uv_alpha, cu, cv, y);
 }
 
 
-void evg_yuv420p_flush_uv_var(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 _cu, s32 _cv, s32 y)
+void evg_yuv420p_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 _cu, s32 _cv, s32 y)
 {
 	u32 i;
-	char *pU, *pV;
+	u8 *pU, *pV;
 	pU = surf->pixels + surf->height *surf->pitch_y;
 	pU += y/2 * surf->pitch_y/2;
 	pV = pU + surf->height/2 * surf->pitch_y/2;
 
+	if (surf->swap_uv) {
+		u8 *tmp = pU;
+		pU = pV;
+		pV = tmp;
+	}
+
 	for (i=0; i<surf->width; i+=2) {
 		u32 a, a11, a12, a21, a22;
-		u32 idx1=3*i;
-		u32 idx2=3*i + 3;
+		u32 idx1 = 3*i;
+		u32 idx2 = idx1 + 3;
 		//get alpha
-		a11 = (u32)surf->uv_alpha[idx1];
-		a12 = (u32)surf->uv_alpha[idx2];
+		a11 = (u32)rctx->uv_alpha[idx1];
+		a12 = (u32)rctx->uv_alpha[idx2];
 		a21 = (u32)surf_uv_alpha[idx1];
 		a22 = (u32)surf_uv_alpha[idx2];
 
@@ -454,9 +463,9 @@
 			if (a!=0xFF) {
 				cdst = *pU;
 			}
-			c11 = (u32)surf->uv_alpha[idx1];
+			c11 = (u32)rctx->uv_alpha[idx1];
 			if (a11!=0xFF) c11 = mul255_zero(a11, c11 - cdst) + cdst;
-			c12 = (u32)surf->uv_alpha[idx2];
+			c12 = (u32)rctx->uv_alpha[idx2];
 			if (a12!=0xFF) c12 = mul255_zero(a12, c12 - cdst) + cdst;
 			c21 = (u32)surf_uv_alpha[idx1];
 			if (a21!=0xFF) c21 = mul255_zero(a21, c21 - cdst) + cdst;
@@ -473,9 +482,9 @@
 			if (a!=0xFF) {
 				cdst = *pV;
 			}
-			c11 = (u32)surf->uv_alpha[idx1];
+			c11 = (u32)rctx->uv_alpha[idx1];
 			if (a11!=0xFF) c11 = mul255_zero(a11, c11 - cdst) + cdst;
-			c12 = (u32)surf->uv_alpha[idx2];
+			c12 = (u32)rctx->uv_alpha[idx2];
 			if (a12!=0xFF) c12 = mul255_zero(a12, c12 - cdst) + cdst;
 			c21 = (u32)surf_uv_alpha[idx1];
 			if (a21!=0xFF) c21 = mul255_zero(a21, c21 - cdst) + cdst;
@@ -492,11 +501,11 @@
 		pV++;
 	}
 	//reset for next pass
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 
 }
 
-void evg_yuv420p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv420p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	s32 i;
 	char *pY = surf->pixels;
@@ -505,13 +514,13 @@
 
 	if (surf->is_422) {
 		write_uv = GF_TRUE;
-		surf_uv_alpha = surf->uv_alpha;
+		surf_uv_alpha = rctx->uv_alpha;
 	} else if (write_uv) {
 		//second line of storage (we store alpha, cr, cb for each pixel)
-		surf_uv_alpha = surf->uv_alpha + 3*surf->width;
+		surf_uv_alpha = rctx->uv_alpha + 3*surf->width;
 	} else {
 		//first line of storage
-		surf_uv_alpha = surf->uv_alpha;
+		surf_uv_alpha = rctx->uv_alpha;
 	}
 
 	pY += y * surf->pitch_y;
@@ -523,9 +532,8 @@
 		u32 *p_col;
 		u32 len;
 		len = spans[i].len;
+		p_col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		p_col = surf->stencil_pix_run;
 
 		s_pY = pY + spans[i].x;
 		x = spans[i].x;
@@ -559,8 +567,8 @@
 		}
 	}
 	//compute final u,v for both lines
-	if (write_uv) {
-		surf->yuv_flush_uv(surf, surf_uv_alpha, 0, 0, y);
+	if (write_uv && !rctx->no_yuv_flush) {
+		surf->yuv_flush_uv(surf, rctx, surf_uv_alpha, 0, 0, y);
 	}
 }
 
@@ -569,14 +577,26 @@
 	s32 i;
 	u8 cy, cb, cr;
 	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
-	char *pY, *pU, *pV;
+	u8 *pY, *pU, *pV;
 
 	pY = surf->pixels + rc.y * surf->pitch_y + rc.x;
 	pU = surf->pixels + surf->height * surf->pitch_y + rc.y/2 * surf->pitch_y/2 + rc.x/2;
 	pV = surf->pixels + 5*surf->height * surf->pitch_y/4 + rc.y/2 * surf->pitch_y/2 + rc.x/2;
+	if (surf->swap_uv) {
+		u8 *tmp = pU;
+		pU = pV;
+		pV = tmp;
+	}
 
 	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
 
+	if (!rc.x && !rc.y && (rc.width==_surf->width) && (rc.height==_surf->height)) {
+		memset(pY, cy, _surf->pitch_y * _surf->height);
+		memset(pU, cb, _surf->pitch_y/2 * _surf->height/2);
+		memset(pV, cr, _surf->pitch_y/2 * _surf->height/2);
+		return GF_OK;
+	}
+
 	for (i = 0; i < rc.height; i++) {
 		memset(pY, cy, rc.width);
 		pY += surf->pitch_y;
@@ -596,7 +616,7 @@
 */
 
 
-void evg_nv12_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y)
+void evg_nv12_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y)
 {
 	u32 i, a;
 	char *pU = surf->pixels + surf->height *surf->pitch_y;
@@ -606,7 +626,7 @@
 		u8 dst;
 
 		//even line
-		a = surf->uv_alpha[i] + surf->uv_alpha[i+1];
+		a = rctx->uv_alpha[i] + rctx->uv_alpha[i+1];
 		//odd line
 		a += surf_uv_alpha[i] + surf_uv_alpha[i+1];
 
@@ -630,10 +650,10 @@
 			}
 		}
 	}
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
-void evg_nv12_flush_uv_var(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y)
+void evg_nv12_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y)
 {
 	u32 i;
 	char *pU;
@@ -647,8 +667,8 @@
 		u32 idx2=3*i + 3;
 
 		//get alpha
-		a11 = (u32)surf->uv_alpha[idx1];
-		a12 = (u32)surf->uv_alpha[idx2];
+		a11 = (u32)rctx->uv_alpha[idx1];
+		a12 = (u32)rctx->uv_alpha[idx2];
 		a21 = (u32)surf_uv_alpha[idx1];
 		a22 = (u32)surf_uv_alpha[idx2];
 		a = a11+a12+a21+a22;
@@ -665,9 +685,9 @@
 			if (a!=0xFF)
 				cdst = pU[surf->idx_u];
 
-			c11 = (u32)surf->uv_alpha[idx1];
+			c11 = (u32)rctx->uv_alpha[idx1];
 			if (a11!=0xFF) c11 = mul255_zero(a11, c11 - cdst) + cdst;
-			c12 = (u32)surf->uv_alpha[idx2];
+			c12 = (u32)rctx->uv_alpha[idx2];
 			if (a12!=0xFF) c12 = mul255_zero(a12, c12 - cdst) + cdst;
 			c21 = (u32)surf_uv_alpha[idx1];
 			if (a21!=0xFF) c21 = mul255_zero(a21, c21 - cdst) + cdst;
@@ -684,9 +704,9 @@
 			if (a!=0xFF)
 				cdst = pU[surf->idx_v];
 
-			c11 = (u32)surf->uv_alpha[idx1];
+			c11 = (u32)rctx->uv_alpha[idx1];
 			if (a11!=0xFF) c11 = mul255_zero(a11, c11 - cdst) + cdst;
-			c12 = (u32)surf->uv_alpha[idx2];
+			c12 = (u32)rctx->uv_alpha[idx2];
 			if (a12!=0xFF) c12 = mul255_zero(a12, c12 - cdst) + cdst;
 			c21 = (u32)surf_uv_alpha[idx1];
 			if (a21!=0xFF) c21 = mul255_zero(a21, c21 - cdst) + cdst;
@@ -702,7 +722,7 @@
 		pU+=2;
 	}
 	//reset for next pass
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
 
@@ -758,7 +778,7 @@
 			YUV422 part
 */
 
-void evg_yuv422p_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y)
+void evg_yuv422p_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y)
 {
 	u32 i, a;
 	char *pU = surf->pixels + surf->height *surf->pitch_y;
@@ -769,7 +789,7 @@
 	for (i=0; i<surf->width; i+=2) {
 		u8 dst;
 
-		a = surf->uv_alpha[i] + surf->uv_alpha[i+1];
+		a = rctx->uv_alpha[i] + rctx->uv_alpha[i+1];
 
 		if (a) {
 			char *s_ptr_u, *s_ptr_v;
@@ -789,10 +809,10 @@
 			}
 		}
 	}
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
-void evg_yuv422p_flush_uv_var(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 _cu, s32 _cv, s32 y)
+void evg_yuv422p_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *surf_uv_alpha, s32 _cu, s32 _cv, s32 y)
 {
 	u32 i;
 	char *pU, *pV;
@@ -805,8 +825,8 @@
 		u32 idx1=3*i;
 		u32 idx2=3*i + 3;
 		//get alpha
-		a1 = (u32)surf->uv_alpha[idx1];
-		a2 = (u32)surf->uv_alpha[idx2];
+		a1 = (u32)rctx->uv_alpha[idx1];
+		a2 = (u32)rctx->uv_alpha[idx2];
 		a = a1+a2;
 		if (a) {
 			u8 cdst=0;
@@ -818,9 +838,9 @@
 			if (a != 0xFF)
 				cdst = *pU;
 
-			c1 = (u32)surf->uv_alpha[idx1+1];
+			c1 = (u32)rctx->uv_alpha[idx1+1];
 			if (a1!=0xFF) c1 = mul255_zero(a1, c1 - cdst) + cdst;
-			c2 = (u32)surf->uv_alpha[idx2+1];
+			c2 = (u32)rctx->uv_alpha[idx2+1];
 			if (a2!=0xFF) c2 = mul255_zero(a2, c1 - cdst) + cdst;
 			chroma_u = c1 + c2;
 			chroma_u /= 2;
@@ -829,9 +849,9 @@
 			if (a != 0xFF)
 				cdst = *pV;
 
-			c1 = (u32)surf->uv_alpha[idx1+2];
+			c1 = (u32)rctx->uv_alpha[idx1+2];
 			if (a1!=0xFF) c1 = mul255_zero(a1, c1 - cdst) + cdst;
-			c2 = (u32)surf->uv_alpha[idx2+2];
+			c2 = (u32)rctx->uv_alpha[idx2+2];
 			if (a2!=0xFF) c2 = mul255_zero(a2, c1 - cdst) + cdst;
 			chroma_v = c1 + c2;
 			chroma_v /= 2;
@@ -844,7 +864,7 @@
 		pV++;
 	}
 	//reset for next pass
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
 
@@ -867,6 +887,14 @@
 
 	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
 
+	if (!rc.x && !rc.y && (rc.width==_surf->width) && (rc.height==_surf->height)) {
+		memset(pY, cy, _surf->pitch_y * _surf->height);
+		memset(pU, cb, _surf->pitch_y/2 * _surf->height);
+		memset(pV, cr, _surf->pitch_y/2 * _surf->height);
+		return GF_OK;
+	}
+
+
 	for (i = 0; i < rc.height; i++) {
 		memset(pY, cy, rc.width);
 		pY += surf->pitch_y;
@@ -882,7 +910,7 @@
 			YUV444 part
 */
 
-void evg_yuv444p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv444p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	char *pY, *pU, *pV;
 	s32 i;
@@ -923,7 +951,7 @@
 	}
 }
 
-void evg_yuv444p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv444p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 a;
 	char *pY, *pU, *pV;
@@ -974,7 +1002,7 @@
 	}
 }
 
-void evg_yuv444p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv444p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	s32 i;
 	char *pY, *pU, *pV;
@@ -989,9 +1017,8 @@
 		u32 *p_col;
 		char *s_pY, *s_pU, *s_pV;
 		len = spans[i].len;
+		p_col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		p_col = surf->stencil_pix_run;
 
 		s_pY = pY + spans[i].x;
 		s_pU = pU + spans[i].x;
@@ -1043,6 +1070,13 @@
 
 	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
 
+	if (!rc.x && !rc.y && (rc.width==_surf->width) && (rc.height==_surf->height)) {
+		memset(pY, cy, _surf->pitch_y * _surf->height);
+		memset(pU, cb, _surf->pitch_y * _surf->height);
+		memset(pV, cr, _surf->pitch_y * _surf->height);
+		return GF_OK;
+	}
+
 	for (i = 0; i < rc.height; i++) {
 		memset(pY, cy, rc.width);
 		pY += surf->pitch_y;
@@ -1066,7 +1100,7 @@
 	s32 dstc = (*dst) & 0xFF;
 	*dst = mul255(srca, srcc - dstc) + dstc;
 }
-void evg_yuyv_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuyv_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	char *pY;
 	s32 i;
@@ -1091,13 +1125,13 @@
 		if (spans[i].x%2) s_pY += 2;
 
 		if (spans[i].coverage != 0xFF) {
-			memset(surf->uv_alpha + spans[i].x, spans[i].coverage, len);
+			memset(rctx->uv_alpha + spans[i].x, spans[i].coverage, len);
 			while (len--) {
 				overmask_yuvy(s_pY, cy, spans[i].coverage);
 				s_pY += 2;
 			}
 		} else {
-			memset(surf->uv_alpha + spans[i].x, 0xFF, len);
+			memset(rctx->uv_alpha + spans[i].x, 0xFF, len);
 
 			while (len--) {
 				*s_pY = cy;
@@ -1107,8 +1141,8 @@
 	}
 
 	for (i=0; i<(s32) surf->width; i+=2) {
-		u32 a = (u32)surf->uv_alpha[i];
-		a += (u32)surf->uv_alpha[i + 1];
+		u32 a = (u32)rctx->uv_alpha[i];
+		a += (u32)rctx->uv_alpha[i + 1];
 		if (a) {
 			a /=2;
 			if (a==0xFF) {
@@ -1121,10 +1155,10 @@
 		}
 		pY+=4;
 	}
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
-void evg_yuyv_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuyv_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	char *pY;
 	s32 i;
@@ -1145,7 +1179,7 @@
 
 		fin = mul255(a, spans[i].coverage);
 
-		memset(surf->uv_alpha + spans[i].x, (u8)fin, len);
+		memset(rctx->uv_alpha + spans[i].x, (u8)fin, len);
 		while (len--) {
 			overmask_yuvy(s_pY + surf->idx_y1, cy, fin);
 			s_pY += 2;
@@ -1153,8 +1187,8 @@
 	}
 	pY = surf->pixels + y * surf->pitch_y;
 	for (i=0; i<(s32) surf->width; i+=2) {
-		u32 p_a = surf->uv_alpha[i];
-		p_a += surf->uv_alpha[i + 1];
+		u32 p_a = rctx->uv_alpha[i];
+		p_a += rctx->uv_alpha[i + 1];
 		p_a /=2;
 		if (p_a==0xFF) {
 			pY[surf->idx_u] = cu;
@@ -1165,11 +1199,11 @@
 		}
 		pY+=4;
 	}
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 
 }
 
-void evg_yuyv_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuyv_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	s32 i;
 	char *pY;
@@ -1185,9 +1219,8 @@
 		s_pY = pY + (spans[i].x/2) * 4;
 		if (spans[i].x%2) s_pY += 2;
 
+		p_col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		p_col = surf->stencil_pix_run;
 
 		x = spans[i].x;
 
@@ -1205,13 +1238,13 @@
 					overmask_yuv420p(col_a, cy, s_pY + surf->idx_y1, spanalpha);
 
 					u8 a = mul255(col_a, spanalpha);
-					surf->uv_alpha[idx] = a;
+					rctx->uv_alpha[idx] = a;
 				} else {
 					s_pY[surf->idx_y1] = cy;
-					surf->uv_alpha[idx] = 0xFF;
+					rctx->uv_alpha[idx] = 0xFF;
 				}
-				surf->uv_alpha[idx+1] = cb;
-				surf->uv_alpha[idx+2] = cr;
+				rctx->uv_alpha[idx+1] = cb;
+				rctx->uv_alpha[idx+2] = cr;
 			}
 			s_pY+=2;
 			p_col++;
@@ -1224,14 +1257,14 @@
 		u32 idx1=3*i;
 		u32 idx2=3*i + 3;
 		//get alpha
-		a = (u32)surf->uv_alpha[idx1] + (u32)surf->uv_alpha[idx2];
+		a = (u32)rctx->uv_alpha[idx1] + (u32)rctx->uv_alpha[idx2];
 		if (a) {
 			u32 chroma;
 
 			a /= 2;
 
 			//get cb
-			chroma = (u32)surf->uv_alpha[idx1+1] + (u32)surf->uv_alpha[idx2+1];
+			chroma = (u32)rctx->uv_alpha[idx1+1] + (u32)rctx->uv_alpha[idx2+1];
 			chroma /= 2;
 			if (a==0xFF) {
 				pY[surf->idx_u] = chroma;
@@ -1239,7 +1272,7 @@
 				overmask_yuvy(pY + surf->idx_u, chroma, a);
 			}
 			//get cr
-			chroma = (u32)surf->uv_alpha[idx1+2] + (u32)surf->uv_alpha[idx2+2];
+			chroma = (u32)rctx->uv_alpha[idx1+2] + (u32)rctx->uv_alpha[idx2+2];
 			chroma /= 2;
 			if (a==0xFF) {
 				pY[surf->idx_v] = chroma;
@@ -1250,7 +1283,7 @@
 		pY+=4;
 	}
 
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 
 }
 
@@ -1343,10 +1376,10 @@
 	}
 }
 
-void evg_yuv420p_10_flush_uv_const(GF_EVGSurface *surf, u8 *_surf_uv_alpha, s32 cu, s32 cv, s32 y)
+void evg_yuv420p_10_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *_surf_uv_alpha, s32 cu, s32 cv, s32 y)
 {
 	u32 i, a;
-	u16 *surf_uv_alpha_even = (u16 *) surf->uv_alpha;
+	u16 *surf_uv_alpha_even = (u16 *) rctx->uv_alpha;
 	u16 *surf_uv_alpha_odd = (u16 *) _surf_uv_alpha;
 	char *pU = surf->pixels + surf->height *surf->pitch_y;
 	char *pV;
@@ -1380,10 +1413,10 @@
 			}
 		}
 	}
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
-void evg_yuv420p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv420p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u16 *pY;
 	u16 *surf_uv_alpha;
@@ -1393,12 +1426,12 @@
 
 	if (surf->is_422) {
 		write_uv = GF_TRUE;
-		surf_uv_alpha = (u16 *)surf->uv_alpha;
+		surf_uv_alpha = (u16 *)rctx->uv_alpha;
 	}
 	else if (write_uv) {
-		surf_uv_alpha = ((u16 *)surf->uv_alpha) + surf->width;
+		surf_uv_alpha = ((u16 *)rctx->uv_alpha) + surf->width;
 	} else {
-		surf_uv_alpha = (u16 *)surf->uv_alpha;
+		surf_uv_alpha = (u16 *)rctx->uv_alpha;
 	}
 
 	pY = (u16 *) (surf->pixels + y * surf->pitch_y);
@@ -1431,13 +1464,13 @@
 			}
 		}
 	}
-	if (write_uv) {
-		surf->yuv_flush_uv(surf, (u8 *)surf_uv_alpha, cu, cv, y);
+	if (write_uv && !rctx->no_yuv_flush) {
+		surf->yuv_flush_uv(surf, rctx, (u8 *)surf_uv_alpha, cu, cv, y);
 	}
 
 }
 
-void evg_yuv420p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv420p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 a;
 	u16 *pY;
@@ -1448,11 +1481,11 @@
 
 	if (surf->is_422) {
 		write_uv = GF_TRUE;
-		surf_uv_alpha = (u16 *)surf->uv_alpha;
+		surf_uv_alpha = (u16 *)rctx->uv_alpha;
 	} else if (write_uv) {
-		surf_uv_alpha = (u16 *)surf->uv_alpha + surf->width;
+		surf_uv_alpha = (u16 *)rctx->uv_alpha + surf->width;
 	} else {
-		surf_uv_alpha = (u16 *)surf->uv_alpha;
+		surf_uv_alpha = (u16 *)rctx->uv_alpha;
 	}
 
 	pY = (u16 *) (surf->pixels + y * surf->pitch_y);
@@ -1498,14 +1531,14 @@
 		}
 	}
 	//we are at an odd line, write uv
-	if (write_uv)
-		surf->yuv_flush_uv(surf, (u8*)surf_uv_alpha, cu, cv, y);
+	if (write_uv && !rctx->no_yuv_flush)
+		surf->yuv_flush_uv(surf, rctx, (u8*)surf_uv_alpha, cu, cv, y);
 }
 
-void evg_yuv420p_10_flush_uv_var(GF_EVGSurface *surf, u8 *_surf_uv_alpha, s32 _cu, s32 _cv, s32 y)
+void evg_yuv420p_10_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *_surf_uv_alpha, s32 _cu, s32 _cv, s32 y)
 {
 	u32 i;
-	u16 *surf_uv_alpha_even = (u16 *) surf->uv_alpha;
+	u16 *surf_uv_alpha_even = (u16 *) rctx->uv_alpha;
 	u16 *surf_uv_alpha_odd = (u16 *) _surf_uv_alpha;
 	u16 *pU, *pV;
 	pU = (u16 *) (surf->pixels + surf->height *surf->pitch_y + y/2 * surf->pitch_y/2);
@@ -1573,11 +1606,11 @@
 		pV++;
 	}
 	//reset for next pass
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 
 }
 
-void evg_yuv420p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv420p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	s32 i;
 	u16 *pY;
@@ -1586,13 +1619,13 @@
 
 	if (surf->is_422) {
 		write_uv = GF_TRUE;
-		surf_uv_alpha = (u16 *) surf->uv_alpha;
+		surf_uv_alpha = (u16 *) rctx->uv_alpha;
 	} else if (write_uv) {
 		//second line of storage (we store alpha, cr, cb for each pixel)
-		surf_uv_alpha = ((u16 *) surf->uv_alpha) + 3*surf->width;
+		surf_uv_alpha = ((u16 *) rctx->uv_alpha) + 3*surf->width;
 	} else {
 		//first line of storage
-		surf_uv_alpha = (u16 *) surf->uv_alpha;
+		surf_uv_alpha = (u16 *) rctx->uv_alpha;
 	}
 
 	pY = (u16 *) (surf->pixels + y * surf->pitch_y);
@@ -1604,9 +1637,8 @@
 		u16 *s_pY;
 		short x;
 		len = spans[i].len;
+		p_col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		p_col = surf->stencil_pix_run;
 
 		s_pY = pY + spans[i].x;
 		x = spans[i].x;
@@ -1640,8 +1672,8 @@
 		}
 	}
 	//compute final u,v for both lines
-	if (write_uv) {
-		surf->yuv_flush_uv(surf, (u8 *)surf_uv_alpha, 0, 0, y);
+	if (write_uv && !rctx->no_yuv_flush) {
+		surf->yuv_flush_uv(surf, rctx, (u8 *)surf_uv_alpha, 0, 0, y);
 	}
 }
 
@@ -1701,10 +1733,10 @@
 */
 
 
-void evg_nv12_10_flush_uv_const(GF_EVGSurface *surf, u8 *_surf_uv_alpha, s32 cu, s32 cv, s32 y)
+void evg_nv12_10_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *_surf_uv_alpha, s32 cu, s32 cv, s32 y)
 {
 	u32 i, a;
-	u16 *surf_uv_alpha_even = (u16 *) surf->uv_alpha;
+	u16 *surf_uv_alpha_even = (u16 *) rctx->uv_alpha;
 	u16 *surf_uv_alpha_odd = (u16 *)_surf_uv_alpha;
 	u8 *pUV = surf->pixels + surf->height * surf->pitch_y + y/2 * surf->pitch_y;
 	u8 *pU = pUV + 2*surf->idx_u;
@@ -1733,14 +1765,14 @@
 		pU += 4;
 		pV += 4;
 	}
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
 
-void evg_nv12_10_flush_uv_var(GF_EVGSurface *surf, u8 *_surf_uv_alpha, s32 cu, s32 cv, s32 y)
+void evg_nv12_10_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *_surf_uv_alpha, s32 cu, s32 cv, s32 y)
 {
 	u32 i;
-	u16 *surf_uv_alpha_even = (u16 *) surf->uv_alpha;
+	u16 *surf_uv_alpha_even = (u16 *) rctx->uv_alpha;
 	u16 *surf_uv_alpha_odd = (u16 *) _surf_uv_alpha;
 	u8 *pUV = surf->pixels + surf->height *surf->pitch_y + y/2 * surf->pitch_y;
 	u8 *pU = pUV + 2*surf->idx_u;
@@ -1806,7 +1838,7 @@
 		pV += 4;
 	}
 	//reset for next pass
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
 
@@ -1879,12 +1911,12 @@
 			YUV422 10 part
 */
 
-void evg_yuv422p_10_flush_uv_const(GF_EVGSurface *surf, u8 *_surf_uv_alpha, s32 cu, s32 cv, s32 y)
+void evg_yuv422p_10_flush_uv_const(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *_surf_uv_alpha, s32 cu, s32 cv, s32 y)
 {
 	u32 i, a;
 	char *pU = surf->pixels + surf->height *surf->pitch_y;
 	char *pV;
-	u16 *surf_uv_alpha = (u16 *) surf->uv_alpha;
+	u16 *surf_uv_alpha = (u16 *) rctx->uv_alpha;
 	pU += y * surf->pitch_y/2;
 	pV = pU + surf->height * surf->pitch_y/2;
 
@@ -1912,13 +1944,13 @@
 			}
 		}
 	}
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
-void evg_yuv422p_10_flush_uv_var(GF_EVGSurface *surf, u8 *_surf_uv_alpha, s32 _cu, s32 _cv, s32 y)
+void evg_yuv422p_10_flush_uv_var(GF_EVGSurface *surf, EVGRasterCtx *rctx, u8 *_surf_uv_alpha, s32 _cu, s32 _cv, s32 y)
 {
 	u32 i;
-	u16 *surf_uv_alpha = (u16 *) surf->uv_alpha;
+	u16 *surf_uv_alpha = (u16 *) rctx->uv_alpha;
 	u16 *pU = (u16 *) (surf->pixels + surf->height *surf->pitch_y + y * surf->pitch_y/2);
 	u16 *pV = (u16 *) (surf->pixels + surf->height *surf->pitch_y + surf->height * surf->pitch_y/2 + y * surf->pitch_y/2);
 
@@ -1966,7 +1998,7 @@
 		pV++;
 	}
 	//reset for next pass
-	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+	memset(rctx->uv_alpha, 0, surf->uv_alpha_alloc);
 }
 
 
@@ -2024,7 +2056,7 @@
 			YUV444 10bits part
 */
 
-void evg_yuv444p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv444p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u16 *pY, *pU, *pV;
 	s32 i;
@@ -2069,7 +2101,7 @@
 	}
 }
 
-void evg_yuv444p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv444p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	u32 a;
 	u16 *pY, *pU, *pV;
@@ -2126,7 +2158,7 @@
 	}
 }
 
-void evg_yuv444p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+void evg_yuv444p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
 {
 	s32 i;
 	u16 *pY, *pU, *pV;
@@ -2141,9 +2173,8 @@
 		u64 *p_col;
 		u16 *s_pY, *s_pU, *s_pV;
 		len = spans[i].len;
+		p_col = surf->fill_run(surf->sten, rctx, &spans[i], y);
 		spanalpha = spans[i].coverage;
-		evg_fill_run(surf->sten, surf, spans[i].x, y, len);
-		p_col = surf->stencil_pix_run;
 
 		s_pY = pY + spans[i].x;
 		s_pU = pU + spans[i].x;

gpac-1.0.1.tar.gz/src/evg/stencil.c -> gpac-2.0.0.tar.gz/src/evg/stencil.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / software 2D rasterizer module
@@ -72,8 +72,10 @@
 		for (c=0; c<EVGGRADIENTSLOTS; c++) {
 			if (_this->pos[c]<0) break;
 			if (_this->pos[c+1]>=0) {
-				start = FIX2INT(gf_mulfix(_this->pos[c], maxPos));
-				end = FIX2INT(gf_mulfix(_this->pos[c+1], maxPos));
+				Fixed pos = MIN(_this->pos[c], FIX_ONE);
+				start = FIX2INT(gf_mulfix(pos, maxPos));
+				pos = MIN(_this->pos[c+1], FIX_ONE);
+				end = FIX2INT(gf_mulfix(pos, maxPos));
 				diff = end-start;
 
 				if (diff) {
@@ -83,7 +85,8 @@
 					}
 				}
 			} else {
-				start = FIX2INT(gf_mulfix(_this->pos[c+0], maxPos));
+				Fixed pos = MIN(_this->pos[c+0], FIX_ONE);
+				start = FIX2INT(gf_mulfix(pos, maxPos));
 				for(i=start; i<=EVGGRADIENTMAXINTPOS; i++) {
 					_this->precomputed_argb[i] = _this->col[c];
 				}
@@ -179,12 +182,13 @@
 		st = evg_texture_brush();
 		break;
 	default:
-		return 0L;
+		return NULL;
 	}
 	if (st) {
 		gf_mx2d_init(st->pmat);
 		gf_mx2d_init(st->smat);
 		gf_cmx_init(&st->cmat);
+		st->auto_mx = 1;
 	}
 	return st;
 }
@@ -192,37 +196,57 @@
 GF_EXPORT
 void gf_evg_stencil_delete(GF_EVGStencil * st)
 {
-	GF_EVGStencil *_this = (GF_EVGStencil *) st;
-	switch(_this->type) {
+	switch(st->type) {
 	case GF_STENCIL_SOLID:
 	case GF_STENCIL_LINEAR_GRADIENT:
 	case GF_STENCIL_RADIAL_GRADIENT:
-		gf_free(_this);
+		gf_free(st);
 		return;
 	case GF_STENCIL_TEXTURE:
 	{
-		EVG_Texture *tx = (EVG_Texture *)_this;
+		EVG_Texture *tx = (EVG_Texture *)st;
 		/*destroy local texture iof any*/
 		if (tx->owns_texture && tx->pixels) gf_free(tx->pixels);
-		gf_free(_this);
+		gf_free(st);
 	}
 	return;
 	}
 }
 
 GF_EXPORT
+GF_Err gf_evg_stencil_set_auto_matrix(GF_EVGStencil * st, Bool auto_on)
+{
+ if (!st) return GF_BAD_PARAM;
+ st->auto_mx = auto_on ? 1 : 0;
+ return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_evg_stencil_get_auto_matrix(GF_EVGStencil * st)
+{
+ return st ? st->auto_mx : GF_FALSE;
+}
+
+GF_EXPORT
 GF_Err gf_evg_stencil_set_matrix(GF_EVGStencil * st, GF_Matrix2D *mx)
 {
-	GF_EVGStencil *_this = (GF_EVGStencil *)st;
-	if (!_this || _this->type>GF_STENCIL_TEXTURE) return GF_BAD_PARAM;
+	if (!st || (st->type>GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
 	if (mx) {
-		gf_mx2d_copy(_this->smat, *mx);
+		gf_mx2d_copy(st->smat, *mx);
 	} else {
-		gf_mx2d_init(_this->smat);
+		gf_mx2d_init(st->smat);
 	}
 	return GF_OK;
 }
 
+GF_EXPORT
+Bool gf_evg_stencil_get_matrix(GF_EVGStencil * st, GF_Matrix2D *mx)
+{
+	if (!st || !mx || (st->type>GF_STENCIL_TEXTURE)) return GF_FALSE;
+	gf_mx2d_copy(*mx, st->smat);
+	return GF_TRUE;
+}
+
 
 GF_EXPORT
 GF_StencilType gf_evg_stencil_type(GF_EVGStencil *sten)
@@ -233,14 +257,27 @@
 /*
 	Solid color stencil
 */
+static void sc_fill_run(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 x, s32 y, u32 count)
+{
+	EVG_Brush *sc = (EVG_Brush *)p;
+	u32 *data = rctx->stencil_pix_run;
+	u64 *data_wide = rctx->surf->not_8bits ? rctx->stencil_pix_run : NULL;
+	while (count) {
+		if (data) *data++ = sc->fill_col;
+		else *data_wide++ = sc->fill_col_wide;
+
+		count--;
+	}
 
+}
 static GF_EVGStencil *evg_solid_brush()
 {
 	EVG_Brush *tmp;
 	GF_SAFEALLOC(tmp, EVG_Brush);
 	if (!tmp) return 0L;
-	tmp->fill_run = NULL;
+	tmp->fill_run = sc_fill_run;
 	tmp->color = 0xFF000000;
+	tmp->alpha = 0xFF;
 	tmp->type = GF_STENCIL_SOLID;
 	return (GF_EVGStencil *) tmp;
 }
@@ -254,33 +291,87 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Color gf_evg_stencil_get_brush_color(GF_EVGStencil * st)
+{
+	EVG_Brush *_this = (EVG_Brush *) st;
+	if (!_this || (_this ->type != GF_STENCIL_SOLID) ) return 0;
+	return _this->color;
+}
+
+#define edgeFunction_pre2(a, b_minus_a_x, b_minus_a_y) \
+	( (_x - a.x) * (b_minus_a_y) - (_y - a.y) * (b_minus_a_x) ) / surf->tri_area
+
+#define PERSP_VARS_DECL \
+	GF_EVGSurface *surf = rctx->surf; \
+	Float bc1 = edgeFunction_pre2(surf->s_v2, surf->s3_m_s2_x, surf->s3_m_s2_y); \
+	Float bc3 = edgeFunction_pre2(surf->s_v1, surf->s2_m_s1_x, surf->s2_m_s1_y); \
+	Float bc1_inc = surf->s3_m_s2_y / surf->tri_area; \
+	Float bc3_inc = surf->s2_m_s1_y / surf->tri_area; \
+	Float pbc1 = bc1 * surf->s_v1.q; \
+	Float pbc3 = bc3 * surf->s_v3.q; \
+	Float pbc2 = (1.0f - bc1 - bc3) * surf->s_v2.q; \
+	Float pbc1_inc = bc1_inc * surf->s_v1.q; \
+	Float pbc3_inc = bc3_inc * surf->s_v3.q; \
+	Float pbc2_inc = - (bc1_inc + bc3_inc) * surf->s_v2.q; \
+	Float persp_denum = pbc1 + pbc2 + pbc3; \
+	Float pers_denum_inc = pbc1_inc + pbc2_inc + pbc3_inc;
+
+
+
+//we map texture coords, pt1 is {0,0} pt2 is {1,0} pt3 is {0,1}
+//y flip is done by switching the points in evg_raster_render_path_3d
+#define PERSP_APPLY \
+	Float ix = ((Float) pbc2) / persp_denum;\
+	Float iy = ((Float) pbc3) / persp_denum;\
+	pbc2 += pbc2_inc;\
+	pbc3 += pbc3_inc;\
+	persp_denum += pers_denum_inc;
 
 /*
 	linear gradient stencil
 */
 
-static void lg_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, s32 x, s32 y, u32 count)
+static void lg_fill_run(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
 {
 	Fixed _res;
 	s32 val;
 	u32 col;
-	u32 *data = surf->stencil_pix_run;
-	u64 *data_wide = surf->not_8bits ? surf->stencil_pix_run : NULL;
+	u32 *data = rctx->stencil_pix_run;
+	u64 *data_wide = rctx->surf->not_8bits ? rctx->stencil_pix_run : NULL;
 	EVG_LinearGradient *_this = (EVG_LinearGradient *) p;
 
 	assert(data);
 
-	/*no need to move x & y to fixed*/
-	_res = (Fixed) (x * _this->smat.m[0] + y * _this->smat.m[1] + _this->smat.m[2]);
-	while (count) {
-		val = FIX2INT(_res);
-		_res += _this->smat.m[0];
+	if (rctx->surf->is_3d_matrix) {
+		PERSP_VARS_DECL
 
-		col = gradient_get_color((EVG_BaseGradient *)_this, val );
-		if (data_wide) *data_wide++ = evg_col_to_wide(col);
-		else *data++ = col;
+		while (count) {
 
-		count--;
+			PERSP_APPLY
+
+			gf_mx2d_apply_coords(&_this->smat, &ix, &iy);
+			val = FIX2INT(ix);
+
+			col = gradient_get_color((EVG_BaseGradient *)_this, val );
+			if (data_wide) *data_wide++ = evg_col_to_wide(col);
+			else *data++ = col;
+
+			count--;
+		}
+	} else {
+		/*no need to move x & y to fixed*/
+		_res = (Fixed) (_x * _this->smat.m[0] + _y * _this->smat.m[1] + _this->smat.m[2]);
+		while (count) {
+			val = FIX2INT(_res);
+			_res += _this->smat.m[0];
+
+			col = gradient_get_color((EVG_BaseGradient *)_this, val );
+			if (data_wide) *data_wide++ = evg_col_to_wide(col);
+			else *data++ = col;
+
+			count--;
+		}
 	}
 }
 
@@ -338,36 +429,60 @@
 	radial gradient stencil
 */
 
-static void rg_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+static void rg_fill_run(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
 {
 	Fixed x, y, dx, dy, b, val;
 	s32 pos;
 	u32 col;
-	u32 *data = surf->stencil_pix_run;
-	u64 *data_wide = surf->not_8bits ? surf->stencil_pix_run : NULL;
+	u32 *data = rctx->stencil_pix_run;
+	u64 *data_wide = rctx->surf->not_8bits ? rctx->stencil_pix_run : NULL;
 	EVG_RadialGradient *_this = (EVG_RadialGradient *) p;
 
 	assert(data);
 	
-	x = INT2FIX(_x);
-	y = INT2FIX(_y);
-	gf_mx2d_apply_coords(&_this->smat, &x, &y);
+	if (rctx->surf->is_3d_matrix) {
+		PERSP_VARS_DECL
 
-	dx = x - _this->d_f.x;
-	dy = y - _this->d_f.y;
-	while (count) {
-		b = gf_mulfix(_this->rad, gf_mulfix(dx, _this->d_f.x) + gf_mulfix(dy, _this->d_f.y));
-		val = gf_mulfix(b, b) + gf_mulfix(_this->rad, gf_mulfix(dx, dx)+gf_mulfix(dy, dy));
-		b += gf_sqrt(val);
-		pos = FIX2INT(EVGGRADIENTBUFFERSIZE*b);
+		while (count) {
 
-		col = gradient_get_color((EVG_BaseGradient *)_this, pos);
-		if (data_wide) *data_wide++ = evg_col_to_wide(col);
-		else *data++ = col;
+			PERSP_APPLY
 
-		dx += _this->d_i.x;
-		dy += _this->d_i.y;
-		count--;
+			gf_mx2d_apply_coords(&_this->smat, &ix, &iy);
+
+			dx = ix - _this->d_f.x;
+			dy = iy - _this->d_f.y;
+			b = gf_mulfix(_this->rad, gf_mulfix(dx, _this->d_f.x) + gf_mulfix(dy, _this->d_f.y));
+			val = gf_mulfix(b, b) + gf_mulfix(_this->rad, gf_mulfix(dx, dx)+gf_mulfix(dy, dy));
+			b += gf_sqrt(val);
+			pos = FIX2INT(EVGGRADIENTBUFFERSIZE*b);
+
+			col = gradient_get_color((EVG_BaseGradient *)_this, pos );
+			if (data_wide) *data_wide++ = evg_col_to_wide(col);
+			else *data++ = col;
+
+			count--;
+		}
+	} else {
+		x = INT2FIX(_x);
+		y = INT2FIX(_y);
+		gf_mx2d_apply_coords(&_this->smat, &x, &y);
+
+		dx = x - _this->d_f.x;
+		dy = y - _this->d_f.y;
+		while (count) {
+			b = gf_mulfix(_this->rad, gf_mulfix(dx, _this->d_f.x) + gf_mulfix(dy, _this->d_f.y));
+			val = gf_mulfix(b, b) + gf_mulfix(_this->rad, gf_mulfix(dx, dx)+gf_mulfix(dy, dy));
+			b += gf_sqrt(val);
+			pos = FIX2INT(EVGGRADIENTBUFFERSIZE*b);
+
+			col = gradient_get_color((EVG_BaseGradient *)_this, pos);
+			if (data_wide) *data_wide++ = evg_col_to_wide(col);
+			else *data++ = col;
+
+			dx += _this->d_i.x;
+			dy += _this->d_i.y;
+			count--;
+		}
 	}
 }
 
@@ -531,20 +646,24 @@
 	g2 = g0 + mul_wide(t, (g1 - g0));
 	b2 = b0 + mul_wide(t, (b1 - b0));
 
-	return evg_make_col_wide(a2, r2, g2, b2);
+	return GF_COLW_ARGB(a2, r2, g2, b2);
 }
 
+//slightly more precise but way too expensive as it uses mx2d apply
+//#define EXACT_TX_COORDS
+
 static void tex_untransform_coord(EVG_Texture *_this, s32 _x, s32 _y, Fixed *outx, Fixed *outy)
 {
-	u32 checkx, checky;
-	Fixed x, y, dim;
+	Fixed x, y;
 
 	/* reverse to texture coords*/
 	x = INT2FIX(_x);
 	y = INT2FIX(_y);
 	gf_mx2d_apply_coords(&_this->smat, &x, &y);
 
-	checkx = checky = 0;
+#ifdef EXACT_TX_COORDS
+	u32 checkx = 0;
+	u32 checky = 0;
 	if (ABS(x)< FIX_ONE/20) checkx = 1;
 	if (ABS(y)< FIX_ONE/20) checky = 1;
 
@@ -564,45 +683,27 @@
 			else y = 0;
 		}
 	}
-
-	dim = INT2FIX(_this->width);
-	if (_this->mod & GF_TEXTURE_REPEAT_S) {
-		if (x<0) {
-			while (x<0) x += dim;
-		} else {
-			while (x>dim) x -= dim;
-		}
-	} else {
-		if (x<-dim) {
-			x = 0;
-		} else if (x>dim) {
-			x = dim;
-		}
-		while (x<0) x+=dim;
-	}
-
-	dim = INT2FIX(_this->height);
-	if (_this->mod & GF_TEXTURE_REPEAT_T) {
-		if (y<0) {
-			while (y<0) y += dim;
-		} else {
-			while (y>dim) y -= dim;
-		}
-	} else {
-		if (y<-dim) {
-			y = 0;
-		} else if (y>dim) {
-			y = dim;
-		}
-		while (y<0) y+=dim;
-	}
+#endif
 
 	*outx=x;
 	*outy=y;
 }
 
+#ifdef EXACT_TX_COORDS
+
+#define TEX_UNTRANSFORM_COORDS \
+	_x++; \
+	tex_untransform_coord(_this, _x, _y, &x, &y);
+
+#else
+
+#define TEX_UNTRANSFORM_COORDS \
+		x += _this->inc_x; \
+		y += _this->inc_y; \
+
+#endif
 
-static u32 evg_paramtx_get_pixel(struct __evg_texture *_this, u32 x, u32 y)
+static u32 evg_paramtx_get_pixel(struct __evg_texture *_this, u32 x, u32 y, EVGRasterCtx *rctx)
 {
 	Float a, r, g, b;
 	_this->tx_callback(_this->tx_callback_udta, x, y, &r, &g, &b, &a);
@@ -612,7 +713,7 @@
 	a*=255;
 	return GF_COL_ARGB(a, r, g, b);
 }
-u64 evg_paramtx_get_pixel_wide(struct __evg_texture *_this, u32 x, u32 y)
+u64 evg_paramtx_get_pixel_wide(struct __evg_texture *_this, u32 x, u32 y, EVGRasterCtx *rctx)
 {
 	Float a, r, g, b;
 	_this->tx_callback(_this->tx_callback_udta, x, y, &r, &g, &b, &a);
@@ -620,50 +721,48 @@
 	g*=0xFFFF;
 	b*=0xFFFF;
 	a*=0xFFFF;
-	return evg_make_col_wide(a, r, g, b);
+	return GF_COLW_ARGB(a, r, g, b);
 }
 
-static void tex_fill_run_callback(EVG_Texture *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+static void tex_fill_run_callback(GF_EVGStencil *_p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
 {
-	u32 *data = surf->stencil_pix_run;
+	EVG_Texture *p = (EVG_Texture *)_p;
+	u32 *data = rctx->stencil_pix_run;
 	while (count) {
-		*data = evg_paramtx_get_pixel(p, _x, _y);
+		*data = evg_paramtx_get_pixel(p, _x, _y, NULL);
 		data++;
 		count--;
 		_x++;
 	}
 }
 
-static void tex_fill_run_callback_wide(EVG_Texture *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+static void tex_fill_run_callback_wide(GF_EVGStencil *_p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
 {
-	u64 *data = surf->stencil_pix_run;
+	EVG_Texture *p = (EVG_Texture *)_p;
+	u64 *data = rctx->stencil_pix_run;
 	while (count) {
-		*data = evg_paramtx_get_pixel_wide(p, _x, _y);
+		*data = evg_paramtx_get_pixel_wide(p, _x, _y, NULL);
 		data++;
 		count--;
 	}
 }
 
 //bilinear used fo 2D graphics ?
-#define USE_BILINEAR	0
+#define USE_BILINEAR	1
 
-static void tex_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+static void tex_fill_run(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
 {
-	s32 cx, x0, y0;
-	u32 pix, replace_col;
-	Bool has_alpha, has_replace_cmat, has_cmat, repeat_s, repeat_t;
-	Fixed x, y, _fd;
+	s32 cx, x0, y0, m_width, m_height;
+	u32 pix;
+	Bool has_alpha, has_cmat, repeat_s, repeat_t;
+	Fixed x, y;
 #if USE_BILINEAR
 	s32 incx, incy;
 #endif
-	u32 *data = surf->stencil_pix_run;
+	EVG_YUVType yuv_type = rctx->surf->yuv_type;
+	u32 *data = rctx->stencil_pix_run;
 	EVG_Texture *_this = (EVG_Texture *) p;
 
-	if (_this->tx_callback && _this->tx_callback_screen_coords) {
-		tex_fill_run_callback(_this, surf, _x, _y, count);
-		return;
-	}
-
 	tex_untransform_coord(_this, _x, _y, &x, &y);
 
 #if USE_BILINEAR
@@ -671,51 +770,73 @@
 	incy = (_this->inc_y>0) ? 1 : -1;
 #endif
 
-	_fd = INT2FIX(_this->width);
 	repeat_s = _this->mod & GF_TEXTURE_REPEAT_S;
-	if (!repeat_s && (x < - _fd)) x = 0;
-	while (x<0) x += _fd;
-
-	_fd = INT2FIX(_this->height);
 	repeat_t = _this->mod & GF_TEXTURE_REPEAT_T;
-	if (!repeat_t && (y < - _fd)) y = 0;
-	while (y<0) y += _fd;
 
 	has_alpha = (_this->alpha != 255) ? GF_TRUE : GF_FALSE;
-	has_replace_cmat = _this->cmat_is_replace ? GF_TRUE : GF_FALSE;
-	if (has_replace_cmat) has_cmat = GF_FALSE;
-	else has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
+	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
 
-	replace_col = _this->replace_col;
+	m_width = _this->width-1;
+	m_height = _this->height-1;
 
 	while (count) {
 		x0 = FIX2INT(x);
-		assert((s32)x0 >=0);
-		if (repeat_s) {
-			x0 = (x0) % _this->width;
-		} else {
-			x0 = MIN(x0, (s32) _this->width - 1);
+
+		if (x0 > m_width) {
+			if (repeat_s) {
+				x0 = (x0) % _this->width;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				TEX_UNTRANSFORM_COORDS
+				goto write_pix;
+			} else {
+				x0 = m_width;
+			}
+		}
+		else if (x0 < 0) {
+			if (repeat_s) {
+				while (x0<0) x0 += _this->width;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				TEX_UNTRANSFORM_COORDS
+				goto write_pix;
+			} else {
+				x0 = 0;
+			}
 		}
 
 		y0 = FIX2INT(y);
-		assert((s32)y0 >=0);
-		if (repeat_t) {
-			y0 = (y0) % _this->height;
-		} else if (y0 >= (s32) _this->height) {
-			y0 = _this->height-1;
+		if (y0 > m_height) {
+			if (repeat_t) {
+				y0 = (y0) % _this->height;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				TEX_UNTRANSFORM_COORDS
+				goto write_pix;
+			} else {
+				y0 = m_height;
+			}
+		}
+		else if (y0 < 0) {
+			if (repeat_t) {
+				while (y0<0) y0 += _this->height;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				TEX_UNTRANSFORM_COORDS
+				goto write_pix;
+			} else {
+				y0 = 0;
+			}
 		}
 
-		pix = _this->tx_get_pixel(_this, x0, y0);
-
-		_x++;
-		tex_untransform_coord(_this, _x, _y, &x, &y);
+		pix = _this->tx_get_pixel(_this, x0, y0, rctx);
 
-		if (x<0) x+=INT2FIX(_this->width);
-		if (y<0) y+=INT2FIX(_this->height);
+		TEX_UNTRANSFORM_COORDS
 
-		/*bilinear filtering - disabled (too slow and not precise enough)*/
+		/*bilinear filtering*/
 #if USE_BILINEAR
 		if (_this->filter==GF_TEXTURE_FILTER_HIGH_QUALITY) {
+			Bool do_lerp=GF_TRUE;
 			u32 p00, p01, p10, p11;
 			s32 x1, y1;
 			u8 tx, ty;
@@ -725,16 +846,31 @@
 
 			x1 = (x0+incx);
 			if (x1<0) {
-				while (x1<0) x1 += _this->width;
+				if (!repeat_s)
+					do_lerp=GF_FALSE;
+				else
+					while (x1<0) x1 += _this->width;
 			} else {
-				x1 = x1 % _this->width;
+				if (!repeat_s && ((u32) x1 > _this->width))
+					do_lerp=GF_FALSE;
+				else
+					x1 = x1 % _this->width;
 			}
 			y1 = (y0+incy);
 			if (y1<0) {
-				while (y1<0) y1+=_this->height;
+				if (!repeat_t)
+					do_lerp=GF_FALSE;
+				else
+					while (y1<0) y1+=_this->height;
 			} else {
-				y1 = y1 % _this->height;
+				if (!repeat_t && ((u32) y1 > _this->height))
+					do_lerp=GF_FALSE;
+				else
+					y1 = y1 % _this->height;
 			}
+
+			if (!do_lerp) goto write_pix;
+
 			if (incx>0) {
 				if (x1<x0) tx = 255-tx;
 			} else {
@@ -747,9 +883,9 @@
 			}
 
 			p00 = pix;
-			p01 = _this->tx_get_pixel(_this, x1, y0);
-			p10 = _this->tx_get_pixel(_this, x0, y1);
-			p11 = _this->tx_get_pixel(_this, x1, y1);
+			p01 = _this->tx_get_pixel(_this, x1, y0, rctx);
+			p10 = _this->tx_get_pixel(_this, x0, y1, rctx);
+			p11 = _this->tx_get_pixel(_this, x1, y1, rctx);
 
 			p00 = EVG_LERP(p00, p01, tx);
 			p10 = EVG_LERP(p10, p11, tx);
@@ -758,22 +894,16 @@
 		}
 #endif
 
+write_pix:
 		if (has_alpha) {
 			cx = ((GF_COL_A(pix) + 1) * _this->alpha) >> 8;
-			pix = ( ((cx<<24) & 0xFF000000) ) | (pix & 0x00FFFFFF);
-		}
-		if (has_replace_cmat) {
-			u32 __a;
-			__a = GF_COL_A(pix);
-			__a = (u32) (_this->cmat.m[18] * __a);
-			//replace col is in target pixel format
-			pix = ((__a<<24) | (replace_col & 0x00FFFFFF));
+			pix = ( (((u32)cx<<24) & 0xFF000000) ) | (pix & 0x00FFFFFF);
 		}
 		//move pixel to target pixel format, applying color transform matrix
-		else if (_this->is_yuv) {
+		if (_this->is_yuv) {
 			//if surf is rgb, transform
-			if (!surf->yuv_type) {
-				pix = gf_evg_ayuv_to_argb(surf, pix);
+			if (!yuv_type) {
+				pix = gf_evg_ayuv_to_argb(rctx->surf, pix);
 				//apply cmat
 				if (has_cmat)
 					pix = gf_cmx_apply(&_this->cmat, pix);
@@ -790,8 +920,8 @@
 				pix = gf_cmx_apply(&_this->cmat, pix);
 
 			//dest is yuv, transform
-			if (surf->yuv_type)
-				pix = gf_evg_argb_to_ayuv(surf, pix);
+			if (yuv_type)
+				pix = gf_evg_argb_to_ayuv(rctx->surf, pix);
 		}
 
 		*data++ = pix;
@@ -801,21 +931,18 @@
 
 
 /*just a little faster...*/
-static void tex_fill_run_straight(GF_EVGStencil *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+static void tex_fill_run_straight(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
 {
-	s32 x0, y0;
+	s32 x0, y0, m_width;
 	u32 pix;
-	u32 __a;
+	u32 conv_type=0;
 	Bool repeat_s = GF_FALSE;
-	Fixed x, y, _fdim;
-	u32 *data = surf->stencil_pix_run;
+	u32 pad_y = 0;
+	Fixed x, y;
+	EVG_YUVType yuv_type = rctx->surf->yuv_type;
+	u32 *data = rctx->stencil_pix_run;
 	EVG_Texture *_this = (EVG_Texture *) p;
 
-	if (_this->tx_callback && _this->tx_callback_screen_coords) {
-		tex_fill_run_callback(_this, surf, _x, _y, count);
-		return;
-	}
-
 	/*get texture coords in FIXED - offset*/
 	x = _this->smat.m[0]*_x + _this->smat.m[2];
 	y = _this->smat.m[4]*_y + _this->smat.m[5];
@@ -823,48 +950,84 @@
 	/*we may have a numerical stability issues, try to figure out whether we are close from 0 or width/height*/
 	if (ABS(x)< FIX_ONE/10) {
 		Fixed test = _this->smat.m[0]*(_x+1) + _this->smat.m[2];
-		if (test<0) x = INT2FIX(_this->width - 1);
+		if (test<0)
+			x = INT2FIX(_this->width - 1);
 		else x = 0;
 	}
 	if (ABS(y)< FIX_ONE/10) {
 		Fixed test = _this->smat.m[4]*(_y+1) + _this->smat.m[5];
-		if (test<0) y = INT2FIX(_this->height - 1);
+		if (test<0)
+			y = INT2FIX(_this->height - 1);
 		else y = 0;
 	}
 
-	/* and move in absolute coords*/
-	_fdim = INT2FIX(_this->width);
 	repeat_s = (_this->mod & GF_TEXTURE_REPEAT_S);
-	if (!repeat_s && (x <- _fdim)) x=0;
-	while (x<0) x += _fdim;
-
-	_fdim = INT2FIX(_this->height);
-	if (!(_this->mod & GF_TEXTURE_REPEAT_T) && (y <- _fdim)) y = 0;
-	while (y<0) y += _fdim;
 
 	y0 = FIX2INT(y);
-	y0 = y0 % _this->height;
+	if (y0<0) {
+		if (_this->mod & GF_TEXTURE_REPEAT_T) {
+			while (y0<0) y0 += (s32) _this->height;
+		} else if (_this->fill_pad_color)
+			pad_y = _this->fill_pad_color;
+		else
+			y0 = 0;
+	} else if (y0 >= (s32) _this->height) {
+		if (_this->mod & GF_TEXTURE_REPEAT_T)
+			while (y0 >= (s32) _this->height) y0 -= (s32) _this->height;
+		else if (_this->fill_pad_color)
+			pad_y = _this->fill_pad_color;
+		else
+			y0 = _this->height-1;
+	}
+	if (pad_y) {
+		while (count) {
+			*data++ = pad_y;
+			count--;
+		}
+		return;
+	}
+
+	m_width = _this->width - 1;
+
+	if (_this->is_yuv && !yuv_type) conv_type = 1;
+	else if (!_this->is_yuv && yuv_type) conv_type = 2;
+
 	
 	while (count) {
 		x0 = FIX2INT(x);
-		if (repeat_s) {
-			x0 = (x0) % _this->width;
-		} else if (x0 >= (s32) _this->width) x0 = _this->width-1;
+		if (x0 > m_width) {
+			if (repeat_s) {
+				while ((u32) x0 > _this->width) x0 -= _this->width;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				goto write_pix;
+			} else {
+				x0 = m_width;
+			}
+		}
+		else if (x0 < 0) {
+			if (repeat_s) {
+				while (x0<0) x0 += _this->width;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				goto write_pix;
+			} else {
+				x0 = 0;
+			}
+		}
 
-		x += _this->inc_x;
-		pix = _this->tx_get_pixel(_this, x0, y0);
+		pix = _this->tx_get_pixel(_this, x0, y0, rctx);
 
-		//replace_col is in destination format
-		if (_this->replace_col) {
-			__a = GF_COL_A(pix);
-			pix = ((__a<<24) | (_this->replace_col & 0x00FFFFFF));
-		}
+write_pix:
+		x += _this->inc_x;
 		//move pixel to target pixel format
-		else if (_this->is_yuv && !surf->yuv_type) {
-			pix = gf_evg_ayuv_to_argb(surf, pix);
-		}
-		else if (!_this->is_yuv && surf->yuv_type) {
-			pix = gf_evg_argb_to_ayuv(surf, pix);
+		switch (conv_type) {
+		case 1:
+			pix = gf_evg_ayuv_to_argb(rctx->surf, pix);
+			break;
+		case 2:
+			pix = gf_evg_argb_to_ayuv(rctx->surf, pix);
+			break;
 		}
 
 		*data++ = pix;
@@ -878,26 +1041,22 @@
 	u32 r = GF_COL_R(col) << 8 | 0xFF;
 	u32 g = GF_COL_G(col) << 8 | 0xFF;
 	u32 b = GF_COL_B(col) << 8 | 0xFF;
-	return evg_make_col_wide(a, r, g, b);
+	return GF_COLW_ARGB(a, r, g, b);
 }
 
-static void tex_fill_run_wide(GF_EVGStencil *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+static void tex_fill_run_wide(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
 {
-	s32 x0, y0;
-	u64 pix, replace_col;
-	Bool has_alpha, has_replace_cmat, has_cmat, repeat_s, repeat_t;
-	Fixed x, y, _fd;
+	s32 x0, y0, m_width, m_height;
+	u64 pix;
+	Bool has_alpha, has_cmat, repeat_s, repeat_t;
+	Fixed x, y;
 #if USE_BILINEAR
 	s32 incx, incy;
 #endif
-	u64 *data = surf->stencil_pix_run;
+	EVG_YUVType yuv_type = rctx->surf->yuv_type;
+	u64 *data = rctx->stencil_pix_run;
 	EVG_Texture *_this = (EVG_Texture *) p;
 
-	if (_this->tx_callback && _this->tx_callback_screen_coords) {
-		tex_fill_run_callback_wide(_this, surf, _x, _y, count);
-		return;
-	}
-
 	tex_untransform_coord(_this, _x, _y, &x, &y);
 
 #if USE_BILINEAR
@@ -905,120 +1064,144 @@
 	incy = (_this->inc_y>0) ? 1 : -1;
 #endif
 
-	_fd = INT2FIX(_this->width);
 	repeat_s = _this->mod & GF_TEXTURE_REPEAT_S;
-	if (!repeat_s && (x < - _fd)) x = 0;
-	while (x<0) x += _fd;
-
-	_fd = INT2FIX(_this->height);
 	repeat_t = _this->mod & GF_TEXTURE_REPEAT_T;
-	if (!repeat_t && (y < - _fd)) y = 0;
-	while (y<0) y += _fd;
 
 	has_alpha = (_this->alpha != 255) ? GF_TRUE : GF_FALSE;
-	has_replace_cmat = _this->cmat_is_replace ? GF_TRUE : GF_FALSE;
-	if (has_replace_cmat) has_cmat = GF_FALSE;
-	else has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
+	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
 
-	replace_col = evg_col_to_wide(_this->replace_col);
+	m_width = _this->width - 1;
+	m_height = _this->height - 1;
 
 	while (count) {
 		x0 = FIX2INT(x);
-		assert((s32)x0 >=0);
-		if (repeat_s) {
-			x0 = (x0) % _this->width;
-		} else {
-			x0 = MIN(x0, (s32) _this->width - 1);
+		if (x0 > m_width) {
+			if (repeat_s) {
+				x0 = (x0) % _this->width;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				TEX_UNTRANSFORM_COORDS
+				goto write_pix;
+			} else {
+				x0 = m_width;
+			}
+		}
+		else if (x0 < 0) {
+			if (repeat_s) {
+				while (x0<0) x0 += _this->width;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				TEX_UNTRANSFORM_COORDS
+				goto write_pix;
+			} else {
+				x0 = 0;
+			}
 		}
 
 		y0 = FIX2INT(y);
-		assert((s32)y0 >=0);
-		if (repeat_t) {
-			y0 = (y0) % _this->height;
-		} else if (y0 >= (s32) _this->height) {
-			y0 = _this->height-1;
+		if (y0 > m_height) {
+			if (repeat_t) {
+				y0 = (y0) % _this->height;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				TEX_UNTRANSFORM_COORDS
+				goto write_pix;
+			} else {
+				y0 = m_height;
+			}
 		}
-
-		if (_this->tx_get_pixel_wide) {
-			pix = _this->tx_get_pixel_wide(_this, x0, y0);
-		} else {
-			pix = evg_col_to_wide( _this->tx_get_pixel(_this, x0, y0) );
+		else if (y0 < 0) {
+			if (repeat_t) {
+				while (y0<0) y0 += _this->height;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				TEX_UNTRANSFORM_COORDS
+				goto write_pix;
+			} else {
+				y0 = 0;
+			}
 		}
-		_x++;
-		tex_untransform_coord(_this, _x, _y, &x, &y);
 
-		if (x<0) x+=INT2FIX(_this->width);
-		if (y<0) y+=INT2FIX(_this->height);
+		pix = _this->tx_get_pixel_wide(_this, x0, y0, rctx);
+
+		TEX_UNTRANSFORM_COORDS
 
-		/*bilinear filtering - disabled (too slow and not precise enough)*/
+		/*bilinear filtering*/
 #if USE_BILINEAR
 		if (_this->filter==GF_TEXTURE_FILTER_HIGH_QUALITY) {
 			u64 p00, p01, p10, p11;
 			s32 x1, y1;
 			u8 tx, ty;
+			Bool do_lerp=GF_TRUE;
 
 			tx = FIX2INT(gf_muldiv(x, 255, _this->width) );
 			ty = FIX2INT(gf_muldiv(y, 255, _this->height) );
 
-			if (tx>120 || ty>120) {
-				x1 = (x0+incx);
-				if (x1<0) {
+			x1 = (x0+incx);
+			if (x1<0) {
+				if (!repeat_s)
+					do_lerp=GF_FALSE;
+				else
 					while (x1<0) x1 += _this->width;
-				} else {
+			} else {
+				if (!repeat_s && ((u32) x1 > _this->width))
+					do_lerp=GF_FALSE;
+				else
 					x1 = x1 % _this->width;
-				}
-				y1 = (y0+incy);
-				if (y1<0) {
+			}
+			y1 = (y0+incy);
+			if (y1<0) {
+				if (!repeat_t)
+					do_lerp=GF_FALSE;
+				else
 					while (y1<0) y1+=_this->height;
-				} else {
+			} else {
+				if (!repeat_t && ((u32) y1 > _this->height))
+					do_lerp=GF_FALSE;
+				else
 					y1 = y1 % _this->height;
-				}
-				if (incx>0) {
-					if (x1<x0) tx = 255-tx;
-				} else {
-					if (x1>x0) tx = 255-tx;
-				}
-				if (incy>0) {
-					if (y1<y0) ty = 255-ty;
-				} else {
-					if (y1>y0) ty = 255-ty;
-				}
+			}
 
-				p00 = pix;
-				if (_this->tx_get_pixel_wide) {
-					p01 = _this->tx_get_pixel_wide(_this, x1, y0);
-					p10 = _this->tx_get_pixel_wide(_this, x0, y1);
-					p11 = _this->tx_get_pixel_wide(_this, x1, y1);
-				} else {
-					p01 = evg_col_to_wide(_this->tx_get_pixel(_this, x1, y0) );
-					p10 = evg_col_to_wide(_this->tx_get_pixel(_this, x0, y1) );
-					p11 = evg_col_to_wide(_this->tx_get_pixel(_this, x1, y1) );
-				}
-				p00 = EVG_LERP_WIDE(p00, p01, tx);
-				p10 = EVG_LERP_WIDE(p10, p11, tx);
-				pix = EVG_LERP_WIDE(p00, p10, ty);
+			if (!do_lerp) goto write_pix;
+
+
+			if (incx>0) {
+				if (x1<x0) tx = 255-tx;
+			} else {
+				if (x1>x0) tx = 255-tx;
+			}
+			if (incy>0) {
+				if (y1<y0) ty = 255-ty;
+			} else {
+				if (y1>y0) ty = 255-ty;
 			}
+
+			p00 = pix;
+
+			p01 = _this->tx_get_pixel_wide(_this, x1, y0, rctx);
+			p10 = _this->tx_get_pixel_wide(_this, x0, y1, rctx);
+			p11 = _this->tx_get_pixel_wide(_this, x1, y1, rctx);
+
+			p00 = EVG_LERP_WIDE(p00, p01, tx);
+			p10 = EVG_LERP_WIDE(p10, p11, tx);
+			pix = EVG_LERP_WIDE(p00, p10, ty);
 		}
 #endif
 
+write_pix:
+
 		if (has_alpha) {
 			u64 _a = (pix>>48)&0xFF;
 			_a = (_a * _this->alpha) >> 8;
 			_a<<=48;
 			pix = ( (_a & 0xFFFF000000000000UL) ) | (pix & 0x0000FFFFFFFFFFFFUL);
 		}
-		if (has_replace_cmat) {
-			u64 _a = (pix>>48)&0xFF;
-			_a = (_a * _this->alpha) >> 8;
-			_a = (u64) (_this->cmat.m[18] * _a);
-			_a<<=48;
-			pix = ( (_a & 0xFFFF000000000000UL) ) | (replace_col & 0x0000FFFFFFFFFFFFUL);
-		}
+
 		//move pixel to target pixel format, applying color transform matrix
-		else if (_this->is_yuv) {
+		if (_this->is_yuv) {
 			//if surf is rgb, transform
-			if (!surf->yuv_type) {
-				pix = gf_evg_ayuv_to_argb_wide(surf, pix);
+			if (!yuv_type) {
+				pix = gf_evg_ayuv_to_argb_wide(rctx->surf, pix);
 				//apply cmat
 				if (has_cmat)
 					pix = gf_cmx_apply_wide(&_this->cmat, pix);
@@ -1035,8 +1218,8 @@
 				pix = gf_cmx_apply_wide(&_this->cmat, pix);
 
 			//dest is yuv, transform
-			if (surf->yuv_type)
-				pix = gf_evg_argb_to_ayuv_wide(surf, pix);
+			if (yuv_type)
+				pix = gf_evg_argb_to_ayuv_wide(rctx->surf, pix);
 		}
 
 		*data++ = pix;
@@ -1046,20 +1229,17 @@
 
 
 /*just a little faster...*/
-static void tex_fill_run_straight_wide(GF_EVGStencil *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+static void tex_fill_run_straight_wide(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
 {
-	s32 x0, y0;
-	u64 pix;
+	s32 x0, y0, m_width;
+	u64 pix, pad_y=0;
+	u32 conv_type=0;
 	Bool repeat_s = GF_FALSE;
-	Fixed x, y, _fdim;
-	u64 *data = surf->stencil_pix_run;
+	Fixed x, y;
+	EVG_YUVType yuv_type = rctx->surf->yuv_type;
+	u64 *data = rctx->stencil_pix_run;
 	EVG_Texture *_this = (EVG_Texture *) p;
 
-	if (_this->tx_callback && _this->tx_callback_screen_coords) {
-		tex_fill_run_callback_wide(_this, surf, _x, _y, count);
-		return;
-	}
-
 	/*get texture coords in FIXED - offset*/
 	x = _this->smat.m[0]*_x + _this->smat.m[2];
 	y = _this->smat.m[4]*_y + _this->smat.m[5];
@@ -1077,45 +1257,73 @@
 	}
 
 	/* and move in absolute coords*/
-	_fdim = INT2FIX(_this->width);
 	repeat_s = (_this->mod & GF_TEXTURE_REPEAT_S);
-	if (!repeat_s && (x <- _fdim)) x=0;
-	while (x<0) x += _fdim;
-
-	_fdim = INT2FIX(_this->height);
-	if (!(_this->mod & GF_TEXTURE_REPEAT_T) && (y <- _fdim)) y = 0;
-	while (y<0) y += _fdim;
 
 	y0 = FIX2INT(y);
-	y0 = y0 % _this->height;
 
-	while (count) {
-		x0 = FIX2INT(x);
-		if (repeat_s) {
-			x0 = (x0) % _this->width;
-		} else if (x0 >= (s32) _this->width) x0 = _this->width-1;
+	if (y0<0) {
+		if (_this->mod & GF_TEXTURE_REPEAT_T)
+			while (y0<0) y0 += _this->height;
+		else if (_this->fill_pad_color_wide)
+			pad_y = _this->fill_pad_color_wide;
+		else
+			y0 = 0;
+	} else if (y0>=(s32) _this->height) {
+		if (_this->mod & GF_TEXTURE_REPEAT_T)
+			while ((u32) y0 > _this->height) y0 -= _this->height;
+		else if (_this->fill_pad_color_wide)
+			pad_y = _this->fill_pad_color_wide;
+		else
+			y0 = _this->height-1;
+	}
+	if (pad_y) {
+		while (count) {
+			*data++ = pad_y;
+			count--;
+		}
+		return;
+	}
 
-		x += _this->inc_x;
+	m_width = _this->width - 1;
 
-		if (_this->tx_get_pixel_wide) {
-			pix = _this->tx_get_pixel_wide(_this, x0, y0);
-		} else {
-			pix = evg_col_to_wide( _this->tx_get_pixel(_this, x0, y0) );
-		}
+	if (_this->is_yuv && !yuv_type) conv_type = 1;
+	else if (!_this->is_yuv && yuv_type) conv_type = 2;
 
-		//replace_col is in destination format
-		if (_this->replace_col) {
-			u64 _a = (pix>>48)&0xFF;
-			_a = (_a * _this->alpha) >> 8;
-			_a<<=48;
-			pix = ( (_a & 0xFFFF000000000000UL) ) | (_this->replace_col & 0x0000FFFFFFFFFFFFUL);
+	while (count) {
+		x0 = FIX2INT(x);
+		if (x0 > m_width) {
+			if (repeat_s) {
+				x0 = (x0) % _this->width;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				goto write_pix;
+			} else {
+				x0 = m_width;
+			}
 		}
-		//move pixel to target pixel format
-		else if (_this->is_yuv && !surf->yuv_type) {
-			pix = gf_evg_ayuv_to_argb_wide(surf, pix);
+		else if (x0 < 0) {
+			if (repeat_s) {
+				while (x0<0) x0 += _this->width;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				goto write_pix;
+			} else {
+				x0 = 0;
+			}
 		}
-		else if (!_this->is_yuv && surf->yuv_type) {
-			pix = gf_evg_argb_to_ayuv_wide(surf, pix);
+
+		pix = _this->tx_get_pixel_wide(_this, x0, y0, rctx);
+
+write_pix:
+		x += _this->inc_x;
+		//move pixel to target pixel format
+		switch (conv_type) {
+		case 1:
+			pix = gf_evg_ayuv_to_argb_wide(rctx->surf, pix);
+			break;
+		case 2:
+			pix = gf_evg_argb_to_ayuv_wide(rctx->surf, pix);
+			break;
 		}
 
 		*data++ = pix;
@@ -1123,74 +1331,446 @@
 	}
 }
 
-GF_EVGStencil *evg_texture_brush()
+static void tex_fill_run_3d(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
 {
-	EVG_Texture *tmp;
-	GF_SAFEALLOC(tmp, EVG_Texture);
-	if (!tmp) return 0L;
+	s32 cx, x0, y0, m_width, m_height;
+	u32 pix;
+	Bool has_alpha, has_cmat, repeat_s, repeat_t;
+	Fixed x, y;
+#if USE_BILINEAR
+	s32 incx, incy;
+#endif
+	EVG_YUVType yuv_type = rctx->surf->yuv_type;
+	u32 *data = rctx->stencil_pix_run;
+	EVG_Texture *_this = (EVG_Texture *) p;
 
-	tmp->fill_run = tex_fill_run;
-	tmp->type = GF_STENCIL_TEXTURE;
-	/*default is using the surface settings*/
-	gf_evg_stencil_set_filter( (GF_EVGStencil *) tmp, GF_TEXTURE_FILTER_DEFAULT);
-	tmp->mod = 0;
-	gf_cmx_init(&tmp->cmat);
-	tmp->alpha = 255;
-	return (GF_EVGStencil *) tmp;
-}
 
+#if USE_BILINEAR
+	Bool use_bili = (_this->filter==GF_TEXTURE_FILTER_HIGH_QUALITY) ? 1 : 0;
+	incx = (_this->inc_x>0) ? 1 : -1;
+	incy = (_this->inc_y>0) ? 1 : -1;
+#endif
 
-u32 get_pix_argb(EVG_Texture *_this, u32 x, u32 y)
-{
-	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
-	return GF_COL_ARGB(*(pix) & 0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF, *(pix+3) & 0xFF);
-}
-u32 get_pix_rgba(EVG_Texture *_this, u32 x, u32 y)
-{
-	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
-	return GF_COL_ARGB(*(pix+3) & 0xFF, *(pix) & 0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF);
-}
-u32 get_pix_abgr(EVG_Texture *_this, u32 x, u32 y)
-{
-	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
-	return GF_COL_ARGB(*(pix) & 0xFF, *(pix+3) & 0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF);
-}
-u32 get_pix_bgra(EVG_Texture *_this, u32 x, u32 y)
-{
-	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
-	return GF_COL_ARGB(*(pix+3) & 0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF, *(pix) & 0xFF);
-}
-u32 get_pix_rgbx(EVG_Texture *_this, u32 x, u32 y)
-{
-	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
-	return GF_COL_ARGB(0xFF, *(pix) & 0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF);
-}
-u32 get_pix_xrgb(EVG_Texture *_this, u32 x, u32 y)
-{
-	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
-	return GF_COL_ARGB(0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF, *(pix+3) & 0xFF);
-}
-u32 get_pix_xbgr(EVG_Texture *_this, u32 x, u32 y)
-{
-	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
-	return GF_COL_ARGB(0xFF, *(pix+3) & 0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF);
-}
-u32 get_pix_bgrx(EVG_Texture *_this, u32 x, u32 y)
-{
-	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
-	return GF_COL_ARGB(0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF, *(pix) & 0xFF);
+	Bool do_mx = gf_mx2d_is_identity(_this->smat_bck) ? GF_FALSE : GF_TRUE;
+
+	repeat_s = _this->mod & GF_TEXTURE_REPEAT_S;
+	repeat_t = _this->mod & GF_TEXTURE_REPEAT_T;
+
+	has_alpha = (_this->alpha != 255) ? GF_TRUE : GF_FALSE;
+	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
+
+	m_width = _this->width-1;
+	m_height = _this->height-1;
+
+	PERSP_VARS_DECL
+
+	while (count) {
+		PERSP_APPLY
+
+		if (do_mx)
+			gf_mx2d_apply_coords(&_this->smat_bck, &ix, &iy);
+
+		x = m_width * ix;
+		y = m_height * iy;
+
+		x0 = FIX2INT(x);
+
+		if (x0 > m_width) {
+			if (repeat_s) {
+				while (x0>m_width) x0 -= m_width;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				goto write_pix;
+			} else {
+				x0 = m_width;
+			}
+		}
+		else if (x0 < 0) {
+			if (repeat_s) {
+				while (x0<0) x0 += m_width;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				goto write_pix;
+			} else {
+				x0 = 0;
+			}
+		}
+
+		y0 = FIX2INT(y);
+		if (y0 > m_height) {
+			if (repeat_t) {
+				while (y0>m_height) y0 -= m_height;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				goto write_pix;
+			} else {
+				y0 = m_height;
+			}
+		}
+		else if (y0 < 0) {
+			if (repeat_t) {
+				while (y0<0) y0 += m_height;
+			} else if (_this->fill_pad_color) {
+				pix = _this->fill_pad_color;
+				goto write_pix;
+			} else {
+				y0 = 0;
+			}
+		}
+
+		pix = _this->tx_get_pixel(_this, x0, y0, rctx);
+
+		/*bilinear filtering*/
+#if USE_BILINEAR
+		if (use_bili) {
+			Bool do_lerp=GF_TRUE;
+			u32 p00, p01, p10, p11;
+			s32 x1, y1;
+			u8 tx, ty;
+
+			tx = FIX2INT(gf_muldiv(x, 255, m_width) );
+			ty = FIX2INT(gf_muldiv(y, 255, m_height) );
+
+			x1 = (x0+incx);
+			if (x1<0) {
+				if (!repeat_s)
+					do_lerp=GF_FALSE;
+				else
+					while (x1<0) x1 += m_width;
+			} else {
+				if (!repeat_s && (x1 > m_width))
+					do_lerp=GF_FALSE;
+				else
+					x1 = x1 % m_width;
+			}
+			y1 = (y0+incy);
+			if (y1<0) {
+				if (!repeat_t)
+					do_lerp=GF_FALSE;
+				else
+					while (y1<0) y1 += m_height;
+			} else {
+				if (!repeat_t && (y1 > m_height))
+					do_lerp=GF_FALSE;
+				else
+					y1 = y1 % m_height;
+			}
+
+			if (!do_lerp) goto write_pix;
+
+			if (incx>0) {
+				if (x1<x0) tx = 255-tx;
+			} else {
+				if (x1>x0) tx = 255-tx;
+			}
+			if (incy>0) {
+				if (y1<y0) ty = 255-ty;
+			} else {
+				if (y1>y0) ty = 255-ty;
+			}
+
+			p00 = pix;
+			p01 = _this->tx_get_pixel(_this, x1, y0, rctx);
+			p10 = _this->tx_get_pixel(_this, x0, y1, rctx);
+			p11 = _this->tx_get_pixel(_this, x1, y1, rctx);
+
+			p00 = EVG_LERP(p00, p01, tx);
+			p10 = EVG_LERP(p10, p11, tx);
+			pix = EVG_LERP(p00, p10, ty);
+
+		}
+#endif
+
+write_pix:
+		if (has_alpha) {
+			cx = ((GF_COL_A(pix) + 1) * _this->alpha) >> 8;
+			pix = ( (((u32)cx<<24) & 0xFF000000) ) | (pix & 0x00FFFFFF);
+		}
+		//move pixel to target pixel format, applying color transform matrix
+		if (_this->is_yuv) {
+			//if surf is rgb, transform
+			if (!yuv_type) {
+				pix = gf_evg_ayuv_to_argb(rctx->surf, pix);
+				//apply cmat
+				if (has_cmat)
+					pix = gf_cmx_apply(&_this->cmat, pix);
+			} else if (has_cmat) {
+				//yuv->yuv , use color matrix in yuv domain
+				//this is equivalent to gf_evg_ayuv_to_argb, gf_cmx_apply(&_this->cmat, pix), gf_evg_argb_to_ayuv
+				pix = gf_cmx_apply(&_this->yuv_cmat, pix);
+			}
+		}
+		//texture is RGB
+		else {
+			//apply cmat
+			if (has_cmat)
+				pix = gf_cmx_apply(&_this->cmat, pix);
+
+			//dest is yuv, transform
+			if (yuv_type)
+				pix = gf_evg_argb_to_ayuv(rctx->surf, pix);
+		}
+
+		*data++ = pix;
+		count--;
+	}
+}
+
+static void tex_fill_run_3d_wide(GF_EVGStencil *p, EVGRasterCtx *rctx, s32 _x, s32 _y, u32 count)
+{
+	s32 x0, y0, m_width, m_height;
+	u64 pix;
+	Bool has_alpha, has_cmat, repeat_s, repeat_t;
+	Fixed x, y;
+#if USE_BILINEAR
+	s32 incx, incy;
+#endif
+	EVG_YUVType yuv_type = rctx->surf->yuv_type;
+	u64 *data = rctx->stencil_pix_run;
+	EVG_Texture *_this = (EVG_Texture *) p;
+
+
+#if USE_BILINEAR
+	Bool use_bili = (_this->filter==GF_TEXTURE_FILTER_HIGH_QUALITY) ? 1 : 0;
+	incx = (_this->inc_x>0) ? 1 : -1;
+	incy = (_this->inc_y>0) ? 1 : -1;
+#endif
+
+	Bool do_mx = gf_mx2d_is_identity(_this->smat_bck) ? GF_FALSE : GF_TRUE;
+
+	repeat_s = _this->mod & GF_TEXTURE_REPEAT_S;
+	repeat_t = _this->mod & GF_TEXTURE_REPEAT_T;
+
+	has_alpha = (_this->alpha != 255) ? GF_TRUE : GF_FALSE;
+	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
+
+	m_width = _this->width-1;
+	m_height = _this->height-1;
+
+	PERSP_VARS_DECL
+
+	while (count) {
+		PERSP_APPLY
+
+		if (do_mx)
+			gf_mx2d_apply_coords(&_this->smat_bck, &ix, &iy);
+
+		x = m_width * ix;
+		y = m_height * iy;
+
+		x0 = FIX2INT(x);
+
+		if (x0 > m_width) {
+			if (repeat_s) {
+				while (x0>m_width) x0 -= m_width;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				goto write_pix;
+			} else {
+				x0 = m_width;
+			}
+		}
+		else if (x0 < 0) {
+			if (repeat_s) {
+				while (x0<0) x0 += m_width;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				goto write_pix;
+			} else {
+				x0 = 0;
+			}
+		}
+
+		y0 = FIX2INT(y);
+		if (y0 > m_height) {
+			if (repeat_t) {
+				while (y0>m_height) y0 -= m_height;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				goto write_pix;
+			} else {
+				y0 = m_height;
+			}
+		}
+		else if (y0 < 0) {
+			if (repeat_t) {
+				while (y0<0) y0 += m_height;
+			} else if (_this->fill_pad_color_wide) {
+				pix = _this->fill_pad_color_wide;
+				goto write_pix;
+			} else {
+				y0 = 0;
+			}
+		}
+
+		pix = _this->tx_get_pixel_wide(_this, x0, y0, rctx);
+
+		/*bilinear filtering*/
+#if USE_BILINEAR
+		if (use_bili) {
+			Bool do_lerp=GF_TRUE;
+			u64 p00, p01, p10, p11;
+			s32 x1, y1;
+			u8 tx, ty;
+
+			tx = FIX2INT(gf_muldiv(x, 255, m_width) );
+			ty = FIX2INT(gf_muldiv(y, 255, m_height) );
+
+			x1 = (x0+incx);
+			if (x1<0) {
+				if (!repeat_s)
+					do_lerp=GF_FALSE;
+				else
+					while (x1<0) x1 += m_width;
+			} else {
+				if (!repeat_s && (x1 > m_width))
+					do_lerp=GF_FALSE;
+				else
+					x1 = x1 % m_width;
+			}
+			y1 = (y0+incy);
+			if (y1<0) {
+				if (!repeat_t)
+					do_lerp=GF_FALSE;
+				else
+					while (y1<0) y1 += m_height;
+			} else {
+				if (!repeat_t && (y1 > m_height))
+					do_lerp=GF_FALSE;
+				else
+					y1 = y1 % m_height;
+			}
+
+			if (!do_lerp) goto write_pix;
+
+			if (incx>0) {
+				if (x1<x0) tx = 255-tx;
+			} else {
+				if (x1>x0) tx = 255-tx;
+			}
+			if (incy>0) {
+				if (y1<y0) ty = 255-ty;
+			} else {
+				if (y1>y0) ty = 255-ty;
+			}
+
+			p00 = pix;
+			p01 = _this->tx_get_pixel_wide(_this, x1, y0, rctx);
+			p10 = _this->tx_get_pixel_wide(_this, x0, y1, rctx);
+			p11 = _this->tx_get_pixel_wide(_this, x1, y1, rctx);
+
+			p00 = EVG_LERP_WIDE(p00, p01, tx);
+			p10 = EVG_LERP_WIDE(p10, p11, tx);
+			pix = EVG_LERP_WIDE(p00, p10, ty);
+
+		}
+#endif
+
+write_pix:
+		if (has_alpha) {
+			u64 _a = (pix>>48)&0xFF;
+			_a = (_a * _this->alpha) >> 8;
+			_a<<=48;
+			pix = ( (_a & 0xFFFF000000000000UL) ) | (pix & 0x0000FFFFFFFFFFFFUL);
+		}
+		//move pixel to target pixel format, applying color transform matrix
+		if (_this->is_yuv) {
+			//if surf is rgb, transform
+			if (!yuv_type) {
+				pix = gf_evg_ayuv_to_argb_wide(rctx->surf, pix);
+				//apply cmat
+				if (has_cmat)
+					pix = gf_cmx_apply_wide(&_this->cmat, pix);
+			} else if (has_cmat) {
+				//yuv->yuv , use color matrix in yuv domain
+				//this is equivalent to gf_evg_ayuv_to_argb, gf_cmx_apply(&_this->cmat, pix), gf_evg_argb_to_ayuv
+				pix = gf_cmx_apply_wide(&_this->yuv_cmat, pix);
+			}
+		}
+		//texture is RGB
+		else {
+			//apply cmat
+			if (has_cmat)
+				pix = gf_cmx_apply_wide(&_this->cmat, pix);
+
+			//dest is yuv, transform
+			if (yuv_type)
+				pix = gf_evg_argb_to_ayuv_wide(rctx->surf, pix);
+		}
+
+		*data++ = pix;
+		count--;
+	}
+}
+
+GF_EVGStencil *evg_texture_brush()
+{
+	EVG_Texture *tmp;
+	GF_SAFEALLOC(tmp, EVG_Texture);
+	if (!tmp) return 0L;
+
+	tmp->fill_run = tex_fill_run;
+	tmp->type = GF_STENCIL_TEXTURE;
+	/*default is using the surface settings*/
+	gf_evg_stencil_set_filter( (GF_EVGStencil *) tmp, GF_TEXTURE_FILTER_HIGH_SPEED);
+	tmp->mod = 0;
+	gf_cmx_init(&tmp->cmat);
+	tmp->alpha = 255;
+	return (GF_EVGStencil *) tmp;
+}
+
+
+u32 get_pix_argb(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
+{
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	return GF_COL_ARGB(*(pix) & 0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF, *(pix+3) & 0xFF);
 }
-u32 get_pix_rgb_24(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_rgba(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
+{
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	return GF_COL_ARGB(*(pix+3) & 0xFF, *(pix) & 0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF);
+}
+u32 get_pix_abgr(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
+{
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	return GF_COL_ARGB(*(pix) & 0xFF, *(pix+3) & 0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF);
+}
+u32 get_pix_bgra(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
+{
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	return GF_COL_ARGB(*(pix+3) & 0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF, *(pix) & 0xFF);
+}
+u32 get_pix_rgbx(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
+{
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	return GF_COL_ARGB(0xFF, *(pix) & 0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF);
+}
+u32 get_pix_xrgb(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
+{
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	return GF_COL_ARGB(0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF, *(pix+3) & 0xFF);
+}
+u32 get_pix_xbgr(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
+{
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	return GF_COL_ARGB(0xFF, *(pix+3) & 0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF);
+}
+u32 get_pix_bgrx(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
+{
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	return GF_COL_ARGB(0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF, *(pix) & 0xFF);
+}
+u32 get_pix_rgb_24(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
 	return GF_COL_ARGB(0xFF, *pix & 0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF);
 }
-u32 get_pix_bgr_24(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_bgr_24(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
 	return GF_COL_ARGB(0xFF, *(pix+2) & 0xFF, * (pix+1) & 0xFF, *pix & 0xFF);
 }
-u32 get_pix_444(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_444(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
 	u32 r = pix[0]&0x0f;
@@ -1198,7 +1778,7 @@
 	u32 b = pix[1]&0x0f;
 	return GF_COL_ARGB(0xFF, (r << 4), (g << 4), (b << 4));
 }
-u32 get_pix_555(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_555(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
 	u32 r = (pix[0]>>2) & 0x1f;
@@ -1208,7 +1788,7 @@
 	u32 b = pix[1] & 0x1f;
 	return GF_COL_ARGB(0xFF, (r << 3), (g << 3), (b << 3));
 }
-u32 get_pix_565(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_565(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
 	u32 r = (pix[0]>>3) & 0x1f;
@@ -1218,13 +1798,13 @@
 	u32 b = pix[1] & 0x1f;
 	return GF_COL_ARGB(0xFF, (r << 3), (g << 2), (b << 3));
 }
-u32 get_pix_grey(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_grey(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
 	u8 val = *pix;
 	return GF_COL_ARGB(0xFF, val, val, val);
 }
-u32 get_pix_alphagrey(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_alphagrey(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 a, g;
 	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
@@ -1232,7 +1812,7 @@
 	g = *(pix+1);
 	return GF_COL_ARGB(a, g, g, g);
 }
-u32 get_pix_greyalpha(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_greyalpha(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 a, g;
 	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
@@ -1240,7 +1820,7 @@
 	a = *(pix+1);
 	return GF_COL_ARGB(a, g, g, g);
 }
-u32 get_pix_yuv420p(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv420p(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + x;
 	u8 *pU = _this->pix_u + y/2 * _this->stride/2 + x/2;
@@ -1267,7 +1847,7 @@
 #endif
 
 
-u32 get_pix_yuv420p_10(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv420p_10(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1281,7 +1861,7 @@
 	return GF_COL_ARGB(0xFF, vy, vu, vv);
 }
 
-u64 get_pix_yuv420p_10_wide(EVG_Texture *_this, u32 x, u32 y)
+u64 get_pix_yuv420p_10_wide(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u16 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1292,9 +1872,9 @@
 	vu = GET_LE_10BIT_AS_16(pU);
 	vv = GET_LE_10BIT_AS_16(pV);
 
-	return evg_make_col_wide(0xFFFF, vy, vu, vv);
+	return GF_COLW_ARGB(0xFFFF, vy, vu, vv);
 }
-u32 get_pix_yuv420p_a(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv420p_a(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + x;
 	u8 *pU = _this->pix_u + y/2 * _this->stride/2 + x/2;
@@ -1303,14 +1883,14 @@
 
 	return GF_COL_ARGB(*pA, *pY, *pU, *pV);
 }
-u32 get_pix_yuv422p(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv422p(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + x;
 	u8 *pU = _this->pix_u + y * _this->stride/2 + x/2;
 	u8 *pV = _this->pix_v + y * _this->stride/2 + x/2;
 	return GF_COL_ARGB(0xFF, *pY, *pU, *pV);
 }
-u32 get_pix_yuv422p_10(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv422p_10(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1323,7 +1903,7 @@
 	return GF_COL_ARGB(0xFF, vy, vu, vv);
 }
 
-u64 get_pix_yuv422p_10_wide(EVG_Texture *_this, u32 x, u32 y)
+u64 get_pix_yuv422p_10_wide(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u16 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1333,17 +1913,17 @@
 	vy = GET_LE_10BIT_AS_16(pY);
 	vu = GET_LE_10BIT_AS_16(pU);
 	vv = GET_LE_10BIT_AS_16(pV);
-	return evg_make_col_wide(0xFFFF, vy, vu, vv);
+	return GF_COLW_ARGB(0xFFFF, vy, vu, vv);
 }
 
-u32 get_pix_yuv444p(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv444p(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + x;
 	u8 *pU = _this->pix_u + y * _this->stride + x;
 	u8 *pV = _this->pix_v + y * _this->stride + x;
 	return GF_COL_ARGB(0xFF, *pY, *pU, *pV);
 }
-u32 get_pix_yuv444p_10(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv444p_10(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1355,7 +1935,7 @@
 	vv = GET_LE_10BIT_AS_8(pV);
 	return GF_COL_ARGB(0xFF, vy, vu, vv);
 }
-u64 get_pix_yuv444p_10_wide(EVG_Texture *_this, u32 x, u32 y)
+u64 get_pix_yuv444p_10_wide(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u16 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1365,9 +1945,9 @@
 	vy = GET_LE_10BIT_AS_16(pY);
 	vu = GET_LE_10BIT_AS_16(pU);
 	vv = GET_LE_10BIT_AS_16(pV);
-	return evg_make_col_wide(0xFFFF, vy, vu, vv);
+	return GF_COLW_ARGB(0xFFFF, vy, vu, vv);
 }
-u32 get_pix_yuv444p_a(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv444p_a(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + x;
 	u8 *pU = _this->pix_u + y * _this->stride + x;
@@ -1375,14 +1955,14 @@
 	u8 *pA = _this->pix_a + y * _this->stride + x;
 	return GF_COL_ARGB(*pA, *pY, *pU, *pV);
 }
-u32 get_pix_yuv_nv12(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv_nv12(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + x;
 	u8 *pU = _this->pix_u + y/2 * _this->stride + (x/2)*2;
 	return GF_COL_ARGB(0xFF, *pY, *pU, *(pU+1));
 }
 
-u32 get_pix_yuv_nv12_10(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv_nv12_10(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u16 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1393,7 +1973,7 @@
 
 	return GF_COL_ARGB(0xFF, vy, vu, vv);
 }
-u64 get_pix_yuv_nv12_10_wide(EVG_Texture *_this, u32 x, u32 y)
+u64 get_pix_yuv_nv12_10_wide(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u16 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1403,15 +1983,15 @@
 	vu = GET_LE_10BIT_AS_16(pU);
 	vv = GET_LE_10BIT_AS_16(pU+2);
 
-	return evg_make_col_wide(0xFFFF, vy, vu, vv);
+	return GF_COLW_ARGB(0xFFFF, vy, vu, vv);
 }
-u32 get_pix_yuv_nv21(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv_nv21(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + x;
 	u8 *pU = _this->pix_u + y/2 * _this->stride + (x/2)*2;
 	return GF_COL_ARGB(0xFF, *pY, *(pU+1), *pU);
 }
-u32 get_pix_yuv_nv21_10(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuv_nv21_10(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1423,7 +2003,7 @@
 
 	return GF_COL_ARGB(0xFF, vy, vv, vu);
 }
-u64 get_pix_yuv_nv21_10_wide(EVG_Texture *_this, u32 x, u32 y)
+u64 get_pix_yuv_nv21_10_wide(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u16 vy, vu, vv;
 	u8 *pY = _this->pixels + y * _this->stride + x*2;
@@ -1432,9 +2012,9 @@
 	vy = GET_LE_10BIT_AS_16(pY);
 	vu = GET_LE_10BIT_AS_16(pU);
 	vv = GET_LE_10BIT_AS_16(pU+2);
-	return evg_make_col_wide(0xFFFF, vy, vv, vu);
+	return GF_COLW_ARGB(0xFFFF, vy, vv, vu);
 }
-u32 get_pix_yuyv(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yuyv(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + (x/2)*4;
 	u8 u = pY[1];
@@ -1442,7 +2022,7 @@
 	u8 luma = (x%2) ? pY[2] : pY[0];
 	return GF_COL_ARGB(0xFF, luma, u, v);
 }
-u32 get_pix_yvyu(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_yvyu(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + (x/2)*4;
 	u8 u = pY[3];
@@ -1450,7 +2030,7 @@
 	u8 luma = (x%2) ? pY[2] : pY[0];
 	return GF_COL_ARGB(0xFF, luma, u, v);
 }
-u32 get_pix_uyvy(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_uyvy(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + (x/2)*4;
 	u8 u = pY[0];
@@ -1458,7 +2038,7 @@
 	u8 luma = (x%2) ? pY[3] : pY[1];
 	return GF_COL_ARGB(0xFF, luma, u, v);
 }
-u32 get_pix_vyuy(EVG_Texture *_this, u32 x, u32 y)
+u32 get_pix_vyuy(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *ctx)
 {
 	u8 *pY = _this->pixels + y * _this->stride + (x/2)*4;
 	u8 u = pY[2];
@@ -1467,22 +2047,39 @@
 	return GF_COL_ARGB(0xFF, luma, u, v);
 }
 
+
+u64 default_get_pixel_wide(struct __evg_texture *_this, u32 x, u32 y, EVGRasterCtx *rctx)
+{
+	return evg_col_to_wide( _this->tx_get_pixel(_this, x, y, rctx) );
+}
+
 static void texture_set_callbacks(EVG_Texture *_this)
 {
+	Bool swap_uv = GF_FALSE;
 	if (_this->tx_callback)
 		return;
+
+	_this->is_wide = 0;
+	_this->is_transparent = 0;
+	_this->tx_get_pixel = NULL;
+	_this->tx_get_pixel_wide = default_get_pixel_wide;
+
 	switch (_this->pixel_format) {
 	case GF_PIXEL_RGBA:
 		_this->tx_get_pixel = get_pix_rgba;
+		_this->is_transparent = 1;
 		return;
 	case GF_PIXEL_ARGB:
 		_this->tx_get_pixel = get_pix_argb;
+		_this->is_transparent = 1;
 		return;
 	case GF_PIXEL_ABGR:
 		_this->tx_get_pixel = get_pix_abgr;
+		_this->is_transparent = 1;
 		return;
 	case GF_PIXEL_BGRA:
 		_this->tx_get_pixel = get_pix_bgra;
+		_this->is_transparent = 1;
 		return;
 	case GF_PIXEL_RGBX:
 		_this->tx_get_pixel = get_pix_rgbx;
@@ -1516,15 +2113,20 @@
 		return;
 	case GF_PIXEL_ALPHAGREY:
 		_this->tx_get_pixel = get_pix_alphagrey;
+		_this->is_transparent = 1;
 		return;
 	case GF_PIXEL_GREYALPHA:
 		_this->tx_get_pixel = get_pix_greyalpha;
+		_this->is_transparent = 1;
 		return;
 	case GF_PIXEL_YUV:
+	//we swap pU and pV at setup, use the same function
+	case GF_PIXEL_YVU:
 		_this->tx_get_pixel = get_pix_yuv420p;
 		break;
 	case GF_PIXEL_YUVA:
 		_this->tx_get_pixel = get_pix_yuv420p_a;
+		_this->is_transparent = 1;
 		break;
 	case GF_PIXEL_YUV422:
 		_this->tx_get_pixel = get_pix_yuv422p;
@@ -1534,6 +2136,7 @@
 		break;
 	case GF_PIXEL_YUVA444:
 		_this->tx_get_pixel = get_pix_yuv444p_a;
+		_this->is_transparent = 1;
 		break;
 	case GF_PIXEL_NV12:
 		_this->tx_get_pixel = get_pix_yuv_nv12;
@@ -1556,22 +2159,34 @@
 	case GF_PIXEL_YUV_10:
 		_this->tx_get_pixel = get_pix_yuv420p_10;
 		_this->tx_get_pixel_wide = get_pix_yuv420p_10_wide;
+		_this->is_wide = 1;
 		break;
 	case GF_PIXEL_YUV422_10:
 		_this->tx_get_pixel = get_pix_yuv422p_10;
 		_this->tx_get_pixel_wide = get_pix_yuv422p_10_wide;
+		_this->is_wide = 1;
 		break;
 	case GF_PIXEL_YUV444_10:
 		_this->tx_get_pixel = get_pix_yuv444p_10;
 		_this->tx_get_pixel_wide = get_pix_yuv444p_10_wide;
+		_this->is_wide = 1;
 		break;
 	case GF_PIXEL_NV12_10:
 		_this->tx_get_pixel = get_pix_yuv_nv12_10;
 		_this->tx_get_pixel_wide = get_pix_yuv_nv12_10_wide;
+		_this->is_wide = 1;
 		break;
 	case GF_PIXEL_NV21_10:
 		_this->tx_get_pixel = get_pix_yuv_nv21_10;
 		_this->tx_get_pixel_wide = get_pix_yuv_nv21_10_wide;
+		_this->is_wide = 1;
+		break;
+	case GF_PIXEL_YUVA444_PACK:
+		_this->tx_get_pixel = get_pix_rgba;
+		_this->is_transparent = 1;
+		break;
+	case GF_PIXEL_YUV444_PACK:
+		_this->tx_get_pixel = get_pix_rgb_24;
 		break;
 	default:
 		return;
@@ -1580,11 +2195,18 @@
 	if (_this->pix_u) return;
 
 	switch (_this->pixel_format) {
+	case GF_PIXEL_YVU:
+		swap_uv = GF_TRUE;
 	case GF_PIXEL_YUV_10:
 	case GF_PIXEL_YUV:
 		if (!_this->stride_uv) _this->stride_uv = _this->stride/2;
 		_this->pix_u = _this->pixels + _this->stride*_this->height;
 		_this->pix_v = _this->pix_u + _this->stride_uv * _this->height/2;
+		if (swap_uv) {
+			u8 *tmp = _this->pix_u;
+			_this->pix_u = _this->pix_v;
+			_this->pix_v = tmp;
+		}
 		return;
 	case GF_PIXEL_YUVA:
 		if (!_this->stride_uv) _this->stride_uv = _this->stride/2;
@@ -1655,6 +2277,7 @@
 		_this->Bpp = 1;
 		break;
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 	case GF_PIXEL_NV12:
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_YUV422:
@@ -1681,6 +2304,14 @@
 		if (!stride)
 			stride = 4 * width;
 		break;
+	case GF_PIXEL_YUVA444_PACK:
+		_this->Bpp = 4;
+		_this->is_yuv = GF_TRUE;
+		break;
+	case GF_PIXEL_YUV444_PACK:
+		_this->Bpp = 3;
+		_this->is_yuv = GF_TRUE;
+		break;
 	default:
 		return GF_NOT_SUPPORTED;
 	}
@@ -1712,6 +2343,25 @@
 }
 
 GF_EXPORT
+GF_Err gf_evg_stencil_get_texture_planes(GF_EVGStencil *stencil, u8 **pY_or_RGB, u8 **pU, u8 **pV, u8 **pA, u32 *stride, u32 *stride_uv)
+{
+	EVG_Texture *_this = (EVG_Texture *) stencil;
+	if (!_this || (_this->type != GF_STENCIL_TEXTURE) )
+		return GF_BAD_PARAM;
+
+
+	if (pY_or_RGB) *pY_or_RGB = _this->pixels;
+	if (pU) *pU = _this->pix_u;
+	if (pV) *pV = _this->pix_v;
+	if (pA) *pA = _this->pix_a;
+	if (stride) *stride = _this->stride;
+	if (stride_uv) *stride_uv = _this->stride_uv;
+
+	return GF_OK;
+}
+
+
+GF_EXPORT
 GF_Err gf_evg_stencil_set_texture_parametric(GF_EVGStencil *stencil, u32 width, u32 height, GF_PixelFormat pixelFormat, gf_evg_texture_callback callback, void *cbk_data, Bool use_screen_coords)
 {
 	EVG_Texture *_this = (EVG_Texture *) stencil;
@@ -1723,6 +2373,7 @@
 	_this->pixels = NULL;
 	_this->tx_get_pixel = evg_paramtx_get_pixel;
 	_this->tx_get_pixel_wide = evg_paramtx_get_pixel_wide;
+	_this->is_wide = 1;
 
 	_this->tx_callback = callback;
 	_this->tx_callback_udta = cbk_data;
@@ -1742,22 +2393,23 @@
 	_this->inc_x = p1.x - p0.x;
 	_this->inc_y = p1.y - p0.y;
 
-	_this->replace_col = 0;
-	_this->cmat_is_replace = GF_FALSE;
-	if (!_this->cmat.identity
-	 && !_this->cmat.m[0] && !_this->cmat.m[1] && !_this->cmat.m[2] && !_this->cmat.m[3]
-	 && !_this->cmat.m[5] && !_this->cmat.m[6] && !_this->cmat.m[7] && !_this->cmat.m[8]
-	 && !_this->cmat.m[10] && !_this->cmat.m[11] && !_this->cmat.m[12] && !_this->cmat.m[13]
-	 && !_this->cmat.m[15] && !_this->cmat.m[16] && !_this->cmat.m[17] && !_this->cmat.m[19]) {
-		_this->cmat_is_replace = GF_TRUE;
-		_this->replace_col = GF_COL_ARGB(FIX2INT(_this->cmat.m[18]*255), FIX2INT(_this->cmat.m[4]*255), FIX2INT(_this->cmat.m[9]*255), FIX2INT(_this->cmat.m[14]*255));
-
-		if (surf->yuv_type) {
-			_this->replace_col = gf_evg_argb_to_ayuv(surf, _this->replace_col);
+	if (surf->is_3d_matrix) {
+		if (surf->not_8bits) {
+			_this->fill_run = tex_fill_run_3d_wide;
+		} else {
+			_this->fill_run = tex_fill_run_3d;
+		}
+	} else if (_this->tx_callback && _this->tx_callback_screen_coords) {
+		if (surf->not_8bits) {
+			_this->fill_run = tex_fill_run_callback_wide;
+		} else {
+			_this->fill_run = tex_fill_run_callback;
 		}
 	}
-
-	if ((_this->alpha == 255) && !_this->smat.m[1] && !_this->smat.m[3] && (_this->cmat.identity || _this->cmat_is_replace)) {
+	else if ((_this->filter != GF_TEXTURE_FILTER_HIGH_QUALITY) && (_this->alpha == 255)
+		&& !_this->smat.m[1] && !_this->smat.m[3]
+		&& _this->cmat.identity
+	) {
 		if (surf->not_8bits) {
 			_this->fill_run = tex_fill_run_straight_wide;
 		} else {
@@ -1765,7 +2417,8 @@
 		}
 	} else {
 		if (!_this->cmat.identity && _this->is_yuv && surf->yuv_type) {
-			evg_make_ayuv_color_mx(&_this->cmat, &_this->yuv_cmat);
+//			evg_make_ayuv_color_mx(&_this->cmat, &_this->yuv_cmat);
+			_this->yuv_cmat = _this->cmat;
 		}
 		if (surf->not_8bits) {
 			_this->fill_run = tex_fill_run_wide;
@@ -1774,10 +2427,36 @@
 		}
 	}
 
+	if (!_this->pad_rbg) {
+		_this->fill_pad_color = 0;
+	} else if (_this->is_transparent) {
+		_this->fill_pad_color = GF_COL_ARGB(0, 0xFF, 0xFF, 0xFF);
+	} else if (_this->is_yuv) {
+		_this->fill_pad_color = gf_evg_argb_to_ayuv(surf, _this->pad_rbg);
+	} else {
+		_this->fill_pad_color = _this->pad_rbg;
+	}
+	_this->fill_pad_color_wide = evg_col_to_wide(_this->fill_pad_color);
+
 	texture_set_callbacks(_this);
 }
 
+GF_EXPORT
+GF_Err gf_evg_stencil_set_pad_color(GF_EVGStencil * st, GF_Color pad_color)
+{
+	EVG_Texture *_this = (EVG_Texture *) st;
+	if (!_this || (_this->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
+	_this->pad_rbg = pad_color;
+	return GF_OK;
+}
 
+GF_EXPORT
+u32 gf_evg_stencil_get_pad_color(GF_EVGStencil * st)
+{
+	EVG_Texture *_this = (EVG_Texture *) st;
+	if (!_this || (_this->type != GF_STENCIL_TEXTURE)) return 0;
+	return _this->pad_rbg;
+}
 
 GF_EXPORT
 GF_Err gf_evg_stencil_set_mapping(GF_EVGStencil * st, GF_TextureMapFlags mode)
@@ -1801,27 +2480,34 @@
 GF_Err gf_evg_stencil_set_color_matrix(GF_EVGStencil * st, GF_ColorMatrix *cmat)
 {
 	Bool is_grad;
-	GF_EVGStencil *_this = (GF_EVGStencil *)st;
+	EVG_BaseGradient *_this = (EVG_BaseGradient *)st;
 	if (!_this) return GF_BAD_PARAM;
 	is_grad = ((_this->type==GF_STENCIL_LINEAR_GRADIENT) || (_this->type==GF_STENCIL_RADIAL_GRADIENT)) ? GF_TRUE : GF_FALSE;
 
 
 	if (!cmat) {
 		if (is_grad && !_this->cmat.identity)
-			((EVG_BaseGradient *) _this)->updated = 1;
+			_this->updated = 1;
 		gf_cmx_init(&_this->cmat);
 	} else {
 		if (is_grad && memcmp(&_this->cmat.m, &cmat->m, sizeof(Fixed)*20))
-			((EVG_BaseGradient *) _this)->updated = 1;
+			_this->updated = 1;
 		gf_cmx_copy(&_this->cmat, cmat);
 	}
 	return GF_OK;
 }
 
-static u32 gf_evg_stencil_get_pixel_intern(GF_EVGStencil *st, s32 x, s32 y, Bool want_yuv)
+GF_EXPORT
+GF_Err gf_evg_stencil_get_color_matrix(GF_EVGStencil * st, GF_ColorMatrix *cmat)
+{
+	EVG_BaseGradient *_this = (EVG_BaseGradient *)st;
+	if (!_this || !cmat) return GF_BAD_PARAM;
+	gf_cmx_copy(cmat, &_this->cmat);
+	return GF_OK;
+}
+static u32 gf_evg_stencil_get_pixel_intern(EVG_Texture *_this, s32 x, s32 y, Bool want_yuv)
 {
 	u32 col;
-	EVG_Texture *_this = (EVG_Texture *) st;
 	if (!_this || (_this->type != GF_STENCIL_TEXTURE) || !_this->tx_get_pixel) return 0;
 	if (x<0) x=0;
 	else if ((u32) x>=_this->width) x = _this->width-1;
@@ -1829,7 +2515,7 @@
 	if (y<0) y=0;
 	else if ((u32) y>=_this->height) y = _this->height-1;
 
-	col = _this->tx_get_pixel(_this, x, y);
+	col = _this->tx_get_pixel(_this, x, y, NULL);
 	if (_this->is_yuv) {
 		if (!want_yuv) return gf_evg_ayuv_to_argb(NULL, col);
 	} else {
@@ -1841,21 +2527,55 @@
 GF_EXPORT
 u32 gf_evg_stencil_get_pixel(GF_EVGStencil *st, s32 x, s32 y)
 {
-	return gf_evg_stencil_get_pixel_intern(st, x, y, GF_FALSE);
+	return gf_evg_stencil_get_pixel_intern((EVG_Texture *)st, x, y, GF_FALSE);
 }
 
-#if 0 //unused
 GF_EXPORT
 u32 gf_evg_stencil_get_pixel_yuv(GF_EVGStencil *st, s32 x, s32 y)
 {
-	return gf_evg_stencil_get_pixel_intern(st, x, y, GF_TRUE);
+	return gf_evg_stencil_get_pixel_intern((EVG_Texture *)st, x, y, GF_TRUE);
 }
-#endif
 
-static GF_Err gf_evg_stencil_get_pixel_f_intern(EVG_Texture *_this, Float x, Float y, Float *r, Float *g, Float *b, Float *a, Bool want_yuv)
+
+
+static u64 gf_evg_stencil_get_pixel_wide_intern(EVG_Texture *_this, s32 x, s32 y, Bool want_yuv)
+{
+	u64 col;
+	if (!_this || (_this->type != GF_STENCIL_TEXTURE) || !_this->tx_get_pixel_wide) return 0;
+	if (x<0) x=0;
+	else if ((u32) x>=_this->width) x = _this->width-1;
+
+	if (y<0) y=0;
+	else if ((u32) y>=_this->height) y = _this->height-1;
+
+	col = _this->tx_get_pixel_wide(_this, x, y, NULL);
+	if (_this->is_yuv) {
+		if (!want_yuv) return gf_evg_ayuv_to_argb_wide(NULL, col);
+	} else {
+		if (want_yuv) return gf_evg_argb_to_ayuv_wide(NULL, col);
+	}
+	return col;
+}
+
+GF_EXPORT
+u64 gf_evg_stencil_get_pixel_wide(GF_EVGStencil *st, s32 x, s32 y)
+{
+	return gf_evg_stencil_get_pixel_wide_intern((EVG_Texture *)st, x, y, GF_FALSE);
+}
+
+GF_EXPORT
+u64 gf_evg_stencil_get_pixel_yuv_wide(GF_EVGStencil *st, s32 x, s32 y)
+{
+	return gf_evg_stencil_get_pixel_intern((EVG_Texture *)st, x, y, GF_TRUE);
+}
+static GF_Vec4 gf_evg_stencil_get_pixel_f_intern(EVG_Texture *_this, Float x, Float y, Bool want_yuv)
 {
 	u32 col;
-	if (!_this->tx_get_pixel) return GF_BAD_PARAM;
+	GF_Vec4 res;
+	if (!_this || (_this->type != GF_STENCIL_TEXTURE) || (!_this->tx_get_pixel && !_this->tx_get_pixel_wide) ) {
+		memset(&res, 0, sizeof(GF_Vec4));
+		return res;
+	}
 
 	if (_this->mod & GF_TEXTURE_FLIP_X) x = -x;
 	if (_this->mod & GF_TEXTURE_FLIP_Y) y = -y;
@@ -1879,17 +2599,17 @@
 	}
 
 	//10-bit or more texture, use wide and convert to float
-	if (_this->tx_get_pixel_wide) {
+	if (_this->is_wide) {
 		u64 colw;
 		if (_this->filter==GF_TEXTURE_FILTER_HIGH_SPEED) {
-			colw = _this->tx_get_pixel_wide(_this, (s32) x, (s32) y);
+			colw = _this->tx_get_pixel_wide(_this, (s32) x, (s32) y, NULL);
 		} else {
 			u32 _x = (u32) floor(x);
 			u32 _y = (u32) floor(y);
 			if (_this->filter==GF_TEXTURE_FILTER_MID) {
 				if ((x - _x > 0.5) && _x+1<_this->width) _x++;
 				if ((y - _y > 0.5) && _y+1<_this->height) _y++;
-				colw = _this->tx_get_pixel_wide(_this, _x, _y);
+				colw = _this->tx_get_pixel_wide(_this, _x, _y, NULL);
 			} else {
 				u64 col01, col11, col10;
 				s32 _x1 = _x+1;
@@ -1899,10 +2619,10 @@
 
 				if ((u32)_x1>=_this->width) _x1 = _this->width-1;
 				if ((u32)_y1>=_this->height) _y1 = _this->height-1;
-				colw = _this->tx_get_pixel_wide(_this, _x, _y);
-				col10 = _this->tx_get_pixel_wide(_this, _x1, _y);
-				col01 = _this->tx_get_pixel_wide(_this, _x, _y1);
-				col11 = _this->tx_get_pixel_wide(_this, _x1, _y1);
+				colw = _this->tx_get_pixel_wide(_this, _x, _y, NULL);
+				col10 = _this->tx_get_pixel_wide(_this, _x1, _y, NULL);
+				col01 = _this->tx_get_pixel_wide(_this, _x, _y1, NULL);
+				col11 = _this->tx_get_pixel_wide(_this, _x1, _y1, NULL);
 				colw = EVG_LERP_WIDE(colw, col10, diff_x);
 				col11 = EVG_LERP_WIDE(col01, col11, diff_x);
 				colw = EVG_LERP_WIDE(colw, col11, diff_y);
@@ -1914,23 +2634,23 @@
 			if (want_yuv) colw = gf_evg_argb_to_ayuv_wide(NULL, colw);
 		}
 
-		*r = ((Float) GF_COLW_R(colw) ) / 0xFFFF;
-		*g = ((Float) GF_COLW_G(colw) ) / 0xFFFF;
-		*b = ((Float) GF_COLW_B(colw) ) / 0xFFFF;
-		*a = ((Float) GF_COLW_A(colw) ) / 0xFFFF;
-		return GF_OK;
+		res.x = GF_COLW_R(colw); res.x /= 0xFFFF;
+		res.y = GF_COLW_G(colw); res.y /= 0xFFFF;
+		res.z = GF_COLW_B(colw); res.z /= 0xFFFF;
+		res.q = GF_COLW_A(colw); res.q /= 0xFFFF;
+		return res;
 	}
 
 	//8-bit texture, use regular and convert to float
 	if (_this->filter==GF_TEXTURE_FILTER_HIGH_SPEED) {
-		col = _this->tx_get_pixel(_this, (s32) x, (s32) y);
+		col = _this->tx_get_pixel(_this, (s32) x, (s32) y, NULL);
 	} else {
 		u32 _x = (u32) floor(x);
 		u32 _y = (u32) floor(y);
 		if (_this->filter==GF_TEXTURE_FILTER_MID) {
 			if ((x - _x > 0.5) && _x+1<_this->width) _x++;
 			if ((y - _y > 0.5) && _y+1<_this->height) _y++;
-			col = _this->tx_get_pixel(_this, _x, _y);
+			col = _this->tx_get_pixel(_this, _x, _y, NULL);
 		} else {
 			u32 col01, col11, col10;
 			s32 _x1 = _x+1;
@@ -1940,10 +2660,10 @@
 
 			if ((u32)_x1>=_this->width) _x1 = _this->width-1;
 			if ((u32)_y1>=_this->height) _y1 = _this->height-1;
-			col = _this->tx_get_pixel(_this, _x, _y);
-			col10 = _this->tx_get_pixel(_this, _x1, _y);
-			col01 = _this->tx_get_pixel(_this, _x, _y1);
-			col11 = _this->tx_get_pixel(_this, _x1, _y1);
+			col = _this->tx_get_pixel(_this, _x, _y, NULL);
+			col10 = _this->tx_get_pixel(_this, _x1, _y, NULL);
+			col01 = _this->tx_get_pixel(_this, _x, _y1, NULL);
+			col11 = _this->tx_get_pixel(_this, _x1, _y1, NULL);
 			col = EVG_LERP(col, col10, diff_x);
 			col11 = EVG_LERP(col01, col11, diff_x);
 			col = EVG_LERP(col, col11, diff_y);
@@ -1954,27 +2674,23 @@
 	} else {
 		if (want_yuv) col = gf_evg_argb_to_ayuv(NULL, col);
 	}
-	*r = ((Float) GF_COL_R(col) ) / 255.0f;
-	*g = ((Float) GF_COL_G(col) ) / 255.0f;
-	*b = ((Float) GF_COL_B(col) ) / 255.0f;
-	*a = ((Float) GF_COL_A(col) ) / 255.0f;
-	return GF_OK;
+	res.x = (Float) ( GF_COL_R(col) / 255.0 );
+	res.y = (Float)( GF_COL_G(col) / 255.0 );
+	res.z = (Float)( GF_COL_B(col) / 255.0 );
+	res.q = (Float)( GF_COL_A(col) / 255.0 );
+	return res;
 }
 
 GF_EXPORT
-GF_Err gf_evg_stencil_get_pixel_f(GF_EVGStencil *st, Float x, Float y, Float *r, Float *g, Float *b, Float *a)
+GF_Vec4 gf_evg_stencil_get_pixel_f(GF_EVGStencil *st, Float x, Float y)
 {
-	EVG_Texture *_this = (EVG_Texture *) st;
-	if (!_this || (_this->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
-	return gf_evg_stencil_get_pixel_f_intern(_this, x, y, r, g, b, a, GF_FALSE);
+	return gf_evg_stencil_get_pixel_f_intern((EVG_Texture *)st, x, y, GF_FALSE);
 }
 
 GF_EXPORT
-GF_Err gf_evg_stencil_get_pixel_yuv_f(GF_EVGStencil *st, Float x, Float y, Float *r, Float *g, Float *b, Float *a)
+GF_Vec4 gf_evg_stencil_get_pixel_yuv_f(GF_EVGStencil *st, Float x, Float y)
 {
-	EVG_Texture *_this = (EVG_Texture *) st;
-	if (!_this || (_this->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
-	return gf_evg_stencil_get_pixel_f_intern(_this, x, y, r, g, b, a, GF_TRUE);
+	return gf_evg_stencil_get_pixel_f_intern((EVG_Texture *)st, x, y, GF_TRUE);
 }
 
 GF_EXPORT
@@ -1982,7 +2698,10 @@
 {
 	EVG_Texture *_this = (EVG_Texture *)st;
 	if (!_this) return GF_BAD_PARAM;
-	if (_this->type==GF_STENCIL_SOLID) return GF_BAD_PARAM;
+	if (_this->type==GF_STENCIL_SOLID) {
+		((EVG_Brush *)st)->alpha = alpha;
+		return GF_OK;
+	}
 	if (_this->type==GF_STENCIL_TEXTURE)
 		_this->alpha = alpha;
 	else {
@@ -1994,28 +2713,605 @@
 	return GF_OK;
 }
 
-void evg_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, s32 x, s32 y, u32 count)
+GF_EXPORT
+u8 gf_evg_stencil_get_alpha(GF_EVGStencil * st)
+{
+	EVG_Texture *_this = (EVG_Texture *)st;
+	if (!_this) return 0;
+	if (_this->type==GF_STENCIL_SOLID) {
+		return ((EVG_Brush *)st)->alpha;
+	}
+	if (_this->type==GF_STENCIL_TEXTURE)
+		return _this->alpha;
+
+	return ((EVG_BaseGradient*)st)->alpha;
+}
+
+void *evg_fill_run(GF_EVGStencil *p, EVGRasterCtx *rctx, EVG_Span *span, s32 y)
 {
-	p->fill_run(p, surf, x, y, count);
-	if (surf->get_alpha) {
+
+	if (rctx->surf->direct_yuv_3d) {
+		u32 *src = rctx->stencil_pix_run;
+		return src + span->x;
+	}
+	if (rctx->surf->is_shader) {
+		rctx->frag_param.coverage = span->coverage;
+		rctx->frag_param.odd_flag = span->odd_flag;
+		rctx->frag_param.screen_x = (Float) span->x;
+		rctx->frag_param.screen_y = (Float) y;
+	}
+	if (rctx->surf->odd_fill) {
+		if (!span->odd_flag && rctx->surf->sten2) {
+			rctx->surf->sten2->fill_run(rctx->surf->sten2, rctx, span->x, y, span->len);
+		} else {
+			p->fill_run(p, rctx, span->x, y, span->len);
+		}
+		return rctx->stencil_pix_run;
+	}
+
+	if (p)
+		p->fill_run(p, rctx, span->x, y, span->len);
+	if (rctx->surf->update_run) {
+		void *bck = rctx->stencil_pix_run;
+		if (rctx->surf->sten2) {
+			rctx->stencil_pix_run = rctx->stencil_pix_run2;
+			rctx->surf->sten2->fill_run(rctx->surf->sten2, rctx, span->x, y, span->len);
+		}
+		if (rctx->surf->sten3) {
+			rctx->stencil_pix_run = rctx->stencil_pix_run3;
+			rctx->surf->sten3->fill_run(rctx->surf->sten3, rctx, span->x, y, span->len);
+		}
+		rctx->stencil_pix_run = bck;
+		rctx->surf->update_run(rctx, span->len);
+		return rctx->stencil_pix_run;
+	}
+
+	if (rctx->surf->get_alpha) {
 		u32 i;
+		GF_EVGSurface *surf = rctx->surf;
 		EVG_Texture *_p = (EVG_Texture *)p;
 		if (_p->Bpp>8) {
-			u64 *coll = (u64 *)surf->stencil_pix_run;
-			for (i=0; i<count; i++) {
+			u64 *coll = (u64 *)rctx->stencil_pix_run;
+			for (i=0; i<span->len; i++) {
 				u64 a = (*coll>>48)&0xFFFF;
-				a = 0xFF * surf->get_alpha(surf->get_alpha_udta, (u8) (a/0xFF), x+i, y);
+				a = 0xFF * surf->get_alpha(surf->get_alpha_udta, (u8) (a/0xFF), span->x+i, y);
 				*coll = (a<<48) | ((*coll) & 0x0000FFFFFFFFFFFFUL);
 				coll ++;
 			}
 		} else {
-			u32 *col = (u32 *)surf->stencil_pix_run;
-			for (i=0; i<count; i++) {
-				u8 a = GF_COL_A(*col);
-				a = surf->get_alpha(surf->get_alpha_udta, a, x+i, y);
+			u32 *col = (u32 *)rctx->stencil_pix_run;
+			for (i=0; i<span->len; i++) {
+				u32 a = GF_COL_A(*col);
+				a = surf->get_alpha(surf->get_alpha_udta, a, span->len+i, y);
 				*col = (a<<24) | ((*col) & 0x00FFFFFF);
 				col ++;
 			}
 		}
 	}
+	return rctx->stencil_pix_run;
+}
+void *evg_fill_run_mask(GF_EVGStencil *p, EVGRasterCtx *rctx, EVG_Span *span, s32 y)
+{
+	void *res = evg_fill_run(p, rctx, span, y);
+	u8 *mask = rctx->surf->internal_mask + y*rctx->surf->width + span->x;
+	u32 i;
+	if (rctx->surf->not_8bits) {
+		u64 *wcols = res;
+		for (i=0; i<span->len; i++) {
+			*wcols = (*wcols & 0x0000FFFFFFFFFFFFUL) | (((u64) *mask)*256)<<48;
+			wcols++;
+			mask++;
+		}
+	} else {
+		u32 * cols = res;
+		for (i=0; i<span->len; i++) {
+			*cols = (*cols & 0x00FFFFFF) | ((u32)*mask)<<24;
+			cols++;
+			mask++;
+		}
+	}
+	return res;
+}
+void *evg_fill_run_mask_inv(GF_EVGStencil *p, EVGRasterCtx *rctx, EVG_Span *span, s32 y)
+{
+	void *res = evg_fill_run(p, rctx, span, y);
+	u8 *mask = rctx->surf->internal_mask + y*rctx->surf->width + span->x;
+	u32 i;
+	if (rctx->surf->not_8bits) {
+		u64 *wcols = res;
+		for (i=0; i<span->len; i++) {
+			*wcols = (*wcols & 0x0000FFFFFFFFFFFFUL) | (((u64) (0xFF- *mask))*256)<<48;
+			wcols++;
+			mask++;
+		}
+	} else {
+		u32 * cols = res;
+		for (i=0; i<span->len; i++) {
+			*cols = (*cols & 0x00FFFFFF) | ((u32) (0xFF- *mask) )<<24;
+			cols++;
+			mask++;
+		}
+	}
+	return res;
+}
+
+void evg_fill_span_mask(int y, int count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx)
+{
+	EVG_Span aspan, *ospan;
+	int i;
+	aspan.idx1 = aspan.idx2 = 0;
+
+	//disable yuv flush for 420 and 422
+	rctx->no_yuv_flush = 1;
+	for (i=0; i<count; i++) {
+		u32 len, o_x;
+		ospan = &spans[i];
+
+		o_x = ospan->x;
+		len = ospan->len;
+		aspan.len = 0;
+		u8 *mask = surf->internal_mask + surf->width * y + o_x;
+		while (len) {
+			u32 mv = *mask;
+
+			if (mv) {
+				if (!aspan.len) {
+					aspan.x = o_x;
+					aspan.coverage = ospan->coverage;
+					aspan.odd_flag = ospan->odd_flag;
+				}
+				aspan.len++;
+				if (mv == 0xFF)
+					*mask = 0xFF - aspan.coverage;
+				else {
+					*mask = 0;
+					aspan.coverage = 0xFF;
+				}
+			} else if (aspan.len) {
+				surf->fill_spans(y, 1, &aspan, surf, rctx);
+				aspan.len = 0;
+			}
+			mask++;
+			o_x++;
+			len--;
+		}
+		//flush
+		if (aspan.len) {
+			//last span, enable yuv flush for 420 and 422
+			//we can do it now because we know we get called only once per y for YUV 420/422
+			if (i+1==count)
+				rctx->no_yuv_flush = 0;
+
+			surf->fill_spans(y, 1, &aspan, surf, rctx);
+		}
+	}
+}
+
+
+#define mix_run_func(_type, _val, _shift, _R, _G, _B, _ARGB) \
+	u32 r1, g1, b1, r2, g2, b2; \
+	u32 mix = rctx->surf->mix_val; \
+	u32 imix = _val - mix; \
+	u32 i=0; \
+	_type col1, col2, *col1p = rctx->stencil_pix_run, *col2p = rctx->stencil_pix_run2; \
+	if (!mix) return; \
+	if (!imix) return;\
+	\
+	while (i<count) { \
+		col1 = col1p[i]; \
+		col2 = col2p[i]; \
+		r1 = _R(col1); \
+		g1 = _G(col1); \
+		b1 = _B(col1); \
+		r2 = _R(col2); \
+		g2 = _G(col2); \
+		b2 = _B(col2); \
+		r1 = (r1 * imix + r2 * mix) >> _shift; \
+		g1 = (g1 * imix + g2 * mix) >> _shift; \
+		b1 = (b1 * imix + b2 * mix) >> _shift; \
+		col1p[i] = _ARGB(_val, r1, g1, b1); \
+		i++; \
+	} \
+
+static void mix_run(EVGRasterCtx *rctx, u32 count)
+{
+	mix_run_func(u32, 0xFF, 8, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+
+static void mix_run_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mix_run_func(u64, 0xFFFF, 16, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+
+
+#define mixa_run_func(_type, _val, _shift, _A, _R, _G, _B, _ARGB) \
+	u32 a1, r1, g1, b1, a2, r2, g2, b2; \
+	u32 mix = rctx->surf->mix_val; \
+	u32 imix = _val - mix; \
+	u32 i=0; \
+	_type col1, col2, *col1p = rctx->stencil_pix_run, *col2p = rctx->stencil_pix_run2; \
+	if (!mix) return; \
+	if (!imix) return; \
+ \
+	while (i<count) { \
+		col1 = col1p[i]; \
+		col2 = col2p[i]; \
+		a1 = _A(col1); \
+		r1 = _R(col1); \
+		g1 = _G(col1); \
+		b1 = _B(col1); \
+		a2 = _A(col2); \
+		r2 = _R(col2); \
+		g2 = _G(col2); \
+		b2 = _B(col2); \
+		a1 = (a1 * imix + a2 * mix) >> _shift; \
+		r1 = (r1 * imix + r2 * mix) >> _shift; \
+		g1 = (g1 * imix + g2 * mix) >> _shift; \
+		b1 = (b1 * imix + b2 * mix) >> _shift; \
+		col1p[i] = _ARGB(a1, r1, g1, b1); \
+		i++; \
+	} \
+
+static void mixa_run(EVGRasterCtx *rctx, u32 count)
+{
+	mixa_run_func(u32, 0xFF, 8, GF_COL_A, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+
+static void mixa_run_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mixa_run_func(u64, 0xFFFF, 16, GF_COLW_A, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+
+
+#define repa_run_func(_type, _shift, _mask, _A) \
+	u32 i=0; \
+	_type a2, col1, col2, *col1p = rctx->stencil_pix_run, *col2p = rctx->stencil_pix_run2; \
+ \
+	while (i<count) { \
+		col1 = col1p[i]; \
+		col2 = col2p[i]; \
+		a2 = _A(col2);\
+		col1p[i] = (a2<<_shift) | (col1 & _mask);\
+		i++; \
+	} \
+
+static void replace_alpha_run_a(EVGRasterCtx *rctx, u32 count)
+{
+	repa_run_func(u32, 24, 0x00FFFFFF, GF_COL_A)
+}
+static void replace_alpha_run_a_wide(EVGRasterCtx *rctx, u32 count)
+{
+	repa_run_func(u64, 56, 0x0000FFFFFFFFFFFFUL, GF_COLW_A)
+}
+static void replace_alpha_run_r(EVGRasterCtx *rctx, u32 count)
+{
+	repa_run_func(u32, 24, 0x00FFFFFF, GF_COL_R)
+}
+static void replace_alpha_run_r_wide(EVGRasterCtx *rctx, u32 count)
+{
+	repa_run_func(u64, 56, 0x0000FFFFFFFFFFFFUL, GF_COLW_R)
+}
+static void replace_alpha_run_g(EVGRasterCtx *rctx, u32 count)
+{
+	repa_run_func(u32, 24, 0x00FFFFFF, GF_COL_G)
+}
+static void replace_alpha_run_g_wide(EVGRasterCtx *rctx, u32 count)
+{
+	repa_run_func(u64, 56, 0x0000FFFFFFFFFFFFUL, GF_COLW_G)
+}
+static void replace_alpha_run_b(EVGRasterCtx *rctx, u32 count)
+{
+	repa_run_func(u32, 24, 0x00FFFFFF, GF_COL_B)
+}
+static void replace_alpha_run_b_wide(EVGRasterCtx *rctx, u32 count)
+{
+	repa_run_func(u64, 56, 0x0000FFFFFFFFFFFFUL, GF_COLW_B)
+}
+
+
+#define repa_m1_run_func(_type, _val, _shift, _mask, _A) \
+	u32 i=0; \
+	_type a2, col1, col2, *col1p = rctx->stencil_pix_run, *col2p = rctx->stencil_pix_run2; \
+ \
+	while (i<count) { \
+		col1 = col1p[i]; \
+		col2 = col2p[i]; \
+		a2 = _val - _A(col2);\
+		col1p[i] = (a2<<_shift) | (col1 & _mask);\
+		i++; \
+	} \
+
+static void replace_alpha_m1_run_a(EVGRasterCtx *rctx, u32 count)
+{
+	repa_m1_run_func(u32, 0xFF, 24, 0x00FFFFFF, GF_COL_A)
+}
+static void replace_alpha_m1_run_a_wide(EVGRasterCtx *rctx, u32 count)
+{
+	repa_m1_run_func(u64, 0xFFFF, 56, 0x0000FFFFFFFFFFFFUL, GF_COLW_A)
+}
+static void replace_alpha_m1_run_r(EVGRasterCtx *rctx, u32 count)
+{
+	repa_m1_run_func(u32, 0xFF, 24, 0x00FFFFFF, GF_COL_R)
+}
+static void replace_alpha_m1_run_r_wide(EVGRasterCtx *rctx, u32 count)
+{
+	repa_m1_run_func(u64, 0xFFFF, 56, 0x0000FFFFFFFFFFFFUL, GF_COLW_R)
+}
+static void replace_alpha_m1_run_g(EVGRasterCtx *rctx, u32 count)
+{
+	repa_m1_run_func(u32, 0xFF, 24, 0x00FFFFFF, GF_COL_G)
+}
+static void replace_alpha_m1_run_g_wide(EVGRasterCtx *rctx, u32 count)
+{
+	repa_m1_run_func(u64, 0xFFFF, 56, 0x0000FFFFFFFFFFFFUL, GF_COLW_G)
+}
+static void replace_alpha_m1_run_b(EVGRasterCtx *rctx, u32 count)
+{
+	repa_m1_run_func(u32, 0xFF, 24, 0x00FFFFFF, GF_COL_B)
+}
+static void replace_alpha_m1_run_b_wide(EVGRasterCtx *rctx, u32 count)
+{
+	repa_m1_run_func(u64, 0xFFFF, 56, 0x0000FFFFFFFFFFFFUL, GF_COLW_B)
+}
+
+
+#define mix_dyn_run_func(_type, _val, _shift, _A, _R, _G, _B, _ARGB) \
+	u32 r1, g1, b1, r2, g2, b2; \
+	u32 i=0; \
+	_type col1, col2, *col1p = rctx->stencil_pix_run, *col2p = rctx->stencil_pix_run2, *col3p = rctx->stencil_pix_run3; \
+ \
+	while (i<count) { \
+		u32 mix = _A(col3p[i]); \
+		u32 imix = _val - mix; \
+		col1 = col1p[i]; \
+		col2 = col2p[i]; \
+		r1 = _R(col1); \
+		g1 = _G(col1); \
+		b1 = _B(col1); \
+		r2 = _R(col2); \
+		g2 = _G(col2); \
+		b2 = _B(col2); \
+		r1 = (r1 * imix + r2 * mix) >> _shift; \
+		g1 = (g1 * imix + g2 * mix) >> _shift; \
+		b1 = (b1 * imix + b2 * mix) >> _shift; \
+		col1p[i] = _ARGB(_val, r1, g1, b1); \
+		i++; \
+	} \
+
+static void mix_dyn_run_a(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyn_run_func(u32, 0xFF, 8, GF_COL_A, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+
+static void mix_dyn_run_a_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyn_run_func(u64, 0xFFFF, 16, GF_COLW_A, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+
+static void mix_dyn_run_r(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyn_run_func(u32, 0xFF, 8, GF_COL_R, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+
+static void mix_dyn_run_r_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyn_run_func(u64, 0xFFFF, 16, GF_COLW_R, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+
+static void mix_dyn_run_g(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyn_run_func(u32, 0xFF, 8, GF_COL_G, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+
+static void mix_dyn_run_g_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyn_run_func(u64, 0xFFFF, 16, GF_COLW_G, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+static void mix_dyn_run_b(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyn_run_func(u32, 0xFF, 8, GF_COL_B, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+
+static void mix_dyn_run_b_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyn_run_func(u64, 0xFFFF, 16, GF_COLW_B, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+
+
+#define mix_dyna_run_func(_type, _val, _shift, _A, _R, _G, _B, _ARGB) \
+	u32 a1, r1, g1, b1, a2, r2, g2, b2; \
+	u32 i=0; \
+	_type col1, col2, *col1p = rctx->stencil_pix_run, *col2p = rctx->stencil_pix_run2, *col3p = rctx->stencil_pix_run3; \
+ \
+	while (i<count) { \
+		u32 mix = _A(col3p[i]); \
+		u32 imix = _val - mix; \
+		col1 = col1p[i]; \
+		col2 = col2p[i]; \
+		a1 = _A(col1); \
+		r1 = _R(col1); \
+		g1 = _G(col1); \
+		b1 = _B(col1); \
+		a2 = _A(col2); \
+		r2 = _R(col2); \
+		g2 = _G(col2); \
+		b2 = _B(col2); \
+		a1 = (a1 * imix + a2 * mix) >> _shift; \
+		r1 = (r1 * imix + r2 * mix) >> _shift; \
+		g1 = (g1 * imix + g2 * mix) >> _shift; \
+		b1 = (b1 * imix + b2 * mix) >> _shift; \
+		col1p[i] = _ARGB(a1, r1, g1, b1); \
+		i++; \
+	} \
+
+static void mix_dyna_run_a(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyna_run_func(u32, 0xFF, 8, GF_COL_A, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+static void mix_dyna_run_a_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyna_run_func(u64, 0xFFFF, 16, GF_COLW_A, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+static void mix_dyna_run_r(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyna_run_func(u32, 0xFF, 8, GF_COL_R, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+static void mix_dyna_run_r_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyna_run_func(u64, 0xFFFF, 16, GF_COLW_R, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+static void mix_dyna_run_g(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyna_run_func(u32, 0xFF, 8, GF_COL_G, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+static void mix_dyna_run_g_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyna_run_func(u64, 0xFFFF, 16, GF_COLW_G, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+static void mix_dyna_run_b(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyna_run_func(u32, 0xFF, 8, GF_COL_B, GF_COL_R, GF_COL_G, GF_COL_B, GF_COL_ARGB)
+}
+static void mix_dyna_run_b_wide(EVGRasterCtx *rctx, u32 count)
+{
+	mix_dyna_run_func(u64, 0xFFFF, 16, GF_COLW_B, GF_COLW_R, GF_COLW_G, GF_COLW_B, GF_COLW_ARGB)
+}
+
+
+GF_Err gf_evg_setup_multi_texture(GF_EVGSurface *surf, GF_EVGMultiTextureMode operand, GF_EVGStencil *sten2, GF_EVGStencil *sten3, Float *params)
+{
+	u32 i;
+	Float param1 = params ? params[0] : 0;
+	surf->sten2 = surf->sten3 = NULL;
+	surf->odd_fill = 0;
+
+	switch (operand) {
+	case GF_EVG_OPERAND_MIX:
+		if (!sten2 || !params) return GF_BAD_PARAM;
+		surf->sten2 = sten2;
+		if (surf->not_8bits) {
+			surf->mix_val = (u32) (params[0] * 0xFFFF);
+			surf->update_run = mix_run_wide;
+			if (!surf->mix_val) surf->sten2 = NULL;
+			else if (surf->mix_val==0xFFFF) {
+				surf->sten2 = NULL;
+				surf->sten = sten2;
+			}
+		} else {
+			surf->mix_val = (u32) (params[0] * 255);
+			surf->update_run = mix_run;
+			if (!surf->mix_val) surf->sten2 = NULL;
+			else if (surf->mix_val==0xFF) {
+				surf->sten2 = NULL;
+				surf->sten = sten2;
+			}
+		}
+		break;
+	case GF_EVG_OPERAND_MIX_ALPHA:
+		if (!sten2 || !params) return GF_BAD_PARAM;
+		surf->sten2 = sten2;
+		if (surf->not_8bits) {
+			surf->mix_val = (u32) (params[0] * 0xFFFF);
+			surf->update_run = mixa_run_wide;
+			if (!surf->mix_val) surf->sten2 = NULL;
+			else if (surf->mix_val==0xFFFF) {
+				surf->sten2 = NULL;
+				surf->sten = sten2;
+			}
+		} else {
+			surf->mix_val = (u32) (params[0] * 255);
+			surf->update_run = mixa_run;
+			if (!surf->mix_val) surf->sten2 = NULL;
+			else if (surf->mix_val==0xFF) {
+				surf->sten2 = NULL;
+				surf->sten = sten2;
+			}
+		}
+		break;
+	case GF_EVG_OPERAND_REPLACE_ALPHA:
+		if (!sten2) return GF_BAD_PARAM;
+		if (param1>=3)
+			surf->update_run = surf->not_8bits ? replace_alpha_run_b_wide : replace_alpha_run_b;
+		else if (param1>=2)
+			surf->update_run = surf->not_8bits ? replace_alpha_run_g_wide : replace_alpha_run_g;
+		else if (param1>=1)
+			surf->update_run = surf->not_8bits ? replace_alpha_run_r_wide : replace_alpha_run_r;
+		else
+			surf->update_run = surf->not_8bits ? replace_alpha_run_a_wide : replace_alpha_run_a;
+		surf->sten2 = sten2;
+		break;
+	case GF_EVG_OPERAND_REPLACE_ONE_MINUS_ALPHA:
+		if (!sten2) return GF_BAD_PARAM;
+		if (param1>=3)
+			surf->update_run = surf->not_8bits ? replace_alpha_m1_run_b_wide : replace_alpha_m1_run_b;
+		else if (param1>=2)
+			surf->update_run = surf->not_8bits ? replace_alpha_m1_run_g_wide : replace_alpha_m1_run_g;
+		else if (param1>=1)
+			surf->update_run = surf->not_8bits ? replace_alpha_m1_run_r_wide : replace_alpha_m1_run_r;
+		else
+			surf->update_run = surf->not_8bits ? replace_alpha_m1_run_a_wide : replace_alpha_m1_run_a;
+		surf->sten2 = sten2;
+		break;
+	case GF_EVG_OPERAND_MIX_DYN:
+		if (!sten2 || !sten3) return GF_BAD_PARAM;
+		if (param1>=3)
+			surf->update_run = surf->not_8bits ? mix_dyn_run_b_wide : mix_dyn_run_b;
+		else if (param1>=2)
+			surf->update_run = surf->not_8bits ? mix_dyn_run_g_wide : mix_dyn_run_g;
+		else if (param1>=1)
+			surf->update_run = surf->not_8bits ? mix_dyn_run_r_wide : mix_dyn_run_r;
+		else
+			surf->update_run = surf->not_8bits ? mix_dyn_run_a_wide : mix_dyn_run_a;
+		surf->sten2 = sten2;
+		surf->sten3 = sten3;
+		break;
+	case GF_EVG_OPERAND_MIX_DYN_ALPHA:
+		if (!sten2 || !sten3 || !params) return GF_BAD_PARAM;
+		if (param1>=3)
+			surf->update_run = surf->not_8bits ? mix_dyna_run_b_wide : mix_dyna_run_b;
+		else if (param1>=2)
+			surf->update_run = surf->not_8bits ? mix_dyna_run_g_wide : mix_dyna_run_g;
+		else if (param1>=1)
+			surf->update_run = surf->not_8bits ? mix_dyna_run_r_wide : mix_dyna_run_r;
+		else
+			surf->update_run = surf->not_8bits ? mix_dyna_run_a_wide : mix_dyna_run_a;
+
+		surf->sten2 = sten2;
+		surf->sten3 = sten3;
+		break;
+	case GF_EVG_OPERAND_ODD_FILL:
+		if (!sten2) return GF_BAD_PARAM;
+		surf->sten2 = sten2;
+		surf->odd_fill = 1;
+		break;
+
+	default:
+		return GF_BAD_PARAM;
+	}
+
+
+	surf->run_size = sizeof(u32) * (surf->width+2);
+	if (surf->not_8bits) surf->run_size *= 2;
+
+	if (surf->sten2 && !surf->raster_ctx.stencil_pix_run2) {
+		surf->raster_ctx.stencil_pix_run2 = gf_malloc(sizeof(u8) * surf->run_size);
+		if (!surf->raster_ctx.stencil_pix_run2) return GF_OUT_OF_MEM;
+	}
+	if (surf->sten3 && !surf->raster_ctx.stencil_pix_run3) {
+		surf->raster_ctx.stencil_pix_run3 = gf_malloc(sizeof(u8) * surf->run_size);
+		if (!surf->raster_ctx.stencil_pix_run3) return GF_OUT_OF_MEM;
+	}
+
+	for (i=0; i<surf->nb_threads; i++) {
+		EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+		if (surf->sten2 && !rctx->stencil_pix_run2) {
+			rctx->stencil_pix_run2 = gf_malloc(sizeof(u8) * surf->run_size);
+			if (!rctx->stencil_pix_run2) return GF_OUT_OF_MEM;
+		}
+		if (surf->sten3 && !rctx->stencil_pix_run3) {
+			rctx->stencil_pix_run3 = gf_malloc(sizeof(u8) * surf->run_size);
+			if (!rctx->stencil_pix_run3) return GF_OUT_OF_MEM;
+		}
+	}
+	return GF_OK;
 }

gpac-1.0.1.tar.gz/src/evg/surface.c -> gpac-2.0.0.tar.gz/src/evg/surface.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / software 2D rasterizer module
@@ -36,16 +36,40 @@
 	}
 }
 
+
+static GF_Err evg_raster_ctx_init(EVGRasterCtx *raster_ctx, GF_EVGSurface *surf)
+{
+	raster_ctx->max_gray_spans = raster_ctx->alloc_gray_spans = FT_MAX_GRAY_SPANS;
+	raster_ctx->gray_spans = gf_malloc(sizeof(EVG_Span)* raster_ctx->max_gray_spans);
+	if (!raster_ctx->gray_spans) return GF_OUT_OF_MEM;
+	raster_ctx->surf = surf;
+	return GF_OK;
+}
+
+static void evg_raster_ctx_uninit(EVGRasterCtx *raster_ctx)
+{
+	if (raster_ctx->gray_spans) gf_free(raster_ctx->gray_spans);
+	if (raster_ctx->stencil_pix_run) gf_free(raster_ctx->stencil_pix_run);
+	if (raster_ctx->stencil_pix_run2) gf_free(raster_ctx->stencil_pix_run2);
+	if (raster_ctx->stencil_pix_run3) gf_free(raster_ctx->stencil_pix_run3);
+	if (raster_ctx->uv_alpha) gf_free(raster_ctx->uv_alpha);
+}
+
 GF_EXPORT
 GF_EVGSurface *gf_evg_surface_new(Bool center_coords)
 {
+	GF_Err e;
 	GF_EVGSurface *surf;
 	GF_SAFEALLOC(surf, GF_EVGSurface);
-	if (surf) {
-		surf->center_coords = center_coords;
-		surf->texture_filter = GF_TEXTURE_FILTER_DEFAULT;
-		surf->raster = evg_raster_new();
-		surf->yuv_prof=1;
+	if (!surf) return NULL;
+
+	surf->center_coords = center_coords;
+	surf->qlevel = GF_RASTER_HIGH_QUALITY;
+	surf->yuv_prof = 1;
+	e = evg_raster_ctx_init(&surf->raster_ctx, surf);
+	if (e) {
+		gf_free(surf);
+		return NULL;
 	}
 	return surf;
 }
@@ -53,24 +77,78 @@
 EVG_Surface3DExt *evg_init_3d_surface(GF_EVGSurface *surf);
 
 GF_EXPORT
-GF_EVGSurface *gf_evg_surface3d_new()
+GF_Err gf_evg_surface_enable_3d(GF_EVGSurface *surf)
 {
-	GF_EVGSurface *surf;
-	GF_SAFEALLOC(surf, GF_EVGSurface);
-	if (surf) {
-		surf->texture_filter = GF_TEXTURE_FILTER_DEFAULT;
-		surf->raster = evg_raster_new();
-		surf->yuv_prof=1;
-
-		surf->ext3d = evg_init_3d_surface(surf);
-		if (!surf->ext3d) {
-			gf_free(surf);
-			return NULL;
+	if (!surf) return GF_BAD_PARAM;
+	if (surf->ext3d) return GF_OK;
+	surf->ext3d = evg_init_3d_surface(surf);
+	if (!surf->ext3d) return GF_OUT_OF_MEM;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_evg_enable_threading(GF_EVGSurface *surf, s32 nb_threads)
+{
+	u32 i, run_size;
+	char szName[100];
+	if (!surf || surf->nb_threads) return GF_BAD_PARAM;
+
+	if (nb_threads<0) {
+		GF_SystemRTInfo rti;
+		gf_sys_get_rti(0, &rti, 0);
+		if (rti.nb_cores<2) return GF_IO_ERR;
+		nb_threads = rti.nb_cores-1;
+	}
+	surf->nb_threads = (u32) nb_threads;
+	if (!surf->nb_threads) return GF_OK;
+	surf->th_raster_ctx = gf_malloc(sizeof(EVGRasterCtx) * surf->nb_threads);
+	sprintf(szName, "EVGMX%p", surf);
+	surf->raster_mutex = gf_mx_new(szName);
+
+	if (!surf->th_raster_ctx || !surf->raster_mutex) {
+		surf->nb_threads = 0;
+		return GF_OUT_OF_MEM;
+	}
+	run_size = surf->width ? (sizeof(u32) * (surf->width+2)) : 0;
+	if (surf->width && surf->not_8bits) run_size *= 2;
+
+
+	memset(surf->th_raster_ctx, 0, sizeof(EVGRasterCtx) * surf->nb_threads);
+	for (i=0; i<surf->nb_threads; i++) {
+		EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+		sprintf(szName, "gf_evg_%d", i+1);
+		rctx->th = gf_th_new(szName);
+		if (!rctx->th) {
+			surf->nb_threads = i;
+			break;
 		}
+		rctx->surf = surf;
+		rctx->max_gray_spans = rctx->alloc_gray_spans = FT_MAX_GRAY_SPANS;
+		rctx->gray_spans = gf_malloc(sizeof(EVG_Span) * rctx->max_gray_spans);
+
+		if (run_size) {
+			rctx->stencil_pix_run = gf_realloc(rctx->stencil_pix_run, run_size);
+		}
+		
+		if (!rctx->gray_spans || !rctx->stencil_pix_run) {
+			surf->nb_threads = i;
+			break;
+		}
+		rctx->th_state = 1;
 	}
-	return surf;
+	surf->raster_sem = gf_sema_new(surf->nb_threads, 0);
+	if (!surf->raster_sem)
+		surf->nb_threads = 0;
+
+	//launch all threads
+	for (i=0; i<surf->nb_threads; i++) {
+		EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+		gf_th_run(rctx->th, th_sweep_lines, rctx);
+	}
+	return GF_OK;
 }
 
+
 GF_EXPORT
 void gf_evg_surface_set_center_coords(GF_EVGSurface *surf, Bool center_coords)
 {
@@ -80,19 +158,44 @@
 GF_EXPORT
 void gf_evg_surface_delete(GF_EVGSurface *surf)
 {
+	u32 i;
 	if (!surf)
 		return;
-	if (surf->stencil_pix_run) gf_free(surf->stencil_pix_run);
-	surf->stencil_pix_run = NULL;
-	if (surf->raster) evg_raster_del(surf->raster);
-	surf->raster = NULL;
-	if (surf->uv_alpha) gf_free(surf->uv_alpha);
+
+	for (i=0; i<surf->max_lines; i++) {
+		gf_free(surf->scanlines[i].cells);
+		if (surf->scanlines[i].pixels)
+			gf_free(surf->scanlines[i].pixels);
+	}
+	gf_free(surf->scanlines);
+
+	if (surf->internal_mask) gf_free(surf->internal_mask);
+
+	evg_raster_ctx_uninit(&surf->raster_ctx);
 
 	if (surf->ext3d) {
-		if (surf->ext3d->pix_vals)
-			gf_free(surf->ext3d->pix_vals);
 		gf_free(surf->ext3d);
 	}
+	if (surf->nb_threads) {
+		for (i=0; i<surf->nb_threads; i++) {
+			EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+			rctx->th_state = 0;
+		}
+		gf_sema_notify(surf->raster_sem, surf->nb_threads);
+
+		for (i=0; i<surf->nb_threads; i++) {
+			EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+			//wait for destruction
+			while (!rctx->th_state) {
+				gf_sleep(0);
+			}
+			gf_th_del(surf->th_raster_ctx[i].th);
+			evg_raster_ctx_uninit(&surf->th_raster_ctx[i]);
+		}
+		gf_free(surf->th_raster_ctx);
+		gf_mx_del(surf->raster_mutex);
+		gf_sema_del(surf->raster_sem);
+	}
 	gf_free(surf);
 }
 
@@ -109,6 +212,8 @@
 	gf_mx2d_add_matrix(&tmp, mat);
 	gf_mx2d_add_matrix(&tmp, &surf->mat);
 	gf_mx2d_copy(surf->mat, tmp);
+	gf_mx2d_copy(surf->shader_mx, *mat);
+
 	return GF_OK;
 }
 
@@ -164,6 +269,7 @@
 		surf->idx_b=3;
 		break;
 	case GF_PIXEL_RGBA:
+	case GF_PIXEL_YUVA444_PACK:
 		surf->idx_a=3;
 		surf->idx_r=0;
 		surf->idx_g=1;
@@ -218,9 +324,6 @@
 	}
 }
 
-GF_Err evg_3d_resize(GF_EVGSurface *surf);
-
-
 GF_EXPORT
 GF_Err gf_evg_surface_attach_to_buffer(GF_EVGSurface *surf, u8 *pixels, u32 width, u32 height, s32 pitch_x, s32 pitch_y, GF_PixelFormat pixelFormat)
 {
@@ -260,6 +363,7 @@
 		BPP = 3;
 		break;
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 	case GF_PIXEL_NV12:
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_YUV422:
@@ -278,17 +382,46 @@
 		BPP = 2;
 		surf->not_8bits = GF_TRUE;
 		break;
+	case GF_PIXEL_YUVA444_PACK:
+		surf->is_transparent = GF_TRUE;
+		BPP = 4;
+		break;
 	default:
 		return GF_NOT_SUPPORTED;
 	}
 	if (!pitch_x) pitch_x = BPP;
 	surf->pitch_x = pitch_x;
 	surf->pitch_y = pitch_y;
-	if (!surf->stencil_pix_run || (surf->width != width)) {
+	if (!surf->raster_ctx.stencil_pix_run || (surf->width != width)) {
+		u32 i;
 		u32 run_size = sizeof(u32) * (width+2);
 		if (surf->not_8bits) run_size *= 2;
-		if (surf->stencil_pix_run) gf_free(surf->stencil_pix_run);
-		surf->stencil_pix_run = (u32 *) gf_malloc(run_size);
+		surf->raster_ctx.stencil_pix_run = gf_realloc(surf->raster_ctx.stencil_pix_run, run_size);
+		if (!surf->raster_ctx.stencil_pix_run) return GF_OUT_OF_MEM;
+
+		if (surf->raster_ctx.stencil_pix_run2) {
+			surf->raster_ctx.stencil_pix_run2 = gf_realloc(surf->raster_ctx.stencil_pix_run2, run_size);
+			if (!surf->raster_ctx.stencil_pix_run2) return GF_OUT_OF_MEM;
+		}
+		if (surf->raster_ctx.stencil_pix_run3) {
+			surf->raster_ctx.stencil_pix_run3 = gf_realloc(surf->raster_ctx.stencil_pix_run3, run_size);
+			if (!surf->raster_ctx.stencil_pix_run3) return GF_OUT_OF_MEM;
+		}
+
+		for (i=0; i<surf->nb_threads; i++) {
+			EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+			rctx->stencil_pix_run = gf_realloc(rctx->stencil_pix_run, run_size);
+			if (!rctx->stencil_pix_run) return GF_OUT_OF_MEM;
+
+			if (rctx->stencil_pix_run2) {
+				rctx->stencil_pix_run2 = gf_realloc(rctx->stencil_pix_run2, run_size);
+				if (!rctx->stencil_pix_run2) return GF_OUT_OF_MEM;
+			}
+			if (rctx->stencil_pix_run3) {
+				rctx->stencil_pix_run3 = gf_realloc(rctx->stencil_pix_run3, run_size);
+				if (!rctx->stencil_pix_run3) return GF_OUT_OF_MEM;
+			}
+		}
 	}
 	if (surf->width != width) {
 		surf->width = width;
@@ -303,8 +436,21 @@
 	surf->BPP = BPP;
 	evg_surface_set_components_idx(surf);
 	gf_evg_surface_set_matrix(surf, NULL);
-	if (surf->ext3d && size_changed)
-		evg_3d_resize(surf);
+
+	if (size_changed && surf->internal_mask) {
+		gf_free(surf->internal_mask);
+		surf->internal_mask = NULL;
+	}
+	if (surf->ext3d && size_changed) {
+		surf->ext3d->depth_buffer = NULL;
+
+		if (!surf->vp_w || !surf->vp_h) {
+			surf->vp_x = 0;
+			surf->vp_y = 0;
+			surf->vp_w = surf->width;
+			surf->vp_h = surf->height;
+		}
+	}
 	return GF_OK;
 }
 
@@ -319,6 +465,7 @@
 }
 
 
+
 GF_EXPORT
 GF_Err gf_evg_surface_clear(GF_EVGSurface *surf, GF_IRect *rc, u32 color)
 {
@@ -404,6 +551,7 @@
 
 	/*YUV formats*/
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 		return evg_surface_clear_yuv420p(surf, clear, color);
 	case GF_PIXEL_YUV422:
 		return evg_surface_clear_yuv422p(surf, clear, color);
@@ -428,6 +576,9 @@
 		return evg_surface_clear_yuv422p_10(surf, clear, color);
 	case GF_PIXEL_YUV444_10:
 		return evg_surface_clear_yuv444p_10(surf, clear, color);
+
+	case GF_PIXEL_YUVA444_PACK:
+		return evg_surface_clear_argb(surf, clear, gf_evg_argb_to_ayuv(surf, color) );
 	default:
 		return GF_BAD_PARAM;
 	}
@@ -437,18 +588,21 @@
 GF_Err gf_evg_surface_set_raster_level(GF_EVGSurface *surf, GF_RasterQuality RasterSetting)
 {
 	if (!surf) return GF_BAD_PARAM;
-	switch (RasterSetting) {
-	case GF_RASTER_HIGH_QUALITY:
-		surf->texture_filter = GF_TEXTURE_FILTER_HIGH_QUALITY;
-		break;
-	case GF_RASTER_MID:
-		surf->texture_filter = GF_TEXTURE_FILTER_HIGH_QUALITY;
-		break;
-	case GF_RASTER_HIGH_SPEED:
-	default:
-		surf->texture_filter = GF_TEXTURE_FILTER_HIGH_SPEED;
-		break;
-	}
+	surf->qlevel = RasterSetting;
+	return GF_OK;
+}
+GF_EXPORT
+GF_RasterQuality gf_evg_surface_get_raster_level(GF_EVGSurface *surf)
+{
+	if (!surf) return GF_RASTER_HIGH_QUALITY;
+	return surf->qlevel;
+}
+
+GF_EXPORT
+GF_Err gf_evg_surface_force_aa(GF_EVGSurface *surf)
+{
+	if (!surf) return GF_BAD_PARAM;
+	surf->aa_level = 0xFF;
 	return GF_OK;
 }
 
@@ -490,24 +644,75 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+Bool gf_evg_surface_use_clipper(GF_EVGSurface *surf)
+{
+	if (!surf) return 0;
+	return surf->useClipper ? GF_TRUE : GF_FALSE;
+}
 
-static Bool setup_grey_callback(GF_EVGSurface *surf, Bool for_3d)
+static Bool setup_grey_callback(GF_EVGSurface *surf, Bool for_3d, Bool multi_sten)
 {
 	u32 a, uv_alpha_size=0;
 	Bool use_const = GF_TRUE;
 
+	//default fill_run callback
+	surf->fill_run = evg_fill_run;
+
+	//mask mode draw,
+	if (surf->mask_mode == GF_EVGMASK_DRAW) {
+		if (surf->sten && (surf->sten->type == GF_STENCIL_SOLID)) {
+			EVG_Brush *sc = (EVG_Brush *)surf->sten;
+			u32 col = sc->color;
+			if (sc->alpha < 0xFF) {
+				u32 ca = ((u32) (GF_COL_A(col) + 1) * sc->alpha) >> 8;
+				col = ( ((ca<<24) & 0xFF000000) ) | (col & 0x00FFFFFF);
+			}
+			surf->fill_col = col;
+			surf->fill_col_wide = evg_col_to_wide(surf->fill_col);
+			if (GF_COL_A(col)<0xFF)
+				surf->fill_spans = (EVG_SpanFunc) evg_grey_fill_const_a;
+			else
+				surf->fill_spans = (EVG_SpanFunc) evg_grey_fill_const;
+		} else {
+			surf->fill_spans = (EVG_SpanFunc) evg_grey_fill_var;
+		}
+		if (surf->ext3d) {
+			surf->fill_single = evg_grey_fill_single;
+			surf->fill_single_a = evg_grey_fill_single_a;
+		}
+		return GF_TRUE;
+	}
+
 	//in 3D mode, we only write one pixel at a time except in YUV modes
 	if (for_3d) {
 		a = 1;
 		use_const = GF_TRUE;
 	}
-	else if (surf->sten->type == GF_STENCIL_SOLID) {
-		surf->fill_col = ((EVG_Brush *)surf->sten)->color;
+	else if (!multi_sten && surf->sten && (surf->sten->type == GF_STENCIL_SOLID)) {
+		EVG_Brush *sc = (EVG_Brush *)surf->sten;
+		u32 col = sc->color;
+		if (sc->alpha < 0xFF) {
+			u32 ca = ((u32) (GF_COL_A(col) + 1) * sc->alpha) >> 8;
+			col = ( ((ca<<24) & 0xFF000000) ) | (col & 0x00FFFFFF);
+		}
+		surf->fill_col = col;
 		a = GF_COL_A(surf->fill_col);
 	} else {
 		a = 0;
 		use_const = GF_FALSE;
 	}
+	//mask is used, force fill with variable alpha (xxx_fill_var) and use masking callback for fill_run
+	if ((surf->mask_mode == GF_EVGMASK_USE) || (surf->mask_mode == GF_EVGMASK_RECORD) ){
+		a = 0;
+		use_const = GF_FALSE;
+		if (surf->mask_mode == GF_EVGMASK_USE)
+			surf->fill_run = evg_fill_run_mask;
+	} else if (surf->mask_mode == GF_EVGMASK_USE_INV) {
+		a = 0;
+		use_const = GF_FALSE;
+		surf->fill_run = evg_fill_run_mask_inv;
+	}
 
 	if (use_const && !a && !surf->is_transparent) return GF_FALSE;
 
@@ -515,6 +720,7 @@
 	surf->yuv_type = 0;
 	surf->swap_uv = GF_FALSE;
 	surf->yuv_flush_uv = NULL;
+	surf->direct_yuv_3d = GF_FALSE;
 
 	if (surf->comp_mode) a=100;
 	else if (surf->get_alpha) a=100;
@@ -525,12 +731,12 @@
 	case GF_PIXEL_GREYSCALE:
 		if (use_const) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_grey_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_grey_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_grey_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_grey_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_grey_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_grey_fill_var;
 		}
 		if (surf->ext3d) {
 			surf->fill_single = evg_grey_fill_single;
@@ -541,32 +747,34 @@
 	case GF_PIXEL_GREYALPHA:
 		if (use_const) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_alphagrey_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_alphagrey_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_alphagrey_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_alphagrey_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_alphagrey_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_alphagrey_fill_var;
 		}
 		if (surf->ext3d) {
 			surf->fill_single = evg_alphagrey_fill_single;
 			surf->fill_single_a = evg_alphagrey_fill_single_a;
 		}
 		break;
+	case GF_PIXEL_YUVA444_PACK:
+		surf->yuv_type = EVG_YUV;
 	case GF_PIXEL_ARGB:
 	case GF_PIXEL_RGBA:
 	case GF_PIXEL_BGRA:
 	case GF_PIXEL_ABGR:
 		if (use_const) {
 			if (!a) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_argb_fill_erase;
+				surf->fill_spans = (EVG_SpanFunc) evg_argb_fill_erase;
 			} else if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_argb_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_argb_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_argb_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_argb_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_argb_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_argb_fill_var;
 		}
 		if (surf->ext3d) {
 			surf->fill_single = evg_argb_fill_single;
@@ -580,12 +788,12 @@
 	case GF_PIXEL_XBGR:
 		if (use_const) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_rgbx_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_rgbx_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_rgbx_fill_var;
 		}
 		if (surf->ext3d) {
 			surf->fill_single = evg_rgbx_fill_single;
@@ -597,12 +805,12 @@
 	case GF_PIXEL_BGR:
 		if (use_const) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_rgb_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_rgb_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_rgb_fill_var;
 		}
 		if (surf->ext3d) {
 			surf->fill_single = evg_rgb_fill_single;
@@ -613,13 +821,12 @@
 	case GF_PIXEL_RGB_565:
 		if (use_const) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_565_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_565_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_565_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_565_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_565_fill_var;
-			assert(surf->sten->fill_run);
+			surf->fill_spans = (EVG_SpanFunc) evg_565_fill_var;
 		}
 		if (surf->ext3d) {
 			surf->fill_single = evg_565_fill_single;
@@ -629,12 +836,12 @@
 	case GF_PIXEL_RGB_444:
 		if (use_const) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_444_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_444_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_444_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_444_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_444_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_444_fill_var;
 		}
 		if (surf->ext3d) {
 			surf->fill_single = evg_444_fill_single;
@@ -644,35 +851,40 @@
 	case GF_PIXEL_RGB_555:
 		if (use_const) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_555_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_555_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_555_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_555_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_555_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_555_fill_var;
 		}
 		if (surf->ext3d) {
 			surf->fill_single = evg_555_fill_single;
 			surf->fill_single_a = evg_555_fill_single_a;
 		}
 		break;
+	case GF_PIXEL_YVU:
+		surf->swap_uv = GF_TRUE;
 	case GF_PIXEL_YUV:
 		surf->yuv_type = EVG_YUV;
 		if (use_const && !for_3d) {
 			surf->yuv_flush_uv = evg_yuv420p_flush_uv_const;
 
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_fill_const;
 			}
 			uv_alpha_size=2*surf->width;
 		} else {
 			surf->yuv_flush_uv = evg_yuv420p_flush_uv_var;
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_fill_var;
 			uv_alpha_size = 2 * 3*surf->width;
-			if (for_3d)
+			if (for_3d) {
 				surf->sten = &surf->ext3d->yuv_sten;
+				surf->direct_yuv_3d = GF_TRUE;
+			}
+
 		}
 		break;
 	case GF_PIXEL_NV21:
@@ -692,14 +904,14 @@
 			surf->yuv_flush_uv = evg_nv12_flush_uv_const;
 
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_fill_const;
 			}
 			uv_alpha_size = 2*surf->width;
 		} else {
 			surf->yuv_flush_uv = evg_nv12_flush_uv_var;
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_fill_var;
 			uv_alpha_size = 2 * 3*surf->width;
 		}
 		break;
@@ -710,14 +922,14 @@
 			surf->yuv_flush_uv = evg_yuv422p_flush_uv_const;
 
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_fill_const;
 			}
 			uv_alpha_size = 2*surf->width;
 		} else {
 			surf->yuv_flush_uv = evg_yuv422p_flush_uv_var;
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_fill_var;
 			uv_alpha_size = 2 * 3*surf->width;
 		}
 		break;
@@ -725,12 +937,12 @@
 		surf->yuv_type = EVG_YUV_444;
 		if (use_const) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv444p_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv444p_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_yuv444p_fill_var;
 		}
 		break;
 	case GF_PIXEL_YUYV:
@@ -740,13 +952,13 @@
 		surf->yuv_type = EVG_YUV;
 		if (use_const && !for_3d) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuyv_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuyv_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuyv_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuyv_fill_const;
 			}
 			uv_alpha_size = 2*surf->width;
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuyv_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_yuyv_fill_var;
 			uv_alpha_size = 2 * 3*surf->width;
 		}
 		break;
@@ -757,14 +969,14 @@
 			surf->yuv_flush_uv = evg_yuv420p_10_flush_uv_const;
 
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_10_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_10_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_10_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_10_fill_const;
 			}
 			uv_alpha_size = 4*surf->width;
 		} else {
 			surf->yuv_flush_uv = evg_yuv420p_10_flush_uv_var;
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_10_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_10_fill_var;
 			uv_alpha_size = 4*3*surf->width;
 		}
 		break;
@@ -785,14 +997,14 @@
 			surf->yuv_flush_uv = evg_nv12_10_flush_uv_const;
 
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_10_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_10_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_10_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_10_fill_const;
 			}
 			uv_alpha_size = 4*surf->width;
 		} else {
 			surf->yuv_flush_uv = evg_nv12_10_flush_uv_var;
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_10_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_10_fill_var;
 			uv_alpha_size = 4 * 3*surf->width;
 		}
 		break;
@@ -803,14 +1015,14 @@
 			surf->yuv_flush_uv = evg_yuv422p_10_flush_uv_const;
 
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_10_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_10_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_10_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_10_fill_const;
 			}
 			uv_alpha_size = 4*surf->width;
 		} else {
 			surf->yuv_flush_uv = evg_yuv422p_10_flush_uv_var;
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_10_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_yuv420p_10_fill_var;
 			uv_alpha_size = 4 * 3*surf->width;
 		}
 		break;
@@ -818,12 +1030,12 @@
 		surf->yuv_type = EVG_YUV_444;
 		if (use_const) {
 			if (a!=0xFF) {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_10_fill_const_a;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv444p_10_fill_const_a;
 			} else {
-				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_10_fill_const;
+				surf->fill_spans = (EVG_SpanFunc) evg_yuv444p_10_fill_const;
 			}
 		} else {
-			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_10_fill_var;
+			surf->fill_spans = (EVG_SpanFunc) evg_yuv444p_10_fill_var;
 		}
 		break;
 	default:
@@ -831,15 +1043,27 @@
 	}
 
 	if (uv_alpha_size) {
+		u32 i;
 		if (surf->uv_alpha_alloc < uv_alpha_size) {
 			surf->uv_alpha_alloc = uv_alpha_size;
-			surf->uv_alpha = gf_realloc(surf->uv_alpha, uv_alpha_size);
-			memset(surf->uv_alpha, 0, uv_alpha_size);
+			surf->raster_ctx.uv_alpha = gf_realloc(surf->raster_ctx.uv_alpha, uv_alpha_size);
+			if (!surf->raster_ctx.uv_alpha) return GF_FALSE;
+			for (i=0;i<surf->nb_threads; i++) {
+				EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+				rctx->uv_alpha = gf_realloc(rctx->uv_alpha, uv_alpha_size);
+				if (!rctx->uv_alpha) return GF_FALSE;
+			}
+		}
+		memset(surf->raster_ctx.uv_alpha, 0, sizeof(char)*surf->uv_alpha_alloc);
+		for (i=0;i<surf->nb_threads; i++) {
+			EVGRasterCtx *rctx = &surf->th_raster_ctx[i];
+			memset(rctx->uv_alpha, 0, sizeof(char)*surf->uv_alpha_alloc);
 		}
-		memset(surf->uv_alpha, 0, sizeof(char)*surf->uv_alpha_alloc);
 	}
-	if (surf->yuv_type && for_3d)
+	if (surf->yuv_type && for_3d) {
 		surf->sten = &surf->ext3d->yuv_sten;
+		surf->direct_yuv_3d = GF_TRUE;
+	}
 
 	if (use_const && surf->yuv_type) {
 		u8 y, cb, cr;
@@ -863,6 +1087,7 @@
 GF_Err gf_evg_surface_set_path(GF_EVGSurface *surf, GF_Path *gp)
 {
 	if (!surf) return GF_BAD_PARAM;
+	surf->aa_level = 0;
 	if (!gp || !gp->n_points) {
 		surf->ftoutline.n_points = 0;
 		surf->ftoutline.n_contours = 0;
@@ -881,7 +1106,10 @@
 	surf->path_bounds.y -= surf->path_bounds.height;
 
 	surf->ftoutline.flags = 0;
-	if (gp->flags & GF_PATH_FILL_ZERO_NONZERO) surf->ftoutline.flags = GF_PATH_FILL_ZERO_NONZERO;
+	if (gp->flags & GF_PATH_FILL_ZERO_NONZERO)
+		surf->ftoutline.flags |= GF_PATH_FILL_ZERO_NONZERO;
+	if (gp->flags & GF_PATH_FILL_EVEN)
+		surf->ftoutline.flags |= GF_PATH_FILL_EVEN;
 
 	surf->ftoutline.n_points = gp->n_points;
 	surf->ftoutline.points = gp->points;
@@ -889,71 +1117,127 @@
 	return GF_OK;
 }
 
-/* static void gray_spans_stub(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf){} */
-
-GF_EXPORT
-GF_Err gf_evg_surface_fill(GF_EVGSurface *surf, GF_EVGStencil *sten)
+static u32 shader_get_pix(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *rctx)
 {
-	GF_Err e;
-	GF_Rect rc;
-	u32 max_gray;
-	GF_Matrix2D mat, st_mat;
-	Bool restore_filter;
-	if (!surf || !sten) return GF_BAD_PARAM;
-	if (!surf->ftoutline.n_points) return GF_OK;
-	surf->sten = sten;
+	rctx->frag_param.tx_x = x;
+	rctx->frag_param.tx_y = _this->height-y;
 
-	/*setup ft raster calllbacks*/
-	if (!setup_grey_callback(surf, GF_FALSE)) return GF_OK;
+	evg_get_fragment(rctx->surf, rctx, NULL);
+	rctx->frag_param.screen_x += 1;
+	return rctx->fill_col;
+}
 
-	/*	surf->gray_spans = gray_spans_stub; */
+static u64 shader_get_pix_wide(EVG_Texture *_this, u32 x, u32 y, EVGRasterCtx *rctx)
+{
+	rctx->frag_param.tx_x = x;
+	rctx->frag_param.tx_y = _this->height-y;
 
-	/*TODO, check matrix with 3D transform*/
+	evg_get_fragment(rctx->surf, rctx, NULL);
+	rctx->frag_param.screen_x += 1;
+	return rctx->fill_col_wide;
+}
+
+static GF_Err gf_evg_setup_stencil(GF_EVGSurface *surf, GF_EVGStencil *sten, GF_Matrix2D *mat)
+{
+	GF_Rect rc;
 
-	get_surface_world_matrix(surf, &mat);
-	restore_filter = GF_FALSE;
 	/*get path frame for texture convertion */
 	if (sten->type != GF_STENCIL_SOLID) {
 		rc = surf->path_bounds;
-		gf_mx2d_apply_rect(&mat, &rc);
+		if (surf->is_shader) {
+			EVG_Texture *_tx = (EVG_Texture *)sten;
+			_tx->width = (u32) rc.width;
+			_tx->height = (u32) rc.height;
+			_tx->cmat.identity = 1;
+			_tx->alpha = 255;
+			gf_mx2d_init(_tx->smat);
+			gf_mx2d_add_translation(&_tx->smat, rc.width/2, rc.height/2);
+			gf_mx2d_add_matrix(&_tx->smat, &surf->shader_mx);
+//			_tx->fill_run = tex_fill_run;
+			_tx->tx_get_pixel = shader_get_pix;
+			_tx->tx_get_pixel_wide = shader_get_pix_wide;
+			_tx->is_wide = 1;
+			
+			_tx->is_yuv = surf->yuv_type ? 1 : 0;
+		}
+		gf_mx2d_apply_rect(mat, &rc);
 		rc.x = rc.y = 0;
 		/*assign target frame and matrix*/
 		sten->frame = rc;
 		gf_mx2d_copy(sten->pmat, surf->mat);
 		gf_mx2d_inverse(&sten->pmat);
 
-		gf_mx2d_copy(st_mat, sten->smat);
+		gf_mx2d_copy(sten->smat_bck, sten->smat);
 		gf_mx2d_init(sten->smat);
 
 		switch (sten->type) {
 		case GF_STENCIL_TEXTURE:
-			if ( ((EVG_Texture *)sten)->tx_callback) {
-
-			} else {
-				if (! ((EVG_Texture *)sten)->pixels) return GF_BAD_PARAM;
-			}
 
-			if (((EVG_Texture *)sten)->mod & GF_TEXTURE_FLIP_Y) {
-				if (!surf->center_coords) gf_mx2d_add_scale(&sten->smat, FIX_ONE, -FIX_ONE);
+			//in 3D mode, we only need the orginal stencil matrix
+			if (!surf->is_3d_matrix) {
+				if (!surf->is_shader) {
+					EVG_Texture *texture = (EVG_Texture *) sten;
+					if (!texture->tx_callback && ! texture->pixels)
+						return GF_BAD_PARAM;
+
+					if (texture->mod & GF_TEXTURE_FLIP_Y) {
+						if (!surf->center_coords) gf_mx2d_add_scale(&sten->smat, FIX_ONE, -FIX_ONE);
+					} else {
+						if (surf->center_coords) gf_mx2d_add_scale(&sten->smat, FIX_ONE, -FIX_ONE);
+					}
+				}
+
+				//add texture transform (normalized)
+				gf_mx2d_add_matrix(&sten->smat, &sten->smat_bck);
+				if (sten->auto_mx) {
+					EVG_Texture *_tx = (EVG_Texture *)sten;
+					//move translation to texture size
+					sten->smat.m[2] *= _tx->width;
+					sten->smat.m[5] *= _tx->height;
+					//in auto mx, matrix is given inverted, as in OpenGL
+					gf_mx2d_inverse(&sten->smat);
+
+					//add texture -> untransformed path bounds matrix scale and translation
+					gf_mx2d_add_scale(&sten->smat, surf->path_bounds.width/_tx->width, surf->path_bounds.height/_tx->height);
+					gf_mx2d_add_translation(&sten->smat, -surf->path_bounds.width/2, surf->path_bounds.height/2);
+
+					//add final path matrix
+					gf_mx2d_add_matrix(&sten->smat, &surf->shader_mx);
+				}
+
+				//add surface matrix matrix
+				gf_mx2d_add_matrix(&sten->smat, mat);
+				gf_mx2d_inverse(&sten->smat);
 			} else {
-				if (surf->center_coords) gf_mx2d_add_scale(&sten->smat, FIX_ONE, -FIX_ONE);
+				if (!sten->auto_mx) {
+					return GF_NOT_SUPPORTED;
+				}
 			}
-			gf_mx2d_add_matrix(&sten->smat, &st_mat);
-			gf_mx2d_add_matrix(&sten->smat, &mat);
-			gf_mx2d_inverse(&sten->smat);
 
 			evg_texture_init(sten, surf);
-			if (((EVG_Texture *)sten)->filter == GF_TEXTURE_FILTER_DEFAULT) {
-				restore_filter = GF_TRUE;
-				((EVG_Texture *)sten)->filter = surf->texture_filter;
+			if (surf->is_shader) {
+				EVG_Texture *_tx = (EVG_Texture *)sten;
+				_tx->tx_get_pixel = shader_get_pix;
+				_tx->tx_get_pixel_wide = shader_get_pix_wide;
 			}
-
 			break;
 		case GF_STENCIL_LINEAR_GRADIENT:
 		{
 			EVG_LinearGradient *lin = (EVG_LinearGradient *)sten;
-			gf_mx2d_add_matrix(&sten->smat, &st_mat);
-			gf_mx2d_add_matrix(&sten->smat, &mat);
+			gf_mx2d_copy(sten->smat, sten->smat_bck);
+			if (!surf->is_3d_matrix) {
+				if (sten->auto_mx) {
+					//add [0,1] -> untransformed path bounds and path translation
+					gf_mx2d_add_translation(&sten->smat, gf_divfix(surf->path_bounds.x, surf->path_bounds.width), gf_divfix(surf->path_bounds.y, surf->path_bounds.height));
+					gf_mx2d_add_scale(&sten->smat, surf->path_bounds.width, surf->path_bounds.height);
+					gf_mx2d_add_matrix(&sten->smat, &surf->shader_mx);
+				}
+				gf_mx2d_add_matrix(&sten->smat, mat);
+			} else {
+				if (!sten->auto_mx) {
+					return GF_NOT_SUPPORTED;
+				}
+			}
 			gf_mx2d_inverse(&sten->smat);
 			/*and finalize matrix in gradient coord system*/
 			gf_mx2d_add_matrix(&sten->smat, &lin->vecmat);
@@ -961,31 +1245,119 @@
 
 			/*init*/
 			evg_gradient_precompute((EVG_BaseGradient *)lin, surf);
-
 		}
 		break;
 		case GF_STENCIL_RADIAL_GRADIENT:
 		{
 			EVG_RadialGradient *rad = (EVG_RadialGradient*)sten;
-			gf_mx2d_copy(sten->smat, st_mat);
-			gf_mx2d_add_matrix(&sten->smat, &mat);
+			gf_mx2d_copy(sten->smat, sten->smat_bck);
+			if (!surf->is_3d_matrix) {
+				if (sten->auto_mx) {
+					//add [0,1] -> untransformed path bounds and path translation
+					gf_mx2d_add_translation(&sten->smat, gf_divfix(surf->path_bounds.x, surf->path_bounds.width), gf_divfix(surf->path_bounds.y, surf->path_bounds.height));
+					gf_mx2d_add_scale(&sten->smat, surf->path_bounds.width, surf->path_bounds.height);
+					gf_mx2d_add_matrix(&sten->smat, &surf->shader_mx);
+				}
+				gf_mx2d_add_matrix(&sten->smat, mat);
+			} else {
+				if (!sten->auto_mx) {
+					return GF_NOT_SUPPORTED;
+				}
+			}
 			gf_mx2d_inverse(&sten->smat);
 			gf_mx2d_add_translation(&sten->smat, -rad->center.x, -rad->center.y);
 			gf_mx2d_add_scale(&sten->smat, gf_invfix(rad->radius.x), gf_invfix(rad->radius.y));
 
 			rad->d_f.x = gf_divfix(rad->focus.x - rad->center.x, rad->radius.x);
 			rad->d_f.y = gf_divfix(rad->focus.y - rad->center.y, rad->radius.y);
+
 			/*init*/
 			evg_radial_init(rad);
 			evg_gradient_precompute((EVG_BaseGradient *)rad, surf);
 		}
 		break;
 		}
+	} else {
+		EVG_Brush *sc = (EVG_Brush *) sten;
+		u32 col = sc->color;
+		if (sc->alpha < 0xFF) {
+			u32 ca = ((u32) (GF_COL_A(col) + 1) * sc->alpha) >> 8;
+			col = ( ((ca<<24) & 0xFF000000) ) | (col & 0x00FFFFFF);
+		}
+		if (surf->yuv_type) {
+			sc->fill_col = gf_evg_argb_to_ayuv(surf, col);
+		} else {
+			sc->fill_col = col;
+		}
+		if (surf->not_8bits)
+			sc->fill_col_wide = evg_col_to_wide(sc->fill_col);
+	}
+	return GF_OK;
+}
+
+static void gf_evg_restore_stencil(GF_EVGSurface *surf, GF_EVGStencil *sten)
+{
+	/*restore stencil matrix*/
+	if (sten->type != GF_STENCIL_SOLID) {
+		gf_mx2d_copy(sten->smat, sten->smat_bck);
 	}
-	max_gray = surf->raster->max_gray_spans;
+}
+
+GF_EXPORT
+GF_Err gf_evg_surface_multi_fill(GF_EVGSurface *surf, GF_EVGMultiTextureMode operand, GF_EVGStencil *sten1, GF_EVGStencil *sten2, GF_EVGStencil *sten3, Float params[4])
+{
+	GF_Err e;
+	Bool reset_aa = GF_FALSE;
+	u32 max_gray;
+	GF_Matrix2D mat;
+	if (!surf || (!sten1 && !surf->frag_shader) ) return GF_BAD_PARAM;
+	if (!surf->ftoutline.n_points) return GF_OK;
+	surf->sten = sten1;
+	surf->update_run = NULL;
+
+	/*setup ft raster calllbacks*/
+	if (!setup_grey_callback(surf, GF_FALSE, sten2 ? GF_TRUE : GF_FALSE)) return GF_OK;
+
+	get_surface_world_matrix(surf, &mat);
+	surf->is_shader = GF_FALSE;
+	if (!sten1) {
+		sten1 = (GF_EVGStencil *) &surf->shader_sten;
+		sten1->type = GF_STENCIL_TEXTURE;
+		surf->is_shader = GF_TRUE;
+		surf->sten = sten1;
+		operand = GF_EVG_OPERAND_NONE;
+	}
+
+	e = gf_evg_setup_stencil(surf, sten1, &mat);
+	if (e) return e;
+
+	if (operand) {
+		e = gf_evg_setup_multi_texture(surf, operand, sten2, sten3, params);
+		if (e) return e;
+		if (sten2 && (sten2 != sten1)) {
+			e = gf_evg_setup_stencil(surf, sten2, &mat);
+			if (e) return e;
+		}
+		if (sten3 && (sten3 != sten1) && (sten3 != sten2)) {
+			e = gf_evg_setup_stencil(surf, sten3, &mat);
+			if (e) return e;
+		}
+	}
+
+	if (!surf->aa_level) {
+		//no AA
+		if (surf->qlevel == GF_RASTER_HIGH_SPEED) surf->aa_level = 0;
+		//skip pixles with less than 25% coverage
+		else if (surf->qlevel == GF_RASTER_MID) surf->aa_level = 63;
+		else surf->aa_level = 0xFF;
+		reset_aa = GF_TRUE;
+	}
+
+
+	max_gray = surf->max_gray_spans;
 	/*force complete line callback for YUV 420/422*/
 	if (surf->yuv_type==EVG_YUV)
-		surf->raster->max_gray_spans = 0xFFFFFFFF;
+		surf->max_gray_spans = 0xFFFFFFFF;
 
 	if (surf->useClipper) {
 		surf->clip_xMin = surf->clipper.x;
@@ -999,24 +1371,48 @@
 		surf->clip_yMax = (surf->height);
 	}
 
-	/*and call the raster*/
-	if (surf->is_3d_matrix)
-		e = evg_raster_render_path_3d(surf);
-	else
-		e = evg_raster_render(surf);
+	if (surf->mask_mode == GF_EVGMASK_DRAW) {
+		u32 old_pitch_x = surf->pitch_x;
+		u32 old_pitch_y = surf->pitch_y;
+		u8 *old_pixels = surf->pixels;
 
-	surf->raster->max_gray_spans = max_gray;
+		surf->pixels = surf->internal_mask;
+		surf->pitch_x = 1;
+		surf->pitch_y = surf->width;
 
-	/*restore stencil matrix*/
-	if (sten->type != GF_STENCIL_SOLID) {
-		gf_mx2d_copy(sten->smat, st_mat);
-		if (restore_filter) ((EVG_Texture *)sten)->filter = GF_TEXTURE_FILTER_DEFAULT;
+		/*and call the raster*/
+		if (surf->is_3d_matrix)
+			e = evg_raster_render_path_3d(surf);
+		else
+			e = evg_raster_render(surf);
+
+		surf->pitch_x = old_pitch_x;
+		surf->pitch_y = old_pitch_y;
+		surf->pixels = old_pixels;
+	} else {
+		/*and call the raster*/
+		if (surf->is_3d_matrix)
+			e = evg_raster_render_path_3d(surf);
+		else
+			e = evg_raster_render(surf);
 	}
-	surf->sten = 0L;
+
+	if (reset_aa) surf->aa_level = 0;
+
+	surf->max_gray_spans = max_gray;
+
+	gf_evg_restore_stencil(surf, sten1);
+	if (sten2) gf_evg_restore_stencil(surf, sten2);
+	if (sten3) gf_evg_restore_stencil(surf, sten3);
+	surf->sten = surf->sten2 = surf->sten3 = NULL;
 	return e;
 }
 
-
+GF_EXPORT
+GF_Err gf_evg_surface_fill(GF_EVGSurface *surf, GF_EVGStencil *sten)
+{
+	return gf_evg_surface_multi_fill(surf, 0, sten, NULL, NULL, NULL);
+}
 
 void gf_evg_surface_set_composite_mode(GF_EVGSurface *surf, GF_EVGCompositeMode comp_mode)
 {
@@ -1053,7 +1449,7 @@
 	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
 
 	/*setup ft raster calllbacks*/
-	if (!setup_grey_callback(surf, GF_TRUE)) return GF_OK;
+	if (!setup_grey_callback(surf, GF_TRUE, GF_FALSE)) return GF_OK;
 
 	if (surf->useClipper) {
 		surf->clip_xMin = surf->clipper.x;
@@ -1066,14 +1462,16 @@
 		surf->clip_xMax = (surf->width);
 		surf->clip_yMax = (surf->height);
 	}
-	max_gray = surf->raster->max_gray_spans;
+	max_gray = surf->max_gray_spans;
 	/*force complete line callback for YUV 420/422*/
 	if (surf->yuv_type==EVG_YUV)
-		surf->raster->max_gray_spans = 0xFFFFFFFF;
+		surf->max_gray_spans = 0xFFFFFFFF;
 
+	surf->aa_level = 0xFF;
+	
 	/*and call the raster*/
 	e = evg_raster_render3d(surf, indices, nb_idx, vertices, nb_vertices, nb_comp, prim_type);
-	surf->raster->max_gray_spans = max_gray;
+	surf->max_gray_spans = max_gray;
 	return e;
 }
 
@@ -1086,7 +1484,7 @@
 	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
 
 	/*setup ft raster calllbacks*/
-	if (!setup_grey_callback(surf, GF_TRUE)) return GF_OK;
+	if (!setup_grey_callback(surf, GF_TRUE, GF_FALSE)) return GF_OK;
 
 	if (surf->useClipper) {
 		surf->clip_xMin = surf->clipper.x;
@@ -1099,13 +1497,55 @@
 		surf->clip_xMax = (surf->width);
 		surf->clip_yMax = (surf->height);
 	}
-	max_gray = surf->raster->max_gray_spans;
+	max_gray = surf->max_gray_spans;
 	/*force complete line callback for YUV 420/422*/
 	if (surf->yuv_type==EVG_YUV)
-		surf->raster->max_gray_spans = 0xFFFFFFFF;
+		surf->max_gray_spans = 0xFFFFFFFF;
+
+	surf->aa_level = 0xFF;
 
 	/*and call the raster*/
 	e = evg_raster_render3d_path(surf, path, z);
-	surf->raster->max_gray_spans = max_gray;
+	surf->max_gray_spans = max_gray;
 	return e;
 }
+
+
+GF_Err gf_evg_surface_set_mask_mode(GF_EVGSurface *surf, GF_EVGMaskMode mask_mode)
+{
+	if (!surf) return GF_BAD_PARAM;
+
+	if ((mask_mode==GF_EVGMASK_DRAW)
+		|| (mask_mode==GF_EVGMASK_DRAW_NO_CLEAR)
+		|| (mask_mode==GF_EVGMASK_RECORD)
+	) {
+		u8 clear_val = 0;
+		Bool clear_mask = GF_FALSE;
+		if (!surf->internal_mask) {
+			surf->internal_mask = gf_malloc(sizeof(u8) * surf->width * surf->height);
+			if (!surf->internal_mask) return GF_OUT_OF_MEM;
+			clear_mask = GF_TRUE;
+		}
+		if ((mask_mode==GF_EVGMASK_DRAW) && (surf->mask_mode != GF_EVGMASK_DRAW))
+			clear_mask = GF_TRUE;
+
+		if (mask_mode==GF_EVGMASK_RECORD) {
+			clear_mask = GF_TRUE;
+			clear_val = 0xFF;
+		} else {
+			mask_mode = GF_EVGMASK_DRAW;
+		}
+
+		if (clear_mask) {
+			memset(surf->internal_mask, clear_val, sizeof(u8) * surf->width * surf->height);
+		}
+	}
+	surf->mask_mode = mask_mode;
+	return GF_OK;
+}
+
+GF_EVGMaskMode gf_evg_surface_get_mask_mode(GF_EVGSurface *surf)
+{
+	if (!surf) return GF_EVGMASK_NONE;
+	return surf->mask_mode;
+}

gpac-1.0.1.tar.gz/src/export.cpp -> gpac-2.0.0.tar.gz/src/export.cpp Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -37,6 +37,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(CE_WideToChar) )
 #endif
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_gpac_version) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_gpac_copyright) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_gpac_copyright_cite) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_gpac_abi_major) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_gpac_abi_minor) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_gpac_abi_micro) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_close) )
@@ -44,26 +51,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_argc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_argv) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_arg) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_find_global_arg) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_is_arg_used) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_mark_arg_used) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_is_test_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_old_arch_compat) )
-
-#ifdef GPAC_ENABLE_COVERAGE
-#pragma comment (linker, EXPORT_SYMBOL(gf_sys_is_cov_mode) )
-#endif
-
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_is_quiet) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_gpac_version) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_gpac_copyright) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_gpac_copyright_cite) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_features) )
-
-#pragma comment (linker, EXPORT_SYMBOL(gf_sleep) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mkdir) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rmdir) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dir_exists) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cleanup_dir) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_clock) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_clock_high_res) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_rti) )
@@ -76,8 +70,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_localized) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_process_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_set_console_code) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_log_use_color) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_log_use_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_format_help) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_word_match) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_profiler_set_callback) )
@@ -85,8 +77,19 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_profiler_enable_sampling) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_profiler_sampling_enabled) )
 
+#ifdef GPAC_ENABLE_COVERAGE
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_is_cov_mode) )
+#endif
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_sleep) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mkdir) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rmdir) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dir_exists) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dir_cleanup) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_get_default_cache_directory) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_get_default_font_dir) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_4cc_to_str) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_4cc_parse) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_error_to_string) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rand_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rand) )
@@ -94,7 +97,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_enum_directory) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_file_load_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dynstrcat) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_parse_lfrac) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_parse_frac) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_gmtime) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_strnistr) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_modify_tools_levels) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_set_tools_levels) )
@@ -105,6 +111,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_get_tools_levels) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_reset_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_tool_level_on) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_log_use_color) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_log_use_file) )
 
 #ifndef GPAC_DISABLE_LOG
 #pragma comment (linker, EXPORT_SYMBOL(gf_log) )
@@ -117,7 +125,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_fileio_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fileio_get_udta) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fileio_url) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fileio_resource_url) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fileio_translate_url) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fileio_set_stats) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fileio_tag_main_thread) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fileio_is_main_thread) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_set_progress) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_set_progress_callback) )
@@ -149,6 +161,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_lz_compress_payload) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_lz_decompress_payload) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_file_handles_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_timestamp_rescale) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_timestamp_rescale_signed) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_timestamp_less) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_timestamp_less_or_equal) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_timestamp_greater) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_timestamp_greater_or_equal) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_timestamp_equal) )
 
 /* Memory */
 #ifdef GPAC_MEMORY_TRACKING
@@ -168,6 +187,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_strdup) )
 #endif /*GPAC_MEMORY_TRACKING*/
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_strlcpy) )
+
 /* Sound */
 #ifndef GPAC_DISABLE_PLAYER
 #pragma comment (linker, EXPORT_SYMBOL(gf_mixer_set_config) )
@@ -253,6 +274,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_write_u16_le) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_write_u32_le) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_enable_emulation_byte_removal ) )
 
 /* Thread */
 #pragma comment (linker, EXPORT_SYMBOL(gf_th_new) )
@@ -304,7 +326,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_is_local) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_get_absolute_path) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_concatenate) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_url_get_resource_path) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_url_free) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_get_resource_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_to_fs_path) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utc_time_since_1970) )
@@ -315,9 +337,15 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_utc_ts) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_ntp_to_utc) )
 
-
 #pragma comment (linker, EXPORT_SYMBOL(gf_errno_str) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_blob_get_data) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_get_next_pow2) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_htonl) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_htons) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_ntohl) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_ntohs) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_blob_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_blob_release) )
 
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_utc) )
@@ -372,7 +400,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_count) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_module_directories) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_file_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_module_get_file_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_module_load_static) )
@@ -386,6 +413,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_wcslen) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_to_wcs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_wcs_to_utf8) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_utf8_is_legal) )
 #ifndef GPAC_DISABLE_PLAYER
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_is_right_to_left) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_reorder_bidi) )
@@ -449,15 +477,18 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_parse) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_create_attribute) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_append_child) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_rem_child) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_root) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_error) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_line) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_serialize) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_serialize_root) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_node_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_node_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_parse_string) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_root_nodes_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_root_idx) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_detach_root) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_parse_bit_sequence) )
 #endif
 
@@ -657,18 +688,27 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_read) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_write_bs) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_read) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_read_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_write) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_write_bs) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vvc_cfg_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vvc_cfg_read) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vvc_cfg_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vvc_cfg_read_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vvc_cfg_write) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vvc_cfg_write_bs) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_write_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_del ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_write_bs) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_read_bs) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_write) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_write_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_read) )
@@ -677,6 +717,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_write_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_dump_txtcfg) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_dovi_cfg_del) )
+
+
 #ifndef GPAC_MINIMAL_ODF
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_add_desc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_list_read) )
@@ -731,6 +774,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_open_progressive) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_missing_bytes) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_freeze_order) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_inplace_padding) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_fragmented) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_fragmented_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_fragments_count) )
@@ -747,6 +791,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_original_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_creation_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_creation_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_by_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_track_enabled) )
@@ -815,6 +860,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_default_sync_track) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_ac3_config_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_truehd_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_set_streaming_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_layout_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_matrix) )
@@ -831,7 +877,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_cenc_media) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_cenc_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_get_sample_aux_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_samp_aux_info_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_get_default_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_avc_svc_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_config_box) )
@@ -841,10 +886,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_lhvc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_hevc_lhvc_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_vvc_config_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_vvc_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_by_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_meta_get_next_item_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_flags) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_meta_xml) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_extract_meta_xml) )
@@ -856,13 +904,17 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_segment_get_fragment_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_segment_get_track_fragment_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_segment_get_track_fragment_decode_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_segment_get_fragment_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_single_av) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_guess_specification) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_keep_utc_times) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_keep_utc_times) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_sync_shadows) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_sample_dependency) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_find_od_id_for_track) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_apple_get_tag) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_apple_enum_tag) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_wma_enum_tag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_media_data_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_omadrm_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_omadrm_media) )
@@ -870,6 +922,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_switch_parameter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_next_alternate_group_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_primary_item_id) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_meta_get_item_ref_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_meta_get_item_ref_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_JPEG2000) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_rvc_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_rap_roll_info) )
@@ -884,6 +938,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_last_producer_time_box) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_current_tfdt) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_smooth_streaming_moov) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_smooth_next_tfdt) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_adobe_protection_media) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_adobe_protection_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_group_info) )
@@ -903,13 +958,24 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_sample_has_subsamples) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_sample_get_subsamples_buffer) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_max_sample_delta) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_mpegh_compatible_profiles) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_av1_config_get ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_mvc_config_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_extract_meta_item_get_cenc_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_subtitle_get_mime) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_chunk_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_chunk_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_first_mdat_start) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_unused_box_bytes) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_clean_aperture) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_dovi_config_get) )
+
 
 # ifndef GPAC_DISABLE_ISOM_DUMP
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_num_supported_boxes) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_supported_box_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump_supported_box) )
-
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_dump) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump_ismacryp_protection) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump_ismacryp_sample) )
@@ -944,6 +1010,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_creation_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_creation_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_media_creation_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_enabled) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_flags) )
@@ -974,6 +1041,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_kind) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_kind_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_edit) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_edit_with_rate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_modify_edit) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_append_edit) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_edit) )
@@ -987,9 +1055,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_user_data_item) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_uuid) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_use_compact_size) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_disable_brand_rewrite) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_brand_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_modify_alternate_brand) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_alt_brands) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_alt_brands_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_visual_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_visual_color_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_visual_bit_depth) )
@@ -1021,6 +1091,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_interleaving_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_priority_in_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_hint_max_chunk_size) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_hint_max_chunk_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_extraction_slc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_make_interleave) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_new) )
@@ -1063,11 +1134,18 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_meta_primary_item) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_meta_xml) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_meta_add_item_ref) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_meta_add_item_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_iff_create_image_item_from_track) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_iff_create_image_grid_item) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_iff_create_image_overlay_item) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_iff_create_image_identity_item) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_meta_xml) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_apple_set_tag) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_wma_set_tag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_next_alternate_group_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_ipod_compatible) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_inplace_rewrite) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_disable_inplace_rewrite) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_switch_parameters) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_track_switch_parameter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_switch_parameter) )
@@ -1091,6 +1169,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_tmcd_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_tmcd_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_magic) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_vvc_config_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_vvc_set_inband_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_subtitle_set_mime) )
 
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
@@ -1166,10 +1247,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_av1_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_equal) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_write_header) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_is_pattern_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_close_fragments) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_bitrate) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_cenc_info_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_set_tile_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_mvc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_mvc_config_new) )
@@ -1214,7 +1293,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_set_flag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_min_frame_dur) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_event_target_add_node) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_nb_layers) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_nb_views) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_started) )
 
@@ -1357,6 +1435,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_import_chapters) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_import_chapters_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_change_pl) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_change_color) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_next_start_code_bs) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_split_svc) )
@@ -1364,12 +1443,14 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_split_hevc_tiles) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_split_lhvc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_filter_hevc) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dolby_vision_level) )
 
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_inspect_dump_nalu) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_inspect_dump_obu) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_inspect_dump_prores) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_inspect_format_timecode) )
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1378,6 +1459,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_update_bitrate) )
 #endif
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_nal_rewrite_samples) )
+
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_next_start_code) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_remove_emulation_bytes) )
@@ -1386,27 +1470,34 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_get_pps_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_get_profile_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_hevc_get_chroma_format_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_avc_is_rext_profile) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_parse_nalu) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_read_sps) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_read_pps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_avc_parse_nalu) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_avc_read_sps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_avc_read_pps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_avc_read_sps_bs ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_avc_read_pps_bs ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_avc_hevc_get_chroma_format_name) )
 
 #ifndef GPAC_DISABLE_HEVC
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_vps) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_vps_ex) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_vps_bs) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_sps) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_sps_ex) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_sps_bs) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_pps) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_pps_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_vps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_vps_ex) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_vps_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_sps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_sps_ex) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_sps_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_pps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_pps_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_hevc_get_profile_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_hevc_get_sps_info_with_state) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_parse_nalu) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_parse_nalu) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_vvc_get_sps_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_vvc_get_profile_name) )
 #endif //GPAC_DISABLE_HEVC
 
 
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_aom_av1_parse_obu) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_av1_parse_obu) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_av1_get_obu_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_av1_reset_state) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_av1_init_state) )
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
@@ -1478,6 +1569,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_profile) )
 #endif
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpegv12_get_config) )
+
 #if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_ISOM_WRITE)
 /*crypt_tools.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_file) )
@@ -1693,11 +1786,15 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_svg_attributes_copy) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_get_element_tag) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_smil_set_media_duration) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_init_runtime_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_insert_clock) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_is_active) )
 
 #endif
 
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_dom_pre_destroy) )
@@ -1705,7 +1802,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_event_remove_listener) )
 #endif
 
-#endif /*GPAC_HAS_SPIDERMONKEY*/
+#endif /*GPAC_HAS_QJS*/
 
 /* scenegraph_vrml.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_replace_child) )
@@ -1774,7 +1871,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_in_table_by_tag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_get_field_type_name) )
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 #pragma comment (linker, EXPORT_SYMBOL(gf_js_vrml_flush_event_out) )
 #endif
 
@@ -1784,7 +1881,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_x3d_get_node_type) )
 #endif
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_handle_dom_event_for_vrml) )
 #endif
@@ -1794,14 +1891,9 @@
 
 #endif //!defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_X3D) && !defined(GPAC_DISABLE_SVG)
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_get_node) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_js_add_root) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_js_add_named_root) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_js_remove_root) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_has_instance) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_lock_javascript) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_try_lock_javascript) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_js_delete_runtime) )
 #endif
 
 
@@ -1859,6 +1951,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_current_service_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_print_graph) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_is_type_supported) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_print_stats) )
 
 /*terminal_dev exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_new) )
@@ -1948,6 +2041,14 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_font_manager_create_span) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_font_manager_refresh_span_bounds) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_connect_from_time_ex) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_disconnect) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_send_event) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_downloader) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_scene_switch_quality) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_scene_set_service_id) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odm_get_object_info) )
+
 #endif
 
 /*mpegts.h exports*/
@@ -2086,9 +2187,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_split_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_cues) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_print_session_info) )
-
-
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_keep_source_utc) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_last_segment_merge) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_next_update_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_hls_clock ) )
 
 #endif
 
@@ -2114,7 +2216,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_group_udta) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_group_selected) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_group_selectable) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_debug_group) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_debug_groups) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_switch_quality) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_duration) )
@@ -2130,11 +2232,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_request_period_switch) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_running) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_in_setup) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_num_segments_ready) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_discard_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_next_segment_location) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_probe_current_download_segment_location) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_max_segments_in_cache) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_group_done) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_in_period_setup) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_seek) )
@@ -2155,6 +2254,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_speed) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_switching_probe_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_agressive_adaptation) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_enable_single_range_llhls) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_period_start) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_period_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_language) )
@@ -2165,7 +2265,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_automatic_switching) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_automatic_switching) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_select_quality) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_download_rate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_timeshift) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_timeshift_buffer_pos) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_set_codec_stat) )
@@ -2178,13 +2277,14 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_dependent_group_index) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_tile_adaptation_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_tile_adaptation_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_disable_low_quality_tiles) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_srd_max_size_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_srd_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_set_quality_degradation_hint) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_set_visible_rect) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_utc_drift_estimate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_algo) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_atsc_ast_shift) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_route_ast_shift) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_ignore_xlink) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_num_components) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_all_groups_done) )
@@ -2201,82 +2301,103 @@
 
 #pragma comment (linker, EXPORT_SYMBOL(utf8_to_ucs4) )
 
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_tune_in) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_set_callback) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_process) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_object_count) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_remove_object_by_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_remove_first_object) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_find_service) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_purge_objects) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_first_packet_time) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_last_packet_time) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_nb_packets) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_recv_bytes) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_set_service_udta) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_service_udta) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_debug_tsi) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_set_max_objects_store) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_atsc3_tune_in) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_process) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_get_object_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_remove_object_by_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_remove_first_object) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_find_atsc3_service) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_purge_objects) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_get_first_packet_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_get_last_packet_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_get_nb_packets) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_get_recv_bytes) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_set_service_udta) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_get_service_udta) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_debug_tsi) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_add_cache_entry) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_force_headers) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_set_localcache_provider) )
 
 /*filter session exports*/
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_connect_from_time_ex) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_disconnect) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_send_event) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_downloader) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_scene_switch_quality) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_scene_set_service_id) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odm_get_object_info) )
-
-#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_bit_depth) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_cicp_layout) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_layout_from_cicp) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_layout_name_from_cicp) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_cicp_from_layout) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_stream_type_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_stream_type_all_names) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_stream_types_enum) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_print_stats) )
-
-#pragma comment (linker, EXPORT_SYMBOL(gf_stream_type_afx_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_mvc_config_get) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_avc_hevc_get_chroma_format_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_nal_rewrite_samples) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_set_max_objects_store) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_debug_tsi) )
-
 #pragma comment (linker, EXPORT_SYMBOL(gf_itags_find_by_id3tag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_itags_find_by_itag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_itags_find_by_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_itags_get_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_itags_get_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_itags_get_alt_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_itags_get_itag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_itags_get_id3tag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_itags_enum_tags) )
-
 #pragma comment (linker, EXPORT_SYMBOL(gf_id3_get_genre) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_id3_get_genre_tag) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_bit_depth) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_cicp_layout) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_layout_from_cicp) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_layout_name_from_cicp) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_layout_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_layout_from_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_cicp_from_layout) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_all_names) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_all_shortnames) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_enum) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_parse) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_get_dolby_chanmap) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_to_isobmf) )
+
+
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_stream_type_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_stream_type_short_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_stream_types_enum) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_stream_type_by_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_stream_type_afx_name) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_pixel_fmt_all_names) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_pixel_fmt_all_shortnames) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_pixel_get_size_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_pixel_fmt_enum) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_pixel_get_bytes_per_pixel) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_pixel_fmt_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_pixel_fmt_sname) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_pixel_fmt_parse) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_pixel_fmt_from_qt_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_pixel_fmt_to_qt_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_pixel_is_wide_depth) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_pixel_fmt_probe) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_codecid_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_codecid_enum) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_codecid_mime) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_codecid_alt) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_codecid_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_codecid_4cc_type) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_all_names) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_all_shortnames) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_enum) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_codecid_file_ext) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_codecid_parse) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_codec_id_from_isobmf) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_codecid_from_oti) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_audio_fmt_cicp_enum) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_get_type_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_get_type_desc) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_parse_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_dump_val) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_get_id) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_get_description) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_4cc_get_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_4cc_get_name) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_type_is_enum) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_parse_enum) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_enum_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_enum_all_names) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_new_defaults) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_del) )
@@ -2284,36 +2405,34 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_run) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_stats) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_connections) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_non_connected) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_non_connected_ex) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_unused_args) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_set_separators) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_props_get_type_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_props_get_type_desc) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_props_parse_type) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_props_dump_val) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_props_get_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_filters_registers_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_filter_register) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_lock_filters) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_filters_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_filter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_filter_stats) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_register_test_filters) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_load_source) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_load_destination) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_props_4cc_get_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_post_user_task ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_abort ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_is_last_task ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_in_final_flush) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_source ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_source_restricted ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_abort ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_lock ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_lock_all) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_all_connections ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_check_filter_register_cap ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_send_update ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_arg ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_arg_str ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_ui_event ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_is_alias ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_stats ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_in_parent_chain ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_set_max_resolution_chain_length ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_max_resolution_chain_length ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_add_filter_register ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_remove_filter_register ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_last_connect_error ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_last_process_error ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_filter_exists ) )
@@ -2322,7 +2441,36 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_enum_unmapped_options) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_send_update) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_load_script) )
-
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_new_filter) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_http_rate) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_http_max_rate) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_set_http_max_rate) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_fire_event) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_is_supported_mime) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_is_supported_source) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_set_filter_creation_callback) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_rt_udta) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_send_update ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_arg ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_arg_str ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_ui_event ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_is_alias ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_stats ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_in_parent_chain ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_push_caps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_process_ckb) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_configure_ckb) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_process_event_ckb) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_reconfigure_output_ckb) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_probe_data_cbk) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_rt_udta) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_rt_udta) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_update_status) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_prevent_blocking) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_block_eos) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_max_extra_input_pids) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_block_enabled) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_connections_pending) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_reconnect_output) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_add_event_listener ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_remove_event_listener ) )
@@ -2332,9 +2480,56 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_help) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_args) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_caps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_release_property) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_udta ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_max_extra_input_pids ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_id ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_enumerate_args) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_info_str) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_ipid_count ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_ipid ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_opid_count ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_opid ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_ask_rt_reschedule ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_setup_failure_callback ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_notification_failure ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_setup_failure ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_post_task ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_remove_src ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_remove ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_connect_source ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_connect_destination ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_load_filter ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_is_supported_source ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_output_buffer_max ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_make_sticky ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_hint_single_clock ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_clock_hint ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_override_caps ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_name ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_name ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_reset_source ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_register_opengl_provider) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_request_opengl) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_count_source_by_protocol) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_disable_probe) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_disable_inputs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_num_events_queued) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_all_sinks_done) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_has_pid_connection_pending) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_reporting_enabled) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_event_name ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_send_event ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_post_process_task ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_require_source_id ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_register ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_print_all_connections ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_force_main_thread ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_is_sink ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_is_source ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_tag_subsession ) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_discard ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_ref ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_ref_props ) )
@@ -2343,6 +2538,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_property ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_property_str ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_property_dyn ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_has_properties ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_property ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_property_str ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_enum_properties ) )
@@ -2390,6 +2586,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_frame_interface) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_forward ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_send ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_clone ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_copy ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_is_blocking_ref) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_ref_ex) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_readonly) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_dangling_copy) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_check_caps ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_copy_properties ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_drop_packet ) )
@@ -2400,6 +2603,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_buffer_occupancy ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_udta ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_udta ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_udta_flags ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_udta_flags ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_packet_count ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_packet ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_first_packet_cts ) )
@@ -2410,9 +2615,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_would_block ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_query_buffer_duration ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_has_seen_eos ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_event_name ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_eos_received ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_send_event ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_send_event ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_exec_event ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_is_filter_in_parents ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_statistics ) )
@@ -2444,65 +2648,31 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_new ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_allow_direct_dispatch ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_alias_udta ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_post_process_task ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_ipid_count ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_ipid ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_opid_count ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_opid ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_ask_rt_reschedule ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_setup_failure_callback ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_notification_failure ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_setup_failure ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_post_task ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_remove_src ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_remove ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_connect_source ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_connect_destination ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_load_filter ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_is_supported_source ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_output_buffer_max ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_make_sticky ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_hint_single_clock ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_clock_hint ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_override_caps ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_init_play_event ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_name ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_name ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_reset_source ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_negociate_property ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_register_opengl_provider) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_request_opengl) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_count_source_by_protocol) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_disable_probe) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_disable_inputs) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_num_events_queued) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_all_sinks_done) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_has_pid_connection_pending) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_reporting_enabled) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_negociate_property_str) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_negociate_property_dyn) )
-
-
-#pragma comment (linker, EXPORT_SYMBOL(gf_bs_enable_emulation_byte_removal ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_del ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_av1_config_get ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_read_sps_bs ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_read_pps_bs ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_hls_clock ) )
-
-#pragma comment (linker, EXPORT_SYMBOL(gf_av1_get_obu_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_av1_reset_state) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_av1_init_state) )
-
-#pragma comment (linker, EXPORT_SYMBOL(gf_get_next_pow2) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_htonl) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_htons) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ntohl) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ntohs) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_inline_is_default_viewpoint) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mpegv12_get_config) )
-
-#pragma comment (linker, EXPORT_SYMBOL(gf_smil_set_media_duration) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_init_runtime_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_insert_clock) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_is_active) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_source_filter) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_enum_destinations) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_discard_block) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_reset_properties) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_require_source_id) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_recompute_dts) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_min_pck_duration) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_is_playing) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_ignore_blocking) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_next_ts) )
+
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_bind_dash_algo_callbacks) )
+
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_cicp_parse_color_primaries) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cicp_parse_color_transfer) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cicp_parse_color_matrix) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cicp_color_primaries_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cicp_color_transfer_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cicp_color_matrix_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cicp_color_primaries_all_names) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cicp_color_transfer_all_names) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cicp_color_matrix_all_names) )

gpac-1.0.1.tar.gz/src/filter_core/filter.c -> gpac-2.0.0.tar.gz/src/filter_core/filter.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / filters sub-project
@@ -42,15 +42,44 @@
 
 const char *gf_fs_path_escape_colon(GF_FilterSession *sess, const char *path)
 {
-	const char *res, *arg;
+	const char *res;
 	if (!path) return NULL;
 	if (sess->sep_args != ':')
 		return strchr(path, sess->sep_args);
 
-	arg = strchr(path, sess->sep_name);
-	res = gf_url_colon_suffix(path);
-	if (arg && res && (res > arg))
-		res = gf_url_colon_suffix(arg+1);
+	res = gf_url_colon_suffix(path, sess->sep_name);
+	//if path is one of this proto, check if we have a port specified
+	if (!strncmp(path, "tcp://", 6)
+		|| !strncmp(path, "udp://", 6)
+		|| !strncmp(path, "tcpu://", 7)
+		|| !strncmp(path, "udpu://", 7)
+		|| !strncmp(path, "rtp://", 6)
+		|| !strncmp(path, "route://", 8)
+	) {
+		char *sep2 = res ? strchr(res+1, ':') : NULL;
+		char *sep3 = res ? strchr(res+1, '/') : NULL;
+		if (sep2 && sep3 && (sep2>sep3)) {
+			sep2 = strchr(sep3, ':');
+		}
+		if (sep2 || sep3 || res) {
+			u32 port = 0;
+			if (sep2) {
+				sep2[0] = 0;
+				if (sep3) sep3[0] = 0;
+			}
+			else if (sep3) sep3[0] = 0;
+			if (sscanf(res+1, "%d", &port)==1) {
+				char szPort[20];
+				snprintf(szPort, 20, "%d", port);
+				if (strcmp(res+1, szPort))
+					port = 0;
+			}
+			if (sep2) sep2[0] = ':';
+			if (sep3) sep3[0] = '/';
+
+			if (port) res = sep2;
+		}
+	}
 	return res;
 }
 
@@ -59,7 +88,6 @@
 	char szEscape[7];
 	char *args_striped = NULL;
 	if (in_args) {
-		char szDst[6];
 		const char *key;
 		if (is_dst) {
 			key = "dst";
@@ -69,12 +97,16 @@
 		if (!strncmp(in_args, key, 3) && (in_args[3]==fsess->sep_name)) {
 			args_striped = (char *) in_args;
 		} else {
+			char szDst[6];
 			sprintf(szDst, "%c%s%c", fsess->sep_name, key, fsess->sep_name);
 			args_striped = strstr(in_args, szDst);
 		}
 
 		if (args_striped) {
-			args_striped = (char *)gf_fs_path_escape_colon(fsess, args_striped+4);
+			args_striped += 4;
+			if (!strncmp(args_striped, "gcryp://", 8))
+				args_striped += 8;
+			args_striped = (char *)gf_fs_path_escape_colon(fsess, args_striped);
 			if (args_striped) args_striped ++;
 		} else {
 			args_striped = (char *)in_args;
@@ -91,6 +123,10 @@
 {
 	return gf_filter_get_args_stripped(filter->session, filter->dst_args, GF_TRUE);
 }
+const char *gf_filter_get_src_args(GF_Filter *filter)
+{
+	return filter->orig_args ? filter->orig_args : filter->src_args;
+}
 
 char *gf_filter_get_dst_name(GF_Filter *filter)
 {
@@ -126,6 +162,63 @@
 	return res;
 }
 
+/*push arguments from source and dest into the final argument string. We strip the following
+- FID: will be inherited from last explicit filter in the chain
+- SID: is cloned during the resolution while loading the filter chain
+- TAG: TAG is never inherited
+- local options: by definition these options only apply to the loaded filter, and are never inherited
+- user-assigned PID properties on destination (they only apply after the destination, not in the new chain).
+
+Note that user-assigned PID properties assigned on source are inherited so that
+	-i SRC:#PidProp=PidVal -o dst
+
+will have all intermediate filters loaded for the resolution (eg demux) set this property.
+
+*/
+static void filter_push_args(GF_FilterSession *fsess, char **out_args, char *in_args, Bool is_src, Bool first_sep_inserted)
+{
+	char szSep[2];
+	Bool prev_is_db_sep = GF_FALSE;
+	szSep[0] = fsess->sep_args;
+	szSep[1] = 0;
+	while (in_args) {
+		char *sep = strchr(in_args, fsess->sep_args);
+		if (sep) sep[0] = 0;
+
+		if (!strncmp(in_args, "gfloc", 5) && (!in_args[5] || (in_args[5]==fsess->sep_args))) {
+			if (sep) sep[0] = fsess->sep_args;
+			return;
+		}
+		if (!strncmp(in_args, "FID", 3) && (in_args[3]==fsess->sep_name)) {
+		}
+		else if (!strncmp(in_args, "SID", 3) && (in_args[3]==fsess->sep_name)) {
+		}
+		else if (!strncmp(in_args, "TAG", 3) && (in_args[3]==fsess->sep_name)) {
+		}
+		else if (!strncmp(in_args, "FS", 2) && (in_args[2]==fsess->sep_name)) {
+		}
+		else if (!is_src && (in_args[0]==fsess->sep_frag)) {
+
+		} else {
+			if (*out_args && !first_sep_inserted) {
+				gf_dynstrcat(out_args, szSep, NULL);
+				if (prev_is_db_sep)
+					gf_dynstrcat(out_args, szSep, NULL);
+			}
+			gf_dynstrcat(out_args, in_args, NULL);
+			first_sep_inserted = GF_FALSE;
+		}
+		if (!sep) break;
+		sep[0] = fsess->sep_args;
+		in_args = sep+1;
+		prev_is_db_sep = GF_FALSE;
+		if (in_args[0] == fsess->sep_args) {
+			in_args ++;
+			prev_is_db_sep = GF_TRUE;
+		}
+	}
+}
+
 GF_Filter *gf_filter_new(GF_FilterSession *fsess, const GF_FilterRegister *freg, const char *src_args, const char *dst_args, GF_FilterArgType arg_type, GF_Err *err, GF_Filter *multi_sink_target, Bool is_dynamic_filter)
 {
 	char szName[200];
@@ -144,7 +237,7 @@
 	filter->freg = freg;
 	filter->session = fsess;
 	filter->max_extra_pids = freg->max_extra_pids;
-	filter->dynamic_filter = is_dynamic_filter;
+	filter->dynamic_filter = is_dynamic_filter ? 1 : 0;
 
 	if (fsess->use_locks) {
 		snprintf(szName, 200, "Filter%sPackets", filter->freg->name);
@@ -170,13 +263,14 @@
 	filter->blacklisted = gf_list_new();
 	filter->destination_filters = gf_list_new();
 	filter->destination_links = gf_list_new();
+	filter->temp_input_pids = gf_list_new();
 
 	filter->bundle_idx_at_resolution = -1;
 	filter->cap_idx_at_resolution = -1;
 
-	if (fsess->filters_mx) gf_mx_p(fsess->filters_mx);
+	gf_mx_p(fsess->filters_mx);
 	gf_list_add(fsess->filters, filter);
-	if (fsess->filters_mx) gf_mx_v(fsess->filters_mx);
+	gf_mx_v(fsess->filters_mx);
 
 	filter->multi_sink_target = multi_sink_target;
 
@@ -211,43 +305,70 @@
 		char *all_args;
 		const char *dbsep;
 		char *localarg_marker;
-		u32 nb_db_sep=0;
+		u32 nb_db_sep=0, src_arg_len;
 		char szDBSep[3];
 		Bool insert_escape = GF_FALSE;
-		u32 len = 2 + (u32) strlen(src_striped) + (u32) strlen(dst_striped);
-		//source has a URL (locat or not), escape it to make sure we don't pass dst args as params to the URL
+		Bool dst_sep_inserted = GF_FALSE;
+		//source has a URL (local or not), escape it to make sure we don't pass dst args as params to the URL
 		if ((strstr(src_striped, "src=") || strstr(src_striped, "dst=")) && strstr(src_striped, "://")){
 			char szEscape[10];
 			sprintf(szEscape, "%cgpac", fsess->sep_args);
 			if (strstr(src_striped, szEscape)==NULL) {
 				insert_escape = GF_TRUE;
-				len += 5;
 			}
 		}
 
 		szDBSep[0] = szDBSep[1] = filter->session->sep_args;
 		szDBSep[2] = 0;
+
+		//handle the case where the first src arg was escaped ("filter::opt"), src args is now ":opt
+		//consider we have one double sep
+		if (src_striped[0] == filter->session->sep_args)
+			nb_db_sep = 1;
+
 		dbsep = src_striped;
 		while (dbsep) {
 			char *next_dbsep = strstr(dbsep, szDBSep);
 			if (!next_dbsep) break;
 			nb_db_sep++;
 			dbsep = next_dbsep+2;
+			//this happens when we had cat :opt1 and ::opt2, this results in :opt1:::opt2
+			//consider that this is a new escaped option
+			while (dbsep[0] == filter->session->sep_args) {
+				nb_db_sep++;
+				dbsep++;
+			}
 		}
 		if (nb_db_sep % 2) nb_db_sep=1;
 		else nb_db_sep=0;
 
-		all_args = gf_malloc(sizeof(char)*(len+nb_db_sep));
+
 		if (!nb_db_sep) {
 			szDBSep[1] = 0;
 		}
+		//src_striped is ending with our separator, don't insert a new one
+		src_arg_len = (u32)strlen(src_striped);
+		if (src_arg_len && (src_striped[src_arg_len-1] == filter->session->sep_args)) {
+			szDBSep[0] = 0;
+		}
 
-		if (insert_escape) {
-			sprintf(all_args, "%s%sgpac%c%s", src_striped, szDBSep, fsess->sep_args, dst_striped);
-		} else {
-			sprintf(all_args, "%s%s%s", src_striped, szDBSep, dst_striped);
+		//push src args
+		all_args = NULL;
+		filter_push_args(fsess, &all_args, (char *) src_striped, GF_TRUE, GF_FALSE);
+
+		if (all_args && insert_escape) {
+			gf_dynstrcat(&all_args, szDBSep, NULL);
+			gf_dynstrcat(&all_args, "gpac", NULL);
+			dst_sep_inserted = GF_TRUE;
+		} else if (all_args) {
+			gf_dynstrcat(&all_args, szDBSep, NULL);
+			dst_sep_inserted = GF_TRUE;
 		}
-		localarg_marker = strstr(all_args, "gfloc");
+		//push dst args
+		filter_push_args(fsess, &all_args, (char *) dst_striped, GF_FALSE, dst_sep_inserted);
+
+
+		localarg_marker = all_args ? strstr(all_args, "gfloc") : NULL;
 		if (localarg_marker) {
 			localarg_marker[0]=0;
 			if (strlen(all_args) && (localarg_marker[-1]==fsess->sep_args))
@@ -257,8 +378,18 @@
 		filter->orig_args = all_args;
 		src_striped = NULL;
 	} else if (dst_striped) {
+		//remove local args from dst
+		char *localarg_marker = strstr(dst_striped, "gfloc");
+		if (localarg_marker) {
+			localarg_marker--;
+			if (localarg_marker[0]!=filter->session->sep_args)
+				localarg_marker = NULL;
+			else
+				localarg_marker[0] = 0;
+		}
 		e = gf_filter_new_finalize(filter, dst_striped, arg_type);
 		filter->orig_args = gf_strdup(dst_striped);
+		if (localarg_marker) localarg_marker[0] = filter->session->sep_args;
 		src_striped = NULL;
 	} else {
 		e = gf_filter_new_finalize(filter, src_striped, arg_type);
@@ -267,7 +398,7 @@
 
 	if (e) {
 		if (!filter->setup_notified && (e<0) ) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Error %s while instantiating filter %s\n", gf_error_to_string(e),freg->name));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Error %s while instantiating filter %s\n", gf_error_to_string(e),freg->name));
 			gf_filter_setup_failure(filter, e);
 		}
 		if (err) *err = e;
@@ -278,7 +409,8 @@
 		}
 		return NULL;
 	}
-	if (filter && src_striped) filter->orig_args = gf_strdup(src_striped);
+	if (filter && src_striped)
+		filter->orig_args = gf_strdup(src_striped);
 
 	for (i=0; i<freg->nb_caps; i++) {
 		if (freg->caps[i].flags & GF_CAPFLAG_OUTPUT) {
@@ -301,7 +433,13 @@
 	if (filter->freg->initialize) {
 		GF_Err e;
 		FSESS_CHECK_THREAD(filter)
-		e = filter->freg->initialize(filter);
+		if (((arg_type==GF_FILTER_ARG_EXPLICIT_SOURCE) || (arg_type==GF_FILTER_ARG_EXPLICIT_SINK)) && !filter->orig_args) {
+			filter->orig_args = (char *)args;
+			e = filter->freg->initialize(filter);
+			filter->orig_args = NULL;
+		} else {
+			e = filter->freg->initialize(filter);
+		}
 		if (e) return e;
 	}
 	if ((filter->freg->flags & GF_FS_REG_SCRIPT) && filter->freg->update_arg) {
@@ -323,7 +461,8 @@
 #ifdef GPAC_HAS_QJS
 	jsfs_on_filter_created(filter);
 #endif
-
+	if (filter->session->on_filter_create_destroy)
+		filter->session->on_filter_create_destroy(filter->session->rt_udta, filter, GF_FALSE);
 	return GF_OK;
 }
 
@@ -352,7 +491,7 @@
 
 void gf_filter_del(GF_Filter *filter)
 {
-	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s destruction\n", filter->name));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s destruction\n", filter->name));
 	assert(filter);
 //	assert(!filter->detached_pid_inst);
 	assert(!filter->detach_pid_tasks_pending);
@@ -364,6 +503,9 @@
 	jsfs_on_filter_destroyed(filter);
 #endif
 
+	if (filter->session->on_filter_create_destroy)
+		filter->session->on_filter_create_destroy(filter->session->rt_udta, filter, GF_TRUE);
+
 #ifndef GPAC_DISABLE_3D
 	gf_list_del_item(filter->session->gl_providers, filter);
 	gf_fs_check_gl_provider(filter->session);
@@ -400,6 +542,8 @@
 	gf_list_del(filter->destination_filters);
 	gf_list_del(filter->destination_links);
 	gf_list_del(filter->source_filters);
+	gf_list_del(filter->temp_input_pids);
+
 	gf_list_del(filter->input_pids);
 	gf_fq_del(filter->tasks, task_del);
 	gf_fq_del(filter->pending_pids, NULL);
@@ -426,6 +570,7 @@
 	if (filter->dst_args) gf_free(filter->dst_args);
 	if (filter->name) gf_free(filter->name);
 	if (filter->status_str) gf_free(filter->status_str);
+	if (filter->restricted_source_id) gf_free(filter->restricted_source_id);
 
 	if (!filter->session->in_final_flush && !filter->session->run_status) {
 		u32 i, count;
@@ -433,6 +578,7 @@
 		count = gf_list_count(filter->session->filters);
 		for (i=0; i<count; i++) {
 			GF_Filter *a_filter = gf_list_get(filter->session->filters, i);
+			gf_mx_p(a_filter->tasks_mx);
 			gf_list_del_item(a_filter->destination_filters, filter);
 			gf_list_del_item(a_filter->destination_links, filter);
 			gf_list_del_item(a_filter->source_filters, filter);
@@ -446,6 +592,7 @@
 				a_filter->target_filter = NULL;
 			if (a_filter->dst_filter == filter)
 				a_filter->dst_filter = NULL;
+			gf_mx_v(a_filter->tasks_mx);
 		}
 		gf_mx_v(filter->session->filters_mx);
 	}
@@ -463,6 +610,20 @@
 		gf_free(filter->iname);
 #endif
 
+	if (filter->freg && (filter->freg->flags & GF_FS_REG_CUSTOM)) {
+		//external custom filters
+		if (! (filter->freg->flags & GF_FS_REG_SCRIPT) && filter->forced_caps) {
+			u32 i;
+			for (i=0; i<filter->nb_forced_caps; i++) {
+				if (filter->forced_caps[i].name)
+					gf_free((char *) filter->forced_caps[i].name);
+				gf_props_reset_single( (GF_PropertyValue *) & filter->forced_caps[i].val);
+			}
+			gf_free( (void *) filter->forced_caps);
+		}
+		gf_free( (char *) filter->freg->name);
+		gf_free( (void *) filter->freg);
+	}
 	gf_free(filter);
 }
 
@@ -504,24 +665,37 @@
 void gf_filter_reset_source(GF_Filter *filter)
 {
 	if (filter && filter->source_ids) {
+		gf_mx_p(filter->session->filters_mx);
 		gf_free(filter->source_ids);
 		filter->source_ids = NULL;
+		gf_mx_v(filter->session->filters_mx);
 	}
 }
 
 static void gf_filter_set_sources(GF_Filter *filter, const char *sources_ID)
 {
 	assert(filter);
+
+	gf_mx_p(filter->session->filters_mx);
+
 	if (!sources_ID) {
 		if (filter->source_ids) gf_free(filter->source_ids);
 		filter->source_ids = NULL;
-		return;
-	}
-	if (!filter->source_ids) {
+	} else if (!filter->source_ids) {
 		filter->source_ids = gf_strdup(sources_ID);
-		return;
+	} else {
+		char *found = strstr(filter->source_ids, sources_ID);
+		if (found) {
+			u32 len = (u32) strlen(sources_ID);
+			if ((found[len]==0) || (found[len]==',')) {
+				gf_mx_v(filter->session->filters_mx);
+				return;
+			}
+		}
+		gf_dynstrcat(&filter->source_ids, sources_ID, ",");
 	}
-	gf_dynstrcat(&filter->source_ids, sources_ID, ",");
+
+	gf_mx_v(filter->session->filters_mx);
 }
 
 static void gf_filter_set_arg(GF_Filter *filter, const GF_FilterArgs *a, GF_PropertyValue *argv)
@@ -548,8 +722,7 @@
 		}
 		break;
 	case GF_PROP_UINT:
-	case GF_PROP_PIXFMT:
-	case GF_PROP_PCMFMT:
+	case GF_PROP_4CC:
 		if (a->offset_in_private + sizeof(u32) <= filter->freg->private_size) {
 			*(u32 *)ptr = argv->value.uint;
 			res = GF_TRUE;
@@ -609,24 +782,12 @@
 			res = GF_TRUE;
 		}
 		break;
-	case GF_PROP_VEC3:
-		if (a->offset_in_private + sizeof(GF_PropVec3) <= filter->freg->private_size) {
-			*(GF_PropVec3 *)ptr = argv->value.vec3;
-			res = GF_TRUE;
-		}
-		break;
 	case GF_PROP_VEC4I:
 		if (a->offset_in_private + sizeof(GF_PropVec4i) <= filter->freg->private_size) {
 			*(GF_PropVec4i *)ptr = argv->value.vec4i;
 			res = GF_TRUE;
 		}
 		break;
-	case GF_PROP_VEC4:
-		if (a->offset_in_private + sizeof(GF_PropVec4) <= filter->freg->private_size) {
-			*(GF_PropVec4 *)ptr = argv->value.vec4;
-			res = GF_TRUE;
-		}
-		break;
 
 	case GF_PROP_NAME:
 	case GF_PROP_STRING:
@@ -636,6 +797,11 @@
 			*(char **)ptr = argv->value.string;
 			res = GF_TRUE;
 		}
+		if (argv->value.string && !strncmp(argv->value.string, "gfio://", 7)) {
+			if (gf_fileio_is_main_thread(argv->value.string)) {
+				gf_filter_force_main_thread(filter, GF_TRUE);
+			}
+		}
 		break;
 	case GF_PROP_DATA:
 	case GF_PROP_DATA_NO_COPY:
@@ -657,20 +823,22 @@
 		break;
 	case GF_PROP_STRING_LIST:
 		if (a->offset_in_private + sizeof(void *) <= filter->freg->private_size) {
-			GF_List *l = *(GF_List **)ptr;
-			if (l) {
-				while (gf_list_count(l)) {
-					char *s = gf_list_pop_back(l);
-					gf_free(s);
-				}
-				gf_list_del(l);
+			u32 k;
+			GF_PropStringList *l = (GF_PropStringList *)ptr;
+			for (k=0; k<l->nb_items; k++) {
+				gf_free(l->vals[k]);
 			}
+			if (l->vals) gf_free(l->vals);
 			//we don't clone since we don't free the string at the caller site
-			*(GF_List **)ptr = argv->value.string_list;
+			*l = argv->value.string_list;
 			res = GF_TRUE;
 		}
 		break;
 	case GF_PROP_UINT_LIST:
+	case GF_PROP_4CC_LIST:
+	case GF_PROP_SINT_LIST:
+	case GF_PROP_VEC2I_LIST:
+		//use uint_list as base type for lists
 		if (a->offset_in_private + sizeof(void *) <= filter->freg->private_size) {
 			GF_PropUIntList *l = (GF_PropUIntList *)ptr;
 			if (l->vals) gf_free(l->vals);
@@ -679,9 +847,15 @@
 		}
 		break;
 	default:
+		if (gf_props_type_is_enum(argv->type)) {
+			if (a->offset_in_private + sizeof(u32) <= filter->freg->private_size) {
+				*(u32 *)ptr = argv->value.uint;
+				res = GF_TRUE;
+			}
+			break;
+		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Property type %s not supported for filter argument\n", gf_props_get_type_name(argv->type) ));
 		return;
-		break;
 	}
 	if (!res) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to set argument %s: memory offset %d overwrite structure size %f\n", a->arg_name, a->offset_in_private, filter->freg->private_size));
@@ -774,38 +948,12 @@
 		}
 	}
 	else if (!strnicmp(value, "$GJS", 4)) {
-		Bool found = GF_FALSE;
-		const char *all_dirs = gf_opts_get_key("core", "js-dirs");
-		if (all_dirs) {
-			const char *dirs = all_dirs;
-			while (dirs && dirs[0]) {
-				char *sep = strchr(dirs, ',');
-				if (sep) {
-					u32 cplen = (u32) (sep-dirs);
-					if (cplen>=GF_MAX_PATH) cplen = GF_MAX_PATH-1;
-					strncpy(szPath, dirs, cplen);
-					szPath[cplen]=0;
-					dirs = sep+1;
-				} else {
-					strcpy(szPath, dirs);
-				}
-				if (!strcmp(szPath, "$GJS")) {
-					gf_opts_default_shared_directory(szPath);
-					strcat(szPath, "/scripts/jsf");
-				}
-				strcat(szPath, value+4);
-				if (gf_file_exists(szPath)) {
-					value = szPath;
-					found = GF_TRUE;
-					break;
-				}
-				if (!sep) break;
-			}
-			if (!found) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed solve to %s in GPAC script directories %s, file not found\n", value, all_dirs));
-			}
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to query GPAC shared resource directory location\n"));
+		Bool gf_fs_solve_js_script(char *szPath, const char *file_name, const char *file_ext);
+
+		Bool found = gf_fs_solve_js_script(szPath, value+4, NULL);
+
+		if (!found) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed solve to %s in GPAC script directories, file not found\n", value));
 		}
 	}
 	else if (!strnicmp(value, "$GLANG", 6)) {
@@ -826,57 +974,68 @@
 	return argv;
 }
 
-void gf_filter_update_arg_task(GF_FSTask *task)
+Bool gf_filter_update_arg_apply(GF_Filter *filter, const char *arg_name, const char *arg_value, Bool is_sync_call)
 {
 	u32 i=0;
-	Bool found = GF_FALSE;
-	GF_FilterUpdate *arg=task->udta;
 	//find arg
-	i=0;
-	while (task->filter->freg->args) {
+	while (filter->freg->args) {
 		GF_PropertyValue argv;
-		const GF_FilterArgs *a = &task->filter->freg->args[i];
+		const GF_FilterArgs *a = &filter->freg->args[i];
 		i++;
 		Bool is_meta = GF_FALSE;
 		if (!a || !a->arg_name) break;
 
 		if ((a->flags & GF_FS_ARG_META) && !strcmp(a->arg_name, "*")) {
-			if (!task->filter->freg->update_arg)
+			if (!filter->freg->update_arg)
 				continue;
 			is_meta = GF_TRUE;
-		} else if (strcmp(a->arg_name, arg->name)) {
+		} else if (strcmp(a->arg_name, arg_name)) {
 			continue;
 		}
+		//we found the argument
 
-		found = GF_TRUE;
-		if (!is_meta && ! (a->flags & GF_FS_ARG_UPDATE) ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Argument %s of filter %s is not updatable - ignoring\n", a->arg_name, task->filter->name));
-			break;
+		if (!is_meta && ! (a->flags & (GF_FS_ARG_UPDATE|GF_FS_ARG_UPDATE_SYNC) ) ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Argument %s of filter %s is not updatable - ignoring\n", a->arg_name, filter->name));
+			return GF_TRUE;
+		}
+
+		if (a->flags & GF_FS_ARG_UPDATE_SYNC) {
+			if (!is_sync_call) return GF_TRUE;
 		}
 
-		argv = gf_filter_parse_prop_solve_env_var(task->filter, a->arg_type, a->arg_name, arg->val, a->min_max_enum);
+		argv = gf_filter_parse_prop_solve_env_var(filter, a->arg_type, a->arg_name, arg_value, a->min_max_enum);
 
 		if (argv.type != GF_PROP_FORBIDEN) {
 			GF_Err e = GF_OK;
-			FSESS_CHECK_THREAD(task->filter)
+			if (!is_sync_call) {
+				FSESS_CHECK_THREAD(filter)
+			}
 			//if no update function consider the arg OK
-			if (task->filter->freg->update_arg) {
-				e = task->filter->freg->update_arg(task->filter, arg->name, &argv);
+			if (filter->freg->update_arg) {
+				e = filter->freg->update_arg(filter, arg_name, &argv);
 			}
 			if (e==GF_OK) {
 				if (!is_meta)
-					gf_filter_set_arg(task->filter, a, &argv);
+					gf_filter_set_arg(filter, a, &argv);
 			} else if (e!=GF_NOT_FOUND) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s did not accept update of arg %s to value %s: %s\n", task->filter->name, arg->name, arg->val, gf_error_to_string(e) ));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s did not accept update of arg %s to value %s: %s\n", filter->name, arg_name, arg_value, gf_error_to_string(e) ));
 			}
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to parse argument %s value %s\n", a->arg_name, a->arg_default_val));
 		}
-		break;
+		return GF_TRUE;
 	}
+	return GF_FALSE;
+}
+void gf_filter_update_arg_task(GF_FSTask *task)
+{
+	GF_FilterUpdate *arg=task->udta;
+
+	Bool found = gf_filter_update_arg_apply(task->filter, arg->name, arg->val, GF_FALSE);
 
 	if (!found) {
 		if (arg->recursive) {
+			u32 i;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Failed to locate argument %s in filter %s, propagating %s the filter chain\n", arg->name, task->filter->freg->name,
 				(arg->recursive & (GF_FILTER_UPDATE_UPSTREAM|GF_FILTER_UPDATE_DOWNSTREAM)) ? "up and down" : ((arg->recursive & GF_FILTER_UPDATE_UPSTREAM) ? "up" : "down") ));
 
@@ -895,6 +1054,7 @@
 
 			}
 			if (arg->recursive & GF_FILTER_UPDATE_DOWNSTREAM) {
+				gf_mx_p(task->filter->tasks_mx);
 				for (i=0; i<task->filter->num_input_pids; i++) {
 					GF_FilterPidInst *pidi = gf_list_get(task->filter->input_pids, i);
 					if (gf_list_find(flist, pidi->pid->filter)<0) gf_list_add(flist, pidi->pid->filter);
@@ -905,6 +1065,8 @@
 					//only allow downstream propagation
 					gf_fs_send_update(task->filter->session, NULL, a_f, arg->name, arg->val, GF_FILTER_UPDATE_DOWNSTREAM);
 				}
+
+				gf_mx_v(task->filter->tasks_mx);
 			}
 
 			gf_list_del(flist);
@@ -919,6 +1081,7 @@
 
 static const char *gf_filter_load_arg_config(GF_Filter *filter, const char *sec_name, const char *arg_name, const char *arg_val)
 {
+	char szArg[101];
 	Bool gf_sys_has_filter_global_args();
 	const char *opt;
 	GF_FilterSession *session = filter->session;
@@ -928,30 +1091,42 @@
 		u32 alen = (u32) strlen(arg_name);
 		u32 i, nb_args = gf_sys_get_argc();
 		for (i=0; i<nb_args; i++) {
-			const char *per_filter;
-			const char *arg = gf_sys_get_arg(i);
+			u32 flen = 0;
+			const char *per_filter, *sep2, *sep;
+			const char *o_arg, *arg = gf_sys_get_arg(i);
 			if (arg[0]!='-') continue;
 			if (arg[1]!='-') continue;
 
 			arg += 2;
+			o_arg = arg;
+			//allow filter@opt= and filter:opt=
+			sep = strchr(arg, '=');
 			per_filter = strchr(arg, '@');
+			sep2 = strchr(arg, ':');
+			if (sep && per_filter && (sep<per_filter)) per_filter = NULL;
+			if (sep && sep2 && (sep<sep2)) sep2 = NULL;
+			if (per_filter && sep2 && (sep2<per_filter)) per_filter = sep2;
+			else if (!per_filter) per_filter = sep2;
+
 			if (per_filter) {
-				u32 len = (u32) (per_filter - arg);
-				if (!len || strncmp(filter->freg->name, arg, len))
+				flen = (u32) (per_filter - arg);
+				if (!flen || strncmp(filter->freg->name, arg, flen))
 					continue;
-				arg += len+1;
+				flen++;
+				arg += flen;
 			}
 
 			if (!strncmp(arg, arg_name, alen)) {
 				u32 len=0;
-				char *sep = strchr(arg, '=');
 				if (sep) {
 					len = (u32) (sep - (arg));
 				} else {
 					len = (u32) strlen(arg);
 				}
 				if (len != alen) continue;
-				gf_fs_push_arg(session, arg_name, GF_TRUE, 0);
+				strncpy(szArg, o_arg, 100);
+				szArg[ MIN(flen + alen, 100) ] = 0;
+				gf_fs_push_arg(session, szArg, GF_TRUE, GF_ARGTYPE_LOCAL, NULL);
 
 				if (sep) return sep+1;
 				//no arg value means boolean true
@@ -965,11 +1140,12 @@
 	if (opt)
 		return opt;
 
-	//ifce (used by socket and keep MP4Client behaviour: some options are set in MP4Client main apply them
+	//ifce (used by socket and keep MP4Client behavior: some options are set in MP4Client main apply them
 	if (!strcmp(arg_name, "ifce")) {
 		opt = gf_opts_get_key("core", "ifce");
 		if (opt)
 			return opt;
+		return NULL;
 	}
 
 	return arg_val;
@@ -979,6 +1155,7 @@
 {
 	GF_PropertyValue argv;
 	Bool gf_sys_has_filter_global_meta_args();
+	Bool gf_sys_has_filter_global_args();
 	u32 i, key_count = gf_opts_get_key_count(sec_name);
 
 	FSESS_CHECK_THREAD(filter)
@@ -1007,46 +1184,67 @@
 		argv.value.string = (char *) arg_val;
 		filter->freg->update_arg(filter, arg_name, &argv);
 	}
-	if (!gf_sys_has_filter_global_meta_args()) return;
+	if (!gf_sys_has_filter_global_meta_args()
+		//allow -- syntax as well
+		&& !gf_sys_has_filter_global_args()
+	) {
+		return;
+	}
 
 	key_count = gf_sys_get_argc();
 	for (i=0; i<key_count; i++) {
 #define META_MAX_ARG	1000
 		char szArg[META_MAX_ARG+1];
 		GF_Err e;
+		u32 len = 0;
 		const char *per_filter;
-		const char *sep, *arg = gf_sys_get_arg(i);
+		const char *sep, *sep2, *o_arg, *arg = gf_sys_get_arg(i);
 		if (arg[0] != '-') continue;
-		if (arg[1] != '+') continue;
+		if ((arg[1] != '+') && (arg[1] != '-')) continue;
 		arg+=2;
 
+		o_arg = arg;
+
+		//allow filter@opt= and filter:opt=
+		sep = strchr(arg, '=');
 		per_filter = strchr(arg, '@');
+		sep2 = strchr(arg, ':');
+		if (sep && per_filter && (sep<per_filter)) per_filter = NULL;
+		if (sep && sep2 && (sep<sep2)) sep2 = NULL;
+		if (per_filter && sep2 && (sep2<per_filter)) per_filter = sep2;
+		else if (!per_filter) per_filter = sep2;
+
 		if (per_filter) {
-			u32 len = (u32) (per_filter - arg);
+			len = (u32) (per_filter - arg);
 			if (!len || strncmp(filter->freg->name, arg, len))
 				continue;
-			arg += len+1;
+			len++;
+			arg += len;
 		}
 
-		sep = strchr(arg, '=');
 		memset(&argv, 0, sizeof(GF_PropertyValue));
 		argv.type = GF_PROP_STRING;
 		if (sep) {
-			u32 cplen = (u32) (sep - arg);
+			u32 cplen = (u32) (sep - o_arg);
 			if (cplen>=META_MAX_ARG) cplen=META_MAX_ARG;
-			strncpy(szArg, arg, cplen);
-			szArg[META_MAX_ARG] = 0;
+			strncpy(szArg, o_arg, cplen);
+			szArg[cplen] = 0;
 			argv.value.string = (char *) sep+1;
 		} else {
-			u32 cplen = (u32) strlen(arg);
+			u32 cplen = (u32) strlen(o_arg);
 			if (cplen>=META_MAX_ARG) cplen=META_MAX_ARG;
-			strncpy(szArg, arg, cplen);
-			szArg[META_MAX_ARG] = 0;
+			memcpy(szArg, o_arg, cplen);
+			szArg[cplen] = 0;
 		}
 #undef META_MAX_ARG
 
-		e = filter->freg->update_arg(filter, szArg, &argv);
-		gf_fs_push_arg(filter->session, szArg, (e==GF_OK) ? GF_TRUE : GF_FALSE, 2);
+		e = filter->freg->update_arg(filter, szArg + len, &argv);
+		if (e) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Error assigning argument %s to filter %s: %s\n", szArg, filter->name, gf_errno_str(e) ));
+		}
+
+		//no need to push the arg, global args are always pushed when creating the session,
+		//and meta filters must report used/unused options
 	}
 }
 
@@ -1061,6 +1259,23 @@
 	if (args)
 		szArg = gf_malloc(sizeof(char)*1024);
 
+	//by default always force a remux
+	if ((arg_type==GF_FILTER_ARG_EXPLICIT_SINK)
+		&& !filter->dynamic_filter
+		&& !filter->multi_sink_target
+		&& (filter->freg->flags & GF_FS_REG_FORCE_REMUX)
+	) {
+		filter->force_demux = GF_TRUE;
+	}
+	//implicit linking mode: if not a script or if script init (initialized called) and no extra pid set, enable clonable 
+	if ( (filter->session->flags & GF_FS_FLAG_IMPLICIT_MODE)
+		&& !filter->max_extra_pids
+		&& (for_script || !(filter->freg->flags&GF_FS_REG_SCRIPT))
+		&& ((arg_type==GF_FILTER_ARG_EXPLICIT_SINK) || (arg_type==GF_FILTER_ARG_EXPLICIT))
+	) {
+		filter->clonable = GF_FILTER_CLONE_PROBE;
+	}
+
 	//parse each arg
 	while (args) {
 		char *value;
@@ -1080,6 +1295,9 @@
 			while (args[0] == filter->session->sep_args) {
 				args++;
 			}
+			if (!args[0])
+				break;
+
 			sep = (char *) args + 1;
 			while (1) {
 				sep = strchr(sep, filter->session->sep_args);
@@ -1096,8 +1314,12 @@
 			//we don't use gf_fs_path_escape_colon here because we also analyse whether the URL is internal or not, and we don't want to do that on each arg
 
 			if (filter->session->sep_args == ':') {
+				if (sep && !strncmp(args, szSrc, 4) && !strncmp(args+4, "gcryp://", 8)) {
+					sep = strstr(args+12, "://");
+				}
 				while (sep && !strncmp(sep, "://", 3)) {
 					absolute_url = GF_TRUE;
+
 					//filter internal url schemes
 					if ((!strncmp(args, szSrc, 4) || !strncmp(args, szDst, 4) ) &&
 						(!strncmp(args+4, "video://", 8)
@@ -1113,6 +1335,7 @@
 						|| !strncmp(args+4, "rtp://", 6)
 						|| !strncmp(args+4, "atsc://", 7)
 						|| !strncmp(args+4, "gfio://", 7)
+						|| !strncmp(args+4, "route://", 8)
 						)
 					) {
 						internal_url = GF_TRUE;
@@ -1122,6 +1345,7 @@
 							|| !strncmp(args+4, "tcpu://", 7)
 							|| !strncmp(args+4, "udpu://", 7)
 							|| !strncmp(args+4, "rtp://", 6)
+							|| !strncmp(args+4, "route://", 8)
 						) {
 							char *sep2 = sep ? strchr(sep+1, ':') : NULL;
 							char *sep3 = sep ? strchr(sep+1, '/') : NULL;
@@ -1149,7 +1373,31 @@
 						}
 
 					} else {
-						char *sep2 = strstr(sep+3, "::");
+						//look for '::' vs ':gfopt' and ':gpac:' - if '::' appears before these, jump to '::'
+						char *sep2 = strstr(sep+3, ":gfopt:");
+						char *sep3 = strstr(sep+3, ":gfloc:");
+						if (sep2 && sep3 && sep2>sep3)
+							sep2 = sep3;
+						else if (!sep2)
+							sep2 = sep3;
+
+						//keep first of :gfopt:, :gfloc: or :gpac: in sep3
+						sep3 = strstr(sep+3, szEscape);
+						if (sep2 && sep3 && sep2<sep3)
+							sep3 = sep2;
+						else if (!sep3)
+							sep3 = sep2;
+
+						sep2 = strstr(sep+3, "::");
+						if (sep2 && sep3 && sep3<sep2)
+							sep2 = sep3;
+						else if (sep2)
+							opaque_arg = GF_TRUE; //skip an extra ':' at the end of the arg parsing
+						else {
+							//first occurence of our internal separator if any
+							sep2 = sep3;
+						}
+
 						//escape sequence present after this argument, use it
 						if (sep2) {
 							sep = sep2;
@@ -1175,12 +1423,39 @@
 
 skip_date:
 					if (prev_date) {
+						u32 char_idx=1;
+						u32 nb_date_seps=0;
+						Bool last_non_num=GF_FALSE;
 						char *search_after = NULL;
-						//assume date Th:m:s or Th:mm:s or Thh:m:s or Thh:mm:s
-						if ((prev_date[2] == ':') && (prev_date[4] == ':')) search_after = prev_date+5;
-						else if ((prev_date[2] == ':') && (prev_date[5] == ':')) search_after = prev_date+6;
-						else if ((prev_date[3] == ':') && (prev_date[5] == ':')) search_after = prev_date+6;
-						else if ((prev_date[3] == ':') && (prev_date[6] == ':')) search_after = prev_date+7;
+						while (1) {
+							char dc = prev_date[char_idx];
+
+							if ((dc>='0') && (dc<='9')) {
+								search_after = prev_date+char_idx;
+								char_idx++;
+								continue;
+							}
+							if (dc == ':') {
+								search_after = prev_date+char_idx;
+								if (nb_date_seps>=3)
+									break;
+								char_idx++;
+								nb_date_seps++;
+								continue;
+							}
+							if ((dc == '.') || (dc == ';')) {
+								if (last_non_num || !nb_date_seps) {
+									search_after = NULL;
+									break;
+								}
+								last_non_num = GF_TRUE;
+								search_after = prev_date+char_idx;
+								char_idx++;
+								continue;
+							}
+							//not a valid char in date, stop
+							break;
+						}
 
 						if (search_after) {
 							//take care of lists
@@ -1199,8 +1474,32 @@
 				}
 			}
 			if (sep) {
-				escaped = strstr(sep, szEscape);
-				if (escaped) sep = escaped;
+				escaped = (sep[1] == filter->session->sep_args) ? NULL : strstr(sep, szEscape);
+				if (escaped) {
+					sep = escaped;
+				}
+				/*no escape, special case for src= and dst= where we need to detect if this is a filename with an option
+				separator in the name, i.e. differentiate
+					foo:bar=toto.mp4:bar2=z
+				and
+					foo:toto.mp4:bar2=z
+
+				We do that by checking that if a file extension is present after the option sep, we don't have an assign ('=')
+				in-between the option sep and the extension.
+				If no assign is persent, ignore all option separators before the file extension
+				cf #1942
+
+				Note that this only works if file extension is present. If not, escape mechanism (eg :gpac:) must be used
+				*/
+				else if (!strncmp(args, szSrc, 4) || !strncmp(args, szDst, 4)) {
+					char *ext_sep = strchr(args, '.');
+					if (ext_sep && (ext_sep>sep)) {
+						char *assign = strchr(args+4, filter->session->sep_name);
+						if (!assign || (assign>ext_sep)) {
+							sep = strchr(ext_sep+1, filter->session->sep_args);
+						}
+					}
+				}
 			}
 
 			if (sep && !strncmp(args, szSrc, 4) && !escaped && absolute_url && !internal_url) {
@@ -1209,6 +1508,7 @@
 				if (!strcmp(args+4, "null")) file_exists = GF_TRUE;
 				else if (!strncmp(args+4, "tcp://", 6)) file_exists = GF_TRUE;
 				else if (!strncmp(args+4, "udp://", 6)) file_exists = GF_TRUE;
+				else if (!strncmp(args+4, "route://", 8)) file_exists = GF_TRUE;
 				else file_exists = gf_file_exists(args+4);
 
 				if (!file_exists) {
@@ -1252,7 +1552,7 @@
 
 		if (len>=alloc_len) {
 			alloc_len = len+1;
-			szArg = gf_realloc(szArg, sizeof(char)*len);
+			szArg = gf_realloc(szArg, sizeof(char)*alloc_len);
 		}
 		strncpy(szArg, args, len);
 		szArg[len]=0;
@@ -1263,6 +1563,7 @@
 			value++;
 		}
 
+		//arg is a PID property assignment
 		if (szArg[0] == filter->session->sep_frag) {
 			filter->user_pid_props = GF_TRUE;
 			goto skip_arg;
@@ -1336,46 +1637,88 @@
 		if (!strlen(szArg)) {
 			found = GF_TRUE;
 		} else if (!found) {
+			//filter ID
 			if (!strcmp("FID", szArg)) {
 				if (arg_type != GF_FILTER_ARG_INHERIT)
 					gf_filter_set_id(filter, value);
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 			}
+			//filter sources
 			else if (!strcmp("SID", szArg)) {
 				if (arg_type!=GF_FILTER_ARG_INHERIT)
 					gf_filter_set_sources(filter, value);
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
-			} else if (!strcmp("clone", szArg)) {
-				if ((arg_type==GF_FILTER_ARG_EXPLICIT_SINK) || (arg_type==GF_FILTER_ARG_EXPLICIT))
-					filter->clonable=GF_TRUE;
+			}
+			//clonable filter
+			else if (!strcmp("clone", szArg)) {
+				if ((arg_type==GF_FILTER_ARG_EXPLICIT_SINK) || (arg_type==GF_FILTER_ARG_EXPLICIT)) {
+					if (value && (!strcmp(value, "0") || !strcmp(value, "false") || !strcmp(value, "no"))) {
+						filter->clonable = GF_FILTER_NO_CLONE;
+					} else {
+						filter->clonable = GF_FILTER_CLONE;
+					}
+				}
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 			}
-			//codec for generic enc load
-			else if (!strcmp("c", szArg)) {
+			//filter name
+			else if (!strcmp("N", szArg)) {
+				if ((arg_type==GF_FILTER_ARG_EXPLICIT_SINK) || (arg_type==GF_FILTER_ARG_EXPLICIT) || (arg_type==GF_FILTER_ARG_EXPLICIT_SOURCE)) {
+					gf_filter_set_name(filter, value);
+				}
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
-			} else if (!strcmp("N", szArg)) {
-				if ((arg_type==GF_FILTER_ARG_EXPLICIT_SINK) || (arg_type==GF_FILTER_ARG_EXPLICIT) || (arg_type==GF_FILTER_ARG_EXPLICIT_SOURCE))
+			}
+			if (!strcmp("FS", szArg)) {
+				if (arg_type != GF_FILTER_ARG_INHERIT)
+					filter->subsession_id = atoi(value);
 
-					gf_filter_set_name(filter, value);
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 			}
-			//codec for generic enc load
-			else if (!strcmp("gfreg", szArg)) {
+			//internal options, nothing to do here
+			else if (
+				//generic encoder load
+				!strcmp("c", szArg)
+				//preferred registry to use
+				|| !strcmp("gfreg", szArg)
+				//non inherited options
+				|| !strcmp("gfloc", szArg)
+			) {
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 			}
-			//codec for generic enc load
+			//non tracked options
 			else if (!strcmp("gfopt", szArg)) {
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 				opts_optional = GF_TRUE;
 			}
-			else if (gf_file_exists(szArg)) {
+			//filter tag
+			else if (!strcmp("TAG", szArg)) {
+				if (! filter->dynamic_filter) {
+					if (filter->tag) gf_free(filter->tag);
+					filter->tag = value ? gf_strdup(value) : NULL;
+				}
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
+			//allow direct copy
+			else if (!strcmp("nomux", szArg)) {
+				//only apply fo explicit sink, not dynamic and no multi-sink target
+				if ((arg_type==GF_FILTER_ARG_EXPLICIT_SINK) && !filter->dynamic_filter && !filter->multi_sink_target) {
+					if (value && (!strcmp(value, "0") || !strcmp(value, "false") || !strcmp(value, "no"))) {
+						filter->force_demux = GF_TRUE;
+					} else {
+						filter->force_demux = GF_FALSE;
+					}
+				}
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
+			else if (!value && gf_file_exists(szArg)) {
 				if (!for_script && (argfile_level<5) ) {
 					char szLine[2001];
 					FILE *arg_file = gf_fopen(szArg, "rt");
@@ -1408,20 +1751,21 @@
 				}
 				internal_arg = GF_TRUE;
 			}
-			else if (has_meta_args && filter->freg->update_arg && value) {
+			else if (has_meta_args && filter->freg->update_arg) {
+				GF_Err e = GF_OK;
 				if (for_script || !(filter->freg->flags&GF_FS_REG_SCRIPT) ) {
 					GF_PropertyValue argv = gf_props_parse_value(GF_PROP_STRING, szArg, value, NULL, filter->session->sep_list);
 					FSESS_CHECK_THREAD(filter)
-					filter->freg->update_arg(filter, szArg, &argv);
+					e = filter->freg->update_arg(filter, szArg, &argv);
 					if (argv.value.string) gf_free(argv.value.string);
 				}
-				if (!(filter->freg->flags&GF_FS_REG_SCRIPT))
+				if (!(filter->freg->flags&GF_FS_REG_SCRIPT) && (e==GF_OK) )
 					found = GF_TRUE;
 			}
 		}
 
 		if (!internal_arg && !opaque_arg && !opts_optional)
-			gf_fs_push_arg(filter->session, szArg, found, 0);
+			gf_fs_push_arg(filter->session, szArg, found, GF_ARGTYPE_LOCAL, NULL);
 
 skip_arg:
 		if (escaped) {
@@ -1602,7 +1946,7 @@
 	//good do go, unprotect pid
 	assert(cur_pidinst->detach_pending);
 	safe_int_dec(&cur_pidinst->detach_pending);
-	task->filter->removed = GF_FALSE;
+	task->filter->removed = 0;
 
 	gf_filter_relink_dst(cur_pidinst);
 }
@@ -1623,7 +1967,7 @@
 
 	//make sure we flush the end of the pipeline !
 	if (needs_flush) {
-		cur_filter->removed = GF_TRUE;
+		cur_filter->removed = 2;
 		//prevent any fetch from pid
 		safe_int_inc(&src_pidinst->detach_pending);
 		gf_fs_post_task(cur_filter->session, gf_filter_relink_task, cur_filter, NULL, "relink_dst", src_pidinst);
@@ -1638,15 +1982,20 @@
 	while (1) {
 		u32 fchain_len;
 		GF_FilterPidInst *an_inpid = NULL;
-		if (cur_filter->num_input_pids>1) break;
-		if (cur_filter->num_output_pids>1) break;
+		gf_mx_p(cur_filter->tasks_mx);
+		if ((cur_filter->num_input_pids>1) || (cur_filter->num_output_pids>1)) {
+			gf_mx_v(cur_filter->tasks_mx);
+			break;
+		}
 
 		an_inpid = gf_list_get(cur_filter->input_pids, 0);
-		if (!an_inpid)
+		if (!an_inpid) {
+			gf_mx_v(cur_filter->tasks_mx);
 			break;
-
+		}
 		if (gf_filter_pid_caps_match((GF_FilterPid *)an_inpid, filter_dst->freg, filter_dst, NULL, NULL, NULL, -1)) {
 			link_from_pid = an_inpid->pid;
+			gf_mx_v(cur_filter->tasks_mx);
 			break;
 		}
 		fchain_len = gf_filter_pid_resolve_link_length(an_inpid->pid, filter_dst);
@@ -1654,6 +2003,7 @@
 			min_chain_len = fchain_len;
 			link_from_pid = an_inpid->pid;
 		}
+		gf_mx_v(cur_filter->tasks_mx);
 		cur_filter = an_inpid->pid->filter;
 	}
 
@@ -1690,18 +2040,30 @@
 		if (!filter_dst->sticky) filter_dst->sticky = 2;
 		gf_filter_remove_internal(a_dst_pidi->filter, filter_dst, GF_TRUE);
 		is_new_chain = GF_FALSE;
-		
+
 		//we will reassign packets from that pid instance to the new connection
 		filter_dst->swap_pidinst_dst = a_dst_pidi;
 
+		src_pidi->filter->removed = 2;
+
 	}
 	//we are inserting a new chain for reconfiguration only
 	else if (reconfig_only) {
 		gf_fs_check_graph_load(filter_dst->session, GF_TRUE);
 		//make sure we don't try the PID parent filter since we just failed reconfiguring it
 		gf_list_add(pid->filter->blacklisted, (void *) pid->filter->freg);
-		new_f = gf_filter_pid_resolve_link_for_caps(pid, filter_dst);
+		new_f = gf_filter_pid_resolve_link_for_caps(pid, filter_dst, GF_TRUE);
+
 		gf_list_del_item(pid->filter->blacklisted, (void *)pid->filter->freg);
+
+		//special case: no adaptation filter found but destination filter has forced caps set, try to load a filter chain allowing for new caps
+		if (!new_f && filter_dst->forced_caps) {
+			new_f = gf_filter_pid_resolve_link_for_caps(pid, filter_dst, GF_FALSE);
+			if (new_f) {
+				//drop caps negociate
+				reconfig_only = GF_FALSE;
+			}
+		}
 	}
 	//we are inserting a new chain
 	else {
@@ -1720,6 +2082,13 @@
 			gf_list_del(pid->adapters_blacklist);
 			pid->adapters_blacklist = NULL;
 		}
+		if (pid->num_destinations==1) {
+			GF_FilterEvent evt;
+			GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+			gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
+			GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
+			gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
+		}
 		if (dst_pidi) {
 			gf_fs_post_task(filter->session, gf_filter_pid_disconnect_task, dst_pidi->filter, dst_pidi->pid, "pidinst_disconnect", NULL);
 		}
@@ -1766,24 +2135,32 @@
 Bool gf_filter_reconf_output(GF_Filter *filter, GF_FilterPid *pid)
 {
 	GF_Err e;
-	GF_FilterPidInst *src_pidi = gf_list_get(filter->input_pids, 0);
-	GF_FilterPid *src_pid = src_pidi->pid;
+	GF_FilterPidInst *src_pidi;
+	GF_FilterPid *src_pid;
+
+	gf_mx_p(filter->tasks_mx);
+	src_pidi = gf_list_get(filter->input_pids, 0);
+	src_pid = src_pidi->pid;
 	if (filter->is_pid_adaptation_filter) {
 		//do not remove from destination_filters, needed for end of pid_init task
 		if (!filter->dst_filter) filter->dst_filter = gf_list_get(filter->destination_filters, 0);
 		assert(filter->dst_filter);
 		assert(filter->num_input_pids==1);
 	}
-	assert(filter->freg->reconfigure_output);
 	//swap to pid
 	pid->caps_negociate = filter->caps_negociate;
 	filter->caps_negociate = NULL;
-	e = filter->freg->reconfigure_output(filter, pid);
-
+	if (filter->freg->reconfigure_output) {
+		e = filter->freg->reconfigure_output(filter, pid);
+	} else {
+		//happens for decoders
+		e = GF_OK;
+	}
 
 	if (e!=GF_OK) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("PID Adaptation Filter %s output reconfiguration error %s, discarding filter and reloading new adaptation chain\n", filter->name, gf_error_to_string(e)));
 		gf_filter_pid_retry_caps_negotiate(src_pid, pid, filter->dst_filter);
+		gf_mx_v(filter->tasks_mx);
 		return GF_FALSE;
 	}
 	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("PID Adaptation Filter %s output reconfiguration OK (between filters %s and %s)\n", filter->name, src_pid->filter->name, filter->dst_filter->name));
@@ -1803,6 +2180,7 @@
 	if (filter->is_pid_adaptation_filter) {
 		filter->dst_filter = NULL;
 	}
+	gf_mx_v(filter->tasks_mx);
 	return GF_TRUE;
 }
 
@@ -1822,15 +2200,25 @@
 	assert(filter->nb_caps_renegociate );
 	safe_int_dec(& filter->nb_caps_renegociate );
 
+	gf_mx_p(filter->tasks_mx);
+
 	for (i=0; i<filter->num_output_pids; i++) {
 		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
 		if (pid->caps_negociate) {
 			Bool is_ok = GF_FALSE;
+			Bool reconfig_direct = GF_FALSE;
+
+			//the caps_negociate property map is create with ref count 1
 
-			//the property map is create with ref count 1
+			//no fanout, we can try direct reconfigure of the filter
+			if (pid->num_destinations<=1)
+				reconfig_direct = GF_TRUE;
+			//fanout but we have as many pid instances being negociated as there are destinations, we can try direct reconfigure
+			else if (pid->num_destinations==gf_list_count(pid->caps_negociate_pidi_list) && pid->caps_negociate_direct)
+				reconfig_direct = GF_TRUE;
 
 			//we cannot reconfigure output if more than one destination
-			if ((pid->num_destinations<=1) && filter->freg->reconfigure_output && !force_afchain_insert) {
+			if (reconfig_direct && filter->freg->reconfigure_output && !force_afchain_insert) {
 				GF_Err e = filter->freg->reconfigure_output(filter, pid);
 				if (e) {
 					if (filter->is_pid_adaptation_filter) {
@@ -1860,7 +2248,8 @@
 				if (pid->num_destinations) {
 					for (j=0; j<pid->num_destinations; j++) {
 						GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
-						if (pid->caps_negociate_pidi != pidi) continue;
+						if (gf_list_find(pid->caps_negociate_pidi_list, pidi)<0)
+							continue;
 						filter_dst = pidi->filter;
 
 						if (filter_dst->freg->reconfigure_output) {
@@ -1876,7 +2265,7 @@
 						}
 					}
 				}
-				//we are deconnected (unload of a previous adaptation filter)
+				//we are disconnected (unload of a previous adaptation filter)
 				else {
 					filter_dst = pid->caps_dst_filter;
 					assert(pid->num_destinations==0);
@@ -1889,9 +2278,13 @@
 				gf_props_del(pid->caps_negociate);
 			}
 			pid->caps_negociate = NULL;
-			pid->caps_negociate_pidi = NULL;
+			if (pid->caps_negociate_pidi_list) {
+				gf_list_del(pid->caps_negociate_pidi_list);
+				pid->caps_negociate_pidi_list = NULL;
+			}
 		}
 	}
+	gf_mx_v(filter->tasks_mx);
 }
 
 void gf_filter_renegociate_output_task(GF_FSTask *task)
@@ -1901,9 +2294,16 @@
 		gf_filter_renegociate_output(task->filter, GF_TRUE);
 }
 
+static Bool session_should_abort(GF_FilterSession *fs)
+{
+	if (fs->run_status<GF_OK) return GF_TRUE;
+	if (!fs->run_status) return GF_FALSE;
+	return fs->in_final_flush;
+}
+
 static void gf_filter_check_pending_tasks(GF_Filter *filter, GF_FSTask *task)
 {
-	if (filter->session->run_status!=GF_OK) {
+	if (session_should_abort(filter->session)) {
 		return;
 	}
 
@@ -2005,7 +2405,8 @@
 		if (!filter->nb_consecutive_errors) filter->time_at_first_error = gf_sys_clock_high_res();
 
 		filter->nb_consecutive_errors ++;
-		if (filter->nb_pck_io) filter->nb_consecutive_errors = 0;
+		if (filter->nb_pck_io && !filter->session->in_final_flush)
+			filter->nb_consecutive_errors = 0;
 		//give it at most one second
 		diff = gf_sys_clock_high_res() - filter->time_at_first_error;
 		if (diff >= 1000000) {
@@ -2013,7 +2414,9 @@
 			kill_filter = GF_TRUE;
 		}
 	} else {
-		if ((!filter->nb_pck_io && filter->pending_packets && (filter->nb_pids_playing>0) ) || for_reconnection) {
+		if ((!filter->nb_pck_io && filter->pending_packets && (filter->nb_pids_playing>0) && !gf_filter_connections_pending(filter)) || for_reconnection) {
+			if (!filter->nb_consecutive_errors)
+				filter->time_at_first_error = gf_sys_clock_high_res();
 			filter->nb_consecutive_errors++;
 
 			out_e = GF_SERVICE_ERROR;
@@ -2035,6 +2438,7 @@
 
 	if (kill_filter) {
 		u32 i;
+		gf_mx_p(filter->tasks_mx);
 		for (i=0; i<filter->num_input_pids; i++) {
 			GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
 			gf_filter_pid_set_discard((GF_FilterPid *)pidi, GF_TRUE);
@@ -2043,6 +2447,7 @@
 			GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
 			gf_filter_pid_set_eos(pid);
 		}
+		gf_mx_v(filter->tasks_mx);
 		filter->session->last_process_error = out_e;
 		filter->disabled = GF_TRUE;
 	}
@@ -2074,9 +2479,19 @@
 		//do not cancel the process task since it might have been triggered by the filter itself,
 		//we would not longer call it
 		task->requeue_request = GF_TRUE;
- 		task->schedule_next_time = gf_sys_clock_high_res() + 10000;
+
 		assert(filter->process_task_queued);
-		check_filter_error(filter, GF_OK, GF_TRUE);
+		//in we are during the graph resolution phase, to not ask for RT reschedule: this can post-pone process tasks and change their initial
+		//scheduling order, resulting in random change of input pid declaration, for example:
+		//fin1 -> reframe1 -> fA
+		//fin2 -> reframe2 -> fA
+		//if we postpone by 10 us finX process while wating for rfX->fA setup, depending on the CPU charge fin2 might be rescheduled before fin1
+		//leading to pushing new/pending packets ro reframe2 before reframe1, and having fA declare its pid in the reverse order as the one expected
+		//note that this is only valid for single-thread case, as in multithread we do not guarantee PID declaration order
+		if (!filter->out_pid_connection_pending) {
+			task->schedule_next_time = gf_sys_clock_high_res() + 10000;
+			check_filter_error(filter, GF_OK, GF_TRUE);
+		}
 		return;
 	}
 	if (filter->removed || filter->finalized) {
@@ -2169,7 +2584,7 @@
 		}
 	}
 	//no requeue if end of session
-	if (filter->session->run_status != GF_OK) {
+	if (session_should_abort(filter->session)) {
 		return;
 	}
 	//if eos but we still have pending packets or process tasks queued, move to GF_OK so that
@@ -2197,7 +2612,7 @@
 		for (i=0; i<filter->num_input_pids; i++) {
 			GF_FilterPidInst *a_pidinst = gf_list_get(filter->input_pids, i);
 
-			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Not supported profile for filter %s - blacklisting as output from %s and retrying connections\n", filter->name, a_pidinst->pid->filter->name));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Codec/Profile not supported for filter %s - blacklisting as output from %s and retrying connections\n", filter->name, a_pidinst->pid->filter->name));
 
 			gf_list_add(a_pidinst->pid->filter->blacklisted, (void *) filter->freg);
 
@@ -2233,6 +2648,16 @@
 			&& filter->pending_packets
 			&& (gf_fq_count(filter->tasks)<=1)
 	) {
+		//prune eos packets that could still be present
+		if (filter->pending_packets && filter->session->in_final_flush) {
+			u32 i;
+			for (i=0; i<filter->num_input_pids; i++) {
+				GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
+				gf_filter_pid_get_packet((GF_FilterPid *)pidi);
+			}
+			if (!filter->num_input_pids)
+				filter->pending_packets = 0;
+		}
 		task->requeue_request = GF_TRUE;
 		assert(filter->process_task_queued);
 	}
@@ -2254,6 +2679,9 @@
 	if (filter->would_block && (filter->would_block == filter->num_output_pids) ) {
 		return;
 	}
+	if (filter->in_process || filter->in_process_callback) {
+		return;
+	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s inline process\n", filter->name));
 
 	if (filter->postponed_packets) {
@@ -2264,14 +2692,15 @@
 		gf_list_del(filter->postponed_packets);
 		filter->postponed_packets = NULL;
 		if (filter->process_task_queued==1) {
-			gf_mx_p(filter->tasks_mx);
-			filter->process_task_queued = 0;
-			gf_mx_v(filter->tasks_mx);
+			//do not touch process_task_queued, we are outside regular fs task calls
 			return;
 		}
 	}
 	FSESS_CHECK_THREAD(filter)
 
+	filter->in_process = GF_TRUE;
+	filter->in_process_callback = GF_TRUE;
+
 #ifdef GPAC_MEMORY_TRACKING
 	if (filter->session->check_allocs)
 		e = gf_filter_process_check_alloc(filter);
@@ -2279,6 +2708,9 @@
 #endif
 		e = filter->freg->process(filter);
 
+	filter->in_process_callback = GF_FALSE;
+	filter->in_process = GF_FALSE;
+
 	//flush all pending pid init requests following the call to init
 	if (filter->has_pending_pids) {
 		filter->has_pending_pids=GF_FALSE;
@@ -2288,13 +2720,11 @@
 		}
 	}
 	//no requeue if end of session
-	if (filter->session->run_status != GF_OK) {
+	if (session_should_abort(filter->session)) {
 		return;
 	}
 	if ((e==GF_EOS) || filter->removed || filter->finalized) {
-		gf_mx_p(filter->tasks_mx);
-		filter->process_task_queued = 0;
-		gf_mx_v(filter->tasks_mx);
+		//do not touch process_task_queued, we are outside regular fs task calls
 		return;
 	}
 	check_filter_error(filter, e, GF_FALSE);
@@ -2306,9 +2736,45 @@
 	if (filter) gf_fs_send_update(filter->session, fid, fid ? NULL : filter, name, val, propagate_mask);
 }
 
-GF_Filter *gf_filter_clone(GF_Filter *filter)
+GF_Filter *gf_filter_clone(GF_Filter *filter, GF_Filter *source_filter)
 {
-	GF_Filter *new_filter = gf_filter_new(filter->session, filter->freg, filter->orig_args, NULL, filter->arg_type, NULL, NULL, GF_FALSE);
+	GF_Filter *new_filter;
+
+	if (source_filter) {
+		GF_Filter *old_source;
+		GF_FilterPidInst *first_in = gf_list_get(filter->input_pids, 0);
+		//if source filter is set, this is a clone due to a new instance request, so we have at least one input
+		assert(first_in);
+		old_source = first_in->pid->filter;
+		//get source arguments for new source filter connecting to the clone
+		const char *args_src_new = gf_filter_get_args_stripped(filter->session, source_filter->src_args ? source_filter->src_args : source_filter->orig_args, GF_FALSE);
+		//get source arguments for previous source filter connected to the clone
+		const char *args_src_old = gf_filter_get_args_stripped(filter->session, old_source->src_args ? old_source->src_args : old_source->orig_args, GF_FALSE);
+
+		//remove all old source args and append new source args
+		//this allows dealing with -i live.mpd:OPT1 -i live2.mpd:OPT2
+		//where the filter (dashin here) will request a clone when fin:live2.mpd connects, we must use the options from live2.mpd
+		char *args = gf_strdup(filter->orig_args ? filter->orig_args : "");
+		u32 arg_len = (u32) strlen(args);
+		char *old_args = args_src_old ? strstr(args, args_src_old) : NULL;
+		if (old_args) {
+			u32 offset = (u32) (old_args - args);
+			u32 old_args_len = (u32) strlen(args_src_old);
+			memmove(old_args, old_args+old_args_len, arg_len - old_args_len - offset);
+			old_args[arg_len - old_args_len - offset]=0;
+		}
+		if (args_src_new) {
+			char szSep[2];
+			szSep[0] = filter->session->sep_args;
+			szSep[1] = 0;
+			gf_dynstrcat(&args, args_src_new, szSep);
+		}
+
+		new_filter = gf_filter_new(filter->session, filter->freg, args, NULL, filter->arg_type, NULL, NULL, GF_FALSE);
+		gf_free(args);
+	} else {
+		new_filter = gf_filter_new(filter->session, filter->freg, filter->orig_args, NULL, filter->arg_type, NULL, NULL, GF_FALSE);
+	}
 	if (!new_filter) return NULL;
 	new_filter->cloned_from = filter;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter cloned (register %s, args %s)\n", filter->freg->name, filter->orig_args ? filter->orig_args : "none"));
@@ -2361,7 +2827,7 @@
 
 	if (use_direct_dispatch) {
 		safe_int_inc(&filter->process_task_queued);
-		gf_fs_post_task_ex(filter->session, gf_filter_process_task, filter, NULL, "process", NULL, GF_FALSE, GF_TRUE);
+		gf_fs_post_task_ex(filter->session, gf_filter_process_task, filter, NULL, "process", NULL, GF_FALSE, GF_FALSE, GF_TRUE);
 	} else if (safe_int_inc(&filter->process_task_queued) <= 1) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s added to scheduler\n", filter->freg->name));
 		gf_fs_post_task(filter->session, gf_filter_process_task, filter, NULL, "process", NULL);
@@ -2389,9 +2855,23 @@
 GF_EXPORT
 void gf_filter_ask_rt_reschedule(GF_Filter *filter, u32 us_until_next)
 {
-	if (!filter->in_process) {
+	u64 next_time;
+	if (!filter->in_process_callback) {
 		if (filter->session->direct_mode) return;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s request for real-time reschedule but filter is not in process\n", filter->name));
+		if (filter->session->in_final_flush) {
+			filter->schedule_next_time = 0;
+			return;
+		}
+		//allow reschedule if not called from process
+		if (us_until_next) {
+			next_time = 1+us_until_next + gf_sys_clock_high_res();
+			if (!filter->schedule_next_time || (filter->schedule_next_time > next_time))
+				filter->schedule_next_time = next_time;
+		} else {
+			filter->schedule_next_time = 0;
+		}
+
+		gf_filter_post_process_task(filter);
 		return;
 	}
 	if (filter->session->in_final_flush)
@@ -2400,14 +2880,18 @@
 	//if the filter requests rescheduling, consider it is in a valid state and increment pck IOs to avoid flagging it as broken
 	filter->nb_pck_io++;
 	if (!us_until_next) {
+		filter->schedule_next_time = 0;
 		return;
 	}
-	filter->schedule_next_time = 1+us_until_next + gf_sys_clock_high_res();
+	next_time = 1+us_until_next + gf_sys_clock_high_res();
+	if (!filter->schedule_next_time || (filter->schedule_next_time > next_time))
+		filter->schedule_next_time = next_time;
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Filter %s real-time reschedule in %d us (at "LLU" sys clock)\n", filter->name, us_until_next, filter->schedule_next_time));
 }
 
 GF_EXPORT
-void gf_filter_set_setup_failure_callback(GF_Filter *filter, GF_Filter *source_filter, void (*on_setup_error)(GF_Filter *f, void *on_setup_error_udta, GF_Err e), void *udta)
+void gf_filter_set_setup_failure_callback(GF_Filter *filter, GF_Filter *source_filter, Bool (*on_setup_error)(GF_Filter *f, void *on_setup_error_udta, GF_Err e), void *udta)
 {
 	if (!filter) return;
 	if (!source_filter) return;
@@ -2432,34 +2916,58 @@
 	if (task->udta) {
 		e = ((struct _gf_filter_setup_failure *)task->udta)->e;
 		gf_free(task->udta);
-
-		f->session->last_connect_error = e;
+		if (e)
+			f->session->last_connect_error = e;
 	}
 
 	if (!f->finalized && f->freg->finalize) {
 		FSESS_CHECK_THREAD(f)
 		f->freg->finalize(f);
 	}
-	if (f->session->filters_mx) gf_mx_p(f->session->filters_mx);
+	gf_mx_p(f->session->filters_mx);
 
 	res = gf_list_del_item(f->session->filters, f);
 	if (res < 0) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s task failure callback on already removed filter!\n", f->name));
 	}
 
-	if (f->session->filters_mx) gf_mx_v(f->session->filters_mx);
+	gf_mx_v(f->session->filters_mx);
+
+	gf_mx_p(f->tasks_mx);
+	//detach all input pids
+	while (gf_list_count(f->input_pids)) {
+		GF_FilterPidInst *pidinst = gf_list_pop_back(f->input_pids);
+		pidinst->filter = NULL;
+	}
+	//detach all output pids
+	while (gf_list_count(f->output_pids)) {
+		u32 j;
+		GF_FilterPid *pid = gf_list_pop_back(f->output_pids);
+		for (j=0; j<pid->num_destinations; j++) {
+			GF_FilterPid *pidinst = gf_list_get(pid->destinations, j);
+			pidinst->pid = NULL;
+		}
+	}
+	gf_mx_v(f->tasks_mx);
+	//avoid destruction of the current task (ourselves)
+	gf_fq_pop(f->tasks);
 
 	gf_filter_del(f);
+	task->filter = NULL;
+	task->requeue_request = GF_FALSE;
 }
 
 static void gf_filter_setup_failure_notify_task(GF_FSTask *task)
 {
 	struct _gf_filter_setup_failure *st = (struct _gf_filter_setup_failure *)task->udta;
-	if (st->notify_filter && st->filter->on_setup_error)
-		st->filter->on_setup_error(st->filter, st->filter->on_setup_error_udta, st->e);
+	if (st->notify_filter && st->filter->on_setup_error) {
+		Bool cancel = st->filter->on_setup_error(st->filter, st->filter->on_setup_error_udta, st->e);
+		if (cancel) st->e = GF_OK;
+	}
 
 	if (st->do_disconnect) {
-		gf_fs_post_task(st->filter->session, gf_filter_setup_failure_task, NULL, NULL, "setup_failure", st);
+		//post setup°failure task ON THE FILTER, otherwise we might end up having 2 threads on the active filter
+		gf_fs_post_task(st->filter->session, gf_filter_setup_failure_task, st->filter, NULL, "setup_failure", st);
 	} else {
 		gf_free(st);
 	}
@@ -2477,12 +2985,13 @@
 	stack->filter = filter;
 	stack->do_disconnect = force_disconnect;
 	if (force_disconnect) {
-		filter->removed = GF_TRUE;
+		filter->removed = 1;
 	}
 	if (filter->on_setup_error_filter) {
 		gf_fs_post_task(filter->session, gf_filter_setup_failure_notify_task, filter->on_setup_error_filter, NULL, "setup_failure_notify", stack);
 	} else if (force_disconnect) {
-		gf_fs_post_task(filter->session, gf_filter_setup_failure_task, NULL, NULL, "setup_failure", stack);
+		//post setup°failure task ON THE FILTER, otherwise we might end up having 2 threads on the active filter
+		gf_fs_post_task(filter->session, gf_filter_setup_failure_task, filter, NULL, "setup_failure", stack);
 	}
 }
 
@@ -2498,20 +3007,23 @@
 	//filter was already connected, trigger removal of all pid instances
 	if (filter->num_input_pids) {
 		gf_filter_reset_pending_packets(filter);
-		filter->removed = GF_TRUE;
+		filter->removed = 1;
+		gf_mx_p(filter->tasks_mx);
 		while (filter->num_input_pids) {
 			GF_FilterPidInst *pidinst = gf_list_get(filter->input_pids, 0);
-			GF_Filter *sfilter = pidinst->pid->filter;				
+			GF_Filter *sfilter = pidinst->pid->filter;
 			gf_list_del_item(filter->input_pids, pidinst);
 			pidinst->filter = NULL;
-			gf_mx_p(filter->tasks_mx);
 			filter->num_input_pids = gf_list_count(filter->input_pids);
-			gf_mx_v(filter->tasks_mx);
+			if (!filter->num_input_pids)
+				filter->single_source = NULL;
 
 			//post a pid_delete task to also trigger removal of the filter if needed
 			gf_fs_post_task(filter->session, gf_filter_pid_inst_delete_task, sfilter, pidinst->pid, "pid_inst_delete", pidinst);
 		}
-		filter->session->last_connect_error = reason;
+		gf_mx_v(filter->tasks_mx);
+		if (reason)
+			filter->session->last_connect_error = reason;
 		return;
 	}
 
@@ -2522,7 +3034,8 @@
 	gf_filter_notification_failure(filter, reason, GF_TRUE);
 }
 
-#ifndef GPAC_DISABLE_LOG
+//#define DUMP_TASKS
+#if !defined(GPAC_DISABLE_LOG) && defined DUMP_TASKS
 static Bool task_postponed_log(void *udta, void *item)
 {
 	GF_FSTask *at = (GF_FSTask *)item;
@@ -2537,7 +3050,8 @@
 	GF_Filter *f = task->filter;
 	u32 count = gf_fq_count(f->tasks);
 
-	if (f->out_pid_connection_pending || f->detach_pid_tasks_pending) {
+	//do not destroy filters if tasks for this filter are pending or some ref packets are still present
+	if (f->out_pid_connection_pending || f->detach_pid_tasks_pending || f->nb_ref_packets) {
 		task->requeue_request = GF_TRUE;
 		return;
 	}
@@ -2547,37 +3061,39 @@
 	if (count!=1) {
 		task->requeue_request = GF_TRUE;
 		task->can_swap = GF_TRUE;
-#ifndef GPAC_DISABLE_LOG
+#if !defined(GPAC_DISABLE_LOG) && defined DUMP_TASKS
 		if (gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_DEBUG) ) {
 			gf_fq_enum(f->tasks, task_postponed_log, NULL);
 		}
 #endif //GPAC_DISABLE_LOG
 		return;
 	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s destruction task\n", f->name));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s destruction task\n", f->name));
 
-	//avoid destruction of the task
+	//avoid destruction of the current task
 	gf_fq_pop(f->tasks);
-	
+
 	if (f->freg->finalize) {
 		FSESS_CHECK_THREAD(f)
 		f->freg->finalize(f);
 	}
 
-	if (f->session->filters_mx) gf_mx_p(f->session->filters_mx);
+	gf_mx_p(f->session->filters_mx);
 
 	res = gf_list_del_item(f->session->filters, f);
 	if (res<0) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s destruction task on already removed filter\n", f->name));
 	}
 
-	if (f->session->filters_mx) gf_mx_v(f->session->filters_mx);
+	gf_mx_v(f->session->filters_mx);
 
+	gf_mx_p(f->tasks_mx);
 	//detach all input pids
 	while (gf_list_count(f->input_pids)) {
 		GF_FilterPidInst *pidinst = gf_list_pop_back(f->input_pids);
 		pidinst->filter = NULL;
 	}
+	gf_mx_v(f->tasks_mx);
 
 	gf_filter_del(f);
 	task->filter = NULL;
@@ -2590,32 +3106,42 @@
 	assert(!filter->swap_pidinst_src);
 	assert(!filter->finalized);
 	filter->finalized = GF_TRUE;
-	gf_fs_post_task(filter->session, gf_filter_remove_task, filter, NULL, "filter_destroy", NULL);
+
+	//post remove task ON THE FILTER, otherwise we might end up having 2 threads on the active filter
+	gf_fs_post_task_ex(filter->session, gf_filter_remove_task, filter, NULL, "filter_destroy", NULL, GF_FALSE, filter->session->force_main_thread_tasks, GF_FALSE);
 }
 
-static void gf_filter_tag_remove(GF_Filter *filter, GF_Filter *source_filter, GF_Filter *until_filter)
+static void gf_filter_tag_remove(GF_Filter *filter, GF_Filter *source_filter, GF_Filter *until_filter, Bool keep_end_connections)
 {
 	u32 i, count, j, nb_inst;
 	u32 nb_rem_inst=0;
 	Bool mark_only = GF_FALSE;
+	Bool do_unlock;
 	if (filter==until_filter) return;
 
-	count = gf_list_count(filter->input_pids);
-	for (i=0; i<count; i++) {
+	//we do a try-lock here, as the filter could be locked by another thread
+	//this typically happens upon compositor source disconnection while an event or packet drop is still being processed on that filter
+	do_unlock = gf_mx_try_lock(filter->tasks_mx);
+	for (i=0; i<filter->num_input_pids; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
 		if (pidi->pid->filter==source_filter) nb_rem_inst++;
 	}
-	if (!nb_rem_inst)
+	if (!nb_rem_inst) {
+		if (do_unlock) gf_mx_v(filter->tasks_mx);
 		return;
+	}
 	filter->marked_for_removal = GF_TRUE;
-	if (nb_rem_inst != count)
+	if (nb_rem_inst != filter->num_input_pids)
 		mark_only = GF_TRUE;
+
 	//already removed
-	if (filter->removed) return;
-	
+	if (filter->removed) {
+		if (do_unlock) gf_mx_v(filter->tasks_mx);
+		return;
+	}
 	//filter will be removed, propagate on all output pids
 	if (!mark_only)
-		filter->removed = GF_TRUE;
+		filter->removed = 1;
 
 	count = gf_list_count(filter->output_pids);
 	for (i=0; i<count; i++) {
@@ -2624,11 +3150,16 @@
 		nb_inst = pid->num_destinations;
 		for (j=0; j<nb_inst; j++) {
 			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
-			gf_filter_tag_remove(pidi->filter, filter, until_filter);
-			if (!mark_only)
+			gf_filter_tag_remove(pidi->filter, filter, until_filter, keep_end_connections);
+			if (!mark_only && (!keep_end_connections || (pidi->filter != until_filter)) ) {
+				//unlock filter before posting remove task on other filter
+				if (do_unlock) gf_mx_v(filter->tasks_mx);
 				gf_fs_post_task(filter->session, gf_filter_pid_disconnect_task, pidi->filter, pid, "pidinst_disconnect", NULL);
+				do_unlock = gf_mx_try_lock(filter->tasks_mx);
+			}
 		}
 	}
+	if (do_unlock) gf_mx_v(filter->tasks_mx);
 }
 
 void gf_filter_remove_internal(GF_Filter *filter, GF_Filter *until_filter, Bool keep_end_connections)
@@ -2637,20 +3168,24 @@
 
 	if (!filter) return;
 
-	if (filter->removed) 
+	if (filter->removed)
 		return;
 
 	if (filter==until_filter)
 		return;
 
 	if (until_filter) {
+		//check if filter has not been removed
+		s32 res = gf_list_find(until_filter->session->filters, filter);
+		if (res<0)
+			return;
 		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Disconnecting filter %s up to %s\n", filter->name, until_filter->name));
 	} else {
 		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Disconnecting filter %s from session\n", filter->name));
 	}
 	//get all dest pids, post disconnect and mark filters as removed
 	assert(!filter->removed);
-	filter->removed = GF_TRUE;
+	filter->removed = 1;
 	for (i=0; i<filter->num_output_pids; i++) {
 		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
 		count = pid->num_destinations;
@@ -2658,7 +3193,7 @@
 			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
 
 			if (until_filter) {
-				gf_filter_tag_remove(pidi->filter, filter, until_filter);
+				gf_filter_tag_remove(pidi->filter, filter, until_filter, keep_end_connections);
 			}
 
 			if (keep_end_connections && (pidi->filter == until_filter)) {
@@ -2670,6 +3205,7 @@
 	}
 	if (keep_end_connections) return;
 
+	gf_mx_p(filter->tasks_mx);
 	//check all pids connected to this filter, ensure their owner is only connected to this filter
 	for (i=0; i<filter->num_input_pids; i++) {
 		GF_FilterPid *pid;
@@ -2689,6 +3225,7 @@
 			gf_filter_remove_internal(pid->filter, NULL, GF_FALSE);
 		}
 	}
+	gf_mx_v(filter->tasks_mx);
 }
 
 GF_EXPORT
@@ -2704,6 +3241,7 @@
 	if (!filter) return;
 
 	//locate source filter(s)
+	gf_mx_p(filter->tasks_mx);
 	for (i=0; i<filter->num_input_pids; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
 		//fanout, only disconnect this pid instance
@@ -2720,6 +3258,7 @@
 			gf_filter_remove(pidi->pid->filter);
 		}
 	}
+	gf_mx_v(filter->tasks_mx);
 }
 
 #if 0
@@ -2727,10 +3266,10 @@
 void gf_filter_remove_dst(GF_Filter *filter, GF_Filter *dst_filter)
 {
 	u32 i, j;
-	Bool removed;
+	u32 removed;
 	if (!filter) return;
 	removed = filter->removed;
-	filter->removed = GF_TRUE;
+	filter->removed = 1;
 	gf_filter_remove_internal(dst_filter, filter, GF_FALSE);
 	filter->removed = removed;
 
@@ -2818,6 +3357,7 @@
 
 	for (i=0; i<gf_list_count(filter->destination_links); i++) {
 		GF_Filter *af = gf_list_get(filter->destination_links, i);
+		gf_mx_p(af->tasks_mx);
 		if (af->num_input_pids) {
 			u32 j;
 			for (j=0; j<af->num_input_pids; j++) {
@@ -2825,11 +3365,12 @@
 				pidi->is_end_of_stream = GF_TRUE;
 			}
 		}
+		gf_mx_v(af->tasks_mx);
 		if (af->sticky) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to find any filter for URL %s\n", src_url));
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to find any filter for URL %s, disabling destination filter %s\n", src_url, af->name));
-			af->removed = GF_TRUE;
+			af->removed = 1;
 		}
 	}
 	if (e==GF_NOT_SUPPORTED)
@@ -2846,7 +3387,7 @@
 	u64 clock_val;
 	if (!filter->next_clock_dispatch_type) return;
 	if (!filter->num_output_pids) return;
-	
+
 	for (i=0; i<filter->num_output_pids; i++) {
 		GF_FilterPacket *pck;
 		Bool req_props_map, info_modified;
@@ -2860,11 +3401,14 @@
 
 		clock_val = filter->next_clock_dispatch;
 		if (map->timescale != filter->next_clock_dispatch_timescale) {
-			clock_val *= map->timescale;
-			clock_val /= filter->next_clock_dispatch_timescale;
+			clock_val = gf_timestamp_rescale(clock_val, filter->next_clock_dispatch_timescale, map->timescale);
 		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s internal forward of clock reference\n", pid->filter->name, pid->name));
 		pck = gf_filter_pck_new_shared((GF_FilterPid *)pid, NULL, 0, NULL);
+		if (!pck) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s PID %s failted to allocate packet for clock reference forward\n", pid->filter->name, pid->name));
+			continue;
+		}
 		gf_filter_pck_set_cts(pck, clock_val);
 		gf_filter_pck_set_clock_type(pck, filter->next_clock_dispatch_type);
 
@@ -2901,10 +3445,14 @@
 		if (err) *err = GF_BAD_PARAM;
 		return NULL;
 	}
+
 	args = inherit_args ? gf_filter_get_dst_args(filter) : NULL;
 	if (args) {
+		char *rem_opts[] = {"FID", "SID", "N", "clone", NULL};
 		char szSep[10];
 		char *loc_args;
+		u32 opt_idx;
+		u32 dst_offset = 0;
 		u32 len = (u32) strlen(args);
 		sprintf(szSep, "%cgfloc%c", filter->session->sep_args, filter->session->sep_args);
 		loc_args = strstr(args, szSep);
@@ -2920,11 +3468,26 @@
 				sprintf(szSep, "%c", filter->session->sep_args);
 				gf_dynstrcat(&full_args, szSep, NULL);
 			}
+			if (full_args)
+				dst_offset = (u32) strlen(full_args);
+
 			gf_dynstrcat(&full_args, args, NULL);
 			sprintf(szSep, "%cgfloc%c", filter->session->sep_args, filter->session->sep_args);
 			loc_args = strstr(full_args, "gfloc");
 			if (loc_args) loc_args[0] = 0;
 
+			//remove all internal options FIS, SID, N
+			opt_idx = 0;
+			while (rem_opts[opt_idx]) {
+				sprintf(szSep, "%c%s%c", filter->session->sep_args, rem_opts[opt_idx], filter->session->sep_name);
+				loc_args = strstr(full_args + dst_offset, szSep);
+				if (loc_args) {
+					char *sep = strchr(loc_args+1, filter->session->sep_args);
+					if (sep) memmove(loc_args, sep, strlen(sep)+1);
+					else loc_args[0] = 0;
+				}
+				opt_idx++;
+			}
 			url = full_args;
 		}
 	}
@@ -2934,15 +3497,18 @@
 
 	if (!filter_src) return NULL;
 
+	gf_mx_p(filter->tasks_mx);
 	if (!filter->source_filters)
 		filter->source_filters = gf_list_new();
 	gf_list_add(filter->source_filters, filter_src);
+	gf_mx_v(filter->tasks_mx);
 	return filter_src;
 }
 
 GF_EXPORT
 GF_Filter *gf_filter_connect_destination(GF_Filter *filter, const char *url, GF_Err *err)
 {
+	if (!filter) return NULL;
 	return gf_fs_load_source_dest_internal(filter->session, url, NULL, NULL, err, NULL, filter, GF_FALSE, GF_FALSE, NULL);
 }
 
@@ -3006,12 +3572,9 @@
 	if (!filter) return 0;
 	fsess = filter->session;
 
-	if (fsess->filters_mx)
-		gf_mx_p(fsess->filters_mx);
-
+	gf_mx_p(fsess->filters_mx);
 	res = gf_filter_get_num_events_queued_internal(filter);
-	if (fsess->filters_mx)
-		gf_mx_v(fsess->filters_mx);
+	gf_mx_v(fsess->filters_mx);
 
 	return res;
 }
@@ -3059,36 +3622,68 @@
 {
 	if (!filter || !link_from) return GF_BAD_PARAM;
 	if (filter == link_from) return GF_OK;
+
 	//don't allow loops
 	if (gf_filter_in_parent_chain(filter, link_from)) return GF_BAD_PARAM;
 
 	if (!link_from->id) {
 		gf_filter_assign_id(link_from, NULL);
 	}
+
 	if (link_ext) {
-		char szID[1024];
-		sprintf(szID, "%s%c%s", link_from->id, link_from->session->sep_frag, link_ext);
-		gf_filter_set_sources(filter, szID);
+		char szSep[2];
+		char *id = NULL;
+		gf_dynstrcat(&id, link_from->id, NULL);
+		szSep[0] = link_from->session->sep_frag;
+		szSep[1] = 0;
+		gf_dynstrcat(&id, link_ext, szSep);
+		gf_filter_set_sources(filter, id);
+		gf_free(id);
 	} else {
 		gf_filter_set_sources(filter, link_from->id);
 	}
+
+	if (link_from->target_filter != filter) {
+		filter->target_filter = link_from->target_filter;
+		link_from->target_filter = NULL;
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_set_source_restricted(GF_Filter *filter, GF_Filter *link_from, const char *link_ext)
+{
+	GF_Err e = gf_filter_set_source(filter, link_from, link_ext);
+	if (e) return e;
+	if (link_from->restricted_source_id)
+		gf_free(link_from->restricted_source_id);
+
+	link_from->restricted_source_id = gf_strdup(link_from->id);
 	return GF_OK;
 }
 
+
 GF_EXPORT
 GF_Err gf_filter_override_caps(GF_Filter *filter, const GF_FilterCapability *caps, u32 nb_caps )
 {
 	if (!filter) return GF_BAD_PARAM;
-	if (filter->num_output_pids) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempts at setting input caps on filter %s during execution of filter, not supported\n", filter->name));
-		return GF_NOT_SUPPORTED;
-	}
+	//we accept caps override event on a running filter, this will only impact the next link solving
 	filter->forced_caps = nb_caps ? caps : NULL;
 	filter->nb_forced_caps = nb_caps;
+	filter->bundle_idx_at_resolution = -1;
 	return GF_OK;
 }
 
 GF_EXPORT
+GF_Err gf_filter_act_as_sink(GF_Filter *filter)
+{
+	if (!filter) return GF_BAD_PARAM;
+	filter->act_as_sink = GF_TRUE;
+	return GF_OK;
+}
+
+
+GF_EXPORT
 void gf_filter_pid_init_play_event(GF_FilterPid *pid, GF_FilterEvent *evt, Double start, Double speed, const char *log_name)
 {
 	u32 pmode = GF_PLAYBACK_MODE_NONE;
@@ -3119,17 +3714,17 @@
 	case GF_PLAYBACK_MODE_NONE:
 		evt->play.start_range = 0;
 		if (start) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] Media PID does not support seek, ignoring start directive\n", log_name));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[%s] Media PID does not support seek, ignoring start directive\n", log_name));
 		}
 		break;
 	case GF_PLAYBACK_MODE_SEEK:
 		if (speed != 1.0) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] Media PID does not support speed, ignoring speed directive\n", log_name));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[%s] Media PID does not support speed, ignoring speed directive\n", log_name));
 		}
 		break;
 	case GF_PLAYBACK_MODE_FASTFORWARD:
 		if (speed<0) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] Media PID does not support negative speed, ignoring speed directive\n", log_name));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[%s] Media PID does not support negative speed, ignoring speed directive\n", log_name));
 			if (was_end) evt->play.start_range = 0;
 		} else {
 			evt->play.speed = speed;
@@ -3141,6 +3736,7 @@
 	}
 }
 
+GF_EXPORT
 void gf_filter_set_max_extra_input_pids(GF_Filter *filter, u32 max_extra_pids)
 {
 	if (filter) filter->max_extra_pids = max_extra_pids;
@@ -3151,7 +3747,7 @@
 	if (filter) return filter->max_extra_pids;
 	return 0;
 }
-
+GF_EXPORT
 Bool gf_filter_block_enabled(GF_Filter *filter)
 {
 	if (!filter) return GF_FALSE;
@@ -3159,7 +3755,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_filter_pid_raw_new(GF_Filter *filter, const char *url, const char *local_file, const char *mime_type, const char *fext, u8 *probe_data, u32 probe_size, Bool trust_mime, GF_FilterPid **out_pid)
+GF_Err gf_filter_pid_raw_new(GF_Filter *filter, const char *url, const char *local_file, const char *mime_type, const char *fext, const u8 *probe_data, u32 probe_size, Bool trust_mime, GF_FilterPid **out_pid)
 {
 	char tmp_ext[50];
 	u32 ext_len=0;
@@ -3178,10 +3774,12 @@
 	gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
 
 	if (local_file)
-		gf_filter_pid_set_property(pid, GF_PROP_PID_FILEPATH, &PROP_STRING(local_file));
+ 	gf_filter_pid_set_property(pid, GF_PROP_PID_FILEPATH, &PROP_STRING(local_file));
 
 
 	if (url) {
+		//force reconfigure
+		gf_filter_pid_set_property(pid, GF_PROP_PID_URL, NULL);
 		gf_filter_pid_set_property(pid, GF_PROP_PID_URL, &PROP_STRING(url));
 
 		if (!strnicmp(url, "isobmff://", 10)) {
@@ -3193,6 +3791,12 @@
 		} else {
 			char *sep = gf_file_basename(url);
 
+			//for fileIO, fetch the underlying resource name, this avoids having memory address in pid name for inspect
+			if (!strncmp(url, "gfio://", 7)) {
+				const char *res_url = gf_fileio_translate_url(url);
+				if (res_url) sep = gf_file_basename(res_url);
+				else sep="Unknown_URL";
+			}
 			gf_filter_pid_set_name(pid, sep);
 		}
 
@@ -3219,7 +3823,7 @@
 			}
 		}
 	}
-	
+
 	ext_not_trusted = GF_FALSE;
 	//probe data
 	if ((!mime_type || !trust_mime) && !filter->no_probe && is_new_pid && probe_data && probe_size && !(filter->session->flags & GF_FS_FLAG_NO_PROBE)) {
@@ -3261,7 +3865,7 @@
 				}
 			} else {
 				if (a_mime) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Data Prober (filter %s) detected format is%s mime %s\n", freg->name, (score==GF_FPROBE_MAYBE_SUPPORTED) ? " maybe" : "", a_mime));
+					GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Data Prober (filter %s) detected format is%s mime %s\n", freg->name, (score==GF_FPROBE_SUPPORTED) ? "" : "maybe", a_mime));
 				}
 				if (a_mime && (score > max_score)) {
 					probe_mime = a_mime;
@@ -3284,7 +3888,7 @@
 	if (mime_type && is_new_pid && !strstr(mime_type, "/octet-")) {
 		strncpy(tmp_ext, mime_type, 50);
 		tmp_ext[49] = 0;
-		strlwr(tmp_ext);
+		//keep case for mime type
 		gf_filter_pid_set_property(pid, GF_PROP_PID_MIME, &PROP_STRING( tmp_ext ));
 		//we have a mime, disable extension checking
 		pid->ext_not_trusted = GF_TRUE;
@@ -3310,7 +3914,7 @@
 		a_mime = freg->probe_data(data, size, &score);
 		if (score==GF_FPROBE_NOT_SUPPORTED) {
 		} else if (score==GF_FPROBE_EXT_MATCH) {
-			probe_mime = NULL;
+//			probe_mime = NULL;
 		} else {
 			if (a_mime && (score > max_score)) {
 				probe_mime = a_mime;
@@ -3332,7 +3936,7 @@
 		const GF_FilterArgs *arg = &filter->freg->args[i];
 		if (!arg || !arg->arg_name) break;
 		i++;
-		
+
 		if (strcmp(arg->arg_name, arg_name)) continue;
 		if (arg->offset_in_private < 0) continue;
 
@@ -3342,6 +3946,7 @@
 			p.value.boolean = * (Bool *) ((char *)filter->filter_udta + arg->offset_in_private);
 			break;
 		case GF_PROP_UINT:
+		case GF_PROP_4CC:
 			p.value.uint = * (u32 *) ((char *)filter->filter_udta + arg->offset_in_private);
 			break;
 		case GF_PROP_SINT:
@@ -3368,15 +3973,9 @@
 		case GF_PROP_VEC3I:
 			p.value.vec3i = * (GF_PropVec3i *) ((char *)filter->filter_udta + arg->offset_in_private);
 			break;
-		case GF_PROP_VEC3:
-			p.value.vec3 = * (GF_PropVec3 *) ((char *)filter->filter_udta + arg->offset_in_private);
-			break;
 		case GF_PROP_VEC4I:
 			p.value.vec4i = * (GF_PropVec4i *) ((char *)filter->filter_udta + arg->offset_in_private);
 			break;
-		case GF_PROP_VEC4:
-			p.value.vec4 = * (GF_PropVec4 *) ((char *)filter->filter_udta + arg->offset_in_private);
-			break;
 		case GF_PROP_FRACTION:
 			p.value.frac = * (GF_Fraction *) ((char *)filter->filter_udta + arg->offset_in_private);
 			break;
@@ -3396,19 +3995,19 @@
 		case GF_PROP_NAME:
 			p.value.ptr = * (char **) ((char *)filter->filter_udta + arg->offset_in_private);
 			break;
+		//use uint_list as base type for lists
 		case GF_PROP_STRING_LIST:
-			p.value.string_list = * (GF_List **) ((char *)filter->filter_udta + arg->offset_in_private);
-			break;
 		case GF_PROP_UINT_LIST:
+		case GF_PROP_4CC_LIST:
+		case GF_PROP_SINT_LIST:
+		case GF_PROP_VEC2I_LIST:
 			p.value.uint_list = * (GF_PropUIntList *) ((char *)filter->filter_udta + arg->offset_in_private);
 			break;
-		case GF_PROP_PIXFMT:
-			p.value.uint = * (u32 *) ((char *)filter->filter_udta + arg->offset_in_private);
-			break;
-		case GF_PROP_PCMFMT:
-			p.value.uint = * (u32 *) ((char *)filter->filter_udta + arg->offset_in_private);
-			break;
 		default:
+			if (gf_props_type_is_enum(arg->arg_type)) {
+				p.value.uint = * (u32 *) ((char *)filter->filter_udta + arg->offset_in_private);
+				break;
+			}
 			return GF_FALSE;
 		}
 		if (min_max_enum) *min_max_enum = arg->min_max_enum;
@@ -3425,12 +4024,7 @@
 	const char *arg_min_max = NULL;
 	if (!dump || !gf_filter_get_arg_internal(filter, arg_name, &p, &arg_min_max))
 		return NULL;
-	if (p.type==GF_PROP_PIXFMT)
-		return gf_pixel_fmt_name(p.value.uint);
-	if (p.type==GF_PROP_PCMFMT)
-		return gf_audio_fmt_name(p.value.uint);
-
-	return gf_props_dump_val(&p, dump, GF_FALSE, arg_min_max);
+	return gf_props_dump_val(&p, dump, GF_PROP_DUMP_DATA_NONE, arg_min_max);
 }
 
 GF_EXPORT
@@ -3444,7 +4038,7 @@
 GF_EXPORT
 Bool gf_filter_is_supported_mime(GF_Filter *filter, const char *mime)
 {
-	return gf_fs_mime_supported(filter->session, mime);
+	return gf_fs_is_supported_mime(filter->session, mime);
 }
 
 GF_EXPORT
@@ -3458,22 +4052,25 @@
 {
 	u32 i, count;
 	Bool res = GF_TRUE;
-	if (!filter || filter->session->in_final_flush || (filter->session->run_status==GF_EOS) )
+	if (!filter || filter->session->in_final_flush || (filter->session->run_status==GF_EOS)	)
 		return GF_TRUE;
-		
+
 	gf_mx_p(filter->session->filters_mx);
 	count = gf_list_count(filter->session->filters);
 	for (i=0; i<count; i++) {
 		u32 j;
 		GF_Filter *f = gf_list_get(filter->session->filters, i);
 		if (f->num_output_pids) continue;
+		gf_mx_p(f->tasks_mx);
 		for (j=0; j<f->num_input_pids; j++) {
 			GF_FilterPidInst *pidi = gf_list_get(f->input_pids, j);
 			if (pidi->pid->is_playing && !pidi->is_end_of_stream) {
 				res = GF_FALSE;
+				gf_mx_v(f->tasks_mx);
 				goto exit;
 			}
 		}
+		gf_mx_v(f->tasks_mx);
 	}
 exit:
 	gf_mx_v(filter->session->filters_mx);
@@ -3496,8 +4093,8 @@
 	gf_list_del_item(filter->session->gl_providers, filter);
 	e = gf_fs_check_gl_provider(filter->session);
 	if (e && filter->session->nb_gl_filters) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to reload an OpenGL provider and some filters require openGL, aborting\n"));
-		gf_fs_abort(filter->session, GF_FALSE);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to reload an OpenGL provider and some filters require OpenGL, aborting\n"));
+		gf_fs_abort(filter->session, GF_FS_FLUSH_NONE);
 	}
 #endif
 
@@ -3514,11 +4111,10 @@
 	e = gf_fs_check_gl_provider(filter->session);
 	if (e) {
 		filter->session->nb_gl_filters--;
-		filter->main_thread_forced = GF_FALSE;
 		return e;
 	}
 	if (!(filter->freg->flags & GF_FS_REG_CONFIGURE_MAIN_THREAD))
-		filter->main_thread_forced = GF_TRUE;
+		safe_int_inc(&filter->nb_main_thread_forced);
 	return GF_OK;
 #else
 	return GF_NOT_SUPPORTED;
@@ -3600,6 +4196,21 @@
 	if (filter == stop_at_filter) return GF_FALSE;
 
 	if (filter->has_pending_pids) return GF_TRUE;
+	if (filter->in_pid_connection_pending) return GF_TRUE;
+	if (filter->out_pid_connection_pending) return GF_TRUE;
+
+	if (!filter->num_output_pids) {
+		if (!filter->act_as_sink && !filter->multi_sink_target) {
+			if (filter->forced_caps) {
+				if (gf_filter_has_out_caps(filter->forced_caps, filter->nb_forced_caps))
+					return GF_TRUE;
+			} else {
+				if (gf_filter_has_out_caps(filter->freg->caps, filter->freg->nb_caps))
+					return GF_TRUE;
+			}
+		}
+		return GF_FALSE;
+	}
 
 	for (i=0; i<filter->num_output_pids; i++) {
 		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
@@ -3621,9 +4232,9 @@
 	if (!filter) return GF_FALSE;
 	//lock session, this is an unsafe call
 	fsess = filter->session;
-	if (fsess->filters_mx) gf_mx_p(fsess->filters_mx);
+	gf_mx_p(fsess->filters_mx);
 	res = gf_filter_has_pid_connection_pending_internal(filter, stop_at_filter);
-	if (fsess->filters_mx) gf_mx_v(fsess->filters_mx);
+	gf_mx_v(fsess->filters_mx);
 	return res;
 }
 
@@ -3642,7 +4253,7 @@
 	if (!filter) return GF_BAD_PARAM;
 	if (!filter->session->reporting_on)
 		return GF_OK;
-		
+
 	if (!szStatus) {
 		if (filter->status_str) filter->status_str[0] = 0;
 		return GF_OK;
@@ -3670,7 +4281,7 @@
 	return GF_OK;
 }
 
-void gf_filter_report_unused_meta_option(GF_Filter *filter, const char *arg)
+void gf_filter_report_meta_option(GF_Filter *filter, const char *arg, Bool was_found)
 {
 	if (!filter->session || filter->removed || filter->finalized) return;
 	if (filter->orig_args) {
@@ -3682,7 +4293,10 @@
 		}
 	}
 	gf_mx_p(filter->session->filters_mx);
-	gf_fs_push_arg(filter->session, arg, GF_FALSE, 2);
+	//meta filters may report unused options set when setting up the filter, and not specified
+	//at prompt, ignore them
+	//the argtype will be ignored here
+	gf_fs_push_arg(filter->session, arg, was_found, GF_ARGTYPE_META_REPORTING, filter);
 	gf_mx_v(filter->session->filters_mx);
 }
 
@@ -3759,6 +4373,14 @@
 }
 
 GF_EXPORT
+const GF_FilterCapability *gf_filter_get_caps(GF_Filter *filter, u32 *nb_caps)
+{
+	if (!filter || !filter->forced_caps || !nb_caps) return NULL;
+	*nb_caps = filter->nb_forced_caps;
+	return filter->forced_caps;
+}
+
+GF_EXPORT
 GF_Filter *gf_filter_load_filter(GF_Filter *filter, const char *name, GF_Err *err_code)
 {
 	if (!filter) return NULL;
@@ -3783,27 +4405,51 @@
 \param filter target filter
 \return GF_TRUE if some connection tasks are pending, GF_FALSE otherwise
 */
+GF_EXPORT
 Bool gf_filter_connections_pending(GF_Filter *filter)
 {
 	u32 i, count;
 	Bool res = GF_FALSE;
 	if (!filter) return GF_FALSE;
 	if (filter->session->pid_connect_tasks_pending) return GF_TRUE;
+	if (filter->session->in_final_flush) return GF_FALSE;
 	gf_mx_p(filter->session->filters_mx);
 	count = gf_list_count(filter->session->filters);
 	for (i=0; i<count; i++) {
+		u32 j;
 		GF_Filter *f = gf_list_get(filter->session->filters, i);
-		if (f==filter) continue;
+		if (f->removed || f->finalized) continue;
 
-		gf_mx_p(filter->tasks_mx);
-		if (f->num_input_pids && ! f->num_output_pids) {
+		gf_mx_p(f->tasks_mx);
+		for (j=0; j<f->num_output_pids; j++) {
+			GF_FilterPid *pid = gf_list_get(f->output_pids, j);
+			if (pid->init_task_pending) {
+				res = GF_TRUE;
+				break;
+			}
+		}
+		if (res) {
+			gf_mx_v(f->tasks_mx);
+			break;
+		}
+
+		if (f==filter) {
+			gf_mx_v(f->tasks_mx);
+			continue;
+		}
+
+		if (f->in_pid_connection_pending || f->out_pid_connection_pending) {
+			res = GF_TRUE;
+		}
+		//filter has no output, check if it is expected or not
+		else if (!f->removed && !f->finalized && !f->disabled && !f->num_output_pids && !f->act_as_sink && !f->multi_sink_target) {
 			if (f->forced_caps) {
 				res = gf_filter_has_out_caps(f->forced_caps, f->nb_forced_caps);
 			} else {
 				res = gf_filter_has_out_caps(f->freg->caps, f->freg->nb_caps);
 			}
 		}
-		gf_mx_v(filter->tasks_mx);
+		gf_mx_v(f->tasks_mx);
 		if (res)
 			break;
 	}
@@ -3852,3 +4498,239 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_filter_push_caps(GF_Filter *filter, u32 code, GF_PropertyValue *value, const char *name, u32 flags, u8 priority)
+{
+	u32 nb_caps;
+	GF_FilterCapability *caps;
+	if (! (filter->freg->flags & GF_FS_REG_CUSTOM)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to push cap on non custom filter %s\n", filter->freg->name));
+		return GF_BAD_PARAM;
+	}
+	caps = (GF_FilterCapability *)filter->forced_caps;
+	nb_caps = filter->nb_forced_caps;
+	caps = gf_realloc(caps, sizeof(GF_FilterCapability)*(nb_caps+1) );
+	if (!caps) return GF_OUT_OF_MEM;
+	caps[nb_caps].code = code;
+	caps[nb_caps].val = *value;
+	caps[nb_caps].name = name ? gf_strdup(name) : NULL;
+	caps[nb_caps].priority = priority;
+	caps[nb_caps].flags = flags;
+	filter->nb_forced_caps++;
+	filter->forced_caps = caps;
+
+	//reload graph for this updated registry!
+	GF_FilterRegister *freg = (GF_FilterRegister *)filter->freg;
+	freg->caps = filter->forced_caps;
+	freg->nb_caps = filter->nb_forced_caps;
+	gf_filter_sess_reset_graph(filter->session, filter->freg);
+	gf_filter_sess_build_graph(filter->session, filter->freg);
+
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_set_process_ckb(GF_Filter *filter, GF_Err (*process_cbk)(GF_Filter *filter) )
+{
+	if (! (filter->freg->flags & GF_FS_REG_CUSTOM)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to assign filter callback on non custom filter %s\n", filter->freg->name));
+		return GF_BAD_PARAM;
+	}
+	((GF_FilterRegister *) filter->freg)->process = process_cbk;
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_filter_set_configure_ckb(GF_Filter *filter, GF_Err (*configure_cbk)(GF_Filter *filter, GF_FilterPid *PID, Bool is_remove) )
+{
+	if (! (filter->freg->flags & GF_FS_REG_CUSTOM)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to assign filter callback on non custom filter %s\n", filter->freg->name));
+		return GF_BAD_PARAM;
+	}
+	((GF_FilterRegister *) filter->freg)->configure_pid = configure_cbk;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_set_process_event_ckb(GF_Filter *filter, Bool (*process_event_cbk)(GF_Filter *filter, const GF_FilterEvent *evt) )
+{
+	if (! (filter->freg->flags & GF_FS_REG_CUSTOM)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to assign filter callback on non custom filter %s\n", filter->freg->name));
+		return GF_BAD_PARAM;
+	}
+	((GF_FilterRegister *) filter->freg)->process_event = process_event_cbk;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_set_reconfigure_output_ckb(GF_Filter *filter, GF_Err (*reconfigure_output_cbk)(GF_Filter *filter, GF_FilterPid *PID) )
+{
+	if (! (filter->freg->flags & GF_FS_REG_CUSTOM)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to assign filter callback on non custom filter %s\n", filter->freg->name));
+		return GF_BAD_PARAM;
+	}
+	((GF_FilterRegister *) filter->freg)->reconfigure_output = reconfigure_output_cbk;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_set_probe_data_cbk(GF_Filter *filter, const char * (*probe_data_cbk)(const u8 *data, u32 size, GF_FilterProbeScore *score) )
+{
+	if (! (filter->freg->flags & GF_FS_REG_CUSTOM)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to assign filter callback on non custom filter %s\n", filter->freg->name));
+		return GF_BAD_PARAM;
+	}
+	((GF_FilterRegister *) filter->freg)->probe_data = probe_data_cbk;
+	return GF_OK;
+}
+
+
+GF_EXPORT
+const GF_FilterArgs *gf_filter_enumerate_args(GF_Filter *filter, u32 idx)
+{
+	u32 i;
+	if (!filter) return NULL;
+	if (!filter->freg->args) return NULL;
+
+	for (i=0; i<=idx; i++) {
+		if (! filter->freg->args[i].arg_name)
+			return NULL;
+	}
+	return &filter->freg->args[idx];
+}
+
+GF_EXPORT
+GF_Err gf_filter_set_rt_udta(GF_Filter *filter, void *udta)
+{
+	if (!filter) return GF_BAD_PARAM;
+	filter->rt_udta = udta;
+	return GF_OK;
+}
+
+GF_EXPORT
+void *gf_filter_get_rt_udta(GF_Filter *filter)
+{
+	if (!filter) return NULL;
+	return filter->rt_udta;
+}
+
+
+Bool gf_filter_is_instance_of(GF_Filter *filter, const GF_FilterRegister *freg)
+{
+	if (filter && freg && (filter->freg==freg))
+		return GF_TRUE;
+	return GF_FALSE;
+}
+
+GF_EXPORT
+void gf_filter_abort(GF_Filter *filter)
+{
+	u32 i;
+	GF_FilterEvent evt;
+	if (!filter) return;
+	gf_mx_p(filter->tasks_mx);
+	GF_FEVT_INIT(evt, GF_FEVT_STOP, NULL);
+	for (i=0; i<filter->num_input_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->input_pids, i);
+		gf_filter_pid_set_discard(pid, GF_TRUE);
+		evt.base.on_pid = pid;
+		gf_filter_pid_send_event(pid, &evt);
+	}
+	for (i=0; i<filter->num_output_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		gf_filter_pid_set_eos(pid);
+	}
+	filter->disabled = 1;
+	gf_mx_v(filter->tasks_mx);
+}
+
+GF_EXPORT
+void gf_filter_lock(GF_Filter *filter, Bool do_lock)
+{
+	if (!filter) return;
+	if (do_lock)
+		gf_mx_p(filter->tasks_mx);
+	else
+		gf_mx_v(filter->tasks_mx);
+}
+
+GF_EXPORT
+void gf_filter_lock_all(GF_Filter *filter, Bool do_lock)
+{
+	if (!filter) return;
+	if (do_lock)
+		gf_mx_p(filter->session->filters_mx);
+	else
+		gf_mx_v(filter->session->filters_mx);
+}
+
+void gf_filter_mirror_forced_caps(GF_Filter *filter, GF_Filter *dst_filter)
+{
+	if (filter && dst_filter) {
+		filter->forced_caps = dst_filter->forced_caps;
+		filter->nb_forced_caps = dst_filter->nb_forced_caps;
+	}
+}
+
+GF_EXPORT
+void gf_filter_require_source_id(GF_Filter *filter)
+{
+	if (filter) filter->require_source_id = GF_TRUE;
+}
+
+void gf_filter_set_blocking(GF_Filter *filter, Bool is_blocking)
+{
+	if (filter) filter->is_blocking_source = is_blocking;
+}
+
+GF_EXPORT
+const GF_FilterRegister *gf_filter_get_register(GF_Filter *filter)
+{
+	return filter ? filter->freg : NULL;
+}
+
+GF_EXPORT
+void gf_filter_force_main_thread(GF_Filter *filter, Bool do_tag)
+{
+	if (!filter) return;
+	if (do_tag)
+		safe_int_inc(&filter->nb_main_thread_forced);
+	else
+		safe_int_dec(&filter->nb_main_thread_forced);
+
+}
+
+GF_EXPORT
+Bool gf_filter_is_sink(GF_Filter *filter)
+{
+	if (!filter) return GF_FALSE;
+	if (filter->forced_caps) {
+		return !gf_filter_has_out_caps(filter->forced_caps, filter->nb_forced_caps);
+	}
+	return !gf_filter_has_out_caps(filter->freg->caps, filter->freg->nb_caps);
+}
+
+GF_EXPORT
+Bool gf_filter_is_source(GF_Filter *filter)
+{
+	if (!filter) return GF_FALSE;
+	if (filter->forced_caps) {
+		return !gf_filter_has_in_caps(filter->forced_caps, filter->nb_forced_caps);
+	}
+	return !gf_filter_has_in_caps(filter->freg->caps, filter->freg->nb_caps);
+}
+
+GF_EXPORT
+GF_Err gf_filter_tag_subsession(GF_Filter *filter, u32 subsession_id, u32 source_id)
+{
+	if (!filter) return GF_BAD_PARAM;
+	//ignored in non implicit mode
+	if (! (filter->session->flags & GF_FS_FLAG_IMPLICIT_MODE)) return GF_OK;
+	filter->subsession_id = subsession_id;
+	if (gf_filter_is_sink(filter))
+		filter->subsource_id = 0;
+	else
+		filter->subsource_id = 1 + source_id;
+	return GF_OK;
+}

gpac-1.0.1.tar.gz/src/filter_core/filter_pck.c -> gpac-2.0.0.tar.gz/src/filter_core/filter_pck.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / filters sub-project
@@ -48,10 +48,15 @@
 	pck_src=pck_src->pck;
 	pck_dst=pck_dst->pck;
 
+	//keep internal flags
+	u32 iflags = pck_dst->info.flags & (GF_PCKF_PROPS_REFERENCE | GF_PCKF_FORCE_MAIN) ;
 	pck_dst->info = pck_src->info;
-	pck_dst->info.flags &= ~GF_PCKF_PROPS_REFERENCE;
+	//remove internal props flags of reference
+	pck_dst->info.flags &= ~ (GF_PCKF_PROPS_REFERENCE | GF_PCKF_FORCE_MAIN);
+	//restore internal props flags of packet
+	pck_dst->info.flags |= iflags;
 
-	if (!pck_src->props) {
+	if (!pck_src->props || pck_dst->is_dangling) {
 		return GF_OK;
 	}
 	if (!pck_dst->props) {
@@ -95,7 +100,7 @@
 	return GF_FALSE;
 }
 
-static GF_FilterPacket *gf_filter_pck_new_alloc_internal(GF_FilterPid *pid, u32 data_size, u8 **data, Bool no_block_check)
+static GF_FilterPacket *gf_filter_pck_new_alloc_internal(GF_FilterPid *pid, u32 data_size, u8 **data)
 {
 	GF_FilterPacket *pck=NULL;
 	GF_FilterPacket *closest=NULL;
@@ -105,8 +110,6 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to allocate a packet on an input PID in filter %s\n", pid->filter->name));
 		return NULL;
 	}
-	if (!no_block_check && gf_filter_pid_would_block(pid))
-		return NULL;
 
 	count = gf_fq_count(pid->filter->pcks_alloc_reservoir);
 	if (count) {
@@ -128,6 +131,11 @@
 		assert(closest);
 		closest->alloc_size = data_size;
 		closest->data = gf_realloc(closest->data, closest->alloc_size);
+		if (!closest->data) {
+			gf_free(closest);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new packet on PID %s of filter %s\n", pid->name, pid->filter->name));
+			return NULL;
+		}
 		pck = closest;
 #ifdef GPAC_MEMORY_TRACKING
 		pid->filter->session->nb_realloc_pck++;
@@ -136,9 +144,16 @@
 
 	if (!pck) {
 		GF_SAFEALLOC(pck, GF_FilterPacket);
-		if (!pck)
+		if (!pck) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new packet on PID %s of filter %s\n", pid->name, pid->filter->name));
 			return NULL;
+		}
 		pck->data = gf_malloc(sizeof(char)*data_size);
+		if (!pck->data) {
+			gf_free(pck);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new packet on PID %s of filter %s\n", pid->name, pid->filter->name));
+			return NULL;
+		}
 		pck->alloc_size = data_size;
 #ifdef GPAC_MEMORY_TRACKING
 		pid->filter->session->nb_alloc_pck+=2;
@@ -171,17 +186,60 @@
 GF_EXPORT
 GF_FilterPacket *gf_filter_pck_new_alloc(GF_FilterPid *pid, u32 data_size, u8 **data)
 {
-	return gf_filter_pck_new_alloc_internal(pid, data_size, data, GF_TRUE);
+	return gf_filter_pck_new_alloc_internal(pid, data_size, data);
 }
 
-static GF_FilterPacket *clone_frame_interface(GF_FilterPid *pid, GF_FilterPacket *pck_source, u8 **data)
+static GF_FilterPacket *gf_filter_pck_new_dangling_packet(GF_FilterPacket *cached_pck, u32 data_length)
+{
+	GF_FilterPacket *dst;
+
+	if (cached_pck && cached_pck->reference) {
+		gf_filter_pck_discard(cached_pck);
+		cached_pck = NULL;
+	}
+	if (cached_pck) {
+		if (data_length > cached_pck->alloc_size) {
+			cached_pck->alloc_size = data_length;
+			cached_pck->data = gf_realloc(cached_pck->data, cached_pck->alloc_size);
+			if (!cached_pck->data) {
+				gf_free(cached_pck);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to re-allocate dangling packet data\n"));
+				return NULL;
+			}
+		}
+		cached_pck->data_length = data_length;
+		return cached_pck;
+	}
+
+	GF_SAFEALLOC(dst, GF_FilterPacket);
+	if (!dst) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new dangling packet\n"));
+		return NULL;
+	}
+	dst->data = gf_malloc(sizeof(char) * data_length);
+	if (!dst->data) {
+		gf_free(dst);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new dangling packet\n"));
+		return NULL;
+	}
+	dst->alloc_size = dst->data_length = data_length;
+	dst->filter_owns_mem = 0;
+	dst->pck = dst;
+	dst->is_dangling = 1;
+	return dst;
+}
+
+static GF_FilterPacket *gf_filter_pck_clone_frame_interface(GF_FilterPid *pid, GF_FilterPacket *pck_source, u8 **data, Bool dangling_packet, GF_FilterPacket *cached_pck)
 {
 	u32 i, w, h, stride, stride_uv, pf, osize;
 	u32 nb_planes, uv_height;
 	GF_FilterPacket *dst, *ref;
+	u8 *pck_data;
 	GF_FilterPacketInstance *pcki = (GF_FilterPacketInstance *) pck_source;
 	const GF_PropertyValue *p;
 
+	if (data) *data = NULL;
+
 	ref = pcki->pck;
 
 	p = gf_filter_pid_get_property(ref->pid , GF_PROP_PID_WIDTH);
@@ -198,18 +256,27 @@
 	stride = stride_uv = 0;
 
 	if (gf_pixel_get_size_info(pf, w, h, &osize, &stride, &stride_uv, &nb_planes, &uv_height) == GF_FALSE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unknown pixel format, cannot grab underlying video data\n"));
 		return NULL;
 	}
-	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
-	if (!p || (p->value.uint != stride)) {
-		gf_filter_pid_set_property(pid, GF_PROP_PID_STRIDE, &PROP_UINT(stride));
-		gf_filter_pid_set_property(pid, GF_PROP_PID_STRIDE_UV, &PROP_UINT(stride_uv));
+
+	if (!dangling_packet) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
+		if (!p || (p->value.uint != stride)) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_STRIDE, &PROP_UINT(stride));
+			gf_filter_pid_set_property(pid, GF_PROP_PID_STRIDE_UV, &PROP_UINT(stride_uv));
+		}
+		dst = gf_filter_pck_new_alloc(pid, osize, &pck_data);
+		if (!dst) return NULL;
+	} else {
+		dst = gf_filter_pck_new_dangling_packet(cached_pck, osize);
+		if (!dst) return NULL;
+		pck_data = dst->data;
 	}
 
-	dst = gf_filter_pck_new_alloc(pid, osize, data);
 	if (!dst) return NULL;
-	
-	u8 *out_ptr = *data;
+	if (data) *data = pck_data;
+
 	for (i=0; i<nb_planes; i++) {
 		u32 j, write_h, dst_stride;
 		const u8 *in_ptr;
@@ -227,25 +294,32 @@
 			dst_stride = stride;
 		}
 		for (j=0; j<write_h; j++) {
-			memcpy(out_ptr, in_ptr, dst_stride);
+			memcpy(pck_data, in_ptr, dst_stride);
 			in_ptr += src_stride;
-			out_ptr += dst_stride;
+			pck_data += dst_stride;
 		}
 	}
 	gf_filter_pck_merge_properties(pck_source, dst);
 	return dst;
 }
 
-static GF_FilterPacket *gf_filter_pck_new_clone_internal(GF_FilterPid *pid, GF_FilterPacket *pck_source, u8 **data, Bool force_copy)
+static GF_FilterPacket *gf_filter_pck_new_clone_internal(GF_FilterPid *pid, GF_FilterPacket *pck_source, u8 **data, Bool force_copy, Bool dangling_packet, GF_FilterPacket *cached_pck)
 {
 	GF_FilterPacket *dst, *ref;
 	u32 max_ref = 0;
 	GF_FilterPacketInstance *pcki;
 	if (!pck_source) return NULL;
 
+	if (dangling_packet) {
+		if (PCK_IS_OUTPUT(pck_source)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Cannot create dangling packet from non-source packet\n"));
+			return NULL;
+		}
+	}
+
 	pcki = (GF_FilterPacketInstance *) pck_source;
 	if (pcki->pck->frame_ifce)
-		return clone_frame_interface(pid, pck_source, data);
+		return gf_filter_pck_clone_frame_interface(pid, pck_source, data, dangling_packet, cached_pck);
 
 	if (force_copy) {
 		max_ref = 2;
@@ -263,39 +337,84 @@
 	}
 	
 	if (max_ref>1) {
-		dst = gf_filter_pck_new_alloc_internal(pid, pcki->pck->data_length, data, GF_TRUE);
-		if (dst && data) {
-			memcpy(*data, pcki->pck->data, sizeof(char)*pcki->pck->data_length);
+		u8 *data_new;
+		if (dangling_packet) {
+			dst = gf_filter_pck_new_dangling_packet(cached_pck, pcki->pck->data_length);
+			if (!dst) return NULL;
+
+			data_new = dst->data;
+		} else {
+			dst = gf_filter_pck_new_alloc_internal(pid, pcki->pck->data_length, &data_new);
+		}
+		if (dst && data_new) {
+			memcpy(data_new, pcki->pck->data, sizeof(char)*pcki->pck->data_length);
+			if (data) *data = data_new;
 		}
 		if (dst) gf_filter_pck_merge_properties(pck_source, dst);
 		return dst;
 	}
-	dst = gf_filter_pck_new_ref(pid, NULL, 0, pck_source);
+
+	if (dangling_packet) {
+		if (cached_pck && cached_pck->reference) {
+			gf_filter_pck_discard(cached_pck);
+		}
+		GF_SAFEALLOC(dst, GF_FilterPacket);
+		if (!dst) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new dangling packet (source filter %s)\n", pck_source->pck->src_filter->name));
+			return NULL;
+		}
+		pck_source = pck_source->pck;
+		dst->data = pck_source->data;
+		dst->data_length = pck_source->data_length;
+		dst->reference = pck_source;
+		dst->pck = dst;
+		dst->is_dangling = 1;
+
+		assert(pck_source->reference_count);
+		//cf gf_filter_pck_new_ref for these
+		safe_int_inc(&pck_source->reference_count);
+		safe_int_inc(&pck_source->pid->nb_shared_packets_out);
+		safe_int_inc(&pck_source->pid->filter->nb_shared_packets_out);
+		gf_filter_pck_merge_properties(pck_source, dst);
+		if (data) *data = dst->data;
+		return dst;
+	}
+
+	dst = gf_filter_pck_new_ref(pid, 0, 0, pck_source);
 	if (dst) {
 		gf_filter_pck_merge_properties(pck_source, dst);
-		*data = dst->data;
+		if (data) *data = dst->data;
 	}
 	return dst;
 }
 
+GF_EXPORT
+GF_FilterPacket *gf_filter_pck_dangling_copy(GF_FilterPacket *pck_source, GF_FilterPacket *cached_pck)
+{
+	return gf_filter_pck_new_clone_internal(NULL, pck_source, NULL, GF_FALSE, GF_TRUE, cached_pck);
+}
 
 GF_EXPORT
 GF_FilterPacket *gf_filter_pck_new_clone(GF_FilterPid *pid, GF_FilterPacket *pck_source, u8 **data)
 {
-	return gf_filter_pck_new_clone_internal(pid, pck_source, data, GF_FALSE);
+	return gf_filter_pck_new_clone_internal(pid, pck_source, data, GF_FALSE, GF_FALSE, NULL);
 }
 GF_EXPORT
 GF_FilterPacket *gf_filter_pck_new_copy(GF_FilterPid *pid, GF_FilterPacket *pck_source, u8 **data)
 {
-	return gf_filter_pck_new_clone_internal(pid, pck_source, data, GF_TRUE);
+	return gf_filter_pck_new_clone_internal(pid, pck_source, data, GF_TRUE, GF_FALSE, NULL);
 }
 
 
 GF_EXPORT
 GF_FilterPacket *gf_filter_pck_new_alloc_destructor(GF_FilterPid *pid, u32 data_size, u8 **data, gf_fsess_packet_destructor destruct)
 {
-	GF_FilterPacket *pck = gf_filter_pck_new_alloc_internal(pid, data_size, data, GF_TRUE);
-	if (pck) pck->destructor = destruct;
+	GF_FilterPacket *pck = gf_filter_pck_new_alloc_internal(pid, data_size, data);
+	if (pck && destruct) {
+		pck->destructor = destruct;
+		if (pid->filter->freg->flags & GF_FS_REG_MAIN_THREAD)
+			pck->info.flags |= GF_PCKF_FORCE_MAIN;
+	}
 	return pck;
 }
 
@@ -327,6 +446,9 @@
 	}
 	gf_filter_pck_reset_props(pck, pid);
 
+	if (destruct && (pid->filter->freg->flags & GF_FS_REG_MAIN_THREAD))
+		pck->info.flags |= GF_PCKF_FORCE_MAIN;
+
 	assert(pck->pid);
 	return pck;
 }
@@ -339,21 +461,39 @@
 }
 
 GF_EXPORT
-GF_FilterPacket *gf_filter_pck_new_ref(GF_FilterPid *pid, const u8 *data, u32 data_size, GF_FilterPacket *reference)
+GF_FilterPacket *gf_filter_pck_new_ref(GF_FilterPid *pid, u32 data_offset, u32 data_size, GF_FilterPacket *reference)
 {
 	GF_FilterPacket *pck;
 	if (!reference) return NULL;
 	reference=reference->pck;
-	pck = gf_filter_pck_new_shared(pid, data, data_size, NULL);
+
+	if (reference->data) {
+		if (data_offset > reference->data_length)
+			return NULL;
+
+		if (!data_size)
+			data_size = reference->data_length - data_offset;
+
+		if (data_offset + data_size > reference->data_length)
+			return NULL;
+	}
+
+	pck = gf_filter_pck_new_shared(pid, reference->data, data_size, NULL);
 	if (!pck) return NULL;
 	pck->reference = reference;
+	//apply offset
+	if (reference->data)
+		pck->data += data_offset;
 	assert(reference->reference_count);
 	safe_int_inc(&reference->reference_count);
-	if (!data && !data_size) {
+	if (!data_offset && (!data_size || (data_size==reference->data_length))) {
 		pck->data = reference->data;
 		pck->data_length = reference->data_length;
 		pck->frame_ifce = reference->frame_ifce;
 	}
+	if (reference->info.flags & GF_PCKF_FORCE_MAIN)
+		pck->info.flags |= GF_PCKF_FORCE_MAIN;
+
 	safe_int_inc(&reference->pid->nb_shared_packets_out);
 	safe_int_inc(&reference->pid->filter->nb_shared_packets_out);
 	return pck;
@@ -380,6 +520,8 @@
 	pck->destructor = destruct;
 	pck->frame_ifce = frame_ifce;
 	pck->filter_owns_mem = 2;
+	if (frame_ifce && frame_ifce->get_gl_texture)
+		pck->info.flags |= GF_PCKF_FORCE_MAIN;
 	return pck;
 }
 
@@ -401,6 +543,8 @@
 	pck->data = reference->data;
 	pck->data_length = reference->data_length;
 	pck->frame_ifce = reference->frame_ifce;
+	if (reference->info.flags & GF_PCKF_FORCE_MAIN)
+		pck->info.flags |= GF_PCKF_FORCE_MAIN;
 
 	return gf_filter_pck_send(pck);
 }
@@ -434,7 +578,7 @@
 		is_filter_destroyed = pck->src_filter->finalized;
 	}
 
-	if (!is_filter_destroyed) {
+	if (!is_filter_destroyed && !pck->is_dangling) {
 		assert(pck->pid);
 		if (pck->pid->filter) {
 			if (pck->info.cts != GF_FILTER_NO_TS) {
@@ -444,8 +588,10 @@
 			}
 		}
 	}
+	//never set for dangling packets
 	if (pck->destructor) pck->destructor(pid->filter, pid, pck);
 
+	//never set for dangling packets (theyr are never sent)
 	if (pck->pid_props) {
 		GF_PropertyMap *props = pck->pid_props;
 		pck->pid_props = NULL;
@@ -481,6 +627,7 @@
 			gf_props_del(props);
 		}
 	}
+	//never set for dangling packets, they are either standalone mem or packet references
 	if (pck->filter_owns_mem && !(pck->info.flags & GF_PCK_CMD_MASK) ) {
 		assert(pck->pid);
 		assert(pck->pid->nb_shared_packets_out);
@@ -506,6 +653,8 @@
 			gf_filter_packet_destroy(pck->reference);
 		}
 		pck->reference = NULL;
+		if (pck->is_dangling)
+			pck->data = NULL;
 	}
 	/*this is a property reference packet, its destruction may happen at ANY time*/
 	if (is_ref_props_packet) {
@@ -517,7 +666,11 @@
 	} else if (is_filter_destroyed) {
 		if (!pck->filter_owns_mem && pck->data) gf_free(pck->data);
 		gf_free(pck);
-	} else if (pck->filter_owns_mem ) {
+	} else if (pck->is_dangling) {
+		if (pck->data) gf_free(pck->data);
+		gf_free(pck);
+	}
+	else if (pck->filter_owns_mem ) {
 		if (pid->filter && pid->filter->pcks_shared_reservoir) {
 			gf_fq_add(pid->filter->pcks_shared_reservoir, pck);
 		} else {
@@ -533,7 +686,7 @@
 	}
 }
 
-static Bool gf_filter_aggregate_packets(GF_FilterPidInst *dst)
+Bool gf_filter_aggregate_packets(GF_FilterPidInst *dst)
 {
 	u32 size=0, pos=0;
 	u64 byte_offset = 0;
@@ -548,13 +701,15 @@
 	count=gf_list_count(dst->pck_reassembly);
 	//no packet to reaggregate
 	if (!count) return GF_FALSE;
+
+	dst->nb_reagg_pck++;
+
 	//single packet, update PID buffer and dispatch to packet queue
 	if (count==1) {
 		GF_FilterPacketInstance *pcki = gf_list_pop_back(dst->pck_reassembly);
 		safe_int_inc(&dst->filter->pending_packets);
 		if (pcki->pck->info.duration && pcki->pck->pid_props->timescale) {
-			s64 duration = ((u64)pcki->pck->info.duration) * 1000000;
-			duration /= pcki->pck->pid_props->timescale;
+			u64 duration = gf_timestamp_rescale(pcki->pck->info.duration, pcki->pck->pid_props->timescale, 1000000);
 			safe_int64_add(&dst->buffer_duration, duration);
 		}
 		pcki->pck->info.flags |= GF_PCKF_BLOCK_START | GF_PCKF_BLOCK_END;
@@ -637,8 +792,7 @@
 			safe_int_inc(&dst->filter->pending_packets);
 
 			if (info.duration && pck->pid_props && pck->pid_props->timescale) {
-				s64 duration = ((u64) info.duration) * 1000000;
-				duration /= pck->pid_props->timescale;
+				u64 duration = gf_timestamp_rescale(info.duration, pck->pid_props->timescale, 1000000);
 				safe_int64_add(&dst->buffer_duration, duration);
 			}
 			//not continous set of bytes reaggregated
@@ -685,6 +839,7 @@
 	s64 duration=0;
 	u32 timescale=0;
 	GF_FilterClockType cktype;
+	Bool is_cmd_pck;
 #ifdef GPAC_MEMORY_TRACKING
 	u32 nb_allocs=0, nb_reallocs=0, prev_nb_allocs=0, prev_nb_reallocs=0;
 #endif
@@ -716,8 +871,10 @@
 		return GF_OK;
 	}
 
+	is_cmd_pck = (pck->info.flags & GF_PCK_CMD_MASK);
+
 	//special case for source filters (no input pids), mark as playing once we have a packet sent
-	if (!pid->filter->num_input_pids && !pid->initial_play_done && !pid->is_playing) {
+	if (!is_cmd_pck && !pid->filter->num_input_pids && !pid->initial_play_done && !pid->is_playing) {
 		pid->initial_play_done = GF_TRUE;
 		pid->is_playing = GF_TRUE;
 		pid->filter->nb_pids_playing++;
@@ -730,18 +887,23 @@
 
 	gf_rmt_begin(pck_send, GF_RMT_AGGREGATE);
 
+	cktype = ( pck->info.flags & GF_PCK_CKTYPE_MASK) >> GF_PCK_CKTYPE_POS;
+
 	//send from filter, update flags
 	if (from_filter) {
-		Bool is_cmd = (pck->info.flags & GF_PCK_CKTYPE_MASK) ? GF_TRUE : GF_FALSE;
-		if (! is_cmd ) {
+		Bool is_cmd = (pck->info.flags & GF_PCK_CMD_MASK) ? GF_TRUE : GF_FALSE;
+		//not a clock, flush any pending clock
+		if (! (pck->info.flags & GF_PCK_CKTYPE_MASK) ) {
 			gf_filter_forward_clock(pck->pid->filter);
 		}
 		if ( (pck->info.flags & GF_PCK_CMD_MASK) == GF_PCK_CMD_PID_EOS) {
 			if (!pid->has_seen_eos) {
 				pid->has_seen_eos = GF_TRUE;
-				GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s EOS detected\n", pck->pid->filter->name, pck->pid->name));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s EOS detected\n", pck->pid->filter->name, pck->pid->name));
 			}
-		} else if (pid->has_seen_eos && !is_cmd) {
+		}
+		//reset eos only if not a command and not a clock signaling
+		else if (pid->has_seen_eos && !is_cmd && !cktype) {
 			pid->has_seen_eos = GF_FALSE;
 		}
 
@@ -754,13 +916,17 @@
 		//a new property map was created - flag the packet; don't do this if first packet dispatched on pid
 		pck->info.flags &= ~GF_PCKF_PROPS_CHANGED;
 
-		if (!pid->request_property_map && !(pck->info.flags & GF_PCK_CMD_MASK) && (pid->nb_pck_sent || pid->props_changed_since_connect) ) {
+		if (!pid->request_property_map && !is_cmd_pck && (pid->nb_pck_sent || pid->props_changed_since_connect) ) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s properties modified, marking packet\n", pck->pid->filter->name, pck->pid->name));
 
+			if (pid->filter->user_pid_props)
+				gf_filter_pid_set_args(pid->filter, pid);
+
 			pck->info.flags |= GF_PCKF_PROPS_CHANGED;
 		}
 		//any new pid_set_property after this packet will trigger a new property map
-		if (! (pck->info.flags & GF_PCK_CMD_MASK)) {
+		//note we don't reset if packet is a clock info so that next non-clock packet still has the discontinuity marker
+		if (! is_cmd_pck && !cktype) {
 			pid->request_property_map = GF_TRUE;
 			pid->props_changed_since_connect = GF_FALSE;
 		}
@@ -800,7 +966,7 @@
 	pck->src_filter = NULL;
 
 	assert(pck->pid);
-	if (! (pck->info.flags & GF_PCK_CMD_MASK) ) {
+	if (! is_cmd_pck ) {
 		pid->nb_pck_sent++;
 		if (pck->data_length) {
 			pid->filter->nb_pck_sent++;
@@ -808,14 +974,12 @@
 		} else if (pck->frame_ifce) {
 			pid->filter->nb_hw_pck_sent++;
 		}
-		if (pck->info.cts!=GF_FILTER_NO_TS) {
+		if (timescale && (pck->info.cts!=GF_FILTER_NO_TS)) {
 			pid->last_ts_sent.num = pck->info.cts;
-			pid->last_ts_sent.den = pck->pid_props->timescale;
+			pid->last_ts_sent.den = timescale;
 		}
 	}
 
-	cktype = ( pck->info.flags & GF_PCK_CKTYPE_MASK) >> GF_PCK_CKTYPE_POS;
-
 	if (cktype == GF_FILTER_CLOCK_PCR_DISC) {
 		pid->duration_init = GF_FALSE;
 		pid->min_pck_cts = pid->max_pck_cts = 0;
@@ -901,6 +1065,7 @@
 			if (!pid->min_pck_duration) pid->min_pck_duration = (u32) duration;
 			else if ((u32) duration < pid->min_pck_duration) pid->min_pck_duration = (u32) duration;
 		}
+
 		if (!pck->info.duration && pid->min_pck_duration)
 			pck->info.duration = (u32) duration;
 
@@ -908,6 +1073,7 @@
 		if ((s32) pck->info.duration < 0) {
 			pck->info.duration = 0;
 		}
+		pid->last_pck_dur = pck->info.duration;
 
 #ifndef GPAC_DISABLE_LOG
 		if (gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_DEBUG)) {
@@ -944,13 +1110,16 @@
 
 	assert(pck->pid);
 	count = pck->pid->num_destinations;
+	//check if processing this packet must be done on main thread (OpenGL interface or source filter asked fo this) 
+	Bool force_main_thread = (pck->info.flags & GF_PCKF_FORCE_MAIN) ? GF_TRUE : GF_FALSE;
+
 	for (i=0; i<count; i++) {
 		Bool post_task=GF_FALSE;
 		GF_FilterPacketInstance *inst;
 		GF_FilterPidInst *dst = gf_list_get(pck->pid->destinations, i);
-		if (!dst->filter || dst->filter->finalized || dst->filter->removed || !dst->filter->freg->process) continue;
+		if (!dst->filter || dst->filter->finalized || (dst->filter->removed==1) || !dst->filter->freg->process) continue;
 
-		if (dst->discard_inputs) {
+		if (dst->discard_inputs==1) {
 			//in discard input mode, we drop all input packets but trigger reconfigure as they happen
 			if ((pck->info.flags & GF_PCKF_PROPS_CHANGED) && (dst->props != pck->pid_props)) {
 				//unassign old property list and set the new one
@@ -972,11 +1141,14 @@
 				//in which a previously blacklisted filter (failing (re)configure for previous state) could
 				//now work, eg moving from formatA to formatB then back to formatA
 				gf_list_reset(dst->filter->blacklisted);
+				dst->discard_inputs = 2;
 				//and post a reconfigure task
-				gf_fs_post_task(dst->filter->session, gf_filter_pid_reconfigure_task, dst->filter, dst->pid, "pidinst_reconfigure", NULL);
+				gf_fs_post_task(dst->filter->session, gf_filter_pid_reconfigure_task_discard, dst->filter, (GF_FilterPid *)dst, "pidinst_reconfigure", NULL);
+				//keep packets, they will be trashed if we are still in discard when executing gf_filter_pid_reconfigure_task_discard
+			} else {
+				nb_discard++;
+				continue;
 			}
-			nb_discard++;
-			continue;
 		}
 
 		inst = gf_fq_pop(pck->pid->filter->pcks_inst_reservoir);
@@ -988,9 +1160,11 @@
 		inst->pid = dst;
 		inst->pid_props_change_done = 0;
 		inst->pid_info_change_done = 0;
-		//if packet is an openGL interface, force scheduling on main thread for the destination
-		if (pck->frame_ifce&&pck->frame_ifce->get_gl_texture)
-			dst->filter->main_thread_forced = GF_TRUE;
+
+		//if packet is forcing main thread processing increase destination filter main_thread
+		if (force_main_thread) {
+			safe_int_inc(&dst->filter->nb_main_thread_forced);
+		}
 
 		if ((inst->pck->info.flags & GF_PCK_CMD_MASK) == GF_PCK_CMD_PID_EOS) {
 			safe_int_inc(&inst->pid->nb_eos_signaled);
@@ -1034,14 +1208,14 @@
 				//single block packet, direct dispatch in packet queue (aggregation done before)
 				else {
 					assert(dst->last_block_ended);
+					if (!is_cmd_pck)
+						dst->nb_reagg_pck++;
 
 					if (pck->info.duration && timescale) {
-						duration = ((u64)pck->info.duration) * 1000000;
-						duration /= timescale;
+						duration = gf_timestamp_rescale(pck->info.duration, timescale, 1000000);
 						safe_int64_add(&dst->buffer_duration, duration);
 					}
 					inst->pck->info.flags |= GF_PCKF_BLOCK_START;
-
 					safe_int_inc(&dst->filter->pending_packets);
 					gf_fq_add(dst->packets, inst);
 				}
@@ -1059,7 +1233,12 @@
 				if (inst->pck->filter_owns_mem) {
 					u8 *data;
 					u32 alloc_size;
-					inst->pck = gf_filter_pck_new_alloc_internal(pck->pid, pck->data_length, &data, GF_TRUE);
+					inst->pck = gf_filter_pck_new_alloc_internal(pck->pid, pck->data_length, &data);
+					if (!inst->pck) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s: failed to allocate new packet\n", pid->filter->name));
+						continue;
+					}
+
 					alloc_size = inst->pck->alloc_size;
 					memcpy(inst->pck, pck, sizeof(GF_FilterPacket));
 					inst->pck->pck = inst->pck;
@@ -1114,11 +1293,9 @@
 			}
 
 			if (duration && timescale) {
-				duration *= 1000000;
-				duration /= timescale;
+				duration = gf_timestamp_rescale(duration, timescale, 1000000);
 				safe_int64_add(&dst->buffer_duration, duration);
 			}
-
 			safe_int_inc(&dst->filter->pending_packets);
 //
 			gf_fq_add(dst->packets, inst);
@@ -1170,6 +1347,11 @@
 GF_EXPORT
 GF_Err gf_filter_pck_send(GF_FilterPacket *pck)
 {
+	//dangling packet
+	if (pck->is_dangling) {
+		gf_filter_pck_discard(pck);
+		return GF_OK;
+	}
 	assert(pck->pid);
 	return gf_filter_pck_send_internal(pck, GF_TRUE);
 }
@@ -1182,10 +1364,24 @@
 
 	(*pck) = (*pck)->pck;
 	safe_int_inc(& (*pck)->reference_count);
+	//keep track of number of ref packets for this pid at filter level
+	safe_int_inc(& (*pck)->pid->filter->nb_ref_packets);
 	return GF_OK;
 }
 
 GF_EXPORT
+GF_FilterPacket *gf_filter_pck_ref_ex(GF_FilterPacket *pck)
+{
+	GF_FilterPacket *ref_pck;
+	if (! pck ) return NULL;
+	ref_pck = pck->pck;
+	safe_int_inc(& ref_pck->reference_count);
+	//keep track of number of ref packets for this pid at filter level
+	safe_int_inc(& ref_pck->pid->filter->nb_ref_packets);
+	return ref_pck;
+}
+
+GF_EXPORT
 GF_Err gf_filter_pck_ref_props(GF_FilterPacket **pck)
 {
 	GF_FilterPacket *npck, *srcpck;
@@ -1232,6 +1428,11 @@
 	pck=pck->pck;
 
 	assert(pck->reference_count);
+	//decrease number of ref packets for this pid at filter level if not a props reference
+	if (! (pck->info.flags & GF_PCKF_PROPS_REFERENCE)) {
+		assert(pck->pid->filter->nb_ref_packets);
+		safe_int_dec(&pck->pid->filter->nb_ref_packets);
+	}
 	if (safe_int_dec(&pck->reference_count) == 0) {
 		gf_filter_packet_destroy(pck);
 	}
@@ -1290,6 +1491,15 @@
 }
 
 GF_EXPORT
+Bool gf_filter_pck_has_properties(GF_FilterPacket *pck)
+{
+	//get true packet pointer
+	pck = pck->pck;
+	if (!pck->props) return GF_FALSE;
+	return GF_TRUE;
+}
+
+GF_EXPORT
 const GF_PropertyValue *gf_filter_pck_get_property(GF_FilterPacket *pck, u32 prop_4cc)
 {
 	//get true packet pointer

gpac-1.0.1.tar.gz/src/filter_core/filter_pid.c -> gpac-2.0.0.tar.gz/src/filter_core/filter_pid.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / filters sub-project
@@ -25,8 +25,9 @@
 
 #include "filter_session.h"
 #include <gpac/constants.h>
+#include <gpac/bitstream.h>
 
-void pcki_del(GF_FilterPacketInstance *pcki)
+static void pcki_del(GF_FilterPacketInstance *pcki)
 {
 	assert(pcki->pck->reference_count);
 	if (safe_int_dec(&pcki->pck->reference_count) == 0) {
@@ -97,6 +98,9 @@
 {
 	Bool unblock;
 
+	if (pid->ignore_blocking) {
+		return;
+	}
 	//if we are in end of stream state and done with all packets, stay blocked
 	if (pid->has_seen_eos && !pid->nb_buffer_unit) {
 		if (!pid->would_block) {
@@ -121,8 +125,14 @@
 		unblock=GF_TRUE;
 	}
 
+	if (!unblock) {
+		return;
+	}
 	gf_mx_p(pid->filter->tasks_mx);
-	if (pid->would_block && unblock) {
+	unblock = GF_FALSE;
+
+	//unblock pid
+	if (pid->would_block) {
 		assert(pid->would_block);
 		safe_int_dec(&pid->would_block);
 
@@ -133,13 +143,21 @@
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s unblocked (filter has %d blocking pids)\n", pid->pid->filter->name, pid->pid->name, pid->pid->filter->would_block));
 
-		if (pid->filter->would_block + pid->filter->num_out_pids_not_connected < pid->filter->num_output_pids) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has only %d / %d blocked pids, requesting process task (%d queued)\n", pid->filter->name, pid->filter->would_block + pid->filter->num_out_pids_not_connected, pid->filter->num_output_pids, pid->filter->process_task_queued));
+		//check filter unblock
+		unblock = GF_TRUE;
+	}
+	//pid was not blocking but filter is no longer scheduled (might happen in multi-threaded modes), check filter unblock
+	else if (!pid->filter->process_task_queued) {
+		unblock = GF_TRUE;
+	}
 
-			//post a process task
-			gf_filter_post_process_task(pid->filter);
-		}
+	if (unblock && (pid->filter->would_block + pid->filter->num_out_pids_not_connected < pid->filter->num_output_pids)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has only %d / %d blocked pids, requesting process task (%d queued)\n", pid->filter->name, pid->filter->would_block + pid->filter->num_out_pids_not_connected, pid->filter->num_output_pids, pid->filter->process_task_queued));
+
+		//post a process task
+		gf_filter_post_process_task(pid->filter);
 	}
+
 	gf_mx_v(pid->filter->tasks_mx);
 }
 
@@ -187,7 +205,7 @@
 static void gf_filter_pid_update_caps(GF_FilterPid *pid)
 {
 	u32 mtype=0, codecid=0;
-	u32 i, count;
+	u32 i;
 	const GF_PropertyValue *p;
 
 	pid->raw_media = GF_FALSE;
@@ -210,10 +228,11 @@
 	pid->raw_media = GF_FALSE;
 
 	if (codecid!=GF_CODECID_RAW) {
-		count=pid->filter->num_input_pids;
-		for (i=0; i<count; i++) {
-			GF_FilterPidInst *pidi = gf_list_get(pid->filter->input_pids, i);
+		gf_mx_p(pid->filter->tasks_mx);
+		for (i=0; i<pid->filter->num_input_pids; i++) {
 			u32 i_codecid=0, i_type=0;
+			GF_FilterPidInst *pidi = gf_list_get(pid->filter->input_pids, i);
+			if (!pidi->pid) continue;
 			p = gf_filter_pid_get_property_first(pidi->pid, GF_PROP_PID_STREAM_TYPE);
 			if (p) i_type = p->value.uint;
 
@@ -224,6 +243,7 @@
 				pidi->is_encoder_input = GF_TRUE;
 			}
 		}
+		gf_mx_v(pid->filter->tasks_mx);
 		return;
 	}
 
@@ -235,10 +255,11 @@
 
 	//output is a decoded raw stream: if some input has same type but different codecid this is a decoder
 	//set input buffer size
-	count=pid->filter->num_input_pids;
-	for (i=0; i<count; i++) {
+	gf_mx_p(pid->filter->tasks_mx);
+	for (i=0; i<pid->filter->num_input_pids; i++) {
 		u32 i_codecid=0, i_type=0;
 		GF_FilterPidInst *pidi = gf_list_get(pid->filter->input_pids, i);
+		if (!pidi->pid) continue;
 
 		p = gf_filter_pid_get_property_first(pidi->pid, GF_PROP_PID_STREAM_TYPE);
 		if (p) i_type = p->value.uint;
@@ -281,9 +302,10 @@
 		}
 	}
 	//source pid, mark raw media
-	if (!count && pid->num_destinations) {
+	if (!pid->filter->num_input_pids && pid->num_destinations) {
 		pid->raw_media = GF_TRUE;
 	}
+	gf_mx_v(pid->filter->tasks_mx);
 }
 
 #define TASK_REQUEUE(_t) \
@@ -299,7 +321,7 @@
 
 	assert(filter);
 	//reset in process
-	if ((pidinst->filter && pidinst->discard_packets) || filter->stream_reset_pending) {
+	if ((pidinst->filter && pidinst->discard_packets) || filter->stream_reset_pending || filter->abort_pending) {
 		TASK_REQUEUE(task)
 		return;
 	}
@@ -367,28 +389,30 @@
 
 		return;
 	}
+	gf_mx_p(filter->tasks_mx);
 	//still some input to the filter, cannot destroy the output pid
-	if (gf_list_count(filter->input_pids))
+	if (gf_list_count(filter->input_pids)) {
+		gf_mx_v(filter->tasks_mx);
 		return;
+	}
 	//no more destinations on pid, destroy it
 	if (pid->would_block) {
 		assert(pid->filter->would_block);
 		safe_int_dec(&pid->filter->would_block);
 	}
 	
-	gf_mx_p(filter->tasks_mx);
 	gf_list_del_item(filter->output_pids, pid);
 	filter->num_output_pids = gf_list_count(filter->output_pids);
 	gf_filter_pid_del(pid);
-	gf_mx_v(filter->tasks_mx);
 
 	//no more pids on filter, destroy it
-	if (!gf_list_count(filter->output_pids) && !gf_list_count(filter->input_pids)) {
+	if (!gf_list_count(filter->output_pids) && !gf_list_count(filter->input_pids) && !filter->finalized) {
 		gf_filter_post_remove(filter);
 	}
+	gf_mx_v(filter->tasks_mx);
 }
 
-void gf_filter_pid_inst_swap_delete(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPidInst *pidinst, GF_FilterPidInst *dst_swapinst)
+static void gf_filter_pid_inst_swap_delete(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPidInst *pidinst, GF_FilterPidInst *dst_swapinst)
 {
 	u32 i, j;
 
@@ -397,10 +421,12 @@
 	//pid instance buffer (not consumed)
 	gf_filter_pid_inst_reset(pidinst);
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid instance %s swap destruction\n", filter->name, pidinst->pid->name));
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid instance %s swap destruction\n", filter->name, pidinst->pid ? pidinst->pid->name : pid->name));
 	gf_mx_p(filter->tasks_mx);
 	gf_list_del_item(filter->input_pids, pidinst);
 	filter->num_input_pids = gf_list_count(filter->input_pids);
+	if (!filter->num_input_pids)
+		filter->single_source = NULL;
 	gf_mx_v(filter->tasks_mx);
 
 	gf_mx_p(pid->filter->tasks_mx);
@@ -438,7 +464,7 @@
 	gf_filter_post_remove(filter);
 }
 
-void gf_filter_pid_inst_swap_delete_task(GF_FSTask *task)
+static void gf_filter_pid_inst_swap_delete_task(GF_FSTask *task)
 {
 	GF_FilterPidInst *pidinst = task->udta;
 	GF_Filter *filter = pidinst->filter;
@@ -459,7 +485,7 @@
 	gf_filter_pid_inst_swap_delete(filter, pid, pidinst, dst_swapinst);
 }
 
-void gf_filter_pid_inst_swap(GF_Filter *filter, GF_FilterPidInst *dst)
+static void gf_filter_pid_inst_swap(GF_Filter *filter, GF_FilterPidInst *dst)
 {
 	GF_PropertyMap *prev_dst_props;
 	u32 nb_pck_transfer=0;
@@ -488,6 +514,12 @@
 		if (gf_list_find(dst->filter->input_pids, dst)<0) {
 			gf_list_add(dst->filter->input_pids, dst);
 			dst->filter->num_input_pids = gf_list_count(dst->filter->input_pids);
+
+			if (dst->filter->num_input_pids==1) {
+				dst->filter->single_source = dst->pid->filter;
+			} else if (dst->filter->single_source != dst->pid->filter) {
+				dst->filter->single_source = NULL;
+			}
 		}
 		gf_mx_v(dst->pid->filter->tasks_mx);
 	}
@@ -500,6 +532,11 @@
 			assert(src->filter->pending_packets);
 			safe_int_dec(&src->filter->pending_packets);
 
+			if (pcki->pck->info.flags & GF_PCKF_FORCE_MAIN) {
+				assert(src->filter->nb_main_thread_forced);
+				safe_int_dec(&src->filter->nb_main_thread_forced);
+				safe_int_inc(&dst->filter->nb_main_thread_forced);
+			}
 			pcki->pid = dst;
 			gf_fq_add(dst->packets, pcki);
 			safe_int_inc(&dst->filter->pending_packets);
@@ -563,6 +600,8 @@
 			gf_mx_p(src_filter->tasks_mx);
 			gf_list_del_item(src_filter->input_pids, src);
 			src_filter->num_input_pids = gf_list_count(src_filter->input_pids);
+			if (!src_filter->num_input_pids)
+				src_filter->single_source = NULL;
 			gf_mx_v(src_filter->tasks_mx);
 
 			gf_list_del_item(src->pid->destinations, src);
@@ -582,6 +621,11 @@
 	}
 }
 
+static void task_canceled(GF_FSTask *task)
+{
+
+}
+
 
 typedef enum {
 	GF_PID_CONF_CONNECT,
@@ -653,13 +697,14 @@
 	//first connection of this PID to this filter
 	if (!pidinst) {
 		if (ctype != GF_PID_CONF_CONNECT) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Trying to disconnect PID %s not found in filter %s inputs\n", pid->name, filter->name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Trying to disconnect PID %s not present in filter %s inputs\n", pid->name, filter->name));
 			return GF_SERVICE_ERROR;
 		}
 		pidinst = gf_filter_pid_inst_new(filter, pid);
 		new_pid_inst=GF_TRUE;
-		pidinst->alias_orig = alias_orig;
 	}
+	if (!pidinst->alias_orig)
+		pidinst->alias_orig = alias_orig;
 
 	//if new, add the PID to input/output before calling configure
 	if (new_pid_inst) {
@@ -670,11 +715,18 @@
 		gf_list_add(pid->destinations, pidinst);
 		pid->num_destinations = gf_list_count(pid->destinations);
 
+		gf_mx_v(pid->filter->tasks_mx);
+
+		gf_mx_p(filter->tasks_mx);
 		if (!filter->input_pids) filter->input_pids = gf_list_new();
 		gf_list_add(filter->input_pids, pidinst);
 		filter->num_input_pids = gf_list_count(filter->input_pids);
-
-		gf_mx_v(pid->filter->tasks_mx);
+		if (filter->num_input_pids==1) {
+			filter->single_source = pidinst->pid->filter;
+		} else if (filter->single_source != pidinst->pid->filter) {
+			filter->single_source = NULL;
+		}
+		gf_mx_v(filter->tasks_mx);
 
 		//new connection, update caps in case we have events using caps (buffer req) being sent
 		//while processing the configure (they would be dispatched on the source filter, not the dest one being
@@ -722,16 +774,17 @@
 	if (e==GF_OK) {
 		//if new, register the new pid instance, and the source pid as input to this filter
 		if (new_pid_inst) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Connected filter %s (%p) PID %s (%p) (%d fan-out) to filter %s (%p)\n", pid->filter->name, pid->filter, pid->name, pid, pid->num_destinations, filter->name, filter));
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s (%p) PID %s (%p) (%d fan-out) connected to filter %s (%p)\n", pid->filter->name, pid->filter, pid->name, pid, pid->num_destinations, filter->name, filter));
 		}
 	}
 	//failure on reconfigure, try reloading a filter chain
 	else if ((ctype==GF_PID_CONF_RECONFIG) && (e != GF_FILTER_NOT_SUPPORTED)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to reconfigure PID %s:%s in filter %s: %s, reloading filter graph\n", pid->filter->name, pid->name, filter->name, gf_error_to_string(e) ));
-
 		if (e==GF_BAD_PARAM) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to reconfigure PID %s:%s in filter %s: %s\n", pid->filter->name, pid->name, filter->name, gf_error_to_string(e) ));
+
 			filter->session->last_connect_error = e;
 		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Failed to reconfigure PID %s:%s in filter %s: %s, reloading filter graph\n", pid->filter->name, pid->name, filter->name, gf_error_to_string(e) ));
 			gf_filter_relink_dst(pidinst);
 		}
 	} else {
@@ -740,6 +793,8 @@
 		gf_mx_p(filter->tasks_mx);
 		gf_list_del_item(filter->input_pids, pidinst);
 		filter->num_input_pids = gf_list_count(filter->input_pids);
+		if (!filter->num_input_pids)
+			filter->single_source = NULL;
 		filter->freg->configure_pid(filter, (GF_FilterPid *) pidinst, GF_TRUE);
 		gf_mx_v(filter->tasks_mx);
 
@@ -755,6 +810,18 @@
 			gf_mx_p(pid->filter->tasks_mx);
 			gf_list_del_item(pid->destinations, pidinst);
 			pid->num_destinations = gf_list_count(pid->destinations);
+
+			//cancel all tasks targeting this pid
+			gf_mx_p(pid->filter->tasks_mx);
+			count = gf_fq_count(pid->filter->tasks);
+			for (i=0; i<count; i++) {
+				GF_FSTask *t = gf_fq_get(pid->filter->tasks, i);
+				if (t->pid == (GF_FilterPid *) pidinst) {
+					t->run_task = task_canceled;
+				}
+			}
+			gf_mx_v(pid->filter->tasks_mx);
+
 			//destroy pid instance
 			gf_filter_pid_inst_del(pidinst);
 			gf_mx_v(pid->filter->tasks_mx);
@@ -763,7 +830,7 @@
 
 		if (e==GF_REQUIRES_NEW_INSTANCE) {
 			//TODO: copy over args from current filter
-			GF_Filter *new_filter = gf_filter_clone(filter);
+			GF_Filter *new_filter = gf_filter_clone(filter, pid->filter);
 			if (new_filter) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Clone filter %s, new instance for pid %s\n", filter->name, pid->name));
 				gf_filter_pid_post_connect_task(new_filter, pid);
@@ -777,13 +844,23 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to disconnect filter %s PID %s from filter %s: %s\n", pid->filter->name, pid->name, filter->name, gf_error_to_string(e) ));
 		}
 		else if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to connect filter %s PID %s to filter %s: %s\n", pid->filter->name, pid->name, filter->name, gf_error_to_string(e) ));
+			if (e!= GF_EOS) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to connect filter %s PID %s to filter %s: %s\n", pid->filter->name, pid->name, filter->name, gf_error_to_string(e) ));
+			}
 
-			if ((e==GF_BAD_PARAM) || (e==GF_FILTER_NOT_SUPPORTED) || (filter->session->flags & GF_FS_FLAG_NO_REASSIGN)) {
-				if (e!=GF_FILTER_NOT_SUPPORTED) {
+			if ((e==GF_BAD_PARAM)
+				|| (e==GF_SERVICE_ERROR)
+				|| (e==GF_REMOTE_SERVICE_ERROR)
+				|| (e==GF_FILTER_NOT_SUPPORTED)
+				|| (e==GF_EOS)
+				|| (filter->session->flags & GF_FS_FLAG_NO_REASSIGN)
+			) {
+				if (filter->session->flags & GF_FS_FLAG_NO_REASSIGN) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter reassignment disabled, skippping chain reload for filter %s PID %s\n", pid->filter->name, pid->name ));
 				}
-				filter->session->last_connect_error = e;
+				if (e!= GF_EOS) {
+					filter->session->last_connect_error = e;
+				}
 
 				if (ctype==GF_PID_CONF_CONNECT) {
 					GF_FilterEvent evt;
@@ -819,7 +896,8 @@
 					unload_filter = GF_FALSE;
 				}
 				filter->num_input_pids = 0;
-				filter->removed = GF_TRUE;
+				filter->single_source = NULL;
+				filter->removed = 1;
 				filter->has_pending_pids = GF_FALSE;
 				gf_mx_v(filter->tasks_mx);
 
@@ -894,6 +972,10 @@
 		filter->has_pending_pids = GF_FALSE;
 		while (gf_fq_count(filter->pending_pids)) {
 			GF_FilterPid *a_pid=gf_fq_pop(filter->pending_pids);
+			//filter is a pid adaptation filter (dynamically loaded to solve prop negociation)
+			//copy over play state if the input PID was already playing
+			if (pid->is_playing && filter->is_pid_adaptation_filter)
+				a_pid->is_playing = GF_TRUE;
 
 			gf_filter_pid_post_init_task(filter, a_pid);
 		}
@@ -903,6 +985,8 @@
 		gf_mx_p(filter->tasks_mx);
 		gf_list_del_item(filter->input_pids, pidinst);
 		filter->num_input_pids = gf_list_count(filter->input_pids);
+		if (!filter->num_input_pids)
+			filter->single_source = NULL;
 		gf_mx_v(filter->tasks_mx);
 
 		//PID instance is no longer in graph, we must remove it from pid destination to avoid propagating events
@@ -921,7 +1005,7 @@
 		//disconnected the last input, flag as removed
 		if (!filter->num_input_pids && !filter->sticky) {
 			gf_filter_reset_pending_packets(filter);
-			filter->removed = GF_TRUE;
+			filter->removed = 1;
 		}
 		//post a pid_delete task to also trigger removal of the filter if needed
 		gf_fs_post_task(filter->session, gf_filter_pid_inst_delete_task, pid->filter, pid, "pid_inst_delete", pidinst);
@@ -951,21 +1035,29 @@
 {
 	GF_Filter *filter = task->filter;
 	GF_FilterSession *fsess = filter->session;
-	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid %s connecting to %s\n", task->pid->pid->filter->name, task->pid->pid->name, task->filter->name));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s pid %s connecting to %s (%p)\n", task->pid->pid->filter->name, task->pid->pid->name, task->filter->name, filter));
 
 	//filter will require a new instance, clone it
 	if (filter->num_input_pids && (filter->max_extra_pids <= filter->num_input_pids - 1)) {
-		GF_Filter *new_filter = gf_filter_clone(filter);
+		GF_Filter *new_filter = gf_filter_clone(filter, task->pid->pid->filter);
 		if (new_filter) {
 			filter = new_filter;
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to clone filter %s\n", filter->name));
 			assert(filter->in_pid_connection_pending);
 			safe_int_dec(&filter->in_pid_connection_pending);
+			if (task->pid->pid) {
+				gf_mx_p(filter->tasks_mx);
+				gf_list_del_item(filter->temp_input_pids, task->pid->pid);
+				gf_mx_v(filter->tasks_mx);
+			}
 			return;
 		}
 	}
 	if (task->pid->pid) {
+		gf_mx_p(filter->tasks_mx);
+		gf_list_del_item(filter->temp_input_pids, task->pid->pid);
+		gf_mx_v(filter->tasks_mx);
 		gf_filter_pid_configure(filter, task->pid->pid, GF_PID_CONF_CONNECT);
 		//once connected, any set_property before the first packet dispatch will have to trigger a reconfigure
 		if (!task->pid->pid->nb_pck_sent) {
@@ -996,17 +1088,43 @@
 	}
 }
 
+void gf_filter_pid_reconfigure_task_discard(GF_FSTask *task)
+{
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *) task->pid;
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid %s reconfigure to %s\n", task->pid->pid->filter->name, task->pid->pid->name, task->filter->name));
+
+	if (!pidi->pid) return;
+	gf_filter_pid_configure(task->filter, pidi->pid, GF_PID_CONF_RECONFIG);
+	//once connected, any set_property before the first packet dispatch will have to trigger a reconfigure
+	if (!task->pid->pid->nb_pck_sent) {
+		task->pid->pid->request_property_map = GF_TRUE;
+		task->pid->pid->pid_info_changed = GF_FALSE;
+	}
+
+	if (pidi->discard_inputs==2) {
+		gf_filter_aggregate_packets(pidi);
+		while (gf_filter_pid_get_packet((GF_FilterPid *) pidi)) {
+			gf_filter_pid_drop_packet((GF_FilterPid *) pidi);
+		}
+	}
+}
 void gf_filter_pid_disconnect_task(GF_FSTask *task)
 {
 	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid %s disconnect from %s\n", task->pid->pid->filter->name, task->pid->pid->name, task->filter->name));
 	gf_filter_pid_configure(task->filter, task->pid->pid, GF_PID_CONF_REMOVE);
 
+	gf_mx_p(task->filter->tasks_mx);
 	//if the filter has no more connected ins and outs, remove it
 	if (task->filter->removed && !gf_list_count(task->filter->output_pids) && !gf_list_count(task->filter->input_pids)) {
 		Bool direct_mode = task->filter->session->direct_mode;
 		gf_filter_post_remove(task->filter);
-		if (direct_mode) task->filter = NULL;
+		if (direct_mode) {
+			gf_mx_v(task->filter->tasks_mx);
+			task->filter = NULL;
+			return;
+		}
 	}
+	gf_mx_v(task->filter->tasks_mx);
 }
 
 void gf_filter_pid_detach_task(GF_FSTask *task)
@@ -1044,7 +1162,7 @@
 
 	//first connection of this PID to this filter
 	if (!pidinst) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Trying to detach PID %s not found in filter %s inputs\n", pid->name, filter->name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Trying to detach PID %s not present in filter %s inputs\n", pid->name, filter->name));
 		assert(!new_chain_input->swap_pidinst_dst);
 		assert(!new_chain_input->swap_pidinst_src);
 		new_chain_input->swap_needs_init = GF_FALSE;
@@ -1065,9 +1183,9 @@
 	pidinst->props = NULL;
 
 	gf_mx_p(filter->tasks_mx);
-	//detach pid - remove all packets in our pid instance and alos update filter pending_packets
+	//detach pid - remove all packets in our pid instance and also update filter pending_packets
 	count = gf_fq_count(pidinst->packets);
-	assert(!count || (count >= filter->pending_packets));
+	assert(count <= filter->pending_packets);
 	safe_int_sub(&filter->pending_packets, (s32) count);
 	gf_filter_pid_inst_reset(pidinst);
 	pidinst->pid = NULL;
@@ -1075,6 +1193,8 @@
 	pid->num_destinations = gf_list_count(pid->destinations);
 	gf_list_del_item(filter->input_pids, pidinst);
 	filter->num_input_pids = gf_list_count(filter->input_pids);
+	if (!filter->num_input_pids)
+		filter->single_source = NULL;
 	gf_mx_v(filter->tasks_mx);
 
 	if (!filter->detached_pid_inst) {
@@ -1121,7 +1241,7 @@
 }
 
 GF_EXPORT
-const char *gf_filter_pid_orig_src_args(GF_FilterPid *pid)
+const char *gf_filter_pid_orig_src_args(GF_FilterPid *pid, Bool for_unicity)
 {
 	u32 i;
 	const char *args;
@@ -1129,12 +1249,28 @@
 	pid = pid->pid;
 	args = pid->filter->src_args;
 	if (args && strstr(args, "src")) return args;
-	if (!pid->filter->num_input_pids) return args;
+	gf_mx_p(pid->filter->tasks_mx);
+	if (!pid->filter->num_input_pids) {
+		gf_mx_v(pid->filter->tasks_mx);
+		return args;
+	}
 	for (i=0; i<pid->filter->num_input_pids; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(pid->filter->input_pids, i);
-		const char *arg_src = gf_filter_pid_orig_src_args(pidi->pid);
-		if (arg_src) return arg_src;
+		if (for_unicity && (pidi->pid->num_destinations>1)) {
+			gf_mx_v(pid->filter->tasks_mx);
+			return "__GPAC_SRC_FANOUT__";
+		}
+		const char *arg_src = gf_filter_pid_orig_src_args(pidi->pid, for_unicity);
+		if (arg_src) {
+			if (for_unicity && !strcmp(arg_src, "__GPAC_SRC_FANOUT__"))
+				arg_src = pid->filter->orig_args ? pid->filter->orig_args : pid->filter->src_args;
+			if (arg_src) {
+				gf_mx_v(pid->filter->tasks_mx);
+				return arg_src;
+			}
+		}
 	}
+	gf_mx_v(pid->filter->tasks_mx);
 	return args;
 }
 
@@ -1142,9 +1278,18 @@
 const char *gf_filter_pid_get_source_filter_name(GF_FilterPid *pid)
 {
 	GF_Filter *filter = pid->pid->filter;
-	while (filter && filter->num_input_pids) {
+	while (1) {
+		GF_Filter *f;
+		if (!filter) break;
+		gf_mx_p(filter->tasks_mx);
+		if (!filter->num_input_pids) {
+			gf_mx_v(filter->tasks_mx);
+			break;
+		}
 		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, 0);
-		filter = pidi->pid->filter;
+		f = pidi->pid->filter;
+		gf_mx_v(filter->tasks_mx);
+		filter = f;
 	}
 	if (!filter) return NULL;
 	return filter->name ? filter->name : filter->freg->name;
@@ -1221,7 +1366,9 @@
 			matched=4;
 			type=GF_STREAM_TEXT;
 		}
-		if (matched && (type != pent->prop.value.uint)) {
+		if (matched &&
+			( (!is_neg && (type != pent->prop.value.uint)) || (is_neg && (type == pent->prop.value.uint)) )
+		) {
 			//special case: if we request a non-file stream but the pid is a file, we will need a demux to
 			//move from file to A/V/... streams, so we accept any #MEDIA from file streams
 			if (pent->prop.value.uint == GF_STREAM_FILE) {
@@ -1292,6 +1439,28 @@
 	psep[0] = 0;
 	pent=NULL;
 
+	//special case for tag
+	if (!strcmp(frag_name, "TAG")) {
+		psep[0] = c;
+		if (src_pid->filter->tag) {
+			Bool is_eq;
+			//check for negation
+			if ( (psep[0]==src_pid->filter->session->sep_name) && (psep[1]==src_pid->filter->session->sep_neg) ) {
+				psep++;
+				use_not_equal = GF_TRUE;
+			}
+
+			is_eq = !strcmp(psep+1, src_pid->filter->tag);
+			if (use_not_equal) is_eq = !is_eq;
+			if (is_eq) return GF_TRUE;
+			*pid_excluded = GF_TRUE;
+			return GF_FALSE;
+		}
+		//not tag set for pid's filter, assume match
+		return GF_TRUE;
+	}
+
+
 	//check for built-in property
 	p4cc = gf_props_get_id(frag_name);
 	if (!p4cc && !strcmp(frag_name, "PID") )
@@ -1316,7 +1485,7 @@
 	//check for dynamic assignment
 	if ( (psep[0]==src_pid->filter->session->sep_name) && ((psep[1]=='*') || (psep[1]=='\0') ) ) {
 		*needs_resolve = GF_TRUE;
-		gf_props_dump_val(&pent->prop, prop_dump_buffer, GF_FALSE, NULL);
+		gf_props_dump_val(&pent->prop, prop_dump_buffer, GF_PROP_DUMP_DATA_NONE, NULL);
 		return GF_FALSE;
 	}
 
@@ -1325,10 +1494,16 @@
 		psep++;
 		use_not_equal = GF_TRUE;
 	}
+
 	//parse the property, based on its property type
 	if (pent->p4cc==GF_PROP_PID_CODECID) {
 		prop_val.type = GF_PROP_UINT;
-		prop_val.value.uint = gf_codec_parse(psep+1);
+		prop_val.value.uint = gf_codecid_parse(psep+1);
+	}
+	//parse the property, based on its property type
+	else if (pent->p4cc==GF_PROP_PID_STREAM_TYPE) {
+		prop_val.type = GF_PROP_UINT;
+		prop_val.value.uint = gf_stream_type_by_name(psep+1);
 	} else {
 		u32 val_is_prop = gf_props_get_id(psep+1);
 		if (val_is_prop) {
@@ -1353,6 +1528,7 @@
 			if (comp_type==2) is_equal = !is_equal;
 			break;
 		case GF_PROP_UINT:
+		case GF_PROP_4CC:
 			if (pent->prop.value.uint<prop_val.value.uint) is_equal = GF_TRUE;
 			if (comp_type==2) is_equal = !is_equal;
 			break;
@@ -1422,8 +1598,15 @@
 		Bool all_frags_not_found = GF_TRUE;
 		u32 len, sublen;
 		Bool last=GF_FALSE;
-		char *sep = strchr(source_ids, src_pid->filter->session->sep_list);
 		char *frag_name, *frag_clone;
+		char *sep;
+		Bool use_neg = GF_FALSE;
+		if (source_ids[0] == src_pid->filter->session->sep_neg) {
+			source_ids++;
+			use_neg = GF_TRUE;
+		}
+
+		sep = strchr(source_ids, src_pid->filter->session->sep_list);
 		if (sep) {
 			len = (u32) (sep - source_ids);
 		} else {
@@ -1440,10 +1623,14 @@
 		//any ID, always match
 		if (source_ids[0]=='*') { }
 		// id does not match
-		else if (strncmp(id, source_ids, sublen)) {
-			source_ids += len+1;
-			if (last) break;
-			continue;
+		else {
+			Bool res = strncmp(id, source_ids, sublen) ? GF_FALSE : GF_TRUE;
+			if (use_neg) res = !res;
+			if (!res) {
+				source_ids += len+1;
+				if (last) break;
+				continue;
+			}
 		}
 		//no fragment or fragment match pid name, OK
 		if (!frag_name || !strcmp(src_pid->name, frag_name)) {
@@ -1554,18 +1741,41 @@
 GF_EXPORT
 Bool gf_filter_in_parent_chain(GF_Filter *parent, GF_Filter *filter)
 {
-	u32 i, count;
+	u32 i;
 	if (parent == filter) return GF_TRUE;
-	//browse all parent PIDs
-	count = parent->num_input_pids;
-	if (!count) return GF_FALSE;
-	for (i=0; i<count; i++) {
-		GF_FilterPidInst *pid = gf_list_get(parent->input_pids, i);
-		if (gf_filter_in_parent_chain(pid->pid->filter, filter)) return GF_TRUE;
+
+	//browse all parent PIDs - we must lock the parent filter
+	//as some pid init tasks may be in process in other threads
+	gf_mx_p(parent->tasks_mx);
+	if (!parent->num_input_pids) {
+		gf_mx_v(parent->tasks_mx);
+		return GF_FALSE;
+	}
+	//single source filter, do not browse pids
+	if (parent->single_source) {
+		Bool res = gf_filter_in_parent_chain(parent->single_source, filter);
+		gf_mx_v(parent->tasks_mx);
+		return res;
+	}
+	for (i=0; i<parent->num_input_pids; i++) {
+		GF_FilterPidInst *pidi = gf_list_get(parent->input_pids, i);
+		if (gf_filter_in_parent_chain(pidi->pid->filter, filter)) {
+			gf_mx_v(parent->tasks_mx);
+			return GF_TRUE;
+		}
+	}
+	for (i=0; i<gf_list_count(parent->temp_input_pids); i++) {
+		GF_FilterPid *a_src_pid = gf_list_get(parent->temp_input_pids, i);
+		if (gf_filter_in_parent_chain(a_src_pid->filter, filter)) {
+			gf_mx_v(parent->tasks_mx);
+			return GF_TRUE;
+		}
 	}
+	gf_mx_v(parent->tasks_mx);
 	return GF_FALSE;
 }
 
+
 static Bool cap_code_match(u32 c1, u32 c2)
 {
 	if (c1==c2) return GF_TRUE;
@@ -1707,9 +1917,6 @@
 			}
 		}
 
-		//optional cap
-		if (cap->flags & GF_CAPFLAG_OPTIONAL) continue;
-
 		//try by name
 		if (!pid_cap && cap->name) pid_cap = gf_filter_pid_get_property_str_first(src_pid_or_ipid, cap->name);
 
@@ -1718,6 +1925,14 @@
 			continue;
 		}
 
+		//optional cap, only adjust priority
+		if (cap->flags & GF_CAPFLAG_OPTIONAL) {
+			if (pid_cap && priority && cap->priority && ((*priority) < cap->priority)) {
+				(*priority) = cap->priority;
+			}
+			continue;
+		}
+
 
 		//we found a property of that type and it is equal
 		if (pid_cap) {
@@ -1768,13 +1983,16 @@
 						}
 						prop_excluded = GF_TRUE;
 					}
-					if (prop_equal) break;
+					if (prop_equal) {
+						if (priority && a_cap->priority && ((*priority) < a_cap->priority)) {
+							(*priority) = a_cap->priority;
+						}
+						break;
+					}
 				}
 			}
 			if (!prop_equal && !prop_excluded) {
 				all_caps_matched=GF_FALSE;
-			} else if (priority && cap->priority) {
-				(*priority) = cap->priority;
 			}
 			if (ext_not_trusted && prop_equal && (cap->code==GF_PROP_PID_MIME))
 				mime_matched = GF_TRUE;
@@ -1840,9 +2058,10 @@
 	return gf_filter_has_in_out_caps(caps, nb_caps, GF_TRUE);
 }
 
-u32 gf_filter_caps_to_caps_match(const GF_FilterRegister *src, u32 src_bundle_idx, const GF_FilterRegister *dst_reg, GF_Filter *dst_filter, u32 *dst_bundle_idx, s32 for_dst_bundle, u32 *loaded_filter_flags, GF_CapsBundleStore *capstore)
+u32 gf_filter_caps_to_caps_match(const GF_FilterRegister *src, u32 src_bundle_idx, const GF_FilterRegister *dst_reg, GF_Filter *dst_filter, u32 *dst_bundle_idx, u32 for_dst_bundle, u32 *loaded_filter_flags, GF_CapsBundleStore *capstore)
 {
 	u32 i=0;
+	s32 first_static_cap=-1;
 	u32 cur_bundle_start = 0;
 	u32 cur_bundle_idx = 0;
 	u32 nb_matched=0;
@@ -1900,6 +2119,11 @@
 		Bool already_tested = GF_FALSE;
 		const GF_FilterCapability *out_cap = &src->caps[i];
 
+		if (i<cur_bundle_start) {
+			if (!(out_cap->flags & GF_CAPFLAG_STATIC))
+				continue;
+		}
+
 		if (!(out_cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
 			all_caps_matched = GF_TRUE;
 			cur_bundle_start = i+1;
@@ -1907,6 +2131,8 @@
 			if (src_bundle_idx < cur_bundle_idx)
 				break;
 
+			if (first_static_cap>=0)
+				i = (u32) (first_static_cap-1);
 			continue;
 		}
 
@@ -1918,6 +2144,11 @@
 		//not an output cap
 		if (!(out_cap->flags & GF_CAPFLAG_OUTPUT) ) continue;
 
+		if ((first_static_cap==-1) && (out_cap->flags & GF_CAPFLAG_STATIC)) {
+			first_static_cap = i;
+		}
+
+
 		//no match possible for this cap, wait until next cap start
 		if (!all_caps_matched) continue;
 
@@ -1950,7 +2181,12 @@
 		}
 
 		//check all output caps in this bundle with the same code/name, consider OK if one is matched
-		for (k=cur_bundle_start; k<src->nb_caps; k++) {
+		if (first_static_cap>=0)
+			k = first_static_cap-1;
+		else
+			k = cur_bundle_start;
+
+		for (; k<src->nb_caps; k++) {
 			u32 cur_dst_bundle=0;
 			Bool static_matched = GF_FALSE;
 			u32 nb_caps_tested = 0;
@@ -1959,6 +2195,11 @@
 			Bool exclude=GF_FALSE;
 			Bool prop_found=GF_FALSE;
 			const GF_FilterCapability *an_out_cap = &src->caps[k];
+
+			if (k<cur_bundle_start) {
+				if (!(an_out_cap->flags & GF_CAPFLAG_STATIC))
+					continue;
+			}
 			if (! (an_out_cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
 				break;
 			}
@@ -1983,8 +2224,11 @@
 				const GF_FilterCapability *in_cap = &dst_caps[j];
 
 				if (! (in_cap->flags & GF_CAPFLAG_IN_BUNDLE)) {
-					if (!matched && !nb_caps_tested && (out_cap->flags & GF_CAPFLAG_EXCLUDED))
-						matched = GF_TRUE;
+					if (((cur_dst_bundle >= for_dst_bundle) || (in_cap->flags & GF_CAPFLAG_STATIC))) {
+						if (!matched && !nb_caps_tested && (out_cap->flags & GF_CAPFLAG_EXCLUDED)) {
+							matched = GF_TRUE;
+						}
+					}
 
 					//we found a prop, excluded but with != value hence acceptable, default matching to true
 					if (!matched && prop_found) matched = GF_TRUE;
@@ -1998,11 +2242,14 @@
 					}
 
 					matched = static_matched ? GF_TRUE : GF_FALSE;
-					exclude = GF_FALSE;
+					if (exclude) {
+						bundles_cap_found[cur_dst_bundle] = 0;
+						exclude = GF_FALSE;
+					}
 					prop_found = GF_FALSE;
 					nb_caps_tested = 0;
 					cur_dst_bundle++;
-					if ((for_dst_bundle>=0) && (cur_dst_bundle > (u32) for_dst_bundle))
+					if (cur_dst_bundle > for_dst_bundle)
 						break;
 
 					continue;
@@ -2015,7 +2262,7 @@
 				if (in_cap->flags & GF_CAPFLAG_OPTIONAL)
 					continue;
 
-				if ((for_dst_bundle>=0) && (cur_dst_bundle < (u32)for_dst_bundle) && !(in_cap->flags & GF_CAPFLAG_STATIC))
+				if ((cur_dst_bundle < for_dst_bundle) && !(in_cap->flags & GF_CAPFLAG_STATIC))
 					continue;
 
 				//prop was excluded, cannot match in bundle
@@ -2076,12 +2323,16 @@
 
 					nb_matched++;
 				}
+				//excluded cap was found, disable bundle (might have been activated before we found the excluded cap)
+				else if (exclude) {
+					bundles_cap_found[cur_dst_bundle] = 0;
+				}
 			} else if (!nb_dst_caps) {
 				if (!bundles_cap_found[cur_dst_bundle])
 					bundles_cap_found[cur_dst_bundle] = cap_loaded_filter_only ? 2 : 1;
 
 				nb_matched++;
-			} else if (!nb_matched && !prop_found && (an_out_cap->flags & GF_CAPFLAG_EXCLUDED) ) {
+			} else if (!nb_matched && !prop_found && (an_out_cap->flags & GF_CAPFLAG_EXCLUDED) && (cur_dst_bundle<nb_in_bundles) ) {
 				if (!bundles_cap_found[cur_dst_bundle])
 					bundles_cap_found[cur_dst_bundle] = cap_loaded_filter_only ? 2 : 1;
 
@@ -2125,7 +2376,7 @@
 					*loaded_filter_flags = (bundles_in_ok[i]>>1);
 				}
 			}
-			if ((for_dst_bundle>=0) && (for_dst_bundle==i)) {
+			if (for_dst_bundle==i) {
 				*dst_bundle_idx = i;
 				if (loaded_filter_flags) {
 					*loaded_filter_flags = (bundles_in_ok[i]>>1);
@@ -2143,14 +2394,17 @@
 }
 
 GF_EXPORT
-Bool gf_filter_pid_check_caps(GF_FilterPid *pid)
+Bool gf_filter_pid_check_caps(GF_FilterPid *_pid)
 {
 	u8 priority;
 	Bool res;
-	if (PID_IS_OUTPUT(pid)) return GF_FALSE;
-	pid->pid->local_props = ((GF_FilterPidInst*)pid)->props;
-	res = gf_filter_pid_caps_match(pid->pid, NULL, pid->filter, &priority, NULL, pid->filter, -1);
-	pid->pid->local_props = NULL;
+	GF_Filter *on_filter;
+	if (PID_IS_OUTPUT(_pid)) return GF_FALSE;
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *)_pid;
+	on_filter = pidi->alias_orig ? pidi->alias_orig : pidi->filter;
+	pidi->pid->local_props = pidi->props;
+	res = gf_filter_pid_caps_match(pidi->pid, NULL, on_filter, &priority, NULL, on_filter, -1);
+	pidi->pid->local_props = NULL;
 	return res;
 }
 
@@ -2287,7 +2541,7 @@
 	we only accept dst type FILE for the first call (ie reg desc is the loaded destination), and forbid muxers in the middle of the chain
 	for dynamic resolution. This avoids situations such as StreamTypeA->mux->demux->streamtypeB which cannot be resolved
 
-	note that it is still possible to use a mux or demux in the chain, but they have to be explicetly loaded
+	note that it is still possible to use a mux or demux in the chain, but they have to be explicitly loaded
 	*/
 	if ((rlevel>1) && (dst_stream_type==GF_STREAM_FILE))
 		return 0;
@@ -2335,7 +2589,7 @@
 		if (!source_stream_type && dst_stream_type>0)
 			source_stream_type = dst_stream_type;
 		//if source is encrypted type and dest type is set, use dest type
-		if ((source_stream_type==GF_STREAM_ENCRYPTED) && dst_stream_type>0)
+		if ((source_stream_type==GF_STREAM_ENCRYPTED) && (dst_stream_type>0) && (dst_stream_type!=GF_STREAM_FILE))
 			source_stream_type = dst_stream_type;
 		//if dest is encrypted type and source type is set, use source type
 		if ((dst_stream_type==GF_STREAM_ENCRYPTED) && source_stream_type>0)
@@ -2382,6 +2636,73 @@
 	return 0;
 }
 
+static void gf_filter_reg_build_graph_single(GF_FilterRegDesc *reg_desc, const GF_FilterRegister *freg, GF_FilterRegDesc *a_reg, Bool freg_has_output, u32 nb_dst_caps, GF_CapsBundleStore *capstore, GF_Filter *dst_filter)
+{
+	u32 nb_src_caps, k, l;
+	u32 path_weight;
+
+	//check which cap of this filter matches our destination
+	nb_src_caps = gf_filter_caps_bundle_count(a_reg->freg->caps, a_reg->freg->nb_caps);
+	for (k=0; k<nb_src_caps; k++) {
+		for (l=0; l<nb_dst_caps; l++) {
+			s32 bundle_idx;
+
+			if (gf_filter_has_out_caps(a_reg->freg->caps, a_reg->freg->nb_caps)) {
+				u32 loaded_filter_only_flags = 0;
+
+				path_weight = gf_filter_caps_to_caps_match(a_reg->freg, k, (const GF_FilterRegister *) freg, dst_filter, &bundle_idx, l, &loaded_filter_only_flags, capstore);
+
+				if (path_weight && (bundle_idx == l)) {
+					GF_FilterRegEdge *edge;
+					if (reg_desc->nb_edges==reg_desc->nb_alloc_edges) {
+						reg_desc->nb_alloc_edges += 10;
+						reg_desc->edges = gf_realloc(reg_desc->edges, sizeof(GF_FilterRegEdge) * reg_desc->nb_alloc_edges);
+					}
+					assert(path_weight<0xFF);
+					assert(k<0xFFFF);
+					assert(l<0xFFFF);
+					edge = &reg_desc->edges[reg_desc->nb_edges];
+					memset(edge, 0, sizeof(GF_FilterRegEdge));
+					edge->src_reg = a_reg;
+					edge->weight = (u8) path_weight;
+					edge->src_cap_idx = (u16) k;
+					edge->dst_cap_idx = (u16) l;
+
+					//we inverted the caps, invert the flags
+					if (loaded_filter_only_flags & EDGE_LOADED_SOURCE_ONLY)
+						edge->loaded_filter_only |= EDGE_LOADED_DEST_ONLY;
+					if (loaded_filter_only_flags & EDGE_LOADED_DEST_ONLY)
+						edge->loaded_filter_only |= EDGE_LOADED_SOURCE_ONLY;
+					edge->src_stream_type = gf_filter_reg_get_bundle_stream_type(edge->src_reg->freg, edge->src_cap_idx, GF_TRUE);
+					reg_desc->nb_edges++;
+				}
+			}
+
+			if ( freg_has_output ) {
+				u32 loaded_filter_only_flags = 0;
+
+				path_weight = gf_filter_caps_to_caps_match(freg, l, a_reg->freg, dst_filter, &bundle_idx, k, &loaded_filter_only_flags, capstore);
+
+				if (path_weight && (bundle_idx == k)) {
+					GF_FilterRegEdge *edge;
+					if (a_reg->nb_edges==a_reg->nb_alloc_edges) {
+						a_reg->nb_alloc_edges += 10;
+						a_reg->edges = gf_realloc(a_reg->edges, sizeof(GF_FilterRegEdge) * a_reg->nb_alloc_edges);
+					}
+					edge = &a_reg->edges[a_reg->nb_edges];
+					edge->src_reg = reg_desc;
+					edge->weight = (u8) path_weight;
+					edge->src_cap_idx = (u16) l;
+					edge->dst_cap_idx = (u16) k;
+					edge->priority = 0;
+					edge->loaded_filter_only = loaded_filter_only_flags;
+					edge->src_stream_type = gf_filter_reg_get_bundle_stream_type(edge->src_reg->freg, edge->src_cap_idx, GF_TRUE);
+					a_reg->nb_edges++;
+				}
+			}
+		}
+	}
+}
 
 static GF_FilterRegDesc *gf_filter_reg_build_graph(GF_List *links, const GF_FilterRegister *freg, GF_CapsBundleStore *capstore, GF_FilterPid *src_pid, GF_Filter *dst_filter)
 {
@@ -2391,7 +2712,7 @@
 	GF_FilterRegDesc *reg_desc = NULL;
 	const GF_FilterCapability *caps = freg->caps;
 	nb_caps = freg->nb_caps;
-	if (dst_filter && (freg->flags & GF_FS_REG_SCRIPT)) {
+	if (dst_filter && ((freg->flags & (GF_FS_REG_SCRIPT|GF_FS_REG_CUSTOM)) || (src_pid && dst_filter->forced_caps) ) ) {
 		caps = dst_filter->forced_caps;
 		nb_caps = dst_filter->nb_forced_caps;
 	}
@@ -2412,72 +2733,14 @@
 	//setup all connections
 	nb_regs = gf_list_count(links);
 	for (i=0; i<nb_regs; i++) {
-		u32 nb_src_caps, k, l;
-		u32 path_weight;
 		GF_FilterRegDesc *a_reg = gf_list_get(links, i);
 		if (a_reg->freg == freg) continue;
 
-		//check which cap of this filter matches our destination
-		nb_src_caps = gf_filter_caps_bundle_count(a_reg->freg->caps, a_reg->freg->nb_caps);
-		for (k=0; k<nb_src_caps; k++) {
-			for (l=0; l<nb_dst_caps; l++) {
-				s32 bundle_idx;
-
-				if (gf_filter_has_out_caps(a_reg->freg->caps, a_reg->freg->nb_caps)) {
-					u32 loaded_filter_only_flags = 0;
-
-					path_weight = gf_filter_caps_to_caps_match(a_reg->freg, k, (const GF_FilterRegister *) freg, dst_filter, &bundle_idx, l, &loaded_filter_only_flags, capstore);
-
-					if (path_weight && (bundle_idx == l)) {
-						GF_FilterRegEdge *edge;
-						if (reg_desc->nb_edges==reg_desc->nb_alloc_edges) {
-							reg_desc->nb_alloc_edges += 10;
-							reg_desc->edges = gf_realloc(reg_desc->edges, sizeof(GF_FilterRegEdge) * reg_desc->nb_alloc_edges);
-						}
-						assert(path_weight<0xFF);
-						assert(k<0xFFFF);
-						assert(l<0xFFFF);
-						edge = &reg_desc->edges[reg_desc->nb_edges];
-						memset(edge, 0, sizeof(GF_FilterRegEdge));
-						edge->src_reg = a_reg;
-						edge->weight = (u8) path_weight;
-						edge->src_cap_idx = (u16) k;
-						edge->dst_cap_idx = (u16) l;
-
-						//we inverted the caps, invert the flags
-						if (loaded_filter_only_flags & EDGE_LOADED_SOURCE_ONLY)
-							edge->loaded_filter_only |= EDGE_LOADED_DEST_ONLY;
-						if (loaded_filter_only_flags & EDGE_LOADED_DEST_ONLY)
-							edge->loaded_filter_only |= EDGE_LOADED_SOURCE_ONLY;
-					 	edge->src_stream_type = gf_filter_reg_get_bundle_stream_type(edge->src_reg->freg, edge->src_cap_idx, GF_TRUE);
-						reg_desc->nb_edges++;
-					}
-				}
-
-				if ( freg_has_output ) {
-					u32 loaded_filter_only_flags = 0;
-
-					path_weight = gf_filter_caps_to_caps_match(freg, l, a_reg->freg, dst_filter, &bundle_idx, k, &loaded_filter_only_flags, capstore);
+		gf_filter_reg_build_graph_single(reg_desc, freg, a_reg, freg_has_output, nb_dst_caps, capstore, dst_filter);
+	}
 
-					if (path_weight && (bundle_idx == k)) {
-						GF_FilterRegEdge *edge;
-						if (a_reg->nb_edges==a_reg->nb_alloc_edges) {
-							a_reg->nb_alloc_edges += 10;
-							a_reg->edges = gf_realloc(a_reg->edges, sizeof(GF_FilterRegEdge) * a_reg->nb_alloc_edges);
-						}
-						edge = &a_reg->edges[a_reg->nb_edges];
-						edge->src_reg = reg_desc;
-						edge->weight = (u8) path_weight;
-						edge->src_cap_idx = (u16) l;
-						edge->dst_cap_idx = (u16) k;
-						edge->priority = 0;
-						edge->loaded_filter_only = loaded_filter_only_flags;
-					 	edge->src_stream_type = gf_filter_reg_get_bundle_stream_type(edge->src_reg->freg, edge->src_cap_idx, GF_TRUE);
-						a_reg->nb_edges++;
-					}
-				}
-			}
-		}
+	if (!dst_filter && (freg->flags & GF_FS_REG_ALLOW_CYCLIC)) {
+		gf_filter_reg_build_graph_single(reg_desc, freg, reg_desc, freg_has_output, nb_dst_caps, capstore, NULL);
 	}
 	return reg_desc;
 }
@@ -2511,7 +2774,7 @@
 				gf_list_add(fsess->links, freg_desc);
 			}
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Build filter graph in "LLU" us\n", gf_sys_clock_high_res() - start_time));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Built filter graph in "LLU" us\n", gf_sys_clock_high_res() - start_time));
 
 		if (fsess->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
 			u32 j;
@@ -2610,6 +2873,7 @@
 	u32 i, dijsktra_node_count, dijsktra_edge_count, count;
 	GF_CapsBundleStore capstore;
 	Bool first;
+	Bool check_codec_id_raw = GF_FALSE;
 	u32 path_weight, pid_stream_type, max_weight=0;
 	u64 dijkstra_time_us, sort_time_us, start_time_us = gf_sys_clock_high_res();
 	const GF_PropertyValue *p;
@@ -2624,14 +2888,48 @@
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
 	if (p) pid_stream_type = p->value.uint;
 
+	//decoders usually do not expose reconfigure_output interface
+	//if this is a reconfig asking for codecID=raw, check each registry for non-raw->raw conversion
+	//and if present consider this filter suitable
+	//note that encoders must use reconfigure output
+	if (reconfigurable_only
+		&& pid->caps_negociate
+		&& (gf_list_count(pid->caps_negociate->properties)==1)
+	) {
+		const GF_PropertyValue *cid = gf_props_get_property(pid->caps_negociate, GF_PROP_PID_CODECID, NULL);
+		//for now we only check decoders, encoders must use reconfigure output
+		if (cid && (cid->value.uint==GF_CODECID_RAW)) {
+			check_codec_id_raw = cid->value.uint;
+		}
+	}
+
 	//1: select all elligible filters for the graph resolution: exclude sources, sinks, explicits, blacklisted and not reconfigurable if we reconfigure
 	count = gf_list_count(fsess->links);
 	for (i=0; i<count; i++) {
 		u32 j;
 		Bool disable_filter = GF_FALSE;
+		Bool reconf_only = reconfigurable_only;
 		GF_FilterRegDesc *reg_desc = gf_list_get(fsess->links, i);
 		const GF_FilterRegister *freg = reg_desc->freg;
 
+		if (check_codec_id_raw) {
+			Bool has_raw_out=GF_FALSE, has_non_raw_in=GF_FALSE;
+			for (j=0; j<freg->nb_caps; j++) {
+				if (!(freg->caps[j].flags & GF_CAPFLAG_IN_BUNDLE))
+					continue;
+				if (freg->caps[j].code!=GF_PROP_PID_CODECID) continue;
+
+				if (freg->caps[j].val.value.uint == GF_CODECID_RAW) {
+					if ((freg->caps[j].flags & GF_CAPFLAG_OUTPUT) && ! (freg->caps[j].flags & GF_CAPFLAG_EXCLUDED))
+						has_raw_out = GF_TRUE;
+					continue;
+				}
+				if ((freg->caps[j].flags & GF_CAPFLAG_INPUT) && ! (freg->caps[j].flags & GF_CAPFLAG_EXCLUDED))
+					has_non_raw_in = GF_TRUE;
+			}
+			if (has_raw_out && has_non_raw_in)
+				reconf_only = GF_FALSE;
+		}
 		//reset state, except for edges which are reseted after each dijkstra resolution
 		reg_desc->destination = NULL;
 		reg_desc->cap_idx = 0;
@@ -2651,7 +2949,7 @@
 			disable_filter = GF_TRUE;
 		}
 		//freg shall be instantiated
-		else if ((freg->flags & (GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_SCRIPT)) && (freg != pid->filter->freg) && (freg != dst->freg) ) {
+		else if ((freg->flags & (GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_SCRIPT|GF_FS_REG_CUSTOM)) && (freg != pid->filter->freg) && (freg != dst->freg) ) {
 			assert(freg != dst->freg);
 			disable_filter = GF_TRUE;
 		}
@@ -2660,13 +2958,14 @@
 			disable_filter = GF_TRUE;
 		}
 		//we only want reconfigurable output filters
-		else if (reconfigurable_only && !freg->reconfigure_output && (freg != dst->freg)) {
+		else if (reconf_only && !freg->reconfigure_output && (freg != dst->freg)) {
 			assert(freg != dst->freg);
 			disable_filter = GF_TRUE;
 		}
 		//blacklisted filter
 		else if (gf_list_find(pid->filter->blacklisted, (void *) freg)>=0) {
-			assert(freg != dst->freg);
+			//this commented because not true for multi-pids inputs (tiling) to a decoder
+			//assert(freg != dst->freg);
 			if (!reconfigurable_only) {
 				assert(freg != pid->filter->freg);
 			}
@@ -2699,6 +2998,10 @@
 					edge->status = EDGE_STATUS_DISABLED;
 					continue;
 				}
+#if 0
+				if (priority)
+					path_weight *= priority;
+#endif
 			}
 
 			//if source is not edge origin and edge is only valid for explicitly loaded filters, disable edge
@@ -2905,18 +3208,18 @@
 
 	sort_time_us -= start_time_us;
 	dijkstra_time_us = gf_sys_clock_high_res() - start_time_us;
-	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("[Filters] Dijkstra: sorted filters in "LLU" us, Dijkstra done in "LLU" us on %d nodes %d edges\n", sort_time_us, dijkstra_time_us, dijsktra_node_count, dijsktra_edge_count));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("[Filters] Dijkstra: sorted filters in "LLU" us, Dijkstra done in "LLU" us on %d nodes %d edges\n", sort_time_us, dijkstra_time_us, dijsktra_node_count, dijsktra_edge_count));
 
 	if (result && result->destination) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("[Filters] Dijkstra result: %s(%d)", result->freg->name, result->cap_idx));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("[Filters] Dijkstra result: %s(%d)", result->freg->name, result->cap_idx));
 		result = result->destination;
 		while (result->destination) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, (" %s(%d)", result->freg->name, result->cap_idx ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, (" %s(%d)", result->freg->name, result->cap_idx ));
 			gf_list_add(out_reg_chain, (void *) result->freg);
 			gf_list_add(out_reg_chain, (void *) &result->freg->caps[result->cap_idx]);
 			result = result->destination;
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, (" %s\n", result->freg->name));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, (" %s\n", result->freg->name));
 	} else {
 		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("[Filters] Dijkstra: no results found!\n"));
 	}
@@ -2936,7 +3239,7 @@
 \param reconfigurable_only indicates the chain should be loaded for reconfigurable filters
 \return the first filter in the matching chain, or NULL if no match
 */
-static GF_Filter *gf_filter_pid_resolve_link_internal(GF_FilterPid *pid, GF_Filter *dst, Bool *filter_reassigned, Bool reconfigurable_only, u32 *min_chain_len, GF_List *skip_if_in_filter_list, Bool *skipped)
+static GF_Filter *gf_filter_pid_resolve_link_internal(GF_FilterPid *pid, GF_Filter *dst, Bool *filter_reassigned, u32 reconfigurable_only_type, u32 *min_chain_len, GF_List *skip_if_in_filter_list, Bool *skipped)
 {
 	GF_Filter *chain_input = NULL;
 	GF_FilterSession *fsess = pid->filter->session;
@@ -2944,6 +3247,7 @@
 	u32 i, count;
 	char prefRegister[1001];
 	char szForceReg[20];
+	Bool reconfigurable_only;
 
 	if (!fsess->max_resolve_chain_len) return NULL;
 
@@ -2951,6 +3255,8 @@
 
 	if (!dst) return NULL;
 
+	reconfigurable_only = (reconfigurable_only_type==2) ? GF_TRUE : GF_FALSE;
+
 	sprintf(szForceReg, "gfreg%c", pid->filter->session->sep_name);
 	prefRegister[0]=0;
 	//look for reg given in
@@ -3006,6 +3312,7 @@
 	} else if (reconfigurable_only && (count>2)) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Cannot find filter chain with only one filter handling reconfigurable output for pid %s from filter %s - not supported\n", pid->name, pid->filter->name));
 	} else {
+		Bool dst_is_sink = gf_filter_is_sink(dst);
 		const char *dst_args = NULL;
 		const char *args = pid->filter->orig_args ? pid->filter->orig_args : pid->filter->src_args;
 		GF_FilterPid *a_pid = pid;
@@ -3067,14 +3374,16 @@
 			args = a_pid->filter->src_args;
 			if (!args) args = a_pid->filter->orig_args;
 			if (args) break;
+			gf_mx_p(a_pid->filter->tasks_mx);
 			pidi = gf_list_get(a_pid->filter->input_pids, 0);
+			gf_mx_v(a_pid->filter->tasks_mx);
 			if (!pidi) break;
 			a_pid = pidi->pid;
 		}
 
 #ifndef GPAC_DISABLE_LOG
 		if (gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_INFO)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Solved %sfilter chain from filter %s PID %s to filter %s - dumping chain:\n", reconfigurable_only ? "adaptation " : "", pid->filter->name, pid->name, dst->freg->name));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Solved %sfilter chain from filter %s PID %s to filter %s - dumping chain:\n", reconfigurable_only_type ? "adaptation " : "", pid->filter->name, pid->name, dst->freg->name));
 		}
 #endif
 		prev_af = NULL;
@@ -3139,20 +3448,46 @@
 				}
 			}
 
-			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("\t%s\n", freg->name));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("\t%s\n", freg->name));
 
 			af = gf_filter_new(fsess, freg, args, dst_args, pid->filter->no_dst_arg_inherit ? GF_FILTER_ARG_INHERIT_SOURCE_ONLY : GF_FILTER_ARG_INHERIT, NULL, NULL, GF_TRUE);
 			if (!af) goto exit;
-
-			//remember our target cap bundle on that filter
-			af->bundle_idx_at_resolution = bundle_idx;
-			//remember our target cap on that filter
-			af->cap_idx_at_resolution = cap_idx;
+			af->subsession_id = dst->subsession_id;
+			//destination is sink, check if af is a mux (output cap type STREAM=FILE present
+			//if not, copy subsource_id from pid
+			Bool af_is_mux = GF_FALSE;
+			if (dst_is_sink) {
+				for (u32 cidx=0; cidx<freg->nb_caps; cidx++) {
+					const GF_FilterCapability *cap = &freg->caps[cidx];
+					if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE)) continue;
+					if (!(cap->flags & GF_CAPFLAG_OUTPUT)) continue;
+					if (cap->flags & GF_CAPFLAG_EXCLUDED) continue;
+					if (cap->code!=GF_PROP_PID_STREAM_TYPE) continue;
+					if (cap->val.value.uint!=GF_STREAM_FILE) break;
+					af_is_mux = GF_TRUE;
+				}
+			}
+			af->subsource_id = af_is_mux ? 0 : pid->filter->subsource_id;
+
+			if (!af->forced_caps) {
+				//remember our target cap bundle on that filter
+				af->bundle_idx_at_resolution = bundle_idx;
+				//remember our target cap on that filter
+				af->cap_idx_at_resolution = cap_idx;
+			}
+			if (pid->require_source_id)
+				af->require_source_id = GF_TRUE;
+			
 			//copy source IDs for all filters in the chain
 			//we cannot figure out the destination sourceID when initializing PID connection tasks
 			//by walking up the filter chain because PIDs connection might be pending
 			//(upper chain not yet fully connected)
-			if (dst->source_ids)
+			//if the source had a restricted source_id set, use it, otherwise use the destination source_id
+			if (!prev_af && pid->filter->restricted_source_id)
+				af->source_ids = gf_strdup(pid->filter->restricted_source_id);
+			else if (prev_af && prev_af->source_ids)
+				af->source_ids = gf_strdup(prev_af->source_ids);
+			else if (dst->source_ids)
 				af->source_ids = gf_strdup(dst->source_ids);
 
 			//remember our target filter
@@ -3174,13 +3509,13 @@
 
 			prev_af = af;
 
-			if (reconfigurable_only) af->is_pid_adaptation_filter = GF_TRUE;
+			if (reconfigurable_only_type) af->is_pid_adaptation_filter = GF_TRUE;
 
 			//remember the first in the chain
 			if (!i) chain_input = af;
 
 			if (load_first_only) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s needs to be connected to decide its outputs, not loading end of the chain\n", freg->name));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s needs to be connected to decide its outputs, not loading end of the chain\n", freg->name));
 				//store destination as future destination link for this new filter
 				if ( gf_list_find(pid->filter->destination_links, dst)<0)
 					gf_list_add(pid->filter->destination_links, dst);
@@ -3202,28 +3537,42 @@
 
 GF_Filter *gf_filter_pid_resolve_link(GF_FilterPid *pid, GF_Filter *dst, Bool *filter_reassigned)
 {
-	return gf_filter_pid_resolve_link_internal(pid, dst, filter_reassigned, GF_FALSE, NULL, NULL, NULL);
+	return gf_filter_pid_resolve_link_internal(pid, dst, filter_reassigned, 0, NULL, NULL, NULL);
 }
 
 GF_Filter *gf_filter_pid_resolve_link_check_loaded(GF_FilterPid *pid, GF_Filter *dst, Bool *filter_reassigned, GF_List *skip_if_in_filter_list, Bool *skipped)
 {
-	return gf_filter_pid_resolve_link_internal(pid, dst, filter_reassigned, GF_FALSE, NULL, skip_if_in_filter_list, skipped);
+	return gf_filter_pid_resolve_link_internal(pid, dst, filter_reassigned, 0, NULL, skip_if_in_filter_list, skipped);
 }
 
-GF_Filter *gf_filter_pid_resolve_link_for_caps(GF_FilterPid *pid, GF_Filter *dst)
+GF_Filter *gf_filter_pid_resolve_link_for_caps(GF_FilterPid *pid, GF_Filter *dst, Bool check_reconfig_only)
 {
-	return gf_filter_pid_resolve_link_internal(pid, dst, NULL, GF_TRUE, NULL, NULL, NULL);
+	return gf_filter_pid_resolve_link_internal(pid, dst, NULL, check_reconfig_only ? 2 : 1, NULL, NULL, NULL);
 }
 
 u32 gf_filter_pid_resolve_link_length(GF_FilterPid *pid, GF_Filter *dst)
 {
 	u32 chain_len=0;
-	gf_filter_pid_resolve_link_internal(pid, dst, NULL, GF_FALSE, &chain_len, NULL, NULL);
+	gf_filter_pid_resolve_link_internal(pid, dst, NULL, 0, &chain_len, NULL, NULL);
 	return chain_len;
 }
 
-static void gf_filter_pid_set_args_internal(GF_Filter *filter, GF_FilterPid *pid, char *args, u32 argfile_level)
+static void gf_filter_pid_set_args_internal(GF_Filter *filter, GF_FilterPid *pid, char *args, Bool use_default_seps, u32 argfile_level)
 {
+	char sep_args, sep_frag, sep_name, sep_list;
+
+	if (use_default_seps) {
+		sep_args = ':';
+		sep_frag = '#';
+		sep_name = '=';
+		sep_list = ',';
+	} else {
+		sep_args = filter->session->sep_args;
+		sep_frag = filter->session->sep_frag;
+		sep_name = filter->session->sep_name;
+		sep_list = filter->session->sep_list;
+	}
+
 	//parse each arg
 	while (args) {
 		u32 p4cc=0;
@@ -3231,11 +3580,22 @@
 		Bool parse_prop = GF_TRUE;
 		char *value_next_list = NULL;
 		char *value_sep = NULL;
-		char *value, *name;
-		//look for our arg separator
-
-		char *sep = (char *)gf_fs_path_escape_colon(filter->session, args);
+		char *value, *name, *sep;
 
+		//escaped arg separator, skip everything until next escape sep or end
+		if (args[0] == sep_args) {
+			char szEscape[3];
+			szEscape[0] = szEscape[1] = sep_args;
+			szEscape[2] = 0;
+			args++;
+			sep = strstr(args, szEscape);
+		} else {
+			if (sep_args == ':') {
+				sep = (char *)gf_fs_path_escape_colon(filter->session, args);
+			} else {
+				sep = strchr(args, sep_args);
+			}
+		}
 		if (sep) {
 			char *xml_start = strchr(args, '<');
 			u32 len = (u32) (sep-args);
@@ -3243,7 +3603,7 @@
 				u32 xlen = (u32) (xml_start-args);
 				if ((xlen < len) && (args[len-1] != '>')) {
 					while (1) {
-						sep = strchr(sep+1, filter->session->sep_args);
+						sep = strchr(sep+1, sep_args);
 						if (!sep) {
 							break;
 						}
@@ -3258,7 +3618,7 @@
 
 		if (sep) sep[0]=0;
 
-		if (args[0] != filter->session->sep_frag) {
+		if (args[0] != sep_frag) {
 			//if arg is not one of our reserved keywords and is a valid file, try to open it
 			if (strcmp(args, "gpac") && strcmp(args, "gfopt") && strcmp(args, "gfloc") && gf_file_exists(args)) {
 				if (argfile_level<5) {
@@ -3285,7 +3645,7 @@
 						if ((subarg[0] == '/') && (subarg[1] == '/'))
 							continue;
 
-						gf_filter_pid_set_args_internal(filter, pid, subarg, argfile_level+1);
+						gf_filter_pid_set_args_internal(filter, pid, subarg, use_default_seps, argfile_level+1);
 					}
 					gf_fclose(arg_file);
 				} else {
@@ -3296,7 +3656,7 @@
 		}
 
 		value = NULL;
-		value_sep = strchr(args, filter->session->sep_name);
+		value_sep = strchr(args, sep_name);
 		if (value_sep) {
 			value_sep[0]=0;
 			value = value_sep+1;
@@ -3330,7 +3690,7 @@
 
 			parse_prop = GF_FALSE;
 
-			next_val = strchr(closing, filter->session->sep_list);
+			next_val = strchr(closing, sep_list);
 			if (next_val) next_val[0] = 0;
 
 			while (closing) {
@@ -3357,7 +3717,7 @@
 				break;
 			}
 			if (!next_val) break;
-			next_val[0] = filter->session->sep_list;
+			next_val[0] = sep_list;
 			value = next_val+1;
 		}
 
@@ -3366,17 +3726,67 @@
 
 
 		if (prop_type != GF_PROP_FORBIDEN) {
-			GF_PropertyValue p = gf_props_parse_value(prop_type, name, value, NULL, pid->filter->session->sep_list);
-			if (prop_type==GF_PROP_NAME) {
-				p.type = GF_PROP_STRING;
-				gf_filter_pid_set_property(pid, p4cc, &p);
+			GF_PropertyValue p;
+			p.type = GF_PROP_FORBIDEN;
+
+			//specific parsing for clli: it's a data prop but we allow textual specifiers
+			if ((p4cc == GF_PROP_PID_CONTENT_LIGHT_LEVEL) && strchr(value, sep_list) ){
+				GF_PropertyValue a_p = gf_props_parse_value(GF_PROP_UINT_LIST, name, value, NULL, sep_list);
+				if ((a_p.type == GF_PROP_UINT_LIST) && (a_p.value.uint_list.nb_items==2)) {
+					GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[0]);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[1]);
+					gf_bs_get_content(bs, &p.value.data.ptr, &p.value.data.size);
+					p.type = GF_PROP_DATA;
+					gf_bs_del(bs);
+				}
+				gf_props_reset_single(&a_p);
+			}
+			//specific parsing for mdcv: it's a data prop but we allow textual specifiers
+			else if ((p4cc == GF_PROP_PID_MASTER_DISPLAY_COLOUR) && strchr(value, sep_list) ) {
+				GF_PropertyValue a_p = gf_props_parse_value(GF_PROP_UINT_LIST, name, value, NULL, sep_list);
+				if ((a_p.type == GF_PROP_UINT_LIST) && (a_p.value.uint_list.nb_items==10)) {
+					GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[0]);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[1]);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[2]);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[3]);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[4]);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[5]);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[6]);
+					gf_bs_write_u16(bs, a_p.value.uint_list.vals[7]);
+					gf_bs_write_u32(bs, a_p.value.uint_list.vals[8]);
+					gf_bs_write_u32(bs, a_p.value.uint_list.vals[9]);
+					gf_bs_get_content(bs, &p.value.data.ptr, &p.value.data.size);
+					p.type = GF_PROP_DATA;
+					gf_bs_del(bs);
+				}
+				gf_props_reset_single(&a_p);
 			} else {
-				gf_filter_pid_set_property(pid, p4cc, &p);
+				p = gf_props_parse_value(prop_type, name, value, NULL, sep_list);
+			}
+
+			if (p.type != GF_PROP_FORBIDEN) {
+				if (prop_type==GF_PROP_NAME) {
+					p.type = GF_PROP_STRING;
+					gf_filter_pid_set_property(pid, p4cc, &p);
+				} else {
+					gf_filter_pid_set_property(pid, p4cc, &p);
+				}
+			}
+
+			if ((p4cc==GF_PROP_PID_TEMPLATE) && p.value.string) {
+				if (strstr(p.value.string, "$Bandwidth$")) {
+					gf_opts_set_key("temp", "force_indexing", "true");
+				}
 			}
+
 			if (prop_type==GF_PROP_STRING_LIST) {
-				p.value.string_list = NULL;
+				p.value.string_list.vals = NULL;
+				p.value.string_list.nb_items = 0;
 			}
-			else if (prop_type==GF_PROP_UINT_LIST) {
+			//use uint_list as base type for lists
+			else if ((prop_type==GF_PROP_UINT_LIST) || (prop_type==GF_PROP_SINT_LIST) || (prop_type==GF_PROP_VEC2I_LIST) || (prop_type==GF_PROP_4CC_LIST)) {
 				p.value.uint_list.vals = NULL;
 			}
 			gf_props_reset_single(&p);
@@ -3384,9 +3794,9 @@
 			Bool reset_prop=GF_FALSE;
 			GF_PropertyValue p;
 			if (!strncmp(value, "bxml@", 5)) {
-				p = gf_props_parse_value(GF_PROP_DATA_NO_COPY, name, value, NULL, pid->filter->session->sep_list);
+				p = gf_props_parse_value(GF_PROP_DATA_NO_COPY, name, value, NULL, sep_list);
 			} else if (!strncmp(value, "file@", 5)) {
-				p = gf_props_parse_value(GF_PROP_STRING, name, value, NULL, pid->filter->session->sep_list);
+				p = gf_props_parse_value(GF_PROP_STRING, name, value, NULL, sep_list);
 				p.type = GF_PROP_STRING_NO_COPY;
 			} else {
 				u32 ptype = GF_PROP_FORBIDEN;
@@ -3406,7 +3816,7 @@
 					p.type = GF_PROP_STRING;
 					p.value.string = value;
 				} else {
-					p = gf_props_parse_value(ptype, name, value, NULL, pid->filter->session->sep_list);
+					p = gf_props_parse_value(ptype, name, value, NULL, sep_list);
 					reset_prop = GF_TRUE;
 				}
 			}
@@ -3414,14 +3824,14 @@
 			if (reset_prop) gf_props_reset_single(&p);
 		}
 		if (value_next_list)
-			value_next_list[0] = filter->session->sep_list;
+			value_next_list[0] = sep_list;
 
 skip_arg:
 		if (value_sep)
-			value_sep[0] = filter->session->sep_name;
+			value_sep[0] = sep_name;
 
 		if (sep) {
-			sep[0] = filter->session->sep_args;
+			sep[0] = sep_args;
 			args=sep+1;
 		} else {
 			break;
@@ -3429,15 +3839,41 @@
 	}
 }
 
-static void gf_filter_pid_set_args(GF_Filter *filter, GF_FilterPid *pid)
+GF_EXPORT
+GF_Err gf_filter_pid_push_properties(GF_FilterPid *pid, char *args, Bool direct_merge, Bool use_default_seps)
+{
+	if (!args) return GF_OK;
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to write property on input PID in filter %s - ignoring\n", pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+
+	//pid props specified by user are merged directly
+	if (direct_merge) {
+		Bool req_map_bck = pid->request_property_map;
+		pid->request_property_map = GF_FALSE;
+		gf_filter_pid_set_args_internal(pid->filter, pid, args, use_default_seps, 0);
+		pid->request_property_map = req_map_bck;
+	} else {
+		gf_filter_pid_set_args_internal(pid->filter, pid, args, use_default_seps, 0);
+	}
+	return GF_OK;
+}
+
+void gf_filter_pid_set_args(GF_Filter *filter, GF_FilterPid *pid)
 {
+	Bool req_map_bck;
 	char *args;
 	if (!filter->src_args && !filter->orig_args) return;
 	args = filter->orig_args ? filter->orig_args : filter->src_args;
 
-	gf_filter_pid_set_args_internal(filter, pid, args, 0);
-
+	//pid props specified by user are merged directly
+	req_map_bck = pid->request_property_map;
+	pid->request_property_map = GF_FALSE;
+	gf_filter_pid_set_args_internal(filter, pid, args, GF_FALSE, 0);
+	pid->request_property_map = req_map_bck;
 }
+
 static const char *gf_filter_last_id_in_chain(GF_Filter *filter, Bool ignore_first)
 {
 	u32 i;
@@ -3447,14 +3883,25 @@
 		if (!filter->dynamic_filter) return NULL;
 	}
 
+	gf_mx_p(filter->tasks_mx);
 	for (i=0; i<filter->num_input_pids; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
-		if (pidi->pid->filter->id) return pidi->pid->filter->id;
+		if (pidi->pid->filter->id) {
+			gf_mx_v(filter->tasks_mx);
+			return pidi->pid->filter->id;
+		}
 		//stop at first non dyn filter
 		if (!pidi->pid->filter->dynamic_filter) continue;
 		id = gf_filter_last_id_in_chain(pidi->pid->filter, GF_FALSE);
-		if (id) return id;
+		if (id) {
+			gf_mx_v(filter->tasks_mx);
+			return id;
+		}
+		//single source filter, no need to browse remaining pids
+		if (pidi->pid->filter->single_source)
+			break;
 	}
+	gf_mx_v(filter->tasks_mx);
 	return NULL;
 }
 
@@ -3554,19 +4001,73 @@
 	const GF_PropertyEntry *p;
 	GF_PropertyMap *pmap = gf_list_get(pid->properties, 0);
 	while (pmap && (p = gf_list_enum(pmap->properties, &idx))) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Pid prop %s: %s\n", gf_props_4cc_get_name(p->p4cc), gf_props_dump(p->p4cc, &p->prop, szDump, GF_FALSE) ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Pid prop %s: %s\n", gf_props_4cc_get_name(p->p4cc), gf_props_dump(p->p4cc, &p->prop, szDump, GF_PROP_DUMP_DATA_NONE) ));
 	}
 }
 #endif
 
+static Bool gf_pid_in_parent_chain(GF_FilterPid *pid, GF_FilterPid *look_for_pid)
+{
+	u32 i, ret=GF_FALSE;
+	if (pid == look_for_pid) return GF_TRUE;
+	//browse all parent PIDs
+	//stop checking at the first explicit filter with ID
+	if (!pid->filter->dynamic_filter && pid->filter->id) return GF_FALSE;
+
+	gf_mx_p(pid->filter->tasks_mx);
+	for (i=0; i<pid->filter->num_input_pids; i++) {
+		GF_FilterPidInst *pidi = gf_list_get(pid->filter->input_pids, i);
+		if (gf_pid_in_parent_chain(pidi->pid, look_for_pid)) {
+			ret = GF_TRUE;
+			break;
+		}
+		//single source filter, no need to look further
+		if (pidi->pid->filter->single_source)
+			break;
+	}
+	gf_mx_v(pid->filter->tasks_mx);
+	return ret;
+}
+
+static Bool filter_match_target_dst(GF_List *flist, GF_Filter *dst)
+{
+	u32 i, count=gf_list_count(flist);
+	for (i=0;i<count;i++) {
+		GF_Filter *f = gf_list_get(flist, i);
+		if (f==dst) return GF_TRUE;
+		if (filter_match_target_dst(f->destination_filters, dst))
+			return GF_TRUE;
+		if (filter_match_target_dst(f->destination_links, dst))
+			return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+static Bool parent_chain_has_dyn_pids(GF_Filter *filter)
+{
+	u32 i;
+	if (filter->freg->flags & GF_FS_REG_DYNAMIC_PIDS) return GF_TRUE;
+	gf_mx_p(filter->tasks_mx);
+	for (i=0; i<filter->num_input_pids; i++) {
+		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
+		if (parent_chain_has_dyn_pids(pidi->pid->filter)) {
+			gf_mx_v(filter->tasks_mx);
+			return GF_TRUE;
+		}
+	}
+	gf_mx_v(filter->tasks_mx);
+	return GF_FALSE;
+}
 
 static void gf_filter_pid_init_task(GF_FSTask *task)
 {
-	u32 i, count;
+	u32 f_idx, count;
 	Bool found_dest=GF_FALSE;
 	Bool found_matching_sourceid;
 	Bool can_reassign_filter = GF_FALSE;
 	Bool can_try_link_resolution=GF_FALSE;
+	Bool link_sinks_only = GF_FALSE;
+	Bool implicit_link_found = GF_FALSE;
 	u32 num_pass=0;
 	GF_List *loaded_filters = NULL;
 	GF_List *linked_dest_filters = NULL;
@@ -3576,7 +4077,7 @@
 	GF_FilterPid *pid = task->pid;
 	GF_Filter *dynamic_filter_clone = NULL;
 	Bool filter_found_but_pid_excluded = GF_FALSE;
-	Bool ignore_source_ids = GF_FALSE;
+	u32 pid_is_file = 0;
 	const char *filter_id;
 
 	if (pid->destroyed || pid->removed) {
@@ -3602,14 +4103,30 @@
 	if (filter->user_pid_props)
 		gf_filter_pid_set_args(filter, pid);
 
-	//since we may have inserted filters in the middle (demuxers typically), get the last explicitely
+	//explicit source, check if demux is forcd
+	if (!pid->filter->dynamic_filter
+		&& !pid->filter->num_input_pids
+		&& (pid->filter->freg->flags & GF_FS_REG_FORCE_REMUX)
+	) {
+		const GF_PropertyValue *st = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+		if (st && (st->value.uint==GF_STREAM_FILE))
+			pid_is_file = 1;
+	}
+
+	//since we may have inserted filters in the middle (demuxers typically), get the last explicitly
 	//loaded ID in the chain
 	filter_id = gf_filter_last_id_in_chain(filter, GF_FALSE);
 	if (!filter_id && filter->cloned_from)
 		filter_id = gf_filter_last_id_in_chain(filter->cloned_from, GF_FALSE);
 
 	//we lock the instantiated filter list for the entire resolution process
-	if (filter->session->filters_mx) gf_mx_p(filter->session->filters_mx);
+	//we must unlock this mutex before calling locking a filter mutex (->tasks_mx)
+	//either directly or in functions calling it (e.g. gf_filter_in_parent_chain)
+	//in case another thread is reconfiguring a filter fA:
+	//- fA would have tasks_mx locked, and could be waiting for session->filters_mx to insert a new filter (inserting a filter chain)
+	//- trying to lock fA->tasks_mx would then deadlock
+	//cf issue 1799
+	gf_mx_p(filter->session->filters_mx);
 
 	linked_dest_filters = gf_list_new();
 	force_link_resolutions = gf_list_new();
@@ -3624,29 +4141,103 @@
 restart:
 
 	if (num_pass) {
-		loaded_filters = gf_list_new();
+
+		//we're about to load filters to solve the link, use the already linked destination filters as list of loaded filters.
+		//Not doing so may lead to loading several instances of the same filter for cases like:
+		//-i encrypted aout vout
+		//the first pid init (src->aout/vout) will load a demux, registering aout and vout as destination of demux
+		//the second pid init (demux.Audio -> aout) will load cdcrypt, remove aout from demux destinations
+		//the third pid init (demux.video) will
+		//- match cdcrypt and link to it, but will not remove vout from demux destinations, resulting in further linking (this pass)
+		//- create a new cdcrypt to solve demux.video -> vout
+		
+//		loaded_filters = gf_list_new();
+		loaded_filters = gf_list_clone(linked_dest_filters);
 	}
 
 	found_matching_sourceid = GF_FALSE;
+
+	//relock the filter list.
+	//If the filter_dst we were checking is no longer present, rewind and go on
+	//otherwise update its index (might be less if some filters were removed)
+#define RELOCK_FILTER_LIST\
+		gf_mx_p(filter->session->filters_mx); \
+		count = gf_list_count(filter->session->filters); \
+		f_dst_idx = gf_list_find(filter->session->filters, filter_dst); \
+		if (f_dst_idx < 0) {\
+			f_idx--;\
+		} else {\
+			f_idx = f_dst_idx;\
+		}
+
+
 	//try to connect pid to all running filters
 	count = gf_list_count(filter->session->filters);
-	for (i=0; i<count; i++) {
+	for (f_idx=0; f_idx<count; f_idx++) {
+		s32 f_dst_idx;
 		Bool needs_clone;
-		Bool cap_matched;
+		Bool cap_matched, in_parent_chain, is_sink;
+		Bool ignore_source_ids;
+		Bool use_explicit_link;
 		GF_Filter *filter_dst;
 
 single_retry:
 
-		filter_dst = gf_list_get(filter->session->filters, i);
+		ignore_source_ids = GF_FALSE;
+		use_explicit_link = GF_FALSE;
+		filter_dst = gf_list_get(filter->session->filters, f_idx);
+		//this can happen in multithreaded cases with filters being removed while we check for links
+		if (!filter_dst)
+			break;
 		//source filter
 		if (!filter_dst->freg->configure_pid) continue;
 		if (filter_dst->finalized || filter_dst->removed || filter_dst->disabled || filter_dst->marked_for_removal || filter_dst->no_inputs) continue;
 		if (filter_dst->target_filter == pid->filter) continue;
 
-		//we don't allow re-entrant filter registries (eg filter foo of type A output cannot connect to filter bar of type A)
+		//handle re-entrant filter registries (eg filter foo of type A output usually cannot connect to filter bar of type A)
 		if (pid->pid->filter->freg == filter_dst->freg) {
-			continue;
+			//only allowed for:
+			if (
+				// explicitly loaded filters
+				filter->dynamic_filter
+				//if cyclic explictly allowed by filter registry or if script or custom filter
+				|| !(filter_dst->freg->flags & (GF_FS_REG_ALLOW_CYCLIC|GF_FS_REG_SCRIPT|GF_FS_REG_CUSTOM))
+			) {
+				continue;
+			}
+		}
+
+		is_sink = GF_FALSE;
+		if (filter->session->flags & GF_FS_FLAG_IMPLICIT_MODE) {
+			if (filter_dst->dynamic_filter) {
+				if (!filter_dst->subsource_id) {
+					is_sink = GF_TRUE;
+				}
+			} else if (filter_dst->forced_caps) {
+				is_sink = !gf_filter_has_out_caps(filter_dst->forced_caps, filter_dst->nb_forced_caps);
+			} else {
+				is_sink = !gf_filter_has_out_caps(filter_dst->freg->caps, filter_dst->freg->nb_caps);
+			}
+		}
+
+		//we linked to a sink in implicit mode and new filter is not a sink, continue
+		if (link_sinks_only && !is_sink) continue;
+		//we linked to a non-sink filter in implicit mode and the destination has no sourceID, continue
+		if (implicit_link_found && !filter_dst->source_ids) {
+			//destination not a sink, do not connect
+			if (!is_sink) continue;
+			//destination is a sink, do not connect if destination is not already registered as target for our filter
+			//we need to check this for case such as
+			//rtpin(avc) -> avc
+			// -> ts
+			//which will invoke the AVC unframer/rewriter (ufnalu) only once and then try to link it to both TS mux and fout
+			if ((gf_list_find(filter->destination_filters, filter_dst)<0)
+				&& (gf_list_find(filter->destination_links, filter_dst)<0)
+			) {
+				continue;
+			}
 		}
+
 		//we already linked to this one
 		if (gf_list_find(linked_dest_filters, filter_dst)>=0) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s already linked to filter %s\n", pid->name, filter_dst->name));
@@ -3663,6 +4254,7 @@
 
 				pid->filter->dst_filter = NULL;
 			} else {
+				filter_dst->in_link_resolution = 0;
 				pid->filter->dst_filter = filter_dst;
 			}
 		}
@@ -3672,39 +4264,56 @@
 			if (ours<0) {
 				ours = gf_list_find(possible_linked_resolutions, filter_dst);
 				if (ours<0) {
+					ours = gf_list_find(force_link_resolutions, filter_dst);
+				}
+				if (ours<0) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has destination links, filter %s not one of them\n", pid->name, filter_dst->name));
 					continue;
 				}
 			}
 			pid->filter->dst_filter = NULL;
 		}
-
+		//we must unlock the filters list at this point, otherwise we may end up in deadlock when checking gf_filter_in_parent_chain
+		gf_mx_v(filter->session->filters_mx);
+		gf_mx_p(filter_dst->tasks_mx);
 		if (gf_list_count(filter_dst->source_filters)) {
 			u32 j, count2 = gf_list_count(filter_dst->source_filters);
 			for (j=0; j<count2; j++) {
+				Bool in_par;
 				GF_Filter *srcf = gf_list_get(filter_dst->source_filters, j);
-				if (gf_filter_in_parent_chain(pid->filter, srcf)) {
+				gf_mx_v(filter_dst->tasks_mx);
+				in_par = gf_filter_in_parent_chain(pid->filter, srcf);
+				gf_mx_p(filter_dst->tasks_mx);
+				if (in_par) {
 					ignore_source_ids = GF_TRUE;
 					break;
 				}
 			}
 		}
-		
+		gf_mx_v(filter_dst->tasks_mx);
+		RELOCK_FILTER_LIST
+
 		//if destination accepts only one input and connected or connection pending
 		//note that if destination uses dynamic clone through source ids, we need to check this filter
 		if (!filter_dst->max_extra_pids
 		 	&& !filter_dst->dynamic_source_ids
-		 	&& (filter_dst->num_input_pids || filter_dst->in_pid_connection_pending)
+			&& (filter_dst->num_input_pids || filter_dst->in_pid_connection_pending || filter_dst->in_link_resolution)
 		 	&& (!filter->swap_pidinst_dst || (filter->swap_pidinst_dst->filter != filter_dst))
 		) {
+			if ((filter_dst->clonable==GF_FILTER_CLONE_PROBE)
+				&& !(filter->session->flags & GF_FS_FLAG_IMPLICIT_MODE)
+				&& !filter->source_ids
+			)
+				filter_dst->clonable = GF_FILTER_NO_CLONE;
+
 			//not explicitly clonable, don't connect to it
-			if (!filter_dst->clonable) {
+			if (filter_dst->clonable==GF_FILTER_NO_CLONE) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s not clonable\n", filter_dst->name));
 				continue;
 			}
 
 			//explicitly clonable but caps don't match, don't connect to it
-			if (!gf_filter_pid_caps_match(pid, filter_dst->freg, NULL, NULL, NULL, pid->filter->dst_filter, -1)) {
+			if (!gf_filter_pid_caps_match(pid, filter_dst->freg, filter_dst, NULL, NULL, pid->filter->dst_filter, -1)) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s caps does not match clonable filter %s\n", pid->name, filter_dst->name));
 				continue;
 			}
@@ -3714,7 +4323,7 @@
 
 		//we try to load a filter chain, so don't test against filters loaded for another chain
 		if (filter_dst->dynamic_filter && (filter_dst != pid->filter->dst_filter)) {
-			//dst was explicitely set and does not match
+			//dst was explicitly set and does not match
 			if (pid->filter->dst_filter) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has explicit dest %s not %s\n", pid->name, pid->filter->dst_filter->name, filter_dst->name));
 				continue;
@@ -3744,16 +4353,78 @@
 		}
 		//walk up through the parent graph and check if this filter is already in. If so don't connect
 		//since we don't allow re-entrant PIDs
-		if (gf_filter_in_parent_chain(filter, filter_dst) ) {
+		//we must unlock the filters list at this point, otherwise we may end up in deadlock when checking gf_filter_in_parent_chain
+		gf_mx_v(filter->session->filters_mx);
+		in_parent_chain = gf_filter_in_parent_chain(filter, filter_dst);
+
+		RELOCK_FILTER_LIST
+
+		if (in_parent_chain) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has filter %s in its parent chain\n", pid->name, filter_dst->name));
 			continue;
 		}
+
+		//do not create cyclic graphs due to link resolution (dynamic filters)
+		//look in all registered input PIDs of filter_dst and check if the current PID being linked has one of these pid in its source chain.
+		//If so, do not link. this solves:
+		// fin:ID1 [-> dmx] (PID1) -> dynf1 (PID2) -> dst1:SID=1
+		// -> dynf2 (PID3) -> dst2:SID=1
+		//In this case, PID2 will inherit ID1 and could be accepted a source of dynf2 which already has PID1 registered
+		//by walking up PID2 parent chain we check that PID1 will not be linked twice to the same filter
+		//
+		//We stop inspecting at the first filter with ID in the source
+		if (filter->dynamic_filter) {
+			Bool cyclic_detected = GF_FALSE;
+			u32 k;
+			gf_mx_p(filter_dst->tasks_mx);
+			//check filters pending a configure on filter_dst
+			for (k=0; k<gf_list_count(filter_dst->temp_input_pids); k++) {
+				GF_FilterPid *a_src_pid = gf_list_get(filter_dst->temp_input_pids, k);
+				if (a_src_pid == pid) continue;
+				if (gf_pid_in_parent_chain(pid, a_src_pid))
+					cyclic_detected = GF_TRUE;
+			}
+			gf_mx_v(filter_dst->tasks_mx);
+
+			//we must unlock the filters list at this point, otherwise we may end up in deadlock when checking gf_filter_in_parent_chain
+			gf_mx_v(filter->session->filters_mx);
+			gf_mx_p(filter_dst->tasks_mx);
+			//check filters already connected on filter_dst
+			for (k=0; k<filter_dst->num_input_pids && !cyclic_detected; k++) {
+				GF_FilterPidInst *pidi = gf_list_get(filter_dst->input_pids, k);
+				if (pidi->pid == pid) continue;
+				if (gf_pid_in_parent_chain(pid, pidi->pid))
+					cyclic_detected = GF_TRUE;
+			}
+			gf_mx_v(filter_dst->tasks_mx);
+
+			RELOCK_FILTER_LIST
+
+			if (cyclic_detected) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("PID %s:%s has one or more PID in input chain already connected to filter %s, breaking cycle\n", pid->name, pid->filter->name, filter_dst->name));
+				gf_list_del_item(force_link_resolutions, filter_dst);
+				for (k=0; k<gf_list_count(filter_dst->destination_links); k++) {
+					GF_Filter *a_dst = gf_list_get(filter_dst->destination_links, k);
+ gf_list_del_item(force_link_resolutions, a_dst);
+				}
+				for (k=0; k<gf_list_count(filter_dst->destination_filters); k++) {
+					GF_Filter *a_dst = gf_list_get(filter_dst->destination_filters, k);
+ gf_list_del_item(force_link_resolutions, a_dst);
+				}
+				continue;
+			}
+		}
+
 		//if the original filter is in the parent chain of this PID's filter, don't connect (equivalent to re-entrant)
 		if (filter_dst->cloned_from) {
 			if (gf_filter_in_parent_chain(filter, filter_dst->cloned_from) ) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has the original of cloned filter %s in its parent chain\n", pid->name, filter_dst->name));
 				continue;
 			}
+			if (gf_filter_in_parent_chain(filter_dst->cloned_from, filter) ) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has the original of cloned filter %s in its output filter chain\n", pid->name, filter_dst->name));
+				continue;
+			}
 		}
 
 		//if the filter is in the parent chain of this PID's original filter, don't connect (equivalent to re-entrant)
@@ -3790,6 +4461,7 @@
 						continue;
 					}
 				}
+				use_explicit_link = GF_TRUE;
 			}
 			//if no source ID on the dst filter, this means the dst filter accepts any possible connections from out filter
 			//unless prevented for this pid
@@ -3801,7 +4473,10 @@
 		//no filterID and dst expects only specific filters, continue
 		else if (filter_dst->source_ids && !ignore_source_ids) {
 			Bool pid_excluded=GF_FALSE;
-			if ( (filter_dst->source_ids[0]!='*') && (filter_dst->source_ids[0]!=filter->session->sep_frag)) {
+			if ( (filter_dst->source_ids[0]!='*')
+				&& (filter_dst->source_ids[0]!=filter->session->sep_frag)
+				&& (filter_dst->source_ids[0]!=filter->session->sep_neg)
+				) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s does not match filter %s source ID\n", pid->name, filter_dst->name));
 				continue;
 			}
@@ -3810,6 +4485,17 @@
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s is excluded by filter %s source ID\n", pid->name, filter_dst->name));
 				continue;
 			}
+			use_explicit_link = GF_TRUE;
+		}
+		else if (filter->subsession_id != filter_dst->subsession_id) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s and filter %s not in same subsession and no links directive\n", pid->name, filter_dst->name));
+			continue;
+		}
+		//filters are in the same subsession and have a subsource_id (not part of chain-to-sink)
+		//only link if same subsource_id
+		else if (filter->subsource_id && filter_dst->subsource_id && (filter->subsource_id != filter_dst->subsource_id)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s and filter %s do not have same source and no links directive\n", pid->name, filter_dst->name));
+			continue;
 		}
 		if (needs_clone) {
 			//remember this filter as clonable (dynamic source id scheme) if none yet found.
@@ -3825,6 +4511,17 @@
 		//remember we had a sourceid match
 		found_matching_sourceid = GF_TRUE;
 
+		//we have a match, check if caps are OK
+		cap_matched = gf_filter_pid_caps_match(pid, filter_dst->freg, filter_dst, NULL, NULL, pid->filter->dst_filter, -1);
+
+		//dst filter forces demuxing, pid is file and caps matched, do not test and do not activate link resolution
+		//if can_try_link_resolution is still false at end of pass one, we will insert a reframer
+		if (cap_matched && filter_dst->force_demux && pid_is_file) {
+			if (pid_is_file==1)
+				pid_is_file = 2;
+			continue;
+		}
+
 		can_try_link_resolution = GF_TRUE;
 
 		//this is the right destination filter. We however need to check if we don't have a possible destination link
@@ -3838,7 +4535,7 @@
 				//Not doing so could results in broken link resolution:
 				//PID1(AVC) -> decoder1 -> compositor
 				//PID2(PNG) -> decoder2 -> compositor
-				//However this algo would force a connection of PID2 to decoder1 if decoder1 accepts multiple input, regardless of PID2 caps
+				//However this algo would force a connection of PID2 to decoder1 if decoder1 accepts multiple inputs, regardless of PID2 caps
 				if (! (adest->freg->flags & GF_FS_REG_DYNAMIC_REDIRECT))
 					continue;
 				if ((gf_list_find(adest->destination_filters, filter_dst)>=0) || (gf_list_find(adest->destination_links, filter_dst)>=0) ) {
@@ -3849,14 +4546,10 @@
 			}
 		}
 
-
-		//we have a match, check if caps are OK
-		cap_matched = gf_filter_pid_caps_match(pid, filter_dst->freg, filter_dst, NULL, NULL, pid->filter->dst_filter, -1);
-
 		//if clonable filter and no match, check if we would match the caps without caps override of dest
 		//note we don't do this on sources for the time being, since this might trigger undesired resolution of file->file
-		if (!cap_matched && filter_dst->clonable && pid->filter->num_input_pids) {
-			cap_matched = gf_filter_pid_caps_match(pid, filter_dst->freg, NULL, NULL, NULL, pid->filter->dst_filter, -1);
+		if (!cap_matched && (filter_dst->clonable==GF_FILTER_CLONE) && pid->filter->num_input_pids) {
+			cap_matched = gf_filter_pid_caps_match(pid, filter_dst->freg, NULL, NULL, NULL, pid->filter->dst_filter, -1);
 		}
 
 		if (!cap_matched) {
@@ -3883,26 +4576,41 @@
 					&& !old_dst->num_input_pids
 					&& !old_dst->out_pid_connection_pending
 				) {
+					Bool skip = ((old_dst==filter_dst) && (filter_dst->dynamic_filter!=2)) ? GF_TRUE : GF_FALSE;
 					gf_filter_post_remove(old_dst);
+					if (skip)
+						continue;
 				}
 			}
 			if (!num_pass) {
 //we have an explicit link instruction so we must try dynamic link even if we connect to another filter
-				if (filter_dst->source_ids) {
+ //is_sink set, same thing (implicit mode only, force link to sink)
+				if (filter_dst->source_ids || (is_sink && !implicit_link_found)) {
 gf_list_add(force_link_resolutions, filter_dst);
+ //! filter is an alias, prevent linking to the filter being aliased
+ if (filter_dst->multi_sink_target) {
+						gf_list_del_item(force_link_resolutions, filter_dst->multi_sink_target);
+						gf_list_add(linked_dest_filters, filter_dst->multi_sink_target);
+					}
 				} else {
 					//register as possible destination link. If a filter already registered is a destination of this possible link
 					//only the possible link will be kept
 					add_possible_link_destination(possible_linked_resolutions, filter_dst);
+
+					//implicit link mode: if possible destination is not a sink, stop checking
+					if (!use_explicit_link && (filter->session->flags & GF_FS_FLAG_IMPLICIT_MODE) && !is_sink) {
+						break;
+					}
 				}
 				continue;
 			}
 			filter_found_but_pid_excluded = GF_FALSE;
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Attempting to solve link between PID %s and filter %s\n", pid->name, filter_dst->name));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Attempting to solve link between PID %s:%s and filter %s\n", pid->filter->freg->name, pid->name, filter_dst->name));
 
 			if (num_pass==1) reassigned = GF_TRUE;
 			else reassigned = GF_FALSE;
+
 			//we pass the list of loaded filters for this pid, so that we don't instanciate twice the same chain start
 			new_f = gf_filter_pid_resolve_link_check_loaded(pid, filter_dst, &reassigned, loaded_filters, &skipped);
 
@@ -3913,7 +4621,7 @@
 				}
 				if (pid->filter->session->run_status!=GF_OK) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s:%s init canceled (session abort)\n", pid->filter->name, pid->name));
-					if (filter->session->filters_mx) gf_mx_v(filter->session->filters_mx);
+					gf_mx_v(filter->session->filters_mx);
 					assert(pid->init_task_pending);
 					safe_int_dec(&pid->init_task_pending);
 					if (loaded_filters) gf_list_del(loaded_filters);
@@ -3929,7 +4637,7 @@
 						can_reassign_filter = GF_TRUE;
 						continue;
 					}
-					if (filter->session->filters_mx) gf_mx_v(filter->session->filters_mx);
+					gf_mx_v(filter->session->filters_mx);
 					assert(pid->init_task_pending);
 					safe_int_dec(&pid->init_task_pending);
 					if (loaded_filters) gf_list_del(loaded_filters);
@@ -3953,7 +4661,7 @@
 					new_f = gf_filter_pid_resolve_link(pid, new_dst, &reassigned);
 					if (!new_f) {
 						if (reassigned) {
-							if (filter->session->filters_mx) gf_mx_v(filter->session->filters_mx);
+							gf_mx_v(filter->session->filters_mx);
 							assert(pid->init_task_pending);
 							safe_int_dec(&pid->init_task_pending);
 							if (loaded_filters) gf_list_del(loaded_filters);
@@ -3970,18 +4678,45 @@
 					continue;
 				}
 			}
-			gf_list_del_item(filter->destination_links, filter_dst);
+
+			//in implicit link, if target is not here push it (we have no SID/FID to solve that later)
+			if ((filter->session->flags & GF_FS_FLAG_IMPLICIT_MODE)
+				&& !gf_list_count(new_f->destination_filters)
+				&& !gf_list_count(new_f->destination_links)
+				&& !filter_dst->source_ids
+			) {
+				gf_list_add(new_f->destination_links, filter_dst);
+			}
+
+			//target was in clone probe but we have loaded a mux, disable clone
+			if ((filter_dst->clonable==GF_FILTER_CLONE_PROBE) && new_f->max_extra_pids)
+				filter_dst->clonable = GF_FILTER_NO_CLONE;
+
+			gf_list_del_item(filter->destination_filters, filter_dst);
+			if (gf_list_find(new_f->destination_filters, filter_dst)>=0) {
+				if (filter_dst->clonable==GF_FILTER_NO_CLONE)
+					filter_dst->in_link_resolution = GF_TRUE;
+			}
+
 			filter_dst = new_f;
 			gf_list_add(loaded_filters, new_f);
 		}
 
-		assert(pid->pid->filter->freg != filter_dst->freg);
+		if (!(filter_dst->freg->flags & GF_FS_REG_ALLOW_CYCLIC)) {
+			assert(pid->pid->filter->freg != filter_dst->freg);
+		}
 
 		safe_int_inc(&pid->filter->out_pid_connection_pending);
+		gf_mx_p(filter_dst->tasks_mx);
+		gf_list_add(filter_dst->temp_input_pids, pid);
+		if (pid->filter != filter_dst->single_source)
+			filter_dst->single_source = NULL;
+		gf_mx_v(filter_dst->tasks_mx);
 		gf_filter_pid_post_connect_task(filter_dst, pid);
 
 		found_dest = GF_TRUE;
 		gf_list_add(linked_dest_filters, filter_dst);
+
 		gf_list_del_item(filter->destination_links, filter_dst);
 		/*we are linking to a mux, check all destination filters registered with the muxer and remove them from our possible destination links*/
 		if (filter_dst->max_extra_pids) {
@@ -3991,21 +4726,43 @@
 				gf_list_del_item(filter->destination_links, dst_f);
 			}
 		}
+
+		//implicit link mode: if target was a sink, allow further sink connections, otherwise stop linking
+		if (!use_explicit_link && (filter->session->flags & GF_FS_FLAG_IMPLICIT_MODE)) {
+			if (is_sink)
+				link_sinks_only = GF_TRUE;
+			else if (!implicit_link_found) {
+				u32 k=0;
+				for (k=0; k<gf_list_count(force_link_resolutions); k++) {
+					GF_Filter *dst_f = gf_list_get(force_link_resolutions, k);
+					if (!dst_f->source_ids) {
+						gf_list_rem(force_link_resolutions, k);
+						k--;
+					}
+				}
+				implicit_link_found = GF_TRUE;
+			}
+		}
 }
 
 	if (!num_pass) {
-		//cleanup forced link resolution
+		u32 i, k;
+		gf_mx_v(filter->session->filters_mx);
+		//cleanup forced filter list:
+		//remove any forced filter which is a destination of a filter we already linked to
 		for (i=0; i< gf_list_count(linked_dest_filters); i++) {
 			GF_Filter *filter_dst = gf_list_get(linked_dest_filters, i);
-			u32 k=0;
 			for (k=0; k<gf_list_count(force_link_resolutions); k++) {
 				GF_Filter *dst_link = gf_list_get(force_link_resolutions, k);
 				if (//if forced filter is in parent chain (already connected filters), don't force a link
 					gf_filter_in_parent_chain(filter_dst, dst_link)
 					|| gf_filter_in_parent_chain(dst_link, filter_dst)
 					//if forced filter is in destination of filter (connection pending), don't force a link
-					|| (gf_list_find(filter_dst->destination_filters, dst_link)>=0)
-					|| (gf_list_find(filter_dst->destination_links, dst_link)>=0)
+					//we need to walk up the destination chain, not just check the first level since the filter_dst might be connected
+					//and no longer have dst_link in its destination filter list
+					//typical case is multithreaded mode with mux or tileagg filter
+					|| filter_match_target_dst(filter_dst->destination_filters, dst_link)
+					|| filter_match_target_dst(filter_dst->destination_links, dst_link)
 					//if forced filter's target is the same as what we connected to, don't force a link
 					|| (dst_link->target_filter == filter_dst)
 				) {
@@ -4014,6 +4771,28 @@
 				}
 			}
 		}
+
+		//cleanup forced link resolution list: remove any forced filter which is a destination of another forced filter
+		//this is needed when multiple pids link to a single dynamically loaded mux, where we could end up
+		//with both the destination link and the mux (in this order) in this list, creating a new mux if the destination has a pending link
+		for (i=0; i<gf_list_count(force_link_resolutions); i++) {
+			GF_Filter *forced_dst = gf_list_get(force_link_resolutions, i);
+			for (k=i+1; k<gf_list_count(force_link_resolutions); k++) {
+				GF_Filter *forced_inserted = gf_list_get(force_link_resolutions, k);
+
+				if (gf_filter_in_parent_chain(forced_inserted, forced_dst)
+					|| filter_match_target_dst(forced_inserted->destination_filters, forced_dst)
+					|| filter_match_target_dst(forced_inserted->destination_links, forced_dst)
+				) {
+					gf_list_rem(force_link_resolutions, i);
+					//prevent linking to this filter
+					gf_list_add(linked_dest_filters, forced_dst);
+					i--;
+					break;
+				}
+			}
+		}
+		gf_mx_p(filter->session->filters_mx);
 	}
 
 	if (loaded_filters) {
@@ -4036,7 +4815,7 @@
 	if (found_dest) {
 		assert(pid->init_task_pending);
 		safe_int_dec(&pid->init_task_pending);
-		if (filter->session->filters_mx) gf_mx_v(filter->session->filters_mx);
+		gf_mx_v(filter->session->filters_mx);
 		pid->filter->disabled = GF_FALSE;
 		gf_list_del(linked_dest_filters);
 gf_list_del(force_link_resolutions);
@@ -4047,7 +4826,7 @@
 
 	//on first pass, if we found a clone (eg a filter using freg:#PropName=*), instantiate this clone and redo the pid linking to this clone (last entry in the filter list)
 	if (dynamic_filter_clone && !num_pass) {
-		GF_Filter *clone = gf_filter_clone(dynamic_filter_clone);
+		GF_Filter *clone = gf_filter_clone(dynamic_filter_clone, NULL);
 		if (clone) {
 			assert(dynamic_filter_clone->dynamic_source_ids);
 			gf_free(clone->source_ids);
@@ -4055,12 +4834,31 @@
 			clone->cloned_from = NULL;
 			count = gf_list_count(filter->session->filters);
 			gf_list_add(pid->filter->destination_links, clone);
-			i = count-1;
+			f_idx = count-1;
 			num_pass = 1;
 			goto single_retry;
 		}
 	}
 
+	//nothing found at first pass and demuxed forced, inject a reframer filter
+	if (!num_pass && !can_try_link_resolution && (pid_is_file==2)) {
+		GF_Err e;
+		GF_Filter *f = gf_fs_load_filter(filter->session, "reframer", &e);
+		if (!e) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Local file PID %s to local file detected, forcing remux\n", pid->name));
+			f->dynamic_filter = 2;
+			f->subsession_id = pid->filter->subsession_id;
+			f->subsource_id = pid->filter->subsource_id;
+			//force pid's filter destination to the reframer - this will in pass #2:
+			//- force solving file->reframer, loading the demuxer
+			//- since caps between pid and reframer don't match and reframer is not used by anyone, the reframer will be removed
+			//We end up with a demuxed source with no intermediate reframer filter :)
+			pid->filter->dst_filter = f;
+			num_pass = 1;
+			goto restart;
+		}
+	}
+
 	//nothing found, redo a pass, this time allowing for link resolve
 	if (!num_pass && can_try_link_resolution && filter->session->max_resolve_chain_len) {
 		num_pass = 1;
@@ -4081,7 +4879,7 @@
 	gf_list_del(linked_dest_filters);
 gf_list_del(force_link_resolutions);
 gf_list_del(possible_linked_resolutions);
-	if (filter->session->filters_mx) gf_mx_v(filter->session->filters_mx);
+	gf_mx_v(filter->session->filters_mx);
 
 
 	filter->num_out_pids_not_connected ++;
@@ -4104,6 +4902,7 @@
 		}
 
 		GF_LOG(pid->not_connected_ok ? GF_LOG_DEBUG : GF_LOG_WARNING, GF_LOG_FILTER, ("No filter chain found for PID %s in filter %s to any loaded filters - NOT CONNECTED\n", pid->name, pid->filter->name));
+
 		if (pid->filter->freg->process_event) {
 			GF_FEVT_INIT(evt, GF_FEVT_CONNECT_FAIL, pid);
 			pid->filter->freg->process_event(filter, &evt);
@@ -4117,7 +4916,10 @@
 	gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
 
 	gf_filter_pid_set_eos(pid);
-	if (!pid->not_connected_ok && !(pid->filter->freg->flags & GF_FS_REG_DYNAMIC_PIDS ) && (pid->filter->num_out_pids_not_connected == pid->filter->num_output_pids)) {
+	if (!pid->not_connected_ok
+		&& !parent_chain_has_dyn_pids(pid->filter)
+		&& (pid->filter->num_out_pids_not_connected == pid->filter->num_output_pids)
+	) {
 		pid->filter->disabled = GF_TRUE;
 
 		if (can_reassign_filter) {
@@ -4138,20 +4940,26 @@
 {
 	assert(pid->pid);
 	assert(pid->filter != filter);
-	assert(pid->filter->freg != filter->freg);
+	if (!(filter->freg->flags & GF_FS_REG_ALLOW_CYCLIC)) {
+		assert(pid->filter->freg != filter->freg);
+	}
 	assert(filter->freg->configure_pid);
 	safe_int_inc(&filter->session->pid_connect_tasks_pending);
 	safe_int_inc(&filter->in_pid_connection_pending);
-	gf_fs_post_task_ex(filter->session, gf_filter_pid_connect_task, filter, pid, "pid_connect", NULL, GF_TRUE, GF_FALSE);
+	gf_fs_post_task_ex(filter->session, gf_filter_pid_connect_task, filter, pid, "pid_connect", NULL, GF_TRUE, GF_FALSE, GF_FALSE);
 }
 
 
 void gf_filter_pid_post_init_task(GF_Filter *filter, GF_FilterPid *pid)
 {
+	Bool force_main_thread=GF_FALSE;
 	if (pid->init_task_pending) return;
 
 	safe_int_inc(&pid->init_task_pending);
-	gf_fs_post_task(filter->session, gf_filter_pid_init_task, filter, pid, "pid_init", NULL);
+	if (filter->session->force_main_thread_tasks)
+		force_main_thread = GF_TRUE;
+
+	gf_fs_post_task_ex(filter->session, gf_filter_pid_init_task, filter, pid, "pid_init", NULL, GF_FALSE, force_main_thread, GF_FALSE);
 }
 
 GF_EXPORT
@@ -4184,18 +4992,21 @@
 	gf_mx_v(filter->tasks_mx);
 	pid->pid = pid;
 	pid->playback_speed_scaler = GF_FILTER_SPEED_SCALER;
-	
+	pid->require_source_id = filter->require_source_id;
+
 	sprintf(szName, "PID%d", filter->num_output_pids);
 	pid->name = gf_strdup(szName);
 
 	filter->has_pending_pids = GF_TRUE;
 	gf_fq_add(filter->pending_pids, pid);
 
+	gf_mx_p(filter->tasks_mx);
 	//by default copy properties if only one input pid
 	if (filter->num_input_pids==1) {
 		GF_FilterPid *pidi = gf_list_get(filter->input_pids, 0);
 		gf_filter_pid_copy_properties(pid, pidi);
 	}
+	gf_mx_v(filter->tasks_mx);
 	return pid;
 }
 
@@ -4301,18 +5112,30 @@
 static GF_Err gf_filter_pid_set_property_full(GF_FilterPid *pid, u32 prop_4cc, const char *prop_name, char *dyn_name, const GF_PropertyValue *value, Bool is_info)
 {
 	GF_PropertyMap *map;
-
+	const GF_PropertyValue *oldp;
 	if (PID_IS_INPUT(pid)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to write property on input PID in filter %s - ignoring\n", pid->filter->name));
 		return GF_BAD_PARAM;
 	}
 
+	if (prop_4cc) {
+		oldp = gf_filter_pid_get_property(pid, prop_4cc);
+	} else {
+		oldp = gf_filter_pid_get_property_str(pid, prop_name ? prop_name : dyn_name);
+	}
+	if (!oldp && !value)
+		return GF_OK;
+	if (oldp && value) {
+		if (gf_props_equal_strict(oldp, value)) {
+			if (value->type==GF_PROP_DATA_NO_COPY) gf_free(value->value.data.ptr);
+			else if (value->type==GF_PROP_STRING_NO_COPY) gf_free(value->value.string);
+			else if (value->type==GF_PROP_STRING_LIST) gf_props_reset_single((GF_PropertyValue *) value);
+			return GF_OK;
+		}
+	}
+
 	//info property, do not request a new property map
 	if (is_info) {
-		if (value && (value->type==GF_PROP_POINTER)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set info property of type pointer is forbidden (filter %s) - ignoring\n", pid->filter->name));
-			return GF_BAD_PARAM;
-		}
 		map = pid->infos;
 		if (!map) {
 			map = pid->infos = gf_props_new(pid->filter);
@@ -4390,9 +5213,11 @@
 	}
 	pid = pid->pid;
 	if (!pid->caps_negociate) {
-		assert(!pid->caps_negociate_pidi);
+		assert(!pid->caps_negociate_pidi_list);
 		pid->caps_negociate = gf_props_new(pid->filter);
-		pid->caps_negociate_pidi = pidi;
+		pid->caps_negociate_pidi_list = gf_list_new();
+		pid->caps_negociate_direct = GF_TRUE;
+		gf_list_add(pid->caps_negociate_pidi_list, pidi);
 		//we start a new caps negotiation step, reset any blacklist on pid
 		if (pid->adapters_blacklist) {
 			gf_list_del(pid->adapters_blacklist);
@@ -4400,7 +5225,23 @@
 		}
 		safe_int_inc(&pid->filter->nb_caps_renegociate);
 	}
-	//pid is end of stream of pid instance has packet pendings, we will need a new chain to adapt these packets formats
+	else {
+		const GF_PropertyValue *p;
+		//new PID instance asking for cap negociation
+		if (gf_list_find(pid->caps_negociate_pidi_list, pidi)<0) {
+			gf_list_add(pid->caps_negociate_pidi_list, pidi);
+		}
+
+		//check if same property to list
+		p = gf_props_get_property(pid->caps_negociate, prop_4cc, prop_name);
+		if (p) {
+			if (gf_props_equal(p, value))
+				return GF_OK;
+			//not the same value, disable direct caps negociate
+			pid->caps_negociate_direct = GF_FALSE;
+		}
+	}
+	//pid is end of stream or pid instance has packet pendings, we will need a new chain to adapt these packets formats
 	if (pid->has_seen_eos || gf_fq_count(pidi->packets)) {
 		gf_fs_post_task(pid->filter->session, gf_filter_renegociate_output_task, pid->filter, NULL, "filter renegociate", NULL);
 	}
@@ -4513,7 +5354,7 @@
 
 static const GF_PropertyValue *gf_filter_pid_get_info_internal(GF_FilterPid *pid, u32 prop_4cc, const char *prop_name, Bool first_call, GF_PropertyEntry **propentry)
 {
-	u32 i, count;
+	u32 i;
 	const GF_PropertyEntry *prop_ent = NULL;
 	GF_PropertyMap *map;
 	*propentry = NULL;
@@ -4541,18 +5382,22 @@
 		if (prop_ent) goto exit;
 	}
 
-	count = gf_list_count(pid->filter->input_pids);
-	for (i=0; i<count; i++) {
+	gf_mx_p(pid->filter->tasks_mx);
+	for (i=0; i<pid->filter->num_input_pids; i++) {
 		const GF_PropertyValue *prop;
 		GF_FilterPid *pidinst = gf_list_get(pid->filter->input_pids, i);
 		if (!pidinst->pid) continue;
-		
+		if (!pidinst->pid->filter) continue;
+		if (pidinst->pid->filter->removed) continue;
+
 		prop = gf_filter_pid_get_info_internal((GF_FilterPid *)pidinst, prop_4cc, prop_name, GF_FALSE, propentry);
 		if (prop) {
 			prop_ent = *propentry;
+			gf_mx_v(pid->filter->tasks_mx);
 			goto exit;
 		}
 	}
+	gf_mx_v(pid->filter->tasks_mx);
 	prop_ent = NULL;
 
 exit:
@@ -4595,7 +5440,7 @@
 GF_EXPORT
 const GF_PropertyValue *gf_filter_pid_enum_info(GF_FilterPid *pid, u32 *idx, u32 *prop_4cc, const char **prop_name)
 {
-	u32 i, count, cur_idx=0, nb_in_pid=0;
+	u32 i, cur_idx=0, nb_in_pid=0;
 
 	if (PID_IS_OUTPUT(pid)) {
 		return NULL;
@@ -4613,49 +5458,53 @@
 		cur_idx = *idx - nb_in_pid;
 	}
 
-	count = gf_list_count(pid->filter->input_pids);
-	for (i=0; i<count; i++) {
+	gf_mx_p(pid->filter->tasks_mx);
+	for (i=0; i<pid->filter->num_input_pids; i++) {
 		u32 sub_idx = cur_idx;
 		const GF_PropertyValue * prop;
 		GF_FilterPid *pidinst = gf_list_get(pid->filter->input_pids, i);
 		prop = gf_filter_pid_enum_info((GF_FilterPid *)pidinst, &sub_idx, prop_4cc, prop_name);
 		if (prop) {
 			*idx = nb_in_pid + sub_idx;
+			gf_mx_v(pid->filter->tasks_mx);
 			return prop;
 		}
 		nb_in_pid += sub_idx;
 		cur_idx = *idx - nb_in_pid;
 	}
+	gf_mx_v(pid->filter->tasks_mx);
 	return NULL;
 }
 
 
 static const GF_PropertyValue *gf_filter_get_info_internal(GF_Filter *filter, u32 prop_4cc, const char *prop_name, GF_PropertyEntry **propentry)
 {
-	u32 i, count;
+	u32 i;
 	const GF_PropertyValue *prop=NULL;
 
 	gf_mx_p(filter->session->info_mx);
+	gf_mx_p(filter->tasks_mx);
 
 	//TODO avoid doing back and forth ...
-	count = gf_list_count(filter->output_pids);
-	for (i=0; i<count; i++) {
+	for (i=0; i<filter->num_output_pids; i++) {
 		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
 		prop = gf_filter_pid_get_info_internal(pid, prop_4cc, prop_name, GF_FALSE, propentry);
 		if (prop) {
+			gf_mx_v(filter->tasks_mx);
 			gf_mx_v(filter->session->info_mx);
 			return prop;
 		}
 	}
-	count = gf_list_count(filter->input_pids);
-	for (i=0; i<count; i++) {
+	for (i=0; i<filter->num_input_pids; i++) {
 		GF_FilterPidInst *pidinst = gf_list_get(filter->input_pids, i);
 		prop = gf_filter_pid_get_info_internal(pidinst->pid, prop_4cc, prop_name, GF_FALSE, propentry);
 		if (prop) {
+			gf_mx_v(filter->tasks_mx);
 			gf_mx_v(filter->session->info_mx);
 			return prop;
 		}
 	}
+	gf_mx_v(filter->tasks_mx);
 	gf_mx_v(filter->session->info_mx);
 	return NULL;
 }
@@ -4690,6 +5539,7 @@
 	}
 }
 
+GF_EXPORT
 GF_Err gf_filter_pid_reset_properties(GF_FilterPid *pid)
 {
 	GF_PropertyMap *map;
@@ -4712,7 +5562,7 @@
 
 static GF_Err gf_filter_pid_merge_properties_internal(GF_FilterPid *dst_pid, GF_FilterPid *src_pid, gf_filter_prop_filter filter_prop, void *cbk, Bool is_merge)
 {
-	GF_PropertyMap *dst_props, *src_props, *old_dst_props=NULL;
+	GF_PropertyMap *dst_props, *src_props = NULL, *old_dst_props=NULL;
 	if (PID_IS_INPUT(dst_pid)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to reset all properties on input PID in filter %s - ignoring\n", dst_pid->filter->name));
 		return GF_BAD_PARAM;
@@ -4730,15 +5580,32 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("No properties for destination pid in filter %s, ignoring reset\n", dst_pid->filter->name));
 		return GF_OUT_OF_MEM;
 	}
+	//if pid is input, use the current properties - cf filter_pid_get_prop_map
+	if (PID_IS_INPUT(src_pid)) {
+		GF_FilterPidInst *pidi = (GF_FilterPidInst *)src_pid;
+		if (!pidi->props) {
+			//see \ref gf_filter_pid_merge_properties_internal for mutex
+			gf_mx_p(src_pid->filter->tasks_mx);
+			pidi->props = gf_list_get(src_pid->pid->properties, 0);
+			gf_mx_v(src_pid->filter->tasks_mx);
+			assert(pidi->props);
+			safe_int_inc(&pidi->props->reference_count);
+		}
+		src_props = pidi->props;
+	}
+	//move to rela pid
 	src_pid = src_pid->pid;
-	//our list is not thread-safe, so we must lock the filter when destroying the props
-	//otherwise gf_list_last() (this caller) might use the last entry while another threads sets this last entry to NULL
-	gf_mx_p(src_pid->filter->tasks_mx);
-	src_props = gf_list_last(src_pid->properties);
-	gf_mx_v(src_pid->filter->tasks_mx);
+	//this is a copy props on output pid
 	if (!src_props) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("No properties for source pid in filter %s, ignoring merge\n", src_pid->filter->name));
-		return GF_OK;
+		//our list is not thread-safe, so we must lock the filter when destroying the props
+		//otherwise gf_list_last() (this caller) might use the last entry while another thread sets this last entry to NULL
+		gf_mx_p(src_pid->filter->tasks_mx);
+		src_props = gf_list_last(src_pid->properties);
+		gf_mx_v(src_pid->filter->tasks_mx);
+		if (!src_props) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("No properties to copy from pid %s in filter %s, ignoring merge\n", src_pid->name, src_pid->filter->name));
+			return GF_OK;
+		}
 	}
 	if (src_pid->name && !old_dst_props)
 		gf_filter_pid_set_name(dst_pid, src_pid->name);
@@ -4787,7 +5654,7 @@
 	u32 ctype = (pcki->pck->info.flags & GF_PCK_CMD_MASK);
 	if (ctype == GF_PCK_CMD_PID_EOS ) {
 		pcki->pid->is_end_of_stream = pcki->pid->pid->has_seen_eos ? GF_TRUE : GF_FALSE;
-		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Found EOS packet in PID %s in filter %s - eos %d\n", pidi->pid->name, pidi->filter->name, pcki->pid->pid->has_seen_eos));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Found EOS packet in PID %s in filter %s - eos %d\n", pidi->pid->name, pidi->filter->name, pcki->pid->pid->has_seen_eos));
 		assert(pcki->pid->nb_eos_signaled);
 		safe_int_dec(&pcki->pid->nb_eos_signaled);
 		is_internal = GF_TRUE;
@@ -4799,19 +5666,21 @@
 	ctype = (pcki->pck->info.flags & GF_PCK_CKTYPE_MASK) >> GF_PCK_CKTYPE_POS;
 
 	if (ctype) {
+		u32 timescale;
 		if (pcki->pid->handles_clock_references) return GF_FALSE;
 		assert(pcki->pid->nb_clocks_signaled);
 		safe_int_dec(&pcki->pid->nb_clocks_signaled);
 		//signal destination
 		assert(!pcki->pid->filter->next_clock_dispatch_type || !pcki->pid->filter->num_output_pids);
 
+		timescale = pcki->pck->pid_props ? pcki->pck->pid_props->timescale : 0;
 		pcki->pid->filter->next_clock_dispatch = pcki->pck->info.cts;
-		pcki->pid->filter->next_clock_dispatch_timescale = pcki->pck->pid_props->timescale;
+		pcki->pid->filter->next_clock_dispatch_timescale = timescale;
 		pcki->pid->filter->next_clock_dispatch_type = ctype;
 
 		//keep clock values but only override clock type if no discontinuity is pending
 		pcki->pid->last_clock_value = pcki->pck->info.cts;
-		pcki->pid->last_clock_timescale = pcki->pck->pid_props->timescale;
+		pcki->pid->last_clock_timescale = timescale;
 		if (pcki->pid->last_clock_type != GF_FILTER_CLOCK_PCR_DISC)
 			pcki->pid->last_clock_type = ctype;
 
@@ -4844,6 +5713,7 @@
 	pcki = (GF_FilterPacketInstance *)gf_fq_head(pidinst->packets);
 	//no packets
 	if (!pcki) {
+		if (!pidinst->pid || !pidinst->pid->filter) return NULL;
 		if (pidinst->pid->filter->disabled) {
 			pidinst->is_end_of_stream = pidinst->pid->has_seen_eos = GF_TRUE;
 		}
@@ -4863,7 +5733,6 @@
 		GF_Err e;
 		Bool skip_props = GF_FALSE;
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s property changed at this packet, triggering reconfigure\n", pidinst->pid->filter->name, pidinst->pid->name));
 		pcki->pid_props_change_done = 1;
 
 		//it may happen that:
@@ -4889,10 +5758,12 @@
 				//it may happen that pid_configure for destination was called after packet being dispatched, in
 				//which case we are already properly configured
 				skip_props = GF_TRUE;
-				GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s was already configured with the last property set, ignoring reconfigure\n", pidinst->pid->filter->name, pidinst->pid->name));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s was already configured with the last property set, ignoring reconfigure\n", pidinst->pid->filter->name, pidinst->pid->name));
 			}
 		}
 		if (!skip_props) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s property changed at this packet, triggering reconfigure\n", pidinst->pid->filter->name, pidinst->pid->name));
+
 			assert(pidinst->filter->freg->configure_pid);
 			//reset the blacklist whenever reconfiguring, since we may need to reload a new filter chain
 			//in which a previously blacklisted filter (failing (re)configure for previous state) could
@@ -4905,7 +5776,7 @@
 				return NULL;
 		}
 	}
-	if ( (pcki->pck->info.flags & GF_PCKF_INFO_CHANGED) /* && !pcki->pid_info_change_done*/) {
+	if ( (pcki->pck->info.flags & GF_PCKF_INFO_CHANGED) && !pcki->pid_info_change_done) {
 		Bool res=GF_FALSE;
 
 		//it may happen that this filter pid is pulled from another thread than ours (eg audio callback), in which case
@@ -5015,9 +5886,8 @@
 	if (pck->data_length) {
 		Bool has_ts = GF_TRUE;
 		u64 ts = (pck->info.dts != GF_FILTER_NO_TS) ? pck->info.dts : pck->info.cts;
-		if ((ts != GF_FILTER_NO_TS) && (pck->pid_props->timescale)) {
-			ts *= 1000000;
-			ts /= pck->pid_props->timescale;
+		if ((ts != GF_FILTER_NO_TS) && pck->pid_props && pck->pid_props->timescale) {
+			ts = gf_timestamp_rescale(ts, pck->pid_props->timescale, 1000000);
 		} else {
 			has_ts = GF_FALSE;
 		}
@@ -5090,7 +5960,7 @@
 #ifdef GPAC_MEMORY_TRACKING
 	u32 prev_nb_allocs, prev_nb_reallocs, nb_allocs, nb_reallocs;
 #endif
-
+	u32 timescale = 0;
 	u32 nb_pck=0;
 	GF_FilterPacket *pck=NULL;
 	GF_FilterPacketInstance *pcki;
@@ -5117,11 +5987,17 @@
 	pck = pcki->pck;
 	//move to source pid
 	pid = pid->pid;
+	if (pck->pid_props)
+		timescale = pck->pid_props->timescale;
 
+	if (pck->info.flags & GF_PCKF_FORCE_MAIN) {
+		assert(pidinst->filter->nb_main_thread_forced);
+		safe_int_dec(&pidinst->filter->nb_main_thread_forced);
+	}
 	gf_filter_pidinst_update_stats(pidinst, pck);
-	if (pck->info.cts!=GF_FILTER_NO_TS) {
+	if (timescale && (pck->info.cts!=GF_FILTER_NO_TS)) {
 		pidinst->last_ts_drop.num = pck->info.cts;
-		pidinst->last_ts_drop.den = pck->pid_props->timescale;
+		pidinst->last_ts_drop.den = timescale;
 	}
 
 
@@ -5132,11 +6008,10 @@
 
 	if (!nb_pck) {
 		safe_int64_sub(&pidinst->buffer_duration, pidinst->buffer_duration);
-	} else if (pck->info.duration && (pck->info.flags & GF_PCKF_BLOCK_START) && pck->pid_props->timescale) {
-		s64 d = ((u64)pck->info.duration) * 1000000;
-		d /= pck->pid_props->timescale;
+	} else if (pck->info.duration && (pck->info.flags & GF_PCKF_BLOCK_START) && timescale) {
+		s64 d = gf_timestamp_rescale(pck->info.duration, timescale, 1000000);
 		if (d > pidinst->buffer_duration) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Corrupted buffer level in PID instance %s (%s -> %s), droping packet duration "LLD" us greater than buffer duration "LLU" us\n", pid->name, pid->filter->name, pidinst->filter ? pidinst->filter->name : "disconnected", d, pidinst->buffer_duration));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Corrupted buffer level in PID instance %s (%s -> %s), dropping packet duration "LLD" us greater than buffer duration "LLU" us\n", pid->name, pid->filter->name, pidinst->filter ? pidinst->filter->name : "disconnected", d, pidinst->buffer_duration));
 			d = pidinst->buffer_duration;
 		}
 		assert(d <= pidinst->buffer_duration);
@@ -5176,7 +6051,7 @@
 #ifndef GPAC_DISABLE_LOG
 	if (gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_DEBUG)) {
 		u8 sap_type = (pck->info.flags & GF_PCK_SAP_MASK) >> GF_PCK_SAP_POS;
-		Bool seek_flag = pck->info.flags & GF_PCKF_SEEK;
+		Bool seek_flag = (pck->info.flags & GF_PCKF_SEEK) ? 1 : 0;
 
 		if ((pck->info.dts != GF_FILTER_NO_TS) && (pck->info.cts != GF_FILTER_NO_TS) ) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s (%s) drop packet DTS "LLU" CTS "LLU" SAP %d Seek %d - %d packets remaining buffer "LLU" us\n", pidinst->filter ? pidinst->filter->name : "disconnected", pid->name, pid->filter->name, pck->info.dts, pck->info.cts, sap_type, seek_flag, nb_pck, pidinst->buffer_duration));
@@ -5244,8 +6119,9 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query EOS on output PID %s in filter %s\n", pid->pid->name, pid->filter->name));
 		return GF_FALSE;
 	}
+	if (!pid->pid) return GF_TRUE;
 	if (!pid->pid->has_seen_eos && !pidi->discard_inputs && !pidi->discard_packets) {
-		((GF_FilterPidInst *)pid)->is_end_of_stream = GF_FALSE;
+		pidi->is_end_of_stream = GF_FALSE;
 		return GF_FALSE;
 	}
 	//peek next for eos
@@ -5253,7 +6129,7 @@
 	if (pcki)
 		gf_filter_pid_filter_internal_packet(pidi, pcki);
 
-	if (pidi->discard_packets) return GF_FALSE;
+	if (pidi->discard_packets && !pid->pid->filter->session->in_final_flush) return GF_FALSE;
 	if (!pidi->is_end_of_stream) return GF_FALSE;
 	if (!pidi->filter->eos_probe_state)
 		pidi->filter->eos_probe_state = 1;
@@ -5264,6 +6140,8 @@
 void gf_filter_pid_set_eos(GF_FilterPid *pid)
 {
 	GF_FilterPacket *pck;
+	//allow NULL as input (most filters blindly call set_eos on output even if no output)
+	if (!pid) return;
 
 	if (PID_IS_INPUT(pid)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to signal EOS on input PID %s in filter %s\n", pid->pid->name, pid->filter->name));
@@ -5274,6 +6152,10 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("EOS signaled on PID %s in filter %s\n", pid->name, pid->filter->name));
 	//we create a fake packet for eos signaling
 	pck = gf_filter_pck_new_shared_internal(pid, NULL, 0, NULL, GF_TRUE);
+	if (!pck) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new packet for EOS on PID %s in filter %s\n", pid->name, pid->filter->name));
+		return;
+	}
 	gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
 	pck->pck->info.flags |= GF_PCK_CMD_PID_EOS;
 	gf_filter_pck_send(pck);
@@ -5360,8 +6242,7 @@
 	return would_block;
 }
 
-GF_EXPORT
-u64 gf_filter_pid_query_buffer_duration(GF_FilterPid *pid, Bool check_pid_full)
+static u64 gf_filter_pid_query_buffer_duration_internal(GF_FilterPid *pid, Bool check_pid_full, Bool force_update)
 {
 	u32 count, i, j;
 	u64 duration=0;
@@ -5385,13 +6266,31 @@
 			if (!buffer_full)
 				return 0;
 		}
+
+		//this is a very costly recursive call until each source, and is likely to be an overkill
+		//if many PIDs (large tiling configurations for example)
+		//we cache the last computed value and only update every 10ms
+		if (!force_update && (pidinst->filter->last_schedule_task_time - pidinst->last_buf_query_clock < 10000)) {
+			return pidinst->last_buf_query_dur;
+		}
+		pidinst->last_buf_query_clock = pidinst->filter->last_schedule_task_time;
+		force_update = GF_TRUE;
+
+		gf_mx_p(filter->tasks_mx);
 		count = filter->num_input_pids;
 		for (i=0; i<count; i++) {
-			u64 dur = gf_filter_pid_query_buffer_duration( gf_list_get(filter->input_pids, i), 0);
+			u64 dur = gf_filter_pid_query_buffer_duration_internal( gf_list_get(filter->input_pids, i), 0, force_update);
 			if (dur > duration)
 				duration = dur;
+
+			//only probe for first pid when this is a mux or a reassembly filter
+			//this is not as precise but avoids spending too much time here for very large number of input pids (tiling)
+			if ((count>1) && (filter->num_output_pids==1))
+				break;
 		}
+		gf_mx_v(filter->tasks_mx);
 		duration += pidinst->buffer_duration;
+		pidinst->last_buf_query_dur = duration;
 		return duration;
 	} else {
 		u32 count2;
@@ -5411,7 +6310,7 @@
 			count2 = pidinst->filter->num_output_pids;
 			for (j=0; j<count2; j++) {
 				GF_FilterPid *pid_n = gf_list_get(pidinst->filter->output_pids, i);
-				u64 dur = gf_filter_pid_query_buffer_duration(pid_n, 0);
+				u64 dur = gf_filter_pid_query_buffer_duration_internal(pid_n, 0, GF_FALSE);
 				if (dur > max_dur ) max_dur = dur;
 			}
 		}
@@ -5420,7 +6319,12 @@
 	return duration;
 }
 
+GF_EXPORT
+u64 gf_filter_pid_query_buffer_duration(GF_FilterPid *pid, Bool check_pid_full)
+{
+	return gf_filter_pid_query_buffer_duration_internal(pid, check_pid_full, GF_FALSE);
 
+}
 GF_EXPORT
 Bool gf_filter_pid_has_seen_eos(GF_FilterPid *pid)
 {
@@ -5431,13 +6335,30 @@
 	}
 	if (pid->pid->has_seen_eos) return GF_TRUE;
 	if (pid->pid->filter->block_eos) return GF_FALSE;
+	gf_mx_p(pid->pid->filter->tasks_mx);
 	for (i=0; i<pid->pid->filter->num_input_pids; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(pid->pid->filter->input_pids, i);
-		if (gf_filter_pid_has_seen_eos((GF_FilterPid *) pidi)) return GF_TRUE;
+		if (gf_filter_pid_has_seen_eos((GF_FilterPid *) pidi)) {
+			gf_mx_v(pid->pid->filter->tasks_mx);
+			return GF_TRUE;
+		}
+	}
+	gf_mx_v(pid->pid->filter->tasks_mx);
+	return GF_FALSE;
+}
+
+GF_EXPORT
+Bool gf_filter_pid_eos_received(GF_FilterPid *pid)
+{
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query EOS on output PID %s in filter %s\n", pid->pid->name, pid->filter->name));
+		return GF_FALSE;
 	}
+	if (pid->pid->has_seen_eos) return GF_TRUE;
 	return GF_FALSE;
 }
 
+
 GF_EXPORT
 const char *gf_filter_event_name(GF_FEventType type)
 {
@@ -5457,9 +6378,13 @@
 	case GF_FEVT_BUFFER_REQ: return "BUFFER_REQ";
 	case GF_FEVT_USER: return "USER";
 	case GF_FEVT_SEGMENT_SIZE: return "SEGMENT_SIZE";
+	case GF_FEVT_FRAGMENT_SIZE: return "FRAGMENT_SIZE";
 	case GF_FEVT_CAPS_CHANGE: return "CAPS_CHANGED";
 	case GF_FEVT_CONNECT_FAIL: return "CONNECT_FAIL";
+	case GF_FEVT_FILE_DELETE: return "FILE_DELETE";
 	case GF_FEVT_PLAY_HINT: return "PLAY_HINT";
+	case GF_FEVT_ENCODE_HINTS: return "ENCODE_HINTS";
+	case GF_FEVT_NTP_REF: return "NTP_REF";
 	default:
 		return "UNKNOWN";
 	}
@@ -5468,7 +6393,7 @@
 static void gf_filter_pid_reset_task_ex(GF_FSTask *task, Bool *had_eos)
 {
 	GF_FilterPidInst *pidi = (GF_FilterPidInst *)task->udta;
-	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s input PID %s (from %s) reseting buffer\n", task->filter->name, pidi->pid->name, pidi->pid->filter->name ));
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s input PID %s (from %s) resetting buffer\n", task->filter->name, pidi->pid->name, pidi->pid->filter->name ));
 	assert(pidi->pid->discard_input_packets);
 
 	if (had_eos) *had_eos = GF_FALSE;
@@ -5487,7 +6412,9 @@
 	}
 	gf_filter_pidinst_reset_stats(pidi);
 
-	pidi->discard_packets = GF_FALSE;
+	assert(pidi->discard_packets);
+	safe_int_dec(&pidi->discard_packets);
+
 	pidi->last_block_ended = GF_TRUE;
 	pidi->first_block_started = GF_FALSE;
 	pidi->is_end_of_stream = GF_FALSE;
@@ -5501,7 +6428,6 @@
 	pidi->pid->nb_buffer_unit = 0;
 	pidi->pid->buffer_duration = 0;
 	gf_filter_pid_check_unblock(pidi->pid);
-
 	safe_int_dec(& pidi->pid->discard_input_packets );
 }
 static void gf_filter_pid_reset_task(GF_FSTask *task)
@@ -5524,7 +6450,7 @@
 	char string[1];
 } GF_RefString;
 
-#define TO_REFSTRING(_v) (GF_RefString *) (_v - offsetof(GF_RefString, string))
+#define TO_REFSTRING(_v) _v ? (GF_RefString *) (_v - offsetof(GF_RefString, string)) : NULL
 
 static GF_RefString *evt_get_refstr(GF_FilterEvent *evt)
 {
@@ -5582,23 +6508,59 @@
 	}
 	if (url_addr_src) {
 		char *url = *url_addr_src;
-		u32 len = url ? (u32) strlen(url) : 0;
-		GF_RefString *rstr = gf_malloc(sizeof(GF_RefString) + sizeof(char)*len);
-		rstr->ref_count=1;
-		strcpy( (char *) &rstr->string[0], url ? url : "");
-		*url_addr_dst = (char *) &rstr->string[0];
+		if (!url) {
+			*url_addr_dst = NULL;
+		} else {
+			u32 len = (u32) strlen(url);
+			GF_RefString *rstr = gf_malloc(sizeof(GF_RefString) + sizeof(char)*len);
+			rstr->ref_count=1;
+			strcpy( (char *) &rstr->string[0], url);
+			*url_addr_dst = (char *) &rstr->string[0];
+		}
 	}
 	return an_evt;
 }
 
+
+static Bool filter_pid_is_raw_source(GF_FilterPid *pid)
+{
+	u32 i;
+	Bool res = GF_TRUE;
+	if (!pid->raw_media) {
+		if (pid->stream_type!=GF_STREAM_FILE)
+			return GF_FALSE;
+	}
+
+	gf_mx_p(pid->filter->tasks_mx);
+
+	for (i=0; i<pid->filter->num_input_pids; i++) {
+		GF_FilterPidInst *pidi = gf_list_get(pid->filter->input_pids, i);
+		if (pidi->pid->nb_decoder_inputs) {
+			res = GF_FALSE;
+			break;
+		}
+		if (! filter_pid_is_raw_source(pidi->pid)) {
+			res = GF_FALSE;
+			break;
+		}
+	}
+	gf_mx_v(pid->filter->tasks_mx);
+	return res;
+}
+
 void gf_filter_pid_send_event_downstream(GF_FSTask *task)
 {
-	u32 i, count;
+	u32 i, count, nb_playing=0, nb_paused=0;
 	Bool canceled = GF_FALSE;
+	Bool forced_cancel = GF_FALSE;
 	GF_FilterEvent *evt = task->udta;
 	GF_Filter *f = task->filter;
 	GF_List *dispatched_filters = NULL;
-	Bool evt_reused=GF_FALSE;
+	GF_FilterPidInst *for_pidi = (GF_FilterPidInst *)task->pid;
+
+	if (for_pidi && (for_pidi->pid == task->pid)) {
+		for_pidi = NULL;
+	}
 
 	//if stream reset task is posted, wait for it before processing this event
 	if (f->stream_reset_pending) {
@@ -5616,13 +6578,63 @@
 		assert(evt->base.on_pid->filter->num_events_queued);
 		safe_int_dec(&evt->base.on_pid->filter->num_events_queued);
 	}
+	if (f->finalized) {
+		free_evt(evt);
+		return;
+	}
+
+	if (for_pidi) {
+		//update pid instance status
+		switch (evt->base.type) {
+		case GF_FEVT_PLAY:
+		case GF_FEVT_SOURCE_SEEK:
+			for_pidi->is_playing = GF_TRUE;
+			break;
+		case GF_FEVT_STOP:
+			for_pidi->is_playing = GF_FALSE;
+			break;
+		case GF_FEVT_PAUSE:
+			for_pidi->is_paused = GF_TRUE;
+			break;
+		case GF_FEVT_RESUME:
+			for_pidi->is_paused = GF_FALSE;
+			break;
+		default:
+			break;
+		}
+	}
+	if (evt->base.on_pid) {
+		GF_FilterPid *pid = (GF_FilterPid *) evt->base.on_pid->pid;
+		//we have destination for this pid but this is an event not targeting a dedicated pid instance, this
+		//means this was a connect fail, do not process event as other parts of the graphs are using this filter
+		if (pid->num_destinations && !for_pidi
+			&& ((evt->base.type==GF_FEVT_PLAY) || (evt->base.type==GF_FEVT_STOP) || (evt->base.type==GF_FEVT_CONNECT_FAIL))
+		) {
+			free_evt(evt);
+			return;
+		}
+		//update number of playing/paused pids
+		for (i=0; i<pid->num_destinations; i++) {
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
+			if (pidi->is_playing) nb_playing++;
+			if (pidi->is_paused) nb_paused++;
+		}
+	}
 
 	if (evt->base.type == GF_FEVT_BUFFER_REQ) {
 		if (!evt->base.on_pid) {
 			free_evt(evt);
 			return;
 		}
-		if (evt->base.on_pid->nb_decoder_inputs || evt->base.on_pid->raw_media || evt->buffer_req.pid_only) {
+		//, set buffering at this level if:
+		if (
+			//- pid is a decoder input
+			evt->base.on_pid->nb_decoder_inputs
+			//- buffer req event explicitly requested for this pid
+			|| evt->buffer_req.pid_only
+			//- pid is a raw media source
+			|| filter_pid_is_raw_source(evt->base.on_pid)
+		) {
 			evt->base.on_pid->max_buffer_time = evt->base.on_pid->user_max_buffer_time = evt->buffer_req.max_buffer_us;
 			evt->base.on_pid->user_max_playout_time = evt->buffer_req.max_playout_us;
 			evt->base.on_pid->user_min_playout_time = evt->buffer_req.min_playout_us;
@@ -5642,38 +6654,90 @@
 		}
 		free_evt(evt);
 		return;
-	} else if (evt->base.on_pid && (evt->base.type == GF_FEVT_STOP) && !evt->base.on_pid->pid->is_playing) {
+	} else if (evt->base.on_pid && (evt->base.type == GF_FEVT_STOP)
+		&& (
+			//stop request on pid already stop
+			!evt->base.on_pid->pid->is_playing
+			//fan out but some instances are still playing
+			|| nb_playing
+		)
+	) {
 		GF_FilterPid *pid = (GF_FilterPid *) evt->base.on_pid->pid;
-		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s event %s but PID is not playing, discarding\n", f->name, evt->base.on_pid->name, gf_filter_event_name(evt->base.type)));
 
+		if (!evt->base.on_pid->pid->is_playing) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s event %s but PID is not playing, discarding\n", f->name, evt->base.on_pid->name, gf_filter_event_name(evt->base.type)));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s event %s but PID has playing destinations, discarding\n", f->name, evt->base.on_pid->name, gf_filter_event_name(evt->base.type)));
+		}
+
+		gf_mx_p(f->tasks_mx);
 		for (i=0; i<pid->num_destinations; i++) {
 			GF_FilterPidInst *pidi = (GF_FilterPidInst *) gf_list_get(pid->destinations, i);
 			//don't forget we pre-processed stop by incrementing the discard counter and setting discard_packets on pid instances
 			//undo this
 			if (pidi->discard_packets) {
+				safe_int_dec(&pidi->discard_packets);
 				assert(pidi->pid->discard_input_packets);
 				safe_int_dec(& pidi->pid->discard_input_packets );
-				pidi->discard_packets = GF_FALSE;
 			}
 		}
 
-		free_evt(evt);
-		if ((f->num_input_pids==f->num_output_pids) && (f->num_input_pids==1)) {
-			gf_filter_pid_set_discard(gf_list_get(f->input_pids, 0), GF_TRUE);
+		if (!evt->base.on_pid->pid->is_playing) {
+			if ((f->num_input_pids==f->num_output_pids) && (f->num_input_pids==1)) {
+				gf_filter_pid_set_discard(gf_list_get(f->input_pids, 0), GF_TRUE);
+			}
+			if (pid->not_connected)
+				pid->not_connected = 2;
 		}
-		if (pid->not_connected)
-			pid->not_connected = 2;
+		gf_mx_v(f->tasks_mx);
+		free_evt(evt);
 		return;
-	} else if (f->freg->process_event) {
-		FSESS_CHECK_THREAD(f)
-		canceled = f->freg->process_event(f, evt);
+	}
+	//do not allow pause/resume if already paused
+	else if (nb_paused && ((evt->base.type == GF_FEVT_PAUSE) || (evt->base.type == GF_FEVT_RESUME)) ) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s event %s but PID is already paused, discarding\n", f->name, evt->base.on_pid->name, gf_filter_event_name(evt->base.type)));
+		free_evt(evt);
+		return;
+	}
+	//cancel connect failure if some destinations are successfully connected
+	else if ((evt->base.type==GF_FEVT_CONNECT_FAIL) && evt->base.on_pid->is_playing) {
+		free_evt(evt);
+		return;
+	}
+	//otherwise process
+	else {
+		//reset EOS to false on source switch before executing the event, so that a filter may set a pid to EOS in the callback
+		if (evt->base.type==GF_FEVT_SOURCE_SWITCH) {
+			//if session has been aborted, cancel event - this avoids the dashin requesting a source switch on a source that is not yet over
+			if (f->session->in_final_flush) {
+				free_evt(evt);
+				return;
+			}
+			for (i=0; i<f->num_output_pids; i++) {
+				GF_FilterPid *apid = gf_list_get(f->output_pids, i);
+				apid->has_seen_eos = GF_FALSE;
+				gf_filter_pid_check_unblock(apid);
+			}
+		}
+
+		if (f->freg->process_event) {
+			FSESS_CHECK_THREAD(f)
+			canceled = f->freg->process_event(f, evt);
+		}
+		if (!canceled && (evt->base.type==GF_FEVT_STOP) && evt->play.forced_dash_segment_switch) {
+			GF_FilterPidInst *pid_inst = gf_list_get(f->input_pids, 0);
+			//input is source filter, cancel
+			if (pid_inst && ((pid_inst->pid->filter->num_input_pids==0) || (pid_inst->pid->filter->freg->flags & GF_FS_REG_ACT_AS_SOURCE))) {
+				canceled = GF_TRUE;
+				forced_cancel = GF_TRUE;
+			}
+		}
 	}
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s processed event %s - canceled %s\n", f->name, evt->base.on_pid ? evt->base.on_pid->name : "none", gf_filter_event_name(evt->base.type), canceled ? "yes" : "no" ));
 
 	if (evt->base.on_pid && ((evt->base.type == GF_FEVT_STOP) || (evt->base.type==GF_FEVT_SOURCE_SEEK) || (evt->base.type==GF_FEVT_PLAY)) ) {
 		Bool do_reset = GF_TRUE;
-		Bool is_play_reset = GF_FALSE;
 		GF_FilterPidInst *p = (GF_FilterPidInst *) evt->base.on_pid;
 		GF_FilterPid *pid = p->pid;
 		//we need to force a PID reset when the first PLAY is > 0, since some filters may have dispatched packets during the initialization
@@ -5685,7 +6749,6 @@
 				do_reset = GF_FALSE;
 			} else {
 				pid->initial_play_done = GF_TRUE;
-				is_play_reset = GF_TRUE;
 				if (evt->play.start_range < 0.1)
 					do_reset = GF_FALSE;
 			}
@@ -5701,24 +6764,29 @@
 		}
 		for (i=0; i<pid->num_destinations && do_reset; i++) {
 			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
-			pidi->discard_packets = GF_TRUE;
-			//if not play reset, the request was set only once so we need to do it if more than one destination
-			if (is_play_reset || i)
+
+			if (!pidi->discard_packets) {
+				safe_int_inc(&pidi->discard_packets);
 				safe_int_inc(& pid->discard_input_packets );
+			}
 
 			safe_int_inc(& pid->filter->stream_reset_pending );
 
+			assert(pid->discard_input_packets);
+
 			//post task on destination filter
 			if (evt->base.type==GF_FEVT_STOP)
-				gf_fs_post_task(pidi->filter->session, gf_filter_pid_reset_stop_task, pidi->filter, NULL, "reset_pid", pidi);
+				gf_fs_post_task(pidi->filter->session, gf_filter_pid_reset_stop_task, pidi->filter, NULL, "reset_stop_pid", pidi);
 			else
 				gf_fs_post_task(pidi->filter->session, gf_filter_pid_reset_task, pidi->filter, NULL, "reset_pid", pidi);
 		}
 		pid->nb_reaggregation_pending = 0;
 	}
 	
+	gf_mx_p(f->tasks_mx);
+
 	//after play or seek, request a process task for source filters or filters having pending packets
-	if (!f->input_pids || f->pending_packets) {
+	if (!f->num_input_pids || f->pending_packets) {
 		if ((evt->base.type==GF_FEVT_PLAY) || (evt->base.type==GF_FEVT_SOURCE_SEEK)) {
 			gf_filter_post_process_task(f);
 		}
@@ -5732,14 +6800,23 @@
 	if ((f->num_input_pids==f->num_output_pids) && (f->num_input_pids==1)) {
 		GF_FilterPidInst *apidi = gf_list_get(f->input_pids, 0);
 		if (apidi->pid) {
+			//unlock before setting discard to avoid deadlocks during shutdown
+			gf_mx_v(f->tasks_mx);
 			if (evt->base.type==GF_FEVT_STOP) {
-				if (!canceled)
+				if (forced_cancel) {
+					//we stop propagating the event to the source, but we must reset the source pid
 					gf_filter_pid_set_discard((GF_FilterPid *)apidi, GF_TRUE);
+//					gf_filter_pid_set_discard((GF_FilterPid *)apidi, GF_FALSE);
+				} else if (!canceled) {
+					gf_filter_pid_set_discard((GF_FilterPid *)apidi, GF_TRUE);
+				}
 			} else if (evt->base.type==GF_FEVT_PLAY) {
 				gf_filter_pid_set_discard((GF_FilterPid *)apidi, GF_FALSE);
 			}
+			gf_mx_p(f->tasks_mx);
 		}
 	}
+	gf_mx_v(f->tasks_mx);
 
 	if ((evt->base.type==GF_FEVT_PLAY) || (evt->base.type==GF_FEVT_SET_SPEED)) {
 		if (evt->base.on_pid) {
@@ -5757,20 +6834,15 @@
 			}
 		}
 	}
-	else if (evt->base.type==GF_FEVT_SOURCE_SWITCH) {
-		for (i=0; i<f->num_output_pids; i++) {
-			GF_FilterPid *apid = gf_list_get(f->output_pids, i);
-			apid->has_seen_eos = GF_FALSE;
-			gf_filter_pid_check_unblock(apid);
-		}
-	}
 
 	//no more input pids
+	gf_mx_p(f->tasks_mx);
 	count = f->num_input_pids;
 	if (count==0) canceled = GF_TRUE;
 
 	if (canceled) {
 		free_evt(evt);
+		gf_mx_v(f->tasks_mx);
 		return;
 	}
 	if (!task->pid) dispatched_filters = gf_list_new();
@@ -5781,7 +6853,7 @@
 		GF_FilterPidInst *pid_inst = gf_list_get(f->input_pids, i);
 		GF_FilterPid *pid = pid_inst->pid;
 		if (!pid) continue;
-		
+
 		if (dispatched_filters) {
 			if (gf_list_find(dispatched_filters, pid_inst->pid->filter) >=0 )
 				continue;
@@ -5791,24 +6863,20 @@
 
 		//mark pid instance as about to be reset to avoid processing PID destroy task before
 		if ((evt->base.type == GF_FEVT_STOP) || (evt->base.type==GF_FEVT_SOURCE_SEEK)) {
-			pid_inst->discard_packets = GF_TRUE;
+			safe_int_inc(&pid_inst->discard_packets);
 			safe_int_inc(& pid_inst->pid->discard_input_packets );
 		}
-		//allocate a copy except for the last PID where we use the one from the input
-		if (evt_reused) {
-			an_evt = dup_evt(evt);
-		} else {
-			an_evt = evt;
-			evt_reused = GF_TRUE;
-		}
+
+		an_evt = dup_evt(evt);
 		an_evt->base.on_pid = task->pid ? pid : NULL;
 
 		safe_int_inc(&pid->filter->num_events_queued);
 		
-		gf_fs_post_task(pid->filter->session, gf_filter_pid_send_event_downstream, pid->filter, task->pid ? pid : NULL, "downstream_event", an_evt);
+		gf_fs_post_task(pid->filter->session, gf_filter_pid_send_event_downstream, pid->filter, task->pid ? (GF_FilterPid *) pid_inst : NULL, "downstream_event", an_evt);
 	}
+	gf_mx_v(f->tasks_mx);
 	if (dispatched_filters) gf_list_del(dispatched_filters);
-	if (!evt_reused) free_evt(evt);
+	free_evt(evt);
 	return;
 }
 
@@ -5824,7 +6892,7 @@
 		return;
 	}
 
-	canceled = f->freg->process_event ? f->freg->process_event(f, evt) : GF_TRUE;
+	canceled = f->freg->process_event ? f->freg->process_event(f, evt) : GF_FALSE;
 	if (!canceled) {
 		for (i=0; i<f->num_output_pids; i++) {
 			GF_FilterPid *apid = gf_list_get(f->output_pids, i);
@@ -5883,26 +6951,31 @@
 	}
 
 
-	if ((evt->base.type == GF_FEVT_STOP) || (evt->base.type == GF_FEVT_PLAY) || (evt->base.type==GF_FEVT_SOURCE_SEEK)) {
-		u32 i, count = pid->pid->num_destinations;
-		for (i=0; i<count; i++) {
+	if ((evt->base.type == GF_FEVT_STOP)
+		|| (evt->base.type == GF_FEVT_PLAY)
+		|| (evt->base.type==GF_FEVT_SOURCE_SEEK)
+	) {
+		u32 i;
+		gf_mx_p(pid->pid->filter->tasks_mx);
+		for (i=0; i<pid->pid->num_destinations; i++) {
 			GF_FilterPidInst *pidi = gf_list_get(pid->pid->destinations, i);
 			if (evt->base.type == GF_FEVT_PLAY) {
 				pidi->is_end_of_stream = GF_FALSE;
 //				gf_filter_pid_clear_eos(pid, GF_FALSE);
 			} else {
 				//flag pid instance to discard all packets (cf above note)
-				pidi->discard_packets = GF_TRUE;
+				safe_int_inc(&pidi->discard_packets);
 				safe_int_inc(& pidi->pid->discard_input_packets );
 			}
 		}
+		gf_mx_v(pid->pid->filter->tasks_mx);
 	}
 
 	an_evt = init_evt(evt);
 	if (evt->base.on_pid) {
-		target_pid = evt->base.on_pid->pid;
-		an_evt->base.on_pid = target_pid;
-		safe_int_inc(&target_pid->filter->num_events_queued);
+		target_pid = evt->base.on_pid;
+		an_evt->base.on_pid = evt->base.on_pid->pid;
+		safe_int_inc(&target_pid->pid->filter->num_events_queued);
 	}
 	gf_fs_post_task(pid->pid->filter->session, gf_filter_pid_send_event_downstream, pid->pid->filter, target_pid, "downstream_event", an_evt);
 }
@@ -5940,7 +7013,7 @@
 
 	//switch and seek events are only sent on source filters
 	if ((evt->base.type==GF_FEVT_SOURCE_SWITCH) || (evt->base.type==GF_FEVT_SOURCE_SEEK)) {
-		if (filter->num_input_pids) {
+		if (filter->num_input_pids && !(filter->freg->flags & GF_FS_REG_ACT_AS_SOURCE)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Sending %s event on non source filter %s is not allowed, discarding)\n", gf_filter_event_name(evt->base.type), filter->name));
 			return;
 		}
@@ -5984,6 +7057,60 @@
 	return gf_filter_in_parent_chain(pid->filter, filter);
 }
 
+
+
+GF_EXPORT
+Bool gf_filter_pid_share_origin(GF_FilterPid *pid, GF_FilterPid *other_pid)
+{
+ if (!pid || !other_pid) return GF_FALSE;
+ pid = pid->pid;
+ other_pid = other_pid->pid;
+ if (gf_filter_in_parent_chain(pid->filter, other_pid->filter))
+ return GF_TRUE;
+ if (gf_filter_in_parent_chain(other_pid->filter, pid->filter))
+ return GF_TRUE;
+ return GF_FALSE;
+}
+
+static void filter_pid_inst_collect_stats(GF_FilterPidInst *pidi, GF_FilterPidStatistics *stats)
+{
+	if (!pidi->pid) return;
+
+	stats->avgerage_bitrate += pidi->avg_bit_rate;
+	if (!stats->first_process_time || (stats->first_process_time > pidi->first_frame_time))
+		stats->first_process_time = pidi->first_frame_time;
+	if (stats->last_process_time < pidi->last_pck_fetch_time)
+		stats->last_process_time = pidi->last_pck_fetch_time;
+
+	stats->max_bitrate += pidi->max_bit_rate;
+
+	if (stats->max_process_time < (u32) pidi->max_process_time)
+		stats->max_process_time = (u32) pidi->max_process_time;
+	if (stats->max_sap_process_time < (u32) pidi->max_sap_process_time)
+		stats->max_sap_process_time = (u32) pidi->max_sap_process_time;
+	if (!stats->min_frame_dur || (stats->min_frame_dur > pidi->pid->min_pck_duration))
+		stats->min_frame_dur = pidi->pid->min_pck_duration;
+	stats->nb_processed += pidi->nb_processed;
+	stats->nb_saps += pidi->nb_sap_processed;
+	stats->total_process_time += pidi->total_process_time;
+	stats->total_sap_process_time += pidi->total_sap_process_time;
+	stats->average_process_rate += pidi->avg_process_rate;
+	stats->max_process_rate += pidi->max_process_rate;
+
+	if (stats->nb_buffer_units < pidi->pid->nb_buffer_unit)
+		stats->nb_buffer_units = pidi->pid->nb_buffer_unit;
+	if (stats->max_buffer_time < pidi->pid->max_buffer_time)
+		stats->max_buffer_time = pidi->pid->max_buffer_time;
+
+	if (stats->max_playout_time < pidi->pid->user_max_playout_time)
+		stats->max_playout_time = pidi->pid->user_max_playout_time;
+	if (!stats->min_playout_time || (stats->min_playout_time > pidi->pid->user_min_playout_time))
+		stats->min_playout_time = pidi->pid->user_min_playout_time;
+
+	if (stats->buffer_time < pidi->pid->buffer_duration)
+		stats->buffer_time = pidi->pid->buffer_duration;
+}
+
 static void filter_pid_collect_stats(GF_List *pidi_list, GF_FilterPidStatistics *stats)
 {
 	u32 i;
@@ -5991,42 +7118,11 @@
 		GF_FilterPidInst *pidi = (GF_FilterPidInst *) gf_list_get(pidi_list, i);
 		if (!pidi->pid) continue;
 
-		stats->avgerage_bitrate += pidi->avg_bit_rate;
-		if (!stats->first_process_time || (stats->first_process_time > pidi->first_frame_time))
-			stats->first_process_time = pidi->first_frame_time;
-		if (stats->last_process_time < pidi->last_pck_fetch_time)
-			stats->last_process_time = pidi->last_pck_fetch_time;
-
-		stats->max_bitrate += pidi->max_bit_rate;
-
-		if (stats->max_process_time < (u32) pidi->max_process_time)
-			stats->max_process_time = (u32) pidi->max_process_time;
-		if (stats->max_sap_process_time < (u32) pidi->max_sap_process_time)
-			stats->max_sap_process_time = (u32) pidi->max_sap_process_time;
-		if (!stats->min_frame_dur || (stats->min_frame_dur > pidi->pid->min_pck_duration))
-			stats->min_frame_dur = pidi->pid->min_pck_duration;
-		stats->nb_processed += pidi->nb_processed;
-		stats->nb_saps += pidi->nb_sap_processed;
-		stats->total_process_time += pidi->total_process_time;
-		stats->total_sap_process_time += pidi->total_sap_process_time;
-		stats->average_process_rate += pidi->avg_process_rate;
-		stats->max_process_rate += pidi->max_process_rate;
-
-		if (stats->nb_buffer_units < pidi->pid->nb_buffer_unit)
-			stats->nb_buffer_units = pidi->pid->nb_buffer_unit;
-		if (stats->max_buffer_time < pidi->pid->max_buffer_time)
-			stats->max_buffer_time = pidi->pid->max_buffer_time;
-
-		if (stats->max_playout_time < pidi->pid->user_max_playout_time)
-			stats->max_playout_time = pidi->pid->user_max_playout_time;
-		if (!stats->min_playout_time || (stats->min_playout_time > pidi->pid->user_min_playout_time))
-			stats->min_playout_time = pidi->pid->user_min_playout_time;
-
-		if (stats->buffer_time < pidi->pid->buffer_duration)
-			stats->buffer_time = pidi->pid->buffer_duration;
+		filter_pid_inst_collect_stats(pidi, stats);
 	}
 }
 
+
 static GF_Filter *filter_locate_enc_dec_sink(GF_Filter *filter, Bool locate_decoder)
 {
 	u32 i, j;
@@ -6048,14 +7144,21 @@
 {
 	u32 i;
 
+	gf_mx_p(filter->tasks_mx);
 	for (i=0; i<filter->num_input_pids; i++) {
 		GF_Filter *res;
 		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
-		if (pidi->is_decoder_input) return filter;
-
+		if (pidi->is_decoder_input) {
+			gf_mx_v(filter->tasks_mx);
+			return filter;
+		}
 		res = filter_locate_enc_dec_sink(pidi->pid->filter, locate_decoder);
-		if (res) return res;
+		if (res) {
+			gf_mx_v(filter->tasks_mx);
+			return res;
+		}
 	}
+	gf_mx_v(filter->tasks_mx);
 	return NULL;
 }
 
@@ -6079,20 +7182,7 @@
 			filter_pid_collect_stats(pid->destinations, stats);
 			return GF_OK;
 		}
-		stats->avgerage_bitrate = pidi->avg_bit_rate;
-		stats->first_process_time = pidi->first_frame_time;
-		stats->last_process_time = pidi->last_pck_fetch_time;
-		stats->max_bitrate = pidi->max_bit_rate;
-		stats->max_process_time = (u32) pidi->max_process_time;
-		stats->max_sap_process_time = (u32) pidi->max_sap_process_time;
-		stats->min_frame_dur = pidi->pid->min_pck_duration;
-		stats->nb_processed = pidi->nb_processed;
-		stats->nb_saps = pidi->nb_sap_processed;
-		stats->total_process_time = pidi->total_process_time;
-		stats->total_sap_process_time = pidi->total_sap_process_time;
-
-		stats->average_process_rate = pidi->avg_process_rate;
-		stats->max_process_rate = pidi->max_process_rate;
+		filter_pid_inst_collect_stats(pidi, stats);
 		return GF_OK;
 	case GF_STATS_LOCAL_INPUTS:
 		if (PID_IS_OUTPUT(pid)) {
@@ -6115,7 +7205,9 @@
 	if (!filter) {
 		return GF_NOT_FOUND;
 	}
+	gf_mx_p(filter->tasks_mx);
 	filter_pid_collect_stats(filter->input_pids, stats);
+	gf_mx_v(filter->tasks_mx);
 	return GF_OK;
 }
 
@@ -6146,6 +7238,10 @@
 
 	//we create a fake packet for removal signaling
 	pck = gf_filter_pck_new_shared_internal(pid, NULL, 0, NULL, GF_TRUE);
+	if (!pck) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new packet for PID %s remove in filter %s\n", pid->name, pid->filter->name));
+		return;
+	}
 	gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
 	pck->pck->info.flags |= GF_PCK_CMD_PID_REM;
 	gf_filter_pck_send(pck);
@@ -6188,7 +7284,14 @@
 GF_EXPORT
 u32 gf_filter_pid_get_timescale(GF_FilterPid *pid)
 {
-	GF_PropertyMap *map = pid ? gf_list_get(pid->pid->properties, 0) : 0;
+	GF_PropertyMap *map;
+	if (!pid) return 0;
+	//if input pid, the active PID config is the first one
+	if (PID_IS_INPUT(pid))
+		map = gf_list_get(pid->pid->properties, 0);
+	//if output pid, the active PID config is the last one one
+	else
+		map = gf_list_last(pid->pid->properties);
 	return map ? map->timescale : 0;
 }
 
@@ -6196,14 +7299,12 @@
 void gf_filter_pid_clear_eos(GF_FilterPid *pid, Bool clear_all)
 {
 	u32 i, j;
-	Bool was_blocking;
 	GF_FilterPidInst *pidi = (GF_FilterPidInst *)pid;
 	if (PID_IS_OUTPUT(pid)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Clearing EOS on output PID %s in filter %s\n", pid->pid->name, pid->filter->name));
 		return;
 	}
 	pid = pid->pid;
-	was_blocking = pid->filter->would_block;
 	for (i=0; i<pid->filter->num_output_pids; i++) {
 		GF_FilterPid *apid = gf_list_get(pid->filter->output_pids, i);
 		if (!clear_all && (pid != apid)) continue;
@@ -6222,21 +7323,26 @@
 
 			if (apidi->pid->filter->would_block && apidi->pid->filter->num_input_pids) {
 				u32 k;
+				gf_mx_p(apidi->pid->filter->tasks_mx);
 				for (k=0; k<apidi->pid->filter->num_input_pids; k++) {
 					GF_FilterPidInst *source_pid_inst = gf_list_get(apidi->pid->filter->input_pids, k);
 					gf_filter_pid_clear_eos((GF_FilterPid *) source_pid_inst, clear_all);
 				}
+				gf_mx_v(apidi->pid->filter->tasks_mx);
 			}
 		}
 	}
-	if (!clear_all || (was_blocking == pid->filter->would_block)) return;
 
-	//unblock parent
-	for (i=0; i<pid->filter->num_input_pids; i++) {
-		GF_FilterPidInst *apidi = gf_list_get(pid->filter->input_pids, i);
-		gf_filter_pid_clear_eos((GF_FilterPid *) apidi, GF_TRUE);
+	//if filter is blocking we cannot clear EOS down the chain
+	if (clear_all && !pid->filter->would_block) {
+		//block parent
+		gf_mx_p(pid->filter->tasks_mx);
+		for (i=0; i<pid->filter->num_input_pids; i++) {
+			GF_FilterPidInst *apidi = gf_list_get(pid->filter->input_pids, i);
+			gf_filter_pid_clear_eos((GF_FilterPid *) apidi, GF_TRUE);
+		}
+		gf_mx_v(pid->filter->tasks_mx);
 	}
-
 }
 
 GF_EXPORT
@@ -6367,17 +7473,18 @@
 GF_EXPORT
 const GF_PropertyValue *gf_filter_pid_caps_query_str(GF_FilterPid *pid, const char *prop_name)
 {
-	GF_PropertyMap *map = pid->caps_negociate;
+	GF_PropertyMap *map;
 	if (PID_IS_INPUT(pid)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Reconfig caps query on input PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
 		return NULL;
 	}
+	map = pid->caps_negociate;
 	return map ? gf_props_get_property(map, 0, prop_name) : NULL;
 }
 
 
 GF_EXPORT
-GF_Err gf_filter_pid_resolve_file_template(GF_FilterPid *pid, char szTemplate[GF_MAX_PATH], char szFinalName[GF_MAX_PATH], u32 file_idx, const char *file_suffix)
+GF_Err gf_filter_pid_resolve_file_template_ex(GF_FilterPid *pid, char szTemplate[GF_MAX_PATH], char szFinalName[GF_MAX_PATH], u32 file_idx, const char *file_suffix, const char *filename)
 {
 	u32 k;
 	char szFormat[30], szTemplateVal[GF_MAX_PATH], szPropVal[GF_PROP_DUMP_ARG_SIZE];
@@ -6419,7 +7526,7 @@
 		}
 		sep = strchr(name+1, '$');
 		if (!sep) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[Filter] broken file template expecting $KEYWORD$, couln't find second '$'\n", szTemplate));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[Filter] broken file template expecting $KEYWORD$, couldn't find second '$'\n", szTemplate));
 			strcpy(szFinalName, szTemplate);
 			return GF_BAD_PARAM;
 		}
@@ -6441,33 +7548,54 @@
 			value = file_idx;
 			has_val = GF_TRUE;
 		} else if (!strcmp(name, "URL")) {
-			prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_URL);
+			if (!filename)
+				prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_URL);
 			is_file_str = GF_TRUE;
 		} else if (!strcmp(name, "File")) {
-			prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_FILEPATH);
-			if (!prop_val) prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_URL);
+			if (!filename) {
+				prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_FILEPATH);
+				//if filepath is a gmem:// wrapped, don't use it !
+				if (prop_val && !strncmp(prop_val->value.string, "gmem://", 7))
+					prop_val = NULL;
+
+				if (!prop_val)
+					prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_URL);
+
+				if (!prop_val && pid->pid->name) {
+					prop_val_patched.type = GF_PROP_STRING;
+					prop_val_patched.value.string = pid->pid->name;
+					prop_val = &prop_val_patched;
+				}
+			}
 			is_file_str = GF_TRUE;
 		} else if (!strcmp(name, "PID")) {
 			prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_ID);
 		} else if (!strcmp(name, "FS")) {
 			str_val = file_suffix ? file_suffix : "";
 			is_ok = GF_TRUE;
+		} else if (!strcmp(name, "Type")) {
+			prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_STREAM_TYPE);
+			if (prop_val) {
+				str_val = gf_stream_type_short_name(prop_val->value.uint);
+				is_ok = GF_TRUE;
+			}
+			prop_val = NULL;
 		} else if (!strncmp(name, "p4cc=", 5)) {
 			if (strlen(name) != 9) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[Filter] wrong length in 4CC template, expecting 4cc=ABCD\n", name));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[Filter] wrong length in 4CC template, expecting 4cc=ABCD\n", name));
 				is_ok = GF_FALSE;
 			} else {
 				prop_4cc = GF_4CC(name[5],name[6],name[7],name[8]);
 				prop_val = gf_filter_pid_get_property_first(pid, prop_4cc);
 				if (!prop_val) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[Filter] no pid property of type %s\n", name+5));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[Filter] no pid property of type %s\n", name+5));
 					is_ok = GF_FALSE;
 				}
 			}
 		} else if (!strncmp(name, "pname=", 6)) {
 			prop_val = gf_filter_pid_get_property_str_first(pid, name+6);
 			if (!prop_val) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[Filter] no pid property named %s\n", name+6));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[Filter] no pid property named %s\n", name+6));
 				is_ok = GF_FALSE;
 			}
 		} else if (!strncmp(name, "Number", 6)) {
@@ -6495,7 +7623,7 @@
 				if (!prop_4cc) {
 					prop_val = gf_filter_pid_get_property_str_first(pid, name);
 					if (!prop_val) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[Filter] Unrecognized template %s\n", name));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[Filter] Unrecognized template %s\n", name));
 						is_ok = GF_FALSE;
 					}
 				} else {
@@ -6557,7 +7685,7 @@
 				prop_val = &prop_val_patched;
 				is_ok=GF_TRUE;
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[Filter] property %s not found for pid, cannot resolve template\n", name));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[Filter] property %s not found for pid, cannot resolve template\n", name));
 				return GF_BAD_PARAM;
 			}
 		}
@@ -6571,38 +7699,47 @@
 				value = prop_val->value.uint;
 				has_val = GF_TRUE;
 			} else {
-				str_val = gf_props_dump_val(prop_val, szPropVal, GF_FALSE, NULL);
+				str_val = gf_props_dump_val(prop_val, szPropVal, GF_PROP_DUMP_DATA_NONE, NULL);
 			}
+		} else if (is_file_str) {
+			str_val = filename;
 		}
 		szTemplateVal[0]=0;
 		if (has_val) {
 			sprintf(szTemplateVal, szFormat, value);
 		} else if (str_val) {
 			if (is_file_str) {
-				char *ext;
-				char *sname;
-
 				if (!strncmp(str_val, "gfio://", 7))
 					str_val = gf_fileio_translate_url(str_val);
 
-				sname = strrchr(str_val, '/');
-				if (!sname) sname = strrchr(str_val, '\\');
-				if (!sname) sname = (char *) str_val;
-				else sname++;
-				ext = strrchr(str_val, '.');
-
-				if (ext) {
-					u32 len = (u32) (ext - sname);
-					strncpy(szTemplateVal, sname, ext - sname);
-					szTemplateVal[len] = 0;
+				if (filename) {
+					strcpy(szTemplateVal, filename);
 				} else {
-					strcpy(szTemplateVal, sname);
+					char *ext, *sname;
+					ext = strstr(str_val, "://");
+					sname = strrchr(ext ? ext+4 : str_val, '/');
+					if (!sname) sname = strrchr(ext ? ext+4 : str_val, '\\');
+					if (sname && ext)
+						str_val = sname+1;
+
+					if (!sname) sname = (char *) str_val;
+					else sname++;
+
+					ext = strrchr(str_val, '.');
+
+					if (ext && (ext > sname) ) {
+						u32 len = (u32) (ext - sname);
+						strncpy(szTemplateVal, sname, ext - sname);
+						szTemplateVal[len] = 0;
+					} else {
+						strcpy(szTemplateVal, sname);
+					}
 				}
 			} else {
 				strcpy(szTemplateVal, str_val);
 			}
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[Filter] property %s not found for pid, cannot resolve template\n", name));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[Filter] property %s not found for pid, cannot resolve template\n", name));
 			return GF_BAD_PARAM;
 		}
 		if (k + strlen(szTemplateVal) > GF_MAX_PATH) {
@@ -6621,6 +7758,12 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_filter_pid_resolve_file_template(GF_FilterPid *pid, char szTemplate[GF_MAX_PATH], char szFinalName[GF_MAX_PATH], u32 file_idx, const char *file_suffix)
+{
+	return gf_filter_pid_resolve_file_template_ex(pid, szTemplate, szFinalName, file_idx, file_suffix, NULL);
+}
+
 
 GF_EXPORT
 GF_Err gf_filter_pid_set_discard(GF_FilterPid *pid, Bool discard_on)
@@ -6632,9 +7775,14 @@
 	}
 	if (discard_on) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Discarding packets on PID %s (filter %s to %s)\n", pid->pid->name, pid->pid->filter->name, pid->filter->name));
+		gf_filter_aggregate_packets(pidi);
+		//force discarding
+		u32 pck_discard_bck = pidi->discard_packets;
+		pidi->discard_packets = 0;
 		while (gf_filter_pid_get_packet(pid)) {
 			gf_filter_pid_drop_packet(pid);
 		}
+		pidi->discard_packets = pck_discard_bck;
 		pidi->is_end_of_stream = GF_TRUE;
 	} else {
 		//no more packets in queue or postponed, we can trust the EOS signal on the PID
@@ -6644,7 +7792,7 @@
 		if (!gf_fq_count(pidi->packets) && !pid->pid->filter->postponed_packets)
 			pidi->is_end_of_stream = pid->pid->has_seen_eos;
 	}
-	pidi->discard_inputs = discard_on;
+	pidi->discard_inputs = discard_on ? 1 : 0;
 	return GF_OK;
 }
 
@@ -6691,7 +7839,7 @@
 	res = gf_filter_pid_get_dst_string(pid->filter->session, dst_args, GF_TRUE);
 	if (res) return res;
 
-	//if not set this means we have explicetly loaded the filter
+	//if not set this means we have explicitly loaded the filter
 	for (i=0; i<pid->num_destinations; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
 
@@ -6727,16 +7875,41 @@
 	res = gf_filter_pid_get_dst_string(pid->filter->session, src_args, GF_FALSE);
 	if (res) return res;
 
-	//if not set this means we have explicetly loaded the filter
+	//if not set this means we have explicitly loaded the filter
+	gf_mx_p(pid->filter->tasks_mx);
 	for (i=0; i<pid->filter->num_input_pids; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(pid->filter->input_pids, i);
 
 		src_args = pidi->pid->filter->src_args;
 		if (!src_args) src_args = pidi->pid->filter->dst_args;
 		res = gf_filter_pid_get_dst_string(pid->filter->session, src_args, GF_FALSE);
-		if (res) return res;
+		if (res) {
+			gf_mx_v(pid->filter->tasks_mx);
+			return res;
+		}
+	}
+	gf_mx_v(pid->filter->tasks_mx);
+	return NULL;
+}
+
+GF_FilterPid *gf_filter_pid_first_pid_for_source(GF_FilterPid *pid, GF_Filter *source)
+{
+	u32 i;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to locate PID on output PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return NULL;
+	}
+	pid = pid->pid;
+	for (i=0; i<pid->filter->num_input_pids; i++) {
+		GF_FilterPid *a_pid;
+		GF_FilterPidInst *a_pidi = gf_list_get(pid->filter->input_pids, i);
+		if (gf_filter_in_parent_chain(a_pidi->pid->filter, source))
+			return (GF_FilterPid *) a_pidi;
+		a_pid = gf_filter_pid_first_pid_for_source((GF_FilterPid *) a_pidi, source);
+		if (a_pid) return a_pid;
 	}
 	return NULL;
+
 }
 
 GF_EXPORT
@@ -6823,3 +7996,74 @@
 	if (!pidi->alias_orig) return NULL;
 	return pidi->alias_orig->filter_udta;
 }
+
+GF_EXPORT
+GF_Filter *gf_filter_pid_get_source_filter(GF_FilterPid *pid)
+{
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query source filter on output pid %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return NULL;
+	}
+	return pid->pid->filter;
+}
+
+GF_EXPORT
+GF_Filter *gf_filter_pid_enum_destinations(GF_FilterPid *pid, u32 idx)
+{
+	GF_FilterPidInst *dst_pid;
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query destination filters on input pid %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return NULL;
+	}
+	if (idx>=pid->num_destinations) return NULL;
+	dst_pid = gf_list_get(pid->destinations, idx);
+	return dst_pid->filter;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_ignore_blocking(GF_FilterPid *pid, Bool do_ignore)
+{
+	GF_FilterPidInst *pidi;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set output pid %s in filter %s to ignore block mode not allowed\n", pid->pid->name, pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	pidi = (GF_FilterPidInst *) pid;
+	pidi->pid->ignore_blocking = do_ignore;
+	return GF_OK;
+}
+
+GF_EXPORT
+u64 gf_filter_pid_get_next_ts(GF_FilterPid *pid)
+{
+	if (!pid) return GF_FILTER_NO_TS;
+	u64 dts = pid->pid->last_pck_dts;
+	if (dts == GF_FILTER_NO_TS)
+		dts = pid->pid->last_pck_cts;
+	if (dts == GF_FILTER_NO_TS)
+		return dts;
+	dts += pid->pid->last_pck_dur;
+	return dts;
+}
+
+GF_EXPORT
+u32 gf_filter_pid_get_udta_flags(GF_FilterPid *pid)
+{
+	if (!pid) return 0;
+	if (PID_IS_OUTPUT(pid)) {
+		return pid->udta_flags;
+	}
+	return ((GF_FilterPidInst *)pid)->udta_flags;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_set_udta_flags(GF_FilterPid *pid, u32 flags)
+{
+	if (!pid) return GF_BAD_PARAM;
+	if (PID_IS_OUTPUT(pid)) {
+		pid->udta_flags = flags;
+	} else {
+		((GF_FilterPidInst *)pid)->udta_flags = flags;
+	}
+	return GF_OK;
+}

gpac-1.0.1.tar.gz/src/filter_core/filter_props.c -> gpac-2.0.0.tar.gz/src/filter_core/filter_props.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2019
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / filters sub-project
@@ -27,6 +27,66 @@
 #include <gpac/constants.h>
 //for binxml parsing
 #include <gpac/xml.h>
+//for base64 decode
+#include <gpac/base_coding.h>
+
+typedef u32(*cst_parse_proto)(const char *val);
+typedef const char *(*cst_name_proto)(u32 val);
+
+static struct {
+	u32 type;
+	u32 (*cst_parse)(const char *val);
+	const char *(*cst_name)(u32 val);
+	const char *(*cst_all_names)();
+} EnumProperties[] = {
+	{GF_PROP_PIXFMT, (cst_parse_proto) gf_pixel_fmt_parse, (cst_name_proto) gf_pixel_fmt_name, gf_pixel_fmt_all_names},
+	{GF_PROP_PCMFMT, (cst_parse_proto) gf_audio_fmt_parse, (cst_name_proto) gf_audio_fmt_name, gf_audio_fmt_all_names},
+	{GF_PROP_CICP_COL_PRIM, gf_cicp_parse_color_primaries, gf_cicp_color_primaries_name, gf_cicp_color_primaries_all_names},
+	{GF_PROP_CICP_COL_TFC, gf_cicp_parse_color_transfer, gf_cicp_color_transfer_name, gf_cicp_color_transfer_all_names},
+	{GF_PROP_CICP_COL_MX, gf_cicp_parse_color_matrix, gf_cicp_color_matrix_name, gf_cicp_color_matrix_all_names}
+};
+
+GF_EXPORT
+u32 gf_props_parse_enum(u32 type, const char *value)
+{
+	u32 i, count = GF_ARRAY_LENGTH(EnumProperties);
+	for (i=0; i<count; i++) {
+		if (EnumProperties[i].type==type)
+			return EnumProperties[i].cst_parse(value);
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unrecognized constant type %d\n", type));
+	return 0;
+}
+
+GF_EXPORT
+const char *gf_props_enum_name(u32 type, u32 value)
+{
+	u32 i, count = GF_ARRAY_LENGTH(EnumProperties);
+	for (i=0; i<count; i++) {
+		if (EnumProperties[i].type==type)
+			return EnumProperties[i].cst_name(value);
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unrecognized constant type %d\n", type));
+	return NULL;
+}
+
+GF_EXPORT
+const char *gf_props_enum_all_names(u32 type)
+{
+	u32 i, count = GF_ARRAY_LENGTH(EnumProperties);
+	for (i=0; i<count; i++) {
+		if (EnumProperties[i].type==type)
+			return EnumProperties[i].cst_all_names();
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unrecognized constant type %d\n", type));
+	return NULL;
+}
+GF_EXPORT
+Bool gf_props_type_is_enum(GF_PropType type)
+{
+	if ((type>=GF_PROP_FIRST_ENUM) && (type < GF_PROP_LAST_DEFINED)) return GF_TRUE;
+	return GF_FALSE;
+}
 
 GF_PropertyValue gf_props_parse_value(u32 type, const char *name, const char *value, const char *enum_values, char list_sep_char)
 {
@@ -41,12 +101,23 @@
 	unit_sep = NULL;
 	if (value) {
 		u32 len = (u32) strlen(value);
-		unit_sep = len ? strrchr("kKgGmM", value[len-1]) : NULL;
+		unit_sep = len ? strrchr("kKgGmMsS", value[len-1]) : NULL;
 		if (unit_sep) {
 			u8 unit_char = unit_sep[0];
 			if ((unit_char=='k') || (unit_char=='K')) unit = 1000;
 			else if ((unit_char=='m') || (unit_char=='M')) unit = 1000000;
-			if ((unit_char=='G') || (unit_char=='g')) unit = 1000000000;
+			else if ((unit_char=='G') || (unit_char=='g')) unit = 1000000000;
+			else if ((unit_char=='s') || (unit_char=='S')) unit = 1000;
+		}
+		else if (type==GF_PROP_UINT) {
+			unit_sep = strstr(value, "sec");
+			if (unit_sep && strlen(unit_sep)==3)
+				unit = 1000;
+			else {
+				unit_sep = strstr(value, "min");
+				if (unit_sep && strlen(unit_sep)==3)
+					unit = 60000;
+			}
 		}
 	}
 
@@ -54,7 +125,7 @@
 	case GF_PROP_BOOL:
 		if (!value || !strcmp(value, "yes") || !strcmp(value, "true") || !strcmp(value, "1")) {
 			p.value.boolean = GF_TRUE;
-		} else if ( !strcmp(value, "no") || !strcmp(value, "false") ) {
+		} else if ( !strcmp(value, "no") || !strcmp(value, "false") || !strcmp(value, "0")) {
 			p.value.boolean = GF_FALSE;
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for boolean arg %s - using false\n", value, name));
@@ -72,12 +143,19 @@
 		}
 		break;
 	case GF_PROP_UINT:
-		if (value && !strcmp(value, "+I")) p.value.sint = 0xFFFFFFFF;
-		else if (!value) {
+		if (value && !strcmp(value, "+I")) {
+			p.value.sint = 0xFFFFFFFF;
+			break;
+		}
+
+		if (!value && !enum_values) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for unsigned int arg %s - using 0\n", value, name));
 			p.value.uint = 0;
-		} else if (enum_values && strchr(enum_values, '|')) {
-			u32 a_len = (u32) strlen(value);
+			break;
+		}
+
+		if (enum_values && strchr(enum_values, '|')) {
+			u32 a_len = value ? (u32) strlen(value) : 0;
 			u32 val = 0;
 			char *str_start = (char *) enum_values;
 			while (str_start) {
@@ -88,7 +166,13 @@
 				} else {
 					len = (u32) strlen(str_start);
 				}
-				if ((a_len == len) && !strncmp(str_start, value, len))
+				if (!a_len && len) {
+					char szVal[50];
+					gf_strlcpy(szVal, str_start, MIN(len+1, 50) );
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for unsigned int arg %s enum %s - using `%s`\n", value, name, enum_values, szVal));
+					break;
+				}
+				if ((a_len == len) && value && !strncmp(str_start, value, len))
 					break;
 				if (!sep) {
 					str_start = NULL;
@@ -98,27 +182,45 @@
 				val++;
 			}
 			if (!str_start) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for unsigned int arg %s enum %s - using 0\n", value, name, enum_values));
-				p.value.uint = 0;
+				//special case for enums with default set to -1
+				if (value && !strcmp(value, "-1")) {
+					p.value.uint = (u32) -1;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for unsigned int arg %s enum %s - using 0\n", value, name, enum_values));
+					p.value.uint = 0;
+				}
 			} else {
 				p.value.uint = val;
 			}
-		} else if (!strnicmp(value, "0x", 2)) {
+		} else if (value && !strnicmp(value, "0x", 2)) {
 			if (sscanf(value, "0x%x", &p.value.uint)!=1) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for unsigned int arg %s - using 0\n", value, name));
 			} else if (unit) {
 				p.value.uint *= unit;
 			}
-		} else if (sscanf(value, "%d", &p.value.uint)!=1) {
-			if (strlen(value)==4) {
-				p.value.uint = GF_4CC(value[0],value[1],value[2],value[3]);
-			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for unsigned int arg %s - using 0\n", value, name));
+		} else if (value) {
+			if (sscanf(value, "%d", &p.value.uint)!=1) {
+				if (strlen(value)==4) {
+					p.value.uint = GF_4CC(value[0],value[1],value[2],value[3]);
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for unsigned int arg %s - using 0\n", value, name));
+				}
+			} else if (unit) {
+				p.value.uint *= unit;
 			}
-		} else if (unit) {
-			p.value.uint *= unit;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Missing argument value for unsigned int arg %s - using 0\n", name));
 		}
 		break;
+
+	case GF_PROP_4CC:
+		if (value && (strlen(value)==4) ) {
+			p.value.sint = GF_4CC(value[0], value[1], value[2], value[3]);
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for 4CC arg %s - using 0\n", value, name));
+		}
+		break;
+
 	case GF_PROP_LSINT:
 		if (value && !strcmp(value, "+I")) p.value.longsint = 0x7FFFFFFFFFFFFFFFUL;
 		else if (value && !strcmp(value, "-I")) p.value.longsint = 0x8000000000000000UL;
@@ -139,64 +241,17 @@
 		}
 		break;
 	case GF_PROP_FRACTION:
-		if (!value) {
+		if (gf_parse_frac(value, &p.value.frac)==GF_FALSE) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for fraction arg %s - using 0/1\n", value, name));
 			p.value.frac.num = 0;
 			p.value.frac.den = 1;
-		} else {
-			if (sscanf(value, "%d/%u", &p.value.frac.num, &p.value.frac.den) != 2) {
-				if (sscanf(value, "%d-%u", &p.value.frac.num, &p.value.frac.den) != 2) {
-					u32 ret=0;
-					p.value.frac.den=1;
-					if (strchr(value, '.') || strchr(value, ',')) {
-						Float v;
-						ret = sscanf(value, "%g", &v);
-						if (ret==1) {
-							p.value.frac.num = (u32) (v*1000000);
-							p.value.frac.den = 1000000;
-						} else {
-							ret = 0;
-						}
-					}
-					if (!ret && (sscanf(value, "%d", &p.value.frac.num) != 1)) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for fraction arg %s - using 0/1\n", value, name));
-						p.value.frac.num = 0;
-						p.value.frac.den = 1;
-					}
-				}
-			}
 		}
 		break;
 	case GF_PROP_FRACTION64:
-		if (!value) {
+		if (gf_parse_lfrac(value, &p.value.lfrac)==GF_FALSE) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for fraction arg %s - using 0/1\n", value, name));
-			p.value.frac.num = 0;
-			p.value.frac.den = 1;
-		}
-		else {
-			if (sscanf(value, LLD"/"LLU, &p.value.lfrac.num, &p.value.lfrac.den) != 2) {
-				if (sscanf(value, LLD"-"LLU, &p.value.lfrac.num, &p.value.lfrac.den) != 2) {
-					u32 ret=0;
-					p.value.lfrac.den = 1;
-
-					if (strchr(value, '.') || strchr(value, ',')) {
-						Float v;
-						ret = sscanf(value, "%g", &v);
-						if (ret==1) {
-							p.value.lfrac.num = (u64) (v*1000000);
-							p.value.lfrac.den = 1000000;
-						} else {
-							ret = 0;
-						}
-					}
-
-					if (!ret && (sscanf(value, LLD, &p.value.lfrac.num) != 1)) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for fraction arg %s - using 0/1\n", value, name));
-						p.value.lfrac.num = 0;
-						p.value.lfrac.den = 1;
-					}
-				}
-			}
+			p.value.lfrac.num = 0;
+			p.value.lfrac.den = 1;
 		}
 		break;
 	case GF_PROP_FLOAT:
@@ -244,30 +299,12 @@
 			p.value.vec3i.x = p.value.vec3i.y = p.value.vec3i.z = 0;
 		}
 		break;
-	case GF_PROP_VEC3:
-		if (!value || (sscanf(value, "%lgx%lgx%lg", &p.value.vec3.x, &p.value.vec3.y, &p.value.vec3.z) != 3)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for vec3 arg %s - using {0,0,0}\n", value, name));
-			p.value.vec3.x = p.value.vec3.y = p.value.vec3.z = 0;
-		}
-		break;
 	case GF_PROP_VEC4I:
 		if (!value || (sscanf(value, "%dx%dx%dx%d", &p.value.vec4i.x, &p.value.vec4i.y, &p.value.vec4i.z, &p.value.vec4i.w) != 4)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for vec4i arg %s - using {0,0,0}\n", value, name));
 			p.value.vec4i.x = p.value.vec4i.y = p.value.vec4i.z = p.value.vec4i.w = 0;
 		}
 		break;
-	case GF_PROP_VEC4:
-		if (!value || (sscanf(value, "%lgx%lgx%lgx%lg", &p.value.vec4.x, &p.value.vec4.y, &p.value.vec4.z, &p.value.vec4.w) != 4)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for vec4 arg %s - using {0,0,0}\n", value, name));
-			p.value.vec4.x = p.value.vec4.y = p.value.vec4.z = p.value.vec4.w = 0;
-		}
-		break;
-	case GF_PROP_PIXFMT:
-		p.value.uint = gf_pixel_fmt_parse(value);
-		break;
-	case GF_PROP_PCMFMT:
-		p.value.uint = gf_audio_fmt_parse(value);
-		break;
 	case GF_PROP_NAME:
 	case GF_PROP_STRING:
 	case GF_PROP_STRING_NO_COPY:
@@ -283,6 +320,7 @@
 			}
 		} else if (value && !strnicmp(value, "bxml@", 5) ) {
 			GF_Err e;
+#ifndef GPAC_DISABLE_CORE_TOOLS
 			GF_DOMParser *dom = gf_xml_dom_new();
 			e = gf_xml_dom_parse(dom, value+5, NULL, NULL);
 			if (e) {
@@ -300,6 +338,10 @@
 				}
 			}
 			gf_xml_dom_del(dom);
+#else
+			e = GF_NOT_SUPPORTED;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to binarize XML file %s: %s\n", value+5, gf_error_to_string(e) ));
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
 		} else {
 			p.value.string = value ? gf_strdup(value) : NULL;
 		}
@@ -328,6 +370,7 @@
 			}
 		} else if (!strnicmp(value, "bxml@", 5) ) {
 			GF_Err e;
+#ifndef GPAC_DISABLE_CORE_TOOLS
 			GF_DOMParser *dom = gf_xml_dom_new();
 			e = gf_xml_dom_parse(dom, value+5, NULL, NULL);
 			if (e) {
@@ -343,6 +386,10 @@
 				}
 			}
 			gf_xml_dom_del(dom);
+#else
+			e = GF_NOT_SUPPORTED;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to binarize XML file %s: %s\n", value+5, gf_error_to_string(e) ));
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
 		} else if (!strnicmp(value, "file@", 5) ) {
 			GF_Err e = gf_file_load_data(value+5, (u8 **) &p.value.data.ptr, &p.value.data.size);
 			if (e) {
@@ -350,6 +397,27 @@
 				p.value.data.ptr=NULL;
 				p.value.data.size=0;
 			}
+		} else if (!strnicmp(value, "b64@", 4) ) {
+#ifndef GPAC_DISABLE_CORE_TOOLS
+			u8 *b64 = (u8 *)value + 5;
+			u32 size = (u32) strlen(b64);
+			p.value.data.ptr = gf_malloc(sizeof(char) * size);
+			if (p.value.data.ptr) {
+				p.value.data.size = gf_base64_decode((u8 *)b64, size, p.value.data.ptr, size);
+				if (!p.value.data.size) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to decode base64 value %s\n", value, name));
+					p.type=GF_PROP_FORBIDEN;
+				}
+				p.value.data.ptr[p.value.data.size] = 0;
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate memory for decoding base64 value %s\n", value, name));
+				p.value.data.size = 0;
+				p.type=GF_PROP_FORBIDEN;
+			}
+#else
+			GF_Err e = GF_NOT_SUPPORTED;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to binarize XML file %s: %s\n", value+5, gf_error_to_string(e) ));
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
 		} else {
 			p.value.data.size = (u32) strlen(value);
 			if (p.value.data.size)
@@ -367,7 +435,6 @@
 	case GF_PROP_STRING_LIST:
 	{
 		Bool is_xml = GF_FALSE;
-		p.value.string_list = gf_list_new();
 		char *v = (char *) value;
 		if (v && v[0]=='<') is_xml = GF_TRUE;
 		if (!list_sep_char) list_sep_char = ',';
@@ -403,11 +470,15 @@
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Cannot load data from file %s\n", nv+5));
 				} else {
-					gf_list_add(p.value.string_list, data);
+					p.value.string_list.vals = gf_realloc(p.value.string_list.vals, sizeof(char *) * (p.value.string_list.nb_items+1));
+					p.value.string_list.vals[p.value.string_list.nb_items] = data;
+					p.value.string_list.nb_items++;
 				}
 				gf_free(nv);
 			} else {
-				gf_list_add(p.value.string_list, nv);
+				p.value.string_list.vals = gf_realloc(p.value.string_list.vals, sizeof(char *) * (p.value.string_list.nb_items+1));
+				p.value.string_list.vals[p.value.string_list.nb_items] = nv;
+				p.value.string_list.nb_items++;
 			}
 			if (!sep) break;
 			v = sep+1;
@@ -415,12 +486,15 @@
 	}
 		break;
 	case GF_PROP_UINT_LIST:
+	case GF_PROP_4CC_LIST:
+	case GF_PROP_SINT_LIST:
+	case GF_PROP_VEC2I_LIST:
 	{
 		char *v = (char *) value;
 		if (!list_sep_char) list_sep_char = ',';
 		while (v && v[0]) {
 			char szV[100];
-			u32 val_uint=0, len=0;
+			u32 len=0;
 			char *sep = strchr(v, list_sep_char);
 			if (sep) {
 				len = (u32) (sep - v);
@@ -430,9 +504,36 @@
 			if (len>=99) len=99;
 			strncpy(szV, v, len);
 			szV[len] = 0;
-			sscanf(szV, "%u", &val_uint);
-			p.value.uint_list.vals = gf_realloc(p.value.uint_list.vals, (p.value.uint_list.nb_items+1) * sizeof(u32));
-			p.value.uint_list.vals[p.value.uint_list.nb_items] = val_uint;
+			if (p.type == GF_PROP_UINT_LIST) {
+				u32 val_uint;
+				if (sscanf(szV, "%u", &val_uint) != 1) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for uint arg %s[%d] - using 0\n", value, name, p.value.uint_list.nb_items));
+					val_uint = 0;
+				}
+				p.value.uint_list.vals = gf_realloc(p.value.uint_list.vals, (p.value.uint_list.nb_items+1) * sizeof(u32));
+				p.value.uint_list.vals[p.value.uint_list.nb_items] = val_uint;
+			} else if (p.type == GF_PROP_4CC_LIST) {
+				u32 val_uint = gf_4cc_parse(szV);
+				if (!val_uint) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for 4CC arg %s[%d] - using 0\n", value, name, p.value.uint_list.nb_items));
+					val_uint = 0;
+				}
+				p.value.uint_list.vals = gf_realloc(p.value.uint_list.vals, (p.value.uint_list.nb_items+1) * sizeof(u32));
+				p.value.uint_list.vals[p.value.uint_list.nb_items] = val_uint;
+			} else if (p.type == GF_PROP_SINT_LIST) {
+				s32 val_int;
+				sscanf(szV, "%d", &val_int);
+				p.value.sint_list.vals = gf_realloc(p.value.sint_list.vals, (p.value.sint_list.nb_items+1) * sizeof(u32));
+				p.value.sint_list.vals[p.value.sint_list.nb_items] = val_int;
+			} else {
+				s32 v1=0, v2=0;
+				if (sscanf(szV, "%dx%d", &v1, &v2) != 2) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for vec2i arg %s[%d] - using {0,0}\n", value, name, p.value.v2i_list.nb_items));
+				}
+				p.value.v2i_list.vals = gf_realloc(p.value.v2i_list.vals, (p.value.v2i_list.nb_items+1) * sizeof(GF_PropVec2i));
+				p.value.v2i_list.vals[p.value.v2i_list.nb_items].x = v1;
+				p.value.v2i_list.vals[p.value.v2i_list.nb_items].y = v2;
+			}
 			p.value.uint_list.nb_items++;
 			if (!sep) break;
 			v = sep+1;
@@ -441,6 +542,11 @@
 		break;
 	case GF_PROP_FORBIDEN:
 	default:
+		if (gf_props_type_is_enum(type)) {
+			p.type = type;
+			p.value.uint = gf_props_parse_enum(type, value);
+			break;
+		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Forbidden property type %d for arg %s - ignoring\n", type, name));
 		p.type=GF_PROP_FORBIDEN;
 		break;
@@ -450,21 +556,45 @@
 	return p;
 }
 
-Bool gf_props_equal(const GF_PropertyValue *p1, const GF_PropertyValue *p2)
+u32 gf_props_get_base_type(u32 type)
+{
+	switch (type) {
+	case GF_PROP_STRING:
+	case GF_PROP_NAME:
+	case GF_PROP_STRING_NO_COPY:
+		return GF_PROP_STRING;
+	case GF_PROP_DATA_NO_COPY:
+	case GF_PROP_DATA:
+	case GF_PROP_CONST_DATA:
+		return GF_PROP_DATA;
+	case GF_PROP_UINT:
+	case GF_PROP_4CC:
+		return GF_PROP_UINT;
+	case GF_PROP_4CC_LIST:
+	case GF_PROP_UINT_LIST:
+		return GF_PROP_UINT_LIST;
+	default:
+		//we declare const as UINT in caps
+		if (gf_props_type_is_enum(type))
+			return GF_PROP_UINT;
+		return type;
+	}
+}
+
+Bool gf_props_equal_internal(const GF_PropertyValue *p1, const GF_PropertyValue *p2, Bool strict_compare)
 {
 	if (p1->type!=p2->type) {
-		if ((p1->type == GF_PROP_STRING) && (p2->type == GF_PROP_NAME) ) {
-		} else if ((p2->type == GF_PROP_STRING) && (p1->type == GF_PROP_NAME) ) {
-		} else {
+		u32 p1_base = gf_props_get_base_type(p1->type);
+		u32 p2_base = gf_props_get_base_type(p2->type);
+
+		if (p1_base != p2_base)
 			return GF_FALSE;
-		}
 	}
 
 	switch (p1->type) {
 	case GF_PROP_SINT: return (p1->value.sint==p2->value.sint) ? GF_TRUE : GF_FALSE;
-	case GF_PROP_PIXFMT:
-	case GF_PROP_PCMFMT:
 	case GF_PROP_UINT:
+	case GF_PROP_4CC:
 	 	return (p1->value.uint==p2->value.uint) ? GF_TRUE : GF_FALSE;
 	case GF_PROP_LSINT: return (p1->value.longsint==p2->value.longsint) ? GF_TRUE : GF_FALSE;
 	case GF_PROP_LUINT: return (p1->value.longuint==p2->value.longuint) ? GF_TRUE : GF_FALSE;
@@ -482,20 +612,18 @@
 		return ((p1->value.vec2.x==p2->value.vec2.x) && (p1->value.vec2.y==p2->value.vec2.y)) ? GF_TRUE : GF_FALSE;
 	case GF_PROP_VEC3I:
 		return ((p1->value.vec3i.x==p2->value.vec3i.x) && (p1->value.vec3i.y==p2->value.vec3i.y) && (p1->value.vec3i.z==p2->value.vec3i.z)) ? GF_TRUE : GF_FALSE;
-	case GF_PROP_VEC3:
-		return ((p1->value.vec3.x==p2->value.vec3.x) && (p1->value.vec3.y==p2->value.vec3.y) && (p1->value.vec3.z==p2->value.vec3.z)) ? GF_TRUE : GF_FALSE;
 	case GF_PROP_VEC4I:
 		return ((p1->value.vec4i.x==p2->value.vec4i.x) && (p1->value.vec4i.y==p2->value.vec4i.y) && (p1->value.vec4i.z==p2->value.vec4i.z) && (p1->value.vec4i.w==p2->value.vec4i.w)) ? GF_TRUE : GF_FALSE;
-	case GF_PROP_VEC4:
-		return ((p1->value.vec4.x==p2->value.vec4.x) && (p1->value.vec4.y==p2->value.vec4.y) && (p1->value.vec4.z==p2->value.vec4.z) && (p1->value.vec4.w==p2->value.vec4.w)) ? GF_TRUE : GF_FALSE;
-
 
 	case GF_PROP_STRING:
+	case GF_PROP_STRING_NO_COPY:
 	case GF_PROP_NAME:
 		if (!p1->value.string) return p2->value.string ? GF_FALSE : GF_TRUE;
 		if (!p2->value.string) return GF_FALSE;
-		if (!strcmp(p1->value.string, "*")) return GF_TRUE;
-		if (!strcmp(p2->value.string, "*")) return GF_TRUE;
+		if (!strict_compare) {
+			if (!strcmp(p1->value.string, "*")) return GF_TRUE;
+			if (!strcmp(p2->value.string, "*")) return GF_TRUE;
+		}
 		if (strchr(p2->value.string, '|')) {
 			u32 len = (u32) strlen(p1->value.string);
 			char *cur = p2->value.string;
@@ -524,6 +652,7 @@
 		return !strcmp(p1->value.string, p2->value.string) ? GF_TRUE : GF_FALSE;
 
 	case GF_PROP_DATA:
+	case GF_PROP_DATA_NO_COPY:
 	case GF_PROP_CONST_DATA:
 		if (!p1->value.data.ptr) return p2->value.data.ptr ? GF_FALSE : GF_TRUE;
 		if (!p2->value.data.ptr) return GF_FALSE;
@@ -532,15 +661,15 @@
 
 	case GF_PROP_STRING_LIST:
 	{
-		u32 c1, c2, i, j;
-		c1 = gf_list_count(p1->value.string_list);
-		c2 = gf_list_count(p2->value.string_list);
+		u32 i, j, c1, c2;
+		c1 = p1->value.string_list.nb_items;
+		c2 = p2->value.string_list.nb_items;
 		if (c1 != c2) return GF_FALSE;
 		for (i=0; i<c1; i++) {
 			u32 found = 0;
-			char *s1 = gf_list_get(p1->value.string_list, i);
+			char *s1 = p1->value.string_list.vals[i];
 			for (j=0; j<c2; j++) {
-				char *s2 = gf_list_get(p2->value.string_list, j);
+				char *s2 = p2->value.string_list.vals[j];
 				if (s1 && s2 && !strcmp(s1, s2)) found++;
 			}
 			if (found!=1) return GF_FALSE;
@@ -548,23 +677,43 @@
 		return GF_TRUE;
 	}
 	case GF_PROP_UINT_LIST:
+	case GF_PROP_4CC_LIST:
+	case GF_PROP_SINT_LIST:
+	case GF_PROP_VEC2I_LIST:
 	{
-		u32 i;
+		size_t it_size = sizeof(u32);
+		if (p1->type==GF_PROP_UINT_LIST) it_size = sizeof(u32);
+		else if (p1->type==GF_PROP_4CC_LIST) it_size = sizeof(u32);
+		else if (p1->type==GF_PROP_SINT_LIST) it_size = sizeof(s32);
+		else if (p1->type==GF_PROP_VEC2I_LIST) it_size = sizeof(GF_PropVec2i);
+		//use uint list for checking
 		if (p1->value.uint_list.nb_items != p2->value.uint_list.nb_items) return GF_FALSE;
-		for (i=0; i<p1->value.uint_list.nb_items; i++) {
-			if (p1->value.uint_list.vals[i] != p2->value.uint_list.vals[i]) return GF_FALSE;
-		}
+		if (p1->value.uint_list.nb_items && memcmp(p1->value.uint_list.vals, p2->value.uint_list.vals, it_size * p1->value.uint_list.nb_items))
+			return GF_FALSE;
 		return GF_TRUE;
 	}
 
 	//user-managed pointer
-	case GF_PROP_POINTER: return (p1->value.ptr==p2->value.ptr) ? GF_TRUE : GF_FALSE;
+	case GF_PROP_POINTER:
+		return (p1->value.ptr==p2->value.ptr) ? GF_TRUE : GF_FALSE;
 	default:
+		if (gf_props_type_is_enum(p1->type)) {
+			return (p1->value.uint==p2->value.uint) ? GF_TRUE : GF_FALSE;
+		}
+
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Comparing forbidden property type %d\n", p1->type));
 		break;
 	}
 	return GF_FALSE;
 }
+Bool gf_props_equal(const GF_PropertyValue *p1, const GF_PropertyValue *p2)
+{
+	return gf_props_equal_internal(p1, p2, GF_FALSE);
+}
+Bool gf_props_equal_strict(const GF_PropertyValue *p1, const GF_PropertyValue *p2)
+{
+	return gf_props_equal_internal(p1, p2, GF_TRUE);
+}
 
 #if GF_PROPS_HASHTABLE_SIZE
 GFINLINE u32 gf_props_hash_djb2(u32 p4cc, const char *str)
@@ -618,18 +767,21 @@
 		p->value.data.ptr = NULL;
 		p->value.data.size = 0;
 	}
-	else if (p->type==GF_PROP_UINT_LIST) {
+	//use uint_list as base type for list
+	else if ((p->type==GF_PROP_UINT_LIST) || (p->type==GF_PROP_4CC_LIST) || (p->type==GF_PROP_SINT_LIST) || (p->type==GF_PROP_VEC2I_LIST)) {
 		gf_free(p->value.uint_list.vals);
 		p->value.uint_list.vals = NULL;
 		p->value.uint_list.nb_items = 0;
 	}
 	else if (p->type==GF_PROP_STRING_LIST) {
-		while (gf_list_count(p->value.string_list)) {
-			char *str = gf_list_pop_back(p->value.string_list);
+		u32 i;
+		for (i=0; i<p->value.string_list.nb_items; i++) {
+			char *str = p->value.string_list.vals[i];
 			gf_free(str);
 		}
-		gf_list_del(p->value.string_list);
-		p->value.string_list = NULL;
+		gf_free(p->value.string_list.vals);
+		p->value.string_list.vals = NULL;
+		p->value.string_list.nb_items = 0;
 	}
 }
 void gf_props_del_property(GF_PropertyEntry *it)
@@ -651,16 +803,17 @@
 		}
 		//string list are destroyed
 		else if (it->prop.type==GF_PROP_STRING_LIST) {
-			GF_List *l = it->prop.value.string_list;
-			it->prop.value.string_list = NULL;
-			while (gf_list_count(l)) {
-				char *s = gf_list_pop_back(l);
+			u32 i;
+			for (i=0; i<it->prop.value.string_list.nb_items; i++) {
+				char *s = it->prop.value.string_list.vals[i];
 				gf_free(s);
 			}
-			gf_list_del(l);
+			gf_free(it->prop.value.string_list.vals);
+			it->prop.value.string_list.vals = NULL;
+			it->prop.value.string_list.nb_items = 0;
 		}
-		//string list are destroyed
-		else if (it->prop.type==GF_PROP_UINT_LIST) {
+		//use uint_list as base type for list
+		else if ((it->prop.type==GF_PROP_UINT_LIST) || (it->prop.type==GF_PROP_4CC_LIST) || (it->prop.type==GF_PROP_SINT_LIST) || (it->prop.type==GF_PROP_VEC2I_LIST)) {
 			if (it->prop.value.uint_list.vals)
 				gf_free(it->prop.value.uint_list.vals);
 			it->prop.value.uint_list.nb_items = 0;
@@ -729,6 +882,7 @@
 
 	gf_props_reset(map);
 	map->reference_count = 0;
+	map->timescale = 0;
 	if (map->session->prop_maps_reservoir) {
 		gf_fq_add(map->session->prop_maps_reservoir, map);
 	} else {
@@ -812,9 +966,16 @@
 		prop->alloc_size = value->value.data.size;
 		assert(prop->alloc_size);
 	}
-	else if (prop->prop.type == GF_PROP_UINT_LIST) {
-		prop->prop.value.uint_list.vals = gf_malloc(sizeof(u32) * value->value.uint_list.nb_items);
-		memcpy(prop->prop.value.uint_list.vals, value->value.uint_list.vals, sizeof(u32) * value->value.uint_list.nb_items);
+	//use uint_list as base type for list
+	else if ((prop->prop.type == GF_PROP_UINT_LIST) || (prop->prop.type == GF_PROP_4CC_LIST) || (prop->prop.type == GF_PROP_SINT_LIST) || (prop->prop.type == GF_PROP_VEC2I_LIST)) {
+		size_t it_size = sizeof(u32);
+		if (prop->prop.type == GF_PROP_UINT_LIST) it_size = sizeof(u32);
+		else if (prop->prop.type == GF_PROP_4CC_LIST) it_size = sizeof(u32);
+		else if (prop->prop.type == GF_PROP_SINT_LIST) it_size = sizeof(s32);
+		else if (prop->prop.type == GF_PROP_VEC2I_LIST) it_size = sizeof(GF_PropVec2i);
+		prop->prop.value.uint_list.vals = gf_malloc(it_size * value->value.uint_list.nb_items);
+		if (value->value.uint_list.nb_items)
+			memcpy(prop->prop.value.uint_list.vals, value->value.uint_list.vals, it_size * value->value.uint_list.nb_items);
 		prop->prop.value.uint_list.nb_items = value->value.uint_list.nb_items;
 	}
 }
@@ -893,7 +1054,7 @@
 
 const GF_PropertyEntry *gf_props_get_property_entry(GF_PropertyMap *map, u32 prop_4cc, const char *name)
 {
-	u32 i, count;
+	u32 i, count, len;
 	const GF_PropertyEntry *res=NULL;
 #if GF_PROPS_HASHTABLE_SIZE
 	u32 hash = gf_props_hash_djb2(prop_4cc, name);
@@ -910,6 +1071,12 @@
 	}
 #else
 	count = gf_list_count(map->properties);
+	if (name) {
+		len = (u32) strlen(name);
+	} else {
+		if (!prop_4cc) return NULL;
+		len = 0;
+	}
 	for (i=0; i<count; i++) {
 		GF_PropertyEntry *p = gf_list_get(map->properties, i);
 		if (!p) {
@@ -917,9 +1084,24 @@
 			return NULL;
 		}
 
-		if ((prop_4cc && (p->p4cc==prop_4cc)) || (p->pname && name && !strcmp(p->pname, name)) ) {
-			res = p;
-			break;
+		if (prop_4cc) {
+			if (p->p4cc==prop_4cc) {
+				res = p;
+				break;
+			}
+		} else if (p->pname) {
+			u32 j;
+			for (j=0; j<=len; j++) {
+				char c = p->pname[j];
+				if (!c)
+					break;
+				if (c != name[j])
+					break;
+			}
+			if (j==len) {
+				res = p;
+				break;
+			}
 		}
 	}
 #endif
@@ -1042,6 +1224,7 @@
 {
 	{GF_PROP_SINT, "sint", "signed 32 bit integer"},
 	{GF_PROP_UINT, "uint", "unsigned 32 bit integer"},
+	{GF_PROP_4CC, "4cc", "Four character code"},
 	{GF_PROP_LSINT, "lsint", "signed 64 bit integer"},
 	{GF_PROP_LUINT, "luint", "unsigned 32 bit integer"},
 	{GF_PROP_FRACTION, "frac", "32/32 bit fraction"},
@@ -1057,15 +1240,19 @@
 	{GF_PROP_CONST_DATA, "cmem", "const data buffer"},
 	{GF_PROP_POINTER, "ptr", "32 or 64 bit pointer"},
 	{GF_PROP_VEC2I, "v2di", "2D 32-bit integer vector"},
-	{GF_PROP_VEC2, "v2df", "2D 32-bit float vector"},
+	{GF_PROP_VEC2, "v2d", "2D 64-bit float vector"},
 	{GF_PROP_VEC3I, "v3di", "3D 32-bit integer vector"},
-	{GF_PROP_VEC3, "v3df", "3D 32-bit float vector"},
 	{GF_PROP_VEC4I, "v4di", "4D 32-bit integer vector"},
-	{GF_PROP_VEC4, "v4df", "4D 32-bit float vector"},
+	{GF_PROP_STRING_LIST, "strl", "UTF-8 string list"},
+	{GF_PROP_UINT_LIST, "uintl", "unsigned 32 bit integer list"},
+	{GF_PROP_4CC_LIST, "4ccl", "four-character codes list"},
+	{GF_PROP_SINT_LIST, "sintl", "signed 32 bit integer list"},
+	{GF_PROP_VEC2I_LIST, "v2il", "2D 32-bit integer vector list"},
 	{GF_PROP_PIXFMT, "pfmt", "raw pixel format"},
 	{GF_PROP_PCMFMT, "afmt", "raw audio format"},
-	{GF_PROP_STRING_LIST, "strl", "UTF-8 string list"},
-	{GF_PROP_UINT_LIST, "uintl", "unsigned 32 bit integer list"}
+	{GF_PROP_CICP_COL_PRIM, "cprm", "color primaries, string or int value from ISO/IEC 23091-2"},
+	{GF_PROP_CICP_COL_TFC, "ctfc", "color transfer characteristics, string or int value from ISO/IEC 23091-2"},
+	{GF_PROP_CICP_COL_MX, "cmxc", "color matrix coefficients, string or int value from ISO/IEC 23091-2"}
 };
 
 GF_EXPORT
@@ -1104,35 +1291,37 @@
 GF_BuiltInProperty GF_BuiltInProps [] =
 {
 	{ GF_PROP_PID_ID, "ID", "Stream ID", GF_PROP_UINT},
-	{ GF_PROP_PID_ESID, "ESID", "MPEG-4 ESID of pid", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ESID, "ESID", "MPEG-4 ESID of PID", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_ITEM_ID, "ItemID", "ID of image item in HEIF, same value as ID", GF_PROP_UINT},
 	{ GF_PROP_PID_ITEM_NUM, "ItemNumber", "Number (1-based) of image item in HEIF, in order of declaration in file", GF_PROP_UINT},
 	{ GF_PROP_PID_TRACK_NUM, "TrackNumber", "Number (1-based) of track in order of declaration in file", GF_PROP_UINT},
 	{ GF_PROP_PID_SERVICE_ID, "ServiceID", "ID of parent service", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CLOCK_ID, "ClockID", "ID of clock reference pid", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DEPENDENCY_ID, "DependencyID", "ID of layer dependended on", GF_PROP_UINT},
-	{ GF_PROP_PID_SUBLAYER, "SubLayer", "pid is a sublayer of the stream depended on rather than an enhancement layer", GF_PROP_BOOL},
+	{ GF_PROP_PID_CLOCK_ID, "ClockID", "ID of clock reference PID", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DEPENDENCY_ID, "DependencyID", "ID of layer depended on", GF_PROP_UINT},
+	{ GF_PROP_PID_SUBLAYER, "SubLayer", "PID is a sublayer of the stream depended on rather than an enhancement layer", GF_PROP_BOOL},
 	{ GF_PROP_PID_PLAYBACK_MODE, "PlaybackMode", "Playback mode supported:\n- 0: no time control\n- 1: play/pause/seek,speed=1\n- 2: play/pause/seek,speed>=0\n- 3: play/pause/seek, reverse playback", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_SCALABLE, "Scalable", "Scalable stream", GF_PROP_BOOL},
 	{ GF_PROP_PID_TILE_BASE, "TileBase", "Tile base stream", GF_PROP_BOOL},
+	{ GF_PROP_PID_TILE_ID, "TileID", "ID of the tile for hvt1/hvt2 PIDs", GF_PROP_UINT},
 	{ GF_PROP_PID_LANGUAGE, "Language", "Language code: ISO639 2/3 character code or RFC 4646", GF_PROP_NAME},
 	{ GF_PROP_PID_SERVICE_NAME, "ServiceName", "Name of parent service", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_SERVICE_PROVIDER, "ServiceProvider", "Provider of parent service", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_STREAM_TYPE, "StreamType", "Media stream type", GF_PROP_UINT},
-	{ GF_PROP_PID_SUBTYPE, "StreamSubtype", "Media subtype 4CC (auxiliary, pic sequence, etc ..)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_SUBTYPE, "ISOMSubtype", "ISOM media subtype 4CC (avc1 avc2...)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_SUBTYPE, "StreamSubtype", "Media subtype 4CC (auxiliary, pic sequence, etc ..), matches ISOM handler type", GF_PROP_4CC, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ISOM_SUBTYPE, "ISOMSubtype", "ISOM media subtype 4CC (avc1 avc2...)", GF_PROP_4CC, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_ORIG_STREAM_TYPE, "OrigStreamType", "Original stream type before encryption", GF_PROP_UINT},
 	{ GF_PROP_PID_CODECID, "CodecID", "Codec ID (MPEG-4 OTI or ISOBMFF 4CC)", GF_PROP_UINT},
-	{ GF_PROP_PID_IN_IOD, "InitialObjectDescriptor", "Indicates if pid is declared in the IOD for MPEG-4", GF_PROP_BOOL},
-	{ GF_PROP_PID_UNFRAMED, "Unframed", "Indicates that the media data is not framed, i.e. each packet is not a complete AU/frame or is not in internal format (eg annexB for avc/hevc, adts for aac)", GF_PROP_BOOL},
-	{ GF_PROP_PID_UNFRAMED_FULL_AU, "UnframedAU", "Indicates that the unframed media still has correct AU boundaries: one packet is one full AU, but the packet format might not be the internal one (eg annexB for avc/hevc, adts for aac)", GF_PROP_BOOL},
-	{ GF_PROP_PID_UNFRAMED_LATM, "LATM", "Indicates media is unframed AAC in LATM format", GF_PROP_BOOL},
+	{ GF_PROP_PID_IN_IOD, "InitialObjectDescriptor", "PID is declared in the IOD for MPEG-4", GF_PROP_BOOL},
+	{ GF_PROP_PID_UNFRAMED, "Unframed", "The media data is not framed, i.e. each packet is not a complete AU/frame or is not in internal format (e.g. annexB for avc/hevc, adts for aac)", GF_PROP_BOOL},
+	{ GF_PROP_PID_UNFRAMED_FULL_AU, "UnframedAU", "The unframed media still has correct AU boundaries: one packet is one full AU, but the packet format might not be the internal one (e.g. annexB for avc/hevc, adts for aac)", GF_PROP_BOOL},
+	{ GF_PROP_PID_UNFRAMED_LATM, "LATM", "Media is unframed AAC in LATM format", GF_PROP_BOOL},
 	{ GF_PROP_PID_DURATION, "Duration", "Media duration", GF_PROP_FRACTION64},
 	{ GF_PROP_PID_NB_FRAMES, "NumFrames", "Number of frames in the stream", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_FRAME_OFFSET, "FrameOffset", "Index of first frame in the stream (used for reporting)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_FRAME_SIZE, "ConstantFrameSize", "Size of the frames for constant frame size streams", GF_PROP_UINT},
 	{ GF_PROP_PID_TIMESHIFT_DEPTH, "TimeshiftDepth", "Depth of the timeshift buffer", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_TIMESHIFT_TIME, "TimeshiftTime", "Time in the timeshift buffer in seconds - changes are signaled through pid info (no reconfigure)", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_TIMESHIFT_STATE, "TimeshiftState", "State of timeshift buffer: 0 is OK, 1 is underflow, 2 is overflow - changes are signaled through pid info (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_TIMESHIFT_TIME, "TimeshiftTime", "Time in the timeshift buffer in seconds - changes are signaled through PID info (no reconfigure)", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_TIMESHIFT_STATE, "TimeshiftState", "State of timeshift buffer: 0 is OK, 1 is underflow, 2 is overflow - changes are signaled through PID info (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_TIMESCALE, "Timescale", "Media timescale (a timestamp delta of N is N/timescale seconds)", GF_PROP_UINT},
 	{ GF_PROP_PID_PROFILE_LEVEL, "ProfileLevel", "MPEG-4 profile and level", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_DECODER_CONFIG, "DecoderConfig", "Decoder configuration data", GF_PROP_DATA},
@@ -1145,8 +1334,9 @@
 	{ GF_PROP_PID_CHANNEL_LAYOUT, "ChannelLayout", "Channel Layout mask", GF_PROP_LUINT},
 	{ GF_PROP_PID_AUDIO_FORMAT, "AudioFormat", "Audio sample format", GF_PROP_PCMFMT},
 	{ GF_PROP_PID_AUDIO_SPEED, "AudioPlaybackSpeed", "Audio playback speed, only used for audio output reconfiguration", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DELAY, "Delay", "Delay of presentation compared to composition timestamps, in media timescale. Positive value imply holding (delaying) the stream. Negative value imply skipping the beginning of stream", GF_PROP_SINT},
+	{ GF_PROP_PID_DELAY, "Delay", "Delay of presentation compared to composition timestamps, in media timescale. Positive value imply holding (delaying) the stream. Negative value imply skipping the beginning of stream", GF_PROP_LSINT},
 	{ GF_PROP_PID_CTS_SHIFT, "CTSShift", "CTS offset to apply in case of negative ctts", GF_PROP_UINT},
+	{ GF_PROP_PID_NO_PRIMING, "SkipPriming", "Audio priming shall not to be removed when initializing decoding", GF_PROP_BOOL},
 	{ GF_PROP_PID_WIDTH, "Width", "Visual Width (video / text / graphics)", GF_PROP_UINT},
 	{ GF_PROP_PID_HEIGHT, "Height", "Visual Height (video / text / graphics)", GF_PROP_UINT},
 	{ GF_PROP_PID_PIXFMT, "PixelFormat", "Pixel format", GF_PROP_PIXFMT},
@@ -1157,14 +1347,14 @@
 	{ GF_PROP_PID_BIT_DEPTH_UV, "BitDepthChroma", "Bit depth for chroma components", GF_PROP_UINT},
 	{ GF_PROP_PID_FPS, "FPS", "Video framerate", GF_PROP_FRACTION},
 	{ GF_PROP_PID_INTERLACED, "Interlaced", "Video is interlaced", GF_PROP_BOOL},
-	{ GF_PROP_PID_SAR, "SAR", "Sample (ie pixel) aspect ratio", GF_PROP_FRACTION},
+	{ GF_PROP_PID_SAR, "SAR", "Sample (i.e. pixel) aspect ratio", GF_PROP_FRACTION},
 	{ GF_PROP_PID_PAR, "PAR", "Picture aspect ratio", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_WIDTH_MAX, "MaxWidth", "Maximum width (video / text / graphics) of all enhancement layers", GF_PROP_UINT},
 	{ GF_PROP_PID_HEIGHT_MAX, "MaxHeight", "Maximum height (video / text / graphics) of all enhancement layers", GF_PROP_UINT},
-	{ GF_PROP_PID_ZORDER, "ZOrder", "Z-order of the video, from 0 (first) to max int (last)", GF_PROP_UINT},
+	{ GF_PROP_PID_ZORDER, "ZOrder", "Z-order of the video, from 0 (first) to max int (last)", GF_PROP_SINT},
 	{ GF_PROP_PID_TRANS_X, "TransX", "Horizontal translation of the video", GF_PROP_SINT},
 	{ GF_PROP_PID_TRANS_Y, "TransY", "Vertical translation of the video", GF_PROP_SINT},
-	{ GF_PROP_PID_HIDDEN, "Hidden", "Indicates the PID is hidden in visual/audio rendering", GF_PROP_BOOL},
+	{ GF_PROP_PID_HIDDEN, "Hidden", "PID is hidden in visual/audio rendering", GF_PROP_BOOL},
 
 	{ GF_PROP_PID_CROP_POS, "CropOrigin", "Position in source window, X,Y indicates coord in source", GF_PROP_VEC2I},
 	{ GF_PROP_PID_ORIG_SIZE, "OriginalSize", "Original resolution of video", GF_PROP_VEC2I},
@@ -1174,9 +1364,17 @@
 	"- Ox,Oy,Ow,Oh: position and size of the input video (usually matching its `SRD` property), expressed in the output referential given by `SRDRef`\n"
 	"- Dx,Dy,Dw,Dh: Position and Size of the input video in the reconstructed output, expressed in the output referential given by `SRDRef`", GF_PROP_UINT_LIST},
 
-	{ GF_PROP_PID_ALPHA, "Alpha", "Indicates the video in this pid is an alpha map", GF_PROP_BOOL},
+	{ GF_PROP_PID_ALPHA, "Alpha", "Video in this PID is an alpha map", GF_PROP_BOOL},
+	{ GF_PROP_PID_MIRROR, "Mirror", "Mirror mode (0: no mirror, 1: along Y-axis, 2: along X-axis)", GF_PROP_UINT},
+	{ GF_PROP_PID_ROTATE, "Rotate", "Video rotation as value*90 degree anti-clockwise", GF_PROP_UINT},
+	{ GF_PROP_PID_CLAP_W, "ClapW", "Width of clean aperture in luma pixels", GF_PROP_FRACTION},
+	{ GF_PROP_PID_CLAP_H, "ClapH", "Height of clean aperture in luma pixels", GF_PROP_FRACTION},
+	{ GF_PROP_PID_CLAP_X, "ClapX", "Horizontal offset of clean aperture center in luma pixels, 0 at image center", GF_PROP_FRACTION},
+	{ GF_PROP_PID_CLAP_Y, "ClapY", "Vertical offset of clean aperture center in luma pixels, 0 at image center", GF_PROP_FRACTION},
+	{ GF_PROP_PID_NUM_VIEWS, "NumViews", "Number of views packed in a frame (top-to-bottom only)", GF_PROP_UINT},
 	{ GF_PROP_PID_BITRATE, "Bitrate", "Bitrate in bps", GF_PROP_UINT},
 	{ GF_PROP_PID_MAXRATE, "Maxrate", "Max bitrate in bps", GF_PROP_UINT},
+	{ GF_PROP_PID_TARGET_RATE, "TargetRate", "Target bitrate in bps, used to setup encoders", GF_PROP_UINT},
 	{ GF_PROP_PID_DBSIZE, "DBSize", "Decode buffer size in bytes", GF_PROP_UINT},
 	{ GF_PROP_PID_MEDIA_DATA_SIZE, "MediaDataSize", "Size in bytes of media data", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_CAN_DATAREF, "DataRef", "Data referencing is possible (each compressed frame is a continuous set of bytes in source, with no transformation)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
@@ -1186,17 +1384,16 @@
 	{ GF_PROP_PID_FILEPATH, "SourcePath", "Path of source file on file system", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_MIME, "MIMEType", "MIME type of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_FILE_EXT, "Extension", "File extension of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_FILE_CACHED, "Cached", "indicates the file is completely cached", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DOWN_RATE, "DownloadRate", "Dowload rate of resource in bits per second - changes are signaled through pid info (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_FILE_CACHED, "Cached", "File is completely cached", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DOWN_RATE, "DownloadRate", "Download rate of resource in bits per second - changes are signaled through PID info (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_DOWN_SIZE, "DownloadSize", "Size of resource in bytes", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DOWN_BYTES, "DownBytes", "Number of bytes downloaded - changes are signaled through pid info (no reconfigure)", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DOWN_BYTES, "DownBytes", "Number of bytes downloaded - changes are signaled through PID info (no reconfigure)", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_FILE_RANGE, "ByteRange", "Byte range of resource", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DISABLE_PROGRESSIVE, "DisableProgressive", "indicates that some blocks in file need patching (replace or insertion) upon closing, potentially disabling progressive upload", GF_PROP_UINT, 0},
-	{ GF_PROP_PID_ISOM_BRANDS, "IsoAltBrands", "indicates ISOBMFF brands associated with PID/file", GF_PROP_UINT_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_MBRAND, "IsoBrand", "indicates ISOBMFF major brand associated with PID/file", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_MOVIE_TIME, "MovieTime", "indicates ISOBMFF movie header duration and timescale", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_HAS_SYNC, "HasSync", "indicates ISOBMFF track has sync points", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-
+	{ GF_PROP_PID_DISABLE_PROGRESSIVE, "DisableProgressive", "Some blocks in file need patching (replace or insertion) upon closing, potentially disabling progressive upload", GF_PROP_UINT, 0},
+	{ GF_PROP_PID_ISOM_BRANDS, "IsoAltBrands", "ISOBMFF brands associated with PID/file", GF_PROP_4CC_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ISOM_MBRAND, "IsoBrand", "ISOBMFF major brand associated with PID/file", GF_PROP_4CC, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ISOM_MOVIE_TIME, "MovieTime", "ISOBMFF movie header duration and timescale", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_HAS_SYNC, "HasSync", "PID has sync points", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_SERVICE_WIDTH, "ServiceWidth", "Display width of service", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_SERVICE_HEIGHT, "ServiceHeight", "Display height of service", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_CAROUSEL_RATE, "CarouselRate", "Repeat rate in ms for systems carousel data", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
@@ -1205,119 +1402,180 @@
 	{ GF_PROP_PID_AUDIO_VOLUME, "AudioVolume", "Volume of audio", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_AUDIO_PAN, "AudioPan", "Balance/Pan of audio", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_AUDIO_PRIORITY, "AudioPriority", "Audio thread priority", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PROTECTION_SCHEME_TYPE, "ProtectionScheme", "Protection scheme type (4CC) used", GF_PROP_UINT},
+	{ GF_PROP_PID_PROTECTION_SCHEME_TYPE, "ProtectionScheme", "Protection scheme type (4CC) used", GF_PROP_4CC},
 	{ GF_PROP_PID_PROTECTION_SCHEME_VERSION, "SchemeVersion", "Protection scheme version used", GF_PROP_UINT},
 	{ GF_PROP_PID_PROTECTION_SCHEME_URI, "SchemeURI", "Protection scheme URI", GF_PROP_STRING},
 	{ GF_PROP_PID_PROTECTION_KMS_URI, "KMS_URI", "URI for key management system", GF_PROP_STRING},
-	{ GF_PROP_PID_ISMA_SELECTIVE_ENC, "SelectiveEncryption", "Indicates if ISMA/OMA selective encryption is used", GF_PROP_BOOL},
+	{ GF_PROP_PID_ISMA_SELECTIVE_ENC, "SelectiveEncryption", "ISMA/OMA selective encryption is used", GF_PROP_BOOL},
 	{ GF_PROP_PID_ISMA_IV_LENGTH, "IVLength", "ISMA IV size", GF_PROP_UINT},
 	{ GF_PROP_PID_ISMA_KI_LENGTH, "KILength", "ISMA KeyIndication size", GF_PROP_UINT},
 	{ GF_PROP_PID_OMA_CRYPT_TYPE, "CryptType", "OMA encryption type", GF_PROP_UINT},
 	{ GF_PROP_PID_OMA_CID, "ContentID", "OMA Content ID", GF_PROP_STRING},
 	{ GF_PROP_PID_OMA_TXT_HDR, "TextualHeaders", "OMA textual headers", GF_PROP_STRING},
 	{ GF_PROP_PID_OMA_CLEAR_LEN, "PlaintextLen", "OMA size of plaintext data", GF_PROP_LUINT},
-	{ GF_PROP_PID_CRYPT_INFO, "CryptInfo", "URL (local file only) of crypt info file for this pid", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DECRYPT_INFO, "DecryptInfo", "URL (local file only) of crypt info file for this pid - see decrypter help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_CRYPT_INFO, "CryptInfo", "URL (local file only) of crypt info file for this PID, use `clear` to force passthrough", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DECRYPT_INFO, "DecryptInfo", "URL (local file only) of crypt info file for this PID - see decrypter help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PCK_SENDER_NTP, "SenderNTP", "NTP time at sender side or grabber side", GF_PROP_LUINT, GF_PROP_FLAG_PCK | GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PCK_RECEIVER_NTP, "ReceiverNTP", "Receiver NTP time (usually associated with the sender NTP property)", GF_PROP_LUINT, GF_PROP_FLAG_PCK | GF_PROP_FLAG_GSF_REM},
 
-	{ GF_PROP_PID_ENCRYPTED, "Encrypted", "Packets for the stream are by default encrypted (however the encryption state is carried in packet crypt flags) - changes are signaled through pid_set_info (no reconfigure)", GF_PROP_BOOL},
+	{ GF_PROP_PID_ENCRYPTED, "Encrypted", "Packets for the stream are by default encrypted (however the encryption state is carried in packet crypt flags) - changes are signaled through PID info change (no reconfigure)", GF_PROP_BOOL},
 	{ GF_PROP_PID_OMA_PREVIEW_RANGE, "OMAPreview", "OMA Preview range ", GF_PROP_LUINT},
 	{ GF_PROP_PID_CENC_PSSH, "CENC_PSSH", "PSSH blob for CENC, formatted as (u32)NbSystems [ (bin128)SystemID(u32)version(u32)KID_count[ (bin128)keyID ] (u32)priv_size(char*priv_size)priv_data]", GF_PROP_DATA},
-	{ GF_PROP_PCK_CENC_SAI, "CENC_SAI", "CENC SAI for the packet, formated as (char(IV_Size))IV(u16)NbSubSamples [(u16)ClearBytes(u32)CryptedBytes]", GF_PROP_DATA, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PID_KID, "KID", "Key ID for packets of the PID - changes are signaled through pid_set_info (no reconfigure)", GF_PROP_DATA},
-	{ GF_PROP_PID_CENC_IV_SIZE, "IVSize", "IV size for packets of the PID", GF_PROP_UINT},
-	{ GF_PROP_PID_CENC_IV_CONST, "ConstantIV", "Constant IV for packets of the PID", GF_PROP_DATA},
+	{ GF_PROP_PCK_CENC_SAI, "CENC_SAI", "CENC SAI for the packet, formatted as (char(IV_Size))IV(u16)NbSubSamples [(u16)ClearBytes(u32)CryptedBytes]", GF_PROP_DATA, GF_PROP_FLAG_PCK},
+	{ GF_PROP_PID_CENC_KEY_INFO, "KeyInfo", "Multi key info formatted as:\n `is_mkey(u8);\nnb_keys(u16);\n[\n\tIV_size(u8);\n\tKID(bin128);\n\tif (!IV_size) {;\n\t\tconst_IV_size(u8);\n\t\tconstIV(const_IV_size);\n}\n]\n`", GF_PROP_DATA},
 	{ GF_PROP_PID_CENC_PATTERN, "CENCPattern", "CENC crypt pattern, CENC pattern, skip as frac.num crypt as frac.den", GF_PROP_FRACTION},
-	{ GF_PROP_PID_CENC_STORE, "CENCStore", "Storage location 4CC of SAI data", GF_PROP_UINT},
+	{ GF_PROP_PID_CENC_STORE, "CENCStore", "Storage location 4CC of SAI data", GF_PROP_4CC},
 	{ GF_PROP_PID_CENC_STSD_MODE, "CENCstsdMode", "Mode for CENC sample description when using clear samples:\n"
 	"- 0: single sample description is used\n"
 	"- 1: a clear clone of the sample description is created, inserted before the CENC sample description\n"
 	"- 2: a clear clone of the sample description is created, inserted after the CENC sample description", GF_PROP_UINT},
 	{ GF_PROP_PID_AMR_MODE_SET, "AMRModeSet", "ModeSet for AMR and AMR-WideBand", GF_PROP_UINT},
 	{ GF_PROP_PCK_SUBS, "SubSampleInfo", "Binary blob describing N subsamples of the sample, formatted as N [(u32)flags(u32)size(u32)codec_param(u8)priority(u8) discardable]. Subsamples for a given flag MUST appear in order, however flags can be interleaved", GF_PROP_DATA},
-	{ GF_PROP_PID_MAX_NALU_SIZE, "NALUMaxSize", "Max size of NAL units in stream - changes are signaled through pid_set_info (no reconfigure)", GF_PROP_UINT},
+	{ GF_PROP_PID_MAX_NALU_SIZE, "NALUMaxSize", "Max size of NAL units in stream - changes are signaled through PID info change (no reconfigure)", GF_PROP_UINT},
 	{ GF_PROP_PCK_FILENUM, "FileNumber", "Index of file when dumping to files", GF_PROP_UINT, GF_PROP_FLAG_PCK},
 	{ GF_PROP_PCK_FILENAME, "FileName", "Name of output file when dumping / dashing. Must be set on first packet belonging to new file", GF_PROP_STRING, GF_PROP_FLAG_PCK},
 	{ GF_PROP_PCK_IDXFILENAME, "IDXName", "Name of index file when dashing MPEG-2 TS. Must be set on first packet belonging to new file", GF_PROP_STRING, GF_PROP_FLAG_PCK},
 	{ GF_PROP_PCK_FILESUF, "FileSuffix", "File suffix name, replacement for $FS$ in tile templates", GF_PROP_STRING, GF_PROP_FLAG_PCK},
-
 	{ GF_PROP_PCK_EODS, "EODS", "End of DASH segment", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PID_MAX_FRAME_SIZE, "MaxFrameSize", "Max size of frame in stream - changes are signaled through pid_set_info (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AVG_FRAME_SIZE, "AvgFrameSize", "Average size of frame in stream (isobmff only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MAX_TS_DELTA, "MaxTSDelta", "Maximum DTS delta between frames (isobmff only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MAX_CTS_OFFSET, "MaxCTSOffset", "Maximum absolute CTS offset (isobmff only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CONSTANT_DURATION, "ConstantDuration", "Constant duration of samples, 0 means variable duration (isobmff only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_TRACK_TEMPLATE, "TrackTemplate", "ISOBMFF serialized track box for this PID, without any sample info (empty stbl and empty dref) - used by isomuxer to reinject specific boxes of input ISOBMFF track", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_TREX_TEMPLATE, "TrexTemplate", "ISOBMFF serialized trex box for this PID - used by isomuxer to remux empty init segments", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_STSD_TEMPLATE, "STSDTemplate", "ISOBMFF serialized sample description box (stsd entry) for this PID - used by isomuxer to reinject specific boxes of input ISOBMFF track", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_ISOM_UDTA, "MovieUserData", "ISOBMFF serialized moov UDTA and other moov-level boxes (list) for this PID - used by isomuxer to reinject specific boxes of input ISOBMFF moov", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_HANDLER, "TrackHandler", "ISOBMFF track handler name", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PCK_CUE_START, "CueStart", "Set on packets marking the beginning of a DASH/HLS segment for cue-driven segmentation - see dasher help", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
+	{ GF_PROP_PID_MAX_FRAME_SIZE, "MaxFrameSize", "Max size of frame in stream - changes are signaled through PID info change (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_AVG_FRAME_SIZE, "AvgFrameSize", "Average size of frame in stream (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_MAX_TS_DELTA, "MaxTSDelta", "Maximum DTS delta between frames (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_MAX_CTS_OFFSET, "MaxCTSOffset", "Maximum absolute CTS offset (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_CONSTANT_DURATION, "ConstantDuration", "Constant duration of samples, 0 means variable duration (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ISOM_TRACK_TEMPLATE, "TrackTemplate", "ISOBMFF serialized track box for this PID, without any sample info (empty stbl and empty dref)", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ISOM_TREX_TEMPLATE, "TrexTemplate", "ISOBMFF serialized trex box for this PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ISOM_STSD_TEMPLATE, "STSDTemplate", "ISOBMFF serialized sample description box (stsd entry) for this PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PID_ISOM_UDTA, "MovieUserData", "ISOBMFF serialized moov UDTA and other moov-level boxes (list) for this PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ISOM_HANDLER, "HandlerName", "ISOBMFF track handler name", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_ISOM_TRACK_FLAGS, "TrackFlags", "ISOBMFF track header flags", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_TRACK_MATRIX, "TrackMatrix", "ISOBMFF track header matrix", GF_PROP_UINT_LIST, GF_PROP_FLAG_GSF_REM},
-
+	{ GF_PROP_PID_ISOM_TRACK_MATRIX, "TrackMatrix", "ISOBMFF track header matrix", GF_PROP_SINT_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ISOM_ALT_GROUP, "AltGroup", "ISOBMFF alt group ID", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ISOM_FORCE_NEGCTTS, "ForceNCTTS", "ISOBMFF force negative CTS offsets", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DISABLED, "Disable", "ISOBMFF disable flag", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_PERIOD_ID, "Period", "ID of DASH period", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PERIOD_START, "PStart", "DASH Period start - cf dasher help", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PERIOD_DUR, "PDur", "DASH Period duration - cf dasher help", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_PERIOD_START, "PStart", "DASH Period start - cf dasher help", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_PERIOD_DUR, "PDur", "DASH Period duration - cf dasher help", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_REP_ID, "Representation", "ID of DASH representation", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_AS_ID, "ASID", "ID of parent DASH AS", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_MUX_SRC, "MuxSrc", "Name of mux source(s), set by dasher to direct its outputs", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_MODE, "DashMode", "DASH mode to be used by muxer if any, set by dasher. 0 is no DASH, 1 is regular DASH, 2 is VoD", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_DUR, "DashDur", "DASH target segment duration in seconds to muxer if any, set by dasher", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_MULTI_PID, NULL, "Pointer to the GF_List of input pids for multi-stsd entries segments, set by dasher", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DASH_MODE, "DashMode", "DASH mode to be used by multiplexer if any, set by dasher. 0 is no DASH, 1 is regular DASH, 2 is VoD", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DASH_DUR, "DashDur", "DASH target segment duration in seconds", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DASH_MULTI_PID, NULL, "Pointer to the GF_List of input PIDs for multi-stsd entries segments, set by dasher", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_DASH_MULTI_PID_IDX, NULL, "1-based index of PID in the multi PID list, set by dasher", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_MULTI_TRACK, NULL, "Pointer to the GF_List of input pids for multi-tracks segments, set by dasher", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ROLE, "Role", "List of roles for this pid", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PERIOD_DESC, "PDesc", "List of descriptors for the DASH period containing this pid", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AS_COND_DESC, "ASDesc", "List of conditional descriptors for the DASH AdaptationSet containing this pid. If a pid with the same property type but different value is found, the pids will be in different AdaptationSets", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AS_ANY_DESC, "ASCDesc", "List of common descriptors for the DASH AdaptationSet containing this pid", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_REP_DESC, "RDesc", "List of descriptors for the DASH Representation containing this pid", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_BASE_URL, "BUrl", "List of base URLs for this pid", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_TEMPLATE, "Template", "Template to use for DASH generation for this pid", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_START_NUMBER, "StartNumber", "Start number to use for this pid - cf dasher help", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DASH_MULTI_TRACK, NULL, "Pointer to the GF_List of input PIDs for multi-tracks segments, set by dasher", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ROLE, "Role", "List of roles for this PID, where each role string can be a DASH role, a `URN:role-value` or any other string (this will throw a warning and use a custom URI for the role)", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_PERIOD_DESC, "PDesc", "List of descriptors for the DASH period containing this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_AS_COND_DESC, "ASDesc", "List of conditional descriptors for the DASH AdaptationSet containing this PID. If a PID with the same property type but different value is found, the PIDs will be in different AdaptationSets", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_AS_ANY_DESC, "ASCDesc", "List of common descriptors for the DASH AdaptationSet containing this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_REP_DESC, "RDesc", "List of descriptors for the DASH Representation containing this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_BASE_URL, "BUrl", "List of base URLs for this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_TEMPLATE, "Template", "Template to use for DASH generation for this PID", GF_PROP_STRING, 0},
+	{ GF_PROP_PID_START_NUMBER, "StartNumber", "Start number to use for this PID - cf dasher help", GF_PROP_UINT, 0},
 	{ GF_PROP_PID_XLINK, "xlink", "Remote period URL for DASH - cf dasher help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CLAMP_DUR, "CDur", "Max media duration to process from pid in DASH mode", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_CLAMP_DUR, "ClampDur", "Max media duration to process from PID in DASH mode", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_HLS_PLAYLIST, "HLSPL", "Name of the HLS variant playlist for this media", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_HLS_GROUPID, "HLSGroup", "Name of HLS Group of a stream", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_CUE, "DCue", "Name of a cue list file for this pid - see dasher help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_HLS_EXT_MASTER, "HLSMExt", "List of extensions to add to the master playlist for this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_HLS_EXT_VARIANT, "HLSVExt", "List of extensions to add to the variant playlist for this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DASH_CUE, "DCue", "Name of a cue list file for this PID - see dasher help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
 	{ GF_PROP_PID_DASH_SEGMENTS, "DSegs", "Number of DASH segments defined by the DASH cue info", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CODEC, "Codec", "codec parameter string to force. If starting with '.', appended to ISOBMF code point; otherwise replace the codec string", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_SINGLE_SCALE, "SingleScale", "Indicates the movie header should use the media timescale of the first track added", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_UDP, "RequireReorder", "Indicates the PID packets come from source with losses and reordering happening (UDP)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PRIMARY_ITEM, "Primary", "Indicates this is a primary item in isobmf", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_COLR_PRIMARIES, "ColorPrimaries", "Indicate color primaries for a visual pid (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COLR_TRANSFER, "ColorTransfer", "Indicate color transfer characteristics for a visual pid (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COLR_MX, "ColorMatrixCoef", "Indicate color matrix coeficient for a visual pid (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COLR_RANGE, "FullRange", "Indicate color full range flag for a visual pid (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COLR_CHROMALOC, "ChromaLoc", "Indicate chrom location for a visual pid (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_SRC_MAGIC, "SrcMagic", "Indicate a magic number to store in the track, only used by importers", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MUX_INDEX, "MuxIndex", "Indicate target track index in destination file, stored by lowest value first (not set by demuxers)", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_NO_TS_LOOP, "NoTSLoop", "Indicate the timestamps on this PID are adjusted in case of loops (used by TS muxer output)", GF_PROP_BOOL, 0},
-
-
-	{ GF_PROP_PCK_FRAG_START, "FragStart", "Indicate if packet is a fragment start (value 1) or a segment start (value 2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_FRAG_RANGE, "FragRange", "Indicate start and end position in bytes of fragment if packet is a fragment or segment start", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_SIDX_RANGE, "SIDXRange", "Indicate start and end position in bytes of sidx if packet is a fragment or segment start", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PCK_MOOF_TEMPLATE, "MoofTemplate", "Serialized moof box corresponding to the start of a movie fragment or segment (with styp and optionally sidx)", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_RAWGRAB, "RawGrab", "Indicate PID is a raw media grabber (webcam, microphone, etc...)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_KEEP_AFTER_EOS, "KeepAfterEOS", "Indicate the PID must be kept alive after EOS (LASeR and BIFS)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COVER_ART, "CoverArt", "Indicate PID cover art image data. If associated data is NULL, the data is carried in the PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-
+	{ GF_PROP_PID_CODEC, "Codec", "codec parameter string to force. If starting with '.', appended to ISOBMFF code point; otherwise replace the codec string", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PID_SINGLE_SCALE, "SingleScale", "Movie header should use the media timescale of the first track added", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_UDP, "RequireReorder", "PID packets come from source with losses and reordering happening (UDP)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_PRIMARY_ITEM, "Primary", "Primary item in ISOBMFF", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DASH_FWD, "DFMode", "DASH forward mode is used for this PID. If 2, the manifest is also carried in packet propery", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PCK_DASH_MANIFEST, "DFManifest", "Value of manifest in forward mode", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PCK_HLS_VARIANT, "DFVariant", "Value of variant playlist in forward mode", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PCK_HLS_VARIANT_NAME, "DFVariantName", "Value of variant playlist name in forward mode", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_DASH_PERIOD_START, "DFPStart", "Value of active period start time in forward mode", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_HLS_KMS, "HLSKey", "URI, KEYFORMAT and KEYFORMATVERSIONS for HLS full segment encryption creation, Key URI otherwise ( decoding and sample-AES)", GF_PROP_STRING},
+	{ GF_PROP_PID_HLS_IV, "HLSIV", "Init Vector for HLS decode", GF_PROP_DATA},
+
+	{ GF_PROP_PID_COLR_PRIMARIES, "ColorPrimaries", "Color primaries", GF_PROP_CICP_COL_PRIM, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_COLR_TRANSFER, "ColorTransfer", "Color transfer characteristics", GF_PROP_CICP_COL_TFC, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_COLR_MX, "ColorMatrix", "Color matrix coefficient", GF_PROP_CICP_COL_MX, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_COLR_RANGE, "FullRange", "Color full range flag", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_COLR_CHROMAFMT, "Chroma", "Chroma format (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_COLR_CHROMALOC, "ChromaLoc", "Chroma location (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_CONTENT_LIGHT_LEVEL, "ContentLightLevel", "Content light level, payload of clli box (see ISO/IEC 14496-12), can be set as a list of 2 integers in fragment declaration (e.g. \"=max_cll,max_pic_avg_ll\")", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_MASTER_DISPLAY_COLOUR, "MasterDisplayColour", "Master display colour info, payload of mdcv box (see ISO/IEC 14496-12), can be set as a list of 10 integers in fragment declaration (e.g. \"=dpx0,dpy0,dpx1,dpy1,dpx2,dpy2,wpx,wpy,max,min\")", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PID_SRC_MAGIC, "SrcMagic", "Magic number to store in the track, only used by importers", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_MUX_INDEX, "MuxIndex", "Target track index in destination file, stored by lowest value first (not set by demultiplexers)", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_NO_TS_LOOP, "NoTSLoop", "Timestamps on this PID are adjusted in case of loops (used by TS multiplexer output)", GF_PROP_BOOL, 0},
+	{ GF_PROP_PID_MHA_COMPATIBLE_PROFILES, "MHAProfiles", "List of compatible profiles for this MPEG-H Audio object", GF_PROP_UINT_LIST, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PCK_FRAG_START, "FragStart", "Packet is a fragment start (value 1) or a segment start (value 2)", GF_PROP_UINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PCK_FRAG_RANGE, "FragRange", "Start and end position in bytes of fragment if packet is a fragment or segment start", GF_PROP_FRACTION64, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PCK_SIDX_RANGE, "SIDXRange", "Start and end position in bytes of sidx if packet is a fragment or segment start", GF_PROP_FRACTION64, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PCK_MOOF_TEMPLATE, "MoofTemplate", "Serialized moof box corresponding to the start of a movie fragment or segment (with styp and optionally sidx)", GF_PROP_DATA, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PCK_INIT, "InitSeg", "Set to true if packet is a complete DASH init segment file", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
+
+	{ GF_PROP_PID_RAWGRAB, "RawGrab", "PID is a raw media grabber (webcam, microphone, etc...)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_KEEP_AFTER_EOS, "KeepAfterEOS", "PID must be kept alive after EOS (LASeR and BIFS)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_COVER_ART, "CoverArt", "PID cover art image data. If associated data is NULL, the data is carried in the PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PID_PLAY_BUFFER, "BufferLength", "Playout buffer in ms", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_MAX_BUFFER, "MaxBuffer", "Maximum buffer occupancy in ms", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_RE_BUFFER, "ReBuffer", "Rebuffer threshold in ms, 0 disable rebuffering", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_VIEW_IDX, "ViewIdx", "View index for multiview (1 being left)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ORIG_FRAG_URL, "FragURL", "Fragment URL (without '#') of original URL (used by some filters to set the property on media PIDs)", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PID_ROUTE_IP, "ROUTEIP", "ROUTE session IP address", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ROUTE_PORT, "ROUTEPort", "ROUTE session port number", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ROUTE_NAME, "ROUTEName", "Name (location) of raw file to advertise in ROUTE session", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ROUTE_CAROUSEL, "ROUTECarousel", "Carousel period in seconds of raw file in ROUTE session", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_ROUTE_SENDTIME, "ROUTEUpload", "Upload time in seconds of raw file in ROUTE session", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PID_STEREO_TYPE, "Stereo", "Stereo type of video", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_PROJECTION_TYPE, "Projection", "Projection type of video", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_VR_POSE, "InitalPose", "Initial pose for 360 video, in degrees expressed as 16.16 bits (x is yaw, y is pitch, z is roll)", GF_PROP_VEC3I, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PID_CUBE_MAP_PAD, "CMPad", "Number of pixels to pad from edge of each face in cube map", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_EQR_CLAMP, "EQRClamp", "Clamping of frame for EQR as 0.32 fixed point (x is top, y is bottom, z is left and w is right)", GF_PROP_VEC4I, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PID_SCENE_NODE, "SceneNode", "PID is a scene node decoder (AFX BitWrapper in BIFS)", GF_PROP_BOOL, 0},
+	{ GF_PROP_PID_ORIG_CRYPT_SCHEME, "OrigCryptoScheme", "Original crypto scheme on a decrypted PID", GF_PROP_UINT, 0},
+	{ GF_PROP_PID_TIMESHIFT_SEGS, "TSBSegs", "Time shift in number of segments for HAS streams, only set by dashin and dasher filters", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_IS_MANIFEST, "IsManifest", "PID is a HAS manifest", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+
+	{ GF_PROP_PCK_SKIP_BEGIN, "SkipBegin", "Amount of media to skip from beginning of packet in PID timescale", GF_PROP_UINT, GF_PROP_FLAG_PCK},
+	{ GF_PROP_PCK_SKIP_PRES, "SkipPres", "Packet and any following with CTS greater than this packet shall not be presented (used by reframer to create edit lists)", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
+
+	{ GF_PROP_PCK_HLS_REF, "HLSRef", "HLS playlist reference, gives a unique ID identifying media mux, and indicated in packets carrying child playlists", GF_PROP_LUINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_LLHLS, "LLHLS", "HLS low latency mode", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PCK_HLS_FRAG_NUM, "LLHLSFragNum", "LLHLS fragment number", GF_PROP_UINT, GF_PROP_FLAG_PCK},
+	{ GF_PROP_PID_DOWNLOAD_SESSION, "DownloadSession", "Pointer to download session", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_HAS_TEMI, "HasTemi", "TEMI present flag", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PCK_XPS_MASK, "XPSMask", "Parameter set mask", GF_PROP_UINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PCK_END_RANGE, "RangeEnd", "Signal packet is the last in the desired play range", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
 };
 
+static u32 gf_num_props = sizeof(GF_BuiltInProps) / sizeof(GF_BuiltInProperty);
+
 GF_EXPORT
 u32 gf_props_get_id(const char *name)
 {
-	u32 i, nb_props;
+	u32 i, len;
 	if (!name) return 0;
-	nb_props = sizeof(GF_BuiltInProps) / sizeof(GF_BuiltInProperty);
-	for (i=0; i<nb_props; i++) {
-		if (GF_BuiltInProps[i].name && !strcmp(GF_BuiltInProps[i].name, name)) return GF_BuiltInProps[i].type;
+	len = (u32) strlen(name);
+	for (i=0; i<gf_num_props; i++) {
+		if (GF_BuiltInProps[i].name) {
+			u32 j;
+			for (j=0; j<=len; j++) {
+				char c = GF_BuiltInProps[i].name[j];
+				if (!c) break;
+				if (c != name[j])
+					break;
+			}
+			if ((j==len) && !GF_BuiltInProps[i].name[j])
+				return GF_BuiltInProps[i].type;
+		}
 	}
 	return 0;
 }
@@ -1325,16 +1583,15 @@
 GF_EXPORT
 const GF_BuiltInProperty *gf_props_get_description(u32 prop_idx)
 {
-	u32 nb_props = sizeof(GF_BuiltInProps) / sizeof(GF_BuiltInProperty);
-	if (prop_idx>=nb_props) return NULL;
+	if (prop_idx>=gf_num_props) return NULL;
 	return &GF_BuiltInProps[prop_idx];
 }
 
 GF_EXPORT
 const char *gf_props_4cc_get_name(u32 prop_4cc)
 {
-	u32 i, nb_props = sizeof(GF_BuiltInProps) / sizeof(GF_BuiltInProperty);
-	for (i=0; i<nb_props; i++) {
+	u32 i;
+	for (i=0; i<gf_num_props; i++) {
 		if (GF_BuiltInProps[i].type==prop_4cc) return GF_BuiltInProps[i].name;
 	}
 	return NULL;
@@ -1343,8 +1600,8 @@
 GF_EXPORT
 u8 gf_props_4cc_get_flags(u32 prop_4cc)
 {
-	u32 i, nb_props = sizeof(GF_BuiltInProps) / sizeof(GF_BuiltInProperty);
-	for (i=0; i<nb_props; i++) {
+	u32 i;
+	for (i=0; i<gf_num_props; i++) {
 		if (GF_BuiltInProps[i].type==prop_4cc) return GF_BuiltInProps[i].flags;
 	}
 	return 0;
@@ -1353,8 +1610,8 @@
 GF_EXPORT
 u32 gf_props_4cc_get_type(u32 prop_4cc)
 {
-	u32 i, nb_props = sizeof(GF_BuiltInProps) / sizeof(GF_BuiltInProperty);
-	for (i=0; i<nb_props; i++) {
+	u32 i;
+	for (i=0; i<gf_num_props; i++) {
 		if (GF_BuiltInProps[i].type==prop_4cc) return GF_BuiltInProps[i].data_type;
 	}
 	return GF_PROP_FORBIDEN;
@@ -1363,9 +1620,9 @@
 Bool gf_props_4cc_check_props()
 {
 	Bool res = GF_TRUE;
-	u32 i, j, nb_props = sizeof(GF_BuiltInProps) / sizeof(GF_BuiltInProperty);
-	for (i=0; i<nb_props; i++) {
-		for (j=i+1; j<nb_props; j++) {
+	u32 i, j;
+	for (i=0; i<gf_num_props; i++) {
+		for (j=i+1; j<gf_num_props; j++) {
 			if (GF_BuiltInProps[i].type==GF_BuiltInProps[j].type) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Property %s and %s have the same code type %s\n", GF_BuiltInProps[i].name, GF_BuiltInProps[j].name, gf_4cc_to_str(GF_BuiltInProps[i].type) ));
 				res = GF_FALSE;
@@ -1375,7 +1632,8 @@
 	return res;
 }
 
-const char *gf_props_dump_val_ex(const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], Bool dump_data, const char *min_max_enum, Bool is_4cc)
+GF_EXPORT
+const char *gf_props_dump_val(const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], u32 dump_data_type, const char *min_max_enum)
 {
 	switch (att->type) {
 	case GF_PROP_NAME:
@@ -1421,6 +1679,9 @@
 			sprintf(dump, "%u", att->value.uint);
 		}
 		break;
+	case GF_PROP_4CC:
+		sprintf(dump, "%s", gf_4cc_to_str(att->value.uint) );
+		break;
 	case GF_PROP_LSINT:
 		sprintf(dump, ""LLD, att->value.longsint);
 		break;
@@ -1461,19 +1722,9 @@
 	case GF_PROP_VEC3I:
 		sprintf(dump, "%dx%dx%d", att->value.vec3i.x, att->value.vec3i.y, att->value.vec3i.z);
 		break;
-	case GF_PROP_VEC3:
-		sprintf(dump, "%lgx%lgx%lg", att->value.vec3.x, att->value.vec3.y, att->value.vec3.y);
-		break;
 	case GF_PROP_VEC4I:
 		sprintf(dump, "%dx%dx%dx%d", att->value.vec4i.x, att->value.vec4i.y, att->value.vec4i.z, att->value.vec4i.w);
 		break;
-	case GF_PROP_VEC4:
-		sprintf(dump, "%lgx%lgx%lgx%lg", att->value.vec4.x, att->value.vec4.y, att->value.vec4.y, att->value.vec4.w);
-		break;
-	case GF_PROP_PIXFMT:
-		return gf_pixel_fmt_name(att->value.uint);
-	case GF_PROP_PCMFMT:
-		return gf_audio_fmt_name(att->value.uint);
 	case GF_PROP_NAME:
 	case GF_PROP_STRING:
 	case GF_PROP_STRING_NO_COPY:
@@ -1482,7 +1733,9 @@
 	case GF_PROP_DATA:
 	case GF_PROP_CONST_DATA:
 	case GF_PROP_DATA_NO_COPY:
-		if (dump_data && att->value.data.size < 40) {
+		if (dump_data_type==2) {
+			sprintf(dump, "%d@%p", att->value.data.size, att->value.data.ptr);
+		} else if (dump_data_type && att->value.data.size < 40) {
 			u32 i;
 			sprintf(dump, "%d bytes 0x", att->value.data.size);
 			for (i=0; i<att->value.data.size; i++) {
@@ -1497,11 +1750,11 @@
 		break;
 	case GF_PROP_STRING_LIST:
 	{
-		u32 i, count = gf_list_count(att->value.string_list);
+		u32 i, count = att->value.string_list.nb_items;
 		u32 len = GF_PROP_DUMP_ARG_SIZE-1;
 		dump[len]=0;
 		for (i=0; i<count; i++) {
-			char *s = gf_list_get(att->value.string_list, i);
+			char *s = att->value.string_list.vals[i];
 			if (!i) {
 				strncpy(dump, s, len);
 			} else {
@@ -1517,16 +1770,23 @@
 		return dump;
 	}
 	case GF_PROP_UINT_LIST:
+	case GF_PROP_4CC_LIST:
+	case GF_PROP_SINT_LIST:
+	case GF_PROP_VEC2I_LIST:
 	{
 		u32 i, count = att->value.uint_list.nb_items;
 		u32 len = GF_PROP_DUMP_ARG_SIZE-1;
 		dump[len]=0;
 		for (i=0; i<count; i++) {
 			char szItem[1024];
-			if (is_4cc) {
+			if (att->type==GF_PROP_UINT_LIST) {
+				sprintf(szItem, "%u", att->value.uint_list.vals[i]);
+			} else if (att->type==GF_PROP_4CC_LIST) {
 				sprintf(szItem, "%s", gf_4cc_to_str(att->value.uint_list.vals[i]) );
+			} else if (att->type==GF_PROP_SINT_LIST) {
+				sprintf(szItem, "%d", att->value.sint_list.vals[i]);
 			} else {
-				sprintf(szItem, "%u", att->value.uint_list.vals[i]);
+				sprintf(szItem, "%dx%d", att->value.v2i_list.vals[i].x, att->value.v2i_list.vals[i].x);
 			}
 			if (!i) {
 				strncpy(dump, szItem, len);
@@ -1536,7 +1796,7 @@
 			}
 			len = GF_PROP_DUMP_ARG_SIZE - 1 - (u32) strlen(dump);
 			if (len<=1) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Uint list is too large to fit in predefined property dump buffer of %d bytes, truncating\n", GF_PROP_DUMP_ARG_SIZE));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("List is too large to fit in predefined property dump buffer of %d bytes, truncating\n", GF_PROP_DUMP_ARG_SIZE));
 				return dump;
 			}
 		}
@@ -1548,48 +1808,78 @@
 	case GF_PROP_LAST_DEFINED:
 		sprintf(dump, "lastDefined");
 		break;
+	default:
+		if (gf_props_type_is_enum(att->type)) {
+			return gf_props_enum_name(att->type, att->value.uint);
+		}
 	}
 	return dump;
 }
 
 GF_EXPORT
-const char *gf_props_dump_val(const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], Bool dump_data, const char *min_max_enum)
-{
-	return gf_props_dump_val_ex(att, dump, dump_data, min_max_enum, GF_FALSE);
-}
-
-GF_EXPORT
-const char *gf_props_dump(u32 p4cc, const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], Bool dump_data)
+const char *gf_props_dump(u32 p4cc, const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], u32 dump_data_mode)
 {
-	Bool is_4cc = GF_FALSE;
-
 	switch (p4cc) {
 	case GF_PROP_PID_STREAM_TYPE:
 	case GF_PROP_PID_ORIG_STREAM_TYPE:
 		return gf_stream_type_name(att->value.uint);
 	case GF_PROP_PID_CODECID:
 		return gf_codecid_name(att->value.uint);
-	case GF_PROP_PID_PIXFMT:
-		return gf_pixel_fmt_name(att->value.uint);
-	case GF_PROP_PID_AUDIO_FORMAT:
-		return gf_audio_fmt_name(att->value.uint);
-	case GF_PROP_PID_PROTECTION_SCHEME_TYPE:
-	case GF_PROP_PID_CENC_STORE:
-	case GF_PROP_PID_SUBTYPE:
-	case GF_PROP_PID_ISOM_SUBTYPE:
-	case GF_PROP_PID_ISOM_MBRAND:
-		return gf_4cc_to_str(att->value.uint);
+
 	case GF_PROP_PID_PLAYBACK_MODE:
 		if (att->value.uint == GF_PLAYBACK_MODE_SEEK) return "seek";
 		else if (att->value.uint == GF_PLAYBACK_MODE_REWIND) return "rewind";
 		else if (att->value.uint == GF_PLAYBACK_MODE_FASTFORWARD) return "forward";
 		else return "none";
-	case GF_PROP_PID_ISOM_BRANDS:
-		is_4cc = GF_TRUE;
-
 	default:
-		return gf_props_dump_val_ex(att, dump, dump_data, NULL, is_4cc);
+		if (att->type==GF_PROP_UINT) {
+			u32 type = gf_props_4cc_get_type(p4cc);
+			if (gf_props_type_is_enum(type))
+				return gf_props_enum_name(type, att->value.uint);
+		}
+		return gf_props_dump_val(att, dump, dump_data_mode, NULL);
 	}
 	return "";
 }
 
+
+GF_Err gf_prop_matrix_decompose(const GF_PropertyValue *p, u32 *flip_mode, u32 *rot_mode)
+{
+	GF_Point2D scale, translate;
+	Fixed rotate;
+	GF_Matrix2D mx;
+	if (!p || (p->type!=GF_PROP_SINT_LIST) || (p->value.sint_list.nb_items!=9))
+		return GF_BAD_PARAM;
+
+	mx.m[0] = INT2FIX(p->value.sint_list.vals[0])/65536;
+	mx.m[1] = INT2FIX(p->value.sint_list.vals[1])/65536;
+	mx.m[2] = INT2FIX(p->value.sint_list.vals[2])/65536;
+	mx.m[3] = INT2FIX(p->value.sint_list.vals[3])/65536;
+	mx.m[4] = INT2FIX(p->value.sint_list.vals[4])/65536;
+	mx.m[5] = INT2FIX(p->value.sint_list.vals[5])/65536;
+	gf_mx2d_decompose(&mx, &scale, &rotate, &translate);
+
+	if (flip_mode) {
+		*flip_mode = 0;
+		if (ABSDIFF(scale.x, -1) < 0.05) {
+			*flip_mode = (ABSDIFF(scale.y, -1) < 0.05) ? 3 : 2;
+		}
+		else if (ABSDIFF(scale.x, -1) < 0.05) {
+			*flip_mode = 1;
+		}
+	}
+	if (rot_mode) {
+		*rot_mode = 0;
+		if (ABSDIFF(rotate, GF_PI2)<0.05) {
+			*rot_mode = 1;
+		}
+		else if (ABSDIFF(rotate, GF_PI/2)<0.05) {
+			*rot_mode = 2;
+		}
+		if (ABSDIFF(-rotate, GF_PI2)<0.05) {
+			*rot_mode = 3;
+		}
+	}
+	return GF_OK;
+}
+

gpac-1.0.1.tar.gz/src/filter_core/filter_queue.c -> gpac-2.0.0.tar.gz/src/filter_core/filter_queue.c Changed

gpac-1.0.1.tar.gz/src/filter_core/filter_register.c -> gpac-2.0.0.tar.gz/src/filter_core/filter_register.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -119,6 +119,8 @@
 const GF_FilterRegister *tsmux_register(GF_FilterSession *session);
 const GF_FilterRegister *dasher_register(GF_FilterSession *session);
 const GF_FilterRegister *tileagg_register(GF_FilterSession *session);
+const GF_FilterRegister *tilesplit_register(GF_FilterSession *session);
+
 #if !defined(GPAC_CONFIG_ANDROID)
 const GF_FilterRegister *pipein_register(GF_FilterSession *session);
 const GF_FilterRegister *pipeout_register(GF_FilterSession *session);
@@ -131,7 +133,7 @@
 #if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID)
 const GF_FilterRegister *nvdec_register(GF_FilterSession *session);
 #endif
-const GF_FilterRegister *atscin_register(GF_FilterSession *session);
+const GF_FilterRegister *routein_register(GF_FilterSession *session);
 const GF_FilterRegister *rtpout_register(GF_FilterSession *session);
 const GF_FilterRegister *rtspout_register(GF_FilterSession *session);
 const GF_FilterRegister *hevcsplit_register(GF_FilterSession *session);
@@ -152,6 +154,15 @@
 const GF_FilterRegister *flac_dmx_register(GF_FilterSession *session);
 const GF_FilterRegister *proresdmx_register(GF_FilterSession *session);
 const GF_FilterRegister *bsrw_register(GF_FilterSession *session);
+const GF_FilterRegister *bs_split_register(GF_FilterSession *session);
+const GF_FilterRegister *bs_agg_register(GF_FilterSession *session);
+const GF_FilterRegister *mhas_dmx_register(GF_FilterSession *session);
+const GF_FilterRegister *mhasmx_register(GF_FilterSession *session);
+const GF_FilterRegister *routeout_register(GF_FilterSession *session);
+const GF_FilterRegister *truehd_register(GF_FilterSession *session);
+const GF_FilterRegister *cryptfin_register(GF_FilterSession *session);
+const GF_FilterRegister *cryptfout_register(GF_FilterSession *session);
+const GF_FilterRegister *restamp_register(GF_FilterSession *session);
 
 void gf_fs_reg_all(GF_FilterSession *fsess, GF_FilterSession *a_sess)
 {
@@ -215,6 +226,7 @@
 	gf_fs_add_filter_register(fsess, fileout_register(a_sess) );
 	gf_fs_add_filter_register(fsess, latm_mx_register(a_sess) );
 	gf_fs_add_filter_register(fsess, adtsmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, mhasmx_register(a_sess) );
 
 	gf_fs_add_filter_register(fsess, reframer_register(a_sess) );
 	gf_fs_add_filter_register(fsess, writegen_register(a_sess) );
@@ -242,6 +254,8 @@
 	gf_fs_add_filter_register(fsess, tsmux_register(a_sess) );
 	gf_fs_add_filter_register(fsess, dasher_register(a_sess) );
 	gf_fs_add_filter_register(fsess, tileagg_register(a_sess) );
+	gf_fs_add_filter_register(fsess, tilesplit_register(a_sess) );
+
 #if !defined(GPAC_CONFIG_ANDROID)
 	gf_fs_add_filter_register(fsess, pipein_register(a_sess) );
 	gf_fs_add_filter_register(fsess, pipeout_register(a_sess) );
@@ -254,7 +268,7 @@
 #if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID)
 	gf_fs_add_filter_register(fsess, nvdec_register(a_sess));
 #endif
-	gf_fs_add_filter_register(fsess, atscin_register(a_sess));
+	gf_fs_add_filter_register(fsess, routein_register(a_sess));
 	gf_fs_add_filter_register(fsess, rtpout_register(a_sess));
 	gf_fs_add_filter_register(fsess, rtspout_register(a_sess));
 	gf_fs_add_filter_register(fsess, httpout_register(a_sess));
@@ -262,9 +276,13 @@
 	gf_fs_add_filter_register(fsess, hevcsplit_register(a_sess));
 	gf_fs_add_filter_register(fsess, hevcmerge_register(a_sess));
 	gf_fs_add_filter_register(fsess, flac_dmx_register(a_sess));
+	gf_fs_add_filter_register(fsess, mhas_dmx_register(a_sess));
+
 	gf_fs_add_filter_register(fsess, proresdmx_register(a_sess));
 	gf_fs_add_filter_register(fsess, m2tssplit_register(a_sess));
 	gf_fs_add_filter_register(fsess, bsrw_register(a_sess));
+	gf_fs_add_filter_register(fsess, bs_split_register(a_sess));
+	gf_fs_add_filter_register(fsess, bs_agg_register(a_sess));
 
 	gf_fs_add_filter_register(fsess, ffdmx_register(a_sess) );
 	gf_fs_add_filter_register(fsess, ffdec_register(a_sess) );
@@ -275,6 +293,11 @@
 	gf_fs_add_filter_register(fsess, ffavf_register(a_sess) );
 
 	gf_fs_add_filter_register(fsess, jsfilter_register(a_sess) );
+	gf_fs_add_filter_register(fsess, routeout_register(a_sess) );
+	gf_fs_add_filter_register(fsess, truehd_register(a_sess) );
+	gf_fs_add_filter_register(fsess, cryptfin_register(a_sess) );
+	gf_fs_add_filter_register(fsess, cryptfout_register(a_sess) );
+	gf_fs_add_filter_register(fsess, restamp_register(a_sess) );
 
 #if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_HAVE_DTAPI) && !defined(WIN32) 
 	gf_fs_add_filter_register(fsess, dtout_register(a_sess) );

gpac-1.0.1.tar.gz/src/filter_core/filter_session.c -> gpac-2.0.0.tar.gz/src/filter_core/filter_session.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / filters sub-project
@@ -86,28 +86,69 @@
 	}
 }
 
+GF_EXPORT
 void gf_fs_add_filter_register(GF_FilterSession *fsess, const GF_FilterRegister *freg)
 {
-	if (!freg) return;
+	if (!freg || !fsess) return;
 
 	if (!freg->name) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter missing name - ignoring\n"));
 		return;
 	}
+#if 0
+	if (strchr(freg->name, fsess->sep_args)	) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter name cannot contain argument separator %c - ignoring\n", fsess->sep_args));
+		return;
+	}
+	if (strchr(freg->name, fsess->sep_name)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter name cannot contain argument value separator %c - ignoring\n", fsess->sep_name));
+		return;
+	}
+#endif
 	if (!freg->process) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s missing process function - ignoring\n", freg->name));
 		return;
 	}
 	if (fsess->blacklist) {
-		char *fname = strstr(fsess->blacklist, freg->name);
-		if (fname) {
+		Bool match = GF_FALSE;
+		const char *blacklist = fsess->blacklist;
+		Bool is_whitelist=GF_FALSE;
+		if (blacklist[0]=='-') {
+			blacklist++;
+			is_whitelist = GF_TRUE;
+		}
+		while (blacklist) {
+			char *fname = strstr(blacklist, freg->name);
+			if (!fname) break;
 			u32 len = (u32) strlen(freg->name);
 			if (!fname[len] || (fname[len] == fsess->sep_list)) {
-				return;
+				match = GF_TRUE;
+				break;
 			}
+			blacklist = fname+len;
 		}
+		if (match) {
+			if (!is_whitelist)
+				return;
+		} else {
+			if (is_whitelist)
+				return;
+		}
+	}
+	//except for meta filters, don't accept a filter with input caps but no output caps
+	//meta filters do follow the same rule, however when expanding them for help we may have weird cases
+	//where no config is set but inputs are listed to expose mime types or extensions (cf ffdmx)
+	if (!(freg->flags & GF_FS_REG_META)
+		&& !freg->configure_pid
+		&& gf_filter_has_in_caps(freg->caps, freg->nb_caps)
+	) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s missing configure_pid function but has input capabilities - ignoring\n", freg->name));
+		return;
 	}
+
+	gf_mx_p(fsess->filters_mx);
 	gf_list_add(fsess->registry, (void *) freg);
+	gf_mx_v(fsess->filters_mx);
 
 	if (fsess->init_done && fsess->links && gf_list_count( fsess->links)) {
 		gf_filter_sess_build_graph(fsess, freg);
@@ -119,17 +160,32 @@
 static Bool fs_default_event_proc(void *ptr, GF_Event *evt)
 {
 	GF_FilterSession *fs = (GF_FilterSession *)ptr;
+	if (evt->type==GF_EVENT_QUIT) {
+		gf_fs_abort(fs, GF_FS_FLUSH_FAST);
+	}
+	if (evt->type==GF_EVENT_MESSAGE) {
+		if (evt->message.error) {
+			if (evt->message.service) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Service %s %s: %s\n", evt->message.service, evt->message.message, gf_error_to_string(evt->message.error) ))
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("%s: %s\n", evt->message.message, gf_error_to_string(evt->message.error) ))
+			}
+		}
+	}
+
 #ifdef GPAC_HAS_QJS
 	if (fs->on_evt_task)
 		return jsfs_on_event(fs, evt);
 #endif
-
-	if (evt->type==GF_EVENT_QUIT) {
-		gf_fs_abort(fs, GF_FALSE);
-	}
 	return 0;
 }
 
+
+#ifdef GF_FS_ENABLE_LOCALES
+static Bool fs_check_locales(void *__self, const char *locales_parent_path, const char *rel_path, char *relocated_path, char *localized_rel_path);
+#endif
+
+
 GF_EXPORT
 GF_FilterSession *gf_fs_new(s32 nb_threads, GF_FilterSchedulerType sched_type, u32 flags, const char *blacklist)
 {
@@ -149,6 +205,12 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to alloc media session\n"));
 		return NULL;
 	}
+	//reverse implicit mode flag, we run by default in this mode
+	if (flags & GF_FS_FLAG_NO_IMPLICIT)
+		flags &= ~GF_FS_FLAG_IMPLICIT_MODE;
+	else
+		flags |= GF_FS_FLAG_IMPLICIT_MODE;
+
 	fsess->flags = flags;
 
 	fsess->filters = gf_list_new();
@@ -200,8 +262,8 @@
 	fsess->ui_event_proc = fs_default_event_proc;
 	fsess->ui_opaque = fsess;
 
-	if (flags & GF_FS_FLAG_NO_MAIN_THREAD)
-		fsess->no_main_thread = GF_TRUE;
+	if (flags & GF_FS_FLAG_NON_BLOCKING)
+		fsess->non_blocking = 1;
 
 	if (!fsess->semaphore_main)
 		nb_threads=0;
@@ -256,13 +318,15 @@
 	}
 
 	for (i=0; i<(u32) nb_threads; i++) {
+		char szName[30];
 		GF_SessionThread *sess_thread;
 		GF_SAFEALLOC(sess_thread, GF_SessionThread);
 		if (!sess_thread) continue;
 #ifndef GPAC_DISABLE_REMOTERY
 		sprintf(sess_thread->rmt_name, "FSThread%d", i+1);
 #endif
-		sess_thread->th = gf_th_new("MediaSessionThread");
+		sprintf(szName, "gf_fs_th_%d", i+1);
+		sess_thread->th = gf_th_new(szName);
 		if (!sess_thread->th) {
 			gf_free(sess_thread);
 			continue;
@@ -283,7 +347,6 @@
 	for (i=0; i<count; i++) {
 		GF_FilterRegister *freg = (GF_FilterRegister *) gf_modules_load_filter(i, a_sess);
 		if (freg) {
-			freg->flags |= 0x80000000;
 			gf_fs_add_filter_register(fsess, freg);
 		}
 	}
@@ -302,6 +365,7 @@
 			fsess->blocking_mode = GF_FS_NOBLOCK;
 		}
 	}
+
 	fsess->run_status = GF_EOS;
 	fsess->nb_threads_stopped = 1+nb_threads;
 	fsess->default_pid_buffer_max_us = 1000;
@@ -323,7 +387,7 @@
 
 	fsess->init_done = GF_TRUE;
 
-
+	//parse all global filter options for argument tracking
 	if (gf_sys_has_filter_global_args() || gf_sys_has_filter_global_meta_args()) {
 		u32 nb_args = gf_sys_get_argc();
 		for (i=0; i<nb_args; i++) {
@@ -332,19 +396,37 @@
 			if ((arg[1]!='-') && (arg[1]!='+')) continue;
 			char *sep = strchr(arg, '=');
 			if (sep) sep[0] = 0;
-			gf_fs_push_arg(fsess, arg+2, GF_FALSE, (arg[1]!='-') ? 2 : 1);
+			gf_fs_push_arg(fsess, arg+2, GF_FALSE, (arg[1]=='-') ? GF_ARGTYPE_GLOBAL : GF_ARGTYPE_META, NULL);
+
+			//force indexing in reframers when dash template with bandwidth is used
+			if (sep && !strcmp(arg+2, "template") && strstr(sep+1, "$Bandwidth$")) {
+				gf_opts_set_key("temp", "force_indexing", "true");
+			}
+
 			if (sep) sep[0] = '=';
 		}
 	}
 
+#ifdef GF_FS_ENABLE_LOCALES
+	fsess->uri_relocators = gf_list_new();
+	fsess->locales.relocate_uri = fs_check_locales;
+	fsess->locales.sess = fsess;
+	gf_list_add(fsess->uri_relocators, &fsess->locales);
+#endif
 	return fsess;
 }
 
-void gf_fs_push_arg(GF_FilterSession *session, const char *szArg, Bool was_found, u32 type)
+void gf_fs_push_arg(GF_FilterSession *session, const char *szArg, Bool was_found, GF_FSArgItemType type, GF_Filter *meta_filter)
 {
+	u32 meta_len = meta_filter ? (u32) strlen(meta_filter->freg->name) : 0;
+	Bool create_if_not_found = GF_TRUE;
 	if (session->flags & GF_FS_FLAG_NO_ARG_CHECK)
 		return;
 
+	//ignore any meta argument reported (found or not) that is not already present
+	if (type==GF_ARGTYPE_META_REPORTING) {
+		create_if_not_found = GF_FALSE;
+	}
 	if (!was_found) {
 		Bool afound = GF_FALSE;
 		u32 k, acount;
@@ -354,12 +436,18 @@
 			GF_FSArgItem *ai = gf_list_get(session->parsed_args, k);
 			if (!strcmp(ai->argname, szArg)) {
 				afound = GF_TRUE;
-				if ((ai->type==2) && (type==2))
-					ai->found = GF_FALSE;
+				break;
+			}
+			if (meta_len
+				&& !strncmp(ai->argname, meta_filter->freg->name, meta_len)
+				&& ((ai->argname[meta_len]==':') || (ai->argname[meta_len]=='@'))
+				&& !strcmp(ai->argname+meta_len+1, szArg)
+			) {
+				afound = GF_TRUE;
 				break;
 			}
 		}
-		if (!afound) {
+		if (!afound && create_if_not_found) {
 			GF_FSArgItem *ai;
 			GF_SAFEALLOC(ai, GF_FSArgItem);
 			if (ai) {
@@ -376,12 +464,21 @@
 		for (k=0; k<acount; k++) {
 			GF_FSArgItem *ai = gf_list_get(session->parsed_args, k);
 			if (!strcmp(ai->argname, szArg)) {
-				ai->found = GF_TRUE;
+				ai->found = was_found;
+				found = GF_TRUE;
+				break;
+			}
+			if (meta_len
+				&& !strncmp(ai->argname, meta_filter->freg->name, meta_len)
+				&& ((ai->argname[meta_len]==':') || (ai->argname[meta_len]=='@'))
+				&& !strcmp(ai->argname+meta_len+1, szArg)
+			) {
+				ai->found = was_found;
 				found = GF_TRUE;
 				break;
 			}
 		}
-		if (!found) {
+		if (!found && create_if_not_found) {
 			GF_FSArgItem *ai;
 			GF_SAFEALLOC(ai, GF_FSArgItem);
 			if (ai) {
@@ -418,12 +515,18 @@
 	if (inflags & GF_FS_FLAG_LOAD_META)
 		flags |= GF_FS_FLAG_LOAD_META;
 
-	if (inflags & GF_FS_FLAG_NO_MAIN_THREAD)
-		flags |= GF_FS_FLAG_NO_MAIN_THREAD;
+	if (inflags & GF_FS_FLAG_NON_BLOCKING)
+		flags |= GF_FS_FLAG_NON_BLOCKING;
 
 	if (inflags & GF_FS_FLAG_NO_GRAPH_CACHE)
 		flags |= GF_FS_FLAG_NO_GRAPH_CACHE;
 
+	if (inflags & GF_FS_FLAG_PRINT_CONNECTIONS)
+		flags |= GF_FS_FLAG_PRINT_CONNECTIONS;
+
+	if (inflags & GF_FS_FLAG_NO_IMPLICIT)
+		flags |= GF_FS_FLAG_NO_IMPLICIT;
+
 	if (gf_opts_get_bool("core", "dbg-edges"))
 		flags |= GF_FS_FLAG_PRINT_CONNECTIONS;
 
@@ -441,6 +544,8 @@
 
 	if (gf_opts_get_bool("core", "no-probe"))
 		flags |= GF_FS_FLAG_NO_PROBE;
+	else if (inflags & GF_FS_FLAG_NO_PROBE)
+		flags |= GF_FS_FLAG_NO_PROBE;
 
 	if (gf_opts_get_bool("core", "no-argchk"))
 		flags |= GF_FS_FLAG_NO_ARG_CHECK;
@@ -509,9 +614,14 @@
 	return session->max_resolve_chain_len;
 }
 
+GF_EXPORT
 void gf_fs_remove_filter_register(GF_FilterSession *session, GF_FilterRegister *freg)
 {
+	if (!session || !freg) return;
+
+	gf_mx_p(session->filters_mx);
 	gf_list_del_item(session->registry, freg);
+	gf_mx_v(session->filters_mx);
 	gf_filter_sess_reset_graph(session, freg);
 }
 
@@ -574,7 +684,7 @@
 	//temporary until we don't introduce fsess_stop
 	assert(fsess->run_status != GF_OK);
 	if (fsess->filters) {
-		u32 i, count=gf_list_count(fsess->filters);
+		u32 i, pass, count=gf_list_count(fsess->filters);
 		//first pass: disconnect all filters, since some may have references to property maps or packets 
 		for (i=0; i<count; i++) {
 			u32 j;
@@ -599,20 +709,30 @@
 				gf_list_del(filter->postponed_packets);
 				filter->postponed_packets = NULL;
 			}
+			gf_mx_p(filter->tasks_mx);
 			for (j=0; j<filter->num_input_pids; j++) {
 				GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, j);
 				gf_filter_pid_inst_reset(pidi);
 			}
+			gf_mx_v(filter->tasks_mx);
 			filter->scheduled_for_next_task = GF_FALSE;
 		}
 		//second pass, finalize all
-		for (i=0; i<count; i++) {
-			GF_Filter *filter = gf_list_get(fsess->filters, i);
-			if (filter->freg->finalize && !filter->finalized) {
-				filter->finalized = GF_TRUE;
-				FSESS_CHECK_THREAD(filter)
-				filter->freg->finalize(filter);
+		for (pass=0; pass<2; pass++) {
+			Bool has_scripts = GF_FALSE;
+			for (i=0; i<count; i++) {
+				GF_Filter *filter = gf_list_get(fsess->filters, i);
+				if (!pass && (filter->freg->flags & GF_FS_REG_SCRIPT)) {
+					has_scripts = GF_TRUE;
+					continue;
+				}
+				if (filter->freg->finalize && !filter->finalized) {
+					filter->finalized = GF_TRUE;
+					FSESS_CHECK_THREAD(filter)
+					filter->freg->finalize(filter);
+				}
 			}
+			if (!has_scripts) break;
 		}
 
 		while (gf_list_count(fsess->filters)) {
@@ -717,6 +837,11 @@
 		gf_list_del(fsess->auto_inc_nums);
 	}
 
+#ifdef GF_FS_ENABLE_LOCALES
+	if (fsess->uri_relocators) gf_list_del(fsess->uri_relocators);
+	if (fsess->locales.szAbsRelocatedPath) gf_free(fsess->locales.szAbsRelocatedPath);
+#endif
+
 	gf_free(fsess);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Session destroyed\n"));
 }
@@ -747,18 +872,15 @@
 }
 #endif
 
-
-void gf_fs_post_task_ex(GF_FilterSession *fsess, gf_fs_task_callback task_fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta, Bool is_configure, Bool force_direct_call)
+void gf_fs_post_task_ex(GF_FilterSession *fsess, gf_fs_task_callback task_fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta, Bool is_configure, Bool force_main_thread, Bool force_direct_call)
 {
 	GF_FSTask *task;
-	Bool force_main_thread = GF_FALSE;
 	Bool notified = GF_FALSE;
 
 	assert(fsess);
 	assert(task_fun);
 
-	//only flatten calls if in main thread (we still have some broken filters using threading
-	//that could trigger tasks
+	//only flatten calls if in main thread (we still have some broken filters using threading that could trigger tasks)
 	if ((force_direct_call || fsess->direct_mode)
 		&& (!filter || !filter->in_process)
 		&& fsess->tasks_in_process
@@ -786,6 +908,24 @@
 			return;
 		//asked to requeue the task, post it
 	}
+
+	/*this was a gf_filter_process_task request but direct call could not be done or requeue is requested.
+	process_task_queued was incremented by caller without checking for existing process task
+		- If the task was not treated, dec / inc will give the same state, undo process_task_queued increment
+		- If the task was requeued, dec will undo the increment done when requeing the task in gf_filter_check_pending_tasks
+
+	In both cases, inc will redo the same logic as in gf_filter_post_process_task_internal, not creating task if gf_filter_process_task is
+	already scheduled for the filter
+
+	We must use safe_int_dec/safe_int_inc here for multi thread cases - cf issue #1778
+	*/
+	if (force_direct_call) {
+		assert(filter);
+		safe_int_dec(&filter->process_task_queued);
+		if (safe_int_inc(&filter->process_task_queued) > 1) {
+			return;
+		}
+	}
 	task = gf_fq_pop(fsess->tasks_reservoir);
 
 	if (!task) {
@@ -808,20 +948,25 @@
 
 	if (filter) {
 		gf_mx_p(filter->tasks_mx);
+
 		//no tasks and not scheduled
 		if (! filter->scheduled_for_next_task && !gf_fq_count(filter->tasks)) {
 			notified = task->notified = GF_TRUE;
 
 			if (!force_main_thread)
-				force_main_thread = (filter->main_thread_forced || (filter->freg->flags & GF_FS_REG_MAIN_THREAD)) ? GF_TRUE : GF_FALSE;
+				force_main_thread = (filter->nb_main_thread_forced || (filter->freg->flags & GF_FS_REG_MAIN_THREAD)) ? GF_TRUE : GF_FALSE;
 		} else if (force_main_thread) {
+#if 0
 			force_main_thread = GF_FALSE;
 			if (filter->process_th_id && (fsess->main_th.th_id != filter->process_th_id)) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_SCHEDULER, ("Cannot post task to main thread, filter is already scheduled\n"));
 			}
+#endif
 		}
 		if (!force_main_thread)
-			task->blocking = (filter->freg->flags & GF_FS_REG_BLOCKING) ? GF_TRUE : GF_FALSE;
+			task->blocking = (filter->is_blocking_source) ? GF_TRUE : GF_FALSE;
+		else
+			task->force_main = GF_TRUE;
 
 		gf_fq_add(filter->tasks, task);
 		gf_mx_v(filter->tasks_mx);
@@ -829,6 +974,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u Posted task %p Filter %s::%s (%d (%d) pending, %d process tasks) on %s task list\n", gf_th_id(), task, filter->name, task->log_name, fsess->tasks_pending, gf_fq_count(filter->tasks), filter->process_task_queued, task->notified ? (force_main_thread ? "main" : "secondary") : "filter"));
 	} else {
 		task->notified = notified = GF_TRUE;
+		task->force_main = force_main_thread;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u Posted filter-less task %s (%d pending) on secondary task list\n", gf_th_id(), task->log_name, fsess->tasks_pending));
 	}
 
@@ -848,7 +994,7 @@
 
 		//notify/count tasks posted on the main task or regular task lists
 		safe_int_inc(&fsess->tasks_pending);
-		if (filter && force_main_thread) {
+		if (task->force_main) {
 			gf_fq_add(fsess->main_thread_tasks, task);
 			gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
 		} else {
@@ -861,11 +1007,10 @@
 
 void gf_fs_post_task(GF_FilterSession *fsess, gf_fs_task_callback task_fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta)
 {
-	gf_fs_post_task_ex(fsess, task_fun, filter, pid, log_name, udta, GF_FALSE, GF_FALSE);
+	gf_fs_post_task_ex(fsess, task_fun, filter, pid, log_name, udta, GF_FALSE, GF_FALSE, GF_FALSE);
 }
 
-GF_EXPORT
-Bool gf_fs_check_filter_register_cap(const GF_FilterRegister *f_reg, u32 incode, GF_PropertyValue *cap_input, u32 outcode, GF_PropertyValue *cap_output, Bool exact_match_only)
+Bool gf_fs_check_filter_register_cap_ex(const GF_FilterRegister *f_reg, u32 incode, GF_PropertyValue *cap_input, u32 outcode, GF_PropertyValue *cap_output, Bool exact_match_only, Bool out_cap_excluded)
 {
 	u32 j;
 	u32 has_raw_in = 0;
@@ -896,10 +1041,18 @@
 		if ( (cap->flags & GF_CAPFLAG_OUTPUT) && (cap->code == outcode) ) {
 			if (! (cap->flags & GF_CAPFLAG_EXCLUDED)) {
 				if (gf_props_equal(&cap->val, cap_output) ) {
-					has_cid_match = (cap->flags & GF_CAPS_OUTPUT_STATIC) ? 2 : 1;
+					if (out_cap_excluded) {
+						exclude_cid_out = (cap->flags & GF_CAPS_OUTPUT_STATIC) ? 2 : 1;
+					} else {
+						has_cid_match = (cap->flags & GF_CAPS_OUTPUT_STATIC) ? 2 : 1;
+					}
 				}
 			} else {
-				if (gf_props_equal(&cap->val, cap_output) ) {
+				Bool prop_equal = gf_props_equal(&cap->val, cap_output);
+				if (out_cap_excluded)
+					prop_equal = !prop_equal;
+
+				if (prop_equal) {
 					exclude_cid_out = (cap->flags & GF_CAPS_OUTPUT_STATIC) ? 2 : 1;
 				} else {
 					has_exclude_cid_out = (cap->flags & GF_CAPS_OUTPUT_STATIC) ? 2 : 1;
@@ -913,21 +1066,29 @@
 	}
 	return GF_FALSE;
 }
+GF_EXPORT
+Bool gf_fs_check_filter_register_cap(const GF_FilterRegister *f_reg, u32 incode, GF_PropertyValue *cap_input, u32 outcode, GF_PropertyValue *cap_output, Bool exact_match_only)
+{
+	return gf_fs_check_filter_register_cap_ex(f_reg, incode, cap_input, outcode, cap_output, exact_match_only, GF_FALSE);
+}
+
 static GF_Filter *gf_fs_load_encoder(GF_FilterSession *fsess, const char *args)
 {
 	GF_Err e;
 	char szCodec[3];
 	char *cid, *sep;
-	const GF_FilterRegister *candidate = NULL;
+	const GF_FilterRegister *candidate;
 	u32 codecid=0;
 	GF_Filter *filter;
 	u32 i, count;
 	GF_PropertyValue cap_in, cap_out;
+	GF_List *blacklist = NULL;
+	Bool ocap_excluded = GF_FALSE;
 	szCodec[0] = 'c';
 	szCodec[1] = fsess->sep_name;
 	szCodec[2] = 0;
 
-	cid = args ? strstr(args, szCodec) : NULL;
+	cid = strstr(args, szCodec);
 	if (!cid) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Missing codec identifier in \"enc\" definition: %s\n", args ? args : "no arguments"));
 		return NULL;
@@ -935,38 +1096,56 @@
 	sep = strchr(cid, fsess->sep_args);
 	if (sep) sep[0] = 0;
 
-	codecid = gf_codec_parse(cid+2);
+	codecid = gf_codecid_parse(cid+2);
+#if 0
 	if (codecid==GF_CODECID_NONE) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unrecognized codec identifier in \"enc\" definition: %s\n", cid));
 		if (sep) sep[0] = fsess->sep_args;
 		return NULL;
 	}
+#endif
 	if (sep) sep[0] = fsess->sep_args;
 
 	cap_in.type = GF_PROP_UINT;
 	cap_in.value.uint = GF_CODECID_RAW;
 	cap_out.type = GF_PROP_UINT;
-	cap_out.value.uint = codecid;
+	if (codecid==GF_CODECID_NONE) {
+		cap_out.value.uint = GF_CODECID_RAW;
+		ocap_excluded = GF_TRUE;
+	} else {
+		cap_out.value.uint = codecid;
+	}
 
+retry:
+	candidate = NULL;
 	count = gf_list_count(fsess->registry);
 	for (i=0; i<count; i++) {
 		const GF_FilterRegister *f_reg = gf_list_get(fsess->registry, i);
+		if (blacklist && (gf_list_find(blacklist, (void *) f_reg)>=0) )
+			continue;
 
-		if ( gf_fs_check_filter_register_cap(f_reg, GF_PROP_PID_CODECID, &cap_in, GF_PROP_PID_CODECID, &cap_out, GF_FALSE)) {
+		if ( gf_fs_check_filter_register_cap_ex(f_reg, GF_PROP_PID_CODECID, &cap_in, GF_PROP_PID_CODECID, &cap_out, GF_FALSE, ocap_excluded)) {
 			if (!candidate || (candidate->priority>f_reg->priority))
 				candidate = f_reg;
 		}
 	}
 	if (!candidate) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Cannot find any filter providing encoding for %s\n", cid));
+		if (blacklist) gf_list_del(blacklist);
 		return NULL;
 	}
 	filter = gf_filter_new(fsess, candidate, args, NULL, GF_FILTER_ARG_EXPLICIT, &e, NULL, GF_FALSE);
 	if (!filter) {
+		if (e==GF_NOT_SUPPORTED) {
+			if (!blacklist) blacklist = gf_list_new();
+			gf_list_add(blacklist, (void *) candidate);
+			goto retry;
+		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to load filter %s: %s\n", candidate->name, gf_error_to_string(e) ));
 	} else {
 		filter->encoder_stream_type = gf_codecid_type(codecid);
 	}
+	if (blacklist) gf_list_del(blacklist);
 	return filter;
 }
 
@@ -976,6 +1155,8 @@
 	u32 i, count;
 
 	if (!strcmp(name, "enc")) return GF_TRUE;
+	if ((strlen(name)>2) && (name[0]=='c') && (name[1]==fsess->sep_name))
+		return GF_TRUE;
 
 	count = gf_list_count(fsess->registry);
 	for (i=0;i<count;i++) {
@@ -987,11 +1168,86 @@
 	return GF_FALSE;
 }
 
-GF_EXPORT
-GF_Filter *gf_fs_load_filter(GF_FilterSession *fsess, const char *name, GF_Err *err_code)
+static Bool locate_js_script(char *path, const char *file_name, const char *file_ext)
+{
+	u32 len = (u32) strlen(path);
+	u32 flen = 20 + (u32) strlen(file_name);
+
+	char *apath = gf_malloc(sizeof(char) * (len+flen) );
+	if (!apath) return GF_FALSE;
+	strcpy(apath, path);
+
+	strcat(apath, file_name);
+	if (gf_file_exists(apath)) {
+		strncpy(path, apath, GF_MAX_PATH-1);
+		path[GF_MAX_PATH-1] = 0;
+		gf_free(apath);
+		return GF_TRUE;
+	}
+
+	if (!file_ext) {
+		strcat(apath, ".js");
+		if (gf_file_exists(apath)) {
+			strncpy(path, apath, GF_MAX_PATH-1);
+			path[GF_MAX_PATH-1] = 0;
+			gf_free(apath);
+			return GF_TRUE;
+		}
+	}
+	apath[len] = 0;
+	strcat(apath, file_name);
+	strcat(apath, "/init.js");
+	if (gf_file_exists(apath)) {
+		strncpy(path, apath, GF_MAX_PATH-1);
+		path[GF_MAX_PATH-1] = 0;
+		gf_free(apath);
+		return GF_TRUE;
+	}
+	gf_free(apath);
+	return GF_FALSE;
+}
+
+Bool gf_fs_solve_js_script(char *szPath, const char *file_name, const char *file_ext)
+{
+	const char *js_dirs;
+	if (gf_opts_default_shared_directory(szPath)) {
+		strcat(szPath, "/scripts/jsf/");
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Trying JS filter %s\n", szPath));
+		if (locate_js_script(szPath, file_name, file_ext)) {
+			return GF_TRUE;
+		}
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Failed to get default shared dir\n"));
+	}
+	js_dirs = gf_opts_get_key("core", "js-dirs");
+	while (js_dirs && js_dirs[0]) {
+		char *sep = strchr(js_dirs, ',');
+		if (sep) {
+			u32 cplen = (u32) (sep-js_dirs);
+			if (cplen>=GF_MAX_PATH) cplen = GF_MAX_PATH-1;
+			strncpy(szPath, js_dirs, cplen);
+			szPath[cplen]=0;
+			js_dirs = sep+1;
+		} else {
+			strcpy(szPath, js_dirs);
+		}
+		if (strcmp(szPath, "$GJS")) {
+			u32 len = (u32) strlen(szPath);
+			if (len && (szPath[len-1]!='/') && (szPath[len-1]!='\\'))
+				strcat(szPath, "/");
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Trying JS filter in %s\n", szPath));
+			if (locate_js_script(szPath, file_name, file_ext))
+				return GF_TRUE;
+		}
+		if (!sep) break;
+	}
+	return GF_FALSE;
+}
+
+static GF_Filter *gf_fs_load_filter_internal(GF_FilterSession *fsess, const char *name, GF_Err *err_code, Bool *probe_only)
 {
 	const char *args=NULL;
-	const char *sep;
+	const char *sep, *file_ext;
 	u32 i, len, count = gf_list_count(fsess->registry);
 	Bool quiet = (err_code && (*err_code == GF_EOS)) ? GF_TRUE : GF_FALSE;
 
@@ -999,7 +1255,8 @@
 	assert(name);
 	if (err_code) *err_code = GF_OK;
 
-	sep = gf_fs_path_escape_colon(fsess, name);
+	//the first string before any option sep MUST be the filter registry name, so we don't use gf_fs_path_escape_colon here
+	sep = strchr(name, fsess->sep_args);
 	if (sep) {
 		args = sep+1;
 		len = (u32) (sep - name);
@@ -1015,6 +1272,10 @@
 	if (!strncmp(name, "enc", len)) {
 		return gf_fs_load_encoder(fsess, args);
 	}
+	if ((strlen(name)>2) && (name[0]=='c') && (name[1]==fsess->sep_name)) {
+		return gf_fs_load_encoder(fsess, name);
+	}
+
 	/*regular filter loading*/
 	for (i=0;i<count;i++) {
 		const GF_FilterRegister *f_reg = gf_list_get(fsess->registry, i);
@@ -1032,36 +1293,80 @@
 			filter = gf_filter_new(fsess, f_reg, args, NULL, argtype, err_code, NULL, GF_FALSE);
 			if (!filter) return NULL;
 			if (!filter->num_output_pids) {
+				//check we have a src specified for the filter
 				const char *src_url = strstr(name, "src");
-				if (src_url && (src_url[3]==fsess->sep_name))
-					gf_filter_post_process_task(filter);
+				if (src_url && (src_url[3]==fsess->sep_name)) {
+					const GF_FilterArgs *f_args = filter->instance_args ? filter->instance_args : f_reg->args;
+					//check the filter has an src argument
+					//we don't want to call process on a filter not acting as source until at least one input is connected
+					i=0;
+					while (f_args && f_args[i].arg_name) {
+						if (!strcmp(f_args[i].arg_name, "src")) {
+							gf_filter_post_process_task(filter);
+							break;
+						}
+						i++;
+					}
+				}
 			}
 			return filter;
 		}
 	}
 	/*check JS file*/
-	if (strstr(name, ".js") || strstr(name, ".jsf") || strstr(name, ".mjs") ) {
+	file_ext = gf_file_ext_start(name);
+	if (file_ext && (file_ext > sep) )
+		file_ext = NULL;
+
+	if (!file_ext || strstr(name, ".js") || strstr(name, ".jsf") || strstr(name, ".mjs") ) {
+		Bool file_exists = GF_FALSE;
+		char szName[10+GF_MAX_PATH];
 		char szPath[10+GF_MAX_PATH];
 		if (len>GF_MAX_PATH)
 			return NULL;
+
 		strncpy(szPath, name, len);
 		szPath[len]=0;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Trying JS filter %s\n", szPath));
 		if (gf_file_exists(szPath)) {
-			sprintf(szPath, "jsf%cjs%c", fsess->sep_args, fsess->sep_name);
-			strcat(szPath, name);
-			return gf_fs_load_filter(fsess, szPath, err_code);
+			file_exists = GF_TRUE;
+		} else {
+			strcpy(szName, szPath);
+			file_exists = gf_fs_solve_js_script(szPath, szName, file_ext);
+			if (!file_exists && !file_ext) {
+				strcat(szName, ".js");
+				if (gf_file_exists(szName)) {
+					strncpy(szPath, name, len);
+					szPath[len]=0;
+					strcat(szPath, ".js");
+					file_exists = GF_TRUE;
+				}
+			}
 		}
-	}
 
-	if (!quiet) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to load filter %s: no such filter registry\n", name));
+		if (file_exists) {
+			if (probe_only) {
+				*probe_only = GF_TRUE;
+				return NULL;
+			}
+			sprintf(szName, "jsf%cjs%c", fsess->sep_args, fsess->sep_name);
+			strcat(szName, szPath);
+			if (name[len])
+				strcat(szName, name+len);
+			return gf_fs_load_filter(fsess, szName, err_code);
+		}
 	}
 	if (err_code) *err_code = GF_FILTER_NOT_FOUND;
 	return NULL;
 }
 
+GF_EXPORT
+GF_Filter *gf_fs_load_filter(GF_FilterSession *fsess, const char *name, GF_Err *err_code)
+{
+	return gf_fs_load_filter_internal(fsess, name, err_code, NULL);
+}
+
 //in mono thread mode, we cannot always sleep for the requested timeout in case there are more tasks to be processed
-//this defines the number of pending tasks above wich we limit sleep
+//this defines the number of pending tasks above which we limit sleep
 #define MONOTH_MIN_TASKS	2
 //this defines the sleep time for this case
 #define MONOTH_MIN_SLEEP	5
@@ -1094,7 +1399,7 @@
 
 	safe_int_inc(&fsess->active_threads);
 
-	if (!thid && fsess->no_main_thread) {
+	if (!thid && fsess->non_blocking) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc enter\n"));
 	}
 
@@ -1149,17 +1454,35 @@
 				force_secondary_tasks = GF_FALSE;
 			} else {
 				task = gf_fq_pop(fsess->tasks);
+				if (task && (task->force_main || (task->filter && task->filter->nb_main_thread_forced) ) ) {
+					//post to main
+					gf_fq_add(fsess->main_thread_tasks, task);
+					gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
+					continue;
+				}
 			}
-			if (task) {
-				assert( task->run_task );
-				assert( task->notified );
-			}
+			assert(!task || task->run_task );
+			assert(!task || task->notified );
 		} else {
 			//keep task in filter tasks list until done
 			task = gf_fq_head(current_filter->tasks);
 			if (task) {
 				assert( task->run_task );
 				assert( ! task->notified );
+
+				//task was requested for main thread
+				if ((task->force_main || current_filter->nb_main_thread_forced) && thid) {
+					//make task notified and increase pending tasks
+					task->notified = GF_TRUE;
+					safe_int_inc(&fsess->tasks_pending);
+
+					//post to main
+					gf_fq_add(fsess->main_thread_tasks, task);
+					gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
+					//disable current filter
+					current_filter = NULL;
+					continue;
+				}
 			}
 		}
 
@@ -1222,7 +1545,7 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: no task available\n", sys_thid));
 
 			//no main thread, return
-			if (!thid && fsess->no_main_thread) {
+			if (!thid && fsess->non_blocking) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc exit\n"));
 				return 0;
 			}
@@ -1232,6 +1555,7 @@
 			}
 			continue;
 		}
+
 #ifdef CHECK_TASK_LIST_INTEGRITY
 		check_task_list(fsess->main_thread_tasks, task);
 		check_task_list(fsess->tasks, task);
@@ -1334,9 +1658,13 @@
 					//little optim here: if this is the main thread and we have other tasks pending
 					//check the timing of tasks in the secondary list. If a task is present with smaller time than
 					//the head of the main task, force a temporary swap to the secondary task list
-					if (!thid && task->notified && diff>10) {
-						next = gf_fq_head(fsess->tasks);
-						if (next && !next->blocking) {
+					if (!thid && task->notified && (diff > MONOTH_MIN_SLEEP) ) {
+						u32 idx=0;
+						while (1) {
+							next = gf_fq_get(fsess->tasks, idx);
+							if (!next || next->blocking) break;
+							idx++;
+
 							u64 next_time_main = task->schedule_next_time;
 							u64 next_time_secondary = next->schedule_next_time;
 							//if we have several threads, also check the next task on the main task list
@@ -1346,11 +1674,12 @@
 								if (next_main && (next_time_main > next_main->schedule_next_time))
 									next_time_main = next_main->schedule_next_time;
 							}
-							
+
 							if (next_time_secondary<next_time_main) {
-								GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: forcing secondary task list on main - current task schedule time "LLU" (diff to now %d) vs next time secondary "LLU" (%s::%s)\n", sys_thid, task->schedule_next_time, (s32) diff, next_time_secondary, next->filter->freg->name, next->log_name));
+								GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: forcing secondary task list on main - current task schedule time "LLU" (diff to now %d) vs next time secondary "LLU" (%s::%s)\n", sys_thid, task->schedule_next_time, (s32) diff, next_time_secondary, next->filter ? next->filter->freg->name : "", next->log_name));
 								diff = 0;
 								force_secondary_tasks = GF_TRUE;
+								break;
 							}
 						}
 					}
@@ -1461,6 +1790,9 @@
 		safe_int_inc(& fsess->tasks_in_process );
 		assert( task->run_task );
 		task_time = gf_sys_clock_high_res();
+		//remember the last time we scheduled this filter
+		if (task->filter)
+			task->filter->last_schedule_task_time = task_time;
 
 		task->can_swap = GF_FALSE;
 		task->requeue_request = GF_FALSE;
@@ -1651,7 +1983,7 @@
 
 
 		//no main thread, return
-		if (!thid && fsess->no_main_thread && !current_filter && !fsess->pid_connect_tasks_pending) {
+		if (!thid && fsess->non_blocking && !current_filter && !fsess->pid_connect_tasks_pending) {
 			gf_rmt_end();
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc exit\n"));
 			return 0;
@@ -1661,7 +1993,7 @@
 	gf_rmt_end();
 
 	//no main thread, return
-	if (!thid && fsess->no_main_thread) {
+	if (!thid && fsess->non_blocking) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc exit\n"));
 		return 0;
 	}
@@ -1690,6 +2022,13 @@
 	u32 i, nb_threads;
 	assert(fsess);
 
+	//non blocking mode and threads created, only run main thread proc
+	if (fsess->non_blocking && (fsess->non_blocking==2) ) {
+		gf_fs_thread_proc(&fsess->main_th);
+		return fsess->run_status;
+	}
+
+	//run threads
 	fsess->run_status = GF_OK;
 	fsess->main_th.has_seen_eot = GF_FALSE;
 	fsess->nb_threads_stopped = 0;
@@ -1699,11 +2038,17 @@
 		GF_SessionThread *sess_th = gf_list_get(fsess->threads, i);
 		gf_th_run(sess_th->th, (gf_thread_run) gf_fs_thread_proc, sess_th);
 	}
-	if (fsess->no_main_thread) return GF_OK;
 
+	//run main thread
 	gf_fs_thread_proc(&fsess->main_th);
 
-	//wait for all threads to be done
+	//non blocking mode init, don't wait for other threads
+	if (fsess->non_blocking) {
+		fsess->non_blocking = 2;
+		return fsess->run_status;
+	}
+
+	//blocking mode, wait for all threads to be done
 	while (nb_threads+1 != fsess->nb_threads_stopped) {
 		gf_sleep(1);
 	}
@@ -1711,24 +2056,35 @@
 	return fsess->run_status;
 }
 
-void gf_fs_run_step(GF_FilterSession *fsess)
+static void filter_abort_task(GF_FSTask *task)
 {
-	gf_fs_thread_proc(&fsess->main_th);
+	GF_FilterEvent evt;
+	GF_FEVT_INIT(evt, GF_FEVT_STOP, task->pid);
+
+	task->pid->filter->freg->process_event(task->pid->filter, &evt);
+	gf_filter_pid_set_eos(task->pid);
+	task->pid->filter->disabled = GF_TRUE;
+	safe_int_dec(&task->pid->filter->abort_pending);
+
 }
 
 GF_EXPORT
-GF_Err gf_fs_abort(GF_FilterSession *fsess, Bool do_flush)
+GF_Err gf_fs_abort(GF_FilterSession *fsess, GF_FSFlushType flush_type)
 {
 	u32 i, count;
-	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Session abort from user, stoping sources\n"));
+	Bool threaded;
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Session abort from user, stopping sources\n"));
 	if (!fsess) return GF_BAD_PARAM;
+	threaded = (!fsess->filters_mx && (fsess->main_th.th_id==gf_th_id())) ? GF_FALSE : GF_TRUE;
 
-	if (!do_flush) {
+	if (flush_type==GF_FS_FLUSH_NONE) {
 		fsess->in_final_flush = GF_TRUE;
 		fsess->run_status = GF_EOS;
 		return GF_OK;
 	}
 
+	fsess->in_final_flush = GF_TRUE;
+
 	gf_mx_p(fsess->filters_mx);
 	count = gf_list_count(fsess->filters);
 	//disable all sources
@@ -1737,30 +2093,93 @@
 		//force end of session on all sources, and on all filters connected to these sources, and dispatch end of stream on all outputs pids of these filters
 		//if we don't propagate on connected filters, we take the risk of not deactivating demuxers working from file
 		//(eg ignoring input packets)
+		//
+		//we shortcut the thread execution state here by directly calling set_eos, we need to lock/unlock our filters carefully
+		//to avoid deadlocks or crashes
+		gf_mx_p(filter->tasks_mx);
+
 		if (!filter->num_input_pids) {
 			u32 j, k, l;
 			filter->disabled = GF_TRUE;
 			for (j=0; j<filter->num_output_pids; j++) {
+				const GF_PropertyValue *p;
 				GF_FilterPid *pid = gf_list_get(filter->output_pids, j);
+				//unlock before forcing eos as this could trigger a post task on a filter waiting for this mutex to be unlocked
+				gf_mx_v(filter->tasks_mx);
 				gf_filter_pid_set_eos(pid);
+				gf_mx_p(filter->tasks_mx);
+				//if the PID has a codecid set (demuxed pid, e.g. ffavin or other grabbers), do not force STOP on its destinations
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+				if (p) continue;
+				
 				for (k=0; k<pid->num_destinations; k++) {
+					Bool force_disable = GF_TRUE;
 					GF_FilterPidInst *pidi = gf_list_get(pid->destinations, k);
-					pidi->filter->disabled = GF_TRUE;
+					gf_mx_v(filter->tasks_mx);
+					gf_mx_p(pidi->filter->tasks_mx);
 					for (l=0; l<pidi->filter->num_output_pids; l++) {
 						GF_FilterPid *opid = gf_list_get(pidi->filter->output_pids, l);
+						//We cannot directly call process_event as this would make concurrent access to the filter
+						//which we guarantee we will never do
+						//but we don't want to send a regular stop event which will reset PID buffers, so:
+						//- if called in main thread of session in single-thread mode we can safely force a STOP event
+						//otherwise:
+						//- post a task to the filter
+						//- only disable the filter once the filter_abort has been called
+						//- only move to EOS if no filter_abort is pending
+						//
 						if (opid->filter->freg->process_event) {
-							GF_FilterEvent evt;
-							GF_FEVT_INIT(evt, GF_FEVT_STOP, opid);
-							opid->filter->freg->process_event(opid->filter, &evt);
+							if (threaded) {
+								safe_int_inc(&opid->filter->abort_pending);
+								gf_fs_post_task(opid->filter->session, filter_abort_task, opid->filter, opid, "filter_abort", NULL);
+								force_disable = GF_FALSE;
+							} else {
+								GF_FilterEvent evt;
+								GF_FEVT_INIT(evt, GF_FEVT_STOP, opid);
+
+								opid->filter->freg->process_event(opid->filter, &evt);
+								gf_filter_pid_set_eos(opid);
+							}
+						} else {
+							gf_filter_pid_set_eos(opid);
 						}
-						gf_filter_pid_set_eos(opid);
 					}
+					gf_mx_v(pidi->filter->tasks_mx);
+					gf_mx_p(filter->tasks_mx);
+					//no filter_abort pending, disable the filter
+					if (force_disable)
+						pidi->filter->disabled = GF_TRUE;
+				}
+			}
+		}
+		//fast flush and this is a sink: send a stop from all filters connected to the sink
+		if ((flush_type==GF_FS_FLUSH_FAST) && !filter->num_output_pids) {
+			u32 j;
+			for (j=0; j<filter->num_input_pids; j++) {
+				GF_FilterEvent evt;
+				GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, j);
+				const GF_PropertyValue *p = gf_filter_pid_get_property((GF_FilterPid *) pidi, GF_PROP_PID_STREAM_TYPE);
+				//if pid is of type FILE, we keep the last connections to the sink active so that muxers can still dispatch pending packets
+				if (p && (p->value.uint==GF_STREAM_FILE)) {
+					u32 k;
+					gf_mx_p(pidi->pid->filter->tasks_mx);
+					for (k=0; k<pidi->pid->filter->num_input_pids; k++) {
+						GF_FilterPid *pid = gf_list_get(pidi->pid->filter->input_pids, k);
+						GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
+						gf_filter_pid_send_event(pid, &evt);
+					}
+					gf_mx_v(pidi->pid->filter->tasks_mx);
+				}
+				//otherwise send STOP right away
+				else {
+					GF_FEVT_INIT(evt, GF_FEVT_STOP, (GF_FilterPid *) pidi);
+					gf_filter_pid_send_event((GF_FilterPid *) pidi, &evt);
 				}
 			}
 		}
-	}
-	fsess->in_final_flush = GF_TRUE;
 
+		gf_mx_v(filter->tasks_mx);
+	}
 	gf_mx_v(fsess->filters_mx);
 	return GF_OK;
 }
@@ -1775,15 +2194,17 @@
 		return GF_OK;
 	}
 
-	if (!fsess->run_status)
+	if (!fsess->run_status) {
+		fsess->in_final_flush = GF_TRUE;
 		fsess->run_status = GF_EOS;
+	}
 
 	for (i=0; i < count; i++) {
 		gf_fs_sema_io(fsess, GF_TRUE, GF_FALSE);
 	}
 
 	//wait for all threads to be done, we might still need flushing the main thread queue
-	while (fsess->no_main_thread) {
+	while (fsess->non_blocking) {
 		gf_fs_thread_proc(&fsess->main_th);
 		if (gf_fq_count(fsess->main_thread_tasks))
 			continue;
@@ -1793,7 +2214,7 @@
 		}
 		break;
 	}
-	if (fsess->no_main_thread) {
+	if (fsess->non_blocking) {
 		safe_int_inc(&fsess->nb_threads_stopped);
 		fsess->main_th.has_seen_eot = GF_TRUE;
 	}
@@ -1804,7 +2225,7 @@
 		}
 		gf_sleep(0);
 		//we may have tasks in main task list posted by other threads
-		if (fsess->no_main_thread) {
+		if (fsess->non_blocking) {
 			gf_fs_thread_proc(&fsess->main_th);
 			fsess->main_th.has_seen_eot = GF_TRUE;
 		}
@@ -1814,9 +2235,13 @@
 
 static GFINLINE void print_filter_name(GF_Filter *f, Bool skip_id, Bool skip_args)
 {
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s", f->freg->name));
-	if (strcmp(f->name, f->freg->name)) {
+	if (f->freg->flags & GF_FS_REG_SCRIPT) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" \"%s\"", f->name));
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s", f->freg->name));
+		if (strcmp(f->name, f->freg->name)) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" \"%s\"", f->name));
+		}
 	}
 	if (!skip_id && f->id) GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" ID %s", f->id));
 	if (f->dynamic_filter || skip_args) return;
@@ -1844,7 +2269,7 @@
 	u32 i, count;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
-	if (fsess->filters_mx) gf_mx_p(fsess->filters_mx);
+	gf_mx_p(fsess->filters_mx);
 
 	count=gf_list_count(fsess->filters);
 	for (i=0; i<count; i++) {
@@ -1859,6 +2284,8 @@
 		GF_Filter *f = gf_list_get(fsess->filters, i);
 		if (f->multi_sink_target) continue;
 
+		gf_mx_p(f->tasks_mx);
+
 		ipids = f->num_input_pids;
 		opids = f->num_output_pids;
 		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\tFilter "));
@@ -1891,7 +2318,11 @@
 		for (k=0; k<ipids; k++) {
 			GF_FilterPidInst *pid = gf_list_get(f->input_pids, k);
 			if (!pid->pid) continue;
-			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\t\t* input PID %s: %d packets received\n", pid->pid->name, pid->pid->nb_pck_sent));
+			if (pid->requires_full_data_block && (pid->nb_reagg_pck != pid->pid->nb_pck_sent) ) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\t\t* input PID %s: %d frames (%d packets) received\n", pid->pid->name, pid->nb_reagg_pck, pid->pid->nb_pck_sent));
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\t\t* input PID %s: %d packets received\n", pid->pid->name, pid->pid->nb_pck_sent));
+			}
 		}
 #ifndef GPAC_DISABLE_LOG
 		for (k=0; k<opids; k++) {
@@ -1903,8 +2334,9 @@
 		}
 #endif
 
+		gf_mx_v(f->tasks_mx);
 	}
-	if (fsess->filters_mx) gf_mx_v(fsess->filters_mx);
+	gf_mx_v(fsess->filters_mx);
 
 	count=gf_list_count(fsess->threads);
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Session stats - threads %d\n", 1+count));
@@ -1927,29 +2359,68 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\nTotal: run_time "LLU" us active_time "LLU" us nb_tasks "LLU"\n", run_time, active_time, nb_tasks));
 }
 
-static void gf_fs_print_filter_outputs(GF_Filter *f, GF_List *filters_done, u32 indent, GF_FilterPid *pid, GF_Filter *alias_for)
+static void gf_fs_print_filter_outputs(GF_Filter *f, GF_List *filters_done, u32 indent, GF_FilterPid *pid, GF_Filter *alias_for, u32 src_num_tiled_pids, Bool skip_print, s32 nb_recursion, u32 max_length)
 {
 	u32 i=0;
 
-	while (i<indent) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-"));
-		i++;
-	}
+	if (!skip_print) {
+		while (i<indent) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-"));
+			i++;
+		}
+
+		if (src_num_tiled_pids>1) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("(tilePID[%d]) ", src_num_tiled_pids));
+		}
+		else if (pid) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("(PID %s)", pid->name));
+		}
+		if (max_length) {
+			u32 l;
+			if (src_num_tiled_pids) {
+				char szName[50];
+				sprintf(szName, "PID[%d]", src_num_tiled_pids);
+				l = (u32) strlen(szName);
+			} else {
+				l = (u32) strlen(pid->name);
+			}
+			while (l<max_length) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" "));
+					l++;
+			}
+		}
+		if (nb_recursion>0) {
+			u32 k=0;
+			while (k<(u32) nb_recursion-1) {
+				k++;
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" "));
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\\\n"));
+			return;
+		}
+		if (pid) {
+			if (nb_recursion<0) {
+				u32 k=(u32) -nb_recursion;
+				while (k>1) {
+					k--;
+					GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-"));
+				}
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, (">"));
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" "));
+		}
 
-	if (pid) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("(PID %s) ", pid->name));
-	}
-	print_filter_name(f, GF_TRUE, GF_FALSE);
-	if (f->id) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" (ID=%s)\n", f->id));
-	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" (ptr=%p)\n", f));
+		print_filter_name(f, GF_TRUE, GF_FALSE);
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" (%s=%u)\n", f->dynamic_filter ? "dyn_idx" : "idx", 1+gf_list_find(f->session->filters, f) ));
 	}
-	if (gf_list_find(filters_done, f)>=0)
+
+	if (filters_done && (gf_list_find(filters_done, f)>=0))
 		return;
 
-	gf_list_add(filters_done, f);
-	if (alias_for) {
+	if (filters_done)
+		gf_list_add(filters_done, f);
+	if (alias_for && !skip_print) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" (<=> "));
 		print_filter_name(alias_for, GF_TRUE, GF_TRUE);
 		if (alias_for->id) {
@@ -1960,12 +2431,93 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (")\n"));
 	}
 
+	GF_List *dests = gf_list_new();
 	for (i=0; i<f->num_output_pids; i++) {
-		u32 j, k;
+		u32 j;
+		GF_FilterPid *pidout = gf_list_get(f->output_pids, i);
+		for (j=0; j<pidout->num_destinations; j++) {
+			GF_FilterPidInst *pidi = gf_list_get(pidout->destinations, j);
+			if (gf_list_find(dests, pidi->filter)<0)
+				gf_list_add(dests, pidi->filter);
+		}
+	}
+
+	while (gf_list_count(dests)) {
+	GF_Filter *dest = gf_list_pop_front(dests);
+	GF_List *pids = gf_list_new();
+	u32 max_name_len=0;
+	u32 num_tile_pids=0;
+	for (i=0; i<f->num_output_pids; i++) {
+		u32 j;
 		GF_FilterPid *pidout = gf_list_get(f->output_pids, i);
 		for (j=0; j<pidout->num_destinations; j++) {
 			GF_FilterPidInst *pidi = gf_list_get(pidout->destinations, j);
+			if (pidi->filter != dest) continue;
+			gf_list_add(pids, pidi);
+		}
+		u32 plen = (u32) strlen(pidout->name);
+
+		const GF_PropertyValue *p = gf_filter_pid_get_property(pidout, GF_PROP_PID_CODECID);
+		if (p &&
+			((p->value.uint==GF_CODECID_HEVC_TILES) || (p->value.uint==GF_CODECID_VVC_SUBPIC))
+		) {
+			plen = 0;
+			if (!num_tile_pids) {
+				for (j=0; j<f->num_output_pids; j++) {
+					GF_FilterPid *apid = gf_list_get(f->output_pids, j);
+					p = gf_filter_pid_get_property(apid, GF_PROP_PID_CODECID);
+					if (p &&
+						((p->value.uint==GF_CODECID_HEVC_TILES) || (p->value.uint==GF_CODECID_VVC_SUBPIC))
+					) {
+						num_tile_pids++;
+					}
+				}
+				plen = 5;
+				j=0;
+				while (j<num_tile_pids) {
+					plen+=1;
+					j+=10;
+				}
+			}
+		}
+		if (plen>max_name_len) max_name_len = plen;
+	}
+	s32 nb_pids_print = gf_list_count(pids);
+	if (nb_pids_print==1) nb_pids_print = 0;
+	if (num_tile_pids) nb_pids_print -= num_tile_pids-1;
+	s32 nb_final_pids = nb_pids_print;
+	if (nb_pids_print) nb_pids_print++;
+	Bool first_tile = GF_TRUE;
+
+	for (i=0; i<f->num_output_pids; i++) {
+		u32 j, k;
+		Bool is_tiled = GF_FALSE;
+		Bool skip_tiled = skip_print;
+
+		GF_FilterPid *pidout = gf_list_get(f->output_pids, i);
+		if (num_tile_pids) {
+			const GF_PropertyValue *p = gf_filter_pid_get_property(pidout, GF_PROP_PID_CODECID);
+			if (p &&
+				((p->value.uint==GF_CODECID_HEVC_TILES) || (p->value.uint==GF_CODECID_VVC_SUBPIC))
+			) {
+				is_tiled = GF_TRUE;
+			}
+		}
+
+		for (j=0; j<pidout->num_destinations; j++) {
 			GF_Filter *alias = NULL;
+			GF_FilterPidInst *pidi = gf_list_get(pidout->destinations, j);
+			if (pidi->filter != dest) continue;
+
+			gf_list_del_item(pids, pidi);
+			if (nb_pids_print && !gf_list_count(pids))
+				nb_pids_print = 0;
+			else if (is_tiled) {
+				if (!first_tile) continue;
+				nb_pids_print = 0;
+				first_tile = GF_FALSE;
+			}
+
 			for (k=0; k<gf_list_count(f->destination_filters); k++) {
 				alias = gf_list_get(f->destination_filters, k);
 				if (alias->multi_sink_target == pidi->filter)
@@ -1973,25 +2525,65 @@
 				alias = NULL;
 			}
 			if (alias) {
-
-				gf_fs_print_filter_outputs(alias, filters_done, indent+1, pidout, pidi->filter);
+				gf_fs_print_filter_outputs(alias, filters_done, indent+1, pidout, pidi->filter, is_tiled ? num_tile_pids : src_num_tiled_pids, skip_tiled, nb_pids_print-nb_final_pids, max_name_len);
 			} else {
-				gf_fs_print_filter_outputs(pidi->filter, filters_done, indent+1, pidout, NULL);
+				gf_fs_print_filter_outputs(pidi->filter, filters_done, indent+1, pidout, NULL, is_tiled ? num_tile_pids : src_num_tiled_pids, skip_tiled, nb_pids_print-nb_final_pids, max_name_len);
 			}
 		}
+		if (nb_pids_print) nb_pids_print++;
+	}
+	gf_list_del(pids);
+	}
+	gf_list_del(dests);
+}
+
+static void gf_fs_print_not_connected_filters(GF_FilterSession *fsess, GF_List *filters_done, Bool ignore_sinks)
+{
+	u32 i, count;
+	Bool has_unconnected=GF_FALSE;
+	count=gf_list_count(fsess->filters);
+	for (i=0; i<count; i++) {
+		GF_Filter *f = gf_list_get(fsess->filters, i);
+		//only dump not connected ones
+		if (f->num_input_pids || f->num_output_pids || f->multi_sink_target || f->nb_tasks_done) continue;
+		if (ignore_sinks) {
+			Bool has_outputs;
+			if (f->forced_caps)
+				has_outputs = gf_filter_has_out_caps(f->forced_caps, f->nb_forced_caps);
+			else
+				has_outputs = gf_filter_has_out_caps(f->freg->caps, f->freg->nb_caps);
+			if (!has_outputs) continue;
+		}
+
+		if (!has_unconnected) {
+			has_unconnected = GF_TRUE;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("Filters not connected:\n"));
+		}
+		gf_fs_print_filter_outputs(f, filters_done, 0, NULL, NULL, 0, GF_FALSE, 0, 0);
 	}
+}
 
+GF_EXPORT
+void gf_fs_print_non_connected(GF_FilterSession *fsess)
+{
+	gf_fs_print_not_connected_filters(fsess, NULL, GF_FALSE);
 }
+
+GF_EXPORT
+void gf_fs_print_non_connected_ex(GF_FilterSession *fsess, Bool ignore_sinks)
+{
+	gf_fs_print_not_connected_filters(fsess, NULL, ignore_sinks);
+}
+
 GF_EXPORT
 void gf_fs_print_connections(GF_FilterSession *fsess)
 {
 	u32 i, count;
 	Bool has_undefined=GF_FALSE;
 	Bool has_connected=GF_FALSE;
-	Bool has_unconnected=GF_FALSE;
 	GF_List *filters_done;
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
-	if (fsess->filters_mx) gf_mx_p(fsess->filters_mx);
+	gf_mx_p(fsess->filters_mx);
 
 	filters_done = gf_list_new();
 
@@ -2005,18 +2597,11 @@
 			has_connected = GF_TRUE;
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Filters connected:\n"));
 		}
-		gf_fs_print_filter_outputs(f, filters_done, 0, NULL, NULL);
-	}
-	for (i=0; i<count; i++) {
-		GF_Filter *f = gf_list_get(fsess->filters, i);
-		//only dump not connected ones
-		if (f->num_input_pids || f->num_output_pids || f->multi_sink_target) continue;
-		if (!has_unconnected) {
-			has_unconnected = GF_TRUE;
-			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Filters not connected:\n"));
-		}
-		gf_fs_print_filter_outputs(f, filters_done, 0, NULL, NULL);
+		gf_fs_print_filter_outputs(f, filters_done, 0, NULL, NULL, 0, GF_FALSE, 0, 0);
 	}
+
+	gf_fs_print_not_connected_filters(fsess, filters_done, GF_FALSE);
+
 	for (i=0; i<count; i++) {
 		GF_Filter *f = gf_list_get(fsess->filters, i);
 		if (f->multi_sink_target) continue;
@@ -2025,23 +2610,61 @@
 			has_undefined = GF_TRUE;
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Filters in unknown connection state:\n"));
 		}
-		gf_fs_print_filter_outputs(f, filters_done, 0, NULL, NULL);
+		gf_fs_print_filter_outputs(f, filters_done, 0, NULL, NULL, 0, GF_FALSE, 0, 0);
 	}
 
-	if (fsess->filters_mx) gf_mx_v(fsess->filters_mx);
+	gf_mx_v(fsess->filters_mx);
 	gf_list_del(filters_done);
 }
 
+GF_EXPORT
+void gf_fs_print_unused_args(GF_FilterSession *fsess, const char *ignore_args)
+{
+	u32 idx = 0;
+	char *argname;
+	u32 argtype;
+
+	while (1) {
+		Bool found = GF_FALSE;
+		const char *loc_arg;
+		if (gf_fs_enum_unmapped_options(fsess, &idx, &argname, &argtype)==GF_FALSE)
+			break;
+
+		loc_arg = ignore_args;
+		while (loc_arg) {
+			u32 len;
+			char *sep;
+			char *match = strstr(loc_arg, argname);
+			if (!match) break;
+			len = (u32) strlen(argname);
+			if (!match[len] || (match[len]==',')) {
+				found = GF_TRUE;
+				break;
+			}
+			sep = strchr(loc_arg, ',');
+			if (!sep) break;
+			loc_arg = sep+1;
+		}
+		if (found) continue;
+
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Arg %s set but not used\n", argname));
+	}
+}
 
 GF_EXPORT
 void gf_fs_send_update(GF_FilterSession *fsess, const char *fid, GF_Filter *filter, const char *name, const char *val, GF_EventPropagateType propagate_mask)
 {
 	GF_FilterUpdate *upd;
 	u32 i, count;
+	char *sep = NULL;
 	Bool removed = GF_FALSE;
 	if ((!fid && !filter) || !name) return;
+	if (!fsess) {
+		if (!filter) return;
+		fsess = filter->session;
+	}
 
-	if (fsess->filters_mx) gf_mx_p(fsess->filters_mx);
+	gf_mx_p(fsess->filters_mx);
 
 	if (!filter) {
 		GF_Filter *reg_filter = NULL;
@@ -2066,14 +2689,40 @@
 		filter = filter->multi_sink_target;
 
 	removed = (!filter || filter->removed || filter->finalized) ? GF_TRUE : GF_FALSE;
-	if (fsess->filters_mx) gf_mx_v(fsess->filters_mx);
+	gf_mx_v(fsess->filters_mx);
 
 	if (removed) return;
 
-	GF_SAFEALLOC(upd, GF_FilterUpdate);
 	if (!val) {
-		char *sep = strchr(name, fsess->sep_name);
+		sep = strchr(name, fsess->sep_name);
 		if (sep) sep[0] = 0;
+	}
+
+	//find arg and check if it is only a sync update - if so do it now
+	i=0;
+	while (filter->freg->args) {
+		const GF_FilterArgs *a = &filter->freg->args[i];
+		i++;
+		if (!a || !a->arg_name) break;
+
+		if ((a->flags & GF_FS_ARG_META) && !strcmp(a->arg_name, "*")) {
+			continue;
+		} else if (strcmp(a->arg_name, name)) {
+			continue;
+		}
+
+		if (a->flags & GF_FS_ARG_UPDATE_SYNC) {
+			gf_mx_p(filter->tasks_mx);
+			gf_filter_update_arg_apply(filter, name, sep ? sep+1 : val, GF_TRUE);
+			gf_mx_v(filter->tasks_mx);
+			if (sep) sep[0] = fsess->sep_name;
+			return;
+		}
+		break;
+	}
+
+	GF_SAFEALLOC(upd, GF_FilterUpdate);
+	if (!val) {
 		upd->name = gf_strdup(name);
 		upd->val = sep ? gf_strdup(sep+1) : NULL;
 		if (sep) sep[0] = fsess->sep_name;
@@ -2100,6 +2749,9 @@
 		char *ext_arg;
 		sprintf(szExtN, "ext%c", fsess->sep_name);
 		ext_arg = strstr(fargs, szExtN);
+		if (ext_arg && (ext_arg>fargs) && (ext_arg[-1] != fsess->sep_name))
+			ext_arg = NULL;
+
 		if (ext_arg) {
 			char *next_arg;
 			ext_arg+=4;
@@ -2133,7 +2785,7 @@
 				dst_arg=NULL;
 				break;
 			}
-			if (!strcmp(dst_arg->arg_name, "dst")) break;
+			if (!strcmp(dst_arg->arg_name, "dst") && !(dst_arg->flags&GF_FS_ARG_SINK_ALIAS)) break;
 			dst_arg = NULL;
 			j++;
 		}
@@ -2180,6 +2832,28 @@
 	return GF_FPROBE_SUPPORTED;
 }
 
+static GF_Filter *locate_alias_sink(GF_Filter *filter, const char *url, const char *mime_type)
+{
+	u32 i;
+	for (i=0; i<filter->num_output_pids; i++) {
+		u32 j;
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		for (j=0; j<pid->num_destinations; j++) {
+			GF_Filter *f;
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
+			if (!pidi->filter) continue;
+			if (pidi->filter->act_as_sink && pidi->filter->freg->use_alias
+				&& pidi->filter->freg->use_alias(pidi->filter, url, mime_type)
+			) {
+				return pidi->filter;
+			}
+			//recursovely walk towards the sink
+			f = locate_alias_sink(pidi->filter, url, mime_type);
+			if (f) return f;
+		}
+	}
+	return NULL;
+}
 
 GF_Filter *gf_fs_load_source_dest_internal(GF_FilterSession *fsess, const char *url, const char *user_args, const char *parent_url, GF_Err *err, GF_Filter *filter, GF_Filter *dst_filter, Bool for_source, Bool no_args_inherit, Bool *probe_only)
 {
@@ -2197,6 +2871,10 @@
 	Bool free_url=GF_FALSE;
 	memset(szExt, 0, sizeof(szExt));
 
+	if (!url) {
+		if (err) *err = GF_BAD_PARAM;
+		return NULL;
+	}
 	if (err) *err = GF_OK;
 
 	mime_type = NULL;
@@ -2216,12 +2894,10 @@
 		}
 	}
 	sURL = NULL;
-	if (!url || !strncmp(url, "\\\\", 2) ) {
-		return NULL;
-	}
 	if (filter) {
 		sURL = (char *) url;
 	} else {
+		Bool is_local;
 		/*used by GUIs scripts to skip URL concatenation*/
 		if (!strncmp(url, "gpac://", 7)) sURL = gf_strdup(url+7);
 		/*opera-style localhost URLs*/
@@ -2237,8 +2913,14 @@
 			memmove(sURL, sURL+7, ulen);
 			sURL[ulen]=0;
 		}
+		//remove any filter arguments in URL before checking if it is local
+		//not doing so will lead wrong result if one argument is a URL (eg ":#BUrl=http://")
+		sep = (char *) gf_fs_path_escape_colon(fsess, sURL);
+		if (sep) sep[0] = 0;
+		is_local = gf_url_is_local(sURL);
+		if (sep) sep[0] = fsess->sep_args;
 
-		if (for_source && gf_url_is_local(sURL)) {
+		if (for_source && is_local && !strstr(sURL, "isobmff://")) {
 			char *frag_par, *cgi, *ext_start;
 			char f_c=0;
 			gf_url_to_fs_path(sURL);
@@ -2257,12 +2939,31 @@
 				frag_par[0] = 0;
 			}
 
-			if (strcmp(sURL, "null") && strcmp(sURL, "-") && strcmp(sURL, "stdin") && ! gf_file_exists(sURL)) {
+			if (strcmp(sURL, "null") && strncmp(sURL, "rand", 4) && strcmp(sURL, "-") && strcmp(sURL, "stdin") && ! gf_file_exists(sURL)) {
+				char szPath[GF_MAX_PATH];
+				Bool try_js = gf_fs_solve_js_script(szPath, sURL, NULL);
 				if (sep) sep[0] = fsess->sep_args;
 				if (frag_par) frag_par[0] = f_c;
+				gf_free(sURL);
+
+				if (try_js) {
+					if (!strncmp(url, "gpac://", 7)) url += 7;
+					filter = gf_fs_load_filter_internal(fsess, url, err, probe_only);
+					if (probe_only) return NULL;
+
+					if (filter) {
+						//for link resolution
+						if (dst_filter)	{
+							if (gf_list_find(filter->destination_links, dst_filter)<0)
+								gf_list_add(filter->destination_links, dst_filter);
+							//to remember our connection target
+							filter->target_filter = dst_filter;
+						}
+					}
+					return filter;
+				}
 
 				if (err) *err = GF_URL_ERROR;
-				gf_free(sURL);
 				return NULL;
 			}
 			if (frag_par) frag_par[0] = f_c;
@@ -2283,9 +2984,18 @@
 	if (force_freg)
 		force_freg += 6;
 
+
+	if (!for_source && dst_filter) {
+		alias_for_filter = locate_alias_sink(dst_filter, sURL, mime_type);
+		if (alias_for_filter) {
+			candidate_freg = (GF_FilterRegister *) alias_for_filter->freg;
+		}
+	}
+
 restart:
 	//check all our registered filters
 	count = gf_list_count(fsess->registry);
+	if (candidate_freg) count = 0;
 	for (i=0; i<count; i++) {
 		u32 j;
 		GF_FilterProbeScore s;
@@ -2303,7 +3013,7 @@
 				break;
 			}
 			if (for_source && !strcmp(src_dst_arg->arg_name, "src")) break;
-			else if (!for_source && !strcmp(src_dst_arg->arg_name, "dst")) break;
+			else if (!for_source && !strcmp(src_dst_arg->arg_name, "dst") && !(src_dst_arg->flags&GF_FS_ARG_SINK_ALIAS)) break;
 			src_dst_arg = NULL;
 			j++;
 		}
@@ -2372,7 +3082,7 @@
 		else arg_type = GF_FILTER_ARG_EXPLICIT_SOURCE;
 	}
 
-	if (!for_source && candidate_freg->use_alias) {
+	if (!for_source && !alias_for_filter && candidate_freg->use_alias) {
 		u32 fcount = gf_list_count(fsess->filters);
 		for (i=0; i<fcount; i++) {
 			GF_Filter *f = gf_list_get(fsess->filters, i);
@@ -2387,7 +3097,14 @@
 	if (!filter) {
 		filter = gf_filter_new(fsess, candidate_freg, args, NULL, arg_type, err, alias_for_filter, GF_FALSE);
 	} else {
-		filter->freg = candidate_freg;
+ //destroy underlying JS object - gf_filter_new_finalize always reassign it to JS_UNDEFINED
+#ifdef GPAC_HAS_QJS
+ jsfs_on_filter_destroyed(filter);
+#endif
+		if (filter->session->on_filter_create_destroy)
+			filter->session->on_filter_create_destroy(filter->session->rt_udta, filter, GF_TRUE);
+			
+ filter->freg = candidate_freg;
 		e = gf_filter_new_finalize(filter, args, arg_type);
 		if (err) *err = e;
 	}
@@ -2460,47 +3177,52 @@
 }
 
 GF_EXPORT
-Bool gf_filter_forward_gf_event(GF_Filter *filter, GF_Event *evt, Bool consumed, Bool skip_user)
+Bool gf_fs_forward_gf_event(GF_FilterSession *fsess, GF_Event *evt, Bool consumed, Bool skip_user)
 {
-	if (!filter || !filter->session || filter->session->in_final_flush) return GF_FALSE;
+	if (!fsess || fsess->in_final_flush) return GF_FALSE;
 
-	if (filter->session->event_listeners) {
+	if (fsess->event_listeners) {
 		GF_FSEventListener *el;
 		u32 i=0;
 
-		gf_mx_p(filter->session->evt_mx);
-		filter->session->in_event_listener ++;
-		gf_mx_v(filter->session->evt_mx);
-		while ((el = gf_list_enum(filter->session->event_listeners, &i))) {
+		gf_mx_p(fsess->evt_mx);
+		fsess->in_event_listener ++;
+		gf_mx_v(fsess->evt_mx);
+		while ((el = gf_list_enum(fsess->event_listeners, &i))) {
 			if (el->on_event(el->udta, evt, consumed)) {
-				filter->session->in_event_listener --;
+				fsess->in_event_listener --;
 				return GF_TRUE;
 			}
 		}
-		filter->session->in_event_listener --;
+		fsess->in_event_listener --;
 	}
 
-	if (!skip_user && !consumed && filter->session->ui_event_proc) {
+	if (!skip_user && !consumed && fsess->ui_event_proc) {
 		Bool res;
-//		term->nb_calls_in_event_proc++;
-		res = gf_fs_ui_event(filter->session, evt);
-//		term->nb_calls_in_event_proc--;
+		res = gf_fs_ui_event(fsess, evt);
 		return res;
 	}
 	return GF_FALSE;
 }
 
 GF_EXPORT
+Bool gf_filter_forward_gf_event(GF_Filter *filter, GF_Event *evt, Bool consumed, Bool skip_user)
+{
+	if (!filter) return GF_FALSE;
+	return gf_fs_forward_gf_event(filter->session, evt, consumed, skip_user);
+
+}
+
+GF_EXPORT
 Bool gf_filter_send_gf_event(GF_Filter *filter, GF_Event *evt)
 {
 	return gf_filter_forward_gf_event(filter, evt, GF_FALSE, GF_FALSE);
 }
 
 
-static void gf_fs_print_jsf_connection(GF_FilterSession *session, char *filter_name, void (*print_fn)(FILE *output, GF_SysPrintArgFlags flags, const char *fmt, ...) )
+static void gf_fs_print_jsf_connection(GF_FilterSession *session, char *filter_name, GF_Filter *js_filter, void (*print_fn)(FILE *output, GF_SysPrintArgFlags flags, const char *fmt, ...) )
 {
 	GF_CapsBundleStore capstore;
-	GF_Filter *js_filter;
 	const char *js_name = NULL;
 	GF_Err e=GF_OK;
 	u32 i, j, count, nb_js_caps;
@@ -2508,8 +3230,12 @@
 	GF_FilterRegister loaded_freg;
 	Bool has_output, has_input;
 
-	js_filter = gf_fs_load_filter(session, filter_name, &e);
-	if (!js_filter) return;
+	if (!js_filter) {
+		js_filter = gf_fs_load_filter(session, filter_name, &e);
+		if (!js_filter) return;
+	} else {
+		if (!filter_name) filter_name = (char *) js_filter->freg->name;
+	}
 
 	js_name = strrchr(filter_name, '/');
 	if (!js_name) js_name = strrchr(filter_name, '\\');
@@ -2568,7 +3294,7 @@
 
 	for (i=0; i<2; i++) {
 		GF_List *from = i ? sinks : sources;
-		char *type = i ? "sources" : "sinks";
+		char *type = i ? "sinks" : "sources";
 
 		count = gf_list_count(from);
 		if (!count) {
@@ -2612,13 +3338,13 @@
 {
 	Bool found = GF_FALSE;
 	GF_List *done;
-	u32 i, j, count;
+	u32 i, j, k, count;
 	u32 llev = gf_log_get_tool_level(GF_LOG_FILTER);
 
 	gf_log_set_tool_level(GF_LOG_FILTER, GF_LOG_INFO);
 	//load JS to inspect its connections
 	if (filter_name && strstr(filter_name, ".js")) {
-		gf_fs_print_jsf_connection(session, filter_name, print_fn);
+		gf_fs_print_jsf_connection(session, filter_name, NULL, print_fn);
 		gf_log_set_tool_level(GF_LOG_FILTER, llev);
 		return;
 	}
@@ -2653,6 +3379,28 @@
 					GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" %s", src->edges[j].src_reg->freg->name));
 				}
 				gf_list_add(done, (void *) src->edges[j].src_reg->freg->name);
+				if (session->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
+					if (print_fn)
+						print_fn(stderr, 0, " ( ", src->edges[j].src_reg->freg->name);
+					else {
+						GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" ( ", src->edges[j].src_reg->freg->name));
+					}
+					for (k=0; k<src->nb_edges; k++) {
+						if (src->edges[j].src_reg != src->edges[k].src_reg) continue;;
+
+						if (print_fn)
+							print_fn(stderr, 0, "%d->%d ", src->edges[k].src_cap_idx, src->edges[k].dst_cap_idx);
+						else {
+							GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%d->%d ", src->edges[k].src_cap_idx, src->edges[k].dst_cap_idx));
+						}
+
+					}
+					if (print_fn)
+						print_fn(stderr, 0, ")", src->edges[j].src_reg->freg->name);
+					else {
+						GF_LOG(GF_LOG_INFO, GF_LOG_APP, (")", src->edges[j].src_reg->freg->name));
+					}
+				}
 			}
 		}
 		if (print_fn)
@@ -2672,7 +3420,10 @@
 		count = gf_list_count(session->links);
 		for (i=0; i<count; i++) {
 			const GF_FilterRegDesc *src = gf_list_get(session->links, i);
-			if (!strcmp(src->freg->name, filter_name)) continue;
+			if (!strcmp(src->freg->name, filter_name)) {
+				if (!(src->freg->flags & GF_FS_REG_EXPLICIT_ONLY) || !(src->freg->flags & GF_FS_REG_ALLOW_CYCLIC))
+					continue;
+			}
 
 			for (j=0; j<src->nb_edges; j++) {
 				if (strcmp(src->edges[j].src_reg->freg->name, filter_name)) continue;
@@ -2684,6 +3435,27 @@
 						GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" %s", src->freg->name));
 					}
 					gf_list_add(done, (void *) src->freg->name);
+					if (session->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
+						if (print_fn)
+							print_fn(stderr, 0, " ( ", src->edges[j].src_reg->freg->name);
+						else {
+							GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" ( ", src->edges[j].src_reg->freg->name));
+						}
+						for (k=0; k<src->nb_edges; k++) {
+							if (src->edges[j].src_reg != src->edges[k].src_reg) continue;
+
+							if (print_fn)
+								print_fn(stderr, 0, "%d->%d ", src->edges[k].src_cap_idx, src->edges[k].dst_cap_idx);
+							else {
+								GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%d->%d ", src->edges[k].src_cap_idx, src->edges[k].dst_cap_idx));
+							}
+						}
+						if (print_fn)
+							print_fn(stderr, 0, ")", src->edges[j].src_reg->freg->name);
+						else {
+							GF_LOG(GF_LOG_INFO, GF_LOG_APP, (")", src->edges[j].src_reg->freg->name));
+						}
+				}
 				}
 			}
 			gf_list_reset(done);
@@ -2696,7 +3468,12 @@
 	}
 
 	if (!found && filter_name) {
-		if (print_fn)
+		GF_Err e = GF_OK;
+		GF_Filter *f = gf_fs_load_filter(session, filter_name, &e);
+		if (f) {
+			gf_fs_print_jsf_connection(session, filter_name, f, print_fn);
+		}
+		else if (print_fn)
 			print_fn(stderr, 1, "%s filter not found\n", filter_name);
 		else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("%s filter not found\n", filter_name));
@@ -2706,6 +3483,16 @@
 	gf_log_set_tool_level(GF_LOG_FILTER, llev);
 }
 
+GF_EXPORT
+void gf_filter_print_all_connections(GF_Filter *filter, void (*print_fn)(FILE *output, GF_SysPrintArgFlags flags, const char *fmt, ...) )
+{
+	if (!filter) return;
+	if (filter->freg->flags & GF_FS_REG_CUSTOM) {
+		gf_fs_print_jsf_connection(filter->session, NULL, filter, print_fn);
+	} else {
+		gf_fs_print_all_connections(filter->session, (char *) filter->freg->name, print_fn);
+	}
+}
 
 GF_EXPORT
 void gf_filter_get_session_caps(GF_Filter *filter, GF_FilterSessionCaps *caps)
@@ -2741,29 +3528,40 @@
 	}
 }
 
+static Bool gf_fsess_get_user_pass(void *usr_cbk, const char *site_url, char *usr_name, char *password)
+{
+	GF_Event evt;
+	GF_FilterSession *fsess = (GF_FilterSession *)usr_cbk;
+	evt.type = GF_EVENT_AUTHORIZATION;
+	evt.auth.site_url = site_url;
+	evt.auth.user = usr_name;
+	evt.auth.password = password;
+	return gf_fs_forward_gf_event(fsess, &evt, GF_FALSE, GF_FALSE);
+}
+
+static GF_DownloadManager *gf_fs_get_download_manager(GF_FilterSession *fs)
+{
+	if (!fs->download_manager) {
+		fs->download_manager = gf_dm_new(fs);
+
+		gf_dm_set_auth_callback(fs->download_manager, gf_fsess_get_user_pass, fs);
+	}
+	return fs->download_manager;
+}
+
 GF_EXPORT
 GF_DownloadManager *gf_filter_get_download_manager(GF_Filter *filter)
 {
-	GF_FilterSession *fsess;
 	if (!filter) return NULL;
-	fsess = filter->session;
-
-	if (!fsess->download_manager) {
-		fsess->download_manager = gf_dm_new(fsess);
-	}
-	return fsess->download_manager;
+	return gf_fs_get_download_manager(filter->session);
 }
 
 GF_EXPORT
-struct _gf_ft_mgr *gf_filter_get_font_manager(GF_Filter *filter)
+struct _gf_ft_mgr *gf_fs_get_font_manager(GF_FilterSession *fsess)
 {
 #ifdef GPAC_DISABLE_PLAYER
 	return NULL;
 #else
-	GF_FilterSession *fsess;
-	if (!filter) return NULL;
-	fsess = filter->session;
-
 	if (!fsess->font_manager) {
 		fsess->font_manager = gf_font_manager_new();
 	}
@@ -2771,6 +3569,13 @@
 #endif
 }
 
+GF_EXPORT
+struct _gf_ft_mgr *gf_filter_get_font_manager(GF_Filter *filter)
+{
+	if (!filter) return NULL;
+	return gf_fs_get_font_manager(filter->session);
+}
+
 void gf_fs_cleanup_filters(GF_FilterSession *fsess)
 {
 	assert(fsess->pid_connect_tasks_pending);
@@ -2808,7 +3613,7 @@
 #endif
 } GF_UserTask;
 
-static void gf_fs_user_task(GF_FSTask *task)
+static void do_fs_user_task(GF_FSTask *task, Bool free_log_name)
 {
 	u32 reschedule_ms=0;
 	GF_UserTask *utask = (GF_UserTask *)task->udta;
@@ -2829,23 +3634,38 @@
 	if (!task->requeue_request || utask->fsess->in_final_flush) {
 		gf_free(utask);
 		task->udta = NULL;
+		//we duplicated the name for user tasks
+		if (free_log_name)
+			gf_free((char *) task->log_name);
 		task->requeue_request = GF_FALSE;
 	} else {
 		task->schedule_next_time = gf_sys_clock_high_res() + 1000*reschedule_ms;
 	}
 }
+static void gf_fs_user_task(GF_FSTask *task)
+{
+	do_fs_user_task(task, GF_FALSE);
+}
+static void gf_fs_user_task_free_log(GF_FSTask *task)
+{
+	do_fs_user_task(task, GF_TRUE);
+}
+
 
 GF_EXPORT
 GF_Err gf_fs_post_user_task(GF_FilterSession *fsess, Bool (*task_execute) (GF_FilterSession *fsess, void *callback, u32 *reschedule_ms), void *udta_callback, const char *log_name)
 {
 	GF_UserTask *utask;
+	char *_log_name;
 	if (!fsess || !task_execute) return GF_BAD_PARAM;
 	GF_SAFEALLOC(utask, GF_UserTask);
 	if (!utask) return GF_OUT_OF_MEM;
 	utask->fsess = fsess;
 	utask->callback = udta_callback;
 	utask->task_execute = task_execute;
-	gf_fs_post_task(fsess, gf_fs_user_task, NULL, NULL, log_name ? log_name : "user_task", utask);
+	//dup mem for user task
+	_log_name = gf_strdup(log_name ? log_name : "user_task");
+	gf_fs_post_task_ex(fsess, gf_fs_user_task_free_log, NULL, NULL, _log_name, utask, GF_FALSE, fsess->force_main_thread_tasks, GF_FALSE);
 	return GF_OK;
 }
 
@@ -2871,11 +3691,18 @@
 	if (fsess->tasks_pending>1) return GF_FALSE;
 	if (gf_fq_count(fsess->main_thread_tasks)) return GF_FALSE;
 	if (gf_fq_count(fsess->tasks)) return GF_FALSE;
+	if (fsess->non_blocking && fsess->tasks_in_process) return GF_FALSE;
 	return GF_TRUE;
 }
 
 GF_EXPORT
-Bool gf_fs_mime_supported(GF_FilterSession *fsess, const char *mime)
+Bool gf_fs_in_final_flush(GF_FilterSession *fsess)
+{
+	if (!fsess) return GF_TRUE;
+	return fsess->in_final_flush;
+}
+GF_EXPORT
+Bool gf_fs_is_supported_mime(GF_FilterSession *fsess, const char *mime)
 {
 	u32 i, count;
 	//first pass on explicit mimes
@@ -2914,6 +3741,11 @@
 {
 	return session ? gf_list_count(session->filters) : 0;
 }
+GF_EXPORT
+GF_Filter *gf_fs_get_filter(GF_FilterSession *session, u32 idx)
+{
+	return session ? gf_list_get(session->filters, idx) : NULL;
+}
 
 GF_EXPORT
 GF_Err gf_filter_get_stats(GF_Filter *f, GF_FilterStats *stats)
@@ -2972,6 +3804,7 @@
 			set_name = GF_FALSE;
 		}
 	}
+	gf_mx_p(f->tasks_mx);
 	stats->nb_pid_in = f->num_input_pids;
 	for (i=0; i<f->num_input_pids; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(f->input_pids, i);
@@ -2981,7 +3814,7 @@
 		if (pidi->is_decoder_input) stats->type = GF_FS_STATS_FILTER_DECODE;
 		else if (pidi->is_encoder_input) stats->type = GF_FS_STATS_FILTER_ENCODE;
 
-		if (pidi->pid->stream_type==GF_STREAM_FILE)
+		if (pidi->pid && (pidi->pid->stream_type==GF_STREAM_FILE))
 			stats->type = GF_FS_STATS_FILTER_DEMUX;
 
 		if (pidi->last_ts_drop.num * stats->last_ts_drop.den >= stats->last_ts_drop.num * pidi->last_ts_drop.den)
@@ -3000,6 +3833,7 @@
 			set_name = GF_FALSE;
 		}
 	}
+	gf_mx_v(f->tasks_mx);
 	if (!stats->type && stats->codecid) {
 		if (!stats->nb_pid_out) {
 			stats->type = GF_FS_STATS_FILTER_MEDIA_SINK;
@@ -3037,6 +3871,40 @@
 	}
 }
 
+GF_EXPORT
+GF_Filter *gf_fs_new_filter(GF_FilterSession *fsess, const char *name, u32 flags, GF_Err *e)
+{
+	GF_Filter *f;
+	char szRegName[25];
+	GF_FilterRegister *reg;
+
+	GF_SAFEALLOC(reg, GF_FilterRegister);
+	if (!reg) {
+		*e = GF_OUT_OF_MEM;
+		return NULL;
+	}
+
+	reg->flags = 0;
+#ifndef GPAC_DISABLE_DOC
+	reg->author = "custom";
+	reg->description = "custom";
+	reg->help = "custom";
+#endif
+	reg->version = "custom";
+	sprintf(szRegName, "custom%p", reg);
+	reg->name = gf_strdup(name ? name : szRegName);
+	reg->flags = GF_FS_REG_CUSTOM | GF_FS_REG_EXPLICIT_ONLY;
+
+	if (flags & GF_FS_REG_MAIN_THREAD)
+		reg->flags |= GF_FS_REG_MAIN_THREAD;
+
+	f = gf_filter_new(fsess, reg, NULL, NULL, 0, e, NULL, GF_FALSE);
+	if (!f) return NULL;
+	if (name)
+		gf_filter_set_name(f, name);
+	return f;
+}
+
 #ifndef GPAC_DISABLE_3D
 
 
@@ -3156,10 +4024,118 @@
 #endif
 
 
-#ifdef FILTER_FIXME
+GF_EXPORT
+u32 gf_fs_get_http_max_rate(GF_FilterSession *fs)
+{
+	if (!fs->download_manager) {
+		gf_fs_get_download_manager(fs);
+		if (!fs->download_manager) return 0;
+	}
+	return gf_dm_get_data_rate(fs->download_manager);
+}
+
+GF_EXPORT
+GF_Err gf_fs_set_http_max_rate(GF_FilterSession *fs, u32 rate)
+{
+	if (!fs) return GF_OK;
+	if (!fs->download_manager) {
+		gf_fs_get_download_manager(fs);
+		if (!fs->download_manager) return GF_OUT_OF_MEM;
+	}
+	gf_dm_set_data_rate(fs->download_manager, rate);
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_fs_get_http_rate(GF_FilterSession *fs)
+{
+	if (!fs->download_manager) {
+		gf_fs_get_download_manager(fs);
+		if (!fs->download_manager) return 0;
+	}
+	return gf_dm_get_global_rate(fs->download_manager);
+}
+
+GF_EXPORT
+Bool gf_fs_is_supported_source(GF_FilterSession *session, const char *url, const char *parent_url)
+{
+	GF_Err e;
+	Bool is_supported = GF_FALSE;
+	gf_fs_load_source_dest_internal(session, url, NULL, parent_url, &e, NULL, NULL, GF_TRUE, GF_TRUE, &is_supported);
+	return is_supported;
+}
+
+
+GF_EXPORT
+Bool gf_fs_fire_event(GF_FilterSession *fs, GF_Filter *f, GF_FilterEvent *evt, Bool upstream)
+{
+	Bool ret = GF_FALSE;
+	if (!fs || !evt) return GF_FALSE;
+
+	GF_FilterPid *on_pid = evt->base.on_pid;
+	evt->base.on_pid = NULL;
+	if (f) {
+		if (evt->base.type==GF_FEVT_USER) {
+			if (f->freg->process_event && f->event_target) {
+				gf_mx_p(f->tasks_mx);
+				f->freg->process_event(f, evt);
+				gf_mx_v(f->tasks_mx);
+				ret = GF_TRUE;
+			}
+		}
+		if (!ret) {
+			gf_mx_p(f->tasks_mx);
+			if (f->num_output_pids && upstream) ret = GF_TRUE;
+			else if (f->num_input_pids && !upstream) ret = GF_TRUE;
+			if (ret)
+				gf_filter_send_event(f, evt, upstream);
+			gf_mx_v(f->tasks_mx);
+		}
+	} else {
+		u32 i, count;
+		gf_fs_lock_filters(fs, GF_TRUE);
+		count = gf_list_count(fs->filters);
+		for (i=0; i<count; i++) {
+			Bool canceled;
+			f = gf_list_get(fs->filters, i);
+			if (f->disabled || f->removed) continue;
+			if (f->multi_sink_target) continue;
+			if (!f->freg->process_event) continue;
+			if (!f->event_target) continue;
+
+			gf_mx_p(f->tasks_mx);
+			canceled = f->freg->process_event(f, evt);
+			gf_mx_v(f->tasks_mx);
+			ret = GF_TRUE;
+			if (canceled) break;
+		}
+		gf_fs_lock_filters(fs, GF_FALSE);
+	}
+	evt->base.on_pid = on_pid;
+	return ret;
+}
 
+GF_EXPORT
+GF_Err gf_fs_set_filter_creation_callback(GF_FilterSession *session, gf_fs_on_filter_creation on_create_destroy, void *udta, Bool force_sync)
+{
+	if (!session) return GF_BAD_PARAM;
+	session->rt_udta = udta;
+	session->on_filter_create_destroy = on_create_destroy;
+	session->force_main_thread_tasks = force_sync;
+	return GF_OK;
+}
 
-static Bool term_find_res(GF_TermLocales *loc, char *parent, char *path, char *relocated_path, char *localized_rel_path)
+GF_EXPORT
+void *gf_fs_get_rt_udta(GF_FilterSession *session)
+{
+	if (!session) return NULL;
+	return session->rt_udta;
+}
+
+
+#ifdef GF_FS_ENABLE_LOCALES
+
+static Bool fsess_find_res(GF_FSLocales *loc, char *parent, char *path, char *relocated_path, char *localized_rel_path)
 {
 	FILE *f;
 
@@ -3181,12 +4157,12 @@
 if this is the case, it returns the absolute localized path, otherwise it returns null.
 if the resource was localized, the last parameter is set to the localized relative path.
 */
-static Bool term_check_locales(void *__self, const char *locales_parent_path, const char *rel_path, char *relocated_path, char *localized_rel_path)
+static Bool fs_check_locales(void *__self, const char *locales_parent_path, const char *rel_path, char *relocated_path, char *localized_rel_path)
 {
 	char path[GF_MAX_PATH];
 	const char *opt;
 
-	GF_TermLocales *loc = (GF_TermLocales*)__self;
+	GF_FSLocales *loc = (GF_FSLocales*)__self;
 
 	/* Checks if the rel_path argument really contains a relative path (no ':', no '/' at the beginning) */
 	if (strstr(rel_path, "://") || (rel_path[0]=='/') || strstr(rel_path, ":\\") || !strncmp(rel_path, "\\\\", 2)) {
@@ -3228,7 +4204,7 @@
 		}
 
 		sprintf(path, "locales/%s/%s", lan, rel_path);
-		if (term_find_res(loc, (char *) locales_parent_path, (char *) path, relocated_path, localized_rel_path))
+		if (fsess_find_res(loc, (char *) locales_parent_path, (char *) path, relocated_path, localized_rel_path))
 			return 1;
 
 		/*recursively remove region (sub)tags*/
@@ -3237,18 +4213,40 @@
 			if (!sep) break;
 			sep[0] = 0;
 			sprintf(path, "locales/%s/%s", lan, rel_path);
-			if (term_find_res(loc, (char *) locales_parent_path, (char *) path, relocated_path, localized_rel_path))
+			if (fsess_find_res(loc, (char *) locales_parent_path, (char *) path, relocated_path, localized_rel_path))
 				return 1;
 		}
 	}
 
-	if (term_find_res(loc, (char *) locales_parent_path, (char *) rel_path, relocated_path, localized_rel_path))
+	if (fsess_find_res(loc, (char *) locales_parent_path, (char *) rel_path, relocated_path, localized_rel_path))
 		return 1;
 	/* if we did not find the localized file, both the relocated and localized strings are NULL */
 	strcpy(localized_rel_path, "");
 	strcpy(relocated_path, "");
 	return 0;
 }
+#endif
 
+static Bool gf_fs_relocate_url(GF_FilterSession *session, const char *service_url, const char *parent_url, char *out_relocated_url, char *out_localized_url)
+{
+#ifdef GF_FS_ENABLE_LOCALES
+	u32 i, count;
+
+	count = gf_list_count(session->uri_relocators);
+	for (i=0; i<count; i++) {
+		Bool result;
+		GF_URIRelocator *uri_relocator = gf_list_get(session->uri_relocators, i);
+		result = uri_relocator->relocate_uri(uri_relocator, parent_url, service_url, out_relocated_url, out_localized_url);
+		if (result) return 1;
+	}
 #endif
+	return 0;
+}
+
+GF_EXPORT
+Bool gf_filter_relocate_url(GF_Filter *filter, const char *service_url, const char *parent_url, char *out_relocated_url, char *out_localized_url)
+{
+	if (!filter) return 0;
+	return gf_fs_relocate_url(filter->session, service_url, parent_url, out_relocated_url, out_localized_url);
+}

gpac-1.0.1.tar.gz/src/filter_core/filter_session.h -> gpac-2.0.0.tar.gz/src/filter_core/filter_session.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / filters sub-project
@@ -58,6 +58,10 @@
 	u32 alloc_size;
 };
 
+//we use the same value internally but with reverse meaning
+#define GF_FS_FLAG_IMPLICIT_MODE	GF_FS_FLAG_NO_IMPLICIT
+
+
 #ifndef GF_PROPS_HASHTABLE_SIZE
 #define GF_PROPS_HASHTABLE_SIZE 0
 #endif
@@ -72,7 +76,7 @@
 	GF_List *properties;
 #endif
 	volatile u32 reference_count;
-	//number of references hold by packet references - since these may be destroyed at the end of the refering filter
+	//number of references hold by packet references - since these may be destroyed at the end of the referring filter
 	//the pid might be dead. This is only used for pid props maps
 	volatile u32 pckrefs_reference_count;
 	GF_FilterSession *session;
@@ -139,6 +143,32 @@
 } GF_FilterPacketInstance;
 
 
+/*URI relocators are used for containers like zip or ISO FF with file items. The relocator
+is in charge of translating the URI, potentially extracting the associated resource and sending
+back the new (local or not) URI. Only the interface is defined, URI translators are free to derive from them
+
+relocate a URI - if NULL is returned, this relocator is not concerned with the URI
+otherwise returns the translated URI
+*/
+
+#define GF_FS_URI_RELOCATOR	\
+	Bool (*relocate_uri)(void *__self, const char *parent_uri, const char *uri, char *out_relocated_uri, char *out_localized_uri);		\
+
+typedef struct __gf_uri_relocator GF_URIRelocator;
+
+struct __gf_uri_relocator
+{
+	GF_FS_URI_RELOCATOR
+};
+
+typedef struct
+{
+	GF_FS_URI_RELOCATOR
+	GF_FilterSession *sess;
+	char *szAbsRelocatedPath;
+} GF_FSLocales;
+
+
 //packet flags
 enum
 {
@@ -165,7 +195,9 @@
 	//2 bits for crypt type
 	GF_PCK_CMD_POS = 13,
 	GF_PCK_CMD_MASK = 0x3 << GF_PCK_CMD_POS,
-	//RESERVED bits [9,12]
+	GF_PCKF_FORCE_MAIN = 1<<12,
+	//RESERVED bits [8,11]
+
 	//2 bits for is_leading
 	GF_PCK_ISLEADING_POS = 6,
 	GF_PCK_ISLEADING_MASK = 0x3 << GF_PCK_ISLEADING_POS,
@@ -221,9 +253,6 @@
 
 	//for allocated memory packets
 	u32 alloc_size;
-	//for shared memory packets: 0: cloned mem, 1: read/write mem from source filter, 2: read-only mem from filter
-	//note that packets with frame_ifce are always considered as read-only memory
-	u32 filter_owns_mem;
 	gf_fsess_packet_destructor destructor;
 	//for packet reference packets (sharing data from other packets)
 	struct __gf_filter_pck *reference;
@@ -234,6 +263,12 @@
 	GF_PropertyMap *props;
 	//pid properties applying to this packet
 	GF_PropertyMap *pid_props;
+
+	//for shared memory packets: 0: cloned mem, 1: read/write mem from source filter, 2: read-only mem from filter
+	//note that packets with frame_ifce are always considered as read-only memory
+	u8 filter_owns_mem;
+	u8 is_dangling;
+
 };
 
 /*!
@@ -250,6 +285,7 @@
 	Bool requeue_request;
 	Bool can_swap;
 	Bool blocking;
+	Bool force_main;
 
 	u64 schedule_next_time;
 
@@ -262,7 +298,10 @@
 };
 
 void gf_fs_post_task(GF_FilterSession *fsess, gf_fs_task_callback fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta);
-void gf_fs_post_task_ex(GF_FilterSession *fsess, gf_fs_task_callback task_fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta, Bool requires_main_thread, Bool force_direct_call);
+/* extended version of gf_fs_post_task
+force_direct_call shall only be true for gf_filter_process_task
+*/
+void gf_fs_post_task_ex(GF_FilterSession *fsess, gf_fs_task_callback task_fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta, Bool is_configure, Bool force_main_thread, Bool force_direct_call);
 
 void gf_filter_pid_send_event_downstream(GF_FSTask *task);
 
@@ -287,14 +326,21 @@
 
 } GF_SessionThread;
 
+typedef enum {
+	GF_ARGTYPE_LOCAL = 0, //:arg syntax
+	GF_ARGTYPE_GLOBAL, //--arg syntax
+	GF_ARGTYPE_META, //old -+arg syntax
+	GF_ARGTYPE_META_REPORTING
+} GF_FSArgItemType;
+
 typedef struct
 {
 	char *argname;
-	u32 type;
+	GF_FSArgItemType type;
 	Bool found;
 } GF_FSArgItem;
 
-void gf_fs_push_arg(GF_FilterSession *session, const char *szArg, Bool was_found, u32 type);
+void gf_fs_push_arg(GF_FilterSession *session, const char *szArg, Bool was_found, GF_FSArgItemType type, GF_Filter *meta_filter);
 
 enum
 {
@@ -303,6 +349,9 @@
 	GF_FS_NOBLOCK
 };
 
+//#define GF_FS_ENABLE_LOCALES
+
+
 struct __gf_filter_session
 {
 	u32 flags;
@@ -310,7 +359,11 @@
 	Bool direct_mode;
 	volatile u32 tasks_in_process;
 	Bool requires_solved_graph;
-	Bool no_main_thread;
+	//non blicking session mode:
+	//0: session is blocking
+	//1: session is non-blocking and first call to gf_fs_run (extra threads not started)
+	//2: session is non-blocking and not first call to gf_fs_run (extra threads started)
+	u32 non_blocking;
 
 	GF_List *registry;
 	GF_List *filters;
@@ -428,6 +481,15 @@
 	GF_List *jstasks;
 	struct __jsfs_task *new_f_task, *del_f_task, *on_evt_task;
 #endif
+
+	gf_fs_on_filter_creation on_filter_create_destroy;
+	void *rt_udta;
+	Bool force_main_thread_tasks;
+
+#ifdef GF_FS_ENABLE_LOCALES
+	GF_List *uri_relocators;
+	GF_FSLocales locales;
+#endif
 };
 
 #ifdef GPAC_HAS_QJS
@@ -460,6 +522,16 @@
 	GF_FILTER_ARG_EXPLICIT_SINK,
 } GF_FilterArgType;
 
+typedef enum
+{
+	//filter cannot be cloned
+	GF_FILTER_NO_CLONE=0,
+	//filter can be cloned
+	GF_FILTER_CLONE,
+	//filter may be cloned in implicit link session mode only
+	GF_FILTER_CLONE_PROBE,
+} GF_FilterCloneType;
+
 struct __gf_filter
 {
 	const GF_FilterRegister *freg;
@@ -475,13 +547,17 @@
 	//but dynamic_source_ids still contains the unresolved pattern (eg ServiceID=*)
 	char *dynamic_source_ids;
 
+	char *restricted_source_id;
+	
 	//parent media session
 	GF_FilterSession *session;
 
 	//indicates the max number of additional input PIDs - muxers and scalable filters typically set this to (u32) -1
 	u32 max_extra_pids;
 
-	void (*on_setup_error)(GF_Filter *f, void *on_setup_error_udta, GF_Err e);
+	u32 subsession_id, subsource_id;
+
+	Bool (*on_setup_error)(GF_Filter *f, void *on_setup_error_udta, GF_Err e);
 	void *on_setup_error_udta;
 	GF_Filter *on_setup_error_filter;
 
@@ -493,7 +569,9 @@
 	char *src_args;
 	//allocated argument string of the destingation filter for filters dynamically loaded, if any
 	char *dst_args;
-
+	//filter tag
+	char *tag;
+	
 	//tasks pending for this filter. The first task in this list is also present in the filter session
 	//task list in order to avoid locking the main task list with a mutex
 	GF_FilterQueue *tasks;
@@ -513,7 +591,9 @@
 	Bool in_process_callback;
 	Bool no_probe;
 	Bool no_inputs;
-	
+	Bool is_blocking_source;
+	Bool force_demux;
+
 	s32 nb_pids_playing;
 
 	//list of pids connected to this filter
@@ -546,11 +626,13 @@
 	volatile u32 in_pid_connection_pending;
 	volatile u32 out_pid_connection_pending;
 	volatile u32 pending_packets;
+	volatile u32 nb_ref_packets;
 
 	volatile u32 stream_reset_pending;
 	volatile u32 num_events_queued;
 	volatile u32 detach_pid_tasks_pending;
 	volatile u32 nb_shared_packets_out;
+	volatile u32 abort_pending;
 	GF_List *postponed_packets;
 
 	//list of blacklisted filtered registries
@@ -568,6 +650,8 @@
 	GF_List *destination_filters;
 	//list of potential destination for which we need to perform link resolution
 	GF_List *destination_links;
+	//temp list of input PIDs during graph resolution, added during pid_init task and removed at pid_configure task
+	GF_List *temp_input_pids;
 
 	//statistics
 	//number of tasks executed by this filter
@@ -607,11 +691,12 @@
 	Bool finalized;
 	//filter is scheduled for removal: any filter connected to this filter will
 	//not be checked for graph resolution - destroy has not yet been posted
-	Bool removed;
+	//if value is 2, packets are still dispatched to this PID instance (pid reconfig)
+	u32 removed;
 	//setup has been notified
 	Bool setup_notified;
-	//filter loaded to solve a filter chain
-	Bool dynamic_filter;
+	//filter loaded to solve a filter chain - special value 2 is for dummy reframer when forcing demux
+	u32 dynamic_filter;
 	//filter block EOS queries
 	Bool block_eos;
 	//set when one input pid of the filter has been marked for removal through gf_filter_remove_src
@@ -621,7 +706,9 @@
 	//2 means temporary sticky, used when reconfiguring filter chain
 	u32 sticky;
 	//explicitly loaded filters are usually not cloned, except if this flag is set
-	Bool clonable;
+	GF_FilterCloneType clonable;
+	//set to true during pid link resolution for filters accepting a single pid
+	Bool in_link_resolution;
 	//one of the output PID needs reconfiguration
 	volatile u32 nb_caps_renegociate;
 
@@ -666,6 +753,8 @@
 	//for encoder filters, set to the corresponding stream type - used to discard filters during the resolution
 	u32 encoder_stream_type;
 
+	Bool act_as_sink;
+	Bool require_source_id;
 #ifndef GPAC_DISABLE_REMOTERY
 	rmtU32 rmt_hash;
 #endif
@@ -686,7 +775,7 @@
 
 	GF_Err in_connect_err;
 
-	Bool main_thread_forced;
+	volatile u32 nb_main_thread_forced;
 	Bool no_dst_arg_inherit;
 	GF_List *source_filters;
 
@@ -701,14 +790,24 @@
 
 	Bool event_target;
 
+	u64 last_schedule_task_time;
+
+	//set to NULL, or to the only source filter for this filter
+	//this is a helper for the graph resolver to avoid browing all input pids when checking
+	//for cycles or fetching last defined ID.
+	//typically helps for tiling case with hundreds of tiles
+	GF_Filter *single_source;
+
 #ifdef GPAC_HAS_QJS
 	char *iname;
 	JSValue jsval;
 #endif
+	//for external bindings
+	void *rt_udta;
 };
 
 GF_Filter *gf_filter_new(GF_FilterSession *fsess, const GF_FilterRegister *freg, const char *args, const char *dst_args, GF_FilterArgType arg_type, GF_Err *err, GF_Filter *multi_sink_target, Bool dynamic_filter);
-GF_Filter *gf_filter_clone(GF_Filter *filter);
+GF_Filter *gf_filter_clone(GF_Filter *filter, GF_Filter *source_filter);
 void gf_filter_del(GF_Filter *filter);
 
 Bool gf_filter_swap_source_register(GF_Filter *filter);
@@ -758,12 +857,12 @@
 	Bool last_block_ended;
 	Bool first_block_started;
 	//set during play/stop/reset phases
-	Bool discard_packets;
+	volatile u32 discard_packets;
 
 	Bool force_reconfig;
 
 	//set by filter
-	Bool discard_inputs;
+	u32 discard_inputs;
 
 	//amount of media data in us in the packet queue - concurrent inc/dec
 	volatile s64 buffer_duration;
@@ -771,17 +870,20 @@
 	volatile s32 detach_pending;
 
 	void *udta;
+	u32 udta_flags;
 
 	//statistics per pid instance
 	u64 last_pck_fetch_time;
 	u64 stats_start_ts, stats_start_us;
 	u32 cur_bit_size, avg_bit_rate, max_bit_rate, avg_process_rate, max_process_rate;
-	u32 nb_processed, nb_sap_processed;
+	u32 nb_processed, nb_sap_processed, nb_reagg_pck;
 	//all times in us
 	u64 total_process_time, total_sap_process_time;
 	u64 max_process_time, max_sap_process_time;
 	u64 first_frame_time;
 	Bool is_end_of_stream;
+	Bool is_playing, is_paused;
+	
 	volatile u32 nb_eos_signaled;
 
 	Bool is_encoder_input;
@@ -805,6 +907,8 @@
 
 	GF_Fraction64 last_ts_drop;
 
+	u64 last_buf_query_clock;
+	u64 last_buf_query_dur;
 };
 
 struct __gf_filter_pid
@@ -856,8 +960,9 @@
 
 	Bool duration_init;
 	u64 last_pck_dts, last_pck_cts, min_pck_cts, max_pck_cts;
-	u32 min_pck_duration, nb_unreliable_dts;
+	u32 min_pck_duration, nb_unreliable_dts, last_pck_dur;
 	Bool recompute_dts;
+	Bool ignore_blocking;
 
 	u32 nb_pck_sent;
 	//1000x speed value
@@ -868,9 +973,11 @@
 	Bool initial_play_done;
 	Bool is_playing;
 	void *udta;
+	u32 udta_flags;
 
 	GF_PropertyMap *caps_negociate;
-	GF_FilterPidInst *caps_negociate_pidi;
+	Bool caps_negociate_direct;
+	GF_List *caps_negociate_pidi_list;
 	GF_List *adapters_blacklist;
 	GF_Filter *caps_dst_filter;
 
@@ -896,6 +1003,7 @@
 
 /*internal tasks definitions*/
 void gf_filter_pid_reconfigure_task(GF_FSTask *task);
+void gf_filter_pid_reconfigure_task_discard(GF_FSTask *task);
 void gf_filter_update_arg_task(GF_FSTask *task);
 void gf_filter_pid_disconnect_task(GF_FSTask *task);
 void gf_filter_remove_task(GF_FSTask *task);
@@ -916,7 +1024,7 @@
 #define CAP_MATCH_LOADED_INPUT_ONLY		1
 #define CAP_MATCH_LOADED_OUTPUT_ONLY	1<<1
 
-u32 gf_filter_caps_to_caps_match(const GF_FilterRegister *src, u32 src_bundle_idx, const GF_FilterRegister *dst, GF_Filter *dst_filter, u32 *dst_bundle_idx, s32 for_dst_bundle, u32 *loaded_filter_flags, GF_CapsBundleStore *capstore);
+u32 gf_filter_caps_to_caps_match(const GF_FilterRegister *src, u32 src_bundle_idx, const GF_FilterRegister *dst, GF_Filter *dst_filter, u32 *dst_bundle_idx, u32 for_dst_bundle, u32 *loaded_filter_flags, GF_CapsBundleStore *capstore);
 Bool gf_filter_has_out_caps(const GF_FilterCapability *caps, u32 nb_caps);
 Bool gf_filter_has_in_caps(const GF_FilterCapability *caps, u32 nb_caps);
 
@@ -928,7 +1036,7 @@
 GF_Filter *gf_filter_pid_resolve_link(GF_FilterPid *pid, GF_Filter *dst, Bool *filter_reassigned);
 GF_Filter *gf_filter_pid_resolve_link_check_loaded(GF_FilterPid *pid, GF_Filter *dst, Bool *filter_reassigned, GF_List *skip_if_in_filter_list, Bool *skipped);
 
-GF_Filter *gf_filter_pid_resolve_link_for_caps(GF_FilterPid *pid, GF_Filter *dst);
+GF_Filter *gf_filter_pid_resolve_link_for_caps(GF_FilterPid *pid, GF_Filter *dst, Bool check_reconfig_only);
 u32 gf_filter_pid_resolve_link_length(GF_FilterPid *pid, GF_Filter *dst);
 
 Bool gf_filter_pid_caps_match(GF_FilterPid *src_pid, const GF_FilterRegister *freg, GF_Filter *filter_inst, u8 *priority, u32 *dst_bundle_idx, GF_Filter *dst_filter, s32 for_bundle_idx);
@@ -954,7 +1062,9 @@
 const GF_PropertyValue *gf_filter_pid_get_property_first(GF_FilterPid *pid, u32 prop_4cc);
 const GF_PropertyValue *gf_filter_pid_get_property_str_first(GF_FilterPid *pid, const char *prop_name);
 
+void gf_filter_pid_set_args(GF_Filter *filter, GF_FilterPid *pid);
 
+Bool gf_filter_aggregate_packets(GF_FilterPidInst *dst);
 enum
 {
 	EDGE_STATUS_NONE=0,
@@ -1009,6 +1119,11 @@
 
 void gf_fs_unload_script(GF_FilterSession *fs, void *js_ctx);
 
+
+Bool gf_fs_check_filter_register_cap_ex(const GF_FilterRegister *f_reg, u32 incode, GF_PropertyValue *cap_input, u32 outcode, GF_PropertyValue *cap_output, Bool exact_match_only, Bool out_cap_excluded);
+
+Bool gf_filter_update_arg_apply(GF_Filter *filter, const char *arg_name, const char *arg_value, Bool is_sync_call);
+
 #endif //_GF_FILTER_SESSION_H_

gpac-1.0.1.tar.gz/src/filter_core/filter_session_js.c -> gpac-2.0.0.tar.gz/src/filter_core/filter_session_js.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / filters sub-project
@@ -29,7 +29,6 @@
 #include "../scenegraph/qjs_common.h"
 
 #ifdef GPAC_HAS_QJS
-void js_load_constants(JSContext *ctx, JSValue global_obj);
 
 
 
@@ -80,13 +79,23 @@
 	JSFS_LAST_TASK,
 	JSFS_HTTP_MAX_RATE,
 	JSFS_HTTP_RATE,
-	JSFS_RMT_SAMPLING
+	JSFS_RMT_SAMPLING,
+	JSFS_CONNECTED,
+	JSFS_LAST_PROCESS_ERR,
+	JSFS_LAST_CONNECT_ERR,
+	JSFS_PATH
 };
 
 GF_Filter *jsff_get_filter(JSContext *c, JSValue this_val)
 {
 	return JS_GetOpaque(this_val, fs_f_class_id);
 }
+
+GF_FilterSession *jsff_get_session(JSContext *c, JSValue this_val)
+{
+	return JS_GetOpaque(this_val, fs_class_id);
+}
+
 static JSValue jsfs_new_filter_obj(JSContext *ctx, GF_Filter *f);
 
 
@@ -100,6 +109,7 @@
 	} else if (new_filter) {
 		arg = jsfs_new_filter_obj(task->ctx, new_filter);
 	} else {
+		assert(del_filter);
 		arg = JS_DupValue(task->ctx, del_filter->jsval);
 	}
 
@@ -116,7 +126,7 @@
 		js_dump_error(task->ctx);
 	}
 	JS_FreeValue(task->ctx, ret);
-	js_do_loop(task->ctx);
+	js_std_loop(task->ctx);
 	gf_js_lock(task->ctx, GF_FALSE);
 }
 
@@ -131,13 +141,15 @@
 {
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
 	if (!fs)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case JSFS_NB_FILTERS:
 		return JS_NewInt32(ctx, gf_fs_get_filters_count(fs));
 	case JSFS_LAST_TASK:
 		return gf_fs_is_last_task(fs) ? JS_TRUE : JS_FALSE;
+	case JSFS_CONNECTED:
+		return fs->pid_connect_tasks_pending ? JS_FALSE : JS_TRUE;
 
 	case JSFS_HTTP_MAX_RATE:
 		if (fs->download_manager)
@@ -146,25 +158,31 @@
 
 	case JSFS_HTTP_RATE:
 		if (fs->download_manager)
-			return JS_NewInt32(ctx, gf_dm_get_global_rate(fs->download_manager) / 1000);
+			return JS_NewInt32(ctx, gf_dm_get_global_rate(fs->download_manager) );
 		return JS_NULL;
 	case JSFS_RMT_SAMPLING:
 		return JS_NewBool(ctx, gf_sys_profiler_sampling_enabled() );
+	case JSFS_LAST_CONNECT_ERR:
+		return JS_NewInt32(ctx, gf_fs_get_last_process_error(fs) );
+	case JSFS_LAST_PROCESS_ERR:
+		return JS_NewInt32(ctx, gf_fs_get_last_connect_error(fs) );
+	case JSFS_PATH:
+		return JS_NewString(ctx, jsf_get_script_filename(ctx) );
 	}
 	return JS_UNDEFINED;
 }
 
 static JSValue jsfs_prop_set(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
 {
+	s32 ival;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
 	if (!fs)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case JSFS_HTTP_MAX_RATE:
 		if (fs->download_manager) {
-			s32 ival;
-			if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+			if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 			gf_dm_set_data_rate(fs->download_manager, (u32) ival);
 		}
 		break;
@@ -201,7 +219,7 @@
 	}
 
 	JS_FreeValue(task->ctx, ret);
-	js_do_loop(task->ctx);
+	js_std_loop(task->ctx);
 	gf_js_lock(task->ctx, GF_FALSE);
 
 	if (do_free) {
@@ -219,11 +237,11 @@
 	JSFS_Task *task;
 	const char *tname = NULL;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
- if (!fs || !argc) return JS_EXCEPTION;
-	if (!JS_IsFunction(ctx, argv[0]) ) return JS_EXCEPTION;
+ if (!fs || !argc) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsFunction(ctx, argv[0]) ) return GF_JS_EXCEPTION(ctx);
 
 	GF_SAFEALLOC(task, JSFS_Task);
-	if (!task) return JS_EXCEPTION;
+	if (!task) return GF_JS_EXCEPTION(ctx);
 	task->ctx = ctx;
 
 	if (argc>1) {
@@ -242,22 +260,22 @@
 
 static JSValue jsfs_abort(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
-	Bool do_flush = GF_FALSE;
+	u32 flush_type = GF_FS_FLUSH_NONE;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
- if (!fs) return JS_EXCEPTION;
-	if (argc && JS_IsBool(argv[0]) && JS_ToBool(ctx, argv[0])) {
-		do_flush = GF_FALSE;
+ if (!fs) return GF_JS_EXCEPTION(ctx);
+	if (argc) {
+		JS_ToInt32(ctx, &flush_type, argv[0]);
 	}
-	gf_fs_abort(fs, do_flush);
+	gf_fs_abort(fs, flush_type);
 	return JS_UNDEFINED;
 }
 static JSValue jsfs_lock_filters(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	Bool do_lock;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
- if (!fs || !argc) return JS_EXCEPTION;
+ if (!fs || !argc) return GF_JS_EXCEPTION(ctx);
 	if (JS_IsBool(argv[0])) do_lock = JS_ToBool(ctx, argv[0]);
-	else return JS_EXCEPTION;
+	else return GF_JS_EXCEPTION(ctx);
 
 	gf_fs_lock_filters(fs, do_lock);
 	return JS_UNDEFINED;
@@ -268,9 +286,9 @@
 {
 	const char *msg;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
- if (!fs ||!argc) return JS_EXCEPTION;
+ if (!fs ||!argc) return GF_JS_EXCEPTION(ctx);
 msg = JS_ToCString(ctx, argv[0]);
- if (!msg) return JS_EXCEPTION;
+ if (!msg) return GF_JS_EXCEPTION(ctx);
 	gf_sys_profiler_send(msg);
 	JS_FreeCString(ctx, msg);
 	return JS_UNDEFINED;
@@ -335,7 +353,7 @@
 		evt->clipboard.text = NULL;
 	}
 	JS_FreeValue(fs->on_evt_task->ctx, ret);
-	js_do_loop(fs->on_evt_task->ctx);
+	js_std_loop(fs->on_evt_task->ctx);
 	gf_js_lock(fs->on_evt_task->ctx, GF_FALSE);
 	return res;
 }
@@ -347,12 +365,12 @@
 	u32 i, count;
 	Bool is_rem = GF_FALSE;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
- if (!fs || !argc) return JS_EXCEPTION;
+ if (!fs || !argc) return GF_JS_EXCEPTION(ctx);
 
 if (JS_IsNull(argv[0]))
 		is_rem = GF_TRUE;
 	else if (!JS_IsFunction(ctx, argv[0]) )
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (cbk_type==2) {
 		task = fs->new_f_task;
@@ -392,7 +410,7 @@
 		JS_FreeValue(ctx, task->_obj);
 	} else {
 		GF_SAFEALLOC(task, JSFS_Task);
-		if (!task) return JS_EXCEPTION;
+		if (!task) return GF_JS_EXCEPTION(ctx);
 		gf_list_add(fs->jstasks, task);
 		task->type = cbk_type;
 		task->ctx = ctx;
@@ -400,8 +418,14 @@
 	task->fun = JS_DupValue(ctx, argv[0]);
 	task->_obj = JS_DupValue(ctx, this_val);
 
-	if (cbk_type == 1)
+	if (cbk_type == 1) {
 		gf_sys_profiler_set_callback(task, jsfs_rmt_user_callback);
+#ifdef GPAC_ENABLE_COVERAGE
+		if (gf_sys_is_cov_mode()) {
+			jsfs_rmt_user_callback(task, "test");
+		}
+#endif
+	}
 	else if (cbk_type == 2)
 		fs->new_f_task = task;
 	else if (cbk_type == 3)
@@ -463,10 +487,11 @@
 {
 	const char *val_s;
 	Bool val_b;
+	JSValue res;
 	GF_FilterStats stats;
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 	if (!f)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case JSFF_NAME:
@@ -541,11 +566,18 @@
 	case JSFF_LAST_TS_SENT:
 		gf_filter_get_stats(f, &stats);
 		if (!stats.last_ts_sent.den) return JS_NULL;
-		return JS_NewInt64(ctx, stats.last_ts_sent.num);
+		res = JS_NewObject(ctx);
+		JS_SetPropertyStr(ctx, res, "n", JS_NewInt64(ctx, stats.last_ts_sent.num));
+		JS_SetPropertyStr(ctx, res, "d", JS_NewInt64(ctx, stats.last_ts_sent.den));
+		return res;
+
 	case JSFF_LAST_TS_DROP:
 		gf_filter_get_stats(f, &stats);
 		if (!stats.last_ts_drop.den) return JS_NULL;
-		return JS_NewInt64(ctx, stats.last_ts_drop.num);
+		res = JS_NewObject(ctx);
+		JS_SetPropertyStr(ctx, res, "n", JS_NewInt64(ctx, stats.last_ts_drop.num));
+		JS_SetPropertyStr(ctx, res, "d", JS_NewInt64(ctx, stats.last_ts_drop.den));
+		return res;
 
 	case JSFF_INAME:
 		if (f->iname) return JS_NewString(ctx, f->iname);
@@ -565,7 +597,7 @@
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 #endif
 	if (!f)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case JSFF_INAME:
@@ -588,6 +620,7 @@
 }
 
 JSValue jsf_NewProp(JSContext *ctx, const GF_PropertyValue *new_val);
+JSValue jsf_NewPropTranslate(JSContext *ctx, const GF_PropertyValue *prop, u32 p4cc);
 
 static JSValue jsff_enum_pid_props(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, Bool is_output)
 {
@@ -596,28 +629,45 @@
 	const char *pname=NULL;
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 	if (!f || (argc!=2) )
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (JS_IsString(argv[1])) {
 		pname = JS_ToCString(ctx, argv[1]);
-		if (!pname) return JS_EXCEPTION;
+		if (!pname) return GF_JS_EXCEPTION(ctx);
 	}
 	else if (!JS_IsFunction(ctx, argv[1]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (JS_ToInt32(ctx, &idx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (is_output) {
 		pid = gf_filter_get_opid(f, idx);
-		if (!pid) return JS_EXCEPTION;
+		if (!pid) return GF_JS_EXCEPTION(ctx);
 	} else {
 		pid = gf_filter_get_ipid(f, idx);
-		if (!pid) return JS_EXCEPTION;
+		if (!pid) return GF_JS_EXCEPTION(ctx);
 	}
 
 	if (pname) {
 		const GF_PropertyValue *p;
+
+		if (!strcmp(pname, "buffer")) {
+			JS_FreeCString(ctx, pname);
+			return JS_NewInt64(ctx, gf_filter_pid_query_buffer_duration(pid, GF_FALSE) );
+		}
+		if (!strcmp(pname, "buffer_total")) {
+			JS_FreeCString(ctx, pname);
+			return JS_NewInt64(ctx, gf_filter_pid_query_buffer_duration(pid, GF_TRUE) );
+		}
+		if (!strcmp(pname, "name")) {
+			JS_FreeCString(ctx, pname);
+			return JS_NewString(ctx, pid->pid->name);
+		}
+		if (!strcmp(pname, "eos")) {
+			JS_FreeCString(ctx, pname);
+			return JS_NewBool(ctx, gf_filter_pid_is_eos(pid) );
+		}
 		u32 p4cc = gf_props_get_id(pname);
 		if (p4cc)
 			p = gf_filter_pid_get_property(pid, p4cc);
@@ -625,6 +675,9 @@
 			p = gf_filter_pid_get_property_str(pid, pname);
 
 		JS_FreeCString(ctx, pname);
+		if (p && p4cc)
+			return jsf_NewPropTranslate(ctx, p, p4cc);
+
 		return jsf_NewProp(ctx, p);
 	}
 
@@ -639,7 +692,11 @@
 
 		args[0] = JS_NewString(ctx, prop_name ? prop_name : gf_props_4cc_get_name(prop_4cc) );
 		args[1] = JS_NewString(ctx, gf_props_get_type_name(prop->type) );
-		args[2] = jsf_NewProp(ctx, prop);
+		if (prop_4cc) {
+			args[2] = jsf_NewPropTranslate(ctx, prop, prop_4cc);
+		} else {
+			args[2] = jsf_NewProp(ctx, prop);
+		}
 		ret = JS_Call(ctx, argv[1], this_val, 3, args);
 		if (JS_IsException(ret)) {
 			js_dump_error(ctx);
@@ -668,16 +725,14 @@
 	GF_FilterPidInst *ipid;
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 	if (!f || (argc!=1) )
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt32(ctx, &idx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	pid = gf_filter_get_ipid(f, idx);
 	if (!pid) return JS_NULL;
 
 	ipid = (GF_FilterPidInst *)pid;
-	idx = gf_list_find(f->session->filters, ipid->pid->filter);
-
 	return jsfs_new_filter_obj(ctx, ipid->pid->filter);
 }
 
@@ -688,9 +743,9 @@
 	GF_FilterPid *pid;
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 	if (!f || (argc!=1) )
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt32(ctx, &idx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	pid = gf_filter_get_opid(f, idx);
 	if (!pid) return JS_NULL;
@@ -713,7 +768,7 @@
 	const GF_FilterArgs *args;
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 	if (!f)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (argc && JS_IsBool(argv[0]) && JS_ToBool(ctx, argv[0]))
 		val_only = GF_FALSE;
@@ -782,6 +837,7 @@
 			if (arg->arg_default_val)
 				JS_SetPropertyStr(ctx, aval, "default", JS_NewString(ctx, arg->arg_default_val) );
 			JS_SetPropertyStr(ctx, aval, "update", JS_NewBool(ctx, (arg->flags & GF_FS_ARG_UPDATE) ) );
+			JS_SetPropertyStr(ctx, aval, "update_sync", JS_NewBool(ctx, (arg->flags & GF_FS_ARG_UPDATE_SYNC) ) );
 			if (arg->flags & GF_FS_ARG_HINT_ADVANCED) {
 				JS_SetPropertyStr(ctx, aval, "hint", JS_NewString(ctx, "advanced") );
 			}
@@ -796,23 +852,94 @@
 	return res;
 }
 
+static JSValue jsff_get_arg(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 idx;
+	const char *aname=NULL;
+	const GF_FilterArgs *args;
+	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
+	if (!f || !argc)
+		return GF_JS_EXCEPTION(ctx);
+
+	aname = JS_ToCString(ctx, argv[0]);
+	if (!aname) return GF_JS_EXCEPTION(ctx);
+
+	idx=0;
+	args = f->freg->args;
+	while (args && args[idx].arg_name) {
+		const GF_FilterArgs *arg = &args[idx];
+		GF_PropertyValue p;
+		if (strcmp(arg->arg_name, aname)) {
+			idx++;
+			continue;
+		}
+		if (gf_filter_get_arg(f, arg->arg_name, &p)) {
+			JS_FreeCString(ctx, aname);
+			return jsf_NewProp(ctx, &p);
+		}
+		break;
+	}
+	JS_FreeCString(ctx, aname);
+	return JS_NULL;
+}
+
+
+GF_Err jsf_ToProp_ex(GF_Filter *filter, JSContext *ctx, JSValue value, u32 p4cc, GF_PropertyValue *prop, u32 prop_type);
+
 static JSValue jsff_update(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
-	const char *aname, *aval;
+	const char *aname;
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 	if (!f || (argc!=2) )
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	aname = JS_ToCString(ctx, argv[0]);
-	if (!aname) return JS_EXCEPTION;
-	aval = JS_ToCString(ctx, argv[1]);
-	if (!aval) {
+	if (!aname) return GF_JS_EXCEPTION(ctx);
+	if (JS_IsString(argv[1])) {
+		const char *aval = JS_ToCString(ctx, argv[1]);
+		if (!aval) {
+			JS_FreeCString(ctx, aname);
+			return GF_JS_EXCEPTION(ctx);
+		}
+		gf_fs_send_update(f->session, NULL, f, aname, aval, 0);
+		JS_FreeCString(ctx, aval);
 		JS_FreeCString(ctx, aname);
-		return JS_EXCEPTION;
+		return JS_UNDEFINED;
+	} else {
+		char szDump[GF_PROP_DUMP_ARG_SIZE];
+		GF_PropertyValue p;
+		GF_Err e;
+		if (! gf_filter_get_arg(f, aname, &p)) {
+			JSValue err = js_throw_err_msg(ctx, GF_BAD_PARAM, "Argument %s not defined in filter %s", aname, f->freg->name);
+			JS_FreeCString(ctx, aname);
+			return err;
+		}
+		e = jsf_ToProp_ex(f, ctx, argv[1], 0, &p, p.type);
+		if (e) {
+			JSValue err = js_throw_err_msg(ctx, GF_BAD_PARAM, "Failed to parse argument %s", aname);
+			JS_FreeCString(ctx, aname);
+			return err;
+		}
+		gf_props_dump_val(&p, szDump, GF_PROP_DUMP_DATA_PTR, NULL);
+		gf_fs_send_update(f->session, NULL, f, aname, szDump, 0);
+		gf_props_reset_single(&p);
 	}
-	gf_fs_send_update(f->session, NULL, f, aname, aval, 0);
+
 	JS_FreeCString(ctx, aname);
-	JS_FreeCString(ctx, aval);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsff_lock(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
+	if (!f || (argc!=1) )
+		return GF_JS_EXCEPTION(ctx);
+
+	if (JS_ToBool(ctx, argv[0]))
+		gf_filter_lock(f, GF_TRUE);
+	else
+		gf_filter_lock(f, GF_FALSE);
+
 	return JS_UNDEFINED;
 }
 
@@ -820,7 +947,7 @@
 {
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 	if (!f)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	gf_filter_remove(f);
 	return JS_UNDEFINED;
@@ -831,23 +958,25 @@
 	const char *fname, *link_args;
 	GF_Filter *new_f;
 	GF_Err e;
+	Bool is_source = GF_FALSE;
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 	if (!f || !argc)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	fname = JS_ToCString(ctx, argv[0]);
-	if (!fname) return JS_EXCEPTION;
+	if (!fname) return GF_JS_EXCEPTION(ctx);
 	link_args = NULL;
 	if (argc>1) {
 		link_args = JS_ToCString(ctx, argv[1]);
 		if (!link_args) {
 			JS_FreeCString(ctx, fname);
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		}
 	}
-
+	gf_fs_lock_filters(f->session, GF_TRUE);
 	if (!strncmp(fname, "src=", 4)) {
 		new_f = gf_fs_load_source(f->session, fname+4, NULL, NULL, &e);
+		is_source = GF_TRUE;
 	} else if (!strncmp(fname, "dst=", 4)) {
 		new_f = gf_fs_load_destination(f->session, fname+4, NULL, NULL, &e);
 	} else {
@@ -858,9 +987,16 @@
 		JSValue ret = js_throw_err_msg(ctx, e, "Cannot load filter %s: %s\n", fname, gf_error_to_string(e));
 		JS_FreeCString(ctx, fname);
 		if (link_args) JS_FreeCString(ctx, link_args);
+		gf_fs_lock_filters(f->session, GF_FALSE);
 		return ret;
 	}
-	gf_filter_set_source(new_f, (GF_Filter *) f, link_args);
+	if (is_source)
+		gf_filter_set_source_restricted(new_f, (GF_Filter *) f, link_args);
+	else
+		gf_filter_set_source(new_f, (GF_Filter *) f, link_args);
+
+	gf_fs_lock_filters(f->session, GF_FALSE);
+	
 	//reconnect outputs of source
 	gf_filter_reconnect_output((GF_Filter *) f);
 
@@ -870,6 +1006,24 @@
 	return jsfs_new_filter_obj(ctx, new_f);
 }
 
+static JSValue jsff_bind(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
+	if (!f || !argc)
+		return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsObject(argv[0]) && !JS_IsNull(argv[0]))
+		return GF_JS_EXCEPTION(ctx);
+	if (!f->freg)
+		return GF_JS_EXCEPTION(ctx);
+
+	if (!strcmp(f->freg->name, "dashin")) {
+		JSValue dashdmx_bind_js(GF_Filter *f, JSContext *jsctx, JSValueConst obj);
+		return dashdmx_bind_js(f, ctx, argv[0]);
+	}
+
+	return js_throw_err_msg(ctx, GF_BAD_PARAM, "filter class %s has no JS bind capabilities", f->freg->name);
+}
+
 #define JS_CGETSET_MAGIC_DEF_ENUM(name, fgetter, fsetter, magic) { name, JS_PROP_CONFIGURABLE|JS_PROP_ENUMERABLE, JS_DEF_CGETSET_MAGIC, magic, .u = { .getset = { .get = { .getter_magic = fgetter }, .set = { .setter_magic = fsetter } } } }
 
 static const JSCFunctionListEntry fs_f_funcs[] = {
@@ -906,9 +1060,12 @@
 	JS_CFUNC_DEF("ipid_source", 0, jsff_get_pid_source),
 	JS_CFUNC_DEF("opid_sinks", 0, jsff_get_pid_sinks),
 	JS_CFUNC_DEF("all_args", 0, jsff_all_args),
+	JS_CFUNC_DEF("get_arg", 0, jsff_get_arg),
 	JS_CFUNC_DEF("update", 0, jsff_update),
 	JS_CFUNC_DEF("remove", 0, jsff_remove),
 	JS_CFUNC_DEF("insert", 0, jsff_insert_filter),
+	JS_CFUNC_DEF("bind", 0, jsff_bind),
+	JS_CFUNC_DEF("lock", 0, jsff_lock),
 };
 
 static JSValue jsfs_new_filter_obj(JSContext *ctx, GF_Filter *f)
@@ -926,7 +1083,7 @@
 	u32 idx;
 	GF_Filter *f = NULL;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
- if (!fs || !argc) return JS_EXCEPTION;
+ if (!fs || !argc) return GF_JS_EXCEPTION(ctx);
 
 if (JS_IsString(argv[0])) {
 		const char *iname = JS_ToCString(ctx, argv[0]);
@@ -944,11 +1101,11 @@
 		JS_FreeCString(ctx, iname);
 	} else {
 		if (JS_ToInt32(ctx, &idx, argv[0]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 
 		f = gf_list_get(fs->filters, idx);
 	}
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
 
 	return jsfs_new_filter_obj(ctx, f);
 }
@@ -959,30 +1116,35 @@
 	const char *fname, *link_args;
 	GF_Filter *new_f;
 	GF_Err e;
+	Bool relative_to_script = GF_FALSE;
+	Bool is_source = GF_FALSE;
 	GF_Filter *link_from = NULL;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
 	if (!fs || !argc)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	fname = JS_ToCString(ctx, argv[0]);
-	if (!fname) return JS_EXCEPTION;
+	if (!fname) return GF_JS_EXCEPTION(ctx);
 
 	link_args = NULL;
 	if (argc>1) {
 		link_from = JS_GetOpaque(argv[1], fs_f_class_id);
-		if (!link_from) {
-			JS_FreeCString(ctx, fname);
-			return JS_EXCEPTION;
-		}
 		if (argc>2) {
 			link_args = JS_ToCString(ctx, argv[2]);
 		}
+		if (argc>3) {
+			relative_to_script = JS_ToBool(ctx, argv[3]);
+		}
 	}
 
+	gf_fs_lock_filters(fs, GF_TRUE);
+
+	const char *parent_url = relative_to_script ? jsf_get_script_filename(ctx) : NULL;
 	if (!strncmp(fname, "src=", 4)) {
-		new_f = gf_fs_load_source(fs, fname+4, NULL, NULL, &e);
+		new_f = gf_fs_load_source(fs, fname+4, NULL, parent_url, &e);
+		is_source = GF_TRUE;
 	} else if (!strncmp(fname, "dst=", 4)) {
-		new_f = gf_fs_load_destination(fs, fname+4, NULL, NULL, &e);
+		new_f = gf_fs_load_destination(fs, fname+4, NULL, parent_url, &e);
 	} else {
 		new_f = gf_fs_load_filter(fs, fname, &e);
 	}
@@ -991,76 +1153,44 @@
 		JSValue ret = js_throw_err_msg(ctx, e, "Cannot load filter %s: %s\n", fname, gf_error_to_string(e));
 		JS_FreeCString(ctx, fname);
 		if (link_args) JS_FreeCString(ctx, link_args);
+		gf_fs_lock_filters(fs, GF_FALSE);
 		return ret;
 	}
 	JS_FreeCString(ctx, fname);
 	if (link_from) {
-		gf_filter_set_source(new_f, link_from, link_args);
+		if (is_source)
+			gf_filter_set_source_restricted(link_from, new_f, link_args);
+		else
+			gf_filter_set_source(new_f, link_from, link_args);
 	}
 
 	if (link_args) JS_FreeCString(ctx, link_args);
+	gf_fs_lock_filters(fs, GF_FALSE);
 
 	return jsfs_new_filter_obj(ctx, new_f);
 }
 
+Bool gf_fs_fire_event(GF_FilterSession *fs, GF_Filter *f, GF_FilterEvent *evt, Bool upstream);
+
 static JSValue jsfs_fire_event(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
-	u32 i, count;
+	Bool upstream = GF_FALSE;
 	GF_Filter *f = NULL;
 	Bool ret=GF_FALSE;
-	GF_FilterPid *on_pid;
 	GF_FilterEvent *jsf_get_event(JSContext *ctx, JSValueConst this_val);
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
 	GF_FilterEvent *evt;
 	if (!fs || !argc)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	evt = jsf_get_event(ctx, argv[0]);
-	if (!evt) return JS_EXCEPTION;
+	if (!evt) return GF_JS_EXCEPTION(ctx);
 
 	if (argc>1) {
 		f = jsff_get_filter(ctx, argv[1]);
+		if (argc>2) upstream = JS_ToBool(ctx, argv[2]);
 	}
-	on_pid = evt->base.on_pid;
-	evt->base.on_pid = NULL;
-	if (f) {
-		Bool upstream = GF_FALSE;
-		if (evt->base.type==GF_FEVT_USER) {
-			if (f->freg->process_event && f->event_target) {
-				gf_mx_p(f->tasks_mx);
-				f->freg->process_event(f, evt);
-				gf_mx_v(f->tasks_mx);
-				ret = GF_TRUE;
-			}
-		}
-		if (!ret) {
-			if (argc>2) upstream = JS_ToBool(ctx, argv[2]);
-			gf_mx_p(f->tasks_mx);
-			if (f->num_output_pids && upstream) ret = GF_TRUE;
-			else if (f->num_input_pids && !upstream) ret = GF_TRUE;
-			gf_filter_send_event(f, evt, upstream);
-			gf_mx_v(f->tasks_mx);
-		}
-	} else {
-		gf_fs_lock_filters(fs, GF_TRUE);
-		count = gf_list_count(fs->filters);
-		for (i=0; i<count; i++) {
-			Bool canceled;
-			f = gf_list_get(fs->filters, i);
-			if (f->disabled || f->removed) continue;
-			if (f->multi_sink_target) continue;
-			if (!f->freg->process_event) continue;
-			if (!f->event_target) continue;
-
-			gf_mx_p(f->tasks_mx);
-			canceled = f->freg->process_event(f, evt);
-			gf_mx_v(f->tasks_mx);
-			ret = GF_TRUE;
-			if (canceled) break;
-		}
-		gf_fs_lock_filters(fs, GF_FALSE);
-	}
-	evt->base.on_pid = on_pid;
+	ret = gf_fs_fire_event(fs, f, evt, upstream);
 	return JS_NewBool(ctx, ret);
 }
 
@@ -1069,12 +1199,36 @@
 	Bool report_on;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
 	if (!fs || !argc)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	report_on = JS_ToBool(ctx, argv[0]);
 	gf_fs_enable_reporting(fs, report_on);
 	return JS_UNDEFINED;
 }
 
+JSValue jsfilter_initialize_custom(GF_Filter *filter, JSContext *ctx);
+
+static JSValue jsfs_new_filter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Filter *f;
+	GF_Err e;
+	u32 flags=0;
+	const char *name = NULL;
+	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
+	if (!fs) return GF_JS_EXCEPTION(ctx);
+	if (argc) {
+		name = JS_ToCString(ctx, argv[0]);
+		if (argc>1) {
+			JS_ToInt32(ctx, &flags, argv[1]);
+		}
+	}
+
+	f = gf_fs_new_filter(fs, name, flags, &e);
+	if (name) JS_FreeCString(ctx, name);
+	if (!f) return js_throw_err(ctx, e);
+
+	return jsfilter_initialize_custom(f, ctx);
+}
+
 
 static const JSCFunctionListEntry fs_funcs[] = {
 JS_CGETSET_MAGIC_DEF_ENUM("nb_filters", jsfs_prop_get, NULL, JSFS_NB_FILTERS),
@@ -1082,6 +1236,10 @@
 	JS_CGETSET_MAGIC_DEF("http_max_bitrate", jsfs_prop_get, jsfs_prop_set, JSFS_HTTP_MAX_RATE),
 	JS_CGETSET_MAGIC_DEF("http_bitrate", jsfs_prop_get, NULL, JSFS_HTTP_RATE),
 	JS_CGETSET_MAGIC_DEF("rmt_sampling", jsfs_prop_get, jsfs_prop_set, JSFS_RMT_SAMPLING),
+	JS_CGETSET_MAGIC_DEF("connected", jsfs_prop_get, NULL, JSFS_CONNECTED),
+	JS_CGETSET_MAGIC_DEF("last_process_error", jsfs_prop_get, NULL, JSFS_LAST_PROCESS_ERR),
+	JS_CGETSET_MAGIC_DEF("last_connect_error", jsfs_prop_get, NULL, JSFS_LAST_CONNECT_ERR),
+	JS_CGETSET_MAGIC_DEF("jspath", jsfs_prop_get, NULL, JSFS_PATH),
 
 JS_CFUNC_DEF("post_task", 0, jsfs_post_task),
 JS_CFUNC_DEF("abort", 0, jsfs_abort),
@@ -1095,9 +1253,28 @@
 JS_CFUNC_DEF("add_filter", 0, jsfs_add_filter),
 JS_CFUNC_DEF("fire_event", 0, jsfs_fire_event),
 JS_CFUNC_DEF("reporting", 0, jsfs_reporting),
+ JS_CFUNC_DEF("new_filter", 0, jsfs_new_filter),
 
 };
 
+void gf_fs_unload_js_api(JSContext *c, GF_FilterSession *fs)
+{
+	u32 i, count;
+	gf_mx_p(fs->filters_mx);
+	count = gf_list_count(fs->filters);
+	//detach all script objects, the context having created them is about to be destroyed
+	//not doing so would result in potential crashes during final destruction of filter(s)
+	for (i=0; i<count; i++) {
+		GF_Filter *f = gf_list_get(fs->filters, i);
+		if (!JS_IsUndefined(f->jsval)) {
+			JS_SetOpaque(f->jsval, NULL);
+			JS_FreeValue(c, f->jsval);
+			f->jsval = JS_UNDEFINED;
+		}
+	}
+	gf_mx_v(fs->filters_mx);
+}
+
 GF_Err gf_fs_load_js_api(JSContext *c, GF_FilterSession *fs)
 {
 	JSValue fs_obj;
@@ -1113,6 +1290,14 @@
 	global_obj = JS_GetGlobalObject(c);
 
 	js_load_constants(c, global_obj);
+
+#define DEF_CONST( _val ) \
+ JS_SetPropertyStr(c, global_obj, #_val, JS_NewInt32(c, _val));
+
+	DEF_CONST(GF_FS_FLUSH_NONE)
+	DEF_CONST(GF_FS_FLUSH_ALL)
+	DEF_CONST(GF_FS_FLUSH_FAST)
+
 	if (!fs->jstasks) {
 		fs->jstasks = gf_list_new();
 		if (!fs->jstasks) return GF_OUT_OF_MEM;
@@ -1139,6 +1324,7 @@
 GF_EXPORT
 GF_Err gf_fs_load_script(GF_FilterSession *fs, const char *jsfile)
 {
+	GF_Err e;
 JSValue global_obj;
 	u8 *buf;
 	u32 buf_len;
@@ -1163,23 +1349,29 @@
 	fs->js_ctx = ctx;
 
 	JS_SetPropertyStr(fs->js_ctx, global_obj, "_gpac_log_name", JS_NewString(fs->js_ctx, gf_file_basename(jsfile) ) );
+	JS_SetPropertyStr(fs->js_ctx, global_obj, "_gpac_script_src", JS_NewString(fs->js_ctx, jsfile ) );
 JS_FreeValue(fs->js_ctx, global_obj);
 
 
 	//load script
-	GF_Err e = gf_file_load_data(jsfile, &buf, &buf_len);
+	if (!strncmp(jsfile, "$GSHARE/", 8)) {
+		char szPath[GF_MAX_PATH];
+		if (gf_opts_default_shared_directory(szPath)) {
+			strcat(szPath, jsfile + 7);
+			e = gf_file_load_data(szPath, &buf, &buf_len);
+		} else {
+			e = GF_NOT_FOUND;
+		}
+	} else {
+		e = gf_file_load_data(jsfile, &buf, &buf_len);
+	}
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Error loading script file %s: %s\n", jsfile, gf_error_to_string(e) ));
 		return e;
 	}
 
 	if (!gf_opts_get_bool("core", "no-js-mods") && JS_DetectModule((char *)buf, buf_len)) {
- 		//init modules
-		qjs_module_init_gpaccore(fs->js_ctx);
-		qjs_module_init_xhr(fs->js_ctx);
-		qjs_module_init_evg(fs->js_ctx);
-		qjs_module_init_storage(fs->js_ctx);
-		qjs_module_init_webgl(fs->js_ctx);
+		qjs_init_all_modules(fs->js_ctx, GF_FALSE, GF_FALSE);
 		flags = JS_EVAL_TYPE_MODULE;
 	}
 
@@ -1193,6 +1385,7 @@
 		return GF_BAD_PARAM;
 	}
 	JS_FreeValue(fs->js_ctx, ret);
+	js_std_loop(fs->js_ctx);
 	return GF_OK;
 #else
 	return GF_NOT_SUPPORTED;
@@ -1203,17 +1396,23 @@
 void gf_fs_unload_script(GF_FilterSession *fs, void *js_ctx)
 {
 	u32 i, count=gf_list_count(fs->jstasks);
+
 	for (i=0; i<count; i++) {
 		JSFS_Task *task = gf_list_get(fs->jstasks, i);
 		if (js_ctx && (task->ctx != js_ctx))
 			continue;
+
+		gf_js_lock(js_ctx, GF_TRUE);
 		JS_FreeValue(task->ctx, task->fun);
 		JS_FreeValue(task->ctx, task->_obj);
+		gf_js_lock(js_ctx, GF_FALSE);
+
 		gf_free(task);
 		gf_list_rem(fs->jstasks, i);
 		i--;
 		count--;
 	}
+
 	if (fs->js_ctx) {
 		gf_js_delete_context(fs->js_ctx);
 		fs->js_ctx = NULL;

gpac-2.0.0.tar.gz/src/filters/bs_agg.c Added

@@ -0,0 +1,925 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / compressed split bitstream aggregator filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/filters.h>
+#include <gpac/constants.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/mpeg4_odf.h>
+
+#define MAX_LID	64
+#define MAX_TID	7
+
+typedef struct
+{
+	u8 *data;
+	u32 size, alloc_size, lid, tid;
+} NALStore;
+
+typedef struct _bs_agg_ctx BSAggCtx;
+typedef struct _bs_agg_pid BSAggOut;
+
+struct _bs_agg_pid
+{
+	u32 nalu_size_length;
+	u32 codec_id;
+
+	GF_Err (*rewrite_pid_config)(BSAggCtx *ctx, BSAggOut *pctx);
+	GF_Err (*agg_process)(BSAggCtx *ctx, BSAggOut *pctx);
+
+	GF_FilterPid *opid;
+
+	GF_FilterPacket *pck;
+	GF_List *nal_stores;
+
+	GF_List *ipids;
+};
+
+struct _bs_agg_ctx
+{
+	//options
+	Bool svcqid;
+
+	//internal
+	GF_Filter *filter;
+	GF_List *pids;
+};
+
+static GF_Err bsagg_transfer_avc_params(GF_AVCConfig *cfg_out, GF_AVCConfig *cfg_in)
+{
+	if (!cfg_out) return GF_OUT_OF_MEM;
+	for (u32 i=0; i<3; i++) {
+		GF_List *l_out, *l_in;
+		if (i==0) {
+			if (!cfg_in->sequenceParameterSets) continue;
+			l_in = cfg_in->sequenceParameterSets;
+			l_out = cfg_out->sequenceParameterSets;
+		}
+		else if (i==2) {
+			if (!cfg_in->pictureParameterSets) continue;
+			l_in = cfg_in->pictureParameterSets;
+			l_out = cfg_out->pictureParameterSets;
+		}
+		else {
+			if (!cfg_in->sequenceParameterSetExtensions) continue;
+			l_in = cfg_in->pictureParameterSets;
+			if (!cfg_out->sequenceParameterSetExtensions)
+				cfg_out->sequenceParameterSetExtensions = gf_list_new();
+			l_out = cfg_out->sequenceParameterSetExtensions;
+			if (!l_out) return GF_OUT_OF_MEM;
+		}
+		while (gf_list_count(l_in)) {
+			u32 j, count_out = gf_list_count(l_out);
+			GF_NALUFFParam *sl_in = gf_list_pop_front(l_in);
+			GF_NALUFFParam *sl_out=NULL;
+			for (j=0; j<count_out; j++) {
+				sl_out = gf_list_get(l_out, j);
+				if ((sl_out->size == sl_in->size) && !memcmp(sl_in->data, sl_out->data, sl_in->size))
+					break;
+				sl_out = NULL;
+			}
+			if (sl_out) {
+				gf_free(sl_in->data);
+				gf_free(sl_in);
+			} else {
+				gf_list_add(l_out, sl_in);
+			}
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err avc_rewrite_pid_config(BSAggCtx *ctx, BSAggOut *pctx)
+{
+	GF_Err e;
+	u32 i, count;
+	GF_AVCConfig *avcc_out = NULL;
+	GF_AVCConfig *svcc_out = NULL;
+	GF_FilterPid *base = NULL;
+
+	count = gf_list_count(pctx->ipids);
+	for (i=0; i<count; i++) {
+		const GF_PropertyValue *dsi, *dsi_enh, *prop;
+		GF_FilterPid *ipid = gf_list_get(pctx->ipids, i);
+		prop = gf_filter_pid_get_property(ipid, GF_PROP_PID_DEPENDENCY_ID);
+		if (!prop || !prop->value.uint) base = ipid;
+
+		dsi = gf_filter_pid_get_property(ipid, GF_PROP_PID_DECODER_CONFIG);
+		dsi_enh = gf_filter_pid_get_property(ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+
+
+		GF_AVCConfig *avcc = NULL;
+
+		if (dsi) {
+			avcc = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+			if (!avcc) return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		else if (dsi_enh) {
+			avcc = gf_odf_avc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size);
+			if (!avcc) return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		gf_filter_pid_set_udta_flags(ipid, avcc->nal_unit_size);
+		if (dsi && (base==ipid) && !avcc_out) {
+			avcc_out = avcc;
+			avcc = NULL;
+		}
+
+reparse:
+		if (avcc) {
+			if (!svcc_out) {
+				GF_SAFEALLOC(svcc_out, GF_AVCConfig);
+				if (!svcc_out) {
+					gf_odf_avc_cfg_del(avcc);
+					return GF_OUT_OF_MEM;
+				}
+				memcpy(svcc_out, avcc, sizeof(GF_AVCConfig));
+				svcc_out->sequenceParameterSets = gf_list_new();
+				svcc_out->pictureParameterSets = gf_list_new();
+				svcc_out->sequenceParameterSetExtensions = NULL;
+			}
+
+			e = bsagg_transfer_avc_params(svcc_out, avcc);
+			if (e) return e;
+
+			gf_odf_avc_cfg_del(avcc);
+		}
+
+		if (dsi && dsi_enh) {
+
+			avcc = gf_odf_avc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size);
+			if (!avcc) return GF_NON_COMPLIANT_BITSTREAM;
+			dsi_enh = NULL;
+			goto reparse;
+		}
+	}
+
+	if (base) {
+		gf_filter_pid_copy_properties(pctx->opid, base);
+
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_AVC));
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_ISOM_STSD_TEMPLATE, NULL);
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_BITRATE, NULL);
+
+		u8 *data;
+		u32 size;
+		avcc_out->nal_unit_size = 4;
+		gf_odf_avc_cfg_write(avcc_out, &data, &size);
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(data, size) );
+		if (svcc_out) {
+			svcc_out->nal_unit_size = 4;
+			gf_odf_avc_cfg_write(svcc_out, &data, &size);
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, &PROP_DATA_NO_COPY(data, size) );
+		} else {
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+		}
+	}
+	if (avcc_out) gf_odf_avc_cfg_del(avcc_out);
+	if (svcc_out) gf_odf_avc_cfg_del(svcc_out);
+	return GF_OK;
+}
+
+static GF_Err bsagg_transfer_param_array(GF_List *array_out, GF_List *array_in)
+{
+	while (gf_list_count(array_in)) {
+		u32 i, count = gf_list_count(array_out);
+		GF_NALUFFParamArray *pa_in = gf_list_pop_front(array_in);
+		GF_NALUFFParamArray *pa_out = NULL;
+		for (i=0; i<count; i++) {
+			pa_out = gf_list_get(array_out, i);
+			if (pa_out->type == pa_in->type) break;
+			pa_out = NULL;
+		}
+		if (!pa_out) {
+			GF_SAFEALLOC(pa_out, GF_NALUFFParamArray);
+			if (!pa_out) return GF_OUT_OF_MEM;
+
+			pa_out->type = pa_in->type;
+			pa_out->array_completeness = pa_in->array_completeness;
+			pa_out->nalus = gf_list_new();
+			if (!pa_out->nalus) return GF_OUT_OF_MEM;
+			gf_list_add(array_out, pa_out);
+		}
+		while (gf_list_count(pa_in->nalus)) {
+			u32 j, count2 = gf_list_count(pa_out->nalus);
+			GF_NALUFFParam *sl_in = gf_list_pop_front(pa_in->nalus);
+			GF_NALUFFParam *sl_out = NULL;
+			for (j=0; j<count2; j++) {
+				sl_out = gf_list_get(pa_out->nalus, j);
+				if ((sl_out->size == sl_in->size) && !memcmp(sl_out->data, sl_in->data, sl_in->size))
+					break;
+				sl_out = NULL;
+			}
+			if (!sl_out) {
+				gf_list_add(pa_out->nalus, sl_in);
+			}
+			else {
+				gf_free(sl_in->data);
+				gf_free(sl_in);
+			}
+		}
+
+		gf_list_del(pa_in->nalus);
+		gf_free(pa_in);
+	}
+
+	return GF_OK;
+}
+
+static GF_Err vvc_hevc_rewrite_pid_config(BSAggCtx *ctx, BSAggOut *pctx)
+{
+	GF_Err e;
+	u32 i, count;
+	Bool is_vvc = GF_FALSE;
+#ifndef GPAC_DISABLE_HEVC
+	GF_HEVCConfig *hvcc_out = NULL;
+	GF_HEVCConfig *hvcc_enh_out = NULL;
+#endif
+	GF_VVCConfig *vvcc_out = NULL;
+	GF_FilterPid *base = NULL;
+	const GF_PropertyValue *dv_cfg = NULL;
+	if (pctx->codec_id == GF_CODECID_VVC) is_vvc = GF_TRUE;
+
+	if (is_vvc) {
+		vvcc_out = gf_odf_vvc_cfg_new();
+	} else {
+#ifndef GPAC_DISABLE_HEVC
+		hvcc_out = gf_odf_hevc_cfg_new();
+#endif
+	}
+
+	count = gf_list_count(pctx->ipids);
+	for (i=0; i<count; i++) {
+		const GF_PropertyValue *dsi, *dsi_enh, *prop;
+		GF_FilterPid *ipid = gf_list_get(pctx->ipids, i);
+		prop = gf_filter_pid_get_property(ipid, GF_PROP_PID_DEPENDENCY_ID);
+		if (!prop || !prop->value.uint) base = ipid;
+
+		dsi = gf_filter_pid_get_property(ipid, GF_PROP_PID_DECODER_CONFIG);
+		dsi_enh = gf_filter_pid_get_property(ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+
+		if (!dv_cfg)
+			dv_cfg = gf_filter_pid_get_property(ipid, GF_PROP_PID_DOLBY_VISION);
+
+		if (is_vvc) {
+			GF_VVCConfig *vvcc = NULL;
+
+			if (dsi) {
+				vvcc = gf_odf_vvc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+				if (!vvcc) return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			else if (dsi_enh) {
+				vvcc = gf_odf_vvc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size);
+				if (!vvcc) return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			if (dsi) {
+				GF_List *bck = vvcc_out->param_array;
+				memcpy(vvcc_out, vvcc, sizeof(GF_VVCConfig));
+				vvcc_out->param_array = bck;
+			}
+
+			gf_filter_pid_set_udta_flags(ipid, vvcc->nal_unit_size);
+			e = bsagg_transfer_param_array(vvcc_out->param_array, vvcc->param_array);
+			if (e) return e;
+
+			if (vvcc)
+				gf_odf_vvc_cfg_del(vvcc);
+
+			if (dsi && dsi_enh) {
+				vvcc = gf_odf_vvc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size);
+				if (!vvcc) return GF_NON_COMPLIANT_BITSTREAM;
+
+				e = bsagg_transfer_param_array(vvcc_out->param_array, vvcc->param_array);
+				gf_odf_vvc_cfg_del(vvcc);
+				if (e) return e;
+			}
+		} else {
+#ifndef GPAC_DISABLE_HEVC
+			GF_HEVCConfig *hvcc = NULL;
+			Bool dsi_lhvc=GF_FALSE;
+			if ((pctx->codec_id==GF_CODECID_LHVC) && !dsi_enh) dsi_lhvc=GF_TRUE;
+
+			if (dsi) {
+				hvcc = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, dsi_lhvc);
+				if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			else if (dsi_enh) {
+				hvcc = gf_odf_hevc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size, GF_TRUE);
+				if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			if (dsi) {
+				GF_List *bck = hvcc_out->param_array;
+				memcpy(hvcc_out, hvcc, sizeof(GF_HEVCConfig));
+				hvcc_out->param_array = bck;
+			}
+
+			gf_filter_pid_set_udta_flags(ipid, hvcc->nal_unit_size);
+			if (dsi) {
+				e = bsagg_transfer_param_array(hvcc_out->param_array, hvcc->param_array);
+				if (e) return e;
+			} else {
+				if (!hvcc_enh_out) {
+					hvcc_enh_out = hvcc;
+					hvcc = NULL;
+				} else {
+					e = bsagg_transfer_param_array(hvcc_enh_out->param_array, hvcc->param_array);
+					if (e) return e;
+				}
+			}
+			if (hvcc)
+				gf_odf_hevc_cfg_del(hvcc);
+
+			if (dsi && dsi_enh) {
+				hvcc = gf_odf_hevc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size, GF_TRUE);
+				if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+
+				e = bsagg_transfer_param_array(hvcc_out->param_array, hvcc->param_array);
+				gf_odf_hevc_cfg_del(hvcc);
+				if (e) return e;
+			}
+#endif
+		}
+	}
+
+	if (base) {
+
+		gf_filter_pid_copy_properties(pctx->opid, base);
+
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_HEVC));
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_ISOM_STSD_TEMPLATE, NULL);
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_BITRATE, NULL);
+
+		if (dv_cfg)
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DOLBY_VISION, dv_cfg);
+
+
+		u8 *data;
+		u32 size;
+		if (vvcc_out) {
+			vvcc_out->nal_unit_size = 4;
+			gf_odf_vvc_cfg_write(vvcc_out, &data, &size);
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(data, size) );
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+		}
+#ifndef GPAC_DISABLE_HEVC
+		if (hvcc_out) {
+			hvcc_out->nal_unit_size = 4;
+			hvcc_out->is_lhvc = GF_FALSE;
+			gf_odf_hevc_cfg_write(hvcc_out, &data, &size);
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(data, size) );
+			if (hvcc_enh_out) {
+				hvcc_enh_out->is_lhvc = GF_TRUE;
+				hvcc_enh_out->nal_unit_size = 4;
+				gf_odf_hevc_cfg_write(hvcc_enh_out, &data, &size);
+				gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, &PROP_DATA_NO_COPY(data, size) );
+			} else {
+				gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+			}
+		}
+#endif
+	}
+
+#ifndef GPAC_DISABLE_HEVC
+	if (hvcc_out) gf_odf_hevc_cfg_del(hvcc_out);
+	if (hvcc_enh_out) gf_odf_hevc_cfg_del(hvcc_enh_out);
+#endif
+	if (vvcc_out) gf_odf_vvc_cfg_del(vvcc_out);
+	return GF_OK;
+}
+
+
+static GF_Err none_rewrite_pid_config(BSAggCtx *ctx, BSAggOut *c_opid)
+{
+	GF_FilterPid *ipid = gf_list_get(c_opid->ipids, 0);
+	gf_filter_pid_copy_properties(c_opid->opid, ipid);
+	return GF_OK;
+}
+
+static GF_Err none_process(BSAggCtx *ctx, BSAggOut *c_opid)
+{
+	GF_FilterPid *ipid = gf_list_get(c_opid->ipids, 0);
+	while (1) {
+		GF_Err e;
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ipid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(ipid)) {
+				gf_filter_pid_set_eos(c_opid->opid);
+				return GF_EOS;
+			}
+			return GF_OK;
+		}
+		e = gf_filter_pck_forward(pck, c_opid->opid);
+		gf_filter_pid_drop_packet(ipid);
+		if (e) return e;
+	}
+	return GF_OK;
+}
+
+static GF_Err nalu_process(BSAggCtx *ctx, BSAggOut *pctx, u32 codec_type)
+{
+	u32 size, pck_size, i, count, tot_size=0, nb_done=0;
+	u64 min_dts = GF_FILTER_NO_TS;
+	u32 min_timescale=0, min_nal_size;
+	GF_Err process_error = GF_OK;
+	Bool has_svc_prefix = GF_FALSE;
+
+	min_nal_size = codec_type ? 2 : 1;
+
+	count = gf_list_count(pctx->ipids);
+	for (i=0; i<count; i++) {
+		u64 ts;
+		u32 timescale;
+		GF_FilterPid *pid = gf_list_get(pctx->ipids, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(pid)) {
+				nb_done++;
+				continue;
+			}
+			return GF_OK;
+		}
+		ts = gf_filter_pck_get_dts(pck);
+		if (ts==GF_FILTER_NO_TS)
+			ts = gf_filter_pck_get_cts(pck);
+		if (ts==GF_FILTER_NO_TS) {
+			ts = 0;
+		}
+		timescale = gf_filter_pck_get_timescale(pck);
+		if (min_dts==GF_FILTER_NO_TS) {
+			min_dts = ts;
+			min_timescale = timescale;
+		} else if (gf_timestamp_less(ts, timescale, min_dts, min_timescale)) {
+			min_dts = ts;
+			min_timescale = timescale;
+		}
+	}
+	if (nb_done==count) {
+		gf_filter_pid_set_eos(pctx->opid);
+		return GF_EOS;
+	}
+	if (!min_timescale) return GF_OK;
+
+	for (i=0; i<count; i++) {
+		GF_Err e = GF_OK;
+		u64 ts;
+		u32 timescale;
+		u32 svc_layer_id=0, svc_temporal_id=0;
+		GF_FilterPid *pid = gf_list_get(pctx->ipids, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
+		if (!pck) continue;
+
+		ts = gf_filter_pck_get_dts(pck);
+		if (ts==GF_FILTER_NO_TS) ts = gf_filter_pck_get_cts(pck);
+		if (ts==GF_FILTER_NO_TS) ts = 0;
+
+		timescale = gf_filter_pck_get_timescale(pck);
+		if (! gf_timestamp_less_or_equal(ts, timescale, min_dts, min_timescale)) continue;
+
+		const u8 *data = gf_filter_pck_get_data(pck, &pck_size);
+		if (!data) continue;
+
+		u32 nalu_size_length = gf_filter_pid_get_udta_flags(pid);
+
+		size=0;
+		while (size<pck_size) {
+			u32 nal_type=0;
+			u32 layer_id = 0;
+			u32 temporal_id = 0;
+			u32 nal_hdr = nalu_size_length;
+			u32 nal_size = 0;
+			while (nal_hdr) {
+				nal_size |= data[size];
+				size++;
+				nal_hdr--;
+				if (!nal_hdr) break;
+				nal_size<<=8;
+			}
+			if (size + nal_size > pck_size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BSAgg] Invalid NAL size %d but remain %d\n", nal_size, pck_size-size));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				break;
+			}
+			if (nal_size < min_nal_size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BSAgg] Invalid NAL size %d but mn size %d\n", nal_size, min_nal_size));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				break;
+			}
+
+			//AVC
+			if (codec_type==0) {
+				nal_type = data[size] & 0x1F;
+				if ((nal_type == GF_AVC_NALU_SVC_PREFIX_NALU) || (nal_type==GF_AVC_NALU_SVC_SLICE)) {
+					if (nal_size < 4) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BSAgg] Invalid NAL size %d but mn size 4\n", nal_size));
+						e = GF_NON_COMPLIANT_BITSTREAM;
+						break;
+					}
+					has_svc_prefix = GF_TRUE;
+					//quick parse svc nal header (right after 1-byte nal header)
+					//u32 prio_id = (data[size+1]) & 0x3F;
+					u32 dep_id = (data[size+2] >> 4) & 0x7;
+					u32 qual_id = (data[size+2]) & 0xF;
+					u32 temporal_id = (data[size+3]>>5) & 0x7;
+
+					svc_temporal_id = temporal_id;
+					svc_layer_id = ctx->svcqid ? qual_id : dep_id;
+				}
+				if (has_svc_prefix) {
+					layer_id = svc_layer_id;
+					temporal_id = svc_temporal_id;
+				}
+
+				//force layerID 100 for DV
+				if ((nal_type == GF_AVC_NALU_DV_RPU) || (nal_type == GF_AVC_NALU_DV_EL)) {
+					layer_id = 100;
+				}
+				//don't forward extractors
+				//todo, find a way to differentiate DV EL from naluff aggregator
+				else if ((nal_type == GF_AVC_NALU_FF_EXTRACTOR)
+					|| (nal_type == GF_AVC_NALU_ACCESS_UNIT)
+				) {
+					size += nal_size;
+					continue;
+				}
+			}
+			//HEVC
+			else if (codec_type==1) {
+				nal_type = (data[size] & 0x7E) >> 1;
+
+				layer_id = data[size] & 1;
+				layer_id <<= 5;
+				layer_id |= (data[size+1] >> 3) & 0x1F;
+				temporal_id = (data[size+1] & 0x7);
+
+				if (nal_type == GF_HEVC_NALU_ACCESS_UNIT) {
+					size += nal_size;
+					continue;
+				}
+
+				//force layerID 100 for DV
+				if ((nal_type == GF_HEVC_NALU_DV_RPU) || (nal_type == GF_HEVC_NALU_DV_EL)) {
+					layer_id = 100;
+				}
+				//don't forward extractors nor aggregators
+				else if ((nal_type == GF_HEVC_NALU_FF_EXTRACTOR)
+					|| (nal_type == GF_HEVC_NALU_FF_AGGREGATOR)
+					|| (nal_type == GF_AVC_NALU_ACCESS_UNIT)
+				) {
+					size += nal_size;
+					continue;
+				}
+			}
+			//VVC
+			else if (codec_type==2) {
+				layer_id = data[size] & 0x3F;
+				temporal_id = data[size+1] & 0x7;
+				nal_type = data[size+1] >> 3;
+
+				if (nal_type == GF_VVC_NALU_ACCESS_UNIT) {
+					size += nal_size;
+					continue;
+				}
+			}
+			//push nal
+			NALStore *ns = NULL;
+			s32 next_ns_idx = -1;
+			u32 nal_count = gf_list_count(pctx->nal_stores);
+			for (u32 j=0; j<nal_count; j++) {
+				ns = gf_list_get(pctx->nal_stores, j);
+				if ((ns->lid == layer_id) && (ns->tid == temporal_id))
+					break;
+
+				//same layer, tid greater than ours: insert nal
+				if (ns->lid==layer_id) {
+					if (ns->tid > temporal_id) {
+						next_ns_idx = j;
+						ns = NULL;
+						break;
+					}
+				}
+				if (ns->lid>layer_id) {
+					next_ns_idx = j;
+					ns = NULL;
+					break;
+				}
+				ns = NULL;
+			}
+
+			if (!ns) {
+				GF_SAFEALLOC(ns, NALStore)
+				if (!ns) {
+					e = GF_OUT_OF_MEM;
+					break;
+				}
+				ns->lid = layer_id;
+				ns->tid = temporal_id;
+				if (next_ns_idx>=0) {
+					gf_list_insert(pctx->nal_stores, ns, next_ns_idx);
+				} else {
+					gf_list_add(pctx->nal_stores, ns);
+				}
+			}
+			if (ns->alloc_size < ns->size+nal_size+4) {
+				ns->alloc_size = ns->size+nal_size+4;
+				ns->data = gf_realloc(ns->data, ns->alloc_size);
+				if (!ns->data) {
+					e = GF_OUT_OF_MEM;
+					break;
+				}
+			}
+			u8 *dst = ns->data + ns->size;
+			//write nal header
+			nal_hdr=4;
+			while (nal_hdr) {
+				nal_hdr--;
+				*dst = (nal_size>>(8*nal_hdr)) & 0xFF;
+				dst++;
+			}
+			//write nal
+			memcpy(dst, data + size, nal_size);
+			ns->size+= nal_size + 4;
+			tot_size += nal_size + 4;
+
+			size += nal_size;
+		}
+		//if not created, alloc output packet with 4 bytes and copy packet props
+		if (size && !pctx->pck) {
+			pctx->pck = gf_filter_pck_new_alloc(pctx->opid, 4, NULL);
+			if (!pctx->pck) {
+				e = GF_OUT_OF_MEM;
+				break;
+			}
+			gf_filter_pck_merge_properties(pck, pctx->pck);
+		}
+		//drop packet
+		gf_filter_pid_drop_packet(pid);
+
+		if (e) process_error = e;
+	}
+
+	if (!tot_size) return process_error;
+
+	//realloc packet to total size
+	u8 *output=NULL;
+	gf_filter_pck_expand(pctx->pck, tot_size-4, &output, NULL, NULL);
+	u32 nal_count = gf_list_count(pctx->nal_stores);
+	for (u32 j=0; j<nal_count; j++) {
+		NALStore *ns = gf_list_get(pctx->nal_stores, j);
+		if (!ns->size) continue;
+
+		memcpy(output, ns->data, ns->size);
+		output+= ns->size;
+		ns->size = 0;
+	}
+
+	gf_filter_pck_send(pctx->pck);
+	pctx->pck = NULL;
+	return GF_OK;
+}
+
+static GF_Err avc_process(BSAggCtx *ctx, BSAggOut *c_opid)
+{
+	return nalu_process(ctx, c_opid, 0);
+}
+static GF_Err hevc_process(BSAggCtx *ctx, BSAggOut *c_opid)
+{
+	return nalu_process(ctx, c_opid, 1);
+}
+static GF_Err vvc_process(BSAggCtx *ctx, BSAggOut *c_opid)
+{
+	return nalu_process(ctx, c_opid, 2);
+}
+
+static Bool bs_agg_is_base(BSAggOut *pctx, u32 codec_id, u32 dep_id, u32 rec_level)
+{
+	u32 i, count = gf_list_count(pctx->ipids);
+	if (rec_level>count) return GF_FALSE;
+	for (i=0; i<count; i++) {
+		GF_FilterPid *ipid = gf_list_get(pctx->ipids, i);
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ipid, GF_PROP_PID_ID);
+		if (p && (p->value.uint==dep_id)) return GF_TRUE;
+		p = gf_filter_pid_get_property(ipid, GF_PROP_PID_DEPENDENCY_ID);
+		if (!p || !p->value.uint) continue;;
+
+		if (bs_agg_is_base(pctx, codec_id, p->value.uint, rec_level+1))
+			return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+static BSAggOut *bs_agg_get_base(BSAggCtx *ctx, u32 codec_id, u32 dep_id)
+{
+	u32 i, count = gf_list_count(ctx->pids);
+	for (i=0; i<count; i++) {
+		BSAggOut *pctx = gf_list_get(ctx->pids, i);
+		if (bs_agg_is_base(pctx, codec_id, dep_id, 0))
+			return pctx;
+	}
+	return NULL;
+}
+
+static void bs_agg_reset_stream(BSAggOut *pctx)
+{
+	while (gf_list_count(pctx->nal_stores)) {
+		NALStore *ns = gf_list_pop_back(pctx->nal_stores);
+		gf_free(ns->data);
+		gf_free(ns);
+	}
+	gf_list_del(pctx->nal_stores);
+	gf_list_del(pctx->ipids);
+	gf_free(pctx);
+}
+
+static GF_Err bs_agg_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	u32 codec_id;
+	BSAggCtx *ctx = (BSAggCtx *) gf_filter_get_udta(filter);
+	BSAggOut *pctx = gf_filter_pid_get_udta(pid);
+
+	//disconnect of src pid
+	if (is_remove) {
+		if (pctx) {
+			gf_list_del_item(pctx->ipids, pid);
+			if (!gf_list_count(pctx->ipids)) {
+				gf_filter_pid_remove(pctx->opid);
+				gf_list_del_item(ctx->pids, pctx);
+				bs_agg_reset_stream(pctx);
+			}
+ 			gf_filter_pid_set_udta(pid, NULL);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!prop) return GF_NOT_SUPPORTED;
+	codec_id = prop->value.uint;
+
+	//initial config of pid, check base ID
+	if (!pctx) {
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DEPENDENCY_ID);
+		if (prop && prop->value.uint)
+			pctx = bs_agg_get_base(ctx, codec_id, prop->value.uint);
+
+		if (!pctx) {
+			GF_SAFEALLOC(pctx, BSAggOut);
+			if (!pctx) return GF_OUT_OF_MEM;
+			pctx->ipids = gf_list_new();
+			pctx->nal_stores = gf_list_new();
+			if (!pctx->ipids || !pctx->nal_stores) return GF_OUT_OF_MEM;
+			pctx->opid = gf_filter_pid_new(filter);
+			gf_list_add(ctx->pids, pctx);
+		}
+		//add input
+		gf_filter_pid_set_udta(pid, pctx);
+		gf_list_add(pctx->ipids, pid);
+	}
+
+	switch (codec_id) {
+	case GF_CODECID_AVC:
+	case GF_CODECID_SVC:
+	case GF_CODECID_MVC:
+		pctx->rewrite_pid_config = avc_rewrite_pid_config;
+		pctx->agg_process = avc_process;
+		break;
+#ifndef GPAC_DISABLE_HEVC
+	case GF_CODECID_HEVC:
+	case GF_CODECID_LHVC:
+		codec_id = GF_CODECID_HEVC;
+		pctx->rewrite_pid_config = vvc_hevc_rewrite_pid_config;
+		pctx->agg_process = hevc_process;
+		break;
+#endif
+	case GF_CODECID_VVC:
+		pctx->rewrite_pid_config = vvc_hevc_rewrite_pid_config;
+		pctx->agg_process = vvc_process;
+		break;
+	default:
+		pctx->rewrite_pid_config = none_rewrite_pid_config;
+		pctx->agg_process = none_process;
+		break;
+	}
+
+	//change of codec, reset output
+	if (pctx->codec_id && (pctx->codec_id != codec_id)) {
+		while (gf_list_count(pctx->nal_stores)) {
+			NALStore *ns = gf_list_pop_back(pctx->nal_stores);
+			gf_free(ns->data);
+			gf_free(ns);
+		}
+	}
+	pctx->codec_id = codec_id;
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	//rewrite asap - waiting for first packet could lead to issues further down the chain, especially for movie fragments
+	//were the init segment could have already been flushed at the time we will dispatch the first packet
+	return pctx->rewrite_pid_config(ctx, pctx);
+}
+
+
+static GF_Err bs_agg_process(GF_Filter *filter)
+{
+	u32 i, count, done=0;
+	BSAggCtx *ctx = (BSAggCtx *) gf_filter_get_udta(filter);
+
+	count = gf_list_count(ctx->pids);
+	for (i=0; i<count; i++) {
+		BSAggOut *pctx = gf_list_get(ctx->pids, i);
+		GF_Err e = pctx->agg_process(ctx, pctx);
+		if (e==GF_EOS) done++;
+		else if (e) return e;
+	}
+	if (done==count) return GF_EOS;
+	return GF_OK;
+}
+
+
+static GF_Err bs_agg_initialize(GF_Filter *filter)
+{
+	BSAggCtx *ctx = (BSAggCtx *) gf_filter_get_udta(filter);
+	ctx->pids = gf_list_new();
+
+	ctx->filter = filter;
+	return GF_OK;
+}
+static void bs_agg_finalize(GF_Filter *filter)
+{
+	BSAggCtx *ctx = (BSAggCtx *) gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->pids)) {
+		BSAggOut *pctx = gf_list_pop_back(ctx->pids);
+		bs_agg_reset_stream(pctx);
+	}
+	gf_list_del(ctx->pids);
+}
+
+#define OFFS(_n)	#_n, offsetof(BSAggCtx, _n)
+static GF_FilterArgs BSAggArgs[] =
+{
+	{ OFFS(svcqid), "use qualityID instead of dependencyID for SVC splitting", GF_PROP_BOOL, "false", NULL, 0},
+	{0}
+};
+
+static const GF_FilterCapability BSAggCaps[] =
+{
+	//we want the filter to act as passthrough for other media, so we accept everything
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+};
+
+GF_FilterRegister BSAggRegister = {
+	.name = "bsagg",
+	GF_FS_SET_DESCRIPTION("Compressed layered bitstream aggregator")
+	GF_FS_SET_HELP("This filter aggregates layers and sublayers into a single output PID.\n"
+	"\n"
+	"The filter supports AVC|H264, HEVC and VVC stream reconstruction, and is passthrough for other codec types.\n"
+	"\n"
+	"Aggregation is based on temporalID value (start from 1) and layerID value (start from 0).\n"
+	"For AVC|H264, layerID is the dependency value, or quality value if `svcqid` is set.\n"
+	"\n"
+	"The filter can also be used on AVC and HEVC DolbyVision dual-streams to aggregate base stream and DV RPU/EL.\n"
+	"\n"
+	"The filter does not forward aggregator or extractor NAL units.\n"
+	)
+	.private_size = sizeof(BSAggCtx),
+	.max_extra_pids = 0xFFFFFFFF,
+	.flags = GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_ALLOW_CYCLIC,
+	.args = BSAggArgs,
+	SETCAPS(BSAggCaps),
+	.initialize = bs_agg_initialize,
+	.finalize = bs_agg_finalize,
+	.configure_pid = bs_agg_configure_pid,
+	.process = bs_agg_process
+};
+
+const GF_FilterRegister *bs_agg_register(GF_FilterSession *session)
+{
+	return (const GF_FilterRegister *) &BSAggRegister;
+}

gpac-2.0.0.tar.gz/src/filters/bs_split.c Added

@@ -0,0 +1,1487 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / compressed bitstream splitter filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/filters.h>
+#include <gpac/constants.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/mpeg4_odf.h>
+
+typedef struct
+{
+	GF_FilterPid *opid;
+
+	u32 max_layer_id, max_temporal_id;
+
+	u32 min_lid_plus_one, min_tid_plus_one;
+
+	Bool is_base, is_init;
+	u32 id, dep_id, width, height;
+
+	GF_FilterPacket *pck;
+
+	GF_AVCConfig *svcc;
+} BSSplitOut;
+
+typedef struct _bs_split_ctx BSSplitCtx;
+typedef struct _bs_split_pid BSSplitIn;
+
+struct _bs_split_pid
+{
+	u32 nalu_size_length;
+	u32 codec_id;
+
+	u64 first_ts_plus_one;
+
+	GF_Err (*rewrite_pid_config)(BSSplitCtx *ctx, BSSplitIn *pctx);
+	GF_Err (*split_packet)(BSSplitCtx *ctx, BSSplitIn *pctx, GF_FilterPacket *pck);
+
+	GF_FilterPid *ipid;
+
+	GF_List *opids;
+
+	GF_AVCConfig *avcc;
+	GF_AVCConfig *svcc;
+	AVCState *avc_state;
+	GF_BitStream *r_bs;
+
+	u32 max_layers, max_sublayers;
+};
+
+struct _bs_split_ctx
+{
+	//options
+	GF_PropStringList ltid;
+	Bool sig_ltid, svcqid;
+
+	//internal
+	GF_Filter *filter;
+	GF_List *pids;
+};
+
+
+static Bool match_substream(BSSplitOut *c_opid, u32 layer_id, u32 temporal_id)
+{
+	if (layer_id > c_opid->max_layer_id) return GF_FALSE;
+
+	if (temporal_id > c_opid->max_temporal_id) return GF_FALSE;
+
+	if (c_opid->min_lid_plus_one) {
+		if (layer_id < c_opid->min_lid_plus_one-1)
+			return GF_FALSE;
+		if (layer_id > c_opid->min_lid_plus_one-1)
+			return GF_TRUE;
+	}
+	if (c_opid->min_tid_plus_one) {
+		if (temporal_id <= c_opid->min_tid_plus_one-1)
+			return GF_FALSE;
+	}
+
+	return GF_TRUE;
+}
+
+//reinsert param set by ID order
+static void bs_split_svc_add_param(GF_List *ps_list, GF_NALUFFParam *sl)
+{
+	u32 i, count=gf_list_count(ps_list);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParam *p = gf_list_get(ps_list, i);
+		if (p->id > sl->id) {
+			gf_list_insert(ps_list, sl, i);
+			return;
+		}
+	}
+	gf_list_add(ps_list, sl);
+}
+
+static void bs_split_check_svc_config(BSSplitIn *pctx, BSSplitOut *c_opid)
+{
+	u32 i;
+	Bool sps_found=GF_FALSE, pps_found=GF_FALSE;
+	u32 avc_pps_id = pctx->avc_state->s_info.pps->id;
+	//warning the sps ID internally stored in svcc is shifted by GF_SVC_SSPS_ID_SHIFT
+
+	u32 avc_sps_id;
+	if (pctx->avc_state->last_nal_type_parsed == GF_AVC_NALU_SVC_SLICE)
+		avc_sps_id = pctx->avc_state->s_info.pps->sps_id + GF_SVC_SSPS_ID_SHIFT;
+	else
+		avc_sps_id = pctx->avc_state->s_info.pps->sps_id;
+
+	if (!c_opid->svcc) {
+		GF_SAFEALLOC(c_opid->svcc, GF_AVCConfig);
+		memcpy(c_opid->svcc, pctx->svcc, sizeof(GF_AVCConfig));
+		c_opid->svcc->sequenceParameterSets = gf_list_new();
+		c_opid->svcc->pictureParameterSets = gf_list_new();
+		c_opid->svcc->complete_representation = 0;
+	}
+
+	if (pctx->avc_state->sps[avc_sps_id].width > c_opid->width) {
+		c_opid->width = pctx->avc_state->sps[avc_sps_id].width;
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_WIDTH, &PROP_UINT(c_opid->width));
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_WIDTH_MAX, &PROP_UINT(c_opid->width));
+	}
+	if (pctx->avc_state->sps[avc_sps_id].height > c_opid->height) {
+		c_opid->height = pctx->avc_state->sps[avc_sps_id].height;
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(c_opid->height));
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_HEIGHT_MAX, &PROP_UINT(c_opid->height));
+	}
+
+#define CHECK_PARAM(_name, _id, _res)\
+	for (i=0; i<gf_list_count(_name); i++) {\
+		GF_NALUFFParam *sl = gf_list_get(_name, i);\
+		if (sl->id == _id) { _res = GF_TRUE; break; }\
+	}
+
+	//check sps, first in our config
+	CHECK_PARAM(c_opid->svcc->sequenceParameterSets, avc_sps_id, sps_found)
+	if (!sps_found) {
+		//sps is in base config
+		CHECK_PARAM(pctx->avcc->sequenceParameterSets, avc_sps_id, sps_found)
+		if (!sps_found && (avc_sps_id<GF_SVC_SSPS_ID_SHIFT)) {
+			CHECK_PARAM(c_opid->svcc->sequenceParameterSets, avc_sps_id+GF_SVC_SSPS_ID_SHIFT, sps_found)
+		}
+	}
+
+	//check pps, first in our config
+	CHECK_PARAM(c_opid->svcc->pictureParameterSets, avc_pps_id, pps_found)
+	if (!pps_found) {
+		//pps is in base config
+		CHECK_PARAM(pctx->avcc->pictureParameterSets, avc_pps_id, pps_found)
+	}
+	if (pps_found && sps_found) return;
+
+	if (!sps_found) {
+rebrowse_sps:
+		for (i=0; i<gf_list_count(pctx->svcc->sequenceParameterSets); i++) {
+			GF_NALUFFParam *sl = gf_list_get(pctx->svcc->sequenceParameterSets, i);
+			if (sl->id == avc_sps_id) {
+				sps_found = GF_TRUE;
+				assert(gf_list_find(c_opid->svcc->sequenceParameterSets, sl)<0);
+				bs_split_svc_add_param(c_opid->svcc->sequenceParameterSets, sl);
+				break;
+			}
+		}
+		if (!sps_found && (avc_sps_id<GF_SVC_SSPS_ID_SHIFT)) {
+			avc_sps_id+=GF_SVC_SSPS_ID_SHIFT;
+			goto rebrowse_sps;
+		}
+	}
+	if (!pps_found) {
+		for (i=0; i<gf_list_count(pctx->svcc->pictureParameterSets); i++) {
+			GF_NALUFFParam *sl = gf_list_get(pctx->svcc->pictureParameterSets, i);
+			if (sl->id == avc_pps_id) {
+				pps_found = GF_TRUE;
+				bs_split_svc_add_param(c_opid->svcc->pictureParameterSets, sl);
+				break;
+			}
+		}
+	}
+	if (!sps_found) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BSSplit] Missing sequence parameter set ID %d in input\n", (avc_sps_id>GF_SVC_SSPS_ID_SHIFT) ? (avc_sps_id-GF_SVC_SSPS_ID_SHIFT) : avc_sps_id));
+	}
+	if (!pps_found) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BSSplit] Missing picture parameter set ID %d in input\n", avc_pps_id));
+	}
+	if (!pps_found && !sps_found) return;
+
+	u8 *dsi;
+	u32 dsi_size;
+	gf_odf_avc_cfg_write(c_opid->svcc, &dsi, &dsi_size);
+	gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, &PROP_DATA_NO_COPY(dsi, dsi_size) );
+
+}
+
+static void bs_split_update_hevc_linf(BSSplitIn *pctx, BSSplitOut *c_opid)
+{
+	u32 i;
+	u32 max_lid = c_opid->max_layer_id;
+	u32 max_tid = c_opid->max_temporal_id;
+	u32 min_lid = 0;
+	u32 min_tid = 0;
+	for (i=0; i<gf_list_count(pctx->opids); i++) {
+		BSSplitOut *an_out = gf_list_get(pctx->opids, i);
+		if (an_out==c_opid) continue;
+		if (max_lid < an_out->max_layer_id) continue;
+		if (max_lid == an_out->max_layer_id) {
+			if (min_tid<an_out->max_temporal_id) min_tid = an_out->max_temporal_id;
+			continue;
+		}
+		if (min_lid < an_out->max_layer_id) min_lid = an_out->max_layer_id;
+	}
+	if (pctx->max_layers) {
+		if (max_lid >= pctx->max_layers) max_lid = pctx->max_layers-1;
+	} else {
+		if (max_lid >= 63) max_lid = 63;
+	}
+
+	if (pctx->max_sublayers) {
+		if (max_tid > pctx->max_sublayers) max_tid = pctx->max_sublayers;
+	} else {
+		if (max_tid > 7) max_tid = 7;
+	}
+
+	u32 nb_layers = (max_lid - min_lid);
+	if (!nb_layers) {
+		nb_layers = 1;
+		min_lid = 0;
+	} else {
+		min_lid++;
+	}
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	gf_bs_write_int(bs, 0, 2);
+	gf_bs_write_int(bs, nb_layers, 6);
+	for (i=0; i<nb_layers; i++) {
+		gf_bs_write_int(bs, 0, 4);
+		gf_bs_write_int(bs, min_lid+i, 6);
+		gf_bs_write_int(bs, min_tid+1, 3);
+		gf_bs_write_int(bs, max_tid, 3);
+		gf_bs_write_int(bs, 0, 1);
+		gf_bs_write_int(bs, 0xFF, 7);
+	}
+	u8 *data;
+	u32 data_size;
+	gf_bs_get_content(bs, &data, &data_size);
+	gf_bs_del(bs);
+	gf_filter_pid_set_info_str(c_opid->opid, "hevc:linf", &PROP_DATA_NO_COPY(data, data_size) );
+}
+
+static void bs_split_copy_props_base(BSSplitCtx *ctx, BSSplitOut *c_opid, GF_FilterPid *pid, u32 svc_base_id)
+{
+	gf_filter_pid_copy_properties(c_opid->opid, pid);
+	gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_ID, &PROP_UINT(c_opid->id));
+	gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_ISOM_STSD_TEMPLATE, NULL);
+	gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_ISOM_SUBTYPE, NULL);
+
+	if (!c_opid->is_base) {
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_ISOM_TRACK_TEMPLATE, NULL);
+	} else {
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DOLBY_VISION, NULL);
+	}
+	gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_BITRATE, NULL);
+	//we must force negctts on output MP4 otherwise the mux will adjust timings for some tracks (P frames)
+	//but not for tracks containing only I or B frames
+	gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_ISOM_FORCE_NEGCTTS, &PROP_BOOL(GF_TRUE));
+
+	if (c_opid->width && c_opid->height) {
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_WIDTH, &PROP_UINT(c_opid->width));
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(c_opid->height));
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_WIDTH_MAX, &PROP_UINT(c_opid->width));
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_HEIGHT_MAX, &PROP_UINT(c_opid->height));
+	}
+	if (c_opid->dep_id)
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(c_opid->dep_id));
+
+	if (ctx->sig_ltid) {
+		gf_filter_pid_set_property_str(c_opid->opid, "max_layer_id", &PROP_UINT(c_opid->max_layer_id));
+		gf_filter_pid_set_property_str(c_opid->opid, "max_temporal_id", &PROP_UINT(c_opid->max_temporal_id));
+	}
+
+	if (svc_base_id) {
+		GF_PropertyValue prop_sbas;
+		prop_sbas.type = GF_PROP_UINT_LIST;
+		prop_sbas.value.uint_list.nb_items = 1;
+		prop_sbas.value.uint_list.vals = &svc_base_id;
+		//inject sbas reference
+		gf_filter_pid_set_property_str(c_opid->opid, "isom:sbas", &prop_sbas);
+	}
+
+	//the rest: codecID, decoder config and codec-specific props are done elsewhere
+}
+
+static BSSplitOut *bs_split_get_out_stream(BSSplitCtx *ctx, BSSplitIn *pctx, Bool is_config, u32 layer_id, u32 temporal_id, Bool force_dv)
+{
+	u32 i, count;
+	Bool update_linf=GF_FALSE;
+	BSSplitOut *c_opid = NULL;
+	BSSplitOut *max_c_opid = NULL;
+	if (!layer_id && (temporal_id==1)) {
+		c_opid = gf_list_get(pctx->opids, 0);
+		c_opid->is_base = GF_TRUE;
+	} else {
+		count = gf_list_count(pctx->opids);
+		for (i=0; i<count; i++) {
+			c_opid = gf_list_get(pctx->opids, i);
+			if ((c_opid->max_layer_id==99) && (c_opid->max_temporal_id==99))
+				max_c_opid = c_opid;
+
+			if (match_substream(c_opid, layer_id, temporal_id))
+				break;
+
+			c_opid = NULL;
+		}
+	}
+
+	//assign config based on settings
+	u32 min_lid_last = 0;
+	u32 min_tid_last = 0;
+	u32 max_lid = 0;
+	u32 max_tid = 0;
+
+	//no output or max TID not assigned, parse config
+	if (!c_opid || !c_opid->max_temporal_id) {
+		//if no config, assume layer split
+		if (!ctx->ltid.nb_items) {
+			max_lid = layer_id;
+			max_tid = 99;
+		} else {
+			Bool found=GF_FALSE;
+			for (i=0; i<ctx->ltid.nb_items; i++) {
+				u32 max_layer_id = 0;
+				u32 max_temporal_id = 0;
+				char *ltid = ctx->ltid.vals[i];
+
+				if (ltid[0] == '.') {
+					max_layer_id = 99;
+					sscanf(ltid, ".%u", &max_temporal_id);
+				} else if (!strcmp(ltid, "all")) {
+					max_layer_id = layer_id;
+					max_temporal_id = temporal_id;
+				} else if (strchr(ltid, '.')) {
+					sscanf(ltid, "%u.%u", &max_layer_id, &max_temporal_id);
+				} else {
+					sscanf(ltid, "%u", &max_layer_id);
+					max_temporal_id=99;
+				}
+				if (!max_temporal_id) max_temporal_id = 1;
+
+				if (max_layer_id!=99) {
+					if (min_lid_last < max_layer_id+1) min_lid_last = max_layer_id+1;
+				}
+				if (max_temporal_id!=99) {
+					if (min_tid_last < max_temporal_id+1) min_tid_last = max_temporal_id+1;
+				}
+
+				//layer not specified or we match our layer, check temporal
+				if ((max_layer_id==99) || (max_layer_id == layer_id)) {
+					if (max_temporal_id >= temporal_id) {
+						max_lid = max_layer_id;
+						max_tid = max_temporal_id;
+						found = GF_TRUE;
+						break;
+					}
+				}
+				else if ((max_layer_id > layer_id) && (max_temporal_id >= temporal_id)) {
+					max_lid = max_layer_id;
+					max_tid = max_temporal_id;
+					found = GF_TRUE;
+					break;
+				}
+			}
+			//no stream found (e.g. max stream), use max stream if existing
+			if (!c_opid && !found && max_c_opid) {
+				c_opid = max_c_opid;
+			}
+			else if (!found) {
+				//if we get here, last layer specified, put everything higher in this stream
+				max_lid = 99;
+				max_tid = 99;
+			} else {
+				min_lid_last = 0;
+				min_tid_last = 0;
+			}
+		}
+	}
+
+
+	if (!c_opid) {
+		const GF_PropertyValue *p;
+		BSSplitOut *base_out = gf_list_last(pctx->opids);
+		u32 base_id;
+		GF_SAFEALLOC(c_opid, BSSplitOut);
+		if (!c_opid) return NULL;
+		gf_list_add(pctx->opids, c_opid);
+		c_opid->opid = gf_filter_pid_new(ctx->filter);
+
+		p = gf_filter_pid_get_property(pctx->ipid, GF_PROP_PID_ID);
+		base_id = p ? p->value.uint : 1;
+		c_opid->id = base_id + 100 + gf_list_count(pctx->opids)-2;
+
+		//check dependencies, first by layers, then by tid within layer
+		//note that this is not sufficient: if we split L0(T1,T2)+L1(T1,T2) in 4 streams
+		//L1T2 depends on both L1T1 and L0T2
+		BSSplitOut *dep=NULL;
+		count = gf_list_count(pctx->opids);
+		for (i=count; i>1; i--) {
+			dep = gf_list_get(pctx->opids, i-2);
+			if ((dep->max_layer_id==layer_id) && (dep->max_temporal_id < temporal_id)) {
+				break;
+			}
+			dep=NULL;
+		}
+		if (!dep) {
+			for (i=count; i>1; i--) {
+				dep = gf_list_get(pctx->opids, i-2);
+				if (dep->max_layer_id<layer_id) {
+					break;
+				}
+				dep = NULL;
+			}
+		}
+		if (!dep)
+			dep = gf_list_get(pctx->opids, 0);
+
+		c_opid->dep_id = dep->id;
+
+		//get first stream with same layer ID and set width/height
+		for (i=0; i<count-1; i++) {
+			dep = gf_list_get(pctx->opids, i);
+			if (dep->width && dep->height && (dep->max_layer_id == layer_id)) {
+				c_opid->width = dep->width;
+				c_opid->height = dep->height;
+				break;
+			}
+		}
+
+		//ready to copy properties
+		bs_split_copy_props_base(ctx, c_opid, pctx->ipid, (pctx->codec_id==GF_CODECID_AVC) ? base_id : 0);
+
+		//not called during config, we must recreate decoder config and set codec IDs
+		//this happens for:
+		//- temporal sublayers which are usually not detected at configure
+		//- SVC for which we need frames to detect LID TID
+		//- DolbyVision RPU/EL
+		if (!is_config) {
+			Bool base_is_enh=GF_FALSE;
+			//always remove decoder config from enhancement
+			gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
+
+			p = gf_filter_pid_get_property(base_out->opid, GF_PROP_PID_DECODER_CONFIG);
+			if (!p) {
+				base_is_enh = GF_TRUE;
+				p = gf_filter_pid_get_property(base_out->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+			}
+
+			//DV split
+			if (force_dv) {
+				u8 dvcfg[24];
+				//set dsi
+				gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG, p);
+
+				//set dv
+				p = gf_filter_pid_get_property(pctx->ipid, GF_PROP_PID_DOLBY_VISION);
+				if (p && (p->value.data.size==24)) memcpy(dvcfg, p->value.data.ptr, 24);
+				else {
+					memset(dvcfg, 0, 24);
+					dvcfg[0] = 1;
+					dvcfg[0] = 1;
+				}
+				//remove bl_present_flag, last lsb bit of byte 4
+				dvcfg[3] &= ~1;
+
+				gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DOLBY_VISION, &PROP_DATA(dvcfg, 24));
+				if ((pctx->codec_id==GF_CODECID_HEVC) || (pctx->codec_id==GF_CODECID_LHVC)) {
+					gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_HEVC) );
+				}
+				else if (pctx->codec_id==GF_CODECID_AVC) {
+					gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_AVC) );
+				}
+				//VVC, not defined yet
+				else {
+					gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_VVC) );
+				}
+			}
+			//L-HEVC split, build decoder config(s)
+			else if ((pctx->codec_id==GF_CODECID_HEVC) || (pctx->codec_id==GF_CODECID_LHVC)) {
+				gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_LHVC) );
+
+				if (p) {
+					u8 *dsi;
+					u32 dsi_size;
+					GF_HEVCConfig *hvcc = gf_odf_hevc_cfg_read(p->value.data.ptr, p->value.data.size, (base_is_enh ? GF_TRUE : GF_FALSE) );
+					hvcc->is_lhvc = GF_TRUE;
+					gf_odf_hevc_cfg_write(hvcc, &dsi, &dsi_size);
+					gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, &PROP_DATA_NO_COPY(dsi, dsi_size) );
+					gf_odf_hevc_cfg_del(hvcc);
+				}
+				update_linf = GF_TRUE;
+			} else {
+				gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, p);
+				if (pctx->codec_id==GF_CODECID_AVC) {
+					gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_SVC) );
+				}
+			}
+		}
+	}
+	if (!is_config && pctx->avc_state && (layer_id || (temporal_id>1)))
+		bs_split_check_svc_config(pctx, c_opid);
+
+	if (c_opid->max_temporal_id)
+		return c_opid;
+
+	c_opid->max_layer_id = max_lid;
+	c_opid->max_temporal_id = max_tid;
+
+	//keep track of min lid/tid defined in config so we don't put NALs on highest stream when intermediate stream
+	//is not yet defined (temporal scalable)
+	if (min_lid_last) c_opid->min_lid_plus_one = min_lid_last;
+	if (min_tid_last) c_opid->min_tid_plus_one = min_tid_last;
+
+	if (ctx->sig_ltid) {
+		gf_filter_pid_set_property_str(c_opid->opid, "max_layer_id", &PROP_UINT(c_opid->max_layer_id));
+		gf_filter_pid_set_property_str(c_opid->opid, "max_temporal_id", &PROP_UINT(c_opid->max_temporal_id));
+	}
+	if (update_linf) bs_split_update_hevc_linf(pctx, c_opid);
+	return c_opid;
+}
+
+static void bs_split_svcc_del(GF_AVCConfig *svcc)
+{
+	if (!svcc) return;
+
+	gf_list_reset(svcc->sequenceParameterSets);
+	gf_list_reset(svcc->pictureParameterSets);
+	gf_odf_avc_cfg_del(svcc);
+}
+
+static GF_Err avc_rewrite_pid_config(BSSplitCtx *ctx, BSSplitIn *pctx)
+{
+	GF_AVCConfig *avcc;
+	BSSplitOut *c_opid;
+	u8 *dsi;
+	u32 dsi_size, i, count, base_id;
+	u32 width=0, height=0;
+	const GF_PropertyValue *prop;
+
+	prop = gf_filter_pid_get_property(pctx->ipid, GF_PROP_PID_DECODER_CONFIG);
+	if (!prop) return GF_OK;
+
+	avcc = gf_odf_avc_cfg_read(prop->value.data.ptr, prop->value.data.size);
+	if (!avcc) return GF_NON_COMPLIANT_BITSTREAM;
+
+	if (!pctx->avc_state) pctx->avc_state = (AVCState *) gf_malloc(sizeof(AVCState));
+	memset(pctx->avc_state, 0, sizeof(AVCState));
+	if (!pctx->r_bs)
+		pctx->r_bs = gf_bs_new((u8*)pctx->avc_state, 1, GF_BITSTREAM_READ);
+
+	gf_odf_avc_cfg_write(avcc, &dsi, &dsi_size);
+	pctx->nalu_size_length = avcc->nal_unit_size;
+
+	//cleanup all svcc, they contain pointers to pctx->avcc andf pctx->svcc we are about to free
+	for (i=1; i<gf_list_count(pctx->opids); i++) {
+		c_opid = gf_list_get(pctx->opids, i);
+		if (c_opid->svcc) {
+			bs_split_svcc_del(c_opid->svcc);
+			c_opid->svcc = NULL;
+		}
+	}
+
+	if (pctx->avcc) gf_odf_avc_cfg_del(pctx->avcc);
+	pctx->avcc = avcc;
+
+#define AVC_READ_LIST(_list, _is_sps) \
+	if (_list) {\
+		count = gf_list_count(_list);\
+		for (i=0; i<count; i++) {\
+			GF_NALUFFParam *sl = gf_list_get(_list, i);\
+			gf_bs_reassign_buffer(pctx->r_bs, sl->data, sl->size);\
+			gf_bs_enable_emulation_byte_removal(pctx->r_bs, GF_TRUE);\
+			s32 res = gf_avc_parse_nalu(pctx->r_bs, pctx->avc_state);\
+			if (res>=0) {\
+				sl->id = pctx->avc_state->last_ps_idx;\
+				if (_is_sps) {\
+					width = pctx->avc_state->sps[sl->id].width;\
+					height = pctx->avc_state->sps[sl->id].height;\
+				}\
+			}\
+		}\
+	}\
+
+	AVC_READ_LIST(pctx->avcc->sequenceParameterSets, GF_TRUE)
+	AVC_READ_LIST(pctx->avcc->pictureParameterSets, GF_FALSE)
+	AVC_READ_LIST(pctx->avcc->sequenceParameterSetExtensions, GF_FALSE)
+
+	if (pctx->svcc) gf_odf_avc_cfg_del(pctx->svcc);
+	pctx->svcc = NULL;
+	prop = gf_filter_pid_get_property(pctx->ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+	if (prop) {
+		pctx->svcc = gf_odf_avc_cfg_read(prop->value.data.ptr, prop->value.data.size);
+		if (!pctx->svcc) return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	//rewrite config of base
+	c_opid = gf_list_get(pctx->opids, 0);
+	if (width && height) {
+		c_opid->width = width;
+		c_opid->height = height;
+	}
+
+	bs_split_copy_props_base(ctx, c_opid, pctx->ipid, 0);
+	gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
+	gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+
+	base_id = c_opid->id;
+
+	//for SVC/MVC we need slices to figure out what shoud go where, which is why we keep a copy of avcC and svcC
+
+	if (pctx->svcc) {
+		AVC_READ_LIST(pctx->svcc->sequenceParameterSets, GF_FALSE)
+		AVC_READ_LIST(pctx->svcc->pictureParameterSets, GF_FALSE)
+		AVC_READ_LIST(pctx->svcc->sequenceParameterSetExtensions, GF_FALSE)
+	}
+
+	//copy props on all defined pids
+	for (i=1; i<gf_list_count(pctx->opids); i++) {
+		c_opid = gf_list_get(pctx->opids, i);
+
+		bs_split_copy_props_base(ctx, c_opid, pctx->ipid, base_id);
+
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_SVC) );
+
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
+		//reset decoder config, it will be recreated when parsing SVC slices
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+	}
+	return GF_OK;
+}
+
+
+static GF_Err vvc_hevc_rewrite_pid_config(BSSplitCtx *ctx, BSSplitIn *pctx)
+{
+#ifndef GPAC_DISABLE_HEVC
+	GF_HEVCConfig *hvcc=NULL;
+	GF_HEVCConfig *hvcc_out = NULL;
+#endif
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+#ifndef GPAC_DISABLE_HEVC
+	HEVCState *hvcc_state = NULL;
+#endif
+	VVCState *vvcc_state = NULL;
+#else
+	void *hvcc_state = NULL;
+	void *vvcc_state = NULL;
+#endif
+	Bool is_vvc = GF_FALSE;
+	GF_VVCConfig *vvcc=NULL;
+	GF_VVCConfig *vvcc_out = NULL;
+	u8 *dsi;
+	u32 dsi_size, i, j, count;
+	GF_List *param_array;
+	const GF_PropertyValue *cfg, *cfg_enh;
+
+	cfg = gf_filter_pid_get_property(pctx->ipid, GF_PROP_PID_DECODER_CONFIG);
+	cfg_enh = gf_filter_pid_get_property(pctx->ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+	if (!cfg && !cfg_enh) return GF_OK;
+
+	if (pctx->codec_id==GF_CODECID_VVC) is_vvc = GF_TRUE;
+
+	if (cfg) {
+		if (is_vvc) {
+			vvcc = gf_odf_vvc_cfg_read(cfg->value.data.ptr, cfg->value.data.size);
+		} else {
+			hvcc = gf_odf_hevc_cfg_read(cfg->value.data.ptr, cfg->value.data.size, (!cfg_enh && (pctx->codec_id==GF_CODECID_LHVC)) ? GF_TRUE : GF_FALSE);
+		}
+	} else {
+		if (is_vvc) {
+			vvcc = gf_odf_vvc_cfg_read(cfg_enh->value.data.ptr, cfg_enh->value.data.size);
+		} else {
+			hvcc = gf_odf_hevc_cfg_read(cfg_enh->value.data.ptr, cfg_enh->value.data.size, GF_TRUE);
+		}
+	}
+	if (vvcc)
+		pctx->nalu_size_length = vvcc->nal_unit_size;
+	else if (hvcc)
+		pctx->nalu_size_length = hvcc->nal_unit_size;
+	else
+		return GF_NON_COMPLIANT_BITSTREAM;
+
+
+	//gather all param sets
+restart:
+
+	param_array = vvcc ? vvcc->param_array : hvcc->param_array;
+	count = gf_list_count(param_array);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParamArray *pa = gf_list_get(param_array, i);
+
+		u32 count2 = gf_list_count(pa->nalus);
+		for (j=0; j<count2; j++) {
+			GF_List *pa_out_list;
+			u32 layer_id=0, temporal_id=0;
+			GF_NALUFFParamArray *pa_out = NULL;
+			GF_NALUFFParam *nal = gf_list_get(pa->nalus, j);
+
+			if (is_vvc) {
+				layer_id = nal->data[0] & 0x3F;
+				temporal_id = (nal->data[1] & 0x7);
+			} else {
+				layer_id = nal->data[0] & 1;
+				layer_id <<= 5;
+				layer_id |= (nal->data[1] >> 3) & 0x1F;
+				temporal_id = (nal->data[1] & 0x7);
+			}
+
+			BSSplitOut *c_opid = bs_split_get_out_stream(ctx, pctx, GF_TRUE, layer_id, temporal_id, GF_FALSE);
+			if (!c_opid) return GF_OUT_OF_MEM;
+
+			if (is_vvc) {
+				if (!vvcc_out) {
+					GF_SAFEALLOC(vvcc_out, GF_VVCConfig);
+					if (!vvcc_out) {
+						gf_odf_vvc_cfg_del(vvcc);
+						return GF_OUT_OF_MEM;
+					}
+					memcpy(vvcc_out, vvcc, sizeof(GF_VVCConfig));
+					vvcc_out->param_array = gf_list_new();
+					if (!vvcc_out->param_array) {
+						gf_odf_vvc_cfg_del(vvcc);
+						gf_odf_vvc_cfg_del(vvcc_out);
+						return GF_OUT_OF_MEM;
+					}
+				}
+				pa_out_list = vvcc_out->param_array;
+			} else {
+				if (!hvcc_out) {
+					GF_SAFEALLOC(hvcc_out, GF_HEVCConfig);
+					if (!hvcc_out) {
+						gf_odf_hevc_cfg_del(hvcc);
+						return GF_OUT_OF_MEM;
+					}
+					memcpy(hvcc_out, hvcc, sizeof(GF_HEVCConfig));
+					hvcc_out->param_array = gf_list_new();
+					if (!hvcc_out->param_array) {
+						gf_odf_hevc_cfg_del(hvcc);
+						gf_odf_hevc_cfg_del(hvcc_out);
+						return GF_OUT_OF_MEM;
+					}
+				}
+				pa_out_list = hvcc_out->param_array;
+			}
+
+			for (u32 k=0; k<gf_list_count(pa_out_list); k++) {
+				pa_out = gf_list_get(pa_out_list, k);
+				if (pa_out->type == pa->type) break;
+				pa_out = NULL;
+			}
+			if (pa_out == NULL) {
+				GF_SAFEALLOC(pa_out, GF_NALUFFParamArray);
+				if (pa_out) pa_out->nalus = gf_list_new();
+				if (!pa_out || !pa_out->nalus) {
+					if (vvcc) gf_odf_vvc_cfg_del(vvcc);
+					if (vvcc_out) gf_odf_vvc_cfg_del(vvcc_out);
+					if (hvcc) gf_odf_hevc_cfg_del(hvcc);
+					if (hvcc_out) gf_odf_hevc_cfg_del(hvcc_out);
+					if (pa_out) gf_free(pa_out);
+					return GF_OUT_OF_MEM;
+				}
+				pa_out->type = pa->type;
+				pa_out->array_completeness = 1;
+				gf_list_add(pa_out_list, pa_out);
+			}
+			GF_NALUFFParam *nal_out;
+			GF_SAFEALLOC(nal_out, GF_NALUFFParam);
+			nal_out->size = nal->size;
+			nal_out->data = gf_malloc(sizeof(u8) * nal->size);
+			memcpy(nal_out->data, nal->data, sizeof(u8) * nal->size);
+			gf_list_add(pa_out->nalus, nal_out);
+		}
+	}
+
+	if (vvcc) {
+		gf_odf_vvc_cfg_del(vvcc);
+		vvcc = NULL;
+	}
+	if (hvcc) {
+		gf_odf_hevc_cfg_del(hvcc);
+		hvcc = NULL;
+	}
+
+	//for hevc we might get l-hevc config on main stream
+	if (cfg_enh && cfg && !is_vvc) {
+		hvcc = gf_odf_hevc_cfg_read(cfg_enh->value.data.ptr, cfg_enh->value.data.size, GF_TRUE);
+		if (!hvcc) {
+			if (hvcc_out) gf_odf_hevc_cfg_del(hvcc_out);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		cfg_enh = NULL;
+		goto restart;
+	}
+
+	GF_Err e = GF_OK;
+	vvcc = vvcc_out;
+	hvcc = hvcc_out;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+#ifndef GPAC_DISABLE_HEVC
+	if (hvcc) GF_SAFEALLOC(hvcc_state, HEVCState);
+#endif
+	if (vvcc) GF_SAFEALLOC(vvcc_state, VVCState);
+#endif
+
+
+	count = gf_list_count(pctx->opids);
+	for (i=0; i<count; i++) {
+		u32 max_w=0, max_h=0;
+		GF_List *orig_pa_list, *out_param_array;
+		BSSplitOut *c_opid = gf_list_get(pctx->opids, i);
+
+
+		if (vvcc) {
+			orig_pa_list = vvcc->param_array;
+			vvcc->param_array = gf_list_new();
+			if (!vvcc->param_array) {
+				vvcc->param_array = orig_pa_list;
+				e = GF_OUT_OF_MEM;
+				break;
+			}
+			out_param_array = vvcc->param_array;
+		}
+		else if (hvcc) {
+			orig_pa_list = hvcc->param_array;
+			hvcc->is_lhvc = !c_opid->is_base ? GF_TRUE : GF_FALSE;
+			hvcc->param_array = gf_list_new();
+			if (!hvcc->param_array) {
+				hvcc->param_array = orig_pa_list;
+				e = GF_OUT_OF_MEM;
+				break;
+			}
+			out_param_array = hvcc->param_array;
+		} else {
+			e = GF_SERVICE_ERROR;
+			break;
+		}
+
+		u32 count2 = gf_list_count(orig_pa_list);
+		for (j=0; j<count2; j++) {
+			GF_NALUFFParamArray *pa = gf_list_get(orig_pa_list, j);
+			GF_NALUFFParamArray *pa_out = NULL;
+			for (u32 k=0; k<gf_list_count(pa->nalus); k++) {
+				Bool do_add = GF_FALSE;
+				u32 layer_id=0, temporal_id=0;
+				GF_NALUFFParam *nal = gf_list_get(pa->nalus, k);
+				if (vvcc) {
+					layer_id = nal->data[0] & 0x3F;
+					temporal_id = (nal->data[1] & 0x7);
+				} else {
+					//u32 nal_type = (nal->data[0] & 0x7E) >> 1;
+					layer_id = nal->data[0] & 1;
+					layer_id <<= 5;
+					layer_id |= (nal->data[1] >> 3) & 0x1F;
+					temporal_id = (nal->data[1] & 0x7);
+
+					if (pa->type == GF_HEVC_NALU_VID_PARAM) do_add = GF_TRUE;
+				}
+				if (match_substream(c_opid, layer_id, temporal_id))
+					do_add = GF_TRUE;
+
+				if (!do_add) continue;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+				if (hvcc_state) {
+					u8 ntype, tid, lid;
+					s32 res = gf_hevc_parse_nalu(nal->data, nal->size, hvcc_state, &ntype, &tid, &lid);
+					if ((res>=0) && (pa->type == GF_HEVC_NALU_SEQ_PARAM)) {
+						if (max_w < hvcc_state->sps[hvcc_state->last_parsed_sps_id].width)
+							max_w = hvcc_state->sps[hvcc_state->last_parsed_sps_id].width;
+						if (max_h < hvcc_state->sps[hvcc_state->last_parsed_sps_id].height)
+							max_h = hvcc_state->sps[hvcc_state->last_parsed_sps_id].height;
+					}
+					if ((res>=0) && (pa->type==GF_HEVC_NALU_VID_PARAM)) {
+						pctx->max_layers = hvcc_state->vps[hvcc_state->last_parsed_vps_id].max_layers;
+						pctx->max_sublayers = hvcc_state->vps[hvcc_state->last_parsed_vps_id].max_sub_layers;
+					}
+				}
+				if (vvcc_state) {
+					u8 ntype, tid, lid;
+					s32 res = gf_vvc_parse_nalu(nal->data, nal->size, vvcc_state, &ntype, &tid, &lid);
+					if ((res>=0) && (pa->type == GF_VVC_NALU_SEQ_PARAM)) {
+						if (max_w < vvcc_state->sps[vvcc_state->last_parsed_sps_id].width)
+							max_w = vvcc_state->sps[vvcc_state->last_parsed_sps_id].width;
+						if (max_h < vvcc_state->sps[vvcc_state->last_parsed_sps_id].height)
+							max_h = vvcc_state->sps[vvcc_state->last_parsed_sps_id].height;
+					}
+					if ((res>=0) && (pa->type==GF_VVC_NALU_VID_PARAM)) {
+						pctx->max_layers = vvcc_state->vps[vvcc_state->last_parsed_vps_id].max_layers;
+						pctx->max_sublayers = vvcc_state->vps[vvcc_state->last_parsed_vps_id].max_sub_layers;
+					}
+				}
+#endif
+
+				if (pa_out == NULL) {
+					GF_SAFEALLOC(pa_out, GF_NALUFFParamArray);
+					if (pa_out) pa_out->nalus = gf_list_new();
+					if (!pa_out || !pa_out->nalus) {
+						if (pa_out) gf_free(pa_out);
+						e = GF_OUT_OF_MEM;
+						break;
+					}
+					pa_out->type = pa->type;
+					pa_out->array_completeness = pa->array_completeness;
+					gf_list_add(out_param_array, pa_out);
+				}
+				gf_list_add(pa_out->nalus, nal);
+			}
+			if (e) break;
+		}
+		if (e) {
+			if (vvcc) vvcc->param_array = orig_pa_list;
+			else hvcc->param_array = orig_pa_list;
+			break;
+		}
+		if (vvcc)
+			gf_odf_vvc_cfg_write(vvcc, &dsi, &dsi_size);
+		else
+			gf_odf_hevc_cfg_write(hvcc, &dsi, &dsi_size);
+
+		if (max_w && max_h) {
+			c_opid->width = max_w;
+			c_opid->height = max_h;
+		}
+
+
+		bs_split_copy_props_base(ctx, c_opid, pctx->ipid, 0);
+
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
+		gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL );
+
+		if (is_vvc) {
+
+		} else {
+			if (hvcc->is_lhvc) {
+				gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_LHVC) );
+			} else {
+				gf_filter_pid_set_property(c_opid->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_HEVC) );
+			}
+			bs_split_update_hevc_linf(pctx, c_opid);
+		}
+
+		count2 = gf_list_count(out_param_array);
+		for (j=0; j<count2; j++) {
+			GF_NALUFFParamArray *pa = gf_list_get(out_param_array, j);
+			gf_list_del(pa->nalus);
+			gf_free(pa);
+		}
+		gf_list_del(out_param_array);
+
+		if (vvcc) vvcc->param_array = orig_pa_list;
+		else if (hvcc) hvcc->param_array = orig_pa_list;
+	}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+#ifndef GPAC_DISABLE_HEVC
+	if (hvcc_state) gf_free(hvcc_state);
+#endif
+	if (vvcc_state) gf_free(vvcc_state);
+#endif
+
+	if (vvcc) gf_odf_vvc_cfg_del(vvcc);
+	if (hvcc) gf_odf_hevc_cfg_del(hvcc);
+	return GF_OK;
+}
+
+
+static GF_Err none_rewrite_pid_config(BSSplitCtx *ctx, BSSplitIn *pctx)
+{
+	u32 i, count;
+
+	count = gf_list_count(pctx->opids);
+	for (i=0; i<count; i++) {
+		BSSplitOut *c_opid = gf_list_get(pctx->opids, i);
+		gf_filter_pid_copy_properties(c_opid->opid, pctx->ipid);
+	}
+	return GF_OK;
+}
+
+static GF_Err none_split_packet(BSSplitCtx *ctx, BSSplitIn *pctx, GF_FilterPacket *pck)
+{
+	BSSplitOut *c_opid = gf_list_get(pctx->opids, 0);
+	if (c_opid)
+		return gf_filter_pck_forward(pck, c_opid->opid);
+	return GF_OK;
+}
+
+static GF_Err nalu_split_packet(BSSplitCtx *ctx, BSSplitIn *pctx, GF_FilterPacket *pck, u32 codec_type)
+{
+	u32 size, pck_size, min_nal_size;
+	GF_Err e;
+	u64 pck_ts;
+	Bool has_svc_prefix = GF_FALSE;
+	const u8 *data = gf_filter_pck_get_data(pck, &pck_size);
+	if (!data) {
+		BSSplitOut *c_opid = gf_list_get(pctx->opids, 0);
+		if (c_opid)
+			return gf_filter_pck_forward(pck, c_opid->opid);
+		return GF_OK;
+	}
+
+	pck_ts = gf_filter_pck_get_dts(pck);
+	if (pck_ts == GF_FILTER_NO_TS)
+		pck_ts = gf_filter_pck_get_cts(pck);
+	if (pck_ts == GF_FILTER_NO_TS)
+		pck_ts = 0;
+	if (!pctx->first_ts_plus_one) {
+		pctx->first_ts_plus_one = pck_ts+1;
+	}
+	min_nal_size = codec_type ? 2 : 1;
+
+	size=0;
+	while (size<pck_size) {
+		Bool force_dv = GF_FALSE;
+		u32 nal_type=0;
+		u32 layer_id = 0;
+		u32 temporal_id = 0;
+		u32 nal_hdr = pctx->nalu_size_length;
+		u32 nal_size = 0;
+		while (nal_hdr) {
+			nal_size |= data[size];
+			size++;
+			nal_hdr--;
+			if (!nal_hdr) break;
+			nal_size<<=8;
+		}
+		if (size + nal_size > pck_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BSSplit] Invalid NAL size %d but remain %d\n", nal_size, pck_size-size));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			break;
+		}
+		if (nal_size < min_nal_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BSSplit] Invalid NAL size %d but mn size %d\n", nal_size, min_nal_size));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			break;
+		}
+
+		//AVC
+		if (codec_type==0) {
+			Bool get_dqid=GF_FALSE;
+			gf_bs_reassign_buffer(pctx->r_bs, data+size, nal_size);
+			gf_avc_parse_nalu(pctx->r_bs, pctx->avc_state);
+			nal_type = pctx->avc_state->last_nal_type_parsed;
+			temporal_id = 1;
+			//remember we had an svc prefix
+			if (nal_type == GF_AVC_NALU_SVC_PREFIX_NALU) {
+				has_svc_prefix = GF_TRUE;
+			}
+			//if slice is scalable extension, get dqid
+			else if ((nal_type == GF_AVC_NALU_SVC_SLICE) && pctx->avc_state->s_info.pps) {
+				//svc prefix is no longer valid
+				has_svc_prefix = GF_FALSE;
+				get_dqid = GF_TRUE;
+			}
+			//don't forward extractors
+			else if (nal_type == GF_AVC_NALU_FF_EXTRACTOR) {
+				size += nal_size;
+				continue;
+			}
+			//todo, find a way to differentiate between FF AVC aggregator and DV EL ...
+
+
+			//if we had an svc prefix, get dqid
+			if (has_svc_prefix) {
+				get_dqid = GF_TRUE;
+			}
+
+			if (get_dqid) {
+				if (ctx->svcqid)
+					layer_id = pctx->avc_state->s_info.svc_nalhdr.quality_id;
+				else
+					layer_id = pctx->avc_state->s_info.svc_nalhdr.dependency_id;
+
+				temporal_id = 1+pctx->avc_state->s_info.svc_nalhdr.temporal_id;
+			}
+
+			//force layerID 100 for DV
+			if ((nal_type == GF_AVC_NALU_DV_RPU) || (nal_type == GF_AVC_NALU_DV_EL)) {
+				layer_id = 100;
+				force_dv = GF_TRUE;
+			}
+
+		}
+		//HEVC
+		else if (codec_type==1) {
+			nal_type = (data[size] & 0x7E) >> 1;
+
+			layer_id = data[size] & 1;
+			layer_id <<= 5;
+			layer_id |= (data[size+1] >> 3) & 0x1F;
+			temporal_id = (data[size+1] & 0x7);
+
+			//force layerID 100 for DV
+			if ((nal_type == GF_HEVC_NALU_DV_RPU) || (nal_type == GF_HEVC_NALU_DV_EL)) {
+				layer_id = 100;
+				force_dv = GF_TRUE;
+			}
+			//don't forward extractors nor aggregators
+			else if ((nal_type == GF_HEVC_NALU_FF_EXTRACTOR) || (nal_type == GF_HEVC_NALU_FF_AGGREGATOR)) {
+				size += nal_size;
+				continue;
+			}
+		}
+		//VVC
+		else if (codec_type==2) {
+			layer_id = data[size] & 0x3F;
+			temporal_id = data[size+1] & 0x7;
+			nal_type = data[size+1] >> 3;
+		}
+
+		BSSplitOut *c_opid = bs_split_get_out_stream(ctx, pctx, GF_FALSE, layer_id, temporal_id, force_dv);
+		if (!c_opid) {
+			e = GF_OUT_OF_MEM;
+			break;
+		}
+
+		u8 *out_data;
+
+		if (!c_opid->is_init) {
+			u64 ts_diff = pck_ts - (pctx->first_ts_plus_one-1);
+			c_opid->is_init = GF_TRUE;
+
+			//tsdiff not 0, we are starting a new split stream on a temporal sublayer, inject empty AU with a single NALU AU delim
+			//we do so because we need to make sure the muxer will not screw up timing:
+			//for mp4 not fragmented, not injecting will result in this sample (being the first) having dts=0 plus edit
+			//which will unalign the tracks in terms of dts/ctts, which is what implicit reconstruction uses....
+			if (ts_diff) {
+				u32 isize;
+				u8 *idata;
+
+				if (codec_type==1) isize=3;
+				else if (codec_type==2) isize=3;
+				else isize=2;
+				GF_FilterPacket *inject_pck = gf_filter_pck_new_alloc(c_opid->opid, isize+pctx->nalu_size_length, &idata);
+				if (!inject_pck) {
+					e = GF_OUT_OF_MEM;
+					break;
+				}
+				GF_BitStream *aud_bs = gf_bs_new(idata, isize+pctx->nalu_size_length, GF_BITSTREAM_WRITE);
+				if (!aud_bs) {
+					e = GF_OUT_OF_MEM;
+					break;
+				}
+
+				gf_bs_write_int(aud_bs, isize, 8*pctx->nalu_size_length);
+				if (codec_type==1) {
+					gf_bs_write_int(aud_bs, 0, 1);
+					gf_bs_write_int(aud_bs, GF_HEVC_NALU_ACCESS_UNIT, 6);
+					gf_bs_write_int(aud_bs, layer_id, 6);
+					gf_bs_write_int(aud_bs, temporal_id, 3);
+					/*pic-type - by default we signal all slice types possible*/
+					gf_bs_write_int(aud_bs, 2, 3);
+					gf_bs_write_int(aud_bs, 1, 1); //stop bit
+					gf_bs_write_int(aud_bs, 0, 4); //4 bits to 0
+				} else if (codec_type==2) {
+					gf_bs_write_int(aud_bs, 0, 1);
+					gf_bs_write_int(aud_bs, 0, 1);
+					gf_bs_write_int(aud_bs, layer_id, 6);
+					gf_bs_write_int(aud_bs, GF_VVC_NALU_ACCESS_UNIT, 5);
+					gf_bs_write_int(aud_bs, temporal_id, 3);
+					gf_bs_write_int(aud_bs, 0, 1);
+					/*pic-type - by default we signal all slice types possible*/
+					gf_bs_write_int(aud_bs, 2, 3);
+					gf_bs_write_int(aud_bs, 1, 1); //stop bit
+					gf_bs_write_int(aud_bs, 0, 3); //3 bits to 0
+				} else {
+					gf_bs_write_int(aud_bs, (data[size] & 0x60) | GF_AVC_NALU_ACCESS_UNIT, 8);
+					gf_bs_write_int(aud_bs, 0xF0 , 8); /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
+				}
+				gf_bs_del(aud_bs);
+
+				gf_filter_pck_set_dts(inject_pck, pctx->first_ts_plus_one-1);
+				gf_filter_pck_set_cts(inject_pck, pctx->first_ts_plus_one-1);
+				gf_filter_pck_set_duration(inject_pck, (u32) ts_diff);
+				gf_filter_pck_set_framing(inject_pck, GF_TRUE, GF_TRUE);
+				gf_filter_pck_send(inject_pck);
+			}
+		}
+
+		if (!c_opid->pck) {
+			c_opid->pck = gf_filter_pck_new_alloc(c_opid->opid, nal_size+pctx->nalu_size_length, &out_data);
+			if (!c_opid->pck) {
+				e = GF_OUT_OF_MEM;
+				break;
+			}
+			gf_filter_pck_merge_properties(pck, c_opid->pck);
+
+			if (!c_opid->is_base)
+				gf_filter_pck_set_sap(c_opid->pck, GF_FILTER_SAP_NONE);
+		} else {
+			e = gf_filter_pck_expand(c_opid->pck, nal_size+pctx->nalu_size_length, NULL, &out_data, NULL);
+			if (e) break;
+		}
+		memcpy(out_data, data + size - pctx->nalu_size_length, nal_size+pctx->nalu_size_length);
+
+		size += nal_size;
+	}
+
+	u32 i, count = gf_list_count(pctx->opids);
+	for (i=0; i<count; i++) {
+		BSSplitOut *c_opid = gf_list_get(pctx->opids, i);
+		if (c_opid->pck) {
+			gf_filter_pck_send(c_opid->pck);
+			c_opid->pck = NULL;
+		}
+	}
+	return e;
+}
+
+static GF_Err avc_split_packet(BSSplitCtx *ctx, BSSplitIn *pctx, GF_FilterPacket *pck)
+{
+	return nalu_split_packet(ctx, pctx, pck, 0);
+}
+static GF_Err hevc_split_packet(BSSplitCtx *ctx, BSSplitIn *pctx, GF_FilterPacket *pck)
+{
+	return nalu_split_packet(ctx, pctx, pck, 1);
+}
+static GF_Err vvc_split_packet(BSSplitCtx *ctx, BSSplitIn *pctx, GF_FilterPacket *pck)
+{
+	return nalu_split_packet(ctx, pctx, pck, 2);
+}
+
+static void bs_split_reset_stream(GF_Filter *filter, BSSplitCtx *ctx, BSSplitIn *pctx, Bool is_finalize, Bool is_reconf)
+{
+	if (!pctx) return;
+
+	while (gf_list_count(pctx->opids)) {
+		BSSplitOut *c_opid = gf_list_pop_back(pctx->opids);
+		if (!is_finalize)
+			gf_filter_pid_remove(c_opid->opid);
+		bs_split_svcc_del(c_opid->svcc);
+		gf_free(c_opid);
+	}
+	if (pctx->avcc) {
+		gf_odf_avc_cfg_del(pctx->avcc);
+		pctx->avcc = NULL;
+	}
+	if (pctx->svcc) {
+		gf_odf_avc_cfg_del(pctx->svcc);
+		pctx->svcc = NULL;
+	}
+	if (pctx->avc_state) {
+		gf_free(pctx->avc_state);
+		pctx->avc_state = NULL;
+	}
+	if (pctx->r_bs) {
+		gf_bs_del(pctx->r_bs);
+		pctx->r_bs = NULL;
+	}
+	if (is_reconf)
+		return;
+
+	gf_list_del_item(ctx->pids, pctx);
+	gf_list_del(pctx->opids);
+	gf_free(pctx);
+
+}
+
+static GF_Err bs_split_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	BSSplitCtx *ctx = (BSSplitCtx *) gf_filter_get_udta(filter);
+	BSSplitIn *pctx = gf_filter_pid_get_udta(pid);
+
+	//disconnect of src pid
+	if (is_remove) {
+		if (pctx) {
+			bs_split_reset_stream(filter, ctx, pctx, GF_FALSE, GF_FALSE);
+			gf_filter_pid_set_udta(pid, NULL);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!pctx) {
+		BSSplitOut *base_opid;
+		GF_SAFEALLOC(pctx, BSSplitIn);
+		if (!pctx) return GF_OUT_OF_MEM;
+		GF_SAFEALLOC(base_opid, BSSplitOut);
+		if (!base_opid) {
+			gf_free(pctx);
+			return GF_OUT_OF_MEM;
+		}
+		pctx->ipid = pid;
+		pctx->opids = gf_list_new();
+		gf_list_add(pctx->opids, base_opid);
+		gf_filter_pid_set_udta(pid, pctx);
+		gf_list_add(ctx->pids, pctx);
+		base_opid->opid = gf_filter_pid_new(filter);
+		if (!base_opid->opid) return GF_OUT_OF_MEM;
+
+		const GF_PropertyValue *p = gf_filter_pid_get_property(pctx->ipid, GF_PROP_PID_ID);
+		base_opid->id = p ? p->value.uint : 1;
+	}
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	assert(prop);
+
+	switch (prop->value.uint) {
+	case GF_CODECID_AVC:
+	case GF_CODECID_SVC:
+	case GF_CODECID_MVC:
+		pctx->rewrite_pid_config = avc_rewrite_pid_config;
+		pctx->split_packet = avc_split_packet;
+		break;
+#ifndef GPAC_DISABLE_HEVC
+	case GF_CODECID_HEVC:
+	case GF_CODECID_LHVC:
+		pctx->rewrite_pid_config = vvc_hevc_rewrite_pid_config;
+		pctx->split_packet = hevc_split_packet;
+		break;
+#endif
+	case GF_CODECID_VVC:
+		pctx->rewrite_pid_config = vvc_hevc_rewrite_pid_config;
+		pctx->split_packet = vvc_split_packet;
+		break;
+	default:
+		pctx->rewrite_pid_config = none_rewrite_pid_config;
+		pctx->split_packet = none_split_packet;
+		break;
+	}
+
+	//change of codec, reset output
+	if (pctx->codec_id && (pctx->codec_id != prop->value.uint)) {
+		bs_split_reset_stream(filter, ctx, pctx, GF_FALSE, GF_TRUE);
+	}
+	pctx->codec_id = prop->value.uint;
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	//rewrite asap - waiting for first packet could lead to issues further down the chain, especially for movie fragments
+	//were the init segment could have already been flushed at the time we will dispatch the first packet
+	return pctx->rewrite_pid_config(ctx, pctx);
+}
+
+
+static GF_Err bs_split_process(GF_Filter *filter)
+{
+	u32 i, count;
+	BSSplitCtx *ctx = (BSSplitCtx *) gf_filter_get_udta(filter);
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		BSSplitIn *pctx;
+		GF_FilterPacket *pck;
+		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+		if (!pid) break;
+		pctx = gf_filter_pid_get_udta(pid);
+		if (!pctx) break;
+
+		while (1) {
+			pck = gf_filter_pid_get_packet(pid);
+			if (!pck) {
+				if (gf_filter_pid_is_eos(pctx->ipid)) {
+					for (u32 j=0; j<gf_list_count(pctx->opids); j++) {
+						BSSplitOut *c_opid = gf_list_get(pctx->opids, j);
+						gf_filter_pid_set_eos(c_opid->opid);
+					}
+				}
+				break;
+			}
+			pctx->split_packet(ctx, pctx, pck);
+			gf_filter_pid_drop_packet(pid);
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err bs_split_initialize(GF_Filter *filter)
+{
+	BSSplitCtx *ctx = (BSSplitCtx *) gf_filter_get_udta(filter);
+	ctx->pids = gf_list_new();
+
+	ctx->filter = filter;
+	return GF_OK;
+}
+static void bs_split_finalize(GF_Filter *filter)
+{
+	BSSplitCtx *ctx = (BSSplitCtx *) gf_filter_get_udta(filter);
+	while (gf_list_count(ctx->pids)) {
+		BSSplitIn *pctx = gf_list_pop_back(ctx->pids);
+
+		bs_split_reset_stream(filter, ctx, pctx, GF_TRUE, GF_FALSE);
+	}
+	gf_list_del(ctx->pids);
+}
+
+#define OFFS(_n)	#_n, offsetof(BSSplitCtx, _n)
+static GF_FilterArgs BSSplitArgs[] =
+{
+	{ OFFS(ltid), "temporal and layer ID of output streams", GF_PROP_STRING_LIST, NULL, NULL, 0},
+	{ OFFS(svcqid), "use qualityID instead of dependencyID for SVC splitting", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(sig_ltid), "signal maximum temporal (`max_temporal_id`) and layer ID (`max_layer_id`) of output streams (mostly used for debug)", GF_PROP_BOOL, "false", NULL, 0},
+	{0}
+};
+
+static const GF_FilterCapability BSSplitCaps[] =
+{
+	//we want the filter to act as passthrough for other media, so we accept everything
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_DEPENDENCY_ID, 0),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+};
+
+GF_FilterRegister BSSplitRegister = {
+	.name = "bssplit",
+	GF_FS_SET_DESCRIPTION("Compressed layered bitstream splitter")
+	GF_FS_SET_HELP("This filter splits input stream by layers and sublayers\n"
+	"\n"
+	"The filter supports AVC|H264, HEVC and VVC stream splitting and is pass-through for other codec types.\n"
+	"\n"
+	"Splitting is based on temporalID value (start from 1) and layerID value (start from 0).\n"
+	"For AVC|H264, layerID is the dependency value, or quality value if `svcqid` is set.\n"
+	"\n"
+	"Each input stream is filtered according to the `ltid` option as follows:\n"
+	"- no value set: input stream is split by layerID, i.e. each layer creates an output\n"
+	"- `all`: input stream is split by layerID and temporalID, i.e. each {layerID,temporalID} creates an output\n"
+	"- `lID`: input stream is split according to layer `lID` value, and temporalID is ignored\n"
+	"- `.tID`: input stream is split according to temporal sub-layer `tID` value and layerID is ignored\n"
+	"- `lID.tID`: input stream is split according to layer `lID` and sub-layer `tID` values\n"
+	"\n"
+	"Note: A tID value of 0 in `ltid` is equivalent to value 1.\n"
+	"\n"
+	"Multiple values can be given in `ltid`, in which case each value gives the maximum {layerID,temporalID} values for the current layer.\n"
+	"A few examples on an input with 2 layers each with 2 temporal sublayers:\n"
+	"- `ltid=0.2`: this will split the stream in:\n"
+	" - one stream with {lID=0,tID=1} and {lID=0,tID=2} NAL units\n"
+	" - one stream with all other layers/substreams\n"
+	"- `ltid=0.1,1.1`: this will split the stream in:\n"
+	" - one stream with {lID=0,tID=1} NAL units\n"
+	" - one stream with {lID=0,tID=2}, {lID=1,tID=1} NAL units\n"
+	" - one stream with the rest {lID=0,tID=2}, {lID=1,tID=2} NAL units\n"
+	"- `ltid=0.1,0.2`: this will split the stream in:\n"
+	" - one stream with {lID=0,tID=1} NAL units\n"
+	" - one stream with {lID=0,tID=2} NAL units\n"
+	" - one stream with the rest {lID=1,tID=1}, {lID=1,tID=2} NAL units\n"
+	"\n"
+	"The filter can also be used on AVC and HEVC DolbyVision streams to split base stream and DV RPU/EL.\n"
+	"\n"
+	"The filter does not create aggregator or extractor NAL units.\n"
+	)
+	.private_size = sizeof(BSSplitCtx),
+	.max_extra_pids = 0xFFFFFFFF,
+	.flags = GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_ALLOW_CYCLIC,
+	.args = BSSplitArgs,
+	SETCAPS(BSSplitCaps),
+	.initialize = bs_split_initialize,
+	.finalize = bs_split_finalize,
+	.configure_pid = bs_split_configure_pid,
+	.process = bs_split_process
+};
+
+const GF_FilterRegister *bs_split_register(GF_FilterSession *session)
+{
+	return (const GF_FilterRegister *) &BSSplitRegister;
+}

gpac-1.0.1.tar.gz/src/filters/bsrw.c -> gpac-2.0.0.tar.gz/src/filters/bsrw.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2020
+ *			Copyright (c) Telecom ParisTech 2020-2022
 *					All rights reserved
 *
 * This file is part of GPAC / compressed bitstream metadata rewrite filter
@@ -36,22 +36,25 @@
 	GF_FilterPid *ipid, *opid;
 	u32 codec_id;
 	Bool reconfigure;
-	s32 clrp, txchar, mxcoef;
 	GF_Err (*rewrite_pid_config)(GF_BSRWCtx *ctx, BSRWPid *pctx);
 	GF_Err (*rewrite_packet)(GF_BSRWCtx *ctx, BSRWPid *pctx, GF_FilterPacket *pck);
 
-	s32 prev_clrp, prev_txchar, prev_mxcoef, prev_sar;
+	s32 prev_cprim, prev_ctfc, prev_cmx, prev_sar;
 
 	u32 nalu_size_length;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	GF_VUIInfo vui;
+#endif
+	Bool rewrite_vui;
 };
 
 struct _bsrw_ctx
 {
 	GF_Fraction sar;
 	s32 m4vpl, prof, lev, pcomp, pidc, pspace, gpcflags;
-	char *clrp, *txchar, *mxcoef;
-	Bool remsei;
-
+	s32 cprim, ctfc, cmx, vidfmt;
+	Bool rmsei, fullrange, novsi;
 
 	GF_List *pids;
 	Bool reconfigure;
@@ -62,7 +65,6 @@
 	return gf_filter_pck_forward(pck, pctx->opid);
 }
 
-
 static GF_Err m4v_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
 {
 	GF_Err e;
@@ -81,7 +83,11 @@
 	memcpy(dsi, prop->value.data.ptr, sizeof(u8) * dsi_size);
 
 	if (ctx->sar.num && ctx->sar.den) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 		e = gf_m4v_rewrite_par(&dsi, &dsi_size, ctx->sar.num, ctx->sar.den);
+#else
+		e = GF_NOT_SUPPORTED;
+#endif
 		if (e) {
 			gf_free(dsi);
 			return e;
@@ -89,8 +95,12 @@
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->sar) );
 	}
 	if (ctx->m4vpl>=0) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 		gf_m4v_rewrite_pl(&dsi, &dsi_size, (u32) ctx->m4vpl);
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_PROFILE_LEVEL, &PROP_UINT(ctx->m4vpl) );
+#else
+		return GF_NOT_SUPPORTED;
+#endif
 	}
 
 	gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
@@ -98,8 +108,9 @@
 	return GF_OK;
 }
 
-static GF_Err avc_rewrite_packet(GF_BSRWCtx *ctx, BSRWPid *pctx, GF_FilterPacket *pck)
+static GF_Err nalu_rewrite_packet(GF_BSRWCtx *ctx, BSRWPid *pctx, GF_FilterPacket *pck, u32 codec_type)
 {
+	Bool is_sei;
 	u32 size, pck_size, final_size;
 	GF_FilterPacket *dst;
 	u8 *output;
@@ -107,6 +118,7 @@
 	if (!data)
 		return gf_filter_pck_forward(pck, pctx->opid);
 
+
 	final_size = 0;
 	size=0;
 	while (size<pck_size) {
@@ -120,9 +132,26 @@
 			if (!nal_hdr) break;
 			nal_size<<=8;
 		}
-		nal_type = data[size];
-		nal_type = nal_type & 0x1F;
-		if (nal_type != GF_AVC_NALU_SEI) {
+		is_sei = GF_FALSE;
+		//AVC
+		if (codec_type==0) {
+			nal_type = data[size] & 0x1F;
+			if (nal_type == GF_AVC_NALU_SEI) is_sei = GF_TRUE;
+		}
+		//HEVC
+		else if (codec_type==1) {
+			nal_type = (data[size] & 0x7E) >> 1;
+			if ((nal_type == GF_HEVC_NALU_SEI_PREFIX) || (nal_type == GF_HEVC_NALU_SEI_SUFFIX))
+				is_sei = GF_TRUE;
+		}
+		//VVC
+		else if (codec_type==2) {
+			nal_type = data[size+1] >> 3;
+			if ((nal_type == GF_VVC_NALU_SEI_PREFIX) || (nal_type == GF_VVC_NALU_SEI_SUFFIX))
+				is_sei = GF_TRUE;
+		}
+
+		if (!is_sei) {
 			final_size += nal_size+pctx->nalu_size_length;
 		}
 		size += nal_size;
@@ -131,6 +160,8 @@
 		return gf_filter_pck_forward(pck, pctx->opid);
 
 	dst = gf_filter_pck_new_alloc(pctx->opid, final_size, &output);
+	if (!dst) return GF_OUT_OF_MEM;
+
 	gf_filter_pck_merge_properties(pck, dst);
 
 	size=0;
@@ -145,9 +176,27 @@
 			if (!nal_hdr) break;
 			nal_size<<=8;
 		}
-		nal_type = data[size];
-		nal_type = nal_type & 0x1F;
-		if (nal_type == GF_AVC_NALU_SEI) {
+		is_sei = GF_FALSE;
+
+		//AVC
+		if (codec_type==0) {
+			nal_type = data[size] & 0x1F;
+			if (nal_type == GF_AVC_NALU_SEI) is_sei = GF_TRUE;
+		}
+		//HEVC
+		else if (codec_type==1) {
+			nal_type = (data[size] & 0x7E) >> 1;
+			if ((nal_type == GF_HEVC_NALU_SEI_PREFIX) || (nal_type == GF_HEVC_NALU_SEI_SUFFIX))
+				is_sei = GF_TRUE;
+		}
+		//VVC
+		else if (codec_type==2) {
+			nal_type = data[size+1] >> 3;
+			if ((nal_type == GF_VVC_NALU_SEI_PREFIX) || (nal_type == GF_VVC_NALU_SEI_SUFFIX))
+				is_sei = GF_TRUE;
+		}
+
+		if (is_sei) {
 			size += nal_size;
 			continue;
 		}
@@ -158,6 +207,39 @@
 	return gf_filter_pck_send(dst);
 }
 
+static GF_Err avc_rewrite_packet(GF_BSRWCtx *ctx, BSRWPid *pctx, GF_FilterPacket *pck)
+{
+	return nalu_rewrite_packet(ctx, pctx, pck, 0);
+}
+static GF_Err hevc_rewrite_packet(GF_BSRWCtx *ctx, BSRWPid *pctx, GF_FilterPacket *pck)
+{
+	return nalu_rewrite_packet(ctx, pctx, pck, 1);
+}
+static GF_Err vvc_rewrite_packet(GF_BSRWCtx *ctx, BSRWPid *pctx, GF_FilterPacket *pck)
+{
+	return nalu_rewrite_packet(ctx, pctx, pck, 2);
+}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+static void update_props(BSRWPid *pctx, GF_VUIInfo *vui)
+{
+	if ((vui->ar_num>0) && (vui->ar_den>0))
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_SAR, &PROP_FRAC_INT(vui->ar_num, vui->ar_den) );
+
+	if (vui->fullrange>0)
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(vui->fullrange) );
+
+	if (!vui->remove_video_info) {
+		if (vui->color_prim>=0)
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_PRIMARIES, &PROP_UINT(vui->color_prim) );
+		if (vui->color_tfc>=0)
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_TRANSFER, &PROP_UINT(vui->color_tfc) );
+		if (vui->color_matrix>=0)
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_MX, &PROP_UINT(vui->color_matrix) );
+	}
+}
+#endif /*GPAC_DISABLE_AV_PARSERS*/
+
 static GF_Err avc_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
 {
 	GF_AVCConfig *avcc;
@@ -171,17 +253,25 @@
 	pctx->reconfigure = GF_FALSE;
 
 	avcc = gf_odf_avc_cfg_read(prop->value.data.ptr, prop->value.data.size);
-	if (ctx->sar.num && ctx->sar.den) {
-		e = gf_media_avc_change_par(avcc, ctx->sar.num, ctx->sar.den);
-		if (!e)
-			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->sar) );
+
+	if (pctx->rewrite_vui) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+		GF_VUIInfo tmp_vui = pctx->vui;
+		tmp_vui.update = GF_TRUE;
+		e = gf_avc_change_vui(avcc, &tmp_vui);
+		if (!e) {
+			update_props(pctx, &tmp_vui);
+		}
+#else
+		return GF_NOT_SUPPORTED;
+#endif /*GPAC_DISABLE_AV_PARSERS*/
 	}
 
 	if ((ctx->lev>=0) || (ctx->prof>=0) || (ctx->pcomp>=0)) {
 		u32 i, count = gf_list_count(avcc->sequenceParameterSets);
 		for (i=0; i<count; i++) {
-			GF_AVCConfigSlot *sps = gf_list_get(avcc->sequenceParameterSets, i);
-			//first byte is nalu header, then profile_idc (8bits), prof_comp (8buts) a,d level_idc (8bits)
+			GF_NALUFFParam *sps = gf_list_get(avcc->sequenceParameterSets, i);
+			//first byte is nalu header, then profile_idc (8bits), prof_comp (8bits), and level_idc (8bits)
 			if (ctx->prof>=0) {
 				sps->data[1] = (u8) ctx->prof;
 			}
@@ -205,7 +295,7 @@
 
 	gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
 
-	if (ctx->remsei) {
+	if (ctx->rmsei) {
 		pctx->rewrite_packet = avc_rewrite_packet;
 	} else {
 		pctx->rewrite_packet = none_rewrite_packet;
@@ -215,66 +305,6 @@
 
 #ifndef GPAC_DISABLE_HEVC
 
-static GF_Err hevc_rewrite_packet(GF_BSRWCtx *ctx, BSRWPid *pctx, GF_FilterPacket *pck)
-{
-	u32 size, pck_size, final_size;
-	GF_FilterPacket *dst;
-	u8 *output;
-	const u8 *data = gf_filter_pck_get_data(pck, &pck_size);
-	if (!data)
-		return gf_filter_pck_forward(pck, pctx->opid);
-
-	final_size = 0;
-	size=0;
-	while (size<pck_size) {
-		u8 nal_type=0;
-		u32 nal_hdr = pctx->nalu_size_length;
-		u32 nal_size = 0;
-		while (nal_hdr) {
-			nal_size |= data[size];
-			size++;
-			nal_hdr--;
-			if (!nal_hdr) break;
-			nal_size<<=8;
-		}
-		nal_type = data[size];
-		nal_type = (nal_type & 0x7E) >> 1;
-		if ((nal_type != GF_HEVC_NALU_SEI_PREFIX) && (nal_type != GF_HEVC_NALU_SEI_SUFFIX) ) {
-			final_size += nal_size+pctx->nalu_size_length;
-		}
-		size += nal_size;
-	}
-	if (final_size == pck_size)
-		return gf_filter_pck_forward(pck, pctx->opid);
-
-	dst = gf_filter_pck_new_alloc(pctx->opid, final_size, &output);
-	gf_filter_pck_merge_properties(pck, dst);
-
-	size=0;
-	while (size<pck_size) {
-		u8 nal_type=0;
-		u32 nal_hdr = pctx->nalu_size_length;
-		u32 nal_size = 0;
-		while (nal_hdr) {
-			nal_size |= data[size];
-			size++;
-			nal_hdr--;
-			if (!nal_hdr) break;
-			nal_size<<=8;
-		}
-		nal_type = data[size];
-		nal_type = (nal_type & 0x7E) >> 1;
-		if ((nal_type == GF_HEVC_NALU_SEI_PREFIX) || (nal_type == GF_HEVC_NALU_SEI_SUFFIX) ) {
-			size += nal_size;
-			continue;
-		}
-		memcpy(output, &data[size-pctx->nalu_size_length], pctx->nalu_size_length+nal_size);
-		output += pctx->nalu_size_length+nal_size;
-		size += nal_size;
-	}
-	return gf_filter_pck_send(dst);
-}
-
 static GF_Err hevc_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
 {
 	GF_HEVCConfig *hvcc;
@@ -288,11 +318,19 @@
 	pctx->reconfigure = GF_FALSE;
 
 	hvcc = gf_odf_hevc_cfg_read(prop->value.data.ptr, prop->value.data.size, (pctx->codec_id==GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE);
-	if (ctx->sar.num && ctx->sar.den) {
-		e = gf_media_hevc_change_par(hvcc, ctx->sar.num, ctx->sar.den);
-		if (!e)
-			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->sar) );
+	if (pctx->rewrite_vui) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+		GF_VUIInfo tmp_vui = pctx->vui;
+		tmp_vui.update = GF_TRUE;
+		e = gf_hevc_change_vui(hvcc, &tmp_vui);
+		if (!e) {
+			update_props(pctx, &tmp_vui);
+		}
+#else
+		return GF_NOT_SUPPORTED;
+#endif /*GPAC_DISABLE_AV_PARSERS*/
 	}
+
 	if (ctx->pidc>=0) hvcc->profile_idc = ctx->pidc;
 	if (ctx->pspace>=0) hvcc->profile_space = ctx->pspace;
 	if (ctx->gpcflags>=0) hvcc->general_profile_compatibility_flags = ctx->gpcflags;
@@ -305,7 +343,7 @@
 
 	gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
 
-	if (ctx->remsei) {
+	if (ctx->rmsei) {
 		pctx->rewrite_packet = hevc_rewrite_packet;
 	} else {
 		pctx->rewrite_packet = none_rewrite_packet;
@@ -314,6 +352,52 @@
 }
 #endif // GPAC_DISABLE_HEVC
 
+
+static GF_Err vvc_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	GF_VVCConfig *vvcc;
+	GF_Err e = GF_OK;
+	u8 *dsi;
+	u32 dsi_size;
+	const GF_PropertyValue *prop;
+
+	prop = gf_filter_pid_get_property(pctx->ipid, GF_PROP_PID_DECODER_CONFIG);
+	if (!prop) return GF_OK;
+	pctx->reconfigure = GF_FALSE;
+
+	vvcc = gf_odf_vvc_cfg_read(prop->value.data.ptr, prop->value.data.size);
+	if (pctx->rewrite_vui) {
+		GF_VUIInfo tmp_vui = pctx->vui;
+		tmp_vui.update = GF_TRUE;
+		e = gf_vvc_change_vui(vvcc, &tmp_vui);
+		if (!e) {
+			update_props(pctx, &tmp_vui);
+		}
+	}
+
+	if (ctx->pidc>=0) vvcc->general_profile_idc = ctx->pidc;
+	if (ctx->lev>=0) vvcc->general_level_idc = ctx->pidc;
+
+
+	gf_odf_vvc_cfg_write(vvcc, &dsi, &dsi_size);
+	pctx->nalu_size_length = vvcc->nal_unit_size;
+	gf_odf_vvc_cfg_del(vvcc);
+	if (e) return e;
+
+	gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
+
+	if (ctx->rmsei) {
+		pctx->rewrite_packet = vvc_rewrite_packet;
+	} else {
+		pctx->rewrite_packet = none_rewrite_packet;
+	}
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif /*GPAC_DISABLE_AV_PARSERS*/
+}
+
 static GF_Err none_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
 {
 	pctx->reconfigure = GF_FALSE;
@@ -324,57 +408,42 @@
 {
 	GF_Err e = pctx->rewrite_pid_config(ctx, pctx);
 	if (e) return e;
-	pctx->clrp = pctx->txchar = pctx->mxcoef = -1;
-	pctx->prev_clrp = pctx->prev_txchar = pctx->prev_mxcoef = pctx->prev_sar = -1;
-
-	if (ctx->clrp) {
-		if (!stricmp(ctx->clrp, "BT.709") || !stricmp(ctx->clrp, "BT709")) pctx->clrp = 1;
-		else if (!stricmp(ctx->clrp, "BT.601-625") || !stricmp(ctx->clrp, "BT601-625")) pctx->clrp = 5;
-		else if (!stricmp(ctx->clrp, "BT.601-525") || !stricmp(ctx->clrp, "BT601-525")) pctx->clrp = 6;
-		else if (!stricmp(ctx->clrp, "BT.2020") || !stricmp(ctx->clrp, "BT2020")) pctx->clrp = 9;
-		else if (!stricmp(ctx->clrp, "P3")) pctx->clrp = 11;
-		else if (!stricmp(ctx->clrp, "P3-D65")) pctx->clrp = 12;
-		else {
-			char szCoef[100];
-			pctx->clrp = atoi(ctx->clrp);
-			sprintf(szCoef, "%u", pctx->clrp);
-			if (stricmp(szCoef, ctx->clrp))
-				pctx->clrp = -1;
-		}
-	}
-	if (ctx->txchar) {
-		if (!strcmp(ctx->txchar, "BT-709") || !strcmp(ctx->txchar, "BT709")) pctx->txchar=1;
-		else if (!strcmp(ctx->txchar, "ST-2084") || !strcmp(ctx->txchar, "ST2084")) pctx->txchar=16;
-		else if (!strcmp(ctx->txchar, "STD-B67") || !strcmp(ctx->txchar, "STDB67")) pctx->txchar=18;
-		else {
-			char szTxChar[100];
-			pctx->txchar = atoi(ctx->txchar);
-			sprintf(szTxChar, "%u", pctx->txchar);
-			if (stricmp(szTxChar, ctx->txchar))
-				pctx->txchar = -1;
-		}
-	}
-	if (ctx->mxcoef) {
-		if (!strcmp(ctx->mxcoef, "BT.709") || !strcmp(ctx->mxcoef, "BT709")) pctx->mxcoef = 1;
-		else if (!strcmp(ctx->mxcoef, "BT.601") || !strcmp(ctx->mxcoef, "BT601")) pctx->mxcoef = 6;
-		else if (!strcmp(ctx->mxcoef, "BT.2020") || !strcmp(ctx->mxcoef, "BT2020")) pctx->mxcoef = 9;
-		else {
-			char szMx[100];
-			pctx->mxcoef = atoi(ctx->mxcoef);
-			sprintf(szMx, "%u", pctx->mxcoef);
-			if (stricmp(szMx, ctx->mxcoef))
-				pctx->mxcoef = -1;
-		}
-	}
+	pctx->prev_cprim = pctx->prev_ctfc = pctx->prev_cmx = pctx->prev_sar = -1;
 	return GF_OK;
 }
 
+static void init_vui(GF_BSRWCtx *ctx, BSRWPid *pctx)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	pctx->vui.ar_num = ctx->sar.num;
+	pctx->vui.ar_den = ctx->sar.den;
+	pctx->vui.color_matrix = ctx->cmx;
+	pctx->vui.color_prim = ctx->cprim;
+	pctx->vui.fullrange = ctx->fullrange;
+	pctx->vui.remove_video_info = ctx->novsi;
+	pctx->vui.color_tfc = ctx->ctfc;
+	pctx->vui.video_format = ctx->vidfmt;
+#endif /*GPAC_DISABLE_AV_PARSERS*/
+
+	pctx->rewrite_vui = GF_TRUE;
+	if (ctx->sar.num>=0) return;
+	if ((s32) ctx->sar.den>=0) return;
+	if (ctx->cmx>-1) return;
+	if (ctx->cprim>-1) return;
+	if (ctx->fullrange) return;
+	if (ctx->novsi) return;
+	if (ctx->ctfc>-1) return;
+	if (ctx->vidfmt>-1) return;
+	//all default
+	pctx->rewrite_vui = GF_FALSE;
+}
 
 static GF_Err prores_rewrite_packet(GF_BSRWCtx *ctx, BSRWPid *pctx, GF_FilterPacket *pck)
 {
 	u8 *output;
 	GF_FilterPacket *dst_pck = gf_filter_pck_new_clone(pctx->opid, pck, &output);
-
+	if (!dst_pck) return GF_OUT_OF_MEM;
+	
 	//starting at offset 20 in frame:
 	/*
 	prores_frame->chroma_format = gf_bs_read_int(bs, 2);
@@ -398,7 +467,7 @@
 		else if (ctx->sar.num * 9 == ctx->sar.den * 16) new_ar = 3;
 		else {
 			if (pctx->prev_sar != new_ar) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[BSRW] Aspect ratio %d/%d not registered in ProRes, using 0 (unknown)\n", ctx->sar.num, ctx->sar.den));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[BSRW] Aspect ratio %d/%d not registered in ProRes, using 0 (unknown)\n", ctx->sar.num, ctx->sar.den));
 			}
 		}
 		new_ar <<= 4;
@@ -409,25 +478,25 @@
 			pctx->prev_sar = new_ar;
 		}
 	}
-	if (pctx->clrp>=0) {
-		output[22] = (u8) pctx->clrp;
-		if (pctx->prev_clrp != pctx->clrp) {
-			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_PRIMARIES, &PROP_UINT(pctx->clrp) );
-			pctx->prev_clrp = pctx->clrp;
+	if (ctx->cprim>=0) {
+		output[22] = (u8) ctx->cprim;
+		if (pctx->prev_cprim != ctx->cprim) {
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_PRIMARIES, &PROP_UINT(ctx->cprim) );
+			pctx->prev_cprim = ctx->cprim;
 		}
 	}
-	if (pctx->txchar>=0) {
-		output[23] = (u8) pctx->txchar;
-		if (pctx->prev_txchar != pctx->txchar) {
-			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_TRANSFER, &PROP_UINT(pctx->txchar) );
-			pctx->prev_txchar = pctx->txchar;
+	if (ctx->ctfc>=0) {
+		output[23] = (u8) ctx->ctfc;
+		if (ctx->ctfc != pctx->prev_ctfc) {
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_TRANSFER, &PROP_UINT(ctx->ctfc) );
+			pctx->prev_ctfc = ctx->ctfc;
 		}
 	}
-	if (pctx->mxcoef>=0) {
-		output[24] = (u8) pctx->mxcoef;
-		if (pctx->prev_mxcoef != pctx->mxcoef) {
-			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_MX, &PROP_UINT(pctx->mxcoef) );
-			pctx->prev_mxcoef = pctx->mxcoef;
+	if (ctx->cmx>=0) {
+		output[24] = (u8) ctx->cmx;
+		if (pctx->prev_cmx != ctx->cmx) {
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_COLR_MX, &PROP_UINT(ctx->cmx) );
+			pctx->prev_cmx = ctx->cmx;
 		}
 	}
 	return gf_filter_pck_send(dst_pck);
@@ -443,8 +512,10 @@
 	//disconnect of src pid (not yet supported)
 	if (is_remove) {
 		if (pctx) {
-			//one in one out, this is simple
-			gf_filter_pid_remove(pctx->opid);
+			if (pctx->opid) {
+				gf_filter_pid_remove(pctx->opid);
+				pctx->opid = NULL;
+			}
 			gf_filter_pid_set_udta(pid, NULL);
 			gf_list_del_item(ctx->pids, pctx);
 			gf_free(pctx);
@@ -464,6 +535,7 @@
 		gf_list_add(ctx->pids, pctx);
 		pctx->opid = gf_filter_pid_new(filter);
 		if (!pctx->opid) return GF_OUT_OF_MEM;
+		init_vui(ctx, pctx);
 	}
 
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
@@ -481,6 +553,10 @@
 		pctx->rewrite_pid_config = hevc_rewrite_pid_config;
 		break;
 #endif
+	case GF_CODECID_VVC:
+	case GF_CODECID_VVC_SUBPIC:
+		pctx->rewrite_pid_config = vvc_rewrite_pid_config;
+		break;
 	case GF_CODECID_MPEG4_PART2:
 		pctx->rewrite_pid_config = m4v_rewrite_pid_config;
 		break;
@@ -502,8 +578,11 @@
 
 	gf_filter_pid_copy_properties(pctx->opid, pctx->ipid);
 	pctx->codec_id = prop->value.uint;
-	pctx->reconfigure = GF_TRUE;
+	pctx->reconfigure = GF_FALSE;
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	//rewrite asap - waiting for first packet could lead to issues further down the chain, especially for movie fragments
+	//were the init segment could have already been flushed at the time we will dispatch the first packet
+	rewrite_pid_config(ctx, pctx);
 	return GF_OK;
 }
 
@@ -525,6 +604,7 @@
 			pctx->reconfigure = GF_TRUE;
 
 		if (pctx->reconfigure) {
+			init_vui(ctx, pctx);
 			GF_Err e = rewrite_pid_config(ctx, pctx);
 			if (e) return e;
 		}
@@ -569,28 +649,31 @@
 }
 
 #define OFFS(_n)	#_n, offsetof(GF_BSRWCtx, _n)
-static const GF_FilterArgs BSRWArgs[] =
+static GF_FilterArgs BSRWArgs[] =
 {
-	{ OFFS(sar), "aspect ratio to rewrite", GF_PROP_FRACTION, "0/0", NULL, GF_FS_ARG_UPDATE},
+	///do not change order of the first 3
+	{ OFFS(cprim), "color primaries according to ISO/IEC 23001-8 / 23091-2", GF_PROP_CICP_COL_PRIM, "-1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(ctfc), "color transfer characteristics according to ISO/IEC 23001-8 / 23091-2", GF_PROP_CICP_COL_TFC, "-1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(cmx), "color matrix coeficients according to ISO/IEC 23001-8 / 23091-2", GF_PROP_CICP_COL_MX, "-1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(sar), "aspect ratio to rewrite", GF_PROP_FRACTION, "-1/-1", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(m4vpl), "set ProfileLevel for MPEG-4 video part two", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(clrp), "color primaries according to ISO/IEC 23001-8 / 23091-2. Value can be the integer value or (case insensitive) `BT709`, `BT601-625`, `BT601-525`, `BT2020`, `P3` or `P3-D65`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(txchar), "transfer characteristics according to ISO/IEC 23001-8 / 23091-2. Value can be the integer value or (case insensitive) `BT709`, `ST2084` or `STDB67`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(mxcoef), "matrix coeficients according to ISO/IEC 23001-8 / 23091-2. Value can be the integer value or (case insensitive) `BT709`, `BT601` or `BT2020`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_UPDATE},
-
+	{ OFFS(fullrange), "video full range flag", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(novsi), "remove video_signal_type from VUI in AVC|H264 and HEVC", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(prof), "profile indication for AVC|H264", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(lev), "level indication for AVC|H264", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(lev), "level indication for AVC|H264, level_idc for VVC", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(pcomp), "profile compatibility for AVC|H264", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(pidc), "profile IDC for HEVC", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(pidc), "profile IDC for HEVC and VVC", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(pspace), "profile space for HEVC", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(gpcflags), "general compatibility flags for HEVC", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
-
-	{ OFFS(remsei), "remove SEI messages from bitstream", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
-
+	{ OFFS(rmsei), "remove SEI messages from bitstream for AVC|H264, HEVC and VVC", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(vidfmt), "video format for AVC|H264, HEVC and VVC", GF_PROP_UINT, "-1", "component|pal|ntsc|secam|mac|undef", GF_FS_ARG_UPDATE},
 	{0}
 };
 
 static const GF_FilterCapability BSRWCaps[] =
 {
+	//this is correct but we want the filter to act as passthrough for other media
+#if 0
 	CAP_UINT(GF_CAPS_INPUT_STATIC ,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED|GF_CAPFLAG_STATIC , GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_AVC),
@@ -609,24 +692,45 @@
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_APCN),
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_APCO),
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_APCS),
+#else
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+#endif
+
 };
 
 GF_FilterRegister BSRWRegister = {
 	.name = "bsrw",
 	GF_FS_SET_DESCRIPTION("Compressed bitstream rewriter")
 	GF_FS_SET_HELP("This filter rewrites some metadata of various bitstream formats.\n"
-	"The filter can currently modify the following properties in the bitstream:\n"
-	"- MPEG-4 Visual: aspect ratio and profile/level\n"
-	"- AVC|H264: aspect ratio, profile, level, profile compatibility\n"
-	"- HEVC: aspect ratio\n"
-	"- ProRes: aspect ratio, color primaries, transfer characteristics and matrix coefficients\n"
+	"The filter can currently modify the following properties in video bitstreams:\n"
+	"- MPEG-4 Visual:\n"
+	" - sample aspect ratio\n"
+	" - profile and level\n"
+	"- AVC|H264, HEVC and VVC:\n"
+	" - sample aspect ratio\n"
+	" - profile, level, profile compatibility\n"
+	" - video format, video fullrange\n"
+	" - color primaries, transfer characteristics and matrix coefficients (or remove all info)\n"
+	"- ProRes:\n"
+	" - sample aspect ratio\n"
+	" - color primaries, transfer characteristics and matrix coefficients\n"
+	" \n"
+	"Values are by default initialized to -1, implying to keep the related info (present or not) in the bitstream.\n"
+	"A [-sar]() value of `0/0` will remove sample aspect ratio info from bitstream if possible.\n"
 	" \n"
 	"The filter can currently modify the following properties in the stream configuration but not in the bitstream:\n"
 	"- HEVC: profile IDC, profile space, general compatibility flags\n"
+	"- VVC: profile IDC, general profile and level indication\n"
+	" \n"
+	"The filter will work in passthrough mode for all other codecs and media types.\n"
 	)
 	.private_size = sizeof(GF_BSRWCtx),
 	.max_extra_pids = 0xFFFFFFFF,
-	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.flags = GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_ALLOW_CYCLIC,
 	.args = BSRWArgs,
 	SETCAPS(BSRWCaps),
 	.initialize = bsrw_initialize,
@@ -638,5 +742,11 @@
 
 const GF_FilterRegister *bsrw_register(GF_FilterSession *session)
 {
-	return &BSRWRegister;
+	//assign runtime caps on first load
+	if (gf_opts_get_bool("temp", "helponly")) {
+		BSRWArgs[0].min_max_enum = gf_cicp_color_primaries_all_names();
+		BSRWArgs[1].min_max_enum = gf_cicp_color_transfer_all_names();
+		BSRWArgs[2].min_max_enum = gf_cicp_color_matrix_all_names();
+	}
+	return (const GF_FilterRegister *) &BSRWRegister;
 }

gpac-1.0.1.tar.gz/src/filters/compose.c -> gpac-2.0.0.tar.gz/src/filters/compose.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / compositor filter
@@ -116,15 +116,21 @@
 				if (!ctx->validator_mode)
 					ctx->force_next_frame_redraw = GF_TRUE;
 			}
-		} else if (!ret && !ctx->check_eos_state && !nb_sys_streams_active) {
+		} else if (!ret && !ctx->frame_was_produced && !ctx->audio_frames_sent && !ctx->check_eos_state && !nb_sys_streams_active) {
 			ctx->check_eos_state = 1;
 		}
-		if (ctx->check_eos_state == 1) {
-			ctx->last_check_pass++;
-			if (ctx->last_check_pass > 10000) {
+		if (ctx->timeout && (ctx->check_eos_state == 1) && !gf_filter_connections_pending(filter)) {
+			u32 now = gf_sys_clock();
+			if (!ctx->last_check_pass)
+				ctx->last_check_pass = now;
+
+			if (now - ctx->last_check_pass > ctx->timeout) {
 				ctx->check_eos_state = 2;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Could not detect end of stream(s) in %d render pass, aborting\n", ctx->last_check_pass));
-				forced_eos = GF_TRUE;
+				if (!gf_filter_end_of_session(filter)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Could not detect end of stream(s) in the %d ms, aborting\n", ctx->timeout));
+					forced_eos = GF_TRUE;
+				}
+				gf_filter_abort(filter);
 			}
 		} else {
 			ctx->last_check_pass = 0;
@@ -162,6 +168,14 @@
 		return ctx->last_error;
 	}
 
+	//player mode
+	
+	//quit event seen, do not flush, just abort and return last error
+	if (ctx->check_eos_state) {
+		gf_filter_abort(filter);
+		return ctx->last_error ? ctx->last_error : GF_EOS;
+	}
+
 
 	//to clean up,depending on whether we use a thread to poll user inputs, etc...
 	if ((u32) ms_until_next > 100)
@@ -197,6 +211,7 @@
 	const GF_PropertyValue *prop;
 	u32 mtype, codecid;
 	u32 i, count;
+	GF_Scene *def_scene = NULL;
 	GF_Scene *scene = NULL;
 	GF_Scene *top_scene = NULL;
 	GF_Compositor *ctx = (GF_Compositor *) gf_filter_get_udta(filter);
@@ -242,6 +257,7 @@
 
 	odm = gf_filter_pid_get_udta(pid);
 	if (odm) {
+		Bool notify_quality = GF_FALSE;
 		if (mtype==GF_STREAM_SCENE) { }
 		else if (mtype==GF_STREAM_OD) { }
 		//change of stream type for a given object, no use case yet
@@ -250,15 +266,24 @@
 				return GF_NOT_SUPPORTED;
 			if (odm->mo) {
 				odm->mo->config_changed = GF_TRUE;
-				if ((odm->type == GF_STREAM_VISUAL) && odm->parentscene && odm->parentscene->is_dynamic_scene) {
+				gf_mo_update_caps_ex(odm->mo, GF_TRUE);
+				if (odm->mo->config_changed && (odm->type == GF_STREAM_VISUAL) && odm->parentscene && odm->parentscene->is_dynamic_scene) {
 					gf_scene_force_size_to_video(odm->parentscene, odm->mo);
-					odm->mo->config_changed = GF_TRUE;
 				}
 			}
 			gf_odm_update_duration(odm, pid);
 			gf_odm_check_clock_mediatime(odm);
+			notify_quality = GF_TRUE;
 		}
 		merge_properties(ctx, pid, mtype, odm->parentscene);
+
+		if (notify_quality) {
+			GF_Event gevt;
+			memset(&gevt, 0, sizeof(GF_Event));
+			gevt.type = GF_EVENT_QUALITY_SWITCHED;
+			gf_filter_forward_gf_event(filter, &gevt, GF_FALSE, GF_FALSE);
+		}
+
 		return GF_OK;
 	}
 
@@ -284,6 +309,12 @@
 			break;
 		}
 
+		if (!ctx->root_scene->root_od->scene_ns->url_frag) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ORIG_FRAG_URL);
+			if (p && p->value.string)
+				ctx->root_scene->root_od->scene_ns->url_frag = gf_strdup(p->value.string);
+		}
+
 		if (!ctx->player)
 			gf_filter_post_process_task(filter);
 	}
@@ -292,19 +323,30 @@
 	scene = ctx->root_scene;
 	top_scene = ctx->root_scene;
 
+	switch (mtype) {
+	case GF_STREAM_SCENE:
+	case GF_STREAM_OD:
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_IN_IOD);
+		if (prop && prop->value.boolean) {
+			in_iod = GF_TRUE;
+		}
+		break;
+	}
+
+
 	//browse all scene namespaces and figure out our parent scene
 	count = gf_list_count(top_scene->namespaces);
 	for (i=0; i<count; i++) {
 		GF_SceneNamespace *sns = gf_list_get(top_scene->namespaces, i);
 		if (!sns->source_filter) {
-			if (sns->connect_ack && sns->owner) {
-				scene = sns->owner->subscene ? sns->owner->subscene : sns->owner->parentscene;
-				break;
+			if (sns->connect_ack && sns->owner && !def_scene) {
+				def_scene = sns->owner->subscene ? sns->owner->subscene : sns->owner->parentscene;
 			}
 			continue;
 		}
 		assert(sns->owner);
 		if (gf_filter_pid_is_filter_in_parents(pid, sns->source_filter)) {
+			Bool scene_setup = GF_FALSE;
 			if (!sns->owner->subscene && sns->owner->parentscene && (mtype!=GF_STREAM_OD) && (mtype!=GF_STREAM_SCENE)) {
 				u32 j;
 				for (j=0; j<gf_list_count(sns->owner->parentscene->scene_objects); j++) {
@@ -323,10 +365,24 @@
 					break;
 				}
 			}
+			//this is an animation stream
+			if (!in_iod && ((mtype==GF_STREAM_OD) || (mtype==GF_STREAM_SCENE)) ) {
+				scene_setup = GF_TRUE;
+			}
+			//otherwise if parent scene is setup and root object type is scene or OD, do not create an inline
+			//inline nodes using od:// must trigger subscene creation by using gf_scene_get_media_object with object type GF_MEDIA_OBJECT_SCENE
+			else if (sns->owner->parentscene
+				&& sns->owner->parentscene->root_od
+				&& sns->owner->parentscene->root_od->pid
+				&& ((sns->owner->parentscene->root_od->type==GF_STREAM_SCENE) || (sns->owner->parentscene->root_od->type==GF_STREAM_OD))
+			) {
+				scene_setup = GF_TRUE;
+			}
+
 			//we are attaching an inline, create the subscene if not done already
-			if (!sns->owner->subscene && ((mtype==GF_STREAM_OD) || (mtype==GF_STREAM_SCENE)) ) {
+			if (!scene_setup && !sns->owner->subscene && ((mtype==GF_STREAM_OD) || (mtype==GF_STREAM_SCENE)) ) {
 				//ignore system PIDs from subservice - this is typically the case when playing a bt/xmt file
-				//created from a container (mp4) and still refering to that container for the media streams
+				//created from a container (mp4) and still referring to that container for the media streams
 				if (sns->owner->ignore_sys) {
 					GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
 					gf_filter_pid_send_event(pid, &evt);
@@ -343,6 +399,7 @@
 			break;
 		}
 	}
+	if (!scene) scene = def_scene;
 	assert(scene);
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Configuring PID %s\n", gf_stream_type_name(mtype)));
@@ -356,24 +413,23 @@
 	switch (mtype) {
 	case GF_STREAM_SCENE:
 	case GF_STREAM_OD:
-		//we have an MPEG-4 ESID defined for the PID, this is MPEG-4 systems
-		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
-		if (prop && scene->is_dynamic_scene) {
+		if (in_iod) {
 			scene->is_dynamic_scene = GF_FALSE;
-		}
-		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_IN_IOD);
-		if (prop && prop->value.boolean) {
-			scene->is_dynamic_scene = GF_FALSE;
-			in_iod = GF_TRUE;
+		} else {
+			//we have an MPEG-4 ESID defined for the PID, this is MPEG-4 systems
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
+			if (prop && scene->is_dynamic_scene) {
+				scene->is_dynamic_scene = GF_FALSE;
+			}
 		}
 		break;
 	}
 
 	if ((mtype==GF_STREAM_OD) && !in_iod) return GF_NOT_SUPPORTED;
 
-	//we inserted a root scene (bt/svg/...) after a pid (passthrough mode), we need to create a new namesapce for
+	//we inserted a root scene (bt/svg/...) after a pid (passthrough mode), we need to create a new namespace for
 	//the scene and reassign the old namespace to the previously created ODM
-	if (!scene->root_od->parentscene && was_dyn_scene && (was_dyn_scene != scene->is_dynamic_scene)) {
+	if (scene->root_od && !scene->root_od->parentscene && was_dyn_scene && (was_dyn_scene != scene->is_dynamic_scene)) {
 		GF_SceneNamespace *new_sns=NULL;
 		const char *service_url = "unknown";
 		const GF_PropertyValue *p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
@@ -392,7 +448,11 @@
 		gf_sc_set_scene(ctx, NULL);
 		gf_sg_reset(scene->graph);
 		gf_sc_set_scene(ctx, scene->graph);
-		ctx->reload_scene_size = GF_TRUE;
+		//do not reload scene size in GUI mode, let the gui decide
+		if (ctx->player<2)
+			ctx->reload_scene_size = GF_TRUE;
+		//force clock to NULL, will resetup based on OCR_ES_IDs
+		scene->root_od->ck = NULL;
 	}
 
 	//setup object (clock) and playback requests
@@ -418,10 +478,18 @@
 	//scene is dynamic
 	if (scene->is_dynamic_scene) {
 		Bool reset = GF_FALSE;
+		u32 scene_vr_type = 0;
 		char *sep = scene->root_od->scene_ns->url_frag;
 		if (sep && ( !strnicmp(sep, "LIVE360", 7) || !strnicmp(sep, "360", 3) || !strnicmp(sep, "VR", 2) ) ) {
-			if (scene->vr_type != 1) reset = GF_TRUE;
-			scene->vr_type = 1;
+			scene_vr_type = 1;
+		}
+		if (!sep) {
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PROJECTION_TYPE);
+			if (prop && (prop->value.uint==GF_PROJ360_EQR)) scene_vr_type = 1;
+		}
+		if (scene_vr_type) {
+			if (scene->vr_type != scene_vr_type) reset = GF_TRUE;
+			scene->vr_type = scene_vr_type;
 		}
 		if (reset)
 			gf_sg_reset(scene->graph);
@@ -520,7 +588,7 @@
 	{
 		GF_Compositor *ctx = (GF_Compositor *) gf_filter_get_udta(filter);
 		if (ctx->audio_renderer && (evt->base.on_pid == ctx->audio_renderer->aout))
-			ctx->audio_renderer->non_rt_output = GF_FALSE;
+			ctx->audio_renderer->non_rt_output = 0;
 	}
 		return GF_FALSE;
 	case GF_FEVT_BUFFER_REQ:
@@ -559,7 +627,7 @@
 			odm = gf_filter_pid_get_udta(evt->base.on_pid);
 			if ((down_size!=odm->last_filesize_signaled) || (down_size != tot_size)) {
 				odm->last_filesize_signaled = down_size;
-				gf_odm_service_media_event_with_download(odm, GF_EVENT_MEDIA_PROGRESS, down_size, tot_size, bps/8);
+				gf_odm_service_media_event_with_download(odm, GF_EVENT_MEDIA_PROGRESS, down_size, tot_size, bps/8, 0, 0);
 			}
 		}
 
@@ -630,14 +698,20 @@
 		ctx->vfr = GF_TRUE;
 	}
 
-	if (ctx->buf > ctx->mbuf)
-		ctx->buf = ctx->mbuf;
-	if (ctx->rbuf > ctx->mbuf)
-		ctx->buf = ctx->mbuf;
-	if (ctx->rbuf >= ctx->buf)
-		ctx->rbuf = 0;
+	//playout buffer not greater than max buffer
+	if (ctx->buffer > ctx->mbuffer)
+		ctx->buffer = ctx->mbuffer;
+
+	//rebuffer level not greater than playout buffer
+	if (ctx->rbuffer >= ctx->buffer)
+		ctx->rbuffer = 0;
+
 
 if (ctx->player) {
+		//explicit disable of OpenGL
+		if (ctx->drv==GF_SC_DRV_OFF)
+			ctx->ogl = GF_SC_GLMODE_OFF;
+
 		if (ctx->ogl == GF_SC_GLMODE_AUTO)
 			ctx->ogl = GF_SC_GLMODE_HYBRID;
 
@@ -657,16 +731,17 @@
 
 	gf_filter_set_session_caps(filter, &sess_caps);
 
+	//make filter sticky (no shutdown if all inputs removed)
+	gf_filter_make_sticky(filter);
+
 	if (ctx->player) {
-		//make filter sticky (no shutdown at eos)
-		gf_filter_make_sticky(filter);
 
 		//load audio filter chain, declaring audio output pid first
 		if (! (ctx->init_flags & (GF_TERM_NO_AUDIO|GF_TERM_NO_DEF_AUDIO_OUT)) ) {
 			GF_Filter *audio_out = gf_filter_load_filter(filter, "aout", &e);
-			ctx->audio_renderer->non_rt_output = GF_FALSE;
+			ctx->audio_renderer->non_rt_output = 0;
 			if (!audio_out) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to load audio output filter (%s) - audio disabled\n", gf_error_to_string(e) ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Terminal] Failed to load audio output filter (%s) - audio disabled\n", gf_error_to_string(e) ));
 			}
 //			else {
 //				gf_filter_reconnect_output(filter);
@@ -708,64 +783,83 @@
 	gf_filter_set_event_target(filter, GF_TRUE);
 	if (ctx->player==2) {
 		const char *gui_path = gf_opts_get_key("General", "StartupFile");
-		if (gui_path)
+		if (gui_path) {
 			gf_sc_connect_from_time_ex(ctx, gui_path, 0, 0, 0, NULL);
+			gf_opts_set_key("temp", "gui_load_url", ctx->src);
+		}
+	}
+	//src set, connect it (whether player mode or not)
+	else if (ctx->src) {
+		gf_sc_connect_from_time_ex(ctx, ctx->src, 0, 0, 0, NULL);
 	}
 	return GF_OK;
 }
 
+GF_FilterProbeScore compose_probe_url(const char *url, const char *mime)
+{
+	//check all our builtin URL schemes
+	if (!strnicmp(url, "mosaic://", 9)) {
+		return GF_FPROBE_FORCE;
+	}
+	else if (!strnicmp(url, "views://", 8)) {
+		return GF_FPROBE_FORCE;
+	}
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+
 #define OFFS(_n)	#_n, offsetof(GF_Compositor, _n)
 static GF_FilterArgs CompositorArgs[] =
 {
-	{ OFFS(aa), "set anti-aliasing mode for raster graphics; whether the setting is applied or not depends on the graphics module or graphic card\n"\
-		"- none: no anti-aliasing\n"\
- 	"- text: anti-aliasing for text only\n"\
- 	"- all: complete anti-aliasing", GF_PROP_UINT, "all", "none|text|all", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(aa), "set anti-aliasing mode for raster graphics; whether the setting is applied or not depends on the graphics module or graphic card\n"
+		"- none: no anti-aliasing\n"
+		"- text: anti-aliasing for text only\n"
+		"- all: complete anti-aliasing", GF_PROP_UINT, "all", "none|text|all", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(hlfill), "set highlight fill color (ARGB)", GF_PROP_UINT, "0x0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(hlline), "set highlight stroke color (ARGB)", GF_PROP_UINT, "0xFF000000", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(hllinew), "set highlight stroke width", GF_PROP_FLOAT, "1.0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(sz), "enable scalable zoom. When scalable zoom is enabled, resizing the output window will also recompute all vectorial objects. Otherwise only the final buffer is stretched", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(bc), "default background color to use when displaying transparent images or video with no scene composition instructions", GF_PROP_UINT, "0", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(yuvhw), "enable YUV hardware for 2D blits", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(blitp), "partial hardware blits (if not set, will force more redraw)", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(yuvhw), "enable YUV hardware for 2D blit", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(blitp), "partial hardware blit. If not set, will force more redraw", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(softblt), "enable software blit/stretch in 2D. If disabled, vector graphics rasterizer will always be used", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
 
 	{ OFFS(stress), "enable stress mode of compositor (rebuild all vector graphics and texture states at each frame)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(fast), "enable speed optimization - whether the setting is applied or not depends on the graphics module / graphic card", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(bvol), "draw bounding volume of objects\n"\
-			"- no: disable bounding box\n"\
-			"- box: draws a rectangle (2D) or box (3D mode)\n"\
-			"- aabb: draws axis-aligned bounding-box tree (3D only)", GF_PROP_UINT, "no", "no|box|aabb", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(textxt), "specify whether text shall be drawn to a texture and then rendered or directly rendered. Using textured text can improve text rendering in 3D and also improve text-on-video like content\n"\
-		"- default: use texturing for OpenGL rendering, no texture for 2D rasterizer\n"\
-		"- never: never uses text textures\n"\
-		"- always: always render text to texture before drawing"\
+	{ OFFS(bvol), "draw bounding volume of objects\n"
+			"- no: disable bounding box\n"
+			"- box: draws a rectangle (2D) or box (3D)\n"
+			"- aabb: draws axis-aligned bounding-box tree (3D) or rectangle (2D)", GF_PROP_UINT, "no", "no|box|aabb", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(textxt), "specify whether text shall be drawn to a texture and then rendered or directly rendered. Using textured text can improve text rendering in 3D and also improve text-on-video like content\n"
+		"- default: use texturing for OpenGL rendering, no texture for 2D rasterizer\n"
+		"- never: never uses text textures\n"
+		"- always: always render text to texture before drawing"
 		"", GF_PROP_UINT, "default", "default|never|always", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(out8b), "convert 10-bit video to 8 bit texture before GPU upload", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(drop), "drop late frame when drawing. By default frames are not droped until a heavy desync of 1 sec is observed", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(drop), "drop late frame when drawing. If not set, frames are not dropped until a desynchronization of 1 second or more is observed", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(sclock), "force synchronizing all streams on a single clock", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(sgaze), "simulate gaze events through mouse", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(ckey), "color key to use in windowless mode (0xFFRRGGBB). GPAC currently does not support true alpha blitting to desktop due to limitations in most windowing toolkit, it therefore uses color keying mechanism. The alpha part of the key is used for global transparency of the output, if supported", GF_PROP_UINT, "0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(timeout), "timeout in ms after which a source is considered dead", GF_PROP_UINT, "10000", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(timeout), "timeout in ms after which a source is considered dead (0 disable timeout)", GF_PROP_UINT, "10000", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(fps), "simulation frame rate when animation-only sources are played (ignored when video is present)", GF_PROP_FRACTION, "30/1", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(timescale), "timescale used for output packets when no input video pid. A value of 0 means fps numerator", GF_PROP_UINT, "0", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(autofps), "use video input fps for output. If no video or not set, uses [-fps](). Ignored in player mode", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(vfr), "only emit frames when changes are detected. Always true in player mode and when filter is dynamically loaded", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(timescale), "timescale used for output packets when no input video PID. A value of 0 means fps numerator", GF_PROP_UINT, "0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(autofps), "use video input fps for output, ignored in player mode. If no video or not set, uses [-fps]()", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(vfr), "only emit frames when changes are detected. (always true in player mode and when filter is dynamically loaded)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 
 	{ OFFS(dur), "duration of generation. Mostly used when no video input is present. Negative values mean number of frames, positive values duration in second, 0 stops as soon as all streams are done", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(fsize), "force the scene to resize to the biggest bitmap available if no size info is given in the BIFS configuration", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(mode2d), "specify whether immediate drawing should be used or not\n"\
-	"- immediate: the screen is completely redrawn at each frame (always on if passthrough mode is detected)\n"\
-	"- defer: object positioning is tracked from frame to frame and dirty rectangles info is collected in order to redraw the minimal amount of the screen buffer\n"\
-	"- debug: only renders changed areas, reseting other areas\n"\
+	{ OFFS(mode2d), "specify whether immediate drawing should be used or not\n"
+	"- immediate: the screen is completely redrawn at each frame (always on if pass-through mode is detected)\n"
+	"- defer: object positioning is tracked from frame to frame and dirty rectangles info is collected in order to redraw the minimal amount of the screen buffer\n"
+	"- debug: only renders changed areas, resetting other areas\n"
 	 "Whether the setting is applied or not depends on the graphics module and player mode", GF_PROP_UINT, "defer", "defer|immediate|debug", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(amc), "audio multichannel support; if disabled always downmix to stereo. Useful if the multichannel output does not work properly", GF_PROP_BOOL, "true", NULL, 0},
-	{ OFFS(asr), "force output sample rate - 0 for auto", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ach), "force output channels - 0 for auto", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(alayout), "force output channel layout - 0 for auto", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(afmt), "force output channel format - 0 for auto", GF_PROP_PCMFMT, "s16", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(amc), "audio multichannel support; if disabled always down-mix to stereo. Useful if the multichannel output does not work properly", GF_PROP_BOOL, "true", NULL, 0},
+	{ OFFS(asr), "force output sample rate (0 for auto)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ach), "force output channels (0 for auto)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(alayout), "force output channel layout (0 for auto)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(afmt), "force output channel format (0 for auto)", GF_PROP_PCMFMT, "s16", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(asize), "audio output packet size in samples", GF_PROP_UINT, "1024", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(abuf), "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", GF_PROP_UINT, 
+	{ OFFS(abuf), "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", GF_PROP_UINT,
 #ifdef GPAC_CONFIG_ANDROID
 		"200"
 #else
@@ -775,49 +869,49 @@
 	{ OFFS(avol), "audio volume in percent", GF_PROP_UINT, "100", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(apan), "audio pan in percent, 50 is no pan", GF_PROP_UINT, "50", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(async), "audio resynchronization; if disabled, audio data is never dropped but may get out of sync", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(max_aspeed), "silence audio if playback speed is greater than sepcified value", GF_PROP_DOUBLE, "2.0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(max_vspeed), "move to i-frame only decoding if playback speed is greater than sepcified value", GF_PROP_DOUBLE, "4.0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(max_aspeed), "silence audio if playback speed is greater than specified value", GF_PROP_DOUBLE, "2.0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(max_vspeed), "move to i-frame only decoding if playback speed is greater than specified value", GF_PROP_DOUBLE, "4.0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 
-	{ OFFS(buf), "playout buffer in ms. overridden by BufferLenth property of input pid", GF_PROP_UINT, "3000", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(rbuf), "rebuffer trigger in ms. overridden by RebufferLenth property of input pid", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(mbuf), "max buffer in ms (must be greater than playout buffer). overridden by BufferMaxOccupancy property of input pid", GF_PROP_UINT, "3000", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(buffer), "playout buffer in ms (overridden by `BufferLength` property of input PID)", GF_PROP_UINT, "3000", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(rbuffer), "rebuffer trigger in ms (overridden by `RebufferLength` property of input PID)", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(mbuffer), "max buffer in ms, must be greater than playout buffer (overridden by `BufferMaxOccupancy` property of input PID)", GF_PROP_UINT, "3000", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(ntpsync), "ntp resync threshold in ms (drops frame if their NTP is more than the given threshold above local ntp), 0 disables ntp drop", GF_PROP_UINT, "0", NULL, GF_FS_ARG_UPDATE},
 
 	{ OFFS(nojs), "disable javascript", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(noback), "ignore background nodes and viewport fill (usefull when dumping to PNG)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(noback), "ignore background nodes and viewport fill (useful when dumping to PNG)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 
 #ifndef GPAC_DISABLE_3D
-	{ OFFS(ogl), "specify 2D rendering mode\n"\
-				"- auto: automatically decides betwwen on, off and hybrid based on content\n"\
-				"- off: disables OpenGL; 3D will not be rendered\n"\
-				"- on: uses OpenGL for all graphics; this will involve polygon tesselation and 2D graphics will not look as nice as 2D mode\n"\
-				"- hybrid: the compositor performs software drawing of 2D graphics with no textures (better quality) and uses OpenGL for all 2D objects with textures and 3D objects"\
+	{ OFFS(ogl), "specify 2D rendering mode\n"
+				"- auto: automatically decides between on, off and hybrid based on content\n"
+				"- off: disables OpenGL; 3D will not be rendered\n"
+				"- on: uses OpenGL for all graphics; this will involve polygon tesselation and 2D graphics will not look as nice as 2D mode\n"
+				"- hybrid: the compositor performs software drawing of 2D graphics with no textures (better quality) and uses OpenGL for all 2D objects with textures and 3D objects"
 				, GF_PROP_UINT, "auto", "auto|off|hybrid|on", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(pbo), "enable PixelBufferObjects to push YUV textures to GPU in OpenGL Mode. This may slightly increase the performances of the playback", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(nav), "override the default navigation mode of MPEG-4/VRML (Walk) and X3D (Examine)\n"\
-	"- none: disables navigation\n"\
-	"- walk: 3D world walk\n"\
-	"- fly: 3D world fly (no ground detection)\n"\
-	"- pan: 2D/3D world zomm/pan\n"\
-	"- game: 3D world game (mouse gives walk direction)\n"\
-	"- slide: 2D/3D world slide\n"\
-	"- exam: 2D/3D object examine\n"\
-	"- orbit: 3D object orbit\n"\
-	"- vr: 3D world VR (yaw/pitch/roll)"\
+	{ OFFS(nav), "override the default navigation mode of MPEG-4/VRML (Walk) and X3D (Examine)\n"
+	"- none: disables navigation\n"
+	"- walk: 3D world walk\n"
+	"- fly: 3D world fly (no ground detection)\n"
+	"- pan: 2D/3D world zoom/pan\n"
+	"- game: 3D world game (mouse gives walk direction)\n"
+	"- slide: 2D/3D world slide\n"
+	"- exam: 2D/3D object examine\n"
+	"- orbit: 3D object orbit\n"
+	"- vr: 3D world VR (yaw/pitch/roll)"
 	"", GF_PROP_UINT, "none", "none|walk|fly|pan|game|slide|exam|orbit|vr", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(linegl), "indicate that outlining shall be done through OpenGL pen width rather than vectorial outlining", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(epow2), "emulate power-of-2 textures for openGL (old hardware). Ignored if OpenGL rectangular texture extension is enabled\n"\
-	"- yes: video texture is not resized but emulated with padding. This usually speeds up video mapping on shapes but disables texture transformations\n"\
+	{ OFFS(epow2), "emulate power-of-2 textures for OpenGL (old hardware). Ignored if OpenGL rectangular texture extension is enabled\n"
+	"- yes: video texture is not resized but emulated with padding. This usually speeds up video mapping on shapes but disables texture transformations\n"
 	"- no: video is resized to a power of 2 texture when mapping to a shape", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(paa), "indicate whether polygon antialiasing should be used in full antialiasing mode. If not set, only lines and points antialiasing are used", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(bcull), "indicate whether backface culling shall be disable or not\n"\
-				"- on: enables backface culling\n"\
-				"- off: disables backface culling\n"\
-				"- alpha: only enables backface culling for transparent meshes"\
+	{ OFFS(bcull), "indicate whether backface culling shall be disable or not\n"
+				"- on: enables backface culling\n"
+				"- off: disables backface culling\n"
+				"- alpha: only enables backface culling for transparent meshes"
 		"", GF_PROP_UINT, "on", "off|on|alpha", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(wire), "wireframe mode\n"\
-	"- none: objects are drawn as solid\n"\
- "- only: objects are drawn as wireframe only\n"\
+	{ OFFS(wire), "wireframe mode\n"
+	"- none: objects are drawn as solid\n"
+ "- only: objects are drawn as wireframe only\n"
 "- solid: objects are drawn as solid and wireframe is then drawn", GF_PROP_UINT, "none", "none|only|solid", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(norms), "normal vector drawing for debug\n"
 	"- none: no normals drawn\n"
@@ -833,15 +927,16 @@
 	"- strip: same as point but thins point set"
 	"", GF_PROP_UINT, "none", "none|point|strip", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(nbviews), "number of views to use in stereo mode", GF_PROP_UINT, "0", NULL, GF_FS_ARG_UPDATE},
-	{ OFFS(stereo), "stereo output type. If your graphic card does not support OpenGL shaders, only `top` and `side` modes will be available\n"\
-		"- side: images are displayed side by side from left to right\n"\
-		"- top: images are displayed from top (laft view) to bottom (right view)\n"\
-		"- hmd: same as side except that view aspect ratio is not changed\n"\
-		"- ana: standard color anaglyph (red for left view, green and blue for right view) is used (forces views=2)\n"\
-		"- cols: images are interleaved by columns, left view on even columns and left view on odd columns (forces views=2)\n"\
-		"- rows: images are interleaved by columns, left view on even rows and left view on odd rows (forces views=2)\n"\
-		"- spv5: images are interleaved by for SpatialView 5 views display, fullscreen mode (forces views=5)\n"\
-		"- alio8: images are interleaved by for Alioscopy 8 views displays, fullscreen mode (forces views=8)\n"\
+	{ OFFS(stereo), "stereo output type. If your graphic card does not support OpenGL shaders, only `top` and `side` modes will be available\n"
+		"- none: no stereo\n"
+		"- side: images are displayed side by side from left to right\n"
+		"- top: images are displayed from top (laft view) to bottom (right view)\n"
+		"- hmd: same as side except that view aspect ratio is not changed\n"
+		"- ana: standard color anaglyph (red for left view, green and blue for right view) is used (forces views=2)\n"
+		"- cols: images are interleaved by columns, left view on even columns and left view on odd columns (forces views=2)\n"
+		"- rows: images are interleaved by columns, left view on even rows and left view on odd rows (forces views=2)\n"
+		"- spv5: images are interleaved by for SpatialView 5 views display, fullscreen mode (forces views=5)\n"
+		"- alio8: images are interleaved by for Alioscopy 8 views displays, fullscreen mode (forces views=8)\n"
 		"- custom: images are interleaved according to the shader file indicated in [-mvshader](). The shader is exposed each view as uniform sampler2D gfViewX, where X is the view number starting from the left", GF_PROP_UINT, "none", "none|top|side|hmd|custom|cols|rows|ana|spv5|alio8", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(mvshader), "file path to the custom multiview interleaving shader", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(fpack), "default frame packing of input video\n"
@@ -855,12 +950,17 @@
 		"- linear: camera is moved along a straight line with rotation\n"
 		"- circular: camera is moved along a circle with rotation"
 	"", GF_PROP_UINT, "offaxis", "straight|offaxis|linear|circular", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(iod), "inter-occular distance (eye separation) in cm (distance between the cameras). ", GF_PROP_FLOAT, "6.4", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(iod), "inter-ocular distance (eye separation) in cm (distance between the cameras). ", GF_PROP_FLOAT, "6.4", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(rview), "reverse view order", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(dbgpack), "view packed stereo video as single image (show all)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+
 
-	{ OFFS(tvtn), "number of point sampling for tile visibility algo", GF_PROP_UINT, "30", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(tvtt), "number of points above which the tile is considered visible", GF_PROP_UINT, "0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(tvtd), "disable the tile having full coverage of the SRD, only displaying partial tiles", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(tvtn), "number of point sampling for tile visibility algorithm", GF_PROP_UINT, "30", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(tvtt), "number of points above which the tile is considered visible", GF_PROP_UINT, "8", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(tvtd), "debug tiles and full coverage SRD\n"
+		"- off: regular draw\n"
+		"- partial: only displaying partial tiles, not the full sphere video\n"
+		"- full: only display the full sphere video", GF_PROP_UINT, "off", "off|partial|full", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(tvtf), "force all tiles to be considered visible, regardless of viewpoint", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(fov), "default field of view for VR", GF_PROP_FLOAT, "1.570796326794897", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(vertshader), "path to vertex shader file", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT },
@@ -868,7 +968,7 @@
 #endif
 
 #ifdef GF_SR_USE_DEPTH
-	{ OFFS(autocal), "auto callibration of znear/zfar in depth rendering mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(autocal), "auto calibration of znear/zfar in depth rendering mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(dispdepth), "display depth, negative value uses default screen height", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(dispdist), "distance in cm between the camera and the zero-disparity plane. There is currently no automatic calibration of depth in GPAC", GF_PROP_FLOAT, "50", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 #ifndef GPAC_DISABLE_3D
@@ -884,17 +984,22 @@
 	{ OFFS(osize), "force output size. If not set, size is derived from inputs", GF_PROP_VEC2I, "0x0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(dpi), "default dpi if not indicated by video output", GF_PROP_VEC2I, "96x96", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(dbgpvr), "debug scene used by PVR addon", GF_PROP_FLOAT, "0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(player), "set compositor in player mode, see filter help\n"
+	{ OFFS(player), "set compositor in player mode\n"
 	"- no: regular mode\n"
 	"- base: player mode\n"
 	"- gui: player mode with GUI auto-start", GF_PROP_UINT, "no", "no|base|gui", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(noaudio), "disable audio output", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(opfmt), "pixel format to use for output. Ignored in [-player]() mode", GF_PROP_PIXFMT, "none", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(drv), "indicate if graphics driver should be used. Ignored in player mode\n"\
-				"- no: never loads a graphics driver (software blitting used, no 3D possible)\n"\
-				"- yes: always loads a graphics driver. Output pixel format will be RGB\n"\
-				"- auto: decides based on the loaded content"\
+	{ OFFS(drv), "indicate if graphics driver should be used\n"
+				"- no: never loads a graphics driver, software blit is used, no 3D possible (in player mode, disables OpenGL)\n"
+				"- yes: always loads a graphics driver, output pixel format will be RGB (in player mode, same as `auto`)\n"
+				"- auto: decides based on the loaded content"
 			, GF_PROP_UINT, "auto", "no|yes|auto", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(src), "URL of source content", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+
+	{ OFFS(gaze_x), "horizontal gaze coordinate (0=left, width=right)", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_UPDATE},
+	{ OFFS(gaze_y), "vertical gaze coordinate (0=top, height=bottom)", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_UPDATE},
+	{ OFFS(gazer_enabled), "enable gaze event dispatch", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_UPDATE},
 	{0}
 };
 
@@ -926,36 +1031,47 @@
 	"\n"
 	"# Media-client mode\n"
 	"In this mode, the compositor acts as a pseudo-sink for the video side and creates its own output window.\n"
-	"The video frames are dispatched to the output video pid in the form of frame pointers requiring later GPU read if used.\n"
+	"The video frames are dispatched to the output video PID in the form of frame pointers requiring later GPU read if used.\n"
 	"The audio part acts as a regular filter, potentially mixing and resampling the audio inputs to generate its output.\n"
 	"User events are directly processed by the filter in this mode.\n"
 	"\n"
 	"# Filter mode\n"
 	"In this mode, the compositor acts as a regular filter generating frames based on the loaded scene.\n"
-	"It will generate its outputs based on the input video frames and will not process any user event.\n"
+	"It will generate its outputs based on the input video frames, and will process user event sent by consuming filter(s).\n"
 	"If no input video frames (e.g. pure BIFS / SVG / VRML), the filter will generate frames based on the [-fps](), at constant or variable frame rate.\n"
 	"It will stop generating frames as soon as all input streams are done, unless extended/reduced by [-dur]().\n"
-	"If audio streams are loaded, an audio output pid is created.\n"
+	"If audio streams are loaded, an audio output PID is created.\n"
 	"\n"
 	"The default output pixel format in filter mode is:\n"
-	"- `rgb` when the filter is explictly loaded by the application\n"
+	"- `rgb` when the filter is explicitly loaded by the application\n"
 	"- `rgba` when the filter is loaded during a link resolution\n"
 	"This can be changed by assigning the [-opfmt]() option.\n"
 	"\n"
 	"In filter-only mode, the special URL `gpid://` is used to locate PIDs in the scene description, in order to design scenes independently from source media.\n"
-	"When such a pid is associated to a `Background2D` node in BIFS (no SVG mapping yet), the compositor operates in passthrough mode.\n"
-	"In this mode, only new input frames on the passthrough pid will generate new frames, and the scene clock matches the input packet time.\n"
+	"When such a PID is associated to a `Background2D` node in BIFS (no SVG mapping yet), the compositor operates in pass-through mode.\n"
+	"In this mode, only new input frames on the pass-through PID will generate new frames, and the scene clock matches the input packet time.\n"
 	"The output size and pixel format will be set to the input size and pixel format, unless specified otherwise in the filter options.\n"
 	"\n"
 	"If only 2D graphics are used and display driver is not forced, 2D rasterizer will happen in the output pixel format (including YUV pixel formats).\n"
-	"In this case, inplace processing (rasterizing over the input frame data) will be used whenever allowed by input data.\n"\
+	"In this case, in-place processing (rasterizing over the input frame data) will be used whenever allowed by input data.\n"
 	"\n"
 	"If 3D graphics are used or display driver is forced, OpenGL will be used on offscreen surface and the output packet will be an OpenGL texture.\n"
 	"\n"
 	"# Specific URL syntaxes\n"
-	"The compositor accepts any URL type supported by GPAC. It also accepts the following syntaxes for URLs:\n"
-	"- views: creates an auto-stereo scene of N views from `views://v1:.:vN`. vN can be any type of URL supported by GPAC.\n"
-	"- mosaic: creates a mosaic of N views from `mosaic://v1:.:vN`. vN can be any type of URL supported by GPAC."
+	"The compositor accepts any URL type supported by GPAC. It also accepts the following schemes for URLs:\n"
+	"- views:// : creates an auto-stereo scene of N views from `views://v1::.::vN`\n"
+	"- mosaic:// : creates a mosaic of N views from `mosaic://v1::.::vN`\n"
+	"\n"
+	"For both syntaxes, `vN` can be any type of URL supported by GPAC.\n"
+	"For `views://` syntax, the number of rendered views is set by [-nbviews]():\n"
+	"- If the URL gives less views than rendered, the views will be repeated\n"
+	"- If the URL gives more views than rendered, the extra views will be ignored\n"
+	"\n"
+	"The compositor can act as a source filter when the [-src]() option is explicitly set, independently from the operating mode:\n"
+	"EX gpac compositor:src=source.mp4 vout\n"
+	"\n"
+	"The compositor can act as a source filter when the source url uses one of the compositor built-in protocol schemes:\n"
+	"EX gpac -i mosaic://URL1:URL2 vout\n"
 	"\n"
 	)
 	.private_size = sizeof(GF_Compositor),
@@ -969,7 +1085,8 @@
 	.process_event = compose_process_event,
 	.configure_pid = compose_configure_pid,
 	.reconfigure_output = compose_reconfig_output,
-	.update_arg = compose_update_arg
+	.update_arg = compose_update_arg,
+	.probe_url = compose_probe_url,
 };
 
 const GF_FilterRegister *compose_filter_register(GF_FilterSession *session)

gpac-1.0.1.tar.gz/src/filters/dasher.c -> gpac-2.0.0.tar.gz/src/filters/dasher.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2020
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / MPEG-DASH/HLS segmenter
@@ -30,6 +30,9 @@
 #include <gpac/internal/media_dev.h>
 #include <gpac/base_coding.h>
 #include <gpac/network.h>
+#include <gpac/crypt_tools.h>
+
+#ifndef GPAC_DISABLE_CORE_TOOLS
 
 #define DEFAULT_PERIOD_ID	 "_gf_dash_def_period"
 
@@ -47,6 +50,7 @@
 	DASHER_BS_SWITCH_OFF,
 	DASHER_BS_SWITCH_ON,
 	DASHER_BS_SWITCH_INBAND,
+	DASHER_BS_SWITCH_INBAND_PPS,
 	DASHER_BS_SWITCH_FORCE,
 	DASHER_BS_SWITCH_MULTI,
 };
@@ -93,37 +97,78 @@
 	DASHER_MUX_AUTO,
 };
 
+enum
+{
+	DASHER_MPHA_NO=0,
+	DASHER_MPHA_COMP_ONLY,
+	DASHER_MPHA_ALL
+};
+
+enum
+{
+	DASHER_FWD_NO = 0,
+	DASHER_FWD_SEGS,
+	DASHER_FWD_ALL,
+};
+
+enum
+{
+	//unknown samples sync state at startup
+	DASHER_SYNC_UNKNOWN=0,
+	//all samples sync
+	DASHER_SYNC_NONE,
+	//some samples sync
+	DASHER_SYNC_PRESENT,
+};
+
+enum
+{
+	DASHER_CMAF_NONE=0,
+	DASHER_CMAF_CMFC,
+	DASHER_CMAF_CMF2
+};
+
 typedef struct
 {
-	u32 bs_switch, profile, cp, ntp;
+	u32 bs_switch, profile, spd, cp, ntp;
 	s32 subs_sidx;
 	s32 buf, timescale;
-	Bool sfile, sseg, no_sar, mix_codecs, stl, tpl, align, sap, no_frag_def, sidx, split, hlsc, strict_cues, force_flush;
+	Bool sfile, sseg, no_sar, mix_codecs, stl, tpl, align, sap, no_frag_def, sidx, split, hlsc, strict_cues, force_flush, last_seg_merge;
+	u32 mha_compat;
 	u32 strict_sap;
 	u32 pssh;
-	Double segdur;
+	u32 cmaf;
+	GF_Fraction segdur;
 	u32 dmode;
 	char *template;
 	char *segext;
 	char *initext;
 	u32 muxtype;
+	Bool rawsub;
 	char *profX;
 	Double asto;
 	char *ast;
 	char *state;
 	char *cues;
 	char *title, *source, *info, *cprt, *lang;
-	GF_List *location, *base;
+	char *chain, *chain_fbk;
+	GF_PropStringList location, base;
 	Bool check_dur, skip_seg, loop, reschedule, scope_deps;
 	Double refresh, tsb, subdur;
 	u64 *_p_gentime, *_p_mpdtime;
-	Bool m2ts;
-	Bool cmpd, dual, sreg;
+	Bool cmpd, dual, sreg, pswitch;
 	char *styp;
 	Bool sigfrag;
 	u32 sbound;
 	char *utcs;
-
+	char *mname;
+	char *hlsdrm;
+	GF_PropStringList hlsx;
+	u32 llhls;
+	//inherited from mp4mx
+	GF_Fraction cdur;
+	Bool ll_preload_hint, ll_rend_rep;
+	Bool gencues;
 
 	//internal
 	Bool in_error;
@@ -137,11 +182,12 @@
 
 	GF_MPD *mpd;
 
-	Double period_start;
 	GF_DasherPeriod *current_period, *next_period;
 	GF_List *pids;
 	Bool template_use_source;
+	s32 period_idx;
 
+	GF_List *tpl_records;
 	Bool use_xlink, use_cenc, check_main_role;
 
 	//options for muxers, constrained by profile
@@ -159,6 +205,7 @@
 	Double nb_secs_to_discard;
 	Bool first_context_load, store_init_params;
 	Bool do_m3u8, do_mpd;
+	Bool is_period_restore, is_empty_period;
 
 	Bool store_seg_states;
 
@@ -168,7 +215,8 @@
 	Bool post_play_events;
 
 	Bool force_period_switch;
-	Bool streams_not_ready;
+	Bool period_not_ready;
+	Bool check_connections;
 
 	//-1 forces report update, otherwise this is a packet count
 	s32 update_report;
@@ -182,6 +230,23 @@
 	Bool utc_initialized;
 	DasherUTCTimingType utc_timing_type;
 	s32 utc_diff;
+
+	Bool is_route;
+
+	Bool force_hls_ll_manifest;
+
+	u32 forward_mode;
+	
+	u8 last_hls_signature[GF_SHA1_DIGEST_SIZE], last_mpd_signature[GF_SHA1_DIGEST_SIZE], last_hls2_signature[GF_SHA1_DIGEST_SIZE];
+
+	GF_CryptInfo *cinfo;
+
+	Bool use_cues;
+	Bool dyn_rate;
+
+	u64 min_segment_start_time, last_min_segment_start_time;
+
+	u32 def_max_seg_dur;
 } GF_DasherCtx;
 
 typedef enum
@@ -200,17 +265,17 @@
 	GF_Fraction sar, fps;
 	u32 width, height;
 	u32 sr, nb_ch;
-	const char *lang;
-	Bool interlaced;
+	char *lang;
+	Bool interlaced, rawmux;
 	const GF_PropertyValue *p_role;
 	const GF_PropertyValue *p_period_desc;
 	const GF_PropertyValue *p_as_desc;
 	const GF_PropertyValue *p_as_any_desc;
 	const GF_PropertyValue *p_rep_desc;
 	const GF_PropertyValue *p_base_url;
-	const char *template;
-	const char *xlink;
-	const char *hls_vp_name;
+	char *template;
+	char *xlink;
+	char *hls_vp_name;
 	u32 nb_surround, nb_lfe;
 	u64 ch_layout;
 	GF_PropVec4i srd;
@@ -224,12 +289,14 @@
 
 	u32 bitrate;
 	GF_DasherPeriod *period;
+	GF_MPD_Period *last_period;
 
-	Double dash_dur;
+	GF_Fraction dash_dur;
 
 	char *period_id;
-	Double period_start;
-	Double period_dur;
+	char *period_continuity_id;
+	GF_Fraction64 period_start;
+	GF_Fraction64 period_dur;
 	//0: not done, 1: eos/abort, 2: subdur exceeded
 	u32 done;
 	Bool seg_done;
@@ -243,6 +310,7 @@
 	char *rep_id;
 	//AS ID for this stream, may be 0
 	u32 as_id;
+	u32 sync_as_id;
 	struct _dash_stream *muxed_base;
 	GF_List *complementary_streams;
 	GF_List *comp_pids;
@@ -252,8 +320,8 @@
 	//the parent adaptation set
 	GF_MPD_AdaptationSet *set;
 	Bool owns_set;
-	//set to true to use inband params
-	Bool inband_params;
+	//set to 1 if full inband params, 2 if pps/aps only, 0 otherwise
+	u32 inband_params;
 	GF_List *multi_pids;
 	GF_List *multi_tracks;
 	//in case we share the same init segment, we MUST use the same timescale
@@ -262,21 +330,25 @@
 
 	u32 startNumber, seg_number;
 	Bool rep_init;
+	Bool forced_period_switch;
 	u64 first_cts;
 	u64 first_dts;
-	s32 pts_minus_cts;
+	s64 pts_minus_cts;
 	Bool is_encrypted;
+	//only used for SegmentTimeline
+	u64 presentation_time_offset;
 
 	//target MPD timescale
 	u32 mpd_timescale;
 	//segment start time in target MPD timescale
 	u64 seg_start_time;
 	Bool split_set_names;
+	Bool skip_tpl_reuse;
 	u64 max_period_dur;
 
 	GF_Filter *dst_filter;
 
-	const char *src_url;
+	char *src_url;
 
 	char *init_seg, *seg_template, *idx_template;
 	u32 nb_sap_3, nb_sap_4;
@@ -285,7 +357,7 @@
 	//dependency ID of output pid (renumbered)
 	u32 dep_pid_id;
 	u32 nb_samples_in_source;
-	Bool has_sync_points;
+	u32 sync_points_type;
 	//seg urls not yet handled (waiting for size/index callbacks)
 	GF_List *pending_segment_urls;
 	//segment states not yet handled (waiting for size/index/etc callbacks), used for M3U8 and state mode
@@ -321,36 +393,70 @@
 	u32 split_dur_next;
 
 	u32 moof_sn_inc, moof_sn;
-	Double clamped_dur;
+	GF_Fraction64 clamped_dur;
 
 	u32 nb_segments_purged;
 	Double dur_purged;
 	Bool tile_base;
+	Bool tile_dep_id_merged;
+	struct _dash_stream *merged_tile_dep;
 
 	u32 cues_timescale;
 	u32 nb_cues;
 	GF_DASHCueInfo *cues;
 	Bool cues_use_edits;
-
+	s32 cues_ts_offset;
+	Bool inband_cues;
+	
 	Bool clamp_done;
-	Bool dcd_not_ready;
+	u32 dcd_not_ready;
 
 	Bool reschedule;
 
 	GF_Fraction64 duration;
 	GF_List *packet_queue;
 	u32 nb_sap_in_queue;
+	u32 sbound;
+
+	u32 request_period_switch;
 
 	//gm_ for gen manifest
 	Double gm_duration_total, gm_duration_min, gm_duration_max;
 	u32 gm_nb_segments;
 
 	Bool no_seg_dur;
+	//for route
+	u64 hls_ref_id;
+	GF_DASH_SegmentContext *current_seg_state;
+
+	Bool transcode_detected;
+
+	//HLS full seg encryption
+	GF_CryptInfo *cinfo;
+	GF_TrackCryptInfo *tci;
+	u64 iv_low, iv_high;
+	u32 key_idx;
+	u32 nb_crypt_seg;
+
+	Bool dyn_bitrate;
+	u64 rate_first_dts_plus_one, rate_last_dts;
+	u64 rate_media_size;
+
+	u64 period_continuity_next_cts;
+
+	u64 last_min_segment_start_time;
+	Bool stl;
+
+	Bool set_period_switch;
+
 } GF_DashStream;
 
-static void dasher_flush_segment(GF_DasherCtx *ctx, GF_DashStream *ds);
+static void dasher_flush_segment(GF_DasherCtx *ctx, GF_DashStream *ds, Bool is_last_in_period);
 static void dasher_update_rep(GF_DasherCtx *ctx, GF_DashStream *ds);
-
+static void dasher_reset_stream(GF_Filter *filter, GF_DashStream *ds, Bool is_destroy);
+static void dasher_update_period_duration(GF_DasherCtx *ctx, Bool is_period_switch);
+static GF_Err dasher_setup_period(GF_Filter *filter, GF_DasherCtx *ctx, GF_DashStream *for_ds);
+static GF_Err dasher_setup_profile(GF_DasherCtx *ctx);
 
 static GF_DasherPeriod *dasher_new_period()
 {
@@ -370,7 +476,9 @@
 	if (Channels) *Channels = ds->nb_ch;
 
 	if (!dsi) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] missing AAC config\n"));
+		if (!ds->dcd_not_ready) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] missing AAC config\n"));
+		}
 		return GF_OK;
 	}
 	e = gf_m4a_get_config(dsi->value.data.ptr, dsi->value.data.size, &a_cfg);
@@ -387,21 +495,311 @@
 #endif
 
 
+static void dasher_check_outpath(GF_DasherCtx *ctx)
+{
+	if (!ctx->out_path) {
+		ctx->out_path = gf_filter_pid_get_destination(ctx->opid);
+		if (!ctx->out_path) return;
+
+		if (ctx->mname) {
+			char *sep = strstr(ctx->out_path, "://");
+			if (sep) {
+				char *opath = gf_url_concatenate(ctx->out_path, ctx->mname);
+				if (opath) {
+					gf_free(ctx->out_path);
+					ctx->out_path = opath;
+				}
+			}
+		}
+		//check if we have a route/atsc output, in which we will case assign hls ref prop
+		if (!strncmp(ctx->out_path, "route://", 8) || !strncmp(ctx->out_path, "atsc://", 7))
+			ctx->is_route = GF_TRUE;
+	}
+	//for routeout
+	if (ctx->opid)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_URL, &PROP_STRING(ctx->out_path) );
+	if (ctx->opid_alt)
+		gf_filter_pid_set_property(ctx->opid_alt, GF_PROP_PID_URL, &PROP_STRING(ctx->out_path) );
+}
+
+
+static GF_Err dasher_hls_setup_crypto(GF_DasherCtx *ctx, GF_DashStream *ds)
+{
+	GF_Err e;
+	u32 pid_id=1;
+	u32 i, count;
+	const GF_PropertyValue *p;
+	GF_CryptInfo *cinfo = NULL;
+	const char *drm = ctx->hlsdrm;
+	if (!ctx->do_m3u8) return GF_OK;
+	if (ds->is_encrypted) return GF_OK;
+	p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_CRYPT_INFO);
+	if (p)
+		drm = p->value.string;
+	else
+		cinfo = ctx->cinfo;
+	if (!drm && !cinfo) return GF_OK;
+
+	if (ctx->sfile) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Cannot use HLS segment encryption with single file output\n"));
+		return GF_BAD_PARAM;
+	}
+
+	if (!cinfo) {
+		cinfo = gf_crypt_info_load(drm, &e);
+		if (!cinfo) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Cannot load HLS DRM file %s\n", drm ));
+			return e;
+		}
+		if (p) {
+			if (ds->cinfo) gf_crypt_info_del(ds->cinfo);
+			ds->cinfo = cinfo;
+		} else {
+			ctx->cinfo = cinfo;
+		}
+	}
+	ds->tci = NULL;
+	p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ID);
+	if (p) pid_id = p->value.uint;
+	count = gf_list_count(cinfo->tcis);
+	for (i=0; i<count; i++) {
+		GF_TrackCryptInfo *tci = gf_list_get(cinfo->tcis, i);
+		if (tci->trackID && (tci->trackID != pid_id)) continue;
+
+		ds->tci = tci;
+		break;
+	}
+	if (!ds->tci) return GF_OK;
+
+	ds->key_idx = 0;
+	ds->iv_low = ds->iv_high = 0;
+	for (i=0; i<8; i++) {
+		ds->iv_high |= ds->tci->keys[ds->key_idx].IV[i];
+		ds->iv_low |= ds->tci->keys[ds->key_idx].IV[i + 8];
+		if (i<7) {
+			ds->iv_high <<= 8;
+			ds->iv_low <<= 8;
+		}
+	}
+
+	return GF_OK;
+}
+
+static u32 dasher_get_dep_bitrate(GF_DasherCtx *ctx, GF_DashStream *ds)
+{
+	u32 bitrate = ds->bitrate;
+	if (ds->dep_id) {
+		u32 i, count = gf_list_count(ctx->current_period->streams);
+		for (i=0; i<count; i++) {
+			GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, i);
+			if (a_ds == ds) continue;
+
+			if (gf_list_find(a_ds->complementary_streams, ds)>=0) {
+
+				bitrate += dasher_get_dep_bitrate(ctx, a_ds);
+			}
+		}
+	}
+	return bitrate;
+}
+
+static void dasher_update_bitrate(GF_DasherCtx *ctx, GF_DashStream *ds)
+{
+	u64 rate;
+	u32 scaler;
+	if (!ds->dyn_bitrate || ds->bitrate) {
+		return;
+	}
+
+	if (!ds->rate_first_dts_plus_one) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't compute bitrate in time for manifest generation, please report to GPAC devs !\n"));
+		return;
+	}
+
+	rate = ds->rate_media_size;
+	rate *= 8;
+	if (ds->rate_last_dts > ds->rate_first_dts_plus_one - 1) {
+		rate *= ds->timescale;
+		rate /= (ds->rate_last_dts - ds->rate_first_dts_plus_one + 1);
+	} else {
+		rate *= ds->dash_dur.den;
+		rate /= ds->dash_dur.num;
+	}
+	//express rates in 100kbps or 10kbps, and if ds is done, trust the average, otherwise add 10%
+	scaler = (rate > 1000000) ? 100000 : 10000;
+	if (rate > 10*scaler) {
+		rate /= scaler;
+		if (!ds->done) scaler = 11 * scaler / 10;
+		rate *= scaler;
+	}
+
+	ds->bitrate = (u32) rate;
+
+	if (ds->rep) {
+		ds->rep->bandwidth = ds->bitrate;
+
+		if (ds->dep_id) {
+			ds->rep->bandwidth = dasher_get_dep_bitrate(ctx, ds);
+		} else if (ds->nb_comp && !ds->muxed_base) {
+			u32 i, count = gf_list_count(ctx->current_period->streams);
+			for (i=0; i<count; i++) {
+				GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, i);
+				if (ds == a_ds) continue;
+				if (a_ds->muxed_base != ds) continue;
+				if (a_ds->dyn_bitrate) {
+					dasher_update_bitrate(ctx, a_ds);
+				}
+				ds->rep->bandwidth += a_ds->bitrate;
+			}
+		}
+	}
+
+	//keep refreshing our rate estimation
+	if (!ds->done && (ds->dyn_bitrate==1))
+		ds->bitrate = 0;
+}
+
+
+static GF_Err dasher_stream_period_changed(GF_Filter *filter, GF_DasherCtx *ctx, GF_DashStream *ds, Bool is_new_period_request)
+{
+	GF_Err e = GF_OK;
+	//period switching, check the stream is still scheduled - if so and not done, flush it, update period duration
+	s32 res = gf_list_find(ctx->current_period->streams, ds);
+	//force end of segment if stream is not yet done and in current period
+	if ((res>=0) && !ds->done && !ds->seg_done) {
+		GF_DashStream *base_ds;
+
+		base_ds = ds->muxed_base ? ds->muxed_base : ds;
+		if (is_new_period_request) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] New period requested during PID %s reconfiguration\n", gf_filter_pid_get_name(ds->ipid) ));
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] PID %s config changed during active period, forcing period switch\n", gf_filter_pid_get_name(ds->ipid) ));
+		}
+		ds->seg_done = GF_TRUE;
+		if(base_ds->nb_comp_done >= base_ds->nb_comp) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Invalid new period: %u components processed (max %u expected)\n", base_ds->nb_comp_done, base_ds->nb_comp));
+			e = GF_BAD_PARAM;
+			goto exit;
+		}
+		base_ds->nb_comp_done ++;
+		ds->first_cts_in_next_seg = ds->est_first_cts_in_next_seg;
+
+		if (base_ds->nb_comp_done == base_ds->nb_comp) {
+			dasher_flush_segment(ctx, base_ds, GF_TRUE);
+		}
+
+		ctx->force_period_switch = GF_TRUE;
+		dasher_update_period_duration(ctx, GF_TRUE);
+	}
+	//remove stream from period
+	if (res>=0) {
+		//force an EOS on this stream for ondemand / side index generation flush
+		if (ds->opid)
+			gf_filter_pid_set_eos(ds->opid);
+		ds->rep_init = GF_FALSE;
+		//indicate this input is moved to next period. If a scheduled input is muxed with this one in the current period
+		//it will abort its current segment
+		ds->forced_period_switch = GF_TRUE;
+		ds->presentation_time_offset = 0;
+		gf_list_rem(ctx->current_period->streams, res);
+	} else {
+		//stream is not in current period, and this is not an explicit new period request
+		//if the period was not ready (not yet setup), add to current streams
+		//this is needed for cases such as HEVC tiling where secondary pids are added after the main pid is configured
+		//see issue 1849
+		if (!is_new_period_request && ctx->period_not_ready && !ds->rep) {
+			gf_list_add(ctx->current_period->streams, ds);
+			ds->period = ctx->current_period;
+			ds->request_period_switch = 0;
+			e = GF_OK;
+			goto exit;
+		}
+	}
+	ds->request_period_switch = 0;
+
+	//this is tricky, when reassigning period IDs in the middle of a stream, we may have cases where some streams
+	//are ready several packets before other streams due to processing delay, which results in period switch signal not
+	//happening at the same time
+	if (is_new_period_request && !ds->rep && ctx->current_period->period && gf_list_count(ctx->current_period->streams)) {
+		Bool inject_in_period = GF_FALSE;
+		if (ds->period_id && ctx->current_period->period->ID && !strcmp(ds->period_id, ctx->current_period->period->ID))
+			inject_in_period = GF_TRUE;
+		else if ((ctx->period_idx>0) && (ds->period_start.num<0) && ((s32) -ds->period_start.num == ctx->period_idx))
+			inject_in_period = GF_TRUE;
+		else if (ds->period_start.num * 1000 == ctx->current_period->period->start * ds->period_start.den)
+			inject_in_period = GF_TRUE;
+
+		if (inject_in_period) {
+			gf_list_add(ctx->current_period->streams, ds);
+			ds->period = ctx->current_period;
+			dasher_setup_period(filter, ctx, ds);
+			//force a MPD publish asap
+			if (ctx->dmode != GF_DASH_STATIC)
+				ctx->mpd->publishTime = 0;
+			e = GF_OK;
+			goto exit;
+		}
+	}
+	gf_list_add(ctx->next_period->streams, ds);
+	ds->period = ctx->next_period;
+
+exit:
+
+	ds->stl = ctx->stl;
+	if (ctx->sigfrag) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property_str(ds->ipid, "source_template");
+		if (p) {
+			p = gf_filter_pid_get_property_str(ds->ipid, "stl_timescale");
+			if (p && p->value.uint) {
+				ds->stl = GF_TRUE;
+				ds->mpd_timescale = p->value.uint;
+			}
+			else
+				ds->stl = GF_FALSE;
+		}
+	}
+	return e;
+}
+
+static void dasher_send_encode_hints(GF_DasherCtx *ctx, GF_DashStream *ds)
+{
+	if (!ctx->sfile && !ds->stl && !ctx->use_cues) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_ENCODE_HINTS, ds->ipid)
+		evt.encode_hints.intra_period = ds->dash_dur;
+		gf_filter_pid_send_event(ds->ipid, &evt);
+	}
+}
+
 static GF_Err dasher_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	Bool period_switch = GF_FALSE;
 	const GF_PropertyValue *p, *dsi=NULL;
 	u32 dc_crc, dc_enh_crc;
+	GF_Err e;
 	GF_DashStream *ds;
+	Bool old_period_switch;
 	u32 prev_stream_type;
+	Bool new_period_request = GF_FALSE;
 	const char *cue_file=NULL;
+	s64 old_clamp_dur = 0;
 	GF_DasherCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
+		ds = gf_filter_pid_get_udta(pid);
+		if (ds) {
+			if (ds->dyn_bitrate) dasher_update_bitrate(ctx, ds);
+			gf_list_del_item(ctx->pids, ds);
+			gf_list_del_item(ctx->current_period->streams, ds);
+			if (ctx->next_period)
+				gf_list_del_item(ctx->next_period->streams, ds);
+			dasher_reset_stream(filter, ds, GF_TRUE);
+			gf_free(ds);
+		}
 		return GF_OK;
 	}
-
-	if (!ctx->opid) {
+	ctx->check_connections = GF_TRUE;
+	if (!ctx->opid && !ctx->gencues) {
 		u32 i, nb_opids = ctx->dual ? 2 : 1;
 		for (i=0; i < nb_opids; i++) {
 			char *segext=NULL;
@@ -412,7 +810,6 @@
 				gf_filter_pid_set_name(ctx->opid, "MANIFEST");
 				opid = ctx->opid;
 			} else {
-				GF_Err e;
 				if (!ctx->alt_dst && ctx->out_path) {
 					char szSRC[100];
 					GF_FileIO *gfio = NULL;
@@ -483,9 +880,11 @@
 			gf_filter_pid_set_property(opid, GF_PROP_PID_CODECID, NULL);
 			gf_filter_pid_set_property(opid, GF_PROP_PID_UNFRAMED, NULL);
 			gf_filter_pid_set_property(opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+			//for routeout
+			gf_filter_pid_set_property(opid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+			gf_filter_pid_set_property(opid, GF_PROP_PID_IS_MANIFEST, &PROP_BOOL(GF_TRUE));
 
-			if (!ctx->out_path)
-				ctx->out_path = gf_filter_pid_get_destination(ctx->opid);
+			dasher_check_outpath(ctx);
 
 			p = gf_filter_pid_caps_query(pid, GF_PROP_PID_FILE_EXT);
 			if (p) {
@@ -495,12 +894,21 @@
 				segext = NULL;
 				if (ctx->out_path) {
 					segext = gf_file_ext_start(ctx->out_path);
+				} else if (ctx->mname) {
+					segext = gf_file_ext_start(ctx->mname);
 				}
 				if (!segext) segext = "mpd";
 				else segext++;
 				if (force_ext)
 					segext = force_ext;
 				gf_filter_pid_set_property(opid, GF_PROP_PID_FILE_EXT, &PROP_STRING(segext) );
+
+				if (!strcmp(segext, "m3u8")) {
+
+					gf_filter_pid_set_property(opid, GF_PROP_PID_MIME, &PROP_STRING("video/mpegurl"));
+				} else {
+					gf_filter_pid_set_property(opid, GF_PROP_PID_MIME, &PROP_STRING("application/dash+xml"));
+				}
 			}
 
 			if (!strcmp(segext, "m3u8")) {
@@ -526,6 +934,7 @@
 		ds->complementary_streams = gf_list_new();
 		period_switch = GF_TRUE;
 		gf_filter_pid_set_udta(pid, ds);
+		ds->sbound = ctx->sbound;
 		if (ctx->sbound!=DASHER_BOUNDS_OUT)
 			ds->packet_queue = gf_list_new();
 
@@ -534,11 +943,20 @@
 		*/
 		if (ctx->is_playing) {
 			GF_FilterEvent evt;
+
+			dasher_send_encode_hints(ctx, ds);
+
 			GF_FEVT_INIT(evt, GF_FEVT_PLAY, ds->ipid);
 			evt.play.speed = 1.0;
 			gf_filter_pid_send_event(ds->ipid, &evt);
 		}
-		//don't create pid at this time
+		//don't create pid at this time except in gencues mode
+
+		if (ctx->gencues) {
+			ds->opid = gf_filter_pid_new(filter);
+			gf_filter_pid_copy_properties(ds->opid, pid);
+			gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("inband") );
+		}
 	}
 
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
@@ -577,13 +995,17 @@
 #define CHECK_PROP_STR(_type, _mem, _e) \
 	p = gf_filter_pid_get_property(pid, _type); \
 	if (!p && (_e<=0) ) return _e; \
-	if (p && _mem && strcmp(_mem, p->value.string)) period_switch = GF_TRUE; \
-	if (p) _mem = p->value.string; \
+	if (p && p->value.string && _mem && strcmp(_mem, p->value.string)) period_switch = GF_TRUE; \
+	if (p) { \
+		if (_mem) gf_free(_mem); \
+		_mem = gf_strdup(p->value.string); \
+	}\
+
 
 #define CHECK_PROP_PROP(_type, _mem, _e) \
 	p = gf_filter_pid_get_property(pid, _type); \
 	if (!p && (_e<=0) ) return _e; \
-	if (p != _mem) period_switch = GF_TRUE; \
+	if (p != _mem) period_switch = GF_TRUE;\
 	_mem = p; \
 
 
@@ -593,6 +1015,7 @@
 	ds->tile_base = GF_FALSE;
 
 	if (ds->stream_type != GF_STREAM_FILE) {
+		u32 prev_bitrate = ds->bitrate;
 		if (ds->stream_type==GF_STREAM_ENCRYPTED) {
 			CHECK_PROP(GF_PROP_PID_ORIG_STREAM_TYPE, ds->stream_type, GF_EOS)
 			ds->is_encrypted = GF_TRUE;
@@ -600,15 +1023,21 @@
 		if (prev_stream_type==ds->stream_type)
 			period_switch = GF_FALSE;
 
-		CHECK_PROP(GF_PROP_PID_CODECID, ds->codec_id, GF_NOT_SUPPORTED)
-		CHECK_PROP(GF_PROP_PID_TIMESCALE, ds->timescale, GF_NOT_SUPPORTED)
 		CHECK_PROP(GF_PROP_PID_BITRATE, ds->bitrate, GF_EOS)
-
-		if (!ds->bitrate) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] No bitrate property assigned to PID %s, defaulting to 1Mbps\n\tTry specifying bitrate property after your source, e.g. -i source.raw:#Bitrate=VAL\n", gf_filter_pid_get_name(ds->ipid)));
-			ds->bitrate = 1000000;
+		if (!ds->bitrate && prev_bitrate) {
+			ds->bitrate = prev_bitrate;
+			period_switch = GF_FALSE;
+		}
+		if (ds->bitrate && period_switch) {
+			//allow 20% variation in bitrate, otherwise force period switch
+			if ((ds->bitrate <= 120 * prev_bitrate / 100) && (ds->bitrate >= 80 * prev_bitrate / 100)) {
+				period_switch = GF_FALSE;
+			}
 		}
 
+		CHECK_PROP(GF_PROP_PID_CODECID, ds->codec_id, GF_NOT_SUPPORTED)
+		CHECK_PROP(GF_PROP_PID_TIMESCALE, ds->timescale, GF_NOT_SUPPORTED)
+
 		if (ds->stream_type==GF_STREAM_VISUAL) {
 			CHECK_PROP(GF_PROP_PID_WIDTH, ds->width, GF_EOS)
 			CHECK_PROP(GF_PROP_PID_HEIGHT, ds->height, GF_EOS)
@@ -618,20 +1047,36 @@
 			CHECK_PROP_FRAC(GF_PROP_PID_FPS, ds->fps, GF_EOS)
 
 
-			p = gf_filter_pid_get_property(pid, GF_PROP_PID_CROP_POS);
-			if (p && ((p->value.vec2i.x != ds->srd.x) || (p->value.vec2i.y != ds->srd.y) ) ) period_switch = GF_TRUE;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_TILE_BASE);
 			if (p) {
-				ds->srd.x = p->value.vec2i.x;
-				ds->srd.y = p->value.vec2i.y;
+				ds->srd.x = ds->srd.y = 0;
 				ds->srd.z = ds->width;
 				ds->srd.w = ds->height;
+				ds->tile_base = GF_TRUE;
 			} else {
-				p = gf_filter_pid_get_property(pid, GF_PROP_PID_TILE_BASE);
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_CROP_POS);
+				if (p && ((p->value.vec2i.x != ds->srd.x) || (p->value.vec2i.y != ds->srd.y) ) ) period_switch = GF_TRUE;
 				if (p) {
-					ds->srd.x = ds->srd.y = 0;
+					ds->srd.x = p->value.vec2i.x;
+					ds->srd.y = p->value.vec2i.y;
 					ds->srd.z = ds->width;
 					ds->srd.w = ds->height;
-					ds->tile_base = GF_TRUE;
+				} else {
+					p = gf_filter_pid_get_property(pid, GF_PROP_PID_SRD);
+					if (p && (
+						(p->value.vec4i.x != ds->srd.x)
+						|| (p->value.vec4i.y != ds->srd.y)
+						|| (p->value.vec4i.z != ds->srd.z)
+						|| (p->value.vec4i.w != ds->srd.w)
+					) )
+						period_switch = GF_TRUE;
+
+					if (p) {
+						ds->srd.x = p->value.vec4i.x;
+						ds->srd.y = p->value.vec4i.y;
+						ds->srd.z = p->value.vec4i.z;
+						ds->srd.w = p->value.vec4i.w;
+					}
 				}
 			}
 		} else if (ds->stream_type==GF_STREAM_AUDIO) {
@@ -640,24 +1085,40 @@
 			CHECK_PROPL(GF_PROP_PID_CHANNEL_LAYOUT, ds->ch_layout, GF_EOS)
 		}
 
-		CHECK_PROP(GF_PROP_PID_ID, ds->id, GF_EOS)
-		CHECK_PROP(GF_PROP_PID_DEPENDENCY_ID, ds->dep_id, GF_EOS)
+		old_period_switch = period_switch;
+
+		//these ones can change without triggering period switch
 		CHECK_PROP(GF_PROP_PID_NB_FRAMES, ds->nb_samples_in_source, GF_EOS)
 		CHECK_PROP_FRAC64(GF_PROP_PID_DURATION, ds->duration, GF_EOS)
-		CHECK_PROP_BOOL(GF_PROP_PID_HAS_SYNC, ds->has_sync_points, GF_EOS)
+		CHECK_PROP_STR(GF_PROP_PID_URL, ds->src_url, GF_EOS)
+		period_switch = old_period_switch;
+
+		CHECK_PROP(GF_PROP_PID_ID, ds->id, GF_EOS)
+		CHECK_PROP(GF_PROP_PID_DEPENDENCY_ID, ds->dep_id, GF_EOS)
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_HAS_SYNC);
+		u32 sync_type = DASHER_SYNC_UNKNOWN;
+		if (p) sync_type = p->value.boolean ? DASHER_SYNC_PRESENT : DASHER_SYNC_NONE;
+		if (sync_type != ds->sync_points_type) period_switch = GF_TRUE;
+		ds->sync_points_type = sync_type;
+
+		if (ds->inband_cues)
+			period_switch = old_period_switch;
 
 		if (ctx->scope_deps) {
-			const char *src_args = gf_filter_pid_orig_src_args(pid);
+			const char *src_args = gf_filter_pid_orig_src_args(pid, GF_TRUE);
 			if (src_args) {
 				ds->src_id = gf_crc_32(src_args, (u32) strlen(src_args));
 			}
 		}
 		dc_crc = 0;
 		dsi = p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
-		if (p) dc_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+		if (p && (p->type==GF_PROP_DATA))
+			dc_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+
 		dc_enh_crc = 0;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
-		if (p) dc_enh_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+		if (p && (p->type==GF_PROP_DATA)) dc_enh_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
 
 		if (((dc_crc != ds->dsi_crc) && ds->dsi_crc)
 			|| ((dc_enh_crc != ds->dsi_enh_crc) && ds->dsi_enh_crc)
@@ -678,6 +1139,7 @@
 			}
 		}
 		//check if input is ready
+		ds->dcd_not_ready = 0;
 		if (!dc_crc && !dc_enh_crc) {
 			switch (ds->codec_id) {
 			case GF_CODECID_AVC:
@@ -689,13 +1151,13 @@
 			case GF_CODECID_AAC_MPEG2_MP:
 			case GF_CODECID_AAC_MPEG2_LCP:
 			case GF_CODECID_AAC_MPEG2_SSRP:
+			case GF_CODECID_USAC:
 			case GF_CODECID_AC3:
 			case GF_CODECID_EAC3:
 			case GF_CODECID_AV1:
 			case GF_CODECID_VP8:
 			case GF_CODECID_VP9:
-				ds->dcd_not_ready = GF_TRUE;
-				ctx->streams_not_ready = GF_TRUE;
+				ds->dcd_not_ready = gf_sys_clock();
 				break;
 			default:
 				break;
@@ -703,7 +1165,6 @@
 		}
 		ds->dsi_crc = dc_crc;
 
-		CHECK_PROP_STR(GF_PROP_PID_URL, ds->src_url, GF_EOS)
 		CHECK_PROP_STR(GF_PROP_PID_TEMPLATE, ds->template, GF_EOS)
 		CHECK_PROP_STR(GF_PROP_PID_LANGUAGE, ds->lang, GF_EOS)
 		CHECK_PROP_BOOL(GF_PROP_PID_INTERLACED, ds->interlaced, GF_EOS)
@@ -715,18 +1176,55 @@
 		CHECK_PROP_STR(GF_PROP_PID_HLS_PLAYLIST, ds->hls_vp_name, GF_EOS)
 		CHECK_PROP_BOOL(GF_PROP_PID_SINGLE_SCALE, ds->sscale, GF_EOS)
 
+		//if manifest generation mode with template and no template at PID or filter level, switch to main profile
+		if (ctx->sigfrag && ctx->tpl && !ctx->template && !ds->template) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Warning, manifest generation only mode requested for live-based profile but no template provided, switching to main profile.\n"));
+			ctx->profile = GF_DASH_PROFILE_MAIN;
+			ctx->tpl = GF_FALSE;
+			dasher_setup_profile(ctx);
+			//we force single file in this mode, but we will replace byte ranges by source URL
+			ctx->sfile = GF_TRUE;
+		}
+
+		if (ds->rate_first_dts_plus_one)
+			dasher_update_bitrate(ctx, ds);
+
+		if (!ds->bitrate) {
+			char *tpl = ds->template ? ds->template : ctx->template;
+			if (tpl && strstr(tpl, "$Bandwidth$")) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] No bitrate property assigned to PID %s but template uses $Bandwidth$, cannot initialize !\n\tTry specifying bitrate property after your source, e.g. -i source.raw:#Bitrate=VAL\n", gf_filter_pid_get_name(ds->ipid)));
+				ctx->in_error = GF_TRUE;
+				return GF_BAD_PARAM;
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] No bitrate property assigned to PID %s, computing from bitstream\n", gf_filter_pid_get_name(ds->ipid)));
+				ds->dyn_bitrate = GF_TRUE;
+				ds->rate_first_dts_plus_one = 0;
+				ds->rate_media_size = 0;
+			}
+		} else {
+			ds->dyn_bitrate = GF_FALSE;
+		}
+
+		if (!ds->src_url)
+			ds->src_url = gf_strdup("file");
 		ds->startNumber = 1;
 		CHECK_PROP(GF_PROP_PID_START_NUMBER, ds->startNumber, GF_EOS)
 		ds->dash_dur = ctx->segdur;
 		ds->no_seg_dur = ctx->no_seg_dur;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_DUR);
 		if (p) {
-			ds->dash_dur = p->value.number;
+			ds->dash_dur = p->value.frac;
 			ds->no_seg_dur = GF_FALSE;
+			if (!ds->dash_dur.num || !ds->dash_dur.den) {
+				ds->dash_dur.num = 1;
+				ds->dash_dur.den = 1;
+			}
 		}
 		//this avoids very weird cases where (u64) (dash_dur*timescale) is 0. we limit the max segment duration to 1M sec, a bit more than 11.5 days
-		if (ds->dash_dur>1000000)
-			ds->dash_dur=1000000;
+		if ((u64) ds->dash_dur.num > (u64)ds->dash_dur.den * 1000000) {
+			ds->dash_dur.num = 1000000;
+			ds->dash_dur.den = 1;
+		}
 
 		ds->splitable = GF_FALSE;
 		switch (ds->stream_type) {
@@ -738,9 +1236,11 @@
 			break;
 		}
 
-		ds->clamped_dur = 0;
+		old_clamp_dur = ds->clamped_dur.num;
+		ds->clamped_dur.num = 0;
+		ds->clamped_dur.den = 1;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAMP_DUR);
-		if (p) ds->clamped_dur = p->value.number;
+		if (p && p->value.lfrac.den) ds->clamped_dur = p->value.lfrac;
 
 		//HDR
 #if !defined(GPAC_DISABLE_AV_PARSERS)
@@ -753,8 +1253,8 @@
 					HEVCState hevc;
 					HEVC_SPS* sps;
 					memset(&hevc, 0, sizeof(HEVCState));
-					gf_media_hevc_parse_ps(hevccfg, &hevc, GF_HEVC_NALU_VID_PARAM);
-					gf_media_hevc_parse_ps(hevccfg, &hevc, GF_HEVC_NALU_SEQ_PARAM);
+					gf_hevc_parse_ps(hevccfg, &hevc, GF_HEVC_NALU_VID_PARAM);
+					gf_hevc_parse_ps(hevccfg, &hevc, GF_HEVC_NALU_SEQ_PARAM);
 					sps = &hevc.sps[hevc.sps_active_idx];
 					if (sps && sps->colour_description_present_flag) {
 						DasherHDRType old_hdr_type = ds->hdr_type;
@@ -776,11 +1276,11 @@
 			if (ds->codec_id == GF_CODECID_AVC || ds->codec_id == GF_CODECID_SVC || ds->codec_id == GF_CODECID_MVC) {
 				AVCState avc;
 				GF_AVCConfig* avccfg = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(avccfg->sequenceParameterSets, 0);
+				GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(avccfg->sequenceParameterSets, 0);
 				if (sl) {
 					s32 idx;
 					memset(&avc, 0, sizeof(AVCState));
-					idx = gf_media_avc_read_sps(sl->data, sl->size, &avc, 0, NULL);
+					idx = gf_avc_read_sps(sl->data, sl->size, &avc, 0, NULL);
 					if (idx>=0) {
 						Bool is_interlaced = avc.sps[idx].frame_mbs_only_flag ? GF_FALSE : GF_TRUE;
 						if (ds->interlaced != is_interlaced) period_switch = GF_TRUE;
@@ -800,8 +1300,12 @@
 			case GF_CODECID_AAC_MPEG2_MP:
 			case GF_CODECID_AAC_MPEG2_LCP:
 			case GF_CODECID_AAC_MPEG2_SSRP:
+			case GF_CODECID_USAC:
 				//DASH-IF and MPEG disagree here:
-				if (ctx->profile == GF_DASH_PROFILE_AVC264_LIVE || ctx->profile == GF_DASH_PROFILE_AVC264_ONDEMAND) {
+				if ((ctx->profile == GF_DASH_PROFILE_AVC264_LIVE)
+					|| (ctx->profile == GF_DASH_PROFILE_AVC264_ONDEMAND)
+					|| (ctx->profile == GF_DASH_PROFILE_DASHIF_LL)
+				) {
 					GF_Err res = dasher_get_audio_info_with_m4a_sbr_ps(ds, dsi, &_sr, &_nb_ch);
 					if (res) {
 						//DASH-IF IOP 3.3 mandates the SBR/PS info
@@ -816,7 +1320,7 @@
 				if (dsi) {
 					u32 i;
 					GF_AC3Config ac3;
-					gf_isom_ac3_config_parse(dsi->value.data.ptr, dsi->value.data.size, (ds->codec_id==GF_CODECID_EAC3) ? GF_TRUE : GF_FALSE, &ac3);
+					gf_odf_ac3_config_parse(dsi->value.data.ptr, dsi->value.data.size, (ds->codec_id==GF_CODECID_EAC3) ? GF_TRUE : GF_FALSE, &ac3);
 
 					ds->nb_lfe = ac3.streams[0].lfon ? 1 : 0;
 					_nb_ch = gf_ac3_get_channels(ac3.streams[0].acmod);
@@ -832,18 +1336,40 @@
 			if (_nb_ch > ds->nb_ch) ds->nb_ch = _nb_ch;
 		}
 
+
+		ds->pts_minus_cts = 0;
+		p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DELAY);
+		if (p && p->value.longsint) {
+			ds->pts_minus_cts = p->value.longsint;
+		}
+
 		//only reload queues if we detected a period switch
 		if (period_switch) {
 			cue_file = ctx->cues;
-			p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_CUE);
-			if (p) cue_file = p->value.string;
+			if (!cue_file || strcmp(cue_file, "none") ) {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_CUE);
+				if (p) cue_file = p->value.string;
+			}
 
 			if (ds->cues) gf_free(ds->cues);
 			ds->cues = NULL;
 			ds->nb_cues = 0;
+			ds->inband_cues = GF_FALSE;
 			if (cue_file) {
-				GF_Err e = gf_mpd_load_cues(cue_file, ds->id, &ds->cues_timescale, &ds->cues_use_edits, &ds->cues, &ds->nb_cues);
-				if (e) return e;
+				if (!strcmp(cue_file, "inband")) {
+					ds->inband_cues = GF_TRUE;
+					//if manifest generation mode, do not setup dash forward mode
+					if (!ctx->sigfrag) {
+						p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_FWD);
+						if (p && p->value.uint)
+							ctx->forward_mode = p->value.uint;
+					}
+				} else if (strcmp(cue_file, "none")) {
+					e = gf_mpd_load_cues(cue_file, ds->id, &ds->cues_timescale, &ds->cues_use_edits, &ds->cues_ts_offset, &ds->cues, &ds->nb_cues);
+					if (e) return e;
+					if (!ds->cues_timescale)
+						ds->cues_timescale = ds->timescale;
+				}
 			}
 		}
 	} else {
@@ -854,24 +1380,109 @@
 
 		CHECK_PROP_STR(GF_PROP_PID_XLINK, ds->xlink, GF_EOS)
 	}
+
+	//stream representation was not yet setup but is scheduled for this period, do not trigger period switch
+	//this typically happens when we post-poned representation setup waiting for the decoder config
+	if (!ds->rep && (gf_list_find(ctx->current_period->streams, ds)>=0))
+		period_switch = GF_FALSE;
+
+	old_period_switch = period_switch;
+	period_switch = GF_FALSE;
 	CHECK_PROP_STR(GF_PROP_PID_PERIOD_ID, ds->period_id, GF_EOS)
 	CHECK_PROP_PROP(GF_PROP_PID_PERIOD_DESC, ds->p_period_desc, GF_EOS)
+	if (!period_switch && ctx->pswitch)
+		period_switch = GF_TRUE;
+
+	if (gf_filter_pid_get_property_str(pid, "period_switch"))
+		period_switch = GF_TRUE;
 
-	ds->period_start = 0;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PERIOD_START);
-	if (p) ds->period_start = p->value.number;
+	if (p) {
+		if (ds->period_start.num * p->value.lfrac.den != p->value.lfrac.num * ds->period_start.den) period_switch = GF_TRUE;
+		ds->period_start = p->value.lfrac;
+	} else {
+		if (ds->period_start.num) period_switch = GF_TRUE;
+		ds->period_start.num = 0;
+		ds->period_start.den = 1;
+	}
+	assert(ds->period_start.den);
+
+	if (period_switch) {
+		new_period_request = GF_TRUE;
+	} else {
+		period_switch = old_period_switch;
+	}
 
-	ds->period_dur = 0;
+	if (ds->period_continuity_id) gf_free(ds->period_continuity_id);
+	ds->period_continuity_id = NULL;
+	p = gf_filter_pid_get_property_str(ds->ipid, "period_resume");
+	if (!ctx->mpd || (gf_list_find(ctx->mpd->periods, ds->last_period)<0))
+		ds->last_period = NULL;
+
+	if (p && p->value.string && ds->last_period) {
+		if (!ds->last_period->ID) {
+			if (p->value.string[0]) {
+				ds->last_period->ID = p->value.string;
+			} else {
+				char szPName[50];
+				sprintf(szPName, "P%d", 1 + gf_list_find(ctx->mpd->periods, ds->last_period));
+				ds->last_period->ID = gf_strdup(szPName);
+			}
+		}
+		if (ds->set && (ds->set->id<0)) {
+			//period may be NULL (no longer scheduled)
+			if (!ds->as_id && ds->period && ds->period->period)
+				ds->as_id = gf_list_find(ds->period->period->adaptation_sets, ds->set) + 1;
+			ds->set->id = ds->as_id;
+		}
+		ds->period_continuity_id = gf_strdup(ds->last_period->ID);
+	}
+	ds->last_period = NULL;
+
+	ds->period_dur.num = 0;
+	ds->period_dur.den = 1;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PERIOD_DUR);
-	if (p) ds->period_dur = p->value.number;
+	if (p) ds->period_dur = p->value.lfrac;
 
 	if (ds->stream_type==GF_STREAM_FILE) {
-		if (!ds->xlink && !ds->period_start && !ds->period_dur) {
+		if (!ds->xlink && !ds->period_start.num && !ds->period_dur.num) {
 			ds->done = 1;
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] null PID specified without any XLINK/start/duration, ignoring\n"));
 		} else if (ds->xlink) {
 			ctx->use_xlink = GF_TRUE;
 		}
+	} else {
+		if (ds->xlink) gf_free(ds->xlink);
+		ds->xlink = NULL;
+		CHECK_PROP_STR(GF_PROP_PID_XLINK, ds->xlink, GF_EOS)
+		if (ds->xlink)
+			ctx->use_xlink = GF_TRUE;
+	}
+
+	//input was done due to clamp but forced to new period, reschedule
+	if (new_period_request && ds->done && old_clamp_dur) {
+		gf_list_del_item(ctx->next_period->streams, ds);
+		//reset discard, blocking mode on output (set by EOS) and reset dasher EOS state
+		gf_filter_pid_set_discard(ds->ipid, GF_FALSE);
+		if (ds->opid && !ctx->gencues) {
+			gf_filter_pid_discard_block(ds->opid);
+			gf_filter_pid_remove(ds->opid);
+			ds->opid = NULL;
+		}
+		if (ctx->is_eos) {
+			ctx->is_eos = GF_FALSE;
+			gf_filter_pid_discard_block(ctx->opid);
+			if (ctx->opid_alt)
+			gf_filter_pid_discard_block(ctx->opid_alt);
+		}
+		ds->rep_init = GF_FALSE;
+		ds->presentation_time_offset = 0;
+		ds->rep = NULL;
+		ds->set = NULL;
+		ds->period = NULL;
+		ds->done = 0;
+//		gf_filter_post_process_task(filter);
+//		dasher_reset_stream(filter, ds, GF_FALSE);
 	}
 
 	//our stream is already scheduled for next period, don't do anything
@@ -880,49 +1491,69 @@
 
 	//assign default ID
 	if (!ds->period_id)
-		ds->period_id = DEFAULT_PERIOD_ID;
+		ds->period_id = gf_strdup(DEFAULT_PERIOD_ID);
+
+	e = dasher_hls_setup_crypto(ctx, ds);
+	if (e) return e;
 
 	if (!period_switch) {
-		if (ds->opid) gf_filter_pid_copy_properties(ds->opid, pid);
+		if (ds->opid) {
+			gf_filter_pid_copy_properties(ds->opid, pid);
+			//for route out
+			if (ctx->is_route && ctx->do_m3u8)
+				gf_filter_pid_set_property(ds->opid, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( ds->hls_ref_id ) );
+			if (ctx->llhls)
+				gf_filter_pid_set_property(ds->opid, GF_PROP_PID_LLHLS, &PROP_UINT(ctx->llhls) );
+
+			if (ctx->gencues)
+				gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("inband") );
+		}
 		if (ds->rep)
 			dasher_update_rep(ctx, ds);
 		return GF_OK;
 	}
+	//period switch !
 
-	//period switching
-	s32 res = gf_list_del_item(ctx->current_period->streams, ds);
-	//force end of segment if stream is not yet done and in current period
-	if ((res>=0) && !ds->done && !ds->seg_done) {
-		GF_DashStream *base_ds;
-
-		base_ds = ds->muxed_base ? ds->muxed_base : ds;
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] PID %s config changed during active period, forcing period switch\n", gf_filter_pid_get_name(ds->ipid) ));
-		ds->seg_done = GF_TRUE;
-		assert(base_ds->nb_comp_done < base_ds->nb_comp);
-		base_ds->nb_comp_done ++;
-		ds->first_cts_in_next_seg = ds->est_next_dts;;
-
-		if (base_ds->nb_comp_done == base_ds->nb_comp) {
-			dasher_flush_segment(ctx, base_ds);
-		}
-		ctx->force_period_switch = GF_TRUE;
+	//we have queued packets (sbound modes), we cannot switch period for this stream now, force queue flush
+	if (gf_list_count(ds->packet_queue)) {
+		ds->request_period_switch = new_period_request ? 2 : 1;
+		return GF_OK;
 	}
-	gf_list_add(ctx->next_period->streams, ds);
-	ds->period = ctx->next_period;
+	//done for this stream
+	return dasher_stream_period_changed(filter, ctx, ds, new_period_request);
+}
 
+static void	dasher_check_chaining(GF_DasherCtx *ctx, char *scheme_id, char *url)
+{
+	GF_MPD_Descriptor *d = gf_mpd_get_descriptor(ctx->mpd->supplemental_properties, scheme_id);
+	if (!d && !url) return;
+	if (!url) {
+		gf_list_del_item(ctx->mpd->supplemental_properties, d);
+		gf_mpd_descriptor_free(d);
+		return;
+	}
+	if (d) {
+		gf_free(d->value);
+		d->value = gf_strdup(url);
+		return;
+	}
+	d = gf_mpd_descriptor_new(NULL, scheme_id, url);
+	if (!ctx->mpd->supplemental_properties)
+		ctx->mpd->supplemental_properties = gf_list_new();
 
-	return GF_OK;
+	gf_list_add(ctx->mpd->supplemental_properties, d);
 }
 
+
 static GF_Err dasher_update_mpd(GF_DasherCtx *ctx)
 {
 	char profiles_string[GF_MAX_PATH];
 	GF_XMLAttribute *cenc_att = NULL;
 	GF_XMLAttribute *xlink_att = NULL;
 
-	u32 i, count=gf_list_count(ctx->mpd->attributes);
+	u32 i, count=gf_list_count(ctx->mpd->x_attributes);
 	for (i=0; i<count; i++) {
-		GF_XMLAttribute * att = gf_list_get(ctx->mpd->attributes, i);
+		GF_XMLAttribute * att = gf_list_get(ctx->mpd->x_attributes, i);
 		if (!strcmp(att->name, "xmlns:cenc")) cenc_att = att;
 		if (!strcmp(att->name, "xmlns:xlink")) xlink_att = att;
 
@@ -934,11 +1565,12 @@
 		ctx->mpd->availabilityStartTime = 0;
 	}
 
+	Bool is_m2ts = (ctx->muxtype==DASHER_MUX_TS) ? GF_TRUE : GF_FALSE;
 	if (ctx->profile==GF_DASH_PROFILE_LIVE) {
-		if (ctx->use_xlink && !ctx->m2ts) {
+		if (ctx->use_xlink && !is_m2ts) {
 			strcpy(profiles_string, "urn:mpeg:dash:profile:isoff-segext-live:2014");
 		} else {
-			sprintf(profiles_string, "urn:mpeg:dash:profile:%s:2011", ctx->m2ts ? "mp2t-simple" : "isoff-live");
+			sprintf(profiles_string, "urn:mpeg:dash:profile:%s:2011", is_m2ts ? "mp2t-simple" : "isoff-live");
 		}
 	} else if (ctx->profile==GF_DASH_PROFILE_ONDEMAND) {
 		if (ctx->use_xlink) {
@@ -947,17 +1579,24 @@
 			strcpy(profiles_string, "urn:mpeg:dash:profile:isoff-on-demand:2011");
 		}
 	} else if (ctx->profile==GF_DASH_PROFILE_MAIN) {
-		sprintf(profiles_string, "urn:mpeg:dash:profile:%s:2011", ctx->m2ts ? "mp2t-main" : "isoff-main");
+		sprintf(profiles_string, "urn:mpeg:dash:profile:%s:2011", is_m2ts ? "mp2t-main" : "isoff-main");
 	} else if (ctx->profile==GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
 		strcpy(profiles_string, "urn:hbbtv:dash:profile:isoff-live:2012");
 	} else if (ctx->profile==GF_DASH_PROFILE_AVC264_LIVE) {
 		strcpy(profiles_string, "urn:mpeg:dash:profile:isoff-live:2011,http://dashif.org/guidelines/dash264");
 	} else if (ctx->profile==GF_DASH_PROFILE_AVC264_ONDEMAND) {
 		strcpy(profiles_string, "urn:mpeg:dash:profile:isoff-on-demand:2011,http://dashif.org/guidelines/dash264");
+	} else if (ctx->profile==GF_DASH_PROFILE_DASHIF_LL) {
+		strcpy(profiles_string, "urn:mpeg:dash:profile:isoff-live:2011,http://www.dashif.org/guidelines/low-latency-live-v5");
 	} else {
 		strcpy(profiles_string, "urn:mpeg:dash:profile:full:2011");
 	}
 
+	if (ctx->cmaf) {
+		const size_t offset = strlen(profiles_string);
+		strncat(profiles_string+offset, ",urn:mpeg:dash:profile:cmaf:2019", GF_MAX_PATH-offset-1);
+	}
+
 	if (ctx->profX) {
 		char profiles_w_ext[GF_MAX_PATH+256];
 		sprintf(profiles_w_ext, "%s,%s", profiles_string, ctx->profX);
@@ -970,11 +1609,11 @@
 
 	if (ctx->use_cenc && !cenc_att) {
 		cenc_att = gf_xml_dom_create_attribute("xmlns:cenc", "urn:mpeg:cenc:2013");
-		gf_list_add(ctx->mpd->attributes, cenc_att);
+		gf_list_add(ctx->mpd->x_attributes, cenc_att);
 	}
 	if (ctx->use_xlink && !xlink_att) {
 		xlink_att = gf_xml_dom_create_attribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
-		gf_list_add(ctx->mpd->attributes, xlink_att);
+		gf_list_add(ctx->mpd->x_attributes, xlink_att);
 	}
 
 	ctx->mpd->time_shift_buffer_depth = 0;
@@ -983,13 +1622,21 @@
 	if (ctx->dmode==GF_MPD_TYPE_DYNAMIC) {
 		ctx->mpd->time_shift_buffer_depth = (u32) -1;
 		if (ctx->tsb>=0) ctx->mpd->time_shift_buffer_depth = (u32) (1000*ctx->tsb);
+		if (ctx->spd>0) ctx->mpd->suggested_presentation_delay = ctx->spd;
 
 		if (ctx->refresh>=0) {
-			ctx->mpd->minimum_update_period = (u32) (1000*(ctx->refresh ? ctx->refresh : ctx->segdur) );
+			if (ctx->refresh) {
+				ctx->mpd->minimum_update_period = (u32) (1000*ctx->refresh);
+			} else {
+				ctx->mpd->minimum_update_period = ctx->segdur.num * 1000;
+				ctx->mpd->minimum_update_period /= ctx->segdur.den;
+			}
 		} else {
 			ctx->mpd->minimum_update_period = 0;
 		}
 	}
+	dasher_check_chaining(ctx, "urn:mpeg:dash:mpd-chaining:2016", ctx->chain);
+	dasher_check_chaining(ctx, "urn:mpeg:dash:fallback:2016", ctx->chain_fbk);
 	return GF_OK;
 }
 static GF_Err dasher_setup_mpd(GF_DasherCtx *ctx)
@@ -1002,12 +1649,13 @@
 	ctx->mpd->locations = gf_list_new();
 	ctx->mpd->program_infos = gf_list_new();
 	ctx->mpd->periods = gf_list_new();
-	ctx->mpd->attributes = gf_list_new();
+	//created by default because we store xmlns in it
+	ctx->mpd->x_attributes = gf_list_new();
 	if (ctx->buf<0) {
 		s32 buf = -ctx->buf;
-		ctx->mpd->min_buffer_time = (u32) ( ctx->segdur*10 * buf ); //*1000 (ms) / 100 (percent)
-	}
-	else ctx->mpd->min_buffer_time = ctx->buf;
+		ctx->mpd->min_buffer_time = (u32) ( ctx->segdur.num * 10 * buf / ctx->segdur.den); //*1000 (ms) / 100 (percent)
+	} else
+		ctx->mpd->min_buffer_time = ctx->buf;
 
 	GF_SAFEALLOC(info, GF_MPD_ProgramInfo);
 	if (info) {
@@ -1039,15 +1687,15 @@
 		if (ctx->lang) info->lang = gf_strdup(ctx->lang);
 	}
 
-	count = ctx->location ? gf_list_count(ctx->location) : 0;
+	count = ctx->location.nb_items;
 	for (i=0; i<count; i++) {
-		char *l = gf_list_get(ctx->location, i);
+		char *l = ctx->location.vals[i];
 		gf_list_add(ctx->mpd->locations, gf_strdup(l));
 	}
-	count = ctx->base ? gf_list_count(ctx->base) : 0;
+	count = ctx->base.nb_items;
 	for (i=0; i<count; i++) {
 		GF_MPD_BaseURL *base;
-		char *b = gf_list_get(ctx->base, i);
+		char *b = ctx->base.vals[i];
 		GF_SAFEALLOC(base, GF_MPD_BaseURL);
 		if (base) {
 			base->URL = gf_strdup(b);
@@ -1057,10 +1705,27 @@
 	return dasher_update_mpd(ctx);
 }
 
+
+GF_Err rfc_6381_get_codec_aac(char *szCodec, u32 codec_id, u8 *dsi, u32 dsi_size, Bool force_sbr);
+GF_Err rfc_6381_get_codec_m4v(char *szCodec, u32 codec_id, u8 *dsi, u32 dsi_size);
+GF_Err rfc_6381_get_codec_avc(char *szCodec, u32 subtype, GF_AVCConfig *avcc);
+GF_Err rfc_6381_get_codec_hevc(char *szCodec, u32 subtype, GF_HEVCConfig *hvcc);
+GF_Err rfc_6381_get_codec_av1(char *szCodec, u32 subtype, GF_AV1Config *av1c, COLR colr);
+GF_Err rfc_6381_get_codec_vpx(char *szCodec, u32 subtype, GF_VPConfig *vpcc, COLR colr);
+GF_Err rfc_6381_get_codec_dolby_vision(char *szCodec, u32 subtype, GF_DOVIDecoderConfigurationRecord *dovi);
+GF_Err rfc_6381_get_codec_vvc(char *szCodec, u32 subtype, GF_VVCConfig *vvcc);
+GF_Err rfc_6381_get_codec_mpegha(char *szCodec, u32 subtype, u8 *dsi, u32 dsi_size, s32 pl);
+GF_Err rfc6381_codec_name_default(char *szCodec, u32 subtype, u32 codec_id);
+
+
 static GF_Err dasher_get_rfc_6381_codec_name(GF_DasherCtx *ctx, GF_DashStream *ds, char *szCodec, Bool force_inband, Bool force_sbr)
 {
-	u32 subtype=0, subtype_src=0, mha_pl=0;
+	u32 subtype=0, subtype_src=0;
+	s32 mha_pl=-1;
 	const GF_PropertyValue *dcd, *dcd_enh, *dovi, *codec;
+	COLR colr;
+
+	memset(&colr, 0, sizeof(colr));
 
 	dcd = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ISOM_SUBTYPE);
 	if (dcd) subtype_src = dcd->value.uint;
@@ -1068,6 +1733,24 @@
 	dcd = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DECODER_CONFIG);
 	dcd_enh = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
 
+	// If colour information is supplied in [the colr] box, and also in the video bitstream, [the] box takes precedence
+	{
+		const GF_PropertyValue *p1 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_COLR_PRIMARIES),
+		 *p2 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_COLR_TRANSFER),
+		 *p3 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_COLR_MX),
+		 *p4 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_COLR_RANGE);
+		if (p1 && p2 && p3 && p4) {
+			colr.override = GF_TRUE;
+			colr.colour_primaries = p1->value.uint;
+			colr.transfer_characteristics = p2->value.uint;
+			colr.matrix_coefficients = p3->value.uint;
+			colr.full_range = p4->value.boolean;
+		} else if (!p1 && !p2 && !p3 && !p4) {
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[ISOM Tools] Incomplete upstream-filter 'colr' information when computing RFC6381. Ignoring.\n"));
+		}
+	}
+
 	if (!force_inband) {
 		force_inband = ds->inband_params;
 	}
@@ -1080,8 +1763,11 @@
 			case GF_ISOM_SUBTYPE_AVC4_H264:
 			case GF_ISOM_SUBTYPE_LHE1:
 			case GF_ISOM_SUBTYPE_HEV1:
+			case GF_ISOM_SUBTYPE_VVI1:
+			case GF_ISOM_SUBTYPE_DVAV:
+			case GF_ISOM_SUBTYPE_DVHE:
 				force_inband = GF_TRUE;
-				ds->inband_params = GF_TRUE;
+				ds->inband_params = 1;
 				break;
 			}
 		}
@@ -1102,19 +1788,30 @@
 
 	dovi = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DOLBY_VISION);
 	if (dovi) {
+		GF_Err e;
 		GF_BitStream *bs = gf_bs_new(dovi->value.data.ptr, dovi->value.data.size, GF_BITSTREAM_READ);
 		GF_DOVIDecoderConfigurationRecord *dvcc = gf_odf_dovi_cfg_read_bs(bs);
 		gf_bs_del(bs);
 		if (!dvcc) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] No config found for Dolby Vision file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[ISOM Tools] No config found for Dolby Vision file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
 			return GF_BAD_PARAM;
 		}
 
-		subtype = GF_ISOM_SUBTYPE_DVHE;
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02u.%02u", gf_4cc_to_str(subtype), dvcc->dv_profile, dvcc->dv_level);
+		switch (ds->codec_id) {
+		case GF_CODECID_HEVC:
+			e = rfc_6381_get_codec_dolby_vision(szCodec, ds->inband_params ? GF_ISOM_SUBTYPE_DVHE : GF_ISOM_SUBTYPE_DVH1, dvcc);
+			break;
+		case GF_CODECID_AVC:
+			e = rfc_6381_get_codec_dolby_vision(szCodec, ds->inband_params ? GF_ISOM_SUBTYPE_DVAV : GF_ISOM_SUBTYPE_DVA1, dvcc);
+			break;
+		case GF_CODECID_AV1:
+			e = rfc_6381_get_codec_dolby_vision(szCodec, GF_ISOM_SUBTYPE_DAV1, dvcc);
+			break;
+		default:
+			e = GF_NOT_SUPPORTED;
+		}
 		gf_odf_dovi_cfg_del(dvcc);
-
-		return GF_OK;
+		return e;
 	}
 
 	switch (ds->codec_id) {
@@ -1122,50 +1819,11 @@
 	case GF_CODECID_AAC_MPEG2_MP:
 	case GF_CODECID_AAC_MPEG2_LCP:
 	case GF_CODECID_AAC_MPEG2_SSRP:
-		if (dcd) {
-			u8 audio_object_type;
-			if (dcd->value.data.size < 2) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[RFC6381-AAC] invalid DSI size %u < 2\n", dcd->value.data.size));
-				return GF_NON_COMPLIANT_BITSTREAM;
-			}
-			/*5 first bits of AAC config*/
-			audio_object_type = (dcd->value.data.ptr[0] & 0xF8) >> 3;
-			if (audio_object_type == 31) { /*escape code*/
-				const u8 audio_object_type_ext = ((dcd->value.data.ptr[0] & 0x07) << 3) + ((dcd->value.data.ptr[1] & 0xE0) >> 5);
-				audio_object_type = 32 + audio_object_type_ext;
-			}
-#ifndef GPAC_DISABLE_AV_PARSERS
-			if (force_sbr && (audio_object_type==2) ) {
-				GF_M4ADecSpecInfo a_cfg;
-				GF_Err e = gf_m4a_get_config(dcd->value.data.ptr, dcd->value.data.size, &a_cfg);
-				if (e==GF_OK) {
-					if (a_cfg.sbr_sr)
-						audio_object_type = a_cfg.sbr_object_type;
-					if (a_cfg.has_ps)
-						audio_object_type = 29;
-				}
-			}
-#endif
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X.%01d", ds->codec_id, audio_object_type);
-			return GF_OK;
-		}
+	case GF_CODECID_USAC:
+		return rfc_6381_get_codec_aac(szCodec, ds->codec_id, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0, force_sbr);
 
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X", ds->codec_id);
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[Dasher] Cannot find AAC config, using default %s\n", szCodec));
-		return GF_OK;
-
-		break;
 	case GF_CODECID_MPEG4_PART2:
-#ifndef GPAC_DISABLE_AV_PARSERS
-		if (dcd) {
-			GF_M4VDecSpecInfo dsi;
-			gf_m4v_get_config(dcd->value.data.ptr, dcd->value.data.size, &dsi);
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X.%01x", ds->codec_id, dsi.VideoPL);
-		} else
-#endif
-		{
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X", ds->codec_id);
-		}
+		return rfc_6381_get_codec_m4v(szCodec, ds->codec_id, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0);
 		break;
 	case GF_CODECID_SVC:
 	case GF_CODECID_MVC:
@@ -1179,18 +1837,18 @@
 				subtype = dcd_enh ? GF_ISOM_SUBTYPE_AVC2_H264 : GF_ISOM_SUBTYPE_AVC_H264;
 			}
 		}
-
 		if (dcd) {
 			GF_AVCConfig *avcc = gf_odf_avc_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
 			if (avcc) {
-				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02X%02X%02X", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
+				GF_Err e = rfc_6381_get_codec_avc(szCodec, subtype, avcc);
 				gf_odf_avc_cfg_del(avcc);
-				return GF_OK;
+				return e;
 			}
 		}
 		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[Dasher] Cannot find AVC config, using default %s\n", szCodec));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Cannot find AVC config, using default %s\n", szCodec));
 		return GF_OK;
+
 #ifndef GPAC_DISABLE_HEVC
 	case GF_CODECID_LHVC:
 		subtype = force_inband ? GF_ISOM_SUBTYPE_LHE1 : GF_ISOM_SUBTYPE_LHV1;
@@ -1222,76 +1880,18 @@
 			}
 		}
 		if (dcd || dcd_enh) {
-			u8 c;
 			GF_HEVCConfig *hvcc = dcd ? gf_odf_hevc_cfg_read(dcd->value.data.ptr, dcd->value.data.size, GF_FALSE) : NULL;
-
-			//TODO - check we do expose hvcC for tiled tracks !
-
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.", gf_4cc_to_str(subtype));
 			if (hvcc) {
-				char szTemp[RFC6381_CODEC_NAME_SIZE_MAX];
-				if (hvcc->profile_space==1) strcat(szCodec, "A");
-				else if (hvcc->profile_space==2) strcat(szCodec, "B");
-				else if (hvcc->profile_space==3) strcat(szCodec, "C");
-				//profile idc encoded as a decimal number
-				sprintf(szTemp, "%d", hvcc->profile_idc);
-				strcat(szCodec, szTemp);
-				//general profile compatibility flags: hexa, bit-reversed
-				{
-					u32 val = hvcc->general_profile_compatibility_flags;
-					u32 i, res = 0;
-					for (i=0; i<32; i++) {
-						res |= val & 1;
-						if (i==31) break;
-						res <<= 1;
-						val >>=1;
-					}
-					sprintf(szTemp, ".%X", res);
-					strcat(szCodec, szTemp);
-				}
-
-				if (hvcc->tier_flag) strcat(szCodec, ".H");
-				else strcat(szCodec, ".L");
-				sprintf(szTemp, "%d", hvcc->level_idc);
-				strcat(szCodec, szTemp);
-
-				c = hvcc->progressive_source_flag << 7;
-				c |= hvcc->interlaced_source_flag << 6;
-				c |= hvcc->non_packed_constraint_flag << 5;
-				c |= hvcc->frame_only_constraint_flag << 4;
-				c |= (hvcc->constraint_indicator_flags >> 40);
-				sprintf(szTemp, ".%X", c);
-				strcat(szCodec, szTemp);
-				if (hvcc->constraint_indicator_flags & 0xFFFFFFFF) {
-					c = (hvcc->constraint_indicator_flags >> 32) & 0xFF;
-					sprintf(szTemp, ".%X", c);
-					strcat(szCodec, szTemp);
-					if (hvcc->constraint_indicator_flags & 0x00FFFFFF) {
-						c = (hvcc->constraint_indicator_flags >> 24) & 0xFF;
-						sprintf(szTemp, ".%X", c);
-						strcat(szCodec, szTemp);
-						if (hvcc->constraint_indicator_flags & 0x0000FFFF) {
-							c = (hvcc->constraint_indicator_flags >> 16) & 0xFF;
-							sprintf(szTemp, ".%X", c);
-							strcat(szCodec, szTemp);
-							if (hvcc->constraint_indicator_flags & 0x000000FF) {
-								c = (hvcc->constraint_indicator_flags >> 8) & 0xFF;
-								sprintf(szTemp, ".%X", c);
-								strcat(szCodec, szTemp);
-								c = (hvcc->constraint_indicator_flags ) & 0xFF;
-								sprintf(szTemp, ".%X", c);
-								strcat(szCodec, szTemp);
-							}
-						}
-					}
-				}
+				GF_Err e = rfc_6381_get_codec_hevc(szCodec, subtype, hvcc);
 				gf_odf_hevc_cfg_del(hvcc);
+				return e;
 			}
-			return GF_OK;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] HEVC config not compliant !\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 
 		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[Dasher] Cannot find HEVC config, using default %s\n", szCodec));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Cannot find HEVC config, using default %s\n", szCodec));
 		return GF_OK;
 #endif
 
@@ -1301,63 +1901,20 @@
 
 		if (dcd) {
 			GF_AV1Config *av1c = gf_odf_av1_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
-
-			if (!av1c) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] Error loading config for AV1 file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
-			} else {
-#ifndef GPAC_DISABLE_AV_PARSERS
-				GF_Err e;
-				u32 i = 0;
-				AV1State av1_state;
-				gf_av1_init_state(&av1_state);
-				av1_state.config = av1c;
-
-				for (i = 0; i < gf_list_count(av1c->obu_array); ++i) {
-					GF_BitStream *bs;
-					GF_AV1_OBUArrayEntry *a = gf_list_get(av1c->obu_array, i);
-					bs = gf_bs_new(a->obu, a->obu_length, GF_BITSTREAM_READ);
-					if (!av1_is_obu_header(a->obu_type))
-						GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOM Tools] AV1: unexpected obu_type %d when computing RFC6381. PArsing anyway.\n", a->obu_type, gf_4cc_to_str(subtype)));
-
-					e = aom_av1_parse_temporal_unit_from_section5(bs, &av1_state);
-					gf_bs_del(bs);
-					bs = NULL;
-					if (e) {
-						gf_odf_av1_cfg_del(av1c);
-						return e;
-					}
-				}
-
-				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%01u.%u%c.%u.%01u.%01u%01u%01u", gf_4cc_to_str(subtype),
-					av1_state.config->seq_profile, av1_state.config->seq_level_idx_0, av1_state.config->seq_tier_0 ? 'H' : 'M',
-					av1_state.bit_depth, av1_state.config->monochrome,
-					av1_state.config->chroma_subsampling_x, av1_state.config->chroma_subsampling_y,
-					av1_state.config->chroma_subsampling_x && av1_state.config->chroma_subsampling_y ? av1_state.config->chroma_sample_position : 0);
-
-				if (av1_state.color_description_present_flag) {
-					char tmp[RFC6381_CODEC_NAME_SIZE_MAX];
-					snprintf(tmp, RFC6381_CODEC_NAME_SIZE_MAX, "%01u.%01u.%01u.%01u", av1_state.color_primaries, av1_state.transfer_characteristics, av1_state.matrix_coefficients, av1_state.color_range);
-					strcat(szCodec, tmp);
-				} else {
-					if ((av1_state.color_primaries == 2) && (av1_state.transfer_characteristics == 2) && (av1_state.matrix_coefficients == 2) && av1_state.color_range == GF_FALSE) {
-
-					} else {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[AV1] incoherent color characteristics primaries %d transfer %d matrix %d color range %d\n", av1_state.color_primaries, av1_state.transfer_characteristics, av1_state.matrix_coefficients, av1_state.color_range));
-					}
-				}
+			if (av1c) {
+				GF_Err e = rfc_6381_get_codec_av1(szCodec, subtype, av1c, colr);
 				gf_odf_av1_cfg_del(av1c);
-				gf_av1_reset_state(&av1_state, GF_TRUE);
-				return GF_OK;
-#else
-				return GF_NOT_SUPPORTED;
-#endif
+				return e;
 			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHER] AV1 config not conformant\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[Dasher] Cannot find AV1 config, using default %s\n", szCodec));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Cannot find AV1 config, using default %s\n", szCodec));
 		return GF_OK;
 #endif /*GPAC_DISABLE_AV1*/
 
+
 	case GF_CODECID_VP8:
 		if (!subtype) subtype = GF_ISOM_SUBTYPE_VP08;
 	case GF_CODECID_VP9:
@@ -1366,52 +1923,49 @@
 		if (dcd) {
 			GF_VPConfig *vpcc = gf_odf_vp_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
 
-			if (!vpcc) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
-			} else {
-				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02u.%02u.%02u.%02u.%02u.%02u.%02u.%02u", gf_4cc_to_str(subtype),
-					vpcc->profile,
-					vpcc->level,
-					vpcc->bit_depth,
-					vpcc->chroma_subsampling,
-					vpcc->colour_primaries,
-					vpcc->transfer_characteristics,
-					vpcc->matrix_coefficients,
-					vpcc->video_fullRange_flag);
-
+			if (vpcc) {
+				GF_Err e = rfc_6381_get_codec_vpx(szCodec, subtype, vpcc, colr);
 				gf_odf_vp_cfg_del(vpcc);
-				return GF_OK;
+				return e;
 			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[Dasher] No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[Dasher] Cannot find VPX config, using default %s\n", szCodec));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Cannot find VPX config, using default %s\n", szCodec));
 		return GF_OK;
 
-	case GF_CODECID_MPHA:
-		subtype = subtype_src ? subtype_src : GF_ISOM_SUBTYPE_MH3D_MHA1;
-
-		if (!dcd || (dcd->value.data.size<2) ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[Dasher] Cannot find MPEG-H Audio Config, defaulting to profile 0x01\n"));
-			mha_pl = 1;
-		} else {
-			mha_pl = dcd->value.data.ptr[1];
-		}
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.0x%02X", gf_4cc_to_str(subtype), mha_pl);
-		return GF_OK;
 	case GF_CODECID_MHAS:
 		subtype = subtype_src ? subtype_src : GF_ISOM_SUBTYPE_MH3D_MHM1;
-		if (dcd && (dcd->value.data.size>2)) {
-			mha_pl = dcd->value.data.ptr[1];
-		} else {
+		if (!dcd) {
 			const GF_PropertyValue *pl = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_PROFILE_LEVEL);
-			if (pl) {
-				mha_pl = pl->value.uint;
-			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[Dasher] Cannot find MPEG-H Audio Config or audio PL, defaulting to profile 0x01\n"));
-				mha_pl = 1;
+			if (pl) mha_pl = (s32) pl->value.uint;
+		}
+		//fallthrough
+	case GF_CODECID_MPHA:
+		if (!subtype)
+			subtype = subtype_src ? subtype_src : GF_ISOM_SUBTYPE_MH3D_MHA1;
+
+		return rfc_6381_get_codec_mpegha(szCodec, subtype, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0, mha_pl);
+
+	case GF_CODECID_VVC:
+		if (!subtype) {
+			subtype = force_inband ? GF_ISOM_SUBTYPE_VVI1 : GF_ISOM_SUBTYPE_VVC1;
+		}
+		if (dcd) {
+			GF_VVCConfig *vvcc = gf_odf_vvc_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
+
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.", gf_4cc_to_str(subtype));
+			if (vvcc) {
+				GF_Err e = rfc_6381_get_codec_vvc(szCodec, subtype, vvcc);
+				gf_odf_vvc_cfg_del(vvcc);
+				return e;
 			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[Dasher] No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+			return GF_NON_COMPLIANT_BITSTREAM;
 		}
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.0x%02X", gf_4cc_to_str(subtype), mha_pl);
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Cannot find VVC config, using default %s\n", szCodec));
 		return GF_OK;
 
 	default:
@@ -1420,43 +1974,39 @@
 			const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ISOM_SUBTYPE);
 			if (p) subtype = p->value.uint;
 		}
+		if (!subtype && (ds->codec_id==GF_CODECID_RAW)) {
+			if (ds->stream_type==GF_STREAM_VISUAL) {
+				const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_PIXFMT);
+				if (p) subtype = gf_pixel_fmt_to_qt_type(p->value.uint);
+			}
+			else if (ds->stream_type==GF_STREAM_AUDIO) {
+				const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_AUDIO_FORMAT);
+				if (p) subtype = gf_audio_fmt_to_isobmf(p->value.uint);
+			}
+		}
 		if (!subtype) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[Dasher] codec parameters not known, cannot set codec string\n" ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] codec parameters not known, cannot set codec string\n" ));
 			strcpy(szCodec, "unkn");
 			return GF_OK;
 		}
-		if (ds->codec_id<GF_CODECID_LAST_MPEG4_MAPPING) {
-			if (ds->stream_type==GF_STREAM_VISUAL) {
-				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X", ds->codec_id);
-			} else if (ds->stream_type==GF_STREAM_AUDIO) {
-				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X", ds->codec_id);
-			} else {
-				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4s.%02X", ds->codec_id);
-			}
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[Dasher] codec parameters not known - setting codecs string to default value \"%s\"\n", gf_4cc_to_str(subtype) ));
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		}
+
+		return rfc6381_codec_name_default(szCodec, subtype, ds->codec_id);
 	}
 	return GF_OK;
 }
 
-static u32 dasher_get_dep_bitrate(GF_DasherCtx *ctx, GF_DashStream *ds)
-{
-	u32 bitrate = ds->bitrate;
-	if (ds->dep_id) {
-		u32 i, count = gf_list_count(ctx->current_period->streams);
-		for (i=0; i<count; i++) {
-			GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, i);
-			if (a_ds == ds) continue;
-
-			if (gf_list_find(a_ds->complementary_streams, ds)>=0) {
 
-				bitrate += dasher_get_dep_bitrate(ctx, a_ds);
-			}
-		}
+static GF_DashStream *get_base_ds(GF_DasherCtx *ctx, GF_DashStream *for_ds)
+{
+	u32 i, count;
+	if (!for_ds->dep_id) return NULL;
+	count = gf_list_count(ctx->pids);
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->pids, i);
+		if (ds->id == for_ds->dep_id)
+			return ds;
 	}
-	return bitrate;
+	return NULL;
 }
 
 static void get_canon_urn(bin128 URN, char *res)
@@ -1532,15 +2082,17 @@
 		p = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
 		if (p) prot_scheme = p->value.uint;
 
-		if ((prot_scheme==GF_ISOM_CENC_SCHEME) || (prot_scheme==GF_ISOM_CBC_SCHEME) || (prot_scheme==GF_ISOM_CENS_SCHEME) || (prot_scheme==GF_ISOM_CBCS_SCHEME)) {
+		if ((prot_scheme==GF_ISOM_CENC_SCHEME) || (prot_scheme==GF_ISOM_CBC_SCHEME) || (prot_scheme==GF_ISOM_CENS_SCHEME) || (prot_scheme==GF_ISOM_CBCS_SCHEME)
+		) {
+			const GF_PropertyValue *ki;
 			u32 j, nb_pssh;
 			GF_XMLAttribute *att;
 			char szVal[GF_MAX_PATH];
 
 			ctx->use_cenc = GF_TRUE;
 
-			p = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_KID);
-			if (!p) {
+			ki = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_CENC_KEY_INFO);
+			if (!ki || !ki->value.data.ptr) {
 				continue;
 			}
 
@@ -1548,11 +2100,10 @@
 			desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:mp4protection:2011", gf_4cc_to_str(prot_scheme));
 			gf_list_add(res, desc);
 
-
-			get_canon_urn(p->value.data.ptr, sCan);
+			get_canon_urn(ki->value.data.ptr + 4, sCan);
 			att = gf_xml_dom_create_attribute("cenc:default_KID", sCan);
-			if (!desc->attributes) desc->attributes = gf_list_new();
-			gf_list_add(desc->attributes, att);
+			if (!desc->x_attributes) desc->x_attributes = gf_list_new();
+			gf_list_add(desc->x_attributes, att);
 
 			if (ctx->pssh <= GF_DASH_PSSH_MOOF) {
 				continue;
@@ -1581,8 +2132,7 @@
 				gf_bs_read_data(bs_r, sysID, 16);
 				version = gf_bs_read_u32(bs_r);
 
-				k_count = gf_bs_read_u32(bs_r);
-				if (k_count) version = 1;
+				k_count = version ? gf_bs_read_u32(bs_r) : 0;
 				gf_bs_write_u8(bs_w, version);
 				gf_bs_write_u24(bs_w, 0);
 				gf_bs_write_data(bs_w, sysID, 16);
@@ -1608,7 +2158,7 @@
 
 				get_canon_urn(sysID, sCan);
 				desc = gf_mpd_descriptor_new(NULL, NULL, NULL);
-				desc->children = gf_list_new();
+				desc->x_children = gf_list_new();
 				sprintf(szVal, "urn:uuid:%s", sCan);
 				desc->scheme_id_uri = gf_strdup(szVal);
 				desc->value = gf_strdup(get_drm_kms_name(sCan));
@@ -1620,7 +2170,7 @@
 					node->type = GF_XML_NODE_TYPE;
 					node->name = gf_strdup("cenc:pssh");
 					node->content = gf_list_new();
-					gf_list_add(desc->children, node);
+					gf_list_add(desc->x_children, node);
 
 					GF_SAFEALLOC(pnode, GF_XMLNode);
 					if (pnode) {
@@ -1638,7 +2188,9 @@
 				gf_free(pssh_data);
 			}
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Protection scheme %s has no official DASH mapping, using URI \"urn:gpac:dash:mp4protection:2018\"\n", gf_4cc_to_str(prot_scheme)));
+			if (ctx->do_mpd) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Protection scheme %s has no official DASH mapping, using URI \"urn:gpac:dash:mp4protection:2018\"\n", gf_4cc_to_str(prot_scheme)));
+			}
 			if (!res) res = gf_list_new();
 			desc = gf_mpd_descriptor_new(NULL, "urn:gpac:dash:mp4protection:2018", gf_4cc_to_str(prot_scheme));
 			gf_list_add(res, desc);
@@ -1654,9 +2206,7 @@
 	const char *mux_ext = NULL;
 	const char *cstr;
 
-	if (ctx->m2ts) {
-		subtype = "mp2t";
-	} else if (ctx->muxtype!=DASHER_MUX_AUTO) {
+	if (ctx->muxtype!=DASHER_MUX_AUTO) {
 		switch (ctx->muxtype) {
 		case DASHER_MUX_ISOM: subtype = "mp4"; mux_ext = "mp4"; break;
 		case DASHER_MUX_TS: subtype = "mp2t"; mux_ext = "ts"; break;
@@ -1702,6 +2252,7 @@
 	if (out_ext) *out_ext = mux_ext;
 }
 
+
 static void dasher_update_rep(GF_DasherCtx *ctx, GF_DashStream *ds)
 {
 	char szCodec[RFC6381_CODEC_NAME_SIZE_MAX];
@@ -1733,28 +2284,48 @@
 		if (ds->rep->sar) {
 			ds->rep->sar->num = ds->sar.num;
 			ds->rep->sar->den = ds->sar.den;
-			if (ds->fps.num && ds->fps.den) {
-				if (!ds->rep->framerate) {
-					GF_SAFEALLOC(ds->rep->framerate, GF_MPD_Fractional);
-				}
-				if (ds->rep->framerate) {
-					ds->rep->framerate->num = ds->fps.num;
-					ds->rep->framerate->den = ds->fps.den;
-					gf_media_get_reduced_frame_rate(&ds->rep->framerate->num, &ds->rep->framerate->den);
-				}
+		}
+		if (ds->fps.num && ds->fps.den) {
+			if (!ds->rep->framerate) {
+				GF_SAFEALLOC(ds->rep->framerate, GF_MPD_Fractional);
+			}
+			if (ds->rep->framerate) {
+				ds->rep->framerate->num = ds->fps.num;
+				ds->rep->framerate->den = ds->fps.den;
+				gf_media_get_reduced_frame_rate(&ds->rep->framerate->num, &ds->rep->framerate->den);
 			}
 		}
 	}
 	else if (ds->stream_type==GF_STREAM_AUDIO) {
 		Bool use_cicp = GF_FALSE;
+		Bool use_dolbyx = GF_FALSE;
 		GF_MPD_Descriptor *desc;
 		char value[256];
 		ds->rep->samplerate = ds->sr;
 
 		if (ds->nb_surround || ds->nb_lfe) use_cicp = GF_TRUE;
 		if ((ds->codec_id==GF_CODECID_MHAS) || (ds->codec_id==GF_CODECID_MPHA)) use_cicp = GF_TRUE;
+		if ((ds->codec_id==GF_CODECID_DTS_LBR) || (ds->codec_id==GF_CODECID_DTS_CA) || (ds->codec_id==GF_CODECID_DTS_HD_HR)
+		 || (ds->codec_id==GF_CODECID_DTS_HD_MASTER) || (ds->codec_id==GF_CODECID_DTS_X))
+			use_cicp = GF_TRUE;
+
+		if ((ds->codec_id==GF_CODECID_AC3) || (ds->codec_id==GF_CODECID_EAC3)) {
+			//if regular MPEG-DASH, use CICP, otherwise use Dolby signaling
+			if (ctx->profile > GF_DASH_PROFILE_FULL) {
+				use_dolbyx = GF_TRUE;
+			}
+		}
+		if (use_dolbyx) {
+			u32 cicp_layout = 0;
+			if (ds->ch_layout)
+				cicp_layout = gf_audio_fmt_get_cicp_from_layout(ds->ch_layout);
+			if (!cicp_layout)
+				cicp_layout = gf_audio_fmt_get_cicp_layout(ds->nb_ch, ds->nb_surround, ds->nb_lfe);
 
-		if (!use_cicp) {
+			sprintf(value, "%X", gf_audio_fmt_get_dolby_chanmap(cicp_layout) );
+			desc = gf_mpd_descriptor_new(NULL, "tag:dolby.com,2014:dash:audio_channel_configuration:2011", value);
+		}
+		else if (!use_cicp) {
 			sprintf(value, "%d", ds->nb_ch);
 			desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:23003:3:audio_channel_configuration:2011", value);
 		} else {
@@ -1768,11 +2339,10 @@
 	} else {
 	}
 
-	dasher_get_rfc_6381_codec_name(ctx, ds, szCodec, (ctx->bs_switch==DASHER_BS_SWITCH_INBAND) ? GF_TRUE : GF_FALSE, GF_TRUE);
+	dasher_get_rfc_6381_codec_name(ctx, ds, szCodec, ((ctx->bs_switch==DASHER_BS_SWITCH_INBAND) || (ctx->bs_switch==DASHER_BS_SWITCH_INBAND_PPS)) ? GF_TRUE : GF_FALSE, GF_TRUE);
 	if (ds->rep->codecs) gf_free(ds->rep->codecs);
 	ds->rep->codecs = gf_strdup(szCodec);
 
-
 	if (ds->interlaced) ds->rep->scan_type = GF_MPD_SCANTYPE_INTERLACED;
 	else {
 		//profiles forcing scanType=progressive for progressive
@@ -1796,11 +2366,22 @@
 	assert(ds->rep==NULL);
 	ds->rep = gf_mpd_representation_new();
 	ds->rep->playback.udta = ds;
+	if (ds->tci)
+		ds->rep->crypto_type = 1;
+	else
+		ds->rep->crypto_type = ds->is_encrypted ? 2 : 0;
 
 	dasher_update_rep(ctx, ds);
 
 	p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_AS_ID);
-	ds->as_id = p ? p->value.uint : 0;
+	//do not reset as id in case of period continuity
+	if (p) {
+		if (ds->as_id != p->value.uint) {
+			if (ds->period_continuity_id) gf_free(ds->period_continuity_id);
+			ds->period_continuity_id = NULL;
+		}
+		ds->as_id = p->value.uint;
+	}
 
 	p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_REP_ID);
 	if (p) {
@@ -1821,11 +2402,22 @@
 		ds->rep_id = gf_strdup(szRepID);
 	}
 	ds->rep->id = gf_strdup(ds->rep_id);
+
+	p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_HLS_EXT_MASTER);
+	if (p) {
+		ds->rep->nb_hls_master_tags = p->value.string_list.nb_items;
+		ds->rep->hls_master_tags = (const char **) p->value.string_list.vals;
+	}
+	p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_HLS_EXT_VARIANT);
+	if (p) {
+		ds->rep->nb_hls_variant_tags = p->value.string_list.nb_items;
+		ds->rep->hls_variant_tags = (const char **) p->value.string_list.vals;
+	}
 }
 
 static Bool dasher_same_roles(GF_DashStream *ds1, GF_DashStream *ds2)
 {
-	GF_List *list;
+	const GF_PropStringList *slist;
 	if (ds1->p_role && ds2->p_role) {
 		if (gf_props_equal(ds1->p_role, ds2->p_role)) return GF_TRUE;
 	}
@@ -1833,17 +2425,37 @@
 		return GF_TRUE;
 
 	//special case, if one is set and the other is not, compare with "main" role
-	list = ds2->p_role ? ds2->p_role->value.string_list : ds1->p_role->value.string_list;
-	if (gf_list_count(list)==1) {
-		char *s = gf_list_get(list, 0);
-		if (!strcmp(s, "main")) return GF_TRUE;
+	slist = ds2->p_role ? &ds2->p_role->value.string_list : &ds1->p_role->value.string_list;
+	if (slist->nb_items==1) {
+		if (!strcmp(slist->vals[0], "main")) return GF_TRUE;
 	}
 	return GF_FALSE;
 }
 
+static u32 dasher_get_next_as_id(GF_DasherCtx *ctx)
+{
+	u32 check_id = 1;
+	u32 i, count = gf_list_count(ctx->current_period->streams);
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		if (ds->as_id == check_id) {
+			check_id++;
+			i = -1;
+			continue;
+		}
+	}
+	return check_id;
+}
+
 static Bool dasher_same_adaptation_set(GF_DasherCtx *ctx, GF_DashStream *ds, GF_DashStream *ds_test)
 {
 	const char *lang1, *lang2;
+	const GF_PropertyValue *p1, *p2;
+
+	//in all forward mode we don't rewrite the manifest, make each source file a single as
+	if (ctx->forward_mode==DASHER_FWD_ALL)
+		return GF_FALSE;
+		
 	//muxed representations
 	if (ds_test->muxed_base) {
 		if (ds_test->muxed_base == ds)
@@ -1859,6 +2471,20 @@
 	//not the same roles
 	if (!dasher_same_roles(ds, ds_test)) return GF_FALSE;
 
+	//intra-only trick mode belongs to a separate AS
+	if ((ds->stream_type == GF_STREAM_VISUAL) && (ds->sync_points_type != ds_test->sync_points_type)) {
+		//assign trickmode as id for dashif
+		if (ds_test->sync_points_type == DASHER_SYNC_NONE) {
+			if (!ds->as_id) ds->as_id = dasher_get_next_as_id(ctx);
+			ds_test->sync_as_id = ds->as_id;
+		}
+		else if (ds->sync_points_type == DASHER_SYNC_NONE) {
+			if (!ds_test->as_id) ds_test->as_id = dasher_get_next_as_id(ctx);
+			ds->sync_as_id = ds_test->as_id;
+		}
+		return GF_FALSE;
+	}
+
 	/* if two inputs don't have the same (number and value) as_desc they don't belong to the same AdaptationSet
 	 (use c_as_desc for AdaptationSet descriptors common to all inputs in an AS) */
 	if (!ds->p_as_desc && ds_test->p_as_desc)
@@ -1874,9 +2500,16 @@
 
 	//need same dash duration if aligned
 	if (ctx->align) {
-		if (ds->dash_dur != ds_test->dash_dur) return GF_FALSE;
+		if ((u64) ds->dash_dur.num * ds_test->dash_dur.den != (u64) ds_test->dash_dur.num * ds->dash_dur.den) return GF_FALSE;
 	}
 
+	//if one of the pid is marked with period resume and the other is not, one is a spliced media the other no
+	//cf flist filter
+	p1 = gf_filter_pid_get_property_str(ds->ipid, "period_resume");
+	p2 = gf_filter_pid_get_property_str(ds_test->ipid, "period_resume");
+	if ((!p1 && p2) || (p1 && !p2) || (p1 && gf_props_equal(p1, p2)))
+		return GF_FALSE;
+
 	if (ds->srd.x != ds_test->srd.x) return GF_FALSE;
 	if (ds->srd.y != ds_test->srd.y) return GF_FALSE;
 	if (ds->srd.z != ds_test->srd.z) return GF_FALSE;
@@ -1919,8 +2552,10 @@
 	//ok, we are video or audio with mixed codecs
 	if (ctx->mix_codecs) return GF_TRUE;
 	//we need dependencies, unless SRD case
-	if (ds_test->dep_id && (ds_test->src_id==ds->src_id) && gf_list_find(ds->complementary_streams, ds_test) < 0) {
-		return GF_FALSE;
+	if (!ds_test->srd.z && !ds_test->srd.w) {
+		if (ds_test->dep_id && (ds_test->src_id==ds->src_id) && gf_list_find(ds->complementary_streams, ds_test) < 0) {
+			return GF_FALSE;
+		}
 	}
 	//we should be good
 	return GF_TRUE;
@@ -1932,17 +2567,18 @@
 	GF_List *dst_list;
 	if (!desc_val) return;
 	if (desc_val->type != GF_PROP_STRING_LIST) return;
-	count = gf_list_count(desc_val->value.string_list);
+	count = desc_val->value.string_list.nb_items;
 	if (!count) return;
 	if ( ! (*p_dst_list)) *p_dst_list = gf_list_new();
 	dst_list = *p_dst_list;
 	for (j=0; j<count; j++) {
-		char *desc = gf_list_get(desc_val->value.string_list, j);
+		char *desc = desc_val->value.string_list.vals[j];
 		if (desc[0] == '<') {
-			GF_MPD_other_descriptors *d;
-			GF_SAFEALLOC(d, GF_MPD_other_descriptors);
+			GF_XMLNode *d;
+			GF_SAFEALLOC(d, GF_XMLNode);
 			if (d) {
-				d->xml_desc = gf_strdup(desc);
+				d->type = GF_XML_TEXT_TYPE;
+				d->name = gf_strdup(desc);
 				gf_list_add(dst_list, d);
 			}
 		} else {
@@ -1973,26 +2609,46 @@
 		if (set->max_framerate * ds->fps.den < ds->fps.num) set->max_framerate = (u32) (ds->fps.num / ds->fps.den);
 */
 
+		/*set trick mode*/
+		if (set->intra_only && (ds->stream_type==GF_STREAM_VISUAL)) {
+			char value[256];
+			GF_MPD_Descriptor* desc;
+			sprintf(value, "%d", ds->sync_as_id);
+			desc = gf_mpd_descriptor_new(NULL, "http://dashif.org/guidelines/trickmode", value);
+			gf_list_add(set->essential_properties, desc);
+		}
 		/*set role*/
 		if (ds->p_role) {
 			u32 j, role_count;
-			role_count = gf_list_count(ds->p_role->value.string_list);
+			role_count = ds->p_role->value.string_list.nb_items;
 			for (j=0; j<role_count; j++) {
-				char *role = gf_list_get(ds->p_role->value.string_list, j);
-				GF_MPD_Descriptor *desc;
-				char *uri;
+				char *role = ds->p_role->value.string_list.vals[j];
+				GF_MPD_Descriptor *desc=NULL;
+				char *uri=NULL;
+				//all roles defined by dash 5th edition
 				if (!strcmp(role, "caption") || !strcmp(role, "subtitle") || !strcmp(role, "main")
 			 || !strcmp(role, "alternate") || !strcmp(role, "supplementary") || !strcmp(role, "commentary")
 			 || !strcmp(role, "dub") || !strcmp(role, "description") || !strcmp(role, "sign")
-					 || !strcmp(role, "metadata") || !strcmp(role, "enhanced-audio- intelligibility")
+					 || !strcmp(role, "metadata") || !strcmp(role, "enhanced-audio-intelligibility")
+					 || !strcmp(role, "emergency") || !strcmp(role, "forced-subtitle")
+					 || !strcmp(role, "easyreader") || !strcmp(role, "karaoke")
 				) {
 					uri = "urn:mpeg:dash:role:2011";
 					if (!strcmp(role, "main")) main_role_set = GF_TRUE;
 				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Unrecognized role %s - using GPAC urn for schemaID\n", role));
-					uri = "urn:gpac:dash:role:2013";
+					char *sep = strrchr(role, ':');
+					if (sep) {
+						sep[0] = 0;
+						desc = gf_mpd_descriptor_new(NULL, role, sep+1);
+						sep[0] = ':';
+					} else {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Unrecognized role %s - using GPAC urn for schemaID\n", role));
+						uri = "urn:gpac:dash:role:2013";
+					}
 				}
-				desc = gf_mpd_descriptor_new(NULL, uri, role);
+				if (!desc)
+					desc = gf_mpd_descriptor_new(NULL, uri, role);
+
 				gf_list_add(set->role, desc);
 			}
 		}
@@ -2005,10 +2661,15 @@
 				desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:srd:2014", value);
 				gf_list_add(set->supplemental_properties, desc);
 			} else {
-				if (gf_sys_old_arch_compat()) {
-					sprintf(value, "1,0,0,0,0"); //compat with old arch, don't set W and H
-				} else {
+				if (ds->tile_base) {
 					sprintf(value, "1,0,0,0,0,%d,%d", ds->srd.z, ds->srd.w);
+				} else {
+					const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_SRD_REF);
+					if (p) {
+						sprintf(value, "1,%d,%d,%d,%d,%d,%d", ds->srd.x, ds->srd.y, ds->srd.z, ds->srd.w, p->value.vec2i.x, p->value.vec2i.y);
+					} else {
+						sprintf(value, "1,%d,%d,%d,%d", ds->srd.x, ds->srd.y, ds->srd.z, ds->srd.w);
+					}
 				}
 				desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:srd:2014", value);
 				gf_list_add(set->essential_properties, desc);
@@ -2048,18 +2709,40 @@
 	}
 }
 
+static void rewrite_dep_ids(GF_DasherCtx *ctx, GF_DashStream *base_ds)
+{
+	u32 i, count = gf_list_count(ctx->pids);
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->pids, i);
+		if (ds->src_id != base_ds->src_id) continue;
+		if (!ds->dep_id || !ds->rep) continue;
+		if (ds->dep_id != base_ds->id) continue;
+
+		ds->tile_dep_id_merged = GF_TRUE;
+		if (ds->rep->dependency_id) gf_free(ds->rep->dependency_id);
+		ds->rep->dependency_id = gf_strdup(base_ds->merged_tile_dep->rep->id);
+	}
+}
+
 static void dasher_check_bitstream_swicthing(GF_DasherCtx *ctx, GF_MPD_AdaptationSet *set)
 {
 	u32 i, j, count;
-	Bool use_inband = (ctx->bs_switch==DASHER_BS_SWITCH_INBAND) ? GF_TRUE : GF_FALSE;
+	Bool use_inband = ((ctx->bs_switch==DASHER_BS_SWITCH_INBAND) || (ctx->bs_switch==DASHER_BS_SWITCH_INBAND_PPS)) ? GF_TRUE : GF_FALSE;
 	Bool use_multi = (ctx->bs_switch==DASHER_BS_SWITCH_MULTI) ? GF_TRUE : GF_FALSE;
 	GF_MPD_Representation *base_rep = gf_list_get(set->representations, 0);
 	GF_DashStream *base_ds;
 
-	if (ctx->m2ts) {
+	switch (ctx->muxtype) {
+	case DASHER_MUX_TS:
+	case DASHER_MUX_OGG:
+	case DASHER_MUX_RAW:
 		set->bitstream_switching = GF_TRUE;
 		return;
+	//other formats use an init segment
+	default:
+		break;
 	}
+
 	if (ctx->bs_switch==DASHER_BS_SWITCH_OFF) return;
 	if (!base_rep) return;
 	base_ds = base_rep->playback.udta;
@@ -2067,8 +2750,12 @@
 	count = gf_list_count(set->representations);
 	if (count==1) {
 		if (ctx->bs_switch==DASHER_BS_SWITCH_FORCE) set->bitstream_switching=GF_TRUE;
-		else if (ctx->bs_switch==DASHER_BS_SWITCH_INBAND) {
-			base_ds->inband_params = GF_TRUE;
+		else if (use_inband) {
+			if (base_ds->codec_id==GF_CODECID_VVC) {
+				base_ds->inband_params = (ctx->bs_switch==DASHER_BS_SWITCH_INBAND_PPS) ? 2 : 1;
+			} else {
+				base_ds->inband_params = 1;
+			}
 		}
 		return;
 	}
@@ -2080,8 +2767,17 @@
 		if (ds->codec_id == base_ds->codec_id) {
 			//we will use inband params, so bs switching is OK
 			if (use_inband || use_multi) continue;
-			//we have deps, cannot use bitstream switching
-			if (ds->dep_id) return;
+			//we have deps, cannot use bitstream switching except for merged tile base
+			if (ds->dep_id) {
+				if (ds->codec_id==GF_CODECID_HEVC_TILES) {
+					u32 id;
+					GF_DashStream *tile_base = get_base_ds(ctx, ds);
+					if (!tile_base) return;
+					id = tile_base->merged_tile_dep ? tile_base->merged_tile_dep->id : tile_base->id;
+					if (base_ds->dep_id==id) continue;
+				}
+				return;
+			}
 			//we consider we can switch in non-inband only if we have same CRC for the decoder config
 			if (base_ds->dsi_crc == ds->dsi_crc) continue;
 			//not the same config, no BS switching
@@ -2096,6 +2792,20 @@
 	for (i=0; i<count; i++) {
 		GF_MPD_Representation *rep = gf_list_get(set->representations, i);
 		GF_DashStream *ds = rep->playback.udta;
+		if (base_ds->tile_base && ds->tile_base && (base_ds != ds) ) {
+			ds->merged_tile_dep = base_ds;
+			if (ds->rep) {
+				gf_list_rem(set->representations, i);
+				i--;
+				count--;
+				gf_mpd_representation_free(ds->rep);
+				ds->rep = NULL;
+				//switch dependencyID of all reps depending on this one to the new base
+				rewrite_dep_ids(ctx, ds);
+				//and ignore this rep while flushing segments
+				base_ds->nb_rep--;
+			}
+		}
 		for (j=i+1; j<count; j++) {
 			GF_DashStream *a_ds;
 			rep = gf_list_get(set->representations, j);
@@ -2107,6 +2817,8 @@
 	}
 }
 
+GF_Err gf_cryptfout_push_key(GF_Filter *filter, bin128 *key, bin128 *IV);
+
 static void dasher_open_destination(GF_Filter *filter, GF_DasherCtx *ctx, GF_MPD_Representation *rep, const char *szInitURL, Bool trash_init)
 {
 	GF_Err e;
@@ -2114,18 +2826,21 @@
 	Bool has_subs=GF_FALSE;
 	Bool has_strun=GF_FALSE;
 	Bool has_vodcache=GF_FALSE;
+	Bool has_cmaf=GF_FALSE;
 	char sep_args = gf_filter_get_sep(filter, GF_FS_SEP_ARGS);
 	char sep_name = gf_filter_get_sep(filter, GF_FS_SEP_NAME);
 	const char *dst_args, *trailer_args=NULL;
 	char *szDST = NULL;
 	char szSRC[100];
 
-	if (ctx->sigfrag)
+	if (ctx->sigfrag || ctx->gencues)
 		return;
 
 	GF_DashStream *ds = rep->playback.udta;
 	if (ds->muxed_base) return;
 
+
+	ctx->check_connections = GF_TRUE;
 	gf_dynstrcat(&szDST, szInitURL, NULL);
 	if (ctx->out_path) {
 		char *rel = NULL;
@@ -2143,6 +2858,13 @@
 			szDST = rel;
 		}
 	}
+	if (ds->tci) {
+		char *tmp = szDST;
+		szDST = NULL;
+		gf_dynstrcat(&szDST, "gcryp://", NULL);
+		gf_dynstrcat(&szDST, tmp, NULL);
+		gf_free(tmp);
+	}
 
 	sprintf(szSRC, "%cgfopt", sep_args);
 	gf_dynstrcat(&szDST, szSRC, NULL);
@@ -2176,30 +2898,40 @@
 
 		sprintf(szKey, "%cvodcache", sep_args);
 		if (strstr(dst_args, szKey)) has_vodcache = GF_TRUE;
+
+		sprintf(szKey, "%ccmaf", sep_args);
+		if (strstr(dst_args, szKey)) has_cmaf = GF_TRUE;
 	}
 
 	if (trash_init) {
-		sprintf(szSRC, "%cnoinit", sep_args);
+		if (ds->rawmux)
+			sprintf(szSRC, "%cnoinitraw", sep_args);
+		else
+			sprintf(szSRC, "%cnoinit", sep_args);
 		gf_dynstrcat(&szDST, szSRC, NULL);
 	}
 	if (!has_frag) {
 		sprintf(szSRC, "%cfrag", sep_args);
 		gf_dynstrcat(&szDST, szSRC, NULL);
 	}
-	if (!has_subs && ctx->sseg) {
-		sprintf(szSRC, "%csubs_sidx%c0", sep_args, sep_name);
-		gf_dynstrcat(&szDST, szSRC, NULL);
-	}
-	if (ctx->cues && !has_strun) {
-		sprintf(szSRC, "%cstrun", sep_args);
-		gf_dynstrcat(&szDST, szSRC, NULL);
-	}
-	if (ctx->styp) {
-		sprintf(szSRC, "%cstyp=%s", sep_args, ctx->styp);
-		gf_dynstrcat(&szDST, szSRC, NULL);
+	if (!ctx->forward_mode) {
+		if (!has_subs && ctx->sseg) {
+			sprintf(szSRC, "%csubs_sidx%c0", sep_args, sep_name);
+			gf_dynstrcat(&szDST, szSRC, NULL);
+		}
+		if (ctx->cues && !has_strun) {
+			sprintf(szSRC, "%cstrun", sep_args);
+			gf_dynstrcat(&szDST, szSRC, NULL);
+		}
+		if (ctx->styp) {
+			sprintf(szSRC, "%cstyp=%s", sep_args, ctx->styp);
+			gf_dynstrcat(&szDST, szSRC, NULL);
+		}
 	}
+
 	//override xps inband declaration in args
-	sprintf(szSRC, "%cxps_inband%c%s", sep_args, sep_name, ds->inband_params ? "all" : "no");
+	sprintf(szSRC, "%cxps_inband%c%s", sep_args, sep_name,
+		(ds->inband_params==2) ? "pps" : (ds->inband_params ? "all" : "no") );
 	gf_dynstrcat(&szDST, szSRC, NULL);
 
 	if (ctx->no_fragments_defaults) {
@@ -2223,12 +2955,16 @@
 	//patch for old arch: make sure we don't have any extra free box before the sidx
 	//we could also use vodcache=insert but this might break http outputs
 	if (gf_sys_old_arch_compat() && !has_vodcache && ctx->sseg) {
-		sprintf(szSRC, "%cvodcache=on", sep_args );
+		sprintf(szSRC, "%cvodcache%con", sep_args, sep_name );
 		if (!strstr(szDST, szSRC))
 			gf_dynstrcat(&szDST, szSRC, NULL);
 	}
-	sprintf(szSRC, "%cmime=%s", sep_args, rep->mime_type);
-	gf_dynstrcat(&szDST, szSRC, NULL);
+
+	//we don't append mime in case of raw streams, raw format (writegen doesn't use mime types for raw media, only file ext)
+	if (!ds->rawmux && ((ctx->muxtype!=DASHER_MUX_RAW) || (ds->codec_id != GF_CODECID_RAW)) ) {
+		sprintf(szSRC, "%cmime%c%s", sep_args, sep_name, rep->mime_type);
+		gf_dynstrcat(&szDST, szSRC, NULL);
+	}
 
 	if (ds->moof_sn>1) {
 		sprintf(szSRC, "%cmsn%c%d", sep_args, sep_name, ds->moof_sn);
@@ -2242,6 +2978,13 @@
 		sprintf(szSRC, "%cmoovts%c-1", sep_args, sep_name);
 		gf_dynstrcat(&szDST, szSRC, NULL);
 	}
+
+	if (!has_cmaf && ctx->cmaf) {
+		sprintf(szSRC, "%ccmaf%c%s", sep_args, sep_name, (ctx->cmaf==DASHER_CMAF_CMF2) ? "cmf2" : "cmfc");
+		gf_dynstrcat(&szDST, szSRC, NULL);
+	}
+
+
 	if (trailer_args)
 		gf_dynstrcat(&szDST, trailer_args, NULL);
 		
@@ -2257,6 +3000,11 @@
 	sprintf(szSRC, "MuxSrc%cdasher_%p", sep_name, ds->dst_filter);
 	gf_filter_reset_source(ds->dst_filter);
 	gf_filter_set_source(ds->dst_filter, filter, szSRC);
+
+	if (ds->tci && !trash_init) {
+		//push NULL key, we are not encrypting the init segment
+		gf_cryptfout_push_key(ds->dst_filter, NULL, NULL);
+	}
 }
 
 static void dasher_gather_deps(GF_DasherCtx *ctx, u32 dependency_id, GF_List *multi_tracks)
@@ -2276,15 +3024,17 @@
 
 static void dasher_update_dep_list(GF_DasherCtx *ctx, GF_DashStream *ds, const char *ref_type)
 {
-	u32 i, j, count;
+	u32 i, j, count, base_id;
 	GF_PropertyValue *p = (GF_PropertyValue *) gf_filter_pid_get_property_str(ds->opid, ref_type);
 	if (!p) return;
+	base_id = ds->dep_id ? ds->dep_id : ds->id;
 	count = gf_list_count(ctx->current_period->streams);
 	for (i=0; i<p->value.uint_list.nb_items; i++) {
 		for (j=0; j<count; j++) {
 			GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, j);
+			if (a_ds->dep_id != base_id) continue;
 			if ((a_ds->id == p->value.uint_list.vals[i]) && a_ds->pid_id) {
-				p->value.uint_list.vals[j] = a_ds->pid_id;
+				p->value.uint_list.vals[i] = a_ds->pid_id;
 			}
 		}
 	}
@@ -2295,7 +3045,7 @@
 	GF_DashStream *base_ds = ds->muxed_base ? ds->muxed_base : ds;
 	char szSRC[1024];
 
-	if (ctx->sigfrag || ctx->in_error)
+	if (ctx->sigfrag || ctx->in_error || ctx->gencues)
 		return;
 
 	assert(!ds->opid);
@@ -2330,11 +3080,15 @@
 		}
 	}
 
-	if (ctx->sigfrag)
-		return;
-
 	sprintf(szSRC, "dasher_%p", base_ds->dst_filter);
 	ds->opid = gf_filter_pid_new(filter);
+
+#ifdef GPAC_64_BITS
+	ds->hls_ref_id = (u64) ds->opid;
+#else
+	ds->hls_ref_id = (u64) ((u32) ds->opid);
+#endif
+
 	gf_filter_pid_copy_properties(ds->opid, ds->ipid);
 	if (!ds->muxed_base) {
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("*"));
@@ -2346,6 +3100,16 @@
 			ncues++;
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_SEGMENTS, &PROP_UINT(ncues) );
 	}
+	//for route out
+	if (ctx->is_route) {
+		if (ctx->do_m3u8)
+			gf_filter_pid_set_property(ds->opid, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( ds->hls_ref_id ) );
+
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_REP_ID, &PROP_STRING( ds->rep->id ) );
+
+
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC( ds->dash_dur ) );
+	}
 
 	gf_filter_pid_require_source_id(ds->opid);
 
@@ -2353,8 +3117,6 @@
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_CENC_PSSH, NULL);
 	}
 
-	//set init filename
-//	if (ds->init_seg) gf_filter_pid_set_property(ds->opid, GF_PROP_PID_OUTPATH, &PROP_STRING(ds->init_seg));
 
 	//force PID ID
 	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_ID, &PROP_UINT(ds->pid_id) );
@@ -2362,7 +3124,7 @@
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(ds->dep_pid_id) );
 	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_MUX_SRC, &PROP_STRING(szSRC) );
 	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MODE, &PROP_UINT(ctx->sseg ? 2 : 1) );
-	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_DUR, &PROP_DOUBLE(ds->dash_dur) );
+	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC(ds->dash_dur) );
 
 	if (ds->id != ds->pid_id) {
 		dasher_update_dep_list(ctx, ds, "isom:scal");
@@ -2373,6 +3135,18 @@
 	if (ds->force_timescale)
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ds->force_timescale) );
 
+	if (ds->rep && ds->rep->segment_template)
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_TEMPLATE, &PROP_STRING(ds->rep->segment_template->media));
+	else if (ds->set && ds->set->segment_template)
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_TEMPLATE, &PROP_STRING(ds->set->segment_template->media));
+
+	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_BITRATE, &PROP_UINT(ds->bitrate));
+	gf_filter_pid_set_property(ds->opid, GF_PROP_PCK_FILENAME, &PROP_STRING(ds->init_seg));
+
+	if (ds->rep && ds->rep->codecs)
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_CODEC, &PROP_STRING(ds->rep->codecs));
+
+
 	if (multi_pids) {
 		s32 idx = 1+gf_list_find(multi_pids, ds->ipid);
 		assert(idx>0);
@@ -2394,7 +3168,7 @@
 		}
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MULTI_TRACK, &PROP_POINTER(ds->multi_tracks) );
 	}
-	if (ds->dep_id) {
+	if (ds->dep_id && !init_trashed) {
 		if (!ds->multi_tracks) ds->multi_tracks = gf_list_new();
 		gf_list_reset(ds->multi_tracks);
 		dasher_gather_deps(ctx, ds->dep_id, ds->multi_tracks);
@@ -2404,7 +3178,16 @@
 			gf_list_del(ds->multi_tracks);
 			ds->multi_tracks = NULL;
 		}
+	}
 
+	if (ctx->llhls) {
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_LLHLS, &PROP_UINT(ctx->llhls) );
+	}
+
+	if (ctx->tsb>=0) {
+		u32 tsb_seg = ds->dash_dur.num ? ((u32) (ctx->tsb * ds->dash_dur.den / ds->dash_dur.num)) : 0;
+		tsb_seg++;
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_TIMESHIFT_SEGS, &PROP_UINT(tsb_seg) );
 	}
 }
 
@@ -2450,6 +3233,30 @@
 	gf_list_add(base_ds->set->content_component, component);
 }
 
+typedef struct
+{
+	//this is not the template string, this is the resolved segment name for first segment, startNumber=0 and time=0
+	char *tpl;
+	u32 nb_reused;
+} DashTemplateRecord;
+
+static u32 dasher_check_template_reuse(GF_DasherCtx *ctx, const char *tpl)
+{
+	DashTemplateRecord *tr;
+	u32 i, count = gf_list_count(ctx->tpl_records);
+	for (i=0; i<count; i++) {
+		tr = gf_list_get(ctx->tpl_records, i);
+		if (!strcmp(tr->tpl, tpl)) {
+			tr->nb_reused++;
+			return tr->nb_reused;
+		}
+	}
+	GF_SAFEALLOC(tr, DashTemplateRecord)
+	tr->tpl = gf_strdup(tpl);
+	gf_list_add(ctx->tpl_records, tr);
+	return 0;
+}
+
 static void dasher_setup_sources(GF_Filter *filter, GF_DasherCtx *ctx, GF_MPD_AdaptationSet *set)
 {
 	char szDASHTemplate[GF_MAX_PATH];
@@ -2466,10 +3273,11 @@
 	GF_List *multi_pids = NULL;
 	u32 set_timescale = 0;
 	Bool init_template_done=GF_FALSE;
-	Bool use_inband = (ctx->bs_switch==DASHER_BS_SWITCH_INBAND) ? GF_TRUE : GF_FALSE;
+	Bool use_inband = ((ctx->bs_switch==DASHER_BS_SWITCH_INBAND) || (ctx->bs_switch==DASHER_BS_SWITCH_INBAND_PPS)) ? GF_TRUE : GF_FALSE;
 	Bool template_use_source = GF_FALSE;
 	Bool split_rep_names = GF_FALSE;
 	Bool split_set_names = GF_FALSE;
+	u32 force_ds_id;
 	GF_DashStream *ds;
 	GF_MPD_Representation *rep = gf_list_get(set->representations, 0);
 	if (!rep) {
@@ -2546,11 +3354,17 @@
 	set->lang = gf_strdup(ds->lang ? ds->lang : "und");
 
 	//check all streams in active period not in this set
+	force_ds_id = ds->id;
 	nb_streams = gf_list_count(ctx->current_period->streams);
 	for (i=0; i<nb_streams; i++) {
 		char *frag_uri;
 		u32 len1, len2;
 		GF_DashStream *ads = gf_list_get(ctx->current_period->streams, i);
+
+		if (force_ds_id && (ads != ds) && (ads->id == ds->id)) {
+			force_ds_id = 0;
+		}
+
 		if (ads->set == set) continue;
 		frag_uri = strrchr(ds->src_url, '#');
 		if (frag_uri) len1 = (u32) (frag_uri-1 - ds->src_url);
@@ -2565,10 +3379,6 @@
 		}
 	}
 
-	if (split_set_names) {
-		sprintf(szSetFileSuffix, "_track%d_", ds->id);
-	}
-
 	if (ctx->timescale>0) {
 		set_timescale = ctx->timescale;
 	} else {
@@ -2611,27 +3421,50 @@
 
 			p1 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_FILEPATH);
 			p2 = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_FILEPATH);
-			if (gf_props_equal(p1, p2)) split_rep_names = GF_TRUE;
+			if (p1 && p2 && gf_props_equal(p1, p2)) split_rep_names = GF_TRUE;
+			else if (!p1 && !p2) split_rep_names = GF_TRUE;
 			p1 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_URL);
 			p2 = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_URL);
-			if (gf_props_equal(p1, p2)) split_rep_names = GF_TRUE;
+			if (p1 && p2 && gf_props_equal(p1, p2)) split_rep_names = GF_TRUE;
+			else if (!p1 && !p2) split_rep_names = GF_TRUE;
 
 			if (split_rep_names) break;
 		}
 		if (split_rep_names) break;
 	}
 
+	if (split_set_names) {
+		if (!force_ds_id) {
+			if (split_rep_names || !ds->split_set_names)
+				force_ds_id = ds->id;
+			else
+				force_ds_id = gf_list_find(ctx->pids, ds) + 1;
+		}
+		sprintf(szSetFileSuffix, "_track%d_", force_ds_id);
+	}
+
 	//assign PID IDs - we assume only one component of a given media type per adaptation set
 	//and assign the same PID ID for each component of the same type
 	//we could refine this using roles, but most HAS solutions don't use roles at the mulitplexed level
 	for (i=0; i<count; i++) {
+		Bool is_bs_switching;
 		rep = gf_list_get(set->representations, i);
 		ds = rep->playback.udta;
 		if (ds->pid_id) continue;
 		//in bitstream switching mode, ensure each track in the set has the same ID
-		if (set->bitstream_switching) {
+		//except when tile merge is used
+		is_bs_switching = ds->tile_dep_id_merged ? GF_FALSE : set->bitstream_switching;
+		if (is_bs_switching) {
 			ctx->next_pid_id_in_period++;
-			ds->pid_id = ctx->next_pid_id_in_period;
+			//except for base tile track where we force using input PID ID
+			//to avoid messing up sabt/tbas references
+			if (ds->tile_base) {
+				ds->pid_id = ds->id;
+				if (ctx->next_pid_id_in_period <= ds->pid_id)
+					ctx->next_pid_id_in_period = ds->pid_id;
+			} else {
+				ds->pid_id = ctx->next_pid_id_in_period;
+			}
 
 			for (j=i+1; j<count; j++) {
 				GF_DashStream *a_ds;
@@ -2685,9 +3518,15 @@
 		GF_Err e;
 		char szRawExt[20];
 		Bool use_dash_suffix = GF_FALSE;
-		const char *seg_ext, *init_ext, *idx_ext;
+		Bool is_source_template = GF_FALSE;
+		const char *seg_ext, *init_ext, *idx_ext, *force_init_seg_tpl;
+#if 0
+		GF_MPD_URL *force_init_seg_sl;
+#endif
 		Bool skip_init = GF_FALSE;
+		GF_DashStream *tile_base_ds = NULL;
 		Bool is_bs_switch;
+		u32 reused_template_idx;
 		u32 init_template_mode = GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE;
 		rep = gf_list_get(set->representations, i);
 		ds = rep->playback.udta;
@@ -2700,13 +3539,16 @@
 			count--;
 			assert(ds_set->nb_rep);
 			ds_set->nb_rep--;
-			assert(ds->muxed_base->dst_filter);
+			assert(ctx->sigfrag || ds->muxed_base->dst_filter);
 			gf_list_transfer(ds->muxed_base->rep->audio_channels, rep->audio_channels);
 			gf_list_transfer(ds->muxed_base->rep->base_URLs, rep->base_URLs);
 			gf_list_transfer(ds->muxed_base->rep->content_protection , rep->content_protection);
 			gf_list_transfer(ds->muxed_base->rep->essential_properties , rep->essential_properties);
 			gf_list_transfer(ds->muxed_base->rep->frame_packing , rep->frame_packing);
-			gf_list_transfer(ds->muxed_base->rep->other_descriptors , rep->other_descriptors);
+			if (rep->x_children) {
+				if (!ds->muxed_base->rep->x_children) ds->muxed_base->rep->x_children = gf_list_new();
+				gf_list_transfer(ds->muxed_base->rep->x_children, rep->x_children);
+			}
 			gf_list_transfer(ds->muxed_base->rep->supplemental_properties , rep->supplemental_properties);
 
 			gf_mpd_representation_free(ds->rep);
@@ -2721,20 +3563,38 @@
 			dasher_open_pid(filter, ctx, ds, NULL, GF_FALSE);
 			continue;
 		}
-		if (ds->template) strcpy(szTemplate, ds->template);
-		else strcpy(szTemplate, ctx->template ? ctx->template : "");
+		if (ds->template) {
+			strcpy(szTemplate, ds->template);
+			if (ctx->sigfrag) {
+				const GF_PropertyValue *p = gf_filter_pid_get_property_str(ds->ipid, "source_template");
+				if (p && p->value.boolean)
+					is_source_template = GF_TRUE;
+			}
+		} else {
+			strcpy(szTemplate, ctx->template ? ctx->template : "");
+		}
 
-		if (use_inband)
-			ds->inband_params = GF_TRUE;
+		if (use_inband) {
+			ds->inband_params = 1;
+			if ((ds->codec_id==GF_CODECID_VVC) && (ctx->bs_switch==DASHER_BS_SWITCH_INBAND_PPS))
+				ds->inband_params = 2;
+		}
 
 		//if bitstream switching and templating, only set for the first one
-		if (i && set->bitstream_switching && ctx->stl && single_template) continue;
+		if (i && set->bitstream_switching && ds->stl && single_template) continue;
 
 		if (!set_timescale) set_timescale = ds->timescale;
 
 		if (ctx->timescale<0) ds->mpd_timescale = ds->timescale;
 		else ds->mpd_timescale = set_timescale;
 
+		if (ctx->sigfrag && gf_filter_pid_get_property_str(ds->ipid, "source_template")) {
+			const GF_PropertyValue *p = gf_filter_pid_get_property_str(ds->ipid, "stl_timescale");
+			if (p && p->value.uint) {
+				ds->mpd_timescale = p->value.uint;
+			}
+		}
+
 		if (ds->nb_repeat && !ctx->loop) {
 			if (split_set_names) {
 				sprintf(szDASHSuffix, "%sp%d_", szSetFileSuffix, ds->nb_repeat+1);
@@ -2746,6 +3606,11 @@
 			strcpy(szDASHSuffix, szSetFileSuffix);
 			use_dash_suffix = GF_TRUE;
 		}
+		//we need dash suffix in template, but the template may be user-provided without dash suffix. If so add it
+		//we don't add suffic if we have $RepresentationID or $Path set, we assume the user knows what he's doing
+		if (use_dash_suffix && !strstr(szTemplate, "$FS$") && !strstr(szTemplate, "$RepresentationID$") && !strstr(szTemplate, "$Path=")) {
+			strcat(szTemplate, "$FS$");
+		}
 
 		//resolve segment template
 		e = gf_filter_pid_resolve_file_template(ds->ipid, szTemplate, szDASHTemplate, 0, use_dash_suffix ? szDASHSuffix : NULL);
@@ -2755,6 +3620,8 @@
 			ds->done = 1;
 			continue;
 		}
+
+
 		if (single_template && ds->split_set_names && !use_dash_suffix) {
 			char szStrName[20];
 			sprintf(szStrName, "_set%d", 1 + gf_list_find(ctx->current_period->period->adaptation_sets, set) );
@@ -2766,83 +3633,160 @@
 			strcat(szDASHTemplate, szStrName);
 		}
 
+		ds->rawmux = GF_FALSE;
 		idx_ext = NULL;
-		if (ctx->m2ts) {
-			seg_ext = init_ext = "ts";
+
+
+		const char *def_ext = NULL;
+		seg_ext = init_ext = NULL;
+
+		if (ctx->muxtype==DASHER_MUX_TS) {
+			def_ext = seg_ext = init_ext = "ts";
 			if (!ctx->do_m3u8 && (ctx->subs_sidx>=0) )
 				idx_ext = "idx";
-		} else {
-			const char *def_ext = NULL;
+		}
+		else if (ctx->muxtype==DASHER_MUX_MKV) def_ext = "mkv";
+		else if (ctx->muxtype==DASHER_MUX_WEBM) def_ext = "webm";
+		else if (ctx->muxtype==DASHER_MUX_OGG) def_ext = "ogg";
+		else if (ctx->muxtype==DASHER_MUX_RAW) {
+			char *ext = (char *) gf_codecid_file_ext(ds->codec_id);
+			if (ds->codec_id==GF_CODECID_RAW) {
+				const GF_PropertyValue *p;
+				if (ds->stream_type==GF_STREAM_VISUAL) {
+					p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PIXFMT);
+					if (p) ext = (char *) gf_pixel_fmt_sname(p->value.uint);
+				}
+				else if (ds->stream_type==GF_STREAM_AUDIO) {
+					p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_AUDIO_FORMAT);
+					if (p) ext = (char *) gf_audio_fmt_sname(p->value.uint);
+				}
+			}
+			strncpy(szRawExt, ext ? ext : "raw", 19);
+			szRawExt[19] = 0;
+			ext = strchr(szRawExt, '|');
+			if (ext) ext[0] = 0;
+			def_ext = szRawExt;
+		}
 
-			seg_ext = init_ext = NULL;
+		if (!ds->muxed_base && ctx->rawsub && (ds->stream_type==GF_STREAM_TEXT) ) {
+			char *ext_sub = (char *) gf_codecid_file_ext(ds->codec_id);
+			if (ext_sub) {
+				if (!strcmp(ext_sub, "subx"))
+					ext_sub = "ttml";
 
-			if (ctx->muxtype==DASHER_MUX_TS) def_ext = "ts";
-			else if (ctx->muxtype==DASHER_MUX_MKV) def_ext = "mkv";
-			else if (ctx->muxtype==DASHER_MUX_WEBM) def_ext = "webm";
-			else if (ctx->muxtype==DASHER_MUX_OGG) def_ext = "ogg";
-			else if (ctx->muxtype==DASHER_MUX_RAW) {
-				char *ext = (char *) gf_codecid_file_ext(ds->codec_id);
-				strncpy(szRawExt, ext ? ext : "raw", 19);
+				strncpy(szRawExt, ext_sub, 19);
 				szRawExt[19] = 0;
-				ext = strchr(szRawExt, '|');
-				if (ext) ext[0] = 0;
+				ext_sub = strchr(szRawExt, '|');
+				if (ext_sub) ext_sub[0] = 0;
 				def_ext = szRawExt;
+				skip_init = GF_TRUE;
+				ds->rawmux = GF_TRUE;
 			}
+		}
 
-			if (ctx->segext && !stricmp(ctx->segext, "null")) {
-				seg_ext = NULL;
-			} else {
-				seg_ext = ctx->segext;
-				if (!seg_ext) seg_ext = def_ext ? def_ext : "m4s";
-			}
-			if (ctx->initext && !stricmp(ctx->initext, "null")) {
-				init_ext = NULL;
-			} else {
-				init_ext = ctx->initext;
-				if (!init_ext) init_ext = def_ext ? def_ext : "mp4";
-			}
+		if (ctx->segext && !stricmp(ctx->segext, "null")) {
+			seg_ext = NULL;
+		} else {
+			seg_ext = ctx->segext;
+			if (!seg_ext) seg_ext = def_ext ? def_ext : "m4s";
+		}
+		if (ctx->initext && !stricmp(ctx->initext, "null")) {
+			init_ext = NULL;
+		} else {
+			init_ext = ctx->initext;
+			if (!init_ext) init_ext = def_ext ? def_ext : "mp4";
+		}
+
+		//source template is used, do not use any extensions, they are present in the template
+		if (is_source_template) {
+			def_ext = NULL;
+			init_ext = NULL;
+			seg_ext = NULL;
 		}
 
 		is_bs_switch = set->bitstream_switching;
-		//patch for old arch compat
-		if (ds->tile_base || (ds->codec_id==GF_CODECID_HEVC_TILES)) is_bs_switch = GF_FALSE;
+		//only used to force _init in default templates
+		if (ds->tile_base) is_bs_switch = GF_FALSE;
 
+
+		//check we are not reusing an existing template from previous periods, if so append a suffix
+		//we check the final init name
+		if (!ds->skip_tpl_reuse) {
+			//1- init will not work in tiling as the base track and the first rep could end up having the same
+			//segment template since base uses "init" while tile tracks don't for the init template
+			//2- because of that, all evaluated templates must be the segment ones, otherwise we may check the audio init template
+			//against a tile segment template, which will not match even though they use the same base template...
+			//ex: template: seg_ => seg_trackN_init.mp4 for non-tiled vs seg_trackN_$number$.m4s for tiled, resulting in same N
+			//being used for 2 track
+			//cf issue 1849
+			//we however don't want to change templates if they are indeed reused but resolve to something different due to representationID
+			//we therefore resolve the segment template with startNumber 0 time 0, use this resolved name as base check.
+
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switch, szInitSegmentFilename, ds->rep_id, NULL, szDASHTemplate, is_source_template ? NULL : "mp4", 0, ds->bitrate, 0, ds->stl);
+
+			reused_template_idx = dasher_check_template_reuse(ctx, szInitSegmentFilename);
+			if (reused_template_idx) {
+				char szExName[20];
+				sprintf(szExName, "_r%d_", reused_template_idx);
+				strcat(szDASHTemplate, szExName);
+				//force template at representation level if more than one rep and templates have been reused
+				if (gf_list_count(ds->set->representations)>1)
+					single_template = GF_FALSE;
+			}
+		}
+		
 		//get final segment template with path resolution - output file name is NULL, we already have solved this
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE_WITH_PATH, is_bs_switch, szSegmentName, ds->rep_id, NULL, szDASHTemplate, seg_ext, 0, 0, 0, ctx->stl);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE_WITH_PATH, is_bs_switch, szSegmentName, ds->rep_id, NULL, szDASHTemplate, seg_ext, 0, 0, 0, ds->stl);
 		ds->seg_template = gf_strdup(szSegmentName);
 
 		//get final segment template - output file name is NULL, we already have solved this
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switch, szSegmentName, ds->rep_id, NULL, szDASHTemplate, seg_ext, 0, 0, 0, ctx->stl);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switch, szSegmentName, ds->rep_id, NULL, szDASHTemplate, seg_ext, 0, 0, 0, ds->stl);
 
 		//get index templates
 		if (idx_ext) {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX_TEMPLATE_WITH_PATH, is_bs_switch, szIndexSegmentName, ds->rep_id, NULL, szDASHTemplate, idx_ext, 0, 0, 0, ctx->stl);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX_TEMPLATE_WITH_PATH, is_bs_switch, szIndexSegmentName, ds->rep_id, NULL, szDASHTemplate, idx_ext, 0, 0, 0, ds->stl);
 			ds->idx_template = gf_strdup(szIndexSegmentName);
 
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX_TEMPLATE, is_bs_switch, szIndexSegmentName, ds->rep_id, NULL, szDASHTemplate, idx_ext, 0, 0, 0, ctx->stl);
-		}
-
-		//patch for old arch, override template name for init segment UGLY, to remove asap
-		if (gf_sys_old_arch_compat() && ds->tile_base && !ctx->sseg && !ctx->sfile ) {
-			char *sep;
-			char szTemp[100];
-			const char *out_path = gf_file_basename(ctx->out_path);
-			strcpy(szDASHTemplate, out_path);
-			sep = gf_file_ext_start(szDASHTemplate);
-			if (sep) sep[0]=0;
-			sprintf(szTemp, "_set%d_", 1+gf_list_find(ctx->current_period->period->adaptation_sets, ds->set) );
-			strcat(szDASHTemplate, szTemp);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX_TEMPLATE, is_bs_switch, szIndexSegmentName, ds->rep_id, NULL, szDASHTemplate, idx_ext, 0, 0, 0, ds->stl);
 		}
 
 		//get final init name - output file name is NULL, we already have solved this
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switch, szInitSegmentFilename, ds->rep_id, NULL, szDASHTemplate, init_ext, 0, ds->bitrate, 0, ctx->stl);
-		ds->init_seg = gf_strdup(szInitSegmentFilename);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switch, szInitSegmentFilename, ds->rep_id, NULL, szDASHTemplate, init_ext, 0, ds->bitrate, 0, ds->stl);
 
 		//get final init template name - output file name is NULL, we already have solved this
-		gf_media_mpd_format_segment_name(init_template_mode, is_bs_switch, szInitSegmentTemplate, ds->rep_id, NULL, szDASHTemplate, init_ext, 0, 0, 0, ctx->stl);
+		gf_media_mpd_format_segment_name(init_template_mode, is_bs_switch, szInitSegmentTemplate, ds->rep_id, NULL, szDASHTemplate, init_ext, 0, 0, 0, ds->stl);
 
 		if (ctx->sigfrag) {
 			if (ctx->template || ds->template) {
+				 if (is_source_template) {
+					const GF_PropertyValue *mpd_url = gf_filter_pid_get_property_str(ds->ipid, "manifest_url");
+					strcpy(szInitSegmentFilename, gf_file_basename(ds->src_url));
+
+					if (ctx->out_path && mpd_url) {
+						char *url, *mpd_out;
+						mpd_out = gf_file_basename(ctx->out_path);
+						u32 len = (u32) (mpd_out - ctx->out_path);
+						char *mpd_src = mpd_url->value.string;
+						if (!strncmp(ctx->out_path, mpd_url->value.string, len))
+							mpd_src += len;
+
+						const GF_PropertyValue *init_url = gf_filter_pid_get_property_str(ds->ipid, "init_url");
+						if (init_url) {
+							url = gf_url_concatenate(mpd_src, init_url->value.string);
+							strcpy(szInitSegmentFilename, url);
+							strcpy(szInitSegmentTemplate, url);
+							gf_free(url);
+						} else {
+							//no init segment URL
+							strcpy(szInitSegmentFilename, "");
+							strcpy(szInitSegmentTemplate, "");
+						}
+
+						url = gf_url_concatenate(mpd_src, ds->template);
+						strcpy(szSegmentName, url);
+						gf_free(url);
+					}
+				 }
 			} else {
 				strcpy(szInitSegmentFilename, gf_file_basename(ds->src_url));
 				strcpy(szSegmentName, gf_file_basename(ds->src_url));
@@ -2854,35 +3798,112 @@
 			ds->pending_segment_states = gf_list_new();
 		}
 		/* baseURLs */
-		nb_base = ds->p_base_url ? gf_list_count(ds->p_base_url->value.string_list) : 0;
+		nb_base = ds->p_base_url ? ds->p_base_url->value.string_list.nb_items : 0;
 		for (j=0; j<nb_base; j++) {
 			GF_MPD_BaseURL *base_url;
-			char *url = gf_list_get(ds->p_base_url->value.string_list, j);
+			char *url = ds->p_base_url->value.string_list.vals[j];
 			GF_SAFEALLOC(base_url, GF_MPD_BaseURL);
 			if (base_url) {
 				base_url->URL = gf_strdup(url);
 				gf_list_add(rep->base_URLs, base_url);
 			}
 		}
-		//commented for compat with old arch
-		//if (ds->codec_id==GF_CODECID_HEVC_TILES) skip_init = GF_TRUE;
-		if (ctx->m2ts) skip_init = GF_TRUE;
-		else if (ctx->muxtype==DASHER_MUX_RAW) skip_init = GF_TRUE;
+
+		force_init_seg_tpl = NULL;
+#if 0
+		force_init_seg_sl = NULL;
+#endif
+		if (ds->codec_id==GF_CODECID_HEVC_TILES) {
+			tile_base_ds = get_base_ds(ctx, ds);
+			skip_init = GF_TRUE;
+			if (tile_base_ds->rep->segment_template) force_init_seg_tpl = tile_base_ds->rep->segment_template->initialization;
+			if (!force_init_seg_tpl && tile_base_ds->set->segment_template) force_init_seg_tpl = tile_base_ds->set->segment_template->initialization;
+
+#if 0
+			if (tile_base_ds->rep->segment_list) force_init_seg_sl = tile_base_ds->rep->segment_list->initialization_segment;
+			if (!force_init_seg_sl && tile_base_ds->set->segment_list) force_init_seg_sl = tile_base_ds->set->segment_list->initialization_segment;
+#endif
+		}
+		if (ctx->muxtype==DASHER_MUX_RAW) skip_init = GF_TRUE;
 		else if (ctx->muxtype==DASHER_MUX_TS) skip_init = GF_TRUE;
+		else if (ctx->muxtype==DASHER_MUX_OGG) skip_init = GF_TRUE;
+
+
+		//forward mode, change segment names
+		if (ctx->forward_mode) {
+			u32 k, nb_pids = gf_list_count(ctx->pids);
+			char *src = NULL;
+			const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PCK_FILENAME);
+
+			if (!p || !p->value.string) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't fetch source URL in forward mode, cannot forward\n"));
+				ctx->in_error = GF_TRUE;
+				return;
+			}
+			src = p->value.string;
+
+			for (k=0; k<nb_pids; k++) {
+				GF_DashStream *a_ds = gf_list_get(ctx->pids, k);
+				if (ds == a_ds) continue;
+				if (!a_ds->dst_filter) continue;
+
+				p = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PCK_FILENAME);
+				if (!p || !p->value.string) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't fetch source URL in forward mode, cannot forward\n"));
+					ctx->in_error = GF_TRUE;
+					return;
+				}
+				//same init segment used (bs switching)
+				if (!strcmp(p->value.string, src))
+					skip_init = GF_TRUE;
+			}
+			strcpy(szInitSegmentFilename, src);
+			strcpy(szInitSegmentTemplate, src);
+
+			if (ctx->tpl) {
+				p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_TEMPLATE);
+				if (!p || !p->value.string) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't fetch source template in forward mode, cannot forward\n"));
+					ctx->in_error = GF_TRUE;
+					return;
+				}
+				strcpy(szSegmentName, p->value.string);
+			}
+		}
 
+		ds->init_seg = gf_strdup(szInitSegmentFilename);
 
 		//we use segment template
 		if (ctx->tpl) {
+			Bool use_single_init;
 			GF_MPD_SegmentTemplate *seg_template;
+			u32 start_number = ds->startNumber ? ds->startNumber : 1;
+			u64 seg_duration = (u64)(ds->dash_dur.num) * ds->mpd_timescale / ds->dash_dur.den;
+
+			if (ds->inband_params && (ctx->bs_switch==DASHER_BS_SWITCH_INBAND_PPS)) {
+				use_single_init = GF_FALSE;
+				single_template = GF_FALSE;
+			} else {
+				use_single_init = (set->bitstream_switching || single_template) ? GF_TRUE : GF_FALSE;
+			}
+
 			//first rep in set and bs switching or single template, create segment template at set level
-			if (!i && (set->bitstream_switching || single_template) ) {
+			if (!i && use_single_init ) {
 				init_template_done = GF_TRUE;
 				seg_template = NULL;
-				if (!skip_init || single_template) {
+				if (!skip_init || force_init_seg_tpl || single_template) {
 					GF_SAFEALLOC(seg_template, GF_MPD_SegmentTemplate);
-					if (seg_template)
-						seg_template->initialization = skip_init ? NULL : gf_strdup(szInitSegmentTemplate);
+					if (seg_template) {
+						if (skip_init) {
+							seg_template->initialization = force_init_seg_tpl ? gf_strdup(force_init_seg_tpl) : NULL;
+							seg_template->hls_init_name = force_init_seg_tpl ? tile_base_ds->init_seg : NULL;
+						} else {
+							seg_template->initialization = gf_strdup(szInitSegmentTemplate);
+							seg_template->hls_init_name = ds->init_seg;
+						}
+					}
 				}
+				set->segment_template = seg_template;
 
 				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
 
@@ -2892,15 +3913,15 @@
 						seg_template->index = gf_strdup(szIndexSegmentName);
 
 					seg_template->timescale = ds->mpd_timescale;
-					seg_template->start_number = ds->startNumber ? ds->startNumber : 1;
-					seg_template->duration = (u64)(ds->dash_dur * ds->mpd_timescale);
+					seg_template->start_number = start_number;
+					seg_template->duration = seg_duration;
+
 					if (ctx->asto>0) {
 						seg_template->availability_time_offset = ctx->asto;
 					}
 				} else if (seg_template) {
 					seg_template->start_number = (u32)-1;
 				}
-				set->segment_template = seg_template;
 			}
 			//non-first rep in set and single template, only open destination
 			if (i && single_template) {
@@ -2910,8 +3931,15 @@
 			else if (i || !single_template) {
 				GF_SAFEALLOC(seg_template, GF_MPD_SegmentTemplate);
 				if (seg_template) {
+					rep->segment_template = seg_template;
 					if (!init_template_done) {
-						seg_template->initialization = skip_init ? NULL : gf_strdup(szInitSegmentTemplate);
+						if (skip_init) {
+							seg_template->initialization = force_init_seg_tpl ? gf_strdup(force_init_seg_tpl) : NULL;
+							seg_template->hls_init_name = force_init_seg_tpl ? tile_base_ds->init_seg : NULL;
+						} else {
+							seg_template->initialization = gf_strdup(szInitSegmentTemplate);
+							seg_template->hls_init_name = ds->init_seg;
+						}
 						dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
 					} else if (i) {
 						dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, (set->bitstream_switching || skip_init) ? GF_TRUE : GF_FALSE);
@@ -2919,25 +3947,18 @@
 					seg_template->media = gf_strdup(szSegmentName);
 					if (ds->idx_template)
 						seg_template->index = gf_strdup(szIndexSegmentName);
-					seg_template->duration = (u64)(ds->dash_dur * ds->mpd_timescale);
+					seg_template->duration = seg_duration;
 					seg_template->timescale = ds->mpd_timescale;
-					seg_template->start_number = ds->startNumber ? ds->startNumber : 1;
+					seg_template->start_number = start_number;
 					if (ctx->asto > 0) {
 						seg_template->availability_time_offset = ctx->asto;
 					}
-					rep->segment_template = seg_template;
 				}
 			}
 		}
 		/*we are using a single file or segment, use base url*/
 		else if (ctx->sseg || ctx->sfile) {
 			GF_MPD_BaseURL *baseURL;
-/*			char *segext = (ctx->segext && !stricmp(ctx->segext, "null")) ? NULL : "mp4";
-			if (ctx->m2ts) segext = "ts";
-
-			//use GF_DASH_TEMPLATE_INITIALIZATION_SKIPINIT to get rid of default "init" added for init templates
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, set->bitstream_switching, szInitSegmentName, ds->rep_id, NULL, szDASHTemplate, segext, 0, 0, 0, ctx->stl);
-*/
 
 			if (ds->init_seg) gf_free(ds->init_seg);
 			ds->init_seg = gf_strdup(szInitSegmentFilename);
@@ -2965,7 +3986,7 @@
 				baseURL->URL = gf_strdup(szInitSegmentFilename);
 				seg_list->dasher_segment_name = gf_strdup(szSegmentName);
 				seg_list->timescale = ds->mpd_timescale;
-				seg_list->duration = (u64) (ds->mpd_timescale * ds->dash_dur);
+				seg_list->duration = (u64) (ds->dash_dur.num) * ds->mpd_timescale / ds->dash_dur.den;
 				seg_list->segment_URLs = gf_list_new();
 				rep->segment_list = seg_list;
 				ds->pending_segment_urls = gf_list_new();
@@ -2989,7 +4010,7 @@
 			seg_list->timescale = ds->mpd_timescale;
 			seg_list->segment_URLs = gf_list_new();
 			seg_list->start_number = (u32) -1;
-			seg_list->duration = (u64) (ds->mpd_timescale * ds->dash_dur);
+			seg_list->duration = (u64) (ds->dash_dur.num) * ds->mpd_timescale / ds->dash_dur.den;
 			rep->segment_list = seg_list;
 			ds->pending_segment_urls = gf_list_new();
 
@@ -3001,7 +4022,7 @@
 	}
 }
 
-static void dahser_purge_segment_timeline(GF_DashStream *ds, GF_MPD_SegmentTimeline *stl, GF_DASH_SegmentContext *sctx)
+static void dasher_purge_segment_timeline(GF_DashStream *ds, GF_MPD_SegmentTimeline *stl, GF_DASH_SegmentContext *sctx)
 {
 	GF_MPD_SegmentTimelineEntry *stl_e = gf_list_get(stl->entries, 0);
 	if (!stl_e) return;
@@ -3103,13 +4124,13 @@
 
 			if (ds->rep->segment_template) {
 				if (ds->rep->segment_template->segment_timeline) {
-					dahser_purge_segment_timeline(ds, ds->rep->segment_template->segment_timeline, sctx);
+					dasher_purge_segment_timeline(ds, ds->rep->segment_template->segment_timeline, sctx);
 				}
 			}
 			//not an else due to inheritance
 			if (ds->owns_set && ds->set->segment_template) {
 				if (ds->set->segment_template->segment_timeline) {
-					dahser_purge_segment_timeline(ds, ds->set->segment_template->segment_timeline, sctx);
+					dasher_purge_segment_timeline(ds, ds->set->segment_template->segment_timeline, sctx);
 				}
 			}
 
@@ -3117,6 +4138,7 @@
 			ds->dur_purged += dur;
 			assert(gf_list_find(ds->pending_segment_states, sctx)<0);
 			if (sctx->filename) gf_free(sctx->filename);
+			if (sctx->hls_key_uri) gf_free(sctx->hls_key_uri);
 			gf_free(sctx);
 			gf_list_rem(ds->rep->state_seg_list, 0);
 		}
@@ -3150,18 +4172,19 @@
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
 		if (ds->muxed_base) continue;
 
-		if (ds->xlink) {
-			pdur = (u32) (1000*ds->period_dur);
+		if (ds->xlink && (ds->stream_type==GF_STREAM_FILE) ) {
+			pdur = (u32) (1000*(s64)ds->period_dur.num / ds->period_dur.den);
 		} else {
 			u64 ds_dur = ds->max_period_dur;
+
 			//we had to generate one extra segment to unlock looping, but we don't want to advertise it in the manifest duration
 			//because other sets may not be ready for this time interval
 			if (ds->subdur_forced_use_period_dur)
 				ds_dur = ds->subdur_forced_use_period_dur;
 
-			if (ds->clamped_dur && !ctx->loop) {
-				u64 clamp_dur = (u64) (ds->clamped_dur * 1000);
-				if (clamp_dur<ds_dur) ds_dur = clamp_dur;
+			if (ds->clamped_dur.num && !ctx->loop) {
+				u64 clamp_dur = (u64) (ds->clamped_dur.num * 1000);
+				if (clamp_dur < ds->clamped_dur.den * ds_dur) ds_dur = clamp_dur / ds->clamped_dur.den;
 			}
 
 			if (ds->dur_purged && (ctx->mpd->type != GF_MPD_TYPE_DYNAMIC)) {
@@ -3174,8 +4197,11 @@
 			if (pdur < ds_dur) pdur = ds_dur;
 		}
 	}
-	if (!count && ctx->current_period->period && ctx->current_period->period->duration)
-		pdur = ctx->current_period->period->duration;
+
+	if (!count) {
+		if (ctx->current_period->period && ctx->current_period->period->duration)
+			pdur = ctx->current_period->period->duration;
+	}
 
 	if (!ctx->check_dur) {
 		s32 diff = (s32) ((s64) pdur - (s64) min_dur);
@@ -3252,7 +4278,7 @@
 	}
 }
 
-static void dasher_transfer_file(FILE *f, GF_FilterPid *opid, const char *name)
+static void dasher_transfer_file(FILE *f, GF_FilterPid *opid, const char *name, GF_DashStream *ds)
 {
 	GF_FilterPacket *pck;
 	u32 size, nb_read;
@@ -3261,23 +4287,297 @@
 	size = (u32) gf_fsize(f);
 
 	pck = gf_filter_pck_new_alloc(opid, size, &output);
+	if (!pck) return;
+
 	nb_read = (u32) gf_fread(output, size, f);
 	if (nb_read != size) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Error reading temp MPD file, read %d bytes but file size is %d\n", nb_read, size ));
 	}
+
 	gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
 	gf_filter_pck_set_seek_flag(pck, GF_TRUE);
 	if (name) {
 		gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENAME, &PROP_STRING(name) );
 	}
+	if (ds) {
+		gf_filter_pck_set_property(pck, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( ds->hls_ref_id ) );
+	}
 	gf_filter_pck_send(pck);
 }
 
+
 static u64 dasher_get_utc(GF_DasherCtx *ctx)
 {
 	return gf_net_get_utc() - ctx->utc_diff;
 }
 
+static void dasher_get_set_and_rep(GF_MPD_Period *period, const char *repid, GF_MPD_AdaptationSet **out_set, GF_MPD_Representation **out_rep)
+{
+	u32 i, nb_sets = gf_list_count(period->adaptation_sets);
+	for (i=0; i<nb_sets; i++) {
+		u32 j, nb_reps;
+		GF_MPD_AdaptationSet *set = gf_list_get(period->adaptation_sets, i);
+		nb_reps = gf_list_count(set->representations);
+		for (j=0; j<nb_reps; j++) {
+			GF_MPD_Representation *rep = gf_list_get(set->representations, j);
+			if (rep->id && !strcmp(rep->id, repid)) {
+				*out_set = set;
+				*out_rep = rep;
+				return;
+			}
+		}
+	}
+}
+
+static Bool dasher_merge_rep(GF_DashStream *ds, GF_MPD_Representation *rep)
+{
+	Bool transcode_detected = GF_FALSE;
+	Bool recompute_set = GF_FALSE;
+	GF_MPD_Representation *n_rep = ds->rep;
+
+	//TODO: copy other properties in case we transcode ?
+
+#define CHECK_VAL(_name, _v) if (rep->_name != n_rep->_name) { rep->_name = n_rep->_name; transcode_detected = GF_TRUE; if (_v) recompute_set = GF_TRUE; }
+
+#define CHECK_STR(_name) if (rep->_name && n_rep->_name && !strcmp(rep->_name, n_rep->_name)) {} \
+	else if (!rep->_name && !n_rep->_name) {}\
+	else { \
+		if (rep->_name) gf_free(rep->_name); \
+		rep->_name = n_rep->_name ? gf_strdup(n_rep->_name) : NULL; \
+		transcode_detected = GF_TRUE; \
+	}
+
+//for frac, if not set on source PID, consider it unchanged
+#define CHECK_FRAC(_name) if (rep->_name && n_rep->_name && (rep->_name->num * n_rep->_name->den == rep->_name->den * n_rep->_name->num)) {} \
+	else if (!n_rep->_name) {}\
+	else { \
+		if (rep->_name) gf_free(rep->_name); \
+		if (n_rep->_name) { rep->_name = gf_malloc(sizeof(GF_MPD_Fractional)); memcpy(rep->_name, n_rep->_name, sizeof(GF_MPD_Fractional)); } \
+		else rep->_name = NULL; \
+		transcode_detected = GF_TRUE; \
+	}
+
+	CHECK_STR(codecs)
+	CHECK_STR(profiles)
+	CHECK_STR(mime_type)
+	CHECK_STR(segmentProfiles)
+	CHECK_VAL(width, 1)
+	CHECK_VAL(height, 1)
+	CHECK_VAL(bandwidth, 0)
+	CHECK_VAL(samplerate, 0)
+	CHECK_VAL(scan_type, 0)
+	CHECK_FRAC(sar)
+	CHECK_FRAC(framerate)
+
+	if (transcode_detected && !ds->transcode_detected) {
+		ds->transcode_detected = GF_TRUE;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Transcoded detected in forward mode, not fully tested !\n"));
+	}
+#undef CHECK_VAL
+#undef CHECK_STR
+#undef CHECK_FRAC
+
+	return recompute_set;
+}
+static void dasher_forward_manifest_raw(GF_DasherCtx *ctx, GF_DashStream *ds, const char *manifest, const char *manifest_name)
+{
+	GF_FilterPacket *pck;
+	u32 size;
+	u8 *output;
+
+	size = (u32) strlen(manifest);
+
+	pck = gf_filter_pck_new_alloc(ctx->opid, size+1, &output);
+	if (!pck) return;
+
+	memcpy(output, manifest, size);
+	output[size] = 0;
+	gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
+	gf_filter_pck_set_seek_flag(pck, GF_TRUE);
+	if (manifest_name) {
+		if (ctx->out_path) {
+			char *url = gf_url_concatenate(ctx->out_path, manifest_name);
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENAME, &PROP_STRING_NO_COPY(url) );
+		} else {
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENAME, &PROP_STRING(manifest_name) );
+		}
+		if (ds)
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( ds->hls_ref_id ) );
+	}
+	gf_filter_pck_send(pck);
+}
+
+
+static void dasher_forward_mpd(GF_DasherCtx *ctx, const char *manifest)
+{
+	u32 i, count, nb_periods, nb_streams;
+	GF_XMLAttribute *cenc_att = NULL;
+	GF_XMLAttribute *xlink_att = NULL;
+	FILE *tmp = NULL;
+	GF_MPD *mpd = gf_mpd_new();
+	GF_List *recompute_sets = NULL;
+	GF_DOMParser *dom = gf_xml_dom_new();
+	GF_Err e = gf_xml_dom_parse_string(dom, (char *)manifest);
+	if (e) goto err_exit;
+
+	e = gf_mpd_init_from_dom(gf_xml_dom_get_root(dom), mpd, NULL);
+	if (e) goto err_exit;
+
+	nb_streams = gf_list_count(ctx->pids);
+	nb_periods = gf_list_count(mpd->periods);
+	for (i=0; i<nb_periods; i++) {
+		u32 j;
+		GF_MPD_AdaptationSet *set = NULL;
+		GF_MPD_Representation *rep = NULL;
+		GF_MPD_Period *period = gf_list_get(mpd->periods, i);
+		for (j=0; j<nb_streams; j++) {
+			Bool invalidate_set;
+			GF_DashStream *ds = gf_list_get(ctx->pids, j);
+			if (ds->muxed_base) continue;
+			const GF_PropertyValue *ps = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DASH_PERIOD_START);
+			const GF_PropertyValue *repid = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_REP_ID);
+			if (!ps || !repid) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't fetch period start or rep ID in forward mode, cannot forward\n"));
+				goto err_exit;
+			}
+			if (period->start != ps->value.longuint) continue;
+			dasher_get_set_and_rep(period, repid->value.string, &set, &rep);
+			if (!set || !rep) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't locate adaptation set and period in source manifest in forward mode, cannot forward\n"));
+				goto err_exit;
+			}
+			//copy/reset common encryption
+			if (set->content_protection) {
+				gf_mpd_del_list(set->content_protection, gf_mpd_descriptor_free, 1);
+			}
+			if (rep->content_protection) {
+				gf_mpd_del_list(rep->content_protection, gf_mpd_descriptor_free, 1);
+			}
+			if (gf_list_count(ds->rep->content_protection)) {
+				gf_list_del(rep->content_protection);
+				rep->content_protection = dasher_get_content_protection_desc(ctx, ds, NULL);
+			}
+			if (gf_list_count(ds->set->content_protection)) {
+				gf_list_del(set->content_protection);
+				set->content_protection = dasher_get_content_protection_desc(ctx, ds, ds->set);
+			}
+			invalidate_set = dasher_merge_rep(ds, rep);
+			//wait until we are all done
+			if (invalidate_set) {
+				if (!recompute_sets) recompute_sets = gf_list_new();
+				if (gf_list_find(recompute_sets, set)<0)
+					gf_list_add(recompute_sets, set);
+			}
+		}
+	}
+	//update sets - TODO
+
+	//insert xmlns if needed
+	count = gf_list_count(mpd->x_attributes);
+	for (i=0; i<count; i++) {
+		GF_XMLAttribute * att = gf_list_get(mpd->x_attributes, i);
+		if (!strcmp(att->name, "xmlns:cenc")) cenc_att = att;
+		if (!strcmp(att->name, "xmlns:xlink")) xlink_att = att;
+
+	}
+	if (ctx->use_cenc && !cenc_att) {
+		cenc_att = gf_xml_dom_create_attribute("xmlns:cenc", "urn:mpeg:cenc:2013");
+		gf_list_add(mpd->x_attributes, cenc_att);
+	}
+	if (ctx->use_xlink && !xlink_att) {
+		xlink_att = gf_xml_dom_create_attribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
+		gf_list_add(mpd->x_attributes, xlink_att);
+	}
+
+	dasher_check_chaining(ctx, "urn:mpeg:dash:mpd-chaining:2016", ctx->chain);
+	dasher_check_chaining(ctx, "urn:mpeg:dash:fallback:2016", ctx->chain_fbk);
+
+
+	//and send
+	tmp = gf_file_temp(NULL);
+	mpd->xml_namespace = ctx->mpd->xml_namespace;
+	mpd->publishTime = dasher_get_utc(ctx);
+	e = gf_mpd_write(mpd, tmp, ctx->cmpd);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Error serializing manifest in forward mode: %s\n", gf_error_to_string(e) ));
+		e = GF_OK;
+		goto err_exit;
+	}
+	dasher_transfer_file(tmp, ctx->opid, NULL, NULL);
+
+err_exit:
+	if (tmp) gf_fclose(tmp);
+	gf_mpd_del(mpd);
+	gf_xml_dom_del(dom);
+	gf_list_del(recompute_sets);
+	if (e)
+		ctx->in_error = GF_TRUE;
+}
+
+static GF_Err dasher_write_and_send_manifest(GF_DasherCtx *ctx, u64 last_period_dur, Bool do_m3u8, Bool m3u8_second_pass, GF_FilterPid *opid, char *alt_name)
+{
+	void *last_signature;
+	u8 sig[GF_SHA1_DIGEST_SIZE];
+	GF_Err e;
+	FILE *tmp = gf_file_temp(NULL);
+	if (do_m3u8) {
+		ctx->mpd->m3u8_time = ctx->hlsc;
+		ctx->mpd->nb_hls_ext_master = ctx->hlsx.nb_items;
+		ctx->mpd->hls_ext_master = (const char **) ctx->hlsx.vals;
+		ctx->mpd->llhls_preload = ctx->ll_preload_hint;
+		ctx->mpd->llhls_rendition_reports = ctx->ll_rend_rep;
+		if (ctx->llhls==3)
+			ctx->mpd->force_llhls_mode = m3u8_second_pass ? 2 : 1;
+		else
+			ctx->mpd->force_llhls_mode = 0;
+
+		if (m3u8_second_pass) {
+			e = gf_mpd_write_m3u8_master_playlist(ctx->mpd, tmp, ctx->out_path, gf_list_last(ctx->mpd->periods) );
+		} else {
+			e = gf_mpd_write_m3u8_master_playlist(ctx->mpd, tmp, ctx->out_path, gf_list_last(ctx->mpd->periods) );
+		}
+	} else {
+		e = gf_mpd_write(ctx->mpd, tmp, ctx->cmpd);
+	}
+
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] failed to write %s file: %s\n", do_m3u8 ? "M3U8" : "MPD", gf_error_to_string(e) ));
+		gf_fclose(tmp);
+		if (ctx->current_period->period)
+			ctx->current_period->period->duration = last_period_dur;
+		return e;
+	}
+
+	if (ctx->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
+		if (gf_ftell(tmp) > 100 * 1024)
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] manifest MPD is too big for HbbTV 1.5. Limit is 100kB, current size is "LLU"kB\n", gf_ftell(tmp) / 1024));
+	}
+
+	gf_sha1_file_ptr(tmp, sig);
+	if (do_m3u8) {
+		last_signature = (void *) m3u8_second_pass ? ctx->last_hls2_signature : ctx->last_hls_signature;
+	} else {
+		last_signature = (void *) ctx->last_mpd_signature;
+	}
+
+	if (memcmp(sig, last_signature, GF_SHA1_DIGEST_SIZE)) {
+		memcpy(last_signature, sig, GF_SHA1_DIGEST_SIZE);
+
+		dasher_transfer_file(tmp, opid, alt_name, NULL);
+	}
+	gf_fclose(tmp);
+	return GF_OK;
+}
+
+static void dasher_update_dyn_bitrates(GF_DasherCtx *ctx)
+{
+	u32 i, count = gf_list_count(ctx->current_period->streams);
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		if (ds->dyn_bitrate) dasher_update_bitrate(ctx, ds);
+	}
+}
+
 GF_Err dasher_send_manifest(GF_Filter *filter, GF_DasherCtx *ctx, Bool for_mpd_only)
 {
 	GF_Err e;
@@ -3286,6 +4586,14 @@
 	u64 store_mpd_dur=0;
 	u64 max_seg_dur=0;
 	u64 last_period_dur;
+
+	//manifest forwarding
+	if (ctx->forward_mode == DASHER_FWD_ALL)
+		return GF_OK;
+
+	if (ctx->dyn_rate)
+		dasher_update_dyn_bitrates(ctx);
+
 	//UGLY PATCH, to remove - we don't have the same algos in old arch and new arch, which result in slightly different max segment duration
 	//on audio for our test suite - patch it manually to avoid hash failures :(
 	//TODO, remove as soon as we switch archs
@@ -3318,6 +4626,7 @@
 			d->value = gf_strdup(szTime);
 		}
 	}
+
 	dasher_update_mpd(ctx);
 	ctx->mpd->write_context = GF_FALSE;
 	ctx->mpd->was_dynamic = GF_FALSE;
@@ -3345,7 +4654,6 @@
 	max_opid = (ctx->dual && ctx->opid_alt) ? 2 : 1;
 	for (i=0; i < max_opid; i++) {
 		Bool do_m3u8 = GF_FALSE;
-		tmp = gf_file_temp(NULL);
 		GF_FilterPid *opid;
 
 		if (i==0) {
@@ -3359,30 +4667,15 @@
 			do_m3u8 = ctx->opid_alt_m3u8;
 			opid = ctx->opid_alt;
 		}
-
-		if (do_m3u8) {
-			if (for_mpd_only) continue;
-			ctx->mpd->m3u8_time = ctx->hlsc;
-			e = gf_mpd_write_m3u8_master_playlist(ctx->mpd, tmp, ctx->out_path, gf_list_get(ctx->mpd->periods, 0) );
-		} else {
-			e = gf_mpd_write(ctx->mpd, tmp, ctx->cmpd);
-		}
-
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] failed to write %s file: %s\n", do_m3u8 ? "M3U8" : "MPD", gf_error_to_string(e) ));
-			gf_fclose(tmp);
-			if (ctx->current_period->period)
-				ctx->current_period->period->duration = last_period_dur;
-			return e;
-		}
-
-		if (ctx->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
-			if (gf_ftell(tmp) > 100 * 1024)
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] manifest MPD is too big for HbbTV 1.5. Limit is 100kB, current size is "LLU"kB\n", gf_ftell(tmp) / 1024));
+		if (do_m3u8 && for_mpd_only) {
+			continue;
 		}
+		if ((ctx->llhls==3) && do_m3u8)
+			ctx->mpd->force_llhls_mode = 1;
+		e = dasher_write_and_send_manifest(ctx, last_period_dur, do_m3u8, GF_FALSE, opid, NULL);
+		if (e) return e;
 
-		dasher_transfer_file(tmp, opid, NULL);
-		gf_fclose(tmp);
+		ctx->mpd->force_llhls_mode = 0;
 	}
 
 	if (ctx->current_period->period)
@@ -3395,18 +4688,27 @@
 		ctx->mpd->max_segment_duration = (u32) max_seg_dur;
 		ctx->mpd->max_subsegment_duration = 0;
 	}
+	if (ctx->def_max_seg_dur)
+		ctx->mpd->max_segment_duration = (u32) ctx->def_max_seg_dur;
 
 	if (ctx->do_m3u8) {
+		Bool m3u8_second_pass = GF_FALSE;
 		u32 j;
-		GF_MPD_Period *period = gf_list_get(ctx->mpd->periods, 0);
+		GF_MPD_Period *period = gf_list_last(ctx->mpd->periods);
 		GF_MPD_AdaptationSet *as;
 		GF_MPD_Representation *rep;
+		GF_FilterPid *opid;
 		assert(period);
+		if (ctx->opid_alt_m3u8) opid = ctx->opid_alt;
+		else opid = ctx->opid;
+
+resend:
 		i=0;
 		while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
 			j=0;
 			while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
 				if (rep->m3u8_var_file) {
+					GF_DashStream *ds;
 					char *outfile = rep->m3u8_var_name;
 					Bool do_free = GF_FALSE;
 
@@ -3417,13 +4719,48 @@
 							do_free = GF_TRUE;
 						}
 					}
-					dasher_transfer_file(rep->m3u8_var_file, ctx->opid, outfile);
+					if (m3u8_second_pass) {
+						char *sep;
+						char *new_name = gf_strdup(outfile);
+
+						sep = gf_file_ext_start(new_name);
+						if (sep) sep[0] = 0;
+						gf_dynstrcat(&new_name, "_IF", NULL);
+						sep = gf_file_ext_start(outfile);
+						if (sep)
+							gf_dynstrcat(&new_name, sep, NULL);
+
+						if (do_free) gf_free(outfile);
+						outfile = new_name;
+						do_free = GF_TRUE;
+					}
+					ds = rep->playback.udta;
+					dasher_transfer_file(rep->m3u8_var_file, opid, outfile, ds);
 					gf_fclose(rep->m3u8_var_file);
 					rep->m3u8_var_file = NULL;
 					if (do_free) gf_free(outfile);
 				}
 			}
 		}
+
+		if ((ctx->llhls==3) && !m3u8_second_pass && ctx->out_path) {
+			char *sep;
+			char szAltName[GF_MAX_PATH];
+			strcpy(szAltName, ctx->out_path);
+			sep = gf_file_ext_start(szAltName);
+			if (sep) sep[0] = 0;
+			strcat(szAltName, "_IF");
+			sep = gf_file_ext_start(ctx->out_path);
+			if (sep) strcat(szAltName, sep);
+
+			ctx->mpd->force_llhls_mode = 2;
+			e = dasher_write_and_send_manifest(ctx, last_period_dur, GF_TRUE, GF_TRUE, ctx->opid, szAltName);
+			if (e) return e;
+
+			m3u8_second_pass = GF_TRUE;
+			goto resend;
+
+		}
 	}
 
 
@@ -3440,15 +4777,17 @@
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] failed to write MPD file: %s\n", gf_error_to_string(e) ));
 		}
-		return e;
 	}
+
+	if (ctx->def_max_seg_dur)
+		ctx->mpd->max_segment_duration = 0;
 	return GF_OK;
 }
 
 static void dasher_reset_stream(GF_Filter *filter, GF_DashStream *ds, Bool is_destroy)
 {
 	//we do not remove the destination filter, it will be removed automatically once all remove_pids are called
-	//removing it explicetly will discard the upper chain and any packets not yet processed
+	//removing it explicitly will discard the upper chain and any packets not yet processed
 
 	ds->dst_filter = NULL;
 	if (ds->seg_template) gf_free(ds->seg_template);
@@ -3468,6 +4807,19 @@
 		if (ds->cues) gf_free(ds->cues);
 		gf_list_del(ds->complementary_streams);
 		gf_free(ds->rep_id);
+		//string properties are locally copied
+#define RESET_PROP_STR(_prop) \
+		if (_prop) gf_free(_prop);
+
+		RESET_PROP_STR(ds->src_url)
+		RESET_PROP_STR(ds->template)
+		RESET_PROP_STR(ds->lang)
+		RESET_PROP_STR(ds->hls_vp_name)
+		RESET_PROP_STR(ds->xlink)
+		RESET_PROP_STR(ds->period_id)
+		RESET_PROP_STR(ds->period_continuity_id)
+
+#undef RESET_PROP_STR
 		return;
 	}
 	ds->init_seg = ds->seg_template = ds->idx_template = NULL;
@@ -3482,7 +4834,7 @@
 	ds->muxed_base = NULL;
 	ds->nb_comp = ds->nb_comp_done = 0;
 	gf_list_reset(ds->complementary_streams);
-	ds->inband_params = GF_FALSE;
+	ds->inband_params = 0;
 	ds->seg_start_time = 0;
 	ds->seg_number = ds->startNumber;
 	ds->nb_segments_purged = 0;
@@ -3498,6 +4850,7 @@
 		}
 		ds->nb_sap_in_queue = 0;
 	}
+	ds->forced_period_switch = GF_FALSE;
 }
 
 void dasher_context_update_period_end(GF_DasherCtx *ctx)
@@ -3749,12 +5102,12 @@
 					nb_done_in_period++;
 					continue;
 				}
-				if (ds->period_start != rep->dasher_ctx->period_start) {
+				if (ds->period_start.num * rep->dasher_ctx->period_start.den != rep->dasher_ctx->period_start.num * ds->period_start.den) {
 					rep->dasher_ctx->done = 1;
 					nb_done_in_period++;
 					continue;
 				}
-				if (ds->period_dur != rep->dasher_ctx->period_duration) {
+				if (ds->period_dur.num * rep->dasher_ctx->period_duration.den != rep->dasher_ctx->period_duration.num * ds->period_dur.den) {
 					rep->dasher_ctx->done = 1;
 					nb_done_in_period++;
 					continue;
@@ -3837,11 +5190,23 @@
 			}
 
 			ds->period_start = rep->dasher_ctx->period_start;
+			if (!ds->period_start.den) {
+				ds->period_start.num = 0;
+				ds->period_start.den = 1;
+			}
 			ds->period_dur = rep->dasher_ctx->period_duration;
+			if (!ds->period_dur.den) {
+				ds->period_dur.num = 0;
+				ds->period_dur.den = 1;
+			}
 			ds->pid_id = rep->dasher_ctx->pid_id;
 			ds->dep_pid_id = rep->dasher_ctx->dep_pid_id;
 			ds->seek_to_pck = rep->dasher_ctx->last_pck_idx;
 			ds->dash_dur = rep->dasher_ctx->dash_dur;
+			if (!ds->dash_dur.den) {
+				ds->dash_dur.num = 0;
+				ds->dash_dur.den = 1;
+			}
 			ds->next_seg_start = rep->dasher_ctx->next_seg_start;
 			ds->adjusted_next_seg_start = ds->next_seg_start;
 			ds->first_cts = rep->dasher_ctx->first_cts;
@@ -3893,6 +5258,14 @@
 				use_multi_pid_init = GF_TRUE;
 
 			ds->period = ctx->current_period;
+			if ((ds->codec_id==GF_CODECID_MHAS) || (ds->codec_id==GF_CODECID_MPHA)) {
+				const GF_PropertyValue *prop = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_MHA_COMPATIBLE_PROFILES);
+				if (prop) {
+					ds->set->nb_alt_mha_profiles = prop->value.uint_list.nb_items;
+					ds->set->alt_mha_profiles = prop->value.uint_list.vals;
+				}
+			}
+
 
 			gf_list_del_item(ctx->next_period->streams, ds);
 
@@ -3960,13 +5333,13 @@
 		dasher_context_update_period_end(ctx);
 
 	//we have a MPD ready, flush it
-	if (ctx->mpd)
+	if (!ctx->gencues && ctx->mpd)
 		dasher_send_manifest(filter, ctx, GF_FALSE);
 }
 
 typedef struct
 {
-	Double period_start;
+	GF_Fraction64 period_start;
 	const char *period_id;
 } PeriodInfo;
 
@@ -3983,7 +5356,7 @@
 		nb_periods = gf_list_count(pinfos);
 		for (j=0; j < nb_periods; j++) {
 			info = gf_list_get(pinfos, j);
-			if (info->period_start == ds->period_start) {
+			if (info->period_start.num * ds->period_start.den == ds->period_start.num * info->period_start.den) {
 				same_period = GF_TRUE;
 				break;
 			}
@@ -4048,7 +5421,7 @@
 
 	sess = gf_dm_sess_new(dm, url, GF_NETIO_SESSION_MEMORY_CACHE|GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to create session for remote UTC source %s: %s\n", url, gf_error_to_string(e) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to create session for remote UTC source %s: %s - local clock will be used instead\n", url, gf_error_to_string(e) ));
 		return;
 	}
 	while (1) {
@@ -4064,7 +5437,7 @@
 		return;
 	}
 	cache_name = gf_dm_sess_get_cache_name(sess);
-	gf_blob_get_data(cache_name, &data, &size);
+	gf_blob_get(cache_name, &data, &size, NULL);
 	if (data) {
 		//xsDate or isoDate - we always signal using iso
 		if (strchr(data, 'T')) {
@@ -4074,11 +5447,18 @@
 		}
 		//ntp
 		else if (sscanf(data, LLU, &remote_utc) == 1) {
-			remote_utc = gf_net_ntp_to_utc(remote_utc);
+			//ntp value not counted since 1900, assume format is seconds till 1 jan 1970
+			if (remote_utc<=GF_NTP_SEC_1900_TO_1970) {
+				remote_utc = remote_utc*1000;
+			} else {
+				remote_utc = gf_net_ntp_to_utc(remote_utc);
+			}
 			if (remote_utc)
 				ctx->utc_timing_type = DASHER_UTCREF_NTP;
 		}
 	}
+	gf_blob_release(cache_name);
+
 	//not match, try http date
 	if (!ctx->utc_timing_type) {
 		const char *hdr = gf_dm_sess_get_header(sess, "Date");
@@ -4094,9 +5474,15 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to parse response %s from remote UTC source %s\n", data, url ));
 	} else {
 		ctx->utc_diff = (s32) ( (s64) gf_net_get_utc() - (s64) remote_utc );
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] Synchronized clock to remote %s - UTC diff (local - remote) %d ms\n", url, ctx->utc_diff));
+		if (ABS(ctx->utc_diff) > 3600000) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Diff between local clock and remote %s is %d, way too large! Assuming 0 ms UTC diff\n", url, ctx->utc_diff));
+			ctx->utc_diff = 0;
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] Synchronized clock to remote %s - UTC diff (local - remote) %d ms\n", url, ctx->utc_diff));
+		}
 
 		if (!gf_list_count(ctx->mpd->utc_timings) ) {
+			Bool dashif_ok = GF_FALSE;
 			GF_MPD_Descriptor *utc_t;
 			GF_SAFEALLOC(utc_t, GF_MPD_Descriptor);
 			utc_t->value = gf_strdup(url);
@@ -4105,13 +5491,16 @@
 				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-head:2014");
 				break;
 			case DASHER_UTCREF_XSDATE:
-				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http- xsdate:2014");
+				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-xsdate:2014");
+				dashif_ok = GF_TRUE;
 				break;
 			case DASHER_UTCREF_ISO:
 				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-iso:2014");
+				dashif_ok = GF_TRUE;
 				break;
 			case DASHER_UTCREF_NTP:
 				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-ntp:2014");
+				dashif_ok = GF_TRUE;
 				break;
 			case DASHER_UTCREF_INBAND:
 				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:direct:2014");
@@ -4119,34 +5508,41 @@
 			default:
 				break;
 			}
+			if (!dashif_ok && (ctx->profile==GF_DASH_PROFILE_DASHIF_LL)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] UTC reference %s allowed in DASH-IF Low Latency profile\n\tswitching to regular live profile\n", utc_t->scheme_id_uri));
+				ctx->profile = GF_DASH_PROFILE_LIVE;
+			}
+			if (!ctx->mpd->utc_timings)
+				ctx->mpd->utc_timings = gf_list_new();
 			gf_list_add(ctx->mpd->utc_timings, utc_t);
 		}
 	}
 	gf_dm_sess_del(sess);
 }
 
+
 static GF_Err dasher_switch_period(GF_Filter *filter, GF_DasherCtx *ctx)
 {
-	u32 i, count, j, nb_sets, nb_done, srd_rep_idx;
-	u32 nb_periods = 0;
-	Bool has_muxed_bases=GF_FALSE;
+	u32 i, count, nb_done;
 	char *period_id;
 	const char *remote_xlink = NULL;
+	const char *period_xlink = NULL;
 	u64 remote_dur = 0;
-	Bool empty_period = GF_FALSE;
-	Bool is_restore = GF_FALSE;
-	Bool has_as_id = GF_FALSE;
-	Bool has_deps = GF_FALSE;
 	GF_DasherPeriod *p;
-	Double period_idx, period_start, next_period_start, min_dur, min_adur, max_adur;
+	GF_Fraction64 period_start, next_period_start;
 	GF_DashStream *first_in_period=NULL;
 	p = ctx->current_period;
 
-	if (!ctx->out_path) {
-		ctx->out_path = gf_filter_pid_get_destination(ctx->opid);
-	}
-	if (ctx->current_period->period) {
-		dasher_udpate_periods_and_manifest(filter, ctx);
+	if (!ctx->gencues) {
+		if (!ctx->out_path) {
+			dasher_check_outpath(ctx);
+		}
+		if (ctx->current_period->period) {
+			if (ctx->dyn_rate)
+				dasher_update_dyn_bitrates(ctx);
+
+			dasher_udpate_periods_and_manifest(filter, ctx);
+		}
 	}
 
 	if (ctx->subdur_done || (ctx->current_period->period && (ctx->dmode == GF_MPD_TYPE_DYNAMIC_LAST)) )
@@ -4155,18 +5551,29 @@
 	if (ctx->current_period->period) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] End of Period %s\n", ctx->current_period->period->ID ? ctx->current_period->period->ID : ""));
 	}
+	ctx->is_period_restore = GF_FALSE;
+	ctx->is_empty_period = GF_FALSE;
+
+	//safety check at period switch, probe each first packet in case we have a reconfigure pending
+	count = gf_list_count(ctx->pids);
+	for (i=0; i<count;i++) {
+		GF_DashStream *ds = gf_list_get(ctx->pids, i);
+		gf_filter_pid_get_packet(ds->ipid);
+	}
+
 	//reset - don't destroy, it is in the MPD
 	ctx->current_period->period = NULL;
 	//switch
 	ctx->current_period = ctx->next_period;
 	ctx->next_period = p;
 	ctx->on_demand_done = GF_FALSE;
+	ctx->min_segment_start_time = ctx->last_min_segment_start_time = 0;
 
 	//reset input pids and detach output pids
 	count = gf_list_count(ctx->current_period->streams);
 	for (i=0; i<count;i++) {
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
-		if (ds->opid) {
+		if (ds->opid && !ctx->gencues) {
 			gf_filter_pid_remove(ds->opid);
 			ds->opid = NULL;
 		}
@@ -4179,27 +5586,26 @@
 
 	//figure out next period
 	count = gf_list_count(ctx->current_period->streams);
-	period_idx = 0;
-	period_start = -1;
+	ctx->period_idx = 0;
+	period_start.num = -1;
+	period_start.den = 1;
 	for (i=0; i<count; i++) {
-		Double pstart;
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
 
 		if (ds->done) continue;
-		if (ds->period_start < 0) {
-			pstart = -ds->period_start;
-			if (!period_idx || (pstart<period_idx)) period_idx = pstart;
+		if (ds->period_start.num < 0) {
+			s32 pstart = (s32) -ds->period_start.num;
+			if (!ctx->period_idx || (pstart < ctx->period_idx)) ctx->period_idx = pstart;
 		} else {
-			if ((period_start<0) || (ds->period_start < period_start)) period_start = ds->period_start;
+			if ((period_start.num<0) || (ds->period_start.num * period_start.den < period_start.num * ds->period_start.den)) {
+				period_start = ds->period_start;
+				assert(ds->period_start.den);
+			}
 		}
 	}
 
-	if (period_start>=0)
-		period_idx = 0;
-
-	if (ctx->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
-		nb_periods = dasher_period_count(ctx->current_period->streams);
-	}
+	if (period_start.num >= 0)
+		ctx->period_idx = 0;
 
 	if (ctx->first_context_load) {
 		GF_Err e = dasher_reload_context(filter, ctx);
@@ -4207,7 +5613,7 @@
 			ctx->setup_failure = e;
 			return e;
 		}
-		if (ctx->current_period->period) is_restore = GF_TRUE;
+		if (ctx->current_period->period) ctx->is_period_restore = GF_TRUE;
 
 		if (ctx->dmode==GF_DASH_DYNAMIC_LAST) {
 			dasher_udpate_periods_and_manifest(filter, ctx);
@@ -4223,7 +5629,6 @@
 	//filter out PIDs not for this period
 	count = gf_list_count(ctx->current_period->streams);
 	period_id = NULL;
-	srd_rep_idx = 2; //2 for compat with old arch
 	for (i=0; i<count; i++) {
 		Bool in_period=GF_TRUE;
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
@@ -4237,8 +5642,11 @@
 			in_period = GF_FALSE;
 		}
 		if (in_period) {
-			if ((period_start>=0) && (ds->period_start != period_start)) in_period = GF_FALSE;
-			else if ((period_idx>0) && (-ds->period_start != period_idx)) in_period = GF_FALSE;
+			if ((period_start.num>=0) && (ds->period_start.num * period_start.den != period_start.num * ds->period_start.den))
+				in_period = GF_FALSE;
+			else if ((ctx->period_idx>0) && ((s32) -ds->period_start.num != ctx->period_idx))
+				in_period = GF_FALSE;
+
 			if (!in_period && (first_in_period == ds))
 				period_id = NULL;
 		}
@@ -4254,11 +5662,13 @@
 		}
 		if (ds->stream_type == GF_STREAM_FILE) {
 			if (ds->xlink) remote_xlink = ds->xlink;
-			else empty_period = GF_TRUE;
-			remote_dur = (u64) (ds->period_dur * 1000);
-		} else if (!is_restore) {
-			//setup representation - the representation is created independently from the period
-			dasher_setup_rep(ctx, ds, &srd_rep_idx);
+			else ctx->is_empty_period = GF_TRUE;
+			remote_dur = 0;
+			if (ds->period_dur.den)
+				remote_dur = (u64) (ds->period_dur.num * 1000) / ds->period_dur.den;
+		} else if (!ctx->is_period_restore) {
+			if (ds->xlink)
+				period_xlink = ds->xlink;
 
 			if (ctx->post_play_events) {
 				GF_FilterEvent evt;
@@ -4268,6 +5678,8 @@
 
 				gf_filter_pid_set_discard(ds->ipid, GF_FALSE);
 
+				dasher_send_encode_hints(ctx, ds);
+
 				GF_FEVT_INIT(evt, GF_FEVT_PLAY, ds->ipid);
 				evt.play.speed = 1.0;
 				gf_filter_pid_send_event(ds->ipid, &evt);
@@ -4286,12 +5698,13 @@
 		}
 		if (nb_done == count) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] End of MPD (no more active streams)\n"));
+			ctx->on_demand_done = GF_TRUE;
 			return GF_EOS;
 		}
 	}
 
 	//we need a new period unless created during reload, create it
-	if (!is_restore) {
+	if (!ctx->is_period_restore) {
 		ctx->current_period->period = gf_mpd_period_new();
 		if (!ctx->mpd) dasher_setup_mpd(ctx);
 		gf_list_add(ctx->mpd->periods, ctx->current_period->period);
@@ -4302,33 +5715,51 @@
 		ctx->current_period->period->xlink_href = gf_strdup(remote_xlink);
 		ctx->current_period->period->duration = remote_dur;
 	}
+	else if (period_xlink) {
+		ctx->current_period->period->xlink_href = gf_strdup(period_xlink);
+	}
+
 
 	assert(period_id);
 
-	next_period_start = -1;
-	if (period_start>=0) {
-		ctx->current_period->period->start = (u64)(period_start*1000);
+	next_period_start.num = -1;
+	next_period_start.den = 1;
+	if (period_start.num >= 0) {
+		ctx->current_period->period->start = (u64)(period_start.num*1000 / period_start.den);
 		//check next period start
 		count = gf_list_count(ctx->next_period->streams);
 		for (i=0; i<count; i++)	 {
 			GF_DashStream *ds = gf_list_get(ctx->next_period->streams, i);
 			if (ds->done) continue;
-			if (ds->period_start<period_start) continue;
-			if ((next_period_start<0) || (next_period_start>ds->period_start))
+			if (ds->period_start.num * period_start.den < period_start.num * ds->period_start.den) continue;
+			if ((next_period_start.num<0) || (next_period_start.num * ds->period_start.den > ds->period_start.num * next_period_start.den)) {
 				next_period_start = ds->period_start;
+			}
 		}
 		//check current period dur
 		count = gf_list_count(ctx->current_period->streams);
 		for (i=0; i<count; i++)	 {
-			Double dur;
+			GF_Fraction64 dur;
 			GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
-			if (!ds->period_dur) continue;
-			dur = period_start + ds->period_dur;
-			if ((next_period_start<0) || (next_period_start>dur))
+			if (!ds->period_dur.den) continue;
+			dur = period_start;
+			if (ds->period_dur.den) {
+				if (dur.den != ds->period_dur.den)
+					dur.num += ds->period_dur.num * dur.den / ds->period_dur.den;
+				else
+					dur.num += ds->period_dur.num;
+			}
+			
+			if ((next_period_start.num < 0) || (next_period_start.num * dur.den > dur.num * next_period_start.den))
 				next_period_start = dur;
 		}
-		if (next_period_start>0) {
-			ctx->current_period->period->duration = (u32) ( (next_period_start - period_start) * 1000 );
+		if (next_period_start.num > 0) {
+			u64 next = next_period_start.num;
+			if (next_period_start.den != period_start.den) {
+				next *= period_start.den;
+				next /= next_period_start.den;
+			}
+			ctx->current_period->period->duration = (u32) ( (next - period_start.num) * 1000 / period_start.den);
 		}
 	}
 
@@ -4342,29 +5773,94 @@
 		ctx->current_period->period->ID = gf_strdup(szPName);
 	}
 
-	min_dur = min_adur = max_adur = 0;
-	//setup representation dependency / components (muxed)
+	//check all streams are ready
+	ctx->period_not_ready = GF_FALSE;
 	count = gf_list_count(ctx->current_period->streams);
 	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		//assign force_rep_end
+		if (next_period_start.num > 0) {
+			u64 next = next_period_start.num;
+			if (next_period_start.den != period_start.den) {
+				next *= period_start.den;
+				next /= next_period_start.den;
+			}
+
+			ds->force_rep_end = (u64) ((next - period_start.num) * ds->timescale / period_start.den);
+		}
+		if (ds->dcd_not_ready) {
+			ctx->period_not_ready = GF_TRUE;
+		}
+	}
+	//not all streams are ready, cannot setup period yet
+	if (ctx->period_not_ready)
+		return GF_OK;
+
+	return dasher_setup_period(filter, ctx, NULL);
+}
+
+static GF_Err dasher_setup_period(GF_Filter *filter, GF_DasherCtx *ctx, GF_DashStream *inject_ds)
+{
+	u32 i, count, j, nb_sets;
+	Bool has_muxed_bases=GF_FALSE;
+	const char *remote_xlink = NULL;
+	Bool has_as_id = GF_FALSE;
+	Bool has_deps = GF_FALSE;
+	const GF_PropertyValue *prop;
+	GF_Fraction64 min_dur, min_adur, max_adur;
+	u32 srd_rep_idx;
+
+	ctx->dyn_rate = GF_FALSE;
+	ctx->use_cues = GF_FALSE;
+	min_dur.num = min_adur.num = max_adur.num = 0;
+	min_dur.den = min_adur.den = max_adur.den = 1;
+	srd_rep_idx = 2; //2 for compat with old arch
+
+	count = gf_list_count(ctx->current_period->streams);
+	//setup representations
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		if (inject_ds && (ds != inject_ds))
+			continue;
+
+		if (ds->stream_type == GF_STREAM_FILE) {
+			if (ds->xlink) remote_xlink = ds->xlink;
+		} else if (!ctx->is_period_restore) {
+			//setup representation - the representation is created independently from the period
+			dasher_setup_rep(ctx, ds, &srd_rep_idx);
+		}
+	}
+
+	//setup representation dependency / components (muxed)
+	for (i=0; i<count; i++) {
 		Bool remove = GF_FALSE;
 		GF_DashStream *ds_video=NULL;
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		if (inject_ds && (ds != inject_ds))
+			continue;
+
 		ds->period = ctx->current_period;
+		ds->last_period = ds->period->period;
+
+		if (ds->dyn_bitrate) ctx->dyn_rate = GF_TRUE;
+		if (ds->inband_cues || ds->cues)
+			ctx->use_cues = GF_TRUE;
 
 		if (ctx->loop) {
-			Double d=0;
-			const GF_PropertyValue *prop = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DURATION);
+			prop = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DURATION);
 			if (prop && prop->value.lfrac.den) {
-				d = (Double) prop->value.lfrac.num;
-				d /= prop->value.lfrac.den;
-				if (ds->clamped_dur && (ds->clamped_dur<d))
+				GF_Fraction64 d;
+				d.num = prop->value.lfrac.num;
+				d.den = prop->value.lfrac.den;
+				if (ds->clamped_dur.num && (ds->clamped_dur.num * d.den < d.num * ds->clamped_dur.den)) {
 					d = ds->clamped_dur;
+				}
 
 				if (ds->stream_type == GF_STREAM_AUDIO) {
-					if (d > max_adur) max_adur = d;
-					if (!min_adur || (d < min_adur)) min_adur = d;
+					if (d.num * max_adur.den > max_adur.num * d.den) max_adur = d;
+					if (!min_adur.num || (d.num * min_adur.den < min_adur.num * d.den)) min_adur = d;
 				} else {
-					if (!min_dur || (d < min_dur)) min_dur = d;
+					if (!min_dur.num || (d.num * min_dur.den < min_dur.num * d.den)) min_dur = d;
 				}
 			}
 		}
@@ -4374,8 +5870,8 @@
 		} else if (remote_xlink) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] period uses xlink but other media source %s, ignoring source\n", ds->src_url));
 			remove = GF_TRUE;
-		} else if (empty_period) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] empty period defines but other media source %s, ignoring source\n", ds->src_url));
+		} else if (ctx->is_empty_period) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] empty period defined but other media source %s, ignoring source\n", ds->src_url));
 			remove = GF_TRUE;
 		}
 
@@ -4389,21 +5885,43 @@
 			continue;
 		}
 
-		if (next_period_start>0) {
-			ds->force_rep_end = (u64) ((next_period_start - period_start) * ds->timescale);
-		}
+		if (ctx->gencues)
+			ds->set_period_switch = GF_TRUE;
 
-		if (is_restore) continue;
+		if (ctx->is_period_restore) continue;
 
 		//add period descriptors
-		dasher_add_descriptors(&ctx->current_period->period->other_descriptors, ds->p_period_desc);
+		dasher_add_descriptors(&ctx->current_period->period->x_children, ds->p_period_desc);
 		//add representation descriptors
-		dasher_add_descriptors(&ds->rep->other_descriptors, ds->p_rep_desc);
+		dasher_add_descriptors(&ds->rep->x_children, ds->p_rep_desc);
 
 		if (ds->muxed_base) continue;
 
 		if (ds->stream_type==GF_STREAM_VISUAL)
 			ds_video = ds;
+
+		ds->skip_tpl_reuse = GF_FALSE;
+		// period resume (end of content replacement/splice/...): if using templates, check if period ID is used, if not force startNumber to resume
+		prop = gf_filter_pid_get_property_str(ds->ipid, "period_resume");
+		if (prop && prop->value.string && ctx->tpl && ds->mpd_timescale) {
+			char *template = ds->template;
+			if (!template) template = ctx->template;
+			if (
+				//undefined period name
+				!prop->value.string[0]
+				//template dor not resolve against period name
+				|| (template && !strstr(template, "$Period$"))
+			) {
+				u64 seg_duration = (u64)(ds->dash_dur.num) * ds->mpd_timescale / ds->dash_dur.den;
+				u64 period_start = ds->mpd_timescale * ctx->mpd->media_presentation_duration / 1000;
+				u64 num = period_start / seg_duration;
+				if (num * seg_duration < period_start)
+					num++;
+				ds->startNumber = (u32) (num+1);
+				ds->skip_tpl_reuse = GF_TRUE;
+			}
+		}
+
 		ds->nb_comp = 1;
 
 		for (j=0; j<count; j++) {
@@ -4413,33 +5931,44 @@
 			if (a_ds->dep_id && (a_ds->src_id==ds->src_id) && (a_ds->dep_id==ds->id) ) {
 				gf_list_add(ds->complementary_streams, a_ds);
 				has_deps = GF_TRUE;
-				if (!a_ds->rep->dependency_id) a_ds->rep->dependency_id = gf_strdup(ds->rep->id);
-			}
-			if (!a_ds->muxed_base && !strcmp(a_ds->rep_id, ds->rep_id) && (ctx->muxtype!=DASHER_MUX_RAW) ) {
-				a_ds->muxed_base = ds;
-				a_ds->dash_dur = ds->dash_dur;
-				has_muxed_bases = GF_TRUE;
-				ds->nb_comp++;
-
-				if (ctx->bs_switch==DASHER_BS_SWITCH_MULTI) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Bitstream Swicthing mode \"multi\" is not supported with multiplexed representations, disabling bitstream switching\n"));
-					ctx->bs_switch = DASHER_BS_SWITCH_OFF;
-				}
-				if (!ds->rep->codecs || !strstr(ds->rep->codecs, a_ds->rep->codecs)) {
-					gf_dynstrcat(&ds->rep->codecs, a_ds->rep->codecs, ",");
-				}
-
-				if (ctx->profile == GF_DASH_PROFILE_AVC264_LIVE) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Muxed representations not allowed in DASH-IF AVC264 live profile\n\tswitching to regular live profile\n"));
-					ctx->profile = GF_DASH_PROFILE_LIVE;
-				} else if (ctx->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Muxed representations not allowed in HbbTV 1.5 ISOBMF live profile\n\tswitching to regular live profile\n"));
-					ctx->profile = GF_DASH_PROFILE_LIVE;
-				} else if (ctx->profile == GF_DASH_PROFILE_AVC264_ONDEMAND) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Muxed representations not allowed in DASH-IF AVC264 onDemand profile\n\tswitching to regular onDemand profile\n"));
-					ctx->profile = GF_DASH_PROFILE_ONDEMAND;
+				if (!a_ds->rep->dependency_id) {
+					a_ds->rep->dependency_id = gf_strdup(ds->rep->id);
 				}
 			}
+			//check if this rep should be muxed: same rep ID, not raw format, not CMAF
+			if (a_ds->muxed_base) continue;
+			if (ctx->muxtype==DASHER_MUX_RAW) continue;
+			if (ctx->cmaf) continue;
+			if (strcmp(a_ds->rep_id, ds->rep_id)) continue;
+			if (a_ds->template && ds->template && strcmp(a_ds->template, ds->template)) continue;
+
+
+			a_ds->muxed_base = ds;
+			a_ds->dash_dur = ds->dash_dur;
+			has_muxed_bases = GF_TRUE;
+			ds->nb_comp++;
+
+			if (ctx->bs_switch==DASHER_BS_SWITCH_MULTI) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Bitstream Swicthing mode \"multi\" is not supported with multiplexed representations, disabling bitstream switching\n"));
+				ctx->bs_switch = DASHER_BS_SWITCH_OFF;
+			}
+			if (!ds->rep->codecs || !strstr(ds->rep->codecs, a_ds->rep->codecs)) {
+				gf_dynstrcat(&ds->rep->codecs, a_ds->rep->codecs, ",");
+			}
+
+			if (ctx->profile == GF_DASH_PROFILE_AVC264_LIVE) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Muxed representations not allowed in DASH-IF AVC264 live profile\n\tswitching to regular live profile\n"));
+				ctx->profile = GF_DASH_PROFILE_LIVE;
+			} else if (ctx->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Muxed representations not allowed in HbbTV 1.5 ISOBMFF live profile\n\tswitching to regular live profile\n"));
+				ctx->profile = GF_DASH_PROFILE_LIVE;
+			} else if (ctx->profile == GF_DASH_PROFILE_AVC264_ONDEMAND) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Muxed representations not allowed in DASH-IF AVC264 onDemand profile\n\tswitching to regular onDemand profile\n"));
+				ctx->profile = GF_DASH_PROFILE_ONDEMAND;
+			} else if (ctx->profile == GF_DASH_PROFILE_DASHIF_LL) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Muxed representations not allowed in DASH-IF Low Latency profile\n\tswitching to regular live profile\n"));
+				ctx->profile = GF_DASH_PROFILE_LIVE;
+			}
 		}
 		//use video as main stream for segmentation of muxed sources
 		if (ds_video != ds) {
@@ -4453,24 +5982,27 @@
 				}
 			}
 		}
+
+		if ((u32) ds->dash_dur.num * 1000 > ctx->def_max_seg_dur * ds->dash_dur.den )
+			ctx->def_max_seg_dur = (u32) ((ds->dash_dur.num * 1000) / ds->dash_dur.den);
 	}
 
 
-	if (ctx->loop && max_adur) {
-		if (max_adur != min_adur) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Audio streams in the period have different durations (min %lf, max %lf), may result in bad synchronization while looping\n", min_adur, max_adur));
+	if (ctx->loop && max_adur.num) {
+		if (max_adur.num * min_adur.den != min_adur.num * max_adur.den) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Audio streams in the period have different durations (min "LLU"/"LLD", max "LLU"/"LLD"), may result in bad synchronization while looping\n", min_adur.num, min_adur.den, max_adur.num, max_adur.den));
 		}
 		for (i=0; i<count; i++) {
 			GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
-			if (ds->duration.num > max_adur * ds->duration.den) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Input %s: max audio duration (%lf) in the period is less than duration (%lf), clamping will happen\n", ds->src_url , max_adur, ((Double)ds->duration.num)/ds->duration.den ));
+			if (ds->duration.num * max_adur.den > max_adur.num * ds->duration.den) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Input %s: max audio duration "LLU"/"LLD" in the period is less than duration "LLU"/"LLD", clamping will happen\n", ds->src_url, max_adur.num, max_adur.den, ds->duration.num, ds->duration.den ));
 			}
 			ds->clamped_dur = max_adur;
 		}
 	}
 
 
-	if (is_restore) return GF_OK;
+	if (ctx->is_period_restore) return GF_OK;
 
 	if (has_deps) {
 		for (i=0; i<count; i++) {
@@ -4513,7 +6045,37 @@
 		//not setup, create new AS
 		ds->set = gf_mpd_adaptation_set_new();
 		ds->owns_set = GF_TRUE;
+		//only set hls intra for visual stream if we have know for sure
+		if ((ds->stream_type==GF_STREAM_VISUAL) && (ds->sync_points_type==DASHER_SYNC_NONE)) {
+			ds->set->intra_only = GF_TRUE;
+		}
+		if (ctx->llhls) {
+			ds->set->use_hls_ll = GF_TRUE;
+			if (ctx->cdur.den)
+				ds->set->hls_ll_target_frag_dur = ((Double)ctx->cdur.num) / ctx->cdur.den;
+		}
 		ds->set->udta = ds;
+		if (ds->period_continuity_id) {
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(ds->ipid);
+			if (pck && (gf_filter_pck_get_cts(pck) != ds->period_continuity_next_cts)) {
+				gf_free(ds->period_continuity_id);
+				ds->period_continuity_id = NULL;
+			} else {
+				GF_MPD_Descriptor *desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:period-continuity:2015", ds->period_continuity_id);
+				gf_list_add(ds->set->supplemental_properties, desc);
+			}
+		}
+		ds->period_continuity_next_cts = 0;
+
+
+		if (ctx->mha_compat && ((ds->codec_id==GF_CODECID_MHAS) || (ds->codec_id==GF_CODECID_MPHA))) {
+			prop = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_MHA_COMPATIBLE_PROFILES);
+			if (prop) {
+				ds->set->nb_alt_mha_profiles = prop->value.uint_list.nb_items;
+				ds->set->alt_mha_profiles = prop->value.uint_list.vals;
+				ds->set->alt_mha_profiles_only = (ctx->mha_compat==DASHER_MPHA_COMP_ONLY) ? GF_TRUE : GF_FALSE;
+			}
+		}
 
 		if (!ds->set->representations)
 			ds->set->representations = gf_list_new();
@@ -4525,9 +6087,9 @@
 		ds->nb_rep = 1;
 
 		//add non-conditional adaptation set descriptors
-		dasher_add_descriptors(&ds->set->other_descriptors, ds->p_as_any_desc);
+		dasher_add_descriptors(&ds->set->x_children, ds->p_as_any_desc);
 		//new AS, add conditional adaptation set descriptors
-		dasher_add_descriptors(&ds->set->other_descriptors, ds->p_as_desc);
+		dasher_add_descriptors(&ds->set->x_children, ds->p_as_desc);
 
 		if (ds->as_id) has_as_id = GF_TRUE;
 		//for each following, check if same AS is possible
@@ -4537,10 +6099,11 @@
 			//we add to the adaptation set even if shared rep, we will remove it when assigning templates and pids
 			if (dasher_same_adaptation_set(ctx, ds, a_ds)) {
 				a_ds->set = ds->set;
+
 				gf_list_add(ds->set->representations, a_ds->rep);
 				ds->nb_rep++;
 				//add non-conditional adaptation set descriptors
-				dasher_add_descriptors(&ds->set->other_descriptors, a_ds->p_as_any_desc);
+				dasher_add_descriptors(&ds->set->x_children, a_ds->p_as_any_desc);
 			}
 		}
 	}
@@ -4575,6 +6138,9 @@
 		assert(rep);
 		ds = rep->playback.udta;
 
+		if (inject_ds && (ds != inject_ds))
+			continue;
+
 		if (!dasher_template_use_source_url(ds->template ? ds->template : ctx->template))
 			continue;
 
@@ -4610,6 +6176,7 @@
 
 	/*HbbTV 1.5 ISO live specific checks*/
 	if (ctx->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
+		u32 nb_periods = dasher_period_count(ctx->current_period->streams);
 		if (nb_sets > 16) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Max 16 adaptation sets in HbbTV 1.5 ISO live profile\n\tswitching to DASH AVC/264 live profile\n"));
 			ctx->profile = GF_DASH_PROFILE_AVC264_LIVE;
@@ -4618,26 +6185,34 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Max 32 periods in HbbTV 1.5 ISO live profile\n\tswitching to regular DASH AVC/264 live profile\n"));
 			ctx->profile = GF_DASH_PROFILE_AVC264_LIVE;
 		}
-		if (ctx->segdur < 1.0) {
+		if (ctx->segdur.num < (s32) ctx->segdur.den) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Min segment duration 1s in HbbTV 1.5 ISO live profile\n\tcapping to 1s\n"));
-			ctx->segdur = 1.0;
+			ctx->segdur.num = 1;
+			ctx->segdur.den = 1;
 		}
-		if (ctx->segdur > 15.0) {
+		if (ctx->segdur.num > 15 * (s32) ctx->segdur.den) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Max segment duration 15s in HbbTV 1.5 ISO live profile\n\tcapping to 15s\n"));
-			ctx->segdur = 15.0;
+			ctx->segdur.num = 15;
+			ctx->segdur.den = 1;
 		}
 	}
 
 	//init UTC reference time for dynamic
-	if (!ctx->mpd->availabilityStartTime && (ctx->dmode!=GF_MPD_TYPE_STATIC) ) {
+	if (!ctx->mpd->availabilityStartTime && (ctx->dmode!=GF_MPD_TYPE_STATIC) && !inject_ds) {
 		u64 dash_start_date = ctx->ast ? gf_net_parse_date(ctx->ast) : 0;
 
 		if (!ctx->utc_initialized) {
 			dasher_init_utc(filter, ctx);
+
+			//setup service description
+			if (ctx->profile == GF_DASH_PROFILE_DASHIF_LL) {
+				ctx->mpd->inject_service_desc = GF_TRUE;
+			}
 		}
 
 		ctx->mpd->gpac_init_ntp_ms = gf_net_get_ntp_ms();
 		ctx->mpd->availabilityStartTime = dasher_get_utc(ctx);
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] MPD Availability start time initialized to "LLU" ms\n", ctx->mpd->availabilityStartTime));
 
 		if (dash_start_date && (dash_start_date < ctx->mpd->availabilityStartTime)) {
 			u64 start_date_sec_ntp, secs;
@@ -4665,6 +6240,8 @@
 	for (i=0; i<count; i++) {
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
 		if (!ds->owns_set) continue;
+		if (inject_ds && (ds != inject_ds))
+			continue;
 		//check bitstream switching
 		dasher_check_bitstream_swicthing(ctx, ds->set);
 		//setup AS defaults, roles and co
@@ -4681,10 +6258,13 @@
 	//good to go !
 	for (i=0; i<count; i++) {
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		if (inject_ds && (ds != inject_ds))
+			continue;
 		//setup segmentation
 		ds->rep_init = GF_FALSE;
+		ds->presentation_time_offset = 0;
 		ds->seg_done = GF_FALSE;
-		ds->next_seg_start = (u32) ( ds->dash_dur * ds->timescale );
+		ds->next_seg_start = (u32) ( ((u64) ds->dash_dur.num * ds->timescale) / ds->dash_dur.den);
 		ds->adjusted_next_seg_start = ds->next_seg_start;
 		ds->segment_started = GF_FALSE;
 		ds->seg_number = ds->startNumber;
@@ -4696,13 +6276,12 @@
 			u32 nb_skip=0;
 
 			period_dur = (u64) (ctx->nb_secs_to_discard * ds->timescale);
-			seg_dur = (u64) (ds->dash_dur * ds->timescale);
+			seg_dur = (u64) (ds->dash_dur.num) * ds->timescale / ds->dash_dur.den;
 
 			nb_skip = (u32) (period_dur / seg_dur);
 			ds->ts_offset += nb_skip*seg_dur;
 			ds->seg_number += nb_skip;
 
-//			ds->max_period_dur += nb_skip*seg_dur;
 			ds->max_period_dur = ds->cumulated_dur;
 			ds->adjusted_next_seg_start += ds->ts_offset;
 			ds->next_seg_start += ds->ts_offset;
@@ -4713,13 +6292,14 @@
 
 	if (ctx->state)
 		dasher_context_update_period_start(ctx);
+
 	return GF_OK;
 }
 
 static void dasher_insert_timeline_entry(GF_DasherCtx *ctx, GF_DashStream *ds)
 {
 	GF_MPD_SegmentTimelineEntry *s;
-	u64 duration;
+	u64 duration, pto;
 	Bool is_first = GF_FALSE;
 	Bool seg_align = GF_FALSE;
 	GF_MPD_SegmentTimeline *tl=NULL;
@@ -4734,14 +6314,17 @@
 	}
 
 	//we only use segment timeline with templates
-	if (!ctx->stl) return;
+	if (!ds->stl) return;
 
 	if (gf_list_find(ds->set->representations, ds->rep)==0) is_first = GF_TRUE;
 	assert(ds->first_cts_in_next_seg > ds->first_cts_in_seg);
 	duration = ds->first_cts_in_next_seg - ds->first_cts_in_seg;
+	pto = ds->presentation_time_offset;
 	if (ds->timescale != ds->mpd_timescale) {
 		duration *= ds->mpd_timescale;
 		duration /= ds->timescale;
+
+		pto = gf_timestamp_rescale(pto, ds->timescale, ds->mpd_timescale);
 	}
 	seg_align = (ds->set->segment_alignment || ds->set->subsegment_alignment) ? GF_TRUE : GF_FALSE;
 	//not first and segment alignment, ignore
@@ -4753,7 +6336,7 @@
 	if (!seg_align) {
 		GF_MPD_SegmentTimeline **p_tl=NULL;
 		if (!ds->rep) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] failed to store timeline entru, no representation assigned !\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] failed to store timeline entry, no representation assigned !\n"));
 			return;
 		}
 
@@ -4773,7 +6356,7 @@
 		GF_MPD_SegmentTimeline **p_tl=NULL;
 
 		if (!ds->set) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] failed to store timeline entru, no AdpatationSet assigned !\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] failed to store timeline entry, no AdpatationSet assigned !\n"));
 			return;
 		}
 		assert(ds->set);
@@ -4783,7 +6366,8 @@
 				GF_SAFEALLOC(ds->set->segment_template, GF_MPD_SegmentTemplate);
 				if (ds->set->segment_template) {
 					ds->set->segment_template->start_number = (u32) -1;
-					ds->set->segment_template->timescale = ds->timescale;
+					ds->set->segment_template->timescale = ds->mpd_timescale;
+					ds->set->segment_template->presentation_time_offset = pto;
 				}
 				new_tl = GF_TRUE;
 			}
@@ -4795,7 +6379,8 @@
 				GF_SAFEALLOC(ds->set->segment_list, GF_MPD_SegmentList);
 				if (ds->set->segment_list) {
 					ds->set->segment_list->start_number = (u32) -1;
-					ds->set->segment_list->timescale = ds->timescale;
+					ds->set->segment_list->timescale = ds->mpd_timescale;
+					ds->set->segment_list->presentation_time_offset = pto;
 				}
 				new_tl = GF_TRUE;
 			}
@@ -4819,14 +6404,14 @@
 
 	//append to previous entry if possible
 	s = gf_list_last(tl->entries);
-	if (s && (s->duration == duration) && (s->start_time + (s->repeat_count+1) * s->duration == ds->seg_start_time)) {
+	if (s && (s->duration == duration) && (s->start_time + (s->repeat_count+1) * s->duration == ds->seg_start_time + pto)) {
 		s->repeat_count++;
 		return;
 	}
 	//nope, allocate
 	GF_SAFEALLOC(s, GF_MPD_SegmentTimelineEntry);
 	if (!s) return;
-	s->start_time = ds->seg_start_time;
+	s->start_time = ds->seg_start_time + pto;
 	s->duration = (u32) duration;
 	gf_list_add(tl->entries, s);
 }
@@ -4835,7 +6420,6 @@
 {
 	GF_MPD_SegmentTimeline *src_tl = NULL;
 	u32 i, j, count, nb_s;
-	if (!ctx->stl) return;
 	//get as level segment timeline, set it to NULL, reassign it to first rep and clone for other reps
 	if (ctx->tpl) {
 		assert(set->segment_template->segment_timeline);
@@ -4895,7 +6479,7 @@
 	}
 }
 
-static void dasher_flush_segment(GF_DasherCtx *ctx, GF_DashStream *ds)
+static void dasher_flush_segment(GF_DasherCtx *ctx, GF_DashStream *ds, Bool is_last_in_period)
 {
 	u32 i, count;
 	GF_DashStream *ds_done = NULL, *ds_not_done = NULL;
@@ -4906,6 +6490,10 @@
 	GF_DashStream *ds_log = NULL;
 	u64 first_cts_in_cur_seg=0;
 
+	//these are ignored
+	if (ds->merged_tile_dep)
+		return;
+
 	ctx->update_report = -1;
 
 	if (ds->segment_started) {
@@ -4921,6 +6509,7 @@
 		first_cts_in_cur_seg = ds->first_cts_in_seg;
 		if (ctx->mpd->max_segment_duration < seg_dur_ms)
 			ctx->mpd->max_segment_duration = seg_dur_ms;
+		ctx->def_max_seg_dur = 0;
 
 		seg_duration = (Double) base_ds->first_cts_in_next_seg - ds->first_cts_in_seg;
 		seg_duration /= base_ds->timescale;
@@ -4933,30 +6522,30 @@
 					ds->gm_duration_min = seg_duration;
 				if (ds->gm_duration_max<seg_duration)
 					ds->gm_duration_max = seg_duration;
-				ds->dash_dur = ds->gm_duration_total;
-				ds->dash_dur /= ds->gm_nb_segments;
+				ds->dash_dur.num = (s32) (1000.0 * ds->gm_duration_total / ds->gm_nb_segments);
+				ds->dash_dur.den = 1000;
 				ds->rep->dash_dur = ds->dash_dur;
 			}
 
-			if (ds->rep->segment_list && (ds->rep->segment_list->duration != ds->dash_dur) ) {
-				ds->rep->segment_list->duration = (u64) (ds->dash_dur * ds->rep->segment_list->timescale);
+			if (ds->rep->segment_list && (ds->rep->segment_list->duration * ds->dash_dur.den != ds->dash_dur.num) ) {
+				ds->rep->segment_list->duration = (u64) (ds->dash_dur.num) * ds->rep->segment_list->timescale / ds->dash_dur.den;
 			}
-			if (ds->set && ds->set->segment_list && ( ds->set->segment_list->duration != ds->dash_dur) ) {
-				ds->set->segment_list->duration = (u64) (ds->dash_dur * ds->set->segment_list->timescale);
+			if (ds->set->segment_list && (ds->set->segment_list->duration * ds->dash_dur.den != ds->dash_dur.num) ) {
+				ds->set->segment_list->duration = (u64) (ds->dash_dur.num) * ds->set->segment_list->timescale / ds->dash_dur.den;
 			}
-			if (ds->rep->segment_template && (ds->rep->segment_template->duration != ds->dash_dur) ) {
-				ds->rep->segment_template->duration = (u64) (ds->dash_dur * ds->rep->segment_template->timescale);
+			if (ds->rep->segment_template && (ds->rep->segment_template->duration * ds->dash_dur.den != ds->dash_dur.num) ) {
+				ds->rep->segment_template->duration = (u64) (ds->dash_dur.num) * ds->rep->segment_template->timescale / ds->dash_dur.den;
 			}
-			if (ds->set && ds->set->segment_template && (ds->set->segment_template->duration != ds->dash_dur) ) {
-				ds->set->segment_template->duration = (u64) (ds->dash_dur * ds->set->segment_template->timescale);
+			if (ds->set && ds->set->segment_template && (ds->set->segment_template->duration * ds->dash_dur.den != ds->dash_dur.num) ) {
+				ds->set->segment_template->duration = (u64) (ds->dash_dur.num) * ds->set->segment_template->timescale / ds->dash_dur.den;
 			}
 		}
-		if (!base_ds->done && !ctx->stl && ctx->tpl && !ctx->cues) {
+		if (!base_ds->done && !base_ds->stl && ctx->tpl && !ctx->cues && !ctx->forward_mode && !is_last_in_period) {
 
-			if (seg_duration< ds->dash_dur/2) {
+			if (2 * seg_duration * ds->dash_dur.den < ds->dash_dur.num) {
 
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Segment %d duration %g less than half DASH duration, consider reencoding or using segment timeline\n", ds->seg_number, seg_duration));
-			} else if (seg_duration > 3 * ds->dash_dur / 2) {
+			} else if (2 * seg_duration * ds->dash_dur.den > 3 * ds->dash_dur.num) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Segment %d duration %g more than 3/2 DASH duration, consider reencoding or using segment timeline\n", ds->seg_number, seg_duration));
 			}
 		}
@@ -4969,14 +6558,17 @@
 				Double diff = set_ds->set_seg_duration - seg_duration;
 
 				if (ABS(diff) > 0.001) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Segments are not aligned across representations: first rep segment duration %g but new segment duration %g for the same segment %d\n", set_ds->set_seg_duration, seg_duration, set_ds->seg_number));
-
+					if (set_ds->set->segment_alignment || set_ds->set->subsegment_alignment) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Segments are not aligned across representations: first rep segment duration %g but new segment duration %g for the same segment %d\n", set_ds->set_seg_duration, seg_duration, set_ds->seg_number));
+					}
 					if (ctx->profile != GF_DASH_PROFILE_FULL) {
 						set_ds->set->segment_alignment = GF_FALSE;
 						set_ds->set->subsegment_alignment = GF_FALSE;
 						ctx->profile = GF_DASH_PROFILE_FULL;
 						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] No segment alignment, switching to full profile\n"));
-						dasher_copy_segment_timelines(ctx, set_ds->set);
+
+						if (set_ds->stl)
+							dasher_copy_segment_timelines(ctx, set_ds->set);
 					}
 				}
 			}
@@ -5070,7 +6662,7 @@
 				s64 ast_diff;
 				u64 seg_ast = ctx->mpd->availabilityStartTime;
 				seg_ast += ctx->current_period->period->start;
-				seg_ast += (base_ds->adjusted_next_seg_start*1000) / base_ds->timescale;
+				seg_ast += gf_timestamp_rescale(base_ds->adjusted_next_seg_start, base_ds->timescale, 1000);
 
 				//if theoretical AST of the segment is less than the current UTC, we are producing the segment too late.
 				ast_diff = (s64) dasher_get_utc(ctx);
@@ -5088,18 +6680,17 @@
 			}
 #endif
 
-
 			assert(base_ds->segment_started);
 			base_ds->segment_started = GF_FALSE;
 
-			base_ds->next_seg_start += (u64) (base_ds->dash_dur * base_ds->timescale);
+			base_ds->next_seg_start += (u64) (base_ds->dash_dur.num) * base_ds->timescale / base_ds->dash_dur.den;
 			while (base_ds->next_seg_start <= base_ds->adjusted_next_seg_start) {
-				base_ds->next_seg_start += (u64) (base_ds->dash_dur * base_ds->timescale);
+				base_ds->next_seg_start += (u64) (base_ds->dash_dur.num) * base_ds->timescale / base_ds->dash_dur.den;
 				if (ctx->skip_seg)
-					base_ds->seg_number++;
+					base_ds->seg_number ++;
 			}
 			base_ds->adjusted_next_seg_start = base_ds->next_seg_start;
-			base_ds->seg_number++;
+			base_ds->seg_number ++;
 		}
 	}
 
@@ -5129,7 +6720,7 @@
 				if (ds->set->udta == set_ds)
 					set_ds->nb_rep_done++;
 			} else if (ctx->check_dur && !ds->force_rep_end) {
-				ds->force_rep_end = ds_done->first_cts_in_next_seg * ds->timescale / ds_done->timescale;
+				ds->force_rep_end = gf_timestamp_rescale(ds_done->first_cts_in_next_seg, ds_done->timescale, ds->timescale );
 			}
 		}
 	}
@@ -5141,6 +6732,8 @@
 	char *file_path = url;
 	char *res = url;
 
+	if (!manifest_path || !url) return NULL;
+	
 	if (!strncmp(manifest_path, "./", 2)) manifest_path+=2;
 	if (!strncmp(file_path, "./", 2)) file_path+=2;
 
@@ -5152,12 +6745,92 @@
 	return res;
 }
 
+static GFINLINE
+u64 dasher_translate_cts(GF_DashStream *ds, u64 cts)
+{
+	if (ds->cues) {
+		cts -= ds->first_cts;
+	} else if (cts < ds->first_dts) {
+		cts = 0;
+	} else if (ds->pts_minus_cts<0) {
+		if ((s64) (cts - ds->first_dts) >= -ds->pts_minus_cts) {
+			cts = cts - ds->first_dts + ds->pts_minus_cts;
+		} else {
+			cts = 0;
+		}
+	} else {
+		cts -= ds->first_cts;
+	}
+	return cts;
+}
+
 static void dasher_mark_segment_start(GF_DasherCtx *ctx, GF_DashStream *ds, GF_FilterPacket *pck, GF_FilterPacket *in_pck)
 {
 	GF_DASH_SegmentContext *seg_state=NULL;
 	char szSegmentName[GF_MAX_PATH], szSegmentFullPath[GF_MAX_PATH], szIndexName[GF_MAX_PATH];
 	GF_DashStream *base_ds = ds->muxed_base ? ds->muxed_base : ds;
 
+	if (ctx->forward_mode) {
+		const GF_PropertyValue *p_fname, *p_manifest;
+
+		p_fname = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_FILENAME);
+		p_manifest = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_FILENUM);
+		if (!p_fname || !p_fname->value.string || !p_manifest) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't fetch source URL / idx of segment in forward mode, cannot forward\n"));
+			ctx->in_error = GF_TRUE;
+			return;
+		}
+		strcpy(szSegmentName, p_fname->value.string);
+		//remove filename property
+		if (pck)
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENAME, NULL);
+
+		//check for manifest update
+		p_manifest = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_DASH_MANIFEST);
+		if (p_manifest) {
+			if (p_manifest->value.string) {
+				if (strstr(p_manifest->value.string, "<MPD")) {
+					if (ctx->do_m3u8) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Manifest forward mode got DASH MPD but output is HLS M3U8, cannot operate - change formats or dasher forward mode\n"));
+						ctx->in_error = GF_TRUE;
+						return;
+					} else {
+						dasher_forward_mpd(ctx, p_manifest->value.string);
+					}
+				} else {
+					if (ctx->do_mpd) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Manifest forward mode got M3U8 but output is DASH MPD, cannot operate - change formats or dasher forward mode\n"));
+						ctx->in_error = GF_TRUE;
+						return;
+					} else {
+						dasher_forward_manifest_raw(ctx, ds, p_manifest->value.string, NULL);
+					}
+				}
+			}
+			if (pck)
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_DASH_MANIFEST, NULL);
+		}
+
+		//check for HLS child playlist update
+		p_manifest = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_HLS_VARIANT);
+		p_fname = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_HLS_VARIANT_NAME);
+		if (p_manifest && p_fname && (p_fname->value.string_list.nb_items==p_manifest->value.string_list.nb_items)) {
+			u32 i, count = p_fname->value.string_list.nb_items;
+			for (i=0; i<count; i++)
+				dasher_forward_manifest_raw(ctx, ds, p_manifest->value.string_list.vals[i], p_fname->value.string_list.vals[i]);
+		}
+		if (pck) {
+			if (p_manifest)
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_HLS_VARIANT, NULL);
+			if (p_fname)
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_HLS_VARIANT_NAME, NULL);
+		}
+
+		//we need to move from segment name to output name
+		if (ctx->forward_mode==DASHER_FWD_ALL)
+			goto send_packet;
+	}
+
 	if (pck) {
 		if (ctx->ntp==DASHER_NTP_YES) {
 			u64 ntpts = gf_net_get_ntp_ts();
@@ -5165,8 +6838,21 @@
 		} else if (ctx->ntp==DASHER_NTP_REM) {
 			gf_filter_pck_set_property(pck, GF_PROP_PCK_SENDER_NTP, NULL);
 		}
+		if (!ctx->gencues) {
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENUM, NULL );
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_IDXFILENAME, NULL );
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENAME, NULL );
+		}
 
 		gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENUM, &PROP_UINT(base_ds->seg_number ) );
+
+		if (ctx->gencues) {
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+			if (ds->set_period_switch) {
+				ds->set_period_switch = GF_FALSE;
+				gf_filter_pck_set_property(pck, GF_PROP_PID_DASH_PERIOD_START, &PROP_LONGUINT(0) );
+			}
+		}
 	}
 
 	//only signal file name & insert timelines on one stream for muxed representations
@@ -5174,16 +6860,23 @@
 
 	ds->seg_start_time = ds->first_cts_in_seg;
 	if (ds->timescale != ds->mpd_timescale) {
-		ds->seg_start_time *= ds->mpd_timescale;
-		ds->seg_start_time /= ds->timescale;
+		ds->seg_start_time = gf_timestamp_rescale(ds->seg_start_time, ds->timescale, ds->mpd_timescale);
 	}
+	ds->last_min_segment_start_time = ds->first_cts_in_seg;
+	ds->last_min_segment_start_time *= 1000;
+	ds->last_min_segment_start_time /= ds->timescale;
+
+	if (ds->last_min_segment_start_time > ctx->min_segment_start_time)
+		ctx->min_segment_start_time = ds->last_min_segment_start_time;
 
 	if (ctx->store_seg_states) {
+		char *kms_uri;
+		const GF_PropertyValue *p;
+		assert(!ctx->gencues);
 		if (!ds->rep->state_seg_list) {
 			ds->rep->state_seg_list = gf_list_new();
 		}
-		if (!ds->rep->dash_dur) {
-			const GF_PropertyValue *p;
+		if (!ds->rep->dash_dur.num) {
 			ds->rep->timescale = ds->timescale;
 			ds->rep->streamtype = ds->stream_type;
 			ds->rep->timescale_mpd = ds->mpd_timescale;
@@ -5199,14 +6892,17 @@
 				}
 			}
 
-			if (!ds->rep->hls_single_file_name && !ctx->m2ts) {
+			if (!ds->rep->hls_single_file_name) {
 				switch (ctx->muxtype) {
 				case DASHER_MUX_TS:
 				case DASHER_MUX_OGG:
 				case DASHER_MUX_RAW:
 					break;
 				default:
-					ds->rep->hls_single_file_name = ds->init_seg;
+					if (ds->set->bitstream_switching && ds->set->segment_template)
+						ds->rep->hls_single_file_name = ds->set->segment_template->hls_init_name;
+					else
+						ds->rep->hls_single_file_name = ds->init_seg;
 				}
 			}
 			ds->rep->nb_chan = ds->nb_ch;
@@ -5220,6 +6916,74 @@
 		if (!seg_state) return;
 		seg_state->time = ds->seg_start_time;
 		seg_state->seg_num = ds->seg_number;
+		seg_state->llhls_mode = ctx->llhls;
+		ds->current_seg_state = seg_state;
+		seg_state->encrypted = GF_FALSE;
+
+		p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_HLS_KMS);
+		kms_uri = (p && p->value.string) ? p->value.string : NULL;
+		if (ds->tci) {
+			u32 s;
+			ds->iv_low++;
+			if (ds->iv_low == 0)
+				ds->iv_high++;
+			for (s=0; s<8; s++)
+				seg_state->hls_iv[s] = (ds->iv_high >> 8*(7-s) ) & 0xFF;
+			for (s=0; s<8; s++)
+				seg_state->hls_iv[s+8] = (ds->iv_low >> 8*(7-s) ) & 0xFF;
+
+			seg_state->encrypted = GF_TRUE;
+			gf_cryptfout_push_key(ds->dst_filter, & ds->tci->keys[ds->key_idx].key, &seg_state->hls_iv);
+
+			if (ds->tci->keys[ds->key_idx].hls_info)
+				kms_uri = ds->tci->keys[ds->key_idx].hls_info;
+
+			ds->nb_crypt_seg++;
+			if (ds->tci->keyRoll) {
+				if (ds->nb_crypt_seg == ds->tci->keyRoll) {
+					ds->nb_crypt_seg = 0;
+					ds->key_idx = (ds->key_idx+1) % ds->tci->nb_keys;
+				}
+			}
+		}
+		//we need a hard copy as the pid may reconfigure before we flush the segment
+		if (kms_uri) {
+			//insert IV if not mp4
+			if (!ds->tci && !strstr(kms_uri, "IV=") && (ctx->muxtype!=DASHER_MUX_ISOM)) {
+				p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_CENC_KEY_INFO);
+				if (p && (p->value.data.size==37)) {
+					char *kms_iv=NULL;
+					u8 *iv=p->value.data.ptr + 21;
+					char szIV[40];
+					u32 i;
+					strcpy(szIV, "IV=0x");
+					for (i=0; i<16; i++) {
+						char szVal[3];
+						sprintf(szVal, "%02X", iv[i]);
+						strcat(szIV, szVal);
+					}
+					if (!strstr(kms_uri, "URI=")) {
+						gf_dynstrcat(&kms_iv, "URI=\"", NULL);
+						gf_dynstrcat(&kms_iv, kms_uri, NULL);
+						gf_dynstrcat(&kms_iv, "\"", NULL);
+					} else {
+						gf_dynstrcat(&kms_iv, kms_uri, NULL);
+					}
+					gf_dynstrcat(&kms_iv, szIV, ",");
+					seg_state->hls_key_uri = kms_iv;
+				}
+			}
+			if (!seg_state->hls_key_uri) {
+				if (!strstr(kms_uri, "URI=")) {
+					gf_dynstrcat(&seg_state->hls_key_uri, "URI=\"", NULL);
+					gf_dynstrcat(&seg_state->hls_key_uri, kms_uri, NULL);
+					gf_dynstrcat(&seg_state->hls_key_uri, "\"", NULL);
+				} else {
+					seg_state->hls_key_uri = gf_strdup(kms_uri);
+				}
+			}
+		}
+
 		gf_list_add(ds->rep->state_seg_list, seg_state);
 		if (ctx->sigfrag) {
 			const GF_PropertyValue *frag_range = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_FRAG_RANGE);
@@ -5243,7 +7007,18 @@
 						}
 					}
 					ds->rep->segment_base->initialization_segment = url;
+
+					//first seg, remove sidx if present
+					//our frag_range includes sidx
+					const GF_PropertyValue *sidx_range = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_SIDX_RANGE);
+					if (sidx_range) {
+						u64 sidx_size = (u64)sidx_range->value.lfrac.den;
+						sidx_size -= (u64) sidx_range->value.lfrac.num;
+						seg_state->file_offset += sidx_size;
+						seg_state->file_size -= (u32) sidx_size;
+					}
 				}
+
 			} else {
 				gf_list_del_item(ds->rep->state_seg_list, seg_state);
 				gf_free(seg_state);
@@ -5259,7 +7034,7 @@
 	szIndexName[0] = 0;
 	if (ds->idx_template) {
 		//get final segment template - output file name is NULL, we already have solved this in source_setup
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, ds->set->bitstream_switching, szIndexName, base_ds->rep_id, NULL, base_ds->idx_template, NULL, base_ds->seg_start_time, base_ds->rep->bandwidth, base_ds->seg_number, ctx->stl);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, ds->set->bitstream_switching, szIndexName, base_ds->rep_id, NULL, base_ds->idx_template, NULL, base_ds->seg_start_time, base_ds->rep->bandwidth, base_ds->seg_number, base_ds->stl);
 
 		strcpy(szSegmentFullPath, szIndexName);
 		if (ctx->out_path) {
@@ -5274,6 +7049,8 @@
 	}
 
 	if (ctx->sseg) {
+		if (ctx->gencues) return;
+
 		if (ctx->sigfrag) {
 			const GF_PropertyValue *p = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_SIDX_RANGE);
 			if (p) {
@@ -5281,7 +7058,7 @@
 					GF_SAFEALLOC(ds->rep->segment_base->index_range, GF_MPD_ByteRange);
 					if (ds->rep->segment_base->index_range) {
 						ds->rep->segment_base->index_range->start_range = p->value.lfrac.num;
-						ds->rep->segment_base->index_range->end_range = p->value.lfrac.den;
+						ds->rep->segment_base->index_range->end_range = p->value.lfrac.den-1;
 						ds->rep->segment_base->index_range_exact = GF_TRUE;
 					}
 
@@ -5307,6 +7084,9 @@
 	if (ctx->sfile) {
 		GF_MPD_SegmentURL *seg_url;
 		assert(ds->rep->segment_list);
+
+		if (ctx->gencues) return;
+
 		GF_SAFEALLOC(seg_url, GF_MPD_SegmentURL);
 		if (!seg_url) return;
 
@@ -5359,29 +7139,38 @@
 		return;
 	}
 
-	if (!ctx->stl && !ctx->cues) {
+	if (!ds->stl && !ctx->cues && !ctx->forward_mode) {
 		Double drift, seg_start = (Double) ds->seg_start_time;
 		seg_start /= ds->mpd_timescale;
-		drift = seg_start - (ds->seg_number - ds->startNumber) * ds->dash_dur;
+		drift = seg_start - ((Double)(ds->seg_number - ds->startNumber)) * ds->dash_dur.num / ds->dash_dur.den;
 
-		if ((ds->dash_dur>0) && (ABS(drift) > ds->dash_dur/2)) {
+		if ((ds->dash_dur.num>0) && (ABS(drift) * 2 * ds->dash_dur.den > ds->dash_dur.num)) {
 			u64 cts = 0;
 			if (pck) {
-				cts = gf_filter_pck_get_cts(pck);
-				cts -= ds->first_cts;
+				cts = dasher_translate_cts(ds, gf_filter_pck_get_cts(pck) );
 			}
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] First CTS "LLU" in segment %d drifting by %g (more than half a segment duration) from segment time, consider reencoding or using segment timeline\n", cts, ds->seg_number, drift));
 		}
 	}
 
-	//get final segment template - output file name is NULL, we already have solved this in source_setup
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, ds->set->bitstream_switching, szSegmentName, base_ds->rep_id, NULL, base_ds->seg_template, NULL, base_ds->seg_start_time, base_ds->rep->bandwidth, base_ds->seg_number, ctx->stl);
+	if (!ctx->forward_mode) {
+		/*get final segment template - output file name is NULL, we already have solved this in source_setup
+		segment time must be PTO-adjusted !*/
+		u64 pto = ds->presentation_time_offset;
+		if (base_ds->timescale != base_ds->mpd_timescale) {
+			pto = gf_timestamp_rescale(pto, base_ds->timescale, base_ds->mpd_timescale);
+		}
+
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, ds->set->bitstream_switching, szSegmentName, base_ds->rep_id, NULL, base_ds->seg_template, NULL, base_ds->seg_start_time + pto, base_ds->rep->bandwidth, base_ds->seg_number, ds->stl);
+	}
+
 
+send_packet:
 	strcpy(szSegmentFullPath, szSegmentName);
 
 	if (ctx->out_path) {
 		char *rel = NULL;
-		if (ctx->do_m3u8 && ds->hls_vp_name) {
+		if (ctx->do_m3u8 && ds->hls_vp_name && !ctx->forward_mode) {
 			char *tmp = gf_url_concatenate(ctx->out_path, ds->hls_vp_name);
 			if (tmp) {
 				rel = gf_url_concatenate(tmp, szSegmentName);
@@ -5402,7 +7191,7 @@
 		seg_state->filename = gf_strdup(szSegmentName);
 	}
 
-	if (ds->rep->segment_list) {
+	if (ds->rep->segment_list && (ctx->forward_mode!=DASHER_FWD_ALL) && !ctx->gencues) {
 		GF_MPD_SegmentURL *seg_url;
 		GF_SAFEALLOC(seg_url, GF_MPD_SegmentURL);
 		if (seg_url) {
@@ -5468,7 +7257,7 @@
 		//get max duration
 		ts_offset = a_ds->est_next_dts;
 
-		if (max_ts_offset * a_ds->timescale < ts_offset * max_ts_scale) {
+		if (gf_timestamp_less(max_ts_offset, max_ts_scale, ts_offset, a_ds->timescale)) {
 			max_ts_offset = ts_offset;
 			max_ts_scale = a_ds->timescale;
 		}
@@ -5481,9 +7270,7 @@
 		if (a_ds->subdur_done)
 			continue;
 
-		ts_offset = max_ts_offset;
-		ts_offset *= a_ds->timescale;
-		ts_offset /= max_ts_scale;
+		ts_offset = gf_timestamp_rescale(max_ts_offset, max_ts_scale, a_ds->timescale);
 
 		a_ds->ts_offset = ts_offset;
 		if (a_ds->done) continue;
@@ -5505,6 +7292,8 @@
 
 			gf_filter_pid_set_discard(a_ds->ipid, GF_FALSE);
 
+			dasher_send_encode_hints(ctx, ds);
+
 			GF_FEVT_INIT(evt, GF_FEVT_PLAY, a_ds->ipid);
 			evt.play.speed = 1.0;
 			gf_filter_pid_send_event(a_ds->ipid, &evt);
@@ -5515,25 +7304,32 @@
 }
 
 //depending on input formats, streams may be declared with or without DCD. For streams requiring the config, wait for it
-static Bool dasher_check_streams_ready(GF_DasherCtx *ctx)
+static Bool dasher_check_period_ready(GF_DasherCtx *ctx, Bool is_session_end)
 {
 	u32 i=0;
 	GF_DashStream *ds;
-	ctx->streams_not_ready = GF_FALSE;;
-	while ((ds = gf_list_enum(ctx->pids, &i))) {
+	ctx->period_not_ready = GF_FALSE;
+	while ((ds = gf_list_enum(ctx->current_period->streams, &i))) {
+
+		if (is_session_end)
+			gf_filter_pid_set_discard(ds->ipid, GF_TRUE);
+
 		if (ds->dcd_not_ready) {
 			GF_FilterPacket *pck;
-			ds->dcd_not_ready = GF_FALSE;
+			u32 prev = ds->dcd_not_ready;
+			ds->dcd_not_ready = 0;
 			pck = gf_filter_pid_get_packet(ds->ipid);
 			if (!pck) {
-				ds->dcd_not_ready = GF_TRUE;
-				ctx->streams_not_ready = GF_TRUE;
+				u32 diff = gf_sys_clock() - prev;
+				if (diff > 10000) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Failed to initialize PID %s, no packets after %d ms, aborting\n", gf_filter_pid_get_name(ds->ipid), diff));
+					ctx->in_error = GF_TRUE;
+					return GF_FALSE;
+				}
+				ds->dcd_not_ready = prev;
+				ctx->period_not_ready = GF_TRUE;
 				return GF_FALSE;
 			}
-			if (ds->dcd_not_ready) {
-				ds->dcd_not_ready = GF_FALSE;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] PID %s first packet dispatched but no decoder config available, will use default one\n", gf_filter_pid_get_name(ds->ipid) ));
-			}
 		}
 	}
 	return GF_TRUE;
@@ -5587,23 +7383,24 @@
 				done /= ds->timescale;
 				snprintf(szDS, 200, "AS#%d.%d(%c) seg #%d %.2fs", set_idx, rep_idx, stype, ds->seg_number, done);
 			} else {
-				Double pcent;
+				Double pcent, ddur;
 				done = (Double) ds->adjusted_next_seg_start;
 				done -= (Double) ds->last_dts;
 				if (done<0)
 					done=0;
 				done /= ds->timescale;
-				done = ds->dash_dur-done;
+				ddur = ((Double)ds->dash_dur.num) / ds->dash_dur.den;
+				done = ddur - done;
 				//this may happen since we don't print info at segment start
 				if (done<0)
 					done=0;
-				pcent = done / ds->dash_dur;
+				pcent = done / ddur;
 				pc = (s32) (done * 10000);
 				snprintf(szDS, 200, "AS#%d.%d(%c) seg #%d %.2fs (%.2f %%)", set_idx, rep_idx, stype, ds->seg_number, done, 100*pcent);
 			}
 
 			mpdtime = (Double) ds->last_dts;
-			mpdtime -= (Double) ds->first_cts;
+			mpdtime -= (Double) ds->first_dts;
 			if (mpdtime<0) mpdtime=0;
 			mpdtime /= ds->timescale;
 
@@ -5630,7 +7427,7 @@
 
 static void dasher_drop_input(GF_DasherCtx *ctx, GF_DashStream *ds, Bool discard_all)
 {
-	if (ctx->sbound) {
+	if (ds->sbound) {
 		while (gf_list_count(ds->packet_queue)) {
 			GF_FilterPacket *pck = gf_list_pop_front(ds->packet_queue);
 			if (gf_filter_pck_get_sap(pck)) {
@@ -5648,15 +7445,95 @@
 	}
 }
 
+static void dasher_inject_eods(GF_DasherCtx *ctx, GF_DashStream *ds)
+{
+	//in dynamic mode, send end of dash segment marker to flush segment right away, otherwise we will
+	//flush the segment at next segment start which could be after the segment AST => 404
+	//
+	//if subdur no need to do so as we will close the muxer right after
+	//if sigfrag no need to do so since we don't generate media packets
+	if (!ctx->subdur && (ctx->dmode>=GF_DASH_DYNAMIC) && !ctx->sigfrag) {
+		GF_FilterPacket *eods_pck;
+		eods_pck = gf_filter_pck_new_alloc(ds->opid, 0, NULL);
+		if (eods_pck) {
+			gf_filter_pck_set_property(eods_pck, GF_PROP_PCK_EODS, &PROP_BOOL(GF_TRUE) );
+			gf_filter_pck_send(eods_pck);
+		}
+	}
+}
+
+static const char *empty_ttml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<tt xmlns=\"http://www.w3.org/ns/ttml\" xml:lang=\"en\">\n<head/>\n<body/>\n</tt>";
+
+static void dasher_send_empty_segment(GF_DasherCtx *ctx, GF_DashStream *ds)
+{
+	GF_FilterPacket *pck;
+	u8 *data;
+
+	if (ds->segment_started) {
+		u64 next_cts = ds->first_cts_in_seg + gf_timestamp_rescale(ds->dash_dur.num, ds->dash_dur.den, ds->timescale);
+		ds->first_cts_in_next_seg = next_cts;
+		ds->nb_comp_done ++;
+		ds->split_dur_next = 0;
+		ds->seg_done = GF_TRUE;
+
+		dasher_inject_eods(ctx, ds);
+
+		dasher_flush_segment(ctx, ds, GF_FALSE);
+
+		ds->first_cts_in_seg = next_cts;
+		ds->nb_comp_done = 0;
+		ds->split_dur_next = 0;
+	}
+
+	if (ds->codec_id == GF_CODECID_SUBS_XML) {
+		//write empty TTML doc
+		u32 len = (u32) strlen(empty_ttml);
+		pck = gf_filter_pck_new_alloc(ds->opid, len+1, &data);
+		memcpy(data, empty_ttml, len);
+		data[len] = 0;
+	} else if (ds->codec_id == GF_CODECID_WEBVTT) {
+		//write empty cue box, 8 byte size of type vtte
+		pck = gf_filter_pck_new_alloc(ds->opid, 8, &data);
+		data[0] = data[1] = data[2] = 0; data[3] = 8;
+		data[4] = 'v'; data[5] = 't'; data[6] = 't'; data[7] = 'e';
+	} else if (ds->codec_id == GF_CODECID_TX3G) {
+		//write empty tx3g sample, 2 bytes text len=0
+		pck = gf_filter_pck_new_alloc(ds->opid, 2, &data);
+		data[0] = data[1] = 0;
+	} else {
+		pck = gf_filter_pck_new_alloc(ds->opid, 0, &data);
+	}
+
+	gf_filter_pck_set_dts(pck, ds->first_cts_in_seg);
+	gf_filter_pck_set_cts(pck, ds->first_cts_in_seg);
+	gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+	//we don't assign a duration
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[Dasher] Sending empty text packet CTS "LLU"/%d\n", ds->first_cts_in_seg, ds->timescale));
+
+	dasher_mark_segment_start(ctx, ds, pck, NULL);
+	ds->segment_started = GF_TRUE;
+	gf_filter_pck_send(pck);
+
+	ds->first_cts_in_next_seg = ds->first_cts_in_seg + gf_timestamp_rescale(ds->dash_dur.num, ds->dash_dur.den, ds->timescale);
+	ds->est_first_cts_in_next_seg = ds->first_cts_in_next_seg;
+}
+
+
+
 static GF_Err dasher_process(GF_Filter *filter)
 {
 	u32 i, count, nb_init, has_init, nb_reg_done;
 	GF_DasherCtx *ctx = gf_filter_get_udta(filter);
 	GF_Err e;
 	Bool seg_done = GF_FALSE;
+	u32 nb_seg_waiting = 0;
+	u32 nb_seg_active = 0;
 
-	if (ctx->in_error)
+	if (ctx->in_error) {
+		gf_filter_abort(filter);
 		return GF_SERVICE_ERROR;
+	}
 
 	//session regulation is on and we have a an MPD (setup done) and a next time (first seg processed)
 	//check if we have reached the next time
@@ -5670,11 +7547,25 @@
 		}
 	}
 
-	if (ctx->streams_not_ready) {
-		if (! dasher_check_streams_ready(ctx)) return GF_OK;
+	//streams in period are not all ready, wait for them
+	if (ctx->period_not_ready) {
+		Bool is_eos;
+		//potpone until no pending connections, otherwise we may add input streams in the wrong period
+		if (gf_filter_connections_pending(filter))
+			return GF_OK;
+
+		is_eos = gf_filter_end_of_session(filter);
+		if (! dasher_check_period_ready(ctx, is_eos)) {
+			return is_eos ? GF_SERVICE_ERROR : GF_OK;
+		}
+		e = dasher_setup_period(filter, ctx, NULL);
+		if (e) return e;
+	}
+	if (ctx->check_connections) {
+		if (gf_filter_connections_pending(filter))
+			return GF_OK;
+		ctx->check_connections = GF_FALSE;
 	}
-	if (gf_filter_connections_pending(filter))
-		return GF_OK;
 
 	if (ctx->is_eos)
 		return GF_EOS;
@@ -5686,7 +7577,7 @@
 	for (i=0; i<count; i++) {
 		GF_DashStream *base_ds;
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
-
+		assert(ds);
 		if (ds->done) continue;
 		base_ds = ds->muxed_base ? ds->muxed_base : ds;
 		//subdur mode abort, don't process
@@ -5704,29 +7595,56 @@
 		while (1) {
 			u32 sap_type, dur, o_dur, split_dur;
 			s32 check_dur;
-			u64 cts, orig_cts, dts, ncts, split_dur_next;
+			u64 cts, orig_cts, dts, split_dur_next, pcont_cts;
 			Bool seg_over = GF_FALSE;
 			Bool is_packet_split = GF_FALSE;
 			Bool is_queue_flush = GF_FALSE;
-			GF_FilterPacket *pck;
 			GF_FilterPacket *dst;
+			GF_FilterPacket *pck = NULL;
 
-			assert(ds->period == ctx->current_period);
-			pck = gf_filter_pid_get_packet(ds->ipid);
-			//we may change period after a packet fetch (reconfigure of input pid)
-			if (ds->period != ctx->current_period) {
-				//in closest mode, flush queue
-				if (!ctx->sbound || !gf_list_count(ds->packet_queue)) {
-					assert(gf_list_find(ctx->current_period->streams, ds)<0);
-					count = gf_list_count(ctx->current_period->streams);
-					i--;
-					break;
+			if (!ds->request_period_switch) {
+				assert(ds->period == ctx->current_period);
+				pck = gf_filter_pid_get_packet(ds->ipid);
+				//we may change period after a packet fetch (reconfigure of input pid)
+				if ((ds->period != ctx->current_period) || ds->request_period_switch) {
+					//in closest mode, flush queue
+					if (!ds->sbound || !gf_list_count(ds->packet_queue)) {
+						assert(gf_list_find(ctx->current_period->streams, ds)<0);
+						count = gf_list_count(ctx->current_period->streams);
+						i--;
+						break;
+					}
+					is_queue_flush = GF_TRUE;
+				}
+
+				//text streams, insert an empty segment if we are one segment behind last produced segment on other pids
+				//we don't generate if behing this last time in case a packet comes in
+				//
+				//TODO: extend this to send empty segments for other streams (audio, video) in case of signal loss ??
+				if (!pck
+					&& (ds->stream_type==GF_STREAM_TEXT)
+					&& !ds->muxed_base
+				) {
+					u64 ddur_ms = (1000*ds->dash_dur.num)/ds->dash_dur.den;
+					while (ds->last_min_segment_start_time + ddur_ms < ctx->last_min_segment_start_time) {
+						dasher_send_empty_segment(ctx, ds);
+					}
 				}
+			} else {
 				is_queue_flush = GF_TRUE;
 			}
+			if (ds->sbound && pck && gf_filter_pck_is_blocking_ref(pck)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Cannot use `sbound` with blocking input packet references, disabling packet buffering for PID %s\n", gf_filter_pid_get_name(ds->ipid) ));
+				ds->sbound = DASHER_BOUNDS_OUT;
+			}
 
+			//skipped merged tile base
+			if (ds->merged_tile_dep) {
+				if (pck) gf_filter_pid_drop_packet(ds->ipid);
+				pck = NULL;
+			}
 			//queue mode
-			if (ctx->sbound) {
+			else if (ds->sbound) {
 				if (!is_queue_flush && pck) {
 					gf_filter_pck_ref(&pck);
 					gf_filter_pid_drop_packet(ds->ipid);
@@ -5756,8 +7674,47 @@
 
 
 			if (!pck) {
+				if (ds->request_period_switch) {
+					e = dasher_stream_period_changed(filter, ctx, ds, (ds->request_period_switch==2) ? GF_TRUE : GF_FALSE);
+					if (e < 0) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Period switch request failed.\n"));
+						i--;
+						break;
+					}
+					assert(gf_list_find(ctx->current_period->streams, ds)<0);
+					count = gf_list_count(ctx->current_period->streams);
+					i--;
+					break;
+				}
+
+
 				if (gf_filter_pid_is_eos(ds->ipid) || ds->clamp_done) {
 					u32 ds_done = 1;
+
+					if (!ds->clamp_done && !ds->muxed_base && (ds->stream_type==GF_STREAM_TEXT)) {
+						u32 s_idx;
+						u64 ddur_ms;
+						Bool over = GF_TRUE;
+						for (s_idx=0; s_idx<count; s_idx++) {
+							GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, s_idx);
+							if (a_ds == ds) continue;
+							if (a_ds->stream_type==GF_STREAM_TEXT) continue;
+							if (!a_ds->done) {
+								over = GF_FALSE;
+								break;
+							}
+						}
+						if (!over)
+							break;
+
+						//text streams, insert empty segments if we are one segment behind (and including) last produced segment on other pids
+						ddur_ms = (1000*ds->dash_dur.num)/ds->dash_dur.den;
+						while (ds->last_min_segment_start_time + ddur_ms <= ctx->min_segment_start_time) {
+							dasher_send_empty_segment(ctx, ds);
+						}
+					}
+
+
 					if (ctx->loop && dasher_check_loop(ctx, ds)) {
 						if (ctx->subdur)
 							break;
@@ -5768,7 +7725,8 @@
 					ds->clamp_done = GF_FALSE;
 
 					ctx->update_report = -1;
-					if (!ctx->sigfrag)
+					//opid may be NULL for skipped tile rep
+					if (!ctx->sigfrag && ds->opid)
 						gf_filter_pid_set_eos(ds->opid);
 
 					if (!ds->done) ds->done = ds_done;
@@ -5779,7 +7737,7 @@
 					assert(base_ds->nb_comp_done < base_ds->nb_comp);
 					base_ds->nb_comp_done ++;
 					if (base_ds->nb_comp_done == base_ds->nb_comp) {
-						dasher_flush_segment(ctx, base_ds);
+						dasher_flush_segment(ctx, base_ds, GF_FALSE);
 						base_ds->nb_comp_done = 0;
 					}
 					//loop on the entire source, mark as done for subdur and check if all other streams are done
@@ -5818,7 +7776,7 @@
 					}
 					ds->nb_pck = sn-1;
 				} else {
-					//no sn signaled, this implies we played from the begining
+					//no sn signaled, this implies we played from the beginning
 					if (ds->nb_pck < ds->seek_to_pck) {
 						ds->nb_pck ++;
 						dasher_drop_input(ctx, ds, GF_FALSE);
@@ -5833,21 +7791,39 @@
 			dts = gf_filter_pck_get_dts(pck);
 			if (dts==GF_FILTER_NO_TS) dts = cts;
 
+			pcont_cts = cts;
+
 			if (!ds->rep_init) {
 				u32 set_start_with_sap;
-				const GF_PropertyValue *p;
+				//for video, resync on sap 1 or 2 if not full profile
+				if ((ds->stream_type==GF_STREAM_VISUAL) && (ctx->profile != GF_DASH_PROFILE_FULL)) {
+					if ((sap_type!=GF_FILTER_SAP_1) && (sap_type!=GF_FILTER_SAP_2))
+						sap_type = 0;
+				}
 				if (!sap_type) {
+					//remember our timing
+					if (!ds->presentation_time_offset)
+						ds->presentation_time_offset = cts + 1;
+
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Representation not initialized, dropping non-SAP1/2 packet CTS "LLU"/%d\n", cts, ds->timescale));
 					dasher_drop_input(ctx, ds, GF_FALSE);
 					break;
 				}
-				p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DELAY);
-				if (p) ds->pts_minus_cts = p->value.sint;
 
 				set_start_with_sap = ctx->sseg ? base_ds->set->subsegment_starts_with_sap : base_ds->set->starts_with_sap;
 				if (!ds->muxed_base) {
+					u64 check_ts;
 					//force sap type to 1 for non-visual streams if strict_sap is set to off
 					if ((ds->stream_type!=GF_STREAM_VISUAL) && (ctx->strict_sap==DASHER_SAP_OFF) ) {
-						sap_type = 1;
+						switch (ds->codec_id) {
+						//MPEG-H requires saps
+						case GF_CODECID_MPHA:
+						case GF_CODECID_MHAS:
+							break;
+						default:
+							sap_type = 1;
+							break;
+						}
 					}
 					//set AS sap type
 					if (!set_start_with_sap) {
@@ -5864,16 +7840,35 @@
 					else if (set_start_with_sap != sap_type) {
 						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Segments do not start with the same SAP types: set initialized with %d but first packet got %d - bitstream will not be compliant\n", set_start_with_sap, sap_type));
 					}
-					//TODO setup proper PTO, the code below will break sync by realigning first AU of each stream
-					if (cts > ds->pts_minus_cts) {
-						u64 pto = cts - ds->pts_minus_cts;
+
+					check_ts = cts;
+					//in case we droped frames
+					if (ds->presentation_time_offset)
+						check_ts = ds->presentation_time_offset - 1;
+					//The code below assumes that the first frame in the stream has a presentation time of 0
+					ds->presentation_time_offset = 0;
+					if ((s64) check_ts + ds->pts_minus_cts > 0) {
+						u64 pto = check_ts + ds->pts_minus_cts;
+						u64 pto_adj = pto;
+						if (ds->timescale != ds->mpd_timescale) {
+							pto_adj = gf_timestamp_rescale(pto_adj, ds->timescale, ds->mpd_timescale);
+						}
 						if (ds->rep->segment_list)
-							ds->rep->segment_list->presentation_time_offset = pto;
+							ds->rep->segment_list->presentation_time_offset = pto_adj;
 						else if (ds->rep->segment_template)
-							ds->rep->segment_template->presentation_time_offset = pto;
+							ds->rep->segment_template->presentation_time_offset = pto_adj;
 						else if (ds->set->segment_template)
-							ds->set->segment_template->presentation_time_offset = pto;
-					}
+							ds->set->segment_template->presentation_time_offset = pto_adj;
+						else if (ds->set->segment_list)
+							ds->set->segment_list->presentation_time_offset = pto_adj;
+						else if (ds->rep->segment_base)
+							ds->rep->segment_base->presentation_time_offset = pto_adj;
+
+						ds->presentation_time_offset = pto;
+					}
+					//period continuity, skip priming in new periods
+					if (ds->period_continuity_id)
+						ds->pts_minus_cts = 0;
 				}
 
 				ds->first_cts = cts;
@@ -5881,6 +7876,7 @@
 				ds->rep_init++;
 				has_init++;
 			}
+
 			nb_init++;
 
 			if (ds->ts_offset) {
@@ -5889,19 +7885,23 @@
 			}
 
 			//ready to write MPD for the first time in dynamic mode with template
-			if (has_init && (nb_init==count) && (ctx->dmode==GF_MPD_TYPE_DYNAMIC) && ctx->tpl && ctx->do_mpd) {
+			if (has_init && (nb_init==count) && (ctx->dmode==GF_MPD_TYPE_DYNAMIC) && ctx->tpl && ctx->do_mpd && !ctx->dyn_rate) {
 				e = dasher_send_manifest(filter, ctx, GF_TRUE);
 				if (e) return e;
 			}
-			cts -= ds->first_cts;
+
+			cts = dasher_translate_cts(ds, cts);
 			dts -= ds->first_dts;
 
-			if (ctx->sreg && ctx->mpd->gpac_mpd_time && (dts * 1000 > ctx->mpd->gpac_mpd_time * ds->timescale)) {
+			if (ctx->sreg && ctx->mpd->gpac_mpd_time && gf_timestamp_greater(dts, ds->timescale, ctx->mpd->gpac_mpd_time, 1000)) {
 				nb_reg_done++;
 				break;
 			}
 
 			dur = o_dur = gf_filter_pck_get_duration(pck);
+			pcont_cts += dur;
+			if (ds->period_continuity_next_cts < pcont_cts)
+				ds->period_continuity_next_cts = pcont_cts;
 
 			split_dur = 0;
 			split_dur_next = 0;
@@ -5911,6 +7911,22 @@
 			if (ds->stream_type==GF_STREAM_AUDIO)
 				check_dur = dur;
 
+			//perform regulation of inputs to avoid dashing one stream faster than the others
+			//this is needed when inputs are not realtime and we have text streams for which we must decide
+			//if we insert empty segments
+			if (!base_ds->segment_started && ctx->min_segment_start_time) {
+				orig_cts = cts;
+				if (ds->split_dur_next)
+					cts += ds->split_dur_next;
+
+				if (gf_timestamp_greater(cts, ds->timescale, ctx->min_segment_start_time, 1000)) {
+					nb_seg_waiting++;
+					break;
+				}
+				cts = orig_cts;
+			}
+			nb_seg_active++;
+
 			//adjust duration and cts
 			orig_cts = cts;
 			if (ds->split_dur_next) {
@@ -5922,25 +7938,47 @@
 				is_packet_split = GF_TRUE;
 			}
 
-			if (ds->splitable && !ds->split_dur_next) {
-				//adding this sampl would exceed the segment duration
-				if ( (cts + dur) * base_ds->timescale >= base_ds->adjusted_next_seg_start * ds->timescale ) {
+			if (ds->splitable && !ds->split_dur_next && !ds->cues && !ds->inband_cues) {
+				Bool do_split = GF_FALSE;
+				//adding this sample would exceed the segment duration
+				if (gf_sys_old_arch_compat()) {
+					if (gf_timestamp_greater_or_equal(cts + dur, ds->timescale, base_ds->adjusted_next_seg_start, base_ds->timescale))
+						do_split = GF_TRUE;
+				} else {
+					if ( gf_timestamp_greater(cts + dur, ds->timescale, base_ds->adjusted_next_seg_start, base_ds->timescale))
+						do_split = GF_TRUE;
+				}
+				if (do_split) {
 					//this sample starts in the current segment - split it
-					if (cts * base_ds->timescale < base_ds->adjusted_next_seg_start * ds->timescale ) {
-						split_dur = (u32) (base_ds->adjusted_next_seg_start * ds->timescale / base_ds->timescale - ds->last_cts);
-						//we should patch the above >= once we get rid of master, but changing it might break some hashes
-						if (split_dur==dur) split_dur=0;
+					if (gf_timestamp_less(cts, ds->timescale, base_ds->adjusted_next_seg_start, base_ds->timescale) ) {
+						split_dur = (u32) (gf_timestamp_rescale(base_ds->adjusted_next_seg_start, base_ds->timescale, ds->timescale) - ds->last_cts);
+
+						if (gf_sys_old_arch_compat() && (split_dur==dur))
+							split_dur=0;
+
+						if (split_dur>=dur)
+							split_dur=0;
 					}
 				}
 			}
 
 			//mux rep, wait for a CTS more than our base if base not yet over
-			if ((base_ds != ds) && !base_ds->seg_done && (cts * base_ds->timescale > base_ds->last_cts * ds->timescale ) )
+			if ((base_ds != ds) && !base_ds->seg_done && gf_timestamp_greater(cts, ds->timescale, base_ds->last_cts, base_ds->timescale) )
 				break;
 
 			if (ds->seek_to_pck) {
 				ds->seek_to_pck = 0;
 			}
+			//base rep has been forced to another period, we switch asap
+			else if (base_ds->forced_period_switch) {
+				ds->seg_done = GF_TRUE;
+				dasher_inject_eods(ctx, ds);
+				seg_done = GF_TRUE;
+				dasher_stream_period_changed(filter, ctx, ds, GF_FALSE);
+				i--;
+				count--;
+				break;
+			}
 			//force flush mode, segment is done upon eos
 			else if (ctx->force_flush) {
 			}
@@ -5954,7 +7992,17 @@
 					}
 				}
 			}
-			//cue base - FIXME, check what was wrong before we merged PR #1121
+			//inband-cue based segmentation
+			else if (ds->inband_cues) {
+				const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_CUE_START);
+				if (p && p->value.boolean && base_ds->segment_started) {
+					seg_over = GF_TRUE;
+					if (ds == base_ds) {
+						base_ds->adjusted_next_seg_start = cts;
+					}
+				}
+			}
+			//cue-list based segmentation
 			else if (ds->cues) {
 				u32 cidx;
 				GF_DASHCueInfo *cue=NULL;
@@ -5974,7 +8022,7 @@
 						}
 					}
 					else if (cue->dts) {
-						u64 ts = cue->dts * ds->timescale;
+						u64 ts = (cue->dts - ds->cues_ts_offset) * ds->timescale;
 						u64 ts2 = dts * ds->cues_timescale;
 						if (ts == ts2) {
 							is_cue_split = GF_TRUE;
@@ -5986,10 +8034,10 @@
 						}
 					}
 					else if (cue->cts) {
-						s64 ts = cue->cts * ds->timescale;
+						s64 ts = (cue->cts - ds->cues_ts_offset) * ds->timescale;
 						s64 ts2 = (cts + ds->first_cts) * ds->cues_timescale;
 
-						//cues are given in track timeline (presentation time), substract the media time to pres time offset
+						//cues are given in track timeline (presentation time), subtract the media time to pres time offset
 						if (ds->cues_use_edits) {
 							ts2 += (s64) (ds->pts_minus_cts) * ds->cues_timescale;
 						}
@@ -6061,8 +8109,9 @@
 				}
 			}
 			//forcing max time
-			else if ((base_ds->force_rep_end && (cts * base_ds->timescale >= base_ds->force_rep_end * ds->timescale) )
-				|| (base_ds->clamped_dur && (cts + o_dur > ds->ts_offset + base_ds->clamped_dur * ds->timescale))
+			else if (
+				(base_ds->force_rep_end && gf_timestamp_greater_or_equal(cts, ds->timescale, base_ds->force_rep_end, base_ds->timescale) )
+				|| (base_ds->clamped_dur.num && (cts + o_dur > ds->ts_offset + base_ds->clamped_dur.num * ds->timescale / base_ds->clamped_dur.den))
 			) {
 				if (!base_ds->period->period->duration && base_ds->force_rep_end) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Inputs duration do not match, %s truncated to %g duration\n", ds->src_url, ((Double)base_ds->force_rep_end)/base_ds->timescale ));
@@ -6073,33 +8122,48 @@
 			}
 			//we have a SAP and we work in closest mode: check the next SAP in the queue, and decide if we
 			//split the segment at this SAP or wait for the next one
-			else if (ds->segment_started && ctx->sbound && sap_type && !is_queue_flush) {
-				u32 idx, nb_queued = gf_list_count(ds->packet_queue);
+			else if (ds->segment_started && ds->sbound && sap_type) {
+				u32 idx, nb_queued, nb_pck = gf_list_count(ds->packet_queue);
+				nb_queued = nb_pck;
+				if (is_queue_flush) nb_queued += 1;
+				
 				for (idx=1; idx<nb_queued; idx++) {
-					GF_FilterPacket *next = gf_list_get(ds->packet_queue, idx);
-					u32 sap_next = gf_filter_pck_get_sap(next);
-					if (!sap_next) continue;
+					GF_FilterPacket *next;
+					if (idx==nb_pck) {
+						next = gf_list_last(ds->packet_queue);
+					} else {
+						next = gf_list_get(ds->packet_queue, idx);
+						u32 sap_next = gf_filter_pck_get_sap(next);
+						if (!sap_next) continue;
+					}
 					u32 next_dur = gf_filter_pck_get_duration(next);
 					//compute cts next
 					u64 cts_next = gf_filter_pck_get_cts(next);
 					if (ds->ts_offset) {
 						cts_next += ds->ts_offset;
 					}
-					cts_next -= ds->first_cts;
+					cts_next = dasher_translate_cts(ds, cts_next);
+
+					if ((idx==nb_pck) && ctx->last_seg_merge) {
+						u64 next_seg_dur = (cts_next + next_dur - cts);
+						if (next_seg_dur * ds->dash_dur.den < (u64) ds->dash_dur.num * ds->timescale / 2)
+							continue;
+					}
+
 					//same rule as above
-					if ((cts_next + next_dur) * base_ds->timescale >= base_ds->adjusted_next_seg_start * ds->timescale ) {
+					if (gf_timestamp_greater_or_equal(cts_next + next_dur, ds->timescale, base_ds->adjusted_next_seg_start, base_ds->timescale)) {
 						Bool force_seg_flush = GF_FALSE;
-						s64 diff_next = cts_next * base_ds->timescale / ds->timescale;
+						s64 diff_next = gf_timestamp_rescale(cts_next, ds->timescale, base_ds->timescale);
 						diff_next -= base_ds->adjusted_next_seg_start;
 						//bounds at closest: if this SAP is closer to the target next segment start than the next SAP, split at this packet
-						if (ctx->sbound==DASHER_BOUNDS_CLOSEST) {
-							s64 diff = cts * base_ds->timescale / ds->timescale;
+						if (ds->sbound==DASHER_BOUNDS_CLOSEST) {
+							s64 diff = gf_timestamp_rescale(cts, ds->timescale, base_ds->timescale);
 							diff -= base_ds->adjusted_next_seg_start;
 							//this one may be negative, but we always want diff_next positive (next SAP in next segment)
 							if (diff<0)
 								diff = -diff;
 							//old arch was only using closest for tracks with sync points
-							if (gf_sys_old_arch_compat() && !base_ds->has_sync_points) {
+							if (gf_sys_old_arch_compat() && (base_ds->sync_points_type==DASHER_SYNC_NONE) ) {
 								if (diff_next > 0) {
 									force_seg_flush = GF_TRUE;
 								}
@@ -6126,11 +8190,16 @@
 			}
 			//we exceed segment duration - if segment was started, check if we need to stop segment
 			//if segment was not started we insert the packet anyway
-			else if (!ctx->sbound && ds->segment_started && ((cts + check_dur) * base_ds->timescale >= base_ds->adjusted_next_seg_start * ds->timescale ) ) {
+			else if (!ds->sbound && ds->segment_started && gf_timestamp_greater_or_equal(cts + check_dur, ds->timescale, base_ds->adjusted_next_seg_start, base_ds->timescale) ) {
 				//no sap, segment is over
 				if (! ctx->sap) {
 					seg_over = GF_TRUE;
 				}
+				else if ((ds->stream_type==GF_STREAM_AUDIO)
+					&& gf_timestamp_equal(cts + check_dur, ds->timescale, base_ds->adjusted_next_seg_start, base_ds->timescale)
+				) {
+
+				}
 				// sap, segment is over
 				else if (sap_type) {
 
@@ -6146,8 +8215,17 @@
 						for now we only complain for video*/
 						&& ((ds->stream_type==GF_STREAM_VISUAL) || (ctx->strict_sap==DASHER_SAP_ON) )
 					) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] WARNING! Max SAP type %d detected - switching to FULL profile\n", ds->nb_sap_4 ? 4 : 3));
-						ctx->profile = GF_DASH_PROFILE_FULL;
+						if ((sap_type == GF_FILTER_SAP_3)
+							&& (ds->codec_id==GF_CODECID_VVC)
+							&& (ds->inband_params==2)
+						) {
+							if (ds->set->starts_with_sap<3) {
+								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Using VVC with SAP type 3 and inband PPS, profile not yet defined\n", ds->nb_sap_4 ? 4 : 3));
+							}
+						} else {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] WARNING! Max SAP type %d detected - switching to FULL profile\n", ds->nb_sap_4 ? 4 : 3));
+							ctx->profile = GF_DASH_PROFILE_FULL;
+						}
 						if (ctx->sseg)
 							ds->set->subsegment_starts_with_sap = sap_type;
 						else
@@ -6169,17 +8247,35 @@
 			//because this is the before-last sample, don't flush unless:
 			//- we have an asto set (low latency)
 			//- this is not an audio stream or all samples are SAPs
+			//- we use cues
 			else if (seg_over && ds->nb_samples_in_source && !ctx->loop
 				&& (ds->nb_pck+1 == ds->nb_samples_in_source)
+				&& !ds->inband_cues && !ds->cues
 				&& !ctx->asto
-				&& !(!ds->has_sync_points && (ds->stream_type!=GF_STREAM_AUDIO))
+				&& ! ((ds->sync_points_type==DASHER_SYNC_NONE) && (ds->stream_type!=GF_STREAM_AUDIO))
 			) {
 				seg_over = GF_FALSE;
 			}
 			//if dur=0 (some text streams), don't flush segment
 			if (seg_over && dur) {
 				assert(!ds->seg_done);
+
+				if (ds->request_period_switch && !gf_list_count(ds->packet_queue)) {
+					e = dasher_stream_period_changed(filter, ctx, ds, (ds->request_period_switch==2) ? GF_TRUE : GF_FALSE);
+					if (e < 0) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Period switch request failed.\n"));
+						break;
+					}
+					assert(gf_list_find(ctx->current_period->streams, ds)<0);
+					count = gf_list_count(ctx->current_period->streams);
+					i--;
+					break;
+				}
+
 				ds->seg_done = GF_TRUE;
+
+				dasher_inject_eods(ctx, ds);
+
 				ds->first_cts_in_next_seg = cts;
 				assert(base_ds->nb_comp_done < base_ds->nb_comp);
 				base_ds->nb_comp_done ++;
@@ -6188,7 +8284,7 @@
 					ds->split_dur_next = (u32) split_dur_next;
 
 				if (base_ds->nb_comp_done == base_ds->nb_comp) {
-					dasher_flush_segment(ctx, base_ds);
+					dasher_flush_segment(ctx, base_ds, GF_FALSE);
 					seg_done = GF_TRUE;
 				}
 				break;
@@ -6200,13 +8296,11 @@
 				cts = ds->last_cts;
 				dts = ds->last_dts;
 			} else {
-
-				ncts = cts + (split_dur ? split_dur : dur);
+				u64 ncts = cts + (split_dur ? split_dur : dur);
 				if (ncts>ds->est_first_cts_in_next_seg)
 					ds->est_first_cts_in_next_seg = ncts;
 
-				ncts *= 1000;
-				ncts /= ds->timescale;
+				ncts = gf_timestamp_rescale(ncts, ds->timescale, 1000);
 				if (ncts>base_ds->max_period_dur)
 					base_ds->max_period_dur = ncts;
 
@@ -6225,7 +8319,7 @@
 
 				ds->cumulated_dur += dur;
 
-				//drop packet if not spliting
+				//drop packet if not splitting
 				if (!ds->split_dur_next)
 					gf_filter_pid_drop_packet(ds->ipid);
 
@@ -6237,20 +8331,23 @@
 				continue;
 			}
 			//create new ref to input
-			dst = gf_filter_pck_new_ref(ds->opid, NULL, 0, pck);
+			dst = gf_filter_pck_new_ref(ds->opid, 0, 0, pck);
+			if (!dst) return GF_OUT_OF_MEM;
+
 			//merge all props
 			gf_filter_pck_merge_properties(pck, dst);
 			//we have ts offset, use computed cts and dts
 			if (ds->ts_offset) {
-				gf_filter_pck_set_cts(dst, cts + ds->first_cts);
-				gf_filter_pck_set_dts(dst, dts + ds->first_dts);
+				gf_filter_pck_set_cts(dst, gf_filter_pck_get_cts(pck) + ds->ts_offset);
+				gf_filter_pck_set_dts(dst, gf_filter_pck_get_dts(pck) + ds->ts_offset);
 			}
 
-			if (gf_sys_old_arch_compat() && ds->clamped_dur && ctx->loop && (cts + 2*o_dur >= ds->ts_offset + base_ds->clamped_dur * ds->timescale)
+			if (gf_sys_old_arch_compat() && ds->clamped_dur.num && ctx->loop
+				&& (cts + 2*o_dur >= ds->ts_offset + base_ds->clamped_dur.num * ds->timescale / base_ds->clamped_dur.den)
 			) {
 				u32 _dur = dur;
 				/* simple round with (int)+.5 to avoid trucating .99999 to 0 */
-				dur = (u32)( ds->clamped_dur * ds->timescale - (dts - ds->ts_offset) + 0.5);
+				dur = (u32) (ds->clamped_dur.num * ds->timescale / ds->clamped_dur.den - (dts - ds->ts_offset) + 0.5);
 				//it may happen that the sample duration is 0 if the clamp duration is right after the sample DTS and timescale is not big enough to express it - force to 1
 				if (dur==0)
 					dur=1;
@@ -6264,18 +8361,8 @@
 				dasher_mark_segment_start(ctx, ds, dst, pck);
 				ds->segment_started = GF_TRUE;
 			}
-			//if split, adjust duration
-			if (split_dur) {
-				u32 cumulated_split_dur = split_dur;
-				gf_filter_pck_set_duration(dst, split_dur);
-				//adjust dur
-				cumulated_split_dur += (u32) (cts - orig_cts);
-				assert( dur > split_dur);
-				ds->split_dur_next = cumulated_split_dur;
-				dur = split_dur;
-			}
 			//prev packet was split
-			else if (is_packet_split) {
+			if (is_packet_split) {
 				u64 diff=0;
 				u8 dep_flags = gf_filter_pck_get_dependency_flags(pck);
 				u64 ts = gf_filter_pck_get_cts(pck);
@@ -6295,9 +8382,21 @@
 				//add sample is redundant flag
 				dep_flags |= 0x1;
 				gf_filter_pck_set_dependency_flags(dst, dep_flags);
+				//this one might be incorrect of this split packet is also split, but we update the duration right below
 				gf_filter_pck_set_duration(dst, dur);
 			}
 
+			//if split, adjust duration - this may happen on a split packet, if it covered 3 or more segments
+			if (split_dur) {
+				u32 cumulated_split_dur = split_dur;
+				gf_filter_pck_set_duration(dst, split_dur);
+				//adjust dur
+				cumulated_split_dur += (u32) (cts - orig_cts);
+				assert( dur > split_dur);
+				ds->split_dur_next = cumulated_split_dur;
+				dur = split_dur;
+			}
+
 			//remove NTP
 			if (ctx->ntp != DASHER_NTP_KEEP)
 				gf_filter_pck_set_property(dst, GF_PROP_PCK_SENDER_NTP, NULL);
@@ -6307,26 +8406,25 @@
 				u64 ats;
 				ats = gf_filter_pck_get_dts(dst);
 				if (ats!=GF_FILTER_NO_TS) {
-					ats *= ds->force_timescale;
-					ats /= ds->timescale;
+					ats = gf_timestamp_rescale(ats, ds->timescale, ds->force_timescale);
 					gf_filter_pck_set_dts(dst, ats);
 				}
 				ats = gf_filter_pck_get_cts(dst);
 				if (ats!=GF_FILTER_NO_TS) {
-					ats *= ds->force_timescale;
-					ats /= ds->timescale;
+					ats = gf_timestamp_rescale(ats, ds->timescale, ds->force_timescale);
 					gf_filter_pck_set_cts(dst, ats);
 				}
 				ats = (u64) gf_filter_pck_get_duration(dst);
 				if (ats) {
-					ats *= ds->force_timescale;
-					ats /= ds->timescale;
+					ats = gf_timestamp_rescale(ats, ds->timescale, ds->force_timescale);
 					gf_filter_pck_set_duration(dst, (u32) ats);
 				}
 			}
 
 			ds->cumulated_dur += dur;
 
+			if (ds->current_seg_state && gf_filter_pck_get_crypt_flags(pck))
+				ds->current_seg_state->encrypted = GF_TRUE;
 			//TODO check drift between MPD start time and min CTS in segment (not just first CTS in segment)
 
 			//send packet
@@ -6335,12 +8433,30 @@
 			if (ctx->update_report>=0)
 				ctx->update_report++;
 
-			//drop packet if not spliting
+			if (ds->dyn_bitrate) {
+				u32 dsize;
+				u64 rdts = gf_filter_pck_get_dts(pck);
+				gf_filter_pck_get_data(pck, &dsize);
+				if (!ds->rate_first_dts_plus_one)
+					ds->rate_first_dts_plus_one = 1 + rdts;
+				ds->rate_last_dts = rdts;
+				ds->rate_media_size += dsize;
+			}
+
+			//drop packet if not splitting
 			if (!ds->split_dur_next)
 				dasher_drop_input(ctx, ds, GF_FALSE);
+
 		}
 	}
-	nb_init = 0;
+
+	if (nb_seg_waiting && !nb_seg_active) {
+		ctx->last_min_segment_start_time = ctx->min_segment_start_time;
+		ctx->min_segment_start_time = 0;
+		return GF_OK;
+	}
+
+	nb_init = 0;
 	for (i=0; i<count; i++) {
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
 		//if (ds->muxed_base) ds = ds->muxed_base;
@@ -6371,6 +8487,10 @@
 				if (!ctx->mpd->publishTime) {
 					update_manifest = GF_TRUE;
 				}
+				//whenever we have a new seg in HLS, push new manifest
+				else if (ctx->do_m3u8) {
+					update_manifest = GF_TRUE;
+				}
 				//we have a minimum ipdate period
 				else if (ctx->mpd->minimum_update_period) {
 					u64 diff = dasher_get_utc(ctx) - ctx->mpd->publishTime;
@@ -6384,25 +8504,27 @@
 			if (update_manifest)
 				dasher_send_manifest(filter, ctx, GF_FALSE);
 		}
-
+	} else if (ctx->force_hls_ll_manifest) {
+		ctx->force_hls_ll_manifest = GF_FALSE;
+		dasher_send_manifest(filter, ctx, GF_FALSE);
 	}
 
-	//still some running streams in period
+	//still some running streams in period - do not ask for reschedule, wait for input packets to be available
 	if (count && (nb_init<count)) {
-		gf_filter_post_process_task(filter);
 		return GF_OK;
 	}
 
-	//in subdur mode once we are done, flush outpud pids and discard all input packets
+	//in subdur mode once we are done, flush output pids and discard all input packets
 	//this is done at the end to be able to resume dashing when loop is requested
 	if (ctx->subdur) {
 		for (i=0; i<count; i++) {
 			GF_FilterPacket *eods_pck;
 			GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
 			if (ds->done) continue;
+			eods_pck = gf_filter_pck_new_alloc(ds->opid, 0, NULL);
+			if (!eods_pck) return GF_OUT_OF_MEM;
 			ds->done = 2;
 			ds->subdur_done = GF_TRUE;
-			eods_pck = gf_filter_pck_new_alloc(ds->opid, 0, NULL);
 			gf_filter_pck_set_property(eods_pck, GF_PROP_PCK_EODS, &PROP_BOOL(GF_TRUE) );
 			gf_filter_pck_send(eods_pck);
 
@@ -6414,11 +8536,14 @@
 	//proper segment size for segment_list+byte_range mode
 	if (ctx->nb_seg_url_pending) {
 		u64 diff;
-		if (!ctx->last_evt_check_time) ctx->last_evt_check_time = gf_sys_clock_high_res();
+		if (!ctx->last_evt_check_time) {
+			ctx->last_evt_check_time = gf_sys_clock_high_res();
+			gf_filter_prevent_blocking(filter, GF_TRUE);
+		}
 
 		diff = gf_sys_clock_high_res() - ctx->last_evt_check_time;
-		if (diff < 1000000) {
-			gf_filter_post_process_task(filter);
+		if (diff < 10000000) {
+			gf_filter_ask_rt_reschedule(filter, 1000);
 			return GF_OK;
 		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] timeout %d segment info still pending but no event from muxer after "LLU" us, aborting\n", ctx->nb_seg_url_pending, diff));
@@ -6428,6 +8553,7 @@
 	if (ctx->sseg && !ctx->on_demand_done && !ctx->sigfrag) {
 		return GF_OK;
 	}
+	gf_filter_prevent_blocking(filter, GF_FALSE);
 	ctx->force_period_switch = GF_FALSE;
 	//done with this period, do period switch - this will update the MPD if needed
 	e = dasher_switch_period(filter, ctx);
@@ -6470,6 +8596,7 @@
 		GF_FEVT_INIT(evt, GF_FEVT_STOP, ds->ipid);
 		gf_filter_pid_send_event(ds->ipid, &evt);
 
+		dasher_send_encode_hints(ctx, ds);
 		GF_FEVT_INIT(evt, GF_FEVT_PLAY, ds->ipid);
 		evt.play.speed = 1.0;
 		if (!ctx->subdur || !ctx->loop) {
@@ -6500,6 +8627,57 @@
 	gf_filter_post_process_task(filter);
 }
 
+static void dasher_process_hls_ll(GF_DasherCtx *ctx, const GF_FilterEvent *evt)
+{
+	u32 i, count = gf_list_count(ctx->pids);
+	GF_DASH_SegmentContext *sctx;
+	GF_DashStream *ds = NULL;
+
+	if (ctx->forward_mode)
+		return;
+
+	if (!ctx->store_seg_states) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Received fragment size info event but no associated segment state\n"));
+		return;
+	}
+	for (i=0; i<count; i++) {
+		ds = gf_list_get(ctx->pids, i);
+		if (ds->opid == evt->base.on_pid) break;
+		ds = NULL;
+	}
+	if (!ds) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Received fragment size info event but no associated pid\n"));
+		return;
+	}
+	if (ds->muxed_base)
+		ds = ds->muxed_base;
+
+	sctx = gf_list_get(ds->pending_segment_states, 0);
+	if (!sctx || !ctx->nb_seg_url_pending) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Received segment size info event but no pending segments\n"));
+		return;
+	}
+	sctx->frags = gf_realloc(sctx->frags, sizeof (GF_DASH_FragmentContext) * (sctx->nb_frags+1));
+	if (!sctx->frags) {
+		sctx->nb_frags = 0;
+		return;
+	}
+	sctx->frags[sctx->nb_frags].size = evt->frag_size.size;
+	sctx->frags[sctx->nb_frags].offset = evt->frag_size.offset;
+	if (evt->frag_size.duration.den) {
+		sctx->frags[sctx->nb_frags].duration = (u32) ((u64) evt->frag_size.duration.num * ds->rep->timescale / evt->frag_size.duration.den);
+	} else {
+		sctx->frags[sctx->nb_frags].duration = 0;
+	}
+
+	sctx->frags[sctx->nb_frags].independent = evt->frag_size.independent;
+	sctx->nb_frags++;
+	if (evt->frag_size.is_last) {
+		sctx->llhls_done = GF_TRUE;
+	} else {
+		ctx->force_hls_ll_manifest = GF_TRUE;
+	}
+}
 
 static Bool dasher_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
 {
@@ -6527,6 +8705,17 @@
 
 	if (evt->base.type == GF_FEVT_PLAY) {
 		ctx->is_playing = GF_TRUE;
+		if (!ctx->sfile && !ctx->stl && !ctx->use_cues) {
+			GF_FilterEvent anevt;
+			GF_FEVT_INIT(anevt, GF_FEVT_ENCODE_HINTS, NULL)
+			count = gf_list_count(ctx->pids);
+			for (i=0; i<count; i++) {
+				GF_DashStream *ds = gf_list_get(ctx->pids, i);
+				anevt.base.on_pid = ds->ipid;
+				anevt.encode_hints.intra_period = ds->dash_dur;
+				gf_filter_pid_send_event(ds->ipid, &anevt);
+			}
+		}
 		return GF_FALSE;
 	}
 	if (evt->base.type == GF_FEVT_STOP) {
@@ -6534,8 +8723,15 @@
 		return GF_FALSE;
 	}
 
+	if (evt->base.type == GF_FEVT_FRAGMENT_SIZE) {
+		dasher_process_hls_ll(ctx, evt);
+		return GF_TRUE;
+	}
 	if (evt->base.type != GF_FEVT_SEGMENT_SIZE) return GF_FALSE;
 
+	if (ctx->forward_mode==DASHER_FWD_ALL)
+		return GF_TRUE;
+
 	count = gf_list_count(ctx->pids);
 	for (i=0; i<count; i++) {
 		u64 r_start, r_end;
@@ -6548,7 +8744,7 @@
 		if (ctx->store_seg_states && !evt->seg_size.is_init) {
 			GF_DASH_SegmentContext *sctx = gf_list_pop_front(ds->pending_segment_states);
 			if (!sctx || !ctx->nb_seg_url_pending) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Received segment size info event but no pending segments\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Broken muxer, received segment size info event but no pending segments\n"));
 				return GF_TRUE;
 			}
 			assert(sctx);
@@ -6558,6 +8754,34 @@
 			sctx->file_offset = evt->seg_size.media_range_start;
 			sctx->index_size = 1 + (u32) (evt->seg_size.idx_range_end - evt->seg_size.idx_range_start);
 			sctx->index_offset = evt->seg_size.idx_range_start;
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[Dasher] Got segment size event for %s\n", sctx->filename));
+
+			if (sctx->llhls_mode) {
+				sctx->llhls_done = GF_TRUE;
+				//reset frags of past segments
+				s32 idx, reset_until = gf_list_find(ds->rep->state_seg_list, sctx);
+				for (idx=reset_until-4; idx>=0; idx--) {
+					GF_DASH_SegmentContext *prev_sctx = gf_list_get(ds->rep->state_seg_list, idx);
+					if (!prev_sctx->llhls_mode)
+						break;
+
+					//send file delete events
+					if (prev_sctx->llhls_mode>1) {
+						u32 k;
+						for (k=0; k<prev_sctx->nb_frags; k++) {
+							GF_FilterEvent anevt;
+							char szPath[GF_MAX_PATH];
+							sprintf(szPath, "%s.%d", prev_sctx->filepath, k+1);
+							GF_FEVT_INIT(anevt, GF_FEVT_FILE_DELETE, ds->opid);
+							anevt.file_del.url = szPath;
+							gf_filter_pid_send_event(ds->opid, &anevt);
+						}
+					}
+					prev_sctx->llhls_mode = 0;
+				}
+				ctx->force_hls_ll_manifest = GF_TRUE;
+			}
 		}
 
 		//in state mode we store everything
@@ -6577,6 +8801,18 @@
 		if ((ctx->sfile || ctx->sseg) && (evt->seg_size.is_init==1)) {
 			GF_MPD_URL *url, **s_url;
 
+			if (evt->seg_size.is_shift) {
+				u32 j, nb_segs = gf_list_count(ds->rep->state_seg_list);
+				//we assume the shifted index start range is the previous init segment end range
+				//which is always the case for isobmf muxer (the only one using is_shift)
+				u64 diff = 1 + (u32) (evt->seg_size.idx_range_end - evt->seg_size.idx_range_start);
+
+				for (j=0; j<nb_segs; j++) {
+					GF_DASH_SegmentContext *sctx = gf_list_get(ds->rep->state_seg_list, j);
+					sctx->file_offset += diff;
+				}
+			}
+
 			if (ds->rep->segment_list) {
 				if (!evt->seg_size.media_range_start && !evt->seg_size.media_range_end) {
 					if (ds->rep->segment_list->initialization_segment) {
@@ -6621,8 +8857,12 @@
 			*s_url = url;
 		} else if (ds->rep->segment_list && !evt->seg_size.is_init) {
 			GF_MPD_SegmentURL *url = gf_list_pop_front(ds->pending_segment_urls);
-			assert(url);
-			assert(ctx->nb_seg_url_pending);
+			if (!url || !ctx->nb_seg_url_pending) {
+				if (!ds->done) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Broken muxer, received segment size info event but no pending segments\n"));
+				}
+				return GF_TRUE;
+			}
 			ctx->nb_seg_url_pending--;
 
 			if (!url->media && ctx->sfile) {
@@ -6665,6 +8905,7 @@
 	switch (ctx->profile) {
 	case GF_DASH_PROFILE_AVC264_LIVE:
 	case GF_DASH_PROFILE_AVC264_ONDEMAND:
+	case GF_DASH_PROFILE_DASHIF_LL:
 		if (ctx->cp == GF_DASH_CPMODE_REPRESENTATION) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] ERROR! The selected DASH profile (DASH-IF IOP) requires the ContentProtection element to be present in the AdaptationSet element, updating.\n"));
 			ctx->cp = GF_DASH_CPMODE_ADAPTATION_SET;
@@ -6672,10 +8913,11 @@
 	default:
 		break;
 	}
-	if (ctx->m2ts) {
+	if (ctx->muxtype==DASHER_MUX_TS) {
 		switch (ctx->profile) {
 		case GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE:
 		case GF_DASH_PROFILE_AVC264_LIVE:
+		case GF_DASH_PROFILE_DASHIF_LL:
 			ctx->profile = GF_DASH_PROFILE_LIVE;
 			break;
 		case GF_DASH_PROFILE_ONDEMAND:
@@ -6707,7 +8949,7 @@
 		ctx->sseg = ctx->align = ctx->sap = ctx->sfile = GF_TRUE;
 		ctx->tpl = GF_FALSE;
 
-		if (ctx->m2ts) {
+		if (ctx->muxtype==DASHER_MUX_TS) {
 			ctx->sseg = GF_FALSE;
 			ctx->tpl = GF_TRUE;
 			ctx->profile = GF_DASH_PROFILE_MAIN;
@@ -6723,6 +8965,14 @@
 		ctx->align = ctx->sap = GF_TRUE;
 		ctx->sseg = ctx->tpl = GF_FALSE;
 		break;
+	case GF_DASH_PROFILE_DASHIF_LL:
+		ctx->sseg = ctx->sfile = GF_FALSE;
+		ctx->no_fragments_defaults = ctx->align = ctx->tpl = ctx->sap = GF_TRUE;
+		if (!ctx->utcs) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] DASH-IF LL requires UTCTiming but none specified, using http://time.akamai.com/?iso \n"));
+			ctx->utcs = gf_strdup("http://time.akamai.com/?iso");
+		}
+		break;
 	default:
 		break;
 	}
@@ -6730,14 +8980,13 @@
 	if (ctx->sseg)
 		ctx->tpl = GF_FALSE;
 
-		//commented out, not sure why we had inband by default in live
 	if (ctx->bs_switch == DASHER_BS_SWITCH_DEF) {
-#if 0
-		ctx->bs_switch = DASHER_BS_SWITCH_INBAND;
-#else
 		ctx->bs_switch = DASHER_BS_SWITCH_ON;
-#endif
+	}
 
+	if (ctx->cmaf) {
+		ctx->align = GF_TRUE;
+		ctx->sap = GF_TRUE;
 	}
 
 	if (! ctx->align) {
@@ -6792,12 +9041,14 @@
 
 	ctx->pids = gf_list_new();
 	ctx->postponed_pids = gf_list_new();
+	ctx->tpl_records = gf_list_new();
 
 	if (!ctx->initext && (ctx->muxtype==DASHER_MUX_AUTO))
 		ctx->muxtype = DASHER_MUX_ISOM;
 
-	if (ctx->segdur<=0) {
-		ctx->segdur = 1.0;
+	if ((ctx->segdur.num <= 0) || !ctx->segdur.den) {
+		ctx->segdur.num = 1;
+		ctx->segdur.den = 1;
 		ctx->no_seg_dur = GF_TRUE;
 	}
 
@@ -6820,27 +9071,21 @@
 	//we build manifest from input frag/seg, always use single frag
 	if (ctx->sigfrag) {
 		if (ctx->tpl) {
-			if (!ctx->template) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Warning, manifest generation only mode requested for live-based profile but no template provided, switching to main profile.\n"));
-				ctx->profile = GF_DASH_PROFILE_MAIN;
-				ctx->tpl = GF_FALSE;
-				dasher_setup_profile(ctx);
-				//we force single file in this mode, but we will replace byte ranges by source URL
-				ctx->sfile = GF_TRUE;
-			} else {
-				ctx->sseg = GF_FALSE;
-				ctx->sfile = GF_FALSE;
-			}
+			ctx->sseg = GF_FALSE;
+			ctx->sfile = GF_FALSE;
 		} else {
 			if (!ctx->sseg)
 				ctx->sfile = GF_TRUE;
 		}
+		if (ctx->gencues) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] `sigfrag` and `gencues` options cannot be used together, disabling gencies\n"));
+			ctx->gencues = GF_FALSE;
+		}
 	}
 
 	if (!ctx->sap || ctx->sigfrag || ctx->cues)
 		ctx->sbound = DASHER_BOUNDS_OUT;
 
-
 	if ((ctx->tsb>=0) && (ctx->dmode!=GF_DASH_STATIC))
 		ctx->purge_segments = GF_TRUE;
 
@@ -6868,11 +9113,19 @@
 		GF_DashStream *ds = gf_list_pop_back(ctx->pids);
 		dasher_reset_stream(filter, ds, GF_TRUE);
 		if (ds->packet_queue) gf_list_del(ds->packet_queue);
+		if (ds->cinfo) gf_crypt_info_del(ds->cinfo);
 		gf_free(ds);
 	}
 	gf_list_del(ctx->pids);
 	if (ctx->mpd) gf_mpd_del(ctx->mpd);
 
+	while (gf_list_count(ctx->tpl_records)) {
+		DashTemplateRecord *tr = gf_list_pop_back(ctx->tpl_records);
+		gf_free(tr->tpl);
+		gf_free(tr);
+	}
+	gf_list_del(ctx->tpl_records);
+
 	if (ctx->next_period->period) gf_mpd_period_free(ctx->next_period->period);
 	gf_list_del(ctx->current_period->streams);
 	gf_free(ctx->current_period);
@@ -6880,6 +9133,7 @@
 	gf_free(ctx->next_period);
 	if (ctx->out_path) gf_free(ctx->out_path);
 	gf_list_del(ctx->postponed_pids);
+	if (ctx->cinfo) gf_crypt_info_del(ctx->cinfo);
 }
 
 #define MPD_EXTS "mpd|m3u8|3gm|ism"
@@ -6931,7 +9185,7 @@
 #define OFFS(_n)	#_n, offsetof(GF_DasherCtx, _n)
 static const GF_FilterArgs DasherArgs[] =
 {
-	{ OFFS(segdur), "target segment duration in seconds. A value less than or equal to 0 means to 1.0 second", GF_PROP_DOUBLE, "0.0", NULL, 0},
+	{ OFFS(segdur), "target segment duration in seconds. A value less than or equal to 0 means to 1.0 second", GF_PROP_FRACTION, "0/0", NULL, 0},
 	{ OFFS(tpl), "use template mode (multiple segment, template URLs)", GF_PROP_BOOL, "true", NULL, 0},
 	{ OFFS(stl), "use segment timeline (ignored in on_demand mode)", GF_PROP_BOOL, "false", NULL, 0},
 	{ OFFS(dmode), "dash content mode\n"
@@ -6942,22 +9196,22 @@
 	{ OFFS(sseg), "single segment is used", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(sfile), "use a single file for all segments (default in on_demand)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(align), "enable segment time alignment between representations", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(sap), "enable spliting segments at SAP boundaries", GF_PROP_BOOL, "true", NULL, 0},
+	{ OFFS(sap), "enable splitting segments at SAP boundaries", GF_PROP_BOOL, "true", NULL, 0},
 	{ OFFS(mix_codecs), "enable mixing different codecs in an adaptation set", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(ntp), "insert/override NTP clock at the begining of each segment\n"
+	{ OFFS(ntp), "insert/override NTP clock at the beginning of each segment\n"
 	"- rem: removes NTP from all input packets\n"
 	"- yes: inserts NTP at each segment start\n"
 	"- keep: leaves input packet NTP untouched", GF_PROP_UINT, "rem", "rem|yes|keep", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(no_sar), "do not check for identical sample aspect ratio for adaptation sets", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(m2ts), "generate MPEG-2 TS output", GF_PROP_BOOL, "false", NULL, 0},
 	{ OFFS(bs_switch), "bitstream switching mode (single init segment)\n"
 	"- def: resolves to off for onDemand and inband for live\n"
 	"- off: disables BS switching\n"
 	"- on: enables it if same decoder configuration is possible\n"
 	"- inband: moves decoder config inband if possible\n"
+	"- pps: moves PPS and APS inband, keep VPS,SPS and DCI out of band (used for VVC RPR)\n"
 	"- force: enables it even if only one representation\n"
-	"- multi: uses multiple stsd entries in ISOBMFF", GF_PROP_UINT, "def", "def|off|on|inband|force|multi", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(template), "template string to use to generate segment name - see filter help", GF_PROP_STRING, NULL, NULL, 0},
+	"- multi: uses multiple stsd entries in ISOBMFF", GF_PROP_UINT, "def", "def|off|on|inband|pps|force|multi", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(template), "template string to use to generate segment name", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(segext), "file extension to use for segments", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(initext), "file extension to use for the init segment", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(muxtype), "muxtype to use for the segments\n"
@@ -6965,8 +9219,10 @@
 		"- ts: uses MPEG-2 TS format\n"
 		"- mkv: uses Matroska format\n"
 		"- webm: uses WebM format\n"
-		"- raw: uses raw media format (disables muxed representations)\n"
+		"- ogg: uses OGG format\n"
+		"- raw: uses raw media format (disables multiplexed representations)\n"
 		"- auto: guess format based on extension, default to mp4 if no extension", GF_PROP_UINT, "auto", "mp4|ts|mkv|webm|ogg|raw|auto", 0},
+	{ OFFS(rawsub), "use raw subtitle format instead of encapsulating in container", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(asto), "availabilityStartTimeOffset to use in seconds. A negative value simply increases the AST, a positive value sets the ASToffset to representations", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(profile), "target DASH profile. This will set default option values to ensure conformance to the desired profile. For MPEG-2 TS, only main and live are used, others default to main\n"
 		"- auto: turns profile to live for dynamic and full for non-dynamic\n"
@@ -6976,8 +9232,9 @@
 		"- full: MPEG-DASH full profile\n"
 		"- hbbtv1.5.live: HBBTV 1.5 DASH profile\n"
 		"- dashavc264.live: DASH-IF live profile\n"
-		"- dashavc264.onDemand: DASH-IF onDemand profile"
-		"", GF_PROP_UINT, "auto", "auto|live|onDemand|main|full|hbbtv1.5.live|dashavc264.live|dashavc264.onDemand", 0 },
+		"- dashavc264.onDemand: DASH-IF onDemand profile\n"
+		"- dashif.ll: DASH IF low-latency profile (set UTC server to time.akamai.com if none set)"
+		"", GF_PROP_UINT, "auto", "auto|live|onDemand|main|full|hbbtv1.5.live|dashavc264.live|dashavc264.onDemand|dashif.ll", 0 },
 	{ OFFS(profX), "list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED },
 	{ OFFS(cp), "content protection element location\n"
 	"- set: in adaptation set element\n"
@@ -6991,7 +9248,8 @@
 	"- mf: stores in mpd and movie fragment\n"
 	"- mv: stores in mpd and movie\n"
 	"- n: discard pssh from mpd and segments", GF_PROP_UINT, "v", "v|f|mv|mf|m|n", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(buf), "min buffer duration in ms. negative value means percent of segment duration (eg -150 = 1.5*seg_dur)", GF_PROP_SINT, "-100", NULL, 0},
+	{ OFFS(buf), "min buffer duration in ms. negative value means percent of segment duration (e.g. -150 = 1.5*seg_dur)", GF_PROP_SINT, "-100", NULL, 0},
+	{ OFFS(spd), "suggested presentation delay in ms", GF_PROP_SINT, "0", NULL, 0},
 	{ OFFS(timescale), "set timescale for timeline and segment list/template. A value of 0 picks up the first timescale of the first stream in an adaptation set. A negative value forces using stream timescales for each timed element (multiplication of segment list/template/timelines). A positive value enforces the MPD timescale", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(check_dur), "check duration of sources in period, trying to have roughly equal duration. Enforced whenever period start times are used", GF_PROP_BOOL, "true", NULL, 0},
 	{ OFFS(skip_seg), "increment segment number whenever an empty segment would be produced - NOT DASH COMPLIANT", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
@@ -7002,26 +9260,26 @@
 	{ OFFS(lang), "language of MPD Info", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(location), "set MPD locations to given URL", GF_PROP_STRING_LIST, NULL, NULL, 0},
 	{ OFFS(base), "set base URLs of MPD", GF_PROP_STRING_LIST, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(refresh), "refresh rate for dynamic manifests, in seconds. A negative value sets the MPD duration. If 0, uses dash duration", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(tsb), "time-shift buffer depth in seconds. A negative value means infinity", GF_PROP_DOUBLE, "30", NULL, 0},
+	{ OFFS(refresh), "refresh rate for dynamic manifests, in seconds (a negative value sets the MPD duration, value 0 uses dash duration)", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(tsb), "time-shift buffer depth in seconds (a negative value means infinity)", GF_PROP_DOUBLE, "30", NULL, 0},
 	{ OFFS(subdur), "maximum duration of the input file to be segmented. This does not change the segment duration, segmentation stops once segments produced exceeded the duration", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ast), "set start date (as xs:date, eg YYYY-MM-DDTHH:MM:SSZ) for live mode. Default is now. !! Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size !!", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ast), "set start date (as xs:date, e.g. YYYY-MM-DDTHH:MM:SSZ) for live mode. Default is now. !! Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size !!", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(state), "path to file used to store/reload state info when simulating live. This is stored as a valid MPD with GPAC XML extensions", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(loop), "loop sources when dashing with subdur and state. If not set, a new period is created once the sources are over", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(split), "enable cloning samples for text/metadata/scene description streams, marking further clones as redundant", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(hlsc), "insert clock reference in variant playlist in live HLS", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(cues), "set cue file - see filter help", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(strict_cues), "strict mode for cues, complains if spliting is not on SAP type 1/2/3 or if unused cue is found", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(cues), "set cue file", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(strict_cues), "strict mode for cues, complains if splitting is not on SAP type 1/2/3 or if unused cue is found", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(strict_sap), "strict mode for sap\n"
 	"- off: ignore SAP types for PID other than video, enforcing _startsWithSAP=1_\n"
 	"- sig: same as [-off]() but keep _startsWithSAP_ to the true SAP value\n"
 	"- on: warn if any PID uses SAP 3 or 4 and switch to FULL profile", GF_PROP_UINT, "off", "off|sig|on", GF_FS_ARG_HINT_EXPERT},
 
 	{ OFFS(subs_sidx), "number of subsegments per sidx. negative value disables sidx. Only used to inherit sidx option of destination", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(cmpd), "skip line feed and spaces in MPD XML for more compacity", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(cmpd), "skip line feed and spaces in MPD XML for compactness", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(styp), "indicate the 4CC to use for styp boxes when using ISOBMFF output", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(dual), "indicate to produce both MPD and M3U files", GF_PROP_BOOL, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(sigfrag), "use manifest generation only mode - see filter help", GF_PROP_BOOL, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(sigfrag), "use manifest generation only mode", GF_PROP_BOOL, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(_p_gentime), "pointer to u64 holding the ntp clock in ms of next DASH generation in live mode", GF_PROP_POINTER, NULL, NULL, GF_FS_ARG_HINT_HIDE},
 	{ OFFS(_p_mpdtime), "pointer to u64 holding the mpd time in ms of the last generated segment", GF_PROP_POINTER, NULL, NULL, GF_FS_ARG_HINT_HIDE},
 	{ OFFS(sbound), "indicate how the theoretical segment start `TSS (= segment_number * duration)` should be handled\n"
@@ -7034,7 +9292,33 @@
 	"- otherwise in dynamic mode without context, do not generate segments ahead of time", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(scope_deps), "scope PID dependencies to be within source. If disabled, PID dependencies will be checked across all input PIDs regardless of their sources", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(utcs), "URL to use as time server / UTCTiming source. Special value `inband` enables inband UTC (same as publishTime), special prefix `xsd@` uses xsDateTime schemeURI rather than ISO", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(force_flush), "force generating a single segment for each input. This can be usefull in batch mode when average source duration is known and used as segment duration but actual duration may sometimes be greater", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(force_flush), "force generating a single segment for each input. This can be useful in batch mode when average source duration is known and used as segment duration but actual duration may sometimes be greater", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(last_seg_merge), "force merging last segment if less than half the target duration", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mha_compat), "adaptation set generation mode for compatible MPEG-H Audio profile\n"
+		"- no: only generate the adaptation set for the main profile\n"
+		"- comp: only generate the adaptation sets for all compatible profiles\n"
+		"- all: generate the adaptation set for the main profile and all compatible profiles"
+		, GF_PROP_UINT, "no", "no|comp|all", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mname), "output manifest name for ATSC3 multiplexing", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(llhls), "HLS low latency type\n"
+		"- off: do not use LL-HLS\n"
+		"- br: use LL-HLS with byte-range for segment parts, pointing to full segment (DASH-LL compatible)\n"
+		"- sf: use separate files for segment parts (post-fixed .1, .2 etc.)\n"
+		"- brsf: generate two sets of manifest, one for byte-range and one for files (`_IF` added before extension of manifest)", GF_PROP_UINT, "off", "off|br|sf|brsf", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(cdur), "chunk duration for fragmentation modes", GF_PROP_FRACTION, "-1/1", NULL, GF_FS_ARG_HINT_HIDE},
+	{ OFFS(hlsdrm), "cryp file info for HLS full segment encryption", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(hlsx), "list of string to append to master HLS header before variants with `['#foo','#bar=val']` added as `#foo \\n #bar=val`", GF_PROP_STRING_LIST, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(ll_preload_hint), "inject preload hint for LL-HLS", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(ll_rend_rep), "inject rendition reports for LL-HLS", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(cmaf), "use cmaf guidelines\n"
+		"- no: CMAF not enforced\n"
+		"- cmfc: use CMAF `cmfc` guidelines\n"
+		"- cmf2: use CMAF `cmf2` guidelines"
+		, GF_PROP_UINT, "no", "no|cmfc|cmf2", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(pswitch), "force period switch instead of absorbing PID reconfiguration (for splicing or add insertion not using periodID)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_HIDE},
+	{ OFFS(chain), "URL of next MPD for regular chaining", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(chain_fbk), "URL of fallback MPD", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(gencues), "only insert segment boundaries and do not generate manifests", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };
 
@@ -7042,153 +9326,220 @@
 GF_FilterRegister DasherRegister = {
 	.name = "dasher",
 	GF_FS_SET_DESCRIPTION("DASH and HLS segmenter")
-	GF_FS_SET_HELP("# GPAC DASH and HLS segmenter\n"
-			"This filter provides segmentation and manifest generation for MPEG-DASH and HLS formats.\n"
-			"The segmenter currently supports:\n"
-			"- MPD and m3u8 generation (potentially in parallel)\n"
-			"- ISOBMFF, MPEG-2 TS, MKV and raw bitstream segment formats\n"
-			"- override of profiles and levels in manifest for codecs\n"
-			"- most MPEG-DASH profiles\n"
-			"- static and dynamic (live) manifest offering\n"
-			"- context store and reload for batch processing of live/dynamic sessions\n"
-			"\n"
-			"The filter does perform per-segment real-time regulation using [-sreg]().\n"
-			"If you need per-frame real-time regulation on non-real-time inputs, insert a [reframer](reframer) before to perform real-time regulation.\n"
-			"EX src=file.mp4 reframer:rt=on @ -o live.mpd:dmode=dynamic\n"
-			"## Template strings\n"
-			"The segmenter uses templates to derive output file names, regardless of the DASH mode (even when templates are not used). "
-			"The default one is `$File$_dash` for ondemand and single file modes, and `$File$_$Number$` for separate segment files\n"
-			"EX template=Great_$File$_$Width$_$Number$\n"
-			"If input is foo.mp4 with 640x360 video, this will resolve in Great_foo_640_$Number$ for the DASH template.\n"
-			"EX template=Great_$File$_$Width$\n"
-			"If input is foo.mp4 with 640x360 video, this will resolve in Great_foo_640.mp4 for onDemand case.\n"
-			"\n"
-			"Standard DASH replacement strings: \n"
-	 "- $Number[%%0Nd]$: replaced by the segment number, possibly prefixed with 0\n"
-	 "- $RepresentationID$: replaced by representation name\n"
-	 "- $Time$: replaced by segment start time\n"
-	 "- $Bandwidth$: replaced by representation bandwidth.\n"
-	 "Note: these strings are not replaced in the manifest templates elements.\n"
-			"\n"
-			"Additional replacement strings (not DASH, not generic GPAC replacements but may occur multiple times in template):\n"
-	 "- $Init=NAME$: replaced by NAME for init segment, ignored otherwise\n"
-	 "- $XInit=NAME$: complete replace by NAME for init segment, ignored otherwise\n"
-	 "- $Index=NAME$: replaced by NAME for index segments, ignored otherwise\n"
-	 "- $Path=PATH$: replaced by PATH when creating segments, ignored otherwise\n"
-	 "- $Segment=NAME$: replaced by NAME for media segments, ignored for init segments\n"
-	 "- $FS$ (FileSuffix): replaced by `_trackN` in case the input is an AV multiplex, or kept empty otherwise\n"
-	 "Note: these strings are replaced in the manifest templates elements.\n"
-			"\n"
-			"## PID assignment and configuration\n"
-			"To assign PIDs into periods and adaptation sets and configure the session, the segmenter looks for the following properties on each input pid:\n"
-			"- Representation: assigns representation ID to input pid. If not set, the default behaviour is to have each media component in different adaptation sets. Setting the RepresentationID allows explicit multiplexing of the source(s)\n"
-			"- Period: assigns period ID to input pid. If not set, the default behaviour is to have all media in the same period with the same start time\n"
-			"- PStart: assigns period start. If not set, 0 is assumed, and periods appear in the Period ID declaration order. If negative, this gives the period order (-1 first, then -2 ...). If positive, this gives the true start time and will abort DASHing at period end\n"
-			"Note: When both positive and negative values are found, the by-order periods (negative) will be inserted AFTER the timed period (positive)\n"
-			"- ASID: assigns parent adaptation set ID. If not 0, only sources with same AS ID will be in the same adaptation set\n"
-			"Note: If multiple streams in source, only the first stream will have an AS ID assigned\n"
-			"- xlink: for remote periods, only checked for null pid\n"
-			"- Role, PDesc, ASDesc, ASCDesc, RDesc: various descriptors to set for period, AS or representation\n"
-			"- BUrl: overrides segmenter [-base] with a set of BaseURLs to use for the pid (per representation)\n"
-			"- Template: overrides segmenter [-template]() for this PID\n"
-			"- DashDur: overrides segmenter segment duration for this PID\n"
-			"- StartNumber: sets the start number for the first segment in the PID, default is 1\n"
-			"- Non-dash properties: Bitrate, SAR, Language, Width, Height, SampleRate, NumChannels, Language, ID, DependencyID, FPS, Interlaced, Codec. These properties are used to setup each representation and can be overridden on input PIDs using the general PID property settings (cf global help).\n"
-			" \n"
-			"EX src=test.mp4:#Bitrate=1M dst=test.mpd\n"
-			"This will force declaring a bitrate of 1M for the representation, regardless of actual input bitrate.\n"
-			"EX src=muxav.mp4 dst=test.mpd\n"
-			"This will create unmuxed DASH segments.\n"
-			"EX src=muxav.mp4:#Representation=1 dst=test.mpd\n"
-			"This will create muxed DASH segments.\n"
-			"EX src=m1.mp4 src=m2.mp4:#Period=Yep dst=test.mpd\n"
-			"This will put src m1.mp4 in first period, m2.mp4 in second period.\n"
-			"EX src=m1.mp4:#BUrl=http://foo/bar dst=test.mpd\n"
-			"This will assign a baseURL to src m1.mp4.\n"
-			"EX src=m1.mp4:#ASCDesc=<ElemName val=\"attval\">text</ElemName> dst=test.mpd\n"
-			"This will assign the specified XML descriptor to the adaptation set.\n"
-			"Note: this can be used to inject most DASH descriptors not natively handled by the segmenter.\n"
-			"The segmenter handles the XML descriptor as a string and does not attempt to validate it. Descriptors, as well as some segmenter filter arguments, are string lists (comma-separated by default), so that multiple descriptors can be added:\n"
-			"EX src=m1.mp4:#RDesc=<Elem attribute=\"1\"/>,<Elem2>text</Elem2> dst=test.mpd\n"
-			"This will insert two descriptors in the representation(s) of m1.mp4.\n"
-			"EX src=video.mp4:#Template=foo$Number$ src=audio.mp4:#Template=bar$Number$ dst=test.mpd\n"
-			"This will assign different templates to the audio and video sources.\n"
-			"EX src=null:#xlink=http://foo/bar.xml:#PDur=4 src=m.mp4:#PStart=-1\n"
-			"This will insert an create an MPD with first a remote period then a regular one.\n"
-			"EX src=null:#xlink=http://foo/bar.xml:#PStart=6 src=m.mp4\n"
-			"This will create an MPD with first a regular period, dashing ony 6s of content, then a remote one.\n"
-			"\n"
-			"The segmenter will create muxing filter chains for each representation and will reassign PID IDs so that each media component (video, audio, ...) in an adaptation set has the same ID.\n"
-			"\n"
-			"For HLS, the output pid will deliver the master playlist **and** the variant playlists.\n"
-			"The default variant playlist are $NAME_$N.m3u8, where $NAME is the radical of the output file name and $N is the 1-based index of the variant.\n"
-			"\n"
-			"## Segmentation\n"
-			"The default behavior of the segmenter is to estimate the theoretical start time of each segment based on target segment duration, and start a new segment when a packet with SAP type 1,2,3 or 4 with time greater than the theoretical time is found.\n"
-			"This behavior can be changed to find the best SAP packet around a segment theoretical boundary using [-sbound]():\n"
-			"- closest mode: the segment will start at the closest SAP of the theoretical boundary\n"
-			"- in mode: the segment will start at or before the theoretical boundary\n"
-			"Warning: These modes will introduce delay in the segmenter (typically buffering of one GOP) and should not be used for low-latency modes.\n"
-			"The segmenter can also be configured to:\n"
-			"- completely ignore SAP when segmenting using [-sap]().\n"
-			"- ignore SAP on non-video streams when segmenting using [-strict_sap]().\n"
-			"\n"
-			"## Cue-driven segmentation\n"
-			"The segmenter can take a list of instructions, or Cues, to use for the segmentation process, in which case only these are used to derive segment boundaries.\n"
-			"Cue files can be specified for the entire segmenter, or per PID using DashCue property.\n"
-			"Cues are given in an XML file with a root element called <DASHCues>, with currently no attribute specified. The children are one or more <Stream> elements, with attributes:\n"
-			"- id: integer for stream/track/pid ID\n"
-			"- timescale: integer giving the units of following timestamps\n"
-			"- mode: if present and value is `edit`, the timestamp are in presentation time (edit list applied) otherwise they are in media time\n"
-			"\nThe children of <Stream> are one or more <Cue> elements, with attributes:\n"
-			"- sample: integer giving the sample/frame number of a sample at which spliting shall happen\n"
-			"- dts: long integer giving the decoding time stamp of a sample at which spliting shall happen\n"
-			"- cts: long integer giving the composition / presentation time stamp of a sample at which spliting shall happen\n"
-			"Warning: Cues shall be listed in decoding order.\n"
-			"\n"
-			"## Manifest Generation only mode\n"
-			"The segmenter can be used to generate manifests from already fragmented ISOBMFF inputs using [-sigfrag]().\n"
-			"In this case, segment boundaries are attached to each packet starting a segment and used to drive the segmentation.\n"
-			"This can be used with single-track ISOBMFF sources, either single file or multi file.\n"
-			"For single file source:\n"
-			"- if onDemand [-profile]() is requested, sources have to be formatted as a DASH self-initializing media segment with the proper sidx.\n"
-			"- templates are disabled.\n"
-			"- [-sseg]() is forced for all profiles except onDemand ones.\n"
-			"For multi files source:\n"
-			"- input shall be a playlist containing the initial file followed by the ordered list of segments.\n"
-			"- if no [-template]() is provided, the full or main [-profile]() will be used\n"
-			"- if [-template]() is provided, it shall be correct: the filter will not try to guess one from the input file names and will not validate it either.\n"
-			"\n"
-			"The manifest generation-only mode supports both MPD and HLS generation.\n"
-			"\n"
-			"EX -i ondemand_src.mp4 -o dash.mpd:sigfrag:profile=onDemand\n"
-			"This will generate a DASH manifest for onDemand Profile based on the input file.\n"
-			"EX -i ondemand_src.mp4 -o dash.m3u8:sigfrag\n"
-			"This will generate a HLS manifest based on the input file.\n"
-			"EX -i seglist.txt -o dash.mpd:sigfrag\n"
-			"This will generate a DASH manifest in Main Profile based on the input files.\n"
-			"EX -i seglist.txt:Template=$XInit=init$$q1/$Number$ -o dash.mpd:sigfrag:profile=live\n"
-			"This will generate a DASH manifest in live Profile based on the input files. The input file will contain `init.mp4`, `q1/1.m4s`, `q1/2.m4s`...\n"
-			"\n"
-			"## Muxer development considerations\n"
-			"Output muxers allowing segmented output must obey the following:\n"
-			"- inspect packet properties\n"
-			" - FileNumber: if set, indicate the start of a new DASH segment\n"
-			" - FileName: if set, indicate the file name. If not present, output shall be a single file. This is only set for packet carrying the `FileNumber` property, and only on one PID (usually the first) for multiplexed outputs\n"
-			" - IDXName: gives the optional index name (if not present, index shall be in the same file as dash segment). Only used for MPEG-2 TS for now\n"
-			" - EODS: property is set on packets with no payload and no timestamp to signal the end of a DASH segment. This is only used when stoping/resuming the segmentation process, in order to flush segments without dispatching an EOS (see [-subdur]() )\n"
-			"- for each segment done, send a downstream event on the first connected PID signaling the size of the segment and the size of its index if any\n"
-			"- for muxers with init data, send a downstream event signaling the size of the init and the size of the global index if any\n"
-			"- the following filter options are passed to muxers, which should declare them as arguments:\n"
-			" - noinit: disables output of init segment for the muxer (used to handle bitstream switching with single init in DASH)\n"
-			" - frag: indicates muxer shall use fragmented format (used for ISOBMFF mostly)\n"
-			" - subs_sidx=0: indicates an SIDX shall be generated - only added if not already specified by user\n"
-			" - xps_inband=all|no: indicates AVC/HEVC/... parameter sets shall be sent inband or out of band\n"
-			" - nofragdef: indicates fragment defaults should be set in each segment rather than in init segment\n"
-			"\n"
-			"The segmenter will add the following properties to the output PIDs:\n"
-			"- DashMode: identifies VoD (single file with global index) or regular DASH mode used by segmenter\n"
-			"- DashDur: identifies target DASH segment duration - this can be used to estimate the SIDX size for example\n"
+	GF_FS_SET_HELP(
+"This filter provides segmentation and manifest generation for MPEG-DASH and HLS formats.\n"
+"The segmenter currently supports:\n"
+"- MPD and m3u8 generation (potentially in parallel)\n"
+"- ISOBMFF, MPEG-2 TS, MKV and raw bitstream segment formats\n"
+"- override of profiles and levels in manifest for codecs\n"
+"- most MPEG-DASH profiles\n"
+"- static and dynamic (live) manifest offering\n"
+"- context store and reload for batch processing of live/dynamic sessions\n"
+"\n"
+"The filter does perform per-segment real-time regulation using [-sreg]().\n"
+"If you need per-frame real-time regulation on non-real-time inputs, insert a [reframer](reframer) before to perform real-time regulation.\n"
+"EX gpac -i file.mp4 reframer:rt=on -o live.mpd:dmode=dynamic\n"
+"## Template strings\n"
+"The segmenter uses templates to derive output file names, regardless of the DASH mode (even when templates are not used). "
+"The default one is `$File$_dash` for ondemand and single file modes, and `$File$_$Number$` for separate segment files\n"
+"EX template=Great_$File$_$Width$_$Number$\n"
+"If input is `foo.mp4` with `640x360` video resolution, this will resolve in `Great_foo_640_$Number$` for the DASH template.\n"
+"EX template=Great_$File$_$Width$\n"
+"If input is `foo.mp4` with `640x360` video resolution, this will resolve in `Great_foo_640.mp4` for onDemand case.\n"
+"\n"
+"Standard DASH replacement strings: \n"
+"- $Number[%%0Nd]$: replaced by the segment number, possibly prefixed with 0\n"
+"- $RepresentationID$: replaced by representation name\n"
+"- $Time$: replaced by segment start time\n"
+"- $Bandwidth$: replaced by representation bandwidth.\n"
+"Note: these strings are not replaced in the manifest templates elements.\n"
+"\n"
+"Additional replacement strings (not DASH, not generic GPAC replacements but may occur multiple times in template):\n"
+"- $Init=NAME$: replaced by NAME for init segment, ignored otherwise\n"
+"- $XInit=NAME$: complete replace by NAME for init segment, ignored otherwise\n"
+"- $Index=NAME$: replaced by NAME for index segments, ignored otherwise\n"
+"- $Path=PATH$: replaced by PATH when creating segments, ignored otherwise\n"
+"- $Segment=NAME$: replaced by NAME for media segments, ignored for init segments\n"
+"- $FS$ (FileSuffix): replaced by `_trackN` in case the input is an AV multiplex, or kept empty otherwise\n"
+"Note: these strings are replaced in the manifest templates elements.\n"
+"\n"
+"## PID assignment and configuration\n"
+"To assign PIDs into periods and adaptation sets and configure the session, the segmenter looks for the following properties on each input PID:\n"
+"- `Representation`: assigns representation ID to input PID. If not set, the default behavior is to have each media component in different adaptation sets. Setting the `Representation` allows explicit multiplexing of the source(s)\n"
+"- `Period`: assigns period ID to input PID. If not set, the default behavior is to have all media in the same period with the same start time\n"
+"- `PStart`: assigns period start. If not set, 0 is assumed, and periods appear in the Period ID declaration order. If negative, this gives the period order (-1 first, then -2 ...). If positive, this gives the true start time and will abort DASHing at period end\n"
+"Note: When both positive and negative values are found, the by-order periods (negative) will be inserted AFTER the timed period (positive)\n"
+"- `ASID`: assigns parent adaptation set ID. If not 0, only sources with same AS ID will be in the same adaptation set\n"
+"Note: If multiple streams in source, only the first stream will have an AS ID assigned\n"
+"- `xlink`: for remote periods, only checked for null PID\n"
+"- `Role`, `PDesc`, `ASDesc`, `ASCDesc`, `RDesc`: various descriptors to set for period, AS or representation\n"
+"- `BUrl`: overrides segmenter [-base] with a set of BaseURLs to use for the PID (per representation)\n"
+"- `Template`: overrides segmenter [-template]() for this PID\n"
+"- `DashDur`: overrides segmenter segment duration for this PID\n"
+"- `StartNumber`: sets the start number for the first segment in the PID, default is 1\n"
+"- `IntraOnly`: indicates input PID follows HLS EXT-X-I-FRAMES-ONLY guidelines\n"
+"- `CropOrigin`: indicates x and y coordinates of video for SRD (size is video size)\n"
+"- `SRD`: indicates SRD position and size of video for SRD, ignored if `CropOrigin` is set\n"
+"- `SRDRef`: indicates global width and height of SRD, ignored if `CropOrigin` is set\n"
+"- `HLSMExt`: list of extensions to add to master playlist entries, ['foo','bar=val'] added as `,foo,bar=val`\n"
+"- `HLSVExt`: list of extensions to add to variant playlist, ['#foo','#bar=val'] added as `#foo \\n #bar=val`\n"
+"- Non-dash properties: `Bitrate`, `SAR`, `Language`, `Width`, `Height`, `SampleRate`, `NumChannels`, `Language`, `ID`, `DependencyID`, `FPS`, `Interlaced`, `Codec`. These properties are used to setup each representation and can be overridden on input PIDs using the general PID property settings (cf global help).\n"
+" \n"
+"EX gpac -i test.mp4:#Bitrate=1M -o test.mpd\n"
+"This will force declaring a bitrate of 1M for the representation, regardless of actual input bitrate.\n"
+"EX gpac -i muxav.mp4 -o test.mpd\n"
+"This will create un-multiplexed DASH segments.\n"
+"EX gpac -i muxav.mp4:#Representation=1 -o test.mpd\n"
+"This will create multiplexed DASH segments.\n"
+"EX gpac -i m1.mp4 -i m2.mp4:#Period=Yep -o test.mpd\n"
+"This will put src `m1.mp4` in first period, `m2.mp4` in second period.\n"
+"EX gpac -i m1.mp4:#BUrl=http://foo/bar -o test.mpd\n"
+"This will assign a baseURL to src `m1.mp4`.\n"
+"EX gpac -i m1.mp4:#ASCDesc=<ElemName val=\"attval\">text</ElemName> -o test.mpd\n"
+"This will assign the specified XML descriptor to the adaptation set.\n"
+"Note: this can be used to inject most DASH descriptors not natively handled by the segmenter.\n"
+"The segmenter handles the XML descriptor as a string and does not attempt to validate it. Descriptors, as well as some segmenter filter arguments, are string lists (comma-separated by default), so that multiple descriptors can be added:\n"
+"EX gpac -i m1.mp4:#RDesc=<Elem attribute=\"1\"/>,<Elem2>text</Elem2> -o test.mpd\n"
+"This will insert two descriptors in the representation(s) of `m1.mp4`.\n"
+"EX gpac -i video.mp4:#Template=foo$Number$ -i audio.mp4:#Template=bar$Number$ -o test.mpd\n"
+"This will assign different templates to the audio and video sources.\n"
+"EX gpac -i null:#xlink=http://foo/bar.xml:#PDur=4 -i m.mp4:#PStart=-1 -o test.mpd\n"
+"This will insert an create an MPD with first a remote period then a regular one.\n"
+"EX gpac -i null:#xlink=http://foo/bar.xml:#PStart=6 -i m.mp4 -o test.mpd\n"
+"This will create an MPD with first a regular period, dashing only 6s of content, then a remote one.\n"
+"EX gpac -i v1:#SRD=0x0x1280x360:#SRDRef=1280x720 -i v2:#SRD=0x360x1280x360 -o test.mpd\n"
+"This will layout the `v2` below `v1` using a global SRD size of 1280x720.\n"
+"\n"
+"The segmenter will create multiplexing filter chains for each representation and will reassign PID IDs so that each media component (video, audio, ...) in an adaptation set has the same ID.\n"
+"\n"
+"For HLS, the output PID will deliver the master playlist **and** the variant playlists.\n"
+"The default variant playlist are $NAME_$N.m3u8, where $NAME is the radical of the output file name and $N is the 1-based index of the variant.\n"
+"\n"
+"## Segmentation\n"
+"The default behavior of the segmenter is to estimate the theoretical start time of each segment based on target segment duration, and start a new segment when a packet with SAP type 1,2,3 or 4 with time greater than the theoretical time is found.\n"
+"This behavior can be changed to find the best SAP packet around a segment theoretical boundary using [-sbound]():\n"
+"- `closest` mode: the segment will start at the closest SAP of the theoretical boundary\n"
+"- `in` mode: the segment will start at or before the theoretical boundary\n"
+"Warning: These modes will introduce delay in the segmenter (typically buffering of one GOP) and should not be used for low-latency modes.\n"
+"The segmenter can also be configured to:\n"
+"- completely ignore SAP when segmenting using [-sap]().\n"
+"- ignore SAP on non-video streams when segmenting using [-strict_sap]().\n"
+"\n"
+"## Dynamic (real-time live) Mode\n"
+"The dasher does not perform real-time regulation by default.\n"
+"For regular segmentation, you should enable segment regulation [-sreg]() if your sources are not real-time.\n"
+"EX gpac -i source.mp4 -o live.mpd:segdur=2:profile=live:dmode=dynamic:sreg\n"
+"\n"
+"For low latency segmentation with fMP4, you will need to specify the following options:\n"
+"- cdur: set the fMP4 fragment duration\n"
+"- asto: set the availability time offset for DASH. This value should be equal or slightly greater than segment duration minus cdur\n"
+"- llhls: enable low latency for HLS\n"
+"If your sources are not real-time, insert a reframer filter with real-time regulation\n"
+"EX gpac -i source.mp4 reframer:rt=on -o live.mpd:segdur=2:cdur=0.2:asto=1.8:profile=live:dmode=dynamic\n"
+"This will create DASH segments of 2 seconds made of fragments of 200 ms and indicate to the client that requests can be made 1.8 seconds earlier than segment complete availability on server.\n"
+"EX gpac -i source.mp4 reframer:rt=on -o live.m3u8:segdur=2:cdur=0.2:llhls=br:dmode=dynamic\n"
+"This will create DASH segments of 2 seconds made of fragments of 200 ms and produce HLS low latency parts using byte ranges in the final segment.\n"
+"EX gpac -i source.mp4 reframer:rt=on -o live.m3u8:segdur=2:cdur=0.2:llhls=sf:dmode=dynamic\n"
+"This will create DASH segments of 2 seconds made of fragments of 200 ms and produce HLS low latency parts using dedicated files.\n"
+"\n"
+"You can combine LL-HLS and DASH-LL generation:\n"
+"EX gpac -i source.mp4 reframer:rt=on -o live.mpd:dual:segdur=2:cdur=0.2:asto=1.8:llhls=br:profile=live:dmode=dynamic\n"
+"\n"
+"For DASH, the filter will use the local clock for UTC anchor points in DASH.\n"
+"The filter can fetch and signal clock in other ways using [-utcs]().\n"
+"EX [opts]:utcs=inband\n"
+"This will use the local clock and insert in the MPD a UTCTiming descriptor containing the local clock.\n"
+"EX [opts]::utcs=http://time.akamai.com[::opts]\n"
+"This will fetch time from `http://time.akamai.com`, use it as the UTC reference for segment generation and insert in the MPD a UTCTiming descriptor containing the time server URL.\n"
+"Note: if not set as a global option using `--utcs=`, you must escape the url using double `::` or use other separators.\n"
+"\n"
+"## Cue-driven segmentation\n"
+"The segmenter can take a list of instructions, or Cues, to use for the segmentation process, in which case only these are used to derive segment boundaries. Cues can be set through XML files or injected in input packets.\n"
+"\n"
+"Cue files can be specified for the entire segmenter, or per PID using `DashCue` property.\n"
+"Cues are given in an XML file with a root element called <DASHCues>, with currently no attribute specified. The children are one or more <Stream> elements, with attributes:\n"
+"- id: integer for stream/track/PID ID\n"
+"- timescale: integer giving the units of following timestamps\n"
+"- mode: if present and value is `edit`, the timestamp are in presentation time (edit list applied) otherwise they are in media time\n"
+"- ts_offset: integer giving a value (in timescale) to subtract to the DTS/CTS values listed\n"
+"\nThe children of <Stream> are one or more <Cue> elements, with attributes:\n"
+"- sample: integer giving the sample/frame number of a sample at which splitting shall happen\n"
+"- dts: long integer giving the decoding time stamp of a sample at which splitting shall happen\n"
+"- cts: long integer giving the composition / presentation time stamp of a sample at which splitting shall happen\n"
+"Warning: Cues shall be listed in decoding order.\n"
+"\n"
+"If the `DashCue` property of a PID equals `inband`, the PID will be segmented according to the `CueStart` property of input packets.\n"
+"This feature is typically combined with a list of files as input:\n"
+"EX gpac -i list.m3u:sigcues -o res/live.mpd\n"
+"This will load the `flist` filter in cue mode, generating continuous timelines from the sources and injecting a `CueStart` property at each new file.\n"
+"\n"
+"If the [-cues]() option equals `none`, the `DashCue` property of input PIDs will be ignored.\n"
+"\n"
+"## Manifest Generation only mode\n"
+"The segmenter can be used to generate manifests from already fragmented ISOBMFF inputs using [-sigfrag]().\n"
+"In this case, segment boundaries are attached to each packet starting a segment and used to drive the segmentation.\n"
+"This can be used with single-track ISOBMFF sources, either single file or multi file.\n"
+"For single file source:\n"
+"- if onDemand [-profile]() is requested, sources have to be formatted as a DASH self-initializing media segment with the proper sidx.\n"
+"- templates are disabled.\n"
+"- [-sseg]() is forced for all profiles except onDemand ones.\n"
+"For multi files source:\n"
+"- input shall be a playlist containing the initial file followed by the ordered list of segments.\n"
+"- if no [-template]() is provided, the full or main [-profile]() will be used\n"
+"- if [-template]() is provided, it shall be correct: the filter will not try to guess one from the input file names and will not validate it either.\n"
+"\n"
+"The manifest generation-only mode supports both MPD and HLS generation.\n"
+"\n"
+"EX gpac -i ondemand_src.mp4 -o dash.mpd:sigfrag:profile=onDemand\n"
+"This will generate a DASH manifest for onDemand Profile based on the input file.\n"
+"EX gpac -i ondemand_src.mp4 -o dash.m3u8:sigfrag\n"
+"This will generate a HLS manifest based on the input file.\n"
+"EX gpac -i seglist.txt -o dash.mpd:sigfrag\n"
+"This will generate a DASH manifest in Main Profile based on the input files.\n"
+"EX gpac -i seglist.txt:Template=$XInit=init$$q1/$Number$ -o dash.mpd:sigfrag:profile=live\n"
+"This will generate a DASH manifest in live Profile based on the input files. The input file will contain `init.mp4`, `q1/1.m4s`, `q1/2.m4s`...\n"
+"\n"
+"## Cue Generation only mode\n"
+"The segmenter can be used to only generate segment boundaries from a set of inputs using [-gencues](), without generating manifests or output files.\n"
+"In this mode, output PIDs are declared directly rather than redirected to media segment files.\n"
+"The segmentation logic is not changed, and packets are forwarded with the same information and timing as in regular mode.\n"
+"\n"
+"Output PIDs are forwarded with `DashCue=inband` property, so that any subsequent dasher follows the same segmentation process (see above).\n"
+"\n"
+"The first packet in a segment has:\n"
+"- property `FileNumber` (and, if multiple files, `FileName`) set as usual\n"
+"- property `CueStart` set\n"
+"- property `DFPStart=0` set if this is the first packet in a period\n"
+"\n"
+"This mode can be used to pre-segment the streams for later processing that must take place before final dashing.\n"
+"EX gpac -i source.mp4 dasher:gencues cecrypt:cfile=roll_seg.xml -o live.mpd\n"
+"This will allow the encrypter to locate dash boundaries and roll keys at segment boundaries.\n"
+"EX gpac -i s1.mp4 -i s2.mp4:#CryptInfo=clear:#Period=3 -i s3.mp4:#Period=3 dasher:gencues cecrypt:cfile=roll_period.xml -o live.mpd\n"
+"If the DRM file uses `keyRoll=period`, this will generate:\n"
+"- first period crypted with one key\n"
+"- second period clear\n"
+"- third period crypted with another key\n"
+"\n"
+"## Multiplexer development considerations\n"
+"Output multiplexers allowing segmented output must obey the following:\n"
+"- inspect packet properties\n"
+" - FileNumber: if set, indicate the start of a new DASH segment\n"
+" - FileName: if set, indicate the file name. If not present, output shall be a single file. This is only set for packet carrying the `FileNumber` property, and only on one PID (usually the first) for multiplexed outputs\n"
+" - IDXName: gives the optional index name. If not present, index shall be in the same file as dash segment. Only used for MPEG-2 TS for now\n"
+" - EODS: property is set on packets with no payload and no timestamp to signal the end of a DASH segment. This is only used when stopping/resuming the segmentation process, in order to flush segments without dispatching an EOS (see [-subdur]() )\n"
+"- for each segment done, send a downstream event on the first connected PID signaling the size of the segment and the size of its index if any\n"
+"- for multiplexers with init data, send a downstream event signaling the size of the init and the size of the global index if any\n"
+"- the following filter options are passed to multiplexers, which should declare them as arguments:\n"
+" - noinit: disables output of init segment for the multiplexer (used to handle bitstream switching with single init in DASH)\n"
+" - frag: indicates multiplexer shall use fragmented format (used for ISOBMFF mostly)\n"
+" - subs_sidx=0: indicates an SIDX shall be generated - only added if not already specified by user\n"
+" - xps_inband=all|no: indicates AVC/HEVC/... parameter sets shall be sent inband or out of band\n"
+" - nofragdef: indicates fragment defaults should be set in each segment rather than in init segment\n"
+"\n"
+"The segmenter adds the following properties to the output PIDs:\n"
+"- DashMode: identifies VoD (single file with global index) or regular DASH mode used by segmenter\n"
+"- DashDur: identifies target DASH segment duration - this can be used to estimate the SIDX size for example\n"
+"- LLHLS: identifies LLHLS is used; the multiplexer must send fragment size events back to the dasher, and set `LLHLSFragNum` on the first packet of each fragment\n"
 			)
 	.private_size = sizeof(GF_DasherCtx),
 	.args = DasherArgs,
@@ -7206,3 +9557,5 @@
 {
 	return &DasherRegister;
 }
+
+#endif /*GPAC_DISABLE_CORE_TOOLS*/

gpac-1.0.1.tar.gz/src/filters/dec_ac52.c -> gpac-2.0.0.tar.gz/src/filters/dec_ac52.c Changed

gpac-1.0.1.tar.gz/src/filters/dec_bifs.c -> gpac-2.0.0.tar.gz/src/filters/dec_bifs.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / BIFS decoder filter
@@ -105,7 +105,8 @@
 		out_pid = gf_filter_pid_get_udta(pid);
 		if (ctx->out_pid==out_pid)
 			ctx->out_pid = NULL;
-		gf_filter_pid_remove(out_pid);
+		if (out_pid)
+			gf_filter_pid_remove(out_pid);
 		return GF_OK;
 	}
 	//this is a reconfigure
@@ -274,7 +275,8 @@
 GF_FilterRegister BIFSDecRegister = {
 	.name = "bifsdec",
 	GF_FS_SET_DESCRIPTION("MPEG-4 BIFS decoder")
-	GF_FS_SET_HELP("This filter decodes MPEG-4 BIFS frames directly into the scene graph of the compositor. It cannot be used to dump BIFS content.")
+	GF_FS_SET_HELP("This filter decodes MPEG-4 BIFS binary frames directly into the scene graph of the compositor.\n"
+	"Note: This filter cannot be used to dump BIFS content to text or xml, use `MP4Box` for that.")
 	.private_size = sizeof(GF_BIFSDecCtx),
 	.flags = GF_FS_REG_MAIN_THREAD,
 	.priority = 1,

gpac-1.0.1.tar.gz/src/filters/dec_faad.c -> gpac-2.0.0.tar.gz/src/filters/dec_faad.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / AAC FAAD2 decoder filter
@@ -57,7 +57,8 @@
 
 	u32 channel_mask;
 	char ch_reorder[16];
-	u64 last_cts;
+	u64 last_cts, first_priming_cts_plus_one;
+	u32 ts_offset;
 } GF_FAADCtx;
 
 static void faaddec_check_mc_config(GF_FAADCtx *ctx)
@@ -112,8 +113,10 @@
 #endif
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 		return GF_OK;
 	}
@@ -131,14 +134,21 @@
 	ctx->ipid = pid;
 
 
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NO_PRIMING);
+	//force re-priming
+	if (p && !p->value.boolean) {
+		ctx->cfg_crc = 0;
+	}
+
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
 	if (p && p->value.data.ptr && p->value.data.size) {
 		u32 ex_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
-		if (ctx->cfg_crc && (ctx->cfg_crc != ex_crc)) {
-			//shoud we flush ?
-			if (ctx->codec) NeAACDecClose(ctx->codec);
-			ctx->codec = NULL;
-		}
+		if (ctx->cfg_crc == ex_crc)
+			return GF_OK;
+		//no need to flush
+		if (ctx->codec) NeAACDecClose(ctx->codec);
+		ctx->codec = NULL;
+		ctx->cfg_crc = ex_crc;
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Reconfiguring but no DSI set, skipping\n"));
 		return GF_OK;
@@ -150,6 +160,9 @@
 		return GF_IO_ERR;
 	}
 
+	ctx->ts_offset = 0;
+	ctx->first_priming_cts_plus_one = 0;
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 	e = gf_m4a_get_config(p->value.data.ptr, p->value.data.size, &a_cfg);
 	if (e) return e;
@@ -219,6 +232,8 @@
 		else gf_filter_set_name(filter, "dec_faad:FAAD2");
 	}
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+
 	return GF_OK;
 }
 
@@ -295,7 +310,13 @@
 	if (!ctx->info.samples || !buffer || !ctx->info.bytesconsumed) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] empty/non complete AU\n"));
 		if (is_eos) gf_filter_pid_set_eos(ctx->opid);
-		if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+		if (pck) {
+			if (!ctx->first_priming_cts_plus_one) {
+				ctx->first_priming_cts_plus_one = gf_filter_pck_get_cts(pck) + 1;
+
+			}
+			gf_filter_pid_drop_packet(ctx->ipid);
+		}
 		return GF_OK;
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] AU decoded\n"));
@@ -357,6 +378,16 @@
 		faaddec_check_mc_config(ctx);
 	}
 
+	if (ctx->timescale && pck && gf_filter_pid_eos_received(ctx->ipid)) {
+		u64 odur = gf_filter_pck_get_duration(pck);
+		if (ctx->timescale != ctx->sample_rate) {
+			odur = gf_timestamp_rescale(odur, ctx->timescale, ctx->sample_rate);
+		}
+		if (odur * ctx->info.channels < ctx->info.samples) {
+			ctx->info.samples = (unsigned long) (odur * ctx->info.channels);
+		}
+	}
+
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, (u32) (sizeof(short) * ctx->info.samples), &output);
 	if (!dst_pck) {
 		if (pck) gf_filter_pid_drop_packet(ctx->ipid);
@@ -364,8 +395,18 @@
 	}
 	if (pck) {
 		ctx->last_cts = gf_filter_pck_get_cts(pck);
+		if (ctx->first_priming_cts_plus_one && !ctx->ts_offset) {
+			if (ctx->last_cts + 1 >= ctx->first_priming_cts_plus_one)
+				ctx->ts_offset = (u32) (ctx->last_cts - (ctx->first_priming_cts_plus_one-1));
+			else
+				//neg speed
+				ctx->ts_offset = (u32) ((ctx->first_priming_cts_plus_one-1) - ctx->last_cts);
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DELAY, NULL);
+		}
+		ctx->last_cts -= ctx->ts_offset;
 		ctx->timescale = gf_filter_pck_get_timescale(pck);
 		gf_filter_pck_merge_properties(pck, dst_pck);
+		gf_filter_pck_set_dependency_flags(dst_pck, 0);
 	}
 	gf_filter_pck_set_cts(dst_pck, ctx->last_cts);
 	if (ctx->timescale != ctx->sample_rate) {
@@ -395,6 +436,11 @@
 	return GF_OK;
 }
 
+static void faaddec_finalize(GF_Filter *filter)
+{
+	GF_FAADCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->codec) NeAACDecClose(ctx->codec);
+}
 static const GF_FilterCapability FAADCaps[] =
 {
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
@@ -412,9 +458,10 @@
 	GF_FS_SET_DESCRIPTION("FAAD decoder")
 	GF_FS_SET_HELP("This filter decodes AAC streams through faad library.")
 	.private_size = sizeof(GF_FAADCtx),
-	.priority = 1,
+	.priority = 200, //lower priority than ffdec, as faad support for multichannel is not really good
 	SETCAPS(FAADCaps),
 	.configure_pid = faaddec_configure_pid,
+	.finalize = faaddec_finalize,
 	.process = faaddec_process,
 };

gpac-1.0.1.tar.gz/src/filters/dec_img.c -> gpac-2.0.0.tar.gz/src/filters/dec_img.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / libjpeg and libpng decoder filter
@@ -41,8 +41,10 @@
 
 	//disconnect of src pid (not yet supported)
 	if (is_remove) {
-		//one in one out, this is simple
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 		return GF_OK;
 	}
@@ -123,7 +125,7 @@
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->BPP*ctx->width) );
 		}
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, out_size, &output);
-		if (!dst_pck) return GF_SERVICE_ERROR;
+		if (!dst_pck) return GF_OUT_OF_MEM;
 
 		if (ctx->codecid == GF_CODECID_JPEG) {
 			e = gf_img_jpeg_dec(data, size, &ctx->width, &ctx->height, &ctx->pixel_format, output, &out_size, ctx->BPP);
@@ -135,6 +137,7 @@
 			gf_filter_pck_discard(dst_pck);
 		} else {
 			gf_filter_pck_merge_properties(pck, dst_pck);
+			gf_filter_pck_set_dependency_flags(dst_pck, 0);
 			gf_filter_pck_send(dst_pck);
 		}
 		gf_filter_pid_drop_packet(ctx->ipid);

gpac-1.0.1.tar.gz/src/filters/dec_j2k.c -> gpac-2.0.0.tar.gz/src/filters/dec_j2k.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 *  This file is part of GPAC / openjpeg2k decoder filter
@@ -78,8 +78,10 @@
 	GF_J2KCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 		return GF_OK;
 	}
@@ -171,6 +173,7 @@
 	if (ctx->pixel_format) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT( (ctx->pixel_format == GF_PIXEL_YUV) ? ctx->width : ctx->width * ctx->nb_comp) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pixel_format) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(GF_TRUE) );
 	}
 	return GF_OK;
 }
@@ -453,6 +456,7 @@
 #endif
 
 	pck_dst = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &buffer);
+	if (!pck_dst) return GF_OUT_OF_MEM;
 
 	w = image->comps[0].w;
 	wr = int_ceildivpow2(image->comps[0].w, image->comps[0].factor);
@@ -563,6 +567,7 @@
 		gf_filter_pck_discard(pck_dst);
 	} else {
 		gf_filter_pck_merge_properties(pck, pck_dst);
+		gf_filter_pck_set_dependency_flags(pck_dst, 0);
 		gf_filter_pck_send(pck_dst);
 	}
 	gf_filter_pid_drop_packet(ctx->ipid);

gpac-1.0.1.tar.gz/src/filters/dec_laser.c -> gpac-2.0.0.tar.gz/src/filters/dec_laser.c Changed

gpac-1.0.1.tar.gz/src/filters/dec_mad.c -> gpac-2.0.0.tar.gz/src/filters/dec_mad.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2017
+ *			Copyright (c) Telecom ParisTech 2005-2021
 *					All rights reserved
 *
 * This file is part of GPAC / MP3 libmad decoder filter
@@ -66,23 +66,62 @@
 	struct mad_stream stream;
 	struct mad_synth synth;
 
+	Bool flush_done;
+	u32 last_pck_dur;
+	s64 delay;
+
 } GF_MADCtx;
 
+static void maddec_copy_props(GF_MADCtx *ctx)
+{
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16) );
+
+	if (ctx->sample_rate)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(ctx->sample_rate) );
+
+	if (ctx->num_channels) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(ctx->num_channels) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT((ctx->num_channels==1) ? GF_AUDIO_CH_FRONT_CENTER : GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT) );
+	}
+
+	if (!ctx->delay)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DELAY, NULL);
+}
+
 static GF_Err maddec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	const GF_PropertyValue *p;
 	GF_MADCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
 		return GF_NOT_SUPPORTED;
 
+
 	if (ctx->configured) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NO_PRIMING);
+		//no re-prime, skip if same config
+		if (p && p->value.boolean) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+			u32 sr = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+			u32 ch = p ? p->value.uint : 0;
+			if ((ctx->sample_rate==sr) && (ctx->num_channels==ch)) {
+				maddec_copy_props(ctx);
+				return GF_OK;
+			}
+		}
+
 		mad_stream_finish(&ctx->stream);
 		mad_frame_finish(&ctx->frame);
 		mad_synth_finish(&ctx->synth);
@@ -101,32 +140,24 @@
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
 	}
-	//copy properties at init or reconfig
-	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
 	if (p) ctx->sample_rate = p->value.uint;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
 	if (p) ctx->num_channels = p->value.uint;
 
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16) );
-
 	if (!ctx->buffer) {
 		ctx->buffer = (unsigned char*)gf_malloc(sizeof(char) * 2*MAD_BUFFER_MDLEN);
 	}
 
-	if (ctx->sample_rate)
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(ctx->sample_rate) );
-
-	if (ctx->num_channels) {
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(ctx->num_channels) );
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT((ctx->num_channels==1) ? GF_AUDIO_CH_FRONT_CENTER : GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT) );
-	}
-
 	gf_filter_set_name(filter, "dec_mad:MAD " MAD_VERSION);
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+	ctx->delay = p ? p->value.longsint : 0;
 
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	maddec_copy_props(ctx);
+
 	return GF_OK;
 }
 
@@ -158,32 +189,46 @@
 	mad_fixed_t *left_ch, *right_ch, chan;
 	u8 *ptr;
 	u8 *data;
-	u32 num, in_size; //, outSize=0;
+	u32 num, samples_to_trash, in_size; //, outSize=0;
 	GF_MADCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *dst_pck;
 	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
 
 	if (!pck) {
-		if (gf_filter_pid_is_eos(ctx->ipid))
-			gf_filter_pid_set_eos(ctx->opid);
-		return GF_OK;
-	}
-	data = (char *) gf_filter_pck_get_data(pck, &in_size);
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (ctx->flush_done) {
+				gf_filter_pid_set_eos(ctx->opid);
+				return GF_EOS;
+			}
+			ctx->flush_done = GF_TRUE;
+			memset(ctx->buffer + ctx->len, 0, MAD_BUFFER_GUARD);
+			ctx->len += MAD_BUFFER_GUARD;
+		} else {
+			return GF_OK;
+		}
+	} else {
+		data = (char *) gf_filter_pck_get_data(pck, &in_size);
 
-	if (ctx->len + in_size > 2*MAD_BUFFER_MDLEN) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[MAD] MAD buffer overflow, truncating\n"));
-		in_size = 2*MAD_BUFFER_MDLEN - ctx->len;
-	}
+		if (ctx->len + in_size > 2*MAD_BUFFER_MDLEN) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[MAD] MAD buffer overflow, truncating\n"));
+			in_size = 2*MAD_BUFFER_MDLEN - ctx->len;
+		}
 
-	memcpy(ctx->buffer + ctx->len, data, in_size);
-	ctx->len += in_size;
+		memcpy(ctx->buffer + ctx->len, data, in_size);
+		ctx->len += in_size;
+		ctx->last_pck_dur = gf_filter_pck_get_duration(pck);
+	}
 
 mad_resync:
 	mad_stream_buffer(&ctx->stream, ctx->buffer, ctx->len);
 
 	if (mad_frame_decode(&ctx->frame, &ctx->stream) == -1) {
+		if (!pck) return GF_OK;
+
 		if (ctx->stream.error==MAD_ERROR_BUFLEN) {
-			if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+			ctx->last_cts = gf_filter_pck_get_cts(pck);
+			ctx->timescale = gf_filter_pck_get_timescale(pck);
+			gf_filter_pid_drop_packet(ctx->ipid);
 			return GF_OK;
 		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MAD] Decoding failed error %s (%d)\n", mad_stream_errorstr(&ctx->stream), ctx->stream.error ) );
@@ -215,22 +260,53 @@
 	}
 
 	num = ctx->synth.pcm.length;
-	left_ch = ctx->synth.pcm.samples[0];
-	right_ch = ctx->synth.pcm.samples[1];
 
-	dst_pck = gf_filter_pck_new_alloc(ctx->opid, num*2*ctx->num_channels, &ptr);
+	samples_to_trash = 0;
+	if (ctx->delay<0) {
+		if ((s64) ctx->last_cts + ctx->delay < 0) {
+			s32 dur = num;
+			if (ctx->timescale != ctx->sample_rate) {
+				dur = (s32) gf_timestamp_rescale(dur, ctx->timescale, ctx->sample_rate);
+			}
+			if (dur + ctx->delay < 0) {
+				num = 0;
+				ctx->delay += dur;
+			} else {
+				samples_to_trash = (u32) -ctx->delay;
+			}
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DELAY, NULL);
+		} else {
+			ctx->delay = 0;
+		}
+	}
+
+	if (!pck && ctx->last_pck_dur) {
+		u32 dur = ctx->last_pck_dur;
+		if (ctx->timescale != ctx->sample_rate) {
+			dur = (u32) gf_timestamp_rescale(dur, ctx->timescale, ctx->sample_rate);
+		}
+		if (dur < num) {
+			num = dur;
+		}
+	}
+
+	left_ch = ctx->synth.pcm.samples[0] + samples_to_trash;
+	right_ch = ctx->synth.pcm.samples[1] + samples_to_trash;
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, (num - samples_to_trash) * 2 * ctx->num_channels, &ptr);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	if (pck) {
 		ctx->last_cts = gf_filter_pck_get_cts(pck);
 		ctx->timescale = gf_filter_pck_get_timescale(pck);
 		gf_filter_pck_merge_properties(pck, dst_pck);
+		gf_filter_pck_set_dependency_flags(dst_pck, 0);
 
 		gf_filter_pid_drop_packet(ctx->ipid);
 	}
 	gf_filter_pck_set_cts(dst_pck, ctx->last_cts);
 	if (ctx->timescale != ctx->sample_rate) {
-		u64 dur = num * ctx->timescale;
-		dur /= ctx->sample_rate;
+		u64 dur = gf_timestamp_rescale(num, ctx->sample_rate, ctx->timescale);
 		gf_filter_pck_set_duration(dst_pck, (u32) dur);
 		ctx->last_cts += dur;
 	} else {
@@ -239,7 +315,7 @@
 	}
 
 
-	while (num--) {
+	while (num-- > samples_to_trash) {
 		s32 rs;
 		MAD_SCALE(rs, (*left_ch++) );
 
@@ -269,6 +345,7 @@
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_PART3),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO_L1),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 };

gpac-1.0.1.tar.gz/src/filters/dec_mediacodec.c -> gpac-2.0.0.tar.gz/src/filters/dec_mediacodec.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / mediacodec decoder filter
@@ -124,7 +124,7 @@
 static void mcdec_reset_ps_list(GF_List *list)
 {
 	while (list && gf_list_count(list)) {
-		GF_AVCConfigSlot *slc = gf_list_get(list, 0);
+		GF_NALUFFParam *slc = gf_list_get(list, 0);
 		gf_free(slc->data);
 		gf_free(slc);
 		gf_list_rem(list, 0);
@@ -136,8 +136,8 @@
 {
 	s32 idx;
 	u32 i;
-	GF_AVCConfigSlot *sps = NULL;
-	GF_AVCConfigSlot *pps = NULL;
+	GF_NALUFFParam *sps = NULL;
+	GF_NALUFFParam *pps = NULL;
 
 	for (i=0; i<gf_list_count(ctx->SPSs); i++) {
 		sps = gf_list_get(ctx->SPSs, i);
@@ -157,7 +157,9 @@
 	ctx->reconfig_needed = GF_FALSE;
 	ctx->inject_xps = GF_TRUE;
 
+	if (ctx->active_sps<0) return GF_OK;
 	idx = ctx->active_sps;
+
 	ctx->width = ctx->avc.sps[idx].width;
 	ctx->height = ctx->avc.sps[idx].height;
 	ctx->crop_left = ctx->avc.sps[idx].crop.left;
@@ -244,9 +246,9 @@
 	s32 idx;
 
 	u32 i;
-	GF_AVCConfigSlot *sps = NULL;
-	GF_AVCConfigSlot *pps = NULL;
-	GF_AVCConfigSlot *vps = NULL;
+	GF_NALUFFParam *sps = NULL;
+	GF_NALUFFParam *pps = NULL;
+	GF_NALUFFParam *vps = NULL;
 
 	for (i=0; i<gf_list_count(ctx->SPSs); i++) {
 		sps = gf_list_get(ctx->SPSs, i);
@@ -274,6 +276,8 @@
 	ctx->reconfig_needed = GF_FALSE;
 	ctx->inject_xps = GF_TRUE;
 
+	if (ctx->active_sps<0) return GF_OK;
+
 	idx = ctx->active_sps;
 	ctx->width = ctx->hevc.sps[idx].width;
 	ctx->height = ctx->hevc.sps[idx].height;
@@ -433,16 +437,16 @@
 	GF_List *dest = (xps == MCDEC_SPS) ? ctx->SPSs : ctx->PPSs;
 
 	if (xps == MCDEC_SPS) {
-		ps_id = gf_media_avc_read_sps(data, size, &ctx->avc, 0, NULL);
+		ps_id = gf_avc_read_sps(data, size, &ctx->avc, 0, NULL);
 		if (ps_id<0) return;
 	}
 	else {
-		ps_id = gf_media_avc_read_pps(data, size, &ctx->avc);
+		ps_id = gf_avc_read_pps(data, size, &ctx->avc);
 		if (ps_id<0) return;
 	}
 	count = gf_list_count(dest);
 	for (i = 0; i<count; i++) {
-		GF_AVCConfigSlot *a_slc = gf_list_get(dest, i);
+		GF_NALUFFParam *a_slc = gf_list_get(dest, i);
 		if (a_slc->id != ps_id) continue;
 		//not same size or different content but same ID, remove old xPS
 		if ((a_slc->size != size) || memcmp(a_slc->data, data, size)) {
@@ -457,8 +461,8 @@
 		break;
 	}
 	if (add) {
-		GF_AVCConfigSlot *slc;
-		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
+		GF_NALUFFParam *slc;
+		GF_SAFEALLOC(slc, GF_NALUFFParam);
 		if (!slc) return;
 		slc->data = gf_malloc(size);
 		if (!slc->data) {
@@ -486,17 +490,17 @@
 	switch(xps) {
 		case MCDEC_SPS:
 			dest = ctx->SPSs;
-			ps_id = gf_media_hevc_read_sps(data, size, &ctx->hevc);
+			ps_id = gf_hevc_read_sps(data, size, &ctx->hevc);
 			if (ps_id<0) return;
 			break;
 		case MCDEC_PPS:
 			dest = ctx->PPSs;
-			ps_id = gf_media_hevc_read_pps(data, size, &ctx->hevc);
+			ps_id = gf_hevc_read_pps(data, size, &ctx->hevc);
 			if (ps_id<0) return;
 			break;
 		case MCDEC_VPS:
 			dest = ctx->VPSs;
-			ps_id = gf_media_hevc_read_vps(data, size, &ctx->hevc);
+			ps_id = gf_hevc_read_vps(data, size, &ctx->hevc);
 			if (ps_id<0) return;
 			break;
 		default:
@@ -505,7 +509,7 @@
 
 	count = gf_list_count(dest);
 	for (i = 0; i<count; i++) {
-		GF_AVCConfigSlot *a_slc = gf_list_get(dest, i);
+		GF_NALUFFParam *a_slc = gf_list_get(dest, i);
 		if (a_slc->id != ps_id) continue;
 		//not same size or different content but same ID, remove old xPS
 		if ((a_slc->size != size) || memcmp(a_slc->data, data, size)) {
@@ -520,8 +524,8 @@
 		break;
 	}
 	if (add && dest) {
-		GF_AVCConfigSlot *slc;
-		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
+		GF_NALUFFParam *slc;
+		GF_SAFEALLOC(slc, GF_NALUFFParam);
 		if (!slc) return;
 		slc->data = gf_malloc(size);
 		if (!slc->data) {
@@ -554,8 +558,10 @@
 		gf_list_del_item(ctx->streams, pid);
 		if (!gf_list_count(ctx->streams)) {
 			if (ctx->codec) AMediaCodec_stop(ctx->codec);
-			if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-			ctx->opid = NULL;
+			if (ctx->opid) {
+				gf_filter_pid_remove(ctx->opid);
+				ctx->opid = NULL;
+			}
 		}
 		return GF_OK;
 	}
@@ -650,7 +656,7 @@
 	//check AVC config
 if (ctx->codecid == GF_CODECID_AVC) {
 		GF_AVCConfig *cfg;
-		GF_AVCConfigSlot *slc;
+		GF_NALUFFParam *slc;
 
 		ctx->mime = "video/avc";
 		ctx->avc.sps_active_idx = -1;
@@ -689,7 +695,7 @@
 	else if (codecid == GF_CODECID_HEVC) {
 		ctx->mime = "video/hevc";
 GF_HEVCConfig *hvcc;
-	 GF_AVCConfigSlot *sl;
+	 GF_NALUFFParam *sl;
 	 HEVCState hevc;
 	 u32 j;
 
@@ -700,9 +706,9 @@
 	 ctx->nalu_size_length = hvcc->nal_unit_size;
 
 	 for (i=0; i< gf_list_count(hvcc->param_array); i++) {
-			GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(hvcc->param_array, i);
+			GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *)gf_list_get(hvcc->param_array, i);
 			for (j=0; j< gf_list_count(ar->nalus); j++) {
-				sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+				sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
 
 				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
 					mcdec_register_hevc_param_set(ctx, sl->data, sl->size, MCDEC_SPS);
@@ -735,7 +741,7 @@
 	if (!all && (active_ps<0)) return;
 	count = gf_list_count(ps);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(ps, i);
+		GF_NALUFFParam *sl = gf_list_get(ps, i);
 		if (all || (sl->id==active_ps)) {
 			gf_bs_write_u32(bs, 1);
 			gf_bs_write_data(bs, sl->data, sl->size);
@@ -805,7 +811,7 @@
 
 		if (ctx->codecid==GF_CODECID_AVC) {
 			//this will turn it back on
-			gf_media_avc_parse_nalu (bs, &ctx->avc);
+			gf_avc_parse_nalu (bs, &ctx->avc);
 			gf_bs_seek(bs, pos + nal_size);
 
 			nal_type = ctx->avc.last_nal_type_parsed;
@@ -828,7 +834,7 @@
 			}
 		} else {
 			u8 quality_id, temporal_id;
-			gf_media_hevc_parse_nalu_bs (bs, &ctx->hevc, &nal_type, &temporal_id, &quality_id);
+			gf_hevc_parse_nalu_bs (bs, &ctx->hevc, &nal_type, &temporal_id, &quality_id);
 			gf_bs_seek(bs, pos + nal_size);
 
 			switch(nal_type) {
@@ -871,7 +877,8 @@
 
 	Bool mcdec_buffer_available = GF_FALSE;
 
-#if FILTER_FIXME
+	//commented out, leading to some crashes
+#if 0
 	if (!ctx->before_exit_registered) {
 		ctx->before_exit_registered = GF_TRUE;
 		if (gf_register_before_exit_function(gf_th_current(), &mcdec_exit_callback) != GF_OK) {
@@ -898,9 +905,8 @@
 				return GF_OK;
 			}
 		}
-		dts = gf_filter_pck_get_dts(pck);
-		dts *= 1000;
-		dts /= gf_filter_pck_get_timescale(pck);
+		dts = gf_timestamp_rescale(gf_filter_pck_get_dts(pck), gf_filter_pck_get_timescale(pck), 1000);
+
 		if (!min_dts || (min_dts>dts)) {
 			min_dts = dts;
 			ref_pid = pid;
@@ -1213,6 +1219,10 @@
 }
 
 #else
+static GF_Err mcdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	return GF_EOS;
+}
 static GF_Err mcdec_process(GF_Filter *filter)
 {
 	return GF_EOS;
@@ -1256,8 +1266,8 @@
 	.private_size = sizeof(GF_MCDecCtx),
 	.initialize = mcdec_initialize,
 	.finalize = mcdec_finalize,
-	.configure_pid = mcdec_configure_pid,
 #endif
+	.configure_pid = mcdec_configure_pid,
 	.process = mcdec_process,
 };
 
@@ -1270,9 +1280,16 @@
 	GF_MCDecCtxRegister.version = "! Warning: MediaCodec SDK NOT AVAILABLE IN THIS BUILD !";
 
 #ifdef GPAC_ENABLE_COVERAGE
+	mcdec_configure_pid(NULL, NULL, GF_FALSE);
 	mcdec_process(NULL);
 #endif
+	return &GF_MCDecCtxRegister;
+
+#elif defined(GPAC_HAS_MEDIACODEC)
 
-#endif
 	return &GF_MCDecCtxRegister;
+#else
+
+	return NULL;
+#endif
 }

gpac-1.0.1.tar.gz/src/filters/dec_nvdec.c -> gpac-2.0.0.tar.gz/src/filters/dec_nvdec.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / NVidia Hardware decoder filter
@@ -28,7 +28,7 @@
 #include <gpac/constants.h>
 #include <gpac/filters.h>
 
-#if (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) 
+#if (!defined(GPAC_STATIC_BUILD) && (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) && !defined(GPAC_DISABLE_NVDEC))
 
 #include "dec_nvdec_sdk.h"
 
@@ -69,7 +69,7 @@
 	u32 num_surfaces;
 
 	GF_FilterPid *ipid, *opid;
-	u32 codec_id;
+	u32 codec_id, cfg_crc;
 	Bool use_gl_texture;
 	u32 width, height, bpp_luma, bpp_chroma;
 	cudaVideoCodec codec_type;
@@ -80,7 +80,7 @@
 	Bool skip_next_frame;
 	CUresult decode_error, dec_create_error;
 	Bool frame_size_changed;
-	Bool needs_resetup;
+	u32 needs_resetup;
 	unsigned long prefer_dec_mode;
 
 	NVDecInstance *dec_inst;
@@ -89,9 +89,6 @@
 	GF_List *frames_res;
 	GF_List *src_packets;
 
-	struct __nv_frame *pending_frame;
-
-
 	u8 *xps_buf;
 	u32 xps_buf_size;
 	u32 nal_size_length;
@@ -106,7 +103,10 @@
 	Bool gl_provider_requested;
 	GLint y_tx_id, uv_tx_id;
 	GLint y_pbo_id, uv_pbo_id;
+	Bool reset_pbo;
 #endif
+	u32 nb_out_frames_pending;
+
 } NVDecCtx;
 
 
@@ -145,6 +145,8 @@
 static CUdevice cuda_dev = -1;
 #endif
 
+static GF_Err nvdec_flush_frame(NVDecCtx *ctx, NVDecFrame *f);
+
 //#define ENABLE_10BIT_OUTPUT
 
 static GF_Err nvdec_init_decoder(NVDecCtx *ctx)
@@ -242,6 +244,15 @@
 	return GF_FALSE;
 }
 
+static void nvdec_copy_props(NVDecCtx *ctx)
+{
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
+}
+
 static void nvdec_destroy_decoder(NVDecInstance *inst)
 {
 	if (inst->cu_decoder) {
@@ -268,6 +279,7 @@
 		ctx->pix_fmt = 0;
 		return;
 	}
+	ctx->stride_uv = 0;
 	gf_pixel_get_size_info(ctx->pix_fmt, ctx->width, ctx->height, &ctx->out_size, &ctx->stride, &ctx->stride_uv, &ctx->nb_planes, &ctx->uv_height);
 }
 
@@ -277,8 +289,8 @@
 	Bool skip_output_resize=GF_FALSE;
 	NVDecInstance *inst= (NVDecInstance *)pUserData;
 	NVDecCtx *ctx = inst->ctx;
-
 	u32 w, h;
+
 	w = pFormat->coded_width;
 	h = pFormat->coded_height;
 
@@ -298,6 +310,17 @@
 			return 1;
 		skip_output_resize = GF_TRUE;
 	}
+	ctx->needs_resetup = 1;
+	while (gf_list_count(ctx->frames)) {
+		NVDecFrame *f = gf_list_pop_front(ctx->frames);
+		nvdec_flush_frame(ctx, f);
+	}
+	ctx->needs_resetup = 0;
+
+	if (ctx->nb_out_frames_pending) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] Decoder must reset and pending frames not yet drawn: multiple SPS in single config, not supported!\nDisabling GPU frame dispatch\n"));
+		ctx->fmode = NVDEC_COPY;
+	}
 
 	//commented out since this falls back to soft decoding !
 #ifdef ENABLE_10BIT_OUTPUT
@@ -312,7 +335,11 @@
 	ctx->chroma_fmt = pFormat->chroma_format;
 	ctx->stride = pFormat->coded_width;
 
-	//if load_inatcive returns TRUE, we are reusing an existing decoder with the same config, no need to recreate one
+#ifndef GPAC_DISABLE_3D
+	ctx->reset_pbo = GF_TRUE;
+#endif
+
+	//if load_inactive returns TRUE, we are reusing an existing decoder with the same config, no need to recreate one
 	if (load_inactive_dec(ctx)) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] reusing inactive decoder %dx%d - %d total decoders loaded\n", ctx->width, ctx->height, global_nb_loaded_decoders) );
 		ctx->stride = ctx->dec_inst->stride;
@@ -320,7 +347,7 @@
 		if (!ctx->out_size) ctx->reload_decoder_state = 1;
 
 		update_pix_fmt(ctx, use_10bits);
-		return GF_OK;
+		return 1;
 	}
 	if (!ctx->dec_inst) return GF_OUT_OF_MEM;
 	//if we have an existing decoder but with a different config, let's reload
@@ -333,13 +360,15 @@
 	ctx->dec_inst->codec_type = ctx->codec_type;
 	ctx->dec_inst->chroma_fmt = ctx->chroma_fmt;
 	ctx->dec_inst->ctx = ctx;
-	ctx->stride = use_10bits ? 2*ctx->width : ctx->width;
+	ctx->stride = use_10bits ? 2 * ctx->width : ctx->width;
 
 	update_pix_fmt(ctx, use_10bits);
 
+	nvdec_copy_props(ctx);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->stride));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE_UV, NULL);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BIT_DEPTH_Y, &PROP_UINT(use_10bits ? ctx->bpp_luma : 8));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BIT_DEPTH_UV, &PROP_UINT(use_10bits ? ctx->bpp_chroma : 8));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pix_fmt));
@@ -407,7 +436,7 @@
 	u32 i, count;
 	count = gf_list_count(psl);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *slc = gf_list_get(psl, i);
+		GF_NALUFFParam *slc = gf_list_get(psl, i);
 		gf_bs_write_u32(bs, 1);
 		gf_bs_write_data(bs, slc->data, slc->size);
 	}
@@ -427,7 +456,7 @@
 		ctx->nal_size_length = hevc_cfg->nal_unit_size;
 		count = gf_list_count(hevc_cfg->param_array);
 		for (i=0; i<count; i++) {
-			GF_HEVCParamArray *pa = gf_list_get(hevc_cfg->param_array, i);
+			GF_NALUFFParamArray *pa = gf_list_get(hevc_cfg->param_array, i);
 			nvdec_store_paramlist(bs, pa->nalus);
 		}
 		gf_odf_hevc_cfg_del(hevc_cfg);
@@ -482,7 +511,7 @@
 
 	//create a video parser and a video decoder
 memset(&oVideoParserParameters, 0, sizeof(CUVIDPARSERPARAMS));
-	ctx->needs_resetup = GF_FALSE;
+	ctx->needs_resetup = 0;
 	ctx->nal_size_length = 0;
 
 	//this destroys avc_cfg / hevc_cfg
@@ -558,8 +587,13 @@
 	NVDecCtx *ctx = (NVDecCtx *) gf_filter_get_udta(filter);
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = NULL;
+		if (ctx->ipid != pid)
+			return GF_OK;
+
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 
 		if (ctx->unload == 2) {
@@ -587,7 +621,7 @@
 	if (ctx->use_gl_texture && (ctx->fmode==NVDEC_GL) && !ctx->gl_provider_requested) {
 		GF_Err e = gf_filter_request_opengl(filter);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to request an openGL provider (error %s), will not use OpenGL output\n", gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to request an OpenGL provider (error %s), will not use OpenGL output\n", gf_error_to_string(e) ));
 			ctx->use_gl_texture = GF_FALSE;
 		}
 		ctx->gl_provider_requested = GF_TRUE;
@@ -596,6 +630,9 @@
 
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
 	if (!prop) return GF_NOT_SUPPORTED;
+	if (ctx->codec_id != prop->value.uint) {
+		ctx->cfg_crc = 0;
+	}
 	ctx->codec_id = prop->value.uint;
 
 	switch (ctx->codec_id) {
@@ -614,14 +651,10 @@
 		return GF_NOT_SUPPORTED;
 	}
 
-	if (!ctx->opid)
+	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
-
-	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
+		nvdec_copy_props(ctx);
+	}
 
 	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
 
@@ -631,6 +664,11 @@
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
 		//not ready yet
 		if (!prop) return GF_OK;
+		if (prop->value.data.ptr) {
+			u32 crc = gf_crc_32(prop->value.data.ptr, prop->value.data.size);
+			if (crc == ctx->cfg_crc) return GF_OK;
+			ctx->cfg_crc = crc;
+		}
 		break;
 	}
 
@@ -707,7 +745,7 @@
 	}
 
 
-	ctx->needs_resetup = GF_TRUE;
+	ctx->needs_resetup = 1;
 
 	return GF_OK;
 }
@@ -747,20 +785,20 @@
 				ctx->dec_inst = NULL;
 				gf_mx_v(global_inst_mutex);
 			}
-			ctx->needs_resetup = GF_TRUE;
+			ctx->needs_resetup = 1;
 			ctx->dec_create_error = CUDA_SUCCESS;
 		} else if (ctx->unload == 1) {
 			if (ctx->dec_inst) {
 				nvdec_destroy_decoder(ctx->dec_inst);
 			}
-			ctx->needs_resetup = GF_TRUE;
+			ctx->needs_resetup = 1;
 			ctx->dec_create_error = CUDA_SUCCESS;
 		}
 		return GF_OK;
 	}
 #endif
 
-static GF_Err nvdec_send_hw_frame(NVDecCtx *ctx);
+static GF_Err nvdec_send_hw_frame(NVDecCtx *ctx, NVDecFrame *f);
 
 static void nvdec_reset_pcks(NVDecCtx *ctx)
 {
@@ -779,6 +817,8 @@
 		src_pck = gf_list_get(ctx->src_packets, i);
 		if (gf_filter_pck_get_cts(src_pck) == f->frame_info.timestamp) {
 			gf_filter_pck_merge_properties(src_pck, dst_pck);
+			gf_filter_pck_set_dependency_flags(dst_pck, 0);
+			gf_filter_pck_set_dts(dst_pck, f->frame_info.timestamp);
 			gf_list_rem(ctx->src_packets, i);
 			gf_filter_pck_unref(src_pck);
 			return;
@@ -786,6 +826,7 @@
 	}
 	//not found !
 	gf_filter_pck_set_cts(dst_pck, f->frame_info.timestamp);
+	gf_filter_pck_set_dts(dst_pck, f->frame_info.timestamp);
 	if (!gf_filter_pck_get_interlaced(dst_pck) && !f->frame_info.progressive_frame) {
 		gf_filter_pck_set_interlaced(dst_pck, f->frame_info.top_field_first ? 1 : 2);
 	}
@@ -794,25 +835,44 @@
 static GF_Err nvdec_process(GF_Filter *filter)
 {
 	NVDecFrame *f;
- CUdeviceptr map_mem = 0;
-	CUVIDPROCPARAMS params;
-	unsigned int pitch = 0;
 	GF_Err e;
 	u32 pck_size;
 	const u8 *data;
-	u8 *output;
-	GF_FilterPacket *ipck, *dst_pck;
- CUVIDSOURCEDATAPACKET cu_pkt;
+	GF_FilterPacket *ipck;
+	CUVIDSOURCEDATAPACKET cu_pkt;
 	CUresult res;
-	NVDecCtx *ctx = (NVDecCtx *) gf_filter_get_udta(filter);
+	NVDecCtx *ctx = (NVDecCtx *)gf_filter_get_udta(filter);
 
 	ipck = gf_filter_pid_get_packet(ctx->ipid);
 
 	if (ctx->needs_resetup) {
-		e = nvdec_configure_stream(filter, ctx);
-		if (e<0) return e;
-		//not ready
-		if (e==GF_EOS) return GF_OK;
+		if (gf_list_count(ctx->frames)) {
+#ifndef EMUL_NV_DLL
+			res = cuCtxPushCurrent(cuda_ctx);
+			if (res != CUDA_SUCCESS) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to push CUDA CTX %s\n", cudaGetErrorEnum(res)));
+			}
+#endif
+			f = gf_list_pop_front(ctx->frames);
+			e = nvdec_flush_frame(ctx, f);
+			cuCtxPopCurrent(NULL);
+			return e;
+		}
+		//send end of sequence
+		if (ctx->dec_inst && (ctx->needs_resetup == 1)) {
+			ctx->needs_resetup = 2;
+			ipck = NULL;
+		}
+		else {
+			if (ctx->nb_out_frames_pending) {
+				gf_filter_ask_rt_reschedule(filter, 1);
+				return GF_OK;
+			}
+			e = nvdec_configure_stream(filter, ctx);
+			if (e < 0) return e;
+			//not ready
+			if (e == GF_EOS) return GF_OK;
+		}
 	}
 
 	memset(&cu_pkt, 0, sizeof(CUVIDSOURCEDATAPACKET));
@@ -820,12 +880,13 @@
 	pck_size = 0;
 	data = NULL;
 	if (!ipck) {
-		if (!gf_filter_pid_is_eos(ctx->ipid))
+		if (!ctx->needs_resetup && !gf_filter_pid_is_eos(ctx->ipid))
 			return GF_OK;
 
 		cu_pkt.flags |= CUVID_PKT_ENDOFSTREAM;
 		ctx->skip_next_frame = GF_FALSE;
-	} else {
+	}
+	else {
 		data = gf_filter_pck_get_data(ipck, &pck_size);
 	}
 
@@ -851,7 +912,7 @@
 
 		while (pck_size) {
 			u32 i, nal_size = 0;
-			for (i = 0; i<ctx->nal_size_length; i++) {
+			for (i = 0; i < ctx->nal_size_length; i++) {
 				nal_size = (nal_size << 8) + ((u8)data[i]);
 			}
 			data += ctx->nal_size_length;
@@ -874,16 +935,17 @@
 	if (ipck) cu_pkt.timestamp = gf_filter_pck_get_cts(ipck);
 
 #ifndef EMUL_NV_DLL
- res = cuCtxPushCurrent(cuda_ctx);
+	res = cuCtxPushCurrent(cuda_ctx);
 	if (res != CUDA_SUCCESS) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to push CUDA CTX %s\n", cudaGetErrorEnum(res) ) );
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to push CUDA CTX %s\n", cudaGetErrorEnum(res)));
 	}
 	if (ctx->skip_next_frame) {
 		ctx->skip_next_frame = GF_FALSE;
-	} else {
+	}
+	else {
 		res = cuvidParseVideoData(ctx->dec_inst->cu_parser, &cu_pkt);
 		if (res != CUDA_SUCCESS) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] decoder instance %d failed to parse data %s\n", ctx->dec_inst->id, cudaGetErrorEnum(res) ) );
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] decoder instance %d failed to parse data %s\n", ctx->dec_inst->id, cudaGetErrorEnum(res)));
 		}
 	}
 #endif //EMUL_NV_DLL
@@ -895,9 +957,10 @@
 	}
 
 	if (ctx->reload_decoder_state) {
-		if (ctx->reload_decoder_state==2) {
+		if (ctx->reload_decoder_state == 2) {
 			nvdec_destroy_decoder(ctx->dec_inst);
-		} else {
+		}
+		else {
 			ctx->skip_next_frame = GF_TRUE;
 		}
 
@@ -908,7 +971,7 @@
 		}
 
 		//need to setup decoder
-		if (! ctx->dec_inst->cu_decoder) {
+		if (!ctx->dec_inst->cu_decoder) {
 			nvdec_init_decoder(ctx);
 		}
 		cuCtxPopCurrent(NULL);
@@ -930,14 +993,27 @@
 		}
 		return GF_OK;
 	}
-	if (ctx->use_gl_texture || (ctx->fmode==NVDEC_SINGLE) ) {
-		assert(!ctx->pending_frame);
-		ctx->pending_frame = f;
-		return nvdec_send_hw_frame(ctx);
+	e = nvdec_flush_frame(ctx, f);
+	cuCtxPopCurrent(NULL);
+	return e;
+}
+
+static GF_Err nvdec_flush_frame(NVDecCtx *ctx, NVDecFrame *f)
+{
+	GF_FilterPacket *dst_pck;
+	CUdeviceptr map_mem = 0;
+	CUVIDPROCPARAMS params;
+	unsigned int pitch = 0;
+	u8 *output;
+	CUresult res;
+	GF_Err e;
+	if (ctx->use_gl_texture || (ctx->fmode==NVDEC_SINGLE)) {
+		return nvdec_send_hw_frame(ctx, f);
 	}
 
 	assert(ctx->out_size);
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &output);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	memset(&params, 0, sizeof(params));
 	params.progressive_frame = f->frame_info.progressive_frame;
@@ -990,11 +1066,8 @@
 			gf_filter_pck_discard(dst_pck);
 		}
 	}
-	cuCtxPopCurrent(NULL);
-
 	memset(f, 0, sizeof(NVDecFrame));
 	gf_list_add(ctx->frames_res, f);
-
 	return e;
 }
 
@@ -1003,7 +1076,7 @@
 	GF_FilterFrameInterface *frame = gf_filter_pck_get_frame_interface(pck);
 	NVDecFrame *f = (NVDecFrame*) frame->user_data;
 	NVDecCtx *ctx = (NVDecCtx *)f->ctx;
-
+	ctx->nb_out_frames_pending--;
 	memset(f, 0, sizeof(NVDecFrame));
 	gf_list_add(ctx->frames_res, f);
 }
@@ -1033,14 +1106,30 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to push CUDA CTX %s\n", cudaGetErrorEnum(res) ) );
 	}
 
+	if (ctx->reset_pbo) {
+		ctx->reset_pbo = GF_FALSE;
+		cuGLUnregisterBufferObject(ctx->y_pbo_id);
+		cuGLUnregisterBufferObject(ctx->uv_pbo_id);
+		glDeleteBuffers(1, &ctx->y_pbo_id);
+		glDeleteBuffers(1, &ctx->uv_pbo_id);
+		ctx->y_pbo_id = ctx->uv_pbo_id = 0;
+		glDeleteTextures(1, &ctx->y_tx_id);
+		glDeleteTextures(1, &ctx->uv_tx_id);
+		ctx->y_tx_id = ctx->uv_tx_id = 0;
+	}
+
 	if (! *gl_tex_id && ! plane_idx && ctx->y_tx_id ) {
 		cuGLUnregisterBufferObject(ctx->y_pbo_id);
+		glDeleteBuffers(1, &ctx->y_pbo_id);
 		ctx->y_pbo_id = 0;
+		glDeleteTextures(1, &ctx->y_tx_id);
 		ctx->y_tx_id = 0;
 	}
 	if (! *gl_tex_id && plane_idx && ctx->uv_tx_id ) {
 		cuGLUnregisterBufferObject(ctx->uv_pbo_id);
+		glDeleteBuffers(1, &ctx->uv_pbo_id);
 		ctx->uv_pbo_id = 0;
+		glDeleteTextures(1, &ctx->uv_tx_id);
 		ctx->uv_tx_id = 0;
 	}
 
@@ -1102,7 +1191,7 @@
 		gl_fmt = GL_LUMINANCE_ALPHA;
 	}
 
-	cuGLMapBufferObject(&tx_data, &tx_pitch, pbo_id);
+	res = cuGLMapBufferObject(&tx_data, &tx_pitch, pbo_id);
 	if (res != CUDA_SUCCESS) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to map GL texture data %s\n", cudaGetErrorEnum(res) ) );
 		return GF_IO_ERR;
@@ -1285,14 +1374,9 @@
 }
 
 
-GF_Err nvdec_send_hw_frame(NVDecCtx *ctx)
+GF_Err nvdec_send_hw_frame(NVDecCtx *ctx, NVDecFrame *f)
 {
 	GF_FilterPacket *dst_pck;
-	NVDecFrame *f;
-
-	if (!ctx->pending_frame) return GF_BAD_PARAM;
-	f = ctx->pending_frame;
-	ctx->pending_frame = NULL;
 
 	f->gframe.user_data = f;
 	f->gframe.get_plane = nvframe_get_frame;
@@ -1300,6 +1384,8 @@
 	f->gframe.get_gl_texture = nvframe_get_gl_texture;
 #endif
 
+	ctx->nb_out_frames_pending++;
+
 	if (ctx->frame_size_changed) {
 		ctx->frame_size_changed = GF_FALSE;
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width));
@@ -1313,7 +1399,8 @@
 		f->gframe.flags = GF_FRAME_IFCE_BLOCKING;
 
 	dst_pck = gf_filter_pck_new_frame_interface(ctx->opid, &f->gframe, nvframe_release);
-
+	if (!dst_pck) return GF_OUT_OF_MEM;
+	
 	nvdec_merge_pck_props(ctx, f, dst_pck);
 	if (gf_filter_pck_get_seek_flag(dst_pck)) {
 		gf_filter_pck_discard(dst_pck);
@@ -1457,12 +1544,12 @@
 	{ OFFS(vmode), "video decoder backend\n"
 		"- cuvid: use dedicated video engines directly\n"
 		"- cuda: use a CUDA-based decoder if faster than dedicated engines\n"
-		"- dxva: go through DXVA internally if possible (requires D3D9 interop)", GF_PROP_UINT, "cuvid", "cuvid|cuda|dxva", GF_FS_ARG_HINT_ADVANCED },
+		"- dxva: go through DXVA internally if possible (requires D3D9)", GF_PROP_UINT, "cuvid", "cuvid|cuda|dxva", GF_FS_ARG_HINT_ADVANCED },
 	{ OFFS(fmode), "frame output mode\n"
 		"- copy: each frame is copied and dispatched\n"
-		"- single: frame data is only retrieved when used, single memory space for all frames (not safe if multiple consummers)\n"
+		"- single: frame data is only retrieved when used, single memory space for all frames (not safe if multiple consumers)\n"
 		"- gl: frame data is mapped to an OpenGL texture"
-	, GF_PROP_UINT, "gl", "copy|single|gl|", 0 },
+	, GF_PROP_UINT, "gl", "copy|single|gl", 0 },
 
 	{ 0 }
 };
@@ -1470,7 +1557,7 @@
 GF_FilterRegister NVDecRegister = {
 	.name = "nvdec",
 	GF_FS_SET_DESCRIPTION("NVidia decoder")
-	GF_FS_SET_HELP("This filter decodes MPEG-2, MPEG-4 Part 2, AVC|H264 and HEVC streams through NVideia decoder. It allows GPU frame dispatch or direct frame copy.")
+	GF_FS_SET_HELP("This filter decodes MPEG-2, MPEG-4 Part 2, AVC|H264 and HEVC streams through NVidia decoder. It allows GPU frame dispatch or direct frame copy.")
 	.private_size = sizeof(NVDecCtx),
 	SETCAPS(NVDecCaps),
 	.flags = GF_FS_REG_CONFIGURE_MAIN_THREAD,
@@ -1485,6 +1572,11 @@
 
 const GF_FilterRegister *nvdec_register(GF_FilterSession *session)
 {
+	//check if nvdec is not globally blacklisted - if so, do not try to load CUDA SDK which may be time consuming on some devices
+	const char *blacklist = gf_opts_get_key("core", "blacklist");
+	if (blacklist && (blacklist[0]!='-') && strstr(blacklist, "nvdec"))
+		return NULL;
+
 	init_cuda_sdk();
 	//do not register if no SDK
 	if (cuvid_load_state != 2) {
@@ -1503,6 +1595,4 @@
 {
 	return NULL;
 }
-#endif // defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)
-
-
+#endif // (!defined(GPAC_STATIC_BUILD) && (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) && !defined(GPAC_DISABLE_NVDEC))

gpac-1.0.1.tar.gz/src/filters/dec_nvdec_sdk.c -> gpac-2.0.0.tar.gz/src/filters/dec_nvdec_sdk.c Changed

@@ -20,7 +20,7 @@
 #include <gpac/tools.h>
 
 
-#if (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN))
+#if ((defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) && !defined(GPAC_DISABLE_NVDEC))
 
 #include "dec_nvdec_sdk.h"
 
@@ -230,8 +230,8 @@
 {
 *pInstance = LoadLibrary(__CudaLibName);
 if (*pInstance == NULL) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[NVDec] LoadLibrary \"%s\" failed!\n", __CudaLibName));
- return CUDA_ERROR_UNKNOWN;
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] LoadLibrary \"%s\" failed!\n", __CudaLibName));
+ return CUDA_ERROR_SHARED_OBJECT_INIT_FAILED;
 }
 return CUDA_SUCCESS;
 }
@@ -240,7 +240,7 @@
 {
 *pInstance = LoadLibrary(__CuvidLibName);
 if (*pInstance == NULL) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[NVDec] LoadLibrary \"%s\" failed!\n", __CuvidLibName));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] LoadLibrary \"%s\" failed!\n", __CuvidLibName));
 return CUDA_ERROR_UNKNOWN;
 }
 return CUDA_SUCCESS;
@@ -249,14 +249,14 @@
 #define GET_PROC_EX(name, alias, required) \
 alias = (t##name *)GetProcAddress(curr_lib, #name); \
 if (alias == NULL && required) { \
- GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[NVDec] Failed to find required function \"%s\" \n", \
+ GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] Failed to find required function \"%s\" \n", \
 #name)); \
 }
 
 #define GET_PROC_EX_V2(name, alias, required) \
 alias = (t##name *)GetProcAddress(curr_lib, STRINGIFY(name##_v2));\
 if (alias == NULL && required) { \
- GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[NVDec] Failed to find required function \"%s\" \n", \
+ GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] Failed to find required function \"%s\" \n", \
 STRINGIFY(name##_v2))); \
 }
 
@@ -278,7 +278,7 @@
 {
 *pInstance = dlopen(__CudaLibName, RTLD_NOW);
 if (*pInstance == NULL) {
- GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[NVDec] dlopen \"%s\" failed!\n", __CudaLibName));
+ GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] dlopen \"%s\" failed!\n", __CudaLibName));
 return CUDA_ERROR_SHARED_OBJECT_INIT_FAILED;
 }
 return CUDA_SUCCESS;
@@ -288,7 +288,7 @@
 {
 *pInstance = dlopen(__CuvidLibName, RTLD_NOW);
 if (*pInstance == NULL) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[NVDec]dlopen \"%s\" failed!\n", __CuvidLibName));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec]dlopen \"%s\" failed!\n", __CuvidLibName));
 return CUDA_ERROR_UNKNOWN;
 }
 return CUDA_SUCCESS;
@@ -297,14 +297,14 @@
 #define GET_PROC_EX(name, alias, required) \
 alias = (t##name *)dlsym(curr_lib, #name); \
 if (alias == NULL && required) { \
- GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[NVDec] Failed to find required function \"%s\"\n", \
+ GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] Failed to find required function \"%s\"\n", \
 #name)); \
 }
 
 #define GET_PROC_EX_V2(name, alias, required) \
 alias = (t##name *)dlsym(curr_lib, STRINGIFY(name##_v2)); \
 if (alias == NULL && required) { \
- GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[NVDec]Failed to find required function \"%s\"\n", \
+ GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec]Failed to find required function \"%s\"\n", \
 STRINGIFY(name##_v2))); \
 }
 
@@ -580,7 +580,7 @@
 GET_PROC(cuLaunchKernel);
 }
 
-	/*load openGL*/
+	/*load OpenGL*/
 if (cudaVersion >= 2010)
 {
 GET_PROC(cuGLCtxCreate);
@@ -709,4 +709,4 @@
 	return "<unknown>";
 }
 
-#endif //WIN32
+#endif // ((defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) && !defined(GPAC_DISABLE_NVDEC))

gpac-1.0.1.tar.gz/src/filters/dec_odf.c -> gpac-2.0.0.tar.gz/src/filters/dec_odf.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2017
+ *			Copyright (c) Telecom ParisTech 2005-2022
 *					All rights reserved
 *
 * This file is part of GPAC / OD decoder filter
@@ -65,7 +65,8 @@
 		out_pid = gf_filter_pid_get_udta(pid);
 		if (out_pid==ctx->out_pid)
 			ctx->out_pid = NULL;
-		gf_filter_pid_remove(out_pid);
+		if (out_pid)
+			gf_filter_pid_remove(out_pid);
 		return GF_OK;
 	}
 
@@ -91,6 +92,20 @@
 	return GF_OK;
 }
 
+static void attach_desc_to_odm(GF_ObjectManager *odm, GF_ObjectDescriptor *od)
+{
+	if (odm->OD) {
+		gf_odf_desc_del((GF_Descriptor *)odm->OD);
+		odm->OD = NULL;
+	}
+	if (gf_list_count(od->OCIDescriptors)) {
+		char *url = od->URLString;
+		od->URLString = NULL;
+		gf_odf_desc_copy((GF_Descriptor *) od, (GF_Descriptor **) &odm->OD);
+		od->URLString = url;
+	}
+
+}
 void ODS_SetupOD(GF_Scene *scene, GF_ObjectDescriptor *od)
 {
 	u32 i, j, count, nb_scene, nb_od, nb_esd;
@@ -103,8 +118,26 @@
 		odm->parentscene = scene;
 		if (od->fake_remote)
 			odm->ignore_sys = GF_TRUE;
+
+		attach_desc_to_odm(odm, od);
+
 		gf_list_add(scene->resources, odm);
-		gf_odm_setup_remote_object(odm, scene->root_od->scene_ns, od->URLString);
+		if (odm->ID != GF_MEDIA_EXTERNAL_ID) {
+			count = gf_list_count(scene->scene_objects);
+			for (i=0; i<count; i++) {
+				GF_MediaObject *mo = gf_list_get(scene->scene_objects, i);
+				if (mo->OD_ID != odm->ID) continue;
+				if (mo->type == GF_MEDIA_OBJECT_SCENE) {
+					odm->subscene = gf_scene_new(scene->compositor, scene);
+					odm->subscene->is_dynamic_scene = GF_TRUE;
+					odm->subscene->root_od = odm;
+					odm->mo = mo;
+					mo->odm = odm;
+					break;
+				}
+			}
+		}
+		gf_odm_setup_remote_object(odm, scene->root_od->scene_ns, od->URLString, GF_FALSE);
 		return;
 	}
 
@@ -118,6 +151,7 @@
 	}
 
 	for (j=0; j<nb_esd; j++) {
+		Bool skip_od = GF_FALSE;
 		GF_FilterPid *pid = NULL;
 		esd = gf_list_get(od->ESDescriptors, j);
 
@@ -126,8 +160,14 @@
 			u32 k=0;
 			GF_ODMExtraPid *xpid;
 			odm = gf_list_get(scene->resources, i);
-			//can happen with interaction streams
+			//can happen with interaction and scene streams
 			if (!odm->pid) {
+				if (odm->mo && odm->mo->OD_ID == od->objectDescriptorID) {
+					odm->ServiceID = od->ServiceID;
+					attach_desc_to_odm(odm, od);
+					skip_od = GF_TRUE;
+					break;
+				}
 				odm = NULL;
 				continue;
 			}
@@ -145,6 +185,8 @@
 			if (pid) break;
 			odm = NULL;
 		}
+		if (skip_od)
+			continue;
 
 		//OCR streams and input sensors don't have PIDs associated for now (only local sensors supported)
 		if ((esd->decoderConfig->streamType == GF_STREAM_INTERACT)
@@ -163,6 +205,8 @@
 				odm->scene_ns->nb_odm_users++;
 				gf_list_add(scene->resources, odm);
 			}
+			attach_desc_to_odm(odm, od);
+
 			if (esd->decoderConfig->streamType == GF_STREAM_INTERACT) {
 				gf_scene_setup_object(scene, odm);
 				gf_input_sensor_setup_object(odm, esd);
@@ -179,7 +223,7 @@
 #endif
 			return;
 		} else if (!odm || !pid ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SCENE, ("Cannot match OD ID %d to any PID in the service, ignoring OD\n", od->objectDescriptorID));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("Cannot match OD ID %d to any PID in the service, ignoring OD\n", od->objectDescriptorID));
 			return;
 		}
 
@@ -191,7 +235,12 @@
 		}
 
 		odm->ID = od->objectDescriptorID;
+		if (odm->mo && (odm->mo->OD_ID != odm->ID)) {
+			odm->mo->OD_ID = odm->ID;
+
+		}
 		odm->ServiceID = od->ServiceID;
+		attach_desc_to_odm(odm, od);
 
 		/*setup PID for this object */
 		gf_odm_setup_object(odm, scene->root_od->scene_ns, pid);
@@ -228,7 +277,9 @@
 
 static GF_Err ODS_UpdateESD(GF_Scene *scene, GF_ESDUpdate *ESDs)
 {
-#if FILTER_FIXME
+	//no more support for ESD update in new arch (never used anyway)
+	//following is kept for the case we need to reintroduce it one day
+#if 0
 	GF_ObjectManager *odm;
 	u32 count, i;
 
@@ -430,6 +481,7 @@
 	if (!com->attach_scene.on_pid) return GF_TRUE;
 
 	count = gf_filter_get_ipid_count(filter);
+	//attach inline scenes
 	for (i=0; i<count; i++) {
 		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
 		GF_FilterPid *opid = gf_filter_pid_get_udta(ipid);
@@ -460,7 +512,8 @@
 GF_FilterRegister ODFDecRegister = {
 	.name = "odfdec",
 	GF_FS_SET_DESCRIPTION("MPEG-4 OD decoder")
-	GF_FS_SET_HELP("This filter decodes MPEG-4 OD frames directly into the scene manager of the compositor. It cannot be used to dump OD content.")
+	GF_FS_SET_HELP("This filter decodes MPEG-4 OD binary frames directly into the scene manager of the compositor.\n"
+	"Note: This filter cannot be used to dump OD content to text or xml, use `MP4Box` for that.")
 	.private_size = sizeof(GF_ODFDecCtx),
 	.flags = GF_FS_REG_MAIN_THREAD,
 	.priority = 1,

gpac-1.0.1.tar.gz/src/filters/dec_openhevc.c -> gpac-2.0.0.tar.gz/src/filters/dec_openhevc.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2017
+ *			Copyright (c) Telecom ParisTech 2010-2022
 *					All rights reserved
 *
 * This file is part of GPAC / OpenHEVC decoder filter
@@ -47,10 +47,12 @@
 	u32 id;
 	u32 dep_id;
 	u32 codec_id;
+	u32 timescale;
 	Bool sublayer;
 
 	u8 *inject_hdr;
 	u32 inject_hdr_size;
+	GF_Filter *src_filter;
 } GF_HEVCStream;
 
 
@@ -76,6 +78,7 @@
 	GF_Fraction sar;
 	GF_FilterPacket *packed_pck;
 	u8 *packed_data;
+	Bool monochrome;
 
 	u32 hevc_nalu_size_length;
 	Bool has_pic;
@@ -115,9 +118,14 @@
 
 	GF_List *src_packets;
 	Bool drop_non_refs;
+
+	Bool check_hybrid_clock, has_temi_time;
+	u32 temi_media_timescale;
+	u64 temi_media_timestamp, temi_media_pts;
+	u64 last_base_dts;
 } GF_OHEVCDecCtx;
 
-static GF_Err ohevcdec_configure_scalable_pid(GF_OHEVCDecCtx *ctx, GF_FilterPid *pid, u32 codecid)
+static GF_Err ohevcdec_configure_scalable_pid(GF_OHEVCDecCtx *ctx, GF_FilterPid *pid, u32 codecid, GF_HEVCStream *stream)
 {
 	GF_HEVCConfig *cfg = NULL;
 	u8 *data;
@@ -154,6 +162,21 @@
 	oh_select_active_layer(ctx->codec, ctx->nb_layers-1);
 	oh_select_view_layer(ctx->codec, ctx->nb_layers-1);
 
+	if (ctx->streams[0].src_filter != stream->src_filter) {
+		ctx->check_hybrid_clock = GF_TRUE;
+		if (gf_filter_pid_is_playing(ctx->streams[0].ipid)) {
+			GF_FilterEvent evt;
+
+			GF_FEVT_INIT(evt, GF_FEVT_BUFFER_REQ, pid);
+			evt.buffer_req.max_buffer_us = gf_filter_pid_get_max_buffer(ctx->streams[0].ipid);
+			gf_filter_pid_send_event(pid, &evt);
+
+			GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+			gf_filter_pid_send_event(pid, &evt);
+
+		}
+	}
+
 #ifdef OPENHEVC_HAS_AVC_BASE
 	//LHVC mode with base AVC layer: set extradata for LHVC
 	if (ctx->avc_base_id) {
@@ -164,9 +187,9 @@
 	{
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		for (i=0; i< gf_list_count(cfg->param_array); i++) {
-			GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(cfg->param_array, i);
+			GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *)gf_list_get(cfg->param_array, i);
 			for (j=0; j< gf_list_count(ar->nalus); j++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+				GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
 				gf_bs_write_int(bs, sl->size, 8*ctx->hevc_nalu_size_length);
 				gf_bs_write_data(bs, sl->data, sl->size);
 			}
@@ -192,7 +215,7 @@
 {
 	u32 i, count = list ? gf_list_count(list) : 0;
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(list, i);
+		GF_NALUFFParam *sl = gf_list_get(list, i);
 		gf_bs_write_int(bs, sl->size, 8*nalu_size_length);
 		gf_bs_write_data(bs, sl->data, sl->size);
 	}
@@ -240,15 +263,18 @@
 #endif
 }
 
-static u32 ohevcdec_get_pixel_format( u32 luma_bpp, u8 chroma_format_idc)
+static u32 ohevcdec_get_pixel_format(GF_OHEVCDecCtx *ctx)
 {
-	switch (chroma_format_idc) {
+	if (ctx->monochrome)
+		return GF_PIXEL_GREYSCALE;
+
+	switch (ctx->chroma_format_idc) {
 	case 1:
-		return (luma_bpp==10) ? GF_PIXEL_YUV_10 : GF_PIXEL_YUV;
+		return (ctx->luma_bpp==10) ? GF_PIXEL_YUV_10 : GF_PIXEL_YUV;
 	case 2:
-		return (luma_bpp==10) ? GF_PIXEL_YUV422_10 : GF_PIXEL_YUV422;
+		return (ctx->luma_bpp==10) ? GF_PIXEL_YUV422_10 : GF_PIXEL_YUV422;
 	case 3:
-		return (luma_bpp==10) ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;
+		return (ctx->luma_bpp==10) ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;
 	default:
 		return 0;
 	}
@@ -268,17 +294,20 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(2*ctx->width) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(2*ctx->height) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(2*ctx->stride) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_VIEWS, NULL);
 	} else {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width) );
-		if (ctx->force_stereo && ctx->is_multiview && ctx->cur_layer>1) {
+		if (ctx->force_stereo && ctx->is_multiview && (ctx->cur_layer==2)) {
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(2*ctx->height) );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_VIEWS, &PROP_UINT(2) );
 		} else {
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_VIEWS, NULL);
 		}
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->stride) );
 	}
-	pixfmt = ohevcdec_get_pixel_format(ctx->luma_bpp, ctx->chroma_format_idc);
+	pixfmt = ohevcdec_get_pixel_format(ctx);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(pixfmt) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->sar) );
 }
@@ -297,11 +326,15 @@
 	if (is_remove) {
 		if (ctx->streams[0].ipid == pid) {
 			memset(ctx->streams, 0, HEVC_MAX_STREAMS*sizeof(GF_HEVCStream));
-			if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-			ctx->opid = NULL;
+			if (ctx->opid) {
+				gf_filter_pid_remove(ctx->opid);
+				ctx->opid = NULL;
+			}
 			ctx->nb_streams = 0;
-			if (ctx->codec) oh_close(ctx->codec);
-			ctx->codec = NULL;
+			if (ctx->codec) {
+				oh_close(ctx->codec);
+				ctx->codec = NULL;
+			}
 			return GF_OK;
 		} else {
 			for (i=0; i<ctx->nb_streams; i++) {
@@ -368,13 +401,13 @@
 		for (i=0; i<ctx->nb_streams; i++) {
 
 			if (!dep_id && !ctx->streams[i].dep_id) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[SVC Decoder] Detected multiple independent base (%s and %s)\n", gf_filter_pid_get_name(pid), gf_filter_pid_get_name(ctx->streams[i].ipid)));
+				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[HEVC Decoder] Detected multiple independent base (%s and %s)\n", gf_filter_pid_get_name(pid), gf_filter_pid_get_name(ctx->streams[i].ipid)));
 				return GF_REQUIRES_NEW_INSTANCE;
 			}
 
 			if (ctx->streams[i].id == dep_id) {
-				if (ctx->nb_streams > i+2)
-					memmove(&ctx->streams[i+1], &ctx->streams[i+2], sizeof(GF_HEVCStream) * (ctx->nb_streams-i-1));
+				if (ctx->nb_streams > i+1)
+					memmove(&ctx->streams[i+2], &ctx->streams[i+1], sizeof(GF_HEVCStream) * (ctx->nb_streams-i-1));
 
 				ctx->streams[i+1].ipid = pid;
 				ctx->streams[i+1].cfg_crc = cfg_crc;
@@ -416,6 +449,10 @@
 	}
 	ctx->nb_layers = ctx->cur_layer = 1;
 
+	stream->src_filter = gf_filter_pid_get_source_filter(pid);
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	stream->timescale = p ? p->value.uint : 1000;
+
 	//temporal sublayer stream setup, do nothing
 	if (stream->sublayer)
 		return GF_OK;
@@ -423,7 +460,7 @@
 	//scalable stream setup
 	if (stream->dep_id) {
 		GF_Err e;
-		e = ohevcdec_configure_scalable_pid(ctx, pid, codecid);
+		e = ohevcdec_configure_scalable_pid(ctx, pid, codecid, stream);
 		ohevcdec_set_codec_name(filter);
 		return e;
 	}
@@ -448,8 +485,8 @@
 			ctx->avc_nalu_size_length = avcc->nal_unit_size;
 
 			for (i=0; i< gf_list_count(avcc->sequenceParameterSets); i++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(avcc->sequenceParameterSets, i);
-				s32 idx = gf_media_avc_read_sps(sl->data, sl->size, &avc, 0, NULL);
+				GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(avcc->sequenceParameterSets, i);
+				s32 idx = gf_avc_read_sps(sl->data, sl->size, &avc, 0, NULL);
 				ctx->width = MAX(avc.sps[idx].width, ctx->width);
 				ctx->height = MAX(avc.sps[idx].height, ctx->height);
 				ctx->luma_bpp = avcc->luma_bit_depth;
@@ -490,22 +527,22 @@
 			}
 
 			for (i=0; i< gf_list_count(hvcc->param_array); i++) {
-				GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(hvcc->param_array, i);
+				GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *)gf_list_get(hvcc->param_array, i);
 
 				if (hvcc_enh) {
 					for (j=0; j< gf_list_count(hvcc_enh->param_array); j++) {
-						GF_HEVCParamArray *ar_enh = (GF_HEVCParamArray *)gf_list_get(hvcc_enh->param_array, j);
+						GF_NALUFFParamArray *ar_enh = (GF_NALUFFParamArray *)gf_list_get(hvcc_enh->param_array, j);
 						if (ar->type==ar_enh->type)
 							gf_list_transfer(ar->nalus, ar_enh->nalus);
 					}
 				}
 				for (j=0; j< gf_list_count(ar->nalus); j++) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+					GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
 					s32 idx;
 					u16 hdr = sl->data[0] << 8 | sl->data[1];
 
 					if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
-						idx = gf_media_hevc_read_sps(sl->data, sl->size, &hevc);
+						idx = gf_hevc_read_sps(sl->data, sl->size, &hevc);
 						ctx->width = MAX(hevc.sps[idx].width, ctx->width);
 						ctx->height = MAX(hevc.sps[idx].height, ctx->height);
 						ctx->luma_bpp = MAX(hevc.sps[idx].bit_depth_luma, ctx->luma_bpp);
@@ -518,7 +555,7 @@
 						SPSs = ar->nalus;
 					}
 					else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
-						s32 vps_id = gf_media_hevc_read_vps(sl->data, sl->size, &hevc);
+						s32 vps_id = gf_hevc_read_vps(sl->data, sl->size, &hevc);
 						//multiview
 						if ((vps_id>=0) && (hevc.vps[vps_id].scalability_mask[1])) {
 							ctx->is_multiview = GF_TRUE;
@@ -526,7 +563,7 @@
 						VPSs = ar->nalus;
 					}
 					else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
-						gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
+						gf_hevc_read_pps(sl->data, sl->size, &hevc);
 						PPSs = ar->nalus;
 					}
 				}
@@ -575,24 +612,31 @@
 #endif
 
 	if (dsi) {
+		u32 active_layer = 0;
 		if (has_scalable) {
 			ctx->cur_layer = ctx->nb_layers;
 			oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
 			oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
+			active_layer = ctx->cur_layer-1;
 		} else {
 			//there is a bug with select active layer on win32 with avc base
 #ifdef WIN32
 			if (!ctx->avc_base_id) {
 #endif
 				oh_select_active_layer(ctx->codec, 1);
+				active_layer = 1;
 				if (!ctx->avc_base_id)
 					oh_select_view_layer(ctx->codec, 0);
 #ifdef WIN32
 			}
 #endif
-			}
+		}
 
 		if (!ctx->decoder_started) {
+			//hack: openhevc does not not infer nalu_size_length on all layers, we therefore
+			//activate max layer which will copy extradata on each layer's decoder
+			oh_select_active_layer(ctx->codec, HEVC_MAX_STREAMS-1);
+
 #ifdef OPENHEVC_HAS_AVC_BASE
 			if (ctx->avc_base_id) {
 				oh_extradata_cpy_lhvc(ctx->codec, (u8 *) dsi->value.data.ptr, NULL, dsi->value.data.size, 0);
@@ -605,6 +649,7 @@
 					oh_extradata_cpy(ctx->codec, (u8 *) dsi->value.data.ptr, dsi->value.data.size);
 				}
 			}
+			oh_select_active_layer(ctx->codec, active_layer);
 		}
 	} else {
 		//decode and display layer 0 by default - will be changed when attaching enhancement layers
@@ -736,6 +781,7 @@
 	oh_output_update(ctx->codec, 1, &ctx->frame_ptr);
 
 	dst_pck = gf_filter_pck_new_frame_interface(ctx->opid, &ctx->frame_ifce, ohevcframe_release);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	src_pck = NULL;
 	count = gf_list_count(ctx->src_packets);
@@ -769,7 +815,9 @@
 	u8 *data;
 	u32 a_w, a_h, a_stride, bit_depth, i, count;
 	u64 cts;
+	Bool monochrome=GF_FALSE;
 	OHFrame_cpy openHevcFrame_FL, openHevcFrame_SL;
+	OHFrame openHFrame;
 	int chromat_format;
 
 	if (ctx->no_copy && !ctx->pack_hfr) {
@@ -778,6 +826,10 @@
 		oh_cropped_frameinfo(ctx->codec, &openHevcFrame_FL.frame_par);
 		if (ctx->nb_layers == 2) oh_cropped_frameinfo_from_layer(ctx->codec, &openHevcFrame_SL.frame_par, 1);
 	}
+	if (oh_output_update(ctx->codec, 1, &openHFrame)) {
+		if (!openHFrame.data_cb_p && !openHFrame.data_cr_p)
+			monochrome = GF_TRUE;
+	}
 
 	a_w = openHevcFrame_FL.frame_par.width;
 	a_h = openHevcFrame_FL.frame_par.height;
@@ -787,7 +839,7 @@
 	cts = (u32) openHevcFrame_FL.frame_par.pts;
 	if (!openHevcFrame_FL.frame_par.sample_aspect_ratio.den || !openHevcFrame_FL.frame_par.sample_aspect_ratio.num)
 		openHevcFrame_FL.frame_par.sample_aspect_ratio.den = openHevcFrame_FL.frame_par.sample_aspect_ratio.num = 1;
-		
+
 	src_pck = NULL;
 	count = gf_list_count(ctx->src_packets);
 	for (i=0;i<count; i++) {
@@ -805,21 +857,26 @@
 	if (ctx->force_stereo_reset || !ctx->out_size || (ctx->width != a_w) || (ctx->height!=a_h) || (ctx->stride != a_stride)
 		|| (ctx->luma_bpp!= bit_depth) || (ctx->chroma_bpp != bit_depth) || (ctx->chroma_format_idc != (chromat_format + 1))
 		|| (ctx->sar.num*openHevcFrame_FL.frame_par.sample_aspect_ratio.den != ctx->sar.den*openHevcFrame_FL.frame_par.sample_aspect_ratio.num)
+		|| (ctx->monochrome != monochrome)
 	 ) {
 		ctx->width = a_w;
 		ctx->stride = a_stride;
 		ctx->height = a_h;
-		if( chromat_format == OH_YUV420 ) {
+		ctx->monochrome = monochrome;
+
+		if (monochrome) {
+			ctx->out_size = ctx->stride * ctx->height;
+		} else if (chromat_format == OH_YUV420 ) {
 			ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-		} else if ( chromat_format == OH_YUV422 ) {
+		} else if (chromat_format == OH_YUV422 ) {
 			ctx->out_size = ctx->stride * ctx->height * 2;
-		} else if ( chromat_format == OH_YUV444 ) {
+		} else if (chromat_format == OH_YUV444 ) {
 			ctx->out_size = ctx->stride * ctx->height * 3;
 		} 
 		//force top/bottom output of left and right frame, double height
 		if (ctx->pack_hfr) {
 			ctx->out_size *= 4;
-		} else if ((ctx->cur_layer==2) && (ctx->is_multiview || ctx->force_stereo) ){
+		} else if ((ctx->cur_layer==2) && ctx->is_multiview && ctx->force_stereo) {
 			ctx->out_size *= 2;
 		}
 
@@ -832,14 +889,13 @@
 		ohevc_set_out_props(ctx);
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVC Decoder] Sending ouput frame CTS "LLU"\n", openHevcFrame_FL.frame_par.pts ));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVC Decoder] Sending output frame CTS "LLU"\n", openHevcFrame_FL.frame_par.pts ));
 
 	if (ctx->no_copy && !ctx->pack_hfr) {
 		return ohevcdec_send_output_frame(ctx);
 	}
 
 	if (ctx->pack_hfr) {
-		OHFrame openHFrame;
 		u8 *pY, *pU, *pV;
 		u32 idx_w, idx_h;
 
@@ -848,6 +904,7 @@
 
 		if (!ctx->packed_pck) {
 			ctx->packed_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &ctx->packed_data);
+			if (!ctx->packed_pck) return GF_OUT_OF_MEM;
 			if (src_pck) gf_filter_pck_merge_properties(src_pck, ctx->packed_pck);
 			else gf_filter_pck_set_cts(ctx->packed_pck, cts);
 		}
@@ -871,7 +928,7 @@
 		}
 
 		if (oh_output_update(ctx->codec, 1, &openHFrame)) {
-			u32 i, s_stride, hs_stride, qs_stride, d_stride, dd_stride, hd_stride;
+			u32 s_stride, hs_stride, qs_stride, d_stride, dd_stride, hd_stride;
 
 			s_stride = openHFrame.frame_par.linesize_y;
 			qs_stride = s_stride / 4;
@@ -929,10 +986,11 @@
 	}
 
 	pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &data);
-
+	if (!pck) return GF_OUT_OF_MEM;
+	
 	openHevcFrame_FL.data_y = (void*) data;
 
-	if (ctx->nb_layers==2 && ctx->is_multiview && !ctx->no_copy){
+	if ((ctx->cur_layer==2) && ctx->is_multiview && ctx->force_stereo && !ctx->no_copy){
 		int out1, out2;
 		if( chromat_format == OH_YUV420){
 			openHevcFrame_SL.data_y = (void*) (data + ctx->stride * ctx->height);
@@ -952,16 +1010,30 @@
 			gf_filter_pck_discard(pck);
 		}
 	} else {
-		openHevcFrame_FL.data_cb = (void*) (data + ctx->stride * ctx->height);
-		if( chromat_format == OH_YUV420) {
-			openHevcFrame_FL.data_cr = (void*) (data + 5*ctx->stride * ctx->height/4);
-		} else if (chromat_format == OH_YUV422) {
-			openHevcFrame_FL.data_cr = (void*) (data + 3*ctx->stride * ctx->height/2);
-		} else if ( chromat_format == OH_YUV444) {
-			openHevcFrame_FL.data_cr = (void*) (data + 2*ctx->stride * ctx->height);
+		int res;
+		openHevcFrame_FL.data_cb = openHevcFrame_FL.data_cr = NULL;
+		if (!ctx->monochrome) {
+			openHevcFrame_FL.data_cb = (void*) (data + ctx->stride * ctx->height);
+			if (chromat_format == OH_YUV420) {
+				openHevcFrame_FL.data_cr = (void*) (data + 5*ctx->stride * ctx->height/4);
+			} else if (chromat_format == OH_YUV422) {
+				openHevcFrame_FL.data_cr = (void*) (data + 3*ctx->stride * ctx->height/2);
+			} else if ( chromat_format == OH_YUV444) {
+				openHevcFrame_FL.data_cr = (void*) (data + 2*ctx->stride * ctx->height);
+			}
+		} else {
+			openHevcFrame_FL.frame_par.linesize_cb = openHevcFrame_FL.frame_par.linesize_cr = 0;
+		}
+		if (ctx->monochrome) {
+			res = oh_output_update(ctx->codec, 1, &openHFrame);
+			if (src_pck) {
+				memcpy(data, openHFrame.data_y_p, ctx->out_size);
+			}
+		} else {
+			res = oh_output_cropped_cpy(ctx->codec, &openHevcFrame_FL);
 		}
 
-		if (oh_output_cropped_cpy(ctx->codec, &openHevcFrame_FL)) {
+		if (res) {
 			if (src_pck) {
 				u8 car_v = gf_filter_pck_get_carousel_version(src_pck);
 				gf_filter_pck_set_carousel_version(src_pck, 0);
@@ -982,6 +1054,27 @@
 	return GF_OK;
 }
 
+static u64 translate_ts_temi(GF_OHEVCDecCtx *ctx, GF_HEVCStream *stream, s64 ts)
+{
+	if (stream->timescale != ctx->temi_media_timescale) {
+		ts = gf_timestamp_rescale_signed(ts, stream->timescale, ctx->temi_media_timescale);
+	}
+	ts -= ctx->temi_media_timestamp;
+
+	//translate to output timescale
+	if (ctx->temi_media_timescale != ctx->streams[0].timescale) {
+		ts = gf_timestamp_rescale_signed(ts, ctx->temi_media_timescale, ctx->streams[0].timescale);
+	}
+	if (ctx->streams[0].timescale != 90000) {
+		u64 diff = gf_timestamp_rescale_signed(ctx->temi_media_pts, 90000, ctx->streams[0].timescale);
+ 		ts += diff;
+	} else {
+		ts += ctx->temi_media_pts;
+	}
+	if (ts<0) return 0;
+	return ts;
+}
+
 static GF_Err ohevcdec_process(GF_Filter *filter)
 {
 	s32 got_pic;
@@ -1027,6 +1120,28 @@
 	}
 	if (!ctx->codec) return GF_SERVICE_ERROR;
 
+	if (ctx->check_hybrid_clock) {
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->streams[0].ipid);
+		idx=0;
+		while (pck) {
+			GF_BitStream *bs;
+			u32 p4cc;
+			const char *pname;
+			const GF_PropertyValue *p = gf_filter_pck_enum_properties(pck, &idx, &p4cc, &pname);
+			if (!p) break;
+			if (!pname) continue;
+			if (p->type != GF_PROP_DATA) continue;
+			if (strncmp(pname, "temi_t:", 7)) continue;
+
+			bs = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
+			ctx->temi_media_timescale = gf_bs_read_u32(bs);
+			ctx->temi_media_timestamp = gf_bs_read_u64(bs);
+			ctx->temi_media_pts = gf_bs_read_u64(bs);
+			ctx->has_temi_time = GF_TRUE;
+			gf_bs_del(bs);
+		}
+	}
+
 	//probe all streams
 	for (idx=0; idx<ctx->nb_streams; idx++) {
 		u64 dts, cts;
@@ -1052,6 +1167,18 @@
 		dts = gf_filter_pck_get_dts(pck);
 		cts = gf_filter_pck_get_cts(pck);
 
+		//adjust timing
+		if (idx && ctx->check_hybrid_clock && (ctx->streams[0].src_filter!=ctx->streams[idx].src_filter) && ctx->has_temi_time ) {
+			dts = translate_ts_temi(ctx, &ctx->streams[idx], (s64) dts);
+			cts = translate_ts_temi(ctx, &ctx->streams[idx], (s64) cts);
+
+			if (ctx->last_base_dts > dts) {
+				gf_filter_pid_drop_packet(ctx->streams[idx].ipid);
+				idx--;
+				continue;
+			}
+		}
+
 		data = (char *) gf_filter_pck_get_data(pck, &data_size);
 		//TODO: this is a clock signaling, for now just trash ..
 		if (!data) {
@@ -1086,7 +1213,7 @@
 
 			if (got_pic) {
 				ohevcdec_flush_picture(ctx);
-				//we are in direct output mode, wait for frame to be consummed before flushing next frame
+				//we are in direct output mode, wait for frame to be consumed before flushing next frame
 				if (ctx->frame_out) return GF_OK;
 			}
 			else
@@ -1122,8 +1249,17 @@
 
 		dts = gf_filter_pck_get_dts(pck);
 		cts = gf_filter_pck_get_cts(pck);
+
+		//adjust timing
+		if (idx && ctx->check_hybrid_clock && (ctx->streams[0].src_filter!=ctx->streams[idx].src_filter) && ctx->has_temi_time ) {
+			dts = translate_ts_temi(ctx, &ctx->streams[idx], (s64) dts);
+			cts = translate_ts_temi(ctx, &ctx->streams[idx], (s64) cts);
+		}
+
 		if (dts==GF_FILTER_NO_TS) dts = cts;
 
+		if (!idx) ctx->last_base_dts = dts;
+
 		if (min_dts != GF_FILTER_NO_TS) {
 			if (min_dts != dts) continue;
 		} else if (min_cts != cts) {
@@ -1204,6 +1340,8 @@
 		}
 	}
 	ctx->src_packets = gf_list_new();
+	ctx->sar.num = 1;
+	ctx->sar.den = 1;
 	return GF_OK;
 }
 
@@ -1248,11 +1386,11 @@
 	"- frameslice: parallel decoding of both frames and slices\n"
 	"- frame: parallel decoding of frames\n"
 	"- slice: parallel decoding of slices", GF_PROP_UINT, "frame", "frameslice|frame|slice", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(nb_threads), "set number of threads. If 0, uses number of cores minus one", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(nb_threads), "set number of threads (if 0, uses number of cores minus one)", GF_PROP_UINT, "0", NULL, 0},
 	{ OFFS(no_copy), "directly dispatch internal decoded frame without copy", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(pack_hfr), "pack 4 consecutive frames in a single output", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(seek_reset), "reset decoder when seeking", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(force_stereo), "force stereo output for multiview (top-bottom only)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(force_stereo), "use stereo output for multiview (top-bottom only)", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(reset_switch), "reset decoder at config change", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
@@ -1276,6 +1414,7 @@
 
 #endif // defined(GPAC_HAS_OPENHEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
 
+#ifdef GPAC_HAS_OPENHEVC
 
 #ifndef GPAC_OPENHEVC_STATIC
 
@@ -1292,3 +1431,5 @@
 	return NULL;
 #endif
 }
+
+#endif

gpac-1.0.1.tar.gz/src/filters/dec_opensvc.c -> gpac-2.0.0.tar.gz/src/filters/dec_opensvc.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2017
+ *			Copyright (c) Telecom ParisTech 2010-2022
 *					All rights reserved
 *
 * This file is part of GPAC / OpenSVC Decoder filter
@@ -74,7 +74,7 @@
 static GF_Err osvcdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	Bool found=GF_TRUE;
-	const GF_PropertyValue *p;
+	const GF_PropertyValue *p, *dsi_enh;
 	u32 i, count, dep_id=0, id=0, cfg_crc=0;
 	s32 res;
 	OPENSVCFRAME Picture;
@@ -83,8 +83,10 @@
 	if (is_remove) {
 		if (ctx->streams[0].ipid == pid) {
 			memset(ctx->streams, 0, SVC_MAX_STREAMS*sizeof(GF_SVCStream));
-			if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-			ctx->opid = NULL;
+			if (ctx->opid) {
+				gf_filter_pid_remove(ctx->opid);
+				ctx->opid = NULL;
+			}
 			ctx->nb_streams = ctx->active_streams = 0;
 			if (ctx->codec) SVCDecoder_close(ctx->codec);
 			ctx->codec = NULL;
@@ -120,6 +122,7 @@
 			if ((ctx->streams[i].ipid == pid) && (ctx->streams[i].cfg_crc == cfg_crc)) return GF_OK;
 		}
 	}
+	dsi_enh = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
 
 	found = GF_FALSE;
 	for (i=0; i<ctx->active_streams; i++) {
@@ -187,6 +190,7 @@
 			if (SVCDecoder_init(&ctx->codec) == SVC_STATUS_ERROR) return GF_IO_ERR;
 		}
 
+retry:
 		/*decode all NALUs*/
 		count = gf_list_count(cfg->sequenceParameterSets);
 		SetCommandLayer(ctx->layers, 255, 0, &res, 0);//bufindex can be reset without pb
@@ -196,7 +200,7 @@
 			u32 sid;
 			s32 par_n=0, par_d=0;
 #endif
-			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, i);
+			GF_NALUFFParam *slc = (GF_NALUFFParam*)gf_list_get(cfg->sequenceParameterSets, i);
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 			gf_avc_get_sps_info(slc->data, slc->size, &sid, &w, &h, &par_n, &par_d);
@@ -223,7 +227,7 @@
 
 		count = gf_list_count(cfg->pictureParameterSets);
 		for (i=0; i<count; i++) {
-			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->pictureParameterSets, i);
+			GF_NALUFFParam *slc = (GF_NALUFFParam*)gf_list_get(cfg->pictureParameterSets, i);
 #ifndef GPAC_DISABLE_AV_PARSERS
 			u32 sps_id, pps_id;
 			gf_avc_get_pps_info(slc->data, slc->size, &pps_id, &sps_id);
@@ -238,6 +242,12 @@
 
 		}
 		gf_odf_avc_cfg_del(cfg);
+
+		if (dsi_enh) {
+			cfg = gf_odf_avc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size);
+			dsi_enh = NULL;
+			if (cfg) goto retry;
+		}
 	} else {
 		if (ctx->nalu_size_length) {
 			return GF_NOT_SUPPORTED;
@@ -374,7 +384,8 @@
 	if (!src_pck)
 		gf_list_add(ctx->src_packets, pck_ref);
 
-	pic.Width = pic.Height = 0;
+	memset(&pic, 0, sizeof(OPENSVCFRAME));
+
 	for (idx=0; idx<ctx->nb_streams; idx++) {
 		u64 dts, cts;
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -503,7 +514,7 @@
 
 		if (got_pic) has_pic = GF_TRUE;
 	}
-	if (!has_pic) return GF_OK;
+	if (!has_pic || !pic.Width || !pic.Height) return GF_OK;
 
 	if ((pic.Width != ctx->width) || (pic.Height!=ctx->height)) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[SVC Decoder] Resizing from %dx%d to %dx%d\n", ctx->width, ctx->height, pic.Width, pic.Height ));
@@ -529,6 +540,8 @@
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &data);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+
 	memcpy(data, pic.pY[0], ctx->stride*ctx->height);
 	memcpy(data + ctx->stride * ctx->height, pic.pU[0], ctx->stride*ctx->height/4);
 	memcpy(data + 5*ctx->stride * ctx->height/4, pic.pV[0], ctx->stride*ctx->height/4);
@@ -536,7 +549,9 @@
 	if (src_pck) {
 		gf_filter_pck_merge_properties(src_pck, dst_pck);
 		gf_filter_pck_unref(src_pck);
+		gf_filter_pck_set_dependency_flags(dst_pck, 0);
 	}
+	gf_filter_pck_set_dts(dst_pck, gf_filter_pck_get_cts(dst_pck));
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[OpenSVC] decoded out frame PTS "LLU"\n", gf_filter_pck_get_cts(dst_pck) ));
 	gf_filter_pck_send(dst_pck);

gpac-1.0.1.tar.gz/src/filters/dec_theora.c -> gpac-2.0.0.tar.gz/src/filters/dec_theora.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / XIPH Theora decoder filter
@@ -62,8 +62,10 @@
 
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 		return GF_OK;
 	}
@@ -215,6 +217,7 @@
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->ti.width*ctx->ti.height * 3 / 2, &buffer);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	pYO = yuv.y;
 	pUO = yuv.u;
@@ -242,8 +245,10 @@
 		gf_filter_pck_merge_properties(src_pck, dst_pck);
 		is_seek = gf_filter_pck_get_seek_flag(src_pck);
 		ctx->next_cts = gf_filter_pck_get_cts(src_pck);
+		gf_filter_pck_set_dts(dst_pck, ctx->next_cts);
 		ctx->next_cts += gf_filter_pck_get_duration(src_pck);
 		gf_filter_pck_unref(src_pck);
+		gf_filter_pck_set_dependency_flags(dst_pck, 0);
 	} else {
 		is_seek = 0;
 		gf_filter_pck_set_cts(dst_pck, ctx->next_cts);

gpac-1.0.1.tar.gz/src/filters/dec_ttml.c -> gpac-2.0.0.tar.gz/src/filters/dec_ttml.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2020
+ *			Copyright (c) Telecom ParisTech 2020-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / TTML decoder filter
@@ -151,8 +151,11 @@
 	GF_TTMLDec *ctx = (GF_TTMLDec *)gf_filter_get_udta(filter);
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = ctx->ipid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		ctx->ipid = NULL;
 		return GF_OK;
 	}
 	//TODO: we need to cleanup cap checking upon reconfigure
@@ -341,7 +344,7 @@
 		if (e) return e;
 	}
 
-	if (cts * 1000 > obj_time * timescale) {
+	if (gf_timestamp_greater(cts, timescale, obj_time, 1000)) {
 		gf_sc_sys_frame_pending(ctx->scene->compositor, ((Double) cts / timescale), obj_time, filter);
 		return GF_OK;
 	}
@@ -363,16 +366,23 @@
 				first = GF_FALSE;
 				if (subs_size>pck_size) {
 					gf_filter_pid_drop_packet(ctx->ipid);
-					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[TTMLDec] Invalid subsample size %d for packet size %d\n", subs_size, pck_size));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[TTMLDec] Invalid subsample size %d for packet size %d\n", subs_size, pck_size));
 					return GF_NON_COMPLIANT_BITSTREAM;
 				}
-				pck_alloc = gf_malloc(sizeof(char)*subs_size+2);
+				pck_alloc = gf_malloc(sizeof(char)*(subs_size+2));
 				memcpy(pck_alloc, pck_data, sizeof(char)*subs_size);
 				pck_alloc[subs_size] = 0;
 				pck_alloc[subs_size+1] = 0;
 				ttml_doc = pck_alloc;
 			}
 		}
+	} else {
+		//we cannot assume the doc ends with 0
+		pck_alloc = gf_malloc(sizeof(char)*(pck_size+2));
+		memcpy(pck_alloc, ttml_doc, sizeof(char)*pck_size);
+		pck_alloc[pck_size] = 0;
+		pck_alloc[pck_size+1] = 0;
+		ttml_doc = pck_alloc;
 	}
 
 	GF_DOMParser *dom = gf_xml_dom_new();
@@ -479,9 +489,9 @@
 static const GF_FilterArgs TTMLDecArgs[] =
 {
 	{ OFFS(script), "location of TTML SVG JS renderer", GF_PROP_STRING, "$GSHARE/scripts/ttml-renderer.js", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(font), "font to use", GF_PROP_STRING, "SANS", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
-	{ OFFS(fontSize), "font size to use", GF_PROP_FLOAT, "20", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
-	{ OFFS(color), "color to use", GF_PROP_STRING, "white", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(font), "font", GF_PROP_STRING, "SANS", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(fontSize), "font size", GF_PROP_FLOAT, "20", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(color), "text color", GF_PROP_STRING, "white", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
 	{ OFFS(valign), "vertical alignment\n"
 	"- bottom: align text at bottom of text area\n"
 	"- center: align text at center of text area\n"

gpac-1.0.1.tar.gz/src/filters/dec_ttxt.c -> gpac-2.0.0.tar.gz/src/filters/dec_ttxt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / 3GPP/MPEG4 text renderer filter
@@ -212,8 +212,11 @@
 	const GF_PropertyValue *p, *dsi;
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = ctx->ipid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		ctx->ipid = NULL;
 		return GF_OK;
 	}
 	//TODO: we need to cleanup cap checking upon reconfigure
@@ -252,6 +255,9 @@
 			ctx->cfg = NULL;
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
+		if (!sd->default_style.text_color)
+			sd->default_style.text_color = 0xFFFFFFFF;
+
 		gf_list_add(ctx->cfg->sample_descriptions, sd);
 		ctx->is_tx3g = GF_TRUE;
 	}
@@ -511,6 +517,16 @@
 		fontSize = tsd->default_style.font_size;
 		styleFlags = tsd->default_style.style_flags;
 		color = tsd->default_style.text_color;
+		if (!color && !tsd->back_color)
+			color = 0xFFFFFFFF;
+		if (!fontSize) {
+			if (ctx->cfg->text_height > 2000)
+				fontSize = 80;
+			else if (ctx->cfg->text_height > 700)
+				fontSize = 40;
+			else
+				fontSize = 20;
+		}
 	} else {
 		fontName = ttd_find_font(tsd, tc->srec->fontID);
 		fontSize = tc->srec->font_size;
@@ -563,6 +579,7 @@
 	if (!strlen(szStyle)) strcpy(szStyle, "PLAIN");
 	/*also underline for URLs*/
 	if ((styleFlags & GF_TXT_STYLE_UNDERLINED) || (tc->hlink && tc->hlink->URL)) strcat(szStyle, " UNDERLINED");
+	if (styleFlags & GF_TXT_STYLE_STRIKETHROUGH) strcat(szStyle, " STRIKETHROUGH");
 
 	if (tc->is_hilight) {
 		if (tc->hilight_col) {
@@ -639,7 +656,8 @@
 				memcpy(wsChunk, &utf16_txt[start_char], sizeof(s16)*(i-start_char));
 				wsChunk[i-start_char] = 0;
 				sp = &wsChunk[0];
-				len = (u32) gf_utf8_wcstombs(szLine, 5000, (const unsigned short **) &sp);
+				len = gf_utf8_wcstombs(szLine, 5000, (const unsigned short **) &sp);
+				if (len == GF_UTF8_FAIL) len = 0;
 				szLine[len] = 0;
 
 				gf_sg_vrml_mf_append(&text->string, GF_SG_VRML_MFSTRING, (void **) &st);
@@ -901,7 +919,8 @@
 		char_count = txt->len / 2;
 	} else {
 		char *p = txt->text;
-		char_count = (u32) gf_utf8_mbstowcs(utf16_text, 2500, (const char **) &p);
+		char_count = gf_utf8_mbstowcs(utf16_text, 2500, (const char **) &p);
+		if (char_count == GF_UTF8_FAIL) char_count = 0;
 	}
 
 	chunks = gf_list_new();
@@ -1230,7 +1249,7 @@
 
 	//we still process any frame before our clock time even when buffering
 	obj_time = gf_clock_time(ctx->odm->ck);
-	if (cts * 1000 > obj_time * timescale) {
+	if (gf_timestamp_greater(cts, timescale, obj_time, 1000)) {
 		Double ts_offset = (Double) cts;
 		ts_offset /= timescale;

gpac-1.0.1.tar.gz/src/filters/dec_vorbis.c -> gpac-2.0.0.tar.gz/src/filters/dec_vorbis.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / XIPH Vorbis decoder filter
@@ -62,8 +62,10 @@
 
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 		return GF_OK;
 	}
@@ -227,7 +229,10 @@
 
 	}
 	size = (ctx->vd.pcm_current - ctx->vd.pcm_returned) * 2 * ctx->vi.channels;
-	if (size) dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &buffer);
+	if (size) {
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &buffer);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+	}
 
 	if (pck && dst_pck) gf_filter_pck_merge_properties(pck, dst_pck);
 
@@ -254,8 +259,7 @@
 	gf_filter_pck_set_cts(dst_pck, ctx->last_cts);
 
 	if (ctx->timescale != ctx->sample_rate) {
-		u64 dur = total_samples * ctx->timescale;
-		dur /= ctx->sample_rate;
+		u64 dur = gf_timestamp_rescale(total_samples, ctx->sample_rate, ctx->timescale);
 		gf_filter_pck_set_duration(dst_pck, (u32) dur);
 		ctx->last_cts += dur;
 	} else {

gpac-1.0.1.tar.gz/src/filters/dec_vtb.c -> gpac-2.0.0.tar.gz/src/filters/dec_vtb.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / VideoToolBox decoder filter
@@ -28,7 +28,7 @@
 
 #include <gpac/thread.h>
 
-#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) )
+#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) ) && defined(GPAC_HAS_VTB)
 
 #include <stdint.h>
 
@@ -149,7 +149,7 @@
 
 	Bool profile_supported, can_reconfig;
 	u32 nb_consecutive_errors;
-	//openGL output
+	//OpenGL output
 #ifdef VTB_GL_TEXTURE
 	Bool use_gl_textures;
 	GF_CVGLTextureCacheREF cache_texture;
@@ -168,7 +168,7 @@
 	CVPixelBufferRef frame;
 	GF_VTBDecCtx *ctx;
 	GF_FilterPacket *pck_src;
-	//openGL mode
+	//OpenGL mode
 #ifdef VTB_GL_TEXTURE
 	GF_CVGLTextureREF y, u, v;
 #endif
@@ -262,7 +262,7 @@
 			}
 		} else {
 			diff = (s64) (acts * timescale) - (s64) (cts * atimescale);
-			if ((diff>0) && (ctx->last_timescale_out * cts > timescale * ctx->last_cts_out) ) {
+			if ((diff>0) && gf_timestamp_greater(cts, timescale, ctx->last_cts_out, ctx->last_timescale_out) ) {
 				insert = GF_TRUE;
 			}
 		}
@@ -322,6 +322,7 @@
 	u32 dsi_data_size=0;
 	u32 w, h;
 	GF_FilterPid *pid;
+	const char *codec_name = NULL;
 	w = h = 0;
 	
 dec_dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
@@ -344,7 +345,10 @@
 	if (p) w = p->value.uint;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
 	if (p) h = p->value.uint;
-
+	if (w && h) {
+		ctx->width = w;
+		ctx->height = h;
+	}
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
 
@@ -354,8 +358,8 @@
 			s32 idx;
 			u32 i;
 			GF_AVCConfig *cfg;
-			GF_AVCConfigSlot *sps = NULL;
-			GF_AVCConfigSlot *pps = NULL;
+			GF_NALUFFParam *sps = NULL;
+			GF_NALUFFParam *pps = NULL;
 
 			for (i=0; i<gf_list_count(ctx->SPSs); i++) {
 				sps = gf_list_get(ctx->SPSs, i);
@@ -381,11 +385,12 @@
 			if (!pps) return GF_NON_COMPLIANT_BITSTREAM;
 			ctx->reconfig_needed = GF_FALSE;
 			
-			ctx->vtb_type = kCMVideoCodecType_H264;
+			ctx->vtb_type = 'avc1'; //kCMVideoCodecType_H264;
+			codec_name = "AVC|H264";
 
-			if (gf_media_avc_read_sps(sps->data, sps->size, &ctx->avc, 0, NULL)<0)
+			if (gf_avc_read_sps(sps->data, sps->size, &ctx->avc, 0, NULL)<0)
 				return GF_NON_COMPLIANT_BITSTREAM;
-			if (gf_media_avc_read_pps(pps->data, pps->size, &ctx->avc)<0)
+			if (gf_avc_read_pps(pps->data, pps->size, &ctx->avc)<0)
 				return GF_NON_COMPLIANT_BITSTREAM;
 
 			idx = ctx->active_sps;
@@ -473,12 +478,12 @@
 			s32 idx;
 			u32 i;
 			GF_HEVCConfig *cfg;
-			GF_HEVCParamArray *vpsa = NULL;
-			GF_HEVCParamArray *spsa = NULL;
-			GF_HEVCParamArray *ppsa = NULL;
-			GF_AVCConfigSlot *vps = NULL;
-			GF_AVCConfigSlot *sps = NULL;
-			GF_AVCConfigSlot *pps = NULL;
+			GF_NALUFFParamArray *vpsa = NULL;
+			GF_NALUFFParamArray *spsa = NULL;
+			GF_NALUFFParamArray *ppsa = NULL;
+			GF_NALUFFParam *vps = NULL;
+			GF_NALUFFParam *sps = NULL;
+			GF_NALUFFParam *pps = NULL;
 
 			for (i=0; i<gf_list_count(ctx->VPSs); i++) {
 				vps = gf_list_get(ctx->VPSs, i);
@@ -507,7 +512,8 @@
 			if (!pps) return GF_NON_COMPLIANT_BITSTREAM;
 			ctx->reconfig_needed = GF_FALSE;
 
-			ctx->vtb_type = kCMVideoCodecType_HEVC;
+			ctx->vtb_type = 'hvc1'; //kCMVideoCodecType_HEVC;
+			codec_name = "HEVC";
 
 			idx = ctx->active_sps;
 			ctx->width = ctx->hevc.sps[idx].width;
@@ -571,7 +577,7 @@
 
 			cfg->nal_unit_size = 4;
 
-			GF_SAFEALLOC(vpsa, GF_HEVCParamArray);
+			GF_SAFEALLOC(vpsa, GF_NALUFFParamArray);
 			if (!vpsa) return GF_OUT_OF_MEM;
 			vpsa->array_completeness = 1;
 			vpsa->type = GF_HEVC_NALU_VID_PARAM;
@@ -579,7 +585,7 @@
 			gf_list_add(vpsa->nalus, vps);
 			gf_list_add(cfg->param_array, vpsa);
 
-			GF_SAFEALLOC(spsa, GF_HEVCParamArray);
+			GF_SAFEALLOC(spsa, GF_NALUFFParamArray);
 			if (!spsa) return GF_OUT_OF_MEM;
 			spsa->array_completeness = 1;
 			spsa->type = GF_HEVC_NALU_SEQ_PARAM;
@@ -587,7 +593,7 @@
 			gf_list_add(spsa->nalus, sps);
 			gf_list_add(cfg->param_array, spsa);
 
-			GF_SAFEALLOC(ppsa, GF_HEVCParamArray);
+			GF_SAFEALLOC(ppsa, GF_NALUFFParamArray);
 			if (!ppsa) return GF_OUT_OF_MEM;
 			ppsa->array_completeness = 1;
 			ppsa->type = GF_HEVC_NALU_PIC_PARAM;
@@ -622,7 +628,8 @@
 	case GF_CODECID_MPEG2_HIGH:
 	case GF_CODECID_MPEG2_422:
 
- ctx->vtb_type = kCMVideoCodecType_MPEG2Video;
+ ctx->vtb_type = 'mp2v'; //kCMVideoCodecType_MPEG2Video;
+		codec_name = "MPEG2";
 		if (!ctx->width || !ctx->height) {
 			ctx->init_mpeg12 = GF_TRUE;
 			return GF_OK;
@@ -632,7 +639,8 @@
 break;
 		
 	case GF_CODECID_MPEG1:
-		ctx->vtb_type = kCMVideoCodecType_MPEG1Video;
+		ctx->vtb_type = 'mp1v'; //kCMVideoCodecType_MPEG1Video;
+		codec_name = "MPEG1";
 		if (!ctx->width || !ctx->height) {
 			ctx->init_mpeg12 = GF_TRUE;
 			return GF_OK;
@@ -644,7 +652,8 @@
 	{
 		char *vosh = NULL;
 		u32 vosh_size = 0;
-		ctx->vtb_type = kCMVideoCodecType_MPEG4Video;
+		ctx->vtb_type = 'mp4v'; //kCMVideoCodecType_MPEG4Video;
+		codec_name = "MPEG4";
 
 		if (!p || !p->value.data.ptr) {
 			vosh = ctx->vosh;
@@ -697,14 +706,34 @@
 	case GF_CODECID_S263:
 		ctx->reorder_probe = 0;
 		ctx->reconfig_needed = GF_FALSE;
-		if (w && h) {
-			ctx->width = w;
-			ctx->height = h;
-			ctx->vtb_type = kCMVideoCodecType_H263;
-			break;
-		}
+		ctx->vtb_type = 'h263'; //kCMVideoCodecType_H263;
+		codec_name = "H263";
+		break;
+
+	case GF_CODECID_AP4X:
+		ctx->vtb_type = 'ap4x'; //kCMVideoCodecType_AppleProRes4444XQ;
+		codec_name = "ProRes.AP4X";
+		break;
+	case GF_CODECID_AP4H:
+		ctx->vtb_type = 'ap4h'; //kCMVideoCodecType_AppleProRes4444;
+		codec_name = "ProRes.AP4H";
+		break;
+	case GF_CODECID_APCH:
+		ctx->vtb_type = 'apch'; // kCMVideoCodecType_AppleProRes422HQ;
+		codec_name = "ProRes.APCH";
+		break;
+	case GF_CODECID_APCN:
+		ctx->vtb_type = 'apcn'; // kCMVideoCodecType_AppleProRes422;
+		codec_name = "ProRes.APCN";
+		break;
+	case GF_CODECID_APCS:
+		ctx->vtb_type = 'apcs'; // kCMVideoCodecType_AppleProRes422LT;
+		codec_name = "ProRes.APCS";
+		break;
+	case GF_CODECID_APCO:
+		ctx->vtb_type = 'apco'; // kCMVideoCodecType_AppleProRes422Proxy;
+		codec_name = "ProRes.APCO";
 		break;
-		
 	default :
 		ctx->reconfig_needed = GF_FALSE;
 		return GF_NOT_SUPPORTED;
@@ -789,24 +818,11 @@
 	ctx->profile_supported = GF_FALSE;
 	ctx->can_reconfig = !gf_opts_get_bool("core", "no-reassign");
 
-	switch (ctx->vtb_type) {
-	case kCMVideoCodecType_H264:
-		gf_filter_set_name(filter, ctx->is_hardware ? "VTB:Hardware:AVC|H264" : "VTB:Software:AVC|H264");
-		break;
-	case kCMVideoCodecType_MPEG2Video:
-		gf_filter_set_name(filter, ctx->is_hardware ? "VTB:Hardware:MPEG2" : "VTB:Software:MPEG2");
-		break;
- case kCMVideoCodecType_MPEG4Video:
-		gf_filter_set_name(filter, ctx->is_hardware ? "VTB:Hardware:MPEG4P2" : "VTB:Software:MPEG4P2");
-		break;
- case kCMVideoCodecType_H263:
-		gf_filter_set_name(filter, ctx->is_hardware ? "VTB:Hardware:H263" : "VTB:Software:H263");
-		break;
-	case kCMVideoCodecType_MPEG1Video:
-		gf_filter_set_name(filter, ctx->is_hardware ? "VTB:Hardware:MPEG1" : "VTB:Software:MPEG1");
-		break;
-	default:
-		break;
+	if (codec_name) {
+		char szName[100];
+		snprintf(szName, 99, "VTB:%s:%s", ctx->is_hardware ? "Hardware" : "Software", codec_name);
+		szName[99] = 0;
+		gf_filter_set_name(filter, szName);
 	}
 	return GF_OK;
 }
@@ -822,20 +838,20 @@
 	else gf_bs_reassign_buffer(ctx->ps_bs, data, size);
 
 	if (hevc_nal_type) {
-#ifndef GPAC_DISABLE_HEVC
+#if !defined(GPAC_DISABLE_HEVC)
 		if (hevc_nal_type==GF_HEVC_NALU_SEQ_PARAM) {
 			dest = ctx->SPSs;
-			ps_id = gf_media_hevc_read_sps_bs(ctx->ps_bs, &ctx->hevc);
+			ps_id = gf_hevc_read_sps_bs(ctx->ps_bs, &ctx->hevc);
 			if (ps_id<0) return;
 		}
 		else if (hevc_nal_type==GF_HEVC_NALU_PIC_PARAM) {
 			dest = ctx->PPSs;
-			ps_id = gf_media_hevc_read_pps_bs(ctx->ps_bs, &ctx->hevc);
+			ps_id = gf_hevc_read_pps_bs(ctx->ps_bs, &ctx->hevc);
 			if (ps_id<0) return;
 		}
 		else if (hevc_nal_type==GF_HEVC_NALU_VID_PARAM) {
 			dest = ctx->VPSs;
-			ps_id = gf_media_hevc_read_vps_bs(ctx->ps_bs, &ctx->hevc);
+			ps_id = gf_hevc_read_vps_bs(ctx->ps_bs, &ctx->hevc);
 			if (ps_id<0) return;
 		}
 #endif //GPAC_DISABLE_HEVC
@@ -844,17 +860,17 @@
 		dest = is_sps ? ctx->SPSs : ctx->PPSs;
 
 		if (is_sps) {
-			ps_id = gf_media_avc_read_sps_bs(ctx->ps_bs, &ctx->avc, 0, NULL);
+			ps_id = gf_avc_read_sps_bs(ctx->ps_bs, &ctx->avc, 0, NULL);
 			if (ps_id<0) return;
 		} else {
-			ps_id = gf_media_avc_read_pps_bs(ctx->ps_bs, &ctx->avc);
+			ps_id = gf_avc_read_pps_bs(ctx->ps_bs, &ctx->avc);
 			if (ps_id<0) return;
 		}
 	}
 	
 	count = gf_list_count(dest);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *a_slc = gf_list_get(dest, i);
+		GF_NALUFFParam *a_slc = gf_list_get(dest, i);
 		if (a_slc->id != ps_id) continue;
 		//not same size or different content but same ID, remove old xPS
 		if ((a_slc->size != size) || memcmp(a_slc->data, data, size) ) {
@@ -868,8 +884,8 @@
 		break;
 	}
 	if (add) {
-		GF_AVCConfigSlot *slc;
-		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
+		GF_NALUFFParam *slc;
+		GF_SAFEALLOC(slc, GF_NALUFFParam);
 		if (!slc) return;
 		slc->data = gf_malloc(size);
 		if (!slc->data) {
@@ -892,12 +908,12 @@
 	//remove all xPS sharing the same ID, use only the last occurence
 	count = gf_list_count(dest);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *slc = gf_list_get(dest, i);
+		GF_NALUFFParam *slc = gf_list_get(dest, i);
 		if (slc->id != idx) continue;
 		crc_res = slc->crc;
 
 		for (j=i+1; j<count; j++) {
-			GF_AVCConfigSlot *a_slc = gf_list_get(dest, j);
+			GF_NALUFFParam *a_slc = gf_list_get(dest, j);
 			if (a_slc->id != slc->id) continue;
 			//not same size or different content but same ID, remove old xPS
 			if ((slc->size != a_slc->size) || memcmp(a_slc->data, slc->data, a_slc->size) ) {
@@ -917,7 +933,7 @@
 static void vtbdec_del_param_list(GF_List *list)
 {
 	while (gf_list_count(list)) {
-		GF_AVCConfigSlot *slc = gf_list_get(list, 0);
+		GF_NALUFFParam *slc = gf_list_get(list, 0);
 		gf_free(slc->data);
 		gf_free(slc);
 		gf_list_rem(list, 0);
@@ -934,9 +950,11 @@
 	GF_VTBDecCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = NULL;
 		gf_list_del_item(ctx->streams, pid);
+		if (ctx->opid && !gf_list_count(ctx->streams)) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid)) {
@@ -988,7 +1006,7 @@
 
 	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
 	dsi_crc = dsi ? gf_crc_32(dsi->value.data.ptr, dsi->value.data.size) : 0;
-	if ((codecid==ctx->codecid) && (dsi_crc == ctx->cfg_crc) && ctx->width && ctx->height) {
+	if (ctx->opid && (codecid==ctx->codecid) && (dsi_crc == ctx->cfg_crc) && ctx->width && ctx->height) {
 		gf_filter_pid_copy_properties(ctx->opid, pid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
@@ -1028,6 +1046,7 @@
 
 	ctx->nalu_size_length = 0;
 	ctx->is_annex_b = GF_FALSE;
+	ctx->is_avc = ctx->is_hevc = GF_FALSE;
 
 	//check AVC config
 	if (codecid==GF_CODECID_AVC) {
@@ -1052,7 +1071,7 @@
 			return GF_OK;
 		} else {
 			u32 i;
-			GF_AVCConfigSlot *slc;
+			GF_NALUFFParam *slc;
 			GF_AVCConfig *cfg = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
 			for (i=0; i<gf_list_count(cfg->sequenceParameterSets); i++) {
 				slc = gf_list_get(cfg->sequenceParameterSets, i);
@@ -1085,6 +1104,16 @@
 				e = GF_OK;
 			}
 			gf_odf_avc_cfg_del(cfg);
+
+			if ((ctx->active_sps>=0) && ctx->avc.sps[ctx->active_sps].vui_parameters_present_flag) {
+				Bool full_range = ctx->avc.sps[ctx->active_sps].vui.video_full_range_flag;
+				u32 cmx = ctx->avc.sps[ctx->active_sps].vui.matrix_coefficients;
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(full_range));
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, &PROP_UINT(cmx));
+			} else {
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, NULL);
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, NULL);
+			}
 			return e;
 		}
 	}
@@ -1110,11 +1139,11 @@
 			return GF_OK;
 		} else {
 			u32 i, j;
-			GF_AVCConfigSlot *slc;
+			GF_NALUFFParam *slc;
 			GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_FALSE);
 
 			for (i=0; i<gf_list_count(cfg->param_array); i++) {
-				GF_HEVCParamArray *pa = gf_list_get(cfg->param_array, i);
+				GF_NALUFFParamArray *pa = gf_list_get(cfg->param_array, i);
 
 
 				for (j=0; j<gf_list_count(pa->nalus); j++) {
@@ -1141,6 +1170,16 @@
 				e = GF_OK;
 			}
 			gf_odf_hevc_cfg_del(cfg);
+
+			if ((ctx->active_sps>=0) && ctx->hevc.sps[ctx->active_sps].vui_parameters_present_flag) {
+				Bool full_range = ctx->hevc.sps[ctx->active_sps].video_full_range_flag;
+				u32 cmx = ctx->hevc.sps[ctx->active_sps].matrix_coeffs;
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(full_range));
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, &PROP_UINT(cmx));
+			} else {
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, NULL);
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, NULL);
+			}
 			return e;
 		}
 	}
@@ -1216,7 +1255,7 @@
 			}
 
 			if (nal_size > inBufferLength) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error parsing NAL: size indicated %d but %d bytes only in payload\n", nal_size, inBufferLength));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error parsing NAL: size indicated %u but %u bytes only in payload\n", nal_size, inBufferLength));
 				break;
 			}
 			ptr += ctx->nalu_size_length;
@@ -1263,7 +1302,7 @@
 				break;
 			}
 
-			gf_media_avc_parse_nalu(ctx->nal_bs, &ctx->avc);
+			gf_avc_parse_nalu(ctx->nal_bs, &ctx->avc);
 
 			if ((nal_type<=GF_AVC_NALU_IDR_SLICE) && ctx->avc.s_info.sps) {
 				if (ctx->avc.sps_active_idx != ctx->active_sps) {
@@ -1274,7 +1313,7 @@
 				}
 			}
 		} else if (ctx->is_hevc) {
-#ifdef GPAC_DISABLE_HEVC
+#if defined(GPAC_DISABLE_HEVC)
 			return GF_NOT_SUPPORTED;
 #else
 			u8 temporal_id, ayer_id;
@@ -1282,7 +1321,7 @@
 			if (!ctx->nal_bs) ctx->nal_bs = gf_bs_new(ptr, nal_size, GF_BITSTREAM_READ);
 			else gf_bs_reassign_buffer(ctx->nal_bs, ptr, nal_size);
 
-			s32 res = gf_media_hevc_parse_nalu_bs(ctx->nal_bs, &ctx->hevc, &nal_type, &temporal_id, &ayer_id);
+			s32 res = gf_hevc_parse_nalu_bs(ctx->nal_bs, &ctx->hevc, &nal_type, &temporal_id, &ayer_id);
 			if (res>=0) {
 				switch (nal_type) {
 				case GF_HEVC_NALU_VID_PARAM:
@@ -1387,7 +1426,7 @@
 	if (ctx->no_copy) return vtbdec_send_output_frame(filter, ctx);
 
 	vtbframe = gf_list_pop_front(ctx->frames);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[VTB] Outputing frame DTS "LLU" CTS "LLU" timescale %d\n", gf_filter_pck_get_dts(vtbframe->pck_src), gf_filter_pck_get_cts(vtbframe->pck_src), gf_filter_pck_get_timescale(vtbframe->pck_src)));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[VTB] Outputting frame DTS "LLU" CTS "LLU" timescale %d\n", gf_filter_pck_get_dts(vtbframe->pck_src), gf_filter_pck_get_cts(vtbframe->pck_src), gf_filter_pck_get_timescale(vtbframe->pck_src)));
 
 
 	status = CVPixelBufferLockBaseAddress(vtbframe->frame, kCVPixelBufferLock_ReadOnly);
@@ -1412,6 +1451,7 @@
 		u32 stride = (u32) CVPixelBufferGetBytesPerRowOfPlane(vtbframe->frame, 0);
 
 		GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &dst);
+		if (!dst_pck) return GF_OUT_OF_MEM;
 
 		//TOCHECK - for now the 3 planes are consecutive in VideoToolbox
 		if (stride==ctx->width) {
@@ -1447,7 +1487,9 @@
 		}
 
 		gf_filter_pck_merge_properties(vtbframe->pck_src, dst_pck);
+		gf_filter_pck_set_dependency_flags(dst_pck, 0);
 		ctx->last_cts_out = gf_filter_pck_get_cts(vtbframe->pck_src);
+		gf_filter_pck_set_dts(dst_pck, ctx->last_cts_out);
 		ctx->last_timescale_out = gf_filter_pck_get_timescale(vtbframe->pck_src);
 		gf_filter_pck_unref(vtbframe->pck_src);
 		vtbframe->pck_src = NULL;
@@ -1489,9 +1531,7 @@
 				return GF_OK;
 			}
 		}
-		dts = gf_filter_pck_get_dts(pck);
-		dts *= 1000;
-		dts /= gf_filter_pck_get_timescale(pck);
+		dts = gf_timestamp_rescale(gf_filter_pck_get_dts(pck), gf_filter_pck_get_timescale(pck), 1000);
 		if (!min_dts || (min_dts>dts)) {
 			min_dts = dts;
 			ref_pid = pid;
@@ -1851,7 +1891,7 @@
 	vtb_frame = gf_list_pop_front(ctx->frames);
 	if (!vtb_frame) return GF_BAD_PARAM;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[VTB] Outputing frame DTS "LLU" CTS "LLU" timescale %d\n", gf_filter_pck_get_dts(vtb_frame->pck_src), gf_filter_pck_get_cts(vtb_frame->pck_src), gf_filter_pck_get_timescale(vtb_frame->pck_src)));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[VTB] Outputting frame DTS "LLU" CTS "LLU" timescale %d\n", gf_filter_pck_get_dts(vtb_frame->pck_src), gf_filter_pck_get_cts(vtb_frame->pck_src), gf_filter_pck_get_timescale(vtb_frame->pck_src)));
 
 	vtb_frame->frame_ifce.user_data = vtb_frame;
 	vtb_frame->frame_ifce.get_plane = vtbframe_get_plane;
@@ -1866,10 +1906,13 @@
 	safe_int_inc(&ctx->decoded_frames_pending);
 
 	dst_pck = gf_filter_pck_new_frame_interface(ctx->opid, &vtb_frame->frame_ifce, vtbframe_release);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	gf_filter_pck_merge_properties(vtb_frame->pck_src, dst_pck);
+	gf_filter_pck_set_dependency_flags(dst_pck, 0);
 
 	ctx->last_cts_out = gf_filter_pck_get_cts(vtb_frame->pck_src);
+	gf_filter_pck_set_dts(dst_pck, ctx->last_cts_out);
 	ctx->last_timescale_out = gf_filter_pck_get_timescale(vtb_frame->pck_src);
 	gf_filter_pck_unref(vtb_frame->pck_src);
 	vtb_frame->pck_src = NULL;
@@ -1957,9 +2000,9 @@
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AVC),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
-	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_TILE_BASE, GF_TRUE),
+	{ .code=GF_PROP_PID_SCALABLE, .val={.type=GF_PROP_BOOL, .value.boolean = GF_TRUE}, .flags=(GF_CAPS_INPUT_OPT), .priority=255 },
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
 
-#ifndef GPAC_CONFIG_IOS
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SIMPLE),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_MAIN),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SNR),
@@ -1968,7 +2011,13 @@
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_422),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_H263),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_S263),
-#endif
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AP4X),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AP4H),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCH),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCN),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCS),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCO),
+
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 };
@@ -1978,8 +2027,8 @@
 static const GF_FilterArgs VTBDecArgs[] =
 {
 	{ OFFS(reorder), "number of frames to wait for temporal re-ordering", GF_PROP_UINT, "6", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(no_copy), "dispatch VTB frames into filter chain (no copy)", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ofmt), "set default pixel format for decoded video. If not matched default to nv12", GF_PROP_PIXFMT, "nv12", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(no_copy), "dispatch decoded frames as OpenGL textures (true) or as copied packets (false) ", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ofmt), "set default pixel format for decoded video. If not found, fall back to `nv12`", GF_PROP_PIXFMT, "nv12", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(disable_hw), "disable hardware decoding", GF_PROP_BOOL, "false", NULL, 0},
 	{}
 };
@@ -1987,7 +2036,7 @@
 GF_FilterRegister GF_VTBDecCtxRegister = {
 	.name = "vtbdec",
 	GF_FS_SET_DESCRIPTION("VideoToolBox decoder")
-	GF_FS_SET_HELP("This filter decodes MPEG-2, H263, AVC|H264 and HEVC streams through VideoToolBox. It allows GPU frame dispatch or direct frame copy.")
+	GF_FS_SET_HELP("This filter decodes video streams through OSX/iOS VideoToolBox (MPEG-2, H263, AVC|H264, HEVC, ProRes). It allows GPU frame dispatch or direct frame copy.")
 	.private_size = sizeof(GF_VTBDecCtx),
 	.args = VTBDecArgs,
 	.priority = 1,
@@ -1996,7 +2045,6 @@
 	.finalize = vtbdec_finalize,
 	.configure_pid = vtbdec_configure_pid,
 	.process = vtbdec_process,
-	.max_extra_pids = 5,
 	.process_event = vtbdec_process_event,
 };
 
@@ -2005,11 +2053,11 @@
 #include <gpac/maths.h>
 #include <gpac/filters.h>
 
-#endif // !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) )
+#endif // !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) ) && defined(GPAC_HAS_VTB)
 
 const GF_FilterRegister *vtbdec_register(GF_FilterSession *session)
 {
-#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) )
+#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) ) && defined(GPAC_HAS_VTB)
 	return &GF_VTBDecCtxRegister;
 #else
 	return NULL;

gpac-1.0.1.tar.gz/src/filters/dec_webvtt.c -> gpac-2.0.0.tar.gz/src/filters/dec_webvtt.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Cyril Concolato - Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2013-2017
+ *			Copyright (c) Telecom ParisTech 2013-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / WebVTT decoder filter
@@ -160,8 +160,11 @@
 	GF_VTTDec *ctx = (GF_VTTDec *)gf_filter_get_udta(filter);
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = ctx->ipid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		ctx->ipid = NULL;
 		return GF_OK;
 	}
 	//TODO: we need to cleanup cap checking upon reconfigure
@@ -398,13 +401,13 @@
 
 	//we still process any frame before our clock time even when buffering
 	obj_time = gf_clock_time(ctx->odm->ck);
-	if (cts * 1000 > obj_time * timescale) {
+	if (gf_timestamp_greater(cts, timescale, obj_time, 1000)) {
 		gf_sc_sys_frame_pending(ctx->scene->compositor, ((Double) cts / timescale), obj_time, filter);
 		return GF_OK;
 	}
 	pck_data = gf_filter_pck_get_data(pck, &pck_size);
 
-	cues = gf_webvtt_parse_cues_from_data(pck_data, pck_size, 0);
+	cues = gf_webvtt_parse_cues_from_data(pck_data, pck_size, 0, 0);
 	vttd_js_remove_cues(ctx, ctx->scenegraph->RootNode);
 	if (gf_list_count(cues)) {
 		while (gf_list_count(cues)) {
@@ -460,9 +463,9 @@
 static const GF_FilterArgs VTTDecArgs[] =
 {
 	{ OFFS(script), "location of WebVTT SVG JS renderer", GF_PROP_STRING, "$GSHARE/scripts/webvtt-renderer.js", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(font), "font to use", GF_PROP_STRING, "SANS", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
-	{ OFFS(fontSize), "font size to use", GF_PROP_FLOAT, "20", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
-	{ OFFS(color), "color to use", GF_PROP_STRING, "white", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(font), "font", GF_PROP_STRING, "SANS", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(fontSize), "font size", GF_PROP_FLOAT, "20", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(color), "text color", GF_PROP_STRING, "white", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
 	{ OFFS(lineSpacing), "line spacing as scaling factor to font size", GF_PROP_FLOAT, "1.0", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
 	{ OFFS(txtx), "horizontal offset", GF_PROP_FLOAT, "5", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
 	{ OFFS(txty), "vertical offset", GF_PROP_FLOAT, "5", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},

gpac-1.0.1.tar.gz/src/filters/dec_xvid.c -> gpac-2.0.0.tar.gz/src/filters/dec_xvid.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG-4 visual p2 xvid decoder filter
@@ -141,8 +141,10 @@
 	GF_XVIDCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
-		ctx->opid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 		return GF_OK;
 	}
@@ -179,7 +181,7 @@
 	/*decode DSI*/
 	e = gf_m4v_get_config(p->value.data.ptr, p->value.data.size, &dsi);
 	if (e) return e;
-	if (!dsi.width || !dsi.height) return GF_NON_COMPLIANT_BITSTREAM;
+	if (!dsi.width || (dsi.width%2) || !dsi.height) return GF_NON_COMPLIANT_BITSTREAM;
 
 	memset(&par, 0, sizeof(par));
 	par.width = dsi.width;
@@ -294,6 +296,7 @@
 packed_frame :
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->width*ctx->height*3/2, &buffer);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 #ifdef XVID_USE_OLD_API
 	frame.colorspace = XVID_CSP_I420;
@@ -378,8 +381,10 @@
 
 	if (src_pck) {
 		gf_filter_pck_merge_properties(src_pck, dst_pck);
+		gf_filter_pck_set_dependency_flags(dst_pck, 0);
 		is_seek = gf_filter_pck_get_seek_flag(src_pck);
 		ctx->next_cts = gf_filter_pck_get_cts(src_pck);
+		gf_filter_pck_set_dts(dst_pck, ctx->next_cts);
 		ctx->next_cts += gf_filter_pck_get_duration(src_pck);
 		gf_filter_pck_unref(src_pck);
 		gf_list_pop_front(ctx->src_packets);

gpac-1.0.1.tar.gz/src/filters/decrypt_cenc_isma.c -> gpac-2.0.0.tar.gz/src/filters/decrypt_cenc_isma.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / CENC and ISMA decrypt filter
@@ -29,6 +29,8 @@
 #include <gpac/crypt.h>
 #include <gpac/base_coding.h>
 #include <gpac/download.h>
+#include <gpac/network.h>
+#include <gpac/internal/media_dev.h>
 
 #ifndef GPAC_DISABLE_CRYPTO
 
@@ -36,23 +38,38 @@
 
 enum
 {
-	DECRYPT_STATE_ERROR,
+	DECRYPT_STATE_ERROR=1,
 	DECRYPT_STATE_SETUP,
 	DECRYPT_STATE_PLAY,
 };
 
+enum
+{
+	DECRYPT_FULL=0,
+	DECRYPT_NOKEY,
+	DECRYPT_SKIP,
+};
+
+typedef struct
+{
+	GF_Crypt *crypt;
+	bin128 key;
+	u32 key_valid;
+} CENCDecKey;
+
 typedef struct
 {
 	GF_FilterPid *ipid, *opid;
 
-	GF_Crypt *crypt;
-	bin128 key, kid;
 	u32 state;
 	u32 pssh_crc;
 	u32 scheme_type, scheme_version;
 
 	GF_Err key_error;
 
+	CENCDecKey *crypts;
+	u32 nb_crypts;
+
 	//ISMA & OMA
 	char salt[8];
 	u64 last_IV;
@@ -70,16 +87,36 @@
 	bin128 *KIDs;
 	bin128 *keys;
 
+	const GF_PropertyValue *cenc_ki;
+	u32 multikey;
+	const GF_PropertyValue *cenc_pattern;
+
 	/*adobe and CENC*/
 	Bool crypt_init;
+
+	Bool is_hls;
+	bin128 hls_IV;
+	char *hls_key_url;
+	Bool is_hls_saes;
+	u32 codec_id;
+
+	Bool force_hls_iv;
+
+	Bool gpac_master_leaf;
+	bin128 master_key;
 } GF_CENCDecStream;
 
 typedef struct
 {
 	const char *cfile;
-
+	u32 decrypt;
+	GF_PropUIntList drop_keys;
+	GF_PropStringList kids;
+	GF_PropStringList keys;
 	GF_CryptInfo *cinfo;
-	
+	Bool hls_cenc_patch_iv;
+
+	GF_Filter *filter;
 	GF_List *streams;
 	GF_BitStream *bs_r;
 
@@ -143,16 +180,17 @@
 	is supported as a proof of concept, crypto and IPMP being the last priority on gpac...*/
 	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[CENC/ISMA] Fetching ISMACryp key for channel %d\n", id) );
 
-	sess = gf_dm_sess_new(ctx->dm, kms_url, 0, cenc_dec_kms_netio, ctx, NULL);
+	sess = gf_dm_sess_new(ctx->dm, kms_url, GF_NETIO_SESSION_NOT_THREADED, cenc_dec_kms_netio, ctx, NULL);
 	if (!sess) return GF_IO_ERR;
-	/*start our download (threaded)*/
-	gf_dm_sess_process(sess);
 
 	while (1) {
-		e = gf_dm_sess_get_stats(sess, NULL, NULL, NULL, NULL, NULL, NULL);
+		GF_NetIOStatus status;
+		e = gf_dm_sess_process(sess);
 		if (e) break;
+		gf_dm_sess_get_stats(sess, NULL, NULL, NULL, NULL, NULL, &status);
+		if (status>=GF_NETIO_DATA_TRANSFERED) break;
 	}
-	if (e==GF_EOS) {
+	if (e >= GF_EOS) {
 		e = gf_ismacryp_gpac_get_info(id, (char *) gf_dm_sess_get_cache_name(sess), cstr->key, cstr->salt);
 	}
 	gf_dm_sess_del(sess);
@@ -217,7 +255,7 @@
 	if (!strnicmp(kms_uri, "(key)", 5)) {
 		char data[100];
 		gf_base64_decode((char*) kms_uri+5, (u32)strlen(kms_uri)-5, data, 100);
-		memcpy(cstr->key, data, sizeof(char)*16);
+		memcpy(cstr->crypts[0].key, data, sizeof(char)*16);
 		memcpy(cstr->salt, data+16, sizeof(char)*8);
 	}
 	/*hexadecimal inband encoding*/
@@ -233,7 +271,7 @@
 			szT[0] = k[2*i];
 			szT[1] = k[2*i + 1];
 			sscanf(szT, "%X", &v);
-			cstr->key[i] = v;
+			cstr->crypts[0].key[i] = v;
 		}
 
 		k = (char *)kms_uri + 10 + 32;
@@ -272,7 +310,7 @@
 			}
 		};
 		memcpy(cstr->salt, mysalt, sizeof(char)*8);
-		memcpy(cstr->key, mykey, sizeof(char)*16);
+		memcpy(cstr->crypts[0].key, mykey, sizeof(char)*16);
 	}
 	cstr->state = DECRYPT_STATE_SETUP;
 
@@ -296,18 +334,18 @@
 		char IV[16];
 		if (cstr->state != DECRYPT_STATE_SETUP)
 			return GF_SERVICE_ERROR;
-		assert(!cstr->crypt);
+		assert(!cstr->crypts[0].crypt);
 
 		//if (!ctx->nb_allow_play) return GF_AUTHENTICATION_FAILURE;
 		//ctx->nb_allow_play--;
 
 		/*init decrypter*/
-		cstr->crypt = gf_crypt_open(GF_AES_128, GF_CTR);
-		if (!cstr->crypt) return GF_IO_ERR;
+		cstr->crypts[0].crypt = gf_crypt_open(GF_AES_128, GF_CTR);
+		if (!cstr->crypts[0].crypt) return GF_IO_ERR;
 
 		memset(IV, 0, sizeof(char)*16);
 		memcpy(IV, cstr->salt, sizeof(char)*8);
-		e = gf_crypt_init(cstr->crypt, cstr->key, IV);
+		e = gf_crypt_init(cstr->crypts[0].crypt, cstr->crypts[0].key, IV);
 		if (e) return e;
 
 		cstr->state = DECRYPT_STATE_PLAY;
@@ -315,8 +353,8 @@
 	} else {
 		if (cstr->state != DECRYPT_STATE_PLAY)
 			return GF_SERVICE_ERROR;
-		if (cstr->crypt) gf_crypt_close(cstr->crypt);
-		cstr->crypt = NULL;
+		if (cstr->crypts[0].crypt) gf_crypt_close(cstr->crypts[0].crypt);
+		cstr->crypts[0].crypt = NULL;
 		cstr->state = DECRYPT_STATE_SETUP;
 		return GF_OK;
 	}
@@ -332,11 +370,12 @@
 	u32 offset=0;
 	GF_FilterPacket *out_pck;
 	Bool is_encrypted=GF_FALSE;
-	if (!cstr->crypt)
+	if (!cstr->crypts[0].crypt)
 		return GF_SERVICE_ERROR;
 
 	if (! gf_filter_pck_get_crypt_flags(in_pck)) {
-		out_pck = gf_filter_pck_new_ref(cstr->opid, NULL, 0, in_pck);
+		out_pck = gf_filter_pck_new_ref(cstr->opid, 0, 0, in_pck);
+		if (!out_pck) return GF_OUT_OF_MEM;
 		gf_filter_pck_merge_properties(in_pck, out_pck);
 		gf_filter_pck_set_crypt_flags(out_pck, 0);
 		gf_filter_pck_send(out_pck);
@@ -379,12 +418,12 @@
 		gf_bs_write_data(bs, cstr->salt, 8);
 		gf_bs_write_u64(bs, (s64) count);
 		gf_bs_del(bs);
-		gf_crypt_set_IV(cstr->crypt, IV, 17);
+		gf_crypt_set_IV(cstr->crypts[0].crypt, IV, 17);
 
 		/*decrypt remain bytes*/
 		if (remain) {
 			char dummy[20];
-			gf_crypt_decrypt(cstr->crypt, dummy, remain);
+			gf_crypt_decrypt(cstr->crypts[0].crypt, dummy, remain);
 		}
 		cstr->last_IV = isma_BSO;
 	}
@@ -392,10 +431,11 @@
 	data_size -= offset;
 
 	out_pck = gf_filter_pck_new_alloc(cstr->opid, data_size, &out_data);
+	if (!out_pck) return GF_OUT_OF_MEM;
 
 	memcpy(out_data, in_data, data_size);
 	/*decrypt*/
-	gf_crypt_decrypt(cstr->crypt, out_data, data_size);
+	gf_crypt_decrypt(cstr->crypts[0].crypt, out_data, data_size);
 	cstr->last_IV += data_size;
 
 	/*replace AVC start codes (0x00000001) by nalu size*/
@@ -461,67 +501,281 @@
 }
 #endif
 
-static GF_Err cenc_dec_setup_cenc(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, u32 scheme_type, u32 scheme_version, const char *scheme_uri, const char *kms_uri)
+
+static GF_Err cenc_dec_load_keys(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr)
 {
-	GF_CryptInfo *cinfo=NULL;
-	u32 i, nb_pssh, pssh_crc=0;
-	const GF_PropertyValue *prop, *cinfo_prop;
-	char *pssh_data=NULL;
-	GF_FilterPid *pid = cstr->ipid;
-	Bool is_playing = (cstr->state == DECRYPT_STATE_PLAY) ? GF_TRUE : GF_FALSE;
+	bin128 blank_KID;
+	const u8 *key_info;
+	u32 i, j, kpos=3, nb_keys;
+	cstr->crypt_init = GF_FALSE;
 
-	cstr->state = DECRYPT_STATE_ERROR;
+	//this can be NULL when set per sample and not at init
+	if (!cstr->cenc_ki)
+		return GF_OK;
 
-	if ((scheme_type != GF_ISOM_CENC_SCHEME)
-		&& (scheme_type != GF_ISOM_CBC_SCHEME)
-		&& (scheme_type != GF_ISOM_CENS_SCHEME)
-		&& (scheme_type != GF_ISOM_CBCS_SCHEME)
-		&& (scheme_type != GF_ISOM_PIFF_SCHEME)
-	)
-		return GF_NOT_SUPPORTED;
+	memset(blank_KID, 0, 16);
+	key_info = cstr->cenc_ki->value.data.ptr;
+	if (key_info[0]) {
+		nb_keys = key_info[1];
+		nb_keys<<=8;
+		nb_keys |= key_info[2];
+	} else {
+		nb_keys = 1;
+	}
+	for (i=0; i<nb_keys; i++) {
+		Bool found = GF_FALSE;
+		u8 iv_size = key_info[kpos];
+		const u8 *KID = key_info + kpos+1;
+		kpos += 17;
+		if (!iv_size) {
+			iv_size = key_info[kpos];
+			kpos += 1 + iv_size;
+		}
 
-	if (scheme_version != 0x00010000) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Invalid scheme version %08X for scheme type %s, results might be wrong\n", scheme_version, gf_4cc_to_str(scheme_type) ));
+		cstr->crypts[i].key_valid = GF_TRUE;
+		if (ctx->drop_keys.nb_items) {
+			for (j=0; j<ctx->drop_keys.nb_items; j++) {
+				if (ctx->drop_keys.vals[j] == i+1) {
+					cstr->crypts[i].key_valid = GF_FALSE;
+					break;
+				}
+			}
+		}
+		if (ctx->kids.nb_items) {
+			char szKID[33];
+			szKID[0] = 0;
+			for (j=0; j<16; j++) {
+				char szC[3];
+				sprintf(szC, "%02X", KID[j]);
+				strcat(szKID, szC);
+			}
+			for (j=0; j<ctx->kids.nb_items; j++) {
+				char *kid_d = ctx->kids.vals[j];
+				if (!strncmp(kid_d, "0x", 2)) kid_d+=2;
+
+				if (stricmp(szKID, kid_d)) continue;
+
+				//no global key, disable key
+				if (!ctx->keys.nb_items) {
+					cstr->crypts[i].key_valid = GF_FALSE;
+				}
+				//use global keys
+				else {
+					u32 len;
+					bin128 key;
+					char *key_str = ctx->keys.vals[j];
+					if (!strncmp(key_str, "0x", 2)) key_str+= 2;
+					len = (u32) strlen(key_str);
+					if (len!=32) {
+						cstr->crypts[i].key_valid = GF_FALSE;
+						break;
+					}
+					for (j=0; j<16; j++) {
+						u32 val;
+						char szV[3];
+						szV[0] = key_str[2*j];
+						szV[1] = key_str[2*j+1];
+						szV[2] = 0;
+						sscanf(szV, "%02X", &val);
+						key[j] = val;
+					}
+					memcpy(cstr->crypts[i].key, key, 16);
+					found = GF_TRUE;
+				}
+				break;
+			}
+		}
+		if (!cstr->crypts[i].key_valid) continue;
+		if (found) continue;
+
+		for (j=0; j<cstr->KID_count; j++) {
+			Bool match = GF_FALSE;
+			if (cstr->is_hls) {
+				match = GF_TRUE;
+			} else if (cstr->KIDs[j]) {
+				if (!memcmp(KID, cstr->KIDs[j], 16) || !memcmp(blank_KID, cstr->KIDs[j], 16) ) {
+					match = GF_TRUE;
+				}
+			}
+			if (match) {
+				memcpy(cstr->crypts[i].key, cstr->keys[j], 16);
+				found = GF_TRUE;
+				if (ctx->decrypt==DECRYPT_SKIP) {
+					cstr->crypts[i].key_valid = GF_FALSE;
+				} else {
+					cstr->crypts[i].key_valid = GF_TRUE;
+				}
+				break;
+			}
+		}
+		if (!found) {
+			char szKID[33];
+			//key not yet delivered
+			if (cstr->gpac_master_leaf) {
+				cstr->crypts[i].key_valid = GF_FALSE;
+				continue;
+			}
+
+			szKID[0] = 0;
+			for (j=0; j<16; j++) {
+				char szV[3];
+				sprintf(szV, "%02X", KID[j]);
+				strcat(szKID, szV);
+			}
+			if (ctx->decrypt==DECRYPT_FULL) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Cannot locate key #%d for given KID 0x%s, aborting !\n\tUse '--decrypt=nokey' to force decrypting\n", i+1, szKID));
+				return cstr->key_error = GF_SERVICE_ERROR;
+			}
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC] Cannot locate key #%d for given KID 0x%s, will leave data encrypted\n", i+1, szKID));
+			cstr->crypts[i].key_valid = GF_FALSE;
+		}
 	}
 
-	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CENC_PSSH);
-	if (prop) {
-		pssh_data = (char *) prop->value.data.ptr;
-		pssh_crc = gf_crc_32(prop->value.data.ptr, prop->value.data.size);
+	cstr->key_error = GF_OK;
+	cstr->crypt_init = GF_FALSE;
+	return GF_OK;
+}
+
+static GF_Err cenc_dec_set_hls_key(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, char *key_url, u8 *key_IV)
+{
+	GF_Err e;
+
+	cstr->is_hls = GF_TRUE;
+
+	//copy IV
+	memcpy(cstr->hls_IV, key_IV, sizeof(bin128));
+	//switch key if needed IV
+	if (cstr->hls_key_url && key_url && !strcmp(cstr->hls_key_url, key_url)) {
+		if (cstr->crypt_init)
+			gf_crypt_set_IV(cstr->crypts[0].crypt, cstr->hls_IV, 16);
+		return GF_OK;
 	}
-	if ((cstr->scheme_type==scheme_type) && (cstr->scheme_version==scheme_version) && (cstr->pssh_crc==pssh_crc) )
+
+	if (cstr->hls_key_url) gf_free(cstr->hls_key_url);
+
+	if (!key_url) {
+		cstr->hls_key_url = NULL;
 		return GF_OK;
+	}
+	cstr->hls_key_url = gf_strdup(key_url);
+	if (!cstr->hls_key_url) {
+		return GF_OUT_OF_MEM;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[CENC/HLS] Switching key to %s\n", key_url))
 
-	cstr->scheme_version = scheme_version;
-	cstr->scheme_type = scheme_type;
-	cstr->pssh_crc = pssh_crc;
+	if (ctx->hls_cenc_patch_iv)
+		cstr->force_hls_iv = GF_TRUE;
 
-	if ((scheme_type == GF_ISOM_CENC_SCHEME) || (scheme_type == GF_ISOM_PIFF_SCHEME) || (scheme_type == GF_ISOM_CENS_SCHEME))
-		cstr->is_cenc = GF_TRUE;
-	else
-		cstr->is_cbc = GF_TRUE;
+	cstr->KID_count = 1;
+	cstr->keys = (bin128 *)gf_realloc(cstr->keys, cstr->KID_count*sizeof(bin128));
 
-	cstr->state = is_playing ? DECRYPT_STATE_PLAY : DECRYPT_STATE_SETUP;
-	//ctx->nb_allow_play = 1;
+	if (!strncmp(key_url, "urn:gpac:keys:value:", 20)) {
+		u32 i;
+		u8 *key_data = (u8 *) cstr->keys[0];
+		key_url += 20;
+		if (!strncmp(key_url, "0x", 2)) key_url += 2;
+		i = (u32) strlen(key_url);
+		if (i != 32) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CENC/HLS] key %s not found\n", key_url))
+			return GF_BAD_PARAM;
+		}
+		for (i=0; i<16; i++) {
+			char szV[3];
+			u32 v;
+			szV[0] = key_url[2*i];
+			szV[1] = key_url[2*i + 1];
+			szV[2] = 0;
+			sscanf(szV, "%X", &v);
+			key_data[i] = v;
+		}
+	}
+	//key is local, activate right away
+	else if (gf_url_is_local(key_url)) {
+		FILE *fkey = gf_fopen(key_url, "rb");
+		if (!fkey) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CENC/HLS] key %s not found\n", key_url))
+			return GF_URL_ERROR;
+		} else {
+			u32 read = (u32) gf_fread(cstr->keys[0], 16, fkey);
+			if (read != 16) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CENC/HLS] key %s too short, expecting 16 bytes got %d\n", key_url, read))
+				return GF_BAD_PARAM;
+			}
+			gf_fclose(fkey);
+		}
+	}
+	//load key
+	else {
+		u32 nb_read=0;
+		u8 key_data[100];
+		GF_DownloadManager *dm = gf_filter_get_download_manager(ctx->filter);
+		GF_DownloadSession *sess = gf_dm_sess_new(dm, key_url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED, NULL, NULL, &e);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CENC/HLS] Failed to setup download session for key %s: %s\n", key_url, gf_error_to_string(e)))
+			return e;
+		}
+		while (1) {
+			u32 nread=0;
+			e = gf_dm_sess_fetch_data(sess, key_data + nb_read, 100-nb_read, &nread);
+			nb_read += nread;
+			if (nb_read > 16) break;
+
+			if ((e<0) && (e != GF_IP_NETWORK_EMPTY)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CENC/HLS] Failed to download key %s: %s\n", key_url, gf_error_to_string(e)))
+				return e;
+			}
+			if (e == GF_EOS) {
+				break;
+			}
+		}
+		//first 16 bytes is the key, in some case we have IV repeated after the key (to do ?)
+		if (nb_read <= 32) {
+			memcpy(cstr->keys[0], key_data, sizeof(bin128));
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CENC/HLS] Invalid key size, greater than 16 bytes\n"))
+			return GF_SERVICE_ERROR;
+		}
+	}
 
-	cinfo_prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_DECRYPT_INFO);
-	if (!cinfo_prop) cinfo_prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_CRYPT_INFO);
+	if (!cstr->crypts) {
+		cstr->crypts = gf_malloc(sizeof(CENCDecKey));
+		memset(cstr->crypts, 0, sizeof(CENCDecKey));
+	}
+	memcpy(cstr->crypts[0].key, cstr->keys[0], sizeof(bin128));
+	cstr->crypts[0].key_valid = 1;
+
+	return GF_OK;
+}
+
+static GF_Err cenc_dec_push_iv(GF_CENCDecStream *cstr, u32 key_idx, u8 *IV, u32 iv_size, u32 const_iv_size, const u8 *const_iv);
+
+static GF_Err cenc_dec_load_pssh(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, const GF_PropertyValue *pssh_prop, Bool is_pck_pssh, const GF_PropertyValue *cinfo_prop)
+{
+	u32 i, nb_pssh;
+
+	if (pssh_prop) {
+		gf_bs_reassign_buffer(ctx->bs_r, pssh_prop->value.data.ptr, pssh_prop->value.data.size);
+		nb_pssh = gf_bs_read_u32(ctx->bs_r);
+	} else {
+		nb_pssh = 0;
+	}
 
-	if (pssh_data) gf_bs_reassign_buffer(ctx->bs_r, prop->value.data.ptr, prop->value.data.size);
-	nb_pssh = pssh_data ? gf_bs_read_u32(ctx->bs_r) : 0;
 	for (i = 0; i < nb_pssh; i++) {
-		u8 cypherOffset;
+		u32 cypherOffset;
 		char *enc_data;
 		bin128 cypherKey, cypherIV;
 		GF_Crypt *mc;
 		u32 pos, priv_len;
 		char szSystemID[33];
 		bin128 sysID;
-		u32 j, kid_count;
+		Bool is_leaf_key=GF_FALSE;
+		u32 j, kid_count=0, enc_payload_len;
+		u8 *pssh_data = (u8 *) pssh_prop->value.data.ptr	;
 
 		gf_bs_read_data(ctx->bs_r, sysID, 16);
-		/*version =*/ gf_bs_read_u32(ctx->bs_r);
-		kid_count = gf_bs_read_u32(ctx->bs_r);
+		u32 version = gf_bs_read_u32(ctx->bs_r);
+		if (version)
+			kid_count = gf_bs_read_u32(ctx->bs_r);
 
 		memset(szSystemID, 0, 33);
 		for (j=0; j<16; j++) {
@@ -529,16 +783,34 @@
 		}
 
 		/*SystemID for GPAC Player: 67706163-6365-6E63-6472-6D746F6F6C31*/
-		if (strcmp(szSystemID, "6770616363656E6364726D746F6F6C31")) {
+		if (!strcmp(szSystemID, "6770616363656E6364726D746F6F6C31")) {
+			if (version==2)
+				cstr->gpac_master_leaf = GF_TRUE;
+			else if (version==3)
+				is_leaf_key = GF_TRUE;
+			else if (version==1)
+				cstr->gpac_master_leaf = GF_FALSE;
+			else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Unsupported GPAC DRM config (version %d)\n", version));
+				continue;
+			}
+		}
+		else {
 			if (!cinfo_prop && !ctx->cfile) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] System ID %s not supported\n", szSystemID));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[CENC/ISMA] System ID %s not supported\n", szSystemID));
 			}
-			gf_bs_skip_bytes(ctx->bs_r, kid_count*16);
+			if (version)
+				gf_bs_skip_bytes(ctx->bs_r, kid_count*16);
 			j=gf_bs_read_u32(ctx->bs_r);
 			gf_bs_skip_bytes(ctx->bs_r, j);
 			continue;
 		}
 
+		if (kid_count*16 > gf_bs_available(ctx->bs_r)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Invalid KID count %d in GPAC init blob\n", kid_count));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
 		/*store key IDs*/
 		cstr->KID_count = kid_count;
 		pos = (u32) gf_bs_get_position(ctx->bs_r);
@@ -550,38 +822,172 @@
 		priv_len = gf_bs_read_u32(ctx->bs_r);
 		pos = (u32) gf_bs_get_position(ctx->bs_r);
 
-		/*GPAC DRM TEST system info, used to validate cypher offset in CENC packager
-			keyIDs as usual (before private data)
-			URL len on 8 bits
-			URL
-			keys, cyphered with our magic key :)
-		*/
-		cypherOffset = pssh_data[pos] + 1;
-		gf_bin128_parse("0x6770616363656E6364726D746F6F6C31", cypherKey);
-		gf_bin128_parse("0x00000000000000000000000000000001", cypherIV);
-
-		mc = gf_crypt_open(GF_AES_128, GF_CTR);
-		if (!mc) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
-			return GF_IO_ERR;
+		if (gf_bs_available(ctx->bs_r) < priv_len) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Invalid private len %d in GPAC init blob\n", priv_len));
+			return GF_NON_COMPLIANT_BITSTREAM;
 		}
-		enc_data = gf_malloc(priv_len - cypherOffset);
-		memcpy(enc_data, pssh_data + pos + cypherOffset, priv_len - cypherOffset);
-		gf_crypt_init(mc, cypherKey, cypherIV);
-		gf_crypt_decrypt(mc, enc_data, priv_len - cypherOffset);
-		gf_crypt_close(mc);
 
-		memmove(cstr->keys, enc_data, cstr->KID_count*sizeof(bin128));
-		gf_bs_skip_bytes(ctx->bs_r, cstr->KID_count*sizeof(bin128));
-		gf_free(enc_data);
+		if (is_leaf_key) {
+			if (gf_bs_available(ctx->bs_r) < 16) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Invalid GPAC init blob for leaf key\n", kid_count));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			memmove(cstr->keys, pssh_data + pos, cstr->KID_count*sizeof(bin128));
+		} else {
+			/*GPAC DRM TEST system info, used to validate cypher offset in CENC packager
+				keyIDs as usual (before private data)
+				URL len on 8 bits
+				URL
+				keys, cyphered with our magic key :)
+			*/
+			cypherOffset = pssh_data[pos] + 1;
+
+			if (priv_len < cypherOffset) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Invalid cypher offset %d in GPAC init blob\n", cypherOffset));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+
+			gf_bin128_parse("0x6770616363656E6364726D746F6F6C31", cypherKey);
+			gf_bin128_parse("0x00000000000000000000000000000001", cypherIV);
+
+			enc_payload_len = priv_len - cypherOffset;
+			if ((priv_len < cypherOffset) || (enc_payload_len < (u32) (cstr->KID_count*sizeof(bin128)))) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Invalid GPAC init blob\n"));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+
+			mc = gf_crypt_open(GF_AES_128, GF_CTR);
+			if (!mc) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
+				return GF_IO_ERR;
+			}
+			enc_data = gf_malloc(priv_len - cypherOffset);
+			memcpy(enc_data, pssh_data + pos + cypherOffset, priv_len - cypherOffset);
+
+			gf_crypt_init(mc, cypherKey, cypherIV);
+			gf_crypt_decrypt(mc, enc_data, priv_len - cypherOffset);
+			gf_crypt_close(mc);
+
+			memmove(cstr->keys, enc_data, cstr->KID_count*sizeof(bin128));
+			gf_bs_skip_bytes(ctx->bs_r, cstr->KID_count*sizeof(bin128));
+			gf_free(enc_data);
+		}
+
+		if (cstr->gpac_master_leaf && !is_leaf_key) {
+			if (!cstr->KID_count) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] No master key found for gpac test DRM\n"));
+				return GF_NON_COMPLIANT_BITSTREAM;
+
+			}
+			memcpy(cstr->master_key, cstr->keys[0], sizeof(bin128));
+			cstr->KID_count = 0;
+			return GF_OK;
+		}
+		if (is_leaf_key) {
+			u32 j;
+			for (j=0; j<cstr->KID_count; j++) {
+				GF_Crypt *crypto = gf_crypt_open(GF_AES_128, GF_CBC);
+				if (!crypto) return GF_OUT_OF_MEM;
+				gf_crypt_init(crypto, cstr->master_key, NULL);
+				gf_crypt_decrypt(crypto, cstr->keys[j], 16);
+				gf_crypt_close(crypto);
+			}
+		}
+		return cenc_dec_load_keys(ctx, cstr);
+	}
+
+	return GF_NOT_FOUND;
+}
+
+static GF_Err cenc_dec_setup_cenc(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, u32 scheme_type, u32 scheme_version, const char *scheme_uri, const char *kms_uri)
+{
+	GF_Err e;
+	GF_CryptInfo *cinfo=NULL;
+	u32 i, pssh_crc=0, ki_crc=0;
+	const GF_PropertyValue *prop, *cinfo_prop, *pssh_prop;
+	GF_FilterPid *pid = cstr->ipid;
+	Bool is_playing = (cstr->state == DECRYPT_STATE_PLAY) ? GF_TRUE : GF_FALSE;
+
+	cstr->state = DECRYPT_STATE_ERROR;
+
+	if ((scheme_type != GF_ISOM_CENC_SCHEME)
+		&& (scheme_type != GF_ISOM_CBC_SCHEME)
+		&& (scheme_type != GF_ISOM_CENS_SCHEME)
+		&& (scheme_type != GF_ISOM_CBCS_SCHEME)
+		&& (scheme_type != GF_ISOM_PIFF_SCHEME)
+		&& (scheme_type != GF_HLS_SAMPLE_AES_SCHEME)
+	)
+		return GF_NOT_SUPPORTED;
+
+	if (scheme_version != 0x00010000) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC/ISMA] Invalid scheme version %08X for scheme type %s, results might be wrong\n", scheme_version, gf_4cc_to_str(scheme_type) ));
+	}
+
+	pssh_prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CENC_PSSH);
+	if (pssh_prop) {
+		pssh_crc = gf_crc_32(pssh_prop->value.data.ptr, pssh_prop->value.data.size);
+	}
+
+	cstr->cenc_pattern = gf_filter_pid_get_property(pid, GF_PROP_PID_CENC_PATTERN);
+	if (cstr->cenc_pattern && (!cstr->cenc_pattern->value.frac.num || !cstr->cenc_pattern->value.frac.den))
+		cstr->cenc_pattern = NULL;
+
+	ki_crc = 0;
+	if (cstr->cenc_ki) {
+		ki_crc = gf_crc_32(cstr->cenc_ki->value.data.ptr, cstr->cenc_ki->value.data.size);
+	}
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CENC_KEY_INFO);
+	if (prop) {
+		cstr->cenc_ki = prop;
+		cstr->multikey = 0;
+		if (prop->value.data.ptr[0]) {
+			cstr->multikey = prop->value.data.ptr[1];
+			cstr->multikey <<= 8;
+			cstr->multikey |= prop->value.data.ptr[2];
+		}
+		u32 new_crc = gf_crc_32(cstr->cenc_ki->value.data.ptr, cstr->cenc_ki->value.data.size);
+
+		//change of key config and same pssh, setup single key
+		if ((new_crc != ki_crc) && (pssh_crc==cstr->pssh_crc)) {
+			e = cenc_dec_load_keys(ctx, cstr);
+			if (e) return e;
+		}
+		//if no pssh or pssh change we setup the key later
+		//and if same key/pssh nothing to do for crypto reinit
+	} else {
+		cstr->cenc_ki = NULL;
+	}
+
+	cstr->state = is_playing ? DECRYPT_STATE_PLAY : DECRYPT_STATE_SETUP;
+
+	if ((cstr->scheme_type==scheme_type) && (cstr->scheme_version==scheme_version) && (cstr->pssh_crc==pssh_crc) )
 		return GF_OK;
+
+	cstr->scheme_version = scheme_version;
+	cstr->scheme_type = scheme_type;
+	cstr->pssh_crc = pssh_crc;
+
+	if ((scheme_type == GF_ISOM_CENC_SCHEME) || (scheme_type == GF_ISOM_PIFF_SCHEME) || (scheme_type == GF_ISOM_CENS_SCHEME))
+		cstr->is_cenc = GF_TRUE;
+	else
+		cstr->is_cbc = GF_TRUE;
+
+	cinfo_prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_DECRYPT_INFO);
+	if (!cinfo_prop) cinfo_prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_CRYPT_INFO);
+
+	if (pssh_prop) {
+		e = cenc_dec_load_pssh(ctx, cstr, pssh_prop, GF_FALSE, cinfo_prop);
+		if (e==GF_NOT_FOUND) {
+			e = GF_OK;
+		} else {
+			return e;
+		}
 	}
 
 	if (cinfo_prop) {
-		GF_Err e;
 		cinfo = gf_crypt_info_load(cinfo_prop->value.string, &e);
 		if (!cinfo) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Failed to open crypt info file %s\n", cinfo_prop->value.string));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Failed to open crypt info file %s\n", cinfo_prop->value.string));
 			return e;
 		}
 	}
@@ -604,24 +1010,92 @@
 		if (!tci && any_tci) tci = any_tci;
 
 		if (tci) {
-			cstr->KID_count = tci->KID_count;
-			cstr->KIDs = (bin128 *)gf_realloc(cstr->KIDs, tci->KID_count*sizeof(bin128));
-			cstr->keys = (bin128 *)gf_realloc(cstr->keys, tci->KID_count*sizeof(bin128));
-			for (i=0; i<tci->KID_count; i++) {
-				memcpy(cstr->KIDs[i], tci->KIDs[i], sizeof(bin128));
-				memcpy(cstr->keys[i], tci->keys[i], sizeof(bin128));
+			cstr->KID_count = tci->nb_keys;
+			cstr->KIDs = (bin128 *)gf_realloc(cstr->KIDs, tci->nb_keys*sizeof(bin128));
+			cstr->keys = (bin128 *)gf_realloc(cstr->keys, tci->nb_keys*sizeof(bin128));
+			for (i=0; i<tci->nb_keys; i++) {
+				memcpy(cstr->KIDs[i], tci->keys[i].KID, sizeof(bin128));
+				memcpy(cstr->keys[i], tci->keys[i].key, sizeof(bin128));
+				memcpy(cstr->hls_IV, tci->keys[i].IV, sizeof(bin128));
 			}
 			if (cinfo != ctx->cinfo)
 				gf_crypt_info_del(cinfo);
-			return GF_OK;
+
+			return cenc_dec_load_keys(ctx, cstr);
 		}
 		if (cinfo != ctx->cinfo)
 			gf_crypt_info_del(cinfo);
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] No supported system ID, no key found\n"));
-	return GF_NOT_SUPPORTED;
+
+	if (ctx->keys.nb_items) {
+		return GF_OK;
+	}
+
+	cinfo_prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_HLS_KMS);
+	prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_HLS_IV);
+
+	if (cinfo_prop && prop) {
+		e = cenc_dec_set_hls_key(ctx, cstr, cinfo_prop->value.string, prop->value.data.ptr);
+		if (!e) return GF_OK;
+	}
+
+	if (ctx->decrypt!=DECRYPT_FULL) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC/ISMA] No keys found but playback forced\n"));
+		return GF_OK;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] No key found, aborting!\n\tUse '--decrypt=nokey' to force decrypting\n"));
+	return GF_FILTER_NOT_SUPPORTED;
 }
 
+static GF_Err cenc_dec_hls_saes(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, u32 scheme_type, u32 scheme_version, const char *scheme_uri, const char *kms_uri)
+{
+	GF_Err e;
+	const GF_PropertyValue *prop, *cinfo_prop;
+	GF_FilterPid *pid = cstr->ipid;
+	Bool is_playing = (cstr->state == DECRYPT_STATE_PLAY) ? GF_TRUE : GF_FALSE;
+
+	cstr->state = DECRYPT_STATE_ERROR;
+
+	cstr->cenc_pattern = gf_filter_pid_get_property(pid, GF_PROP_PID_CENC_PATTERN);
+	if (cstr->cenc_pattern && (!cstr->cenc_pattern->value.frac.num || !cstr->cenc_pattern->value.frac.den))
+		cstr->cenc_pattern = NULL;
+
+	cstr->state = is_playing ? DECRYPT_STATE_PLAY : DECRYPT_STATE_SETUP;
+	cstr->is_cbc = GF_TRUE;
+	cstr->is_hls_saes = GF_TRUE;
+	prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_CODECID);
+	if (!prop) return GF_NON_COMPLIANT_BITSTREAM;
+	cstr->codec_id = prop->value.uint;
+
+	cinfo_prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_HLS_KMS);
+	prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_HLS_IV);
+
+	if (cinfo_prop && prop) {
+		e = cenc_dec_set_hls_key(ctx, cstr, cinfo_prop->value.string, prop->value.data.ptr);
+		if (!e) return GF_OK;
+	}
+	prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_ISOM_SUBTYPE);
+	if (!prop) prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_DECRYPT_INFO);
+	if (prop || ctx->cinfo) {
+		e = cenc_dec_setup_cenc(ctx, cstr, scheme_type, scheme_version, scheme_uri, kms_uri);
+		if (e) return e;
+		if (!cstr->cenc_ki && cstr->nb_crypts && cstr->crypts[0].crypt && !cstr->crypts[0].key_valid) {
+			bin128 IV;
+			memcpy(cstr->crypts[0].key, cstr->keys[0], 16);
+			cenc_dec_push_iv(cstr, 0, IV, 0, 16, cstr->hls_IV);
+		}
+		return GF_OK;
+	}
+
+	if (ctx->decrypt!=DECRYPT_FULL) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC/ISMA] No keys found but playback forced\n"));
+		return GF_OK;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] No key found, aborting!\n\tUse '--decrypt=nokey' to force decrypting\n"));
+	return GF_FILTER_NOT_SUPPORTED;
+}
+
+
 static GF_Err cenc_dec_setup_adobe(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, u32 scheme_type, u32 scheme_version, const char *scheme_uri, const char *kms_uri)
 {
 	GF_CryptInfo *cinfo=NULL;
@@ -648,7 +1122,7 @@
 		GF_Err e;
 		cinfo = gf_crypt_info_load(prop->value.string, &e);
 		if (!cinfo) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Failed to open crypt info file %s\n", prop->value.string));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Failed to open crypt info file %s\n", prop->value.string));
 			return e;
 		}
 	}
@@ -671,12 +1145,12 @@
 		if (!tci && any_tci) tci = any_tci;
 
 		if (tci) {
-			cstr->KID_count = tci->KID_count;
-			cstr->KIDs = (bin128 *)gf_realloc(cstr->KIDs, tci->KID_count*sizeof(bin128));
-			cstr->keys = (bin128 *)gf_realloc(cstr->keys, tci->KID_count*sizeof(bin128));
-			for (i=0; i<tci->KID_count; i++) {
-				memcpy(cstr->KIDs[i], tci->KIDs[i], sizeof(bin128));
-				memcpy(cstr->keys[i], tci->keys[i], sizeof(bin128));
+			cstr->KID_count = tci->nb_keys;
+			cstr->KIDs = (bin128 *)gf_realloc(cstr->KIDs, tci->nb_keys*sizeof(bin128));
+			cstr->keys = (bin128 *)gf_realloc(cstr->keys, tci->nb_keys*sizeof(bin128));
+			for (i=0; i<tci->nb_keys; i++) {
+				memcpy(cstr->KIDs[i], tci->keys[i].KID, sizeof(bin128));
+				memcpy(cstr->keys[i], tci->keys[i].key, sizeof(bin128));
 			}
 			if (cinfo != ctx->cinfo)
 				gf_crypt_info_del(cinfo);
@@ -685,34 +1159,38 @@
 		if (cinfo != ctx->cinfo)
 			gf_crypt_info_del(cinfo);
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] No supported system ID, no key found\n"));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC/ISMA] No supported system ID, no key found\n"));
 	return GF_NOT_SUPPORTED;
 }
 
 static GF_Err cenc_dec_access_cenc(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, Bool is_play)
 {
+	u32 i;
 	if (is_play) {
 		if (cstr->state != DECRYPT_STATE_SETUP)
 			return GF_SERVICE_ERROR;
-		assert(!cstr->crypt);
 
 		//if (!ctx->nb_allow_play) return GF_AUTHENTICATION_FAILURE;
 		//ctx->nb_allow_play--;
 
 		/*open decrypter - we do NOT initialize decrypter; it wil be done when we decrypt the first crypted sample*/
-		if (cstr->is_cenc)
-			cstr->crypt = gf_crypt_open(GF_AES_128, GF_CTR);
-		else
-			cstr->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
-		if (!cstr->crypt) return GF_IO_ERR;
-
+		for (i=0; i<cstr->nb_crypts; i++) {
+			assert(!cstr->crypts[i].crypt);
+			if (cstr->is_cenc)
+				cstr->crypts[i].crypt = gf_crypt_open(GF_AES_128, GF_CTR);
+			else
+				cstr->crypts[i].crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+			if (!cstr->crypts[i].crypt) return GF_IO_ERR;
+		}
 		cstr->state = DECRYPT_STATE_PLAY;
 		return GF_OK;
 	} else {
 		if (cstr->state != DECRYPT_STATE_PLAY)
 			return GF_SERVICE_ERROR;
-		if (cstr->crypt) gf_crypt_close(cstr->crypt);
-		cstr->crypt = NULL;
+		for (i=0; i<cstr->nb_crypts; i++) {
+			if (cstr->crypts[i].crypt) gf_crypt_close(cstr->crypts[i].crypt);
+			cstr->crypts[i].crypt = NULL;
+		}
 		cstr->state = DECRYPT_STATE_SETUP;
 		return GF_OK;
 	}
@@ -724,59 +1202,104 @@
 	if (is_play) {
 		if (cstr->state != DECRYPT_STATE_SETUP)
 			return GF_SERVICE_ERROR;
-		assert(!cstr->crypt);
+		assert(!cstr->crypts[0].crypt);
 
-		cstr->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
-		if (!cstr->crypt) return GF_IO_ERR;
+		cstr->crypts[0].crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+		if (!cstr->crypts[0].crypt) return GF_IO_ERR;
 
 		cstr->state = DECRYPT_STATE_PLAY;
 		return GF_OK;
 	} else {
 		if (cstr->state != DECRYPT_STATE_PLAY)
 			return GF_SERVICE_ERROR;
-		if (cstr->crypt) gf_crypt_close(cstr->crypt);
-		cstr->crypt = NULL;
+		if (cstr->crypts[0].crypt) gf_crypt_close(cstr->crypts[0].crypt);
+		cstr->crypts[0].crypt = NULL;
 		cstr->state = DECRYPT_STATE_SETUP;
 		return GF_OK;
 	}
 	return GF_BAD_PARAM;
 }
 
+static GF_Err cenc_dec_push_iv(GF_CENCDecStream *cstr, u32 key_idx, u8 *IV, u32 iv_size, u32 const_iv_size, const u8 *const_iv)
+{
+	GF_Err e;
+
+	if (!cstr->crypt_init) {
+		if (const_iv) {
+			memcpy(IV, const_iv, const_iv_size);
+		}
+		e = gf_crypt_init(cstr->crypts[key_idx].crypt, cstr->crypts[key_idx].key, IV);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Cannot initialize AES-128 AES-128 %s (%s)\n", cstr->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
+			return GF_IO_ERR;
+		}
+	} else {
+		//always restore IV at beginning of sample regardless of the mode (const IV or IV CBC or CTR)
+		if (!cstr->is_cbc) {
+			if (!iv_size)
+				iv_size = const_iv_size;
+
+			memmove(&IV[1], &IV[0], sizeof(char) * iv_size);
+			IV[0] = 0;	/*begin of counter*/
+			e = gf_crypt_set_IV(cstr->crypts[key_idx].crypt, IV, 17);
+		} else {
+			if (const_iv) {
+				if (cstr->force_hls_iv) {
+					memcpy(IV, cstr->hls_IV, sizeof(bin128));
+				} else {
+					memcpy(IV, const_iv, const_iv_size);
+				}
+			}
+			e = gf_crypt_set_IV(cstr->crypts[key_idx].crypt, IV, 16);
+		}
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Cannot set key AES-128 %s (%s)\n", cstr->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
+			return e;
+		}
+	}
+	return GF_OK;
+}
+
+u8 key_info_get_iv_size(const u8 *key_info, u32 nb_keys, u32 idx, u8 *const_iv_size, const u8 **const_iv);
+
 
 static GF_Err cenc_dec_process_cenc(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, GF_FilterPacket *in_pck)
 {
-	GF_Err e;
-	char IV[17];
-	bin128 KID;
-	u32 i, subsample_count;
+	GF_Err e = GF_OK;
+	u32 subsample_count;
 	u32 data_size;
 	u8 *out_data;
 	const char *sai_payload=NULL;
 	u32 saiz=0;
-	u32 IV_size;
-	Bool crypt_reinit = GF_FALSE;
+	u32 min_sai_size_subs = 6;
 	GF_FilterPacket *out_pck;
-	const GF_PropertyValue *prop, *const_IV=NULL, *cbc_pattern=NULL;
+	const GF_PropertyValue *prop;
+	u32 skey_const_iv_size = 0;
+	Bool has_subsamples = GF_FALSE;
+	const u8 *skey_const_iv = NULL;
 
-	if (!cstr->crypt)
+	//packet has been fetched, we now MUST have a key info
+	if (!cstr->cenc_ki) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Packet encrypted but no KID info\n" ) );
 		return GF_SERVICE_ERROR;
+	}
 
+	prop = gf_filter_pck_get_property(in_pck, GF_PROP_PID_CENC_PSSH);
+	if (prop && (prop->type==GF_PROP_DATA) && prop->value.data.ptr) {
+		cenc_dec_load_pssh(ctx, cstr, prop, GF_TRUE, NULL);
+	}
 	gf_filter_pck_get_data(in_pck, &data_size);
 
 	if (!data_size || ! gf_filter_pck_get_crypt_flags(in_pck)) {
-		out_pck = gf_filter_pck_new_ref(cstr->opid, NULL, 0, in_pck);
+		out_pck = gf_filter_pck_new_ref(cstr->opid, 0, 0, in_pck);
+		if (!out_pck) return GF_OUT_OF_MEM;
 		gf_filter_pck_merge_properties(in_pck, out_pck);
 		gf_filter_pck_set_property(out_pck, GF_PROP_PCK_CENC_SAI, NULL);
 		gf_filter_pck_set_crypt_flags(out_pck, 0);
 		gf_filter_pck_send(out_pck);
 		return GF_OK;
 	}
-	prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_KID);
-	if (!prop) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Packet encrypted but no KID info\n" ) );
-		return GF_SERVICE_ERROR;
-	}
-	memcpy(KID, prop->value.data.ptr, 16);
+
 
 	prop = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_CENC_SAI);
 	if (prop) {
@@ -787,145 +1310,198 @@
 
 	//CENC can use inplace processing for decryption
 	out_pck = gf_filter_pck_new_clone(cstr->opid, in_pck, &out_data);
-	if (!out_pck) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Failed to allocated/clone packet for decrypting payload\n" ) );
-		gf_filter_pid_drop_packet(cstr->ipid);
-		return GF_SERVICE_ERROR;
-	}
-
-	//memset to 0 in case we use <16 byte key
-	memset(IV, 0, sizeof(char)*17);
-	prop = NULL;
-	if (sai_payload)
-		prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_CENC_IV_SIZE);
-
-	if (!prop) {
-		const_IV = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_CENC_IV_CONST);
-		IV_size = 0;
-	} else {
-		IV_size = prop->value.uint;
-	}
-	if (!sai_payload && !const_IV) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Packet encrypted but no SAI info nor constant IV\n" ) );
-		return GF_SERVICE_ERROR;
-
-	}
-	
-	cbc_pattern = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_CENC_PATTERN);
+	if (!out_pck) return GF_OUT_OF_MEM;
 
-	/*read sample auxiliary information from bitstream*/
 	subsample_count = 0;
-	if (sai_payload) {
-		gf_bs_read_data(ctx->bs_r, (char *) IV, IV_size);
 
-		if (gf_bs_available(ctx->bs_r))
-			subsample_count = gf_bs_read_u16(ctx->bs_r);
-	}
+	if (cstr->multikey) {
+		u8 IV[17];
+		u32 k, nb_iv_init;
+		min_sai_size_subs = 8;
+		if (!sai_payload
+			//we need at least 2bytes for IV counts and 4 for nb_subsamples, mandatory in multikey
+			|| (gf_bs_available(ctx->bs_r) < 6 )
+		) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Multikey with no associated auxiliary info !\n" ) );
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			goto exit;
+		}
+		nb_iv_init = gf_bs_read_u16(ctx->bs_r);
+		//init all non-const IV listed
+		for (k=0; k<nb_iv_init; k++) {
+			u8 IV_size;
+			u32 kidx = gf_bs_read_u16(ctx->bs_r);
+
+			if (!kidx || (kidx>cstr->nb_crypts)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Corrupted CENC sai, kidx %d but valid range is [1,%d]\n", kidx, cstr->nb_crypts));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+			IV_size = key_info_get_iv_size(cstr->cenc_ki->value.data.ptr, cstr->cenc_ki->value.data.size, kidx, NULL, NULL);
+			if (!IV_size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] invalid SAI multikey with IV size 0\n" ));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+			//memset to 0 in case we use <16 byte key
+			memset(IV, 0, sizeof(u8)*17);
+			gf_bs_read_data(ctx->bs_r, IV, IV_size);
 
-	if (const_IV) IV_size = const_IV->value.data.size;
+			e = cenc_dec_push_iv(cstr, kidx-1, IV, IV_size, 0, NULL);
+			if (e) goto exit;
+		}
+		if (nb_iv_init < cstr->multikey) {
+			//init all const IV listed
+			for (k=0; k<cstr->multikey; k++) {
+				u8 const_iv_size;
+				const u8 *const_iv=NULL;
+				u8 IV_size = key_info_get_iv_size(cstr->cenc_ki->value.data.ptr, cstr->cenc_ki->value.data.size, k+1, &const_iv_size, &const_iv);
+				if (IV_size) continue;
+				memset(IV, 0, sizeof(char)*17);
+				e = cenc_dec_push_iv(cstr, k, IV, 0, const_iv_size, const_iv);
+				if (e) goto exit;
+			}
+		}
+	} else {
+		u8 IV[17];
+		u32 iv_size = 0;
 
-	if (strncmp(cstr->kid, KID, 16)) {
-		bin128 blank_KID;
-		Bool found = GF_FALSE;
-		memcpy(cstr->kid, KID, 16);
-		memset(blank_KID, 0, 16);
-		for (i = 0; i < cstr->KID_count; i++) {
-			if (!strncmp((const char *)KID, (const char *)cstr->KIDs[i], 16)
-			 || !strncmp((const char *)blank_KID, (const char *)cstr->KIDs[i], 16)
-			) {
-				memcpy(cstr->key, cstr->keys[i], 16);
-				found = GF_TRUE;
-				break;
+		//check single key IV is OK - in multikey we ALWAYS have SAI payload
+		if (sai_payload) {
+			iv_size = cstr->cenc_ki->value.data.ptr[3];
+		}
+		if (!iv_size) {
+			if (! cstr->cenc_ki->value.data.ptr[3]) {
+				skey_const_iv_size = cstr->cenc_ki->value.data.ptr[20];
 			}
 		}
-		if (!found) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot locate key with given KID !\n" ));
-			cstr->key_error = e = GF_SERVICE_ERROR;
-			goto exit;
+
+		if (!sai_payload && !skey_const_iv_size) {
+			if (ctx->decrypt == DECRYPT_SKIP) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC] Packet encrypted but no SAI info nor constant IV\n" ) );
+				e = GF_OK;
+				goto send_packet;
+			}
+			if (gf_filter_pck_get_crypt_flags(in_pck)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Packet encrypted but no SAI info nor constant IV\n" ) );
+			}
+			return GF_SERVICE_ERROR;
 		}
-		cstr->key_error = GF_OK;
-		crypt_reinit = GF_TRUE;
-		cstr->crypt_init =GF_TRUE;
-	}
-	if (!cstr->crypt_init) {
-		crypt_reinit = GF_TRUE;
-		cstr->crypt_init = GF_TRUE;
+
+		//memset to 0 in case we use <16 byte key
+		memset(IV, 0, sizeof(char)*17);
+		if (sai_payload) {
+			if (iv_size)
+				gf_bs_read_data(ctx->bs_r, IV, iv_size);
+		}
+
+		if (skey_const_iv_size)
+			skey_const_iv = cstr->cenc_ki->value.data.ptr+21;
+
+		e = cenc_dec_push_iv(cstr, 0, IV, iv_size, skey_const_iv_size, skey_const_iv);
+		if (e) goto exit;
 	}
+	cstr->crypt_init = GF_TRUE;
+
 	if (cstr->key_error) {
 		e = cstr->key_error;
 		goto exit;
 	}
 
-	if (crypt_reinit) {
-		if (const_IV) {
-			memcpy(IV, const_IV->value.data.ptr, const_IV->value.data.size);
-		}
-		e = gf_crypt_init(cstr->crypt, cstr->key, IV);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 AES-128 %s (%s)\n", cstr->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
-			e = GF_IO_ERR;
-			goto exit;
-		}
+	if (cstr->multikey) {
+		subsample_count = gf_bs_read_u32(ctx->bs_r);
+		has_subsamples = GF_TRUE;
 	} else {
-		//always restore IV at begining of sample regardless of the mode (const IV or IV CBC or CTR
-		if (!cstr->is_cbc) {
-			memmove(&IV[1], &IV[0], sizeof(char) * IV_size);
-			IV[0] = 0;	/*begin of counter*/
-			e = gf_crypt_set_IV(cstr->crypt, IV, 17);
-		} else {
-		 	if (const_IV) {
-				memcpy(IV, const_IV->value.data.ptr, const_IV->value.data.size);
-			}
-			e = gf_crypt_set_IV(cstr->crypt, IV, 16);
-		}
-
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", cstr->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
-			e = GF_IO_ERR;
-			goto exit;
+		if (sai_payload && gf_bs_available(ctx->bs_r)) {
+			subsample_count = gf_bs_read_u16(ctx->bs_r);
+			has_subsamples = GF_TRUE;
 		}
 	}
+	if (has_subsamples && !subsample_count) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC] Subsample field present but no subsamples indicated, assuming clear payload\n"));
+		goto send_packet;
+	}
 
-	//sub-sample encryption
-	if (subsample_count) {
+	//sub-sample encryption, always on for multikey
+	if (subsample_count || cstr->multikey) {
 		u32 cur_pos = 0;
 
 		while (cur_pos < data_size) {
+			u8 const_iv_size=0;
+			const u8 *const_iv=NULL;
+			u32 kidx = 0;
 			u32 bytes_clear_data, bytes_encrypted_data;
 			if (subsample_count==0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Corrupted CENC sai, not enough subsamples described\n" ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Corrupted CENC sai, not enough subsamples described\n" ));
 				e = GF_NON_COMPLIANT_BITSTREAM;
 				goto exit;
 			}
-			if (gf_bs_available(ctx->bs_r) < 6) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Corrupted CENC sai, not enough bytes in subsample info\n" ));
+			if (gf_bs_available(ctx->bs_r) < min_sai_size_subs) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Corrupted CENC sai, not enough bytes in subsample info\n" ));
 				e = GF_NON_COMPLIANT_BITSTREAM;
 				goto exit;
 			}
-			bytes_clear_data = gf_bs_read_u16(ctx->bs_r);
-			bytes_encrypted_data = gf_bs_read_u32(ctx->bs_r);
+			if (cstr->multikey) {
+				kidx = gf_bs_read_u16(ctx->bs_r);
+				//check index is valid
+				if (kidx>cstr->nb_crypts) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Corrupted CENC sai key idx %d, should be in range [1, %d]\n", kidx, cstr->nb_crypts));
+					e = GF_NON_COMPLIANT_BITSTREAM;
+					goto exit;
+				}
+				bytes_clear_data = gf_bs_read_u16(ctx->bs_r);
+				bytes_encrypted_data = gf_bs_read_u32(ctx->bs_r);
+
+				if (kidx) {
+					key_info_get_iv_size(cstr->cenc_ki->value.data.ptr, cstr->cenc_ki->value.data.size, kidx, &const_iv_size, &const_iv);
+					kidx-=1;
+				}
+				//to clarify in the spec: kidx 0 should be allowed for clear subsamples
+				else if (bytes_encrypted_data) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Corrupted CENC sai key idx 0 but encrypted payload\n", cstr->nb_crypts));
+					e = GF_NON_COMPLIANT_BITSTREAM;
+					goto exit;
+				}
+			} else {
+				const_iv = skey_const_iv;
+				const_iv_size = skey_const_iv_size;
+				bytes_clear_data = gf_bs_read_u16(ctx->bs_r);
+				bytes_encrypted_data = gf_bs_read_u32(ctx->bs_r);
+			}
+
 			subsample_count--;
 
-			if (const_IV) {
-				memmove(IV, const_IV->value.data.ptr, const_IV->value.data.size);
-				if (const_IV->value.data.size == 8)
+			//const IV is applied at each subsample
+			if (const_iv_size) {
+				u8 IV[17];
+				memcpy(IV, const_iv, const_iv_size);
+				if (const_iv_size == 8)
 					memset(IV+8, 0, sizeof(char)*8);
-				gf_crypt_set_IV(cstr->crypt, IV, 16);
+
+				if (cstr->force_hls_iv)
+					memcpy(IV, cstr->hls_IV, sizeof(bin128));
+
+				gf_crypt_set_IV(cstr->crypts[kidx].crypt, IV, 16);
 			}
 			if (cur_pos + bytes_clear_data + bytes_encrypted_data > data_size) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Corrupted CENC sai, subsample info describe more bytes (%d) than in packet (%d)\n", cur_pos + bytes_clear_data + bytes_encrypted_data , data_size ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Corrupted CENC sai, subsample info describe more bytes (%d) than in packet (%d)\n", cur_pos + bytes_clear_data + bytes_encrypted_data , data_size ));
 				e = GF_NON_COMPLIANT_BITSTREAM;
 				goto exit;
 			}
 			/*skip clear data*/
 			cur_pos += bytes_clear_data;
 
+			if (!cstr->crypts[kidx].key_valid) {
+				cur_pos += bytes_encrypted_data;
+				continue;
+			}
+
 			//pattern decryption
-			if (cbc_pattern && cbc_pattern->value.frac.den && cbc_pattern->value.frac.num) {
+			if (cstr->cenc_pattern) {
 				u32 pos = cur_pos;
 				u32 res = bytes_encrypted_data;
-				u32 skip_byte_block = cbc_pattern->value.frac.num;
-				u32 crypt_byte_block = cbc_pattern->value.frac.den;
+				u32 cryp_block = 16 * cstr->cenc_pattern->value.frac.den;
+				u32 full_block = 16 * (cstr->cenc_pattern->value.frac.den + cstr->cenc_pattern->value.frac.num);
 
 				if (cstr->is_cbc) {
 					u32 clear_trailing = res % 16;
@@ -933,10 +1509,11 @@
 				}
 
 				while (res) {
-					gf_crypt_decrypt(cstr->crypt, out_data + pos, res >= (u32) (16* crypt_byte_block) ? 16* crypt_byte_block : res);
-					if (res >= (u32) (16 * (crypt_byte_block + skip_byte_block))) {
-						pos += 16 * (crypt_byte_block + skip_byte_block);
-						res -= 16 * (crypt_byte_block + skip_byte_block);
+					gf_crypt_decrypt(cstr->crypts[kidx].crypt, out_data + pos, (res >= cryp_block) ? cryp_block : res);
+					if (res >= full_block) {
+						pos += full_block;
+						assert(res>=full_block);
+						res -= full_block;
 					} else {
 						res = 0;
 					}
@@ -944,23 +1521,33 @@
 			}
 			//full subsample decryption
 			else {
-				gf_crypt_decrypt(cstr->crypt, out_data+cur_pos, bytes_encrypted_data);
+				u32 res = bytes_encrypted_data;
+				//trailing will be 0 in cbc1 (as cbc1 mandates bytes_encrypted_data % 16 == 0)
+				//but can be non-0 in cbcs NALU-based without pattern (not defined in CENC)
+				//in this case, we must only decrypt a multiple of 16-byte blocks
+				//note that vpX cbcs mandates bytes_encrypted_data % 16 == 0, as cbc1
+				if (cstr->is_cbc) {
+					u32 clear_trailing = res % 16;
+					res -= clear_trailing;
+				}
+				gf_crypt_decrypt(cstr->crypts[kidx].crypt, out_data+cur_pos, res);
 			}
 			cur_pos += bytes_encrypted_data;
 		}
 	}
-	//full sample encryption
+	//full sample encryption in single key mode
 	else {
 		if (cstr->is_cenc) {
-			gf_crypt_decrypt(cstr->crypt, out_data, data_size);
+			gf_crypt_decrypt(cstr->crypts[0].crypt, out_data, data_size);
 		} else {
 			u32 ret = data_size % 16;
 			if (data_size >= 16) {
-				gf_crypt_decrypt(cstr->crypt, out_data, data_size-ret);
+				gf_crypt_decrypt(cstr->crypts[0].crypt, out_data, data_size-ret);
 			}
 		}
 	}
 
+send_packet:
 	gf_filter_pck_merge_properties(in_pck, out_pck);
 	gf_filter_pck_set_property(out_pck, GF_PROP_PCK_CENC_SAI, NULL);
 	gf_filter_pck_set_crypt_flags(out_pck, 0);
@@ -974,6 +1561,178 @@
 	return e;
 }
 
+static GF_Err cenc_dec_process_hls_saes(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, GF_FilterPacket *in_pck)
+{
+	GF_Err e = GF_OK;
+	u32 data_size;
+	u8 *out_data;
+	GF_FilterPacket *out_pck;
+
+	gf_filter_pck_get_data(in_pck, &data_size);
+
+	if (!data_size) {
+		out_pck = gf_filter_pck_new_ref(cstr->opid, 0, 0, in_pck);
+		if (!out_pck) return GF_OUT_OF_MEM;
+		gf_filter_pck_merge_properties(in_pck, out_pck);
+		gf_filter_pck_set_property(out_pck, GF_PROP_PCK_CENC_SAI, NULL);
+		gf_filter_pck_set_crypt_flags(out_pck, 0);
+		gf_filter_pck_send(out_pck);
+		return GF_OK;
+	}
+
+	//we can use inplace processing for decryption
+	out_pck = gf_filter_pck_new_clone(cstr->opid, in_pck, &out_data);
+	if (!out_pck) return GF_OUT_OF_MEM;
+
+	//packet has been fetched, we now MUST have a key info
+
+	if (!cstr->hls_key_url && !cstr->cenc_ki && !ctx->cinfo) {
+		if (ctx->decrypt == DECRYPT_SKIP) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[HLS_SAES] Packet encrypted but no KEY info\n" ) );
+			e = GF_OK;
+			goto send_packet;
+		}
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HLS_SAES] Packet encrypted but no KEY info\n" ) );
+		return GF_SERVICE_ERROR;
+	}
+	if (cstr->cenc_ki) {
+		if (cstr->cenc_ki->value.data.size<37) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HLS_SAES] Broken KID for HLS SAES\n" ) );
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		e = cenc_dec_push_iv(cstr, 0, cstr->cenc_ki->value.data.ptr + 21, 16, 0, NULL);
+		if (e) goto exit;
+		memcpy(cstr->hls_IV, cstr->cenc_ki->value.data.ptr + 21, 16);
+	} else {
+		e = cenc_dec_push_iv(cstr, 0, cstr->hls_IV, 16, 0, NULL);
+		if (e) goto exit;
+	}
+	cstr->crypt_init = GF_TRUE;
+
+	if (cstr->key_error) {
+		e = cstr->key_error;
+		goto exit;
+	}
+
+	if (cstr->codec_id==GF_CODECID_AVC) {
+		u32 cur_pos = 0;
+		u32 o_data_size = data_size;
+		u8 *data = out_data;
+
+		while (cur_pos + 4 < data_size) {
+			u32 i;
+			u32 nal_size=0;
+			u32 bk_idx = 0;
+			u8 *nal_start, *nal_hdr_ptr;
+			u32 nal_size_o;
+			for (i=0; i<4; i++) {
+				nal_size <<= 8;
+				nal_size |= data[i];
+			}
+			if (cur_pos+4+nal_size > data_size) {
+				break;
+			}
+			nal_hdr_ptr = data;
+			cur_pos += 4;
+			data += 4;
+
+			u8 nal_hdr = data[0];
+			u8 nal_type = nal_hdr & 0x1F;
+
+			if ((nal_size<=48) || ((nal_type != 1) && (nal_type != 5))) {
+				data += nal_size;
+				cur_pos += nal_size;
+				continue;
+			}
+			nal_start = data;
+			nal_size_o = nal_size;
+			//remove EPB
+			u32 nb_epb = gf_media_nalu_emulation_bytes_remove_count(data, nal_size);
+			if (nb_epb) {
+				nal_size = gf_media_nalu_remove_emulation_bytes(data, data, nal_size);
+			}
+
+			//unencrypted header
+			data += 32;
+			cur_pos += 32;
+			nal_size -= 32;
+
+			//const IV is applied at each subsample
+			gf_crypt_set_IV(cstr->crypts[0].crypt, cstr->hls_IV, 16);
+
+			while (nal_size) {
+				Bool is_crypted = GF_FALSE;
+				if (! (bk_idx % 10)) is_crypted = GF_TRUE;
+
+				if (is_crypted && cstr->crypts[0].key_valid) {
+					//decrypt
+					gf_crypt_decrypt(cstr->crypts[0].crypt, data, 16);
+				}
+
+				bk_idx++;
+				nal_size -= 16;
+				data += 16;
+				cur_pos += 16;
+				if (nal_size < 16) break;
+			}
+			//unencrypted trailer
+			data += nal_size;
+			cur_pos += nal_size;
+
+			if (nb_epb) {
+				u32 remain = data_size - (cur_pos+nb_epb);
+				//move all remainging bytes
+				memmove(nal_start + nal_size_o - nb_epb, nal_start + nal_size_o, remain);
+				//rewrite NALU length field
+				nal_size_o -= nb_epb;
+				nal_hdr_ptr[0] = ((nal_size_o>>24) & 0xFF);
+				nal_hdr_ptr[1] = ((nal_size_o>>16) & 0xFF);
+				nal_hdr_ptr[2] = ((nal_size_o>>8) & 0xFF);
+				nal_hdr_ptr[3] = ((nal_size_o) & 0xFF);
+
+				data_size -= nb_epb;
+			}
+		}
+		if (o_data_size > data_size)
+			gf_filter_pck_truncate(out_pck, data_size);
+	}
+	//otherwise audio, same scheme for all
+	else {
+		u8 *data = out_data;
+		//clear 16 bytes header
+		data += 16;
+		if (data_size>16) {
+			data_size-=16;
+
+			//const IV is applied at each sample
+			gf_crypt_set_IV(cstr->crypts[0].crypt, cstr->hls_IV, 16);
+		} else {
+			data_size=0;
+		}
+
+		while (data_size>0) {
+			gf_crypt_decrypt(cstr->crypts[0].crypt, data, 16);
+			data += 16;
+			data_size -= 16;
+			if (data_size<16)
+				break;
+		}
+	}
+
+
+send_packet:
+	gf_filter_pck_merge_properties(in_pck, out_pck);
+	gf_filter_pck_set_property(out_pck, GF_PROP_PCK_CENC_SAI, NULL);
+	gf_filter_pck_set_crypt_flags(out_pck, 0);
+
+	gf_filter_pck_send(out_pck);
+
+exit:
+	if (e && out_pck) {
+		gf_filter_pck_discard(out_pck);
+	}
+	return e;
+}
 
 static GF_Err cenc_dec_process_adobe(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, GF_FilterPacket *in_pck)
 {
@@ -985,11 +1744,12 @@
 	u32 offset, size;
 	Bool encrypted_au;
 
-	if (!cstr->crypt)
+	if (!cstr->crypts[0].crypt)
 		return GF_SERVICE_ERROR;
 
 	in_data = gf_filter_pck_get_data(in_pck, &data_size);
 	out_pck = gf_filter_pck_new_alloc(cstr->opid, data_size, &out_data);
+	if (!out_pck) return GF_OUT_OF_MEM;
 
 	memcpy(out_data, in_data, data_size);
 
@@ -1000,28 +1760,28 @@
 		u32 trim_bytes;
 		char IV[17];
 		if (size<17) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Error in sample size, %d bytes remain but at least 17 are required\n", size ) );
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ADOBE] Error in sample size, %d bytes remain but at least 17 are required\n", size ) );
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		memmove(IV, out_data+1, 16);
 		if (!cstr->crypt_init) {
-			e = gf_crypt_init(cstr->crypt, cstr->keys[0], IV);
+			e = gf_crypt_init(cstr->crypts[0].crypt, cstr->keys[0], IV);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot initialize AES-128 CBC (%s)\n", gf_error_to_string(e)) );
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ADOBE] Cannot initialize AES-128 CBC (%s)\n", gf_error_to_string(e)) );
 				return GF_IO_ERR;
 			}
 			cstr->crypt_init = GF_TRUE;
 		} else {
-			e = gf_crypt_set_IV(cstr->crypt, IV, GF_AES_128_KEYSIZE);
+			e = gf_crypt_set_IV(cstr->crypts[0].crypt, IV, GF_AES_128_KEYSIZE);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot set state AES-128 CBC (%s)\n", gf_error_to_string(e)) );
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ADOBE] Cannot set state AES-128 CBC (%s)\n", gf_error_to_string(e)) );
 				return GF_IO_ERR;
 			}
 		}
 		offset += 17;
 		size -= 17;
 
-		gf_crypt_decrypt(cstr->crypt, out_data+offset, size);
+		gf_crypt_decrypt(cstr->crypts[0].crypt, out_data+offset, size);
 		trim_bytes = out_data[offset + size - 1];
 		size -= trim_bytes;
 	} else {
@@ -1038,9 +1798,16 @@
 
 static void cenc_dec_stream_del(GF_CENCDecStream *cstr)
 {
-	if (cstr->crypt) gf_crypt_close(cstr->crypt);
+	if (cstr->crypts) {
+		u32 i;
+		for (i=0; i<cstr->nb_crypts; i++) {
+			if (cstr->crypts[i].crypt) gf_crypt_close(cstr->crypts[i].crypt);
+		}
+		gf_free(cstr->crypts);
+	}
 	if (cstr->KIDs) gf_free(cstr->KIDs);
 	if (cstr->keys) gf_free(cstr->keys);
+	if (cstr->hls_key_url) gf_free(cstr->hls_key_url);
 
 
 	gf_free(cstr);
@@ -1054,8 +1821,10 @@
 	u32 scheme_version = 0;
 	const char *scheme_uri = NULL;
 	const char *kms_uri = NULL;
+	u32 nb_keys;
 	GF_CENCDecStream *cstr;
 	GF_CENCDecCtx *ctx = (GF_CENCDecCtx *)gf_filter_get_udta(filter);
+	u32 i;
 
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
 	if (prop) scheme_type = prop->value.uint;
@@ -1082,6 +1851,9 @@
 		gf_list_add(ctx->streams, cstr);
 		gf_filter_pid_set_udta(pid, cstr);
 		gf_filter_pid_set_udta(cstr->opid, cstr);
+		//we need full sample
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
 	}
 
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_SCHEME_VERSION);
@@ -1093,7 +1865,7 @@
 
 	if (ctx->cinfo) {
 		u32 stream_id=0;
-		u32 i, count = gf_list_count(ctx->cinfo->tcis);
+		u32 count = gf_list_count(ctx->cinfo->tcis);
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
 		if (!prop) prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
 		if (prop) stream_id = prop->value.uint;
@@ -1105,7 +1877,37 @@
 				break;
 			}
 		}
+	}
 
+	nb_keys = 1;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CENC_KEY_INFO);
+	if (prop && prop->value.data.ptr && prop->value.data.ptr[0]) {
+		nb_keys = prop->value.data.ptr[1];
+		nb_keys<<=8;
+		nb_keys |= prop->value.data.ptr[2];
+	}
+	if (nb_keys > cstr->nb_crypts) {
+		cstr->crypts = gf_realloc(cstr->crypts, sizeof(CENCDecKey) * nb_keys);
+		memset(&cstr->crypts[cstr->nb_crypts], 0, sizeof(CENCDecKey) * (nb_keys-cstr->nb_crypts) );
+
+		if (cstr->crypts[0].crypt) {
+			for (i=cstr->nb_crypts; i<nb_keys; i++) {
+				if (cstr->is_cenc)
+					cstr->crypts[i].crypt = gf_crypt_open(GF_AES_128, GF_CTR);
+				else
+					cstr->crypts[i].crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+				if (!cstr->crypts[i].crypt) return GF_IO_ERR;
+			}
+		}
+		cstr->nb_crypts = nb_keys;
+	}
+	//resetup, check decrypter
+	if (cstr->state==DECRYPT_STATE_PLAY) {
+		for (i=0; i<cstr->nb_crypts; i++) {
+			if (!cstr->crypts[i].crypt) {
+				return GF_SERVICE_ERROR;
+			}
+		}
 	}
 
 	switch (scheme_type) {
@@ -1129,6 +1931,9 @@
 	case GF_ISOM_ADOBE_SCHEME:
 		e = cenc_dec_setup_adobe(ctx, cstr, scheme_type, scheme_version, scheme_uri, kms_uri);
 		break;
+	case GF_HLS_SAMPLE_AES_SCHEME:
+		e = cenc_dec_hls_saes(ctx, cstr, scheme_type, scheme_version, scheme_uri, kms_uri);
+		break;
 	default:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Protection scheme type %s not supported\n", gf_4cc_to_str(scheme_type) ) );
 		return GF_SERVICE_ERROR;
@@ -1154,9 +1959,12 @@
 	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_OMA_PREVIEW_RANGE, NULL);
 	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_PSSH, NULL);
 	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ENCRYPTED, NULL);
-	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_IV_SIZE, NULL);
-	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_IV_CONST, NULL);
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_KEY_INFO, NULL);
 	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_PATTERN, NULL);
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_HLS_KMS, NULL);
+
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ORIG_CRYPT_SCHEME, &PROP_UINT(scheme_type) );
+
 
 	cstr->is_nalu = GF_FALSE;;
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
@@ -1168,6 +1976,8 @@
 		case GF_CODECID_HEVC:
 		case GF_CODECID_HEVC_TILES:
 		case GF_CODECID_LHVC:
+		case GF_CODECID_VVC:
+		case GF_CODECID_VVC_SUBPIC:
 			cstr->is_nalu = GF_TRUE;;
 			break;
 		}
@@ -1226,7 +2036,14 @@
 			continue;
 		}
 
-		if (cstr->is_cenc || cstr->is_cbc) {
+		if (cstr->state != DECRYPT_STATE_PLAY) {
+			gf_filter_pid_drop_packet(cstr->ipid);
+			continue;
+		}
+
+		if (cstr->is_hls_saes) {
+			e = cenc_dec_process_hls_saes(ctx, cstr, pck);
+		} else if (cstr->is_cenc || cstr->is_cbc) {
 			e = cenc_dec_process_cenc(ctx, cstr, pck);
 		} else if (cstr->is_oma) {
 			e = GF_NOT_SUPPORTED;
@@ -1245,6 +2062,14 @@
 static GF_Err cenc_dec_initialize(GF_Filter *filter)
 {
 	GF_CENCDecCtx *ctx = (GF_CENCDecCtx *)gf_filter_get_udta(filter);
+	ctx->filter = filter;
+
+	if (ctx->keys.nb_items) {
+		if (ctx->keys.nb_items != ctx->kids.nb_items) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCCrypt] Number of defined keys (%d) must be the same as number of defined KIDs (%d)\n", ctx->keys.nb_items, ctx->kids.nb_items ));
+			return GF_BAD_PARAM;
+		}
+	}
 	ctx->streams = gf_list_new();
 	if (!ctx->streams) return GF_OUT_OF_MEM;
 
@@ -1252,7 +2077,7 @@
 		GF_Err e;
 		ctx->cinfo = gf_crypt_info_load(ctx->cfile, &e);
 		if (!ctx->cinfo) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENCCrypt] Cannot load config file %s\n", ctx->cfile ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCCrypt] Cannot load config file %s\n", ctx->cfile ));
 			return e;
 		}
 	}
@@ -1278,39 +2103,52 @@
 static const GF_FilterCapability CENCDecCaps[] =
 {
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
-	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_ISMACRYP_SCHEME),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_OMADRM_SCHEME),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_CENC_SCHEME),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_CENS_SCHEME),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_CBC_SCHEME),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_CBCS_SCHEME),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_ADOBE_SCHEME),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_PIFF_SCHEME),
-
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_ISMACRYP_SCHEME),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_OMADRM_SCHEME),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_CENC_SCHEME),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_CENS_SCHEME),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_CBC_SCHEME),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_CBCS_SCHEME),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_ADOBE_SCHEME),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_ISOM_PIFF_SCHEME),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_HLS_SAMPLE_AES_SCHEME),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
-	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
-	//CAP_UINT(GF_CAPS_OUTPUT_STATIC_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED, GF_FALSE),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 };
 
 
 #define OFFS(_n)	#_n, offsetof(GF_CENCDecCtx, _n)
 static const GF_FilterArgs GF_CENCDecArgs[] =
 {
-	{ OFFS(cfile), "crypt file location - see filter help", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(cfile), "crypt file location", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(decrypt), "decrypt mode (CENC only)\n"
+		"- full: decrypt everything, throwing error if keys are not found\n"
+		"- nokey: decrypt everything for which a key is found, skip decryption otherwise\n"
+		"- skip: decrypt nothing"
+		, GF_PROP_UINT, "full", "full|nokey|skip", GF_ARG_HINT_ADVANCED},
+	{ OFFS(drop_keys), "consider keys with given 1-based indexes as not available (multi-key debug)", GF_PROP_UINT_LIST, NULL, NULL, GF_ARG_HINT_EXPERT},
+	{ OFFS(kids), "define KIDs. If `keys` is empty, consider keys with given KID (as hex string) as not available (debug)", GF_PROP_STRING_LIST, NULL, NULL, GF_ARG_HINT_EXPERT},
+	{ OFFS(keys), "define key values for each of the specified KID", GF_PROP_STRING_LIST, NULL, NULL, GF_ARG_HINT_EXPERT},
+	{ OFFS(hls_cenc_patch_iv), "ignore IV updates in some broken HLS+CENC streams", GF_PROP_BOOL, "false", NULL, GF_ARG_HINT_EXPERT},
 	{0}
 };
 
 GF_FilterRegister CENCDecRegister = {
 	.name = "cdcrypt",
 	GF_FS_SET_DESCRIPTION("CENC decryptor")
-	GF_FS_SET_HELP("The CENC decryptor supports decrypting CENC, ISMA and Adobe streams. It uses a configuration file for retrieving keys.\n"
+	GF_FS_SET_HELP("The CENC decryptor supports decrypting CENC, ISMA, HLS Sample-AES (MPEG2 ts) and Adobe streams.\n"
+	"\n"
+	"For HLS, key is retrieved according to the key URI in the manifest.\n"
+	"Otherwise, the filter uses a configuration file.\n"
 	"The syntax is available at https://wiki.gpac.io/Common-Encryption\n"
-	"The file can be set per PID using the property `DecryptInfo` (highest priority), `CryptInfo` (lower priority) "
+	"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]() (lowest priority).\n"
-	"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 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.\n"
+	)
 	.private_size = sizeof(GF_CENCDecCtx),
 	.max_extra_pids=-1,
 	.args = GF_CENCDecArgs,

gpac-1.0.1.tar.gz/src/filters/dmx_avi.c -> gpac-2.0.0.tar.gz/src/filters/dmx_avi.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2019
+ *			Copyright (c) Telecom ParisTech 2005-2022
 *					All rights reserved
 *
 * This file is part of GPAC / AVI demuxer filter
@@ -103,6 +103,7 @@
 		|| !stricmp(comp, "RMP4") /*Sigma - not tested*/
 		|| !stricmp(comp, "MP43") /*not tested*/
 		|| !stricmp(comp, "FMP4") /*not tested*/
+		|| !stricmp(comp, "VP6F") /*not tested*/
 	) {
 		codecid = GF_CODECID_MPEG4_PART2;
 	} else if ( !stricmp(comp, "H264") /*not tested*/
@@ -118,7 +119,9 @@
 		codecid = GF_CODECID_RAW;
 		pfmt = GF_PIXEL_BGR;
 	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIDmx] Video format %s not supported, patch welcome\n", comp));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AVIDmx] Video format %s not natively supported, signaling as is\n", comp));
+		codecid = gf_4cc_parse(comp);
+		unframed = GF_FALSE;
 	}
 
 	ctx->v_in_use = GF_FALSE;
@@ -145,7 +148,7 @@
 		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_HEIGHT, &PROP_UINT( h ) );
 		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_DURATION, &PROP_FRAC64( dur ) );
 
-		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_SEEK ) );
+		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 
 		if (pfmt) {
 			u32 stride=0;
@@ -232,17 +235,20 @@
 		case IBM_FORMAT_ADPCM:
 			codecid = GF_CODECID_IBM_ADPCM;
 			break;
-		case 0x55:
+		case WAVE_FORMAT_MP3:
 			codecid = GF_CODECID_MPEG_AUDIO;
 			unframed = GF_TRUE;
 			break;
-		case 0x0000706d:
+		case WAVE_FORMAT_AAC_ADTS:
 			codecid = GF_CODECID_AAC_MPEG4;
 			unframed = GF_TRUE;
 			break;
-		case 255:
+		case WAVE_FORMAT_AAC:
 			codecid = GF_CODECID_AAC_MPEG4;
 			break;
+		case WAVE_FORMAT_AC3:
+			codecid = GF_CODECID_AC3;
+			break;
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIDmx] Audio format %d not supported, patch welcome\n", a_fmt));
 			break;
@@ -267,6 +273,17 @@
 			if (!sync_id) sync_id = 2 + st->stream_num;
 			st->audio_done = GF_FALSE;
 
+			if (codecid==GF_CODECID_MPEG_AUDIO) {
+				u32 cid;
+				char data[8];
+				AVI_set_audio_track(ctx->avi, i);
+				AVI_read_audio(ctx->avi, data, 8, (int*)&cid);
+				u32 hdr = GF_4CC(data[0], data[1], data[2], data[3]);
+				cid = gf_mp3_object_type_indication(hdr);
+				AVI_set_audio_position(ctx->avi, 0);
+				if (cid) codecid = cid;
+			}
+
 			gf_filter_pid_set_property(st->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO) );
 			gf_filter_pid_set_property(st->opid, GF_PROP_PID_CODECID, &PROP_UINT( codecid) );
 			st->freq = AVI_audio_rate(ctx->avi);
@@ -281,11 +298,11 @@
 			gf_filter_pid_set_property(st->opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT( sync_id ) );
 			gf_filter_pid_set_property(st->opid, GF_PROP_PID_DURATION, &PROP_FRAC64( dur ) );
 
-			gf_filter_pid_set_property(st->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_SEEK ) );
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 			st->audio_bps = 0;
 			if (unframed) {
 				gf_filter_pid_set_property(st->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL( GF_TRUE ) );
-				//we don't set timescale, let the reframer handle it
+				gf_filter_pid_set_property(st->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(st->freq) );
 			} else {
 				if (afmt) {
 					gf_filter_pid_set_property(st->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(afmt) );
@@ -323,11 +340,14 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		if (ctx->v_opid) gf_filter_pid_remove(ctx->v_opid);
-		ctx->v_opid = NULL;
+		if (ctx->v_opid) {
+			gf_filter_pid_remove(ctx->v_opid);
+			ctx->v_opid = NULL;
+		}
 		while (gf_list_count(ctx->audios) ) {
 			AVIAstream *st = gf_list_pop_back(ctx->audios);
-			gf_filter_pid_remove(st->opid);
+			if (st->opid)
+				gf_filter_pid_remove(st->opid);
 			gf_free(st);
 		}
 		return GF_OK;
@@ -479,6 +499,7 @@
 
 			if (size > 4) {
 				GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->v_opid, size, &pck_data);
+				if (!dst_pck) return GF_OUT_OF_MEM;
 				AVI_read_frame(ctx->avi, pck_data, &key);
 				gf_filter_pck_set_byte_offset(dst_pck, file_offset);
 				gf_filter_pck_set_cts(dst_pck, cts);
@@ -514,6 +535,7 @@
 			nb_done++;
 			continue;
 		}
+		if (!ctx->v_playing) video_done = GF_TRUE;
 		if (!st->playing || gf_filter_pid_would_block(st->opid) )
 			continue;
 		AVI_set_audio_track(ctx->avi, st->stream_num);
@@ -535,7 +557,8 @@
 			u8 *pck_data;
 			u64 file_offset;
 			GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(st->opid, size, &pck_data);
-
+			if (!dst_pck) return GF_OUT_OF_MEM;
+			
 			file_offset = gf_ftell(ctx->avi->fdes);
 			AVI_read_audio(ctx->avi, pck_data, size, (int*)&continuous);
 
@@ -595,11 +618,19 @@
 	gf_list_del(ctx->audios);
 
 	if (ctx->importer) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("AVI Removed Frames: 1 VFW delay frames - 296 N-VOPs\n", ctx->dummy, ctx->nvops));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("AVI Removed Frames: 1 VFW delay frames - 296 N-VOPs\n", ctx->dummy, ctx->nvops));
 	}
 
 }
 
+static const char * avidmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	if (size<12) return NULL;
+	if (strncmp(data, "RIFF", 4)) return NULL;
+	if (strncmp(data+8, "AVI ", 4)) return NULL;
+	*score = GF_FPROBE_SUPPORTED;
+	return "video/avi";
+}
 
 static const GF_FilterCapability AVIDmxCaps[] =
 {
@@ -622,8 +653,8 @@
 
 GF_FilterRegister AVIDmxRegister = {
 	.name = "avidmx",
-	GF_FS_SET_DESCRIPTION("AVI demuxer")
-	GF_FS_SET_HELP("This filter demultiplexes AVI files/data to produce media PIDs and frames.")
+	GF_FS_SET_DESCRIPTION("AVI demultiplexer")
+	GF_FS_SET_HELP("This filter demultiplexes AVI files to produce media PIDs and frames.")
 	.private_size = sizeof(GF_AVIDmxCtx),
 	.initialize = avidmx_initialize,
 	.finalize = avidmx_finalize,
@@ -632,6 +663,7 @@
 	.configure_pid = avidmx_configure_pid,
 	.process = avidmx_process,
 	.process_event = avidmx_process_event,
+	.probe_data = avidmx_probe_data,
 };
 
 #endif // GPAC_DISABLE_AVILIB

gpac-1.0.1.tar.gz/src/filters/dmx_dash.c -> gpac-2.0.0.tar.gz/src/filters/dmx_dash.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / DASH/HLS demux filter
@@ -30,32 +30,65 @@
 
 #include <gpac/dash.h>
 
+#ifdef GPAC_HAS_QJS
+#include "../quickjs/quickjs.h"
+#include "../scenegraph/qjs_common.h"
+#endif
+
+#define DASHIN_MIMES "application/dash+xml|video/vnd.3gpp.mpd|audio/vnd.3gpp.mpd|video/vnd.mpeg.dash.mpd|audio/vnd.mpeg.dash.mpd|audio/mpegurl|video/mpegurl|application/vnd.ms-sstr+xml|application/x-mpegURL|application/vnd.apple.mpegURL"
+
+#define DASHIN_FILE_EXT "mpd|m3u8|3gm|ism"
+
+enum
+{
+	DFWD_OFF = 0,
+	DFWD_FILE,
+	//all modes below forward frames, not files
+	DFWD_SBOUND,
+	DFWD_SBOUND_MANIFEST,
+};
+
+
+enum
+{
+	BMIN_NO = 0,
+	BMIN_AUTO,
+	BMIN_MPD,
+};
+
 typedef struct
 {
 	//opts
-	s32 shift_utc, debug_as, atsc_shift;
-	u32 max_buffer, auto_switch, init_timeshift, tiles_rate, segstore, delay40X, exp_threshold, switch_count;
-	Bool server_utc, screen_res, aggressive, speedadapt;
+	s32 shift_utc, route_shift;
+	u32 max_buffer, tiles_rate, segstore, delay40X, exp_threshold, switch_count, bwcheck;
+	s32 auto_switch;
+	s32 init_timeshift;
+	Bool server_utc, screen_res, aggressive, speedadapt, fmodefwd, skip_lqt, llhls_merge, filemode, chain_mode, asloop;
+	u32 forward;
+	GF_PropUIntList debug_as;
 	GF_DASHInitialSelectionMode start_with;
 	GF_DASHTileAdaptationMode tile_mode;
-	GF_DASHAdaptationAlgorithm algo;
-	Bool max_res, immediate, abort, use_bmin;
+	char *algo;
+	Bool max_res, abort;
+	u32 use_bmin;
 	char *query;
-	Bool noxlink, split_as, noseek;
+	Bool noxlink, split_as, noseek, groupsel;
 	u32 lowlat;
 
 	GF_FilterPid *mpd_pid;
 	GF_Filter *filter;
 
+	GF_FilterPid *output_mpd_pid;
+
 	GF_DashClient *dash;
 	//http io for manifest
 	GF_DASHFileIO dash_io;
 	GF_DownloadManager *dm;
 	
-	Bool closed;
 	Bool reuse_download_session;
 
 	Bool initial_setup_done;
+	Bool in_error;
 	u32 nb_playing;
 
 	/*max width & height in all active representations*/
@@ -67,6 +100,29 @@
 	Bool mpd_open;
 	Bool initial_play;
 	Bool check_eos;
+
+	char *frag_url;
+
+	char *manifest_payload;
+	GF_List *hls_variants, *hls_variants_names;
+
+	GF_Fraction64 time_discontinuity;
+	Bool compute_min_dts;
+	u64 timedisc_next_min_ts;
+
+	Bool is_dash;
+	Bool manifest_stop_sent;
+#ifdef GPAC_HAS_QJS
+	JSContext *js_ctx;
+	Bool owns_context;
+	JSValue js_obj, rate_fun, download_fun, new_group_fun, period_reset_fun;
+#endif
+
+	void *rt_udta;
+	void (*on_period_reset)(void *udta, u32 reset_type);
+	void (*on_new_group)(void *udta, u32 group_idx, void *dash);
+	s32 (*on_rate_adaptation)(void *udta, u32 group_idx, u32 base_group_idx, Bool force_low_complex, void *stats);
+	s32 (*on_download_monitor)(void *udta, u32 group_idx, void *stats);
 } GF_DASHDmxCtx;
 
 typedef struct
@@ -76,19 +132,21 @@
 
 	u32 idx;
 	Bool init_switch_seg_sent;
-	Bool segment_sent;
+	Bool segment_sent, in_is_cryptfile;
 
 	u32 nb_eos, nb_pids;
 	Bool stats_uploaded;
 	Bool wait_for_pck;
 	Bool eos_detected;
+	u32 next_dependent_rep_idx, current_dependent_rep_idx;
 
 	GF_DownloadSession *sess;
 	Bool is_timestamp_based, pto_setup;
 	Bool prev_is_init_segment;
+	//media timescale for which the pto, max_cts_in_period and timedisc_ts_offset were computed
 	u32 timescale;
 	s64 pto;
-	s64 max_cts_in_period;
+	u64 max_cts_in_period, timedisc_ts_offset;
 	bin128 key_IV;
 
 	Bool seg_was_not_ready;
@@ -96,17 +154,136 @@
 	Bool is_playing;
 	Bool force_seg_switch;
 	u32 nb_group_deps, current_group_dep;
+	u32 last_bw_check;
+	u64 us_at_seg_start;
+	Bool signal_seg_name;
+	Bool init_ok;
+	Bool notify_quality_change;
+
+	u32 seg_discard_state;
+	u32 nb_pending;
+
+	char *template;
+
+	const char *hls_key_uri;
+	bin128 hls_key_IV;
 } GF_DASHGroup;
 
+static void dashdmx_notify_group_quality(GF_DASHDmxCtx *ctx, GF_DASHGroup *group);
+
+static void dashdmx_set_string_list_prop(GF_FilterPacket *ref, u32 prop_name, GF_List **str_list)
+{
+	u32 i, count;
+	GF_PropertyValue v;
+	GF_List *list = *str_list;
+	if (!list) return;
+
+	v.type = GF_PROP_STRING_LIST;
+	v.value.string_list.nb_items = count = gf_list_count(list);
+	v.value.string_list.vals = gf_malloc(sizeof(char *) * count);
+	for (i=0; i<count;i++) {
+		v.value.string_list.vals[i] = gf_list_pop_front(list);
+	}
+	gf_list_del(list);
+	*str_list = NULL;
+	gf_filter_pck_set_property(ref, prop_name, &v);
+}
+
 
-void dashdmx_forward_packet(GF_DASHDmxCtx *ctx, GF_FilterPacket *in_pck, GF_FilterPid *in_pid, GF_FilterPid *out_pid, GF_DASHGroup *group)
+static void dashdmx_forward_packet(GF_DASHDmxCtx *ctx, GF_FilterPacket *in_pck, GF_FilterPid *in_pid, GF_FilterPid *out_pid, GF_DASHGroup *group)
 {
 	GF_FilterPacket *dst_pck;
 	Bool do_map_time = GF_FALSE;
 	Bool seek_flag = 0;
 	u64 cts, dts;
 
-	if (gf_dash_is_m3u8(ctx->dash)) {
+	if (ctx->forward) {
+		Bool is_filemode;
+		Bool is_start = group->signal_seg_name;
+		GF_FilterPacket *ref;
+
+		if (ctx->forward==DFWD_FILE) {
+			Bool is_end = GF_FALSE;
+			if (ctx->fmodefwd) {
+				ref = gf_filter_pck_new_ref(out_pid, 0, 0, in_pck);
+			} else {
+				u8 *output;
+				ref = gf_filter_pck_new_copy(out_pid, in_pck, &output);
+			}
+			if (!ref) return;
+
+			group->signal_seg_name = 0;
+			gf_filter_pck_get_framing(in_pck, NULL, &is_end);
+			gf_filter_pid_drop_packet(in_pid);
+			if (gf_filter_pid_is_eos(in_pid))
+				is_end = GF_TRUE;
+
+			gf_filter_pck_set_framing(ref, is_start, is_end);
+			is_filemode = GF_TRUE;
+		} else {
+			const GF_PropertyValue *p;
+			ref = gf_filter_pck_new_ref(out_pid, 0, 0, in_pck);
+			if (!ref) return;
+
+			gf_filter_pck_merge_properties(in_pck, ref);
+			p = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_CUE_START);
+			if (p && p->value.boolean) {
+				is_start = GF_TRUE;
+			}
+			group->pto_setup = GF_TRUE;
+			gf_filter_pid_drop_packet(in_pid);
+			is_filemode = GF_FALSE;
+		}
+
+		if (is_start) {
+			if (group->prev_is_init_segment) {
+				const char *init_segment = NULL;
+				gf_dash_group_next_seg_info(ctx->dash, group->idx, 0, NULL, NULL, NULL, NULL, &init_segment);
+				if (init_segment) {
+					gf_filter_pck_set_property(ref, GF_PROP_PCK_FILENAME, &PROP_STRING(init_segment) );
+					gf_filter_pck_set_property(ref, GF_PROP_PCK_INIT, &PROP_BOOL(GF_TRUE) );
+				}
+			} else {
+				GF_Fraction64 seg_time;
+				const char *seg_name = NULL;
+				u32 seg_number, seg_dur;
+				gf_dash_group_next_seg_info(ctx->dash, group->idx, group->current_dependent_rep_idx, &seg_name, &seg_number, &seg_time, &seg_dur, NULL);
+				if (seg_name) {
+					gf_filter_pck_set_property(ref, GF_PROP_PCK_FILENAME, &PROP_STRING(seg_name) );
+					gf_filter_pck_set_property(ref, GF_PROP_PCK_FILENUM, &PROP_UINT(seg_number) );
+
+					if (is_filemode) {
+						u64 ts;
+						gf_filter_pck_set_duration(ref, seg_dur);
+						//hack to avoid using a property, we set the carousel version on the packet to signal the duration applies to the entire segment, not the packet
+						gf_filter_pck_set_carousel_version(ref, 1);
+						if (seg_time.den) {
+							ts = gf_timestamp_rescale(seg_time.num, seg_time.den, 1000);
+						} else {
+							ts = GF_FILTER_NO_TS;
+						}
+						gf_filter_pck_set_cts(ref, ts);
+					}
+				}
+			}
+
+			if (ctx->manifest_payload) {
+				gf_filter_pck_set_property(ref, GF_PROP_PCK_DASH_MANIFEST, &PROP_STRING_NO_COPY(ctx->manifest_payload));
+				ctx->manifest_payload = NULL;
+			}
+			dashdmx_set_string_list_prop(ref, GF_PROP_PCK_HLS_VARIANT, &ctx->hls_variants);
+			dashdmx_set_string_list_prop(ref, GF_PROP_PCK_HLS_VARIANT_NAME, &ctx->hls_variants_names);
+		}
+
+		if (gf_filter_pid_get_udta_flags(out_pid)) {
+			gf_filter_pid_set_udta_flags(out_pid, 0);
+			gf_filter_pck_set_property(ref, GF_PROP_PID_DASH_PERIOD_START, &PROP_LONGUINT(0) );
+		}
+		gf_filter_pck_send(ref);
+		return;
+	}
+
+	if (!ctx->is_dash) {
 		gf_filter_pck_forward(in_pck, out_pid);
 
 		if (!group->pto_setup) {
@@ -127,22 +304,34 @@
 
 	//if sync is based on timestamps do not adjust the timestamps back
 	if (! group->is_timestamp_based) {
+		u64 scale_max_cts, scale_timesdisc_offset;
+		s64 scale_pto;
+		u32 ts = gf_filter_pck_get_timescale(in_pck);
+
 		if (!group->pto_setup) {
 			Double scale;
 			s64 start, dur;
 			u64 pto;
-			u32 ts = gf_filter_pck_get_timescale(in_pck);
-			gf_dash_group_get_presentation_time_offset(ctx->dash, group->idx, &pto, &group->timescale);
-			group->pto = (s64) pto;
+			u32 mpd_timescale;
+			gf_dash_group_get_presentation_time_offset(ctx->dash, group->idx, &pto, &mpd_timescale);
 			group->pto_setup = 1;
 
-			if (group->timescale && (group->timescale != ts)) {
-				group->pto *= ts;
-				group->pto /= group->timescale;
+			//we are forwarding segment boundaries and potentially rebuilding manifest based on the source time
+			//do not adjust timestamps
+			if (ctx->forward) {
+				pto = 0;
+			} else {
+				if (mpd_timescale && (mpd_timescale != ts)) {
+					pto = gf_timestamp_rescale(pto, mpd_timescale, ts);
+				}
 			}
+
+			group->pto = (s64) pto;
+			group->timescale = ts;
 			scale = ts;
 			scale /= 1000;
 
+
 			dur = (u64) (scale * gf_dash_get_period_duration(ctx->dash));
 			if (dur) {
 				group->max_cts_in_period = group->pto + dur;
@@ -150,41 +339,108 @@
 				group->max_cts_in_period = 0;
 			}
 
+			//no max cts in HLS, and don't filter in forward modes
+			if (gf_dash_is_m3u8(ctx->dash) || ctx->forward) {
+				group->max_cts_in_period = 0;
+			} else if (!group->pto && group->max_cts_in_period && !gf_dash_is_dynamic_mpd(ctx->dash) ) {
+				u32 seg_number=0;
+				if (((s64) dts > group->pto)
+					&& (gf_dash_group_next_seg_info(ctx->dash, group->idx, 0, NULL, &seg_number, NULL, NULL, NULL) == GF_OK)
+					&& (seg_number<=1)
+				) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] First packet decode timestamp "LLU" but PTO is 0 - broken period timing, will not clamp\n", dts));
+					group->max_cts_in_period = 0;
+				}
+			}
+
+
+			if (ctx->time_discontinuity.den) {
+				group->pto += gf_timestamp_rescale(ctx->timedisc_next_min_ts, ctx->time_discontinuity.den, ts);
+				group->timedisc_ts_offset = gf_timestamp_rescale(ctx->time_discontinuity.num, ctx->time_discontinuity.den, ts);
+			}
+
 			start = (u64) (scale * gf_dash_get_period_start(ctx->dash));
 			group->pto -= start;
 		}
 
-		if (group->max_cts_in_period && (s64) cts > group->max_cts_in_period) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASHDmx] Packet timestamp "LLU" larger than max CTS in period "LLU" - forcing seek flag\n", cts, group->max_cts_in_period));
+		if (ts == group->timescale) {
+			scale_max_cts = group->max_cts_in_period;
+			scale_pto = group->pto;
+			scale_timesdisc_offset = group->timedisc_ts_offset;
+		} else {
+			scale_max_cts = gf_timestamp_rescale(group->max_cts_in_period, group->timescale, ts);
+			scale_pto = gf_timestamp_rescale_signed(group->pto, group->timescale, ts);
+			scale_timesdisc_offset = gf_timestamp_rescale(group->timedisc_ts_offset, group->timescale, ts);
+		}
 
-			seek_flag = 1;
+
+		if (scale_max_cts && (cts > scale_max_cts)) {
+			u64 adj_cts = cts;
+			s64 diff;
+			const GF_PropertyValue *p = gf_filter_pid_get_property(in_pid, GF_PROP_PID_DELAY);
+			if (p) adj_cts += p->value.longsint;
+			diff = (s64)adj_cts;
+			diff -= scale_max_cts;
+			//move back to ms and then back to timescale to checko rounding issues
+			if (diff>0) {
+				diff *= 1000;
+				diff /= ts;
+				if (diff<=1) diff=0;
+				
+				diff *= ts;
+				diff /= 1000;
+			}
+
+			if (diff>0) {
+				u32 flags;
+				u64 _dts = (dts==GF_FILTER_NO_TS) ? dts : adj_cts;
+
+				//if DTS larger than max TS, drop packet
+				if ( (s64) _dts > (s64) scale_max_cts) {
+					flags = gf_filter_pid_get_udta_flags(out_pid);
+					if (!flags) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] Packet decode timestamp "LLU" larger than max CTS in period "LLU" - dropping all further packets\n", adj_cts, scale_max_cts));
+						gf_filter_pid_set_udta_flags(out_pid, 1);
+					}
+					gf_filter_pid_drop_packet(in_pid);
+					return;
+				}
+				//otherwise, packet may be required for decoding future frames, mark as drop
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASHDmx] Packet timestamp "LLU" larger than max CTS in period "LLU" - forcing seek flag\n", adj_cts, scale_max_cts));
+
+				seek_flag = 1;
+			}
 		}
 
 		//remap timestamps to our timeline
 		if (dts != GF_FILTER_NO_TS) {
-			if ((s64) dts >= group->pto)
-				dts -= group->pto;
+			if ((s64) dts >= scale_pto)
+				dts -= scale_pto;
 			else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] Packet DTS "LLU" less than PTO "LLU" - forcing DTS to 0\n", dts, group->pto));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] Packet DTS "LLU" less than PTO "LLU" - forcing DTS to 0\n", dts, scale_pto));
 				dts = 0;
 				seek_flag = 1;
 			}
 		}
 		if (cts!=GF_FILTER_NO_TS) {
-			if ((s64) cts >= group->pto)
-				cts -= group->pto;
+			if ((s64) cts >= scale_pto)
+				cts -= scale_pto;
 			else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] Packet CTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", cts, group->pto));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] Packet CTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", cts, scale_pto));
 				cts = 0;
 				seek_flag = 1;
 			}
 		}
+		dts += scale_timesdisc_offset;
+		cts += scale_timesdisc_offset;
 	} else if (!group->pto_setup) {
 		do_map_time = 1;
 		group->pto_setup = 1;
 	}
 
-	dst_pck = gf_filter_pck_new_ref(out_pid, NULL, 0, in_pck);
+	dst_pck = gf_filter_pck_new_ref(out_pid, 0, 0, in_pck);
+	if (!dst_pck) return;
+	
 	//this will copy over clock info for PCR in TS
 	gf_filter_pck_merge_properties(in_pck, dst_pck);
 	gf_filter_pck_set_dts(dst_pck, dts);
@@ -200,19 +456,16 @@
 }
 
 
-static void dashdmx_on_filter_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
+static Bool dashdmx_on_filter_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
 {
 	GF_DASHGroup *group = (GF_DASHGroup *)udta;
-	if (!udta) return;
+	if (!udta) return GF_FALSE;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] group %d download setup error %s\n", group->idx, gf_error_to_string(err) ));
 
-	gf_dash_set_group_download_state(group->ctx->dash, group->idx, err);
+	gf_dash_set_group_download_state(group->ctx->dash, group->idx, group->current_dependent_rep_idx, err);
 	if (err) {
-		Bool group_done=GF_FALSE;
-
-		gf_dash_group_get_num_segments_ready(group->ctx->dash, group->idx, &group_done);
-
+		Bool group_done = gf_dash_get_group_done(group->ctx->dash, group->idx);
 		group->stats_uploaded = GF_TRUE;
 		group->segment_sent = GF_FALSE;
 		gf_filter_post_process_task(group->ctx->filter);
@@ -220,10 +473,23 @@
 			group->eos_detected = GF_TRUE;
 		} else {
 			group->in_error = GF_TRUE;
+
+			if (group->nb_group_deps) {
+				if (group->current_group_dep) group->current_group_dep--;
+			} else if (group->next_dependent_rep_idx) {
+				group->next_dependent_rep_idx--;
+			}
+
+			//failure at init, abort group
+			if (!group->init_ok)
+				group->seg_filter_src = NULL;
 		}
 	}
+	return GF_FALSE;
 }
 
+void gf_cryptfin_set_kms(GF_Filter *f, const char *key_url, bin128 key_IV);
+
 /*locates input service (demuxer) based on mime type or segment name*/
 static GF_Err dashdmx_load_source(GF_DASHDmxCtx *ctx, u32 group_index, const char *mime, const char *init_segment_name, u64 start_range, u64 end_range)
 {
@@ -231,10 +497,14 @@
 	GF_Err e;
 	u32 url_type=0;
 	Bool has_sep = GF_FALSE;
+	u32 crypto_type;
+	bin128 key_IV;
+	char szSep[2];
+	const char *key_uri;
 	char *sURL = NULL;
 	const char *base_url;
 	if (!init_segment_name) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] group %d Error locating plugin for segment - mime type %s\n", group_index, mime));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] group %d Error locating input filter: no segment URL, mime type %s\n", group_index, mime));
 		return GF_FILTER_NOT_FOUND;
 	}
 
@@ -249,51 +519,91 @@
 	else if (!strnicmp(base_url, "https://", 7)) url_type=2;
 	else url_type=0;
 
-	sURL = gf_malloc(sizeof(char) * (strlen(init_segment_name) + 200) );
-	strcpy(sURL, init_segment_name);
-	if (!strncmp(sURL, "isobmff://", 10)) {
+	key_uri = gf_dash_group_get_segment_init_keys(ctx->dash, group_index, &crypto_type, &key_IV);
+	if (crypto_type==1) {
+		gf_dynstrcat(&sURL, "gcryp://", NULL);
+		group->in_is_cryptfile = GF_TRUE;
+	}
+
+	if (!strncmp(init_segment_name, "isobmff://", 10)) {
 		if (url_type==1)
-			sprintf(sURL, "http://%s", init_segment_name);
+			gf_dynstrcat(&sURL, "http://", NULL);
 		else if (url_type==2)
-			sprintf(sURL, "http://%s", init_segment_name);
+			gf_dynstrcat(&sURL, "https://", NULL);
 		else
-			sprintf(sURL, "file://%s", init_segment_name);
+			gf_dynstrcat(&sURL, "file://", NULL);
 	}
+	gf_dynstrcat(&sURL, init_segment_name, NULL);
+
+	szSep[0] = gf_filter_get_sep(ctx->filter, GF_FS_SEP_ARGS);
+	szSep[1] = 0;
+
 	//not from file system, set cache option
 	if (url_type) {
 		if (!ctx->segstore) {
-			if (!has_sep) { strcat(sURL, ":gpac"); has_sep = GF_TRUE; }
-			strcat(sURL, ":cache=mem");
+			if (!has_sep) { gf_dynstrcat(&sURL, "gpac", szSep); has_sep = GF_TRUE; }
+			//if operating in mem mode and we load a file decryptor, only store in mem cache the first seg, and no cache for segments
+			if (crypto_type==1)
+				gf_dynstrcat(&sURL, "cache=none_keep", szSep);
+			else
+				gf_dynstrcat(&sURL, "cache=mem_keep", szSep);
 		}
 		else if (ctx->segstore==2) {
-			if (!has_sep) { strcat(sURL, ":gpac"); has_sep = GF_TRUE; }
-			strcat(sURL, ":cache=keep");
+			if (!has_sep) { gf_dynstrcat(&sURL, "gpac", szSep); has_sep = GF_TRUE; }
+			gf_dynstrcat(&sURL, "cache=keep", szSep);
 		}
 	}
 
 	if (start_range || end_range) {
 		char szRange[500];
-		if (!has_sep) { strcat(sURL, ":gpac"); /* has_sep = GF_TRUE; */ }
-		snprintf(szRange, 500, ":range="LLU"-"LLU, start_range, end_range);
-		strcat(sURL, szRange);
+		if (!has_sep) { gf_dynstrcat(&sURL, "gpac", szSep); has_sep = GF_TRUE; }
+		snprintf(szRange, 500, "range="LLU"-"LLU, start_range, end_range);
+		gf_dynstrcat(&sURL, szRange, szSep);
+	}
+	if (ctx->forward>DFWD_FILE) {
+		if (!has_sep) { gf_dynstrcat(&sURL, "gpac", szSep); }
+		gf_dynstrcat(&sURL, "sigfrag", szSep);
 	}
 
 	group->seg_filter_src = gf_filter_connect_source(ctx->filter, sURL, NULL, GF_FALSE, &e);
 	if (!group->seg_filter_src) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] group %d error locating plugin for segment - mime type %s name %s: %s\n", group_index, mime, sURL, gf_error_to_string(e) ));
 		gf_free(sURL);
 		gf_free(group);
 		gf_dash_set_group_udta(ctx->dash, group_index, NULL);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] group %d error locating plugin for segment - mime type %s name %s\n", group_index, mime, sURL));
 		return e;
 	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASHDmx] setting up group %d from %s\n", group->idx, sURL));
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASHDmx] setting up group %d from %s\n", group->idx, init_segment_name));
+	group->signal_seg_name = (ctx->forward==DFWD_FILE) ? GF_TRUE : GF_FALSE;
+	gf_filter_set_source(ctx->filter, group->seg_filter_src, NULL);
 
 	gf_filter_set_setup_failure_callback(ctx->filter, group->seg_filter_src, dashdmx_on_filter_setup_error, group);
+
+	if (gf_dash_group_init_segment_is_media(ctx->dash, group_index))
+		group->prev_is_init_segment = GF_FALSE;
+	else {
+		group->prev_is_init_segment = GF_TRUE;
+		//consider init is always in clear if AES-128, might need further checks
+		if (crypto_type==1) {
+			key_uri = NULL;
+		}
+	}
+
+	//if HLS AES-CBC, set key BEFORE discarding segment URL (if TS, discarding the segment will discard the key uri)
+	if (key_uri) {
+		if (crypto_type==1) {
+			gf_cryptfin_set_kms(group->seg_filter_src, key_uri, key_IV);
+		} else {
+			group->hls_key_uri = key_uri;
+			memcpy(group->hls_key_IV, key_IV, sizeof(bin128));
+		}
+	}
+
 	gf_dash_group_discard_segment(ctx->dash, group->idx);
-	group->prev_is_init_segment = GF_TRUE;
 	group->nb_group_deps = gf_dash_group_get_num_groups_depending_on(ctx->dash, group_index);
 	group->current_group_dep = 0;
 	gf_free(sURL);
+
 	return GF_OK;
 }
 
@@ -323,8 +633,10 @@
 		if (p) {
 			sess = (GF_DownloadSession *) p->value.ptr;
 			if (!ctx->segstore) {
-				gf_dm_sess_force_memory_mode(sess);
+				gf_dm_sess_force_memory_mode(sess, 1);
 			}
+			if (ctx->reuse_download_session)
+				gf_dm_sess_setup_from_url(sess, url, GF_FALSE);
 			ctx->reuse_download_session = GF_TRUE;
 			return (GF_DASHFileIOSession) sess;
 		}
@@ -382,12 +694,6 @@
 	return gf_dm_sess_set_range((GF_DownloadSession *)session, start_range, end_range, discontinue_cache);
 }
 
-#if 0 //unused since we are in non threaded mode
-void dashdmx_io_abort(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	gf_dm_sess_abort((GF_DownloadSession *)session);
-}
-
 u32 dashdmx_io_get_bytes_per_sec(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
 	u32 bps=0;
@@ -400,6 +706,11 @@
 	}
 	return bps;
 }
+#if 0 //unused since we are in non threaded mode
+void dashdmx_io_abort(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	gf_dm_sess_abort((GF_DownloadSession *)session);
+}
 u32 dashdmx_io_get_total_size(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
 	u64 size=0;
@@ -414,6 +725,172 @@
 }
 #endif
 
+#ifdef GPAC_HAS_QJS
+#include <gpac/mpd.h>
+void dashdmx_js_declare_group(GF_DASHDmxCtx *ctx, u32 group_idx)
+{
+	u32 i, count;
+	u32 srd_id, srd_x, srd_y, srd_w, srd_h, srd_fw, srd_fh;
+	JSValue res, reps;
+	JSValue obj = JS_NewObject(ctx->js_ctx);
+
+	JS_SetPropertyStr(ctx->js_ctx, obj, "idx", JS_NewInt32(ctx->js_ctx, group_idx));
+	JS_SetPropertyStr(ctx->js_ctx, obj, "duration", JS_NewInt64(ctx->js_ctx, gf_dash_get_period_duration(ctx->dash) ));
+
+	srd_id = srd_x = srd_y = srd_w = srd_h = srd_fw = srd_fh = 0;
+	gf_dash_group_get_srd_info(ctx->dash, group_idx, &srd_id, &srd_x, &srd_y, &srd_w, &srd_h, &srd_fw, &srd_fh);
+
+	if (srd_fw && srd_fh) {
+		JSValue srd = JS_NewObject(ctx->js_ctx);
+		JS_SetPropertyStr(ctx->js_ctx, srd, "ID", JS_NewInt32(ctx->js_ctx, srd_id));
+		JS_SetPropertyStr(ctx->js_ctx, srd, "x", JS_NewInt32(ctx->js_ctx, srd_x));
+		JS_SetPropertyStr(ctx->js_ctx, srd, "y", JS_NewInt32(ctx->js_ctx, srd_y));
+		JS_SetPropertyStr(ctx->js_ctx, srd, "w", JS_NewInt32(ctx->js_ctx, srd_w));
+		JS_SetPropertyStr(ctx->js_ctx, srd, "h", JS_NewInt32(ctx->js_ctx, srd_h));
+		JS_SetPropertyStr(ctx->js_ctx, srd, "fw", JS_NewInt32(ctx->js_ctx, srd_fw));
+		JS_SetPropertyStr(ctx->js_ctx, srd, "fh", JS_NewInt32(ctx->js_ctx, srd_fh));
+		JS_SetPropertyStr(ctx->js_ctx, obj, "SRD", srd);
+	} else {
+		JS_SetPropertyStr(ctx->js_ctx, obj, "SRD", JS_NULL);
+	}
+
+	reps = JS_NewArray(ctx->js_ctx);
+
+	count = gf_dash_group_get_num_qualities(ctx->dash, group_idx);
+	for (i=0; i<count; i++) {
+		GF_DASHQualityInfo qinfo;
+		JSValue rep;
+		GF_Err e;
+
+		e = gf_dash_group_get_quality_info(ctx->dash, group_idx, i, &qinfo);
+		if (e) break;
+		if (!qinfo.ID) qinfo.ID="";
+		if (!qinfo.mime) qinfo.mime="unknown";
+		if (!qinfo.codec) qinfo.codec="codec";
+
+		rep = JS_NewObject(ctx->js_ctx);
+		JS_SetPropertyStr(ctx->js_ctx, rep, "ID", JS_NewString(ctx->js_ctx, qinfo.ID));
+		JS_SetPropertyStr(ctx->js_ctx, rep, "mime", JS_NewString(ctx->js_ctx, qinfo.mime));
+		JS_SetPropertyStr(ctx->js_ctx, rep, "codec", JS_NewString(ctx->js_ctx, qinfo.codec));
+		JS_SetPropertyStr(ctx->js_ctx, rep, "bitrate", JS_NewInt32(ctx->js_ctx, qinfo.bandwidth));
+		JS_SetPropertyStr(ctx->js_ctx, rep, "disabled", JS_NewBool(ctx->js_ctx, qinfo.disabled));
+		if (qinfo.width && qinfo.height) {
+			JSValue frac;
+			JS_SetPropertyStr(ctx->js_ctx, rep, "width", JS_NewInt32(ctx->js_ctx, qinfo.width));
+			JS_SetPropertyStr(ctx->js_ctx, rep, "height", JS_NewInt32(ctx->js_ctx, qinfo.height));
+			JS_SetPropertyStr(ctx->js_ctx, rep, "interlaced", JS_NewBool(ctx->js_ctx, qinfo.interlaced));
+			frac = JS_NewObject(ctx->js_ctx);
+			JS_SetPropertyStr(ctx->js_ctx, frac, "n", JS_NewInt32(ctx->js_ctx, qinfo.fps_num));
+			JS_SetPropertyStr(ctx->js_ctx, frac, "d", JS_NewInt32(ctx->js_ctx, qinfo.fps_den ? qinfo.fps_den : 1));
+			JS_SetPropertyStr(ctx->js_ctx, rep, "fps", frac);
+
+			frac = JS_NewObject(ctx->js_ctx);
+			JS_SetPropertyStr(ctx->js_ctx, frac, "n", JS_NewInt32(ctx->js_ctx, qinfo.par_num));
+			JS_SetPropertyStr(ctx->js_ctx, frac, "d", JS_NewInt32(ctx->js_ctx, qinfo.par_den ? qinfo.par_den : qinfo.par_num));
+			JS_SetPropertyStr(ctx->js_ctx, rep, "sar", frac);
+		}
+		if (qinfo.sample_rate) {
+			JS_SetPropertyStr(ctx->js_ctx, rep, "samplerate", JS_NewInt32(ctx->js_ctx, qinfo.sample_rate));
+			JS_SetPropertyStr(ctx->js_ctx, rep, "channels", JS_NewInt32(ctx->js_ctx, qinfo.nb_channels));
+		}
+		JS_SetPropertyStr(ctx->js_ctx, rep, "ast_offset", JS_NewFloat64(ctx->js_ctx, qinfo.ast_offset));
+		JS_SetPropertyStr(ctx->js_ctx, rep, "avg_duration", JS_NewFloat64(ctx->js_ctx, qinfo.average_duration));
+
+		if (qinfo.seg_urls) {
+			u32 k=0, nb_segs=gf_list_count(qinfo.seg_urls);
+			JSValue seg_sizes = JS_NewArray(ctx->js_ctx);
+			for (k=0; k<nb_segs; k++) {
+				GF_MPD_SegmentURL *surl = gf_list_get((GF_List *) qinfo.seg_urls, k);
+				u64 size = (1 + surl->media_range->end_range - surl->media_range->start_range);
+				JS_SetPropertyUint32(ctx->js_ctx, seg_sizes, k, JS_NewInt64(ctx->js_ctx, size) );
+			}
+			JS_SetPropertyStr(ctx->js_ctx, rep, "sizes", seg_sizes);
+		} else {
+			JS_SetPropertyStr(ctx->js_ctx, rep, "sizes", JS_NULL);
+		}
+		JS_SetPropertyUint32(ctx->js_ctx, reps, i, rep);
+	}
+
+	JS_SetPropertyStr(ctx->js_ctx, obj, "qualities", reps);
+
+	res = JS_Call(ctx->js_ctx, ctx->new_group_fun, ctx->js_obj, 1, &obj);
+	JS_FreeValue(ctx->js_ctx, obj);
+	JS_FreeValue(ctx->js_ctx, res);
+}
+#endif
+
+static void dashdmx_declare_group(GF_DASHDmxCtx *ctx, u32 group_idx)
+{
+	if (ctx->on_new_group)
+		ctx->on_new_group(ctx->rt_udta, group_idx, ctx->dash);
+#ifdef GPAC_HAS_QJS
+	else if (ctx->js_ctx && JS_IsFunction(ctx->js_ctx, ctx->new_group_fun)) {
+		dashdmx_js_declare_group(ctx, group_idx);
+	}
+#endif
+}
+
+void dashdmx_io_manifest_updated(GF_DASHFileIO *dashio, const char *manifest_name, const char *cache_url, s32 group_idx)
+{
+	u8 *manifest_payload;
+	u32 manifest_payload_len;
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
+
+	if (gf_file_load_data(cache_url, &manifest_payload, &manifest_payload_len) == GF_OK) {
+		u8 *output;
+
+		//strip baseURL since we are recording, links are already resolved
+		char *man_pay_start = manifest_payload;
+		while (1) {
+			u32 end_len, offset;
+			manifest_payload_len = (u32) strlen(manifest_payload);
+			char *base_url_start = strstr(man_pay_start, "<BaseURL>");
+			if (!base_url_start) break;
+			char *base_url_end = strstr(base_url_start, "</BaseURL>");
+			if (!base_url_end) break;
+			offset = 10;
+			while (base_url_end[offset] == '\n')
+				offset++;
+			end_len = (u32) strlen(base_url_end+offset);
+			memmove(base_url_start, base_url_end+offset, end_len);
+			base_url_start[end_len]=0;
+			man_pay_start = base_url_start;
+		}
+
+		if ((ctx->forward==DFWD_FILE) && ctx->output_mpd_pid) {
+			GF_FilterPacket *pck = gf_filter_pck_new_alloc(ctx->output_mpd_pid, manifest_payload_len, &output);
+			if (pck) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASHDmx] Manifest %s updated, forwarding\n", manifest_name));
+				memcpy(output, manifest_payload, manifest_payload_len);
+				gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENAME, &PROP_STRING(manifest_name));
+				if (group_idx>=0)
+					gf_filter_pck_set_property(pck, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( (u64) 1+group_idx) );
+
+				gf_filter_pck_send(pck);
+			}
+		} else if (ctx->forward==DFWD_SBOUND_MANIFEST) {
+			if (group_idx>=0) {
+				assert(manifest_name);
+				if (!ctx->hls_variants) ctx->hls_variants = gf_list_new();
+				if (!ctx->hls_variants_names) ctx->hls_variants_names = gf_list_new();
+				gf_list_add(ctx->hls_variants, manifest_payload);
+				manifest_payload = NULL;
+				gf_list_add(ctx->hls_variants_names, gf_strdup(manifest_name) );
+
+			} else {
+				if (ctx->manifest_payload) gf_free(ctx->manifest_payload);
+				ctx->manifest_payload = manifest_payload;
+				manifest_payload = NULL;
+			}
+		}
+		if (manifest_payload)
+			gf_free(manifest_payload);
+	}
+}
+
+static GF_Err dashin_abort(GF_DASHDmxCtx *ctx);
+
 GF_Err dashdmx_io_on_dash_event(GF_DASHFileIO *dashio, GF_DASHEventType dash_evt, s32 group_idx, GF_Err error_code)
 {
 	GF_Err e;
@@ -423,7 +900,7 @@
 	if (dash_evt==GF_DASH_EVENT_PERIOD_SETUP_ERROR) {
 		if (!ctx->initial_setup_done) {
 			gf_filter_setup_failure(ctx->filter, error_code);
-			ctx->initial_setup_done= GF_TRUE;
+			ctx->initial_setup_done = GF_TRUE;
 		}
 		return GF_OK;
 	}
@@ -432,10 +909,14 @@
 #ifdef GPAC_ENABLE_COVERAGE
 		if (gf_sys_is_cov_mode()) {
 			gf_dash_groups_set_language(ctx->dash, gf_opts_get_key("core", "lang"));
-			//these are not used in the test suite (require JS)
-			gf_dash_switch_quality(ctx->dash, GF_TRUE, GF_TRUE);
+			//not used in the test suite (require JS)
+			gf_dash_switch_quality(ctx->dash, GF_TRUE);
+			//not used relyably in the test suite (require fatal error in session)
+			dashin_abort(NULL);
 		}
 #endif
+		if (ctx->groupsel)
+			gf_dash_groups_set_language(ctx->dash, gf_opts_get_key("core", "lang"));
 
 		//let the player decide which group to play: we declare everything
 		return GF_OK;
@@ -443,21 +924,16 @@
 
 	/*for all selected groups, create input service and connect to init/first segment*/
 	if (dash_evt==GF_DASH_EVENT_CREATE_PLAYBACK) {
+		u32 nb_groups_selected = 0;
 		//coverage of a few functions from old arch not deprecated (yet)
 #ifdef GPAC_ENABLE_COVERAGE
 		if (gf_sys_is_cov_mode()) {
-			Bool done;
 			gf_dash_is_group_selected(ctx->dash, 0);
 			gf_dash_get_url(ctx->dash);
-			gf_dash_group_get_segment_init_keys(ctx->dash, 0, NULL);
-			gf_dash_group_get_max_segments_in_cache(ctx->dash, 0);
-			gf_dash_group_get_num_segments_ready(ctx->dash, 0, &done);
-			gf_dash_group_probe_current_download_segment_location(ctx->dash, 0, NULL, NULL, NULL, NULL, NULL);
 			gf_dash_group_loop_detected(ctx->dash, 0);
 			gf_dash_is_dynamic_mpd(ctx->dash);
 			gf_dash_group_get_language(ctx->dash, 0);
 			gf_dash_group_get_num_components(ctx->dash, 0);
-			gf_dash_group_get_download_rate(ctx->dash, 0);
 			gf_dash_get_utc_drift_estimate(ctx->dash);
 
 
@@ -466,20 +942,30 @@
 			gf_dash_group_set_buffer_levels(ctx->dash, 0, 0, 0, 0);
 
 			//these are not used in the test suite (require JS)
-			if (ctx->algo==GF_DASH_ALGO_NONE)
+			if (!strcmp(ctx->algo, "none"))
 				gf_dash_set_automatic_switching(ctx->dash, GF_FALSE);
 			gf_dash_group_select_quality(ctx->dash, (u32) -1, NULL, 0);
 
 			//these are not used yet in the test suite (require TEMI)
 			gf_dash_override_ntp(ctx->dash, 0);
 
-			//these are not used yet in the test suite (require tiling + long run)
+			//this is not used yet in the test suite (require user interaction)
 			gf_dash_group_set_quality_degradation_hint(ctx->dash, 0, 0);
-			gf_dash_group_set_visible_rect(ctx->dash, 0, 0, 0, 0, 0, 0);
-			//this happen only when error downloading a segment
-			gf_dash_set_group_download_state(ctx->dash, 0, GF_OK);
 		}
 #endif
+
+		if (ctx->on_period_reset)
+			ctx->on_period_reset(ctx->rt_udta, gf_dash_is_dynamic_mpd(ctx->dash) ? 2 : 1);
+#ifdef GPAC_HAS_QJS
+		else if (ctx->js_ctx && JS_IsFunction(ctx->js_ctx, ctx->period_reset_fun)) {
+			JSValue arg;
+			arg = JS_NewInt32(ctx->js_ctx, gf_dash_is_dynamic_mpd(ctx->dash) ? 2 : 1);
+			JSValue res = JS_Call(ctx->js_ctx, ctx->period_reset_fun, ctx->js_obj, 1, &arg);
+			JS_FreeValue(ctx->js_ctx, res);
+		}
+#endif
+
+
 		/*select input services if possible*/
 		for (i=0; i<gf_dash_get_group_count(ctx->dash); i++) {
 			const char *mime, *init_segment;
@@ -490,6 +976,9 @@
 			if (!gf_dash_is_group_selectable(ctx->dash, i))
 				continue;
 
+			if (ctx->groupsel && !gf_dash_is_group_selected(ctx->dash, i))
+				continue;
+
 			j=0;
 			while (1) {
 				const char *desc_id, *desc_scheme, *desc_value;
@@ -497,6 +986,7 @@
 					break;
 				j++;
 				if (!strcmp(desc_scheme, "urn:mpeg:dash:srd:2014")) {
+				} else if (!strcmp(desc_scheme, "http://dashif.org/guidelines/trickmode")) {
 				} else {
 					playable = GF_FALSE;
 					break;
@@ -507,8 +997,11 @@
 				continue;
 			}
 
+			nb_groups_selected++;
+
 			if (gf_dash_group_has_dependent_group(ctx->dash, i) >=0 ) {
 				gf_dash_group_select(ctx->dash, i, GF_TRUE);
+				dashdmx_declare_group(ctx, i);
 				continue;
 			}
 
@@ -530,7 +1023,7 @@
 					ctx->width = w;
 					ctx->height = h;
 				}
-				if (ctx->closed) return GF_OK;
+				dashdmx_declare_group(ctx, i);
 			}
 		}
 
@@ -538,18 +1031,8 @@
 			ctx->initial_setup_done = GF_TRUE;
 		}
 
-		//we had a seek outside of the period we were setting up, during period setup !
-		//request the seek again from the player
-		if (ctx->seek_request>=0) {
-#ifdef FILTER_FIXME
-			GF_NetworkCommand com;
-			memset(&com, 0, sizeof(GF_NetworkCommand));
-			com.command_type = GF_NET_SERVICE_SEEK;
-			com.play.start_range = ctx->seek_request;
-			ctx->seek_request = 0;
-			gf_service_command(ctx->service, &com, GF_OK);
-#endif
-
+		if (!nb_groups_selected) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] No groups selectable, not playing !\n"));
 		}
 		return GF_OK;
 	}
@@ -563,6 +1046,7 @@
 				gf_filter_remove_src(ctx->filter, group->seg_filter_src);
 				group->seg_filter_src = NULL;
 			}
+			if (group->template) gf_free(group->template);
 			gf_free(group);
 			gf_dash_set_group_udta(ctx->dash, i, NULL);
 		}
@@ -570,6 +1054,17 @@
 			GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
 			gf_filter_pid_set_udta(opid, NULL);
 		}
+
+		if (ctx->on_period_reset)
+			ctx->on_period_reset(ctx->rt_udta, 0);
+#ifdef GPAC_HAS_QJS
+		else if (ctx->js_ctx && JS_IsFunction(ctx->js_ctx, ctx->period_reset_fun)) {
+			JSValue arg = JS_NewInt32(ctx->js_ctx, 0);
+			JSValue res = JS_Call(ctx->js_ctx, ctx->period_reset_fun, ctx->js_obj, 1, &arg);
+			JS_FreeValue(ctx->js_ctx, res);
+		}
+#endif
+
 		return GF_OK;
 	}
 	if (dash_evt==GF_DASH_EVENT_ABORT_DOWNLOAD) {
@@ -585,26 +1080,18 @@
 	}
 
 	if (dash_evt==GF_DASH_EVENT_QUALITY_SWITCH) {
-		if (group_idx>=0) {
-			GF_DASHGroup *group = gf_dash_get_group_udta(ctx->dash, group_idx);
-			if (!group) {
-				group_idx = gf_dash_group_has_dependent_group(ctx->dash, group_idx);
-				group = gf_dash_get_group_udta(ctx->dash, group_idx);
-			}
-			if (group) {
-				for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
-					GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
-					if (gf_filter_pid_get_udta(opid) != group) continue;
-
-					s32 sel = gf_dash_group_get_active_quality(ctx->dash, group_idx);
-					if (sel>=0) {
-						gf_filter_pid_set_property_str(opid, "has:selected", &PROP_UINT(sel) );
-					}
-					gf_filter_pid_set_property_str(opid, "has:auto", &PROP_UINT(gf_dash_get_automatic_switching(ctx->dash) ) );
-					gf_filter_pid_set_property_str(opid, "has:tilemode", &PROP_UINT(gf_dash_get_tile_adaptation_mode(ctx->dash) ) );
-				}
-			}
-		}
+		if (group_idx<0) return GF_OK;
+
+		GF_DASHGroup *group = gf_dash_get_group_udta(ctx->dash, group_idx);
+
+		if (!group) {
+			group_idx = gf_dash_group_has_dependent_group(ctx->dash, group_idx);
+			group = gf_dash_get_group_udta(ctx->dash, group_idx);
+		}
+		//do not notify HAS status (selected qualities & co) right away, we are still potentially processing packets from previous segment(s)
+		if (group)
+			group->notify_quality_change = GF_TRUE;
+
 		return GF_OK;
 	}
 	if (dash_evt==GF_DASH_EVENT_TIMESHIFT_UPDATE) {
@@ -629,16 +1116,22 @@
 			GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
 			if (gf_filter_pid_get_udta(opid) == group) {
 				GF_FilterPidStatistics stats;
-				if (gf_filter_pid_get_statistics(opid, &stats, GF_STATS_DECODER_SINK) != GF_OK)
-					continue;
+				Bool is_decoder = GF_TRUE;
+				//collect decoder stats, or if not found direct output
+				if (gf_filter_pid_get_statistics(opid, &stats, GF_STATS_DECODER_SINK) != GF_OK) {
+					is_decoder = GF_FALSE;
+					if (gf_filter_pid_get_statistics(opid, &stats, GF_STATS_LOCAL_INPUTS) != GF_OK)
+						continue;
+				}
+
 				if (stats.disconnected)
 					continue;
 
-				if (!stats.nb_processed) stats.nb_processed=1;
-				if (!stats.nb_saps) stats.nb_saps=1;
-
-				gf_dash_group_set_codec_stat(ctx->dash, group_idx, (u32) (stats.total_process_time/stats.nb_processed), stats.max_process_time, (u32) (stats.total_sap_process_time/stats.nb_saps), stats.max_sap_process_time, GF_FALSE, GF_FALSE);
-
+				if (is_decoder) {
+					if (!stats.nb_processed) stats.nb_processed=1;
+					if (!stats.nb_saps) stats.nb_saps=1;
+					gf_dash_group_set_codec_stat(ctx->dash, group_idx, (u32) (stats.total_process_time/stats.nb_processed), stats.max_process_time, (u32) (stats.total_sap_process_time/stats.nb_saps), stats.max_sap_process_time, GF_FALSE, GF_FALSE);
+				}
 
 				gf_dash_group_set_buffer_levels(ctx->dash, group_idx, (u32) (stats.min_playout_time/1000), (u32) (stats.max_buffer_time/1000), (u32) (stats.buffer_time/1000) );
 
@@ -646,6 +1139,35 @@
 			}
 		}
 	}
+
+	//discontinuity at next period, recompute timeline anchor at end of pres
+	if ((dash_evt==GF_DASH_EVENT_END_OF_PERIOD) && group_idx) {
+		ctx->time_discontinuity.num = 0;
+		ctx->time_discontinuity.den = 0;
+
+		for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
+			GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
+
+			//in forward mode, signal period switch at packet level but don't touch timestamps for now
+			if (ctx->forward) {
+				gf_filter_pid_set_udta_flags(opid, 1);
+				continue;
+			}
+			u32 timescale = gf_filter_pid_get_timescale(opid);
+			u64 ts = gf_filter_pid_get_next_ts(opid);
+			if (ts==GF_FILTER_NO_TS) continue;
+
+			if (!ctx->time_discontinuity.den || gf_timestamp_greater(ts, timescale, ctx->time_discontinuity.num, ctx->time_discontinuity.den)) {
+				ctx->time_discontinuity.num = ts;
+				ctx->time_discontinuity.den = timescale;
+			}
+		}
+		if (ctx->time_discontinuity.num && ctx->time_discontinuity.den) {
+			gf_filter_post_process_task(ctx->filter);
+			ctx->compute_min_dts = GF_TRUE;
+		}
+	}
+
 	return GF_OK;
 }
 
@@ -657,7 +1179,7 @@
 	play_buf_ms /= 1000;
 
 	//use min buffer from MPD
-	if (ctx->use_bmin) {
+	if (ctx->use_bmin==BMIN_MPD) {
 		u64 mpd_buffer_ms = gf_dash_get_min_buffer_time(ctx->dash);
 		if (mpd_buffer_ms > buffer_ms)
 			buffer_ms = (u32) mpd_buffer_ms;
@@ -699,11 +1221,23 @@
 	return -1;
 }
 
-static GF_FilterPid *dashdmx_create_output_pid(GF_Filter *filter, GF_FilterPid *input, u32 *run_status)
+static GF_FilterPid *dashdmx_opid_from_group(GF_DASHDmxCtx *ctx, GF_DASHGroup *group)
+{
+	s32 i;
+
+	for (i=0; (u32) i < gf_filter_get_opid_count(ctx->filter); i++) {
+		GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i );
+		GF_DASHGroup *g = gf_filter_pid_get_udta( opid );
+		if (g == group) return opid;
+	}
+	return NULL;
+}
+
+static GF_FilterPid *dashdmx_create_output_pid(GF_DASHDmxCtx *ctx, GF_FilterPid *input, u32 *run_status, GF_DASHGroup *for_group)
 {
 	u32 global_score=0;
 	GF_FilterPid *output_pid = NULL;
-	u32 i, count = gf_filter_get_opid_count(filter);
+	u32 i, count = gf_filter_get_opid_count(ctx->filter);
 	const GF_PropertyValue *codec, *streamtype, *role, *lang;
 
 	*run_status = 0;
@@ -719,9 +1253,10 @@
 	for (i=0; i<count; i++) {
 		u32 score;
 		const GF_PropertyValue *o_codec, *o_streamtype, *o_role, *o_lang;
-		GF_FilterPid *opid = gf_filter_get_opid(filter, i);
+		GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
 		//in use by us
 		if (gf_filter_pid_get_udta(opid)) continue;
+		if (opid == ctx->output_mpd_pid) continue;
 
 		o_streamtype = gf_filter_pid_get_property(opid, GF_PROP_PID_STREAM_TYPE);
 		if (o_streamtype && o_streamtype->value.uint==GF_STREAM_ENCRYPTED)
@@ -752,8 +1287,9 @@
 		*run_status = gf_filter_pid_is_playing(output_pid) ? 1 : 2;
 		return output_pid;
 	}
-	//none found create a new PID
-	return gf_filter_pid_new(filter);
+	//none found create a new PID - mark pid as pending so we don't process it until we get play
+	for_group->nb_pending++;
+	return gf_filter_pid_new(ctx->filter);
 }
 
 Bool dashdmx_merge_prop(void *cbk, u32 prop_4cc, const char *prop_name, const GF_PropertyValue *src_prop)
@@ -767,22 +1303,98 @@
 	return GF_TRUE;
 }
 
-static void dashdmx_declare_properties(GF_DASHDmxCtx *ctx, GF_DASHGroup *group, u32 group_idx, GF_FilterPid *opid, GF_FilterPid *ipid)
+
+static void dashdm_format_qinfo(char **q_desc, GF_DASHQualityInfo *qinfo)
+{
+	GF_Err e;
+	char szInfo[500];
+	if (!qinfo->ID) qinfo->ID="";
+	if (!qinfo->mime) qinfo->mime="unknown";
+	if (!qinfo->codec) qinfo->codec="codec";
+
+	snprintf(szInfo, 500, "id=%s", qinfo->ID);
+
+	e = gf_dynstrcat(q_desc, szInfo, "::");
+	if (e) return;
+
+	snprintf(szInfo, 500, "codec=%s", qinfo->codec);
+	e = gf_dynstrcat(q_desc, szInfo, "::");
+	if (e) return;
+
+	snprintf(szInfo, 500, "mime=%s", qinfo->mime);
+	e = gf_dynstrcat(q_desc, szInfo, "::");
+	if (e) return;
+
+	snprintf(szInfo, 500, "bw=%d", qinfo->bandwidth);
+	e = gf_dynstrcat(q_desc, szInfo, "::");
+	if (e) return;
+
+	if (qinfo->disabled) {
+		e = gf_dynstrcat(q_desc, "disabled", "::");
+		if (e) return;
+	}
+
+	if (qinfo->width && qinfo->height) {
+		snprintf(szInfo, 500, "w=%d", qinfo->width);
+		e = gf_dynstrcat(q_desc, szInfo, "::");
+		if (e) return;
+
+		snprintf(szInfo, 500, "h=%d", qinfo->height);
+		e = gf_dynstrcat(q_desc, szInfo, "::");
+		if (e) return;
+
+		if (qinfo->interlaced) {
+			e = gf_dynstrcat(q_desc, "interlaced", "::");
+			if (e) return;
+		}
+		if (qinfo->fps_den) {
+			snprintf(szInfo, 500, "fps=%d/%d", qinfo->fps_num, qinfo->fps_den);
+		} else {
+			snprintf(szInfo, 500, "fps=%d", qinfo->fps_num);
+		}
+		e = gf_dynstrcat(q_desc, szInfo, "::");
+		if (e) return;
+
+		if (qinfo->par_den && qinfo->par_num && (qinfo->par_den != qinfo->par_num)) {
+			snprintf(szInfo, 500, "sar=%d/%d", qinfo->par_num, qinfo->par_den);
+			e = gf_dynstrcat(q_desc, szInfo, "::");
+			if (e) return;
+		}
+	}
+	if (qinfo->sample_rate) {
+		snprintf(szInfo, 500, "sr=%d", qinfo->sample_rate);
+		e = gf_dynstrcat(q_desc, szInfo, "::");
+		if (e) return;
+
+		snprintf(szInfo, 500, "ch=%d", qinfo->nb_channels);
+		e = gf_dynstrcat(q_desc, szInfo, "::");
+		if (e) return;
+	}
+}
+
+static void dashdmx_declare_properties(GF_DASHDmxCtx *ctx, GF_DASHGroup *group, u32 group_idx, GF_FilterPid *opid, GF_FilterPid *ipid, Bool is_period_switch)
 {
 	GF_DASHQualityInfo qinfo;
 	GF_PropertyValue qualities, srd, srdref;
 	GF_Err e;
+	u32 stream_type = GF_STREAM_UNKNOWN;
 	u32 count, i;
 	u32 dur, mode;
 
 	gf_filter_pid_copy_properties(opid, ipid);
 
 	if (!group->nb_group_deps) {
-		u32 asid;
+		s32 asid;
 		char as_name[100];
 		asid = gf_dash_group_get_as_id(ctx->dash, group_idx);
-		if (!asid) asid = group_idx+1;
-		sprintf(as_name, "AS%d", asid);
+		//TODO: remove and regenerate hashes
+		if (gf_sys_is_test_mode() && (asid<=0)) {
+			sprintf(as_name, "AS%d", group_idx+1);
+		} else if (asid<0) {
+			sprintf(as_name, "AS_%d", group_idx+1);
+		} else {
+			sprintf(as_name, "AS%d", asid);
+		}
 		gf_filter_pid_set_name(opid, as_name);
 	}
 
@@ -797,94 +1409,150 @@
 	dur = (u32) (1000*gf_dash_get_duration(ctx->dash) );
 	if (dur>0)
 		gf_filter_pid_set_property(opid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(dur, 1000) );
+	else
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DURATION, NULL);
 
-	dur = (1000*gf_dash_group_get_time_shift_buffer_depth(ctx->dash, group_idx) );
-	if (dur>0)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_TIMESHIFT_DEPTH, &PROP_FRAC_INT(dur, 1000) );
+	dur = gf_dash_group_get_time_shift_buffer_depth(ctx->dash, group_idx);
+	if ((s32) dur > 0)
+		gf_filter_pid_set_property(opid, GF_PROP_PID_TIMESHIFT_DEPTH, &PROP_FRAC_INT(1000*dur, 1000) );
 
 
-	if (ctx->use_bmin) {
+	if (ctx->use_bmin==BMIN_MPD) {
 		u32 max = gf_dash_get_min_buffer_time(ctx->dash);
-		gf_filter_pid_set_property_str(opid, "BufferLength", &PROP_UINT(max));
+		gf_filter_pid_set_property(opid, GF_PROP_PID_PLAY_BUFFER, &PROP_UINT(max));
+	}
+	//check if low latency is on, if not notify max segment duration as target min buffer
+	//we don't do this in test mode, it breaks all inspect hashes
+	else if ((ctx->use_bmin==BMIN_AUTO) && !gf_sys_is_test_mode()) {
+		Bool do_set = GF_FALSE;
+		u32 min_buf = gf_dash_get_max_segment_duration(ctx->dash);
+		//low latency not enabled or not active
+		if (!ctx->lowlat || !gf_dash_is_low_latency(ctx->dash, group_idx)) {
+			do_set = GF_TRUE;
+		}
+		//or we have dependent groups, no low latency possible for now
+		else if (group->nb_group_deps) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] Low-Latency dependent group (tiling & co) not supported, using regular download\n"));
+			do_set = GF_TRUE;
+			ctx->lowlat = 0;
+			gf_dash_set_low_latency_mode(ctx->dash, ctx->lowlat);
+		}
+		//set play buffer for all output pids
+		if (do_set && min_buf) {
+			for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
+				GF_FilterPid *a_opid = gf_filter_get_opid(ctx->filter, i);
+				gf_filter_pid_set_property(a_opid, GF_PROP_PID_PLAY_BUFFER, &PROP_UINT(min_buf));
+			}
+		}
 	}
 
 	memset(&qualities, 0, sizeof(GF_PropertyValue));
 	qualities.type = GF_PROP_STRING_LIST;
-	qualities.value.string_list = gf_list_new();
 
 	count = gf_dash_group_get_num_qualities(ctx->dash, group_idx);
 	for (i=0; i<count; i++) {
-		char szInfo[500];
 		char *qdesc = NULL;
 
 		e = gf_dash_group_get_quality_info(ctx->dash, group_idx, i, &qinfo);
 		if (e) break;
-		if (!qinfo.ID) qinfo.ID="";
+
 		if (!qinfo.mime) qinfo.mime="unknown";
 		if (!qinfo.codec) qinfo.codec="codec";
 
-		snprintf(szInfo, 500, "id=%s", qinfo.ID);
-
-		e = gf_dynstrcat(&qdesc, szInfo, "::");
-		if (e) break;
+		if (qinfo.width && qinfo.height) {
+			stream_type = GF_STREAM_VISUAL;
+		} else if (qinfo.sample_rate || qinfo.nb_channels) {
+			stream_type = GF_STREAM_AUDIO;
+		} else if (strstr(qinfo.mime, "text")
+			|| strstr(qinfo.codec, "vtt")
+			|| strstr(qinfo.codec, "srt")
+			|| strstr(qinfo.codec, "text")
+			|| strstr(qinfo.codec, "tx3g")
+			|| strstr(qinfo.codec, "stxt")
+			|| strstr(qinfo.codec, "stpp")
+		) {
+			stream_type = GF_STREAM_TEXT;
+		}
+		dashdm_format_qinfo(&qdesc, &qinfo);
 
-		snprintf(szInfo, 500, "codec=%s", qinfo.codec);
-		e = gf_dynstrcat(&qdesc, szInfo, "::");
-		if (e) break;
+		qualities.value.string_list.vals = gf_realloc(qualities.value.string_list.vals, sizeof(char *) * (qualities.value.string_list.nb_items+1));
 
-		snprintf(szInfo, 500, "mime=%s", qinfo.mime);
-		e = gf_dynstrcat(&qdesc, szInfo, "::");
-		if (e) break;
+		qualities.value.string_list.vals[qualities.value.string_list.nb_items] = qdesc;
+		qualities.value.string_list.nb_items++;
+		qdesc = NULL;
+	}
+	gf_filter_pid_set_info_str(opid, "has:qualities", &qualities);
 
-		snprintf(szInfo, 500, "bw=%d", qinfo.bandwidth);
-		e = gf_dynstrcat(&qdesc, szInfo, "::");
-		if (e) break;
+	if (group->nb_group_deps) {
+		GF_PropertyValue srd_deps;
+		gf_filter_pid_set_info_str(opid, "has:group_deps", &PROP_UINT(group->nb_group_deps) );
+		memset(&srd_deps, 0, sizeof(GF_PropertyValue));
+		srd_deps.type = GF_PROP_STRING_LIST;
+		srd_deps.value.string_list.nb_items = group->nb_group_deps;
+		srd_deps.value.string_list.vals = gf_malloc(sizeof(char *) * group->nb_group_deps);
+
+		for (i=0; i<group->nb_group_deps; i++) {
+			char szSRDInf[1024];
+			GF_PropertyValue deps_q;
+			u32 k, nb_q;
+			u32 g_idx = gf_dash_get_dependent_group_index(ctx->dash, group_idx, i);
+			szSRDInf[0] = 0;
+			if (gf_dash_group_get_srd_info(ctx->dash, g_idx, NULL,
+					&srd.value.vec4i.x,
+					&srd.value.vec4i.y,
+					&srd.value.vec4i.z,
+					&srd.value.vec4i.w,
+					&srdref.value.vec2i.x,
+					&srdref.value.vec2i.y)
+			) {
+				sprintf(szSRDInf, "%dx%dx%dx%d@%dx%d", srd.value.vec4i.x, srd.value.vec4i.y, srd.value.vec4i.z, srd.value.vec4i.w, srdref.value.vec2i.x, srdref.value.vec2i.y);
+			}
+			srd_deps.value.string_list.vals[i] = gf_strdup(szSRDInf);
+
+			memset(&deps_q, 0, sizeof(GF_PropertyValue));
+			deps_q.type = GF_PROP_STRING_LIST;
+			nb_q = gf_dash_group_get_num_qualities(ctx->dash, g_idx);
+			deps_q.value.string_list.nb_items = nb_q;
+			deps_q.value.string_list.vals = gf_malloc(sizeof(char *) * nb_q);
+
+			for (k=0; k<nb_q; k++) {
+				char *qdesc = NULL;
+				e = gf_dash_group_get_quality_info(ctx->dash, g_idx, k, &qinfo);
+				if (e) break;
 
-		if (qinfo.disabled) {
-			e = gf_dynstrcat(&qdesc, "disabled", "::");
-			if (e) break;
+				dashdm_format_qinfo(&qdesc, &qinfo);
+				deps_q.value.string_list.vals[k] = qdesc;
+			}
+			sprintf(szSRDInf, "has:deps_%d_qualities", i+1);
+			gf_filter_pid_set_info_dyn(opid, szSRDInf, &deps_q);
 		}
+		gf_filter_pid_set_info_str(opid, "has:groups_srd", &srd_deps);
+	}
 
-		if (qinfo.width && qinfo.height) {
-			snprintf(szInfo, 500, "w=%d", qinfo.width);
-			e = gf_dynstrcat(&qdesc, szInfo, "::");
-			if (e) break;
-
-			snprintf(szInfo, 500, "h=%d", qinfo.height);
-			e = gf_dynstrcat(&qdesc, szInfo, "::");
-			if (e) break;
+	if ((ctx->forward==DFWD_FILE) && (stream_type!=GF_STREAM_UNKNOWN)) {
+		gf_filter_pid_set_property(opid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(stream_type) );
 
-			if (qinfo.interlaced) {
-				e = gf_dynstrcat(&qdesc, "interlaced", "::");
-				if (e) break;
-			}
-			if (qinfo.fps_den) {
-				snprintf(szInfo, 500, "fps=%d/%d", qinfo.fps_num, qinfo.fps_den);
-			} else {
-				snprintf(szInfo, 500, "fps=%d", qinfo.fps_num);
-			}
-			e = gf_dynstrcat(&qdesc, szInfo, "::");
-			if (e) break;
+		gf_filter_pid_set_property(opid, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( (u64) 1+group->idx) );
 
-			if (qinfo.par_den && qinfo.par_num && (qinfo.par_den != qinfo.par_num)) {
-				snprintf(szInfo, 500, "sar=%d/%d", qinfo.par_num, qinfo.par_den);
-				e = gf_dynstrcat(&qdesc, szInfo, "::");
-				if (e) break;
-			}
+		if (!gf_dash_group_has_init_segment(ctx->dash, group_idx)) {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_NO_INIT, &PROP_BOOL(GF_TRUE) );
 		}
-		if (qinfo.sample_rate) {
-			snprintf(szInfo, 500, "sr=%d", qinfo.sample_rate);
-			e = gf_dynstrcat(&qdesc, szInfo, "::");
-			if (e) break;
-
-			snprintf(szInfo, 500, "ch=%d", qinfo.nb_channels);
-			e = gf_dynstrcat(&qdesc, szInfo, "::");
-			if (e) break;
+	}
+
+	if (ctx->forward == DFWD_FILE) {
+		u32 segdur, timescale;
+		u64 tsb = (u64) gf_dash_group_get_time_shift_buffer_depth(ctx->dash, group_idx);
+		gf_dash_group_get_segment_duration(ctx->dash, group_idx, &segdur, &timescale);
+		if (segdur) {
+			tsb *= timescale;
+			tsb /= segdur;
+			tsb /= 1000; //tsb given in ms
+		} else {
+			tsb = 0;
 		}
-		gf_list_add(qualities.value.string_list, qdesc);
-		qdesc = NULL;
+		tsb++;
+		gf_filter_pid_set_property(opid, GF_PROP_PID_TIMESHIFT_SEGS, &PROP_UINT((u32) tsb) );
 	}
-	gf_filter_pid_set_info_str(opid, "has:qualities", &qualities);
 
 	const char *title, *source;
 	gf_dash_get_info(ctx->dash, &title, &source);
@@ -910,16 +1578,6 @@
 		gf_filter_pid_set_info_str(opid, "ntpdiff", &PROP_SINT(gf_dash_get_utc_drift_estimate(ctx->dash) ) );
 	}
 
-#ifdef FILTER_FIXME
-	//need to implement back dependent group SRD and qualities (fir HEVC tiles)
-	if (com->srd.dependent_group_index) {
-		if (com->srd.dependent_group_index > gf_dash_group_get_num_groups_depending_on(ctx->dash, idx))
-			return GF_BAD_PARAM;
-
-		idx = gf_dash_get_dependent_group_index(ctx->dash, idx, com->srd.dependent_group_index-1);
-	}
-#endif
-
 	memset(&srd, 0, sizeof(GF_PropertyValue));
 	memset(&srdref, 0, sizeof(GF_PropertyValue));
 	srd.type = GF_PROP_VEC4I;
@@ -937,20 +1595,73 @@
 	}
 
 	//setup initial quality - this is disabled in test mode for the time being (invalidates all dash playback hashes)
-	if (!gf_sys_is_test_mode())
-		dashdmx_io_on_dash_event(&ctx->dash_io, GF_DASH_EVENT_QUALITY_SWITCH, group->idx, GF_OK);
-
+	//in forward mode, always send the event to setup dash templates
+	if (!gf_sys_is_test_mode() || ctx->forward) {
+		group->notify_quality_change = GF_TRUE;
+		dashdmx_notify_group_quality(ctx, group);
+	}
 
 	//if MPD file pid is defined, merge its properties. This will allow forwarding user-defined properties,
 	// eg -i dash.mpd:#MyProp=toto to all PIDs coming from media sources
 	if (ctx->mpd_pid) {
 		gf_filter_pid_merge_properties(opid, ctx->mpd_pid, dashdmx_merge_prop, ipid);
 	}
+
+	if (ctx->frag_url)
+		gf_filter_pid_set_property(opid, GF_PROP_PID_ORIG_FRAG_URL, &PROP_NAME(ctx->frag_url) );
+
+	if (stream_type == GF_STREAM_AUDIO) {
+		Bool is_cont = GF_FALSE;
+		if (is_period_switch) {
+			u32 j=0;
+			while (1) {
+				const char *desc_id, *desc_scheme, *desc_value;
+				if (! gf_dash_group_enum_descriptor(ctx->dash, group_idx, GF_MPD_DESC_SUPPLEMENTAL_PROPERTIES, j, &desc_id, &desc_scheme, &desc_value))
+					break;
+				j++;
+				if (!strcmp(desc_scheme, "urn:mpeg:dash:period-continuity:2015") && desc_value) {
+					is_cont = GF_TRUE;
+					break;
+				}
+			}
+		}
+		gf_filter_pid_set_property(opid, GF_PROP_PID_NO_PRIMING, is_cont ? &PROP_BOOL(GF_TRUE) : NULL);
+	}
+
+	if (group->hls_key_uri) {
+		gf_filter_pid_set_property(opid, GF_PROP_PID_HLS_KMS, &PROP_STRING(group->hls_key_uri));
+		gf_filter_pid_set_property(opid, GF_PROP_PID_HLS_IV, &PROP_DATA(group->hls_key_IV, sizeof(bin128) ));
+	}
+
+	if (ctx->forward > DFWD_FILE) {
+		u64 pstart;
+		u32 timescale;
+		const char *str = NULL;
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_FWD, &PROP_UINT( (ctx->forward - DFWD_FILE) ) );
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("inband") );
+
+		gf_dash_group_get_segment_duration(ctx->dash, group->idx, &dur, &timescale);
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC_INT(dur, timescale) );
+
+		gf_dash_group_next_seg_info(ctx->dash, group->idx, group->current_dependent_rep_idx, NULL, NULL, NULL, NULL, &str);
+		if (str) {
+			gf_filter_pid_set_property(opid, GF_PROP_PCK_FILENAME, &PROP_STRING(str) );
+		}
+
+		//forward representation ID so that dasher will match muxed streams and identify streams in the MPD
+		str = gf_dash_group_get_representation_id(ctx->dash, group->idx);
+		if (str) {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_REP_ID, &PROP_STRING(str) );
+		}
+		pstart = gf_dash_get_period_start(ctx->dash);
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_PERIOD_START, &PROP_LONGUINT(pstart) );
+	}
 }
 
 static GF_Err dashdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	s32 group_idx;
+	Bool is_period_switch = GF_FALSE;
 	GF_FilterPid *opid;
 	GF_Err e;
 	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
@@ -991,6 +1702,7 @@
 
 	//configure MPD pid
 	if (!ctx->mpd_pid) {
+		char *frag;
 		const GF_PropertyValue *p;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
 		if (!p || !p->value.string) {
@@ -1003,17 +1715,41 @@
 		ctx->seek_request = -1;
 		ctx->nb_playing = 0;
 
+		if ((ctx->forward==DFWD_FILE) && !ctx->output_mpd_pid) {
+			ctx->output_mpd_pid = gf_filter_pid_new(filter);
+			gf_filter_pid_copy_properties(ctx->output_mpd_pid, pid);
+			gf_filter_pid_set_name(ctx->output_mpd_pid, "manifest");
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASHDmx] Creating manifest output PID\n"));
+			//for route
+			gf_filter_pid_set_property(ctx->output_mpd_pid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
+			gf_filter_pid_set_property(ctx->output_mpd_pid, GF_PROP_PID_IS_MANIFEST, &PROP_BOOL(GF_TRUE));
+		}
+
 		e = gf_dash_open(ctx->dash, p->value.string);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] Error - cannot initialize DASH Client for %s: %s\n", p->value.string, gf_error_to_string(e)));
 			gf_filter_setup_failure(filter, e);
 			return e;
 		}
+		frag = strchr(p->value.string, '#');
+		if (frag) {
+			if (ctx->frag_url) gf_free(ctx->frag_url);
+			ctx->frag_url = gf_strdup(frag+1);
+		}
+		if (gf_dash_is_m3u8(ctx->dash) || gf_dash_is_smooth_streaming(ctx->dash))
+			ctx->is_dash = GF_FALSE;
+		else
+			ctx->is_dash = GF_TRUE;
+
 		//we have a redirect URL on mpd pid, this means this comes from a service feeding the cache so we won't get any data on the pid.
 		//request a process task
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_REDIRECT_URL);
-		if (p && p->value.string)
+		if (p && p->value.string) {
+			GF_FilterEvent evt;
+			GF_FEVT_INIT(evt, GF_FEVT_PLAY, ctx->mpd_pid);
+			gf_filter_pid_send_event(ctx->mpd_pid, &evt);
 			gf_filter_post_process_task(filter);
+		}
 		return GF_OK;
 	} else if (ctx->mpd_pid == pid) {
 		return GF_OK;
@@ -1022,6 +1758,12 @@
 	//figure out group for this pid
 	group_idx = dashdmx_group_idx_from_pid(ctx, pid);
 	if (group_idx<0) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+		if (p && strstr(DASHIN_MIMES, p->value.string)) return GF_REQUIRES_NEW_INSTANCE;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
+		if (p && strstr(DASHIN_FILE_EXT, p->value.string)) return GF_REQUIRES_NEW_INSTANCE;
+
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] Failed to locate adaptation set for input pid\n"));
 		return GF_SERVICE_ERROR;
 	}
@@ -1034,9 +1776,10 @@
 		group = gf_dash_get_group_udta(ctx->dash, group_idx);
 		assert(group);
 		//for now we declare every component from the input source
-		opid = dashdmx_create_output_pid(filter, pid, &run_status);
+		opid = dashdmx_create_output_pid(ctx, pid, &run_status, group);
 		gf_filter_pid_set_udta(opid, group);
 		gf_filter_pid_set_udta(pid, opid);
+		gf_filter_pid_set_udta_flags(opid, 0);
 		group->nb_pids ++;
 
 		if (run_status) {
@@ -1053,10 +1796,12 @@
 				GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
 				gf_filter_pid_send_event(pid, &evt);
 				group->is_playing = GF_FALSE;
+			} else {
+				is_period_switch = GF_TRUE;
 			}
 		}
 	}
-	dashdmx_declare_properties(ctx, group, group_idx, opid, pid);
+	dashdmx_declare_properties(ctx, group, group_idx, opid, pid, is_period_switch);
 
 
 	//reset the file cache property (init segment could be cached but not the rest)
@@ -1065,13 +1810,227 @@
 	return GF_OK;
 }
 
+#ifdef GPAC_HAS_QJS
+
+static s32 dashdmx_algo_js(void *udta, u32 group, u32 base_group, Bool force_lower_complexity, GF_DASHCustomAlgoInfo *stats)
+{
+	s32 res;
+	JSValue ret, args[4];
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)udta;
+
+	gf_js_lock(ctx->js_ctx, GF_TRUE);
+	args[0] = JS_NewInt32(ctx->js_ctx, group);
+	args[1] = JS_NewInt32(ctx->js_ctx, base_group);
+	args[2] = JS_NewBool(ctx->js_ctx, force_lower_complexity);
+	args[3] = JS_NewObject(ctx->js_ctx);
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "rate", JS_NewInt32(ctx->js_ctx, stats->download_rate) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "filesize", JS_NewInt32(ctx->js_ctx, stats->file_size) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "speed", JS_NewFloat64(ctx->js_ctx, stats->speed) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "max_speed", JS_NewFloat64(ctx->js_ctx, stats->max_available_speed) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "display_width", JS_NewInt32(ctx->js_ctx, stats->display_width) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "display_height", JS_NewInt32(ctx->js_ctx, stats->display_height) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "active_quality", JS_NewInt32(ctx->js_ctx, stats->active_quality_idx) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "buffer_min", JS_NewInt32(ctx->js_ctx, stats->buffer_min_ms) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "buffer_max", JS_NewInt32(ctx->js_ctx, stats->buffer_max_ms) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "buffer", JS_NewInt32(ctx->js_ctx, stats->buffer_occupancy_ms) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "degradation_hint", JS_NewInt32(ctx->js_ctx, stats->quality_degradation_hint) );
+	JS_SetPropertyStr(ctx->js_ctx, args[3], "total_rate", JS_NewInt32(ctx->js_ctx, stats->total_rate) );
+	ret = JS_Call(ctx->js_ctx, ctx->rate_fun, ctx->js_obj, 4, args);
+	JS_FreeValue(ctx->js_ctx, args[3]);
+
+	if (JS_IsException(ret)) {
+		js_dump_error(ctx->js_ctx);
+		res = -3;
+	} else if (JS_ToInt32(ctx->js_ctx, &res, ret))
+		res = -1;
+
+	JS_FreeValue(ctx->js_ctx, ret);
+	gf_js_lock(ctx->js_ctx, GF_FALSE);
+	return res;
+}
+
+s32 dashdmx_download_monitor_js(void *udta, u32 group, u32 bits_per_sec, u64 total_bytes, u64 bytes_done, u64 us_since_start, u32 buffer_dur_ms, u32 current_seg_dur)
+{
+	s32 res = -1;
+	JSValue ret, args[2];
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)udta;
+
+	gf_js_lock(ctx->js_ctx, GF_TRUE);
+
+	args[0] = JS_NewInt32(ctx->js_ctx, group);
+	args[1] = JS_NewObject(ctx->js_ctx);
+	JS_SetPropertyStr(ctx->js_ctx, args[1], "bits_per_second", JS_NewInt32(ctx->js_ctx, bits_per_sec) );
+	JS_SetPropertyStr(ctx->js_ctx, args[1], "total_bytes", JS_NewInt64(ctx->js_ctx, total_bytes) );
+	JS_SetPropertyStr(ctx->js_ctx, args[1], "bytes_done", JS_NewInt64(ctx->js_ctx, bytes_done) );
+	JS_SetPropertyStr(ctx->js_ctx, args[1], "us_since_start", JS_NewInt64(ctx->js_ctx, us_since_start) );
+	JS_SetPropertyStr(ctx->js_ctx, args[1], "buffer_duration", JS_NewInt32(ctx->js_ctx, buffer_dur_ms) );
+	JS_SetPropertyStr(ctx->js_ctx, args[1], "current_segment_duration", JS_NewInt32(ctx->js_ctx, current_seg_dur) );
+	ret = JS_Call(ctx->js_ctx, ctx->download_fun, ctx->js_obj, 2, args);
+	JS_FreeValue(ctx->js_ctx, args[1]);
+	if (JS_ToInt32(ctx->js_ctx, &res, ret))
+		res = -1;
+	JS_FreeValue(ctx->js_ctx, ret);
+
+	gf_js_lock(ctx->js_ctx, GF_FALSE);
+	return res;
+}
+void dashdmx_cleanup_js(GF_DASHDmxCtx *ctx)
+{
+	if (ctx->js_ctx) {
+		gf_js_lock(ctx->js_ctx, GF_TRUE);
+		JS_FreeValue(ctx->js_ctx, ctx->rate_fun);
+		JS_FreeValue(ctx->js_ctx, ctx->download_fun);
+		JS_FreeValue(ctx->js_ctx, ctx->new_group_fun);
+		JS_FreeValue(ctx->js_ctx, ctx->period_reset_fun);
+
+		if (!ctx->owns_context)
+			JS_FreeValue(ctx->js_ctx, ctx->js_obj);
+
+		gf_js_lock(ctx->js_ctx, GF_FALSE);
+		if (ctx->owns_context)
+			gf_js_delete_context(ctx->js_ctx);
+		ctx->js_ctx = NULL;
+		ctx->owns_context = GF_FALSE;
+		ctx->rate_fun = ctx->download_fun = ctx->new_group_fun= ctx->period_reset_fun = JS_UNDEFINED;
+	}
+}
+
+#define GET_FUN(_field, _name) \
+	dashctx->_field = JS_GetPropertyStr(ctx, dashctx->js_obj, _name); \
+	if (! JS_IsFunction(ctx, dashctx->_field)) {\
+		JS_FreeValue(dashctx->js_ctx, dashctx->_field); \
+		dashctx->_field = JS_NULL;\
+	}
+
+
+JSValue dashdmx_bind_js(GF_Filter *f, JSContext *ctx, JSValueConst obj)
+{
+	GF_DASHDmxCtx *dashctx = (GF_DASHDmxCtx *) gf_filter_get_udta(f);
+	JSValue rate_fun;
+
+	rate_fun = JS_GetPropertyStr(ctx, obj, "rate_adaptation");
+	if (! JS_IsFunction(ctx, rate_fun)) {
+		JS_FreeValue(ctx, rate_fun);
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Object does not define a rate_adaptation function\n");
+	}
+
+	if (dashctx->js_ctx) {
+		dashdmx_cleanup_js(dashctx);
+	}
+	dashctx->js_ctx = ctx;
+	dashctx->js_obj = JS_DupValue(ctx, obj);
+	dashctx->rate_fun = rate_fun;
+
+	GET_FUN(download_fun, "download_monitor")
+	GET_FUN(new_group_fun, "new_group")
+	GET_FUN(period_reset_fun, "period_reset")
+
+	if (JS_IsFunction(ctx, dashctx->download_fun)) {
+		gf_dash_set_algo_custom(dashctx->dash, dashctx, dashdmx_algo_js, dashdmx_download_monitor_js);
+		dashctx->abort = GF_TRUE;
+	} else {
+		gf_dash_set_algo_custom(dashctx->dash, dashctx, dashdmx_algo_js, NULL);
+		dashctx->abort = GF_FALSE;
+	}
+	return JS_UNDEFINED;
+}
+
+
+static GF_Err dashdmx_initialize_js(GF_DASHDmxCtx *dashctx, char *jsfile)
+{
+ JSContext *ctx;
+	JSValue global_obj, ret;
+	u8 *buf;
+	u32 buf_len;
+	GF_Err e;
+	u32 flags = JS_EVAL_TYPE_GLOBAL;
+
+	e = gf_file_load_data(jsfile, &buf, &buf_len);
+	if (e) return e;
+
+	ctx = gf_js_create_context();
+	if (!ctx) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DASHDmx] Failed to load QuickJS context\n"));
+		if (buf) gf_free(buf);
+		return GF_IO_ERR;
+	}
+	JS_SetContextOpaque(ctx, dashctx);
+	dashctx->owns_context = GF_TRUE;
+
+ global_obj = JS_GetGlobalObject(ctx);
+	js_load_constants(ctx, global_obj);
+	dashctx->js_ctx = ctx;
+
+	JS_SetPropertyStr(dashctx->js_ctx, global_obj, "_gpac_log_name", JS_NewString(dashctx->js_ctx, gf_file_basename(jsfile) ) );
+	dashctx->js_obj = JS_NewObject(dashctx->js_ctx);
+	JS_SetPropertyStr(dashctx->js_ctx, global_obj, "dashin", dashctx->js_obj);
+
+ 	if (!gf_opts_get_bool("core", "no-js-mods") && JS_DetectModule((char *)buf, buf_len)) {
+ 		//init modules, except webgl
+		qjs_init_all_modules(dashctx->js_ctx, GF_TRUE, GF_FALSE);
+		flags = JS_EVAL_TYPE_MODULE;
+	}
+
+	ret = JS_Eval(dashctx->js_ctx, (char *)buf, buf_len, jsfile, flags);
+	gf_free(buf);
+
+	if (JS_IsException(ret)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DASHDmx] Error loading script %s\n", jsfile));
+ js_dump_error(dashctx->js_ctx);
+		JS_FreeValue(dashctx->js_ctx, ret);
+		JS_FreeValue(dashctx->js_ctx, global_obj);
+		return GF_BAD_PARAM;
+	}
+	JS_FreeValue(dashctx->js_ctx, ret);
+ JS_FreeValue(dashctx->js_ctx, global_obj);
+
+	dashctx->rate_fun = JS_GetPropertyStr(ctx, dashctx->js_obj, "rate_adaptation");
+	if (! JS_IsFunction(ctx, dashctx->rate_fun)) {
+		JS_FreeValue(dashctx->js_ctx, dashctx->rate_fun);
+		dashctx->rate_fun = JS_UNDEFINED;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DASHDmx] JS file does not define a rate_adaptation function in dasher object\n"));
+		return GF_BAD_PARAM;
+	}
+
+
+	GET_FUN(download_fun, "download_monitor")
+	GET_FUN(new_group_fun, "new_group")
+	GET_FUN(period_reset_fun, "period_reset")
+	return GF_OK;
+}
+
+#endif
+
+static const GF_FilterCapability DASHDmxFileModeCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "mpd|m3u8|3gm|ism"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/dash+xml|video/vnd.3gpp.mpd|audio/vnd.3gpp.mpd|video/vnd.mpeg.dash.mpd|audio/vnd.mpeg.dash.mpd|audio/mpegurl|video/mpegurl|application/vnd.ms-sstr+xml|application/x-mpegURL|application/vnd.apple.mpegURL"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	//accept only file streams and produce them
+	{ .code=GF_PROP_PID_STREAM_TYPE, .val.type=GF_PROP_UINT, .val.value.uint=GF_STREAM_FILE, .flags=(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_LOADED_FILTER) },
+};
+
 static GF_Err dashdmx_initialize(GF_Filter *filter)
 {
+	u32 timeshift;
 	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
+	GF_DASHAdaptationAlgorithm algo = GF_DASH_ALGO_NONE;
+	const char *algo_str;
 	ctx->filter = filter;
 	ctx->dm = gf_filter_get_download_manager(filter);
 	if (!ctx->dm) return GF_SERVICE_ERROR;
 
+	//old syntax
+	if (ctx->filemode) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] `filemode` option will soon be deprecated, update your script to use `:forward=file` option.\n"));
+		ctx->forward = DFWD_FILE;
+		ctx->filemode = GF_FALSE;
+	}
+
 	ctx->dash_io.udta = ctx;
 	ctx->dash_io.delete_cache_file = dashdmx_io_delete_cache_file;
 	ctx->dash_io.create = dashdmx_io_create;
@@ -1085,17 +2044,90 @@
 	ctx->dash_io.get_utc_start_time = dashdmx_io_get_utc_start_time;
 	ctx->dash_io.setup_from_url = dashdmx_io_setup_from_url;
 	ctx->dash_io.set_range = dashdmx_io_set_range;
+	if ((ctx->forward==DFWD_FILE) || (ctx->forward==DFWD_SBOUND_MANIFEST))
+		ctx->dash_io.manifest_updated = dashdmx_io_manifest_updated;
+
+	ctx->dash_io.get_bytes_per_sec = dashdmx_io_get_bytes_per_sec;
 
 #if 0 //unused since we are in non threaded mode
 	ctx->dash_io.abort = dashdmx_io_abort;
-	ctx->dash_io.get_bytes_per_sec = dashdmx_io_get_bytes_per_sec;
 	ctx->dash_io.get_total_size = dashdmx_io_get_total_size;
 	ctx->dash_io.get_bytes_done = dashdmx_io_get_bytes_done;
 #endif
 
 	ctx->dash_io.on_dash_event = dashdmx_io_on_dash_event;
 
-	ctx->dash = gf_dash_new(&ctx->dash_io, GF_DASH_THREAD_NONE, 0, ctx->auto_switch, (ctx->segstore==2) ? GF_TRUE : GF_FALSE, (ctx->algo==GF_DASH_ALGO_NONE) ? GF_TRUE : GF_FALSE, ctx->start_with, ctx->init_timeshift);
+	if (ctx->init_timeshift<0) {
+		timeshift = -ctx->init_timeshift;
+		if (timeshift>100) timeshift = 100;
+	} else {
+		timeshift = ctx->init_timeshift;
+	}
+
+	algo_str = ctx->algo;
+
+	if (ctx->forward > DFWD_FILE) {
+		ctx->split_as = GF_TRUE;
+		ctx->screen_res = GF_FALSE;
+		algo_str = "none";
+		ctx->auto_switch = 0;
+		ctx->noseek = GF_TRUE;
+	}
+
+	if (!strcmp(algo_str, "none")) algo = GF_DASH_ALGO_NONE;
+	else if (!strcmp(algo_str, "grate")) algo = GF_DASH_ALGO_GPAC_LEGACY_RATE;
+	else if (!strcmp(algo_str, "gbuf")) algo = GF_DASH_ALGO_GPAC_LEGACY_BUFFER;
+	else if (!strcmp(algo_str, "bba0")) algo = GF_DASH_ALGO_BBA0;
+	else if (!strcmp(algo_str, "bolaf")) algo = GF_DASH_ALGO_BOLA_FINITE;
+	else if (!strcmp(algo_str, "bolab")) algo = GF_DASH_ALGO_BOLA_BASIC;
+	else if (!strcmp(algo_str, "bolau")) algo = GF_DASH_ALGO_BOLA_U;
+	else if (!strcmp(algo_str, "bolao")) algo = GF_DASH_ALGO_BOLA_O;
+	else {
+#ifndef GPAC_HAS_QJS
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] No JS support, cannot use custom algo %s\n", algo_str));
+		return GF_BAD_PARAM;
+#else
+		char szFile[GF_MAX_PATH];
+		Bool found = GF_FALSE;
+		GF_Err e;
+		//init to default, overwrite later
+		algo = GF_DASH_ALGO_GPAC_LEGACY_BUFFER;
+		if (gf_file_exists(algo_str)) {
+			strcpy(szFile, algo_str);
+			found = GF_TRUE;
+		} else if (!strstr(algo_str, ".js")) {
+			strcpy(szFile, algo_str);
+			strcat(szFile, ".js");
+			if (gf_file_exists(szFile)) {
+				found = GF_TRUE;
+			}
+		}
+		if (!found) {
+			gf_opts_default_shared_directory(szFile);
+			strcat(szFile, "/scripts/");
+			strcat(szFile, algo_str);
+			if (gf_file_exists(szFile)) {
+				found = GF_TRUE;
+			} else if (!strstr(algo_str, ".js")) {
+				strcat(szFile, ".js");
+				if (gf_file_exists(szFile))
+					found = GF_TRUE;
+			}
+		}
+		if (!found) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] Custom algo %s not found\n", algo_str));
+			return GF_BAD_PARAM;
+		}
+		e = dashdmx_initialize_js(ctx, szFile);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] Failed to setup custom algo %s\n", algo_str));
+			return e;
+		}
+#endif
+	}
+
+
+	ctx->dash = gf_dash_new(&ctx->dash_io, 0, 0, (ctx->segstore==2) ? GF_TRUE : GF_FALSE, (algo==GF_DASH_ALGO_NONE) ? GF_TRUE : GF_FALSE, ctx->start_with, timeshift);
 
 	if (!ctx->dash) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] Error - cannot create DASH Client\n"));
@@ -1108,9 +2140,9 @@
 		gf_dash_set_max_resolution(ctx->dash, caps.max_screen_width, caps.max_screen_height, caps.max_screen_bpp);
 	}
 
-	gf_dash_set_algo(ctx->dash, ctx->algo);
+	gf_dash_set_algo(ctx->dash, algo);
 	gf_dash_set_utc_shift(ctx->dash, ctx->shift_utc);
-	gf_dash_set_atsc_ast_shift(ctx->dash, ctx->atsc_shift);
+	gf_dash_set_route_ast_shift(ctx->dash, ctx->route_shift);
 	gf_dash_enable_utc_drift_compensation(ctx->dash, ctx->server_utc);
 	gf_dash_set_tile_adaptation_mode(ctx->dash, ctx->tile_mode, ctx->tiles_rate);
 
@@ -1118,17 +2150,43 @@
 	gf_dash_set_segment_expiration_threshold(ctx->dash, ctx->exp_threshold);
 	gf_dash_set_switching_probe_count(ctx->dash, ctx->switch_count);
 	gf_dash_set_agressive_adaptation(ctx->dash, ctx->aggressive);
-	gf_dash_debug_group(ctx->dash, ctx->debug_as);
-	gf_dash_disable_speed_adaptation(ctx->dash, ctx->speedadapt);
+	gf_dash_enable_single_range_llhls(ctx->dash, ctx->llhls_merge);
+	gf_dash_debug_groups(ctx->dash, ctx->debug_as.vals, ctx->debug_as.nb_items);
+	gf_dash_disable_speed_adaptation(ctx->dash, !ctx->speedadapt);
 	gf_dash_ignore_xlink(ctx->dash, ctx->noxlink);
 	gf_dash_set_period_xlink_query_string(ctx->dash, ctx->query);
 	gf_dash_set_low_latency_mode(ctx->dash, ctx->lowlat);
 	if (ctx->split_as)
 		gf_dash_split_adaptation_sets(ctx->dash);
+	gf_dash_disable_low_quality_tiles(ctx->dash, ctx->skip_lqt);
+	gf_dash_set_chaining_mode(ctx->dash, ctx->chain_mode);
+	gf_dash_set_auto_switch(ctx->dash, ctx->auto_switch, ctx->asloop);
+
+	//in test mode, we disable seeking inside the segment: this initial seek range is dependent from tune-in time and would lead to different start range
+	//at each run, possibly breaking all tests
+	if (gf_sys_is_test_mode())
+		ctx->noseek = GF_TRUE;
 
 	ctx->initial_play = GF_TRUE;
 	gf_filter_block_eos(filter, GF_TRUE);
 
+#ifdef GPAC_HAS_QJS
+	if (ctx->js_ctx) {
+		if (JS_IsFunction(ctx->js_ctx, ctx->download_fun)) {
+			gf_dash_set_algo_custom(ctx->dash, ctx, dashdmx_algo_js, dashdmx_download_monitor_js);
+			ctx->abort = GF_TRUE;
+		} else {
+			gf_dash_set_algo_custom(ctx->dash, ctx, dashdmx_algo_js, NULL);
+			ctx->abort = GF_FALSE;
+		}
+	}
+#endif
+
+	if (ctx->forward==DFWD_FILE) {
+		ctx->segstore = 0;
+		gf_filter_override_caps(filter, DASHDmxFileModeCaps, GF_ARRAY_LENGTH(DASHDmxFileModeCaps) );
+	}
+
 	//for coverage
 #ifdef GPAC_ENABLE_COVERAGE
 	if (gf_sys_is_cov_mode()) {
@@ -1138,7 +2196,6 @@
 	return GF_OK;
 }
 
-
 static void dashdmx_finalize(GF_Filter *filter)
 {
 	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
@@ -1146,6 +2203,27 @@
 
 	if (ctx->dash)
 		gf_dash_del(ctx->dash);
+
+	if (ctx->frag_url)
+		gf_free(ctx->frag_url);
+
+	if (ctx->manifest_payload)
+		gf_free(ctx->manifest_payload);
+
+	if (ctx->hls_variants) {
+		while (gf_list_count(ctx->hls_variants))
+			gf_free(gf_list_pop_back(ctx->hls_variants));
+		gf_list_del(ctx->hls_variants);
+	}
+	if (ctx->hls_variants_names) {
+		while (gf_list_count(ctx->hls_variants_names))
+			gf_free(gf_list_pop_back(ctx->hls_variants_names));
+		gf_list_del(ctx->hls_variants_names);
+	}
+
+#ifdef GPAC_HAS_QJS
+	dashdmx_cleanup_js(ctx);
+#endif
 }
 
 static Bool dashdmx_process_event(GF_Filter *filter, const GF_FilterEvent *fevt)
@@ -1176,33 +2254,55 @@
 
 			if (fevt->quality_switch.dependent_group_index) {
 				if (fevt->quality_switch.dependent_group_index > gf_dash_group_get_num_groups_depending_on(ctx->dash, group->idx))
-					return GF_BAD_PARAM;
+					return GF_TRUE;
 
 				idx = gf_dash_get_dependent_group_index(ctx->dash, group->idx, fevt->quality_switch.dependent_group_index-1);
-				if (idx==-1) return GF_BAD_PARAM;
+				if (idx==-1) return GF_TRUE;
 			}
 
 			gf_dash_set_automatic_switching(ctx->dash, 0);
 			gf_dash_group_select_quality(ctx->dash, idx, NULL, fevt->quality_switch.q_idx);
 		} else {
-			gf_dash_switch_quality(ctx->dash, fevt->quality_switch.up, ctx->immediate);
+			gf_dash_switch_quality(ctx->dash, fevt->quality_switch.up);
 		}
 		return GF_TRUE;
 
-#ifdef FILTER_FIXME
+	case GF_FEVT_NTP_REF:
+		gf_dash_override_ntp(ctx->dash, fevt->ntp.ntp);
+		return GF_TRUE;
 
-	case GF_NET_ASSOCIATED_CONTENT_TIMING:
-		gf_dash_override_ntp(ctx->dash, com->addon_time.ntp);
-		return GF_OK;
-#endif
+	case GF_FEVT_FILE_DELETE:
+		//check if we want that in other forward mode
+		if (ctx->forward==DFWD_FILE) {
+			for (i=0; i<gf_dash_get_group_count(ctx->dash); i++) {
+				group = gf_dash_get_group_udta(ctx->dash, i);
+				if (!group || !group->template) continue;
+				
+				if (!strncmp(group->template, fevt->file_del.url, strlen(group->template) )) {
+					GF_FilterPid *pid = dashdmx_opid_from_group(ctx, group);
+					if (pid) {
+						GF_FilterEvent evt;
+						GF_FEVT_INIT(evt, GF_FEVT_FILE_DELETE, pid);
+						evt.file_del.url = fevt->file_del.url;
+						gf_filter_pid_send_event(pid, &evt);
+					}
+					return GF_TRUE;
+				}
+			}
+		}
+		return GF_TRUE;
 	default:
 		break;
 	}
 
 	/*not supported*/
-	if (!fevt->base.on_pid) return GF_NOT_SUPPORTED;
+	if (!fevt->base.on_pid) return GF_TRUE;
+
+	if (fevt->base.on_pid == ctx->output_mpd_pid) {
+		return GF_TRUE;
+	}
 	group = gf_filter_pid_get_udta(fevt->base.on_pid);
-	if (!group) return GF_NOT_SUPPORTED;
+	if (!group) return GF_TRUE;
 	count = gf_filter_get_ipid_count(filter);
 	ipid = NULL;
 	for (i=0; i<count; i++) {
@@ -1316,6 +2416,8 @@
 		dashdmx_setup_buffer(ctx, group);
 
 		gf_filter_prevent_blocking(filter, GF_TRUE);
+		if (group->nb_pending)
+			group->nb_pending--;
 
 		ctx->nb_playing++;
 		//forward new event to source pid
@@ -1327,9 +2429,22 @@
 		return GF_TRUE;
 
 	case GF_FEVT_STOP:
+		//there is still pending PIDs for this group, don't stop the group until we get a final stop
+		//this happens when source is muxed content and one or more pids are not used by the chain
+		if (group->nb_pending)
+			return GF_TRUE;
+
 		gf_dash_set_group_done(ctx->dash, (u32) group->idx, 1);
 		gf_dash_group_select(ctx->dash, (u32) group->idx, GF_FALSE);
+		//group was playing, force stop on source filter (to discard any non-processed data)
+		//we need this because SOURCE_SWITCH event is sent directly on source filter
+		if (group->is_playing) {
+			src_evt = *fevt;
+			src_evt.base.on_pid = NULL;
+			gf_filter_send_event(group->seg_filter_src, &src_evt, GF_FALSE);
+		}
 		group->is_playing = GF_FALSE;
+		group->prev_is_init_segment = GF_FALSE;
 		if (ctx->nb_playing) {
 			ctx->initial_play = GF_FALSE;
 			group->force_seg_switch = GF_TRUE;
@@ -1339,10 +2454,15 @@
 		//forward new event to source pid
 		src_evt = *fevt;
 		src_evt.base.on_pid = ipid;
+		//send a stop but indicate source should not receive it
+		src_evt.play.forced_dash_segment_switch = GF_TRUE;
 		gf_filter_pid_send_event(ipid, &src_evt);
 
 		//cancel the event
 		return GF_TRUE;
+	case GF_FEVT_SET_SPEED:
+		gf_dash_set_speed(ctx->dash, fevt->play.speed);
+		return GF_FALSE;
 
 	case GF_FEVT_CAPS_CHANGE:
 		if (ctx->screen_res) {
@@ -1362,32 +2482,207 @@
 	return GF_TRUE;
 }
 
+
+static void dashdmx_notify_group_quality(GF_DASHDmxCtx *ctx, GF_DASHGroup *group)
+{
+	u32 i;
+	if (!group->notify_quality_change) return;
+	group->notify_quality_change = GF_FALSE;
+
+	for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
+		s32 sel = -1;
+		GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
+		if (gf_filter_pid_get_udta(opid) != group) continue;
+
+		sel = gf_dash_group_get_active_quality(ctx->dash, group->idx);
+		if (!gf_sys_is_test_mode() || (ctx->forward==DFWD_FILE)) {
+			if (sel>=0) {
+				gf_filter_pid_set_property_str(opid, "has:selected", &PROP_UINT(sel) );
+			}
+			gf_filter_pid_set_property_str(opid, "has:auto", &PROP_UINT(gf_dash_get_automatic_switching(ctx->dash) ) );
+			gf_filter_pid_set_property_str(opid, "has:tilemode", &PROP_UINT(gf_dash_get_tile_adaptation_mode(ctx->dash) ) );
+
+			if (group->nb_group_deps) {
+				u32 k;
+				GF_PropertyValue deps_sel;
+
+				memset(&deps_sel, 0, sizeof(GF_PropertyValue));
+				deps_sel.type = GF_PROP_SINT_LIST;
+				deps_sel.value.sint_list.nb_items = group->nb_group_deps;
+				deps_sel.value.sint_list.vals = gf_malloc(sizeof(char *) * group->nb_group_deps);
+
+				for (k=0; k<group->nb_group_deps; k++) {
+					u32 g_idx = gf_dash_get_dependent_group_index(ctx->dash, group->idx, k);
+					sel = gf_dash_group_get_active_quality(ctx->dash, g_idx);
+					deps_sel.value.sint_list.vals[k] = sel;
+				}
+				gf_filter_pid_set_property_str(opid, "has:deps_selected", &deps_sel);
+				gf_free(deps_sel.value.sint_list.vals);
+			}
+		}
+
+		//setup some info for consuming filters
+		if (ctx->forward) {
+			GF_DASHQualityInfo q;
+			const char *init_seg = NULL;
+			const char *dash_url = gf_dash_get_url(ctx->dash);
+			u32 segment_timeline_timescale = 0;
+
+			//we dispatch timing in milliseconds
+			if (ctx->forward==DFWD_FILE) {
+				gf_filter_pid_set_property(opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(1000));
+			}
+
+			if (gf_dash_group_get_quality_info(ctx->dash, group->idx, sel, &q)==GF_OK) {
+				if (q.bandwidth)
+					gf_filter_pid_set_property(opid, GF_PROP_PID_BITRATE, &PROP_UINT(q.bandwidth));
+				if (q.codec)
+					gf_filter_pid_set_property(opid, GF_PROP_PID_CODEC, &PROP_STRING(q.codec));
+			}
+			if (group->template) gf_free(group->template);
+			group->template = gf_dash_group_get_template(ctx->dash, group->idx, &segment_timeline_timescale, &init_seg);
+			if (!group->template) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASHDmx] Cannot extract template string for %s\n", dash_url ));
+				gf_filter_pid_set_property(opid, GF_PROP_PID_TEMPLATE, NULL);
+			} else {
+				gf_filter_pid_set_property(opid, GF_PROP_PID_TEMPLATE, &PROP_STRING(group->template) );
+				char *sep = strchr(group->template, '$');
+				if (sep) sep[0] = 0;
+				gf_filter_pid_set_property_str(opid, "source_template", &PROP_BOOL(GF_TRUE) );
+				gf_filter_pid_set_property_str(opid, "stl_timescale", segment_timeline_timescale ? &PROP_UINT(segment_timeline_timescale) : NULL);
+				gf_filter_pid_set_property_str(opid, "init_url", init_seg ? &PROP_STRING(init_seg) : NULL);
+				gf_filter_pid_set_property_str(opid, "manifest_url", dash_url ? &PROP_STRING(dash_url) : NULL);
+			}
+			gf_filter_pid_set_property(opid, GF_PROP_PID_REP_ID, &PROP_STRING(q.ID) );
+
+			//file forward mode, we may need a dash duration later in the chain (route mux for ex), signal what we know
+			//from manifest
+			if (ctx->forward==DFWD_FILE) {
+				u32 dur, timescale;
+
+				gf_dash_group_get_segment_duration(ctx->dash, group->idx, &dur, &timescale);
+				gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC_INT(dur, timescale) );
+			}
+		}
+	}
+}
+GF_Err gf_dash_group_push_tfrf(GF_DashClient *dash, u32 idx, void *tfrf, u32 timescale);
+
+static void dashdmx_update_group_stats(GF_DASHDmxCtx *ctx, GF_DASHGroup *group)
+{
+	u32 bytes_per_sec = 0;
+	u64 file_size = 0;
+	u32 dep_rep_idx;
+	const GF_PropertyValue *p;
+	GF_PropertyEntry *pe=NULL;
+	Bool broadcast_flag = GF_FALSE;
+	if (group->stats_uploaded) return;
+	if (group->prev_is_init_segment) return;
+	if (!group->seg_filter_src) return;
+
+	p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_FILE_CACHED, &pe);
+	if (!p || !p->value.boolean) {
+		u64 us_since_start = 0;
+		u64 down_bytes = 0;
+		u32 bits_per_sec = 0;
+		u32 now = gf_sys_clock();
+
+		if (!ctx->abort || (now - group->last_bw_check < ctx->bwcheck)) {
+			gf_filter_release_property(pe);
+			return;
+		}
+		group->last_bw_check = now;
+		//we allow file abort, check the download
+
+		p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_DOWN_RATE, &pe);
+		if (p) bits_per_sec = p->value.uint;
+
+		p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_DOWN_SIZE, &pe);
+		if (p) file_size = p->value.longuint;
+
+		p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_DOWN_BYTES, &pe);
+		if (p) down_bytes = p->value.longuint;
+
+		us_since_start = gf_sys_clock_high_res() - group->us_at_seg_start;
+		gf_dash_group_check_bandwidth(ctx->dash, group->idx, bits_per_sec, file_size, down_bytes, us_since_start);
+
+		gf_filter_release_property(pe);
+		return;
+	}
+	group->stats_uploaded = GF_TRUE;
+
+	p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_DOWN_RATE, &pe);
+	if (p) bytes_per_sec = p->value.uint / 8;
+
+	p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_DOWN_SIZE, &pe);
+	if (p) file_size = p->value.longuint;
+
+	p = gf_filter_get_info_str(group->seg_filter_src, "x-route", &pe);
+	if (p && p->value.string && !strcmp(p->value.string, "yes")) {
+		broadcast_flag = GF_TRUE;
+	}
+	if (group->nb_group_deps)
+		dep_rep_idx = group->current_group_dep ? (group->current_group_dep-1) : group->nb_group_deps;
+	else
+		dep_rep_idx = group->current_dependent_rep_idx;
+
+	gf_dash_group_store_stats(ctx->dash, group->idx, dep_rep_idx, bytes_per_sec, file_size, broadcast_flag, gf_sys_clock_high_res() - group->us_at_seg_start);
+
+	p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_FILE_CACHED, &pe);
+	if (p && p->value.boolean)
+		group->stats_uploaded = GF_TRUE;
+
+	gf_filter_release_property(pe);
+}
+
 static void dashdmx_switch_segment(GF_DASHDmxCtx *ctx, GF_DASHGroup *group)
 {
-	u32 dependent_representation_index = 0;
+	u32 dependent_representation_index;
 	GF_Err e;
-	Bool has_next;
+	Bool has_scalable_next;
+	Bool seg_disabled;
 	GF_FilterEvent evt;
 	const char *next_url, *next_url_init_or_switch_segment, *src_url, *key_url;
 	u64 start_range, end_range, switch_start_range, switch_end_range;
 	bin128 key_IV;
 	u32 group_idx;
 
+	//for smooth if prev is init segment itis not connected to the real httpin yet...
+	if (group->prev_is_init_segment && gf_dash_is_smooth_streaming(ctx->dash)) {
+
+	} else {
+		group->init_ok = GF_TRUE;
+	}
+	dashdmx_notify_group_quality(ctx, group);
+
+fetch_next:
 	assert(group->nb_eos || group->seg_was_not_ready || group->in_error);
 	group->wait_for_pck = GF_TRUE;
 	group->in_error = GF_FALSE;
 	if (group->segment_sent) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] group %d drop current segment\n", group->idx));
-		if (!group->current_group_dep)
+		if (!group->current_group_dep && !group->next_dependent_rep_idx) {
 			gf_dash_group_discard_segment(ctx->dash, group->idx);
 
+			//special case for group dependencies (tiling): signal segment switch
+			//so that tileagg may detect losses
+			if (group->nb_group_deps) {
+				GF_FilterPid *opid = dashdmx_opid_from_group(ctx, group);
+				if (opid) {
+					GF_FEVT_INIT(evt, GF_FEVT_PLAY_HINT, opid);
+					evt.play.forced_dash_segment_switch = GF_TRUE;
+					gf_filter_pid_send_event(opid, &evt);
+				}
+			}
+			if (group->seg_discard_state==1)
+				group->seg_discard_state = 2;
+		}
+
 		group->segment_sent = GF_FALSE;
 		//no thread mode, we work with at most one entry in cache, call process right away to get the group next URL ready
 		gf_dash_process(ctx->dash);
 	}
 
-	group->stats_uploaded = GF_FALSE;
-
 #if 0
 	if (group_done) {
 		if (!gf_dash_get_period_switch_status(ctx->dash) && gf_dash_in_last_period(ctx->dash, GF_TRUE)) {
@@ -1396,22 +2691,55 @@
 	}
 #endif
 
+	//special case if we had a discard of a dependent seg: we wait for the output PIDs to be flushed
+	//so that we don't send a GF_FEVT_PLAY_HINT event before the previous segment is completely produced
+	//this is mostly for tileagg for the time being and could need further refinements
+	if (group->seg_discard_state == 2) {
+		u32 i;
+		for (i=0; i < gf_filter_get_opid_count(ctx->filter); i++) {
+			GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i );
+			GF_DASHGroup *g = gf_filter_pid_get_udta( opid );
+			if (g != group) continue;
+			if (gf_filter_pid_would_block(opid)) {
+				group->seg_was_not_ready = GF_TRUE;
+				group->stats_uploaded = GF_TRUE;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] some pids blocked on group with discard, waiting before fetching next segment\n"));
+				return;
+			}
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] all pids unblocked on group with discard, fetching next segment\n"));
+		group->seg_discard_state = 0;
+	}
+
+
+	dependent_representation_index = 0;
 	group_idx = group->idx;
 	if (group->nb_group_deps) {
-		if (group->current_group_dep) {
-			dependent_representation_index = group->current_group_dep;
-//			s32 res = gf_dash_get_dependent_group_index(ctx->dash, group->idx, group->current_group_dep-
-		}
+		dependent_representation_index = group->current_group_dep;
+	} else if (group->next_dependent_rep_idx) {
+		dashdmx_update_group_stats(ctx, group);
+		dependent_representation_index = group->current_dependent_rep_idx = group->next_dependent_rep_idx;
+	} else if (group->current_dependent_rep_idx) {
+		dashdmx_update_group_stats(ctx, group);
+		group->current_dependent_rep_idx = 0;
 	}
+
+	group->stats_uploaded = GF_FALSE;
+
 	e = gf_dash_group_get_next_segment_location(ctx->dash, group_idx, dependent_representation_index, &next_url, &start_range, &end_range,
 		 NULL, &next_url_init_or_switch_segment, &switch_start_range , &switch_end_range,
-		 &src_url, &has_next, &key_url, &key_IV);
+		 &src_url, &has_scalable_next, &key_url, &key_IV);
 
 	if (e == GF_EOS) {
 		group->eos_detected = GF_TRUE;
 		return;
 	}
+	seg_disabled = GF_FALSE;
 	group->eos_detected = GF_FALSE;
+	if (e == GF_URL_REMOVED) {
+		seg_disabled = GF_TRUE;
+		e = GF_OK;
+	}
 
 	if (e != GF_OK) {
 		if (e == GF_BUFFER_TOO_SMALL) {
@@ -1426,6 +2754,12 @@
 		return;
 	}
 
+	if (!has_scalable_next) {
+		group->next_dependent_rep_idx = 0;
+	} else {
+		group->next_dependent_rep_idx++;
+	}
+
 	if (group->nb_group_deps) {
 		group->current_group_dep++;
 		if (group->current_group_dep>group->nb_group_deps)
@@ -1436,77 +2770,77 @@
 	group->seg_was_not_ready = GF_FALSE;
 
 	if (next_url_init_or_switch_segment && !group->init_switch_seg_sent) {
+		if (group->in_is_cryptfile) {
+			gf_cryptfin_set_kms(group->seg_filter_src, key_url, key_IV);
+		}
 		GF_FEVT_INIT(evt, GF_FEVT_SOURCE_SWITCH, NULL);
 		evt.seek.start_offset = switch_start_range;
 		evt.seek.end_offset = switch_end_range;
 		evt.seek.source_switch = next_url_init_or_switch_segment;
-		evt.seek.previous_is_init_segment = group->prev_is_init_segment;
+		evt.seek.is_init_segment = GF_TRUE;
 		evt.seek.skip_cache_expiration = GF_TRUE;
 
 		group->prev_is_init_segment = GF_TRUE;
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] group %d queuing next init/switching segment %s\n", group->idx, next_url_init_or_switch_segment));
 
+		group->signal_seg_name = (ctx->forward==DFWD_FILE) ? GF_TRUE : GF_FALSE;
 		group->init_switch_seg_sent = GF_TRUE;
 		gf_filter_send_event(group->seg_filter_src, &evt, GF_FALSE);
 		return;
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] group %d queuing next media segment %s\n", group->idx, next_url));
 
-	GF_FEVT_INIT(evt, GF_FEVT_SOURCE_SWITCH, NULL);
-	evt.seek.source_switch = next_url;
-	evt.seek.start_offset = start_range;
-	evt.seek.end_offset = end_range;
-	evt.seek.previous_is_init_segment = group->prev_is_init_segment;
 	group->segment_sent = GF_TRUE;
 	group->prev_is_init_segment = GF_FALSE;
 	group->init_switch_seg_sent = GF_FALSE;
-	gf_filter_send_event(group->seg_filter_src, &evt, GF_FALSE);
-}
+	group->signal_seg_name = (ctx->forward==DFWD_FILE) ? GF_TRUE : GF_FALSE;
+	group->us_at_seg_start = gf_sys_clock_high_res();
 
-static void dashdmx_update_group_stats(GF_DASHDmxCtx *ctx, GF_DASHGroup *group)
-{
-	u32 bytes_per_sec = 0;
-	u64 file_size = 0, bytes_done = 0;
-	const GF_PropertyValue *p;
-	GF_PropertyEntry *pe=NULL;
-	Bool broadcast_flag = GF_FALSE;
-	if (group->stats_uploaded) return;
-	if (group->prev_is_init_segment) return;
-	if (!group->seg_filter_src) return;
+	if (seg_disabled) {
+		u32 dep_rep_idx;
+		if (group->nb_group_deps)
+			dep_rep_idx = group->current_group_dep ? (group->current_group_dep-1) : group->nb_group_deps;
+		else
+			dep_rep_idx = group->current_dependent_rep_idx;
 
-	p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_FILE_CACHED, &pe);
-	if (!p || !p->value.boolean) {
-		gf_filter_release_property(pe);
-		return;
+		gf_dash_group_store_stats(ctx->dash, group->idx, dep_rep_idx, 0, 0, 0, 0);
+		if (!group->seg_discard_state)
+			group->seg_discard_state = 1;
+		goto fetch_next;
 	}
-	group->stats_uploaded = GF_TRUE;
-
-	p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_DOWN_RATE, &pe);
-	if (p) bytes_per_sec = p->value.uint / 8;
-
-	p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_DOWN_SIZE, &pe);
-	if (p) file_size = p->value.longuint;
 
-	p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_DOWN_BYTES, &pe);
-	if (p) bytes_done = p->value.longuint;
-
-	p = gf_filter_get_info_str(group->seg_filter_src, "x-atsc", &pe);
-	if (p && p->value.string && !strcmp(p->value.string, "yes")) {
-		broadcast_flag = GF_TRUE;
+	if (group->in_is_cryptfile) {
+		gf_cryptfin_set_kms(group->seg_filter_src, key_url, key_IV);
 	}
 
-	gf_dash_group_store_stats(ctx->dash, group->idx, bytes_per_sec, (u32) file_size, (u32) bytes_done, broadcast_flag);
-
-	//we allow file abort, check the download
-	if (ctx->abort)
-		gf_dash_group_check_bandwidth(ctx->dash, group->idx);
-
-	p = gf_filter_get_info(group->seg_filter_src, GF_PROP_PID_FILE_CACHED, &pe);
-	if (p && p->value.boolean)
-		group->stats_uploaded = GF_TRUE;
+	GF_FEVT_INIT(evt, GF_FEVT_SOURCE_SWITCH, NULL);
+	evt.seek.source_switch = next_url;
+	evt.seek.start_offset = start_range;
+	evt.seek.end_offset = end_range;
+	evt.seek.is_init_segment = GF_FALSE;
+	gf_filter_send_event(group->seg_filter_src, &evt, GF_FALSE);
+}
 
-	gf_filter_release_property(pe);
+static GF_Err dashin_abort(GF_DASHDmxCtx *ctx)
+{
+	u32 i;
+	if (!ctx || ctx->in_error) return GF_EOS;
+	
+	for (i=0; i<gf_filter_get_ipid_count(ctx->filter); i++) {
+		GF_FilterEvent evt;
+		GF_FilterPid *pid = gf_filter_get_ipid(ctx->filter, i);
+		gf_filter_pid_set_discard(pid, GF_TRUE);
+		GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
+		gf_filter_pid_send_event(pid, &evt);
+	}
+	for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
+		GF_FilterPid *pid = gf_filter_get_opid(ctx->filter, i);
+		gf_filter_pid_set_eos(pid);
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] Fatal error, aborting\n"));
+	ctx->in_error = GF_TRUE;
+	return GF_SERVICE_ERROR;
 }
 
 GF_Err dashdmx_process(GF_Filter *filter)
@@ -1514,10 +2848,12 @@
 	u32 i, count;
 	GF_FilterPacket *pck;
 	GF_Err e;
+	u32 inputs_fetched = 1;
 	u32 next_time_ms = 0;
 	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
 	Bool check_eos = ctx->check_eos;
 	Bool has_pck = GF_FALSE;
+	Bool switch_pending = GF_FALSE;
 
 	//reset group states and update stats
 	count = gf_dash_get_group_count(ctx->dash);
@@ -1531,6 +2867,29 @@
 	if (!ctx->mpd_pid)
 		return GF_EOS;
 
+	//this needs further testing
+#if 0
+	//we had a seek outside of the period we were setting up, during period setup !
+	//force a stop/play event on each output pids
+	if (ctx->seek_request>=0) {
+		GF_FilterEvent evt;
+		memset(&evt, 0, sizeof(GF_FilterEvent));
+
+		count = gf_filter_get_opid_count(filter);
+		for (i=0; i<count; i++) {
+			evt.base.on_pid = gf_filter_get_opid(filter, i);
+			evt.base.type = GF_FEVT_STOP;
+			dashdmx_process_event(filter, &evt);
+
+			evt.base.type = GF_FEVT_PLAY;
+			evt.play.start_range = ctx->seek_request;
+			dashdmx_process_event(filter, &evt);
+		}
+		ctx->seek_request = 0;
+	}
+#endif
+
+
 	//check MPD pid
 	pck = gf_filter_pid_get_packet(ctx->mpd_pid);
 	if (pck) {
@@ -1541,6 +2900,9 @@
 		gf_filter_ask_rt_reschedule(filter, 100000);
 		return GF_OK;
 	}
+	else if (e==GF_SERVICE_ERROR) {
+		return dashin_abort(ctx);
+	}
 	if (e)
 		return e;
 
@@ -1548,8 +2910,12 @@
 	if (next_time_ms>1000)
 		next_time_ms=1000;
 
-	//flush all media input
 	count = gf_filter_get_ipid_count(filter);
+
+	if (ctx->compute_min_dts)
+		ctx->timedisc_next_min_ts = 0;
+
+	//flush all media input
 	for (i=0; i<count; i++) {
 		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
 		GF_FilterPid *opid;
@@ -1558,20 +2924,27 @@
 		opid = gf_filter_pid_get_udta(ipid);
 		group = gf_filter_pid_get_udta(opid);
 
-		if (!group)
+		if (!group || group->nb_pending) {
+			inputs_fetched = 0;
 			continue;
+		}
 
 		while (1) {
 			pck = gf_filter_pid_get_packet(ipid);
 			if (!group->is_playing) {
 				if (pck) {
-					gf_filter_pid_drop_packet(ipid);
-					continue;
+					//in file mode, keep first packet (init seg) until we play
+					if ((ctx->forward!=DFWD_FILE) || !group->prev_is_init_segment) {
+						gf_filter_pid_drop_packet(ipid);
+						continue;
+					}
 				}
+//				inputs_fetched = 0;
 				break;
 			}
 
 			if (!pck) {
+				inputs_fetched = 0;
 				if (gf_filter_pid_is_eos(ipid) || !gf_filter_pid_is_playing(opid) || group->force_seg_switch) {
 					group->nb_eos++;
 
@@ -1592,13 +2965,16 @@
 							}
 						}
 						if (nb_block == group->nb_pids) {
-							GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASHDmx] End of segment for group %d but %d output pid(s) would block, postponing\n", nb_block, group->idx));
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] End of segment for group %d but %d output pid(s) would block, postponing\n", group->idx, nb_block));
+							switch_pending = GF_TRUE;
 							break;
 						}
 
 						//good to switch, cancel all end of stream signals on pids from this group and switch
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] End of segment for group %d, updating stats and switching segment\n", group->idx));
+						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASHDmx] End of segment for group %d, updating stats and switching segment\n", group->idx));
 						for (j=0; j<count; j++) {
+							const GF_PropertyValue *p;
+							GF_PropertyEntry *pe=NULL;
 							GF_FilterPid *an_ipid = gf_filter_get_ipid(filter, j);
 							GF_FilterPid *an_opid = gf_filter_pid_get_udta(an_ipid);
 							GF_DASHGroup *agroup;
@@ -1606,10 +2982,16 @@
 							agroup = gf_filter_pid_get_udta(an_opid);
 							if (!agroup || (agroup != group)) continue;
 
-							if (gf_filter_pid_is_eos(an_ipid)) {
+							if (gf_filter_pid_is_eos(an_ipid) || group->force_seg_switch) {
 								gf_filter_pid_clear_eos(an_ipid, GF_TRUE);
 								GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] Clearing EOS on pids from group %d\n", group->idx));
 							}
+
+							p = gf_filter_pid_get_info_str(an_ipid, "smooth_tfrf", &pe);
+							if (p) {
+								gf_dash_group_push_tfrf(ctx->dash, group->idx, p->value.ptr, gf_filter_pid_get_timescale(an_ipid));
+							}
+							gf_filter_release_property(pe);
 						}
 						dashdmx_update_group_stats(ctx, group);
 						group->stats_uploaded = GF_TRUE;
@@ -1621,15 +3003,45 @@
 					}
 				}
 				else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] No source packet group %d and not in end of stream\n", group->idx));
+					//still waiting for input packets, do not reschedule (let filter session do it)
+					next_time_ms = 0;
+					if (ctx->abort)
+						dashdmx_update_group_stats(ctx, group);
+					//GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] No source packet group %d and not in end of stream\n", group->idx));
 				}
 				if (group->in_error || group->seg_was_not_ready) {
+					//reset EOS state on all input if we were in error
+					u32 j;
+					for (j=0; j<count && group->in_error; j++) {
+						GF_FilterPid *an_ipid = gf_filter_get_ipid(filter, j);
+						GF_FilterPid *an_opid = gf_filter_pid_get_udta(an_ipid);
+						GF_DASHGroup *agroup;
+						if (an_ipid == ctx->mpd_pid) continue;
+						agroup = gf_filter_pid_get_udta(an_opid);
+						if (!agroup || (agroup != group)) continue;
+
+						gf_filter_pid_clear_eos(an_ipid, GF_TRUE);
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] Clearing EOS on pids from group %d\n", group->idx));
+					}
 					dashdmx_switch_segment(ctx, group);
 					gf_filter_prevent_blocking(filter, GF_FALSE);
 					if (group->eos_detected && !has_pck) check_eos = GF_TRUE;
 				}
 				break;
 			}
+
+			if (ctx->compute_min_dts) {
+				if (inputs_fetched) inputs_fetched++;
+				u32 timescale = gf_filter_pid_get_timescale(ipid);
+				u64 dts = gf_filter_pck_get_dts(pck);
+				if (dts==GF_FILTER_NO_TS)
+					dts = gf_filter_pck_get_cts(pck);
+				if (dts==GF_FILTER_NO_TS)
+					continue;
+				dts = gf_timestamp_rescale(dts, timescale, ctx->time_discontinuity.den);
+				if (!ctx->timedisc_next_min_ts || (ctx->timedisc_next_min_ts > dts)) ctx->timedisc_next_min_ts = dts;
+				break;
+			}
 			has_pck = GF_TRUE;
 			check_eos = GF_FALSE;
 			dashdmx_forward_packet(ctx, pck, ipid, opid, group);
@@ -1637,6 +3049,24 @@
 			dashdmx_update_group_stats(ctx, group);
 		}
 	}
+	if (ctx->compute_min_dts) {
+		if (inputs_fetched>1) {
+			ctx->compute_min_dts = GF_FALSE;
+		} else {
+			gf_filter_ask_rt_reschedule(filter, 1000);
+			return GF_OK;
+		}
+	}
+
+	if (switch_pending) {
+		gf_filter_ask_rt_reschedule(filter, 1000);
+		return GF_OK;
+	}
+	if (has_pck)
+		check_eos = GF_FALSE;
+	//only check for eos if no pending events, otherwise we may miss a PLAY pending (due to seek)
+	else if (check_eos && gf_filter_get_num_events_queued(filter))
+		check_eos = GF_FALSE;
 
 	if (check_eos) {
 		Bool all_groups_done = GF_TRUE;
@@ -1679,15 +3109,22 @@
 			if (!group->eos_detected && group->is_playing) {
 				all_groups_done = GF_FALSE;
 			} else if (is_in_last_period) {
-				if (gf_filter_pid_is_eos(ipid) || group->eos_detected)
+				if (gf_filter_pid_is_eos(ipid) || group->eos_detected || gf_dash_get_group_done(ctx->dash, group->idx))
 					gf_filter_pid_set_eos(opid);
 				else
 					all_groups_done = GF_FALSE;
 			}
 		}
 		if (all_groups_done) {
-			if (is_in_last_period || groups_not_playing)
+			if (is_in_last_period || groups_not_playing) {
+				if (!ctx->manifest_stop_sent) {
+					GF_FilterEvent evt;
+					ctx->manifest_stop_sent = GF_TRUE;
+					GF_FEVT_INIT(evt, GF_FEVT_STOP, ctx->mpd_pid)
+					gf_filter_pid_send_event(ctx->mpd_pid, &evt);
+				}
 				return GF_EOS;
+			}
 			if (!gf_dash_get_period_switch_status(ctx->dash)) {
 				for (i=0; i<count; i++) {
 					GF_DASHGroup *group = gf_dash_get_group_udta(ctx->dash, i);
@@ -1700,11 +3137,14 @@
 			}
 		}
 	}
+
 	if (gf_dash_is_in_setup(ctx->dash))
 		gf_filter_post_process_task(filter);
-	else if (next_time_ms) {
+	else if (ctx->abort)
+		gf_filter_ask_rt_reschedule(filter, 50000);
+	else if (next_time_ms)
 		gf_filter_ask_rt_reschedule(filter, 1000 * next_time_ms);
-	}
+
 	return GF_OK;
 }
 
@@ -1725,7 +3165,8 @@
 	}
 	if (res_m3u) {
 		*score = GF_FPROBE_SUPPORTED;
-		return "video/mpegurl";
+		//we don't use x-mpegURL to avoid complaints from HLS mediastreamvalidator
+		return "application/vnd.apple.mpegURL";
 	}
 	if (res_smooth) {
 		*score = GF_FPROBE_SUPPORTED;
@@ -1737,66 +3178,90 @@
 #define OFFS(_n)	#_n, offsetof(GF_DASHDmxCtx, _n)
 static const GF_FilterArgs DASHDmxArgs[] =
 {
-	{ OFFS(auto_switch), "switch quality every N segments, disabled if 0", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(auto_switch), "switch quality every N segments\n"
+		"- positive: go to higher quality or loop to lowest\n"
+		"- negative: go to lower quality or loop to highest\n"
+		"- 0: disabled", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(segstore), "enable file caching\n"
 		"- mem: all files are stored in memory, no disk IO\n"
-		"- file: files are stored to disk but discarded once played\n"
+		"- disk: files are stored to disk but discarded once played\n"
 		"- cache: all files are stored to disk and kept"
-		"", GF_PROP_UINT, "mem", "mem|file|cache", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(algo), "adaptation algorithm to use\n"\
-					"- none: no adaptation logic\n"\
-					"- grate: GAPC legacy algo based on available rate\n"\
-					"- gbuf: GAPC legacy algo based on buffer occupancy\n"\
-					"- bba0: BBA-0\n"\
-					"- bolaf: BOLA Finite\n"\
-					"- bolab: BOLA Basic\n"\
-					"- bolau: BOLA-U\n"\
-					"- bolao: BOLA-O"
-					, GF_PROP_UINT, "gbuf", "none|grate|gbuf|bba0|bolaf|bolab|bolau|bolao", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(start_with), "initial selection criteria\n"\
-						"- min_q: start with lowest quality\n"\
-						"- max_q: start with highest quality\n"\
-						"- min_bw: start with lowest bitrate\n"\
-						"- max_bw: start with highest bitrate; for tiles are used, all low priority tiles will have the lower (below max) bandwidth selected\n"\
-						"- max_bw_tiles: start with highest bitrate; for tiles all low priority tiles will have their lowest bandwidth selected"
-						, GF_PROP_UINT, "max_bw", "min_q|max_q|min_bw|max_bw|max_bw_tiles", 0},
+		"", GF_PROP_UINT, "mem", "mem|disk|cache", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(algo), "adaptation algorithm to use\n"
+		"- none: no adaptation logic\n"
+		"- grate: GPAC legacy algo based on available rate\n"
+		"- gbuf: GPAC legacy algo based on buffer occupancy\n"
+		"- bba0: BBA-0\n"
+		"- bolaf: BOLA Finite\n"
+		"- bolab: BOLA Basic\n"
+		"- bolau: BOLA-U\n"
+		"- bolao: BOLA-O\n"
+		"- JS: use file JS (either with specified path or in $GSHARE/scripts/) for algo (.js extension may be omitted)"
+		, GF_PROP_STRING, "gbuf", "none|grate|gbuf|bba0|bolaf|bolab|bolau|bolao|JS", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(start_with), "initial selection criteria\n"
+		"- min_q: start with lowest quality\n"
+		"- max_q: start with highest quality\n"
+		"- min_bw: start with lowest bitrate\n"
+		"- max_bw: start with highest bitrate; if tiles are used, all low priority tiles will have the lower (below max) bandwidth selected\n"
+		"- max_bw_tiles: start with highest bitrate; if tiles are used, all low priority tiles will have their lowest bandwidth selected"
+		, GF_PROP_UINT, "max_bw", "min_q|max_q|min_bw|max_bw|max_bw_tiles", 0},
 
 	{ OFFS(max_res), "use max media resolution to configure display", GF_PROP_BOOL, "true", NULL, 0},
-	{ OFFS(immediate), "when interactive switching is requested and immediate is set, the buffer segments are trashed", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(abort), "allow abort during a segment download", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(use_bmin), "use the indicated min buffer time of the MPD if true, otherwise uses default player settings", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(use_bmin), "playout buffer handling\n"
+		"- no: use default player settings\n"
+		"- auto: notify player of segment duration if not low latency\n"
+		"- mpd: use the indicated min buffer time of the MPD", GF_PROP_UINT, "auto", "no|auto|mpd", 0},
 
 	{ OFFS(shift_utc), "shift DASH UTC clock in ms", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(atsc_shift), "shift ATSC requests time by given ms", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(server_utc), "use ServerUTC: or Date: http headers instead of local UTC", GF_PROP_BOOL, "yes", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(route_shift), "shift ROUTE requests time by given ms", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(server_utc), "use `ServerUTC` or `Date` HTTP headers instead of local UTC", GF_PROP_BOOL, "yes", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(screen_res), "use screen resolution in selection phase", GF_PROP_BOOL, "yes", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(init_timeshift), "set initial timshift in ms (if >0) or in per-cent of timeshift buffer (if <0)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(tile_mode), "tile adaptation mode\n"\
-						"- none: bitrate is shared equaly accross all tiles\n"\
-						"- rows: bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row\n"\
-						"- rrows: bitrate decreases for each row of tiles starting from the bottom, same rate for each tile on the row\n"\
-						"- mrows: bitrate decreased for top and bottom rows only, same rate for each tile on the row\n"\
-						"- cols: bitrate decreases for each columns of tiles starting from the left, same rate for each tile on the columns\n"\
-						"- rcols: bitrate decreases for each columns of tiles starting from the right, same rate for each tile on the columns\n"\
-						"- mcols: bitrate decreased for left and right columns only, same rate for each tile on the columns\n"\
-						"- center: bitrate decreased for all tiles on the edge of the picture\n"\
-						"- edges: bitrate decreased for all tiles on the center of the picture"
-						, GF_PROP_UINT, "none", "none|rows|rrows|mrows|cols|rcols|mcols|center|edges", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(init_timeshift), "set initial timeshift in ms (if >0) or in per-cent of timeshift buffer (if <0)", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(tile_mode), "tile adaptation mode\n"
+		"- none: bitrate is shared equally across all tiles\n"
+		"- rows: bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row\n"
+		"- rrows: bitrate decreases for each row of tiles starting from the bottom, same rate for each tile on the row\n"
+		"- mrows: bitrate decreased for top and bottom rows only, same rate for each tile on the row\n"
+		"- cols: bitrate decreases for each columns of tiles starting from the left, same rate for each tile on the columns\n"
+		"- rcols: bitrate decreases for each columns of tiles starting from the right, same rate for each tile on the columns\n"
+		"- mcols: bitrate decreased for left and right columns only, same rate for each tile on the columns\n"
+		"- center: bitrate decreased for all tiles on the edge of the picture\n"
+		"- edges: bitrate decreased for all tiles on the center of the picture"
+		, GF_PROP_UINT, "none", "none|rows|rrows|mrows|cols|rcols|mcols|center|edges", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(tiles_rate), "indicate the amount of bandwidth to use at each quality level. The rate is recursively applied at each level, e.g. if 50%, Level1 gets 50%, level2 gets 25%, ... If 100, automatic rate allocation will be done by maximizing the quality in order of priority. If 0, bitstream will not be smoothed across tiles/qualities, and concurrency may happen between different media", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(delay40X), "delay in millisconds to wait between two 40X on the same segment", GF_PROP_UINT, "500", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(exp_threshold), "delay in millisconds to wait after the segment AvailabilityEndDate before considering the segment lost", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(delay40X), "delay in milliseconds to wait between two 40X on the same segment", GF_PROP_UINT, "500", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(exp_threshold), "delay in milliseconds to wait after the segment AvailabilityEndDate before considering the segment lost", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(switch_count), "indicate how many segments the client shall wait before switching up bandwidth. If 0, switch will happen as soon as the bandwidth is enough, but this is more prone to network variations", GF_PROP_UINT, "1", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(aggressive), "if enabled, switching algo targets the closest bandwidth fitting the available download rate. If no, switching algo targets the lowest bitrate representation that is above the currently played (eg does not try to switch to max bandwidth)", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(debug_as), "play only the adaptation set indicated by its index in the MPD; if negative, all sets are used", GF_PROP_UINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(aggressive), "if enabled, switching algo targets the closest bandwidth fitting the available download rate. If no, switching algo targets the lowest bitrate representation that is above the currently played (e.g. does not try to switch to max bandwidth)", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(debug_as), "play only the adaptation sets indicated by their indices (0-based) in the MPD", GF_PROP_UINT_LIST, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(speedadapt), "enable adaptation based on playback speed", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(noxlink), "disable xlink if period has both xlink and adaptation sets", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(query), "set query string (without initial '?') to append to xlink of periods", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(split_as), "separate all qualities into different adaptation sets and stream all qualities", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(split_as), "separate all qualities into different adaptation sets and stream all qualities. Dependent representations (scalable) are treated as independent", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(noseek), "disable seeking of initial segment(s) in dynamic mode (useful when UTC clocks do not match)", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(bwcheck), "minimum time in milliseconds between two bandwidth checks when allowing segment download abort", GF_PROP_UINT, "5", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(lowlat), "segment scheduling policy in low latency mode\n"
-			"- no: disable low latency\n"
-			"- strict: strict respect of AST offset in low latency\n"
-			"- early: allow fetching segments earlier than their AST in low latency when input demux is empty", GF_PROP_UINT, "early", "no|strict|early", GF_FS_ARG_HINT_EXPERT},
+		"- no: disable low latency\n"
+		"- strict: strict respect of AST offset in low latency\n"
+		"- early: allow fetching segments earlier than their AST in low latency when input PID is empty", GF_PROP_UINT, "early", "no|strict|early", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(forward), "segment forwarding mode\n"
+		"- none: regular DASH read\n"
+		"- file: do not demultiplex files and forward them as file PIDs (imply `segstore=mem`)\n"
+		"- segb: turn on [-split_as](), segment and fragment bounds signaling (`sigfrag`) in sources and DASH cue insertion\n"
+		"- mani: same as `segb` and also forward manifests"
+	, GF_PROP_UINT, "none", "none|file|segb|mani", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(fmodefwd), "forward packet rather than copy them in `file` forward mode. Packet copy might improve performances in low latency mode", GF_PROP_BOOL, "yes", NULL, GF_FS_ARG_HINT_EXPERT},
+
+	{ OFFS(skip_lqt), "disable decoding of tiles with highest degradation hints (not visible, not gazed at) for debug purposes", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(llhls_merge), "merge LL-HLS byte range parts into a single open byte range request", GF_PROP_BOOL, "yes", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(filemode), "alias for forward=file", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_HIDE},
+	{ OFFS(groupsel), "select groups based on language (by default all playable groups are exposed)", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(chain_mode), "MPD chaining mode\n"
+	"- off: do not use MPD chaining\n"
+	"- on: use MPD chaining once over, fallback if MPD load failure\n"
+	"- error: use MPD chaining once over or if error (MPD or segment download)", GF_PROP_UINT, "on", "off|on|error", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(asloop), "when auto switch is enabled, iterates back and forth from highest to lowest qualities", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -1805,8 +3270,8 @@
 static const GF_FilterCapability DASHDmxCaps[] =
 {
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
-	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "mpd|m3u8|3gm|ism"),
-	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/dash+xml|video/vnd.3gpp.mpd|audio/vnd.3gpp.mpd|video/vnd.mpeg.dash.mpd|audio/vnd.mpeg.dash.mpd|audio/mpegurl|video/mpegurl|application/vnd.ms-sstr+xml"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, DASHIN_FILE_EXT),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, DASHIN_MIMES),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
@@ -1814,22 +3279,81 @@
 	//accept any stream but files, framed
 	{ .code=GF_PROP_PID_STREAM_TYPE, .val.type=GF_PROP_UINT, .val.value.uint=GF_STREAM_FILE, .flags=(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_LOADED_FILTER) },
 	{ .code=GF_PROP_PID_UNFRAMED, .val.type=GF_PROP_BOOL, .val.value.boolean=GF_TRUE, .flags=(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_LOADED_FILTER) },
-	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
-	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 };
 
 
 GF_FilterRegister DASHDmxRegister = {
 	.name = "dashin",
 	GF_FS_SET_DESCRIPTION("MPEG-DASH and HLS client")
-	GF_FS_SET_HELP("This filter reads MPEG-DASH, HLS and MS Smooth (on demand only for now) manifests and produces media PIDs and frames.")
+	GF_FS_SET_HELP("This filter reads MPEG-DASH, HLS and MS Smooth manifests.\n"
+	"\n"
+	"# Regular mode\n"
+	"This is the default mode, in which the filter produces media PIDs and frames from sources indicated in the manifest.\n"
+	"The default behavior is to perform adaptation according to [-algo](), but the filter can:\n"
+	"- run with no adaptation, to grab maximum quality.\n"
+	"EX gpac -i MANIFEST_URL:algo=none:start_with=max_bw -o dest.mp4\n"
+	"- run with no adaptation, fetching all qualities.\n"
+	"EX gpac -i MANIFEST_URL:split_as -o dst=$File$.mp4:clone\n"
+	"\n"
+	"# File mode\n"
+	"When [-forward]() is set to `file`, the client forwards media files without demultiplexing them.\n"
+	"This is mostly used to expose the DASH session to a file server such as ROUTE or HTTP.\n"
+	"In this mode, the manifest is forwarded as an output PID.\n"
+	"Warning: This mode cannot be set through inheritance as it changes the link capabilities of the filter. The filter MUST be explicitly declared.\n"
+	"\n"
+	"To expose a live DASH session to route:\n"
+	"EX gpac -i MANIFEST_URL dashin:forward=file -o route://225.0.0.1:8000/\n"
+	"\n"
+	"Note: This mode used to be trigger by [-filemode]() option, still recognized.\n"
+	"\n"
+	"If the source has dependent media streams (scalability) and all qualities and initialization segments need to be forwarded, add [-split_as]().\n"
+	"\n"
+	"# Segment bound modes\n"
+	"When [-forward]() is set to `segb` or `mani`, the client forwards media frames (after demultiplexing) together with segment and fragment boundaries of source files.\n"
+	"\n"
+	"This mode can be used to process media data and regenerate the same manifest/segmentation.\n"
+	"\n"
+	"EX gpac -i MANIFEST_URL:forward=mani cecrypt:cfile=DRM.xml -o encrypted/live.mpd:pssh=mv\n"
+	"This will encrypt an existing DASH session, inject PSSH in manifest and segments.\n"
+	"\n"
+	"EX gpac -i MANIFEST_URL:forward=segb cecrypt:cfile=DRM.xml -o encrypted/live.m3u8\n"
+	"This will encrypt an existing DASH session and republish it as HLS, using same segment names and boundaries.\n"
+	"\n"
+	"This mode will force [-noseek]()=`true` to ensure the first segment fetched is complete, and [-split_as]()=`true` to fetch all qualities.\n"
+	"\n"
+	"Each first packet of a segment will have the following properties attached:\n"
+	"- `CueStart`: indicate this is a segment start\n"
+	"- `FileNumber`: current segment number\n"
+	"- `FileName`: current segment file name without manifest base url\n"
+	"- `DFPStart`: set with value `0` if this is the first packet in the period, absent otherwise\n"
+	"\n"
+	"If [-forward]() is set to `mani`, the first packet of a segment dispatched after a manifest update will also carry the manifest payload as a property:\n"
+	"- `DFManifest`: contains main manifest (MPD, M3U8 master)\n"
+	"- `DFVariant`: contains list of HLS child playlists as strings for the given quality\n"
+	"- `DFVariantName`: contains list of associated HLS child playlists name, in same order as manifests in `DFVariant`\n"
+	"\n"
+	"Each output PID will have the following properties assigned:\n"
+	"- `DFMode`: set to 1 for `segb` or 2 for `mani`\n"
+	"- `DCue`: set to `inband`\n"
+	"- `DFPStart`: set to current period start value\n"
+	"- `FileName`: set to associated init segment if any\n"
+	"- `Representation`: set to the associated representation ID in the manifest\n"
+	"- `DashDur`: set to the average segment duration as indicated in the manifest\n"
+	"- `source_template`: set to true to indicate the source template is known\n"
+	"- `stl_timescale`: timescale used by SegmentTimeline, or 0 if no SegmentTimeline\n"
+	"- `init_url`: unresolved intialization URL (as it appears in the manifest)\n"
+	"- `manifest_url`: manifest URL\n"
+	"\n"
+	"When the [dasher](dasher) is used together with this mode, this will force all generated segments to have the same name, duration and fragmentation properties as the input ones. It is therefore not recommended for sessions stored/generated on local storage to generate the output in the same directory.\n"
+	)
 	.private_size = sizeof(GF_DASHDmxCtx),
 	.initialize = dashdmx_initialize,
 	.finalize = dashdmx_finalize,
 	.args = DASHDmxArgs,
 	SETCAPS(DASHDmxCaps),
-	.flags = GF_FS_REG_REQUIRES_RESOLVER,
+	//we need the resolver, and pids are declared dynamically
+	.flags = GF_FS_REG_REQUIRES_RESOLVER | GF_FS_REG_DYNAMIC_PIDS,
 	.configure_pid = dashdmx_configure_pid,
 	.process = dashdmx_process,
 	.process_event = dashdmx_process_event,
@@ -1849,3 +3373,75 @@
 	return NULL;
 #endif
 }
+
+
+#ifndef GPAC_DISABLE_DASH_CLIENT
+static s32 dashdmx_rate_adaptation_ext(void *udta, u32 group_idx, u32 base_group_idx, Bool force_lower_complexity, GF_DASHCustomAlgoInfo *stats)
+{
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) udta;
+	return ctx->on_rate_adaptation(ctx->rt_udta, group_idx, base_group_idx, force_lower_complexity, stats);
+}
+
+
+typedef struct
+{
+	u32 bits_per_sec;
+	u64 total_bytes;
+	u64 bytes_done;
+	u64 us_since_start;
+	u32 buffer_dur;
+	u32 current_seg_dur;
+} GF_DASHDownloadStats;
+
+static s32 dashdmx_download_monitor_ext(void *udta, u32 group_idx, u32 bits_per_sec, u64 total_bytes, u64 bytes_done, u64 us_since_start, u32 buffer_dur_ms, u32 current_seg_dur)
+{
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) udta;
+	GF_DASHDownloadStats stats;
+	memset(&stats, 0, sizeof(GF_DASHDownloadStats));
+	stats.bits_per_sec = bits_per_sec;
+	stats.total_bytes = total_bytes;
+	stats.bytes_done = bytes_done;
+	stats.us_since_start = us_since_start;
+	stats.buffer_dur = buffer_dur_ms;
+	stats.current_seg_dur = current_seg_dur;
+	return ctx->on_download_monitor(ctx->rt_udta, group_idx, &stats);
+}
+#endif /*GPAC_DISABLE_DASH_CLIENT*/
+
+
+GF_EXPORT
+GF_Err gf_filter_bind_dash_algo_callbacks(GF_Filter *filter, void *udta,
+		void (*period_reset)(void *rate_adaptation, u32 type),
+		void (*new_group)(void *udta, u32 group_idx, void *dash),
+		s32 (*rate_adaptation)(void *udta, u32 group_idx, u32 base_group_idx, Bool force_low_complex, void *stats),
+		s32 (*download_monitor)(void *udta, u32 group_idx, void *stats)
+)
+{
+#ifdef GPAC_DISABLE_DASH_CLIENT
+	return GF_NOT_SUPPORTED;
+#else
+	if (!gf_filter_is_instance_of(filter, &DASHDmxRegister))
+		return GF_BAD_PARAM;
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
+
+	if (rate_adaptation) {
+		ctx->on_period_reset = period_reset;
+		ctx->on_new_group = new_group;
+		ctx->on_rate_adaptation = rate_adaptation;
+		ctx->on_download_monitor = download_monitor;
+		ctx->rt_udta = udta;
+		ctx->abort = download_monitor ? GF_TRUE : GF_FALSE;
+		gf_dash_set_algo_custom(ctx->dash, ctx, dashdmx_rate_adaptation_ext, dashdmx_download_monitor_ext);
+	} else {
+		ctx->on_period_reset = NULL;
+		ctx->on_new_group = NULL;
+		ctx->on_rate_adaptation = NULL;
+		ctx->on_download_monitor = NULL;
+		ctx->rt_udta = NULL;
+		ctx->abort = GF_FALSE;
+		gf_dash_set_algo(ctx->dash, GF_DASH_ALGO_GPAC_LEGACY_BUFFER);
+	}
+	return GF_OK;
+
+#endif
+}

gpac-1.0.1.tar.gz/src/filters/dmx_gsf.c -> gpac-2.0.0.tar.gz/src/filters/dmx_gsf.c Changed

@@ -2,10 +2,10 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2019
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
- * This file is part of GPAC / GPAC stream serializer filter
+ * This file is part of GPAC / GPAC stream format reader filter
 *
 * GPAC is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -108,6 +108,10 @@
 
 	GF_List *pck_res;
 	Bool buffer_too_small;
+
+	Bool corrupted;
+	Bool file_pids;
+	Bool stop_pending;
 } GSF_DemuxCtx;
 
 
@@ -136,6 +140,7 @@
 } GSF_PacketType;
 
 
+static void gsfdmx_stream_del(GSF_DemuxCtx *ctx, GSF_Stream *gst, Bool is_flush);
 
 GF_Err gsfdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
@@ -148,7 +153,7 @@
 			GSF_Stream *st = gf_list_pop_back(ctx->streams);
 			if (st->opid)
 				gf_filter_pid_remove(st->opid);
-			gf_free(st);
+			gsfdmx_stream_del(ctx, st, GF_FALSE);
 		}
 		return GF_OK;
 	}
@@ -167,15 +172,16 @@
 	switch (evt->base.type) {
 	case GF_FEVT_PLAY:
 		if (ctx->nb_playing && (ctx->start_range == evt->play.start_range)) {
+			ctx->nb_playing++;
 			return GF_TRUE;
 		}
 		ctx->nb_playing++;
 		ctx->wait_for_play = GF_FALSE;
+		ctx->stop_pending = GF_FALSE;
 
 		if (! ctx->is_file) {
 			return GF_FALSE;
 		}
-//		safdmx_check_dur(ctx);
 
 		ctx->start_range = evt->play.start_range;
 		ctx->file_pos = 0;
@@ -202,8 +208,15 @@
 
 	case GF_FEVT_STOP:
 		ctx->nb_playing--;
-		//don't cancel event
-		return GF_FALSE;
+		if (ctx->file_pids) return GF_TRUE;
+		if (!ctx->nb_playing) {
+			ctx->stop_pending = GF_TRUE;
+			//force a process to evaluate eos
+			gf_filter_post_process_task(filter);
+		}
+		//always cancel, take the decision to stop source after demuxing some packets
+		//this avoids stopping (and resetting inputs) when some streams of the mux are not used while other are
+		return GF_TRUE;
 
 	case GF_FEVT_SET_SPEED:
 		//cancel event
@@ -264,14 +277,15 @@
 	switch (p->type) {
 	case GF_PROP_SINT:
 	case GF_PROP_UINT:
-	case GF_PROP_PIXFMT:
-	case GF_PROP_PCMFMT:
 		p->value.uint = gsfdmx_read_vlen(bs);
 		break;
 	case GF_PROP_LSINT:
 	case GF_PROP_LUINT:
 		p->value.longuint = gf_bs_read_u64(bs);
 		break;
+	case GF_PROP_4CC:
+		p->value.uint = gf_bs_read_u32(bs);
+		break;
 	case GF_PROP_BOOL:
 		p->value.boolean = gf_bs_read_u8(bs) ? 1 : 0;
 		break;
@@ -302,23 +316,12 @@
 		p->value.vec3i.y = gsfdmx_read_vlen(bs);
 		p->value.vec3i.z = gsfdmx_read_vlen(bs);
 		break;
-	case GF_PROP_VEC3:
-		p->value.vec3.x = gf_bs_read_double(bs);
-		p->value.vec3.y = gf_bs_read_double(bs);
-		p->value.vec3.z = gf_bs_read_double(bs);
-		break;
 	case GF_PROP_VEC4I:
 		p->value.vec4i.x = gsfdmx_read_vlen(bs);
 		p->value.vec4i.y = gsfdmx_read_vlen(bs);
 		p->value.vec4i.z = gsfdmx_read_vlen(bs);
 		p->value.vec4i.w = gsfdmx_read_vlen(bs);
 		break;
-	case GF_PROP_VEC4:
-		p->value.vec4.x = gf_bs_read_double(bs);
-		p->value.vec4.y = gf_bs_read_double(bs);
-		p->value.vec4.z = gf_bs_read_double(bs);
-		p->value.vec4.w = gf_bs_read_double(bs);
-		break;
 	case GF_PROP_STRING:
 	case GF_PROP_STRING_NO_COPY:
 	case GF_PROP_NAME:
@@ -339,29 +342,50 @@
 		break;
 
 	case GF_PROP_STRING_LIST:
-		p->value.string_list = gf_list_new();
 		len2 = gsfdmx_read_vlen(bs);
+		p->value.string_list.nb_items = len2;
+		p->value.string_list.vals = gf_malloc(sizeof(char*) * len2);
 		for (i=0; i<len2; i++) {
 			len = gsfdmx_read_vlen(bs);
 			char *str = gf_malloc(sizeof(char)*(len+1));
 			gf_bs_read_data(bs, str, len);
 			str[len] = 0;
-			gf_list_add(p->value.string_list, str);
+			p->value.string_list.vals[i] = str;
 		}
 		break;
 
 	case GF_PROP_UINT_LIST:
+	case GF_PROP_SINT_LIST:
 		p->value.uint_list.nb_items = len = gsfdmx_read_vlen(bs);
 		p->value.uint_list.vals = gf_malloc(sizeof(u32)*len);
 		for (i=0; i<len; i++) {
 			p->value.uint_list.vals[i] = gsfdmx_read_vlen(bs);
 		}
 		break;
+	case GF_PROP_4CC_LIST:
+		p->value.uint_list.nb_items = len = gsfdmx_read_vlen(bs);
+		p->value.uint_list.vals = gf_malloc(sizeof(u32)*len);
+		for (i=0; i<len; i++) {
+			p->value.uint_list.vals[i] = gf_bs_read_u32(bs);
+		}
+		break;
+	case GF_PROP_VEC2I_LIST:
+		p->value.v2i_list.nb_items = len = gsfdmx_read_vlen(bs);
+		p->value.v2i_list.vals = gf_malloc(sizeof(GF_PropVec2i)*len);
+		for (i=0; i<len; i++) {
+			p->value.v2i_list.vals[i].x = gsfdmx_read_vlen(bs);
+			p->value.v2i_list.vals[i].y = gsfdmx_read_vlen(bs);
+		}
+		break;
 	case GF_PROP_POINTER:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] pointer property found in serialized stream, illegal\n"));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] Cannot deserialize property of unknown type\n"));
+		if (gf_props_type_is_enum(p->type)) {
+			p->value.uint = gsfdmx_read_vlen(bs);
+			break;
+		}
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] Cannot read property of unknown type\n"));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	return GF_OK;
@@ -399,6 +423,7 @@
 	u32 i;
 	u8 cfg_version;
 	GF_BitStream *bs=NULL;
+	Bool pid_is_file = GF_FALSE;
 
 	if (pck->crypted) {
 		gsfdmx_decrypt(ctx, pck->output, pck->full_block_size);
@@ -429,9 +454,44 @@
 		e = gsfdmx_read_prop(bs, &p);
 		if (e) return e;
 
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_DEBUG)) {
+			char dump[GF_PROP_DUMP_ARG_SIZE];
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[GSFDemux] Set pid %d %s %s to %s\n", gst->idx, gf_props_4cc_get_name(p4cc), is_info_update ? "info" : "property", gf_props_dump(p4cc, &p, dump, GF_PROP_DUMP_DATA_NONE) ) );
+		}
+#endif
+
 		if (is_info_update) gf_filter_pid_set_info(gst->opid, p4cc, &p);
 		else gf_filter_pid_set_property(gst->opid, p4cc, &p);
+
+		if (p4cc==GF_PROP_PID_STREAM_TYPE) {
+			if (p.value.uint==GF_STREAM_FILE)
+				pid_is_file = GF_TRUE;
+		}
+	}
+
+	//PID is a file, we must start dispatch asap for demuxers to work
+	if (pid_is_file) {
+		const GF_PropertyValue *url = gf_filter_pid_get_property(gst->opid, GF_PROP_PID_URL);
+		if (url) {
+			const char *base_name = gf_file_basename(url->value.string);
+			if (base_name) gf_filter_pid_set_name(gst->opid, base_name);
+		}
+		gf_filter_pid_set_property(gst->opid, GF_PROP_PID_FILE_CACHED, NULL);
+		gf_filter_pid_set_property(gst->opid, GF_PROP_PID_FILEPATH, NULL);
+		gf_filter_pid_set_property(gst->opid, GF_PROP_PID_DOWN_SIZE, NULL);
+		gf_filter_pid_set_property(gst->opid, GF_PROP_PID_DOWN_BYTES, NULL);
+
+		ctx->wait_for_play = GF_FALSE;
+		if (!ctx->file_pids) {
+			GF_FilterEvent evt;
+			ctx->file_pids = GF_TRUE;
+			GF_FEVT_INIT(evt, GF_FEVT_PLAY, ctx->ipid);
+			gf_filter_pid_send_event(ctx->ipid, &evt);
+		}
 	}
+
+
 	for (i=0; i<nb_str_props; i++) {
 		GF_PropertyValue p;
 
@@ -470,7 +530,7 @@
 		return GF_NOT_SUPPORTED;
 	}
 	sig = gf_bs_read_u8(bs);
-	if (sig != 1) {
+	if (sig != GF_GSF_VERSION) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] Wrong GPAC serialized version %d\n", sig ));
 		ctx->tune_error = GF_TRUE;
 		return GF_NOT_SUPPORTED;
@@ -531,6 +591,16 @@
 	return GF_OK;
 }
 
+
+static GFINLINE void gsfdmx_pck_reset(GSF_Packet *pck)
+{
+	u32 alloc_frags = pck->nb_alloc_frags;
+	GSF_PacketFragment *frags = pck->frags;
+	memset(pck, 0, sizeof(GSF_Packet));
+	pck->nb_alloc_frags = alloc_frags;
+	pck->frags = frags;
+}
+
 static GFINLINE GSF_Packet *gsfdmx_get_packet(GSF_DemuxCtx *ctx, GSF_Stream *gst, Bool pck_frag, s32 frame_sn, u8 pkt_type, u32 frame_size)
 {
 	u32 i=0, count;
@@ -560,6 +630,11 @@
 		gpck->pck_type = pkt_type;
 		gpck->full_block_size = frame_size;
 		gpck->pck = gf_filter_pck_new_alloc(gst->opid, frame_size, &gpck->output);
+		if (!gpck->pck) {
+			gsfdmx_pck_reset(gpck);
+			gf_list_add(ctx->pck_res, gpck);
+			return NULL;
+		}
 		memset(gpck->output, (u8) ctx->pad, sizeof(char) * gpck->full_block_size);
 
 		count = gf_list_count(gst->packets);
@@ -634,7 +709,7 @@
 GF_Err gsfdmx_read_data_pck(GSF_DemuxCtx *ctx, GSF_Stream *gst, GSF_Packet *gpck, u32 pck_len, Bool full_pck, GF_BitStream *bs)
 {
 	u64 dts=GF_FILTER_NO_TS, cts=GF_FILTER_NO_TS, bo=GF_FILTER_NO_BO;
-	u32 copy_size, consummed, dur, dep_flags=0, tsmodebits, durmodebits, spos;
+	u32 copy_size, consumed, dur, dep_flags=0, tsmodebits, durmodebits, spos;
 	s16 roll=0;
 	u8 carv=0;
 
@@ -657,7 +732,7 @@
 	//if durmode>0, dur on ts_diff_mode
 	//if sap==4, roll on signed 16 bits
 	//if (has sample deps) sample_deps_flags on 8 bits
-	//if has_carousel, carrousel version on 8 bits
+	//if has_carousel, carousel version on 8 bits
 	//if has_byteoffset, byte offset on 64 bits
 	//if (has builtin) vlen nb builtin_props then props[builtin_props]
 	//if (has props) vlen nb_str_props then props[nb_str_props]
@@ -793,16 +868,18 @@
 			}
 			gf_filter_pck_set_property_dyn(gpck->pck, pname, &p);
 			gf_free(pname);
-			if ((p.type==GF_PROP_UINT_LIST) && p.value.uint_list.vals)
-				gf_free(p.value.uint_list.vals);
+			if ((p.type==GF_PROP_UINT_LIST) || (p.type==GF_PROP_4CC_LIST) || (p.type==GF_PROP_SINT_LIST) || (p.type==GF_PROP_VEC2I_LIST) ) {
+				if (p.value.uint_list.vals)
+					gf_free(p.value.uint_list.vals);
+			}
 		}
 	}
 
-	consummed = (u32) gf_bs_get_position(bs) - spos;
-	pck_len -= consummed;
+	consumed = (u32) gf_bs_get_position(bs) - spos;
+	pck_len -= consumed;
 	if (full_pck) {
-		assert(gpck->full_block_size > consummed);
-		gpck->full_block_size -= consummed;
+		assert(gpck->full_block_size > consumed);
+		gpck->full_block_size -= consumed;
 		assert(gpck->full_block_size == pck_len);
 		gf_filter_pck_truncate(gpck->pck, gpck->full_block_size);
 	}
@@ -845,14 +922,6 @@
 }
 #endif
 
-static GFINLINE void gsfdmx_pck_reset(GSF_Packet *pck)
-{
-	u32 alloc_frags = pck->nb_alloc_frags;
-	GSF_PacketFragment *frags = pck->frags;
-	memset(pck, 0, sizeof(GSF_Packet));
-	pck->nb_alloc_frags = alloc_frags;
-	pck->frags = frags;
-}
 
 static void gsfdmx_stream_del(GSF_DemuxCtx *ctx, GSF_Stream *gst, Bool is_flush)
 {
@@ -870,7 +939,7 @@
 		gsfdmx_pck_reset(gpck);
 		gf_list_add(ctx->pck_res, gpck);
 	}
-	if (is_flush)
+	if (is_flush && gst->opid)
 		gf_filter_pid_remove(gst->opid);
 
 	gf_list_del(gst->packets);
@@ -930,23 +999,31 @@
 			if (gpck->pck) gf_filter_pck_discard(gpck->pck);
 			break;
 		case GFS_PCKTYPE_PID_REMOVE:
-			if (gpck->pck) gf_filter_pck_discard(gpck->pck);
+			if (gpck->pck) {
+				gf_filter_pck_discard(gpck->pck);
+				gpck->pck = NULL;
+			}
 			gsfdmx_stream_del(ctx, gst, GF_TRUE);
 			return GF_OK;
 
 		case GFS_PCKTYPE_PID_EOS:
-			if (gpck->pck) gf_filter_pck_discard(gpck->pck);
+			if (gpck->pck) {
+				gf_filter_pck_discard(gpck->pck);
+				gpck->pck = NULL;
+			}
 			gf_filter_pid_set_eos(gst->opid);
 			e = GF_EOS;
 			break;
 		case GFS_PCKTYPE_PCK:
 			if (gpck->corrupted) gf_filter_pck_set_corrupted(gpck->pck, GF_TRUE);
 			e = gf_filter_pck_send(gpck->pck);
+			gpck->pck = NULL;
 			break;
 		default:
 			e = GF_OK;
 			break;
 		}
+
 		gf_list_rem(gst->packets, 0);
 		gsfdmx_pck_reset(gpck);
 		gf_list_add(ctx->pck_res, gpck);
@@ -964,13 +1041,15 @@
 	if (!ctx->tuned)
 		ctx->buf_size = 0;
 
-	if (ctx->alloc_size < ctx->buf_size + data_size) {
-		ctx->buffer = (char*)gf_realloc(ctx->buffer, sizeof(char)*(ctx->buf_size + data_size) );
-		ctx->alloc_size = ctx->buf_size + data_size;
-	}
+	if (data && data_size) {
+		if (ctx->alloc_size < ctx->buf_size + data_size) {
+			ctx->buffer = (char*)gf_realloc(ctx->buffer, sizeof(char)*(ctx->buf_size + data_size) );
+			ctx->alloc_size = ctx->buf_size + data_size;
+		}
 
-	memcpy(ctx->buffer + ctx->buf_size, data, sizeof(char)*data_size);
-	ctx->buf_size += data_size;
+		memcpy(ctx->buffer + ctx->buf_size, data, sizeof(char)*data_size);
+		ctx->buf_size += data_size;
+	}
 
 	gf_bs_reassign_buffer(ctx->bs_r, ctx->buffer, ctx->buf_size);
 	while (gf_bs_available(ctx->bs_r) > 4) { //1 byte header + 3 vlen field at least 1 bytes
@@ -1021,7 +1100,7 @@
 			block_offset = 0;
 		}
 
-		if ( (pck_type==GFS_PCKTYPE_PCK) && !ctx->nb_playing && ctx->tuned && gf_list_count(ctx->streams) ) {
+		if (!ctx->corrupted && (pck_type==GFS_PCKTYPE_PCK) && !ctx->nb_playing && ctx->tuned && !ctx->file_pids && gf_list_count(ctx->streams) ) {
 			ctx->wait_for_play = GF_TRUE;
 			break;
 		}
@@ -1104,6 +1183,7 @@
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] error decoding packet: %s\n", gf_error_to_string(e) ));
 			if (ctx->tune_error) return e;
+			ctx->corrupted = GF_TRUE;
 		}
 		gf_bs_skip_bytes(ctx->bs_r, pck_len);
 		last_pck_end = (u32) gf_bs_get_position(ctx->bs_r);
@@ -1113,6 +1193,13 @@
 		assert(ctx->buf_size>=last_pck_end);
 		memmove(ctx->buffer, ctx->buffer+last_pck_end, sizeof(char) * (ctx->buf_size-last_pck_end));
 		ctx->buf_size -= last_pck_end;
+
+		if (ctx->stop_pending) {
+			GF_FilterEvent evt;
+			ctx->stop_pending = GF_FALSE;
+			GF_FEVT_INIT(evt, GF_FEVT_STOP, ctx->ipid);
+			gf_filter_pid_send_event(ctx->ipid, &evt);
+		}
 	}
 	return GF_OK;
 }
@@ -1133,8 +1220,15 @@
 
 	pck = gf_filter_pid_get_packet(ctx->ipid);
 	if (!pck) {
-		if (gf_filter_pid_is_eos(ctx->ipid)) is_eos = GF_TRUE;
-		else return GF_OK;
+		if (ctx->buf_size) {
+			e = gsfdmx_demux(filter, ctx, NULL, 0);
+			if (e) return e;
+		}
+		if (gf_filter_pid_is_eos(ctx->ipid))
+			is_eos = GF_TRUE;
+		else {
+			return GF_OK;
+		}
 	}
 
 	//check if all the streams are in block state, if so return.
@@ -1148,7 +1242,15 @@
 			}
 		}
 	}
-	if (is_eos) return GF_EOS;
+	if (is_eos) {
+		if (ctx->stop_pending) {
+			GF_FilterEvent evt;
+			ctx->stop_pending = GF_FALSE;
+			GF_FEVT_INIT(evt, GF_FEVT_STOP, ctx->ipid);
+			gf_filter_pid_send_event(ctx->ipid, &evt);
+		}
+		return GF_EOS;
+	}
 
 	if (would_block && (would_block+1==i))
 		return GF_OK;
@@ -1170,8 +1272,8 @@
 	while (buf) {
 		char *start_sig = memchr(buf, 'G', avail);
 		if (!start_sig) return NULL;
-		//signature found and version is 1
-		if (!strncmp(start_sig, "GS5F", 4) && (start_sig[4] == 1)) {
+		//signature found and version is 2
+		if (!strncmp(start_sig, "GS5F", 4) && (start_sig[4] == GF_GSF_VERSION)) {
 			*score = GF_FPROBE_SUPPORTED;
 			return "application/x-gpac-sf";
 		}
@@ -1238,6 +1340,8 @@
 	//we deliver more than these two but this make the filter chain loading stop until we declare a pid
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
 };
 
@@ -1258,14 +1362,14 @@
 
 GF_FilterRegister GSFDemuxRegister = {
 	.name = "gsfdmx",
-	GF_FS_SET_DESCRIPTION("GSF Demuxer")
+	GF_FS_SET_DESCRIPTION("GSF demultiplexer")
 #ifndef GPAC_DISABLE_DOC
-	.help = "This filter provides GSF (__GPAC Super/Simple/Serialized/Stream/State Format__) demultiplexing.\n"
-			"It deserializes the stream states (config/reconfig/info update/remove/eos) and packets of input PIDs.\n"
+	.help = "This filter provides GSF (__GPAC Serialized Format__) demultiplexing.\n"
+			"It de-serializes the stream states (config/reconfig/info update/remove/eos) and packets in the GSF bytestream.\n"
 			"This allows either reading a session saved to file, or receiving the state/data of streams from another instance of GPAC using either pipes or sockets\n"
 			"\n"
 #ifndef GPAC_DISABLE_CRYPTO
-			"The stream format can be encrypted in AES 128 CBC mode, in which case the demux filters must be given a 128 bit key."
+			"The stream format can be encrypted in AES 128 CBC mode, in which case the demultiplexing filter must be given a 128 bit key."
 #endif
 		,
 #endif

gpac-1.0.1.tar.gz/src/filters/dmx_m2ts.c -> gpac-2.0.0.tar.gz/src/filters/dmx_m2ts.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2020
+ *			Copyright (c) Telecom ParisTech 2005-2022
 *					All rights reserved
 *
 * This file is part of GPAC / M2TS demux filter
@@ -59,7 +59,7 @@
 {
 	//opts
 	const char *temi_url;
-	Bool dsmcc, seeksrc;
+	Bool dsmcc, seeksrc, sigfrag;
 
 	GF_Filter *filter;
 	GF_FilterPid *ipid;
@@ -85,6 +85,8 @@
 
 	u32 mux_tune_state;
 	u32 wait_for_progs;
+
+	Bool is_dash;
 } GF_M2TSDmxCtx;
 
 
@@ -160,14 +162,40 @@
 	}
 }
 
+static void m2tsdmx_update_sdt(GF_M2TS_Demuxer *ts, void *for_pid)
+{
+	u32 i, count = gf_list_count(ts->programs);
+	for (i=0; i<count; i++) {
+		u32 j, nb_streams;
+		GF_M2TS_Program *prog = gf_list_get(ts->programs, i);
+		GF_M2TS_SDT *sdt = gf_m2ts_get_sdt_info(ts, prog->number);
+		if (!sdt) continue;
+
+		nb_streams = gf_list_count(prog->streams);
+		for (j=0; j<nb_streams; j++) {
+			GF_M2TS_ES *es = gf_list_get(prog->streams, j);
+			if (!es->user) continue;
+			if (for_pid && (es->user != for_pid)) continue;
+			//TODO, translate non standard character maps to UTF8
+			//we for now comment in test mode to avoid non UTF characters in text dumps
+			if (isalnum(sdt->service[0]) || !gf_sys_is_test_mode())
+				gf_filter_pid_set_property((GF_FilterPid *)es->user, GF_PROP_PID_SERVICE_NAME, &PROP_STRING(sdt->service ) );
+
+			if (isalnum(sdt->provider[0]) || !gf_sys_is_test_mode())
+				gf_filter_pid_set_property((GF_FilterPid *)es->user, GF_PROP_PID_SERVICE_PROVIDER, &PROP_STRING( sdt->provider ) );
+		}
+	}
+}
+
 static void m2tsdmx_declare_pid(GF_M2TSDmxCtx *ctx, GF_M2TS_PES *stream, GF_ESD *esd)
 {
-	u32 i, count, codecid=0, stype=0;
+	u32 i, count, codecid=0, stype=0, orig_stype=0;
 	GF_FilterPid *opid;
 	Bool m4sys_stream = GF_FALSE;
 	Bool m4sys_iod_stream = GF_FALSE;
 	Bool has_scal_layer = GF_FALSE;
 	Bool unframed = GF_FALSE;
+	Bool unframed_latm = GF_FALSE;
 	char szName[20];
 	const char *stname;
 	if (stream->user) return;
@@ -206,6 +234,12 @@
 			if (stream->program->is_scalable)
 				has_scal_layer = GF_TRUE;
 			break;
+		case GF_M2TS_HLS_AVC_CRYPT:
+			stype = GF_STREAM_ENCRYPTED;
+			orig_stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_AVC;
+			unframed = GF_TRUE;
+			break;
 		case GF_M2TS_VIDEO_SVC:
 			stype = GF_STREAM_VISUAL;
 			codecid = GF_CODECID_SVC;
@@ -229,6 +263,16 @@
 			codecid = GF_CODECID_LHVC;
 			has_scal_layer = GF_TRUE;
 			break;
+		case GF_M2TS_VIDEO_VVC:
+		case GF_M2TS_VIDEO_VVC_TEMPORAL:
+			stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_VVC;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_VIDEO_VC1:
+			stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_SMPTE_VC1;
+			break;
 		case GF_M2TS_AUDIO_MPEG1:
 			stype = GF_STREAM_AUDIO;
 			codecid = GF_CODECID_MPEG_AUDIO;
@@ -239,7 +283,6 @@
 			codecid = GF_CODECID_MPEG2_PART3;
 			unframed = GF_TRUE;
 			break;
-		case GF_M2TS_AUDIO_LATM_AAC:
 		case GF_M2TS_AUDIO_AAC:
 		case GF_CODECID_AAC_MPEG2_MP:
 		case GF_CODECID_AAC_MPEG2_LCP:
@@ -248,6 +291,19 @@
 			codecid = GF_CODECID_AAC_MPEG4;
 			unframed = GF_TRUE;
 			break;
+		case GF_M2TS_AUDIO_LATM_AAC:
+			stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_AAC_MPEG4;
+			unframed = GF_TRUE;
+			unframed_latm = GF_TRUE;
+			break;
+
+		case GF_M2TS_MHAS_MAIN:
+		case GF_M2TS_MHAS_AUX:
+			stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_MHAS;
+			unframed = GF_TRUE;
+			break;
 		case GF_M2TS_AUDIO_AC3:
 			stype = GF_STREAM_AUDIO;
 			codecid = GF_CODECID_AC3;
@@ -257,6 +313,14 @@
 			stype = GF_STREAM_AUDIO;
 			codecid = GF_CODECID_EAC3;
 			break;
+		case GF_M2TS_AUDIO_DTS:
+			stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_DTS_X;
+			break;
+		case GF_M2TS_AUDIO_OPUS:
+			stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_OPUS;
+			break;
 		case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
 			((GF_M2TS_ES*)stream)->flags |= GF_M2TS_ES_SEND_REPEATED_SECTIONS;
 			//fallthrough
@@ -283,13 +347,42 @@
 			stype = GF_STREAM_AUDIO;
 			codecid = GF_CODECID_EAC3;
 			break;
+
+		case GF_M2TS_HLS_AAC_CRYPT:
+			stype = GF_STREAM_ENCRYPTED;
+			orig_stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_AAC_MPEG4;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_HLS_AC3_CRYPT:
+			stype = GF_STREAM_ENCRYPTED;
+			orig_stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_AC3;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_HLS_EC3_CRYPT:
+			stype = GF_STREAM_ENCRYPTED;
+			orig_stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_EAC3;
+			break;
 		default:
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TSDmx] Stream type %d not supported - ignoring pid\n", stream->stream_type));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TSDmx] Stream type 0x%02X not supported - ignoring pid\n", stream->stream_type));
 			return;
 		}
 	}
 
-	opid = gf_filter_pid_new(ctx->filter);
+	opid = NULL;
+	for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
+		opid = gf_filter_get_opid(ctx->filter, i);
+		const GF_PropertyValue *p = gf_filter_pid_get_property(opid, GF_PROP_PID_ID);
+		if (p && (p->value.uint == stream->pid))
+			break;
+		opid = NULL;
+	}
+
+	if (!opid)
+		opid = gf_filter_pid_new(ctx->filter);
+
 	stream->user = opid;
 	stream->flags |= GF_M2TS_ES_ALREADY_DECLARED;
 
@@ -298,8 +391,7 @@
 	gf_filter_pid_set_name(opid, szName);
 
 	gf_filter_pid_set_property(opid, GF_PROP_PID_ID, &PROP_UINT(stream->pid) );
-	if (stream->mpeg4_es_id)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_ESID, &PROP_UINT(stream->mpeg4_es_id) );
+	gf_filter_pid_set_property(opid, GF_PROP_PID_ESID, stream->mpeg4_es_id ? &PROP_UINT(stream->mpeg4_es_id) : NULL);
 
 	if (m4sys_stream) {
 		if (stream->slcfg) gf_free(stream->slcfg);
@@ -322,20 +414,39 @@
 	} else {
 		gf_filter_pid_set_property(opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(stype) );
 		gf_filter_pid_set_property(opid, GF_PROP_PID_CODECID, &PROP_UINT(codecid) );
-		if (unframed)
-			gf_filter_pid_set_property(opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+
+		gf_filter_pid_set_property(opid, GF_PROP_PID_UNFRAMED, unframed ? &PROP_BOOL(GF_TRUE) : NULL);
+		gf_filter_pid_set_property(opid, GF_PROP_PID_UNFRAMED_LATM, unframed_latm ? &PROP_BOOL(GF_TRUE) : NULL );
+
+		if (orig_stype) {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(orig_stype) );
+			gf_filter_pid_set_property(opid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, &PROP_UINT(GF_HLS_SAMPLE_AES_SCHEME) );
+		} else {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_ORIG_STREAM_TYPE, NULL);
+			gf_filter_pid_set_property(opid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, NULL);
+		}
 
 		gf_filter_pid_set_property(opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(90000) );
 		gf_filter_pid_set_property(opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(stream->program->pcr_pid) );
 	}
-	if (has_scal_layer)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_SCALABLE, &PROP_BOOL(GF_TRUE));
+	gf_filter_pid_set_property(opid, GF_PROP_PID_SCALABLE, has_scal_layer ? &PROP_BOOL(GF_TRUE) : NULL);
 
 	gf_filter_pid_set_property(opid, GF_PROP_PID_SERVICE_ID, &PROP_UINT(stream->program->number) );
 
+	if (stream->lang) {
+		char szLang[4];
+		szLang[0] = (stream->lang>>16) & 0xFF;
+		szLang[1] = (stream->lang>>8) & 0xFF;
+		szLang[2] = stream->lang & 0xFF;
+		szLang[3] = 0;
+		if (szLang[2]==' ') szLang[2] = 0;
+		gf_filter_pid_set_property(opid, GF_PROP_PID_LANGUAGE, &PROP_STRING(szLang) );
+	}
+
+
 	if (ctx->duration.num>1) {
 		gf_filter_pid_set_property(opid, GF_PROP_PID_DURATION, &PROP_FRAC64(ctx->duration) );
-		gf_filter_pid_set_property(opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_SEEK ) );
+		gf_filter_pid_set_property(opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 	}
 	/*indicate our coding dependencies if any*/
 	if (!m4sys_stream) {
@@ -344,8 +455,28 @@
 			if ((stream->stream_type == GF_M2TS_VIDEO_HEVC_TEMPORAL) || (stream->stream_type == GF_M2TS_VIDEO_HEVC_MCTS)) {
 				gf_filter_pid_set_property(opid, GF_PROP_PID_SUBLAYER, &PROP_BOOL(GF_TRUE) );
 			}
+		} else {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DEPENDENCY_ID, NULL);
+			gf_filter_pid_set_property(opid, GF_PROP_PID_SUBLAYER, NULL);
 		}
 	}
+
+	if (stream->dv_info[0]) {
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DOLBY_VISION, &PROP_DATA(stream->dv_info, 24) );
+		u32 dvtype=0;
+		if (stream->dv_info[24]) {
+			if (stream->stream_type == GF_M2TS_VIDEO_H264)
+				dvtype = GF_4CC('d','a','v','1');
+			else
+				dvtype = GF_4CC('d','v','h','1');
+		}
+		gf_filter_pid_set_property(opid, GF_PROP_PID_ISOM_SUBTYPE, dvtype ? &PROP_4CC(dvtype) : NULL);
+	} else {
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DOLBY_VISION, NULL);
+	}
+
+	m2tsdmx_update_sdt(ctx->ts, opid);
+
 	gf_m2ts_set_pes_framing((GF_M2TS_PES *)stream, GF_M2TS_PES_FRAMING_DEFAULT);
 }
 
@@ -354,18 +485,6 @@
 	u32 i, count;
 
 	count = gf_list_count(prog->streams);
-#ifdef FILTER_FIXME
-	if (ctx->ts->tuner) {
-		Bool found = 0;
-		for (i=0; i<count; i++) {
-			GF_M2TS_PES *pes = gf_list_get(prog->streams, i);
-			if (pes->pid==ctx->ts->tuner->vpid) found = 1;
-			else if (pes->pid==ctx->ts->tuner->apid) found = 1;
-		}
-		if (!found) return;
-	}
-#endif
-
 	for (i=0; i<count; i++) {
 		GF_M2TS_PES *es = gf_list_get(prog->streams, i);
 		if (es->pid==prog->pmt_pid) continue;
@@ -394,7 +513,7 @@
 	}
 }
 
-static void m2tdmx_merge_temi(GF_M2TS_ES *stream, GF_FilterPacket *pck)
+static void m2tdmx_merge_temi(GF_FilterPid *pid, GF_M2TS_ES *stream, GF_FilterPacket *pck)
 {
 	if (stream->props) {
 		char szID[100];
@@ -407,6 +526,12 @@
 		}
 		gf_list_del(stream->props);
 		stream->props = NULL;
+
+		if (!(stream->flags & GF_M2TS_ES_TEMI_INFO)) {
+			stream->flags |= GF_M2TS_ES_TEMI_INFO;
+			gf_filter_pid_set_property(pid, GF_PROP_PID_HAS_TEMI, &PROP_BOOL(GF_TRUE) );
+		}
+		
 	}
 }
 
@@ -422,6 +547,8 @@
 	opid = pck->stream->user;
 
 	dst_pck = gf_filter_pck_new_alloc(opid, pck->data_len, &data);
+	if (!dst_pck) return;
+
 	memcpy(data, pck->data, pck->data_len);
 	//we don't have end of frame signaling
 	gf_filter_pck_set_framing(dst_pck, (pck->flags & GF_M2TS_PES_PCK_AU_START) ? GF_TRUE : GF_FALSE, GF_FALSE);
@@ -433,7 +560,12 @@
 		}
 		gf_filter_pck_set_sap(dst_pck, (pck->flags & GF_M2TS_PES_PCK_RAP) ? GF_FILTER_SAP_1 : GF_FILTER_SAP_NONE);
 	}
-	m2tdmx_merge_temi((GF_M2TS_ES *)pck->stream, dst_pck);
+	m2tdmx_merge_temi(opid, (GF_M2TS_ES *)pck->stream, dst_pck);
+
+	if (pck->stream->is_seg_start) {
+		pck->stream->is_seg_start = GF_FALSE;
+		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+	}
 	gf_filter_pck_send(dst_pck);
 }
 
@@ -474,6 +606,8 @@
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(opid, pck->data_len - slh_len, &data);
+	if (!dst_pck) return;
+
 	memcpy(data, pck->data + slh_len, pck->data_len - slh_len);
 	start = end = GF_FALSE;
 	if (slc->useAccessUnitStartFlag && slh.accessUnitStartFlag) start = GF_TRUE;
@@ -491,7 +625,11 @@
 
 	gf_filter_pck_set_carousel_version(dst_pck, pck->version_number);
 
-	m2tdmx_merge_temi(pck->stream, dst_pck);
+	m2tdmx_merge_temi(opid, pck->stream, dst_pck);
+	if (pck->stream->is_seg_start) {
+		pck->stream->is_seg_start = GF_FALSE;
+		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+	}
 	gf_filter_pck_send(dst_pck);
 
 	if (pck->version_number + 1 == pck->stream->slcfg->carousel_version)
@@ -545,7 +683,7 @@
 	}
 }
 
-#ifdef FILTER_FIXME
+#if 0 //unused
 static void m2tsdmx_declare_epg_pid(GF_M2TSDmxCtx *ctx)
 {
 	assert(ctx->eit_pid == NULL);
@@ -558,6 +696,7 @@
 }
 #endif
 
+
 static void m2tsdmx_on_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *param)
 {
 	u32 i, count;
@@ -596,35 +735,17 @@
 	case GF_M2TS_EVT_SDT_FOUND:
 	case GF_M2TS_EVT_SDT_UPDATE:
 //	case GF_M2TS_EVT_SDT_REPEAT:
-		count = gf_list_count(ts->programs);
-		for (i=0; i<count; i++) {
-			GF_M2TS_Program *prog = gf_list_get(ts->programs, i);
-			GF_M2TS_SDT *sdt = gf_m2ts_get_sdt_info(ts, prog->number);
-			if (sdt) {
-				u32 j, nb_streams;
-				nb_streams = gf_list_count(prog->streams);
-				for (j=0; j<nb_streams; j++) {
-					GF_M2TS_ES *es = gf_list_get(prog->streams, j);
-					if (es->user) {
-						//TODO, translate non standard character maps to UTF8
-						//we for now comment in test mode to avoid non UTF characters in text dumps
-						if (isalnum(sdt->service[0]) || !gf_sys_is_test_mode())
-							gf_filter_pid_set_property((GF_FilterPid *)es->user, GF_PROP_PID_SERVICE_NAME, &PROP_NAME( sdt->service ) );
-
-						if (isalnum(sdt->provider[0]) || !gf_sys_is_test_mode())
-							gf_filter_pid_set_property((GF_FilterPid *)es->user, GF_PROP_PID_SERVICE_PROVIDER, &PROP_NAME( sdt->provider ) );
-					}
-				}
-			}
-		}
+		m2tsdmx_update_sdt(ts, NULL);
 		break;
 	case GF_M2TS_EVT_DVB_GENERAL:
 		if (ctx->eit_pid) {
 			GF_M2TS_SL_PCK *pck = (GF_M2TS_SL_PCK *)param;
 			u8 *data;
 			GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->eit_pid, pck->data_len, &data);
-			memcpy(data, pck->data, pck->data_len);
-			gf_filter_pck_send(dst_pck);
+			if (dst_pck) {
+				memcpy(data, pck->data, pck->data_len);
+				gf_filter_pck_send(dst_pck);
+			}
 		}
 		break;
 	case GF_M2TS_EVT_PES_PCK:
@@ -660,8 +781,14 @@
 			if (!stream->user) continue;
 
 			dst_pck = gf_filter_pck_new_shared(stream->user, NULL, 0, NULL);
+			if (!dst_pck) continue;
+
 			gf_filter_pck_set_cts(dst_pck, pcr);
 			gf_filter_pck_set_clock_type(dst_pck, discontinuity ? GF_FILTER_CLOCK_PCR_DISC : GF_FILTER_CLOCK_PCR);
+			if (pck->stream->is_seg_start) {
+				pck->stream->is_seg_start = GF_FALSE;
+				gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+			}
 			gf_filter_pck_send(dst_pck);
 
 			if (map_time) {
@@ -692,7 +819,7 @@
 					gf_filter_pid_set_info(stream->user, GF_PROP_PID_UTC_TIMESTAMP, & PROP_LONGUINT(prog->last_pcr_value / 300) );
 				}
 			}
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TS In] Mapping TDT Time %04d/%02d/%02d %02d:%02d:%02d and PCR time "LLD" on program %d\n",
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[M2TS In] Mapping TDT Time %04d/%02d/%02d %02d:%02d:%02d and PCR time "LLD" on program %d\n",
 				 tdt->year, tdt->month, tdt->day, tdt->hour, tdt->minute, tdt->second, prog->last_pcr_value/300, prog->number));
 		}
 	}
@@ -750,7 +877,10 @@
 		gf_bs_write_int(bs, temi_l->is_splicing, 1);
 		gf_bs_write_int(bs, temi_l->reload_external, 1);
 		gf_bs_write_int(bs, 0, 5);
-		gf_bs_write_double(bs, temi_l->activation_countdown);
+		if (temi_l->is_announce) {
+			gf_bs_write_u32(bs, temi_l->activation_countdown.den);
+			gf_bs_write_u32(bs, temi_l->activation_countdown.num);
+		}
 		gf_bs_get_content(bs, &t->data, &t->len);
 		gf_bs_del(bs);
 
@@ -798,6 +928,19 @@
 		gf_list_add(es->props, t);
 	}
 	break;
+	case GF_M2TS_EVT_STREAM_REMOVED:
+	{
+		GF_M2TS_ES *es = (GF_M2TS_ES *)param;
+		if (es && es->props) {
+			while (gf_list_count(es->props)) {
+				GF_TEMIInfo *t = gf_list_pop_back(es->props);
+				gf_free(t->data);
+				gf_free(t);
+			}
+			gf_list_del(es->props);
+		}
+	}
+		break;
 	}
 }
 
@@ -809,7 +952,18 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-//		gf_filter_pid_remove(ctx->opid);
+		u32 i, count = gf_list_count(ctx->ts->programs);
+		for (i=0; i<count; i++) {
+			GF_M2TS_Program *prog = gf_list_get(ctx->ts->programs, i);
+			u32 j, count2 = gf_list_count(prog->streams);
+			for (j=0; j<count2; j++) {
+				GF_M2TS_ES *es = gf_list_get(prog->streams, j);
+				if (es->user) {
+					GF_FilterPid *opid = es->user;
+					gf_filter_pid_remove(opid);
+				}
+			}
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -819,7 +973,7 @@
 	ctx->mux_tune_state = DMX_TUNE_DONE;
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
-	if (p && p->value.string && !ctx->duration.num) {
+	if (p && p->value.string && !ctx->duration.num && strncmp(p->value.string, "gmem://", 7)) {
 		stream = gf_fopen(p->value.string, "rb");
 	}
 
@@ -942,12 +1096,14 @@
 			}
 			return GF_FALSE;
 		}
+		if (com->play.no_byterange_forward)
+			ctx->is_dash = GF_TRUE;
 		/*mark pcr as not initialized*/
 		if (pes->program->pcr_pid==pes->pid) pes->program->first_dts=0;
 		gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_DEFAULT);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[M2TSDmx] Setting default reframing for PID %d\n", pes->pid));
 
-		/*this is a multplex, only trigger the play command for the first stream activated*/
+		/*this is a multiplex, only trigger the play command for the first activated stream*/
 		ctx->nb_playing++;
 		if (ctx->nb_playing>1) return GF_TRUE;
 
@@ -1041,15 +1197,18 @@
 static GF_Err m2tsdmx_process(GF_Filter *filter)
 {
 	GF_M2TSDmxCtx *ctx = gf_filter_get_udta(filter);
-	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+	GF_FilterPacket *pck;
+	Bool check_block = GF_TRUE;
 	const char *data;
 	u32 size;
 
+restart:
+	pck = gf_filter_pid_get_packet(ctx->ipid);
 	if (!pck) {
 		if (gf_filter_pid_is_eos(ctx->ipid)) {
 			u32 i, nb_streams = gf_filter_get_opid_count(filter);
 
-			gf_m2ts_flush_all(ctx->ts);
+			gf_m2ts_flush_all(ctx->ts, ctx->is_dash);
 			for (i=0; i<nb_streams; i++) {
 				GF_FilterPid *opid = gf_filter_get_opid(filter, i);
 				gf_filter_pid_set_eos(opid);
@@ -1058,12 +1217,19 @@
 		}
 		return GF_OK;
 	}
+	if (ctx->sigfrag) {
+		Bool is_start;
+		gf_filter_pck_get_framing(pck, &is_start, NULL);
+		if (is_start) {
+			gf_m2ts_mark_seg_start(ctx->ts);
+		}
+	}
 	//we process even if no stream playing: since we use unframed dispatch we may need to send packets to configure reframers
 	//which will in turn connect to the sink which will send the PLAY event marking stream(s) as playing
 	if (ctx->in_seek) {
 		gf_m2ts_reset_parsers(ctx->ts);
 		ctx->in_seek = GF_FALSE;
-	} else {
+	} else if (check_block) {
 		u32 i, nb_streams, would_block = 0;
 		nb_streams = gf_filter_get_opid_count(filter);
 		for (i=0; i<nb_streams; i++) {
@@ -1074,6 +1240,8 @@
 		}
 		if (would_block && (would_block==nb_streams))
 			return GF_OK;
+
+		check_block = GF_FALSE;
 	}
 
 	data = gf_filter_pck_get_data(pck, &size);
@@ -1088,6 +1256,8 @@
 		gf_filter_pid_send_event(ctx->ipid, &fevt);
 		ctx->mux_tune_state = DMX_TUNE_DONE;
 		gf_m2ts_reset_parsers(ctx->ts);
+	} else {
+		goto restart;
 	}
 	return GF_OK;
 }
@@ -1103,14 +1273,15 @@
 
 static const GF_FilterCapability M2TSDmxCaps[] =
 {
-	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
-	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "ts|m2t|mts|dmb|trp"),
-	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/mpeg-2|video/mp2t|video/mpeg"),
+	CAP_UINT(GF_CAPS_INPUT_STATIC, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT_STATIC, GF_PROP_PID_FILE_EXT, "ts|m2t|mts|dmb|trp"),
+	CAP_STRING(GF_CAPS_INPUT_STATIC, GF_PROP_PID_MIME, "video/mpeg-2|video/mp2t|video/mpeg|audio/mpeg-2|audio/mp2t"),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_PRIVATE_SCENE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 };
 
@@ -1120,13 +1291,14 @@
 	{ OFFS(temi_url), "force TEMI URL", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(dsmcc), "enable DSMCC receiver", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(seeksrc), "seek local source file back to origin once all programs are setup", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(sigfrag), "signal segment boundaries on output packets for DASH or HLS sources", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };
 
 
 GF_FilterRegister M2TSDmxRegister = {
 	.name = "m2tsdmx",
-	GF_FS_SET_DESCRIPTION("MPEG-2 TS demuxer")
+	GF_FS_SET_DESCRIPTION("MPEG-2 TS demultiplexer")
 	GF_FS_SET_HELP("This filter demultiplexes MPEG-2 Transport Stream files/data into a set of media PIDs and frames.")
 	.private_size = sizeof(GF_M2TSDmxCtx),
 	.initialize = m2tsdmx_initialize,

gpac-1.0.1.tar.gz/src/filters/dmx_mpegps.c -> gpac-2.0.0.tar.gz/src/filters/dmx_mpegps.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2017
+ *			Copyright (c) Telecom ParisTech 2005-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG Program Stream demuxer filter
@@ -133,7 +133,7 @@
 
 		gf_filter_pid_set_property(st->opid, GF_PROP_PID_BITRATE, &PROP_UINT((u32) mpeg2ps_get_video_stream_bitrate(ctx->ps, i) ) );
 
-		gf_filter_pid_set_property(st->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_SEEK ) );
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 	}
 
 	nb_streams = mpeg2ps_get_audio_stream_count(ctx->ps);
@@ -193,7 +193,7 @@
 		gf_filter_pid_set_property(st->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL( GF_TRUE ) );
 		gf_filter_pid_set_property_str(st->opid, "nocts", &PROP_BOOL(GF_TRUE ));
 
-		gf_filter_pid_set_property(st->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_SEEK ) );
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 	}
 }
 
@@ -208,7 +208,8 @@
 		ctx->ipid = NULL;
 		while (gf_list_count(ctx->streams) ) {
 			M2PSStream *st = gf_list_pop_back(ctx->streams);
-			gf_filter_pid_remove(st->opid);
+			if (st->opid)
+				gf_filter_pid_remove(st->opid);
 			gf_free(st);
 		}
 		return GF_OK;
@@ -379,8 +380,10 @@
 			if (st->last_dts == dts) dts++;;
 			st->last_dts = dts;
 
-			if ((buf[buf_len - 4] == 0) && (buf[buf_len - 3] == 0) && (buf[buf_len - 2] == 1)) buf_len -= 4;
+			if ((buf_len>4) && (buf[buf_len - 4] == 0) && (buf[buf_len - 3] == 0) && (buf[buf_len - 2] == 1)) buf_len -= 4;
 			dst_pck = gf_filter_pck_new_alloc(st->opid, buf_len, &pck_data);
+			if (!dst_pck) continue;
+
 			memcpy(pck_data, buf, buf_len);
 			if (ftype==1) gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
 
@@ -403,6 +406,8 @@
 				continue;
 			}
 			dst_pck = gf_filter_pck_new_alloc(st->opid, buf_len, &pck_data);
+			if (!dst_pck) continue;
+			
 			memcpy(pck_data, buf, buf_len);
 			if (cts != GF_FILTER_NO_TS) {
 				cts -= ctx->first_dts;
@@ -466,8 +471,8 @@
 
 GF_FilterRegister M2PSDmxRegister = {
 	.name = "m2psdmx",
-	GF_FS_SET_DESCRIPTION("MPEG PS demuxer")
-	GF_FS_SET_HELP("This filter demultiplexes MPEG-2 program stream files/data to produce media PIDs and frames.")
+	GF_FS_SET_DESCRIPTION("MPEG PS demultiplexer")
+	GF_FS_SET_HELP("This filter demultiplexes MPEG-2 program streams to produce media PIDs and frames.")
 	.private_size = sizeof(GF_M2PSDmxCtx),
 	.initialize = m2psdmx_initialize,
 	.finalize = m2psdmx_finalize,

gpac-1.0.1.tar.gz/src/filters/dmx_nhml.c -> gpac-2.0.0.tar.gz/src/filters/dmx_nhml.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2020
+ *			Copyright (c) Telecom ParisTech 2005-2022
 *					All rights reserved
 *
 * This file is part of GPAC / NHML demuxer filter
@@ -33,6 +33,8 @@
 #include <gpac/isomedia.h>
 #include <gpac/base_coding.h>
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 #include <gpac/avparse.h>
 #endif
@@ -59,7 +61,7 @@
 	u32 sample_num;
 
 	FILE *mdia;
-	char szMedia[GF_MAX_PATH];
+	char *media_file;
 
 	GF_DOMParser *parser;
 	GF_XMLNode *root;
@@ -97,8 +99,7 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		//gf_filter_pid_remove(st->opid);
-
+		gf_filter_pid_remove(ctx->opid);
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -114,6 +115,11 @@
 		if (p && p->value.string && strstr(p->value.string, "dims")) ctx->is_dims = GF_TRUE;
 	}
 
+	//check multithreaded FileIO restrictions
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
+	if (p && p->value.string && gf_fileio_is_main_thread(p->value.string)) {
+		gf_filter_force_main_thread(filter, GF_TRUE);
+	}
 	return GF_OK;
 }
 
@@ -209,6 +215,122 @@
 	return GF_FALSE;
 }
 
+static GF_XMLNode *nhmldmx_get_props(GF_NHMLDmxCtx *ctx, char *ID)
+{
+	u32 i=0;
+	GF_XMLNode *node;
+	while ((node = (GF_XMLNode *) gf_list_enum(ctx->root->content, &i))) {
+		GF_XMLAttribute *att;
+		GF_XMLNode *childnode;
+		u32 j;
+		if (node->type) continue;
+		if (!stricmp(node->name, "Properties")) {
+			j=0;
+			while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+				if (!strcmp(att->name, "id") && !strcmp(att->value, ID)) return node;
+			}
+			continue;
+		}
+		if (stricmp(node->name, "NHNTSample")) continue;
+		j=0;
+		while ((childnode = (GF_XMLNode *) gf_list_enum(node->content, &j))) {
+			u32 k=0;
+			if (childnode->type) continue;
+			if (stricmp(childnode->name, "Properties")) continue;
+			while ( (att = (GF_XMLAttribute *)gf_list_enum(childnode->attributes, &k))) {
+				if (!strcmp(att->name, "id") && !strcmp(att->value, ID)) return childnode;
+			}
+		}
+	}
+	return NULL;
+}
+static void nhmldmx_set_props(GF_NHMLDmxCtx *ctx, GF_XMLNode *props, GF_FilterPacket *pck)
+{
+	GF_XMLNode *childnode;
+	u32 i=0;
+	GF_XMLAttribute *att;
+
+	i=0;
+	while ( (att = (GF_XMLAttribute *)gf_list_enum(props->attributes, &i))) {
+		if (strcmp(att->name, "ref")) continue;;
+		GF_XMLNode *ref_props = nhmldmx_get_props(ctx, att->value);
+		if (ref_props) {
+			props = ref_props;
+			break;
+		}
+	}
+
+	i=0;
+	while ((childnode = (GF_XMLNode *) gf_list_enum(props->content, &i))) {
+		u32 j;
+		GF_XMLNode *bs_child;
+		Bool has_bs = GF_FALSE;
+		if (childnode->type) continue;
+		if (stricmp(childnode->name, "P")) continue;
+
+		char *ptype=NULL;
+		char *pname=NULL;
+		char *pval=NULL;
+		j=0;
+		while ( (att = (GF_XMLAttribute *)gf_list_enum(childnode->attributes, &j))) {
+			if (!strcmp(att->name, "type")) ptype = att->value;
+			else if (!strcmp(att->name, "name")) pname = att->value;
+			else if (!strcmp(att->name, "value")) pval = att->value;
+			else if (!pname) {
+				pname = att->name;
+				pval = att->value;
+			}
+		}
+
+		j=0;
+		while ( (bs_child = (GF_XMLNode *)gf_list_enum(childnode->content, &j))) {
+			if (bs_child->type) continue;
+			if (!stricmp(bs_child->name, "BS")) has_bs = GF_TRUE;
+		}
+
+
+		Bool reset=GF_TRUE;
+		u32 prop_type = 0;
+		u32 p4cc = gf_props_get_id(pname);
+		if (p4cc) {
+			prop_type = gf_props_4cc_get_type(p4cc);
+			pname = NULL;
+			if (prop_type!=GF_PROP_DATA)
+				has_bs = GF_FALSE;
+		} else if (ptype) {
+			prop_type = gf_props_parse_type(ptype);
+		} else {
+			prop_type = GF_PROP_STRING;
+		}
+		GF_PropertyValue prop_val;
+		if (has_bs) {
+			GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			prop_val.type = GF_PROP_DATA_NO_COPY;
+			gf_xml_parse_bit_sequence_bs(childnode, ctx->src_url, bs);
+			gf_bs_get_content(bs, &prop_val.value.data.ptr, &prop_val.value.data.size);
+			gf_bs_del(bs);
+			reset = GF_FALSE;
+		} else if (pval) {
+			prop_val = gf_props_parse_value(prop_type, pname, pval, NULL, ',');
+		} else {
+			continue;
+		}
+
+		if (p4cc) {
+			if (pck)
+				gf_filter_pck_set_property(pck, p4cc, &prop_val );
+			else
+				gf_filter_pid_set_property(ctx->opid, p4cc, &prop_val );
+		} else {
+			if (pck)
+				gf_filter_pck_set_property_dyn(pck, pname, &prop_val );
+			else
+				gf_filter_pid_set_property_dyn(ctx->opid, pname, &prop_val );
+		}
+		if (reset)
+			gf_props_reset_single(&prop_val);
+	}
+}
 
 typedef struct
 {
@@ -444,7 +566,7 @@
 	}\
 
 
-static GF_Err nhmldmx_init_parsing(GF_Filter *filter, GF_NHMLDmxCtx *ctx)
+static GF_Err nhmldmx_config_output(GF_Filter *filter, GF_NHMLDmxCtx *ctx, GF_XMLNode *root)
 {
 	GF_Err e;
 	Bool inRootOD;
@@ -454,76 +576,32 @@
 
 	u32 dims_profile, dims_level, dims_pathComponents, dims_fullRequestHost, dims_streamType, dims_containsRedundant;
 	char *textEncoding, *contentEncoding, *dims_content_script_types, *mime_type, *xml_schema_loc, *xmlns;
-	FILE *nhml;
-	const GF_PropertyValue *p;
 	char *auxiliary_mime_types = NULL;
-	char *ext, szName[1000], szInfo[GF_MAX_PATH], szXmlFrom[1000], szXmlHeaderEnd[1000];
+	char*init_name=NULL, szXmlFrom[1000], szXmlHeaderEnd[1000];
 	u8 *specInfo;
 	char compressor_name[100];
 	GF_XMLNode *node;
 	FILE *finfo;
-	u64 media_size, last_dts;
-	char *szRootName, *szSampleName, *szImpName;
+	u64 media_size;
+	char *szImpName;
 
-	szRootName = ctx->is_dims ? "DIMSStream" : "NHNTStream";
-	szSampleName = ctx->is_dims ? "DIMSUnit" : "NHNTSample";
 	szImpName = ctx->is_dims ? "DIMS" : "NHML";
 
-	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
-	if (!p) {
-		gf_filter_pid_drop_packet(ctx->ipid);
-		return GF_NOT_SUPPORTED;
-	}
-	ctx->src_url = p->value.string;
-	nhml = gf_fopen(ctx->src_url, "rt");
-	if (!nhml) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Cannot find %s file %s", szImpName, ctx->src_url));
-		return GF_URL_ERROR;
-	}
-
-	szName[0] = 0;
-	if (!strncmp(ctx->src_url, "gfio://", 7)) {
-		char *base = gf_file_basename( gf_fileio_translate_url(ctx->src_url) );
-		if (base) strcpy(szName, base);
-	} else {
-		strcpy(szName, ctx->src_url);
-	}
-	ext = gf_file_ext_start(szName);
-	if (ext) ext[0] = 0;
-	strcpy(ctx->szMedia, szName);
-	strcpy(szInfo, szName);
-	strcat(ctx->szMedia, ".media");
-	strcat(szInfo, ".info");
-
-	ctx->parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(ctx->parser, p->value.string, NULL, NULL);
-	if (e) {
-		gf_fclose(nhml);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Error parsing %s file: Line %d - %s", szImpName, gf_xml_dom_get_line(ctx->parser), gf_xml_dom_get_error(ctx->parser) ));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	gf_fclose(nhml);
-
-	ctx->root = gf_xml_dom_get_root(ctx->parser);
-	if (!ctx->root) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Error parsing %s file - no root node found", szImpName ));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
 	ctx->dts_inc = 0;
 	inRootOD = GF_FALSE;
 	ctx->compress_type = 0;
 	specInfo = NULL;
 
+	gf_dynstrcat(&init_name, ctx->media_file, NULL);
+	char *ext = gf_file_ext_start(init_name);
+	if (ext) ext[0] = 0;
+	gf_dynstrcat(&init_name, ".info", NULL);
+
+
 #ifndef GPAC_DISABLE_ZLIB
 	ctx->use_dict = GF_FALSE;
 #endif
 
-	if (stricmp(ctx->root->name, szRootName)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Error parsing %s file - \"%s\" root expected, got \"%s\"", szImpName, szRootName, ctx->root->name));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
 	tkID = mtype = streamType = codecid = par_den = par_num = 0;
 	ctx->timescale = 1000;
 	i=0;
@@ -538,19 +616,32 @@
 	dims_streamType = GF_TRUE;
 	dims_containsRedundant = 1;
 
-	while ((att = (GF_XMLAttribute *)gf_list_enum(ctx->root->attributes, &i))) {
+	while ((att = (GF_XMLAttribute *)gf_list_enum(root->attributes, &i))) {
 		if (!stricmp(att->name, "streamType")) {
 			NHML_SCAN_INT("%u", streamType)
+			if (!streamType)
+				streamType = gf_stream_type_by_name(att->value);
 		} else if (!stricmp(att->name, "mediaType") && (strlen(att->value)==4)) {
 			mtype = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
 		} else if (!stricmp(att->name, "mediaSubType") && (strlen(att->value)==4)) {
 			codec_tag = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
 		} else if (!stricmp(att->name, "objectTypeIndication")) {
 			NHML_SCAN_INT("%u", codecid)
-		} else if (!stricmp(att->name, "codecID") && (strlen(att->value)==4)) {
-			codecid = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
+		} else if (!stricmp(att->name, "codecID")) {
+			if (strlen(att->value)==4) {
+				codecid = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
+			} else {
+				codecid = gf_codecid_parse(att->value);
+			}
 		} else if (!stricmp(att->name, "timeScale")) {
+			u32 old_timescale = ctx->timescale;
 			NHML_SCAN_INT("%u", ctx->timescale)
+			if (old_timescale && ctx->timescale && (root != ctx->root)) {
+				if (ctx->dts_inc)
+					ctx->dts_inc = (u32) gf_timestamp_rescale(ctx->dts_inc, old_timescale, ctx->timescale);
+				if (ctx->last_dts != GF_FILTER_NO_TS)
+					ctx->last_dts = gf_timestamp_rescale(ctx->last_dts, old_timescale, ctx->timescale);
+			}
 		} else if (!stricmp(att->name, "width")) {
 			NHML_SCAN_INT("%u", width)
 		} else if (!stricmp(att->name, "height")) {
@@ -565,12 +656,12 @@
 			NHML_SCAN_INT("%u", nb_channels)
 		} else if (!stricmp(att->name, "baseMediaFile")) {
 			char *url = gf_url_concatenate(ctx->src_url, att->value);
-			strcpy(ctx->szMedia, url ? url : att->value);
-			if (url) gf_free(url);
+			if (ctx->media_file) gf_free(ctx->media_file);
+			ctx->media_file = url;
 		} else if (!stricmp(att->name, "specificInfoFile")) {
 			char *url = gf_url_concatenate(ctx->src_url, att->value);
-			strcpy(szInfo, url ? url : att->value);
-			if (url) gf_free(url);
+			if (init_name) gf_free(init_name);
+			init_name = url;
 		} else if (!stricmp(att->name, "headerEnd")) {
 			NHML_SCAN_INT("%u", ctx->header_end)
 		} else if (!stricmp(att->name, "trackID")) {
@@ -686,8 +777,8 @@
 		codecid = GF_CODECID_DIMS;
 		streamType = GF_STREAM_SCENE;
 	}
-	if (gf_file_exists_ex(ctx->szMedia, ctx->src_url))
-		ctx->mdia = gf_fopen_ex(ctx->szMedia, ctx->src_url, "rb");
+	if (gf_file_exists_ex(ctx->media_file, ctx->src_url))
+		ctx->mdia = gf_fopen_ex(ctx->media_file, ctx->src_url, "rb", GF_FALSE);
 
 	specInfoSize = 0;
 	if (!streamType && !mtype && !codec_tag) {
@@ -696,13 +787,16 @@
 	}
 
 	finfo = NULL;
-	if (gf_file_exists_ex(szInfo, ctx->src_url))
-		finfo = gf_fopen_ex(szInfo, ctx->src_url, "rb");
+	if (gf_file_exists_ex(init_name, ctx->src_url))
+		finfo = gf_fopen_ex(init_name, ctx->src_url, "rb", GF_FALSE);
 
 	if (finfo) {
 		e = gf_file_load_data_filep(finfo, (u8 **)&specInfo, &specInfoSize);
 		gf_fclose(finfo);
-		if (e) return e;
+		if (e) {
+			if (init_name) gf_free(init_name);
+			return e;
+		}
 	} else if (ctx->header_end) {
 		/* for text based streams, the decoder specific info can be at the beginning of the file */
 		specInfoSize = ctx->header_end;
@@ -714,9 +808,10 @@
 		/* for XML based streams, the decoder specific info can be up to some element in the file */
 		strcpy(szXmlFrom, "doc.start");
 		ctx->samp_buffer_size = 0;
-		e = nhml_sample_from_xml(ctx, ctx->szMedia, szXmlFrom, szXmlHeaderEnd);
+		e = nhml_sample_from_xml(ctx, ctx->media_file, szXmlFrom, szXmlHeaderEnd);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] failed to load XML header: %s", gf_error_to_string(e) ));
+			if (init_name) gf_free(init_name);
 			return e;
 		}
 
@@ -726,25 +821,30 @@
 		specInfo[specInfoSize] = 0;
 	}
 
-	i=0;
-	while ((node = (GF_XMLNode *) gf_list_enum(ctx->root->content, &i))) {
+	i = 0;
+	GF_XMLNode *par = (root != ctx->root) ? root : ctx->root;
+	while ((node = (GF_XMLNode *) gf_list_enum(par->content, &i))) {
 		if (node->type) continue;
+		if (!stricmp(node->name, ctx->is_dims ? "DIMSUnit" : "NHNTSample") ) break;
 		if (stricmp(node->name, "DecoderSpecificInfo") ) continue;
 
 		e = gf_xml_parse_bit_sequence(node, ctx->src_url, &specInfo, &specInfoSize);
 		if (e) {
 			if (specInfo) gf_free(specInfo);
+			if (init_name) gf_free(init_name);
 			return e;
 		}
 		break;
 	}
 
-	ctx->opid = gf_filter_pid_new(filter);
+	if (!ctx->opid)
+		ctx->opid = gf_filter_pid_new(filter);
+
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(streamType) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(codecid) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale) );
 	if (ctx->reframe)
-	 gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_UINT(GF_TRUE) );
+	 gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 	if (!width && !height && specInfo && (codecid==GF_CODECID_MPEG4_PART2)) {
@@ -852,13 +952,7 @@
 		specInfoSize = 0;
 	}
 
-	if (inRootOD) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_IN_IOD, &PROP_BOOL(GF_TRUE) );
-
-	ctx->media_done = 0;
-	ctx->current_child_idx = 0;
-	ctx->last_dts = GF_FILTER_NO_TS;
-
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILEPATH, & PROP_STRING(ctx->szMedia));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILEPATH, & PROP_STRING(ctx->media_file));
 
 	if (ctx->mdia) {
 		media_size = gf_fsize(ctx->mdia);
@@ -867,6 +961,93 @@
 
 	if (specInfo) gf_free(specInfo);
 	if (auxiliary_mime_types) gf_free(auxiliary_mime_types);
+	if (init_name) gf_free(init_name);
+
+	if (inRootOD) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_IN_IOD, &PROP_BOOL(GF_TRUE) );
+
+
+	i = 0;
+	par = (root != ctx->root) ? root : ctx->root;
+	while ((node = (GF_XMLNode *) gf_list_enum(par->content, &i))) {
+		if (node->type) continue;
+		if (!stricmp(node->name, ctx->is_dims ? "DIMSUnit" : "NHNTSample") ) break;
+
+		if (stricmp(node->name, "Properties")) continue;
+
+		nhmldmx_set_props(ctx, node, NULL);
+		break;
+	}
+
+	return GF_OK;
+}
+
+static GF_Err nhmldmx_init_parsing(GF_Filter *filter, GF_NHMLDmxCtx *ctx)
+{
+	GF_Err e;
+	u32 i;
+	GF_XMLAttribute *att;
+	FILE *nhml;
+	const GF_PropertyValue *p;
+	char *ext;
+	GF_XMLNode *node;
+	u64 last_dts;
+	char *szRootName, *szSampleName, *szImpName;
+
+	szRootName = ctx->is_dims ? "DIMSStream" : "NHNTStream";
+	szSampleName = ctx->is_dims ? "DIMSUnit" : "NHNTSample";
+	szImpName = ctx->is_dims ? "DIMS" : "NHML";
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
+	if (!p) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+	}
+	ctx->src_url = p->value.string;
+	nhml = gf_fopen(ctx->src_url, "rt");
+	if (!nhml) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Cannot find %s file %s", szImpName, ctx->src_url));
+		return GF_URL_ERROR;
+	}
+
+	if (ctx->media_file) gf_free(ctx->media_file);
+	ctx->media_file = NULL;
+
+	if (!strncmp(ctx->src_url, "gfio://", 7)) {
+		char *base = gf_file_basename( gf_fileio_translate_url(ctx->src_url) );
+		if (base) gf_dynstrcat(&ctx->media_file, base, NULL);
+	} else {
+		gf_dynstrcat(&ctx->media_file, ctx->src_url, NULL);
+	}
+	if (!ctx->media_file) return GF_OUT_OF_MEM;
+	ext = gf_file_ext_start(ctx->media_file);
+	if (ext) ext[0] = 0;
+	gf_dynstrcat(&ctx->media_file, ".media", NULL);
+
+	ctx->parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(ctx->parser, p->value.string, NULL, NULL);
+	if (e) {
+		gf_fclose(nhml);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Error parsing %s file: Line %d - %s", szImpName, gf_xml_dom_get_line(ctx->parser), gf_xml_dom_get_error(ctx->parser) ));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	gf_fclose(nhml);
+
+	ctx->root = gf_xml_dom_get_root(ctx->parser);
+	if (!ctx->root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Error parsing %s file - no root node found", szImpName ));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (stricmp(ctx->root->name, szRootName)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Error parsing %s file - \"%s\" root expected, got \"%s\"", szImpName, szRootName, ctx->root->name));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	nhmldmx_config_output(filter, ctx, ctx->root);
+
+	ctx->media_done = 0;
+	ctx->current_child_idx = 0;
+	ctx->last_dts = GF_FILTER_NO_TS;
 
 	//compute duration
 	ctx->duration.den = ctx->timescale;
@@ -880,7 +1061,12 @@
 		s32 cts_offset=0;
 		u64 sample_duration = 0;
 		if (node->type) continue;
-		if (stricmp(node->name, szSampleName) ) continue;
+		if (!stricmp(node->name, szSampleName) ) {
+		} else if (!stricmp(node->name, "NHNTReconfig") ) {
+			break;
+		} else {
+			continue;
+		}
 
 		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
 			if (!stricmp(att->name, "DTS") || !stricmp(att->name, "time")) {
@@ -896,6 +1082,7 @@
 			else if (!stricmp(att->name, "duration") ) sscanf(att->value, ""LLU, &sample_duration);
 			else if (!stricmp(att->name, "isRAP") ) ctx->has_sap = GF_TRUE;
 		}
+
 		last_dts = ctx->duration.num;
 		if (dts) ctx->duration.num = (u32) (dts + cts_offset);
 		if (sample_duration) {
@@ -909,29 +1096,201 @@
 	if (last_dts) {
 		ctx->duration.num += (u32) (ctx->duration.num - last_dts);
 	}
+
+	p = gf_filter_pid_get_property(ctx->opid, GF_PROP_PID_STREAM_TYPE);
 	//assume image, one sec (default for old arch)
-	if ((streamType==4) && !ctx->duration.num) {
+	if (p && (p->value.uint==4) && !ctx->duration.num) {
 		ctx->is_img = GF_TRUE;
 		ctx->duration.num =ctx->duration.den;
 	}
 
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration) );
-
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 	return e;
 }
 
+
+
 void nhml_get_bs(GF_BitStream **bs, char *data, u32 size, u32 mode)
 {
 	if (*bs) gf_bs_reassign_buffer(*bs, data, size);
 	else (*bs) = gf_bs_new(data, size, mode);
 }
 
+static void nhmldmx_set_subs(GF_NHMLDmxCtx *ctx, GF_XMLNode *node, GF_FilterPacket *pck)
+{
+	GF_XMLNode *childnode, *subs;
+	u32 i=0;
+	while ((childnode = (GF_XMLNode *) gf_list_enum(node->content, &i))) {
+		u32 j;
+		GF_XMLAttribute *att;
+		GF_BitStream *bs;
+
+		if (childnode->type) continue;
+		if (stricmp(childnode->name, "SubSamples")) continue;
+
+		u32 flags=0;
+		j=0;
+		while ( (att = (GF_XMLAttribute *)gf_list_enum(childnode->attributes, &j))) {
+			if (!strcmp(att->name, "flags")) flags = atoi(att->value);
+		}
+
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		j=0;
+		while ((subs = (GF_XMLNode *) gf_list_enum(childnode->content, &j))) {
+			if (subs->type) continue;
+			if (stricmp(subs->name, "SubSample")) continue;
+
+			Bool discardable=0;
+			u32 priority=0;
+			u32 size=0;
+			u32 codec_info=0;
+			char *fsize = NULL;
+			Bool ftext=GF_FALSE;
+
+			u32 k = 0;
+			while ((att = (GF_XMLAttribute *)gf_list_enum(subs->attributes, &k))) {
+				if (!stricmp(att->name, "size")) size = atoi(att->value);
+				else if (!stricmp(att->name, "fsize")) fsize = att->value;
+				else if (!stricmp(att->name, "textmode")) {
+					if (!stricmp(att->value, "yes") || !stricmp(att->value, "true") || !stricmp(att->value, "1")) {
+						ftext = GF_TRUE;
+					}
+				}
+				else if (!stricmp(att->name, "discardable")) {
+					if (!stricmp(att->value, "yes") || !stricmp(att->value, "true") || !stricmp(att->value, "1")) {
+						discardable = GF_TRUE;
+					}
+				}
+				else if (!stricmp(att->name, "priority")) priority = atoi(att->value);
+				else if (!stricmp(att->name, "codec_info")) {
+					if (!strnicmp(att->value, "0x", 2)) sscanf(att->value+2, "%x", &codec_info);
+					else sscanf(att->value, "%u", &codec_info);
+				}
+			}
+
+			if (fsize) {
+				char *sub_file_url = gf_url_concatenate(ctx->src_url, fsize);
+				if (sub_file_url) {
+					FILE *f = gf_fopen(sub_file_url, ftext ? "rt" : "r");
+					if (f) {
+						size += (u32) gf_fsize(f);
+						gf_fclose(f);
+					}
+					gf_free(sub_file_url);
+				}
+			}
+
+			gf_bs_write_u32(bs, flags); //flags
+			gf_bs_write_u32(bs, size);
+			gf_bs_write_u32(bs, codec_info); //codec_specific_parameters
+			gf_bs_write_u8(bs, priority); //priority
+			gf_bs_write_u8(bs, discardable); //discardable
+		}
+
+		u8 *subs_data;
+		u32 subs_size;
+		gf_bs_get_content(bs, &subs_data, &subs_size);
+		gf_bs_del(bs);
+		gf_filter_pck_set_property(pck, GF_PROP_PCK_SUBS, &PROP_DATA_NO_COPY(subs_data, subs_size) );
+		break;
+	}
+}
+
+static GF_XMLNode *nhmldmx_find_sai(GF_NHMLDmxCtx *ctx, char *id)
+{
+	GF_XMLNode *node;
+	u32 idx=0;
+	while ((node = (GF_XMLNode *) gf_list_enum(ctx->root->content, &idx))) {
+		GF_XMLNode *child;
+		u32 j=0;
+		if (node->type) continue;
+		if (stricmp(node->name, ctx->is_dims ? "DIMSUnit" : "NHNTSample") ) continue;
+
+		while ((child = (GF_XMLNode *) gf_list_enum(node->content, &j))) {
+			u32 k=0;
+			GF_XMLAttribute *att;
+			if (child->type) continue;
+			if (stricmp(child->name, "SAI") ) continue;
+			while ((att = (GF_XMLAttribute *) gf_list_enum(child->attributes, &k))) {
+				if (!strcmp(att->name, "id") && !strcmp(att->value, id))
+					return child;
+			}
+		}
+	}
+	return NULL;
+}
+
+static void nhmldmx_set_sai(GF_NHMLDmxCtx *ctx, GF_XMLNode *node, GF_FilterPacket *pck)
+{
+	GF_XMLNode *childnode;
+	u32 i=0;
+	while ((childnode = (GF_XMLNode *) gf_list_enum(node->content, &i))) {
+		u32 j;
+		char szPName[30];
+		GF_XMLAttribute *att;
+		GF_BitStream *bs;
+
+		if (childnode->type) continue;
+		if (stricmp(childnode->name, "SAI")) continue;
+
+		Bool is_ref=GF_FALSE;
+		u32 type, aux_info;
+		Bool is_sample_group;
+		Bool valid = GF_TRUE;
+
+retry_sai:
+		type=0;
+		aux_info=0;
+		is_sample_group = GF_FALSE;
+		j=0;
+		while ( (att = (GF_XMLAttribute *)gf_list_enum(childnode->attributes, &j))) {
+			if (!strcmp(att->name, "type")) type = gf_4cc_parse(att->value);
+			else if (!strcmp(att->name, "ref")) {
+				if (!is_ref) {
+					GF_XMLNode *ref_sai = nhmldmx_find_sai(ctx, att->value);
+					if (ref_sai) {
+						is_ref = GF_TRUE;
+						childnode = ref_sai;
+						goto retry_sai;
+					} else {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Cannot locate SAI with id %s, ignoring SAI", att->value));
+						valid=GF_FALSE;
+					}
+				}
+			}
+			else if (!strcmp(att->name, "aux_info")) aux_info = atoi(att->value);
+			else if (!strcmp(att->name, "group")) {
+				if (!strcmp(att->value, "yes") || !strcmp(att->value, "true") || !strcmp(att->value, "1")) is_sample_group = GF_TRUE;
+			}
+		}
+		if (!valid) continue;
+
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		gf_xml_parse_bit_sequence_bs(childnode, ctx->src_url, bs);
+
+		u8 *sai_data;
+		u32 sai_size;
+		gf_bs_get_content(bs, &sai_data, &sai_size);
+		gf_bs_del(bs);
+
+		char *prefix = is_sample_group ? "grp" : "sai";
+		if (aux_info) {
+			sprintf(szPName, "%s_%s_%d", prefix, gf_4cc_to_str(type), aux_info);
+		} else {
+			sprintf(szPName, "%s_%s", prefix, gf_4cc_to_str(type));
+		}
+
+		gf_filter_pck_set_property_dyn(pck, szPName, &PROP_DATA_NO_COPY(sai_data, sai_size) );
+	}
+}
+
+
 static GF_Err nhmldmx_send_sample(GF_Filter *filter, GF_NHMLDmxCtx *ctx)
 {
 	GF_XMLNode *node, *childnode;
 	u64 sample_duration = 0;
 	char szMediaTemp[GF_MAX_PATH], szXmlFrom[1000], szXmlTo[1000];
-	char *szSubSampleName = ctx->is_dims ? "DIMSSubUnit" : "NHNTSubSample";
 
 	while ((node = (GF_XMLNode *) gf_list_enum(ctx->root->content, &ctx->current_child_idx))) {
 		u8 *data;
@@ -943,12 +1302,16 @@
 		GF_Err e=GF_OK;
 		s32 cts_offset;
 		u64 offset=0, byte_offset = GF_FILTER_NO_BO;
-		u32 nb_subsamples = 0;
-		Bool redundant_rap, append, has_subbs, first_subsample_is_first = GF_FALSE;
+		Bool redundant_rap, append, has_subbs;
 		u32 compress_type;
 		char *base_data = NULL;
 		if (node->type) continue;
-		if (stricmp(node->name, ctx->is_dims ? "DIMSUnit" : "NHNTSample") ) continue;
+		if (stricmp(node->name, ctx->is_dims ? "DIMSUnit" : "NHNTSample") ) {
+			if (!strcmp(node->name, "NHNTReconfig")) {
+				nhmldmx_config_output(filter, ctx, node);
+			}
+			continue;
+		}
 
 		strcpy(szMediaTemp, "");
 		strcpy(szXmlFrom, "");
@@ -985,7 +1348,10 @@
 			}
 			else if (!stricmp(att->name, "CTSOffset")) cts_offset = atoi(att->value);
 			else if (!stricmp(att->name, "isRAP") ) {
-				sap_type = (!stricmp(att->value, "yes")) ? GF_FILTER_SAP_1 : GF_FILTER_SAP_NONE;
+				if ((att->value[0]>='0') && (att->value[0]<='9'))
+					sap_type = atoi(att->value);
+				else
+					sap_type = (!stricmp(att->value, "yes")) ? GF_FILTER_SAP_1 : GF_FILTER_SAP_NONE;
 			}
 			else if (!stricmp(att->name, "isSyncShadow")) redundant_rap = !stricmp(att->value, "yes") ? 1 : 0;
 			else if (!stricmp(att->name, "SAPType") ) sap_type = atoi(att->value);
@@ -999,14 +1365,27 @@
 					} else {
 						base_data = att->value;
 					}
+				} else if (!strnicmp(att->value, "gmem://", 7)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHMLDmx] Invalid url %s for NHML import\n", att->value));
 				} else {
 					char *url = gf_url_concatenate(ctx->src_url, att->value);
-					strcpy(szMediaTemp, url ? url : att->value);
-					if (url) gf_free(url);
+					if (!url) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHMLDmx] Failed to get full url for %s\n", att->value));
+					} else {
+						strncpy(szMediaTemp, url, GF_MAX_PATH-1);
+						szMediaTemp[GF_MAX_PATH-1] = 0;
+						gf_free(url);
+					}
 				}
 			}
-			else if (!stricmp(att->name, "xmlFrom")) strcpy(szXmlFrom, att->value);
-			else if (!stricmp(att->name, "xmlTo")) strcpy(szXmlTo, att->value);
+			else if (!stricmp(att->name, "xmlFrom")) {
+				strncpy(szXmlFrom, att->value, 999);
+				szXmlFrom[999]=0;
+			}
+			else if (!stricmp(att->name, "xmlTo")) {
+				strncpy(szXmlTo, att->value, 999);
+				szXmlTo[999]=0;
+			}
 			/*DIMS flags*/
 			else if (!stricmp(att->name, "is-Scene") && !stricmp(att->value, "yes"))
 				dims_flags |= GF_DIMS_UNIT_S;
@@ -1033,25 +1412,41 @@
 
 		if (ctx->is_img) sample_duration = ctx->duration.den;
 
+		GF_XMLNode *sample_child=NULL;
+		Bool has_subs_child = GF_FALSE;
+		Bool has_sai_child = GF_FALSE;
 		has_subbs = GF_FALSE;
+		GF_XMLNode *props = NULL;
 		j=0;
 		while ((childnode = (GF_XMLNode *) gf_list_enum(node->content, &j))) {
 			if (childnode->type) continue;
+			if (!stricmp(childnode->name, "Media")) {
+				sample_child = childnode;
+				has_subbs = GF_TRUE;
+			}
+			if (!stricmp(childnode->name, "SubSamples")) {
+				has_subs_child = GF_TRUE;
+			}
+			if (!stricmp(childnode->name, "SAI")) {
+				has_sai_child = GF_TRUE;
+			}
 			if (!stricmp(childnode->name, "BS")) {
 				has_subbs = GF_TRUE;
-				break;
+			}
+			if (!stricmp(childnode->name, "Properties")) {
+				props = childnode;
 			}
 		}
 
 		if (strlen(szXmlFrom) && strlen(szXmlTo)) {
 			char *xml_file;
 			if (strlen(szMediaTemp)) xml_file = szMediaTemp;
-			else xml_file = ctx->szMedia;
+			else xml_file = ctx->media_file;
 			ctx->samp_buffer_size = 0;
 			e = nhml_sample_from_xml(ctx, xml_file, szXmlFrom, szXmlTo);
 		} else if (ctx->is_dims && !strlen(szMediaTemp)) {
 
-			char *content = gf_xml_dom_serialize(node, GF_TRUE);
+			char *content = gf_xml_dom_serialize(node, GF_TRUE, GF_FALSE);
 
 			ctx->samp_buffer_size = 3 + (u32) strlen(content);
 			if (ctx->samp_buffer_alloc < ctx->samp_buffer_size) {
@@ -1067,14 +1462,6 @@
 			/*same DIMS unit*/
 			if (ctx->last_dts == dts)
 				append = GF_TRUE;
-
-		} else if (has_subbs) {
-			gf_bs_reassign_buffer(ctx->bs_w, ctx->samp_buffer, ctx->samp_buffer_alloc);
-			gf_xml_parse_bit_sequence_bs(node, ctx->src_url, ctx->bs_w);
-			gf_bs_get_content(ctx->bs_w, &ctx->samp_buffer, &ctx->samp_buffer_size);
-			if (ctx->samp_buffer_size > ctx->samp_buffer_alloc)
-				ctx->samp_buffer_alloc = ctx->samp_buffer_size;
-
 		} else if (base_data) {
 			char *start = strchr(base_data, ',');
 			if (start) {
@@ -1089,18 +1476,10 @@
 			Bool close = GF_FALSE;
 			FILE *f = ctx->mdia;
 
-			j = 0;
-			while ((childnode = (GF_XMLNode *)gf_list_enum(node->content, &j))) {
-				if (childnode->type) continue;
-				if (!stricmp(childnode->name, szSubSampleName)) {
-					nb_subsamples++;
-				}
-			}
-
 			if (strlen(szMediaTemp)) {
 				f = gf_fopen(szMediaTemp, "rb");
 				if (!f) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] import failure in sample %d: file %s not found", ctx->sample_num, close ? szMediaTemp : ctx->szMedia));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] import failure in sample %d: file %s not found", ctx->sample_num, close ? szMediaTemp : ctx->media_file));
 					return GF_NON_COMPLIANT_BITSTREAM;
 				}
 				close = GF_TRUE;
@@ -1149,14 +1528,28 @@
 					}
 				}
 				if (close) gf_fclose(f);
-			} else if (!nb_subsamples) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] No media file associated with sample %d!\n", ctx->sample_num));
-				e = GF_URL_ERROR;
+			} else {
+				e = GF_OK;
 			}
 		}
 
 		if (e) return e;
 
+		//child BS present, parse them
+		if (has_subbs) {
+			nhml_get_bs(&ctx->bs_w, ctx->samp_buffer, ctx->samp_buffer_size, GF_BITSTREAM_WRITE);
+			if (ctx->samp_buffer_size) {
+				gf_bs_seek(ctx->bs_w, ctx->samp_buffer_size);
+			}
+			gf_xml_parse_bit_sequence_bs(sample_child ? sample_child : node, ctx->src_url, ctx->bs_w);
+			gf_bs_get_content(ctx->bs_w, &ctx->samp_buffer, &ctx->samp_buffer_size);
+			if (ctx->samp_buffer_size > ctx->samp_buffer_alloc)
+				ctx->samp_buffer_alloc = ctx->samp_buffer_size;
+		}
+		if (!ctx->samp_buffer_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHMLDmx] No media file associated with sample %d!\n", ctx->sample_num));
+		}
+
 		//override DIMS flags
 		if (ctx->is_dims) {
 			if (strstr(ctx->samp_buffer + 3, "svg ")) dims_flags |= GF_DIMS_UNIT_S;
@@ -1185,8 +1578,10 @@
 		}
 		if (ctx->samp_buffer_size) {
 			pck = gf_filter_pck_new_alloc(ctx->opid, ctx->samp_buffer_size, &data);
+			if (!pck) return GF_OUT_OF_MEM;
+
 			memcpy(data, ctx->samp_buffer, ctx->samp_buffer_size);
-			gf_filter_pck_set_framing(pck, append ? GF_FALSE : GF_TRUE, nb_subsamples ? GF_FALSE : GF_TRUE);
+			gf_filter_pck_set_framing(pck, append ? GF_FALSE : GF_TRUE, GF_FALSE);
 			if (!append) {
 				gf_filter_pck_set_sap(pck, sap_type);
 				gf_filter_pck_set_dts(pck, dts);
@@ -1206,87 +1601,16 @@
 						gf_filter_pck_set_seek_flag(pck, GF_TRUE);
 				}
 			}
-			gf_filter_pck_send(pck);
-		} else {
-			first_subsample_is_first = GF_TRUE;
-		}
-
-		if (nb_subsamples) {
-			if (ctx->samp_buffer_alloc<14*nb_subsamples) {
-				ctx->samp_buffer_alloc = 14*nb_subsamples;
-				ctx->samp_buffer = gf_realloc(ctx->samp_buffer, ctx->samp_buffer_alloc);
+			if (has_subs_child) {
+				nhmldmx_set_subs(ctx, node, pck);
 			}
-			assert(ctx->samp_buffer);
-			nhml_get_bs(&ctx->bs_w, ctx->samp_buffer, ctx->samp_buffer_alloc, GF_BITSTREAM_WRITE);
-		}
-
-		j = 0;
-		while (!append && nb_subsamples && (childnode = (GF_XMLNode *)gf_list_enum(node->content, &j))) {
-			if (childnode->type) continue;
-			if (!stricmp(childnode->name, szSubSampleName)) {
-				u32 k = 0;
-				while ((att = (GF_XMLAttribute *)gf_list_enum(childnode->attributes, &k))) {
-					if (!stricmp(att->name, "mediaFile")) {
-						u64 subsMediaFileSize = 0;
-						FILE *f = NULL;
-						char *sub_file_url = gf_url_concatenate(ctx->src_url, att->value);
-						if (sub_file_url) {
-							f = gf_fopen(sub_file_url, "rb");
-							gf_free(sub_file_url);
-						}
-
-						if (!f) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Error: mediaFile \"%s\" not found for subsample in sample %d. Abort.\n", att->value, ctx->sample_num));
-							return GF_URL_ERROR;
-						}
-						subsMediaFileSize = gf_fsize(f);
-						assert(subsMediaFileSize < 0x80000000);
-
-						//send continuation frame
-						pck = gf_filter_pck_new_alloc(ctx->opid, (u32) subsMediaFileSize, &data);
-						subsMediaFileSize = (u32) gf_fread(data, (u32) subsMediaFileSize, f);
-						gf_fclose(f);
-
-						nb_subsamples--;
-						if (first_subsample_is_first) {
-							gf_filter_pck_set_framing(pck, GF_TRUE, nb_subsamples ? GF_FALSE : GF_TRUE);
-
-							gf_filter_pck_set_sap(pck, sap_type);
-							gf_filter_pck_set_dts(pck, dts);
-							gf_filter_pck_set_cts(pck, dts+cts_offset);
-							if (redundant_rap && !ctx->is_dims) gf_filter_pck_set_dependency_flags(pck, 0x1);
-
-							if (sample_duration || ctx->dts_inc)
-								gf_filter_pck_set_duration(pck, sample_duration ? (u32) sample_duration : ctx->dts_inc);
-
-							if (ctx->in_seek) {
-								if (dts+cts_offset >= ctx->start_range * ctx->timescale)
-									ctx->in_seek = GF_FALSE;
-								else
-									gf_filter_pck_set_seek_flag(pck, GF_TRUE);
-							}
-
-							first_subsample_is_first = GF_FALSE;
-						} else {
-							gf_filter_pck_set_framing(pck, GF_FALSE, nb_subsamples ? GF_FALSE : GF_TRUE);
-						}
-
-
-						gf_bs_write_u32(ctx->bs_w, 0); //flags
-						gf_bs_write_u32(ctx->bs_w, (u32) subsMediaFileSize);
-						gf_bs_write_u32(ctx->bs_w, 0); //reserved
-						gf_bs_write_u8(ctx->bs_w, 0); //priority
-						gf_bs_write_u8(ctx->bs_w, 0); //discardable
-
-						if (!nb_subsamples) {
-							u32 subs_size = (u32) gf_bs_get_position(ctx->bs_w);
-							gf_filter_pck_set_property(pck, GF_PROP_PCK_SUBS, &PROP_DATA(ctx->samp_buffer, subs_size) );
-						}
-
-						gf_filter_pck_send(pck);
-					}
-				}
+			if (has_sai_child) {
+				nhmldmx_set_sai(ctx, node, pck);
+			}
+			if (props) {
+				nhmldmx_set_props(ctx, props, pck);
 			}
+			gf_filter_pck_send(pck);
 		}
 
 		ctx->last_dts = dts;
@@ -1367,13 +1691,14 @@
 	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
 	if (ctx->samp_buffer) gf_free(ctx->samp_buffer);
 	if (ctx->zlib_buffer) gf_free(ctx->zlib_buffer);
+	if (ctx->media_file) gf_free(ctx->media_file);
 }
 
 
 #define OFFS(_n)	#_n, offsetof(GF_NHMLDmxCtx, _n)
 static const GF_FilterArgs GF_NHMLDmxArgs[] =
 {
-	{ OFFS(reframe), "force reparsing of referenced content", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(reframe), "force re-parsing of referenced content", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
 	{0}
 };
@@ -1384,14 +1709,13 @@
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "nhml|dims|dml"),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/x-nhml|application/dims"),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_UNKNOWN),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE)
 };
 
 GF_FilterRegister NHMLDmxRegister = {
 	.name = "nhmlr",
-	GF_FS_SET_DESCRIPTION("NHML parser")
+	GF_FS_SET_DESCRIPTION("NHML reader")
 	GF_FS_SET_HELP("This filter reads NHML files/data to produce a media PID and frames.\n"
 	"NHML documentation is available at https://wiki.gpac.io/NHML-Format\n")
 	.private_size = sizeof(GF_NHMLDmxCtx),
@@ -1409,3 +1733,5 @@
 	return &NHMLDmxRegister;
 }
 
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
+

gpac-1.0.1.tar.gz/src/filters/dmx_nhnt.c -> gpac-2.0.0.tar.gz/src/filters/dmx_nhnt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2020
+ *			Copyright (c) Telecom ParisTech 2005-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / NHNT demuxer filter
@@ -171,7 +171,11 @@
 	dur.den = timescale;
 	if (!ctx->duration.num || (ctx->duration.num * dur.den != dur.num * ctx->duration.den)) {
 		ctx->duration = dur;
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+		if (ctx->opid) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+			if (ctx->duration.num)
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
+		}
 	}
 }
 
@@ -182,8 +186,7 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		//gf_filter_pid_remove(st->opid);
-
+		gf_filter_pid_remove(ctx->opid);
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -192,6 +195,12 @@
 	ctx->ipid = pid;
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
 
+	//check multithreaded FileIO restrictions
+	const GF_PropertyValue *p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
+	if (p && p->value.string && gf_fileio_is_main_thread(p->value.string)) {
+		gf_filter_force_main_thread(filter, GF_TRUE);
+	}
+
 	return GF_OK;
 }
 
@@ -308,10 +317,10 @@
 			ext = strrchr(szMedia, '.');
 			if (ext) ext[0] = 0;
 			strcat(szMedia, ".media");
-			ctx->mdia = gf_fopen_ex(szMedia, p->value.string, "rb");
+			ctx->mdia = gf_fopen_ex(szMedia, p->value.string, "rb", GF_FALSE);
 
 			if (!ctx->mdia) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[NHNT] Cannot find MEDIA file %s\n", szMedia));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[NHNT] Cannot find MEDIA file %s\n", szMedia));
 				gf_filter_pid_drop_packet(ctx->ipid);
 				gf_filter_pid_set_discard(ctx->ipid, GF_TRUE);
 				ctx->in_error = GF_URL_ERROR;
@@ -322,7 +331,7 @@
 			if (ctx->sig == GF_MEDIA_TYPE_NHNT) ctx->sig = 0;
 			else if (ctx->sig == GF_MEDIA_TYPE_NHNL) ctx->sig = 1;
 			else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[NHNT] Invalid NHNT signature %s\n", gf_4cc_to_str(ctx->sig) ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[NHNT] Invalid NHNT signature %s\n", gf_4cc_to_str(ctx->sig) ));
 				gf_filter_pid_drop_packet(ctx->ipid);
 				gf_filter_pid_set_discard(ctx->ipid, GF_TRUE);
 				ctx->in_error = GF_NON_COMPLIANT_BITSTREAM;
@@ -341,7 +350,7 @@
 
 			val = gf_bs_read_u8(ctx->bs);
 			if (val == GF_STREAM_OD) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[NHNT] OD stream detected, might result in broken import\n"));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[NHNT] OD stream detected, might result in broken import\n"));
 			}
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(val));
 
@@ -365,11 +374,11 @@
 			if (ext) ext[0] = 0;
 			strcat(szMedia, ".info");
 
-			finfo = gf_fopen_ex(szMedia, p->value.string, "rb");
+			finfo = gf_fopen_ex(szMedia, p->value.string, "rb", GF_FALSE);
 			dsi = NULL;
 			if (finfo) {
 				if ( gf_file_load_data_filep(finfo, (u8 **) &dsi, &dsi_size) != GF_OK) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[NHNT] Failed to read decoder config\n"));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[NHNT] Failed to read decoder config\n"));
 				} else {
 
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -436,9 +445,11 @@
 		gf_fseek(ctx->mdia, offset, SEEK_SET);
 
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, len, &output);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+		
 		res = (u32) gf_fread(output, len, ctx->mdia);
 		if (res != len) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[NHNT] Read failure, expecting %d bytes got %d", len, res));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[NHNT] Read failure, expecting %d bytes got %d", len, res));
 		}
 		gf_filter_pck_set_framing(dst_pck, is_start, is_end);
 		if (is_rap)
@@ -474,7 +485,7 @@
 #define OFFS(_n)	#_n, offsetof(GF_NHNTDmxCtx, _n)
 static const GF_FilterArgs GF_NHNTDmxArgs[] =
 {
-	{ OFFS(reframe), "force reparsing of referenced content", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(reframe), "force re-parsing of referenced content", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
 	{0}
 };

gpac-1.0.1.tar.gz/src/filters/dmx_ogg.c -> gpac-2.0.0.tar.gz/src/filters/dmx_ogg.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / XIPH OGG demux filter
@@ -33,6 +33,7 @@
 #include <gpac/internal/isomedia_dev.h>
 //#include <ogg/ogg.h>
 #include <gpac/avparse.h>
+#include <gpac/base_coding.h>
 
 
 
@@ -77,6 +78,7 @@
 typedef struct
 {
 	Double index;
+	Bool expart;
 
 	//only one input pid declared
 	GF_FilterPid *ipid;
@@ -94,6 +96,8 @@
 
 	/*ogg ogfile state*/
 	ogg_sync_state oy;
+
+	GF_FilterPid *art_opid;
 } GF_OGGDmxCtx;
 
 void oggdmx_signal_eos(GF_OGGDmxCtx *ctx)
@@ -261,9 +265,10 @@
 	if (st->info.frame_rate.den)
 		gf_filter_pid_set_property(st->opid, GF_PROP_PID_FPS, &PROP_FRAC(st->info.frame_rate) );
 
-	if (ctx->duration.num)
+	if (ctx->duration.num) {
 		gf_filter_pid_set_property(st->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
-
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
+	}
 }
 
 static void oggdmx_new_stream(GF_Filter *filter, GF_OGGDmxCtx *ctx, ogg_page *oggpage)
@@ -572,6 +577,142 @@
 	return GF_FALSE;
 }
 
+static void oggdmx_parse_picture(GF_Filter *filter, GF_OGGStream *st, u8 *data_b64)
+{
+	u32 skip=0;
+	u32 osize = (u32) strlen(data_b64);
+	u8 *output = gf_malloc(sizeof(u8) * osize);
+	osize = gf_base64_decode(data_b64, (u32) strlen(data_b64), output, osize);
+	if ((s32) osize == -1) goto exit;
+
+	u32 type = GF_4CC(output[0], output[1], output[2], output[3]);
+	u32 mlen = GF_4CC(output[4], output[5], output[6], output[7]);
+	skip = 8 + mlen;
+	if (skip > osize) goto exit;
+	//skip desc
+	mlen = GF_4CC(output[skip], output[skip+1], output[skip+2], output[skip+3]);
+	skip += 4 + mlen;
+	if (skip > osize) goto exit;
+
+	//skip (each 32 bits) width, height, depth, nb_cols
+	skip += 4 * 4;
+	if (skip > osize) goto exit;
+
+	u32 img_size = GF_4CC(output[skip], output[skip+1], output[skip+2], output[skip+3]);
+	skip += 4;
+	if (skip + img_size > osize) goto exit;
+
+	if (type==3) {
+		GF_OGGDmxCtx *ctx = gf_filter_get_udta(filter);
+		if (ctx->expart) {
+			GF_Err e = gf_filter_pid_raw_new(filter, NULL, NULL, NULL, NULL, output + skip, img_size, GF_FALSE, &ctx->art_opid);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[OGGDmx] error setting up video pid for cover art: %s\n", gf_error_to_string(e) ));
+			}
+			if (ctx->art_opid) {
+				u8 *out_buffer;
+				GF_FilterPacket *dst_pck;
+				gf_filter_pid_set_name(ctx->art_opid, "CoverArt");
+				gf_filter_pid_set_property(ctx->art_opid, GF_PROP_PID_COVER_ART, &PROP_BOOL(GF_TRUE));
+				dst_pck = gf_filter_pck_new_alloc(ctx->art_opid, img_size, &out_buffer);
+				if (dst_pck) {
+					gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+					memcpy(out_buffer, output + skip, img_size);
+					gf_filter_pck_send(dst_pck);
+				}
+
+				gf_filter_pid_set_eos(ctx->art_opid);
+			}
+		} else {
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_COVER_ART, &PROP_DATA(output + skip, img_size) );
+		}
+	} else {
+		const char *name = "cover_art";
+		switch (type) {
+		case 4: name = "cover_back"; break;
+		case 5: name = "cover_leaflet"; break;
+		case 6: name = "cover_media"; break;
+		case 7: name = "cover_lead"; break;
+		case 8: name = "cover_artist"; break;
+		case 9: name = "cover_conductor"; break;
+		case 10: name = "cover_band"; break;
+		case 11: name = "cover_composer"; break;
+		case 12: name = "cover_lyricist"; break;
+		case 13: name = "cover_location"; break;
+		case 14: name = "cover_recording"; break;
+		case 15: name = "cover_performance"; break;
+		case 16: name = "cover_movie"; break;
+		case 17: name = "cover_bright_color_fish"; break;
+		case 18: name = "cover_illustration"; break;
+		case 19: name = "cover_logo"; break;
+		case 20: name = "cover_publisher"; break;
+		}
+		gf_filter_pid_set_property_str(st->opid, name, &PROP_DATA(output + skip, img_size) );
+	}
+
+exit:
+	gf_free(output);
+}
+
+static void oggdmx_parse_tags(GF_Filter *filter, GF_OGGStream *st, u8 *data, u32 size)
+{
+	u32 num_comments = 0;
+	while (size > 4) {
+		char sep;
+		u32 t_size = GF_4CC(data[3], data[2], data[1], data[0]);
+		size -= 4;
+		data += 4;
+		if (size < t_size) return;
+		sep = data[t_size];
+		data[t_size] = 0;
+		if (!num_comments) {
+			gf_filter_pid_set_property_str(st->opid, "tool", &PROP_STRING(data));
+		}
+		else {
+			char *sep_tag = strchr(data, '=');
+			if (sep_tag) {
+				char *name;
+				sep_tag[0] = 0;
+				s32 tag_idx = gf_itags_find_by_name( data );
+				if (tag_idx>=0) {
+					name = (char *) gf_itags_get_name(tag_idx);
+					gf_filter_pid_set_property_str(st->opid, name, &PROP_STRING(sep_tag+1));
+				} else if (!strcmp(data, "METADATA_BLOCK_PICTURE")) {
+					oggdmx_parse_picture(filter, st, sep_tag+1);
+				} else {
+					if (!strcmp(data, "date"))
+						gf_filter_pid_set_property_str(st->opid, "created", &PROP_STRING(sep_tag+1));
+					else {
+						name = data;
+						name-=4;
+						name[0]='t';
+						name[1]='a';
+						name[2]='g';
+						name[3]='_';
+						gf_filter_pid_set_property_dyn(st->opid, name, &PROP_STRING(sep_tag+1));
+					}
+				}
+				sep_tag[0] = '=';
+			}
+		}
+		data[t_size] = sep;
+		size -= t_size;
+		data += t_size;
+
+		if (!num_comments) {
+			if (size<4) return;
+			num_comments = GF_4CC(data[3], data[2], data[1], data[0]);
+			size -= 4;
+			data += 4;
+		} else {
+			num_comments--;
+			if (!num_comments)
+				break;
+		}
+	}
+}
+
+
 GF_Err oggdmx_process(GF_Filter *filter)
 {
 	ogg_page oggpage;
@@ -649,7 +790,7 @@
 				case GF_CODECID_VORBIS:
 					res = gf_vorbis_parse_header(st->vorbis_parser, (char *) oggpacket.packet, oggpacket.bytes);
 					if (!res) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[OGG] Failed to parse Vorbis header\n"));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[OGG] Failed to parse Vorbis header\n"));
 					} else {
 						add_page = GF_TRUE;
 					}
@@ -657,7 +798,7 @@
 				case GF_CODECID_OPUS:
 					res = gf_opus_parse_header(st->opus_parser, (char *) oggpacket.packet, oggpacket.bytes);
 					if (!res) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[OGG] Failed to parse Opus header\n"));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[OGG] Failed to parse Opus header\n"));
 					}
 					break;
 				case GF_CODECID_THEORA:
@@ -693,6 +834,8 @@
 					if (oggpackB_read(&opb, 1) != 0) continue;
 
 					dst_pck = gf_filter_pck_new_alloc(st->opid, oggpacket.bytes, &output);
+					if (!dst_pck) return GF_OUT_OF_MEM;
+
 					memcpy(output, (char *) oggpacket.packet, oggpacket.bytes);
 					gf_filter_pck_set_cts(dst_pck, st->recomputed_ts);
 					gf_filter_pck_set_sap(dst_pck, oggpackB_read(&opb, 1) ? GF_FILTER_SAP_NONE : GF_FILTER_SAP_1);
@@ -708,27 +851,35 @@
 					}
 					else if (st->info.type==GF_CODECID_OPUS) {
 						block_size = gf_opus_check_frame(st->opus_parser, (char *) oggpacket.packet, oggpacket.bytes);
-						if (!block_size) continue;
+						if (!block_size) {
+							if ((oggpacket.bytes>8) && !strnicmp(oggpacket.packet, "OpusTags", 8)) {
+								oggdmx_parse_tags(filter, st, oggpacket.packet + 8, oggpacket.bytes - 8);
+							}
+							continue;
+						}
 
 						if (!st->recomputed_ts) {
-							//compat with old arch (keep same hashes), to remove once droping it
+							//compat with old arch (keep same hashes), to remove once dropping it
 							if (!gf_sys_old_arch_compat()) {
-								gf_filter_pid_set_property(st->opid, GF_PROP_PID_DELAY, &PROP_SINT((s32)-st->opus_parser->PreSkip));
+								gf_filter_pid_set_property(st->opid, GF_PROP_PID_DELAY, &PROP_LONGSINT( -st->opus_parser->PreSkip));
 							}
 						}
 					}
 
 					if (ogg_page_eos(&oggpage)) {
-						//compat with old arch (keep same hashes), to remove once droping it
+						//compat with old arch (keep same hashes), to remove once dropping it
 						if (!gf_sys_old_arch_compat()) {
+							/*4.4 End Trimming, cf https://tools.ietf.org/html/rfc7845 */
 							if (oggpacket.granulepos != -1 && granulepos_init != -1)
-								block_size = (u32)(oggpacket.granulepos - granulepos_init - st->recomputed_ts); /*4.4 End Trimming, cf https://tools.ietf.org/html/rfc7845*/
+								block_size = (u32)(oggpacket.granulepos - granulepos_init - st->recomputed_ts);
 						}
 					}
 					dst_pck = gf_filter_pck_new_alloc(st->opid, oggpacket.bytes, &output);
+					if (!dst_pck) return GF_OUT_OF_MEM;
+					
 					memcpy(output, (char *) oggpacket.packet, oggpacket.bytes);
 					gf_filter_pck_set_cts(dst_pck, st->recomputed_ts);
-					//compat with old arch (keep same hashes), to remove once droping it
+					//compat with old arch (keep same hashes), to remove once dropping it
 					if (!gf_sys_old_arch_compat()) {
 						gf_filter_pck_set_duration(dst_pck, block_size);
 					}
@@ -736,7 +887,7 @@
 					if (st->info.type == GF_CODECID_VORBIS) {
 						gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
 					} else if (st->info.type == GF_CODECID_OPUS) {
-						//compat with old arch (keep same hashes), to remove once droping it
+						//compat with old arch (keep same hashes), to remove once dropping it
 						if (!gf_sys_old_arch_compat()) {
 							gf_filter_pck_set_roll_info(dst_pck, 3840);
 							gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_4);
@@ -805,19 +956,24 @@
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_SPEEX),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_THEORA),
+	{0},
+	//also declare generic file output for embedded files (cover art & co), but explicit to skip this cap in chain resolution
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT | GF_CAPFLAG_LOADED_FILTER ,GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE)
 };
 
 #define OFFS(_n)	#_n, offsetof(GF_OGGDmxCtx, _n)
 static const GF_FilterArgs OGGDmxArgs[] =
 {
-	{ OFFS(index), "indexing window length (unimplemented, only 0 disables stream probing for duration), ", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{ OFFS(index), "indexing window length (not implemented), use 0 to disable stream probing for duration), ", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{ OFFS(expart), "expose pictures as a dedicated video PID", GF_PROP_BOOL, "false", NULL, 0},
 	{0}
 };
 
 
 GF_FilterRegister OGGDmxRegister = {
 	.name = "oggdmx",
-	GF_FS_SET_DESCRIPTION("OGG demuxer")
+	GF_FS_SET_DESCRIPTION("OGG demultiplexer")
 	GF_FS_SET_HELP("This filter demultiplexes OGG files/data into a set of media PIDs and frames.")
 	.private_size = sizeof(GF_OGGDmxCtx),
 	.initialize = oggdmx_initialize,

gpac-1.0.1.tar.gz/src/filters/dmx_saf.c -> gpac-2.0.0.tar.gz/src/filters/dmx_saf.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2017
+ *			Copyright (c) Telecom ParisTech 2005-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / SAF demuxer filter
@@ -147,8 +147,10 @@
 				gf_filter_pid_set_property(st->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(stype));
 				st->ts_res = gf_bs_read_u24(bs);
 				gf_filter_pid_set_property(st->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(st->ts_res));
-				if (ctx->duration.num)
+				if (ctx->duration.num) {
 					gf_filter_pid_set_property(st->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+					gf_filter_pid_set_property(st->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
+				}
 
 				/*bufferSizeDB = */gf_bs_read_u16(bs);
 				au_size -= 7;
@@ -179,18 +181,20 @@
 				u8 *pck_data;
 				bs_pos = gf_bs_get_position(bs);
 				pck = gf_filter_pck_new_alloc(st->opid, au_size, &pck_data);
-				memcpy(pck_data, ctx->saf_data+bs_pos, au_size);
-				//TODO: map byte range pos ?
-				//TODO: map AU SN  ?
-
-				gf_filter_pck_set_cts(pck, cts);
-				if (is_rap)
-					gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
-
-				if (ctx->start_range && (ctx->start_range * st->ts_res > cts*1000)) {
-					gf_filter_pck_set_seek_flag(pck, GF_TRUE);
+				if (pck) {
+					memcpy(pck_data, ctx->saf_data+bs_pos, au_size);
+					//TODO: map byte range pos ?
+					//TODO: map AU SN  ?
+
+					gf_filter_pck_set_cts(pck, cts);
+					if (is_rap)
+						gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+
+					if (ctx->start_range && (ctx->start_range * st->ts_res > cts*1000)) {
+						gf_filter_pck_set_seek_flag(pck, GF_TRUE);
+					}
+					gf_filter_pck_send(pck);
 				}
-				gf_filter_pck_send(pck);
 			}
 			gf_bs_skip_bytes(bs, au_size);
 			break;
@@ -246,8 +250,10 @@
 	if (!ctx->file_loaded) return;
 
 	stream = gf_fopen(p->value.string, "rb");
-	if (!stream) return;
-
+	if (!stream) {
+		ctx->duration.num=1;
+		return;
+	}
 	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
 	ctx->file_size = gf_bs_get_size(bs);
 
@@ -445,7 +451,7 @@
 
 GF_FilterRegister SAFDmxRegister = {
 	.name = "safdmx",
-	GF_FS_SET_DESCRIPTION("SAF demuxer")
+	GF_FS_SET_DESCRIPTION("SAF demultiplexer")
 	GF_FS_SET_HELP("This filter demultiplexes SAF (MPEG-4 Simple Aggregation Format for LASeR) files/data into a set of media PIDs and frames.")
 	.private_size = sizeof(GF_SAFDmxCtx),
 	.initialize = safdmx_initialize,

gpac-1.0.1.tar.gz/src/filters/dmx_vobsub.c -> gpac-2.0.0.tar.gz/src/filters/dmx_vobsub.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2020
+ *			Copyright (c) Telecom ParisTech 2005-2022
 *					All rights reserved
 *
 * This file is part of GPAC / NHNT demuxer filter
@@ -111,6 +111,10 @@
 		if (!strncmp(p->value.string, "gfio://", 7)) {
 			use_gfio = GF_TRUE;
 			strcpy(sURL, gf_fileio_translate_url(p->value.string) );
+
+			if (gf_fileio_is_main_thread(p->value.string)) {
+				gf_filter_force_main_thread(filter, GF_TRUE);
+			}
 		} else {
 			strcpy(sURL, p->value.string);
 		}
@@ -236,6 +240,7 @@
 			gf_filter_pid_set_property(opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->vobsub->height) );
 			gf_filter_pid_set_property(opid, GF_PROP_PID_LANGUAGE, &PROP_STRING(ctx->vobsub->langs[i].name) );
 			gf_filter_pid_set_property(opid, GF_PROP_PID_DURATION, &PROP_FRAC64(ctx->duration) );
+			gf_filter_pid_set_property(opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 
 			gf_filter_pid_set_udta(opid, &ctx->vobsub->langs[i]);
 		}
@@ -274,22 +279,22 @@
 
 		gf_fseek(ctx->mdia, pos->filepos, SEEK_SET);
 		if (gf_ftell(ctx->mdia) != pos->filepos) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VobSub] Could not seek in file\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[VobSub] Could not seek in file\n"));
 			return GF_IO_ERR;
 		}
 
 		if (!gf_fread(buf, sizeof(buf), ctx->mdia)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VobSub] Could not read from file\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[VobSub] Could not read from file\n"));
 			return GF_IO_ERR;
 		}
 
 		if (*(u32*)&buf[0x00] != 0xba010000		 ||
-		 *(u32*)&buf[0x0e] != 0xbd010000		 ||
+			 (buf[14] || buf[15] || (buf[16]!=0x01) || (buf[17]!=0xbd)) ||
 		 !(buf[0x15] & 0x80)				 ||
 		 (buf[0x17] & 0xf0) != 0x20			 ||
 		 (buf[buf[0x16] + 0x17] & 0xe0) != 0x20)
 		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VobSub] Corrupted data found in file (1)\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[VobSub] Corrupted data found in file (1)\n"));
 			return GF_CORRUPTED_DATA;
 		}
 
@@ -298,10 +303,8 @@
 
 		if (ctx->blankframe && !c && (pos->start>0)) {
 			dst_pck = gf_filter_pck_new_alloc(pid, sizeof(null_subpic), &packet);
-			if (!dst_pck) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VobSub] Memory allocation failed\n"));
-				return GF_OUT_OF_MEM;
-			}
+			if (!dst_pck) return GF_OUT_OF_MEM;
+
 			memcpy(packet, null_subpic, sizeof(null_subpic));
 			gf_filter_pck_set_cts(dst_pck, 0);
 			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
@@ -310,10 +313,7 @@
 		}
 
 		dst_pck = gf_filter_pck_new_alloc(pid, psize, &packet);
-		if (!dst_pck) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VobSub] Memory allocation failed\n"));
-			return GF_OUT_OF_MEM;
-		}
+		if (!dst_pck) return GF_OUT_OF_MEM;
 
 		for (i = 0, left = psize; i < psize; i += size, left -= size) {
 			hsize = 0x18 + buf[0x16];
@@ -330,12 +330,12 @@
 		}
 
 		if (i != psize || left > 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VobSub] Corrupted data found in file (2)\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[VobSub] Corrupted data found in file (2)\n"));
 			return GF_CORRUPTED_DATA;
 		}
 
 		if (vobsub_get_subpic_duration(packet, psize, dsize, &duration) != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VobSub] Corrupted data found in file (3)\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[VobSub] Corrupted data found in file (3)\n"));
 			return GF_CORRUPTED_DATA;
 		}
 
@@ -344,7 +344,7 @@
 		gf_filter_pck_set_duration(dst_pck, duration);
 
 		if (vslang->last_dts && (vslang->last_dts >= pos->start * 90)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[VobSub] Out of order timestamps in vobsub file\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[VobSub] Out of order timestamps in vobsub file\n"));
 		}
 		gf_filter_pck_send(dst_pck);
 		vslang->last_dts = pos->start * 90;
@@ -387,7 +387,7 @@
 		p = gf_filter_pid_get_property(ctx->sub_pid, GF_PROP_PID_FILEPATH);
 		if (!p) {
 			gf_filter_setup_failure(filter, GF_URL_ERROR);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VobSub] Cannot open sub file\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[VobSub] Cannot open sub file\n"));
 			return GF_EOS;
 		}
 		ctx->mdia = gf_fopen(p->value.string, "rb");
@@ -459,8 +459,8 @@
 
 GF_FilterRegister VOBSubDmxRegister = {
 	.name = "vobsubdmx",
-	GF_FS_SET_DESCRIPTION("VobSub demuxer")
-	GF_FS_SET_HELP("This filter demultiplexes VobSub files/data to produce media PIDs and frames.")
+	GF_FS_SET_DESCRIPTION("VobSub parser")
+	GF_FS_SET_HELP("This filter parses VobSub files/data to produce media PIDs and frames.")
 	.private_size = sizeof(GF_VOBSubDmxCtx),
 	.max_extra_pids = 1,
 	.args = GF_VOBSubDmxArgs,

gpac-1.0.1.tar.gz/src/filters/enc_jpg.c -> gpac-2.0.0.tar.gz/src/filters/enc_jpg.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / libjpeg encoder filter
@@ -65,8 +65,10 @@
 
 	//disconnect of src pid (not yet supported)
 	if (is_remove) {
-		//one in one out, this is simple
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 		return GF_OK;
 	}
@@ -170,6 +172,8 @@
 		return;
 
 	ctx->dst_pck = gf_filter_pck_new_alloc(ctx->opid, ALLOC_STEP_SIZE, &ctx->output);
+	if (!ctx->dst_pck) return;
+
     cinfo->dest->next_output_byte = ctx->output;
     cinfo->dest->free_in_buffer = ALLOC_STEP_SIZE;
     ctx->dst_pck_size += ALLOC_STEP_SIZE;
@@ -259,6 +263,10 @@
 
 	if (ctx->max_size) {
 		ctx->dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->max_size, &ctx->output);
+		if (!ctx->dst_pck) {
+			e = GF_OUT_OF_MEM;
+			goto exit;
+		}
 		ctx->dst.next_output_byte = ctx->output;
 		ctx->dst.free_in_buffer = ctx->max_size;
 		ctx->dst_pck_size = ctx->max_size;

gpac-1.0.1.tar.gz/src/filters/enc_png.c -> gpac-2.0.0.tar.gz/src/filters/enc_png.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2021
 *					All rights reserved
 *
 * This file is part of GPAC / libpng encoder filter
@@ -58,7 +58,10 @@
 	//disconnect of src pid (not yet supported)
 	if (is_remove) {
 		//one in one out, this is simple
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		ctx->ipid = NULL;
 		return GF_OK;
 	}
@@ -142,6 +145,7 @@
 	if (!ctx->dst_pck) {
 		while (ctx->alloc_size<size) ctx->alloc_size+=PNG_BLOCK_SIZE;
 		ctx->dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->alloc_size, &ctx->output);
+		if (!ctx->dst_pck) return;
 	} else if (ctx->pos + size > ctx->alloc_size) {
 		u8 *new_data;
 		u32 new_size;
@@ -245,6 +249,10 @@
 	ctx->pos = 0;
 	if (ctx->max_size) {
 		ctx->dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->max_size, &ctx->output);
+		if (!ctx->dst_pck) {
+			e = GF_OUT_OF_MEM;
+			goto exit;
+		}
 		ctx->alloc_size = ctx->max_size;
 	}
 	png_set_write_fn(png_ptr, ctx, pngenc_write, pngenc_flush);

gpac-1.0.1.tar.gz/src/filters/encrypt_cenc_isma.c -> gpac-2.0.0.tar.gz/src/filters/encrypt_cenc_isma.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2020
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / CENC and ISMA encrypt module
@@ -53,8 +53,16 @@
 	CENC_HEVC, /*HEVC, nalu-based*/
 	CENC_AV1, /*AV1, OBU-based*/
 	CENC_VPX, /*VPX, custom, see https://www.webmproject.org/vp9/mp4/ */
+	CENC_VVC, /*VVC, nalu-based*/
 } CENCCodecMode;
 
+typedef struct
+{
+	GF_Crypt *crypt;
+	char IV[16];
+	bin128 key;
+	u32 IV_size;
+} CENC_MKey;
 
 typedef struct
 {
@@ -65,7 +73,11 @@
 	GF_FilterPid *ipid;
 	GF_FilterPid *opid;
 	GF_TrackCryptInfo *tci;
-	GF_Crypt *crypt;
+
+	//active keys (for multikey support)
+	u32 nb_keys;
+	CENC_MKey *keys;
+	Bool multi_key;
 	u32 codec_id;
 
 	u32 nb_pck;
@@ -76,34 +88,43 @@
 	Bool isma_oma;
 	u64 BSO;
 	u64 range_end;
-	Bool prev_pck_encryped;
+	Bool prev_pck_encrypted;
 	u32 KI_length;
 	u32 isma_IV_size;
 	Bool has_crypted_pck;
 
 	Bool is_adobe;
-	bin128 key;
 
 	CENCCodecMode cenc_codec;
 
 	u32 bytes_in_nal_hdr;
 	Bool use_subsamples;
 	Bool cenc_init;
-	u32 nb_pck_encrypted, kidx;
-	char IV[16];
-	bin128 default_KID;
+	u32 nb_pck_encrypted, kidx, nb_saps, nb_segments, nb_periods;
 
 	//true if using AES-CTR mode, false if using AES-CBC mode
 	Bool ctr_mode;
+	Bool is_saes;
+
+	Bool rap_roll;
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-	AVCState avc;
+	AVCState *avc_state;
 #ifndef GPAC_DISABLE_HEVC
-	HEVCState hevc;
+	HEVCState *hevc_state;
 #endif
-	AV1State av1;
+	AV1State *av1_state;
+	GF_VPConfig *vp9_cfg;
+
+	VVCState *vvc_state;
 #endif
 	Bool slice_header_clear;
+
+	GF_PropUIntList mkey_indices;
+
+	//0: no generation, >0: use v-1 as key idx
+	u32 pssh_template_plus_one;
+	GF_List *pssh_templates;
 } GF_CENCStream;
 
 typedef struct
@@ -154,6 +175,17 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] Missing NALU length size, assuming 4\n") );
 		}
 		break;
+	case GF_CODECID_VVC:
+		if (p) {
+			GF_VVCConfig *vvcc = gf_odf_vvc_cfg_read(p->value.data.ptr, p->value.data.size);
+			cstr->nalu_size_length = vvcc ? vvcc->nal_unit_size : 0;
+			if (vvcc) gf_odf_vvc_cfg_del(vvcc);
+		}
+		if (!cstr->nalu_size_length) {
+			cstr->nalu_size_length = 4;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] Missing NALU length size, assuming 4\n") );
+		}
+		break;
 	}
 
 	if (!scheme_uri || !strlen(scheme_uri)) scheme_uri = "urn:gpac:isma:encryption_scheme";
@@ -167,7 +199,7 @@
 		/*128 bit IV in OMA*/
 		cstr->isma_IV_size = 16;
 	} else {
-		p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_CENC_IV_SIZE);
+		p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_ISMA_IV_LENGTH);
 		if (p) {
 			cstr->isma_IV_size = p->value.uint;
 		} else {
@@ -183,34 +215,34 @@
 		if (!cstr->isma_IV_size || (cstr->isma_IV_size > 8)) cstr->isma_IV_size = 8;
 	}
 
-	if (!cstr->tci || !cstr->tci->KID_count) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMACrypt] No keys specified for ISMA\n"));
+	if (!cstr->tci || !cstr->tci->nb_keys) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ISMACrypt] No keys specified for ISMA\n"));
 		return GF_BAD_PARAM;
 	}
 
 	/*init crypto*/
 	memset(IV, 0, sizeof(char)*16);
-	memcpy(IV, cstr->tci->first_IV, sizeof(char)*8);
-	if (cstr->crypt) gf_crypt_close(cstr->crypt);
-	cstr->crypt = gf_crypt_open(GF_AES_128, GF_CTR);
-	if (!cstr->crypt) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMACrypt] Cannot open AES-128 CTR\n"));
+	memcpy(IV, cstr->tci->keys[0].IV, sizeof(char)*8);
+	if (cstr->keys[0].crypt) gf_crypt_close(cstr->keys[0].crypt);
+	cstr->keys[0].crypt = gf_crypt_open(GF_AES_128, GF_CTR);
+	if (!cstr->keys[0].crypt) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ISMACrypt] Cannot open AES-128 CTR\n"));
 		return GF_IO_ERR;
 	}
 
-	e = gf_crypt_init(cstr->crypt, cstr->tci->keys[0], IV);
+	e = gf_crypt_init(cstr->keys[0].crypt, cstr->tci->keys[0].key, IV);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMACrypt] Cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)) );
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ISMACrypt] Cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)) );
 		return GF_IO_ERR;
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ISMACrypt] Encrypting stream %s - KMS: %s%s\n", gf_filter_pid_get_name(cstr->ipid), cstr->tci->KMS_URI, cstr->tci->sel_enc_type ? " - Selective Encryption" : ""));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ISMACrypt] Encrypting stream %s - KMS: %s%s\n", gf_filter_pid_get_name(cstr->ipid), cstr->tci->KMS_URI, cstr->tci->sel_enc_type ? " - Selective Encryption" : ""));
 
 	if (!stricmp(kms_uri, "self")) {
 		char Data[100], d64[100];
 		u32 size_b64;
-		memcpy(Data, cstr->tci->keys[0], sizeof(char)*16);
-		memcpy(Data+16, cstr->tci->first_IV, sizeof(char)*8);
+		memcpy(Data, cstr->tci->keys[0].key, sizeof(char)*16);
+		memcpy(Data+16, cstr->tci->keys[0].IV, sizeof(char)*8);
 		size_b64 = gf_base64_encode(Data, 24, d64, 100);
 		d64[size_b64] = 0;
 		cstr->tci->KMS_URI = gf_realloc(cstr->tci->KMS_URI, size_b64+6);
@@ -259,7 +291,7 @@
 	}
 
 	cstr->isma_oma = GF_TRUE;
-	cstr->prev_pck_encryped = GF_TRUE;
+	cstr->prev_pck_encrypted = GF_TRUE;
 	cstr->has_crypted_pck = GF_FALSE;
 
 	//we drop IPMPX support for now
@@ -341,15 +373,15 @@
 
 static GF_Err adobe_enc_configure(GF_CENCEncCtx *ctx, GF_CENCStream *cstr)
 {
-	if (cstr->crypt) gf_crypt_close(cstr->crypt);
-	cstr->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
-	if (!cstr->crypt) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Adobe] Cannot open AES-128 CBC \n"));
+	if (cstr->keys[0].crypt) gf_crypt_close(cstr->keys[0].crypt);
+	cstr->keys[0].crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+	if (!cstr->keys[0].crypt) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Adobe] Cannot open AES-128 CBC \n"));
 		return GF_IO_ERR;
 	}
 
 	/*Adobe's protection scheme does not support selective key*/
-	memcpy(cstr->key, cstr->tci->keys[0], 16);
+	memcpy(cstr->keys[0].key, cstr->tci->keys[0].key, 16);
 
 	if (cstr->tci->metadata)
 		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ADOBE_CRYPT_META, &PROP_DATA(cstr->tci->metadata, (u32) strlen(cstr->tci->metadata) ) );
@@ -377,12 +409,21 @@
 	root = gf_xml_dom_get_root(parser);
 	if (!root) {
 		gf_xml_dom_del(parser);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open or validate xml file %s\n", ctx->cfile));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Cannot open or validate xml file %s\n", ctx->cfile));
 		return GF_NOT_SUPPORTED;
 	}
 	pssh_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_u32(pssh_bs, 0);
 
+	if (cstr->pssh_templates) {
+		while (gf_list_count(cstr->pssh_templates)) {
+			GF_XMLNode *n = gf_list_pop_back(cstr->pssh_templates);
+			gf_xml_dom_node_del(n);
+		}
+		gf_list_del(cstr->pssh_templates);
+	}
+	cstr->pssh_templates = NULL;
+
 	i=0;
 	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
 		Bool is_pssh;
@@ -395,6 +436,14 @@
 		s32 cypherOffset = -1;
 		Bool has_key = GF_FALSE, has_IV = GF_FALSE;
 
+		if (!strcmp(node->name, "DRMInfoTemplate")) {
+			if (!cstr->pssh_templates) cstr->pssh_templates = gf_list_new();
+			if (gf_list_add(cstr->pssh_templates, node) == GF_OK) {
+				i--;
+				gf_list_rem(root->content, i);
+			}
+			continue;
+		}
 		if (strcmp(node->name, "DRMInfo")) continue;
 
 		j = 0;
@@ -418,15 +467,15 @@
 			} else if (!strcmp(att->name, "cypherKey")) {
 				e = gf_bin128_parse(att->value, cypherKey);
 if (e != GF_OK) {
- GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse cypherKey\n"));
- return e;
+ GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Cannnot parse cypherKey\n"));
+ break;
 }
 				has_key = GF_TRUE;
 			} else if (!strcmp(att->name, "cypherIV")) {
 				e = gf_bin128_parse(att->value, cypherIV);
 if (e != GF_OK) {
- GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse cypherIV\n"));
- return e;
+ GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Cannnot parse cypherIV\n"));
+ break;
 }
 				has_IV = GF_TRUE;
 			} else if (!strcmp(att->name, "cypherOffset")) {
@@ -435,22 +484,34 @@
 		}
 
 		if (!is_pssh) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Not a Protection System Specific Header Box - skipping\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC/ISMA] Not a Protection System Specific Header Box - skipping\n"));
 			continue;
 		}
 
 		e = gf_xml_parse_bit_sequence(node, cfile_name, &specInfo, &specInfoSize);
 		if (e) {
 			if (specInfo) gf_free(specInfo);
-			gf_xml_dom_del(parser);
-			return e;
+			break;
 		}
 
 		bs = gf_bs_new(specInfo, specInfoSize, GF_BITSTREAM_READ);
 		gf_bs_read_data(bs, (char *)systemID, 16);
 		if (version) {
 			KID_count = gf_bs_read_u32(bs);
+			if (KID_count*16 > gf_bs_available(bs)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC/ISMA] Invalid PSSH blob, KID count %d but only %d bytes available\n", KID_count, gf_bs_available(bs)));
+				if (specInfo) gf_free(specInfo);
+				gf_bs_del(bs);
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				break;
+			}
 			KIDs = (bin128 *)gf_malloc(KID_count*sizeof(bin128));
+			if (!KIDs) {
+				if (specInfo) gf_free(specInfo);
+				gf_bs_del(bs);
+				e = GF_OUT_OF_MEM;
+				break;
+			}
 			for (j = 0; j < KID_count; j++) {
 				gf_bs_read_data(bs, (char *)KIDs[j], 16);
 			}
@@ -460,18 +521,34 @@
 			KIDs = NULL;
 		}
 		if (specInfoSize < 16 + (version ? 4 + 16*KID_count : 0)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Invalid PSSH blob in version %d: size %d key count %d - ignoring PSSH\n", version, specInfoSize, KID_count));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC/ISMA] Invalid PSSH blob in version %d: size %d key count %d - ignoring PSSH\n", version, specInfoSize, KID_count));
+
+			if (specInfo) gf_free(specInfo);
+			gf_bs_del(bs);
+			if (KIDs) gf_free(KIDs);
 			continue;
 		}
 		len = specInfoSize - 16 - (version ? 4 + 16*KID_count : 0);
 		data = (char *)gf_malloc(len*sizeof(char));
+		if (!data) {
+			e = GF_OUT_OF_MEM;
+			if (specInfo) gf_free(specInfo);
+			gf_bs_del(bs);
+			if (KIDs) gf_free(KIDs);
+			break;
+		}
 		gf_bs_read_data(bs, data, len);
 
 		if (has_key && has_IV && (cypherOffset >= 0) && (cypherMode != 1)) {
 			GF_Crypt *gc = gf_crypt_open(GF_AES_128, GF_CTR);
 			if (!gc) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
-				return GF_IO_ERR;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
+				if (specInfo) gf_free(specInfo);
+				gf_bs_del(bs);
+				if (KIDs) gf_free(KIDs);
+				if (data) gf_free(data);
+				e = GF_IO_ERR;
+				break;
 			}
 			e = gf_crypt_init(gc, cypherKey, cypherIV);
 			gf_crypt_encrypt(gc, data+cypherOffset, len-cypherOffset);
@@ -481,9 +558,11 @@
 			nb_pssh++;
 			gf_bs_write_data(pssh_bs, systemID, 16);
 			gf_bs_write_u32(pssh_bs, version);
-			gf_bs_write_u32(pssh_bs, KID_count);
-			for (j=0; j<KID_count; j++) {
-				gf_bs_write_data(pssh_bs, KIDs[j], 16);
+			if (version) {
+				gf_bs_write_u32(pssh_bs, KID_count);
+				for (j=0; j<KID_count; j++) {
+					gf_bs_write_data(pssh_bs, KIDs[j], 16);
+				}
 			}
 			gf_bs_write_u32(pssh_bs, len);
 			gf_bs_write_data(pssh_bs, data, len);
@@ -498,7 +577,7 @@
 
 	gf_xml_dom_del(parser);
 
-	if (nb_pssh) {
+	if (!e && nb_pssh) {
 		u8 *pssh=NULL;
 		u32 pssh_size=0;
 		u32 pos = (u32) gf_bs_get_position(pssh_bs);
@@ -513,6 +592,32 @@
 	return e;
 }
 
+static void cenc_pid_reset_codec_states(GF_CENCStream *cstr)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (cstr->av1_state) {
+		if (cstr->av1_state->config) gf_odf_av1_cfg_del(cstr->av1_state->config);
+		gf_free(cstr->av1_state);
+		cstr->av1_state = NULL;
+	}
+	if (cstr->avc_state) {
+		gf_free(cstr->avc_state);
+		cstr->avc_state = NULL;
+	}
+	if (cstr->hevc_state) {
+		gf_free(cstr->hevc_state);
+		cstr->hevc_state = NULL;
+	}
+	if (cstr->vvc_state) {
+		gf_free(cstr->vvc_state);
+		cstr->vvc_state = NULL;
+	}
+#endif
+	if (cstr->vp9_cfg) {
+		gf_odf_vp_cfg_del(cstr->vp9_cfg);
+		cstr->vp9_cfg = NULL;
+	}
+}
 
 static GF_Err cenc_enc_configure(GF_CENCEncCtx *ctx, GF_CENCStream *cstr, const char *cfile_name)
 {
@@ -523,6 +628,7 @@
 	Bool is_reinit=GF_FALSE;
 	GF_AVCConfig *avccfg;
 	GF_HEVCConfig *hevccfg;
+	GF_VVCConfig *vvccfg;
 	const GF_PropertyValue *p;
 
 	p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_DECODER_CONFIG);
@@ -533,26 +639,88 @@
 	}
 	if (dsi_crc != cstr->dsi_crc)
 		is_reinit = GF_TRUE;
-	else if (!dsi_crc && !cstr->crypt)
+	else if (!dsi_crc && !cstr->keys[0].crypt)
 		is_reinit = GF_TRUE;
 
 	cstr->dsi_crc = dsi_crc;
+	if (cstr->is_saes) {
+		cstr->tci->crypt_byte_block = 1;
+		cstr->tci->skip_byte_block = 9;
+	}
+
 
 	if (is_reinit) {
 		const GF_PropertyValue *p2;
+		Bool allow_saes=GF_FALSE;
+		u32 cenc_codec = CENC_FULL_SAMPLE;
 		cstr->nalu_size_length = 0;
+
+		//get CENC media type
 		switch (cstr->codec_id) {
 		case GF_CODECID_AVC:
+			allow_saes=GF_TRUE;
 		case GF_CODECID_SVC:
 		case GF_CODECID_MVC:
+			cenc_codec = CENC_AVC;
+			break;
+		case GF_CODECID_HEVC:
+		case GF_CODECID_LHVC:
+			cenc_codec = CENC_HEVC;
+			break;
+		case GF_CODECID_AV1:
+			cenc_codec = CENC_AV1;
+			break;
+		case GF_CODECID_VP8:
+		case GF_CODECID_VP9:
+			cenc_codec = CENC_VPX;
+			break;
+		case GF_CODECID_VVC:
+			cenc_codec = CENC_VVC;
+			break;
+		case GF_CODECID_AAC_MPEG4:
+		case GF_CODECID_AAC_MPEG2_MP:
+		case GF_CODECID_AAC_MPEG2_LCP:
+		case GF_CODECID_AAC_MPEG2_SSRP:
+			allow_saes=GF_TRUE;
+			break;
+		}
+		if (cstr->is_saes && !allow_saes) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCCrypt] HLS Sample-AES not supported for codec %s\n", gf_codecid_name(cstr->codec_id) ));
+			return GF_NOT_SUPPORTED;
+		}
+		//if change in type, free/realloc parsing contexts
+		if (cstr->cenc_codec != cenc_codec) {
+			cenc_pid_reset_codec_states(cstr);
+			cstr->cenc_codec = cenc_codec;
+			switch (cenc_codec) {
+			case CENC_AVC:
+				GF_SAFEALLOC(cstr->avc_state, AVCState);
+				if (!cstr->avc_state) return GF_OUT_OF_MEM;
+				break;
+			case CENC_HEVC:
+				GF_SAFEALLOC(cstr->hevc_state, HEVCState);
+				if (!cstr->hevc_state) return GF_OUT_OF_MEM;
+				break;
+			case CENC_VVC:
+				GF_SAFEALLOC(cstr->vvc_state, VVCState);
+				if (!cstr->vvc_state) return GF_OUT_OF_MEM;
+				break;
+			case CENC_AV1:
+				GF_SAFEALLOC(cstr->av1_state, AV1State);
+				if (!cstr->av1_state) return GF_OUT_OF_MEM;
+				break;
+			}
+		}
+
+
+		switch (cstr->cenc_codec) {
+		case CENC_AVC:
 			if (!p)
 				return GF_OK;
 
 			avccfg = gf_odf_avc_cfg_read(p->value.data.ptr, p->value.data.size);
 			if (avccfg) cstr->nalu_size_length = avccfg->nal_unit_size;
 
-			cstr->cenc_codec = CENC_AVC;
-
 			p2 = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_ISOM_SUBTYPE);
 			if (p2 && (p2->value.uint==GF_ISOM_BOX_TYPE_AVC1)) {
 				if (!cstr->tci->allow_encrypted_slice_header) {
@@ -566,12 +734,12 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 			if (avccfg) {
 				for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
-					GF_AVCConfigSlot *slc = gf_list_get(avccfg->sequenceParameterSets, i);
-					gf_media_avc_read_sps(slc->data, slc->size, &cstr->avc, 0, NULL);
+					GF_NALUFFParam *slc = gf_list_get(avccfg->sequenceParameterSets, i);
+					gf_avc_read_sps(slc->data, slc->size, cstr->avc_state, 0, NULL);
 				}
 				for (i=0; i<gf_list_count(avccfg->pictureParameterSets); i++) {
-					GF_AVCConfigSlot *slc = gf_list_get(avccfg->pictureParameterSets, i);
-					gf_media_avc_read_pps(slc->data, slc->size, &cstr->avc);
+					GF_NALUFFParam *slc = gf_list_get(avccfg->pictureParameterSets, i);
+					gf_avc_read_pps(slc->data, slc->size, cstr->avc_state);
 				}
 
 				gf_odf_avc_cfg_del(avccfg);
@@ -589,8 +757,7 @@
 				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENCCrypt] Missing NALU length size, assuming 4\n") );
 			}
 			break;
-		case GF_CODECID_HEVC:
-		case GF_CODECID_LHVC:
+		case CENC_HEVC:
 			if (!p)
 				return GF_OK;
 
@@ -598,16 +765,14 @@
 			if (hevccfg) cstr->nalu_size_length = hevccfg->nal_unit_size;
 
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
-			gf_media_hevc_parse_ps(hevccfg, &cstr->hevc, GF_HEVC_NALU_VID_PARAM);
-			gf_media_hevc_parse_ps(hevccfg, &cstr->hevc, GF_HEVC_NALU_SEQ_PARAM);
-			gf_media_hevc_parse_ps(hevccfg, &cstr->hevc, GF_HEVC_NALU_PIC_PARAM);
+			gf_hevc_parse_ps(hevccfg, cstr->hevc_state, GF_HEVC_NALU_VID_PARAM);
+			gf_hevc_parse_ps(hevccfg, cstr->hevc_state, GF_HEVC_NALU_SEQ_PARAM);
+			gf_hevc_parse_ps(hevccfg, cstr->hevc_state, GF_HEVC_NALU_PIC_PARAM);
 #endif
 
 			//mandatory for HEVC
 			cstr->slice_header_clear = GF_TRUE;
 
-			cstr->cenc_codec = CENC_HEVC;
-
 			if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
 			cstr->bytes_in_nal_hdr = 2;
 
@@ -616,25 +781,50 @@
 				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENCCrypt] Missing NALU length size, assuming 4\n") );
 			}
 			break;
-		case GF_CODECID_AV1:
+		case CENC_AV1:
 			if (!p)
 				return GF_OK;
 
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_AV1)
-			cstr->av1.config = gf_odf_av1_cfg_read(p->value.data.ptr, p->value.data.size);
-			cstr->cenc_codec = CENC_AV1;
+			cstr->av1_state->config = gf_odf_av1_cfg_read(p->value.data.ptr, p->value.data.size);
 			cstr->bytes_in_nal_hdr = 2;
 #endif
 			//mandatory for AV1
 			cstr->slice_header_clear = GF_TRUE;
 			break;
-		case GF_CODECID_VP8:
-		case GF_CODECID_VP9:
+		case CENC_VPX:
 			if (p) {
-			cstr->cenc_codec = CENC_VPX;
 				cstr->bytes_in_nal_hdr = 2;
+				cstr->vp9_cfg = gf_odf_vp_cfg_new();
+			}
+			break;
+		case CENC_VVC:
+			if (!p)
+				return GF_OK;
+
+			vvccfg = gf_odf_vvc_cfg_read(p->value.data.ptr, p->value.data.size);
+			if (vvccfg) cstr->nalu_size_length = vvccfg->nal_unit_size;
+
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+			gf_vvc_parse_ps(vvccfg, cstr->vvc_state, GF_VVC_NALU_VID_PARAM);
+			gf_vvc_parse_ps(vvccfg, cstr->vvc_state, GF_VVC_NALU_SEQ_PARAM);
+			gf_vvc_parse_ps(vvccfg, cstr->vvc_state, GF_VVC_NALU_PIC_PARAM);
+#endif
+
+			//mandatory for VVC
+			cstr->slice_header_clear = GF_TRUE;
+
+			if (vvccfg) gf_odf_vvc_cfg_del(vvccfg);
+			cstr->bytes_in_nal_hdr = 2;
+
+			if (!cstr->nalu_size_length) {
+				cstr->nalu_size_length = 4;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENCCrypt] Missing NALU length size, assuming 4\n") );
 			}
 			break;
+
+		default:
+			break;
 		}
 	}
 
@@ -642,7 +832,7 @@
 	) {
 		if (!cstr->tci->crypt_byte_block || !cstr->tci->skip_byte_block) {
 			if (cstr->tci->crypt_byte_block || cstr->tci->skip_byte_block) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using pattern mode, crypt_byte_block and skip_byte_block shall be 0 only for track other than video, using 1 crypt + 9 skip\n"));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC] Using pattern mode, crypt_byte_block and skip_byte_block shall be 0 only for track other than video, using 1 crypt + 9 skip\n"));
 			}
 			cstr->tci->crypt_byte_block = 1;
 			cstr->tci->skip_byte_block = 9;
@@ -650,18 +840,26 @@
 	}
 
 	if ( (cstr->cenc_codec==CENC_VPX) && (cstr->tci->scheme_type != GF_CRYPT_TYPE_CENC) ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Encryption mode %s is not supported with VP8/VP9, only cenc is\n", gf_4cc_to_str(cstr->tci->scheme_type) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Encryption mode %s is not supported with VP8/VP9, only cenc is\n", gf_4cc_to_str(cstr->tci->scheme_type) ));
 		return GF_NOT_SUPPORTED;
 	}
 
 
 	cstr->use_subsamples = GF_FALSE;
-	if (cstr->cenc_codec != CENC_FULL_SAMPLE) cstr->use_subsamples = GF_TRUE;
+	if (cstr->cenc_codec != CENC_FULL_SAMPLE)
+		cstr->use_subsamples = GF_TRUE;
 	//CBCS mode with skip byte block may be used for any track, in which case we need subsamples
 	else if (cstr->tci->scheme_type == GF_CRYPT_TYPE_CBCS) {
+		const GF_PropertyValue *prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_STREAM_TYPE);
+		if (prop && prop->value.uint != GF_STREAM_VISUAL) {
+			if (cstr->tci->skip_byte_block) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("\n[CENC] Using cbcs pattern mode on-video track is disabled in GPAC, using whole-block full encryption\n"));
+				cstr->tci->skip_byte_block = 0;
+			}
+		}
 		if (cstr->tci->skip_byte_block) {
 			cstr->use_subsamples = GF_TRUE;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("\n[CENC] Using cbcs pattern mode on non NAL video track, this may not be supported by most devices; consider setting skip_byte_block to 0\n\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("\n[CENC] Using cbcs pattern mode on non NAL video track, this may not be supported by most devices; consider setting skip_byte_block to 0\n\n"));
 			//cbcs allows bytes of clear data
 			cstr->bytes_in_nal_hdr = cstr->tci->clear_bytes;
 		}
@@ -669,7 +867,7 @@
 		//but cbcs asks for 1 - needs further clarification
 #if 0
 		//setup defaults
-		else if (!cstr->tci->crypt_byte_block) {
+		else if (!cstr->crypt_byte_block) {
 			cstr->tci->crypt_byte_block = 1;
 		}
 #else
@@ -678,43 +876,100 @@
 		}
 #endif
 	}
-	else if ((cstr->tci->scheme_type == GF_CRYPT_TYPE_CENS) && cstr->tci->skip_byte_block) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using cens pattern mode on non NAL video track not allowed, forcing skip_byte_block to 0\n"));
-		cstr->tci->skip_byte_block = 0;
-		if (!cstr->tci->crypt_byte_block) {
-			cstr->tci->crypt_byte_block = 1;
+	else if (cstr->tci->scheme_type == GF_CRYPT_TYPE_CENS) {
+		if (cstr->tci->skip_byte_block) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC] Using cens pattern mode on non NAL video track not allowed, forcing skip_byte_block to 0\n"));
+			cstr->tci->skip_byte_block = 0;
+			if (!cstr->tci->crypt_byte_block) {
+				cstr->tci->crypt_byte_block = 1;
+			}
 		}
 	}
 
-	if (is_reinit) {
-		if (cstr->crypt) gf_crypt_close(cstr->crypt);
-		if (cstr->ctr_mode) {
-			cstr->crypt = gf_crypt_open(GF_AES_128, GF_CTR);
-		}
-		else {
-			cstr->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+	//setup crypto context, disabling multikey if the stream doesn't use subsample
+	if (!cstr->keys) {
+		if (!cstr->use_subsamples)
+			cstr->multi_key = GF_FALSE;
+
+		if (cstr->multi_key) {
+			cstr->nb_keys = cstr->tci->nb_keys;
+		} else {
+			cstr->nb_keys = 1;
 		}
+		cstr->keys = gf_malloc(sizeof(CENC_MKey) * cstr->nb_keys);
+		if (!cstr->keys) return GF_OUT_OF_MEM;
+		memset(cstr->keys, 0, sizeof(CENC_MKey) * cstr->nb_keys);
+	}
+	//init rand
+	if ((cstr->tci->sel_enc_type==GF_CRYPT_SELENC_RAND)
+		|| (cstr->tci->sel_enc_type==GF_CRYPT_SELENC_RAND_RANGE)
+		|| cstr->tci->subs_rand
+	) {
+		gf_rand_init(GF_TRUE);
+	}
 
-		if (!cstr->crypt) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot open AES-128 %s\n", cstr->ctr_mode ? "CTR" : "CBC"));
-			return GF_IO_ERR;
+	//configure roll rap
+	if (cstr->tci->roll_type==GF_KEYROLL_SAPS) {
+		cstr->rap_roll = GF_TRUE;
+		//if no subsample, only use key roll "rap" if codec has sync point
+		if (!cstr->use_subsamples) {
+			p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_HAS_SYNC);
+			if (p && p->value.uint) {
+				cstr->rap_roll = GF_TRUE;
+			} else {
+				switch (cstr->codec_id) {
+				case GF_CODECID_USAC:
+					cstr->rap_roll = GF_TRUE;
+					break;
+				}
+			}
+		} else {
+			cstr->rap_roll = GF_TRUE;
 		}
+	}
+	if (cstr->multi_key && !cstr->mkey_indices.nb_items && cstr->tci->mkey_subs) {
+		GF_PropertyValue pval = gf_props_parse_value(GF_PROP_UINT_LIST, "subs", cstr->tci->mkey_subs, NULL, ',');
+		cstr->mkey_indices = pval.value.uint_list;
+	}
+
+	if (is_reinit) {
+		u32 nb_keys;
 
 		/*select key*/
 		if (!cstr->tci->keys) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] No key specified\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] No key specified\n"));
 			return GF_BAD_PARAM;
 		}
-		if (cstr->tci->defaultKeyIdx && (cstr->tci->defaultKeyIdx < cstr->tci->KID_count)) {
-			memcpy(cstr->key, cstr->tci->keys[cstr->tci->defaultKeyIdx], 16);
-			memcpy(cstr->default_KID, cstr->tci->KIDs[cstr->tci->defaultKeyIdx], 16);
-			cstr->kidx = cstr->tci->defaultKeyIdx;
-		} else {
-			memcpy(cstr->key, cstr->tci->keys[0], 16);
-			memcpy(cstr->default_KID, cstr->tci->KIDs[0], 16);
-			cstr->kidx = 0;
+
+		nb_keys = cstr->multi_key ? cstr->tci->nb_keys : 1;
+		for (i=0; i<nb_keys; i++) {
+
+			if (cstr->keys[i].crypt) gf_crypt_close(cstr->keys[i].crypt);
+			if (cstr->ctr_mode) {
+				cstr->keys[i].crypt = gf_crypt_open(GF_AES_128, GF_CTR);
+			}
+			else {
+				cstr->keys[i].crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+			}
+			if (!cstr->keys[i].crypt) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Cannot open AES-128 %s\n", cstr->ctr_mode ? "CTR" : "CBC"));
+				return GF_IO_ERR;
+			}
+
+			if (nb_keys>1) {
+				memcpy(cstr->keys[i].key, cstr->tci->keys[i].key, 16);
+				cstr->kidx = 0;
+			} else {
+				if (cstr->tci->defaultKeyIdx && (cstr->tci->defaultKeyIdx < cstr->tci->nb_keys)) {
+					cstr->kidx = cstr->tci->defaultKeyIdx;
+				} else {
+					cstr->kidx = 0;
+				}
+				memcpy(cstr->keys[0].key, cstr->tci->keys[cstr->kidx].key, 16);
+			}
 		}
-		cstr->prev_pck_encryped = cstr->tci->IsEncrypted;
+
+		cstr->prev_pck_encrypted = cstr->tci->IsEncrypted;
 	}
 
 	/*set CENC protection properties*/
@@ -722,32 +977,95 @@
 	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_SCHEME_VERSION, &PROP_UINT(0x00010000) );
 	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ENCRYPTED, &PROP_BOOL(cstr->tci->IsEncrypted ? GF_TRUE : GF_FALSE) );
 
-	if (cstr->tci->IV_size) {
-		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_IV_SIZE, &PROP_UINT(cstr->tci->IV_size) );
+	u8 *data;
+	u32 size;
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (cstr->multi_key) {
+		gf_bs_write_u8(bs, 1);
+		gf_bs_write_u16(bs, cstr->tci->nb_keys);
+
+		for (i=0; i<cstr->tci->nb_keys; i++) {
+			GF_CryptKeyInfo *ki = &cstr->tci->keys[i];
+			gf_bs_write_u8(bs, ki->constant_IV_size ? 0 : ki->IV_size);
+			gf_bs_write_data(bs, ki->KID, 16);
+			if (ki->constant_IV_size) {
+				gf_bs_write_u8(bs, ki->constant_IV_size);
+				gf_bs_write_data(bs, ki->IV, ki->constant_IV_size);
+			}
+		}
 	} else {
-		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_IV_SIZE, NULL);
+		GF_CryptKeyInfo *ki = &cstr->tci->keys[cstr->kidx];
+		gf_bs_write_u8(bs, 0);
+		gf_bs_write_u16(bs, 0);
+		gf_bs_write_u8(bs, ki->constant_IV_size ? 0 : ki->IV_size);
+		gf_bs_write_data(bs, ki->KID, 16);
+		if (ki->constant_IV_size) {
+			gf_bs_write_u8(bs, ki->constant_IV_size);
+			gf_bs_write_data(bs, ki->IV, ki->constant_IV_size);
+		}
+	}
+	gf_bs_get_content(bs, &data, &size);
+	gf_bs_del(bs);
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_KEY_INFO, &PROP_DATA_NO_COPY(data, size) );
+
+	if (!cstr->multi_key) {
+		char *hls_info = cstr->tci->keys[0].hls_info;
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_HLS_KMS, hls_info ? &PROP_STRING(hls_info) : NULL);
 	}
-	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_KID, &PROP_DATA(cstr->default_KID, sizeof(bin128) ) );
 
 	if (cstr->tci->skip_byte_block || cstr->tci->crypt_byte_block) {
 		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_PATTERN, &PROP_FRAC_INT(cstr->tci->skip_byte_block, cstr->tci->crypt_byte_block ) );
 	} else {
 		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_PATTERN, NULL);
 	}
-	if (cstr->tci->constant_IV_size) {
-		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_IV_CONST, &PROP_DATA(cstr->tci->constant_IV, cstr->tci->constant_IV_size) );
-	} else {
-		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_IV_CONST, NULL );
-	}
+
 	//if constantIV and not using CENC subsample, no CENC auxiliary info
-	if (!cstr->tci->constant_IV_size || cstr->use_subsamples) {
-		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_STORE, &PROP_UINT(cstr->tci->sai_saved_box_type) );
+	if (!cstr->tci->keys[0].constant_IV_size || cstr->use_subsamples) {
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_STORE, &PROP_4CC(cstr->tci->sai_saved_box_type) );
 	}
 
 	//parse pssh even if reinit since we need to reassign pssh property
 	return cenc_parse_pssh(ctx, cstr, cfile_name);
 }
 
+
+static void cenc_free_pid_context(GF_CENCStream *cstr)
+{
+	u32 i;
+	for (i=0; i<cstr->nb_keys; i++) {
+		if (cstr->keys[i].crypt) gf_crypt_close(cstr->keys[i].crypt);
+	}
+	gf_free(cstr->keys);
+	if (cstr->cinfo) gf_crypt_info_del(cstr->cinfo);
+
+	if (cstr->mkey_indices.vals) gf_free(cstr->mkey_indices.vals);
+	cenc_pid_reset_codec_states(cstr);
+	if (cstr->pssh_templates) {
+		while (gf_list_count(cstr->pssh_templates)) {
+			GF_XMLNode *n = gf_list_pop_back(cstr->pssh_templates);
+			gf_xml_dom_node_del(n);
+		}
+		gf_list_del(cstr->pssh_templates);
+	}
+	gf_free(cstr);
+}
+
+void cenc_gen_bin128(bin128 data)
+{
+	u64 *low = (u64 *) &data[0];
+	u64 *high = (u64 *) &data[8];
+
+	u64 val = gf_rand();
+	val <<= 32;
+	val |= gf_rand();
+	*low = val;
+
+	val = gf_rand();
+	val <<= 32;
+	val |= gf_rand();
+	*high = val;
+}
+
 static GF_Err cenc_enc_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	const GF_PropertyValue *prop;
@@ -762,16 +1080,16 @@
 	const char *cfile_name = ctx->cfile;
 	GF_TrackCryptInfo *tci_any = NULL;
 	u32 i, count;
-
+	Bool force_clear = GF_FALSE;
 
 	if (is_remove) {
 		cstr = gf_filter_pid_get_udta(pid);
 		if (cstr) {
 			gf_list_del_item(ctx->streams, cstr);
-			gf_filter_pid_remove(cstr->opid);
-			if (cstr->crypt) gf_crypt_close(cstr->crypt);
-			if (cstr->cinfo) gf_crypt_info_del(cstr->cinfo);
-			gf_free(cstr);
+			if (cstr->opid)
+				gf_filter_pid_remove(cstr->opid);
+
+			cenc_free_pid_context(cstr);
 		}
 		return GF_OK;
 	}
@@ -781,14 +1099,19 @@
 
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CRYPT_INFO);
 	if (prop) {
-		cinfo = gf_crypt_info_load(prop->value.string, &e);
-		if (!cinfo) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCrypt] failed to load crypt info file %s for pid %s\n", prop->value.string, gf_filter_pid_get_name(pid) ) );
-			return e;
+		if (!stricmp(prop->value.string, "clear")) {
+			force_clear = GF_TRUE;
+		} else {
+			cinfo = gf_crypt_info_load(prop->value.string, &e);
+			if (!cinfo) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCrypt] failed to load crypt info file %s for pid %s\n", prop->value.string, gf_filter_pid_get_name(pid) ) );
+				return e;
+			}
+			cfile_name = prop->value.string;
 		}
-		cfile_name = prop->value.string;
 	}
-	if (!cinfo) cinfo = ctx->cinfo;
+	if (!cinfo && !force_clear)
+		cinfo = ctx->cinfo;
 
 
 	if (cinfo) {
@@ -802,7 +1125,7 @@
 			tci = NULL;
 		}
 		if (!tci) tci = tci_any;
-	} else if (ctx->allc) {
+	} else if (ctx->allc && !force_clear) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCrypt] Missing DRM config file\n") );
 		return GF_NOT_SUPPORTED;
 	}
@@ -823,6 +1146,7 @@
 		case GF_CRYPT_TYPE_CENS:
 		case GF_CRYPT_TYPE_CBCS:
 		case GF_CRYPT_TYPE_PIFF:
+		case GF_CRYPT_TYPE_SAES:
 			break;
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCrypt] Unsupported scheme type %s\n", gf_4cc_to_str(scheme_type) ));
@@ -840,12 +1164,34 @@
 		cstr->tci = tci;
 		gf_list_add(ctx->streams, cstr);
 		gf_filter_pid_set_udta(pid, cstr);
+		//we need full sample
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
 	}
 	if (cstr->cinfo) gf_crypt_info_del(cstr->cinfo);
 	cstr->cinfo = (cinfo != ctx->cinfo) ? cinfo : NULL;
 	cstr->tci = tci;
 	cstr->passthrough = tci ? GF_FALSE : GF_TRUE;
 
+	if (tci && tci->rand_keys) {
+		if (!tci->nb_keys) {
+			tci->keys = gf_realloc(tci->keys, sizeof(GF_CryptKeyInfo));
+			memset(&tci->keys[0], 0, sizeof(GF_CryptKeyInfo));
+		}
+		tci->nb_keys = 1;
+		if (tci->scheme_type == GF_CRYPT_TYPE_CBCS) {
+			tci->keys[0].IV_size = 0;
+			tci->keys[0].constant_IV_size = 16;
+		} else {
+			if (!tci->keys[0].IV_size) tci->keys[0].IV_size = 16;
+			tci->keys[0].constant_IV_size = 0;
+		}
+		tci->nb_keys = 1;
+		gf_rand_init(GF_TRUE);
+		cenc_gen_bin128(tci->keys[0].key);
+		cenc_gen_bin128(tci->keys[0].KID);
+		cenc_gen_bin128(tci->keys[0].IV);
+	}
+
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(cstr->opid, pid);
 
@@ -853,7 +1199,7 @@
 	if (prop) cstr->codec_id = prop->value.uint;
 
 	if (cstr->tci) {
-		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, &PROP_UINT(scheme_type) );
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, &PROP_4CC(scheme_type) );
 
 
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
@@ -867,7 +1213,7 @@
 				gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ORIG_STREAM_TYPE, & PROP_UINT(prop->value.uint) );
 				break;
 			default:
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENCrypt] Stream type %s cannot be encrypted, using passthrough\n", gf_stream_type_name(prop->value.uint) ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[CENCrypt] Stream type %s cannot be encrypted, using passthrough\n", gf_stream_type_name(prop->value.uint) ));
 				cstr->passthrough = GF_TRUE;
 				break;
 			}
@@ -887,6 +1233,30 @@
 		kms_uri = cfile_name;
 	}
 
+	if (!cstr->keys) {
+		cstr->multi_key = cstr->tci->multi_key;
+		if (cstr->multi_key) {
+			switch (scheme_type) {
+			case GF_CRYPT_TYPE_CENC:
+			case GF_CRYPT_TYPE_CENS:
+			case GF_CRYPT_TYPE_PIFF:
+			case GF_CRYPT_TYPE_CBC1:
+			case GF_CRYPT_TYPE_CBCS:
+				break;
+			default:
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] Multi-key not possible with scheme %s, ignoring\n", gf_4cc_to_str(scheme_type) ));
+				cstr->multi_key = 0;
+				break;
+			}
+		}
+		if (!cstr->multi_key) {
+			cstr->nb_keys = 1;
+			cstr->keys = gf_malloc(sizeof(CENC_MKey) * cstr->nb_keys);
+			if (!cstr->keys) return GF_OUT_OF_MEM;
+			memset(cstr->keys, 0, sizeof(CENC_MKey) * cstr->nb_keys);
+		}
+	}
+
 	cstr->ctr_mode = GF_FALSE;
 
 	switch (scheme_type) {
@@ -904,6 +1274,9 @@
 	case GF_CRYPT_TYPE_CBC1:
 	case GF_CRYPT_TYPE_CBCS:
 		return cenc_enc_configure(ctx, cstr, cfile_name);
+	case GF_CRYPT_TYPE_SAES:
+		cstr->is_saes = GF_TRUE;
+		return cenc_enc_configure(ctx, cstr, cfile_name);
 	default:
 		return GF_NOT_SUPPORTED;
 	}
@@ -972,10 +1345,12 @@
 
 	data = gf_filter_pck_get_data(pck, &size);
 	if (!data) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISMACrypt] No data associated with packet\n" ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] No data associated with packet\n" ));
 		return GF_OK;
 	}
 	dst_pck = gf_filter_pck_new_alloc(cstr->opid, size+isma_hdr_size, &output);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+
 	memcpy(output+isma_hdr_size, data, sizeof(char)*size);
 	gf_filter_pck_merge_properties(pck, dst_pck);
 
@@ -996,7 +1371,7 @@
 	//encrypt
 	if (flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
 		/*resync IV*/
-		if (!cstr->prev_pck_encryped) {
+		if (!cstr->prev_pck_encrypted) {
 			char IV[17];
 			u64 count;
 			u32 remain;
@@ -1007,21 +1382,21 @@
 			/*format IV to begin of counter*/
 			bs = gf_bs_new(IV, 17, GF_BITSTREAM_WRITE);
 			gf_bs_write_u8(bs, 0);	/*begin of counter*/
-			gf_bs_write_data(bs, cstr->tci->first_IV, 8);
+			gf_bs_write_data(bs, cstr->tci->keys[0].IV, 8);
 			gf_bs_write_u64(bs, (s64) count);
 			gf_bs_del(bs);
-			gf_crypt_set_IV(cstr->crypt, IV, GF_AES_128_KEYSIZE+1);
+			gf_crypt_set_IV(cstr->keys[0].crypt, IV, GF_AES_128_KEYSIZE+1);
 
 			/*decrypt remain bytes*/
 			if (remain) {
 				char dummy[20];
-				gf_crypt_decrypt(cstr->crypt, dummy, remain);
+				gf_crypt_decrypt(cstr->keys[0].crypt, dummy, remain);
 			}
 		}
-		gf_crypt_encrypt(cstr->crypt, output+isma_hdr_size, size);
-		cstr->prev_pck_encryped = GF_TRUE;
+		gf_crypt_encrypt(cstr->keys[0].crypt, output+isma_hdr_size, size);
+		cstr->prev_pck_encrypted = GF_TRUE;
 	} else {
-		cstr->prev_pck_encryped = GF_FALSE;
+		cstr->prev_pck_encrypted = GF_FALSE;
 	}
 
 	//rewrite ISMA header
@@ -1072,7 +1447,7 @@
 
 	data = gf_filter_pck_get_data(pck, &size);
 	if (!data) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISMACrypt] No data associated with packet\n" ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] No data associated with packet\n" ));
 		return GF_OK;
 	}
 	padding_bytes = 0;
@@ -1082,29 +1457,30 @@
 		len += padding_bytes;
 	}
 	dst_pck = gf_filter_pck_new_alloc(cstr->opid, len + adobe_hdr_size, &output);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 	memcpy(output+adobe_hdr_size, data, sizeof(char)*size);
 	gf_filter_pck_merge_properties(pck, dst_pck);
 
 
 	if (is_encrypted) {
-		if (!cstr->prev_pck_encryped) {
-			memcpy(IV, cstr->tci->first_IV, sizeof(char)*16);
-			e = gf_crypt_init(cstr->crypt, cstr->key, IV);
-			cstr->prev_pck_encryped = GF_TRUE;
+		if (!cstr->prev_pck_encrypted) {
+			memcpy(IV, cstr->tci->keys[0].IV, sizeof(char)*16);
+			e = gf_crypt_init(cstr->keys[0].crypt, cstr->keys[0].key, IV);
+			cstr->prev_pck_encrypted = GF_TRUE;
 		} else {
 			cstr->isma_IV_size = 16;
-			e = gf_crypt_get_IV(cstr->crypt, IV, &cstr->isma_IV_size);
+			e = gf_crypt_get_IV(cstr->keys[0].crypt, IV, &cstr->isma_IV_size);
 		}
 
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot initialize AES-128 CBC (%s)\n", gf_error_to_string(e)) );
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ADOBE] Cannot initialize AES-128 CBC (%s)\n", gf_error_to_string(e)) );
 			gf_filter_pck_discard(dst_pck);
 			return GF_IO_ERR;
 		}
 
 		memset(output+adobe_hdr_size+size, padding_bytes, sizeof(char)*padding_bytes);
 
-		gf_crypt_encrypt(cstr->crypt, output+adobe_hdr_size, len);
+		gf_crypt_encrypt(cstr->keys[0].crypt, output+adobe_hdr_size, len);
 
 		/*write encrypted AU header*/
 		output[0] = 0x10;
@@ -1144,13 +1520,13 @@
 	gf_crypt_get_IV(mc, (u8 *) next_IV, &size);
 	/*
 		NOTE 1: the next_IV returned by get_state has 17 bytes, the first byte being the current counter position in the following 16 bytes.
-		If this index is 0, this means that we are at the begining of a new block and we can use it as IV for next sample,
-		otherwise we must discard unsued bytes in the counter (next sample shall begin with counter at 0)
+		If this index is 0, this means that we are at the beginning of a new block and we can use it as IV for next sample,
+		otherwise we must discard unused bytes in the counter (next sample shall begin with counter at 0)
 		if less than 16 blocks were cyphered, we must force increasing the next IV for next sample, not doing so would produce the same IV for the next bytes cyphered,
 		which is forbidden by CENC (unique IV per sample). In GPAC, we ALWAYS force counter increase
 
 		NOTE 2: in case where IV_size is 8, because the cypher block is treated as 16 bytes while processing,
-		we need to increment manually the 8-bytes IV (bytes 0 to 7) for the next sample, otherwise we would likely the same IV (eg unless we had cyphered 16 * 2^64 - 1
+		we need to increment manually the 8-bytes IV (bytes 0 to 7) for the next sample, otherwise we would likely use the same IV (eg unless we had cyphered 16 * 2^64 - 1
 		bytes in the last sample , quite unlikely !)
 
 		NOTE 3: Bytes 8 to 15 are set to 0 when forcing a new IV for 8-bytes IVs.
@@ -1181,12 +1557,13 @@
 static u32 cenc_get_clear_bytes(GF_CENCStream *cstr, GF_BitStream *plaintext_bs, char *samp_data, u32 nal_size, u32 bytes_in_nalhr)
 {
 	u32 clear_bytes = 0;
+
 	if (cstr->slice_header_clear) {
 		u32 nal_start = (u32) gf_bs_get_position(plaintext_bs);
 		if (cstr->cenc_codec==CENC_AVC) {
 			u32 ntype;
-			gf_media_avc_parse_nalu(plaintext_bs, &cstr->avc);
-			ntype = cstr->avc.last_nal_type_parsed;
+			gf_avc_parse_nalu(plaintext_bs, cstr->avc_state);
+			ntype = cstr->avc_state->last_nal_type_parsed;
 			switch (ntype) {
 			case GF_AVC_NALU_NON_IDR_SLICE:
 			case GF_AVC_NALU_DP_A_SLICE:
@@ -1202,17 +1579,34 @@
 				clear_bytes = nal_size;
 				break;
 			}
-		} else {
+			if (cstr->is_saes) {
+				if ((ntype == GF_AVC_NALU_NON_IDR_SLICE) || (ntype == GF_AVC_NALU_IDR_SLICE)) {
+					clear_bytes = 32;
+				} else {
+					clear_bytes = nal_size;
+				}
+			}
+
+		} else if (cstr->cenc_codec==CENC_HEVC) {
 #if !defined(GPAC_DISABLE_HEVC)
 			u8 ntype, ntid, nlid;
-			cstr->hevc.full_slice_header_parse = GF_TRUE;
-			gf_media_hevc_parse_nalu (samp_data + nal_start, nal_size, &cstr->hevc, &ntype, &ntid, &nlid);
+			cstr->hevc_state->full_slice_header_parse = GF_TRUE;
+			gf_hevc_parse_nalu(samp_data + nal_start, nal_size, cstr->hevc_state, &ntype, &ntid, &nlid);
 			if (ntype<=GF_HEVC_NALU_SLICE_CRA) {
-				clear_bytes = cstr->hevc.s_info.payload_start_offset;
+				clear_bytes = cstr->hevc_state->s_info.payload_start_offset;
 			} else {
 				clear_bytes = nal_size;
 			}
 #endif
+		} else if (cstr->cenc_codec==CENC_VVC) {
+			u8 ntype, ntid, nlid;
+			cstr->vvc_state->parse_mode = 1;
+			gf_vvc_parse_nalu(samp_data + nal_start, nal_size, cstr->vvc_state, &ntype, &ntid, &nlid);
+			if (ntype <= GF_VVC_NALU_SLICE_GDR) {
+				clear_bytes = cstr->vvc_state->s_info.payload_start_offset;
+			} else {
+				clear_bytes = nal_size;
+			}
 		}
 		gf_bs_seek(plaintext_bs, nal_start);
 	} else {
@@ -1228,29 +1622,50 @@
 	GF_BitStream *sai_bs;
 	u32 prev_entry_bytes_clear=0;
 	u32 prev_entry_bytes_crypt=0;
+	u32 prev_entry_mkey_idx=0;
 	u32 pck_size;
 	GF_FilterPacket *dst_pck;
 	const u8 *data;
 	u8 *output;
-	u32 sai_size = cstr->tci->IV_size;
-	u32 nb_subsamples=0;
-
-	//in cbcs scheme, if Per_Sample_IV_size is not 0 (no constant IV), fetch current IV
-	if (!cstr->ctr_mode && cstr->tci->IV_size) {
-		u32 IV_size = 16;
-		gf_crypt_get_IV(cstr->crypt, cstr->IV, &IV_size);
+	u32 sai_size;
+	u32 i, nb_iv_init=0, nb_keys, nb_subsamples_bits, sai_size_sub, nb_subsamples=0;
+	u32 key_idx = 0;
+	u32 subsample_idx = 0;
+	u32 nb_subs_crypted = 0;
+	u32 nb_sub_offset;
+	Bool multi_key;
+
+	if (cstr->multi_key) {
+		nb_keys = cstr->tci->nb_keys;
+		multi_key = GF_TRUE;
+		nb_subsamples_bits = 32;
+		sai_size_sub = 8;
+	} else {
+		nb_keys = 1;
+		multi_key = GF_FALSE;
+		nb_subsamples_bits = 16;
+		sai_size_sub = 6;
+	}
+	for (i=0; i<nb_keys; i++) {
+		if (cstr->tci->keys[i].IV_size) {
+			//in cbcs scheme, if Per_Sample_IV_size is not 0 (no constant IV), fetch current IV
+			if (!cstr->ctr_mode) {
+				u32 IV_size = 16;
+				gf_crypt_get_IV(cstr->keys[i].crypt, cstr->keys[i].IV, &IV_size);
+			}
+			nb_iv_init++;
+		}
 	}
-
 
 	data = gf_filter_pck_get_data(pck, &pck_size);
 
-	//CENC can use inplace processing for decryption
-	dst_pck = gf_filter_pck_new_clone(cstr->opid, pck, &output);
-	if (!dst_pck) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Failed to allocated/clone packet for encrypting payload\n" ) );
-		gf_filter_pid_drop_packet(cstr->ipid);
-		return GF_SERVICE_ERROR;
+	//CENC can use inplace processing for decryption, SAES cannot
+	if (!cstr->is_saes) {
+		dst_pck = gf_filter_pck_new_clone(cstr->opid, pck, &output);
+	} else {
+		dst_pck = gf_filter_pck_new_copy(cstr->opid, pck, &output);
 	}
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	gf_filter_pck_merge_properties(pck, dst_pck);
 	gf_filter_pck_set_crypt_flags(dst_pck, GF_FILTER_PCK_CRYPT);
@@ -1260,22 +1675,34 @@
 
 	sai_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
-	gf_bs_write_data(sai_bs, cstr->IV, cstr->tci->IV_size);
+	if (multi_key) {
+		gf_bs_write_u16(sai_bs, nb_iv_init);
+		for (i=0; i<nb_keys; i++) {
+			//for now we use all our keys in one sample
+			if (cstr->tci->keys[i].IV_size) {
+				gf_bs_write_u16(sai_bs, i+1);
+				gf_bs_write_data(sai_bs, cstr->keys[i].IV, cstr->tci->keys[i].IV_size);
+			}
+		}
+		nb_subsamples_bits = 32;
+	} else {
+		gf_bs_write_data(sai_bs, cstr->keys[0].IV, cstr->tci->keys[0].IV_size);
+	}
+	sai_size = nb_sub_offset = (u32) gf_bs_get_position(sai_bs);
 
 	while (gf_bs_available(ctx->bs_r)) {
 		GF_Err e=GF_OK;
 
 		if (cstr->use_subsamples) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-			ObuType obut;
+			ObuType obut = 0;
 			u32 num_frames_in_superframe = 0, superframe_index_size = 0;
 			u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME];
 			struct {
 				int clear, encrypted;
 			} ranges[AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS];
-			u64 obu_size;
-			u32 hdr_size;
-			u32 i;
+			u64 obu_size = 0;
+			u32 hdr_size = 0;
 #else
 			struct {
 				int clear, encrypted;
@@ -1292,6 +1719,7 @@
 			switch (cstr->cenc_codec) {
 			case CENC_AVC:
 			case CENC_HEVC:
+			case CENC_VVC:
 				nalu_size = gf_bs_read_int(ctx->bs_r, 8*cstr->nalu_size_length);
 				if (nalu_size == 0) {
 					continue;
@@ -1301,9 +1729,9 @@
 
 			case CENC_AV1:
 				pos = gf_bs_get_position(ctx->bs_r);
-				e = gf_media_aom_av1_parse_obu(ctx->bs_r, &obut, &obu_size, &hdr_size, &cstr->av1);
+				e = gf_av1_parse_obu(ctx->bs_r, &obut, &obu_size, &hdr_size, cstr->av1_state);
 				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Failed to parse OBU\n" ));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Failed to parse OBU\n" ));
 					return e;
 				}
 				gf_bs_seek(ctx->bs_r, pos);
@@ -1313,16 +1741,16 @@
 				//we only encrypt frame and tile group
 				case OBU_FRAME:
 				case OBU_TILE_GROUP:
-					if (!cstr->av1.frame_state.nb_tiles_in_obu) {
+					if (!cstr->av1_state->frame_state.nb_tiles_in_obu) {
 						clear_bytes = (u32) obu_size;
 					} else {
-						nb_ranges = cstr->av1.frame_state.nb_tiles_in_obu;
+						nb_ranges = cstr->av1_state->frame_state.nb_tiles_in_obu;
 
-						ranges[0].clear = cstr->av1.frame_state.tiles[0].obu_start_offset;
-						ranges[0].encrypted = cstr->av1.frame_state.tiles[0].size;
+						ranges[0].clear = cstr->av1_state->frame_state.tiles[0].obu_start_offset;
+						ranges[0].encrypted = cstr->av1_state->frame_state.tiles[0].size;
 						for (i = 1; i < nb_ranges; ++i) {
-							ranges[i].clear = cstr->av1.frame_state.tiles[i].obu_start_offset - (cstr->av1.frame_state.tiles[i - 1].obu_start_offset + cstr->av1.frame_state.tiles[i - 1].size);
-							ranges[i].encrypted = cstr->av1.frame_state.tiles[i].size;
+							ranges[i].clear = cstr->av1_state->frame_state.tiles[i].obu_start_offset - (cstr->av1_state->frame_state.tiles[i - 1].obu_start_offset + cstr->av1_state->frame_state.tiles[i - 1].size);
+							ranges[i].encrypted = cstr->av1_state->frame_state.tiles[i].size;
 						}
 						clear_bytes = ranges[0].clear;
 						nalu_size = clear_bytes + ranges[0].encrypted;
@@ -1333,14 +1761,17 @@
 						If previous range had encrypted bytes, create a new one, otherwise merge in prev
 						*/
 						if (prev_entry_bytes_crypt) {
-							if (!nb_subsamples) gf_bs_write_u16(sai_bs, 0);
+							if (!nb_subsamples) gf_bs_write_int(sai_bs, 0, nb_subsamples_bits);
 							nb_subsamples++;
+							if (multi_key)
+								gf_bs_write_u16(sai_bs, prev_entry_bytes_crypt ? (prev_entry_mkey_idx+1) : 0);
 							gf_bs_write_u16(sai_bs, prev_entry_bytes_clear);
 							gf_bs_write_u32(sai_bs, prev_entry_bytes_crypt);
-							sai_size+=6;
+							sai_size += sai_size_sub;
 
 							prev_entry_bytes_crypt = 0;
 							prev_entry_bytes_clear = 0;
+							prev_entry_mkey_idx = 0;
 						}
 					}
 					break;
@@ -1351,13 +1782,13 @@
 				break;
 			case CENC_VPX:
 				if (cstr->tci->block_align != 2) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] VP9 mandates that blockAlign=\"always\". Forcing value.\n"));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC] VP9 mandates that blockAlign=\"always\". Forcing value.\n"));
 					cstr->tci->block_align = 2;
 				}
 
 				pos = gf_bs_get_position(ctx->bs_r);
-				e = gf_media_vp9_parse_superframe(ctx->bs_r, pck_size, &num_frames_in_superframe, frame_sizes, &superframe_index_size);
-				if (e || !num_frames_in_superframe) return e;
+				e = gf_vp9_parse_superframe(ctx->bs_r, pck_size, &num_frames_in_superframe, frame_sizes, &superframe_index_size);
+				if (e) return e;
 				gf_bs_seek(ctx->bs_r, pos);
 
 				nb_ranges = num_frames_in_superframe;
@@ -1365,12 +1796,10 @@
 				for (i = 0; i < num_frames_in_superframe; ++i) {
 					Bool key_frame;
 					u32 width = 0, height = 0, renderWidth = 0, renderHeight = 0;
-					GF_VPConfig *vp9_cfg = gf_odf_vp_cfg_new();
 					u64 pos2 = gf_bs_get_position(ctx->bs_r);
-					e = gf_media_vp9_parse_sample(ctx->bs_r, vp9_cfg, &key_frame, &width, &height, &renderWidth, &renderHeight);
-					gf_odf_vp_cfg_del(vp9_cfg);
+					e = gf_vp9_parse_sample(ctx->bs_r, cstr->vp9_cfg, &key_frame, &width, &height, &renderWidth, &renderHeight);
 					if (e) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[CENC] Error parsing VP9 frame at DTS "LLU"\n", gf_filter_pck_get_dts(pck) ));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC] Error parsing VP9 frame at DTS "LLU"\n", gf_filter_pck_get_dts(pck) ));
 						return e;
 					}
 
@@ -1380,7 +1809,7 @@
 					gf_bs_seek(ctx->bs_r, pos2 + frame_sizes[i]);
 				}
 				if (gf_bs_get_position(ctx->bs_r) + superframe_index_size != pos + pck_size) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[CENC] Inconsistent VP9 size %u (parsed "LLU") at DTS "LLU". Re-import raw VP9/IVF for more details.\n",
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC] Inconsistent VP9 size %u (parsed "LLU") at DTS "LLU". Re-import raw VP9/IVF for more details.\n",
 						pck_size, gf_bs_get_position(ctx->bs_r) + superframe_index_size - pos, gf_filter_pck_get_dts(pck)));
 				}
 				gf_bs_seek(ctx->bs_r, pos);
@@ -1400,26 +1829,74 @@
 				if (frame_sizes[0] - clear_bytes >= 16) {
 					//A subsample SHALL be created for each tile >= 16 bytes. If previous range had encrypted bytes, create a new one, otherwise merge in prev
 					if (prev_entry_bytes_crypt) {
-						if (!nb_subsamples) gf_bs_write_u16(sai_bs, 0);
+						if (!nb_subsamples) gf_bs_write_int(sai_bs, 0, nb_subsamples_bits);
 						nb_subsamples++;
+						if (multi_key)
+							gf_bs_write_u16(sai_bs, prev_entry_bytes_crypt ? (prev_entry_mkey_idx+1) : 0);
 						gf_bs_write_u16(sai_bs, prev_entry_bytes_clear);
 						gf_bs_write_u32(sai_bs, prev_entry_bytes_crypt);
-						sai_size+=6;
+						sai_size += sai_size_sub;
 
 						prev_entry_bytes_crypt = 0;
 						prev_entry_bytes_clear = 0;
+						prev_entry_mkey_idx = 0;
 					}
 				} else {
 					clear_bytes = nalu_size;
 				}
 				break;
 			default:
-				assert(0);
+				//used by cbcs
+				clear_bytes = 0;
+				break;
 			}
 #else
 			clear_bytes = nalu_size;
 #endif
 
+			//VCL subsample, check out settings to decide if we leave it in the clear
+			if ((nalu_size > clear_bytes) &&
+				(cstr->tci->subs_crypt || cstr->tci->subs_rand || cstr->multi_key)
+			) {
+				Bool do_crypt = GF_TRUE;
+
+				if (cstr->mkey_indices.nb_items) {
+					if (subsample_idx>=cstr->mkey_indices.nb_items)
+						do_crypt = GF_FALSE;
+					else {
+						key_idx = cstr->mkey_indices.vals[subsample_idx];
+						if (!key_idx || (key_idx>cstr->nb_keys))
+							do_crypt = GF_FALSE;
+						else
+							key_idx-=1;
+					}
+				}
+				subsample_idx++;
+				if (do_crypt && cstr->tci->subs_crypt) {
+					char szSub[20], *sep;
+					sprintf(szSub, "%d", subsample_idx);
+					sep = strstr(cstr->tci->subs_crypt, szSub);
+					if (sep) {
+						u32 len = (u32) strlen(szSub);
+						if ((sep[len]!=',') && sep[len])
+							do_crypt = GF_FALSE;
+					} else {
+						do_crypt = GF_FALSE;
+					}
+				}
+				if (do_crypt && cstr->tci->subs_rand) {
+					u32 rndm = gf_rand() % cstr->tci->subs_rand;
+					if (rndm)
+						do_crypt = GF_FALSE;
+				}
+
+				if (!do_crypt) {
+					clear_bytes = nalu_size;
+				} else {
+					nb_subs_crypted++;
+				}
+			}
+			
 			while (nb_ranges) {
 				if (cstr->ctr_mode) {
 
@@ -1450,7 +1927,9 @@
 				} else {
 					//in cbcs, we don't adjust bytes_encrypted_data to be a multiple of 16 bytes and leave the last block unencrypted
 					//except in VPX, where BytesOfProtectedData SHALL end on the last byte of the decode_tile structure
-					if ((cstr->cenc_codec != CENC_VPX) && (cstr->tci->scheme_type == GF_CRYPT_TYPE_CBCS)) {
+					if ((cstr->cenc_codec != CENC_VPX)
+						&& ((cstr->tci->scheme_type == GF_CRYPT_TYPE_CBCS) || cstr->is_saes)
+					) {
 						u32 ret = (nalu_size - clear_bytes) % 16;
 						clear_bytes_at_end = ret;
 					}
@@ -1475,8 +1954,8 @@
 					gf_bs_skip_bytes(ctx->bs_r, nalu_size - clear_bytes);
 
 					//cbcs scheme with constant IV, reinit at each sub sample,
-					if (!cstr->ctr_mode && !cstr->tci->IV_size)
-						gf_crypt_set_IV(cstr->crypt, cstr->IV, 16);
+					if (!cstr->ctr_mode && !cstr->tci->keys[key_idx].IV_size)
+						gf_crypt_set_IV(cstr->keys[key_idx].crypt, cstr->keys[key_idx].IV, 16);
 
 					//pattern encryption
 					if (cstr->tci->crypt_byte_block && cstr->tci->skip_byte_block) {
@@ -1485,7 +1964,7 @@
 						assert((res % 16) == 0);
 
 						while (res) {
-							e = gf_crypt_encrypt(cstr->crypt, output+pos, res >= (u32) (16*cstr->tci->crypt_byte_block) ? 16*cstr->tci->crypt_byte_block : res);
+							e = gf_crypt_encrypt(cstr->keys[key_idx].crypt, output+pos, res >= (u32) (16*cstr->tci->crypt_byte_block) ? 16*cstr->tci->crypt_byte_block : res);
 							if (res >= (u32) (16 * (cstr->tci->crypt_byte_block + cstr->tci->skip_byte_block))) {
 								pos += 16 * (cstr->tci->crypt_byte_block + cstr->tci->skip_byte_block);
 								res -= 16 * (cstr->tci->crypt_byte_block + cstr->tci->skip_byte_block);
@@ -1496,7 +1975,9 @@
 					}
 					//full subsample encryption
 					else {
-						e = gf_crypt_encrypt(cstr->crypt, output+cur_pos, nalu_size - clear_bytes);
+						//clear_bytes_at_end is 0 unless NALU-based cbcs without pattern (not defined in CENC)
+						//in this case, we must only encrypt a multiple of 16-byte blocks
+						e = gf_crypt_encrypt(cstr->keys[key_idx].crypt, output+cur_pos, nalu_size - clear_bytes - clear_bytes_at_end);
 					}
 				}
 
@@ -1505,26 +1986,51 @@
 				if (!prev_entry_bytes_crypt) {
 					prev_entry_bytes_clear += cstr->nalu_size_length + clear_bytes;
 					prev_entry_bytes_crypt += nalu_size - clear_bytes;
+					if (prev_entry_bytes_crypt)
+						prev_entry_mkey_idx = key_idx;
 				} else {
 					//store current
-					if (!nb_subsamples) gf_bs_write_u16(sai_bs, 0);
+					if (!nb_subsamples) gf_bs_write_int(sai_bs, 0, nb_subsamples_bits);
 					nb_subsamples++;
+					if (multi_key)
+						gf_bs_write_u16(sai_bs, prev_entry_bytes_crypt ? (prev_entry_mkey_idx+1) : 0);
 					gf_bs_write_u16(sai_bs, prev_entry_bytes_clear);
 					gf_bs_write_u32(sai_bs, prev_entry_bytes_crypt);
-					sai_size+=6;
+					sai_size += sai_size_sub;
 
 					prev_entry_bytes_clear = cstr->nalu_size_length + clear_bytes;
 					prev_entry_bytes_crypt = nalu_size - clear_bytes;
+					prev_entry_mkey_idx = key_idx;
+				}
+
+				//subsample was a possible encryption target, apply key roll
+				if (multi_key && prev_entry_bytes_crypt && !cstr->mkey_indices.nb_items) {
+					Bool change_key = GF_FALSE;
+					if (!cstr->tci->mkey_roll_plus_one) {
+						change_key = GF_TRUE;
+					} else if (cstr->tci->mkey_roll_plus_one>1) {
+						if (nb_subs_crypted + 1 == cstr->tci->mkey_roll_plus_one) {
+							change_key = GF_TRUE;
+							nb_subs_crypted = 0;
+						}
+					}
+					if (change_key) {
+						key_idx++;
+						if (key_idx==cstr->nb_keys)
+							key_idx = 0;
+					}
 				}
 
 				//check bytes of clear is not larger than 16bits
 				while (prev_entry_bytes_clear > 0xFFFF) {
 					//store current
-					if (!nb_subsamples) gf_bs_write_u16(sai_bs, 0);
+					if (!nb_subsamples) gf_bs_write_int(sai_bs, 0, nb_subsamples_bits);
 					nb_subsamples++;
+					if (multi_key)
+						gf_bs_write_u16(sai_bs, 0);
 					gf_bs_write_u16(sai_bs, 0xFFFF);
 					gf_bs_write_u32(sai_bs, 0);
-					sai_size+=6;
+					sai_size += sai_size_sub;
 
 					prev_entry_bytes_clear -= 0xFFFF;
 				}
@@ -1535,7 +2041,7 @@
 
 				range_idx++;
 				if (range_idx >= AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] More ranges than tiles allowed spec, bitstream error ?\n"));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] More ranges than tiles allowed spec, bitstream error ?\n"));
 					return GF_BAD_PARAM;
 				}
 				switch (cstr->cenc_codec) {
@@ -1553,24 +2059,32 @@
 					}
 					break;
 				default:
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Unexpected subrange for sample format, only allowed for VPX and AV1\n"));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Unexpected subrange for sample format, only allowed for VPX and AV1\n"));
 					return GF_BAD_PARAM;
 				}
 			}
-		} else if (cstr->ctr_mode) {
+		}
+		//the other cases are NOT multi-key
+		//CTR full sample
+		else if (cstr->ctr_mode) {
 			gf_bs_skip_bytes(ctx->bs_r, pck_size);
-			e = gf_crypt_encrypt(cstr->crypt, output, pck_size);
-		} else {
-			u32 clear_trailing;
+			e = gf_crypt_encrypt(cstr->keys[0].crypt, output, pck_size);
+		}
+		//CBC full sample with padding
+		else {
+			u32 clear_trailing, clear_header=0;
+			//clear SAES header is 16 bytes for all audio codecs (AAC and AC3)
+			if (cstr->is_saes)
+				clear_header = 16;
 
-			clear_trailing = pck_size % 16;
+			clear_trailing = (pck_size-clear_header) % 16;
 
 			//cbcs scheme with constant IV, reinit at each sample,
-			if (!cstr->tci->IV_size)
-				gf_crypt_set_IV(cstr->crypt, cstr->IV, 16);
+			if (!cstr->tci->keys[0].IV_size)
+				gf_crypt_set_IV(cstr->keys[0].crypt, cstr->keys[0].IV, 16);
 
 			if (pck_size >= 16) {
-				gf_crypt_encrypt(cstr->crypt, output, pck_size - clear_trailing);
+				gf_crypt_encrypt(cstr->keys[0].crypt, output+clear_header, pck_size - clear_header - clear_trailing);
 			}
 			gf_bs_skip_bytes(ctx->bs_r, pck_size);
 		}
@@ -1582,21 +2096,28 @@
 	}
 	
 	if (prev_entry_bytes_clear || prev_entry_bytes_crypt) {
-		if (!nb_subsamples) gf_bs_write_u16(sai_bs, 0);
+		if (!nb_subsamples) gf_bs_write_int(sai_bs, 0, nb_subsamples_bits);
 		nb_subsamples++;
+		if (multi_key)
+			gf_bs_write_u16(sai_bs, prev_entry_bytes_crypt ? (prev_entry_mkey_idx+1) : 0);
 		gf_bs_write_u16(sai_bs, prev_entry_bytes_clear);
 		gf_bs_write_u32(sai_bs, prev_entry_bytes_crypt);
-		sai_size+=6;
+		sai_size += sai_size_sub;
+	}
+	if (cstr->ctr_mode) {
+		for (i=0; i<nb_keys; i++) {
+			cenc_resync_IV(cstr->keys[i].crypt, cstr->keys[i].IV, cstr->tci->keys[i].IV_size);
+		}
 	}
-	if (cstr->ctr_mode)
-		cenc_resync_IV(cstr->crypt, cstr->IV, cstr->tci->IV_size);
 
 	if (sai_size) {
 		u8 *sai=NULL;
-		sai_size = (u32) gf_bs_get_position(sai_bs);
-		gf_bs_seek(sai_bs, cstr->tci->IV_size);
-		gf_bs_write_u16(sai_bs, nb_subsamples);
-		gf_bs_seek(sai_bs, sai_size);
+		if (cstr->use_subsamples) {
+			sai_size = (u32) gf_bs_get_position(sai_bs);
+			gf_bs_seek(sai_bs, nb_sub_offset);
+			gf_bs_write_int(sai_bs, nb_subsamples, nb_subsamples_bits);
+			gf_bs_seek(sai_bs, sai_size);
+		}
 		sai_size = 0;
 		gf_bs_get_content(sai_bs, &sai, &sai_size);
 
@@ -1604,6 +2125,196 @@
 	}
 	gf_bs_del(sai_bs);
 
+	if (cstr->is_saes)
+		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CENC_SAI, NULL);
+
+	if (cstr->is_saes && (cstr->cenc_codec==CENC_AVC)) {
+		u8 *nal;
+		u32 epb_add_count = 0;
+
+		gf_bs_reassign_buffer(ctx->bs_r, output, pck_size);
+		nal = output;
+		while (gf_bs_available(ctx->bs_r)) {
+			u32 nalu_size = gf_bs_read_int(ctx->bs_r, 8*cstr->nalu_size_length);
+			nal += cstr->nalu_size_length;
+			epb_add_count += gf_media_nalu_emulation_bytes_add_count(nal, nalu_size);
+			nal += nalu_size;
+			gf_bs_skip_bytes(ctx->bs_r, nalu_size);
+		}
+
+		if (epb_add_count) {
+			u32 w_pos = 0;
+			u8 *dst_nal;
+			u8 *old_output = gf_malloc(sizeof(u8) * pck_size);
+			memcpy(old_output, output, sizeof(u8) * pck_size);
+			gf_filter_pck_expand(dst_pck, epb_add_count, &output, NULL, NULL);
+			gf_bs_reassign_buffer(ctx->bs_r, old_output, pck_size);
+			gf_bs_reassign_buffer(ctx->bs_w, output, pck_size+epb_add_count);
+			dst_nal = output;
+			nal = old_output;
+
+			while (gf_bs_available(ctx->bs_r)) {
+				u32 nalu_size = gf_bs_read_int(ctx->bs_r, 8*cstr->nalu_size_length);
+				epb_add_count = gf_media_nalu_emulation_bytes_add_count(nal, nalu_size);
+				gf_bs_write_int(ctx->bs_w, nalu_size+epb_add_count, 8*cstr->nalu_size_length);
+				nal += cstr->nalu_size_length;
+				dst_nal += cstr->nalu_size_length;
+				w_pos += 4;
+
+				gf_media_nalu_add_emulation_bytes(nal, dst_nal, nalu_size);
+				nal += nalu_size;
+				dst_nal += nalu_size+epb_add_count;
+				gf_bs_skip_bytes(ctx->bs_r, nalu_size);
+				w_pos += nalu_size+epb_add_count;
+				gf_bs_seek(ctx->bs_w, w_pos);
+			}
+			gf_free(old_output);
+		}
+	}
+
+	if (cstr->pssh_template_plus_one) {
+		u32 key_idx = cstr->pssh_template_plus_one-1;
+		cstr->pssh_template_plus_one = 0;
+
+		if (cstr->pssh_templates) {
+			GF_XMLNode *pssh_tpl=NULL;
+			char szKID[33];
+			const char *cfile_name = ctx->cfile;
+			const GF_PropertyValue *prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_CRYPT_INFO);
+			if (prop) cfile_name = prop->value.string;
+			GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			u32 nb_systems=0;
+			//nb systems
+			gf_bs_write_u32(bs, 0);
+
+			szKID[0]=0;
+			for (i=0; i<16; i++) {
+				char szTmp[3];
+				sprintf(szTmp, "%02x", cstr->tci->keys[key_idx].KID[i]);
+				strcat(szKID, szTmp);
+			}
+			i=0;
+			while ((pssh_tpl = gf_list_enum(cstr->pssh_templates, &i))) {
+				u32 j=0;
+				GF_XMLNode *bs_node;
+				char szCryptKey[33];
+				u32 pssh_version=1;
+				u32 crypt_mode=GF_CBC;
+				char *key_att_backup = NULL;
+				char *kid_att_backup = NULL;
+				Bool valid=GF_TRUE;
+				GF_XMLAttribute *att, *sys_att=NULL, *key_val = NULL, *key_att = NULL, *kid_att = NULL, *iv_val=NULL;
+				while ((att = gf_list_enum(pssh_tpl->attributes, &j))) {
+					if (!stricmp(att->name, "system")) {
+						sys_att = att;
+					}
+					else if (!stricmp(att->name, "key")) {
+						key_val = att;
+					}
+					else if (!stricmp(att->name, "mode")) {
+						if (strcmp(att->value, "cbc")) crypt_mode = GF_CBC;
+						else if (strcmp(att->value, "ctr")) crypt_mode = GF_CTR;
+						else if (strcmp(att->value, "ecb")) crypt_mode = GF_ECB;
+						else {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] Unsupported mode %s, ignoring DRMInfoTemplate\n", att->value));
+							valid=GF_FALSE;
+						}
+					}
+					else if (!stricmp(att->name, "IV")) {
+						iv_val = att;
+					}
+					else if (!stricmp(att->name, "version")) {
+						pssh_version = atoi(att->value);
+					}
+				}
+				if (!valid) continue;
+
+				if (!sys_att) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] Missing systemID, ignoring DRMInfoTemplate\n"));
+					continue;
+				}
+				if (!key_val) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] Missing keyval, ignoring DRMInfoTemplate\n"));
+					continue;
+				}
+
+				j=0;
+				while ((bs_node = gf_list_enum(pssh_tpl->content, &j))) {
+					u32 k=0;
+					if (strcmp(bs_node->name, "BS")) continue;
+					while ((att = gf_list_enum(bs_node->attributes, &k))) {
+						if (stricmp(att->name, "ID128")) continue;
+						if (!stricmp(att->value, "KEY"))
+							key_att = att;
+						else if (!stricmp(att->value, "KID"))
+							kid_att = att;
+					}
+				}
+
+				if (kid_att) {
+					kid_att_backup = kid_att->value;
+					kid_att->value = szKID;
+				}
+
+				if (key_val && key_att) {
+					bin128 master_key, leaf_key;
+					key_att_backup = key_att->value;
+					gf_bin128_parse(key_val->value, master_key);
+					GF_Crypt *crypto = gf_crypt_open(GF_AES_128, crypt_mode);
+					if (iv_val) {
+						bin128 IV;
+						gf_bin128_parse(iv_val->value, IV);
+						gf_crypt_init(crypto, master_key, IV);
+					} else {
+						gf_crypt_init(crypto, master_key, NULL);
+					}
+					memcpy(leaf_key, cstr->tci->keys[key_idx].key, 16);
+					gf_crypt_encrypt(crypto, leaf_key, 16);
+					gf_crypt_close(crypto);
+
+					szCryptKey[0]=0;
+					for (j=0; j<16; j++) {
+						char szTmp[3];
+						sprintf(szTmp, "%02x", leaf_key[j]);
+						strcat(szCryptKey, szTmp);
+					}
+					key_att->value = szCryptKey;
+				}
+
+				u8 *pssh_kid=NULL;
+				u32 pssh_kid_size;
+				GF_Err e = gf_xml_parse_bit_sequence(pssh_tpl, cfile_name, &pssh_kid, &pssh_kid_size);
+				if (e) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] Failed to get binary XML for PSSH template: %s\n", gf_error_to_string(e) ));
+				} else {
+					bin128 system_ID;
+					gf_bin128_parse(sys_att->value, system_ID);
+					gf_bs_write_data(bs, system_ID, 16); //systemID
+					gf_bs_write_u32(bs, pssh_version); //version
+					if (pssh_version) {
+						gf_bs_write_u32(bs, 1); //nb KIDs
+						gf_bs_write_data(bs, (const u8 *) cstr->tci->keys[key_idx].KID, 16); //kid
+					}
+					gf_bs_write_u32(bs, pssh_kid_size);
+					gf_bs_write_data(bs, pssh_kid, pssh_kid_size);
+					nb_systems++;
+				}
+				if (pssh_kid) gf_free(pssh_kid);
+				if (key_att_backup) key_att->value = key_att_backup;
+				if (kid_att_backup) kid_att->value = kid_att_backup;
+			}
+			u32 pssh_pos = (u32) gf_bs_get_position(bs);
+			gf_bs_seek(bs, 0);
+			gf_bs_write_u32(bs, nb_systems);
+			gf_bs_seek(bs, pssh_pos);
+			u8 *pssh;
+			u32 pssh_len;
+			gf_bs_get_content(bs, &pssh, &pssh_len);
+			gf_bs_del(bs);
+			gf_filter_pck_set_property(dst_pck, GF_PROP_PID_CENC_PSSH, &PROP_DATA_NO_COPY(pssh, pssh_len) );
+		}
+	}
+
 	gf_filter_pck_send(dst_pck);
 	return GF_OK;
 }
@@ -1615,13 +2326,12 @@
 	GF_Err e;
 	Bool all_rap=GF_FALSE;
 	u32 pck_size;
-	Bool key_changed = GF_FALSE;
 	Bool force_clear = GF_FALSE;
 	u8 sap = gf_filter_pck_get_sap(pck);
 
 	data = gf_filter_pck_get_data(pck, &pck_size);
 	if (!data) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISMACrypt] No data associated with packet\n" ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISMACrypt] No data associated with packet\n" ));
 		return GF_OK;
 	}
 
@@ -1643,9 +2353,11 @@
 		break;
 	case GF_CRYPT_SELENC_CLEAR_FORCED:
 		is_encrypted = GF_FALSE;
-		force_clear = GF_TRUE;
-		if (cstr->tci->sel_enc_range && (cstr->nb_pck+1 >= cstr->tci->sel_enc_range)) {
-			cstr->tci->sel_enc_type = GF_CRYPT_SELENC_NONE;
+		if (!cstr->multi_key) {
+			force_clear = GF_TRUE;
+			if (cstr->tci->sel_enc_range && (cstr->nb_pck+1 >= cstr->tci->sel_enc_range)) {
+				cstr->tci->sel_enc_type = GF_CRYPT_SELENC_NONE;
+			}
 		}
 		break;
 	default:
@@ -1657,7 +2369,9 @@
 		u32 i, sai_size = 0;
 		Bool signal_sai = GF_FALSE;
 		GF_FilterPacket *dst_pck;
-		dst_pck = gf_filter_pck_new_ref(cstr->opid, NULL, 0, pck);
+		dst_pck = gf_filter_pck_new_ref(cstr->opid, 0, 0, pck);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+		
 		gf_filter_pck_merge_properties(pck, dst_pck);
 
 		if (force_clear && !cstr->tci->force_clear_stsd_idx)
@@ -1676,7 +2390,7 @@
 				bin128 NULL_IV;
 				memset(NULL_IV, 0, 16);
 				memcpy(NULL_IV, (char *) &cstr->nb_pck, 4);
-				gf_bs_write_data(bs, NULL_IV, cstr->tci->IV_size);
+				gf_bs_write_data(bs, NULL_IV, cstr->tci->keys[0].IV_size);
 			}
 			gf_bs_write_u16(bs, subsample_count);
 			olen = pck_size;
@@ -1700,61 +2414,113 @@
 		return GF_OK;
 	}
 
-	/*generate initialization vector for the first sample in track ... */
+	cstr->pssh_template_plus_one = 0;
+
+	/*load initialization vector for the first sample in track ... */
 	if (!cstr->cenc_init) {
-		memset(cstr->IV, 0, sizeof(char)*16);
-		if (cstr->tci->IV_size == 8) {
-			memcpy(cstr->IV, cstr->tci->first_IV, sizeof(char)*8);
-			memset(cstr->IV+8, 0, sizeof(char)*8);
-		}
-		else if (cstr->tci->IV_size == 16) {
-			memcpy(cstr->IV, cstr->tci->first_IV, sizeof(char)*16);
-		}
-		else if (!cstr->tci->IV_size) {
-			if (cstr->tci->constant_IV_size == 8) {
-				memcpy(cstr->IV, cstr->tci->constant_IV, sizeof(char)*8);
-				memset(cstr->IV+8, 0, sizeof(char)*8);
+		u32 i, nb_keys = cstr->multi_key ? cstr->tci->nb_keys : 1;
+
+		for (i=0; i<nb_keys; i++) {
+			//memset IV to 0, and copy from start (0-padding at the end)
+			memset(cstr->keys[i].IV, 0, sizeof(char)*16);
+			//IV
+			if ((cstr->tci->keys[i].IV_size == 8) || (cstr->tci->keys[i].IV_size == 16)) {
+				memcpy(cstr->keys[i].IV, cstr->tci->keys[i].IV, sizeof(char) * cstr->tci->keys[i].IV_size);
 			}
-			else if (cstr->tci->constant_IV_size == 16) {
-				memcpy(cstr->IV, cstr->tci->constant_IV, sizeof(char)*16);
+			//const IV
+			else if (!cstr->tci->keys[i].IV_size) {
+				if ((cstr->tci->keys[i].constant_IV_size == 8) || (cstr->tci->keys[i].constant_IV_size == 16)) {
+					memcpy(cstr->keys[i].IV, cstr->tci->keys[i].IV, sizeof(char) * cstr->tci->keys[i].constant_IV_size);
+				} else {
+					return GF_NOT_SUPPORTED;
+				}
 			} else {
 				return GF_NOT_SUPPORTED;
 			}
-		} else {
-			return GF_NOT_SUPPORTED;
-		}
 
-		e = gf_crypt_init(cstr->crypt, cstr->key, cstr->IV);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 %s (%s)\n", cstr->ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
-			return GF_IO_ERR;
+			e = gf_crypt_init(cstr->keys[i].crypt, cstr->keys[i].key, cstr->keys[i].IV);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Cannot initialize AES-128 %s (%s)\n", cstr->ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
+				return GF_IO_ERR;
+			}
+
+			cstr->pssh_template_plus_one = 1;
 		}
 		cstr->cenc_init = GF_TRUE;
-	} else {
+	} else if (!cstr->multi_key) {
+		u32 new_idx = cstr->kidx;
+		u32 nb_keys = cstr->tci->rand_keys ? 2 : cstr->tci->nb_keys;
+		Bool key_changed = GF_FALSE;
+
 		if (cstr->tci->keyRoll) {
-			u32 new_idx = (cstr->nb_pck_encrypted / cstr->tci->keyRoll) % cstr->tci->KID_count;
-			if (cstr->kidx != new_idx) {
-				cstr->kidx = new_idx;
-				memcpy(cstr->key, cstr->tci->keys[cstr->kidx], 16);
-				key_changed = GF_TRUE;
-				e = gf_crypt_set_key(cstr->crypt, cstr->key);
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", cstr->ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
-					return e;
+			if (cstr->tci->roll_type == GF_KEYROLL_SAMPLES) {
+				new_idx = (cstr->nb_pck_encrypted / cstr->tci->keyRoll) % nb_keys;
+			} else if (cstr->tci->roll_type == GF_KEYROLL_SEGMENTS) {
+				const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+				if (!p) {
+					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_CUE_START);
+					if (p && !p->value.boolean) p=NULL;
+				}
+				if (p) {
+					cstr->nb_segments++;
+					new_idx = (cstr->nb_segments / cstr->tci->keyRoll) % nb_keys;
+				}
+			} else if (cstr->tci->roll_type == GF_KEYROLL_PERIODS) {
+				const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PID_DASH_PERIOD_START);
+				if (p) {
+					cstr->nb_periods++;
+					new_idx = (cstr->nb_periods / cstr->tci->keyRoll) % nb_keys;
+				}
+			} else if (cstr->rap_roll) {
+				if ((sap==GF_FILTER_SAP_1) || (sap==GF_FILTER_SAP_2)) {
+					cstr->nb_saps++;
+					new_idx = (cstr->nb_saps / cstr->tci->keyRoll) % nb_keys;
 				}
 			}
 		}
-	}
+		if (cstr->kidx != new_idx) {
+			if (cstr->tci->rand_keys) {
+				new_idx = 0;
+				cenc_gen_bin128(cstr->tci->keys[0].KID);
+				cenc_gen_bin128(cstr->tci->keys[0].key);
+			}
+			cstr->kidx = new_idx;
+			memcpy(cstr->keys[0].key, cstr->tci->keys[cstr->kidx].key, 16);
+			key_changed = GF_TRUE;
+			cstr->pssh_template_plus_one = new_idx+1;
+			e = gf_crypt_set_key(cstr->keys[0].crypt, cstr->keys[0].key);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Cannot set key AES-128 %s (%s)\n", cstr->ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
+				return e;
+			}
+		}
+
+		if (key_changed) {
+			char *hls_info;
+			GF_CryptKeyInfo *ki = &cstr->tci->keys[cstr->kidx];
+			u8 key_info[40];
+			u32 key_info_size = 20;
+			key_info[0] = 0;
+			key_info[1] = 0;
+			key_info[2] = 0;
+			key_info[3] = ki->IV_size;
+			memcpy(key_info+4, ki->KID, 16);
+			if (!ki->IV_size) {
+				key_info[20] = ki->constant_IV_size;
+				memcpy(key_info+21, ki->IV, ki->constant_IV_size);
+				key_info_size += ki->constant_IV_size + 1;
+			}
+
+			gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_KEY_INFO, &PROP_DATA( key_info, key_info_size ) );
 
-	if (key_changed) {
-		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_KID, &PROP_DATA( cstr->tci->KIDs[cstr->kidx], sizeof(bin128) ) );
-		//TODO add support for multiple patterns and keys ?
-		//TODO add support for multiple IV size in key roll ?
+			hls_info = cstr->tci->keys[cstr->kidx].hls_info;
+			gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_HLS_KMS, hls_info ? &PROP_STRING(hls_info) : NULL);
+		}
 	}
 
 	e = cenc_encrypt_packet(ctx, cstr, pck);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Error encrypting packet %d in PID %s: %s\n", cstr->nb_pck, gf_filter_pid_get_name(cstr->ipid), gf_error_to_string(e)) );
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC] Error encrypting packet %d in PID %s: %s\n", cstr->nb_pck, gf_filter_pid_get_name(cstr->ipid), gf_error_to_string(e)) );
 		return e;
 	}
 
@@ -1808,7 +2574,7 @@
 		GF_Err e;
 		ctx->cinfo = gf_crypt_info_load(ctx->cfile, &e);
 		if (!ctx->cinfo) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENCCrypt] Cannot load config file %s\n", ctx->cfile ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCCrypt] Cannot load config file %s\n", ctx->cfile ));
 			return GF_BAD_PARAM;
 		}
 	}
@@ -1823,12 +2589,7 @@
 	if (ctx->cinfo) gf_crypt_info_del(ctx->cinfo);
 	while (gf_list_count(ctx->streams)) {
 		GF_CENCStream *s = gf_list_pop_back(ctx->streams);
-		if (s->crypt) gf_crypt_close(s->crypt);
-		if (s->cinfo) gf_crypt_info_del(s->cinfo);
-#ifndef GPAC_DISABLE_AV_PARSERS
-		if (s->av1.config) gf_odf_av1_cfg_del(s->av1.config);
-#endif
-		gf_free(s);
+		cenc_free_pid_context(s);
 	}
 	gf_list_del(ctx->streams);
 	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
@@ -1841,18 +2602,16 @@
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
-	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
-
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
-//	CAP_UINT(GF_CAPS_OUTPUT_STATIC_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 };
 
 #define OFFS(_n)	#_n, offsetof(GF_CENCEncCtx, _n)
 static const GF_FilterArgs GF_CENCEncArgs[] =
 {
-	{ OFFS(cfile), "crypt file location - see filter help", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(allc), "throw error if no DRM config file is found for a PID - see filter help", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(cfile), "crypt file location", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(allc), "throw error if no DRM config file is found for a PID", GF_PROP_BOOL, NULL, NULL, 0},
 	{0}
 };
 
@@ -1862,7 +2621,8 @@
 	GF_FS_SET_HELP("The CENC encryptor supports CENC, ISMA and Adobe encryption. It uses a DRM config file for declaring keys.\n"
 	"The syntax is available at https://wiki.gpac.io/Common-Encryption\n"
 	"The DRM config file can be set per PID using the property `CryptInfo`, or set at the filter level using [-cfile]().\n"
-	"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.\n"
+	"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).\n"
+	"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.\n"
 	"If no DRM config file is defined for a given PID, this PID will not be encrypted, or an error will be thrown if [-allc]() is specified.\n"
 	)
 	.private_size = sizeof(GF_CENCEncCtx),

gpac-1.0.1.tar.gz/src/filters/ff_avf.c -> gpac-2.0.0.tar.gz/src/filters/ff_avf.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom Paris 2019
+ *			Copyright (c) Telecom Paris 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ffmpeg avfilter filter
@@ -46,6 +46,7 @@
 	AVFilterContext *io_filter_ctx;
 	GF_FilterPid *io_pid;
 	u32 timescale, pfmt, width, height, sr, nb_ch, bps;
+	Bool planar;
 	u64 ch_layout;
 	GF_Fraction sar;
 	u32 stride, stride_uv, nb_planes;
@@ -66,16 +67,13 @@
 	GF_List *ipids;
 	GF_List *opids;
 
-	//decode options
-	AVDictionary *options;
-
 	AVFilterGraph *filter_graph;
 	char *filter_desc;
 
 	GF_FilterCapability filter_caps[7];
 	//0: not loaded, 1: graph config requested but graph not loaded, 2: graph loaded
 	u32 configure_state;
-	u32 nb_v_out, nb_a_out;
+	u32 nb_v_out, nb_a_out, nb_inputs;
 
 	AVFilterInOut *outputs;
 	AVFrame *frame;
@@ -172,12 +170,12 @@
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_WIDTH, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_HEIGHT, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_PIXFMT, NULL);
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_FPS, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_STRIDE, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_STRIDE_UV, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_SAR, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_MX, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_RANGE, NULL);
-				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_SPACE, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_TRANSFER, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_PRIMARIES, NULL);
 			}
@@ -286,6 +284,7 @@
 	ctx->opids = gf_list_new();
 	ctx->frame = av_frame_alloc();
 
+	ffmpeg_setup_logs(GF_LOG_MEDIA);
 
 	ctx->filter_graph = avfilter_graph_alloc();
 	ret = avfilter_graph_parse2(ctx->filter_graph, ctx->filter_desc, &inputs, &outputs);
@@ -294,19 +293,20 @@
 		return GF_BAD_PARAM;
 	}
 
+	ctx->nb_inputs=0;
 	io = inputs;
 	while (io) {
 		if (io->filter_ctx->filter->flags & AVFILTER_FLAG_DYNAMIC_INPUTS)
 			dyn_inputs = GF_TRUE;
-		for (i=0; i<io->filter_ctx->nb_inputs; i++) {
-			enum AVMediaType mt = avfilter_pad_get_type(io->filter_ctx->input_pads, i);
-			u32 streamtype = ffmpeg_stream_type_to_gpac(mt);
 
-			switch (streamtype) {
-			case GF_STREAM_VISUAL: nb_v_in++; break;
-			case GF_STREAM_AUDIO: nb_a_in++; break;
-			}
+		enum AVMediaType mt = avfilter_pad_get_type(io->filter_ctx->input_pads, io->pad_idx);
+		u32 streamtype = ffmpeg_stream_type_to_gpac(mt);
+
+		switch (streamtype) {
+		case GF_STREAM_VISUAL: nb_v_in++; break;
+		case GF_STREAM_AUDIO: nb_a_in++; break;
 		}
+		ctx->nb_inputs++;
 		io = io->next;
 	}
 
@@ -461,6 +461,10 @@
 
 	//graph needs to be loaded
 	if (ctx->configure_state==1) {
+		if (gf_filter_connections_pending(filter))
+			return GF_OK;
+		if (ctx->nb_inputs > gf_list_count(ctx->ipids))
+			return GF_OK;
 		return ffavf_setup_filter(filter, ctx);
 	}
 
@@ -545,6 +549,12 @@
 				ctx->frame->sample_rate = ipid->sr;
 				ctx->frame->format = ipid->pfmt;
 				ctx->frame->nb_samples = data_size / ipid->nb_ch / ipid->bps;
+				if (ipid->planar) {
+					u32 ch_idx;
+					for (ch_idx=0; ch_idx<ipid->nb_ch; ch_idx++) {
+						ctx->frame->extended_data[ch_idx] = (uint8_t *) data + ctx->frame->nb_samples*ipid->bps*ch_idx;
+					}
+				}
 			}
 			/* push the decoded frame into the filtergraph */
 			ret = av_buffersrc_add_frame_flags(ipid->io_filter_ctx, ctx->frame, 0);
@@ -606,7 +616,12 @@
 			if (update_props) {
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_WIDTH, &PROP_UINT(frame->width));
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_HEIGHT, &PROP_UINT(frame->height));
-				opid->gf_pfmt = ffmpeg_pixfmt_to_gpac(frame->format);
+				opid->gf_pfmt = ffmpeg_pixfmt_to_gpac(frame->format, GF_FALSE);
+				if (ffmpeg_pixfmt_is_fullrange(frame->format)) {
+					gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(GF_TRUE));
+				} else {
+					gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_RANGE, NULL);
+				}
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_PIXFMT, &PROP_UINT(opid->gf_pfmt));
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_STRIDE, &PROP_UINT(frame->linesize[0]));
 				if (frame->linesize[1])
@@ -615,6 +630,7 @@
 					gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_STRIDE_UV, NULL);
 
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(opid->io_filter_ctx->inputs[0]->time_base.den) );
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_FPS, &PROP_FRAC_INT(opid->io_filter_ctx->inputs[0]->time_base.den, opid->io_filter_ctx->inputs[0]->time_base.num) );
 
 				opid->width = frame->width;
 				opid->height = frame->height;
@@ -638,7 +654,7 @@
 			if (!pck) return GF_OUT_OF_MEM;
 
 			for (j=0; j<opid->height; j++) {
-				memcpy(buffer + j*opid->stride, frame->data[0] + j*frame->linesize[0], opid->stride);
+				memcpy(buffer + j*opid->stride, frame->data[0] + j*frame->linesize[0], opid->width);
 			}
 			if (frame->linesize[1]) {
 				buffer += opid->height*opid->stride;
@@ -652,6 +668,12 @@
 					memcpy(buffer + j*opid->stride_uv, frame->data[2] + j*frame->linesize[2], opid->uv_width);
 				}
 			}
+			if (frame->linesize[3]) {
+				buffer += opid->uv_height*opid->stride_uv;
+				for (j=0; j<opid->height; j++) {
+					memcpy(buffer + j*opid->stride, frame->data[3] + j*frame->linesize[3], opid->width);
+				}
+			}
 			if (frame->interlaced_frame)
 				gf_filter_pck_set_interlaced(pck, frame->top_field_first ? 1 : 2);
 
@@ -767,7 +789,7 @@
 		pix_fmt = ffmpeg_pixfmt_from_gpac(gf_pfmt);
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
-		if (p) sar = p->value.frac;
+		if (p && p->value.frac.num && p->value.frac.den) sar = p->value.frac;
 
 		pid_ctx->stride = pid_ctx->stride_uv = 0;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
@@ -811,6 +833,7 @@
 		if (!p) return GF_OK; //not ready yet
 		afmt = ffmpeg_audio_fmt_from_gpac(p->value.uint);
 		pid_ctx->bps = gf_audio_fmt_bit_depth(p->value.uint) / 8;
+		pid_ctx->planar = gf_audio_fmt_is_planar(p->value.uint);
 
 		if (check_recfg) {
 			if (sr!=pid_ctx->sr) {}
@@ -864,21 +887,18 @@
 	ffavf_reset_graph(ctx);
 	while (gf_list_count(ctx->ipids)) {
 		GF_FFAVPid *ipid = gf_list_pop_back(ctx->ipids);
-		//io_filter_ctx is destroyed while reseting the graph
+		//io_filter_ctx is destroyed while resetting the graph
 		gf_free(ipid);
 	}
 	gf_list_del(ctx->ipids);
 	while (gf_list_count(ctx->opids)) {
 		GF_FFAVPid *opid = gf_list_pop_back(ctx->opids);
-		//io_filter_ctx is destroyed while reseting the graph
+		//io_filter_ctx is destroyed while resetting the graph
 		gf_free(opid);
 	}
 	gf_list_del(ctx->opids);
 	if (ctx->filter_desc) gf_free(ctx->filter_desc);
 	if (ctx->frame) av_frame_free(&ctx->frame);
-
-	if (ctx->options) av_dict_free(&ctx->options);
-	return;
 }
 
 static GF_Err ffavf_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *arg_val)
@@ -931,13 +951,12 @@
 		ret = avfilter_graph_send_command(ctx->filter_graph, szTargetName, arg, arg_value, szCommandRes, 1024, 0);
 		if (ret<0) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Failed to execute command %s: %s\n", arg_name, av_err2str(ret) ));
+			return GF_BAD_PARAM;
 		}
+		return GF_OK;
 	}
-	ret = av_dict_set(&ctx->options, arg_name, arg_val->value.string, 0);
-	if (ret<0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Failed to set option %s:%s\n", arg_name, arg_val ));
-	}
-	return GF_OK;
+	//other options are not allowed, they MUST be passed as part of `f` option
+	return GF_NOT_FOUND;
 }
 
 
@@ -954,7 +973,9 @@
 	.name = "ffavf",
 	.version = LIBAVFORMAT_IDENT,
 	GF_FS_SET_DESCRIPTION("FFMPEG AVFilter")
-	GF_FS_SET_HELP("This filter provides libavfilter raw audio and video tools. See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details\n"
+	GF_FS_SET_HELP("This filter provides libavfilter raw audio and video tools.\n"
+		"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details\n"
+		"To list all supported avfilters for your GPAC build, use `gpac -h ffavf:*`.\n"
 		"\n"
 		"# Declaring a filter\n"
 		"The filter loads a filter or a filter chain description from the [-f]() option.\n"
@@ -970,17 +991,17 @@
 		"For simple filter graphs with only one input and one output, the input PID is assigned the avfilter name `in` and the output PID is assigned the avfilter name `out`\n"
 		"\n"
 		"When a graph has several inputs, input PID names shall be assigned by the user using the `ffid` property, and mapping must be done in the filter.\n"
-		"EX src=video:#ffid=a src=logo:#ffid=b ffavf::f=[a][b]overlay=main_w-overlay_w-10:main_h-overlay_h-10\n"
+		"EX gpac -i video:#ffid=a -i logo:#ffid=b ffavf::f=[a][b]overlay=main_w-overlay_w-10:main_h-overlay_h-10 vout\n"
 		"In this example:\n"
 		"- the video source is identified as `a`\n"
 		"- the logo source is identified as `b`\n"
 		"- the filter declaration maps `a` to its first input (in this case, main video) and `b` to its second input (in this case the overlay)\n"
 	 "\n"
 		"When a graph has several outputs, output PIDs will be identified using the `ffid` property set to the output avfilter name.\n"
-		"EX src=source ffavf::f=split inspect:SID=#ffid=out0 vout#SID=out1\n"
+		"EX gpac -i source ffavf::f=split inspect:SID=#ffid=out0 vout#SID=out1\n"
 		"In this example:\n"
-		"- the spliter produces 2 video streams `out0` and `out1`\n"
-		"- the inspecter only process stream with ffid `out0`\n"
+		"- the splitter produces 2 video streams `out0` and `out1`\n"
+		"- the inspector only process stream with ffid `out0`\n"
 		"- the video output only displays stream with ffid `out1`\n"
 		"\n"
 		"The name(s) of the final output of the avfilter graph cannot be configured in GPAC. You can however name intermediate output(s) in a complex filter chain as usual.\n"
@@ -991,7 +1012,7 @@
 		"- name#com_name=value: sends command `com_name` with value `value` to filter named `name`\n"
 		"\n"
 	)
-	.flags = GF_FS_REG_META | GF_FS_REG_EXPLICIT_ONLY,
+	.flags = GF_FS_REG_META | GF_FS_REG_EXPLICIT_ONLY | GF_FS_REG_ALLOW_CYCLIC,
 	.private_size = sizeof(GF_FFAVFilterCtx),
 	SETCAPS(FFAVFilterCaps),
 	.initialize = ffavf_initialize,
@@ -1005,13 +1026,13 @@
 
 static const GF_FilterArgs FFAVFilterArgs[] =
 {
-	{ "f", -1, "filter or filter chain description - see filter help", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
+	{ "f", -1, "filter or filter chain description", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{ OFFS(pfmt), "pixel format of output. If not set, let AVFilter decide", GF_PROP_PIXFMT, "none", NULL, 0},
 	{ OFFS(afmt), "audio format of output. If not set, let AVFilter decide", GF_PROP_PCMFMT, "none", NULL, 0},
 	{ OFFS(sr), "sample rate of output. If not set, let AVFilter decide", GF_PROP_UINT, "0", NULL, 0},
 	{ OFFS(ch), "number of channels of output. If not set, let AVFilter decide", GF_PROP_UINT, "0", NULL, 0},
-	{ OFFS(dump), "dump graph as log madia@info or stderr if not set", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
-	{ "*", -1, "any possible options defined for AVFilter and sub-classes. See `gpac -hx ffavf` and `gpac -hx ffavf:*`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
+	{ OFFS(dump), "dump graph as log media@info or stderr if not set", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ "*", -1, "any possible options defined for AVFilter and sub-classes (see `gpac -hx ffavf` and `gpac -hx ffavf:*`)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{0}
 };

gpac-1.0.1.tar.gz/src/filters/ff_common.c -> gpac-2.0.0.tar.gz/src/filters/ff_common.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / common ffmpeg filters
@@ -55,8 +55,15 @@
 {
 	u32 ff_pf;
 	u32 gpac_pf;
+	u32 flags; //only 1 used, for full range
 } GF_FF_PFREG;
 
+#ifndef FFMPEG_ENABLE_VVC
+//enable this when compiling under xcode or visual (eg without ./configure), or add macro to configuration.h or project settings
+//to remove once we have a known API version number for vvc in libavcodec
+//#define FFMPEG_ENABLE_VVC
+#endif
+
 static const GF_FF_PFREG FF2GPAC_PixelFormats[] =
 {
 	{AV_PIX_FMT_YUV420P, GF_PIXEL_YUV},
@@ -79,6 +86,11 @@
 	{AV_PIX_FMT_P010LE, GF_PIXEL_NV12_10},
 #endif
 	{AV_PIX_FMT_NV21, GF_PIXEL_NV21},
+	{AV_PIX_FMT_YUVA420P, GF_PIXEL_YUVA},
+	{AV_PIX_FMT_YUVA444P, GF_PIXEL_YUVA444},
+	{AV_PIX_FMT_YUV444P, GF_PIXEL_YUV444},
+
+
 	{AV_PIX_FMT_0RGB, GF_PIXEL_XRGB},
 	{AV_PIX_FMT_RGB0, GF_PIXEL_RGBX},
 	{AV_PIX_FMT_0BGR, GF_PIXEL_XBGR},
@@ -94,10 +106,9 @@
 	{AV_PIX_FMT_BGRA, GF_PIXEL_BGRA},
 
 	/*aliases*/
-	{AV_PIX_FMT_YUVJ420P, GF_PIXEL_YUV},
-	{AV_PIX_FMT_YUVJ422P, GF_PIXEL_YUV422},
-	{AV_PIX_FMT_YUVJ444P, GF_PIXEL_YUV444},
-
+	{AV_PIX_FMT_YUVJ420P, GF_PIXEL_YUV, 1},
+	{AV_PIX_FMT_YUVJ422P, GF_PIXEL_YUV422, 1},
+	{AV_PIX_FMT_YUVJ444P, GF_PIXEL_YUV444, 1},
 	{0},
 };
 
@@ -113,7 +124,7 @@
 	return 0;
 }
 
-u32 ffmpeg_pixfmt_to_gpac(u32 pfmt)
+u32 ffmpeg_pixfmt_to_gpac(u32 pfmt, Bool no_warn)
 {
 	const AVPixFmtDescriptor *ffdesc = av_pix_fmt_desc_get(pfmt);
 	if (!ffdesc) {
@@ -126,7 +137,37 @@
 			return FF2GPAC_PixelFormats[i].gpac_pf;
 		i++;
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFMPEG] Unmapped FFMPEG pixel format %s, patch welcome\n", ffdesc->name));
+	if (!no_warn) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFMPEG] Unmapped FFMPEG pixel format %s, patch welcome\n", ffdesc->name));
+	}
+	return 0;
+}
+
+Bool ffmpeg_pixfmt_is_fullrange(u32 pfmt)
+{
+	u32 i=0;
+	while (FF2GPAC_PixelFormats[i].gpac_pf) {
+		if (FF2GPAC_PixelFormats[i].ff_pf == pfmt)
+			return (FF2GPAC_PixelFormats[i].flags & 1) ? GF_TRUE : GF_FALSE;
+		i++;
+	}
+	return GF_FALSE;
+}
+
+u32 ffmpeg_pixfmt_from_codec_tag(u32 codec_tag, Bool *is_full_range)
+{
+	u32 i=0;
+	if (is_full_range) *is_full_range = 0;
+
+	while (FF2GPAC_PixelFormats[i].gpac_pf) {
+		if (avcodec_pix_fmt_to_codec_tag(FF2GPAC_PixelFormats[i].ff_pf) == codec_tag) {
+			if (is_full_range && (FF2GPAC_PixelFormats[i].flags & 1)) {
+				*is_full_range = GF_TRUE;
+			}
+			return FF2GPAC_PixelFormats[i].gpac_pf;
+		}
+		i++;
+	}
 	return 0;
 }
 
@@ -244,8 +285,9 @@
 
 static const GF_FF_CIDREG FF2GPAC_CodecIDs[] =
 {
-	{AV_CODEC_ID_MP2, GF_CODECID_MPEG_AUDIO, 0},
-	{AV_CODEC_ID_MP3, GF_CODECID_MPEG2_PART3, 0},
+	{AV_CODEC_ID_MP3, GF_CODECID_MPEG_AUDIO, 0},
+	{AV_CODEC_ID_MP2, GF_CODECID_MPEG2_PART3, 0},
+	{AV_CODEC_ID_MP1, GF_CODECID_MPEG_AUDIO_L1, 0},
 	{AV_CODEC_ID_AAC, GF_CODECID_AAC_MPEG4, 0},
 	{AV_CODEC_ID_AC3, GF_CODECID_AC3, 0},
 	{AV_CODEC_ID_EAC3, GF_CODECID_EAC3, 0},
@@ -330,6 +372,15 @@
 	{AV_CODEC_ID_PCM_F16LE, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_F24LE, GF_CODECID_RAW, 0},
 #endif
+
+#ifdef FFMPEG_ENABLE_VVC
+	{AV_CODEC_ID_VVC, GF_CODECID_VVC, 0},
+#endif
+
+	{AV_CODEC_ID_V210, GF_CODECID_V210, 0},
+
+	{AV_CODEC_ID_TRUEHD, GF_CODECID_TRUEHD, 0},
+	{AV_CODEC_ID_FFV1, GF_CODECID_FFV1, 0},
 	{0}
 };
 
@@ -404,34 +455,116 @@
 	return GF_STREAM_METADATA;
 }
 
-//static void ff_log_callback(void *avcl, int level, const char *fmt, va_list vl) { }
+#ifndef GPAC_DISABLE_LOG
 
-void ffmpeg_setup_logs(u32 log_class)
+static GF_LOG_Level ffmpeg_to_gpac_log_level(int level)
 {
-	u32 level = gf_log_get_tool_level(log_class);
 	switch (level) {
-	case GF_LOG_DEBUG:
-		av_log_set_level(AV_LOG_DEBUG);
-		break;
-	case GF_LOG_INFO:
-		av_log_set_level(AV_LOG_INFO);
-		break;
-	case GF_LOG_WARNING:
-		av_log_set_level(AV_LOG_WARNING);
-		break;
+	case AV_LOG_DEBUG: return GF_LOG_DEBUG;
+	case AV_LOG_TRACE: return GF_LOG_DEBUG;
+	case AV_LOG_VERBOSE: return GF_LOG_DEBUG;
+	case AV_LOG_INFO: return GF_LOG_INFO;
+	case AV_LOG_WARNING: return GF_LOG_WARNING;
+	case AV_LOG_ERROR: return GF_LOG_ERROR;
+	case AV_LOG_FATAL: return GF_LOG_ERROR;
+	case AV_LOG_PANIC: return GF_LOG_ERROR;
+	default: return GF_LOG_QUIET;
+	}
+}
+
+static int gpac_to_ffmpeg_log_level(GF_LOG_Level level)
+{
+	switch (level) {
+	case GF_LOG_QUIET: return AV_LOG_QUIET;
+	case GF_LOG_DEBUG: return AV_LOG_DEBUG;
+	case GF_LOG_INFO: return AV_LOG_INFO;
+	case GF_LOG_WARNING: return AV_LOG_WARNING;
+	case GF_LOG_ERROR: return AV_LOG_ERROR;
+	default: return AV_LOG_QUIET;
+	}
+}
+
+static GF_LOG_Tool gpac_to_ffmpeg_log_tool(AVClass* avc)
+{
+	if (!avc) return GF_LOG_CORE;
+	switch (avc->category) {
+	case AV_CLASS_CATEGORY_INPUT:
+	case AV_CLASS_CATEGORY_OUTPUT:
+	case AV_CLASS_CATEGORY_MUXER:
+	case AV_CLASS_CATEGORY_DEMUXER:
+		return GF_LOG_CONTAINER;
+	case AV_CLASS_CATEGORY_ENCODER:
+	case AV_CLASS_CATEGORY_DECODER:
+		return GF_LOG_CODEC;
+	case AV_CLASS_CATEGORY_FILTER:
+		return GF_LOG_MEDIA;
+	case AV_CLASS_CATEGORY_BITSTREAM_FILTER:
+		return GF_LOG_CODING;
+	case AV_CLASS_CATEGORY_SWSCALER:
+	case AV_CLASS_CATEGORY_SWRESAMPLER:
+		return GF_LOG_MEDIA;
+	case AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT:
+	case AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT:
+	case AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT:
+	case AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT:
+	case AV_CLASS_CATEGORY_DEVICE_OUTPUT:
+	case AV_CLASS_CATEGORY_DEVICE_INPUT:
+		return GF_LOG_MMIO;
 	default:
-		av_log_set_level(AV_LOG_ERROR);
-		break;
+		return GF_LOG_CORE;
 	}
-//	av_log_set_callback(ff_log_callback);
 }
 
+#define FF_LOG_SIZE 2000
+static void ff_log_callback(void *avcl, int level, const char *fmt, va_list vl)
+{
+	AVClass* avc = avcl ? *(AVClass**)avcl : NULL;
+	GF_LOG_Level glevel = ffmpeg_to_gpac_log_level(level);
+	GF_LOG_Tool gtool = gpac_to_ffmpeg_log_tool(avc);
+
+	if (!gf_log_tool_level_on(gtool, glevel))
+		return;
+	gf_log_lt(glevel, gtool);
+
+	if (avc) {
+		char buffer[FF_LOG_SIZE+1];
+		buffer[FF_LOG_SIZE] = 0;
+		vsnprintf(buffer, FF_LOG_SIZE, fmt, vl);
+//		gf_log( "[%s@%p] %s", avc->item_name(avcl), avcl, buffer);
+		gf_log( "[%s] %s", avc->item_name(avcl), buffer);
+	} else {
+		gf_log_va_list(glevel, gtool, fmt, vl);
+	}
+}
+
+void ffmpeg_setup_logs(u32 log_class)
+{
+	u32 level = gf_log_get_tool_level(log_class);
+	int av_level = gpac_to_ffmpeg_log_level(level);
+	//only set if more verbose
+	if (av_level > av_log_get_level())
+		av_log_set_level(av_level);
+}
+#else
+void ffmpeg_setup_logs(u32 log_class)
+{
+
+}
+#endif
+
 void ffmpeg_initialize()
 {
 	if (ffmpeg_init) return;
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 	av_register_all();
+#endif
 	avformat_network_init();
 	ffmpeg_init = GF_TRUE;
+
+#ifndef GPAC_DISABLE_LOG
+	av_log_set_callback(&ff_log_callback);
+#endif
+
 }
 
 static void ffmpeg_register_free(GF_FilterSession *session, GF_FilterRegister *reg)
@@ -609,7 +742,7 @@
 	return GF_STREAM_UNKNOWN;
 }
 
-#if (LIBAVFORMAT_VERSION_MAJOR >= 58) && (LIBAVFORMAT_VERSION_MINOR>=30)
+#if ( (LIBAVFORMAT_VERSION_MAJOR >= 59) || ((LIBAVFORMAT_VERSION_MAJOR >= 58) && (LIBAVFORMAT_VERSION_MINOR>=30)))
 #else
 #define NO_AVIO_PROTO
 #endif
@@ -622,15 +755,15 @@
 #endif
 	const struct AVOption *opt;
 	GF_List *all_filters = gf_list_new();
-	AVInputFormat *fmt = NULL;
+	const AVInputFormat *fmt = NULL;
 	const AVOutputFormat *ofmt = NULL;
-	AVCodec *codec = NULL;
+	const AVCodec *codec = NULL;
 #if (LIBAVFILTER_VERSION_MAJOR > 5)
 	const AVFilter *avf = NULL;
 #endif
 
-#if !defined(NO_AVIO_PROTO) || (LIBAVFILTER_VERSION_MAJOR > 6)
-	void *av_it;
+#if !defined(NO_AVIO_PROTO) || (LIBAVFILTER_VERSION_MAJOR > 6) || (LIBAVFORMAT_VERSION_MAJOR >= 59)
+	void *av_it = NULL;
 #endif
 
 	const char *fname = "";
@@ -664,7 +797,7 @@
 second_pass:
 #endif
 
-#if !defined(NO_AVIO_PROTO) || (LIBAVFILTER_VERSION_MAJOR > 6)
+#if !defined(NO_AVIO_PROTO) || (LIBAVFILTER_VERSION_MAJOR > 6) || (LIBAVFORMAT_VERSION_MAJOR >= 59)
 	av_it = NULL;
 #endif
 
@@ -688,8 +821,14 @@
 			} else
 #endif
 			{
+
+#if (LIBAVFORMAT_VERSION_MAJOR<59)
 				fmt = av_iformat_next(fmt);
+#else
+				fmt = av_demuxer_iterate(&av_it);
+#endif
 				if (!fmt) break;
+
 				av_class = fmt->priv_class;
 				subname = fmt->name;
 #ifndef GPAC_DISABLE_DOC
@@ -697,8 +836,15 @@
 #endif
 			}
 		} else if (type==FF_REG_TYPE_DECODE) {
+#if (LIBAVFORMAT_VERSION_MAJOR<59)
 			codec = av_codec_next(codec);
+#else
+			codec = av_codec_iterate(&av_it);
+#endif
 			if (!codec) break;
+			if (!av_codec_is_decoder(codec))
+				continue;
+
 			av_class = codec->priv_class;
 			subname = codec->name;
 #ifndef GPAC_DISABLE_DOC
@@ -706,7 +852,7 @@
 #endif
 		} else if (type==FF_REG_TYPE_DEV_IN) {
 #if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)
-			fmt = av_input_video_device_next(fmt);
+			fmt = av_input_video_device_next(FF_IFMT_CAST fmt);
 			if (!fmt) break;
 			av_class = fmt->priv_class;
 			subname = fmt->name;
@@ -715,7 +861,12 @@
 #endif
 		if (!av_class || (av_class->category!=AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) ) continue;
 #else
+
+#if (LIBAVFORMAT_VERSION_MAJOR<59)
 			fmt = av_iformat_next(fmt);
+#else
+			fmt = av_demuxer_iterate(&av_it);
+#endif
 			if (!fmt) break;
 			av_class = fmt->priv_class;
 			subname = fmt->name;
@@ -744,8 +895,14 @@
 			else continue;
 #endif
 		} else if (type==FF_REG_TYPE_ENCODE) {
+#if (LIBAVFORMAT_VERSION_MAJOR<59)
 			codec = av_codec_next(codec);
+#else
+			codec = av_codec_iterate(&av_it);
+#endif
 			if (!codec) break;
+			if (!av_codec_is_encoder(codec))
+				continue;
 			av_class = codec->priv_class;
 			subname = codec->name;
 #ifndef GPAC_DISABLE_DOC
@@ -803,6 +960,8 @@
 		freg->args = NULL;
 		freg->caps = NULL;
 		freg->nb_caps = 0;
+		//no help
+		freg->help = NULL;
 
 		gf_list_add(all_filters, freg);
 
@@ -922,7 +1081,7 @@
 
 		idx=0;
 		i=0;
-		while (av_class) {
+		while (av_class && av_class->option) {
 			opt = &av_class->option[idx];
 			if (!opt || !opt->name) break;
 			if (!flags || (opt->flags & flags) ) {
@@ -1023,7 +1182,6 @@
 		}
 	}
 #endif
-
 }
 
 void ffmpeg_build_register(GF_FilterSession *session, GF_FilterRegister *orig_reg, const GF_FilterArgs *default_args, u32 nb_def_args, u32 reg_type)
@@ -1040,6 +1198,8 @@
 
 	ffmpeg_initialize();
 
+	orig_reg->author = avfilter_configuration();
+	
 	//by default no need to load option descriptions, everything is handled by av_set_opt in update_args
 	if (!load_meta_filters) {
 		orig_reg->args = default_args;
@@ -1047,12 +1207,12 @@
 		return;
 	}
 
-
 	if (reg_type==FF_REG_TYPE_ENCODE) opt_type = AV_OPT_FLAG_ENCODING_PARAM;
 	else if (reg_type==FF_REG_TYPE_MUX) opt_type = AV_OPT_FLAG_ENCODING_PARAM;
 	else if (reg_type==FF_REG_TYPE_AVF) opt_type = 0xFFFFFFFF;
 
 	if ((reg_type==FF_REG_TYPE_ENCODE) || (reg_type==FF_REG_TYPE_DECODE)) {
+		orig_reg->author = avcodec_configuration();
 		codec_ctx = avcodec_alloc_context3(NULL);
 		av_class = codec_ctx->av_class;
 	} else if (reg_type==FF_REG_TYPE_AVF) {
@@ -1243,14 +1403,22 @@
 	}
 }
 
-void ffmpeg_report_unused_options(GF_Filter *filter, AVDictionary *options)
+void ffmpeg_report_options(GF_Filter *filter, AVDictionary *options, AVDictionary *all_options)
 {
 	AVDictionaryEntry *prev_e = NULL;
-	while (1) {
-		prev_e = av_dict_get(options, "", prev_e, AV_DICT_IGNORE_SUFFIX);
+
+	while (all_options) {
+		Bool unknown_opt = GF_FALSE;
+		prev_e = av_dict_get(all_options, "", prev_e, AV_DICT_IGNORE_SUFFIX);
 		if (!prev_e) break;
-		gf_filter_report_unused_meta_option(filter, prev_e->key);
+		if (options) {
+			AVDictionaryEntry *unkn = av_dict_get(options, prev_e->key, NULL, 0);
+			if (unkn) unknown_opt = GF_TRUE;
+		}
+		gf_filter_report_meta_option(filter, prev_e->key, unknown_opt ? GF_FALSE : GF_TRUE);
 	}
-
+	if (options)
+		av_dict_free(&options);
 }
+
 #endif

gpac-1.0.1.tar.gz/src/filters/ff_common.h -> gpac-2.0.0.tar.gz/src/filters/ff_common.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2021
 *					All rights reserved
 *
 * This file is part of GPAC / common ffmpeg filters
@@ -34,8 +34,27 @@
 #include <libavutil/dict.h>
 #include <libavdevice/avdevice.h>
 #include <libswscale/swscale.h>
+#include <libavutil/channel_layout.h>
 
-#define GF_FFMPEG_DECODER_CONFIG GF_4CC('f','f','D','C')
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
+#define AVFMT_URL(_mux) _mux->filename
+#else
+#define AVFMT_URL(_mux) _mux->url
+#endif
+
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
+#define FF_FREE_PCK(_pkt)	av_free_packet(_pkt);
+#define FF_RELEASE_PCK(_pkt)
+#define FF_INIT_PCK(ctx, _pkt) { pkt = &ctx->pkt; av_init_packet(pkt); }
+#define FF_OFMT_CAST	(AVOutputFormat *)
+#define FF_IFMT_CAST	(AVInputFormat *)
+#else
+#define FF_FREE_PCK(_pkt)	av_packet_unref(_pkt);
+#define FF_RELEASE_PCK(_pkt) av_packet_unref(_pkt);
+#define FF_INIT_PCK(ctx, _pkt) { pkt = ctx->pkt; }
+#define FF_OFMT_CAST
+#define FF_IFMT_CAST
+#endif
 
 
 //rendering/translating to internal supported formats for text streams is not yet implemented
@@ -57,7 +76,12 @@
 void ffmpeg_build_register(GF_FilterSession *session, GF_FilterRegister *orig_reg, const GF_FilterArgs *default_args, u32 nb_def_args, u32 reg_type);
 
 u32 ffmpeg_pixfmt_from_gpac(u32 pfmt);
-u32 ffmpeg_pixfmt_to_gpac(u32 pfmt);
+u32 ffmpeg_pixfmt_to_gpac(u32 pfmt, Bool no_warn);
+//return GPAC pix format from codec tag
+u32 ffmpeg_pixfmt_from_codec_tag(u32 codec_tag, Bool *is_full_range);
+//check if FF pixfmt is an old format fullrange
+Bool ffmpeg_pixfmt_is_fullrange(u32 pfmt);
+
 u32 ffmpeg_audio_fmt_from_gpac(u32 sfmt);
 u32 ffmpeg_audio_fmt_to_gpac(u32 sfmt);
 u32 ffmpeg_codecid_from_gpac(u32 codec_id, u32 *ff_codectag);
@@ -72,4 +96,5 @@
 u64 ffmpeg_channel_layout_from_gpac(u64 gpac_ch_layout);
 u64 ffmpeg_channel_layout_to_gpac(u64 ff_ch_layout);
 
-void ffmpeg_report_unused_options(GF_Filter *filter, AVDictionary *options);
+//this will destroy unknown_options if set
+void ffmpeg_report_options(GF_Filter *filter, AVDictionary *unknown_options, AVDictionary *all_options);

gpac-1.0.1.tar.gz/src/filters/ff_dec.c -> gpac-2.0.0.tar.gz/src/filters/ff_dec.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ffmpeg decode filter
@@ -51,6 +51,8 @@
 
 typedef struct _gf_ffdec_ctx
 {
+	GF_PropStringList ffcmap;
+
 	//internal data
 	Bool initialized;
 
@@ -76,7 +78,9 @@
 	//audio state
 	u32 channels, sample_rate, sample_fmt, bytes_per_sample;
 	u64 channel_layout;
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
 	u32 frame_start;
+#endif
 	u32 nb_samples_already_in_frame;
 
 	//video state
@@ -86,7 +90,23 @@
 
 	GF_List *src_packets;
 
+	//only used to check decoder output change
+	u32 o_ff_pfmt;
+	Bool force_full_range;
 	Bool drop_non_refs;
+
+	s64 first_cts_plus_one;
+	s64 delay;
+	u32 ts_offset;
+
+	Bool force_rap_wait;
+
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
+	AVPacket pkt;
+#else
+	AVPacket *pkt;
+#endif
+
 } GF_FFDecodeCtx;
 
 static GF_Err ffdec_initialize(GF_Filter *filter)
@@ -95,6 +115,10 @@
 	ctx->initialized = GF_TRUE;
 	ctx->src_packets = gf_list_new();
 
+#if (LIBAVCODEC_VERSION_MAJOR >= 59)
+	ctx->pkt = av_packet_alloc();
+#endif
+
 	ffmpeg_setup_logs(GF_LOG_CODEC);
 	return GF_OK;
 }
@@ -113,30 +137,80 @@
 	}
 	gf_list_del(ctx->src_packets);
 
+#if (LIBAVCODEC_VERSION_MAJOR >= 59)
+	av_packet_free(&ctx->pkt);
+#endif
+
 	if (ctx->owns_context && ctx->decoder) {
-		if (ctx->decoder->extradata) gf_free(ctx->decoder->extradata);
-		avcodec_close(ctx->decoder);
+		avcodec_free_context(&ctx->decoder);
 	}
 	return;
 }
 
+static void ffdec_check_pix_fmt_change(struct _gf_ffdec_ctx *ctx, u32 pix_fmt)
+{
+	if (ctx->pixel_fmt != pix_fmt) {
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_PIXFMT, &PROP_UINT(pix_fmt));
+		ctx->pixel_fmt = pix_fmt;
+		ctx->force_full_range = GF_FALSE;
+		if (ctx->decoder->color_range==AVCOL_RANGE_JPEG)
+			ctx->force_full_range = GF_TRUE;
+		else if (ffmpeg_pixfmt_is_fullrange(ctx->decoder->pix_fmt))
+			ctx->force_full_range = GF_TRUE;
+		else
+			ctx->force_full_range = GF_FALSE;
+
+		if (ctx->force_full_range)
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(GF_TRUE) );
+		else
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_RANGE, NULL );
+
+		if (ctx->decoder->color_primaries!=AVCOL_PRI_UNSPECIFIED)
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_PRIMARIES, &PROP_UINT(ctx->decoder->color_primaries) );
+		else
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_PRIMARIES, NULL );
+
+		if (ctx->decoder->colorspace!=AVCOL_SPC_UNSPECIFIED)
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_MX, &PROP_UINT(ctx->decoder->colorspace) );
+		else
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_MX, NULL );
+
+		if (ctx->decoder->color_trc!=AVCOL_TRC_UNSPECIFIED)
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_TRANSFER, &PROP_UINT(ctx->decoder->color_trc) );
+		else
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_TRANSFER, NULL );
+	}
+}
+
 static GF_Err ffdec_process_video(GF_Filter *filter, struct _gf_ffdec_ctx *ctx)
 {
-	AVPacket pkt;
+	AVPacket *pkt;
 	AVFrame *frame;
-	AVPicture pict;
+	u32 dst_stride[5];
+	u8 *dst_planes[5];
+	u32 pix_out;
 	Bool is_eos=GF_FALSE;
 	s32 res;
 	s32 gotpic;
+	u64 out_cts;
 	const char *data = NULL;
 	Bool seek_flag = GF_FALSE;
-	u32 i, count;
-	u32 size=0, pix_fmt, outsize, pix_out, stride, stride_uv, uv_height, nb_planes;
+	u32 i, count, ff_pfmt;
+	u32 size=0, outsize, stride, stride_uv, uv_height, nb_planes;
 	u8 *out_buffer;
 	GF_FilterPacket *pck_src;
 	GF_FilterPacket *dst_pck;
 	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->in_pid);
 
+	if (pck && ctx->force_rap_wait) {
+		GF_FilterSAPType sap = gf_filter_pck_get_sap(pck);
+		if (sap && (sap<=GF_FILTER_SAP_4)) {
+			ctx->force_rap_wait = GF_FALSE;
+		} else {
+			gf_filter_pid_drop_packet(ctx->in_pid);
+			return GF_OK;
+		}
+	}
 	if (ctx->reconfig_pending) {
 		pck = NULL;
 	} else if (!pck) {
@@ -148,16 +222,22 @@
 		gf_filter_pid_drop_packet(ctx->in_pid);
 		return GF_OK;
 	}
+ //we don't own the codec and we're in end of stream, don't try to decode (the context might have been closed)
+ if (!pck && !ctx->owns_context) {
+ gf_filter_pid_set_eos(ctx->out_pid);
+ return GF_EOS;
+ }
 
 	frame = ctx->frame;
 
-	av_init_packet(&pkt);
+	FF_INIT_PCK(ctx, pkt)
 
 	if (pck) {
 		data = gf_filter_pck_get_data(pck, &size);
 
 		if (!size) {
 			gf_filter_pid_drop_packet(ctx->in_pid);
+			FF_RELEASE_PCK(pkt)
 			return GF_OK;
 		}
 
@@ -167,38 +247,83 @@
 
 		//seems ffmpeg is not properly handling the decoding after a flush, we close and reopen the codec
 		if (ctx->flush_done) {
+#if 0
+			AVDictionary *options = NULL;
 			const AVCodec *codec = ctx->decoder->codec;
-			avcodec_close(ctx->decoder);
-			avcodec_open2(ctx->decoder, codec, NULL );
+			avcodec_free_context(&ctx->decoder);
+
+			av_dict_copy(&options, ctx->options, 0);
+			avcodec_open2(ctx->decoder, codec, &options );
+			if (options) av_dict_free(&options);
+#else
+			avcodec_flush_buffers(ctx->decoder);
+#endif
 			ctx->flush_done = GF_FALSE;
 		}
 
-		pkt.dts = gf_filter_pck_get_dts(pck);
-		pkt.pts = gf_filter_pck_get_cts(pck);
-		pkt.duration = gf_filter_pck_get_duration(pck);
+		pkt->dts = gf_filter_pck_get_dts(pck);
+		pkt->pts = gf_filter_pck_get_cts(pck);
+		pkt->duration = gf_filter_pck_get_duration(pck);
 		if (gf_filter_pck_get_sap(pck)>0)
-			pkt.flags = AV_PKT_FLAG_KEY;
+			pkt->flags = AV_PKT_FLAG_KEY;
 	}
-	pkt.data = (uint8_t*)data;
-	pkt.size = size;
+	pkt->data = (uint8_t*)data;
+	pkt->size = size;
 
 	/*TOCHECK: for AVC bitstreams after ISMA decryption, in case (as we do) the decryption DRM tool
 	doesn't put back nalu size, we have to do it ourselves, but we can't modify input data...*/
 
 	gotpic=0;
-	res = avcodec_decode_video2(ctx->decoder, frame, &gotpic, &pkt);
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
+	res = avcodec_decode_video2(ctx->decoder, frame, &gotpic, pkt);
+#else
+	res = avcodec_send_packet(ctx->decoder, pkt);
+	switch (res) {
+	case AVERROR(EAGAIN):
+		if (pck_src) {
+			gf_list_del_item(ctx->src_packets, pck_src);
+			gf_filter_pck_unref(pck_src);
+		}
+		FF_RELEASE_PCK(pkt);
+		//input full but output available, go on but don't discard input
+		pck = NULL;
+		break;
+	case 0:
+	case AVERROR_EOF:
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to send frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(res) ));
+		break;
+	}
+	gotpic = 0;
+	res = avcodec_receive_frame(ctx->decoder, frame);
+	switch (res) {
+	case AVERROR(EAGAIN):
+		res = 0;
+		break;
+	case 0:
+		gotpic = 1;
+		break;
+	case AVERROR_EOF:
+		res = 0;
+		break;
+	}
+#endif
+
+
 	if (pck) gf_filter_pid_drop_packet(ctx->in_pid);
 
+
 	if (!gotpic) {
+		FF_RELEASE_PCK(pkt);
 		if (is_eos) {
 			ctx->flush_done = GF_TRUE;
 			gf_filter_pid_set_eos(ctx->out_pid);
 			return GF_EOS;
 		}
 		if (ctx->reconfig_pending) {
-			if (ctx->decoder->extradata) gf_free(ctx->decoder->extradata);
-			ctx->decoder->extradata = NULL;
-			avcodec_close(ctx->decoder);
+			GF_Err e;
+			avcodec_free_context(&ctx->decoder);
 			ctx->decoder = NULL;
 			ctx->reconfig_pending = GF_FALSE;
 			//these properties are checked after decode, when we reconfigure we copy props from input to output
@@ -213,27 +338,36 @@
 				GF_FilterPacket *ref_pck = gf_list_pop_back(ctx->src_packets);
 				gf_filter_pck_unref(ref_pck);
 			}
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[FFDec] PID %s reconfigure pending and all frames flushed, reconfguring\n", gf_filter_pid_get_name(ctx->in_pid) ));
-			return ffdec_configure_pid(filter, ctx->in_pid, GF_FALSE);
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[FFDec] PID %s reconfigure pending and all frames flushed, reconfiguring\n", gf_filter_pid_get_name(ctx->in_pid) ));
+			e = ffdec_configure_pid(filter, ctx->in_pid, GF_FALSE);
+			if (e==GF_NOT_SUPPORTED)
+				return GF_PROFILE_NOT_SUPPORTED;
+			return e;
 		}
 	}
 
 	if (res < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to decode frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt.pts, av_err2str(res) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to decode frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(res) ));
+		FF_RELEASE_PCK(pkt);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
+	FF_RELEASE_PCK(pkt);
 	if (!gotpic) return GF_OK;
 
-	pix_fmt = ffmpeg_pixfmt_to_gpac(ctx->decoder->pix_fmt);
-	if (!pix_fmt) pix_fmt = GF_PIXEL_RGB;
-
+	if (ctx->decoder->pix_fmt != ctx->o_ff_pfmt) {
+		u32 pix_fmt = ffmpeg_pixfmt_to_gpac(ctx->decoder->pix_fmt, GF_FALSE);
+		ctx->o_ff_pfmt = ctx->decoder->pix_fmt;
+		if (!pix_fmt) {
+			pix_fmt = GF_PIXEL_RGB;
+		}
+		ffdec_check_pix_fmt_change(ctx, pix_fmt);
+	}
 	//update all props
-	FF_CHECK_PROP_VAL(pixel_fmt, pix_fmt, GF_PROP_PID_PIXFMT)
 	FF_CHECK_PROP(width, width, GF_PROP_PID_WIDTH)
 	FF_CHECK_PROP(height, height, GF_PROP_PID_HEIGHT)
 
 	stride = stride_uv = uv_height = nb_planes = 0;
-	if (! gf_pixel_get_size_info(pix_fmt, ctx->width, ctx->height, &outsize, &stride, &stride_uv, &nb_planes, &uv_height) ) {
+	if (! gf_pixel_get_size_info(ctx->pixel_fmt, ctx->width, ctx->height, &outsize, &stride, &stride_uv, &nb_planes, &uv_height) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to query pixelformat size infon", gf_filter_pid_get_name(ctx->in_pid) ));
 		return GF_NOT_SUPPORTED;
 	}
@@ -247,20 +381,27 @@
 		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_SAR, &PROP_FRAC( ctx->sar ) );
 	}
 
-	memset(&pict, 0, sizeof(pict));
-
-
 	pck_src = NULL;
 	count = gf_list_count(ctx->src_packets);
 	for (i=0; i<count; i++) {
+		u64 cts;
 		pck_src = gf_list_get(ctx->src_packets, i);
-		if (gf_filter_pck_get_cts(pck_src) == frame->pkt_pts) break;
+		cts = gf_filter_pck_get_cts(pck_src);
+		if (cts == frame->pts)
+			break;
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
+		if (cts == frame->pkt_pts)
+			break;
+#endif
 		pck_src = NULL;
 	}
 
 	seek_flag = GF_FALSE;
 	if (pck_src) {
 		seek_flag = gf_filter_pck_get_seek_flag(pck_src);
+		out_cts = gf_filter_pck_get_cts(pck_src);
+	} else {
+		out_cts = frame->pts;
 	}
 	//this was a seek frame, do not dispatch
 	if (seek_flag) {
@@ -272,36 +413,52 @@
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->out_pid, outsize, &out_buffer);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	if (pck_src) {
-		if (dst_pck) gf_filter_pck_merge_properties(pck_src, dst_pck);
+		gf_filter_pck_merge_properties(pck_src, dst_pck);
+		gf_filter_pck_set_dependency_flags(dst_pck, 0);
 		gf_list_del_item(ctx->src_packets, pck_src);
 		gf_filter_pck_unref(pck_src);
 	} else {
-		if (dst_pck) gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+		gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
 	}
-	if (!dst_pck) return GF_OUT_OF_MEM;
 
+ //rewrite dts and pts to PTS value
+ gf_filter_pck_set_dts(dst_pck, out_cts);
+ gf_filter_pck_set_cts(dst_pck, out_cts);
+
+	ff_pfmt = ctx->decoder->pix_fmt;
+	if (ff_pfmt==AV_PIX_FMT_YUVJ420P) {
+		ff_pfmt = AV_PIX_FMT_YUV420P;
+		if (!ctx->force_full_range) {
+			ctx->force_full_range = GF_TRUE;
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(GF_TRUE));
+		}
+	}
+
+	memset(&dst_planes, 0, sizeof(u8 *)*5);
+	memset(&dst_stride, 0, sizeof(u32)*5);
 
 	//TODO: cleanup, we should not convert pixel format in the decoder but through filters !
 	switch (ctx->pixel_fmt) {
 	case GF_PIXEL_RGB:
-		pict.data[0] = (uint8_t *)out_buffer;
-		pict.linesize[0] = 3*ctx->width;
+		dst_planes[0] = (uint8_t *)out_buffer;
+		dst_stride[0] = 3*ctx->width;
 		pix_out = AV_PIX_FMT_RGB24;
 		break;
 	case GF_PIXEL_RGBA:
-		pict.data[0] = (uint8_t *)out_buffer;
-		pict.linesize[0] = 4*ctx->width;
+		dst_planes[0] = (uint8_t *)out_buffer;
+		dst_stride[0] = 4*ctx->width;
 		pix_out = AV_PIX_FMT_RGBA;
 		break;
 	case GF_PIXEL_YUV:
 	case GF_PIXEL_YUV_10:
-		pict.data[0] = (uint8_t *)out_buffer;
-		pict.data[1] = (uint8_t *)out_buffer + ctx->stride * ctx->height;
-		pict.data[2] = (uint8_t *)pict.data[1] + ctx->stride_uv * uv_height;
-		pict.linesize[0] = ctx->stride;
-		pict.linesize[1] = pict.linesize[2] = ctx->stride_uv;
+		dst_planes[0] = (uint8_t *)out_buffer;
+		dst_planes[1] = (uint8_t *)out_buffer + ctx->stride * ctx->height;
+		dst_planes[2] = (uint8_t *)dst_planes[1] + ctx->stride_uv * uv_height;
+		dst_stride[0] = ctx->stride;
+		dst_stride[1] = dst_stride[2] = ctx->stride_uv;
 		if (ctx->pixel_fmt == GF_PIXEL_YUV_10)
 			pix_out = AV_PIX_FMT_YUV420P10LE;
 		else
@@ -310,11 +467,11 @@
 
 	case GF_PIXEL_YUV422:
 	case GF_PIXEL_YUV422_10:
-		pict.data[0] = (uint8_t *)out_buffer;
-		pict.data[1] = (uint8_t *)out_buffer + ctx->stride * ctx->height;
-		pict.data[2] = (uint8_t *)pict.data[1] + ctx->stride_uv * ctx->height;
-		pict.linesize[0] = ctx->stride;
-		pict.linesize[1] = pict.linesize[2] = ctx->stride_uv;
+		dst_planes[0] = (uint8_t *)out_buffer;
+		dst_planes[1] = (uint8_t *)out_buffer + ctx->stride * ctx->height;
+		dst_planes[2] = (uint8_t *)dst_planes[1] + ctx->stride_uv * ctx->height;
+		dst_stride[0] = ctx->stride;
+		dst_stride[1] = dst_stride[2] = ctx->stride_uv;
 		if (ctx->pixel_fmt == GF_PIXEL_YUV422_10)
 			pix_out = AV_PIX_FMT_YUV422P10LE;
 		else
@@ -323,10 +480,10 @@
 
 	case GF_PIXEL_YUV444:
 	case GF_PIXEL_YUV444_10:
-		pict.data[0] = (uint8_t *)out_buffer;
-		pict.data[1] = (uint8_t *)out_buffer + ctx->stride * ctx->height;
-		pict.data[2] = (uint8_t *)out_buffer + 2*ctx->stride * ctx->height;
-		pict.linesize[0] = pict.linesize[1] = pict.linesize[2] = ctx->stride;
+		dst_planes[0] = (uint8_t *)out_buffer;
+		dst_planes[1] = (uint8_t *)out_buffer + ctx->stride * ctx->height;
+		dst_planes[2] = (uint8_t *)out_buffer + 2*ctx->stride * ctx->height;
+		dst_stride[0] = dst_stride[1] = dst_stride[2] = ctx->stride;
 		if (ctx->pixel_fmt == GF_PIXEL_YUV444_10)
 			pix_out = AV_PIX_FMT_YUV444P10LE;
 		else
@@ -342,12 +499,13 @@
 	}
 
 	ctx->sws_ctx = sws_getCachedContext(ctx->sws_ctx,
-	 ctx->decoder->width, ctx->decoder->height, ctx->decoder->pix_fmt,
+	 ctx->decoder->width, ctx->decoder->height, ff_pfmt,
 	 ctx->width, ctx->height, pix_out, SWS_BICUBIC, NULL, NULL, NULL);
 	if (ctx->sws_ctx) {
-		sws_scale(ctx->sws_ctx, (const uint8_t * const*)frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
+		sws_scale(ctx->sws_ctx, (const uint8_t * const*)frame->data, frame->linesize, 0, ctx->height, dst_planes, dst_stride);
 	}
 
+
 	gf_filter_pck_set_seek_flag(dst_pck, GF_FALSE);
 
 	if (frame->interlaced_frame)
@@ -360,16 +518,24 @@
 
 static GF_Err ffdec_process_audio(GF_Filter *filter, struct _gf_ffdec_ctx *ctx)
 {
-	AVPacket pkt;
 	s32 gotpic;
-	s32 len, in_size, i;
-	u32 output_size;
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
+	s32 len;
+#endif
+	AVPacket *pkt;
+	s32 res, in_size, i;
+	u32 samples_to_trash;
+	u32 output_size, prev_afmt;
 	Bool is_eos=GF_FALSE;
 	u8 *data;
 	AVFrame *frame;
 	GF_FilterPacket *dst_pck, *src_pck;
-	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->in_pid);
+	GF_FilterPacket *pck;
 
+decode_next:
+	pck = gf_filter_pid_get_packet(ctx->in_pid);
+	in_size = 0;
+	
 	if (ctx->reconfig_pending) {
 		pck = NULL;
 	} else if (!pck) {
@@ -377,56 +543,126 @@
 		if (!is_eos) return GF_OK;
 	}
 
-	av_init_packet(&pkt);
-	if (pck) pkt.data = (uint8_t *) gf_filter_pck_get_data(pck, &in_size);
+	FF_INIT_PCK(ctx, pkt)
+
+	if (pck) pkt->data = (uint8_t *) gf_filter_pck_get_data(pck, &in_size);
 
 	if (pck) {
 		src_pck = pck;
 		gf_filter_pck_ref_props(&src_pck);
 		if (src_pck) gf_list_add(ctx->src_packets, src_pck);
 
-		if (!pkt.data) {
+		if (!pkt->data) {
 			gf_filter_pid_drop_packet(ctx->in_pid);
 			return GF_OK;
 		}
 
-		pkt.pts = gf_filter_pck_get_cts(pck);
-		pkt.dts = gf_filter_pck_get_dts(pck);
+		pkt->pts = gf_filter_pck_get_cts(pck);
+		pkt->dts = gf_filter_pck_get_dts(pck);
 
-		pkt.size = in_size;
-		if ((s32) ctx->frame_start > pkt.size) ctx->frame_start = 0;
+		pkt->size = in_size;
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
+		if ((s32) ctx->frame_start > pkt->size) ctx->frame_start = 0;
 		//seek to last byte consumed by the previous decode4()
 		else if (ctx->frame_start) {
-			pkt.data += ctx->frame_start;
-			pkt.size -= ctx->frame_start;
+			pkt->data += ctx->frame_start;
+			pkt->size -= ctx->frame_start;
 		}
-		pkt.duration = gf_filter_pck_get_duration(pck);
+#endif
+
+		pkt->duration = gf_filter_pck_get_duration(pck);
 		if (gf_filter_pck_get_sap(pck)>0)
-			pkt.flags = AV_PKT_FLAG_KEY;
+			pkt->flags = AV_PKT_FLAG_KEY;
+
+		if (!ctx->first_cts_plus_one)
+			ctx->first_cts_plus_one = pkt->pts + 1;
 
 	} else {
-		pkt.size = 0;
+		pkt->size = 0;
 	}
 
+	prev_afmt = ctx->decoder->sample_fmt;
 	frame = ctx->frame;
-	len = avcodec_decode_audio4(ctx->decoder, frame, &gotpic, &pkt);
+
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
+	len = res = avcodec_decode_audio4(ctx->decoder, frame, &gotpic, pkt);
+#else
+	res = avcodec_send_packet(ctx->decoder, pkt);
+	switch (res) {
+	case AVERROR(EAGAIN):
+		if (src_pck) {
+			gf_list_del_item(ctx->src_packets, src_pck);
+			gf_filter_pck_unref(src_pck);
+		}
+		av_packet_unref(pkt);
+		return GF_OK;
+	case 0:
+	case AVERROR_EOF:
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to decode frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(res) ));
+		break;
+	}
+
+	gotpic = 0;
+	res = avcodec_receive_frame(ctx->decoder, frame);
+	switch (res) {
+	case AVERROR(EAGAIN):
+		res = 0;
+		break;
+	case 0:
+		gotpic = 1;
+		break;
+	case AVERROR_EOF:
+		res = 0;
+		break;
+	default:
+		break;
+	}
+dispatch_next:
+#endif
+
+	samples_to_trash = 0;
+	if ( gotpic && (ctx->delay<0)) {
+		if (pkt->pts + 1 - ctx->first_cts_plus_one + ctx->delay < 0) {
+			if (pkt->duration + ctx->delay < 0) {
+				frame->nb_samples = 0;
+				samples_to_trash = 0;
+				ctx->delay += pkt->duration;
+			} else {
+				samples_to_trash = (u32) -ctx->delay;
+			}
+			
+			if (!samples_to_trash || (samples_to_trash > (u32) frame->nb_samples) ) {
+				frame->nb_samples = 0;
+				samples_to_trash = 0;
+			}
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DELAY, NULL);
+		} else {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DELAY, NULL);
+			ctx->delay = 0;
+		}
+	}
 
 	//this will handle eos as well
-	if ((len<0) || !gotpic) {
+	if ((res<0) || !gotpic) {
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
 		ctx->frame_start = 0;
+#endif
 		if (pck) gf_filter_pid_drop_packet(ctx->in_pid);
-		if (pkt.size && (len<0)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to decode frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt.pts, av_err2str(len) ));
+		if (pkt->size && (res<0)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to decode frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(res) ));
+			FF_RELEASE_PCK(pkt);
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
+		FF_RELEASE_PCK(pkt);
 		if (is_eos) {
 			gf_filter_pid_set_eos(ctx->out_pid);
 			return GF_EOS;
 		}
 		if (ctx->reconfig_pending) {
-			if (ctx->decoder->extradata) gf_free(ctx->decoder->extradata);
-			ctx->decoder->extradata = NULL;
-			avcodec_close(ctx->decoder);
+			GF_Err e;
+			avcodec_free_context(&ctx->decoder);
 			ctx->decoder = NULL;
 			ctx->reconfig_pending = GF_FALSE;
 			//these properties are checked after decode, when we reconfigure we copy props from input to output
@@ -435,18 +671,44 @@
 			ctx->sample_rate = 0;
 			ctx->channels = 0;
 			ctx->channel_layout = 0;
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[FFDec] PID %s reconfigure pending and all frames flushed, reconfguring\n", gf_filter_pid_get_name(ctx->in_pid) ));
-			return ffdec_configure_pid(filter, ctx->in_pid, GF_FALSE);
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[FFDec] PID %s reconfigure pending and all frames flushed, reconfiguring\n", gf_filter_pid_get_name(ctx->in_pid) ));
+			e = ffdec_configure_pid(filter, ctx->in_pid, GF_FALSE);
+			if (e==GF_NOT_SUPPORTED)
+				return GF_PROFILE_NOT_SUPPORTED;
+			return e;
 		}
 		return GF_OK;
 	}
+	FF_RELEASE_PCK(pkt);
+
 
 	FF_CHECK_PROP(channels, channels, GF_PROP_PID_NUM_CHANNELS)
 	FF_CHECK_PROPL(channel_layout, channel_layout, GF_PROP_PID_CHANNEL_LAYOUT)
 	FF_CHECK_PROP(sample_rate, sample_rate, GF_PROP_PID_SAMPLE_RATE)
 
-	output_size = frame->nb_samples*ctx->channels*ctx->bytes_per_sample;
+	if (prev_afmt != ctx->decoder->sample_fmt) {
+		ctx->sample_fmt = ffmpeg_audio_fmt_to_gpac(ctx->decoder->sample_fmt);
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->sample_fmt) );
+		ctx->bytes_per_sample = gf_audio_fmt_bit_depth(ctx->sample_fmt) / 8;
+	}
+
+	if (pck) {
+		const GF_PropertyValue *er = gf_filter_pck_get_property(pck, GF_PROP_PCK_END_RANGE);
+		if (er && er->value.boolean) {
+			u32 timescale = gf_filter_pck_get_timescale(pck);
+			u64 odur = gf_filter_pck_get_duration(pck);
+			if (timescale != ctx->sample_rate) {
+				odur = gf_timestamp_rescale(odur, timescale, ctx->sample_rate);
+			}
+			if (odur < frame->nb_samples) {
+				frame->nb_samples = (int) odur;
+			}
+		}
+	}
+
+	output_size = (frame->nb_samples - samples_to_trash) * ctx->channels * ctx->bytes_per_sample;
 	dst_pck = gf_filter_pck_new_alloc(ctx->out_pid, output_size, &data);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	switch (frame->format) {
 	case AV_SAMPLE_FMT_U8P:
@@ -455,13 +717,13 @@
 	case AV_SAMPLE_FMT_FLTP:
 	case AV_SAMPLE_FMT_DBLP:
 		for (i=0; (u32) i< ctx->channels; i++) {
-			char *inputChannel = frame->extended_data[i];
-			memcpy(data, inputChannel, ctx->bytes_per_sample * frame->nb_samples);
-			data += ctx->bytes_per_sample * frame->nb_samples;
+			char *inputChannel = frame->extended_data[i] + samples_to_trash * ctx->bytes_per_sample;
+			memcpy(data, inputChannel, ctx->bytes_per_sample * (frame->nb_samples-samples_to_trash) );
+			data += ctx->bytes_per_sample * (frame->nb_samples-samples_to_trash);
 		}
 		break;
 	default:
-		memcpy(data, ctx->frame->data[0], ctx->bytes_per_sample * frame->nb_samples * ctx->channels);
+		memcpy(data, ctx->frame->data[0] + samples_to_trash * ctx->bytes_per_sample, ctx->bytes_per_sample * (frame->nb_samples - samples_to_trash) * ctx->channels);
 		break;
 	}
 
@@ -473,27 +735,31 @@
 
 	if (src_pck) {
 		gf_filter_pck_merge_properties(src_pck, dst_pck);
+		gf_filter_pck_set_dependency_flags(dst_pck, 0);
 		gf_list_rem(ctx->src_packets, 0);
 		gf_filter_pck_unref(src_pck);
 	}
 
-	if (frame->pkt_pts != AV_NOPTS_VALUE) {
-		u64 pts = frame->pkt_pts;
-		u32 timescale = gf_filter_pck_get_timescale(pck);
-		if (ctx->nb_samples_already_in_frame) {
-			if (ctx->sample_rate == timescale) {
-				pts += ctx->nb_samples_already_in_frame;
+	if (output_size) {
+		if (frame->pts != AV_NOPTS_VALUE) {
+			u64 pts = frame->pts;
+			u32 timescale = gf_filter_pck_get_timescale(pck);
+			if (ctx->nb_samples_already_in_frame) {
+				if (ctx->sample_rate == timescale) {
+					pts += ctx->nb_samples_already_in_frame;
+				}
 			}
+			if (pts >= ctx->ts_offset) pts -= ctx->ts_offset;
+			else pts = 0;
+			gf_filter_pck_set_cts(dst_pck, pts);
+			gf_filter_pck_set_dts(dst_pck, pts);
 		}
-		gf_filter_pck_set_cts(dst_pck, pts);
-	}
-	if (frame->pkt_dts != AV_NOPTS_VALUE) {
-		gf_filter_pck_set_dts(dst_pck, frame->pkt_dts);
+		gf_filter_pck_send(dst_pck);
+	} else {
+		gf_filter_pck_discard(dst_pck);
 	}
 
-
-	gf_filter_pck_send(dst_pck);
-
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
 	ctx->frame_start += len;
 	//done with this input packet
 	if (in_size <= (s32) ctx->frame_start) {
@@ -501,21 +767,40 @@
 		ctx->frame_start = 0;
 		ctx->nb_samples_already_in_frame = 0;
 		gf_filter_pid_drop_packet(ctx->in_pid);
-		return GF_OK;
+
+		if (gf_filter_pid_would_block(ctx->out_pid))
+			return GF_OK;
+
+		//if space available in output, decode right away - needed for audio formats with very short frames
+		//avoid recursion
+		goto decode_next;
 	}
 	//still some data to decode in packet, don't drop it
 	//todo: check if frame->pkt_pts or frame->pts is updated by ffmpeg, otherwise do it ourselves !
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] Code not yet tested - frame PTS was "LLU" - nb samples dec %d\n", frame->pkt_pts, frame->nb_samples));
 	ctx->nb_samples_already_in_frame += frame->nb_samples;
 	frame->nb_samples = 0;
+#else
+	//if multiple frames in packet, send them
+	gotpic = 0;
+	res = avcodec_receive_frame(ctx->decoder, frame);
+	if (res==0) {
+		gotpic = 1;
+		goto dispatch_next;
+	}
+	if (pck) gf_filter_pid_drop_packet(ctx->in_pid);
+#endif
+
+	//avoid recursion
+	goto decode_next;
 
-	return ffdec_process_audio(filter, ctx);
+//	return ffdec_process_audio(filter, ctx);
 }
 
 #ifdef FF_SUB_SUPPORT
 static GF_Err ffdec_process_subtitle(GF_Filter *filter, struct _gf_ffdec_ctx *ctx)
 {
-	AVPacket pkt;
+	AVPacket *pkt;
 	AVSubtitle subs;
 	s32 gotpic;
 	s32 len, in_size;
@@ -527,39 +812,34 @@
 		is_eos = gf_filter_pid_is_eos(ctx->in_pid);
 		if (!is_eos) return GF_OK;
 	}
-	av_init_packet(&pkt);
-	if (pck) pkt.data = (uint8_t *) gf_filter_pck_get_data(pck, &in_size);
+	FF_INIT_PCK(ctx, pkt);
+
+	if (pck) pkt->data = (uint8_t *) gf_filter_pck_get_data(pck, &in_size);
 
 	if (!is_eos) {
 		u64 dts;
-		pkt.pts = gf_filter_pck_get_cts(pck);
+		pkt->pts = gf_filter_pck_get_cts(pck);
 
 		//copy over SAP and duration in dts
 		dts = gf_filter_pck_get_sap(pck);
 		dts <<= 32;
 		dts |= gf_filter_pck_get_duration(pck);
-		pkt.dts = dts;
+		pkt->dts = dts;
 
-		pkt.size = in_size;
-		if (ctx->frame_start > pkt.size) ctx->frame_start = 0;
-		//seek to last byte consumed by the previous decode4()
-		else if (ctx->frame_start) {
-			pkt.data += ctx->frame_start;
-			pkt.size -= ctx->frame_start;
-		}
+		pkt->size = in_size;
 	} else {
-		pkt.size = 0;
+		pkt->size = 0;
 	}
 
 	memset(&subs, 0, sizeof(AVSubtitle));
-	len = avcodec_decode_subtitle2(ctx->decoder, &subs, &gotpic, &pkt);
+	len = avcodec_decode_subtitle2(ctx->decoder, &subs, &gotpic, pkt);
 
 	//this will handle eos as well
 	if ((len<0) || !gotpic) {
-		ctx->frame_start = 0;
+		FF_RELEASE_PCK(pkt)
 		if (pck) gf_filter_pid_drop_packet(ctx->in_pid);
 		if (len<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to decode frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt.pts, av_err2str(len) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to decode frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(len) ));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		if (is_eos) {
@@ -573,6 +853,7 @@
 
 	avsubtitle_free(&subs);
 	if (pck) gf_filter_pid_drop_packet(ctx->in_pid);
+	FF_RELEASE_PCK(pkt)
 	return GF_OK;
 }
 #endif
@@ -582,20 +863,38 @@
 	GF_FFDecodeCtx *ctx = (GF_FFDecodeCtx *) gf_filter_get_udta(filter);
 	if (gf_filter_pid_would_block(ctx->out_pid))
 		return GF_OK;
+
 	return ctx->process(filter, ctx);
 }
 
+static const GF_FilterCapability FFDecodeAnnexBCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_VVC),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_AVC),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+
 static GF_Err ffdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	s32 res;
 	u32 type=0, gpac_codecid=0;
+	AVDictionary *options = NULL;
 	const GF_PropertyValue *prop;
+	const AVCodec *codec=NULL;
+	Bool unwrap_extra_data = GF_FALSE;
 	GF_FFDecodeCtx *ctx = (GF_FFDecodeCtx *) gf_filter_get_udta(filter);
 
 	//disconnect of src pid (not yet supported)
 	if (is_remove) {
 		//one in one out, this is simple
-		if (ctx->out_pid) gf_filter_pid_remove(ctx->out_pid);
+		if (ctx->out_pid) {
+			gf_filter_pid_remove(ctx->out_pid);
+			ctx->out_pid = NULL;
+		}
 		return GF_OK;
 	}
 
@@ -620,6 +919,8 @@
 	if (gpac_codecid==GF_CODECID_RAW)
 		return GF_NOT_SUPPORTED;
 
+	if (gf_sys_is_test_mode() && (gpac_codecid == GF_CODECID_MPEG_AUDIO))
+		gpac_codecid = GF_CODECID_MPEG2_PART3;
 
 	//initial config or update
 	if (!ctx->in_pid || (ctx->in_pid==pid)) {
@@ -634,32 +935,66 @@
 	}
 
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
-	ctx->width = prop ? prop->value.uint : 320;
+	ctx->width = prop ? prop->value.uint : 0;
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
-	ctx->height = prop ? prop->value.uint : 240;
-
+	ctx->height = prop ? prop->value.uint : 0;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+	ctx->sample_rate = prop ? prop->value.uint : 0;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+	ctx->channels = prop ? prop->value.uint : 0;
+
+	if (gpac_codecid==GF_CODECID_VVC) {
+		u32 codec_id = ffmpeg_codecid_from_gpac(gpac_codecid, NULL);
+		codec = codec_id ? avcodec_find_decoder(codec_id) : NULL;
+		//first version of libvvdec+ffmpeg only supported annexB, request ufnalu adaptation filter
+		if (codec && codec->name && strstr(codec->name, "vvdec") && gf_opts_get_bool("core", "vvdec-annexb")) {
+			//vvdec currently requires bootstrap on SAP
+			if (!ctx->decoder)
+				ctx->force_rap_wait = GF_TRUE;
+
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_UNFRAMED);
+			if (!prop || !prop->value.boolean) {
+				gf_filter_override_caps(filter, FFDecodeAnnexBCaps, GF_ARRAY_LENGTH(FFDecodeAnnexBCaps));
+				gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+				return GF_OK;
+			}
+		}
+	}
 
 	if (gpac_codecid == GF_CODECID_FFMPEG) {
-		AVCodec *codec=NULL;
-		prop = gf_filter_pid_get_property(pid, GF_FFMPEG_DECODER_CONFIG);
-		if (!prop || !prop->value.ptr) {
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FFMPEG_CODEC_ID);
+		if (prop && (prop->type==GF_PROP_POINTER)) {
+			ctx->decoder = prop->value.ptr;
+			if (!ctx->decoder) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s codec context not exposed by demuxer !\n", gf_filter_pid_get_name(pid) ));
+				return GF_SERVICE_ERROR;
+			}
+			codec = avcodec_find_decoder(ctx->decoder->codec_id);
+			ctx->owns_context = GF_FALSE;
+		} else if (prop && (prop->type==GF_PROP_UINT)) {
+			ctx->decoder = avcodec_alloc_context3(NULL);
+			if (! ctx->decoder) return GF_OUT_OF_MEM;
+			codec = avcodec_find_decoder(prop->value.uint);
+			ctx->owns_context = GF_TRUE;
+		}
+
+		if (!prop) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s codec context not exposed by demuxer !\n", gf_filter_pid_get_name(pid) ));
 			return GF_SERVICE_ERROR;
 		}
-		ctx->decoder = prop->value.ptr;
-		codec = avcodec_find_decoder(ctx->decoder->codec_id);
-		if (!codec) return GF_NOT_SUPPORTED;
 
-		res = avcodec_open2(ctx->decoder, codec, NULL );
-		if (res < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to open codec context: %s\n", gf_filter_pid_get_name(pid), av_err2str(res) ));
-			return GF_NON_COMPLIANT_BITSTREAM;
+		if (!codec) {
+			gf_filter_set_name(filter, "ffdec");
+			return GF_NOT_SUPPORTED;
 		}
 	}
 	//we reconfigure the stream
 	else {
-		AVCodec *codec=NULL;
 		u32 codec_id, ff_codectag=0;
+
+ if (!ctx->owns_context) {
+ ctx->decoder = NULL;
+ }
 		if (ctx->decoder) {
 			codec_id = ffmpeg_codecid_from_gpac(gpac_codecid, NULL);
 			//same codec, same config, don't reinit
@@ -674,6 +1009,7 @@
 				}
 			}
 
+ 
 			//we could further optimize by detecting we have the same codecid and injecting the extradata
 			//but this is not 100% reliable, and will require parsing AVC/HEVC config
 			//since this seems to work properly with decoder close/open, we keep it as is
@@ -690,9 +1026,39 @@
 			}
 
 		}
-		if (codec_id) codec = avcodec_find_decoder(codec_id);
+		if (codec_id)
+			codec = avcodec_find_decoder(codec_id);
+
+		if (!codec_id && ctx->ffcmap.nb_items) {
+			char szFmt[20], szFmt2[20];
+			u32 i, l1, l2;
+			sprintf(szFmt, "%d@", gpac_codecid);
+			l1 = (u32) strlen(szFmt);
+			sprintf(szFmt2, "%s@", gf_4cc_to_str(gpac_codecid));
+			l2 = (u32) strlen(szFmt2);
+			for (i=0; i<ctx->ffcmap.nb_items; i++) {
+				char *fmt = NULL;
+				Bool unwrap_dsi = GF_FALSE;
+				if (!strncmp(ctx->ffcmap.vals[i], szFmt, l1)) fmt = ctx->ffcmap.vals[i] + l1;
+				else if (!strncmp(ctx->ffcmap.vals[i], szFmt2, l2)) fmt = ctx->ffcmap.vals[i] + l2;
+				else continue;
+
+				if (fmt[0]=='+') {
+					unwrap_dsi = GF_TRUE;
+					fmt++;
+				}
+				codec = avcodec_find_decoder_by_name(fmt);
+				if (codec) {
+					unwrap_extra_data = unwrap_dsi;
+					break;
+				}
+			}
+		}
+		if (!codec && gpac_codecid) codec = avcodec_find_decoder_by_name( gf_4cc_to_str(gpac_codecid));
+
 		if (!codec) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] No decoder found for codec %s\n", gf_codecid_name(gpac_codecid) ));
+			gf_filter_set_name(filter, "ffdec");
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -701,34 +1067,71 @@
 		ctx->owns_context = GF_TRUE;
 		if (ff_codectag)
 			ctx->decoder->codec_tag = ff_codectag;
+	}
+
+	if (ctx->owns_context) {
 
 		ffmpeg_set_enc_dec_flags(ctx->options, ctx->decoder);
 
-		//we may have a dsi here!
-		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
-		if (prop && prop->value.data.ptr && prop->value.data.size) {
-			//looks loke ffmpeg wants the fLaC keyword
-			if (gpac_codecid==GF_CODECID_FLAC) {
-				ctx->decoder->extradata_size = prop->value.data.size+4;
-				ctx->decoder->extradata = gf_malloc(sizeof(char) * prop->value.data.size+4);
-				memcpy(ctx->decoder->extradata, "fLaC", 4);
-				memcpy(ctx->decoder->extradata+4, prop->value.data.ptr, prop->value.data.size);
-			} else {
-				ctx->decoder->extradata_size = prop->value.data.size;
-				ctx->decoder->extradata = gf_malloc(sizeof(char) * prop->value.data.size);
-				memcpy(ctx->decoder->extradata, prop->value.data.ptr, prop->value.data.size);
-			}
-			ctx->extra_data_crc = gf_crc_32(prop->value.data.ptr, prop->value.data.size);
+		//for some raw codecs
+		if (ctx->width && ctx->height) {
+			ctx->decoder->width = ctx->width;
+			ctx->decoder->height = ctx->height;
 		}
+		if (ctx->sample_rate && ctx->channels) {
+			ctx->decoder->sample_rate = ctx->sample_rate;
+			ctx->decoder->channels = ctx->channels;
+		}
+	}
 
-		res = avcodec_open2(ctx->decoder, codec, NULL );
-		if (res < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to open codec context: %s\n", gf_filter_pid_get_name(pid), av_err2str(res) ));
-			return GF_NON_COMPLIANT_BITSTREAM;
+	//we may have a dsi here!
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (prop
+		&& ((prop->type==GF_PROP_DATA) || (prop->type==GF_PROP_CONST_DATA))
+		&& prop->value.data.ptr
+		&& prop->value.data.size
+	) {
+		//looks like ffmpeg wants the fLaC keyword
+		if (gpac_codecid==GF_CODECID_FLAC) {
+			ctx->decoder->extradata_size = prop->value.data.size+4;
+			ctx->decoder->extradata = av_malloc(sizeof(char) * prop->value.data.size+4);
+			memcpy(ctx->decoder->extradata, "fLaC", 4);
+			memcpy(ctx->decoder->extradata+4, prop->value.data.ptr, prop->value.data.size);
+		} else {
+			u8 *dsi = prop->value.data.ptr;
+			u32 dsi_size = prop->value.data.size;
+			if (unwrap_extra_data && (dsi_size>8)) {
+				u32 size = dsi[0]; size<<=8;
+				size |= dsi[1]; size<<=8;
+				size |= dsi[2]; size<<=8;
+				size |= dsi[3];
+				if (size == dsi_size) {
+					dsi += 8;
+					dsi_size -= 8;
+				}
+			}
+
+			ctx->decoder->extradata_size = dsi_size;
+			ctx->decoder->extradata = av_malloc(sizeof(char) * dsi_size);
+			memcpy(ctx->decoder->extradata, dsi, dsi_size);
 		}
+		ctx->extra_data_crc = gf_crc_32(ctx->decoder->extradata, ctx->decoder->extradata_size);
+	}
+
+	//by default let libavcodec decide - if single thread is required, let the user define -threads option
+	if (codec->capabilities & AV_CODEC_CAP_AUTO_THREADS)
+		ctx->decoder->thread_count = 0;
+
+	//clone options (in case we need to destroy/recreate the codec) and open codec
+	av_dict_copy(&options, ctx->options, 0);
+	res = avcodec_open2(ctx->decoder, codec, &options);
+	if (res < 0) {
+		if (options) av_dict_free(&options);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] PID %s failed to open codec context: %s\n", gf_filter_pid_get_name(pid), av_err2str(res) ));
+		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
-	ffmpeg_report_unused_options(filter, ctx->options);
+	ffmpeg_report_options(filter, options, ctx->options);
 
 	//we're good to go, declare our output pid
 	ctx->in_pid = pid;
@@ -752,20 +1155,27 @@
 
 	if (type==GF_STREAM_VISUAL) {
 		u32 pix_fmt;
+		ctx->force_full_range = GF_FALSE;
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_RANGE, NULL );
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_MX, NULL );
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_TRANSFER, NULL );
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_COLR_PRIMARIES, NULL );
+
 		ctx->process = ffdec_process_video;
 		//for some streams, we don't have w/h/pixfmt after opening the decoder
 		//to make sure we are not confusing potential filters expecting them, init to default values
 		if (ctx->decoder->pix_fmt>=0) {
-			pix_fmt = ffmpeg_pixfmt_to_gpac(ctx->decoder->pix_fmt);
+			ctx->o_ff_pfmt = ctx->decoder->pix_fmt;
+			pix_fmt = ffmpeg_pixfmt_to_gpac(ctx->decoder->pix_fmt, GF_FALSE);
 			if (!pix_fmt) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFDec] Unsupported pixel format %d, defaulting to RGB\n", pix_fmt));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFDec] Unsupported pixel format %d, defaulting to RGB\n", ctx->decoder->pix_fmt));
 				pix_fmt = GF_PIXEL_RGB;
 			}
-			FF_CHECK_PROP_VAL(pixel_fmt, pix_fmt, GF_PROP_PID_PIXFMT)
 		} else {
-			ctx->pixel_fmt = GF_PIXEL_YUV;
-			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_PIXFMT, &PROP_UINT( ctx->pixel_fmt) );
+			pix_fmt = GF_PIXEL_YUV;
+			ctx->o_ff_pfmt = AV_PIX_FMT_YUV420P;
 		}
+		ffdec_check_pix_fmt_change(ctx, pix_fmt);
 
 		if (ctx->decoder->width) {
 			FF_CHECK_PROP(width, width, GF_PROP_PID_WIDTH)
@@ -791,12 +1201,15 @@
 
 	} else if (type==GF_STREAM_AUDIO) {
 		ctx->process = ffdec_process_audio;
-		ctx->sample_fmt = ffmpeg_audio_fmt_to_gpac(ctx->decoder->sample_fmt);
-		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->sample_fmt) );
-		ctx->bytes_per_sample = gf_audio_fmt_bit_depth(ctx->sample_fmt) / 8;
+		if (ctx->decoder->sample_fmt != AV_SAMPLE_FMT_NONE) {
+			ctx->sample_fmt = ffmpeg_audio_fmt_to_gpac(ctx->decoder->sample_fmt);
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->sample_fmt) );
+			ctx->bytes_per_sample = gf_audio_fmt_bit_depth(ctx->sample_fmt) / 8;
+		}
 
 		//override PID props with what decoder gives us
 		if (ctx->decoder->channels) {
+			ctx->channels = 0;
 			FF_CHECK_PROP(channels, channels, GF_PROP_PID_NUM_CHANNELS)
 		}
 		if (ctx->decoder->channel_layout) {
@@ -807,6 +1220,7 @@
 			}
 		}
 		if (ctx->decoder->sample_rate) {
+			ctx->sample_rate = 0;
 			FF_CHECK_PROP(sample_rate, sample_rate, GF_PROP_PID_SAMPLE_RATE)
 		}
 		if (!ctx->frame)
@@ -816,6 +1230,20 @@
 			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT( ctx->sample_fmt) );
 		}
 
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_NO_PRIMING);
+		if (prop && prop->value.boolean) {
+			ctx->delay = 0;
+		} else {
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+			ctx->delay = prop ? prop->value.longsint : 0;
+			ctx->first_cts_plus_one = 0;
+
+			if (ctx->delay<0)
+				ctx->ts_offset = (u32) -ctx->delay;
+			else
+				ctx->ts_offset = 0;
+		}
+
 	} else {
 #ifdef FF_SUB_SUPPORT
 		ctx->process = ffdec_process_subtitle;
@@ -856,6 +1284,16 @@
 	if ((evt->base.type==GF_FEVT_PLAY) || (evt->base.type==GF_FEVT_SET_SPEED) || (evt->base.type==GF_FEVT_RESUME)) {
 		ctx->drop_non_refs = evt->play.drop_non_ref;
 	}
+	//play request, detach all pending source packets and trigger a reconfig to start from a clean state
+	else if (evt->base.type==GF_FEVT_STOP) {
+		while (gf_list_count(ctx->src_packets)) {
+			GF_FilterPacket *pck = gf_list_pop_back(ctx->src_packets);
+			gf_filter_pck_unref(pck);
+			//for video, this will reset the decoder
+			ctx->flush_done = GF_TRUE;
+		}
+	}
+
 	return GF_FALSE;
 }
 
@@ -867,8 +1305,11 @@
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_SVC),
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_LHVC),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_HEVC_TILES),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_VVC_SUBPIC),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
+	{ .code=GF_PROP_PID_SCALABLE, .val={.type=GF_PROP_BOOL, .value.boolean = GF_TRUE}, .flags=(GF_CAPS_INPUT_OPT), .priority=255 },
 	{0},
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
@@ -894,7 +1335,23 @@
 	.name = "ffdec",
 	.version = LIBAVCODEC_IDENT,
 	GF_FS_SET_DESCRIPTION("FFMPEG decoder")
-	GF_FS_SET_HELP("See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details")
+	GF_FS_SET_HELP("This filter decodes audio and video streams using FFMPEG.\n"
+	"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.\n"
+	"To list all supported decoders for your GPAC build, use `gpac -h ffdec:*`.\n"
+	"\n"
+	"Options can be passed from prompt using `--OPT=VAL`\n"
+	"The default threading mode is to let libavcodec decide how many threads to use. To enforce single thread, use `--threads=1`\n"
+	"\n"
+	"# Codec Map\n"
+	"The [-ffcmap]() option allows specifying FFMPEG codecs for codecs not supported by GPAC.\n"
+	"Each entry in the list is formated as `GID@name` or `GID@+name`, with:\n"
+	"- GID: 4CC or 32 bit identifier of codec ID, as indicated by `gpac -i source inspect:full`\n"
+	"- name: FFMPEG codec name\n"
+	"- `+': is set and extra data is set and formatted as an ISOBMFF box, removes box header\n"
+	"\n"
+	"EX gpac -i source --ffcmap=BKV1@binkvideo vout\n"
+	"This will map an ISOBMFF track declared with coding type `BKV1` to binkvideo.\n"
+	)
 	.private_size = sizeof(GF_FFDecodeCtx),
 	SETCAPS(FFDecodeCaps),
 	.initialize = ffdec_initialize,
@@ -911,8 +1368,10 @@
 };
 
 
+#define OFFS(_n)	#_n, offsetof(GF_FFDecodeCtx, _n)
 static const GF_FilterArgs FFDecodeArgs[] =
 {
+	{ OFFS(ffcmap), "codec map", GF_PROP_STRING_LIST, NULL, NULL, 0},
 	{ "*", -1, "any possible options defined for AVCodecContext and sub-classes. See `gpac -hx ffdec` and `gpac -hx ffdec:*`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{0}
 };

gpac-1.0.1.tar.gz/src/filters/ff_dmx.c -> gpac-2.0.0.tar.gz/src/filters/ff_dmx.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ffmpeg demux filter
@@ -31,6 +31,7 @@
 
 //for NTP clock
 #include <gpac/network.h>
+#include <gpac/bitstream.h>
 
 enum
 {
@@ -42,6 +43,12 @@
 
 typedef struct
 {
+	GF_FilterPid *pid;
+	u64 ts_offset;
+} PidCtx;
+
+typedef struct
+{
 	//options
 	const char *src;
 	u32 block_size;
@@ -60,15 +67,23 @@
 	//demux options
 	AVDictionary *options;
 
-	GF_FilterPid **pids;
+	PidCtx *pids_ctx;
 
 	Bool raw_pck_out;
+	u32 nb_streams;
 	u32 nb_playing;
 	Bool stop_seen;
 	u64 first_sample_clock, last_frame_ts;
 	u32 probe_frames;
+ u32 nb_pck_sent;
+	Double last_play_start_range;
 
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 	AVPacket pkt;
+#else
+	AVPacket *pkt;
+#endif
+
 	s32 audio_idx, video_idx;
 
 	u64 *probe_times;
@@ -83,8 +98,8 @@
 static void ffdmx_finalize(GF_Filter *filter)
 {
 	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *) gf_filter_get_udta(filter);
-	if (ctx->pids)
-		gf_free(ctx->pids);
+	if (ctx->pids_ctx)
+		gf_free(ctx->pids_ctx);
 	if (ctx->options)
 		av_dict_free(&ctx->options);
 	if (ctx->probe_times)
@@ -105,7 +120,11 @@
 {
 	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *) gf_filter_get_udta(filter);
 	if (ctx->raw_pck_out) {
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 		av_free_packet(&ctx->pkt);
+#else
+		av_packet_unref(ctx->pkt);
+#endif
 		ctx->raw_pck_out = GF_FALSE;
 		gf_filter_post_process_task(filter);
 	}
@@ -119,6 +138,8 @@
 	u8 *data_dst;
 	Bool copy = GF_TRUE;
 	GF_FilterPacket *pck_dst;
+	AVPacket *pkt;
+	PidCtx *pctx;
 	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *) gf_filter_get_udta(filter);
 
 	if (!ctx->nb_playing)
@@ -128,44 +149,56 @@
 		return GF_EOS;
 
 	sample_time = gf_sys_clock_high_res();
-	av_init_packet(&ctx->pkt);
-	ctx->pkt.stream_index = -1;
+
+	FF_INIT_PCK(ctx, pkt)
+
+	pkt->stream_index = -1;
+
 	/*EOF*/
-	if (av_read_frame(ctx->demuxer, &ctx->pkt) <0) {
-		av_free_packet(&ctx->pkt);
+	if (av_read_frame(ctx->demuxer, pkt) <0) {
+		FF_FREE_PCK(pkt);
 		if (!ctx->raw_data) {
-			for (i=0; i<ctx->demuxer->nb_streams; i++) {
-				if (ctx->pids[i]) gf_filter_pid_set_eos(ctx->pids[i]);
+			for (i=0; i<ctx->nb_streams; i++) {
+				if (ctx->pids_ctx[i].pid) gf_filter_pid_set_eos(ctx->pids_ctx[i].pid);
 			}
 			return GF_EOS;
 		}
 		return GF_OK;
 	}
+	assert(pkt->stream_index>=0);
+	assert(pkt->stream_index < (s32) ctx->demuxer->nb_streams);
 
-	assert(ctx->pkt.stream_index>=0);
-	assert(ctx->pkt.stream_index < (s32) ctx->demuxer->nb_streams);
+	if (pkt->stream_index >= (s32) ctx->nb_streams) {
+		GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] More streams (%d) than initialy declared (%d), buggy source demux or not supported, ignoring packet in stream %d\n", ctx->fname, ctx->demuxer->nb_streams, ctx->nb_streams, pkt->stream_index+1 ));
+		FF_FREE_PCK(pkt);
+		return GF_OK;
+	}
 
-	if (ctx->pkt.pts == AV_NOPTS_VALUE) {
-		if (ctx->pkt.dts == AV_NOPTS_VALUE) {
-			GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] No PTS for packet on stream %d\n", ctx->fname, ctx->pkt.stream_index ));
+	if (pkt->pts == AV_NOPTS_VALUE) {
+		if (pkt->dts == AV_NOPTS_VALUE) {
+			GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] No PTS for packet on stream %d\n", ctx->fname, pkt->stream_index ));
 		} else {
-			ctx->pkt.pts = ctx->pkt.dts;
+			pkt->pts = pkt->dts;
 		}
 	}
 
-	if (! ctx->pids[ctx->pkt.stream_index] ) {
-		GF_LOG(GF_LOG_DEBUG, ctx->log_class, ("[%s] No PID defined for given stream %d\n", ctx->fname, ctx->pkt.stream_index ));
-		av_free_packet(&ctx->pkt);
+	pctx = &ctx->pids_ctx[pkt->stream_index];
+	if (! pctx->pid ) {
+		GF_LOG(GF_LOG_DEBUG, ctx->log_class, ("[%s] No PID defined for given stream %d\n", ctx->fname, pkt->stream_index ));
+		FF_FREE_PCK(pkt);
 		return GF_OK;
 	}
-
+ if (ctx->stop_seen && ! gf_filter_pid_is_playing( pctx->pid ) ) {
+		FF_FREE_PCK(pkt);
+ return GF_OK;
+ }
 	if (ctx->raw_data && (ctx->probe_frames<ctx->probes) ) {
-		if (ctx->pkt.stream_index==ctx->audio_idx) {
-			av_free_packet(&ctx->pkt);
+		if (pkt->stream_index==ctx->audio_idx) {
+			FF_FREE_PCK(pkt);
 			return GF_OK;
 		}
 
-		ctx->probe_times[ctx->probe_frames] = ctx->sclock ? sample_time : ctx->pkt.pts;
+		ctx->probe_times[ctx->probe_frames] = ctx->sclock ? sample_time : pkt->pts;
 		ctx->probe_frames++;
 		if (ctx->probe_frames==ctx->probes) {
 			u32 best_diff=0, max_stat=0;
@@ -187,25 +220,62 @@
 			}
 			GF_LOG(GF_LOG_INFO, ctx->log_class, ("[%s] Video probing done, frame diff is %d us (for %d frames out of %d)\n", ctx->fname, best_diff, max_stat, ctx->probes));
 		} else {
-			av_free_packet(&ctx->pkt);
+			FF_FREE_PCK(pkt);
 			return GF_OK;
 		}
 	}
 
+	if (pkt->side_data_elems) {
+		for (i=0; i < (u32) pkt->side_data_elems; i++) {
+			AVPacketSideData *sd = &pkt->side_data[i];
+			if (sd->type == AV_PKT_DATA_NEW_EXTRADATA) {
+				gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA(sd->data, sd->size) );
+			}
+			else if (sd->type == AV_PKT_DATA_PARAM_CHANGE) {
+				GF_BitStream *bs = gf_bs_new(sd->data, sd->size, GF_BITSTREAM_READ);
+
+				u32 flags = gf_bs_read_u32_le(bs);
+				if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) {
+					u32 new_ch = gf_bs_read_u32_le(bs);
+					gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(new_ch) );
+				}
+				if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) {
+					u64 new_lay = gf_bs_read_u64_le(bs);
+					new_lay = ffmpeg_channel_layout_to_gpac(new_lay);
+					gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(new_lay) );
+				}
+				if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) {
+					u32 new_sr = gf_bs_read_u32_le(bs);
+					gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(new_sr) );
+				}
+				if (flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS) {
+					u32 new_w = gf_bs_read_u32_le(bs);
+					u32 new_h = gf_bs_read_u32_le(bs);
+					gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_WIDTH, &PROP_UINT(new_w) );
+					gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_HEIGHT, &PROP_UINT(new_h) );
+				}
+				gf_bs_del(bs);
+			}
+			//todo, map the rest ?
+		}
+	}
+
 	if (ctx->raw_data) {
-		if (ctx->pkt.stream_index==ctx->audio_idx) copy = ctx->copy_audio;
+		if (pkt->stream_index==ctx->audio_idx) copy = ctx->copy_audio;
 		else copy = ctx->copy_video;
 	}
 
 	if (ctx->raw_data && !copy) {
 		//we don't use shared memory on demuxers since they are usually the ones performing all the buffering
-		pck_dst = gf_filter_pck_new_shared(ctx->pids[ctx->pkt.stream_index], ctx->pkt.data, ctx->pkt.size, ffdmx_shared_pck_release);
+		pck_dst = gf_filter_pck_new_shared(pctx->pid, pkt->data, pkt->size, ffdmx_shared_pck_release);
+		if (!pck_dst) return GF_OUT_OF_MEM;
 		ctx->raw_pck_out = GF_TRUE;
 	} else {
 		//we don't use shared memory on demuxers since they are usually the ones performing all the buffering
-		pck_dst = gf_filter_pck_new_alloc(ctx->pids[ctx->pkt.stream_index] , ctx->pkt.size, &data_dst);
+		pck_dst = gf_filter_pck_new_alloc(pctx->pid , pkt->size, &data_dst);
+		if (!pck_dst) return GF_OUT_OF_MEM;
 		assert(pck_dst);
-		memcpy(data_dst, ctx->pkt.data, ctx->pkt.size);
+		memcpy(data_dst, pkt->data, pkt->size);
 	}
 
 
@@ -217,26 +287,41 @@
 		ts = sample_time - ctx->first_sample_clock;
 		gf_filter_pck_set_cts(pck_dst, ts );
 		ctx->last_frame_ts = ts;
-	} else if (ctx->pkt.pts != AV_NOPTS_VALUE) {
-		AVStream *stream = ctx->demuxer->streams[ctx->pkt.stream_index];
-		u64 ts = ctx->pkt.pts * stream->time_base.num;
+	} else if (pkt->pts != AV_NOPTS_VALUE) {
+		AVStream *stream = ctx->demuxer->streams[pkt->stream_index];
+		u64 ts;
 
+		//initial delay setup - we only dispatch dts or cts >=0
+		if (!pctx->ts_offset) {
+			//if first dts is <0, offset timeline and set offset
+			if ((pkt->dts != AV_NOPTS_VALUE) && (pkt->dts<0) && pctx->ts_offset) {
+				pctx->ts_offset = -pkt->dts + 1;
+				gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_DELAY, &PROP_LONGSINT( pkt->dts) );
+			}
+			//otherwise reset any potential delay set previously
+			else {
+				pctx->ts_offset = 1;
+				gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_DELAY, NULL);
+			}
+		}
+
+		ts = (pkt->pts + pctx->ts_offset-1) * stream->time_base.num;
 		gf_filter_pck_set_cts(pck_dst, ts );
 
-		if (ctx->pkt.dts != AV_NOPTS_VALUE) {
-			ts = ctx->pkt.dts * stream->time_base.num;
+		if (pkt->dts != AV_NOPTS_VALUE) {
+			ts = (pkt->dts + pctx->ts_offset-1) * stream->time_base.num;
 			gf_filter_pck_set_dts(pck_dst, ts);
 		}
 
-		if (ctx->pkt.duration)
-			gf_filter_pck_set_duration(pck_dst, (u32) ctx->pkt.duration);
+		if (pkt->duration)
+			gf_filter_pck_set_duration(pck_dst, (u32) pkt->duration);
 	}
 
 	//fixme: try to identify SAP type 2 and more
-	if (ctx->pkt.flags & AV_PKT_FLAG_KEY)
+	if (pkt->flags & AV_PKT_FLAG_KEY)
 		gf_filter_pck_set_sap(pck_dst, GF_FILTER_SAP_1);
 
-	if (ctx->pkt.flags & AV_PKT_FLAG_CORRUPT)
+	if (pkt->flags & AV_PKT_FLAG_CORRUPT)
 		gf_filter_pck_set_corrupted(pck_dst, GF_TRUE);
 
 	gf_net_get_utc();
@@ -246,9 +331,10 @@
 		gf_filter_pck_set_property(pck_dst, GF_PROP_PCK_SENDER_NTP, &PROP_LONGUINT(ntp) );
 	}
 	e = gf_filter_pck_send(pck_dst);
-
-	if (!ctx->raw_pck_out)
-		av_free_packet(&ctx->pkt);
+ ctx->nb_pck_sent++;
+	if (!ctx->raw_pck_out) {
+		FF_FREE_PCK(pkt);
+	}
 	return e;
 }
 
@@ -286,20 +372,63 @@
 #endif
 	char szName[50];
 
+#if (LIBAVCODEC_VERSION_MAJOR >= 59)
+	ctx->pkt = av_packet_alloc();
+#endif
 
-	ctx->pids = gf_malloc(sizeof(GF_FilterPid *)*ctx->demuxer->nb_streams);
-	memset(ctx->pids, 0, sizeof(GF_FilterPid *)*ctx->demuxer->nb_streams);
+	ctx->pids_ctx = gf_malloc(sizeof(PidCtx)*ctx->demuxer->nb_streams);
+	memset(ctx->pids_ctx, 0, sizeof(PidCtx)*ctx->demuxer->nb_streams);
+	ctx->nb_streams = ctx->demuxer->nb_streams;
 
 	nb_a = nb_v = 0;
 	for (i = 0; i < ctx->demuxer->nb_streams; i++) {
 		GF_FilterPid *pid=NULL;
 		Bool force_reframer = GF_FALSE;
 		Bool expose_ffdec=GF_FALSE;
+		u32 gpac_codec_id;
 		AVStream *stream = ctx->demuxer->streams[i];
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 		AVCodecContext *codec = stream->codec;
-		u32 gpac_codec_id;
+		u32 codec_type = codec->codec_type;
+		u32 codec_id = codec->codec_id;
+		const uint8_t *exdata = codec->extradata;
+		u32 exdata_size = codec->extradata_size;
+		u32 codec_sample_rate = codec->sample_rate;
+		u32 codec_frame_size = codec->frame_size;
+		u32 codec_channels = codec->channels;
+		u32 codec_width = codec->width;
+		u32 codec_height = codec->height;
+		u32 codec_field_order = codec->field_order;
+		u32 codec_tag = codec->codec_tag;
+		u32 codec_pixfmt = codec->pix_fmt;
+		AVRational codec_framerate = {0, 0};
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+		codec_framerate = codec->framerate;
+#endif
+		s32 codec_sample_fmt = codec->sample_fmt;
+		u32 codec_bitrate = (u32) codec->bit_rate;
+
+#else
+		u32 codec_type = stream->codecpar->codec_type;
+		u32 codec_id = stream->codecpar->codec_id;
+		const uint8_t *exdata = stream->codecpar->extradata;
+		u32 exdata_size = stream->codecpar->extradata_size;
+		u32 codec_sample_rate = stream->codecpar->sample_rate;
+		u32 codec_frame_size = stream->codecpar->frame_size;
+		u32 codec_channels = stream->codecpar->channels;
+		u32 codec_width = stream->codecpar->width;
+		u32 codec_height = stream->codecpar->height;
+		u32 codec_field_order = stream->codecpar->field_order;
+		u32 codec_tag = stream->codecpar->codec_tag;
+		u32 codec_pixfmt = (codec_type==AVMEDIA_TYPE_VIDEO) ? stream->codecpar->format : 0;
+		s32 codec_sample_fmt = (codec_type==AVMEDIA_TYPE_AUDIO) ? stream->codecpar->format : 0;
+		u32 codec_bitrate = (u32) stream->codecpar->bit_rate;
+		AVRational codec_framerate = stream->r_frame_rate;
+		if (!stream->r_frame_rate.num || !stream->r_frame_rate.den)
+			codec_framerate = stream->avg_frame_rate;
+#endif
 
-		switch(codec->codec_type) {
+		switch(codec_type) {
 		case AVMEDIA_TYPE_AUDIO:
 			pid = gf_filter_pid_new(filter);
 			if (!pid) return GF_OUT_OF_MEM;
@@ -333,7 +462,8 @@
 			break;
 		}
 		if (!pid) continue;
-		ctx->pids[i] = pid;
+		ctx->pids_ctx[i].pid = pid;
+		ctx->pids_ctx[i].ts_offset = 0;
 		gf_filter_pid_set_udta(pid, stream);
 
 		gf_filter_pid_set_property(pid, GF_PROP_PID_ID, &PROP_UINT(stream->id ? stream->id : i+1) );
@@ -366,10 +496,10 @@
 			}
 		}
 
-		gpac_codec_id = ffmpeg_codecid_to_gpac(codec->codec_id);
+		gpac_codec_id = ffmpeg_codecid_to_gpac(codec_id);
 		if (!gpac_codec_id) {
 			gf_filter_pid_set_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_FFMPEG) );
-			expose_ffdec=GF_TRUE;
+			expose_ffdec = GF_TRUE;
 		} else {
 			gf_filter_pid_set_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(gpac_codec_id) );
 		}
@@ -378,11 +508,11 @@
 			gf_filter_pid_set_property(pid, GF_PROP_PID_RAWGRAB, &PROP_BOOL(GF_TRUE) );
 		else if (ctx->demuxer->iformat) {
 			if ((ctx->demuxer->iformat->flags & AVFMT_SEEK_TO_PTS) || ctx->demuxer->iformat->read_seek)
-				gf_filter_pid_set_property(pid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_SEEK ) );
+				gf_filter_pid_set_property(pid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 		}
 
 		//force reframer for the following formats if no DSI is found
-		if (!codec->extradata_size) {
+		if (!exdata_size) {
 			switch (gpac_codec_id) {
 			case GF_CODECID_AC3:
 			case GF_CODECID_AAC_MPEG4:
@@ -397,12 +527,20 @@
 			}
 		}
 		if (expose_ffdec) {
-			const char *cname = avcodec_get_name(codec->codec_id);
-			gf_filter_pid_set_property(pid, GF_FFMPEG_DECODER_CONFIG, &PROP_POINTER( (void*)codec ) );
+			const char *cname = avcodec_get_name(codec_id);
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_FFMPEG_CODEC_ID, &PROP_POINTER( (void*)codec ) );
+#else
+			gf_filter_pid_set_property(pid, GF_PROP_PID_FFMPEG_CODEC_ID, &PROP_UINT( codec_id ) );
+			if (exdata) {
+				//expose as const data
+				gf_filter_pid_set_property(pid, GF_PROP_PID_DECODER_CONFIG, &PROP_CONST_DATA( (char *)exdata, exdata_size) );
+			}
+#endif
 
 			if (cname)
 				gf_filter_pid_set_property_str(pid, "ffmpeg:codec", &PROP_STRING(cname ) );
-		} else if (codec->extradata_size) {
+		} else if (exdata_size) {
 
 			//avc/hevc read by ffmpeg is still in annex B format
 			if (ctx->demuxer->iformat) {
@@ -413,7 +551,7 @@
 
 			if (!force_reframer) {
 				//expose as const data
-				gf_filter_pid_set_property(pid, GF_PROP_PID_DECODER_CONFIG, &PROP_CONST_DATA( (char *)codec->extradata, codec->extradata_size) );
+				gf_filter_pid_set_property(pid, GF_PROP_PID_DECODER_CONFIG, &PROP_CONST_DATA( (char *)exdata, exdata_size) );
 			}
 		}
 
@@ -422,65 +560,56 @@
 		}
 
 
-		if (codec->sample_rate)
-			gf_filter_pid_set_property(pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT( codec->sample_rate ) );
-		if (codec->frame_size)
-			gf_filter_pid_set_property(pid, GF_PROP_PID_SAMPLES_PER_FRAME, &PROP_UINT( codec->frame_size ) );
-		if (codec->channels)
-			gf_filter_pid_set_property(pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT( codec->channels ) );
+		if (codec_sample_rate)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT( codec_sample_rate ) );
+		if (codec_frame_size)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_SAMPLES_PER_FRAME, &PROP_UINT( codec_frame_size ) );
+		if (codec_channels)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT( codec_channels ) );
 
-		if (codec->width)
-			gf_filter_pid_set_property(pid, GF_PROP_PID_WIDTH, &PROP_UINT( codec->width ) );
-		if (codec->height)
-			gf_filter_pid_set_property(pid, GF_PROP_PID_HEIGHT, &PROP_UINT( codec->height ) );
-#if LIBAVCODEC_VERSION_MAJOR >= 58
-		if (codec->framerate.num && codec->framerate.den)
-			gf_filter_pid_set_property(pid, GF_PROP_PID_FPS, &PROP_FRAC_INT( codec->framerate.num, codec->framerate.den ) );
-#endif
+		if (codec_width)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_WIDTH, &PROP_UINT( codec_width ) );
+		if (codec_height)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_HEIGHT, &PROP_UINT( codec_height ) );
 
-		if (codec->field_order>AV_FIELD_PROGRESSIVE)
+		if (codec_width && codec_height) {
+			if (codec_framerate.num && codec_framerate.den)
+				gf_filter_pid_set_property(pid, GF_PROP_PID_FPS, &PROP_FRAC_INT( codec_framerate.num, codec_framerate.den ) );
+			else {
+				GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] Unknown frame rate, will use 25 fps - use `:#FPS=VAL` to force frame rate signaling\n", ctx->fname));
+				gf_filter_pid_set_property(pid, GF_PROP_PID_FPS, &PROP_FRAC_INT( 25, 1 ) );
+			}
+		}
+		
+		if (codec_field_order>AV_FIELD_PROGRESSIVE)
 			gf_filter_pid_set_property(pid, GF_PROP_PID_INTERLACED, &PROP_BOOL(GF_TRUE) );
 
-		if ((codec->codec_type==AVMEDIA_TYPE_VIDEO)
-			&& (codec->pix_fmt || ((codec->codec_id==AV_CODEC_ID_RAWVIDEO) && codec->codec_tag))
+		if ((codec_type==AVMEDIA_TYPE_VIDEO)
+			&& (codec_pixfmt || ((codec_id==AV_CODEC_ID_RAWVIDEO) && codec_tag))
 		) {
+			Bool is_full_range = GF_FALSE;
 			u32 pfmt = 0;
 
-#define CHECK_FF_PFMT(__ff_cid, __gp_cid)\
-			if ((codec->pix_fmt && (codec->pix_fmt==__ff_cid)) \
-				|| (codec->codec_tag && (avcodec_pix_fmt_to_codec_tag(__ff_cid) == codec->codec_tag))) { \
-				pfmt = __gp_cid; \
-			} \
-
-			CHECK_FF_PFMT(AV_PIX_FMT_YUV420P, GF_PIXEL_YUV)
-			else CHECK_FF_PFMT(AV_PIX_FMT_YUV420P10LE, GF_PIXEL_YUV_10)
-			else CHECK_FF_PFMT(AV_PIX_FMT_YUV422P, GF_PIXEL_YUV422)
-			else CHECK_FF_PFMT(AV_PIX_FMT_YUV422P10LE, GF_PIXEL_YUV422_10)
-			else CHECK_FF_PFMT(AV_PIX_FMT_YUV444P, GF_PIXEL_YUV444)
-			else CHECK_FF_PFMT(AV_PIX_FMT_YUV444P10LE, GF_PIXEL_YUV444_10)
-			else CHECK_FF_PFMT(AV_PIX_FMT_RGBA, GF_PIXEL_RGBA)
-			else CHECK_FF_PFMT(AV_PIX_FMT_RGB24, GF_PIXEL_RGB)
-			else CHECK_FF_PFMT(AV_PIX_FMT_BGR24, GF_PIXEL_BGR)
-			else CHECK_FF_PFMT(AV_PIX_FMT_UYVY422, GF_PIXEL_UYVY)
-			else CHECK_FF_PFMT(AV_PIX_FMT_YUYV422, GF_PIXEL_YUYV)
-			else CHECK_FF_PFMT(AV_PIX_FMT_NV12, GF_PIXEL_NV12)
-			else CHECK_FF_PFMT(AV_PIX_FMT_NV21, GF_PIXEL_NV21)
-			else CHECK_FF_PFMT(AV_PIX_FMT_0RGB, GF_PIXEL_XRGB)
-			else CHECK_FF_PFMT(AV_PIX_FMT_RGB0, GF_PIXEL_RGBX)
-			else CHECK_FF_PFMT(AV_PIX_FMT_0BGR, GF_PIXEL_XBGR)
-			else CHECK_FF_PFMT(AV_PIX_FMT_BGR0, GF_PIXEL_BGRX)
-			else {
-				GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] Unsupported pixel format %d\n", ctx->fname, codec->pix_fmt));
+			if (codec_pixfmt) {
+				pfmt = ffmpeg_pixfmt_to_gpac(codec_pixfmt, GF_FALSE);
+				is_full_range = ffmpeg_pixfmt_is_fullrange(codec_pixfmt);
+			} else if (codec_tag) {
+				pfmt = ffmpeg_pixfmt_from_codec_tag(codec_tag, &is_full_range);
 			}
-			gf_filter_pid_set_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT( pfmt) );
 
-#undef CHECK_FF_PFMT
+			if (!pfmt) {
+				GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] Unsupported pixel format %d\n", ctx->fname, codec_pixfmt));
+			} else {
+				gf_filter_pid_set_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT( pfmt) );
+				if (is_full_range)
+					gf_filter_pid_set_property(pid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL( GF_TRUE ) );
+			}
 		}
 
 
-		if (codec->sample_fmt>0) {
+		if (codec_sample_fmt>0) {
 			u32 sfmt = 0;
-			switch (codec->sample_fmt) {
+			switch (codec_sample_fmt) {
 			case AV_SAMPLE_FMT_U8: sfmt = GF_AUDIO_FMT_U8; break;
 			case AV_SAMPLE_FMT_S16: sfmt = GF_AUDIO_FMT_S16; break;
 			case AV_SAMPLE_FMT_S32: sfmt = GF_AUDIO_FMT_S32; break;
@@ -492,15 +621,15 @@
 			case AV_SAMPLE_FMT_FLTP: sfmt = GF_AUDIO_FMT_FLTP; break;
 			case AV_SAMPLE_FMT_DBLP: sfmt = GF_AUDIO_FMT_DBLP; break;
 			default:
-				GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] Unsupported sample format %d\n", ctx->fname, codec->sample_fmt));
+				GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] Unsupported sample format %d\n", ctx->fname, codec_sample_fmt));
 			}
 			gf_filter_pid_set_property(pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT( sfmt) );
 		}
 
-		if (codec->bit_rate)
-			gf_filter_pid_set_property(pid, GF_PROP_PID_BITRATE, &PROP_UINT( (u32) codec->bit_rate ) );
+		if (codec_bitrate)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_BITRATE, &PROP_UINT( (u32) codec_bitrate ) );
 
-		gf_filter_pid_set_property(pid, GF_PROP_PID_URL, &PROP_STRING(ctx->demuxer->filename));
+		gf_filter_pid_set_property(pid, GF_PROP_PID_URL, &PROP_STRING( AVFMT_URL(ctx->demuxer) ));
 	}
 
 	if (!nb_a && !nb_v
@@ -516,12 +645,22 @@
 static int ffavio_read_packet(void *opaque, uint8_t *buf, int buf_size)
 {
 	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *)opaque;
-	return (int) gf_fread(buf, buf_size, ctx->gfio);
+	int res = (int) gf_fread(buf, buf_size, ctx->gfio);
+	if (!res && gf_feof(ctx->gfio)) {
+		return AVERROR_EOF;
+	}
+	return res;
 }
 
 static int64_t ffavio_seek(void *opaque, int64_t offset, int whence)
 {
 	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *)opaque;
+	if (whence==AVSEEK_SIZE) {
+		u64 pos = gf_ftell(ctx->gfio);
+		u64 size = gf_fsize(ctx->gfio);
+		gf_fseek(ctx->gfio, pos, SEEK_SET);
+		return size;
+	}
 	return (int64_t) gf_fseek(ctx->gfio, offset, whence);
 }
 
@@ -532,7 +671,7 @@
 	s32 res;
 	char *ext;
 	const char *url;
-	AVInputFormat *av_in = NULL;
+	const AVInputFormat *av_in = NULL;
 	ctx->fname = "FFDmx";
 	ctx->log_class = GF_LOG_CONTAINER;
 
@@ -542,6 +681,7 @@
 #ifdef GPAC_ENABLE_COVERAGE
 	if (gf_sys_is_cov_mode()) {
 		ffdmx_update_arg(filter, NULL, NULL);
+		ffmpeg_pixfmt_from_codec_tag(0, NULL);
 	}
 #endif
 	if (!ctx->src) {
@@ -581,7 +721,10 @@
 		url = gf_fileio_translate_url(ctx->src);
 	}
 
-	res = avformat_open_input(&ctx->demuxer, url, av_in, ctx->options ? &ctx->options : NULL);
+	AVDictionary *options = NULL;
+	av_dict_copy(&options, ctx->options, 0);
+
+	res = avformat_open_input(&ctx->demuxer, url, FF_IFMT_CAST av_in, &options);
 
 	switch (res) {
 	case 0:
@@ -605,52 +748,60 @@
 		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Fail to open %s - error %s\n", ctx->fname, ctx->src, av_err2str(res) ));
 		avformat_close_input(&ctx->demuxer);
 		avformat_free_context(ctx->demuxer);
+		if (options) av_dict_free(&options);
 		return e;
 	}
 
-
-	ffmpeg_report_unused_options(filter, ctx->options);
-
 	res = avformat_find_stream_info(ctx->demuxer, ctx->options ? &ctx->options : NULL);
 	if (res <0) {
 		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] cannot locate streams - error %s\n", ctx->fname, av_err2str(res)));
 		e = GF_NOT_SUPPORTED;
 		avformat_close_input(&ctx->demuxer);
 		avformat_free_context(ctx->demuxer);
+		if (options) av_dict_free(&options);
 		return e;
 	}
 	GF_LOG(GF_LOG_DEBUG, ctx->log_class, ("[%s] file %s opened - %d streams\n", ctx->fname, ctx->src, ctx->demuxer->nb_streams));
 
+	ffmpeg_report_options(filter, options, ctx->options);
 	return ffdmx_init_common(filter, ctx, GF_FALSE);
 }
 
 
-static Bool ffdmx_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+static Bool ffdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
 {
 	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
 
-	switch (com->base.type) {
+	switch (evt->base.type) {
 	case GF_FEVT_PLAY:
-		if (!ctx->nb_playing && !ctx->raw_data
-			&& (ctx->stop_seen || (com->play.start_range>0))
-		) {
-			int res = av_seek_frame(ctx->demuxer, -1, (s64) (AV_TIME_BASE*com->play.start_range), AVSEEK_FLAG_BACKWARD);
+		//change in play range
+		if (!ctx->raw_data && (ctx->last_play_start_range != evt->play.start_range)) {
+			u32 i;
+			int res = av_seek_frame(ctx->demuxer, -1, (s64) (AV_TIME_BASE*evt->play.start_range), AVSEEK_FLAG_BACKWARD);
 			if (res<0) {
-				GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] Fail to seek %s to %g - error %s\n", ctx->fname, ctx->src, com->play.start_range, av_err2str(res) ));
+				GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] Fail to seek %s to %g - error %s\n", ctx->fname, ctx->src, evt->play.start_range, av_err2str(res) ));
+			}
+			//reset initial delay compute
+			for (i=0; i<ctx->demuxer->nb_streams; i++) {
+				ctx->pids_ctx[i].ts_offset = 0;
 			}
+			ctx->last_play_start_range = evt->play.start_range;
+		}
+		else if (!ctx->nb_playing) {
+			ctx->last_play_start_range = evt->play.start_range;
 		}
 		ctx->nb_playing++;
 		ctx->stop_seen = GF_FALSE;
-
 		//cancel event
 		return GF_TRUE;
 
 	case GF_FEVT_STOP:
 		if (ctx->nb_playing) {
 			ctx->nb_playing--;
-			if (!ctx->nb_playing)
-				ctx->stop_seen = GF_TRUE;
+			ctx->stop_seen = GF_TRUE;
 		}
+		if (ctx->nb_pck_sent)
+			ctx->last_play_start_range = -1;
 		//cancel event
 		return GF_TRUE;
 
@@ -677,11 +828,12 @@
 static const char *ffdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
 {
 	int ffscore;
-	AVInputFormat *probe_fmt;
+	const AVInputFormat *probe_fmt;
 	AVProbeData pb;
 
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 	av_register_all();
-
+#endif
 
 	memset(&pb, 0, sizeof(AVProbeData));
 	//not setting this crashes some probers in ffmpeg
@@ -719,8 +871,14 @@
 GF_FilterRegister FFDemuxRegister = {
 	.name = "ffdmx",
 	.version=LIBAVFORMAT_IDENT,
-	GF_FS_SET_DESCRIPTION("FFMPEG demuxer")
-	GF_FS_SET_HELP("See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details")
+	GF_FS_SET_DESCRIPTION("FFMPEG demultiplexer")
+	GF_FS_SET_HELP("This filter demultiplexes an input file or open a source protocol using FFMPEG.\n"
+	"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.\n"
+	"To list all supported demultiplexers for your GPAC build, use `gpac -h ffdmx:*`.\n"
+	"This will list both supported input formats and protocols.\n"
+	"Input protocols are listed with `Description: Input protocol`, and the subclass name identifies the protocol scheme.\n"
+	"For example, if `ffdmx:rtmp` is listed as input protocol, this means `rtmp://` source URLs are supported.\n"
+	)
 	.private_size = sizeof(GF_FFDemuxCtx),
 	SETCAPS(FFDmxCaps),
 	.initialize = ffdmx_initialize,
@@ -736,11 +894,12 @@
 
 static const GF_FilterArgs FFDemuxArgs[] =
 {
-	{ OFFS(src), "location of source content", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(src), "URL of source content", GF_PROP_NAME, NULL, NULL, 0},
 	{ "*", -1, "any possible options defined for AVFormatContext and sub-classes. See `gpac -hx ffdmx` and `gpac -hx ffdmx:*`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{0}
 };
 
+
 const GF_FilterRegister *ffdmx_register(GF_FilterSession *session)
 {
 	ffmpeg_build_register(session, &FFDemuxRegister, FFDemuxArgs, 2, FF_REG_TYPE_DEMUX);
@@ -751,12 +910,12 @@
 
 static GF_Err ffavin_initialize(GF_Filter *filter)
 {
-	s32 res, i;
+	s32 res, i, dev_idx=-1;
 	Bool has_a, has_v;
 	char szPatchedName[1024];
 	const char *dev_name=NULL;
 	const char *default_fmt=NULL;
-	AVInputFormat *dev_fmt=NULL;
+	const AVInputFormat *dev_fmt=NULL;
 	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
 	Bool wants_audio = GF_FALSE;
 	Bool wants_video = GF_FALSE;
@@ -788,18 +947,18 @@
 			GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Cannot find the input format %s\n", ctx->fname, ctx->fmt));
 		}
 #if LIBAVCODEC_VERSION_MAJOR >= 58
-		else if (dev_fmt->priv_class->category!=AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) {
-			GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s]] %s is not a video input device\n", ctx->fname, ctx->fmt));
+		else if (dev_fmt->priv_class->category != AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT && dev_fmt->priv_class->category != AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT) {
+			GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s]] %s is neither a video nor an audio input device\n", ctx->fname, ctx->fmt));
 			dev_fmt = NULL;
 		}
 #else
-		//not supported for old FFMPE versions
+		//not supported for old FFMPEG versions
 #endif
 	}
 #if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)
 	if (!dev_fmt) {
 		while (1) {
-			dev_fmt = av_input_video_device_next(dev_fmt);
+			dev_fmt = av_input_video_device_next(FF_IFMT_CAST dev_fmt);
 			if (!dev_fmt) break;
 			if (!dev_fmt || !dev_fmt->priv_class) continue;
 			if ((dev_fmt->priv_class->category != AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) && (dev_fmt->priv_class->category != AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT))
@@ -821,6 +980,14 @@
 	else if (!strncmp(ctx->src, "audio://", 8)) wants_audio = GF_TRUE;
 	else if (!strncmp(ctx->src, "av://", 5)) wants_video = wants_audio = GF_TRUE;
 
+	if (sscanf(dev_name, "%d", &dev_idx)==1) {
+		sprintf(szPatchedName, "%d", dev_idx);
+		if (strcmp(szPatchedName, dev_name)) 
+			dev_idx = -1;
+	} else {
+		dev_idx = -1;
+	}
+
 	szPatchedName[0]=0;
 
 #if defined(__DARWIN) || defined(__APPLE__)
@@ -830,9 +997,17 @@
 		dev_name = (char *) szPatchedName;
 	}
 #endif
+	if (!strncmp(dev_fmt->priv_class->class_name, "V4L2", 4) && (dev_idx>=0) ) {
+		if (wants_audio) {
+			sprintf(szPatchedName, "/dev/video%d:hw:%d", dev_idx, dev_idx);
+		} else {
+			sprintf(szPatchedName, "/dev/video%d", dev_idx);
+		}
+		dev_name = (char *) szPatchedName;
+	}
 
-	if (wants_video && wants_audio && !strcmp(dev_name, "0")) {
-		strcpy(szPatchedName, "0:0");
+	else if (wants_video && wants_audio && (dev_idx>=0)) {
+		sprintf(szPatchedName, "%d:%d", dev_idx, dev_idx);
 		dev_name = (char *) szPatchedName;
 	}
 #if defined(__APPLE__) && !defined(GPAC_CONFIG_IOS)
@@ -849,44 +1024,49 @@
 	ctx->demuxer = avformat_alloc_context();
 	ffmpeg_set_mx_dmx_flags(ctx->options, ctx->demuxer);
 
-	res = avformat_open_input(&ctx->demuxer, dev_name, dev_fmt, &ctx->options);
+	AVDictionary *options = NULL;
+	av_dict_copy(&options, ctx->options, 0);
+
+	res = avformat_open_input(&ctx->demuxer, dev_name, FF_IFMT_CAST dev_fmt, &options);
 	if ( (res < 0) && !stricmp(ctx->dev, "screen-capture-recorder") ) {
 		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Buggy screen capture input (open failed with code %d), retrying without specifying resolution\n", ctx->fname, res));
-		av_dict_set(&ctx->options, "video_size", NULL, 0);
-		res = avformat_open_input(&ctx->demuxer, ctx->dev, dev_fmt, &ctx->options);
+		av_dict_set(&options, "video_size", NULL, 0);
+		res = avformat_open_input(&ctx->demuxer, ctx->dev, FF_IFMT_CAST dev_fmt, &options);
 	}
 
 	if (res < 0) {
-		if (ctx->options) {
-			av_dict_free(&ctx->options);
+		if (options) {
+			av_dict_free(&options);
+			options = NULL;
 			GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Error %d opening input - retrying without options\n", ctx->fname, res));
-			res = avformat_open_input(&ctx->demuxer, dev_name, dev_fmt, NULL);
+			res = avformat_open_input(&ctx->demuxer, dev_name, FF_IFMT_CAST dev_fmt, NULL);
 		}
 		if (res<0) {
-			av_dict_set(&ctx->options, "framerate", "30", 0);
+			av_dict_set(&options, "framerate", "30", 0);
 			GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Error %d opening input - retrying with 30 fps\n", ctx->fname, res));
-			res = avformat_open_input(&ctx->demuxer, dev_name, dev_fmt, &ctx->options);
+			res = avformat_open_input(&ctx->demuxer, dev_name, FF_IFMT_CAST dev_fmt, &options);
 			if (res < 0) {
-				av_dict_set(&ctx->options, "framerate", "25", 0);
+				av_dict_set(&options, "framerate", "25", 0);
 				GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Error %d opening input - retrying with 25 fps\n", ctx->fname, res));
-				res = avformat_open_input(&ctx->demuxer, dev_name, dev_fmt, &ctx->options);
+				res = avformat_open_input(&ctx->demuxer, dev_name, FF_IFMT_CAST dev_fmt, &options);
 			}
 		}
 	}
 
 	if (res < 0) {
 		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Cannot open device %s:%s\n", ctx->fname, dev_fmt->priv_class->class_name, ctx->dev));
+		if (options) av_dict_free(&options);
 		return -1;
 	}
 
-	ffmpeg_report_unused_options(filter, ctx->options);
-
 	av_dump_format(ctx->demuxer, 0, ctx->dev, 0);
 	ctx->raw_data = GF_TRUE;
 	ctx->audio_idx = ctx->video_idx = -1;
 
 	res = avformat_find_stream_info(ctx->demuxer, ctx->options ? &ctx->options : NULL);
 
+	ffmpeg_report_options(filter, options, ctx->options);
+
 	if (res <0) {
 		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] cannot locate streams - error %s\n", ctx->fname, av_err2str(res)));
 		return GF_NOT_SUPPORTED;
@@ -895,7 +1075,13 @@
 	//check we have the stream we want
 	has_a = has_v = GF_FALSE;
 	for (i = 0; (u32) i < ctx->demuxer->nb_streams; i++) {
-		switch(ctx->demuxer->streams[i]->codec->codec_type) {
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
+		u32 codec_type = ctx->demuxer->streams[i]->codec->codec_type;
+#else
+		u32 codec_type = ctx->demuxer->streams[i]->codecpar->codec_type;
+#endif
+
+		switch (codec_type) {
 		case AVMEDIA_TYPE_AUDIO:
 			has_a = GF_TRUE;
 			break;
@@ -957,22 +1143,35 @@
 static const GF_FilterCapability FFAVInCaps[] =
 {
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL)
+	//do not expose a specific codec ID (eg raw) as some grabbers might give us mjpeg
 };
 
 GF_FilterRegister FFAVInRegister = {
 	.name = "ffavin",
 	.version = LIBAVDEVICE_IDENT,
 	GF_FS_SET_DESCRIPTION("FFMPEG AV Capture")
-	GF_FS_SET_HELP("Typical classes are `dshow` on windows, `avfoundation` on OSX, `video4linux2` or `x11grab` on linux\n\n"\
-	"Typical device name can be the webcam name:\n"\
-		"`FaceTime HD Camera` on OSX, device name on windows, `/dev/video0` on linux\n"\
-		"`screen-capture-recorder`, see http://screencapturer.sf.net/ on windows\n"\
-		"`Capture screen 0` on OSX (0=first screen), or `screenN` for short\n"\
-		"X display name (eg `:0.0`) on linux"\
-		"\n"\
-		"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details")
+	GF_FS_SET_HELP("Reads from audio/video capture devices using FFMPEG.\n"
+	"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.\n"
+	"To list all supported grabbers for your GPAC build, use `gpac -h ffavin:*`.\n"
+	"\n"
+	"# Device identification\n"
+	"Typical classes are `dshow` on windows, `avfoundation` on OSX, `video4linux2` or `x11grab` on linux\n"
+	"\n"
+	"Typical device name can be the webcam name:\n"
+	"- `FaceTime HD Camera` on OSX, device name on windows, `/dev/video0` on linux\n"
+	"- `screen-capture-recorder`, see http://screencapturer.sf.net/ on windows\n"
+	"- `Capture screen 0` on OSX (0=first screen), or `screenN` for short\n"
+	"- X display name (e.g. `:0.0`) on linux\n"
+	"\n"
+	"The general mapping from ffmpeg command line is:\n"
+	"- ffmpeg `-f` maps to [-fmt]() option\n"
+	"- ffmpeg `-i` maps to [-dev]() option\n"
+	"\n"
+	"EX ffmpeg -f libndi_newtek -i MY_NDI_TEST ...\n"
+	"EX gpac -i av://:fmt=libndi_newtek:dev=MY_NDI_TEST ...\n"
+	"\n"
+	)
 	.private_size = sizeof(GF_FFDemuxCtx),
 	SETCAPS(FFAVInCaps),
 	.initialize = ffavin_initialize,
@@ -988,8 +1187,8 @@
 static const GF_FilterArgs FFAVInArgs[] =
 {
 	{ OFFS(src), "url of device, `video://`, `audio://` or `av://`", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(fmt), "name of device class - see filter help. If not set, defaults to first device class", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(dev), "name of device or index of device - see filter help", GF_PROP_STRING, "0", NULL, 0},
+	{ OFFS(fmt), "name of device class. If not set, defaults to first device class", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(dev), "name of device or index of device", GF_PROP_STRING, "0", NULL, 0},
 	{ OFFS(copy), "set copy mode of raw frames\n"
 		"- N: frames are only forwarded (shared memory, no copy)\n"
 		"- A: audio frames are copied, video frames are forwarded\n"
@@ -997,9 +1196,9 @@
 		"- AV: all frames are copied"
 		"", GF_PROP_UINT, "A", "N|A|V|AV", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(sclock), "use system clock (us) instead of device timestamp (for buggy devices)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(probes), "probe a given number of video frames before emitting - this usually helps with bad timing of the first frames", GF_PROP_UINT, "10", "0-100", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(probes), "probe a given number of video frames before emitting (this usually helps with bad timing of the first frames)", GF_PROP_UINT, "10", "0-100", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(block_size), "block size used to read file when using avio context", GF_PROP_UINT, "4096", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ "*", -1, "any possible options defined for AVInputFormat and AVFormatContext. See `gpac -hx ffavin` and `gpac -hx ffavin:*`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
+	{ "*", -1, "any possible options defined for AVInputFormat and AVFormatContext (see `gpac -hx ffavin` and `gpac -hx ffavin:*`)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{0}
 };

gpac-1.0.1.tar.gz/src/filters/ff_enc.c -> gpac-2.0.0.tar.gz/src/filters/ff_enc.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ffmpeg encode filter
@@ -37,10 +37,11 @@
 {
 	//opts
 	Bool all_intra;
-	char *c, *ffc;
+	char *c;
 	Bool ls;
 	u32 pfmt;
 	GF_Fraction fintra;
+	Bool rc;
 
 	//internal data
 	Bool initialized;
@@ -49,7 +50,7 @@
 	u32 target_rate;
 
 	AVCodecContext *encoder;
-	//decode options
+	//encode options
 	AVDictionary *options;
 
 	GF_FilterPid *in_pid, *out_pid;
@@ -87,7 +88,7 @@
 	u32 channels, sample_rate, channel_layout, bytes_per_sample;
 	//ffmpeg one
 	u32 sample_fmt;
-	//we store input audio frame in this buffer untill we have enough data for one encoder frame
+	//we store input audio frame in this buffer until we have enough data for one encoder frame
 	//we also store the remaining of a consumed frame here, so that input packet is realeased ASAP
 	char *audio_buffer;
 	u32 audio_buffer_size;
@@ -98,7 +99,7 @@
 
 	//shift of TS - ffmpeg may give pkt-> PTS < frame->PTS to indicate discard samples
 	//we convert back to frame PTS but signal discard samples at the PID level
-	s32 ts_shift;
+	s64 ts_shift;
 
 	GF_List *src_packets;
 
@@ -118,18 +119,80 @@
 	u64 orig_ts;
 	u32 nb_forced;
 
+	const AVCodec *force_codec;
+
+	//we don't forward media delay, we directly offset CTS/DTS
+	s64 in_tk_delay;
+
+	Bool discontunity;
+	GF_FilterPacket *disc_pck_ref;
+
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
+	AVPacket pkt;
+#else
+	AVPacket *pkt;
+#endif
+
+	u32 premul_timescale;
 } GF_FFEncodeCtx;
 
-static GF_Err ffenc_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove);
+static GF_Err ffenc_configure_pid_ex(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove, Bool is_force_reconf);
+
+static const GF_FilterCapability FFEncodeCapsVideo[] =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE)
+};
+
+static const GF_FilterCapability FFEncodeCapsAudio[] =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW)
+};
+
+static void ffenc_override_caps(GF_Filter *filter, u32 media_type)
+{
+	if (media_type==AVMEDIA_TYPE_AUDIO) {
+		gf_filter_override_caps(filter, FFEncodeCapsAudio, GF_ARRAY_LENGTH(FFEncodeCapsAudio) );
+	} else {
+		gf_filter_override_caps(filter, FFEncodeCapsVideo, GF_ARRAY_LENGTH(FFEncodeCapsVideo) );
+	}
+}
 
 static GF_Err ffenc_initialize(GF_Filter *filter)
 {
+	u32 codec_id;
 	GF_FFEncodeCtx *ctx = (GF_FFEncodeCtx *) gf_filter_get_udta(filter);
 	ctx->initialized = GF_TRUE;
 	ctx->src_packets = gf_list_new();
 	ctx->sdbs = gf_bs_new((u8*)ctx, 1, GF_BITSTREAM_READ);
 
 	ffmpeg_setup_logs(GF_LOG_CODEC);
+
+#if (LIBAVCODEC_VERSION_MAJOR >= 59)
+	ctx->pkt = av_packet_alloc();
+#endif
+
+	if (!ctx->c) return GF_OK;
+
+	//first look by name, to handle cases such as "aac" vs "vo_aacenc"
+	ctx->force_codec = avcodec_find_encoder_by_name(ctx->c);
+	if (ctx->force_codec) {
+		ffenc_override_caps(filter, ctx->force_codec->type);
+		return GF_OK;
+	}
+	//then look by codec ID
+	codec_id = gf_codecid_parse(ctx->c);
+	if (codec_id!=GF_CODECID_NONE) {
+		ctx->force_codec = avcodec_find_encoder(ffmpeg_codecid_from_gpac(codec_id, NULL) );
+	}
+	if (!ctx->force_codec) return GF_NOT_SUPPORTED;
+	ffenc_override_caps(filter, ctx->force_codec->type);
 	return GF_OK;
 }
 
@@ -147,13 +210,77 @@
 	}
 	gf_list_del(ctx->src_packets);
 
+#if (LIBAVCODEC_VERSION_MAJOR >= 59)
+	av_packet_free(&ctx->pkt);
+#endif
+
 	if (ctx->encoder) {
-		avcodec_close(ctx->encoder);
+		avcodec_free_context(&ctx->encoder);
 	}
 	if (ctx->sdbs) gf_bs_del(ctx->sdbs);
 	return;
 }
 
+static void ffenc_copy_pid_props(GF_FFEncodeCtx *ctx)
+{
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->out_pid, ctx->in_pid);
+	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, NULL);
+	if (!ctx->codecid) {
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_FFMPEG) );
+		if (ctx->encoder) {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_FFMPEG_CODEC_ID, &PROP_UINT(ctx->encoder->codec->id) );
+
+			const char *cname = avcodec_get_name(ctx->encoder->codec->id);
+			if (cname)
+				gf_filter_pid_set_property_str(ctx->out_pid, "ffmpeg:codec", &PROP_STRING(cname ) );
+		}
+	} else {
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_CODECID, &PROP_UINT(ctx->codecid) );
+	}
+	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_ISOM_STSD_TEMPLATE, NULL);
+	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_ISOM_SUBTYPE, NULL);
+	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_PROFILE_LEVEL, NULL);
+
+	switch (ctx->codecid) {
+	case GF_CODECID_AVC:
+	case GF_CODECID_HEVC:
+	case GF_CODECID_MPEG4_PART2:
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_UNFRAMED_FULL_AU, &PROP_BOOL(GF_TRUE) );
+		break;
+	default:
+		if (ctx->encoder && ctx->encoder->extradata_size && ctx->encoder->extradata) {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(ctx->encoder->extradata, ctx->encoder->extradata_size) );
+		}
+		break;
+	}
+	//if target rate is not known yet (encoder default and we setup an adaptation chain for the PID), signal a default 100k
+	//this prevents a warning in the dasher complaining that no rate is set, unaware that we will reconfigure the PID before sending data
+	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_BITRATE, &PROP_UINT(ctx->target_rate ? ctx->target_rate : 100000));
+
+	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_TARGET_RATE, NULL);
+
+	if (ctx->ts_shift) {
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DELAY, &PROP_LONGSINT( - ctx->ts_shift) );
+	} else {
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DELAY, NULL);
+	}
+	if (ctx->width && ctx->height) {
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_HAS_SYNC, ctx->all_intra ? NULL : &PROP_BOOL(GF_TRUE) );
+	}
+}
+
+static u64 ffenc_get_cts(GF_FFEncodeCtx *ctx, GF_FilterPacket *pck)
+{
+	u64 cts = gf_filter_pck_get_cts(pck);
+	if ((ctx->in_tk_delay<0) && (cts < (u64) -ctx->in_tk_delay)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFEnc] Negative input timestamp (cts="LLU" media delay="LLD")\n", cts, ctx->in_tk_delay));
+		return 0;
+	}
+	return cts + ctx->in_tk_delay;
+}
+
 //TODO add more feedback
 static void ffenc_log_video(GF_Filter *filter, struct _gf_ffenc_ctx *ctx, AVPacket *pkt, Bool do_reporting)
 {
@@ -171,7 +298,11 @@
 
 
 #if LIBAVCODEC_VERSION_MAJOR >= 58
+#if (LIBAVFORMAT_VERSION_MAJOR<59)
 	u32 sq_size;
+#else
+	size_t sq_size;
+#endif
 	u8 *side_q = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS, &sq_size);
 	if (side_q) {
 		gf_bs_reassign_buffer(ctx->sdbs, side_q, sq_size);
@@ -223,7 +354,7 @@
 
 static GF_Err ffenc_process_video(GF_Filter *filter, struct _gf_ffenc_ctx *ctx)
 {
-	AVPacket pkt;
+	AVPacket *pkt;
 	s32 gotpck;
 	const char *data = NULL;
 	u32 size=0, i, count, offset, to_copy;
@@ -234,6 +365,7 @@
 	Bool insert_jp2c = GF_FALSE;
 	GF_FilterPacket *dst_pck, *src_pck;
 	GF_FilterPacket *pck;
+	const GF_PropertyValue *p;
 
 	if (!ctx->in_pid) return GF_EOS;
 
@@ -256,9 +388,11 @@
 
 	if (pck) data = gf_filter_pck_get_data(pck, &size);
 
-	av_init_packet(&pkt);
-	pkt.data = (uint8_t*)ctx->enc_buffer;
-	pkt.size = ctx->enc_buffer_size;
+
+	FF_INIT_PCK(ctx, pkt)
+
+	pkt->data = (uint8_t*)ctx->enc_buffer;
+	pkt->size = ctx->enc_buffer_size;
 
 	ctx->frame->pict_type = 0;
 	ctx->frame->width = ctx->width;
@@ -275,16 +409,22 @@
 	if (pck && gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM)) {
 		force_intra = 2;
 	}
+	//if CUE_START is set on input, this is a segment boundary, force IDR sync
+	p = pck ? gf_filter_pck_get_property(pck, GF_PROP_PCK_CUE_START) : NULL;
+	if (p && p->value.boolean) {
+		force_intra = 2;
+	}
+
 	//check if we need to force a closed gop
-	if (pck && (ctx->fintra.den && ctx->fintra.num) && !ctx->force_reconfig) {
-		u64 cts = gf_filter_pck_get_cts(pck);
+	if (pck && (ctx->fintra.den && (ctx->fintra.num>0)) && !ctx->force_reconfig) {
+		u64 cts = ffenc_get_cts(ctx, pck);
 		if (!ctx->fintra_setup) {
 			ctx->fintra_setup = GF_TRUE;
 			ctx->orig_ts = cts;
 			force_intra = 1;
 			ctx->nb_forced=1;
 		} else if (cts < ctx->orig_ts) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFEnc] timestamps not increasing monotonuously, reseting forced intra state !\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFEnc] timestamps not increasing monotonuously, resetting forced intra state !\n"));
 			ctx->orig_ts = cts;
 			force_intra = 1;
 			ctx->nb_forced=1;
@@ -297,10 +437,11 @@
 			}
 		}
 	}
+
 	if (force_intra) {
 		//file switch we force a full reset to force injecting xPS in the stream
 		//we could also inject them manually but we don't have them !!
-		if (force_intra==2) {
+		if ((ctx->rc && ctx->nb_frames_in) || (force_intra==2)) {
 			if (!ctx->force_reconfig) {
 				ctx->reconfig_pending = GF_TRUE;
 				ctx->force_reconfig = GF_TRUE;
@@ -358,17 +499,13 @@
 			ctx->frame->interlaced_frame = 1;
 			ctx->frame->top_field_first = (ilaced==2) ? 1 : 0;
 		}
-		ctx->frame->pts = gf_filter_pck_get_cts(pck);
+		ctx->frame->pts = ffenc_get_cts(ctx, pck);
 		ctx->frame->pkt_duration = gf_filter_pck_get_duration(pck);
 
-#define SCALE_TS(_ts) if (_ts != GF_FILTER_NO_TS) { _ts *= ctx->encoder->time_base.den; _ts /= ctx->encoder->time_base.num; _ts /= ctx->timescale; }
-#define UNSCALE_TS(_ts) if (_ts != AV_NOPTS_VALUE) { _ts *= ctx->encoder->time_base.num; _ts *= ctx->timescale; _ts /= ctx->encoder->time_base.den; }
-#define UNSCALE_DUR(_ts) { _ts *= ctx->encoder->time_base.num; _ts *= ctx->timescale; _ts /= ctx->encoder->time_base.den; }
-
-		//store first frame CTS before rescaling, we use it after rescaling the output packet timing to compute CTS-DTS
-		if (!ctx->cts_first_frame_plus_one) {
-			ctx->cts_first_frame_plus_one = 1 + ctx->frame->pts;
-		}
+//use signed version of timestamp rescale since we may have negative dts
+#define SCALE_TS(_ts) if (_ts != GF_FILTER_NO_TS) { _ts = gf_timestamp_rescale_signed(_ts, ctx->premul_timescale, ctx->encoder->time_base.den); }
+#define UNSCALE_TS(_ts) if (_ts != AV_NOPTS_VALUE) { _ts = gf_timestamp_rescale_signed(_ts, ctx->encoder->time_base.den, ctx->premul_timescale); }
+#define UNSCALE_DUR(_ts) { _ts = gf_timestamp_rescale(_ts, ctx->encoder->time_base.den, ctx->premul_timescale); }
 
 		if (ctx->remap_ts) {
 			SCALE_TS(ctx->frame->pts);
@@ -376,71 +513,139 @@
 			SCALE_TS(ctx->frame->pkt_duration);
 		}
 
-		ctx->frame->pkt_dts = ctx->frame->pkt_pts = ctx->frame->pts;
+		//store first frame CTS as will be seen after rescaling (to cope with rounding errors
+		//we use it after rescaling the output packet timing to compute CTS-DTS
+		if (!ctx->cts_first_frame_plus_one) {
+			s64 ts = ctx->frame->pts;
+			UNSCALE_TS(ts)
+			ctx->cts_first_frame_plus_one = 1 + ts;
+		}
 
-		res = avcodec_encode_video2(ctx->encoder, &pkt, ctx->frame, &gotpck);
+
+#if (LIBAVFORMAT_VERSION_MAJOR<59)
+		ctx->frame->pkt_dts = ctx->frame->pkt_pts = ctx->frame->pts;
+		res = avcodec_encode_video2(ctx->encoder, pkt, ctx->frame, &gotpck);
+		ctx->nb_frames_in++;
+#else
+		ctx->frame->pkt_dts = ctx->frame->pts;
+		res = avcodec_send_frame(ctx->encoder, ctx->frame);
+		switch (res) {
+		case AVERROR(EAGAIN):
+			return GF_OK;
+		case 0:
+			break;
+		case AVERROR_EOF:
+			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] PID %s failed to encode frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(res) ));
+			break;
+		}
 		ctx->nb_frames_in++;
+		gotpck = 0;
+		res = avcodec_receive_packet(ctx->encoder, pkt);
+		switch (res) {
+		case AVERROR(EAGAIN):
+			res = 0;
+			break;
+		case 0:
+			gotpck = 1;
+			break;
+		case AVERROR_EOF:
+			res = 0;
+			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] PID %s failed to retrieve encoded packet PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(res) ));
+			break;
+		}
+#endif
 
-		//keep ref to ource properties
+		//keep ref to source properties
 		gf_filter_pck_ref_props(&pck);
 		gf_list_add(ctx->src_packets, pck);
+		if (ctx->discontunity) {
+			ctx->discontunity = GF_FALSE;
+			ctx->disc_pck_ref = pck;
+		}
 
 		gf_filter_pid_drop_packet(ctx->in_pid);
 
 		if (ctx->remap_ts) {
 			UNSCALE_TS(ctx->frame->pts);
 			UNSCALE_TS(ctx->frame->pkt_duration);
-
-			UNSCALE_TS(pkt.dts);
-			UNSCALE_TS(pkt.pts);
-			UNSCALE_DUR(pkt.duration);
+			if (gotpck) {
+				UNSCALE_TS(pkt->dts);
+				UNSCALE_TS(pkt->pts);
+				UNSCALE_DUR(pkt->duration);
+			}
 		}
 	} else {
-		res = avcodec_encode_video2(ctx->encoder, &pkt, NULL, &gotpck);
+#if (LIBAVFORMAT_VERSION_MAJOR<59)
+		res = avcodec_encode_video2(ctx->encoder, pkt, NULL, &gotpck);
+#else
+		//flush by sending NULL frame
+		avcodec_send_frame(ctx->encoder, NULL);
+		gotpck = 0;
+		res = avcodec_receive_packet(ctx->encoder, pkt);
+		if (!res) gotpck = 1;
+#endif
+
 		if (!gotpck) {
+			FF_RELEASE_PCK(pkt)
 			//done flushing encoder while reconfiguring
 			if (ctx->reconfig_pending) {
+				GF_Err e;
+				Bool bck_init_cts = ctx->init_cts_setup;
 				ctx->reconfig_pending = GF_FALSE;
+				ctx->force_reconfig = GF_FALSE;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FFEnc] codec flush done, triggering reconfiguration\n"));
 				avcodec_close(ctx->encoder);
 				ctx->encoder = NULL;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FFEnc] codec flush done, triggering reconfiguration\n"));
-				return ffenc_configure_pid(filter, ctx->in_pid, GF_FALSE);
+				e = ffenc_configure_pid_ex(filter, ctx->in_pid, GF_FALSE, GF_TRUE);
+				ctx->init_cts_setup = bck_init_cts;
+				return e;
 			}
 			ctx->flush_done = 1;
 			gf_filter_pid_set_eos(ctx->out_pid);
 			return GF_EOS;
 		}
 		if (ctx->remap_ts) {
-			UNSCALE_TS(pkt.dts);
-			UNSCALE_TS(pkt.pts);
-			UNSCALE_DUR(pkt.duration);
+			UNSCALE_TS(pkt->dts);
+			UNSCALE_TS(pkt->pts);
+			UNSCALE_DUR(pkt->duration);
 		}
 	}
 	now = gf_sys_clock_high_res() - now;
 	ctx->time_spent += now;
 
 	if (res<0) {
+		av_packet_free_side_data(pkt);
 		ctx->nb_frames_out++;
+		FF_RELEASE_PCK(pkt)
 		return GF_SERVICE_ERROR;
 	}
 
 	if (!gotpck) {
+		av_packet_free_side_data(pkt);
+		FF_RELEASE_PCK(pkt)
 		return GF_OK;
 	}
 
 	ctx->nb_frames_out++;
 	if (ctx->init_cts_setup) {
 		ctx->init_cts_setup = GF_FALSE;
-		if (ctx->frame->pts != pkt.pts) {
-			//check shift in PTS
-			ctx->ts_shift = (s32) ( (s64) ctx->cts_first_frame_plus_one - 1 - (s64) pkt.pts );
+		if (ctx->frame->pts != pkt->pts) {
+			//check shift in PTS - most of the time this is 0 (ffmpeg does not restamp video pts)
+			ctx->ts_shift = (s64) ctx->cts_first_frame_plus_one - 1 - (s64) pkt->pts;
 
 			//check shift in DTS
-			ctx->ts_shift += (s32) ( (s64) ctx->cts_first_frame_plus_one - 1 - (s64) pkt.dts );
+			ctx->ts_shift += (s64) ctx->cts_first_frame_plus_one - 1 - (s64) pkt->dts;
 		}
+
+		//if ts_shift>0, this means we have a skip
 		if (ctx->ts_shift) {
-			s64 shift = ctx->ts_shift;
-			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DELAY, &PROP_SINT((s32) shift) );
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DELAY, &PROP_LONGSINT( -ctx->ts_shift ) );
+		} else {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DELAY, NULL);
 		}
 	}
 
@@ -448,21 +653,20 @@
 	count = gf_list_count(ctx->src_packets);
 	for (i=0; i<count; i++) {
 		src_pck = gf_list_get(ctx->src_packets, i);
-		if (gf_filter_pck_get_cts(src_pck) == pkt.pts) break;
+		if (ffenc_get_cts(ctx, src_pck) == pkt->pts) break;
 		src_pck = NULL;
 	}
 
 	offset = 0;
-	to_copy = size = pkt.size;
-
+	to_copy = size = pkt->size;
 
 	if (ctx->codecid == GF_CODECID_J2K) {
-		u32 b4cc = GF_4CC(pkt.data[4], pkt.data[5], pkt.data[6], pkt.data[7]);
+		u32 b4cc = GF_4CC(pkt->data[4], pkt->data[5], pkt->data[6], pkt->data[7]);
 		if (b4cc == GF_4CC('j','P',' ',' ')) {
 			u32 jp2h_offset = 0;
 			offset = 12;
-			while (offset+8 < (u32) pkt.size) {
-				b4cc = GF_4CC(pkt.data[offset+4], pkt.data[offset+5], pkt.data[offset+6], pkt.data[offset+7]);
+			while (offset+8 < (u32) pkt->size) {
+				b4cc = GF_4CC(pkt->data[offset+4], pkt->data[offset+5], pkt->data[offset+6], pkt->data[offset+7]);
 				if (b4cc == GF_4CC('j','p','2','c')) {
 					break;
 				}
@@ -472,18 +676,18 @@
 				offset++;
 			}
 			if (jp2h_offset) {
-				u32 len = pkt.data[jp2h_offset];
+				u32 len = pkt->data[jp2h_offset];
 				len <<= 8;
-				len |= pkt.data[jp2h_offset+1];
+				len |= pkt->data[jp2h_offset+1];
 				len <<= 8;
-				len |= pkt.data[jp2h_offset+2];
+				len |= pkt->data[jp2h_offset+2];
 				len <<= 8;
-				len |= pkt.data[jp2h_offset+3];
+				len |= pkt->data[jp2h_offset+3];
 
-				u32 dsi_crc = gf_crc_32(pkt.data + jp2h_offset + 8, len-8);
+				u32 dsi_crc = gf_crc_32(pkt->data + jp2h_offset + 8, len-8);
 				if (dsi_crc != ctx->dsi_crc) {
 					ctx->dsi_crc = dsi_crc;
-					gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(pkt.data + jp2h_offset + 8, len-8) );
+					gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(pkt->data + jp2h_offset + 8, len-8) );
 				}
 			}
 			size -= offset;
@@ -513,8 +717,12 @@
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->out_pid, size, &output);
+	if (!dst_pck) {
+		FF_RELEASE_PCK(pkt)
+		return GF_OUT_OF_MEM;
+	}
 	if (insert_jp2c) {
-		u32 bsize = pkt.size + 8;
+		u32 bsize = pkt->size + 8;
 		output[0] = (bsize >> 24) & 0xFF;
 		output[1] = (bsize >> 16) & 0xFF;
 		output[2] = (bsize >> 8) & 0xFF;
@@ -525,28 +733,33 @@
 		output[7] = 'c';
 		output += 8;
 	}
-	memcpy(output, pkt.data + offset, to_copy);
+	memcpy(output, pkt->data + offset, to_copy);
 
 	if (src_pck) {
+		if (ctx->disc_pck_ref == src_pck) {
+			ctx->disc_pck_ref = NULL;
+			ffenc_copy_pid_props(ctx);
+		}
+
 		gf_filter_pck_merge_properties(src_pck, dst_pck);
 		gf_list_del_item(ctx->src_packets, src_pck);
 		gf_filter_pck_unref(src_pck);
 	} else {
-		if (pkt.duration) {
-			gf_filter_pck_set_duration(dst_pck, (u32) pkt.duration);
+		if (pkt->duration) {
+			gf_filter_pck_set_duration(dst_pck, (u32) pkt->duration);
 		} else {
 			gf_filter_pck_set_duration(dst_pck, (u32) ctx->frame->pkt_duration);
 		}
 	}
 
-	ffenc_log_video(filter, ctx, &pkt, gf_filter_reporting_enabled(filter));
+	ffenc_log_video(filter, ctx, pkt, gf_filter_reporting_enabled(filter));
 
-	gf_filter_pck_set_cts(dst_pck, pkt.pts + ctx->ts_shift);
-	gf_filter_pck_set_dts(dst_pck, pkt.dts + ctx->ts_shift);
+	gf_filter_pck_set_cts(dst_pck, pkt->pts + ctx->ts_shift);
+	gf_filter_pck_set_dts(dst_pck, pkt->dts + ctx->ts_shift);
 
 	//this is not 100% correct since we don't have any clue if this is SAP1/2/3/4 ...
 	//since we send the output to our reframers we should be fine
-	if (pkt.flags & AV_PKT_FLAG_KEY) {
+	if (pkt->flags & AV_PKT_FLAG_KEY) {
 		gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FFEnc] frame %d is SAP\n", ctx->nb_frames_out));
 	}
@@ -554,12 +767,15 @@
 		gf_filter_pck_set_sap(dst_pck, 0);
 
 #if LIBAVCODEC_VERSION_MAJOR >= 58
-	if (pkt.flags & AV_PKT_FLAG_DISPOSABLE) {
+	if (pkt->flags & AV_PKT_FLAG_DISPOSABLE) {
 		gf_filter_pck_set_dependency_flags(dst_pck, 0x8);
 	}
 #endif
 	gf_filter_pck_send(dst_pck);
 
+	av_packet_free_side_data(pkt);
+	FF_RELEASE_PCK(pkt)
+
 	//we're in final flush, request a process task until all frames flushe
 	//we could recursiveley call ourselves, same result
 	if (!pck) {
@@ -576,14 +792,17 @@
 	u32 f_idx, s_idx;
 	u32 i, bytes_per_chan, src_frame_size;
 
-	if (!ctx->audio_buffer || !data)
+	if (!ctx->audio_buffer || !nb_samples)
 		return;
 
 	if (!ctx->planar_audio) {
 		u32 offset_src = sample_offset * ctx->bytes_per_sample;
 		u32 offset_dst = ctx->samples_in_audio_buffer * ctx->bytes_per_sample;
 		u32 len = nb_samples * ctx->bytes_per_sample;
-		memcpy(ctx->audio_buffer + offset_dst, data + offset_src, sizeof(u8)*len);
+		if (data)
+			memcpy(ctx->audio_buffer + offset_dst, data + offset_src, sizeof(u8)*len);
+		else
+			memset(ctx->audio_buffer + offset_dst, 0, sizeof(u8)*len);
 		ctx->samples_in_audio_buffer += nb_samples;
 		return;
 	}
@@ -591,7 +810,7 @@
 	bytes_per_chan = ctx->bytes_per_sample / ctx->channels;
 	src_frame_size = size / ctx->bytes_per_sample;
 	assert(ctx->samples_in_audio_buffer + nb_samples <= (u32) ctx->audio_buffer_size);
-	assert(sample_offset + nb_samples <= src_frame_size);
+	assert(!data || (sample_offset + nb_samples <= src_frame_size));
 	assert(ctx->encoder->frame_size);
 
 	f_idx = ctx->samples_in_audio_buffer / ctx->encoder->frame_size;
@@ -601,20 +820,24 @@
 	}
 	dst = ctx->audio_buffer + (f_idx * ctx->channels * ctx->encoder->frame_size + s_idx) * bytes_per_chan;
 	while (nb_samples) {
-		const u8 *src;
+		const u8 *src = NULL;
 		u32 nb_samples_to_copy = nb_samples;
 		if (nb_samples_to_copy > (u32) ctx->encoder->frame_size)
 			nb_samples_to_copy = ctx->encoder->frame_size;
 
-		assert(sample_offset<src_frame_size);
-
-		src = data + sample_offset * bytes_per_chan;
+		if (data) {
+			assert(sample_offset<src_frame_size);
+			src = data + sample_offset * bytes_per_chan;
+		}
 
 		for (i=0; i<ctx->channels; i++) {
-			memcpy(dst, src, sizeof(u8) * nb_samples_to_copy * bytes_per_chan);
-
+			if (src) {
+				memcpy(dst, src, sizeof(u8) * nb_samples_to_copy * bytes_per_chan);
+				src += src_frame_size * bytes_per_chan;
+			} else {
+				memset(dst, 0, sizeof(u8) * nb_samples_to_copy * bytes_per_chan);
+			}
 			dst += ctx->encoder->frame_size * bytes_per_chan;
-			src += src_frame_size * bytes_per_chan;
 		}
 		ctx->samples_in_audio_buffer += nb_samples_to_copy;
 		nb_samples -= nb_samples_to_copy;
@@ -624,7 +847,7 @@
 
 static GF_Err ffenc_process_audio(GF_Filter *filter, struct _gf_ffenc_ctx *ctx)
 {
-	AVPacket pkt;
+	AVPacket *pkt;
 	s32 gotpck;
 	const char *data = NULL;
 	u32 size=0, nb_copy=0, i, count;
@@ -669,12 +892,16 @@
 		}
 
 		if (!ctx->samples_in_audio_buffer) {
-			ctx->first_byte_cts = gf_filter_pck_get_cts(pck);
+			ctx->first_byte_cts = ffenc_get_cts(ctx, pck);
 		}
 
 		src_pck = pck;
 		gf_filter_pck_ref_props(&src_pck);
 		gf_list_add(ctx->src_packets, src_pck);
+		if (ctx->discontunity) {
+			ctx->disc_pck_ref = src_pck;
+			ctx->discontunity = GF_FALSE;
+		}
 
 		nb_samples = size / ctx->bytes_per_sample;
 		if (ctx->encoder->frame_size && (nb_samples + ctx->samples_in_audio_buffer < (u32) ctx->encoder->frame_size)) {
@@ -702,38 +929,116 @@
 			ctx->samples_in_audio_buffer = 0;
 			if (data && (nb_samples > nb_copy)) {
 				ffenc_audio_append_samples(ctx, data, size, nb_copy, nb_samples - nb_copy);
-				ts_diff = nb_copy;
-				ts_diff *= ctx->timescale;
-				ts_diff /= ctx->sample_rate;
-				ctx->first_byte_cts = gf_filter_pck_get_cts(pck) + ts_diff;
+				ts_diff = gf_timestamp_rescale(nb_copy, ctx->sample_rate, ctx->timescale);
+				ctx->first_byte_cts = ffenc_get_cts(ctx, pck) + ts_diff;
 			}
 			gf_filter_pid_drop_packet(ctx->in_pid);
 			return GF_SERVICE_ERROR;
 		}
+	} else if (ctx->samples_in_audio_buffer) {
+		u32 real_samples = ctx->samples_in_audio_buffer;
+		if (ctx->encoder->frame_size) {
+			nb_samples = ctx->encoder->frame_size - ctx->samples_in_audio_buffer;
+			ffenc_audio_append_samples(ctx, NULL, 0, 0, nb_samples);
+			res = avcodec_fill_audio_frame(ctx->frame, ctx->channels, ctx->sample_fmt, ctx->audio_buffer, ctx->encoder->frame_size * ctx->bytes_per_sample, 0);
+		} else {
+			res = avcodec_fill_audio_frame(ctx->frame, ctx->channels, ctx->sample_fmt, ctx->audio_buffer, ctx->samples_in_audio_buffer * ctx->bytes_per_sample, 0);
+		}
+		ctx->frame->nb_samples = real_samples;
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Error filling raw audio frame: %s\n", av_err2str(res) ));
+			ctx->samples_in_audio_buffer = 0;
+		} else {
+			ctx->samples_in_audio_buffer = real_samples;
+			if (ctx->ts_shift && ctx->encoder->frame_size && (ctx->encoder->frame_size>ctx->ts_shift)) {
+				ctx->samples_in_audio_buffer += (u32) ctx->ts_shift;
+				if (ctx->samples_in_audio_buffer > (u32) ctx->encoder->frame_size)
+					ctx->samples_in_audio_buffer = ctx->encoder->frame_size;
+			}
+		}
 	}
 
-	av_init_packet(&pkt);
-	pkt.data = (uint8_t*)ctx->enc_buffer;
-	pkt.size = ctx->enc_buffer_size;
+	FF_INIT_PCK(ctx, pkt)
 
-	ctx->frame->nb_samples = ctx->encoder->frame_size;
+	pkt->data = (uint8_t*)ctx->enc_buffer;
+	pkt->size = ctx->enc_buffer_size;
+
+	if (pck)
+		ctx->frame->nb_samples = ctx->encoder->frame_size;
 	ctx->frame->format = ctx->encoder->sample_fmt;
 	ctx->frame->channels = ctx->encoder->channels;
 	ctx->frame->channel_layout = ctx->encoder->channel_layout;
 	gotpck = 0;
-	if (pck) {
+	if (pck || ctx->samples_in_audio_buffer) {
+#if (LIBAVFORMAT_VERSION_MAJOR<59)
 		ctx->frame->pkt_dts = ctx->frame->pkt_pts = ctx->frame->pts = ctx->first_byte_cts;
-		res = avcodec_encode_audio2(ctx->encoder, &pkt, ctx->frame, &gotpck);
+		res = avcodec_encode_audio2(ctx->encoder, pkt, ctx->frame, &gotpck);
+#else
+		ctx->frame->pkt_dts = ctx->frame->pts = ctx->first_byte_cts;
+		res = avcodec_send_frame(ctx->encoder, ctx->frame);
+		switch (res) {
+		case AVERROR(EAGAIN):
+			return GF_OK;
+		case 0:
+			break;
+		case AVERROR_EOF:
+			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] PID %s failed to encode frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(res) ));
+			break;
+		}
+		gotpck = 0;
+		res = avcodec_receive_packet(ctx->encoder, pkt);
+		switch (res) {
+		case AVERROR(EAGAIN):
+			res = 0;
+			break;
+		case 0:
+			gotpck = 1;
+			break;
+		case AVERROR_EOF:
+			ctx->flush_done = GF_TRUE;
+			gf_filter_pid_set_eos(ctx->out_pid);
+			return GF_EOS;
+		default:
+			break;
+		}
+#endif
+
+
+		if (!pck) {
+			if (! (ctx->encoder->codec->capabilities & AV_CODEC_CAP_DELAY)) {
+				pkt->duration = ctx->samples_in_audio_buffer;
+				if (ctx->timescale != ctx->sample_rate) {
+					pkt->duration = gf_timestamp_rescale(pkt->duration, ctx->sample_rate, ctx->timescale);
+				}
+			}
+			ctx->samples_in_audio_buffer = 0;
+		}
 	} else {
-		res = avcodec_encode_audio2(ctx->encoder, &pkt, NULL, &gotpck);
+#if (LIBAVFORMAT_VERSION_MAJOR<59)
+		res = avcodec_encode_audio2(ctx->encoder, pkt, NULL, &gotpck);
+#else
+		//flush by sending NULL frame
+		avcodec_send_frame(ctx->encoder, NULL);
+		gotpck = 0;
+		res = avcodec_receive_packet(ctx->encoder, pkt);
+		if (!res) gotpck = 1;
+#endif
 		if (!gotpck) {
+			FF_RELEASE_PCK(pkt);
 			//done flushing encoder while reconfiguring
 			if (ctx->reconfig_pending) {
+				GF_Err e;
+				Bool bck_init_cts = ctx->init_cts_setup;
+
 				ctx->reconfig_pending = GF_FALSE;
-				avcodec_close(ctx->encoder);
+				avcodec_free_context(&ctx->encoder);
 				ctx->encoder = NULL;
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FFEnc] codec flush done, triggering reconfiguration\n"));
-				return ffenc_configure_pid(filter, ctx->in_pid, GF_FALSE);
+				e = ffenc_configure_pid_ex(filter, ctx->in_pid, GF_FALSE, GF_TRUE);
+				ctx->init_cts_setup = bck_init_cts;
+				return e;
 			}
 			ctx->flush_done = 1;
 			gf_filter_pid_set_eos(ctx->out_pid);
@@ -762,8 +1067,7 @@
 	//increase timestamp
 	ts_diff = ctx->frame->nb_samples;
 	if (ctx->timescale!=ctx->sample_rate) {
-		ts_diff *= ctx->timescale;
-		ts_diff /= ctx->sample_rate;
+		ts_diff = gf_timestamp_rescale(ts_diff, ctx->sample_rate, ctx->timescale);
 	}
 	ctx->first_byte_cts += ts_diff;
 
@@ -777,26 +1081,39 @@
 
 	if (res<0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Error encoding frame: %s\n", av_err2str(res) ));
+		av_packet_free_side_data(pkt);
+		FF_RELEASE_PCK(pkt);
 		return GF_SERVICE_ERROR;
 	}
 	if (!gotpck) {
+		av_packet_free_side_data(pkt);
+		FF_RELEASE_PCK(pkt);
 		return GF_OK;
 	}
-	dst_pck = gf_filter_pck_new_alloc(ctx->out_pid, pkt.size, &output);
-	memcpy(output, pkt.data, pkt.size);
+	dst_pck = gf_filter_pck_new_alloc(ctx->out_pid, pkt->size, &output);
+	if (!dst_pck) {
+		FF_RELEASE_PCK(pkt);
+		return GF_OUT_OF_MEM;
+	}
+	memcpy(output, pkt->data, pkt->size);
 
 	if (ctx->init_cts_setup) {
+		u64 octs;
 		ctx->init_cts_setup = GF_FALSE;
-		if (ctx->frame->pts != pkt.pts) {
-			ctx->ts_shift = (s32) ( (s64) ctx->frame->pts - (s64) pkt.pts );
+		src_pck = gf_list_get(ctx->src_packets, 0);
+		octs = src_pck ? ffenc_get_cts(ctx, src_pck) : ctx->frame->pts;
+		if (octs != pkt->pts) {
+			ctx->ts_shift = (s64) octs - (s64) pkt->pts;
+		}
+		if (ctx->ts_shift) {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DELAY, &PROP_LONGSINT( - ctx->ts_shift) );
 		}
-//		if (ctx->ts_shift) {
-//			s64 shift = ctx->ts_shift;
-//			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DELAY, &PROP_SINT((s32) -shift) );
-//		}
 	}
 
-	//try to locate first source packet with cts greater than this packet cts and use it as source for properties
+	//try to locate first source packet with CTS
+	//- greater than or equal to this packet cts
+	//- strictly less than next packet cts
+	// and use it as source for properties
 	//this is not optimal because we dont produce N for N because of different window coding sizes
 	src_pck = NULL;
 	count = gf_list_count(ctx->src_packets);
@@ -804,14 +1121,14 @@
 		u64 acts;
 		u32 adur;
 		src_pck = gf_list_get(ctx->src_packets, i);
-		acts = gf_filter_pck_get_cts(src_pck);
+		acts = ffenc_get_cts(ctx, src_pck);
 		adur = gf_filter_pck_get_duration(src_pck);
 
-		if ((s64) acts >= pkt.pts) {
+		if (((s64) acts >= pkt->pts) && ((s64) acts < pkt->pts + pkt->duration)) {
 			break;
 		}
 
-		if (acts + adur <= (u64) ( pkt.pts + ctx->ts_shift) ) {
+		if (acts + adur <= (u64) ( pkt->pts + ctx->ts_shift) ) {
 			gf_list_rem(ctx->src_packets, i);
 			gf_filter_pck_unref(src_pck);
 			i--;
@@ -820,22 +1137,31 @@
 		src_pck = NULL;
 	}
 	if (src_pck) {
+		if (src_pck==ctx->disc_pck_ref) {
+			ctx->disc_pck_ref = NULL;
+			ffenc_copy_pid_props(ctx);
+		}
+
 		gf_filter_pck_merge_properties(src_pck, dst_pck);
 		gf_list_del_item(ctx->src_packets, src_pck);
 		gf_filter_pck_unref(src_pck);
 	}
-	gf_filter_pck_set_cts(dst_pck, pkt.pts + ctx->ts_shift);
-	gf_filter_pck_set_dts(dst_pck, pkt.dts + ctx->ts_shift);
+
+	gf_filter_pck_set_cts(dst_pck, pkt->pts + ctx->ts_shift);
+	gf_filter_pck_set_dts(dst_pck, pkt->dts + ctx->ts_shift);
 	//this is not 100% correct since we don't have any clue if this is SAP1/4 (roll info missing)
-	if (pkt.flags & AV_PKT_FLAG_KEY)
+	if (pkt->flags & AV_PKT_FLAG_KEY)
 		gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
 	else
 		gf_filter_pck_set_sap(dst_pck, 0);
 
-	gf_filter_pck_set_duration(dst_pck, (u32) pkt.duration);
+	gf_filter_pck_set_duration(dst_pck, (u32) pkt->duration);
 
 	gf_filter_pck_send(dst_pck);
 
+	av_packet_free_side_data(pkt);
+	FF_RELEASE_PCK(pkt);
+
 	//we're in final flush, request a process task until all frames flushe
 	//we could recursiveley call ourselves, same result
 	if (!pck) {
@@ -852,34 +1178,14 @@
 	return ctx->process(filter, ctx);
 }
 
-static void ffenc_copy_pid_props(GF_FFEncodeCtx *ctx)
-{
-	//copy properties at init or reconfig
-	gf_filter_pid_copy_properties(ctx->out_pid, ctx->in_pid);
-	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, NULL);
-	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_CODECID, &PROP_UINT(ctx->codecid) );
-
-	switch (ctx->codecid) {
-	case GF_CODECID_AVC:
-	case GF_CODECID_HEVC:
-	case GF_CODECID_MPEG4_PART2:
-		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
-		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_UNFRAMED_FULL_AU, &PROP_BOOL(GF_TRUE) );
-		break;
-	default:
-		if (ctx->encoder && ctx->encoder->extradata_size && ctx->encoder->extradata) {
-			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(ctx->encoder->extradata, ctx->encoder->extradata_size) );
-		}
-		break;
-	}
-}
-
-static GF_Err ffenc_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+static GF_Err ffenc_configure_pid_ex(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove, Bool is_force_reconf)
 {
 	s32 res;
 	u32 type=0, fftype, ff_codectag=0;
 	u32 i=0;
+	AVDictionary *options = NULL;
 	u32 change_input_fmt = 0;
+	AVRational timebase;
 	const GF_PropertyValue *prop;
 	const AVCodec *codec=NULL;
 	const AVCodec *desired_codec=NULL;
@@ -889,8 +1195,10 @@
 	//disconnect of src pid (not yet supported)
 	if (is_remove) {
 		ctx->in_pid = NULL;
-		//one in one out, this is simple
-		if (ctx->out_pid) gf_filter_pid_remove(ctx->out_pid);
+		if (ctx->out_pid) {
+			gf_filter_pid_remove(ctx->out_pid);
+			ctx->out_pid = NULL;
+		}
 		return GF_OK;
 	}
 	//check our PID: streamtype and codecid
@@ -908,21 +1216,22 @@
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
 	if (!prop || prop->value.uint!=GF_CODECID_RAW) return GF_NOT_SUPPORTED;
 
-	//figure out if output was preconfigured during filter chain setup
-	prop = gf_filter_pid_caps_query(pid, GF_PROP_PID_CODECID);
-	if (prop) {
-		ctx->codecid = prop->value.uint;
-	} else if (!ctx->codecid && ctx->c) {
-		ctx->codecid = gf_codec_parse(ctx->c);
-		if (!ctx->codecid) {
-			codec = avcodec_find_encoder_by_name(ctx->c);
-			if (codec)
-				ctx->codecid = ffmpeg_codecid_to_gpac(codec->id);
+	if (!ctx->force_codec) {
+		//figure out if output was preconfigured during filter chain setup
+		prop = gf_filter_pid_caps_query(pid, GF_PROP_PID_CODECID);
+		if (prop) {
+			ctx->codecid = prop->value.uint;
+		} else if (!ctx->codecid && ctx->c) {
+			ctx->codecid = gf_codecid_parse(ctx->c);
+			if (!ctx->codecid) {
+				codec = avcodec_find_encoder_by_name(ctx->c);
+				if (codec)
+					ctx->codecid = ffmpeg_codecid_to_gpac(codec->id);
+			}
 		}
-	}
-	//if the codec was set using ffc, get it
-	if (ctx->ffc) {
-		desired_codec = avcodec_find_encoder_by_name(ctx->ffc);
+	} else {
+		ctx->codecid = ffmpeg_codecid_to_gpac(ctx->force_codec->id);
+		desired_codec = ctx->force_codec;
 	}
 
 	if (!ctx->codecid && !desired_codec) {
@@ -985,10 +1294,23 @@
 		ctx->process = ffenc_process_video;
 	}
 
-	ffenc_copy_pid_props(ctx);
-	if (ctx->target_rate)
-		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_BITRATE, &PROP_UINT(ctx->target_rate));
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_TARGET_RATE);
+	if (prop && prop->value.uint && (prop->value.uint != ctx->target_rate)) {
+		char szRate[100];
+		ctx->target_rate = prop->value.uint;
+		snprintf(szRate, 99, "%d", ctx->target_rate);
+		szRate[99] = 0;
+		av_dict_set(&ctx->options, "b", szRate, 0);
+	}
 
+	if (!is_force_reconf) {
+		//not yet setup or no delay, copy directly props, otherwise signal discontinuity
+		if (!ctx->encoder || !gf_list_count(ctx->src_packets)) {
+			ffenc_copy_pid_props(ctx);
+		} else {
+			ctx->discontunity = GF_TRUE;
+		}
+	}
 
 #define GET_PROP(_a, _code, _name) \
 	prop = gf_filter_pid_get_property(pid, _code); \
@@ -996,8 +1318,9 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[FFEnc] Input %s unknown, waiting for reconfigure\n", _name)); \
 		return GF_OK; \
 	}\
-	_a =prop->value.uint;
+	_a = prop->value.uint;
 
+	timebase.num = timebase.den = 0;
 	pfmt = afmt = 0;
 	if (type==GF_STREAM_VISUAL) {
 		GET_PROP(ctx->width, GF_PROP_PID_WIDTH, "width")
@@ -1006,29 +1329,56 @@
 
 		prop = gf_filter_pid_caps_query(pid, GF_PROP_PID_STRIDE);
 		//keep stride and stride_uv to 0 i fnot set, and recompute from pixel format
-		if (prop) ctx->stride = prop->value.uint;
+		ctx->stride = prop ? prop->value.uint : 0;
 		prop = gf_filter_pid_caps_query(pid, GF_PROP_PID_STRIDE_UV);
-		if (prop) ctx->stride_uv = prop->value.uint;
+		ctx->stride_uv = prop ? prop->value.uint : 0;
+
+		if (!ctx->stride || !ctx->stride_uv) {
+			gf_pixel_get_size_info(pfmt, ctx->width, ctx->height, NULL, &ctx->stride, &ctx->stride_uv, NULL, NULL);
+		}
+
+		//compute new timebase
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+		if (prop) {
+			timebase.num = 1;
+			timebase.den = prop->value.uint;
+		}
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+		if (prop) {
+			timebase.num = prop->value.frac.den;
+			timebase.den = prop->value.frac.num;
+		}
+		gf_media_get_reduced_frame_rate(&timebase.den, &timebase.num);
 	} else {
 		GET_PROP(ctx->sample_rate, GF_PROP_PID_SAMPLE_RATE, "sample rate")
 		GET_PROP(ctx->channels, GF_PROP_PID_NUM_CHANNELS, "nb channels")
 		GET_PROP(afmt, GF_PROP_PID_AUDIO_FORMAT, "audio format")
 	}
 
+
 	if (ctx->encoder) {
+		Bool reuse = GF_FALSE;
 		codec_id = ffmpeg_codecid_from_gpac(ctx->codecid, &ff_codectag);
 
-		if (type==GF_STREAM_AUDIO) {
-			if ((ctx->encoder->codec->id==codec_id) && (ctx->encoder->sample_rate==ctx->sample_rate) && (ctx->encoder->channels==ctx->channels) && (ctx->gpac_audio_fmt == afmt ) ) {
-				return GF_OK;
-			}
-		} else {
-			if ((ctx->encoder->codec->id==codec_id) && (ctx->encoder->width==ctx->width) && (ctx->encoder->height==ctx->height) && (ctx->gpac_pixel_fmt == pfmt ) ) {
-				return GF_OK;
-			}
+		if ((type==GF_STREAM_AUDIO)
+			&& (ctx->encoder->codec->id==codec_id) && (ctx->encoder->sample_rate==ctx->sample_rate)
+			&& (ctx->encoder->channels==ctx->channels) && (ctx->gpac_audio_fmt == afmt )
+		) {
+			reuse = GF_TRUE;
+		} else if ((ctx->encoder->codec->id==codec_id)
+			&& (ctx->encoder->width==ctx->width) && (ctx->encoder->height==ctx->height)
+			&& (ctx->gpac_pixel_fmt == pfmt)
+		) {
+			reuse = GF_TRUE;
+		}
+		if (reuse) {
+			//delay may have change
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+			ctx->in_tk_delay = prop ? prop->value.longsint : 0;
+			return GF_OK;
 		}
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FFEnc] codec reconfiguration, begining flush\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FFEnc] codec reconfiguration, beginning flush\n"));
 		ctx->reconfig_pending = GF_TRUE;
 		return GF_OK;
 	}
@@ -1045,7 +1395,7 @@
 					break;
 				}
 				//handle pixel formats aliases
-				if (ffmpeg_pixfmt_to_gpac(codec->pix_fmts[i]) == ctx->pfmt) {
+				if (ffmpeg_pixfmt_to_gpac(codec->pix_fmts[i], GF_TRUE) == ctx->pfmt) {
 					force_pfmt = ctx->pixel_fmt;
 					break;
 				}
@@ -1069,20 +1419,20 @@
 					break;
 				}
 				//handle pixel formats aliases
-				if (ffmpeg_pixfmt_to_gpac(codec->pix_fmts[i]) == pfmt) {
+				if (ffmpeg_pixfmt_to_gpac(codec->pix_fmts[i], GF_TRUE) == pfmt) {
 					ctx->pixel_fmt = change_input_fmt = codec->pix_fmts[i];
 					break;
 				}
 				i++;
 			}
-			if (!ctx->ffc && (change_input_fmt == AV_PIX_FMT_NONE)) {
-#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)
+			if (!ctx->force_codec && (change_input_fmt == AV_PIX_FMT_NONE)) {
+#if ((LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)) || (LIBAVFORMAT_VERSION_MAJOR>=59)
 				void *ff_opaque=NULL;
 #else
 				AVCodec *codec_alt = NULL;
 #endif
 				while (1) {
-#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)
+#if ((LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)) || (LIBAVFORMAT_VERSION_MAJOR>=59)
 					const AVCodec *codec_alt = av_codec_iterate(&ff_opaque);
 #else
 					codec_alt = av_codec_next(codec_alt);
@@ -1115,7 +1465,7 @@
 				//find a mapped pixel format
 				while (codec->pix_fmts) {
 					if (codec->pix_fmts[i] == AV_PIX_FMT_NONE) break;
-					if (ffmpeg_pixfmt_to_gpac(codec->pix_fmts[i])) {
+					if (ffmpeg_pixfmt_to_gpac(codec->pix_fmts[i], GF_TRUE)) {
 						ff_pmft = codec->pix_fmts[i];
 						break;
 					}
@@ -1128,7 +1478,7 @@
 			} else if (ctx->pfmt) {
 				ff_pmft = ffmpeg_pixfmt_from_gpac(ctx->pfmt);
 			}
-			pfmt = ffmpeg_pixfmt_to_gpac(ff_pmft);
+			pfmt = ffmpeg_pixfmt_to_gpac(ff_pmft, GF_FALSE);
 			gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_PIXFMT, &PROP_UINT(pfmt) );
 			ctx->infmt_negociate = GF_TRUE;
 		} else {
@@ -1181,6 +1531,9 @@
 	ctx->gpac_audio_fmt = afmt;
 	ctx->dsi_crc = 0;
 
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+	ctx->in_tk_delay = prop ? prop->value.longsint : 0;
+
 	ctx->encoder = avcodec_alloc_context3(codec);
 	if (! ctx->encoder) return GF_OUT_OF_MEM;
 
@@ -1191,28 +1544,52 @@
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
 		if (prop) {
 			ctx->encoder->sample_aspect_ratio.num = prop->value.frac.num;
-			ctx->timescale = ctx->encoder->sample_aspect_ratio.den = prop->value.frac.den;
+			ctx->encoder->sample_aspect_ratio.den = prop->value.frac.den;
 		} else {
 			ctx->encoder->sample_aspect_ratio.num = 1;
 			ctx->encoder->sample_aspect_ratio.den = 1;
 		}
-		//CHECKME: do we need to use 1/FPS ?
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
-		if (prop) {
-			ctx->encoder->time_base.num = 1;
-			ctx->timescale = ctx->encoder->time_base.den = prop->value.uint;
-		}
+		ctx->encoder->time_base.num = 1;
+		ctx->timescale = ctx->encoder->time_base.den = prop ? prop->value.uint : 1000;
+
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
 		if (prop) {
-			ctx->encoder->gop_size = prop->value.frac.num / prop->value.frac.den;
-			ctx->encoder->time_base.num = prop->value.frac.den;
-			ctx->encoder->time_base.den = prop->value.frac.num;
+			Bool reset_gop = GF_FALSE;
+			//don't write gop info for these codecs, unless ctx->gop_size is set (done later)
+			if (codec_id==AV_CODEC_ID_FFV1) reset_gop = GF_TRUE;
+
+			if (reset_gop)
+				ctx->encoder->gop_size = 0;
+			else
+				ctx->encoder->gop_size = prop->value.frac.num / prop->value.frac.den;
+
+			ctx->encoder->framerate.num = prop->value.frac.num;
+			ctx->encoder->framerate.den = prop->value.frac.den;
+			gf_media_get_reduced_frame_rate(&ctx->encoder->framerate.num, &ctx->encoder->framerate.den);
+
+			//if framerate exact or drop frame, use fps.num as timebase
+			//this is needed because some codecs in libavcodec check this value to derive the profile/levels
+			//so providing a too high time_base will increase the profile/levels ...
+			if ((ctx->encoder->framerate.den == 1) || (ctx->encoder->framerate.den == 1001)) {
+				ctx->encoder->time_base.den = ctx->encoder->framerate.num;
+			}
+			//some codecs in libavcodec will complain if timebase is too high
+			//if fps is set and its num is quite small compared to our input timescale, use the num
+			//otherwise we try to keep the same timescale as input
+			else if ((u32) ctx->encoder->framerate.num * 100 < ctx->timescale) {
+				ctx->encoder->time_base.den = ctx->encoder->framerate.num;
+			}
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFEnc] Unknown frame rate for PID %s, will use 25 fps - use `:#FPS=VAL` on input to force frame rate\n", gf_filter_pid_get_name(pid) ));
+			ctx->encoder->framerate.num = 25;
+			ctx->encoder->framerate.den = 1;
 		}
 
 		gf_media_get_reduced_frame_rate(&ctx->encoder->time_base.den, &ctx->encoder->time_base.num);
 
 		if (ctx->low_delay) {
-			av_dict_set(&ctx->options, "vprofile", "baseline", 0);
+			av_dict_set(&ctx->options, "profile", "baseline", 0);
 			av_dict_set(&ctx->options, "preset", "ultrafast", 0);
 			av_dict_set(&ctx->options, "tune", "zerolatency", 0);
 			if (ctx->codecid==GF_CODECID_AVC) {
@@ -1223,7 +1600,7 @@
 #endif
 		}
 
-		if (ctx->fintra.den && ctx->fintra.num) {
+		if (ctx->fintra.den && (ctx->fintra.num>0) && !ctx->rc) {
 			av_dict_set(&ctx->options, "forced-idr", "1", 0);
 		}
 
@@ -1299,23 +1676,22 @@
 		case GF_CODECID_AAC_MPEG2_MP:
 		case GF_CODECID_AAC_MPEG2_LCP:
 		case GF_CODECID_AAC_MPEG2_SSRP:
-		{
+			if (!is_force_reconf) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-			GF_M4ADecSpecInfo acfg;
-			u8 *dsi;
-			u32 dsi_len;
-			memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
-			acfg.base_object_type = GF_M4A_AAC_LC;
-			acfg.base_sr = ctx->sample_rate;
-			acfg.nb_chan = ctx->channels;
-			acfg.sbr_object_type = 0;
-			acfg.audioPL = gf_m4a_get_profile(&acfg);
-
-			gf_m4a_write_config(&acfg, &dsi, &dsi_len);
-			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_len) );
+				GF_M4ADecSpecInfo acfg;
+				u8 *dsi;
+				u32 dsi_len;
+				memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
+				acfg.base_object_type = GF_M4A_AAC_LC;
+				acfg.base_sr = ctx->sample_rate;
+				acfg.nb_chan = ctx->channels;
+				acfg.sbr_object_type = 0;
+				acfg.audioPL = gf_m4a_get_profile(&acfg);
+
+				gf_m4a_write_config(&acfg, &dsi, &dsi_len);
+				gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_len) );
 #endif
-
-		}
+			}
 			break;
 		}
 	}
@@ -1325,24 +1701,48 @@
 	if (ctx->all_intra) ctx->encoder->gop_size = 0;
 	else if (ctx->gop_size) ctx->encoder->gop_size = ctx->gop_size;
 
-	res = avcodec_open2(ctx->encoder, codec, &ctx->options );
+	//by default let libavcodec decide - if single thread is required, let the user define -threads option
+	if (codec->capabilities & AV_CODEC_CAP_AUTO_THREADS)
+		ctx->encoder->thread_count = 0;
+
+
+	av_dict_copy(&options, ctx->options, 0);
+	res = avcodec_open2(ctx->encoder, codec, &options );
 	if (res < 0) {
+		if (options) av_dict_free(&options);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] PID %s failed to open codec context: %s\n", gf_filter_pid_get_name(pid), av_err2str(res) ));
+		avcodec_free_context(&ctx->encoder);
+		ctx->encoder = NULL;
 		return GF_BAD_PARAM;
 	}
-	ctx->remap_ts = (ctx->encoder->time_base.den != ctx->timescale) ? GF_TRUE : GF_FALSE;
+	//precompute gpac_timescale * encoder->time_base.num for rescale operations
+	//do that AFTER opening the codec, since some codecs may touch this field ...
+	ctx->premul_timescale = ctx->timescale;
+	ctx->premul_timescale *= ctx->encoder->time_base.num;
 
+	ctx->remap_ts = (ctx->encoder->time_base.den && (ctx->encoder->time_base.den != ctx->premul_timescale)) ? GF_TRUE : GF_FALSE;
+	if (!ctx->target_rate)
+		ctx->target_rate = (u32)ctx->encoder->bit_rate;
 
-	ffmpeg_report_unused_options(filter, ctx->options);
+	ffmpeg_report_options(filter, options, ctx->options);
 
-	ffenc_copy_pid_props(ctx);
+	if (!is_force_reconf)
+		ffenc_copy_pid_props(ctx);
 	return GF_OK;
 }
 
+static GF_Err ffenc_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	return ffenc_configure_pid_ex(filter, pid, is_remove, GF_FALSE);
+
+}
+
 
 static GF_Err ffenc_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *arg_val)
 {
 	s32 res;
+	char szOverrideOpt[1000];
+	Bool do_override = GF_FALSE;
 	GF_FFEncodeCtx *ctx = gf_filter_get_udta(filter);
 
 	if (!strcmp(arg_name, "global_header"))	return GF_OK;
@@ -1353,7 +1753,7 @@
 //	else if (!strcmp(arg_name, "gop")) arg_name = "g";
 	//disable low delay if these options are set
 	else if (!strcmp(arg_name, "x264opts")) ctx->low_delay = GF_FALSE;
-	else if (!strcmp(arg_name, "vprofile")) ctx->low_delay = GF_FALSE;
+	else if (!strcmp(arg_name, "profile")) ctx->low_delay = GF_FALSE;
 	else if (!strcmp(arg_name, "preset")) ctx->low_delay = GF_FALSE;
 	else if (!strcmp(arg_name, "tune")) ctx->low_delay = GF_FALSE;
 
@@ -1366,6 +1766,9 @@
 			ctx->target_rate *= 1000000;
 		else if (strchr(arg_val->value.string, 'k') || strchr(arg_val->value.string, 'K'))
 			ctx->target_rate *= 1000;
+
+		sprintf(szOverrideOpt, "%d", ctx->target_rate);
+		do_override = GF_TRUE;
 	}
 
 	//initial parsing of arguments
@@ -1373,15 +1776,19 @@
 		const char *arg_val_str;
 		switch (arg_val->type) {
 		case GF_PROP_STRING:
-			arg_val_str = arg_val->value.string;
-			if (!arg_val_str) arg_val_str = "1";
+			if (do_override)
+				arg_val_str = szOverrideOpt;
+			else {
+				arg_val_str = arg_val->value.string;
+				if (!arg_val_str) arg_val_str = "1";
+			}
 			res = av_dict_set(&ctx->options, arg_name, arg_val_str, 0);
 			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Failed to set option %s:%s\n", arg_name, arg_val ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Failed to set option %s:%s\n", arg_name, arg_val_str ));
 			}
 			break;
 		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Failed to set option %s:%s, unrecognized type %d\n", arg_name, arg_val, arg_val->type ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Failed to set option %s, unrecognized type %d\n", arg_name, arg_val->type ));
 			return GF_NOT_SUPPORTED;
 		}
 		return GF_OK;
@@ -1390,30 +1797,58 @@
 	return GF_NOT_SUPPORTED;
 }
 
+static Bool ffenc_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	if (evt->base.type==GF_FEVT_ENCODE_HINTS) {
+		GF_FFEncodeCtx *ctx = gf_filter_get_udta(filter);
+		if ((ctx->fintra.num<0) && evt->encode_hints.intra_period.den && evt->encode_hints.intra_period.num) {
+			ctx->fintra = evt->encode_hints.intra_period;
+			if (!ctx->rc || (gf_list_count(ctx->src_packets) && !ctx->force_reconfig)) {
+				ctx->reconfig_pending = GF_TRUE;
+				ctx->force_reconfig = GF_TRUE;
+			}
+		}
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
 static const GF_FilterCapability FFEncodeCaps[] =
 {
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
 	//some video encoding dumps in unframe mode, we declare the pid property at runtime
 	{0},
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
-
 };
 
 GF_FilterRegister FFEncodeRegister = {
 	.name = "ffenc",
 	.version=LIBAVCODEC_IDENT,
 	GF_FS_SET_DESCRIPTION("FFMPEG encoder")
-	GF_FS_SET_HELP("Encodes audio and video streams.\nSee FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details"
+	GF_FS_SET_HELP("This filter encodes audio and video streams using FFMPEG.\n"
+		"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.\n"
+		"To list all supported encoders for your GPAC build, use `gpac -h ffenc:*`.\n"
+		"\n"
+		"The filter will try to resolve the codec name in [-c]() against a libavcodec codec name (e.g. `libx264`) and use it if found.\n"
+		"If not found, it will consider the name to be a GPAC codec name and find a codec for it. In that case, if no pixel format is given, codecs will be enumerated to find a matching pixel format.\n"
+		"\n"
+		"Options can be passed from prompt using `--OPT=VAL` (global options) or appending `::OPT=VAL` to the desired encoder filter.\n"
+		"\n"
+		"The filter will look for property `TargetRate` on input PID to set the desired bitrate per PID.\n"
 		"\n"
-		"Note: if no codec is explicited through [-ffc]() option and no pixel format is given, codecs will be enumerated to find a matching pixel format.\n"
+		"The filter will force a closed gop boundary:\n"
+		"- at each packet with a `FileNumber` property set or a `CueStart` property set to true.\n"
+		"- if [-fintra]() and [-rc]() is set.\n"
 		"\n"
-		"The encoder will force a closed gop boundary at each packet with a `FileNumber` property set.\n"
+		"When forcing a closed GOP boundary, the filter will flush, destroy and recreate the encoder to make sure a clean context is used, as currently many encoders in libavcodec do not support clean reset when forcing picture types.\n"
+		"If [-fintra]() is not set and the output of the encoder is a DASH session in live profile without segment timeline, [-fintra]() will be set to the target segment duration and [-rc]() will be set.\n"
 	)
 	.private_size = sizeof(GF_FFEncodeCtx),
 	SETCAPS(FFEncodeCaps),
@@ -1421,6 +1856,7 @@
 	.finalize = ffenc_finalize,
 	.configure_pid = ffenc_configure_pid,
 	.process = ffenc_process,
+	.process_event = ffenc_process_event,
 	.update_arg = ffenc_update_arg,
 	.flags = GF_FS_REG_META,
 };
@@ -1428,13 +1864,13 @@
 #define OFFS(_n)	#_n, offsetof(GF_FFEncodeCtx, _n)
 static const GF_FilterArgs FFEncodeArgs[] =
 {
-	{ OFFS(c), "codec identifier. Can be any supported GPAC ID or ffmpeg ID or filter subclass name", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(c), "codec identifier. Can be any supported GPAC codec name or ffmpeg codec name", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(pfmt), "pixel format for input video. When not set, input format is used", GF_PROP_PIXFMT, "none", NULL, 0},
-	{ OFFS(fintra), "force intra / IDR frames at the given period in sec, eg `fintra=60000/1001` will force an intra every 2 seconds on 29.97 fps video; ignored for audio", GF_PROP_FRACTION, "0", NULL, 0},
+	{ OFFS(fintra), "force intra / IDR frames at the given period in sec, e.g. `fintra=2` will force an intra every 2 seconds and `fintra=1001/1000` will force an intra every 30 frames on 30000/1001=29.97 fps video; ignored for audio", GF_PROP_FRACTION, "-1/1", NULL, 0},
 
 	{ OFFS(all_intra), "only produce intra frames", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ls), "log stats", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ffc), "ffmpeg codec name. This allows enforcing a given codec if multiple codecs support the codec ID set (eg aac vs vo_aacenc)", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(rc), "reset encoder when forcing intra frame (some encoders might not support intra frame forcing)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 
 	{ "*", -1, "any possible options defined for AVCodecContext and sub-classes. see `gpac -hx ffenc` and `gpac -hx ffenc:*`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{0}

gpac-1.0.1.tar.gz/src/filters/ff_mx.c -> gpac-2.0.0.tar.gz/src/filters/ff_mx.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom Paris 2019-2020
+ *			Copyright (c) Telecom Paris 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ffmpeg muxer filter
@@ -29,6 +29,7 @@
 
 #include "ff_common.h"
 #include <gpac/network.h>
+#include <gpac/bitstream.h>
 
 #if (LIBAVFORMAT_VERSION_MAJOR <= 56)
 #undef GPAC_HAS_FFMPEG
@@ -47,6 +48,7 @@
 	u32 cts_shift;
 
 	Bool suspended;
+	Bool reconfig_stream;
 } GF_FFMuxStream;
 
 enum{
@@ -58,6 +60,13 @@
 	FFMX_STATE_ERROR
 };
 
+enum
+{
+	FFMX_INJECT_DSI = 1,
+	FFMX_INJECT_VID_INFO = 1<<1,
+	FFMX_INJECT_AUD_INFO = 1<<2
+};
+
 typedef struct
 {
 	//options
@@ -84,8 +93,13 @@
 	AVIOContext *avio_ctx;
 	FILE *gfio;
 
-
 	u32 cur_file_idx_plus_one;
+
+#if (LIBAVCODEC_VERSION_MAJOR < 59)
+	AVPacket pkt;
+#else
+	AVPacket *pkt;
+#endif
 } GF_FFMuxCtx;
 
 static GF_Err ffmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove);
@@ -98,11 +112,16 @@
 	assert(ctx->status==FFMX_STATE_AVIO_OPEN);
 
 	ctx->status = FFMX_STATE_HDR_DONE;
-	res = avformat_init_output(ctx->muxer, &ctx->options);
+
+	AVDictionary *options = NULL;
+	av_dict_copy(&options, ctx->options, 0);
+
+	res = avformat_init_output(ctx->muxer, &options);
 
 	if (res<0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Fail to open %s - error %s\n", ctx->dst, av_err2str(res) ));
 		ctx->status = FFMX_STATE_ERROR;
+		if (options) av_dict_free(&options);
 		return GF_NOT_SUPPORTED;
 	}
 
@@ -119,14 +138,15 @@
 		}
 	}
 
-	res = avformat_write_header(ctx->muxer, &ctx->options);
+	res = avformat_write_header(ctx->muxer, &options);
 	if (res<0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Fail to write header for %s - error %s\n", ctx->dst, av_err2str(res) ));
 		ctx->status = FFMX_STATE_ERROR;
+		if (options) av_dict_free(&options);
 		return GF_SERVICE_ERROR;
 	}
 
-	ffmpeg_report_unused_options(filter, ctx->options);
+	ffmpeg_report_options(filter, options, ctx->options);
 
 	return GF_OK;
 }
@@ -141,6 +161,12 @@
 static int64_t ffavio_seek(void *opaque, int64_t offset, int whence)
 {
 	GF_FFMuxCtx *ctx = (GF_FFMuxCtx *)opaque;
+	if (whence==AVSEEK_SIZE) {
+		u64 pos = gf_ftell(ctx->gfio);
+		u64 size = gf_fsize(ctx->gfio);
+		gf_fseek(ctx->gfio, pos, SEEK_SET);
+		return size;
+	}
 	return (int64_t) gf_fseek(ctx->gfio, offset, whence);
 }
 
@@ -148,7 +174,7 @@
 {
 	const char *dst;
 	Bool use_gfio=GF_FALSE;
-	AVOutputFormat *ofmt = ctx->muxer->oformat;
+	const AVOutputFormat *ofmt = ctx->muxer->oformat;
 
 	dst = final_name ? final_name : ctx->dst;
 	if (!strncmp(dst, "gfio://", 7)) {
@@ -190,11 +216,18 @@
 static GF_Err ffmx_initialize_ex(GF_Filter *filter, Bool use_templates)
 {
 	const char *url, *sep;
-	AVOutputFormat *ofmt;
+	const AVOutputFormat *ofmt;
 	GF_FFMuxCtx *ctx = (GF_FFMuxCtx *) gf_filter_get_udta(filter);
 
+	if (!ctx->dst) return GF_BAD_PARAM;
+
 	ffmpeg_setup_logs(GF_LOG_CONTAINER);
 
+#if (LIBAVCODEC_VERSION_MAJOR >= 59)
+	if (!ctx->pkt)
+		ctx->pkt = av_packet_alloc();
+#endif
+
 	ctx->muxer = avformat_alloc_context();
 	if (!ctx->muxer) return GF_OUT_OF_MEM;
 
@@ -232,7 +265,7 @@
 		}
 		return GF_SERVICE_ERROR;
 	}
-	ctx->muxer->oformat = ofmt;
+	ctx->muxer->oformat = FF_OFMT_CAST ofmt;
 
 	ctx->status = FFMX_STATE_ALLOC;
 	//templates are used, we need to postpone opening the url until we have a PID and a first packet
@@ -288,8 +321,10 @@
 			st->time_base = ctx->muxer->streams[i]->time_base;
 			st->avg_frame_rate = ctx->muxer->streams[i]->avg_frame_rate;
 
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 			if (ctx->muxer->streams[i]->codecpar->codec_tag == MKTAG('t','m','c','d'))
 				st->codec->time_base = ctx->muxer->streams[i]->codec->time_base;
+#endif
 
 			av_dict_copy(&st->metadata, ctx->muxer->streams[i]->metadata, 0);
 
@@ -310,10 +345,13 @@
 		ctx->muxer->pb = NULL;
 	}
 
-//	av_freep(&ctx->muxer->url);
-//	ctx->muxer->url = av_strdup(seg_name);
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 	strncpy(ctx->muxer->filename, seg_name, 1023);
 	ctx->muxer->filename[1023]=0;
+#else
+	av_freep(&ctx->muxer->url);
+	ctx->muxer->url = av_strdup(seg_name);
+#endif
 	ctx->offset_at_seg_start = 0;
 
 	if (!(ctx->muxer->oformat->flags & AVFMT_NOFILE)) {
@@ -339,7 +377,7 @@
 av_dict_copy(&options, ctx->options, 0);
 av_dict_set(&options, "fflags", "-autobsf", 0);
 res = avformat_write_header(ctx->muxer, &options);
- av_dict_free(&options);
+		if (options) av_dict_free(&options);
 if (res < 0) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Fail to configure segment %s - error %s\n", seg_name, av_err2str(res) ));
 			return GF_IO_ERR;
@@ -364,13 +402,13 @@
 			if (ctx->status==FFMX_STATE_HDR_DONE) {
 				res = av_write_trailer(ctx->muxer);
 			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Invalid state %d for segment %s close\n", ctx->status, /*ctx->muxer->url*/ctx->muxer->filename));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Invalid state %d for segment %s close\n", ctx->status, AVFMT_URL(ctx->muxer) ));
 				return GF_SERVICE_ERROR;
 			}
 		}
 
 		if (res<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Fail to flush segment %s - error %s\n", /*ctx->muxer->url*/ctx->muxer->filename, av_err2str(res) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Fail to flush segment %s - error %s\n", AVFMT_URL(ctx->muxer), av_err2str(res) ));
 			return GF_SERVICE_ERROR;
 		}
 		ctx->status = FFMX_STATE_TRAILER_DONE;
@@ -383,10 +421,10 @@
 
 	//init seg
 	if (!ctx->init_done) {
-		evt.seg_size.is_init = GF_TRUE;
+		evt.seg_size.is_init = 1;
 		ctx->init_done = GF_TRUE;
 	} else {
-		evt.seg_size.is_init = GF_FALSE;
+		evt.seg_size.is_init = 0;
 	}
 	evt.seg_size.media_range_start = ctx->offset_at_seg_start;
 	evt.seg_size.media_range_end = ctx->muxer->pb ? ctx->muxer->pb->written-1 : 0;
@@ -396,6 +434,66 @@
 	return GF_OK;
 }
 
+void ffmx_inject_config(GF_FilterPid *pid, GF_FFMuxStream *st, AVPacket *pkt)
+{
+	const GF_PropertyValue *p;
+	u8 *data;
+	if (st->reconfig_stream & FFMX_INJECT_DSI) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		if (p && (p->type==GF_PROP_DATA) && p->value.data.ptr) {
+			data = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, p->value.data.size);
+			if (data)
+				memcpy(data, p->value.data.ptr, p->value.data.size);
+		}
+	}
+	if (st->reconfig_stream & FFMX_INJECT_VID_INFO) {
+		u32 w, h;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+		w = p ? p->value.uint : st->stream->codecpar->width;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+		h = p ? p->value.uint : st->stream->codecpar->height;
+
+		data = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, 12);
+		if (data) {
+			GF_BitStream *bs = gf_bs_new(data, 12, GF_BITSTREAM_WRITE);
+			gf_bs_write_u32_le(bs, AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS);
+			gf_bs_write_u32_le(bs, w);
+			gf_bs_write_u32_le(bs, h);
+			gf_bs_del(bs);
+		}
+	}
+	if (st->reconfig_stream & FFMX_INJECT_AUD_INFO) {
+		u32 sr, ch, size=12;
+		u64 ch_layout;
+		u32 flags = AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT | AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+		sr = p ? p->value.uint : st->stream->codecpar->sample_rate;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+		ch = p ? p->value.uint : st->stream->codecpar->channels;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+		if (p) {
+			ch_layout = ffmpeg_channel_layout_from_gpac(p->value.uint);
+		} else {
+			ch_layout = st->stream->codecpar->channel_layout;
+		}
+		if (ch_layout) {
+			size += 8;
+			flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT;
+		}
+
+		data = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, size);
+		if (data) {
+			GF_BitStream *bs = gf_bs_new(data, 12, GF_BITSTREAM_WRITE);
+			gf_bs_write_u32_le(bs, flags);
+			gf_bs_write_u32_le(bs, ch);
+			if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
+				gf_bs_write_u64_le(bs, ch_layout);
+			gf_bs_write_u32_le(bs, sr);
+			gf_bs_del(bs);
+		}
+	}
+}
+
 static GF_Err ffmx_process(GF_Filter *filter)
 {
 	GF_Err e = GF_OK;
@@ -459,7 +557,7 @@
 			int res;
 			const GF_PropertyValue *p;
 			u32 sap;
-			AVPacket ffpck;
+			AVPacket *pkt;
 			GF_FilterPacket *ipck = gf_filter_pid_get_packet(ipid);
 			if (!ipck) {
 				if (gf_filter_pid_is_eos(ipid)) {
@@ -512,38 +610,48 @@
 				}
 			}
 
-			av_init_packet(&ffpck);
-			ffpck.stream_index = st->stream->index;
-			ffpck.dts = gf_filter_pck_get_dts(ipck);
-			ffpck.pts = gf_filter_pck_get_cts(ipck);
-			if (st->cts_shift) ffpck.pts += st->cts_shift;
+			FF_INIT_PCK(ctx, pkt)
 
-			if (ffpck.dts > ffpck.pts) {
-				st->cts_shift = (u32) (ffpck.dts - ffpck.pts);
+			pkt->stream_index = st->stream->index;
+			pkt->dts = gf_filter_pck_get_dts(ipck);
+			pkt->pts = gf_filter_pck_get_cts(ipck);
+			if (st->cts_shift) pkt->pts += st->cts_shift;
+
+			if (pkt->dts > pkt->pts) {
+				st->cts_shift += (u32) (pkt->dts - pkt->pts);
 				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[FFMux] Negative CTS offset -%d found, adjusting offset\n", st->cts_shift));
-				ffpck.pts = ffpck.dts;
+				pkt->pts = pkt->dts;
 			}
-			ffpck.duration = gf_filter_pck_get_duration(ipck);
+			pkt->duration = gf_filter_pck_get_duration(ipck);
 			sap = gf_filter_pck_get_sap(ipck);
-			if (sap==GF_FILTER_SAP_1) ffpck.flags = AV_PKT_FLAG_KEY;
-			ffpck.data = (u8 *) gf_filter_pck_get_data(ipck, &ffpck.size);
+			if (sap==GF_FILTER_SAP_1) pkt->flags = AV_PKT_FLAG_KEY;
+			pkt->data = (u8 *) gf_filter_pck_get_data(ipck, &pkt->size);
 
 			if (st->ts_rescale) {
-				av_packet_rescale_ts(&ffpck, st->in_scale, st->stream->time_base);
+				av_packet_rescale_ts(pkt, st->in_scale, st->stream->time_base);
+			}
+
+			if (st->reconfig_stream) {
+				ffmx_inject_config(ipid, st, pkt);
 			}
 
 			if (ctx->interleave) {
-				res = av_interleaved_write_frame(ctx->muxer, &ffpck);
+				res = av_interleaved_write_frame(ctx->muxer, pkt);
 			} else {
-				res = av_write_frame(ctx->muxer, &ffpck);
+				res = av_write_frame(ctx->muxer, pkt);
 			}
 			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Fail to write packet to %s - error %s\n", /*ctx->muxer->url*/ctx->muxer->filename, av_err2str(res) ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Fail to write packet %sto %s - error %s\n", st->reconfig_stream ? "with reconfig side data " : "", AVFMT_URL(ctx->muxer), av_err2str(res) ));
 				e = GF_IO_ERR;
 			}
+			if (st->reconfig_stream) {
+				av_packet_free_side_data(pkt);
+				st->reconfig_stream = 0;
+			}
 
 			gf_filter_pid_drop_packet(ipid);
 			ctx->nb_pck_in_seg++;
+			FF_RELEASE_PCK(pkt)
 		}
 	}
 
@@ -610,7 +718,7 @@
 	}
 	st = gf_filter_pid_get_udta(pid);
 	if (st) {
-		if (ctx->status>FFMX_STATE_HDR_DONE)
+		if (ctx->status >= FFMX_STATE_HDR_DONE)
 			check_disc = GF_TRUE;
 	} else {
 		if (ctx->status>FFMX_STATE_HDR_DONE) {
@@ -656,6 +764,9 @@
 			case GF_AUDIO_FMT_S16P:
 				ff_codec_id = AV_CODEC_ID_PCM_S16LE;
 				break;
+			case GF_AUDIO_FMT_S16_BE:
+				ff_codec_id = AV_CODEC_ID_PCM_S16BE;
+				break;
 			case GF_AUDIO_FMT_S24:
 			case GF_AUDIO_FMT_S24P:
 				ff_codec_id = AV_CODEC_ID_PCM_S24LE;
@@ -730,19 +841,47 @@
 
 	if (check_disc) {
 		u32 dsi_crc, old_dsi_crc;
-		Bool is_ok = GF_TRUE;
-		if (avst->codecpar->codec_id != ff_codec_id) is_ok = GF_FALSE;
-		else if (avst->codecpar->codec_type != ff_st) is_ok = GF_FALSE;
+		if ((avst->codecpar->codec_id != ff_codec_id) || (avst->codecpar->codec_type != ff_st)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Dynamic stream update in mux %s not supported\n", ctx->dst));
+			return GF_NOT_SUPPORTED;
+		}
 
 		dsi_crc = old_dsi_crc = 0;
 		if (avst->codecpar->extradata) old_dsi_crc = gf_crc_32(avst->codecpar->extradata, avst->codecpar->extradata_size);
 		if (dsi) dsi_crc = gf_crc_32(dsi->value.data.ptr, dsi->value.data.size);
 
-		if (dsi_crc != old_dsi_crc) is_ok = GF_FALSE;
-		if (!is_ok) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Dynamic stream update in mux %s not supported\n", ctx->dst));
-			return GF_NOT_SUPPORTED;
+		st->reconfig_stream = 0;
+		if (dsi_crc != old_dsi_crc)
+			st->reconfig_stream |= FFMX_INJECT_DSI;
+		if (streamtype==GF_STREAM_VISUAL) {
+			u32 w, h;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+			w = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+			h = p ? p->value.uint : 0;
+			if ((w != avst->codecpar->width) || (h != avst->codecpar->height))
+				st->reconfig_stream |= FFMX_INJECT_VID_INFO;
+		} else if (streamtype==GF_STREAM_AUDIO) {
+			u32 sr, ch;
+			u64 ch_layout;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+			sr = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+			ch = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+			ch_layout = p ? p->value.uint : 0;
+			if (ch_layout)
+				ch_layout = ffmpeg_channel_layout_from_gpac(ch_layout);
+			if ((sr != avst->codecpar->sample_rate) || (ch != avst->codecpar->channels) || (ch_layout!=avst->codecpar->channel_layout))
+				st->reconfig_stream |= FFMX_INJECT_AUD_INFO;
 		}
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+		if (p) {
+			st->in_scale.den = p->value.uint;
+			st->in_scale.num = 1;
+		}
+		return GF_OK;
 	}
 
 	avst->codecpar->codec_id = ff_codec_id;
@@ -825,9 +964,10 @@
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
 		if (p && avst->r_frame_rate.num && avst->r_frame_rate.den) {
-			avst->codecpar->video_delay = p->value.sint;
-			avst->codecpar->video_delay *= avst->r_frame_rate.num;
-			avst->codecpar->video_delay /= avst->r_frame_rate.den;
+			s64 delay = p->value.longsint;
+			delay *= avst->r_frame_rate.num;
+			delay /= avst->r_frame_rate.den;
+			avst->codecpar->video_delay = (s32) delay;
 		}
 
 	}
@@ -858,11 +998,12 @@
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
 		if (p && (p->value.sint<0) && samplerate) {
-			avst->codecpar->initial_padding = p->value.sint;
+			s64 pad = p->value.longsint;
 			if (st->in_scale.den != samplerate) {
-				avst->codecpar->initial_padding *= samplerate;
-				avst->codecpar->initial_padding /= st->in_scale.den;
+				pad *= samplerate;
+				pad /= st->in_scale.den;
 			}
+			avst->codecpar->initial_padding = (s32) pad;
 		}
 		/*
 		//not mapped in gpac
@@ -891,8 +1032,15 @@
 			av_write_trailer(ctx->muxer);
 		}
 		ctx->status = FFMX_STATE_TRAILER_DONE;
+	} 
+	if (!ctx->gfio && ctx->muxer && ctx->muxer->pb) {
+		ctx->muxer->io_close(ctx->muxer, ctx->muxer->pb);
 	}
 
+#if (LIBAVCODEC_VERSION_MAJOR >= 59)
+	av_packet_free(&ctx->pkt);
+#endif
+
 	if (ctx->options) av_dict_free(&ctx->options);
 	if (ctx->muxer)	avformat_free_context(ctx->muxer);
 	while (gf_list_count(ctx->streams)) {
@@ -919,11 +1067,11 @@
 		case GF_PROP_STRING:
 			res = av_dict_set(&ctx->options, arg_name, arg_val->value.string, 0);
 			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] Failed to set option %s:%s\n", arg_name, arg_val ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Failed to set option %s:%s\n", arg_name, arg_val ));
 			}
 			break;
 		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] Failed to set option %s:%s, unrecognized type %d\n", arg_name, arg_val, arg_val->type ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Failed to set option %s:%s, unrecognized type %d\n", arg_name, arg_val, arg_val->type ));
 			return GF_NOT_SUPPORTED;
 		}
 		return GF_OK;
@@ -942,7 +1090,7 @@
 		return GF_FPROBE_NOT_SUPPORTED;
 
 
-	AVOutputFormat *ofmt = av_guess_format(NULL, url, mime);
+	const AVOutputFormat *ofmt = av_guess_format(NULL, url, mime);
 	if (!ofmt && mime) ofmt = av_guess_format(NULL, NULL, mime);
 	if (!ofmt && url) ofmt = av_guess_format(NULL, url, NULL);
 
@@ -975,11 +1123,16 @@
 GF_FilterRegister FFMuxRegister = {
 	.name = "ffmx",
 	.version = LIBAVFORMAT_IDENT,
-	GF_FS_SET_DESCRIPTION("FFMPEG muxer")
-	GF_FS_SET_HELP("FFMPEG output for files and streamers.\n"
-		"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details\n"
+	GF_FS_SET_DESCRIPTION("FFMPEG multiplexer")
+
+	GF_FS_SET_HELP("Multiplexes files and open output protocols using FFMPEG.\n"
+		"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details.\n"
+		"To list all supported multiplexers for your GPAC build, use `gpac -h ffmx:*`."
+		"This will list both supported output formats and protocols.\n"
+		"Output protocols are listed with `Description: Output protocol`, and the subclass name identifies the protocol scheme.\n"
+		"For example, if `ffmx:rtmp` is listed as output protocol, this means `rtmp://` destination URLs are supported.\n"
 		"\n"
-		"Note: Some URL formats may not be sufficient to derive the multiplexing format, you must then use [-ffmt]() to specify the desired format.\n"
+		"Some URL formats may not be sufficient to derive the multiplexing format, you must then use [-ffmt]() to specify the desired format.\n"
 		"\n"
 		"Unlike other multiplexing filters in GPAC, this filter is a sink filter and does not produce any PID to be redirected in the graph.\n"
 		"The filter can however use template names for its output, using the first input PID to resolve the final name.\n"
@@ -1006,16 +1159,16 @@
 
 static const GF_FilterArgs FFMuxArgs[] =
 {
-	{ OFFS(dst), "location of source content", GF_PROP_NAME, NULL, NULL, 0},
-	{ OFFS(start), "set playback start offset. Negative value means percent of media dur with -1 <=> dur", GF_PROP_DOUBLE, "0.0", NULL, 0},
-	{ OFFS(speed), "set playback speed. If speed is negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{ OFFS(dst), "location of destination file or remote URL", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(start), "set playback start offset. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, 0},
+	{ OFFS(speed), "set playback speed. If negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
 	{ OFFS(interleave), "write frame in interleave mode", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(nodisc), "ignore stream configuration changes while muxing, may result in broken streams", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(nodisc), "ignore stream configuration changes while multiplexing, may result in broken streams", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(mime), "set mime type for graph resolution", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(ffiles), "force complete files to be created for each segment in DASH modes", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(ffmt), "force ffmpeg output format for the given URL", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(block_size), "block size used to read file when using avio context", GF_PROP_UINT, "4096", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ "*", -1, "any possible options defined for AVFormatContext and sub-classes. See `gpac -hx ffmx` and `gpac -hx ffmx:*`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
+	{ "*", -1, "any possible options defined for AVFormatContext and sub-classes (see `gpac -hx ffmx` and `gpac -hx ffmx:*`)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{0}
 };

gpac-1.0.1.tar.gz/src/filters/ff_rescale.c -> gpac-2.0.0.tar.gz/src/filters/ff_rescale.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ffmpeg video rescaler filter
@@ -28,6 +28,14 @@
 #ifdef GPAC_HAS_FFMPEG
 
 #include "ff_common.h"
+#include <gpac/evg.h>
+
+enum
+{
+	FFSWS_KEEPAR_OFF=0,
+	FFSWS_KEEPAR_FULL,
+	FFSWS_KEEPAR_NOSRC,
+};
 
 typedef struct
 {
@@ -35,9 +43,14 @@
 	GF_PropVec2i osize;
 	u32 ofmt, scale;
 	Double p1, p2;
-
+	Bool ofr;
+	u32 brightness, saturation, contrast;
+	GF_PropIntList otable, itable;
 	//internal data
 	Bool initialized;
+	char *padclr;
+	u32 keepar;
+	GF_Fraction osar;
 
 	GF_FilterPid *ipid, *opid;
 	u32 w, h, stride, s_pfmt;
@@ -51,7 +64,10 @@
 	u32 nb_planes, nb_src_planes, out_size, out_src_size, src_uv_height, dst_uv_height, ow, oh;
 
 	u32 swap_idx_1, swap_idx_2;
+	Bool fullrange;
 
+	u32 o_bpp, offset_w, offset_h;
+	GF_EVGSurface *surf;
 } GF_FFSWScaleCtx;
 
 static GF_Err ffsws_process(GF_Filter *filter)
@@ -93,7 +109,7 @@
 
 	data = gf_filter_pck_get_data(pck, &osize);
 	frame_ifce = gf_filter_pck_get_frame_interface(pck);
-	//we may have biffer input (padding) but shall not have smaller
+	//we may have buffer input (padding) but shall not have smaller
 	if (osize && (ctx->out_src_size > osize) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFSWS] Mismatched in source osize, expected %d got %d - stride issue ?\n", ctx->out_src_size, osize));
 		gf_filter_pid_drop_packet(ctx->ipid);
@@ -103,10 +119,8 @@
 	memset(src_planes, 0, sizeof(src_planes));
 	memset(dst_planes, 0, sizeof(dst_planes));
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &output);
-	if (!dst_pck) {
-		gf_filter_pid_drop_packet(ctx->ipid);
-		return GF_OUT_OF_MEM;
-	}
+	if (!dst_pck) return GF_OUT_OF_MEM;
+
 	gf_filter_pck_merge_properties(pck, dst_pck);
 
 	if (data) {
@@ -135,21 +149,45 @@
 		return GF_NOT_SUPPORTED;
 	}
 	dst_planes[0] = output;
+	dst_planes[0] += ctx->dst_stride[0] * ctx->offset_h + ctx->offset_w*ctx->o_bpp;
+
 	if (ctx->nb_planes==1) {
 	} else if (ctx->nb_planes==2) {
 		dst_planes[1] = output + ctx->dst_stride[0] * ctx->oh;
+
+		dst_planes[1] += ctx->dst_stride[1] * ctx->offset_h * ctx->dst_uv_height / ctx->oh;
+		dst_planes[1] += ctx->offset_w*ctx->o_bpp*ctx->dst_stride[1]/ctx->dst_stride[0];
 	} else if (ctx->nb_planes==3) {
 		dst_planes[1] = output + ctx->dst_stride[0] * ctx->oh;
 		dst_planes[2] = dst_planes[1] + ctx->dst_stride[1]*ctx->dst_uv_height;
+
+		dst_planes[1] += ctx->dst_stride[1] * ctx->offset_h * ctx->dst_uv_height / ctx->oh;
+		dst_planes[1] += ctx->offset_w*ctx->o_bpp*ctx->dst_stride[1]/ctx->dst_stride[0];
+
+		dst_planes[2] += ctx->dst_stride[2] * ctx->offset_h * ctx->dst_uv_height / ctx->oh;
+		dst_planes[2] += ctx->offset_w*ctx->o_bpp*ctx->dst_stride[2]/ctx->dst_stride[0];
 	} else if (ctx->nb_planes==4) {
 		dst_planes[1] = output + ctx->dst_stride[0] * ctx->oh;
 		dst_planes[2] = dst_planes[1] + ctx->dst_stride[1]*ctx->dst_uv_height;
 		dst_planes[3] = dst_planes[2] + ctx->dst_stride[2]*ctx->dst_uv_height;
+
+		dst_planes[1] += ctx->dst_stride[1] * ctx->offset_h * ctx->dst_uv_height / ctx->oh;
+		dst_planes[1] += ctx->offset_w*ctx->o_bpp*ctx->dst_stride[1]/ctx->dst_stride[0];
+
+		dst_planes[2] += ctx->dst_stride[2] * ctx->offset_h * ctx->dst_uv_height / ctx->oh;
+		dst_planes[2] += ctx->offset_w*ctx->o_bpp*ctx->dst_stride[2]/ctx->dst_stride[0];
+
+		dst_planes[3] += ctx->dst_stride[3] * ctx->offset_h + ctx->offset_w*ctx->o_bpp;
+	}
+	if (ctx->offset_w || ctx->offset_h) {
+		u32 color = ctx->padclr ? gf_color_parse(ctx->padclr) : 0xFF000000;
+		gf_evg_surface_attach_to_buffer(ctx->surf, output, ctx->ow, ctx->oh, 0, ctx->dst_stride[0], ctx->ofmt);
+		gf_evg_surface_clear(ctx->surf, NULL, color);
 	}
 
 	//rescale the cropped frame
 	res = sws_scale(ctx->swscaler, (const u8**) src_planes, ctx->src_stride, 0, ctx->h, dst_planes, ctx->dst_stride);
-	if (res != ctx->oh) {
+	if (res + 2*ctx->offset_h != ctx->oh) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFSWS] Error during scale, expected height %d got %d\n", ctx->oh, res));
 		gf_filter_pid_drop_packet(ctx->ipid);
 		gf_filter_pck_discard(dst_pck);
@@ -199,12 +237,14 @@
 	const GF_PropertyValue *p;
 	u32 w, h, stride, ofmt;
 	GF_Fraction sar;
+	Bool fullrange=GF_FALSE;
 	Double par[2], *par_p=NULL;
 	GF_FFSWScaleCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
 		if (ctx->opid) {
 			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
 		}
 		return GF_OK;
 	}
@@ -219,9 +259,24 @@
 		ctx->ipid = pid;
 	}
 
-	//if nothing is set we, consider we run as an adaptation filter, wait for caps to be set to declare output
-	if (!ctx->ofmt && !ctx->osize.x && !ctx->osize.y)
+	//if nothing is set we, consider we run as an adaptation filter, wait for reconfiguration to be called to declare output format
+	if (!ctx->ofmt && !ctx->osize.x && !ctx->osize.y) {
+		//we were explicitly loaded, act as a passthrough filter until we get a reconfig
+		//we must do so for cases where the declared properties match the consuming format (so reconfiguration will never be called)
+		if (!gf_filter_is_dynamic(filter)) {
+			gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+			//make sure we init at some default values as filters down the chain will check for w/h/pfmt
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+			if (!p) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(128));
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+			if (!p) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(128));
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+			if (!p) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_RGB));
+
+			ctx->passthrough = GF_TRUE;
+		}
 		return GF_OK;
+	}
 
 
 
@@ -238,6 +293,9 @@
 	if (p) sar = p->value.frac;
 	else sar.den = sar.num = 1;
 
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_RANGE);
+	if (p) fullrange = p->value.boolean;
+
 	//ctx->ofmt may be 0 if the filter is instantiated dynamically, we haven't yet been called for reconfigure
 	if (!w || !h || !ofmt) {
 		return GF_OK;
@@ -250,13 +308,90 @@
 
 	ctx->passthrough = GF_FALSE;
 
-	ctx->ow = ctx->osize.x ? ctx->osize.x : w;
-	ctx->oh = ctx->osize.y ? ctx->osize.y : h;
-	if ((ctx->w == w) && (ctx->h == h) && (ctx->s_pfmt == ofmt) && (ctx->stride == stride)) {
+	Bool downsample_w=GF_FALSE, downsample_h=GF_FALSE;
+	switch (ofmt) {
+	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
+	case GF_PIXEL_YUV_10:
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+	case GF_PIXEL_YUVA:
+	case GF_PIXEL_YUVD:
+		downsample_h=GF_TRUE;
+		//fallthrough
+	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_UYVY_10:
+	case GF_PIXEL_VYUY_10:
+	case GF_PIXEL_YUYV_10:
+	case GF_PIXEL_YVYU_10:
+		downsample_w = GF_TRUE;
+		break;
+
+	default:
+		break;
+	}
+
+	u32 scale_w = w;
+	if ((ctx->keepar == FFSWS_KEEPAR_FULL) && (sar.num > (s32) sar.den)) {
+		scale_w = w * sar.num / sar.den;
+		sar.num=0;
+	}
+
+	if (!ctx->osize.x && !ctx->osize.y) {
+		ctx->ow = w;
+		ctx->oh = h;
+		scale_w = w;
+	}
+	else if (!ctx->osize.x) {
+		ctx->oh = ctx->osize.y;
+		ctx->ow = ctx->osize.y * scale_w / h;
+	}
+	else if (!ctx->osize.y) {
+		ctx->ow = ctx->osize.x;
+		ctx->oh = ctx->osize.x * h / scale_w;
+	} else {
+		ctx->ow = ctx->osize.x;
+		ctx->oh = ctx->osize.y;
+	}
+	ctx->offset_w = ctx->offset_h = 0;
+
+	u32 final_w = ctx->ow;
+	u32 final_h = ctx->oh;
+	if (ctx->keepar!=FFSWS_KEEPAR_OFF) {
+		if (ctx->ow * h < scale_w * ctx->oh) {
+			final_h = ctx->ow * h / scale_w;
+		} else if (ctx->ow * h > scale_w * ctx->oh) {
+			final_w = ctx->oh * scale_w / h;
+		}
+	}
+	if (ctx->osar.num > (s32) ctx->osar.den) {
+		ctx->ow = ctx->ow * ctx->osar.den / ctx->osar.num;
+		final_w = final_w * ctx->osar.den / ctx->osar.num;
+		if (downsample_w) {
+			if (ctx->ow % 2) ctx->ow -= 1;
+			if (final_w % 2) final_w -= 1;
+		}
+	}
+	ctx->offset_w = (ctx->ow - final_w) / 2;
+	ctx->offset_h = (ctx->oh - final_h) / 2;
+
+	if (downsample_w && (ctx->offset_w % 2)) ctx->offset_w -= 1;
+	if (downsample_h && (ctx->offset_h % 2)) ctx->offset_h -= 1;
+
+	if ((ctx->w == w) && (ctx->h == h) && (ctx->s_pfmt == ofmt) && (ctx->stride == stride) && (ctx->fullrange==fullrange)) {
 		//nothing to reconfigure
 	}
 	//passthrough mode
-	else if ((ctx->ow == w) && (ctx->oh == h) && (ctx->s_pfmt == ofmt) && (ofmt==ctx->ofmt) ) {
+	else if ((ctx->ow == w) && (ctx->oh == h) && (ofmt==ctx->ofmt) && (ctx->ofr == fullrange)
+		&& !ctx->brightness && !ctx->saturation && !ctx->contrast && (ctx->otable.nb_items!=4) && (ctx->itable.nb_items!=4)
+	) {
 		memset(ctx->dst_stride, 0, sizeof(ctx->dst_stride));
 		gf_pixel_get_size_info(ctx->ofmt, ctx->ow, ctx->oh, &ctx->out_size, &ctx->dst_stride[0], &ctx->dst_stride[1], &ctx->nb_planes, &ctx->dst_uv_height);
 		ctx->passthrough = GF_TRUE;
@@ -281,6 +416,7 @@
 		if (ctx->nb_src_planes==3) ctx->src_stride[2] = ctx->src_stride[1];
 		if (ctx->nb_src_planes==4) ctx->src_stride[3] = ctx->src_stride[0];
 
+		ctx->o_bpp = gf_pixel_get_bytes_per_pixel(ofmt);
 		//get layout info for dest
 		memset(ctx->dst_stride, 0, sizeof(ctx->dst_stride));
 		res = gf_pixel_get_size_info(ctx->ofmt, ctx->ow, ctx->oh, &ctx->out_size, &ctx->dst_stride[0], &ctx->dst_stride[1], &ctx->nb_planes, &ctx->dst_uv_height);
@@ -303,7 +439,7 @@
 			}
 		}
 		//create/get a swscale context
-		ctx->swscaler = sws_getCachedContext(ctx->swscaler, w, h, ff_src_pfmt, ctx->ow, ctx->oh, ff_dst_pfmt, mode, NULL, NULL, par_p);
+		ctx->swscaler = sws_getCachedContext(ctx->swscaler, w, h, ff_src_pfmt, ctx->ow-2*ctx->offset_w, ctx->oh-2*ctx->offset_h, ff_dst_pfmt, mode, NULL, NULL, par_p);
 
 		if (!ctx->swscaler) {
 #ifndef GPAC_DISABLE_LOG
@@ -313,13 +449,33 @@
 #endif
 			return GF_NOT_SUPPORTED;
 		}
+		//set colorspace
+		if (fullrange || ctx->ofr || ctx->brightness || ctx->saturation || ctx->contrast || (ctx->itable.nb_items==4) || (ctx->otable.nb_items==4)) {
+			s32 in_full, out_full, brightness, contrast, saturation;
+			s32 *inv_table, *table;
+
+			sws_getColorspaceDetails(ctx->swscaler, &inv_table, &in_full, &table, &out_full, &brightness, &contrast, &saturation);
+			in_full = fullrange;
+			out_full = ctx->ofr;
+			if (ctx->brightness) brightness = ctx->brightness;
+			if (ctx->saturation) saturation = ctx->saturation;
+			if (ctx->contrast) contrast = ctx->contrast;
+
+			if (ctx->itable.nb_items==4)
+				inv_table = ctx->itable.vals;
+			if (ctx->otable.nb_items==4)
+				table = ctx->otable.vals;
+
+			sws_setColorspaceDetails(ctx->swscaler, (const int *) inv_table, in_full, (const int *)table, out_full, brightness, contrast, saturation);
+		}
 		ctx->w = w;
 		ctx->h = h;
 		ctx->s_pfmt = ofmt;
+		ctx->fullrange = fullrange;
 		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[FFSWS] Setup rescaler from %dx%d fmt %s to %dx%d fmt %s\n", w, h, gf_pixel_fmt_name(ofmt), ctx->ow, ctx->oh, gf_pixel_fmt_name(ctx->ofmt)));
 
 		ctx->swap_idx_1 = ctx->swap_idx_2 = 0;
-		//if same source / dest pixel format, don'( swap UV components
+		//if same source / dest pixel format, don't swap UV components
 		if (ctx->s_pfmt != ctx->ofmt) {
 			if (ctx->ofmt==GF_PIXEL_VYUY) {
 				ctx->swap_idx_1 = 0;
@@ -340,14 +496,36 @@
 
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->ofmt));
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(sar) );
+
+	if (ctx->osar.num >= (s32) ctx->osar.den) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->osar) );
+	} else if (sar.num) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(sar) );
+	} else {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, NULL );
+	}
 	return GF_OK;
 }
 
+static GF_Err ffsws_initialize(GF_Filter *filter)
+{
+	GF_FFSWScaleCtx *ctx = gf_filter_get_udta(filter);
+	ffmpeg_setup_logs(GF_LOG_MEDIA);
+	ctx->surf = gf_evg_surface_new(GF_FALSE);
+
+	if (ctx->osar.num &&
+	 ((ctx->osar.num<0) || (ctx->osar.num < (s32) ctx->osar.den))
+	) {
+		ctx->osar.num = 0;
+		ctx->osar.den = 1;
+	}
+	return GF_OK;
+}
 static void ffsws_finalize(GF_Filter *filter)
 {
 	GF_FFSWScaleCtx *ctx = gf_filter_get_udta(filter);
 	if (ctx->swscaler) sws_freeContext(ctx->swscaler);
+	gf_evg_surface_delete(ctx->surf);
 	return;
 }
 
@@ -373,11 +551,25 @@
 #define OFFS(_n)	#_n, offsetof(GF_FFSWScaleCtx, _n)
 static GF_FilterArgs FFSWSArgs[] =
 {
-	{ OFFS(osize), "osize of output video. When not set, input osize is used", GF_PROP_VEC2I, NULL, NULL, 0},
+	{ OFFS(osize), "osize of output video", GF_PROP_VEC2I, NULL, NULL, 0},
 	{ OFFS(ofmt), "pixel format for output video. When not set, input format is used", GF_PROP_PIXFMT, "none", NULL, 0},
-	{ OFFS(scale), "scaling mode - see filter info", GF_PROP_UINT, "bicubic", "fastbilinear|bilinear|bicubic|X|point|area|bicublin|gauss|sinc|lanzcos|spline", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(p1), "scaling algo param1 - see filter info", GF_PROP_DOUBLE, "+I", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(p2), "scaling algo param2 - see filter info", GF_PROP_DOUBLE, "+I", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(scale), "scaling mode (see filter help)", GF_PROP_UINT, "bicubic", "fastbilinear|bilinear|bicubic|X|point|area|bicublin|gauss|sinc|lanzcos|spline", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(p1), "scaling algo param1", GF_PROP_DOUBLE, "+I", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(p2), "scaling algo param2", GF_PROP_DOUBLE, "+I", NULL, GF_FS_ARG_HINT_ADVANCED},
+
+	{ OFFS(ofr), "force output full range", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(brightness), "16.16 fixed point brightness correction, 0 means use default", GF_PROP_BOOL, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(contrast), "16.16 fixed point brightness correction, 0 means use default", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(saturation), "16.16 fixed point brightness correction, 0 means use default", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(otable), "the yuv2rgb coefficients describing the output yuv space, normally ff_yuv2rgb_coeffs[x], use default if not set", GF_PROP_SINT_LIST, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(itable), "the yuv2rgb coefficients describing the input yuv space, normally ff_yuv2rgb_coeffs[x], use default if not set", GF_PROP_SINT_LIST, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(keepar), "keep aspect ratio\n"
+	"- off: ignore aspect ratio\n"
+	"- full: respect aspect ratio, applying input sample aspect ratio info\n"
+	"- nosrc: respect aspect ratio but ignore input sample aspect ratio"
+	, GF_PROP_UINT, "off", "off|full|nosrc", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(padclr), "clear color when aspect ration preservation is used", GF_PROP_STRING, "black", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(osar), "force output pixel aspect ratio", GF_PROP_FRACTION, "0/1", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -392,15 +584,41 @@
 	.name = "ffsws",
 	.version=LIBSWSCALE_IDENT,
 	GF_FS_SET_DESCRIPTION("FFMPEG video rescaler")
-	GF_FS_SET_HELP("For bicubic, to tune the shape of the basis function, [-p1]() tunes f(1) and [-p2]() f´(1)\n"\
-				"For gauss [-p1]() tunes the exponent and thus cutoff frequency\n"\
-				"For lanczos [-p1]() tunes the width of the window function"\
-				"\nSee FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details")
-
+	GF_FS_SET_HELP("This filter rescales raw video data using FFMPEG to the specified size and pixel format.\n"
+	"## Output size assignment\n"
+	"If [-osize]() is {0,0}, the output dimensions will be set to the input size, and input aspect ratio will be ignored.\n"
+	"\n"
+	"If [-osize]() is {0,H} (resp. {W,0}), the output width (resp. height) will be set to respect input aspect ratio. If [-keepar=nosrc](), input sample aspect ratio is ignored.\n"
+	"## Aspect Ratio and Sample Aspect Ratio\n"
+	"When output sample aspect ratio is set, the output dimensions are divided by the output sample aspect ratio.\n"
+	"EX ffsws:osize=288x240:osar=3/2\n"
+	"The output dimensions will be 192x240.\n"
+	"\n"
+	"When aspect ratio is not kept ([-keepar=off]()):\n"
+	"- source is resampled to desired dimensions\n"
+	"- if output aspect ratio is not set, output will use source sample aspect ratio\n"
+	"\n"
+	"When aspect ratio is partially kept ([-keepar=nosrc]()):\n"
+	"- resampling is done on the input data without taking input sample aspect ratio into account\n"
+	"- if output sample aspect ratio is not set ([-osar=0/N]()), source aspect ratio is forwarded to output.\n"
+	"\n"
+	"When aspect ratio is fully kept ([-keepar=full]()), output aspect ratio is force to 1/1 if not set.\n"
+	"\n"
+	"When sample aspect ratio is kept, the filter will:\n"
+	"- center the rescaled input frame on the output frame\n"
+	"- fill extra pixels with [-padclr]()\n"
+	"\n"
+	"## Algorithms options\n"
+	"- for bicubic, to tune the shape of the basis function, [-p1]() tunes f(1) and [-p2]() f´(1)\n"
+	"- for gauss [-p1]() tunes the exponent and thus cutoff frequency\n"
+	"- for lanczos [-p1]() tunes the width of the window function\n"
+	"\n"
+	"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details")
 	.private_size = sizeof(GF_FFSWScaleCtx),
 	.args = FFSWSArgs,
 	.configure_pid = ffsws_configure_pid,
 	SETCAPS(FFSWSCaps),
+	.initialize = ffsws_initialize,
 	.finalize = ffsws_finalize,
 	.process = ffsws_process,
 	.reconfigure_output = ffsws_reconfigure_output,

gpac-1.0.1.tar.gz/src/filters/filelist.c -> gpac-2.0.0.tar.gz/src/filters/filelist.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2020
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / file concatenator filter
@@ -35,22 +35,54 @@
 #include <gpac/avparse.h>
 #endif
 
+enum
+{
+	FLIST_STATE_STOP=0,
+	FLIST_STATE_PLAY,
+	FLIST_STATE_WAIT_PLAY,
+};
+
+typedef struct
+{
+	Bool is_raw, planar;
+	u32 nb_ch, abps, sample_rate;
+} RawAudioInfo;
+
+
 typedef struct
 {
 	GF_FilterPid *ipid;
 	GF_FilterPid *opid;
+	GF_FilterPid *opid_aux;
 	u32 stream_type;
 	//in current timescale
 	u64 max_cts, max_dts;
 	u32 o_timescale, timescale;
-	//in original timescale
+	//in output timescale
 	u64 cts_o, dts_o;
 	Bool single_frame;
 	Bool is_eos;
 	u64 dts_sub;
 	u64 first_dts_plus_one;
 
-	Bool is_playing;
+	Bool skip_dts_init;
+	u32 play_state;
+
+	Bool send_cue;
+	s32 delay, initial_delay;
+
+	RawAudioInfo ra_info, splice_ra_info;
+
+	s32 audio_samples_to_keep;
+
+	GF_FilterPid *splice_ipid;
+	Bool splice_ready;
+
+	u64 cts_o_splice, dts_o_splice;
+	u64 dts_sub_splice;
+	u32 timescale_splice;
+	s32 splice_delay;
+	Bool wait_rap;
 } FileListPid;
 
 typedef struct
@@ -69,14 +101,43 @@
 	FL_SORT_DATEX,
 };
 
+enum
+{
+	//no splicing
+	FL_SPLICE_NONE=0,
+	//waiting for splice to be active, content is main content
+	FL_SPLICE_BEFORE,
+	//splice is active, content is spliced content
+	FL_SPLICE_ACTIVE,
+	//splice no longer active, content is main content
+	FL_SPLICE_AFTER,
+};
+
+enum
+{
+	FL_RAW_AV=0,
+	FL_RAW_AUDIO,
+	FL_RAW_VIDEO,
+	FL_RAW_NO
+};
+
+
+enum
+{
+	FL_SPLICE_DELTA = 1,
+	FL_SPLICE_FRAME = 1<<1,
+};
+
 typedef struct
 {
 	//opts
-	Bool revert;
+	Bool revert, sigcues, fdel;
+	u32 raw;
 	s32 floop;
 	u32 fsort;
 	u32 ka;
-	GF_List *srcs;
+	u64 timeout;
+	GF_PropStringList srcs;
 	GF_Fraction fdur;
 	u32 timescale;
 
@@ -84,28 +145,60 @@
 	char *file_path;
 	u32 last_url_crc;
 	u32 last_url_lineno;
+	u32 last_splice_crc;
+	u32 last_splice_lineno;
 	Bool load_next;
 
 	GF_List *filter_srcs;
 	GF_List *io_pids;
 	Bool is_eos;
 
-	//in 1000000 Hz
-	u64 cts_offset, dts_offset, dts_sub_plus_one;
+	GF_Fraction64 cts_offset, dts_offset, wait_dts_plus_one, dts_sub_plus_one;
 
 	u32 nb_repeat;
 	Double start, stop;
-	Bool do_cat;
+	Bool do_cat, do_del, src_error;
 	u64 start_range, end_range;
 	GF_List *file_list;
 	s32 file_list_idx;
 
-	u64 current_file_dur;
+	u64 current_file_dur_us;
 	Bool last_is_isom;
-	char szCom[GF_MAX_PATH];
 
-	Bool wait_update;
+	u32 wait_update_start;
 	u64 last_file_modif_time;
+
+	Bool skip_sync;
+	Bool first_loaded;
+	char *frag_url;
+
+	char *unknown_params;
+	char *pid_props;
+
+	GF_Fraction64 splice_start, splice_end;
+	u32 flags_splice_start, flags_splice_end;
+	u32 splice_state;
+	FileListPid *splice_ctrl;
+
+	//splice out, in and current time in **output** timeline
+	u64 splice_end_cts, splice_start_cts, spliced_current_cts;
+	Bool wait_splice_start;
+	Bool wait_splice_end;
+	Bool wait_source;
+	GF_Fraction64 cts_offset_at_splice, dts_offset_at_splice, dts_sub_plus_one_at_splice;
+
+	GF_List *splice_srcs;
+	char *dyn_period_id;
+	u32 cur_splice_index;
+	u32 splice_nb_repeat;
+	Bool keep_splice, mark_only, was_kept;
+	char *splice_props;
+	char *splice_pid_props;
+
+	GF_Fraction64 init_splice_start, init_splice_end;
+	u32 init_flags_splice_start, init_flags_splice_end;
+	Double init_start, init_stop;
+	Bool force_splice_resume;
 } GF_FileListCtx;
 
 static const GF_FilterCapability FileListCapsSrc[] =
@@ -114,31 +207,109 @@
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
 };
 
-static void filelist_start_ipid(GF_FileListCtx *ctx, FileListPid *iopid)
+static const GF_FilterCapability FileListCapsSrc_RAW_AV[] =
+{
+	//raw audio and video only
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	//no restriction for media other than audio and video - cf regular caps for comments
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+static const GF_FilterCapability FileListCapsSrc_RAW_A[] =
+{
+	//raw audio only
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	//no restriction for media other than audio - cf regular caps for comments
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+static const GF_FilterCapability FileListCapsSrc_RAW_V[] =
+{
+	//raw video only
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	//no restriction for media other than video - cf regular caps for comments
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+static void filelist_start_ipid(GF_FileListCtx *ctx, FileListPid *iopid, u32 prev_timescale, Bool is_reassign)
 {
 	iopid->is_eos = GF_FALSE;
 
-	if (!ctx->do_cat) {
+	if (is_reassign && !ctx->do_cat) {
 		GF_FilterEvent evt;
 		//if we reattached the input, we must send a play request
 		gf_filter_pid_init_play_event(iopid->ipid, &evt, ctx->start, 1.0, "FileList");
 		gf_filter_pid_send_event(iopid->ipid, &evt);
+ iopid->skip_dts_init = GF_FALSE;
+ if (iopid->play_state==FLIST_STATE_STOP) {
+ GF_FEVT_INIT(evt, GF_FEVT_STOP, iopid->ipid)
+ gf_filter_pid_send_event(iopid->ipid, &evt);
+ iopid->skip_dts_init = GF_TRUE;
+ }
 	}
 
-	//and convert back cts/dts offsets from 1Mhs to OLD timescale (since we dispatch in this timescale)
-	iopid->dts_o = ctx->dts_offset;
-	iopid->dts_o *= iopid->o_timescale;
-	iopid->dts_o /= 1000000;
+	//and convert back cts/dts offsets to output timescale
+	if (ctx->dts_offset.num && ctx->dts_offset.den) {
+		iopid->dts_o = gf_timestamp_rescale(ctx->dts_offset.num, ctx->dts_offset.den, iopid->o_timescale);
+	} else {
+		iopid->dts_o = 0;
+	}
+	if (ctx->cts_offset.num && ctx->cts_offset.den) {
+		iopid->cts_o = gf_timestamp_rescale(ctx->cts_offset.num, ctx->cts_offset.den, iopid->o_timescale);
+	} else {
+		iopid->cts_o = 0;
+	}
+	
+	if (is_reassign && prev_timescale) {
+		u64 dts, cts;
+
+		//in input timescale
+		dts = iopid->max_dts - iopid->dts_sub;
+		cts = iopid->max_cts - iopid->dts_sub;
+		//convert to output timescale
+		if (iopid->single_frame && (ctx->fsort==FL_SORT_DATEX)) {
+
+		} else if (prev_timescale != iopid->o_timescale) {
+			dts = gf_timestamp_rescale(dts, prev_timescale, iopid->o_timescale);
+			cts = gf_timestamp_rescale(cts, prev_timescale, iopid->o_timescale);
+		}
 
-	iopid->cts_o = ctx->cts_offset;
-	iopid->cts_o *= iopid->o_timescale;
-	iopid->cts_o /= 1000000;
+		if (
+			//skip sync mode, do not adjust timestamps
+			ctx->skip_sync
+			//in case of rounding
+			|| ((dts > iopid->dts_o) && (cts > iopid->cts_o))
+		) {
+			iopid->dts_o = dts;
+			iopid->cts_o = cts;
+		}
+	}
 	iopid->max_cts = iopid->max_dts = 0;
 
 	iopid->first_dts_plus_one = 0;
 }
 
-Bool filelist_merge_prop(void *cbk, u32 prop_4cc, const char *prop_name, const GF_PropertyValue *src_prop)
+static Bool filelist_merge_prop(void *cbk, u32 prop_4cc, const char *prop_name, const GF_PropertyValue *src_prop)
 {
 	const GF_PropertyValue *p;
 	GF_FilterPid *pid = (GF_FilterPid *) cbk;
@@ -149,12 +320,45 @@
 	return GF_TRUE;
 }
 
-GF_Err filelist_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+static void filelist_push_period_id(GF_FileListCtx *ctx, GF_FilterPid *opid)
+{
+	char szID[200];
+	char *dyn_period = NULL;
+
+	gf_dynstrcat(&dyn_period, ctx->dyn_period_id, NULL);
+	sprintf(szID, "_%d", ctx->cur_splice_index+1);
+	gf_dynstrcat(&dyn_period, szID, NULL);
+	gf_filter_pid_set_property(opid, GF_PROP_PID_PERIOD_ID, &PROP_STRING_NO_COPY(dyn_period));
+}
+
+static void filelist_override_caps(GF_Filter *filter, GF_FileListCtx *ctx)
+{
+	switch (ctx->raw) {
+	case FL_RAW_AV:
+		gf_filter_override_caps(filter, FileListCapsSrc_RAW_AV, GF_ARRAY_LENGTH(FileListCapsSrc_RAW_AV) );
+		break;
+	case FL_RAW_AUDIO:
+		gf_filter_override_caps(filter, FileListCapsSrc_RAW_A, GF_ARRAY_LENGTH(FileListCapsSrc_RAW_A) );
+		break;
+	case FL_RAW_VIDEO:
+		gf_filter_override_caps(filter, FileListCapsSrc_RAW_V, GF_ARRAY_LENGTH(FileListCapsSrc_RAW_V) );
+		break;
+	default:
+		gf_filter_override_caps(filter, FileListCapsSrc, 2);
+	}
+}
+
+static GF_Err filelist_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	FileListPid *iopid;
+	GF_FilterPid *opid = NULL;
 	const GF_PropertyValue *p;
 	u32 i, count;
 	Bool reassign = GF_FALSE;
+	Bool first_config = GF_FALSE;
+	u32 force_bitrate = 0;
+	u32 prev_timescale = 0;
+	char *src_url = NULL;
 	GF_FileListCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
@@ -162,7 +366,8 @@
 			ctx->file_pid = NULL;
 		else {
 			iopid = gf_filter_pid_get_udta(pid);
-			if (iopid) iopid->ipid = NULL;
+			if (iopid)
+				iopid->ipid = NULL;
 		}
 		return GF_OK;
 	}
@@ -171,14 +376,18 @@
 		if (! gf_filter_pid_check_caps(pid))
 			return GF_NOT_SUPPORTED;
 		ctx->file_pid = pid;
-		//we want the complete file
-		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+
+		//check multithreaded FileIO restrictions
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
+		if (p && p->value.string && gf_fileio_is_main_thread(p->value.string)) {
+			gf_filter_force_main_thread(filter, GF_TRUE);
+		}
 
 		//we will declare pids later
 
 		//from now on we only accept the above caps
-		gf_filter_override_caps(filter, FileListCapsSrc, 2);
-
+		filelist_override_caps(filter, ctx);
 	}
 	if (ctx->file_pid == pid) return GF_OK;
 
@@ -193,6 +402,7 @@
 			assert(p);
 			if (p->value.uint == iopid->stream_type) {
 				iopid->ipid = pid;
+				prev_timescale = iopid->timescale;
 				iopid->timescale = gf_filter_pid_get_timescale(pid);
 				reassign = GF_TRUE;
 				break;
@@ -205,12 +415,18 @@
 		GF_SAFEALLOC(iopid, FileListPid);
 		if (!iopid) return GF_OUT_OF_MEM;
 		iopid->ipid = pid;
-		if (ctx->timescale) iopid->o_timescale = ctx->timescale;
-		else {
+		if (ctx->timescale) {
+			iopid->o_timescale = ctx->timescale;
+		} else if (ctx->fsort == FL_SORT_DATEX) {
+			iopid->o_timescale = 1000000;
+		} else {
 			iopid->o_timescale = gf_filter_pid_get_timescale(pid);
 			if (!iopid->o_timescale) iopid->o_timescale = 1000;
 		}
 		gf_list_add(ctx->io_pids, iopid);
+		iopid->send_cue = ctx->sigcues;
+		iopid->play_state = FLIST_STATE_WAIT_PLAY;
+		first_config = GF_TRUE;
 	}
 	gf_filter_pid_set_udta(pid, iopid);
 
@@ -220,46 +436,160 @@
 		assert(p);
 		iopid->stream_type = p->value.uint;
 	}
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	if (ctx->sigcues) {
+		p = gf_filter_pid_get_property(iopid->opid, GF_PROP_PID_BITRATE);
+		if (!p) p = gf_filter_pid_get_property(iopid->ipid, GF_PROP_PID_BITRATE);
+		if (p) force_bitrate = p->value.uint;
+
+		p = gf_filter_pid_get_property(iopid->ipid, GF_PROP_PID_URL);
+		if (p && p->value.string) src_url = gf_strdup(p->value.string);
+
+	}
+	opid = iopid->opid;
+
+	if (ctx->keep_splice && (ctx->splice_state==FL_SPLICE_ACTIVE) && iopid->splice_ipid) {
+		assert(!iopid->opid_aux);
+		iopid->opid_aux = gf_filter_pid_new(filter);
+		opid = iopid->opid_aux;
+
+		gf_filter_pid_set_property_str(iopid->opid, "period_switch", &PROP_BOOL(GF_TRUE));
+		gf_filter_pid_set_property_str(iopid->opid, "period_resume", &PROP_STRING(ctx->dyn_period_id ? ctx->dyn_period_id : "") );
+
+		if (ctx->splice_props)
+			gf_filter_pid_push_properties(iopid->opid, ctx->splice_props, GF_TRUE, GF_TRUE);
+
+	} else {
+		gf_filter_pid_set_property_str(iopid->opid, "period_switch", NULL);
+	}
 
 	//copy properties at init or reconfig:
 	//reset (no more props)
-	gf_filter_pid_reset_properties(iopid->opid);
+	gf_filter_pid_reset_properties(opid);
 
-	gf_filter_pid_copy_properties(iopid->opid, iopid->ipid);
+	gf_filter_pid_copy_properties(opid, iopid->ipid);
 
 	//if file pid is defined, merge its properties. This will allow forwarding user-defined properties,
 	// eg -i list.txt:#MyProp=toto to all PIDs coming from the sources
 	if (ctx->file_pid) {
-		gf_filter_pid_merge_properties(iopid->opid, ctx->file_pid, filelist_merge_prop, iopid->ipid);
+		gf_filter_pid_merge_properties(opid, ctx->file_pid, filelist_merge_prop, iopid->ipid);
+
+		p = gf_filter_pid_get_property(opid, GF_PROP_PID_MIME);
+		if (p && p->value.string && !strcmp(p->value.string, "application/x-gpac-playlist"))
+			gf_filter_pid_set_property(opid, GF_PROP_PID_MIME, NULL);
 	}
-	
+
 	//we could further optimize by querying the duration of all sources in the list
-	gf_filter_pid_set_property(iopid->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_NONE) );
-	gf_filter_pid_set_property(iopid->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(iopid->o_timescale) );
-	gf_filter_pid_set_property(iopid->opid, GF_PROP_PID_NB_FRAMES, NULL );
+	gf_filter_pid_set_property(opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_NONE) );
+	gf_filter_pid_set_property(opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(iopid->o_timescale) );
+	gf_filter_pid_set_property(opid, GF_PROP_PID_NB_FRAMES, NULL );
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NB_FRAMES);
 	iopid->single_frame = (p && (p->value.uint==1)) ? GF_TRUE : GF_FALSE ;
 	iopid->timescale = gf_filter_pid_get_timescale(pid);
 	if (!iopid->timescale) iopid->timescale = 1000;
 
-#if 0
-	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
-	if (p) {
-		s64 delay = p->value.sint;
-		delay *= iopid->timescale;
-		delay /= iopid->o_timescale;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (p && (p->value.uint==GF_CODECID_RAW) && (iopid->stream_type==GF_STREAM_AUDIO)) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+		iopid->ra_info.nb_ch = p ? p->value.uint : 1;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+		iopid->ra_info.sample_rate = p ? p->value.uint : 0;
+		iopid->ra_info.abps = 0;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+		if (p) {
+			iopid->ra_info.abps = gf_audio_fmt_bit_depth(p->value.uint) / 8;
+			iopid->ra_info.planar = (p->value.uint > GF_AUDIO_FMT_LAST_PACKED) ? 1 : 0;
+		}
+		iopid->ra_info.abps *= iopid->ra_info.nb_ch;
+		iopid->ra_info.is_raw = GF_TRUE;
+	} else {
+		iopid->ra_info.abps = iopid->ra_info.nb_ch = iopid->ra_info.sample_rate = 0;
+		iopid->ra_info.is_raw = GF_FALSE;
 	}
-#endif
+
+	if (ctx->frag_url)
+		gf_filter_pid_set_property(opid, GF_PROP_PID_ORIG_FRAG_URL, &PROP_NAME(ctx->frag_url) );
+
+	if (ctx->sigcues) {
+		if (!src_url) {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_URL, &PROP_STRING("mysource") );
+			gf_filter_pid_set_property(opid, GF_PROP_PID_FILEPATH, &PROP_STRING("mysource") );
+		} else {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_URL, &PROP_STRING(src_url) );
+			gf_filter_pid_set_property(opid, GF_PROP_PID_FILEPATH, &PROP_STRING_NO_COPY(src_url));
+		}
+		if (force_bitrate)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_BITRATE, &PROP_UINT(force_bitrate) );
+		else
+			gf_filter_pid_set_property(opid, GF_PROP_PID_BITRATE, NULL );
+
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("inband") );
+	} else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+		if (p)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_URL, p);
+	}
+
+	if (ctx->pid_props) {
+		gf_filter_pid_push_properties(opid, ctx->pid_props, GF_TRUE, GF_TRUE);
+	}
+
+	if (iopid->single_frame && (ctx->fsort == FL_SORT_DATEX)) {
+		iopid->delay = 0;
+	} else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+		iopid->delay = p ? (s32) p->value.longsint : 0;
+	}
+
+	if (first_config) {
+		iopid->initial_delay = iopid->delay;
+	} else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+		if (p && (p->value.uint==GF_CODECID_RAW) && (iopid->delay<0)) {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DELAY, NULL);
+		} else {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DELAY, iopid->initial_delay ? &PROP_LONGSINT(iopid->initial_delay) : NULL);
+		}
+	}
+
+	if (ctx->splice_state==FL_SPLICE_BEFORE) {
+		if (!ctx->splice_ctrl) ctx->splice_ctrl = iopid;
+		else if (iopid->stream_type==GF_STREAM_VISUAL) ctx->splice_ctrl = iopid;
+		iopid->timescale_splice = iopid->timescale;
+		iopid->splice_delay = iopid->delay;
+
+		if (ctx->dyn_period_id) gf_free(ctx->dyn_period_id);
+		p = gf_filter_pid_get_property(opid, GF_PROP_PID_PERIOD_ID);
+		if (p && p->value.string) {
+			ctx->dyn_period_id = gf_strdup(p->value.string);
+		} else {
+			ctx->dyn_period_id = NULL;
+		}
+	}
+	if (ctx->dyn_period_id) {
+		if ((ctx->splice_state==FL_SPLICE_BEFORE) || (ctx->splice_state==FL_SPLICE_AFTER)) {
+			filelist_push_period_id(ctx, opid);
+		}
+		//reset period ID if we keep the splice, and copy it from spliced content if any
+		else if ((ctx->splice_state==FL_SPLICE_ACTIVE) && ctx->keep_splice) {
+			gf_filter_pid_set_property(iopid->opid, GF_PROP_PID_PERIOD_ID, NULL);
+			p = gf_filter_pid_get_property(opid, GF_PROP_PID_PERIOD_ID);
+			if (p && p->value.string)
+				gf_filter_pid_set_property(iopid->opid, GF_PROP_PID_PERIOD_ID, p);
+		}
+	}
+	gf_filter_pid_set_property_str(opid, "period_resume", NULL);
 
 	//if we reattached the input, we must send a play request
 	if (reassign) {
-		filelist_start_ipid(ctx, iopid);
+		filelist_start_ipid(ctx, iopid, prev_timescale, GF_TRUE);
+	}
+	//new pid and no a splicing operation, we must adjust dts and cts offset
+	else if (ctx->splice_state == FL_SPLICE_NONE) {
+		filelist_start_ipid(ctx, iopid, prev_timescale, GF_FALSE);
 	}
-	p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
-	if (p)
-	 	gf_filter_pid_set_property(iopid->opid, GF_PROP_PID_URL, p);
-
 	return GF_OK;
 }
 
@@ -277,13 +607,17 @@
 		iopid = gf_list_get(ctx->io_pids, i);
 		if (!iopid->ipid) continue;
 
+ //only send on non connected inputs or on the one matching the pid event
+ if (iopid->opid && (iopid->opid != evt->base.on_pid))
+ continue;
+
 		fevt.base.on_pid = iopid->ipid;
 		if (evt->base.type==GF_FEVT_PLAY) {
 			gf_filter_pid_init_play_event(iopid->ipid, &fevt, ctx->start, 1.0, "FileList");
-			iopid->is_playing = GF_TRUE;
+			iopid->play_state = FLIST_STATE_PLAY;
 			iopid->is_eos = GF_FALSE;
 		} else if (evt->base.type==GF_FEVT_STOP) {
-			iopid->is_playing = GF_FALSE;
+			iopid->play_state = FLIST_STATE_STOP;
 			iopid->is_eos = GF_TRUE;
 		}
 		gf_filter_pid_send_event(iopid->ipid, &fevt);
@@ -292,40 +626,18 @@
 	return GF_TRUE;
 }
 
-void filelist_parse_arg(char *com, char *name, u32 type, u32 *int_val, Double *float_val, u64 *luint_val)
-{
-	char *val = strstr(com, name);
-	if (val) {
-		char c= 0;
-		char *sep = strchr(val, ' ');
-		if (!sep) sep = strchr(val, ',');
-		if (!sep) sep = strchr(val, '\n');
-		if (!sep) sep = strchr(val, '\r');
-		if (sep) {
-			c = sep[0];
-			sep[0] = 0;
-		}
-		val += strlen(name);
-		if (type==1) {
-			(*int_val) = atoi(val);
-		} else if (type==2) {
-			(*int_val) = atoi(val);
-		} else if (type==3) {
-			sscanf(val, LLU, luint_val);
-		} else if (type==0) {
-			(*int_val) = 1;
-		}
-		if (sep) sep[0] = c;
-	}
-}
 
-void filelist_check_implicit_cat(GF_FileListCtx *ctx, char *szURL)
+static void filelist_check_implicit_cat(GF_FileListCtx *ctx, char *szURL)
 {
 	char *res_url = NULL;
+	char *sep;
 	if (ctx->file_path) {
 		res_url = gf_url_concatenate(ctx->file_path, szURL);
 		szURL = res_url;
 	}
+	//we use default session separator set in filelist
+	sep = gf_url_colon_suffix(szURL, '=');
+	if (sep) sep[0] = 0;
 
 	switch (gf_isom_probe_file(szURL)) {
 	//this is a fragment
@@ -344,20 +656,62 @@
 		ctx->do_cat = GF_FALSE;
 		ctx->last_is_isom = GF_FALSE;
 	}
+	if (sep) sep[0] = ':';
 	if (res_url)
 		gf_free(res_url);
 }
 
-Bool filelist_next_url(GF_FileListCtx *ctx, char szURL[GF_MAX_PATH])
+static void filelist_parse_splice_time(char *aval, GF_Fraction64 *frac, u32 *flags)
+{
+	*flags = 0;
+	if (!aval || !strlen(aval)) {
+		frac->num = -1;
+		frac->den = 1;
+		return;
+	}
+	frac->num = 0;
+	frac->den = 0;
+
+	if (!stricmp(aval, "now")) {
+		frac->num = -2;
+		frac->den = 1;
+		return;
+	}
+	if (strchr(aval, ':')) {
+		frac->den = gf_net_parse_date(aval);
+		frac->num = -3;
+	}
+
+	if (aval[0]=='+') {
+		aval ++;
+		*flags |= FL_SPLICE_DELTA;
+	}
+	if (aval[0]=='F') {
+		aval ++;
+		*flags |= FL_SPLICE_FRAME;
+	}
+
+	gf_parse_lfrac(aval, frac);
+}
+
+static Bool filelist_next_url(GF_Filter *filter, GF_FileListCtx *ctx, char szURL[GF_MAX_PATH], Bool is_splice_update)
 {
 	u32 len;
+	u32 url_crc = 0;
 	Bool last_found = GF_FALSE;
 	FILE *f;
 	u32 nb_repeat=0, lineno=0;
-	u64 start_range, end_range;
+	u64 start_range=0, end_range=0;
 	Double start=0, stop=0;
+	GF_Fraction64 splice_start, splice_end;
 	Bool do_cat=0;
+	Bool do_del=0;
 	Bool is_end=0;
+	Bool keep_splice=0;
+	Bool mark_only=0;
+	Bool no_sync=0;
+	u32 start_flags=0;
+	u32 end_flags=0;
 
 	if (ctx->file_list) {
 		FileListEntry *fentry, *next;
@@ -383,23 +737,34 @@
 		filelist_check_implicit_cat(ctx, szURL);
 		next = gf_list_get(ctx->file_list, ctx->file_list_idx + 1);
 		if (next)
-			ctx->current_file_dur = next->last_mod_time - fentry->last_mod_time;
+			ctx->current_file_dur_us = next->last_mod_time - fentry->last_mod_time;
 		return GF_TRUE;
 	}
 
-	if (ctx->wait_update) {
+	if (ctx->wait_update_start || is_splice_update) {
 		u64 last_modif_time = gf_file_modification_time(ctx->file_path);
-		if (ctx->last_file_modif_time >= last_modif_time)
+		if (ctx->last_file_modif_time >= last_modif_time) {
+			if (!is_splice_update) {
+				u64 diff = gf_sys_clock() - ctx->wait_update_start;
+				if (diff > ctx->timeout) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FileList] Timeout refreshing playlist after %d ms, triggering eos\n", diff));
+					ctx->ka = 0;
+				}
+			}
 			return GF_FALSE;
-		ctx->wait_update = GF_FALSE;
+		}
+		ctx->wait_update_start = 0;
 		ctx->last_file_modif_time = last_modif_time;
 	}
 
+	splice_start.num = splice_end.num = 0;
+	splice_start.den = splice_end.den = 0;
+
 	f = gf_fopen(ctx->file_path, "rt");
 	while (f) {
-		u32 crc;
 		char *l = gf_fgets(szURL, GF_MAX_PATH, f);
-		if (!l || gf_feof(f)) {
+		url_crc = 0;
+		if (!l || (gf_feof(f) && !szURL[0]) ) {
 			if (ctx->floop != 0) {
 				gf_fseek(f, 0, SEEK_SET);
 				//load first line
@@ -410,14 +775,21 @@
 			if (is_end) {
 				ctx->ka = 0;
 			} else if (ctx->ka) {
-				ctx->wait_update = GF_TRUE;
+				ctx->wait_update_start = gf_sys_clock();
 				ctx->last_file_modif_time = gf_file_modification_time(ctx->file_path);
 			}
 			return GF_FALSE;
 		}
-		lineno++;
 
 		len = (u32) strlen(szURL);
+		//in keep-alive mode, each line shall end with \n, of not consider the file is not yet ready
+		if (ctx->ka && !is_end && len && (szURL[len-1]!='\n')) {
+			gf_fclose(f);
+			ctx->wait_update_start = gf_sys_clock();
+			ctx->last_file_modif_time = gf_file_modification_time(ctx->file_path);
+			return GF_FALSE;
+		}
+		//strip all \r, \n, \t at the end
 		while (len && strchr("\n\r\t ", szURL[len-1])) {
 			szURL[len-1] = 0;
 			len--;
@@ -426,53 +798,216 @@
 
 		//comment
 		if (szURL[0] == '#') {
+			//ignored line
+			if (szURL[1] == '#')
+				continue;
+
+			char *args = szURL+1;
 			nb_repeat=0;
 			start=stop=0;
 			do_cat = 0;
 			start_range=end_range=0;
-
-			filelist_parse_arg(szURL, "repeat=", 1, &nb_repeat, NULL, NULL);
-			filelist_parse_arg(szURL, "start=", 2, NULL, &start, NULL);
-			filelist_parse_arg(szURL, "stop=", 2, NULL, &stop, NULL);
-			filelist_parse_arg(szURL, "cat", 0, (u32 *)&do_cat, NULL, NULL);
-			if (do_cat) {
-				filelist_parse_arg(szURL, "srange=", 3, NULL, NULL, &start_range);
-				filelist_parse_arg(szURL, "send=", 3, NULL, NULL, &end_range);
+			if (ctx->pid_props) {
+				gf_free(ctx->pid_props);
+				ctx->pid_props = NULL;
 			}
-			if (ctx->ka) {
-				filelist_parse_arg(szURL, "end", 0, (u32 *)&is_end, NULL, NULL);
+
+			while (args) {
+				char c;
+				char *sep, *aval = NULL;
+				while (args[0]==' ') args++;
+
+				sep = strchr(args, ' ');
+				if (strncmp(args, "props", 5))
+					aval = strchr(args, ',');
+
+				if (sep && aval && (aval < sep))
+					sep = aval;
+				else if (aval)
+					sep = aval;
+
+				if (sep) {
+					c = sep[0];
+					sep[0] = 0;
+				}
+				aval = strchr(args, '=');
+				if (aval) {
+					aval[0] = 0;
+					aval++;
+				}
+
+				if (!strcmp(args, "repeat")) {
+					if (aval)
+						nb_repeat = atoi(aval);
+				} else if (!strcmp(args, "start")) {
+					if (aval)
+						start = atof(aval);
+				} else if (!strcmp(args, "stop")) {
+					if (aval)
+						stop = atof(aval);
+				} else if (!strcmp(args, "cat")) {
+					do_cat = GF_TRUE;
+				} else if (!strcmp(args, "del")) {
+					do_del = GF_TRUE;
+				} else if (do_cat && !strcmp(args, "srange")) {
+					if (aval)
+						sscanf(aval, LLU, &start_range);
+				} else if (do_cat && !strcmp(args, "send")) {
+					if (aval)
+						sscanf(aval, LLU, &end_range);
+				} else if (!strcmp(args, "end")) {
+					if (ctx->ka)
+						is_end = GF_TRUE;
+				} else if (!strcmp(args, "ka")) {
+					sscanf(aval, "%u", &ctx->ka);
+				} else if (!strcmp(args, "raw")) {
+					u32 raw_type = 0;
+					if (aval) {
+						if (!stricmp(aval, "av")) raw_type = FL_RAW_AV;
+						else if (!stricmp(aval, "a")) raw_type = FL_RAW_AUDIO;
+						else if (!stricmp(aval, "v")) raw_type = FL_RAW_VIDEO;
+					}
+					if (filter && (ctx->raw != raw_type) ) {
+						ctx->raw = raw_type;
+						filelist_override_caps(filter, ctx);
+					}
+				} else if (!strcmp(args, "floop")) {
+					ctx->floop = aval ? atoi(aval) : 0;
+				} else if (!strcmp(args, "props")) {
+					if (ctx->pid_props) gf_free(ctx->pid_props);
+					ctx->pid_props = aval ? gf_strdup(aval) : NULL;
+				} else if (!strcmp(args, "out")) {
+					filelist_parse_splice_time(aval, &splice_start, &start_flags);
+				} else if (!strcmp(args, "in")) {
+					filelist_parse_splice_time(aval, &splice_end, &end_flags);
+				} else if (!strcmp(args, "keep")) {
+					keep_splice = GF_TRUE;
+				} else if (!strcmp(args, "mark")) {
+					mark_only = GF_TRUE;
+				} else if (!strcmp(args, "nosync")) {
+					no_sync = GF_TRUE;
+				} else if (!strcmp(args, "sprops")) {
+					if (ctx->splice_props) gf_free(ctx->splice_props);
+					ctx->splice_props = aval ? gf_strdup(aval) : NULL;
+				} else {
+					if (!ctx->unknown_params || !strstr(ctx->unknown_params, args)) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FileList] Unrecognized directive %s, ignoring\n", args));
+						gf_dynstrcat(&ctx->unknown_params, args, ",");
+					}
+				}
+
+				if (aval) aval[0] = '=';
+
+				if (!sep) break;
+				sep[0] = c;
+				args = sep+1;
 			}
-			strcpy(ctx->szCom, szURL);
 			continue;
 		}
-		crc = gf_crc_32(szURL, (u32) strlen(szURL) );
+		//increase line num only for non-comment lines
+		lineno++;
+
+		url_crc = gf_crc_32(szURL, (u32) strlen(szURL) );
 		if (!ctx->last_url_crc) {
-			ctx->last_url_crc = crc;
+			ctx->last_url_crc = url_crc;
 			ctx->last_url_lineno = lineno;
 			break;
 		}
-		if ((ctx->last_url_crc == crc) && (ctx->last_url_lineno == lineno)) {
+		if ( ((ctx->last_url_crc == url_crc) && (ctx->last_url_lineno == lineno))
+			|| (is_splice_update && (ctx->last_splice_crc==url_crc))
+		) {
 			last_found = GF_TRUE;
 			nb_repeat=0;
 			start=stop=0;
 			do_cat=0;
 			start_range=end_range=0;
-			ctx->szCom[0] = 0;
+			if (is_splice_update)
+				break;
+			splice_start.den = splice_end.den = 0;
+			keep_splice = 0;
+			mark_only = 0;
+			start_flags=0;
+			end_flags=0;
+			no_sync=0;
 			continue;
 		}
 		if (last_found) {
-			ctx->last_url_crc = crc;
+			ctx->last_url_crc = url_crc;
 			ctx->last_url_lineno = lineno;
 			break;
 		}
 		nb_repeat=0;
 		start=stop=0;
 		do_cat=0;
+		do_del=0;
 		start_range=end_range=0;
-		ctx->szCom[0] = 0;
+		splice_start.den = splice_end.den = 0;
+		keep_splice = 0;
+		mark_only = 0;
+		start_flags=0;
+		end_flags=0;
+		no_sync=0;
 	}
 	gf_fclose(f);
 
+	if (is_splice_update && !last_found)
+		return GF_FALSE;
+
+	//not in active splicing and we had a splice start set, trigger a new splice
+	if ((ctx->splice_state != FL_SPLICE_ACTIVE) && splice_start.den) {
+		//activate if:
+		if (
+			//new new splice start is undefined (prepare for new splice)
+			(splice_start.num<0)
+			// or new splice start is defined and prev splice start was undefined
+			|| ((splice_start.num>=0) && ((ctx->splice_start.num < 0) || !ctx->splice_start.den) )
+			// or new splice time is greater than previous one
+			|| (ctx->splice_start.num * splice_start.den < splice_start.num * ctx->splice_start.den)
+		) {
+
+			ctx->init_splice_start = ctx->splice_start = splice_start;
+			if (!splice_end.den) {
+				ctx->splice_end.num = -1;
+				ctx->splice_end.den = 1;
+			} else {
+				ctx->splice_end = splice_end;
+			}
+			ctx->init_splice_end = ctx->splice_end;
+
+			ctx->splice_state = FL_SPLICE_BEFORE;
+			//items to be spliced are the ones after the spliced content
+			ctx->last_splice_crc = ctx->last_url_crc = url_crc;
+			ctx->last_url_lineno = lineno;
+			ctx->last_splice_lineno = lineno;
+			ctx->last_file_modif_time = gf_file_modification_time(ctx->file_path);
+			ctx->keep_splice = keep_splice;
+			ctx->mark_only = mark_only;
+			ctx->init_flags_splice_start = ctx->flags_splice_start = start_flags;
+			ctx->init_flags_splice_end = ctx->flags_splice_end = end_flags;
+
+			if (!ctx->first_loaded) {
+				if (ctx->splice_start.num == -2)
+					ctx->splice_start.num = -1;
+				if (ctx->splice_end.num == -2)
+					ctx->splice_end.num = -1;
+			}
+		}
+	}
+	//in active splicing and we hava a splice end set, update splice value if previous one was undefined or not set
+	else if ((ctx->splice_state == FL_SPLICE_ACTIVE) && splice_end.den && (!ctx->splice_end.den || (ctx->splice_end.num<0))) {
+		ctx->init_splice_end = ctx->splice_end = splice_end;
+		ctx->init_flags_splice_end = ctx->flags_splice_end = end_flags;
+	}
+
+	if (is_splice_update)
+		return GF_FALSE;
+
+	if ((ctx->splice_state == FL_SPLICE_ACTIVE) && (splice_start.den || splice_end.den)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] URL %s is a main splice content but expecting a regular content in active splice\n", szURL));
+		return GF_FALSE;
+	}
+
+
 	len = (u32) strlen(szURL);
 	while (len && strchr("\r\n", szURL[len-1])) {
 		szURL[len-1] = 0;
@@ -482,165 +1017,910 @@
 	ctx->start = start;
 	ctx->stop = stop;
 	ctx->do_cat = do_cat;
+	ctx->skip_sync = no_sync;
+
+	if (!ctx->floop)
+		ctx->do_del = (do_del || ctx->fdel) ? GF_TRUE : GF_FALSE;
 	ctx->start_range = start_range;
 	ctx->end_range = end_range;
 	filelist_check_implicit_cat(ctx, szURL);
 	return GF_TRUE;
 }
 
-GF_Err filelist_process(GF_Filter *filter)
+static Bool filelist_on_filter_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
 {
-	Bool start, end;
-	GF_Err e;
-	u32 i, count, nb_done, nb_inactive;
-	FileListPid *iopid;
+	u32 i, count;
+	GF_Filter *filter = (GF_Filter *)udta;
 	GF_FileListCtx *ctx = gf_filter_get_udta(filter);
 
-	if (ctx->is_eos)
-		return GF_EOS;
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] Failed to load URL %s: %s\n", gf_filter_get_src_args(failed_filter), gf_error_to_string(err) ));
 
-	if (!ctx->file_list) {
-		GF_FilterPacket *pck;
-		if (!ctx->file_pid) {
-			return GF_EOS;
-		}
-		pck = gf_filter_pid_get_packet(ctx->file_pid);
-		if (pck) {
-			gf_filter_pck_get_framing(pck, &start, &end);
-			gf_filter_pid_drop_packet(ctx->file_pid);
+	count = gf_list_count(ctx->io_pids);
+	for (i=0; i<count; i++) {
+		FileListPid *iopid = gf_list_get(ctx->io_pids, i);
+		if (!iopid->ipid) continue;
 
-			if (end) {
-				const GF_PropertyValue *p;
-				Bool is_first = GF_TRUE;
-				FILE *f=NULL;
-				p = gf_filter_pid_get_property(ctx->file_pid, GF_PROP_PID_FILEPATH);
-				if (p) {
-					if (ctx->file_path) {
-						gf_free(ctx->file_path);
-						is_first = GF_FALSE;
-					}
-					ctx->file_path = gf_strdup(p->value.string);
-					f = gf_fopen(p->value.string, "rt");
-				}
-				if (!f) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[FileList] Unable to open file %s\n", ctx->file_path ? ctx->file_path : "no source path"));
-					return GF_SERVICE_ERROR;
-				} else {
-					gf_fclose(f);
-					ctx->load_next = is_first;
-				}
-			}
-		}
+		if (gf_filter_pid_is_filter_in_parents(iopid->ipid, failed_filter))
+			iopid->ipid = NULL;
 	}
+	ctx->src_error = GF_TRUE;
+	gf_list_del_item(ctx->filter_srcs, failed_filter);
+	gf_filter_post_process_task(filter);
+	return GF_FALSE;
+}
 
-	count = gf_list_count(ctx->io_pids);
 
-	if (ctx->load_next) {
-		GF_Filter *fsrc;
-		u32 s_idx;
-		char *url;
-		char szURL[GF_MAX_PATH];
-		Bool next_url_ok;
+static GF_Err filelist_load_next(GF_Filter *filter, GF_FileListCtx *ctx)
+{
+	GF_Filter *fsrc;
+	FileListPid *iopid;
+	u32 i, count;
+	GF_Filter *prev_filter;
+	GF_List *filters = NULL;
+	char *link_args = NULL;
+	s32 link_idx = -1;
+	Bool is_filter_chain = GF_FALSE;
+	Bool do_del = ctx->do_del;
+	GF_Err e;
+	u32 s_idx;
+	char *url;
+	char szURL[GF_MAX_PATH];
+	Bool next_url_ok;
 
-		next_url_ok = filelist_next_url(ctx, szURL);
+	next_url_ok = filelist_next_url(filter, ctx, szURL, GF_FALSE);
+
+	if (!next_url_ok && ctx->ka) {
+		gf_filter_ask_rt_reschedule(filter, ctx->ka*1000);
+		return GF_OK;
+	}
+	count = gf_list_count(ctx->io_pids);
 
-		if (!next_url_ok && ctx->ka) {
-			gf_filter_ask_rt_reschedule(filter, ctx->ka*1000);
+	if (ctx->wait_splice_start) {
+		if (!next_url_ok) {
+			ctx->wait_splice_start = GF_FALSE;
+			ctx->wait_source = GF_FALSE;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] No URL for splice, ignoring splice\n"));
+			ctx->splice_state = FL_SPLICE_AFTER;
+			ctx->splice_end_cts = ctx->splice_start_cts;
+			ctx->cts_offset = ctx->cts_offset_at_splice;
+			ctx->dts_offset = ctx->dts_offset_at_splice;
+			ctx->dts_sub_plus_one = ctx->dts_sub_plus_one_at_splice;
 			return GF_OK;
 		}
-		if (!next_url_ok || !ctx->do_cat) {
-			while (gf_list_count(ctx->filter_srcs)) {
-				fsrc = gf_list_pop_back(ctx->filter_srcs);
-				gf_filter_remove_src(filter, fsrc);
-			}
+		do_del = GF_FALSE;
+		assert (!ctx->splice_srcs);
+		ctx->splice_srcs = ctx->filter_srcs;
+		ctx->filter_srcs = gf_list_new();
+	}
+
+	if (do_del) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_FILE_DELETE, NULL);
+		evt.file_del.url = "__gpac_self__";
+		for (i=0; i<gf_list_count(ctx->filter_srcs); i++) {
+			fsrc = gf_list_get(ctx->filter_srcs, i);
+			gf_filter_send_event(fsrc, &evt, GF_FALSE);
 		}
+	}
+	if (!ctx->do_cat
+		//only reset if not last entry, so that we keep the last graph setup at the end
+		&& next_url_ok
+	) {
+		while (gf_list_count(ctx->filter_srcs)) {
+			fsrc = gf_list_pop_back(ctx->filter_srcs);
+			gf_filter_remove_src(filter, fsrc);
+		}
+	}
+
 
-		ctx->load_next = GF_FALSE;
+	ctx->load_next = GF_FALSE;
 
-		if (! next_url_ok) {
+	if (! next_url_ok) {
+		if (ctx->splice_state==FL_SPLICE_ACTIVE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] No next URL for splice but splice period still active, resuming splice with possible broken coding dependencies!\n"));
+			ctx->wait_splice_end = GF_TRUE;
+			ctx->splice_state = FL_SPLICE_AFTER;
+			ctx->dts_sub_plus_one.num = 1;
+			ctx->dts_sub_plus_one.den = 1;
 			for (i=0; i<count; i++) {
 				iopid = gf_list_get(ctx->io_pids, i);
-				gf_filter_pid_set_eos(iopid->opid);
-				iopid->ipid = NULL;
+				iopid->splice_ready = GF_TRUE;
 			}
-			ctx->is_eos = GF_TRUE;
-			return GF_EOS;
+			return GF_OK;
 		}
-		for (i=0; i<gf_list_count(ctx->io_pids); i++) {
-			FileListPid *an_iopid = gf_list_get(ctx->io_pids, i);
-			if (ctx->do_cat) {
-				gf_filter_pid_clear_eos(an_iopid->ipid, GF_TRUE);
-				filelist_start_ipid(ctx, an_iopid);
-			} else {
-				an_iopid->ipid = NULL;
+
+		for (i=0; i<count; i++) {
+			iopid = gf_list_get(ctx->io_pids, i);
+			gf_filter_pid_set_eos(iopid->opid);
+			if (iopid->opid_aux)
+				gf_filter_pid_set_eos(iopid->opid_aux);
+			iopid->ipid = NULL;
+		}
+		ctx->is_eos = GF_TRUE;
+		return GF_EOS;
+	}
+	for (i=0; i<gf_list_count(ctx->io_pids); i++) {
+		FileListPid *an_iopid = gf_list_get(ctx->io_pids, i);
+		if (ctx->do_cat) {
+			gf_filter_pid_clear_eos(an_iopid->ipid, GF_TRUE);
+			filelist_start_ipid(ctx, an_iopid, an_iopid->timescale, GF_TRUE);
+		} else {
+			if (ctx->wait_splice_start && !an_iopid->splice_ipid) {
+				an_iopid->splice_ipid = an_iopid->ipid;
+				an_iopid->dts_o_splice = an_iopid->dts_o;
+				an_iopid->cts_o_splice = an_iopid->cts_o;
+				an_iopid->dts_sub_splice = an_iopid->dts_sub;
+				an_iopid->splice_ra_info = an_iopid->ra_info;
 			}
+			an_iopid->ipid = NULL;
+			an_iopid->ra_info.is_raw = GF_FALSE;
 		}
-		s_idx = 0;
-		url = szURL;
-		while (url) {
-			char *sep = strstr(url, " && ");
-			if (sep) sep[0] = 0;
+	}
 
-			if (ctx->do_cat) {
-				char *f_url;
-				GF_FilterEvent evt;
-				fsrc = gf_list_get(ctx->filter_srcs, s_idx);
-				if (!fsrc) {
-					if (sep) sep[0] = ' ';
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[FileList] More URL to cat than opened service!\n"));
-					return GF_BAD_PARAM;
-				}
-				f_url = gf_url_concatenate(ctx->file_path, url);
-				memset(&evt, 0, sizeof(GF_FilterEvent));
-				evt.base.type = GF_FEVT_SOURCE_SWITCH;
-				evt.seek.source_switch = f_url ? f_url : url;
-				evt.seek.start_offset = ctx->start_range;
-				evt.seek.end_offset = ctx->end_range;
-				gf_filter_send_event(fsrc, &evt, GF_FALSE);
-				if (f_url)
-					gf_free(f_url);
-			} else {
-				fsrc = gf_filter_connect_source(filter, url, ctx->file_path, GF_TRUE, &e);
-				if (e) {
-					if (sep) sep[0] = ' ';
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[FileList] Failed to open file %s: %s\n", szURL, gf_error_to_string(e) ));
-					return GF_SERVICE_ERROR;
-				}
-				gf_list_add(ctx->filter_srcs, fsrc);
-			}
-			if (!sep) break;
-			sep[0] = ' ';
-			url = sep+4;
+	//lock all filters while loading up chain, to avoid PID init from other threads to resolve again this filter
+	//while we setup sourceID
+	gf_filter_lock_all(filter, GF_TRUE);
+	//reset all our source_ids
+	gf_filter_reset_source(filter);
+
+	fsrc = NULL;
+	prev_filter = NULL;
+	s_idx = 0;
+	url = szURL;
+	while (url) {
+		char c = 0;
+		char *sep, *lsep;
+		char *sep_f = strstr(url, " @");
+
+		sep = strstr(url, " && ");
+		if (!sep && ctx->srcs.nb_items)
+			sep = strstr(url, "&&");
+
+		if (sep_f && ctx->do_cat) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] Cannot use filter directives in cat mode\n"));
+			gf_filter_lock_all(filter, GF_FALSE);
+			return GF_BAD_PARAM;
 		}
-		//wait for PIDs to connect
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[FileList] Switching to file %s\n", szURL));
 
-	}
+		if (sep && sep_f) {
+			if (sep_f < sep)
+				sep = NULL;
+			else
+				sep_f = NULL;
+		}
 
-	//init first timestamp
-	if (!ctx->dts_sub_plus_one) {
-		u32 nb_eos = 0;
-		for (i=0; i<count; i++) {
+		if (sep) {
+			c = sep[0];
+			sep[0] = 0;
+		}
+		else if (sep_f) {
+			sep_f[0] = 0;
+		}
+		//skip empty
+		while (url[0] == ' ')
+			url++;
+
+
+#define SET_SOURCE(_filter, _from) \
+			if (link_idx>0) { \
+				prev_filter = gf_list_get(filters, (u32) link_idx); \
+				if (!prev_filter) { \
+					if (filters) gf_list_del(filters); \
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] Invalid link directive, filter index %d does not point to a valid filter\n")); \
+					gf_filter_lock_all(filter, GF_FALSE);\
+					return GF_SERVICE_ERROR; \
+				} \
+			}\
+			lsep = link_args ? strchr(link_args, ' ') : NULL; \
+			if (lsep) lsep[0] = 0; \
+			gf_filter_set_source(_filter, _from, link_args); \
+			if (lsep) lsep[0] = ' '; \
+			link_args = NULL;\
+			link_idx=-1;
+
+
+		if (!url[0]) {
+			//last link directive before new source specifier
+			if (is_filter_chain && prev_filter && (link_idx>=0)) {
+				SET_SOURCE(filter, prev_filter);
+				prev_filter = NULL;
+				gf_list_reset(filters);
+			}
+		} else if (ctx->do_cat) {
+			char *f_url;
+			GF_FilterEvent evt;
+			fsrc = gf_list_get(ctx->filter_srcs, s_idx);
+			if (!fsrc) {
+				if (sep) sep[0] = c;
+				else if (sep_f) sep_f[0] = ' ';
+
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] More URL to cat than opened service!\n"));
+				gf_filter_lock_all(filter, GF_FALSE);
+				return GF_BAD_PARAM;
+			}
+			f_url = gf_url_concatenate(ctx->file_path, url);
+			memset(&evt, 0, sizeof(GF_FilterEvent));
+			evt.base.type = GF_FEVT_SOURCE_SWITCH;
+			evt.seek.source_switch = f_url ? f_url : url;
+			evt.seek.start_offset = ctx->start_range;
+			evt.seek.end_offset = ctx->end_range;
+			gf_filter_send_event(fsrc, &evt, GF_FALSE);
+			if (f_url)
+				gf_free(f_url);
+		} else {
+			GF_Filter *f = NULL;
+			if (is_filter_chain) {
+				f = gf_filter_load_filter(filter, url, &e);
+				if (f) gf_filter_require_source_id(f);
+			} else {
+				fsrc = gf_filter_connect_source(filter, url, ctx->file_path, GF_FALSE, &e);
+
+				if (fsrc) {
+					gf_filter_set_setup_failure_callback(filter, fsrc, filelist_on_filter_setup_error, filter);
+					gf_filter_require_source_id(fsrc);
+				}
+			}
+
+			if (e) {
+				if (filters) gf_list_del(filters);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] Failed to open file %s: %s\n", szURL, gf_error_to_string(e) ));
+
+				if (sep) sep[0] = c;
+				else if (sep_f) sep_f[0] = ' ';
+				if (!ctx->splice_srcs)
+					ctx->splice_state = FL_SPLICE_NONE;
+				gf_filter_lock_all(filter, GF_FALSE);
+				return GF_SERVICE_ERROR;
+			}
+			if (is_filter_chain) {
+
+				if (!filters) filters = gf_list_new();
+				if (!gf_list_count(filters)) gf_list_add(filters, fsrc);
+
+				SET_SOURCE(f, prev_filter);
+
+				//insert at beginning, so that link_idx=0 <=> last declared filter
+				gf_list_insert(filters, f, 0);
+				prev_filter = f;
+			} else {
+				gf_list_add(ctx->filter_srcs, fsrc);
+			}
+		}
+		if (!sep && !sep_f) {
+			//if prev filter was not set (simple entry), use fsrc
+			if (!prev_filter) prev_filter = fsrc;
+			break;
+		}
+
+		if (sep) {
+			sep[0] = c;
+			url = (sep[0]==' ') ? sep+4 : sep+2;
+			is_filter_chain = GF_FALSE;
+			if (prev_filter) {
+				gf_filter_set_source(filter, prev_filter, NULL);
+				prev_filter = NULL;
+			}
+			if (filters) gf_list_reset(filters);
+			link_idx = -1;
+		} else {
+			sep_f[0] = ' ';
+
+			if (sep_f[2] != ' ') link_args = sep_f+2;
+			else link_args = NULL;
+
+			link_idx = 0;
+			if (link_args) {
+				if (link_args[0] != '#') {
+					sep = strchr(link_args, '#');
+					if (sep) {
+						sep[0] = 0;
+						link_idx = atoi(link_args);
+						sep[0] = '#';
+						link_args = sep+1;
+					} else {
+						link_idx = atoi(link_args);
+						link_args = NULL;
+					}
+					// " @-1" directive restart chain from source
+					if (link_idx<0) {
+						if (prev_filter) {
+							gf_filter_set_source(filter, prev_filter, NULL);
+							prev_filter = NULL;
+						}
+						if (filters) gf_list_reset(filters);
+					}
+
+				} else {
+					link_args++;
+				}
+			}
+
+			url = strchr(sep_f+2, ' ');
+			if (url && (url[1]!='&'))
+				url += 1;
+
+			is_filter_chain = GF_TRUE;
+			if (!prev_filter) {
+				if (!fsrc) {
+					if (filters) gf_list_del(filters);
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] Missing source declaration before filter directive\n"));
+					gf_filter_lock_all(filter, GF_FALSE);
+					return GF_BAD_PARAM;
+				}
+				prev_filter = fsrc;
+			}
+
+			//last empty link
+			if (!url && prev_filter) {
+				SET_SOURCE(filter, prev_filter);
+				prev_filter = NULL;
+			}
+		}
+	}
+	//assign last defined filter as source for ourselves
+	if (prev_filter) {
+		gf_filter_set_source(filter, prev_filter, NULL);
+		prev_filter = NULL;
+	}
+
+	gf_filter_lock_all(filter, GF_FALSE);
+
+	if (filters) gf_list_del(filters);
+
+	//wait for PIDs to connect
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[FileList] Switching to file %s\n", szURL));
+
+	ctx->wait_splice_start = GF_FALSE;
+	return GF_OK;
+}
+
+static s64 filelist_translate_splice_cts(FileListPid *iopid, u64 cts)
+{
+	if (iopid->timescale_splice != iopid->o_timescale) {
+		cts = gf_timestamp_rescale(cts, iopid->timescale_splice, iopid->o_timescale);
+	}
+	return iopid->cts_o_splice + cts - iopid->dts_sub_splice;
+}
+
+static Bool filelist_check_splice(GF_FileListCtx *ctx)
+{
+	u64 cts;
+	u32 i, count;
+	GF_FilterPacket *pck;
+	GF_FilterSAPType sap;
+	GF_FilterPid *ipid;
+	Bool is_raw_audio;
+	assert(ctx->splice_ctrl);
+	assert(ctx->splice_state);
+
+	ipid = ctx->splice_ctrl->splice_ipid ? ctx->splice_ctrl->splice_ipid : ctx->splice_ctrl->ipid;
+	is_raw_audio = ctx->splice_ctrl->splice_ipid ? ctx->splice_ctrl->splice_ra_info.is_raw : ctx->splice_ctrl->ra_info.is_raw;
+
+	pck = gf_filter_pid_get_packet(ipid);
+	if (!pck) {
+		if (!gf_filter_pid_is_eos(ipid))
+			return GF_FALSE;
+
+		if (ctx->splice_state==FL_SPLICE_BEFORE)
+			ctx->splice_state = FL_SPLICE_AFTER;
+
+		//if we are in end of stream, abort
+		if (ctx->splice_state==FL_SPLICE_ACTIVE) {
+			ctx->splice_state = FL_SPLICE_AFTER;
+			ctx->splice_end_cts = ctx->spliced_current_cts;
+
+			count = gf_list_count(ctx->io_pids);
+			for (i=0; i<count; i++) {
+				FileListPid *iopid = gf_list_get(ctx->io_pids, i);
+				iopid->splice_ready = GF_FALSE;
+			}
+			ctx->wait_splice_end = GF_TRUE;
+		}
+		return GF_TRUE;
+	}
+	cts = gf_filter_pck_get_cts(pck);
+	if (cts==GF_FILTER_NO_TS)
+		return GF_TRUE;
+
+	if (ctx->splice_ctrl->splice_delay>=0) {
+		cts += ctx->splice_ctrl->splice_delay;
+	} else if (cts > - ctx->splice_ctrl->splice_delay) {
+		cts += ctx->splice_ctrl->splice_delay;
+	} else {
+		cts = 0;
+	}
+
+	sap = is_raw_audio ? GF_FILTER_SAP_1 : gf_filter_pck_get_sap(pck);
+	if (ctx->splice_state==FL_SPLICE_BEFORE) {
+		ctx->spliced_current_cts = filelist_translate_splice_cts(ctx->splice_ctrl, cts);
+		if (sap && (sap <= GF_FILTER_SAP_3)) {
+			u64 check_ts = cts;
+			if (is_raw_audio) {
+				check_ts += gf_filter_pck_get_duration(pck);
+				check_ts -= 1;
+			}
+
+			if (ctx->splice_start.num==-1) {
+				char szURL[GF_MAX_PATH];
+				filelist_next_url(NULL, ctx, szURL, GF_TRUE);
+			} else if (ctx->splice_start.num==-2) {
+				ctx->splice_start.num = cts;
+				ctx->splice_start.den = ctx->splice_ctrl->timescale_splice;
+			} else if (ctx->splice_start.num==-3) {
+				u64 now = gf_net_get_utc();
+				if (now >= ctx->splice_start.den) {
+					ctx->splice_start.num = cts;
+					ctx->splice_start.den = ctx->splice_ctrl->timescale_splice;
+				}
+			}
+
+			//we're entering the splice period
+			if ((ctx->splice_start.num >= 0)
+				&& gf_timestamp_greater_or_equal(check_ts, ctx->splice_ctrl->timescale_splice, ctx->splice_start.num, ctx->splice_start.den)
+			) {
+				//cts larger than splice end, move directly to splice_in state
+				if ((ctx->splice_end.num >= 0)
+					&& !ctx->flags_splice_end
+					&& gf_timestamp_greater_or_equal(cts, ctx->splice_ctrl->timescale_splice, ctx->splice_end.num, ctx->splice_end.den)
+				) {
+					ctx->splice_state = FL_SPLICE_AFTER;
+					ctx->splice_end_cts = filelist_translate_splice_cts(ctx->splice_ctrl, cts);
+					return GF_TRUE;
+				}
+				if (is_raw_audio) {
+					u64 ts_diff = gf_timestamp_rescale(ctx->splice_ctrl->timescale_splice, ctx->splice_start.den, ctx->splice_start.num);
+					if (ts_diff >= cts) {
+						ts_diff -= cts;
+						cts += ts_diff;
+					}
+				}
+				ctx->splice_state = FL_SPLICE_ACTIVE;
+				ctx->splice_start_cts = filelist_translate_splice_cts(ctx->splice_ctrl, cts);
+				//we just activate splice, iopid->dts_sub_splice is not set yet !!
+				assert(!ctx->splice_ctrl->dts_sub_splice);
+				ctx->splice_start_cts -= ctx->splice_ctrl->dts_sub;
+
+				if (ctx->flags_splice_end & FL_SPLICE_DELTA) {
+					ctx->splice_start.num = cts;
+					ctx->splice_start.den = ctx->splice_ctrl->timescale_splice;
+				}
+
+				count = gf_list_count(ctx->io_pids);
+				for (i=0; i<count; i++) {
+					FileListPid *iopid = gf_list_get(ctx->io_pids, i);
+					iopid->splice_ready = GF_FALSE;
+				}
+				//signal on controler that we are ready for splicing
+				ctx->splice_ctrl->splice_ready = GF_TRUE;
+				//but wait for all other streams to be ready too
+				ctx->wait_splice_start = GF_TRUE;
+			}
+		}
+	}
+
+	if (ctx->splice_state==FL_SPLICE_ACTIVE) {
+		u64 check_ts = cts;
+		if (is_raw_audio) {
+			check_ts += gf_filter_pck_get_duration(pck);
+			check_ts -= 1;
+		}
+
+		if (ctx->flags_splice_end & FL_SPLICE_DELTA) {
+			GF_Fraction64 s_end = ctx->splice_start;
+			u64 diff = ctx->splice_end.num;
+			diff *= ctx->splice_start.den;
+			diff /= ctx->splice_end.den;
+			s_end.num += diff;
+			ctx->splice_end = s_end;
+			ctx->flags_splice_end = 0;
+		}
+		else if (ctx->splice_end.num==-1) {
+			char szURL[GF_MAX_PATH];
+			filelist_next_url(NULL, ctx, szURL, GF_TRUE);
+		} else if (sap && (sap <= GF_FILTER_SAP_3)) {
+			if (ctx->splice_end.num==-2) {
+				ctx->splice_end.num = cts;
+				ctx->splice_end.den = ctx->splice_ctrl->timescale_splice;
+			} else if (ctx->splice_end.num==-3) {
+				u64 now = gf_net_get_utc();
+				if (now >= ctx->splice_start.den) {
+					ctx->splice_end.num = cts;
+					ctx->splice_end.den = ctx->splice_ctrl->timescale_splice;
+				}
+			}
+		}
+
+		if (sap && (sap <= GF_FILTER_SAP_3)
+			&& (ctx->splice_end.num >= 0)
+			&& gf_timestamp_greater_or_equal(check_ts, ctx->splice_ctrl->timescale_splice, ctx->splice_end.num, ctx->splice_end.den)
+		) {
+			ctx->splice_state = FL_SPLICE_AFTER;
+
+			if (is_raw_audio) {
+				u64 ts_diff = gf_timestamp_rescale(ctx->splice_ctrl->timescale_splice, ctx->splice_end.den, ctx->splice_end.num);
+				if (ts_diff >= cts) {
+					ts_diff -= cts;
+					cts += ts_diff;
+				}
+			}
+
+
+			ctx->splice_end_cts = filelist_translate_splice_cts(ctx->splice_ctrl, cts);
+
+			count = gf_list_count(ctx->io_pids);
+			for (i=0; i<count; i++) {
+				FileListPid *iopid = gf_list_get(ctx->io_pids, i);
+				iopid->splice_ready = GF_FALSE;
+			}
+			//do not signal splice ready on controler yet, we need to wait for the first frame in the splice content to have cts >= splice end
+			ctx->wait_splice_end = GF_TRUE;
+			return GF_TRUE;
+		}
+
+		ctx->spliced_current_cts = filelist_translate_splice_cts(ctx->splice_ctrl, cts);
+	}
+
+	return GF_TRUE;
+}
+
+void filelist_copy_raw_audio(FileListPid *iopid, const u8 *src, u32 src_size, u32 offset, u8 *dst, u32 nb_samp, RawAudioInfo *ra)
+{
+	if (iopid->ra_info.planar) {
+		u32 i, bps, stride;
+		stride = src_size / ra->nb_ch;
+		bps = ra->abps / ra->nb_ch;
+		for (i=0; i<ra->nb_ch; i++) {
+			memcpy(dst + i*bps*nb_samp, src + i*stride + offset * bps, nb_samp * bps);
+		}
+	} else {
+		memcpy(dst, src + offset * ra->abps, nb_samp * ra->abps);
+	}
+}
+
+static void filelist_forward_splice_pck(FileListPid *iopid, GF_FilterPacket *pck)
+{
+	if (iopid->audio_samples_to_keep) {
+		u32 nb_samp, dur;
+		u64 cts;
+		u8 *output;
+		const u8 *data;
+		GF_FilterPacket *dst_pck;
+		u32 pck_size, osize, offset=0;
+
+		cts = gf_filter_pck_get_cts(pck);
+
+		data = gf_filter_pck_get_data(pck, &pck_size);
+		if (iopid->audio_samples_to_keep>0) {
+			nb_samp = iopid->audio_samples_to_keep;
+			iopid->audio_samples_to_keep = -iopid->audio_samples_to_keep;
+		} else {
+			nb_samp = pck_size / iopid->splice_ra_info.abps + iopid->audio_samples_to_keep;
+			offset = -iopid->audio_samples_to_keep;
+			iopid->audio_samples_to_keep = 0;
+		}
+		osize = nb_samp * iopid->splice_ra_info.abps;
+		dst_pck = gf_filter_pck_new_alloc(iopid->opid, osize, &output);
+		if (!dst_pck) return;
+
+		filelist_copy_raw_audio(iopid, data, pck_size, offset, output, nb_samp, &iopid->splice_ra_info);
+
+		dur = nb_samp;
+		if (iopid->timescale_splice != iopid->splice_ra_info.sample_rate) {
+			dur = (u32) gf_timestamp_rescale(dur, iopid->splice_ra_info.sample_rate, iopid->timescale_splice);
+			offset = (u32) gf_timestamp_rescale(offset, iopid->splice_ra_info.sample_rate, iopid->timescale_splice);
+		}
+		cts += offset;
+		gf_filter_pck_set_cts(dst_pck, cts);
+		gf_filter_pck_set_dts(dst_pck, cts);
+		gf_filter_pck_set_duration(dst_pck, dur);
+
+		gf_filter_pck_send(dst_pck);
+	} else {
+		gf_filter_pck_forward(pck, iopid->opid);
+	}
+}
+
+static void filelist_purge_slice(GF_FileListCtx *ctx)
+{
+	u32 i, count = gf_list_count(ctx->io_pids);
+	assert(ctx->splice_ctrl);
+
+	if (ctx->mark_only)
+		return;
+	assert(ctx->splice_ctrl->splice_ipid);
+
+	for (i=0; i<count; i++) {
+		FileListPid *iopid = gf_list_get(ctx->io_pids, i);
+		if (iopid == ctx->splice_ctrl) continue;
+		if (!iopid->splice_ipid) continue;
+
+		while (1) {
+			u64 cts;
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(iopid->splice_ipid);
+			if (!pck) break;
+
+			cts = gf_filter_pck_get_cts(pck);
+			if (cts==GF_FILTER_NO_TS) cts=0;
+
+			cts = filelist_translate_splice_cts(iopid, cts);
+			if (gf_timestamp_greater(cts, iopid->o_timescale, ctx->spliced_current_cts, ctx->splice_ctrl->o_timescale))
+				break;
+
+			if (ctx->keep_splice) {
+				GF_FilterPacket *splice_pck = gf_filter_pid_get_packet(iopid->splice_ipid);
+				filelist_forward_splice_pck(iopid, splice_pck);
+			}
+			gf_filter_pid_drop_packet(iopid->splice_ipid);
+		}
+	}
+	if (ctx->keep_splice) {
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->splice_ctrl->splice_ipid);
+		filelist_forward_splice_pck(ctx->splice_ctrl, pck);
+	}
+
+	gf_filter_pid_drop_packet(ctx->splice_ctrl->splice_ipid);
+}
+
+void filelist_send_packet(GF_FileListCtx *ctx, FileListPid *iopid, GF_FilterPacket *pck, Bool is_splice_forced)
+{
+	GF_FilterPacket *dst_pck;
+	u32 dur;
+	u64 dts, cts;
+	Bool skip_ts_rescale=GF_FALSE;
+	if (iopid->audio_samples_to_keep) {
+		u32 nb_samp;
+		u8 *output;
+		const u8 *data;
+		u32 pck_size, osize, offset=0;
+		RawAudioInfo *ra = is_splice_forced ? &iopid->splice_ra_info : &iopid->ra_info;
+
+		data = gf_filter_pck_get_data(pck, &pck_size);
+		if (iopid->audio_samples_to_keep>0) {
+			nb_samp = iopid->audio_samples_to_keep;
+		} else {
+			nb_samp = pck_size / ra->abps + iopid->audio_samples_to_keep;
+			offset = -iopid->audio_samples_to_keep;
+		}
+
+		osize = ABS(iopid->audio_samples_to_keep) * ra->abps;
+		dst_pck = gf_filter_pck_new_alloc((!is_splice_forced && iopid->opid_aux) ? iopid->opid_aux : iopid->opid, osize, &output);
+		if (!dst_pck) return;
+
+		filelist_copy_raw_audio(iopid, data, pck_size, offset, output, nb_samp, ra);
+	} else {
+		dst_pck = gf_filter_pck_new_ref(iopid->opid_aux ? iopid->opid_aux : iopid->opid, 0, 0, pck);
+		if (!dst_pck) return;
+	}
+	gf_filter_pck_merge_properties(pck, dst_pck);
+
+	dts = gf_filter_pck_get_dts(pck);
+	if (dts==GF_FILTER_NO_TS) dts=0;
+
+	cts = gf_filter_pck_get_cts(pck);
+	if (cts==GF_FILTER_NO_TS) cts=0;
+
+	if (iopid->single_frame && (ctx->fsort==FL_SORT_DATEX) ) {
+		dts = cts = 0;
+		dur = (u32) gf_timestamp_rescale(ctx->current_file_dur_us, 1000000, iopid->o_timescale);
+		skip_ts_rescale = GF_TRUE;
+	} else if (iopid->single_frame && ctx->fdur.num && ctx->fdur.den) {
+		s64 pdur = ctx->fdur.num;
+		pdur *= iopid->timescale;
+		pdur /= ctx->fdur.den;
+		dur = (u32) pdur;
+	} else if (iopid->audio_samples_to_keep) {
+		RawAudioInfo *ra = is_splice_forced ? &iopid->splice_ra_info : &iopid->ra_info;
+		if (iopid->audio_samples_to_keep>0) {
+			dur = iopid->audio_samples_to_keep;
+			if ( (iopid->splice_ipid && (iopid->splice_ipid != iopid->ipid)) || (!ctx->keep_splice && !ctx->mark_only))
+				iopid->audio_samples_to_keep = 0;
+			else
+				iopid->audio_samples_to_keep = -iopid->audio_samples_to_keep;
+		} else {
+			u32 pck_size;
+			gf_filter_pck_get_data(pck, &pck_size);
+			dur = pck_size/ra->abps + iopid->audio_samples_to_keep;
+			cts += -iopid->audio_samples_to_keep;
+			dts += -iopid->audio_samples_to_keep;
+			iopid->audio_samples_to_keep = 0;
+		}
+		if (iopid->timescale != ra->sample_rate) {
+			dur = (u32) gf_timestamp_rescale(dur, ra->sample_rate, iopid->timescale);
+		}
+	} else {
+		dur = gf_filter_pck_get_duration(pck);
+	}
+
+	if (skip_ts_rescale || (iopid->timescale == iopid->o_timescale)) {
+		gf_filter_pck_set_dts(dst_pck, iopid->dts_o + dts - iopid->dts_sub);
+		gf_filter_pck_set_cts(dst_pck, iopid->cts_o + cts - iopid->dts_sub);
+		gf_filter_pck_set_duration(dst_pck, dur);
+	} else {
+		u64 ts = gf_timestamp_rescale(dts, iopid->timescale, iopid->o_timescale);
+		gf_filter_pck_set_dts(dst_pck, iopid->dts_o + ts - iopid->dts_sub);
+
+		ts = gf_timestamp_rescale(cts, iopid->timescale, iopid->o_timescale);
+		gf_filter_pck_set_cts(dst_pck, iopid->cts_o + ts - iopid->dts_sub);
+
+		ts = gf_timestamp_rescale(dur, iopid->timescale, iopid->o_timescale);
+		gf_filter_pck_set_duration(dst_pck, (u32) ts);
+	}
+	dts += dur;
+	cts += dur;
+
+	if (iopid->delay>=0) {
+		cts += iopid->delay;
+	} else if (cts > - iopid->delay) {
+		cts += iopid->delay;
+	} else {
+		cts = 0;
+	}
+
+	if (!is_splice_forced) {
+		if (dts > iopid->max_dts)
+			iopid->max_dts = dts;
+		if (cts > iopid->max_cts)
+			iopid->max_cts = cts;
+
+		//remember our first DTS
+		if (!iopid->first_dts_plus_one) {
+			iopid->first_dts_plus_one = dts + 1;
+		}
+
+		if (iopid->send_cue) {
+			iopid->send_cue = GF_FALSE;
+			gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+		}
+	}
+
+	gf_filter_pck_send(dst_pck);
+
+	if (!iopid->audio_samples_to_keep) {
+		gf_filter_pid_drop_packet(iopid->ipid);
+	}
+}
+
+static GF_Err filelist_process(GF_Filter *filter)
+{
+	Bool start, end, purge_splice = GF_FALSE;
+	u32 i, count, nb_done, nb_inactive, nb_stop, nb_ready;
+	FileListPid *iopid;
+	GF_FileListCtx *ctx = gf_filter_get_udta(filter);
+
+
+	if (!ctx->file_list) {
+		GF_FilterPacket *pck;
+		if (!ctx->file_pid) {
+			return GF_EOS;
+		}
+		pck = gf_filter_pid_get_packet(ctx->file_pid);
+		if (pck) {
+			gf_filter_pck_get_framing(pck, &start, &end);
+			gf_filter_pid_drop_packet(ctx->file_pid);
+
+			if (end) {
+				const GF_PropertyValue *p;
+				Bool is_first = GF_TRUE;
+				FILE *f=NULL;
+				p = gf_filter_pid_get_property(ctx->file_pid, GF_PROP_PID_FILEPATH);
+				if (p) {
+					char *frag;
+					if (ctx->file_path) {
+						gf_free(ctx->file_path);
+						is_first = GF_FALSE;
+					}
+					ctx->file_path = gf_strdup(p->value.string);
+					frag = strchr(ctx->file_path, '#');
+					if (frag) {
+						frag[0] = 0;
+						ctx->frag_url = gf_strdup(frag+1);
+					}
+					f = gf_fopen(ctx->file_path, "rt");
+				}
+				if (!f) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] Unable to open file %s\n", ctx->file_path ? ctx->file_path : "no source path"));
+					return GF_SERVICE_ERROR;
+				} else {
+					gf_fclose(f);
+					ctx->load_next = is_first;
+				}
+			}
+		}
+	}
+	if (ctx->is_eos)
+		return GF_EOS;
+
+	if (ctx->load_next) {
+		return filelist_load_next(filter, ctx);
+	}
+
+
+	count = gf_list_count(ctx->io_pids);
+	//init first timestamp
+	if (!ctx->dts_sub_plus_one.num) {
+		u32 nb_eos = 0;
+
+		for (i=0; i<gf_list_count(ctx->filter_srcs); i++) {
+			GF_Filter *fsrc = gf_list_get(ctx->filter_srcs, i);
+			if (gf_filter_has_pid_connection_pending(fsrc, filter)) {
+				return GF_OK;
+			}
+		}
+
+		for (i=0; i<count; i++) {
 			GF_FilterPacket *pck;
 			u64 dts;
 			iopid = gf_list_get(ctx->io_pids, i);
-			if (!iopid->ipid) return GF_OK;
-			pck = gf_filter_pid_get_packet(iopid->ipid);
+ if (!iopid->ipid) {
+				if (ctx->src_error) {
+					nb_eos++;
+					continue;
+				}
+
+				if (iopid->opid) gf_filter_pid_set_eos(iopid->opid);
+				if (iopid->opid_aux) gf_filter_pid_set_eos(iopid->opid_aux);
+				return GF_OK;
+			}
+ if (iopid->skip_dts_init) continue;
+ pck = gf_filter_pid_get_packet(iopid->ipid);
+
 			if (!pck) {
-				if (gf_filter_pid_is_eos(iopid->ipid)) {
+				if (gf_filter_pid_is_eos(iopid->ipid) || (iopid->play_state==FLIST_STATE_STOP)) {
 					nb_eos++;
 					continue;
 				}
+				ctx->dts_sub_plus_one.num = 0;
 				return GF_OK;
 			}
-			dts = gf_filter_pck_get_dts(pck);
-			if (dts==GF_FILTER_NO_TS) dts=0;
 
-			dts *= 1000000;
-			dts /= iopid->timescale;
-			if (!ctx->dts_sub_plus_one) ctx->dts_sub_plus_one = dts + 1;
-			else if (dts < ctx->dts_sub_plus_one - 1) ctx->dts_sub_plus_one = dts + 1;
+
+			dts = gf_filter_pck_get_dts(pck);
+			if (dts==GF_FILTER_NO_TS)
+				dts = gf_filter_pck_get_cts(pck);
+			if (dts==GF_FILTER_NO_TS)
+				dts = 0;
+
+			//make sure we start all streams on a SAP
+			if (!iopid->wait_rap && gf_filter_pck_get_seek_flag(pck)) {
+				gf_filter_pid_drop_packet(iopid->ipid);
+				pck = NULL;
+			}
+			else if (iopid->wait_rap && !iopid->ra_info.is_raw && !gf_filter_pck_get_sap(pck)) {
+				gf_filter_pid_drop_packet(iopid->ipid);
+				pck = NULL;
+			}
+			if (!pck) {
+				iopid->wait_rap = GF_TRUE;
+				if (!ctx->wait_dts_plus_one.num
+					|| gf_timestamp_greater(dts + 1, iopid->timescale, ctx->wait_dts_plus_one.num, ctx->wait_dts_plus_one.den)
+				) {
+					ctx->wait_dts_plus_one.num = dts + 1;
+					ctx->wait_dts_plus_one.den = iopid->timescale;
+				}
+				ctx->dts_sub_plus_one.num = 0;
+				return GF_OK;
+			}
+			if (ctx->wait_dts_plus_one.num
+				&& gf_timestamp_less(dts, iopid->timescale, (ctx->wait_dts_plus_one.num - 1), ctx->wait_dts_plus_one.den)
+			) {
+				gf_filter_pid_drop_packet(iopid->ipid);
+				iopid->wait_rap = GF_TRUE;
+				ctx->dts_sub_plus_one.num = 0;
+				return GF_OK;
+			}
+			if (iopid->wait_rap) {
+				iopid->wait_rap = GF_FALSE;
+				ctx->dts_sub_plus_one.num = 0;
+				return GF_OK;
+			}
+			if (!ctx->dts_sub_plus_one.num
+				|| gf_timestamp_less(dts, iopid->timescale, (ctx->dts_sub_plus_one.num - 1), ctx->dts_sub_plus_one.den)
+			) {
+				ctx->dts_sub_plus_one.num = dts + 1;
+				ctx->dts_sub_plus_one.den = iopid->timescale;
+			}
 	 	}
+	 	ctx->src_error = GF_FALSE;
 	 	if (nb_eos) {
 			if (nb_eos==count) {
 				//force load
@@ -649,104 +1929,236 @@
 			}
 			return GF_OK;
 		}
+
+		//if we start with a splice, set first dst_sub to 0 to keep timestamps untouched
+		if (!ctx->splice_state) {
+			ctx->first_loaded = GF_TRUE;
+			ctx->skip_sync = GF_FALSE;
+		} else if (!ctx->first_loaded) {
+			ctx->dts_sub_plus_one.num = 1;
+			ctx->dts_sub_plus_one.den = 1;
+			ctx->first_loaded = 1;
+			ctx->skip_sync = GF_FALSE;
+		}
+
 		for (i=0; i<count; i++) {
 			iopid = gf_list_get(ctx->io_pids, i);
-			iopid->dts_sub = ctx->dts_sub_plus_one - 1;
-			iopid->dts_sub *= iopid->o_timescale;
-			iopid->dts_sub /= 1000000;
+			iopid->dts_sub = gf_timestamp_rescale(ctx->dts_sub_plus_one.num - 1, ctx->dts_sub_plus_one.den, iopid->o_timescale);
 		}
+		ctx->wait_dts_plus_one.num = 0;
 	}
 
-	nb_done = nb_inactive = 0;
+	if (ctx->splice_state) {
+		if (!filelist_check_splice(ctx))
+			return GF_OK;
+	}
+
+	nb_done = nb_inactive = nb_stop = nb_ready = 0;
 	for (i=0; i<count; i++) {
 		iopid = gf_list_get(ctx->io_pids, i);
 		if (!iopid->ipid) {
+ iopid->splice_ready = GF_TRUE;
 			nb_inactive++;
 			continue;
 		}
+		if (iopid->play_state==FLIST_STATE_WAIT_PLAY)
+			continue;
+ if (iopid->play_state==FLIST_STATE_STOP) {
+			nb_stop++;
+ //in case the input still dispatch packets, drop them
+ while (1) {
+ GF_FilterPacket *pck = gf_filter_pid_get_packet(iopid->ipid);
+ if (!pck) break;
+ gf_filter_pid_drop_packet(iopid->ipid);
+ }
+ while (iopid->splice_ipid) {
+ GF_FilterPacket *pck = gf_filter_pid_get_packet(iopid->splice_ipid);
+ if (!pck) break;
+ gf_filter_pid_drop_packet(iopid->splice_ipid);
+ }
+ nb_done++;
+ iopid->splice_ready = GF_TRUE;
+ continue;
+ }
 		if (iopid->is_eos) {
+ iopid->splice_ready = GF_TRUE;
 			nb_done++;
 			continue;
 		}
-		if (!iopid->is_playing) {
-			continue;
-		}
-		if (gf_filter_pid_would_block(iopid->opid))
-			continue;
 
 		while (1) {
-			GF_FilterPacket *dst_pck;
-			u64 cts, dts;
-			u32 dur;
+			u64 cts;
 			GF_FilterPacket *pck;
 
 			pck = gf_filter_pid_get_packet(iopid->ipid);
 			if (!pck) {
-				if (gf_filter_pid_is_eos(iopid->ipid))
-					iopid->is_eos = GF_TRUE;
+				if (gf_filter_pid_is_eos(iopid->ipid)) {
+					if (ctx->wait_splice_end) {
+						iopid->splice_ready = GF_TRUE;
+					} else if (ctx->wait_splice_start) {
+						iopid->splice_ready = GF_TRUE;
+					} else {
+						iopid->is_eos = GF_TRUE;
+						if (ctx->splice_state==FL_SPLICE_ACTIVE)
+							purge_splice = GF_TRUE;
+					}
+				}
 
 				if (iopid->is_eos)
 					nb_done++;
 				break;
 			}
 
-			if (gf_filter_pid_would_block(iopid->opid))
+			if (gf_filter_pid_would_block(iopid->opid) && (!iopid->opid_aux || gf_filter_pid_would_block(iopid->opid_aux)))
 				break;
 
-			dst_pck = gf_filter_pck_new_ref(iopid->opid, NULL, 0, pck);
-			gf_filter_pck_merge_properties(pck, dst_pck);
-			dts = gf_filter_pck_get_dts(pck);
-			if (dts==GF_FILTER_NO_TS) dts=0;
-
 			cts = gf_filter_pck_get_cts(pck);
-			if (cts==GF_FILTER_NO_TS) cts=0;
+			if (ctx->splice_state && (cts != GF_FILTER_NO_TS)) {
+				u32 dur = gf_filter_pck_get_duration(pck);
 
-			if (iopid->single_frame && (ctx->fsort==FL_SORT_DATEX) ) {
-				dur = (u32) ctx->current_file_dur;
-				//move from second to input pid timescale
-				dur *= iopid->timescale;
-			} else if (iopid->single_frame && ctx->fdur.num && ctx->fdur.den) {
-				s64 pdur = ctx->fdur.num;
-				pdur *= iopid->timescale;
-				pdur /= ctx->fdur.den;
-				dur = (u32) pdur;
-			} else {
-				dur = gf_filter_pck_get_duration(pck);
+				if (iopid->delay>=0) {
+					cts += iopid->delay;
+				} else if (cts > - iopid->delay) {
+					cts += iopid->delay;
+				} else {
+					cts = 0;
+				}
+
+				//translate cts in output timescale, and compare with splice
+				if (iopid->timescale != iopid->o_timescale) {
+					cts = gf_timestamp_rescale(cts, iopid->timescale, iopid->o_timescale);
+					dur = (u32) gf_timestamp_rescale(dur, iopid->timescale, iopid->o_timescale);
+				}
+				if (iopid->cts_o + cts >= iopid->dts_sub)
+					cts = iopid->cts_o + cts - iopid->dts_sub;
+				else
+					cts = 0;
+
+				//about to enter the splice period
+				if (ctx->splice_state==FL_SPLICE_BEFORE) {
+					//do not dispatch yet if cts is greater than last CTS seen on splice control pid
+					if (gf_timestamp_greater(cts, iopid->o_timescale, ctx->spliced_current_cts, ctx->splice_ctrl->o_timescale))
+						break;
+				}
+				//in the splice period
+				else if (ctx->splice_state==FL_SPLICE_ACTIVE) {
+					u64 check_ts = cts;
+
+					if (iopid->ra_info.is_raw) {
+						check_ts += dur;
+						check_ts -= 1;
+					}
+
+					//packet in splice range
+					if (gf_timestamp_greater_or_equal(check_ts, iopid->o_timescale, ctx->splice_start_cts, ctx->splice_ctrl->o_timescale)) {
+						Bool keep_pck = GF_FALSE;
+						//waiting for all streams to reach splice out point (packet is from main content)
+						//don't drop packet yet in case splice content is not ready
+						if (ctx->wait_splice_start) {
+							if (iopid->ra_info.is_raw && iopid->ra_info.sample_rate && !iopid->audio_samples_to_keep) {
+								u64 ts_diff = gf_timestamp_rescale(ctx->splice_start_cts, ctx->splice_ctrl->o_timescale, iopid->o_timescale);
+								if (ts_diff >= cts) {
+									ts_diff -= cts;
+									if (iopid->ra_info.sample_rate != iopid->o_timescale) {
+										ts_diff = gf_timestamp_rescale(ts_diff, iopid->o_timescale, iopid->ra_info.sample_rate);
+									}
+									iopid->audio_samples_to_keep = (s32) ts_diff;
+									if (ts_diff) keep_pck = GF_TRUE;
+								}
+							}
+							if (!keep_pck) {
+								iopid->splice_ready = GF_TRUE;
+								break;
+							}
+						}
+						if (!keep_pck && (iopid == ctx->splice_ctrl))
+							purge_splice = GF_TRUE;
+
+						//do not dispatch yet if cts is greater than last CTS seen on splice control pid
+						if (gf_timestamp_greater(cts, iopid->o_timescale, ctx->spliced_current_cts, ctx->splice_ctrl->o_timescale))
+							break;
+
+					}
+					//should not happen
+					else if (!ctx->wait_splice_start) {
+						gf_filter_pid_drop_packet(iopid->ipid);
+						continue;
+					}
+				}
+				//leaving the splice period
+				else if (ctx->splice_state==FL_SPLICE_AFTER) {
+					//still in spliced content
+					if (ctx->wait_splice_end) {
+						u64 check_ts = cts;
+						if (iopid->ra_info.is_raw) {
+							check_ts += dur;
+							check_ts -= 1;
+						}
+
+						if (
+							//packet is after splice end, drop
+							gf_timestamp_greater_or_equal(check_ts, iopid->o_timescale, ctx->splice_end_cts, ctx->splice_ctrl->o_timescale)
+							//packet is before splice end but a previous packet was dropped because after splice end (i.e. we dropped a ref), drop
+							|| iopid->splice_ready
+						) {
+							Bool do_break = GF_TRUE;
+							if (iopid->ra_info.is_raw && !iopid->audio_samples_to_keep) {
+								u64 ts_diff = gf_timestamp_rescale(ctx->splice_end_cts, ctx->splice_ctrl->o_timescale, iopid->o_timescale);
+								if (ts_diff >= cts) {
+									ts_diff -= cts;
+									if (iopid->ra_info.sample_rate != iopid->o_timescale) {
+										ts_diff = gf_timestamp_rescale(ts_diff, iopid->o_timescale, iopid->ra_info.sample_rate);
+									}
+									iopid->audio_samples_to_keep = (s32) ts_diff;
+									if (ts_diff)
+										do_break = GF_FALSE;
+								}
+							}
+							if (do_break) {
+								iopid->splice_ready = GF_TRUE;
+								if (!ctx->mark_only)
+									gf_filter_pid_drop_packet(iopid->ipid);
+								break;
+							}
+						}
+					} else {
+						//out of spliced content, packet is from main:
+						//drop packet if before CTS of splice end point (open gop or packets from other PIDs not yet discarded during splice)
+						u64 check_ts = cts;
+						if (iopid->ra_info.is_raw) {
+							check_ts += dur;
+							check_ts -= 1;
+						}
+						if (!iopid->audio_samples_to_keep
+							&& gf_timestamp_less(check_ts, iopid->o_timescale, ctx->splice_end_cts, ctx->splice_ctrl->o_timescale)
+						) {
+							//do not drop if not raw audio and we were in keep/mark mode
+							if (iopid->ra_info.is_raw || !ctx->was_kept) {
+								gf_filter_pid_drop_packet(iopid->ipid);
+								break;
+							}
+						}
+						if (ctx->wait_splice_start) {
+							iopid->splice_ready = GF_FALSE;
+						}
+					}
+				}
 			}
 
-			if (iopid->timescale == iopid->o_timescale) {
-				gf_filter_pck_set_dts(dst_pck, iopid->dts_o + dts - iopid->dts_sub);
-				gf_filter_pck_set_cts(dst_pck, iopid->cts_o + cts - iopid->dts_sub);
-				gf_filter_pck_set_duration(dst_pck, dur);
-			} else {
-				u64 ts = dts;
-				ts *= iopid->o_timescale;
-				ts /= iopid->timescale;
-				gf_filter_pck_set_dts(dst_pck, iopid->dts_o + ts - iopid->dts_sub);
-				ts = cts;
-				ts *= iopid->o_timescale;
-				ts /= iopid->timescale;
-				gf_filter_pck_set_cts(dst_pck, iopid->cts_o + ts - iopid->dts_sub);
-
-				ts = dur;
-				ts *= iopid->o_timescale;
-				ts /= iopid->timescale;
-				gf_filter_pck_set_duration(dst_pck, (u32) ts);
-			}
-			dts += dur;
-			cts += dur;
-			if (dts > iopid->max_dts) iopid->max_dts = dts;
-			if (cts > iopid->max_cts) iopid->max_cts = cts;
-
-			//remember our first DTS
-			if (!iopid->first_dts_plus_one) {
-				iopid->first_dts_plus_one = dts + 1;
-			}
-			gf_filter_pck_send(dst_pck);
-			gf_filter_pid_drop_packet(iopid->ipid);
-			//if we have an end range, compute max_dts (includes dur) - firrst_dts
-			if (ctx->stop>ctx->start) {
-				if ( (ctx->stop-ctx->start) * iopid->timescale <= (iopid->max_dts - iopid->first_dts_plus_one + 1)) {
+			if (ctx->wait_source) {
+				nb_ready++;
+				break;
+			}
+
+			filelist_send_packet(ctx, iopid, pck, GF_FALSE);
+
+			//if we have an end range, compute max_dts (includes dur) - first_dts
+			if (ctx->stop > ctx->start) {
+				if ( (ctx->stop - ctx->start) * iopid->timescale <= (iopid->max_dts - iopid->first_dts_plus_one + 1)) {
+					GF_FilterEvent evt;
+					GF_FEVT_INIT(evt, GF_FEVT_STOP, iopid->ipid)
+					gf_filter_pid_send_event(iopid->ipid, &evt);
+					gf_filter_pid_set_discard(iopid->ipid, GF_TRUE);
 					iopid->is_eos = GF_TRUE;
 					nb_done++;
 					break;
@@ -754,11 +2166,248 @@
 			}
 		}
 	}
+
+	if (purge_splice) {
+		filelist_purge_slice(ctx);
+	}
+	if (ctx->wait_source) {
+		if (nb_ready + nb_inactive + nb_done == count) {
+			ctx->wait_source = GF_FALSE;
+
+			if (ctx->splice_state==FL_SPLICE_AFTER)
+				ctx->splice_state = FL_SPLICE_BEFORE;
+		}
+	}
+
+
+	if (ctx->wait_splice_end) {
+		Bool ready = GF_TRUE;
+		for (i=0; i<count; i++) {
+			iopid = gf_list_get(ctx->io_pids, i);
+			if (!iopid->ipid) continue;
+			if (!iopid->splice_ready) {
+				ready = GF_FALSE;
+				break;
+			}
+		}
+		if (!ready)
+			return GF_OK;
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[FileList] Splice end reached, resuming main content\n"));
+		ctx->wait_splice_end = GF_FALSE;
+		ctx->nb_repeat = ctx->splice_nb_repeat;
+		ctx->splice_nb_repeat = 0;
+
+		//reset props pushed by splice
+		if (ctx->pid_props) gf_free(ctx->pid_props);
+		ctx->pid_props = ctx->splice_pid_props;
+		ctx->splice_pid_props = NULL;
+		ctx->skip_sync = GF_FALSE;
+
+		for (i=0; i<count; i++) {
+			iopid = gf_list_get(ctx->io_pids, i);
+			iopid->splice_ready = GF_FALSE;
+			//detach
+			if (!ctx->mark_only && iopid->ipid) {
+				gf_filter_pid_set_udta(iopid->ipid, NULL);
+				gf_filter_pid_set_discard(iopid->ipid, GF_TRUE);
+			}
+
+			if (iopid->splice_ipid) {
+				GF_FilterPacket *pck;
+				iopid->ipid = iopid->splice_ipid;
+				iopid->dts_o = iopid->dts_o_splice;
+				iopid->cts_o = iopid->cts_o_splice;
+				iopid->dts_sub = iopid->dts_sub_splice;
+				iopid->dts_sub_splice = 0;
+				iopid->dts_o_splice = 0;
+				iopid->cts_o_splice = 0;
+				iopid->splice_ipid = NULL;
+				iopid->ra_info = iopid->splice_ra_info;
+				iopid->splice_ra_info.is_raw = GF_FALSE;
+				iopid->timescale = iopid->timescale_splice;
+
+				//if spliced media was raw audio, we may need to forward or truncate part of the packet before switching properties
+				pck = iopid->ra_info.is_raw ? gf_filter_pid_get_packet(iopid->ipid) : NULL;
+				if (pck) {
+					u64 cts = gf_filter_pck_get_cts(pck);
+					u64 check_ts = cts + gf_filter_pck_get_duration(pck) - 1;
+
+					if (gf_timestamp_less(cts, iopid->timescale, ctx->splice_end_cts, ctx->splice_ctrl->timescale)) {
+						if (gf_timestamp_greater(check_ts, iopid->timescale, ctx->splice_end_cts, ctx->splice_ctrl->timescale)) {
+							u64 diff_ts = gf_timestamp_rescale(ctx->splice_end_cts, ctx->splice_ctrl->timescale, iopid->timescale);
+							diff_ts -= cts;
+
+							if (iopid->timescale != iopid->ra_info.sample_rate) {
+								diff_ts = gf_timestamp_rescale(diff_ts, iopid->timescale, iopid->ra_info.sample_rate);
+							}
+							iopid->audio_samples_to_keep = (s32) diff_ts;
+							if (ctx->keep_splice) {
+								filelist_send_packet(ctx, iopid, pck, GF_TRUE);
+							} else {
+								iopid->audio_samples_to_keep = -iopid->audio_samples_to_keep;
+							}
+						}
+					}
+
+				}
+			} else if (!ctx->mark_only) {
+				iopid->ipid = NULL;
+			}
+			iopid->is_eos = GF_FALSE;
+		}
+		if (!ctx->mark_only) {
+			while (gf_list_count(ctx->filter_srcs)) {
+				GF_Filter *fsrc = gf_list_pop_back(ctx->filter_srcs);
+				gf_filter_remove_src(filter, fsrc);
+			}
+			gf_list_del(ctx->filter_srcs);
+			ctx->filter_srcs = ctx->splice_srcs;
+			ctx->splice_srcs = NULL;
+		} else {
+			for (i=0; i<count; i++) {
+				iopid = gf_list_get(ctx->io_pids, i);
+				if (!iopid->ipid) continue;
+				gf_filter_pid_set_property_str(iopid->opid, "period_resume", NULL);
+				gf_filter_pid_set_property_str(iopid->opid, "period_resume", &PROP_STRING(ctx->dyn_period_id ? ctx->dyn_period_id : "") );
+				gf_filter_pid_set_property_str(iopid->opid, "period_switch", NULL);
+				gf_filter_pid_set_property_str(iopid->opid, "period_switch", &PROP_BOOL(GF_TRUE) );
+			}
+		}
+		ctx->was_kept = (ctx->mark_only || ctx->keep_splice) ? GF_TRUE : GF_FALSE;
+
+		ctx->mark_only = GF_FALSE;
+
+
+		ctx->splice_state = FL_SPLICE_AFTER;
+		if (ctx->keep_splice) {
+			for (i=0; i<count; i++) {
+				iopid = gf_list_get(ctx->io_pids, i);
+				if (iopid->opid_aux) {
+					gf_filter_pid_set_eos(iopid->opid_aux);
+					gf_filter_pid_remove(iopid->opid_aux);
+					iopid->opid_aux = NULL;
+				}
+			}
+			ctx->keep_splice = GF_FALSE;
+
+			if (ctx->splice_props) {
+				gf_free(ctx->splice_props);
+				ctx->splice_props = NULL;
+			}
+		}
+
+		//spliced media is still active, restore our timeline as it was before splicing
+		if (! gf_filter_pid_is_eos(ctx->splice_ctrl->ipid)) {
+
+			ctx->cur_splice_index ++;
+			//force a reconfig
+			for (i=0; i<count; i++) {
+				iopid = gf_list_get(ctx->io_pids, i);
+				if (iopid->ipid) {
+					filelist_configure_pid(filter, iopid->ipid, GF_FALSE);
+					gf_filter_pid_set_property_str(iopid->opid, "period_resume", &PROP_STRING(ctx->dyn_period_id ? ctx->dyn_period_id : "") );
+				}
+			}
+
+			ctx->cts_offset = ctx->cts_offset_at_splice;
+			ctx->dts_offset = ctx->dts_offset_at_splice;
+			ctx->dts_sub_plus_one = ctx->dts_sub_plus_one_at_splice;
+			//set splice start as undefined to probe for new splice time
+			ctx->splice_start.num = -1;
+			ctx->splice_start.den = 1;
+			ctx->splice_end.num = -1;
+			ctx->splice_end.den = 1;
+			//make sure we have a packet ready on each input pid before dispatching packets from the main content
+			//so that we trigger synchronized reconfig on all pids
+			ctx->wait_source = GF_TRUE;
+			return GF_OK;
+		}
+
+		for (i=0; i<count; i++) {
+			iopid = gf_list_get(ctx->io_pids, i);
+			if (!iopid->ipid) continue;
+			gf_filter_pid_set_udta(iopid->ipid, NULL);
+			gf_filter_pid_set_discard(iopid->ipid, GF_TRUE);
+		}
+		//spliced media is done, load next
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[FileList] Spliced media is over, switching to next item in playlist\n"));
+		nb_inactive = 0;
+		nb_done = count;
+		ctx->cur_splice_index = 0;
+		ctx->splice_state = ctx->nb_repeat ? FL_SPLICE_BEFORE : FL_SPLICE_NONE;
+	}
+
+	if (ctx->wait_splice_start) {
+		Bool ready = GF_TRUE;
+		for (i=0; i<count; i++) {
+			iopid = gf_list_get(ctx->io_pids, i);
+			if (!iopid->ipid) continue;
+			if (!iopid->splice_ready) {
+				ready = GF_FALSE;
+				break;
+			}
+		}
+		if (!ready)
+			return GF_OK;
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[FileList] Splice start reached, loading splice content\n"));
+		ctx->splice_nb_repeat = ctx->nb_repeat;
+		ctx->nb_repeat = 0;
+		ctx->init_start = ctx->start;
+		ctx->init_stop = ctx->stop;
+		ctx->was_kept = GF_FALSE;
+		ctx->stop = ctx->start = 0;
+		nb_inactive = 0;
+		nb_done = count;
+
+		assert(!ctx->splice_pid_props);
+		ctx->splice_pid_props = ctx->pid_props;
+		ctx->pid_props = NULL;
+
+		ctx->cts_offset_at_splice = ctx->cts_offset;
+		ctx->dts_offset_at_splice = ctx->dts_offset;
+		ctx->dts_sub_plus_one_at_splice = ctx->dts_sub_plus_one;
+
+		if (ctx->mark_only) {
+			ctx->cur_splice_index ++;
+			for (i=0; i<count; i++) {
+				iopid = gf_list_get(ctx->io_pids, i);
+				if (iopid->ipid) {
+					gf_filter_pid_set_property_str(iopid->opid, "period_resume", NULL);
+					gf_filter_pid_set_property_str(iopid->opid, "period_resume", &PROP_STRING(ctx->dyn_period_id ? ctx->dyn_period_id : "") );
+					gf_filter_pid_set_property_str(iopid->opid, "period_switch", NULL);
+					gf_filter_pid_set_property_str(iopid->opid, "period_switch", &PROP_BOOL(GF_TRUE) );
+				}
+				if (ctx->splice_props)
+					gf_filter_pid_push_properties(iopid->opid, ctx->splice_props, GF_TRUE, GF_TRUE);
+
+				if (ctx->dyn_period_id)
+					filelist_push_period_id(ctx, iopid->opid);
+			}
+			if (ctx->splice_props) {
+				gf_free(ctx->splice_props);
+				ctx->splice_props = NULL;
+			}
+			ctx->wait_splice_start = GF_FALSE;
+			ctx->splice_ctrl->splice_ipid = ctx->splice_ctrl->ipid;
+			ctx->splice_ctrl->splice_ra_info = ctx->splice_ctrl->ra_info;
+			return GF_OK;
+		}
+		//make sure we have a packet ready on each input pid before dispatching packets from the splice
+		//so that we trigger synchronized reconfig on all pids
+		ctx->wait_source = GF_TRUE;
+	}
+
+
+
 	if ((nb_inactive!=count) && (nb_done+nb_inactive==count)) {
-		//compute max cts and dts in 1Mhz timescale
-		u64 max_cts = 0, max_dts = 0;
+		//compute max cts and dts
+		GF_Fraction64 max_cts, max_dts;
+		max_cts.num = max_dts.num = 0;
+		max_cts.den = max_dts.den = 1;
 
-		if (gf_filter_end_of_session(filter)) {
+		if (gf_filter_end_of_session(filter) || (nb_stop + nb_inactive == count) ) {
 			for (i=0; i<count; i++) {
 				iopid = gf_list_get(ctx->io_pids, i);
 				gf_filter_pid_set_eos(iopid->opid);
@@ -766,39 +2415,102 @@
 			ctx->is_eos = GF_TRUE;
 			return GF_EOS;
 		}
-		ctx->dts_sub_plus_one = 0;
+		ctx->dts_sub_plus_one.num = 0;
 		for (i=0; i<count; i++) {
+			u64 ts;
 			iopid = gf_list_get(ctx->io_pids, i);
-			if (iopid->ipid) {
-				u64 ts;
-				ts = iopid->max_cts - iopid->dts_sub;
-				ts *= 1000000;
-				ts /= iopid->timescale;
-				if (max_cts < ts) max_cts = ts;
+			iopid->send_cue = ctx->sigcues;
+			if (!iopid->ipid) continue;
+
+			ts = iopid->max_cts - iopid->dts_sub;
+			if (gf_timestamp_less(max_cts.num, max_cts.den, ts, iopid->timescale)) {
+				max_cts.num = ts;
+				if (iopid->single_frame && (ctx->fsort==FL_SORT_DATEX))
+					max_cts.den = iopid->o_timescale;
+				else
+					max_cts.den = iopid->timescale;
+			}
 
-				ts = iopid->max_dts - iopid->dts_sub;
-				ts *= 1000000;
-				ts /= iopid->timescale;
-				if (max_dts < ts) max_dts = ts;
+			ts = iopid->max_dts - iopid->dts_sub;
+			if (gf_timestamp_less(max_dts.num, max_dts.den, ts, iopid->timescale)) {
+				max_dts.num = ts;
+				if (iopid->single_frame && (ctx->fsort==FL_SORT_DATEX))
+					max_dts.den = iopid->o_timescale;
+				else
+					max_dts.den = iopid->timescale;
 			}
 		}
-		ctx->cts_offset += max_dts;
-		ctx->dts_offset += max_dts;
+		if (!ctx->cts_offset.num || !ctx->cts_offset.den) {
+			ctx->cts_offset = max_dts;
+		} else if (ctx->cts_offset.den == max_dts.den) {
+			ctx->cts_offset.num += max_dts.num;
+		} else if (max_dts.den>ctx->cts_offset.den) {
+			ctx->cts_offset.num = gf_timestamp_rescale_signed(ctx->cts_offset.num, ctx->cts_offset.den, max_dts.den);
+			ctx->cts_offset.num += max_dts.num;
+			ctx->cts_offset.den = max_dts.den;
+		} else {
+			ctx->cts_offset.num += gf_timestamp_rescale_signed(max_dts.num, max_dts.den, ctx->cts_offset.den);
+		}
+
+		if (!ctx->dts_offset.num || !ctx->dts_offset.den) {
+			ctx->dts_offset = max_dts;
+		} else if (ctx->dts_offset.den == max_dts.den) {
+			ctx->dts_offset.num += max_dts.num;
+		} else if (max_dts.den > ctx->dts_offset.den) {
+			ctx->dts_offset.num = gf_timestamp_rescale_signed(ctx->dts_offset.num, ctx->dts_offset.den, max_dts.den);
+			ctx->dts_offset.num += max_dts.num;
+			ctx->dts_offset.den = max_dts.den;
+		} else {
+			ctx->dts_offset.num += gf_timestamp_rescale_signed(max_dts.num, max_dts.den, ctx->dts_offset.den);
+		}
 
 		if (ctx->nb_repeat) {
-			ctx->nb_repeat--;
+			Bool is_splice_resume = GF_FALSE;
+			if ((s32) ctx->nb_repeat>0)
+				ctx->nb_repeat--;
+
+			//reload of main content
+			if (ctx->splice_state==FL_SPLICE_AFTER) {
+				ctx->splice_start = ctx->init_splice_start;
+				ctx->splice_end = ctx->init_splice_end;
+				ctx->flags_splice_start = ctx->init_flags_splice_start;
+				ctx->flags_splice_end = ctx->init_flags_splice_end;
+				ctx->splice_state = FL_SPLICE_BEFORE;
+				ctx->splice_end_cts = 0;
+				ctx->splice_start_cts = 0;
+				ctx->spliced_current_cts = 0;
+				ctx->dts_sub_plus_one_at_splice.num = 0;
+				ctx->last_url_crc = ctx->last_splice_crc;
+				ctx->last_url_lineno = ctx->last_splice_lineno;
+				ctx->start = ctx->init_start;
+				ctx->stop = ctx->init_stop;
+				is_splice_resume = GF_TRUE;
+			}
+
 			for (i=0; i<count; i++) {
 				GF_FilterEvent evt;
 				iopid = gf_list_get(ctx->io_pids, i);
 				if (!iopid->ipid) continue;
 
+				gf_filter_pid_set_discard(iopid->ipid, GF_FALSE);
+
 				GF_FEVT_INIT(evt, GF_FEVT_STOP, iopid->ipid);
 				gf_filter_pid_send_event(iopid->ipid, &evt);
 
 				iopid->is_eos = GF_FALSE;
-				filelist_start_ipid(ctx, iopid);
+				filelist_start_ipid(ctx, iopid, iopid->timescale, GF_TRUE);
+				if (is_splice_resume) {
+					iopid->dts_o_splice = iopid->cts_o;
+					iopid->cts_o_splice = iopid->dts_o;
+					iopid->splice_ra_info = iopid->ra_info;
+					iopid->dts_sub_splice = 0;
+				}
 			}
 		} else {
+			if (ctx->splice_state!=FL_SPLICE_ACTIVE) {
+				ctx->splice_state = FL_SPLICE_NONE;
+				ctx->last_splice_crc = 0;
+			}
 			//force load
 			ctx->load_next = GF_TRUE;
 			return filelist_process(filter);
@@ -807,10 +2519,10 @@
 	return GF_OK;
 }
 
-void filelist_add_entry(GF_FileListCtx *ctx, FileListEntry *fentry)
+static void filelist_add_entry(GF_FileListCtx *ctx, FileListEntry *fentry)
 {
-	u32 i, count;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[FileList] Adding file %s to list\n", fentry->file_name));
+	u32 i, count, l1, l2;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[FileList] Adding file %s size "LLU" mod time "LLU" to list\n", fentry->file_name, fentry->file_size, fentry->last_mod_time));
 	if (ctx->fsort==FL_SORT_NONE) {
 		gf_list_add(ctx->file_list, fentry);
 		return;
@@ -828,7 +2540,13 @@
 			if (cur->last_mod_time>fentry->last_mod_time) insert = GF_TRUE;
 			break;
 		case FL_SORT_NAME:
-			if (strcmp(cur->file_name, fentry->file_name) > 0) insert = GF_TRUE;
+			l1 = (u32) strlen(cur->file_name);
+			l2 = (u32) strlen(fentry->file_name);
+
+			if (l1 > l2)
+				insert = GF_TRUE;
+			else if ((l1==l2) && (strcmp(cur->file_name, fentry->file_name) > 0))
+				insert = GF_TRUE;
 			break;
 		}
 		if (insert) {
@@ -839,7 +2557,7 @@
 	gf_list_add(ctx->file_list, fentry);
 }
 
-Bool filelist_enum(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+static Bool filelist_enum(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	FileListEntry *fentry;
 	GF_FileListCtx *ctx = cbck;
@@ -859,7 +2577,7 @@
 	return GF_FALSE;
 }
 
-GF_Err filelist_initialize(GF_Filter *filter)
+static GF_Err filelist_initialize(GF_Filter *filter)
 {
 	u32 i, count;
 	char *sep_dir, c=0, *dir, *pattern;
@@ -870,25 +2588,31 @@
 	if (ctx->ka)
 		ctx->floop = 0;
 
-	if (!ctx->srcs || !gf_list_count(ctx->srcs)) {
+
+	if (! ctx->srcs.nb_items ) {
 		if (! gf_filter_is_dynamic(filter)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[FileList] No inputs\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[FileList] No inputs\n"));
 		}
 		return GF_OK;
 	}
+
 	ctx->file_list = gf_list_new();
-	count = gf_list_count(ctx->srcs);
+	count = ctx->srcs.nb_items;
 	for (i=0; i<count; i++) {
-		char *list = gf_list_get(ctx->srcs, i);
+		char *list = ctx->srcs.vals[i];
+		Bool is_dir = gf_dir_exists(list);
 
-		if (strchr(list, '*') ) {
+		if (is_dir || strchr(list, '*') ) {
 			sep_dir = strrchr(list, '/');
 			if (!sep_dir) sep_dir = strrchr(list, '\\');
 			if (sep_dir) {
 				c = sep_dir[0];
 				sep_dir[0] = 0;
 				dir = list;
-				pattern = sep_dir+2;
+				pattern = is_dir ? NULL : (sep_dir+2);
+			} else if (is_dir) {
+				dir = list;
+				pattern = NULL;
 			} else {
 				dir = ".";
 				pattern = list;
@@ -896,28 +2620,50 @@
 			gf_enum_directory(dir, GF_FALSE, filelist_enum, ctx, pattern);
 			if (c && sep_dir) sep_dir[0] = c;
 		} else {
-			if (gf_file_exists(list)) {
+			u64 f_size=0, f_date=0;
+			u32 type = 0;
+			if (strstr(list, " && ") || strstr(list, "&&"))
+				type = 1;
+			else {
+				char *ext_start = gf_file_ext_start(list);
+				if (!ext_start) ext_start = list;
+				char *frag = strchr(ext_start, '#');
+				if (frag) frag[0] = 0;
+				char *cgi = strchr(list, '?');
+				if (cgi) cgi[0] = 0;
+				if (gf_file_exists(list)) {
+					type = 2;
+					f_date = gf_file_modification_time(list);
+					FILE *fo = gf_fopen(list, "rb");
+					if (fo) {
+						f_size = gf_fsize(fo);
+						gf_fclose(fo);
+					}
+				}
+
+				if (frag) frag[0] = '#';
+				if (cgi) cgi[0] = '?';
+			}
+
+			if (type) {
 				FileListEntry *fentry;
 				GF_SAFEALLOC(fentry, FileListEntry);
 				if (fentry) {
-					FILE *fo;
 					fentry->file_name = gf_strdup(list);
-					fentry->last_mod_time = gf_file_modification_time(list);
-					fo = gf_fopen(list, "rb");
-					if (fo) {
-						fentry->file_size = gf_fsize(fo);
-						gf_fclose(fo);
+					if (type==2) {
+						fentry->last_mod_time = f_date;
+						fentry->file_size = f_size;
 					}
 					filelist_add_entry(ctx, fentry);
 				}
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[FileList] File %s not found, ignoring\n", list));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FileList] File %s not found, ignoring\n", list));
 			}
 		}
 	}
 
 	if (!gf_list_count(ctx->file_list)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[FileList] No files found in list %s\n", ctx->srcs));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FileList] No files found in list %s\n", ctx->srcs.vals[0]));
 		return GF_BAD_PARAM;
 	}
 	if (ctx->fsort==FL_SORT_DATEX) {
@@ -927,7 +2673,7 @@
 	ctx->file_list_idx = ctx->revert ? gf_list_count(ctx->file_list) : -1;
 	ctx->load_next = GF_TRUE;
 	//from now on we only accept the above caps
-	gf_filter_override_caps(filter, FileListCapsSrc, 2);
+	filelist_override_caps(filter, ctx);
 	//and we act as a source, request processing
 	gf_filter_post_process_task(filter);
 	//prevent deconnection of filter when no input
@@ -935,7 +2681,7 @@
 	return GF_OK;
 }
 
-void filelist_finalize(GF_Filter *filter)
+static void filelist_finalize(GF_Filter *filter)
 {
 	GF_FileListCtx *ctx = gf_filter_get_udta(filter);
 	while (gf_list_count(ctx->io_pids)) {
@@ -953,26 +2699,96 @@
 	gf_list_del(ctx->io_pids);
 	gf_list_del(ctx->filter_srcs);
 	if (ctx->file_path) gf_free(ctx->file_path);
+	if (ctx->frag_url) gf_free(ctx->frag_url);
+	if (ctx->unknown_params) gf_free(ctx->unknown_params);
+	if (ctx->pid_props) gf_free(ctx->pid_props);
+	if (ctx->dyn_period_id) gf_free(ctx->dyn_period_id);
+	if (ctx->splice_props) gf_free(ctx->splice_props);
+	if (ctx->splice_pid_props) gf_free(ctx->splice_pid_props);
 }
 
+static const char *filelist_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	u32 nb_lines = 0;
+	if (!gf_utf8_is_legal(data, size)) {
+		return NULL;
+	}
+	//we only deal with no-BOM files
+	if ((data[0] == 0xFF) || (data[0] == 0xFE) || (data[0] == 0xEF)) return NULL;
+
+	while (data && size) {
+		u32 i, line_size;
+		Bool is_cr = GF_FALSE;
+		char *nl;
+		nl = memchr(data, '\r', size);
+		if (!nl)
+			nl = memchr(data, '\n', size);
+		else
+			is_cr = GF_TRUE;
+
+		if (nl)
+			line_size = (u32) (nl - (char *) data);
+		else
+			line_size = size-1;
+
+		//line is comment
+		if (data[0] != '#') {
+			Bool line_empty = GF_TRUE;
+			for (i=0;i<line_size; i++) {
+				char c = (char) data[i];
+				if (!c) return NULL;
+				if ( isalnum(c)) continue;
+				//valid URL chars plus backslash for win path
+				if (strchr("-._~:/?#[]@!$&'()*+,;%=\\", c)) {
+					line_empty = GF_FALSE;
+					continue;
+				}
+				//not a valid URL
+				return NULL;
+			}
+			if (!line_empty)
+				nb_lines++;
+		}
+		if (!nl) break;
+		size -= (u32) (nl+1 - (char *) data);
+		data = nl+1;
+		if (is_cr && (data[0]=='\n')) {
+			size --;
+			data++;
+		}
+	}
+	if (!nb_lines) return NULL;
+	*score = GF_FPROBE_MAYBE_SUPPORTED;
+	return "application/x-gpac-playlist";
+}
 
 #define OFFS(_n)	#_n, offsetof(GF_FileListCtx, _n)
 static const GF_FilterArgs GF_FileListArgs[] =
 {
 	{ OFFS(floop), "loop playlist/list of files, `0` for one time, `n` for n+1 times, `-1` for indefinitely", GF_PROP_SINT, "0", NULL, 0},
-	{ OFFS(srcs), "list of files to play - see filter help", GF_PROP_STRING_LIST, NULL, NULL, 0},
-	{ OFFS(fdur), "for source files with a single frame, sets frame duration. 0/NaN fraction means reuse source timing which is usually not set!", GF_PROP_FRACTION, "1/25", NULL, 0},
-	{ OFFS(revert), "revert list of files (not playlist)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(timescale), "force output timescale on all pids. 0 uses the timescale of the first pid found", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ka), "keep playlist alive (disable loop), waiting the for a new input to be added or `#end` to end playlist. The value specify the refresh rate in ms", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(srcs), "list of files to play", GF_PROP_STRING_LIST, NULL, NULL, 0},
+	{ OFFS(fdur), "frame duration for source files with a single frame (0/NaN fraction means reuse source timing which is usually not set!)", GF_PROP_FRACTION, "1/25", NULL, 0},
+	{ OFFS(revert), "revert list of files ([-srcs](), not playlist)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(timescale), "force output timescale on all PIDs (0 uses the timescale of the first PID found)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ka), "keep playlist alive (disable loop), waiting for a new input to be added or `#end` directive to end playlist. The value specifies the refresh rate in ms", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(timeout), "timeout in ms after which the playlist is considered dead (`-1` means indefinitely)", GF_PROP_LUINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
 
 	{ OFFS(fsort), "sort list of files\n"
 		"- no: no sorting, use default directory enumeration of OS\n"
 		"- name: sort by alphabetical name\n"
 		"- size: sort by increasing size\n"
 		"- date: sort by increasing modification time\n"
-		"- datex: sort by increasing modification time - see filter help"
+		"- datex: sort by increasing modification time"
 		, GF_PROP_UINT, "no", "no|name|size|date|datex", 0},
+
+	{ OFFS(sigcues), "inject `CueStart` property at each source begin (new or repeated) for DASHing", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(fdel), "delete source files after processing in playlist mode (does not delete the playlist)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(raw), "force input AV streams to be in raw format\n"
+	"- no: do not force decoding of inputs\n"
+	"- av: force decoding of audio and video inputs\n"
+	"- a: force decoding of audio inputs\n"
+	"- v: force decoding of video inputs", GF_PROP_UINT, "no", "av|a|v|no", GF_FS_ARG_HINT_NORMAL},
+
 	{0}
 };
 
@@ -980,7 +2796,8 @@
 static const GF_FilterCapability FileListCaps[] =
 {
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
-	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "txt|m3u"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "txt|m3u|pl"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/x-gpac-playlist"),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 };
 
@@ -991,15 +2808,15 @@
 	GF_FS_SET_HELP("This filter can be used to play playlist files or a list of sources.\n"
 		"\n"
 		"The filter loads any source supported by GPAC: remote or local files or streaming sessions (TS, RTP, DASH or other).\n"
-		"The filter forces input demultiplex and recomputes the input timestamps into a continuous timeline.\n"
+		"The filter demultiplexes inputs and recomputes input timestamps into a continuous timeline.\n"
 		"At each new source, the filter tries to remap input PIDs to already declared output PIDs of the same type, if any, or declares new output PIDs otherwise. If no input PID matches the type of an output, no packets are send for that PID.\n"
 		"\n"
 		"# Source list mode\n"
-		"The source list mode is activated by using `flist:srcs=f1[,f2]`, where f1 can be a file or a directory to enum.\n"
-		"The syntax for directory enum is:\n"
-		"- dir/*: enumerates everything in dir\n"
-		"- foo/*.png: enumerates all files with extension png in foo\n"
-		"- foo/*.png;*.jpg: enumerates all files with extension png or jpg in foo\n"
+		"The source list mode is activated by using `flist:srcs=f1[,f2]`, where f1 can be a file or a directory to enumerate.\n"
+		"The syntax for directory enumeration is:\n"
+		"- dir, dir/ or dir/*: enumerates everything in directory `dir`\n"
+		"- foo/*.png: enumerates all files with extension png in directory `foo`\n"
+		"- foo/*.png;*.jpg: enumerates all files with extension png or jpg in directory `foo`\n"
 		"\n"
 		"The resulting file list can be sorted using [-fsort]().\n"
 		"If the sort mode is `datex` and source files are images or single frame files, the following applies:\n"
@@ -1009,37 +2826,133 @@
 		"- each frame (coming from each file) is assigned a duration equal to the difference of modification time between the file and the next file\n"
 		"- the last frame is assigned the same duration as the previous one\n"
 		"\n"
+		"When sorting by names:\n"
+		"- shorter filenames are inserted before longer filenames\n"
+		"- alphabetical sorting is used if same filename length\n"
+		"\n"
 		"# Playlist mode\n"
-		"The playlist mode is activated when opening a playlist file (extension txt or m3u).\n"
-		"In this mode, directives can be given in a comment line, i.e. a line starting with '#' before the line with the file name.\n"
-		"The following directives, separated with space or comma, are supported:\n"
-		"- repeat=N: repeats N times the content (hence played N+1).\n"
-		"- start=T: tries to play the file from start time T seconds (double format only). This may not work with some files/formats not supporting seeking.\n"
-		"- stop=T: stops source playback after T seconds (double format only). This works on any source (implemented independently from seek support).\n"
-		"- cat: specifies that the following entry should be concatenated to the previous source rather than opening a new source. This can optionnally specify a byte range if desired, otherwise the full file is concatenated.\n"
-		"- srange=T: when cat is set, indicates the start T (64 bit decimal, default 0) of the byte range from the next entry to concatenate.\n"
-		"- send=T: when cat is set, indicates the end T (64 bit decimal, default 0) of the byte range from the next entry to concatenate.\n"
+		"The playlist mode is activated when opening a playlist file (m3u format, utf-8 encoding, no BOM, default extensions `m3u`, `txt` or `pl`).\n"
+		"In this mode, directives can be given in a comment line, i.e. a line starting with `#` before the line with the file name.\n"
+		"Lines stating with `##` are ignored.\n"
 		"\n"
+		"The playlist file is refreshed whenever the next source has to be reloaded in order to allow for dynamic pushing of sources in the playlist.\n"
+		"If the last URL played cannot be found in the playlist, the first URL in the playlist file will be loaded.\n"
+		"\n"
+		"When [-ka]() is used to keep refreshing the playlist on regular basis, the playlist must end with a new line.\n"
+		"Playlist refreshing will abort:\n"
+		"- if the input playlist has a line not ending with a LF `(\\n)` character, in order to avoid asynchronous issues when reading the playlist.\n"
+		"- if the input playlist has not been modified for the [-timeout]() option value (infinite by default).\n"
+		"## Playlist directives\n"
+		"A playlist directive line can contain zero or more directives, separated with space. The following directives are supported:\n"
+		"- repeat=N: repeats `N` times the content (hence played N+1).\n"
+		"- start=T: tries to play the file from start time `T` seconds (double format only). This may not work with some files/formats not supporting seeking.\n"
+		"- stop=T: stops source playback after `T` seconds (double format only). This works on any source (implemented independently from seek support).\n"
+		"- cat: specifies that the following entry should be concatenated to the previous source rather than opening a new source. This can optionally specify a byte range if desired, otherwise the full file is concatenated.\n"
 		"Note: When sources are ISOBMFF files or segments on local storage or GF_FileIO objects, the concatenation will be automatically detected.\n"
+		"- srange=T: when cat is set, indicates the start `T` (64 bit decimal, default 0) of the byte range from the next entry to concatenate.\n"
+		"- send=T: when cat is set, indicates the end `T` (64 bit decimal, default 0) of the byte range from the next entry to concatenate.\n"
+		"- props=STR: assigns properties described in `STR` to all PIDs coming from the listed sources on next line. `STR` is formatted according to `gpac -h doc` using the default parameter set.\n"
+		"- del: specifies that the source file(s) must be deleted once processed, true by default if [-fdel]() is set.\n"
+		"- out=V: specifies splicing start time (cf below).\n"
+		"- in=V: specifies splicing end time (cf below).\n"
+		"- nosync: prevents timestamp adjustments when joining sources (implied if `cat` is set).\n"
+		"- keep: keeps spliced period in output (cf below).\n"
+		"- mark: only inject marker for the splice period and do not load any replacement content (cf below).\n"
+		"- sprops=STR: assigns properties described in `STR` to all PIDs of the main content during a splice (cf below). `STR` is formatted according to `gpac -h doc` using the default parameter set.\n"
+		"\n"
+		"The following global options (applying to the filter, not the sources) may also be set in the playlist:\n"
+		"- ka=N: force [-ka]() option to `N` millisecond refresh.\n"
+		"- floop=N: set [-floop]() option from within playlist.\n"
+		"- raw: set [-raw]() option from within playlist.\n"
 		"\n"
+		"The default behavior when joining sources is to realign the timeline origin of the new source to the maximum time in all PIDs of the previous sources.\n"
+		"This may create gaps in the timeline in case previous source PIDs are not of equal duration (quite common with most audio codecs).\n"
+		"Using `nosync` directive will disable this realignment and provide a continuous timeline but may introduce synchronization errors depending in the source encoding (use with caution).\n"
+		"## Source syntax\n"
 		"The source lines follow the usual source syntax, see `gpac -h`.\n"
-		"Additional pid properties can be added per source (see `gpac -h doc`), but are valid only for the current source, and reset at next source.\n"
+		"Additional PID properties can be added per source (see `gpac -h doc`), but are valid only for the current source, and reset at next source.\n"
+		"The loaded sources do not inherit arguments from the parent playlist filter.\n"
 		"\n"
 		"The URL given can either be a single URL, or a list of URLs separated by \" && \" to load several sources for the active entry.\n"
+		"Warning: There shall not be any other space/tab characters between sources.\n"
 		"EX audio.mp4 && video.mp4\n"
+		"## Source with filter chains\n"
+		"Each URL can be followed by a chain of one or more filters, using the `@` link directive as used in gpac (see `gpac -h doc`).\n"
+		"A negative link index (e.g. `@-1`) can be used to setup a new filter chain starting from the last specified source in the line.\n"
+		"Warning: There shall be a single character, with value space (' '), before and after each link directive.\n"
+		"\n"
+		"EX src.mp4 @ reframer:rt=on\n"
+		"This will inject a reframer with real-time regulation between source and `flist` filter.\n"
+		"EX src.mp4 @ reframer:saps=1 @1 reframer:saps=0,2,3\n"
+		"EX src.mp4 @ reframer:saps=1 @-1 reframer:saps=0,2,3\n"
+		"This will inject a reframer filtering only SAP1 frames and a reframer filtering only non-SAP1 frames between source and `flist` filter\n"
+		"\n"
+		"Link options can be specified (see `gpac -h doc`).\n"
+		"EX src.mp4 @#video reframer:rt=on\n"
+		"This will inject a reframer with real-time regulation between video PID of source and `flist` filter.\n"
+		"\n"
+		"When using filter chains, the `flist` filter will only accept PIDs from the last declared filter in the chain.\n"
+		"In order to accept other PIDs from the source, you must specify a final link directive with no following filter.\n"
+		"EX src.mp4 @#video reframer:rt=on @-1#audio\n"
+		"This will inject a reframer with real-time regulation between video PID of source and `flist` filter, and will also allow audio PIDs from source to connect to `flist` filter.\n"
+		"\n"
+		"The empty link directive can also be used on the last declared filter\n"
+		"EX src.mp4 @ reframer:rt=on @#audio\n"
+		"This will inject a reframer with real-time regulation between source and `flist` filter and only connect audio PIDs to `flist` filter.\n"
+		"## Splicing\n"
+		"The playlist can be used to splice content with other content following a media in the playlist.\n"
+		"A source item is declared as main media in a splice operation if and only if it has an `out` directive set (possibly empty).\n"
+		"Directive can be used for the main media except concatenation directives.\n"
+		"\n"
+		"The splicing operations do not alter media frames and do not perform uncompressed domain operations such as cross-fade or mixing.\n"
+		"\n"
+		"The `out` (resp. `in`) directive specifies the media splice start (resp. end) time. The value can be formatted as follows:\n"
+		"- empty: the time is not yet assigned\n"
+		"- `now`: the time is resolved to the next SAP point in the media\n"
+		"- integer, float or fraction: set time in seconds\n"
+		"- `+VAL`: used for `in` only, specify the end point as delta in seconds from the start point (`VAL` can be integer, float or fraction)\n"
+		"- DATE: set splice time according to wall clock `DATE`, formatted as an `XSD dateTime`\n"
+		"The splice times (except wall clock) are expressed in the source (main media) timing, not the reconstructed output timeline.\n"
+		"\n"
+		"When a splice begins (`out` time reached), the source items following the main media are played until the end of the splice or the end of the main media.\n"
+		"Sources used during the splice period can use directives such as `start`, `dur` or `repeat`.\n"
+		"\n"
+		"Once a splice is done (`in` time reached), the main media `out` splice time is reset to undefined.\n"
+		"\n"
+		"When the main media has undefined `out` or `in` splice times, the playlist is reloaded at each new main media packet to check for resolved values.\n"
+		"- `out` can only be modified when no splice is active, otherwise it is ignored. If modified, it resets the next source to play to be the one following the modified main media.\n"
+		"- `in` can only be modified when a splice is active with an undefined end time, otherwise it is ignored.\n"
+		"\n"
+		"When the main media is over:\n"
+		"- if `repeat` directive is set, the main media is repeated, `in` and `out` set to their initial values and the next splicing content is the one following the main content,\n"
+		"- otherwise, the next source queued is the one following the last source played during the last splice period.\n"
+		"\n"
+		"It is allowed to defined several main media in the playlist, but a main media is not allowed as media for a splice period.\n"
+		"\n"
+		"The filter will look for the property `Period` on the output PIDs of the main media for multi-period DASH.\n"
+		"If found, `_N` is appended to the period ID, with `N` starting from 1 and increased at each main media resume.\n"
+		"If no `Period` property is set on main or spliced media, period switch can still be forced using [-pswitch](dasher) DASH option.\n"
+		"\n"
+		"If `mark` directive is set for a main media, no content replacement is done and the splice boundaries will be signaled in the main media.\n"
+		"If `keep` directive is set for a main media, the main media is forwarded along with the replacement content.\n"
+		"When `mark` or `keep` directives are set, it is possible to alter the PID properties of the main media using `sprops` directive.\n"
+		"\n"
+		"EX #out=2 in=4 mark sprops=#xlink=http://foo.bar/\nEX src:#Period=main\n"
+		"This will inject property xlink on the output PIDs in the splice zone (corresponding to period `main_2`) but not in the rest of the main media.\n"
 		"\n"
-		"The playlist file is refreshed whenever the next source has to be reloaded in order to allow for dynamic pushing of sources in the playlist.\n"\
-		"If the last URL played cannot be found in the playlist, the first URL in the playlist file will be loaded.\n")
+		"Directives `mark`, `keep` and `sprops` are reset at the end of the splice period.\n"
+		)
 	.private_size = sizeof(GF_FileListCtx),
 	.max_extra_pids = -1,
-	.flags = GF_FS_REG_ACT_AS_SOURCE | GF_FS_REG_REQUIRES_RESOLVER,
+	.flags = GF_FS_REG_ACT_AS_SOURCE | GF_FS_REG_REQUIRES_RESOLVER | GF_FS_REG_DYNAMIC_PIDS,
 	.args = GF_FileListArgs,
 	.initialize = filelist_initialize,
 	.finalize = filelist_finalize,
 	SETCAPS(FileListCaps),
 	.configure_pid = filelist_configure_pid,
 	.process = filelist_process,
-	.process_event = filelist_process_event
+	.process_event = filelist_process_event,
+	.probe_data = filelist_probe_data
 };
 
 const GF_FilterRegister *filelist_register(GF_FilterSession *session)

gpac-1.0.1.tar.gz/src/filters/hevcmerge.c -> gpac-2.0.0.tar.gz/src/filters/hevcmerge.c Changed

@@ -4,7 +4,7 @@
 *			Authors: Jean Le Feuvre
 *					 Yacine Mathurin Boubacar Aziakou
 *					 Samir Mustapha
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / HEVC tile merger filter
@@ -155,33 +155,33 @@
 
 	//Read and write NAL header bits
 	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 16), 16);
-	gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); //pps_pic_parameter_set_id
-	gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); //pps_seq_parameter_set_id
+	gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); //pps_pic_parameter_set_id
+	gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); //pps_seq_parameter_set_id
 	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 7), 7); //from dependent_slice_segments_enabled_flag to cabac_init_present_flag
-	gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); //num_ref_idx_l0_default_active_minus1
-	gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); //num_ref_idx_l1_default_active_minus1
-	gf_bs_set_se(ctx->bs_nal_out, gf_bs_get_se(ctx->bs_nal_in)); //init_qp_minus26
+	gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); //num_ref_idx_l0_default_active_minus1
+	gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); //num_ref_idx_l1_default_active_minus1
+	gf_bs_write_se(ctx->bs_nal_out, gf_bs_read_se(ctx->bs_nal_in)); //init_qp_minus26
 	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 2), 2); //from constrained_intra_pred_flag to transform_skip_enabled_flag
 	cu_qp_delta_enabled_flag = gf_bs_read_int(ctx->bs_nal_in, 1); //cu_qp_delta_enabled_flag
 	gf_bs_write_int(ctx->bs_nal_out, cu_qp_delta_enabled_flag, 1); //
 	if (cu_qp_delta_enabled_flag)
-		gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); // diff_cu_qp_delta_depth
-	gf_bs_set_se(ctx->bs_nal_out, gf_bs_get_se(ctx->bs_nal_in)); // pps_cb_qp_offset
-	gf_bs_set_se(ctx->bs_nal_out, gf_bs_get_se(ctx->bs_nal_in)); // pps_cr_qp_offset
+		gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); // diff_cu_qp_delta_depth
+	gf_bs_write_se(ctx->bs_nal_out, gf_bs_read_se(ctx->bs_nal_in)); // pps_cb_qp_offset
+	gf_bs_write_se(ctx->bs_nal_out, gf_bs_read_se(ctx->bs_nal_in)); // pps_cr_qp_offset
 	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 4), 4); // from pps_slice_chroma_qp_offsets_present_flag to transquant_bypass_enabled_flag
 
 
 	gf_bs_read_int(ctx->bs_nal_in, 1);
 	gf_bs_write_int(ctx->bs_nal_out, 1, 1);
 	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 1), 1);//entropy_coding_sync_enabled_flag
-	gf_bs_set_ue(ctx->bs_nal_out, ctx->nb_cols-1);//write num_tile_columns_minus1
+	gf_bs_write_ue(ctx->bs_nal_out, ctx->nb_cols-1);//write num_tile_columns_minus1
 	//num_tile_rows_minus1
 	if (ctx->enable_multi_rows) {
 		u32 nb_rows = ctx->nb_rows - 1;
 		assert(ctx->nb_rows);
-		gf_bs_set_ue(ctx->bs_nal_out, nb_rows);
+		gf_bs_write_ue(ctx->bs_nal_out, nb_rows);
 	} else {
-		gf_bs_set_ue(ctx->bs_nal_out, 0);//num_tile_rows_minus1
+		gf_bs_write_ue(ctx->bs_nal_out, 0);//num_tile_rows_minus1
 	}
 	gf_bs_write_int(ctx->bs_nal_out, 0, 1); //uniform_spacing_flag
 
@@ -189,7 +189,7 @@
 	{
 		u32 i;
 		for (i = 0; i < ctx->nb_cols-1; i++)
-			gf_bs_set_ue(ctx->bs_nal_out, (ctx->grid[i].width / ctx->max_CU_width - 1));
+			gf_bs_write_ue(ctx->bs_nal_out, (ctx->grid[i].width / ctx->max_CU_width - 1));
 
 		//if multi row is possible, declare the row height
 		if (ctx->enable_multi_rows && (ctx->nb_rows>1)) {
@@ -201,7 +201,7 @@
 				HEVCTilePidCtx *tile = gf_list_get(ctx->ordered_pids, i);
 				//only check height in the first column
 				if (tile->pos_col) continue;
-				gf_bs_set_ue(ctx->bs_nal_out, (tile->height / ctx->max_CU_width - 1)); // row_height_minus1[i]
+				gf_bs_write_ue(ctx->bs_nal_out, (tile->height / ctx->max_CU_width - 1)); // row_height_minus1[i]
 				nb_rows--;
 				if (!nb_rows) break;
 			}
@@ -301,8 +301,8 @@
 		gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 1), 1);
 	}
 
-	pps_id = gf_bs_get_ue(ctx->bs_nal_in);
-	gf_bs_set_ue(ctx->bs_nal_out, pps_id);
+	pps_id = gf_bs_read_ue(ctx->bs_nal_in);
+	gf_bs_write_ue(ctx->bs_nal_out, pps_id);
 
 	pps = &hevc->pps[pps_id];
 	sps = &hevc->sps[pps->sps_id];
@@ -331,15 +331,15 @@
 	}
 	//compute new qp delta
 	new_slice_qp_delta = hevc->s_info.pps->pic_init_qp_minus26 + hevc->s_info.slice_qp_delta - ctx->base_pps_init_qp_delta_minus26;
-	gf_bs_set_se(ctx->bs_nal_out, new_slice_qp_delta);
-	gf_bs_get_se(ctx->bs_nal_in);
+	gf_bs_write_se(ctx->bs_nal_out, new_slice_qp_delta);
+	gf_bs_read_se(ctx->bs_nal_in);
 
 	//copy over until num_entry_points
 	while (num_entry_point_start != (gf_bs_get_position(ctx->bs_nal_in) - 1) * 8 + gf_bs_get_bit_position(ctx->bs_nal_in)) {
 		gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 1), 1);
 	}
 	//write num_entry_points to 0 (always present since we use tiling)
-	gf_bs_set_ue(ctx->bs_nal_out, 0);
+	gf_bs_write_ue(ctx->bs_nal_out, 0);
 
 	//write slice extension to 0
 	if (pps->slice_segment_header_extension_present_flag)
@@ -354,7 +354,7 @@
 	//read byte_alignment() is bit=1 + x bit=0
 	al = gf_bs_read_int(ctx->bs_nal_in, 1);
 	if (al != 1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] source slice header not properly aligned\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] source slice header not properly aligned\n"));
 	}
 	gf_bs_align(ctx->bs_nal_in);
 
@@ -400,10 +400,10 @@
 
 	// for all the list objects in param_array
 	for (i = 0; i < gf_list_count(hvcc->param_array); i++) { // hvcc->param_array:list object
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray *) gf_list_get(hvcc->param_array, i); // ar contains the i-th item in param_array
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *) gf_list_get(hvcc->param_array, i); // ar contains the i-th item in param_array
 		for (j = 0; j < gf_list_count(ar->nalus); j++) { // for all the nalus the i-th param got
 			/*! used for storing AVC sequenceParameterSetNALUnit and pictureParameterSetNALUnit*/
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j); // store j-th nalus in *sl
+			GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j); // store j-th nalus in *sl
 
 			if (ar->type == GF_HEVC_NALU_SEQ_PARAM) {
 				char *outSPS=NULL;
@@ -512,7 +512,7 @@
 				x = (srd_x * ctx->out_width) / srd_ref->value.vec2i.x;
 				w = (srd_w * ctx->out_width) / srd_ref->value.vec2i.x;
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[HEVCMerge] width=0 in source pid SRD referential, cannot output SRD map\n" ));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] width=0 in source pid SRD referential, cannot output SRD map\n" ));
 				srd_map_valid = GF_FALSE;
 				break;
 			}
@@ -520,7 +520,7 @@
 				y = (srd_y * ctx->out_height) / srd_ref->value.vec2i.y;
 				h = (srd_h * ctx->out_height) / srd_ref->value.vec2i.y;
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[HEVCMerge] height=0 in source pid SRD referential, undefined results\n" ));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] height=0 in source pid SRD referential, undefined results\n" ));
 				srd_map_valid = GF_FALSE;
 				break;
 			}
@@ -530,7 +530,7 @@
 			w = (s32)(tile->width);
 			h = (s32)(tile->height);
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[HEVCMerge] SRD, SRD_REF and CROP_POS are not defined for source pid, undefined results\n" ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] SRD, SRD_REF and CROP_POS are not defined for source pid, undefined results\n" ));
 			srd_map_valid = GF_FALSE;
 			break;
 		}
@@ -598,15 +598,15 @@
 		}
 	}
 	if ((nb_cols>1) && (nb_rows>1)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Cannot merge more than one tile not a multiple of CTUs in both width and height, not possible in standard\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Cannot merge more than one tile not a multiple of CTUs in both width and height, not possible in standard\n"));
 		return GF_BAD_PARAM;
 	}
 	if (nb_has_pos && nb_no_pos) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Cannot merge tiles with explicit positioning and tiles with implicit positioning, not supported\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Cannot merge tiles with explicit positioning and tiles with implicit positioning, not supported\n"));
 		return GF_BAD_PARAM;
 	}
 	if (nb_rel_pos && nb_abs_pos) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Cannot merge tiles with both relative explicit positioning and absolute explicit positioning, not supported\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Cannot merge tiles with both relative explicit positioning and absolute explicit positioning, not supported\n"));
 		return GF_BAD_PARAM;
 	}
 	if (ctx->grid) gf_free(ctx->grid);
@@ -648,7 +648,7 @@
 				}
 
 				if (overlap) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Overlapping tiles detected, cannot merge\n"));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Overlapping tiles detected, cannot merge\n"));
 					return GF_BAD_PARAM;
 				}
 			}
@@ -727,7 +727,7 @@
 			}
 		}
 		if (!ctx->grid) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Failed to create grid\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Failed to create grid\n"));
 			return GF_OUT_OF_MEM;
 		}
 		// pass on the grid to insert empty columns
@@ -763,7 +763,7 @@
 			}
 			//check non-last columns are multiple of max CU width
 			if ((j+1<max_cols) && (ctx->grid[j].width % ctx->max_CU_height) ) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Invalid grid specification, column %d width %d not a multiple of max CU width and not the last one\n", j+1, ctx->grid[j].width));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Invalid grid specification, column %d width %d not a multiple of max CU width and not the last one\n", j+1, ctx->grid[j].width));
 				return GF_BAD_PARAM;
 			}
 			for (i=0; i<nb_pids; i++) {
@@ -771,7 +771,7 @@
 				if (nb_rel_pos) {
 					if (-tile->pos_x != ctx->grid[j].pos_x) continue;
 					if (ctx->grid[j].width != tile->width) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Invalid relative positioning in the same column of tiles with different width %d vs %d\n", tile->width, ctx->grid[j].width));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Invalid relative positioning in the same column of tiles with different width %d vs %d\n", tile->width, ctx->grid[j].width));
 						return GF_BAD_PARAM;
 					}
 					tile->pos_col = j;
@@ -782,7 +782,7 @@
 					tile->pos_col = j;
 					tile->pos_row = tile->pos_y / ctx->max_CU_height;
 					if (tile->pos_row * ctx->max_CU_height != tile->pos_y) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVCMerge] Tile y %d not a multiple of CU height %d, adjusting to next boundary\n", tile->pos_y, ctx->max_CU_height));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] Tile y %d not a multiple of CU height %d, adjusting to next boundary\n", tile->pos_y, ctx->max_CU_height));
 						tile->pos_row++;
 					}
 					if (tile->pos_y + tile->height > ctx->grid[j].height)
@@ -799,7 +799,7 @@
 				HEVCTilePidCtx *tile = gf_list_get(ctx->pids, i);
 				if (tile->pos_col != j) continue;
 				if ((tile->pos_row < ctx->grid[j].max_row_pos) && (tile->height % ctx->max_CU_height)) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Invalid grid specification, row %d in column %d height %d not a multiple of max CU height and not the last one\n", tile->pos_row, j+1, tile->height));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Invalid grid specification, row %d in column %d height %d not a multiple of max CU height and not the last one\n", tile->pos_row, j+1, tile->height));
 					return GF_BAD_PARAM;
 				}
 			}
@@ -897,12 +897,12 @@
 	ctx->nb_cols = nb_cols;
 
 	//recompute slice addresses
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[HEVCMerge] Grid reconfigured, output size %dx%d, %d input pids:\n", ctx->out_width, ctx->out_height, nb_pids));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[HEVCMerge] Grid reconfigured, output size %dx%d, %d input pids:\n", ctx->out_width, ctx->out_height, nb_pids));
 	for (i=0; i<nb_pids; i++) {
 		HEVCTilePidCtx *pidctx = gf_list_get(ctx->pids, i);
 		pidctx->slice_segment_address = hevcmerge_compute_address(ctx, pidctx, nb_abs_pos ? GF_TRUE : GF_FALSE);
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("- pid %s (pos %dx%d) size %dx%d new address %d\n",
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("- pid %s (pos %dx%d) size %dx%d new address %d\n",
 				gf_filter_pid_get_name(pidctx->pid),
 				nb_has_pos ? pidctx->pos_x : pidctx->pos_col,
 				nb_has_pos ? pidctx->pos_y : pidctx->pos_row,
@@ -1006,7 +1006,7 @@
 
 #define CHECK_SPS_VAL(__name)	\
 			if (sps_base->__name != sps_o->__name ) { \
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVCMerge] "#__name" differs in SPS between %s and %s, undefined results\n", src_base, src_o));\
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] "#__name" differs in SPS between %s and %s, undefined results\n", src_base, src_o));\
 				all_ok = GF_FALSE;\
 			}\
 
@@ -1099,7 +1099,7 @@
 
 #define CHECK_PPS_VAL(__name)	\
 			if (pps_base->__name != pps_o->__name ) { \
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVCMerge] "#__name" differs in PPS, undefined results\n"));\
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] "#__name" differs in PPS, undefined results\n"));\
 				all_ok = GF_FALSE;\
 			}\
 
@@ -1171,9 +1171,10 @@
 		gf_list_del_item(ctx->pids, tile_pid);
 		gf_free(tile_pid);
 		if (!gf_list_count(ctx->pids)) {
-			if (ctx->opid)
+			if (ctx->opid) {
 				gf_filter_pid_remove(ctx->opid);
-
+				ctx->opid = NULL;
+			}
 			return GF_OK;
 		}
 		grid_config_changed = GF_TRUE;
@@ -1228,35 +1229,35 @@
 	ctx->hevc_nalu_size_length = 4;
 	e = GF_OK;
 	for (i = 0; i < gf_list_count(hvcc->param_array); i++) {
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray *) gf_list_get(hvcc->param_array, i);
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *) gf_list_get(hvcc->param_array, i);
 		for (j = 0; j < gf_list_count(ar->nalus); j++) {
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+			GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
 			s32 idx = 0;
 
 			if (ar->type == GF_HEVC_NALU_SEQ_PARAM) {
-				idx = gf_media_hevc_read_sps(sl->data, sl->size, &tile_pid->hevc_state);
+				idx = gf_hevc_read_sps(sl->data, sl->size, &tile_pid->hevc_state);
 				if (idx>=0) {
 					if (!ctx->max_CU_width) {
 						ctx->max_CU_width = tile_pid->hevc_state.sps[idx].max_CU_width;
 					} else if (ctx->max_CU_width != tile_pid->hevc_state.sps[idx].max_CU_width) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Cannot merge tiles not using the same max CU width (%d vs %d)\n", ctx->max_CU_width, tile_pid->hevc_state.sps[idx].max_CU_width));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Cannot merge tiles not using the same max CU width (%d vs %d)\n", ctx->max_CU_width, tile_pid->hevc_state.sps[idx].max_CU_width));
 						e = GF_BAD_PARAM;
 						break;
 					}
 					if (!ctx->max_CU_height) {
 						ctx->max_CU_height = tile_pid->hevc_state.sps[idx].max_CU_height;
 					} else if (ctx->max_CU_height != tile_pid->hevc_state.sps[idx].max_CU_height) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Cannot merge tiles not using the same max CU height (%d vs %d)\n", ctx->max_CU_height, tile_pid->hevc_state.sps[idx].max_CU_height));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCMerge] Cannot merge tiles not using the same max CU height (%d vs %d)\n", ctx->max_CU_height, tile_pid->hevc_state.sps[idx].max_CU_height));
 						e = GF_BAD_PARAM;
 						break;
 					}
 				}
 			}
 			else if (ar->type == GF_HEVC_NALU_VID_PARAM) {
-				idx = gf_media_hevc_read_vps(sl->data, sl->size, &tile_pid->hevc_state);
+				idx = gf_hevc_read_vps(sl->data, sl->size, &tile_pid->hevc_state);
 			}
 			else if (ar->type == GF_HEVC_NALU_PIC_PARAM) {
-				idx = gf_media_hevc_read_pps(sl->data, sl->size, &tile_pid->hevc_state);
+				idx = gf_hevc_read_pps(sl->data, sl->size, &tile_pid->hevc_state);
 			}
 			if (idx < 0) {
 				// WARNING
@@ -1300,7 +1301,7 @@
 		if (p->value.vec2i.x>0) {
 			pos_x = p->value.vec2i.x / ctx->max_CU_width;
 			if (pos_x * ctx->max_CU_width != p->value.vec2i.x) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVCMerge] CropOrigin X %d is not a multiple of max CU width %d, adjusting to next boundary\n", p->value.vec2i.x, ctx->max_CU_width));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] CropOrigin X %d is not a multiple of max CU width %d, adjusting to next boundary\n", p->value.vec2i.x, ctx->max_CU_width));
 				pos_x++;
 			}
 			pos_x *= ctx->max_CU_width;
@@ -1311,7 +1312,7 @@
 		if (p->value.vec2i.y>0) {
 			pos_y = p->value.vec2i.y / ctx->max_CU_height;
 			if (pos_y * ctx->max_CU_height != p->value.vec2i.y) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVCMerge] CropOrigin Y %d is not a multiple of max CU height %d, adjusting to next boundary\n", p->value.vec2i.y, ctx->max_CU_height));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] CropOrigin Y %d is not a multiple of max CU height %d, adjusting to next boundary\n", p->value.vec2i.y, ctx->max_CU_height));
 				pos_y++;
 			}
 			pos_y *= ctx->max_CU_height;
@@ -1407,7 +1408,7 @@
 		}
 		dts = gf_filter_pck_get_dts(pck_src);
 
-		if (dts * min_dts_timescale < min_dts * tile_pid->timescale) {
+		if (!min_dts_timescale || gf_timestamp_less(dts, tile_pid->timescale, min_dts, min_dts_timescale)) {
 			min_dts = dts;
 			min_dts_timescale = tile_pid->timescale;
 		}
@@ -1429,13 +1430,13 @@
 		if (nb_eos) {
 			if (pck_src) {
 				tile_pid->nb_pck++;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVCMerge] pids of unequal duration, skipping packet %d on pid %d\n", tile_pid->nb_pck, i+1));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] pids of unequal duration, skipping packet %d on pid %d\n", tile_pid->nb_pck, i+1));
 				gf_filter_pid_drop_packet(tile_pid->pid);
 			}
 			continue;
 		}
 		if (!pck_src) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVCMerge] no data on pid %d while merging, eos detected %d\n", i+1, gf_filter_pid_is_eos(tile_pid->pid) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] no data on pid %d while merging, eos detected %d\n", i+1, gf_filter_pid_is_eos(tile_pid->pid) ));
 			continue;
 		}
 
@@ -1459,14 +1460,14 @@
 
 			nal_length = gf_bs_read_int(ctx->bs_au_in, tile_pid->nalu_size_length * 8);
 			pos = (u32) gf_bs_get_position(ctx->bs_au_in);
-			gf_media_hevc_parse_nalu(data + pos, nal_length, &tile_pid->hevc_state, &nal_unit_type, &temporal_id, &layer_id);
+			gf_hevc_parse_nalu(data + pos, nal_length, &tile_pid->hevc_state, &nal_unit_type, &temporal_id, &layer_id);
 			gf_bs_skip_bytes(ctx->bs_au_in, nal_length); //skip nal in bs
 
 			//VCL nal, rewrite slice header
 			if (nal_unit_type < 32) {
 				if (!i) current_poc = tile_pid->hevc_state.s_info.poc;
 				else if (current_poc != tile_pid->hevc_state.s_info.poc) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVCMerge] merging AU %u with different POC (%d vs %d), undefined results.\n", tile_pid->nb_pck, current_poc, tile_pid->hevc_state.s_info.poc));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVCMerge] merging AU %u with different POC (%d vs %d), undefined results.\n", tile_pid->nb_pck, current_poc, tile_pid->hevc_state.s_info.poc));
 				}
 
 				nal_pck_size = hevcmerge_rewrite_slice(ctx, tile_pid, data + pos, nal_length);
@@ -1474,7 +1475,7 @@
 			}
 			//NON-vcl, copy for SEI or drop (we should not have any SPS/PPS/VPS in the bitstream, they are in the decoder config prop)
 			else {
-				gf_media_hevc_parse_nalu(data + pos, nal_length, &tile_pid->hevc_state, &nal_unit_type, &temporal_id, &layer_id);
+				gf_hevc_parse_nalu(data + pos, nal_length, &tile_pid->hevc_state, &nal_unit_type, &temporal_id, &layer_id);
 				// Copy SEI_PREFIX only for the first sample.
 				if (nal_unit_type == GF_HEVC_NALU_SEI_PREFIX && !found_sei_prefix) {
 					found_sei_prefix = GF_TRUE;
@@ -1496,6 +1497,8 @@
 			}
 			if (!output_pck) {
 				output_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->hevc_nalu_size_length + nal_pck_size, &output_nal);
+				if (!output_pck) return GF_OUT_OF_MEM;
+				
 				// todo: might need to rewrite crypto info
 				gf_filter_pck_merge_properties(pck_src, output_pck);
 			}
@@ -1530,7 +1533,7 @@
 
 static GF_Err hevcmerge_initialize(GF_Filter *filter)
 {
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVCMerge] hevcmerge_initialize started.\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[HEVCMerge] hevcmerge_initialize started.\n"));
 	GF_HEVCMergeCtx *ctx = (GF_HEVCMergeCtx *)gf_filter_get_udta(filter);
 	ctx->bs_au_in = gf_bs_new((char *)ctx, 1, GF_BITSTREAM_READ);
 	ctx->bs_nal_in = gf_bs_new((char *)ctx, 1, GF_BITSTREAM_READ);
@@ -1541,7 +1544,7 @@
 
 static void hevcmerge_finalize(GF_Filter *filter)
 {
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVCMerge] hevcmerge_finalize.\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[HEVCMerge] hevcmerge_finalize.\n"));
 	GF_HEVCMergeCtx *ctx = (GF_HEVCMergeCtx *)gf_filter_get_udta(filter);
 	if (ctx->buffer_nal) gf_free(ctx->buffer_nal);
 	if (ctx->buffer_nal_no_epb) gf_free(ctx->buffer_nal_no_epb);
@@ -1576,7 +1579,7 @@
 
 static const GF_FilterArgs HEVCMergeArgs[] =
 {
-	{ OFFS(strict), "strict comparison of SPS and PPS of input pids - see filter help", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(strict), "strict comparison of SPS and PPS of input PIDs", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(mrows), "signal multiple rows in tile grid when possible", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };
@@ -1589,36 +1592,37 @@
 		"If [-mrows]() is set and tiles properly align on the final grid, multiple rows will be declared in the PPS.\n"
 		"Positioning of tiles can be automatic (implicit) or explicit.\n"
 		"The filter will check the SPS and PPS configurations of input PID and warn if they are not aligned but will still process them unless [-strict]() is set.\n"
-		"The filter assumes that all input PIDs are synchronized (frames share the same timestamp) and will reassemble frames with the same dts. If pids are of unequal duration, the filter will drop frames as soon as one pid is over.\n"
+		"The filter assumes that all input PIDs are synchronized (frames share the same timestamp) and will reassemble frames with the same decode time. If PIDs are of unequal duration, the filter will drop frames as soon as one PID is over.\n"
 		"## Implicit Positioning\n"
-		"In implicit positioning, results may vary based on the order of input pids declaration.\n"
+		"In implicit positioning, results may vary based on the order of input PIDs declaration.\n"
 		"In this mode the filter will automatically allocate new columns for tiles with height not a multiple of max CU height.\n"
 		"## Explicit Positioning\n"
 		"In explicit positioning, the `CropOrigin` property on input PIDs is used to setup the tile grid. In this case, tiles shall not overlap in the final output.\n"
 		"If `CropOrigin` is used, it shall be set on all input sources.\n"
 		"If positive coordinates are used, they specify absolute positioning in pixels of the tiles. The coordinates are automatically adjusted to the next multiple of max CU width and height.\n"
-		"If negative coordinates are used, they specify relative positioning (eg `0x-1` indicates to place the tile below the tile 0x0).\n"
+		"If negative coordinates are used, they specify relative positioning (e.g. `0x-1` indicates to place the tile below the tile 0x0).\n"
 		"In this mode, it is the caller responsibility to set coordinates so that all tiles in a column have the same width and only the last row/column uses non-multiple of max CU width/height values. The filter will complain and abort if this is not respected.\n"
 		"- If an horizontal blank is detected in the layout, an empty column in the tiling grid will be inserted.\n"
 		"- If a vertical blank is detected in the layout, it is ignored.\n"
 		" \n"
 		"## Spatial Relationship Description (SRD)\n"
 		"\n"
-		"The filter will create an `SRDMap` property in the output PID if `SRDRef` and `SRD`or `CropOrigin` are set on all input PIDs.\n"
+		"The filter will create an `SRDMap` property in the output PID if `SRDRef` and `SRD` or `CropOrigin` are set on all input PIDs.\n"
 		"The `SRDMap` allows forwarding the logical sources `SRD` in the merged PID.\n"
-		"The output pid `SRDRef` is set to the output video size.\n"
+		"The output PID `SRDRef` is set to the output video size.\n"
 		"The input `SRDRef` and `SRD` are usually specified in DASH MPD, but can be manually assigned to inputs.\n"
 		"- `SRDRef` gives the size of the referential used for the input `SRD` (usually matches the original video size, but not always)\n"
 		"- `SRD` gives the size and position of the input in the original video, expressed in `SRDRef` referential of the input.\n"
-		"The inputs do not need to have matching `SRDRef`."
+		"The inputs do not need to have matching `SRDRef`\n."
 		"EX src1:SRD=0x0x640x480:SRDRef=1280x720\n"
 		"This indicates that `src1` contains a video located at 0,0, with a size of 640x480 pixels in a virtual source of 1280x720 pixels.\n"
 		"EX src2:SRD=640x0x640x480:SRDRef=1280x720\n"
 		"This indicates that `src1` contains a video located at 640,0, with a size of 640x480 pixels in a virtual source of 1280x720 pixels.\n"
 		" \n"
-		"Each merged input is described by 8 intergers in the output `SRDMap`:\n"
+		"Each merged input is described by 8 integers in the output `SRDMap`:\n"
 		"- the source `SRD` is rescaled in the output `SRDRef` to form the first part (4 integers) of the `SRDMap` (i.e. __where was the input ?__)\n"
 		"- the source location in the reconstructed video forms the second part (4 integers) of the `SRDMap` (i.e. __where are the input pixels in the output ?__)\n"
+		" \n"
 		"Assuming the two sources are encoded at 320x240 and merged as src2 above src1, the output will be a 320x480 video with a `SRDMap` of {0,160,160,240,0,0,320,240,0,0,160,240,0,240,320,240}\n"
 		"Note: merged inputs are always listed in `SRDMap` in their tile order in the output bitstream.\n"
 		"\n"
@@ -1626,7 +1630,7 @@
 		"- the `CropOrigin` gives the location in the source\n"
 		"- the input size gives the size in the source, and no rescaling of referential is done\n"
 		"EX src1:CropOrigin=0x0 src1:CropOrigin=640x0 \n"
-		"Assuming the two sources are encoded at 320x240 and merged as src1 above src2, the output will be a 320x480 video with a `SRDMap` of {0,0,320,240,0,0,320,240,640,0,320,240,0,240,320,240}\n"
+		"Assuming the two sources are encoded at 320x240 and merged as src1 above src2, the output will be a 320x480 video with a `SRDMap` of `{0,0,320,240,0,0,320,240,640,0,320,240,0,240,320,240}`\n"
 	)
 	.private_size = sizeof(GF_HEVCMergeCtx),
 	SETCAPS(HEVCMergeCaps),

gpac-1.0.1.tar.gz/src/filters/hevcsplit.c -> gpac-2.0.0.tar.gz/src/filters/hevcsplit.c Changed

@@ -4,7 +4,7 @@
 *			Authors: Jean Le Feuvre
 *					 Yacine Mathurin Boubacar Aziakou
 *					 Samir Mustapha
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / HEVC tile split and rewrite filter
@@ -295,7 +295,7 @@
 		hevc_write_profile_tier_level(bs_in, bs_out, 1, max_sub_layers_minus1);
 	}
 
-	gf_bs_set_ue(bs_out, gf_bs_get_ue(bs_in)); //copy sps_id
+	gf_bs_write_ue(bs_out, gf_bs_read_ue(bs_in)); //copy sps_id
 
 	if (multiLayerExtSpsFlag) {
 		u8 update_rep_format_flag = gf_bs_read_int(bs_in, 1);
@@ -305,16 +305,16 @@
 		}
 	}
 	else {
-		chroma_format_idc = gf_bs_get_ue(bs_in);
-		gf_bs_set_ue(bs_out, chroma_format_idc);
+		chroma_format_idc = gf_bs_read_ue(bs_in);
+		gf_bs_write_ue(bs_out, chroma_format_idc);
 		if (chroma_format_idc == 3)
 			gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 1), 1); // copy separate_colour_plane_flag
-		/*w =*/ gf_bs_get_ue(bs_in); //skip width bits in input bitstream
-		/*h =*/ gf_bs_get_ue(bs_in); //skip height bits in input bitstream
+		/*w =*/ gf_bs_read_ue(bs_in); //skip width bits in input bitstream
+		/*h =*/ gf_bs_read_ue(bs_in); //skip height bits in input bitstream
 
 		//Copy the new width and height in output bitstream
-		gf_bs_set_ue(bs_out, width);
-		gf_bs_set_ue(bs_out, height);
+		gf_bs_write_ue(bs_out, width);
+		gf_bs_write_ue(bs_out, height);
 
 		//Get rid of the bit conformance_window_flag
 		conformance_window_flag = gf_bs_read_int(bs_in, 1);
@@ -324,10 +324,10 @@
 		//Skip the bits related to conformance_window_offset
 		if (conformance_window_flag)
 		{
-			gf_bs_get_ue(bs_in);
-			gf_bs_get_ue(bs_in);
-			gf_bs_get_ue(bs_in);
-			gf_bs_get_ue(bs_in);
+			gf_bs_read_ue(bs_in);
+			gf_bs_read_ue(bs_in);
+			gf_bs_read_ue(bs_in);
+			gf_bs_read_ue(bs_in);
 		}
 	}
 
@@ -375,19 +375,19 @@
 
 	//Read and write NAL header bits
 	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 16), 16);
-	gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); //pps_pic_parameter_set_id
-	gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); //pps_seq_parameter_set_id
+	gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); //pps_pic_parameter_set_id
+	gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); //pps_seq_parameter_set_id
 	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 7), 7); //from dependent_slice_segments_enabled_flag to cabac_init_present_flag
-	gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); //num_ref_idx_l0_default_active_minus1
-	gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); //num_ref_idx_l1_default_active_minus1
-	gf_bs_set_se(ctx->bs_nal_out, gf_bs_get_se(ctx->bs_nal_in)); //init_qp_minus26
+	gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); //num_ref_idx_l0_default_active_minus1
+	gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); //num_ref_idx_l1_default_active_minus1
+	gf_bs_write_se(ctx->bs_nal_out, gf_bs_read_se(ctx->bs_nal_in)); //init_qp_minus26
 	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 2), 2); //from constrained_intra_pred_flag to transform_skip_enabled_flag
 	cu_qp_delta_enabled_flag = gf_bs_read_int(ctx->bs_nal_in, 1); //cu_qp_delta_enabled_flag
 	gf_bs_write_int(ctx->bs_nal_out, cu_qp_delta_enabled_flag, 1); //
 	if (cu_qp_delta_enabled_flag)
-		gf_bs_set_ue(ctx->bs_nal_out, gf_bs_get_ue(ctx->bs_nal_in)); // diff_cu_qp_delta_depth
-	gf_bs_set_se(ctx->bs_nal_out, gf_bs_get_se(ctx->bs_nal_in)); // pps_cb_qp_offset
-	gf_bs_set_se(ctx->bs_nal_out, gf_bs_get_se(ctx->bs_nal_in)); // pps_cr_qp_offset
+		gf_bs_write_ue(ctx->bs_nal_out, gf_bs_read_ue(ctx->bs_nal_in)); // diff_cu_qp_delta_depth
+	gf_bs_write_se(ctx->bs_nal_out, gf_bs_read_se(ctx->bs_nal_in)); // pps_cb_qp_offset
+	gf_bs_write_se(ctx->bs_nal_out, gf_bs_read_se(ctx->bs_nal_in)); // pps_cr_qp_offset
 	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 4), 4); // from pps_slice_chroma_qp_offsets_present_flag to transquant_bypass_enabled_flag
 
 	tiles_enabled_flag = gf_bs_read_int(ctx->bs_nal_in, 1); // tiles_enabled_flag
@@ -397,15 +397,15 @@
 
 	//read tile info from source
 	if (tiles_enabled_flag) {
-		u32 num_tile_columns_minus1 = gf_bs_get_ue(ctx->bs_nal_in);
-		u32 num_tile_rows_minus1 = gf_bs_get_ue(ctx->bs_nal_in);
+		u32 num_tile_columns_minus1 = gf_bs_read_ue(ctx->bs_nal_in);
+		u32 num_tile_rows_minus1 = gf_bs_read_ue(ctx->bs_nal_in);
 		u8 uniform_spacing_flag = gf_bs_read_int(ctx->bs_nal_in, 1);
 
 		if (!uniform_spacing_flag) {
 			for (i = 0; i < num_tile_columns_minus1; i++)
-				gf_bs_get_ue(ctx->bs_nal_in);
+				gf_bs_read_ue(ctx->bs_nal_in);
 			for (i = 0; i < num_tile_rows_minus1; i++)
-				gf_bs_get_ue(ctx->bs_nal_in);
+				gf_bs_read_ue(ctx->bs_nal_in);
 		}
 		gf_bs_read_int(ctx->bs_nal_in, 1);
 	}
@@ -495,8 +495,8 @@
 		gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 1), 1);
 	}
 
-	pps_id = gf_bs_get_ue(ctx->bs_nal_in);					 //pps_id
-	gf_bs_set_ue(ctx->bs_nal_out, pps_id);
+	pps_id = gf_bs_read_ue(ctx->bs_nal_in);					 //pps_id
+	gf_bs_write_ue(ctx->bs_nal_out, pps_id);
 
 	pps = &hevc->pps[pps_id];
 	sps = &hevc->sps[pps->sps_id];
@@ -534,7 +534,7 @@
 	//read byte_alignment() is bit=1 + x bit=0
 	al = gf_bs_read_int(ctx->bs_nal_in, 1);
 	if (al != 1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCTileSplit] source slice header not properly aligned\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVCTileSplit] source slice header not properly aligned\n"));
 	}
 
 	//write byte_alignment() is bit=1 + x bit=0
@@ -574,7 +574,7 @@
 	u32 buf_size;
 	HEVCState *hevc = &ctx->hevc_state;
 
-	gf_media_hevc_parse_nalu(in_nal, in_nal_size, hevc, &nal_unit_type, &temporal_id, &layer_id);
+	gf_hevc_parse_nalu(in_nal, in_nal_size, hevc, &nal_unit_type, &temporal_id, &layer_id);
 	switch (nal_unit_type) {
 	//all VCL nal, remove slice address
 	case GF_HEVC_NALU_SLICE_TRAIL_N:
@@ -615,10 +615,10 @@
 
 	// for all the list objects in param_array
 	for (i = 0; i < gf_list_count(hvcc->param_array); i++) { // hvcc->param_array:list object
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(hvcc->param_array, i); // ar contains the i-th item in param_array
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *)gf_list_get(hvcc->param_array, i); // ar contains the i-th item in param_array
 		for (j = 0; j < gf_list_count(ar->nalus); j++) { // for all the nalus the i-th param got
 			/*! used for storing AVC sequenceParameterSetNALUnit and pictureParameterSetNALUnit*/
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j); // store j-th nalus in *sl
+			GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j); // store j-th nalus in *sl
 
 			if (ar->type == GF_HEVC_NALU_SEQ_PARAM) {
 				char *outSPS=NULL;
@@ -675,13 +675,8 @@
 			HEVCTilePid *tpid;
 			opid = gf_filter_get_opid(filter, i);
 			tpid = gf_filter_pid_get_udta(opid);
-
-			if (tpid->opid) {
-				gf_filter_pid_remove(tpid->opid);
-				tpid->opid = NULL;
-			}
 			if (tpid) gf_free(tpid);
-			if(opid){
+			if (opid) {
 				gf_filter_pid_set_udta(opid, NULL);
 				gf_filter_pid_remove(opid);
 			}
@@ -722,24 +717,24 @@
 
 	for (i = 0; i < gf_list_count(hvcc->param_array); i++) { // hvcc->param_array:list object
 		// ar contains the i-th item in param_array
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(hvcc->param_array, i);
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *)gf_list_get(hvcc->param_array, i);
 		for (j = 0; j < gf_list_count(ar->nalus); j++) { // for all the nalus the i-th param got
 			/*! used for storing AVC sequenceParameterSetNALUnit and pictureParameterSetNALUnit*/
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j); // store j-th nalus in *sl
+			GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j); // store j-th nalus in *sl
 			s32 idx;
 
 			if (ar->type == GF_HEVC_NALU_SEQ_PARAM) {
-				idx = gf_media_hevc_read_sps(sl->data, sl->size, &ctx->hevc_state);
+				idx = gf_hevc_read_sps(sl->data, sl->size, &ctx->hevc_state);
 				if ((idx >= 0) && sps_id<0)
 					sps_id = idx;
 			}
 			else if (ar->type == GF_HEVC_NALU_PIC_PARAM) {
-				s32 id = gf_media_hevc_read_pps(sl->data, sl->size, &ctx->hevc_state);
+				s32 id = gf_hevc_read_pps(sl->data, sl->size, &ctx->hevc_state);
 				if ((id >= 0) && pps_id<0)
 					pps_id = id;
 			}
 			else if (ar->type == GF_HEVC_NALU_VID_PARAM) {
-				/*s32 id = */ gf_media_hevc_read_vps(sl->data, sl->size, &ctx->hevc_state);
+				/*s32 id = */ gf_hevc_read_vps(sl->data, sl->size, &ctx->hevc_state);
 			}
 		}
 	}
@@ -752,7 +747,7 @@
 	o_height = ctx->hevc_state.sps[sps_id].height;
 	ctx->num_tiles = ctx->hevc_state.pps[pps_id].num_tile_rows * ctx->hevc_state.pps[pps_id].num_tile_columns;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[HEVCTileSplit] Input stream %dx%d with %d tiles:\n", o_width, o_height, ctx->num_tiles));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[HEVCTileSplit] Input stream %dx%d with %d tiles:\n", o_width, o_height, ctx->num_tiles));
 
 	// Done with parsing SPS/pps/vps
 	u32 rows = ctx->hevc_state.pps[pps_id].num_tile_rows;
@@ -783,7 +778,7 @@
 			e = hevcsplit_rewrite_dsi(ctx, tpid->opid, dsi->value.data.ptr, dsi->value.data.size, tpid->width, tpid->height);
 			if (e) return e;
 
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[HEVCTileSplit] output pid %dx%d (position was %dx%d)\n", tpid->width, tpid->height, tpid->orig_x, tpid->orig_y));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[HEVCTileSplit] output pid %dx%d (position was %dx%d)\n", tpid->width, tpid->height, tpid->orig_x, tpid->orig_y));
 		}
 	}
 	// reaggregate to form complete frame.
@@ -805,6 +800,10 @@
 	GF_FilterPacket *pck_src = gf_filter_pid_get_packet(ctx->ipid);
 	if (!pck_src) {
 		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			for (i=0; i < ctx->num_tiles; i++) {
+				opid = gf_filter_get_opid(filter, i);
+				gf_filter_pid_set_eos(opid);
+			}
 			return GF_EOS;
 		}
 		return GF_OK;
@@ -818,7 +817,7 @@
 	/*create a bitstream reader for the whole packet*/
 	gf_bs_reassign_buffer(ctx->bs_au_in, data, data_size);
 	ctx->nb_pck++;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVCTileSplit] splitting frame %d DTS "LLU" CTS "LLU"\n", ctx->nb_pck, gf_filter_pck_get_dts(pck_src), gf_filter_pck_get_cts(pck_src)));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[HEVCTileSplit] splitting frame %d DTS "LLU" CTS "LLU"\n", ctx->nb_pck, gf_filter_pck_get_dts(pck_src), gf_filter_pck_get_cts(pck_src)));
 
 	while (gf_bs_available(ctx->bs_au_in)) {
 		u8 *rewritten_nal;
@@ -828,7 +827,7 @@
 		// skip the content of the nal from bs to buffer (useful for the next nal)
 		gf_bs_skip_bytes(ctx->bs_au_in, nal_length);
 		// data+pos is an address
-		gf_media_hevc_parse_nalu(data+pos, nal_length, &ctx->hevc_state, &nal_unit_type, &temporal_id, &layer_id);
+		gf_hevc_parse_nalu(data+pos, nal_length, &ctx->hevc_state, &nal_unit_type, &temporal_id, &layer_id);
 
 		// todo: might need to rewrite crypto info
 
@@ -846,6 +845,8 @@
 				}
 				if (!tpid->cur_pck) {
 					tpid->cur_pck = gf_filter_pck_new_alloc(tpid->opid, ctx->hevc_nalu_size_length + out_nal_size, &output_nal);
+					if (!tpid->cur_pck) return GF_OUT_OF_MEM;
+
 					gf_filter_pck_merge_properties(pck_src, tpid->cur_pck);
 				} else {
 					u8 *data_start;
@@ -862,6 +863,8 @@
 			}
 			if (!tpid->cur_pck) {
 				tpid->cur_pck = gf_filter_pck_new_alloc(tpid->opid, ctx->hevc_nalu_size_length + out_nal_size, &output_nal);
+				if (!tpid->cur_pck) return GF_OUT_OF_MEM;
+
 				gf_filter_pck_merge_properties(pck_src, tpid->cur_pck);
 			} else {
 				u8 *data_start;
@@ -921,6 +924,7 @@
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC)
 };
@@ -934,7 +938,7 @@
 
 GF_FilterRegister HEVCSplitRegister = {
 	.name = "hevcsplit",
-	GF_FS_SET_DESCRIPTION("HEVC tile spliter")
+	GF_FS_SET_DESCRIPTION("HEVC tile splitter")
 	GF_FS_SET_HELP("This filter splits a motion-constrained tiled HEVC PID into N independent HEVC PIDs.\n"
 			"Use hevcmerge filter to merge initially motion-constrained tiled HEVC PID in a single output.")
 	.private_size = sizeof(GF_HEVCSplitCtx),

gpac-1.0.1.tar.gz/src/filters/in_dvb4linux.c -> gpac-2.0.0.tar.gz/src/filters/in_dvb4linux.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / DVB4Linux input filter
@@ -97,11 +97,11 @@
 	u32 adapter_num;
 
 	if (!ctx->src) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[DVB4Lin] Missing URL\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[DVB4Lin] Missing URL\n"));
 		return GF_BAD_PARAM;
 	}
 	if (!ctx->chcfg) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[DVB4Lin] Missing channels config file\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[DVB4Lin] Missing channels config file\n"));
 		return GF_BAD_PARAM;
 	}
 	chanfile = gf_fopen(ctx->chcfg, "rb");
@@ -117,7 +117,7 @@
 	} else {
 		adapter_num = 0;
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Channel name %s\n", chan_name));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("Channel name %s\n", chan_name));
 
 	while(!gf_feof(chanfile)) {
 		if ( gf_fgets(line, 255, chanfile) != NULL) {
@@ -200,17 +200,17 @@
 #ifndef GPAC_SIM_LINUX_DVB
 	// Open frontend
 	if((front1 = open(frontend_name,O_RDWR|O_NONBLOCK)) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Cannot open frontend %s.\n", frontend_name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Cannot open frontend %s.\n", frontend_name));
 		return GF_IO_ERR;
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Frontend %s opened.\n", frontend_name));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("Frontend %s opened.\n", frontend_name));
 	}
 	// Open demuxes
 	if ((demux1=open(demux_name, O_RDWR|O_NONBLOCK)) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Cannot open demux %s\n", demux_name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Cannot open demux %s\n", demux_name));
 		return GF_IO_ERR;
 	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Demux %s opened.\n", demux_name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Demux %s opened.\n", demux_name));
 	}
 	// Set FrontendParameters - DVB-T
 	frp.frequency = ctx->freq;
@@ -288,19 +288,19 @@
 	GF_Err e = GF_OK;
 
 	if (!ctx->chcfg) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[DVB4Lin] Missing channels config file\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[DVB4Lin] Missing channels config file\n"));
 		return GF_BAD_PARAM;
 	}
 	if (strnicmp(ctx->src, "dvb://", 6)) return GF_NOT_SUPPORTED;
 
 	if ((ctx->freq != 0) && (ctx->freq == gf_dvblin_get_freq_from_url(ctx, ctx->src)) ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Tuner already tuned to that frequency\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[M2TSDemux] Tuner already tuned to that frequency\n"));
 		return GF_OK;
 	}
 
 	e = dvblin_tune(ctx);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Unable to tune to frequency\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[M2TSDemux] Unable to tune to frequency\n"));
 		return GF_SERVICE_ERROR;
 	}
 	return GF_OK;
@@ -318,11 +318,11 @@
 	e = dvblin_setup_demux(ctx);
 
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[DVBLinux] Failed to open %s\n", ctx->src));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[DVBLinux] Failed to open %s\n", ctx->src));
 		gf_filter_setup_failure(filter, e);
 		return GF_URL_ERROR;
 	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[DVBLinux] opening %s\n", ctx->src));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[DVBLinux] opening %s\n", ctx->src));
 
 	ctx->block = gf_malloc(ctx->block_size +1);
 	return GF_OK;
@@ -381,6 +381,7 @@
 #endif
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->pid, nb_read, &out_data);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 	memcpy(out_data, ctx->block, nb_read);
 	gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
 	gf_filter_pck_send(dst_pck);
@@ -403,7 +404,7 @@
 
 static const GF_FilterArgs DVBLinuxArgs[] =
 {
-	{ OFFS(src), "location of source content", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(src), "URL of source content", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(block_size), "block size used to read file", GF_PROP_UINT, "65536", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(chcfg), "path to channels.conf file", GF_PROP_NAME, NULL, NULL, 0},
 	{0}
@@ -412,7 +413,12 @@
 GF_FilterRegister DVBLinuxRegister = {
 	.name = "dvbin",
 	GF_FS_SET_DESCRIPTION("DVB for Linux")
-	GF_FS_SET_HELP("Experimental DVB support for linux, requires a channel config file through [-chcfg]()")
+	GF_FS_SET_HELP("Experimental DVB support for linux, requires a channel config file through [-chcfg]()\n"
+	" \n"
+	"The URL syntax is `dvb://CHANNAME[@FRONTEND]`, with:\n"
+	" - CHANNAME: the channel name as listed in the channel config file\n"
+	" - frontend: the index of the DVB adapter to use (optional, default is 0)\n"
+	)
 	.args = DVBLinuxArgs,
 #ifdef GPAC_HAS_LINUX_DVB
 	.private_size = sizeof(GF_DVBLinuxCtx),

gpac-1.0.1.tar.gz/src/filters/in_file.c -> gpac-2.0.0.tar.gz/src/filters/in_file.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / generic FILE input filter
@@ -133,7 +133,7 @@
 	}
 
 	if (!ctx->file) {
-		ctx->file = gf_fopen_ex(src, prev_url, "rb");
+		ctx->file = gf_fopen_ex(src, prev_url, "rb", GF_FALSE);
 	}
 
 	if (old_file) {
@@ -219,12 +219,16 @@
 	if (!strcmp(url, "null")) return GF_FPROBE_SUPPORTED;
 	if (!strcmp(url, "rand")) return GF_FPROBE_SUPPORTED;
 	if (!strcmp(url, "randsc")) return GF_FPROBE_SUPPORTED;
+	if (!strncmp(src, "isobmff://", 10)) return GF_FPROBE_SUPPORTED;
 	if (!strncmp(url, "gfio://", 7)) {
 		GF_FileIO *gfio = gf_fileio_from_url(url);
 		if (gfio && gf_fileio_read_mode(gfio))
 			return GF_FPROBE_SUPPORTED;
 		return GF_FPROBE_NOT_SUPPORTED;
 	}
+	if (strstr(src, "://"))
+		return GF_FPROBE_NOT_SUPPORTED;
+
 
 	//strip any fragment identifer
 	ext_start = gf_file_ext_start(url);
@@ -310,6 +314,16 @@
 		filein_initialize(filter);
 		gf_filter_post_process_task(filter);
 		break;
+	case GF_FEVT_FILE_DELETE:
+		if (ctx->is_end && !strcmp(evt->file_del.url, "__gpac_self__")) {
+			if (ctx->file) {
+				gf_fclose(ctx->file);
+				ctx->file = NULL;
+			}
+			gf_file_delete(ctx->src);
+		}
+		break;
+
 	default:
 		break;
 	}
@@ -340,13 +354,14 @@
 	if (ctx->pck_out)
 		return GF_EOS;
 	if (ctx->pid && gf_filter_pid_would_block(ctx->pid)) {
-		assert(0);
 		return GF_OK;
 	}
 
 	if (ctx->full_file_only && ctx->pid && !ctx->do_reconfigure && ctx->cached_set) {
-		ctx->is_end = GF_TRUE;
 		pck = gf_filter_pck_new_shared(ctx->pid, ctx->block, 0, filein_pck_destructor);
+		if (!pck) return GF_OUT_OF_MEM;
+
+		ctx->is_end = GF_TRUE;
 		gf_filter_pck_set_framing(pck, ctx->file_pos ? GF_FALSE : GF_TRUE, ctx->is_end);
 		gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
 		ctx->pck_out = GF_TRUE;
@@ -414,8 +429,7 @@
 			if (e) return e;
 		}
 		pck = gf_filter_pck_new_shared(ctx->pid, ctx->block, ctx->block_size, filein_pck_destructor);
-		if (!pck)
-			return GF_OK;
+		if (!pck) return GF_OUT_OF_MEM;
 
 		gf_filter_pck_set_framing(pck, ctx->file_pos ? GF_FALSE : GF_TRUE, GF_FALSE);
 		gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
@@ -497,14 +511,16 @@
 	}
 
 	pck = gf_filter_pck_new_shared(ctx->pid, ctx->block, nb_read, filein_pck_destructor);
-	if (!pck)
-		return GF_OK;
+	if (!pck) return GF_OUT_OF_MEM;
 
 	gf_filter_pck_set_byte_offset(pck, ctx->file_pos);
 
 	if (ctx->file_size && (ctx->file_pos + nb_read == ctx->file_size)) {
 		ctx->is_end = GF_TRUE;
 		gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT(ctx->file_size) );
+	} else if (ctx->end_pos && (ctx->file_pos + nb_read == ctx->end_pos)) {
+		ctx->is_end = GF_TRUE;
+		gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT(ctx->range.den - ctx->range.num) );
 	} else {
 		if (nb_read < to_read) {
 			Bool is_eof;
@@ -549,7 +565,7 @@
 
 static const GF_FilterArgs FileInArgs[] =
 {
-	{ OFFS(src), "location of source content", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(src), "location of source file", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(block_size), "block size used to read file. 0 means 5000 if file less than 500m, 1M otherwise", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(range), "byte range", GF_PROP_FRACTION64, "0-0", NULL, 0},
 	{ OFFS(ext), "override file extension", GF_PROP_NAME, NULL, NULL, 0},
@@ -571,13 +587,14 @@
 	"Note: Unless disabled at session level (see [-no-probe](CORE) ), file extensions are usually ignored and format probing is done on the first data block.\n"
 	"The special file name `null` is used for creating a file with no data, needed by some filters such as [dasher](dasher).\n"
 	"The special file name `rand` is used to generate random data.\n"
-	"The special file name `randsc` is used to generate random data with fake startcodes (0x000001).\n"
+	"The special file name `randsc` is used to generate random data with `0x000001` start-code prefix.\n"
 	"\n"
 	"The filter handles both files and GF_FileIO objects as input URL.\n"
 	)
 	.private_size = sizeof(GF_FileInCtx),
 	.args = FileInArgs,
 	.initialize = filein_initialize,
+	.flags = GF_FS_REG_FORCE_REMUX,
 	SETCAPS(FileInCaps),
 	.finalize = filein_finalize,
 	.process = filein_process,

gpac-1.0.1.tar.gz/src/filters/in_http.c -> gpac-2.0.0.tar.gz/src/filters/in_http.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / HTTP input filter using GPAC http stack
@@ -34,9 +34,18 @@
 	GF_HTTPIN_STORE_DISK=0,
 	GF_HTTPIN_STORE_DISK_KEEP,
 	GF_HTTPIN_STORE_MEM,
+	GF_HTTPIN_STORE_MEM_KEEP,
 	GF_HTTPIN_STORE_NONE,
+	GF_HTTPIN_STORE_NONE_KEEP,
 } GF_HTTPInStoreMode;
 
+enum
+{
+	HTTP_PCK_NONE=0,
+	HTTP_PCK_OUT=1,
+	HTTP_PCK_OUT_EOS=2,
+};
+
 typedef struct
 {
 	//options
@@ -57,13 +66,17 @@
 	GF_DownloadSession *sess;
 
 	char *block;
-	Bool pck_out, is_end;
+	u32 pck_out;
+	Bool is_end;
 	u64 nb_read, file_size;
 	FILE *cached;
+	u32 blob_size;
 
 	Bool do_reconfigure;
 	Bool full_file_only;
 	GF_Err last_state;
+	Bool is_source_switch;
+	Bool prev_was_init_segment;
 } GF_HTTPInCtx;
 
 static void httpin_notify_error(GF_Filter *filter, GF_HTTPInCtx *ctx, GF_Err e)
@@ -93,9 +106,20 @@
 	ctx->block = gf_malloc(ctx->block_size +1);
 
 	flags = GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_PERSISTENT;
-	if (ctx->cache==GF_HTTPIN_STORE_MEM) flags |= GF_NETIO_SESSION_MEMORY_CACHE;
-	else if (ctx->cache==GF_HTTPIN_STORE_NONE) flags |= GF_NETIO_SESSION_NOT_CACHED;
-	else if (ctx->cache==GF_HTTPIN_STORE_DISK_KEEP) flags |= GF_NETIO_SESSION_KEEP_CACHE;
+	if (ctx->cache==GF_HTTPIN_STORE_MEM)
+		flags |= GF_NETIO_SESSION_MEMORY_CACHE;
+	else if (ctx->cache==GF_HTTPIN_STORE_NONE)
+		flags |= GF_NETIO_SESSION_NOT_CACHED;
+	else if (ctx->cache==GF_HTTPIN_STORE_DISK_KEEP)
+		flags |= GF_NETIO_SESSION_KEEP_CACHE;
+	else if (ctx->cache==GF_HTTPIN_STORE_MEM_KEEP) {
+		flags |= GF_NETIO_SESSION_MEMORY_CACHE|GF_NETIO_SESSION_KEEP_FIRST_CACHE;
+		ctx->cache = GF_HTTPIN_STORE_MEM;
+	}
+	else if (ctx->cache==GF_HTTPIN_STORE_NONE_KEEP) {
+		flags |= GF_NETIO_SESSION_NOT_CACHED|GF_NETIO_SESSION_MEMORY_CACHE|GF_NETIO_SESSION_KEEP_FIRST_CACHE;
+		ctx->cache = GF_HTTPIN_STORE_NONE;
+	}
 
 	server = strstr(ctx->src, "://");
 	if (server) server += 3;
@@ -110,7 +134,7 @@
 		ctx->initial_ack_done = GF_TRUE;
 		return e;
 	}
-	if (ctx->range.den) {
+	if (ctx->range.num || ctx->range.den) {
 		gf_dm_sess_set_range(ctx->sess, ctx->range.num, ctx->range.den, GF_TRUE);
 	}
 
@@ -122,6 +146,18 @@
 	return GF_OK;
 }
 
+
+static void httpin_set_eos(GF_HTTPInCtx *ctx)
+{
+	//no pending packets, signal eos right away
+	if (!ctx->pck_out) {
+		gf_filter_pid_set_eos(ctx->pid);
+	}
+	else
+		ctx->pck_out = HTTP_PCK_OUT_EOS;
+}
+
+
 void httpin_finalize(GF_Filter *filter)
 {
 	GF_HTTPInCtx *ctx = (GF_HTTPInCtx *) gf_filter_get_udta(filter);
@@ -140,6 +176,18 @@
 	return GF_FPROBE_NOT_SUPPORTED;
 }
 
+static void httpin_rel_pck(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_HTTPInCtx *ctx = (GF_HTTPInCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->pck_out==HTTP_PCK_OUT_EOS) {
+		gf_filter_pid_set_eos(ctx->pid);
+	}
+	ctx->pck_out = HTTP_PCK_NONE;
+	//ready to process again
+	gf_filter_post_process_task(filter);
+}
+
 static Bool httpin_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
 {
 	GF_Err e;
@@ -148,20 +196,22 @@
 	if (evt->base.on_pid && (evt->base.on_pid != ctx->pid)) return GF_FALSE;
 
 	switch (evt->base.type) {
+	//we only check PLAY for full_file_only hint
 	case GF_FEVT_PLAY:
-		ctx->is_end = GF_FALSE;
 		ctx->full_file_only = evt->play.full_file_only;
+		//do NOT reset is_end to false, restarting the session is always done via a source_seek event
 		return GF_TRUE;
 	case GF_FEVT_STOP:
 		if (!ctx->is_end) {
-			//abort session
-			gf_filter_pid_set_eos(ctx->pid);
 			ctx->is_end = GF_TRUE;
+			//abort session
 			if (ctx->sess) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPIn] Stop requested, aborting download %s (pck out %d) this %p\n", ctx->src, ctx->pck_out, ctx) );
 				gf_dm_sess_abort(ctx->sess);
 				gf_dm_sess_del(ctx->sess);
 				ctx->sess = NULL;
 			}
+			httpin_set_eos(ctx);
 		}
 		return GF_TRUE;
 	case GF_FEVT_SOURCE_SEEK:
@@ -186,21 +236,56 @@
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPIn] Requested seek outside file range !\n") );
 			ctx->is_end = GF_TRUE;
-			gf_filter_pid_set_eos(ctx->pid);
+
+			httpin_set_eos(ctx);
 		}
 		return GF_TRUE;
 	case GF_FEVT_SOURCE_SWITCH:
-		assert(ctx->is_end);
-		assert(!ctx->pck_out);
 		if (evt->seek.source_switch) {
-			if (ctx->src && ctx->sess && (ctx->cache!=GF_HTTPIN_STORE_DISK_KEEP) && !evt->seek.previous_is_init_segment) {
+			assert(ctx->is_end);
+			assert(!ctx->pck_out);
+			if (ctx->src && ctx->sess && (ctx->cache!=GF_HTTPIN_STORE_DISK_KEEP) && !ctx->prev_was_init_segment) {
 				gf_dm_delete_cached_file_entry_session(ctx->sess, ctx->src);
 			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPIn] Switch from %s to %s\n", gf_file_basename(ctx->src), gf_file_basename(evt->seek.source_switch) ));
 			if (ctx->src) gf_free(ctx->src);
 			ctx->src = gf_strdup(evt->seek.source_switch);
+		} else {
+			if (!ctx->is_end) {
+				gf_filter_pid_set_eos(ctx->pid);
+				ctx->is_end = GF_TRUE;
+				if (ctx->sess) {
+					gf_dm_sess_abort(ctx->sess);
+					gf_dm_sess_del(ctx->sess);
+					ctx->sess = NULL;
+				}
+			}
+			if (ctx->src) gf_free(ctx->src);
+			ctx->src = NULL;
+			return GF_TRUE;
 		}
 		if (ctx->cached) gf_fclose(ctx->cached);
 		ctx->cached = NULL;
+		ctx->blob_size = 0;
+		ctx->is_source_switch = GF_TRUE;
+		ctx->prev_was_init_segment = GF_FALSE;
+
+		//handle isobmff:// url
+		if (!strncmp(ctx->src, "isobmff://", 10)) {
+			GF_FilterPacket *pck;
+			gf_filter_pid_raw_new(filter, ctx->src, ctx->src, NULL, NULL, NULL, 0, GF_FALSE, &ctx->pid);
+			ctx->is_end = GF_TRUE;
+			pck = gf_filter_pck_new_shared(ctx->pid, ctx->block, 0, httpin_rel_pck);
+			if (!pck) return GF_TRUE;
+			gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
+
+			ctx->pck_out = GF_TRUE;
+			gf_filter_pck_send(pck);
+
+			gf_filter_pid_set_eos(ctx->pid);
+			return GF_TRUE;
+		}
+		ctx->prev_was_init_segment = evt->seek.is_init_segment;
 
 		//abort type
 		if (evt->seek.start_offset == (u64) -1) {
@@ -208,7 +293,7 @@
 				if (ctx->sess)
 					gf_dm_sess_abort(ctx->sess);
 				ctx->is_end = GF_TRUE;
-				gf_filter_pid_set_eos(ctx->pid);
+				httpin_set_eos(ctx);
 			}
 			ctx->nb_read = 0;
 			ctx->last_state = GF_OK;
@@ -216,20 +301,30 @@
 		}
 		ctx->last_state = GF_OK;
 		if (ctx->sess) {
+			if ((ctx->cache==GF_HTTPIN_STORE_MEM) && evt->seek.is_init_segment)
+				gf_dm_sess_force_memory_mode(ctx->sess, 2);
 			e = gf_dm_sess_setup_from_url(ctx->sess, ctx->src, evt->seek.skip_cache_expiration);
 		} else {
 			u32 flags;
 
 			flags = GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_PERSISTENT;
-			if (ctx->cache==GF_HTTPIN_STORE_MEM) flags |= GF_NETIO_SESSION_MEMORY_CACHE;
+			if (ctx->cache==GF_HTTPIN_STORE_MEM) {
+				flags |= GF_NETIO_SESSION_MEMORY_CACHE;
+				if (evt->seek.is_init_segment)
+					flags |= GF_NETIO_SESSION_KEEP_FIRST_CACHE;
+			}
 			else if (ctx->cache==GF_HTTPIN_STORE_NONE) flags |= GF_NETIO_SESSION_NOT_CACHED;
 
 			ctx->sess = gf_dm_sess_new(ctx->dm, ctx->src, flags, NULL, NULL, &e);
 		}
 
-		if (!e) e = gf_dm_sess_set_range(ctx->sess, evt->seek.start_offset, evt->seek.end_offset, GF_TRUE);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPIn] Cannot resetup session from URL %s: %s\n", ctx->src, gf_error_to_string(e) ) );
+		if (!e && (evt->seek.start_offset || evt->seek.end_offset))
+            e = gf_dm_sess_set_range(ctx->sess, evt->seek.start_offset, evt->seek.end_offset, GF_TRUE);
+		
+        if (e) {
+			//use info and not error, as source switch is done by dashin and can be scheduled too early in live cases
+			//but recovered later, so we let DASH report the error
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPIn] Cannot resetup session from URL %s: %s\n", ctx->src, gf_error_to_string(e) ) );
 			httpin_notify_error(filter, ctx, e);
 			ctx->is_end = GF_TRUE;
 			if (ctx->src) gf_free(ctx->src);
@@ -241,6 +336,7 @@
 		ctx->is_end = GF_FALSE;
 		ctx->last_state = GF_OK;
 		gf_filter_post_process_task(filter);
+		gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(GF_FALSE) );
 		return GF_TRUE;
 	default:
 		break;
@@ -248,13 +344,7 @@
 	return GF_TRUE;
 }
 
-static void httpin_rel_pck(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
-{
-	GF_HTTPInCtx *ctx = (GF_HTTPInCtx *) gf_filter_get_udta(filter);
-	ctx->pck_out = GF_FALSE;
-	//ready to process again
-	gf_filter_post_process_task(filter);
-}
+
 
 static GF_Err httpin_process(GF_Filter *filter)
 {
@@ -264,7 +354,7 @@
 	GF_Err e=GF_OK;
 	u32 bytes_per_sec=0;
 	u64 bytes_done=0, total_size, byte_offset;
-	GF_NetIOStatus net_status;
+	GF_NetIOStatus net_status = GF_NETIO_DATA_EXCHANGE;
 	GF_HTTPInCtx *ctx = (GF_HTTPInCtx *) gf_filter_get_udta(filter);
 
 	//until packet is released we return EOS (no processing), and ask for processing again upon release
@@ -278,7 +368,8 @@
 		return GF_EOS;
 
 	if (!ctx->pid) {
-		if (ctx->nb_read) return GF_SERVICE_ERROR;
+		if (ctx->nb_read)
+            return GF_SERVICE_ERROR;
 	} else {
 		//TODO: go on fetching data to cache even when not consuming, and reread from cache
 		if (gf_filter_pid_would_block(ctx->pid))
@@ -299,20 +390,58 @@
 			to_read = (u32) lto_read;
 
 		if (ctx->full_file_only) {
-			ctx->is_end = GF_TRUE;
 			pck = gf_filter_pck_new_shared(ctx->pid, ctx->block, 0, httpin_rel_pck);
+			if (!pck) return GF_OUT_OF_MEM;
+			ctx->is_end = GF_TRUE;
 			gf_filter_pck_set_framing(pck, is_start, ctx->is_end);
 
 			//mark packet out BEFORE sending, since the call to send() may destroy the packet if cloned
-			ctx->pck_out = GF_TRUE;
+			ctx->pck_out = HTTP_PCK_OUT;
 			gf_filter_pck_send(pck);
 
-			gf_filter_pid_set_eos(ctx->pid);
+			httpin_set_eos(ctx);
 			return GF_EOS;
 		}
 		nb_read = (u32) gf_fread(ctx->block, to_read, ctx->cached);
 		bytes_per_sec = 0;
-
+	}
+	else if (ctx->blob_size) {
+		u8 *b_data;
+		u32 b_size;
+		const char *cached = gf_dm_sess_get_cache_name(ctx->sess);
+		assert(cached);
+
+		gf_blob_get(cached, &b_data, &b_size, NULL);
+
+		//we should NEVER have this case (file size less than at last call), abort download
+		if (ctx->nb_read > b_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPIn] Error fetching %s, corrupted blob (URL %s prev size %d new size %d)\n", ctx->src, cached, ctx->blob_size, b_size ) );
+			nb_read = 0;
+			ctx->blob_size = b_size;
+			ctx->nb_read = ctx->file_size = b_size;
+			net_status = GF_NETIO_DATA_TRANSFERED;
+			e = GF_EOS;
+		} else {
+			nb_read = b_size - (u32) ctx->nb_read;
+			if (nb_read>ctx->block_size)
+				nb_read = ctx->block_size;
+
+			if (nb_read) {
+				memcpy(ctx->block, b_data + ctx->nb_read, nb_read);
+				e = GF_OK;
+				gf_filter_ask_rt_reschedule(filter, 1);
+			} else {
+				if (b_size == ctx->blob_size) {
+					e = gf_dm_sess_fetch_data(ctx->sess, ctx->block, ctx->block_size, &nb_read);
+					if (e==GF_EOS) {
+						net_status = GF_NETIO_DATA_TRANSFERED;
+					}
+				} else {
+					ctx->blob_size = b_size;
+				}
+			}
+		}
+        gf_blob_release(cached);
 	}
 	//we read from network
 	else {
@@ -331,34 +460,65 @@
 				httpin_notify_error(filter, ctx, e);
 
 			ctx->is_end = GF_TRUE;
-			if (ctx->pid)
+
+			//do not return an error if first fetch after source switch fails with removed or 404, this happens in DASH dynamic
+			//and the error might be absorbed by the dash demux later
+			//also do not signal eos in that case, this could trigger the consuming filter (dashdmx, filein) to consider the stream is in regular EOS
+			//and not wait for notify failure
+			if (ctx->is_source_switch && !ctx->nb_read && ((e==GF_URL_REMOVED) || (e==GF_URL_ERROR)))
+				return GF_OK;
+
+			//no packet out, we can signal eos, except for source switch failures
+			if (ctx->pid) {
 				gf_filter_pid_set_eos(ctx->pid);
+			}
+
+			gf_dm_sess_abort(ctx->sess);
+			ctx->is_source_switch = GF_FALSE;
 			return e;
 		}
 		gf_dm_sess_get_stats(ctx->sess, NULL, NULL, &total_size, &bytes_done, &bytes_per_sec, &net_status);
 
 		//wait until we have some data to declare the pid
-		if ((e!= GF_EOS) && !nb_read) return GF_OK;
+        if ((e!= GF_EOS) && !nb_read) {
+            gf_filter_ask_rt_reschedule(filter, 1000);
+            return GF_OK;
+        }
 
 		if (!ctx->pid || ctx->do_reconfigure) {
 			u32 idx;
+			GF_Err cfg_e;
 			const char *hname, *hval;
 			const char *cached = gf_dm_sess_get_cache_name(ctx->sess);
 
 			ctx->do_reconfigure = GF_FALSE;
 
-			if ((e==GF_EOS) && cached && strnicmp(cached, "gmem://", 7)) {
-				ctx->cached = gf_fopen(cached, "rb");
-				if (ctx->cached) {
-					nb_read = (u32) gf_fread(ctx->block, ctx->block_size, ctx->cached);
+			if ((e==GF_EOS) && cached) {
+				if (!strnicmp(cached, "gmem://", 7)) {
+					u8 *b_data;
+					u32 b_size, b_flags;
+					gf_blob_get(cached, &b_data, &b_size, &b_flags);
+					if (b_size>ctx->block_size) {
+						ctx->blob_size = b_size;
+						b_size = ctx->block_size;
+						e = GF_OK;
+					}
+					assert(! (b_flags&GF_BLOB_IN_TRANSFER));
+					memcpy(ctx->block, b_data, b_size);
+					nb_read = b_size;
+					gf_blob_release(cached);
 				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPIn] Failed to open cached file %s\n", cached));
+					ctx->cached = gf_fopen(cached, "rb");
+					if (ctx->cached) {
+						nb_read = (u32) gf_fread(ctx->block, ctx->block_size, ctx->cached);
+					} else {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPIn] Failed to open cached file %s\n", cached));
+					}
 				}
 			}
-			ctx->file_size = total_size;
 			ctx->block[nb_read] = 0;
-			e = gf_filter_pid_raw_new(filter, ctx->src, cached, ctx->mime ? ctx->mime : gf_dm_sess_mime_type(ctx->sess), ctx->ext, ctx->block, nb_read, ctx->mime ? GF_TRUE : GF_FALSE, &ctx->pid);
-			if (e) return e;
+			cfg_e = gf_filter_pid_raw_new(filter, ctx->src, cached, ctx->mime ? ctx->mime : gf_dm_sess_mime_type(ctx->sess), ctx->ext, ctx->block, nb_read, ctx->mime ? GF_TRUE : GF_FALSE, &ctx->pid);
+			if (cfg_e) return cfg_e;
 
 			gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(GF_FALSE) );
 
@@ -375,6 +535,8 @@
 				}
 			}
 		}
+		//update file size at each call to get_stats, since we may use a dynamic blob in case of route
+		ctx->file_size = total_size;
 
 		gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_RATE, &PROP_UINT(8*bytes_per_sec) );
 		if (ctx->range.num && ctx->file_size) {
@@ -390,13 +552,14 @@
 
 	ctx->nb_read += nb_read;
 	if (ctx->file_size && (ctx->nb_read==ctx->file_size)) {
-		ctx->is_end = GF_TRUE;
+		if (net_status!=GF_NETIO_DATA_EXCHANGE)
+			ctx->is_end = GF_TRUE;
 	} else if (e==GF_EOS) {
 		ctx->is_end = GF_TRUE;
 	}
 
 	pck = gf_filter_pck_new_shared(ctx->pid, ctx->block, nb_read, httpin_rel_pck);
-	if (!pck) return GF_OK;
+	if (!pck) return GF_OUT_OF_MEM;
 
 	gf_filter_pck_set_cts(pck, 0);
 
@@ -405,7 +568,7 @@
 	gf_filter_pck_set_byte_offset(pck, byte_offset);
 
 	//mark packet out BEFORE sending, since the call to send() may destroy the packet if cloned
-	ctx->pck_out = GF_TRUE;
+	ctx->pck_out = HTTP_PCK_OUT;
 	gf_filter_pck_send(pck);
 
 	if (ctx->file_size && gf_filter_reporting_enabled(filter)) {
@@ -421,7 +584,7 @@
 		if (cached)
 			gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(GF_TRUE) );
 
-		gf_filter_pid_set_eos(ctx->pid);
+		httpin_set_eos(ctx);
 		return GF_EOS;
 	}
 
@@ -434,13 +597,16 @@
 
 static const GF_FilterArgs HTTPInArgs[] =
 {
-	{ OFFS(src), "location of source content", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(src), "URL of source content", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(block_size), "block size used to read file", GF_PROP_UINT, "100000", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(cache), "set cache mode\n"
 	"- disk: cache to disk,  discard once session is no longer used\n"
 	"- keep: cache to disk and keep\n"
 	"- mem: stores to memory, discard once session is no longer used\n"
-	"- none: no cache", GF_PROP_UINT, "disk", "disk|keep|mem|none", GF_FS_ARG_HINT_ADVANCED},
+	"- mem_keep: stores to memory, keep after session is reassigned but move to `mem` after first download\n"
+	"- none: no cache\n"
+	"- none_keep: stores to memory, keep after session is reassigned but move to `none` after first download"
+	, GF_PROP_UINT, "disk", "disk|keep|mem|mem_keep|none|none_keep", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(range), "set byte range, as fraction", GF_PROP_FRACTION64, "0-0", NULL, 0},
 	{ OFFS(ext), "override file extension", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(mime), "set file mime type", GF_PROP_NAME, NULL, NULL, 0},
@@ -460,7 +626,6 @@
 	"Content format can be forced through [-mime]() and file extension can be changed through [-ext]().\n"
 	"Note: Unless disabled at session level (see [-no-probe](CORE) ), file extensions are usually ignored and format probing is done on the first data block.")
 	.private_size = sizeof(GF_HTTPInCtx),
-	.flags = GF_FS_REG_BLOCKING,
 	.args = HTTPInArgs,
 	SETCAPS(HTTPInCaps),
 	.initialize = httpin_initialize,

gpac-1.0.1.tar.gz/src/filters/in_pipe.c -> gpac-2.0.0.tar.gz/src/filters/in_pipe.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / pipe input filter
@@ -56,8 +56,9 @@
 	char *ext;
 	char *mime;
 	u32 block_size;
-	Bool blk, ka, mkp;
+	Bool blk, ka, mkp, sigeos;
 
+	u32 read_block_size;
 	//only one output pid declared
 	GF_FilterPid *pid;
 
@@ -111,8 +112,6 @@
 		return GF_NOT_SUPPORTED;
 	}
 
-	if (ctx->mkp) ctx->blk = GF_TRUE;
-
 	//strip any fragment identifer
 	frag_par = strchr(ctx->src, '#');
 	if (frag_par) frag_par[0] = 0;
@@ -123,11 +122,17 @@
 	if (!strnicmp(ctx->src, "pipe://", 7)) src += 7;
 	else if (!strnicmp(ctx->src, "pipe:", 5)) src += 5;
 
+	ctx->read_block_size = MIN(8192, ctx->block_size);
+
 	if (ctx->is_stdin) {
 		e = GF_OK;
 		goto setup_done;
 	}
 
+	if (ctx->blk) {
+		gf_filter_set_blocking(filter, GF_TRUE);
+	}
+
 #ifdef WIN32
 	char szNamedPipe[GF_MAX_PATH];
 	if (!strncmp(src, "\\\\", 2)) {
@@ -164,7 +169,7 @@
 			}
 			ctx->overlap.hEvent = ctx->event;
 		}
-		ctx->pipe = CreateNamedPipe(szNamedPipe, pflags, flags, 10, ctx->block_size, ctx->block_size, 0, NULL);
+		ctx->pipe = CreateNamedPipe(szNamedPipe, pflags, flags, 10, ctx->read_block_size, ctx->read_block_size, 0, NULL);
 
 		if (ctx->pipe == INVALID_HANDLE_VALUE) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeIn] Failed to create named pipe %s: %d\n", szNamedPipe, GetLastError()));
@@ -317,7 +322,7 @@
 static GF_Err pipein_process(GF_Filter *filter)
 {
 	GF_Err e;
-	u32 to_read;
+	u32 total_read;
 	s32 nb_read;
 	GF_FilterPacket *pck;
 	GF_PipeInCtx *ctx = (GF_PipeInCtx *) gf_filter_get_udta(filter);
@@ -334,7 +339,9 @@
 		return GF_OK;
 	}
 
-	to_read = ctx->block_size;
+	total_read = 0;
+
+refill:
 
 	if (ctx->is_stdin) {
 		nb_read = 0;
@@ -342,10 +349,12 @@
 			if (!ctx->ka) {
 				gf_filter_pid_set_eos(ctx->pid);
 				return GF_EOS;
+			} else if (ctx->sigeos) {
+				gf_filter_pid_set_eos(ctx->pid);
 			}
 		} else {
-			nb_read = (s32) fread(ctx->buffer, 1, to_read, stdin);
-			if (nb_read<0) {
+			nb_read = (s32) fread(ctx->buffer + total_read, 1, ctx->read_block_size, stdin);
+			if (!total_read && (nb_read<0)) {
 				if (!ctx->ka) {
 					gf_filter_pid_set_eos(ctx->pid);
 					return GF_EOS;
@@ -365,7 +374,8 @@
 				return GF_IO_ERR;
 			}
 			if (GetOverlappedResult(ctx->pipe, &ctx->overlap, &res, FALSE) == 0) {
-				if (GetLastError() == ERROR_IO_INCOMPLETE) {
+				s32 error = GetLastError();
+				if (error == ERROR_IO_INCOMPLETE) {
 				}
 				else {
 					CloseHandle(ctx->pipe);
@@ -376,61 +386,90 @@
 						return GF_EOS;
 					}
 					GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[PipeIn] Pipe closed by remote side, reopening!\n"));
+					if (ctx->sigeos)
+						gf_filter_pid_set_eos(ctx->pid);
 					return pipein_initialize(filter);
 				}
 			}
 		}
-		if (! ReadFile(ctx->pipe, ctx->buffer, to_read, &nb_read, ctx->blk ? NULL : &ctx->overlap) ) {
-			s32 error = GetLastError();
-			if (error == ERROR_PIPE_LISTENING) return GF_OK;
-			else if ((error == ERROR_IO_PENDING) || (error== ERROR_MORE_DATA)) {
-				//non blocking pipe with writers active
-			}
-			else if (nb_read<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeIn] Failed to read, error %d\n", error));
-				return GF_IO_ERR;
-			}
-			else if (!ctx->ka) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[PipeIn] end of stream detected\n"));
-				gf_filter_pid_set_eos(ctx->pid);
-				CloseHandle(ctx->pipe);
-				ctx->pipe = INVALID_HANDLE_VALUE;
-				ctx->is_end = GF_TRUE;
-				return GF_EOS;
-			}
-			else if (error = ERROR_BROKEN_PIPE) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[PipeIn] Pipe closed by remote side, reopening!\n"));
-				CloseHandle(ctx->pipe);
-				ctx->pipe = INVALID_HANDLE_VALUE;
-				return pipein_initialize(filter);
+		if (! ReadFile(ctx->pipe, ctx->buffer + total_read, ctx->read_block_size, (LPDWORD) &nb_read, ctx->blk ? NULL : &ctx->overlap)) {
+			if (total_read) {
+				nb_read = 0;
+			} else {
+				s32 error = GetLastError();
+				if (error == ERROR_PIPE_LISTENING) return GF_OK;
+				else if ((error == ERROR_IO_PENDING) || (error== ERROR_MORE_DATA)) {
+					//non blocking pipe with writers active
+				}
+				else if (nb_read<0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeIn] Failed to read, error %d\n", error));
+					return GF_IO_ERR;
+				}
+				else if (!ctx->ka && ctx->blk) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[PipeIn] end of stream detected\n"));
+					gf_filter_pid_set_eos(ctx->pid);
+					CloseHandle(ctx->pipe);
+					ctx->pipe = INVALID_HANDLE_VALUE;
+					ctx->is_end = GF_TRUE;
+					return GF_EOS;
+				}
+				else if (error == ERROR_BROKEN_PIPE) {
+					if (ctx->ka) {
+						GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[PipeIn] Pipe closed by remote side, reopening!\n"));
+						CloseHandle(ctx->pipe);
+						ctx->pipe = INVALID_HANDLE_VALUE;
+						if (ctx->sigeos)
+							gf_filter_pid_set_eos(ctx->pid);
+						return pipein_initialize(filter);
+					} else {
+						gf_filter_pid_set_eos(ctx->pid);
+						return GF_EOS;
+					}
+				}
+				return GF_OK;
 			}
-			return GF_OK;
 		}
 #else
-		nb_read = (s32) read(ctx->fd, ctx->buffer, to_read);
+		nb_read = (s32) read(ctx->fd, ctx->buffer + total_read, ctx->read_block_size);
 		if (nb_read <= 0) {
-			s32 res = errno;
-			if (res == EAGAIN) {
-				//non blocking pipe with writers active
-			} else if (nb_read<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeIn] Failed to read, error %s\n", gf_errno_str(res) ));
-				return GF_IO_ERR;
-			} else if (!ctx->ka) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[PipeIn] end of stream detected\n"));
-				if (ctx->pid) gf_filter_pid_set_eos(ctx->pid);
-				close(ctx->fd);
-				ctx->fd=-1;
-				ctx->is_end = GF_TRUE;
-				return GF_EOS;
+			if (total_read) {
+				nb_read = 0;
+			} else {
+				s32 res = errno;
+				if (res == EAGAIN) {
+					//non blocking pipe with writers active
+				} else if (nb_read < 0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeIn] Failed to read, error %s\n", gf_errno_str(res) ));
+					return GF_IO_ERR;
+				} else if (!ctx->ka && ctx->bytes_read) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[PipeIn] end of stream detected after %d bytes\n", ctx->bytes_read));
+					if (ctx->pid) gf_filter_pid_set_eos(ctx->pid);
+					close(ctx->fd);
+					ctx->fd=-1;
+					ctx->is_end = GF_TRUE;
+					return GF_EOS;
+				} else if (ctx->sigeos && ctx->pid) {
+					gf_filter_pid_set_eos(ctx->pid);
+				}
+				return GF_OK;
 			}
-			return GF_OK;
 		}
 #endif
 	}
 
-	if (!nb_read)
+	if (nb_read) {
+		total_read += nb_read;
+		if (total_read + ctx->read_block_size < ctx->block_size) {
+			nb_read = 0;
+			goto refill;
+		}
+	}
+	nb_read = total_read;
+
+	if (!nb_read) {
 		return GF_OK;
-	
+	}
+
 	ctx->buffer[nb_read] = 0;
 	if (!ctx->pid || ctx->do_reconfigure) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[PipeIn] configuring stream %d probe bytes\n", nb_read));
@@ -444,8 +483,7 @@
 		gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_NONE) );
 	}
 	pck = gf_filter_pck_new_shared(ctx->pid, ctx->buffer, nb_read, pipein_pck_destructor);
-	if (!pck)
-		return GF_OK;
+	if (!pck) return GF_OUT_OF_MEM;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[PipeIn] sending %d bytes\n", nb_read));
 	gf_filter_pck_set_framing(pck, ctx->is_first, ctx->is_end);
@@ -469,13 +507,14 @@
 
 static const GF_FilterArgs PipeInArgs[] =
 {
-	{ OFFS(src), "location of source content", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(src), "name of source pipe", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(block_size), "buffer size used to read pipe", GF_PROP_UINT, "5000", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ext), "indicate file extension of pipe data", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(mime), "indicate mime type of pipe data", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(blk), "open pipe in block mode - see filter help", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ka), "keep-alive pipe when end of input is detected - see filter help", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(mkp), "create pipe if not found - see filter help", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(blk), "open pipe in block mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ka), "keep-alive pipe when end of input is detected", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(mkp), "create pipe if not found", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(sigeos), "signal end of stream whenever a pipe breaks in keep-alive mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };
 
@@ -493,32 +532,35 @@
 		"Note: Unless disabled at session level (see [-no-probe](CORE) ), file extensions are usually ignored and format probing is done on the first data block.\n"
 		"\n"
 		"# stdin pipe\n"
-		"The filter can handle reading from stdin, by using `-`or `stdin` as input file name.\n"
+		"The filter can handle reading from stdin, by using `-` or `stdin` as input file name.\n"
 		"EX gpac -i - vout\n"
 		"EX gpac -i stdin vout\n"
 		"\n"
 		"# Named pipes\n"
-		"The filter can handle reading from named pipes. The associated protocol scheme is `pipe://` when loaded as a generic input (eg, `-i pipe://URL` where URL is a relative or absolute pipe name).\n"
+		"The filter can handle reading from named pipes. The associated protocol scheme is `pipe://` when loaded as a generic input (e.g. `-i pipe://URL` where URL is a relative or absolute pipe name).\n"
 		"On Windows hosts, the default pipe prefix is `\\\\.\\pipe\\gpac\\` if no prefix is set.\n"
-		"EX dst=mypipe resolves in \\\\.\\pipe\\gpac\\mypipe\n"
-		"EX dst=\\\\.\\pipe\\myapp\\mypipe resolves in \\\\.\\pipe\\myapp\\mypipe\n"
+		"`dst=mypipe` resolves in `\\\\.\\pipe\\gpac\\mypipe`\n"
+		"`dst=\\\\.\\pipe\\myapp\\mypipe` resolves in `\\\\.\\pipe\\myapp\\mypipe`\n"
 		"Any destination name starting with `\\\\` is used as is, with `\\` translated in `/`.\n"
 		"\n"
 		"Input pipes are created by default in non-blocking mode.\n"
 		"\n"
 		"The filter can create the pipe if not found using [-mkp](). On windows hosts, this will create a pipe server.\n"
 		"On non windows hosts, the created pipe will delete the pipe file upon filter destruction.\n"
-		"\n"
-		"Input pipes can be setup to run forever using [-ka](). In this case, any potential pipe close on the writing side and end of stream will only be triggered upon session close.\n"
+		" \n"
+		"Input pipes can be setup to run forever using [-ka](). In this case:\n"
+		"- any potential pipe close on the writing side will be ignored\n"
+		"- end of stream will be triggered upon pipe close if [-sigeos]() is set\n"
+		"- final end of stream will be triggered upon session close.\n"
+		" \n"
 		"This can be useful to pipe raw streams from different process into gpac:\n"
-		"Receiver side: `gpac -i pipe://mypipe:ext=.264:mkp:ka`\n"
-		"Sender side: `cat raw1.264 > mypipe && gpac -i raw2.264 -o pipe://mypipe:ext=.264`"
-		"\n"
-		"The pipe input can be created in blocking mode or non-blocking mode. If the filter creates the pipe, blocking mode is always enabled.\n"
+		"- Receiver side: `gpac -i pipe://mypipe:ext=.264:mkp:ka`\n"
+		"- Sender side: `cat raw1.264 > mypipe && gpac -i raw2.264 -o pipe://mypipe:ext=.264`"
+		" \n"
+		"The pipe input can be created in blocking mode or non-blocking mode.\n"
 	"")
 	.private_size = sizeof(GF_PipeInCtx),
 	.args = PipeInArgs,
-	.flags = GF_FS_REG_BLOCKING,
 	SETCAPS(PipeInCaps),
 	.initialize = pipein_initialize,
 	.finalize = pipein_finalize,

gpac-2.0.0.tar.gz/src/filters/in_route.c Added

@@ -0,0 +1,982 @@
+	/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / ROUTE (ATSC3, DVB-I) input filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/filters.h>
+#include <gpac/route.h>
+#include <gpac/network.h>
+#include <gpac/thread.h>
+
+#ifndef GPAC_DISABLE_ROUTE
+
+typedef struct
+{
+	u32 sid;
+	u32 tsi;
+	GF_FilterPid *opid;
+} TSI_Output;
+
+typedef struct
+{
+	GF_FilterPid *opid;
+	char *seg_name;
+} SegInfo;
+
+enum
+{
+	ROUTEIN_REPAIR_NO = 0,
+	ROUTEIN_REPAIR_SIMPLE,
+	ROUTEIN_REPAIR_STRICT,
+	ROUTEIN_REPAIR_FULL,
+};
+
+typedef struct
+{
+	//options
+	char *src, *ifce, *odir;
+	Bool gcache, kc, skipr, reorder, fullseg;
+	u32 buffer, timeout, stats, max_segs, tsidbg, rtimeout, nbcached, repair;
+	s32 tunein, stsi;
+	
+	//internal
+	GF_Filter *filter;
+	GF_DownloadManager *dm;
+
+	char *clock_init_seg;
+	GF_ROUTEDmx *route_dmx;
+	u32 tune_service_id;
+
+	u32 sync_tsi, last_toi;
+
+	u32 start_time, tune_time, last_timeout;
+	GF_FilterPid *opid;
+	GF_List *tsi_outs;
+
+	u32 nb_stats;
+	GF_List *received_seg_names;
+
+	u32 nb_playing;
+	Bool initial_play_forced;
+} ROUTEInCtx;
+
+
+static Bool routein_repair_segment_ts(ROUTEInCtx *ctx, GF_ROUTEEventFileInfo *finfo)
+{
+ u32 i, pos;
+ Bool drop_if_first = GF_FALSE;
+ u8 *data = finfo->blob->data;
+
+
+ pos = 0;
+ for (i=0; i<finfo->nb_frags; i++) {
+ u32 start_range = finfo->frags[i].offset;
+ u32 end_range = finfo->frags[i].size;
+
+		//if we missed first 4 packets, we cannot rely on PAT/PMT being present in the rest of the segment
+		//we could further check this at the demux level, but for now we drop the segment
+ if (!i && (start_range>4*188))
+			drop_if_first = GF_TRUE;
+
+ end_range += start_range;
+ //reset all missed byte ranges as padding packets
+ start_range -= pos;
+ while (start_range % 188) start_range++;
+ while (pos<start_range) {
+ data[pos] = 0x47;
+ data[pos+1] = 0x1F;
+ data[pos+2] = 0xFF;
+ data[pos+3] = 0x10;
+ pos += 188;
+ }
+ //end range not aligned with a packet start, rewind position to prev packet start
+		while (end_range % 188) end_range--;
+		pos = end_range;
+ }
+ //and patch all end packets
+ while (pos<finfo->blob->size) {
+ data[pos] = 0x47;
+ data[pos+1] = 0x1F;
+ data[pos+2] = 0xFF;
+ data[pos+3] = 0x10;
+ pos += 188;
+ }
+	//remove corrupted flag
+	finfo->blob->flags = 0;
+	return drop_if_first;
+}
+
+//top boxes we look for in segments
+static const char *top_codes[] = {"styp", "emsg", "prft", "moof", "mdat", "free", "sidx", "ssix"};
+static u32 nb_top_codes = GF_ARRAY_LENGTH(top_codes);
+
+static u32 next_top_level_box(GF_ROUTEEventFileInfo *finfo, u8 *data, u32 size, u32 *cur_pos, u32 *box_size)
+{
+ u32 pos = *cur_pos;
+	u32 cur_frag = 0;
+	while (cur_frag < finfo->nb_frags) {
+		//in range, can go
+		if ((finfo->frags[cur_frag].offset <= pos) && (finfo->frags[cur_frag].offset + finfo->frags[cur_frag].size > pos)) {
+			break;
+		}
+		//before range, adjust pos
+		if (finfo->frags[cur_frag].offset > pos) {
+			pos = finfo->frags[cur_frag].offset;
+			break;
+		}
+		//after range, go to next
+		cur_frag++;
+		//current pos is outside last valid range, no more top-level boxes to parse
+		if (cur_frag==finfo->nb_frags)
+			return 0;
+	}
+		
+ while (pos + 8 < size) {
+ u32 i;
+ u32 type_idx = 0;
+		u32 first_box = 0;
+		u32 first_box_size = 0;
+ for (i=0; i<nb_top_codes; i++) {
+			if ((data[pos]==top_codes[i][0]) && (data[pos+1]==top_codes[i][1]) && (data[pos+2]==top_codes[i][2]) && (data[pos+3]==top_codes[i][3])) {
+				first_box = pos;
+				type_idx = i;
+				break;
+ }
+ }
+ //we need at least 4 bytes size header
+ if (first_box<4) {
+ pos++;
+ continue;
+ }
+		first_box_size = GF_4CC(data[first_box-4], data[first_box-3], data[first_box-2], data[first_box-1]);
+		if (first_box_size<8) {
+			pos++;
+			continue;
+		}
+ *cur_pos = first_box-4;
+ *box_size = first_box_size;
+ return GF_4CC(top_codes[type_idx][0], top_codes[type_idx][1], top_codes[type_idx][2], top_codes[type_idx][3]);
+ }
+ return 0;
+}
+
+static void routein_repair_segment_isobmf(ROUTEInCtx *ctx, GF_ROUTEEventFileInfo *finfo)
+{
+ u8 *data = finfo->blob->data;
+ u32 size = finfo->blob->size;
+ u32 pos = 0;
+	u32 prev_moof_pos = 0;
+ //walk through all possible top-level boxes in order
+ //if box completely in a received byte range, keep as is
+ //if mdat or free box, keep as is
+ //otherwise change box type to free
+ while (pos + 8 < size) {
+ u32 i;
+		Bool is_mdat = GF_FALSE;
+ Bool box_complete = GF_FALSE;
+ u32 prev_pos = pos;
+ u32 box_size = 0;
+ u32 type = next_top_level_box(finfo, data, size, &pos, &box_size);
+ //no more top-level found, patch from current pos until end of payload
+ if (!type) {
+ u32 remain = size - pos;
+ assert(remain);
+ if (remain<8) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to patch end of corrupted segment, segment size not big enough to hold the final box header, something really corrupted in source data\n"));
+ return;
+ }
+ data[pos] = (remain>>24) & 0xFF;
+ data[pos+1] = (remain>>16) & 0xFF;
+ data[pos+2] = (remain>>8) & 0xFF;
+ data[pos+3] = (remain) & 0xFF;
+ data[pos+4] = 'f';
+ data[pos+5] = 'r';
+ data[pos+6] = 'e';
+ data[pos+7] = 'e';
+			//remove corrupted flag
+			finfo->blob->flags = 0;
+ return;
+ }
+ //we missed a box header, insert one at previous pos, indicating a free box !!
+ if (pos > prev_pos) {
+ u32 missed_size = pos - prev_pos;
+ data[prev_pos] = (missed_size>>24) & 0xFF;
+ data[prev_pos+1] = (missed_size>>16) & 0xFF;
+ data[prev_pos+2] = (missed_size>>8) & 0xFF;
+ data[prev_pos+3] = (missed_size) & 0xFF;
+ data[prev_pos+4] = 'f';
+ data[prev_pos+5] = 'r';
+ data[prev_pos+6] = 'e';
+ data[prev_pos+7] = 'e';
+ }
+ if (type == GF_4CC('f','r','e','e')) {
+ box_complete = GF_TRUE;
+ } else if (type == GF_4CC('m','d','a','t')) {
+			if (ctx->repair != ROUTEIN_REPAIR_STRICT) {
+				box_complete = GF_TRUE;
+			} else {
+				is_mdat = GF_TRUE;
+			}
+		} else if (type == GF_4CC('m','o','o','f')) {
+			prev_moof_pos = pos;
+		}
+
+ if (!box_complete) {
+ //box is only partially received
+ for (i=0; i<finfo->nb_frags; i++) {
+ if (pos + box_size < finfo->frags[i].offset)
+ break;
+ if ((pos >= finfo->frags[i].offset) && (pos+box_size<=finfo->frags[i].offset + finfo->frags[i].size)) {
+ box_complete = GF_TRUE;
+ break;
+ }
+ }
+ }
+ if (box_complete) {
+ pos += box_size;
+ continue;
+ }
+		//incomplete mdat (strict mode), discard previous moof
+		if (is_mdat) {
+			data[prev_moof_pos+4] = 'f';
+			data[prev_moof_pos+5] = 'r';
+			data[prev_moof_pos+6] = 'e';
+			data[prev_moof_pos+7] = 'e';
+		}
+ //incomplete box, move to free (not changing size)
+ data[pos+4] = 'f';
+ data[pos+5] = 'r';
+ data[pos+6] = 'e';
+ data[pos+7] = 'e';
+ pos += box_size;
+ }
+	//remove corrupted flag
+	finfo->blob->flags = 0;
+}
+
+static Bool routein_repair_segment(ROUTEInCtx *ctx, GF_ROUTEEventFileInfo *finfo)
+{
+	Bool drop_if_first = GF_FALSE;
+	if (ctx->repair==ROUTEIN_REPAIR_NO)
+		return GF_FALSE;
+
+	if (finfo->blob->mx)
+		gf_mx_p(finfo->blob->mx);
+	
+ if (strstr(finfo->filename, ".ts") || strstr(finfo->filename, ".m2ts")) {
+ drop_if_first = routein_repair_segment_ts(ctx, finfo);
+ } else {
+ routein_repair_segment_isobmf(ctx, finfo);
+ }
+
+	if (finfo->blob->mx)
+		gf_mx_v(finfo->blob->mx);
+
+	return drop_if_first;
+}
+
+
+static GF_FilterProbeScore routein_probe_url(const char *url, const char *mime)
+{
+	if (!strnicmp(url, "atsc://", 7)) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "route://", 8)) return GF_FPROBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+
+static void routein_finalize(GF_Filter *filter)
+{
+	ROUTEInCtx *ctx = gf_filter_get_udta(filter);
+
+#ifdef GPAC_ENABLE_COVERAGE
+ if (gf_sys_is_cov_mode())
+ gf_route_dmx_purge_objects(ctx->route_dmx, 1);
+#endif
+ 
+ if (ctx->clock_init_seg) gf_free(ctx->clock_init_seg);
+	if (ctx->route_dmx) gf_route_dmx_del(ctx->route_dmx);
+
+	if (ctx->tsi_outs) {
+		while (gf_list_count(ctx->tsi_outs)) {
+			TSI_Output *tsio = gf_list_pop_back(ctx->tsi_outs);
+			gf_free(tsio);
+		}
+		gf_list_del(ctx->tsi_outs);
+	}
+	if (ctx->received_seg_names) {
+		while (gf_list_count(ctx->received_seg_names)) {
+			if (ctx->odir) {
+				char *filedel = gf_list_pop_back(ctx->received_seg_names);
+				if (filedel) gf_free(filedel);
+			} else {
+				SegInfo *si = gf_list_pop_back(ctx->received_seg_names);
+				gf_free(si->seg_name);
+				gf_free(si);
+			}
+		}
+		gf_list_del(ctx->received_seg_names);
+	}
+}
+
+static void push_seg_info(ROUTEInCtx *ctx, GF_FilterPid *pid, GF_ROUTEEventFileInfo *finfo)
+{
+ if (ctx->received_seg_names) {
+ SegInfo *si;
+ GF_SAFEALLOC(si, SegInfo);
+ if (!si) return;
+ si->opid = pid;
+ si->seg_name = gf_strdup(finfo->filename);
+ gf_list_add(ctx->received_seg_names, si);
+ }
+ while (gf_list_count(ctx->received_seg_names) > ctx->max_segs) {
+ GF_FilterEvent evt;
+ SegInfo *si = gf_list_pop_front(ctx->received_seg_names);
+ GF_FEVT_INIT(evt, GF_FEVT_FILE_DELETE, si->opid);
+ evt.file_del.url = si->seg_name;
+ gf_filter_pid_send_event(si->opid, &evt);
+ gf_free(si->seg_name);
+ gf_free(si);
+ }
+}
+
+static void routein_send_file(ROUTEInCtx *ctx, u32 service_id, GF_ROUTEEventFileInfo *finfo, u32 evt_type)
+{
+	if (!ctx->kc || !(finfo->blob->flags & GF_BLOB_CORRUPTED)) {
+		u8 *output;
+		char *ext;
+		GF_FilterPid *pid, **p_pid;
+		GF_FilterPacket *pck;
+		TSI_Output *tsio = NULL;
+
+		p_pid = &ctx->opid;
+		if (finfo->tsi && ctx->stsi) {
+			u32 i, count = gf_list_count(ctx->tsi_outs);
+			for (i=0; i<count; i++) {
+				tsio = gf_list_get(ctx->tsi_outs, i);
+				if ((tsio->sid==service_id) && (tsio->tsi==finfo->tsi)) {
+					break;
+				}
+				tsio=NULL;
+			}
+			if (!tsio) {
+				GF_SAFEALLOC(tsio, TSI_Output);
+				if (!tsio) return;
+
+				tsio->tsi = finfo->tsi;
+				tsio->sid = service_id;
+				gf_list_add(ctx->tsi_outs, tsio);
+			}
+			p_pid = &tsio->opid;
+
+			if ((evt_type==GF_ROUTE_EVT_FILE) || (evt_type==GF_ROUTE_EVT_MPD)) {
+				if (ctx->skipr && !finfo->updated) return;
+			}
+		}
+		pid = *p_pid;
+
+		if (!pid) {
+			pid = gf_filter_pid_new(ctx->filter);
+			(*p_pid) = pid;
+			gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
+		}
+		gf_filter_pid_set_property(pid, GF_PROP_PID_ID, &PROP_UINT(tsio ? tsio->tsi : service_id));
+		gf_filter_pid_set_property(pid, GF_PROP_PID_SERVICE_ID, &PROP_UINT(service_id));
+		gf_filter_pid_set_property(pid, GF_PROP_PID_URL, &PROP_STRING(finfo->filename));
+		ext = gf_file_ext_start(finfo->filename);
+		gf_filter_pid_set_property(pid, GF_PROP_PID_FILE_EXT, &PROP_STRING(ext ? (ext+1) : "*" ));
+
+		pck = gf_filter_pck_new_alloc(pid, finfo->blob->size, &output);
+		if (pck) {
+			memcpy(output, finfo->blob->data, finfo->blob->size);
+			if (finfo->blob->flags & GF_BLOB_CORRUPTED) gf_filter_pck_set_corrupted(pck, GF_TRUE);
+			gf_filter_pck_send(pck);
+		}
+		
+ if (ctx->max_segs && (evt_type==GF_ROUTE_EVT_DYN_SEG))
+ push_seg_info(ctx, pid, finfo);
+	}
+
+	while (gf_route_dmx_get_object_count(ctx->route_dmx, service_id)>1) {
+		if (! gf_route_dmx_remove_first_object(ctx->route_dmx, service_id))
+			break;
+	}
+}
+
+static void routein_write_to_disk(ROUTEInCtx *ctx, u32 service_id, GF_ROUTEEventFileInfo *finfo, u32 evt_type)
+{
+	char szPath[GF_MAX_PATH];
+	FILE *out;
+	if (!finfo->blob)
+		return;
+
+	if ((finfo->blob->flags & GF_BLOB_CORRUPTED) && !ctx->kc)
+		return;
+	
+	sprintf(szPath, "%s/service%d/%s", ctx->odir, service_id, finfo->filename);
+
+	out = gf_fopen(szPath, "wb");
+	if (!out) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d failed to create MPD file %s\n", service_id, szPath ));
+	} else {
+		u32 bytes = (u32) gf_fwrite(finfo->blob->data, finfo->blob->size, out);
+		gf_fclose(out);
+		if (bytes != finfo->blob->size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d failed to write file %s: %d written for %d total\n", service_id, finfo->filename, bytes, finfo->blob->size));
+		}
+	}
+	while (gf_route_dmx_get_object_count(ctx->route_dmx, service_id)>1) {
+		if (! gf_route_dmx_remove_first_object(ctx->route_dmx, service_id))
+			break;
+	}
+
+	if (ctx->max_segs && (evt_type==GF_ROUTE_EVT_DYN_SEG)) {
+		gf_list_add(ctx->received_seg_names, gf_strdup(szPath));
+
+		while (gf_list_count(ctx->received_seg_names) > ctx->max_segs) {
+			char *filedel = gf_list_pop_front(ctx->received_seg_names);
+			if (filedel) {
+				gf_file_delete(filedel);
+				gf_free(filedel);
+			}
+		}
+	}
+}
+
+
+
+void routein_on_event(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo)
+{
+	char szPath[GF_MAX_PATH];
+	ROUTEInCtx *ctx = (ROUTEInCtx *)udta;
+	u32 nb_obj;
+	Bool is_init = GF_TRUE;
+	Bool drop_if_first = GF_FALSE;
+	Bool is_loop = GF_FALSE;
+	DownloadedCacheEntry cache_entry;
+
+	//events without finfo
+	if (evt==GF_ROUTE_EVT_SERVICE_FOUND) {
+		if (!ctx->tune_time) ctx->tune_time = gf_sys_clock();
+		return;
+	}
+	if (evt==GF_ROUTE_EVT_SERVICE_SCAN) {
+		if (ctx->tune_service_id && !gf_route_dmx_find_atsc3_service(ctx->route_dmx, ctx->tune_service_id)) {
+
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Asked to tune to service %d but no such service, tuning to first one\n", ctx->tune_service_id));
+
+			ctx->tune_service_id = 0;
+			gf_route_atsc3_tune_in(ctx->route_dmx, (u32) -2, GF_TRUE);
+		}
+		return;
+	}
+	if (!finfo)
+		return;
+
+	//events without finfo->blob
+	if (evt==GF_ROUTE_EVT_FILE_DELETE) {
+		if (ctx->gcache) {
+			sprintf(szPath, "http://groute/service%d/%s", evt_param, finfo->filename);
+			gf_dm_add_cache_entry(ctx->dm, szPath, NULL, 0, 0, "video/mp4", GF_FALSE, 0);
+		}
+		return;
+	}
+	
+	if (!finfo->blob)
+		return;
+
+	cache_entry = finfo->udta;
+	szPath[0] = 0;
+	switch (evt) {
+	case GF_ROUTE_EVT_MPD:
+		if (!ctx->tune_time) ctx->tune_time = gf_sys_clock();
+			
+		if (ctx->odir) {
+			routein_write_to_disk(ctx, evt_param, finfo, evt);
+			break;
+		}
+		if (!ctx->gcache) {
+			routein_send_file(ctx, evt_param, finfo, evt);
+			break;
+		}
+
+		if (!ctx->opid) {
+			ctx->opid = gf_filter_pid_new(ctx->filter);
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
+		}
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(evt_param));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SERVICE_ID, &PROP_UINT(evt_param));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("mpd"));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("application/dash+xml"));
+
+		sprintf(szPath, "http://groute/service%d/%s", evt_param, finfo->filename);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_REDIRECT_URL, &PROP_STRING(szPath));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_URL, &PROP_STRING(szPath));
+
+		cache_entry = gf_dm_add_cache_entry(ctx->dm, szPath, finfo->blob, 0, 0, "application/dash+xml", GF_TRUE, 0);
+
+		sprintf(szPath, "x-route: %d\r\n", evt_param);
+		gf_dm_force_headers(ctx->dm, cache_entry, szPath);
+		gf_route_dmx_set_service_udta(ctx->route_dmx, evt_param, cache_entry);
+
+		ctx->sync_tsi = 0;
+		ctx->last_toi = 0;
+		if (ctx->clock_init_seg) gf_free(ctx->clock_init_seg);
+		ctx->clock_init_seg = NULL;
+		ctx->tune_service_id = evt_param;
+		break;
+	case GF_ROUTE_EVT_DYN_SEG:
+
+		//corrupted file, try to repair
+		if (finfo->blob->flags & GF_BLOB_CORRUPTED) {
+			drop_if_first = routein_repair_segment(ctx, finfo);
+		}
+			
+		if (ctx->odir) {
+			routein_write_to_disk(ctx, evt_param, finfo, evt);
+			break;
+		}
+		if (!ctx->gcache) {
+			routein_send_file(ctx, evt_param, finfo, evt);
+			break;
+		}
+ //fallthrough
+
+ case GF_ROUTE_EVT_DYN_SEG_FRAG:
+ //for now we only push complete files
+ if (!ctx->gcache) {
+ break;
+ }
+
+#if 0
+			//couldn't repair or this is a fragment
+ if ((finfo->blob->flags & GF_BLOB_CORRUPTED) && !ctx->kc) {
+			
+ //force updating the cache entry since we may have reallocated the data buffer
+ sprintf(szPath, "http://groute/service%d/%s", evt_param, finfo->filename);
+ if (evt==GF_ROUTE_EVT_DYN_SEG_FRAG) {
+ cache_entry = gf_dm_add_cache_entry(ctx->dm, szPath, finfo->blob, 0, 0, "video/mp4", GF_FALSE, finfo->download_ms);
+ } else {
+ if (ctx->fullseg)
+ break;
+ cache_entry = gf_dm_add_cache_entry(ctx->dm, szPath, finfo->blob, 0, 0, "video/mp4", GF_FALSE, finfo->download_ms);
+ }
+ //don't break yet, we want to signal the clock
+ }
+#endif
+			
+		if (!ctx->clock_init_seg) {
+			DownloadedCacheEntry mpd_cache_entry = gf_route_dmx_get_service_udta(ctx->route_dmx, evt_param);
+			if (mpd_cache_entry) {
+				ctx->clock_init_seg = gf_strdup(finfo->filename);
+				sprintf(szPath, "x-route: %d\r\nx-route-first-seg: %s\r\n", evt_param, ctx->clock_init_seg);
+				if (evt==GF_ROUTE_EVT_DYN_SEG_FRAG)
+					strcat(szPath, "x-route-ll: yes\r\n");
+				gf_dm_force_headers(ctx->dm, mpd_cache_entry, szPath);
+				szPath[0] = 0;
+			}
+		}
+
+		if ((finfo->blob->flags & GF_BLOB_CORRUPTED) && !ctx->kc)
+ break;
+ 
+		is_init = GF_FALSE;
+		if (!ctx->sync_tsi) {
+			ctx->sync_tsi = finfo->tsi;
+			ctx->last_toi = finfo->toi;
+			if (drop_if_first) {
+				break;
+			}
+		} else if (ctx->sync_tsi == finfo->tsi) {
+			if (ctx->last_toi > finfo->toi) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Loop detected on service %d for TSI %u: prev TOI %u this toi %u\n", ctx->tune_service_id, finfo->tsi, ctx->last_toi, finfo->toi));
+
+				gf_route_dmx_purge_objects(ctx->route_dmx, evt_param);
+				is_loop = GF_TRUE;
+				if (cache_entry) {
+					if (ctx->clock_init_seg) gf_free(ctx->clock_init_seg);
+					ctx->clock_init_seg = gf_strdup(finfo->filename);
+					sprintf(szPath, "x-route: %d\r\nx-route-first-seg: %s\r\nx-route-loop: yes\r\n", evt_param, ctx->clock_init_seg);
+					gf_dm_force_headers(ctx->dm, cache_entry, szPath);
+					szPath[0] = 0;
+				}
+			}
+			ctx->last_toi = finfo->toi;
+		}
+		//fallthrough
+
+	case GF_ROUTE_EVT_FILE:
+
+		if (ctx->odir) {
+			routein_write_to_disk(ctx, evt_param, finfo, evt);
+			break;
+		}
+		if (!ctx->gcache) {
+			routein_send_file(ctx, evt_param, finfo, evt);
+			break;
+		}
+
+		if ((finfo->blob->flags & GF_BLOB_CORRUPTED) && !ctx->kc) return;
+
+
+		if (!cache_entry) {
+			sprintf(szPath, "http://groute/service%d/%s", evt_param, finfo->filename);
+			
+			//we copy over the init segment, but only share the data pointer for segments
+			cache_entry = gf_dm_add_cache_entry(ctx->dm, szPath, finfo->blob, 0, 0, "video/mp4", is_init ? GF_TRUE : GF_FALSE, finfo->download_ms);
+			if (cache_entry) {
+				gf_dm_force_headers(ctx->dm, cache_entry, "x-route: yes\r\n");
+				finfo->udta = cache_entry;
+			}
+		}
+			
+ if (evt==GF_ROUTE_EVT_DYN_SEG_FRAG) {
+ GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Pushing fragment from file %s to cache\n", finfo->filename));
+			break;
+ }
+			
+			
+		GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Pushing file %s to cache\n", finfo->filename));
+		if (ctx->max_segs && (evt==GF_ROUTE_EVT_DYN_SEG))
+			push_seg_info(ctx, ctx->opid, finfo);
+
+		if (is_loop) break;
+
+		//cf routein_local_cache_probe
+		gf_filter_lock(ctx->filter, GF_TRUE);
+		nb_obj = gf_route_dmx_get_object_count(ctx->route_dmx, evt_param);
+		while (nb_obj > ctx->nbcached) {
+			if (!gf_route_dmx_remove_first_object(ctx->route_dmx, evt_param))
+				break;
+			nb_obj = gf_route_dmx_get_object_count(ctx->route_dmx, evt_param);
+		}
+		gf_filter_lock(ctx->filter, GF_FALSE);
+		break;
+	default:
+		break;
+	}
+}
+
+static Bool routein_local_cache_probe(void *par, char *url, Bool is_destroy)
+{
+	ROUTEInCtx *ctx = (ROUTEInCtx *)par;
+	u32 sid=0;
+	char *subr;
+	if (strncmp(url, "http://groute/service", 21)) return GF_FALSE;
+
+	subr = strchr(url+21, '/');
+	subr[0] = 0;
+	sid = atoi(url+21);
+	subr[0] = '/';
+	//this is not a thread-safe callback (typically called from httpin filter)
+	gf_filter_lock(ctx->filter, GF_TRUE);
+	if (is_destroy) {
+		gf_route_dmx_remove_object_by_name(ctx->route_dmx, sid, subr+1, GF_TRUE);
+	} else if (sid && (sid != ctx->tune_service_id)) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Request on service %d but tuned on service %d, retuning\n", sid, ctx->tune_service_id));
+		ctx->tune_service_id = sid;
+		ctx->sync_tsi = 0;
+		ctx->last_toi = 0;
+		if (ctx->clock_init_seg) gf_free(ctx->clock_init_seg);
+		ctx->clock_init_seg = NULL;
+ gf_route_atsc3_tune_in(ctx->route_dmx, sid, GF_TRUE);
+	} else {
+		//mark object as in-use to prevent it from being discarded
+		gf_route_dmx_force_keep_object_by_name(ctx->route_dmx, sid, subr+1);
+	}
+	gf_filter_lock(ctx->filter, GF_FALSE);
+	return GF_TRUE;
+}
+
+static GF_Err routein_process(GF_Filter *filter)
+{
+	ROUTEInCtx *ctx = gf_filter_get_udta(filter);
+
+	if (!ctx->nb_playing)
+		return GF_EOS;
+
+	while (1) {
+		GF_Err e = gf_route_dmx_process(ctx->route_dmx);
+		if (e == GF_IP_NETWORK_EMPTY) {
+			if (ctx->tune_time) {
+				if (!ctx->last_timeout) ctx->last_timeout = gf_sys_clock();
+				else {
+					u32 diff = gf_sys_clock() - ctx->last_timeout;
+					if (diff > ctx->timeout) {
+						GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] No data for %d ms, aborting\n", diff));
+						return GF_EOS;
+					}
+				}
+			}
+			gf_filter_ask_rt_reschedule(filter, 1000);
+			break;
+		} else if (!e) {
+			ctx->last_timeout = 0;
+		}
+	}
+	if (!ctx->tune_time) {
+	 	u32 diff = gf_sys_clock() - ctx->start_time;
+	 	if (diff>ctx->timeout) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] No data for %d ms, aborting\n", diff));
+			gf_filter_setup_failure(filter, GF_SERVICE_ERROR);
+			return GF_EOS;
+		}
+	}
+
+	if (ctx->stats) {
+		u32 now = gf_sys_clock() - ctx->start_time;
+		if (now >= ctx->nb_stats*ctx->stats) {
+			ctx->nb_stats+=1;
+			if (gf_filter_reporting_enabled(filter)) {
+				Double rate=0.0;
+				char szRpt[1024];
+
+				u64 st = gf_route_dmx_get_first_packet_time(ctx->route_dmx);
+				u64 et = gf_route_dmx_get_last_packet_time(ctx->route_dmx);
+				u64 nb_pck = gf_route_dmx_get_nb_packets(ctx->route_dmx);
+				u64 nb_bytes = gf_route_dmx_get_recv_bytes(ctx->route_dmx);
+
+				et -= st;
+				if (et) {
+					rate = (Double)nb_bytes*8;
+					rate /= et;
+				}
+				sprintf(szRpt, "[%us] "LLU" bytes "LLU" packets in "LLU" ms rate %.02f mbps", now/1000, nb_bytes, nb_pck, et/1000, rate);
+				gf_filter_update_status(filter, 0, szRpt);
+			}
+		}
+	}
+
+	return GF_OK;
+}
+
+
+static GF_Err routein_initialize(GF_Filter *filter)
+{
+	Bool is_atsc = GF_TRUE;
+	ROUTEInCtx *ctx = gf_filter_get_udta(filter);
+	ctx->filter = filter;
+
+	if (!ctx->src) return GF_BAD_PARAM;
+	if (!strncmp(ctx->src, "route://", 8)) {
+		is_atsc = GF_FALSE;
+	} else if (strcmp(ctx->src, "atsc://"))
+		return GF_BAD_PARAM;
+
+	if (ctx->odir) {
+		ctx->gcache = GF_FALSE;
+	}
+
+	if (ctx->gcache) {
+		ctx->dm = gf_filter_get_download_manager(filter);
+		if (!ctx->dm) return GF_SERVICE_ERROR;
+		gf_dm_set_localcache_provider(ctx->dm, routein_local_cache_probe, ctx);
+	} else {
+		//for now progressive dispatch is only possible when populating cache
+		ctx->fullseg = GF_TRUE;
+	}
+	if (!ctx->nbcached)
+		ctx->nbcached = 1;
+
+	if (is_atsc) {
+		ctx->route_dmx = gf_route_atsc_dmx_new(ctx->ifce, ctx->buffer, routein_on_event, ctx);
+	} else {
+		char *sep, *root;
+		u32 port;
+		sep = strrchr(ctx->src+8, ':');
+		if (!sep) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Missing port number\n"));
+			return GF_BAD_PARAM;
+		}
+		sep[0] = 0;
+		root = strchr(sep+1, '/');
+		if (root) root[0] = 0;
+		port = atoi(sep+1);
+		if (root) root[0] = '/';
+
+		if (!gf_sk_is_multicast_address(ctx->src+8)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] %s is not a multicast address\n"));
+			sep[0] = ':';
+			return GF_BAD_PARAM;
+		}
+		ctx->route_dmx = gf_route_dmx_new(ctx->src+8, port, ctx->ifce, ctx->buffer, routein_on_event, ctx);
+		sep[0] = ':';
+	}
+	if (!ctx->route_dmx) return GF_SERVICE_ERROR;
+	
+	gf_route_set_allow_progressive_dispatch(ctx->route_dmx, !ctx->fullseg);
+
+	gf_route_set_reorder(ctx->route_dmx, ctx->reorder, ctx->rtimeout);
+
+	if (ctx->tsidbg) {
+		gf_route_dmx_debug_tsi(ctx->route_dmx, ctx->tsidbg);
+	}
+
+	if (ctx->tunein>0) ctx->tune_service_id = ctx->tunein;
+
+	if (is_atsc) {
+ GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] ATSC 3.0 Tunein started\n"));
+		if (ctx->tune_service_id)
+ gf_route_atsc3_tune_in(ctx->route_dmx, ctx->tune_service_id, GF_FALSE);
+		else
+ gf_route_atsc3_tune_in(ctx->route_dmx, (u32) ctx->tunein, GF_TRUE);
+	}
+
+	ctx->start_time = gf_sys_clock();
+
+	if (ctx->stsi) ctx->tsi_outs = gf_list_new();
+	if (ctx->max_segs)
+		ctx->received_seg_names = gf_list_new();
+
+	ctx->nb_playing = 1;
+	ctx->initial_play_forced = GF_TRUE;
+	return GF_OK;
+}
+
+static Bool routein_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	ROUTEInCtx *ctx = gf_filter_get_udta(filter);
+	if (evt->base.type==GF_FEVT_PLAY) {
+		if (!ctx->initial_play_forced)
+			ctx->nb_playing++;
+		ctx->initial_play_forced = GF_FALSE;
+	} else {
+		ctx->nb_playing--;
+	}
+	return GF_TRUE;
+}
+
+#define OFFS(_n)	#_n, offsetof(ROUTEInCtx, _n)
+static const GF_FilterArgs ROUTEInArgs[] =
+{
+	{ OFFS(src), "URL of source content", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(ifce), "default interface to use for multicast. If NULL, the default system interface will be used", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(gcache), "indicate the files should populate GPAC HTTP cache", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(tunein), "service ID to bootstrap on for ATSC 3.0 mode (0 means tune to no service, -1 tune all services -2 means tune on first service found)", GF_PROP_SINT, "-2", NULL, 0},
+	{ OFFS(buffer), "receive buffer size to use in bytes", GF_PROP_UINT, "0x80000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(timeout), "timeout in ms after which tunein fails", GF_PROP_UINT, "5000", NULL, 0},
+ { OFFS(nbcached), "number of segments to keep in cache per service", GF_PROP_UINT, "8", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(kc), "keep corrupted file", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(skipr), "skip repeated files (ignored in cache mode)", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(stsi), "define one output PID per tsi/serviceID (ignored in cache mode)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(stats), "log statistics at the given rate in ms (0 disables stats)", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(tsidbg), "gather only objects with given TSI (debug)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(max_segs), "maximum number of segments to keep on disk", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(odir), "output directory for standalone mode", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(reorder), "ignore order flag in ROUTE/LCT packets, avoiding considering object done when TOI changes", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(rtimeout), "default timeout in ms to wait when gathering out-of-order packets", GF_PROP_UINT, "5000", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(fullseg), "only dispatch full segments in cache mode (always true for other modes)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(repair), "repair mode for corrupted files\n"
+		"- no: no repair is performed\n"
+		"- simple: simple repair is performed (incomplete `mdat` boxes will be kept)\n"
+		"- strict: incomplete mdat boxes will be lost as well as preceding `moof` boxes\n"
+		"- full: HTTP-based repair, not yet implemented"
+		, GF_PROP_UINT, "simple", "no|simple|strict|full", GF_FS_ARG_HINT_EXPERT},
+
+	{0}
+};
+
+static const GF_FilterCapability ROUTEInCaps[] =
+{
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+};
+
+GF_FilterRegister ROUTEInRegister = {
+	.name = "routein",
+	GF_FS_SET_DESCRIPTION("ROUTE input")
+#ifndef GPAC_DISABLE_DOC
+	.help = "This filter is a receiver for ROUTE sessions (ATSC 3.0 and generic ROUTE).\n"
+	"- ATSC 3.0 mode is identified by the URL `atsc://`.\n"
+	"- Generic ROUTE mode is identified by the URL `route://IP:PORT`.\n"
+	"\n"
+	"The filter can work in cached mode, source mode or standalone mode.\n"
+	"# Cached mode\n"
+	"The cached mode is the default filter behavior. It populates GPAC HTTP Cache with the received files, using `http://groute/serviceN/` as service root, `N being the ROUTE service ID.\n"
+	"In cached mode, repeated files are always pushed to cache.\n"
+	"The maximum number of media segment objects in cache per service is defined by [-nbcached](); this is a safety used to force object removal in case DASH client timing is wrong and some files are never requested at cache level.\n"
+	" \n"
+	"The cached MPD is assigned the following headers:\n"
+	"- `x-route`: integer value, indicates the ROUTE service ID.\n"
+	"- `x-route-first-seg`: string value, indicates the name of the first segment (completely or currently being) retrieved from the broadcast.\n"
+ "- `x-route-ll`: boolean value, if yes indicates that the indicated first segment is currently being received (low latency signaling).\n"
+ "- `x-route-loop`: boolean value, if yes indicates a loop in the service has been detected (usually pcap replay loop).\n"
+	" \n"
+	"The cached files are assigned the following headers:\n"
+	"- `x-route`: boolean value, if yes indicates the file comes from an ROUTE session.\n"
+	"\n"
+	"If [-max_segs]() is set, file deletion event will be triggered in the filter chain.\n"
+	"\n"
+	"# Source mode\n"
+	"In source mode, the filter outputs files on a single output PID of type `file`. "
+	"The files are dispatched once fully received, the output PID carries a sequence of complete files. Repeated files are not sent unless requested.\n"
+	"If needed, one PID per TSI can be used rather than a single PID. This avoids mixing files of different mime types on the same PID (e.g. HAS manifest and ISOBMFF).\n"
+	"EX gpac -i atsc://gcache=false -o $ServiceID$/$File$:dynext\n"
+	"This will grab the files and forward them as output PIDs, consumed by the [fout](fout) filter.\n"
+	"\n"
+	"If [-max_segs]() is set, file deletion event will be triggered in the filter chain.\n"
+	"\n"
+	"# Standalone mode\n"
+	"In standalone mode, the filter does not produce any output PID and writes received files to the [-odir]() directory.\n"
+	"EX gpac -i atsc://:odir=output\n"
+	"This will grab the files and write them to `output` directory.\n"
+	"\n"
+	"If [-max_segs]() is set, old files will be deleted.\n"
+	"\n"
+	"# File Repair\n"
+	"In case of losses or incomplete segment reception (during tune-in), the files are patched as follows:\n"
+	"- MPEG-2 TS: all lost ranges are adjusted to 188-bytes boundaries, and transformed into NULL TS packets.\n"
+	"- ISOBMFF: all top-level boxes are scanned, and incomplete boxes are transformed in `free` boxes, except mdat kept as is if [-repair]() is set to simple.\n"
+	"\n"
+	"If [-kc]() option is set, corrupted files will be kept. If [-fullseg]() is not set and files are only partially received, they will be kept.\n"
+	"\n"
+	"# Interface setup\n"
+	"On some systems (OSX), when using VM packet replay, you may need to force multicast routing on your local interface.\n"
+	"For ATSC, you will have to do this for the base signaling multicast (224.0.23.60):\n"
+	"EX route add -net 224.0.23.60/32 -interface vboxnet0\n"
+	"Then for each ROUTE service in the multicast:\n"
+	"EX route add -net 239.255.1.4/32 -interface vboxnet0\n"
+	"",
+#endif //GPAC_DISABLE_DOC
+	.private_size = sizeof(ROUTEInCtx),
+	.args = ROUTEInArgs,
+	.initialize = routein_initialize,
+	.finalize = routein_finalize,
+	SETCAPS(ROUTEInCaps),
+	.process = routein_process,
+	.process_event = routein_process_event,
+	.probe_url = routein_probe_url
+};
+
+const GF_FilterRegister *routein_register(GF_FilterSession *session)
+{
+	return &ROUTEInRegister;
+}
+
+#else
+
+const GF_FilterRegister *routein_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+
+#endif /* GPAC_DISABLE_ROUTE */
+

gpac-1.0.1.tar.gz/src/filters/in_rtp.c -> gpac-2.0.0.tar.gz/src/filters/in_rtp.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / RTP/RTSP input filter
@@ -34,7 +34,6 @@
 		GF_RTPInStream *st = (GF_RTPInStream *)gf_list_get(ctx->streams, 0);
 		gf_list_rem(ctx->streams, 0);
 		if (!is_finalized && st->opid) gf_filter_pid_remove(st->opid);
-		st->opid = NULL;
 		rtpin_stream_del(st);
 	}
 
@@ -68,11 +67,12 @@
 }
 
 //simplified version of RTSP_UnpackURL for SAT>IP
-static void rtpin_satip_get_server_ip(const char *sURL, char *Server)
+void rtpin_satip_get_server_ip(const char *sURL, char *Server)
 {
 	char schema[10], *test, text[1024], *retest;
 	u32 i, len;
 	Bool is_ipv6;
+	if (!sURL) return;
 
 	strcpy(Server, "");
 
@@ -134,7 +134,7 @@
 	GF_RTPIn *ctx = gf_filter_get_udta(filter);
 
 	if (ctx->src) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[RTPIn] Configure pid called on filter instanciated with SRC %s\n", ctx->src));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPIn] Configure pid called on filter instanciated with SRC %s\n", ctx->src));
 		return GF_BAD_PARAM;
 	}
 
@@ -193,21 +193,14 @@
 	if (!cur_stream) return;
 
 	if (switch_up) {
-		/*this is the highest stream*/
-		if (!cur_stream->next_stream) {
-			cur_stream->status = RTP_Running;
-			return;
-		} else {
-			for (i = 0; i < count; i++) {
-				stream = (GF_RTPInStream *) gf_list_get(rtp->streams, i);
-				if (stream->mid == cur_stream->next_stream) {
-					/*resume streaming next channel*/
-					rtpin_stream_init(stream, GF_FALSE);
-					stream->status = RTP_Running;
-					rtp->cur_mid = stream->mid;
-					break;
-				}
-
+		for (i = 0; i < count; i++) {
+			stream = (GF_RTPInStream *) gf_list_get(rtp->streams, i);
+			if (stream->prev_stream == cur_stream->mid) {
+				/*resume streaming next channel*/
+				rtpin_stream_init(stream, GF_FALSE);
+				stream->status = RTP_Running;
+				rtp->cur_mid = stream->mid;
+				break;
 			}
 		}
 	} else {
@@ -220,9 +213,16 @@
 				stream = (GF_RTPInStream *) gf_list_get(rtp->streams, i);
 				if (stream->mid == cur_stream->prev_stream) {
 					/*stop streaming current channel*/
+					if (cur_stream->rtp_ch->rtp)
+						gf_sk_group_unregister(rtp->sockgroup, cur_stream->rtp_ch->rtp);
+					if (cur_stream->rtp_ch->rtcp)
+						gf_sk_group_unregister(rtp->sockgroup, cur_stream->rtp_ch->rtcp);
+
 					gf_rtp_stop(cur_stream->rtp_ch);
 					cur_stream->status = RTP_Connected;
 					rtp->cur_mid = stream->mid;
+					if (cur_stream->opid)
+						gf_filter_pid_set_eos(cur_stream->opid);
 					break;
 				}
 			}
@@ -233,7 +233,7 @@
 }
 
 
-#ifdef FILTER_FIXME
+#if 0 //unused
 static void rtpin_send_data_base64(GF_RTPInStream *stream)
 {
 	u32 size;
@@ -252,6 +252,7 @@
 	size = gf_base64_decode(data, (u32) strlen(data), stream->buffer, stream->rtpin->block_size);
 
 	pck = gf_filter_pck_new_alloc(stream->opid, size, &pck_data);
+	if (!pck) return;
 	memcpy(pck_data, stream->buffer, size);
 	gf_filter_pck_set_cts(pck, (u64) (stream->current_start * stream->ts_res));
 	gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
@@ -271,6 +272,9 @@
 		rtpin_stream_ack_connect(stream, GF_OK);
 		return;
 	default:
+		if (stream->rtsp && ! (stream->rtsp->flags & RTSP_AGG_CONTROL) && stream->session_id) {
+			return;
+		}
 		break;
 	}
 	memset(&ch_desc, 0, sizeof(RTPIn_StreamDescribe));
@@ -305,6 +309,9 @@
 
 		if ((stream->status==RTP_Running) && ((ctx->last_start_range >= 0) && (ctx->last_start_range==evt->play.start_range)))
 		 	return GF_TRUE;
+		//stream was canceled due to setup failure
+		if (stream->status == RTP_Unavailable)
+			return GF_TRUE;
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Processing play on channel @%08x - %s\n", stream, stream->rtsp ? "RTSP control" : "No control (RTP)" ));
 		/*is this RTSP or direct RTP?*/
@@ -340,8 +347,7 @@
 		} else {
 			ctx->last_start_range = evt->play.start_range;
 			stream->status = RTP_Running;
-			if (!stream->next_stream)
-				ctx->cur_mid = stream->mid;
+			ctx->cur_mid = stream->mid;
 
 			if (stream->rtp_ch) {
 				//wait for RTCP to perform stream sync
@@ -398,6 +404,10 @@
 		assert(stream->rtsp);
 		rtpin_rtsp_usercom_send(stream->rtsp, stream, evt);
 		break;
+	case GF_FEVT_CONNECT_FAIL:
+		//stream canceled due to setup failure, prevent any further setup on PLAY
+		stream->status = RTP_Unavailable;
+		break;
 	default:
 		break;
 	}
@@ -599,11 +609,22 @@
 			ctx->session->connect_error = GF_OK;
 		}
 	}
+
+	//we had data, ask for immediate re-process
+	if (tot_read) {
+		gf_filter_post_process_task(filter);
+		return GF_OK;
+	}
+
 	if (ctx->max_sleep<0)
 		gf_filter_ask_rt_reschedule(filter, (u32) ((-ctx->max_sleep) *1000) );
+	else if (!ctx->min_frame_dur_ms) {
+		gf_filter_ask_rt_reschedule(filter, 1000);
+	}
 	else {
 		assert(ctx->min_frame_dur_ms <= (u32) ctx->max_sleep);
-		gf_filter_ask_rt_reschedule(filter, ctx->min_frame_dur_ms*1000);
+		//reschedule in half the frame dur
+		gf_filter_ask_rt_reschedule(filter, ctx->min_frame_dur_ms*500);
 	}
 	return GF_OK;
 }
@@ -623,6 +644,8 @@
 	ctx->last_start_range = -1.0;
 
 	ctx->sockgroup = gf_sk_group_new();
+	//prevent blocking so that we are always called even if output is full
+	gf_filter_prevent_blocking(filter, GF_TRUE);
 
 	//sdp mode, we will have a configure_pid
 	if (!ctx->src) return GF_OK;
@@ -651,7 +674,7 @@
 		} else {
 			ip = gf_strdup(ip);
 		}
-		stream = rtpin_stream_new_standalone(ctx, ip, port);
+		stream = rtpin_stream_new_standalone(ctx, ip, port, GF_FALSE);
 		gf_free(ip);
 		if (!stream)
 			e = GF_OUT_OF_MEM;
@@ -745,31 +768,34 @@
 static const GF_FilterArgs RTPInArgs[] =
 {
 	{ OFFS(src), "location of source content (SDP, RTP or RTSP URL)", GF_PROP_NAME, NULL, NULL, 0},
-	{ OFFS(firstport), "default first port number to use. 0 lets the filter decide", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(firstport), "default first port number to use (0 lets the filter decide)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ifce), "default interface IP to use for multicast. If NULL, the default system interface will be used", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ttl), "multicast TTL", GF_PROP_UINT, "127", "0-127", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(reorder_len), "reorder length in packets", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(reorder_delay), "max delay in RTP reorderer, packets will be dispatched after that", GF_PROP_UINT, "50", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(block_size), "buffer size fur RTP/UDP or RTSP when interleaved", GF_PROP_UINT, "0x200000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(reorder_delay), "max delay in RTP re-orderer, packets will be dispatched after that", GF_PROP_UINT, "50", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(block_size), "buffer size for RTP/UDP or RTSP when interleaved", GF_PROP_UINT, "0x200000", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(disable_rtcp), "disable RTCP reporting", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(nat_keepalive), "delay in ms of NAT keepalive, disabled by default (except for SatIP, set to 30s by default)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(force_mcast), "force multicast on indicated IP in RTSP setup", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(use_client_ports), "force using client ports (hack for some RTSP servers overriding client ports)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(use_client_ports), "force using client ports (hack for some RTSP servers overriding client ports)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(bandwidth), "set bandwidth param for RTSP requests", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(default_port), "set default RTSP port", GF_PROP_UINT, "554", "0-65535", 0},
 	{ OFFS(satip_port), "set default port for SATIP", GF_PROP_UINT, "1400", "0-65535", 0},
 	{ OFFS(interleave), "set RTP over RTSP", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(udp_timeout), "default timeout before considering UDP is down", GF_PROP_UINT, "10000", NULL, 0},
 	{ OFFS(rtsp_timeout), "default timeout before considering RTSP is down", GF_PROP_UINT, "3000", NULL, 0},
-	{ OFFS(rtcp_timeout), "default timeout for RTCP trafic in ms. After this timeout, playback will start unsync. If 0 always wait for RTCP", GF_PROP_UINT, "5000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(rtcp_timeout), "default timeout for RTCP traffic in ms. After this timeout, playback will start out of sync. If 0 always wait for RTCP", GF_PROP_UINT, "5000", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(autortsp), "automatically reconfig RTSP interleaving if UDP timeout", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(first_packet_drop), "set number of first RTP packet to drop - 0 if no drop", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(frequency_drop), "drop 1 out of N packet - 0 disable droping", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(first_packet_drop), "set number of first RTP packet to drop (0 if no drop)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(frequency_drop), "drop 1 out of N packet (0 disable dropping)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(user_agent), "user agent string, by default solved from GPAC preferences", GF_PROP_STRING, "$GUA", NULL, 0},
 	{ OFFS(languages), "user languages, by default solved from GPAC preferences", GF_PROP_STRING, "$GLANG", NULL, 0},
-	{ OFFS(stats), "update statistics to the user every given MS, 0 disables reporting", GF_PROP_UINT, "500", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(max_sleep), "set max sleep in milliseconds. A negative value -N means to always sleep for N ms, a positive value N means to sleep at most N ms but will sleep less if frame duration is shorter", GF_PROP_SINT, "1000", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(stats), "update statistics to the user every given MS (0 disables reporting)", GF_PROP_UINT, "500", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(max_sleep), "set max sleep in milliseconds:\n"
+	"- a negative value `-N` means to always sleep for `N` ms\n"
+	"- a positive value `N` means to sleep at most `N` ms but will sleep less if frame duration is shorter", GF_PROP_SINT, "1000", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(rtcpsync), "use RTCP to adjust synchronization", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(forceagg), "force RTSP control aggregation (patch for buggy servers)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -782,7 +808,7 @@
 	"- RTP direct url through `rtp://` protocol scheme\n"
 	"- RTSP session processing through `rtsp://` and `satip://` protocol schemes\n"
 	" \n"
-	"The filter produces either media PIDs and compressed media frames, or file PIDs and multiplex data (e.g., MPEG-2 TS).")
+	"The filter produces either PIDs with media frames, or file PIDs with multiplexed data (e.g. MPEG-2 TS).")
 	.private_size = sizeof(GF_RTPIn),
 	.args = RTPInArgs,
 	.initialize = rtpin_initialize,

gpac-1.0.1.tar.gz/src/filters/in_rtp.h -> gpac-2.0.0.tar.gz/src/filters/in_rtp.h Changed

@@ -54,6 +54,7 @@
 	Bool disable_rtcp;
 	u32 default_port;
 	u32 rtsp_timeout, udp_timeout, rtcp_timeout, stats;
+	Bool forceagg;
 	/*transport mode. 0 is udp, 1 is tcp, 3 is tcp if unreliable media */
 	u32 interleave;
 	s32 max_sleep;
@@ -154,8 +155,6 @@
 
 void rtpin_rtsp_process_commands(GF_RTPInRTSP *sess);
 
-void rtpin_send_message(GF_RTPIn *ctx, GF_Err e, const char *message);
-
 /*RTP channel state*/
 enum
 {
@@ -265,7 +264,6 @@
 	u32 mid;
 
 	u32 prev_stream;
-	u32 next_stream;
 	u32 base_stream;
 
 	u32 rtcp_check_start;
@@ -282,9 +280,8 @@
 
 /*creates new RTP stream from SDP info*/
 GF_RTPInStream *rtpin_stream_new(GF_RTPIn *rtp, GF_SDPMedia *media, GF_SDPInfo *sdp, GF_RTPInStream *input_stream);
-/*creates new SAT>IP stream*/
-GF_RTPInStream *rtpin_stream_new_satip(GF_RTPIn *rtp, const char *server_ip);
-GF_RTPInStream *rtpin_stream_new_standalone(GF_RTPIn *rtp, const char *flow_ip, u32 port);
+/*creates new standalone RTP stream, or new SAT>IP stream*/
+GF_RTPInStream *rtpin_stream_new_standalone(GF_RTPIn *rtp, const char *flow_ip, u32 port, Bool for_satip);
 
 /*destroys RTP stream */
 void rtpin_stream_del(GF_RTPInStream *stream);
@@ -354,6 +351,8 @@
 
 void rtpin_stream_on_rtp_pck(GF_RTPInStream *stream, char *pck, u32 size);
 
+void rtpin_satip_get_server_ip(const char *sURL, char *Server);
+
 #endif /*GPAC_DISABLE_STREAMING*/
 
 #endif //_IN_RTP_H_

gpac-1.0.1.tar.gz/src/filters/in_rtp_rtsp.c -> gpac-2.0.0.tar.gz/src/filters/in_rtp_rtsp.c Changed

@@ -45,7 +45,6 @@
 	GF_RTSPCommand *com;
 	GF_Err e;
 	u32 time;
-	char sMsg[1000];
 
 	com = (GF_RTSPCommand *)gf_list_get(sess->rtsp_commands, 0);
 
@@ -112,8 +111,7 @@
 	case GF_RTSP_STATE_WAIT_FOR_CONTROL:
 		return;
 	case GF_RTSP_STATE_INVALIDATED:
-		sprintf(sMsg, "Cannot send %s", com->method);
-		rtpin_send_message(sess->rtpin, GF_IP_NETWORK_FAILURE, sMsg);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSPIn] Cannot send %s: %s\n", com->method, gf_error_to_string(GF_IP_NETWORK_FAILURE) ));
 		gf_list_rem(sess->rtsp_commands, 0);
 		gf_rtsp_command_del(com);
 		sess->flags &= ~RTSP_WAIT_REPLY;
@@ -123,9 +121,11 @@
 	/*process*/
 	if (!com->User_Agent) com->User_Agent = (char *) sess->rtpin->user_agent;
 	com->Accept_Language = (char *) sess->rtpin->languages;
-	/*if no session assigned and a session ID is valid, use it*/
-	if (sess->session_id && !com->Session)
+
+	/*if no session assigned but session-level ID was required, use it*/
+	if (!com->Session && com->user_flags) {
 		com->Session = sess->session_id;
+	}
 
 	/*preprocess describe before sending (always the ESD url thing)*/
 	if (!strcmp(com->method, GF_RTSP_DESCRIBE)) {
@@ -147,8 +147,7 @@
 	}
 	e = gf_rtsp_send_command(sess->session, com);
 	if (e) {
-		sprintf(sMsg, "Cannot send %s", com->method);
-		rtpin_send_message(sess->rtpin, e, sMsg);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSPIn] Cannot send %s\n", com->method ));
 		rtpin_rtsp_process_response(sess, com, e);
 	} else {
 		sess->command_time = gf_sys_clock();
@@ -367,17 +366,5 @@
 	gf_free(sess);
 }
 
-void rtpin_send_message(GF_RTPIn *ctx, GF_Err e, const char *message)
-{
-/*	GF_NetworkCommand com;
-	memset(&com, 0, sizeof(com));
-	com.command_type = GF_NET_SERVICE_EVENT;
-	com.send_event.evt.type = GF_EVENT_MESSAGE;
-	com.send_event.evt.message.message = message;
-	com.send_event.evt.message.error = e;
-	gf_service_command(service, &com, GF_OK);
-*/
-
-}
 
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-1.0.1.tar.gz/src/filters/in_rtp_sdp.c -> gpac-2.0.0.tar.gz/src/filters/in_rtp_sdp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / RTP/RTSP input filter
@@ -55,7 +55,8 @@
 		//NPT range only for now
 		else if (!strcmp(att->Name, "range") && !range) range = gf_rtsp_range_parse(att->Value);
 		/*we have the H264-SVC streams*/
-		else if (!strcmp(att->Name, "group") && !strncmp(att->Value, "DDP", 3)) rtp->is_scalable = GF_TRUE;
+		else if (!strcmp(att->Name, "group") && !strncmp(att->Value, "DDP", 3))
+			rtp->is_scalable = GF_TRUE;
 	}
 	if (range) {
 		Start = range->start;
@@ -63,6 +64,14 @@
 		gf_rtsp_range_del(range);
 	}
 
+	if (!sess_ctrl && rtp->session) {
+		if (rtp->forceagg) {
+			sess_ctrl = "*";
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTPIn] Session-level control missing in RTSP SDP - if playback failure, retry specifying `--forceagg`\n"));
+		}
+	}
+
 	//setup all streams
 	i=0;
 	while ((media = (GF_SDPMedia*)gf_list_enum(sdp->media_desc, &i))) {
@@ -107,6 +116,9 @@
 	return GF_OK;
 }
 
+//we now ignore the IOD (default scene anyway) and let the user deal with the media streams
+//code is kept for reference
+#if 0
 /*load iod from data:application/mpeg4-iod;base64*/
 static GF_Err rtpin_sdp_load_iod(GF_RTPIn *rtp, char *iod_str)
 {
@@ -145,6 +157,7 @@
 	gf_odf_desc_read(buf, size, &rtp->iod_desc);
 	return GF_OK;
 }
+#endif
 
 void rtpin_declare_pid(GF_RTPInStream *stream, Bool force_iod, u32 ch_idx, u32 *ocr_es_id)
 {
@@ -171,6 +184,7 @@
 		dur.den = 1000;
 		dur.num = (s64) (1000 * (stream->range_end - stream->range_start));
 		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(dur) );
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_SEEK ) );
 	} else {
 		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_NONE ) );
 	}
@@ -181,7 +195,7 @@
 	//od->objectDescriptorID = stream->OD_ID ? stream->OD_ID : stream->ES_ID;
 
 	// for each channel depending on this channel, get esd, set esd->dependsOnESID and add to od
-	if (stream->rtpin->is_scalable) {
+	if (stream->rtpin->is_scalable && stream->prev_stream) {
 		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT( stream->prev_stream) );
 	}
 
@@ -244,7 +258,7 @@
 
 	/*ISMACryp config*/
 	if (stream->depacketizer->flags & GF_RTP_HAS_ISMACRYP) {
-		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, &PROP_UINT(GF_ISOM_ISMACRYP_SCHEME) );
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, &PROP_4CC(GF_ISOM_ISMACRYP_SCHEME) );
 
 		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_PROTECTION_SCHEME_VERSION, &PROP_UINT(1) );
 		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_PROTECTION_KMS_URI, &PROP_STRING(stream->depacketizer->key) );
@@ -259,27 +273,34 @@
 	}
 
 
-	if (sl_map->StreamType==GF_STREAM_AUDIO) {
-		switch (sl_map->CodecID) {
-		case GF_CODECID_AAC_MPEG4:
-		case GF_CODECID_AAC_MPEG2_MP:
-		case GF_CODECID_AAC_MPEG2_LCP:
-		case GF_CODECID_AAC_MPEG2_SSRP:
-			if (sl_map->config) {
+	switch (sl_map->CodecID) {
+	case GF_CODECID_AAC_MPEG4:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	case GF_CODECID_AAC_MPEG2_SSRP:
+		if (sl_map->config) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-				GF_M4ADecSpecInfo acfg;
-				gf_m4a_get_config(sl_map->config, sl_map->configSize, &acfg);
-				gf_filter_pid_set_property(stream->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(acfg.base_sr) );
-				gf_filter_pid_set_property(stream->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(acfg.nb_chan) );
+			GF_M4ADecSpecInfo acfg;
+			gf_m4a_get_config(sl_map->config, sl_map->configSize, &acfg);
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(acfg.base_sr) );
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(acfg.nb_chan) );
 #endif
 
-			} else {
-				gf_filter_pid_set_property(stream->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(gf_rtp_get_clockrate(stream->rtp_ch) ) );
-				gf_filter_pid_set_property(stream->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(2) );
-
-			}
-			break;
+		} else {
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(gf_rtp_get_clockrate(stream->rtp_ch) ) );
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(2) );
 		}
+		break;
+	//declare as unframed the following for decoder config extraction
+	case GF_CODECID_MPEG1:
+	case GF_CODECID_MPEG2_SIMPLE:
+	case GF_CODECID_MPEG2_MAIN:
+	case GF_CODECID_MPEG2_HIGH:
+	case GF_CODECID_MPEG2_422:
+	case GF_CODECID_MPEG2_SNR:
+	case GF_CODECID_MPEG2_SPATIAL:
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+		break;
 	}
 }
 
@@ -293,7 +314,7 @@
 	i=0;
 	while ((stream = (GF_RTPInStream *)gf_list_enum(rtp->streams, &i))) {
 		if (stream->control && !strnicmp(stream->control, "data:", 5)) continue;
-		if (stream->prev_stream) continue;
+
 		if (rtp->stream_type && (rtp->stream_type!=stream->depacketizer->sl_map.StreamType)) continue;
 
 		rtpin_declare_pid(stream, force_iod, i, &ocr_es_id);
@@ -307,12 +328,13 @@
 	u32 i;
 	GF_SDPInfo *sdp;
 	Bool is_isma_1;
-	char *iod_str;
+#if 0
+	char *iod_str = NULL;
+#endif
 	GF_X_Attribute *att;
 	Bool force_in_iod = GF_FALSE;
 
 	is_isma_1 = GF_FALSE;
-	iod_str = NULL;
 	sdp = gf_sdp_info_new();
 	e = gf_sdp_info_parse(sdp, sdp_text, sdp_len);
 
@@ -335,16 +357,23 @@
 		/*look for IOD*/
 		i=0;
 		while ((att = (GF_X_Attribute*)gf_list_enum(sdp->Attributes, &i))) {
+#if 0
 			if (!iod_str && !strcmp(att->Name, "mpeg4-iod") ) iod_str = att->Value;
+#endif
 			if (!is_isma_1 && !strcmp(att->Name, "isma-compliance") ) {
 				if (!stricmp(att->Value, "1,1.0,1")) is_isma_1 = GF_TRUE;
 			}
 		}
 
+#if 0
 		/*force iod reconstruction with ISMA to use proper clock dependencies*/
 		if (is_isma_1) iod_str = NULL;
 
-		if (!iod_str) {
+		if (iod_str) {
+			e = rtpin_sdp_load_iod(rtp, iod_str);
+		} else
+#endif
+		{
 			GF_RTPInStream *a_stream;
 			i=0;
 			while (!force_in_iod && (a_stream = (GF_RTPInStream *)gf_list_enum(rtp->streams, &i))) {
@@ -361,8 +390,6 @@
 			}
 		}
 
-		if (iod_str) e = rtpin_sdp_load_iod(rtp, iod_str);
-
 		/* service failed*/
 		if (e) gf_filter_setup_failure(rtp->filter, e);
 		else rtpin_declare_media(rtp, force_in_iod);

gpac-1.0.1.tar.gz/src/filters/in_rtp_signaling.c -> gpac-2.0.0.tar.gz/src/filters/in_rtp_signaling.c Changed

@@ -55,7 +55,13 @@
 static void rtpin_rtsp_queue_command(GF_RTPInRTSP *sess, GF_RTPInStream *stream, GF_RTSPCommand *com, Bool needs_sess_id)
 {
 	if (needs_sess_id) {
-		com->Session = sess->session_id;
+		if (stream && !(stream->rtsp->flags & RTSP_AGG_CONTROL)) {
+			com->Session = stream->session_id;
+		} else {
+			com->Session = sess->session_id;
+			//session_id can still be null (setup reply not yet processed), remember we need it
+			com->user_flags = 1;
+		}
 	}
 	gf_list_add(sess->rtsp_commands, com);
 }
@@ -197,7 +203,11 @@
 		goto exit;
 	}
 	if (!sess->session_id) sess->session_id = gf_strdup(sess->rtsp_rsp->Session);
-	assert(!stream->session_id);
+
+	if (! (stream->rtsp->flags & RTSP_AGG_CONTROL) ) {
+		assert(!stream->session_id);
+		stream->session_id = gf_strdup(sess->rtsp_rsp->Session);
+	}
 
 	/*transport setup: break at the first correct transport */
 	i=0;
@@ -230,8 +240,10 @@
 		gf_rtp_set_interleave_callbacks(stream->rtp_ch, rtpin_rtsp_tcp_send_report, stream, stream);
 		sess->flags |= RTSP_TCP_FLUSH;
 #ifdef GPAC_ENABLE_COVERAGE
-		if (gf_sys_is_cov_mode())
+		if (gf_sys_is_cov_mode()) {
 			rtpin_rtsp_tcp_send_report(NULL, NULL, GF_FALSE, NULL, 0);
+			rtpin_satip_get_server_ip(NULL, NULL);
+		}
 #endif
 	}
 
@@ -268,7 +280,7 @@
 	RTPIn_StreamDescribe *ch_desc;
 	/*not a channel describe*/
 	if (!com->user_data) {
-		rtpin_send_message(sess->rtpin, GF_OK, "Connecting...");
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSPIn] Connecting ...\n" ));
 		return GF_TRUE;
 	}
 
@@ -314,7 +326,7 @@
 	if (ch_desc) {
 		stream = rtpin_find_stream(sess->rtpin, ch_desc->opid, ch_desc->ES_ID, ch_desc->esd_url, GF_FALSE);
 	} else {
-		rtpin_send_message(sess->rtpin, GF_OK, "Connected");
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSPIn] Connected\n" ));
 	}
 
 	/*error on loading SDP is done internally*/
@@ -399,7 +411,7 @@
 		}
 		
 		/*hardcoded channel*/
-		stream = rtpin_stream_new_satip(sess->rtpin, sess->satip_server);
+		stream = rtpin_stream_new_standalone(sess->rtpin, sess->satip_server, 0, GF_TRUE);
 		if (!stream) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("SAT>IP: couldn't create the RTP stream.\n"));
 			return;
@@ -476,6 +488,14 @@
 		assert(stream->opid == ch_ctrl->evt.base.on_pid);
 	}
 
+	if (!com->Session) {
+		if (stream && !(stream->rtsp->flags & RTSP_AGG_CONTROL) ) {
+			com->Session = stream->session_id;
+		} else {
+			com->Session = sess->session_id;
+		}
+	}
+
 	skip_it = GF_FALSE;
 	if (!com->Session) {
 		/*re-SETUP failed*/
@@ -631,8 +651,17 @@
 		}
 	} else if (ch_ctrl->evt.base.type == GF_FEVT_STOP) {
 		sess->rtpin->eos_probe_start = gf_sys_clock();
-		if (stream)
+
+		if (sess->flags & RTSP_AGG_CONTROL) {
+			u32 i, count = gf_list_count(sess->rtpin->streams);
+			for (i=0; i<count; i++) {
+				stream = gf_list_get(sess->rtpin->streams, i);
+				if (stream->rtsp == sess)
+					stream->flags |= RTP_EOS;
+			}
+		} else if (stream) {
 			stream->flags |= RTP_EOS;
+		}
 	}
 	gf_free(ch_ctrl);
 	com->user_data = NULL;
@@ -747,16 +776,11 @@
 
 		if (sess->flags & RTSP_AGG_CONTROL)
 			rtpin_rtsp_skip_command(stream);
-		else if (strlen(stream->control))
+		else if (stream->control && strlen(stream->control))
 			com->ControlString = gf_strdup(stream->control);
 
 		if (rtpin_rtsp_is_active(stream)) {
 			if (!com->ControlString && stream->control) com->ControlString = gf_strdup(stream->control);
-		} else {
-			if (com->ControlString) {
-				gf_free(com->ControlString);
-				com->ControlString=NULL;
-			}
 		}
 
 	} else if (evt->base.type == GF_FEVT_PAUSE) {
@@ -801,8 +825,15 @@
 		}
 		/* otherwise send a PAUSE on the stream */
 		else {
-			if (stream->paused) {
+			//stream paused or not running, don't send event
+			if (stream->paused || (stream->status<RTP_Running)) {
 				if (com) gf_rtsp_command_del(com);
+				//if last active stream, send teardown
+				if (!rtpin_rtsp_is_active(stream))
+					rtpin_rtsp_teardown(sess, NULL);
+				//mark as disconnected and start processing eos
+				stream->status = RTP_Disconnected;
+				stream->flags |= RTP_EOS;
 				return;
 			}
 			range = gf_rtsp_range_new();

gpac-1.0.1.tar.gz/src/filters/in_rtp_stream.c -> gpac-2.0.0.tar.gz/src/filters/in_rtp_stream.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / RTP/RTSP input filter
@@ -164,6 +164,8 @@
 	}
 
 	pck = gf_filter_pck_new_alloc(stream->opid, size, &pck_data);
+	if (!pck) return;
+	
 	memcpy(pck_data, payload, size);
 	if (hdr->decodingTimeStampFlag)
 		gf_filter_pck_set_dts(pck, hdr->decodingTimeStamp);
@@ -218,7 +220,7 @@
 	hdr->decodingTimeStamp = dts;
 }
 
-GF_RTPInStream *rtpin_stream_new_satip(GF_RTPIn *rtp, const char *server_ip)
+GF_RTPInStream *rtpin_stream_new_standalone(GF_RTPIn *rtp, const char *flow_ip, u32 port, Bool for_satip)
 {
 	GF_RTSPTransport trans;
 	GF_RTPInStream *tmp;
@@ -229,69 +231,39 @@
 
 	/*create an RTP channel*/
 	tmp->rtp_ch = gf_rtp_new();
-	tmp->control = gf_strdup("*");
 
 	memset(&trans, 0, sizeof(GF_RTSPTransport));
 	trans.Profile = "RTP/AVP";
-	trans.source = (char *) server_ip;
-	trans.IsUnicast = GF_TRUE;
-	trans.client_port_first = 0;
-	trans.client_port_last = 0;
-	trans.port_first = 0;
-	trans.port_last = 0;
+	trans.source = (char *) flow_ip;
+	if (for_satip) {
+		tmp->control = gf_strdup("*");
 
-	if (gf_rtp_setup_transport(tmp->rtp_ch, &trans, NULL) != GF_OK) {
-		rtpin_stream_del(tmp);
-		return NULL;
+		trans.IsUnicast = GF_TRUE;
+		//ports not set for satip
+	} else {
+		trans.IsUnicast = gf_sk_is_multicast_address(flow_ip);
+		trans.client_port_first = port;
+		trans.client_port_last = port+1;
+		trans.port_first = port;
+		trans.port_last = port+1;
 	}
 
-	gf_rtp_setup_payload(tmp->rtp_ch, 33, 90000);
-
-	if (rtp->disable_rtcp) tmp->flags |= RTP_ENABLE_RTCP;
-
-	/*setup NAT keep-alive*/
-	gf_rtp_enable_nat_keepalive(tmp->rtp_ch, rtp->nat_keepalive ? rtp->nat_keepalive : 30000);
-
-	tmp->range_start = 0;
-	tmp->range_end = 0;
-
-	return tmp;
-}
-
-GF_RTPInStream *rtpin_stream_new_standalone(GF_RTPIn *rtp, const char *flow_ip, u32 port)
-{
-	GF_RTSPTransport trans;
-	GF_RTPInStream *tmp;
-	GF_SAFEALLOC(tmp, GF_RTPInStream);
-	if (!tmp) return NULL;
-	tmp->rtpin = rtp;
-	tmp->buffer = gf_malloc(sizeof(char) * rtp->block_size);
-
-	/*create an RTP channel*/
-	tmp->rtp_ch = gf_rtp_new();
-
-	memset(&trans, 0, sizeof(GF_RTSPTransport));
-	trans.Profile = "RTP/AVP";
-	trans.source = (char *) flow_ip;
-	trans.IsUnicast = gf_sk_is_multicast_address(flow_ip);
-	trans.client_port_first = port;
-	trans.client_port_last = port+1;
-	trans.port_first = port;
-	trans.port_last = port+1;
-
 	if (gf_rtp_setup_transport(tmp->rtp_ch, &trans, NULL) != GF_OK) {
 		rtpin_stream_del(tmp);
 		return NULL;
 	}
 
-//	gf_rtp_setup_payload(tmp->rtp_ch, 33, 90000);
+	if (for_satip)
+		gf_rtp_setup_payload(tmp->rtp_ch, 33, 90000);
 
-	if (rtp->disable_rtcp) tmp->flags |= RTP_ENABLE_RTCP;
+	if (rtp->disable_rtcp)
+		tmp->flags |= RTP_ENABLE_RTCP;
 
 	/*setup NAT keep-alive*/
 	gf_rtp_enable_nat_keepalive(tmp->rtp_ch, rtp->nat_keepalive ? rtp->nat_keepalive : 30000);
 	tmp->range_start = 0;
 	tmp->range_end = 0;
+
 	return tmp;
 }
 
@@ -338,9 +310,13 @@
 			sscanf(att->Value, "%*d lay L%d %*s %2999s", &base_stream, buf);
 			if (!strlen(buf))
 				sscanf(att->Value, "%*d lay %2999s", buf);
+			//we only check first indicated dependency
+			char *sep = strchr(buf, ':');
+			if (sep) sep[0] = 0;
 			sscanf(buf, "L%d", &prev_stream);
 		}
 	}
+	if (!base_stream && mid) base_stream = mid;
 
 	if (range) {
 		Start = range->start;
@@ -470,7 +446,7 @@
 		if (rvc_data) {
 			if (is_gz) {
 #ifdef GPAC_DISABLE_ZLIB
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("Error: no zlib support - RVC not supported in RTP\n"));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("Error: no zlib support - RVC not supported in RTP\n"));
 				gf_free(rvc_data);
 				return NULL;
 #else
@@ -655,8 +631,7 @@
 
 		ntp_diff_us = max_ntp_us;
 		ntp_diff_us -= stream->init_ntp_us;
-		ntp_diff_us *= stream->rtp_ch->TimeScale;
-		ntp_diff_us /= 1000000;
+		ntp_diff_us = gf_timestamp_rescale(ntp_diff_us, 1000000, stream->rtp_ch->TimeScale);
 		stream->ts_adjust = ntp_diff_us;
 	}
 }
@@ -685,8 +660,7 @@
 
 		//ntp time at origin: ntp(now) - ntp(first_pck) = rtpts(now) - rtpts(orig) -> ntp_first = ntp - rtp_diff
 		rtp_diff_us = stream->rtp_ch->last_SR_rtp_time - (stream->first_rtp_ts - 1);
-		rtp_diff_us *= 1000000;
-		rtp_diff_us /= stream->rtp_ch->TimeScale;
+		rtp_diff_us = gf_timestamp_rescale(rtp_diff_us, stream->rtp_ch->TimeScale, 1000000);
 
 		stream->init_ntp_us = ntp_clock_us - rtp_diff_us;
 
@@ -739,10 +713,10 @@
 			rtpin_stream_on_rtp_pck(stream, stream->buffer, size);
 		}
 	}
-	if (!tot_size) return 0;
 
 	/*and send the report*/
-	if (stream->flags & RTP_ENABLE_RTCP) gf_rtp_send_rtcp_report(stream->rtp_ch);
+	if (tot_size && (stream->flags & RTP_ENABLE_RTCP))
+		gf_rtp_send_rtcp_report(stream->rtp_ch);
 
 	/*detect timeout*/
 	if (stream->rtpin->udp_timeout) {
@@ -751,12 +725,14 @@
 		} else if (stream->rtp_ch->net_info.IsUnicast) {
 			u32 diff = gf_sys_clock() - stream->last_udp_time;
 			if (diff >= stream->rtpin->udp_timeout) {
-				char szMessage[1024];
-				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] UDP Timeout after %d ms\n", diff));
-				sprintf(szMessage, "No data received in %d ms%s", diff, stream->rtpin->autortsp ? ", retrying using TCP" : "");
-				rtpin_send_message(stream->rtpin, GF_IP_UDP_TIMEOUT, szMessage);
-				if (stream->rtpin->autortsp)
+				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] UDP Timeout after %d ms on stream %d%s\n", diff, stream->ES_ID,
+					(stream->rtpin->session && stream->rtpin->autortsp) ? ", retrying using TCP" : ""));
+
+				if (stream->rtpin->autortsp && stream->rtpin->session && !stream->rtpin->retry_tcp) {
 					stream->rtpin->retry_tcp = GF_TRUE;
+				} else {
+					gf_filter_pid_set_eos(stream->opid);
+				}
 			}
 		}
 	}

gpac-1.0.1.tar.gz/src/filters/in_sock.c -> gpac-2.0.0.tar.gz/src/filters/in_sock.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2019
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / generic TCP/UDP input filter
@@ -44,7 +44,7 @@
 #endif
 	char address[GF_MAX_IP_NAME_LEN];
 
-	u64 start_time;
+	u64 start_time, last_stats_time;
 	u64 nb_bytes;
 	Bool done;
 
@@ -54,7 +54,7 @@
 {
 	//options
 	const char *src;
-	u32 block_size, sockbuf;
+	u32 block_size;
 	u32 port, maxc;
 	char *ifce;
 	const char *ext;
@@ -152,7 +152,7 @@
 		}
 
 	} else {
-		e = gf_sk_connect(ctx->sock_c.socket, url, port, ctx->ifce);
+		e = gf_sk_connect(ctx->sock_c.socket, url, port, NULL);
 	}
 
 	if (str) str[0] = ':';
@@ -163,14 +163,19 @@
 		return e;
 	}
 
-	gf_sk_set_buffer_size(ctx->sock_c.socket, 0, ctx->sockbuf);
-	gf_sk_set_block_mode(ctx->sock_c.socket, !ctx->block);
-
-
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[SockIn] opening %s%s\n", ctx->src, ctx->listen ? " in server mode" : ""));
 
 	if (ctx->block_size<2000)
 		ctx->block_size = 2000;
+
+	if (ctx->is_udp) {
+		ctx->block_size = (ctx->block_size / 188) * 188;
+
+		gf_filter_prevent_blocking(filter, GF_TRUE);
+	}
+	gf_sk_set_buffer_size(ctx->sock_c.socket, 0, ctx->block_size);
+	gf_sk_set_block_mode(ctx->sock_c.socket, (!ctx->is_udp && ctx->block) ? GF_FALSE : GF_TRUE);
+
 	ctx->buffer = gf_malloc(ctx->block_size + 1);
 	if (!ctx->buffer) return GF_OUT_OF_MEM;
 	//ext/mime given and not mpeg2, disable probe
@@ -228,7 +233,10 @@
 	GF_SockInClient *sc = (GF_SockInClient *) gf_filter_pid_get_udta(pid);
 	sc->pck_out = GF_FALSE;
 	data = (char *) gf_filter_pck_get_data(pck, &size);
-	if (data) gf_free(data);
+	if (data) {
+		data-=12;
+		gf_free(data);
+	}
 }
 #endif
 
@@ -249,8 +257,8 @@
 
 static GF_Err sockin_read_client(GF_Filter *filter, GF_SockInCtx *ctx, GF_SockInClient *sock_c)
 {
-	u32 nb_read;
-	u64 bitrate;
+	u32 nb_read, pos;
+	u64 now;
 	GF_Err e;
 	GF_FilterPacket *dst_pck;
 	u8 *out_data, *in_data;
@@ -260,26 +268,44 @@
 	if (sock_c->pck_out)
 		return GF_OK;
 
-	if (sock_c->pid && gf_filter_pid_would_block(sock_c->pid)) {
+	if (sock_c->pid && !ctx->is_udp && gf_filter_pid_would_block(sock_c->pid)) {
 		return GF_OK;
 	}
 
 	if (!sock_c->start_time) sock_c->start_time = gf_sys_clock_high_res();
 
-	e = gf_sk_receive_no_select(sock_c->socket, ctx->buffer, ctx->block_size, &nb_read);
-	switch (e) {
-	case GF_IP_NETWORK_EMPTY:
-		return GF_OK;
-	case GF_OK:
-		break;
-	case GF_IP_CONNECTION_CLOSED:
-		if (!sock_c->done) {
-			sock_c->done = GF_TRUE;
-			gf_filter_pid_set_eos(sock_c->pid);
+	pos = 0;
+	nb_read=0;
+	while (pos < ctx->block_size) {
+		u32 read=0;
+		e = gf_sk_receive_no_select(sock_c->socket, ctx->buffer+pos, ctx->block_size - pos, &read);
+		if (e) {
+			if (nb_read) break;
+			switch (e) {
+			case GF_IP_NETWORK_EMPTY:
+				return GF_OK;
+			case GF_OK:
+				break;
+			case GF_IP_CONNECTION_CLOSED:
+				if (!sock_c->done) {
+					sock_c->done = GF_TRUE;
+					gf_filter_pid_set_eos(sock_c->pid);
+				}
+				return GF_EOS;
+			default:
+				return e;
+			}
 		}
-		return GF_EOS;
-	default:
-		return e;
+		nb_read+=read;
+		if (!ctx->is_udp
+#ifndef GPAC_DISABLE_STREAMING
+		 || sock_c->rtp_reorder
+#else
+		 || sock_c->is_rtp
+#endif
+		 )
+			break;
+		pos += read;
 	}
 	if (!nb_read) return GF_OK;
 	sock_c->nb_bytes += nb_read;
@@ -336,8 +362,10 @@
 		pck = (char *) gf_rtp_reorderer_get(sock_c->rtp_reorder, &nb_read, GF_FALSE);
 		if (pck) {
 			dst_pck = gf_filter_pck_new_shared(sock_c->pid, pck+12, nb_read-12, sockin_rtp_destructor);
-			gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
-			gf_filter_pck_send(dst_pck);
+			if (dst_pck) {
+				gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+				gf_filter_pck_send(dst_pck);
+			}
 		}
 		return GF_OK;
 	}
@@ -349,17 +377,23 @@
 #endif
 
 	dst_pck = gf_filter_pck_new_alloc(sock_c->pid, nb_read, &out_data);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+
 	memcpy(out_data, in_data, nb_read);
 
 	gf_filter_pck_set_framing(dst_pck, (sock_c->nb_bytes == nb_read) ? GF_TRUE : GF_FALSE, GF_FALSE);
 	gf_filter_pck_send(dst_pck);
 
 	//send bitrate
-	bitrate = ( gf_sys_clock_high_res() - sock_c->start_time );
-	if (bitrate) {
-		bitrate = (sock_c->nb_bytes * 8 * 1000000) / bitrate;
-		gf_filter_pid_set_property(sock_c->pid, GF_PROP_PID_DOWN_RATE, &PROP_UINT((u32) bitrate) );
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[SockIn] Receiving from %s at %d kbps\r", sock_c->address, (u32) (bitrate/10)));
+	now = gf_sys_clock_high_res();
+	if (now > sock_c->last_stats_time + 100000) {
+		sock_c->last_stats_time = now;
+		u64 bitrate = (now - sock_c->start_time );
+		if (bitrate) {
+			bitrate = (sock_c->nb_bytes * 8 * 1000000) / bitrate;
+			gf_filter_pid_set_info(sock_c->pid, GF_PROP_PID_DOWN_RATE, &PROP_UINT((u32) bitrate) );
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[SockIn] Receiving from %s at %d kbps\r", sock_c->address, (u32) (bitrate/10)));
+		}
 	}
 
 	return GF_OK;
@@ -367,7 +401,10 @@
 
 static Bool sockin_check_eos(GF_SockInCtx *ctx)
 {
-	u64 now = gf_sys_clock_high_res();
+	u64 now;
+	if (!ctx->timeout) return GF_FALSE;
+
+	now = gf_sys_clock_high_res();
 	if (!ctx->last_rcv_time) {
 		ctx->last_rcv_time = now;
 		return GF_FALSE;
@@ -389,7 +426,7 @@
 	u32 i, count;
 	GF_SockInCtx *ctx = (GF_SockInCtx *) gf_filter_get_udta(filter);
 
-	e = gf_sk_group_select(ctx->active_sockets, 10, GF_SK_SELECT_READ);
+	e = gf_sk_group_select(ctx->active_sockets, 1, GF_SK_SELECT_READ);
 	if (e==GF_IP_NETWORK_EMPTY) {
 		if (ctx->is_udp) {
 			if (sockin_check_eos(ctx) )
@@ -402,11 +439,16 @@
 		gf_filter_ask_rt_reschedule(filter, 1000);
 		return GF_OK;
 	}
-	else if (e) return e;
+	else if (e) {
+		return e;
+	}
 
+	ctx->last_rcv_time = 0;
 	if (gf_sk_group_sock_is_set(ctx->active_sockets, ctx->sock_c.socket, GF_SK_SELECT_READ)) {
 		if (!ctx->listen) {
-			return sockin_read_client(filter, ctx, &ctx->sock_c);
+			e = sockin_read_client(filter, ctx, &ctx->sock_c);
+			gf_filter_ask_rt_reschedule(filter, 1);
+			return e;
 		}
 
 		if (gf_sk_group_sock_is_set(ctx->active_sockets, ctx->sock_c.socket, GF_SK_SELECT_READ)) {
@@ -478,9 +520,8 @@
 
 static const GF_FilterArgs SockInArgs[] =
 {
-	{ OFFS(src), "location of source content", GF_PROP_NAME, NULL, NULL, 0},
-	{ OFFS(block_size), "block size used to read socket", GF_PROP_UINT, "10000", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(sockbuf), "socket max buffer size", GF_PROP_UINT, "65536", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(src), "address of source content", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(block_size), "block size used to read socket", GF_PROP_UINT, "0x60000", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(port), "default port if not specified", GF_PROP_UINT, "1234", NULL, 0},
 	{ OFFS(ifce), "default multicast interface", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(listen), "indicate the input socket works in server mode", GF_PROP_BOOL, "false", NULL, 0},
@@ -490,7 +531,7 @@
 	{ OFFS(ext), "indicate file extension of udp data", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(mime), "indicate mime type of udp data", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(block), "set blocking mode for socket(s)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(timeout), "set timeout in ms for UDP socket(s)", GF_PROP_UINT, "5000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(timeout), "set timeout in ms for UDP socket(s), 0 to disable timeout", GF_PROP_UINT, "10000", NULL, GF_FS_ARG_HINT_ADVANCED},
 
 #ifndef GPAC_DISABLE_STREAMING
 	{ OFFS(reorder_pck), "number of packets delay for RTP reordering (M2TS over RTP) ", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_ADVANCED},
@@ -516,8 +557,12 @@
 #ifdef GPAC_HAS_SOCK_UN
 		"- UDP unix domain sockets are used for source URLs formatted as `udpu://NAME`\n"
 		"- TCP unix domain sockets are used for source URLs formatted as `tcpu://NAME`\n"
+		"\n"
+		"When ports are specified in the URL and the default option separators are used (see `gpac -h doc`), the URL must either:\n"
+		"- have a trailing '/', e.g. `udp://localhost:1234/[:opts]`\n"
+		"- use `gpac` separator, e.g. `udp://localhost:1234[:gpac:opts]`\n"
 #ifdef GPAC_CONFIG_DARWIN
-	"\nOn OSX with VM packet replay you will need to force multicast routing, eg: route add -net 239.255.1.4/32 -interface vboxnet0"
+	"\nOn OSX with VM packet replay you will need to force multicast routing, e.g. `route add -net 239.255.1.4/32 -interface vboxnet0`"
 #endif
 	""
 #else

gpac-1.0.1.tar.gz/src/filters/inspect.c -> gpac-2.0.0.tar.gz/src/filters/inspect.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / inspection filter
@@ -45,10 +45,13 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 	HEVCState *hevc_state;
 	AVCState *avc_state;
+	VVCState *vvc_state;
 	AV1State *av1_state;
 	GF_M4VParser *mv124_state;
 	GF_M4VDecSpecInfo dsi;
 #endif
+	GF_VPConfig *vpcc;
+
 	//for analyzing
 	GF_BitStream *bs;
 
@@ -56,10 +59,17 @@
 	u32 nalu_size_length;
 	Bool is_adobe_protected;
 	Bool is_cenc_protected;
+	Bool aborted;
 
 	GF_Fraction tmcd_rate;
 	u32 tmcd_flags;
 	u32 tmcd_fpt;
+
+	u32 csize;
+	Bool buffer_done, no_analysis;
+
+	u64 last_pcr;
+	GF_FilterClockType last_clock_type;
 } PidCtx;
 
 enum
@@ -78,6 +88,16 @@
 	INSPECT_TEST_NETX,
 	INSPECT_TEST_ENCODE,
 	INSPECT_TEST_ENCX,
+	INSPECT_TEST_NOCRC,
+	INSPECT_TEST_NOBR
+};
+
+enum
+{
+	INSPECT_ANALYZE_OFF=0,
+	INSPECT_ANALYZE_ON,
+	INSPECT_ANALYZE_BS,
+	INSPECT_ANALYZE_BS_BITS,
 };
 
 typedef struct
@@ -88,12 +108,14 @@
 	Bool deep;
 	char *log;
 	char *fmt;
-	Bool props, hdr, allp, info, pcr, analyze, xml;
+	u32 analyze;
+	Bool props, hdr, allp, info, pcr, xml, full;
 	Double speed, start;
 	u32 test;
 	GF_Fraction dur;
-	Bool dump_crc, dtype;
+	Bool crc, dtype;
 	Bool fftmcd;
+	u32 buffer;
 
 	FILE *dump;
 
@@ -101,8 +123,13 @@
 
 	Bool is_prober, probe_done, hdr_done, dump_pck;
 	Bool args_updated;
+	Bool has_seen_eos;
 } GF_InspectCtx;
 
+
+GF_Err gf_bs_set_logger(GF_BitStream *bs, void (*on_bs_log)(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3), void *udta);
+
+
 #define DUMP_ATT_STR(_name, _val) if (ctx->xml) { \
 		gf_fprintf(dump, " %s=\"%s\"", _name, _val); \
 	} else { \
@@ -133,10 +160,10 @@
 		gf_fprintf(dump, " %s 0x%08X", _name, _val);\
 	}
 
-#define DUMP_ATT_F(_name, _val) if (ctx->xml) { \
-		gf_fprintf(dump, " %s=\"%f\"", _name, _val);\
+#define DUMP_ATT_FRAC(_name, _val) if (ctx->xml) { \
+		gf_fprintf(dump, " %s=\"%d/%u\"", _name, _val.num, _val.den);\
 	} else {\
-		gf_fprintf(dump, " %s %f", _name, _val);\
+		gf_fprintf(dump, " %s %d/%u", _name, _val.num, _val.den);\
 	}
 
 
@@ -155,16 +182,329 @@
 	return nal_size;
 }
 
+typedef struct
+{
+	u32 code;
+	const char *name;
+} tag_to_name;
+
+static const tag_to_name SEINames[] =
+{
+	{0, "buffering_period"},
+	{1, "pic_timing"},
+	{2, "pan_scan_rect"},
+	{3, "filler_payload"},
+	{4, "itu_t_t35"},
+	{5, "user_data_unregistered"},
+	{6, "recovery_point"},
+	{7, "dec_ref_pic_marking_repetition"},
+	{8, "spare_pic"},
+	{9, "scene_info"},
+	{10, "sub_seq_info"},
+	{11, "sub_seq_layer_characteristics"},
+	{12, "sub_seq_characteristics"},
+	{13, "full_frame_freeze"},
+	{14, "full_frame_freeze_release"},
+	{15, "picture_snapshot"},
+	{16, "progressive_refinement_segment_start"},
+	{17, "progressive_refinement_segment_end"},
+	{18, "motion_constrained_slice_group_set"},
+	{19, "film_grain_characteristics"},
+	{20, "deblocking_filter_display_preference"},
+	{21, "stereo_video_info"},
+	{22, "post_filter_hint"},
+	{23, "tone_mapping_info"},
+	{24, "scalability_info"},
+	{25, "sub_pic_scalable_layer"},
+	{26, "non_required_layer_rep"},
+	{27, "priority_layer_info"},
+	{28, "layers_not_present"},
+	{29, "layer_dependency_change"},
+	{30, "scalable_nesting"},
+	{31, "base_layer_temporal_hrd"},
+	{32, "quality_layer_integrity_check"},
+	{33, "redundant_pic_property"},
+	{34, "tl0_dep_rep_index"},
+	{35, "tl_switching_point"},
+	{36, "parallel_decoding_info"},
+	{37, "mvc_scalable_nesting"},
+	{38, "view_scalability_info"},
+	{39, "multiview_scene_info"},
+	{40, "multiview_acquisition_info"},
+	{41, "non_required_view_component"},
+	{42, "view_dependency_change"},
+	{43, "operation_points_not_present"},
+	{44, "base_view_temporal_hrd"},
+	{45, "frame_packing_arrangement"},
+	{47, "display_orientation"},
+	{56, "green_metadata"},
+	{128, "structure_of_pictures_info"},
+	{129, "active_parameter_sets"},
+	{130, "decoding_unit_info"},
+	{131, "temporal_sub_layer_zero_index"},
+	{132, "decoded_picture_hash"},
+	{133, "scalable_nesting"},
+	{134, "region_refresh_info"},
+	{135, "no_display"},
+	{136, "time_code"},
+	{137, "mastering_display_colour_volume"},
+	{138, "segmented_rect_frame_packing_arrangement"},
+	{140, "temporal_motion_constrained_tile_sets"},
+	{141, "knee_function_info"},
+	{142, "colour_remapping_info"},
+	{143, "deinterlaced_field_identification"},
+	{144, "content_light_level_info"},
+	{145, "dependent_rap_indication"},
+	{146, "coded_region_completion"},
+	{147, "alternative_transfer_characteristics"},
+	{148, "ambient_viewing_environment"},
+	{160, "layers_not_present"},
+	{161, "inter_layer_constrained_tile_sets"},
+	{162, "bsp_nesting"},
+	{163, "bsp_initial_arrival_time"},
+	{164, "sub_bitstream_property"},
+	{165, "alpha_channel_info"},
+	{166, "overlay_info"},
+	{167, "temporal_mv_prediction_constraints"},
+	{168, "frame_field_info"},
+	{176, "three_dimensional_reference_displays_info"},
+	{177, "depth_representation_info"},
+	{178, "multiview_scene_info"},
+	{179, "multiview_acquisition_info"},
+	{180, "multiview_view_position"},
+	{181, "alternative_depth_info"}
+};
+
+static const char *get_sei_name(u32 sei_type, u32 is_hevc)
+{
+	u32 i, count = sizeof(SEINames) / sizeof(tag_to_name);
+	for (i=0; i<count; i++) {
+		if (SEINames[i].code == sei_type) return SEINames[i].name;
+	}
+	return "Unknown";
+}
+
+static const tag_to_name HEVCNalNames[] =
+{
+	{GF_HEVC_NALU_SLICE_TRAIL_N, "TRAIL_N slice segment"},
+	{GF_HEVC_NALU_SLICE_TRAIL_R, "TRAIL_R slice segment"},
+	{GF_HEVC_NALU_SLICE_TSA_N, "TSA_N slice segment"},
+	{GF_HEVC_NALU_SLICE_TSA_R, "TSA_R slice segment"},
+	{GF_HEVC_NALU_SLICE_STSA_N, "STSA_N slice segment"},
+	{GF_HEVC_NALU_SLICE_STSA_R, "STSA_R slice segment"},
+	{GF_HEVC_NALU_SLICE_RADL_N, "RADL_N slice segment"},
+	{GF_HEVC_NALU_SLICE_RADL_R, "RADL_R slice segment"},
+	{GF_HEVC_NALU_SLICE_RASL_N, "RASL_N slice segment"},
+	{GF_HEVC_NALU_SLICE_RASL_R, "RASL_R slice segment"},
+	{GF_HEVC_NALU_SLICE_BLA_W_LP, "Broken link access slice (W LP)"},
+	{GF_HEVC_NALU_SLICE_BLA_W_DLP, "Broken link access slice (W DLP)"},
+	{GF_HEVC_NALU_SLICE_BLA_N_LP, "Broken link access slice (N LP)"},
+	{GF_HEVC_NALU_SLICE_IDR_W_DLP, "IDR slice (W DLP)"},
+	{GF_HEVC_NALU_SLICE_IDR_N_LP, "IDR slice (N LP)"},
+	{GF_HEVC_NALU_SLICE_CRA, "CRA slice"},
+	{GF_HEVC_NALU_VID_PARAM, "Video Parameter Set"},
+	{GF_HEVC_NALU_SEQ_PARAM, "Sequence Parameter Set"},
+	{GF_HEVC_NALU_PIC_PARAM, "Picture Parameter Set"},
+	{GF_HEVC_NALU_ACCESS_UNIT, "AU Delimiter"},
+	{GF_HEVC_NALU_END_OF_SEQ, "End of Sequence"},
+	{GF_HEVC_NALU_END_OF_STREAM, "End of Stream"},
+	{GF_HEVC_NALU_FILLER_DATA, "Filler Data"},
+	{GF_HEVC_NALU_SEI_PREFIX, "SEI Prefix"},
+	{GF_HEVC_NALU_SEI_SUFFIX, "SEI Suffix"},
+	{GF_HEVC_NALU_FF_AGGREGATOR, "HEVCAggregator"},
+	{GF_HEVC_NALU_FF_EXTRACTOR, "HEVCExtractor"},
+	{GF_HEVC_NALU_DV_RPU, "UNSPEC_DolbiVision_RPU"},
+	{GF_HEVC_NALU_DV_EL, "UNSPEC_DolbiVision_EL"}
+};
+
+static const char *get_hevc_nal_name(u32 nal_type)
+{
+	u32 i, count = sizeof(HEVCNalNames) / sizeof(tag_to_name);
+	for (i=0; i<count; i++) {
+		if (HEVCNalNames[i].code == nal_type) return HEVCNalNames[i].name;
+	}
+	return NULL;
+}
+
+static const tag_to_name VVCNalNames[] =
+{
+	{GF_VVC_NALU_SLICE_TRAIL, "Slice_TRAIL"},
+	{GF_VVC_NALU_SLICE_STSA, "Slice_STSA"},
+	{GF_VVC_NALU_SLICE_RADL, "Slice_RADL"},
+	{GF_VVC_NALU_SLICE_RASL, "Slice_RASL"},
+	{GF_VVC_NALU_SLICE_IDR_W_RADL, "IDR_RADL"},
+	{GF_VVC_NALU_SLICE_IDR_N_LP, "IDR"},
+	{GF_VVC_NALU_SLICE_CRA, "CRA"},
+	{GF_VVC_NALU_SLICE_GDR, "GDR"},
+	{GF_VVC_NALU_OPI, "OperationPointInfo"},
+	{GF_VVC_NALU_VID_PARAM, "VideoParameterSet"},
+	{GF_VVC_NALU_SEQ_PARAM, "SequenceParameterSet"},
+	{GF_VVC_NALU_PIC_PARAM, "PictureParameterSet"},
+	{GF_VVC_NALU_APS_PREFIX, "AdaptationParameterSet_Prefix"},
+	{GF_VVC_NALU_APS_SUFFIX, "AdaptationParameterSet_Suffix"},
+	{GF_VVC_NALU_ACCESS_UNIT, "AUDelimiter"},
+	{GF_VVC_NALU_END_OF_SEQ, "EOS"},
+	{GF_VVC_NALU_END_OF_STREAM, "EOB"},
+	{GF_VVC_NALU_FILLER_DATA, "FillerData"},
+	{GF_VVC_NALU_SEI_PREFIX, "SEI_Prefix"},
+	{GF_VVC_NALU_SEI_SUFFIX, "SEI_Suffix"},
+	{GF_VVC_NALU_PIC_HEADER, "PictureHeader"}
+};
+
+static const char *get_vvc_nal_name(u32 nal_type)
+{
+	u32 i, count = sizeof(VVCNalNames) / sizeof(tag_to_name);
+	for (i=0; i<count; i++) {
+		if (VVCNalNames[i].code == nal_type) return VVCNalNames[i].name;
+	}
+	return NULL;
+}
+
+static const tag_to_name AVCNalNames[] =
+{
+	{GF_AVC_NALU_NON_IDR_SLICE, "Non IDR slice"},
+	{GF_AVC_NALU_DP_A_SLICE, "DP Type A slice"},
+	{GF_AVC_NALU_DP_B_SLICE, "DP Type B slice"},
+	{GF_AVC_NALU_DP_C_SLICE, "DP Type C slice"},
+	{GF_AVC_NALU_IDR_SLICE, "IDR slice"},
+	{GF_AVC_NALU_SEI, "SEI Message"},
+	{GF_AVC_NALU_SEQ_PARAM, "SequenceParameterSet"},
+	{GF_AVC_NALU_PIC_PARAM, "PictureParameterSet"},
+	{GF_AVC_NALU_ACCESS_UNIT, "AccessUnit delimiter"},
+	{GF_AVC_NALU_END_OF_SEQ, "EndOfSequence"},
+	{GF_AVC_NALU_END_OF_STREAM, "EndOfStream"},
+	{GF_AVC_NALU_FILLER_DATA, "Filler data"},
+	{GF_AVC_NALU_SEQ_PARAM_EXT, "SequenceParameterSetExtension"},
+	{GF_AVC_NALU_SVC_PREFIX_NALU, "SVCPrefix"},
+	{GF_AVC_NALU_SVC_SUBSEQ_PARAM, "SVCSubsequenceParameterSet"},
+	{GF_AVC_NALU_SLICE_AUX, "Auxiliary Slice"},
+	{GF_AVC_NALU_SVC_SLICE, "SVCSlice"},
+	{GF_AVC_NALU_DV_RPU, "DV_RPU"},
+	{GF_AVC_NALU_DV_EL, "DV_EL"},
+	{GF_AVC_NALU_FF_AGGREGATOR, "SVCAggregator"},
+	{GF_AVC_NALU_FF_EXTRACTOR, "SVCExtractor"}
+};
+
+static const char *get_avc_nal_name(u32 nal_type)
+{
+	u32 i, count = sizeof(AVCNalNames) / sizeof(tag_to_name);
+	for (i=0; i<count; i++) {
+		if (AVCNalNames[i].code == nal_type) return AVCNalNames[i].name;
+	}
+	return NULL;
+}
+
+typedef struct
+{
+	FILE *dump;
+	Bool dump_bits;
+} InspectLogCbk;
+
+static void inspect_log_bs(Bool is_nalu, void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3)
+{
+	InspectLogCbk *cbk = (InspectLogCbk*)udta;
+
+	if (!nb_bits)
+		return;
+
+	if (is_nalu)
+		gf_fprintf(cbk->dump, "\"");
+
+	gf_fprintf(cbk->dump, " %s", field_name);
+	if (idx1>=0) {
+		gf_fprintf(cbk->dump, "_%d", idx1);
+		if (idx2>=0) {
+			gf_fprintf(cbk->dump, "_%d", idx2);
+			if (idx3>=0) {
+				gf_fprintf(cbk->dump, "_%d", idx3);
+			}
+		}
+	}
+	gf_fprintf(cbk->dump, "=\""LLD, field_val);
+	if (cbk->dump_bits && ((s32) nb_bits > 1) )
+		gf_fprintf(cbk->dump, "(%u)", nb_bits);
+
+	if (!is_nalu)
+		gf_fprintf(cbk->dump, "\"");
+}
+
+static void shifted_bs_log(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3)
+{
+	inspect_log_bs(GF_TRUE, udta, field_name, nb_bits, field_val, idx1, idx2, idx3);
+}
+static void regular_bs_log(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3)
+{
+	inspect_log_bs(GF_FALSE, udta, field_name, nb_bits, field_val, idx1, idx2, idx3);
+}
+
+static void dump_clli(FILE *dump, GF_BitStream *bs)
+{
+	u16 max_content_light_level = gf_bs_read_int(bs, 16);
+	u16 max_pic_average_light_level = gf_bs_read_int(bs, 16);
+	gf_fprintf(dump, " max_content_light_level=\"%u\" max_pic_average_light_level=\"%u\"", max_content_light_level, max_pic_average_light_level);
+}
+
+static void dump_mdcv(FILE *dump, GF_BitStream *bs, Bool isMPEG)
+{
+	u8 c;
+	u16 display_primaries_x[3];
+	u16 display_primaries_y[3];
+	u16 white_point_x;
+	u16 white_point_y;
+	u32 max_display_mastering_luminance;
+	u32 min_display_mastering_luminance;
+	for(c=0;c<3;c++) {
+		display_primaries_x[c] = gf_bs_read_int(bs, 16);
+		display_primaries_y[c] = gf_bs_read_int(bs, 16);
+	}
+	white_point_x = gf_bs_read_int(bs, 16);
+	white_point_y = gf_bs_read_int(bs, 16);
+	max_display_mastering_luminance = gf_bs_read_int(bs, 32);
+	min_display_mastering_luminance = gf_bs_read_int(bs, 32);
+	gf_fprintf(dump, " display_primaries_x=\"%.04f %.04f %.04f\" display_primaries_y=\"%.04f %.04f %.04f\" white_point_x=\"%.04f\" white_point_y=\"%.04f\" max_display_mastering_luminance=\"%.04f\" min_display_mastering_luminance=\"%.04f\"",
+			 display_primaries_x[0]*1.0/(isMPEG?50000:65536),
+			 display_primaries_x[1]*1.0/(isMPEG?50000:65536),
+			 display_primaries_x[2]*1.0/(isMPEG?50000:65536),
+			 display_primaries_y[0]*1.0/(isMPEG?50000:65536),
+			 display_primaries_y[1]*1.0/(isMPEG?50000:65536),
+			 display_primaries_y[2]*1.0/(isMPEG?50000:65536),
+			 white_point_x*1.0/(isMPEG?50000:65536),
+			 white_point_y*1.0/(isMPEG?50000:65536),
+			 max_display_mastering_luminance*1.0/(isMPEG?10000:256),
+			 min_display_mastering_luminance*1.0/(isMPEG?10000:(1<<14)));
+}
+
+static u32 dump_t35(FILE *dump, GF_BitStream *bs)
+{
+	u32 read_bytes = 1;
+	u32 country_code = gf_bs_read_u8(bs);
+	gf_fprintf(dump, " country_code=\"0x%x\"", country_code);
+	if (country_code == 0xFF) {
+		u32 country_code_extension = gf_bs_read_u8(bs);
+		read_bytes++;
+		gf_fprintf(dump, " country_code_extension=\"0x%x\"", country_code_extension);
+	}
+	if (country_code == 0xB5) { // USA
+		u32 terminal_provider_code = gf_bs_read_u16(bs);
+		u32 terminal_provider_oriented_code = gf_bs_read_u16(bs);
+		u32 application_identifier = gf_bs_read_u8(bs);
+		u32 application_mode = gf_bs_read_u8(bs);
+		read_bytes+=6;
+		gf_fprintf(dump, " terminal_provider_code=\"0x%x\" terminal_provider_oriented_code=\"0x%x\" application_identifier=\"%u\" application_mode=\"%u\"",
+				 terminal_provider_code, terminal_provider_oriented_code,
+				 application_identifier, application_mode);
+	}
+	return read_bytes;
+}
+
 static void dump_sei(FILE *dump, GF_BitStream *bs, Bool is_hevc)
 {
-	u32 sei_idx=0;
 	u32 i;
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
 
 	//skip nal header
 	gf_bs_read_int(bs, is_hevc ? 16 : 8);
 
-	gf_fprintf(dump, " SEI=\"");
 	while (gf_bs_available(bs) ) {
 		u32 sei_type = 0;
 		u32 sei_size = 0;
@@ -178,22 +518,34 @@
 			gf_bs_read_int(bs, 8);
 		}
 		sei_size += gf_bs_read_int(bs, 8);
-		i=0;
-		while (i < sei_size) {
-			gf_bs_read_u8(bs);
-			i++;
-		}
-		if (sei_idx) gf_fprintf(dump, ",");
-		gf_fprintf(dump, "(type=%u, size=%u)", sei_type, sei_size);
-		sei_idx++;
+
+		gf_fprintf(dump, " <SEIMessage ptype=\"%u\" psize=\"%u\" type=\"%s\"", sei_type, sei_size, get_sei_name(sei_type, is_hevc) );
+		if (sei_type == 144) {
+			dump_clli(dump, bs);
+		} else if (sei_type == 137) {
+			dump_mdcv(dump, bs, GF_TRUE);
+		} else if (sei_type == 4) {
+			i = dump_t35(dump, bs);
+			while (i < sei_size) {
+				gf_bs_read_u8(bs);
+				i++;
+			}
+		} else {
+			i=0;
+			while (i < sei_size) {
+				gf_bs_read_u8(bs);
+				i++;
+			}
+		}
+		gf_fprintf(dump, "/>\n");
 		if (gf_bs_peek_bits(bs, 8, 0) == 0x80) {
 			break;
 		}
 	}
-	gf_fprintf(dump, "\"");
 }
 
-static void gf_inspect_dump_nalu_internal(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, u32 nalh_size, Bool dump_crc, Bool is_encrypted, PidCtx *pctx)
+
+static void gf_inspect_dump_nalu_internal(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, VVCState *vvc, u32 nalh_size, Bool dump_crc, Bool is_encrypted, u32 full_bs_dump, PidCtx *pctx)
 {
 	s32 res = 0;
 	u8 type, nal_ref_idc;
@@ -202,10 +554,19 @@
 	s8 sample_offset;
 	u32 data_offset, data_size;
 	s32 idx;
-	GF_BitStream *bs;
+	InspectLogCbk lcbk;
+	GF_BitStream *bs = NULL;
+	const char *nal_name;
+
+	if (full_bs_dump<INSPECT_ANALYZE_BS)
+		full_bs_dump = 0;
+	else {
+		lcbk.dump = dump;
+		lcbk.dump_bits = full_bs_dump==INSPECT_ANALYZE_BS_BITS ? GF_TRUE : GF_FALSE;
+	}
 
 	if (!ptr_size) {
-		gf_fprintf(dump, "error=\"invalid nal size 0\"");
+		gf_fprintf(dump, "error=\"invalid nal size 0\"/>\n");
 		return;
 	}
 
@@ -213,247 +574,214 @@
 
 	if (hevc) {
 #ifndef GPAC_DISABLE_HEVC
-		if (ptr_size==1) {
-			gf_fprintf(dump, "error=\"invalid nal size 1\"");
+
+		if (ptr_size<=1) {
+			gf_fprintf(dump, "error=\"invalid nal size 1\"/>\n");
 			return;
 		}
-		res = gf_media_hevc_parse_nalu(ptr, ptr_size, hevc, &type, &temporal_id, &quality_id);
 
-		gf_fprintf(dump, "code=\"%d\" type=\"", type);
+		if (full_bs_dump) {
+			if (pctx) {
+				if (!pctx->bs)
+					pctx->bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
+				else
+					gf_bs_reassign_buffer(pctx->bs, ptr, ptr_size);
+				bs = pctx->bs;
+			} else {
+				bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
+			}
+			gf_bs_set_logger(bs, regular_bs_log, &lcbk);
+			res = gf_hevc_parse_nalu_bs(bs, hevc, &type, &temporal_id, &quality_id);
+		} else {
+			bs = NULL;
+			res = gf_hevc_parse_nalu(ptr, ptr_size, hevc, &type, &temporal_id, &quality_id);
+			gf_fprintf(dump, "code=\"%d\"", type);
+		}
 
-		switch (type) {
-		case GF_HEVC_NALU_SLICE_TRAIL_N:
-			gf_fputs("TRAIL_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_TRAIL_R:
-			gf_fputs("TRAIL_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_TSA_N:
-			gf_fputs("TSA_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_TSA_R:
-			gf_fputs("TSA_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_STSA_N:
-			gf_fputs("STSA_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_STSA_R:
-			gf_fputs("STSA_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_RADL_N:
-			gf_fputs("RADL_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_RADL_R:
-			gf_fputs("RADL_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_RASL_N:
-			gf_fputs("RASL_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_RASL_R:
-			gf_fputs("RASL_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_BLA_W_LP:
-			gf_fputs("Broken link access slice (W LP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_BLA_W_DLP:
-			gf_fputs("Broken link access slice (W DLP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_BLA_N_LP:
-			gf_fputs("Broken link access slice (N LP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_IDR_W_DLP:
-			gf_fputs("IDR slice (W DLP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_IDR_N_LP:
-			gf_fputs("IDR slice (N LP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_CRA:
-			gf_fputs("CRA slice", dump);
-			break;
+		if (res==-1) {
+			gf_fprintf(dump, " status=\"error parsing\"", type);
+		}
+		gf_fprintf(dump, " type=\"", type);
+		nal_name = get_hevc_nal_name(type);
+		if (nal_name)
+			gf_fputs(nal_name, dump);
+		else
+			gf_fprintf(dump, "UNKNOWN (parsing return %d)", res);
 
+		//specific dump
+		switch (type) {
 		case GF_HEVC_NALU_VID_PARAM:
-			gf_fputs("Video Parameter Set", dump);
-			idx = gf_media_hevc_read_vps(ptr, ptr_size, hevc);
+			if (full_bs_dump) break;
+			idx = gf_hevc_read_vps(ptr, ptr_size, hevc);
 			if (idx<0) gf_fprintf(dump, "\" vps_id=\"PARSING FAILURE");
 			else gf_fprintf(dump, "\" vps_id=\"%d", idx);
 			break;
 		case GF_HEVC_NALU_SEQ_PARAM:
-			idx = gf_media_hevc_read_sps(ptr, ptr_size, hevc);
-			gf_fputs("Sequence Parameter Set", dump);
-			if (idx<0) gf_fprintf(dump, "\" sps_id=\"PARSING FAILURE");
-			else {
-				HEVC_SPS *sps= &hevc->sps[idx];
-				gf_fprintf(dump, "\" sps_id=\"%d", idx);
-				if (gf_sys_is_test_mode()) break;
-
-				gf_fprintf(dump, "\" aspect_ratio_info_present_flag=\"%d", sps->aspect_ratio_info_present_flag);
-				gf_fprintf(dump, "\" bit_depth_chroma=\"%d", sps->bit_depth_chroma);
-				gf_fprintf(dump, "\" bit_depth_luma=\"%d", sps->bit_depth_luma);
-				gf_fprintf(dump, "\" chroma_format_idc=\"%d", sps->chroma_format_idc);
-				gf_fprintf(dump, "\" colour_description_present_flag=\"%d", sps->colour_description_present_flag);
-				gf_fprintf(dump, "\" colour_primaries=\"%d", sps->colour_primaries);
-				gf_fprintf(dump, "\" cw_flag=\"%d", sps->cw_flag);
-				if (sps->cw_flag) {
-					gf_fprintf(dump, "\" cw_bottom=\"%d", sps->cw_bottom);
-					gf_fprintf(dump, "\" cw_top=\"%d", sps->cw_top);
-					gf_fprintf(dump, "\" cw_left=\"%d", sps->cw_left);
-					gf_fprintf(dump, "\" cw_bottom=\"%d", sps->cw_bottom);
-				}
-				gf_fprintf(dump, "\" height=\"%d", sps->height);
-				gf_fprintf(dump, "\" width=\"%d", sps->width);
-				gf_fprintf(dump, "\" log2_max_pic_order_cnt_lsb=\"%d", sps->log2_max_pic_order_cnt_lsb);
-				gf_fprintf(dump, "\" long_term_ref_pics_present_flag=\"%d", sps->long_term_ref_pics_present_flag);
-				gf_fprintf(dump, "\" matrix_coeffs=\"%d", sps->matrix_coeffs);
-				gf_fprintf(dump, "\" max_CU_depth=\"%d", sps->max_CU_depth);
-				gf_fprintf(dump, "\" max_CU_width=\"%d", sps->max_CU_width);
-				gf_fprintf(dump, "\" max_CU_height=\"%d", sps->max_CU_height);
-				gf_fprintf(dump, "\" num_long_term_ref_pic_sps=\"%d", sps->num_long_term_ref_pic_sps);
-				gf_fprintf(dump, "\" num_short_term_ref_pic_sets=\"%d", sps->num_short_term_ref_pic_sets);
-				gf_fprintf(dump, "\" has_timing_info=\"%d", sps->has_timing_info);
-				if (sps->has_timing_info) {
-					gf_fprintf(dump, "\" time_scale=\"%d", sps->time_scale);
-					gf_fprintf(dump, "\" num_ticks_poc_diff_one_minus1=\"%d", sps->num_ticks_poc_diff_one_minus1);
-					gf_fprintf(dump, "\" num_units_in_tick=\"%d", sps->num_units_in_tick);
-					gf_fprintf(dump, "\" poc_proportional_to_timing_flag=\"%d", sps->poc_proportional_to_timing_flag);
-				}
-				gf_fprintf(dump, "\" rep_format_idx=\"%d", sps->rep_format_idx);
-				gf_fprintf(dump, "\" sample_adaptive_offset_enabled_flag=\"%d", sps->sample_adaptive_offset_enabled_flag);
-				gf_fprintf(dump, "\" sar_idc=\"%d", sps->sar_idc);
-				gf_fprintf(dump, "\" separate_colour_plane_flag=\"%d", sps->separate_colour_plane_flag);
-				gf_fprintf(dump, "\" temporal_mvp_enable_flag=\"%d", sps->temporal_mvp_enable_flag);
-				gf_fprintf(dump, "\" transfer_characteristic=\"%d", sps->transfer_characteristic);
-				gf_fprintf(dump, "\" video_full_range_flag=\"%d", sps->video_full_range_flag);
-				gf_fprintf(dump, "\" sps_ext_or_max_sub_layers_minus1=\"%d", sps->sps_ext_or_max_sub_layers_minus1);
-				gf_fprintf(dump, "\" max_sub_layers_minus1=\"%d", sps->max_sub_layers_minus1);
-				gf_fprintf(dump, "\" update_rep_format_flag=\"%d", sps->update_rep_format_flag);
-				gf_fprintf(dump, "\" sub_layer_ordering_info_present_flag=\"%d", sps->sub_layer_ordering_info_present_flag);
-				gf_fprintf(dump, "\" scaling_list_enable_flag=\"%d", sps->scaling_list_enable_flag);
-				gf_fprintf(dump, "\" infer_scaling_list_flag=\"%d", sps->infer_scaling_list_flag);
-				gf_fprintf(dump, "\" scaling_list_ref_layer_id=\"%d", sps->scaling_list_ref_layer_id);
-				gf_fprintf(dump, "\" scaling_list_data_present_flag=\"%d", sps->scaling_list_data_present_flag);
-				gf_fprintf(dump, "\" asymmetric_motion_partitions_enabled_flag=\"%d", sps->asymmetric_motion_partitions_enabled_flag);
-				gf_fprintf(dump, "\" pcm_enabled_flag=\"%d", sps->pcm_enabled_flag);
-				gf_fprintf(dump, "\" strong_intra_smoothing_enable_flag=\"%d", sps->strong_intra_smoothing_enable_flag);
-				gf_fprintf(dump, "\" vui_parameters_present_flag=\"%d", sps->vui_parameters_present_flag);
-				gf_fprintf(dump, "\" log2_diff_max_min_luma_coding_block_size=\"%d", sps->log2_diff_max_min_luma_coding_block_size);
-				gf_fprintf(dump, "\" log2_min_transform_block_size=\"%d", sps->log2_min_transform_block_size);
-				gf_fprintf(dump, "\" log2_min_luma_coding_block_size=\"%d", sps->log2_min_luma_coding_block_size);
-				gf_fprintf(dump, "\" log2_max_transform_block_size=\"%d", sps->log2_max_transform_block_size);
-				gf_fprintf(dump, "\" max_transform_hierarchy_depth_inter=\"%d", sps->max_transform_hierarchy_depth_inter);
-				gf_fprintf(dump, "\" max_transform_hierarchy_depth_intra=\"%d", sps->max_transform_hierarchy_depth_intra);
-				gf_fprintf(dump, "\" pcm_sample_bit_depth_luma_minus1=\"%d", sps->pcm_sample_bit_depth_luma_minus1);
-				gf_fprintf(dump, "\" pcm_sample_bit_depth_chroma_minus1=\"%d", sps->pcm_sample_bit_depth_chroma_minus1);
-				gf_fprintf(dump, "\" pcm_loop_filter_disable_flag=\"%d", sps->pcm_loop_filter_disable_flag);
-				gf_fprintf(dump, "\" log2_min_pcm_luma_coding_block_size_minus3=\"%d", sps->log2_min_pcm_luma_coding_block_size_minus3);
-				gf_fprintf(dump, "\" log2_diff_max_min_pcm_luma_coding_block_size=\"%d", sps->log2_diff_max_min_pcm_luma_coding_block_size);
-				gf_fprintf(dump, "\" overscan_info_present=\"%d", sps->overscan_info_present);
-				gf_fprintf(dump, "\" overscan_appropriate=\"%d", sps->overscan_appropriate);
-				gf_fprintf(dump, "\" video_signal_type_present_flag=\"%d", sps->video_signal_type_present_flag);
-				gf_fprintf(dump, "\" video_format=\"%d", sps->video_format);
-				gf_fprintf(dump, "\" chroma_loc_info_present_flag=\"%d", sps->chroma_loc_info_present_flag);
-				gf_fprintf(dump, "\" chroma_sample_loc_type_top_field=\"%d", sps->chroma_sample_loc_type_top_field);
-				gf_fprintf(dump, "\" chroma_sample_loc_type_bottom_field=\"%d", sps->chroma_sample_loc_type_bottom_field);
-				gf_fprintf(dump, "\" neutra_chroma_indication_flag=\"%d", sps->neutra_chroma_indication_flag);
-				gf_fprintf(dump, "\" field_seq_flag=\"%d", sps->field_seq_flag);
-				gf_fprintf(dump, "\" frame_field_info_present_flag=\"%d", sps->frame_field_info_present_flag);
-				gf_fprintf(dump, "\" default_display_window_flag=\"%d", sps->default_display_window_flag);
-				gf_fprintf(dump, "\" left_offset=\"%d", sps->left_offset);
-				gf_fprintf(dump, "\" right_offset=\"%d", sps->right_offset);
-				gf_fprintf(dump, "\" top_offset=\"%d", sps->top_offset);
-				gf_fprintf(dump, "\" bottom_offset=\"%d", sps->bottom_offset);
-				gf_fprintf(dump, "\" hrd_parameters_present_flag=\"%d", sps->hrd_parameters_present_flag);
+			if (full_bs_dump) break;
+			idx = gf_hevc_read_sps(ptr, ptr_size, hevc);
+			if (idx<0) {
+				gf_fprintf(dump, "\" sps_id=\"PARSING FAILURE");
+				break;
+			}
+			{
+			HEVC_SPS *sps= &hevc->sps[idx];
+			gf_fprintf(dump, "\" sps_id=\"%d", idx);
+
+			gf_fprintf(dump, "\" aspect_ratio_info_present_flag=\"%d", sps->aspect_ratio_info_present_flag);
+			gf_fprintf(dump, "\" bit_depth_chroma=\"%d", sps->bit_depth_chroma);
+			gf_fprintf(dump, "\" bit_depth_luma=\"%d", sps->bit_depth_luma);
+			gf_fprintf(dump, "\" chroma_format_idc=\"%d", sps->chroma_format_idc);
+			gf_fprintf(dump, "\" colour_description_present_flag=\"%d", sps->colour_description_present_flag);
+			gf_fprintf(dump, "\" colour_primaries=\"%d", sps->colour_primaries);
+			gf_fprintf(dump, "\" cw_flag=\"%d", sps->cw_flag);
+			if (sps->cw_flag) {
+				gf_fprintf(dump, "\" cw_bottom=\"%d", sps->cw_bottom);
+				gf_fprintf(dump, "\" cw_top=\"%d", sps->cw_top);
+				gf_fprintf(dump, "\" cw_left=\"%d", sps->cw_left);
+				gf_fprintf(dump, "\" cw_right=\"%d", sps->cw_right);
+			}
+			gf_fprintf(dump, "\" height=\"%d", sps->height);
+			gf_fprintf(dump, "\" width=\"%d", sps->width);
+			gf_fprintf(dump, "\" log2_max_pic_order_cnt_lsb=\"%d", sps->log2_max_pic_order_cnt_lsb);
+			gf_fprintf(dump, "\" long_term_ref_pics_present_flag=\"%d", sps->long_term_ref_pics_present_flag);
+			gf_fprintf(dump, "\" matrix_coeffs=\"%d", sps->matrix_coeffs);
+			gf_fprintf(dump, "\" max_CU_depth=\"%d", sps->max_CU_depth);
+			gf_fprintf(dump, "\" max_CU_width=\"%d", sps->max_CU_width);
+			gf_fprintf(dump, "\" max_CU_height=\"%d", sps->max_CU_height);
+			gf_fprintf(dump, "\" num_long_term_ref_pic_sps=\"%d", sps->num_long_term_ref_pic_sps);
+			gf_fprintf(dump, "\" num_short_term_ref_pic_sets=\"%d", sps->num_short_term_ref_pic_sets);
+			gf_fprintf(dump, "\" has_timing_info=\"%d", sps->has_timing_info);
+			if (sps->has_timing_info) {
+				gf_fprintf(dump, "\" time_scale=\"%d", sps->time_scale);
+				gf_fprintf(dump, "\" num_ticks_poc_diff_one_minus1=\"%d", sps->num_ticks_poc_diff_one_minus1);
+				gf_fprintf(dump, "\" num_units_in_tick=\"%d", sps->num_units_in_tick);
+				gf_fprintf(dump, "\" poc_proportional_to_timing_flag=\"%d", sps->poc_proportional_to_timing_flag);
+			}
+			gf_fprintf(dump, "\" rep_format_idx=\"%d", sps->rep_format_idx);
+			gf_fprintf(dump, "\" sample_adaptive_offset_enabled_flag=\"%d", sps->sample_adaptive_offset_enabled_flag);
+			gf_fprintf(dump, "\" sar_idc=\"%d", sps->sar_idc);
+			gf_fprintf(dump, "\" separate_colour_plane_flag=\"%d", sps->separate_colour_plane_flag);
+			gf_fprintf(dump, "\" temporal_mvp_enable_flag=\"%d", sps->temporal_mvp_enable_flag);
+			gf_fprintf(dump, "\" transfer_characteristic=\"%d", sps->transfer_characteristic);
+			gf_fprintf(dump, "\" video_full_range_flag=\"%d", sps->video_full_range_flag);
+			gf_fprintf(dump, "\" sps_ext_or_max_sub_layers_minus1=\"%d", sps->sps_ext_or_max_sub_layers_minus1);
+			gf_fprintf(dump, "\" max_sub_layers_minus1=\"%d", sps->max_sub_layers_minus1);
+			gf_fprintf(dump, "\" update_rep_format_flag=\"%d", sps->update_rep_format_flag);
+			gf_fprintf(dump, "\" sub_layer_ordering_info_present_flag=\"%d", sps->sub_layer_ordering_info_present_flag);
+			gf_fprintf(dump, "\" scaling_list_enable_flag=\"%d", sps->scaling_list_enable_flag);
+			gf_fprintf(dump, "\" infer_scaling_list_flag=\"%d", sps->infer_scaling_list_flag);
+			gf_fprintf(dump, "\" scaling_list_ref_layer_id=\"%d", sps->scaling_list_ref_layer_id);
+			gf_fprintf(dump, "\" scaling_list_data_present_flag=\"%d", sps->scaling_list_data_present_flag);
+			gf_fprintf(dump, "\" asymmetric_motion_partitions_enabled_flag=\"%d", sps->asymmetric_motion_partitions_enabled_flag);
+			gf_fprintf(dump, "\" pcm_enabled_flag=\"%d", sps->pcm_enabled_flag);
+			gf_fprintf(dump, "\" strong_intra_smoothing_enable_flag=\"%d", sps->strong_intra_smoothing_enable_flag);
+			gf_fprintf(dump, "\" vui_parameters_present_flag=\"%d", sps->vui_parameters_present_flag);
+			gf_fprintf(dump, "\" log2_diff_max_min_luma_coding_block_size=\"%d", sps->log2_diff_max_min_luma_coding_block_size);
+			gf_fprintf(dump, "\" log2_min_transform_block_size=\"%d", sps->log2_min_transform_block_size);
+			gf_fprintf(dump, "\" log2_min_luma_coding_block_size=\"%d", sps->log2_min_luma_coding_block_size);
+			gf_fprintf(dump, "\" log2_max_transform_block_size=\"%d", sps->log2_max_transform_block_size);
+			gf_fprintf(dump, "\" max_transform_hierarchy_depth_inter=\"%d", sps->max_transform_hierarchy_depth_inter);
+			gf_fprintf(dump, "\" max_transform_hierarchy_depth_intra=\"%d", sps->max_transform_hierarchy_depth_intra);
+			gf_fprintf(dump, "\" pcm_sample_bit_depth_luma_minus1=\"%d", sps->pcm_sample_bit_depth_luma_minus1);
+			gf_fprintf(dump, "\" pcm_sample_bit_depth_chroma_minus1=\"%d", sps->pcm_sample_bit_depth_chroma_minus1);
+			gf_fprintf(dump, "\" pcm_loop_filter_disable_flag=\"%d", sps->pcm_loop_filter_disable_flag);
+			gf_fprintf(dump, "\" log2_min_pcm_luma_coding_block_size_minus3=\"%d", sps->log2_min_pcm_luma_coding_block_size_minus3);
+			gf_fprintf(dump, "\" log2_diff_max_min_pcm_luma_coding_block_size=\"%d", sps->log2_diff_max_min_pcm_luma_coding_block_size);
+			gf_fprintf(dump, "\" overscan_info_present=\"%d", sps->overscan_info_present);
+			gf_fprintf(dump, "\" overscan_appropriate=\"%d", sps->overscan_appropriate);
+			gf_fprintf(dump, "\" video_signal_type_present_flag=\"%d", sps->video_signal_type_present_flag);
+			gf_fprintf(dump, "\" video_format=\"%d", sps->video_format);
+			gf_fprintf(dump, "\" chroma_loc_info_present_flag=\"%d", sps->chroma_loc_info_present_flag);
+			gf_fprintf(dump, "\" chroma_sample_loc_type_top_field=\"%d", sps->chroma_sample_loc_type_top_field);
+			gf_fprintf(dump, "\" chroma_sample_loc_type_bottom_field=\"%d", sps->chroma_sample_loc_type_bottom_field);
+			gf_fprintf(dump, "\" neutra_chroma_indication_flag=\"%d", sps->neutra_chroma_indication_flag);
+			gf_fprintf(dump, "\" field_seq_flag=\"%d", sps->field_seq_flag);
+			gf_fprintf(dump, "\" frame_field_info_present_flag=\"%d", sps->frame_field_info_present_flag);
+			gf_fprintf(dump, "\" default_display_window_flag=\"%d", sps->default_display_window_flag);
+			gf_fprintf(dump, "\" left_offset=\"%d", sps->left_offset);
+			gf_fprintf(dump, "\" right_offset=\"%d", sps->right_offset);
+			gf_fprintf(dump, "\" top_offset=\"%d", sps->top_offset);
+			gf_fprintf(dump, "\" bottom_offset=\"%d", sps->bottom_offset);
+			gf_fprintf(dump, "\" hrd_parameters_present_flag=\"%d", sps->hrd_parameters_present_flag);
 			}
 			break;
 		case GF_HEVC_NALU_PIC_PARAM:
-			idx = gf_media_hevc_read_pps(ptr, ptr_size, hevc);
-			gf_fputs("Picture Parameter Set", dump);
-			if (idx<0) gf_fprintf(dump, "\" pps_id=\"PARSING FAILURE");
-			else {
-				HEVC_PPS *pps= &hevc->pps[idx];
-				gf_fprintf(dump, "\" pps_id=\"%d", idx);
-
-				if (gf_sys_is_test_mode()) break;
-
-				gf_fprintf(dump, "\" cabac_init_present_flag=\"%d", pps->cabac_init_present_flag);
-				gf_fprintf(dump, "\" dependent_slice_segments_enabled_flag=\"%d", pps->dependent_slice_segments_enabled_flag);
-				gf_fprintf(dump, "\" entropy_coding_sync_enabled_flag=\"%d", pps->entropy_coding_sync_enabled_flag);
-				gf_fprintf(dump, "\" lists_modification_present_flag=\"%d", pps->lists_modification_present_flag);
-				gf_fprintf(dump, "\" loop_filter_across_slices_enabled_flag=\"%d", pps->loop_filter_across_slices_enabled_flag);
-				gf_fprintf(dump, "\" loop_filter_across_tiles_enabled_flag=\"%d", pps->loop_filter_across_tiles_enabled_flag);
-				gf_fprintf(dump, "\" num_extra_slice_header_bits=\"%d", pps->num_extra_slice_header_bits);
-				gf_fprintf(dump, "\" num_ref_idx_l0_default_active=\"%d", pps->num_ref_idx_l0_default_active);
-				gf_fprintf(dump, "\" num_ref_idx_l1_default_active=\"%d", pps->num_ref_idx_l1_default_active);
-				gf_fprintf(dump, "\" tiles_enabled_flag=\"%d", pps->tiles_enabled_flag);
-				if (pps->tiles_enabled_flag) {
-					gf_fprintf(dump, "\" uniform_spacing_flag=\"%d", pps->uniform_spacing_flag);
-					if (!pps->uniform_spacing_flag) {
-						u32 k;
-						gf_fprintf(dump, "\" num_tile_columns=\"%d", pps->num_tile_columns);
-						gf_fprintf(dump, "\" num_tile_rows=\"%d", pps->num_tile_rows);
-						gf_fprintf(dump, "\" colomns_width=\"");
-						for (k=0; k<pps->num_tile_columns-1; k++)
-							gf_fprintf(dump, "%d ", pps->column_width[k]);
-						gf_fprintf(dump, "\" rows_height=\"");
-						for (k=0; k<pps->num_tile_rows-1; k++)
-							gf_fprintf(dump, "%d ", pps->row_height[k]);
-					}
-				}
-				gf_fprintf(dump, "\" output_flag_present_flag=\"%d", pps->output_flag_present_flag);
-				gf_fprintf(dump, "\" pic_init_qp_minus26=\"%d", pps->pic_init_qp_minus26);
-				gf_fprintf(dump, "\" slice_chroma_qp_offsets_present_flag=\"%d", pps->slice_chroma_qp_offsets_present_flag);
-				gf_fprintf(dump, "\" slice_segment_header_extension_present_flag=\"%d", pps->slice_segment_header_extension_present_flag);
-				gf_fprintf(dump, "\" weighted_pred_flag=\"%d", pps->weighted_pred_flag);
-				gf_fprintf(dump, "\" weighted_bipred_flag=\"%d", pps->weighted_bipred_flag);
-
-				gf_fprintf(dump, "\" sign_data_hiding_flag=\"%d", pps->sign_data_hiding_flag);
-				gf_fprintf(dump, "\" constrained_intra_pred_flag=\"%d", pps->constrained_intra_pred_flag);
-				gf_fprintf(dump, "\" transform_skip_enabled_flag=\"%d", pps->transform_skip_enabled_flag);
-				gf_fprintf(dump, "\" cu_qp_delta_enabled_flag=\"%d", pps->cu_qp_delta_enabled_flag);
-				if (pps->cu_qp_delta_enabled_flag)
-					gf_fprintf(dump, "\" diff_cu_qp_delta_depth=\"%d", pps->diff_cu_qp_delta_depth);
-				gf_fprintf(dump, "\" transquant_bypass_enable_flag=\"%d", pps->transquant_bypass_enable_flag);
-				gf_fprintf(dump, "\" pic_cb_qp_offset=\"%d", pps->pic_cb_qp_offset);
-				gf_fprintf(dump, "\" pic_cr_qp_offset=\"%d", pps->pic_cr_qp_offset);
-
-				gf_fprintf(dump, "\" deblocking_filter_control_present_flag=\"%d", pps->deblocking_filter_control_present_flag);
-				if (pps->deblocking_filter_control_present_flag) {
-					gf_fprintf(dump, "\" deblocking_filter_override_enabled_flag=\"%d", pps->deblocking_filter_override_enabled_flag);
-					gf_fprintf(dump, "\" pic_disable_deblocking_filter_flag=\"%d", pps->pic_disable_deblocking_filter_flag);
-					gf_fprintf(dump, "\" beta_offset_div2=\"%d", pps->beta_offset_div2);
-					gf_fprintf(dump, "\" tc_offset_div2=\"%d", pps->tc_offset_div2);
+			if (full_bs_dump) break;
+			idx = gf_hevc_read_pps(ptr, ptr_size, hevc);
+			if (idx<0) {
+				gf_fprintf(dump, "\" pps_id=\"PARSING FAILURE");
+				break;
+			}
+			{
+			HEVC_PPS *pps= &hevc->pps[idx];
+			gf_fprintf(dump, "\" pps_id=\"%d", idx);
+
+			gf_fprintf(dump, "\" cabac_init_present_flag=\"%d", pps->cabac_init_present_flag);
+			gf_fprintf(dump, "\" dependent_slice_segments_enabled_flag=\"%d", pps->dependent_slice_segments_enabled_flag);
+			gf_fprintf(dump, "\" entropy_coding_sync_enabled_flag=\"%d", pps->entropy_coding_sync_enabled_flag);
+			gf_fprintf(dump, "\" lists_modification_present_flag=\"%d", pps->lists_modification_present_flag);
+			gf_fprintf(dump, "\" loop_filter_across_slices_enabled_flag=\"%d", pps->loop_filter_across_slices_enabled_flag);
+			gf_fprintf(dump, "\" loop_filter_across_tiles_enabled_flag=\"%d", pps->loop_filter_across_tiles_enabled_flag);
+			gf_fprintf(dump, "\" num_extra_slice_header_bits=\"%d", pps->num_extra_slice_header_bits);
+			gf_fprintf(dump, "\" num_ref_idx_l0_default_active=\"%d", pps->num_ref_idx_l0_default_active);
+			gf_fprintf(dump, "\" num_ref_idx_l1_default_active=\"%d", pps->num_ref_idx_l1_default_active);
+			gf_fprintf(dump, "\" tiles_enabled_flag=\"%d", pps->tiles_enabled_flag);
+			if (pps->tiles_enabled_flag) {
+				gf_fprintf(dump, "\" uniform_spacing_flag=\"%d", pps->uniform_spacing_flag);
+				if (!pps->uniform_spacing_flag) {
+					u32 k;
+					gf_fprintf(dump, "\" num_tile_columns=\"%d", pps->num_tile_columns);
+					gf_fprintf(dump, "\" num_tile_rows=\"%d", pps->num_tile_rows);
+					gf_fprintf(dump, "\" colomns_width=\"");
+					for (k=0; k<pps->num_tile_columns-1; k++)
+						gf_fprintf(dump, "%d ", pps->column_width[k]);
+					gf_fprintf(dump, "\" rows_height=\"");
+					for (k=0; k<pps->num_tile_rows-1; k++)
+						gf_fprintf(dump, "%d ", pps->row_height[k]);
 				}
-				gf_fprintf(dump, "\" pic_scaling_list_data_present_flag=\"%d", pps->pic_scaling_list_data_present_flag);
-				gf_fprintf(dump, "\" log2_parallel_merge_level_minus2=\"%d", pps->log2_parallel_merge_level_minus2);
+			}
+			gf_fprintf(dump, "\" output_flag_present_flag=\"%d", pps->output_flag_present_flag);
+			gf_fprintf(dump, "\" pic_init_qp_minus26=\"%d", pps->pic_init_qp_minus26);
+			gf_fprintf(dump, "\" slice_chroma_qp_offsets_present_flag=\"%d", pps->slice_chroma_qp_offsets_present_flag);
+			gf_fprintf(dump, "\" slice_segment_header_extension_present_flag=\"%d", pps->slice_segment_header_extension_present_flag);
+			gf_fprintf(dump, "\" weighted_pred_flag=\"%d", pps->weighted_pred_flag);
+			gf_fprintf(dump, "\" weighted_bipred_flag=\"%d", pps->weighted_bipred_flag);
+
+			gf_fprintf(dump, "\" sign_data_hiding_flag=\"%d", pps->sign_data_hiding_flag);
+			gf_fprintf(dump, "\" constrained_intra_pred_flag=\"%d", pps->constrained_intra_pred_flag);
+			gf_fprintf(dump, "\" transform_skip_enabled_flag=\"%d", pps->transform_skip_enabled_flag);
+			gf_fprintf(dump, "\" cu_qp_delta_enabled_flag=\"%d", pps->cu_qp_delta_enabled_flag);
+			if (pps->cu_qp_delta_enabled_flag)
+				gf_fprintf(dump, "\" diff_cu_qp_delta_depth=\"%d", pps->diff_cu_qp_delta_depth);
+			gf_fprintf(dump, "\" transquant_bypass_enable_flag=\"%d", pps->transquant_bypass_enable_flag);
+			gf_fprintf(dump, "\" pic_cb_qp_offset=\"%d", pps->pic_cb_qp_offset);
+			gf_fprintf(dump, "\" pic_cr_qp_offset=\"%d", pps->pic_cr_qp_offset);
+
+			gf_fprintf(dump, "\" deblocking_filter_control_present_flag=\"%d", pps->deblocking_filter_control_present_flag);
+			if (pps->deblocking_filter_control_present_flag) {
+				gf_fprintf(dump, "\" deblocking_filter_override_enabled_flag=\"%d", pps->deblocking_filter_override_enabled_flag);
+				gf_fprintf(dump, "\" pic_disable_deblocking_filter_flag=\"%d", pps->pic_disable_deblocking_filter_flag);
+				gf_fprintf(dump, "\" beta_offset_div2=\"%d", pps->beta_offset_div2);
+				gf_fprintf(dump, "\" tc_offset_div2=\"%d", pps->tc_offset_div2);
+			}
+			gf_fprintf(dump, "\" pic_scaling_list_data_present_flag=\"%d", pps->pic_scaling_list_data_present_flag);
+			gf_fprintf(dump, "\" log2_parallel_merge_level_minus2=\"%d", pps->log2_parallel_merge_level_minus2);
 			}
 			break;
 		case GF_HEVC_NALU_ACCESS_UNIT:
-			gf_fputs("AU Delimiter", dump);
+			if (ptr_size<3) {
+				gf_fprintf(dump, "\" status=\"CORRUPTED NAL");
+				break;
+			}
 			gf_fprintf(dump, "\" primary_pic_type=\"%d", ptr[2] >> 5);
 			break;
-		case GF_HEVC_NALU_END_OF_SEQ:
-			gf_fputs("End of Sequence", dump);
-			break;
-		case GF_HEVC_NALU_END_OF_STREAM:
-			gf_fputs("End of Stream", dump);
-			break;
-		case GF_HEVC_NALU_FILLER_DATA:
-			gf_fputs("Filler Data", dump);
-			break;
-		case GF_HEVC_NALU_SEI_PREFIX:
-			gf_fputs("SEI Prefix", dump);
-			break;
-		case GF_HEVC_NALU_SEI_SUFFIX:
-			gf_fputs("SEI Suffix", dump);
-			break;
-		case 48:
-			gf_fputs("HEVCAggregator", dump);
-			break;
-		case 49:
+		//extractor
+		case GF_HEVC_NALU_FF_EXTRACTOR:
 		{
 			u32 remain = ptr_size-2;
 			char *s = ptr+2;
 
-			gf_fputs("HEVCExtractor ", dump);
+			gf_fputs(" ", dump);
 
 			while (remain) {
 				u32 mode = s[0];
@@ -462,7 +790,7 @@
 				if (mode) {
 					u32 len = s[0];
 					if (len+1>remain) {
-						gf_fprintf(dump, "error=\"invalid inband data extractor size: %d vs %d remaining\"", len, remain);
+						gf_fprintf(dump, "error=\"invalid inband data extractor size: %d vs %d remaining\"/>\n", len, remain);
 						return;
 					}
 					remain -= len+1;
@@ -470,7 +798,7 @@
 					gf_fprintf(dump, "\" inband_size=\"%d", len);
 				} else {
 					if (remain < 2 + 2*nalh_size) {
-						gf_fprintf(dump, "error=\"invalid ref data extractor size: %d vs %d remaining\"", 2 + 2*nalh_size, remain);
+						gf_fprintf(dump, "error=\"invalid ref data extractor size: %d vs %d remaining\"/>\n", 2 + 2*nalh_size, remain);
 						return;
 					}
 					track_ref_index = (u8) s[0];
@@ -486,12 +814,34 @@
 		}
 			break;
 		default:
-			gf_fprintf(dump, "UNKNOWN (parsing return %d)", res);
 			break;
 		}
 		gf_fputs("\"", dump);
 
+		if (!full_bs_dump && (type < GF_HEVC_NALU_VID_PARAM)) {
+			gf_fprintf(dump, " slice=\"%s\" poc=\"%d\"", (hevc->s_info.slice_type==GF_HEVC_SLICE_TYPE_I) ? "I" : (hevc->s_info.slice_type==GF_HEVC_SLICE_TYPE_P) ? "P" : (hevc->s_info.slice_type==GF_HEVC_SLICE_TYPE_B) ? "B" : "Unknown", hevc->s_info.poc);
+			gf_fprintf(dump, " first_slice_in_pic=\"%d\"", hevc->s_info.first_slice_segment_in_pic_flag);
+			gf_fprintf(dump, " dependent_slice_segment=\"%d\"", hevc->s_info.dependent_slice_segment_flag);
+
+			if (!gf_sys_is_test_mode()) {
+				gf_fprintf(dump, " redundant_pic_cnt=\"%d\"", hevc->s_info.redundant_pic_cnt);
+				gf_fprintf(dump, " slice_qp_delta=\"%d\"", hevc->s_info.slice_qp_delta);
+				gf_fprintf(dump, " slice_segment_address=\"%d\"", hevc->s_info.slice_segment_address);
+				gf_fprintf(dump, " slice_type=\"%d\"", hevc->s_info.slice_type);
+			}
+		}
+		if (!full_bs_dump)
+			gf_fprintf(dump, " layer_id=\"%d\" temporal_id=\"%d\"", quality_id, temporal_id);
+
+		if (bs) {
+			if (!pctx)
+				gf_bs_del(bs);
+			else
+				gf_bs_set_logger(bs, NULL, NULL);
+		}
+
 		if ((type == GF_HEVC_NALU_SEI_PREFIX) || (type == GF_HEVC_NALU_SEI_SUFFIX)) {
+			gf_fprintf(dump, ">\n");
 			if (pctx) {
 				if (!pctx->bs)
 					pctx->bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
@@ -503,32 +853,196 @@
 			}
 			dump_sei(dump, bs, GF_TRUE);
 			if (!pctx) gf_bs_del(bs);
+			gf_fprintf(dump, " </NALU>\n");
+		} else {
+			gf_fprintf(dump, "/>\n");
 		}
 
-		if (type < GF_HEVC_NALU_VID_PARAM) {
-			gf_fprintf(dump, " slice=\"%s\" poc=\"%d\"", (hevc->s_info.slice_type==GF_HEVC_SLICE_TYPE_I) ? "I" : (hevc->s_info.slice_type==GF_HEVC_SLICE_TYPE_P) ? "P" : (hevc->s_info.slice_type==GF_HEVC_SLICE_TYPE_B) ? "B" : "Unknown", hevc->s_info.poc);
-			gf_fprintf(dump, " first_slice_in_pic=\"%d\"", hevc->s_info.first_slice_segment_in_pic_flag);
-			gf_fprintf(dump, " dependent_slice_segment=\"%d\"", hevc->s_info.dependent_slice_segment_flag);
+#else
+		gf_fprintf(dump, "/>\n");
+#endif //GPAC_DISABLE_HEVC
+		return;
+	}
 
-			if (!gf_sys_is_test_mode()) {
-				gf_fprintf(dump, " redundant_pic_cnt=\"%d\"", hevc->s_info.redundant_pic_cnt);
-				gf_fprintf(dump, " slice_qp_delta=\"%d\"", hevc->s_info.slice_qp_delta);
-				gf_fprintf(dump, " slice_segment_address=\"%d\"", hevc->s_info.slice_segment_address);
-				gf_fprintf(dump, " slice_type=\"%d\"", hevc->s_info.slice_type);
+	if (vvc) {
+		u8 lid, tid;
+
+		if (ptr_size<=1) {
+			gf_fprintf(dump, "error=\"invalid nal size 1\"/>\n");
+			return;
+		}
+
+		if (full_bs_dump) {
+			vvc->parse_mode = 2;
+			if (pctx) {
+				if (!pctx->bs)
+					pctx->bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
+				else
+					gf_bs_reassign_buffer(pctx->bs, ptr, ptr_size);
+				bs = pctx->bs;
+			} else {
+				bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
+			}
+			gf_bs_set_logger(bs, regular_bs_log, &lcbk);
+			res = gf_vvc_parse_nalu_bs(bs, vvc, &type, &lid, &tid);
+		} else {
+			vvc->parse_mode = 0;
+			bs = NULL;
+			u32 forb_zero = (ptr[0] & 0x80) ? 1 : 0;
+			u32 res_zero = (ptr[0] & 0x40) ? 1 : 0;
+			lid = (ptr[0] & 0x3F);
+			tid = (ptr[1] & 0x7);
+			if (forb_zero || res_zero || !tid) {
+				gf_fprintf(dump, "error=\"invalid header (forb %d res_zero %d tid %d)\"/>\n", forb_zero, res_zero, tid);
+				return;
 			}
+			tid -= 1;
+			type = ptr[1]>>3;
+
+			res = gf_vvc_parse_nalu(ptr, ptr_size, vvc, &type, &lid, &tid);
+			gf_fprintf(dump, "code=\"%d\" temporalid=\"%d\" layerid=\"%d\"", type, tid, lid);
+		}
+		if (res==-1) {
+			gf_fprintf(dump, " status=\"error parsing\"", type);
 		}
 
-		gf_fprintf(dump, " layer_id=\"%d\" temporal_id=\"%d\"", quality_id, temporal_id);
+		gf_fprintf(dump, " type=\"");
+		nal_name = get_vvc_nal_name(type);
+		if (nal_name)
+			gf_fprintf(dump, nal_name);
+		else {
+			gf_fprintf(dump, "Unknwon");
+			res = -2;
+		}
+		//specific dump
+		switch (type) {
+		case GF_VVC_NALU_VID_PARAM:
+			if ((res>=0) && !full_bs_dump) {
+				u32 j;
+				VVC_VPS *vps = &vvc->vps[vvc->last_parsed_vps_id];
+				gf_fprintf(dump, "\" id=\"%d\" num_ptl=\"%d\" max_layers=\"%d\" max_sublayers=\"%d", vps->id, vps->num_ptl, vps->max_layers, vps->max_sub_layers);
+				if (vps->max_layers>1) {
+					gf_fprintf(dump, "\" max_layer_id=\"%d\" all_layers_independent=\"%d\" each_layer_is_ols=\"%d", vps->max_layer_id, vps->all_layers_independent, vps->each_layer_is_ols);
+				}
+				for (j=0; j<vps->num_ptl; j++) {
+					VVC_ProfileTierLevel *ptl = &vps->ptl[j];
+					gf_fprintf(dump, "\" general_level_idc=\"%d\" frame_only_constraint=\"%d\" multilayer_enabled=\"%d\" max_tid=\"%d", ptl->general_level_idc, ptl->frame_only_constraint, ptl->multilayer_enabled, ptl->ptl_max_tid);
 
-#endif //GPAC_DISABLE_HEVC
+					if (ptl->pt_present) {
+						gf_fprintf(dump, "\" general_profile_idc=\"%d\" general_tier_flag=\"%d\" gci_present=\"%d", ptl->general_profile_idc, ptl->general_tier_flag, ptl->gci_present);
+					}
+				}
+			}
+			res = -2;
+			break;
+		case GF_VVC_NALU_SEQ_PARAM:
+			if ((res>=0) && !full_bs_dump) {
+				VVC_SPS *sps = &vvc->sps[vvc->last_parsed_sps_id];
+
+				gf_fprintf(dump, "\" id=\"%d\" vps_id=\"%d\" max_sublayers=\"%d\" chroma_idc=\"%d\" bit_depth=\"%d\" CTBsizeY=\"%d\" gdr_enabled=\"%d\" ref_pic_sampling=\"%d\" subpic_info_present=\"%d\" poc_msb_cycle_flag=\"%d", sps->id, sps->vps_id, sps->max_sublayers, sps->chroma_format_idc, sps->bitdepth, 1<<sps->log2_ctu_size, sps->gdr_enabled, sps->ref_pic_resampling, sps->subpic_info_present, sps->poc_msb_cycle_flag);
+				if (sps->ref_pic_resampling) {
+					gf_fprintf(dump, "\" res_change_in_clvs=\"%d", sps->res_change_in_clvs);
+				}
+				gf_fprintf(dump, "\" width=\"%d\" height=\"%d", sps->width, sps->height);
+				if (!sps->vps_id) {
+					VVC_ProfileTierLevel *ptl = &vvc->vps[0].ptl[0];
+					gf_fprintf(dump, "\" general_level_idc=\"%d\" frame_only_constraint=\"%d\" multilayer_enabled=\"%d\" max_tid=\"%d", ptl->general_level_idc, ptl->frame_only_constraint, ptl->multilayer_enabled, ptl->ptl_max_tid);
+
+					if (ptl->pt_present) {
+						gf_fprintf(dump, "\" general_profile_idc=\"%d\" general_tier_flag=\"%d\" gci_present=\"%d", ptl->general_profile_idc, ptl->general_tier_flag, ptl->gci_present);
+					}
+				}
+				gf_fprintf(dump, "\" conf_window=\"%d", sps->conf_window);
+				if (sps->conf_window) {
+					gf_fprintf(dump, "\" cw_left=\"%d\" cw_right=\"%d\" cw_top=\"%d\" cw_bottom=\"%d", sps->cw_left, sps->cw_right, sps->cw_top, sps->cw_bottom);
+				}
+			}
+			res=-2;
+			break;
+		case GF_VVC_NALU_PIC_PARAM:
+			if ((res>=0) && !full_bs_dump) {
+				VVC_PPS *pps = &vvc->pps[vvc->last_parsed_pps_id];
+				gf_fprintf(dump, "\" id=\"%d\" sps_id=\"%d\" width=\"%d\" height=\"%d\" mixed_nal_types=\"%d\" conf_window=\"%d", pps->id, pps->sps_id, pps->width, pps->height, pps->mixed_nal_types, pps->conf_window);
+
+				if (pps->conf_window) {
+					gf_fprintf(dump, "\" cw_left=\"%d\" cw_right=\"%d\" cw_top=\"%d\" cw_bottom=\"%d", pps->cw_left, pps->cw_right, pps->cw_top, pps->cw_bottom);
+				}
+				gf_fprintf(dump, "\" output_flag_present_flag=\"%d\" no_pic_partition_flag=\"%d\" subpic_id_mapping_present_flag=\"%d", pps->output_flag_present_flag, pps->no_pic_partition_flag, pps->subpic_id_mapping_present_flag);
+			}
+			res=-2;
+			break;
+		default:
+			break;
+		}
+		gf_fprintf(dump, "\"");
+
+		//picture header or slice
+		if ((type!=GF_VVC_NALU_PIC_HEADER) && (type>GF_VVC_NALU_SLICE_GDR))
+			res = -2;
+		if ((res>=0) && !full_bs_dump) {
+			if (type!=GF_VVC_NALU_PIC_HEADER)
+				gf_fprintf(dump, " picture_header_in_slice_header_flag=\"%d\"", vvc->s_info.picture_header_in_slice_header_flag);
+
+			if ((type==GF_VVC_NALU_PIC_HEADER) || vvc->s_info.picture_header_in_slice_header_flag) {
+				gf_fprintf(dump, " pps_id=\"%d\" poc=\"%d\" irap_or_gdr_pic=\"%d\" non_ref_pic=\"%d\" inter_slice_allowed_flag=\"%d\" poc_lsb=\"%d\"", vvc->s_info.pps->id, vvc->s_info.poc, vvc->s_info.irap_or_gdr_pic, vvc->s_info.non_ref_pic, vvc->s_info.inter_slice_allowed_flag, vvc->s_info.poc_lsb);
+				if (vvc->s_info.irap_or_gdr_pic)
+					gf_fprintf(dump, " gdr_pic=\"%d\" gdr_recovery_count=\"%d\"", vvc->s_info.gdr_pic, vvc->s_info.gdr_recovery_count);
+				if (vvc->s_info.inter_slice_allowed_flag)
+					gf_fprintf(dump, " intra_slice_allowed_flag=\"%d\"", vvc->s_info.intra_slice_allowed_flag);
+				if (vvc->s_info.sps->poc_msb_cycle_flag && vvc->s_info.poc_msb_cycle_present_flag)
+					gf_fprintf(dump, " poc_msb_cycle=\"%d\"", vvc->s_info.poc_msb_cycle);
+			}
+			if (type!=GF_VVC_NALU_PIC_HEADER)
+				gf_fprintf(dump, " slice_type=\"%d\"", vvc->s_info.slice_type);
+		}
+
+		if (bs) {
+			if (!pctx)
+				gf_bs_del(bs);
+			else
+				gf_bs_set_logger(bs, NULL, NULL);
+		}
+
+		if ((type == GF_VVC_NALU_SEI_PREFIX) || (type == GF_VVC_NALU_SEI_SUFFIX)) {
+			gf_fprintf(dump, ">\n");
+			if (pctx) {
+				if (!pctx->bs)
+					pctx->bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
+				else
+					gf_bs_reassign_buffer(pctx->bs, ptr, ptr_size);
+				bs = pctx->bs;
+			} else {
+				bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
+			}
+			dump_sei(dump, bs, GF_TRUE);
+			if (!pctx) gf_bs_del(bs);
+			gf_fprintf(dump, " </NALU>\n");
+		} else {
+			gf_fprintf(dump, "/>\n");
+		}
 		return;
 	}
 
+	//avc
+	if (!ptr_size) {
+		gf_fprintf(dump, "error=\"invalid nal size 1\"/>\n");
+		return;
+	}
 	type = ptr[0] & 0x1F;
 	nal_ref_idc = ptr[0] & 0x60;
 	nal_ref_idc>>=5;
-	gf_fprintf(dump, "code=\"%d\" type=\"", type);
+	if (! full_bs_dump)
+		gf_fprintf(dump, "code=\"%d\" ", type);
+
+	gf_fprintf(dump, "type=\"");
 	res = -2;
+	nal_name = get_avc_nal_name(type);
+	if (type == GF_AVC_NALU_SVC_SLICE) nal_name = is_svc ? "SVCSlice" : "CodedSliceExtension";
+	if (nal_name) {
+		gf_fputs(nal_name, dump);
+	} else {
+		gf_fputs("UNKNWON", dump);
+	}
 
 	if (pctx) {
 		if (!pctx->bs)
@@ -539,35 +1053,29 @@
 	} else {
 		bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
 	}
+
+	if (full_bs_dump)
+		gf_bs_set_logger(bs, shifted_bs_log, &lcbk);
+
+	//specific dump
 	switch (type) {
 	case GF_AVC_NALU_NON_IDR_SLICE:
-		gf_fputs("Non IDR slice", dump);
-		if (is_encrypted) break;
-		res = gf_media_avc_parse_nalu(bs, avc);
-		break;
 	case GF_AVC_NALU_DP_A_SLICE:
-		gf_fputs("DP Type A slice", dump);
-		break;
 	case GF_AVC_NALU_DP_B_SLICE:
-		gf_fputs("DP Type B slice", dump);
-		break;
 	case GF_AVC_NALU_DP_C_SLICE:
-		gf_fputs("DP Type C slice", dump);
-		break;
 	case GF_AVC_NALU_IDR_SLICE:
-		gf_fputs("IDR slice", dump);
 		if (is_encrypted) break;
-		res = gf_media_avc_parse_nalu(bs, avc);
-		break;
-	case GF_AVC_NALU_SEI:
-		gf_fputs("SEI Message", dump);
+		res = gf_avc_parse_nalu(bs, avc);
 		break;
 	case GF_AVC_NALU_SEQ_PARAM:
-		gf_fputs("SequenceParameterSet", dump);
 		if (is_encrypted) break;
-		idx = gf_media_avc_read_sps_bs(bs, avc, 0, NULL);
-		if (idx<0) gf_fprintf(dump, "\" sps_id=\"PARSING FAILURE");
-		else gf_fprintf(dump, "\" sps_id=\"%d", idx);
+		idx = gf_avc_read_sps_bs(bs, avc, 0, NULL);
+		if (idx<0) {
+			gf_fprintf(dump, "\" sps_id=\"PARSING FAILURE");
+			break;
+		}
+		if (full_bs_dump) break;
+		gf_fprintf(dump, "\" sps_id=\"%d", idx);
 		gf_fprintf(dump, "\" frame_mbs_only_flag=\"%d", avc->sps->frame_mbs_only_flag);
 		gf_fprintf(dump, "\" mb_adaptive_frame_field_flag=\"%d", avc->sps->mb_adaptive_frame_field_flag);
 		gf_fprintf(dump, "\" vui_parameters_present_flag=\"%d", avc->sps->vui_parameters_present_flag);
@@ -595,7 +1103,6 @@
 			gf_fprintf(dump, "\" vui_matrix_coefficients=\"%d", avc->sps->vui.matrix_coefficients);
 			gf_fprintf(dump, "\" vui_low_delay_hrd_flag=\"%d", avc->sps->vui.low_delay_hrd_flag);
 		}
-		if (gf_sys_is_test_mode()) break;
 		gf_fprintf(dump, "\" log2_max_poc_lsb=\"%d", avc->sps->log2_max_poc_lsb);
 		gf_fprintf(dump, "\" log2_max_frame_num=\"%d", avc->sps->log2_max_frame_num);
 		gf_fprintf(dump, "\" delta_pic_order_always_zero_flag=\"%d", avc->sps->delta_pic_order_always_zero_flag);
@@ -603,13 +1110,15 @@
 
 		break;
 	case GF_AVC_NALU_PIC_PARAM:
-		gf_fputs("PictureParameterSet", dump);
 		if (is_encrypted) break;
-		idx = gf_media_avc_read_pps_bs(bs, avc);
-		if (idx<0) gf_fprintf(dump, "\" pps_id=\"PARSING FAILURE\" ");
-		else gf_fprintf(dump, "\" pps_id=\"%d\" sps_id=\"%d", idx, avc->pps[idx].sps_id);
+		idx = gf_avc_read_pps_bs(bs, avc);
+		if (idx<0) {
+			gf_fprintf(dump, "\" pps_id=\"PARSING FAILURE");
+			break;
+		}
+		if (full_bs_dump) break;
+		gf_fprintf(dump, "\" pps_id=\"%d\" sps_id=\"%d", idx, avc->pps[idx].sps_id);
 		gf_fprintf(dump, "\" entropy_coding_mode_flag=\"%d", avc->pps[idx].entropy_coding_mode_flag);
-		if (gf_sys_is_test_mode()) break;
 		gf_fprintf(dump, "\" deblocking_filter_control_present_flag=\"%d", avc->pps[idx].deblocking_filter_control_present_flag);
 		gf_fprintf(dump, "\" mb_slice_group_map_type=\"%d", avc->pps[idx].mb_slice_group_map_type);
 		gf_fprintf(dump, "\" num_ref_idx_l0_default_active_minus1=\"%d", avc->pps[idx].num_ref_idx_l0_default_active_minus1);
@@ -623,88 +1132,97 @@
 		gf_fprintf(dump, "\" weighted_bipred_idc=\"%d", avc->pps[idx].weighted_bipred_idc);
 		break;
 	case GF_AVC_NALU_ACCESS_UNIT:
-		gf_fputs("AccessUnit delimiter", dump);
 		if (is_encrypted) break;
+		if (full_bs_dump) break;
 		gf_fprintf(dump, "\" primary_pic_type=\"%d", gf_bs_read_u8(bs) >> 5);
 		break;
-	case GF_AVC_NALU_END_OF_SEQ:
-		gf_fputs("EndOfSequence", dump);
-		break;
-	case GF_AVC_NALU_END_OF_STREAM:
-		gf_fputs("EndOfStream", dump);
-		break;
-	case GF_AVC_NALU_FILLER_DATA:
-		gf_fputs("Filler data", dump);
-		break;
-	case GF_AVC_NALU_SEQ_PARAM_EXT:
-		gf_fputs("SequenceParameterSetExtension", dump);
-		break;
-	case GF_AVC_NALU_SVC_PREFIX_NALU:
-		gf_fputs("SVCPrefix", dump);
-		break;
 	case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-		gf_fputs("SVCSubsequenceParameterSet", dump);
 		if (is_encrypted) break;
-		idx = gf_media_avc_read_sps_bs(bs, avc, 1, NULL);
-		assert (idx >= 0);
+		idx = gf_avc_read_sps_bs(bs, avc, 1, NULL);
+		if (idx<0) {
+			gf_fprintf(dump, "\" status=\"CORRUPTED NAL");
+			break;
+		}
+		if (full_bs_dump) break;
 		gf_fprintf(dump, "\" sps_id=\"%d", idx - GF_SVC_SSPS_ID_SHIFT);
 		break;
-	case GF_AVC_NALU_SLICE_AUX:
-		gf_fputs("Auxiliary Slice", dump);
-		break;
-
 	case GF_AVC_NALU_SVC_SLICE:
-		gf_fputs(is_svc ? "SVCSlice" : "CodedSliceExtension", dump);
 		if (is_encrypted) break;
-		gf_media_avc_parse_nalu(bs, avc);
+		gf_avc_parse_nalu(bs, avc);
+		if (full_bs_dump) break;
+		if (ptr_size<4) {
+			gf_fprintf(dump, "\" status=\"CORRUPTED NAL");
+			break;
+		}
 		dependency_id = (ptr[2] & 0x70) >> 4;
 		quality_id = (ptr[2] & 0x0F);
 		temporal_id = (ptr[3] & 0xE0) >> 5;
 		gf_fprintf(dump, "\" dependency_id=\"%d\" quality_id=\"%d\" temporal_id=\"%d", dependency_id, quality_id, temporal_id);
 		gf_fprintf(dump, "\" poc=\"%d", avc->s_info.poc);
 		break;
-	case 30:
-		gf_fputs("SVCAggregator", dump);
+	case GF_AVC_NALU_SVC_PREFIX_NALU:
+		if (is_encrypted) break;
+		if (full_bs_dump) break;
+		if (ptr_size<4) {
+			gf_fprintf(dump, "\" status=\"CORRUPTED NAL");
+			break;
+		}
+		dependency_id = (ptr[2] & 0x70) >> 4;
+		quality_id = (ptr[2] & 0x0F);
+		temporal_id = (ptr[3] & 0xE0) >> 5;
+		gf_fprintf(dump, "\" dependency_id=\"%d\" quality_id=\"%d\" temporal_id=\"%d", dependency_id, quality_id, temporal_id);
 		break;
-	case 31:
-		gf_fputs("SVCExtractor", dump);
+	//extractor
+	case GF_AVC_NALU_FF_EXTRACTOR:
 		if (is_encrypted) break;
+		if (ptr_size<7+nalh_size+nalh_size) {
+			gf_fprintf(dump, "\" status=\"CORRUPTED NAL");
+			break;
+		}
 		track_ref_index = (u8) ptr[4];
 		sample_offset = (s8) ptr[5];
 		data_offset = inspect_get_nal_size(&ptr[6], nalh_size);
 		data_size = inspect_get_nal_size(&ptr[6+nalh_size], nalh_size);
 		gf_fprintf(dump, "\" track_ref_index=\"%d\" sample_offset=\"%d\" data_offset=\"%d\" data_size=\"%d\"", track_ref_index, sample_offset, data_offset, data_size);
 		break;
-
 	default:
-		gf_fputs("UNKNOWN", dump);
 		break;
 	}
 	gf_fputs("\"", dump);
 
-	if (nal_ref_idc) {
-		gf_fprintf(dump, " nal_ref_idc=\"%d\"", nal_ref_idc);
-	}
-	if (res>=0) {
-		gf_fprintf(dump, " poc=\"%d\" pps_id=\"%d\" field_pic_flag=\"%d\"", avc->s_info.poc, avc->s_info.pps->id, (int)avc->s_info.field_pic_flag);
-	}
-
-	if (!is_encrypted) {
-		if (type == GF_AVC_NALU_SEI) {
-			dump_sei(dump, bs, GF_FALSE);
+	if (!full_bs_dump) {
+		if (nal_ref_idc) {
+			gf_fprintf(dump, " nal_ref_idc=\"%d\"", nal_ref_idc);
+		}
+		if (res>=0) {
+			gf_fprintf(dump, " poc=\"%d\" pps_id=\"%d\" field_pic_flag=\"%d\"", avc->s_info.poc, avc->s_info.pps->id, (int)avc->s_info.field_pic_flag);
 		}
 	}
 
 	if (res == -1)
 		gf_fprintf(dump, " status=\"error decoding slice\"");
 
-	if (bs && !pctx) gf_bs_del(bs);
+	if (!is_encrypted && (type == GF_AVC_NALU_SEI)) {
+		gf_fprintf(dump, ">\n");
+		gf_bs_set_logger(bs, NULL, NULL);
+		dump_sei(dump, bs, GF_FALSE);
+		gf_fprintf(dump, " </NALU>\n");
+	} else {
+		gf_fprintf(dump, "/>\n");
+	}
+
+	if (bs) {
+		if (!pctx)
+			gf_bs_del(bs);
+		else
+			gf_bs_set_logger(bs, NULL, NULL);
+	}
 }
 
 GF_EXPORT
-void gf_inspect_dump_nalu(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, u32 nalh_size, Bool dump_crc, Bool is_encrypted)
+void gf_inspect_dump_nalu(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, VVCState *vvc, u32 nalh_size, Bool dump_crc, Bool is_encrypted)
 {
-	gf_inspect_dump_nalu_internal(dump, ptr, ptr_size, is_svc, hevc, avc, nalh_size, dump_crc, is_encrypted, NULL);
+	gf_inspect_dump_nalu_internal(dump, ptr, ptr_size, is_svc, hevc, avc, vvc, nalh_size, dump_crc, is_encrypted, 0, NULL);
 }
 
 static void av1_dump_tile(FILE *dump, u32 idx, AV1Tile *tile)
@@ -712,51 +1230,93 @@
 	gf_fprintf(dump, " <Tile number=\"%d\" start=\"%d\" size=\"%d\"/>\n", idx, tile->obu_start_offset, tile->size);
 }
 
-GF_EXPORT
-void gf_inspect_dump_obu(FILE *dump, AV1State *av1, u8 *obu, u64 obu_length, ObuType obu_type, u64 obu_size, u32 hdr_size, Bool dump_crc)
+static u64 gf_inspect_dump_obu_internal(FILE *dump, AV1State *av1, u8 *obu_ptr, u64 obu_ptr_length, ObuType obu_type, u64 obu_size, u32 hdr_size, Bool dump_crc, PidCtx *pctx, u32 full_dump)
 {
+	//when the pid context is not set, obu_size (which includes the header size in gpac) must be set
+	assert(pctx || obu_size >= 2);
+
+	if (pctx) {
+		InspectLogCbk lcbk;
+
+		if (full_dump>=INSPECT_ANALYZE_BS) {
+			lcbk.dump = dump;
+			lcbk.dump_bits = (full_dump==INSPECT_ANALYZE_BS_BITS) ? GF_TRUE : GF_FALSE;
+			gf_bs_set_logger(pctx->bs, regular_bs_log, &lcbk);
+
+			gf_fprintf(dump, " <OBU");
+		}
+		gf_av1_parse_obu(pctx->bs, &obu_type, &obu_size, &hdr_size, pctx->av1_state);
+
+
+		if (full_dump>=INSPECT_ANALYZE_BS) {
+			gf_bs_set_logger(pctx->bs, NULL, NULL);
+		} else {
+			full_dump = 0;
+		}
+	}
+
+	if (!full_dump) {
+		gf_fprintf(dump, " <OBU");
+	}
+
+
 #define DUMP_OBU_INT(_v) gf_fprintf(dump, #_v"=\"%d\" ", av1->_v);
 #define DUMP_OBU_INT2(_n, _v) gf_fprintf(dump, _n"=\"%d\" ", _v);
 
-	gf_fprintf(dump, " <OBU size=\""LLU"\" type=\"%s\" header_size=\"%d\" has_size_field=\"%d\" has_ext=\"%d\" temporalID=\"%d\" spatialID=\"%d\" ", obu_size, gf_av1_get_obu_name(obu_type), hdr_size, av1->obu_has_size_field, av1->obu_extension_flag, av1->temporal_id , av1->spatial_id);
-	if (dump_crc && (obu_length<0xFFFFFFFFUL))
-		gf_fprintf(dump, "crc=\"%u\" ", gf_crc_32(obu, (u32) obu_length) );
+	gf_fprintf(dump, " size=\""LLU"\" type=\"%s\" header_size=\"%d\" ", obu_size, gf_av1_get_obu_name(obu_type), hdr_size);
+
+	if (!full_dump) {
+		gf_fprintf(dump, "has_size_field=\"%d\" has_ext=\"%d\" temporalID=\"%d\" spatialID=\"%d\" ", av1->obu_has_size_field, av1->obu_extension_flag, av1->temporal_id , av1->spatial_id);
+	}
+
+	if (dump_crc && (obu_size<0xFFFFFFFFUL))
+		gf_fprintf(dump, "crc=\"%u\" ", gf_crc_32(obu_ptr, (u32) obu_size) );
 	switch (obu_type) {
 	case OBU_SEQUENCE_HEADER:
-		DUMP_OBU_INT(width)
-		DUMP_OBU_INT(height)
-		DUMP_OBU_INT(bit_depth)
+		if (full_dump) break;
+		DUMP_OBU_INT(sequence_width)
+		DUMP_OBU_INT(sequence_height)
 		DUMP_OBU_INT(still_picture)
 		DUMP_OBU_INT(OperatingPointIdc)
-		DUMP_OBU_INT(color_range)
+		DUMP_OBU_INT2("profile", av1->config->seq_profile)
+		DUMP_OBU_INT2("level", av1->config->seq_level_idx_0)
+		DUMP_OBU_INT(bit_depth)
+		DUMP_OBU_INT2("monochrome", av1->config->monochrome)
 		DUMP_OBU_INT(color_description_present_flag)
 		DUMP_OBU_INT(color_primaries)
 		DUMP_OBU_INT(transfer_characteristics)
 		DUMP_OBU_INT(matrix_coefficients)
-		DUMP_OBU_INT2("profile", av1->config->seq_profile)
-		DUMP_OBU_INT2("level", av1->config->seq_level_idx_0)
+		DUMP_OBU_INT(color_range)
+		DUMP_OBU_INT2("chroma_subsampling_x", av1->config->chroma_subsampling_x)
+		DUMP_OBU_INT2("chroma_subsampling_y", av1->config->chroma_subsampling_y)
+		DUMP_OBU_INT2("chroma_sample_position", av1->config->chroma_sample_position)
+		DUMP_OBU_INT(film_grain_params_present)
 		break;
 	case OBU_FRAME_HEADER:
 	case OBU_FRAME:
-		if (av1->frame_id_numbers_present_flag) {
-			DUMP_OBU_INT2("delta_frame_id_length_minus_2", av1->delta_frame_id_length_minus_2)
-		}
-		if (av1->reduced_still_picture_header) {
-			DUMP_OBU_INT(reduced_still_picture_header)
-		}
-		DUMP_OBU_INT2("uncompressed_header_bytes", av1->frame_state.uncompressed_header_bytes);
-		if (av1->frame_state.uncompressed_header_bytes) {
-			if (av1->frame_state.frame_type==AV1_KEY_FRAME) gf_fprintf(dump, "frame_type=\"key\" ");
-			else if (av1->frame_state.frame_type==AV1_INTER_FRAME) gf_fprintf(dump, "frame_type=\"inter\" ");
-			else if (av1->frame_state.frame_type==AV1_INTRA_ONLY_FRAME) gf_fprintf(dump, "frame_type=\"intra_only\" ");
-			else if (av1->frame_state.frame_type==AV1_SWITCH_FRAME) gf_fprintf(dump, "frame_type=\"switch\" ");
-			gf_fprintf(dump, "refresh_frame_flags=\"%d\" ", av1->frame_state.refresh_frame_flags);
-
-			DUMP_OBU_INT2("show_frame", av1->frame_state.show_frame);
-			DUMP_OBU_INT2("show_existing_frame", av1->frame_state.show_existing_frame);
+		if (!full_dump) {
+			if (av1->frame_id_numbers_present_flag) {
+				DUMP_OBU_INT2("delta_frame_id_length_minus_2", av1->delta_frame_id_length_minus_2)
+			}
+			if (av1->reduced_still_picture_header) {
+				DUMP_OBU_INT(reduced_still_picture_header)
+			}
+			DUMP_OBU_INT2("uncompressed_header_bytes", av1->frame_state.uncompressed_header_bytes);
+			if (av1->frame_state.uncompressed_header_bytes) {
+				if (av1->frame_state.frame_type==AV1_KEY_FRAME) gf_fprintf(dump, "frame_type=\"key\" ");
+				else if (av1->frame_state.frame_type==AV1_INTER_FRAME) gf_fprintf(dump, "frame_type=\"inter\" ");
+				else if (av1->frame_state.frame_type==AV1_INTRA_ONLY_FRAME) gf_fprintf(dump, "frame_type=\"intra_only\" ");
+				else if (av1->frame_state.frame_type==AV1_SWITCH_FRAME) gf_fprintf(dump, "frame_type=\"switch\" ");
+				gf_fprintf(dump, "refresh_frame_flags=\"%d\" ", av1->frame_state.refresh_frame_flags);
+
+				DUMP_OBU_INT2("show_frame", av1->frame_state.show_frame);
+				DUMP_OBU_INT2("show_existing_frame", av1->frame_state.show_existing_frame);
+				DUMP_OBU_INT(width);
+				DUMP_OBU_INT(height);
+			}
+			if (obu_type==OBU_FRAME_HEADER)
+				break;
 		}
-		if (obu_type==OBU_FRAME_HEADER)
-			break;
 
 	case OBU_TILE_GROUP:
 		if (av1->frame_state.nb_tiles_in_obu) {
@@ -769,14 +1329,43 @@
 		} else {
 			gf_fprintf(dump, "nb_tiles=\"unknown\">\n");
 		}
-		gf_fprintf(dump, "</OBU>\n");
+		gf_fprintf(dump, " </OBU>\n");
+		break;
+	case OBU_METADATA:
+		{
+			GF_BitStream *bs = gf_bs_new(obu_ptr+hdr_size, obu_ptr_length-hdr_size, GF_BITSTREAM_READ);
+			u32 metadata_type = (u32)gf_av1_leb128_read(bs, NULL);
+			DUMP_OBU_INT2("metadata_type", metadata_type);
+			switch (metadata_type) {
+				case OBU_METADATA_TYPE_ITUT_T35:
+					dump_t35(dump, bs);
+					break;
+				case OBU_METADATA_TYPE_HDR_CLL:
+					dump_clli(dump, bs);
+					break;
+				case OBU_METADATA_TYPE_HDR_MDCV:
+					dump_mdcv(dump, bs, GF_FALSE);
+					break;
+				default:
+					break;
+			}
+			gf_bs_del(bs);
+		}
 		break;
 	default:
 		break;
 
 	}
-	if (obu_type != OBU_TILE_GROUP)
+	if ((obu_type != OBU_TILE_GROUP) && (obu_type != OBU_FRAME) )
 		gf_fprintf(dump, "/>\n");
+
+	return obu_size;
+}
+
+GF_EXPORT
+void gf_inspect_dump_obu(FILE *dump, AV1State *av1, u8 *obu_ptr, u64 obu_ptr_length, ObuType obu_type, u64 obu_size, u32 hdr_size, Bool dump_crc)
+{
+	gf_inspect_dump_obu_internal(dump, av1, obu_ptr, obu_ptr_length, obu_type, obu_size, hdr_size, dump_crc, NULL, 0);
 }
 
 static void gf_inspect_dump_prores_internal(FILE *dump, u8 *ptr, u64 frame_size, Bool dump_crc, PidCtx *pctx)
@@ -1077,7 +1666,7 @@
 		}
 		gf_fclose(pctx->tmp);
 		if (ctx->xml)
-			gf_fprintf(ctx->dump, "</PIDInspect>");
+			gf_fprintf(ctx->dump, "</PIDInspect>\n");
 		pctx->tmp = NULL;
 	}
 }
@@ -1087,17 +1676,35 @@
 	Bool concat=GF_FALSE;
 	GF_InspectCtx *ctx = (GF_InspectCtx *) gf_filter_get_udta(filter);
 
-	if (ctx->dump) {
-		if ((ctx->dump!=stderr) && (ctx->dump!=stdout)) concat=GF_TRUE;
-		else if (!ctx->interleave) concat=GF_TRUE;
-	}
-	if (!ctx->interleave) {
-		finalize_dump(ctx, GF_STREAM_AUDIO, concat);
-		finalize_dump(ctx, GF_STREAM_VISUAL, concat);
-		finalize_dump(ctx, GF_STREAM_SCENE, concat);
-		finalize_dump(ctx, GF_STREAM_OD, concat);
-		finalize_dump(ctx, GF_STREAM_TEXT, concat);
-		finalize_dump(ctx, 0, concat);
+	if (ctx->is_prober) {
+		FILE *fout;
+		Bool do_close=GF_FALSE;
+		if (!strcmp(ctx->log, "stderr")) fout = stderr;
+		else if (!strcmp(ctx->log, "stdout")) fout = stdout;
+		else if (!strcmp(ctx->log, "null")) fout = NULL;
+		else {
+			fout = gf_fopen(ctx->log, "w");
+			do_close = GF_TRUE;
+		}
+		if (fout) {
+			gf_fprintf(fout, "%u\n", gf_list_count(ctx->src_pids));
+			if (do_close) gf_fclose(fout);
+		}
+	} else {
+		if (ctx->dump) {
+			if ((ctx->dump!=stderr) && (ctx->dump!=stdout)) concat=GF_TRUE;
+			else if (!ctx->interleave) concat=GF_TRUE;
+		}
+
+
+		if (!ctx->interleave) {
+			finalize_dump(ctx, GF_STREAM_AUDIO, concat);
+			finalize_dump(ctx, GF_STREAM_VISUAL, concat);
+			finalize_dump(ctx, GF_STREAM_SCENE, concat);
+			finalize_dump(ctx, GF_STREAM_OD, concat);
+			finalize_dump(ctx, GF_STREAM_TEXT, concat);
+			finalize_dump(ctx, 0, concat);
+		}
 	}
 
 	while (gf_list_count(ctx->src_pids)) {
@@ -1106,12 +1713,14 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 		if (pctx->avc_state) gf_free(pctx->avc_state);
 		if (pctx->hevc_state) gf_free(pctx->hevc_state);
+		if (pctx->vvc_state) gf_free(pctx->vvc_state);
 		if (pctx->av1_state) {
 			if (pctx->av1_state->config) gf_odf_av1_cfg_del(pctx->av1_state->config);
 			gf_av1_reset_state(pctx->av1_state, GF_TRUE);
 			gf_free(pctx->av1_state);
 		}
 #endif
+		if (pctx->vpcc) gf_odf_vp_cfg_del(pctx->vpcc);
 		if (pctx->bs) gf_bs_del(pctx->bs);
 		gf_free(pctx);
 	}
@@ -1130,13 +1739,13 @@
 			gf_fclose(ctx->dump);
 		}
 	}
-
 }
 
 static void dump_temi_loc(GF_InspectCtx *ctx, PidCtx *pctx, FILE *dump, const char *pname, const GF_PropertyValue *att)
 {
 	u32 val;
-	Double dval;
+	Bool is_announce = GF_FALSE;
+
 	if (ctx->xml) {
 		gf_fprintf(dump, " <TEMILocation");
 	} else {
@@ -1158,6 +1767,7 @@
 	DUMP_ATT_STR("url", att->value.data.ptr)
 	if (gf_bs_read_int(pctx->bs, 1)) {
 		DUMP_ATT_D("announce", 1)
+		is_announce = GF_TRUE;
 	}
 	if (gf_bs_read_int(pctx->bs, 1)) {
 		DUMP_ATT_D("splicing", 1)
@@ -1166,14 +1776,14 @@
 		DUMP_ATT_D("reload", 1)
 	}
 	gf_bs_read_int(pctx->bs, 5);
-	dval =	gf_bs_read_double(pctx->bs);
-	if (dval) {
-		DUMP_ATT_F("splice_start", dval)
-	}
-	dval =	gf_bs_read_double(pctx->bs);
-	if (dval) {
-		DUMP_ATT_F("splice_end", dval)
+	if (is_announce) {
+		GF_Fraction time;
+		time.den = gf_bs_read_u32(pctx->bs);
+		time.num = gf_bs_read_u32(pctx->bs);
+
+		DUMP_ATT_FRAC("splice_start", time)
 	}
+
 	if (ctx->xml) {
 		gf_fprintf(dump, "/>\n");
 	} else {
@@ -1227,19 +1837,134 @@
 	}
 }
 
+static void gf_inspect_dump_truehd_frame(FILE *dump, GF_BitStream *bs)
+{
+	u8 nibble;
+	u16 frame_size, timing;
+	u32 sync;
+	gf_fprintf(dump, " <TrueHDAudioFrame");
+	nibble = gf_bs_read_int(bs, 4);
+	frame_size = gf_bs_read_int(bs, 12);
+	timing = gf_bs_read_u16(bs);
+	sync = gf_bs_read_u32(bs);
+	gf_fprintf(dump, " nibble=\"%u\" size=\"%u\" timing=\"%u\"", nibble, frame_size, timing);
+	if (sync != 0xF8726FBA) {
+		gf_fprintf(dump, " major_sync=\"no\"/>\n");
+		return;
+	}
+	u32 fmt = gf_bs_read_u32(bs);
+	u32 sig = gf_bs_read_u16(bs);
+	u32 flags = gf_bs_read_u16(bs);
+	gf_bs_read_u16(bs);
+	Bool vrate = gf_bs_read_int(bs, 1);
+	u32 prate = gf_bs_read_int(bs, 15);
+	u32 nb_substreams = gf_bs_read_int(bs, 4);
+	gf_bs_read_int(bs, 2);
+	u32 ext_substream_info = gf_bs_read_int(bs, 2);
+	gf_fprintf(dump, " major_sync=\"yes\" format=\"%u\" signature=\"%u\" flags=\"0x%04X\" vrate=\"%u\" peak_data_rate=\"%u\" substreams=\"%u\" extended_substream_info=\"%u\" ", fmt, sig, flags, vrate, prate, nb_substreams, ext_substream_info);
+
+	gf_fprintf(dump, "/>\n");
+}
+
 static void inspect_dump_property(GF_InspectCtx *ctx, FILE *dump, u32 p4cc, const char *pname, const GF_PropertyValue *att, PidCtx *pctx)
 {
 	char szDump[GF_PROP_DUMP_ARG_SIZE];
 
-	if (!pname) pname = gf_props_4cc_get_name(p4cc);
+	if (!pname)
+		pname = gf_props_4cc_get_name(p4cc);
+	else {
+		//all properties starting with __ are not dumped
+		if (!strncmp(pname, "__", 2))
+			return;
+		if (!strcmp(pname, "isom_force_ctts") || !strcmp(pname, "reframer_rem_edits") )
+			return;
+	}
 
 	if (p4cc==GF_PROP_PID_DOWNLOAD_SESSION)
 		return;
+	if (p4cc==GF_PROP_PCK_END_RANGE)
+		return;
+
+	if ((att->type==GF_PROP_DATA) && (ctx->analyze || ctx->xml)) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (p4cc==GF_PROP_PID_CONTENT_LIGHT_LEVEL) {
+			GF_BitStream *bs = gf_bs_new(att->value.data.ptr, att->value.data.size, GF_BITSTREAM_READ);
+			dump_clli(dump, bs);
+			gf_bs_del(bs);
+			return;
+		}
+		else if (p4cc==GF_PROP_PID_MASTER_DISPLAY_COLOUR) {
+			GF_BitStream *bs = gf_bs_new(att->value.data.ptr, att->value.data.size, GF_BITSTREAM_READ);
+			//mdcv property is always in MPEG units
+			dump_mdcv(dump, bs, GF_TRUE);
+			gf_bs_del(bs);
+			return;
+		}
+#endif /*GPAC_DISABLE_AV_PARSERS*/
+	}
+
+
+	if (p4cc==GF_PROP_PID_CENC_KEY_INFO) {
+		u32 i, nb_keys, kpos;
+		u8 *data;
+		if (ctx->xml) {
+			if (ctx->dtype)
+				gf_fprintf(dump, " type=\"%s\"", gf_props_get_type_name(att->type) );
+			gf_fprintf(dump, " %s=\"", pname);
+		} else {
+			if (ctx->dtype) {
+				gf_fprintf(dump, "\t%s (%s): ", pname, gf_props_get_type_name(att->type));
+			} else {
+				gf_fprintf(dump, "\t%s: ", pname);
+			}
+		}
+		data = att->value.data.ptr;
+		nb_keys = 1;
+		if (data[0]) {
+			nb_keys = data[1];
+			nb_keys <<= 8;
+			nb_keys |= data[2];
+		}
+		if (nb_keys>1) gf_fprintf(dump, "[");
+		kpos = 3;
+		for (i=0; i<nb_keys; i++) {
+			u32 j;
+			bin128 KID;
+			u8 iv_size = data[kpos];
+			memcpy(KID, data+kpos+1, 16);
+			gf_fprintf(dump, "IV_size:%d,KID:0x", iv_size);
+			for (j=0; j<16; j++) {
+				gf_fprintf(dump, "%02X", (unsigned char) data[kpos + 1 + j]);
+			}
+			kpos+=17;
+			if (!iv_size) {
+				iv_size = data[kpos];
+				gf_fprintf(dump, ",const_IV_size:%d", iv_size);
+				if (iv_size) {
+					gf_fprintf(dump, ",const_IV:0x");
+					for (j=0; j<iv_size; j++) {
+						gf_fprintf(dump, "%02X", (unsigned char) data[kpos + 1 + j]);
+					}
+				}
+				kpos += iv_size+1;
+			}
+		}
+
+		if (nb_keys>1) gf_fprintf(dump, "]");
+		if (ctx->xml) {
+			gf_fprintf(dump, "\"");
+		} else {
+			gf_fprintf(dump, "\n");
+		}
+
+		return;
+	}
 
 	if (gf_sys_is_test_mode() || ctx->test) {
 		switch (p4cc) {
 		case GF_PROP_PID_FILEPATH:
 		case GF_PROP_PID_URL:
+		case GF_PROP_PID_MUX_SRC:
 			return;
 		case GF_PROP_PID_FILE_CACHED:
 		case GF_PROP_PID_DURATION:
@@ -1252,8 +1977,10 @@
 			if (ctx->test>=INSPECT_TEST_ENCODE)
 				return;
 			break;
-		case GF_PROP_PID_MEDIA_DATA_SIZE:
 		case GF_PROP_PID_BITRATE:
+			if (ctx->test==INSPECT_TEST_NOBR)
+				return;
+		case GF_PROP_PID_MEDIA_DATA_SIZE:
 		case GF_PROP_PID_MAXRATE:
 		case GF_PROP_PID_AVG_FRAME_SIZE:
 		case GF_PROP_PID_MAX_FRAME_SIZE:
@@ -1284,42 +2011,37 @@
 		if (ctx->dtype)
 			gf_fprintf(dump, " type=\"%s\"", gf_props_get_type_name(att->type) );
 			
-		if (pname && strchr(pname, ' ')) {
+		if (pname && (strchr(pname, ' ') || strchr(pname, ':'))) {
 			u32 i=0, k;
 			char *pname_no_space = gf_strdup(pname);
 			while (pname_no_space[i]) {
 				if (pname_no_space[i]==' ') pname_no_space[i]='_';
+				if (pname_no_space[i]==':') pname_no_space[i]='_';
 				i++;
 			}
 
-			if (att->type==GF_PROP_UINT_LIST) {
+			if ((att->type==GF_PROP_UINT_LIST) || (att->type==GF_PROP_4CC_LIST)) {
 				for (k=0; k < att->value.uint_list.nb_items; k++) {
 					if (k) gf_fprintf(dump, ", ");
-					switch (p4cc) {
-					case GF_PROP_PID_ISOM_BRANDS:
-						if (! gf_sys_is_test_mode()) {
-							gf_fprintf(dump, "%s", gf_4cc_to_str(att->value.uint_list.vals[k]) );
-							break;
-						}
-					default:
+					if ((att->type==GF_PROP_4CC_LIST) && ! gf_sys_is_test_mode()) {
+						gf_fprintf(dump, "%s", gf_4cc_to_str(att->value.uint_list.vals[k]) );
+					} else {
 						gf_fprintf(dump, "%d", att->value.uint_list.vals[k]);
-						break;
 					}
 				}
 			} else if (att->type==GF_PROP_STRING_LIST) {
-				u32 plist_count = gf_list_count(att->value.string_list);
-				for (k=0; k < plist_count; k++) {
+				for (k=0; k < att->value.string_list.nb_items; k++) {
 					if (k) gf_fprintf(dump, ", ");
-					gf_xml_dump_string(dump, NULL, (char *) gf_list_get(att->value.string_list, k), NULL);
+					gf_xml_dump_string(dump, NULL, (char *) att->value.string_list.vals[k], NULL);
 				}
 			} else if ((att->type==GF_PROP_STRING) || (att->type==GF_PROP_STRING_NO_COPY)) {
 				gf_xml_dump_string(dump, NULL, att->value.string, NULL);
 			} else {
-				gf_fprintf(dump, " %s=\"%s\"", pname_no_space, gf_props_dump(p4cc, att, szDump, ctx->dump_data));
+				gf_fprintf(dump, " %s=\"%s\"", pname_no_space, gf_props_dump(p4cc, att, szDump, (GF_PropDumDataMode) ctx->dump_data));
 			}
 			gf_free(pname_no_space);
 		} else {
-			gf_fprintf(dump, " %s=\"%s\"", pname ? pname : gf_4cc_to_str(p4cc), gf_props_dump(p4cc, att, szDump, ctx->dump_data));
+			gf_fprintf(dump, " %s=\"%s\"", pname ? pname : gf_4cc_to_str(p4cc), gf_props_dump(p4cc, att, szDump, (GF_PropDumDataMode) ctx->dump_data));
 		}
 	} else {
 		if (ctx->dtype) {
@@ -1333,29 +2055,24 @@
 				gf_fprintf(dump, "\t%s: ", pname ? pname : gf_4cc_to_str(p4cc));
 		}
 
-		if (att->type==GF_PROP_UINT_LIST) {
+		if ((att->type==GF_PROP_UINT_LIST) || (att->type==GF_PROP_4CC_LIST)) {
 			u32 k;
 			for (k=0; k < att->value.uint_list.nb_items; k++) {
 				if (k) gf_fprintf(dump, ", ");
-				switch (p4cc) {
-				case GF_PROP_PID_ISOM_BRANDS:
-					if (! gf_sys_is_test_mode()) {
-						gf_fprintf(dump, "%s", gf_4cc_to_str(att->value.uint_list.vals[k]) );
-						break;
-					}
-				default:
+				if ((att->type==GF_PROP_4CC_LIST) && ! gf_sys_is_test_mode()) {
+					gf_fprintf(dump, "%s", gf_4cc_to_str(att->value.uint_list.vals[k]) );
+				} else {
 					gf_fprintf(dump, "%d", att->value.uint_list.vals[k]);
-					break;
 				}
 			}
 		} else if (att->type==GF_PROP_STRING_LIST) {
-			u32 k, plist_count = gf_list_count(att->value.string_list);
-			for (k=0; k < plist_count; k++) {
+			u32 k;
+			for (k=0; k < att->value.string_list.nb_items; k++) {
 				if (k) gf_fprintf(dump, ", ");
-				gf_fprintf(dump, "%s", (const char *) gf_list_get(att->value.string_list, k));
+				gf_fprintf(dump, "%s", (const char *) att->value.string_list.vals[k]);
 			}
 		}else{
-			gf_fprintf(dump, "%s", gf_props_dump(p4cc, att, szDump, ctx->dump_data) );
+			gf_fprintf(dump, "%s", gf_props_dump(p4cc, att, szDump, (GF_PropDumDataMode) ctx->dump_data) );
 		}
 		gf_fprintf(dump, "\n");
 	}
@@ -1370,8 +2087,10 @@
 	if (!dump) return;
 	assert(str);
 
-	if (pck)
+	if (pck) {
 		data = gf_filter_pck_get_data(pck, &size);
+		pctx->csize += size;
+	}
 
 	while (str) {
 		char csep;
@@ -1399,8 +2118,7 @@
 		key = str+1;
 
 		if (!pck) {
-			if (!strcmp(key, "lf")) gf_fprintf(dump, "\n" );
-			else if (!strcmp(key, "cr")) gf_fprintf(dump, "\r" );
+			if (!strcmp(key, "lf") || !strcmp(key, "n")) gf_fprintf(dump, "\n" );
 			else if (!strcmp(key, "t")) gf_fprintf(dump, "\t" );
 			else if (!strncmp(key, "pid.", 4)) gf_fprintf(dump, "%s", key+4);
 			else gf_fprintf(dump, "%s", key);
@@ -1479,9 +2197,9 @@
 		else if (!strcmp(key, "crypt")) gf_fprintf(dump, "%d", gf_filter_pck_get_crypt_flags(pck) );
 		else if (!strcmp(key, "vers")) gf_fprintf(dump, "%d", gf_filter_pck_get_carousel_version(pck) );
 		else if (!strcmp(key, "size")) gf_fprintf(dump, "%d", size );
+		else if (!strcmp(key, "csize")) gf_fprintf(dump, "%d", pctx->csize);
 		else if (!strcmp(key, "crc")) gf_fprintf(dump, "0x%08X", gf_crc_32(data, size) );
-		else if (!strcmp(key, "lf")) gf_fprintf(dump, "\n" );
-		else if (!strcmp(key, "cr")) gf_fprintf(dump, "\r" );
+		else if (!strcmp(key, "lf") || !strcmp(key, "n")) gf_fprintf(dump, "\n" );
 		else if (!strcmp(key, "t")) gf_fprintf(dump, "\t" );
 		else if (!strcmp(key, "data")) {
 			u32 i;
@@ -1511,7 +2229,48 @@
 			flags &= 0x3;
 			gf_fprintf(dump, "%u", flags);
 		}
-		else if (!strcmp(key, "ck")) gf_fprintf(dump, "%d", gf_filter_pck_get_clock_type(pck) );
+		else if (!strcmp(key, "ck")) {
+			GF_FilterClockType ck_type = gf_filter_pck_get_clock_type(pck);
+			gf_fprintf(dump, "%d", ck_type );
+		} else if (!strcmp(key, "pcr") || !strcmp(key, "pcrd") || !strcmp(key, "pcrc")) {
+			u64 clock_val;
+			u32 ck_timescale;
+			GF_FilterClockType ck_type;
+			ck_type = gf_filter_pid_get_clock_info(pctx->src_pid, &clock_val, &ck_timescale);
+			if (ck_type) {
+				u32 timescale = gf_filter_pck_get_timescale(pck);
+				pctx->last_pcr = gf_timestamp_rescale(clock_val, ck_timescale, timescale);
+				pctx->last_clock_type = ck_type;
+			} else {
+				ck_type = pctx->last_clock_type;
+			}
+			clock_val = pctx->last_pcr;
+
+			if (ck_type) {
+				u64 ts = GF_FILTER_NO_TS;
+				Bool dump_diff=GF_FALSE;
+				u32 timescale = gf_filter_pck_get_timescale(pck);
+				clock_val = gf_timestamp_rescale(clock_val, ck_timescale, timescale);
+				if (!strcmp(key, "pcrd")) {
+					ts = gf_filter_pck_get_dts(pck);
+					dump_diff = GF_TRUE;
+				}
+				else if (!strcmp(key, "pcrc")) {
+					ts = gf_filter_pck_get_cts(pck);
+					dump_diff = GF_TRUE;
+				}
+				if (dump_diff) {
+					if (ts>clock_val)
+						gf_fprintf(dump, "-"LLU, ts - clock_val);
+					else
+						gf_fprintf(dump, LLU, clock_val - ts);
+				} else {
+					gf_fprintf(dump, LLU, clock_val);
+				}
+			} else {
+				gf_fprintf(dump, "N/A");
+			}
+		}
 		else if (!strncmp(key, "pid.", 4)) {
 			const GF_PropertyValue *prop = NULL;
 			u32 prop_4cc=0;
@@ -1525,7 +2284,9 @@
 			if (!prop) prop = gf_filter_pid_get_property_str(pctx->src_pid, key);
 
 			if (prop) {
-				gf_fprintf(dump, "%s", gf_props_dump(prop_4cc, prop, szDump, ctx->dump_data) );
+				gf_fprintf(dump, "%s", gf_props_dump(prop_4cc, prop, szDump, (GF_PropDumDataMode) ctx->dump_data) );
+			} else {
+				gf_fprintf(dump, "N/A");
 			}
 		}
 		else {
@@ -1539,7 +2300,9 @@
 			if (!prop) prop = gf_filter_pck_get_property_str(pck, key);
 
 			if (prop) {
-				gf_fprintf(dump, "%s", gf_props_dump(prop_4cc, prop, szDump, ctx->dump_data) );
+				gf_fprintf(dump, "%s", gf_props_dump(prop_4cc, prop, szDump, (GF_PropDumDataMode) ctx->dump_data) );
+			} else {
+				gf_fprintf(dump, "N/A");
 			}
 		}
 
@@ -1578,7 +2341,7 @@
 				gf_fprintf(dump, " name=\"VOS\" PL=\"%d\"", pctx->dsi.VideoPL);
 				break;
 			case M4V_VOL_START_CODE:
-				gf_fprintf(dump, " name=\"VOL\" RAP=\"%d\" objectType=\"%d\" par=\"%d/%d\" hasShape=\"%d\"", pctx->dsi.RAP_stream, pctx->dsi.objectType, pctx->dsi.par_num, pctx->dsi.par_den, pctx->dsi.has_shape);
+				gf_fprintf(dump, " name=\"VOL\" RAPStream=\"%d\" objectType=\"%d\" par=\"%d/%d\" hasShape=\"%d\"", pctx->dsi.RAP_stream, pctx->dsi.objectType, pctx->dsi.par_num, pctx->dsi.par_den, pctx->dsi.has_shape);
 				if (pctx->dsi.clock_rate)
 					gf_fprintf(dump, " clockRate=\"%d\"", pctx->dsi.clock_rate);
 				if (pctx->dsi.time_increment)
@@ -1589,7 +2352,7 @@
 				break;
 
 			case M4V_VOP_START_CODE:
-				gf_fprintf(dump, " name=\"VOP\" frameType=\"%d\" timeInc=\"%d\" isCoded=\"%d\"", ftype, tinc, is_coded);
+				gf_fprintf(dump, " name=\"VOP\" RAP=\"%d\" frameType=\"%d\" timeInc=\"%d\" isCoded=\"%d\"", (ftype==0) ? 1 : 0, ftype, tinc, is_coded);
 				break;
 			case M4V_GOV_START_CODE:
 				gf_fprintf(dump, " name=\"GOV\"");
@@ -1635,55 +2398,89 @@
 }
 #endif
 
-static void inspect_dump_tmcd(GF_InspectCtx *ctx, PidCtx *pctx, char *data, u32 size, FILE *dump)
+static void inspect_format_tmcd_internal(const u8 *data, u32 size, u32 tmcd_flags, u32 tc_num, u32 tc_den, u32 tmcd_fpt, char szFmt[100], GF_BitStream *bs, Bool force_ff, FILE *dump)
 {
-	u32 h, m, s, f;
+	u32 h, m, s, f, value;
 	Bool neg=GF_FALSE;
+	u32 parse_fmt = 1;
+	Bool is_drop = GF_FALSE;
+	GF_BitStream *loc_bs = NULL;
+
+	if (szFmt)
+		szFmt[0] = 0;
 
-	if (!pctx->tmcd_rate.den || !pctx->tmcd_rate.num)
+	if (!tc_num || !tc_den)
 		return;
-	gf_bs_reassign_buffer(pctx->bs, data, size);
 
-	u32 value = gf_bs_read_u32(pctx->bs);
-	gf_bs_seek(pctx->bs, 0);
-	gf_fprintf(dump, "<TimeCode");
+	if (!bs) {
+		loc_bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+		bs = loc_bs;
+	} else {
+		gf_bs_reassign_buffer(bs, data, size);
+	}
+
+	value = gf_bs_read_u32(bs);
+	gf_bs_seek(bs, 0);
+
+	if (tmcd_flags & 0x00000001)
+		is_drop = GF_TRUE;
+
+	if (tmcd_flags & 0x00000004)
+		neg = GF_TRUE;
+
+	if (dump)
+		gf_fprintf(dump, "<TimeCode");
+
+	if (!force_ff && !(tmcd_flags & 0x00000008)) {
+		h = gf_bs_read_u8(bs);
+		neg = gf_bs_read_int(bs, 1);
+		m = gf_bs_read_int(bs, 7);
+		s = gf_bs_read_u8(bs);
+		f = gf_bs_read_u8(bs);
+
+		if (tmcd_fpt && (f > tmcd_fpt))
+			parse_fmt = 2;
+		else if ((m>=60) || (s>=60))
+			parse_fmt = 2;
+		else
+			parse_fmt = 0;
+	}
 
-	if (ctx->fftmcd || (pctx->tmcd_flags & 0x00000008)) {
+	if (parse_fmt) {
 		u64 nb_secs, nb_frames = value;
-		Bool is_drop = GF_FALSE;
-		if (!ctx->fftmcd && pctx->tmcd_fpt)
-			nb_frames *= pctx->tmcd_fpt;
+		neg = GF_FALSE;
+		if (parse_fmt==2) force_ff = GF_TRUE;
 
-		if (ctx->fftmcd) {
-			u32 fps = pctx->tmcd_rate.num / pctx->tmcd_rate.den;
-			if (fps * pctx->tmcd_rate.den != pctx->tmcd_rate.num)
-				is_drop = GF_TRUE;
-		}
-		else if (pctx->tmcd_flags & 0x00000001) {
-			is_drop = GF_TRUE;
-		}
+		if (!force_ff && tmcd_fpt)
+			nb_frames *= tmcd_fpt;
+
+		if (is_drop && tc_num) {
+			u32 tc_drop_frames, min_10;
 
-		if (is_drop) {
-			u32 drop_frames, frame_base;
+			nb_secs = nb_frames;
+			nb_secs *= tc_den;
+			nb_secs /= tc_num;
 
-			frame_base = 100 * pctx->tmcd_rate.num;
-			frame_base /= pctx->tmcd_rate.den;
+			m = (u32) (nb_secs/60);
 
-			drop_frames = (u32) (nb_frames / frame_base);
-			nb_frames -= 3*drop_frames;
+			min_10 = m / 10;
+			m-= min_10;
+
+			tc_drop_frames = m*2;
+			nb_frames += tc_drop_frames;
 		}
 
-		nb_secs = nb_frames * pctx->tmcd_rate.den / pctx->tmcd_rate.num;
+		if (!tmcd_fpt) tmcd_fpt = 30;
 
-		gf_fprintf(dump, " counter=\"%d\"", value);
+		nb_secs = nb_frames / tmcd_fpt;
 		h = (u32) nb_secs/3600;
 		m = (u32) (nb_secs/60 - h*60);
 		s = (u32) (nb_secs - m*60 - h*3600);
 
-		nb_secs *= pctx->tmcd_rate.num;
-		nb_secs /= pctx->tmcd_rate.den;
+		nb_secs *= tmcd_fpt;
+
 		f = (u32) (nb_frames - nb_secs);
-		if (pctx->tmcd_fpt && (f==pctx->tmcd_fpt)) {
+		if (tmcd_fpt && (f==tmcd_fpt)) {
 			f = 0;
 			s++;
 			if (s==60) {
@@ -1695,16 +2492,167 @@
 				}
 			}
 		}
-	} else {
-		h = gf_bs_read_u8(pctx->bs);
-		neg = gf_bs_read_int(pctx->bs, 1);
-		m = gf_bs_read_int(pctx->bs, 7);
-		s = gf_bs_read_u8(pctx->bs);
-		f = gf_bs_read_u8(pctx->bs);
 	}
-	gf_fprintf(dump, " time=\"%s%02d:%02d:%02d:%02d\"/>\n", neg ? "-" : "", h, m, s, f);
+	if (dump)
+		gf_fprintf(dump, " time=\"%s%02d:%02d:%02d%c%02d\"/>\n", neg ? "-" : "", h, m, s, is_drop ? ';' : ':', f);
+	else if (szFmt)
+		sprintf(szFmt, "%s%02d:%02d:%02d%c%02d", neg ? "-" : "", h, m, s, is_drop ? ';' : ':', f);
+
+	if (loc_bs) gf_bs_del(loc_bs);
 }
 
+
+GF_EXPORT
+void gf_inspect_format_timecode(const u8 *data, u32 size, u32 tmcd_flags, u32 tc_num, u32 tc_den, u32 tmcd_fpt, char szFmt[100])
+{
+	inspect_format_tmcd_internal(data, size, tmcd_flags, tc_num, tc_den, tmcd_fpt, szFmt, NULL, GF_FALSE, NULL);
+}
+
+static void inspect_dump_tmcd(GF_InspectCtx *ctx, PidCtx *pctx, const u8 *data, u32 size, FILE *dump)
+{
+	inspect_format_tmcd_internal(data, size, pctx->tmcd_flags, pctx->tmcd_rate.num, pctx->tmcd_rate.den, pctx->tmcd_fpt, NULL, pctx->bs, ctx->fftmcd, dump);
+}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+static void inspect_dump_vpx(GF_InspectCtx *ctx, FILE *dump, u8 *ptr, u64 frame_size, Bool dump_crc, PidCtx *pctx, u32 vpversion)
+{
+	GF_Err e;
+	Bool key_frame = GF_FALSE;
+	u32 width = 0, height = 0, renderWidth, renderHeight;
+	u32 num_frames_in_superframe = 0, superframe_index_size = 0, i = 0;
+	u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME];
+	gf_bs_reassign_buffer(pctx->bs, ptr, frame_size);
+	InspectLogCbk lcbk;
+
+	if (ctx->analyze>=INSPECT_ANALYZE_BS) {
+		lcbk.dump = dump;
+		lcbk.dump_bits = ctx->analyze==INSPECT_ANALYZE_BS_BITS ? GF_TRUE : GF_FALSE;
+		gf_bs_set_logger(pctx->bs, regular_bs_log, &lcbk);
+	}
+
+	/*check if it is a superframe*/
+	e = gf_vp9_parse_superframe(pctx->bs, frame_size, &num_frames_in_superframe, frame_sizes, &superframe_index_size);
+
+	gf_fprintf(dump, "<VP%d%sFrame", vpversion, superframe_index_size ? "Super" : "");
+	if (e) {
+		gf_fprintf(dump, " status=\"error parsing superframe\"/>\n");
+		gf_bs_set_logger(pctx->bs, NULL, NULL);
+		return;
+	}
+	if (superframe_index_size)
+		gf_fprintf(dump, " nb_frames=\"%u\" index_size=\"%u\">\n", num_frames_in_superframe, superframe_index_size);
+	else {
+		assert(num_frames_in_superframe==1);
+	}
+	for (i = 0; i < num_frames_in_superframe; ++i) {
+		u64 pos2 = gf_bs_get_position(pctx->bs);
+
+		if (superframe_index_size)
+			gf_fprintf(dump, "<VP%dFrame", vpversion);
+
+		gf_fprintf(dump, " size=\"%u\"", frame_sizes[i]);
+		if (gf_vp9_parse_sample(pctx->bs, pctx->vpcc, &key_frame, &width, &height, &renderWidth, &renderHeight) != GF_OK) {
+			gf_fprintf(dump, " status=\"error parsing frame\"/>\n");
+			goto exit;
+		}
+		gf_fprintf(dump, " key_frame=\"%u\" width=\"%u\" height=\"%u\" renderWidth=\"%u\" renderHeight=\"%u\"", key_frame, width, height, renderWidth, renderHeight);
+		e = gf_bs_seek(pctx->bs, pos2 + frame_sizes[i]);
+		if (e) {
+			gf_fprintf(dump, " status=\"error seeking %s (offset "LLU")\"/>\n", gf_error_to_string(e), pos2 + frame_sizes[i]);
+			goto exit;
+		}
+
+		gf_fprintf(dump, "/>\n");
+	}
+
+exit:
+	if (superframe_index_size)
+		gf_fprintf(dump, "</VP%dSuperFrame>\n", vpversion);
+	gf_bs_set_logger(pctx->bs, NULL, NULL);
+}
+
+static void inspect_dump_ac3_eac3(GF_InspectCtx *ctx, FILE *dump, u8 *ptr, u64 frame_size, Bool dump_crc, PidCtx *pctx, Bool is_ec3)
+{
+	GF_AC3Header hdr;
+	InspectLogCbk lcbk;
+
+	if (!pctx->bs) pctx->bs = gf_bs_new(ptr, frame_size, GF_BITSTREAM_READ);
+	else gf_bs_reassign_buffer(pctx->bs, ptr, frame_size);
+
+	if (ctx->analyze>=INSPECT_ANALYZE_BS) {
+		lcbk.dump = dump;
+		lcbk.dump_bits = ctx->analyze==INSPECT_ANALYZE_BS_BITS ? GF_TRUE : GF_FALSE;
+		gf_bs_set_logger(pctx->bs, regular_bs_log, &lcbk);
+	}
+	gf_fprintf(dump, "<%sSample ", is_ec3 ? "EC3" : "AC3");
+	memset(&hdr, 0, sizeof(GF_AC3Header));
+	gf_ac3_parser_bs(pctx->bs, &hdr, GF_TRUE);
+	if (ctx->analyze<INSPECT_ANALYZE_BS) {
+		gf_fprintf(dump, "bitrate=\"%u\" channels=\"%u\" framesize=\"%u\"", hdr.bitrate, hdr.channels, hdr.framesize);
+		if (hdr.is_ec3) {
+			gf_fprintf(dump, " nb_streams=\"%u\" ", hdr.nb_streams);
+		}
+	}
+
+	gf_fprintf(dump, "/>\n");
+	gf_bs_set_logger(pctx->bs, NULL, NULL);
+}
+
+#endif /*GPAC_DISABLE_AV_PARSERS*/
+
+static void inspect_dump_packet_as_info(GF_InspectCtx *ctx, FILE *dump, GF_FilterPacket *pck, u32 pid_idx, u64 pck_num, PidCtx *pctx)
+{
+	u32 size, sap, flag;
+	u64 ts, dts;
+	GF_FilterClockType ck_type;
+	GF_FilterFrameInterface *fifce=NULL;
+
+	gf_filter_pck_get_data(pck, &size);
+	ck_type = ctx->pcr ? gf_filter_pck_get_clock_type(pck) : 0;
+	if (!size && !ck_type) {
+		fifce = gf_filter_pck_get_frame_interface(pck);
+	}
+
+	gf_fprintf(dump, "PID %d PCK "LLU, pid_idx, pck_num);
+
+	if (ck_type) {
+		ts = gf_filter_pck_get_cts(pck);
+		if (ts!=GF_FILTER_NO_TS)
+			gf_fprintf(dump, " PCR%s "LLU"\n", (ck_type==GF_FILTER_CLOCK_PCR) ? "" : " discontinuity", ts );
+		return;
+	}
+
+	ts = gf_filter_pck_get_cts(pck);
+	if (ts==GF_FILTER_NO_TS) gf_fprintf(dump, " cts N/A");
+	else gf_fprintf(dump, " cts "LLU, ts);
+
+	dts = gf_filter_pck_get_dts(pck);
+	if ((dts!=GF_FILTER_NO_TS) && (dts!= ts)) gf_fprintf(dump, " dts "LLU, dts);
+
+	flag = gf_filter_pck_get_duration(pck);
+	if (flag) gf_fprintf(dump, " dur %u", flag);
+
+	sap = gf_filter_pck_get_sap(pck);
+	if (sap==GF_FILTER_SAP_4_PROL) {
+		gf_fprintf(dump, " sap 4 (prol)");
+	} else if (sap) {
+		gf_fprintf(dump, " sap %u", sap);
+	}
+	flag = gf_filter_pck_get_interlaced(pck);
+	if (flag) gf_fprintf(dump, " ilace %u", flag);
+	flag = gf_filter_pck_get_corrupted(pck);
+	if (flag) gf_fprintf(dump, " corr %u", flag);
+	flag = gf_filter_pck_get_seek_flag(pck);
+	if (flag) gf_fprintf(dump, " seek %u", flag);
+	flag = gf_filter_pck_get_crypt_flags(pck);
+	if (flag) gf_fprintf(dump, " crypt %u", flag);
+	flag = gf_filter_pck_get_carousel_version(pck);
+	if (flag) gf_fprintf(dump, " vers %u", flag);
+
+	if (!fifce) gf_fprintf(dump, " size %u", size);
+
+	gf_fprintf(dump, "\n");
+}
 static void inspect_dump_packet(GF_InspectCtx *ctx, FILE *dump, GF_FilterPacket *pck, u32 pid_idx, u64 pck_num, PidCtx *pctx)
 {
 	u32 idx=0, size, sap;
@@ -1717,6 +2665,10 @@
 	if (!dump) return;
 
 	if (!ctx->deep && !ctx->fmt) return;
+	if (!ctx->full) {
+		inspect_dump_packet_as_info(ctx, dump, pck, pid_idx, pck_num, pctx);
+		return;
+	}
 
 	data = (u8 *) gf_filter_pck_get_data(pck, &size);
 	gf_filter_pck_get_framing(pck, &start, &end);
@@ -1724,7 +2676,6 @@
 	ck_type = ctx->pcr ? gf_filter_pck_get_clock_type(pck) : 0;
 	if (!size && !ck_type) {
 		fifce = gf_filter_pck_get_frame_interface(pck);
-		if (!fifce) return;
 	}
 
 	if (ctx->xml) {
@@ -1835,7 +2786,7 @@
 		if (ctx->xml) {
 			gf_fprintf(dump, "\"");
 		}
-	} else if (data) {
+	} else if (data && (ctx->test!=INSPECT_TEST_NOCRC) ) {
 		DUMP_ATT_X("CRC32", gf_crc_32(data, size) )
 	}
 	if (ctx->xml) {
@@ -1858,7 +2809,7 @@
 
 
 props_done:
-	if (!ctx->analyze) {
+	if (!ctx->analyze || !size) {
 		if (ctx->xml) {
 			gf_fprintf(dump, "/>\n");
 		}
@@ -1867,10 +2818,10 @@
 	gf_fprintf(dump, ">\n");
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-	if (pctx->hevc_state || pctx->avc_state) {
+	if (pctx->hevc_state || pctx->avc_state || pctx->vvc_state) {
 		idx=1;
 
-		if (pctx->is_adobe_protected && size) {
+		if (pctx->is_adobe_protected) {
 			u8 encrypted_au = data[0];
 			if (encrypted_au) {
 				gf_fprintf(dump, " \n");
@@ -1891,8 +2842,7 @@
 				break;
 			} else {
 				gf_fprintf(dump, " <NALU size=\"%d\" ", nal_size);
-				gf_inspect_dump_nalu_internal(dump, data, nal_size, pctx->has_svcc ? 1 : 0, pctx->hevc_state, pctx->avc_state, pctx->nalu_size_length, ctx->dump_crc, pctx->is_cenc_protected, pctx);
-				gf_fprintf(dump, "/>\n");
+				gf_inspect_dump_nalu_internal(dump, data, nal_size, pctx->has_svcc ? 1 : 0, pctx->hevc_state, pctx->avc_state, pctx->vvc_state, pctx->nalu_size_length, ctx->crc, pctx->is_cenc_protected, ctx->analyze, pctx);
 			}
 			idx++;
 			data += nal_size;
@@ -1901,23 +2851,23 @@
 	} else if (pctx->av1_state) {
 		gf_bs_reassign_buffer(pctx->bs, data, size);
 		while (size) {
-			ObuType obu_type;
-			u64 obu_size;
-			u32 hdr_size;
-			gf_media_aom_av1_parse_obu(pctx->bs, &obu_type, &obu_size, &hdr_size, pctx->av1_state);
+			ObuType obu_type = 0;
+			u64 obu_size = 0;
+			u32 hdr_size = 0;
+
+			obu_size = gf_inspect_dump_obu_internal(dump, pctx->av1_state, (char *) data, obu_size, obu_type, obu_size, hdr_size, ctx->crc, pctx, ctx->analyze);
 
 			if (obu_size > size) {
 				gf_fprintf(dump, " \n", (u32) obu_size, size);
 				break;
 			}
-
-			gf_inspect_dump_obu(dump, pctx->av1_state, (char *) data, obu_size, obu_type, obu_size, hdr_size, ctx->dump_crc);
 			data += obu_size;
 			size -= (u32)obu_size;
 			idx++;
 		}
 	} else {
 		u32 hdr, pos, fsize, i;
+		u32 dflag=0;
 		switch (pctx->codec_id) {
 		case GF_CODECID_MPEG1:
 		case GF_CODECID_MPEG2_422:
@@ -1929,6 +2879,7 @@
 			break;
 		case GF_CODECID_MPEG_AUDIO:
 		case GF_CODECID_MPEG2_PART3:
+		case GF_CODECID_MPEG_AUDIO_L1:
 			pos = 0;
 			while (size) {
 				hdr = gf_mp3_get_next_header_mem(data, size, &pos);
@@ -1944,17 +2895,16 @@
 			break;
 		case GF_CODECID_SUBS_TEXT:
 		case GF_CODECID_META_TEXT:
-			gf_fprintf(dump, "<![CDATA[");
-			for (i=0; i<size; i++) {
-				gf_fputc(data[i], dump);
-			}
-			gf_fprintf(dump, "]]>\n");
-			break;
+			dflag=1;
 		case GF_CODECID_SUBS_XML:
 		case GF_CODECID_META_XML:
+			if (dflag)
+				gf_fprintf(dump, "<![CDATA[");
 			for (i=0; i<size; i++) {
 				gf_fputc(data[i], dump);
 			}
+			if (dflag)
+				gf_fprintf(dump, "]]>\n");
 			break;
 		case GF_CODECID_APCH:
 		case GF_CODECID_APCO:
@@ -1962,7 +2912,7 @@
 		case GF_CODECID_APCS:
 		case GF_CODECID_AP4X:
 		case GF_CODECID_AP4H:
-			gf_inspect_dump_prores_internal(dump, (char *) data, size, ctx->dump_crc, pctx);
+			gf_inspect_dump_prores_internal(dump, (char *) data, size, ctx->crc, pctx);
 			break;
 
 		case GF_CODECID_MPHA:
@@ -1971,9 +2921,22 @@
 			break;
 
 		case GF_CODECID_MHAS:
-			gf_inspect_dump_mhas(dump, (char *) data, size, ctx->dump_crc, pctx);
+			gf_inspect_dump_mhas(dump, (char *) data, size, ctx->crc, pctx);
+			break;
+		case GF_CODECID_VP8:
+			dflag=1;
+		case GF_CODECID_VP9:
+			inspect_dump_vpx(ctx, dump, (char *) data, size, ctx->crc, pctx, dflag ? 8 : 9);
+			break;
+		case GF_CODECID_AC3:
+			dflag=1;
+		case GF_CODECID_EAC3:
+			inspect_dump_ac3_eac3(ctx, dump, (char *) data, size, ctx->crc, pctx, dflag ? 0 : 1);
+			break;
+		case GF_CODECID_TRUEHD:
+			gf_bs_reassign_buffer(pctx->bs, data, size);
+			gf_inspect_dump_truehd_frame(dump, pctx->bs);
 			break;
-
 		}
 	}
 #endif
@@ -1986,8 +2949,7 @@
 		for (i=0; i<gf_list_count(arr); i++) {\
 			slc = gf_list_get(arr, i);\
 			gf_fprintf(dump, " <NALU size=\"%d\" ", slc->size);\
-			gf_inspect_dump_nalu_internal(dump, slc->data, slc->size, _is_svc, pctx->hevc_state, pctx->avc_state, nalh_size, ctx->dump_crc, GF_FALSE, pctx);\
-			gf_fprintf(dump, "/>\n");\
+			gf_inspect_dump_nalu_internal(dump, slc->data, slc->size, _is_svc, pctx->hevc_state, pctx->avc_state, pctx->vvc_state, nalh_size, ctx->crc, GF_FALSE, ctx->analyze, pctx);\
 		}\
 		gf_fprintf(dump, " </%sArray>\n", name);\
 	}\
@@ -2004,6 +2966,10 @@
 		gf_free(pctx->avc_state);
 		pctx->avc_state = NULL;
 	}
+	if ((&pctx->vvc_state != keep_parser_address) && pctx->vvc_state) {
+		gf_free(pctx->vvc_state);
+		pctx->vvc_state = NULL;
+	}
 	if ((&pctx->av1_state != keep_parser_address) && pctx->av1_state) {
 		if (pctx->av1_state->config) gf_odf_av1_cfg_del(pctx->av1_state->config);
 		gf_free(pctx->av1_state);
@@ -2013,18 +2979,396 @@
 		gf_m4v_parser_del(pctx->mv124_state);
 		pctx->mv124_state = NULL;
 	}
+	if (pctx->vpcc) gf_odf_vp_cfg_del(pctx->vpcc);
 }
 #endif
 
+static void format_duration(u64 dur, u64 timescale, FILE *dump)
+{
+	u32 h, m, s, ms;
+	if ((dur==(u64) -1) || (dur==(u32) -1)) {
+		gf_fprintf(dump, " duration unknown");
+		return;
+	}
+	dur = (u64) (( ((Double) (s64) dur)/timescale)*1000);
+	h = (u32) (dur / 3600000);
+	m = (u32) (dur/ 60000) - h*60;
+	s = (u32) (dur/1000) - h*3600 - m*60;
+	ms = (u32) (dur) - h*3600000 - m*60000 - s*1000;
+	if (h<=24) {
+		if (h)
+			gf_fprintf(dump, " duration %02d:%02d:%02d.%03d", h, m, s, ms);
+		else
+			gf_fprintf(dump, " duration %02d:%02d.%03d", m, s, ms);
+	} else {
+		u32 d = (u32) (dur / 3600000 / 24);
+		h = (u32) (dur/3600000)-24*d;
+		if (d<=365) {
+			gf_fprintf(dump, " duration %d Days, %02d:%02d:%02d.%03d", d, h, m, s, ms);
+		} else {
+			u32 y=0;
+			while (d>365) {
+				y++;
+				d-=365;
+				if (y%4) d--;
+			}
+			gf_fprintf(dump, " duration %d Years %d Days, %02d:%02d:%02d.%03d", y, d, h, m, s, ms);
+		}
+	}
+}
+
+
+static void inspect_dump_pid_as_info(GF_InspectCtx *ctx, FILE *dump, GF_FilterPid *pid, u32 pid_idx, Bool is_connect, Bool is_remove, u64 pck_for_config, Bool is_info, PidCtx *pctx)
+{
+	const GF_PropertyValue *p, *dsi, *dsi_enh;
+	Bool is_raw=GF_FALSE;
+	Bool is_protected=GF_FALSE;
+	u32 codec_id=0;
+	gf_fprintf(dump, "PID");
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+	if (!p) p = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
+	if (p) gf_fprintf(dump, " %d", p->value.uint);
+
+	if (is_remove) {
+		gf_fprintf(dump, " removed\n");
+		return;
+	}
+	if (!is_connect) {
+		gf_fprintf(dump, " reconfigure");
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (p) {
+		if (p->value.uint==GF_STREAM_ENCRYPTED) {
+			is_protected = GF_TRUE;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+		}
+		if (p)
+			gf_fprintf(dump, " %s", gf_stream_type_short_name(p->value.uint));
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SERVICE_ID);
+	if (p) {
+		gf_fprintf(dump, " service %d", p->value.uint);
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SERVICE_NAME);
+		if (p) gf_fprintf(dump, " \"%s\"", p->value.string);
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SERVICE_PROVIDER);
+		if (p) gf_fprintf(dump, " (%s)", p->value.string);
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DISABLED);
+	if (p && p->value.boolean) gf_fprintf(dump, " disabled");
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_TRACK_FLAGS);
+	if (p && p->value.uint) {
+		if (p->value.uint & (1<<1)) gf_fprintf(dump, " inMovie");
+		if (p->value.uint & (1<<2)) gf_fprintf(dump, " inPreview");
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_LANGUAGE);
+	if (p) gf_fprintf(dump, " language \"%s\"", p->value.string);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
+	if (p && (p->value.lfrac.num>0)) format_duration((u64) p->value.lfrac.num, (u32) p->value.lfrac.den, dump);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) gf_fprintf(dump, " timescale %d", p->value.uint);
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+	if (p) gf_fprintf(dump, " delay "LLD, p->value.longsint);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (p) {
+		if (p->value.uint==GF_CODECID_RAW) {
+			is_raw = GF_TRUE;
+			gf_fprintf(dump, " raw");
+		} else {
+			codec_id = p->value.uint;
+			//fprintf(dump, " codec \"%s\"", gf_codecid_name(codec_id));
+		}
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (p) {
+		gf_fprintf(dump, " %dx", p->value.uint);
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+		gf_fprintf(dump, "%d", p ? p->value.uint : 0);
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+		if (p) {
+			u32 tscale = p->value.frac.num;
+			u32 sdur = p->value.frac.den;
+			gf_media_get_reduced_frame_rate(&tscale, &sdur);
+			gf_fprintf(dump, " fps %d", tscale);
+			if (sdur!=1) gf_fprintf(dump, "/%u", sdur);
+		}
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
+		if (p && p->value.frac.num!=p->value.frac.den)
+			gf_fprintf(dump, " SAR %d/%u", p->value.frac.num, p->value.frac.den);
+		else
+			gf_fprintf(dump, " SAR 1/1");
+		if (is_raw) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+			if (p) gf_fprintf(dump, " raw format %s", gf_pixel_fmt_name(p->value.uint) );
+		}
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+	if (p) {
+		gf_fprintf(dump, " %d Hz", p->value.uint);
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+		if (p) {
+			gf_fprintf(dump, " %s", gf_audio_fmt_get_layout_name(p->value.longuint));
+		} else {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+			if (p) gf_fprintf(dump, " %d channels", p->value.uint);
+		}
+		if (is_raw) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+			if (p) gf_fprintf(dump, " raw format %s", gf_audio_fmt_name(p->value.uint) );
+		}
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_BITRATE);
+	if (p) {
+		if (p->value.uint<5000) gf_fprintf(dump, " %d bps", p->value.uint );
+		else gf_fprintf(dump, " %d kbps", p->value.uint/1000 );
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NB_FRAMES);
+	if (p && (p->value.uint>1)) gf_fprintf(dump, " %d frames", p->value.uint);
+
+
+	if (is_protected) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
+		gf_fprintf(dump, " encryption %s", p ? gf_4cc_to_str(p->value.uint) : "unknown");
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CENC_PATTERN);
+		if (p)
+			gf_fprintf(dump, " %d/%d pattern", p->value.frac.num, p->value.frac.den);
+	}
+
+	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	dsi_enh = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+	if (is_raw) {
+		gf_fprintf(dump, "\n");
+		return;
+	}
+
+	gf_fprintf(dump, " codec");
+
+	if ((codec_id==GF_CODECID_HEVC) || (codec_id==GF_CODECID_LHVC) || (codec_id==GF_CODECID_HEVC_TILES)) {
+		u32 i, j, k;
+		HEVCState *hvcs = NULL;
+		GF_HEVCConfig *hvcc=NULL;
+		if (dsi) {
+			hvcc = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, (codec_id==GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE);
+			if (dsi_enh) {
+				GF_SAFEALLOC(hvcs, HEVCState);
+				for (i=0; i<gf_list_count(hvcc->param_array); i++) {
+					GF_NALUFFParamArray *pa = gf_list_get(hvcc->param_array, i);
+					for (j=0; j<gf_list_count(pa->nalus); j++) {
+						GF_NALUFFParam *sl = gf_list_get(pa->nalus, j);
+						u8 nut, lid, tid;
+						gf_hevc_parse_nalu(sl->data, sl->size, hvcs, &nut, &tid, &lid);
+					}
+				}
+			}
+		} else if (dsi_enh) {
+			hvcc = gf_odf_hevc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size, GF_TRUE);
+		}
+		gf_fprintf(dump, " %s", (codec_id==GF_CODECID_LHVC) ? "L-HEVC" : "HEVC");
+		if (codec_id==GF_CODECID_HEVC_TILES) gf_fprintf(dump, " tile");
+
+		if (hvcc) {
+			if (hvcc->interlaced_source_flag)
+				gf_fprintf(dump, " interlaced");
+			if (!hvcc->is_lhvc) {
+				gf_fprintf(dump, " PL %s@%g %s %d bpp compatibility 0x%08X", gf_hevc_get_profile_name(hvcc->profile_idc), ((Double)hvcc->level_idc) / 30.0, gf_avc_hevc_get_chroma_format_name(hvcc->chromaFormat), hvcc->luma_bit_depth, hvcc->general_profile_compatibility_flags);
+			}
+			gf_odf_hevc_cfg_del(hvcc);
+		}
+		if (dsi && dsi_enh) {
+			hvcc = gf_odf_hevc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size, GF_TRUE);
+			if (hvcc) {
+				gf_fprintf(dump, " scalable");
+				for (k=0; k<2; k++) {
+				u32 ntype = k ? GF_HEVC_NALU_SEQ_PARAM : GF_HEVC_NALU_VID_PARAM;
+				for (i=0; i<gf_list_count(hvcc->param_array); i++) {
+					GF_NALUFFParamArray *pa = gf_list_get(hvcc->param_array, i);
+					if (pa->type!=ntype) continue;
+					for (j=0; j<gf_list_count(pa->nalus); j++) {
+						GF_NALUFFParam *sl = gf_list_get(pa->nalus, j);
+						u8 nut, lid, tid;
+						s32 idx = gf_hevc_parse_nalu(sl->data, sl->size, hvcs, &nut, &tid, &lid);
+						if ((idx>=0) && (pa->type==GF_HEVC_NALU_SEQ_PARAM)) {
+							idx = hvcs->last_parsed_sps_id;
+							gf_fprintf(dump, " %dx%d", hvcs->sps[idx].width, hvcs->sps[idx].height);
+						}
+					}
+				}
+				}
+				gf_odf_hevc_cfg_del(hvcc);
+			}
+		}
+		if (hvcs) gf_free(hvcs);
+	}
+	else if ((codec_id==GF_CODECID_AVC) || (codec_id==GF_CODECID_SVC) || (codec_id==GF_CODECID_MVC)) {
+		GF_AVCConfig *avcc=NULL;
+		if (dsi) {
+			avcc = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		} else if (dsi_enh) {
+			avcc = gf_odf_avc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size);
+		}
+		if (codec_id==GF_CODECID_AVC) gf_fprintf(dump, " %s", "AVC|H264");
+		else if (codec_id==GF_CODECID_SVC) gf_fprintf(dump, " %s", "SVC");
+		else if (codec_id==GF_CODECID_MVC) gf_fprintf(dump, " %s", "MVC");
+
+		if (avcc) {
+			gf_fprintf(dump, " PL %s@%g %s %d bpp", gf_avc_get_profile_name(avcc->AVCProfileIndication), ((Double)avcc->AVCLevelIndication)/10.0, gf_avc_hevc_get_chroma_format_name(avcc->chroma_format), avcc->luma_bit_depth );
+			gf_odf_avc_cfg_del(avcc);
+		}
+		if (dsi && dsi_enh) {
+			gf_fprintf(dump, " scalable");
+			avcc = gf_odf_avc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size);
+			if (avcc) {
+				AVCState *avcs;
+				GF_SAFEALLOC(avcs, AVCState);
+				for (u32 i=0; i<gf_list_count(avcc->sequenceParameterSets); i++) {
+					GF_NALUFFParam *sl = gf_list_get(avcc->sequenceParameterSets, i);
+					s32 idx = gf_avc_read_sps(sl->data, sl->size, avcs, 0, NULL);
+					if (idx>=0) gf_fprintf(dump, " %dx%d", avcs->sps[idx].width, avcs->sps[idx].height);
+				}
+				gf_free(avcs);
+				gf_odf_avc_cfg_del(avcc);
+			}
+		}
+	}
+	else if ((codec_id==GF_CODECID_VVC) || (codec_id==GF_CODECID_VVC_SUBPIC)) {
+		GF_VVCConfig *vvcc=NULL;
+		if (dsi) {
+			vvcc = gf_odf_vvc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		} else if (dsi_enh) {
+			vvcc = gf_odf_vvc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size);
+		}
+		if (codec_id==GF_CODECID_VVC) gf_fprintf(dump, " VVC%s", (codec_id==GF_CODECID_VVC) ? "" : " subpictures");
+
+		if (vvcc) {
+			gf_fprintf(dump, " PL %s@%.1g %s %d bpp", gf_vvc_get_profile_name(vvcc->general_profile_idc), ((Double)vvcc->general_level_idc)/16.0, gf_avc_hevc_get_chroma_format_name(vvcc->chroma_format), vvcc->bit_depth );
+			if (vvcc->numTemporalLayers>1)
+			gf_fprintf(dump, " %d sublayers", vvcc->numTemporalLayers);
+
+			gf_odf_vvc_cfg_del(vvcc);
+		}
+	}
+	else if (codec_id==GF_CODECID_AV1) {
+		GF_AV1Config *av1c = NULL;
+		if (dsi)
+			av1c = gf_odf_av1_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		gf_fprintf(dump, " AV1");
+		if (av1c) {
+			gf_fprintf(dump, " PL %d@%d", av1c->seq_profile, av1c->seq_level_idx_0);
+			if (av1c->chroma_subsampling_x) {
+				if (av1c->chroma_subsampling_y) gf_fprintf(dump, " YUV 4:2:0");
+				else gf_fprintf(dump, " YUV 4:2:2");
+			} else gf_fprintf(dump, " YUV 4:4:4");
+			if (av1c->monochrome) gf_fprintf(dump, " monochrome");
+			if (av1c->twelve_bit) gf_fprintf(dump, " 12 bpp");
+
+			gf_odf_av1_cfg_del(av1c);
+		}
+	}
+	else if ((codec_id==GF_CODECID_AAC_MPEG4) || (codec_id==GF_CODECID_AAC_MPEG2_MP) || (codec_id==GF_CODECID_AAC_MPEG2_LCP) || (codec_id==GF_CODECID_AAC_MPEG2_SSRP)) {
+		if (dsi) {
+			const char *name, *sep;
+			GF_M4ADecSpecInfo a_cfg;
+			gf_m4a_get_config(dsi->value.data.ptr, dsi->value.data.size, &a_cfg);
+			char *signaling = "implicit";
+			char *heaac = "";
+			if ((codec_id==GF_CODECID_AAC_MPEG4) && a_cfg.has_sbr) {
+				if (a_cfg.has_ps) heaac = " HEAACv2";
+				else heaac = " HEAACv1";
+			}
+			if (a_cfg.base_object_type==2) {
+				if (a_cfg.has_ps || a_cfg.has_sbr)
+					signaling = "backward compatible";
+			} else {
+				signaling = "hierarchical";
+			}
+			name = gf_m4a_object_type_name(a_cfg.base_object_type);
+			sep = strstr(name, "Audio");
+			if (sep) name = sep+6;
+
+			gf_fprintf(dump, " %s (aot=%d %s)%s", name, a_cfg.base_object_type, signaling, heaac);
+			if (a_cfg.has_sbr) gf_fprintf(dump, " SBR %d Hz aot %s", a_cfg.sbr_sr, gf_m4a_object_type_name(a_cfg.sbr_object_type));
+			if (a_cfg.has_ps) gf_fprintf(dump, " PS");
+		} else {
+			gf_fprintf(dump, " AAC");
+		}
+	} else if (codec_id==GF_CODECID_MPEG4_PART2) {
+		gf_fprintf(dump, " MPEG-4 Visual");
+		if (dsi) {
+			GF_M4VDecSpecInfo vcfg;
+			gf_m4v_get_config(dsi->value.data.ptr, dsi->value.data.size, &vcfg);
+			gf_fprintf(dump, " PL %s", gf_m4v_get_profile_name(vcfg.VideoPL));
+			if (vcfg.chroma_fmt) gf_fprintf(dump, " %s", gf_avc_hevc_get_chroma_format_name(vcfg.chroma_fmt) );
+			if (!vcfg.progresive) gf_fprintf(dump, " interlaced");
+		}
+	} else {
+		if (codec_id==GF_CODECID_FFMPEG) {
+			p = gf_filter_pid_get_property_str(pid, "ffmpeg:codec");
+			if (p) {
+				gf_fprintf(dump, " %s", p->value.string);
+			} else {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_FFMPEG_CODEC_ID);
+				if (p && (p->type==GF_PROP_UINT)) codec_id = p->value.uint;
+				gf_fprintf(dump, " FFMPEG %d", codec_id);
+			}
+		} else {
+			gf_fprintf(dump, " %s", gf_codecid_name(codec_id));
+		}
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PROFILE_LEVEL);
+		if (p) gf_fprintf(dump, " PL %d", p->value.uint);
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_CHROMAFMT);
+		if (p) gf_fprintf(dump, " %s", gf_avc_hevc_get_chroma_format_name(p->value.uint) );
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_INTERLACED);
+		if (p && p->value.boolean) gf_fprintf(dump, " interlaced");
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAP_W);
+	u32 clap_w = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAP_H);
+	u32 clap_h = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAP_X);
+	s32 clap_x = p ? p->value.sint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAP_Y);
+	s32 clap_y = p ? p->value.sint : 0;
+	if (clap_w && clap_h) {
+		gf_fprintf(dump, " clap %dx%d@%ux%u", clap_x, clap_y, clap_w, clap_h);
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DOLBY_VISION);
+	if (p) {
+		GF_BitStream *bs = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
+		GF_DOVIDecoderConfigurationRecord *dovi = gf_odf_dovi_cfg_read_bs(bs);
+		gf_bs_del(bs);
+		if (dovi) {
+			gf_fprintf(dump, " DolbyVision %d.%d PL %d@%d",
+				dovi->dv_version_major, dovi->dv_version_minor, dovi->dv_profile, dovi->dv_level);
+			if (dovi->rpu_present_flag) gf_fprintf(dump, " rpu");
+			if (dovi->bl_present_flag) gf_fprintf(dump, " base");
+			if (dovi->el_present_flag) gf_fprintf(dump, " el");
+			if (dovi->dv_bl_signal_compatibility_id) gf_fprintf(dump, " compat %d", dovi->dv_bl_signal_compatibility_id);
+			gf_odf_dovi_cfg_del(dovi);
+		}
+	}
+	gf_fprintf(dump, "\n");
+}
+
 static void inspect_dump_pid(GF_InspectCtx *ctx, FILE *dump, GF_FilterPid *pid, u32 pid_idx, Bool is_connect, Bool is_remove, u64 pck_for_config, Bool is_info, PidCtx *pctx)
 {
-	u32 idx=0, nalh_size;
+	u32 idx=0, nalh_size, i;
 #ifndef GPAC_DISABLE_AV_PARSERS
-	u32 i;
-	GF_AVCConfigSlot *slc;
+	GF_NALUFFParam *slc;
 #endif
 	GF_AVCConfig *avcc, *svcc;
 	GF_HEVCConfig *hvcc, *lhcc;
+	GF_VVCConfig *vvcC;
 	Bool is_enh = GF_FALSE;
 	Bool is_svc=GF_FALSE;
 	char *elt_name = NULL;
@@ -2033,6 +3377,11 @@
 	if (!ctx->dump) return;
 	if (ctx->test==INSPECT_TEST_NOPROP) return;
 
+	if (!ctx->full) {
+		inspect_dump_pid_as_info(ctx, dump, pid, pid_idx, is_connect, is_remove, pck_for_config, is_info, pctx);
+		return;
+	}
+
 	//disconnect of src pid (not yet supported)
 	if (ctx->xml) {
 		if (is_info) {
@@ -2108,6 +3457,7 @@
 	svcc = NULL;
 	hvcc = NULL;
 	lhcc = NULL;
+	vvcC = NULL;
 	pctx->has_svcc = 0;
 
 	switch (pctx->codec_id) {
@@ -2203,7 +3553,7 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 		if (hvcc) {
 			for (idx=0; idx<gf_list_count(hvcc->param_array); idx++) {
-				GF_HEVCParamArray *ar = gf_list_get(hvcc->param_array, idx);
+				GF_NALUFFParamArray *ar = gf_list_get(hvcc->param_array, idx);
 				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
 					DUMP_ARRAY(ar->nalus, "HEVCSPS", "hvcC", 0)
 				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
@@ -2217,7 +3567,7 @@
 		}
 		if (lhcc) {
 			for (idx=0; idx<gf_list_count(lhcc->param_array); idx++) {
-				GF_HEVCParamArray *ar = gf_list_get(lhcc->param_array, idx);
+				GF_NALUFFParamArray *ar = gf_list_get(lhcc->param_array, idx);
 				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
 					DUMP_ARRAY(ar->nalus, "HEVCSPS", "lhcC", 0)
 				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
@@ -2233,6 +3583,55 @@
 		gf_fprintf(dump, "</HEVCParameterSets>\n");
 		break;
 
+	case GF_CODECID_VVC:
+	case GF_CODECID_VVC_SUBPIC:
+		if (!dsi) {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+		inspect_reset_parsers(pctx, &pctx->vvc_state);
+
+		if (!pctx->vvc_state) {
+			GF_SAFEALLOC(pctx->vvc_state, VVCState);
+			if (!pctx->vvc_state) return;
+		}
+#endif
+
+		vvcC = gf_odf_vvc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		if (vvcC)
+			pctx->nalu_size_length = vvcC->nal_unit_size;
+
+		nalh_size = pctx->nalu_size_length;
+
+		gf_fprintf(dump, ">\n");
+		gf_fprintf(dump, "<VVCParameterSets>\n");
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (vvcC) {
+			for (idx=0; idx<gf_list_count(vvcC->param_array); idx++) {
+				GF_NALUFFParamArray *ar = gf_list_get(vvcC->param_array, idx);
+				if (ar->type==GF_VVC_NALU_SEQ_PARAM) {
+					DUMP_ARRAY(ar->nalus, "VVCSPS", "vvcC", 0)
+				} else if (ar->type==GF_VVC_NALU_PIC_PARAM) {
+					DUMP_ARRAY(ar->nalus, "VVCPPS", "vvcC", 0)
+				} else if (ar->type==GF_VVC_NALU_VID_PARAM) {
+					DUMP_ARRAY(ar->nalus, "VVCVPS", "vvcC", 0)
+				} else if (ar->type==GF_VVC_NALU_APS_PREFIX) {
+					DUMP_ARRAY(ar->nalus, "VVCAPS", "vvcC", 0)
+				} else if (ar->type==GF_VVC_NALU_SEI_PREFIX) {
+					DUMP_ARRAY(ar->nalus, "VVCSEI", "vvcC", 0)
+				} else if (ar->type==GF_VVC_NALU_DEC_PARAM) {
+					DUMP_ARRAY(ar->nalus, "VVCDCI", "vvcC", 0)
+				} else {
+					DUMP_ARRAY(ar->nalus, "VVCUnknownPS", "vvcC", 0)
+				}
+			}
+		}
+#endif
+		gf_fprintf(dump, "</VVCParameterSets>\n");
+		break;
+
 	case GF_CODECID_AV1:
 #ifndef GPAC_DISABLE_AV_PARSERS
 		inspect_reset_parsers(pctx, &pctx->av1_state);
@@ -2254,18 +3653,17 @@
 
 		idx = 1;
 		for (i=0; i<gf_list_count(pctx->av1_state->config->obu_array); i++) {
-			ObuType obu_type;
-			u64 obu_size;
-			u32 hdr_size;
+			ObuType obu_type=0;
+			u64 obu_size = 0;
+			u32 hdr_size = 0;
 			GF_AV1_OBUArrayEntry *obu = gf_list_get(pctx->av1_state->config->obu_array, i);
 
 			if (!pctx->bs)
-				pctx->bs = gf_bs_new((const u8 *)obu->obu, (u32) obu->obu_length, GF_BITSTREAM_READ);
+				pctx->bs = gf_bs_new((const u8 *) obu->obu, (u32) obu->obu_length, GF_BITSTREAM_READ);
 			else
 				gf_bs_reassign_buffer(pctx->bs, (const u8 *)obu->obu, (u32) obu->obu_length);
 
-			gf_media_aom_av1_parse_obu(pctx->bs, &obu_type, &obu_size, &hdr_size, pctx->av1_state);
-			gf_inspect_dump_obu(dump, pctx->av1_state, (char*)obu->obu, obu->obu_length, obu_type, obu_size, hdr_size, ctx->dump_crc);
+			gf_inspect_dump_obu_internal(dump, pctx->av1_state, (char*)obu->obu, obu->obu_length, obu_type, obu_size, hdr_size, ctx->crc, pctx, ctx->analyze);
 			idx++;
 		}
 #endif
@@ -2298,6 +3696,7 @@
 		break;
 	case GF_CODECID_MPEG_AUDIO:
 	case GF_CODECID_MPEG2_PART3:
+	case GF_CODECID_MPEG_AUDIO_L1:
 	case GF_CODECID_TMCD:
 		gf_fprintf(dump, "/>\n");
 		return;
@@ -2312,8 +3711,7 @@
 			gf_fputc(dsi->value.data.ptr[i], dump);
 		}
 		gf_fprintf(dump, "\n </XMLTextConfig>\n");
-		gf_fprintf(dump, "/>\n");
-		return;
+		break;
 	case GF_CODECID_SUBS_TEXT:
 	case GF_CODECID_META_TEXT:
 		if (!dsi) {
@@ -2327,8 +3725,7 @@
 		}
 		gf_fprintf(dump, "]]>\n");
 		gf_fprintf(dump, " </TextConfig>\n");
-		gf_fprintf(dump, "/>\n");
-		return;
+		break;
 	case GF_CODECID_APCH:
 	case GF_CODECID_APCN:
 	case GF_CODECID_APCS:
@@ -2339,31 +3736,138 @@
 		return;
 	case GF_CODECID_MPHA:
 	case GF_CODECID_MHAS:
+		if (!dsi) {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+		{
+		u16 size;
+		if (!pctx->bs)
+			pctx->bs = gf_bs_new(dsi->value.data.ptr, dsi->value.data.size, GF_BITSTREAM_READ);
+		else
+			gf_bs_reassign_buffer(pctx->bs, dsi->value.data.ptr, dsi->value.data.size);
+
+		gf_fprintf(dump, " <MPEGHAudioConfig");
+		gf_fprintf(dump, " version=\"%d\"", gf_bs_read_u8(pctx->bs) );
+		gf_fprintf(dump, " ProfileLevelIndication=\"%d\"", gf_bs_read_u8(pctx->bs) );
+		gf_fprintf(dump, " ReferenceChannelLayout=\"%d\"", gf_bs_read_u8(pctx->bs) );
+		size = gf_bs_read_u16(pctx->bs);
+		if (size) {
+			gf_fprintf(dump, ">\n");
+#ifndef GPAC_DISABLE_AV_PARSERS
+			dump_mha_config(dump, pctx->bs, " ");
+#endif
+			gf_fprintf(dump, " </MPEGHAudioConfig>\n");
+		} else {
+			gf_fprintf(dump, "/>\n");
+		}
+		gf_fprintf(dump, "/>\n");
+		}
+		break;
+	case GF_CODECID_VP8:
+	case GF_CODECID_VP9:
+		if (!dsi) {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+		inspect_reset_parsers(pctx, NULL);
+#endif
+
+		pctx->vpcc = gf_odf_vp_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		gf_fprintf(dump, ">\n");
+		if (pctx->vpcc) {
+			u32 v = (pctx->codec_id==GF_CODECID_VP9) ? 9 : 8;
+			gf_fprintf(dump, "<VP%dConfiguration profile=\"%d\" level=\"%d\" bit_depth=\"%u\" chroma_subsampling=\"%u\" colour_primaries=\"%u\" transfer_characteristics=\"%u\" matrix_coefficients=\"%u\" video_full_range=\"%u\"", v,
+				pctx->vpcc->profile, pctx->vpcc->level, pctx->vpcc->bit_depth, pctx->vpcc->chroma_subsampling, pctx->vpcc->colour_primaries, pctx->vpcc->transfer_characteristics, pctx->vpcc->matrix_coefficients, pctx->vpcc->video_fullRange_flag
+			);
+			if (pctx->vpcc->codec_initdata && pctx->vpcc->codec_initdata_size) {
+				gf_fprintf(dump, " init_data=\"");
+				for (idx=0; idx<pctx->vpcc->codec_initdata_size; idx++)
+					gf_fprintf(dump, "%02X", (unsigned char) pctx->vpcc->codec_initdata[idx]);
+				gf_fprintf(dump, "\"");
+			}
+			gf_fprintf(dump, "/>\n");
+		}
+		break;
+
+	case GF_CODECID_AAC_MPEG4:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	case GF_CODECID_AAC_MPEG2_SSRP:
+	case GF_CODECID_USAC:
+		if (!pctx->no_analysis) {
+			pctx->no_analysis = GF_TRUE;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Inspect] bitstream analysis for codec %s not supported, only configuration is\n", gf_codecid_name(pctx->codec_id)));
+		}
 		if (dsi) {
-			u16 size;
+#ifndef GPAC_DISABLE_AV_PARSERS
+			GF_M4ADecSpecInfo acfg;
+			InspectLogCbk lcbk;
+
+			gf_fprintf(dump, ">\n");
+			gf_fprintf(dump, "<MPEG4AudioConfiguration ");
+
 			if (!pctx->bs)
 				pctx->bs = gf_bs_new(dsi->value.data.ptr, dsi->value.data.size, GF_BITSTREAM_READ);
 			else
 				gf_bs_reassign_buffer(pctx->bs, dsi->value.data.ptr, dsi->value.data.size);
 
-			gf_fprintf(dump, " <MPEGHAudioConfig");
-			gf_fprintf(dump, " version=\"%d\"", gf_bs_read_u8(pctx->bs) );
-			gf_fprintf(dump, " ProfileLevelIndication=\"%d\"", gf_bs_read_u8(pctx->bs) );
-			gf_fprintf(dump, " ReferenceChannelLayout=\"%d\"", gf_bs_read_u8(pctx->bs) );
-			size = gf_bs_read_u16(pctx->bs);
-			if (size) {
-				gf_fprintf(dump, ">\n");
-				dump_mha_config(dump, pctx->bs, " ");
-				gf_fprintf(dump, " </MPEGHAudioConfig>\n");
-			} else {
-				gf_fprintf(dump, "/>\n");
-			}
+			if (ctx->analyze>=INSPECT_ANALYZE_BS) {
+				lcbk.dump = dump;
+				lcbk.dump_bits = (ctx->analyze==INSPECT_ANALYZE_BS_BITS) ? GF_TRUE : GF_FALSE;
+				gf_bs_set_logger(pctx->bs, regular_bs_log, &lcbk);
+			}
+
+			gf_m4a_parse_config(pctx->bs, &acfg, GF_TRUE);
+			if (ctx->analyze<INSPECT_ANALYZE_BS) {
+				gf_fprintf(dump, "base_object_type=\"%u\" sample_rate=\"%u\" channels=\"%u\" ", acfg.base_object_type, acfg.base_sr, acfg.nb_chan);
+				if (acfg.has_sbr)
+					gf_fprintf(dump, "sbr_sample_rate=\"%u\" ", acfg.sbr_sr);
+				if (acfg.has_ps)
+					gf_fprintf(dump, "parametricStereo=\"yes\" ");
+			}
+			if (acfg.comments[0])
+				gf_fprintf(dump, "comments=\"%s\" ", acfg.comments);
+#endif /*GPAC_DISABLE_AV_PARSERS*/
+			gf_fprintf(dump, "/>\n");
+		} else {
 			gf_fprintf(dump, "/>\n");
+			return;
 		}
+		break;
+	case GF_CODECID_AC3:
+	case GF_CODECID_EAC3:
 		gf_fprintf(dump, "/>\n");
 		return;
+
+	case GF_CODECID_TRUEHD:
+		if (dsi) {
+			u16 fmt, prate;
+			gf_fprintf(dump, ">\n");
+			gf_fprintf(dump, "<TrueHDAudioConfiguration");
+
+			if (!pctx->bs)
+				pctx->bs = gf_bs_new(dsi->value.data.ptr, dsi->value.data.size, GF_BITSTREAM_READ);
+			else
+				gf_bs_reassign_buffer(pctx->bs, dsi->value.data.ptr, dsi->value.data.size);
+
+			fmt = gf_bs_read_u32(pctx->bs);
+			prate = gf_bs_read_int(pctx->bs, 15);
+
+			gf_fprintf(dump, " format=\"%u\" peak_data_rate=\"%u\"/>\n", fmt, prate);
+		} else {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+		break;
+
 	default:
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[Inspect] bitstream analysis for codec %s not supported\n", gf_codecid_name(pctx->codec_id)));
+		if (!pctx->no_analysis) {
+			pctx->no_analysis = GF_TRUE;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Inspect] bitstream analysis for codec %s not supported\n", gf_codecid_name(pctx->codec_id)));
+		}
 		gf_fprintf(dump, "/>\n");
 		return;
 	}
@@ -2372,13 +3876,13 @@
 	if (svcc) gf_odf_avc_cfg_del(svcc);
 	if (hvcc) gf_odf_hevc_cfg_del(hvcc);
 	if (lhcc) gf_odf_hevc_cfg_del(lhcc);
-
+	if (vvcC) gf_odf_vvc_cfg_del(vvcC);
 	gf_fprintf(dump, "</%s>\n", elt_name);
 }
 
 static GF_Err inspect_process(GF_Filter *filter)
 {
-	u32 i, count, nb_done=0;
+	u32 i, count, nb_done=0, nb_hdr_done=0;
 	GF_InspectCtx *ctx = (GF_InspectCtx *) gf_filter_get_udta(filter);
 
 	count = gf_list_count(ctx->src_pids);
@@ -2407,11 +3911,31 @@
 	count = gf_list_count(ctx->src_pids);
 	for (i=0; i<count; i++) {
 		PidCtx *pctx = gf_list_get(ctx->src_pids, i);
-		GF_FilterPacket *pck = gf_filter_pid_get_packet(pctx->src_pid);
+		GF_FilterPacket *pck = NULL;
+		pck = pctx->src_pid ? gf_filter_pid_get_packet(pctx->src_pid) : NULL;
 
-		if (!pck && !gf_filter_pid_is_eos(pctx->src_pid))
+		if (pctx->init_pid_config_done)
+			nb_hdr_done++;
+
+		if (!pck) {
+			if (pctx->src_pid && !gf_filter_pid_is_eos(pctx->src_pid))
+				continue;
+			else
+				ctx->has_seen_eos = GF_TRUE;
+		}
+		if (pctx->aborted)
 			continue;
 
+		if (!pctx->buffer_done) {
+			if (pck && !ctx->has_seen_eos) {
+				u64 dur = gf_filter_pid_query_buffer_duration(pctx->src_pid, GF_FALSE);
+				if ((dur < ctx->buffer * 1000) && !gf_filter_pid_has_seen_eos(pctx->src_pid)) {
+					continue;
+				}
+			}
+			pctx->buffer_done = GF_TRUE;
+		}
+
 		if (pctx->dump_pid) {
 			inspect_dump_pid(ctx, pctx->tmp, pctx->src_pid, pctx->idx, pctx->init_pid_config_done ? GF_FALSE : GF_TRUE, GF_FALSE, pctx->pck_for_config, (pctx->dump_pid==2) ? GF_TRUE : GF_FALSE, pctx);
 			pctx->dump_pid = 0;
@@ -2434,37 +3958,49 @@
 
 			if (ctx->is_prober) {
 				nb_done++;
-			} else if (ctx->fmt) {
-				inspect_dump_packet_fmt(ctx, pctx->tmp, pck, pctx, pctx->pck_num);
 			} else {
-				inspect_dump_packet(ctx, pctx->tmp, pck, pctx->idx, pctx->pck_num, pctx);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Inspect] PID %d (codec %s) dump packet CTS "LLU"\n", pctx->idx, gf_codecid_name(pctx->codec_id), gf_filter_pck_get_cts(pck) ));
+				if (ctx->fmt) {
+					inspect_dump_packet_fmt(ctx, pctx->tmp, pck, pctx, pctx->pck_num);
+				} else {
+					inspect_dump_packet(ctx, pctx->tmp, pck, pctx->idx, pctx->pck_num, pctx);
+				}
 			}
 		}
 		
 		if (ctx->dur.num && ctx->dur.den) {
 			u64 timescale = gf_filter_pck_get_timescale(pck);
 			u64 ts = gf_filter_pck_get_dts(pck);
+			u64 dur = gf_filter_pck_get_duration(pck);
 			if (ts == GF_FILTER_NO_TS) ts = gf_filter_pck_get_cts(pck);
 
-			if (!pctx->init_ts) pctx->init_ts = ts;
-			else if (ctx->dur.den * (ts - pctx->init_ts) >= ctx->dur.num * timescale) {
+			if (!pctx->init_ts) pctx->init_ts = ts+1;
+			else if (gf_timestamp_greater_or_equal(ts + dur - pctx->init_ts + 1, timescale, ctx->dur.num, ctx->dur.den)) {
 				GF_FilterEvent evt;
 				GF_FEVT_INIT(evt, GF_FEVT_STOP, pctx->src_pid);
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Inspect] PID %d (codec %s) done dumping, aborting\n", pctx->idx, gf_codecid_name(pctx->codec_id) ));
+				gf_filter_pid_drop_packet(pctx->src_pid);
+
 				gf_filter_pid_send_event(pctx->src_pid, &evt);
 				gf_filter_pid_set_discard(pctx->src_pid, GF_TRUE);
+				pctx->aborted = GF_TRUE;
 				break;
 			}
 		}
 		gf_filter_pid_drop_packet(pctx->src_pid);
 	}
-	if (ctx->is_prober && !ctx->probe_done && (nb_done==count) && !ctx->allp) {
+	if ((ctx->is_prober && !ctx->probe_done && (nb_done==count) && !ctx->allp)
+		|| (!ctx->is_prober && !ctx->allp && !ctx->dump_pck && (nb_hdr_done==count) && !gf_filter_connections_pending(filter))
+	) {
 		for (i=0; i<count; i++) {
 			PidCtx *pctx = gf_list_get(ctx->src_pids, i);
 			GF_FilterEvent evt;
 			GF_FEVT_INIT(evt, GF_FEVT_STOP, pctx->src_pid);
 			gf_filter_pid_send_event(pctx->src_pid, &evt);
 		}
-		ctx->probe_done = GF_TRUE;
+		if (ctx->is_prober)
+			ctx->probe_done = GF_TRUE;
 		return GF_EOS;
 	}
 	return GF_OK;
@@ -2474,6 +4010,7 @@
 {
 	GF_FilterEvent evt;
 	PidCtx *pctx;
+	u32 w, h, sr, ch;
 	const GF_PropertyValue *p;
 	GF_InspectCtx *ctx = (GF_InspectCtx *) gf_filter_get_udta(filter);
 
@@ -2482,13 +4019,24 @@
 	pctx = gf_filter_pid_get_udta(pid);
 	if (pctx) {
 		assert(pctx->src_pid == pid);
-		if (!ctx->is_prober) pctx->dump_pid = 1;
+		if (is_remove)
+			pctx->src_pid = NULL;
+		else if (!ctx->is_prober)
+			pctx->dump_pid = 1;
 		return GF_OK;
 	}
 	GF_SAFEALLOC(pctx, PidCtx);
 	if (!pctx) return GF_OUT_OF_MEM;
 	if (ctx->analyze)
 		pctx->bs = gf_bs_new((u8 *)pctx, 0, GF_BITSTREAM_READ);
+	if (!ctx->buffer) {
+		pctx->buffer_done = GF_TRUE;
+	} else {
+		GF_FEVT_INIT(evt, GF_FEVT_BUFFER_REQ, pid);
+		evt.buffer_req.max_buffer_us = ctx->buffer * 1000;
+		evt.buffer_req.pid_only = GF_TRUE;
+		gf_filter_pid_send_event(pid, &evt);
+	}
 
 	pctx->src_pid = pid;
 	gf_filter_pid_set_udta(pid, pctx);
@@ -2499,25 +4047,60 @@
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
 	pctx->codec_id = p ? p->value.uint : 0;
 
+	w = h = sr = ch = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (p) w = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	if (p) h = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+	if (p) sr = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+	if (p) ch = p->value.uint;
+
 	if (! ctx->interleave) {
 		u32 insert_idx = 0;
 		u32 i;
 		//sort all PIDs by codec IDs
 		for (i=0; i<gf_list_count(ctx->src_pids); i++) {
+			Bool insert = GF_FALSE;
 			PidCtx *actx = gf_list_get(ctx->src_pids, i);
-			insert_idx = i;
 
-			p = gf_filter_pid_get_property(actx->src_pid, GF_PROP_PID_CODECID);
-			if (!p || (pctx->codec_id < p->value.uint)) {
+			if (pctx->codec_id < actx->codec_id) {
+				insert = GF_TRUE;
+			}
+			//same codec ID, sort by increasing width/height/samplerate/channels
+			else if (pctx->codec_id==actx->codec_id) {
+				u32 aw, ah, asr, ach;
+
+				aw = ah = asr = ach = 0;
+				p = gf_filter_pid_get_property(actx->src_pid, GF_PROP_PID_WIDTH);
+				if (p) aw = p->value.uint;
+				p = gf_filter_pid_get_property(actx->src_pid, GF_PROP_PID_HEIGHT);
+				if (p) ah = p->value.uint;
+				p = gf_filter_pid_get_property(actx->src_pid, GF_PROP_PID_SAMPLE_RATE);
+				if (p) asr = p->value.uint;
+				p = gf_filter_pid_get_property(actx->src_pid, GF_PROP_PID_NUM_CHANNELS);
+				if (p) ach = p->value.uint;
+
+				if (w && aw && (w<aw)) insert = GF_TRUE;
+				if (h && ah && (h<ah)) insert = GF_TRUE;
+				if (sr && asr && (sr<asr)) insert = GF_TRUE;
+				if (ch && ach && (ch<ach)) insert = GF_TRUE;
+			}
+
+			if (insert) {
+				insert_idx = i+1;
 				break;
 			}
 		}
-
-		gf_list_insert(ctx->src_pids, pctx, insert_idx);
-
-		for (i=insert_idx+1; i<gf_list_count(ctx->src_pids); i++) {
-			PidCtx *actx = gf_list_get(ctx->src_pids, i);
-			actx->idx = i+1;
+		if (insert_idx) {
+			gf_list_insert(ctx->src_pids, pctx, insert_idx-1);
+			for (i=insert_idx; i<gf_list_count(ctx->src_pids); i++) {
+				PidCtx *actx = gf_list_get(ctx->src_pids, i);
+				actx->idx = i+1;
+			}
+		} else {
+			gf_list_add(ctx->src_pids, pctx);
 		}
 	} else {
 		pctx->tmp = ctx->dump;
@@ -2529,7 +4112,7 @@
 	if (! ctx->interleave && !pctx->tmp && ctx->dump) {
 		pctx->tmp = gf_file_temp(NULL);
 		if (ctx->xml)
-			gf_fprintf(ctx->dump, "<PIDInspect ID=\"%d\" name=\"%s\">\n", pctx->idx, gf_filter_pid_get_name(pid) );
+			gf_fprintf(pctx->tmp, "<PIDInspect ID=\"%d\" name=\"%s\">\n", pctx->idx, gf_filter_pid_get_name(pid) );
 	}
 
 	switch (ctx->mode) {
@@ -2556,6 +4139,9 @@
 	}
 	if (ctx->pcr)
 		gf_filter_pid_set_clock_mode(pid, GF_TRUE);
+
+	if (!ctx->deep)
+		gf_filter_post_process_task(filter);
 	return GF_OK;
 }
 
@@ -2593,6 +4179,13 @@
 		return GF_OK;
 	}
 
+#ifdef GPAC_DISABLE_AVPARSE_LOGS
+	if (ctx->analyze>=INSPECT_ANALYZE_BS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Inspect] Bitstream logging is disable in this build\n"));
+		return GF_NOT_SUPPORTED;
+	}
+#endif
+
 	if (!ctx->log) return GF_BAD_PARAM;
 	if (!strcmp(ctx->log, "stderr")) ctx->dump = stderr;
 	else if (!strcmp(ctx->log, "stdout")) ctx->dump = stdout;
@@ -2600,7 +4193,7 @@
 	else {
 		ctx->dump = gf_fopen(ctx->log, "wt");
 		if (!ctx->dump) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Inspec] Failed to open file %s\n", ctx->log));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Inspect] Failed to open file %s\n", ctx->log));
 			return GF_IO_ERR;
 		}
 	}
@@ -2614,6 +4207,13 @@
 		gf_fprintf(ctx->dump, "<GPACInspect>\n");
 	}
 
+	if (ctx->xml || ctx->analyze || gf_sys_is_test_mode() || ctx->fmt) {
+		ctx->full = GF_TRUE;
+	}
+	if (!ctx->full) {
+		ctx->mode = INSPECT_MODE_REFRAME;
+	}
+
 	switch (ctx->mode) {
 	case INSPECT_MODE_RAW:
 		break;
@@ -2648,35 +4248,45 @@
 #define OFFS(_n)	#_n, offsetof(GF_InspectCtx, _n)
 static const GF_FilterArgs InspectArgs[] =
 {
-	{ OFFS(log), "set inspect log filename", GF_PROP_STRING, "stderr", "fileName, stderr, stdout or null", 0},
+	{ OFFS(log), "set inspect log filename", GF_PROP_STRING, "stdout", "fileName, stderr, stdout or null", 0},
 	{ OFFS(mode), "dump mode\n"
 	"- pck: dump full packet\n"
 	"- blk: dump packets before reconstruction\n"
 	"- frame: force reframer\n"
-	"- raw: dump source packets without demuxing", GF_PROP_UINT, "pck", "pck|blk|frame|raw", 0},
-	{ OFFS(interleave), "dump packets as they are received on each pid. If false, report per pid is generated", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	"- raw: dump source packets without demultiplexing", GF_PROP_UINT, "pck", "pck|blk|frame|raw", 0},
+	{ OFFS(interleave), "dump packets as they are received on each PID. If false, logs are reported for each PID at end of session", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(deep), "dump packets along with PID state change, implied when [-fmt]() is set", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
-	{ OFFS(props), "dump packet properties, ignored when [-fmt]() is set (see filter help)", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
-	{ OFFS(dump_data), "enable full data dump (__WARNING__ heavy!), ignored when [-fmt]() is set (see filter help)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
-	{ OFFS(fmt), "set packet dump format (see filter help)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(hdr), "print a header corresponding to fmt string without \'$ \'or \"pid.\"", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(allp), "analyse for the entire duration, rather than stoping when all pids are found", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(props), "dump packet properties, ignored when [-fmt]() is set", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(dump_data), "enable full data dump (__very large output__), ignored when [-fmt]() is set", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(fmt), "set packet dump format", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(hdr), "print a header corresponding to fmt string without '$' or \"pid\"", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(allp), "analyse for the entire duration, rather than stopping when all PIDs are found", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(info), "monitor PID info changes", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(full), "full dump of PID properties (always on if XML)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
 	{ OFFS(pcr), "dump M2TS PCR info", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_UPDATE},
-	{ OFFS(speed), "set playback command speed. If speed is negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
-	{ OFFS(start), "set playback start offset. Negative value means percent of media dur with -1 <=> dur", GF_PROP_DOUBLE, "0.0", NULL, 0},
+	{ OFFS(speed), "set playback command speed. If negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{ OFFS(start), "set playback start offset. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, 0},
 	{ OFFS(dur), "set inspect duration", GF_PROP_FRACTION, "0/0", NULL, 0},
-	{ OFFS(analyze), "analyze sample content (NALU, OBU)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(analyze), "analyze sample content (NALU, OBU)\n"
+	"- off: no analyzing\n"
+	"- on: simple analyzing\n"
+	"- bs: log bitstream syntax (all elements read from bitstream)\n"
+	"- full: log bitstream syntax and bit sizes signaled as `(N)` after field value, except 1-bit fields (omitted)", GF_PROP_UINT, "off", "off|on|bs|full", GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
 	{ OFFS(xml), "use xml formatting (implied if (-analyze]() is set) and disable [-fmt]()", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(crc), "dump crc of samples of subsamples (NALU or OBU) when analyzing", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(fftmcd), "consider timecodes use ffmpeg-compatible signaling rather than QT compliant one", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_UPDATE},
 	{ OFFS(dtype), "dump property type", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(buffer), "set buffer in ms (mostly used for testing DASH algo)", GF_PROP_UINT, "0", NULL, GF_ARG_HINT_EXPERT},
 	{ OFFS(test), "skip predefined set of properties, used for test mode\n"
 		"- no: no properties skipped\n"
-		"- noprop: all properties/info changes on pid are skipped, only packets are dumped\n"
+		"- noprop: all properties/info changes on PID are skipped, only packets are dumped\n"
 		"- network: URL/path dump, cache state, file size properties skipped (used for hashing network results)\n"
 		"- netx: same as network but skip track duration and templates (used for hashing progressive load of fmp4)\n"
 		"- encode: same as network plus skip decoder config (used for hashing encoding results)\n"
-		"- encx: same as encode and skip bitrates, media data size and co", GF_PROP_UINT, "no", "no|noprop|network|netx|encode|encx", GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_UPDATE},
+		"- encx: same as encode and skip bitrates, media data size and co\n"
+		"- nocrc: disable packet CRC dump\n"
+		"- nobr: skip bitrate"
+		, GF_PROP_UINT, "no", "no|noprop|network|netx|encode|encx|nocrc|nobr", GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_UPDATE},
 	{0}
 };
 
@@ -2689,53 +4299,62 @@
 const GF_FilterRegister InspectRegister = {
 	.name = "inspect",
 	GF_FS_SET_DESCRIPTION("Inspect packets")
-	GF_FS_SET_HELP("The inspect filter can be used to dump pid and packets. It may also be used to check parts of payload of the packets. The default options inspect only pid changes.\n"\
-				"The packet inspector can be configured to dump specific properties of packets using [-fmt]().\n"\
-	 			"When the option is not present, all properties are dumped. Otherwise, only properties identified by `$TOKEN$` "
-	 			"are printed. You may use '$', '@' or '%' for `TOKEN` separator. `TOKEN` can be:\n"\
-				"- pn: packet (frame in framed mode) number\n"\
-				"- dts: decoding time stamp in stream timescale, N/A if not available\n"\
-				"- ddts: difference between current and previous packets decoding time stamp in stream timescale, N/A if not available\n"\
-				"- cts: composition time stamp in stream timescale, N/A if not available\n"\
-				"- dcts: difference between current and previous packets composition time stamp in stream timescale, N/A if not available\n"\
-				"- ctso: difference between composition time stamp and decoding time stamp in stream timescale, N/A if not available\n"\
-				"- dur: duration in stream timescale\n"\
-				"- frame: framing status\n"
-				" - interface: complete AU, interface object (no size info). Typically a GL texture\n"
-				" - frame_full: complete AU\n"
-				" - frame_start: begining of frame\n"
-				" - frame_end: end of frame\n"
-				" - frame_cont: frame continuation (not begining, not end)\n"
-				"- sap or rap: SAP type of the frame\n"\
-				"- ilace: interlacing flag (0: progressive, 1: top field, 2: bottom field)\n"\
-				"- corr: corrupted packet flag\n"\
-				"- seek: seek flag\n"\
-				"- bo: byte offset in source, N/A if not available\n"\
-				"- roll: roll info\n"\
-				"- crypt: crypt flag\n"\
-				"- vers: carrousel version number\n"\
-				"- size: size of packet\n"\
-				"- crc: 32 bit CRC of packet\n"\
-				"- lf: insert linefeed\n"\
-				"- cr: insert carriage return\n"\
-				"- t: insert tab\n"\
-				"- data: hex dump of packet (** WARNING, BIG OUTPUT !! **)\n"\
-				"- lp: leading picture flag\n"\
-				"- depo: depends on other packet flag\n"\
-				"- depf: is depended on other packet flag\n"\
-				"- red: redundant coding flag\n"\
-				"- ck: clock type used for PCR discontinuities\n"\
-	 			"- P4CC: 4CC of packet property\n"\
-	 			"- PropName: Name of packet property\n"\
-	 			"- pid.P4CC: 4CC of PID property\n"\
-	 			"- pid.PropName: Name of PID property\n"\
-	 			"\n"\
-	 			"EX fmt=\"PID $pid.ID$ packet $pn$ DTS $dts$ CTS $cts$ $lf$\"\n"
-	 			"This dumps packet number, cts and dts as follows: `PID 1 packet 10 DTS 100 CTS 108 \\n`\n"\
-	 			" \n"\
-	 			"An unrecognized keywork or missing property will resolve to an empty string.\n"\
-	 			"\n"\
-	 			"Note: when dumping in interleaved mode, there is no guarantee that the packets will be dumped in their original sequence order since the inspector fetches one packet at a time on each PID.\n")
+	GF_FS_SET_HELP("The inspect filter can be used to dump PID and packets. It may also be used to check parts of payload of the packets.\n"
+	"\n"
+	"The default options inspect only PID changes.\n"
+	"If [-full]() is not set, [-mode=frame]() is forced and PID properties are formatted in human-readable form, one PID per line.\n"
+	"Otherwise, all properties are dumped.\n"
+	"Note: specifying [-xml](), [-analyze](), [-fmt]() or using `-for-test` will force [-full]() to true.\n"
+	"\n"
+	"The packet inspector can be configured to dump specific properties of packets using [-fmt]().\n"
+	"When the option is not present, all properties are dumped. Otherwise, only properties identified by `$TOKEN$` "
+	"are printed. You may use '$', '@' or '%' for `TOKEN` separator. `TOKEN` can be:\n"
+	"- pn: packet (frame in framed mode) number\n"
+	"- dts: decoding time stamp in stream timescale, N/A if not available\n"
+	"- ddts: difference between current and previous packets decoding time stamp in stream timescale, N/A if not available\n"
+	"- cts: composition time stamp in stream timescale, N/A if not available\n"
+	"- dcts: difference between current and previous packets composition time stamp in stream timescale, N/A if not available\n"
+	"- ctso: difference between composition time stamp and decoding time stamp in stream timescale, N/A if not available\n"
+	"- dur: duration in stream timescale\n"
+	"- frame: framing status\n"
+	" - interface: complete AU, interface object (no size info). Typically a GL texture\n"
+	" - frame_full: complete AU\n"
+	" - frame_start: beginning of frame\n"
+	" - frame_end: end of frame\n"
+	" - frame_cont: frame continuation (not beginning, not end)\n"
+	"- sap or rap: SAP type of the frame\n"
+	"- ilace: interlacing flag (0: progressive, 1: top field, 2: bottom field)\n"
+	"- corr: corrupted packet flag\n"
+	"- seek: seek flag\n"
+	"- bo: byte offset in source, N/A if not available\n"
+	"- roll: roll info\n"
+	"- crypt: crypt flag\n"
+	"- vers: carousel version number\n"
+	"- size: size of packet\n"
+	"- csize: total size of packets received so far\n"
+	"- crc: 32 bit CRC of packet\n"
+	"- lf or n: insert new line\n"
+	"- t: insert tab\n"
+	"- data: hex dump of packet (__big output!__)\n"
+	"- lp: leading picture flag\n"
+	"- depo: depends on other packet flag\n"
+	"- depf: is depended on other packet flag\n"
+	"- red: redundant coding flag\n"
+	"- ck: clock type used for PCR discontinuities\n"
+	"- pcr: MPEG-2 TS last PCR, n/a if not available\n"
+	"- pcrd: difference between last PCR and decoding time, n/a if no PCR available\n"
+	"- pcrc: difference between last PCR and composition time, n/a if no PCR available\n"
+	"- P4CC: 4CC of packet property\n"
+	"- PropName: Name of packet property\n"
+	"- pid.P4CC: 4CC of PID property\n"
+	"- pid.PropName: Name of PID property\n"
+	"\n"
+	"EX fmt=\"PID $pid.ID$ packet $pn$ DTS $dts$ CTS $cts$ $lf$\"\n"
+	"This dumps packet number, cts and dts as follows: `PID 1 packet 10 DTS 100 CTS 108 \\n`\n"
+	" \n"
+	"An unrecognized keyword or missing property will resolve to an empty string.\n"
+	"\n"
+	"Note: when dumping in interleaved mode, there is no guarantee that the packets will be dumped in their original sequence order since the inspector fetches one packet at a time on each PID.\n")
 	.private_size = sizeof(GF_InspectCtx),
 	.flags = GF_FS_REG_EXPLICIT_ONLY,
 	.max_extra_pids = (u32) -1,
@@ -2768,17 +4387,24 @@
 	{0},
 };
 
+static const GF_FilterArgs ProbeArgs[] =
+{
+	{ OFFS(log), "set probe log filename to print number of streams", GF_PROP_STRING, "stdout", "fileName, stderr, stdout or null", 0},
+	{0}
+};
+
 
 const GF_FilterRegister ProbeRegister = {
 	.name = "probe",
 	GF_FS_SET_DESCRIPTION("Probe source")
-	GF_FS_SET_HELP("The Probe filter is used by applications (typically `MP4Box`) to query demuxed pids available in a source chain.\n"
-	"The filter does not produce any output nor feedback, it is up to the app developper to query input pids of the prober and take appropriated decisions.")
+	GF_FS_SET_HELP("The Probe filter is used by applications (typically `MP4Box`) to query demultiplexed PIDs (audio, video, ...) available in a source chain.\n\n"
+	"The filter outputs the number of input PIDs in the file specified by [-log]().\n"
+	"It is up to the app developer to query input PIDs of the prober and take appropriated decisions.")
 	.private_size = sizeof(GF_InspectCtx),
 	.flags = GF_FS_REG_EXPLICIT_ONLY,
 	.max_extra_pids = (u32) -1,
-	.args = InspectArgs,
 	.initialize = inspect_initialize,
+	.args = ProbeArgs,
 	SETCAPS(ProberCaps),
 	.finalize = inspect_finalize,
 	.process = inspect_process,

gpac-2.0.0.tar.gz/src/filters/io_fcryp.c Added

@@ -0,0 +1,653 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2021-2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / file crypt/decrypt for full segment encryption filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <gpac/filters.h>
+#include <gpac/constants.h>
+#include <gpac/download.h>
+#include <gpac/crypt.h>
+#include <gpac/network.h>
+
+enum
+{
+	KEY_STATE_NONE=0,
+	KEY_STATE_CHANGED,
+	KEY_STATE_DOWNLOADING,
+	KEY_STATE_SET_IV,
+};
+
+typedef struct
+{
+	Bool do_crypt;
+	bin128 key;
+	bin128 iv;
+} KeyInfo;
+
+
+typedef struct
+{
+	//options
+	char *src, *dst;
+	Bool fullfile;
+
+	GF_FilterPid *ipid, *opid;
+	GF_Filter *for_filter;
+
+	u32 reload_key_state;
+	char *key_url;
+	bin128 IV;
+
+	GF_DownloadSession *key_sess;
+	GF_Err in_error;
+
+	u8 key_data[20];
+	u32 key_size;
+	GF_Crypt *crypt;
+
+	u8 store[16];
+	u32 remain;
+
+	bin128 last_key;
+	Bool use_key;
+	Bool file_done;
+	GF_List *keys;
+} GF_CryptFileCtx;
+
+static GF_Err cryptfile_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_CryptFileCtx *ctx = (GF_CryptFileCtx *) gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->opid) gf_filter_pid_set_eos(ctx->opid);
+		return GF_OK;
+	}
+	if (!ctx->opid)
+		ctx->opid = gf_filter_pid_new(filter);
+	ctx->ipid = pid;
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ORIG_STREAM_TYPE, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
+	//the output file is no longer cached
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_CACHED, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILEPATH, NULL);
+
+	//if no mime assume M2TS
+	if (gf_filter_pid_get_property(pid, GF_PROP_PID_MIME) == NULL) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_NAME("video/mpeg-2"));
+	}
+
+	if (ctx->fullfile)
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+const char *gf_filter_get_src_args(GF_Filter *filter);
+
+static Bool cryptfile_on_filter_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
+{
+	GF_Filter *f = (GF_Filter *)udta;
+	if (!udta) return GF_FALSE;
+	//forward failure, but do not send a setup failure (gf_filter_setup_failure) which would remove this filter
+	//we let the final user (dashdmx) decide what to do
+	gf_filter_notification_failure(f, err, GF_FALSE);
+	return GF_FALSE;
+}
+
+static GF_Err cryptfin_initialize(GF_Filter *filter)
+{
+	GF_Err e;
+	const char *args;
+	GF_CryptFileCtx *ctx = (GF_CryptFileCtx *) gf_filter_get_udta(filter);
+	if (!ctx || !ctx->src) return GF_BAD_PARAM;
+
+	if (strncmp(ctx->src, "gcryp://", 8)) return GF_BAD_PARAM;
+	//get complete args of filter, strip anything up to (including) gcryp://
+	args = gf_filter_get_src_args(filter);
+	if (args) args = strstr(args, "gcryp://");
+	if (args) args += 8;
+	else args = ctx->src+8;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		cryptfile_on_filter_setup_error(NULL, NULL, GF_OK);
+	}
+#endif
+
+	ctx->for_filter = gf_filter_connect_source(filter, args, NULL, GF_FALSE, &e);
+	if (e) return e;
+	gf_filter_set_setup_failure_callback(filter, ctx->for_filter, cryptfile_on_filter_setup_error, filter);
+	return gf_filter_set_source(filter, ctx->for_filter, NULL);
+}
+
+static void cryptfile_finalize(GF_Filter *filter)
+{
+	GF_CryptFileCtx *ctx = (GF_CryptFileCtx *) gf_filter_get_udta(filter);
+	if (ctx->crypt) gf_crypt_close(ctx->crypt);
+	if (ctx->key_url) gf_free(ctx->key_url);
+
+	if (ctx->keys) {
+		while (gf_list_count(ctx->keys)) {
+			KeyInfo *ki = gf_list_pop_front(ctx->keys);
+			gf_free(ki);
+		}
+		gf_list_del(ctx->keys);
+	}
+}
+
+static GF_FilterProbeScore cryptfile_probe_url(const char *url, const char *mime_type)
+{
+	if (!strnicmp(url, "gcryp://", 8)) return GF_FPROBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static void cryptfile_set_key(GF_CryptFileCtx *ctx)
+{
+	if (!ctx->crypt) {
+		ctx->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+		if (!ctx->crypt) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CryptFile] Failed to allocat decryptor\n"))
+			ctx->in_error = GF_OUT_OF_MEM;
+			return;
+		}
+		ctx->in_error = gf_crypt_init(ctx->crypt, ctx->key_data, ctx->IV);
+	} else {
+		ctx->in_error = gf_crypt_set_key(ctx->crypt, ctx->key_data);
+		if (!ctx->in_error)
+			ctx->in_error = gf_crypt_set_IV(ctx->crypt, ctx->IV, 16);
+	}
+	ctx->reload_key_state = KEY_STATE_NONE;
+}
+
+static GF_Err cryptfin_process(GF_Filter *filter)
+{
+	GF_Err e;
+	u32 size, osize, unused;
+	const u8 *data;
+	Bool start, end;
+	u8 *output, pad;
+	GF_FilterPacket *pck, *pck_out;
+	GF_CryptFileCtx *ctx = (GF_CryptFileCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->in_error) return ctx->in_error;
+
+	if (!ctx->ipid) return GF_OK;
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	if (!ctx->key_url) {
+		gf_filter_pck_forward(pck, ctx->opid);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+	if (ctx->reload_key_state) {
+		if (ctx->reload_key_state==KEY_STATE_CHANGED) {
+			if (!ctx->key_sess) {
+				GF_DownloadManager *dm = gf_filter_get_download_manager(filter);
+				ctx->key_sess = gf_dm_sess_new(dm, ctx->key_url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED, NULL, NULL, &e);
+			} else {
+				e = gf_dm_sess_setup_from_url(ctx->key_sess, ctx->key_url, GF_TRUE);
+			}
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CryptFile] Failed to setup download session for key %s: %s\n", ctx->key_url, gf_error_to_string(e)))
+				return ctx->in_error = e;
+			}
+			ctx->reload_key_state = KEY_STATE_DOWNLOADING;
+		}
+		if (ctx->reload_key_state==KEY_STATE_DOWNLOADING) {
+			u32 nb_read;
+			e = gf_dm_sess_fetch_data(ctx->key_sess, ctx->key_data + ctx->key_size, 100-ctx->key_size, &nb_read);
+			ctx->key_size += nb_read;
+			if (ctx->key_size > 16) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CryptFile] Invalid key size, greater than 16 bytes\n"))
+				return ctx->in_error = GF_SERVICE_ERROR;
+			}
+
+			if ((e<0) && (e != GF_IP_NETWORK_EMPTY)) {
+				ctx->in_error = e;
+				ctx->reload_key_state = KEY_STATE_NONE;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CryptFile] Failed to download key %s: %s\n", ctx->key_url, gf_error_to_string(e)))
+				return e;
+			}
+			if (e == GF_EOS) {
+				cryptfile_set_key(ctx);
+				if (ctx->in_error) return ctx->in_error;
+			} else {
+				return GF_OK;
+			}
+		}
+		if (ctx->reload_key_state == KEY_STATE_SET_IV) {
+			gf_crypt_set_IV(ctx->crypt, ctx->IV, 16);
+			ctx->reload_key_state = KEY_STATE_NONE;
+		}
+	}
+
+	if (ctx->fullfile) {
+
+		gf_filter_pck_get_data(pck, &size);
+		pck_out = gf_filter_pck_new_clone(ctx->opid, pck, &output);
+		if (!pck_out) return GF_OUT_OF_MEM;
+
+		e = gf_crypt_decrypt(ctx->crypt, output, size);
+		pad = output[size-1];
+		if (!pad || (pad>16)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[CryptFile] Invalid PKCS7 padding %d, should be in range [1,16]\n", pad))
+			if (pad) pad = 16;
+		}
+		size -= pad;
+		gf_filter_pck_truncate(pck_out, size);
+		gf_filter_pck_send(pck_out);
+
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return e;
+	}
+	data = gf_filter_pck_get_data(pck, &size);
+	gf_filter_pck_get_framing(pck, &start, &end);
+
+	osize = size + ctx->remain;
+	unused = 0;
+	if (!end) {
+		while (osize % 16) {
+			osize --;
+			unused++;
+		}
+	}
+	pck_out = gf_filter_pck_new_alloc(ctx->opid, osize, &output);
+	if (!pck_out) return GF_OUT_OF_MEM;
+
+	if (ctx->remain)
+		memcpy(output, ctx->store, ctx->remain);
+	memcpy(output+ctx->remain, data, osize - ctx->remain);
+	e = gf_crypt_decrypt(ctx->crypt, output, osize);
+	gf_filter_pck_merge_properties(pck, pck_out);
+	gf_filter_pck_set_framing(pck_out, start, end);
+
+	if (unused) {
+		memcpy(ctx->store, data + size - unused, unused);
+	}
+	ctx->remain = unused;
+	if (end) {
+		pad = output[osize-1];
+		if (!pad || (pad>16)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[CryptFile] Invalid PKCS7 padding %d, should be in range [1,16]\n", pad))
+			if (pad) pad = 16;
+		}
+		osize -= pad;
+		gf_filter_pck_truncate(pck_out, osize);
+
+		gf_filter_pid_set_info(ctx->opid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(GF_TRUE) );
+	} else if (start) {
+		gf_filter_pid_set_info(ctx->opid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(GF_FALSE) );
+	}
+	gf_filter_pck_send(pck_out);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return e;
+}
+
+
+#define OFFS(_n)	#_n, offsetof(GF_CryptFileCtx, _n)
+
+static const GF_FilterArgs CryptFinArgs[] =
+{
+	{ OFFS(src), "location of source file", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(fullfile), "reassemble full file before decryption", GF_PROP_BOOL, "false", NULL, GF_ARG_HINT_ADVANCED},
+	{0}
+};
+
+static const GF_FilterCapability CryptFileCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+};
+
+GF_FilterRegister CryptFinRegister = {
+	.name = "cryptin",
+	GF_FS_SET_DESCRIPTION("CryptFile input")
+	GF_FS_SET_HELP("This filter dispatch raw blocks from encrypted files with AES 128 CBC in PKCS7 to clear input files\n"
+	"\n"
+	"The filter is automatically loaded by the DASH/HLS demultiplexer and should not be explicitly loaded by your application.\n"
+	"\n"
+	"The filter accepts URL with scheme `gcryp://URL`, where `URL` is the URL to decrypt.\n"
+	"\n"
+	"The filter can process http(s) and local file key URLs (setup through HLS manifest), and expects a full key (16 bytes) as result of resource fetching.\n"
+	)
+	.private_size = sizeof(GF_CryptFileCtx),
+	.args = CryptFinArgs,
+	.initialize = cryptfin_initialize,
+	//GF_FS_REG_ACT_AS_SOURCE needed to prevent GF_FEVT_SOURCE_SWITCH to be canceled
+	.flags = GF_FS_REG_EXPLICIT_ONLY | GF_FS_REG_ACT_AS_SOURCE,
+	SETCAPS(CryptFileCaps),
+	.finalize = cryptfile_finalize,
+	.configure_pid = cryptfile_configure_pid,
+	.process = cryptfin_process,
+	.probe_url = cryptfile_probe_url
+};
+
+
+const GF_FilterRegister *cryptfin_register(GF_FilterSession *session)
+{
+	return &CryptFinRegister;
+}
+
+void gf_cryptfin_set_kms(GF_Filter *filter, const char *key_url, bin128 key_IV)
+{
+	GF_CryptFileCtx *ctx;
+	if (!gf_filter_is_instance_of(filter, &CryptFinRegister))
+		return;
+	ctx = (GF_CryptFileCtx *) gf_filter_get_udta(filter);
+
+	//copy IV
+	memcpy(ctx->IV, key_IV, sizeof(bin128));
+	//switch key if needed IV
+	if (ctx->key_url && key_url && !strcmp(ctx->key_url, key_url)) {
+		ctx->reload_key_state = KEY_STATE_SET_IV;
+	} else {
+		if (ctx->key_url) gf_free(ctx->key_url);
+
+		if (!key_url) {
+			ctx->key_url = NULL;
+			return;
+		}
+		ctx->key_url = gf_strdup(key_url);
+		if (!ctx->key_url) {
+			ctx->in_error = GF_OUT_OF_MEM;
+			return;
+		}
+		ctx->reload_key_state = KEY_STATE_CHANGED;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[CryptFile] Switching key to %s\n", key_url))
+
+		if (!strncmp(key_url, "urn:gpac:keys:value:", 20)) {
+			u32 i;
+			bin128 key_data;
+			key_url += 20;
+			if (!strncmp(key_url, "0x", 2)) key_url += 2;
+			i = (u32) strlen(key_url);
+			if (i != 32) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CryptFile] key %s not found\n", key_url))
+				ctx->in_error = GF_BAD_PARAM;
+				return;
+			}
+			for (i=0; i<16; i++) {
+				char szV[3];
+				u32 v;
+				szV[0] = key_url[2*i];
+				szV[1] = key_url[2*i + 1];
+				szV[2] = 0;
+				sscanf(szV, "%X", &v);
+				key_data[i] = v;
+			}
+			memcpy(ctx->key_data, key_data, sizeof(bin128));
+			cryptfile_set_key(ctx);
+		}
+		//key is local, activate right away
+		else if (gf_url_is_local(key_url)) {
+			FILE *fkey = gf_fopen(key_url, "rb");
+			if (!fkey) {
+				ctx->in_error = GF_URL_ERROR;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CryptFile] key %s not found\n", key_url))
+			} else {
+				u32 read = (u32) gf_fread(ctx->key_data, 16, fkey);
+				if (read != 16) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[CryptFile] key %s too short, expecting 16 bytes got %d\n", key_url, read))
+					ctx->in_error = GF_BAD_PARAM;
+				} else {
+					cryptfile_set_key(ctx);
+				}
+				gf_fclose(fkey);
+			}
+		}
+	}
+}
+
+
+void gf_filter_mirror_forced_caps(GF_Filter *filter, GF_Filter *dst_filter);
+
+static GF_Err cryptfout_initialize(GF_Filter *filter)
+{
+	GF_Err e;
+	const char *args;
+	GF_CryptFileCtx *ctx = (GF_CryptFileCtx *) gf_filter_get_udta(filter);
+	if (!ctx || !ctx->dst) return GF_BAD_PARAM;
+
+	if (strncmp(ctx->dst, "gcryp://", 8)) return GF_BAD_PARAM;
+	ctx->keys = gf_list_new();
+	if (!ctx->keys) return GF_OUT_OF_MEM;
+
+	//get complete args of filter, strip anything up to (including) gcryp://
+	args = gf_filter_get_src_args(filter);
+	if (args) args = strstr(args, "gcryp://");
+	if (args) args += 8;
+	else args = ctx->dst+8;
+
+	ctx->for_filter = gf_filter_connect_destination(filter, args, &e);
+	if (e) return e;
+	gf_filter_set_source(ctx->for_filter, filter, NULL);
+	//use same forced cap as the solved destination
+	gf_filter_mirror_forced_caps(filter, ctx->for_filter);
+	ctx->file_done = GF_TRUE;
+	return GF_OK;
+}
+
+static GF_Err cryptfout_process(GF_Filter *filter)
+{
+	const u8 *data;
+	u8 *output;
+	GF_Err e;
+	Bool start, end;
+	u32 size, osize, pad, i, unused;
+	GF_FilterPacket *pck_out;
+	GF_CryptFileCtx *ctx = (GF_CryptFileCtx *) gf_filter_get_udta(filter);
+	GF_FilterPacket *pck_in = gf_filter_pid_get_packet(ctx->ipid);
+
+	if (ctx->in_error)
+		return ctx->in_error;
+
+	if (!pck_in) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (!ctx->remain && ctx->file_done) {
+				gf_filter_pid_set_eos(ctx->opid);
+				return GF_EOS;
+			}
+			start = GF_TRUE;
+		} else {
+			return GF_OK;
+		}
+	} else {
+		gf_filter_pck_get_framing(pck_in, &start, &end);
+	}
+
+	if (start) {
+		KeyInfo *ki = gf_list_pop_front(ctx->keys);
+
+		if (ctx->remain || !ctx->file_done) {
+			pad = 16 - (ctx->remain % 16);
+			osize = ctx->remain + pad;
+			pck_out = gf_filter_pck_new_alloc(ctx->opid, osize, &output);
+			if (!pck_out) {
+				gf_list_insert(ctx->keys, ki, 0);
+				return GF_OUT_OF_MEM;
+			}
+
+			if (ctx->remain)
+				memcpy(output, ctx->store, ctx->remain);
+
+			for (i=0; i<pad; i++) {
+				output[ctx->remain + i] = pad;
+			}
+			gf_crypt_encrypt(ctx->crypt, output, osize);
+
+			gf_filter_pck_set_framing(pck_out, GF_FALSE, GF_TRUE);
+			ctx->remain = 0;
+			ctx->file_done = GF_TRUE;
+			gf_filter_pck_send(pck_out);
+		}
+		if (!pck_in) {
+			gf_free(ki);
+			return GF_OK;
+		}
+		ctx->file_done = GF_FALSE;
+
+		ctx->use_key = GF_TRUE;
+		e = GF_OK;
+		if (!ki || !ki->do_crypt) {
+			ctx->use_key = GF_FALSE;
+			ctx->file_done = GF_TRUE;
+		} else if (!ctx->crypt) {
+			ctx->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+			if (!ctx->crypt) {
+				gf_free(ki);
+				return ctx->in_error = GF_OUT_OF_MEM;
+			}
+			e = gf_crypt_init(ctx->crypt, ki->key, ki->iv);
+			memcpy(ctx->last_key, ki->key, sizeof(bin128));
+		} else {
+			if (memcmp(ctx->last_key, ki->key, sizeof(bin128))) {
+				e = gf_crypt_set_key(ctx->crypt, ki->key);
+				memcpy(ctx->last_key, ki->key, sizeof(bin128));
+			}
+			if (!e)
+				e = gf_crypt_set_IV(ctx->crypt, ki->iv, 16);
+		}
+		gf_free(ki);
+		if (e) return ctx->in_error = e;
+	}
+
+	if (!ctx->use_key) {
+		gf_filter_pck_forward(pck_in, ctx->opid);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+	if (ctx->fullfile) {
+		data = gf_filter_pck_get_data(pck_in, &size);
+		pad = 16 - (size % 16);
+		pck_out = gf_filter_pck_new_alloc(ctx->opid, size+pad, &output);
+		if (!pck_out) return GF_OUT_OF_MEM;
+
+		memcpy(output, data, size);
+		for (i=0; i<pad; i++) {
+			output[size+i] = (u8) pad;
+		}
+		gf_crypt_encrypt(ctx->crypt, output, size+pad);
+
+		gf_filter_pck_merge_properties(pck_in, pck_out);
+		gf_filter_pck_send(pck_out);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		ctx->file_done = GF_TRUE;
+		return GF_OK;
+	}
+
+	data = gf_filter_pck_get_data(pck_in, &size);
+
+	osize = size + ctx->remain;
+	unused = pad = 0;
+	if (end) {
+		pad = 16 - (osize % 16);
+		osize += pad;
+		ctx->file_done = GF_TRUE;
+	} else {
+		unused = osize % 16;
+		osize -= unused;
+	}
+
+	pck_out = gf_filter_pck_new_alloc(ctx->opid, osize, &output);
+	if (!pck_out) return GF_OUT_OF_MEM;
+	
+	if (ctx->remain)
+		memcpy(output, ctx->store, ctx->remain);
+	memcpy(output+ctx->remain, data, osize - ctx->remain - pad);
+	for (i=0; i<pad; i++) {
+		output[osize + i - pad] = pad;
+	}
+	e = gf_crypt_encrypt(ctx->crypt, output, osize);
+
+	gf_filter_pck_merge_properties(pck_in, pck_out);
+	gf_filter_pck_set_framing(pck_out, start, end);
+
+	if (unused) {
+		memcpy(ctx->store, data + size - unused, unused);
+	}
+	ctx->remain = unused;
+	gf_filter_pck_send(pck_out);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return e;
+}
+
+static const GF_FilterArgs CryptFoutArgs[] =
+{
+	{ OFFS(dst), "location of source file", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(fullfile), "reassemble full file before decryption", GF_PROP_BOOL, "false", NULL, GF_ARG_HINT_ADVANCED},
+	{0}
+};
+
+GF_FilterRegister CryptFoutRegister = {
+	.name = "cryptout",
+	GF_FS_SET_DESCRIPTION("CryptFile output")
+	GF_FS_SET_HELP("This filter dispatch raw blocks from clear input files to encrypted files with AES 128 CBC in PKCS7\n"
+	"\n"
+	"The filter is automatically loaded by the DASH/HLS multiplexer and should not be explicitly loaded by your application.\n"
+	"\n"
+	"The filter accepts URL with scheme `gcryp://URL`, where `URL` is the URL to encrypt.")
+	.private_size = sizeof(GF_CryptFileCtx),
+	.args = CryptFoutArgs,
+	.initialize = cryptfout_initialize,
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	SETCAPS(CryptFileCaps),
+	.finalize = cryptfile_finalize,
+	.configure_pid = cryptfile_configure_pid,
+	.process = cryptfout_process,
+	.probe_url = cryptfile_probe_url
+};
+
+
+const GF_FilterRegister *cryptfout_register(GF_FilterSession *session)
+{
+	return &CryptFoutRegister;
+}
+
+GF_Err gf_cryptfout_push_key(GF_Filter *filter, bin128 *key, bin128 *IV)
+{
+	KeyInfo *key_info;
+	GF_CryptFileCtx *ctx;
+	if (!gf_filter_is_instance_of(filter, &CryptFoutRegister))
+		return GF_BAD_PARAM;
+
+	ctx = (GF_CryptFileCtx *) gf_filter_get_udta(filter);
+	GF_SAFEALLOC(key_info, KeyInfo);
+	if (!key_info) return GF_OUT_OF_MEM;
+
+	if (key && IV) {
+		memcpy(key_info->key, *key, sizeof(bin128));
+		memcpy(key_info->iv, *IV, sizeof(bin128));
+		key_info->do_crypt = GF_TRUE;
+	}
+	return gf_list_add(ctx->keys, key_info);
+}

gpac-1.0.1.tar.gz/src/filters/isoffin.h -> gpac-2.0.0.tar.gz/src/filters/isoffin.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / ISOBMFF reader filter
@@ -48,6 +48,13 @@
 	MP4DMX_SINGLE,
 };
 
+enum
+{
+	MP4DMX_XPS_AUTO=0,
+	MP4DMX_XPS_KEEP,
+	MP4DMX_XPS_REMOVE,
+};
+
 typedef struct
 {
 	//options
@@ -60,9 +67,10 @@
 	u32 frame_size;
 	char* tkid;
 	Bool analyze;
+	u32 xps_check;
 	char *catseg;
 	Bool sigfrag;
-	Bool nocrypt, strtxt;
+	Bool nocrypt, strtxt, nodata;
 	u32 mstore_purge, mstore_samples, mstore_size;
 
 	//internal
@@ -75,7 +83,7 @@
 	/*input file*/
 	GF_ISOFile *mov;
 	Bool extern_mov;
-	u32 time_scale;
+	u32 timescale;
 	u32 nb_playing;
 	//source data is completely available
 	Bool input_loaded;
@@ -92,18 +100,19 @@
 	u32 frag_type;
 	Bool waiting_for_data, reset_frag_state;
 
+	Bool gfio_probe;
 
 	u32 pending_scalable_enhancement_segment_index;
 
-	Bool drop_next_segment;
 	Bool in_data_flush;
 	u32 has_pending_segments, nb_force_flush;
 
 	Bool clock_discontinuity;
 	Bool disconnected;
 	Bool no_order_check;
-	Bool moov_not_loaded;
-
+	u32 moov_not_loaded;
+    Bool invalid_segment;
+    
 	u64 last_sender_ntp, ntp_at_last_sender_ntp, cts_for_last_sender_ntp;
 	Bool is_partial_download, wait_for_source;
 
@@ -131,6 +140,7 @@
 	GF_FilterPid *pid;
 	ISOMReader *owner;
 	u64 duration;
+	Bool last_has_tfrf;
 
 	/*current sample*/
 	GF_ISOSample *static_sample;
@@ -140,7 +150,8 @@
 	Bool sap_3;
 	GF_ISOSampleRollType sap_4_type;
 	s32 roll;
-
+	u32 xps_mask;
+	
 	Bool has_edit_list;
 	u32 sample_num;
 	s64 ts_offset;
@@ -154,9 +165,11 @@
 	u64 sample_time, last_rap_sample_time, start, end;
 	Double speed;
 
-	u32 time_scale;
+	u32 timescale;
 	Bool to_init, has_rap;
-	Bool playing, eos_sent;
+	//0: not playing, 1: playing 2: playing but end of range reached
+	u32 playing;
+	Bool eos_sent;
 	u8 streamType;
 	Bool initial_play_seen;
 
@@ -171,30 +184,31 @@
 	u64 dts, cts;
 	u8 skip_byte_block, crypt_byte_block;
 	Bool is_protected;
-	u8 constant_IV_size;
-	bin128 constant_IV;
-	u8 IV_size;
 	u32 au_seq_num;
 	u64 sender_ntp, ntp_at_server_ntp;
 	u32 seek_flag;
 	u32 au_duration;
 	Bool set_disc;
-	Bool cenc_state_changed;
+
 	u64 isma_BSO;
-	bin128 KID;
 	Bool pck_encrypted;
 
+	u32 key_info_crc;
+	const GF_PropertyValue *cenc_ki;
+	
 	u8 *sai_buffer;
 	u32 sai_alloc_size, sai_buffer_size;
 
-	Bool check_avc_ps, check_hevc_ps, check_mhas_pl;
+	Bool check_avc_ps, check_hevc_ps, check_vvc_ps, check_mhas_pl;
 	GF_HEVCConfig *hvcc;
 	GF_AVCConfig *avcc;
+	GF_VVCConfig *vvcc;
 	GF_BitStream *nal_bs;
 	u32 dsi_crc;
 
 	Bool needs_pid_reconfig;
 	u32 sap_only;
+	Bool check_has_rap;
 } ISOMChannel;
 
 void isor_reset_reader(ISOMChannel *ch);
@@ -216,6 +230,10 @@
 
 Bool isor_declare_item_properties(ISOMReader *read, ISOMChannel *ch, u32 item_idx);
 
+void isor_declare_pssh(ISOMChannel *ch);
+
+void isor_set_sample_groups_and_aux_data(ISOMReader *read, ISOMChannel *ch, GF_FilterPacket *pck);
+
 #endif /*GPAC_DISABLE_ISOM*/
 
 #endif /*_ISMO_IN_H_*/

gpac-1.0.1.tar.gz/src/filters/isoffin_load.c -> gpac-2.0.0.tar.gz/src/filters/isoffin_load.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISOBMFF reader filter
@@ -76,11 +76,30 @@
 }
 #endif
 
+static void isor_export_ref(ISOMReader *read, ISOMChannel *ch, u32 rtype, char *rname)
+{
+	u32 nb_refs = gf_isom_get_reference_count(read->mov, ch->track, rtype);
+	if (nb_refs) {
+		u32 j;
+		GF_PropertyValue prop;
+		prop.type = GF_PROP_UINT_LIST;
+		prop.value.uint_list.nb_items = nb_refs;
+		prop.value.uint_list.vals = gf_malloc(sizeof(u32)*nb_refs);
+		for (j=0; j<nb_refs; j++) {
+			u32 ref_tk;
+			gf_isom_get_reference(read->mov, ch->track, rtype, j+1, &ref_tk );
+			prop.value.uint_list.vals[j] = gf_isom_get_track_id(read->mov, ref_tk);
+		}
+		gf_filter_pid_set_property_str(ch->pid, rname, &prop);
+		gf_free(prop.value.uint_list.vals);
+	}
+}
+
 static void isor_declare_track(ISOMReader *read, ISOMChannel *ch, u32 track, u32 stsd_idx, u32 streamtype, Bool use_iod)
 {
-	u32 w, h, sr, nb_ch, nb_bps, codec_id, depends_on_id, esid, avg_rate, max_rate, buffer_size, sample_count, max_size, nb_refs, exp_refs, base_track, audio_fmt, pix_fmt;
+	u32 w, h, sr, nb_ch, nb_bps, codec_id, depends_on_id, esid, avg_rate, max_rate, buffer_size, sample_count, max_size, base_track, audio_fmt, pix_fmt;
 	GF_ESD *an_esd;
-	const char *mime, *encoding, *stxtcfg, *namespace, *schemaloc;
+	const char *mime, *encoding, *stxtcfg, *namespace, *schemaloc, *mime_cfg;
 #if !defined(GPAC_DISABLE_ISOM_WRITE)
 	u8 *tk_template;
 	u32 tk_template_size;
@@ -102,7 +121,7 @@
 
 
 	depends_on_id = avg_rate = max_rate = buffer_size = 0;
-	mime = encoding = stxtcfg = namespace = schemaloc = NULL;
+	mime = encoding = stxtcfg = namespace = schemaloc = mime_cfg = NULL;
 
 	if ( gf_isom_is_media_encrypted(read->mov, track, stsd_idx)) {
 		gf_isom_get_original_format_type(read->mov, track, stsd_idx, &m_subtype);
@@ -139,9 +158,23 @@
 		}
 
 		gf_odf_desc_del((GF_Descriptor *)an_esd);
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (dsi && (codec_id==GF_CODECID_AAC_MPEG4)) {
+			GF_M4ADecSpecInfo acfg;
+			gf_m4a_get_config(dsi, dsi_size, &acfg);
+			if (acfg.base_object_type == GF_M4A_USAC)
+				codec_id = GF_CODECID_USAC;
+		}
+#endif
+
 	} else {
-		u32 pcm_flags, pcm_size;
+		u32 i, pcm_flags, pcm_size;
 		Bool load_default = GF_FALSE;
+
+		if (an_esd)
+			gf_odf_desc_del((GF_Descriptor *)an_esd);
+
 		lang_desc = (GF_Language *) gf_odf_desc_new(GF_ODF_LANG_TAG);
 		gf_isom_get_media_language(read->mov, track, &lang_desc->full_lang_code);
 		esid = gf_isom_get_track_id(read->mov, track);
@@ -228,22 +261,10 @@
 			else
 				pix_fmt = GF_PIXEL_RGB;
 			break;
-		case GF_QT_SUBTYPE_YUV422:
-			codec_id = GF_CODECID_RAW;
-			pix_fmt = GF_PIXEL_YUV422;
-			break;
-		case GF_QT_SUBTYPE_YUV444:
-			codec_id = GF_CODECID_RAW;
-			pix_fmt = GF_PIXEL_YUV444;
-			break;
 		case GF_QT_SUBTYPE_YUV422_10:
-			codec_id = GF_CODECID_RAW;
-			pix_fmt = GF_PIXEL_YUV422_10;
-			break;
-		case GF_QT_SUBTYPE_YUV444_10:
-			codec_id = GF_CODECID_RAW;
-			pix_fmt = GF_PIXEL_YUV444_10;
+			codec_id = GF_CODECID_V210;
 			break;
+
 		case GF_ISOM_SUBTYPE_IPCM:
 			if (gf_isom_get_pcm_config(read->mov, track, stsd_idx, &pcm_flags, &pcm_size) == GF_OK) {
 				codec_id = GF_CODECID_RAW;
@@ -258,13 +279,94 @@
 				audio_fmt = (pcm_size==64) ? GF_AUDIO_FMT_DBL : GF_AUDIO_FMT_FLT;
 			}
 			break;
-		case GF_ISOM_SUBTYPE_MP3:
-			codec_id = GF_CODECID_MPEG_AUDIO;
+
+		case GF_ISOM_SUBTYPE_VVC1:
+		case GF_ISOM_SUBTYPE_VVI1:
+		{
+			GF_VVCConfig *vvccfg = gf_isom_vvc_config_get(read->mov, track, stsd_idx);
+			if (vvccfg) {
+				gf_odf_vvc_cfg_write(vvccfg, &dsi, &dsi_size);
+				gf_odf_vvc_cfg_del(vvccfg);
+			}
+			codec_id = GF_CODECID_VVC;
+		}
 			break;
+		case GF_ISOM_SUBTYPE_VVS1:
+			base_tile_track = 0;
+			codec_id = gf_isom_get_track_group(read->mov, track, GF_4CC('a','l','t','e') );
+			for (i=0; i<gf_isom_get_track_count(read->mov); i++) {
+				u32 j, nb_refs = gf_isom_get_reference_count(read->mov, i+1, GF_ISOM_REF_SUBPIC);
+				for (j=0; j<nb_refs; j++) {
+					u32 ref_tk=0;
+					gf_isom_get_reference_ID(read->mov, i+1, GF_ISOM_REF_SUBPIC, j+1, &ref_tk);
+					if ((ref_tk == esid) || (ref_tk == codec_id)) {
+						base_tile_track = i+1;
+						depends_on_id = gf_isom_get_track_id(read->mov, base_tile_track);
+						break;
+					}
+				}
+				if (base_tile_track) break;
+			}
+			if (!base_tile_track) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] VVC subpicture track ID %d with no base VVC track referencing it, ignoring\n", esid));
+				if (lang_desc) gf_odf_desc_del((GF_Descriptor *)lang_desc);
+				if (dsi) gf_free(dsi);
+				return;
+			}
+			codec_id = GF_CODECID_VVC_SUBPIC;
+			gf_isom_get_tile_info(read->mov, track, 1, NULL, &srd_id, &srd_indep, &srd_full_frame, &srd_x, &srd_y, &srd_w, &srd_h);
+			break;
+
+		case GF_ISOM_SUBTYPE_AC3:
+		case GF_ISOM_SUBTYPE_EC3:
+		{
+			GF_AC3Config *ac3cfg = gf_isom_ac3_config_get(read->mov, track, stsd_idx);
+			codec_id = (m_subtype==GF_ISOM_SUBTYPE_AC3) ? GF_CODECID_AC3 : GF_CODECID_EAC3;
+			if (ac3cfg) {
+				gf_odf_ac3_cfg_write(ac3cfg, &dsi, &dsi_size);
+				gf_free(ac3cfg);
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Track %d missing AC3/EC3 configuration !\n", track));
+			}
+		}
+			break;
+
+		case GF_ISOM_SUBTYPE_MLPA:
+		{
+			u32 fmt, prate;
+			if (gf_isom_truehd_config_get(read->mov, track, stsd_idx, &fmt, &prate) == GF_OK) {
+				GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				gf_bs_write_u32(bs, fmt);
+				gf_bs_write_int(bs, prate, 15);
+				gf_bs_write_int(bs, 0, 1);
+				gf_bs_write_u32(bs, 0);
+				gf_bs_get_content(bs, &dsi, &dsi_size);
+				gf_bs_del(bs);
+				codec_id = GF_CODECID_TRUEHD;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Track %d missing TrueHD configuration !\n", track));
+			}
+			break;
+		}
+
 
 		default:
 			codec_id = gf_codec_id_from_isobmf(m_subtype);
-			if (!codec_id)
+			if (!codec_id) {
+				pix_fmt=0;
+				if (streamtype==GF_STREAM_VISUAL) {
+					pix_fmt = gf_pixel_fmt_from_qt_type(m_subtype);
+					if (!pix_fmt && gf_pixel_fmt_probe(m_subtype, NULL))
+						pix_fmt = m_subtype;
+				}
+
+ 				if (pix_fmt) {
+					codec_id = GF_CODECID_RAW;
+				} else {
+					load_default = GF_TRUE;
+				}
+			}
+			else if (codec_id==GF_CODECID_FFV1)
 				load_default = GF_TRUE;
 			break;
 		}
@@ -277,21 +379,29 @@
 			}
 			udesc = gf_isom_get_generic_sample_description(read->mov, track, stsd_idx);
 			if (udesc) {
-				dsi = udesc->extension_buf;
-				dsi_size = udesc->extension_buf_size;
-				udesc->extension_buf = NULL;
-				udesc->extension_buf_size = 0;
+				if ((codec_id==GF_CODECID_FFV1) && (udesc->extension_buf_size>8)) {
+					dsi = gf_malloc(udesc->extension_buf_size-8);
+					if (dsi) memcpy(dsi, udesc->extension_buf+8, udesc->extension_buf_size-8);
+					dsi_size = udesc->extension_buf_size - 8;
+				} else {
+					dsi = udesc->extension_buf;
+					dsi_size = udesc->extension_buf_size;
+					udesc->extension_buf = NULL;
+					udesc->extension_buf_size = 0;
+				}
 			}
 		}
 	}
 	if (!streamtype || !codec_id) {
 		if (udesc) gf_free(udesc);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] Failed to %s pid for track %d, couldnot extract codec/streamtype info\n", ch ? "update" : "create", track));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] Failed to %s pid for track %d, could not extract codec/streamtype info\n", ch ? "update" : "create", track));
 		if (lang_desc) gf_odf_desc_del((GF_Descriptor *)lang_desc);
 		if (dsi) gf_free(dsi);
 		return;
 	}
 
+	mime_cfg = gf_isom_subtitle_get_mime(read->mov, track, stsd_idx);
+
 	//first setup, creation of PID and channel
 	if (!ch) {
 		Bool use_sidx_dur = GF_FALSE;
@@ -349,6 +459,21 @@
 			default:
 				break;
 			}
+
+			if (!has_scalable_layers) {
+				u32 i;
+				GF_ISOTrackID track_id = gf_isom_get_track_id(read->mov, track);
+				for (i=0; i<gf_isom_get_track_count(read->mov); i++) {
+					if (gf_isom_get_reference_count(read->mov, i+1, GF_ISOM_REF_BASE)>=0) {
+						GF_ISOTrackID tkid;
+						gf_isom_get_reference_ID(read->mov, i+1, GF_ISOM_REF_BASE, 1, &tkid);
+						if (tkid==track_id) {
+							has_scalable_layers = GF_TRUE;
+							break;
+						}
+					}
+				}
+			}
 		}
 
 		if (base_track && !ocr_es_id) {
@@ -393,8 +518,14 @@
 			gf_filter_pid_set_property(pid, GF_PROP_PID_TRACK_NUM, &PROP_UINT(track) );
 
 		//Dolby Vision
-		if (m_subtype == GF_ISOM_SUBTYPE_DVHE) {
-			GF_DOVIDecoderConfigurationRecord *dovi = gf_isom_dovi_config_get(read->mov, track, 1);
+		switch (m_subtype) {
+		case GF_ISOM_SUBTYPE_DVHE:
+		case GF_ISOM_SUBTYPE_DVH1:
+		case GF_ISOM_SUBTYPE_DVA1:
+		case GF_ISOM_SUBTYPE_DVAV:
+		case GF_ISOM_SUBTYPE_DAV1:
+		{
+			GF_DOVIDecoderConfigurationRecord *dovi = gf_isom_dovi_config_get(read->mov, track, stsd_idx);
 			if (dovi) {
 				u8 *data = NULL;
 				u32 size = 0;
@@ -404,8 +535,16 @@
 				gf_filter_pid_set_property(pid, GF_PROP_PID_DOLBY_VISION, &PROP_DATA_NO_COPY(data, size));
 				gf_bs_del(bs);
 				gf_odf_dovi_cfg_del(dovi);
+
+				if (gf_isom_get_reference_count(read->mov, track, GF_4CC('v','d','e','p'))) {
+					GF_ISOTrackID ref_id=0;
+					gf_isom_get_reference_ID(read->mov, track, GF_4CC('v','d','e','p'), 1, &ref_id);
+					if (ref_id) gf_filter_pid_set_property(pid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(ref_id));
+				}
 			}
 		}
+			break;
+		}
 
 		//create our channel
 		ch = isor_create_channel(read, pid, track, 0, (codec_id==GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE);
@@ -420,6 +559,7 @@
 			lang_desc = NULL;
 		}
 
+		ch->streamType = streamtype;
 
 		if (has_scalable_layers)
 			gf_filter_pid_set_property(pid, GF_PROP_PID_SCALABLE, &PROP_BOOL(GF_TRUE));
@@ -427,6 +567,9 @@
 		if (gf_isom_get_reference_count(read->mov, track, GF_ISOM_REF_SABT)>0) {
 			gf_filter_pid_set_property(pid, GF_PROP_PID_TILE_BASE, &PROP_BOOL(GF_TRUE));
 		}
+		else if (gf_isom_get_reference_count(read->mov, track, GF_ISOM_REF_SUBPIC)>0) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_TILE_BASE, &PROP_BOOL(GF_TRUE));
+		}
 
 		if (srd_w && srd_h) {
 			gf_filter_pid_set_property(pid, GF_PROP_PID_CROP_POS, &PROP_VEC2I_INT(srd_x, srd_y) );
@@ -438,26 +581,12 @@
 			}
 		}
 
-		for (exp_refs=0; exp_refs<3; exp_refs++) {
-			u32 rtype = (exp_refs==2) ? GF_ISOM_REF_TBAS : exp_refs ? GF_ISOM_REF_SABT : GF_ISOM_REF_SCAL;
-			const char *rname = (exp_refs==2) ? "isom:tbas" : exp_refs ? "isom:sabt" : "isom:scal";
-			if (!exp_refs && (codec_id==GF_CODECID_LHVC))
-				continue;
 
-			nb_refs = gf_isom_get_reference_count(read->mov, track, rtype);
-			if (nb_refs) {
-				u32 j;
-				GF_PropertyValue prop;
-				prop.type = GF_PROP_UINT_LIST;
-				prop.value.uint_list.nb_items = nb_refs;
-				prop.value.uint_list.vals = gf_malloc(sizeof(u32)*nb_refs);
-				for (j=0; j<nb_refs; j++) {
-					gf_isom_get_reference(read->mov, track, rtype, j+1, &prop.value.uint_list.vals[j] );
-				}
-				gf_filter_pid_set_property_str(pid, rname, &prop);
-				gf_free(prop.value.uint_list.vals);
-			}
-		}
+		if (codec_id !=GF_CODECID_LHVC)
+			isor_export_ref(read, ch, GF_ISOM_REF_SCAL, "isom:scal");
+		isor_export_ref(read, ch, GF_ISOM_REF_SABT, "isom:sabt");
+		isor_export_ref(read, ch, GF_ISOM_REF_TBAS, "isom:tbas");
+		isor_export_ref(read, ch, GF_ISOM_REF_SUBPIC, "isom:subp");
 
 		ch->duration = gf_isom_get_track_duration(read->mov, ch->track);
 		if (!ch->duration) {
@@ -469,7 +598,7 @@
 			u32 ts;
 			u64 dur;
 			if (gf_isom_get_sidx_duration(read->mov, &dur, &ts)==GF_OK) {
-				dur *= read->time_scale;
+				dur *= read->timescale;
 				dur /= ts;
 				ch->duration = dur;
 				use_sidx_dur = GF_TRUE;
@@ -480,31 +609,41 @@
 		if (!read->mem_load_mode) {
 			//if no edit list (whether complex or simple TS offset) and no sidx, use media duration
 			if (!ch->has_edit_list && !use_sidx_dur && !ch->ts_offset) {
-				u64 dur = gf_isom_get_media_duration(read->mov, ch->track);
-				gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(dur, ch->time_scale));
+				//no specific edit list type but edit present, use the duration in the edit
+				if (gf_isom_get_edits_count(read->mov, ch->track)) {
+					u64 dur = gf_isom_get_track_duration(read->mov, ch->track);
+					gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(dur, read->timescale));
+				} else {
+					u64 dur = gf_isom_get_media_duration(read->mov, ch->track);
+					gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(dur, ch->timescale));
+				}
 			}
 			//otherwise trust track duration
 			else {
-				gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(ch->duration, read->time_scale));
+				gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(ch->duration, read->timescale));
 			}
 			gf_filter_pid_set_property(pid, GF_PROP_PID_NB_FRAMES, &PROP_UINT(sample_count));
 		}
 
 		if (sample_count && (streamtype==GF_STREAM_VISUAL)) {
 			u64 mdur = gf_isom_get_media_duration(read->mov, track);
+			//if ts_offset is negative (skip), update media dur before computing fps
+			if (!gf_sys_old_arch_compat() && (ch->ts_offset<0))
+				mdur -= (u32) -ch->ts_offset;
+
 			mdur /= sample_count;
-			gf_filter_pid_set_property(pid, GF_PROP_PID_FPS, &PROP_FRAC_INT(ch->time_scale, (u32) mdur));
+			gf_filter_pid_set_property(pid, GF_PROP_PID_FPS, &PROP_FRAC_INT(ch->timescale, (u32) mdur));
 		}
 
 		track_dur = (Double) (s64) ch->duration;
-		track_dur /= read->time_scale;
+		track_dur /= read->timescale;
 		//move channel duration in media timescale
-		ch->duration = (u32) (track_dur * ch->time_scale);
+		ch->duration = (u64) (track_dur * ch->timescale);
 
 
 		//set stream subtype
 		mtype = gf_isom_get_media_type(read->mov, track);
-		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_SUBTYPE, &PROP_UINT(mtype) );
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_SUBTYPE, &PROP_4CC(mtype) );
 
 		if (!read->mem_load_mode) {
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_MEDIA_DATA_SIZE, &PROP_LONGUINT(gf_isom_get_media_data_size(read->mov, track) ) );
@@ -527,12 +666,12 @@
 		}
 
 		GF_PropertyValue brands;
-		brands.type = GF_PROP_UINT_LIST;
+		brands.type = GF_PROP_4CC_LIST;
 		u32 major_brand=0;
 		gf_isom_get_brand_info(read->mov, &major_brand, NULL, &brands.value.uint_list.nb_items);
 		brands.value.uint_list.vals = (u32 *) gf_isom_get_brands(read->mov);
 		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_BRANDS, &brands);
-		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_MBRAND, &PROP_UINT(major_brand) );
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_MBRAND, &PROP_4CC(major_brand) );
 
 		//we cannot expose average size/dur in mem mode with fragmented files (sample_count=0)
 		if (sample_count) {
@@ -645,54 +784,58 @@
 
 		u32 idx=0;
 		while (1) {
-			u32 tag_len;
-			const u8 *tag;
-			u32 itag;
-			const char *name = gf_itags_enum_tags(&idx, &itag, NULL, NULL);
-			if (!name) break;
-			if (gf_isom_apple_get_tag(read->mov, itag, &tag, &tag_len)==GF_OK) {
-				switch (itag) {
-				case GF_ISOM_ITUNE_TRACK:
-				case GF_ISOM_ITUNE_TRACKNUMBER:
-				case GF_ISOM_ITUNE_DISK:
-					if (tag_len>=6) {
-						u16 tk_n = (tag[2]<<8)|tag[3];
-						u16 tk_all = (tag[4]<<8)|tag[5];
-						gf_filter_pid_set_property_str(ch->pid, name, &PROP_FRAC_INT(tk_n, tk_all) );
-					}
-					break;
-				case GF_ISOM_ITUNE_GAPLESS:
-				case GF_ISOM_ITUNE_COMPILATION:
-					if (tag_len)
-						gf_filter_pid_set_property_str(ch->pid, name, &PROP_BOOL(tag[0]) );
-					break;
-				case GF_ISOM_ITUNE_GENRE:
-					if (tag_len>=2) {
-						u32 genre_t = tag[0]<<8 | tag[1];
-						const char *genre = gf_id3_get_genre(genre_t);
-						if (genre) {
-							gf_filter_pid_set_property_str(ch->pid, name, &PROP_STRING(genre) );
-							break;
-						}
-					}
-					gf_filter_pid_set_property_str(ch->pid, name, &PROP_STRING(tag) );
-					break;
-				case GF_ISOM_ITUNE_TEMPO:
-					if (tag_len==2) {
-						u32 tempo = tag[0]<<8 | tag[1];
-						gf_filter_pid_set_property_str(ch->pid, name, &PROP_UINT(tempo) );
-					} else {
-						gf_filter_pid_set_property_str(ch->pid, name, &PROP_STRING(tag) );
-					}
-					break;
+			u32 data_len, int_val2, flags;
+			u64 int_val;
+			const char *name;
+			const u8 *data;
+			GF_ISOiTunesTag itag;
+			u32 itype = 0;
+			s32 tag_idx;
+
+			e = gf_isom_apple_enum_tag(read->mov, idx, &itag, &data, &data_len, &int_val, &int_val2, &flags);
+			if (e) break;
+			idx++;
+
+			//do not expose tool
+			if (!gf_sys_is_test_mode() && (itag == GF_ISOM_ITUNE_TOOL))
+				continue;
 
-				default:
-					gf_filter_pid_set_property_str(ch->pid, name, &PROP_STRING(tag) );
+			tag_idx = gf_itags_find_by_itag(itag);
+			if (tag_idx>=0)
+				itype = gf_itags_get_type(tag_idx);
+
+			name = gf_itags_get_name(tag_idx);
+			switch (itype) {
+			case GF_ITAG_BOOL:
+				gf_filter_pid_set_property_str(ch->pid, name, &PROP_BOOL((Bool) int_val ) );
+				break;
+			case GF_ITAG_INT8:
+			case GF_ITAG_INT16:
+			case GF_ITAG_INT32:
+				gf_filter_pid_set_property_str(ch->pid, name, &PROP_UINT((u32) int_val ) );
+				break;
+			case GF_ITAG_INT64:
+				gf_filter_pid_set_property_str(ch->pid, name, &PROP_LONGUINT(int_val) );
+				break;
+			case GF_ITAG_FRAC8:
+			case GF_ITAG_FRAC6:
+				gf_filter_pid_set_property_str(ch->pid, name, &PROP_FRAC_INT((s32) int_val, int_val2) );
+				break;
+			case GF_ITAG_FILE:
+				if (data && data_len)
+					gf_filter_pid_set_property_str(ch->pid, name, &PROP_DATA((u8 *)data, data_len) );
+				break;
+			default:
+				if (data && data_len) {
+					if (gf_utf8_is_legal(data, data_len))
+						gf_filter_pid_set_property_str(ch->pid, name, &PROP_STRING(data) );
+					else
+						gf_filter_pid_set_property_str(ch->pid, name, &PROP_DATA((u8 *)data, data_len) );
 				}
+				break;
 			}
 		}
 
-
 		if (codec_id==GF_CODECID_TMCD) {
 			u32 tmcd_flags=0, tmcd_fps_num=0, tmcd_fps_den=0, tmcd_fpt=0;
 			gf_isom_get_tmcd_config(read->mov, track, stsd_idx, &tmcd_flags, &tmcd_fps_num, &tmcd_fps_den, &tmcd_fpt);
@@ -702,7 +845,14 @@
 
 		}
 
+		if (gf_sys_old_arch_compat()) {
+			Bool gf_isom_has_time_offset_table(GF_ISOFile *the_file, u32 trackNumber);
+			if (gf_isom_has_time_offset_table(read->mov, ch->track))
+				gf_filter_pid_set_property_str(ch->pid, "isom_force_ctts", &PROP_BOOL(GF_TRUE) );
+		}
+
 		if (!gf_sys_is_test_mode()) {
+			u32 nb_udta, alt_grp=0;
 			const char *hdlr = NULL;
 			gf_isom_get_handler_name(read->mov, ch->track, &hdlr);
 			if (hdlr)
@@ -710,26 +860,66 @@
 
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_TRACK_FLAGS, &PROP_UINT( gf_isom_get_track_flags(read->mov, ch->track) ));
 
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_TRACK_FLAGS, &PROP_UINT( gf_isom_get_track_flags(read->mov, ch->track) ));
+
+			gf_isom_get_track_switch_group_count(read->mov, ch->track, &alt_grp, NULL);
+			if (alt_grp)
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_ALT_GROUP, &PROP_UINT( alt_grp ));
+
+
 			if (streamtype==GF_STREAM_VISUAL) {
 				GF_PropertyValue p;
 				u32 vals[9];
 				memset(vals, 0, sizeof(u32)*9);
 				memset(&p, 0, sizeof(GF_PropertyValue));
-				p.type = GF_PROP_UINT_LIST;
+				p.type = GF_PROP_SINT_LIST;
 				p.value.uint_list.nb_items = 9;
 				p.value.uint_list.vals = vals;
 				gf_isom_get_track_matrix(read->mov, ch->track, vals);
 				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_TRACK_MATRIX, &p);
 			}
+
+
+			nb_udta = gf_isom_get_udta_count(read->mov, ch->track);
+			if (nb_udta) {
+				for (i=0; i<nb_udta; i++) {
+					u32 j, type, nb_items;
+					bin128 uuid;
+					gf_isom_get_udta_type(read->mov, ch->track, i+1, &type, &uuid);
+					nb_items = gf_isom_get_user_data_count(read->mov, ch->track, type, uuid);
+					//we only export 4CC udta boxes
+					if (!type) continue;
+
+					for (j=0; j<nb_items; j++) {
+						char szName[31];
+						u8 *udta=NULL;
+						u32 udta_size;
+						gf_isom_get_user_data(read->mov, ch->track, type, uuid, j+1, &udta, &udta_size);
+						if (!udta || !udta_size) continue;
+						if (nb_items>1)
+							snprintf(szName, 30, "udta_%s_%d", gf_4cc_to_str(type), j+1);
+						else
+							snprintf(szName, 30, "udta_%s", gf_4cc_to_str(type));
+						szName[30]=0;
+						if (gf_utf8_is_legal(udta, udta_size)) {
+							gf_filter_pid_set_property_dyn(ch->pid, szName, &PROP_STRING_NO_COPY(udta));
+						} else {
+							gf_filter_pid_set_property_dyn(ch->pid, szName, &PROP_DATA_NO_COPY(udta, udta_size));
+						}
+					}
+				}
+			}
 		}
 	}
 
 	//update decoder configs
-	ch->check_avc_ps = ch->check_hevc_ps = GF_FALSE;
+	ch->check_avc_ps = ch->check_hevc_ps = ch->check_vvc_ps = GF_FALSE;
 	if (ch->avcc) gf_odf_avc_cfg_del(ch->avcc);
 	ch->avcc = NULL;
 	if (ch->hvcc) gf_odf_hevc_cfg_del(ch->hvcc);
 	ch->hvcc = NULL;
+	if (ch->vvcc) gf_odf_vvc_cfg_del(ch->vvcc);
+	ch->vvcc = NULL;
 
 	if (lang_desc) {
 		gf_odf_desc_del((GF_Descriptor *)lang_desc);
@@ -770,7 +960,6 @@
 			}
 			if (hvcc) gf_odf_hevc_cfg_del(hvcc);
 			if (lhcc) gf_odf_hevc_cfg_del(lhcc);
-
 		}
 		if ((codec_id==GF_CODECID_AVC) || (codec_id==GF_CODECID_SVC) || (codec_id==GF_CODECID_MVC)) {
 			Bool is_mvc = GF_FALSE;
@@ -807,6 +996,14 @@
 			if (avcc) gf_odf_avc_cfg_del(avcc);
 			if (svcc) gf_odf_avc_cfg_del(svcc);
 		}
+
+		if (!gf_sys_is_test_mode()) {
+			u64 create_date, modif_date;
+			gf_isom_get_creation_time(read->mov, &create_date, &modif_date);
+			gf_filter_pid_set_property_str(ch->pid, "isom:creation_date", &PROP_LONGUINT(create_date));
+			gf_filter_pid_set_property_str(ch->pid, "isom:modification_date", &PROP_LONGUINT(modif_date));
+		}
+
 	}
 
 	//all stsd specific init/reconfig
@@ -833,6 +1030,7 @@
 	w = h = 0;
 	gf_isom_get_visual_info(read->mov, track, stsd_idx, &w, &h);
 	if (w && h) {
+		GF_ISOM_Y3D_Info yt3d;
 		u32 hspace, vspace;
 		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_WIDTH, &PROP_UINT(w));
 		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_HEIGHT, &PROP_UINT(h));
@@ -840,9 +1038,54 @@
 		gf_isom_get_pixel_aspect_ratio(read->mov, track, stsd_idx, &hspace, &vspace);
 		if (hspace != vspace)
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_SAR, &PROP_FRAC_INT(hspace, vspace) );
+
+		{
+			u32 colour_type;
+			u16 colour_primaries, transfer_characteristics, matrix_coefficients;
+			Bool full_range_flag;
+			if (GF_OK == gf_isom_get_color_info(read->mov, track, stsd_idx,
+				&colour_type, &colour_primaries, &transfer_characteristics, &matrix_coefficients, &full_range_flag)) {
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_COLR_PRIMARIES, &PROP_UINT(colour_primaries));
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_COLR_TRANSFER, &PROP_UINT(transfer_characteristics));
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_COLR_MX, &PROP_UINT(matrix_coefficients));
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(full_range_flag));
+			}
+		}
+
+		e = gf_isom_get_y3d_info(ch->owner->mov, ch->track, stsd_idx, &yt3d);
+		if (e==GF_OK) {
+			if (yt3d.stereo_type) {
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_STEREO_TYPE, &PROP_UINT(yt3d.stereo_type));
+			} else {
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_STEREO_TYPE, NULL);
+			}
+
+			if (yt3d.projection_type) {
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PROJECTION_TYPE, &PROP_UINT(yt3d.projection_type));
+				if (yt3d.projection_type==GF_PROJ360_CUBE_MAP) {
+					gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CUBE_MAP_PAD, yt3d.padding ? &PROP_UINT(yt3d.padding) : NULL);
+				}
+				else if (yt3d.projection_type==GF_PROJ360_EQR) {
+					if (yt3d.top || yt3d.bottom || yt3d.left || yt3d.right)
+						gf_filter_pid_set_property(ch->pid, GF_PROP_PID_EQR_CLAMP, &PROP_VEC4I_INT(yt3d.top, yt3d.bottom , yt3d.left , yt3d.right));
+					else
+						gf_filter_pid_set_property(ch->pid, GF_PROP_PID_EQR_CLAMP, NULL);
+				}
+			} else {
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PROJECTION_TYPE, NULL);
+			}
+			if (yt3d.pose_present) {
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_VR_POSE, &PROP_VEC3I_INT(yt3d.yaw, yt3d.pitch, yt3d.roll) );
+			} else {
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_VR_POSE, NULL);
+			}
+		}
 	}
 	sr = nb_ch = nb_bps = 0;
 	gf_isom_get_audio_info(read->mov,track, stsd_idx, &sr, &nb_ch, &nb_bps);
+	if (streamtype==GF_STREAM_AUDIO) {
+		if (!sr) sr = gf_isom_get_media_timescale(read->mov, track);
+	}
 	//nb_ch may be set to 0 for "not applicable" (3D / object coding audio)
 	if (sr) {
 		u32 d1, d2;
@@ -869,12 +1112,29 @@
 			d2 = gf_isom_get_sample_duration(read->mov, ch->track, 2);
 			if (d1 && d2 && (d1==d2)) {
 				d1 *= sr;
-				d1 /= ch->time_scale;
+				d1 /= ch->timescale;
 				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_SAMPLES_PER_FRAME, &PROP_UINT(d1));
 			}
 		}
+
+		if ((codec_id==GF_CODECID_MPHA) || (codec_id==GF_CODECID_MHAS)) {
+			u32 nb_profiles;
+			const u8 *prof_compat = gf_isom_get_mpegh_compatible_profiles(read->mov, ch->track, stsd_idx, &nb_profiles);
+			if (prof_compat) {
+				u32 j;
+				GF_PropertyValue prop;
+				prop.type = GF_PROP_UINT_LIST;
+				prop.value.uint_list.nb_items = nb_profiles;
+				prop.value.uint_list.vals = gf_malloc(sizeof(u32)*nb_profiles);
+				for (j=0; j<nb_profiles; j++)
+					prop.value.uint_list.vals[j] = prof_compat[j];
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_MHA_COMPATIBLE_PROFILES, &prop);
+				gf_free(prop.value.uint_list.vals);
+			}
+		}
 	}
 
+
 	gf_isom_get_bitrate(read->mov, ch->track, stsd_idx, &avg_rate, &max_rate, &buffer_size);
 
 	if (!avg_rate) {
@@ -893,8 +1153,18 @@
 	if (encoding) gf_filter_pid_set_property_str(ch->pid, "meta:encoding", &PROP_STRING(encoding) );
 	if (namespace) gf_filter_pid_set_property_str(ch->pid, "meta:xmlns", &PROP_STRING(namespace) );
 	if (schemaloc) gf_filter_pid_set_property_str(ch->pid, "meta:schemaloc", &PROP_STRING(schemaloc) );
+	if (mime_cfg) gf_filter_pid_set_property_str(ch->pid, "meta:mime", &PROP_STRING(mime_cfg) );
+	else if ((m_subtype==GF_ISOM_SUBTYPE_STPP) && namespace && strstr(namespace, "ns/ttml")) {
+		mime_cfg = "application/ttml+xml;codecs=im1t";
+		if (gf_isom_sample_has_subsamples(read->mov, track, 0, 0) )
+			mime_cfg = "application/ttml+xml;codecs=im1i";
+		gf_filter_pid_set_property_str(ch->pid, "meta:mime", &PROP_STRING(mime_cfg) );
+	}
+
+	if (!gf_sys_is_test_mode() && (m_subtype==GF_ISOM_SUBTYPE_MPEG4))
+		m_subtype = gf_isom_get_mpeg4_subtype(read->mov, ch->track, stsd_idx);
 
-	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_SUBTYPE, &PROP_UINT(m_subtype) );
+	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_SUBTYPE, &PROP_4CC(m_subtype) );
 	if (stxtcfg) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((char *)stxtcfg, (u32) strlen(stxtcfg) ));
 
 
@@ -932,18 +1202,23 @@
 			gf_filter_pid_set_property_str(ch->pid, "meta:mime", &PROP_STRING(dims.mime_type));
 	}
 	else if (codec_id==GF_CODECID_AVC)
-		ch->check_avc_ps = GF_TRUE;
+		ch->check_avc_ps = (ch->owner->xps_check==MP4DMX_XPS_REMOVE) ? GF_TRUE : GF_FALSE;
 	else if (codec_id==GF_CODECID_HEVC)
-		ch->check_hevc_ps = GF_TRUE;
+		ch->check_hevc_ps = (ch->owner->xps_check==MP4DMX_XPS_REMOVE) ? GF_TRUE : GF_FALSE;
+	else if (codec_id==GF_CODECID_VVC)
+		ch->check_vvc_ps = (ch->owner->xps_check==MP4DMX_XPS_REMOVE) ? GF_TRUE : GF_FALSE;
 	else if (codec_id==GF_CODECID_MHAS) {
 		if (!dsi) {
 			ch->check_mhas_pl = GF_TRUE;
 			GF_ISOSample *samp = gf_isom_get_sample(ch->owner->mov, ch->track, 1, NULL);
 			if (samp) {
-				s32 PL = gf_mpegh_get_mhas_pl(samp->data, samp->dataLength);
+				u64 ch_layout=0;
+				s32 PL = gf_mpegh_get_mhas_pl(samp->data, samp->dataLength, &ch_layout);
 				if (PL>0) {
 					gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PROFILE_LEVEL, &PROP_UINT((u32) PL));
 					ch->check_mhas_pl = GF_FALSE;
+					if (ch_layout)
+						gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(ch_layout));
 				}
 				gf_isom_sample_del(&samp);
 			}
@@ -992,12 +1267,62 @@
 	else if (ch->check_hevc_ps) {
 		ch->hvcc = gf_isom_hevc_config_get(ch->owner->mov, ch->track, ch->last_sample_desc_index ? ch->last_sample_desc_index : 1);
 	}
+	else if (ch->check_vvc_ps) {
+		ch->vvcc = gf_isom_vvc_config_get(ch->owner->mov, ch->track, ch->last_sample_desc_index ? ch->last_sample_desc_index : 1);
+	}
+
+	if (streamtype==GF_STREAM_VISUAL) {
+		u32 cwn, cwd, chn, chd, cxn, cxd, cyn, cyd;
+		gf_isom_get_clean_aperture(ch->owner->mov, ch->track, ch->last_sample_desc_index ? ch->last_sample_desc_index : 1, &cwn, &cwd, &chn, &chd, &cxn, &cxd, &cyn, &cyd);
+
+		if (cwd && chd && cxd && cyd) {
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_W, &PROP_FRAC_INT(cwn, cwd) );
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_H, &PROP_FRAC_INT(chn, chd) );
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_X, &PROP_FRAC_INT(cxn, cxd) );
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_Y, &PROP_FRAC_INT(cyn, cyd) );
+		} else {
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_W, NULL);
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_H, NULL);
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_X, NULL);;
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_Y, NULL);
+		}
+
+		const GF_MasteringDisplayColourVolumeInfo *mdcv = gf_isom_get_mastering_display_colour_info(ch->owner->mov, ch->track,ch->last_sample_desc_index ? ch->last_sample_desc_index : 1);
+		if (mdcv) {
+			u8 *pdata;
+			u32 psize, c;
+			GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+			for(c=0;c<3;c++) {
+				gf_bs_write_u16(bs, mdcv->display_primaries[c].x);
+				gf_bs_write_u16(bs, mdcv->display_primaries[c].x);
+			}
+			gf_bs_write_u16(bs, mdcv->white_point_x);
+			gf_bs_write_u16(bs, mdcv->white_point_y);
+			gf_bs_write_u32(bs, mdcv->max_display_mastering_luminance);
+			gf_bs_write_u32(bs, mdcv->min_display_mastering_luminance);
+			gf_bs_get_content(bs, &pdata, &psize);
+			gf_bs_del(bs);
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_MASTER_DISPLAY_COLOUR, &PROP_DATA_NO_COPY(pdata, psize));
+		}
+
+		const GF_ContentLightLevelInfo *clli = gf_isom_get_content_light_level_info(ch->owner->mov, ch->track,ch->last_sample_desc_index ? ch->last_sample_desc_index : 1);
+		if (clli) {
+			u8 *pdata;
+			u32 psize;
+			GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			gf_bs_write_u16(bs, clli->max_content_light_level);
+			gf_bs_write_u16(bs, clli->max_pic_average_light_level);
+			gf_bs_get_content(bs, &pdata, &psize);
+			gf_bs_del(bs);
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CONTENT_LIGHT_LEVEL, &PROP_DATA_NO_COPY(pdata, psize));
+		}
+	}
 }
 
 void isor_update_channel_config(ISOMChannel *ch)
 {
-	isor_declare_track(ch->owner, ch, ch->track, ch->last_sample_desc_index, GF_STREAM_UNKNOWN, GF_FALSE);
-
+	isor_declare_track(ch->owner, ch, ch->track, ch->last_sample_desc_index, ch->streamType, GF_FALSE);
 }
 
 GF_Err isor_declare_objects(ISOMReader *read)
@@ -1161,7 +1486,7 @@
 			GF_FilterPid *cover_pid=NULL;
 			e = gf_filter_pid_raw_new(read->filter, NULL, NULL, NULL, NULL, (char *) tag, tlen, GF_FALSE, &cover_pid);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[MP3Dmx] error setting up video pid for cover art: %s\n", gf_error_to_string(e) ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP3Dmx] error setting up video pid for cover art: %s\n", gf_error_to_string(e) ));
 			}
 			if (cover_pid) {
 				u8 *out_buffer;
@@ -1169,9 +1494,11 @@
 				gf_filter_pid_set_property(cover_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
 				gf_filter_pid_set_name(cover_pid, "CoverArt");
 				dst_pck = gf_filter_pck_new_alloc(cover_pid, tlen, &out_buffer);
-				gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
-				memcpy(out_buffer, tag, tlen);
-				gf_filter_pck_send(dst_pck);
+				if (dst_pck) {
+					gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+					memcpy(out_buffer, tag, tlen);
+					gf_filter_pck_send(dst_pck);
+				}
 				gf_filter_pid_set_eos(cover_pid);
 			}
 		}
@@ -1185,31 +1512,60 @@
 	GF_FilterPid *pid;
 	GF_ESD *esd;
 	u32 item_id=0;
+	u32 scheme_type=0, scheme_version=0, item_type;
 	const char *item_name, *item_mime_type, *item_encoding;
 
+retry:
+
 	if (item_idx>gf_isom_get_meta_item_count(read->mov, GF_TRUE, 0))
 		return GF_FALSE;
 
 	item_name = item_mime_type = item_encoding = NULL;
-	gf_isom_get_meta_item_info(read->mov, GF_TRUE, 0, item_idx, &item_id, NULL, NULL, NULL, NULL, NULL, &item_name, &item_mime_type, &item_encoding);
+	gf_isom_get_meta_item_info(read->mov, GF_TRUE, 0, item_idx, &item_id, &item_type, &scheme_type, &scheme_version, NULL, NULL, NULL, &item_name, &item_mime_type, &item_encoding);
 
 	if (!item_id) return GF_FALSE;
+	if (item_type==GF_ISOM_ITEM_TYPE_AUXI) return GF_FALSE;
 
 	gf_isom_get_meta_image_props(read->mov, GF_TRUE, 0, item_id, &props);
 
+	//check we support the protection scheme
+	switch (scheme_type) {
+	case GF_ISOM_CBC_SCHEME:
+	case GF_ISOM_CENS_SCHEME:
+	case GF_ISOM_CBCS_SCHEME:
+	case GF_ISOM_CENC_SCHEME:
+	case GF_ISOM_PIFF_SCHEME:
+	case 0:
+		break;
+	default:
+		return GF_FALSE;
+	}
+
+
 	esd = gf_media_map_item_esd(read->mov, item_id);
-	if (!esd) return GF_FALSE;
+	if (!esd) {
+		//unsupported item, try next
+		item_idx++;
+		goto retry;
+	}
+
 
 	//OK declare PID
 	if (!ch)
 		pid = gf_filter_pid_new(read->filter);
-	else
+	else {
 		pid = ch->pid;
+		ch->item_id = item_id;
+	}
+
 
-	if (read->pid)
-		gf_filter_pid_copy_properties(pid, read->pid);
+	//do not override PID ID if itt is set
+	if (!ch) {
+		if (read->pid)
+			gf_filter_pid_copy_properties(pid, read->pid);
+		gf_filter_pid_set_property(pid, GF_PROP_PID_ID, &PROP_UINT(esd->ESID));
+	}
 
-	gf_filter_pid_set_property(pid, GF_PROP_PID_ID, &PROP_UINT(esd->ESID));
 	if (read->itemid)
 		gf_filter_pid_set_property(pid, GF_PROP_PID_ITEM_ID, &PROP_UINT(item_id));
 		
@@ -1219,7 +1575,7 @@
 	gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(esd->decoderConfig->streamType));
 	gf_filter_pid_set_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(esd->decoderConfig->objectTypeIndication));
 	gf_filter_pid_set_property(pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(1000));
-	if (esd->decoderConfig->decoderSpecificInfo) {
+	if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 		gf_filter_pid_set_property(pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength));
 
 		esd->decoderConfig->decoderSpecificInfo->data=NULL;
@@ -1230,10 +1586,23 @@
 		gf_filter_pid_set_property(pid, GF_PROP_PID_WIDTH, &PROP_UINT(props.width));
 		gf_filter_pid_set_property(pid, GF_PROP_PID_HEIGHT, &PROP_UINT(props.height));
 	}
-	if (props.hidden) {
-		gf_filter_pid_set_property(pid, GF_PROP_PID_HIDDEN, &PROP_BOOL(props.hidden));
+
+	gf_filter_pid_set_property(pid, GF_PROP_PID_HIDDEN, props.hidden ? &PROP_BOOL(GF_TRUE) : NULL);
+	gf_filter_pid_set_property(pid, GF_PROP_PID_ALPHA, props.alpha ? &PROP_BOOL(GF_TRUE) : NULL);
+	gf_filter_pid_set_property(pid, GF_PROP_PID_MIRROR, props.mirror ? &PROP_UINT(props.mirror) : NULL);
+	gf_filter_pid_set_property(pid, GF_PROP_PID_ROTATE, props.alpha ? &PROP_UINT(props.angle) : NULL);
+
+	if (props.clap_wden) {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_W, &PROP_FRAC_INT(props.clap_wnum,props.clap_wden) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_H, &PROP_FRAC_INT(props.clap_hnum,props.clap_hden) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_X, &PROP_FRAC_INT(props.clap_honum,props.clap_hoden) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_Y, &PROP_FRAC_INT(props.clap_vonum,props.clap_voden) );
+	} else {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_W, NULL);
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_H, NULL);
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_X, NULL);;
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_Y, NULL);
 	}
-	gf_odf_desc_del((GF_Descriptor *)esd);
 
 	if (gf_isom_get_meta_primary_item_id(read->mov, GF_TRUE, 0) == item_id) {
 		gf_filter_pid_set_property(pid, GF_PROP_PID_PRIMARY_ITEM, &PROP_BOOL(GF_TRUE));
@@ -1241,15 +1610,35 @@
 		gf_filter_pid_set_property(pid, GF_PROP_PID_PRIMARY_ITEM, &PROP_BOOL(GF_FALSE));
 	}
 
-	if (!gf_sys_is_test_mode())
+	if (!gf_sys_is_test_mode() && !read->itt)
 		gf_filter_pid_set_property(pid, GF_PROP_PID_ITEM_NUM, &PROP_UINT(item_idx) );
 
 	gf_filter_pid_set_property_str(pid, "meta:mime", item_mime_type ? &PROP_STRING(item_mime_type) : NULL );
 	gf_filter_pid_set_property_str(pid, "meta:name", item_name ? &PROP_STRING(item_name) : NULL );
 	gf_filter_pid_set_property_str(pid, "meta:encoding", item_encoding ? &PROP_STRING(item_encoding) : NULL );
 
+
+	//setup cenc
+	if (scheme_type) {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, &PROP_4CC(scheme_type) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_PROTECTION_SCHEME_VERSION, &PROP_UINT(scheme_version) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_ENCRYPTED, &PROP_BOOL(GF_TRUE) );
+
+		gf_filter_pid_set_property(pid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(esd->decoderConfig->streamType));
+		gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_ENCRYPTED) );
+	}
+
+	gf_odf_desc_del((GF_Descriptor *)esd);
+
 	if (!ch) {
-		/*ch = */isor_create_channel(read, pid, 0, item_id, GF_FALSE);
+		ch = isor_create_channel(read, pid, 0, item_id, GF_FALSE);
+		if (ch && scheme_type) {
+			ch->is_cenc = GF_TRUE;
+			ch->is_encrypted = GF_TRUE;
+
+			isor_declare_pssh(ch);
+
+		}
 	}
 	return GF_TRUE;
 }

gpac-1.0.1.tar.gz/src/filters/isoffin_read.c -> gpac-2.0.0.tar.gz/src/filters/isoffin_read.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISOBMFF reader filter
@@ -55,7 +55,7 @@
 
 static GF_Err isoffin_setup(GF_Filter *filter, ISOMReader *read)
 {
-	char szURL[2048];
+	char *url;
 	char *tmp, *src;
 	GF_Err e;
 	const GF_PropertyValue *prop;
@@ -68,12 +68,25 @@
 	} else {
 		src = read->src;
 	}
-	if (!src) return GF_SERVICE_ERROR;
+	if (!src) return GF_SERVICE_ERROR;
+
+	//if source is a fileIO, check if it is tagged for main thread
+	//if so, force main thread for this filter and configure at next process
+	if (!strncmp(src, "gfio://", 7) && !read->gfio_probe) {
+		read->gfio_probe = GF_TRUE;
+		if (gf_fileio_is_main_thread(src)) {
+			read->moov_not_loaded = 1;
+			gf_filter_force_main_thread(filter, GF_TRUE);
+			gf_filter_post_process_task(filter);
+			return GF_OK;
+		}
+	}
 
 	read->src_crc = gf_crc_32(src, (u32) strlen(src));
 
-	strcpy(szURL, src);
-	tmp = gf_file_ext_start(szURL);
+	url = gf_strdup(src);
+	if (!url) return GF_OUT_OF_MEM;
+	tmp = gf_file_ext_start(url);
 	if (tmp) {
 		Bool truncate = GF_TRUE;
 		tmp = strchr(tmp, '#');
@@ -107,7 +120,8 @@
 		}
 	}
 
-	if (! isor_is_local(szURL)) {
+	if (! isor_is_local(url)) {
+		gf_free(url);
 		return GF_NOT_SUPPORTED;
 	}
 	read->start_range = read->end_range = 0;
@@ -117,33 +131,47 @@
 		read->end_range = prop->value.lfrac.den;
 	}
 
-	e = gf_isom_open_progressive(szURL, read->start_range, read->end_range, read->sigfrag, &read->mov, &read->missing_bytes);
+	read->missing_bytes = 0;
+	e = gf_isom_open_progressive(url, read->start_range, read->end_range, read->sigfrag, &read->mov, &read->missing_bytes);
 
 	if (e == GF_ISOM_INCOMPLETE_FILE) {
-		read->moov_not_loaded = GF_TRUE;
+		gf_free(url);
+		read->moov_not_loaded = 1;
 		return GF_OK;
 	}
 
+	read->input_loaded = GF_TRUE;
+	//if missing bytes is set, file is incomplete, check if cache is complete
+	if (read->missing_bytes) {
+		read->input_loaded = GF_FALSE;
+		prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_FILE_CACHED);
+		if (prop && prop->value.boolean)
+			read->input_loaded = GF_TRUE;
+	}
+
 	if (e != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] error while opening %s, error=%s\n", szURL,gf_error_to_string(e)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] error while opening %s, error=%s\n", url,gf_error_to_string(e)));
 		gf_filter_setup_failure(filter, e);
+		gf_free(url);
 		return e;
 	}
 	read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
- if (!read->frag_type && read->sigfrag) {
- e = GF_BAD_PARAM;
- GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] sigfrag requested but file %s is not fragmented\n", szURL));
- gf_filter_setup_failure(filter, e);
- return e;
- }
+	if (!read->frag_type && read->sigfrag) {
+		e = GF_BAD_PARAM;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] sigfrag requested but file %s is not fragmented\n", url));
+		gf_filter_setup_failure(filter, e);
+		gf_free(url);
+		return e;
+	}
 
-	read->time_scale = gf_isom_get_timescale(read->mov);
+	read->timescale = gf_isom_get_timescale(read->mov);
 	if (!read->input_loaded && read->frag_type)
 		read->refresh_fragmented = GF_TRUE;
 
 	if (read->strtxt)
 		gf_isom_text_set_streaming_mode(read->mov, GF_TRUE);
 
+	gf_free(url);
 	return isor_declare_objects(read);
 }
 
@@ -153,6 +181,7 @@
 	if (ch->nal_bs) gf_bs_del(ch->nal_bs);
 	if (ch->avcc) gf_odf_avc_cfg_del(ch->avcc);
 	if (ch->hvcc) gf_odf_hevc_cfg_del(ch->hvcc);
+	if (ch->vvcc) gf_odf_vvc_cfg_del(ch->vvcc);
 	gf_free(ch);
 }
 
@@ -162,7 +191,8 @@
 	while (gf_list_count(read->channels)) {
 		ISOMChannel *ch = (ISOMChannel *)gf_list_get(read->channels, 0);
 		gf_list_rem(read->channels, 0);
-		gf_filter_pid_remove(ch->pid);
+		if (ch->pid)
+			gf_filter_pid_remove(ch->pid);
 		isoffin_delete_channel(ch);
 	}
 
@@ -178,17 +208,20 @@
 	u32 i, count;
 	Bool is_new_mov = GF_FALSE;
 	u64 tfdt;
-	GF_ISOTrackID trackID;
+//	GF_ISOTrackID trackID;
 	GF_ISOSegOpenMode flags=0;
 	GF_Err e;
 
 	prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_FILE_CACHED);
 	if (prop && prop->value.boolean)
 		read->input_loaded = GF_TRUE;
+
 	read->refresh_fragmented = GF_FALSE;
 	read->full_segment_flush = GF_TRUE;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] reconfigure triggered, URL %s\n", next_url));
 
+	//no need to lock blob if next_url is a blob, all parsing and probing functions below will lock the blob if any
+
 	switch (gf_isom_probe_file_range(next_url, read->start_range, read->end_range)) {
 	//this is a fragment
 	case 3:
@@ -196,14 +229,19 @@
 		gf_isom_reset_fragment_info(read->mov, GF_TRUE);
 
 		if (read->no_order_check) flags |= GF_ISOM_SEGMENT_NO_ORDER_FLAG;
-#ifdef FILTER_FIXME
+
+		//no longer used in filters
+#if 0
 		if (scalable_segment) flags |= GF_ISOM_SEGMENT_SCALABLE_FLAG;
 #endif
 		e = gf_isom_open_segment(read->mov, next_url, read->start_range, read->end_range, flags);
 		if (!read->input_loaded && (e==GF_ISOM_INCOMPLETE_FILE)) {
-			read->refresh_fragmented = GF_TRUE;
 			e = GF_OK;
 		}
+		//always refresh fragmented files, since we could have a full moof+mdat in buffer (not incomplete file)
+		//but still further fragments to be pushed
+		if (!read->start_range && !read->end_range)
+			read->refresh_fragmented = GF_TRUE;
 		read->seg_name_changed = GF_TRUE;
 
 		for (i=0; i<gf_list_count(read->channels); i++) {
@@ -218,21 +256,24 @@
 		} else if (read->end_range) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Playing new range in %s: "LLU"-"LLU"\n", next_url, read->start_range, read->end_range));
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] playing new segment %s (has next dep %d TODO)\n", next_url, 0));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] playing new segment %s\n", next_url));
 		}
 #endif
 		break;
 	//this is a movie, reload
 	case 2:
 	case 1:
-		tfdt = gf_isom_get_current_tfdt(read->mov, 1);
+		//get tfdt of next segment (cumulated sample dur since moov load)
+		//if the next segment has a tfdt or a tfrx, this will be ignored
+		//otherwise this value will be used as base tfdt for next segment
+		tfdt = gf_isom_get_smooth_next_tfdt(read->mov, 1);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Switching between files - opening new init segment %s (time offset="LLU") - range "LLU"-"LLU"\n", next_url, tfdt, read->start_range, read->end_range));
 
 		if (gf_isom_is_smooth_streaming_moov(read->mov)) {
 			char *tfdt_val = strstr(next_url, "tfdt=");
-			//smooth addressing, replace tfdt=0000000000000000000 with proper value
+			//smooth addressing, replace tfdt=0000000000000000 with proper value
 			if (tfdt_val) {
-				sprintf(tfdt_val+5, LLU, tfdt);
+				sprintf(tfdt_val+5, LLX, tfdt);
 			} else {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[IsoMedia] Error finding init time for init segment %s at UTC "LLU"\n", next_url, gf_net_get_utc() ));
 			}
@@ -240,6 +281,15 @@
 
 		if (read->mov) gf_isom_close(read->mov);
 		e = gf_isom_open_progressive(next_url, read->start_range, read->end_range, read->sigfrag, &read->mov, &read->missing_bytes);
+
+		//init seg not completely downloaded, retry at next packet
+		if (!read->input_loaded && (e==GF_ISOM_INCOMPLETE_FILE)) {
+			read->src_crc = 0;
+			read->moov_not_loaded = 2;
+			return GF_OK;
+		}
+
+		read->moov_not_loaded = 0;
 		if (e < 0) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error opening init segment %s at UTC "LLU": %s\n", next_url, gf_net_get_utc(), gf_error_to_string(e) ));
 		}
@@ -252,7 +302,11 @@
 	case 4:
 		return GF_OK;
 	default:
-		return GF_NOT_SUPPORTED;
+		if (!read->mov) {
+ return GF_NOT_SUPPORTED;
+		}
+ e = GF_ISOM_INVALID_FILE;
+ break;
 	}
 
 	gf_filter_post_process_task(filter);
@@ -262,16 +316,18 @@
 	if (e<0) {
 		count = gf_list_count(read->channels);
 		gf_isom_release_segment(read->mov, 1);
-		//gf_isom_reset_fragment_info(read->mov, GF_TRUE);
-		read->drop_next_segment = 1;
+ read->invalid_segment = GF_TRUE;
 		//error opening the segment, reset everything ...
 		gf_isom_reset_fragment_info(read->mov, GF_FALSE);
 		for (i=0; i<count; i++) {
 			ISOMChannel *ch = gf_list_get(read->channels, i);
-			if (ch)
-				ch->sample_num = 0;
+ if (ch) {
+ ch->sample_num = 0;
+ ch->eos_sent = GF_FALSE;
+ }
 		}
-		return e;
+ GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[IsoMedia] Error opening current segment %s: %s\n", next_url, gf_error_to_string(e) ));
+		return GF_OK;
 	}
 	//segment is the first in our cache, we may need a refresh
 	if (!read->input_loaded) {
@@ -287,11 +343,11 @@
 		ch->last_state = GF_OK;
 		ch->eos_sent = GF_FALSE;
 
+		//old code from master, currently no longer used
+		//in filters we don't use extractors for the time being, we only do implicit reconstruction at the decoder side
+#if 0
 		if (ch->base_track) {
-#ifdef FILTER_FIXME
 			if (scalable_segment)
-#endif
-			if ((0)) {
 				trackID = gf_isom_get_highest_track_in_scalable_segment(read->mov, ch->base_track);
 				if (trackID) {
 					ch->track_id = trackID;
@@ -302,6 +358,7 @@
 				ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
 			}
 		}
+#endif
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track %d - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
 
@@ -347,11 +404,13 @@
 		isoffin_disconnect(read);
 		return GF_OK;
 	}
-	//we must have a file path for now, if not this is a pure stream of boxes (no local file cache)
+	//check if we have a file path; if not, this is a pure stream of boxes (no local file cache)
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
 	if (!prop || !prop->value.string) {
-		read->mem_load_mode = 1;
+		if (!read->mem_load_mode)
+			read->mem_load_mode = 1;
 		if (!read->pid) read->pid = pid;
+		read->input_loaded = GF_FALSE;
 		return GF_OK;
 	}
 
@@ -401,6 +460,10 @@
 	read->filter = filter;
 	read->channels = gf_list_new();
 
+	if (read->xps_check==MP4DMX_XPS_AUTO) {
+		read->xps_check = (read->smode==MP4DMX_SPLIT_EXTRACTORS) ? MP4DMX_XPS_KEEP : MP4DMX_XPS_REMOVE;
+	}
+
 	if (read->src) {
 		read->input_loaded = GF_TRUE;
 		return isoffin_setup(filter, read);
@@ -409,7 +472,7 @@
 		read->extern_mov = GF_TRUE;
 		read->input_loaded = GF_TRUE;
 		read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
-		read->time_scale = gf_isom_get_timescale(read->mov);
+		read->timescale = gf_isom_get_timescale(read->mov);
 
 		if (read->sigfrag) {
 			gf_isom_enable_traf_map_templates(read->mov);
@@ -447,11 +510,47 @@
 	if (read->mem_url) gf_free(read->mem_url);
 }
 
+void isor_declare_pssh(ISOMChannel *ch)
+{
+	u32 i, PSSH_count;
+	u8 *psshd;
+	GF_BitStream *pssh_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	u32 s;
+
+	PSSH_count = gf_isom_get_pssh_count(ch->owner->mov);
+	gf_bs_write_u32(pssh_bs, PSSH_count);
+
+	/*fill PSSH in the structure. We will free it in CENC_Setup*/
+	for (i=0; i<PSSH_count; i++) {
+		bin128 SystemID;
+		u32 version;
+		u32 KID_count;
+		bin128 *KIDs;
+		u32 private_data_size;
+		u8 *private_data;
+		gf_isom_get_pssh_info(ch->owner->mov, i+1, SystemID, &version, &KID_count, (const bin128 **) & KIDs, (const u8 **) &private_data, &private_data_size);
+
+		gf_bs_write_data(pssh_bs, SystemID, 16);
+		gf_bs_write_u32(pssh_bs, version);
+		if (version) {
+			gf_bs_write_u32(pssh_bs, KID_count);
+			for (s=0; s<KID_count; s++) {
+				gf_bs_write_data(pssh_bs, KIDs[s], 16);
+			}
+		}
+		gf_bs_write_u32(pssh_bs, private_data_size);
+		gf_bs_write_data(pssh_bs, private_data, private_data_size);
+	}
+	gf_bs_get_content(pssh_bs, &psshd, &s);
+	gf_bs_del(pssh_bs);
+	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_PSSH, & PROP_DATA_NO_COPY(psshd, s) );
+}
+
 void isor_set_crypt_config(ISOMChannel *ch)
 {
 	GF_ISOFile *mov = ch->owner->mov;
 	u32 track = ch->track;
-	u32 scheme_type, scheme_version, PSSH_count=0, i, count;
+	u32 scheme_type, scheme_version, i, count;
 	const char *kms_uri, *scheme_uri;
 	Bool selectiveEncryption=0;
 	u32 IVLength=0;
@@ -508,9 +607,8 @@
 	} else if (gf_isom_is_cenc_media(mov, track, stsd_idx)) {
 		ch->is_cenc = GF_TRUE;
 
-		gf_isom_get_cenc_info(ch->owner->mov, ch->track, stsd_idx, NULL, &scheme_type, &scheme_version, NULL);
+		gf_isom_get_cenc_info(ch->owner->mov, ch->track, stsd_idx, NULL, &scheme_type, &scheme_version);
 
-		PSSH_count = gf_isom_get_pssh_count(ch->owner->mov);
 		//if no PSSH declared, DO update the properties (PSSH is not mandatory)
 	} else if (gf_isom_is_adobe_protection_media(mov, track, stsd_idx)) {
 		u32 ofmt;
@@ -523,7 +621,7 @@
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ADOBE_CRYPT_META, &PROP_DATA((char *)metadata, (u32) strlen(metadata) ) );
 	}
 
-	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, &PROP_UINT(scheme_type) );
+	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, &PROP_4CC(scheme_type) );
 	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PROTECTION_SCHEME_VERSION, &PROP_UINT(scheme_version) );
 	if (scheme_uri) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PROTECTION_SCHEME_URI, &PROP_STRING((char*) scheme_uri) );
 	if (kms_uri) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PROTECTION_KMS_URI, &PROP_STRING((char*) kms_uri) );
@@ -537,52 +635,23 @@
 	if (plainTextLen) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_OMA_CLEAR_LEN, &PROP_LONGUINT(plainTextLen) );
 
 	if (ch->is_cenc) {
-		u8 *psshd;
-		GF_BitStream *pssh_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		u32 s, container_type;
-
-		gf_bs_write_u32(pssh_bs, PSSH_count);
-
-		/*fill PSSH in the structure. We will free it in CENC_Setup*/
-		for (i=0; i<PSSH_count; i++) {
-			bin128 SystemID;
-			u32 version;
-			u32 KID_count;
-			bin128 *KIDs;
-			u32 private_data_size;
-			u8 *private_data;
-			gf_isom_get_pssh_info(ch->owner->mov, i+1, SystemID, &version, &KID_count, (const bin128 **) & KIDs, (const u8 **) &private_data, &private_data_size);
-
-			gf_bs_write_data(pssh_bs, SystemID, 16);
-			gf_bs_write_u32(pssh_bs, version);
-			gf_bs_write_u32(pssh_bs, KID_count);
-			for (s=0; s<KID_count; s++) {
-				gf_bs_write_data(pssh_bs, KIDs[s], 16);
-			}
-			gf_bs_write_u32(pssh_bs, private_data_size);
-			gf_bs_write_data(pssh_bs, private_data, private_data_size);
-		}
-		gf_bs_get_content(pssh_bs, &psshd, &s);
-		gf_bs_del(pssh_bs);
-		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_PSSH, & PROP_DATA_NO_COPY(psshd, s) );
+		const u8 *key_info;
+		u32 key_info_size;
+		u32 container_type;
 
-		gf_isom_cenc_get_default_info(ch->owner->mov, ch->track, stsd_idx, &container_type, &ch->pck_encrypted, &ch->IV_size, &ch->KID, &ch->constant_IV_size, &ch->constant_IV, &ch->crypt_byte_block, &ch->skip_byte_block);
+		isor_declare_pssh(ch);
 
-		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_STORE, &PROP_UINT(container_type) );
+		gf_isom_cenc_get_default_info(ch->owner->mov, ch->track, stsd_idx, &container_type, &ch->pck_encrypted, &ch->crypt_byte_block, &ch->skip_byte_block, &key_info, &key_info_size);
+
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_STORE, &PROP_4CC(container_type) );
 
 		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ENCRYPTED, &PROP_BOOL(ch->pck_encrypted) );
 
 		if (ch->skip_byte_block || ch->crypt_byte_block) {
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_PATTERN, &PROP_FRAC_INT(ch->skip_byte_block, ch->crypt_byte_block) );
 		}
-
-		if (ch->IV_size) {
-			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_IV_SIZE, &PROP_UINT(ch->IV_size) );
-		}
-		if (ch->constant_IV_size) {
-			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_IV_CONST, &PROP_DATA(ch->constant_IV, ch->constant_IV_size) );
-		}
-		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_KID, &PROP_DATA(ch->KID, sizeof(bin128) ) );
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_KEY_INFO, &PROP_DATA((u8 *)key_info, key_info_size) );
+		ch->key_info_crc = gf_crc_32(key_info, key_info_size);
 	}
 }
 
@@ -636,14 +705,18 @@
 		if (!ch->has_edit_list && ch->ts_offset) {
 			//if >0 this is a hold, we signal positive delay
 			//if <0 this is a skip, we signal negative delay
-			gf_filter_pid_set_property(pid, GF_PROP_PID_DELAY, &PROP_SINT((s32) ch->ts_offset) );
+			gf_filter_pid_set_property(pid, GF_PROP_PID_DELAY, &PROP_LONGSINT( ch->ts_offset) );
 		}
 	} else
 		ch->has_edit_list = GF_FALSE;
 
 	ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track)==1) ? GF_TRUE : GF_FALSE;
 	gf_filter_pid_set_property(pid, GF_PROP_PID_HAS_SYNC, &PROP_BOOL(ch->has_rap) );
-	ch->time_scale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
+	//some fragmented files do not advertize a sync sample table (legal) so we need to update as soon as we fetch a fragment
+	//to see if we are all-intra (as detected here) or not
+	if (!ch->has_rap && ch->owner->frag_type)
+		ch->check_has_rap = GF_TRUE;
+	ch->timescale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
 
 	ts_shift = gf_isom_get_cts_to_dts_shift(ch->owner->mov, ch->track);
 	if (ts_shift) {
@@ -719,8 +792,39 @@
 			}
 		}
 		/*this is the highest quality*/
-		if (!next_track)
+		if (!next_track) {
+			ch->playing = GF_TRUE;
+			ref_count = gf_isom_get_reference_count(the_file, ch->track, GF_ISOM_REF_BASE);
+			trackID = 0;
+			if (ref_count) {
+				gf_isom_get_reference(the_file, ch->track, GF_ISOM_REF_BASE, 1, &trackID);
+				for (i=0; i<gf_list_count(ch->owner->channels) && trackID; i++) {
+					ISOMChannel *base = gf_list_get(ch->owner->channels, i);
+					if (base->track_id==trackID) {
+						u32 sample_desc_index;
+						u64 resume_at;
+						GF_Err e;
+						//try to locate sync after current time in base
+						resume_at = base->static_sample ? gf_timestamp_rescale(base->static_sample->DTS, base->timescale, ch->timescale) : 0;
+						e = gf_isom_get_sample_for_media_time(ch->owner->mov, ch->track, resume_at, &sample_desc_index, GF_ISOM_SEARCH_SYNC_FORWARD, &ch->static_sample, &ch->sample_num, &ch->sample_data_offset);
+						//found, rewind so that next fetch is the sync
+						if (e==GF_OK) {
+							ch->sample = NULL;
+						}
+						//no further sync found, realign with base timescale
+						else if (e==GF_EOS) {
+							e = gf_isom_get_sample_for_media_time(ch->owner->mov, ch->track, resume_at, &sample_desc_index, GF_ISOM_SEARCH_FORWARD, &ch->static_sample, &ch->sample_num, &ch->sample_data_offset);
+						}
+						//unknown state, realign sample num with base
+						if (e<0) {
+							ch->sample_num = base->sample_num;
+						}
+						break;
+					}
+				}
+			}
 			return cur_track;
+		}
 	} else {
 		if (cur_track == ch->base_track)
 			return cur_track;
@@ -730,10 +834,17 @@
 		gf_isom_get_reference(the_file, cur_track, GF_ISOM_REF_SCAL, ref_count, &next_track);
 		if (!next_track)
 			return cur_track;
+
+		if (ch->track != next_track) {
+			ch->playing = GF_FALSE;
+			ch->eos_sent = GF_TRUE;
+			gf_filter_pid_set_eos(ch->pid);
+		}
 	}
 
 	/*in scalable mode add SPS/PPS in-band*/
-	gf_isom_set_nalu_extract_mode(the_file, next_track, ch->nalu_extract_mode);
+	if (ch->owner->smode)
+		gf_isom_set_nalu_extract_mode(the_file, next_track, ch->nalu_extract_mode);
 
 	return next_track;
 }
@@ -752,14 +863,9 @@
 		for (i = 0; i < count; i++) {
 			ch = (ISOMChannel *)gf_list_get(read->channels, i);
 			if (ch->base_track && gf_isom_needs_layer_reconstruction(read->mov)) {
-				ch->next_track = isoffin_channel_switch_quality(ch, read->mov, evt->quality_switch.up);
-			}
-#ifdef GPAC_ENABLE_COVERAGE
-			else if (gf_sys_is_cov_mode()) {
+				/*ch->next_track = */ //old code, see not in isoffin_reconfigure
 				isoffin_channel_switch_quality(ch, read->mov, evt->quality_switch.up);
 			}
-#endif
-
 		}
 		return GF_TRUE;
 	}
@@ -777,6 +883,8 @@
 		ch->speed = evt->play.speed;
 		ch->initial_play_seen = GF_TRUE;
 		read->reset_frag_state = 1;
+		//it can happen that input_is_stop is still TRUE because we did not get called back after the stop - reset to FALSE since we now play
+		read->input_is_stop = GF_FALSE;
 		if (read->frag_type)
 			read->frag_type = 1;
 
@@ -785,23 +893,23 @@
 			Double t;
 			if (evt->play.start_range>=0) {
 				t = evt->play.start_range;
-				t *= ch->time_scale;
+				t *= ch->timescale;
 				ch->start = (u64) t;
 			}
 			if (evt->play.end_range >= evt->play.start_range) {
 				ch->end = (u64) -1;
 				if (evt->play.end_range<FLT_MAX) {
 					t = evt->play.end_range;
-					t *= ch->time_scale;
+					t *= ch->timescale;
 					ch->end = (u64) t;
 				}
 			}
 		} else {
 			Double end = evt->play.end_range;
 			if (end==-1) end = 0;
-			ch->start = (u64) (s64) (evt->play.start_range * ch->time_scale);
+			ch->start = (u64) (s64) (evt->play.start_range * ch->timescale);
 			if (end <= evt->play.start_range)
-				ch->end = (u64) (s64) (end * ch->time_scale);
+				ch->end = (u64) (s64) (end * ch->timescale);
 		}
 		ch->playing = GF_TRUE;
 		ch->sample_num = evt->play.from_pck;
@@ -820,6 +928,7 @@
 			gf_isom_reset_tables(read->mov, GF_TRUE);
 			gf_isom_reset_data_offset(read->mov, NULL);
 			read->refresh_fragmented = GF_TRUE;
+			read->mem_blob.size = 0;
 			//send play event
 			cancel_event = GF_FALSE;
 		} else if (!read->nb_playing && read->pid && !read->input_loaded) {
@@ -840,11 +949,10 @@
 					is_sidx_seek = GF_TRUE;
 					//in case we loaded moov but not sidx, update duration
 					if ((gf_isom_get_sidx_duration(read->mov, &dur, &ts)==GF_OK) && dur) {
-						dur *= read->time_scale;
-						dur /= ts;
+						dur = gf_timestamp_rescale(dur, ts, read->timescale);
 						if (ch->duration != dur) {
 							ch->duration = dur;
-							gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(ch->duration, read->time_scale));
+							gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(ch->duration, read->timescale));
 						}
 					}
 				}
@@ -858,7 +966,7 @@
 					u64 time;
 					ch = gf_list_get(read->channels, i);
 					mode = ch->disable_seek ? GF_ISOM_SEARCH_BACKWARD : GF_ISOM_SEARCH_SYNC_BACKWARD;
-					time = (u64) (evt->play.start_range * ch->time_scale);
+					time = (u64) (evt->play.start_range * ch->timescale);
 
 					/*take care of seeking out of the track range*/
 					if (!read->frag_type && (ch->duration < time)) {
@@ -918,7 +1026,7 @@
 	default:
 		break;
 	}
-	//by default don't cancel event - to rework once we have downloading in place
+	//by default don't cancel event
 	return GF_FALSE;
 }
 
@@ -955,21 +1063,25 @@
 				read->in_error = GF_NOT_SUPPORTED;
 				break;
 			default:
-				read->moov_not_loaded = GF_TRUE;
+				read->moov_not_loaded = 1;
 				break;
 			}
 			return;
 		}
 
 		read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
-		read->time_scale = gf_isom_get_timescale(read->mov);
+		read->timescale = gf_isom_get_timescale(read->mov);
 		isor_declare_objects(read);
 		read->mem_load_mode = 2;
-		read->moov_not_loaded = GF_FALSE;
+		read->moov_not_loaded = 0;
 		return;
 	}
 	//refresh file
 	gf_isom_refresh_fragmented(read->mov, &bytes_missing, read->mem_url);
+
+	if ((read->mem_load_mode==2) && bytes_missing)
+		read->force_fetch = GF_TRUE;
+
 }
 
 static void isoffin_purge_mem(ISOMReader *read, u64 min_offset)
@@ -1016,16 +1128,18 @@
 	for (i=0; i<count; i++) {
 		ISOMChannel *ch = gf_list_get(read->channels, i);
 		u32 num_samples;
-#ifndef GPAC_DISABLE_LOG
 		u32 prev_samples = gf_isom_get_sample_count(read->mov, ch->track);
-#endif
 		//don't run this too often
 		if (ch->sample_num<=1+read->mstore_samples) continue;
 
-		if (gf_isom_purge_samples(read->mov, ch->track, ch->sample_num-1) == GF_OK)
+		num_samples = ch->sample_num-1;
+		if (num_samples>=prev_samples) continue;
+
+		if (gf_isom_purge_samples(read->mov, ch->track, num_samples) == GF_OK)
 			ch->sample_num = 1;
 
 		num_samples = gf_isom_get_sample_count(read->mov, ch->track);
+		assert(ch->sample_num<=num_samples);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[IsoMedia] mem mode %d samples now in track %d (prev %d)\n", num_samples, ch->track_id, prev_samples));
 	}
 }
@@ -1036,13 +1150,21 @@
 	u32 i, count = gf_list_count(read->channels);
 	Bool is_active = GF_FALSE;
 	Bool in_is_eos = GF_FALSE;
+	Bool check_forced_end = GF_FALSE;
 	Bool has_new_data = GF_FALSE;
 	u64 min_offset_plus_one = 0;
+	u32 nb_forced_end=0;
 	if (read->in_error)
 		return read->in_error;
 
 	if (read->pid) {
 		Bool fetch_input = GF_TRUE;
+
+		//we failed at loading the init segment during a dash switch, retry
+		if (!read->is_partial_download && !read->mem_load_mode && (read->moov_not_loaded==2) ) {
+			isoffin_configure_pid(filter, read->pid, GF_FALSE);
+			if (read->moov_not_loaded) return GF_OK;
+		}
 		if (read->mem_load_mode==2) {
 			if (!read->force_fetch && read->mem_blob.size > read->mstore_size) {
 				fetch_input = GF_FALSE;
@@ -1069,6 +1191,11 @@
 				const u8 *pck_data = gf_filter_pck_get_data(pck, &data_size);
 				isoffin_push_buffer(filter, read, pck_data, data_size);
 			}
+			//we just had a switch but init seg is not completely done: input packet is only a part of the init, drop it
+			else if (read->moov_not_loaded==2) {
+				gf_filter_pid_drop_packet(read->pid);
+				return GF_OK;
+			}
 			gf_filter_pid_drop_packet(read->pid);
 			has_new_data = GF_TRUE;
 			if (read->in_error)
@@ -1086,11 +1213,29 @@
 		if (!read->frag_type && read->input_loaded) {
 			in_is_eos = GF_TRUE;
 		}
+ //segment is invalid, wait for eos on input an send eos on all channels
+ if (read->invalid_segment) {
+ if (!in_is_eos) return GF_OK;
+ read->invalid_segment = GF_FALSE;
+
+ for (i=0; i<count; i++) {
+ ISOMChannel *ch = gf_list_get(read->channels, i);
+ if (!ch->playing) {
+ continue;
+ }
+ if (!ch->eos_sent) {
+ ch->eos_sent = GF_TRUE;
+ gf_filter_pid_set_eos(ch->pid);
+ }
+ }
+ read->eos_signaled = GF_TRUE;
+ return GF_EOS;
+ }
 	} else if (read->extern_mov) {
 		in_is_eos = GF_TRUE;
 		read->input_loaded = GF_TRUE;
 	}
-	if (read->moov_not_loaded) {
+	if (read->moov_not_loaded==1) {
 		if (read->mem_load_mode)
 			return GF_OK;
 		read->moov_not_loaded = GF_FALSE;
@@ -1125,7 +1270,7 @@
 			}
 
 			if (!read->refresh_fragmented && (e==GF_ISOM_INCOMPLETE_FILE)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Incomplete Segment received - "LLU" bytes missing but EOF found\n", bytesMissing ));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[IsoMedia] Incomplete Segment received - "LLU" bytes missing but EOF found\n", bytesMissing ));
 			}
 
 #ifndef GPAC_DISABLE_LOG
@@ -1148,6 +1293,7 @@
 		ISOMChannel *ch;
 		ch = gf_list_get(read->channels, i);
 		if (!ch->playing) {
+			nb_forced_end++;
 			continue;
 		}
 		//eos not sent on this channel, we are active
@@ -1180,14 +1326,25 @@
 					ch->needs_pid_reconfig = GF_FALSE;
 				}
 
+				//we have at least two samples, update GF_PROP_PID_HAS_SYNC if needed
+				if (ch->check_has_rap && (gf_isom_get_sample_count(ch->owner->mov, ch->track)>1) && (gf_isom_has_sync_points(ch->owner->mov, ch->track)==1)) {
+					ch->check_has_rap = GF_FALSE;
+					ch->has_rap = GF_TRUE;
+					gf_filter_pid_set_property(ch->pid, GF_PROP_PID_HAS_SYNC, &PROP_BOOL(ch->has_rap) );
+				}
+
 				//strip param sets from payload, trigger reconfig if needed
 				isor_reader_check_config(ch);
 
-				pck = gf_filter_pck_new_alloc(ch->pid, ch->sample->dataLength, &data);
-				assert(pck);
-
-				memcpy(data, ch->sample->data, ch->sample->dataLength);
+				if (read->nodata) {
+					pck = gf_filter_pck_new_shared(ch->pid, NULL, ch->sample->dataLength, NULL);
+					if (!pck) return GF_OUT_OF_MEM;
+				} else {
+					pck = gf_filter_pck_new_alloc(ch->pid, ch->sample->dataLength, &data);
+					if (!pck) return GF_OUT_OF_MEM;
 
+					memcpy(data, ch->sample->data, ch->sample->dataLength);
+				}
 				gf_filter_pck_set_dts(pck, ch->dts);
 				gf_filter_pck_set_cts(pck, ch->cts);
 				if (ch->sample->IsRAP==-1) {
@@ -1210,6 +1367,11 @@
 				gf_filter_pck_set_duration(pck, sample_dur);
 				gf_filter_pck_set_seek_flag(pck, ch->seek_flag);
 
+				//for now we only signal xPS mask for non-sap
+				if (ch->xps_mask && !gf_filter_pck_get_sap(pck) ) {
+					gf_filter_pck_set_property(pck, GF_PROP_PCK_XPS_MASK, &PROP_UINT(ch->xps_mask) );
+				}
+
 				dep_flags = ch->isLeading;
 				dep_flags <<= 2;
 				dep_flags |= ch->dependsOn;
@@ -1230,24 +1392,7 @@
 					gf_filter_pck_set_property(pck, GF_PROP_PCK_SUBS, &PROP_DATA_NO_COPY(subs_buf, subs_buf_size) );
 				}
 
-				/**/
-				if (ch->cenc_state_changed && ch->pck_encrypted) {
-					gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_PATTERN, &PROP_FRAC_INT(ch->skip_byte_block, ch->crypt_byte_block) );
-
-					if (!ch->IV_size) {
-						if (ch->constant_IV_size) {
-							gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_IV_CONST, &PROP_DATA(ch->constant_IV, ch->constant_IV_size) );
-						} else {
-							gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_IV_CONST, NULL);
-						}
-					} else {
-						gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_IV_SIZE, &PROP_UINT(ch->IV_size) );
-					}
-
-					gf_filter_pid_set_property(ch->pid, GF_PROP_PID_KID, &PROP_DATA(ch->KID, sizeof(bin128) ) );
-				}
-				if (ch->sai_buffer && ch->pck_encrypted) {
-					assert(ch->sai_buffer_size);
+				if (ch->sai_buffer && ch->sai_buffer_size && ch->pck_encrypted) {
 					gf_filter_pck_set_property(pck, GF_PROP_PCK_CENC_SAI, &PROP_DATA(ch->sai_buffer, ch->sai_buffer_size) );
 				}
 
@@ -1256,6 +1401,10 @@
 					if (gf_isom_sample_is_fragment_start(read->mov, ch->track, ch->sample_num, &finfo) ) {
 						u64 start=0;
 						u32 traf_start = finfo.seg_start_plus_one ? 2 : 1;
+
+						if (finfo.seg_start_plus_one)
+							gf_filter_pck_set_property(pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+
 						gf_filter_pck_set_property(pck, GF_PROP_PCK_FRAG_START, &PROP_UINT(traf_start));
 
 						start = finfo.frag_start;
@@ -1284,18 +1433,55 @@
 					}
 				}
 				ch->eos_sent = GF_FALSE;
+
+				//this might not be the true end of stream
+				if ((ch->streamType==GF_STREAM_AUDIO) && (ch->sample_num == gf_isom_get_sample_count(read->mov, ch->track))) {
+					gf_filter_pck_set_property(pck, GF_PROP_PCK_END_RANGE, &PROP_BOOL(GF_TRUE));
+				}
+
+				if (!ch->item_id)
+					isor_set_sample_groups_and_aux_data(read, ch, pck);
+
 				gf_filter_pck_send(pck);
 				isor_reader_release_sample(ch);
 
 				ch->last_valid_sample_data_offset = ch->sample_data_offset;
 				nb_pck--;
 			} else if (ch->last_state==GF_EOS) {
+				if (ch->playing == 2) {
+					if (in_is_eos) {
+						ch->playing = GF_FALSE;
+					} else {
+						nb_forced_end++;
+						check_forced_end = GF_TRUE;
+					}
+				}
 				if (in_is_eos && !ch->eos_sent) {
+					void *tfrf;
+					const void *gf_isom_get_tfrf(GF_ISOFile *movie, u32 trackNumber);
+
 					ch->eos_sent = GF_TRUE;
 					read->eos_signaled = GF_TRUE;
+
+					tfrf = (void *) gf_isom_get_tfrf(read->mov, ch->track);
+					if (tfrf) {
+						gf_filter_pid_set_info_str(ch->pid, "smooth_tfrf", &PROP_POINTER(tfrf) );
+						ch->last_has_tfrf = GF_TRUE;
+					} else if (ch->last_has_tfrf) {
+						gf_filter_pid_set_info_str(ch->pid, "smooth_tfrf", NULL);
+						ch->last_has_tfrf = GF_FALSE;
+					}
+
 					gf_filter_pid_set_eos(ch->pid);
 				}
 				break;
+			} else if (ch->last_state==GF_ISOM_INVALID_FILE) {
+				if (!ch->eos_sent) {
+					ch->eos_sent = GF_TRUE;
+					read->eos_signaled = GF_TRUE;
+					gf_filter_pid_set_eos(ch->pid);
+				}
+				return ch->last_state;
 			} else {
 				read->force_fetch = GF_TRUE;
 				break;
@@ -1308,11 +1494,20 @@
 		isoffin_purge_mem(read, min_offset_plus_one-1);
 	}
 
+	//we reached end of playback due to play range request, we must send eos - however for safety reason with DASH, we first need to cancel the input
+	if (read->pid && check_forced_end && (nb_forced_end==count)) {
+		//abort input
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_STOP, read->pid);
+		gf_filter_pid_send_event(read->pid, &evt);
+	}
+
+
 	if (!is_active) {
 		return GF_EOS;
 	}
 	//if (in_is_eos)
-	gf_filter_ask_rt_reschedule(filter, 1);
+//	gf_filter_ask_rt_reschedule(filter, 1);
 	return GF_OK;
 
 }
@@ -1330,8 +1525,8 @@
 
 static const GF_FilterArgs ISOFFInArgs[] =
 {
-	{ OFFS(src), "location of source content", GF_PROP_NAME, NULL, NULL, 0},
-	{ OFFS(allt), "load all tracks even if unknown", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(src), "local file name of source content (only used when explicitly loading the filter)", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(allt), "load all tracks even if unknown media type", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(noedit), "do not use edit lists", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(itt), "convert all items of root meta into a single PID", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(itemid), "keep item IDs in PID properties", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
@@ -1339,26 +1534,31 @@
 	"- split: each track is declared, extractors are removed\n"
 	"- splitx: each track is declared, extractors are kept\n"
 	"- single: a single track is declared (highest level for scalable, tile base for tiling)", GF_PROP_UINT, "split", "split|splitx|single", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(alltk), "declare all tracks even disabled ones", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(alltk), "declare disabled tracks", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(frame_size), "frame size for raw audio samples (dispatches frame_size samples per packet)", GF_PROP_UINT, "1024", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(expart), "expose cover art as a dedicated video pid", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(expart), "expose cover art as a dedicated video PID", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(sigfrag), "signal fragment and segment boundaries of source on output packets", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 
-	{ OFFS(tkid), "declare only track based on given param"
+	{ OFFS(tkid), "declare only track based on given param\n"
 	"- integer value: declares track with the given ID\n"
 	"- audio: declares first audio track\n"
 	"- video: declares first video track\n"
 	"- 4CC: declares first track with matching 4CC for handler type", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(stsd), "only extract sample mapped to the given sample desciption index. 0 means no filter", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(stsd), "only extract sample mapped to the given sample description index (0 means extract all)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(mov), "pointer to a read/edit ISOBMF file used internally by importers and exporters", GF_PROP_POINTER, NULL, NULL, GF_FS_ARG_HINT_HIDE},
-	{ OFFS(analyze), "skip reformat of decoder config and SEI and dispatch all NAL in input order - shall only be used with inspect filter analyze mode!", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_HIDE},
+	{ OFFS(analyze), "skip reformat of decoder config and SEI and dispatch all NAL in input order - shall only be used with inspect filter analyze mode!", GF_PROP_UINT, "off", "off|on|bs|full", GF_FS_ARG_HINT_HIDE},
 	{ OFFS(catseg), "append the given segment to the movie at init time (only local file supported)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_HIDE},
 	{ OFFS(nocrypt), "signal encrypted tracks as non encrypted (mostly used for export)", GF_PROP_BOOL, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(mstore_size), "target buffer size in bytes", GF_PROP_UINT, "1000000", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(mstore_purge), "minimum size in bytes between memory purges when reading from memory stream (pipe etc...), 0 means purge as soon as possible", GF_PROP_UINT, "50000", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mstore_size), "target buffer size in bytes when reading from memory stream (pipe etc...)", GF_PROP_UINT, "1000000", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mstore_purge), "minimum size in bytes between memory purges when reading from memory stream, 0 means purge as soon as possible", GF_PROP_UINT, "50000", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(mstore_samples), "minimum number of samples to be present before purging sample tables when reading from memory stream (pipe etc...), 0 means purge as soon as possible", GF_PROP_UINT, "50", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(strtxt), "load text tracks (apple/tx3g) as MPEG-4 streaming text tracks", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-
+	{ OFFS(xps_check), "parameter sets extraction mode from AVC/HEVC/VVC samples\n"
+	"- keep: do not inspect sample (assumes input file is compliant when generating DASH/HLS/CMAF)\n"
+	"- rem: removes all inband xPS and notify configuration changes accordingly\n"
+	"- auto: resolves to `keep` for `smode=splix` (dasher mode), `rem` otherwise"
+	, GF_PROP_UINT, "auto", "auto|keep|rem", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(nodata), "do not load sample data", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -1376,13 +1576,17 @@
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
 
 	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
-	//we don't set output cap for streamtype FILE for now.
+	{0},
+	//also declare generic file output for embedded files (cover art & co), but explicit to skip this cap in chain resolution
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT | GF_CAPFLAG_LOADED_FILTER ,GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE)
 };
 
 GF_FilterRegister ISOFFInRegister = {
 	.name = "mp4dmx",
-	GF_FS_SET_DESCRIPTION("ISOBMFF/QT demuxer")
-	GF_FS_SET_HELP("This filter demultiplexes ISOBMF and QT files (regular or fragmented).\n"
+	GF_FS_SET_DESCRIPTION("ISOBMFF/QT demultiplexer")
+	GF_FS_SET_HELP("This filter demultiplexes ISOBMF and QT files.\n"
+		"Input ISOBMFF/QT can be regular or fragmented, and available as files or as raw bytestream.\n"
 		"# Track Selection\n"
 		"The filter can use fragment identifiers of source to select a single track for playback. The allowed fragments are:\n"
 		" - #audio: only use the first audio track\n"
@@ -1395,14 +1599,15 @@
 		" - #VAL: only use the track with given ID\n"
 		"\n"
 		"# Scalable Tracks\n"
-		"When scalable tracks are present in a file, the reader can operate in 3 modes using [-smode]() option:\n"\
-	 	"- smode=single: resolves all extractors to extract a single bitstream from a scalable set. The highest level is used\n"\
-	 	"In this mode, there is no enhancement decoder config, only a base one resulting from the merge of the configs\n"\
-	 	"- smode=split: all extractors are removed and every track of the scalable set is declared. In this mode, each enhancement track has no base decoder config\n"
-	 	"and an enhancement decoder config.\n"\
-	 	"- smode=splitx: extractors are kept in the bitstream, and every track of the scalable set is declared. In this mode, each enhancement track has a base decoder config\n"
-	 	" (copied from base) and an enhancement decoder config. This is mostly used for DASHing content.\n"\
-	 	"Warning: smode=splitx will result in extractor NAL units still present in the output bitstream, which shall only be true if the output is ISOBMFF based\n")
+		"When scalable tracks are present in a file, the reader can operate in 3 modes using [-smode]() option:\n"
+		"- smode=single: resolves all extractors to extract a single bitstream from a scalable set. The highest level is used\n"
+		"In this mode, there is no enhancement decoder config, only a base one resulting from the merge of the layers configurations\n"
+		"- smode=split: all extractors are removed and every track of the scalable set is declared. In this mode, each enhancement track has no base decoder config\n"
+		"and an enhancement decoder config.\n"
+		"- smode=splitx: extractors are kept in the bitstream, and every track of the scalable set is declared. In this mode, each enhancement track has a base decoder config\n"
+		" (copied from base) and an enhancement decoder config. This is mostly used for DASHing content.\n"
+		"Warning: smode=splitx will result in extractor NAL units still present in the output bitstream, which shall only be true if the output is ISOBMFF based\n"
+	 	)
 	.private_size = sizeof(ISOMReader),
 	.args = ISOFFInArgs,
 	.initialize = isoffin_initialize,

gpac-1.0.1.tar.gz/src/filters/isoffin_read_ch.c -> gpac-2.0.0.tar.gz/src/filters/isoffin_read_ch.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISOBMFF reader filter
@@ -107,7 +107,7 @@
 		ch->disable_seek = GF_TRUE;
 		ch->au_seq_num = ch->sample_num;
 	} else {
-		//if seek is disabled, get the next closest sample for this time; otherwose, get the previous RAP sample for this time
+		//if seek is disabled, get the next closest sample for this time; otherwise, get the previous RAP sample for this time
 		u32 mode = ch->disable_seek ? GF_ISOM_SEARCH_BACKWARD : GF_ISOM_SEARCH_SYNC_BACKWARD;
 
 		/*take care of seeking out of the track range*/
@@ -117,7 +117,11 @@
 			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->start, &sample_desc_index, mode, &ch->static_sample, &ch->sample_num, &ch->sample_data_offset);
 		} else {
 			ch->sample_num = 1;
-			ch->sample = gf_isom_get_sample_ex(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index, ch->static_sample, &ch->sample_data_offset);
+			if (ch->owner->nodata) {
+				ch->sample = gf_isom_get_sample_info_ex(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index, &ch->sample_data_offset, ch->static_sample);
+			} else {
+				ch->sample = gf_isom_get_sample_ex(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index, ch->static_sample, &ch->sample_data_offset);
+			}
 			if (!ch->sample) ch->last_state = GF_EOS;
 		}
 		if (ch->last_state) {
@@ -165,11 +169,16 @@
 		ch->cts = ch->sample->DTS + ch->sample->CTS_Offset;
 		ch->start = 0;
 	} else {
+		s64 cts;
 		ch->dts = ch->start;
 		ch->cts = ch->start;
 
+		cts = ch->sample->DTS + ch->sample->CTS_Offset;
+		if (ch->ts_offset<0)
+			cts += ch->ts_offset;
+
 		//TODO - we need to notify scene decoder how many secs elapsed between RAP and seek point
-		if (ch->cts != ch->sample->DTS + ch->sample->CTS_Offset) {
+		if (ch->cts != cts) {
 			ch->seek_flag = 1;
 		}
 	}
@@ -178,6 +187,94 @@
 	ch->owner->no_order_check = ch->speed < 0 ? GF_TRUE : GF_FALSE;
 }
 
+
+static void isor_update_cenc_info(ISOMChannel *ch, Bool for_item)
+{
+	GF_Err e;
+	Bool Is_Encrypted;
+	u32 out_size;
+	u8 crypt_byte_block, skip_byte_block;
+	u8 piff_info[20];
+	u8 *key_info = NULL;
+	u32 key_info_size = 0;
+	u8 item_mkey = 0;
+
+	//this will be skipped anyways, don't fectch ...
+	if (ch->owner->stsd && (ch->last_sample_desc_index != ch->owner->stsd) && ch->sample) {
+		return;
+	}
+
+
+	out_size = ch->sai_alloc_size;
+	if (for_item) {
+		u32 aux_info_param=0;
+		e = gf_isom_extract_meta_item_get_cenc_info(ch->owner->mov, GF_TRUE, 0, ch->item_id, &Is_Encrypted, &skip_byte_block, &crypt_byte_block, (const u8 **) &key_info, &key_info_size, &aux_info_param, &ch->sai_buffer, &out_size, &ch->sai_alloc_size);
+
+		/*The ienc property is always exposed as a multiple key info in GPAC
+		However the type of SAI may be single-key (aux_info_param==0) or multiple-key (aux_info_param==1) for the same ienc used
+		We therefore temporary force the key info type to single key if v0 SAI CENC are used
+		Note that this is thread safe as this filter is the only one using the opened file
+		*/
+		if (aux_info_param==0) {
+			item_mkey = key_info[0];
+		}
+	} else {
+		e = gf_isom_get_sample_cenc_info(ch->owner->mov, ch->track, ch->sample_num, &Is_Encrypted, &crypt_byte_block, &skip_byte_block, (const u8 **) &key_info, &key_info_size);
+	}
+	if (!key_info) {
+		piff_info[0] = 0;
+		piff_info[1] = 0;
+		piff_info[2] = 0;
+		piff_info[3] = key_info_size;
+		memset(piff_info + 4, 0, 16);
+		key_info_size = 20;
+		key_info = (u8 *) piff_info;
+	}
+
+
+	if (!for_item && (e==GF_OK) && Is_Encrypted) {
+		e = gf_isom_cenc_get_sample_aux_info(ch->owner->mov, ch->track, ch->sample_num, ch->last_sample_desc_index, NULL, &ch->sai_buffer, &out_size);
+	}
+
+	if (out_size > ch->sai_alloc_size) ch->sai_alloc_size = out_size;
+	ch->sai_buffer_size = out_size;
+
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] Failed to fetch CENC auxiliary info for %s %d: %s\n", for_item ? "item" : "track", for_item ? ch->item_id : ch->track, gf_error_to_string(e) ));
+		return;
+	}
+
+	ch->pck_encrypted = Is_Encrypted;
+	ch->cenc_ki = NULL;
+
+	/*notify change of IV/KID only when packet is encrypted
+	1- these info are ignored when packet is not encrypted
+	2- this allows us to define the initial CENC state for multi-stsd cases*/
+	if (Is_Encrypted) {
+		u32 ki_crc;
+
+		if ((ch->crypt_byte_block != crypt_byte_block) || (ch->skip_byte_block != skip_byte_block)) {
+			ch->crypt_byte_block = crypt_byte_block;
+			ch->skip_byte_block = skip_byte_block;
+
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_PATTERN, &PROP_FRAC_INT(ch->skip_byte_block, ch->crypt_byte_block) );
+		}
+		if (item_mkey)
+			key_info[0] = 0;
+
+		ki_crc = gf_crc_32(key_info, key_info_size);
+		if (ch->key_info_crc != ki_crc) {
+			ch->key_info_crc = ki_crc;
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_KEY_INFO, &PROP_DATA((u8 *)key_info, key_info_size) );
+		}
+
+		if (item_mkey)
+			key_info[0] = item_mkey;
+
+		ch->cenc_ki = gf_filter_pid_get_property(ch->pid, GF_PROP_PID_CENC_KEY_INFO);
+	}
+}
+
 void isor_reader_get_sample_from_item(ISOMChannel *ch)
 {
 	if (ch->au_seq_num) {
@@ -194,8 +291,13 @@
 
 	ch->sample = ch->static_sample;
 	ch->sample->IsRAP = RAP;
+	ch->au_duration = 1000;
 	ch->dts = ch->cts = 1000 * ch->au_seq_num;
 	gf_isom_extract_meta_item_mem(ch->owner->mov, GF_TRUE, 0, ch->item_id, &ch->sample->data, &ch->sample->dataLength, &ch->static_sample->alloc_size, NULL, GF_FALSE);
+
+	if (ch->is_encrypted && ch->is_cenc) {
+		isor_update_cenc_info(ch, GF_TRUE);
+	}
 }
 
 void isor_reader_get_sample(ISOMChannel *ch)
@@ -262,8 +364,10 @@
 				ch->edit_sync_frame++;
 				if (ch->edit_sync_frame < ch->sample_num) {
 					ch->sample = gf_isom_get_sample_ex(ch->owner->mov, ch->track, ch->edit_sync_frame, &sample_desc_index, ch->static_sample, &ch->sample_data_offset);
-					ch->sample->DTS = ch->sample_time;
-					ch->sample->CTS_Offset = 0;
+					if (ch->sample) {
+						ch->sample->DTS = ch->sample_time;
+						ch->sample->CTS_Offset = 0;
+					}
 				} else {
 					ch->edit_sync_frame = 0;
 					if (ch->sample) ch->sample_time = ch->sample->DTS;
@@ -282,7 +386,13 @@
 							u32 time_diff = gf_isom_get_sample_duration(ch->owner->mov, ch->track, sample_num);
 							e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + time_diff, &sample_desc_index, GF_ISOM_SEARCH_FORWARD, &ch->static_sample, &ch->sample_num, &ch->sample_data_offset);
 							if (e==GF_OK) {
-								ch->sample = ch->static_sample;
+								if (ch->sample_num == prev_sample) {
+									ch->sample_time += time_diff;
+									ch->sample = NULL;
+									return;
+								} else {
+									ch->sample = ch->static_sample;
+								}
 							}
 						}
 					}
@@ -296,7 +406,7 @@
 					ch->sample = NULL;
 					e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &sample_desc_index, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->static_sample, &ch->sample_num, &ch->sample_data_offset);
 
-					if (e == GF_OK) ch->sample = ch->static_sample;
+					ch->sample = (e == GF_OK) ? ch->static_sample : NULL;
 
 					/*if no sync point in the past, use the first non-sync for the given time*/
 					if (!ch->sample || !ch->sample->data) {
@@ -333,7 +443,11 @@
 			}
 		}
 		if (do_fetch) {
-			ch->sample = gf_isom_get_sample_ex(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index, ch->static_sample, &ch->sample_data_offset);
+			if (ch->owner->nodata) {
+				ch->sample = gf_isom_get_sample_info_ex(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index, &ch->sample_data_offset, ch->static_sample);
+			} else {
+				ch->sample = gf_isom_get_sample_ex(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index, ch->static_sample, &ch->sample_data_offset);
+			}
 			/*if sync shadow / carousel RAP skip*/
 			if (ch->sample && (ch->sample->IsRAP==RAP_REDUNDANT)) {
 				ch->sample = NULL;
@@ -359,12 +473,19 @@
 		/*incomplete file - check if we're still downloading or not*/
 		if (gf_isom_get_missing_bytes(ch->owner->mov, ch->track)) {
 			ch->last_state = GF_ISOM_INCOMPLETE_FILE;
+			if (ch->owner->mem_load_mode==2)
+				ch->owner->force_fetch = GF_TRUE;
+
 			if (!ch->owner->input_loaded) {
 				ch->last_state = GF_OK;
 				if (!ch->has_edit_list && ch->sample_num)
 					ch->sample_num--;
 			} else {
-				if (ch->sample_num >= gf_isom_get_sample_count(ch->owner->mov, ch->track)) {
+				if (ch->to_init && ch->sample_num) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] Failed to fetch initial sample %d for track %d\n", ch->sample_num, ch->track));
+					ch->last_state = GF_ISOM_INVALID_FILE;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] File truncated, aborting read for track %d\n", ch->track));
 					ch->last_state = GF_EOS;
 				}
 			}
@@ -386,7 +507,12 @@
 				if (ch->sample_num>sample_count) ch->sample_num = sample_count;
 			}
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track #%d fail to fetch sample %d / %d: %s\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track), gf_error_to_string(gf_isom_last_error(ch->owner->mov)) ));
+			e = gf_isom_last_error(ch->owner->mov);
+			GF_LOG((e==GF_ISOM_INCOMPLETE_FILE) ? GF_LOG_DEBUG : GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Track #%d fail to fetch sample %d / %d: %s\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track), gf_error_to_string(e) ));
+
+			if ((e<GF_OK) && (e!=GF_ISOM_INCOMPLETE_FILE)) {
+				ch->last_state = GF_EOS;
+			}
 		}
 		return;
 	}
@@ -410,31 +536,35 @@
 	ch->sap_3 = GF_FALSE;
 	ch->sap_4_type = 0;
 	ch->roll = 0;
+	ch->set_disc = ch->owner->clock_discontinuity ? 2 : 0;
+	ch->owner->clock_discontinuity = 0;
+
 	if (ch->sample) {
 		gf_isom_get_sample_rap_roll_info(ch->owner->mov, ch->track, ch->sample_num, &ch->sap_3, &ch->sap_4_type, &ch->roll);
-	}
 
-	/*still seeking or not ?
-	 1- when speed is negative, the RAP found is "after" the seek point in playback order since we used backward RAP search: nothing to do
-	 2- otherwise set DTS+CTS to start value
-	 */
-	if ((ch->speed < 0) || (ch->start <= ch->sample->DTS + ch->sample->CTS_Offset)) {
-		ch->dts = ch->sample->DTS;
-		ch->cts = ch->sample->DTS + ch->sample->CTS_Offset;
-		ch->seek_flag = 0;
-	} else {
-		ch->cts = ch->start;
-		ch->seek_flag = 1;
-		ch->dts = ch->start;
-	}
-	ch->set_disc = ch->owner->clock_discontinuity ? 2 : 0;
-	ch->owner->clock_discontinuity = 0;
+		/*still seeking or not ?
+		 1- when speed is negative, the RAP found is "after" the seek point in playback order since we used backward RAP search: nothing to do
+		 2- otherwise set DTS+CTS to start value
+		 */
+		if ((ch->speed < 0) || (ch->start <= ch->sample->DTS + ch->sample->CTS_Offset)) {
+			ch->dts = ch->sample->DTS;
+			ch->cts = ch->sample->DTS + ch->sample->CTS_Offset;
+			ch->seek_flag = 0;
+		} else {
+			ch->cts = ch->start;
+			ch->seek_flag = 1;
+			ch->dts = ch->start;
+		}
 
-	if (ch->end && (ch->end < ch->sample->DTS + ch->sample->CTS_Offset + ch->au_duration)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] End of Channel "LLD" (CTS "LLD")\n", ch->end, ch->sample->DTS + ch->sample->CTS_Offset));
-		ch->last_state = GF_EOS;
-		ch->playing = GF_FALSE;
+		if (ch->end && (ch->end < ch->sample->DTS + ch->sample->CTS_Offset + ch->au_duration)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[IsoMedia] End of Channel "LLD" (CTS "LLD")\n", ch->end, ch->sample->DTS + ch->sample->CTS_Offset));
+			ch->sample = NULL;
+			ch->last_state = GF_EOS;
+			ch->playing = 2;
+			return;
+		}
 	}
+
 	if (ch->owner->last_sender_ntp && ch->cts==ch->owner->cts_for_last_sender_ntp) {
 		ch->sender_ntp = ch->owner->last_sender_ntp;
 		ch->ntp_at_server_ntp = ch->owner->ntp_at_last_sender_ntp;
@@ -452,54 +582,7 @@
 	if (ch->is_encrypted) {
 		/*in case of CENC: we write sample auxiliary information to slh->sai; its size is in saiz*/
 		if (gf_isom_is_cenc_media(ch->owner->mov, ch->track, ch->last_sample_desc_index)) {
-			Bool Is_Encrypted;
-			u32 out_size;
-			u8 IV_size;
-			bin128 KID;
-			u8 crypt_byte_block, skip_byte_block;
-			u8 constant_IV_size;
-			bin128 constant_IV;
-
-			ch->cenc_state_changed = 0;
-			gf_isom_get_sample_cenc_info(ch->owner->mov, ch->track, ch->sample_num, &Is_Encrypted, &IV_size, &KID, &crypt_byte_block, &skip_byte_block, &constant_IV_size, &constant_IV);
-
-			if (Is_Encrypted != ch->pck_encrypted) {
-				ch->pck_encrypted = Is_Encrypted;
-				ch->cenc_state_changed = 1;
-			}
-			/*notify change of IV/KID only when packet is encrypted
-			1- these info are ignored when packet is not encrypted
-			2- this allows us to define the initial CENC state for multi-stsd cases*/
-			if (Is_Encrypted) {
-				if (ch->IV_size != IV_size) {
-					ch->IV_size = IV_size;
-					ch->cenc_state_changed = 1;
-				}
-				if ((ch->crypt_byte_block != crypt_byte_block) || (ch->skip_byte_block != skip_byte_block)) {
-					ch->crypt_byte_block = crypt_byte_block;
-					ch->skip_byte_block = skip_byte_block;
-					ch->cenc_state_changed = 1;
-				}
-				if (!ch->IV_size) {
-					if (ch->constant_IV_size != constant_IV_size) {
-						ch->constant_IV_size = constant_IV_size;
-						ch->cenc_state_changed = 1;
-					} else if (memcmp(ch->constant_IV, constant_IV, ch->constant_IV_size)) {
-						ch->cenc_state_changed = 1;
-					}
-					memmove(ch->constant_IV, constant_IV, ch->constant_IV_size);
-				}
-				if (memcmp(ch->KID, KID, sizeof(bin128))) {
-					memcpy(ch->KID, KID, sizeof(bin128));
-					ch->cenc_state_changed = 1;
-				}
-			}
-
-			out_size = ch->sai_alloc_size;
-
-			gf_isom_cenc_get_sample_aux_info_buffer(ch->owner->mov, ch->track, ch->sample_num, ch->last_sample_desc_index, NULL, &ch->sai_buffer, &out_size);
-			if (out_size > ch->sai_alloc_size) ch->sai_alloc_size = out_size;
-			ch->sai_buffer_size = out_size;
+			isor_update_cenc_info(ch, GF_FALSE);
 
 		} else if (gf_isom_is_media_encrypted(ch->owner->mov, ch->track, ch->last_sample_desc_index)) {
 			ch->pck_encrypted = GF_TRUE;
@@ -522,7 +605,7 @@
 static void isor_reset_seq_list(GF_List *list)
 {
 	while (gf_list_count(list)) {
-		GF_AVCConfigSlot *sl = gf_list_pop_back(list);
+		GF_NALUFFParam *sl = gf_list_pop_back(list);
 		gf_free(sl->data);
 		gf_free(sl);
 	}
@@ -534,29 +617,31 @@
 	RESET_STATE_SPS=1<<1,
 	RESET_STATE_PPS=1<<2,
 	RESET_STATE_SPS_EXT=1<<3,
+	RESET_STATE_DCI=1<<4,
 };
 
-static void isor_replace_nal(GF_AVCConfig *avcc, GF_HEVCConfig *hvcc, u8 *data, u32 size, u8 nal_type, u32 *reset_state)
+static void isor_replace_nal(ISOMChannel *ch, u8 *data, u32 size, u8 nal_type, u32 *reset_state)
 {
 	u32 i, count, state=0;
-	GF_AVCConfigSlot *sl;
+	GF_NALUFFParam *sl;
 	GF_List *list=NULL;
-	if (avcc) {
+	if (ch->avcc) {
 		if (nal_type==GF_AVC_NALU_PIC_PARAM) {
-			list = avcc->pictureParameterSets;
+			list = ch->avcc->pictureParameterSets;
 			state=RESET_STATE_PPS;
 		} else if (nal_type==GF_AVC_NALU_SEQ_PARAM) {
-			list = avcc->sequenceParameterSets;
+			list = ch->avcc->sequenceParameterSets;
 			state=RESET_STATE_SPS;
 		} else if (nal_type==GF_AVC_NALU_SEQ_PARAM_EXT) {
-			list = avcc->sequenceParameterSetExtensions;
+			list = ch->avcc->sequenceParameterSetExtensions;
 			state=RESET_STATE_SPS_EXT;
 		} else return;
-	} else if (hvcc) {
-		GF_HEVCParamArray *hvca=NULL;
-		count = gf_list_count(hvcc->param_array);
+	}
+	else if (ch->hvcc) {
+		GF_NALUFFParamArray *hvca=NULL;
+		count = gf_list_count(ch->hvcc->param_array);
 		for (i=0; i<count; i++) {
-			hvca = gf_list_get(hvcc->param_array, i);
+			hvca = gf_list_get(ch->hvcc->param_array, i);
 			if (hvca->type==nal_type) {
 				list = hvca->nalus;
 				break;
@@ -564,11 +649,11 @@
 			hvca = NULL;
 		}
 		if (!hvca) {
-			GF_SAFEALLOC(hvca, GF_HEVCParamArray);
+			GF_SAFEALLOC(hvca, GF_NALUFFParamArray);
 			if (hvca) {
 				list = hvca->nalus = gf_list_new();
 				hvca->type = nal_type;
-				gf_list_add(hvcc->param_array, hvca);
+				gf_list_add(ch->hvcc->param_array, hvca);
 			}
 		}
 		switch (nal_type) {
@@ -583,6 +668,42 @@
 			break;
 		}
 	}
+	else if (ch->vvcc) {
+		GF_NALUFFParamArray *vvca=NULL;
+		count = gf_list_count(ch->vvcc->param_array);
+		for (i=0; i<count; i++) {
+			vvca = gf_list_get(ch->vvcc->param_array, i);
+			if (vvca->type==nal_type) {
+				list = vvca->nalus;
+				break;
+			}
+			vvca = NULL;
+		}
+		if (!vvca) {
+			GF_SAFEALLOC(vvca, GF_NALUFFParamArray);
+			if (vvca) {
+				list = vvca->nalus = gf_list_new();
+				vvca->type = nal_type;
+				gf_list_add(ch->vvcc->param_array, vvca);
+			}
+		}
+		switch (nal_type) {
+		case GF_VVC_NALU_VID_PARAM:
+			state = RESET_STATE_VPS;
+			break;
+		case GF_VVC_NALU_SEQ_PARAM:
+			state = RESET_STATE_SPS;
+			break;
+		case GF_VVC_NALU_PIC_PARAM:
+			state = RESET_STATE_PPS;
+			break;
+		case GF_VVC_NALU_DEC_PARAM:
+			state = RESET_STATE_DCI;
+			break;
+		}
+	}
+
+	ch->xps_mask |= state;
 
 	count = gf_list_count(list);
 	for (i=0; i<count; i++) {
@@ -593,7 +714,7 @@
 		isor_reset_seq_list(list);
 		*reset_state |= state;
 	}
-	GF_SAFEALLOC(sl, GF_AVCConfigSlot);
+	GF_SAFEALLOC(sl, GF_NALUFFParam);
 	if (!sl) return;
 	sl->data = gf_malloc(sizeof(char)*size);
 	memcpy(sl->data, data, size);
@@ -601,41 +722,133 @@
 	gf_list_add(list, sl);
 }
 
+u8 key_info_get_iv_size(const u8 *key_info, u32 nb_keys, u32 idx, u8 *const_iv_size, const u8 **const_iv);
+
+void isor_sai_bytes_removed(ISOMChannel *ch, u32 pos, u32 removed)
+{
+	u32 offset = 0;
+	u8 *sai;
+	u32 sai_size, cur_pos;
+	u32 sub_count_size = 0;
+	u32 i, subs_count = 0;
+
+	if (!ch->cenc_ki || !ch->sai_buffer) return;
+
+	sai = ch->sai_buffer;
+	sai_size = ch->sai_buffer_size;
+
+	//multikey
+	if (ch->cenc_ki->value.data.ptr[0]) {
+		u32 remain;
+		u32 j, nb_iv_init = sai[0];
+		nb_iv_init <<= 8;
+		nb_iv_init |= sai[1];
+		u8 *sai_p = sai + 2;
+		remain = sai_size-2;
+
+		for (j=0; j<nb_iv_init; j++) {
+			u32 mk_iv_size;
+			u32 idx = sai_p[0];
+			idx<<=8;
+			idx |= sai_p[1];
+
+			mk_iv_size = key_info_get_iv_size(ch->cenc_ki->value.data.ptr, ch->cenc_ki->value.data.size, idx, NULL, NULL);
+			mk_iv_size += 2; //idx
+			if (mk_iv_size > remain) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Invalid multi-key CENC SAI, cannot modify first subsample !\n"));
+				return;
+			}
+			sai_p += mk_iv_size;
+			remain -= mk_iv_size;
+		}
+		offset = (u32) (sai_p - sai);
+		sub_count_size = 4; //32bit sub count
+
+	} else {
+		offset = key_info_get_iv_size(ch->cenc_ki->value.data.ptr, ch->cenc_ki->value.data.size, 1, NULL, NULL);
+		sub_count_size = 2; //16bit sub count
+	}
+	if (sai_size < offset + sub_count_size) return;
+
+	sai += offset;
+	if (sub_count_size==2) {
+		subs_count = ((u32) sai[0]) << 8 | sai[1];
+	} else {
+		subs_count = GF_4CC(sai[0], sai[1], sai[2], sai[3]);
+	}
+	sai += sub_count_size;
+	sai_size -= offset + sub_count_size;
+	cur_pos = 0;
+	for (i=0; i<subs_count; i++) {
+		if (sai_size<6)
+			return;
+		u32 clear = ((u32) sai[0]) << 8 | sai[1];
+		u32 crypt = GF_4CC(sai[2], sai[3], sai[4], sai[5]);
+		if (cur_pos + clear > pos) {
+			clear -= removed;
+			sai[0] = (clear>>8) & 0xFF;
+			sai[1] = (clear) & 0xFF;
+			return;
+		}
+		cur_pos += clear + crypt;
+		sai += 6;
+		sai_size-=6;
+	}
+}
+
 void isor_reader_check_config(ISOMChannel *ch)
 {
 	u32 nalu_len, reset_state;
-	if (!ch->check_hevc_ps && !ch->check_avc_ps && !ch->check_mhas_pl) return;
+	if (!ch->check_hevc_ps && !ch->check_avc_ps && !ch->check_vvc_ps && !ch->check_mhas_pl) return;
 
 	if (!ch->sample) return;
-	//we cannot touch the payload if encrypted !!
-	//TODO, in CENC try to remove non-encrypted NALUs and update saiz accordingly
-	if (ch->is_encrypted) return;
+	ch->xps_mask = 0;
+
+	//we cannot touch the payload if encrypted but not CENC !!
+	if (ch->is_encrypted && !ch->is_cenc)
+		return;
 
 	if (ch->check_mhas_pl) {
-		s32 PL = gf_mpegh_get_mhas_pl(ch->sample->data, ch->sample->dataLength);
+		//we cannot touch the payload if encrypted !!
+		if (ch->pck_encrypted) return;
+		u64 ch_layout = 0;
+		s32 PL = gf_mpegh_get_mhas_pl(ch->sample->data, ch->sample->dataLength, &ch_layout);
 		if (PL>0) {
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PROFILE_LEVEL, &PROP_UINT((u32) PL));
 			ch->check_mhas_pl = GF_FALSE;
+			if (ch_layout)
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(ch_layout));
 		}
 		return;
 	}
-
+	//analyze mode, do not rewrite
 	if (ch->owner->analyze) return;
-	
-	nalu_len = ch->hvcc ? ch->hvcc->nal_unit_size : (ch->avcc ? ch->avcc->nal_unit_size : 4);
+
+	//we cannot touch the payload if encrypted but no SAI buffer
+	if (ch->pck_encrypted && !ch->sai_buffer)
+		return;
+
+	nalu_len = 4;
+	if (ch->avcc) nalu_len = ch->avcc->nal_unit_size;
+	else if (ch->hvcc) nalu_len = ch->hvcc->nal_unit_size;
+	else if (ch->vvcc) nalu_len = ch->vvcc->nal_unit_size;
+
 	reset_state = 0;
 
 	if (!ch->nal_bs) ch->nal_bs = gf_bs_new(ch->sample->data, ch->sample->dataLength, GF_BITSTREAM_READ);
 	else gf_bs_reassign_buffer(ch->nal_bs, ch->sample->data, ch->sample->dataLength);
 
-	while (gf_bs_available(ch->nal_bs)) {
+	while (1) {
 		Bool replace_nal = GF_FALSE;
 		u8 nal_type=0;
 		u32 pos = (u32) gf_bs_get_position(ch->nal_bs);
+		if (pos + nalu_len >= ch->sample->dataLength) break;
 		u32 size = gf_bs_read_int(ch->nal_bs, nalu_len*8);
+		//this takes care of size + pos + nalu_len > 0 but (s32) size < 0 ...
+		if (ch->sample->dataLength < size) break;
 		if (ch->sample->dataLength < size + pos + nalu_len) break;
-		u8 hdr = gf_bs_peek_bits(ch->nal_bs, 8, 0);
 		if (ch->check_avc_ps) {
+			u8 hdr = gf_bs_peek_bits(ch->nal_bs, 8, 0);
 			nal_type = hdr & 0x1F;
 			switch (nal_type) {
 			case GF_AVC_NALU_SEQ_PARAM:
@@ -645,7 +858,8 @@
 				break;
 			}
 		}
-		if (ch->check_hevc_ps) {
+		else if (ch->check_hevc_ps) {
+			u8 hdr = gf_bs_peek_bits(ch->nal_bs, 8, 0);
 			nal_type = (hdr & 0x7E) >> 1;
 			switch (nal_type) {
 			case GF_HEVC_NALU_VID_PARAM:
@@ -655,17 +869,33 @@
 				break;
 			}
 		}
+		else if (ch->check_vvc_ps) {
+			u8 hdr = gf_bs_peek_bits(ch->nal_bs, 8, 1);
+			nal_type = hdr >> 3;
+			switch (nal_type) {
+			case GF_VVC_NALU_VID_PARAM:
+			case GF_VVC_NALU_SEQ_PARAM:
+			case GF_VVC_NALU_PIC_PARAM:
+			case GF_VVC_NALU_DEC_PARAM:
+				replace_nal = GF_TRUE;
+				break;
+			}
+		}
 		gf_bs_skip_bytes(ch->nal_bs, size);
 
 		if (replace_nal) {
 			u32 move_size = ch->sample->dataLength - size - pos - nalu_len;
-			isor_replace_nal(ch->avcc, ch->hvcc, ch->sample->data + pos + nalu_len, size, nal_type, &reset_state);
+			isor_replace_nal(ch, ch->sample->data + pos + nalu_len, size, nal_type, &reset_state);
 			if (move_size)
 				memmove(ch->sample->data + pos, ch->sample->data + pos + size + nalu_len, ch->sample->dataLength - size - pos - nalu_len);
 
 			ch->sample->dataLength -= size + nalu_len;
 			gf_bs_reassign_buffer(ch->nal_bs, ch->sample->data, ch->sample->dataLength);
 			gf_bs_seek(ch->nal_bs, pos);
+
+			//remove nal from clear subsample range
+			if (ch->pck_encrypted)
+				isor_sai_bytes_removed(ch, pos, nalu_len+size);
 		}
 	}
 
@@ -678,6 +908,9 @@
 		else if (ch->check_hevc_ps) {
 			gf_odf_hevc_cfg_write(ch->hvcc, &dsi, &dsi_size);
 		}
+		else if (ch->check_vvc_ps) {
+			gf_odf_vvc_cfg_write(ch->vvcc, &dsi, &dsi_size);
+		}
 		if (dsi && dsi_size) {
 			u32 dsi_crc = gf_crc_32(dsi, dsi_size);
 			if (ch->dsi_crc == dsi_crc) {
@@ -690,4 +923,60 @@
 	}
 }
 
+
+
+void isor_set_sample_groups_and_aux_data(ISOMReader *read, ISOMChannel *ch, GF_FilterPacket *pck)
+{
+	char szPName[30];
+
+	u32 grp_idx=0;
+	while (1) {
+		u32 grp_type=0, grp_size=0, grp_parameter=0;
+		const u8 *grp_data=NULL;
+		GF_Err e = gf_isom_enum_sample_group(read->mov, ch->track, ch->sample_num, &grp_idx, &grp_type, &grp_parameter, &grp_data, &grp_size);
+		if (e) continue;
+		if (!grp_type) break;
+		if (!grp_size || !grp_data) continue;
+
+		if (grp_type == GF_4CC('P','S','S','H')) {
+			gf_filter_pck_set_property(pck, GF_PROP_PID_CENC_PSSH, &PROP_DATA((u8*)grp_data, grp_size) );
+			continue;
+		}
+		//all other are mapped to sample groups
+		if (grp_parameter) sprintf(szPName, "grp_%s_%d", gf_4cc_to_str(grp_type), grp_parameter);
+		else sprintf(szPName, "grp_%s", gf_4cc_to_str(grp_type));
+
+		gf_filter_pck_set_property_dyn(pck, szPName, &PROP_DATA((u8*)grp_data, grp_size) );
+	}
+
+	u32 sai_idx=0;
+	while (1) {
+		u32 sai_type=0, sai_size=0, sai_parameter=0;
+		u8 *sai_data=NULL;
+		GF_Err e = gf_isom_enum_sample_aux_data(read->mov, ch->track, ch->sample_num, &sai_idx, &sai_type, &sai_parameter, &sai_data, &sai_size);
+		if (e) continue;
+		if (!sai_type) break;
+		if (!sai_size || !sai_data) continue;
+
+		//all other are mapped to sample groups
+		if (sai_parameter) sprintf(szPName, "sai_%s_%d", gf_4cc_to_str(sai_type), sai_parameter);
+		else sprintf(szPName, "sai_%s", gf_4cc_to_str(sai_type));
+
+		gf_filter_pck_set_property_dyn(pck, szPName, &PROP_DATA_NO_COPY(sai_data, sai_size) );
+	}
+
+
+	while (1) {
+		GF_Err gf_isom_pop_emsg(GF_ISOFile *the_file, u8 **emsg_data, u32 *emsg_size);
+		u8 *data=NULL;
+		u32 size;
+		GF_Err e = gf_isom_pop_emsg(read->mov, &data, &size);
+		if (e || !data) break;
+
+		gf_filter_pck_set_property_str(pck, "emsg", &PROP_DATA_NO_COPY(data, size));
+	}
+
+}
+
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-1.0.1.tar.gz/src/filters/jsfilter.c -> gpac-2.0.0.tar.gz/src/filters/jsfilter.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / QuickJS bindings for GF_Filter
@@ -105,7 +105,9 @@
 	JSF_FILTER_CLOCK_HINT_TIME,
 	JSF_FILTER_CLOCK_HINT_MEDIATIME,
 	JSF_FILTER_CONNECTIONS_PENDING,
-	JSF_FILTER_INAME
+	JSF_FILTER_INAME,
+	JSF_FILTER_REQUIRE_SOURCEID,
+	JSF_FILTER_PATH
 };
 
 enum
@@ -122,6 +124,7 @@
 	const char *js;
 
 	GF_Filter *filter;
+	Bool is_custom;
 
 	JSContext *ctx;
 
@@ -150,11 +153,13 @@
 	JSF_PID_NAME=0,
 	JSF_PID_EOS,
 	JSF_PID_EOS_SEEN,
+	JSF_PID_EOS_RECEIVED,
 	JSF_PID_WOULD_BLOCK,
 	JSF_PID_FILTER_NAME,
 	JSF_PID_FILTER_SRC,
 	JSF_PID_FILTER_ARGS,
 	JSF_PID_FILTER_SRC_ARGS,
+	JSF_PID_FILTER_UNICITY_ARGS,
 	JSF_PID_MAX_BUFFER,
 	JSF_PID_LOOSE_CONNECT,
 	JSF_PID_FRAMING_MODE,
@@ -172,6 +177,7 @@
 	JSF_PID_RECOMPUTE_DTS,
 	JSF_PID_MIN_PCK_DUR,
 	JSF_PID_IS_PLAYING,
+	JSF_PID_NEXT_TS,
 };
 typedef struct
 {
@@ -186,7 +192,8 @@
 {
 	GF_JS_PCK_IS_REF = 1,
 	GF_JS_PCK_IS_SHARED = 1<<1,
-	GF_JS_PCK_IS_OUTPUT = 1<<2
+	GF_JS_PCK_IS_OUTPUT = 1<<2,
+	GF_JS_PCK_IS_DANGLING = 1<<3,
 };
 
 typedef struct _js_pck_ctx
@@ -296,16 +303,28 @@
 {
 GF_JSPckCtx *pckctx = JS_GetOpaque(val, jsf_pck_class_id);
 if (!pckctx) return;
- pckctx->jspid->pck_head = NULL;
-
-	/*we only keep a ref for input packet(s)*/
-	if (pckctx->pck && !(pckctx->flags & GF_JS_PCK_IS_OUTPUT))
-		JS_FreeValueRT(rt, pckctx->jsobj);
 
 	if (!JS_IsUndefined(pckctx->data_ab)) {
 		JS_FreeValueRT(rt, pckctx->data_ab);
 		pckctx->data_ab = JS_UNDEFINED;
 	}
+	//dangling packet
+	if (pckctx->flags & GF_JS_PCK_IS_DANGLING) {
+		//we don't keep a ref on jsobj
+		//we may need to destroy the underlying packet if GCed but .discard was never called
+		if (pckctx->pck) gf_filter_pck_discard(pckctx->pck);
+		//we don't recycle the structure memory (no pid context attached
+		gf_free(pckctx);
+		return;
+	}
+
+ if (pckctx->jspid)
+		pckctx->jspid->pck_head = NULL;
+
+	/*we only keep a ref for input packet(s)*/
+	if (pckctx->pck && !(pckctx->flags & GF_JS_PCK_IS_OUTPUT))
+		JS_FreeValueRT(rt, pckctx->jsobj);
+
 
 if (JS_IsUndefined(pckctx->ref_val) && pckctx->jspid && pckctx->jspid->jsf) {
 		gf_list_add(pckctx->jspid->jsf->pck_res, pckctx);
@@ -318,7 +337,7 @@
 GF_JSPckCtx *pckctx = JS_GetOpaque(val, jsf_pck_class_id);
 if (!pckctx) return;
 
-	if (!(pckctx->flags & GF_JS_PCK_IS_OUTPUT))
+	if (!(pckctx->flags & (GF_JS_PCK_IS_OUTPUT|GF_JS_PCK_IS_DANGLING)))
 		JS_MarkValue(rt, pckctx->jsobj, mark_func);
 
 if (!JS_IsUndefined(pckctx->ref_val)) {
@@ -350,18 +369,33 @@
 	return gf_filter_get_download_manager(jsf->filter);
 }
 
+GF_FilterSession *jsff_get_session(JSContext *c, JSValue this_val);
+struct _gf_ft_mgr *gf_fs_get_font_manager(GF_FilterSession *fsess);
+
 struct _gf_ft_mgr *jsf_get_font_manager(JSContext *c)
 {
-	GF_JSFilterCtx *jsf;
 	JSValue global = JS_GetGlobalObject(c);
+	JSValue obj;
 
-	JSValue filter_obj = JS_GetPropertyStr(c, global, "filter");
+	obj = JS_GetPropertyStr(c, global, "session");
+	if (!JS_IsNull(obj) && !JS_IsException(obj)) {
+		GF_FilterSession *fs = jsff_get_session(c, obj);
+		JS_FreeValue(c, obj);
+		if (fs) {
+			JS_FreeValue(c, global);
+			return gf_fs_get_font_manager(fs);
+		}
+	}
+
+	obj = JS_GetPropertyStr(c, global, "filter");
 	JS_FreeValue(c, global);
-	if (JS_IsNull(filter_obj) || JS_IsException(filter_obj)) return NULL;
-	jsf = JS_GetOpaque(filter_obj, jsf_filter_class_id);
-	JS_FreeValue(c, filter_obj);
-	if (!jsf) return NULL;
-	return gf_filter_get_font_manager(jsf->filter);
+	if (!JS_IsNull(obj) && !JS_IsException(obj)) {
+		GF_JSFilterCtx *jsf = JS_GetOpaque(obj, jsf_filter_class_id);
+		JS_FreeValue(c, obj);
+		if (jsf)
+			return gf_filter_get_font_manager(jsf->filter);
+	}
+	return NULL;
 }
 
 GF_Err jsf_request_opengl(JSContext *c)
@@ -449,11 +483,23 @@
 	JSValue global = JS_GetGlobalObject(c);
 	JSValue filter_obj = JS_GetPropertyStr(c, global, "filter");
 	JS_FreeValue(c, global);
-	if (JS_IsNull(filter_obj) || JS_IsException(filter_obj)) return NULL;
+	if (JS_IsNull(filter_obj) || JS_IsException(filter_obj)) {
+		return NULL;
+	}
+
 	jsf = JS_GetOpaque(filter_obj, jsf_filter_class_id);
 	JS_FreeValue(c, filter_obj);
-	if (!jsf) return NULL;
-	return jsf->js;
+	if (jsf) return jsf->js;
+
+	JSValue g = JS_GetGlobalObject(c);
+	JSValue v = JS_GetPropertyStr(c, g, "_gpac_script_src");
+	const char *parent = NULL;
+	if (!JS_IsUndefined(v))
+		parent = JS_ToCString(c, v);
+	JS_FreeValue(c, g);
+	JS_FreeCString(c, parent);
+	JS_FreeValue(c, v);
+	return parent;
 }
 
 JSValue jsf_NewProp(JSContext *ctx, const GF_PropertyValue *new_val)
@@ -466,9 +512,10 @@
 	case GF_PROP_BOOL:
 		return JS_NewBool(ctx, new_val->value.boolean);
 	case GF_PROP_UINT:
-		return JS_NewInt32(ctx, new_val->value.uint);
 	case GF_PROP_SINT:
 		return JS_NewInt32(ctx, new_val->value.sint);
+	case GF_PROP_4CC:
+		return JS_NewString(ctx, gf_4cc_to_str(new_val->value.uint) );
 	case GF_PROP_LUINT:
 		return JS_NewInt64(ctx, new_val->value.longuint);
 	case GF_PROP_LSINT:
@@ -487,19 +534,6 @@
 		JS_SetPropertyStr(ctx, res, "x", JS_NewFloat64(ctx, new_val->value.vec2.x));
 		JS_SetPropertyStr(ctx, res, "y", JS_NewFloat64(ctx, new_val->value.vec2.y));
 		return res;
-	case GF_PROP_VEC3:
-		res = JS_NewObject(ctx);
-		JS_SetPropertyStr(ctx, res, "x", JS_NewFloat64(ctx, new_val->value.vec3.x));
-		JS_SetPropertyStr(ctx, res, "y", JS_NewFloat64(ctx, new_val->value.vec3.y));
-		JS_SetPropertyStr(ctx, res, "z", JS_NewFloat64(ctx, new_val->value.vec3.z));
-		return res;
-	case GF_PROP_VEC4:
-		res = JS_NewObject(ctx);
-		JS_SetPropertyStr(ctx, res, "x", JS_NewFloat64(ctx, new_val->value.vec4.x));
-		JS_SetPropertyStr(ctx, res, "y", JS_NewFloat64(ctx, new_val->value.vec4.y));
-		JS_SetPropertyStr(ctx, res, "z", JS_NewFloat64(ctx, new_val->value.vec4.z));
-		JS_SetPropertyStr(ctx, res, "w", JS_NewFloat64(ctx, new_val->value.vec4.w));
-		return res;
 	case GF_PROP_VEC2I:
 		res = JS_NewObject(ctx);
 		JS_SetPropertyStr(ctx, res, "x", JS_NewInt32(ctx, new_val->value.vec2i.x));
@@ -528,26 +562,46 @@
 		JS_SetPropertyStr(ctx, res, "n", JS_NewInt64(ctx, new_val->value.lfrac.num));
 		JS_SetPropertyStr(ctx, res, "d", JS_NewInt64(ctx, new_val->value.lfrac.den));
 		return res;
-	case GF_PROP_PIXFMT:
-		return JS_NewString(ctx, gf_pixel_fmt_name(new_val->value.uint));
-	case GF_PROP_PCMFMT:
-		return JS_NewString(ctx, gf_audio_fmt_name(new_val->value.uint));
 	case GF_PROP_UINT_LIST:
 		res = JS_NewArray(ctx);
 		for (i=0; i<new_val->value.uint_list.nb_items; i++) {
- 	JS_SetPropertyUint32(ctx, res, i, JS_NewInt32(ctx, new_val->value.uint_list.vals[i]) );
+ 	JS_SetPropertyUint32(ctx, res, i, JS_NewInt64(ctx, new_val->value.uint_list.vals[i]) );
+		}
+		return res;
+	case GF_PROP_4CC_LIST:
+		res = JS_NewArray(ctx);
+		for (i=0; i<new_val->value.uint_list.nb_items; i++) {
+ 	JS_SetPropertyUint32(ctx, res, i, JS_NewString(ctx, gf_4cc_to_str(new_val->value.uint_list.vals[i]) ) );
+		}
+		return res;
+	case GF_PROP_SINT_LIST:
+		res = JS_NewArray(ctx);
+		for (i=0; i<new_val->value.sint_list.nb_items; i++) {
+ 	JS_SetPropertyUint32(ctx, res, i, JS_NewInt32(ctx, new_val->value.sint_list.vals[i]) );
+		}
+		return res;
+	case GF_PROP_VEC2I_LIST:
+		res = JS_NewArray(ctx);
+		for (i=0; i<new_val->value.v2i_list.nb_items; i++) {
+			JSValue item = JS_NewObject(ctx);
+			JS_SetPropertyStr(ctx, item, "x", JS_NewInt32(ctx, new_val->value.v2i_list.vals[i].x));
+			JS_SetPropertyStr(ctx, item, "y", JS_NewInt32(ctx, new_val->value.v2i_list.vals[i].y));
+ 	JS_SetPropertyUint32(ctx, res, i, item);
 		}
 		return res;
 	case GF_PROP_STRING_LIST:
 		res = JS_NewArray(ctx);
-		for (i=0; i<gf_list_count(new_val->value.string_list); i++) {
- 	JS_SetPropertyUint32(ctx, res, i, JS_NewString(ctx, gf_list_get(new_val->value.string_list, i) ) );
+		for (i=0; i<new_val->value.string_list.nb_items; i++) {
+ 	JS_SetPropertyUint32(ctx, res, i, JS_NewString(ctx, new_val->value.string_list.vals[i] ) );
 		}
 		return res;
 	case GF_PROP_DATA:
 		return JS_NewArrayBufferCopy(ctx, new_val->value.data.ptr, new_val->value.data.size);
 
 	default:
+		if (gf_props_type_is_enum(new_val->type)) {
+			return JS_NewString(ctx, gf_props_enum_name(new_val->type, new_val->value.uint));
+		}
 		return JS_NULL;
 	}
 }
@@ -559,7 +613,7 @@
 	switch (p4cc) {
 	case GF_PROP_PID_CODECID:
 		cid = gf_codecid_file_ext(prop->value.uint);
-		if (!cid) res = JS_EXCEPTION;
+		if (!cid) res = GF_JS_EXCEPTION(ctx);
 		else {
 			char *sep = strchr(cid, '|');
 			if (sep)
@@ -571,12 +625,18 @@
 	case GF_PROP_PID_STREAM_TYPE:
 		res = JS_NewString(ctx, gf_stream_type_name(prop->value.uint));
 		break;
+	case GF_PROP_PID_CHANNEL_LAYOUT:
+		res = JS_NewString(ctx, gf_audio_fmt_get_layout_name(prop->value.longuint));
+		break;
+	//PCM format and pixel format are usually notified as UINT types
 	case GF_PROP_PID_AUDIO_FORMAT:
-		res = JS_NewString(ctx, gf_audio_fmt_name(prop->value.uint));
+		res = JS_NewString(ctx, gf_props_enum_name(GF_PROP_PCMFMT, prop->value.uint));
 		break;
 	case GF_PROP_PID_PIXFMT:
-		res = JS_NewString(ctx, gf_pixel_fmt_name(prop->value.uint));
+	case GF_PROP_PID_PIXFMT_WRAPPED:
+		res = JS_NewString(ctx, gf_props_enum_name(GF_PROP_PIXFMT, prop->value.uint));
 		break;
+
 	default:
 		res = jsf_NewProp(ctx, prop);
 		break;
@@ -584,12 +644,12 @@
 	return res;
 }
 
-GF_Err jsf_ToProp(GF_Filter *filter, JSContext *ctx, JSValue value, u32 p4cc, GF_PropertyValue *prop)
+GF_Err jsf_ToProp_ex(GF_Filter *filter, JSContext *ctx, JSValue value, u32 p4cc, GF_PropertyValue *prop, u32 prop_type)
 {
 	u32 type;
 	memset(prop, 0, sizeof(GF_PropertyValue));
 
-	type = GF_PROP_STRING;
+	type = prop_type ? prop_type : GF_PROP_STRING;
 	if (p4cc)
 		type = gf_props_4cc_get_type(p4cc);
 
@@ -600,9 +660,12 @@
 			prop->value.uint = gf_stream_type_by_name(val_str);
 		} else if (p4cc==GF_PROP_PID_CODECID) {
 			prop->type = GF_PROP_UINT;
-			prop->value.uint = gf_codec_parse(val_str);
+			prop->value.uint = gf_codecid_parse(val_str);
+		} else if (p4cc==GF_PROP_PID_CHANNEL_LAYOUT) {
+			prop->type = GF_PROP_LUINT;
+			prop->value.longuint = gf_audio_fmt_get_layout_from_name(val_str);
 		} else {
-			*prop = gf_props_parse_value(type, NULL, val_str, NULL, gf_filter_get_sep(filter, GF_FS_SEP_LIST));
+			*prop = gf_props_parse_value(type, NULL, val_str, NULL, filter ? gf_filter_get_sep(filter, GF_FS_SEP_LIST) : ',');
 		}
 		JS_FreeCString(ctx, val_str);
 		if (prop->type==GF_PROP_FORBIDEN) return GF_BAD_PARAM;
@@ -614,7 +677,7 @@
 	}
 	else if (JS_IsInteger(value)) {
 		if (!JS_ToInt32(ctx, &prop->value.sint, value)) {
-			prop->type = GF_PROP_SINT;
+			prop->type = (p4cc && type) ? type : GF_PROP_SINT;
 		} else if (!JS_ToInt64(ctx, &prop->value.longsint, value)) {
 			prop->type = GF_PROP_LSINT;
 		}
@@ -654,15 +717,16 @@
 			}
 			if (!i) {
 				if (atype==1) {
-					prop->value.string_list = gf_list_new();
+					prop->value.uint_list.nb_items = (u32) len;
+					prop->value.uint_list.vals = gf_malloc((u32) (sizeof(char *)*len));
+				} else {
+					prop->value.uint_list.nb_items = (u32) len;
+					prop->value.uint_list.vals = gf_malloc((u32) (sizeof(s32)*len));
 				}
-			} else {
-				prop->value.uint_list.nb_items = (u32) len;
-				prop->value.uint_list.vals = gf_malloc((u32) (sizeof(s32)*len));
 			}
 			if (atype==1) {
 				const char *str = JS_ToCString(ctx, v);
-				gf_list_add(prop->value.string_list, gf_strdup(str));
+				prop->value.string_list.vals[i] = gf_strdup(str);
 				JS_FreeCString(ctx, str);
 			} else {
 				JS_ToInt32(ctx, &prop->value.uint_list.vals[i], v);
@@ -671,33 +735,27 @@
 		}
 	}
 	else if (JS_IsObject(value)) {
-		u32 is_vec4 = 0;
-		u32 is_vec3 = 0;
+		Bool is_vec4 = 0;
+		Bool is_vec3 = 0;
 		u32 is_vec2 = 0;
 		u32 is_frac = 0;
 		Bool is_vec = GF_FALSE;
-		GF_PropVec4 val_d;
+		GF_PropVec2 val_d;
 		GF_PropVec4i val_i;
 		GF_Fraction frac;
 		GF_Fraction64 frac_l;
 
 		JSValue res = JS_GetPropertyStr(ctx, value, "w");
 		if (!JS_IsUndefined(res)) {
+			JS_ToInt32(ctx, &val_i.w, res);
 			is_vec4 = 1;
-			if (JS_ToFloat64(ctx, &val_d.w, res)) {
-				JS_ToInt32(ctx, &val_i.w, res);
-				is_vec4 = 2;
-			}
 		}
 		JS_FreeValue(ctx, res);
 
 		res = JS_GetPropertyStr(ctx, value, "z");
 		if (!JS_IsUndefined(res)) {
+			JS_ToInt32(ctx, &val_i.z, res);
 			is_vec3 = 1;
-			if (JS_ToFloat64(ctx, &val_d.z, res)) {
-				JS_ToInt32(ctx, &val_i.z, res);
-				is_vec3 = 2;
-			}
 		}
 		JS_FreeValue(ctx, res);
 
@@ -744,30 +802,22 @@
 		}
 
 		if (is_vec) {
-			if (is_vec4==2) {
+			if (is_vec4) {
 				prop->type = GF_PROP_VEC4I;
 				prop->value.vec4i = val_i;
-			} else if (is_vec4==1) {
-				prop->type = GF_PROP_VEC4;
-				prop->value.vec4 = val_d;
-			} else if (is_vec3==2) {
+			} else if (is_vec3) {
 				prop->type = GF_PROP_VEC3I;
 				prop->value.vec3i.x = val_i.x;
 				prop->value.vec3i.y = val_i.y;
 				prop->value.vec3i.z = val_i.z;
-			} else if (is_vec3==1) {
-				prop->type = GF_PROP_VEC3;
-				prop->value.vec3.x = val_d.x;
-				prop->value.vec3.y = val_d.y;
-				prop->value.vec3.z = val_d.z;
 			} else if (is_vec2==2) {
 				prop->type = GF_PROP_VEC2I;
-				prop->value.vec3i.x = val_i.x;
-				prop->value.vec3i.y = val_i.y;
+				prop->value.vec2i.x = val_i.x;
+				prop->value.vec2i.y = val_i.y;
 			} else if (is_vec2==1) {
 				prop->type = GF_PROP_VEC2;
-				prop->value.vec3.x = val_d.x;
-				prop->value.vec3.y = val_d.y;
+				prop->value.vec2.x = val_d.x;
+				prop->value.vec2.y = val_d.y;
 			}
 		} else if (is_frac) {
 			if (is_frac==2) {
@@ -784,9 +834,24 @@
 			u8 *data = JS_GetArrayBuffer(ctx, &ab_size, value);
 			if (!data)
 				return GF_BAD_PARAM;
-			prop->value.data.ptr = gf_malloc(ab_size);
-			memcpy(prop->value.data.ptr, data, ab_size);
-			prop->value.data.size = (u32) ab_size;
+
+			if (prop_type==GF_PROP_CONST_DATA) {
+				prop->value.data.ptr = data;
+				prop->value.data.size = (u32) ab_size;
+				prop->type = GF_PROP_CONST_DATA;
+ 			} else {
+				prop->value.data.ptr = gf_malloc(ab_size);
+				memcpy(prop->value.data.ptr, data, ab_size);
+				prop->value.data.size = (u32) ab_size;
+				prop->type = GF_PROP_DATA;
+			}
+		}
+	} else if (JS_IsNull(value)) {
+		prop->value.data.ptr = NULL;
+		prop->value.data.size = 0;
+		if (prop_type==GF_PROP_CONST_DATA) {
+			prop->type = GF_PROP_CONST_DATA;
+		} else {
 			prop->type = GF_PROP_DATA;
 		}
 	} else {
@@ -805,14 +870,18 @@
 	return GF_OK;
 }
 
+GF_Err jsf_ToProp(GF_Filter *filter, JSContext *ctx, JSValue value, u32 p4cc, GF_PropertyValue *prop)
+{
+	return jsf_ToProp_ex(filter, ctx, value, p4cc, prop, 0);
 
+}
 static JSValue jsf_filter_prop_set(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
 {
 	u32 ival;
 	GF_FilterSessionCaps caps;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
 	if (!jsf)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (magic < JSF_EVT_LAST_DEFINED) {
 		if (JS_IsFunction(ctx, value) || JS_IsUndefined(value) || JS_IsNull(value)) {
@@ -824,48 +893,48 @@
 	switch (magic) {
 	case JSF_FILTER_MAX_PIDS:
 		if (JS_ToInt32(ctx, &ival, value))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		gf_filter_set_max_extra_input_pids(jsf->filter, ival);
 		break;
 
 	case JSF_FILTER_CAPS_MAX_WIDTH:
 		gf_filter_get_session_caps(jsf->filter, &caps);
-		if (JS_ToInt32(ctx, &caps.max_screen_width, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &caps.max_screen_width, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_set_session_caps(jsf->filter, &caps);
 		break;
 	case JSF_FILTER_CAPS_MAX_HEIGHT:
 		gf_filter_get_session_caps(jsf->filter, &caps);
-		if (JS_ToInt32(ctx, &caps.max_screen_height, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &caps.max_screen_height, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_set_session_caps(jsf->filter, &caps);
 		break;
 	case JSF_FILTER_CAPS_MAX_DISPLAY_DEPTH:
 		gf_filter_get_session_caps(jsf->filter, &caps);
-		if (JS_ToInt32(ctx, &caps.max_screen_bpp, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &caps.max_screen_bpp, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_set_session_caps(jsf->filter, &caps);
 		break;
 	case JSF_FILTER_CAPS_MAX_FPS:
 		gf_filter_get_session_caps(jsf->filter, &caps);
-		if (JS_ToInt32(ctx, &caps.max_screen_fps, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &caps.max_screen_fps, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_set_session_caps(jsf->filter, &caps);
 		break;
 	case JSF_FILTER_CAPS_MAX_VIEWS:
 		gf_filter_get_session_caps(jsf->filter, &caps);
-		if (JS_ToInt32(ctx, &caps.max_screen_nb_views, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &caps.max_screen_nb_views, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_set_session_caps(jsf->filter, &caps);
 		break;
 	case JSF_FILTER_CAPS_MAX_CHANNELS:
 		gf_filter_get_session_caps(jsf->filter, &caps);
-		if (JS_ToInt32(ctx, &caps.max_audio_channels, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &caps.max_audio_channels, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_set_session_caps(jsf->filter, &caps);
 		break;
 	case JSF_FILTER_CAPS_MAX_SAMPLERATE:
 		gf_filter_get_session_caps(jsf->filter, &caps);
-		if (JS_ToInt32(ctx, &caps.max_audio_sample_rate, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &caps.max_audio_sample_rate, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_set_session_caps(jsf->filter, &caps);
 		break;
 	case JSF_FILTER_CAPS_MAX_AUDIO_DEPTH:
 		gf_filter_get_session_caps(jsf->filter, &caps);
-		if (JS_ToInt32(ctx, &caps.max_audio_bit_depth, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &caps.max_audio_bit_depth, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_set_session_caps(jsf->filter, &caps);
 		break;
 
@@ -880,6 +949,10 @@
 		JS_FreeCString(ctx, val);
 	}
 		break;
+	case JSF_FILTER_REQUIRE_SOURCEID:
+		if (JS_ToBool(ctx, value))
+			gf_filter_require_source_id(jsf->filter);
+		break;
 	}
 return JS_UNDEFINED;
 }
@@ -895,7 +968,7 @@
 	JSValue res;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
 	if (!jsf)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (magic<JSF_EVT_LAST_DEFINED)
 		return JS_DupValue(jsf->ctx, jsf->funcs[magic]);
@@ -972,6 +1045,7 @@
 	{
 		GF_Fraction64 frac;
 		gf_filter_get_clock_hint(jsf->filter, NULL, &frac);
+		if (!frac.den) return JS_NULL;
 		dval = ((Double)frac.num) / frac.den;
 	}
 		return JS_NewFloat64(ctx, dval);
@@ -980,6 +1054,22 @@
 	case JSF_FILTER_INAME:
 		if (jsf->filter->iname) return JS_NewString(ctx, jsf->filter->iname);
 		return JS_NULL;
+	case JSF_FILTER_PATH:
+	{
+		char c=0;
+		char *path = (char *) jsf_get_script_filename(ctx);
+		if (!path) return JS_NULL;
+		char *sep = strrchr(path, '/');
+		if (!sep) sep = strrchr(path, '\\');
+		if (!sep)
+			return JS_NewString(ctx, "./");
+
+		c = sep[1];
+		sep[1] = 0;
+		res = JS_NewString(ctx, path);
+		sep[1] = c;
+		return res;
+	}
 	}
 
 return JS_UNDEFINED;
@@ -992,15 +1082,16 @@
 	const char *name=NULL;
 	const char *def = NULL;
 	const char *min_enum = NULL;
+	u32 arg_flags=0;
 	u32 type = 0;
 	Bool is_wildcard=GF_FALSE;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || !argc) return JS_EXCEPTION;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
 
 	v = JS_GetPropertyStr(ctx, argv[0], "name");
 	if (!JS_IsUndefined(v)) name = JS_ToCString(ctx, v);
 	JS_FreeValue(ctx, v);
-	if (!name) return JS_EXCEPTION;
+	if (!name) return GF_JS_EXCEPTION(ctx);
 
 	if (!strcmp(name, "*")) {
 		if (jsf->has_wilcard_arg) return JS_UNDEFINED;
@@ -1013,7 +1104,7 @@
 	JS_FreeValue(ctx, v);
 	if (!desc) {
 	 	JS_FreeCString(ctx, name);
-	 	return JS_EXCEPTION;
+	 	return GF_JS_EXCEPTION(ctx);
 	}
 
 	v = JS_GetPropertyStr(ctx, argv[0], "type");
@@ -1026,7 +1117,7 @@
 		} else {
 			JS_FreeCString(ctx, name);
 			JS_FreeCString(ctx, desc);
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		}
 	}
 
@@ -1038,6 +1129,17 @@
 	if (!JS_IsUndefined(v)) min_enum = JS_ToCString(ctx, v);
 	JS_FreeValue(ctx, v);
 
+	v = JS_GetPropertyStr(ctx, argv[0], "hint");
+	if (!JS_IsUndefined(v)) {
+		const char *hint = JS_ToCString(ctx, v);
+		if (hint && !strcmp(hint, "expert")) arg_flags = GF_FS_ARG_HINT_EXPERT;
+		else if (hint && !strcmp(hint, "advanced")) arg_flags = GF_FS_ARG_HINT_ADVANCED;
+		else if (hint && !strcmp(hint, "hide")) arg_flags = GF_FS_ARG_HINT_HIDE;
+
+		JS_FreeCString(ctx, hint);
+	}
+	JS_FreeValue(ctx, v);
+
 	jsf->args = gf_realloc(jsf->args, sizeof(GF_FilterArgs)*(jsf->nb_args+2));
 	memset(&jsf->args[jsf->nb_args], 0, 2*sizeof(GF_FilterArgs));
 	jsf->args[jsf->nb_args].arg_name = gf_strdup(name);
@@ -1046,6 +1148,7 @@
 	jsf->args[jsf->nb_args].min_max_enum = min_enum ? gf_strdup(min_enum) : NULL;
 	jsf->args[jsf->nb_args].arg_type = type;
 	jsf->args[jsf->nb_args].offset_in_private = -1;
+	jsf->args[jsf->nb_args].flags = arg_flags;
 
 	jsf->nb_args ++;
 
@@ -1070,7 +1173,7 @@
 	Bool is_optional=GF_FALSE;
 	GF_PropertyValue p;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf) return JS_EXCEPTION;
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
 	jsf->disable_filter = GF_FALSE;
 
 	memset(&p, 0, sizeof(GF_PropertyValue));
@@ -1082,7 +1185,7 @@
 		v = JS_GetPropertyStr(ctx, argv[0], "id");
 		if (!JS_IsUndefined(v)) name = JS_ToCString(ctx, v);
 		JS_FreeValue(ctx, v);
-		if (!name) return JS_EXCEPTION;
+		if (!name) return GF_JS_EXCEPTION(ctx);
 		prop_id = gf_props_get_id(name);
 		JS_FreeCString(ctx, name);
 		if (!prop_id)
@@ -1099,7 +1202,7 @@
 			p.value.uint = gf_stream_type_by_name(name);
 		} else if (prop_id==GF_PROP_PID_CODECID) {
 			p.type = GF_PROP_UINT;
-			p.value.uint = gf_codec_parse(name);
+			p.value.uint = gf_codecid_parse(name);
 		} else {
 			p = gf_props_parse_value(prop_type, NULL, name, NULL, gf_filter_get_sep(jsf->filter, GF_FS_SEP_LIST) );
 		}
@@ -1151,9 +1254,9 @@
 static JSValue jsf_filter_set_desc(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf) return JS_EXCEPTION;
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
 	const char *str = JS_ToCString(ctx, argv[0]);
- if (!str) return JS_EXCEPTION;
+ if (!str) return GF_JS_EXCEPTION(ctx);
 	gf_filter_set_description(jsf->filter, str);
 	JS_FreeCString(ctx, str);
 return JS_UNDEFINED;
@@ -1162,9 +1265,9 @@
 static JSValue jsf_filter_set_version(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf) return JS_EXCEPTION;
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
 	const char *str = JS_ToCString(ctx, argv[0]);
- if (!str) return JS_EXCEPTION;
+ if (!str) return GF_JS_EXCEPTION(ctx);
 	gf_filter_set_version(jsf->filter, str);
 	JS_FreeCString(ctx, str);
 return JS_UNDEFINED;
@@ -1173,9 +1276,9 @@
 static JSValue jsf_filter_set_author(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf) return JS_EXCEPTION;
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
 	const char *str = JS_ToCString(ctx, argv[0]);
- if (!str) return JS_EXCEPTION;
+ if (!str) return GF_JS_EXCEPTION(ctx);
 	gf_filter_set_author(jsf->filter, str);
 	JS_FreeCString(ctx, str);
 return JS_UNDEFINED;
@@ -1185,9 +1288,9 @@
 static JSValue jsf_filter_set_help(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf) return JS_EXCEPTION;
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
 	const char *str = JS_ToCString(ctx, argv[0]);
- if (!str) return JS_EXCEPTION;
+ if (!str) return GF_JS_EXCEPTION(ctx);
 	gf_filter_set_help(jsf->filter, str);
 	JS_FreeCString(ctx, str);
 return JS_UNDEFINED;
@@ -1196,13 +1299,13 @@
 static JSValue jsf_filter_set_name(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf) return JS_EXCEPTION;
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
 if (jsf->log_name) gf_free(jsf->log_name);
 jsf->log_name = NULL;
 if (argc) {
 	JSValue global;
 		const char *str = JS_ToCString(ctx, argv[0]);
-		if (!str) return JS_EXCEPTION;
+		if (!str) return GF_JS_EXCEPTION(ctx);
 	jsf->log_name = gf_strdup(str);
 		JS_FreeCString(ctx, str);
 		gf_filter_set_name(jsf->filter, jsf->log_name);
@@ -1219,9 +1322,9 @@
 {
 	GF_JSPidCtx *pctx;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf) return JS_EXCEPTION;
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
 GF_FilterPid *opid = gf_filter_pid_new(jsf->filter);
-	if (!opid) return JS_EXCEPTION;
+	if (!opid) return GF_JS_EXCEPTION(ctx);
 	jsf->disable_filter = GF_FALSE;
 
 	GF_SAFEALLOC(pctx, GF_JSPidCtx);
@@ -1243,9 +1346,9 @@
 	Bool upstream = GF_FALSE;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
 	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
- if (!jsf && !jsfi) return JS_EXCEPTION;
+ if (!jsf && !jsfi) return GF_JS_EXCEPTION(ctx);
 	GF_FilterEvent *evt = JS_GetOpaque(argv[0], jsf_event_class_id);
- if (!evt) return JS_EXCEPTION;
+ if (!evt) return GF_JS_EXCEPTION(ctx);
 if (argc>1) {
 		upstream = JS_ToBool(ctx, argv[1]);
 	}
@@ -1266,9 +1369,9 @@
 	GF_PropertyEntry *pe = NULL;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
 	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
- if (!jsf && !jsfi) return JS_EXCEPTION;
+ if (!jsf && !jsfi) return GF_JS_EXCEPTION(ctx);
 name = JS_ToCString(ctx, argv[0]);
-	if (!name) return JS_EXCEPTION;
+	if (!name) return GF_JS_EXCEPTION(ctx);
 	filter = jsf ? jsf->filter : jsfi->filter;
 
 	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
@@ -1297,9 +1400,9 @@
 	const char *mime=NULL;
 	JSValue res;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || !argc) return JS_EXCEPTION;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
 mime = JS_ToCString(ctx, argv[0]);
-	if (!mime) return JS_EXCEPTION;
+	if (!mime) return GF_JS_EXCEPTION(ctx);
 	res = JS_NewBool(ctx, gf_filter_is_supported_mime(jsf->filter, mime));
 	JS_FreeCString(ctx, mime);
 	return res;
@@ -1311,14 +1414,14 @@
 	const char *parent=NULL;
 	JSValue res;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || !argc) return JS_EXCEPTION;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
 src = JS_ToCString(ctx, argv[0]);
-	if (!src) return JS_EXCEPTION;
+	if (!src) return GF_JS_EXCEPTION(ctx);
 	if (argc>1) {
 		parent = JS_ToCString(ctx, argv[1]);
 		if (!parent) {
 			JS_FreeCString(ctx, src);
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		}
 	}
 	res = JS_NewBool(ctx, gf_filter_is_supported_source(jsf->filter, src, parent) );
@@ -1332,7 +1435,7 @@
 const char *status;
 u32 pc=0;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || (argc<1)) return JS_EXCEPTION;
+ if (!jsf || (argc<1)) return GF_JS_EXCEPTION(ctx);
 
 status = JS_ToCString(ctx, argv[0]);
 	if (argc>1)
@@ -1346,11 +1449,11 @@
 {
 u32 rt_delay=0;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf) return JS_EXCEPTION;
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
 
 if (argc) {
 		if (JS_ToInt32(ctx, &rt_delay, argv[0]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 
 		gf_filter_ask_rt_reschedule(jsf->filter, rt_delay);
 	} else {
@@ -1389,7 +1492,7 @@
 	JS_FreeValue(task->jsf->ctx, ret);
 
 	gf_js_lock(task->jsf->ctx, GF_FALSE);
-	js_do_loop(task->jsf->ctx);
+	js_std_loop(task->jsf->ctx);
 
 	if (fun_result>=0) {
 		*reschedule_ms = (u32) fun_result;
@@ -1406,12 +1509,12 @@
 {
 	JS_ScriptTask *task;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || !argc) return JS_EXCEPTION;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
 	jsf->disable_filter = GF_FALSE;
 	if (!JS_IsFunction(ctx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	if ((argc>1) && !JS_IsObject(argv[1]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	GF_SAFEALLOC(task, JS_ScriptTask);
 	if (!task)
@@ -1431,14 +1534,14 @@
 	GF_Err e;
 	s32 error_type=0;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || !argc) return JS_EXCEPTION;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt32(ctx, (int *) &e, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (e==GF_OK) return JS_UNDEFINED;
 
 	if ((argc>1) && JS_ToInt32(ctx, &error_type, argv[1]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	if (error_type==JSF_NOTIF_ERROR_AND_DISCONNECT)
 		gf_filter_notification_failure(jsf->filter, e, GF_TRUE);
 	else if (error_type==JSF_NOTIF_ERROR)
@@ -1453,20 +1556,20 @@
 	s64 time_in_us=0;
 	GF_Fraction64 media_timestamp;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || (argc<2)) return JS_EXCEPTION;
+ if (!jsf || (argc<2)) return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt64(ctx, &time_in_us, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	if (argc==2) {
 		Double t=0;
 		if (JS_ToFloat64(ctx, &t, argv[0]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		media_timestamp.den = 1000000;
 		media_timestamp.num = (s64) (t*media_timestamp.den);
 	} else {
 		if (JS_ToInt64(ctx, &media_timestamp.num, argv[0]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		if (JS_ToInt64(ctx, &media_timestamp.den, argv[0]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 	}
 	gf_filter_hint_single_clock(jsf->filter, time_in_us, media_timestamp);
 	return JS_UNDEFINED;
@@ -1481,13 +1584,13 @@
 	JSValue ret = JS_UNDEFINED;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
 	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
- if ((!jsf && !jsfi) || (argc!=4)) return JS_EXCEPTION;
+ if ((!jsf && !jsfi) || (argc!=4)) return GF_JS_EXCEPTION(ctx);
 
 	filter_id = JS_ToCString(ctx, argv[0]);
 	arg_name = JS_ToCString(ctx, argv[1]);
 	arg_val = JS_ToCString(ctx, argv[2]);
 	if (!arg_name || !arg_val || JS_ToInt32(ctx, (s32 *) &prop_mask, argv[3])) {
-		ret = JS_EXCEPTION;
+		ret = GF_JS_EXCEPTION(ctx);
 		goto exit;
 	}
 	if (jsf)
@@ -1510,15 +1613,15 @@
 	Bool inherit_args = GF_FALSE;
 	GF_JSFilterInstanceCtx *f_ctx;
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || !argc) return JS_EXCEPTION;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
 url = JS_ToCString(ctx, argv[0]);
-	if (!url) return JS_EXCEPTION;
+	if (!url) return GF_JS_EXCEPTION(ctx);
 
 	if ((mode==JSF_FINST_SOURCE) && (argc>1)) {
 		parent = JS_ToCString(ctx, argv[1]);
 		if (!parent) {
 			JS_FreeCString(ctx, url);
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		}
 		if (argc>2) {
 			inherit_args = JS_ToBool(ctx, argv[2]);
@@ -1565,29 +1668,119 @@
 {
 	return jsf_filter_load_filter(ctx, this_val, argc, argv, JSF_FINST_FILTER);
 }
+
+static JSValue jsf_filter_lock(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+	Bool do_lock;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
+ do_lock = JS_ToBool(ctx, argv[0]) ? GF_TRUE : GF_FALSE;
+	gf_filter_lock(jsf->filter, do_lock);
+	return JS_UNDEFINED;
+}
+static JSValue jsf_filter_lock_all(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+	Bool do_lock;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
+ do_lock = JS_ToBool(ctx, argv[0]) ? GF_TRUE : GF_FALSE;
+	gf_filter_lock_all(jsf->filter, do_lock);
+	return JS_UNDEFINED;
+}
 static JSValue jsf_filter_make_sticky(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf) return JS_EXCEPTION;
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
 	gf_filter_make_sticky(jsf->filter);
 	return JS_UNDEFINED;
 }
 static JSValue jsf_filter_prevent_blocking(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || !argc) return JS_EXCEPTION;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
 	gf_filter_prevent_blocking(jsf->filter, JS_ToBool(ctx, argv[0]) ? GF_TRUE : GF_FALSE);
 	return JS_UNDEFINED;
 }
 static JSValue jsf_filter_block_eos(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
- if (!jsf || !argc) return JS_EXCEPTION;
+ if (!jsf || !argc) return GF_JS_EXCEPTION(ctx);
 	gf_filter_block_eos(jsf->filter, JS_ToBool(ctx, argv[0]) ? GF_TRUE : GF_FALSE);
 	return JS_UNDEFINED;
 }
 
 
+static JSValue jsf_filter_abort(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+ if (!jsf) return GF_JS_EXCEPTION(ctx);
+	gf_filter_abort(jsf->filter);
+	return JS_UNDEFINED;
+}
+
+
+
+static JSValue jsf_filter_set_source_internal(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, Bool use_restricted)
+{
+	GF_Err e=GF_OK;
+	const char *source_id=NULL;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
+ if (!jsf && !jsfi) return GF_JS_EXCEPTION(ctx);
+
+	GF_JSFilterCtx *f_from = JS_GetOpaque(argv[0], jsf_filter_class_id);
+	GF_JSFilterInstanceCtx *fi_from = JS_GetOpaque(argv[0], jsf_filter_inst_class_id);
+ if (!f_from && !fi_from) return GF_JS_EXCEPTION(ctx);
+
+ source_id = NULL;
+ if (argc>1) {
+		source_id = JS_ToCString(ctx, argv[1]);
+		if (!source_id) return GF_JS_EXCEPTION(ctx);
+		if (!source_id[0]) {
+			JS_FreeCString(ctx, source_id);
+			source_id = NULL;
+		}
+	}
+
+	if (use_restricted)
+		e = gf_filter_set_source_restricted(jsfi ? jsfi->filter : jsf->filter, fi_from ? fi_from->filter : f_from->filter, source_id);
+	else
+		e = gf_filter_set_source(jsfi ? jsfi->filter : jsf->filter, fi_from ? fi_from->filter : f_from->filter, source_id);
+
+	JS_FreeCString(ctx, source_id);
+	if (e) return js_throw_err(ctx, e);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_set_source(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_filter_set_source_internal(ctx, this_val, argc, argv, GF_FALSE);
+}
+
+static JSValue jsf_filter_set_source_restricted(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_filter_set_source_internal(ctx, this_val, argc, argv, GF_TRUE);
+}
+
+static JSValue jsf_filter_reset_source(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
+	if (!jsf && !jsfi) return GF_JS_EXCEPTION(ctx);
+	gf_filter_reset_source(jsfi ? jsfi->jsf->filter : jsf->filter);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_set_blocking(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+	if (!jsf) return GF_JS_EXCEPTION(ctx);
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	gf_filter_set_blocking(jsf->filter, JS_ToBool(ctx, argv[0] ));
+	return JS_UNDEFINED;
+}
+
+
 static const JSCFunctionListEntry jsf_filter_funcs[] = {
 JS_CGETSET_MAGIC_DEF("initialize", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_INITIALIZE),
 JS_CGETSET_MAGIC_DEF("finalize", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_FINALIZE),
@@ -1623,7 +1816,8 @@
 JS_CGETSET_MAGIC_DEF("clock_hint_mediatime", jsf_filter_prop_get, NULL, JSF_FILTER_CLOCK_HINT_MEDIATIME),
 JS_CGETSET_MAGIC_DEF("connections_pending", jsf_filter_prop_get, NULL, JSF_FILTER_CONNECTIONS_PENDING),
 	JS_CGETSET_MAGIC_DEF("iname", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_INAME),
-
+ JS_CGETSET_MAGIC_DEF("require_source_id", NULL, jsf_filter_prop_set, JSF_FILTER_REQUIRE_SOURCEID),
+	JS_CGETSET_MAGIC_DEF("jspath", jsf_filter_prop_get, NULL, JSF_FILTER_PATH),
 
 JS_CFUNC_DEF("set_desc", 0, jsf_filter_set_desc),
 JS_CFUNC_DEF("set_version", 0, jsf_filter_set_version),
@@ -1646,59 +1840,36 @@
 JS_CFUNC_DEF("add_source", 0, jsf_filter_add_source),
 JS_CFUNC_DEF("add_destination", 0, jsf_filter_add_dest),
 JS_CFUNC_DEF("add_filter", 0, jsf_filter_add_filter),
+ JS_CFUNC_DEF("lock", 0, jsf_filter_lock),
+ JS_CFUNC_DEF("lock_all", 0, jsf_filter_lock_all),
 JS_CFUNC_DEF("make_sticky", 0, jsf_filter_make_sticky),
 	JS_CFUNC_DEF("prevent_blocking", 1, jsf_filter_prevent_blocking),
 	JS_CFUNC_DEF("block_eos", 1, jsf_filter_block_eos),
+ JS_CFUNC_DEF("abort", 0, jsf_filter_abort),
+ JS_CFUNC_DEF("set_source", 0, jsf_filter_set_source),
+ JS_CFUNC_DEF("set_source_restricted", 0, jsf_filter_set_source_restricted),
+ JS_CFUNC_DEF("reset_source", 0, jsf_filter_reset_source),
+ JS_CFUNC_DEF("set_blocking", 0, jsf_filter_set_blocking),
 };
 
 
 
-static JSValue jsf_filter_set_source_id(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
-{
-	GF_Err e=GF_OK;
-	const char *source_id=NULL;
-	GF_JSFilterInstanceCtx *f_inst = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
- if (!f_inst || (argc<1)) return JS_EXCEPTION;
-
-	GF_JSFilterCtx *f_from = JS_GetOpaque(argv[0], jsf_filter_class_id);
-	GF_JSFilterInstanceCtx *fi_from = JS_GetOpaque(argv[0], jsf_filter_inst_class_id);
- if (!f_from && !fi_from) return JS_EXCEPTION;
-
- source_id = NULL;
- if (argc>1) {
- 	source_id = JS_ToCString(ctx, argv[2]);
-		if (!source_id) return JS_EXCEPTION;
-	}
-	
-	e = gf_filter_set_source(f_inst->filter, fi_from ? fi_from->filter : f_from->filter, source_id);
-
-	JS_FreeCString(ctx, source_id);
-	if (e) return js_throw_err(ctx, e);
-	return JS_UNDEFINED;
-}
-
-static JSValue jsf_filter_reset_source(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
-{
-	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
-	if (!jsfi) return JS_EXCEPTION;
-	gf_filter_reset_source(jsfi->jsf->filter);
-	return JS_UNDEFINED;
-}
-
 static JSValue jsf_filter_remove(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
-	if (!jsfi) return JS_EXCEPTION;
+	if (!jsfi) return GF_JS_EXCEPTION(ctx);
 	if (jsfi->fmode==JSF_FINST_SOURCE)
 		gf_filter_remove_src(jsfi->jsf->filter, jsfi->filter);
 	return JS_UNDEFINED;
 }
 
+
+
 static JSValue jsf_filter_has_pid_connections_pending(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_Filter *stop_at = NULL;
 	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
-	if (!jsfi) return JS_EXCEPTION;
+	if (!jsfi) return GF_JS_EXCEPTION(ctx);
 	if (argc && (JS_IsNull(argv[0]) || JS_IsObject(argv[0]) ) ) {
 		GF_JSFilterInstanceCtx *fi_stop = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
 		GF_JSFilterCtx *f_stop = JS_GetOpaque(this_val, jsf_filter_class_id);
@@ -1710,28 +1881,58 @@
 	return JS_NewBool(ctx, gf_filter_has_pid_connection_pending(jsfi->filter, stop_at) );
 }
 
-static void jsf_on_setup_error(GF_Filter *f, void *on_setup_error_udta, GF_Err e)
+static Bool jsf_on_setup_error(GF_Filter *f, void *on_setup_error_udta, GF_Err e)
 {
-	GF_JSFilterInstanceCtx *f_inst = on_setup_error_udta;
+	Bool res = GF_FALSE;
 	JSValue ret, argv[1];
-	gf_js_lock(f_inst->jsf->ctx, GF_TRUE);
+	GF_JSFilterInstanceCtx *f_inst = on_setup_error_udta;
+	JSContext *ctx = f_inst->jsf->ctx;
+	gf_js_lock(ctx, GF_TRUE);
 
-	argv[0] = JS_NewInt32(f_inst->jsf->ctx, e);
+	argv[0] = JS_NewInt32(ctx, e);
 
-	ret = JS_Call(f_inst->jsf->ctx, f_inst->setup_failure_fun, f_inst->filter_obj, 0, NULL);
+	ret = JS_Call(ctx, f_inst->setup_failure_fun, f_inst->filter_obj, 0, NULL);
+	if (JS_IsBool(ret) && JS_ToBool(ctx, ret)) res = GF_TRUE;
 
-	JS_FreeValue(f_inst->jsf->ctx, argv[0]);
-	JS_FreeValue(f_inst->jsf->ctx, ret);
-	gf_js_lock(f_inst->jsf->ctx, GF_FALSE);
-	js_do_loop(f_inst->jsf->ctx);
+	JS_FreeValue(ctx, argv[0]);
+	JS_FreeValue(ctx, ret);
+	gf_js_lock(ctx, GF_FALSE);
+	js_std_loop(ctx);
+	return res;
+}
+
+enum
+{
+	JSFI_SETUP_FAILURE = 0,
+	JSFI_NAME,
+	JSFI_TYPE,
+	JSFI_INAME,
+};
+
+static JSValue jsf_filter_inst_prop_get(JSContext *ctx, JSValueConst this_val, int magic)
+{
+	GF_JSFilterInstanceCtx *f_inst = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
+ if (!f_inst) return GF_JS_EXCEPTION(ctx);
+
+	switch (magic) {
+	case JSFI_NAME:
+		return JS_NewString(ctx, gf_filter_get_name(f_inst->filter));
+	case JSFI_TYPE:
+		return JS_NewString(ctx, f_inst->filter->freg->name);
+	case JSFI_INAME:
+		return f_inst->filter->iname ? JS_NewString(ctx, f_inst->filter->iname) : JS_NULL;
+	}
+	return JS_UNDEFINED;
 }
 
 static JSValue jsf_filter_inst_prop_set(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
 {
+	const char *str;
 	GF_JSFilterInstanceCtx *f_inst = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
- if (!f_inst) return JS_EXCEPTION;
+ if (!f_inst) return GF_JS_EXCEPTION(ctx);
 
-	if (magic==0) {
+	switch (magic) {
+	case JSFI_SETUP_FAILURE:
 		if (JS_IsFunction(ctx, value) || JS_IsUndefined(value) || JS_IsNull(value)) {
 			if (JS_IsUndefined(f_inst->setup_failure_fun) && !JS_IsUndefined(value)) {
 
@@ -1741,6 +1942,13 @@
 			f_inst->setup_failure_fun = JS_DupValue(ctx, value);
 		}
 	return JS_UNDEFINED;
+
+	case JSFI_INAME:
+		str = JS_ToCString(ctx, value);
+		if (f_inst->filter->iname) gf_free(f_inst->filter->iname);
+		f_inst->filter->iname = str ? gf_strdup(str) : NULL;
+		JS_FreeCString(ctx, str);
+		break;
 	}
 	return JS_UNDEFINED;
 }
@@ -1750,9 +1958,9 @@
 	const char *arg_name=NULL;
 	JSValue res;
 	GF_JSFilterInstanceCtx *f_inst = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
- if (!f_inst || !argc) return JS_EXCEPTION;
+ if (!f_inst || !argc) return GF_JS_EXCEPTION(ctx);
 arg_name = JS_ToCString(ctx, argv[0]);
-	if (!arg_name) return JS_EXCEPTION;
+	if (!arg_name) return GF_JS_EXCEPTION(ctx);
 	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
 		char dump[GF_PROP_DUMP_ARG_SIZE];
 		const char *arg_val = gf_filter_get_arg_str(f_inst->filter, arg_name, dump);
@@ -1772,31 +1980,34 @@
 static JSValue jsf_filter_inst_disable_probe(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
- if (!jsfi) return JS_EXCEPTION;
+ if (!jsfi) return GF_JS_EXCEPTION(ctx);
 	gf_filter_disable_probe(jsfi->filter);
 	return JS_UNDEFINED;
 }
 static JSValue jsf_filter_inst_disable_inputs(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSFilterInstanceCtx *jsfi = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
- if (!jsfi) return JS_EXCEPTION;
+ if (!jsfi) return GF_JS_EXCEPTION(ctx);
 gf_filter_disable_inputs(jsfi->filter);
 	return JS_UNDEFINED;
 }
 
 static const JSCFunctionListEntry jsf_filter_inst_funcs[] = {
- JS_CGETSET_MAGIC_DEF("on_setup_failure", NULL, jsf_filter_inst_prop_set, 0),
+	JS_CGETSET_MAGIC_DEF("on_setup_failure", NULL, jsf_filter_inst_prop_set, JSFI_SETUP_FAILURE),
+	JS_CGETSET_MAGIC_DEF("name", jsf_filter_inst_prop_get, NULL, JSFI_NAME),
+	JS_CGETSET_MAGIC_DEF("type", jsf_filter_inst_prop_get, NULL, JSFI_TYPE),
+	JS_CGETSET_MAGIC_DEF("iname", jsf_filter_inst_prop_get, jsf_filter_inst_prop_set, JSFI_INAME),
 JS_CFUNC_DEF("send_event", 0, jsf_filter_send_event),
 JS_CFUNC_DEF("get_info", 0, jsf_filter_get_info),
 JS_CFUNC_DEF("send_update", 0, jsf_filter_send_update),
- JS_CFUNC_DEF("set_source", 0, jsf_filter_set_source_id),
+ JS_CFUNC_DEF("set_source", 0, jsf_filter_set_source),
+ JS_CFUNC_DEF("set_source_restricted", 0, jsf_filter_set_source_restricted),
 JS_CFUNC_DEF("remove", 0, jsf_filter_remove),
 JS_CFUNC_DEF("has_pid_connections_pending", 0, jsf_filter_has_pid_connections_pending),
 JS_CFUNC_DEF("get_arg", 0, jsf_filter_inst_get_arg),
 JS_CFUNC_DEF("disable_probe", 0, jsf_filter_inst_disable_probe),
 JS_CFUNC_DEF("disable_inputs", 0, jsf_filter_inst_disable_inputs),
 JS_CFUNC_DEF("reset_source", 0, jsf_filter_reset_source),
-
 };
 
 
@@ -1806,7 +2017,7 @@
 	GF_Err e = GF_OK;
 	const char *str=NULL;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 	switch (magic) {
 	case JSF_PID_NAME:
 		str = JS_ToCString(ctx, value);
@@ -1818,7 +2029,7 @@
 	break;
 	case JSF_PID_MAX_BUFFER:
 		if (JS_ToInt32(ctx, &ival, value))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		gf_filter_pid_set_max_buffer(pctx->pid, ival);
 	break;
 	case JSF_PID_LOOSE_CONNECT:
@@ -1854,7 +2065,7 @@
 	u64 dur;
 	char *str;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 	switch (magic) {
 	case JSF_PID_NAME:
 		return JS_NewString(ctx, gf_filter_pid_get_name(pctx->pid) );
@@ -1862,6 +2073,8 @@
 		return JS_NewBool (ctx, gf_filter_pid_is_eos(pctx->pid) );
 	case JSF_PID_EOS_SEEN:
 		return JS_NewBool (ctx, gf_filter_pid_has_seen_eos(pctx->pid) );
+	case JSF_PID_EOS_RECEIVED:
+		return JS_NewBool (ctx, gf_filter_pid_eos_received(pctx->pid) );
 	case JSF_PID_WOULD_BLOCK:
 		return JS_NewBool(ctx, gf_filter_pid_would_block(pctx->pid) );
 	case JSF_PID_FILTER_NAME:
@@ -1871,7 +2084,9 @@
 	case JSF_PID_FILTER_ARGS:
 		return JS_NewString(ctx, gf_filter_pid_get_args(pctx->pid) );
 	case JSF_PID_FILTER_SRC_ARGS:
-		return JS_NewString(ctx, gf_filter_pid_orig_src_args(pctx->pid) );
+		return JS_NewString(ctx, gf_filter_pid_orig_src_args(pctx->pid, GF_FALSE) );
+	case JSF_PID_FILTER_UNICITY_ARGS:
+		return JS_NewString(ctx, gf_filter_pid_orig_src_args(pctx->pid, GF_TRUE) );
 	case JSF_PID_MAX_BUFFER:
 		return JS_NewInt32(ctx, gf_filter_pid_get_max_buffer(pctx->pid) );
 	case JSF_PID_BUFFER:
@@ -1910,6 +2125,10 @@
 		return JS_NewInt32(ctx, gf_filter_pid_get_min_pck_duration(pctx->pid) );
 	case JSF_PID_IS_PLAYING:
 		return JS_NewBool(ctx, gf_filter_pid_is_playing(pctx->pid) );
+	case JSF_PID_NEXT_TS:
+		dur = gf_filter_pid_get_next_ts(pctx->pid);
+		if (dur==GF_FILTER_NO_TS) return JS_NULL;
+		return JS_NewInt64(ctx, dur);
 	}
 return JS_UNDEFINED;
 }
@@ -1917,9 +2136,9 @@
 static JSValue jsf_pid_send_event(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 	GF_FilterEvent *evt = JS_GetOpaque(argv[0], jsf_event_class_id);
- if (!evt) return JS_EXCEPTION;
+ if (!evt) return GF_JS_EXCEPTION(ctx);
 evt->base.on_pid = pctx->pid;
 if (evt->base.type == GF_FEVT_PLAY) {
 		gf_filter_pid_init_play_event(pctx->pid, evt, evt->play.start_range, evt->play.speed, pctx->jsf->log_name);
@@ -1936,9 +2155,9 @@
 	JSValue res;
 	const GF_PropertyValue *prop;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 if (JS_ToInt32(ctx, &idx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
 		prop = gf_filter_pid_enum_info(pctx->pid, &idx, &p4cc, &pname);
@@ -1947,7 +2166,7 @@
 	}
 	if (!prop) return JS_NULL;
 	if (!pname) pname = gf_props_4cc_get_name(p4cc);
-	if (!pname) return JS_EXCEPTION;
+	if (!pname) return GF_JS_EXCEPTION(ctx);
 
 	res = JS_NewObject(ctx);
 JS_SetPropertyStr(ctx, res, "name", JS_NewString(ctx, pname));
@@ -1963,9 +2182,9 @@
 	const GF_PropertyValue *prop;
 	GF_PropertyEntry *pe = NULL;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 name = JS_ToCString(ctx, argv[0]);
-	if (!name) return JS_EXCEPTION;
+	if (!name) return GF_JS_EXCEPTION(ctx);
 	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
 		if (is_info) {
 			prop = gf_filter_pid_get_info_str(pctx->pid, name, &pe);
@@ -1979,13 +2198,27 @@
 	} else {
 		u32 p4cc = gf_props_get_id(name);
 		JS_FreeCString(ctx, name);
-		if (!p4cc) return JS_EXCEPTION;
+		if (!p4cc) return GF_JS_EXCEPTION(ctx);
 		if (is_info) {
 			prop = gf_filter_pid_get_info(pctx->pid, p4cc, &pe);
 		} else {
 			prop = gf_filter_pid_get_property(pctx->pid, p4cc);
 		}
-		if (!prop) return JS_NULL;
+		if (!prop && !is_info) {
+			if ((p4cc==GF_PROP_PID_MIRROR) || (p4cc==GF_PROP_PID_ROTATE)) {
+				prop = gf_filter_pid_get_property(pctx->pid, GF_PROP_PID_ISOM_TRACK_MATRIX);
+				if (prop) {
+					GF_Err gf_prop_matrix_decompose(const GF_PropertyValue *p, u32 *flip_mode, u32 *rot_mode);
+					u32 flip_mode, rot_mode;
+					if (gf_prop_matrix_decompose(prop, &flip_mode, &rot_mode)==GF_OK) {
+						if (p4cc==GF_PROP_PID_MIRROR) return JS_NewInt32(ctx, flip_mode);
+						else return JS_NewInt32(ctx, rot_mode);
+					}
+				}
+			}
+			return JS_NULL;
+		}
+
 		res = jsf_NewPropTranslate(ctx, prop, p4cc);
 	}
 	gf_filter_release_property(pe);
@@ -2007,8 +2240,10 @@
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
-
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
+	if (!pctx->jsf->filter->in_process)
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Filter %s attempt to query packet outside process callback not allowed!\n", pctx->jsf->filter->name);
+		
 pck = gf_filter_pid_get_packet(pctx->pid);
 	if (!pck) return JS_NULL;
 
@@ -2039,7 +2274,9 @@
 {
 	GF_JSPckCtx *pckctx;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
+	if (!pctx->jsf->filter->in_process)
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Filter %s attempt to drop packet outside process callback not allowed!\n", pctx->jsf->filter->name);
 
 	if (!pctx->pck_head) {
 		if (gf_filter_pid_get_packet_count(pctx->pid)) {
@@ -2060,10 +2297,10 @@
 static JSValue jsf_pid_is_filter_in_parents(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx || !argc) return JS_EXCEPTION;
+ if (!pctx || !argc) return GF_JS_EXCEPTION(ctx);
 	GF_JSFilterCtx *f_ctx = JS_GetOpaque(argv[0], jsf_filter_class_id);
 	GF_JSFilterInstanceCtx *fi_ctx = JS_GetOpaque(argv[0], jsf_filter_inst_class_id);
- if (!f_ctx && !fi_ctx) return JS_EXCEPTION;
+ if (!f_ctx && !fi_ctx) return GF_JS_EXCEPTION(ctx);
 	return JS_NewBool(ctx, gf_filter_pid_is_filter_in_parents(pctx->pid, f_ctx ? f_ctx->filter : fi_ctx->filter));
 }
 
@@ -2073,7 +2310,7 @@
 	Bool in_final_flush;
 	u32 max_units, nb_pck, max_dur, dur;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 
 	in_final_flush = !gf_filter_pid_get_buffer_occupancy(pctx->pid, &max_units, &nb_pck, &max_dur, &dur);
 	res = JS_NewObject(ctx);
@@ -2087,27 +2324,27 @@
 static JSValue jsf_pid_clear_eos(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx || !argc) return JS_EXCEPTION;
+ if (!pctx || !argc) return GF_JS_EXCEPTION(ctx);
 	gf_filter_pid_clear_eos(pctx->pid, JS_ToBool(ctx, argv[0]));
 	return JS_UNDEFINED;
 }
 static JSValue jsf_pid_check_caps(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 	return JS_NewBool(ctx, gf_filter_pid_check_caps(pctx->pid));
 }
 static JSValue jsf_pid_discard_block(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 gf_filter_pid_discard_block(pctx->pid);
 	return JS_UNDEFINED;
 }
 static JSValue jsf_pid_allow_direct_dispatch(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 gf_filter_pid_allow_direct_dispatch(pctx->pid);
 	return JS_UNDEFINED;
 }
@@ -2118,15 +2355,15 @@
 	char szFinal[GF_MAX_PATH];
 	const char *templ, *suffix=NULL;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx || !argc) return JS_EXCEPTION;
+ if (!pctx || !argc) return GF_JS_EXCEPTION(ctx);
 
 	templ = JS_ToCString(ctx, argv[0]);
 	if (!templ)
- 	return JS_EXCEPTION;
+ 	return GF_JS_EXCEPTION(ctx);
 
 	if ((argc>=2) && JS_ToInt32(ctx, &fileidx, argv[1])) {
 		JS_FreeCString(ctx, templ);
- 	return JS_EXCEPTION;
+ 	return GF_JS_EXCEPTION(ctx);
 	}
 
 	if (argc==3)
@@ -2145,10 +2382,10 @@
 	const char *name=NULL;
 	const GF_PropertyValue *prop;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx || !argc) return JS_EXCEPTION;
+ if (!pctx || !argc) return GF_JS_EXCEPTION(ctx);
 
 	name = JS_ToCString(ctx, argv[0]);
-	if (!name) return JS_EXCEPTION;
+	if (!name) return GF_JS_EXCEPTION(ctx);
 
 	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
 		JSValue res;
@@ -2177,9 +2414,9 @@
 	GF_Err e;
 	GF_FilterPidStatistics stats;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx || !argc) return JS_EXCEPTION;
+ if (!pctx || !argc) return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt32(ctx, &mode, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	e = gf_filter_pid_get_statistics(pctx->pid, &stats, mode);
 	if (e)
@@ -2219,6 +2456,9 @@
 {
 	u32 i, count;
 	GF_JSPidCtx *pctx = gf_filter_pid_get_udta(PID);
+
+	gf_js_lock(pctx->jsf->ctx, GF_TRUE);
+
 	count = gf_list_count(pctx->shared_pck);
 	for (i=0; i<count; i++) {
 		GF_JSPckCtx *pckc = gf_list_get(pctx->shared_pck, i);
@@ -2235,14 +2475,15 @@
 			memset(pckc, 0, sizeof(GF_JSPckCtx));
 			gf_list_add(pctx->jsf->pck_res, pckc);
 			gf_list_rem(pctx->shared_pck, i);
-			return;
+			break;
 		}
 	}
+	gf_js_lock(pctx->jsf->ctx, GF_FALSE);
 }
 
 
 #if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
-JSValue webgl_get_frame_interface(JSContext *ctx, int argc, JSValueConst *argv, gf_fsess_packet_destructor *pck_del, GF_FilterFrameInterface **f_ifce);
+JSValue webgl_get_frame_interface(JSContext *ctx, int argc, JSValueConst *argv, GF_FilterPid *for_pid, gf_fsess_packet_destructor *pck_del, GF_FilterFrameInterface **f_ifce);
 #endif
 
 static JSValue jsf_pid_new_packet(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
@@ -2254,7 +2495,10 @@
 	GF_JSPckCtx *pckc;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
 
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
+	if (!pctx->jsf->filter->in_process)
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Filter %s attempt to create a new packet outside process callback not allowed!\n", pctx->jsf->filter->name);
+
 
 	pckc = gf_list_pop_back(pctx->jsf->pck_res);
 	if (!pckc) {
@@ -2265,7 +2509,7 @@
 	obj = JS_NewObjectClass(ctx, jsf_pck_class_id);
 if (JS_IsException(obj)) {
 	gf_list_add(pctx->jsf->pck_res, pckc);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	}
 	JS_SetOpaque(obj, pckc);
 	pckc->jspid = pctx;
@@ -2290,7 +2534,7 @@
 				return js_throw_err(ctx, GF_BAD_PARAM);
 			if (JS_ToInt32(ctx, &len, argv[0])) {
 			gf_list_add(pctx->jsf->pck_res, pckc);
-				return JS_EXCEPTION;
+				return GF_JS_EXCEPTION(ctx);
 			}
 		} else {
 			str = JS_ToCString(ctx, argv[0]);
@@ -2319,7 +2563,7 @@
 	GF_JSPckCtx *pckc_ref = JS_GetOpaque(argv[0], jsf_pck_class_id);
 	if (pckc_ref) {
 		if (use_shared) {
-			pckc->pck = gf_filter_pck_new_ref(pctx->pid, NULL, 0, pckc_ref->pck);
+			pckc->pck = gf_filter_pck_new_ref(pctx->pid, 0, 0, pckc_ref->pck);
 			if ((argc>2) && JS_IsFunction(ctx, argv[2]))
 				pckc->cbck_val = JS_DupValue(ctx, argv[2]);
 		} else {
@@ -2336,9 +2580,9 @@
 
 	if (!JS_IsObject(argv[0])) {
 		JS_FreeValue(ctx, obj);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	}
-	ab_data = JS_GetArrayBuffer(ctx, &ab_size, argv[0]);
+	ab_data = JS_IsArrayBuffer(ctx, argv[0]) ? JS_GetArrayBuffer(ctx, &ab_size, argv[0]) : NULL;
 	//this is an array buffer
 	if (ab_data) {
 		if (use_shared) {
@@ -2363,7 +2607,7 @@
 #if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 	gf_fsess_packet_destructor pck_del = NULL;
 	GF_FilterFrameInterface *f_ifce = NULL;
-	JSValue res = webgl_get_frame_interface(ctx, argc, argv, &pck_del, &f_ifce);
+	JSValue res = webgl_get_frame_interface(ctx, argc, argv, pctx->pid, &pck_del, &f_ifce);
 	if (!JS_IsNull(res)) {
 		if (JS_IsException(res)) {
 			JS_FreeValue(ctx, obj);
@@ -2376,7 +2620,7 @@
 #endif
 
 	JS_FreeValue(ctx, obj);
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(ctx);
 
 
 pck_done:
@@ -2395,7 +2639,7 @@
 	GF_FilterClockType cktype;
 	JSValue res;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 cktype = gf_filter_pid_get_clock_info(pctx->pid, &val, &timescale);
 	res = JS_NewObject(ctx);
 JS_SetPropertyStr(ctx, res, "type", JS_NewInt32(ctx, cktype));
@@ -2412,9 +2656,9 @@
 	const GF_PropertyValue *the_prop = NULL;
 	const char *name=NULL;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 name = JS_ToCString(ctx, argv[0]);
-	if (!name) return JS_EXCEPTION;
+	if (!name) return GF_JS_EXCEPTION(ctx);
 
 	if ((argc>2) && JS_ToBool(ctx, argv[2])) {
 		if (!JS_IsNull(argv[1])) {
@@ -2434,7 +2678,7 @@
 	} else {
 		u32 p4cc = gf_props_get_id(name);
 		JS_FreeCString(ctx, name);
-		if (!p4cc) return JS_EXCEPTION;
+		if (!p4cc) return GF_JS_EXCEPTION(ctx);
 		if (!JS_IsNull(argv[1])) {
 			e = jsf_ToProp(pctx->jsf->filter, ctx, argv[1], p4cc, &prop);
 			if (e)
@@ -2469,12 +2713,25 @@
 	return jsf_pid_set_property_ex(ctx, this_val, argc, argv, 2);
 }
 
+static JSValue jsf_pid_ignore_blocking(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Bool do_ignore = GF_TRUE;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
+ if (argc) do_ignore = JS_ToBool(ctx, argv[0]) ? GF_TRUE : GF_FALSE;
+ gf_filter_pid_ignore_blocking(pctx->pid, do_ignore);
+	return JS_UNDEFINED;
+
+}
+
 static JSValue jsf_pid_remove(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
- gf_filter_pid_remove(pctx->pid);
- pctx->pid = NULL;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
+ if (pctx->pid) {
+		gf_filter_pid_remove(pctx->pid);
+		pctx->pid = NULL;
+ }
 JS_SetOpaque(this_val, NULL);
 	return JS_UNDEFINED;
 }
@@ -2483,7 +2740,7 @@
 {
 	GF_Err e;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx) return JS_EXCEPTION;
+ if (!pctx) return GF_JS_EXCEPTION(ctx);
 e = gf_filter_pid_reset_properties(pctx->pid);
 	if (e) return js_throw_err(ctx, e);
 	return JS_UNDEFINED;
@@ -2493,9 +2750,9 @@
 {
 	GF_Err e;
 	GF_JSPidCtx *pctx_this = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx_this || !argc) return JS_EXCEPTION;
+ if (!pctx_this || !argc) return GF_JS_EXCEPTION(ctx);
 	GF_JSPidCtx *pctx_from = JS_GetOpaque(argv[0], jsf_pid_class_id);
- if (!pctx_from) return JS_EXCEPTION;
+ if (!pctx_from) return GF_JS_EXCEPTION(ctx);
 e = gf_filter_pid_copy_properties(pctx_this->pid, pctx_from->pid);
 	if (e) return js_throw_err(ctx, e);
 return JS_UNDEFINED;
@@ -2506,10 +2763,10 @@
 	GF_Err e;
 	GF_JSPckCtx *pckc;
 	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
- if (!pctx || !argc) return JS_EXCEPTION;
- if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+ if (!pctx || !argc) return GF_JS_EXCEPTION(ctx);
+ if (!JS_IsObject(argv[0])) return GF_JS_EXCEPTION(ctx);
 	pckc = JS_GetOpaque(argv[0], jsf_pck_class_id);
- if (!pckc || !pckc->pck) return JS_EXCEPTION;
+ if (!pckc || !pckc->pck) return GF_JS_EXCEPTION(ctx);
 e = gf_filter_pck_forward(pckc->pck, pctx->pid);
 	if (e) return js_throw_err(ctx, e);
 return JS_UNDEFINED;
@@ -2520,11 +2777,13 @@
 JS_CGETSET_MAGIC_DEF("name", jsf_pid_get_prop, jsf_pid_set_prop, JSF_PID_NAME),
 JS_CGETSET_MAGIC_DEF("eos", jsf_pid_get_prop, jsf_pid_set_prop, JSF_PID_EOS),
 JS_CGETSET_MAGIC_DEF("eos_seen", jsf_pid_get_prop, NULL, JSF_PID_EOS_SEEN),
+ JS_CGETSET_MAGIC_DEF("eos_received", jsf_pid_get_prop, NULL, JSF_PID_EOS_RECEIVED),
 JS_CGETSET_MAGIC_DEF("would_block", jsf_pid_get_prop, NULL, JSF_PID_WOULD_BLOCK),
 JS_CGETSET_MAGIC_DEF("filter_name", jsf_pid_get_prop, NULL, JSF_PID_FILTER_NAME),
 JS_CGETSET_MAGIC_DEF("src_name", jsf_pid_get_prop, NULL, JSF_PID_FILTER_SRC),
 JS_CGETSET_MAGIC_DEF("args", jsf_pid_get_prop, NULL, JSF_PID_FILTER_ARGS),
 JS_CGETSET_MAGIC_DEF("src_args", jsf_pid_get_prop, NULL, JSF_PID_FILTER_SRC_ARGS),
+ JS_CGETSET_MAGIC_DEF("unicity_args", jsf_pid_get_prop, NULL, JSF_PID_FILTER_UNICITY_ARGS),
 JS_CGETSET_MAGIC_DEF("max_buffer", jsf_pid_get_prop, jsf_pid_set_prop, JSF_PID_MAX_BUFFER),
 JS_CGETSET_MAGIC_DEF("loose_connect", NULL, jsf_pid_set_prop, JSF_PID_LOOSE_CONNECT),
 JS_CGETSET_MAGIC_DEF("framing", NULL, jsf_pid_set_prop, JSF_PID_FRAMING_MODE),
@@ -2542,6 +2801,7 @@
 JS_CGETSET_MAGIC_DEF("recompute_dts", NULL, jsf_pid_set_prop, JSF_PID_RECOMPUTE_DTS),
 JS_CGETSET_MAGIC_DEF("min_pck_dur", jsf_pid_get_prop, NULL, JSF_PID_MIN_PCK_DUR),
 JS_CGETSET_MAGIC_DEF("playing", jsf_pid_get_prop, NULL, JSF_PID_IS_PLAYING),
+ JS_CGETSET_MAGIC_DEF("next_ts", jsf_pid_get_prop, NULL, JSF_PID_NEXT_TS),
 JS_CFUNC_DEF("send_event", 0, jsf_pid_send_event),
 JS_CFUNC_DEF("enum_properties", 0, jsf_pid_enum_properties),
 JS_CFUNC_DEF("get_prop", 0, jsf_pid_get_property),
@@ -2566,6 +2826,7 @@
 JS_CFUNC_DEF("copy_props", 0, jsf_pid_copy_props),
 JS_CFUNC_DEF("forward", 0, jsf_pid_forward),
 JS_CFUNC_DEF("negociate_prop", 0, jsf_pid_negociate_prop),
+ JS_CFUNC_DEF("ignore_blocking", 0, jsf_pid_ignore_blocking),
 };
 
 enum
@@ -2614,6 +2875,8 @@
 
 	JSF_EVENT_USER_TYPE,
 	JSF_EVENT_USER_KEYCODE,
+	JSF_EVENT_USER_KEYNAME,
+	JSF_EVENT_USER_KEYMODS,
 	JSF_EVENT_USER_MOUSE_X,
 	JSF_EVENT_USER_MOUSE_Y,
 	JSF_EVENT_USER_WHEEL,
@@ -2758,6 +3021,8 @@
 		case GF_EVENT_TEXTINPUT:
 			switch (magic) {
 			case JSF_EVENT_USER_KEYCODE:
+			case JSF_EVENT_USER_KEYNAME:
+			case JSF_EVENT_USER_KEYMODS:
 			case JSF_EVENT_USER_HWKEY:
 			case JSF_EVENT_USER_DROPFILES:
 				return GF_TRUE;
@@ -2819,18 +3084,18 @@
 	Double dval;
 	const char *str=NULL;
 	GF_FilterEvent *evt = JS_GetOpaque(this_val, jsf_event_class_id);
- if (!evt) return JS_EXCEPTION;
+ if (!evt) return GF_JS_EXCEPTION(ctx);
 	if (!jsf_check_evt(evt->base.type, evt->user_event.event.type, magic))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case JSF_EVENT_TYPE:
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	/*PLAY*/
 	case JSF_EVENT_START_RANGE:
-		return JS_ToFloat64(ctx, &evt->play.start_range, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToFloat64(ctx, &evt->play.start_range, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_SPEED:
-		return JS_ToFloat64(ctx, &evt->play.speed, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToFloat64(ctx, &evt->play.speed, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_HW_BUFFER_RESET:
 		evt->play.hw_buffer_reset = JS_ToBool(ctx, value);
 		return JS_UNDEFINED;
@@ -2838,7 +3103,7 @@
 		evt->play.initial_broadcast_play = JS_ToBool(ctx, value);
 		return JS_UNDEFINED;
 	case JSF_EVENT_TIMESTAMP_BASED:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		evt->play.timestamp_based = (u8) ival;
 		return JS_UNDEFINED;
 	case JSF_EVENT_FULL_FILE_ONLY:
@@ -2848,12 +3113,12 @@
 		evt->play.forced_dash_segment_switch = JS_ToBool(ctx, value);
 		return JS_UNDEFINED;
 	case JSF_EVENT_FROM_PCK:
-		return JS_ToInt32(ctx, &evt->play.from_pck, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt32(ctx, &evt->play.from_pck, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	/*source switch*/
 	case JSF_EVENT_START_OFFSET:
-		return JS_ToInt64(ctx, &evt->seek.start_offset, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt64(ctx, &evt->seek.start_offset, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_END_OFFSET:
-		return JS_ToInt64(ctx, &evt->seek.end_offset, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt64(ctx, &evt->seek.end_offset, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_SOURCE_SWITCH:
 		/*TODO check leak!*/
 		evt->seek.source_switch = JS_ToCString(ctx, value);
@@ -2862,89 +3127,91 @@
 		evt->seek.skip_cache_expiration = JS_ToBool(ctx, value);
 		return JS_UNDEFINED;
 	case JSF_EVENT_HINT_BLOCK_SIZE:
-		return JS_ToInt32(ctx, &evt->seek.hint_block_size, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt32(ctx, &evt->seek.hint_block_size, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	/*segment size*/
 	case JSF_EVENT_SEG_URL:
 		/*TODO check leak!*/
 		evt->seg_size.seg_url = JS_ToCString(ctx, value);
 		return JS_UNDEFINED;
 	case JSF_EVENT_SEG_IS_INIT:
-		evt->seg_size.is_init = JS_ToBool(ctx, value);
+		evt->seg_size.is_init = JS_ToBool(ctx, value) ? 1 : 0;
 		return JS_UNDEFINED;
 	case JSF_EVENT_MEDIA_START_RANGE:
-		return JS_ToInt64(ctx, &evt->seg_size.media_range_start, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt64(ctx, &evt->seg_size.media_range_start, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_MEDIA_END_RANGE:
-		return JS_ToInt64(ctx, &evt->seg_size.media_range_end, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt64(ctx, &evt->seg_size.media_range_end, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_IDX_START_RANGE:
-		return JS_ToInt64(ctx, &evt->seg_size.idx_range_start, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt64(ctx, &evt->seg_size.idx_range_start, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_IDX_END_RANGE:
-		return JS_ToInt64(ctx, &evt->seg_size.idx_range_end, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt64(ctx, &evt->seg_size.idx_range_end, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	/*quality switch*/
 	case JSF_EVENT_SWITCH_UP:
 		evt->quality_switch.up = JS_ToBool(ctx, value);
 		return JS_UNDEFINED;
 	case JSF_EVENT_SWITCH_GROUP_IDX:
-		return JS_ToInt32(ctx, &evt->quality_switch.dependent_group_index, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt32(ctx, &evt->quality_switch.dependent_group_index, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_SWITCH_QUALITY_IDX:
-		return JS_ToInt32(ctx, &evt->quality_switch.q_idx, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt32(ctx, &evt->quality_switch.q_idx, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_SWITCH_TILE_MODE:
-		return JS_ToInt32(ctx, &evt->quality_switch.set_tile_mode_plus_one, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt32(ctx, &evt->quality_switch.set_tile_mode_plus_one, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_SWITCH_QUALITY_DEGRADATION:
-		return JS_ToInt32(ctx, &evt->quality_switch.quality_degradation, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt32(ctx, &evt->quality_switch.quality_degradation, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	/*visibility hint*/
-	case JSF_EVENT_VIS_MIN_X: return JS_ToInt32(ctx, &evt->visibility_hint.min_x, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_VIS_MIN_Y: return JS_ToInt32(ctx, &evt->visibility_hint.min_y, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_VIS_MAX_X: return JS_ToInt32(ctx, &evt->visibility_hint.max_x, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_VIS_MAX_Y: return JS_ToInt32(ctx, &evt->visibility_hint.max_y, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_VIS_MIN_X: return JS_ToInt32(ctx, &evt->visibility_hint.min_x, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_VIS_MIN_Y: return JS_ToInt32(ctx, &evt->visibility_hint.min_y, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_VIS_MAX_X: return JS_ToInt32(ctx, &evt->visibility_hint.max_x, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_VIS_MAX_Y: return JS_ToInt32(ctx, &evt->visibility_hint.max_y, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_VIS_IS_GAZE:
 		evt->visibility_hint.is_gaze = JS_ToBool(ctx, value);
 		return JS_UNDEFINED;
 	/*buffer reqs*/
-	case JSF_EVENT_BUFREQ_MAX_BUFFER_US: return JS_ToInt32(ctx, &evt->buffer_req.max_buffer_us, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_BUFREQ_MAX_PLAYOUT_US: return JS_ToInt32(ctx, &evt->buffer_req.max_playout_us, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_BUFREQ_MIN_PLAYOUT_US: return JS_ToInt32(ctx, &evt->buffer_req.min_playout_us, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_BUFREQ_MAX_BUFFER_US: return JS_ToInt32(ctx, &evt->buffer_req.max_buffer_us, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_BUFREQ_MAX_PLAYOUT_US: return JS_ToInt32(ctx, &evt->buffer_req.max_playout_us, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_BUFREQ_MIN_PLAYOUT_US: return JS_ToInt32(ctx, &evt->buffer_req.min_playout_us, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_BUFREQ_PID_ONLY:
 		evt->buffer_req.pid_only = JS_ToBool(ctx, value);
 		return JS_UNDEFINED;
 
 	case JSF_EVENT_USER_TYPE:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		evt->user_event.event.type = (u8) ival;
 		return JS_UNDEFINED;
 
 
 	case JSF_EVENT_USER_MOUSE_X:
 		if (evt->user_event.event.type==GF_EVENT_MULTITOUCH) {
-			if (JS_ToFloat64(ctx, &dval, value)) return JS_EXCEPTION;
+			if (JS_ToFloat64(ctx, &dval, value)) return GF_JS_EXCEPTION(ctx);
 			evt->user_event.event.mtouch.x = FLT2FIX(dval);
 			return JS_UNDEFINED;
 		}
-		return JS_ToInt32(ctx, &evt->user_event.event.mouse.x, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt32(ctx, &evt->user_event.event.mouse.x, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_USER_MOUSE_Y:
 		if (evt->user_event.event.type==GF_EVENT_MULTITOUCH) {
-			if (JS_ToFloat64(ctx, &dval, value)) return JS_EXCEPTION;
+			if (JS_ToFloat64(ctx, &dval, value)) return GF_JS_EXCEPTION(ctx);
 			evt->user_event.event.mtouch.y = FLT2FIX(dval);
 			return JS_UNDEFINED;
 		}
-		return JS_ToInt32(ctx, &evt->user_event.event.mouse.y, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt32(ctx, &evt->user_event.event.mouse.y, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 
 	case JSF_EVENT_USER_WHEEL:
-		if (JS_ToFloat64(ctx, &dval, value)) return JS_EXCEPTION;
+		if (JS_ToFloat64(ctx, &dval, value)) return GF_JS_EXCEPTION(ctx);
 		evt->user_event.event.mouse.wheel_pos = FLT2FIX(dval);
 		return JS_UNDEFINED;
-	case JSF_EVENT_USER_BUTTON: return JS_ToInt32(ctx, &evt->user_event.event.mouse.button, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_USER_HWKEY: return JS_ToInt32(ctx, &evt->user_event.event.key.hw_code, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_USER_BUTTON: return JS_ToInt32(ctx, &evt->user_event.event.mouse.button, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_USER_HWKEY: return JS_ToInt32(ctx, &evt->user_event.event.key.hw_code, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_USER_KEYCODE: return JS_ToInt32(ctx, &evt->user_event.event.key.key_code, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_USER_KEYMODS: return JS_ToInt32(ctx, &evt->user_event.event.key.flags, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 
 	case JSF_EVENT_USER_MT_ROTATION:
-		if (JS_ToFloat64(ctx, &dval, value)) return JS_EXCEPTION;
+		if (JS_ToFloat64(ctx, &dval, value)) return GF_JS_EXCEPTION(ctx);
 		evt->user_event.event.mtouch.rotation = FLT2FIX(dval);
 		return JS_UNDEFINED;
 	case JSF_EVENT_USER_MT_PINCH:
-		if (JS_ToFloat64(ctx, &dval, value)) return JS_EXCEPTION;
+		if (JS_ToFloat64(ctx, &dval, value)) return GF_JS_EXCEPTION(ctx);
 		evt->user_event.event.mtouch.pinch = FLT2FIX(dval);
 		return JS_UNDEFINED;
 	case JSF_EVENT_USER_MT_FINGERS:
-		return JS_ToInt32(ctx, &evt->user_event.event.mtouch.num_fingers, value) ? JS_EXCEPTION : JS_UNDEFINED;
+		return JS_ToInt32(ctx, &evt->user_event.event.mtouch.num_fingers, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 
 	case JSF_EVENT_USER_TEXT:
 	{
@@ -2954,15 +3221,15 @@
 		return JS_UNDEFINED;
 	}
 
-	case JSF_EVENT_USER_WIDTH: return JS_ToInt32(ctx, &evt->user_event.event.size.width, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_USER_HEIGHT: return JS_ToInt32(ctx, &evt->user_event.event.size.height, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_USER_SHOWTYPE: return JS_ToInt32(ctx, &evt->user_event.event.show.show_type, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_USER_MOVE_X: return JS_ToInt32(ctx, &evt->user_event.event.move.x, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_USER_MOVE_Y: return JS_ToInt32(ctx, &evt->user_event.event.move.y, value) ? JS_EXCEPTION : JS_UNDEFINED;
-	case JSF_EVENT_USER_MOVE_RELATIVE: return JS_ToInt32(ctx, &evt->user_event.event.move.relative, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_USER_WIDTH: return JS_ToInt32(ctx, &evt->user_event.event.size.width, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_USER_HEIGHT: return JS_ToInt32(ctx, &evt->user_event.event.size.height, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_USER_SHOWTYPE: return JS_ToInt32(ctx, &evt->user_event.event.show.show_type, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_USER_MOVE_X: return JS_ToInt32(ctx, &evt->user_event.event.move.x, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_USER_MOVE_Y: return JS_ToInt32(ctx, &evt->user_event.event.move.y, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
+	case JSF_EVENT_USER_MOVE_RELATIVE: return JS_ToInt32(ctx, &evt->user_event.event.move.relative, value) ? GF_JS_EXCEPTION(ctx) : JS_UNDEFINED;
 	case JSF_EVENT_USER_MOVE_ALIGN_X:
 	case JSF_EVENT_USER_MOVE_ALIGN_Y:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		if (magic==JSF_EVENT_USER_MOVE_ALIGN_X)
 			evt->user_event.event.move.align_x = ival;
 		else
@@ -2987,9 +3254,9 @@
 static JSValue jsf_event_get_prop(JSContext *ctx, JSValueConst this_val, int magic)
 {
 	GF_FilterEvent *evt = JS_GetOpaque(this_val, jsf_event_class_id);
- if (!evt) return JS_EXCEPTION;
+ if (!evt) return GF_JS_EXCEPTION(ctx);
 	if (!jsf_check_evt(evt->base.type, evt->user_event.event.type, magic))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	switch (magic) {
 	case JSF_EVENT_TYPE: return JS_NewInt32(ctx, evt->base.type);
 	case JSF_EVENT_NAME:
@@ -3067,7 +3334,10 @@
 	case JSF_EVENT_BUFREQ_PID_ONLY: return JS_NewBool(ctx, evt->buffer_req.pid_only);
 	/*user event*/
 	case JSF_EVENT_USER_TYPE: return JS_NewInt32(ctx, evt->user_event.event.type);
-	case JSF_EVENT_USER_KEYCODE:
+	case JSF_EVENT_USER_KEYCODE: return JS_NewInt32(ctx, evt->user_event.event.key.key_code);
+	case JSF_EVENT_USER_KEYMODS:
+		return JS_NewInt32(ctx, evt->user_event.event.key.flags);
+	case JSF_EVENT_USER_KEYNAME:
 #ifndef GPAC_DISABLE_SVG
 		return JS_NewString(ctx, gf_dom_get_key_name(evt->user_event.event.key.key_code) );
 #else
@@ -3175,6 +3445,8 @@
 /*ui events*/
 JS_CGETSET_MAGIC_DEF("ui_type", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_USER_TYPE),
 JS_CGETSET_MAGIC_DEF("keycode", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_USER_KEYCODE),
+ JS_CGETSET_MAGIC_DEF("keyname", jsf_event_get_prop, NULL, JSF_EVENT_USER_KEYNAME),
+ JS_CGETSET_MAGIC_DEF("keymods", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_USER_KEYMODS),
 JS_CGETSET_MAGIC_DEF("mouse_x", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_USER_MOUSE_X),
 JS_CGETSET_MAGIC_DEF("mouse_y", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_USER_MOUSE_Y),
 JS_CGETSET_MAGIC_DEF("wheel", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_USER_WHEEL),
@@ -3206,11 +3478,11 @@
 JSValue obj;
 s32 type;
 	if (argc!=1)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt32(ctx, &type, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	if (!type)
- 	return JS_EXCEPTION;
+ 	return GF_JS_EXCEPTION(ctx);
 obj = JS_NewObjectClass(ctx, jsf_event_class_id);
 if (JS_IsException(obj)) return obj;
 
@@ -3252,6 +3524,7 @@
 	JSF_PCK_SIZE,
 	JSF_PCK_DATA,
 	JSF_PCK_FRAME_IFCE,
+	JSF_PCK_HAS_PROPERTIES,
 };
 
 static JSValue jsf_pck_set_prop(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
@@ -3263,7 +3536,7 @@
 	const char *str=NULL;
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 pck = pckctx->pck;
 
 switch (magic) {
@@ -3279,7 +3552,7 @@
 		if (JS_IsNull(value))
 			gf_filter_pck_set_dts(pck, GF_FILTER_NO_TS);
 		else {
-			if (JS_ToInt64(ctx, &lival, value)) return JS_EXCEPTION;
+			if (JS_ToInt64(ctx, &lival, value)) return GF_JS_EXCEPTION(ctx);
 			gf_filter_pck_set_dts(pck, lival);
 		}
 		break;
@@ -3287,20 +3560,20 @@
 		if (JS_IsNull(value))
 			gf_filter_pck_set_cts(pck, GF_FILTER_NO_TS);
 		else {
-			if (JS_ToInt64(ctx, &lival, value)) return JS_EXCEPTION;
+			if (JS_ToInt64(ctx, &lival, value)) return GF_JS_EXCEPTION(ctx);
 			gf_filter_pck_set_cts(pck, lival);
 		}
 		break;
 	case JSF_PCK_DUR:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_pck_set_duration(pck, ival);
 		break;
 	case JSF_PCK_SAP:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_pck_set_sap(pck, ival);
 		break;
 	case JSF_PCK_INTERLACED:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_pck_set_interlaced(pck, ival);
 		break;
 	case JSF_PCK_SEEK:
@@ -3313,53 +3586,53 @@
 		if (JS_IsNull(value))
 			gf_filter_pck_set_byte_offset(pck, GF_FILTER_NO_BO);
 		else {
-			if (JS_ToInt64(ctx, &lival, value)) return JS_EXCEPTION;
+			if (JS_ToInt64(ctx, &lival, value)) return GF_JS_EXCEPTION(ctx);
 			gf_filter_pck_set_byte_offset(pck, lival);
 		}
 		break;
 	case JSF_PCK_ROLL:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_pck_set_roll_info(pck, (s16) ival);
 		break;
 	case JSF_PCK_CRYPT:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_pck_set_crypt_flags(pck, ival);
 		break;
 	case JSF_PCK_CLOCK_TYPE:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_pck_set_clock_type(pck, ival);
 		break;
 	case JSF_PCK_CAROUSEL:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_pck_set_carousel_version(pck, ival);
 		break;
 	case JSF_PCK_SEQNUM:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_filter_pck_set_seq_num(pck, ival);
 		break;
 	case JSF_PCK_IS_LEADING:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		flags = gf_filter_pck_get_dependency_flags(pck);
 		flags &= 0x3F;
 		flags |= (ival & 0x3)<<6;
 		gf_filter_pck_set_seq_num(pck, flags);
 		break;
 	case JSF_PCK_DEPENDS_ON:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		flags = gf_filter_pck_get_dependency_flags(pck);
 		flags &= 0xCF;
 		flags |= (ival & 0x3)<<4;
 		gf_filter_pck_set_seq_num(pck, flags);
 		break;
 	case JSF_PCK_DEPENDED_ON:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		flags = gf_filter_pck_get_dependency_flags(pck);
 		flags &= 0xF3;
 		flags |= (ival & 0x3)<<2;
 		gf_filter_pck_set_seq_num(pck, flags);
 		break;
 	case JSF_PCK_HAS_REDUNDANT:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		flags = gf_filter_pck_get_dependency_flags(pck);
 		flags &= 0xFC;
 		flags |= (ival & 0x3);
@@ -3379,7 +3652,7 @@
 	u32 ival;
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 pck = pckctx->pck;
 
 	switch (magic) {
@@ -3444,12 +3717,16 @@
 		if (JS_IsUndefined(pckctx->data_ab)) {
 			const u8 *data = gf_filter_pck_get_data(pck, &ival);
 			if (!data) return JS_NULL;
-			pckctx->data_ab = JS_NewArrayBuffer(ctx, (u8 *) data, ival, NULL, NULL, GF_TRUE);
+			pckctx->data_ab = JS_NewArrayBuffer(ctx, (u8 *) data, ival, NULL, NULL, 0/*1*/);
 		}
 		return JS_DupValue(ctx, pckctx->data_ab);
 	case JSF_PCK_FRAME_IFCE:
-		if (gf_filter_pck_get_frame_interface(pck) != NULL) return JS_NewBool(ctx, 1);
+		if (gf_filter_pck_get_frame_interface(pck) != NULL)
+			return JS_NewBool(ctx, 1);
 		else return JS_NewBool(ctx, 0);
+
+	case JSF_PCK_HAS_PROPERTIES:
+		return JS_NewBool(ctx, gf_filter_pck_has_properties(pck) );
 	}
 return JS_UNDEFINED;
 }
@@ -3458,7 +3735,7 @@
 {
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 pck = pckctx->pck;
 
 	gf_filter_pck_set_readonly(pck);
@@ -3473,16 +3750,16 @@
 	const GF_PropertyValue *prop;
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 pck = pckctx->pck;
 
 if (JS_ToInt32(ctx, &idx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	prop = gf_filter_pck_enum_properties(pck, &idx, &p4cc, &pname);
 	if (!prop) return JS_NULL;
 	if (!pname) pname = gf_props_4cc_get_name(p4cc);
-	if (!pname) return JS_EXCEPTION;
+	if (!pname) return GF_JS_EXCEPTION(ctx);
 
 	res = JS_NewObject(ctx);
 JS_SetPropertyStr(ctx, res, "name", JS_NewString(ctx, pname));
@@ -3498,11 +3775,11 @@
 	const GF_PropertyValue *prop;
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 pck = pckctx->pck;
 
 name = JS_ToCString(ctx, argv[0]);
-	if (!name) return JS_EXCEPTION;
+	if (!name) return GF_JS_EXCEPTION(ctx);
 	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
 		prop = gf_filter_pck_get_property_str(pck, name);
 		JS_FreeCString(ctx, name);
@@ -3527,7 +3804,7 @@
 	Bool is_ref_props = GF_FALSE;
 	GF_JSPckCtx *ref_pckctx;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 
 if (argc && JS_ToBool(ctx, argv[0])) is_ref_props = GF_TRUE;
 
@@ -3553,17 +3830,20 @@
 
 static JSValue jsf_pck_unref(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
+	GF_JSPidCtx *jspid;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 	if (!(pckctx->flags & GF_JS_PCK_IS_REF))
 		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Attempt to unref a non-reference packet");
 
 	gf_filter_pck_unref(pckctx->pck);
 	pckctx->pck = NULL;
 	JS_FreeValue(ctx, pckctx->jsobj);
+	JS_FreeValue(ctx, pckctx->data_ab);
 	JS_SetOpaque(this_val, NULL);
-	gf_list_add(pckctx->jspid->jsf->pck_res, pckctx);
+	jspid = pckctx->jspid;
 	memset(pckctx, 0, sizeof(GF_JSPckCtx));
+	gf_list_add(jspid->jsf->pck_res, pckctx);
 	return JS_UNDEFINED;
 }
 
@@ -3571,7 +3851,10 @@
 {
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
+	if (! pckctx->jspid->jsf->filter->in_process)
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Filter %s attempt to send packet outside process callback not allowed!\n", pckctx->jspid->jsf->filter->name);
+
 pck = pckctx->pck;
 if (!JS_IsUndefined(pckctx->data_ab)) {
 	JS_FreeValue(ctx, pckctx->data_ab);
@@ -3580,8 +3863,10 @@
 	gf_filter_pck_send(pck);
 	JS_SetOpaque(this_val, NULL);
 	if (!(pckctx->flags & GF_JS_PCK_IS_SHARED)) {
-		gf_list_add(pckctx->jspid->jsf->pck_res, pckctx);
-		memset(pckctx, 0, sizeof(GF_JSPckCtx));
+		if (pckctx->jspid) {
+			gf_list_add(pckctx->jspid->jsf->pck_res, pckctx);
+			memset(pckctx, 0, sizeof(GF_JSPckCtx));
+		}
 	}
 	return JS_UNDEFINED;
 }
@@ -3589,7 +3874,7 @@
 {
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 pck = pckctx->pck;
 pckctx->pck = NULL;
 	gf_filter_pck_discard(pck);
@@ -3603,11 +3888,11 @@
 	const char *name=NULL;
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 pck = pckctx->pck;
 
 name = JS_ToCString(ctx, argv[0]);
-	if (!name) return JS_EXCEPTION;
+	if (!name) return GF_JS_EXCEPTION(ctx);
 
 	if ((argc>2) && JS_ToBool(ctx, argv[2])) {
 		if (!JS_IsNull(argv[2])) {
@@ -3621,15 +3906,34 @@
 		}
 	} else {
 		u32 p4cc = gf_props_get_id(name);
+		if (!p4cc) {
+			JSValue ret;
+			JS_FreeCString(ctx, name);
+			ret = js_throw_err_msg(ctx, GF_BAD_PARAM, "Urecognized builtin property name %s\n", name);
+			return ret;
+		}
 		JS_FreeCString(ctx, name);
-		if (!p4cc) return js_throw_err(ctx, GF_OUT_OF_MEM);
-		if (!!JS_IsNull(argv[1])) {
+		if ( ((p4cc==GF_PROP_PCK_SENDER_NTP) || (p4cc==GF_PROP_PCK_RECEIVER_NTP))
+			&& JS_IsBool(argv[1]) && JS_ToBool(ctx, argv[1])
+		) {
+			e = gf_filter_pck_set_property(pck, p4cc, &PROP_LONGUINT(gf_net_get_ntp_ts()) );
+		}
+		else if (JS_IsNull(argv[1])) {
+			e = gf_filter_pck_set_property(pck, p4cc, NULL);
+		}
+		else {
 			e = jsf_ToProp(pckctx->jspid->jsf->filter, ctx, argv[1], p4cc, &prop);
 			if (e) return js_throw_err(ctx, e);
+			if ( ((p4cc==GF_PROP_PCK_SENDER_NTP) || (p4cc==GF_PROP_PCK_RECEIVER_NTP)) && (prop.type==GF_PROP_FRACTION)) {
+				u64 ntp = (u32) prop.value.frac.num;
+				ntp <<= 32;
+				ntp |= prop.value.frac.den;
+				prop.type = GF_PROP_LUINT;
+				prop.value.longuint = ntp;
+			}
+
 			e = gf_filter_pck_set_property(pck, p4cc, &prop);
 			gf_props_reset_single(&prop);
-		} else {
-			e = gf_filter_pck_set_property(pck, p4cc, NULL);
 		}
 	}
 	if (e) return js_throw_err(ctx, e);
@@ -3644,7 +3948,7 @@
 	GF_Err e;
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck || !argc) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck || !argc) return GF_JS_EXCEPTION(ctx);
 pck = pckctx->pck;
 
 	if (JS_IsString(argv[0]) || JS_IsInteger(argv[0])) {
@@ -3655,7 +3959,7 @@
 			JS_ToInt32(ctx, &len, argv[0]);
 		} else {
 			str = JS_ToCString(ctx, argv[0]);
-			if (!str) return JS_EXCEPTION;
+			if (!str) return GF_JS_EXCEPTION(ctx);
 			len = (u32) strlen(str);
 		}
 
@@ -3670,15 +3974,15 @@
 		}
 
 		jsf_pck_detach_ab(ctx, pckctx);
-		return JS_NewArrayBuffer(ctx, (u8 *) new_start, len, NULL, NULL, GF_TRUE);
+		return JS_NewArrayBuffer(ctx, (u8 *) new_start, len, NULL, NULL, 0/*1*/);
 	}
 
-	if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+	if (!JS_IsObject(argv[0])) return GF_JS_EXCEPTION(ctx);
 
 	size_t ab_size;
 	u8 *data = JS_GetArrayBuffer(ctx, &ab_size, argv[0]);
 	if (!data)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	e = gf_filter_pck_expand(pck, (u32) ab_size, &data_start, &new_start, &data_size);
 	if (!new_start || e) {
@@ -3688,7 +3992,7 @@
 
 	jsf_pck_detach_ab(ctx, pckctx);
 
-	return JS_NewArrayBuffer(ctx, (u8 *) new_start, ab_size, NULL, NULL, GF_TRUE);
+	return JS_NewArrayBuffer(ctx, (u8 *) new_start, ab_size, NULL, NULL, 0/*1*/);
 }
 
 static JSValue jsf_pck_truncate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
@@ -3697,7 +4001,7 @@
 	GF_Err e;
 	GF_FilterPacket *pck;
 	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
- if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ if (!pckctx || !pckctx->pck) return GF_JS_EXCEPTION(ctx);
 pck = pckctx->pck;
 	if (argc) {
 		JS_ToInt32(ctx, &len, argv[0]);
@@ -3713,15 +4017,53 @@
 	GF_Err e;
 	GF_JSPckCtx *pck_dst = JS_GetOpaque(this_val, jsf_pck_class_id);
 	if (!pck_dst || !pck_dst->pck || !argc)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	GF_JSPckCtx *pck_from = JS_GetOpaque(argv[0], jsf_pck_class_id);
 if (!pck_from || !pck_from->pck)
- 	return JS_EXCEPTION;
+ 	return GF_JS_EXCEPTION(ctx);
 e = gf_filter_pck_merge_properties(pck_from->pck, pck_dst->pck);
 	if (e) return js_throw_err(ctx, e);
 return JS_UNDEFINED;
 }
 
+static JSValue jsf_pck_clone(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	GF_FilterPacket *cloned;
+	GF_JSPckCtx *pck_cached = NULL;
+	GF_JSPckCtx *pck_src = JS_GetOpaque(this_val, jsf_pck_class_id);
+	if (!pck_src || !pck_src->pck)
+		return GF_JS_EXCEPTION(ctx);
+	if (argc) {
+		pck_cached = JS_GetOpaque(argv[0], jsf_pck_class_id);
+		if (pck_cached && !pck_cached->pck)
+			return GF_JS_EXCEPTION(ctx);
+ }
+	cloned = gf_filter_pck_dangling_copy(pck_src->pck, pck_cached ? pck_cached->pck : NULL);
+	if (!cloned) return js_throw_err(ctx, GF_OUT_OF_MEM);
+
+	if (pck_cached) {
+		pck_cached->pck = cloned;
+		return JS_DupValue(ctx, pck_cached->jsobj);
+	}
+	res = JS_NewObjectClass(ctx, jsf_pck_class_id);
+	pck_cached = gf_list_pop_back(pck_src->jspid->jsf->pck_res);
+	if (!pck_cached) {
+		GF_SAFEALLOC(pck_cached, GF_JSPckCtx);
+		if (!pck_cached) return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
+	memset(pck_cached, 0, sizeof(GF_JSPckCtx));
+	pck_cached->pck = cloned;
+	pck_cached->jsobj = res;
+	pck_cached->jspid = NULL;
+	pck_cached->ref_val = JS_UNDEFINED;
+	pck_cached->data_ab = JS_UNDEFINED;
+	pck_cached->flags = GF_JS_PCK_IS_DANGLING;
+	JS_SetOpaque(res, pck_cached);
+ return res;
+}
+
+
 static const JSCFunctionListEntry jsf_pck_funcs[] =
 {
 JS_CGETSET_MAGIC_DEF("start", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_START),
@@ -3747,7 +4089,8 @@
 JS_CGETSET_MAGIC_DEF("redundant", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_HAS_REDUNDANT),
 JS_CGETSET_MAGIC_DEF("size", jsf_pck_get_prop, NULL, JSF_PCK_SIZE),
 JS_CGETSET_MAGIC_DEF("data", jsf_pck_get_prop, NULL, JSF_PCK_DATA),
- JS_CGETSET_MAGIC_DEF("frame_ifce", jsf_pck_get_prop, NULL, JSF_PCK_DATA),
+ JS_CGETSET_MAGIC_DEF("frame_ifce", jsf_pck_get_prop, NULL, JSF_PCK_FRAME_IFCE),
+ JS_CGETSET_MAGIC_DEF("has_properties", jsf_pck_get_prop, NULL, JSF_PCK_HAS_PROPERTIES),
 
 JS_CFUNC_DEF("set_readonly", 0, jsf_pck_set_readonly),
 JS_CFUNC_DEF("enum_properties", 0, jsf_pck_enum_properties),
@@ -3760,6 +4103,7 @@
 JS_CFUNC_DEF("append", 0, jsf_pck_append_data),
 JS_CFUNC_DEF("truncate", 0, jsf_pck_truncate),
 JS_CFUNC_DEF("copy_props", 0, jsf_pck_copy_props),
+ JS_CFUNC_DEF("clone", 0, jsf_pck_clone),
 };
 
 
@@ -3783,7 +4127,7 @@
 	JS_FreeValue(jsf->ctx, ret);
 	gf_js_lock(jsf->ctx, GF_FALSE);
 
-	js_do_loop(jsf->ctx);
+	js_std_loop(jsf->ctx);
 	return e;
 }
 
@@ -3811,13 +4155,26 @@
 		}
 		else if (JS_IsInteger(ret))
 			JS_ToInt32(jsf->ctx, (int*)&e, ret);
+
+		//reset first packet obj if set
+		if (pctx->pck_head) {
+			JS_FreeValue(jsf->ctx, pctx->pck_head->jsobj);
+			//might be set to NULL while freeing above obj
+			if (pctx->pck_head) {
+				pctx->pck_head->jsobj = JS_UNDEFINED;
+				pctx->pck_head->jspid = NULL;
+			}
+		}
 		JS_FreeValue(jsf->ctx, ret);
+		//force cleanup of all refs
+		gf_js_call_gc(jsf->ctx);
+
 		JS_FreeValue(jsf->ctx, pctx->jsobj);
 		gf_list_del_item(jsf->pids, pctx);
 		gf_filter_pid_set_udta(pid, NULL);
 		gf_free(pctx);
 		gf_js_lock(jsf->ctx, GF_FALSE);
-		js_do_loop(jsf->ctx);
+		js_std_loop(jsf->ctx);
 		return e;
 	}
 
@@ -3846,7 +4203,7 @@
 	JS_FreeValue(jsf->ctx, ret);
 
 	gf_js_lock(jsf->ctx, GF_FALSE);
-	js_do_loop(jsf->ctx);
+	js_std_loop(jsf->ctx);
 	return e;
 }
 
@@ -3878,11 +4235,7 @@
 	DEF_CONST(GF_PROP_VEC2I)
 	DEF_CONST(GF_PROP_VEC2)
 	DEF_CONST(GF_PROP_VEC3I)
-	DEF_CONST(GF_PROP_VEC3)
 	DEF_CONST(GF_PROP_VEC4I)
-	DEF_CONST(GF_PROP_VEC4)
-	DEF_CONST(GF_PROP_PCMFMT)
-	DEF_CONST(GF_PROP_PIXFMT)
 	DEF_CONST(GF_PROP_STRING)
 	DEF_CONST(GF_PROP_STRING)
 	DEF_CONST(GF_PROP_STRING_NO_COPY)
@@ -3893,6 +4246,16 @@
 	DEF_CONST(GF_PROP_POINTER)
 	DEF_CONST(GF_PROP_STRING_LIST)
 	DEF_CONST(GF_PROP_UINT_LIST)
+	DEF_CONST(GF_PROP_SINT_LIST)
+	DEF_CONST(GF_PROP_VEC2I_LIST)
+	DEF_CONST(GF_PROP_4CC)
+	DEF_CONST(GF_PROP_4CC_LIST)
+
+	DEF_CONST(GF_PROP_PIXFMT)
+	DEF_CONST(GF_PROP_PCMFMT)
+	DEF_CONST(GF_PROP_CICP_COL_PRIM)
+	DEF_CONST(GF_PROP_CICP_COL_TFC)
+	DEF_CONST(GF_PROP_CICP_COL_MX)
 
 
 	DEF_CONST(GF_FEVT_PLAY)
@@ -4001,6 +4364,222 @@
 	DEF_CONST(GF_EVENT_REFRESH)
 	DEF_CONST(GF_EVENT_QUIT)
 
+	DEF_CONST(GF_KEY_UNIDENTIFIED)
+	DEF_CONST(GF_KEY_ACCEPT)
+	DEF_CONST(GF_KEY_AGAIN)
+	DEF_CONST(GF_KEY_ALLCANDIDATES)
+	DEF_CONST(GF_KEY_ALPHANUM)
+	DEF_CONST(GF_KEY_ALT)
+	DEF_CONST(GF_KEY_ALTGRAPH)
+	DEF_CONST(GF_KEY_APPS)
+	DEF_CONST(GF_KEY_ATTN)
+	DEF_CONST(GF_KEY_BROWSERBACK)
+	DEF_CONST(GF_KEY_BROWSERFAVORITES)
+	DEF_CONST(GF_KEY_BROWSERFORWARD)
+	DEF_CONST(GF_KEY_BROWSERHOME)
+	DEF_CONST(GF_KEY_BROWSERREFRESH)
+	DEF_CONST(GF_KEY_BROWSERSEARCH)
+	DEF_CONST(GF_KEY_BROWSERSTOP)
+	DEF_CONST(GF_KEY_CAPSLOCK)
+	DEF_CONST(GF_KEY_CLEAR)
+	DEF_CONST(GF_KEY_CODEINPUT)
+	DEF_CONST(GF_KEY_COMPOSE)
+	DEF_CONST(GF_KEY_CONTROL)
+	DEF_CONST(GF_KEY_CRSEL)
+	DEF_CONST(GF_KEY_CONVERT)
+	DEF_CONST(GF_KEY_COPY)
+	DEF_CONST(GF_KEY_CUT)
+	DEF_CONST(GF_KEY_DOWN)
+	DEF_CONST(GF_KEY_END)
+	DEF_CONST(GF_KEY_ENTER)
+	DEF_CONST(GF_KEY_ERASEEOF)
+	DEF_CONST(GF_KEY_EXECUTE)
+	DEF_CONST(GF_KEY_EXSEL)
+	DEF_CONST(GF_KEY_F1)
+	DEF_CONST(GF_KEY_F2)
+	DEF_CONST(GF_KEY_F3)
+	DEF_CONST(GF_KEY_F4)
+	DEF_CONST(GF_KEY_F5)
+	DEF_CONST(GF_KEY_F6)
+	DEF_CONST(GF_KEY_F7)
+	DEF_CONST(GF_KEY_F8)
+	DEF_CONST(GF_KEY_F9)
+	DEF_CONST(GF_KEY_F10)
+	DEF_CONST(GF_KEY_F11)
+	DEF_CONST(GF_KEY_F12)
+	DEF_CONST(GF_KEY_F13)
+	DEF_CONST(GF_KEY_F14)
+	DEF_CONST(GF_KEY_F15)
+	DEF_CONST(GF_KEY_F16)
+	DEF_CONST(GF_KEY_F17)
+	DEF_CONST(GF_KEY_F18)
+	DEF_CONST(GF_KEY_F19)
+	DEF_CONST(GF_KEY_F20)
+	DEF_CONST(GF_KEY_F21)
+	DEF_CONST(GF_KEY_F22)
+	DEF_CONST(GF_KEY_F23)
+	DEF_CONST(GF_KEY_F24)
+	DEF_CONST(GF_KEY_FINALMODE)
+	DEF_CONST(GF_KEY_FIND)
+	DEF_CONST(GF_KEY_FULLWIDTH)
+	DEF_CONST(GF_KEY_HALFWIDTH)
+	DEF_CONST(GF_KEY_HANGULMODE)
+	DEF_CONST(GF_KEY_HANJAMODE)
+	DEF_CONST(GF_KEY_HELP)
+	DEF_CONST(GF_KEY_HIRAGANA)
+	DEF_CONST(GF_KEY_HOME)
+	DEF_CONST(GF_KEY_INSERT)
+	DEF_CONST(GF_KEY_JAPANESEHIRAGANA)
+	DEF_CONST(GF_KEY_JAPANESEKATAKANA)
+	DEF_CONST(GF_KEY_JAPANESEROMAJI)
+	DEF_CONST(GF_KEY_JUNJAMODE)
+	DEF_CONST(GF_KEY_KANAMODE)
+	DEF_CONST(GF_KEY_KANJIMODE)
+	DEF_CONST(GF_KEY_KATAKANA)
+	DEF_CONST(GF_KEY_LAUNCHAPPLICATION1)
+	DEF_CONST(GF_KEY_LAUNCHAPPLICATION2)
+	DEF_CONST(GF_KEY_LAUNCHMAIL)
+	DEF_CONST(GF_KEY_LEFT)
+	DEF_CONST(GF_KEY_META)
+	DEF_CONST(GF_KEY_MEDIANEXTTRACK)
+	DEF_CONST(GF_KEY_MEDIAPLAYPAUSE)
+	DEF_CONST(GF_KEY_MEDIAPREVIOUSTRACK)
+	DEF_CONST(GF_KEY_MEDIASTOP)
+	DEF_CONST(GF_KEY_MODECHANGE)
+	DEF_CONST(GF_KEY_NONCONVERT)
+	DEF_CONST(GF_KEY_NUMLOCK)
+	DEF_CONST(GF_KEY_PAGEDOWN)
+	DEF_CONST(GF_KEY_PAGEUP)
+	DEF_CONST(GF_KEY_PASTE)
+	DEF_CONST(GF_KEY_PAUSE)
+	DEF_CONST(GF_KEY_PLAY)
+	DEF_CONST(GF_KEY_PREVIOUSCANDIDATE)
+	DEF_CONST(GF_KEY_PRINTSCREEN)
+	DEF_CONST(GF_KEY_PROCESS)
+	DEF_CONST(GF_KEY_PROPS)
+	DEF_CONST(GF_KEY_RIGHT)
+	DEF_CONST(GF_KEY_ROMANCHARACTERS)
+	DEF_CONST(GF_KEY_SCROLL)
+	DEF_CONST(GF_KEY_SELECT)
+	DEF_CONST(GF_KEY_SELECTMEDIA)
+	DEF_CONST(GF_KEY_SHIFT)
+	DEF_CONST(GF_KEY_STOP)
+	DEF_CONST(GF_KEY_UP)
+	DEF_CONST(GF_KEY_UNDO)
+	DEF_CONST(GF_KEY_VOLUMEDOWN)
+	DEF_CONST(GF_KEY_VOLUMEMUTE)
+	DEF_CONST(GF_KEY_VOLUMEUP)
+	DEF_CONST(GF_KEY_WIN)
+	DEF_CONST(GF_KEY_ZOOM)
+	DEF_CONST(GF_KEY_BACKSPACE)
+	DEF_CONST(GF_KEY_TAB)
+	DEF_CONST(GF_KEY_CANCEL)
+	DEF_CONST(GF_KEY_ESCAPE)
+	DEF_CONST(GF_KEY_SPACE)
+	DEF_CONST(GF_KEY_EXCLAMATION)
+	DEF_CONST(GF_KEY_QUOTATION)
+	DEF_CONST(GF_KEY_NUMBER)
+	DEF_CONST(GF_KEY_DOLLAR)
+	DEF_CONST(GF_KEY_AMPERSAND)
+	DEF_CONST(GF_KEY_APOSTROPHE)
+	DEF_CONST(GF_KEY_LEFTPARENTHESIS)
+	DEF_CONST(GF_KEY_RIGHTPARENTHESIS)
+	DEF_CONST(GF_KEY_STAR)
+	DEF_CONST(GF_KEY_PLUS)
+	DEF_CONST(GF_KEY_COMMA)
+	DEF_CONST(GF_KEY_HYPHEN)
+	DEF_CONST(GF_KEY_FULLSTOP)
+	DEF_CONST(GF_KEY_SLASH)
+	DEF_CONST(GF_KEY_0)
+	DEF_CONST(GF_KEY_1)
+	DEF_CONST(GF_KEY_2)
+	DEF_CONST(GF_KEY_3)
+	DEF_CONST(GF_KEY_4)
+	DEF_CONST(GF_KEY_5)
+	DEF_CONST(GF_KEY_6)
+	DEF_CONST(GF_KEY_7)
+	DEF_CONST(GF_KEY_8)
+	DEF_CONST(GF_KEY_9)
+	DEF_CONST(GF_KEY_COLON)
+	DEF_CONST(GF_KEY_SEMICOLON)
+	DEF_CONST(GF_KEY_LESSTHAN)
+	DEF_CONST(GF_KEY_EQUALS)
+	DEF_CONST(GF_KEY_GREATERTHAN)
+	DEF_CONST(GF_KEY_QUESTION)
+	DEF_CONST(GF_KEY_AT)
+	DEF_CONST(GF_KEY_A)
+	DEF_CONST(GF_KEY_B)
+	DEF_CONST(GF_KEY_C)
+	DEF_CONST(GF_KEY_D)
+	DEF_CONST(GF_KEY_E)
+	DEF_CONST(GF_KEY_F)
+	DEF_CONST(GF_KEY_G)
+	DEF_CONST(GF_KEY_H)
+	DEF_CONST(GF_KEY_I)
+	DEF_CONST(GF_KEY_J)
+	DEF_CONST(GF_KEY_K)
+	DEF_CONST(GF_KEY_L)
+	DEF_CONST(GF_KEY_M)
+	DEF_CONST(GF_KEY_N)
+	DEF_CONST(GF_KEY_O)
+	DEF_CONST(GF_KEY_P)
+	DEF_CONST(GF_KEY_Q)
+	DEF_CONST(GF_KEY_R)
+	DEF_CONST(GF_KEY_S)
+	DEF_CONST(GF_KEY_T)
+	DEF_CONST(GF_KEY_U)
+	DEF_CONST(GF_KEY_V)
+	DEF_CONST(GF_KEY_W)
+	DEF_CONST(GF_KEY_X)
+	DEF_CONST(GF_KEY_Y)
+	DEF_CONST(GF_KEY_Z)
+	DEF_CONST(GF_KEY_LEFTSQUAREBRACKET)
+	DEF_CONST(GF_KEY_BACKSLASH)
+	DEF_CONST(GF_KEY_RIGHTSQUAREBRACKET)
+	DEF_CONST(GF_KEY_CIRCUM)
+	DEF_CONST(GF_KEY_UNDERSCORE)
+	DEF_CONST(GF_KEY_GRAVEACCENT)
+	DEF_CONST(GF_KEY_LEFTCURLYBRACKET)
+	DEF_CONST(GF_KEY_PIPE)
+	DEF_CONST(GF_KEY_RIGHTCURLYBRACKET)
+	DEF_CONST(GF_KEY_DEL)
+	DEF_CONST(GF_KEY_INVERTEXCLAMATION)
+	DEF_CONST(GF_KEY_DEADGRAVE)
+	DEF_CONST(GF_KEY_DEADEACUTE)
+	DEF_CONST(GF_KEY_DEADCIRCUM)
+	DEF_CONST(GF_KEY_DEADTILDE)
+	DEF_CONST(GF_KEY_DEADMACRON)
+	DEF_CONST(GF_KEY_DEADBREVE)
+	DEF_CONST(GF_KEY_DEADABOVEDOT)
+	DEF_CONST(GF_KEY_DEADDIARESIS)
+	DEF_CONST(GF_KEY_DEADRINGABOVE)
+	DEF_CONST(GF_KEY_DEADDOUBLEACUTE)
+	DEF_CONST(GF_KEY_DEADCARON)
+	DEF_CONST(GF_KEY_DEADCEDILLA)
+	DEF_CONST(GF_KEY_DEADOGONEK)
+	DEF_CONST(GF_KEY_DEADIOTA)
+	DEF_CONST(GF_KEY_EURO)
+	DEF_CONST(GF_KEY_DEADVOICESOUND)
+	DEF_CONST(GF_KEY_DEADSEMIVOICESOUND)
+	DEF_CONST(GF_KEY_CHANNELUP)
+	DEF_CONST(GF_KEY_CHANNELDOWN)
+	DEF_CONST(GF_KEY_TEXT)
+	DEF_CONST(GF_KEY_INFO)
+	DEF_CONST(GF_KEY_EPG)
+	DEF_CONST(GF_KEY_RECORD)
+	DEF_CONST(GF_KEY_BEGINPAGE)
+	DEF_CONST(GF_KEY_CELL_SOFT1)
+	DEF_CONST(GF_KEY_CELL_SOFT2)
+	DEF_CONST(GF_KEY_JOYSTICK)
+
+	DEF_CONST(GF_KEY_MOD_SHIFT)
+	DEF_CONST(GF_KEY_MOD_CTRL)
+	DEF_CONST(GF_KEY_MOD_ALT)
+	DEF_CONST(GF_KEY_EXT_NUMPAD)
+	DEF_CONST(GF_KEY_EXT_LEFT)
+	DEF_CONST(GF_KEY_EXT_RIGHT)
+
+
 JS_SetPropertyStr(ctx, global_obj, "print", JS_NewCFunction(ctx, js_print, "print", 1));
 JS_SetPropertyStr(ctx, global_obj, "alert", JS_NewCFunction(ctx, js_print, "alert", 1));
 
@@ -4014,10 +4593,9 @@
 
 	JSValue evt_ctor = JS_NewCFunction2(ctx, jsf_event_constructor, "FilterEvent", 1, JS_CFUNC_constructor, 0);
 JS_SetPropertyStr(ctx, global_obj, "FilterEvent", evt_ctor);
-
 }
 
-static GF_Err jsfilter_initialize(GF_Filter *filter)
+static GF_Err jsfilter_initialize_ex(GF_Filter *filter, JSContext *custom_ctx)
 {
 	u8 *buf;
 	u32 buf_len;
@@ -4028,32 +4606,42 @@
 JSRuntime *rt;
 	GF_JSFilterCtx *jsf = gf_filter_get_udta(filter);
 
+	if (custom_ctx) {
+		GF_SAFEALLOC(jsf, GF_JSFilterCtx);
+		filter->filter_udta = jsf;
+	}
+
 	jsf->filter = filter;
 	jsf->pids = gf_list_new();
 	jsf->pck_res = gf_list_new();
-	jsf->log_name = gf_strdup("JSF");
+	jsf->log_name = gf_strdup(custom_ctx ? filter->name : "JSF");
 
-	if (!jsf->js) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Missing script file\n"));
-		return GF_BAD_PARAM;
-	}
-	if (!gf_file_exists(jsf->js)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Script file %s does not exist\n", jsf->js));
-		return GF_BAD_PARAM;
-	}
-	jsf->filter_obj = JS_UNDEFINED;
+	if (custom_ctx) {
+		jsf->ctx = custom_ctx;
+		jsf->is_custom = GF_TRUE;
+		global_obj = JS_GetGlobalObject(jsf->ctx);
+	} else {
+		if (!jsf->js) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Missing script file\n"));
+			return GF_BAD_PARAM;
+		}
+		if (!gf_file_exists(jsf->js)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Script file %s does not exist\n", jsf->js));
+			return GF_BAD_PARAM;
+		}
+		jsf->filter_obj = JS_UNDEFINED;
 
-	jsf->ctx = gf_js_create_context();
-	if (!jsf->ctx) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Failed to load QuickJS context\n"));
-		return GF_IO_ERR;
+		jsf->ctx = gf_js_create_context();
+		if (!jsf->ctx) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Failed to load QuickJS context\n"));
+			return GF_IO_ERR;
+		}
+		JS_SetContextOpaque(jsf->ctx, jsf);
+		global_obj = JS_GetGlobalObject(jsf->ctx);
+		js_load_constants(jsf->ctx, global_obj);
 	}
-	JS_SetContextOpaque(jsf->ctx, jsf);
 	rt = JS_GetRuntime(jsf->ctx);
 
- global_obj = JS_GetGlobalObject(jsf->ctx);
-
-	js_load_constants(jsf->ctx, global_obj);
 
 
 	//initialize filter class and create a single filter object in global scope
@@ -4063,7 +4651,8 @@
 	jsf->filter_obj = JS_NewObjectClass(jsf->ctx, jsf_filter_class_id);
 JS_SetPropertyFunctionList(jsf->ctx, jsf->filter_obj, jsf_filter_funcs, countof(jsf_filter_funcs));
 JS_SetOpaque(jsf->filter_obj, jsf);
- JS_SetPropertyStr(jsf->ctx, global_obj, "filter", jsf->filter_obj);
+ if (!custom_ctx)
+		JS_SetPropertyStr(jsf->ctx, global_obj, "filter", jsf->filter_obj);
 
 	//initialize filter instance class
 	JS_NewClassID(&jsf_filter_inst_class_id);
@@ -4080,16 +4669,20 @@
 JS_SetClassProto(jsf->ctx, jsf_pid_class_id, pid_proto);
 
 
-	//initialize filter event class
+	//initialize filter packet class
 	JS_NewClassID(&jsf_pck_class_id);
 	JS_NewClass(rt, jsf_pck_class_id, &jsf_pck_class);
 	JSValue pck_proto = JS_NewObjectClass(jsf->ctx, jsf_pck_class_id);
 JS_SetPropertyFunctionList(jsf->ctx, pck_proto, jsf_pck_funcs, countof(jsf_pck_funcs));
 JS_SetClassProto(jsf->ctx, jsf_pck_class_id, pck_proto);
 
-	JS_SetPropertyStr(jsf->ctx, global_obj, "_gpac_log_name", JS_NewString(jsf->ctx, gf_file_basename(jsf->js) ) );
+ if (!custom_ctx)
+		JS_SetPropertyStr(jsf->ctx, global_obj, "_gpac_log_name", JS_NewString(jsf->ctx, gf_file_basename(jsf->js) ) );
+
 JS_FreeValue(jsf->ctx, global_obj);
 
+ if (custom_ctx) return GF_OK;
+
 
 	//load script
 	GF_Err e = gf_file_load_data(jsf->js, &buf, &buf_len);
@@ -4097,6 +4690,10 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Error loading script file %s: %s\n", jsf->js, gf_error_to_string(e) ));
 		return e;
 	}
+	if (!strstr(buf, "session.") && !strstr(buf, "filter.") ) {
+		gf_free(buf);
+		return GF_FILTER_NOT_FOUND;
+	}
 
 	if (strstr(buf, "session.")) {
 		GF_Err gf_fs_load_js_api(JSContext *c, GF_FilterSession *fs);
@@ -4105,6 +4702,7 @@
 		e = gf_fs_load_js_api(jsf->ctx, filter->session);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Error loading session API: %s\n", gf_error_to_string(e) ));
+			gf_free(buf);
 			return e;
 		}
 		jsf->unload_session_api = GF_TRUE;
@@ -4116,12 +4714,7 @@
 
 
 	if (!gf_opts_get_bool("core", "no-js-mods") && JS_DetectModule((char *)buf, buf_len)) {
- 		//init modules
-		qjs_module_init_gpaccore(jsf->ctx);
-		qjs_module_init_xhr(jsf->ctx);
-		qjs_module_init_evg(jsf->ctx);
-		qjs_module_init_storage(jsf->ctx);
-		qjs_module_init_webgl(jsf->ctx);
+		qjs_init_all_modules(jsf->ctx, GF_FALSE, GF_FALSE);
 		flags = JS_EVAL_TYPE_MODULE;
 	}
 	jsf->disable_filter = GF_TRUE;
@@ -4135,15 +4728,24 @@
 		return GF_BAD_PARAM;
 	}
 	JS_FreeValue(jsf->ctx, ret);
+	js_std_loop(jsf->ctx);
 	return GF_OK;
 }
 
+
+static GF_Err jsfilter_initialize(GF_Filter *filter)
+{
+	return jsfilter_initialize_ex(filter, NULL);
+}
+
 static void jsfilter_finalize(GF_Filter *filter)
 {
 	u32 i, count;
 	GF_JSFilterCtx *jsf = gf_filter_get_udta(filter);
 	if (!jsf->ctx) return;
 
+	gf_js_lock(jsf->ctx, GF_TRUE);
+
 	//reset references but do not destroy PIDs yet
 	count = gf_list_count(jsf->pids);
 	for (i=0; i<count; i++) {
@@ -4167,10 +4769,29 @@
 
 	JS_SetOpaque(jsf->filter_obj, NULL);
 
+	if (jsf->is_custom)
+		JS_FreeValue(jsf->ctx, jsf->filter_obj);
+
+	gf_js_lock(jsf->ctx, GF_FALSE);
+
 	if (jsf->unload_session_api)
 		gf_fs_unload_script(filter->session, jsf->ctx);
 
-	gf_js_delete_context(jsf->ctx);
+	if (!jsf->is_custom) {
+		u32 i, count;
+		//we created the context, detach all other filters jsvals
+		gf_mx_p(jsf->filter->session->filters_mx);
+		count = gf_list_count(jsf->filter->session->filters);
+		for (i=0; i<count; i++) {
+			GF_Filter *a_f = gf_list_get(jsf->filter->session->filters, i);
+			if (a_f == jsf->filter) continue;;
+			jsfs_on_filter_destroyed(a_f);
+		}
+		gf_mx_v(jsf->filter->session->filters_mx);
+		gf_js_delete_context(jsf->ctx);
+	} else {
+		gf_js_call_gc(jsf->ctx);
+	}
 
 	while (gf_list_count(jsf->pids)) {
 		GF_JSPidCtx *pctx = gf_list_pop_back(jsf->pids);
@@ -4205,6 +4826,8 @@
 	if (jsf->caps) gf_free(jsf->caps);
 }
 
+
+
 static GF_Err jsfilter_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val)
 {
 	GF_JSFilterCtx *jsf = gf_filter_get_udta(filter);
@@ -4232,6 +4855,14 @@
 			JS_FreeValue(jsf->ctx, ret);
 		}
 		jsf->initialized = GF_TRUE;
+		//we still call initialize even in help-only mode to properly print links and cap bundles
+		if (gf_opts_get_bool("temp", "helponly"))
+			jsf->disable_filter = GF_TRUE;
+
+		if (gf_opts_get_key("temp", "gpac-help") || gf_opts_get_bool("temp", "gendoc")) {
+			js_std_loop(jsf->ctx);
+			jsf->disable_filter = GF_FALSE;
+		}
 		//filter object not used (no new_pid, post_task or set_cap), disable it
 		if (jsf->disable_filter) {
 			JSAtom prop;
@@ -4325,7 +4956,7 @@
 	JS_FreeValue(jsf->ctx, argv[1]);
 	gf_js_lock(jsf->ctx, GF_FALSE);
 
-	js_do_loop(jsf->ctx);
+	js_std_loop(jsf->ctx);
 	return canceled;
 }
 
@@ -4349,14 +4980,14 @@
 static GF_FilterArgs JSFilterArgs[] =
 {
 	{ OFFS(js), "location of script source", GF_PROP_NAME, NULL, NULL, 0},
-	{ "*", -1, "any possible options defined for the script. See `gpac -hx jsf:js=$YOURSCRIPT`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
+	{ "*", -1, "any possible options defined for the script (see `gpac -hx jsf:js=$YOURSCRIPT` or `gpac -hx $YOURSCRIPT`)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{0}
 };
 
 static const GF_FilterCapability JSFilterCaps[] =
 {
-	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_UNKNOWN),
-	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_UNKNOWN),
+ CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_UNKNOWN),
+ CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_UNKNOWN),
 };
 
 GF_FilterRegister JSFilterRegister = {
@@ -4386,6 +5017,24 @@
 	return &JSFilterRegister;
 }
 
+
+JSValue jsfilter_initialize_custom(GF_Filter *filter, JSContext *ctx)
+{
+	GF_JSFilterCtx *jsf;
+	GF_Err e = jsfilter_initialize_ex(filter, ctx);
+	if (e) return js_throw_err(ctx, e);
+	jsf = gf_filter_get_udta(filter);
+	((GF_FilterRegister *) filter->freg)->finalize = jsfilter_finalize;
+	((GF_FilterRegister *) filter->freg)->process = jsfilter_process;
+	((GF_FilterRegister *) filter->freg)->configure_pid = jsfilter_configure_pid;
+	((GF_FilterRegister *) filter->freg)->process_event = jsfilter_process_event;
+//	((GF_FilterRegister *) filter->freg)->reconfigure_output = jsfilter_reconfigure_output;
+//	((GF_FilterRegister *) filter->freg)->probe_data = jsfilter_probe_data;
+	//signal reg is script, so we don't free the filter reg caps as with custom filters
+	((GF_FilterRegister *) filter->freg)->flags |= GF_FS_REG_SCRIPT;
+	return JS_DupValue(ctx, jsf->filter_obj);
+}
+
 #else
 
 const GF_FilterRegister *jsfilter_register(GF_FilterSession *session)

gpac-1.0.1.tar.gz/src/filters/load_bt_xmt.c -> gpac-2.0.0.tar.gz/src/filters/load_bt_xmt.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Context loader filter
@@ -34,7 +34,6 @@
 typedef struct
 {
 	//opts
-	Bool progressive;
 	u32 sax_dur;
 
 	//internal
@@ -157,8 +156,10 @@
 
 	if (is_remove) {
 		priv->in_pid = NULL;
-		gf_filter_pid_remove(priv->out_pid);
-		priv->out_pid = NULL;
+		if (priv->out_pid) {
+			gf_filter_pid_remove(priv->out_pid);
+			priv->out_pid = NULL;
+		}
 		return GF_OK;
 	}
 
@@ -192,21 +193,6 @@
 		return GF_OK;
 	}
 
-#ifdef FILTER_FIXME
-	/*animation stream like*/
-	if (priv->ctx) {
-		GF_StreamContext *sc;
-		u32 i = 0;
-		while ((sc = (GF_StreamContext *)gf_list_enum(priv->ctx->streams, &i))) {
-			if (esd->ESID == sc->ESID) {
-				priv->nb_streams++;
-				return GF_OK;
-			}
-		}
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-#endif
-
 	priv->file_name = prop->value.string;
 	priv->nb_streams = 1;
 
@@ -428,12 +414,6 @@
 		}
 		i=0;
 		while ((sc = (GF_StreamContext *)gf_list_enum(priv->ctx->streams, &i))) {
-#ifdef FILTER_FIXME
-			/*not our stream*/
-			if (!sc->in_root_od && (sc->ESID != ES_ID)) continue;
-			/*not the base stream*/
-			if (sc->in_root_od && (priv->base_stream_id != ES_ID)) continue;
-#endif
 			/*handle SWF media extraction*/
 			if ((sc->streamType == GF_STREAM_OD) && (priv->load_flags==1)) continue;
 			sc->last_au_time = 0;
@@ -443,7 +423,7 @@
 
 	if (priv->load_flags != 2) {
 
-		if (priv->progressive) {
+		if (priv->sax_dur) {
 			u32 entry_time;
 			char file_buf[4096+1];
 			if (!priv->src) {
@@ -517,7 +497,7 @@
 			gf_sm_del(priv->ctx);
 			priv->ctx = NULL;
 			priv->load_flags = 3;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[CtxLoad] Failed to load context for file %s: %s\n", priv->file_name, gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CtxLoad] Failed to load context for file %s: %s\n", priv->file_name, gf_error_to_string(e) ));
 			if (priv->out_pid)
 				gf_filter_pid_set_eos(priv->out_pid);
 			return e;
@@ -542,12 +522,6 @@
 		if (priv->scene->compositor->check_eos_state==2)
 			stream_time=0xFFFFFFFF;
 
-#ifdef FILTER_FIXME
-		/*not our stream*/
-		if (!sc->in_root_od && (sc->ESID != ES_ID)) continue;
-		/*not the base stream*/
-		if (sc->in_root_od && (priv->base_stream_id != ES_ID)) continue;
-#endif
 		/*handle SWF media extraction*/
 		if ((sc->streamType == GF_STREAM_OD) && (priv->load_flags==1)) continue;
 
@@ -565,7 +539,7 @@
 		/*seek*/
 		if (!sc->last_au_time) {
 			while ((au = (GF_AUContext *)gf_list_enum(sc->AUs, &j))) {
-				u32 au_time = (u32) (au->timing*1000/sc->timeScale);
+				u32 au_time = (u32) gf_timestamp_rescale(au->timing, sc->timeScale, 1000);
 
 				if (au_time > stream_time)
 					break;
@@ -575,7 +549,7 @@
 		}
 
 		while ((au = (GF_AUContext *)gf_list_enum(sc->AUs, &j))) {
-			u32 au_time = (u32) (au->timing*1000/sc->timeScale);
+			u32 au_time = (u32) gf_timestamp_rescale(au->timing, sc->timeScale, 1000);
 
 			if (au_time + 1 <= sc->last_au_time) {
 				/*remove first replace command*/
@@ -606,7 +580,7 @@
 				gf_sc_sys_frame_pending(priv->scene->compositor, ts_offset, stream_time, filter);
 				break;
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[CtxLoad] %s applying AU time %d\n", priv->file_name, au_time ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[CtxLoad] %s applying AU time %d\n", priv->file_name, au_time ));
 
 			if (sc->streamType == GF_STREAM_SCENE) {
 				GF_Command *com;
@@ -731,8 +705,12 @@
 							/*if files were created we'll have to clean up (swf import)*/
 							if (mux->delete_file) gf_list_add(priv->files_to_delete, gf_strdup(remote));
 
+							GF_List *oci_descr = od->OCIDescriptors;
+							od->OCIDescriptors = NULL;
 							gf_odf_desc_del((GF_Descriptor *) od);
 							od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+							gf_list_del(od->OCIDescriptors);
+							od->OCIDescriptors = oci_descr;
 							od->URLString = remote;
 							od->fake_remote = GF_TRUE;
 							od->objectDescriptorID = k;
@@ -808,7 +786,8 @@
 {
 	const char *mime_type = NULL;
 	char *dst = NULL;
-	u8 *res;
+	GF_Err e;
+	char *res=NULL;
 
 	/* check gzip magic header */
 	if ((size>2) && (probe_data[0] == 0x1f) && (probe_data[1] == 0x8b)) {
@@ -816,42 +795,121 @@
 		return "btz|bt.gz|xmt.gz|xmtz|wrl.gz|x3dv.gz|x3dvz|x3d.gz|x3dz";
 	}
 
-	res = gf_utf_get_utf8_string_from_bom((char *)probe_data, size, &dst);
-	if (res) probe_data = res;
+	e = gf_utf_get_utf8_string_from_bom(probe_data, size, &dst, &res);
+	if (e) return NULL;
+
+	//strip all spaces and \r\n
+	while (probe_data[0] && strchr("\n\r\t ", (char) probe_data[0]))
+		probe_data ++;
+
+	//for XML, strip doctype, <?xml and comments
+	while (1) {
+		if (!strncmp(probe_data, "<!DOCTYPE", 9)) {
+			probe_data = strchr(probe_data, '>');
+			if (!probe_data) goto exit;
+			probe_data++;
+			while (probe_data[0] && strchr("\n\r\t ", (char) probe_data[0]))
+				probe_data ++;
+		}
+		//for XML, strip xml header
+		else if (!strncmp(probe_data, "<?xml", 5)) {
+			probe_data = strstr(probe_data, "?>");
+			if (!probe_data) goto exit;
+
+			probe_data += 2;
+			while (probe_data[0] && strchr("\n\r\t ", (char) probe_data[0]))
+				probe_data ++;
+		}
+		else if (!strncmp(probe_data, "");
+			if (!probe_data) goto exit;
+			probe_data += 3;
+			while (probe_data[0] && strchr("\n\r\t ", (char) probe_data[0]))
+				probe_data ++;
+		} else {
+			break;
+		}
+	}
+	//probe_data is now the first element of the document, if XML
+	//we should refine by getting the xmlns attribute value rather than searching for its value...
 
-	if (strstr(probe_data, "<XMT-A") || strstr(probe_data, ":mpeg4:xmta:")) {
-		mime_type = "application/x-xmt";
-	} else if (strstr(probe_data, "InitialObjectDescriptor")
-		|| (strstr(probe_data, "EXTERNPROTO") && strstr(probe_data, "gpac:"))
+	if (strstr(probe_data, "http://www.w3.org/1999/XSL/Transform")
 	) {
-		mime_type = "application/x-bt";
-	} else if ( strstr(probe_data, "children") &&
-				(strstr(probe_data, "Group") || strstr(probe_data, "OrderedGroup") || strstr(probe_data, "Layer2D") || strstr(probe_data, "Layer3D"))
+	} else if (!strncmp(probe_data, "<XMT-A", strlen("<XMT-A"))
+		|| strstr(probe_data, "urn:mpeg:mpeg4:xmta:schema:2002")
+	) {
+		mime_type = "application/x-xmt";
+	} else if (strstr(probe_data, "<X3D")
+		|| strstr(probe_data, "http://www.web3d.org/specifications/x3d-3.0.xsd")
 	) {
-		mime_type = "application/x-bt";
-	} else if (strstr(probe_data, "#VRML V2.0 utf8")) {
-		mime_type = "model/vrml";
-	} else if ( strstr(probe_data, "#X3D V3.0")) {
-		mime_type = "model/x3d+vrml";
-	} else if (strstr(probe_data, "<X3D") || strstr(probe_data, "/x3d-3.0.dtd")) {
 		mime_type = "model/x3d+xml";
-	} else if (strstr(probe_data, "<saf") || strstr(probe_data, "mpeg4:SAF:2005")
-		|| strstr(probe_data, "mpeg4:LASeR:2005")
+	} else if (strstr(probe_data, "<saf")
+		|| strstr(probe_data, "urn:mpeg:mpeg4:SAF:2005")
+		|| strstr(probe_data, "urn:mpeg:mpeg4:LASeR:2005")
 	) {
 		mime_type = "application/x-LASeR+xml";
-	} else if (strstr(probe_data, "DIMSStream") ) {
+	} else if (!strncmp(probe_data, "<DIMSStream", strlen("<DIMSStream") ) ) {
 		mime_type = "application/dims";
-	} else if (strstr(probe_data, "<svg") || strstr(probe_data, "w3.org/2000/svg") ) {
+	} else if (!strncmp(probe_data, "<svg", 4) || strstr(probe_data, "http://www.w3.org/2000/svg") ) {
 		mime_type = "image/svg+xml";
-	} else if (strstr(probe_data, "<widget") ) {
+	} else if (!strncmp(probe_data, "<widget", strlen("<widget") ) ) {
 		mime_type = "application/widget";
-	} else if (strstr(probe_data, "<NHNTStream")) {
+	} else if (!strncmp(probe_data, "<NHNTStream", strlen("<NHNTStream") ) ) {
 		mime_type = "application/x-nhml";
-	} else if (strstr(probe_data, "TextStream") ) {
+	} else if (!strncmp(probe_data, "<TextStream", strlen("<TextStream") ) ) {
 		mime_type = "text/ttxt";
-	} else if (strstr(probe_data, "text3GTrack") ) {
+	} else if (!strncmp(probe_data, "<text3GTrack", strlen("<text3GTrack") ) ) {
 		mime_type = "quicktime/text";
 	}
+	//BT/VRML with no doc header
+	else {
+		//get first keyword
+		while (1) {
+			//strip all spaces and \r\n
+			while (probe_data[0] && strchr("\n\r\t ", (char) probe_data[0]))
+				probe_data ++;
+
+			//VRML / XRDV files
+			if (!strncmp(probe_data, "#VRML V2.0", strlen("#VRML V2.0"))) {
+				mime_type = "model/vrml";
+				goto exit;
+			}
+			if (!strncmp(probe_data, "#X3D V3.0", strlen("#X3D V3.0"))) {
+				mime_type = "model/x3d+vrml";
+				goto exit;
+			}
+
+			//skip comment lines and some specific X3D keyword (we want to fetch a group
+			if ((probe_data[0] != '#')
+				&& strncmp(probe_data, "PROFILE", strlen("PROFILE"))
+				&& strncmp(probe_data, "COMPONENT", strlen("COMPONENT"))
+				&& strncmp(probe_data, "META", strlen("META"))
+				&& strncmp(probe_data, "IMPORT", strlen("IMPORT"))
+				&& strncmp(probe_data, "EXPORT", strlen("EXPORT"))
+			) {
+				break;
+			}
+			//skip line and go one
+			probe_data = strchr(probe_data, '\n');
+			if (!probe_data) goto exit;
+		}
+		
+		if (!strncmp(probe_data, "InitialObjectDescriptor", strlen("InitialObjectDescriptor"))
+			|| !strncmp(probe_data, "EXTERNPROTO", strlen("EXTERNPROTO"))
+			|| !strncmp(probe_data, "PROTO", strlen("PROTO"))
+			|| !strncmp(probe_data, "Group", strlen("Group"))
+			|| !strncmp(probe_data, "OrderedGroup", strlen("OrderedGroup"))
+			|| !strncmp(probe_data, "Layer2D", strlen("Layer2D"))
+			|| !strncmp(probe_data, "Layer3D", strlen("Layer3D"))
+		) {
+			if (strstr(probe_data, "children"))
+				mime_type = "application/x-bt";
+		}
+	}
+
+
+exit:
+
 	if (dst) gf_free(dst);
 	if (mime_type) {
 		*score = GF_FPROBE_MAYBE_SUPPORTED;
@@ -876,15 +934,16 @@
 
 static const GF_FilterArgs CTXLoadArgs[] =
 {
-	{ OFFS(progressive), "enable progressive loading", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(sax_dur), "loading duration for SAX parsing (XMT), 0 disables SAX parsing", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(sax_dur), "duration for SAX parsing (XMT), 0 disables SAX parsing", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };
 
 GF_FilterRegister CTXLoadRegister = {
 	.name = "btplay",
 	GF_FS_SET_DESCRIPTION("BT/XMT/X3D loader")
-	GF_FS_SET_HELP("This filter parses MPEG-4 BIFS (BT and XMT), VRML97 and X3D (wrl and XML) files directly into the scene graph of the compositor. It cannot be used to dump content.")
+	GF_FS_SET_HELP("This filter parses MPEG-4 BIFS (BT and XMT), VRML97 and X3D (wrl and XML) files directly into the scene graph of the compositor.\n"
+	"\n"
+	"When [-sax_dur=N]() is set, the filter will do a progressive load of the source and cancel current loading when processing time is higher than `N`.\n")
 	.private_size = sizeof(CTXLoadPriv),
 	.flags = GF_FS_REG_MAIN_THREAD,
 	.args = CTXLoadArgs,

gpac-1.0.1.tar.gz/src/filters/load_svg.c -> gpac-2.0.0.tar.gz/src/filters/load_svg.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2017
+ *			Copyright (c) Telecom ParisTech 2005-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG loader filter
@@ -112,18 +112,6 @@
 		return GF_OK;
 	}
 
-#ifdef FILTER_FIXME
-	if (stream_time==(u32)-1) {
-		if (svgin->src) gf_gzclose(svgin->src);
-		svgin->src = NULL;
-		gf_sm_load_done(&svgin->loader);
-		svgin->loader.fileName = NULL;
-		svgin->file_pos = 0;
-		gf_sg_reset(svgin->scene->graph);
-		return GF_OK;
-	}
-#endif
-
 	switch (svgin->codecid) {
 	/*! streaming SVG*/
 	case GF_CODECID_SVG:
@@ -174,9 +162,10 @@
 		}
 		data = gf_filter_pck_get_data(pck, &size);
 
-		buf2 = gf_malloc(size);
+		buf2 = gf_malloc(size+1);
 		bs = gf_bs_new((u8 *)data, size, GF_BITSTREAM_READ);
 		memcpy(buf2, data, size);
+		buf2[size] = 0;
 
 		gf_filter_pid_drop_packet(svgin->in_pid);
 		e = GF_OK;
@@ -458,7 +447,9 @@
 GF_FilterRegister SVGInRegister = {
 	.name = "svgplay",
 	GF_FS_SET_DESCRIPTION("SVG loader")
-	GF_FS_SET_HELP("This filter parses SVG files directly into the scene graph of the compositor. It cannot be used to dump content.")
+	GF_FS_SET_HELP("This filter parses SVG files directly into the scene graph of the compositor.\n"
+	"\n"
+	"When [-sax_dur=N]() is set, the filter will do a progressive load of the source and cancel current loading when processing time is higher than `N`.\n")
 	.private_size = sizeof(SVGIn),
 	.flags = GF_FS_REG_MAIN_THREAD,
 	.args = SVGInArgs,

gpac-1.0.1.tar.gz/src/filters/load_text.c -> gpac-2.0.0.tar.gz/src/filters/load_text.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / text import filter
@@ -39,7 +39,16 @@
 #include <gpac/internal/swf_dev.h>
 #endif
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
+#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_CORE_TOOLS)
+
+#define TTML_NAMESPACE "http://www.w3.org/ns/ttml"
+
+#define CHECK_STR(__str)	\
+	if (!__str) { \
+		e = gf_import_message(import, GF_BAD_PARAM, "Invalid XML formatting (line %d)", parser.line);	\
+		goto exit;	\
+	}
+
 
 typedef struct __txtin_ctx GF_TXTIn;
 
@@ -48,14 +57,15 @@
 	//opts
 	u32 width, height, txtx, txty, fontsize;
 	s32 zorder;
-	const char *fontname, *lang;
-	Bool nodefbox, noflush, webvtt;
+	const char *fontname, *lang, *ttml_zero;
+	Bool nodefbox, noflush, webvtt, ttml_embed;
 	u32 timescale;
 	GF_Fraction fps;
+	s32 ttml_dur;
 
 
 	GF_FilterPid *ipid, *opid;
-	const char *file_name;
+	char *file_name;
 	u32 fmt;
 	u32 playstate;
 	//0: not seeking, 1: seek request pending, 2: seek configured, discarding packets up until start_range
@@ -95,9 +105,13 @@
 	u32 current_tt_interval;
 
 	//TTML state
-	GF_XMLNode *root_working_copy, *div_node, *sample_list_node;
+	GF_XMLNode *root_working_copy, *body_node;
 	GF_DOMParser *parser_working_copy;
 	Bool non_compliant_ttml;
+	u32 tick_rate, ttml_fps_num, ttml_fps_den, ttml_sfps;
+	GF_List *ttml_resources;
+	GF_List *div_nodes_list;
+	Bool has_images;
 
 #ifndef GPAC_DISABLE_SWF_IMPORT
 	//SWF text
@@ -111,7 +125,15 @@
 
 typedef struct
 {
+	u32 size;
+	u8 *data;
+	Bool global;
+} TTMLRes;
+
+typedef struct
+{
 	s64 begin, end;
+	GF_List *resources;
 } TTMLInterval;
 
 
@@ -203,8 +225,8 @@
 	if ((szLine[0]=='{') && strstr(szLine, "}{")) *fmt = GF_TXTIN_MODE_SUB;
 	else if (szLine[0] == '<') {
 		char *ext = gf_file_ext_start(filename);
-		if (!strnicmp(ext, ".ttxt", 5)) *fmt = GF_TXTIN_MODE_TTXT;
-		else if (!strnicmp(ext, ".ttml", 5)) *fmt = GF_TXTIN_MODE_TTML;
+		if (ext && !strnicmp(ext, ".ttxt", 5)) *fmt = GF_TXTIN_MODE_TTXT;
+		else if (ext && !strnicmp(ext, ".ttml", 5)) *fmt = GF_TXTIN_MODE_TTML;
 		ext = strstr(szLine, "?>");
 		if (ext) ext += 2;
 		if (ext && !ext[0]) {
@@ -233,7 +255,7 @@
 {
 	u32 i, j, len;
 	char *sOK;
-	char szLineConv[1024];
+	char szLineConv[2048];
 	unsigned short *sptr;
 
 	memset(szLine, 0, sizeof(char)*lineSize);
@@ -290,10 +312,11 @@
 	}
 
 #ifdef GPAC_BIG_ENDIAN
-	if (unicode_type==3) {
+	if (unicode_type==3)
 #else
-	if (unicode_type==2) {
+	if (unicode_type==2)
 #endif
+	{
 		i=0;
 		while (1) {
 			char c;
@@ -305,7 +328,8 @@
 		}
 	}
 	sptr = (u16 *)szLine;
-	i = (u32) gf_utf8_wcstombs(szLineConv, 1024, (const unsigned short **) &sptr);
+	i = gf_utf8_wcstombs(szLineConv, 2048, (const unsigned short **) &sptr);
+	if (i == GF_UTF8_FAIL) i = 0;
 	szLineConv[i] = 0;
 	strcpy(szLine, szLineConv);
 	/*this is ugly indeed: since input is UTF16-LE, there are many chances the gf_fgets never reads the \0 after a \n*/
@@ -328,6 +352,7 @@
 			tdur.num = frame_count;
 			tdur.den = frame_rate;
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(tdur));
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 		}
 #endif
 		return;
@@ -372,6 +397,7 @@
 		if (dur.num) {
 			dur.den = 1000;
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(dur));
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 		}
 		return;
 	}
@@ -413,46 +439,52 @@
 		if (dur.num) {
 			dur.den = 1000;
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(dur));
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 		}
 		return;
 	}
 
 	if (ctx->fmt == GF_TXTIN_MODE_TTML) {
-		u32 i=0;
-		GF_XMLNode *node, *p_node;
-
-		while ((node = gf_list_enum(ctx->div_node->content, &i))) {
-			GF_XMLAttribute *att;
-			u32 h, m, s, ms, p_idx=0;
-			u64 ts_end=0;
-			h = m = s = ms = 0;
-			while ( (att = (GF_XMLAttribute*)gf_list_enum(node->attributes, &p_idx))) {
-				if (strcmp(att->name, "end")) continue;
+		u32 i=0, k=0;
+		GF_XMLNode *div_node;
 
-				if (sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
-					ts_end = (h*3600 + m*60+s)*1000+ms;
-				} else if (sscanf(att->value, "%u:%u:%u", &h, &m, &s) == 3) {
-					ts_end = (h*3600 + m*60+s)*1000;
-				}
-			}
-			//or under a 
-			p_idx = 0;
-			while ( (p_node = (GF_XMLNode*)gf_list_enum(node->content, &p_idx))) {
-				u32 span_idx = 0;
-				while ( (att = (GF_XMLAttribute*)gf_list_enum(p_node->attributes, &span_idx))) {
+		while ((div_node = gf_list_enum(ctx->div_nodes_list, &k))) {
+			GF_XMLNode *node;
+			while ((node = gf_list_enum(div_node->content, &i))) {
+				GF_XMLNode *p_node;
+				GF_XMLAttribute *att;
+				u32 h, m, s, ms, p_idx=0;
+				u64 ts_end=0;
+				h = m = s = ms = 0;
+				while ( (att = (GF_XMLAttribute*)gf_list_enum(node->attributes, &p_idx))) {
 					if (strcmp(att->name, "end")) continue;
+
 					if (sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 						ts_end = (h*3600 + m*60+s)*1000+ms;
 					} else if (sscanf(att->value, "%u:%u:%u", &h, &m, &s) == 3) {
 						ts_end = (h*3600 + m*60+s)*1000;
 					}
 				}
+				//or under a 
+				p_idx = 0;
+				while ( (p_node = (GF_XMLNode*)gf_list_enum(node->content, &p_idx))) {
+					u32 span_idx = 0;
+					while ( (att = (GF_XMLAttribute*)gf_list_enum(p_node->attributes, &span_idx))) {
+						if (strcmp(att->name, "end")) continue;
+						if (sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+							ts_end = (h*3600 + m*60+s)*1000+ms;
+						} else if (sscanf(att->value, "%u:%u:%u", &h, &m, &s) == 3) {
+							ts_end = (h*3600 + m*60+s)*1000;
+						}
+					}
+				}
+				if (ts_end > (u64) dur.num) dur.num = (s64) ts_end;
 			}
-			if (ts_end > (u64) dur.num) dur.num = (s64) ts_end;
 		}
 		if (dur.num) {
 			dur.den = 1000;
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(dur));
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 		}
 		return;
 	}
@@ -551,13 +583,13 @@
 	size = gf_isom_text_sample_size(txt_samp);
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &pck_data);
+	if (!dst_pck) return;
+
 	gf_bs_reassign_buffer(ctx->bs_w, pck_data, size);
 	gf_isom_text_sample_write_bs(txt_samp, ctx->bs_w);
 
-	ts *= ctx->timescale;
-	ts /= 1000;
-	duration *= ctx->timescale;
-	duration /= 1000;
+	ts = gf_timestamp_rescale(ts, 1000, ctx->timescale);
+	duration = (u32) gf_timestamp_rescale(duration, 1000, ctx->timescale);
 
 	gf_filter_pck_set_sap(dst_pck, is_rap ? GF_FILTER_SAP_1 : GF_FILTER_SAP_NONE);
 	gf_filter_pck_set_cts(dst_pck, ts);
@@ -593,12 +625,19 @@
 	}
 
 	while (1) {
+		Bool is_empty = GF_FALSE;
 		char *sOK = gf_text_get_utf8_line(szLine, 2048, ctx->src, ctx->unicode_type);
 
-		if (sOK) REM_TRAIL_MARKS(szLine, "\r\n\t ")
+		if (sOK) {
+			REM_TRAIL_MARKS(szLine, "\r\n\t ")
+
+			if (ctx->unicode_type<=1) is_empty = strlen(szLine) ? GF_FALSE : GF_TRUE;
+			else is_empty = (!szLine[0] && !szLine[1]) ? GF_TRUE : GF_FALSE;
+		}
 
-		if (!sOK || !strlen(szLine)) {
-			u32 nb_empty = 1;
+		if (!sOK || is_empty) {
+			u32 utf_inc = (ctx->unicode_type<=1) ? 1 : 2;
+			u32 nb_empty = utf_inc;
 			u32 pos = (u32) gf_ftell(ctx->src);
 			if (ctx->state) {
 				while (!gf_feof(ctx->src)) {
@@ -609,7 +648,7 @@
 						gf_fseek(ctx->src, pos, SEEK_SET);
 						break;
 					} else if (!strlen(szLine+nb_empty)) {
-						nb_empty++;
+						nb_empty+=utf_inc;
 						continue;
 					} else if (	sscanf(szLine+nb_empty, "%u", &line) == 1) {
 						gf_fseek(ctx->src, pos, SEEK_SET);
@@ -706,12 +745,12 @@
 
 			ptr = (char *) szLine;
 			{
-				size_t _len = gf_utf8_mbstowcs(uniLine, 5000, (const char **) &ptr);
-				if (_len == (size_t) -1) {
+				len = gf_utf8_mbstowcs(uniLine, 5000, (const char **) &ptr);
+				if (len == GF_UTF8_FAIL) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] Invalid UTF data (line %d)\n", ctx->curLine));
 					ctx->state = 0;
+					len = 0;
 				}
-				len = (u32) _len;
 			}
 			i=j=0;
 			rem_styles = 0;
@@ -731,7 +770,8 @@
 				}
 				else if (uniLine[i]=='<') {
 					const unsigned short* src = uniLine + i;
-					size_t alen = gf_utf8_wcstombs(szLine, 2048, (const unsigned short**) & src);
+					u32 alen = gf_utf8_wcstombs(szLine, 2048, (const unsigned short**) & src);
+					if (alen == GF_UTF8_FAIL) alen = 0;
 					szLine[alen] = 0;
 					strlwr(szLine);
 					if (!strncmp(szLine, "", 8) ) {
+						style_nb_chars = 8;
+						style_def_type = 1;
+					}
+					else if (!strncmp(szLine, "</strike>", 9) ) {
+						style_nb_chars = 9;
+						style_def_type = 2;
+						font_style = 0xFFFFFFFF;
+					}
 					//skip unknown
 					else {
 						char *a_sep = strstr(szLine, ">");
 						if (a_sep) {
-							style_nb_chars = (u32) (a_sep - szLine);
+							style_nb_chars = (u32) (1 + a_sep - szLine);
 							i += style_nb_chars;
 							continue;
 						}
@@ -806,6 +857,12 @@
 						set_start_char = GF_TRUE;
 						ctx->style.startCharOffset = char_len + j;
 						break;
+					case 's':
+					case 'S':
+						ctx->style.style_flags |= GF_TXT_STYLE_STRIKETHROUGH;
+						set_start_char = GF_TRUE;
+						ctx->style.startCharOffset = char_len + j;
+						break;
 					case 'f':
 					case 'F':
 						if (font_style) {
@@ -840,6 +897,12 @@
 						set_end_char = GF_TRUE;
 						ctx->style.endCharOffset = char_len + j;
 						break;
+					case 's':
+					case 'S':
+						rem_styles |= GF_TXT_STYLE_STRIKETHROUGH;
+						set_end_char = GF_TRUE;
+						ctx->style.endCharOffset = char_len + j;
+						break;
 					case 'f':
 					case 'F':
 						if (font_style) {
@@ -880,7 +943,8 @@
 			uniText[j] = 0;
 
 			sptr = (u16 *) uniText;
-			len = (u32) gf_utf8_wcstombs(szText, 5000, (const u16 **) &sptr);
+			len = gf_utf8_wcstombs(szText, 5000, (const u16 **) &sptr);
+			if (len == GF_UTF8_FAIL) len = 0;
 
 			gf_isom_text_add_text(ctx->samp, szText, len);
 			char_len += char_line;
@@ -916,7 +980,7 @@
 
 static GF_Err gf_webvtt_import_report(void *user, GF_Err e, char *message, const char *line)
 {
-	GF_LOG(e ? GF_LOG_WARNING : GF_LOG_INFO, GF_LOG_AUTHOR, ("[TXTIn] WebVTT line %s: %s\n", line, message) );
+	GF_LOG(e ? GF_LOG_WARNING : GF_LOG_INFO, GF_LOG_PARSER, ("[TXTIn] WebVTT line %s: %s\n", line, message) );
 	return e;
 }
 
@@ -952,15 +1016,17 @@
 		u8 *pck_data;
 
 		pck = gf_filter_pck_new_alloc(ctx->opid, s->dataLength, &pck_data);
-		memcpy(pck_data, s->data, s->dataLength);
-		gf_filter_pck_set_cts(pck, (u64) (ctx->timescale * start / 1000) );
-		gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+		if (pck) {
+			memcpy(pck_data, s->data, s->dataLength);
+			gf_filter_pck_set_cts(pck, (u64) (ctx->timescale * start / 1000) );
+			gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
 
 
-		if (end && (end>=start) ) {
-			gf_filter_pck_set_duration(pck, (u32) (ctx->timescale * (end-start) / 1000) );
+			if (end && (end>=start) ) {
+				gf_filter_pck_set_duration(pck, (u32) (ctx->timescale * (end-start) / 1000) );
+			}
+			gf_filter_pck_send(pck);
 		}
-		gf_filter_pck_send(pck);
 
 		gf_isom_sample_del(&s);
 	}
@@ -1101,19 +1167,19 @@
 	return str;
 }
 
-static void ebu_ttd_remove_samples(GF_XMLNode *root, GF_XMLNode **sample_list_node)
+static void ebu_ttd_remove_samples(GF_XMLNode *root, GF_XMLNode **out_body_node)
 {
 	u32 idx = 0;
 	GF_XMLNode *node = NULL;
-	*sample_list_node = NULL;
+	*out_body_node = NULL;
 	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &idx))) {
 		if (!strcmp(node->name, "body")) {
 			GF_XMLNode *body_node;
 			u32 body_idx = 0;
+			*out_body_node = node;
 			while ( (body_node = (GF_XMLNode*)gf_list_enum(node->content, &body_idx))) {
 				if (!strcmp(body_node->name, "div")) {
 					u32 body_num;
-					*sample_list_node = body_node;
 					body_num = gf_list_count(body_node->content);
 					while (body_num--) {
 						GF_XMLNode *content_node = (GF_XMLNode*)gf_list_get(body_node->content, 0);
@@ -1121,28 +1187,109 @@
 						gf_list_rem(body_node->content, 0);
 						gf_xml_dom_node_del(content_node);
 					}
-					return;
 				}
 			}
+			return;
 		}
 	}
 }
 
-#define TTML_NAMESPACE "http://www.w3.org/ns/ttml"
-
-static s64 ttml_get_timestamp(const char *value)
+static s64 ttml_get_timestamp(GF_TXTIn *ctx, char *value)
 {
-	u32 h, m, s, ms;
+	u32 h, m, s, ms, f, sf;
 	s64 ts = -1;
-	if (sscanf(value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+	u32 len = (u32) strlen(value);
+
+	//tick metrick - cannot be fractional
+	if (len && (value[len-1]=='t')) {
+		value[len-1] = 0;
+		ts = (s64) (atoi(value) * 1000);
+		value[len-1] = 't';
+		if (ctx->tick_rate)
+			ts /= ctx->tick_rate;
+	}
+	//hours metric, can be fractional
+	else if (len && (value[len-1]=='h')) {
+		value[len-1] = 0;
+		ts = (s64) (atof(value) * 1000 * 3600);
+		value[len-1] = 'h';
+	}
+	//minutes metric, can be fractional
+	else if (len && (value[len-1]=='m')) {
+		value[len-1] = 0;
+		ts = (s64) (atof(value) * 1000 * 60);
+		value[len-1] = 'm';
+	}
+	else if (len && (value[len-1]=='s')) {
+		//milliseconds metric, can be fractional but we work at 1ms clock resolution anyway
+		if ((len > 1) && (value[len-2]=='m')) {
+			value[len-2] = 0;
+			ts = (s64) (atof(value));
+			value[len-2] = 'm';
+		}
+		//seconds metric, can be fractional
+		else {
+			value[len-1] = 0;
+			ts = (s64) (atof(value) * 1000);
+			value[len-1] = 's';
+		}
+	}
+	//frames metric, can be fractional
+	else if (len && (value[len-1]=='f')) {
+		f = sf = 0;
+		value[len-1] = 0;
+		if (sscanf(value, "%u.%u", &f, &sf) != 2) {
+			sscanf(value, "%u", &f);
+			sf = 0;
+		}
+		value[len-1] = 'f';
+
+		if (!ctx->ttml_fps_num) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] time indicates frames but no frame rate set, assuming 25 FPS\n"));
+			ctx->ttml_fps_num = 25;
+			ctx->ttml_fps_den = 1;
+		}
+		if (sf && !ctx->ttml_sfps) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] time indicates subframes but no subFrameRate set, assuming 1\n"));
+			ctx->ttml_sfps = 1;
+		}
+		ts = ((s64) 1000 * f * ctx->ttml_fps_den) / ctx->ttml_fps_num;
+		if (sf)
+			ts += ((s64) 1000 * sf * ctx->ttml_fps_den / ctx->ttml_sfps) / ctx->ttml_fps_num;
+	}
+	else if (sscanf(value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 		ts = (h*3600 + m*60+s)*1000+ms;
-	} else if (sscanf(value, "%u:%u:%u", &h, &m, &s) == 3) {
+	}
+	else if (sscanf(value, "%u:%u:%u:%u.%u", &h, &m, &s, &f, &sf) == 5) {
+		ts = (h*3600 + m*60+s)*1000;
+		if (!ctx->ttml_fps_num) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] time indicates frames but no frame rate set, assuming 25 FPS\n"));
+			ctx->ttml_fps_num = 25;
+			ctx->ttml_fps_den = 1;
+		}
+		if (!ctx->ttml_sfps) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] time indicates subframes but no subFrameRate set, assuming 1\n"));
+			ctx->ttml_sfps = 1;
+		}
+		ts += ((s64) 1000 * f * ctx->ttml_fps_den) / ctx->ttml_fps_num;
+		ts += ((s64) 1000 * sf * ctx->ttml_fps_den / ctx->ttml_sfps) / ctx->ttml_fps_num;
+	}
+	else if (sscanf(value, "%u:%u:%u:%u", &h, &m, &s, &f) == 4) {
+		ts = (h*3600 + m*60+s)*1000;
+		if (!ctx->ttml_fps_num) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] time indicates frames but no frame rate set, assuming 25 FPS\n"));
+			ctx->ttml_fps_num = 25;
+			ctx->ttml_fps_den = 1;
+		}
+		ts += ((s64) 1000 * f * ctx->ttml_fps_den) / ctx->ttml_fps_num;
+	}
+	else if (sscanf(value, "%u:%u:%u", &h, &m, &s) == 3) {
 		ts = (h*3600 + m*60+s)*1000;
 	}
 	return ts;
 }
 
-static GF_Err ttml_push_interval(GF_TXTIn *ctx, s64 begin, s64 end)
+static GF_Err ttml_push_interval(GF_TXTIn *ctx, s64 begin, s64 end, TTMLInterval **out_interval)
 {
 	u32 i;
 	TTMLInterval *interval;
@@ -1157,9 +1304,19 @@
 	interval = NULL;
 	for (i=0; i<gf_list_count(ctx->intervals); i++) {
 		interval = gf_list_get(ctx->intervals, i);
+
+		//generate a single sample for the input, merge interval
+		if (ctx->ttml_dur>=0) {
+			if (interval->begin > begin) interval->begin = begin;
+			if (interval->end < end) interval->end = end;
+			*out_interval = interval;
+			return GF_OK;
+		}
 		//contained, do nothing
-		if ((begin>=interval->begin) && (end<=interval->end))
+		if ((begin>=interval->begin) && (end<=interval->end)) {
+			*out_interval = interval;
 			return GF_OK;
+		}
 		//not overlapping
 		if ((end < interval->begin) || (begin > interval->end))
 			continue;
@@ -1170,7 +1327,7 @@
 				begin = interval->begin;
 			gf_list_rem(ctx->intervals, i);
 			gf_free(interval);
-			return ttml_push_interval(ctx, begin, end);
+			return ttml_push_interval(ctx, begin, end, out_interval);
 		}
 		//new interval starts before current and end before, remove current and push rewinded
 		if ((begin < interval->end) && (end <= interval->end)) {
@@ -1179,13 +1336,14 @@
 				begin = interval->begin;
 			gf_list_rem(ctx->intervals, i);
 			gf_free(interval);
-			return ttml_push_interval(ctx, begin, end);
+			return ttml_push_interval(ctx, begin, end, out_interval);
 		}
 	}
 	//need a new interval
 	GF_SAFEALLOC(interval, TTMLInterval);
 	interval->begin = begin;
 	interval->end = end;
+	*out_interval = interval;
 
 	for (i=0; i<gf_list_count(ctx->intervals); i++) {
 		TTMLInterval *an_interval = gf_list_get(ctx->intervals, i);
@@ -1200,13 +1358,203 @@
 {
 	while (gf_list_count(ctx->intervals)) {
 		TTMLInterval *ival = gf_list_pop_back(ctx->intervals);
+		if (ival->resources) {
+			while (gf_list_count(ival->resources)) {
+				TTMLRes *ires = gf_list_pop_back(ival->resources);
+				if (!ires->global) {
+					gf_free(ires->data);
+					gf_free(ires);
+				}
+			}
+			gf_list_del(ival->resources);
+		}
 		gf_free(ival);
 	}
 }
 
+#include <gpac/base_coding.h>
+
+static GF_Err ttml_push_res(GF_TXTIn *ctx, TTMLInterval *interval, u8 *f_data, u32 f_size)
+{
+	GF_Err e;
+	TTMLRes *res;
+	GF_List *res_list;
+	if (interval) {
+		if (!interval->resources) {
+			if (ctx->ttml_resources)
+				interval->resources = gf_list_clone(ctx->ttml_resources);
+			else
+				interval->resources = gf_list_new();
+		}
+		res_list = interval->resources;
+	} else {
+		if (!ctx->ttml_resources) {
+			ctx->ttml_resources = gf_list_new();
+		}
+		res_list = ctx->ttml_resources;
+	}
+	if (!res_list) {
+		gf_free(f_data);
+		return GF_OUT_OF_MEM;
+	}
+	GF_SAFEALLOC(res, TTMLRes)
+	if (!res) {
+		gf_free(f_data);
+		return GF_OUT_OF_MEM;
+	}
+	res->size = f_size;
+	res->data = f_data;
+	if (!interval)
+		res->global = GF_TRUE;
+
+	e = gf_list_add(res_list, res);
+	if (e) {
+		gf_free(res);
+		gf_free(f_data);
+		return e;
+	}
+	return GF_OK;
+}
+
+static GF_Err ttml_push_resources(GF_TXTIn *ctx, TTMLInterval *interval, GF_XMLNode *node, GF_XMLNode *parent_source_node)
+{
+	u32 i;
+	char szURN[1024];
+	u8 *f_data;
+	u32 f_size;
+	u32 idx;
+	GF_Err e;
+	GF_XMLAttribute *att, *data_type = NULL;
+	GF_XMLNode *child;
+	Bool is_source = GF_FALSE;
+	Bool is_data = GF_FALSE;
+	Bool check_src = GF_FALSE;
+
+	if (!ctx->ttml_embed)
+		return GF_OK;
+
+	if (!strcmp(node->name, "source")) {
+		is_source = GF_TRUE;
+		check_src = GF_TRUE;
+	}
+	else if (!strcmp(node->name, "data")) {
+		is_data = parent_source_node ? GF_TRUE : GF_FALSE;
+		check_src = GF_TRUE;
+	}
+	//we don't embed chunks
+	else if (!strcmp(node->name, "chunk")) {
+		return GF_OK;
+	}
+	else if (!strcmp(node->name, "audio") || !strcmp(node->name, "font") || !strcmp(node->name, "image")) {
+		check_src = GF_TRUE;
+	}
+
+	if (check_src) {
+		i = 0;
+		while ( (att = (GF_XMLAttribute*)gf_list_enum(node->attributes, &i))) {
+			char *url;
+			if (!att->value) continue;
+			if (is_data && !strcmp(att->name, "type")) {
+				data_type = att;
+				continue;
+			}
+			if (strcmp(att->name, "src")) continue;
+			if (att->value[0]=='#') continue;
+
+			if (!strncmp(att->value, "file://", 7)) {}
+			else if (strstr(att->value, "://"))
+				continue;
+
+			url = gf_url_concatenate(ctx->file_name, att->value);
+			//embed image
+			e = gf_file_load_data(url, &f_data, &f_size);
+			gf_free(url);
+			if (e) return e;
+
+			e = ttml_push_res(ctx, interval, f_data, f_size);
+			if (e) return e;
+
+			idx = gf_list_count(interval ? interval->resources : ctx->ttml_resources);
+			gf_free(att->value);
+			sprintf(szURN, "urn:mpeg:14496-30:%d", idx);
+			att->value = gf_strdup(szURN);
+			if (!att->value) return GF_OUT_OF_MEM;
+
+			ctx->has_images = GF_TRUE;
+		}
+	}
+
+	i = 0;
+	while ( (child = (GF_XMLNode*) gf_list_enum(node->content, &i))) {
+		if (child->type) {
+			if (!is_data) continue;
+			u8 *data = child->name;
+			u32 ilen = (u32) strlen(data);
+			f_size = 3*ilen/4;
+			f_data = gf_malloc(sizeof(u8) * f_size);
+
+			f_size = gf_base64_decode(data, ilen, f_data, f_size);
+
+			e = ttml_push_res(ctx, interval, f_data, f_size);
+			if (e) return e;
+
+			idx = gf_list_count(interval ? interval->resources : ctx->ttml_resources);
+			sprintf(szURN, "urn:mpeg:14496-30:%d", idx);
+
+			GF_SAFEALLOC(att, GF_XMLAttribute)
+			if (att) {
+				att->name = gf_strdup("src");
+				att->value = gf_strdup(szURN);
+				gf_list_add(parent_source_node->attributes, att);
+			}
+			if (!att || !att->value || !att->name) return GF_OUT_OF_MEM;
+			if (data_type) {
+				gf_list_del_item(node->attributes, data_type);
+				gf_list_add(parent_source_node->attributes, data_type);
+			}
+			gf_xml_dom_node_reset(parent_source_node, GF_FALSE, GF_TRUE);
+			ctx->has_images = GF_TRUE;
+			return GF_OK;
+		}
+
+		e = ttml_push_resources(ctx, interval, child, is_source ? node : NULL);
+		if (e) return e;
+	}
+	return GF_OK;
+}
+
+static GF_Err ttml_rewrite_timestamp(GF_TXTIn *ctx, s64 ttml_zero, GF_XMLAttribute *att, s64 *value, Bool *drop)
+{
+	u64 v;
+	char szTS[21];
+	u32 h, m, s, ms;
+	*value = ttml_get_timestamp(ctx, att->value);
+	if (!ttml_zero)
+		return GF_OK;
+
+	if (*value < ttml_zero) {
+		*drop = GF_TRUE;
+		return GF_OK;
+	}
+
+	*value -= ttml_zero;
+	v = (u64) (*value / 1000);
+	h = (u32) (v / 3600);
+	m = (u32) (v - h*60) / 60;
+	s = (u32) (v - h*3600 - m*60);
+	ms = (*value) % 1000;
+
+	snprintf(szTS, 20, "%02d:%02d:%02d.%03d", h, m, s, ms);
+	szTS[20] = 0;
+	gf_free(att->value);
+	att->value = gf_strdup(szTS);
+	return GF_OK;
+}
+
 static GF_Err ttml_setup_intervals(GF_TXTIn *ctx)
 {
-	u32 k;
+	u32 k, i, nb_divs;
+	s64 ttml_zero_ms = 0;
 	GF_Err e;
 	GF_XMLNode *root;
 
@@ -1215,62 +1563,118 @@
 	else
 		ttml_reset_intervals(ctx);
 
+	ctx->has_images = GF_FALSE;
+	root = ctx->root_working_copy;
+	for (k=0; k<gf_list_count(root->content); k++) {
+		GF_XMLNode *head = (GF_XMLNode*)gf_list_get(root->content, k);
+		if (head->type) continue;
+		if (strcmp(head->name, "head")) continue;
+		ttml_push_resources(ctx, NULL, head, NULL);
+		break;
+	}
+
 	root = gf_xml_dom_get_root(ctx->parser);
+	if (ctx->ttml_zero) {
+		if (ctx->ttml_zero[0]=='T')
+			ttml_zero_ms = ttml_get_timestamp(ctx, (char *) ctx->ttml_zero+1);
+		else
+			ttml_zero_ms = ttml_get_timestamp(ctx, (char *) ctx->ttml_zero);
+	}
+
+	nb_divs = gf_list_count(ctx->div_nodes_list);
+	for (i=0; i<nb_divs; i++) {
+		u32 nb_children;
+		GF_XMLNode *div_node = gf_list_get(ctx->div_nodes_list, i);
+		nb_children = gf_list_count(div_node->content);
+
+		for (k=0; k<nb_children; k++) {
+			TTMLInterval *ival=NULL;
+			u32 p_idx;
+			Bool drop = GF_FALSE;
+			GF_XMLAttribute *p_att;
+			GF_XMLNode *p_node;
+			s64 begin=-1, end=-1;
+			GF_XMLNode *adiv_child = (GF_XMLNode*)gf_list_get(div_node->content, k);
+			if (adiv_child->type) continue;
+			e = gf_xml_get_element_check_namespace(adiv_child, "p", root->ns);
+			if (e) continue;
 
-	for (k=0; k<ctx->nb_children; k++) {
-		u32 p_idx;
-		GF_XMLAttribute *p_att;
-		GF_XMLNode *p_node;
-		s64 begin=-1, end=-1;
-		GF_XMLNode *adiv_child = (GF_XMLNode*)gf_list_get(ctx->div_node->content, k);
-		if (adiv_child->type) continue;
-		e = gf_xml_get_element_check_namespace(adiv_child, "p", root->ns);
-		if (e) continue;
-
-		p_idx = 0;
-		while ( (p_att = (GF_XMLAttribute*)gf_list_enum(adiv_child->attributes, &p_idx))) {
-			if (!strcmp(p_att->name, "begin")) {
-				begin = ttml_get_timestamp(p_att->value);
+			p_idx = 0;
+			while ( (p_att = (GF_XMLAttribute*)gf_list_enum(adiv_child->attributes, &p_idx))) {
+				if (!strcmp(p_att->name, "begin")) {
+					e = ttml_rewrite_timestamp(ctx, ttml_zero_ms, p_att, &begin, &drop);
+					if (e) return e;
+				}
+				if (!strcmp(p_att->name, "end")) {
+					e = ttml_rewrite_timestamp(ctx, ttml_zero_ms, p_att, &end, &drop);
+					if (e) return e;
+				}
 			}
-			if (!strcmp(p_att->name, "end")) {
-				end = ttml_get_timestamp(p_att->value);
+			if (drop) {
+				gf_xml_dom_node_del(adiv_child);
+				gf_list_rem(div_node->content, k);
+				k--;
+				nb_children--;
+				continue;
 			}
-		}
-		e = ttml_push_interval(ctx, begin, end);
-		if (e) return e;
 
-		p_idx = 0;
-		while ( (p_node = (GF_XMLNode*)gf_list_enum(adiv_child->content, &p_idx))) {
-			s64 s_begin=-1, s_end=-1;
-			e = gf_xml_get_element_check_namespace(p_node, "span", root->ns);
-			if (e) continue;
+			e = ttml_push_interval(ctx, begin, end, &ival);
+			if (e) return e;
+
+			e = ttml_push_resources(ctx, ival, adiv_child, NULL);
+			if (e) return e;
+
+			p_idx = 0;
+			while ( (p_node = (GF_XMLNode*)gf_list_enum(adiv_child->content, &p_idx))) {
+				s64 s_begin=-1, s_end=-1;
+				e = gf_xml_get_element_check_namespace(p_node, "span", root->ns);
+				if (e) continue;
 
-			u32 span_idx = 0;
-			GF_XMLAttribute *span_att;
-			while ( (span_att = (GF_XMLAttribute*)gf_list_enum(p_node->attributes, &span_idx))) {
-				if (!strcmp(span_att->name, "begin")) {
-					s_begin = ttml_get_timestamp(span_att->value);
-				} else if (!strcmp(span_att->name, "end")) {
-					s_end = ttml_get_timestamp(span_att->value);
+				u32 span_idx = 0;
+				GF_XMLAttribute *span_att;
+				while ( (span_att = (GF_XMLAttribute*)gf_list_enum(p_node->attributes, &span_idx))) {
+					if (!strcmp(span_att->name, "begin")) {
+						e = ttml_rewrite_timestamp(ctx, ttml_zero_ms, span_att, &s_begin, &drop);
+						if (e) return e;
+					} else if (!strcmp(span_att->name, "end")) {
+						e = ttml_rewrite_timestamp(ctx, ttml_zero_ms, span_att, &s_end, &drop);
+						if (e) return e;
+					}
 				}
+				e = ttml_push_interval(ctx, s_begin, s_end, &ival);
+				if (e) return e;
+
+				e = ttml_push_resources(ctx, ival, p_node, NULL);
+				if (e) return e;
 			}
-			e = ttml_push_interval(ctx, s_begin, s_end);
-			if (e) return e;
 		}
 	}
 
-	for (k=0; k<gf_list_count(ctx->intervals); k++) {
-		TTMLInterval *ival = gf_list_get(ctx->intervals, k);
-		GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[TTML EBU-TTD] Interval %d: "LLU"-"LLU"\n", k+1, ival->begin, ival->end));
+	//empty doc
+	if (!gf_list_count(ctx->intervals)) {
+		TTMLInterval *interval;
+		GF_SAFEALLOC(interval, TTMLInterval);
+		interval->begin = interval->end = 0;
+		gf_list_add(ctx->intervals, interval);
 	}
 
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_PARSER, GF_LOG_DEBUG)) {
+		for (k=0; k<gf_list_count(ctx->intervals); k++) {
+			TTMLInterval *ival = gf_list_get(ctx->intervals, k);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[TTML EBU-TTD] Interval %d: "LLU"-"LLU"\n", k+1, ival->begin, ival->end));
+		}
+	}
+#endif
 	return GF_OK;
 }
+
 static GF_Err gf_text_ttml_setup(GF_Filter *filter, GF_TXTIn *ctx)
 {
 	GF_Err e;
 	u32 i, nb_children, ID;
 	u64 file_size;
+	s32 sub_fps_num, sub_fps_den;
 	GF_XMLAttribute *att;
 	GF_XMLNode *root, *node, *body_node;
 	const char *lang = ctx->lang;
@@ -1309,19 +1713,55 @@
 
 
 	/*** root (including language) ***/
+	sub_fps_num = 0;
+	sub_fps_den = 0;
 	i=0;
 	while ( (att = (GF_XMLAttribute *)gf_list_enum(root->attributes, &i))) {
+		const char *att_name;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[TTML] Found root attribute name %s, value %s\n", att->name, att->value));
 
+		att_name = strchr(att->name, ':');
+		if (att_name) att_name++;
+		else att_name = att->name;
+
 		if (!strcmp(att->name, "xmlns")) {
 			if (strcmp(att->value, TTML_NAMESPACE)) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML] XML Namespace %s not recognized, expecting %s\n", att->name, att->value, TTML_NAMESPACE));
 				ctx->non_compliant_ttml = GF_TRUE;
 				return GF_NON_COMPLIANT_BITSTREAM;
 			}
-		} else if (!strcmp(att->name, "xml:lang") && att->value && strlen(att->value)) {
+		}
+		else if (!strcmp(att->name, "xml:lang") && att->value && strlen(att->value)) {
 			lang = att->value;
 		}
+		else if (!strcmp(att_name, "tickRate") && att->value) {
+			ctx->tick_rate = atoi(att->value);
+		}
+		else if (!strcmp(att_name, "frameRate") && att->value) {
+			ctx->ttml_fps_num = atoi(att->value);
+			ctx->ttml_fps_den = 1;
+		}
+		else if (!strcmp(att_name, "frameRateMultiplier") && att->value) {
+			char *sep = strchr(att->value, ' ');
+			if (!sep) sep = strchr(att->value, '\t');
+			if (sep) {
+				u8 c = sep[0];
+				sep[0] = 0;
+				sub_fps_num = atoi(sep);
+				sep[0] = c;
+				while ((sep[0]==' ') || (sep[0]=='\t'))
+					sep++;
+				sub_fps_den = atoi(sep);
+			}
+		}
+		else if (!strcmp(att_name, "subFrameRate") && att->value) {
+			ctx->ttml_sfps = atoi(att->value);
+		}
+	}
+
+	if (sub_fps_num && sub_fps_den && ctx->ttml_fps_num) {
+		ctx->ttml_fps_num *= sub_fps_num;
+		ctx->ttml_fps_den = sub_fps_den;
 	}
 
 	//locate body
@@ -1347,25 +1787,26 @@
 		}
 	}
 	if (!body_node) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] \"body\" element not found. Abort.\n"));
-		ctx->non_compliant_ttml = GF_TRUE;
-		return GF_NON_COMPLIANT_BITSTREAM;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[TTML EBU-TTD] \"body\" element not found, assuming empty doc\n"));
 	}
 
-	i=0;
-	while ( (node = (GF_XMLNode*)gf_list_enum(body_node->content, &i))) {
-		if (node->type) {
-			nb_children--;
-			continue;
-		}
-		e = gf_xml_get_element_check_namespace(node, "div", root->ns);
-		if (e == GF_BAD_PARAM) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] ignored \"%s\" node, check your namespaces\n", node->name));
-		} else if (e == GF_OK) {
-			if (ctx->div_node) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] several \"div\" found in document, only the first one will be imported - not supported but patch is welcome\n"));
+	if (!ctx->div_nodes_list) {
+		ctx->div_nodes_list = gf_list_new();
+		if (!ctx->div_nodes_list) return GF_OUT_OF_MEM;
+	} else {
+		gf_list_reset(ctx->div_nodes_list);
+	}
+
+	if (body_node) {
+		i=0;
+		while ( (node = (GF_XMLNode*)gf_list_enum(body_node->content, &i))) {
+			if (!node->type) {
+				e = gf_xml_get_element_check_namespace(node, "div", root->ns);
+				if (e == GF_BAD_PARAM) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] ignored \"%s\" node, check your namespaces\n", node->name));
+				}
 			}
-			ctx->div_node = node;
+			gf_list_add(ctx->div_nodes_list, node);
 		}
 	}
 	file_size = ctx->end;
@@ -1392,13 +1833,16 @@
 	ctx->root_working_copy = gf_xml_dom_get_root(ctx->parser_working_copy);
 	assert(ctx->root_working_copy);
 
-	/*remove all the sample entries (instances in body) entries from the working copy, we will add each sample in this clone DOM to create full XML of each sample*/
-	ebu_ttd_remove_samples(ctx->root_working_copy, &ctx->sample_list_node);
-	if (!ctx->sample_list_node) {
-		return GF_NON_COMPLIANT_BITSTREAM;
+	if (body_node) {
+		/*remove all the sample entries (instances in body) entries from the working copy, we will add each sample in this clone DOM to create full XML of each sample*/
+		ebu_ttd_remove_samples(ctx->root_working_copy, &ctx->body_node);
+		if (!ctx->body_node) {
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+	} else {
+		ctx->body_node = NULL;
 	}
 
-	ctx->nb_children = gf_list_count(ctx->div_node->content);
 	ctx->current_tt_interval = 0;
 
 	ctx->last_sample_duration = 0;
@@ -1407,7 +1851,16 @@
 
 	txtin_probe_duration(ctx);
 
-	return ttml_setup_intervals(ctx);
+	e = ttml_setup_intervals(ctx);
+	if (e) return e;
+
+	if (ctx->has_images) {
+		char *mime_cfg = "application/ttml+xml;codecs=im1i";
+		gf_filter_pid_set_property_str(ctx->opid, "meta:mime", &PROP_STRING(mime_cfg) );
+	} else {
+		gf_filter_pid_set_property_str(ctx->opid, "meta:mime", NULL);
+	}
+	return GF_OK;
 }
 
 static Bool ttml_check_range(TTMLInterval *interval, s64 ts_begin, s64 ts_end)
@@ -1432,9 +1885,11 @@
 {
 	GF_Err e;
 	GF_XMLNode *root;
-	u32 i;
+	u32 i, nb_res_interval=0, k, nb_div_nodes;
 	char *samp_text=NULL;
+	GF_List *emb_resources = NULL;
 	TTMLInterval *interval;
+	Bool sample_empty = GF_TRUE;
 
 	if (!ctx->is_setup) return gf_text_ttml_setup(filter, ctx);
 	if (ctx->non_compliant_ttml || !ctx->opid) return GF_NOT_SUPPORTED;
@@ -1456,95 +1911,133 @@
 	}
 	ctx->current_tt_interval++;
 
-	root = gf_xml_dom_get_root(ctx->parser);
-
-	for (i=0; i < ctx->nb_children; i++) {
-		GF_XMLNode *p_node;
-		GF_XMLAttribute *p_att;
-		u32 p_idx = 0;
-		s64 ts_begin = -1, ts_end = -1;
-		Bool in_range;
-		GF_XMLNode *div_child = (GF_XMLNode*)gf_list_get(ctx->div_node->content, i);
-		if (div_child->type) {
-			continue;
-		}
-		e = gf_xml_get_element_check_namespace(div_child, "p", root->ns);
-		if (e == GF_BAD_PARAM) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] ignored \"%s\" node, check your namespaces\n", div_child->name));
-			continue;
-		}
+	emb_resources = interval->resources ? interval->resources : ctx->ttml_resources;
+	nb_res_interval = gf_list_count(emb_resources);
 
+	root = gf_xml_dom_get_root(ctx->parser);
 
-		//sample is either in the ...
-		p_idx = 0;
-		while ( (p_att = (GF_XMLAttribute*)gf_list_enum(div_child->attributes, &p_idx))) {
-			if (!strcmp(p_att->name, "begin")) {
-				if (ts_begin != -1) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"begin\" attribute. Abort.\n"));
-					e = GF_NON_COMPLIANT_BITSTREAM;
-					goto exit;
-				}
-				ts_begin = ttml_get_timestamp(p_att->value);
-			} else if (!strcmp(p_att->name, "end")) {
-				if (ts_end != -1) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"end\" attribute. Abort.\n"));
-					e = GF_NON_COMPLIANT_BITSTREAM;
-					goto exit;
-				}
-				ts_end = ttml_get_timestamp(p_att->value);
+	nb_div_nodes = gf_list_count(ctx->div_nodes_list);
+	for (k=0; k<nb_div_nodes; k++) {
+		Bool has_content = GF_FALSE;
+		GF_XMLNode *div_node = gf_list_get(ctx->div_nodes_list, k);
+		u32 nb_children = gf_list_count(div_node->content);
+
+		GF_XMLNode *copy_div_node = gf_list_get(ctx->body_node->content, k);
+
+		for (i=0; i < nb_children; i++) {
+			GF_XMLNode *p_node;
+			GF_XMLAttribute *p_att;
+			u32 p_idx = 0;
+			s64 ts_begin = -1, ts_end = -1;
+			Bool in_range;
+			GF_XMLNode *div_child = (GF_XMLNode*)gf_list_get(div_node->content, i);
+			if (div_child->type) {
+				continue;
 			}
-		}
-
-		in_range = ttml_check_range(interval, ts_begin, ts_end);
-		if (in_range) {
-			e = gf_xml_dom_append_child(ctx->sample_list_node, div_child);
-			assert(e == GF_OK);
-		}
-
-		//or under a 
-		p_idx = 0;
-		while ( (p_node = (GF_XMLNode*)gf_list_enum(div_child->content, &p_idx))) {
-			u32 span_idx = 0;
-			GF_XMLAttribute *span_att;
-			e = gf_xml_get_element_check_namespace(p_node, "span", root->ns);
+			e = gf_xml_get_element_check_namespace(div_child, "p", root->ns);
 			if (e == GF_BAD_PARAM) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] ignored \"%s\" node, check your namespaces\n", p_node->name));
-			}
-			else if (e)
+				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] ignored \"%s\" node, check your namespaces\n", div_child->name));
 				continue;
+			}
+
 
-			ts_begin = ts_end = -1;
-			while ( (span_att = (GF_XMLAttribute*)gf_list_enum(p_node->attributes, &span_idx))) {
-				if (!strcmp(span_att->name, "begin")) {
+			//sample is either in the ...
+			p_idx = 0;
+			while ( (p_att = (GF_XMLAttribute*)gf_list_enum(div_child->attributes, &p_idx))) {
+				if (!strcmp(p_att->name, "begin")) {
 					if (ts_begin != -1) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"begin\" attribute under . Abort.\n"));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"begin\" attribute. Abort.\n"));
 						e = GF_NON_COMPLIANT_BITSTREAM;
 						goto exit;
 					}
-					ts_begin = ttml_get_timestamp(span_att->value);
-				} else if (!strcmp(span_att->name, "end")) {
+					ts_begin = ttml_get_timestamp(ctx, p_att->value);
+				} else if (!strcmp(p_att->name, "end")) {
 					if (ts_end != -1) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"end\" attribute under . Abort.\n"));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"end\" attribute. Abort.\n"));
 						e = GF_NON_COMPLIANT_BITSTREAM;
 						goto exit;
 					}
-					ts_end = ttml_get_timestamp(span_att->value);
+					ts_end = ttml_get_timestamp(ctx, p_att->value);
 				}
 			}
 
-			/*append the entire and break (we cannot split the text content)*/
 			in_range = ttml_check_range(interval, ts_begin, ts_end);
 			if (in_range) {
-				e = gf_xml_dom_append_child(ctx->sample_list_node, div_child);
+				GF_XMLNode *prev_child = i ? (GF_XMLNode*) gf_list_get(div_node->content, i-1) : NULL;
+				if (prev_child && prev_child->type) {
+					gf_xml_dom_append_child(copy_div_node, prev_child);
+				}
+				e = gf_xml_dom_append_child(copy_div_node, div_child);
 				assert(e == GF_OK);
-				break;
+				has_content = GF_TRUE;
+			}
+
+			//or under a 
+			p_idx = 0;
+			while ( (p_node = (GF_XMLNode*)gf_list_enum(div_child->content, &p_idx))) {
+				u32 span_idx = 0;
+				GF_XMLAttribute *span_att;
+				e = gf_xml_get_element_check_namespace(p_node, "span", root->ns);
+				if (e == GF_BAD_PARAM) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] ignored \"%s\" node, check your namespaces\n", p_node->name));
+				}
+				else if (e)
+					continue;
+
+				ts_begin = ts_end = -1;
+				while ( (span_att = (GF_XMLAttribute*)gf_list_enum(p_node->attributes, &span_idx))) {
+					if (!strcmp(span_att->name, "begin")) {
+						if (ts_begin != -1) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"begin\" attribute under . Abort.\n"));
+							e = GF_NON_COMPLIANT_BITSTREAM;
+							goto exit;
+						}
+						ts_begin = ttml_get_timestamp(ctx, span_att->value);
+					} else if (!strcmp(span_att->name, "end")) {
+						if (ts_end != -1) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"end\" attribute under . Abort.\n"));
+							e = GF_NON_COMPLIANT_BITSTREAM;
+							goto exit;
+						}
+						ts_end = ttml_get_timestamp(ctx, span_att->value);
+					}
+				}
+
+				/*append the entire and break (we cannot split the text content)*/
+				in_range = ttml_check_range(interval, ts_begin, ts_end);
+				if (in_range) {
+					GF_XMLNode *prev_child = i ? (GF_XMLNode*) gf_list_get(div_node->content, i-1) : NULL;
+					if (prev_child && prev_child->type) {
+						gf_xml_dom_append_child(copy_div_node, prev_child);
+					}
+					e = gf_xml_dom_append_child(copy_div_node, div_child);
+					assert(e == GF_OK);
+					has_content = GF_TRUE;
+					break;
+				}
+			}
+		}
+		if (has_content) {
+			GF_XMLNode *last_child = (GF_XMLNode*) gf_list_last(div_node->content);
+			if (last_child && last_child->type) {
+				gf_xml_dom_append_child(copy_div_node, last_child);
 			}
+			sample_empty = GF_FALSE;
 		}
 	}
 
-	if (gf_list_count(ctx->sample_list_node->content)) {
-		samp_text = gf_xml_dom_serialize((GF_XMLNode*)ctx->root_working_copy, GF_FALSE);
-		gf_list_reset(ctx->sample_list_node->content);
+	//empty doc
+	if (!ctx->body_node)
+		sample_empty = GF_FALSE;
+
+	if (! sample_empty) {
+		samp_text = gf_xml_dom_serialize_root((GF_XMLNode*)ctx->root_working_copy, GF_FALSE, GF_FALSE);
+
+		for (k=0; k<nb_div_nodes; k++) {
+			GF_XMLNode *copy_div_node = gf_list_get(ctx->body_node->content, k);
+			if (!copy_div_node->type)
+				gf_list_reset(copy_div_node->content);
+		}
 	}
 
 	if (samp_text) {
@@ -1552,6 +2045,7 @@
 		u8 *pck_data;
 		Bool skip_pck = GF_FALSE;
 		u32 txt_len;
+		u32 res_len = 0;
 		char *txt_str;
 
 
@@ -1565,6 +2059,11 @@
 		if (!txt_str) txt_str = "";
 		txt_len = (u32) strlen(txt_str);
 
+		for (i=0; i<nb_res_interval; i++) {
+			TTMLRes *res = gf_list_get(emb_resources, i);
+			res_len += res->size;
+		}
+
 		if (ctx->first_samp) {
 			interval->begin = 0; /*in MP4 we must start at T=0*/
 			ctx->first_samp = GF_FALSE;
@@ -1583,10 +2082,53 @@
 		}
 
 		if (!skip_pck) {
-			pck = gf_filter_pck_new_alloc(ctx->opid, txt_len, &pck_data);
+			pck = gf_filter_pck_new_alloc(ctx->opid, txt_len+res_len, &pck_data);
+			if (!pck) {
+				gf_free(samp_text);
+				return GF_OUT_OF_MEM;
+			}
 			memcpy(pck_data, txt_str, txt_len);
 			gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
-			gf_filter_pck_set_cts(pck, (ctx->timescale * interval->begin)/1000);
+
+			if (ctx->ttml_dur>0) {
+				gf_filter_pck_set_cts(pck, 0);
+				gf_filter_pck_set_duration(pck, (u32) ctx->ttml_dur);
+				ctx->last_sample_duration = (u64) ctx->ttml_dur * 1000 / ctx->timescale;
+			} else {
+				gf_filter_pck_set_cts(pck, (ctx->timescale * interval->begin)/1000);
+				if (interval->end >= interval->begin) {
+					gf_filter_pck_set_duration(pck, (u32) ((ctx->timescale * (interval->end - interval->begin) )/1000) );
+				}
+			}
+
+			if (res_len) {
+				GF_BitStream *subs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				u8 *subs_data;
+				u32 subs_size;
+				//subs 0
+				gf_bs_write_u32(subs, 0);
+				gf_bs_write_u32(subs, txt_len);
+				gf_bs_write_u32(subs, 0);
+				gf_bs_write_u8(subs, 0);
+				gf_bs_write_u8(subs, 0);
+
+				pck_data += txt_len;
+				for (i=0; i<nb_res_interval; i++) {
+					TTMLRes *res = gf_list_get(emb_resources, i);
+					memcpy(pck_data, res->data, res->size);
+					pck_data += res->size;
+
+					//subs >0
+					gf_bs_write_u32(subs, 0);
+					gf_bs_write_u32(subs, res->size);
+					gf_bs_write_u32(subs, 0);
+					gf_bs_write_u8(subs, 0);
+					gf_bs_write_u8(subs, 0);
+				}
+				gf_bs_get_content(subs, &subs_data, &subs_size);
+				gf_bs_del(subs);
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_SUBS, &PROP_DATA_NO_COPY(subs_data, subs_size) );
+			}
 			gf_filter_pck_send(pck);
 		}
 
@@ -1623,12 +2165,14 @@
 	}
 
 	pck = gf_filter_pck_new_alloc(ctx->opid, length, &pck_data);
-	memcpy(pck_data, data, length);
-	gf_filter_pck_set_cts(pck, (u64) (ctx->timescale*timestamp/1000) );
-	gf_filter_pck_set_sap(pck, isRap ? GF_FILTER_SAP_1 : GF_FILTER_SAP_NONE);
-	gf_filter_pck_set_framing(pck, GF_TRUE, GF_FALSE);
+	if (pck) {
+		memcpy(pck_data, data, length);
+		gf_filter_pck_set_cts(pck, (u64) (ctx->timescale*timestamp/1000) );
+		gf_filter_pck_set_sap(pck, isRap ? GF_FILTER_SAP_1 : GF_FILTER_SAP_NONE);
+		gf_filter_pck_set_framing(pck, GF_TRUE, GF_FALSE);
 
-	gf_filter_pck_send(pck);
+		gf_filter_pck_send(pck);
+	}
 
 	if (gf_filter_pid_would_block(ctx->opid))
 		ctx->do_suspend = GF_TRUE;
@@ -1648,10 +2192,12 @@
 		GF_FilterPacket *pck;
 		u8 *pck_data;
 		pck = gf_filter_pck_new_alloc(ctx->opid, length, &pck_data);
-		memcpy(pck_data, data, length);
-		gf_filter_pck_set_framing(pck, GF_FALSE, GF_TRUE);
+		if (pck) {
+			memcpy(pck_data, data, length);
+			gf_filter_pck_set_framing(pck, GF_FALSE, GF_TRUE);
 
-		gf_filter_pck_send(pck);
+			gf_filter_pck_send(pck);
+		}
 	}
 	return GF_OK;
 }
@@ -1795,6 +2341,8 @@
 		while (szLine[i+1] && szLine[i+1]!='}') {
 			szTime[i] = szLine[i+1];
 			i++;
+			if (i>=19)
+				break;
 		}
 		szTime[i] = 0;
 		ctx->start = atoi(szTime);
@@ -1839,7 +2387,7 @@
 
 		if (ctx->prev_end) {
 			samp = gf_isom_new_text_sample();
-			txtin_process_send_text_sample(ctx, samp, (u64) (ts_scale*(s64)ctx->prev_end), (u32) (ts_scale*(ctx->prev_end - ctx->start)), GF_TRUE);
+			txtin_process_send_text_sample(ctx, samp, (u64) (ts_scale*(s64)ctx->prev_end), (u32) (ts_scale*(ctx->start - ctx->prev_end)), GF_TRUE);
 			gf_isom_delete_text_sample(samp);
 		}
 
@@ -1868,12 +2416,6 @@
 }
 
 
-#define CHECK_STR(__str)	\
-	if (!__str) { \
-		e = gf_import_message(import, GF_BAD_PARAM, "Invalid XML formatting (line %d)", parser.line);	\
-		goto exit;	\
-	}	\
- 
 
 static u32 ttxt_get_color(char *val)
 {
@@ -1924,6 +2466,7 @@
 			if (strstr(att->value, "Bold")) style->style_flags |= GF_TXT_STYLE_BOLD;
 			if (strstr(att->value, "Italic")) style->style_flags |= GF_TXT_STYLE_ITALIC;
 			if (strstr(att->value, "Underlined")) style->style_flags |= GF_TXT_STYLE_UNDERLINED;
+			if (strstr(att->value, "Strikethrough")) style->style_flags |= GF_TXT_STYLE_STRIKETHROUGH;
 		}
 	}
 }
@@ -1943,6 +2486,10 @@
 		return e;
 	}
 	root = gf_xml_dom_get_root(ctx->parser);
+	if (!root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Missing root \"TextStream\" element"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
 
 	if (strcmp(root->name, "TextStream")) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Invalid Timed Text file - expecting \"TextStream\" got %s", root->name));
@@ -2591,6 +3138,7 @@
 								else if (!strcmp(css_style, "font-style") && !strcmp(css_val, "italic")) styles[nb_styles].style_flags |= GF_TXT_STYLE_ITALIC;
 								else if (!strcmp(css_style, "font-weight") && !strcmp(css_val, "bold")) styles[nb_styles].style_flags |= GF_TXT_STYLE_BOLD;
 								else if (!strcmp(css_style, "text-decoration") && !strcmp(css_val, "underline")) styles[nb_styles].style_flags |= GF_TXT_STYLE_UNDERLINED;
+								else if (!strcmp(css_style, "text-decoration") && !strcmp(css_val, "strikethrough")) styles[nb_styles].style_flags |= GF_TXT_STYLE_STRIKETHROUGH;
 								else if (!strcmp(css_style, "color")) styles[nb_styles].text_color = tx3g_get_color(css_val);
 							}
 							if (!nb_styles) td.default_style = styles[0];
@@ -2857,7 +3405,7 @@
 		fevt.base.on_pid = ctx->ipid;
 		fevt.play.full_file_only = GF_TRUE;
 		gf_filter_pid_send_event(ctx->ipid, &fevt);
-		ctx->file_name = src;
+		ctx->file_name = gf_strdup(src);
 	} else {
 		if (pid != ctx->ipid) {
 			return GF_REQUIRES_NEW_INSTANCE;
@@ -2866,7 +3414,8 @@
 
 		ttxtin_reset(ctx);
 		ctx->is_setup = GF_FALSE;
-		ctx->file_name = src;
+		gf_free(ctx->file_name);
+		ctx->file_name = gf_strdup(src);
 	}
 	//guess type
 	e = gf_text_guess_format(ctx->file_name, &ctx->fmt);
@@ -2940,6 +3489,7 @@
 	char data[1];
 	GF_TXTIn *ctx = gf_filter_get_udta(filter);
 	ctx->bs_w = gf_bs_new(data, 1, GF_BITSTREAM_WRITE);
+
 	return GF_OK;
 }
 
@@ -2966,16 +3516,28 @@
 		ttml_reset_intervals(ctx);
 		gf_list_del(ctx->intervals);
 	}
+	if (ctx->ttml_resources) {
+		while (gf_list_count(ctx->ttml_resources)) {
+			TTMLRes *ires = gf_list_pop_back(ctx->ttml_resources);
+			gf_free(ires->data);
+			gf_free(ires);
+		}
+		gf_list_del(ctx->ttml_resources);
+	}
+	if (ctx->div_nodes_list)
+		gf_list_del(ctx->div_nodes_list);
+
+	if (ctx->file_name) gf_free(ctx->file_name);
 }
 
+
 static const char *txtin_probe_data(const u8 *data, u32 data_size, GF_FilterProbeScore *score)
 {
 	char *dst = NULL;
-	u8 *res;
-
-	res = gf_utf_get_utf8_string_from_bom((char *)data, data_size, &dst);
-	if (res) data = res;
-
+	char *res=NULL;
+	GF_Err e = gf_utf_get_utf8_string_from_bom((char *)data, data_size, &dst, &res);
+	if (e) return NULL;
+	
 #define PROBE_OK(_score, _mime) \
 		*score = _score;\
 		if (dst) gf_free(dst);\
@@ -3035,23 +3597,63 @@
 	{ OFFS(webvtt), "force WebVTT import of SRT files", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(nodefbox), "skip default text box", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(noflush), "skip final sample flush for srt", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(fontname), "default font to use", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(fontname), "default font", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(fontsize), "default font size", GF_PROP_UINT, "18", NULL, 0},
-	{ OFFS(lang), "default language to use", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(width), "default width of text area, set to 0 to resolve against visual PIDs", GF_PROP_UINT, "0", NULL, 0},
-	{ OFFS(height), "default height of text area, set to 0 to resolve against visual PIDs", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(lang), "default language", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(width), "default width of text area", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(height), "default height of text area", GF_PROP_UINT, "0", NULL, 0},
 	{ OFFS(txtx), "default horizontal offset of text area: -1 (left), 0 (center) or 1 (right)", GF_PROP_UINT, "0", NULL, 0},
 	{ OFFS(txty), "default vertical offset of text area: -1 (bottom), 0 (center) or 1 (top)", GF_PROP_UINT, "0", NULL, 0},
 	{ OFFS(zorder), "default z-order of the PID", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(timescale), "default timescale of the PID", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ttml_dur), "force single sample mode", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ttml_embed), "force embedding TTML resources", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ttml_zero), "set subtitle zero time for TTML", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };
 
 GF_FilterRegister TXTInRegister = {
 	.name = "txtin",
 	GF_FS_SET_DESCRIPTION("Subtitle loader")
-	GF_FS_SET_HELP("This filter reads subtitle data (srt/webvtt/ttxt/sub) to produce media PIDs and frames.\n"
-	"The TTXT documentation is available at https://wiki.gpac.io/TTXT-Format-Documentation\n"
+	GF_FS_SET_HELP("This filter reads subtitle data from input file PID to produce subtitle frames on a single PID.\n"
+	"The filter supports the following formats:\n"
+	"- SRT: https://en.wikipedia.org/wiki/SubRip\n"
+	"- WebVTT: https://www.w3.org/TR/webvtt1/\n"
+	"- TTXT: https://wiki.gpac.io/TTXT-Format-Documentation\n"
+	"- QT 3GPP Text XML (TexML): Apple QT6, likely deprecated\n"
+	"- TTML: https://www.w3.org/TR/ttml2/\n"
+	"- SUB: one subtitle per line formatted as `{start_frame}{end_frame}text`\n"
+	"\n"
+	"Input files must be in UTF-8 or UTF-16 format, with or without BOM. The internal frame format is: \n"
+	"- WebVTT (and srt if desired): ISO/IEC 14496-30 VTT cues\n"
+	"- TTML: ISO/IEC 14496-30 XML subtitles\n"
+	"- Others: 3GPP/QT Timed Text\n"
+	"\n"
+	"# TTML Support\n"
+	"The [-ttml_dur]() option controls how the TTML document is split into packets:\n"
+	"- if negative (default), TTML document is split in independent time segments by inspecting all overlapping subtitles in the body\n"
+	"- if 0, the input document is not split, forwarded as a single frame with `CTS` matching the first active time in document and a duration equal to the document duration\n"
+	"- if >0, the input document is not split, forwarded as a single frame with `CTS=0` and the specified duration in `timescale` units.\n"
+	"\n"
+	"By default, media resources are kept as declared in TTML2 documents.\n"
+	"\n"
+	"[-ttml_embed]() can be used to embed inside the TTML sample the resources in `<head>` or `<body>`:\n"
+	"- for `<source>`, `<image>`, `<audio>`, ``, local URIs indicated in `src` will be loaded and `src` rewritten.\n"
+	"- for `<data>` with base64 coding, the data will be decoded, `<data>` element removed and parent <source> rewritten with `src` attribute inserted.\n"
+	"\nThe embedded data is added as a subsample to the TTML frame, and the referring elements will use `src=urn:mpeg:14496-30:N` with `N` the index of the subsample.\n"
+	"\n"
+	"A `subtitle zero` may be specified using [-ttml_zero](). This will remove all subtitles before the given time `T0`, and rewrite each subtitle begin/end `T` to `T-T0` using millisecond accuracy.\n"
+	"Warning: Original time formatting (tick, frames/subframe ...) will be lost when this option is used, converted to `HH:MM:SS.ms`.\n"
+	"\n"
+	"The subtitle zero time **must** be prefixed with `T` when the option is not set as a global argument:\n"
+	"EX gpac -i test.ttml:ttml_zero=T10:00:00 [...]\n"
+	"EX MP4Box -add test.ttml:sopt:ttml_zero=T10:00:00 [...]\n"
+	"EX gpac -i test.ttml --ttml_zero=10:00:00 [...]\n"
+	"EX gpac -i test.ttml --ttml_zero=T10:00:00 [...]\n"
+	"EX MP4Box -add test.ttml --ttml_zero=10:00:00 [...]\n"
+
+
+
 	)
 
 	.private_size = sizeof(GF_TXTIn),

gpac-1.0.1.tar.gz/src/filters/mux_avi.c -> gpac-2.0.0.tar.gz/src/filters/mux_avi.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2019
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / AVI output filter
@@ -102,6 +102,7 @@
 static GF_Err avimux_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	AVIStream *stream;
+	Bool strip_box_header=GF_FALSE;
 	GF_FilterEvent evt;
 	const GF_PropertyValue *p;
 	u32 w, h, sr, stride, bps, nb_ch, pf, codec_id, type, br, timescale, wfmt;
@@ -174,6 +175,7 @@
 //		break;
 	case GF_CODECID_MPEG_AUDIO:
 	case GF_CODECID_MPEG2_PART3:
+	case GF_CODECID_MPEG_AUDIO_L1:
 		wfmt = 0x55;
 		break;
 	case GF_CODECID_AAC_MPEG4:
@@ -199,8 +201,31 @@
 		}
 		break;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIOut] Unsupported codec %s for AVI error\n", gf_codecid_name(codec_id) ));
-		return GF_NOT_SUPPORTED;
+		p = gf_filter_pid_get_property_str(pid, "AVIType");
+		if (p) {
+			if ((p->type==GF_PROP_UINT) || (p->type==GF_PROP_4CC)) {
+				if (type==GF_STREAM_VISUAL)
+					strcpy(ctx->comp_name, gf_4cc_to_str(p->value.uint));
+				else
+					wfmt = p->value.uint;
+				break;
+			}
+			else if ((p->type==GF_PROP_STRING) && p->value.string) {
+				char *str = p->value.string;
+				if (str[0]=='+') {
+					strip_box_header = GF_TRUE;
+					str+=1;
+				}
+				if (type==GF_STREAM_VISUAL)
+					strncpy(ctx->comp_name, str, 4);
+				else
+					wfmt = gf_4cc_parse(str);
+				break;
+			}
+		}
+		strcpy(ctx->comp_name, gf_4cc_to_str(codec_id));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AVIOut] Muxing codec %s to unknown AVI type %s, set property `AVIType` on input PID to override\n", gf_codecid_name(codec_id), ctx->comp_name));
+		break;
 	}
 
 	if (!stream) {
@@ -277,6 +302,28 @@
 		avimux_open_close(ctx, szPath, NULL, 0);
 	}
 
+	if (stream->width) {
+		if (ctx->avi_out->extradata) gf_free(ctx->avi_out->extradata);
+		ctx->avi_out->extradata = NULL;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		if (p) {
+			u8 *data = p->value.data.ptr;
+			u32 data_size = p->value.data.size;
+			if (strip_box_header) {
+				u32 size = data[0]; size<<=8;
+				size |= data[1]; size<<=8;
+				size |= data[2]; size<<=8;
+				size |= data[3];
+				if (size == data_size) {
+					data += 8;
+					data_size -= 8;
+				}
+			}
+			ctx->avi_out->extradata_size = data_size;
+			ctx->avi_out->extradata = gf_malloc(data_size);
+			memcpy(ctx->avi_out->extradata, data, data_size);
+		}
+	}
 	return GF_OK;
 }
 
@@ -366,8 +413,7 @@
 			if (cts==GF_FILTER_NO_TS) {
 
 			} else {
-				cts *= 1000;
-				cts /= st->timescale;
+				cts = gf_timestamp_rescale(cts, st->timescale, 1000);
 				if (!ctx->video_is_eos && (cts > ctx->last_video_time_ms))
 				 	break;
 			}
@@ -467,8 +513,8 @@
 		if (cts!=GF_FILTER_NO_TS) {
 			u32 dur = gf_filter_pck_get_duration(pck);
 			cts += dur;
-			cts *= 1000;
-			cts /= video_st->timescale;
+
+			cts = gf_timestamp_rescale(cts, video_st->timescale, 1000);
 			ctx->last_video_time_ms = cts + 1;
 		} else {
 			ctx->last_video_time_ms ++;
@@ -533,21 +579,39 @@
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_RAW),
 	{0},
+	//unframed video streams
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AVC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VVC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AV1),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
 	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
 	{0},
+	//all other video streams
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_CODECID, GF_CODECID_AVC),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_CODECID, GF_CODECID_VVC),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	{0},
+	//unframed audio streams
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG4),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_MP),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_LCP),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_SSRP),
-	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	/*we take adts as input*/
+	CAP_BOOL(GF_CAPS_INPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	{0},
+	//all other audio streams
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_PART3),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG4),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_MP),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_LCP),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_SSRP),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 };
 
 static const GF_FilterCapability AVIMuxCapsNoRAW[] =
@@ -562,22 +626,30 @@
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_MP),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_LCP),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_SSRP),
+	/*we take adts as input*/
 	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
 	{0},
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_PART3),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO_L1),
+	/*we want full MPEG-1/2 audio frames as input*/
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 };
 
 
 GF_FilterRegister AVIMuxRegister = {
 	.name = "avimx",
-	GF_FS_SET_DESCRIPTION("AVI muxer")
+	GF_FS_SET_DESCRIPTION("AVI multiplexer")
 	GF_FS_SET_HELP("This filter multiplexes raw or compressed audio and video to produce an AVI output.\n"
 		"\n"
 		"Unlike other multiplexing filters in GPAC, this filter is a sink filter and does not produce any PID to be redirected in the graph.\n"
 		"The filter can however use template names for its output, using the first input PID to resolve the final name.\n"
 		"The filter watches the property `FileNumber` on incoming packets to create new files.\n"
+		"\n"
+		"The filter will look for property `AVIType` set on the input stream.\n"
+		"The value can either be a 4CC or a string, indicating the mux format for the PID.\n"
+		"If the string is prefixed with `+` and the decoder configuration is present and formatted as an ISOBMFF box, the box header will be removed.\n"
 	)
 	.private_size = sizeof(GF_AVIMuxCtx),
 	.max_extra_pids = -1,

gpac-1.0.1.tar.gz/src/filters/mux_gsf.c -> gpac-2.0.0.tar.gz/src/filters/mux_gsf.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2019
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / GPAC stream serializer filter
@@ -40,15 +40,17 @@
 	u8 config_version;
 	u64 last_cts_config;
 	u32 timescale;
+	u32 is_file;
 } GSFStream;
 
 typedef struct
 {
 	//opts
-	Bool sigsn, sigdur, sigbo, sigdts, minp;
+	Bool sigsn, sigdur, sigbo, sigdts, minp, mixed;
 	u32 dbg;
 	const char *magic;
 	const char *skp;
+	const char *ext, *mime, *dst;
 	GF_PropData key;
 	GF_PropData IV;
 	GF_Fraction pattern;
@@ -73,6 +75,9 @@
 
 	u32 nb_frames;
 	u32 nb_pck;
+
+	GF_FilterCapability caps[4];
+	Bool filemode;
 } GSFMxCtx;
 
 
@@ -164,13 +169,13 @@
 	//reset IV at each packet
 	gf_crypt_set_IV(ctx->crypt, ctx->crypt_IV, 16);
 	if (ctx->pattern.den && ctx->pattern.num) {
-		//u32 pos = 0;
+		u32 bytes_per_pattern = 16 * (ctx->pattern.num + ctx->pattern.den);
+		u32 offset = 0;
 		while (nb_crypt_bytes) {
-			u32 bbytes = 16 * (ctx->pattern.num + ctx->pattern.den);
-			gf_crypt_encrypt(ctx->crypt, data, nb_crypt_bytes >= (u32) (16*ctx->pattern.num) ? 16*ctx->pattern.num : nb_crypt_bytes);
-			if (nb_crypt_bytes >= bbytes) {
-				//pos += bbytes;
-				nb_crypt_bytes -= bbytes;
+			gf_crypt_encrypt(ctx->crypt, data + offset, nb_crypt_bytes >= (u32) (16*ctx->pattern.num) ? 16*ctx->pattern.num : nb_crypt_bytes);
+			if (nb_crypt_bytes >= bytes_per_pattern) {
+				offset += bytes_per_pattern;
+				nb_crypt_bytes -= bytes_per_pattern;
 			} else {
 				nb_crypt_bytes = 0;
 			}
@@ -221,6 +226,7 @@
 		osize = hdr_size + to_write;
 
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, osize, &output);
+		if (!dst_pck) return;
 
 		//format header
 		gf_bs_reassign_buffer(ctx->bs_w, output, osize);
@@ -311,8 +317,20 @@
 	gsfmx_send_packets(ctx, gst, GFS_PCKTYPE_PID_EOS, is_eos, GF_FALSE, 0, 0);
 }
 
-static Bool gsfmx_can_serialize_prop(const GF_PropertyValue *p)
+static Bool gsfmx_can_serialize_prop(const GF_PropertyValue *p, u32 prop_4cc)
 {
+	if (prop_4cc) {
+		u32 prop_type = gf_props_4cc_get_type(prop_4cc);
+		//prop_type can be 0 for unit test filters !!
+		if (prop_type
+			&& !gf_props_type_is_enum(prop_type)
+			&& (gf_props_get_base_type(prop_type) != gf_props_get_base_type(p->type))
+		) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Mismatch between property advertised type (%s) and built-in type (%s) for %s, not serializing !\n\tPlease contact GPAC team or the developers of third-party filters used if any (run with -graph)\n", gf_props_get_type_name(p->type), gf_props_get_type_name(prop_type), gf_props_4cc_get_name(prop_4cc)));
+			return GF_FALSE;
+		}
+	}
+
 	switch (p->type) {
 	case GF_PROP_POINTER:
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[GSFMux] Cannot serialize pointer property, ignoring !!\n"));
@@ -331,10 +349,11 @@
 	switch (p->type) {
 	case GF_PROP_SINT:
 	case GF_PROP_UINT:
-	case GF_PROP_PIXFMT:
-	case GF_PROP_PCMFMT:
 		gsfmx_write_vlen(ctx, p->value.uint);
 		break;
+	case GF_PROP_4CC:
+		gf_bs_write_u32(ctx->bs_w, p->value.uint);
+		break;
 	case GF_PROP_LSINT:
 	case GF_PROP_LUINT:
 		gf_bs_write_u64(ctx->bs_w, p->value.longuint);
@@ -369,23 +388,12 @@
 		gsfmx_write_vlen(ctx, p->value.vec3i.y);
 		gsfmx_write_vlen(ctx, p->value.vec3i.z);
 		break;
-	case GF_PROP_VEC3:
-		gf_bs_write_double(ctx->bs_w, p->value.vec3.x);
-		gf_bs_write_double(ctx->bs_w, p->value.vec3.y);
-		gf_bs_write_double(ctx->bs_w, p->value.vec3.z);
-		break;
 	case GF_PROP_VEC4I:
 		gsfmx_write_vlen(ctx, p->value.vec4i.x);
 		gsfmx_write_vlen(ctx, p->value.vec4i.y);
 		gsfmx_write_vlen(ctx, p->value.vec4i.z);
 		gsfmx_write_vlen(ctx, p->value.vec4i.w);
 		break;
-	case GF_PROP_VEC4:
-		gf_bs_write_double(ctx->bs_w, p->value.vec4.x);
-		gf_bs_write_double(ctx->bs_w, p->value.vec4.y);
-		gf_bs_write_double(ctx->bs_w, p->value.vec4.z);
-		gf_bs_write_double(ctx->bs_w, p->value.vec4.w);
-		break;
 	case GF_PROP_STRING:
 	case GF_PROP_STRING_NO_COPY:
 	case GF_PROP_NAME:
@@ -404,10 +412,10 @@
 
 	//string list: memory is ALWAYS duplicated
 	case GF_PROP_STRING_LIST:
-		len2 = gf_list_count(p->value.string_list);
+		len2 = p->value.string_list.nb_items;
 		gsfmx_write_vlen(ctx, len2);
 		for (i=0; i<len2; i++) {
-			const char *str = gf_list_get(p->value.string_list, i);
+			const char *str = p->value.string_list.vals[i];
 			len = (u32) strlen(str);
 			gsfmx_write_vlen(ctx, len);
 			gf_bs_write_data(ctx->bs_w, str, len);
@@ -415,16 +423,36 @@
 		break;
 
 	case GF_PROP_UINT_LIST:
+	case GF_PROP_SINT_LIST:
 		len = p->value.uint_list.nb_items;
 		gsfmx_write_vlen(ctx, len);
 		for (i=0; i<len; i++) {
 			gsfmx_write_vlen(ctx, p->value.uint_list.vals[i] );
 		}
 		break;
+	case GF_PROP_4CC_LIST:
+		len = p->value.uint_list.nb_items;
+		gsfmx_write_vlen(ctx, len);
+		for (i=0; i<len; i++) {
+			gf_bs_write_u32(ctx->bs_w, p->value.uint_list.vals[i] );
+		}
+		break;
+	case GF_PROP_VEC2I_LIST:
+		len = p->value.v2i_list.nb_items;
+		gsfmx_write_vlen(ctx, len);
+		for (i=0; i<len; i++) {
+			gsfmx_write_vlen(ctx, p->value.v2i_list.vals[i].x );
+			gsfmx_write_vlen(ctx, p->value.v2i_list.vals[i].y );
+		}
+		break;
 	case GF_PROP_POINTER:
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[GSFMux] Cannot serialize pointer property, ignoring !!\n"));
 		break;
 	default:
+		if (gf_props_type_is_enum(p->type)) {
+			gsfmx_write_vlen(ctx, p->value.uint);
+			break;
+		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Cannot serialize property of unknown type, ignoring !!\n"));
 		break;
 	}
@@ -432,6 +460,9 @@
 
 static GFINLINE Bool gsfmx_is_prop_skip(GSFMxCtx *ctx, u32 prop_4cc, const char *prop_name, u8 sep_l)
 {
+	if (prop_name && !strcmp(prop_name, "reframer_rem_edits"))
+		return GF_TRUE;
+
 	if (ctx->minp) {
 		u8 flags;
 		if (prop_name) return GF_TRUE;
@@ -460,6 +491,9 @@
 
 static void gsfmx_write_pid_config(GF_Filter *filter, GSFMxCtx *ctx, GSFStream *gst)
 {
+	const char *force_fext=NULL;
+	const char *force_mime=NULL;
+	const char *force_url=NULL;
 	u32 nb_4cc_props=0;
 	u32 nb_str_props=0;
 	u32 idx=0;
@@ -470,31 +504,88 @@
 		const char *prop_name;
 		const GF_PropertyValue *p = gf_filter_pid_enum_properties(gst->pid, &idx, &prop_4cc, &prop_name);
 		if (!p) break;
-		if (!gsfmx_can_serialize_prop(p)) continue;
+		if (!gsfmx_can_serialize_prop(p, prop_4cc)) continue;
 		if ( gsfmx_is_prop_skip(ctx, prop_4cc, prop_name, sep_l) )
 			continue;
 		if (prop_4cc) {
 			if (gf_props_4cc_get_type(prop_4cc) == GF_PROP_FORBIDEN) {
 				nb_str_props++;
-			} else {
-				nb_4cc_props++;
+			}
+			//file, only send mime, url, ext and streamtype
+			else if (!gst->is_file) {
+				if (prop_4cc != GF_PROP_PID_MUX_SRC)
+					nb_4cc_props++;
 			}
 		}
 		else if (prop_name)
 			nb_str_props++;
 	}
 
+	//file, send mime, url, ext and streamtype
+	if (gst->is_file) {
+		GSFMxCtx *alias_ctx = gf_filter_pid_get_alias_udta(gst->pid);
+		if (alias_ctx) {
+			force_fext = gf_file_ext_start(alias_ctx->dst);
+			if (force_fext) force_fext++;
+			force_url = alias_ctx->dst ? alias_ctx->dst : NULL;
+			force_mime = alias_ctx->mime;
+		} else {
+			const GF_PropertyValue *p = gf_filter_pid_get_property(gst->pid, GF_PROP_PID_FILE_EXT);
+			force_fext = (p && p->value.string) ? p->value.string : ctx->ext;
+			p = gf_filter_pid_get_property(gst->pid, GF_PROP_PID_MIME);
+			force_mime = (p && p->value.string) ? p->value.string : ctx->mime;
+			force_url = ctx->dst;
+			if (!force_url) force_url = "file";
+		}
+		nb_4cc_props++;
+		if (force_url)
+			nb_4cc_props++;
+		if (force_mime)
+			nb_4cc_props++;
+		if (force_fext)
+			nb_4cc_props++;
+	}
 	gf_bs_write_u8(ctx->bs_w, gst->config_version);
 	gsfmx_write_vlen(ctx, nb_4cc_props);
 	gsfmx_write_vlen(ctx, nb_str_props);
 
+	if (gst->is_file) {
+		GF_PropertyValue prop;
+
+		gf_bs_write_u32(ctx->bs_w, GF_PROP_PID_STREAM_TYPE);
+		prop.type = GF_PROP_UINT;
+		prop.value.uint = GF_STREAM_FILE;
+		gsfmx_write_prop(ctx, &prop);
+
+		if (force_url) {
+			gf_bs_write_u32(ctx->bs_w, GF_PROP_PID_URL);
+			prop.type = GF_PROP_STRING;
+			prop.value.string = (char *) force_url;
+			gsfmx_write_prop(ctx, &prop);
+		}
+
+		if (force_mime) {
+			gf_bs_write_u32(ctx->bs_w, GF_PROP_PID_MIME);
+			prop.type = GF_PROP_STRING;
+			prop.value.string = (char *) force_mime;
+			gsfmx_write_prop(ctx, &prop);
+		}
+		if (force_fext) {
+			gf_bs_write_u32(ctx->bs_w, GF_PROP_PID_FILE_EXT);
+			prop.type = GF_PROP_STRING;
+			prop.value.string = (char *) force_fext;
+			gsfmx_write_prop(ctx, &prop);
+		}
+	}
+
+
 	idx=0;
 	while (1) {
 		u32 prop_4cc;
 		const char *prop_name;
 		const GF_PropertyValue *p = gf_filter_pid_enum_properties(gst->pid, &idx, &prop_4cc, &prop_name);
 		if (!p) break;
-		if (!gsfmx_can_serialize_prop(p)) continue;
+		if (!gsfmx_can_serialize_prop(p, prop_4cc)) continue;
 
 		if (prop_name) continue;
 		if (gf_props_4cc_get_type(prop_4cc) == GF_PROP_FORBIDEN)
@@ -503,9 +594,22 @@
 		if ( gsfmx_is_prop_skip(ctx, prop_4cc, prop_name, sep_l) )
 			continue;
 
+		if (gst->is_file) {
+			continue;
+		}
+		if (prop_4cc == GF_PROP_PID_MUX_SRC)
+			continue;
+
 		gf_bs_write_u32(ctx->bs_w, prop_4cc);
 
 		gsfmx_write_prop(ctx, p);
+
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_DEBUG)) {
+			char dump[GF_PROP_DUMP_ARG_SIZE];
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[GSFMux] Write pid %d %s property to %s\n", gst->idx, gf_props_4cc_get_name(prop_4cc), gf_props_dump(prop_4cc, p, dump, GF_PROP_DUMP_DATA_NONE) ) );
+		}
+#endif
 	}
 
 	idx=0;
@@ -514,7 +618,7 @@
 		const char *prop_name;
 		const GF_PropertyValue *p = gf_filter_pid_enum_properties(gst->pid, &idx, &prop_4cc, &prop_name);
 		if (!p) break;
-		if (!gsfmx_can_serialize_prop(p)) continue;
+		if (!gsfmx_can_serialize_prop(p, prop_4cc)) continue;
 		if (prop_4cc && (gf_props_4cc_get_type(prop_4cc) != GF_PROP_FORBIDEN)) continue;
 
 		if ( gsfmx_is_prop_skip(ctx, prop_4cc, prop_name, sep_l) )
@@ -528,6 +632,13 @@
 
 		gf_bs_write_u8(ctx->bs_w, p->type);
 		gsfmx_write_prop(ctx, p);
+
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_DEBUG)) {
+			char dump[GF_PROP_DUMP_ARG_SIZE];
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[GSFMux] Write pid %d %s property to %s\n", gst->idx, prop_name ? prop_name : gf_props_4cc_get_name(prop_4cc), gf_props_dump(prop_4cc, p, dump, GF_PROP_DUMP_DATA_NONE) ) );
+		}
+#endif
 	}
 }
 
@@ -552,7 +663,7 @@
 	//header:signature
 	gf_bs_write_u32(ctx->bs_w, GF_4CC('G','S','5','F') );
 	//header protocol version
-	gf_bs_write_u8(ctx->bs_w, 1);
+	gf_bs_write_u8(ctx->bs_w, GF_GSF_VERSION);
 
 	if (ctx->crypt) {
 		gf_bs_write_data(ctx->bs_w, ctx->crypt_IV, 16);
@@ -613,7 +724,7 @@
 		const char *prop_name;
 		p = gf_filter_pck_enum_properties(pck, &idx, &prop_4cc, &prop_name);
 		if (!p) break;
-		if (!gsfmx_can_serialize_prop(p)) continue;
+		if (!gsfmx_can_serialize_prop(p, prop_4cc)) continue;
 		if (prop_4cc) {
 			if (gf_props_4cc_get_type(prop_4cc) == GF_PROP_FORBIDEN)
 				nb_str_props++;
@@ -669,7 +780,7 @@
 	//if durmode>0, dur on ts_diff_mode
 	//if sap==4, roll on signed 16 bits
 	//if (has sample deps) sample_deps_flags on 8 bits
-	//if has_carousel, carrousel version on 8 bits
+	//if has_carousel, carousel version on 8 bits
 	//if has_byteoffset, byte offset on 64 bits
 	//if (has builtin) vlen nb builtin_props then props[builtin_props]
 	//if (has props) vlen nb_str_props then props[nb_str_props]
@@ -809,7 +920,7 @@
 			const char *prop_name;
 			p = gf_filter_pck_enum_properties(pck, &idx, &prop_4cc, &prop_name);
 			if (!p) break;
-			if (!gsfmx_can_serialize_prop(p)) continue;
+			if (!gsfmx_can_serialize_prop(p, prop_4cc)) continue;
 			if (prop_name) continue;
 			if (gf_props_4cc_get_type(prop_4cc) == GF_PROP_FORBIDEN) continue;
 
@@ -826,7 +937,7 @@
 			const char *prop_name;
 			p = gf_filter_pck_enum_properties(pck, &idx, &prop_4cc, &prop_name);
 			if (!p) break;
-			if (!gsfmx_can_serialize_prop(p)) continue;
+			if (!gsfmx_can_serialize_prop(p, prop_4cc)) continue;
 			if (prop_4cc && (gf_props_4cc_get_type(prop_4cc) != GF_PROP_FORBIDEN)) continue;
 			if (!prop_name) prop_name = gf_4cc_to_str(prop_4cc);
 			len = (u32) strlen(prop_name);
@@ -856,7 +967,7 @@
 	} else if (data) {
 		u32 nb_write = gf_bs_write_data(ctx->bs_w, data, frame_size);
 		if (nb_write != frame_size) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GSFMux] Write error, wrote %d bytes but had %d to write\n", nb_write, frame_size));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Write error, wrote %d bytes but had %d to write\n", nb_write, frame_size));
 		}
 		gsfmx_send_packets(ctx, gst, GFS_PCKTYPE_PCK, GF_FALSE, GF_FALSE, frame_size, frame_hdr_size);
 	} else if (frame_ifce) {
@@ -867,7 +978,7 @@
 			u32 out_stride = i ? stride_uv : stride;
 			GF_Err e = frame_ifce->get_plane(frame_ifce, i, &out_ptr, &out_stride);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GSFMux] Failed to fetch plane data from hardware frame, cannot write\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Failed to fetch plane data from hardware frame, cannot write\n"));
 				break;
 			}
 			write_h = h;
@@ -876,7 +987,7 @@
 			for (j=0; j<write_h; j++) {
 				u32 nb_write = (u32) gf_bs_write_data(ctx->bs_w, out_ptr, lsize);
 				if (nb_write != lsize) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GSFMux] Write error, wrote %d bytes but had %d to write\n", nb_write, lsize));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Write error, wrote %d bytes but had %d to write\n", nb_write, lsize));
 				}
 				out_ptr += out_stride;
 			}
@@ -893,11 +1004,12 @@
 
 	if (is_remove) {
 		gst = gf_filter_pid_get_udta(pid);
-		assert(gst);
+		if (!gst) return GF_OK;
+
 		gsfmx_send_pid_rem(ctx, gst);
 		gf_list_del_item(ctx->streams, gst);
 		gf_free(gst);
-		if (!gf_list_count(ctx->streams)) {
+		if (!gf_list_count(ctx->streams) && ctx->opid) {
 			gf_filter_pid_remove(ctx->opid);
 			ctx->opid = NULL;
 		}
@@ -934,14 +1046,13 @@
 		gst->timescale = 1000;
 		if (p && p->value.uint) gst->timescale = p->value.uint;
 
-		gsfmx_send_pid_config(filter, ctx, gst, GF_FALSE, GF_FALSE);
-
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+		if (p && (p->value.uint==GF_STREAM_FILE)) gst->is_file = GF_TRUE;
 	} else {
 		if (p && p->value.uint) gst->timescale = p->value.uint;
 		gst->last_cts_config = 0;
-		gsfmx_send_pid_config(filter, ctx, gst, GF_FALSE, GF_FALSE);
-
 	}
+	gsfmx_send_pid_config(filter, ctx, gst, GF_FALSE, GF_FALSE);
 	return GF_OK;
 }
 
@@ -997,9 +1108,50 @@
 	return GF_FALSE;
 }
 
+
+
+
+
 static GF_Err gsfmx_initialize(GF_Filter *filter)
 {
 	GSFMxCtx *ctx = gf_filter_get_udta(filter);
+	const char *ext = ctx->ext;
+
+	if (!ext && ctx->dst) {
+		ext = gf_file_ext_start(ctx->dst);
+		if (ext) ext++;
+	}
+
+	if (!gf_filter_is_dynamic(filter) && (ext || ctx->mime)) {
+		ctx->caps[0].code =	GF_PROP_PID_STREAM_TYPE;
+		ctx->caps[0].val = PROP_UINT(GF_STREAM_FILE);
+		ctx->caps[0].flags = GF_CAPS_INPUT_OUTPUT;
+
+		ctx->caps[1].code =	ctx->mime ? GF_PROP_PID_MIME : GF_PROP_PID_FILE_EXT;
+		ctx->caps[1].val = ctx->mime ? PROP_STRING(ctx->mime) : PROP_STRING(ext);
+		ctx->caps[1].flags = GF_CAPS_INPUT;
+
+		ctx->caps[2].code =	GF_PROP_PID_FILE_EXT;
+		ctx->caps[2].val = PROP_STRING("gsf");
+		ctx->caps[2].flags = GF_CAPS_OUTPUT;
+
+		ctx->caps[3].code =	GF_PROP_PID_MIME;
+		ctx->caps[3].val = PROP_STRING("application/x-gpac-sf");
+		ctx->caps[3].flags = GF_CAPS_OUTPUT;
+
+		gf_filter_override_caps(filter, ctx->caps, 4);
+
+		if (gf_filter_is_alias(filter) && ctx->mixed) {
+			ctx->caps[0].code =	GF_PROP_PID_STREAM_TYPE;
+			ctx->caps[0].val = PROP_UINT(GF_STREAM_UNKNOWN);
+			ctx->caps[0].flags = GF_CAPS_INPUT_EXCLUDED;
+			return GF_OK;
+		}
+
+		gf_filter_act_as_sink(filter);
+		ctx->filemode = GF_TRUE;
+	}
+
 
 	gf_rand_init(GF_FALSE);
 
@@ -1049,6 +1201,7 @@
 
 	ctx->is_start = GF_TRUE;
 
+
 	return GF_OK;
 }
 
@@ -1068,6 +1221,12 @@
 #endif
 }
 
+static Bool gsfmx_use_alias(GF_Filter *filter, const char *url, const char *mime)
+{
+	GSFMxCtx *ctx = gf_filter_get_udta(filter);
+	return ctx->filemode;
+}
+
 static const GF_FilterCapability GSFMxCaps[] =
 {
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
@@ -1092,34 +1251,40 @@
 	"- nodata: force packet size to 0\n"
 	"- nopck: skip packet", GF_PROP_UINT, "no", "no|nodata|nopck", GF_FS_ARG_HINT_EXPERT},
 #ifndef GPAC_DISABLE_CRYPTO
-	{ OFFS(key), "encrypt packets using given key - see filter helps", GF_PROP_DATA, NULL, NULL, 0},
+	{ OFFS(key), "encrypt packets using given key", GF_PROP_DATA, NULL, NULL, 0},
 	{ OFFS(IV), "set IV for encryption - a constant IV is used to keep packet overhead small (cbcs-like)", GF_PROP_DATA, NULL, NULL, 0},
-	{ OFFS(pattern), "set nb crypt / nb_skip block pattern. default is all encrypted", GF_PROP_FRACTION, "1/0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(pattern), "set nb_crypt / nb_skip block pattern. default is all encrypted", GF_PROP_FRACTION, "1/0", NULL, GF_FS_ARG_HINT_ADVANCED},
 #endif // GPAC_DISABLE_CRYPTO
 	{ OFFS(mpck), "set max packet size. 0 means no fragmentation (each AU is sent in one packet)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(magic), "magic string to append in setup packet", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(skp), "comma separated list of pid property names to skip - see filter help", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(minp), "include only the minimum set of properties required for stream processing - see filter help", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(crate), "carousel period for tune-in info in seconds - see filter help", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(skp), "comma separated list of PID property names to skip", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(minp), "include only the minimum set of properties required for stream processing", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(crate), "carousel period for tune-in info in seconds", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ext), "file extension for file mode", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(dst), "target URL in file mode", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_SINK_ALIAS},
+	{ OFFS(mime), "file mime for file mode", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_HIDE},
+	{ OFFS(mixed), "allow GSF to contain both files and media streams", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_SINK_ALIAS},
+
 	{0}
 };
 
 
 GF_FilterRegister GSFMxRegister = {
 	.name = "gsfmx",
-	GF_FS_SET_DESCRIPTION("GSF Muxer")
+	GF_FS_SET_DESCRIPTION("GSF Multiplexer")
 #ifndef GPAC_DISABLE_DOC
-	.help = "This filter provides GSF (__GPAC Super/Simple/Serialized/Stream/State Format__) multiplexing.\n"
+	.help = "This filter provides GSF (__GPAC Serialized Format__) multiplexing.\n"
 			"It serializes the stream states (config/reconfig/info update/remove/eos) and packets of input PIDs. "
 			"This allows either saving to file a session, or forwarding the state/data of streams to another instance of GPAC "
 			"using either pipes or sockets. Upstream events are not serialized.\n"
 			"\n"
-			"The default behaviour does not insert sequence numbers. When running over general protocols not ensuring packet order, this should be inserted.\n"
-			"The serializer sends tune-in packets (global and per pid) at the requested carousel rate - if 0, no carousel. These packets are marked as redundant so that they can be discarded by output filters if needed.\n"
+			"The default behavior does not insert sequence numbers. When running over general protocols not ensuring packet order, this should be inserted.\n"
+			"The serializer sends tune-in packets (global and per PID) at the requested carousel rate - if 0, no carousel. These packets are marked as redundant so that they can be discarded by output filters if needed.\n"
 			"\n"
 #ifndef GPAC_DISABLE_CRYPTO
+			"# Encryption\n"
 			"The stream format can be encrypted in AES 128 CBC mode. For all packets, the packet header (header, size, frame size/block offset and optional seq num) are in the clear "
-			"and the followings byte until the last byte of the last multiple of block size (16) fitting in the payload are encrypted.\n"
+			"and the following bytes until the last byte of the last multiple of block size (16) fitting in the payload are encrypted.\n"
 			"For data packets, each fragment is encrypted individually to avoid error propagation in case of losses.\n"
 			"For other packets, the entire packet is encrypted before fragmentation (fragments cannot be processed individually).\n"
 			"For header/tunein packets, the first 25 bytes after the header are in the clear (signature,version,IV and pattern).\n"
@@ -1127,12 +1292,25 @@
 			"Pattern mode can be used (cf CENC cbcs) to encrypt K block and leave N blocks in the clear.\n"
 			"\n"
 #endif
-			"The header/tunein packet may get quite big when all pid properties are kept. In order to help reduce its size, the [-minp]() option can be used: "
-			"this will remove all built-in properties marked as dropable (cf property help) as well as all non built-in properties.\n"
+			"# Filtering properties\n"
+			"The header/tunein packet may get quite big when all PID properties are kept. In order to help reduce its size, the [-minp]() option can be used: "
+			"this will remove all built-in properties marked as droppable (cf property help) as well as all non built-in properties.\n"
 			"The [-skp]() option may also be used to specify which property to drop:\n"
-			"EX skp=\"4CC1,Name2\n"\
-			"This will remove properties of type 4CC1 and properties (built-in or not) of name Name2.\n"
+			"EX skp=\"4CC1,Name2\n"
+			"This will remove properties of type `4CC1` and properties (built-in or not) of name `Name2`.\n"
+			"\n"
+			"# File mode\n"
+			"By default the filter only accepts framed media streams as input PID, not files. This can be changed by explicitly loading the filter with [-ext]() or [-dst]() set.\n"
+			"EX gpac -i source.mp4 gsfmx:dst=manifest.mpd -o dump.gsf\n"
+			"This will DASH the source and store every files produced as PIDs in the GSF mux.\n"
+			"In order to demultiplex such a file, the `gsfdmx`filter will likely need to be explicitly loaded:\n"
+			"EX gpac -i mux.gsf gsfdmx -o dump/$File$:dynext:clone\n"
+			"This will extract all files from the GSF mux.\n"
 			"\n"
+			"By default when working in file mode, the filter only accepts PIDs of type `file` as input.\n"
+			"To allow a mix of files and streams, use [-mixed]():\n"
+			"EX gpac -i source.mp4 gsfmx:dst=manifest.mpd:mixed -o dump.gsf\n"
+			"This will DASH the source, store the manifest file and the media streams with their packet properties in the GSF mux.\n"
 		,
 #endif
 	.private_size = sizeof(GSFMxCtx),
@@ -1145,6 +1323,7 @@
 	.configure_pid = gsfmx_configure_pid,
 	.process = gsfmx_process,
 	.process_event = gsfmx_process_event,
+	.use_alias = gsfmx_use_alias
 };

gpac-1.0.1.tar.gz/src/filters/mux_isom.c -> gpac-2.0.0.tar.gz/src/filters/mux_isom.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISOBMF mux filter
@@ -37,13 +37,14 @@
 #define GF_VENDOR_GPAC		GF_4CC('G','P','A','C')
 
 
-#define ISOM_FILE_EXT "mp4|mpg4|m4a|m4i|3gp|3gpp|3g2|3gp2|iso|ismv|m4s|heif|heic|avci|mj2|mov|qt"
+#define ISOM_FILE_EXT "mp4|mpg4|m4a|m4i|3gp|3gpp|3g2|3gp2|iso|ismv|m4s|heif|heic|iff|avci|avif|mj2|mov|qt"
 #define ISOM_FILE_MIME "application/x-isomedia|application/mp4|video/mp4|audio/mp4|video/3gpp|audio/3gpp|video/3gp2|audio/3gp2|video/iso.segment|audio/iso.segment|image/heif|image/heic|image/avci|video/quicktime"
 
 enum{
 	NALU_NONE,
 	NALU_AVC,
-	NALU_HEVC
+	NALU_HEVC,
+	NALU_VVC
 };
 
 
@@ -61,6 +62,15 @@
 	TAG_ALL
 };
 
+enum
+{
+	XPS_IB_NO = 0,
+	XPS_IB_PPS,
+	XPS_IB_ALL,
+	XPS_IB_BOTH,
+	XPS_IB_MIX,
+	XPS_IB_AUTO
+};
 
 typedef struct
 {
@@ -88,6 +98,7 @@
 	u32 nb_samples, samples_in_stsd;
 	u32 nb_frames_per_sample;
 	u64 ts_shift;
+	Bool has_subs;
 
 	Bool skip_bitrate_update;
 	Bool has_open_gop;
@@ -103,9 +114,10 @@
 
 	GF_AVCConfig *avcc, *svcc;
 	GF_HEVCConfig *hvcc, *lvcc;
+	GF_VVCConfig *vvcc;
 
-	u8 *inband_hdr;
-	u32 inband_hdr_size;
+	u8 *inband_hdr, *inband_hdr_non_rap;
+	u32 inband_hdr_size, inband_hdr_non_rap_size;
 	u32 is_nalu;
 	Bool is_av1, is_vpx;
 	Bool fragment_done;
@@ -114,26 +126,31 @@
 	u64 first_dts_in_seg, next_seg_cts, cts_next;
 	u64 offset_dts;
 	u32 samples_in_frag;
+	Bool patch_tfdt;
 
 	//0: not cenc, 1: needs setup of stsd entry, 2: setup done
 	u32 cenc_state;
-	u32 skip_byte_block, crypt_byte_block;
-	u32 IV_size, constant_IV_size;
-	bin128 constant_IV, KID;
 	Bool cenc_subsamples;
 	u32 scheme_type;
+	u32 def_skip_byte_block, def_crypt_byte_block;
+	u32 def_cenc_key_info_crc;
+	const GF_PropertyValue *cenc_ki;
+	u32 cenc_key_info_crc;
+	u32 constant_IV_size;
+	Bool cenc_multikey;
+	Bool cenc_frag_protected;
 
 	Bool fake_track;
 
 	Bool has_brands;
 	Bool force_inband_inject;
 
-	u32 dur_in_frag;
+	u64 dur_in_frag;
 
 	u32 amr_mode_set;
 	Bool has_seig;
 	u64 empty_init_dur;
-	u32 raw_audio_bytes_per_sample;
+	u32 raw_audio_bytes_per_sample, raw_samplerate;
 	u64 dts_patch;
 
 	Bool is_item;
@@ -141,7 +158,7 @@
 	char status_type;
 	u32 last_import_pc;
 
-	u32 nb_frames;
+	u32 nb_frames, frame_offset;
 	u64 down_bytes, down_size;
 	GF_Fraction64 pid_dur;
 	//for import message
@@ -150,6 +167,29 @@
 	u32 prev_tid_group;
 
 	Bool box_patched;
+
+	u64 imported_edit_sdur, imported_edit_offset;
+
+	Bool force_ctts;
+
+	Bool is_hevc_tile_base;
+	Bool insert_pssh;
+
+	Bool wait_sap;
+	u64 min_ts_seek_plus_one;
+	u64 clamp_ts_plus_one;
+	Bool check_seek_ts;
+
+	u64 max_cts, min_cts;
+	u32 max_cts_samp_dur;
+
+	u32 w_or_sr, h_or_ch, pf_or_af;
+	u32 xps_inband;
+
+	u8 *dyn_pssh;
+	u32 dyn_pssh_len;
+
+	GF_FilterPacket *dgl_copy;
 } TrackWriter;
 
 enum
@@ -191,20 +231,26 @@
 	MP4MX_VODCACHE_REPLACE,
 };
 
+enum
+{
+	MP4MX_CMAF_NO=0,
+	MP4MX_CMAF_CMFC,
+	MP4MX_CMAF_CMF2,
+};
+
 typedef struct
 {
 	//filter args
 	GF_ISOFile *file;
-	char *tmpd;
 	Bool m4sys, dref;
-	GF_Fraction idur;
+	GF_Fraction dur;
 	u32 pack3gp, ctmode;
-	Bool importer, pack_nal, moof_first, abs_offset, fsap, tfdt_traf;
-	u32 xps_inband;
+	Bool importer, pack_nal, moof_first, abs_offset, fsap, tfdt_traf, keep_utc, pps_inband;
+	u32 xps_inband, moovpad;
 	u32 block_size;
 	u32 store, tktpl, mudta;
 	s32 subs_sidx;
-	Double cdur;
+	GF_Fraction cdur;
 	s32 moovts;
 	char *m4cc;
 	Bool chain_sidx;
@@ -222,22 +268,25 @@
 	GF_AudioSampleEntryImportMode ase;
 	char *styp;
 	Bool sseg;
-	Bool noroll;
-	Bool saio32;
+	Bool noroll, norap;
+	Bool saio32, tfdt64;
 	u32 compress;
 	Bool trun_inter;
+	Bool truns_first;
 	char *boxpatch;
-	Bool fcomp;
+	Bool fcomp, otyp;
 	Bool deps;
 	Bool mvex;
 	u32 sdtp_traf;
+	u32 cmaf;
 #ifdef GF_ENABLE_CTRN
 	Bool ctrn;
 	Bool ctrni;
 #endif
 	Bool mfra;
-	Bool forcesync;
-	u32 tags;
+	Bool forcesync, refrag;
+	u32 itags;
+	Double start;
 
 	//internal
 	Bool owns_mov;
@@ -249,7 +298,8 @@
 	GF_BitStream *bs_r;
 	//fragmentation state
 	Bool init_movie_done, fragment_started, segment_started, insert_tfdt, insert_pssh, cdur_set;
-	Double next_frag_start, adjusted_next_frag_start;
+
+	u64 next_frag_start, adjusted_next_frag_start;
 
 	u64 current_offset;
 	u64 current_size;
@@ -258,7 +308,7 @@
 
 	GF_FilterPacket *dst_pck;
 	char *seg_name;
-	u32 dash_seg_num;
+	u32 dash_seg_num_plus_one;
 	Bool flush_seg;
 	u32 eos_marker;
 	TrackWriter *ref_tkw;
@@ -267,8 +317,8 @@
 	FILE *tmp_store;
 	u64 flush_size, flush_done;
 
-	u32 dash_mode;
-	Double dash_dur;
+	u32 dash_mode, llhls_mode;
+	GF_Fraction dash_dur;
 	Double media_dur;
 	u32 sidx_max_size, sidx_chunk_offset;
 	Bool final_sidx_flush;
@@ -294,7 +344,7 @@
 
 	GF_SegmentIndexBox *cloned_sidx;
 	u32 cloned_sidx_index;
-	Double faststart_ts_regulate;
+	GF_Fraction faststart_ts_regulate;
 
 	Bool is_rewind;
 	Bool box_patched;
@@ -304,6 +354,19 @@
 
 	u32 next_file_idx;
 	const char *next_file_suffix;
+
+	//for route scheduling
+	u64 min_cts_plus_one, next_seg_start;
+	u64 min_cts_next_frag;
+
+	u64 frag_size, frag_offset;
+	u32 frag_num;
+	u64 frag_duration;
+	u32 frag_timescale;
+	Bool frag_has_intra;
+
+	u64 wait_dts_plus_one;
+	u32 wait_dts_timescale;
 } GF_MP4MuxCtx;
 
 static void mp4_mux_set_hevc_groups(GF_MP4MuxCtx *ctx, TrackWriter *tkw);
@@ -314,7 +377,7 @@
 		const GF_PropertyValue *p;
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DASH_DUR);
 		if (p) {
-			ctx->dash_dur = p->value.number;
+			ctx->dash_dur = p->value.frac;
 		}
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DURATION);
 		if (p && p->value.lfrac.den) {
@@ -324,6 +387,7 @@
 		}
 	}
 	ctx->dash_mode = MP4MX_DASH_VOD;
+	ctx->llhls_mode = 0;
 	if ((ctx->vodcache==MP4MX_VODCACHE_ON) && !ctx->tmp_store) {
 		ctx->tmp_store = gf_file_temp(NULL);
 		if (!ctx->tmp_store) {
@@ -374,44 +438,52 @@
 {
 	u32 i, count = list ? gf_list_count(list) : 0;
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(list, i);
+		GF_NALUFFParam *sl = gf_list_get(list, i);
 		gf_bs_write_int(bs, sl->size, 8*nalu_size_length);
 		gf_bs_write_data(bs, sl->data, sl->size);
 	}
 }
 
-static GF_List *mp4_mux_get_hevc_ps(GF_HEVCConfig *cfg, u8 type)
+static GF_List *mp4_mux_get_nalus_ps(GF_List *list, u8 type)
 {
-	u32 i, count = gf_list_count(cfg->param_array);
+	u32 i, count = gf_list_count(list);
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *pa = gf_list_get(cfg->param_array, i);
+		GF_NALUFFParamArray *pa = gf_list_get(list, i);
 		if (pa->type == type) return pa->nalus;
 	}
 	return NULL;
 }
 
-static void mp4_mux_make_inband_header(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
+static void mp4_mux_make_inband_header(GF_MP4MuxCtx *ctx, TrackWriter *tkw, Bool for_non_rap)
 {
 	GF_BitStream *bs;
-	if (tkw->inband_hdr) gf_free(tkw->inband_hdr);
+	if (for_non_rap) {
+		if (tkw->inband_hdr_non_rap) gf_free(tkw->inband_hdr_non_rap);
+		tkw->inband_hdr_non_rap = NULL;
+	} else {
+		if (tkw->inband_hdr) gf_free(tkw->inband_hdr);
+		tkw->inband_hdr = NULL;
+	}
 
 	tkw->nal_unit_size = 0;
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	if (tkw->avcc || tkw->svcc) {
 		if (tkw->avcc) {
-			mp4_mux_write_ps_list(bs, tkw->avcc->sequenceParameterSets, tkw->avcc->nal_unit_size);
+			if (!for_non_rap)
+				mp4_mux_write_ps_list(bs, tkw->avcc->sequenceParameterSets, tkw->avcc->nal_unit_size);
 			/*if (!tkw->nal_unit_size) */tkw->nal_unit_size = tkw->avcc->nal_unit_size;
 		}
 
 		if (tkw->svcc) {
-			mp4_mux_write_ps_list(bs, tkw->svcc->sequenceParameterSets, tkw->svcc->nal_unit_size);
+			if (!for_non_rap)
+				mp4_mux_write_ps_list(bs, tkw->svcc->sequenceParameterSets, tkw->svcc->nal_unit_size);
 			if (!tkw->nal_unit_size) tkw->nal_unit_size = tkw->svcc->nal_unit_size;
 		}
 
-		if (tkw->avcc && tkw->avcc->sequenceParameterSetExtensions)
+		if (tkw->avcc && tkw->avcc->sequenceParameterSetExtensions && !for_non_rap)
 			mp4_mux_write_ps_list(bs, tkw->avcc->sequenceParameterSetExtensions, tkw->avcc->nal_unit_size);
 
-		if (tkw->svcc && tkw->svcc->sequenceParameterSetExtensions)
+		if (tkw->svcc && tkw->svcc->sequenceParameterSetExtensions && !for_non_rap)
 			mp4_mux_write_ps_list(bs, tkw->svcc->sequenceParameterSetExtensions, tkw->svcc->nal_unit_size);
 
 		if (tkw->avcc)
@@ -422,25 +494,48 @@
 	}
 	if (tkw->hvcc || tkw->lvcc) {
 		if (tkw->hvcc) {
-			mp4_mux_write_ps_list(bs, mp4_mux_get_hevc_ps(tkw->hvcc, GF_HEVC_NALU_VID_PARAM), tkw->hvcc->nal_unit_size);
+			if (!for_non_rap)
+				mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->hvcc->param_array, GF_HEVC_NALU_VID_PARAM), tkw->hvcc->nal_unit_size);
 			if (!tkw->nal_unit_size) tkw->nal_unit_size = tkw->hvcc->nal_unit_size;
 		}
 		if (tkw->lvcc) {
-			mp4_mux_write_ps_list(bs, mp4_mux_get_hevc_ps(tkw->lvcc, GF_HEVC_NALU_VID_PARAM), tkw->lvcc->nal_unit_size);
+			if (!for_non_rap)
+				mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->lvcc->param_array, GF_HEVC_NALU_VID_PARAM), tkw->lvcc->nal_unit_size);
 			if (!tkw->nal_unit_size) tkw->nal_unit_size = tkw->lvcc->nal_unit_size;
 		}
+		if (tkw->hvcc && !for_non_rap)
+			mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->hvcc->param_array, GF_HEVC_NALU_SEQ_PARAM), tkw->hvcc->nal_unit_size);
+		if (tkw->lvcc && !for_non_rap)
+			mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->lvcc->param_array, GF_HEVC_NALU_SEQ_PARAM), tkw->lvcc->nal_unit_size);
 		if (tkw->hvcc)
-			mp4_mux_write_ps_list(bs, mp4_mux_get_hevc_ps(tkw->hvcc, GF_HEVC_NALU_SEQ_PARAM), tkw->hvcc->nal_unit_size);
-		if (tkw->lvcc)
-			mp4_mux_write_ps_list(bs, mp4_mux_get_hevc_ps(tkw->lvcc, GF_HEVC_NALU_SEQ_PARAM), tkw->lvcc->nal_unit_size);
-		if (tkw->hvcc)
-			mp4_mux_write_ps_list(bs, mp4_mux_get_hevc_ps(tkw->hvcc, GF_HEVC_NALU_PIC_PARAM), tkw->hvcc->nal_unit_size);
+			mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->hvcc->param_array, GF_HEVC_NALU_PIC_PARAM), tkw->hvcc->nal_unit_size);
 		if (tkw->lvcc)
-			mp4_mux_write_ps_list(bs, mp4_mux_get_hevc_ps(tkw->lvcc, GF_HEVC_NALU_PIC_PARAM), tkw->lvcc->nal_unit_size);
+			mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->lvcc->param_array, GF_HEVC_NALU_PIC_PARAM), tkw->lvcc->nal_unit_size);
 	}
 
-	tkw->inband_hdr=NULL;
-	gf_bs_get_content(bs, &tkw->inband_hdr, &tkw->inband_hdr_size);
+	if (tkw->vvcc) {
+		if (tkw->xps_inband==XPS_IB_PPS) {
+			mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->vvcc->param_array, GF_VVC_NALU_PIC_PARAM), tkw->vvcc->nal_unit_size);
+			if (!tkw->nal_unit_size) tkw->nal_unit_size = tkw->vvcc->nal_unit_size;
+			mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->vvcc->param_array, GF_VVC_NALU_APS_PREFIX), tkw->vvcc->nal_unit_size);
+		} else {
+			if (!for_non_rap)
+				mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->vvcc->param_array, GF_VVC_NALU_VID_PARAM), tkw->vvcc->nal_unit_size);
+			if (!tkw->nal_unit_size) tkw->nal_unit_size = tkw->vvcc->nal_unit_size;
+
+			if (!for_non_rap)
+				mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->vvcc->param_array, GF_VVC_NALU_SEQ_PARAM), tkw->vvcc->nal_unit_size);
+
+			mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->vvcc->param_array, GF_VVC_NALU_PIC_PARAM), tkw->vvcc->nal_unit_size);
+			mp4_mux_write_ps_list(bs, mp4_mux_get_nalus_ps(tkw->vvcc->param_array, GF_VVC_NALU_APS_PREFIX), tkw->vvcc->nal_unit_size);
+		}
+	}
+
+	if (for_non_rap) {
+		gf_bs_get_content(bs, &tkw->inband_hdr_non_rap, &tkw->inband_hdr_non_rap_size);
+	} else {
+		gf_bs_get_content(bs, &tkw->inband_hdr, &tkw->inband_hdr_size);
+	}
 	gf_bs_del(bs);
 	//we may have cases where the param sets are updated before a non-IDR/SAP3 picture, we must inject asap at least once
 	tkw->force_inband_inject = GF_TRUE;
@@ -476,17 +571,24 @@
 	if (tkw->svcc) gf_odf_avc_cfg_del(tkw->svcc);
 	if (tkw->hvcc) gf_odf_hevc_cfg_del(tkw->hvcc);
 	if (tkw->lvcc) gf_odf_hevc_cfg_del(tkw->lvcc);
+	if (tkw->vvcc) gf_odf_vvc_cfg_del(tkw->vvcc);
 	if (tkw->inband_hdr) gf_free(tkw->inband_hdr);
+	if (tkw->inband_hdr_non_rap) gf_free(tkw->inband_hdr_non_rap);
+	if (tkw->dyn_pssh) gf_free(tkw->dyn_pssh);
+	if (tkw->dgl_copy) gf_filter_pck_discard(tkw->dgl_copy);
 	gf_free(tkw);
 }
 
-static void mp4_mux_write_track_refs(GF_MP4MuxCtx *ctx, TrackWriter *tkw, const char *rname, u32 rtype)
+static void mp4_mux_write_track_refs(GF_MP4MuxCtx *ctx, TrackWriter *tkw, const char *rname, u32 rtype, Bool remove_from_pres)
 {
 	u32 i;
 	const GF_PropertyValue *p = gf_filter_pid_get_property_str(tkw->ipid, rname);
 	if (!p) return;
 	for (i=0; i<p->value.uint_list.nb_items; i++) {
 		gf_isom_set_track_reference(ctx->file, tkw->track_num, rtype, p->value.uint_list.vals[i]);
+		if (remove_from_pres) {
+			gf_isom_set_track_flags(ctx->file, tkw->track_num, GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_REM);
+		}
 	}
 }
 
@@ -528,22 +630,31 @@
 	ctx->tracks = new_tracks;
 }
 
+#include <gpac/revision.h>
 static void mp4_mux_set_tags(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
 {
 	u32 idx=0;
-	if (ctx->tags==TAG_NONE) return;
+
+	if (!gf_sys_is_test_mode() && !gf_sys_old_arch_compat() ) {
+		const char *tool = "GPAC-"GPAC_VERSION"-rev"GPAC_GIT_REVISION;
+		u32 len = (u32) strlen(tool);
+		gf_isom_apple_set_tag(ctx->file, GF_ISOM_ITUNE_TOOL, tool, len, 0, 0);
+	}
+
+	if (ctx->itags==TAG_NONE) return;
 
 	while (1) {
 		GF_Err e;
-		u32 tag_val;
+		u32 len;
 		u32 prop_4cc=0;
-		s32 itag;
+		u32 itag;
+		s32 tag_idx;
 		const char *tag_name=NULL;
 		const GF_PropertyValue *tag = gf_filter_pid_enum_properties(tkw->ipid, &idx, &prop_4cc, &tag_name);
 		if (!tag) break;
 
 		if (prop_4cc==GF_PROP_PID_COVER_ART) {
-			e = gf_isom_apple_set_tag(ctx->file, GF_ISOM_ITUNE_COVER_ART, tag->value.data.ptr, tag->value.data.size);
+			e = gf_isom_apple_set_tag(ctx->file, GF_ISOM_ITUNE_COVER_ART, tag->value.data.ptr, tag->value.data.size, 0, 0);
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set cover art: %s\n", gf_error_to_string(e)));
 			}
@@ -551,120 +662,118 @@
 		if (!tag_name)
 			continue;
 
-		itag = gf_itags_find_by_name(tag_name);
-		if (itag>=0) {
-			Bool tag_set=GF_FALSE;
-			u32 val;
-			char _t[8];
-			u32 itype = gf_itags_get_type((u32) itag);
-			itag = gf_itags_get_itag(itag);
+		tag_idx = gf_itags_find_by_name(tag_name);
+		if (tag_idx>=0) {
+			itag = gf_itags_get_itag(tag_idx);
+		} else {
+			if (ctx->itags==TAG_STRICT)
+				continue;
 
-			e = GF_OK;
-			if ((itag==GF_ISOM_ITUNE_DISK) ||(itag==GF_ISOM_ITUNE_TRACKNUMBER)) {
-				u32 n=0, t=0, tlen=0;
-				if (tag->value.string) {
-					memset(_t, 0, sizeof(char) * 8);
-					tlen = (itag == GF_ISOM_ITUNE_DISK) ? 6 : 8;
-					if (sscanf(tag->value.string, "%u/%u", &n, &t) == 2) {
-						_t[3] = n;
-						_t[2] = n >> 8;
-						_t[5] = t;
-						_t[4] = t >> 8;
-					}
-					else if (sscanf(tag->value.string, "%u", &n) == 1) {
-						_t[3] = n;
-						_t[2] = n >> 8;
-					}
-					else tlen = 0;
-				}
-				if (!tag->value.string || tlen) {
-					e = gf_isom_apple_set_tag(ctx->file, itag, tlen ? (u8 *)_t : NULL, tlen);
-					tag_set = GF_TRUE;
-				}
-			}
-			else if (itag==GF_ISOM_ITUNE_GENRE) {
-				val = 0;
-				if ((tag->type==GF_PROP_STRING) && tag->value.string) {
-					val = gf_id3_get_genre_tag(tag->value.string);
-					if (val) {
-						e = gf_isom_apple_set_tag(ctx->file, itag, NULL, val);
-						tag_set = GF_TRUE;
-					}
-				}
-			}
+			if (strnicmp(tag_name, "tag_", 4))
+				continue;
 
-			if (!tag_set) {
-				switch (itype) {
-				case GF_ITAG_STR:
-				case GF_ITAG_SUBSTR:
-					if ((tag->type==GF_PROP_STRING) && tag->value.string) {
-						e = gf_isom_apple_set_tag(ctx->file, itag, tag->value.string, (u32) strlen(tag->value.string));
-					} else {
-						e = GF_BAD_PARAM;
-					}
-					break;
-				case GF_ITAG_INT:
-					val=0;
-					if ((tag->type==GF_PROP_STRING) && tag->value.string) {
-						val = atoi(tag->value.string);
-					} else if (tag->type==GF_PROP_UINT) {
-						val = tag->value.uint;
-					}
-					if (val) {
-						e = gf_isom_apple_set_tag(ctx->file, itag, NULL, val);
-					}
-					break;
+			tag_name += 4;
 
-				case GF_ITAG_BOOL:
-					_t[0] = 0;
-					if ((tag->type==GF_PROP_STRING) && tag->value.string &&
-						(!stricmp(tag->value.string, "yes") || !stricmp(tag->value.string, "true") || !stricmp(tag->value.string, "1"))
-					) {
-						_t[0] = 1;
-					} else if (tag->value.boolean) {
-						_t[0] = 1;
-					}
-					e = gf_isom_apple_set_tag(ctx->file, itag, _t, 1);
-				}
-			}
-			
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set tag %s: %s\n", tag_name, gf_error_to_string(e)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MP4Mux] Unrecognized tag %s: %s\n", tag_name, tag->value.string));
+
+			if (strlen(tag_name)==4) {
+				itag = GF_4CC(tag_name[0], tag_name[1], tag_name[2], tag_name[3]);
+			} else if (strlen(tag_name)==3) {
+				itag = GF_4CC(0xA9, tag_name[0], tag_name[1], tag_name[2]);
+			} else {
+				itag = gf_crc_32(tag_name, (u32) strlen(tag_name));
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MP4Mux] Tag name %s is not a 4CC, using CRC32 %08X as value\n", tag_name, itag));
 			}
-			continue;
 		}
-		if (ctx->tags==TAG_STRICT)
-			continue;
 
-		if (strnicmp(tag_name, "tag_", 4))
-			continue;
+		switch (tag->type) {
+		case GF_PROP_STRING:
+		case GF_PROP_NAME:
+			len = tag->value.string ? (u32) strlen(tag->value.string) : 0;
+			e = gf_isom_apple_set_tag(ctx->file, itag, tag->value.string, len, 0, 0);
+			break;
+		case GF_PROP_BOOL:
+			e = gf_isom_apple_set_tag(ctx->file, itag, NULL, 0, tag->value.boolean, 0);
+			break;
+		case GF_PROP_UINT:
+		case GF_PROP_4CC:
+			e = gf_isom_apple_set_tag(ctx->file, itag, NULL, 0, tag->value.uint, 0);
+			break;
+		case GF_PROP_LUINT:
+			e = gf_isom_apple_set_tag(ctx->file, itag, NULL, 0, tag->value.longuint, 0);
+			break;
+		case GF_PROP_FRACTION:
+			e = gf_isom_apple_set_tag(ctx->file, itag, NULL, 0, tag->value.frac.num, tag->value.frac.den);
+			break;
+		case GF_PROP_DATA:
+		case GF_PROP_CONST_DATA:
+			e = gf_isom_apple_set_tag(ctx->file, itag, tag->value.data.ptr, tag->value.data.size, 0, 0);
+			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set tag %s: invalid data format\n", gf_itags_get_name(tag_idx) ));
+			e = GF_OK;
+			break;
+		}
+
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set tag %s: %s\n", tag_name, gf_error_to_string(e)));
+		}
+	}
+}
 
-		tag_name += 4;
+static void mp4_mux_set_udta(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
+{
+	u32 idx=0;
+	while (1) {
+		GF_Err e;
+		u32 prop_4cc=0;
+		const char *udta_name=NULL;
+		const GF_PropertyValue *udta = gf_filter_pid_enum_properties(tkw->ipid, &idx, &prop_4cc, &udta_name);
+		if (!udta) break;
+		if (!udta_name)
+			continue;
+		if (!strncmp(udta_name, "udta_", 5) || !strncmp(udta_name, "mudta_", 6) ) {
+			u32 udta_type;
+			u8 *data=NULL;
+			u32 size=0;
+			u32 track_num = 0;
+
+			if (!strncmp(udta_name, "udta_", 5)) {
+				udta_name += 5;
+				track_num = tkw->track_num;
+			} else {
+				udta_name += 6;
+			}
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MP4Mux] Unrecognized tag %s: %s\n", tag_name, tag->value.string));
-		if ((tag->type!=GF_PROP_STRING) && (tag->type!=GF_PROP_DATA) && (tag->type!=GF_PROP_CONST_DATA)) continue;
+			if (strlen(udta_name) != 4) continue;
+			udta_type = GF_4CC(udta_name[0], udta_name[1], udta_name[2], udta_name[3]);
 
-		if (strlen(tag_name)==4) {
-			tag_val = GF_4CC(tag_name[0], tag_name[1], tag_name[2], tag_name[3]);
-		} else {
-			tag_val = gf_crc_32(tag_name, (u32) strlen(tag_name));
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MP4Mux] Tag name %s is not a 4CC, using CRC32 %d as value\n", tag_name, tag_val));
+			if (udta->type==GF_PROP_DATA) {
+				data = (u8 *) udta->value.data.ptr;
+				size = udta->value.data.size;
+			} else if ((udta->type == GF_PROP_STRING) && udta->value.string) {
+				data = (u8 *) udta->value.string;
+				size = (u32) strlen(udta->value.string)+1;
+			}
+			if (!data) {
+				e = GF_BAD_PARAM;
+			} else {
+				e = gf_isom_add_user_data(ctx->file, track_num, udta_type, NULL, data, size);
+			}
 		}
-		if (tag->type==GF_PROP_STRING) {
-			if (tag->value.string) {
-				if (tag_val==GF_ID3V2_FRAME_TCOP) {
-					e = gf_isom_set_copyright(ctx->file, "unk", tag->value.string);
-				} else {
-					e = gf_isom_apple_set_tag(ctx->file, tag_val, tag->value.string, (u32) strlen(tag->value.string) );
-				}
+		else if (!strcmp(udta_name, "udtab") || !strcmp(udta_name, "mudtab")) {
+			u32 track_num = (!strcmp(udta_name, "mudtab")) ? 0 : tkw->track_num;
+			if (udta->type == GF_PROP_DATA) {
+				e = gf_isom_add_user_data_boxes(ctx->file, track_num, udta->value.data.ptr, udta->value.data.size);
 			} else {
-				e = gf_isom_apple_set_tag(ctx->file, tag_val, NULL, 0);
+				e = GF_BAD_PARAM;
 			}
 		} else {
-			e = gf_isom_apple_set_tag(ctx->file, tag_val, tag->value.data.ptr , tag->value.data.size);
+			continue;
 		}
+
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set tag %s: %s\n", tag_name, gf_error_to_string(e)));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set udta %s: %s\n", udta_name, gf_error_to_string(e)));
 		}
 	}
 }
@@ -684,6 +793,7 @@
 	Bool use_flac_entry = GF_FALSE;
 	Bool use_avc = GF_FALSE;
 	Bool use_hevc = GF_FALSE;
+	Bool use_vvc = GF_FALSE;
 	Bool use_hvt1 = GF_FALSE;
 	Bool use_av1 = GF_FALSE;
 	Bool use_vpX = GF_FALSE;
@@ -715,7 +825,6 @@
 	Bool force_mix_xps = GF_FALSE;
 	Bool make_inband_headers = GF_FALSE;
 	Bool is_prores = GF_FALSE;
-
 	const char *lang_name = NULL;
 	const char *comp_name = NULL;
 	const char *imp_name = NULL;
@@ -737,6 +846,7 @@
 	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
 	GF_AudioSampleEntryImportMode ase_mode = ctx->ase;
 	TrackWriter *tkw;
+	u32 xps_inband = XPS_IB_NO;
 
 	if (ctx->owns_mov && !ctx->opid) {
 		char *dst;
@@ -766,6 +876,11 @@
 		mux_assign_mime_file_ext(pid, ctx->opid, ISOM_FILE_EXT, ISOM_FILE_MIME, NULL);
 		
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DASH_MODE, NULL);
+		//we dispatch timing in milliseconds
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(1000));
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+		if (p)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(p->value.uint));
 
 		switch (ctx->store) {
 		case MP4MX_MODE_FLAT:
@@ -780,7 +895,8 @@
 	}
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TILE_BASE);
-	if (p && p->value.boolean) is_tile_base = GF_TRUE;
+	if (p && p->value.boolean)
+		is_tile_base = GF_TRUE;
 
 	if (is_true_pid && !is_tile_base) {
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MULTI_TRACK);
@@ -818,16 +934,25 @@
 		gf_list_add(ctx->tracks, tkw);
 		tkw->ipid = pid;
 		tkw->fake_track = !is_true_pid;
+		tkw->min_cts = (u64) -1;
+
 		if (is_true_pid) {
 			gf_filter_pid_set_udta(pid, tkw);
 
+			tkw->is_hevc_tile_base = is_tile_base;
 #ifdef GPAC_ENABLE_COVERAGE
 			if (gf_sys_is_cov_mode()) {
 				gf_filter_pid_get_min_pck_duration(pid);
 			}
 #endif
 			if (!ctx->owns_mov || ctx->force_play) {
-				GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+				if (!ctx->owns_mov) {
+					if (ctx->start != 0)
+						tkw->wait_sap = GF_TRUE;
+					gf_filter_pid_init_play_event(pid, &evt, ctx->start, 0, "MP4Mux");
+				} else {
+					GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+				}
 				gf_filter_pid_send_event(pid, &evt);
 			}
 			gf_filter_pid_set_framing_mode(pid, GF_TRUE);
@@ -839,7 +964,6 @@
 				ctx->config_timing = GF_TRUE;
 				ctx->update_report = GF_TRUE;
 			}
-
 		}
 	}
 
@@ -868,28 +992,31 @@
 			tkw->stream_type = stype;
 			const char *name = gf_stream_type_name(stype);
 			tkw->status_type = name ? name[0] : 'U';
-
 		}
 	}
 
 	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
 	if (dsi) {
 		u32 cfg_crc = gf_crc_32(dsi->value.data.ptr, dsi->value.data.size);
-		if (cfg_crc!=tkw->cfg_crc) needs_sample_entry = 2;
+		if ((cfg_crc!=tkw->cfg_crc) && !needs_sample_entry)
+			needs_sample_entry = 2;
 		tkw->cfg_crc = cfg_crc;
 	} else if (tkw->cfg_crc) {
 		tkw->cfg_crc = 0;
-		needs_sample_entry = 2;
+		if (!needs_sample_entry)
+			needs_sample_entry = 2;
 	}
 
 	enh_dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
-	if (enh_dsi) {
+	if (enh_dsi && (enh_dsi->type==GF_PROP_DATA) ) {
 		u32 cfg_crc = gf_crc_32(enh_dsi->value.data.ptr, enh_dsi->value.data.size);
-		if (cfg_crc!=tkw->enh_cfg_crc) needs_sample_entry = 2;
+		if ((cfg_crc!=tkw->enh_cfg_crc) && !needs_sample_entry)
+			needs_sample_entry = 2;
 		tkw->enh_cfg_crc = cfg_crc;
 	} else if (tkw->enh_cfg_crc) {
 		tkw->enh_cfg_crc = 0;
-		needs_sample_entry = 2;
+		if (!needs_sample_entry)
+			needs_sample_entry = 2;
 	}
 
 	//TODO: try to merge PPS/SPS for AVC and HEVC rather than creating a new sample description
@@ -899,11 +1026,19 @@
 	case GF_CODECID_AAC_MPEG2_MP:
 	case GF_CODECID_AAC_MPEG2_LCP:
 	case GF_CODECID_AAC_MPEG2_SSRP:
+	case GF_CODECID_USAC:
 	case GF_CODECID_MPEG4_PART2:
 	case GF_CODECID_AVC:
 	case GF_CODECID_SVC:
 	case GF_CODECID_HEVC:
 	case GF_CODECID_LHVC:
+	case GF_CODECID_MPEG1:
+	case GF_CODECID_MPEG2_422:
+	case GF_CODECID_MPEG2_SNR:
+	case GF_CODECID_MPEG2_HIGH:
+	case GF_CODECID_MPEG2_MAIN:
+	case GF_CODECID_MPEG2_SIMPLE:
+	case GF_CODECID_MPEG2_SPATIAL:
 		if (!dsi && !enh_dsi) return GF_OK;
 		break;
 	case GF_CODECID_APCH:
@@ -959,13 +1094,23 @@
 		ctx->dash_mode = MP4MX_DASH_ON;
 	}
 
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_LLHLS);
+	ctx->llhls_mode = p ? p->value.uint : 0;
+	//insert tfdt in each traf for LL-HLS so that correct timing can be found when doing in-segment tune-in
+	if (ctx->llhls_mode) {
+		ctx->tfdt_traf = GF_TRUE;
+		ctx->store = MP4MX_MODE_SFRAG;
+	}
+
 	if (!ctx->cdur_set) {
 		ctx->cdur_set = GF_TRUE;
-		if (ctx->cdur<0) {
-			if (ctx->make_qt)
-				ctx->cdur = 0.5;
-			else {
-				ctx->cdur = 1.0;
+		if (ctx->cdur.num<0) {
+			if (ctx->make_qt) {
+				ctx->cdur.num = 1000;
+				ctx->cdur.den = 2000;
+			} else {
+				ctx->cdur.num = 1000;
+				ctx->cdur.den = 1000;
 				if (ctx->dash_mode)
 					ctx->fragdur = GF_FALSE;
 			}
@@ -980,6 +1125,12 @@
 		}
 		if (tkw->is_item) {
 			needs_track = GF_FALSE;
+
+			if (tkw->stream_type == GF_STREAM_ENCRYPTED) {
+				tkw->is_encrypted = GF_TRUE;
+				tkw->stream_type = gf_codecid_type(tkw->codecid);
+				tkw->insert_pssh = GF_TRUE;
+			}
 		}
 	}
 
@@ -1003,7 +1154,7 @@
 				else if (inc * 60000 == ts * 1001) target_timescale = 60000;
 				else if (inc * 5994 == ts * 100) target_timescale = 60000;
 				else if (is_prores) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ProRes] Unrecognized frame rate %g\n", ((Double)ts)/inc ));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ProRes] Unrecognized frame rate %g\n", ((Double)ts)/inc ));
 					return GF_NON_COMPLIANT_BITSTREAM;
 				}
 			}
@@ -1025,7 +1176,7 @@
 				}
 			}
 			if (ctx->store==MP4MX_MODE_FASTSTART) {
-				gf_isom_make_interleave(ctx->file, ctx->cdur);
+				gf_isom_make_interleave_ex(ctx->file, &ctx->cdur);
 			}
 		}
 
@@ -1054,8 +1205,6 @@
 		if (!p) p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
 		if (p) tkid = p->value.uint;
 
-		if (ctx->trackid) tkid = ctx->trackid;
-
 		if (tkw->stream_type == GF_STREAM_ENCRYPTED) {
 			tkw->is_encrypted = GF_TRUE;
 			tkw->stream_type = gf_codecid_type(tkw->codecid);
@@ -1070,6 +1219,26 @@
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_MUX_INDEX);
 		if (p) {
 			tk_idx = p->value.uint;
+			if (!ctx->owns_mov) {
+				u32 nb_dst_tk = gf_isom_get_track_count(ctx->file);
+				if (tk_idx < nb_dst_tk) {
+					tk_idx = nb_dst_tk;
+				}
+			}
+		}
+
+		if (ctx->keep_utc) {
+			if (!gf_isom_get_track_count(ctx->file)) {
+				u64 create_date=0, modif_date=0;
+				p = gf_filter_pid_get_property_str(tkw->ipid, "isom:creation_date");
+				if (p && (p->type==GF_PROP_LUINT)) create_date = p->value.longuint;
+				p = gf_filter_pid_get_property_str(tkw->ipid, "isom:modification_date");
+				if (p && (p->type==GF_PROP_LUINT)) modif_date = p->value.longuint;
+
+				if (create_date && modif_date)
+					gf_isom_set_creation_time(ctx->file, create_date, modif_date);
+			}
+			gf_isom_keep_utc_times(ctx->file, GF_TRUE);
 		}
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_TRACK_TEMPLATE);
@@ -1081,6 +1250,14 @@
 			if (!tkw->track_num) {
 				tkw->track_num = gf_isom_new_track_from_template(ctx->file, 0, mtype, tkw->tk_timescale, p->value.data.ptr, p->value.data.size, udta_only);
 			}
+			//purge all track references we inject internally
+			if (tkw->track_num) {
+				gf_isom_remove_track_reference(ctx->file, tkw->track_num, GF_ISOM_REF_SCAL);
+				gf_isom_remove_track_reference(ctx->file, tkw->track_num, GF_ISOM_REF_SABT);
+				gf_isom_remove_track_reference(ctx->file, tkw->track_num, GF_ISOM_REF_TBAS);
+				gf_isom_remove_track_reference(ctx->file, tkw->track_num, GF_ISOM_REF_OREF);
+				gf_isom_remove_track_reference(ctx->file, tkw->track_num, GF_ISOM_REF_BASE);
+			}
 
 			if (!ctx->btrt) {
 				gf_isom_update_bitrate(ctx->file, tkw->track_num, 0, 0, 0, 0);
@@ -1092,6 +1269,11 @@
 			}
 			if (!tkid) tkid = tk_idx;
 
+			if (ctx->trackid) {
+				if (ctx->trackid==(u32)-1) tkid = 0;
+				else tkid = ctx->trackid;
+			}
+
 			tkw->track_num = gf_isom_new_track(ctx->file, tkid, mtype, tkw->tk_timescale);
 			if (!tkw->track_num) {
 				tkw->track_num = gf_isom_new_track(ctx->file, 0, mtype, tkw->tk_timescale);
@@ -1120,12 +1302,24 @@
 		tkw->track_id = gf_isom_get_track_id(ctx->file, tkw->track_num);
 		tkw->next_is_first_sample = GF_TRUE;
 
+		if (ctx->cmaf) {
+			gf_isom_set_track_flags(ctx->file, tkw->track_num, GF_ISOM_TK_ENABLED|GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_SET);
+		}
+		//unless in test mode or old arch compat, set track to be enabled, in movie and in preview
+		else if (!gf_sys_is_test_mode() && !gf_sys_old_arch_compat()) {
+			gf_isom_set_track_flags(ctx->file, tkw->track_num, GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_SET);
+		}
+
+		//override flags if provided
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TRACK_FLAGS);
 		if (p) {
 			gf_isom_set_track_flags(ctx->file, tkw->track_num, p->value.uint, GF_ISOM_TKFLAGS_SET);
 		} else {
 			gf_isom_set_track_enabled(ctx->file, tkw->track_num, GF_TRUE);
 		}
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DISABLED);
+		if (p && p->value.boolean)
+			gf_isom_set_track_enabled(ctx->file, tkw->track_num, GF_FALSE);
 
 		//if we have a subtype set for the pid, use it
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SUBTYPE);
@@ -1135,10 +1329,14 @@
 		if (p && p->value.string) {
 			gf_isom_set_handler_name(ctx->file, tkw->track_num, p->value.string);
 		}
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_ALT_GROUP);
+		if (p && p->value.uint) {
+			gf_isom_set_alternate_group_id(ctx->file, tkw->track_num, p->value.uint);
+		}
 
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TRACK_MATRIX);
-		if (p && (p->value.uint_list.nb_items==9)) {
-			gf_isom_set_track_matrix(ctx->file, tkw->track_num, (s32 *) p->value.uint_list.vals);
+		if (p && (p->value.sint_list.nb_items==9)) {
+			gf_isom_set_track_matrix(ctx->file, tkw->track_num, (s32 *) p->value.sint_list.vals);
 		}
 
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_SRC_MAGIC);
@@ -1182,11 +1380,14 @@
 		if (ctx->noroll) {
 			gf_isom_remove_sample_group(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_ROLL);
 		}
+		if (ctx->norap) {
+			gf_isom_remove_sample_group(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_RAP);
+		}
 
 
 		if (ctx->dash_mode==MP4MX_DASH_VOD) {
 			Bool use_cache = (ctx->vodcache == MP4MX_VODCACHE_ON) ? GF_TRUE : GF_FALSE;
-			if ((ctx->vodcache == MP4MX_VODCACHE_REPLACE) && (!ctx->media_dur || !ctx->dash_dur) ) {
+			if ((ctx->vodcache == MP4MX_VODCACHE_REPLACE) && (!ctx->media_dur || !ctx->dash_dur.num) ) {
 				use_cache = GF_TRUE;
 			}
 
@@ -1197,6 +1398,20 @@
 				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DISABLE_PROGRESSIVE, &PROP_UINT(GF_PID_FILE_PATCH_REPLACE) );
 			}
 		}
+
+		if (gf_sys_old_arch_compat()) {
+			p = gf_filter_pid_get_property_str(pid, "isom_force_ctts");
+			if (p && p->value.boolean) tkw->force_ctts = GF_TRUE;
+		}
+	} else {
+
+		u32 old_timescale = tkw->src_timescale;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+		if (p) tkw->src_timescale = p->value.uint;
+		if (old_timescale && (tkw->src_timescale != old_timescale)) {
+			if (tkw->ts_shift)
+				tkw->ts_shift = gf_timestamp_rescale(tkw->ts_shift, old_timescale, tkw->src_timescale);
+		}
 	}
 
 	if (!tkw->has_brands) {
@@ -1218,17 +1433,24 @@
 				ctx->major_brand_set = p->value.uint_list.vals[0];
 				gf_isom_set_brand_info(ctx->file, p->value.uint_list.vals[0], 1);
 			}
-
+			//reset alt brands, push old ones
+			gf_isom_reset_alt_brands_ex(ctx->file, GF_TRUE);
 			for (i=0; i<p->value.uint_list.nb_items; i++) {
 				gf_isom_modify_alternate_brand(ctx->file, p->value.uint_list.vals[i], GF_TRUE);
 				if (p->value.uint_list.vals[i] == GF_ISOM_BRAND_ISOM) is_isom = GF_TRUE;
 			}
+			//and in case it was not present add major brand
+			gf_isom_modify_alternate_brand(ctx->file, ctx->major_brand_set, GF_TRUE);
 		}
 		if (!ctx->m4sys && !is_isom && !ctx->def_brand_patched) {
 			//remove default brand
 			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISOM, GF_FALSE);
 			ctx->def_brand_patched = GF_TRUE;
 		}
+
+		if (ctx->cmaf) {
+			gf_isom_modify_alternate_brand(ctx->file, (ctx->cmaf==MP4MX_CMAF_CMF2) ? GF_ISOM_BRAND_CMF2 : GF_ISOM_BRAND_CMFC, GF_TRUE);
+		}
 	}
 
 	width = height = sr = nb_chan = z_order = txt_fsize = 0;
@@ -1247,7 +1469,7 @@
 		multi_pid_final_stsd_idx = p->value.uint;
 
 		//should never be the case
-		ctx->xps_inband = 0;
+		tkw->xps_inband = XPS_IB_NO;
 		ctx->dref = GF_FALSE;
 		orig_pid = pid;
 		goto multipid_stsd_setup;
@@ -1287,8 +1509,10 @@
 
 	if (is_true_pid) {
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NB_FRAMES);
-		if (p) tkw->nb_frames = p->value.uint;
-		else tkw->nb_frames = 0;
+		tkw->nb_frames = p ? p->value.uint : 0;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FRAME_OFFSET);
+		tkw->frame_offset = p ? p->value.uint : 0;
 	}
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_SUBTYPE);
 	if (p) m_subtype_src = p->value.uint;
@@ -1298,8 +1522,12 @@
 	switch (codec_id) {
 	case GF_CODECID_MPEG_AUDIO:
 	case GF_CODECID_MPEG2_PART3:
+	case GF_CODECID_MPEG_AUDIO_L1:
 		m_subtype = GF_ISOM_SUBTYPE_MP3;
 		comp_name = "MP3";
+		//if source had a DSI, this was mpeg4 systems signaling, reuse that
+		if (dsi)
+			use_m4sys = GF_TRUE;
 		break;
 	case GF_CODECID_AAC_MPEG4:
 	case GF_CODECID_AAC_MPEG2_MP:
@@ -1334,13 +1562,24 @@
 			}
 		}
 		break;
+	case GF_CODECID_USAC:
+		m_subtype = GF_ISOM_SUBTYPE_MPEG4;
+		use_m4sys = GF_TRUE;
+		comp_name = "xHE-AAC / USAC";
+		use_gen_sample_entry = GF_FALSE;
+		break;
 	case GF_CODECID_JPEG:
 		m_subtype = GF_ISOM_BOX_TYPE_JPEG;
 		comp_name = "JPEG";
+		//use generic sample desc, but don't inject dsi
+		if (!use_m4sys)
+			dsi = NULL;
 		break;
 	case GF_CODECID_PNG:
 		m_subtype = GF_ISOM_BOX_TYPE_PNG;
 		comp_name = "PNG";
+		//use generic sample desc, but don't inject dsi
+		dsi = NULL;
 		break;
 	case GF_CODECID_J2K:
 		m_subtype = GF_ISOM_BOX_TYPE_MJP2;
@@ -1355,7 +1594,8 @@
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AMR_MODE_SET);
 		if (p && (p->value.uint!=tkw->amr_mode_set)) {
 			tkw->amr_mode_set = p->value.uint;
-			needs_sample_entry = 2;
+			if (!needs_sample_entry)
+				needs_sample_entry = 2;
 		}
 		break;
 	case GF_CODECID_AMR_WB:
@@ -1365,7 +1605,8 @@
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AMR_MODE_SET);
 		if (p && (p->value.uint!=tkw->amr_mode_set)) {
 			tkw->amr_mode_set = p->value.uint;
-			needs_sample_entry = 2;
+			if (!needs_sample_entry)
+				needs_sample_entry = 2;
 		}
 		break;
 	case GF_CODECID_EVRC:
@@ -1395,7 +1636,7 @@
 		use_ac3_entry = GF_TRUE;
 		break;
 	case GF_CODECID_EAC3:
-		m_subtype = GF_ISOM_SUBTYPE_AC3;
+		m_subtype = GF_ISOM_SUBTYPE_EC3;
 		comp_name = "EAC-3";
 		use_ac3_entry = GF_TRUE;
 		break;
@@ -1405,6 +1646,7 @@
 		else
 			m_subtype = m_subtype_src;
 		comp_name = "MPEG-H Audio";
+		nb_chan = 0;
 		break;
 	case GF_CODECID_MHAS:
 		if ((m_subtype_src!=GF_ISOM_SUBTYPE_MH3D_MHM1) && (m_subtype_src!=GF_ISOM_SUBTYPE_MH3D_MHM2))
@@ -1412,6 +1654,7 @@
 		else
 			m_subtype = m_subtype_src;
 		comp_name = "MPEG-H AudioMux";
+		nb_chan = 0;
 		break;
 	case GF_CODECID_FLAC:
 		m_subtype = GF_ISOM_SUBTYPE_FLAC;
@@ -1431,28 +1674,44 @@
 		break;
 	case GF_CODECID_AVC:
 	case GF_CODECID_SVC:
-		m_subtype = ((ctx->xps_inband==1) || (ctx->xps_inband==2)) ? GF_ISOM_SUBTYPE_AVC3_H264 : GF_ISOM_SUBTYPE_AVC_H264;
+		if (ctx->xps_inband==XPS_IB_AUTO) {
+			if (m_subtype_src == GF_ISOM_SUBTYPE_AVC3_H264) {
+				m_subtype = GF_ISOM_SUBTYPE_AVC3_H264;
+				xps_inband = XPS_IB_ALL;
+			} else {
+				m_subtype = GF_ISOM_SUBTYPE_AVC_H264;
+			}
+		} else {
+			xps_inband = ctx->xps_inband;
+			m_subtype = ((xps_inband==XPS_IB_ALL) || (xps_inband==XPS_IB_BOTH)) ? GF_ISOM_SUBTYPE_AVC3_H264 : GF_ISOM_SUBTYPE_AVC_H264;
+		}
 		use_avc = GF_TRUE;
 		comp_name = (codec_id == GF_CODECID_SVC) ? "MPEG-4 SVC" : "MPEG-4 AVC";
 		use_gen_sample_entry = GF_FALSE;
-		if (ctx->xps_inband) {
+		if (m_subtype != GF_ISOM_SUBTYPE_AVC_H264) {
 			use_m4sys = GF_FALSE;
-			if (ctx->xps_inband==1) skip_dsi = GF_TRUE;
+			if (xps_inband==XPS_IB_ALL) skip_dsi = GF_TRUE;
 		}
 		break;
 	case GF_CODECID_HEVC:
 	case GF_CODECID_LHVC:
-		m_subtype = ((ctx->xps_inband==1) || (ctx->xps_inband==2)) ? GF_ISOM_SUBTYPE_HEV1 : GF_ISOM_SUBTYPE_HVC1;
+		if (ctx->xps_inband==XPS_IB_AUTO) {
+			if (m_subtype_src == GF_ISOM_SUBTYPE_HEV1) {
+				m_subtype = GF_ISOM_SUBTYPE_HEV1;
+				xps_inband = XPS_IB_ALL;
+			} else {
+				m_subtype = GF_ISOM_SUBTYPE_HVC1;
+			}
+		} else {
+			xps_inband = ctx->xps_inband;
+			m_subtype = ((xps_inband==XPS_IB_ALL) || (xps_inband==XPS_IB_BOTH)) ? GF_ISOM_SUBTYPE_HEV1 : GF_ISOM_SUBTYPE_HVC1;
+		}
 		use_hevc = GF_TRUE;
 		comp_name = (codec_id == GF_CODECID_LHVC) ? "L-HEVC" : "HEVC";
 		use_gen_sample_entry = GF_FALSE;
-		if (ctx->xps_inband) {
+		if (m_subtype != GF_ISOM_SUBTYPE_HVC1) {
 			use_m4sys = GF_FALSE;
-			if (ctx->xps_inband==1) skip_dsi = GF_TRUE;
-		}
-		if (codec_id==GF_CODECID_HEVC_TILES) {
-			m_subtype = GF_ISOM_SUBTYPE_HVT1;
-			skip_dsi = GF_TRUE;
+			if (xps_inband==XPS_IB_ALL) skip_dsi = GF_TRUE;
 		}
 		break;
 	case GF_CODECID_HEVC_TILES:
@@ -1463,6 +1722,31 @@
 		comp_name = "HEVC Tiles";
 		use_gen_sample_entry = GF_FALSE;
 		break;
+	case GF_CODECID_VVC:
+		if (ctx->xps_inband==XPS_IB_AUTO) {
+			if (m_subtype_src == GF_ISOM_SUBTYPE_VVI1) {
+				m_subtype = GF_ISOM_SUBTYPE_VVI1;
+				xps_inband = XPS_IB_ALL;
+			} else {
+				m_subtype = GF_ISOM_SUBTYPE_VVC1;
+			}
+		} else {
+			xps_inband = ctx->xps_inband;
+			m_subtype = ((xps_inband==XPS_IB_PPS) || (xps_inband==XPS_IB_ALL) || (xps_inband==XPS_IB_BOTH)) ? GF_ISOM_SUBTYPE_VVI1 : GF_ISOM_SUBTYPE_VVC1;
+		}
+		use_vvc = GF_TRUE;
+		comp_name = "VVC";
+		use_gen_sample_entry = GF_FALSE;
+		if (xps_inband==XPS_IB_ALL) skip_dsi = GF_TRUE;
+		break;
+	case GF_CODECID_VVC_SUBPIC:
+		m_subtype = GF_ISOM_SUBTYPE_VVS1;
+		skip_dsi = GF_TRUE;
+		use_vvc = GF_TRUE;
+		use_m4sys = GF_FALSE;
+		comp_name = "VVC Subpicture";
+		use_gen_sample_entry = GF_FALSE;
+		break;
 	case GF_CODECID_MPEG1:
 	case GF_CODECID_MPEG2_422:
 	case GF_CODECID_MPEG2_SNR:
@@ -1532,6 +1816,12 @@
 		use_m4sys = GF_TRUE;
 		break;
 
+	case GF_CODECID_TRUEHD:
+		m_subtype = GF_ISOM_SUBTYPE_MLPA;
+		comp_name = "Dolby TrueHD";
+		break;
+
+
 	case GF_CODECID_BIFS:
 /* == GF_CODECID_OD_V1:*/
 	case GF_CODECID_BIFS_V2:
@@ -1540,6 +1830,12 @@
 	case GF_CODECID_LASER:
 		use_m4sys = GF_TRUE;
 		break;
+	case GF_CODECID_V210:
+		m_subtype = GF_QT_SUBTYPE_YUV422_10;
+		comp_name = "v210 YUV 422 10 bit";
+		use_gen_sample_entry = GF_TRUE;
+		unknown_generic = GF_FALSE;
+		break;
 
 	case GF_CODECID_RAW:
 		m_subtype = codec_id;
@@ -1548,13 +1844,15 @@
 		use_m4sys = GF_FALSE;
 		tkw->skip_bitrate_update = GF_TRUE;
 		if (tkw->stream_type == GF_STREAM_AUDIO) {
+			u32 afmt;
 			u32 req_non_planar_type = 0;
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
 			if (!p) break;
 			comp_name = "RawAudio";
 			unknown_generic = GF_FALSE;
-			//todo: we currently only set QTFF-style raw media, add ISOBMFF raw audio support
-			switch (p->value.uint) {
+			afmt = p->value.uint;
+			//m_subtype used for QTFF-style raw media, m_subtype_alt_raw for ISOBMFF raw audio
+			switch (afmt) {
 			case GF_AUDIO_FMT_U8P:
 			 	req_non_planar_type = GF_AUDIO_FMT_U8;
 			case GF_AUDIO_FMT_U8:
@@ -1566,6 +1864,9 @@
 				m_subtype = GF_QT_SUBTYPE_SOWT;
 				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
 				break;
+			case GF_AUDIO_FMT_S16_BE:
+				m_subtype = GF_QT_SUBTYPE_TWOS;
+				break;
 			case GF_AUDIO_FMT_S24P:
 			 	req_non_planar_type = GF_AUDIO_FMT_S24;
 			case GF_AUDIO_FMT_S24:
@@ -1603,42 +1904,52 @@
 					return GF_NOT_SUPPORTED;
 				}
 			}
-			raw_bitdepth = gf_audio_fmt_bit_depth(p->value.uint);
+			raw_bitdepth = gf_audio_fmt_bit_depth(afmt);
 			tkw->raw_audio_bytes_per_sample = raw_bitdepth;
 			tkw->raw_audio_bytes_per_sample *= nb_chan;
 			tkw->raw_audio_bytes_per_sample /= 8;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+			tkw->raw_samplerate = p ? p->value.uint : 0;
+			//force timescale to be samplerate, except if explicit overwrite
+			if (ctx->mediats==0)
+				tkw->tk_timescale = tkw->raw_samplerate;
+
+			if ((sr == tkw->w_or_sr) && (nb_chan==tkw->h_or_ch) && (afmt==tkw->pf_or_af)) {
+
+			} else {
+				if (!needs_sample_entry)
+					needs_sample_entry = 2;
+				tkw->w_or_sr = sr;
+				tkw->h_or_ch = nb_chan;
+				tkw->pf_or_af = afmt;
+			}
 		}
 		else if (tkw->stream_type == GF_STREAM_VISUAL) {
+			u32 pfmt;
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
 			if (!p) break;
+			pfmt = p->value.uint;
 			comp_name = "RawVideo";
 			unknown_generic = GF_FALSE;
 			tkw->skip_bitrate_update = GF_TRUE;
-			//we currently only set QTFF-style raw media
-			switch (p->value.uint) {
-			case GF_PIXEL_RGB:
-				m_subtype = GF_QT_SUBTYPE_RAW;
-				break;
-			case GF_PIXEL_YUV422:
-				m_subtype = GF_QT_SUBTYPE_YUV422;
-				force_colr = GF_TRUE;
-				break;
-			case GF_PIXEL_YUV422_10:
-				m_subtype = GF_QT_SUBTYPE_YUV422_10;
-				force_colr = GF_TRUE;
-				break;
-			case GF_PIXEL_YUV444:
-				m_subtype = GF_QT_SUBTYPE_YUV444;
-				force_colr = GF_TRUE;
-				break;
-			case GF_PIXEL_YUV444_10:
-				m_subtype = GF_QT_SUBTYPE_YUV444_10;
-				force_colr = GF_TRUE;
-				break;
-			default:
+
+			m_subtype = gf_pixel_fmt_to_qt_type(p->value.uint);
+			if (m_subtype) {
+				if (gf_pixel_fmt_is_yuv(p->value.uint))
+					force_colr = GF_TRUE;
+			} else {
 				unknown_generic = GF_TRUE;
 				m_subtype = p->value.uint;
-				break;
+			}
+
+			if ((width == tkw->w_or_sr) && (height==tkw->h_or_ch) && (pfmt==tkw->pf_or_af)) {
+
+			} else {
+				if (!needs_sample_entry)
+					needs_sample_entry = 2;
+				tkw->w_or_sr = width;
+				tkw->h_or_ch = height;
+				tkw->pf_or_af = pfmt;
 			}
 		}
 		break;
@@ -1678,11 +1989,11 @@
 	if (!ctx->init_movie_done && !tkw->nb_samples && (ctx->mediats<0) && (tkw->tk_timescale==1000)) {
 		if (sr) {
 			tkw->tk_timescale = sr;
-			gf_isom_set_media_timescale(ctx->file, tkw->track_num, sr, 0, GF_TRUE);
+			gf_isom_set_media_timescale(ctx->file, tkw->track_num, sr, 0, 1);
 		}
 		else if (width && fps.den) {
 			tkw->tk_timescale = fps.den;
-			gf_isom_set_media_timescale(ctx->file, tkw->track_num, fps.den, 0, GF_TRUE);
+			gf_isom_set_media_timescale(ctx->file, tkw->track_num, fps.den, 0, 1);
 		}
 	}
 	if (!needs_sample_entry || tkw->is_item) {
@@ -1697,15 +2008,15 @@
 		}
 		force_mix_xps = GF_TRUE;
 	} else if (ctx->store < MP4MX_MODE_FRAG) {
-		if ((needs_sample_entry==2) && (ctx->xps_inband==2)) {
+		if ((needs_sample_entry==2) && (xps_inband==XPS_IB_BOTH)) {
 			force_mix_xps = GF_TRUE;
 		}
-		else if ((needs_sample_entry==2) && ((ctx->xps_inband==1)||(ctx->xps_inband==3)) ) {
+		else if ((needs_sample_entry==2) && ((xps_inband==XPS_IB_ALL) || (xps_inband==XPS_IB_MIX)) ) {
 			needs_sample_entry = 0;
 			make_inband_headers = GF_TRUE;
 		}
 	}
-	
+
 	if (force_mix_xps) {
 
 		//for AVC and HEVC, move to inband params if config changed
@@ -1718,13 +2029,15 @@
 				if (tkw->svcc) gf_odf_avc_cfg_del(tkw->svcc);
 				tkw->svcc = gf_odf_avc_cfg_read(enh_dsi->value.data.ptr, enh_dsi->value.data.size);
 			}
-			if (!ctx->xps_inband) {
+			if (!xps_inband) {
 				if (ctx->init_movie_done) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] AVC config update after movie has been finalized, moving all SPS/PPS inband (file might not be compliant)\n"));
 				}
-				ctx->xps_inband = 2;
+				tkw->xps_inband = XPS_IB_BOTH;
 			}
-			mp4_mux_make_inband_header(ctx, tkw);
+			mp4_mux_make_inband_header(ctx, tkw, GF_FALSE);
+			if (ctx->pps_inband || tkw->xps_inband)
+				mp4_mux_make_inband_header(ctx, tkw, GF_TRUE);
 			return GF_OK;
 		}
 		else if (use_hevc && dsi) {
@@ -1735,23 +2048,40 @@
 				if (tkw->lvcc) gf_odf_hevc_cfg_del(tkw->lvcc);
 				tkw->lvcc = gf_odf_hevc_cfg_read(enh_dsi->value.data.ptr, enh_dsi->value.data.size, GF_TRUE);
 			}
-			if (!ctx->xps_inband) {
+			if (!xps_inband) {
 				if (ctx->init_movie_done) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] HEVC config update after movie has been finalized, moving all SPS/PPS inband (file might not be compliant)\n"));
 				}
-				ctx->xps_inband = 2;
+				tkw->xps_inband = XPS_IB_BOTH;
 			}
-			mp4_mux_make_inband_header(ctx, tkw);
+			mp4_mux_make_inband_header(ctx, tkw, GF_FALSE);
+			if (ctx->pps_inband || tkw->xps_inband)
+				mp4_mux_make_inband_header(ctx, tkw, GF_TRUE);
 			return GF_OK;
 		}
+		else if (use_vvc && dsi) {
+			if (tkw->vvcc) gf_odf_vvc_cfg_del(tkw->vvcc);
+			tkw->vvcc = gf_odf_vvc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
 
+			if (!xps_inband) {
+				if (ctx->init_movie_done) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] VVC config update after movie has been finalized, moving all SPS/PPS inband (file might not be compliant)\n"));
+				}
+				tkw->xps_inband = XPS_IB_BOTH;
+			}
+			mp4_mux_make_inband_header(ctx, tkw, GF_FALSE);
+			if (ctx->pps_inband || tkw->xps_inband)
+				mp4_mux_make_inband_header(ctx, tkw, GF_TRUE);
+			return GF_OK;
+		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Cannot create a new sample description entry (config changed) for finalized movie in fragmented mode\n"));
 		return GF_NOT_SUPPORTED;
 	}
 
+	tkw->xps_inband = xps_inband;
 
-	//little optim here: if no samples were added on the stream descritpion remove it
-	if (!tkw->samples_in_stsd && tkw->stsd_idx) {
+	//little optim here: if no samples were added on the stream description remove it
+	if (!tkw->samples_in_stsd && tkw->stsd_idx && needs_sample_entry) {
 		gf_isom_remove_stream_description(ctx->file, tkw->track_num, tkw->stsd_idx);
 	}
 
@@ -1810,8 +2140,12 @@
 		if (tkw->avcc) gf_odf_avc_cfg_del(tkw->avcc);
 
 		//not yet known
-		if (!dsi) return GF_OK;
+		if (!dsi && !enh_dsi) return GF_OK;
 
+		if (!dsi) {
+			dsi = enh_dsi;
+			enh_dsi = NULL;
+		}
 		tkw->avcc = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
 
 		if (needs_sample_entry) {
@@ -1838,8 +2172,8 @@
 						tkw->svcc = NULL;
 					}
 
-					if (ctx->xps_inband) {
-						gf_isom_avc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, (ctx->xps_inband==2) ? GF_TRUE : GF_FALSE);
+					if (xps_inband) {
+						gf_isom_avc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, (xps_inband==XPS_IB_BOTH) ? GF_TRUE : GF_FALSE);
 					}
 				}
 			}
@@ -1849,10 +2183,10 @@
 			}
 		}
 		
-		if (ctx->xps_inband) {
+		if (xps_inband) {
 			//this will cleanup all PS in avcC / svcC
-			gf_isom_avc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, (ctx->xps_inband==2) ? GF_TRUE : GF_FALSE);
-			if (ctx->xps_inband==2) make_inband_headers = GF_TRUE;
+			gf_isom_avc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, (xps_inband==XPS_IB_BOTH) ? GF_TRUE : GF_FALSE);
+			if (xps_inband==XPS_IB_BOTH) make_inband_headers = GF_TRUE;
 		} else {
 			gf_odf_avc_cfg_del(tkw->avcc);
 			tkw->avcc = NULL;
@@ -1927,8 +2261,8 @@
 						tkw->lvcc = NULL;
 					}
 
-					if (!dsi && ctx->xps_inband) {
-						gf_isom_hevc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, (ctx->xps_inband==2) ? GF_TRUE : GF_FALSE);
+					if (!dsi && tkw->xps_inband) {
+						gf_isom_hevc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, (tkw->xps_inband==XPS_IB_BOTH) ? GF_TRUE : GF_FALSE);
 					}
 				}
 			} else if (codec_id == GF_CODECID_LHVC) {
@@ -1942,16 +2276,71 @@
 			}
 		}
 
-		if (dsi && ctx->xps_inband) {
+		if (dsi && tkw->xps_inband) {
 			//this will cleanup all PS in avcC / svcC
-			gf_isom_hevc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, (ctx->xps_inband==2) ? GF_TRUE : GF_FALSE);
+			gf_isom_hevc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, (tkw->xps_inband==XPS_IB_BOTH) ? GF_TRUE : GF_FALSE);
 		} else {
 			gf_odf_hevc_cfg_del(tkw->hvcc);
 			tkw->hvcc = NULL;
 		}
 
 		tkw->use_dref = GF_FALSE;
+	} else if (use_vvc) {
+		if (tkw->vvcc) gf_odf_vvc_cfg_del(tkw->vvcc);
 
+		if (!dsi) {
+			//not yet known
+			return GF_OK;
+		}
+		tkw->vvcc = gf_odf_vvc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+
+		tkw->is_nalu = NALU_VVC;
+
+		if (needs_sample_entry) {
+			if (tkw->xps_inband == XPS_IB_PPS) {
+				u32 k; count=gf_list_count(tkw->vvcc->param_array);
+				for (k=0;k<count;k++) {
+					GF_NALUFFParamArray *pa = gf_list_get(tkw->vvcc->param_array, k);
+					if (pa->type==GF_VVC_NALU_PIC_PARAM)
+						pa->array_completeness = GF_FALSE;
+				}
+			}
+			e = gf_isom_vvc_config_new(ctx->file, tkw->track_num, tkw->vvcc, NULL, NULL, &tkw->stsd_idx);
+
+			if (!tkw->has_brands) {
+				gf_isom_set_brand_info(ctx->file, GF_ISOM_BRAND_ISO4, 1);
+				gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISOM, GF_FALSE);
+			}
+			//patch for old arch
+			else if (ctx->dash_mode) {
+				Bool force_brand=GF_FALSE;
+				if (((ctx->major_brand_set>>24)=='i') && (((ctx->major_brand_set>>16)&0xFF)=='s') && (((ctx->major_brand_set>>8)&0xFF)=='o')) {
+					if ( (ctx->major_brand_set&0xFF) <'6') force_brand=GF_TRUE;
+				}
+
+				if (!force_brand && ctx->major_brand_set) {
+					gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO6, GF_TRUE);
+				} else {
+					gf_isom_set_brand_info(ctx->file, GF_ISOM_BRAND_ISO6, 1);
+					gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISOM, GF_FALSE);
+				}
+			}
+
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new HEVC sample description: %s\n", gf_error_to_string(e) ));
+				return e;
+			}
+		}
+
+		if (tkw->xps_inband) {
+			//this will cleanup all PS in vvcC
+			gf_isom_vvc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, ((tkw->xps_inband==XPS_IB_PPS) || (tkw->xps_inband==XPS_IB_BOTH)) ? GF_TRUE : GF_FALSE);
+		} else {
+			gf_odf_vvc_cfg_del(tkw->vvcc);
+			tkw->vvcc = NULL;
+		}
+
+		tkw->use_dref = GF_FALSE;
 	} else if (use_av1) {
 		GF_AV1Config *av1c;
 
@@ -2047,7 +2436,7 @@
 		memset(&ac3cfg, 0, sizeof(GF_AC3Config));
 
 		if (dsi) {
-			gf_isom_ac3_config_parse(dsi->value.data.ptr, dsi->value.data.size, (codec_id==GF_CODECID_EAC3) ? GF_TRUE : GF_FALSE, &ac3cfg);
+			gf_odf_ac3_config_parse(dsi->value.data.ptr, dsi->value.data.size, (codec_id==GF_CODECID_EAC3) ? GF_TRUE : GF_FALSE, &ac3cfg);
 		}
 		e = gf_isom_ac3_config_new(ctx->file, tkw->track_num, &ac3cfg, (char *)src_url, NULL, &tkw->stsd_idx);
 		if (e) {
@@ -2101,13 +2490,26 @@
 			return e;
 		}
 	} else if (m_subtype == GF_ISOM_SUBTYPE_STPP) {
-		if (meta_xmlns && !strcmp(meta_xmlns, "http://www.w3.org/ns/ttml")) comp_name = "TTML";
-		else comp_name = "XML Subtitle";
+		if (meta_xmlns && !strcmp(meta_xmlns, "http://www.w3.org/ns/ttml")) {
+			comp_name = "TTML";
+		} else {
+			comp_name = "XML Subtitle";
+		}
 		e = gf_isom_new_xml_subtitle_description(ctx->file, tkw->track_num, meta_xmlns, meta_schemaloc, meta_auxmimes, &tkw->stsd_idx);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new XML subtitle sample description: %s\n", gf_error_to_string(e) ));
 			return e;
 		}
+
+		//CMAF 11.3.2
+		if (ctx->cmaf) {
+			if (!meta_mime) meta_mime = gf_isom_subtitle_get_mime(ctx->file, tkw->track_num, tkw->stsd_idx);
+			if (!meta_mime || (!strstr(meta_mime, "im1t") && !strstr(meta_mime, "im1i"))) {
+				gf_isom_subtitle_set_mime(ctx->file, tkw->track_num, tkw->stsd_idx, "application/ttml+xml;codecs=im1t");
+			}
+		}
+
+
 	} else if ((m_subtype == GF_ISOM_SUBTYPE_SBTT) || (m_subtype == GF_ISOM_SUBTYPE_STXT) ) {
 		comp_name = (m_subtype == GF_ISOM_SUBTYPE_STXT) ? "Simple Timed Text" : "Textual Subtitle";
 		e = gf_isom_new_stxt_description(ctx->file, tkw->track_num, m_subtype, meta_mime, meta_content_encoding, meta_config, &tkw->stsd_idx);
@@ -2209,6 +2611,34 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new DIMS sample description: %s\n", gf_error_to_string(e) ));
 			return e;
 		}
+	} else if (codec_id==GF_CODECID_MPHA) {
+		//not ready yet
+		if (!dsi) return GF_OK;
+
+		e = gf_isom_new_mpha_description(ctx->file, tkw->track_num, NULL, NULL, &tkw->stsd_idx, dsi->value.data.ptr, dsi->value.data.size);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new MPEG-H Audio sample description: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
+	} else if (codec_id==GF_CODECID_TRUEHD) {
+		u32 fmt=0, prate=0;
+		//not ready yet
+		if (!dsi) return GF_OK;
+		if (dsi->value.data.size < 6) return GF_NON_COMPLIANT_BITSTREAM;
+
+		fmt = dsi->value.data.ptr[0];
+		fmt <<= 8;
+		fmt |= dsi->value.data.ptr[1];
+		prate = dsi->value.data.ptr[2];
+		prate <<= 8;
+		prate |= dsi->value.data.ptr[3];
+		prate >>= 1;
+
+		e = gf_isom_truehd_config_new(ctx->file, tkw->track_num, (char *)src_url, NULL, fmt, prate, &tkw->stsd_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new TrueHD Audio sample description: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
 	} else if (use_gen_sample_entry) {
 		u8 isor_ext_buf[14];
 		u32 len = 0;
@@ -2244,6 +2674,18 @@
 				ase_mode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF;
 			}
 		}
+
+		if (codec_id == GF_CODECID_FFMPEG) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_SUBTYPE);
+			if (p) {
+				m_subtype = p->value.uint;
+			} else {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_FFMPEG_CODEC_ID);
+				if (p && p->type==GF_PROP_UINT)
+					m_subtype = p->value.uint;
+			}
+		}
+
 		udesc.codec_tag = m_subtype;
 		udesc.width = width;
 		udesc.height = height;
@@ -2252,6 +2694,21 @@
 			udesc.h_res = 72;
 			udesc.depth = 24;
 		}
+		if (dsi) {
+			udesc.extension_buf = dsi->value.data.ptr;
+			udesc.extension_buf_size = dsi->value.data.size;
+			p = gf_filter_pid_get_property_str(pid, "DSIWrap");
+			if (p) {
+				if (p->type==GF_PROP_UINT) udesc.ext_box_wrap = p->value.uint;
+				else if (p->type==GF_PROP_STRING) udesc.ext_box_wrap = gf_4cc_parse(p->value.string);
+			}
+		}
+		if (codec_id==GF_CODECID_FFV1) {
+			udesc.codec_tag = GF_4CC('F', 'F', 'V', '1');
+			udesc.ext_box_wrap = GF_4CC('g', 'l', 'b', 'l');
+			unknown_generic = GF_FALSE;
+		}
+
 		if (unknown_generic) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] muxing unknown codec ID %s, using generic sample entry with 4CC \"%s\"\n", gf_codecid_name(codec_id), gf_4cc_to_str(m_subtype) ));
 		}
@@ -2398,11 +2855,12 @@
 		case GF_ISOM_CENS_SCHEME:
 		case GF_ISOM_CBC_SCHEME:
 		case GF_ISOM_CBCS_SCHEME:
+		case GF_HLS_SAMPLE_AES_SCHEME:
 			tkw->cenc_state = CENC_NEED_SETUP;
 			if (tkw->is_nalu || tkw->is_av1 || tkw->is_vpx) tkw->cenc_subsamples = GF_TRUE;
 			break;
 		default:
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Unrecognized protection scheme type %s, using generic signaling\n", gf_4cc_to_str(tkw->stream_type) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Unrecognized protection scheme type %s, using generic signaling\n", gf_4cc_to_str(scheme_type) ));
 			switch (tkw->stream_type) {
 			case GF_STREAM_VISUAL:
 				gf_isom_set_media_type(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_ENCV);
@@ -2429,11 +2887,27 @@
 	}
 
 	if (is_true_pid) {
-		mp4_mux_write_track_refs(ctx, tkw, "isom:scal", GF_ISOM_REF_SCAL);
-		mp4_mux_write_track_refs(ctx, tkw, "isom:sabt", GF_ISOM_REF_SABT);
-		mp4_mux_write_track_refs(ctx, tkw, "isom:tbas", GF_ISOM_REF_TBAS);
+		mp4_mux_write_track_refs(ctx, tkw, "isom:scal", GF_ISOM_REF_SCAL, GF_FALSE);
+		mp4_mux_write_track_refs(ctx, tkw, "isom:sabt", GF_ISOM_REF_SABT, GF_FALSE);
+		mp4_mux_write_track_refs(ctx, tkw, "isom:tbas", GF_ISOM_REF_TBAS, GF_TRUE);
+		mp4_mux_write_track_refs(ctx, tkw, "isom:sbas", GF_ISOM_REF_BASE, GF_FALSE);
+		//whenever we add a new tile track, rewrite sabt on main tile track
+		if (codec_id==GF_CODECID_HEVC_TILES) {
+			count = gf_list_count(ctx->tracks);
+			for (i=0; i<count; i++) {
+				TrackWriter *base_tk = gf_list_get(ctx->tracks, i);
+				if (base_tk->is_hevc_tile_base)
+					mp4_mux_write_track_refs(ctx, base_tk, "isom:sabt", GF_ISOM_REF_SABT, GF_FALSE);
+			}
+		}
+
+		//check if we have sample-accurate seek info for the pid. If so, enable seek ts checking
+		p = gf_filter_pid_get_property(pid, GF_PROP_PCK_SKIP_BEGIN);
+		if (p && p->value.sint)
+			tkw->check_seek_ts = GF_TRUE;
+
 	} else if (codec_id==GF_CODECID_HEVC_TILES) {
-		mp4_mux_write_track_refs(ctx, tkw, "isom:tbas", GF_ISOM_REF_TBAS);
+		mp4_mux_write_track_refs(ctx, tkw, "isom:tbas", GF_ISOM_REF_TBAS, GF_TRUE);
 	}
 
 	if (is_true_pid && ctx->dash_mode && is_tile_base) {
@@ -2469,6 +2943,9 @@
 		if (ctx->maxchunk)
 			gf_isom_hint_max_chunk_size(ctx->file, tkw->track_num, ctx->maxchunk);
 
+		if (ctx->store==MP4MX_MODE_FLAT)
+			gf_isom_hint_max_chunk_duration(ctx->file, tkw->track_num, tkw->tk_timescale * ctx->cdur.num / ctx->cdur.den);
+
 		if (sr) {
 			if (use_flac_entry) {
 				while (sr>65535) {
@@ -2527,26 +3004,54 @@
 			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_COLR_RANGE);
 			if (p) full_range_flag = p->value.boolean;
 
+			if (ctx->cmaf) {
+				u32 hspac=0, vspac=0;
+				force_colr = GF_TRUE;
+				gf_isom_get_pixel_aspect_ratio(ctx->file, tkw->track_num, tkw->stsd_idx, &hspac, &vspac);
+				if (hspac && vspac) {
+					sar.num = hspac;
+					sar.den = vspac;
+				} else {
+					sar.den = 0;
+				}
+			}
+
 			if ((ctx->prores_track == tkw) || force_colr) {
+				u32 colr_mode;
+
+				if ((ctx->prores_track == tkw) || ctx->make_qt)
+					colr_mode = GF_4CC('n','c','l','c');
+				else
+					colr_mode = GF_4CC('n','c','l','x');
+
+
 				//other conditions were set above, here we force 1:1 pasp box even if no sar or 1:1
 				if (!sar.den || (sar.num == 1)) {
 					gf_isom_set_pixel_aspect_ratio(ctx->file, tkw->track_num, tkw->stsd_idx, -1, -1, GF_TRUE);
 				}
 
 				if (colour_primaries || transfer_characteristics || matrix_coefficients) {
-					gf_isom_set_visual_color_info(ctx->file, tkw->track_num, tkw->stsd_idx, GF_4CC('n','c','l','c'), colour_primaries, transfer_characteristics, matrix_coefficients, GF_FALSE, NULL, 0);
+					gf_isom_set_visual_color_info(ctx->file, tkw->track_num, tkw->stsd_idx, colr_mode, colour_primaries, transfer_characteristics, matrix_coefficients, GF_FALSE, NULL, 0);
 				} else {
 					e = gf_isom_get_color_info(ctx->file, tkw->track_num, tkw->stsd_idx, &colour_type, &colour_primaries, &transfer_characteristics, &matrix_coefficients, &full_range_flag);
 					if (e==GF_NOT_FOUND) {
+						e = gf_media_get_color_info(ctx->file, tkw->track_num, tkw->stsd_idx, &colour_type, &colour_primaries, &transfer_characteristics, &matrix_coefficients, &full_range_flag);
+						if (e)
+							e = GF_NOT_FOUND;
+					}
+					if (e==GF_NOT_FOUND) {
 						colour_primaries = 1;
 						transfer_characteristics = 1;
 						matrix_coefficients = 1;
 						full_range_flag = GF_FALSE;
 						if (ctx->make_qt==1) {
-							GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ProRes] No color info present in visual track, defaulting to BT709\n"));
+							GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ProRes] No color info present in visual track, defaulting to BT709\n"));
+						}
+						else if (ctx->cmaf) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[CMAF] No color info present in visual track, defaulting to BT709\n"));
 						}
 					}
-					gf_isom_set_visual_color_info(ctx->file, tkw->track_num, tkw->stsd_idx, GF_4CC('n','c','l','c'), 1, 1, 1, GF_FALSE, NULL, 0);
+					gf_isom_set_visual_color_info(ctx->file, tkw->track_num, tkw->stsd_idx, colr_mode, colour_primaries, transfer_characteristics, matrix_coefficients, full_range_flag, NULL, 0);
 				}
 
 				if (ctx->prores_track == tkw) {
@@ -2561,6 +3066,69 @@
 				}
 
 			}
+
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CONTENT_LIGHT_LEVEL);
+			const GF_PropertyValue *p2 = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_MASTER_DISPLAY_COLOUR);
+			if (p || p2) {
+				GF_MasteringDisplayColourVolumeInfo mdcv;
+				GF_ContentLightLevelInfo clli;
+				GF_BitStream *bs;
+				if (p) {
+					bs = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
+					clli.max_content_light_level = gf_bs_read_int(bs, 16);
+					clli.max_pic_average_light_level = gf_bs_read_int(bs, 16);
+					gf_bs_del(bs);
+				}
+				if (p2) {
+					bs = gf_bs_new(p2->value.data.ptr, p2->value.data.size, GF_BITSTREAM_READ);
+
+					for(u32 c=0;c<3;c++) {
+						mdcv.display_primaries[c].x = gf_bs_read_int(bs, 16);
+						mdcv.display_primaries[c].y = gf_bs_read_int(bs, 16);
+					}
+					mdcv.white_point_x = gf_bs_read_int(bs, 16);
+					mdcv.white_point_y = gf_bs_read_int(bs, 16);
+					mdcv.max_display_mastering_luminance = gf_bs_read_int(bs, 32);
+					mdcv.min_display_mastering_luminance = gf_bs_read_int(bs, 32);
+					gf_bs_del(bs);
+				}
+				gf_isom_set_high_dynamic_range_info(ctx->file, tkw->track_num, tkw->stsd_idx, p2 ? &mdcv : NULL, p ? &clli : NULL);
+			}
+
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_DOLBY_VISION);
+			if (p) {
+				GF_BitStream *bs = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
+				GF_DOVIDecoderConfigurationRecord *dvcc = gf_odf_dovi_cfg_read_bs(bs);
+				gf_bs_del(bs);
+				if (dvcc) {
+					gf_isom_set_dolby_vision_profile(ctx->file, tkw->track_num, tkw->stsd_idx, dvcc);
+
+					if (!dvcc->bl_present_flag) {
+						u32 i, ref_id = 0;
+
+						p = gf_filter_pid_get_property(pid, GF_PROP_PID_DEPENDENCY_ID);
+						if (p) ref_id = p->value.uint;
+						for (i=0; i<gf_list_count(ctx->tracks); i++) {
+							TrackWriter *tkw_base = gf_list_get(ctx->tracks, i);
+							if (tkw_base == tkw) continue;
+							if (tkw->codecid!=tkw_base->codecid) continue;
+							if (ref_id) {
+								p = gf_filter_pid_get_property(tkw_base->ipid, GF_PROP_PID_ID);
+								if (!p || (p->value.uint!=ref_id)) continue;
+							}
+							ref_id = gf_isom_get_track_id(ctx->file, tkw_base->track_num);
+							gf_isom_set_track_reference(ctx->file, tkw->track_num, GF_4CC('v','d','e','p'), ref_id);
+
+							//dolby requires seperate moof for each track fragment for base and el
+							if (ctx->store>=MP4MX_MODE_FRAG) {
+								ctx->straf = GF_TRUE;
+							}
+							break;
+						}
+					}
+					gf_odf_dovi_cfg_del(dvcc);
+				}
+			}
 		}
 		//default for old arch
 		else if (force_tk_layout
@@ -2575,9 +3143,62 @@
 		if (ctx->tktpl && p && p->value.data.ptr) {
 			gf_isom_update_sample_description_from_template(ctx->file, tkw->track_num, tkw->stsd_idx, p->value.data.ptr, p->value.data.size);
 		}
+	}
+
+	if (tkw->is_encrypted) {
+		tkw->cenc_ki = gf_filter_pid_get_property(pid, GF_PROP_PID_CENC_KEY_INFO);
+		if (tkw->cenc_ki && ((tkw->cenc_ki->type != GF_PROP_DATA) || !gf_cenc_validate_key_info(tkw->cenc_ki->value.data.ptr, tkw->cenc_ki->value.data.size))
+		) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Invalid CENC key info\n"));
+			tkw->cenc_ki = NULL;
+		}
+
+		tkw->constant_IV_size = 0;
+		if (tkw->cenc_ki && tkw->cenc_ki->value.data.ptr) {
+			tkw->cenc_multikey = tkw->cenc_ki->value.data.ptr[0] ? GF_TRUE : GF_FALSE;
+
+			if (!tkw->cenc_ki->value.data.ptr[3])
+				tkw->constant_IV_size = !tkw->cenc_ki->value.data.ptr[20];
+
+			tkw->cenc_key_info_crc = gf_crc_32(tkw->cenc_ki->value.data.ptr, tkw->cenc_ki->value.data.size);
+		}
+	}
 
+	if (is_true_pid) {
+		const GF_PropertyValue *ster = gf_filter_pid_get_property(pid, GF_PROP_PID_STEREO_TYPE);
+		const GF_PropertyValue *proj = gf_filter_pid_get_property(pid, GF_PROP_PID_PROJECTION_TYPE);
+		const GF_PropertyValue *pose = gf_filter_pid_get_property(pid, GF_PROP_PID_VR_POSE);
+
+		if (ster || proj) {
+			GF_ISOM_Y3D_Info yt3d;
+			memset(&yt3d, 0, sizeof(GF_ISOM_Y3D_Info));
+			yt3d.projection_type = proj ? proj->value.uint : 0;
+			yt3d.stereo_type = ster ? ster->value.uint : 0;
+			if (pose) {
+				yt3d.pose_present = GF_TRUE;
+				yt3d.yaw = pose->value.vec3i.x;
+				yt3d.pitch = pose->value.vec3i.y;
+				yt3d.roll = pose->value.vec3i.z;
+				yt3d.stereo_type = ster ? ster->value.uint : 0;
+			}
+			if (yt3d.projection_type==GF_PROJ360_CUBE_MAP) {
+				proj = gf_filter_pid_get_property(pid, GF_PROP_PID_CUBE_MAP_PAD);
+				yt3d.padding = proj ? proj->value.uint : 0;
+			}
+			else if (yt3d.projection_type==GF_PROJ360_EQR) {
+				proj = gf_filter_pid_get_property(pid, GF_PROP_PID_EQR_CLAMP);
+				if (proj) {
+					yt3d.top = proj->value.vec4i.x;
+					yt3d.bottom = proj->value.vec4i.y;
+					yt3d.left = proj->value.vec4i.z;
+					yt3d.right = proj->value.vec4i.w;
+				}
+			}
+			gf_isom_set_y3d_info(ctx->file, tkw->track_num, tkw->stsd_idx, &yt3d);
+		}
 	}
 
+
 	if (is_true_pid && ctx->importer && !tkw->import_msg_header_done) {
 #ifndef GPAC_DISABLE_LOG
 		const char *dst_type = tkw->is_item ? "Item Importing" : "Track Importing";
@@ -2585,18 +3206,26 @@
 		tkw->import_msg_header_done = GF_TRUE;
 		if (!imp_name) imp_name = comp_name;
 		if (sr) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s %s - SampleRate %d Num Channels %d\n", dst_type, imp_name, sr, nb_chan));
+			if (nb_chan) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s - SampleRate %d Num Channels %d\n", dst_type, imp_name, sr, nb_chan));
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s - SampleRate %d\n", dst_type, imp_name, sr));
+			}
 		} else if (is_text_subs) {
 			if (txt_fsize || txt_font) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s %s - Text track %d x %d font %s (size %d) layer %d\n", dst_type, imp_name, width, height, txt_font ? txt_font : "unspecified", txt_fsize, z_order));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s - Text track %d x %d font %s (size %d) layer %d\n", dst_type, imp_name, width, height, txt_font ? txt_font : "unspecified", txt_fsize, z_order));
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s %s - Text track %d x %d layer %d\n", dst_type, imp_name, width, height, z_order));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s - Text track %d x %d layer %d\n", dst_type, imp_name, width, height, z_order));
 
 			}
 		} else if (width) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s %s - Width %d Height %d FPS %d/%d SAR %d/%u\n", dst_type, imp_name, width, height, fps.num, fps.den, sar.num, sar.den));
+			if (sar.den && sar.num) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s - Width %d Height %d FPS %d/%d SAR %d/%u\n", dst_type, imp_name, width, height, fps.num, fps.den, sar.num, sar.den));
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s - Width %d Height %d FPS %d/%d\n", dst_type, imp_name, width, height, fps.num, fps.den));
+			}
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s %s\n", dst_type, imp_name));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s\n", dst_type, imp_name));
 		}
 #ifndef GPAC_DISABLE_AV_PARSERS
 		if (tkw->svcc) {
@@ -2604,12 +3233,12 @@
 			memset(&avc, 0, sizeof(AVCState));
 			count = gf_list_count(tkw->svcc->sequenceParameterSets);
 			for (i=0; i<count; i++) {
-				GF_AVCConfigSlot *sl = gf_list_get(tkw->svcc->sequenceParameterSets, i);
+				GF_NALUFFParam *sl = gf_list_get(tkw->svcc->sequenceParameterSets, i);
 				u8 nal_type = sl->data[0] & 0x1F;
 				Bool is_subseq = (nal_type == GF_AVC_NALU_SVC_SUBSEQ_PARAM) ? GF_TRUE : GF_FALSE;
-				s32 ps_idx = gf_media_avc_read_sps(sl->data, sl->size, &avc, is_subseq, NULL);
+				s32 ps_idx = gf_avc_read_sps(sl->data, sl->size, &avc, is_subseq, NULL);
 				if (ps_idx>=0) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("SVC Detected - SSPS ID %d - frame size %d x %d\n", ps_idx-GF_SVC_SSPS_ID_SHIFT, avc.sps[ps_idx].width, avc.sps[ps_idx].height ));
+					GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("SVC Detected - SSPS ID %d - frame size %d x %d\n", ps_idx-GF_SVC_SSPS_ID_SHIFT, avc.sps[ps_idx].width, avc.sps[ps_idx].height ));
 
 				}
 			}
@@ -2618,7 +3247,7 @@
 
 	}
 	if (txt_font) gf_free(txt_font);
-	if (!ctx->xps_inband || tkw->is_item) {
+	if (!tkw->xps_inband || tkw->is_item) {
 		if (tkw->svcc) {
 			gf_odf_avc_cfg_del(tkw->svcc);
 			tkw->svcc = NULL;
@@ -2628,7 +3257,9 @@
 			tkw->lvcc = NULL;
 		}
 	} else if (needs_sample_entry || make_inband_headers) {
-		mp4_mux_make_inband_header(ctx, tkw);
+		mp4_mux_make_inband_header(ctx, tkw, GF_FALSE);
+		if (ctx->pps_inband || tkw->xps_inband)
+			mp4_mux_make_inband_header(ctx, tkw, GF_TRUE);
 	}
 
 	tkw->negctts_shift = 0;
@@ -2645,33 +3276,74 @@
 			if (!gf_sys_old_arch_compat()) {
 				gf_isom_remove_edits(ctx->file, tkw->track_num);
 			} else {
+				//old arch compat: if we had a simple edit list in source, keep dur and offset
+				//and avoid rewriting it when recomputing edit for b-frames
+				u64 etime, sdur;
+				GF_ISOEditType etype;
+				gf_isom_get_edit(ctx->file, tkw->track_num, 1, &etime, &sdur, &moffset, &etype);
+				if (!etime && sdur) {
+					tkw->imported_edit_sdur = sdur;
+					tkw->imported_edit_offset = moffset;
+				}
 				remove_edits = GF_TRUE;
 			}
 		}
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_FORCE_NEGCTTS);
+		if (p && p->value.boolean) use_negccts = GF_TRUE;
+
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DELAY);
 		if (p) {
-			if (p->value.sint < 0) {
-				if (ctx->ctmode==MP4MX_CT_NEGCTTS) use_negccts = GF_TRUE;
-				else {
+			//media skip
+			if (p->value.longsint < 0) {
+				//if cmf2, remove edits and use negctss
+				if ((ctx->cmaf==MP4MX_CMAF_CMF2) && (tkw->stream_type==GF_STREAM_VISUAL)) {
+					ctx->ctmode = MP4MX_CT_NEGCTTS;
+					gf_isom_remove_edits(ctx->file, tkw->track_num);
+					use_negccts = GF_TRUE;
+				}
+				else if ((ctx->ctmode==MP4MX_CT_NEGCTTS) && (tkw->stream_type==GF_STREAM_VISUAL)) {
+					use_negccts = GF_TRUE;
+				} else {
 					if (remove_edits) {
 						gf_isom_remove_edits(ctx->file, tkw->track_num);
 					}
-					gf_isom_set_edit(ctx->file, tkw->track_num, 0, 0, -p->value.sint, GF_ISOM_EDIT_NORMAL);
+					gf_isom_set_edit(ctx->file, tkw->track_num, 0, 0, -p->value.longsint, GF_ISOM_EDIT_NORMAL);
 				}
-			} else if (p->value.sint > 0) {
-				s64 dur = p->value.sint;
-				dur *= (u32) ctx->moovts;
-				dur /= tkw->src_timescale;
-				if (remove_edits) {
+			}
+			//media delay
+			else if (p->value.longsint > 0) {
+				//if cmaf (whether cmfc or cmf2), remove edits and add delay to tfdt
+				if (ctx->cmaf) {
 					gf_isom_remove_edits(ctx->file, tkw->track_num);
+					tkw->patch_tfdt = GF_TRUE;
+				} else {
+					s64 dur = 100*p->value.longsint;
+					dur *= (u32) ctx->moovts;
+					dur /= tkw->src_timescale;
+					if ((ctx->moovts < (s32) tkw->src_timescale) && (dur>150)) {
+						dur /= 100;
+						dur ++;
+					} else {
+						dur /= 100;
+					}
+					if (remove_edits) {
+						gf_isom_remove_edits(ctx->file, tkw->track_num);
+					}
+					gf_isom_set_edit(ctx->file, tkw->track_num, 0, dur, 0, GF_ISOM_EDIT_EMPTY);
+					gf_isom_set_edit(ctx->file, tkw->track_num, dur, 0, 0, GF_ISOM_EDIT_NORMAL);
 				}
-				gf_isom_set_edit(ctx->file, tkw->track_num, 0, dur, 0, GF_ISOM_EDIT_DWELL);
-				gf_isom_set_edit(ctx->file, tkw->track_num, 0, 0, 0, GF_ISOM_EDIT_NORMAL);
 			}
 			tkw->ts_delay = p->value.sint;
 		} else if (tkw->stream_type==GF_STREAM_VISUAL) {
 			tkw->probe_min_ctts = GF_TRUE;
 		}
+		//for old arch compatibility
+		else if (remove_edits) {
+			p = gf_filter_pid_get_property_str(tkw->ipid, "reframer_rem_edits");
+			if (p && p->value.boolean) {
+				gf_isom_remove_edits(ctx->file, tkw->track_num);
+			}
+		}
 		if (use_negccts) {
 			gf_isom_set_composition_offset_mode(ctx->file, tkw->track_num, GF_TRUE);
 
@@ -2690,10 +3362,12 @@
 		}
 
 		mp4_mux_set_tags(ctx, tkw);
+		mp4_mux_set_udta(ctx, tkw);
 	}
 	return GF_OK;
 }
 
+static GF_Err mp4_mux_flush_fragmented(GF_Filter *filter, GF_MP4MuxCtx *ctx);
 static GF_Err mp4_mux_done(GF_Filter *filter, GF_MP4MuxCtx *ctx, Bool is_final);
 
 static GF_Err mp4_mux_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
@@ -2706,9 +3380,22 @@
 			gf_list_del_item(ctx->tracks, tkw);
 			gf_free(tkw);
 		}
-		//removing last pid, flush file
-		if (ctx->opid && !gf_list_count(ctx->tracks) && ctx->file && !ctx->init_movie_done) {
-			return mp4_mux_done(filter, ctx, GF_TRUE);
+		//removing last pid
+		if (ctx->opid && !gf_list_count(ctx->tracks)) {
+			if (ctx->file) {
+				//non-frag file, flush file
+				if (!ctx->init_movie_done) {
+					mp4_mux_done(filter, ctx, GF_TRUE);
+				}
+			} else {
+				while (ctx->flush_size) {
+					GF_Err e = mp4_mux_flush_fragmented(filter, ctx);
+					if (e) break;
+				}
+			}
+			//delete output pid (to flush destruction of filter chain)
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
 		}
 		return GF_OK;
 	}
@@ -2741,13 +3428,29 @@
 		}
 	}
 	if (evt->base.on_pid && (evt->base.type==GF_FEVT_PLAY) ) {
-		//by default don't cancel event - to rework once we have downloading in place
+		u32 i, count;
+		GF_FilterEvent anevt;
 		ctx->force_play = GF_TRUE;
 		if (evt->play.speed<0)
 			ctx->is_rewind = GF_TRUE;
-		return GF_FALSE;
+
+		if (ctx->start == 0)
+			return GF_FALSE;
+
+		count = gf_list_count(ctx->tracks);
+		for (i=0; i<count; i++) {
+			TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+			if (tkw->fake_track) continue;
+
+			anevt.play = evt->play;
+			gf_filter_pid_init_play_event(tkw->ipid, &anevt, ctx->start, 0, "MP4Mux");
+			if (anevt.play.start_range > 0)
+				tkw->wait_sap = GF_TRUE;
+
+			gf_filter_pid_send_event(tkw->ipid, &anevt);
+		}
+		return GF_TRUE;
 	}
-	//by default don't cancel event - to rework once we have downloading in place
 	return GF_FALSE;
 }
 
@@ -2758,21 +3461,41 @@
 	CENC_ADD_FRAG,
 };
 
-static void mp4_mux_cenc_insert_pssh(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
+static void mp4_mux_cenc_insert_pssh(GF_MP4MuxCtx *ctx, TrackWriter *tkw, const GF_PropertyValue *pssh, Bool dyn_pssh_only)
 {
 	bin128 *keyIDs=NULL;
 	u32 max_keys = 0;
 	u32 i, nb_pssh;
+	GF_PropertyValue _the_prop;
 
 	//set pssh
-	const GF_PropertyValue *p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_PSSH);
-	if (!p) return;
+	const GF_PropertyValue *p;
+
+	if (dyn_pssh_only) {
+		GF_FilterPacket *pck;
+		//nothing to inject
+		if (!tkw->dyn_pssh) return;
+		pck = gf_filter_pid_get_packet(tkw->ipid);
+		if (pck) {
+			pssh = gf_filter_pck_get_property(pck, GF_PROP_PID_CENC_PSSH);
+			//change of dynamic pssh is pending, don't inject the old one
+			if (pssh) return;
+		}
+		_the_prop.type = GF_PROP_DATA;
+		_the_prop.value.data.ptr = tkw->dyn_pssh;
+		_the_prop.value.data.size = tkw->dyn_pssh_len;
+		p = &_the_prop;
+	} else {
+		p = pssh ? pssh : gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_PSSH);
+		if (!p) return;
+	}
 
 	if (!ctx->bs_r) ctx->bs_r = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
 	else gf_bs_reassign_buffer(ctx->bs_r, p->value.data.ptr, p->value.data.size);
 
 	nb_pssh = gf_bs_read_u32(ctx->bs_r);
 	for (i = 0; i < nb_pssh; i++) {
+		u32 mode;
 		bin128 sysID;
 		u32 j, kid_count, version=0;
 		char *data;
@@ -2780,7 +3503,7 @@
 
 		gf_bs_read_data(ctx->bs_r, sysID, 16);
 		version = gf_bs_read_u32(ctx->bs_r);
-		kid_count = gf_bs_read_u32(ctx->bs_r);
+		kid_count = version ? gf_bs_read_u32(ctx->bs_r) : 0;
 
 		if (kid_count>=max_keys) {
 			max_keys = kid_count;
@@ -2791,23 +3514,40 @@
 		}
 		len = gf_bs_read_u32(ctx->bs_r);
 		data = p->value.data.ptr + gf_bs_get_position(ctx->bs_r);
-		gf_cenc_set_pssh(ctx->file, sysID, version, kid_count, keyIDs, data, len, (tkw->scheme_type==GF_ISOM_PIFF_SCHEME) ? GF_TRUE : GF_FALSE);
+
+		if (tkw->is_item) mode = 2;
+		else if (tkw->scheme_type==GF_ISOM_PIFF_SCHEME) mode = 1;
+		else mode = 0;
+
+		gf_cenc_set_pssh(ctx->file, sysID, version, kid_count, keyIDs, data, len, mode);
 		gf_bs_skip_bytes(ctx->bs_r, len);
+		if (gf_bs_is_overflow(ctx->bs_r))
+			break;
 	}
 	if (keyIDs) gf_free(keyIDs);
+
+
+	if (pssh) {
+		if (tkw->dyn_pssh) gf_free(tkw->dyn_pssh);
+		tkw->dyn_pssh = gf_malloc(sizeof(u8) * pssh->value.data.size);
+		if (!tkw->dyn_pssh) return;
+		memcpy(tkw->dyn_pssh, pssh->value.data.ptr, sizeof(u8) * pssh->value.data.size);
+		tkw->dyn_pssh_len = pssh->value.data.size;
+	}
+
 }
 
-static GF_Err mp4_mux_cenc_update(GF_MP4MuxCtx *ctx, TrackWriter *tkw, GF_FilterPacket *pck, u32 act_type, u32 pck_size)
+static GF_Err mp4_mux_cenc_update(GF_MP4MuxCtx *ctx, TrackWriter *tkw, GF_FilterPacket *pck, u32 act_type, u32 pck_size, u32 injected_hdr_size)
 {
 	const GF_PropertyValue *p;
 	GF_Err e;
 	Bool pck_is_encrypted;
 	u32 skip_byte_block=0, crypt_byte_block=0;
-	u32 IV_size=0, constant_IV_size=0;
-	bin128 constant_IV, KID;
+	u32 IV_size=0;
 	u32 scheme_type=0;
 	u32 scheme_version=0;
-	char *sai = NULL;
+	u8 *fake_sai = NULL;
+	u8 *sai = NULL;
 	u32 sai_size = 0;
 	Bool needs_seig = GF_FALSE;
 	u32 sample_num;
@@ -2820,19 +3560,6 @@
 		skip_byte_block = p->value.frac.num;
 		crypt_byte_block = p->value.frac.den;
 	}
-	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_IV_CONST);
-	if (p && p->value.data.size) {
-		constant_IV_size = p->value.data.size;
-		if (constant_IV_size>16) constant_IV_size=16;
-		memcpy(constant_IV, p->value.data.ptr, constant_IV_size);
-	}
-	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_IV_SIZE);
-	if (p) IV_size = p->value.uint;
-
-	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_KID);
-	if (p) {
-		memcpy(KID, p->value.data.ptr, 16);
-	}
 
 	if (pck) {
 		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_CENC_SAI);
@@ -2884,7 +3611,14 @@
 		}
 
 		tkw->cenc_state = CENC_SETUP_DONE;
-		e = gf_isom_set_cenc_protection(ctx->file, tkw->track_num, tkw->stsd_idx, scheme_type, scheme_version, pck_is_encrypted, IV_size, KID, crypt_byte_block, skip_byte_block, constant_IV_size, constant_IV);
+		tkw->def_cenc_key_info_crc = tkw->cenc_key_info_crc;
+		if (tkw->cenc_ki) {
+			e = gf_isom_set_cenc_protection(ctx->file, tkw->track_num, tkw->stsd_idx, scheme_type, scheme_version, pck_is_encrypted, crypt_byte_block, skip_byte_block, tkw->cenc_ki->value.data.ptr, tkw->cenc_ki->value.data.size);
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Missing CENC Key config, cannot mux\n"));
+			tkw->cenc_state = CENC_SETUP_ERROR;
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to setup CENC information: %s\n", gf_error_to_string(e) ));
 			tkw->cenc_state = CENC_SETUP_ERROR;
@@ -2892,20 +3626,20 @@
 		}
 
 		if (ctx->psshs == MP4MX_PSSH_MOOV)
-			mp4_mux_cenc_insert_pssh(ctx, tkw);
+			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, GF_FALSE);
 
-		tkw->IV_size = IV_size;
-		memcpy(tkw->KID, KID, sizeof(bin128));
-		tkw->crypt_byte_block = crypt_byte_block;
-		tkw->skip_byte_block = skip_byte_block;
-		tkw->constant_IV_size = constant_IV_size;
-		memcpy(tkw->constant_IV, constant_IV, sizeof(bin128));
+		tkw->def_crypt_byte_block = crypt_byte_block;
+		tkw->def_skip_byte_block = skip_byte_block;
 
 		if (!tkw->has_brands && (scheme_type==GF_ISOM_OMADRM_SCHEME))
 			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_OPF2, GF_TRUE);
 
 		if (container_type) {
-			e = gf_isom_cenc_allocate_storage(ctx->file, tkw->track_num, container_type, 0, 0, NULL);
+			if (container_type==GF_ISOM_BOX_UUID_PSEC) {
+				e = gf_isom_piff_allocate_storage(ctx->file, tkw->track_num, 0, 0, NULL);
+			} else {
+				e = gf_isom_cenc_allocate_storage(ctx->file, tkw->track_num);
+			}
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to setup CENC storage: %s\n", gf_error_to_string(e) ));
 				tkw->cenc_state = CENC_SETUP_ERROR;
@@ -2920,36 +3654,51 @@
 		pck_is_encrypted = gf_filter_pck_get_crypt_flags(pck);
 
 	//!! tkw->nb_samples / tkw->samples_in_frag not yet incremented !!
-	if (act_type == CENC_ADD_FRAG)
+	if (act_type == CENC_ADD_FRAG) {
 		sample_num = tkw->samples_in_frag + 1;
-	else
-		sample_num = tkw->nb_samples + 1;
 
+		if (ctx->cmaf) {
+			if (!tkw->samples_in_frag) {
+				tkw->cenc_frag_protected = pck_is_encrypted;
+			} else {
+				if (tkw->cenc_frag_protected != pck_is_encrypted) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] CMAF forbids mixing protected and unprotected samples in a single fragment, please re-encrypt or change target segment duration\n"));
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+			}
+		}
+	} else {
+		sample_num = tkw->nb_samples + 1;
+	}
 	if (!pck_is_encrypted) {
 		if (tkw->clear_stsd_idx) {
 			if (act_type==CENC_ADD_FRAG) {
-				return gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, 0, NULL, 0, GF_FALSE, ctx->saio32);
+				return gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, NULL, 0, GF_FALSE, ctx->saio32, tkw->cenc_multikey);
 			} else {
-				return gf_isom_track_cenc_add_sample_info(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_SENC, 0, NULL, 0, GF_FALSE, NULL, ctx->saio32);
+				return gf_isom_track_cenc_add_sample_info(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_SENC, NULL, 0, tkw->cenc_subsamples, ctx->saio32, tkw->cenc_multikey);
 			}
 		} else {
-			bin128 dumb_IV;
-			memset(dumb_IV, 0, 16);
-			e = gf_isom_set_sample_cenc_group(ctx->file, tkw->track_num, sample_num, 0, 0, dumb_IV, 0, 0, 0, NULL);
+			char dumb_key[20];
+			memset(dumb_key, 0, 20); //dumb key, IV size 0, not protected
+			e = gf_isom_set_sample_cenc_group(ctx->file, tkw->track_num, sample_num, GF_FALSE, 0, 0, dumb_key, 20);
 			IV_size = 0;
 			tkw->has_seig = GF_TRUE;
 		}
 	} else {
+	
 		e = GF_OK;
-		if (tkw->IV_size != IV_size) needs_seig = GF_TRUE;
-		else if (memcmp(tkw->KID, KID, sizeof(bin128))) needs_seig = GF_TRUE;
-		else if (tkw->crypt_byte_block != crypt_byte_block) needs_seig = GF_TRUE;
-		else if (tkw->skip_byte_block != skip_byte_block) needs_seig = GF_TRUE;
-		else if (tkw->constant_IV_size != constant_IV_size) needs_seig = GF_TRUE;
-		else if (constant_IV_size && memcmp(tkw->constant_IV, constant_IV, sizeof(bin128))) needs_seig = GF_TRUE;
+		//multikey ALWAYS uses seig
+		if (tkw->cenc_ki->value.data.ptr[0])
+			needs_seig = GF_TRUE;
+		else if (tkw->def_crypt_byte_block != crypt_byte_block)
+			needs_seig = GF_TRUE;
+		else if (tkw->def_skip_byte_block != skip_byte_block)
+			needs_seig = GF_TRUE;
+		else if (tkw->def_cenc_key_info_crc != tkw->cenc_key_info_crc)
+			needs_seig = GF_TRUE;
 
 		if (needs_seig) {
-			e = gf_isom_set_sample_cenc_group(ctx->file, tkw->track_num, sample_num, 1, IV_size, KID, crypt_byte_block, skip_byte_block, constant_IV_size, constant_IV);
+			e = gf_isom_set_sample_cenc_group(ctx->file, tkw->track_num, sample_num, 1, crypt_byte_block, skip_byte_block, tkw->cenc_ki->value.data.ptr, tkw->cenc_ki->value.data.size);
 			tkw->has_seig = GF_TRUE;
 		} else if (tkw->has_seig) {
 			e = gf_isom_set_sample_cenc_default_group(ctx->file, tkw->track_num, sample_num);
@@ -2960,29 +3709,172 @@
 		return e;
 	}
 
+	p = gf_filter_pck_get_property(pck, GF_PROP_PID_CENC_PSSH);
+	if (p && (p->type == GF_PROP_DATA) && p->value.data.ptr) {
+		if (ctx->store>=MP4MX_MODE_FRAG) {
+			mp4_mux_cenc_insert_pssh(ctx, tkw, p, GF_FALSE);
+		} else {
+			gf_isom_set_sample_group_description(ctx->file, tkw->track_num, sample_num, GF_4CC('P','S','S','H'), 0, p->value.data.ptr, p->value.data.size);
+		}
+	}
+
 	if (!sai) {
 		if (tkw->constant_IV_size && !tkw->cenc_subsamples)
 			return GF_OK;
-		sai_size = pck_size;
+
+		if (IV_size) {
+			//generate clear SAI data with a non-0 IV
+			u32 olen = pck_size;
+			GF_BitStream *bs = gf_bs_new(NULL, 9, GF_BITSTREAM_WRITE);
+			if (tkw->cenc_multikey) {
+				gf_bs_write_u16(bs, 0);
+			} else {
+				gf_bs_write_long_int(bs, 0, IV_size*8);
+			}
+
+			if (tkw->cenc_subsamples) {
+				u32 i;
+				u32 subsample_count = 1;
+				while (olen>0xFFFF) {
+					olen -= 0xFFFF;
+					subsample_count ++;
+				}
+				gf_bs_write_u16(bs, subsample_count);
+				olen = pck_size;
+				for (i = 0; i < subsample_count; i++) {
+					u32 clear_size;
+					if (olen<0xFFFF) {
+						clear_size = olen;
+					} else {
+						clear_size = 0xFFFF;
+						olen -= 0xFFFF;
+					}
+
+					if (tkw->cenc_multikey)
+						gf_bs_write_u16(bs, 0);
+					gf_bs_write_u16(bs, clear_size);
+					gf_bs_write_u32(bs, 0);
+				}
+			}
+			gf_bs_get_content(bs, &fake_sai, &sai_size);
+			gf_bs_del(bs);
+			sai = fake_sai;
+		}
+	}
+	//we injected xPS at the beginning of the sample (AVC/HEVC/VVC), we must patch the first subsample
+	//of SAI data
+	else if (injected_hdr_size) {
+		u32 offset = 0;
+		u32 first_sub_clear, sub_count_size;
+		u8 *sai_d;
+		u8 key_info_get_iv_size(const u8 *key_info, u32 nb_keys, u32 idx, u8 *const_iv_size, const u8 **const_iv);
+
+		assert(tkw->cenc_subsamples);
+
+		//multi-key skip all IV inits
+		if (tkw->cenc_ki->value.data.ptr[0]) {
+			u32 remain;
+			u32 j, nb_iv_init = sai[0];
+			nb_iv_init <<= 8;
+			nb_iv_init |= sai[1];
+			u8 *sai_p = sai + 2;
+			remain = sai_size-2;
+
+			for (j=0; j<nb_iv_init; j++) {
+				u32 mk_iv_size;
+				u32 idx = sai_p[0];
+				idx<<=8;
+				idx |= sai_p[1];
+
+				mk_iv_size = key_info_get_iv_size(tkw->cenc_ki->value.data.ptr, tkw->cenc_ki->value.data.size, idx, NULL, NULL);
+				mk_iv_size += 2; //idx
+				if (mk_iv_size > remain) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Invalid multi-key CENC SAI, cannot modify first subsample !\n"));
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+				sai_p += mk_iv_size;
+				remain -= mk_iv_size;
+				if (remain && (remain<=2)) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Invalid multi-key CENC SAI, cannot modify first subsample !\n"));
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+			}
+			offset = (u32) (sai_p - sai);
+			sub_count_size = 4; //32bit sub count
+
+		} else {
+			offset = key_info_get_iv_size(tkw->cenc_ki->value.data.ptr, tkw->cenc_ki->value.data.size, 1, NULL, NULL);
+			sub_count_size = 2; //16bit sub count
+		}
+		if (sai_size < offset + sub_count_size + 6) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Invalid CENC SAI !\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		//get size of first subsample
+		offset += sub_count_size;
+		sai_d = sai + offset;
+		first_sub_clear = sai_d[0];
+		first_sub_clear<<=8;
+		first_sub_clear |= sai_d[1];
+		first_sub_clear += injected_hdr_size;
+		//fits, only patch first subsample size
+		if (first_sub_clear < 0xFFFF) {
+			fake_sai = gf_malloc(sizeof(u8) * sai_size);
+			if (!fake_sai) return GF_OUT_OF_MEM;
+			memcpy(fake_sai, sai, sizeof(u8) * sai_size);
+			sai_d = fake_sai + offset;
+			sai_d[0] = (first_sub_clear>>8) & 0xFF;
+			sai_d[1] = (first_sub_clear) & 0xFF;
+			sai = fake_sai;
+		}
+		//injected header size does not fit in first subsample, add a new subsample
+		else {
+			fake_sai = gf_malloc(sizeof(u8) * (sai_size+6));
+			if (!fake_sai) return GF_OUT_OF_MEM;
+			//copy till start of first subsample (including subsample_count)
+			memcpy(fake_sai, sai, sizeof(u8) * offset);
+			//copy all subsamples
+			memcpy(fake_sai+offset+6, sai+offset, sizeof(u8) * (sai_size - offset) );
+			//insert subsample
+			sai_d = fake_sai + offset;
+			sai_d[0] = (injected_hdr_size>>8) & 0xFF;
+			sai_d[1] = (injected_hdr_size) & 0xFF;
+			sai_d[2] = sai_d[3] = sai_d[4] = sai_d[5] = 0;
+			//update subsample count
+			sai_d = fake_sai + offset - sub_count_size;
+			if (sub_count_size==2) {
+				u32 cnt = ((u32) sai_d[0]) << 8 | (u32) sai_d[1];
+				cnt++;
+				sai_d[0] = (cnt>>8) & 0xFF;
+				sai_d[1] = (cnt) & 0xFF;
+			} else {
+				u32 cnt = GF_4CC( sai_d[0], sai_d[1], sai_d[2], sai_d[3]);
+				cnt++;
+				sai_d[0] = (cnt>>24) & 0xFF;
+				sai_d[1] = (cnt>>16) & 0xFF;
+				sai_d[2] = (cnt>>8) & 0xFF;
+				sai_d[3] = (cnt) & 0xFF;
+			}
+			sai = fake_sai;
+			sai_size += 6;
+		}
 	}
 
 	if (act_type==CENC_ADD_FRAG) {
 		if (pck_is_encrypted) {
-			e = gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, IV_size, sai, sai_size, tkw->cenc_subsamples, ctx->saio32);
+			e = gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, sai, sai_size, tkw->cenc_subsamples, ctx->saio32, tkw->cenc_multikey);
 		} else {
-			e = gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, 0, NULL, 0, GF_FALSE, ctx->saio32);
+			e = gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, NULL, 0, GF_FALSE, ctx->saio32, tkw->cenc_multikey);
 		}
-		if (e) return e;
 	} else {
 		if (sai) {
-			e = gf_isom_track_cenc_add_sample_info(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_SENC, IV_size, sai, sai_size, tkw->cenc_subsamples, NULL, ctx->saio32);
+			e = gf_isom_track_cenc_add_sample_info(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_SENC, sai, sai_size, tkw->cenc_subsamples, ctx->saio32, tkw->cenc_multikey);
 		} else if (!pck_is_encrypted) {
-			e = gf_isom_track_cenc_add_sample_info(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_SENC, 0, NULL, 0, GF_FALSE, NULL, ctx->saio32);
+			e = gf_isom_track_cenc_add_sample_info(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_SENC, NULL, 0, tkw->cenc_subsamples, ctx->saio32, tkw->cenc_multikey);
 		}
-		if (e) return e;
 	}
-
-	return GF_OK;
+	if (fake_sai) gf_free(fake_sai);
+	return e;
 }
 
 GF_FilterSAPType mp4_mux_get_sap(GF_MP4MuxCtx *ctx, GF_FilterPacket *pck)
@@ -3002,18 +3894,22 @@
 	u32 timescale = 0;
 	const GF_PropertyValue *subs;
 	GF_FilterSAPType sap_type;
-	Bool insert_subsample_dsi = GF_FALSE;
+	u32 insert_subsample_dsi_size = 0;
 	u32 first_nal_is_audelim = GF_FALSE;
 	u32 sample_desc_index = tkw->stsd_idx;
 
 	timescale = gf_filter_pck_get_timescale(pck);
 
-	subs = gf_filter_pck_get_property(pck, GF_PROP_PCK_SUBS);
-
 	prev_dts = tkw->nb_samples ? tkw->sample.DTS : GF_FILTER_NO_TS;
 	prev_size = tkw->sample.dataLength;
 	tkw->sample.CTS_Offset = 0;
-	tkw->sample.data = (char *)gf_filter_pck_get_data(pck, &tkw->sample.dataLength);
+	if (gf_filter_pck_get_frame_interface(pck)) {
+		tkw->dgl_copy = gf_filter_pck_dangling_copy(pck, tkw->dgl_copy);
+		if (!tkw->dgl_copy) return GF_IO_ERR;
+		tkw->sample.data = (char *)gf_filter_pck_get_data(tkw->dgl_copy, &tkw->sample.dataLength);
+	} else {
+		tkw->sample.data = (char *)gf_filter_pck_get_data(pck, &tkw->sample.dataLength);
+	}
 
 	ctx->update_report = GF_TRUE;
 	ctx->total_bytes_in += tkw->sample.dataLength;
@@ -3021,6 +3917,7 @@
 
 	tkw->sample.DTS = gf_filter_pck_get_dts(pck);
 	cts = gf_filter_pck_get_cts(pck);
+
 	if (tkw->sample.DTS == GF_FILTER_NO_TS) {
 		if (cts == GF_FILTER_NO_TS) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Sample with no DTS/CTS, cannot add (last DTS "LLU", last size %d)\n", prev_dts, prev_size ));
@@ -3029,9 +3926,9 @@
 			u32 min_pck_dur = gf_filter_pid_get_min_pck_duration(tkw->ipid);
 			if (min_pck_dur) {
 				tkw->sample.DTS = prev_dts;
+
 				if (timescale != tkw->tk_timescale) {
-					tkw->sample.DTS *= timescale;
-					tkw->sample.DTS /= tkw->tk_timescale;
+					tkw->sample.DTS = gf_timestamp_rescale(tkw->sample.DTS, tkw->tk_timescale, timescale);
 				}
 				tkw->sample.DTS += min_pck_dur;
 			} else {
@@ -3061,11 +3958,28 @@
 		}
 	}
 
+	//sample-accurate seek info, start logging min CTS of packets marked as non-sync
+	if (tkw->check_seek_ts && !gf_filter_pck_get_seek_flag(pck)) {
+		u64 ts_check = cts;
+		subs = gf_filter_pck_get_property(pck, GF_PROP_PCK_SKIP_BEGIN);
+		if (subs)
+			ts_check += subs->value.uint;
+
+		if (!tkw->min_ts_seek_plus_one) {
+			tkw->min_ts_seek_plus_one = ts_check + 1;
+		} else if (tkw->min_ts_seek_plus_one > ts_check + 1) {
+			tkw->min_ts_seek_plus_one = ts_check + 1;
+		} else {
+			//TS is greater than last non-seek packet TS, we're done seeking
+			tkw->check_seek_ts = GF_FALSE;
+		}
+	}
+
 	duration = gf_filter_pck_get_duration(pck);
 	if (timescale != tkw->tk_timescale) {
 		s64 ctso;
-		tkw->sample.DTS *= tkw->tk_timescale;
-		tkw->sample.DTS /= timescale;
+		tkw->sample.DTS = gf_timestamp_rescale(tkw->sample.DTS, timescale, tkw->tk_timescale);
+
 		ctso = (s64) tkw->sample.CTS_Offset;
 		ctso *= tkw->tk_timescale;
 		ctso /= timescale;
@@ -3076,22 +3990,52 @@
 
 
 	tkw->sample.IsRAP = 0;
-	sap_type = mp4_mux_get_sap(ctx, pck);
+	if (tkw->codecid==GF_CODECID_RAW) {
+		sap_type = GF_FILTER_SAP_1;
+	} else {
+		sap_type = mp4_mux_get_sap(ctx, pck);
+
+		//if pps inband mode is used, turn sap3 into sap1
+		if ((tkw->xps_inband==XPS_IB_PPS) && sap_type==GF_FILTER_SAP_3)
+			sap_type=GF_FILTER_SAP_1;
+	}
 	if (sap_type==GF_FILTER_SAP_1)
 		tkw->sample.IsRAP = SAP_TYPE_1;
+	else if (sap_type==GF_FILTER_SAP_2)
+		tkw->sample.IsRAP = SAP_TYPE_2;
 	else if ( (sap_type == GF_FILTER_SAP_4) && (tkw->stream_type != GF_STREAM_VISUAL) )
 		tkw->sample.IsRAP = SAP_TYPE_1;
 
+	/*RFC8216bis is not clear here:
+	"if the Partial Segment contains an independent frame."
+		-> this would allow SAP1,2,3 (independent being only defined for segments)
+
+	but
+
+	"Partial Segment containing an independent frame SHOULD carry it to increase the efficiency with which clients can join and switch Renditions"
+		-> if used for switching, this only allows SAP 1 and 2
+
+	Spec should be fixed to allow for both cases (fast tune-in or in-segment switchingà)
+	*/
+	if ((tkw->sample.IsRAP == SAP_TYPE_1) || (tkw->sample.IsRAP == SAP_TYPE_2))
+		ctx->frag_has_intra = GF_TRUE;
+
 	tkw->sample.DTS += tkw->dts_patch;
 	if (tkw->nb_samples && (prev_dts >= tkw->sample.DTS) ) {
 		//the fragmented API will patch the duration on the fly
 		if (!for_fragment) {
-			gf_isom_patch_last_sample_duration(ctx->file, tkw->track_num, prev_dts);
+			gf_isom_patch_last_sample_duration(ctx->file, tkw->track_num, prev_dts ? prev_dts : 1);
 		}
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] PID %s Sample %d with DTS "LLU" less than previous sample DTS "LLU", adjusting prev sample duration\n", gf_filter_pid_get_name(tkw->ipid), tkw->nb_samples, tkw->sample.DTS, prev_dts ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] PID %s ID %d Sample %d with DTS "LLU" less than previous sample DTS "LLU", adjusting prev sample duration\n", gf_filter_pid_get_name(tkw->ipid), tkw->track_id, tkw->nb_samples+1, tkw->sample.DTS, prev_dts ));
 
-		tkw->dts_patch = prev_dts - tkw->sample.DTS;
-		tkw->sample.DTS += tkw->dts_patch;
+		if (prev_dts) {
+			tkw->dts_patch = prev_dts - tkw->sample.DTS;
+			tkw->sample.DTS += tkw->dts_patch;
+		} else {
+			tkw->sample.DTS += 1;
+			if (tkw->sample.CTS_Offset) tkw->sample.CTS_Offset -= 1;
+			duration-=1;
+		}
 	}
 
 
@@ -3111,7 +4055,13 @@
 	tkw->sample.nb_pack = 0;
 	if (tkw->raw_audio_bytes_per_sample) {
 		tkw->sample.nb_pack = tkw->sample.dataLength / tkw->raw_audio_bytes_per_sample;
-		if (tkw->sample.nb_pack) duration /= tkw->sample.nb_pack;
+		if (tkw->sample.nb_pack) {
+			duration = 1;
+			if (tkw->raw_samplerate && (tkw->tk_timescale != tkw->raw_samplerate)) {
+				duration *= tkw->tk_timescale;
+				duration /= tkw->raw_samplerate;
+			}
+		}
 	}
 
 	if (tkw->cenc_state && tkw->clear_stsd_idx && !gf_filter_pck_get_crypt_flags(pck)) {
@@ -3139,26 +4089,48 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to append sample DTS "LLU" data: %s\n", tkw->sample.DTS, gf_error_to_string(e) ));
 		}
 	} else {
-		if ((tkw->sample.IsRAP || tkw->force_inband_inject) && ctx->xps_inband) {
+		Bool inject_pps = ctx->pps_inband;
+		if (ctx->xps_inband==XPS_IB_AUTO) {
+			const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_XPS_MASK);
+			if (p && (p->value.uint & (1<<2) ) )
+				inject_pps = GF_TRUE;
+		}
+
+		if ((tkw->sample.IsRAP || tkw->force_inband_inject || inject_pps) && tkw->xps_inband) {
+			u8 *inband_xps;
+			u32 inband_xps_size;
 			char *au_delim=NULL;
 			u32 au_delim_size=0;
 			char *pck_data = tkw->sample.data;
 			u32 pck_data_len = tkw->sample.dataLength;
-			tkw->sample.data = tkw->inband_hdr;
-			tkw->sample.dataLength = tkw->inband_hdr_size;
-			tkw->force_inband_inject = GF_FALSE;
+			if (tkw->sample.IsRAP || tkw->force_inband_inject) {
+				inband_xps = tkw->inband_hdr;
+				inband_xps_size = tkw->inband_hdr_size;
+				tkw->force_inband_inject = GF_FALSE;
+			} else {
+				inband_xps = tkw->inband_hdr_non_rap;
+				inband_xps_size = tkw->inband_hdr_non_rap_size;
+			}
+			tkw->sample.data = inband_xps;
+			tkw->sample.dataLength = inband_xps_size;
 
 			if (tkw->is_nalu==NALU_AVC) {
-				char *nal = pck_data + tkw->nal_unit_size;
-				if ((nal[0] & 0x1F) == GF_AVC_NALU_ACCESS_UNIT) {
-					first_nal_is_audelim = au_delim_size = 2 + tkw->nal_unit_size;
-					au_delim = pck_data;
+				if (pck_data_len >= 2 + tkw->nal_unit_size) {
+					char *nal = pck_data + tkw->nal_unit_size;
+					if ((nal[0] & 0x1F) == GF_AVC_NALU_ACCESS_UNIT) {
+						first_nal_is_audelim = au_delim_size = 2 + tkw->nal_unit_size;
+						au_delim = pck_data;
+						if (au_delim_size >= pck_data_len) au_delim = NULL;
+					}
 				}
 			} else {
-				char *nal = pck_data + tkw->nal_unit_size;
-				if (((nal[0] & 0x7E)>>1) == GF_HEVC_NALU_ACCESS_UNIT) {
-					first_nal_is_audelim = au_delim_size = 3 + tkw->nal_unit_size;
-					au_delim = pck_data;
+				if (pck_data_len >= 3 + tkw->nal_unit_size) {
+					char *nal = pck_data + tkw->nal_unit_size;
+					if (((nal[0] & 0x7E)>>1) == GF_HEVC_NALU_ACCESS_UNIT) {
+						first_nal_is_audelim = au_delim_size = 3 + tkw->nal_unit_size;
+						au_delim = pck_data;
+						if (au_delim_size >= pck_data_len) au_delim = NULL;
+					}
 				}
 			}
 
@@ -3172,17 +4144,17 @@
 			if (for_fragment) {
 				e = gf_isom_fragment_add_sample(ctx->file, tkw->track_id, &tkw->sample, sample_desc_index, duration, 0, 0, 0);
 				if (!e && au_delim) {
-					e = gf_isom_fragment_append_data(ctx->file, tkw->track_id, tkw->inband_hdr, tkw->inband_hdr_size, 0);
+					e = gf_isom_fragment_append_data(ctx->file, tkw->track_id, inband_xps, inband_xps_size, 0);
 				}
 				if (!e) e = gf_isom_fragment_append_data(ctx->file, tkw->track_id, pck_data, pck_data_len, 0);
 			} else {
 				e = gf_isom_add_sample(ctx->file, tkw->track_num, sample_desc_index, &tkw->sample);
 				if (au_delim && !e) {
-					e = gf_isom_append_sample_data(ctx->file, tkw->track_num, tkw->inband_hdr, tkw->inband_hdr_size);
+					e = gf_isom_append_sample_data(ctx->file, tkw->track_num, inband_xps, inband_xps_size);
 				}
 				if (!e) e = gf_isom_append_sample_data(ctx->file, tkw->track_num, pck_data, pck_data_len);
 			}
-			insert_subsample_dsi = GF_TRUE;
+			insert_subsample_dsi_size = inband_xps_size;
 		} else if (for_fragment) {
 			e = gf_isom_fragment_add_sample(ctx->file, tkw->track_id, &tkw->sample, sample_desc_index, duration, 0, 0, 0);
 		} else {
@@ -3199,9 +4171,10 @@
 		}
 
 		if (!e && tkw->cenc_state) {
-			e = mp4_mux_cenc_update(ctx, tkw, pck, for_fragment ? CENC_ADD_FRAG : CENC_ADD_NORMAL, tkw->sample.dataLength);
+			e = mp4_mux_cenc_update(ctx, tkw, pck, for_fragment ? CENC_ADD_FRAG : CENC_ADD_NORMAL, tkw->sample.dataLength, insert_subsample_dsi_size);
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set sample CENC information: %s\n", gf_error_to_string(e) ));
+				return e;
 			}
 		}
 	}
@@ -3212,15 +4185,38 @@
 
 	if (e) return e;
 
+	if (!for_fragment) {
+		u64 samp_cts;
+		if (!tkw->clamp_ts_plus_one) {
+			const GF_PropertyValue *skp = gf_filter_pck_get_property(pck, GF_PROP_PCK_SKIP_PRES);
+			if (skp && skp->value.boolean) {
+				tkw->clamp_ts_plus_one = 1 + tkw->sample.DTS + tkw->sample.CTS_Offset;
+			}
+		}
+		//store min max cts for edit list updates
+		samp_cts = tkw->sample.DTS + tkw->sample.CTS_Offset;
+		if (!tkw->clamp_ts_plus_one || (samp_cts + 1 < tkw->clamp_ts_plus_one)) {
+			if (samp_cts > tkw->max_cts) {
+				tkw->max_cts = samp_cts;
+				tkw->max_cts_samp_dur = duration;
+			}
+
+			if (tkw->min_cts > samp_cts)
+				tkw->min_cts = samp_cts;
+		}
+	}
+
 	//compat with old arch: write sample to group info for all samples
 	if ((sap_type==3) || tkw->has_open_gop) {
-		if (for_fragment) {
-			e = gf_isom_fragment_set_sample_rap_group(ctx->file, tkw->track_id, tkw->samples_in_frag, (sap_type==3) ? GF_TRUE : GF_FALSE, 0);
-		} else if (sap_type==3) {
-			e = gf_isom_set_sample_rap_group(ctx->file, tkw->track_num, tkw->nb_samples, GF_TRUE /*(sap_type==3) ? GF_TRUE : GF_FALSE*/, 0);
-		}
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set sample DTS "LLU" SAP 3 in RAP group: %s\n", tkw->sample.DTS, gf_error_to_string(e) ));
+		if (!ctx->norap) {
+			if (for_fragment) {
+				e = gf_isom_fragment_set_sample_rap_group(ctx->file, tkw->track_id, tkw->samples_in_frag, (sap_type==3) ? GF_TRUE : GF_FALSE, 0);
+			} else if (sap_type==3) {
+				e = gf_isom_set_sample_rap_group(ctx->file, tkw->track_num, tkw->nb_samples, GF_TRUE /*(sap_type==3) ? GF_TRUE : GF_FALSE*/, 0);
+			}
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set sample DTS "LLU" SAP 3 in RAP group: %s\n", tkw->sample.DTS, gf_error_to_string(e) ));
+			}
 		}
 		tkw->has_open_gop = GF_TRUE;
 	}
@@ -3247,16 +4243,18 @@
 		}
 	}
 	
+	subs = gf_filter_pck_get_property(pck, GF_PROP_PCK_SUBS);
 	if (subs) {
 		//if no AUDelim nal and inband header injection, push new subsample
-		if (!first_nal_is_audelim && insert_subsample_dsi) {
+		if (!first_nal_is_audelim && insert_subsample_dsi_size) {
 			if (for_fragment) {
-				gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, 0, tkw->inband_hdr_size, 0, 0, 0);
+				gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, 0, insert_subsample_dsi_size, 0, 0, 0);
 			} else {
-				gf_isom_add_subsample(ctx->file, tkw->track_num, tkw->nb_samples, 0, tkw->inband_hdr_size, 0, 0, 0);
+				gf_isom_add_subsample(ctx->file, tkw->track_num, tkw->nb_samples, 0, insert_subsample_dsi_size, 0, 0, 0);
 			}
-			insert_subsample_dsi = GF_FALSE;
+			insert_subsample_dsi_size = 0;
 		}
+		tkw->has_subs = GF_TRUE;
 
 		if (!ctx->bs_r) ctx->bs_r = gf_bs_new(subs->value.data.ptr, subs->value.data.size, GF_BITSTREAM_READ);
 		else gf_bs_reassign_buffer(ctx->bs_r, subs->value.data.ptr, subs->value.data.size);
@@ -3275,18 +4273,24 @@
 			}
 
 			//we have AUDelim nal and inband header injection, push new subsample for inband header once we have pushed the first subsample (au delim)
-			if (insert_subsample_dsi) {
+			if (insert_subsample_dsi_size) {
 				if (first_nal_is_audelim != subs_size) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] inserting inband param after AU delimiter NALU, but sample has subsample information not aligned on NALU (got %d subsample size but expecting %d) - file might be broken!\n", subs_size, first_nal_is_audelim));
 				}
 				if (for_fragment) {
-					gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, 0, tkw->inband_hdr_size, 0, 0, 0);
+					gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, 0, insert_subsample_dsi_size, 0, 0, 0);
 				} else {
-					gf_isom_add_subsample(ctx->file, tkw->track_num, tkw->nb_samples, 0, tkw->inband_hdr_size, 0, 0, 0);
+					gf_isom_add_subsample(ctx->file, tkw->track_num, tkw->nb_samples, 0, insert_subsample_dsi_size, 0, 0, 0);
 				}
-				insert_subsample_dsi = GF_FALSE;
+				insert_subsample_dsi_size = GF_FALSE;
 			}
 		}
+	} else if (for_fragment && tkw->has_subs && ctx->cmaf && (tkw->codecid==GF_CODECID_SUBS_XML)) {
+		//tentative implemntation of CMAF 7.5.20 which is just nonsense text !!:
+		//"the value of subsample_count shall equal 1 for the first image sub-sample, and the subsample_count of the TTML document shall equal 0."
+		//
+		//we simply signal a single subsample
+		gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, 0, tkw->sample.dataLength, 0, 0, 0);
 	}
 
 	if (ctx->deps) {
@@ -3304,15 +4308,55 @@
 		}
 	}
 
+	u32 idx = 0;
+	while (1) {
+		Bool is_sample_group=GF_FALSE;
+		u32 aux_type=0, aux_info=0;
+		u32 p4cc;
+		const char *pname=NULL;
+		const GF_PropertyValue *p = gf_filter_pck_enum_properties(pck, &idx, &p4cc, &pname);
+		if (!p) break;
+		if ((p->type!=GF_PROP_DATA) && (p->type!=GF_PROP_CONST_DATA)) continue;
+		if (!p->value.data.size || !p->value.data.ptr) continue;
+		if (!pname) continue;
+
+		if (!strncmp(pname, "sai_", 4)) {
+
+		} else if (!strncmp(pname, "grp_", 4)) {
+			//discard emsg if fragmented, otherwise add as internal sample group - TODO, support for EventMessage tracks
+			if (!strcmp(pname, "grp_EMSG") && (ctx->store>=MP4MX_MODE_FRAG)) continue;
+			is_sample_group = GF_TRUE;
+		} else {
+			continue;
+		}
+
+		pname+=4;
+		if (strlen(pname) < 4) continue;
+		aux_type = GF_4CC(pname[0], pname[1], pname[2], pname[3]);
+		if (pname[4] == '_') aux_info = atoi(pname+5);
+
+		if (!aux_type) continue;
+
+		if (is_sample_group) {
+			gf_isom_set_sample_group_description(ctx->file, tkw->track_num, for_fragment ? 0 : tkw->nb_samples, aux_type, aux_info, p->value.data.ptr, p->value.data.size);
+		} else {
+			if (for_fragment) {
+				gf_isom_fragment_set_sample_aux_info(ctx->file, tkw->track_id, tkw->samples_in_frag, aux_type, aux_info, p->value.data.ptr, p->value.data.size);
+			} else {
+				gf_isom_add_sample_aux_info(ctx->file, tkw->track_num, tkw->nb_samples, aux_type, aux_info, p->value.data.ptr, p->value.data.size);
+			}
+		}
+	}
+
 
 	tkw->next_is_first_sample = GF_FALSE;
 
 	if (duration && !for_fragment && !tkw->raw_audio_bytes_per_sample)
 		gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, duration);
 
-	if (ctx->idur.num) {
+	if (ctx->dur.num) {
 		Bool abort = GF_FALSE;
-		if (ctx->idur.num>0) {
+		if (ctx->dur.num>0) {
 			u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
 
 			/*patch to align to old arch */
@@ -3321,20 +4365,20 @@
 			}
 
 			if (ctx->importer) {
-				tkw->prog_done = mdur * ctx->idur.den;
-				tkw->prog_total = ((u64)tkw->tk_timescale) * ctx->idur.num;
+				tkw->prog_done = mdur * ctx->dur.den;
+				tkw->prog_total = ((u64)tkw->tk_timescale) * ctx->dur.num;
 			}
 
 			/*patch to align to old arch */
 			if (gf_sys_old_arch_compat()) {
-				if (mdur * (u64) ctx->idur.den > tkw->tk_timescale * (u64) ctx->idur.num)
+				if (gf_timestamp_greater(mdur, tkw->tk_timescale, ctx->dur.num, ctx->dur.den))
 					abort = GF_TRUE;
 			} else {
-				if (mdur * (u64) ctx->idur.den >= tkw->tk_timescale * (u64) ctx->idur.num)
+				if (gf_timestamp_greater_or_equal(mdur, tkw->tk_timescale, ctx->dur.num, ctx->dur.den))
 					abort = GF_TRUE;
 			}
 		} else {
-			if ((s32) tkw->nb_samples >= -ctx->idur.num)
+			if ((s32) tkw->nb_samples >= -ctx->dur.num)
 				abort = GF_TRUE;
 		}
 
@@ -3347,7 +4391,7 @@
 		}
 	} else if (ctx->importer) {
 		if (tkw->nb_frames) {
-			tkw->prog_done = tkw->nb_samples;
+			tkw->prog_done = tkw->nb_samples + tkw->frame_offset;
 			tkw->prog_total = tkw->nb_frames;
 		} else {
 			u64 data_offset = gf_filter_pck_get_byte_offset(pck);
@@ -3377,6 +4421,7 @@
 	GF_Err e;
 	u32 meta_type, item_id, size, item_type, nb_items, media_brand;
 	GF_ImageItemProperties image_props;
+	GF_ImageItemProtection cenc_info;
 	const char *data, *item_name=NULL;
 	const GF_PropertyValue *p, *dsi, *dsi_enh;
 	GF_Box *config_box = NULL;
@@ -3525,6 +4570,25 @@
 		//not defined !
 		media_brand = GF_ISOM_SUBTYPE_PNG /* == GF_4CC('j', 'p', 'e', 'g') */;
 		break;
+
+	case GF_CODECID_VVC:
+		config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_VVCC);
+
+		if ((tkw->codecid == GF_CODECID_VVC) && !dsi) return GF_OK;
+
+		((GF_VVCConfigurationBox *)config_box)->config = gf_odf_vvc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		item_type = GF_ISOM_SUBTYPE_VVC1;
+
+		if (! ((GF_VVCConfigurationBox *)config_box)->config) {
+			return GF_NON_COMPLIANT_BITSTREAM;
+		} else {
+			image_props.num_channels = 3;
+			image_props.bits_per_channel[0] = ((GF_VVCConfigurationBox *)config_box)->config->bit_depth;
+			image_props.bits_per_channel[1] = ((GF_VVCConfigurationBox *)config_box)->config->bit_depth;
+			image_props.bits_per_channel[2] = ((GF_VVCConfigurationBox *)config_box)->config->bit_depth;
+		}
+		media_brand = GF_ISOM_BRAND_VVIC;
+		break;
 	default:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Codec %s not supported to create HEIF image items\n", gf_codecid_name(tkw->codecid) ));
 		return GF_NOT_SUPPORTED;
@@ -3547,16 +4611,79 @@
 	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_HIDDEN);
 	if (p) image_props.hidden = p->value.boolean;
 
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_MIRROR);
+	if (p && p->value.uint) image_props.mirror = p->value.uint;
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ROTATE);
+	if (p) image_props.angle = p->value.uint;
+
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CLAP_W);
+	if (p) { image_props.clap_wnum = p->value.frac.num; image_props.clap_wden = p->value.frac.den; }
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CLAP_H);
+	if (p) { image_props.clap_hnum = p->value.frac.num; image_props.clap_hden = p->value.frac.den; }
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CLAP_X);
+	if (p) { image_props.clap_honum = p->value.frac.num; image_props.clap_hoden = p->value.frac.den; }
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CLAP_Y);
+	if (p) { image_props.clap_vonum = p->value.frac.num; image_props.clap_voden = p->value.frac.den; }
+
+	//setup crypto
+	if (tkw->is_encrypted && gf_filter_pck_get_crypt_flags(pck)) {
+		memset(&cenc_info, 0, sizeof(GF_ImageItemProtection));
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_CENC_SAI);
+		if (!p) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Missing CENC SAI on protected packet\n"));
+			return GF_SERVICE_ERROR;
+		}
+		cenc_info.sai_data = p->value.data.ptr;
+		cenc_info.sai_data_size = p->value.data.size;
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
+		if (!p) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Missing CENC scheme type on protected item\n"));
+			return GF_SERVICE_ERROR;
+		}
+		cenc_info.scheme_type = p->value.uint;
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_PROTECTION_SCHEME_VERSION);
+		if (!p) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Missing CENC scheme version on protected item\n"));
+			return GF_SERVICE_ERROR;
+		}
+		cenc_info.scheme_version = p->value.uint;
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_KEY_INFO);
+		if (!p || (p->type != GF_PROP_DATA) || !gf_cenc_validate_key_info(p->value.data.ptr, p->value.data.size)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: %s CENC Key info on protected item\n", p ? "Corrupted" : "Missing"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		cenc_info.key_info = p->value.data.ptr;
+		cenc_info.key_info_size = p->value.data.size;
+
+		image_props.cenc_info = &cenc_info;
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_PATTERN);
+		if (p) {
+			cenc_info.skip_byte_block = p->value.frac.num;
+			cenc_info.crypt_byte_block = p->value.frac.den;
+		}
+
+
+		if (tkw->insert_pssh) {
+			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, GF_FALSE);
+			tkw->insert_pssh = GF_FALSE;
+		}
+	}
+
 	nb_items = gf_isom_get_meta_item_count(ctx->file, GF_TRUE, 0);
 
-	e = gf_isom_add_meta_item_memory(ctx->file, GF_TRUE, 0, item_name, item_id, item_type, NULL, NULL, &image_props, (u8 *)data, size, NULL);
+	e = gf_isom_add_meta_item_memory(ctx->file, GF_TRUE, 0, item_name, &item_id, item_type, NULL, NULL, &image_props, (u8 *)data, size, NULL);
 
 	if (config_box) gf_isom_box_del(config_box);
 
 	if (e) return e;
 
+
 	//retrieve the final itemID
-	gf_isom_get_meta_item_info(ctx->file, GF_TRUE, 0, nb_items+1, &item_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	gf_isom_get_meta_item_info(ctx->file, GF_TRUE, 0, nb_items+1, &item_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 	tkw->item_id = item_id;
 
 	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_PRIMARY_ITEM);
@@ -3603,8 +4730,29 @@
 	}
 }
 
+static void mp4_mux_flush_frag_hls(GF_MP4MuxCtx *ctx)
+{
+	GF_FilterEvent evt;
+	TrackWriter *tkw = NULL;
+	//send event on first track only
+	tkw = gf_list_get(ctx->tracks, 0);
+	GF_FEVT_INIT(evt, GF_FEVT_FRAGMENT_SIZE, tkw->ipid);
+	evt.frag_size.is_last = ctx->flush_seg ? GF_TRUE : GF_FALSE;
+	evt.frag_size.offset = ctx->frag_offset;
+	evt.frag_size.size = ctx->frag_size;
+	evt.frag_size.duration.num = (s64) ctx->frag_duration;
+	evt.frag_size.duration.den = ctx->frag_timescale;
+	evt.frag_size.independent = ctx->frag_has_intra;
+
+	gf_filter_pid_send_event(tkw->ipid, &evt);
+
+	ctx->frag_offset += ctx->frag_size;
+	ctx->frag_size = 0;
+	ctx->frag_duration = 0;
+	ctx->frag_has_intra = GF_FALSE;
+}
 
-static void mp4_mux_flush_frag(GF_MP4MuxCtx *ctx, Bool is_init, u64 idx_start_range, u64 idx_end_range)
+static void mp4_mux_flush_seg(GF_MP4MuxCtx *ctx, Bool is_init, u64 idx_start_range, u64 idx_end_range)
 {
 	GF_FilterEvent evt;
 	TrackWriter *tkw = NULL;
@@ -3614,8 +4762,14 @@
 			Bool s, e;
 			gf_filter_pck_get_framing(ctx->dst_pck, &s, &e);
 			gf_filter_pck_set_framing(ctx->dst_pck, s, GF_TRUE);
+			if (!is_init) {
+				u64 dur = ctx->next_seg_start - (ctx->min_cts_plus_one-1);
+				gf_filter_pck_set_duration(ctx->dst_pck, (u32) dur);
+			}
 			ctx->first_pck_sent = GF_FALSE;
 			ctx->current_offset = 0;
+			if (is_init && s)
+				gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_INIT, &PROP_BOOL(GF_TRUE) );
 		}
 		if (is_init) {
 			gf_filter_pck_set_dependency_flags(ctx->dst_pck, 0xFF);
@@ -3623,23 +4777,32 @@
 		}
 		mp4mux_send_output(ctx);
 	}
-
+	if (!is_init && ctx->llhls_mode && ctx->frag_size) {
+		mp4_mux_flush_frag_hls(ctx);
+	}
 	if (ctx->dash_mode) {
 		//send event on first track only
 		tkw = gf_list_get(ctx->tracks, 0);
 		GF_FEVT_INIT(evt, GF_FEVT_SEGMENT_SIZE, tkw->ipid);
 		evt.seg_size.seg_url = NULL;
-		evt.seg_size.is_init = is_init ? GF_TRUE : GF_FALSE;
+		evt.seg_size.is_init = is_init ? 1 : 0;
 		if (!is_init || !idx_end_range) {
 			evt.seg_size.media_range_start = ctx->current_offset;
 			evt.seg_size.media_range_end = ctx->current_offset + ctx->current_size - 1;
 		}
+		if (idx_end_range && (ctx->vodcache==MP4MX_VODCACHE_INSERT))
+			evt.seg_size.is_shift = 1;
+
 		evt.seg_size.idx_range_start = idx_start_range;
 		evt.seg_size.idx_range_end = idx_end_range;
 		gf_filter_pid_send_event(tkw->ipid, &evt);
 
 		ctx->current_offset += ctx->current_size;
 		ctx->current_size = 0;
+		ctx->frag_offset = 0;
+		ctx->frag_size = 0;
+		ctx->frag_num = 0;
+		ctx->frag_has_intra = GF_FALSE;
 		//changing file
 		if (ctx->seg_name) {
 			ctx->first_pck_sent = GF_FALSE;
@@ -3670,9 +4833,9 @@
 	if (ctx->sseg && ctx->noinit)
 		ctx->single_file = GF_FALSE;
 
-	if (ctx->idur.num && ctx->idur.den) {
-		max_dur.num = ctx->idur.num;
-		max_dur.den = ctx->idur.den;
+	if (ctx->dur.num && ctx->dur.den) {
+		max_dur.num = ctx->dur.num;
+		max_dur.den = ctx->dur.den;
 	}
 
 	//make sure we have one sample from each PID. This will trigger potential pending reconfigure
@@ -3685,7 +4848,13 @@
 
 		pck = gf_filter_pid_get_packet(tkw->ipid);
 		if (!pck) {
-			if (gf_filter_pid_is_eos(tkw->ipid)) continue;
+			if (gf_filter_pid_is_eos(tkw->ipid)) {
+				if (tkw->dgl_copy) {
+					gf_filter_pck_discard(tkw->dgl_copy);
+					tkw->dgl_copy = NULL;
+				}
+				continue;
+			}
 			return GF_OK;
 		}
 
@@ -3702,7 +4871,7 @@
 		}
 
 		if (tkw->cenc_state==CENC_NEED_SETUP) {
-			mp4_mux_cenc_update(ctx, tkw, pck, CENC_CONFIG, 0);
+			mp4_mux_cenc_update(ctx, tkw, pck, CENC_CONFIG, 0, 0);
 		}
 
 		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
@@ -3727,6 +4896,7 @@
 	//good to go, finalize for fragments
 	for (i=0; i<count; i++) {
 		u32 def_pck_dur;
+		u32 def_samp_size=0;
 		u32 def_is_rap;
 #ifdef GF_ENABLE_CTRN
 		u32 inherit_traf_from_track = 0;
@@ -3758,13 +4928,22 @@
 					dts = gf_filter_pck_get_cts(pck);
 				tscale = gf_filter_pck_get_timescale(pck);
 
-				if (!min_dts || min_dts * tscale > dts * min_dts_scale) {
+				if (!min_dts || gf_timestamp_greater(min_dts, min_dts_scale, dts, tscale)) {
 					min_dts = dts;
 					min_dts_scale = tscale;
 				}
+				if (tkw->raw_audio_bytes_per_sample) {
+					u32 pck_size;
+					gf_filter_pck_get_data(pck, &pck_size);
+					pck_size /= tkw->raw_audio_bytes_per_sample;
+					if (pck_size)
+						def_pck_dur /= pck_size;
+				}
 			} else {
 				def_pck_dur = 0;
 			}
+			if (tkw->raw_audio_bytes_per_sample)
+				def_samp_size = tkw->raw_audio_bytes_per_sample;
 		}
 		if (tkw->src_timescale != tkw->tk_timescale) {
 			def_pck_dur *= tkw->tk_timescale;
@@ -3809,15 +4988,24 @@
 
 		//use 1 for the default sample description index. If no multi stsd, this is always the case
 		//otherwise we need to update the stsd idx in the traf headers
-		e = gf_isom_setup_track_fragment(ctx->file, tkw->track_id, tkw->stsd_idx, def_pck_dur, 0, (u8) def_is_rap, 0, 0, ctx->nofragdef ? GF_TRUE : GF_FALSE);
+		e = gf_isom_setup_track_fragment(ctx->file, tkw->track_id, tkw->stsd_idx, def_pck_dur, def_samp_size, (u8) def_is_rap, 0, 0, ctx->nofragdef ? GF_TRUE : GF_FALSE);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Unable to setup fragmentation for track ID %d: %s\n", tkw->track_id, gf_error_to_string(e) ));
 			return e;
 		}
 
+		if (ctx->refrag) {
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TREX_TEMPLATE);
+			if (p) {
+				gf_isom_setup_track_fragment_template(ctx->file, tkw->track_id, p->value.data.ptr, p->value.data.size, ctx->nofragdef);
+			} else if (!ctx->nofragdef) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Refragmentation with default track fragment flags signaling but no TREX found in source track %d, using defaults computed from PID, result might be broken\n", tkw->track_id));
+			}
+		}
+
+
 		if (ctx->tfdt.den && ctx->tfdt.num) {
-			tkw->offset_dts = ctx->tfdt.num * tkw->tk_timescale;
-			tkw->offset_dts /= ctx->tfdt.den;
+			tkw->offset_dts = gf_timestamp_rescale(ctx->tfdt.num, ctx->tfdt.den, tkw->tk_timescale);
 		}
 
 		if (tkw->fake_track) {
@@ -3849,13 +5037,24 @@
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DASH_SEGMENTS);
 		if (p && (p->value.uint>nb_segments))
 			nb_segments = p->value.uint;
+
+		if (!ctx->dash_mode)
+			gf_isom_purge_track_reference(ctx->file, tkw->track_num);
 	}
 
-	if (max_dur.num) {
+	if (max_dur.num && max_dur.den) {
 		u64 mdur = max_dur.num;
-		mdur *= (u32) ctx->moovts;
-		mdur /= max_dur.den;
-		gf_isom_set_movie_duration(ctx->file, mdur);
+		if (ctx->moovts != max_dur.den) {
+			mdur *= (u32) ctx->moovts;
+			mdur /= max_dur.den;
+		}
+		gf_isom_set_movie_duration(ctx->file, mdur, GF_FALSE);
+	}
+	else if (ctx->cmaf) {
+		//CMAF 7.3.2.1.c.6) "The MovieExtendsBox may contain a MovieExtendsHeaderBox,
+		//as defined in ISO/IEC 14496-12, and if so, shall provide the overall duration
+		//of the CMAF track. If the duration is unknown, this box shall be omitted."
+		gf_isom_set_movie_duration(ctx->file, 0, GF_TRUE);
 	}
 
 	//if we have an explicit track reference for fragmenting, move it first in our list
@@ -3923,10 +5122,10 @@
 	ctx->init_movie_done = GF_TRUE;
 
 	if (min_dts_scale) {
-		ctx->next_frag_start = (Double) min_dts;
-		ctx->next_frag_start /= min_dts_scale;
+		u64 rs_dts = gf_timestamp_rescale(min_dts, min_dts_scale, ctx->cdur.den);
+		ctx->next_frag_start = rs_dts;
 	}
-	ctx->next_frag_start += ctx->cdur;
+	ctx->next_frag_start += ctx->cdur.num;
 	ctx->adjusted_next_frag_start = ctx->next_frag_start;
 	ctx->fragment_started = GF_FALSE;
 
@@ -3936,7 +5135,7 @@
 		ctx->current_size = ctx->current_offset = 0;
 		ctx->first_pck_sent = GF_FALSE;
 	} else {
-		mp4_mux_flush_frag(ctx, GF_TRUE, 0, 0);
+		mp4_mux_flush_seg(ctx, GF_TRUE, 0, 0);
 	}
 	assert(!ctx->dst_pck);
 
@@ -3950,7 +5149,7 @@
 	}
 
 	if (ctx->dash_mode==MP4MX_DASH_VOD) {
-		if ((ctx->vodcache==MP4MX_VODCACHE_REPLACE) && !nb_segments && (!ctx->media_dur || !ctx->dash_dur) ) {
+		if ((ctx->vodcache==MP4MX_VODCACHE_REPLACE) && !nb_segments && (!ctx->media_dur || !ctx->dash_dur.num) ) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Media duration unknown, cannot use replace mode of vodcache, using temp file for VoD storage\n"));
 			ctx->vodcache = MP4MX_VODCACHE_ON;
 			e = mp4mx_setup_dash_vod(ctx, NULL);
@@ -3967,7 +5166,7 @@
 
 			if (!nb_segments) {
 				exact_sidx = GF_FALSE;
-				nb_segments = (u32) ( ctx->media_dur / ctx->dash_dur);
+				nb_segments = (u32) ( ctx->media_dur * ctx->dash_dur.den / ctx->dash_dur.num);
 				//always add an extra segment
 				nb_segments ++;
 				//and safety alloc of 10%
@@ -3995,6 +5194,8 @@
 			ctx->sidx_chunk_offset = (u32) (ctx->current_offset + ctx->current_size);
 			//send a dummy packet
 			pck = gf_filter_pck_new_alloc(ctx->opid, ctx->sidx_max_size, &output);
+			if (!pck) return GF_OUT_OF_MEM;
+
 			gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
 			//format as free box for now
 			bs = gf_bs_new(output, ctx->sidx_max_size, GF_BITSTREAM_WRITE);
@@ -4006,6 +5207,8 @@
 			gf_bs_write_data(bs, msg, len );
 			gf_bs_del(bs);
 			gf_filter_pck_send(pck);
+
+			ctx->current_offset += ctx->sidx_max_size;
 		} else if (ctx->vodcache==MP4MX_VODCACHE_ON) {
 			ctx->store_output = GF_TRUE;
 		} else {
@@ -4027,6 +5230,7 @@
 	//setup some default
 	gf_isom_set_next_moof_number(ctx->file, ctx->msn);
 	ctx->msn += ctx->msninc;
+	ctx->min_cts_plus_one = 0;
 
 	if (ctx->moof_first) flags |= GF_ISOM_FRAG_MOOF_FIRST;
 #ifdef GF_ENABLE_CTRN
@@ -4072,13 +5276,24 @@
 		if (ctx->trun_inter) {
 			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRUN_SET_INTERLEAVE_ID, 0);
 		}
+		if (ctx->truns_first) {
+			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_TRUNS_FIRST, 1);
+		}
+		//7.7 cmf2 For video CMAF Tracks not contained in Track Files, Version 1 shall be used.
+		if ((ctx->cmaf==MP4MX_CMAF_CMF2) && (tkw->stream_type==GF_STREAM_VISUAL))
+			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_TRUN_V1, 1);
 
 		if (ctx->sdtp_traf)
 			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_USE_SAMPLE_DEPS_BOX, ctx->sdtp_traf);
 
+		if (ctx->tfdt64)
+			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_USE_LARGE_TFDT, ctx->tfdt64);
 
-		if (ctx->insert_pssh)
-			mp4_mux_cenc_insert_pssh(ctx, tkw);
+		if (tkw->dyn_pssh) {
+			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, GF_TRUE);
+		}
+		else if (ctx->insert_pssh)
+			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, GF_FALSE);
 	}
 	ctx->fragment_started = GF_TRUE;
 	ctx->insert_tfdt = GF_FALSE;
@@ -4096,11 +5311,17 @@
 	}
 	if (!blocksize) return GF_EOS;
 	pck = gf_filter_pck_new_alloc(ctx->opid, blocksize, &output);
+	if (!pck) return GF_OUT_OF_MEM;
+
 	nb_read = (u32) gf_fread(output, blocksize, ctx->tmp_store);
-	ctx->flush_done += nb_read;
 	if (nb_read != blocksize) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error flushing fragmented file, read %d bytes but asked %d bytes\n", nb_read, blocksize));
+		char tmp[1];
+		//weird behavior on some file systems, dump debug info
+		gf_fread(tmp, 1, ctx->tmp_store);
+		Bool is_eof = gf_feof(ctx->tmp_store);
+		GF_LOG(is_eof ? GF_LOG_WARNING : GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error reading from VOD temp cache, read %d bytes but asked %d bytes\n\tCache EOF %d - cache size "LLU" - read pos "LLU" - file pos "LLU"\n", nb_read, blocksize, is_eof, ctx->flush_size, ctx->flush_done, gf_ftell(ctx->tmp_store)));
 	}
+	ctx->flush_done += nb_read;
 	if (ctx->flush_done==ctx->flush_size) {
 		gf_filter_pck_set_framing(pck, GF_FALSE, GF_TRUE);
 		gf_filter_pck_send(pck);
@@ -4110,7 +5331,7 @@
 	gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
 	gf_filter_pck_send(pck);
 	//we are not done flushing but we have no more input packets, signal we still need processing
-	gf_filter_post_process_task(filter);
+	gf_filter_ask_rt_reschedule(filter, 1);
 	return GF_OK;
 }
 
@@ -4168,6 +5389,8 @@
 		tkw->suspended = GF_FALSE;
 		tkw->track_num = 0;
 		tkw->nb_samples = 0;
+		tkw->max_cts = 0;
+		tkw->min_cts = (u64) -1;
 		e = mp4_mux_configure_pid(filter, tkw->ipid, GF_FALSE);
 		if (e) return e;
 		tkw->nb_samples = 0;
@@ -4260,6 +5483,10 @@
 						nb_suspended++;
 					nb_done ++;
 					nb_eos++;
+					if (tkw->dgl_copy) {
+						gf_filter_pck_discard(tkw->dgl_copy);
+						tkw->dgl_copy = NULL;
+					}
 					break;
 				}
 				return GF_OK;
@@ -4280,6 +5507,7 @@
 				if (p && p->value.boolean) {
 					nb_done ++;
 					tkw->fragment_done = GF_TRUE;
+					tkw->samples_in_frag = 0;
 					gf_filter_pid_drop_packet(tkw->ipid);
 					ctx->flush_seg = GF_TRUE;
 					tkw->next_seg_cts = tkw->cts_next;
@@ -4340,6 +5568,14 @@
 				e = mp4_mux_start_fragment(ctx, orig_frag_bounds ? pck : NULL);
 				if (e) return e;
 
+				//push emsgonce the segment is started
+				const GF_PropertyValue *emsg = gf_filter_pck_get_property_str(pck, "grp_EMSG");
+				if (emsg && (emsg->type==GF_PROP_DATA) && emsg->value.data.ptr) {
+					GF_Err gf_isom_set_emsg(GF_ISOFile *movie, u8 *data, u32 size);
+
+					gf_isom_set_emsg(ctx->file, emsg->value.data.ptr, emsg->value.data.size);
+				}
+
 				ctx->nb_frags++;
 				if (ctx->dash_mode)
 					ctx->nb_frags_in_seg++;
@@ -4350,7 +5586,7 @@
 			if (ctx->dash_mode) {
 				if (p) {
 					//start of next segment, abort fragmentation for this track and flush all other writers
-					if (ctx->dash_seg_num && (ctx->dash_seg_num != p->value.uint) ) {
+					if (ctx->dash_seg_num_plus_one && (ctx->dash_seg_num_plus_one != 1 + p->value.uint) ) {
 						tkw->fragment_done = GF_TRUE;
 						tkw->samples_in_frag = 0;
 						nb_done ++;
@@ -4362,7 +5598,7 @@
 						break;
 					}
 					//start of current segment, remember segment number and name
-					ctx->dash_seg_num = p->value.uint;
+					ctx->dash_seg_num_plus_one = 1 + p->value.uint;
 					//get file name prop if any - only send on one pid for muxed content
 					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
 					if (p && p->value.string) {
@@ -4388,16 +5624,29 @@
 			if (tkw->cts_next < ncts)
 				tkw->cts_next = ncts;
 
-
-			if (tkw->samples_in_frag && orig_frag_bounds) {
+			//we have samples and either a request to flush fragment or a emsg, start new fragment
+			if (tkw->samples_in_frag && (orig_frag_bounds || (gf_filter_pck_get_property_str(pck, "grp_EMSG")!=NULL))) {
 				tkw->fragment_done = GF_TRUE;
 				nb_done ++;
 				tkw->samples_in_frag = 0;
 				tkw->dur_in_frag = 0;
 				break;
 			} else if (ctx->fragdur && (!ctx->dash_mode || !tkw->fragment_done) ) {
+				Bool frag_done = GF_FALSE;
 				u32 dur = gf_filter_pck_get_duration(pck);
-				if (tkw->dur_in_frag && (tkw->dur_in_frag >= ctx->cdur * tkw->src_timescale)) {
+				if (tkw->dur_in_frag && gf_timestamp_greater_or_equal(tkw->dur_in_frag, tkw->src_timescale, ctx->cdur.num, ctx->cdur.den)) {
+					frag_done = GF_TRUE;
+				} else if ((ctx->store==MP4MX_MODE_SFRAG)
+					&& gf_timestamp_greater_or_equal(cts - tkw->ts_delay, tkw->src_timescale, ctx->adjusted_next_frag_start, ctx->cdur.den)
+				) {
+					GF_FilterSAPType sap = mp4_mux_get_sap(ctx, pck);
+					if ((sap && sap<GF_FILTER_SAP_3)) {
+						frag_done = GF_TRUE;
+					}
+				}
+				if (frag_done) {
+					ctx->adjusted_next_frag_start = gf_timestamp_rescale(cts - tkw->ts_delay, tkw->src_timescale, ctx->cdur.den);
+//
 					tkw->fragment_done = GF_TRUE;
 					nb_done ++;
 					tkw->dur_in_frag = 0;
@@ -4405,8 +5654,12 @@
 					break;
 				}
 				tkw->dur_in_frag += dur;
+				if (ctx->llhls_mode && (ctx->frag_duration * tkw->src_timescale <= tkw->dur_in_frag * ctx->frag_timescale)) {
+					ctx->frag_duration = tkw->dur_in_frag;
+					ctx->frag_timescale = tkw->src_timescale;
+				}
 			} else if (!ctx->flush_seg && !ctx->dash_mode
-				&& (cts >= (u64) (ctx->adjusted_next_frag_start * tkw->src_timescale) + tkw->ts_delay)
+				&& gf_timestamp_greater_or_equal(cts - tkw->ts_delay, tkw->src_timescale, ctx->adjusted_next_frag_start, ctx->cdur.den)
 			 ) {
 				GF_FilterSAPType sap = mp4_mux_get_sap(ctx, pck);
 				if ((ctx->store==MP4MX_MODE_FRAG) || (sap && sap<GF_FILTER_SAP_3)) {
@@ -4414,12 +5667,25 @@
 					tkw->samples_in_frag = 0;
 					nb_done ++;
 					if (ctx->store==MP4MX_MODE_SFRAG) {
-						ctx->adjusted_next_frag_start = (Double) (cts - tkw->ts_delay);
-						ctx->adjusted_next_frag_start /= tkw->src_timescale;
+						ctx->adjusted_next_frag_start = gf_timestamp_rescale(cts - tkw->ts_delay, tkw->src_timescale, ctx->cdur.den);
 					}
 					break;
 				}
 			}
+
+			if ((ctx->store>=MP4MX_MODE_FRAG) && tkw->samples_in_frag) {
+				p = gf_filter_pck_get_property(pck, GF_PROP_PID_CENC_PSSH);
+				if (p && (p->type == GF_PROP_DATA) && p->value.data.ptr && !ctx->flush_seg && !ctx->dash_mode) {
+					tkw->fragment_done = GF_TRUE;
+					tkw->samples_in_frag = 0;
+					nb_done ++;
+					if (ctx->store==MP4MX_MODE_SFRAG) {
+						ctx->adjusted_next_frag_start = gf_timestamp_rescale(cts - tkw->ts_delay, tkw->src_timescale, ctx->cdur.den);
+					}
+					break;
+				}
+			}
+
 			if (tkw->insert_tfdt) {
 				u64 odts = gf_filter_pck_get_dts(pck);
 				if (odts==GF_FILTER_NO_TS)
@@ -4428,7 +5694,10 @@
 				if (tkw->offset_dts) odts += tkw->offset_dts;
 
 				tkw->insert_tfdt = GF_FALSE;
-				gf_isom_set_traf_base_media_decode_time(ctx->file, tkw->track_id, odts);
+				if (tkw->patch_tfdt)
+					gf_isom_set_traf_base_media_decode_time(ctx->file, tkw->track_id, odts + tkw->ts_delay);
+				else
+					gf_isom_set_traf_base_media_decode_time(ctx->file, tkw->track_id, odts);
 				tkw->first_dts_in_seg = (u64) odts;
 			}
 
@@ -4458,6 +5727,10 @@
 			//discard
 			gf_filter_pid_drop_packet(tkw->ipid);
 
+			cts = gf_timestamp_rescale(cts, tkw->src_timescale, 1000);
+			if (!ctx->min_cts_plus_one) ctx->min_cts_plus_one = cts + 1;
+			else if (ctx->min_cts_plus_one-1 > cts) ctx->min_cts_plus_one = cts + 1;
+
 			if (e) return e;
 		}
 		//done with this track - if single track per moof, request new fragment but don't touch the
@@ -4473,6 +5746,8 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Unable to start new fragment: %s\n", gf_error_to_string(e) ));
 				return e;
 			}
+			gf_isom_set_next_moof_number(ctx->file, ctx->msn);
+			ctx->msn++;
 			if (ctx->sdtp_traf)
 				gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_USE_SAMPLE_DEPS_BOX, ctx->sdtp_traf);
 		}
@@ -4486,19 +5761,21 @@
 
 	if (nb_done==count) {
 		Bool is_eos = (count == nb_eos) ? GF_TRUE : GF_FALSE;
-		Double ref_start;
+		u32 ref_timescale;
 		u64 next_ref_ts = ctx->ref_tkw->next_seg_cts;
 		if (is_eos)
 			next_ref_ts = ctx->ref_tkw->cts_next;
-		ref_start = (Double) next_ref_ts;
-		ref_start /= ctx->ref_tkw->src_timescale;
 
-		ctx->next_frag_start += ctx->cdur;
+		ref_timescale = ctx->ref_tkw->src_timescale;
+		//both in ms
+		ctx->next_seg_start = (u64) gf_timestamp_rescale(next_ref_ts, ref_timescale, 1000);
+		ctx->min_cts_next_frag = (u64) gf_timestamp_rescale(ctx->next_frag_start, ctx->cdur.den, 1000);
+
+		ctx->next_frag_start += ctx->cdur.num;
 		while (ctx->next_frag_start <= ctx->adjusted_next_frag_start) {
-			ctx->next_frag_start += ctx->cdur;
+			ctx->next_frag_start += ctx->cdur.num;
 		}
 		ctx->adjusted_next_frag_start = ctx->next_frag_start;
-		ctx->fragment_started = GF_FALSE;
 
 		mp4mx_frag_box_patch(ctx);
 
@@ -4524,12 +5801,12 @@
 			e = gf_isom_close_segment(ctx->file, subs_sidx, track_ref_id, ctx->ref_tkw->first_dts_in_seg, ctx->ref_tkw->ts_delay, next_ref_ts, ctx->chain_sidx, ctx->ssix, ctx->sseg ? GF_FALSE : is_eos, GF_FALSE, ctx->eos_marker, &idx_start_range, &idx_end_range, &segment_size_in_bytes);
 			if (e) return e;
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MP4Mux] Done writing segment %d - estimated next fragment times start %g end %g\n", ctx->dash_seg_num, ref_start, ctx->next_frag_start ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MP4Mux] Done writing segment %d - estimated next fragment times start %g end %g\n", ctx->dash_seg_num_plus_one - 1, ((Double)next_ref_ts)/ref_timescale, ((Double)ctx->next_frag_start)/ctx->cdur.den ));
 
 			if (ctx->dash_mode != MP4MX_DASH_VOD) {
-				mp4_mux_flush_frag(ctx, GF_FALSE, offset + idx_start_range, idx_end_range ? offset + idx_end_range : 0);
+				mp4_mux_flush_seg(ctx, GF_FALSE, offset + idx_start_range, idx_end_range ? offset + idx_end_range : 0);
 			} else if (ctx->vodcache==MP4MX_VODCACHE_REPLACE) {
-				mp4_mux_flush_frag(ctx, GF_FALSE, 0, 0);
+				mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0);
 			} else {
 				if (ctx->nb_seg_sizes == ctx->alloc_seg_sizes) {
 					 ctx->alloc_seg_sizes *= 2;
@@ -4540,21 +5817,30 @@
 				ctx->seg_sizes[ctx->nb_seg_sizes] = (u32) segment_size_in_bytes;
 				ctx->nb_seg_sizes++;
 			}
+			//we still need to send seg size info for for HLS !
+			if (ctx->vodcache==MP4MX_VODCACHE_INSERT)
+				mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0);
 		}
 		//cannot flush in DASH mode if using sidx (vod single sidx or live 1 sidx/seg)
 		else if (!ctx->dash_mode || ((ctx->subs_sidx<0) && (ctx->dash_mode<MP4MX_DASH_VOD) && !ctx->cloned_sidx) ) {
 			gf_isom_flush_fragments(ctx->file, GF_FALSE);
 
-			if (!ctx->dash_mode || ctx->flush_seg)
-				mp4_mux_flush_frag(ctx, GF_FALSE, 0, 0);
+			if (ctx->llhls_mode) {
+				mp4_mux_flush_frag_hls(ctx);
+			}
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MP4Mux] Done writing fragment - next fragment start time %g\n", ctx->next_frag_start ));
+			if (!ctx->dash_mode || ctx->flush_seg) {
+				mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0);
+			}
+
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MP4Mux] Done writing fragment - next fragment start time %g\n", ((Double)ctx->next_frag_start)/ctx->cdur.den ));
 		}
+		ctx->fragment_started = GF_FALSE;
 
 		if (ctx->flush_seg) {
 			ctx->segment_started = GF_FALSE;
 			ctx->flush_seg = GF_FALSE;
-			ctx->dash_seg_num = 0;
+			ctx->dash_seg_num_plus_one = 0;
 			ctx->nb_segs++;
 			ctx->nb_frags_in_seg=0;
 		}
@@ -4571,17 +5857,18 @@
 			if (ctx->vodcache!=MP4MX_VODCACHE_ON) {
 				ctx->final_sidx_flush = GF_TRUE;
 				//flush SIDX in given space - this will reserve 8 bytes for free box if not fitting
-				gf_isom_flush_sidx(ctx->file, ctx->sidx_max_size, ctx->sidx_size_exact);
+				gf_isom_flush_sidx(ctx->file, ctx->sidx_max_size, (ctx->sidx_size_exact || ctx->tfdt64) ? GF_TRUE : GF_FALSE);
 			} else {
 				u64 start_offset;
 				//reenable packet dispatch
 				ctx->store_output = GF_FALSE;
-				gf_isom_flush_sidx(ctx->file, 0, GF_FALSE);
+				gf_isom_flush_sidx(ctx->file, 0, ctx->tfdt64);
 				//flush sidx packet
 				mp4mux_send_output(ctx);
 
-				mp4_mux_flush_frag(ctx, GF_TRUE, ctx->current_offset, ctx->current_offset + ctx->current_size - 1);
+				mp4_mux_flush_seg(ctx, GF_TRUE, ctx->current_offset, ctx->current_offset + ctx->current_size - 1);
 
+				gf_fflush(ctx->tmp_store);
 				ctx->flush_size = gf_ftell(ctx->tmp_store);
 				ctx->flush_done = 0;
 				gf_fseek(ctx->tmp_store, 0, SEEK_SET);
@@ -4590,7 +5877,7 @@
 					start_offset = ctx->current_offset;
 					for (i=0; i<ctx->nb_seg_sizes; i++) {
 						ctx->current_size = ctx->seg_sizes[i];
-						mp4_mux_flush_frag(ctx, GF_FALSE, 0, 0);
+						mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0);
 					}
 					ctx->current_offset = start_offset;
 					ctx->current_size = 0;
@@ -4630,6 +5917,17 @@
 		GF_FilterPacket *pck;
 		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
 		if (tkw->fake_track) continue;
+
+		//already setup (happens when new PIDs are declared after a packet has already been written on other PIDs)
+		if (tkw->nb_samples) {
+			dts_min = gf_timestamp_rescale(tkw->ts_shift, tkw->src_timescale, 1000000);
+
+			if (first_ts_min > dts_min) {
+				first_ts_min = (u64) dts_min;
+			}
+			continue;
+		}
+retry_pck:
 		pck = gf_filter_pid_get_packet(tkw->ipid);
 		//check this after fetching a packet since it may reconfigure the track
 		if (!tkw->track_num) {
@@ -4639,10 +5937,42 @@
 			}
 			return;
 		}
+
+		if (pck) {
+			if (tkw->wait_sap) {
+				GF_FilterSAPType sap = gf_filter_pck_get_sap(pck);
+				Bool seek = gf_filter_pck_get_seek_flag(pck);
+				if (seek || !sap) {
+					gf_filter_pid_drop_packet(tkw->ipid);
+					goto retry_pck;
+				} else {
+					tkw->wait_sap = GF_FALSE;
+
+					if (!ctx->wait_dts_plus_one) {
+						ctx->wait_dts_plus_one = 1 + gf_filter_pck_get_dts(pck);
+						ctx->wait_dts_timescale = tkw->src_timescale;
+					}
+				}
+			}
+
+			if (ctx->wait_dts_plus_one) {
+				ts = gf_filter_pck_get_dts(pck);
+				if (ts==GF_FILTER_NO_TS)
+					ts = gf_filter_pck_get_cts(pck);
+				if (ts==GF_FILTER_NO_TS)
+					ts=0;
+
+				if (gf_timestamp_less(ts, tkw->src_timescale, (ctx->wait_dts_plus_one-1), ctx->wait_dts_timescale)) {
+					gf_filter_pid_drop_packet(tkw->ipid);
+					goto retry_pck;
+				}
+			}
+		}
+
 		if (!pck) {
 			if (gf_filter_pid_is_eos(tkw->ipid)) {
 				if (tkw->cenc_state==CENC_NEED_SETUP)
-					mp4_mux_cenc_update(ctx, tkw, NULL, CENC_CONFIG, 0);
+					mp4_mux_cenc_update(ctx, tkw, NULL, CENC_CONFIG, 0, 0);
 
 				if (!tkw->nb_samples) {
 					const GF_PropertyValue *p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TREX_TEMPLATE);
@@ -4650,6 +5980,10 @@
 						gf_isom_setup_track_fragment_template(ctx->file, tkw->track_id, p->value.data.ptr, p->value.data.size, ctx->nofragdef);
 					}
 				}
+				if (tkw->dgl_copy) {
+					gf_filter_pck_discard(tkw->dgl_copy);
+					tkw->dgl_copy = NULL;
+				}
 				continue;
 			}
 			return;
@@ -4665,8 +5999,7 @@
 		if (ts==GF_FILTER_NO_TS)
 			ts=0;
 
-		dts_min = ts * 1000000;
-		dts_min /= tkw->src_timescale;
+		dts_min = gf_timestamp_rescale(ts, tkw->src_timescale, 1000000);
 
 		if (first_ts_min > dts_min) {
 			first_ts_min = (u64) dts_min;
@@ -4682,18 +6015,14 @@
 		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
 
 		//compute offsets
-		dts_diff = first_ts_min;
-		dts_diff *= tkw->src_timescale;
-		dts_diff /= 1000000;
+		dts_diff = gf_timestamp_rescale(first_ts_min, 1000000, tkw->src_timescale);
 		dts_diff = (s64) tkw->ts_shift - dts_diff;
 		if (ctx->is_rewind) dts_diff = -dts_diff;
 		//negative could happen due to rounding, ignore them
 		if (dts_diff<=0) continue;
 
 		// dts_diff > 0, we need to delay the track
-		dur = dts_diff;
-		dur *= (u32) ctx->moovts;
-		dur /= tkw->src_timescale;
+		dur = gf_timestamp_rescale(dts_diff, tkw->src_timescale, ctx->moovts);
 		if (dur) {
 			gf_isom_remove_edits(ctx->file, tkw->track_num);
 
@@ -4710,7 +6039,7 @@
 {
 	Bool status_changed=GF_FALSE;
 	u32 total_pc = 0;
-	char szStatus[2048], szTK[20];
+	char *status = NULL, szTmp[2048], szTK[20];
 	if (!gf_filter_reporting_enabled(filter))
 		return;
 	if (!ctx->update_report)
@@ -4719,14 +6048,14 @@
 	ctx->update_report = GF_FALSE;
 
 	if (ctx->config_timing) {
-		sprintf(szStatus, "waiting for clock init");
+		gf_dynstrcat(&status, "waiting for clock init", NULL);
 		status_changed = GF_TRUE;
 	} else if (total) {
 		if (done>=total) {
 			Double ohead = 0;
 			if (ctx->total_bytes_in) ohead = ((Double) (ctx->total_bytes_out - ctx->total_bytes_in)*100 / ctx->total_bytes_in);
 
-			sprintf(szStatus, "done %d samples - bytes "LLU" in "LLU" out - overhead %02.02f%% (%02.02g B/sample)", ctx->total_samples, ctx->total_bytes_in, ctx->total_bytes_out, ohead, ((Double)(ctx->total_bytes_out-ctx->total_bytes_in))/ctx->total_samples);
+			sprintf(szTmp, "done %d samples - bytes "LLU" in "LLU" out - overhead %02.02f%% (%02.02g B/sample)", ctx->total_samples, ctx->total_bytes_in, ctx->total_bytes_out, ohead, ((Double)(ctx->total_bytes_out-ctx->total_bytes_in))/ctx->total_samples);
 			status_changed = GF_TRUE;
 			total_pc = 10000;
 
@@ -4734,40 +6063,43 @@
 			u32 pc = (u32) ((done*10000)/total);
 			if (ctx->last_mux_pc == pc + 1) return;
 			ctx->last_mux_pc = pc + 1;
-			sprintf(szStatus, "mux %d%%", pc);
+			sprintf(szTmp, "mux %d%%", pc);
 			status_changed = GF_TRUE;
 		}
+		gf_dynstrcat(&status, szTmp, NULL);
 	} else {
 		u32 i, count = gf_list_count(ctx->tracks);
 		Bool is_frag = GF_FALSE;
 
 		if (ctx->store>=MP4MX_MODE_FRAG) {
+			Double next = ((Double)ctx->next_frag_start)/ctx->cdur.den;
 			is_frag = GF_TRUE;
 			if (ctx->dash_mode) {
-				sprintf(szStatus, "mux segments %d (frags %d) next %02.02g", ctx->nb_segs, ctx->nb_frags_in_seg, ctx->next_frag_start);
+				sprintf(szTmp, "mux segments %d (frags %d) next %02.02g", ctx->nb_segs, ctx->nb_frags_in_seg, next);
 			} else {
-				sprintf(szStatus, "mux frags %d next %02.02g", ctx->nb_frags, ctx->next_frag_start);
+				sprintf(szTmp, "mux frags %d next %02.02g", ctx->nb_frags, next);
 			}
 		} else {
-			sprintf(szStatus, "%s", ((ctx->store==MP4MX_MODE_FLAT) || (ctx->store==MP4MX_MODE_FASTSTART)) ? "mux" : "import");
+			sprintf(szTmp, "%s", ((ctx->store==MP4MX_MODE_FLAT) || (ctx->store==MP4MX_MODE_FASTSTART)) ? "mux" : "import");
 		}
+		gf_dynstrcat(&status, szTmp, NULL);
 		for (i=0; i<count; i++) {
 			u32 pc=0;
 			TrackWriter *tkw = gf_list_get(ctx->tracks, i);
 			if (tkw->aborted) {
 				pc=10000;
-			} else if (ctx->idur.num) {
-				if (ctx->idur.num>0) {
+			} else if (ctx->dur.num) {
+				if (ctx->dur.num>0) {
 					u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
-					u64 tk_done = mdur * ctx->idur.den;
-					u64 tk_total = ((u64)tkw->tk_timescale) * ctx->idur.num;
+					u64 tk_done = mdur * ctx->dur.den;
+					u64 tk_total = ((u64)tkw->tk_timescale) * ctx->dur.num;
 					pc = (u32) ((tk_done*10000)/tk_total);
 				} else {
-					pc = (u32) ( (10000 * (u64) tkw->nb_samples) / (-ctx->idur.num) );
+					pc = (u32) ( (10000 * (u64) (tkw->nb_samples + tkw->frame_offset) ) / (-ctx->dur.num) );
 				}
 			} else {
 				if (tkw->nb_frames) {
-					pc = (u32) ( (10000 * (u64) tkw->nb_samples) / tkw->nb_frames);
+					pc = (u32) ( (10000 * (u64) (tkw->nb_samples + tkw->frame_offset)) / tkw->nb_frames);
 				} else {
 					if (tkw->pid_dur.num && tkw->pid_dur.den) {
 						pc = (u32) ((tkw->sample.DTS*10000 * tkw->pid_dur.den) / (tkw->pid_dur.num * tkw->tk_timescale));
@@ -4787,21 +6119,22 @@
 
 			if (is_frag) {
 				sprintf(szTK, " TK%d(%c): %d", tkw->track_id, tkw->status_type, tkw->samples_in_frag);
-				strcat(szStatus, szTK);
+				gf_dynstrcat(&status, szTK, NULL);
 				status_changed = GF_TRUE;
 				if (pc) {
 					sprintf(szTK, " %d %%", pc/100);
-					strcat(szStatus, szTK);
+					gf_dynstrcat(&status, szTK, NULL);
 				}
 			} else {
 				sprintf(szTK, " %s%d(%c): %d %%", tkw->is_item ? "IT" : "TK", tkw->track_id, tkw->status_type, pc/100);
-				strcat(szStatus, szTK);
+				gf_dynstrcat(&status, szTK, NULL);
 			}
 		}
 	}
 	if (status_changed) {
-		gf_filter_update_status(filter, total_pc, szStatus);
+		gf_filter_update_status(filter, total_pc, status);
 	}
+	if (status) gf_free(status);
 }
 
 
@@ -4820,7 +6153,7 @@
 		}
 	}
 
-	//in frag mode, force fetching a sample from each track before processing
+	//fragmented mode
 	if (ctx->store>=MP4MX_MODE_FRAG) {
 		u32 done=0;
 		GF_Err e = mp4_mux_process_fragmented(filter, ctx);
@@ -4829,6 +6162,7 @@
 		return e;
 	}
 
+	//regular mode
 	nb_suspended = 0;
 	for (i=0; i<count; i++) {
 		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
@@ -4844,6 +6178,9 @@
 				tkw->suspended = GF_FALSE;
 				nb_eos++;
 			}
+			if (tkw->aborted) {
+				nb_eos++;
+			}
 			continue;
 		}
 
@@ -4879,25 +6216,25 @@
 
 		//basic regulation in case we do on-the-fly interleaving
 		//we need to regulate because sources do not produce packets at the same rate
-		if ((ctx->store==MP4MX_MODE_FASTSTART) && ctx->cdur) {
-			Double cts = (Double) gf_filter_pck_get_cts(pck);
+		if ((ctx->store==MP4MX_MODE_FASTSTART) && ctx->cdur.num) {
+			u64 cts = gf_filter_pck_get_cts(pck);
 			if (ctx->is_rewind)
 				cts = tkw->ts_shift - cts;
 			else
 				cts -= tkw->ts_shift;
-			cts /= tkw->src_timescale;
-			if (!ctx->faststart_ts_regulate) {
+
+			if (!ctx->faststart_ts_regulate.num) {
 				ctx->faststart_ts_regulate = ctx->cdur;
 			}
 			//ahead of our interleaving window, don't write yet
-			else if (cts > ctx->faststart_ts_regulate) {
+			else if (gf_timestamp_greater(cts, tkw->src_timescale, ctx->faststart_ts_regulate.num, ctx->faststart_ts_regulate.den)) {
 				nb_skip++;
 				continue;
 			}
 		}
 
 		if (tkw->cenc_state==CENC_NEED_SETUP)
-			mp4_mux_cenc_update(ctx, tkw, pck, CENC_CONFIG, 0);
+			mp4_mux_cenc_update(ctx, tkw, pck, CENC_CONFIG, 0, 0);
 
 		if (tkw->is_item) {
 			mp4_mux_process_item(ctx, tkw, pck);
@@ -4925,7 +6262,7 @@
 	}
 	//done with this interleaving window, start next one
 	else if (nb_skip + nb_eos == count) {
-		ctx->faststart_ts_regulate += ctx->cdur;
+		ctx->faststart_ts_regulate.num += ctx->cdur.num;
 	} else if (ctx->importer) {
 		u64 prog_done=0, prog_total=0;
 		for (i=0; i<count; i++) {
@@ -4948,6 +6285,8 @@
 	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
 
 	GF_FilterPacket *pck = gf_filter_pck_new_alloc(ctx->opid, block_size, &output);
+	if (!pck) return GF_OUT_OF_MEM;
+
 	memcpy(output, data, block_size);
 	gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
 	gf_filter_pck_set_seek_flag(pck, GF_TRUE);
@@ -4975,6 +6314,8 @@
 
 		if (ctx->vodcache==MP4MX_VODCACHE_INSERT) {
 			pck = gf_filter_pck_new_alloc(ctx->opid, block_size, &output);
+			if (!pck) return GF_OUT_OF_MEM;
+
 			memcpy(output, data, block_size);
 			gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
 			gf_filter_pck_set_byte_offset(pck, ctx->sidx_chunk_offset);
@@ -4991,6 +6332,8 @@
 			}
 			free_size = ctx->sidx_max_size - block_size;
 			pck = gf_filter_pck_new_alloc(ctx->opid, ctx->sidx_max_size, &output);
+			if (!pck) return GF_OUT_OF_MEM;
+
 			gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
 			gf_filter_pck_set_byte_offset(pck, ctx->sidx_chunk_offset);
 			gf_filter_pck_set_seek_flag(pck, GF_TRUE);
@@ -5004,7 +6347,7 @@
 			gf_bs_del(bs);
 			gf_filter_pck_send(pck);
 		}
-		mp4_mux_flush_frag(ctx, GF_TRUE, ctx->sidx_chunk_offset+free_size, ctx->sidx_chunk_offset+free_size + block_size - 1);
+		mp4_mux_flush_seg(ctx, GF_TRUE, ctx->sidx_chunk_offset+free_size, ctx->sidx_chunk_offset+free_size + block_size - 1);
 		return GF_OK;
 	}
 
@@ -5019,17 +6362,29 @@
 
 	//allocate new one
 	ctx->dst_pck = gf_filter_pck_new_alloc(ctx->opid, block_size, &output);
-	if (!ctx->dst_pck) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Cannot allocate output packets, lost %d bytes\n", block_size));
-	} else {
-		memcpy(output, data, block_size);
-		gf_filter_pck_set_framing(ctx->dst_pck, !ctx->first_pck_sent, GF_FALSE);
-	}
+	if (!ctx->dst_pck) return GF_OUT_OF_MEM;
+
+	memcpy(output, data, block_size);
+	gf_filter_pck_set_framing(ctx->dst_pck, !ctx->first_pck_sent, GF_FALSE);
+
 	//set packet prop as string since we may discard the seg_name packet before this packet is processed
 	if (!ctx->first_pck_sent && ctx->seg_name) {
 		ctx->current_offset = 0;
 		gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_FILENAME, &PROP_STRING(ctx->seg_name) );
+		gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_FILENUM, &PROP_UINT(ctx->dash_seg_num_plus_one-1) );
+	}
+	if (ctx->min_cts_plus_one) {
+		u64 orig = ctx->min_cts_plus_one-1;
+		gf_filter_pck_set_cts(ctx->dst_pck, orig);
+		gf_filter_pck_set_duration(ctx->dst_pck, (u32) (ctx->min_cts_next_frag - orig) );
+	}
+
+	if ((ctx->llhls_mode>1) && ctx->fragment_started && !ctx->frag_size && ctx->dst_pck) {
+		ctx->frag_num++;
+		gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_HLS_FRAG_NUM, &PROP_UINT(ctx->frag_num));
 	}
+	ctx->frag_size += block_size;
+
 	ctx->first_pck_sent = GF_TRUE;
 	ctx->current_size += block_size;
 	//non-frag mode, send right away
@@ -5059,6 +6414,7 @@
 			return GF_BAD_PARAM;
 		}
 		ctx->owns_mov = GF_FALSE;
+		gf_filter_act_as_sink(filter);
 	} else {
 		u32 open_mode = GF_ISOM_OPEN_WRITE;
 		ctx->owns_mov = GF_TRUE;
@@ -5069,7 +6425,7 @@
 			open_mode = GF_ISOM_WRITE_EDIT;
 			break;
 		}
-		ctx->file = gf_isom_open("_gpac_isobmff_redirect", open_mode, ctx->tmpd);
+		ctx->file = gf_isom_open("_gpac_isobmff_redirect", open_mode, NULL);
 		if (!ctx->file) return GF_OUT_OF_MEM;
 
 		gf_isom_set_write_callback(ctx->file, mp4_mux_on_data, mp4_mux_on_data_patch, filter, ctx->block_size);
@@ -5084,9 +6440,19 @@
 		if (ctx->store==MP4MX_MODE_FASTSTART) {
 			gf_isom_set_storage_mode(ctx->file, GF_ISOM_STORE_FASTSTART);
 		}
+	}
 
+	if (!ctx->moovts)
+		ctx->moovts=600;
+	if (!ctx->cdur.den) {
+		ctx->cdur.num = 0;
+		ctx->cdur.den = 1000;
+	}
+	//we need at least ms precision for sfrag mode
+	if (ctx->cdur.den < 1000) {
+		ctx->cdur.num = (s32) ( ((s64)ctx->cdur.num) * 1000 / ctx->cdur.den);
+		ctx->cdur.den = 1000;
 	}
-	if (!ctx->moovts) ctx->moovts=600;
 
 	if (ctx->mfra && (ctx->store>=MP4MX_MODE_FRAG)) {
 		GF_Err e = gf_isom_enable_mfra(ctx->file);
@@ -5108,32 +6474,58 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Invalid segment marker 4cc %s, ignoring\n", ctx->m4cc));
 		}
 	}
-	if (ctx->compress)
-		gf_isom_enable_compression(ctx->file, ctx->compress, ctx->fcomp);
+	if (ctx->compress) {
+		u32 flags = 0;
+		if (ctx->fcomp) flags |= GF_ISOM_COMP_FORCE_ALL;
+		if (ctx->otyp) flags |= GF_ISOM_COMP_WRAP_FTYPE;
+		gf_isom_enable_compression(ctx->file, ctx->compress, flags);
+	}
+
+	if (ctx->cmaf) {
+		//cf table 3, 4, 5 of CMAF
+		ctx->mvex = GF_TRUE;
+		ctx->truns_first = GF_TRUE;
+		//single trun, single traf (table 5 of CMAF)
+		ctx->strun = GF_TRUE;
+		ctx->straf = GF_TRUE;
+		//7.5.16 Every TrackFragmentBox shall contain a TrackFragmentBaseMediaDecodeTimeBox
+		ctx->tfdt_traf = GF_TRUE;
+		//7.3.3 : If SegmentIndexBoxes exist, each subsegment referenced in the SegmentIndexBox shall be a single CMAF fragment
+		ctx->chain_sidx = GF_FALSE;
+		if (ctx->subs_sidx>0)
+			ctx->subs_sidx = 0;
+
+		if (ctx->cmaf==MP4MX_CMAF_CMF2) {
+			/*7.7 cmf2
+- default_sample_flags, sample_flags and first_sample_flags shall be set in the TrackFragmentHeaderBox and/or TrackRunBox to provide sample dependency information within each CMAF chunk and CMAF fragment.
+- Default values or per sample values of sample duration and sample size shall be stored in each CMAF chunk’s TrackRunBox and/or TrackFragmentHeaderBox
+			*/
+			ctx->nofragdef = GF_TRUE;
+		}
+	}
 	return GF_OK;
 }
 
-
-static void mp4_mux_update_edit_list_for_bframes(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
+//old code, commented - we track min/max cts while adding to avoid the time-consuming rescan below
+#if 0
+static void mp4_mux_get_min_max_cts(GF_MP4MuxCtx *ctx, TrackWriter *tkw, u64 *omax_cts, u64 *omin_cts)
 {
 	u32 i, count, di;
 	u64 max_cts, min_cts, doff;
-	s64 moffset;
-
-	if (ctx->ctmode > MP4MX_CT_EDIT) return;
-
-	//if we have a complex edit list (due to track template), don't override
-	if (gf_isom_get_edit_list_type(ctx->file, tkw->track_num, &moffset)) return;
-
-	gf_isom_remove_edits(ctx->file, tkw->track_num);
-
 
 	count = gf_isom_get_sample_count(ctx->file, tkw->track_num);
 	max_cts = 0;
 	min_cts = (u64) -1;
 	for (i=0; i<count; i++) {
 		GF_ISOSample *s = gf_isom_get_sample_info(ctx->file, tkw->track_num, i+1, &di, &doff);
-		if (!s) return;
+		if (!s)
+			break;
+		if (tkw->clamp_ts_plus_one) {
+			if (s->DTS + s->CTS_Offset + 1 >= tkw->clamp_ts_plus_one ) {
+				gf_isom_sample_del(&s);
+				continue;
+			}
+		}
 
 		if (s->DTS + s->CTS_Offset > max_cts)
 			max_cts = s->DTS + s->CTS_Offset;
@@ -5143,19 +6535,53 @@
 
 		gf_isom_sample_del(&s);
 	}
+	*omax_cts = max_cts;
+	*omin_cts = min_cts;
+}
+#endif
+
+static void mp4_mux_update_edit_list_for_bframes(GF_MP4MuxCtx *ctx, TrackWriter *tkw, u32 ctts_mode)
+{
+	u64 max_cts, min_cts;
+	s64 moffset;
+
+	if (ctts_mode > MP4MX_CT_EDIT) return;
+
+	//if we have a complex edit list (due to track template), don't override
+	if (gf_isom_get_edit_list_type(ctx->file, tkw->track_num, &moffset)) return;
+
+	gf_isom_remove_edits(ctx->file, tkw->track_num);
+
+#if 0
+	mp4_mux_get_min_max_cts(ctx, tkw, &max_cts, &min_cts);
+#else
+	max_cts = tkw->max_cts - tkw->min_neg_ctts;
+	min_cts = tkw->min_cts - tkw->min_neg_ctts;
+#endif
 
 	if (min_cts || tkw->empty_init_dur) {
 		max_cts -= min_cts;
+		u32 count = gf_isom_get_sample_count(ctx->file, tkw->track_num);
 		max_cts += gf_isom_get_sample_duration(ctx->file, tkw->track_num, count);
 
-		max_cts *= ctx->moovts;
-		max_cts /= tkw->tk_timescale;
+		max_cts = gf_timestamp_rescale(max_cts, tkw->tk_timescale, ctx->moovts);
+
 		if (tkw->empty_init_dur) {
 
 			gf_isom_set_edit(ctx->file, tkw->track_num, 0, tkw->empty_init_dur, 0, GF_ISOM_EDIT_EMPTY);
 			if (max_cts >= tkw->empty_init_dur) max_cts -= tkw->empty_init_dur;
 			else max_cts = 0;
 		}
+		//old arch compat: if we had a simple edit list in source try to keep the original segduration indicated
+		//we tolerate a diff of 100ms
+		else if (gf_sys_old_arch_compat() && tkw->imported_edit_sdur && (tkw->imported_edit_offset==min_cts)) {
+			s32 diff;
+			u64 old_dur_ms = gf_timestamp_rescale(tkw->imported_edit_sdur, tkw->src_timescale, 1000);
+			u64 new_dur_ms = gf_timestamp_rescale(max_cts, tkw->tk_timescale, 1000);
+			diff = (s32) new_dur_ms - (s32) old_dur_ms;
+			if (ABS(diff)<100)
+				max_cts = tkw->imported_edit_sdur;
+		}
 
 		gf_isom_set_edit(ctx->file, tkw->track_num, tkw->empty_init_dur, max_cts, min_cts, GF_ISOM_EDIT_NORMAL);
 	}
@@ -5170,6 +6596,7 @@
 	u32 avc_base_track, hevc_base_track, ref_track_id;
 	avc_base_track = hevc_base_track = 0;
 	u32 i;
+	u32 min_lid = 0;
 	GF_PropertyEntry *pe=NULL;
 	const GF_PropertyValue *p = gf_filter_pid_get_info_str(tkw->ipid, "hevc:oinf", &pe);
 	if (p) {
@@ -5183,10 +6610,12 @@
 		}
 	}
 
+	p = gf_filter_pid_get_info_str(tkw->ipid, "hevc:min_lid", &pe);
+	if (p) min_lid = p->value.uint;
+
 	gf_filter_release_property(pe);
 
-	p = gf_filter_pid_get_property_str(tkw->ipid, "hevc:min_lid");
-	if ((!p || !p->value.uint) && (tkw->codecid!=GF_CODECID_LHVC)) {
+	if (!min_lid && (tkw->codecid!=GF_CODECID_LHVC)) {
 		return;
 	}
 	//set linf
@@ -5227,6 +6656,7 @@
 		if (hevc_base_track) {
 			ref_track_id = gf_isom_get_track_id(ctx->file, hevc_base_track);
 			gf_isom_set_track_reference(ctx->file, tkw->track_num, GF_ISOM_REF_OREF, ref_track_id);
+			gf_isom_remove_sample_group(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_OINF);
 		}
 	}
 }
@@ -5239,13 +6669,17 @@
 
 	count = gf_list_count(ctx->tracks);
 	for (i=0; i<count; i++) {
+		u32 ctts_mode = ctx->ctmode;
 		const GF_PropertyValue *p;
 		Bool has_bframes = GF_FALSE;
 		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
 
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_FORCE_NEGCTTS);
+		if (p && p->value.boolean) ctts_mode = MP4MX_CT_NEGCTTS;
+
 		if (tkw->min_neg_ctts<0) {
 			//use ctts v1 negative offsets
-			if (ctx->ctmode==MP4MX_CT_NEGCTTS) {
+			if (ctts_mode==MP4MX_CT_NEGCTTS) {
 				gf_isom_set_ctts_v1(ctx->file, tkw->track_num, (u32) -tkw->min_neg_ctts);
 			}
 			//ctts v0
@@ -5255,24 +6689,69 @@
 				gf_isom_set_cts_packing(ctx->file, tkw->track_num, GF_FALSE);
 				gf_isom_set_composition_offset_mode(ctx->file, tkw->track_num, GF_FALSE);
 
-				mp4_mux_update_edit_list_for_bframes(ctx, tkw);
+				mp4_mux_update_edit_list_for_bframes(ctx, tkw, ctts_mode);
 			}
 			has_bframes = GF_TRUE;
 		} else if (tkw->has_ctts && (tkw->stream_type==GF_STREAM_VISUAL)) {
-			mp4_mux_update_edit_list_for_bframes(ctx, tkw);
+			mp4_mux_update_edit_list_for_bframes(ctx, tkw, ctts_mode);
 
 			has_bframes = GF_TRUE;
 		} else if (tkw->ts_delay || tkw->empty_init_dur) {
 			gf_isom_update_edit_list_duration(ctx->file, tkw->track_num);
 		}
 
-		if (ctx->importer && ctx->idur.num && ctx->idur.den) {
+		if (tkw->min_ts_seek_plus_one) {
+			u64 min_ts = tkw->min_ts_seek_plus_one - 1;
+			u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
+			u32 delay = 0;
+			if (tkw->clamp_ts_plus_one) {
+#if 0
+				u64 maxcts, mincts;
+				mp4_mux_get_min_max_cts(ctx, tkw, &maxcts, &mincts);
+				mdur = maxcts - mincts;
+#else
+				mdur = tkw->max_cts - tkw->min_cts;
+				mdur += tkw->max_cts_samp_dur;
+#endif
+			}
+			if (mdur > min_ts)
+				mdur -= min_ts;
+			else
+				mdur = 0;
+
+			if ((ctts_mode != MP4MX_CT_NEGCTTS) && (tkw->ts_delay<0) && (tkw->stream_type==GF_STREAM_VISUAL)) {
+				delay = (u32) -tkw->ts_delay;
+			}
+
+			if (tkw->src_timescale != tkw->tk_timescale) {
+				min_ts = gf_timestamp_rescale(min_ts, tkw->src_timescale, tkw->tk_timescale);
+				delay = (u32) gf_timestamp_rescale(delay, tkw->src_timescale, tkw->tk_timescale);
+			}
+			mdur += delay;
+
+			if (ctx->moovts != tkw->tk_timescale) {
+				mdur = gf_timestamp_rescale(mdur, tkw->tk_timescale, ctx->moovts);
+			}
+			gf_isom_remove_edits(ctx->file, tkw->track_num);
+			if (tkw->empty_init_dur)
+				gf_isom_set_edit(ctx->file, tkw->track_num, 0, tkw->empty_init_dur, 0, GF_ISOM_EDIT_EMPTY);
+			gf_isom_set_edit(ctx->file, tkw->track_num, tkw->empty_init_dur, mdur, min_ts, GF_ISOM_EDIT_NORMAL);
+		}
+
+		if (tkw->force_ctts) {
+			GF_Err gf_isom_force_ctts(GF_ISOFile *file, u32 track);
+			gf_isom_force_ctts(ctx->file, tkw->track_num);
+		}
+
+		gf_isom_purge_track_reference(ctx->file, tkw->track_num);
+		
+		if (ctx->importer && ctx->dur.num && ctx->dur.den) {
 			u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
 			u64 pdur = gf_isom_get_track_duration(ctx->file, tkw->track_num);
 			if (pdur==mdur) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[MP4Mux] Imported %d frames - duration %g\n", tkw->nb_samples, ((Double)mdur)/tkw->tk_timescale ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[MP4Mux] Imported %d frames - duration %g\n", tkw->nb_samples, ((Double)mdur)/tkw->tk_timescale ));
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[MP4Mux] Imported %d frames - media duration %g - track duration %g\n", tkw->nb_samples, ((Double)mdur)/tkw->tk_timescale, ((Double)pdur)/ctx->moovts ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[MP4Mux] Imported %d frames - media duration %g - track duration %g\n", tkw->nb_samples, ((Double)mdur)/tkw->tk_timescale, ((Double)pdur)/ctx->moovts ));
 			}
 		}
 
@@ -5284,12 +6763,12 @@
 			if (!PL) PL = 0x01;
 
 			if (ctx->importer) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Indicated Profile: %s\n", gf_m4v_get_profile_name((u8) PL) ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Indicated Profile: %s\n", gf_m4v_get_profile_name((u8) PL) ));
 			}
 
 			if (has_bframes && (tkw->media_profile_level <= 3)) {
 				PL = 0xF5;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Indicated profile doesn't include B-VOPs - forcing %s", gf_m4v_get_profile_name((u8) PL) ));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Indicated profile doesn't include B-VOPs - forcing %s\n", gf_m4v_get_profile_name((u8) PL) ));
 				force_rewrite = GF_TRUE;
 			}
 			if (PL != tkw->media_profile_level) {
@@ -5312,15 +6791,14 @@
 		if (tkw->has_append)
 			gf_isom_refresh_size_info(ctx->file, tkw->track_num);
 
-		if ((tkw->nb_samples == 1) && (ctx->idur.num>0) && ctx->idur.den) {
-			u32 dur = tkw->tk_timescale * ctx->idur.num;
-			dur /= ctx->idur.den;
+		if ((tkw->nb_samples == 1) && (ctx->dur.num>0) && ctx->dur.den) {
+			u32 dur = (u32) gf_timestamp_rescale(ctx->dur.num, ctx->dur.den, tkw->tk_timescale);
 			gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, dur);
 		}
 
 		if (tkw->has_open_gop) {
 			if (ctx->importer) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("OpenGOP detected - adjusting file brand\n"));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("OpenGOP detected - adjusting file brand\n"));
 			}
 			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO6, GF_TRUE);
 		}
@@ -5332,8 +6810,13 @@
 			gf_isom_remove_sample(ctx->file, tkw->track_num, tkw->nb_samples);
 
 		p = gf_filter_pid_get_info_str(tkw->ipid, "ttxt:last_dur", &pe);
-		if (p)
-			gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, p->value.uint);
+		if (p) {
+			u64 val = p->value.uint;
+			if (tkw->src_timescale != tkw->tk_timescale) {
+				val = gf_timestamp_rescale(val, tkw->src_timescale, tkw->tk_timescale);
+			}
+			gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, (u32) val);
+		}
 
 		if (tkw->is_nalu && ctx->pack_nal && (gf_isom_get_mode(ctx->file)!=GF_ISOM_OPEN_WRITE)) {
 			u32 msize = 0;
@@ -5353,7 +6836,7 @@
 					}
 				}
 				if (do_rewrite) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[MP4Mux] Adjusting NALU SizeLength to %d bits\n", msize ));
+					GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[MP4Mux] Adjusting NALU SizeLength to %d bits\n", msize ));
 					gf_media_nal_rewrite_samples(ctx->file, tkw->track_num, msize);
 					msize /= 8;
 					for (j=0; j<stsd_count; j++) {
@@ -5392,12 +6875,15 @@
 
 
 	if (ctx->owns_mov) {
+		if (ctx->moovpad)
+			gf_isom_set_inplace_padding(ctx->file, ctx->moovpad);
+
 		switch (ctx->store) {
 		case MP4MX_MODE_INTER:
-			if (ctx->cdur==0) {
+			if (ctx->cdur.num==0) {
 				e = gf_isom_set_storage_mode(ctx->file, GF_ISOM_STORE_STREAMABLE);
 			} else {
-				e = gf_isom_make_interleave(ctx->file, ctx->cdur);
+				e = gf_isom_make_interleave_ex(ctx->file, &ctx->cdur);
 			}
 			break;
 		case MP4MX_MODE_FLAT:
@@ -5411,11 +6897,11 @@
 			break;
 		}
 		if (e) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[MP4Mux] Failed to set storage mode: %s\n", gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set storage mode: %s\n", gf_error_to_string(e) ));
 		} else {
 			e = gf_isom_close(ctx->file);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[MP4Mux] Failed to write file: %s\n", gf_error_to_string(e) ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to write file: %s\n", gf_error_to_string(e) ));
 			}
 		}
 		ctx->file = NULL;
@@ -5432,6 +6918,9 @@
 	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
 
 	if (ctx->owns_mov && (ctx->file || (ctx->store>=MP4MX_MODE_FRAG))) {
+		if (ctx->store < MP4MX_MODE_FRAG) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Session aborted before writing to file, use fragmented storage mode to record session\n"));
+		}
 		gf_isom_delete(ctx->file);
 	}
 
@@ -5475,85 +6964,88 @@
 static const GF_FilterArgs MP4MuxArgs[] =
 {
 	{ OFFS(m4sys), "force MPEG-4 Systems signaling of tracks", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(dref), "only references data from source file - not compatible with all media sources", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(dref), "only reference data from source file - not compatible with all media sources", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ctmode), "set composition offset mode for video tracks\n"
 	"- edit: uses edit lists to shift first frame to presentation time 0\n"
 	"- noedit: ignore edit lists and does not shift timeline\n"
 	"- negctts: uses ctts v1 with possibly negative offsets and no edit lists", GF_PROP_UINT, "edit", "edit|noedit|negctts", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(idur), "only import the specified duration. If negative, specify the number of coded frames to import", GF_PROP_FRACTION, "0", NULL, 0},
+	{ OFFS(dur), "only import the specified duration. If negative, specify the number of coded frames to import", GF_PROP_FRACTION, "0", NULL, 0},
 	{ OFFS(pack3gp), "pack a given number of 3GPP audio frames in one sample", GF_PROP_UINT, "1", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(importer), "compatibility with old importer, displays import progress", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(pack_nal), "repack NALU size length to minimum possible size for NALU-based video (AVC/HEVC/...)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(xps_inband), "use inband (in sample data) param set for NALU-based video (AVC/HEVC/...)\n"
-	"- no: paramater sets are not inband, several sample descriptions might be created\n"
-	"- all: paramater sets are inband, no param sets in sample description\n"
-	"- both: paramater sets are inband, signaled as inband, and also first set is kept in sample descripton\n"
-	"- mix: creates non-standard files using single sample entry with first PSs found, and moves other PS inband", GF_PROP_UINT, "no", "no|all|both|mix|", 0},
+	{ OFFS(xps_inband), "use inband (in sample data) parameter set for NALU-based video (AVC/HEVC/...)\n"
+	"- no: parameter sets are not inband, several sample descriptions might be created\n"
+	"- pps: picture parameter sets are inband, all other parameter sets are in sample description\n"
+	"- all: parameter sets are inband, no parameter sets in sample description\n"
+	"- both: parameter sets are inband, signaled as inband, and also first set is kept in sample description\n"
+	"- mix: creates non-standard files using single sample entry with first PSs found, and moves other PS inband\n"
+	"- auto: keep source config, or defaults to no if source is not ISOBMFF", GF_PROP_UINT, "no", "no|pps|all|both|mix|auto", 0},
 	{ OFFS(store), "file storage mode\n"
 	"- inter: perform precise interleave of the file using [-cdur]() (requires temporary storage of all media)\n"
-	"- flat: write samples as they arrive and moov at end (fastest mode)\n"
-	"- fstart: write samples as they arrive and moov before mdat\n"
+	"- flat: write samples as they arrive and `moov` at end (fastest mode)\n"
+	"- fstart: write samples as they arrive and `moov` before `mdat`\n"
 	"- tight: uses per-sample interleaving of all tracks (requires temporary storage of all media)\n"
 	"- frag: fragments the file using cdur duration\n"
-	"- sfrag: framents the file using cdur duration but adjusting to start with SAP1/3", GF_PROP_UINT, "inter", "inter|flat|fstart|tight|frag|sfrag", 0},
-	{ OFFS(cdur), "chunk duration for interleaving and fragmentation modes\n"
+	"- sfrag: fragments the file using cdur duration but adjusting to start with SAP1/3", GF_PROP_UINT, "inter", "inter|flat|fstart|tight|frag|sfrag", 0},
+	{ OFFS(cdur), "chunk duration for flat and interleaving modes or fragment duration for fragmentation modes\n"
 	"- 0: no specific interleaving but moov first\n"
-	"- negative: defaults to 1.0 unless overridden by storage profile", GF_PROP_DOUBLE, "-1.0", NULL, 0},
+	"- negative: defaults to 1.0 unless overridden by storage profile", GF_PROP_FRACTION, "-1/1", NULL, 0},
 	{ OFFS(moovts), "timescale to use for movie. A negative value picks the media timescale of the first track added", GF_PROP_SINT, "600", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(moof_first), "generate fragments starting with moof then mdat", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(abs_offset), "use absolute file offset in fragments rather than offsets from moof", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(fsap), "split truns in video fragments at SAPs to reduce file size", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(file), "pointer to a write/edit ISOBMF file used internally by importers and exporters", GF_PROP_POINTER, NULL, NULL, GF_FS_ARG_HINT_HIDE},
-	{ OFFS(subs_sidx), "number of subsegments per sidx. negative value disables sidx, -2 removes sidx if present in source pid", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(m4cc), "4 character code of empty box to appen at the end of a segment", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(subs_sidx), "number of subsegments per sidx. negative value disables sidx, -2 removes sidx if present in source PID", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(m4cc), "4 character code of empty box to append at the end of a segment", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(chain_sidx), "use daisy-chaining of SIDX", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(msn), "sequence number of first moof to N", GF_PROP_UINT, "1", NULL, 0},
-	{ OFFS(msninc), "sequence number increase between moofs", GF_PROP_UINT, "1", NULL, 0},
-	{ OFFS(tfdt), "set TFDT of first traf", GF_PROP_FRACTION64, "0", NULL, 0},
-	{ OFFS(tfdt_traf), "set TFDT in each traf", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(msninc), "sequence number increase between `moof` boxes", GF_PROP_UINT, "1", NULL, 0},
+	{ OFFS(tfdt), "set initial decode time (`tfdt`) of first traf", GF_PROP_FRACTION64, "0", NULL, 0},
+	{ OFFS(tfdt_traf), "force `tfdt` box in each traf", GF_PROP_BOOL, "false", NULL, 0},
 	{ OFFS(nofragdef), "disable default flags in fragments", GF_PROP_BOOL, "false", NULL, 0},
-	{ OFFS(straf), "use a single traf per moov (smooth streaming and co)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(straf), "use a single traf per moof (smooth streaming and co)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(strun), "use a single trun per traf (smooth streaming and co)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(psshs), "set PSSH boxes store mode\n"
+	{ OFFS(psshs), "set `pssh` boxes store mode\n"
 	"- moof: in first moof of each segments\n"
 	"- moov: in movie box\n"
 	"- none: pssh is discarded", GF_PROP_UINT, "moov", "moov|moof|none", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(sgpd_traf), "store sample group descriptions in traf (duplicated for each traf). If not used, sample group descriptions are stored in the movie box", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(vodcache), "enable temp storage for VoD dash modes - see filter help\n"
+	{ OFFS(vodcache), "enable temp storage for VoD dash modes\n"
 		"- on: use temp storage of complete file for sidx and ssix injection\n"
 		"- insert: insert sidx and ssix by shifting bytes in output file\n"
 		"- replace: precompute pace requirements for sidx and ssix and rewrite file range at end", GF_PROP_UINT, "replace", "on|insert|replace", 0},
-	{ OFFS(noinit), "do not produce initial moov, used for DASH bitstream switching mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(noinit), "do not produce initial `moov, used for DASH bitstream switching mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(tktpl), "use track box from input if any as a template to create new track\n"
 	"- no: disables template\n"
 	"- yes: clones the track (except edits and decoder config)\n"
 	"- udta: only loads udta", GF_PROP_UINT, "yes", "no|yes|udta", GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(mudta), "use udta and other moov extension boxes from input if any\n"
+	{ OFFS(mudta), "use `udta` and other `moov` extension boxes from input if any\n"
 	"- no: disables import\n"
 	"- yes: clones all extension boxes\n"
 	"- udta: only loads udta", GF_PROP_UINT, "yes", "no|yes|udta", GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(tmpd), "set temp directory for intermediate file(s)", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(mvex), "set mvex after tracks", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(sdtp_traf), "use sdtp in traf rather than using flags in trun sample entries\n"
-		"- no: do not use sdtp\n"
-		"- sdtp: use sdtp box to indicate sample dependencies and don't write info in trun sample flags\n"
-		"- both: use sdtp box to indicate sample dependencies and also write info in trun sample flags", GF_PROP_UINT, "no", "no|sdtp|both", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mvex), "set `mvex` boxes after `trak` boxes", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(sdtp_traf), "use `sdtp` box in `traf` box rather than using flags in trun sample entries\n"
+		"- no: do not use `sdtp`\n"
+		"- sdtp: use `sdtp` box to indicate sample dependencies and do not write info in `trun` sample flags\n"
+		"- both: use `sdtp` box to indicate sample dependencies and also write info in `trun` sample flags", GF_PROP_UINT, "no", "no|sdtp|both", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(trackid), "track ID of created track for single track. Default 0 uses next available trackID", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(fragdur), "fragment based on fragment duration rather than CTS. Mostly used for MP4Box -frag option", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(btrt), "set btrt box in sample description", GF_PROP_BOOL, "true", NULL, 0},
-	{ OFFS(styp), "set segment styp major brand to the given 4CC[.version]", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(mediats), "set media timescale. A value of 0 means inherit from pid, a value of -1 means derive from samplerate or frame rate", GF_PROP_SINT, "0", NULL, 0},
-	{ OFFS(ase), "set audio sample entry mode for more than stereo layouts\n"\
-			"- v0: use v0 signaling but channel count from stream, recommended for backward compatibility\n"\
-			"- v0s: use v0 signaling and force channel count to 2 (stereo) if more than 2 channels\n"\
-			"- v1: use v1 signaling, ISOBMFF style (will mux raw PCM as ISOBMFF style)\n"\
-			"- v1qt: use v1 signaling, QTFF style"\
+	{ OFFS(fragdur), "fragment based on fragment duration rather than CTS. Mostly used for `MP4Box -frag` option", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(btrt), "set `btrt` box in sample description", GF_PROP_BOOL, "true", NULL, 0},
+	{ OFFS(styp), "set segment `styp` major brand (and optionally version) to the given 4CC[.version]", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(mediats), "set media timescale. A value of 0 means inherit from PID, a value of -1 means derive from samplerate or frame rate", GF_PROP_SINT, "0", NULL, 0},
+	{ OFFS(ase), "set audio sample entry mode for more than stereo layouts\n"
+			"- v0: use v0 signaling but channel count from stream, recommended for backward compatibility\n"
+			"- v0s: use v0 signaling and force channel count to 2 (stereo) if more than 2 channels\n"
+			"- v1: use v1 signaling, ISOBMFF style (will mux raw PCM as ISOBMFF style)\n"
+			"- v1qt: use v1 signaling, QTFF style"
 		, GF_PROP_UINT, "v0", "|v0|v0s|v1|v1qt", 0},
-	{ OFFS(ssix), "create ssix when sidx is present, level 1 mappping I-frames byte ranges, level 0xFF mapping the rest", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ssix), "create `ssix` box when `sidx` box is present, level 1 mapping I-frames byte ranges, level 0xFF mapping the rest", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ccst), "insert coding constraint box for video tracks", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(maxchunk), "set max chunk size in bytes for runs (only used in non-fragmented mode). 0 means no constraints", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(noroll), "disable roll sample grouping", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(saio32), "set single segment mode for dash", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(norap), "disable rap sample grouping", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(saio32), "use 32 bit offset for side data location instead of 64 bit offset", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(tfdt64), "use 64 bit tfdt and sidx even for 32 bits timestamps", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 #ifdef GF_ENABLE_CTRN
 	{ OFFS(ctrn), "use compact track run (experimental)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ctrni), "use inheritance in compact track run for HEVC tile tracks (highly experimental)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
@@ -5568,64 +7060,103 @@
 						"- ssix: compress moof, sidx and ssix boxes\n"
 						"- all: compress moov, moof, sidx and ssix boxes", GF_PROP_UINT, "no", "no|moov|moof|sidx|ssix|all", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(fcomp), "force using compress box even when compressed size is larger than uncompressed", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(otyp), "inject original file type when using compressed boxes", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 
-	{ OFFS(trun_inter), "interleave samples in trun based on the temporal level, the lowest level are stored first - this will create as many trun as required", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(trun_inter), "interleave samples in `trun` based on the temporal level, the lowest level are stored first (this will create as many `trun` boxes as required)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(truns_first), "store track runs before sample group description and sample encryption information", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(block_size), "target output block size, 0 for default internal value (10k)", GF_PROP_UINT, "10000", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(boxpatch), "apply box patch before writing", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(deps), "add samples dependencies information", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(mfra), "enable movie fragment random access when fragmenting (ignored when dashing)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(forcesync), "force all SAP types to be considered sync samples (might produce non-conformant files)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(tags), "tag injection mode\n"
+	{ OFFS(forcesync), "force all SAP types to be considered sync samples (might produce non-compliant files)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(refrag), "use track fragment defaults from initial file if any rather than computing them from PID properties (used when processing standalone segments/fragments)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(itags), "tag injection mode\n"
 			"- none: do not inject tags\n"
 			"- strict: only inject recognized itunes tags\n"
 			"- all: inject all possible tags"
 			, GF_PROP_UINT, "strict", "none|strict|all", GF_FS_ARG_HINT_EXPERT},
+
+	{ OFFS(keep_utc), "force all new files and tracks to keep the source UTC creation and modification times", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(pps_inband), "when [-xps_inband]() is set, inject PPS in each non SAP 1/2/3 sample", GF_PROP_BOOL, "no", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(moovpad), "insert `free` box of given size after `moov` for future in-place editing", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(cmaf), "use CMAF guidelines (turns on `mvex`, `truns_first`, `strun`, `straf`, `tfdt_traf`, `chain_sidx` and restricts `subs_sidx` to -1 or 0)\n"
+		"- no: CMAF not enforced\n"
+		"- cmfc: use CMAF `cmfc` guidelines\n"
+		"- cmf2: use CMAF `cmf2` guidelines (turns on `nofragdef`)"
+		, GF_PROP_UINT, "no", "no|cmfc|cmf2", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(start), "set playback start offset for MP4Box import only. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, GF_FS_ARG_HINT_HIDE},
 	{0}
 };
 
 
 GF_FilterRegister MP4MuxRegister = {
 	.name = "mp4mx",
-	GF_FS_SET_DESCRIPTION("ISOBMFF/QT muxer")
-	GF_FS_SET_HELP("Muxes file according to ISOBMFF (14496-12 and derived specifications) or QuickTime\n"
+	GF_FS_SET_DESCRIPTION("ISOBMFF/QT multiplexer")
+	GF_FS_SET_HELP("This filter multiplexes streams to ISOBMFF (14496-12 and derived specifications) or QuickTime\n"
 	" \n"
 	"# Tracks and Items\n"
-	"By default all input PIDs with ItemID property set are muxed as items, otherwise they are muxed as tracks.\n"
-	"To prevent source items to be muxed as items, use [-itemid](mp4dmx) option from ISOBMF demuxer.\n"
-	"EX -i source.mp4:itemid=false -o file.mp4\n"
+	"By default all input PIDs with ItemID property set are multiplexed as items, otherwise they are multiplexed as tracks.\n"
+	"To prevent source items to be multiplexed as items, use [-itemid](mp4dmx) option from ISOBMFF demultiplexer.\n"
+	"EX gpac -i source.mp4:itemid=false -o file.mp4\n"
 	" \n"
-	"To force non-item streams to be muxed as items, use __#ItemID__ option on that PID:\n"
-	"EX -i source.jpg:#ItemID=1 -o file.mp4\n"
+	"To force non-item streams to be multiplexed as items, use __#ItemID__ option on that PID:\n"
+	"EX gpac -i source.jpg:#ItemID=1 -o file.mp4\n"
 	" \n"
 	"# Storage\n"
-	"The [-store]() option allows controling if the file is fragmented ot not, and when not fragmented, how interleaving is done. For cases where disk requirements are tight and fragmentation cannot be used, it is recommended to use either `flat` or `fstart` modes.\n"
+	"The [-store]() option allows controlling if the file is fragmented or not, and when not fragmented, how interleaving is done. For cases where disk requirements are tight and fragmentation cannot be used, it is recommended to use either `flat` or `fstart` modes.\n"
 	" \n"
-	"The [-vodcache]() option allows controling how DASH onDemand segments are generated:\n"
+	"The [-vodcache]() option allows controlling how DASH onDemand segments are generated:\n"
 	"- If set to `on`, file data is stored to a temporary file on disk and flushed upon completion, no padding is present.\n"
 	"- If set to `insert`, SIDX/SSIX will be injected upon completion of the file by shifting bytes in file. In this case, no padding is required but this might not be compatible with all output sinks and will take longer to write the file.\n"
-	"- If set to `replace`, SIDX/SSIX size will be estimated based on duration and DASH segment length, and padding will be used in the file __before__ the final SIDX. If input pids have the properties `DSegs` set, this will be as the number of segments.\n"
+	"- If set to `replace`, SIDX/SSIX size will be estimated based on duration and DASH segment length, and padding will be used in the file __before__ the final SIDX. If input PIDs have the properties `DSegs` set, this will used be as the number of segments.\n"
 	"The `on` and `insert` modes will produce exactly the same file, while the mode `replace` may inject a `free` box before the sidx.\n"
 	" \n"
 	"# Custom boxes\n"
 	"Custom boxes can be specified as box patches:\n"
 	"For movie-level patch, the [-boxpatch]() option of the filter should be used.\n"
 	"Per PID box patch can be specified through the PID property `boxpatch`.\n"
-	"EX src=source:#boxpatch=myfile.xml dst=mux.mp4\n"
+	"EX gpac -i source:#boxpatch=myfile.xml -o mux.mp4\n"
 	"Per Item box patch can be specified through the PID property `boxpatch`.\n"
-	"EX src=source:1ItemID=1:#boxpatch=myfile.xml dst=mux.mp4\n"
+	"EX gpac -i source:1ItemID=1:#boxpatch=myfile.xml -o mux.mp4\n"
 	" \n"
-	"The box patch is applied before writing the initial moov box in fragmented mode, or when writing the complete file otherwise.\n"
+	"The box patch is applied before writing the initial `moov box in fragmented mode, or when writing the complete file otherwise.\n"
 	"The box patch can either be a filename or the full XML string.\n"
 	" \n"
 	"# Tagging\n"
-	"When tagging is enabled, the filter will watch the property `CoverArt` and all custom properties on incoming pid.\n"
-	"The built-in tag names are `album`, `artist`, `comment`, `complilation`, `composer`, `year`, `disk`, `tool`, `genre`, `contentgroup`, `title`, `tempo`, `track`, `tracknum`, `writer`, `encoder`, `album_artist`, `gapless`, `conductor`.\n"
+	"When tagging is enabled, the filter will watch the property `CoverArt` and all custom properties on incoming PID.\n"
+	"The built-in tag names are indicated by `MP4Box -h tags`.\n"
 	"Other tag class may be specified using `tag_NAME` property names, and will be added if [-tags]() is set to `all` using:\n"
 	"- `NAME` as a box 4CC if `NAME` is four characters long\n"
+	"- `NAME` as a box 4CC if `NAME` is 3 characters long, and will be prefixed by 0xA9\n"
 	"- the CRC32 of the `NAME` as a box 4CC if `NAME` is not four characters long\n"
 	" \n"
+	"# User data\n"
+	"The filter will look for the following PID properties to create user data entries:\n"
+	"- `udtab`: set the track user-data box to the property value which __must__ be a serialized box array blob\n"
+	"- `mudtab`: set the movie user-data box to the property value which __must__ be a serialized box array blob\n"
+	"- `udta_U4CC`: set track user-data box entry of type `U4CC` to property value\n"
+	"- `mudta_U4CC`: set movie user-data box entry of type `U4CC` to property value\n"
+	" \n"
+	"EX gpac -i src.mp4:#udta_tagc='My Awesome Tag' -o tag.mp4\n"
+	"EX gpac -i src.mp4:#mudtab=data@box.bin -o tag.mp4\n"
+	" \n"
+	"# Custom sample group descriptions and sample auxiliary info\n"
+	"The filter watches the following custom data properties on incoming packets:\n"
+	"- `grp_A4CC`: maps packet to sample group description of type `A4CC` and entry set to property payload\n"
+	"- `grp_A4CC_param`: same as above and sets sample to group `grouping_type_parameter` to `param`\n"
+	"- `sai_A4CC`: adds property payload as sample auxiliary information of type `A4CC`\n"
+	"- `sai_A4CC_param`: same as above and sets `aux_info_type_parameter`to `param`\n"
+	" \n"
+	"The property `grp_EMSG` consists in one or more `EventMessageBox` as defined in MPEG-DASH.\n"
+	"- in fragmented mode, presence of these boxes in a packet will start a new fragment, with the boxes written before the `moof`\n"
+	"- in regular mode, an internal sample group of type `EMSG` is currently used for `emsg` box storage\n"
+	" \n"
 	"# Notes\n"
-	"The filter watches the property `FileNumber` on incoming packets to create new files or new segments in DASH mode.\n"
+	"The filter watches the property `FileNumber` on incoming packets to create new files (regular mode) or new segments (DASH mode).\n"
+	" \n"
+	"The filter watches the property `DSIWrap` (4CC as int or string) on incoming PID to wrap decoder configuration in a box of given type (unknonw wraping)\n"
+	"EX -i unkn.mkv:#ISOMSubtype=VIUK:#DSIWrap=cfgv -o t.mp4\n"
+	"This will wrap the uknown stream using `VIUK` code point in `stsd` and wrap any decoder configuration data in a `cfgv` box.\n"
 	)
 	.private_size = sizeof(GF_MP4MuxCtx),
 	.args = MP4MuxArgs,

gpac-1.0.1.tar.gz/src/filters/mux_ts.c -> gpac-2.0.0.tar.gz/src/filters/mux_ts.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2020
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / MPEG-2 TS mux filter
@@ -30,6 +30,9 @@
 #include <gpac/webvtt.h>
 
 
+#ifndef GPAC_DISABLE_MPEG2TS_MUX
+
+
 #define M2TS_FILE_EXTS "ts|m2t|mts|dmb|trp"
 #define M2TS_MIMES "video/mpeg-2|video/mp2t|video/mpeg|audio/mp2t"
 
@@ -97,6 +100,7 @@
 	char *name, *provider, *temi;
 	u32 log_freq;
 	s32 subs_sidx;
+	GF_Fraction cdur;
 
 	//internal
 	GF_FilterPid *opid;
@@ -117,7 +121,7 @@
 	u32 dash_mode;
 	Bool init_dash;
 	u32 dash_seg_num;
-	Bool wait_dash_flush;
+	Bool wait_dash_flush, last_is_eods_flush;
 	Bool dash_file_switch;
 	Bool next_is_start;
 	u32 nb_pck_in_seg;
@@ -130,12 +134,26 @@
 	u32 nb_sidx_entries, nb_sidx_alloc;
 	TS_SIDX *sidx_entries;
 	GF_BitStream *idx_bs;
-	u32 nb_pck_in_file, nb_pck_first_sidx, ref_pid;
+	u32 nb_pck_in_file, nb_pck_first_sidx;
 	u64 total_bytes_in;
 
 	u32 nb_suspended, cur_file_idx_plus_one;
 	char *cur_file_suffix;
 	Bool notify_filename;
+
+	Bool is_playing;
+	Double start_range;
+
+	struct __tsmx_pid *ref_pid;
+	Bool wait_llhls_flush;
+
+	u32 llhls;
+	Bool next_is_llhls_start;
+	u32 frag_num;
+
+	u32 frag_offset, frag_size, frag_duration;
+	Bool frag_has_intra;
+
 } GF_TSMuxCtx;
 
 typedef struct
@@ -148,7 +166,18 @@
 	u64 cts_at_init_val_plus_one;
 } TEMIDesc;
 
-typedef struct
+enum
+{
+	M2TS_EODS_NO=0,
+	//regular end of DASH segment (found new segment start packet)
+	M2TS_EODS_FOUND,
+	//forced end of DASH segment (found empty packet with EODS set)
+	M2TS_EODS_FORCED,
+	//end of LL-HLS part
+	M2TS_EODS_LLHLS,
+};
+
+typedef struct __tsmx_pid
 {
 	GF_ESInterface esi;
 	GF_FilterPid *ipid;
@@ -165,7 +194,7 @@
 	GF_TSMuxCtx *ctx;
 	u32 last_cv;
 	//ts media skip
-	s32 media_delay, max_media_skip;
+	s64 media_delay, max_media_skip;
 	Bool done;
 
 	GF_List *temi_descs;
@@ -176,7 +205,7 @@
 	GF_BitStream *temi_af_bs;
 
 	Bool rewrite_odf;
-	Bool has_seen_eods;
+	u32 has_seen_eods;
 	u32 pck_duration;
 
 	u64 loop_ts_offset;
@@ -186,6 +215,7 @@
 	u8 *pck_data_buf;
 
 	u32 suspended;
+	u64 llhls_dts_init;
 } M2Pid;
 
 static GF_Err tsmux_format_af_descriptor(GF_BitStream *bs, u32 timeline_id, u64 timecode, u32 timescale, u32 mode_64bits, u64 ntp, const char *temi_url, u32 temi_delay, u32 *last_url_time)
@@ -378,34 +408,47 @@
 					ifce->caps |= GF_ESI_STREAM_IS_OVER;
 				}
 				if (tspid->ctx->dash_mode)
-					tspid->has_seen_eods = GF_TRUE;
+					tspid->has_seen_eods = M2TS_EODS_FOUND;
 			}
 			return GF_OK;
 		}
 		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
 		if (tspid->ctx->dash_mode) {
 
-			if (tspid->has_seen_eods)
+			if (tspid->has_seen_eods) {
+				ifce->caps |= GF_ESI_STREAM_FLUSH;
 				return GF_OK;
+			}
+			ifce->caps &= ~GF_ESI_STREAM_FLUSH;
 
 			//detect segment change
 			if (p && tspid->ctx->dash_seg_num && (tspid->ctx->dash_seg_num < p->value.uint)) {
-				tspid->ctx->wait_dash_flush = GF_TRUE;
+				if (!tspid->ctx->last_is_eods_flush)
+					tspid->ctx->wait_dash_flush = GF_TRUE;
 				tspid->ctx->dash_seg_num = p->value.uint;
 				tspid->ctx->dash_file_name[0] = 0;
 			}
 
 			//segment change is pending, check for filename as well - we don't do that in the previous test
 			//since the filename property is sent on a single pid, not each of them
-			if (tspid->ctx->wait_dash_flush && p && (tspid->ctx->dash_seg_num == p->value.uint)) {
-				tspid->has_seen_eods = GF_TRUE;
-
-				p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
-				if (p) {
-					strcpy(tspid->ctx->dash_file_name, p->value.string);
-					tspid->ctx->dash_file_switch = GF_TRUE;
+			if (p && (tspid->ctx->dash_seg_num == p->value.uint)) {
+				if (tspid->ctx->wait_dash_flush) {
+					tspid->has_seen_eods = M2TS_EODS_FOUND;
+
+					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
+					if (p) {
+						strcpy(tspid->ctx->dash_file_name, p->value.string);
+						tspid->ctx->dash_file_switch = GF_TRUE;
+					}
+					return GF_OK;
+				}
+				else if (tspid->ctx->last_is_eods_flush) {
+					const GF_PropertyValue *p2 = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
+					if (p2) {
+						strcpy(tspid->ctx->dash_file_name, p2->value.string);
+						tspid->ctx->next_is_start = GF_TRUE;
+					}
 				}
-				return GF_OK;
 			}
 
 			//at this point the new segment is started
@@ -419,7 +462,7 @@
 
 			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_EODS);
 			if (p && p->value.boolean) {
-				tspid->has_seen_eods = GF_TRUE;
+				tspid->has_seen_eods = M2TS_EODS_FORCED;
 				tspid->ctx->wait_dash_flush = GF_TRUE;
 				gf_filter_pid_drop_packet(tspid->ipid);
 				return GF_OK;
@@ -452,6 +495,31 @@
 			}
 		}
 
+		if (tspid->ctx->ref_pid) {
+			dts = gf_filter_pck_get_dts(pck);
+
+			if (!tspid->llhls_dts_init) {
+				tspid->llhls_dts_init = dts+1;
+				if (tspid->ctx->ref_pid == tspid) {
+					if (gf_filter_pck_get_sap(pck))
+						tspid->ctx->frag_has_intra = GF_TRUE;
+				}
+			} else {
+				u64 dur = dts - tspid->llhls_dts_init + 1;
+				if (gf_timestamp_greater_or_equal(dur, ifce->timescale, tspid->ctx->cdur.num, tspid->ctx->cdur.den)) {
+					if (tspid->ctx->ref_pid == tspid) {
+						tspid->ctx->wait_llhls_flush = GF_TRUE;
+						tspid->ctx->frag_duration = (u32) dur;
+					}
+					tspid->has_seen_eods = M2TS_EODS_LLHLS;
+					return GF_OK;
+				}
+				if (tspid->ctx->ref_pid == tspid) {
+					tspid->ctx->frag_duration = (u32) dur + gf_filter_pck_get_duration(pck);
+				}
+			}
+		}
+
 		memset(&es_pck, 0, sizeof(GF_ESIPacket));
 		es_pck.flags = GF_ESI_DATA_AU_START | GF_ESI_DATA_AU_END | GF_ESI_DATA_HAS_CTS;
 		es_pck.sap_type = gf_filter_pck_get_sap(pck);
@@ -478,9 +546,11 @@
 		}
 		if (cts != GF_FILTER_NO_TS) {
 			cts += tspid->loop_ts_offset;
+			es_pck.cts = cts;
+		} else {
+			es_pck.cts = 0;
 		}
 
-		es_pck.cts = cts;
 		if (tspid->temi_descs) {
 			u32 i, count=gf_list_count(tspid->temi_descs);
 
@@ -501,22 +571,24 @@
 
 					tc = (cts - (temi->cts_at_init_val_plus_one-1));
 					if (timescale != ifce->timescale) {
-						tc *= temi->timescale;
-						tc /= ifce->timescale;
+						tc = gf_timestamp_rescale(tc, ifce->timescale, temi->timescale);
 					}
 					tc += temi->init_val;
 				} else {
-					//TOCHECK: do we want media timeline or composition timeline ?
-					tc = cts;
+					//we want media timeline
+					if ((s64) cts + tspid->media_delay >= 0)
+						tc = cts + tspid->media_delay;
+					else
+						tc = 0;
+
 					if (timescale != ifce->timescale) {
-						tc *= temi->timescale;
-						tc /= ifce->timescale;
+						tc = gf_timestamp_rescale(tc, ifce->timescale, temi->timescale);
 					}
 				}
 
 				if (temi->offset) {
 					if (timescale != ifce->timescale)
-						tc += ((u64) temi->offset) * ifce->timescale / 1000;
+						tc += (u64) gf_timestamp_rescale(temi->offset, 1000, ifce->timescale);
 					else
 						tc += temi->offset;
 				}
@@ -541,9 +613,7 @@
 
 		cts_diff = 0;
 		if (tspid->prog->cts_offset) {
-			cts_diff = tspid->prog->cts_offset;
-			cts_diff *= tspid->esi.timescale;
-			cts_diff /= 1000000;
+			cts_diff = gf_timestamp_rescale(tspid->prog->cts_offset, 1000000, tspid->esi.timescale);
 
 			es_pck.cts += cts_diff;
 		}
@@ -558,8 +628,7 @@
 				u64 diff;
 				//we don't have reliable dts - double the diff should make sure we don't try to adjust too often
 				diff = cts_diff = 2*(es_pck.dts - es_pck.cts);
-				diff *= 1000000;
-				diff /= tspid->esi.timescale;
+				diff = gf_timestamp_rescale(diff, tspid->esi.timescale, 1000000);
 				assert(tspid->prog->cts_offset <= diff);
 				tspid->prog->cts_offset += (u32) diff;
 
@@ -599,17 +668,18 @@
 		//serialize webvtt cue formatting for TX3G
 		else if (tspid->codec_id == GF_CODECID_WEBVTT) {
 			u32 i;
-			u64 start_ts;
-			void webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue);
+			u64 start_ts, end_ts;
+			void webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue, Bool write_srt);
 			GF_List *cues;
 			GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
-			start_ts = es_pck.cts * 1000;
-			start_ts /= tspid->esi.timescale;
-			cues = gf_webvtt_parse_cues_from_data(es_pck.data, es_pck.data_len, start_ts);
+			start_ts = gf_timestamp_rescale(es_pck.cts, tspid->esi.timescale, 1000);
+			end_ts = gf_timestamp_rescale(es_pck.cts + es_pck.duration, tspid->esi.timescale, 1000);
+
+			cues = gf_webvtt_parse_cues_from_data(es_pck.data, es_pck.data_len, start_ts, end_ts);
 			for (i = 0; i < gf_list_count(cues); i++) {
 				GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, i);
-				webvtt_write_cue(bs, cue);
+				webvtt_write_cue(bs, cue, GF_FALSE);
 				gf_webvtt_cue_del(cue);
 			}
 			gf_list_del(cues);
@@ -669,13 +739,26 @@
 	}
 }
 
-static void tsmux_setup_esi(GF_TSMuxCtx *ctx, GF_M2TS_Mux_Program *prog, M2Pid *tspid, u32 stream_type)
+static Bool tsmux_setup_esi(GF_TSMuxCtx *ctx, GF_M2TS_Mux_Program *prog, M2Pid *tspid, u32 stream_type)
 {
 	const GF_PropertyValue *p;
+	GF_ESInterface bckp = tspid->esi;
 
 	memset(&tspid->esi, 0, sizeof(GF_ESInterface));
+
+	if (stream_type == GF_STREAM_ENCRYPTED) {
+		p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
+		if (p && (p->value.uint == GF_HLS_SAMPLE_AES_SCHEME)) {
+			p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_ORIG_STREAM_TYPE);
+			if (p) {
+				stream_type = p->value.uint;
+				tspid->esi.caps |= GF_ESI_STREAM_HLS_SAES;
+			}
+
+		}
+	}
 	tspid->esi.stream_type = stream_type;
-	
+
 	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_TIMESCALE);
 	tspid->esi.timescale = p->value.uint;
 
@@ -722,10 +805,10 @@
 		update_m4sys_info(ctx, prog);
 	}
 
-	tspid->esi.caps = 0;
 	switch (tspid->esi.stream_type) {
 	case GF_STREAM_AUDIO:
-		if (ctx->latm) tspid->esi.caps |= GF_ESI_AAC_USE_LATM;
+		if (ctx->latm && !(tspid->esi.caps & GF_ESI_STREAM_HLS_SAES))
+			tspid->esi.caps |= GF_ESI_AAC_USE_LATM;
 	case GF_STREAM_VISUAL:
 		if (ctx->mpeg4==2) {
 			tspid->esi.caps |= GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS;
@@ -733,9 +816,61 @@
 		break;
 	}
 
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_DOLBY_VISION);
+	if (p && p->value.data.ptr && (p->value.data.size==24)) {
+		memcpy(tspid->esi.dv_info, p->value.data.ptr, 24);
+		if (! (tspid->esi.dv_info[3] & 0x1))
+			tspid->esi.caps |= GF_ESI_FORCE_DOLBY_VISION;
+	}
+
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_ISOM_SUBTYPE);
+	if (p && (((p->value.uint>>24) & 0xFF) == 'd') && (((p->value.uint>>16) & 0xFF) == 'v'))
+		tspid->esi.caps |= GF_ESI_FORCE_DOLBY_VISION;
+
 	tspid->esi.input_ctrl = tsmux_esi_ctrl;
 	tspid->esi.input_udta = tspid;
 	tspid->prog = prog;
+
+	tspid->esi.output_ctrl = bckp.output_ctrl;
+	tspid->esi.output_udta = bckp.output_udta;
+
+	Bool changed = GF_FALSE;
+	if (bckp.stream_id != tspid->esi.stream_id) changed = GF_TRUE;
+	else if (bckp.codecid != tspid->esi.codecid) changed = GF_TRUE;
+	else if (bckp.depends_on_stream != tspid->esi.depends_on_stream) changed = GF_TRUE;
+	else if (bckp.lang != tspid->esi.lang) changed = GF_TRUE;
+	else if (bckp.decoder_config && !tspid->esi.decoder_config) changed = GF_TRUE;
+	else if (!bckp.decoder_config && tspid->esi.decoder_config) changed = GF_TRUE;
+	else if (bckp.decoder_config && tspid->esi.decoder_config &&
+		( (bckp.decoder_config_size != tspid->esi.decoder_config_size)
+		|| memcmp(bckp.decoder_config, tspid->esi.decoder_config, bckp.decoder_config_size))
+	)
+		changed = GF_TRUE;
+	else if (memcmp(bckp.dv_info, tspid->esi.dv_info, 24))
+		changed = GF_TRUE;
+
+	else if ((tspid->esi.caps & GF_ESI_STREAM_HLS_SAES) != (bckp.caps & GF_ESI_STREAM_HLS_SAES))
+		changed = GF_TRUE;
+	else if ((tspid->esi.caps & GF_ESI_AAC_USE_LATM) != (bckp.caps & GF_ESI_AAC_USE_LATM))
+		changed = GF_TRUE;
+	else if ((tspid->esi.caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS) != (bckp.caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS))
+		changed = GF_TRUE;
+	else if ((tspid->esi.caps & GF_ESI_FORCE_DOLBY_VISION) != (bckp.caps & GF_ESI_FORCE_DOLBY_VISION))
+		changed = GF_TRUE;
+
+
+	u32 m2ts_ra = 0;
+	p = gf_filter_pid_get_property_str(tspid->ipid, "M2TSRA");
+	if (p) {
+		if ((p->type==GF_PROP_UINT) || (p->type==GF_PROP_4CC)) m2ts_ra = p->value.uint;
+		else if (p->type==GF_PROP_STRING) m2ts_ra = gf_4cc_parse(p->value.string);
+	}
+	if (m2ts_ra != tspid->esi.ra_code) {
+		changed = GF_TRUE;
+		tspid->esi.ra_code = m2ts_ra;
+	}
+
+	return changed;
 }
 
 static void tsmux_setup_temi(GF_TSMuxCtx *ctx, M2Pid *tspid)
@@ -946,12 +1081,24 @@
 	p = gf_filter_pid_get_info(pid, GF_PROP_PID_DASH_MODE, &pe);
 	if (p) {
 		if (!ctx->dash_mode && p->value.uint) ctx->init_dash = GF_TRUE;
+		if (!ctx->dash_mode) {
+			//use large pack buffer for dash unless not default value
+			if (ctx->nb_pack==4) {
+				ctx->nb_pack = 200;
+				ctx->pack_buffer = gf_realloc(ctx->pack_buffer, sizeof(u8)*188*ctx->nb_pack);
+			}
+			//in dash, force singel PES per AU, some demuxers have issues with PES packets with no ADTS headers (middle of a frame)
+			gf_m2ts_mux_use_single_au_pes_mode(ctx->mux, GF_M2TS_PACK_NONE);
+		}
 		ctx->dash_mode = p->value.uint;
 		if (ctx->dash_mode) {
 			ctx->mux->flush_pes_at_rap = GF_TRUE;
 			gf_m2ts_mux_set_initial_pcr(ctx->mux, 0);
 		}
 	}
+	p = gf_filter_pid_get_info(pid, GF_PROP_PID_LLHLS, &pe);
+	ctx->llhls = p ? p->value.uint : 0;
+
 	gf_filter_release_property(pe);
 
 	tspid = gf_filter_pid_get_udta(pid);
@@ -972,6 +1119,16 @@
 			evt.buffer_req.pid_only = GF_TRUE;
 			gf_filter_pid_send_event(pid, &evt);
 		}
+		if (ctx->is_playing) {
+			GF_FilterEvent evt;
+			GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+			evt.play.start_range = ctx->start_range;
+			gf_filter_pid_send_event(pid, &evt);
+		}
+	}
+
+	if (ctx->llhls && (!ctx->ref_pid || (streamtype == GF_STREAM_VISUAL)) ) {
+		ctx->ref_pid = tspid;
 	}
 
 	//do we need a new program
@@ -1004,6 +1161,8 @@
 				//add 10% of safety to cover TS signaling and other potential table update while sending the largest PES
 				r *= 1.1;
 				pcr_offset = (u64) r;
+			} else {
+				pcr_offset = -1;
 			}
 		} else {
 			pcr_offset = ctx->pcr_offset;
@@ -1018,10 +1177,7 @@
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSMux] Setting up program ID %d - send rates: PSI %d ms PCR every %d ms max - PCR offset %d\n", service_id, ctx->pmt_rate, ctx->max_pcr, ctx->pcr_offset));
 	}
-	//no changes in codec ID or stream type
-	if ((tspid->codec_id == codec_id) && (tspid->esi.stream_type == streamtype))
-		return GF_OK;
-
+	//first setup
 	if (!tspid->codec_id) {
 		Bool is_pcr=GF_FALSE;
 		Bool force_pes=GF_FALSE;
@@ -1046,6 +1202,19 @@
 		tsmux_setup_esi(ctx, prog, tspid, streamtype);
 		tspid->mstream = gf_m2ts_program_stream_add(prog, &tspid->esi, pes_pid, is_pcr, force_pes, GF_FALSE);
 		tsmux_setup_temi(ctx, tspid);
+
+		if (!ctx->mux->ref_pid || (streamtype==GF_STREAM_VISUAL))
+			ctx->mux->ref_pid = pes_pid;
+
+	}
+	//no changes in codec ID, update ifce, notify pmt update if needed and return
+	else if (tspid->codec_id == codec_id) {
+		if (tsmux_setup_esi(ctx, prog, tspid, streamtype)) {
+			prog->pmt->table_needs_update = GF_TRUE;
+			ctx->pmt_update_pending = GF_TRUE;
+			ctx->update_mux = GF_TRUE;
+		}
+		return GF_OK;
 	} else {
 		tspid->codec_id = codec_id;
 		tsmux_setup_esi(ctx, prog, tspid, streamtype);
@@ -1056,7 +1225,7 @@
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
 	if (p) {
-		tspid->media_delay = p->value.sint;
+		tspid->media_delay = p->value.longsint;
 
 		//compute max ts skip for this program
 		s64 max_media_skip = 0;
@@ -1064,8 +1233,14 @@
 		ts_stream = prog->streams;
 		while (ts_stream) {
 			M2Pid *atspid = ts_stream->ifce->input_udta;
-			s64 media_skip = (s64) -atspid->media_delay;
-			if (media_skip > max_media_skip) {
+			s64 media_skip;
+			if (atspid->media_delay>=0) {
+				ts_stream = ts_stream->next;
+				continue;
+			}
+
+			media_skip = -atspid->media_delay;
+			if (!max_media_skip || gf_timestamp_greater(media_skip, atspid->esi.timescale, max_media_skip, max_skip_ts) ) {
 				max_media_skip = media_skip ;
 				max_skip_ts = atspid->esi.timescale;
 			}
@@ -1076,7 +1251,7 @@
 		while (ts_stream) {
 			M2Pid *atspid = ts_stream->ifce->input_udta;
 			if (max_skip_ts) {
-				atspid->max_media_skip = (s32) (max_media_skip * atspid->esi.timescale / max_skip_ts);
+				atspid->max_media_skip = (max_media_skip * atspid->esi.timescale / max_skip_ts);
 			} else {
 				atspid->max_media_skip = 0;
 			}
@@ -1085,9 +1260,7 @@
 	}
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CTS_SHIFT);
 	if (p) {
-		u64 diff = p->value.uint;
-		diff *= 1000000;
-		diff /= tspid->esi.timescale;
+		u64 diff = gf_timestamp_rescale(p->value.uint, tspid->esi.timescale, 1000000);
 		if (diff > tspid->prog->cts_offset)
 			tspid->prog->cts_offset = (u32) diff;
 	}
@@ -1140,10 +1313,9 @@
 	u32 i;
 	M2Pid *tspid = NULL;
 
-	for (i=0; i<gf_list_count(ctx->pids); i++) {
+		for (i=0; i<gf_list_count(ctx->pids); i++) {
 		tspid = gf_list_get(ctx->pids, i);
-		if (ctx->nb_sidx_entries) break;
-		if (ctx->ref_pid == tspid->mstream->pid) break;
+		if (ctx->mux->ref_pid == tspid->mstream->pid) break;
 		tspid = NULL;
 	}
 	if (!tspid) tspid = gf_list_get(ctx->pids, 0);
@@ -1153,9 +1325,7 @@
 		u8 *output;
 		Bool large_sidx = GF_FALSE;
 		u32 segidx_size=0;
-		u64 last_pck_dur = tspid->pck_duration;
-		last_pck_dur *= 90000;
-		last_pck_dur /= tspid->esi.timescale;
+		u64 last_pck_dur = gf_timestamp_rescale(tspid->pck_duration, tspid->esi.timescale, 90000);
 
 		if (ctx->sidx_entries[ctx->nb_sidx_entries-1].sap_time > 0xFFFFFFFFUL)
 			large_sidx = GF_TRUE;
@@ -1180,6 +1350,7 @@
 			if (ctx->idx_filter) gf_filter_set_source(ctx->idx_filter, filter, NULL);
 		}
 		idx_pck = gf_filter_pck_new_alloc(ctx->idx_opid, segidx_size, &output);
+		if (!idx_pck) return;
 
 		if (!ctx->idx_bs) ctx->idx_bs = gf_bs_new(output, segidx_size, GF_BITSTREAM_WRITE);
 		else gf_bs_reassign_buffer(ctx->idx_bs, output, segidx_size);
@@ -1197,7 +1368,7 @@
 		gf_bs_write_u8(ctx->idx_bs, large_sidx ? 1 : 0);
 		gf_bs_write_int(ctx->idx_bs, 0, 24);
 		//reference id
-		gf_bs_write_u32(ctx->idx_bs, ctx->ref_pid);
+		gf_bs_write_u32(ctx->idx_bs, ctx->mux->ref_pid);
 		//timescale
 		gf_bs_write_u32(ctx->idx_bs, 90000);
 		if (large_sidx) {
@@ -1238,41 +1409,63 @@
 
 static void tsmux_insert_sidx(GF_TSMuxCtx *ctx, Bool final_flush)
 {
+	TS_SIDX *tsidx = NULL;
 	if (ctx->subs_sidx<0) return;
 
-	if (!ctx->ref_pid && ctx->mux->sap_inserted)
-		ctx->ref_pid = ctx->mux->last_pid;
-	if (!ctx->ref_pid) return;
+	if (!ctx->mux->ref_pid) return;
 
 	if (ctx->nb_sidx_entries) {
-		TS_SIDX *tsidx = &ctx->sidx_entries[ctx->nb_sidx_entries-1];
+		tsidx = &ctx->sidx_entries[ctx->nb_sidx_entries-1];
 
-		if (ctx->ref_pid == ctx->mux->last_pid) {
-			if (!tsidx->min_pts_plus_one) tsidx->min_pts_plus_one = ctx->mux->last_pts + 1;
-			else if (tsidx->min_pts_plus_one-1 > ctx->mux->last_pts) tsidx->min_pts_plus_one = ctx->mux->last_pts + 1;
+		if (!tsidx->min_pts_plus_one) tsidx->min_pts_plus_one = ctx->mux->last_pts + 1;
+		else if (tsidx->min_pts_plus_one-1 > ctx->mux->last_pts) tsidx->min_pts_plus_one = ctx->mux->last_pts + 1;
 
-			if (tsidx->max_pts < ctx->mux->last_pts) tsidx->max_pts = ctx->mux->last_pts;
-		}
+		if (tsidx->max_pts < ctx->mux->last_pts) tsidx->max_pts = ctx->mux->last_pts;
 
 		if (!final_flush && !ctx->mux->sap_inserted) return;
 
 		tsidx->nb_pck = ctx->nb_pck_in_seg - tsidx->nb_pck;
+		if (tsidx->nb_pck)
+			tsidx = NULL;
 	}
 
 	if (final_flush) return;
 	if (!ctx->mux->sap_inserted) return;
 
-	if (ctx->nb_sidx_entries == ctx->nb_sidx_alloc) {
-		ctx->nb_sidx_alloc += 10;
-		ctx->sidx_entries = gf_realloc(ctx->sidx_entries, sizeof(TS_SIDX)*ctx->nb_sidx_alloc);
+	if (!tsidx) {
+		if (ctx->nb_sidx_entries == ctx->nb_sidx_alloc) {
+			ctx->nb_sidx_alloc += 10;
+			ctx->sidx_entries = gf_realloc(ctx->sidx_entries, sizeof(TS_SIDX)*ctx->nb_sidx_alloc);
+		}
+		tsidx = &ctx->sidx_entries[ctx->nb_sidx_entries];
+		ctx->nb_sidx_entries ++;
 	}
-	ctx->sidx_entries[ctx->nb_sidx_entries].sap_time = ctx->mux->sap_time;
-	ctx->sidx_entries[ctx->nb_sidx_entries].sap_type = ctx->mux->sap_type;
-	ctx->sidx_entries[ctx->nb_sidx_entries].min_pts_plus_one = ctx->mux->sap_time + 1;
-	ctx->sidx_entries[ctx->nb_sidx_entries].max_pts = ctx->mux->sap_time;
-	ctx->sidx_entries[ctx->nb_sidx_entries].nb_pck = ctx->nb_sidx_entries ? ctx->nb_pck_in_seg : 0;
-	ctx->sidx_entries[ctx->nb_sidx_entries].offset = ctx->nb_sidx_entries ? 0 : ctx->nb_pck_first_sidx;
-	ctx->nb_sidx_entries ++;
+	tsidx->sap_time = ctx->mux->sap_time;
+	tsidx->sap_type = ctx->mux->sap_type;
+	tsidx->min_pts_plus_one = ctx->mux->sap_time + 1;
+	tsidx->max_pts = ctx->mux->sap_time;
+	tsidx->nb_pck = (ctx->nb_sidx_entries>1) ? ctx->nb_pck_in_seg : 0;
+	tsidx->offset = (ctx->nb_sidx_entries>1) ? 0 : ctx->nb_pck_first_sidx;
+}
+
+static void tsmux_flush_frag_hls(GF_TSMuxCtx *ctx, Bool is_last)
+{
+	GF_FilterEvent evt;
+
+	GF_FEVT_INIT(evt, GF_FEVT_FRAGMENT_SIZE, ctx->ref_pid->ipid);
+	evt.frag_size.is_last = is_last;
+	evt.frag_size.offset = ctx->frag_offset;
+	evt.frag_size.size = ctx->frag_size;
+	evt.frag_size.duration.num = (s64) ctx->frag_duration;
+	evt.frag_size.duration.den = ctx->ref_pid->esi.timescale;
+	evt.frag_size.independent = ctx->frag_has_intra;
+
+	gf_filter_pid_send_event(ctx->ref_pid->ipid, &evt);
+
+	ctx->frag_offset += ctx->frag_size;
+	ctx->frag_size = 0;
+	ctx->frag_duration = 0;
+	ctx->frag_has_intra = GF_FALSE;
 }
 
 static GF_Err tsmux_process(GF_Filter *filter)
@@ -1288,7 +1481,10 @@
 		tsmux_assign_pcr(ctx);
 	}
 
-	if (ctx->init_buffering && !tsmux_init_buffering(filter, ctx)) return GF_OK;
+	if (ctx->init_buffering && !tsmux_init_buffering(filter, ctx)) {
+		gf_filter_ask_rt_reschedule(filter, 1000);
+		return GF_OK;
+	}
 
 	if (ctx->init_dash) {
 		u32 i, count = gf_list_count(ctx->pids);
@@ -1317,7 +1513,9 @@
 	}
 
 
-	if (ctx->wait_dash_flush) {
+	if (ctx->wait_dash_flush || ctx->wait_llhls_flush) {
+		Bool is_llhls_flush = GF_FALSE;
+		Bool is_eods_flush = GF_FALSE;
 		u32 i, done=0, count = gf_list_count(ctx->pids);
 		for (i=0; i<count; i++) {
 			M2Pid *tspid = gf_list_get(ctx->pids, i);
@@ -1327,22 +1525,46 @@
 		if (done==count) {
 			for (i=0; i<count; i++) {
 				M2Pid *tspid = gf_list_get(ctx->pids, i);
+				if (tspid->has_seen_eods==M2TS_EODS_FORCED)
+					is_eods_flush = GF_TRUE;
+				else if (tspid->has_seen_eods==M2TS_EODS_LLHLS) {
+					is_llhls_flush = GF_TRUE;
+				}
 				tspid->has_seen_eods = 0;
+				tspid->llhls_dts_init = 0;
 			}
 			ctx->wait_dash_flush = GF_FALSE;
-			ctx->next_is_start = ctx->dash_file_switch;
 			ctx->mux->force_pat = GF_TRUE;
-			ctx->dash_file_switch = GF_FALSE;
-			if (ctx->nb_pck_in_seg) {
-				tsmux_insert_sidx(ctx, GF_TRUE);
-				tsmux_send_seg_event(filter, ctx);
-			}
-			ctx->dash_seg_num = 0;
 
-			ctx->nb_pck_in_seg = 0;
-			ctx->pck_start_idx = ctx->nb_pck;
-			if (ctx->next_is_start) ctx->nb_pck_in_file = 0;
-			ctx->nb_pck_first_sidx = ctx->nb_pck_in_file;
+			if (is_llhls_flush) {
+				ctx->wait_llhls_flush = GF_FALSE;
+				ctx->next_is_llhls_start = GF_TRUE;
+
+				tsmux_flush_frag_hls(ctx, GF_FALSE);
+			} else {
+				ctx->next_is_start = ctx->dash_file_switch;
+				ctx->dash_file_switch = GF_FALSE;
+
+				if (ctx->llhls) {
+					tsmux_flush_frag_hls(ctx, GF_TRUE);
+					ctx->frag_offset = 0;
+				}
+
+				if (ctx->nb_pck_in_seg) {
+					tsmux_insert_sidx(ctx, GF_TRUE);
+					tsmux_send_seg_event(filter, ctx);
+				}
+
+				if (!is_eods_flush)
+					ctx->dash_seg_num = 0;
+				else
+					ctx->last_is_eods_flush = GF_TRUE;
+
+				ctx->nb_pck_in_seg = 0;
+				ctx->pck_start_idx = ctx->nb_pck;
+				if (ctx->next_is_start) ctx->nb_pck_in_file = 0;
+				ctx->nb_pck_first_sidx = ctx->nb_pck_in_file;
+			}
 		}
 	}
 
@@ -1379,6 +1601,8 @@
 		}
 		osize = nb_pck_in_pack * 188;
 		pck = gf_filter_pck_new_alloc(ctx->opid, osize, &output);
+		if (!pck) return GF_OUT_OF_MEM;
+		
 		memcpy(output, ts_pck, osize);
 		gf_filter_pck_set_framing(pck, ctx->nb_pck ? ctx->next_is_start : GF_TRUE, (status==GF_M2TS_STATE_EOS) ? GF_TRUE : GF_FALSE);
 
@@ -1390,6 +1614,17 @@
 
 			ctx->dash_file_name[0] = 0;
 			ctx->next_is_start = GF_FALSE;
+			if (ctx->llhls>1) {
+				ctx->frag_num=1;
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_HLS_FRAG_NUM, &PROP_UINT(ctx->frag_num));
+			}
+		}
+		else if (ctx->next_is_llhls_start) {
+			if (ctx->llhls>1) {
+				ctx->frag_num++;
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_HLS_FRAG_NUM, &PROP_UINT(ctx->frag_num));
+			}
+			ctx->next_is_llhls_start = GF_FALSE;
 		}
 
 		pck_ts = gf_m2ts_get_ts_clock_90k(ctx->mux);
@@ -1411,6 +1646,8 @@
 		ctx->nb_pck_in_file += nb_pck_in_pack;
 		nb_pck_in_call += nb_pck_in_pack;
 		nb_pck_in_pack = 0;
+		if (ctx->llhls)
+			ctx->frag_size += osize;
 
 		if (is_pack_flush)
 			break;
@@ -1469,7 +1706,7 @@
 			ctx->last_log_time = now;
 		else if (now > ctx->last_log_time + ctx->log_freq) {
 			ctx->last_log_time = now;
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[M2TSMux] time % 6d TS time % 6d bitrate % 8d\r", gf_m2ts_get_sys_clock(ctx->mux), gf_m2ts_get_ts_clock(ctx->mux), ctx->mux->average_birate_kbps));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[M2TSMux] time % 6d TS time % 6d bitrate % 8d\r", gf_m2ts_get_sys_clock(ctx->mux), gf_m2ts_get_ts_clock(ctx->mux), ctx->mux->average_birate_kbps));
 		}
 		if (status == GF_M2TS_STATE_IDLE) {
 #if 0
@@ -1486,6 +1723,9 @@
 			gf_filter_ask_rt_reschedule(filter, 1000);
 #endif
 		}
+	} else if (!nb_pck_in_call) {
+		//not in end of stream and we did not emit packets, force reschedule to signal we're still active
+		gf_filter_ask_rt_reschedule(filter, 0);
 	}
 	//PMT update management is still under progress...
 	ctx->pmt_update_pending = 0;
@@ -1520,7 +1760,7 @@
 		ctx->init_buffering = GF_TRUE;
 	}
 	ctx->pids = gf_list_new();
-	if (ctx->nb_pack>1) ctx->pack_buffer = gf_malloc(sizeof(char)*188*ctx->nb_pack);
+	if (ctx->nb_pack>1) ctx->pack_buffer = gf_malloc(sizeof(u8)*188*ctx->nb_pack);
 
 #ifdef GPAC_ENABLE_COVERAGE
 	if (gf_sys_is_cov_mode()) {
@@ -1539,7 +1779,7 @@
 #endif
 	u64 dur_ms = gf_m2ts_get_ts_clock(ctx->mux);
 	if (!dur_ms) dur_ms = 1;
-	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[M2TSMux] Done muxing - %.02f sec - %sbitrate %d kbps "LLD" packets written\nPadding: "LLD" packets (%g kbps) - "LLD" PES padded bytes (%g kbps)\n",
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[M2TSMux] Done muxing - %.02f sec - %sbitrate %d kbps "LLD" packets written\nPadding: "LLD" packets (%g kbps) - "LLD" PES padded bytes (%g kbps)\n",
 		((Double) dur_ms)/1000.0, ctx->rate ? "" : "average ", (u32) (bits/dur_ms), ctx->mux->tot_pck_sent,
 		 ctx->mux->tot_pad_sent, (Double) (ctx->mux->tot_pad_sent*188*8.0/dur_ms) , ctx->mux->tot_pes_pad_bytes, (Double) (ctx->mux->tot_pes_pad_bytes*8.0/dur_ms)
 	));
@@ -1568,14 +1808,21 @@
 			else
 				tspid->esi.caps &= ~GF_ESI_STREAM_IS_OVER;
 		}
+		if (evt->base.type==GF_FEVT_PLAY) {
+			ctx->is_playing = GF_TRUE;
+			ctx->start_range = evt->play.start_range;
+		} else {
+			ctx->is_playing = GF_FALSE;
+		}
 	}
 	return GF_FALSE;
 }
 
 static const GF_FilterCapability TSMuxCaps[] =
 {
-	//first set of caps describe streams that need reframing (NAL)
+	//first set of caps describe streams that need reframing (NALU, mp4v, mpegh audio)
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	//unframed streams only
 	CAP_BOOL(GF_CAPS_INPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	//for NAL-based, we want annexB format
@@ -1584,10 +1831,14 @@
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_SVC),
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_LHVC),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_VVC),
 	//for m4vp2 we want DSI reinsertion
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
 	//for AAC we use the AAC->ADTS or AAC->LATM of the mux, so don't insert here
 
+	//for MPEG-H audio MHAS we need to insert sync packets
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_MHAS),
+
 	//static output cap file extension
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_STRING(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_FILE_EXT, M2TS_FILE_EXTS),
@@ -1604,36 +1855,47 @@
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_SVC),
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_LHVC),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_VVC),
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
-	//no RAW support for now
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_MHAS),
+	//we don't accept MPEG-H audio without MHAS
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_MPHA),
+	//no RAW support for now$
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+
+	//for SAES, accepte encrypted AVC with scheme SAES, unframed
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_4CC('s','a','e','s') ),
+	CAP_BOOL(GF_CAPS_INPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_AVC),
 };
 
 
 #define OFFS(_n)	#_n, offsetof(GF_TSMuxCtx, _n)
 static const GF_FilterArgs TSMuxArgs[] =
 {
-	{ OFFS(breq), "buffer requirements in ms for input pids", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(breq), "buffer requirements in ms for input PIDs", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(pmt_id), "define the ID of the first PMT to use in the mux", GF_PROP_UINT, "100", NULL, 0},
 	{ OFFS(rate), "target rate in bps of the multiplex. If not set, variable rate is used", GF_PROP_UINT, "0", NULL, 0},
 	{ OFFS(pmt_rate), "interval between PMT in ms", GF_PROP_UINT, "200", NULL, 0},
 	{ OFFS(pat_rate), "interval between PAT in ms", GF_PROP_UINT, "200", NULL, 0},
 	{ OFFS(first_pts), "force PTS value of first packet, in 90kHz", GF_PROP_LUINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(pcr_offset), "offset all timestamps from PCR by V, in 90kHz. Default value is computed based on input media", GF_PROP_LUINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(mpeg4), "force usage of MPEG-4 signaling (IOD and SL Config)\n"\
-				"- none: disables 4on2\n"\
-				"- full: sends AUs as SL packets over section for OD, section/pes for scene (cf bifs_pes)\n"\
-				"- scene: sends only scene streams as 4on2 but uses regular PES without SL for audio and video"\
+	{ OFFS(pcr_offset), "offset all timestamps from PCR by V, in 90kHz (default value is computed based on input media)", GF_PROP_LUINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(mpeg4), "force usage of MPEG-4 signaling (IOD and SL Config)\n"
+				"- none: disables 4on2\n"
+				"- full: sends AUs as SL packets over section for OD, section/pes for scene (cf bifs_pes)\n"
+				"- scene: sends only scene streams as 4on2 but uses regular PES without SL for audio and video"
 				, GF_PROP_UINT, "none", "none|full|scene", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(pmt_version), "set version number of the PMT", GF_PROP_UINT, "200", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(disc), "set the discontinuity marker for the first packet of each stream", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(repeat_rate), "interval in ms between two carousel send for MPEG-4 systems. Is overridden by carousel duration PID property if defined", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(repeat_img), "interval in ms between re-sending (as PES) of single-image streams. If 0, image data is sent once only", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(repeat_rate), "interval in ms between two carousel send for MPEG-4 systems (overridden by `CarouselRate` PID property if defined)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(repeat_img), "interval in ms between re-sending (as PES) of single-image streams (if 0, image data is sent once only)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(max_pcr), "set max interval in ms between 2 PCR", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(nb_pack), "pack N TS packets in output packets", GF_PROP_UINT, "4", NULL, 0},
-	{ OFFS(pes_pack), "set AU to PES packing mode\n"\
-		"- audio: will pack only multiple audio AUs in a PES\n"\
-		"- none: make exactly one AU per PES\n"\
+	{ OFFS(pes_pack), "set AU to PES packing mode\n"
+		"- audio: will pack only multiple audio AUs in a PES\n"
+		"- none: make exactly one AU per PES\n"
 		"- all: will pack multiple AUs per PES for all streams", GF_PROP_UINT, "audio", "audio|none|all", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(realtime), "use real-time output", GF_PROP_BOOL, "false", NULL, 0},
 	{ OFFS(bifs_pes), "select BIFS streams packetization (PES vs sections)\n"
@@ -1642,39 +1904,41 @@
 	"- copy: uses BIFS PES but removes timestamps in BIFS SL and only carries PES timestamps", GF_PROP_UINT, "off", "off|on|copy", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(flush_rap), "force flushing mux program when RAP is found on video, and injects PAT and PMT before the next video PES begin", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(pcr_only), "enable PCR-only TS packets", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(pcr_init), "set initial PCR value for the programs. Negative value implies random value is picked", GF_PROP_LSINT, "-1", NULL, 0},
-	{ OFFS(sid), "set service ID for the program - see filter help", GF_PROP_UINT, "0", NULL, 0},
-	{ OFFS(name), "set service name for the program - see filter help", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(provider), "set service provider name for the program - see filter help", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(sdt_rate), "interval in ms between two DVB SDT tables. If 0, SDT is disabled", GF_PROP_UINT, "0", NULL, 0},
-
-	{ OFFS(temi), "insert TEMI time codes in adaptation field - see filter help", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(pcr_init), "set initial PCR value for the programs. A negative value means random value is picked", GF_PROP_LSINT, "-1", NULL, 0},
+	{ OFFS(sid), "set service ID for the program", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(name), "set service name for the program", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(provider), "set service provider name for the program", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(sdt_rate), "interval in ms between two DVB SDT tables (if 0, SDT is disabled)", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(temi), "insert TEMI time codes in adaptation field", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(log_freq), "delay between logs for realtime mux", GF_PROP_UINT, "500", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(latm), "use LATM AAC encapsulation instead of regular ADTS", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(subs_sidx), "number of subsegments per sidx. negative value disables sidx", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(subs_sidx), "number of subsegments per sidx (negative value disables sidx)", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(cdur), "chunk duration for fragmentation modes", GF_PROP_FRACTION, "-1/1", NULL, GF_FS_ARG_HINT_HIDE},
 	{0}
 };
 
 
 GF_FilterRegister TSMuxRegister = {
 	.name = "m2tsmx",
-	GF_FS_SET_DESCRIPTION("MPEG-2 TS muxer")
-	GF_FS_SET_HELP("GPAC TS multiplexer selects M2TS PID for media streams using the PID of the PMT plus the stream index.\n"
-	 	"For example, default config creates the first program with a PMT PID 100, the first stream will have a PID of 101.\n"
+	GF_FS_SET_DESCRIPTION("MPEG-2 TS multiplexer")
+	GF_FS_SET_HELP("This filter multiplexes one or more input PIDs into a MPEG-2 Transport Stream multiplex.\n"
+		"\n"
+		"# PID selection\n"
+		"The MPEG-2 TS multiplexer assigns M2TS PID for media streams using the PID of the PMT plus the stream index.\n"
+	 	"For example, the default config creates the first program with a PMT PID 100, the first stream will have a PID of 101.\n"
 		"Streams are grouped in programs based on input PID property ServiceID if present. If absent, stream will go in the program with service ID as indicated by [-sid]() option.\n"
 		"- [-name]() option is overridden by input PID property `ServiceName`.\n"
 		"- [-provider]() option is overridden by input PID property `ServiceProvider`.\n"
 		"- [-pcr_offset]() option is overridden by input PID property `\"tsmux:pcr_offset\"`\n"
 		"- [-first_pts]() option is overridden by input PID property `\"tsmux:force_pts\"`\n"
 		"- [-temi]() option is overridden by input PID property `\"tsmux:temi\"`\n"
-
 		"\n"
 		"# Time and External Media Information (TEMI)\n"
 		"The [-temi]() option allows specifying a list of URLs or timeline IDs to insert in streams of a program.\n"
 		"One or more TEMI timeline can be specified per PID.\n"
 		"The syntax is a comma-separated list of one or more TEMI description.\n"
 		"Each TEMI description is formatted as ID_OR_URL or #OPT1[#OPT2]#ID_OR_URL. Options are:\n"
-		"- S`N`: gives number N indicating the target serviceID\n"
+		"- S`N`: indicate the target service with ID `N`\n"
 		"- T`N`: set timescale to use (default: PID timescale)\n"
 		"- D`N`: set delay in ms between two TEMI url descriptors (default 1000)\n"
 		"- O`N`: set offset (max 64 bits) to add to TEMI timecodes (default 0). If timescale is not specified, offset value is in ms, otherwise in timescale units.\n"
@@ -1683,13 +1947,13 @@
 		" - `V`: only insert for video streams.\n"
 		" - `A`: only insert for audio streams.\n"
 		" - `T`: only insert for text streams.\n"
-		" - N: only insert for stream with index N (0-based) in the program.\n"
-		"- L`N`: set 64bit timecode signaling. Possible values are:\n"
+		" - N: only insert for stream with index `N` (0-based) in the program.\n"
+		"- L`C`: set 64bit timecode signaling. Possible values for `C` are:\n"
 		" - `A`: automatic switch between 32 and 64 bit depending on timecode value (default if not specified).\n"
 		" - `Y`: use 64 bit signaling only.\n"
 		" - `N`: use 32 bit signaling only and wrap around timecode value.\n"
 		"- N: insert NTP timestamp in TEMI timeline descriptor\n"
-		"- ID_OR_URL: If number, indicates the TEMI ID to use for external timeline. Otherwise, gives the URL to insert\n"
+		"- ID_OR_URL: If number, indicate the TEMI ID to use for external timeline. Otherwise, give the URL to insert\n"
 		" \n"
 		"EX temi=\"url\"\n"
 		"Inserts a TEMI URL+timecode in the each stream of each program.\n"
@@ -1703,9 +1967,15 @@
 		"Inserts an external TEMI with ID 4 and timescale 30000, NTP injection and carousel of 500 ms in the video stream of all programs.\n"
 		"\n"
 		"Warning: multipliers (k,m,g) are not supported in TEMI options.\n"
-		"# Notes\n"
-		"In DASH mode, the PCR is always initialized at 0, and [-flush_rap]() is automatically set.\n"
-		"The filter watches the property `FileNumber` on incoming packets to create new files or new segments in DASH mode.\n"
+		"# Adaptive Streaming\n"
+		"In DASH and HLS mode:\n"
+		"- the PCR is always initialized at 0, and [-flush_rap]() is automatically set.\n"
+		"- unless `nb_pack` is specified, 200 TS packets will be used as pack output in DASH mode.\n"
+		"- `pes_pack=none` is forced since some demultiplexers have issues with non-aligned ADTS PES.\n"
+		"\n"
+		"The filter watches the property `FileNumber` on incoming packets to create new files, or new segments in DASH mode.\n"
+		"The filter will look for property `M2TSRA` set on the input stream.\n"
+		"The value can either be a 4CC or a string, indicating the MP2G-2 TS Registration tag for unknwon media types.\n"
 	)
 	.private_size = sizeof(GF_TSMuxCtx),
 	.args = TSMuxArgs,
@@ -1723,3 +1993,5 @@
 {
 	return &TSMuxRegister;
 }
+
+#endif /*GPAC_DISABLE_MPEG2TS_MUX*/

gpac-1.0.1.tar.gz/src/filters/out_audio.c -> gpac-2.0.0.tar.gz/src/filters/out_audio.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / audio output filter
@@ -37,7 +37,7 @@
 	Bool clock;
 	GF_Fraction64 dur;
 	Double speed, start;
-	u32 vol, pan, buffer;
+	u32 vol, pan, buffer, mbuffer, rbuffer;
 	GF_Fraction adelay;
 	
 	GF_FilterPid *pid;
@@ -51,16 +51,21 @@
 
 	u32 pck_offset;
 	u64 first_cts;
+	u64 last_cts;
 	Bool aborted;
-	Bool speed_set;
+	u32 speed_set;
 	GF_Filter *filter;
-	Bool is_eos;
+	Bool is_eos, in_error;
 	Bool first_write_done;
 
-	s32 pid_delay;
+	s64 pid_delay;
 
 	Bool buffer_done, no_buffering;
 	u64 hwdelay_us, totaldelay_us;
+
+	u64 rebuffer;
+	Bool do_seek;
+	u64 last_clock;
 } GF_AudioOutCtx;
 
 
@@ -81,6 +86,9 @@
 		gf_filter_pid_get_packet(ctx->pid);
 		return;
 	}
+	//we only support packed audio at output
+	if (afmt>GF_AUDIO_FMT_LAST_PACKED)
+		afmt -= GF_AUDIO_FMT_LAST_PACKED;
 
 	e = ctx->audio_out->Configure(ctx->audio_out, &sr, &nb_ch, &afmt, ch_cfg);
 	if (e) {
@@ -89,7 +97,7 @@
 		sr = 44100;
 		nb_ch = 2;
 	}
-	if (ctx->speed == FIX_ONE) ctx->speed_set = GF_TRUE;
+	if (ctx->speed == FIX_ONE) ctx->speed_set = 1;
 
 	if (ctx->vol<=100) {
 		if (ctx->audio_out->SetVolume)
@@ -114,7 +122,7 @@
 		gf_filter_pid_negociate_property(ctx->pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(afmt));
 		gf_filter_pid_negociate_property(ctx->pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(nb_ch));
 		gf_filter_pid_negociate_property(ctx->pid, GF_PROP_PID_AUDIO_SPEED, &PROP_DOUBLE(ctx->speed));
-		ctx->speed_set = GF_TRUE;
+		ctx->speed_set = (ctx->speed==1.0) ? 1 : 2;
 		ctx->needs_recfg = GF_FALSE;
 		//drop all packets until next reconfig
 		ctx->wait_recfg = GF_TRUE;
@@ -125,6 +133,12 @@
 	} else if (e==GF_OK) {
 		ctx->needs_recfg = GF_FALSE;
 		ctx->wait_recfg = GF_FALSE;
+	} else {
+		if (!ctx->in_error) {
+			ctx->in_error = GF_TRUE;
+			gf_filter_abort(ctx->filter);
+		}
+		return;
 	}
 	ctx->bytes_per_sample = gf_audio_fmt_bit_depth(afmt) * nb_ch / 8;
 	ctx->hwdelay_us = 0;
@@ -173,6 +187,27 @@
 
 	memset(buffer, 0, buffer_size);
 	if (!ctx->pid || ctx->aborted) return 0;
+	if (!ctx->speed) return 0;
+
+	if (ctx->do_seek) {
+		GF_FilterEvent evt;
+
+		GF_FEVT_INIT(evt, GF_FEVT_STOP, ctx->pid);
+		gf_filter_pid_send_event(ctx->pid, &evt);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] Seek request to %f speed %f\n", ctx->start, ctx->speed));
+		gf_filter_pid_init_play_event(ctx->pid, &evt, ctx->start, ctx->speed, "VideoOut");
+		gf_filter_pid_send_event(ctx->pid, &evt);
+
+		//reinit clock
+		ctx->first_write_done = GF_FALSE;
+		ctx->buffer_done = GF_FALSE;
+		ctx->do_seek = GF_FALSE;
+		ctx->pck_offset = 0;
+		ctx->last_cts = 0;
+		return 0;
+	}
+
 
 	if (!ctx->buffer_done) {
 		u32 size;
@@ -186,7 +221,11 @@
 		/*the compositor sends empty packets after its reconfiguration to check when the config is active
 		we therefore probe the first packet before probing the buffer fullness*/
 		pck = gf_filter_pid_get_packet(ctx->pid);
-		if (!pck) return 0;
+		if (!pck) {
+			if (gf_filter_pid_is_eos(ctx->pid))
+				ctx->is_eos = GF_TRUE;
+			return 0;
+		}
 
 		if (! gf_filter_pck_is_blocking_ref(pck)) {
 			if ((dur < ctx->buffer * 1000) && !gf_filter_pid_is_eos(ctx->pid))
@@ -201,7 +240,27 @@
 				return 0;
 		}
 		ctx->buffer_done = GF_TRUE;
+		if (ctx->rebuffer) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[AudioOut] rebuffer done in "LLU" ms\n", (u32) ( (gf_sys_clock_high_res() - ctx->rebuffer) /1000) ));
+			ctx->rebuffer = 0;
+		}
+	} else if (ctx->rbuffer && !ctx->rebuffer) {
+		//query full buffer duration in us
+		u64 dur = gf_filter_pid_query_buffer_duration(ctx->pid, GF_FALSE);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] buffer %d / %d ms\r", dur/1000, ctx->buffer));
+		if ((dur < ctx->rbuffer * 1000) && !gf_filter_pid_has_seen_eos(ctx->pid)) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[AudioOut] buffer %u less than min threshold %u, rebuffering\n", (u32) (dur/1000), ctx->rbuffer));
+			ctx->rebuffer = gf_sys_clock_high_res();
+			ctx->buffer_done = GF_FALSE;
+			return GF_OK;
+		}
+#ifndef GPAC_DISABLE_LOG
+	} else if (gf_log_tool_level_on(GF_LOG_MMIO, GF_LOG_DEBUG)) {
+		u64 dur = gf_filter_pid_query_buffer_duration(ctx->pid, GF_FALSE);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] buffer %d / %d ms\r", dur/1000, ctx->buffer));
+#endif
 	}
+
 	//do not throw underflow log util first packet is fetched
 	if (ctx->first_write_done)
 		is_first_pck = GF_FALSE;
@@ -227,7 +286,7 @@
 
 		delay = ctx->pid_delay;
 		if (ctx->adelay.den)
-			delay += ctx->adelay.num * (s32)ctx->timescale / (s32)ctx->adelay.den;
+			delay += gf_timestamp_rescale(ctx->adelay.num, ctx->adelay.den, ctx->timescale);
 
 		cts = gf_filter_pck_get_cts(pck);
 		if (delay >= 0) {
@@ -239,10 +298,24 @@
 			cts -= (u64) -delay;
 		}
 
+		if (ctx->last_cts && (cts != GF_FILTER_NO_TS) && (cts>ctx->last_cts)) {
+			u64 now = gf_sys_clock_high_res();
+			u64 diff = cts - ctx->last_cts;
+			//diff too high and no discontinuity, wait
+			if ((diff > ctx->timescale/5) && (gf_filter_pid_get_clock_info(ctx->pid, NULL, NULL) != GF_FILTER_CLOCK_PCR_DISC) ) {
+				diff = gf_timestamp_rescale(diff, ctx->timescale, 1000000);
+				if (now < ctx->last_clock + diff) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] Frame too early by "LLU" us\n", ctx->last_clock + diff - now));
+					return 0;
+				}
+			}
+		}
+
+
 		if (ctx->dur.num>0) {
 			if (!ctx->first_cts) ctx->first_cts = cts+1;
 
-			if ((cts - ctx->first_cts + 1) * ctx->dur.den > (u64) ctx->dur.num*ctx->timescale) {
+			if (gf_timestamp_greater(cts - ctx->first_cts + 1, ctx->timescale, ctx->dur.num, ctx->dur.den)) {
 				gf_filter_pid_drop_packet(ctx->pid);
 				if (!ctx->aborted) {
 					GF_FilterEvent evt;
@@ -260,19 +333,23 @@
 		if (!done && ctx->clock && data && size) {
 			GF_Fraction64 timestamp;
 			timestamp.num = cts;
-			if (ctx->pck_offset)
-				timestamp.num += ctx->pck_offset/ctx->bytes_per_sample;
+			if (ctx->pck_offset) {
+				u32 nb_samp = ctx->pck_offset/ctx->bytes_per_sample;
+				if (ctx->timescale != ctx->sr) {
+					nb_samp = (u32) gf_timestamp_rescale(nb_samp, ctx->sr, ctx->timescale);
+				}
+				timestamp.num += nb_samp;
+			}
 
-			timestamp.num -= (ctx->hwdelay_us*ctx->timescale)/1000000;
+			timestamp.num -= gf_timestamp_rescale(ctx->hwdelay_us, 1000000, ctx->timescale);
 			if (timestamp.num<0) timestamp.num = 0;
 			timestamp.den = ctx->timescale;
 			gf_filter_hint_single_clock(ctx->filter, gf_sys_clock_high_res(), timestamp);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] At %d ms audio frame CTS "LLU" (compensated time %g s)\n", gf_sys_clock(), cts, ((Double)timestamp.num)/timestamp.den ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] At %d ms audio frame CTS "LLU" (compensated time %g s, HW delay "LLU" us)\n", gf_sys_clock(), cts, ((Double)timestamp.num)/timestamp.den, ctx->hwdelay_us ));
 		}
 		
-		if (data && !ctx->wait_recfg) {
+		if (data && !ctx->wait_recfg && (size >= ctx->pck_offset)) {
 			u32 nb_copy;
-			assert(size >= ctx->pck_offset);
 			
 			nb_copy = (size - ctx->pck_offset);
 			if (nb_copy + done > buffer_size) nb_copy = buffer_size - done;
@@ -285,6 +362,8 @@
 				gf_filter_update_status(ctx->filter, -1, szStatus);
 			}
 
+			ctx->last_cts = cts;
+			ctx->last_clock = gf_sys_clock_high_res();
 
 			done += nb_copy;
 			ctx->first_write_done = GF_TRUE;
@@ -323,7 +402,9 @@
 		return GF_OK;
 	}
 	assert(!ctx->pid || (ctx->pid==pid));
-	gf_filter_pid_check_caps(pid);
+
+	if (!gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
 
 	sr = afmt = nb_ch = timescale = 0;
 	ch_cfg = 0;
@@ -354,30 +435,35 @@
 
 	if (ctx->first_cts && (ctx->timescale != timescale)) {
 		ctx->first_cts-=1;
-		ctx->first_cts *= timescale;
-		ctx->first_cts /= ctx->timescale;
+		gf_timestamp_rescale(ctx->first_cts, ctx->timescale, timescale);
 		ctx->first_cts+=1;
+
+		gf_timestamp_rescale(ctx->last_cts, ctx->timescale, timescale);
 	}
 	ctx->timescale = timescale;
 
-	p = gf_filter_pid_get_property_str(pid, "BufferLength");
-	ctx->no_buffering = (p && !p->value.sint) ? GF_TRUE : GF_FALSE;
-	if (ctx->no_buffering) ctx->buffer_done = GF_TRUE;
-
-	if ((ctx->sr==sr) && (ctx->afmt == afmt) && (ctx->nb_ch == nb_ch) && (ctx->ch_cfg == ch_cfg)) {
-		ctx->needs_recfg = GF_FALSE;
-		ctx->wait_recfg = GF_FALSE;
-		return GF_OK;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAY_BUFFER);
+	ctx->no_buffering = (p && !p->value.uint) ? GF_TRUE : GF_FALSE;
+	if (ctx->no_buffering) {
+		ctx->buffer_done = GF_TRUE;
+		ctx->clock = GF_FALSE;
+	}
+	Bool buffer_req_changed = GF_FALSE;
+	if (p && p->value.uint) {
+		if (ctx->buffer < p->value.uint) {
+			ctx->buffer = p->value.uint;
+			buffer_req_changed = GF_TRUE;
+		}
 	}
 
-	//whenever change of sample rate / format / channel, force buffer requirements and speed setup
 	if ((ctx->sr!=sr) || (ctx->afmt != afmt) || (ctx->nb_ch != nb_ch)) {
+		buffer_req_changed = GF_TRUE;
+	}
+	if (buffer_req_changed) {
 		GF_FilterEvent evt;
-		ctx->speed_set = GF_FALSE;
-
 		//set buffer reqs to bdur or 100 ms - we don't "buffer" in the filter, but this will allow dispatching
 		//several input frames in the buffer (default being 1 pck / 1000 us max in buffers). Not doing so could cause
-		//the session to end because input is blocked (no tasks posted) and output still holds a packet 
+		//the session to end because input is blocked (no tasks posted) and output still holds a packet
 		GF_FEVT_INIT(evt, GF_FEVT_BUFFER_REQ, pid);
 		evt.buffer_req.max_buffer_us = ctx->buffer * 1000;
 		if (ctx->bdur) {
@@ -386,9 +472,32 @@
 			if (evt.buffer_req.max_buffer_us < b)
 				evt.buffer_req.max_buffer_us = (u32) b;
 		}
-		evt.buffer_req.pid_only = GF_TRUE;
-
+		//we have a max buffer, move our computed max to playout and setup max buffer
+		if (ctx->mbuffer > evt.buffer_req.max_buffer_us / 1000 ) {
+			evt.buffer_req.max_playout_us = evt.buffer_req.max_buffer_us;
+			evt.buffer_req.max_buffer_us = ctx->mbuffer * 1000;
+		}
+		//more than 200ms, use regular buffer
+		else if (ctx->buffer>200) {
+			evt.buffer_req.max_playout_us = evt.buffer_req.max_buffer_us;
+		}
+		//we don't have a max buffer, set buffer requirements to PID only
+		else {
+			evt.buffer_req.pid_only = GF_TRUE;
+		}
 		gf_filter_pid_send_event(pid, &evt);
+	}
+
+	if ((ctx->sr==sr) && (ctx->afmt == afmt) && (ctx->nb_ch == nb_ch) && (ctx->ch_cfg == ch_cfg)) {
+		ctx->needs_recfg = GF_FALSE;
+		ctx->wait_recfg = GF_FALSE;
+		return GF_OK;
+	}
+
+	//whenever change of sample rate / format / channel, force speed setup
+	if ((ctx->sr!=sr) || (ctx->afmt != afmt) || (ctx->nb_ch != nb_ch)) {
+		GF_FilterEvent evt;
+		ctx->speed_set = 0;
 
 		gf_filter_pid_init_play_event(pid, &evt, ctx->start, ctx->speed, "AudioOut");
 		gf_filter_pid_send_event(pid, &evt);
@@ -406,7 +515,7 @@
 	if (p) aout_set_priority(ctx, p->value.uint);
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
-	ctx->pid_delay = p ? p->value.sint : 0;
+	ctx->pid_delay = p ? p->value.longsint : 0;
 
 	ctx->needs_recfg = GF_TRUE;
 	
@@ -462,7 +571,7 @@
 	}
 	if (ctx->audio_out->SelfThreaded) {
 	} else if (ctx->threaded) {
-		ctx->th = gf_th_new("AudioOutput");
+		ctx->th = gf_th_new("gf_aout");
 		gf_th_run(ctx->th, aout_th_proc, ctx);
 	}
 
@@ -487,6 +596,7 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] audio thread stopped\n"));
 			gf_th_del(ctx->th);
 		} else {
+			ctx->aborted = GF_TRUE;
 			ctx->audio_out->Shutdown(ctx->audio_out);
 		}
 		gf_modules_close_interface((GF_BaseInterface *)ctx->audio_out);
@@ -498,6 +608,9 @@
 {
 	GF_AudioOutCtx *ctx = (GF_AudioOutCtx *) gf_filter_get_udta(filter);
 
+	if (ctx->in_error)
+		return GF_IO_ERR;
+
 	if (!ctx->th && ctx->needs_recfg) {
 		aout_reconfig(ctx);
 	}
@@ -531,22 +644,55 @@
 	return GF_TRUE;
 }
 
+GF_Err aout_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val)
+{
+	GF_AudioOutCtx *ctx = (GF_AudioOutCtx *) gf_filter_get_udta(filter);
+
+	if (!strcmp(arg_name, "start")) {
+		if (!ctx->pid) return GF_OK;
+		ctx->do_seek = GF_TRUE;
+	}
+	else if (!strcmp(arg_name, "speed")) {
+		if (ctx->speed != new_val->value.number) {
+			if (new_val->value.number==0) return GF_OK;
+			if ((new_val->value.number==1) && ((ctx->speed==0) || (ctx->speed==1)))
+				return GF_OK;
+			if (ctx->speed_set != 2) {
+				ctx->needs_recfg = GF_TRUE;
+				ctx->speed_set = 0;
+			} else {
+				GF_FilterEvent evt;
+				GF_FEVT_INIT(evt, GF_FEVT_SET_SPEED, ctx->pid)
+				evt.play.speed = new_val->value.number;
+				gf_filter_pid_send_event(ctx->pid, &evt);
+			}
+		}
+	}
+	return GF_OK;
+}
+
+
+
 #define OFFS(_n)	#_n, offsetof(GF_AudioOutCtx, _n)
 
 static const GF_FilterArgs AudioOutArgs[] =
 {
 	{ OFFS(drv), "audio driver name", GF_PROP_NAME, NULL, NULL, 0},
-	{ OFFS(bnum), "number of audio buffers - 0 for auto", GF_PROP_UINT, "2", NULL, 0},
-	{ OFFS(bdur), "total duration of all buffers in ms - 0 for auto. The longer the audio buffer is, the longer the audio latency will be (pause/resume). The quality of fast forward audio playback will also be degradated when using large audio buffers", GF_PROP_UINT, "100", NULL, 0},
+	{ OFFS(bnum), "number of audio buffers (0 for auto)", GF_PROP_UINT, "2", NULL, 0},
+	{ OFFS(bdur), "total duration of all buffers in ms (0 for auto)", GF_PROP_UINT, "100", NULL, 0},
 	{ OFFS(threaded), "force dedicated thread creation if sound card driver is not threaded", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(dur), "only play the specified duration", GF_PROP_FRACTION, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(clock), "hint audio clock for this stream (reports system time and CTS), for other filters to use", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(speed), "set playback speed. If speed is negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
-	{ OFFS(start), "set playback start offset. Negative value means percent of media dur with -1 <=> dur", GF_PROP_DOUBLE, "0.0", NULL, 0},
+	{ OFFS(clock), "hint audio clock for this stream", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(speed), "set playback speed. If speed is negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(start), "set playback start offset. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(vol), "set default audio volume, as a percentage between 0 and 100", GF_PROP_UINT, "100", "0-100", GF_FS_ARG_UPDATE},
 	{ OFFS(pan), "set stereo pan, as a percentage between 0 and 100, 50 being centered", GF_PROP_UINT, "50", "0-100", GF_FS_ARG_UPDATE},
-	{ OFFS(buffer), "set buffer in ms", GF_PROP_UINT, "200", NULL, 0},
+	{ OFFS(buffer), "set playout buffer in ms", GF_PROP_UINT, "200", NULL, 0},
+	{ OFFS(mbuffer), "set max buffer occupancy in ms. If less than buffer, use buffer", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(rbuffer), "rebuffer trigger in ms. If 0 or more than buffer, disable rebuffering", GF_PROP_UINT, "0", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(adelay), "set audio delay in sec", GF_PROP_FRACTION, "0", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{ OFFS(buffer_done), "buffer done indication (readonly, for user app)", GF_PROP_BOOL, NULL, NULL, GF_ARG_HINT_EXPERT},
+	{ OFFS(rebuffer), "system time in us at which last rebuffer started, 0 if not rebuffering (readonly, for user app)", GF_PROP_LUINT, NULL, NULL, GF_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -561,7 +707,11 @@
 GF_FilterRegister AudioOutRegister = {
 	.name = "aout",
 	GF_FS_SET_DESCRIPTION("Audio output")
-	GF_FS_SET_HELP("This filter outputs a single uncompressed audio PID to a soundcard.")
+	GF_FS_SET_HELP("This filter writes a single uncompressed audio input PID to a sound card or other audio output device.\n"
+	"\n"
+	"The longer the audio buffering [-bdur]() is, the longer the audio latency will be (pause/resume). The quality of fast forward audio playback will also be degraded when using large audio buffers.\n"
+	"\n"
+	"If [-clock]() is set, the filter will report system time (in us) and corresponding packet CTS for other filters to use for AV sync.\n")
 	.private_size = sizeof(GF_AudioOutCtx),
 	.args = AudioOutArgs,
 	SETCAPS(AudioOutCaps),
@@ -569,7 +719,8 @@
 	.finalize = aout_finalize,
 	.configure_pid = aout_configure_pid,
 	.process = aout_process,
-	.process_event = aout_process_event
+	.process_event = aout_process_event,
+	.update_arg = aout_update_arg
 };
 
 const GF_FilterRegister *aout_register(GF_FilterSession *session)

gpac-1.0.1.tar.gz/src/filters/out_file.c -> gpac-2.0.0.tar.gz/src/filters/out_file.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / generic FILE output filter
@@ -28,13 +28,22 @@
 #include <gpac/constants.h>
 #include <gpac/xml.h>
 
+enum
+{
+	FOUT_CAT_NONE = 0,
+	FOUT_CAT_AUTO,
+	FOUT_CAT_ALL
+};
+
 typedef struct
 {
 	//options
 	Double start, speed;
 	char *dst, *mime, *ext;
-	Bool append, dynext, cat, ow, redund;
+	Bool append, dynext, ow, redund, noinitraw;
+	u32 cat;
 	u32 mvbk;
+	s32 max_cache_segs;
 
 	//only one input pid
 	GF_FilterPid *pid;
@@ -42,18 +51,23 @@
 	FILE *file;
 	Bool is_std;
 	u64 nb_write;
-
+	Bool use_templates;
 	GF_FilterCapability in_caps[2];
 	char szExt[10];
 	char szFileName[GF_MAX_PATH];
 
 	Bool patch_blocks;
 	Bool is_null;
-	GF_Err is_error;
+	GF_Err error;
 	u32 dash_mode;
 	u64 offset_at_seg_start;
 	const char *original_url;
 	GF_FileIO *gfio_ref;
+
+	FILE *hls_chunk;
+
+	u32 max_segs;
+	GF_List *past_files;
 } GF_FileOutCtx;
 
 #ifdef WIN32
@@ -61,11 +75,20 @@
 #include <fcntl.h>
 #endif //WIN32
 
+static void fileout_close_hls_chunk(GF_FileOutCtx *ctx, Bool final_flush)
+{
+	if (!ctx->hls_chunk) return;
+	gf_fclose(ctx->hls_chunk);
+	ctx->hls_chunk = NULL;
+}
+
 static GF_Err fileout_open_close(GF_FileOutCtx *ctx, const char *filename, const char *ext, u32 file_idx, Bool explicit_overwrite, char *file_suffix)
 {
 	if (ctx->file && !ctx->is_std) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[FileOut] closing output file %s\n", ctx->szFileName));
 		gf_fclose(ctx->file);
+
+		fileout_close_hls_chunk(ctx, GF_FALSE);
 	}
 	ctx->file = NULL;
 
@@ -83,7 +106,7 @@
 #endif
 
 	} else {
-		char szName[GF_MAX_PATH], szFinalName[GF_MAX_PATH];
+		char szFinalName[GF_MAX_PATH];
 		Bool append = ctx->append;
 		const char *url = filename;
 
@@ -93,18 +116,38 @@
 		if (ctx->dynext) {
 			const char *has_ext = gf_file_ext_start(url);
 
-			strcpy(szName, url);
+			strcpy(szFinalName, url);
 			if (!has_ext && ext) {
-				strcat(szName, ".");
-				strcat(szName, ext);
+				strcat(szFinalName, ".");
+				strcat(szFinalName, ext);
 			}
 		} else {
-			strcpy(szName, url);
+			strcpy(szFinalName, url);
+		}
+
+		if (ctx->use_templates) {
+			GF_Err e;
+			char szName[GF_MAX_PATH];
+			assert(ctx->dst);
+			if (!strcmp(filename, ctx->dst)) {
+				strcpy(szName, szFinalName);
+				e = gf_filter_pid_resolve_file_template(ctx->pid, szName, szFinalName, file_idx, file_suffix);
+			} else {
+				char szFileName[GF_MAX_PATH];
+				strcpy(szFileName, szFinalName);
+				strcpy(szName, ctx->dst);
+				e = gf_filter_pid_resolve_file_template_ex(ctx->pid, szName, szFinalName, file_idx, file_suffix, szFileName);
+			}
+			if (e) {
+				return ctx->error = e;
+			}
 		}
-		gf_filter_pid_resolve_file_template(ctx->pid, szName, szFinalName, file_idx, file_suffix);
 
 		if (!gf_file_exists(szFinalName)) append = GF_FALSE;
 
+		if (!strcmp(szFinalName, ctx->szFileName) && (ctx->cat==FOUT_CAT_AUTO))
+			append = GF_TRUE;
+
 		if (!ctx->ow && gf_file_exists(szFinalName) && !append) {
 			char szRes[21];
 			s32 res;
@@ -112,23 +155,23 @@
 			fprintf(stderr, "File %s already exist - override (y/n/a) ?:", szFinalName);
 			res = scanf("%20s", szRes);
 			if (!res || (szRes[0] == 'n') || (szRes[0] == 'N')) {
-				return ctx->is_error = GF_IO_ERR;
+				return ctx->error = GF_IO_ERR;
 			}
 			if ((szRes[0] == 'a') || (szRes[0] == 'A')) ctx->ow = GF_TRUE;
 		}
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[FileOut] opening output file %s\n", szFinalName));
-		ctx->file = gf_fopen_ex(szFinalName, ctx->original_url, append ? "a+b" : "w+b");
+		ctx->file = gf_fopen_ex(szFinalName, ctx->original_url, append ? "a+b" : "w+b", GF_FALSE);
 
-		if (!strcmp(szFinalName, ctx->szFileName) && !ctx->append && ctx->nb_write && !explicit_overwrite) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[FileOut] re-opening in write mode output file %s, content overwrite\n", szFinalName));
+		if (!strcmp(szFinalName, ctx->szFileName) && !append && ctx->nb_write && !explicit_overwrite) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[FileOut] re-opening in write mode output file %s, content overwrite (use `cat` option to enable append)\n", szFinalName));
 		}
 		strcpy(ctx->szFileName, szFinalName);
 	}
 	ctx->nb_write = 0;
 	if (!ctx->file) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] cannot open output file %s\n", ctx->szFileName));
-		return ctx->is_error = GF_IO_ERR;;
+		return ctx->error = GF_IO_ERR;;
 	}
 
 	return GF_OK;
@@ -136,21 +179,46 @@
 
 static void fileout_setup_file(GF_FileOutCtx *ctx, Bool explicit_overwrite)
 {
+	const char *dst = ctx->dst;
 	const GF_PropertyValue *p, *ext;
+
 	p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_OUTPATH);
 	ext = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_FILE_EXT);
 
 	if (p && p->value.string) {
 		fileout_open_close(ctx, p->value.string, (ext && ctx->dynext) ? ext->value.string : NULL, 0, explicit_overwrite, NULL);
-	} else if (ctx->dynext) {
+		return;
+	}
+	if (!dst) {
+		p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_FILEPATH);
+		if (p && p->value.string) {
+			dst = p->value.string;
+			char *sep = strstr(dst, "://");
+			if (sep) {
+				dst = strchr(sep+3, '/');
+				if (!dst) return;
+			} else {
+				if (!strncmp(dst, "./", 2)) dst+= 2;
+				else if (!strncmp(dst, ".\\", 2)) dst+= 2;
+				else if (!strncmp(dst, "../", 3)) dst+= 3;
+				else if (!strncmp(dst, "..\\", 3)) dst+= 3;
+			}
+		}
+	}
+	if (ctx->dynext) {
 		p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PCK_FILENUM);
 		if (!p) {
 			if (ext && ext->value.string) {
-				fileout_open_close(ctx, ctx->dst, ext->value.string, 0, explicit_overwrite, NULL);
+				fileout_open_close(ctx, dst, ext->value.string, 0, explicit_overwrite, NULL);
 			}
 		}
-	} else {
+	} else if (ctx->dst) {
 		fileout_open_close(ctx, ctx->dst, NULL, 0, explicit_overwrite, NULL);
+	} else {
+		p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_FILEPATH);
+		if (!p) p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_URL);
+		if (p && p->value.string)
+			fileout_open_close(ctx, p->value.string, NULL, 0, explicit_overwrite, NULL);
 	}
 }
 static GF_Err fileout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
@@ -176,12 +244,26 @@
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
 	if (p && p->value.uint) ctx->dash_mode = 1;
+
+	ctx->max_segs = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESHIFT_SEGS);
+	if (ctx->max_cache_segs<0) {
+		ctx->max_segs = (u32) -ctx->max_cache_segs;
+	} else if (ctx->max_cache_segs>0) {
+		ctx->max_segs = (u32) ctx->max_cache_segs;
+		if (p && (p->value.uint > (u32) ctx->max_cache_segs))
+			ctx->max_segs = p->value.uint;
+	}
+	if (ctx->max_segs && !ctx->past_files)
+		ctx->past_files = gf_list_new();
+
+	ctx->error = GF_OK;
 	return GF_OK;
 }
 
 static GF_Err fileout_initialize(GF_Filter *filter)
 {
-	char *ext=NULL;
+	char *ext=NULL, *sep;
 	const char *dst;
 	GF_FileOutCtx *ctx = (GF_FileOutCtx *) gf_filter_get_udta(filter);
 
@@ -218,6 +300,12 @@
 		dst = ctx->dst;
 	}
 
+	sep = dst ? strchr(dst, '$') : NULL;
+	if (sep) {
+		sep = strchr(sep+1, '$');
+		if (sep) ctx->use_templates = GF_TRUE;
+	}
+
 	if (ctx->dynext) return GF_OK;
 
 	if (ctx->ext) ext = ctx->ext;
@@ -257,9 +345,20 @@
 {
 	GF_Err e;
 	GF_FileOutCtx *ctx = (GF_FileOutCtx *) gf_filter_get_udta(filter);
+
+	fileout_close_hls_chunk(ctx, GF_TRUE);
+
 	fileout_open_close(ctx, NULL, NULL, 0, GF_FALSE, NULL);
 	if (ctx->gfio_ref)
 		gf_fileio_open_url((GF_FileIO *)ctx->gfio_ref, NULL, "unref", &e);
+
+	if (ctx->past_files) {
+		while (gf_list_count(ctx->past_files)) {
+			char *url = gf_list_pop_back(ctx->past_files);
+			gf_free(url);
+		}
+		gf_list_del(ctx->past_files);
+	}
 }
 
 static GF_Err fileout_process(GF_Filter *filter)
@@ -271,14 +370,8 @@
 	u32 pck_size, nb_write;
 	GF_FileOutCtx *ctx = (GF_FileOutCtx *) gf_filter_get_udta(filter);
 
-	if (ctx->is_error) {
-		GF_Err e = ctx->is_error;
-		if (e != GF_EOS) {
-			gf_filter_pid_set_discard(ctx->pid, GF_TRUE);
-			ctx->is_error = GF_EOS;
-		}
-		return e;
-	}
+	if (ctx->error)
+		return ctx->error;
 
 	pck = gf_filter_pid_get_packet(ctx->pid);
 	if (!pck) {
@@ -295,13 +388,13 @@
 				evt.seg_size.seg_url = NULL;
 
 				if (ctx->dash_mode==1) {
-					evt.seg_size.is_init = GF_TRUE;
+					evt.seg_size.is_init = 1;
 					ctx->dash_mode = 2;
 					evt.seg_size.media_range_start = 0;
 					evt.seg_size.media_range_end = 0;
 					gf_filter_pid_send_event(ctx->pid, &evt);
 				} else {
-					evt.seg_size.is_init = GF_FALSE;
+					evt.seg_size.is_init = 0;
 					evt.seg_size.media_range_start = ctx->offset_at_seg_start;
 					evt.seg_size.media_range_end = gf_ftell(ctx->file)-1;
 					gf_filter_pid_send_event(ctx->pid, &evt);
@@ -314,7 +407,7 @@
 	}
 
 	gf_filter_pck_get_framing(pck, &start, &end);
-	if (!ctx->redund) {
+	if (!ctx->redund && !ctx->dash_mode) {
 		u32 dep_flags = gf_filter_pck_get_dependency_flags(pck);
 		//redundant packet, do not store
 		if ((dep_flags & 0x3) == 1) {
@@ -347,7 +440,7 @@
 		return fileout_process(filter);
 	}
 
-	if (ctx->file && start && ctx->cat)
+	if (ctx->file && start && (ctx->cat==FOUT_CAT_ALL))
 		start = GF_FALSE;
 
 	if (ctx->dash_mode) {
@@ -359,16 +452,16 @@
 			evt.seg_size.seg_url = NULL;
 
 			if (ctx->dash_mode==1) {
-				evt.seg_size.is_init = GF_TRUE;
+				evt.seg_size.is_init = 1;
 				ctx->dash_mode = 2;
 				evt.seg_size.media_range_start = 0;
 				evt.seg_size.media_range_end = 0;
 				gf_filter_pid_send_event(ctx->pid, &evt);
 			} else {
-				evt.seg_size.is_init = GF_FALSE;
+				evt.seg_size.is_init = 0;
 				evt.seg_size.media_range_start = ctx->offset_at_seg_start;
 				evt.seg_size.media_range_end = gf_ftell(ctx->file)-1;
-				ctx->offset_at_seg_start = evt.seg_size.media_range_end;
+				ctx->offset_at_seg_start = evt.seg_size.media_range_end+1;
 				gf_filter_pid_send_event(ctx->pid, &evt);
 			}
 			if ( gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME))
@@ -401,9 +494,29 @@
 
 		if (name) {
 			fileout_open_close(ctx, name, ext ? ext->value.string : NULL, fnum ? fnum->value.uint : 0, explicit_overwrite, fsuf ? fsuf->value.string : NULL);
-		} else if (!ctx->file) {
+		} else if (!ctx->file && !ctx->noinitraw) {
 			fileout_setup_file(ctx, explicit_overwrite);
 		}
+
+		if (ctx->max_segs) {
+			while (gf_list_count(ctx->past_files)>ctx->max_segs) {
+				char *url = gf_list_pop_front(ctx->past_files);
+				gf_file_delete(url);
+				gf_free(url);
+			}
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_INIT);
+			if (!p || !p->value.boolean) {
+				gf_list_add(ctx->past_files, gf_strdup(ctx->szFileName));
+			}
+		}
+	}
+
+	p = gf_filter_pck_get_property(pck, GF_PROP_PCK_HLS_FRAG_NUM);
+	if (p) {
+		char szHLSChunk[GF_MAX_PATH+21];
+		snprintf(szHLSChunk, GF_MAX_PATH+20, "%s.%d", ctx->szFileName, p->value.uint);
+		if (ctx->hls_chunk) gf_fclose(ctx->hls_chunk);
+		ctx->hls_chunk = gf_fopen_ex(szHLSChunk, ctx->original_url, "w+b", GF_FALSE);
 	}
 
 	pck_data = gf_filter_pck_get_data(pck, &pck_size);
@@ -440,7 +553,7 @@
 						pos = cur_w;
 						block = gf_malloc(ctx->mvbk);
 						if (!block) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] unable to allocate blockof %d bytes\n", ctx->mvbk));
+							GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] unable to allocate block of %d bytes\n", ctx->mvbk));
 						} else {
 							while (cur_r > bo) {
 								u32 move_bytes = ctx->mvbk;
@@ -481,6 +594,13 @@
 					GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] Write error, wrote %d bytes but had %d to write\n", nb_write, pck_size));
 				}
 				ctx->nb_write += nb_write;
+
+				if (ctx->hls_chunk) {
+					nb_write = (u32) gf_fwrite(pck_data, pck_size, ctx->hls_chunk);
+					if (nb_write!=pck_size) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] Write error, wrote %d bytes but had %d to write\n", nb_write, pck_size));
+					}
+				}
 			}
 		} else if (hwf) {
 			u32 w, h, stride, stride_uv, pf;
@@ -547,6 +667,7 @@
 		if (ctx->is_null) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[FileOut] null delete (file name was %s)\n", evt->file_del.url));
 		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[FileOut] delete file %s\n", evt->file_del.url));
 			gf_file_delete(evt->file_del.url);
 		}
 		return GF_TRUE;
@@ -573,18 +694,23 @@
 
 static const GF_FilterArgs FileOutArgs[] =
 {
-	{ OFFS(dst), "location of destination file - see filter help ", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(dst), "location of destination file", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(append), "open in append mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(dynext), "indicate the file extension is set by filter chain, not dst", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(start), "set playback start offset. Negative value means percent of media dur with -1 <=> dur", GF_PROP_DOUBLE, "0.0", NULL, 0},
-	{ OFFS(speed), "set playback speed when vsync is on. If speed is negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{ OFFS(start), "set playback start offset. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, 0},
+	{ OFFS(speed), "set playback speed when vsync is on. If negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
 	{ OFFS(ext), "set extension for graph resolution, regardless of file extension", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(mime), "set mime type for graph resolution", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(cat), "cat each file of input pid rather than creating one file per filename", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(cat), "cat each file of input PID rather than creating one file per filename\n"
+			"- none: never cat files\n"
+			"- auto: only cat if files have same names\n"
+			"- all: always cat regardless of file names"
+	, GF_PROP_UINT, "none", "none|auto|all", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ow), "overwrite output if existing", GF_PROP_BOOL, "true", NULL, 0},
 	{ OFFS(mvbk), "block size used when moving parts of the file around in patch mode", GF_PROP_UINT, "8192", NULL, 0},
 	{ OFFS(redund), "keep redundant packet in output file", GF_PROP_BOOL, "false", NULL, 0},
-
+	{ OFFS(noinitraw), "do not produce initial segment", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_HIDE},
+	{ OFFS(max_cache_segs), "maximum number of segments cached per HAS quality when recording live sessions (0 means no limit)", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -598,14 +724,29 @@
 GF_FilterRegister FileOutRegister = {
 	.name = "fout",
 	GF_FS_SET_DESCRIPTION("File output")
-	GF_FS_SET_HELP("The file output filter is used to write output to disk, and does not produce any output PID.\n"
-		"It can work as a null sink when its destination is `null`, dropping all input packets. In this case it accepts ANY type of input pid, not just file ones.\n"
-		"In regular mode, the filter only accept pid of type file. It will dump to file incomming packets (stream type file), starting a new file for each packet having a __frame_start__ flag set, unless operating in [-cat]() mode.\n"
-		"The ouput file name can use gpac templating mechanism, see `gpac -h doc`."
+	GF_FS_SET_HELP("This filter is used to write data to disk, and does not produce any output PID.\n"
+		"In regular mode, the filter only accept PID of type file. It will dump to file incoming packets (stream type file), starting a new file for each packet having a __frame_start__ flag set, unless operating in [-cat]() mode.\n"
+		"If the output file name is `std` or `stdout`, writes to stdout.\n"
+		"The output file name can use gpac templating mechanism, see `gpac -h doc`."
 		"The filter watches the property `FileNumber` on incoming packets to create new files.\n"
+		"\n"
+		"# Discard sink mode\n"
+		"When the destination is `null`, the filter is a sink dropping all input packets.\n"
+		"In this case it accepts ANY type of input PID, not just file ones.\n"
+		"\n"
+		"# HTTP streaming recording\n"
+		"When recording a DASH or HLS session, the number of segments to keep per quality can be set using [-max_cache_segs]().\n"
+		"- value `0` keeps everything (default behaviour)\n"
+		"- a negative value `N` will keep `-N` files regardless of the time-shift buffer value\n"
+		"- a positive value `N` will keep `MAX(N, time-shift buffer)` files\n"
+		"\n"
+		"EX gpac -i LIVE_MPD dashin:forward=file -o rec/$File$:max_cache_segs=3\n"
+		"This will force keeping a maximum of 3 media segments while recording the DASH session.\n"
+		""
 	)
 	.private_size = sizeof(GF_FileOutCtx),
 	.args = FileOutArgs,
+	.flags = GF_FS_REG_FORCE_REMUX,
 	SETCAPS(FileOutCaps),
 	.probe_url = fileout_probe_url,
 	.initialize = fileout_initialize,

gpac-1.0.1.tar.gz/src/filters/out_http.c -> gpac-2.0.0.tar.gz/src/filters/out_http.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019-2020
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / http server and output filter
@@ -33,17 +33,27 @@
 #include <gpac/base_coding.h>
 #include <gpac/network.h>
 
+//socket and SSL context ownership is transfered to the download session object
 GF_DownloadSession *gf_dm_sess_new_server(GF_Socket *server, void *ssl_ctx, gf_dm_user_io user_io, void *usr_cbk, GF_Err *e);
+GF_DownloadSession *gf_dm_sess_new_subsession(GF_DownloadSession *sess, u32 stream_id, void *usr_cbk, GF_Err *e);
+u32 gf_dm_sess_subsession_count(GF_DownloadSession *);
+
+
 GF_Err gf_dm_sess_send(GF_DownloadSession *sess, u8 *data, u32 size);
+void gf_dm_sess_clear_headers(GF_DownloadSession *sess);
+void gf_dm_sess_set_header(GF_DownloadSession *sess, const char *name, const char *value);
+
+GF_Err gf_dm_sess_send_reply(GF_DownloadSession *sess, u32 reply_code, const char *response_body, Bool no_body);
+void gf_dm_sess_server_reset(GF_DownloadSession *sess);
+Bool gf_dm_sess_is_h2(GF_DownloadSession *sess);
+void gf_dm_sess_flush_h2(GF_DownloadSession *sess);
 
 #ifdef GPAC_HAS_SSL
 
 void *gf_ssl_new(void *ssl_server_ctx, GF_Socket *client_sock, GF_Err *e);
-void gf_ssl_del(void *ssl_ctx);
 void *gf_ssl_server_context_new(const char *cert, const char *key);
 void gf_ssl_server_context_del(void *ssl_server_ctx);
 Bool gf_ssl_init_lib();
-GF_Err gf_ssl_write(void *ssl_ctx, const u8 *buffer, u32 size);
 
 #endif
 
@@ -54,13 +64,21 @@
 	MODE_SOURCE,
 };
 
+enum
+{
+	CORS_AUTO=0,
+	CORS_OFF,
+	CORS_ON,
+};
+
 typedef struct
 {
 	//options
 	char *dst, *user_agent, *ifce, *cache_control, *ext, *mime, *wdir, *cert, *pkey, *reqlog;
-	GF_List *rdirs;
+	GF_PropStringList rdirs;
 	Bool close, hold, quit, post, dlist, ice;
-	u32 port, block_size, maxc, maxp, timeout, hmode, sutc, cors;
+	u32 port, block_size, maxc, maxp, timeout, hmode, sutc, cors, max_client_errors;
+	s32 max_cache_segs;
 
 	//internal
 	GF_Filter *filter;
@@ -71,6 +89,7 @@
 	u32 next_wake_us;
 	char *ip;
 	Bool done;
+	struct __httpout_input *dst_in;
 
 	GF_SockGroup *sg;
 	Bool no_etag;
@@ -86,9 +105,13 @@
 	void *ssl_ctx;
 
 	u64 req_id;
+	Bool log_record;
+
+	const char *mem_url;
+	GF_FileIO *mem_fileio;
 } GF_HTTPOutCtx;
 
-typedef struct
+typedef struct __httpout_input
 {
 	GF_HTTPOutCtx *ctx;
 	GF_FilterPid *ipid;
@@ -104,6 +127,7 @@
 
 	//for PUT mode, NULL in server mode
 	GF_DownloadSession *upload;
+	Bool is_h2;
 	u32 cur_header;
 
 	u64 offset_at_seg_start;
@@ -114,8 +138,29 @@
 	char *local_path;
 	FILE *resource;
 
+	FILE *hls_chunk;
+	char *hls_chunk_path, *hls_chunk_local_path;
+
 	u8 *tunein_data;
 	u32 tunein_data_size;
+ 
+ Bool force_dst_name;
+ Bool in_error;
+
+	//max number of files to keep per pid
+	u32 max_segs;
+	//list of past files in non-mem mode
+	GF_List *past_files;
+
+	//list of files created in mem - read-only fileios are not stored here
+	GF_List *mem_files;
+	Bool is_manifest;
+
+	//for PUT mode for LL-HLS SF, NULL in server mode
+	GF_DownloadSession *llhls_upload;
+	u32 llhls_cur_header;
+	Bool llhls_is_open;
+	char *llhls_url;
 } GF_HTTPOutInput;
 
 typedef struct
@@ -131,7 +176,8 @@
 	GF_Socket *socket;
 	GF_DownloadSession *http_sess;
 	char peer_address[GF_MAX_IP_NAME_LEN];
-	void *ssl;
+
+	Bool headers_done;
 
 	u32 play_state;
 	Double start_range;
@@ -145,7 +191,6 @@
 
 	u64 req_start_time;
 	u64 last_active_time;
-	Bool is_head;
 	Bool file_in_progress;
 	Bool use_chunk_transfer;
 	u32 put_in_progress;
@@ -157,37 +202,211 @@
 
 	GF_HTTPOutInput *in_source;
 	Bool send_init_data;
+	Bool in_source_is_ll_hls_chunk;
 
 	u32 nb_ranges, alloc_ranges, range_idx;
 	HTTByteRange *ranges;
 
 	Bool do_log;
 	u64 req_id;
-	u32 method_type, reply_code;
+	u32 method_type, reply_code, nb_consecutive_errors;
+
+	Bool is_h2;
+	Bool sub_sess_pending;
+	Bool canceled;
+
+	Bool force_destroy;
 } GF_HTTPOutSession;
 
-static void httpout_reset_socket(GF_HTTPOutSession *sess)
+/*GF FileIO for mem mode*/
+typedef struct __gf_http_io
 {
-	if (!sess->socket) return;
+	//only for read
+	struct __gf_http_io *parent;
+	u64 pos;
 
-	assert(sess->ctx->nb_connections);
-	sess->ctx->nb_connections--;
+	//only for write
+	u64 size;
+	u8 *data;
+	//source PID
+	GF_HTTPOutInput *in;
+	u32 nb_used;
+	GF_FileIO *fio;
+	Bool hls_ll_chunk, do_remove, is_static;
+} GF_HTTPFileIO;
+
+static void httpio_del(GF_HTTPFileIO *hio)
+{
+	gf_fileio_del(hio->fio);
+	if (hio->data) gf_free(hio->data);
+	gf_free(hio);
+}
+
+static GF_Err httpio_seek(GF_FileIO *fileio, u64 offset, s32 whence)
+{
+	GF_HTTPFileIO *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->parent) return GF_BAD_PARAM;
+	if (whence == SEEK_CUR) ioctx->pos += offset;
+	else if (whence == SEEK_SET) ioctx->pos = offset;
+	else if (whence == SEEK_END) ioctx->pos = ioctx->parent->size - offset;
+	if (ioctx->pos > ioctx->parent->size) return GF_BAD_PARAM;
+	return GF_OK;
+}
+static u32 httpio_read(GF_FileIO *fileio, u8 *buffer, u32 bytes)
+{
+	GF_HTTPFileIO *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->parent) return 0;
+	u32 to_read = bytes;
+	if (to_read > ioctx->parent->size - ioctx->pos)
+		to_read = (u32) (ioctx->parent->size - ioctx->pos);
 
-	gf_sk_group_unregister(sess->ctx->sg, sess->socket);
-#ifdef GPAC_HAS_SSL
-	if (sess->ssl) {
-		gf_ssl_del(sess->ssl);
-		sess->ssl = NULL;
+	if (to_read) {
+		memcpy(buffer, ioctx->parent->data + ioctx->pos, to_read);
+		ioctx->pos += to_read;
 	}
-#endif
-	gf_sk_del(sess->socket);
+	return to_read;
+}
+static u32 httpio_write(GF_FileIO *fileio, u8 *buffer, u32 bytes)
+{
+	GF_HTTPFileIO *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || ioctx->parent) return 0;
+
+	ioctx->data = gf_realloc(ioctx->data, sizeof(u8)*((size_t)ioctx->size+bytes));
+	if (!ioctx->data) return 0;
+	memcpy(ioctx->data + ioctx->size, buffer, bytes);
+	ioctx->size += bytes;
+	ioctx->pos += bytes;
+	return bytes;
+}
+static s64 httpio_tell(GF_FileIO *fileio)
+{
+	GF_HTTPFileIO *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx) return -1;
+	return (s64) ioctx->pos;
+}
+
+//not used but mandatory in constructor
+static Bool httpio_eof(GF_FileIO *fileio)
+{
+	GF_HTTPFileIO *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->parent) return GF_TRUE;
+	if (ioctx->pos == ioctx->parent->size) return GF_TRUE;
+	return GF_FALSE;
+}
+
+static GF_FileIO *httpio_open(GF_FileIO *fileio_ref, const char *url, const char *mode, GF_Err *out_err)
+{
+	u32 i, count;
+	GF_FileIO *gfio=NULL;
+	GF_HTTPFileIO *ioctx = gf_fileio_get_udta(fileio_ref);
+
+	*out_err = GF_OK;
+
+	if (!strcmp(mode, "close")) {
+		//read file io, drop
+		if (ioctx->parent) {
+			GF_HTTPFileIO *par = ioctx->parent;
+			ioctx->parent->nb_used--;
+			httpio_del(ioctx);
+			//last read session on a discarded object, fallthrough to discard parent
+			if (!par->nb_used && par->do_remove) {
+				assert(par->in);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOutIO] delete old version of input file %s\n", gf_fileio_resource_url(ioctx->fio) ));
+				gf_list_del_item(par->in->mem_files, par);
+				httpio_del(par);
+			}
+			return NULL;
+		}
+		//write file io
+		assert(ioctx->in);
+
+		//purge old files
+		count = gf_list_count(ioctx->in->mem_files);
+		if (count > ioctx->in->max_segs) count -= ioctx->in->max_segs;
+		else count = 0;
+
+		for (i=0; i<count; i++) {
+			GF_HTTPFileIO *old = gf_list_get(ioctx->in->mem_files, i);
+			//static file (init seg, manifest), do not purge
+			if (old->is_static) continue;
+			//stop at first used io, or first HLS low latency chunk, if any
+			if (old->nb_used || old->hls_ll_chunk) break;
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOutIO] remove %s in write mode, exceed max_cache_seg %d\n", gf_fileio_resource_url(old->fio), count));
+			gf_list_rem(ioctx->in->mem_files, i);
+			httpio_del(old);
+			i--;
+			count--;
+		}
+		//keep active
+		return NULL;
+	}
+
+	if (!strcmp(mode, "wb")) {
+		GF_SAFEALLOC(ioctx, GF_HTTPFileIO);
+		if (!ioctx) {
+			*out_err = GF_OUT_OF_MEM;
+			return NULL;
+		}
+
+		gfio = gf_fileio_new((char *)url, ioctx, httpio_open, httpio_seek, httpio_read, httpio_write, httpio_tell, httpio_eof, NULL);
+		if (!gfio) {
+			gf_free(ioctx);
+			*out_err = GF_OUT_OF_MEM;
+		}
+		ioctx->fio = gfio;
+	}
+	if (!strcmp(mode, "rb")) {
+		GF_SAFEALLOC(ioctx, GF_HTTPFileIO);
+		if (!ioctx) {
+			*out_err = GF_OUT_OF_MEM;
+			return NULL;
+		}
+		//in read mode, the url given as parent is the gfio:// of the file
+		ioctx->parent = gf_fileio_get_udta(fileio_ref);
+		ioctx->parent->nb_used++;
+
+		gfio = gf_fileio_new((char *) gf_fileio_resource_url(fileio_ref), ioctx, httpio_open, httpio_seek, httpio_read, NULL, httpio_tell, httpio_eof, NULL);
+		if (!gfio) {
+			gf_free(ioctx);
+			*out_err = GF_OUT_OF_MEM;
+		}
+		ioctx->fio = gfio;
+	}
+	return gfio;
+}
+
+static void httpout_close_session(GF_HTTPOutSession *sess)
+{
+	Bool last_connection = GF_TRUE;
+	if (!sess->http_sess) return;
+
+	if (sess->is_h2) {
+		u32 nb_sub_sess = gf_dm_sess_subsession_count(sess->http_sess);
+		if (nb_sub_sess > 1) {
+			last_connection = GF_FALSE;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOut] %d sub-sessions still active in connection to %s, keeping alive\n", nb_sub_sess-1, sess->peer_address ));
+		}
+		else {
+			gf_dm_sess_flush_h2(sess->http_sess);
+		}
+	}
+	if (last_connection) {
+		assert(sess->ctx->nb_connections);
+		sess->ctx->nb_connections--;
+
+		gf_sk_group_unregister(sess->ctx->sg, sess->socket);
+	}
+
+	gf_dm_sess_del(sess->http_sess);
+	sess->http_sess = NULL;
 	sess->socket = NULL;
+
 	if (sess->in_source) sess->in_source->nb_dest--;
 }
 
-static void httpout_insert_date(u64 time, char **headers, Bool for_listing)
+static void httpout_format_date(u64 time, char szDate[200], Bool for_listing)
 {
-	char szDate[200];
 	time_t gtime;
 	struct tm *t;
 	const char *wday, *month;
@@ -225,12 +444,8 @@
 
 	if (for_listing) {
 		sprintf(szDate, "%02d-%s-%d %02d:%02d:%02d", t->tm_mday, month, 1900 + t->tm_year, t->tm_hour, t->tm_min, sec);
-		gf_dynstrcat(headers, szDate, NULL);
 	} else {
 		sprintf(szDate, "%s, %02d %s %d %02d:%02d:%02d GMT", wday, t->tm_mday, month, 1900 + t->tm_year, t->tm_hour, t->tm_min, sec);
-		gf_dynstrcat(headers, "Date: ", NULL);
-		gf_dynstrcat(headers, szDate, NULL);
-		gf_dynstrcat(headers, "\r\n", NULL);
 	}
 }
 
@@ -262,8 +477,11 @@
 		name_len++;
 		gf_dynstrcat(listing, " ", NULL);
 	}
-	if (file_info)
-		httpout_insert_date(file_info->last_modified*1000, listing, GF_TRUE);
+	if (file_info) {
+		char szDate[200];
+		httpout_format_date(file_info->last_modified/1000, szDate, GF_TRUE);
+		gf_dynstrcat(listing, szDate, NULL);
+	}
 
 	if (is_dir || !file_info) {
 		gf_dynstrcat(listing, " -\n", NULL);
@@ -293,7 +511,7 @@
 {
 	char szHost[GF_MAX_IP_NAME_LEN];
 	char *has_par, *dir;
-	u32 i, count = gf_list_count(ctx->rdirs);
+	u32 i, count = ctx->rdirs.nb_items;
 	char *listing = NULL;
 	char *name = full_path;
 
@@ -321,7 +539,7 @@
 		//retranslate server root
 		gf_dynstrcat(&listing, ".. <a href=\"", NULL);
 		for (i=0; i<count; i++) {
-			dir = gf_list_get(ctx->rdirs, i);
+			dir = ctx->rdirs.vals[i];
 			u32 dlen = (u32) strlen(dir);
 			if (!strncmp(dir, name, dlen) && ((name[dlen]=='/') || (name[dlen]==0))) {
 				gf_dynstrcat(&listing, "/", NULL);
@@ -338,14 +556,14 @@
 	}
 
 	if (!full_path || !strlen(full_path)) {
-		count = gf_list_count(ctx->rdirs);
+		count = ctx->rdirs.nb_items;
 		if (count==1) {
-			dir = gf_list_get(ctx->rdirs, 0);
+			dir = ctx->rdirs.vals[0];
 			gf_enum_directory(dir, GF_TRUE, httpout_dir_enum, &listing, NULL);
 			gf_enum_directory(dir, GF_FALSE, httpout_file_enum, &listing, NULL);
 		} else {
 			for (i=0; i<count; i++) {
-				dir = gf_list_get(ctx->rdirs, i);
+				dir = ctx->rdirs.vals[i];
 				httpout_dir_file_enum(&listing, dir, NULL, NULL, GF_TRUE);
 			}
 		}
@@ -353,7 +571,7 @@
 		Bool insert_root = GF_FALSE;
 		if (count>1) {
 			for (i=0; i<count; i++) {
-				dir = gf_list_get(ctx->rdirs, i);
+				dir = ctx->rdirs.vals[i];
 				if (!strcmp(full_path, dir)) {
 					insert_root=GF_TRUE;
 					break;
@@ -386,9 +604,9 @@
 	u32 len;
 	assert(in->path);
 	//not recording
-	if (!ctx->rdirs) return;
+	if (!ctx->rdirs.nb_items) return;
 
-	dir = gf_list_get(ctx->rdirs, 0);
+	dir = ctx->rdirs.vals[0];
 	if (!dir) return;
 	len = (u32) strlen(dir);
 	if (in->local_path) gf_free(in->local_path);
@@ -396,7 +614,10 @@
 	gf_dynstrcat(&in->local_path, dir, NULL);
 	if (!strchr("/\\", dir[len-1]))
 		gf_dynstrcat(&in->local_path, "/", NULL);
-	gf_dynstrcat(&in->local_path, in->path+1, NULL);
+ if (in->path[0]=='/')
+ gf_dynstrcat(&in->local_path, in->path+1, NULL);
+ else
+ gf_dynstrcat(&in->local_path, in->path, NULL);
 }
 
 static Bool httpout_sess_parse_range(GF_HTTPOutSession *sess, char *range)
@@ -411,7 +632,7 @@
 	sess->range_idx = 0;
 	if (!range) return GF_TRUE;
 
-	if (sess->in_source && !sess->ctx->rdirs)
+	if (sess->in_source && !sess->ctx->rdirs.nb_items)
 		return GF_FALSE;
 
 	while (range) {
@@ -478,7 +699,7 @@
 	}
 	if (!request_ok) return GF_FALSE;
 
-	if (sess->in_source) {
+	if (sess->in_source && !sess->resource) {
 		//cannot fetch end of file it is not yet known !
 		if (has_file_end) return GF_FALSE;
 		known_file_size = sess->in_source->nb_write;
@@ -516,25 +737,19 @@
 	if ((sess->nb_ranges == 1) && known_file_size && !sess->ranges[0].start && (sess->ranges[0].end==known_file_size-1))
 		sess->nb_ranges = 0;
 
-	if (!request_ok) return GF_FALSE;
+	if (!request_ok) {
+		if (!sess->in_source || (sess->nb_ranges>1))
+			return GF_FALSE;
+		//source in progress, we accept single range - note that this could be further refined by postponing the request until the source
+		//is done or has written the requested byte range, however this will delay sending chunk in LL-HLS byterange ...
+		//for now, since we use chunk transfer in this case, we will send less data than asked and close resource using last 0-size chunk
+	}
 	sess->file_pos = sess->ranges[0].start;
-	if (sess->resource) gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
+	if (sess->resource)
+		gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
 	return GF_TRUE;
 }
 
-GF_Err httpout_sess_send(GF_HTTPOutSession *sess, const u8 *buffer, u32 length)
-{
-	GF_Err e;
-#ifdef GPAC_HAS_SSL
-	if (sess->ssl) {
-		e = gf_ssl_write(sess->ssl, buffer, length);
-	} else
-#endif
-		e = gf_sk_send(sess->socket, buffer, length);
-
-	return e;
-}
-
 static Bool httpout_do_log(GF_HTTPOutSession *sess, u32 method)
 {
 	if (!sess->ctx->reqlog) return GF_FALSE;
@@ -583,31 +798,78 @@
 }
 #endif //GPAC_DISABLE_LOG
 
+GF_Err httpout_new_subsession(GF_HTTPOutSession *sess, u32 stream_id)
+{
+	GF_HTTPOutSession *sub_sess;
+	GF_Err e;
+	//warning, sess->is_h2 might not be set yet
+	if (!sess || !sess->http_sess || !gf_dm_sess_is_h2(sess->http_sess))
+		return GF_BAD_PARAM;
+
+	sess->is_h2 = GF_TRUE;
+	GF_SAFEALLOC(sub_sess, GF_HTTPOutSession);
+	if (!sub_sess) return GF_OUT_OF_MEM;
+	sub_sess->socket = sess->socket;
+	sub_sess->ctx = sess->ctx;
+	//mark the subsession as being h2 right away so that we can process it even if no pending data on socket (cf httpout_process_session)
+	sub_sess->is_h2 = GF_TRUE;
+	strcpy(sub_sess->peer_address, sess->peer_address);
+	sub_sess->http_sess = gf_dm_sess_new_subsession(sess->http_sess, stream_id, sub_sess, &e);
+	if (!sub_sess->http_sess) {
+		gf_free(sub_sess);
+		return e;
+	}
+	gf_list_add(sess->ctx->sessions, sub_sess);
+	gf_list_add(sess->ctx->active_sessions, sub_sess);
+	sess->sub_sess_pending = GF_TRUE;
+	return GF_OK;
+}
+
+
 static void httpout_sess_io(void *usr_cbk, GF_NETIO_Parameter *parameter)
 {
-	char *rsp_buf = NULL;
-	const char *url="";
+	const char *durl="";
+	char *url=NULL;
 	char *full_path=NULL;
-	char *response = NULL;
 	char szFmt[100];
+	char szDate[200];
+	char szRange[200];
 	char szETag[100];
 	u64 modif_time=0;
 	u32 body_size=0;
 	const char *etag=NULL, *range=NULL;
 	const char *mime = NULL;
+	char *cors_origin = NULL;
 	char *response_body = NULL;
 	GF_Err e=GF_OK;
 	Bool not_modified = GF_FALSE;
 	Bool is_upload = GF_FALSE;
+	Bool is_options = GF_FALSE;
+	Bool is_head = GF_FALSE;
+	Bool no_body = GF_FALSE;
+	Bool send_cors;
 	u32 i, count;
 	GF_HTTPOutInput *source_pid = NULL;
+	Bool source_pid_is_ll_hls_chunk = GF_FALSE;
 	GF_HTTPOutSession *source_sess = NULL;
 	GF_HTTPOutSession *sess = usr_cbk;
 
+	if (parameter->msg_type == GF_NETIO_REQUEST_SESSION) {
+		parameter->error = httpout_new_subsession(sess, parameter->reply);
+		return;
+	}
+	if (parameter->msg_type == GF_NETIO_CANCEL_STREAM) {
+		sess->canceled = GF_TRUE;
+		return;
+	}
+
 	if (parameter->msg_type != GF_NETIO_PARSE_REPLY) {
 		parameter->error = GF_BAD_PARAM;
 		return;
 	}
+
+	send_cors = GF_FALSE;
+	sess->reply_code = 0;
 	switch (parameter->reply) {
 	case GF_HTTP_GET:
 	case GF_HTTP_HEAD:
@@ -617,23 +879,31 @@
 	case GF_HTTP_DELETE:
 		is_upload = GF_TRUE;
 		break;
+	case GF_HTTP_OPTIONS:
+		is_options = GF_TRUE;
+		break;
 	default:
-		response = "HTTP/1.1 501 Not Implemented\r\n";
+		sess->reply_code = 501;
 		gf_dynstrcat(&response_body, "Method is not supported by GPAC", NULL);
 		goto exit;
 	}
-	url = gf_dm_sess_get_resource_name(sess->http_sess);
-	if (!url || (url[0] != '/')) {
-		response = "HTTP/1.1 400 Bad Request\r\n";
+	durl = gf_dm_sess_get_resource_name(sess->http_sess);
+	if (!durl || (durl[0] != '/')) {
+		sess->reply_code = 400;
 		goto exit;
 	}
+	url = gf_url_percent_decode(durl);
 
+	sess->file_pos = 0;
+	sess->file_size = 0;
+	sess->bytes_in_req = 0;
+	sess->nb_ranges = 0;
 	sess->do_log = httpout_do_log(sess, parameter->reply);
 
 	//resolve name against upload dir
 	if (is_upload) {
 		if (!sess->ctx->wdir && (sess->ctx->hmode!=MODE_SOURCE)) {
-			response = "HTTP/1.1 405 Not Allowed\r\n";
+			sess->reply_code = 405;
 			gf_dynstrcat(&response_body, "No write directory enabled on server", NULL);
 			goto exit;
 		}
@@ -667,6 +937,8 @@
 		hdr = gf_dm_sess_get_header(sess->http_sess, "Transfer-Encoding");
 		if (hdr && !strcmp(hdr, "chunked")) {
 			sess->use_chunk_transfer = GF_TRUE;
+		} else if (!sess->is_h2) {
+			sess->is_h2 = gf_dm_sess_is_h2(sess->http_sess);
 		}
 		sess->file_in_progress = GF_FALSE;
 		sess->nb_bytes = 0;
@@ -680,7 +952,7 @@
 		if (sess->ctx->hmode==MODE_SOURCE) {
 			if (range) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] Cannot handle PUT/POST request as PID output with byte ranges (%s)\n", range));
-				response = "416 Requested Range Not Satisfiable\r\n";
+				sess->reply_code = 416;
 				gf_dynstrcat(&response_body, "Server running in source mode - cannot handle PUT/POST request with byte ranges ", NULL);
 				gf_dynstrcat(&response_body, range, NULL);
 				goto exit;
@@ -695,12 +967,12 @@
 
 			sess->resource = gf_fopen(sess->path, range ? "rb+" : "wb");
 			if (!sess->resource) {
-				response = "HTTP/1.1 403 Forbidden\r\n";
+				sess->reply_code = 403;
 				gf_dynstrcat(&response_body, "File exists but cannot be open", NULL);
 				goto exit;
 			}
-			if (!sess->content_length && !sess->use_chunk_transfer) {
-				response = "HTTP/1.1 411 Length Required\r\n";
+			if (!sess->content_length && !sess->use_chunk_transfer && !sess->is_h2) {
+				sess->reply_code = 411;
 				gf_dynstrcat(&response_body, "No content length specified and chunked transfer not enabled", NULL);
 				goto exit;
 			}
@@ -711,7 +983,7 @@
 		range = gf_dm_sess_get_header(sess->http_sess, "Range");
 		if (! httpout_sess_parse_range(sess, (char *) range) ) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] Unsupported Range format: %s\n", range));
-			response = "416 Requested Range Not Satisfiable\r\n";
+			sess->reply_code = 416;
 			gf_dynstrcat(&response_body, "Range format is not supported, only \"bytes\" units allowed: ", NULL);
 			gf_dynstrcat(&response_body, range, NULL);
 			goto exit;
@@ -729,13 +1001,16 @@
 			sess->req_id = ++sess->ctx->req_id;
 			sess->method_type = parameter->reply;
 			if (range) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#%d %s %s %s [range: %s] start\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1, range));
+				GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#"LLU" %s %s %s [range: %s] start%s\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1, range, sess->use_chunk_transfer ? " chunk-transfer" : ""));
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#%d %s %s %s start\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1));
+				GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#"LLU" %s %s %s start%s\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1, sess->use_chunk_transfer ? " chunk-transfer" : ""));
 			}
 		}
+		sess->nb_consecutive_errors = 0;
 		sess->req_start_time = gf_sys_clock_high_res();
-		//send reply once we are done recieving
+		if (url) gf_free(url);
+		gf_dm_sess_clear_headers(sess->http_sess);
+		//send reply once we are done receiving
 		return;
 	}
 
@@ -747,19 +1022,39 @@
 
 	for (i=0; i<count; i++) {
 		GF_HTTPOutInput *in = gf_list_get(sess->ctx->inputs, i);
+		assert(in->path[0] == '/');
 		//matching name and input pid not done: file has been created and is in progress
 		//if input pid done, try from file
 		if (!strcmp(in->path, url) && !in->done) {
 			source_pid = in;
 			break;
 		}
+		if (in->hls_chunk_path && !strcmp(in->hls_chunk_path, url) && !in->done) {
+			source_pid = in;
+			source_pid_is_ll_hls_chunk = GF_TRUE;
+			break;
+		}
+		if (in->mem_files) {
+			u32 j, count2 = gf_list_count(in->mem_files);
+			for (j=0; j<count2; j++) {
+				GF_HTTPFileIO *hio = gf_list_get(in->mem_files, j);
+				if (hio->do_remove) continue;
+				const char *fio_url = gf_fileio_resource_url(hio->fio);
+				//skip "gmem"
+				if (fio_url && !strcmp(fio_url+4, url)) {
+					gf_dynstrcat(&full_path, gf_fileio_url(hio->fio), NULL);
+					break;
+				}
+			}
+			if (full_path) break;
+		}
 	}
 
 	/*not resolved and no source matching, check file on disk*/
 	if (!source_pid && !full_path) {
-		count = gf_list_count(sess->ctx->rdirs);
+		count = sess->ctx->rdirs.nb_items;
 		for (i=0; i<count; i++) {
-			char *mdir = gf_list_get(sess->ctx->rdirs, i);
+			char *mdir = sess->ctx->rdirs.vals[i];
 			u32 len = (u32) strlen(mdir);
 			if (!len) continue;
 			if (count==1) {
@@ -776,10 +1071,28 @@
 		}
 	}
 
+	cors_origin = (char *) gf_dm_sess_get_header(sess->http_sess, "Origin");
+	switch (sess->ctx->cors) {
+	case CORS_ON:
+		send_cors = GF_TRUE;
+		break;
+	case CORS_AUTO:
+		if (cors_origin != NULL) {
+			send_cors = GF_TRUE;
+			break;
+		}
+	default:
+		send_cors = GF_FALSE;
+		break;
+	}
+	if (is_options && (!url || !strcmp(url, "*"))) {
+		sess->reply_code = 204;
+		goto exit;
+	}
+
 	if (!full_path && !source_pid) {
 		if (!sess->ctx->dlist || strcmp(url, "/")) {
 			sess->reply_code = 404;
-			response = "HTTP/1.1 404 Not Found\r\n";
 			gf_dynstrcat(&response_body, "Resource ", NULL);
 			gf_dynstrcat(&response_body, url, NULL);
 			gf_dynstrcat(&response_body, " cannot be resolved", NULL);
@@ -787,6 +1100,11 @@
 		}
 	}
 
+	if (is_options) {
+		sess->reply_code = 200;
+		goto exit;
+	}
+
 	//check if request is HEAD or GET on a file being uploaded
 	if (full_path && ((parameter->reply == GF_HTTP_GET) || (parameter->reply == GF_HTTP_HEAD))) {
 		count = gf_list_count(sess->ctx->sessions);
@@ -799,6 +1117,8 @@
 		}
 	}
 
+	szETag[0] = 0;
+
 	//session is on an active input being uploaded, always consider as modified
 	if (source_pid && !sess->ctx->single_mode) {
 		etag = NULL;
@@ -810,8 +1130,10 @@
 	//check ETag
 	else if (full_path) {
 		modif_time = gf_file_modification_time(full_path);
-		sprintf(szETag, LLU, modif_time);
-		etag = gf_dm_sess_get_header(sess->http_sess, "If-None-Match");
+		if (modif_time) {
+			sprintf(szETag, LLU, modif_time);
+			etag = gf_dm_sess_get_header(sess->http_sess, "If-None-Match");
+		}
 	}
 
 	range = gf_dm_sess_get_header(sess->http_sess, "Range");
@@ -827,6 +1149,7 @@
 	sess->upload_type = 0;
 
 	if (parameter->reply==GF_HTTP_DELETE) {
+		no_body = GF_TRUE;
 		sess->upload_type = 0;
 		if (sess->path) gf_free(sess->path);
 		sess->path = full_path;
@@ -834,25 +1157,28 @@
 		sess->resource = NULL;
 		sess->file_pos = sess->file_size = 0;
 
-		if (gf_file_exists(full_path)) {
+		if (sess->ctx->mem_url) {
+			e = GF_NOT_SUPPORTED;
+		}
+		else if (gf_file_exists(full_path)) {
 			e = gf_file_delete(full_path);
 
 			if (e) {
 				sess->reply_code = 500;
 				GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] Error deleting file %s (full path %s)\n", url, full_path));
-				response = "HTTP/1.1 500 Internal Server Error\r\n";
+				sess->reply_code = 500;
 				gf_dynstrcat(&response_body, "Error while deleting ", NULL);
 				gf_dynstrcat(&response_body, url, NULL);
 				gf_dynstrcat(&response_body, ": ", NULL);
 				gf_dynstrcat(&response_body, gf_error_to_string(e), NULL);
 				goto exit;
-			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOut] Deleting file %s (full path %s)\n", url, full_path));
 			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOut] Deleting file %s (full path %s)\n", url, full_path));
 
 			if (sess->do_log) {
 				sess->req_id = ++sess->ctx->req_id;
-				GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#%d %s DELETE %s\n", sess->req_id, sess->peer_address, url+1));
+				GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#"LLU" %s DELETE %s\n", sess->req_id, sess->peer_address, url+1));
+				sess->do_log = GF_FALSE;
 			}
 		} else {
 			e = GF_URL_ERROR;
@@ -864,8 +1190,8 @@
 		if (sess->path) gf_free(sess->path);
 		sess->path = NULL;
 		sess->in_source = source_pid;
-		sess->send_init_data = GF_TRUE;
 		source_pid->nb_dest++;
+		sess->send_init_data = GF_TRUE;
 		source_pid->hold = GF_FALSE;
 
 		sess->file_pos = sess->file_size = 0;
@@ -877,23 +1203,30 @@
 		sess->path = full_path;
 		not_modified = GF_TRUE;
 	}
-	/*we have the same URL and no associated source*/
-	else if (!sess->in_source && (sess->last_file_modif == modif_time) && sess->path && full_path && !strcmp(sess->path, full_path) ) {
+	/*we have the same URL, source file is setup and not modified, no need to resetup - byte-range is setup after */
+	else if (!sess->in_source && sess->resource && (sess->last_file_modif == modif_time) && sess->path && full_path && !strcmp(sess->path, full_path) ) {
 		gf_free(full_path);
 		sess->file_pos = 0;
-	} else {
+	}
+	else {
 		if (sess->path) gf_free(sess->path);
 		if (source_pid) {
+			//source_pid->resource may be NULL at this point (PID created but no data written yet), typically happens on manifest PIDs or init segments
 			sess->in_source = source_pid;
 			source_pid->nb_dest++;
 			source_pid->hold = GF_FALSE;
 			sess->send_init_data = GF_TRUE;
+			sess->in_source_is_ll_hls_chunk = source_pid_is_ll_hls_chunk;
 
 			sess->file_in_progress = GF_TRUE;
 			assert(!full_path);
 			assert(source_pid->local_path);
-			full_path = gf_strdup(source_pid->local_path);
+			if (source_pid_is_ll_hls_chunk)
+				full_path = gf_strdup(source_pid->hls_chunk_local_path);
+			else
+				full_path = gf_strdup(source_pid->local_path);
 			sess->use_chunk_transfer = GF_TRUE;
+			sess->file_size = 0;
 		}
 		sess->path = full_path;
 		if (!full_path || gf_dir_exists(full_path)) {
@@ -906,27 +1239,31 @@
 				}
 				sess->file_size = sess->file_pos = 0;
 			} else {
-				response = "HTTP/1.1 403 Forbidden\r\n";
+				sess->reply_code = 403;
 				gf_dynstrcat(&response_body, "Directory browsing is not allowed", NULL);
 				goto exit;
 			}
 		} else {
+			//no need to use gf_fopen_ex in mem mode, since the fullpath is the gfio:// URL of the mem resource
 			sess->resource = gf_fopen(full_path, "rb");
 			//we may not have the file if it is currently being created
 			if (!sess->resource && !sess->in_source) {
-				response = "HTTP/1.1 500 Internal Server Error\r\n";
+				sess->reply_code = 500;
 				gf_dynstrcat(&response_body, "File exists but no read access", NULL);
 				goto exit;
 			}
+			//warning, sess->resource may still be NULL here !
 
-			if (!sess->in_source) {
+			mime = source_pid ? source_pid->mime : NULL;
+			//probe for mime
+			if (!mime && sess->resource) {
 				u8 probe_buf[5001];
 				u32 read = (u32) gf_fread(probe_buf, 5000, sess->resource);
 				if ((s32) read < 0) {
 					if (source_sess) {
 						read = 0;
 					} else {
-						response = "HTTP/1.1 500 Internal Server Error\r\n";
+						sess->reply_code = 500;
 						gf_dynstrcat(&response_body, "File opened but read operation failed", NULL);
 						goto exit;
 					}
@@ -935,15 +1272,15 @@
 					probe_buf[read] = 0;
 					mime = gf_filter_probe_data(sess->ctx->filter, probe_buf, read);
 				}
-
+			}
+			if (source_sess) {
+				sess->file_size = 0;
+				sess->use_chunk_transfer = GF_TRUE;
+				sess->put_in_progress = 1;
+			} else if (sess->resource) {
+				//get file size, might be incomplete if file writing is in progress
 				sess->file_size = gf_fsize(sess->resource);
-				if (source_sess) {
-					sess->file_size = 0;
-					sess->use_chunk_transfer = GF_TRUE;
-					sess->put_in_progress = 1;
-				}
 			} else {
-				mime = source_pid ? source_pid->mime : NULL;
 				sess->file_size = 0;
 			}
 		}
@@ -955,106 +1292,114 @@
 		sess->last_file_modif = gf_file_modification_time(full_path);
 	}
 
-	if (!sess->in_source && ! httpout_sess_parse_range(sess, (char *) range) ) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] Unsupported Range format: %s", range));
-		response = "416 Requested Range Not Satisfiable\r\n";
+	//parse byte range except if associated input in single mode where byte ranges are ignored
+	if ( (!sess->in_source || !sess->ctx->single_mode) && ! httpout_sess_parse_range(sess, (char *) range) ) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] Unsupported Range format: %s\n", range));
+		sess->reply_code = 416;
 		gf_dynstrcat(&response_body, "Range format is not supported, only \"bytes\" units allowed: ", NULL);
 		gf_dynstrcat(&response_body, range, NULL);
 		goto exit;
 	}
 
 	if (not_modified) {
-		gf_dynstrcat(&rsp_buf, "HTTP/1.1 304 Not Modified\r\n", NULL);
 		sess->reply_code = 304;
 	} else if (sess->nb_ranges) {
-		gf_dynstrcat(&rsp_buf, "HTTP/1.1 206 Partial Content\r\n", NULL);
 		sess->reply_code = 206;
 	} else if ((parameter->reply==GF_HTTP_DELETE) && (e==GF_URL_ERROR)) {
-		gf_dynstrcat(&rsp_buf, "HTTP/1.1 204 No Content\r\n", NULL);
 		sess->reply_code = 204;
 	} else {
-		gf_dynstrcat(&rsp_buf, "HTTP/1.1 200 OK\r\n", NULL);
 		sess->reply_code = 200;
 	}
-	gf_dynstrcat(&rsp_buf, "Server: ", NULL);
-	gf_dynstrcat(&rsp_buf, sess->ctx->user_agent, NULL);
-	gf_dynstrcat(&rsp_buf, "\r\n", NULL);
-	httpout_insert_date(gf_net_get_utc(), &rsp_buf, GF_FALSE);
-	if (sess->ctx->cors) {
-		gf_dynstrcat(&rsp_buf, "Access-Control-Allow-Origin: *\r\n", NULL);
-		gf_dynstrcat(&rsp_buf, "Access-Control-Expose-Headers: *\r\n", NULL);
+
+	//copy range for logs before resetting session headers
+	if (sess->do_log && range) {
+		strncpy(szRange, range, 199);
+		szRange[199] = 0;
+	} else {
+		szRange[0] = 0;
+	}
+	//copy cors origin
+	if (cors_origin)
+		cors_origin = gf_strdup(cors_origin);
+
+	gf_dm_sess_clear_headers(sess->http_sess);
+
+	gf_dm_sess_set_header(sess->http_sess, "Server", sess->ctx->user_agent);
+
+	httpout_format_date(gf_net_get_utc(), szDate, GF_FALSE);
+	gf_dm_sess_set_header(sess->http_sess, "Date", szDate);
+
+	if (send_cors) {
+		gf_dm_sess_set_header(sess->http_sess, "Access-Control-Allow-Origin", cors_origin ? cors_origin : "*");
+		gf_dm_sess_set_header(sess->http_sess, "Access-Control-Expose-Headers", "*");
 	}
+	if (cors_origin) gf_free(cors_origin);
+
 	if (sess->ctx->sutc) {
-		sprintf(szFmt, "Server-UTC: "LLU"\r\n", gf_net_get_utc());
-		gf_dynstrcat(&rsp_buf, szFmt, NULL);
+		sprintf(szFmt, LLU, gf_net_get_utc() );
+		gf_dm_sess_set_header(sess->http_sess, "Server-UTC", szFmt);
 	}
 
-	sess->is_head = (parameter->reply == GF_HTTP_HEAD) ? GF_TRUE : GF_FALSE;
+	if (parameter->reply == GF_HTTP_HEAD) {
+		is_head = GF_TRUE;
+		no_body = GF_TRUE;
+	}
 
 	if (sess->ctx->close) {
-		gf_dynstrcat(&rsp_buf, "Connection: close\r\n", NULL);
+		gf_dm_sess_set_header(sess->http_sess, "Connection", "close");
 	} else {
-		gf_dynstrcat(&rsp_buf, "Connection: keep-alive\r\n", NULL);
+		gf_dm_sess_set_header(sess->http_sess, "Connection", "keep-alive");
 		if (sess->ctx->timeout) {
 			sprintf(szFmt, "timeout=%d", sess->ctx->timeout);
-			gf_dynstrcat(&rsp_buf, "Keep-Alive: ", NULL);
-			gf_dynstrcat(&rsp_buf, szFmt, NULL);
-			gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+			gf_dm_sess_set_header(sess->http_sess, "Keep-Alive", szFmt);
 		}
 	}
 
 	if (response_body) {
 		body_size = (u32) strlen(response_body);
-		gf_dynstrcat(&rsp_buf, "Content-Type: text/html\r\n", NULL);
-		gf_dynstrcat(&rsp_buf, "Content-Length: ", NULL);
+		gf_dm_sess_set_header(sess->http_sess, "Content-Type", "text/html");
 		sprintf(szFmt, "%d", body_size);
-		gf_dynstrcat(&rsp_buf, szFmt, NULL);
-		gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+		gf_dm_sess_set_header(sess->http_sess, "Content-Length", szFmt);
 	}
 	//for HEAD/GET only
 	else if (!not_modified && (parameter->reply!=GF_HTTP_DELETE) ) {
-		if (!sess->in_source && !sess->ctx->no_etag) {
-			gf_dynstrcat(&rsp_buf, "ETag: ", NULL);
-			gf_dynstrcat(&rsp_buf, szETag, NULL);
-			gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+		if (!sess->in_source && !sess->ctx->no_etag && szETag[0]) {
+			gf_dm_sess_set_header(sess->http_sess, "ETag", szETag);
 			if (sess->ctx->cache_control) {
-				gf_dynstrcat(&rsp_buf, "Cache-Control: ", NULL);
-				gf_dynstrcat(&rsp_buf, sess->ctx->cache_control, NULL);
-				gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+				gf_dm_sess_set_header(sess->http_sess, "Cache-Control", sess->ctx->cache_control);
 			}
-		} else if (sess->in_source && !sess->ctx->rdirs) {
+		} else if (sess->in_source && !sess->ctx->rdirs.nb_items) {
 			sess->nb_ranges = 0;
-			gf_dynstrcat(&rsp_buf, "Cache-Control: no-cache, no-store\r\n", NULL);
+			gf_dm_sess_set_header(sess->http_sess, "Cache-Control", "no-cache, no-store");
 		}
-		if (sess->bytes_in_req) {
+		//only put content length if not using chunk transfer - bytes_in_req may be > 0 if we have a byte range on a chunk-transfer session
+		if (sess->bytes_in_req && !sess->use_chunk_transfer) {
 			sprintf(szFmt, LLU, sess->bytes_in_req);
-			gf_dynstrcat(&rsp_buf, "Content-Length: ", NULL);
-			gf_dynstrcat(&rsp_buf, szFmt, NULL);
-			gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+			gf_dm_sess_set_header(sess->http_sess, "Content-Length", szFmt);
 		}
 		mime = sess->in_source ? sess->in_source->mime : mime;
 		if (mime && !strcmp(mime, "*")) mime = NULL;
 		if (mime) {
-			gf_dynstrcat(&rsp_buf, "Content-Type: ", NULL);
-			gf_dynstrcat(&rsp_buf, mime, NULL);
-			gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+			gf_dm_sess_set_header(sess->http_sess, "Content-Type", mime);
 		}
 		//data comes either directly from source pid, or from file written by source pid, we must use chunk transfer
-		if (!sess->is_head && sess->use_chunk_transfer) {
-			gf_dynstrcat(&rsp_buf, "Transfer-Encoding: chunked\r\n", NULL);
+		if (!is_head && sess->use_chunk_transfer) {
+			gf_dm_sess_set_header(sess->http_sess, "Transfer-Encoding", "chunked");
 		}
 
-		if (!sess->is_head && sess->nb_ranges) {
-			gf_dynstrcat(&rsp_buf, "Content-Range: bytes=", NULL);
+		if (!is_head && sess->nb_ranges) {
+			char *ranges = NULL;
+			gf_dynstrcat(&ranges, "bytes=", NULL);
 			for (i=0; i<sess->nb_ranges; i++) {
 				if (sess->in_source || !sess->file_size) {
 					sprintf(szFmt, LLD"-"LLD"/*", sess->ranges[i].start, sess->ranges[i].end);
 				} else {
 					sprintf(szFmt, LLD"-"LLD"/"LLU, sess->ranges[i].start, sess->ranges[i].end, sess->file_size);
 				}
-				gf_dynstrcat(&rsp_buf, szFmt, i ? ", " : NULL);
+				gf_dynstrcat(&ranges, szFmt, i ? ", " : NULL);
 			}
-			gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+			gf_dm_sess_set_header(sess->http_sess, "Content-Range", ranges);
+			gf_free(ranges);
 		}
 
 		if (sess->in_source && sess->ctx->ice) {
@@ -1074,47 +1419,34 @@
 			if (p) h = p->value.uint;
 
 			if (sr || br || nb_ch) {
-				Bool first=GF_TRUE;
-				gf_dynstrcat(&rsp_buf, "ice-audio-info: ", NULL);
-				if (sr) {
-					gf_dynstrcat(&rsp_buf, "samplerate=", NULL);
-					sprintf(szFmt, "%d", sr);
-					gf_dynstrcat(&rsp_buf, szFmt, NULL);
-					first=GF_FALSE;
-				}
-				if (nb_ch) {
-					gf_dynstrcat(&rsp_buf, "channels=", first ? NULL : ";");
-					sprintf(szFmt, "%d", nb_ch);
-					gf_dynstrcat(&rsp_buf, szFmt, NULL);
-					first=GF_FALSE;
-				}
-				if (br) {
-					gf_dynstrcat(&rsp_buf, "bitrate=", first ? NULL : ";");
-					sprintf(szFmt, "%d", br);
-					gf_dynstrcat(&rsp_buf, szFmt, NULL);
-					//first=GF_FALSE;
-				}
-				gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+				if (sr && br && nb_ch)
+					sprintf(szFmt, "samplerate=%d;channels=%d;bitrate=%d", sr, nb_ch, br);
+				else if (sr && nb_ch)
+					sprintf(szFmt, "samplerate=%d;channels=%d", sr, nb_ch);
+				else if (sr && br)
+					sprintf(szFmt, "samplerate=%d;bitrate=%d", sr, br);
+				else if (nb_ch && br)
+					sprintf(szFmt, "channels=%d;bitrate=%d", nb_ch, br);
+				else if (nb_ch)
+					sprintf(szFmt, "channels=%d", nb_ch);
+				else
+					sprintf(szFmt, "bitrate=%d", br);
+
+				gf_dm_sess_set_header(sess->http_sess, "ice-audio-info", szFmt);
 			}
-			if (w&&h) {
-				gf_dynstrcat(&rsp_buf, "ice-video-info: ", NULL);
+			if (w && h) {
 				sprintf(szFmt, "width=%d;height=%d", w, h);
-				gf_dynstrcat(&rsp_buf, szFmt, NULL);
-				gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+				gf_dm_sess_set_header(sess->http_sess, "ice-video-info", szFmt);
 			}
 
 			if (br) {
-				gf_dynstrcat(&rsp_buf, "icy-br: ", NULL);
 				sprintf(szFmt, "%d", br);
-				gf_dynstrcat(&rsp_buf, szFmt, NULL);
-				gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+				gf_dm_sess_set_header(sess->http_sess, "icy-br", szFmt);
 			}
-			gf_dynstrcat(&rsp_buf, "icy-pub: 1\r\n", NULL);
+			gf_dm_sess_set_header(sess->http_sess, "icy-pub", "1");
 			p = gf_filter_pid_get_property(sess->in_source->ipid, GF_PROP_PID_SERVICE_NAME);
 			if (p && p->value.string) {
-				gf_dynstrcat(&rsp_buf, "icy-name: ", NULL);
-				gf_dynstrcat(&rsp_buf, p->value.string, NULL);
-				gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+				gf_dm_sess_set_header(sess->http_sess, "icy-name", p->value.string);
 			}
 			p_idx = 0;
 			while (1) {
@@ -1123,101 +1455,144 @@
 				if (!p) break;
 				if (!pname || strncmp(pname, "ice-", 4)) continue;
 				if (!p->value.string) continue;
-				gf_dynstrcat(&rsp_buf, pname, NULL);
-				gf_dynstrcat(&rsp_buf, p->value.string, ": ");
-				gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+				gf_dm_sess_set_header(sess->http_sess, pname, p->value.string);
 			}
 		}
 	}
-	gf_dynstrcat(&rsp_buf, "\r\n", NULL);
 
-	if (response_body) {
-		gf_dynstrcat(&rsp_buf, response_body, NULL);
-	}
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Sending response to %s:\n%s\n", sess->peer_address, rsp_buf));
+	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Sending response to %s\n", sess->peer_address));
 
 	if (sess->do_log) {
 		sess->req_id = ++sess->ctx->req_id;
 		sess->method_type = parameter->reply;
 		sess->req_start_time = gf_sys_clock_high_res();
 		if (not_modified) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#%d %s %s %s: reply %d\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1, sess->reply_code));
-		} else if (range) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#%d %s %s %s [range: %s] start%s\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1, range, sess->use_chunk_transfer ? " chunk-transfer" : ""));
+			GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#"LLU" %s %s %s: reply %d\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1, sess->reply_code));
+		} else if (szRange[0]) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#"LLU" %s %s %s [range: %s] start%s\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1, szRange, sess->use_chunk_transfer ? " chunk-transfer" : ""));
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#%d %s %s %s start%s\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1, sess->use_chunk_transfer ? " chunk-transfer" : ""));
+			GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#"LLU" %s %s %s start%s\n", sess->req_id, sess->peer_address, get_method_name(sess->method_type), url+1, sess->use_chunk_transfer ? " chunk-transfer" : ""));
 		}
 	}
 
-	httpout_sess_send(sess, rsp_buf, (u32) strlen(rsp_buf));
-	gf_free(rsp_buf);
+	sess->nb_consecutive_errors = 0;
+	sess->canceled = GF_FALSE;
+	assert(sess->reply_code);
+	e = gf_dm_sess_send_reply(sess->http_sess, sess->reply_code, response_body, no_body);
+	sess->headers_done = GF_TRUE;
+	sess->is_h2 = gf_dm_sess_is_h2(sess->http_sess);
+
+	if (url) gf_free(url);
 	if (!sess->buffer) {
 		sess->buffer = gf_malloc(sizeof(u8)*sess->ctx->block_size);
 	}
 	if (response_body) {
 		gf_free(response_body);
 		sess->done = GF_TRUE;
-		if (sess->ctx->quit)
-			httpout_reset_socket(sess);
 	} else if (parameter->reply == GF_HTTP_DELETE) {
 		sess->done = GF_TRUE;
 	} else if (parameter->reply == GF_HTTP_HEAD) {
 		sess->done = GF_FALSE;
 		sess->file_pos = sess->file_size;
-		sess->is_head = GF_TRUE;
 	} else {
 		sess->done = GF_FALSE;
 		if (gf_list_find(sess->ctx->active_sessions, sess)<0) {
 			gf_list_add(sess->ctx->active_sessions, sess);
 			gf_sk_group_register(sess->ctx->sg, sess->socket);
 		}
-		sess->is_head = GF_FALSE;
-		if (not_modified)
+		if (not_modified) {
 			sess->done = GF_TRUE;
+		}
+	}
+
+	if (e<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error sending reply: %s\n", gf_error_to_string(e)));
+		sess->done = GF_TRUE;
 	}
+
+	if (sess->done)
+		sess->headers_done = GF_FALSE;
+
+	gf_dm_sess_clear_headers(sess->http_sess);
+
 	sess->last_active_time = gf_sys_clock_high_res();
 	return;
 
 exit:
-	if (response)
-		gf_dynstrcat(&rsp_buf, response, NULL);
-	else
-		gf_dynstrcat(&rsp_buf, "HTTP/1.1 501 Not Implemented\r\n", NULL);
 
-	gf_dynstrcat(&rsp_buf, "Server: ", NULL);
-	gf_dynstrcat(&rsp_buf, sess->ctx->user_agent, NULL);
-	gf_dynstrcat(&rsp_buf, "\r\n", NULL);
-	httpout_insert_date(gf_net_get_utc(), &rsp_buf, GF_FALSE);
-	gf_dynstrcat(&rsp_buf, "Connection: close\r\n", NULL);
-	if (sess->ctx->cors) {
-		gf_dynstrcat(&rsp_buf, "Access-Control-Allow-Origin: *\r\n", NULL);
-		gf_dynstrcat(&rsp_buf, "Access-Control-Expose-Headers: *\r\n", NULL);
+	if (cors_origin && (sess->reply_code==200))
+		send_cors = GF_TRUE;
+
+	gf_dm_sess_clear_headers(sess->http_sess);
+
+	gf_dm_sess_set_header(sess->http_sess, "Server", sess->ctx->user_agent);
+
+	httpout_format_date(gf_net_get_utc(), szDate, GF_FALSE);
+	gf_dm_sess_set_header(sess->http_sess, "Date", szDate);
+
+	sess->nb_consecutive_errors++;
+	if (sess->nb_consecutive_errors == sess->ctx->max_client_errors) {
+		gf_dm_sess_set_header(sess->http_sess, "Connection", "close");
+	} else {
+		sess->last_active_time = gf_sys_clock_high_res();
+	}
+
+	if (is_options) {
+		if (sess->ctx->hmode==MODE_SOURCE) {
+			gf_dm_sess_set_header(sess->http_sess, "Allow", "POST,PUT,OPTIONS");
+		} else if (sess->ctx->wdir) {
+			gf_dm_sess_set_header(sess->http_sess, "Allow", "GET,POST,PUT,DELETE,HEAD,OPTIONS");
+		} else {
+			gf_dm_sess_set_header(sess->http_sess, "Allow", "GET,HEAD,OPTIONS");
+		}
+	}
+	if (send_cors) {
+		gf_dm_sess_set_header(sess->http_sess, "Access-Control-Allow-Origin", "*");
+		gf_dm_sess_set_header(sess->http_sess, "Access-Control-Expose-Headers", "*");
+
+		if (is_options) {
+			gf_dm_sess_set_header(sess->http_sess, "Access-Control-Allow-Methods", "*");
+			gf_dm_sess_set_header(sess->http_sess, "Access-Control-Allow-Headers", "*");
+		}
 	}
+
 	if (response_body) {
 		body_size = (u32) strlen(response_body);
-		gf_dynstrcat(&rsp_buf, "Content-Type: text/plain\r\n", NULL);
-		gf_dynstrcat(&rsp_buf, "Content-Length: ", NULL);
+		gf_dm_sess_set_header(sess->http_sess, "Content-Type", "text/plain");
 		sprintf(szFmt, "%d", body_size);
-		gf_dynstrcat(&rsp_buf, szFmt, NULL);
-		gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+		gf_dm_sess_set_header(sess->http_sess, "Content-Length", szFmt);
 	}
-	gf_dynstrcat(&rsp_buf, "\r\n", NULL);
-	if (response_body) {
-		gf_dynstrcat(&rsp_buf, response_body, NULL);
-		gf_free(response_body);
+	else if (is_options) {
+		//if this header is not present, firefox may timeout on preflight
+		gf_dm_sess_set_header(sess->http_sess, "Content-Length", "0");
 	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Sending response to %s:\n%s\n", sess->peer_address, rsp_buf));
-	httpout_sess_send(sess, rsp_buf, (u32) strlen(rsp_buf));
-	gf_free(rsp_buf);
+
+	gf_dm_sess_send_reply(sess->http_sess, sess->reply_code, response_body, GF_FALSE);
+	sess->is_h2 = gf_dm_sess_is_h2(sess->http_sess);
+
+	if (response_body) gf_free(response_body);
+	gf_dm_sess_clear_headers(sess->http_sess);
 
 	if (sess->do_log) {
 		sess->req_id = ++sess->ctx->req_id;
-		GF_LOG(GF_LOG_WARNING, GF_LOG_ALL, ("[HTTPOut] REQ#%d %s %s %s error %d\n", sess->req_id, sess->peer_address, get_method_name(parameter->reply), url+1, sess->reply_code));
+		if (sess->reply_code<204) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#"LLU" %s %s %s OK\n", sess->req_id, sess->peer_address, get_method_name(parameter->reply), url ? (url+1) : ""));
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ALL, ("[HTTPOut] REQ#"LLU" %s %s %s error %d\n", sess->req_id, sess->peer_address, get_method_name(parameter->reply), url ? (url+1) : "", sess->reply_code));
+		}
 	}
 
+	if (url) gf_free(url);
 	sess->upload_type = 0;
-	httpout_reset_socket(sess);
+	sess->done = GF_TRUE;
+	sess->canceled = GF_FALSE;
+	sess->headers_done = GF_FALSE;
+
+	if (!sess->is_h2 && (sess->ctx->close || (sess->nb_consecutive_errors == sess->ctx->max_client_errors))) {
+		sess->force_destroy = GF_TRUE;
+	} else if (sess->http_sess) {
+		gf_dm_sess_server_reset(sess->http_sess);
+	}
 	return;
 }
 
@@ -1229,16 +1604,18 @@
 	HTTP_PUT_HEADER_DONE
 };
 
-static void httpout_in_io(void *usr_cbk, GF_NETIO_Parameter *parameter)
+static void httpout_in_io_ex(void *usr_cbk, GF_NETIO_Parameter *parameter, Bool is_llhls)
 {
 	GF_HTTPOutInput *in =usr_cbk;
 
+	u32 *cur_header = is_llhls ? &in->llhls_cur_header : &in->cur_header;
+
 	if (parameter->msg_type==GF_NETIO_GET_METHOD) {
 		if (in->is_delete)
 			parameter->name = "DELETE";
 		else
 			parameter->name = in->ctx->post ? "POST" : "PUT";
-		in->cur_header = HTTP_PUT_HEADER_ENCODING;
+		*cur_header = HTTP_PUT_HEADER_ENCODING;
 		return;
 	}
 	if (parameter->msg_type==GF_NETIO_GET_HEADER) {
@@ -1246,20 +1623,21 @@
 
 		if (in->is_delete) return;
 
-		switch (in->cur_header) {
+		switch (*cur_header) {
 		case HTTP_PUT_HEADER_ENCODING:
 			parameter->name = "Transfer-Encoding";
 			parameter->value = "chunked";
 			if (in->mime)
-				in->cur_header = HTTP_PUT_HEADER_MIME;
+				*cur_header = HTTP_PUT_HEADER_MIME;
 			else
-				in->cur_header = in->write_start_range ? HTTP_PUT_HEADER_RANGE : HTTP_PUT_HEADER_DONE;
+				*cur_header = in->write_start_range ? HTTP_PUT_HEADER_RANGE : HTTP_PUT_HEADER_DONE;
 			break;
 		case HTTP_PUT_HEADER_MIME:
 			parameter->name = "Content-Type";
 			parameter->value = in->mime;
-			in->cur_header = HTTP_PUT_HEADER_DONE;
-			if (in->write_start_range)
+			*cur_header = HTTP_PUT_HEADER_DONE;
+			//range only for non LLHLS
+			if (in->write_start_range && !is_llhls)
 				in->cur_header = HTTP_PUT_HEADER_RANGE;
 			break;
 		case HTTP_PUT_HEADER_RANGE:
@@ -1280,6 +1658,15 @@
 	}
 }
 
+static void httpout_in_io(void *usr_cbk, GF_NETIO_Parameter *parameter)
+{
+	httpout_in_io_ex(usr_cbk, parameter, GF_FALSE);
+}
+static void httpout_in_io_llhls(void *usr_cbk, GF_NETIO_Parameter *parameter)
+{
+	httpout_in_io_ex(usr_cbk, parameter, GF_TRUE);
+}
+
 static GF_Err httpout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	const GF_PropertyValue *p;
@@ -1297,6 +1684,7 @@
 		GF_HTTPOutCtx *ctx_orig;
 		Bool patch_blocks = GF_FALSE;
 		GF_FilterEvent evt;
+ const char *res_path;
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DISABLE_PROGRESSIVE);
 		if (p && p->value.uint) {
@@ -1315,7 +1703,7 @@
 		/*if PID was connected to an alias, get the alias context to get the destination
 		Otherwise PID was directly connected to the main filter, use main filter destination*/
 		ctx_orig = (GF_HTTPOutCtx *) gf_filter_pid_get_alias_udta(pid);
-		if (!ctx_orig) ctx_orig = ctx;
+ if (!ctx_orig) ctx_orig = ctx;
 
 		if (!ctx_orig->dst && (ctx->hmode==MODE_PUSH)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Push output but no destination set !\n"));
@@ -1329,13 +1717,49 @@
 		pctx->patch_blocks = patch_blocks;
 		pctx->hold = ctx->hold;
 
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESHIFT_SEGS);
+		if (ctx->mem_fileio) {
+			pctx->mem_files = gf_list_new();
+			pctx->max_segs = (u32) ctx->max_cache_segs;
+		} else {
+			pctx->past_files = gf_list_new();
+			if (ctx->max_cache_segs<0) {
+				pctx->max_segs = (u32) (-ctx->max_cache_segs);
+				p = NULL;
+			} else if (p) {
+				pctx->max_segs = (u32) ctx->max_cache_segs;
+			}
+		}
+		if (p && p->value.uint) {
+			if (ctx->mem_fileio && (p->value.uint > (u32) ctx->max_cache_segs)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] Timeshift buffer of %d segments but max segments cache set to %d, may result in client errors\n\tTry increasing segemnt buffer using --max_cache_segs\n", p->value.uint, ctx->max_cache_segs));
+			} else {
+				pctx->max_segs = p->value.uint;
+			}
+		}
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_IS_MANIFEST);
+		if (p && p->value.boolean) pctx->is_manifest = GF_TRUE;
+
+ res_path = NULL;
 		if (ctx_orig->dst) {
-			char *path = strstr(ctx_orig->dst, "://");
-			if (path) path = strchr(path+3, '/');
-			if (path) pctx->path = gf_strdup(path);
+ res_path = ctx_orig->dst;
+ char *path = strstr(res_path, "://");
+ if (path) path = strchr(path+3, '/');
+ if (path) pctx->path = gf_strdup(path);
+ } else if (!ctx->dst) {
+ p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
+ if (p && p->value.string) {
+ res_path = p->value.string;
+ pctx->path = gf_strdup(res_path);
+ }
+ }
+ if (res_path) {
 
 			if (ctx->hmode==MODE_PUSH) {
 				GF_Err e;
+				//note that ctx_orig->dst might be wrong (eg indicating MPD url rather than segment), but this is fixed in httpout_open_input by resetting up the session
+				//with the correct URL
 				pctx->upload = gf_dm_sess_new(gf_filter_get_download_manager(filter), ctx_orig->dst, GF_NETIO_SESSION_NOT_THREADED|GF_NETIO_SESSION_NOT_CACHED|GF_NETIO_SESSION_PERSISTENT, httpout_in_io, pctx, &e);
 				if (!pctx->upload) {
 					gf_free(pctx);
@@ -1343,21 +1767,33 @@
 				}
 //				gf_sk_group_register(ctx->sg, pctx->socket);
 			} else {
+				if (!pctx->path) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Output path not specified\n"));
+					return GF_BAD_PARAM;
+				}
 				httpout_set_local_path(ctx, pctx);
 			}
+			if (ctx->dst && !gf_list_count(ctx->inputs))
+				pctx->force_dst_name = GF_TRUE;
 
-			p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
-			if (p && p->value.uint) pctx->dash_mode = GF_TRUE;
-
-			p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
-			if (p && p->value.string) pctx->mime = gf_strdup(p->value.string);
-
-			gf_filter_pid_set_udta(pid, pctx);
-			gf_list_add(ctx->inputs, pctx);
-
-			gf_filter_pid_init_play_event(pid, &evt, 0.0, 1.0, "HTTPOut");
-			gf_filter_pid_send_event(pid, &evt);
-		}
+			//reset caps to anything (mime or ext) in case a URL was given, since graph resolution is now done
+			//this allows working with input filters dispatching files without creating a new destination (dashin in file mode for example)
+			//we do not reset caps to default as the default caps list an output and we don't want gf_filter_connections_pending to think we will produce one
+			ctx->in_caps[1].val = PROP_NAME( "*" );
+		}
+		//in any cast store dash state, mime, register input and fire play
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
+		if (p && p->value.uint) pctx->dash_mode = GF_TRUE;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+		if (p && p->value.string) pctx->mime = gf_strdup(p->value.string);
+
+		gf_filter_pid_set_udta(pid, pctx);
+		gf_list_add(ctx->inputs, pctx);
+
+		gf_filter_pid_init_play_event(pid, &evt, 0.0, 1.0, "HTTPOut");
+		gf_filter_pid_send_event(pid, &evt);
+ 
 	}
 	if (is_remove) {
 		return GF_OK;
@@ -1368,13 +1804,27 @@
 	return GF_OK;
 }
 
+static void httpout_check_connection(GF_HTTPOutSession *sess)
+{
+	GF_Err e = gf_sk_probe(sess->socket);
+	if (e==GF_IP_CONNECTION_CLOSED) {
+		sess->last_active_time = gf_sys_clock_high_res();
+		sess->done = GF_TRUE;
+		sess->canceled = GF_FALSE;
+		sess->upload_type = 0;
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Client %s disconnected, destroying session\n", sess->peer_address));
+		httpout_close_session(sess);
+		return;
+	}
+}
 
 static void httpout_check_new_session(GF_HTTPOutCtx *ctx)
 {
 	char peer_address[GF_MAX_IP_NAME_LEN];
 	GF_HTTPOutSession *sess;
 	GF_Err e;
-	GF_Socket *new_conn=NULL;
+	void *ssl_c = NULL;
+	GF_Socket *new_conn = NULL;
 
 	e = gf_sk_accept(ctx->server_sock, &new_conn);
 	if (e==GF_IP_SOCK_WOULD_BLOCK) return;
@@ -1393,10 +1843,13 @@
 		u32 i, nb_conn=0, count = gf_list_count(ctx->sessions);
 		for (i=0; i<count; i++) {
 			sess = gf_list_get(ctx->sessions, i);
-			if (!strcmp(sess->peer_address, peer_address)) nb_conn++;
+			if (strcmp(sess->peer_address, peer_address)) continue;
+			httpout_check_connection(sess);
+			if (sess->done) continue;
+			nb_conn++;
 		}
 		if (nb_conn>=ctx->maxp) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] Connection rejected due to too many connections from peer %s\n", peer_address));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] Connection rejected due to too many connections from peer %s (%d vs max %d)\n", peer_address, nb_conn, ctx->maxp));
 			gf_sk_del(new_conn);
 			return;
 		}
@@ -1406,13 +1859,14 @@
 		gf_sk_del(new_conn);
 		return;
 	}
-	
+
+	//we keep track of the socket for sock group (un)register
 	sess->socket = new_conn;
 	sess->ctx = ctx;
 
 #ifdef GPAC_HAS_SSL
 	if (ctx->ssl_ctx) {
-		sess->ssl = gf_ssl_new(ctx->ssl_ctx, new_conn, &e);
+		ssl_c = gf_ssl_new(ctx->ssl_ctx, new_conn, &e);
 		if (e) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Failed to create TLS session from %s: %s\n", sess->peer_address, gf_error_to_string(e) ));
 			gf_free(sess);
@@ -1422,7 +1876,7 @@
 	}
 #endif
 
-	sess->http_sess = gf_dm_sess_new_server(new_conn, sess->ssl, httpout_sess_io, sess, &e);
+	sess->http_sess = gf_dm_sess_new_server(new_conn, ssl_c, httpout_sess_io, sess, &e);
 	if (!sess->http_sess) {
 		gf_sk_del(new_conn);
 		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Failed to create HTTP server session from %s: %s\n", sess->peer_address, gf_error_to_string(e) ));
@@ -1440,7 +1894,8 @@
 	strcpy(sess->peer_address, peer_address);
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Accepting new connection from %s\n", sess->peer_address));
-	ctx->next_wake_us = 0;
+	//ask immediate reschedule
+	ctx->next_wake_us = 1;
 }
 
 static GF_Err httpout_initialize(GF_Filter *filter)
@@ -1523,13 +1978,27 @@
 	if (ctx->wdir)
 		ctx->hmode = MODE_DEFAULT;
 
-	if (!url && !ctx->rdirs && !ctx->wdir && (ctx->hmode!=MODE_SOURCE)) {
+	if (!url && !ctx->rdirs.nb_items && !ctx->wdir && (ctx->hmode!=MODE_SOURCE)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] No root dir(s) for server, no URL set and not configured as source, cannot run!\n" ));
 		return GF_BAD_PARAM;
 	}
 
-	if (ctx->rdirs || ctx->wdir) {
+	if (ctx->rdirs.nb_items || ctx->wdir) {
 		gf_filter_make_sticky(filter);
+
+		if (ctx->rdirs.nb_items && !strcmp(ctx->rdirs.vals[0], "gmem")) {
+			ctx->mem_fileio = gf_fileio_new("gmem", NULL, httpio_open, httpio_seek, httpio_read, httpio_write, httpio_tell, httpio_eof, NULL);
+			ctx->mem_url = gf_fileio_url(ctx->mem_fileio);
+			if (ctx->max_cache_segs==0) ctx->max_cache_segs = 1;
+			else if (ctx->max_cache_segs<0) ctx->max_cache_segs = -ctx->max_cache_segs;
+
+#ifdef GPAC_ENABLE_COVERAGE
+			if (gf_sys_is_cov_mode()) {
+				httpio_eof(ctx->mem_fileio);
+			}
+#endif
+		}
+
 	} else if (ctx->hmode!=MODE_PUSH) {
 		ctx->single_mode = GF_TRUE;
 	}
@@ -1568,7 +2037,7 @@
 			return GF_IO_ERR;
 		}
 		if (!gf_file_exists(ctx->pkey)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Provate key file %s not found\n", ctx->pkey));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Private key file %s not found\n", ctx->pkey));
 			return GF_IO_ERR;
 		}
 		if (gf_ssl_init_lib()) {
@@ -1577,6 +2046,9 @@
 		}
 		ctx->ssl_ctx = gf_ssl_server_context_new(ctx->cert, ctx->pkey);
 		if (!ctx->ssl_ctx) return GF_IO_ERR;
+
+		if (!ctx->port)
+			ctx->port = 443;
 #else
 		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] TLS key/certificate set but GPAC compiled without TLS support\n"));
 		return GF_NOT_SUPPORTED;
@@ -1584,8 +2056,11 @@
 #endif
 	}
 
+	if (!ctx->port)
+		ctx->port = 80;
+
 	ctx->server_sock = gf_sk_new(GF_SOCK_TYPE_TCP);
-	e = gf_sk_bind(ctx->server_sock, NULL, port, ip, 0, GF_SOCK_REUSE_PORT);
+	e = gf_sk_bind(ctx->server_sock, NULL, ctx->port, ip, 0, GF_SOCK_REUSE_PORT);
 	if (!e) e = gf_sk_listen(ctx->server_sock, ctx->maxc);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] failed to start server on port %d: %s\n", ctx->port, gf_error_to_string(e) ));
@@ -1597,6 +2072,8 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Server running on port %d\n", ctx->port));
 	if (ctx->reqlog) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] Server running on port %d\n", ctx->port));
+		if (strstr(ctx->reqlog, "REC"))
+			ctx->log_record = GF_TRUE;
 	}
 	gf_filter_post_process_task(filter);
 	return GF_OK;
@@ -1606,17 +2083,77 @@
 {
 	gf_list_del_item(s->ctx->active_sessions, s);
 	gf_list_del_item(s->ctx->sessions, s);
-	if (s->socket) gf_sk_del(s->socket);
+	if (s->http_sess)
+		httpout_close_session(s);
 	if (s->buffer) gf_free(s->buffer);
 	if (s->path) gf_free(s->path);
 	if (s->mime) gf_free(s->mime);
-	if (s->http_sess) gf_dm_sess_del(s->http_sess);
 	if (s->opid) gf_filter_pid_remove(s->opid);
 	if (s->resource) gf_fclose(s->resource);
 	if (s->ranges) gf_free(s->ranges);
 	gf_free(s);
 }
 
+static void httpout_check_mem_path(GF_HTTPOutSession *sess, GF_HTTPOutInput *in)
+{
+	u32 i, count;
+	if (!in || !in->mem_files) return;
+	if (!sess->path) return;
+	if (!strncmp(sess->path, "gfio://", 7)) return;
+
+	count = gf_list_count(in->mem_files);
+	for (i=0; i<count; i++) {
+		GF_HTTPFileIO *hio = gf_list_get(in->mem_files, i);
+		const char *url = gf_fileio_resource_url(hio->fio);
+		if (url && !strcmp(url, sess->path)) {
+			gf_free(sess->path);
+			sess->path = gf_strdup(gf_fileio_url(hio->fio) );
+			return;
+		}
+	}
+}
+
+static void httpout_close_hls_chunk(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in, Bool final_flush)
+{
+	if (!in->hls_chunk) return;
+
+	gf_fclose(in->hls_chunk);
+	in->hls_chunk = NULL;
+
+	if (!final_flush) {
+		u32 i, count;
+		//detach all clients from this input and reassign to a regular output
+		count = gf_list_count(ctx->sessions);
+		for (i=0; i<count; i++) {
+			GF_HTTPOutSession *sess = gf_list_get(ctx->sessions, i);
+			if (sess->in_source != in) continue;
+			if (!sess->in_source_is_ll_hls_chunk) continue;
+			if (strcmp(sess->path, in->local_path)) continue;
+
+			assert(sess->file_in_progress);
+			if (sess->in_source) {
+				sess->in_source->nb_dest--;
+				sess->in_source = NULL;
+				if (!sess->resource && sess->path) {
+					//in mem mode, sess->path may still be a local path, convert to gfio of source if needed
+					httpout_check_mem_path(sess, sess->in_source);
+					sess->resource = gf_fopen(sess->path, "rb");
+				}
+			}
+			sess->in_source_is_ll_hls_chunk = GF_FALSE;
+			sess->file_size = gf_fsize(sess->resource);
+			gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
+			sess->file_in_progress = GF_FALSE;
+		}
+	}
+
+	if (in->hls_chunk_path) gf_free(in->hls_chunk_path);
+	in->hls_chunk_path = NULL;
+	if (in->hls_chunk_local_path) gf_free(in->hls_chunk_local_path);
+	in->hls_chunk_local_path = NULL;
+}
+
+
 static void httpout_finalize(GF_Filter *filter)
 {
 	GF_HTTPOutCtx *ctx = (GF_HTTPOutCtx *) gf_filter_get_udta(filter);
@@ -1634,26 +2171,46 @@
 	gf_list_del(ctx->active_sessions);
 
 	while (gf_list_count(ctx->inputs)) {
-		GF_HTTPOutInput *tmp = gf_list_pop_back(ctx->inputs);
-		if (tmp->local_path) gf_free(tmp->local_path);
-		if (tmp->path) gf_free(tmp->path);
-		if (tmp->mime) gf_free(tmp->mime);
-		if (tmp->resource) gf_fclose(tmp->resource);
-		if (tmp->upload) gf_dm_sess_del(tmp->upload);
-		if (tmp->file_deletes) {
-			while (gf_list_count(tmp->file_deletes)) {
-				char *url = gf_list_pop_back(tmp->file_deletes);
+		GF_HTTPOutInput *in = gf_list_pop_back(ctx->inputs);
+		if (in->local_path) gf_free(in->local_path);
+		if (in->path) gf_free(in->path);
+		if (in->mime) gf_free(in->mime);
+
+		httpout_close_hls_chunk(ctx, in, GF_TRUE);
+
+		if (in->resource) gf_fclose(in->resource);
+		if (in->llhls_upload) gf_dm_sess_del(in->llhls_upload);
+		if (in->llhls_url) gf_free(in->llhls_url);
+		if (in->upload) gf_dm_sess_del(in->upload);
+		if (in->file_deletes) {
+			while (gf_list_count(in->file_deletes)) {
+				char *url = gf_list_pop_back(in->file_deletes);
 				gf_free(url);
 			}
-			gf_list_del(tmp->file_deletes);
+			gf_list_del(in->file_deletes);
+		}
+		if (in->mem_files) {
+			while (gf_list_count(in->mem_files)) {
+				GF_HTTPFileIO *hio = gf_list_pop_back(in->mem_files);
+				httpio_del(hio);
+			}
+			gf_list_del(in->mem_files);
+		}
+		if (in->past_files) {
+			while (gf_list_count(in->past_files)) {
+				char *url = gf_list_pop_back(in->past_files);
+				gf_free(url);
+			}
+			gf_list_del(in->past_files);
 		}
-		gf_free(tmp);
+		gf_free(in);
 	}
 	gf_list_del(ctx->inputs);
 	if (ctx->server_sock) gf_sk_del(ctx->server_sock);
 	if (ctx->sg) gf_sk_group_del(ctx->sg);
 	if (ctx->ip) gf_free(ctx->ip);
 
+	if (ctx->mem_fileio) gf_fileio_del(ctx->mem_fileio);
 #ifdef GPAC_HAS_SSL
 	if (ctx->ssl_ctx) {
 		gf_ssl_server_context_del(ctx->ssl_ctx);
@@ -1690,6 +2247,7 @@
 		if (write != size) {
 			return GF_IO_ERR;
 		}
+		gf_fflush(sess->resource);
 		sess->nb_bytes += write;
 		sess->file_pos += write;
 		return GF_OK;
@@ -1702,6 +2260,7 @@
 			if (write != remain) {
 				return GF_IO_ERR;
 			}
+			gf_fflush(sess->resource);
 			sess->nb_bytes += write;
 			sess->file_pos += remain;
 			remain = 0;
@@ -1711,6 +2270,7 @@
 		sess->nb_bytes += write;
 		remain -= to_write;
 		sess->range_idx++;
+		gf_fflush(sess->resource);
 		if (sess->range_idx>=sess->nb_ranges) break;
 		sess->file_pos = sess->ranges[sess->range_idx].start;
 		gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
@@ -1721,25 +2281,16 @@
 	}
 	return GF_OK;
 }
-static void httpout_check_connection(GF_HTTPOutSession *sess)
-{
-	GF_Err e = gf_sk_probe(sess->socket);
-	if (e==GF_IP_CONNECTION_CLOSED) {
-		sess->last_active_time = gf_sys_clock_high_res();
-		sess->done = GF_TRUE;
-		sess->upload_type = 0;
-		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Client %s disconnected, destroying session\n", sess->peer_address));
-		httpout_reset_socket(sess);
-		return;
-	}
-}
 
 static void log_request_done(GF_HTTPOutSession *sess)
 {
 	if (!sess->do_log) return;
+	const char *sprefix = sess->is_h2 ? "H2 " : "";
 
 	if (!sess->socket) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_ALL, ("[HTTPOut] REQ#%d %s aborted!\n", sess->req_id, get_method_name(sess->method_type)));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_ALL, ("[HTTPOut] %sREQ#"LLU" %s aborted!\n", sprefix, sess->req_id, get_method_name(sess->method_type)));
+	} else if (sess->canceled) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] %sREQ#"LLU" %s canceled\n", sprefix, sess->req_id, get_method_name(sess->method_type)));
 	} else {
 		char *unit = "bps";
 		u64 diff_us = (gf_sys_clock_high_res() - sess->req_start_time);
@@ -1752,7 +2303,18 @@
 			unit = "kbps";
 			bps/=1000;
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] REQ#%d %s done: reply %d - %d bytes in %d ms at %g %s\n", sess->req_id, get_method_name(sess->method_type), sess->reply_code, sess->nb_bytes, (u32) (diff_us/1000), bps, unit));
+#if 0
+		assert(sess->nb_bytes);
+		if (sess->nb_ranges) {
+			u32 i;
+			u64 tot_bytes = 0;
+			for (i=0; i<sess->nb_ranges; i++) {
+				tot_bytes += sess->ranges[i].end - sess->ranges[i].start + 1;
+			}
+			assert(tot_bytes==sess->nb_bytes);
+		}
+#endif
+		GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] %sREQ#"LLU" %s done: reply %d - "LLU" bytes in %d ms at %g %s\n", sprefix, sess->req_id, get_method_name(sess->method_type), sess->reply_code, sess->nb_bytes, (u32) (diff_us/1000), bps, unit));
 	}
 }
 
@@ -1763,17 +2325,26 @@
 	GF_Err e = GF_OK;
 	Bool close_session = ctx->close;
 
+	if (sess->force_destroy) {
+		httpout_close_session(sess);
+		return;
+	}
 
+
+	//upload session (PUT, POST)
 	if (sess->upload_type) {
 		u32 i, count;
 		GF_Err write_e=GF_OK;
-		char *rsp_buf = NULL;
 		assert(sess->path);
 		if (sess->done)
 			return;
 
 		read = 0;
-		e = gf_dm_sess_fetch_data(sess->http_sess, sess->buffer, ctx->block_size, &read);
+		if (sess->canceled) {
+			e = GF_EOS;
+		} else {
+			e = gf_dm_sess_fetch_data(sess->http_sess, sess->buffer, ctx->block_size, &read);
+		}
 
 		if (e>=GF_OK) {
 			if (read)
@@ -1783,6 +2354,7 @@
 
 			if (!write_e) {
 				sess->last_active_time = gf_sys_clock_high_res();
+				//don't reschedule in upload, let server decide
 				ctx->next_wake_us = 0;
 				//we way be in end of stream
 				if (e==GF_OK)
@@ -1791,6 +2363,7 @@
 				e = write_e;
 			}
 		} else if (e==GF_IP_NETWORK_EMPTY) {
+			//don't reschedule in upload, let server decide
 			ctx->next_wake_us = 0;
 			sess->last_active_time = gf_sys_clock_high_res();
 			httpout_check_connection(sess);
@@ -1798,8 +2371,9 @@
 		} else if (e==GF_IP_CONNECTION_CLOSED) {
 			sess->last_active_time = gf_sys_clock_high_res();
 			sess->done = GF_TRUE;
+			sess->canceled = GF_FALSE;
 			sess->upload_type = 0;
-			httpout_reset_socket(sess);
+			httpout_close_session(sess);
 			log_request_done(sess);
 			return;
 		}
@@ -1808,70 +2382,83 @@
 			GF_FilterPacket *pck = gf_filter_pck_new_alloc(sess->opid, 0, NULL);
 			if (pck) {
 				gf_filter_pck_set_framing(pck, GF_FALSE, GF_TRUE);
+				if (sess->canceled)
+					gf_filter_pck_set_corrupted(pck, GF_TRUE);
+
 				gf_filter_pck_send(pck);
 			}
 			gf_filter_pid_set_eos(sess->opid);
 		} else {
 			if (sess->resource) gf_fclose(sess->resource);
 			sess->resource = NULL;
+			//for now we remove any canceled file
+			if (sess->canceled)
+				gf_file_delete(sess->path);
 		}
 
+		if (sess->canceled) {
+			log_request_done(sess);
+		} else {
+			char szDate[200];
 
-		if (e==GF_EOS) {
-			if (sess->upload_type==2) {
-				sess->reply_code = 200;
-				gf_dynstrcat(&rsp_buf, "HTTP/1.1 200 OK\r\n", NULL);
+			if (e==GF_EOS) {
+				if (sess->upload_type==2) {
+					sess->reply_code = 200;
+				} else {
+					sess->reply_code = 201;
+				}
+			} else if (write_e==GF_BAD_PARAM) {
+				close_session = GF_TRUE;
+				sess->reply_code = 416;
 			} else {
-				gf_dynstrcat(&rsp_buf, "HTTP/1.1 201 Created\r\n", NULL);
-				sess->reply_code = 201;
+				close_session = GF_TRUE;
+				sess->reply_code = 500;
 			}
-		} else if (write_e==GF_BAD_PARAM) {
-			gf_dynstrcat(&rsp_buf, "HTTP/1.1 416 Requested Range Not Satisfiable\r\n", NULL);
-			close_session = GF_TRUE;
-			sess->reply_code = 416;
-		} else {
-			gf_dynstrcat(&rsp_buf, "HTTP/1.1 500 Internal Server error\r\n", NULL);
-			close_session = GF_TRUE;
-			sess->reply_code = 500;
-		}
-		gf_dynstrcat(&rsp_buf, "Server: ", NULL);
-		gf_dynstrcat(&rsp_buf, sess->ctx->user_agent, NULL);
-		gf_dynstrcat(&rsp_buf, "\r\n", NULL);
-		httpout_insert_date(gf_net_get_utc(), &rsp_buf, GF_FALSE);
-		if (close_session)
-			gf_dynstrcat(&rsp_buf, "Connection: close\r\n", NULL);
-		else
-			gf_dynstrcat(&rsp_buf, "Connection: keep-alive\r\n", NULL);
+			gf_dm_sess_set_header(sess->http_sess, "Server", sess->ctx->user_agent);
 
-		if (sess->ctx->cors) {
-			gf_dynstrcat(&rsp_buf, "Access-Control-Allow-Origin: *\r\n", NULL);
-			gf_dynstrcat(&rsp_buf, "Access-Control-Expose-Headers: *\r\n", NULL);
-		}
+			httpout_format_date(gf_net_get_utc(), szDate, GF_FALSE);
+			gf_dm_sess_set_header(sess->http_sess, "Date", szDate);
 
-		if (e==GF_EOS) {
-			gf_dynstrcat(&rsp_buf, "Content-Location: ", NULL);
-			if (ctx->hmode==MODE_SOURCE) {
-				gf_dynstrcat(&rsp_buf, sess->path, "/");
-			} else {
-				char *spath = strchr(sess->path, '/');
-				if (spath) spath = spath+1;
-				else spath = sess->path;
-				gf_dynstrcat(&rsp_buf, spath, NULL);
+			if (close_session)
+				gf_dm_sess_set_header(sess->http_sess, "Connection", "close");
+			else
+				gf_dm_sess_set_header(sess->http_sess, "Connection", "keep-alive");
+
+			if (e==GF_EOS) {
+				if (ctx->hmode==MODE_SOURCE) {
+					char *loc = NULL;
+					gf_dynstrcat(&loc, sess->path, "/");
+					gf_dm_sess_set_header(sess->http_sess, "Content-Location", loc);
+					gf_free(loc);
+				} else {
+					char *spath = strchr(sess->path, '/');
+					if (spath) spath = spath+1;
+					else spath = sess->path;
+
+					if (ctx->wdir) {
+						u32 plen = (u32) strlen(ctx->wdir);
+						if ((ctx->wdir[plen-1] == '/') || (ctx->wdir[plen-1] == '\\'))
+							plen--;
+						if (!strncmp(ctx->wdir, sess->path, plen))
+							spath = sess->path + plen;
+					}
+
+					gf_dm_sess_set_header(sess->http_sess, "Content-Location", spath);
+				}
 			}
-			gf_dynstrcat(&rsp_buf, "\r\n", NULL);
-		}
-		gf_dynstrcat(&rsp_buf, "\r\n", NULL);
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Sending PUT response to %s:\n%s\n", sess->peer_address, rsp_buf));
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Sending PUT response to %s - reply %d\n", sess->peer_address, sess->reply_code));
 
-		log_request_done(sess);
+			log_request_done(sess);
 
-		httpout_sess_send(sess, rsp_buf, (u32) strlen(rsp_buf));
-		gf_free(rsp_buf);
+			gf_dm_sess_send_reply(sess->http_sess, sess->reply_code, NULL, GF_TRUE);
+		}
 
 		sess->last_active_time = gf_sys_clock_high_res();
 		sess->done = GF_TRUE;
+		sess->canceled = GF_FALSE;
 		sess->upload_type = 0;
+		sess->nb_consecutive_errors = 0;
 
 		//notify all download (GET, HEAD) sessions using the same resource that we are done
 		count = gf_list_count(sess->ctx->sessions);
@@ -1887,42 +2474,45 @@
 		}
 
 		if (close_session) {
-			httpout_reset_socket(sess);
+			httpout_close_session(sess);
 		} else {
-			//we keep alive, recreate a dm session
-			if (sess->http_sess) gf_dm_sess_del(sess->http_sess);
-			sess->http_sess = gf_dm_sess_new_server(sess->socket, sess->ssl, httpout_sess_io, sess, &e);
-			if (e) {
-				httpout_reset_socket(sess);
-			}
+			gf_dm_sess_server_reset(sess->http_sess);
 		}
 		return;
 	}
-	//read request and process headers
-	else if (sess->http_sess) {
-		if (!gf_sk_group_sock_is_set(ctx->sg, sess->socket, GF_SK_SELECT_READ)) {
+
+
+	//other session: read incoming request and process headers
+	if (!sess->headers_done) {
+		//check we have something to read if not http2
+		//if http2, data might have been received on this session while processing another session
+		if (!sess->is_h2 && !gf_sk_group_sock_is_set(ctx->sg, sess->socket, GF_SK_SELECT_READ)) {
 			return;
 		}
 		e = gf_dm_sess_process(sess->http_sess);
 
-		if (e==GF_IP_CONNECTION_CLOSED) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Connection to %s closed\n", sess->peer_address));
-			httpout_reset_socket(sess);
+		if (e==GF_IP_NETWORK_EMPTY) {
+			return;
+		}
+
+		if (e<0) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Connection to %s closed: %s\n", sess->peer_address, gf_error_to_string(e) ));
+			httpout_close_session(sess);
 			if (!sess->done)
 				log_request_done(sess);
 			return;
 		}
 
 		sess->last_active_time = gf_sys_clock_high_res();
-		ctx->next_wake_us = 0;
+		//reschedule asap
+		ctx->next_wake_us = 1;
 
 		//request has been process, if not an upload we don't need the session anymore
 		//otherwise we use the session to parse transfered data
 		if (!sess->upload_type) {
-			//no support for request pipeline yet, just remove the downloader session until done
-			gf_dm_sess_del(sess->http_sess);
-			sess->http_sess = NULL;
-			if (sess->done && sess->socket && (e!=GF_IP_NETWORK_EMPTY) )
+			sess->headers_done = GF_TRUE;
+
+			if (sess->done)
 				goto session_done;
 		} else {
 			//flush any data received
@@ -1930,9 +2520,21 @@
 			return;
 		}
 	}
-	if (!sess->socket) return;
+	if (!sess->http_sess) return;
+
+	//H2 session, keep on processing inputs
+	if (sess->is_h2 && gf_sk_group_sock_is_set(ctx->sg, sess->socket, GF_SK_SELECT_READ)) {
+		gf_dm_sess_process(sess->http_sess);
+	}
+
 	if (sess->done) return;
-	if (sess->in_source) return;
+	//associated input directly writes to session
+	if (sess->in_source && !sess->in_source->resource) return;
+
+	if (sess->canceled) {
+		log_request_done(sess);
+		goto session_done;
+	}
 
 	if (!gf_sk_group_sock_is_set(ctx->sg, sess->socket, GF_SK_SELECT_WRITE)) {
 		return;
@@ -1943,6 +2545,10 @@
 			sess->last_active_time = gf_sys_clock_high_res();
 			return;
 		}
+
+		//in mem mode, sess->path is still a local path, convert to gfio of source
+		httpout_check_mem_path(sess, sess->in_source);
+
 		sess->resource = gf_fopen(sess->path, "rb");
 		if (!sess->resource) return;
 		sess->last_active_time = gf_sys_clock_high_res();
@@ -1955,13 +2561,15 @@
 		gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
 	}
 
+resend:
+
 	//we have ranges
 	if (sess->nb_ranges) {
 		//current range is done
 		if ((s64) sess->file_pos >= sess->ranges[sess->range_idx].end) {
-			sess->range_idx++;
 			//load next range, seeking file
-			if (sess->range_idx<sess->nb_ranges) {
+			if (sess->range_idx+1<sess->nb_ranges) {
+				sess->range_idx++;
 				sess->file_pos = (u64) sess->ranges[sess->range_idx].start;
 				gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
 			}
@@ -1974,25 +2582,30 @@
 	}
 
 	if (to_read) {
-		ctx->next_wake_us = 0;
+		//rescedule asap while we send
+		ctx->next_wake_us = 1;
 
 		if (to_read > (u64) sess->ctx->block_size)
 			to_read = (u64) sess->ctx->block_size;
 
 		read = (u32) gf_fread(sess->buffer, (u32) to_read, sess->resource);
-
+		//may happen when file writing is in progress
+		if (!read) {
+			sess->last_active_time = gf_sys_clock_high_res();
+			return;
+		}
 		//transfer of file being uploaded, use chunk transfer
-		if (sess->use_chunk_transfer) {
+		if (!sess->is_h2 && sess->use_chunk_transfer) {
 			char szHdr[100];
 			u32 len;
 			sprintf(szHdr, "%X\r\n", read);
 			len = (u32) strlen(szHdr);
 
-			e = httpout_sess_send(sess, szHdr, len);
-			e |= httpout_sess_send(sess, sess->buffer, read);
-			e |= httpout_sess_send(sess, "\r\n", 2);
+			e = gf_dm_sess_send(sess->http_sess, szHdr, len);
+			e |= gf_dm_sess_send(sess->http_sess, sess->buffer, read);
+			e |= gf_dm_sess_send(sess->http_sess, "\r\n", 2);
 		} else {
-			e = httpout_sess_send(sess, sess->buffer, read);
+			e = gf_dm_sess_send(sess->http_sess, sess->buffer, read);
 		}
 		sess->last_active_time = gf_sys_clock_high_res();
 
@@ -2003,13 +2616,18 @@
 			if (e==GF_IP_CONNECTION_CLOSED) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOut] Connection to %s for %s closed\n", sess->peer_address, sess->path));
 				sess->done = GF_TRUE;
-				httpout_reset_socket(sess);
+				sess->canceled = GF_FALSE;
+				httpout_close_session(sess);
 				log_request_done(sess);
 				return;
 			}
 			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error sending data to %s for %s: %s\n", sess->peer_address, sess->path, gf_error_to_string(e) ));
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOut] sending data to %s for %s: "LLU"/"LLU" bytes\n", sess->peer_address, sess->path, sess->nb_bytes, sess->bytes_in_req));
+
+			if (gf_sk_select(sess->socket, GF_SK_SELECT_WRITE)==GF_OK) {
+				goto resend;
+			}
 		}
 		return;
 	}
@@ -2019,12 +2637,6 @@
 		return;
 	}
 
-	if (!sess->is_head) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Done sending %s to %s ("LLU"/"LLU" bytes)\n", sess->path, sess->peer_address, sess->nb_bytes, sess->bytes_in_req));
-	}
-
-	log_request_done(sess);
-
 session_done:
 
 	sess->file_pos = sess->file_size;
@@ -2034,49 +2646,126 @@
 	if (sess->put_in_progress==2)
 		close_session = GF_TRUE;
 
+	if (ctx->quit)
+		close_session = GF_TRUE;
+
 	if (!sess->done) {
-		if (sess->use_chunk_transfer) {
-			httpout_sess_send(sess, "0\r\n\r\n", 5);
+		if (!sess->is_h2 && sess->use_chunk_transfer) {
+			assert(sess->nb_bytes);
+			gf_dm_sess_send(sess->http_sess, "0\r\n\r\n", 5);
+		} else {
+			gf_dm_sess_send(sess->http_sess, NULL, 0);
 		}
 		if (sess->resource) gf_fclose(sess->resource);
 		sess->resource = NULL;
+
+		if (sess->nb_bytes) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Done sending %s to %s ("LLU"/"LLU" bytes)\n", sess->path, sess->peer_address, sess->nb_bytes, sess->bytes_in_req));
+		}
+
+		log_request_done(sess);
+
 		//keep resource active
 		sess->done = GF_TRUE;
+		sess->canceled = GF_FALSE;
+
 	}
 	if (close_session) {
-		httpout_reset_socket(sess);
-	} else {
-		//we keep alive, recreate an dm sess
-		sess->http_sess = gf_dm_sess_new_server(sess->socket, sess->ssl, httpout_sess_io, sess, &e);
-		if (e) {
-			httpout_reset_socket(sess);
-		}
+		httpout_close_session(sess);
+	}
+	//might be NULL if quit was set
+	else if (sess->http_sess) {
+		sess->headers_done = GF_FALSE;
+		gf_dm_sess_server_reset(sess->http_sess);
 	}
 }
 
-static Bool httpout_open_input(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in, const char *name, Bool is_delete)
+static Bool httpout_open_input(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in, const char *name, Bool is_delete, Bool is_static)
 {
 //	Bool reassign_clients = GF_TRUE;
-	u32 len;
-	const char *dir;
-	const char *sep = name ? strstr(name, "://") : NULL;
+	u32 len = 0;
+ char *o_url = NULL;
+ const char *dir = NULL;
+ const char *sep;
+
+ if (in->is_open && !is_delete) return GF_FALSE;
+ if (!in->upload) {
+ //singe session mode, not recording, nothing to do
+ if (ctx->single_mode) {
+			in->done = GF_FALSE;
+			in->is_open = GF_TRUE;
+			return GF_FALSE;
+		}
+ //server mode not recording, nothing to do
+		if (!ctx->rdirs.nb_items) return GF_FALSE;
+		dir = ctx->rdirs.vals[0];
+		if (!dir) return GF_FALSE;
+		len = (u32) strlen(dir);
+		if (!len) return GF_FALSE;
+
+ if (in->resource) return GF_FALSE;
+ }
 
-	if (sep) sep = strchr(sep+3, '/');
+ sep = name ? strstr(name, "://") : NULL;
+ if (sep) sep = strchr(sep+3, '/');
 	if (!sep) {
+ if (in->force_dst_name) {
+ sep = in->path;
+ } else if (ctx->dst) {
+ u32 i, count = gf_list_count(ctx->inputs);
+ for (i=0; i<count; i++) {
+ char *path_sep;
+ GF_HTTPOutInput *an_in = gf_list_get(ctx->inputs, i);
+ if (an_in==in) continue;
+ if (!an_in->path) continue;
+ if (ctx->dst && !an_in->force_dst_name) continue;
+ if (!gf_filter_pid_share_origin(in->ipid, an_in->ipid))
+ continue;
+ 
+ o_url = gf_strdup(an_in->path);
+ path_sep = strrchr(o_url, '/');
+ if (path_sep) {
+ path_sep[1] = 0;
+ if (name[0]=='/')
+						gf_dynstrcat(&o_url, name+1, NULL);
+ else
+						gf_dynstrcat(&o_url, name, NULL);
+ sep = o_url;
+ } else {
+ sep = name;
+ }
+ break;
+ }
+		} else {
+			sep = name;
+		}
+		if (sep && (sep[0] != '/')) {
+			char *new_url = NULL;
+			gf_dynstrcat(&new_url, "/", NULL);
+			gf_dynstrcat(&new_url, sep, NULL);
+			if (o_url) gf_free(o_url);
+			sep = o_url = new_url;
+		}
+ }
+ if (!sep) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] %s output file %s but cannot guess path !\n", is_delete ? "Deleting" : "Opening", name));
 		return GF_FALSE;
 	}
-	if (in->is_open) return GF_FALSE;
-	in->done = GF_FALSE;
-	in->is_open = GF_TRUE;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOut] %s output file %s\n", is_delete ? "Deleting" : "Opening", name));
 
+	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] %s output file %s\n", is_delete ? "Deleting" : "Opening", sep+1));
 	if (in->upload) {
 		GF_Err e;
-		char *old = in->path;
+		in->done = GF_FALSE;
+		in->is_open = GF_TRUE;
+
 		in->is_delete = is_delete;
-		in->path = gf_strdup(name);
-		if (old) gf_free(old);
+		if (!in->force_dst_name) {
+			char *old = in->path;
+			in->path = gf_strdup(sep);
+			if (old) gf_free(old);
+		}
+		if (o_url) gf_free(o_url);
+		
 		e = gf_dm_sess_setup_from_url(in->upload, in->path, GF_TRUE);
 		if (!e) {
 			in->cur_header = 0;
@@ -2088,6 +2777,8 @@
 			in->is_open = GF_FALSE;
 			return GF_FALSE;
 		}
+		in->is_h2 = gf_dm_sess_is_h2(in->upload);
+
 		if (is_delete) {
 			//get response
 			gf_dm_sess_process(in->upload);
@@ -2097,15 +2788,48 @@
 		}
 		return GF_TRUE;
 	}
-	//server mode not recording, nothing to do
-	if (!ctx->rdirs) return GF_FALSE;
 
-	if (in->resource) return GF_FALSE;
+	if (ctx->log_record) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] %s output file %s\n", is_delete ? "Deleting" : "Opening", name));
+	}
+
+	//file delete is async (the resource associated with the input can still be active)
+	if (is_delete) {
+		char *loc_path = NULL;
+		gf_dynstrcat(&loc_path, dir, NULL);
+		if (!strchr("/\\", dir[len-1]))
+			gf_dynstrcat(&loc_path, "/", NULL);
+		if (sep[0]=='/')
+			gf_dynstrcat(&loc_path, sep+1, NULL);
+		else
+			gf_dynstrcat(&loc_path, sep, NULL);
+
+
+		//purge mem
+		if (in->mem_files) {
+			u32 i, count = gf_list_count(in->mem_files);
+			for (i=0; i<count; i++) {
+				GF_HTTPFileIO *hio = gf_list_get(in->mem_files, i);
+				const char *res_url = gf_fileio_resource_url(hio->fio);
+				if (!res_url || strcmp(res_url, loc_path)) continue;
+
+				gf_list_rem(in->mem_files, i);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOutIO] delete old version of input file %s\n", res_url ));
+
+				httpio_del(hio);
+				break;
+			}
+		}
+
+		gf_file_delete(loc_path);
+		if (o_url) gf_free(o_url);
+		gf_free(loc_path);
+		return GF_TRUE;
+	}
+
+	in->done = GF_FALSE;
+	in->is_open = GF_TRUE;
 
-	dir = gf_list_get(ctx->rdirs, 0);
-	if (!dir) return GF_FALSE;
-	len = (u32) strlen(dir);
-	if (!len) return GF_FALSE;
 
 	if (in->path && !strcmp(in->path, sep)) {
 //		reassign_clients = GF_FALSE;
@@ -2113,17 +2837,48 @@
 		if (in->path) gf_free(in->path);
 		in->path = gf_strdup(sep);
 	}
+ if (o_url) gf_free(o_url);
+
 	httpout_set_local_path(ctx, in);
 
-	if (is_delete) {
-		gf_file_delete(in->local_path);
-		in->done = GF_TRUE;
+	//for mem mode, pass the parent gfio for fileIO construction
+	in->resource = gf_fopen_ex(in->local_path, ctx->mem_url, "wb", GF_FALSE);
+	if (!in->resource)
 		in->is_open = GF_FALSE;
-		in->is_delete = GF_FALSE;
-	} else {
-		in->resource = gf_fopen(in->local_path, "wb");
-		if (!in->resource)
-			in->is_open = GF_FALSE;
+
+	if (ctx->mem_url) {
+		u32 i, count;
+		GF_HTTPFileIO *hio = gf_fileio_get_udta((GF_FileIO *) in->resource);
+		hio->in = in;
+
+		count = gf_list_count(in->mem_files);
+		for (i=0; i<count; i++) {
+			GF_HTTPFileIO *prev_hio = gf_list_get(in->mem_files, i);
+			const char *res_url = gf_fileio_resource_url(prev_hio->fio);
+			if (strcmp(res_url, in->local_path )) continue;
+			if (prev_hio->nb_used) {
+				prev_hio->do_remove = GF_TRUE;
+				continue;
+			}
+			gf_list_rem(in->mem_files, i);
+			httpio_del(prev_hio);
+			i--;
+			count--;
+		}
+		if (is_static) hio->is_static = GF_TRUE;
+		gf_list_add(in->mem_files, hio);
+	} else if (in->past_files) {
+		if (!in->file_deletes)
+			in->file_deletes = gf_list_new();
+
+		//move pas files beyond our timeshift to list of files to delete
+		//we don't call delete directly since the file could still be used by a session
+		while (gf_list_count(in->past_files)>in->max_segs) {
+			char *url = gf_list_pop_front(in->past_files);
+			gf_list_add(in->file_deletes, url);
+		}
+		if (!is_static)
+			gf_list_add(in->past_files, gf_strdup(in->path));
 	}
 	return GF_TRUE;
 }
@@ -2134,11 +2889,15 @@
 	in->is_open = GF_FALSE;
 	in->done = GF_TRUE;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOut] Closing output file %s\n", in->local_path ? in->local_path : in->path));
+	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Closing output %s\n", in->local_path ? in->local_path : in->path));
+
 	if (in->upload) {
-		GF_Err e = gf_dm_sess_send(in->upload, "0\r\n\r\n", 5);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error writing last chunk to output file %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
+		GF_Err e;
+		if (!in->is_h2) {
+			e = gf_dm_sess_send(in->upload, "0\r\n\r\n", 5);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error sending last chunk to %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
+			}
 		}
 		//signal we're done sending the body
 		gf_dm_sess_send(in->upload, NULL, 0);
@@ -2146,23 +2905,39 @@
 		//fetch reply (blocking)
 		e = gf_dm_sess_process(in->upload);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error closing output file %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error closing output %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
 		}
 
 	} else {
 		u32 i, count;
-		if (in->resource) {
-			u64 file_size = gf_ftell(in->resource);
 
+		if (ctx->log_record) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("[HTTPOut] Closing output file %s\n", in->local_path ? in->local_path : in->path));
+		}
+
+		if (in->resource) {
 			assert(in->local_path);
+			//close all LL-HLS chunks before closing session
+			httpout_close_hls_chunk(ctx, in, GF_FALSE);
+
 			//detach all clients from this input and reassign to a regular output
 			count = gf_list_count(ctx->sessions);
 			for (i=0; i<count; i++) {
 				GF_HTTPOutSession *sess = gf_list_get(ctx->sessions, i);
 				if (sess->in_source != in) continue;
 				assert(sess->file_in_progress);
-				sess->in_source = NULL;
-				sess->file_size = file_size;
+				if (sess->in_source) {
+					//in mem mode, sess->path may still be a local path, convert to gfio of source if needed
+					httpout_check_mem_path(sess, sess->in_source);
+					sess->in_source->nb_dest--;
+					sess->in_source = NULL;
+					if (!sess->resource && sess->path) {
+						sess->resource = gf_fopen(sess->path, "rb");
+					}
+				}
+				//get final size by forcing a seek
+				sess->file_size = gf_fsize(sess->resource);
+				gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
 				sess->file_in_progress = GF_FALSE;
 			}
 			gf_fclose(in->resource);
@@ -2172,55 +2947,134 @@
 			for (i=0; i<count; i++) {
 				GF_HTTPOutSession *sess = gf_list_get(ctx->active_sessions, i);
 				if (sess->in_source != in) continue;
+				assert(sess->nb_bytes);
+				if (!sess->is_h2)
+					gf_dm_sess_send(sess->http_sess, "0\r\n\r\n", 5);
+
+				//signal we're done sending the body
+				gf_dm_sess_send(sess->http_sess, NULL, 0);
 
-				httpout_sess_send(sess, "0\r\n\r\n", 5);
 				log_request_done(sess);
 			}
 		}
 	}
 	in->nb_write = 0;
 }
+
+//for upload of LLHLS in seperate file mode only
+static void httpout_close_input_llhls(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in)
+{
+	GF_Err e;
+	if (!in->llhls_is_open) return;
+	in->llhls_is_open = GF_FALSE;
+	//close prev session
+	if (!in->is_h2) {
+		e = gf_dm_sess_send(in->llhls_upload, "0\r\n\r\n", 5);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error sending last chunk of LLHLS part from %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
+		}
+	}
+	//signal we're done sending the body
+	gf_dm_sess_send(in->llhls_upload, NULL, 0);
+
+	//fetch reply (blocking)
+	e = gf_dm_sess_process(in->llhls_upload);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error closing output %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
+	}
+}
+
+//for upload of LLHLS in seperate file mode only
+static Bool httpout_open_input_llhls(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in, char *dst)
+{
+	GF_Err e = gf_dm_sess_setup_from_url(in->llhls_upload, dst, GF_TRUE);
+	if (!e) {
+		in->llhls_cur_header = 0;
+		e = gf_dm_sess_process(in->llhls_upload);
+	}
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Failed to open output file %s: %s\n", in->path, gf_error_to_string(e) ));
+		in->llhls_is_open = GF_FALSE;
+		return GF_FALSE;
+	}
+
+	in->llhls_is_open = GF_TRUE;
+	if (in->llhls_url != dst) {
+		if (in->llhls_url) gf_free(in->llhls_url);
+		in->llhls_url = gf_strdup(dst);
+	}
+	return GF_TRUE;
+}
+
+
 u32 httpout_write_input(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in, const u8 *pck_data, u32 pck_size, Bool file_start)
 {
-	char szHdr[100];
-	u32 len, out=0;
+	u32 out=0;
 
 	if (!in->is_open) return 0;
 
-	sprintf(szHdr, "%X\r\n", pck_size);
-	len = (u32) strlen(szHdr);
-
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOut] Writing %d bytes to output file %s\n", pck_size, in->local_path ? in->local_path : in->path));
 
 	if (in->upload) {
+		char szChunkHdr[100];
+		u32 chunk_hdr_len=0;
 		GF_Err e;
+		u32 s_idx, max_out = 1;
 		u32 nb_retry = 0;
 		out = pck_size;
 
+		if (!in->is_h2) {
+			sprintf(szChunkHdr, "%X\r\n", pck_size);
+			chunk_hdr_len = (u32) strlen(szChunkHdr);
+		}
+		if (in->llhls_upload && in->llhls_is_open)
+			max_out = 2;
+
+		for (s_idx=0; s_idx<max_out; s_idx++) {
+			GF_DownloadSession *up_sess = s_idx ? in->llhls_upload : in->upload;
 retry:
-		e = gf_dm_sess_send(in->upload, szHdr, len);
-		if (!e) e = gf_dm_sess_send(in->upload, (u8 *) pck_data, pck_size);
-		strcpy(szHdr, "\r\n");
-		if (!e) e = gf_dm_sess_send(in->upload, szHdr, 2);
-
-		if (e==GF_IP_CONNECTION_CLOSED) {
-			if (file_start && (nb_retry<10) ) {
-				in->is_open = GF_FALSE;
-				nb_retry++;
-				if (httpout_open_input(ctx, in, in->path, GF_FALSE))
-					goto retry;
+			if (!in->is_h2) {
+				e = gf_dm_sess_send(up_sess, szChunkHdr, chunk_hdr_len);
+				if (!e) e = gf_dm_sess_send(up_sess, (u8 *) pck_data, pck_size);
+				if (!e) e = gf_dm_sess_send(up_sess, "\r\n", 2);
+			} else {
+				e = gf_dm_sess_send(up_sess, (u8 *) pck_data, pck_size);
+			}
+			if (e==GF_IP_CONNECTION_CLOSED) {
+				if (file_start && (nb_retry<10) ) {
+					in->is_open = GF_FALSE;
+					nb_retry++;
+					if (s_idx) {
+						if (httpout_open_input_llhls(ctx, in, in->llhls_url))
+							goto retry;
+					} else {
+						if (httpout_open_input(ctx, in, in->path, GF_FALSE, GF_FALSE))
+							goto retry;
+					}
+				}
+			}
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error writing to output file %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
+				out = 0;
 			}
-		}
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error writing to output file %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
-			out = 0;
 		}
 
 	} else {
+		char szChunkHdr[100];
+		u32 chunk_hdr_len=0;
 		u32 i, count = gf_list_count(ctx->active_sessions);
 
 		if (in->resource) {
 			out = (u32) gf_fwrite(pck_data, pck_size, in->resource);
+			gf_fflush(in->resource);
+
+			if (in->hls_chunk) {
+				u32 wb = (u32) gf_fwrite(pck_data, pck_size, in->hls_chunk);
+				if (wb != pck_size) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Write error for HLS chunk, wrote %d bytes but had %d to write\n", wb, pck_size));
+				}
+				gf_fflush(in->hls_chunk);
+			}
 		}
 
 		for (i=0; i<count; i++) {
@@ -2228,30 +3082,44 @@
 			if (sess->in_source != in) continue;
 
 			if (sess->send_init_data && in->tunein_data_size && !sess->file_in_progress) {
-				char szHdrInit[100];
-				sprintf(szHdrInit, "%X\r\n", in->tunein_data_size);
-				u32 len_hdr = (u32) strlen(szHdrInit);
-				httpout_sess_send(sess, szHdrInit, len_hdr);
-				httpout_sess_send(sess, in->tunein_data, in->tunein_data_size);
-				httpout_sess_send(sess, "\r\n", 2);
+				if (!sess->is_h2) {
+					char szHdrInit[100];
+					sprintf(szHdrInit, "%X\r\n", in->tunein_data_size);
+					u32 len_hdr = (u32) strlen(szHdrInit);
+					gf_dm_sess_send(sess->http_sess, szHdrInit, len_hdr);
+					gf_dm_sess_send(sess->http_sess, in->tunein_data, in->tunein_data_size);
+					gf_dm_sess_send(sess->http_sess, "\r\n", 2);
+				} else {
+					gf_dm_sess_send(sess->http_sess, in->tunein_data, in->tunein_data_size);
+				}
 				sess->nb_bytes += in->tunein_data_size;
 			}
 			sess->send_init_data = GF_FALSE;
 			out = pck_size;
 
-			/*source is read from disk, but update file size (this avoids refreshing the file size at each process)*/
+			/*source is read from disk but a different file handle is used, force refresh by using fseek (so use fsize and seek back to current pos)*/
 			if (sess->file_in_progress) {
-				sess->file_size += pck_size;
+				sess->file_size = gf_fsize(sess->resource);
+				gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
 			}
 			/*source is not read from disk, write data*/
 			else {
-				httpout_sess_send(sess, szHdr, len);
-				httpout_sess_send(sess, pck_data, pck_size);
-				httpout_sess_send(sess, "\r\n", 2);
+				if (!sess->is_h2) {
+					if (!chunk_hdr_len) {
+						sprintf(szChunkHdr, "%X\r\n", pck_size);
+						chunk_hdr_len = (u32) strlen(szChunkHdr);
+					}
+					gf_dm_sess_send(sess->http_sess, szChunkHdr, chunk_hdr_len);
+					gf_dm_sess_send(sess->http_sess, (u8*) pck_data, pck_size);
+					gf_dm_sess_send(sess->http_sess, "\r\n", 2);
+				} else {
+					gf_dm_sess_send(sess->http_sess, (u8*) pck_data, pck_size);
+				}
 				sess->nb_bytes += pck_size;
 			}
 		}
 	}
+	//don't reschedule, we will be notified when new packets are ready
 	ctx->next_wake_us = 0;
 	return out;
 }
@@ -2259,7 +3127,7 @@
 static Bool httpout_input_write_ready(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in)
 {
 	u32 i, count;
-	if (ctx->rdirs)
+	if (ctx->rdirs.nb_items)
 		return GF_TRUE;
 
 	if (in->upload) {
@@ -2287,13 +3155,13 @@
 	evt.seg_size.seg_url = NULL;
 
 	if (in->dash_mode==1) {
-		evt.seg_size.is_init = GF_TRUE;
+		evt.seg_size.is_init = 1;
 		in->dash_mode = 2;
 		evt.seg_size.media_range_start = 0;
 		evt.seg_size.media_range_end = 0;
 		gf_filter_pid_send_event(in->ipid, &evt);
 	} else {
-		evt.seg_size.is_init = GF_FALSE;
+		evt.seg_size.is_init = 0;
 		evt.seg_size.media_range_start = in->offset_at_seg_start;
 		evt.seg_size.media_range_end = in->nb_write-1;
 		in->offset_at_seg_start = 1+evt.seg_size.media_range_end;
@@ -2301,32 +3169,39 @@
 	}
 }
 
+static void httpout_prune_files(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in)
+{
+	//not sending/writing anything, delete files
+	if (!in->is_open && in->file_deletes) {
+		while (gf_list_count(in->file_deletes)) {
+			char *url = gf_list_pop_front(in->file_deletes);
+			httpout_open_input(ctx, in, url, GF_TRUE, GF_FALSE);
+			gf_free(url);
+		}
+		gf_list_del(in->file_deletes);
+		in->file_deletes = NULL;
+	}
+}
 static void httpout_process_inputs(GF_HTTPOutCtx *ctx)
 {
 	u32 i, nb_eos=0, nb_nopck=0, count = gf_list_count(ctx->inputs);
 	for (i=0; i<count; i++) {
 		Bool start, end;
+		const GF_PropertyValue *p;
 		const u8 *pck_data;
 		u32 pck_size, nb_write;
 		GF_FilterPacket *pck;
 		GF_HTTPOutInput *in = gf_list_get(ctx->inputs, i);
+		if (in->in_error) continue;
 
-		//not sending/writing anything, delete files
-		if (!in->is_open && in->file_deletes) {
-			while (gf_list_count(in->file_deletes)) {
-				char *url = gf_list_pop_back(in->file_deletes);
-				httpout_open_input(ctx, in, url, GF_TRUE);
-				gf_free(url);
-			}
-			gf_list_del(in->file_deletes);
-			in->file_deletes = NULL;
-		}
+		httpout_prune_files(ctx, in);
 
 		//no destination and holding for first connect, don't drop
-		if (!ctx->hmode && !ctx->rdirs && !in->nb_dest && in->hold) {
+		if (!ctx->hmode && !ctx->rdirs.nb_items && !in->nb_dest && in->hold) {
 			continue;
 		}
 
+next_pck:
 		pck = gf_filter_pid_get_packet(in->ipid);
 		if (!pck) {
 			nb_nopck++;
@@ -2345,7 +3220,7 @@
 		gf_filter_pck_get_framing(pck, &start, &end);
 
 		if (in->dash_mode) {
-			const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
 			if (p) {
 				httpin_send_seg_info(in);
 
@@ -2355,6 +3230,7 @@
 		}
 
 		if (start) {
+			Bool is_static = in->is_manifest;
 			const GF_PropertyValue *fnum, *fname;
 			const char *name = NULL;
 			fname = NULL;
@@ -2362,6 +3238,8 @@
 			if (in->is_open)
 				httpout_close_input(ctx, in);
 
+			httpout_prune_files(ctx, in);
+
 			//file num increased per packet, open new file
 			fnum = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
 			if (fnum) {
@@ -2369,21 +3247,40 @@
 				//if (!fname) name = ctx->dst;
 			}
 			//filename change at packet start, open new file
-			if (!fname) fname = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
+			if (!fname) {
+				fname = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
+				if (fname) in->force_dst_name = GF_FALSE;
+			}
+
 			if (!fname) fname = gf_filter_pck_get_property(pck, GF_PROP_PID_OUTPATH);
 			if (fname) name = fname->value.string;
 
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_INIT);
+			if (p && p->value.boolean) is_static = GF_TRUE;
+
 			if (!name) {
 				/*if PID was connected to an alias, get the alias context to get the destination
 				Otherwise PID was directly connected to the main filter, use main filter destination*/
 				GF_HTTPOutCtx *orig_ctx = gf_filter_pid_get_alias_udta(in->ipid);
 				if (!orig_ctx) orig_ctx = ctx;
-				name = orig_ctx->dst;
+
+				if (orig_ctx->dst_in && (orig_ctx->dst_in != in) ) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Mutliple input PIDs with no file name set, broken graph, discarding input %s\n\tYou may retry by adding a new http output filter\n", gf_filter_pid_get_name(in->ipid) ));
+
+					gf_filter_pid_set_discard(in->ipid, GF_TRUE);
+					in->in_error = GF_TRUE;
+					continue;
+				} else {
+					name = orig_ctx->dst;
+					orig_ctx->dst_in = in;
+				}
+			} else if (in->force_dst_name && !ctx->dst_in) {
+				ctx->dst_in = in;
 			}
 
-			httpout_open_input(ctx, in, name, GF_FALSE);
+			httpout_open_input(ctx, in, name, GF_FALSE, is_static);
 
-			if (!ctx->hmode && !ctx->rdirs && !in->nb_dest) {
+			if (!ctx->hmode && !ctx->rdirs.nb_items && !in->nb_dest) {
 				if ((gf_filter_pck_get_dependency_flags(pck)==0xFF) && (gf_filter_pck_get_carousel_version(pck)==1)) {
 					pck_data = gf_filter_pck_get_data(pck, &pck_size);
 					if (pck_data) {
@@ -2395,8 +3292,41 @@
 			}
 		}
 
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_HLS_FRAG_NUM);
+		if (p && in->resource) {
+			char szHLSChunk[GF_MAX_PATH];
+			snprintf(szHLSChunk, GF_MAX_PATH-1, "%s.%d", in->local_path, p->value.uint);
+			httpout_close_hls_chunk(ctx, in, GF_FALSE);
+			//for mem mode, pass the parent gfio for fileIO construction
+			in->hls_chunk = gf_fopen_ex(szHLSChunk, ctx->mem_url, "wb", GF_FALSE);
+			in->hls_chunk_local_path = gf_strdup(szHLSChunk);
+			snprintf(szHLSChunk, GF_MAX_PATH-1, "%s.%d", in->path, p->value.uint);
+			in->hls_chunk_path = gf_strdup(szHLSChunk);
+
+			if (ctx->mem_url && in->hls_chunk) {
+				GF_HTTPFileIO *hio = gf_fileio_get_udta((GF_FileIO *) in->hls_chunk);
+				hio->in = in;
+				hio->hls_ll_chunk = GF_TRUE;
+				gf_list_add(in->mem_files, hio);
+			}
+		} else if (p && in->upload) {
+			GF_Err e;
+			char szHLSChunk[GF_MAX_PATH];
+			snprintf(szHLSChunk, GF_MAX_PATH-1, "%s.%d", in->path, p->value.uint);
+
+			if (!in->llhls_upload) {
+				in->llhls_upload = gf_dm_sess_new(gf_filter_get_download_manager(ctx->filter), ctx->dst, GF_NETIO_SESSION_NOT_THREADED|GF_NETIO_SESSION_NOT_CACHED|GF_NETIO_SESSION_PERSISTENT, httpout_in_io_llhls, in, &e);
+			}
+
+			if (in->llhls_upload) {
+				httpout_close_input_llhls(ctx, in);
+
+				httpout_open_input_llhls(ctx, in, szHLSChunk);
+			}
+		}
+
 		//no destination and not holding packets (either first connection not here or disabled), trash packet
-		if (!ctx->hmode && !ctx->rdirs && !in->nb_dest && !in->hold) {
+		if (!ctx->hmode && !ctx->rdirs.nb_items && !in->nb_dest && !in->hold) {
 			gf_filter_pid_drop_packet(in->ipid);
 			continue;
 		}
@@ -2424,7 +3354,7 @@
 							//re-open file
 							in->write_start_range = bo;
 							in->write_end_range = bo + pck_size - 1;
-							httpout_open_input(ctx, in, in->path, GF_FALSE);
+							httpout_open_input(ctx, in, in->path, GF_FALSE, GF_FALSE);
 
 							nb_write = httpout_write_input(ctx, in, pck_data, pck_size, start);
 							if (nb_write!=pck_size) {
@@ -2438,7 +3368,7 @@
 					}
 				} else {
 					if (in->write_start_range) {
-						httpout_open_input(ctx, in, in->path, GF_FALSE);
+						httpout_open_input(ctx, in, in->path, GF_FALSE, GF_FALSE);
 					}
 
 					nb_write = httpout_write_input(ctx, in, pck_data, pck_size, start);
@@ -2450,7 +3380,6 @@
 			} else if (hwf) {
 				u32 w, h, stride, stride_uv, pf;
 				u32 nb_planes, uv_height;
-				const GF_PropertyValue *p;
 				p = gf_filter_pid_get_property(in->ipid, GF_PROP_PID_WIDTH);
 				w = p ? p->value.uint : 0;
 				p = gf_filter_pid_get_property(in->ipid, GF_PROP_PID_HEIGHT);
@@ -2490,7 +3419,7 @@
 					}
 				}
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] No data associated with packet, cannot write\n"));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPOut] No data associated with packet, cannot write\n"));
 			}
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] output file handle is not opened, discarding %d bytes\n", pck_size));
@@ -2498,11 +3427,14 @@
 		gf_filter_pid_drop_packet(in->ipid);
 		if (end) {
 			httpout_close_input(ctx, in);
+			httpout_close_input_llhls(ctx, in);
 		}
+
+		goto next_pck;
 	}
 
 	if (count && (nb_eos==count)) {
-		if (ctx->rdirs) {
+		if (ctx->rdirs.nb_items) {
 			if (gf_list_count(ctx->active_sessions))
 				gf_filter_post_process_task(ctx->filter);
 			else
@@ -2511,7 +3443,7 @@
 		else
 			ctx->done = GF_TRUE;
 	}
-	//push mode and no packets on inputs, do not ask for RT reschedule (we will get called f new packets are to be processed)
+	//push mode and no packets on inputs, do not ask for RT reschedule (we will get called if new packets are to be processed)
 	if ((nb_nopck==count) && (ctx->hmode==MODE_PUSH))
 		ctx->next_wake_us = 0;
 }
@@ -2528,7 +3460,7 @@
 	//wakeup every 50ms when inactive
 	ctx->next_wake_us = 50000;
 
-	gf_sk_group_select(ctx->sg, 10, GF_SK_SELECT_BOTH);
+	e = gf_sk_group_select(ctx->sg, 10, GF_SK_SELECT_BOTH);
 	if ((e==GF_OK) && ctx->server_sock) {
 		//server mode, check pending connections
 		if (gf_sk_group_sock_is_set(ctx->sg, ctx->server_sock, GF_SK_SELECT_READ)) {
@@ -2544,12 +3476,19 @@
 			//regular download
 			httpout_process_session(filter, ctx, sess);
 			//closed, remove
-			if (! sess->socket) {
+			if (! sess->http_sess) {
 				httpout_del_session(sess);
 				i--;
 				count--;
 				if (!count && ctx->quit)
 					ctx->done = GF_TRUE;
+				continue;
+			}
+
+			if (sess->sub_sess_pending) {
+				sess->sub_sess_pending = GF_FALSE;
+				count = gf_list_count(ctx->active_sessions);
+				i = -1;
 			}
 		}
 	}
@@ -2567,7 +3506,7 @@
 			if (diff_sec>ctx->timeout) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTPOut] Timeout for peer %s after %d sec, closing connection (last request %s)\n", sess->peer_address, diff_sec, sess->in_source ? sess->in_source->path : sess->path ));
 
-				httpout_reset_socket(sess);
+				httpout_close_session(sess);
 
 				httpout_del_session(sess);
 				i--;
@@ -2581,8 +3520,14 @@
 		e=GF_OK;
 	}
 
-	if (ctx->next_wake_us)
+	//reschedule was canceled but we still have active sessions, reschedule for our default timeout
+	if (!ctx->next_wake_us && gf_list_count(ctx->active_sessions)) {
+		ctx->next_wake_us = 50000;
+	}
+
+	if (ctx->next_wake_us) {
 		gf_filter_ask_rt_reschedule(filter, ctx->next_wake_us);
+	}
 
 	return e;
 }
@@ -2599,12 +3544,11 @@
 	if (!in) return GF_TRUE;
 
 	ctx = (GF_HTTPOutCtx *) gf_filter_get_udta(filter);
-		//simple server mode (no record, no push), nothing to do
-	if (!in->upload && !ctx->rdirs) return GF_TRUE;
+	//simple server mode (no record, no push), nothing to do
+	if (!in->upload && !ctx->rdirs.nb_items) return GF_TRUE;
 
 	if (!in->file_deletes)
 		in->file_deletes = gf_list_new();
-
 	gf_list_add(in->file_deletes, gf_strdup(evt->file_del.url));
 	return GF_TRUE;
 }
@@ -2649,34 +3593,40 @@
 #define OFFS(_n)	#_n, offsetof(GF_HTTPOutCtx, _n)
 static const GF_FilterArgs HTTPOutArgs[] =
 {
-	{ OFFS(dst), "location of destination file - see filter help ", GF_PROP_NAME, NULL, NULL, 0},
-	{ OFFS(port), "server port", GF_PROP_UINT, "80", NULL, 0},
-	{ OFFS(ifce), "default network inteface to use", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(rdirs), "list of directories to expose for read - see filter help", GF_PROP_STRING_LIST, NULL, NULL, 0},
-	{ OFFS(wdir), "directory to expose for write - see filter help", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(dst), "location of destination resource", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(port), "server port", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(ifce), "default network interface to use", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(rdirs), "list of directories to expose for read", GF_PROP_STRING_LIST, NULL, NULL, 0},
+	{ OFFS(wdir), "directory to expose for write", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(cert), "certificate file in PEM format to use for TLS mode", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(pkey), "private key file in PEM format to use for TLS mode", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(block_size), "block size used to read and write TCP socket", GF_PROP_UINT, "10000", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(user_agent), "user agent string, by default solved from GPAC preferences", GF_PROP_STRING, "$GUA", NULL, 0},
 	{ OFFS(close), "close HTTP connection after each request", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(maxc), "maximum number of connections, 0 is unlimited", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(maxp), "maximum number of connections for one peer, 0 is unlimited", GF_PROP_UINT, "6", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(cache_control), "specify the `Cache-Control` string to add; `none` disable ETag", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(maxp), "maximum number of connections for one peer (0 is unlimited)", GF_PROP_UINT, "6", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(cache_control), "specify the `Cache-Control` string to add (`none` disable cache control and ETag)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(hold), "hold packets until one client connects", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(hmode), "filter operation mode, ignored if [-wdir]() is set. See filter help for more details. Mode can be\n"
-	"- default: run in server mode (see filter help)\n"
-	"- push: run in client mode using PUT or POST (see filter help)\n"
+	{ OFFS(hmode), "filter operation mode, ignored if [-wdir]() is set\n"
+	"- default: run in server mode\n"
+	"- push: run in client mode using PUT or POST\n"
 	"- source: use server as source filter on incoming PUT/POST", GF_PROP_UINT, "default", "default|push|source", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(timeout), "timeout in seconds for persistent connections; 0 disable timeout", GF_PROP_UINT, "30", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(timeout), "timeout in seconds for persistent connections (0 disable timeout)", GF_PROP_UINT, "30", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ext), "set extension for graph resolution, regardless of file extension", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(mime), "set mime type for graph resolution", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(quit), "exit server once all input PIDs are done and client disconnects (for test purposes)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(post), "use POST instead of PUT for uploading files", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(dlist), "enable HTML listing for GET requests on directories", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(sutc), "insert server UTC in response headers as `Server-UTC: VAL_IN_MS`", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(cors), "insert CORS header allowing all domains", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(reqlog), "provide short log of the requests indicated in this option (comma separated list, `*` for all) regardless of HTTP log settings", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(ice), "insert ICE meta-data in response headers in sink mode - see filter help", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(cors), "insert CORS header allowing all domains\n"
+		"- off: disable CORS\n"
+		"- on: enable CORS\n"
+		"- auto: enable CORS when `Origin` is found in request", GF_PROP_UINT, "auto", "auto|off|on", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(reqlog), "provide short log of the requests indicated in this option (comma separated list, `*` for all) regardless of HTTP log settings. Value `REC` logs file writing start/end", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(ice), "insert ICE meta-data in response headers in sink mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(max_client_errors), "force disconnection after specified number of consecutive errors from HTTTP 1.1 client (ignored in H/2 or when `close` is set)", GF_PROP_UINT, "20", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(max_cache_segs), "maximum number of segments cached per HAS quality (see filter help)", GF_PROP_SINT, "5", NULL, GF_FS_ARG_HINT_EXPERT},
+
 	{0}
 };
 
@@ -2692,7 +3642,7 @@
 		"- an HTTP __client__ sink\n"
 		"- an HTTP server __source__\n"
 		" \n"
-		"The server currently handles GET, HEAD, PUT, POST, DELETE methods.\n"
+		"The server currently handles GET, HEAD, PUT, POST, DELETE methods, and basic OPTIONS support.\n"
 		"Single or multiple byte ranges are supported for both GET and PUT/POST methods, in all server modes.\n"
 		"- for GET, the resulting body is a single-part body formed by the concatenated byte ranges as requested (no overlap checking).\n"
 		"- for PUT/POST, the received data is pushed to the target file according to the byte ranges specified in the client request.\n"
@@ -2708,7 +3658,7 @@
 		"When enabled, a GET on a directory will return a simple HTML listing of the content inspired from Apache.\n"
 		" \n"
 		"# Simple HTTP server\n"
-		"In this mode, the filter doesn't need any input connection and exposes all files in the directories given by [-rdirs]().\n"
+		"In this mode, the filter does not need any input connection and exposes all files in the directories given by [-rdirs]().\n"
 		"PUT and POST methods are only supported if a write directory is specified by [-wdir]() option.\n"
 		"EX gpac httpout:rdirs=outcoming\n"
 		"This sets up a read-only server.\n"
@@ -2721,16 +3671,16 @@
 		" \n"
 		"# HTTP server sink\n"
 		"In this mode, the filter will forward input PIDs to connected clients, trashing the data if no client is connected unless [-hold]() is specified.\n"
-		"The filter doesn't use any read directory in this mode.\n"
-		"This mode is mostly usefull to setup live HTTP streaming of media sessions such as MP3, MPEG-2 TS or other muxed representations:\n"
+		"The filter does not use any read directory in this mode.\n"
+		"This mode is mostly useful to setup live HTTP streaming of media sessions such as MP3, MPEG-2 TS or other multiplexed representations:\n"
 		"EX gpac -i MP3_SOURCE -o http://localhost/live.mp3 --hold\n"
 		"In this example, the server waits for client requests on `/live.mp3` and will then push each input packet to all connected clients.\n"
 		"If the source is not real-time, you can inject a reframer filter performing realtime regulation.\n"
-		"EX gpac -i MP3_SOURCE reframer:rt=on @ -o http://localhost/live.mp3\n"
+		"EX gpac -i MP3_SOURCE reframer:rt=on -o http://localhost/live.mp3\n"
 		"In this example, the server will push each input packet to all connected clients, or trash the packet if no connected clients.\n"
 		" \n"
 		"In this mode, ICECast meta-data can be inserted using [-ice](). The default inserted values are `ice-audio-info`, `icy-br`, `icy-pub` (set to 1) and `icy-name` if input `ServiceName` property is set.\n"
-		"The server will also look for any property called `ice-*` on the input pid and inject them.\n"
+		"The server will also look for any property called `ice-*` on the input PID and inject them.\n"
 		"EX gpac -i source.mp3:#ice-Genre=CoolRock -o http://IP/live.mp3 --ice\n"
 		"This will inject the header `ice-Genre: CoolRock` in the response."
 		" \n"
@@ -2740,11 +3690,19 @@
 		"Upon client GET request, the server will check if the requested URL matches the name of a file currently being written by the server.\n"
 		"- If so, the server will:\n"
 		" - send the content using HTTP chunk transfer mode, starting with what is already written on disk\n"
-		" - push remaining data to the client as soon as recieved while writing it to disk, until source file is done\n"
+		" - push remaining data to the client as soon as received while writing it to disk, until source file is done\n"
 		"- If not so, the server will simply send the file from the disk as a regular HTTP session, without chunk transfer.\n"
 		" \nThis mode is typically used for origin server in HAS sessions where clients may request files while they are being produced (low latency DASH).\n"
-		"EX gpac -i SOURCE reframer:rt=on @ -o http://localhost:8080/live.mpd --rdirs=temp --dmode=dynamic --cdur=0.1\n"
-		"In this example, a real-time dynamic DASH session with chunks of 100ms is created, outputing files in `temp`. A client connecting to the live edge will receive segments as they are produced using HTTP chunk transfer.\n"
+		"EX gpac -i SOURCE reframer:rt=on -o http://localhost:8080/live.mpd --rdirs=temp --dmode=dynamic --cdur=0.1\n"
+		"In this example, a real-time dynamic DASH session with chunks of 100ms is created, writing files to `temp`. A client connecting to the live edge will receive segments as they are produced using HTTP chunk transfer.\n"
+		" \n"
+		"The server can store incoming files to memory mode by setting the read directory to `gmem`.\n"
+		"In this mode, [-max_cache_segs]() is always at least 1.\n"
+		" \n"
+		"If [-max_cache_segs]() valeu `N` is not 0, each incoming PID will store at most:\n"
+		"- `MIN(N, time-shift depth)` files if stored in memory\n"
+		"- `MAX(N, time-shift depth)` files if stored locally and `N` is positive\n"
+		"- `-N` files if stored locally and `N` is negative\n"
 		" \n"
 		"# HTTP client sink\n"
 		"In this mode, the filter will upload input PIDs data to remote server using PUT (or POST if [-post]() is set).\n"
@@ -2764,6 +3722,16 @@
 		"The server can run over TLS (https) for all the server modes. TLS is enabled by specifying [-cert]() and [-pkey]() options.\n"
 		"Both certificate and key must be in PEM format.\n"
 		"The server currently only operates in either HTTPS or HTTP mode and cannot run both modes at the same time. You will need to use two httpout filters for this, one operating in HTTPS and one operating in HTTP.\n"
+		" \n"
+		"# Multiple destinations on single server\n"
+		"When running in server mode, multiple HTTP outputs with same URL/port may be used:\n"
+		"- the first loaded HTTP output filter with same URL/port will be reused\n"
+		"- all httpout options of subsequent httpout filters, except [-dst]() will be ignored, other options will be inherited as usual\n"
+		"\n"
+		"EX gpac -i dash.mpd dashin:forward=file:SID=D1 dashin:forward=segb:SID=D2 -o http://localhost:80/live.mpd:SID=D1:rdirs=dash -o http://localhost:80/live_rw.mpd:SID=D2:sigfrag\n"
+		"This will:\n"
+		"- load the HTTP server and forward (through `D1`) the dash session to this server using `live.mpd` as manifest name\n"
+		"- reuse the HTTP server and regenerate the manifest (through `D2` and `sigfrag` option), using `live_rw.mpd` as manifest name\n"
 		)
 	.private_size = sizeof(GF_HTTPOutCtx),
 	.max_extra_pids = -1,

gpac-1.0.1.tar.gz/src/filters/out_pipe.c -> gpac-2.0.0.tar.gz/src/filters/out_pipe.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / generic pipe output filter
@@ -69,7 +69,7 @@
 
 	GF_FilterCapability in_caps[2];
 	char szExt[10];
-	char szFileName[GF_MAX_PATH];
+	char *szFileName;
 	Bool owns_pipe;
 
 } GF_PipeOutCtx;
@@ -108,7 +108,7 @@
 	}
 	gf_filter_pid_resolve_file_template(ctx->pid, szName, szFinalName, file_idx, NULL);
 
-	if (!strcmp(szFinalName, ctx->szFileName) 
+	if (ctx->szFileName && !strcmp(szFinalName, ctx->szFileName) 
 #ifdef WIN32
 		&& (ctx->pipe != INVALID_HANDLE_VALUE)
 #else
@@ -191,15 +191,15 @@
 	ctx->fd = open(szFinalName, O_WRONLY );
 
 	if (ctx->fd<0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] cannot open output pipe %s: %s\n", ctx->szFileName, gf_errno_str(errno)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Cannot open output pipe %s: %s\n", szFinalName, gf_errno_str(errno)));
 		e = ctx->owns_pipe ? GF_IO_ERR : GF_URL_ERROR;
 	}
 #endif
 	if (e) {
 		return e;
 	}
-	strncpy(ctx->szFileName, szFinalName, GF_MAX_PATH-1);
-	ctx->szFileName[GF_MAX_PATH-1] = 0;
+	if (ctx->szFileName) gf_free(ctx->szFileName);
+	ctx->szFileName = gf_strdup(szFinalName);
 	return GF_OK;
 }
 
@@ -302,8 +302,11 @@
 	GF_PipeOutCtx *ctx = (GF_PipeOutCtx *) gf_filter_get_udta(filter);
 	pipeout_open_close(ctx, NULL, NULL, 0, GF_FALSE);
 
-	if (ctx->owns_pipe)
-		gf_file_delete(ctx->szFileName);
+	if (ctx->szFileName) {
+		if (ctx->owns_pipe)
+			gf_file_delete(ctx->szFileName);
+		gf_free(ctx->szFileName);
+	}
 }
 
 static GF_Err pipeout_process(GF_Filter *filter)
@@ -377,7 +380,7 @@
 		GF_FilterFrameInterface *hwf = gf_filter_pck_get_frame_interface(pck);
 		if (pck_data) {
 #ifdef WIN32
-			if (! WriteFile(ctx->pipe, pck_data, pck_size, &nb_write, NULL)) {
+			if (! WriteFile(ctx->pipe, pck_data, pck_size, (LPDWORD) &nb_write, NULL)) {
 				nb_write = 0;
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Write error, wrote %d bytes but had %u to write: error %d\n", nb_write, pck_size, GetLastError() ));
 			}
@@ -420,7 +423,7 @@
 
 					for (j=0; j<write_h; j++) {
 #ifdef WIN32
-						if (!WriteFile(ctx->pipe, out_ptr, lsize, &nb_write, NULL)) {
+						if (!WriteFile(ctx->pipe, out_ptr, lsize, (LPDWORD) &nb_write, NULL)) {
 							nb_write = 0;
 							GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Write error, wrote %d bytes but had %u to write: %d\n", nb_write, pck_size, GetLastError()));
 						}
@@ -438,7 +441,7 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[PipeOut] No data associated with packet, cannot write\n"));
 		}
 	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] output file handle is not opened, discarding %d bytes\n", pck_size));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Output file handle is not opened, discarding %d bytes\n", pck_size));
 	}
 	gf_filter_pid_drop_packet(ctx->pid);
 	if (end) {
@@ -459,13 +462,13 @@
 
 static const GF_FilterArgs PipeOutArgs[] =
 {
-	{ OFFS(dst), "location of destination file", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(dst), "name of destination pipe", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(ext), "indicate file extension of pipe data", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(mime), "indicate mime type of pipe data", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(dynext), "indicate the file extension is set by filter chain, not dst", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(start), "set playback start offset. Negative value means percent of media dur with -1 <=> dur", GF_PROP_DOUBLE, "0.0", NULL, 0},
-	{ OFFS(speed), "set playback speed. If speed is negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
-	{ OFFS(mkp), "create pipe if not found - see filter help", GF_PROP_BOOL, "false", NULL, 0 },
+	{ OFFS(start), "set playback start offset. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, 0},
+	{ OFFS(speed), "set playback speed. If negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{ OFFS(mkp), "create pipe if not found", GF_PROP_BOOL, "false", NULL, 0 },
 	{ OFFS(block_size), "buffer size used to write to pipe, windows only", GF_PROP_UINT, "5000", NULL, GF_FS_ARG_HINT_ADVANCED },
 	{0}
 };
@@ -481,19 +484,19 @@
 GF_FilterRegister PipeOutRegister = {
 	.name = "pout",
 	GF_FS_SET_DESCRIPTION("pipe output")
-	GF_FS_SET_HELP("This filter handles generic output pipes (mono-directional) in blocking mode only.\n"\
-		"Warning: Output pipes do not currently support non blocking mode.\n"\
-		"The assoicated protocol scheme is `pipe://` when loaded as a generic output (eg, -o `pipe://URL` where URL is a relative or absolute pipe name).\n"\
-		"Data format of the pipe **shall** be specified using extension (either in filename or through [-ext]() option) or MIME type through [-mime]()\n"\
-		"The pipe name indicated in [-dst]() can use template mechanisms from gpac, e.g. `dst=pipe_$ServiceID$`\n"\
-		"\n"\
-		"On Windows hosts, the default pipe prefix is `\\\\.\\pipe\\gpac\\` if no prefix is set \n"\
-		"EX dst=mypipe resolves in \\\\.\\pipe\\gpac\\mypipe\n"\
-		"EX dst=\\\\.\\pipe\\myapp\\mypipe resolves in \\\\.\\pipe\\myapp\\mypipe\n"
-		"Any destination name starting with `\\\\` is used as is, with `\\` translated in `/`\n"\
-		"\n"\
-		"The pipe input can create the pipe if not found using [-mkp](). On windows hosts, this will create a pipe server.\n"\
-		"On non windows hosts, the created pipe will delete the pipe file upon filter destruction."\
+	GF_FS_SET_HELP("This filter handles generic output pipes (mono-directional) in blocking mode only.\n"
+		"Warning: Output pipes do not currently support non blocking mode.\n"
+		"The associated protocol scheme is `pipe://` when loaded as a generic output (e.g. -o `pipe://URL` where URL is a relative or absolute pipe name).\n"
+		"Data format of the pipe **shall** be specified using extension (either in filename or through [-ext]() option) or MIME type through [-mime]()\n"
+		"The pipe name indicated in [-dst]() can use template mechanisms from gpac, e.g. `dst=pipe_$ServiceID$`\n"
+		"\n"
+		"On Windows hosts, the default pipe prefix is `\\\\.\\pipe\\gpac\\` if no prefix is set \n"
+		"`dst=mypipe` resolves in `\\\\.\\pipe\\gpac\\mypipe`\n"
+		"`dst=\\\\.\\pipe\\myapp\\mypipe` resolves in `\\\\.\\pipe\\myapp\\mypipe\n"
+		"Any destination name starting with `\\\\` is used as is, with `\\` translated in `/`\n"
+		"\n"
+		"The pipe input can create the pipe if not found using [-mkp](). On windows hosts, this will create a pipe server.\n"
+		"On non windows hosts, the created pipe will delete the pipe file upon filter destruction."
 	"")
 	.private_size = sizeof(GF_PipeOutCtx),
 	.args = PipeOutArgs,

gpac-2.0.0.tar.gz/src/filters/out_route.c Added

@@ -0,0 +1,2230 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2020-2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / ROUTE output filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <gpac/filters.h>
+#include <gpac/constants.h>
+#include <gpac/xml.h>
+#include <gpac/route.h>
+#include <gpac/network.h>
+
+
+enum
+{
+	LCT_SPLIT_NONE=0,
+	LCT_SPLIT_TYPE,
+	LCT_SPLIT_ALL,
+};
+
+typedef struct
+{
+	char *dst, *ext, *mime, *ifce, *ip;
+	u32 carousel, first_port, bsid, mtu, splitlct, ttl, brinc, runfor;
+	Bool korean, llmode, noreg;
+
+	GF_FilterCapability in_caps[2];
+	char szExt[10];
+
+	GF_List *services;
+
+	//ATSC3
+	GF_Socket *sock_atsc_lls;
+
+	u64 clock_init, clock, clock_stats;
+	u64 last_lls_clock;
+
+	u8 *lls_time_table;
+	u32 lls_time_table_len;
+
+	u8 *lls_slt_table;
+	u32 lls_slt_table_len;
+
+	u64 bytes_sent;
+	u8 *lct_buffer;
+
+	u64 reschedule_us;
+	u32 next_raw_file_toi;
+
+	Bool reporting_on;
+	u64 total_size, total_bytes;
+	Bool total_size_unknown;
+	u32 nb_resources;
+
+	Bool done;
+} GF_ROUTEOutCtx;
+
+typedef struct
+{
+	char *ip;
+	u32 port;
+
+	//for now we use a single route session per service, differenciated by TSI
+	GF_Socket *sock;
+
+} ROUTELCT;
+
+typedef struct
+{
+	u32 service_id;
+	GF_List *pids;
+	u32 dash_mode;
+
+	GF_List *rlcts;
+	ROUTELCT *rlct_base;
+
+	Bool is_done;
+	Bool wait_for_inputs;
+
+	//storage for main manifest - all manifests (including HLS sub-playlists) are sent in the same PID
+	//HLS sub-playlists are stored on their related PID to be pushed at each new seg
+	char *manifest, *manifest_name, *manifest_mime, *manifest_server, *manifest_url;
+	u32 manifest_version, manifest_crc;
+	Bool stsid_changed;
+	u32 stsid_version;
+	u32 first_port;
+
+	u8 *stsid_bundle;
+	u32 stsid_bundle_size;
+	u32 stsid_bundle_toi;
+
+	u64 last_stsid_clock;
+	u32 manifest_type;
+	u32 creation_time;
+} ROUTEService;
+
+typedef struct
+{
+	GF_FilterPid *pid;
+
+	ROUTEService *route;
+	ROUTELCT *rlct;
+
+	u32 tsi, bandwidth, stream_type;
+	GF_Fraction dash_dur;
+	//we cannot hold a ref to the init segment packet, as this may lock the input waiting for its realease to dispatch next packets
+	u8 *init_seg_data;
+	u32 init_seg_size;
+	u32 init_seg_crc;
+	Bool no_init;
+	char *init_seg_name;
+
+	//0: not manifest, 1: MPD, 2: HLS
+	u32 manifest_type;
+
+	Bool init_seg_sent;
+
+	char *template;
+
+	char *hld_child_pl, *hld_child_pl_name;
+	u32 hld_child_pl_version, hld_child_pl_crc;
+	u64 hls_ref_id;
+	Bool update_hls_child_pl;
+
+	u32 fmtp, mode;
+
+	GF_FilterPacket *current_pck;
+	u32 current_toi;
+
+	const u8 *pck_data;
+	u32 pck_size, pck_offset;
+	u64 res_size, offset_at_seg_start;
+	char *seg_name;
+
+	u32 timescale;
+	u64 clock_at_first_pck;
+	u64 cts_first_pck;
+	u64 current_cts_us;
+	u64 current_dur_us;
+	u64 carousel_time_us;
+	u64 clock_at_pck;
+	Bool raw_file, use_basename;
+
+	u32 full_frame_size, cumulated_frag_size, frag_offset;
+	u32 frag_idx;
+	Bool push_init, force_tol_send;
+	u64 clock_at_frame_start, cts_us_at_frame_start, cts_at_frame_start;
+	u32 pck_dur_at_frame_start;
+
+	u32 bitrate;
+} ROUTEPid;
+
+
+ROUTELCT *route_create_lct_channel(GF_ROUTEOutCtx *ctx, const char *ip, u32 port, GF_Err *e)
+{
+	*e = GF_OUT_OF_MEM;
+	ROUTELCT *rlct;
+	GF_SAFEALLOC(rlct, ROUTELCT);
+	if (!rlct) return NULL;
+
+	rlct->ip = gf_strdup(ip ? ip : ctx->ip);
+	if (!rlct->ip) goto fail;
+	if (port) {
+		rlct->port = port;
+	} else {
+		rlct->port = ctx->first_port;
+		ctx->first_port ++;
+	}
+
+	if (rlct->ip) {
+		rlct->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+		if (rlct->sock) {
+			*e = gf_sk_setup_multicast(rlct->sock, rlct->ip, rlct->port, ctx->ttl, GF_FALSE, ctx->ifce);
+			if (*e) {
+				gf_sk_del(rlct->sock);
+				rlct->sock = NULL;
+				goto fail;
+			}
+		}
+	}
+	*e = GF_OK;
+	return rlct;
+fail:
+	if (rlct->ip) gf_free(rlct->ip);
+	gf_free(rlct);
+	return NULL;
+}
+
+ROUTEService *routeout_create_service(GF_ROUTEOutCtx *ctx, u32 service_id, const char *ip, u32 port, GF_Err *e)
+{
+	ROUTEService *rserv;
+	ROUTELCT *rlct = NULL;
+	*e = GF_OUT_OF_MEM;
+	GF_SAFEALLOC(rserv, ROUTEService);
+	if (!rserv) return NULL;
+
+	rlct = route_create_lct_channel(ctx, ip, port, e);
+	if (!rlct) {
+		gf_free(rserv);
+		return NULL;
+	}
+	if (port) {
+		rserv->first_port = port+1;
+	}
+
+	rserv->pids = gf_list_new();
+	if (!rserv->pids) goto fail;
+	rserv->rlcts = gf_list_new();
+	if (!rserv->rlcts) goto fail;
+
+	gf_list_add(rserv->rlcts, rlct);
+	rserv->rlct_base = rlct;
+
+	rserv->service_id = service_id;
+	gf_list_add(ctx->services, rserv);
+
+	if (ctx->lls_slt_table) {
+		gf_free(ctx->lls_slt_table);
+		ctx->lls_slt_table = NULL;
+		ctx->last_lls_clock = 0;
+	}
+	*e = GF_OK;
+	return rserv;
+
+fail:
+	*e = GF_OUT_OF_MEM;
+	if (rlct->ip) gf_free(rlct->ip);
+	gf_free(rlct);
+	if (rserv->pids) gf_list_del(rserv->pids);
+	if (rserv->rlcts) gf_list_del(rserv->rlcts);
+	gf_free(rserv);
+	return NULL;
+}
+
+void routeout_remove_pid(ROUTEPid *rpid, Bool is_rem)
+{
+	if (!is_rem) {
+		gf_list_del_item(rpid->route->pids, rpid);
+		rpid->route->stsid_changed = GF_TRUE;
+	}
+	if (rpid->rlct != rpid->route->rlct_base) {
+		gf_list_del_item(rpid->route->rlcts, rpid->rlct);
+		gf_free(rpid->rlct->ip);
+		gf_sk_del(rpid->rlct->sock);
+		gf_free(rpid->rlct);
+	}
+
+	if (rpid->init_seg_data) gf_free(rpid->init_seg_data);
+	if (rpid->init_seg_name) gf_free(rpid->init_seg_name);
+	if (rpid->hld_child_pl) gf_free(rpid->hld_child_pl);
+	if (rpid->hld_child_pl_name) gf_free(rpid->hld_child_pl_name);
+	if (rpid->template) gf_free(rpid->template);
+	if (rpid->seg_name) gf_free(rpid->seg_name);
+
+	if (rpid->current_pck)
+		gf_filter_pck_unref(rpid->current_pck);
+	gf_free(rpid);
+}
+
+void routeout_delete_service(ROUTEService *serv)
+{
+	while (gf_list_count(serv->pids)) {
+		ROUTEPid *rpid = gf_list_pop_back(serv->pids);
+		routeout_remove_pid(rpid, GF_TRUE);
+	}
+	gf_list_del(serv->pids);
+
+	while (gf_list_count(serv->rlcts)) {
+		ROUTELCT *rlct = gf_list_pop_back(serv->rlcts);
+		gf_sk_del(rlct->sock);
+		gf_free(rlct->ip);
+		gf_free(rlct);
+	}
+	gf_list_del(serv->rlcts);
+
+	if (serv->manifest_mime) gf_free(serv->manifest_mime);
+	if (serv->manifest_name) gf_free(serv->manifest_name);
+	if (serv->manifest_server) gf_free(serv->manifest_server);
+	if (serv->manifest_url) gf_free(serv->manifest_url);
+
+	if (serv->manifest) gf_free(serv->manifest);
+	if (serv->stsid_bundle) gf_free(serv->stsid_bundle);
+	gf_free(serv);
+}
+
+static GF_Err routeout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	u32 i;
+	GF_FilterEvent evt;
+	ROUTEService *rserv;
+	u32 manifest_type;
+	u32 service_id = 0;
+	u32 pid_dash_mode = 0;
+	GF_ROUTEOutCtx *ctx = (GF_ROUTEOutCtx *) gf_filter_get_udta(filter);
+	ROUTEPid *rpid;
+
+	rpid = gf_filter_pid_get_udta(pid);
+	if (is_remove) {
+		if (rpid) routeout_remove_pid(rpid, GF_FALSE);
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_FILTER_NOT_SUPPORTED;
+
+	//we currently ignore any reconfiguration of the pids
+	if (rpid) {
+		//any change to a raw file will require reconfiguring S-TSID
+		if (rpid->raw_file) {
+			rpid->route->stsid_changed = GF_TRUE;
+		}
+		else if (!rpid->manifest_type) {
+			p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_TEMPLATE);
+			if (p && p->value.string) {
+				if (!rpid->template || strcmp(rpid->template, p->value.string)) {
+					if (rpid->template) gf_free(rpid->template);
+					rpid->template = gf_strdup(p->value.string);
+					rpid->route->stsid_changed = GF_TRUE;
+					rpid->use_basename = (strchr(rpid->template, '/')==NULL) ? GF_TRUE : GF_FALSE;
+				}
+			} else if (rpid->template) {
+				gf_free(rpid->template);
+				rpid->template = NULL;
+				rpid->route->stsid_changed = GF_TRUE;
+			}
+		}
+
+		return GF_OK;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DISABLE_PROGRESSIVE);
+	if (p && p->value.uint) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Delivering files with progressive download disabled is not possible in ROUTE !\n"));
+		return GF_FILTER_NOT_SUPPORTED;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
+	if (p) pid_dash_mode = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SERVICE_ID);
+	if (p) service_id = p->value.uint;
+
+	rserv = NULL;
+	for (i=0; i<gf_list_count(ctx->services); i++) {
+		rserv = gf_list_get(ctx->services, i);
+		if (service_id == rserv->service_id) break;
+		rserv = NULL;
+	}
+
+	manifest_type = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+	if (p && p->value.string) {
+		if (strstr(p->value.string, "dash")) manifest_type = 1;
+		else if (strstr(p->value.string, "mpd")) manifest_type = 1;
+		else if (strstr(p->value.string, "mpegurl")) manifest_type = 2;
+	}
+	if (!manifest_type) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
+		if (p && p->value.string) {
+			if (strstr(p->value.string, "mpd")) manifest_type = 1;
+			else if (strstr(p->value.string, "m3u8")) manifest_type = 2;
+			else if (strstr(p->value.string, "3gm")) manifest_type = 1;
+		}
+	}
+	if (manifest_type) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+		if (!p || (p->value.uint!=GF_STREAM_FILE)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Manifest file detected but no dashin filter, file will be uploaded as is !\n"));
+			manifest_type = 0;
+		}
+	}
+
+	if (!rserv) {
+		GF_Err e;
+		u32 port = ctx->first_port;
+		const char *service_ip = ctx->ip;
+
+		//cannot have 2 manifest pids connecting in route mode
+		if (!ctx->sock_atsc_lls && gf_list_count(ctx->services) && manifest_type) {
+			if (strchr(ctx->dst, '$')) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Multiple services in route mode, creating a new output filter\n"));
+				return GF_REQUIRES_NEW_INSTANCE;
+			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Multiple services in route mode and no URL templating, cannot create new output\n"));
+			return GF_FILTER_NOT_SUPPORTED;
+		}
+
+		if (ctx->sock_atsc_lls) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ROUTE_IP);
+			if (p && p->value.string) service_ip = p->value.string;
+
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ROUTE_PORT);
+			if (p && p->value.uint) port = p->value.uint;
+			else ctx->first_port++;
+		}
+
+		rserv = routeout_create_service(ctx, service_id, service_ip, port, &e);
+		if (!rserv) return e;
+		rserv->dash_mode = pid_dash_mode;
+	}
+
+	if (!rserv->manifest_type)
+		rserv->manifest_type = manifest_type;
+
+	if (rserv->dash_mode != pid_dash_mode){
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Mix of raw and muxed files should never happen - please report bug !\n"));
+		return GF_SERVICE_ERROR;
+	}
+
+	GF_SAFEALLOC(rpid, ROUTEPid);
+	if (!rpid) return GF_OUT_OF_MEM;
+	rpid->route = rserv;
+	rpid->pid = pid;
+	rpid->fmtp = 128;
+	rpid->mode = 1;
+	rpid->tsi = 0;
+	rpid->manifest_type = manifest_type;
+	if (manifest_type) {
+		rserv->creation_time = gf_sys_clock();
+		gf_filter_pid_ignore_blocking(pid, GF_TRUE);
+	} else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NO_INIT);
+		if (p && p->value.boolean) {
+			rpid->no_init = GF_TRUE;
+		}
+	}
+
+	gf_list_add(rserv->pids, rpid);
+	gf_filter_pid_set_udta(pid, rpid);
+
+	rpid->rlct = rserv->rlct_base;
+
+	p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_BITRATE);
+	if (p) rpid->bitrate = p->value.uint * (100+ctx->brinc) / 100;
+
+	rpid->stream_type = 0;
+	p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+	if (!p) {
+		if (!rpid->manifest_type) {
+			rpid->raw_file = GF_TRUE;
+		}
+	} else {
+		rpid->stream_type = p->value.uint;
+	}
+
+	rpid->bandwidth = 0;
+	p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_BITRATE);
+	if (p) rpid->bandwidth = p->value.uint;
+
+	rpid->dash_dur.num = 1;
+	rpid->dash_dur.den = 1;
+	p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_DASH_DUR);
+	if (p) rpid->dash_dur = p->value.frac;
+
+	if (!rpid->manifest_type && !rpid->raw_file) {
+		p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_TEMPLATE);
+		if (p && p->value.string) rpid->template = gf_strdup(p->value.string);
+
+		else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Segment file PID detected but no template assigned, assuming raw file upload!\n"));
+			rpid->raw_file = GF_TRUE;
+		}
+	}
+
+	if (rpid->raw_file) {
+		rpid->tsi = 1;
+		rpid->current_toi = ctx->next_raw_file_toi;
+		ctx->next_raw_file_toi ++;
+	}
+
+	if (!rpid->manifest_type && !rpid->raw_file) {
+		Bool do_split = GF_FALSE;
+
+		p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_TIMESCALE);
+		if (p) rpid->timescale = p->value.uint;
+
+		p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PCK_HLS_REF);
+		if (p) rpid->hls_ref_id = p->value.longuint;
+
+		rpid->tsi = gf_list_find(rserv->pids, rpid) * 10;
+
+		//do we put this on the main LCT of the service or do we split ?
+		if (ctx->splitlct==LCT_SPLIT_ALL) {
+			if (gf_list_count(rserv->pids)>1)
+				do_split = GF_TRUE;
+		}
+		else if (ctx->splitlct && rpid->stream_type) {
+			for (i=0; i<gf_list_count(rserv->pids); i++) {
+				u32 astreamtype;
+				ROUTEPid *apid = gf_list_get(rserv->pids, i);
+				if (apid->manifest_type) continue;
+				if (apid == rpid) continue;
+				p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+				if (!p) continue;
+				astreamtype = p->value.uint;
+				if (astreamtype==rpid->stream_type) {
+					do_split = GF_TRUE;
+					break;
+				}
+			}
+		}
+		if (do_split) {
+			GF_Err e;
+			rserv->first_port++;
+			ctx->first_port++;
+			rpid->rlct = route_create_lct_channel(ctx, NULL, rserv->first_port, &e);
+			if (e) return e;
+			if (rpid->rlct) {
+				gf_list_add(rserv->rlcts, rpid->rlct);
+			}
+		}
+	}
+
+
+	gf_filter_pid_init_play_event(pid, &evt, 0, 1.0, "ROUTEOut");
+	gf_filter_pid_send_event(pid, &evt);
+
+	rserv->wait_for_inputs = GF_TRUE;
+	//low-latency mode, consume media segment files as they are received (don't wait for full segment reconstruction)
+	if (ctx->llmode && !rpid->manifest_type && !rpid->raw_file) {
+		gf_filter_pid_set_framing_mode(pid, GF_FALSE);
+	} else {
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	}
+	return GF_OK;
+}
+
+static GF_Err routeout_initialize(GF_Filter *filter)
+{
+	char *base_name;
+	Bool is_atsc = GF_TRUE;
+	char *ext=NULL;
+	GF_ROUTEOutCtx *ctx = (GF_ROUTEOutCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx || !ctx->dst) return GF_BAD_PARAM;
+
+	if (!strnicmp(ctx->dst, "route://", 8)) {
+		is_atsc = GF_FALSE;
+	} else if (strnicmp(ctx->dst, "atsc://", 7)) {
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (ctx->ext) {
+		ext = ctx->ext;
+	} else {
+		if (is_atsc) {
+			base_name = gf_file_basename(ctx->dst);
+		} else {
+			char *sep = strchr(ctx->dst + 8, '/');
+			base_name = sep ? gf_file_basename(ctx->dst) : NULL;
+		}
+		ext = base_name ? gf_file_ext_start(base_name) : NULL;
+		if (ext) ext++;
+	}
+
+#if 0
+	if (!ext) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Missing destination manifest type, cannot infer format!\n"));
+		return GF_BAD_PARAM;
+	}
+#endif
+
+	if (is_atsc) {
+		if (!ctx->ip) return GF_BAD_PARAM;
+	} else {
+		char *sep, *root;
+		sep = strrchr(ctx->dst+8, ':');
+		if (sep) sep[0] = 0;
+		root = sep ? strchr(sep+1, '/') : NULL;
+		if (root) root[0] = 0;
+		if (ctx->ip) gf_free(ctx->ip);
+		ctx->ip = gf_strdup(ctx->dst+8);
+		if (sep) {
+			ctx->first_port = atoi(sep+1);
+			sep[0] = ':';
+		}
+		if (root) root[0] = '/';
+	}
+
+	if (!gf_sk_is_multicast_address(ctx->ip)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] IP %s is not a multicast address\n", ctx->ip));
+		return GF_BAD_PARAM;
+	}
+
+	if (ext || ctx->mime) {
+		//static cap, streamtype = file
+		ctx->in_caps[0].code = GF_PROP_PID_STREAM_TYPE;
+		ctx->in_caps[0].val = PROP_UINT(GF_STREAM_FILE);
+		ctx->in_caps[0].flags = GF_CAPS_INPUT_STATIC;
+
+		if (ctx->mime) {
+			ctx->in_caps[1].code = GF_PROP_PID_MIME;
+			ctx->in_caps[1].val = PROP_NAME( ctx->mime );
+			ctx->in_caps[1].flags = GF_CAPS_INPUT;
+		} else {
+			strncpy(ctx->szExt, ext, 9);
+			ctx->szExt[9] = 0;
+			strlwr(ctx->szExt);
+			ctx->in_caps[1].code = GF_PROP_PID_FILE_EXT;
+			ctx->in_caps[1].val = PROP_NAME( ctx->szExt );
+			ctx->in_caps[1].flags = GF_CAPS_INPUT;
+		}
+		gf_filter_override_caps(filter, ctx->in_caps, 2);
+	}
+
+
+	/*this is an alias for our main filter, nothing to initialize*/
+	if (gf_filter_is_alias(filter)) {
+		return GF_OK;
+	}
+
+	ctx->services = gf_list_new();
+
+	if (is_atsc) {
+		ctx->sock_atsc_lls = gf_sk_new(GF_SOCK_TYPE_UDP);
+		gf_sk_setup_multicast(ctx->sock_atsc_lls, GF_ATSC_MCAST_ADDR, GF_ATSC_MCAST_PORT, 0, GF_FALSE, ctx->ifce);
+	}
+
+	ctx->lct_buffer = gf_malloc(sizeof(u8) * ctx->mtu);
+	ctx->clock_init = gf_sys_clock_high_res();
+	ctx->clock_stats = ctx->clock_init;
+
+	if (!ctx->carousel) ctx->carousel = 1000;
+	//move to microseconds
+	ctx->carousel *= 1000;
+	ctx->next_raw_file_toi = 1;
+	return GF_OK;
+}
+
+static void routeout_finalize(GF_Filter *filter)
+{
+	GF_ROUTEOutCtx *ctx;
+	/*this is an alias for our main filter, nothing to finalize*/
+	if (gf_filter_is_alias(filter))
+		return;
+
+	ctx = (GF_ROUTEOutCtx *) gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->services)) {
+		routeout_delete_service(gf_list_pop_back(ctx->services));
+	}
+	gf_list_del(ctx->services);
+	if (ctx->sock_atsc_lls)
+		gf_sk_del(ctx->sock_atsc_lls);
+
+	if (ctx->lct_buffer) gf_free(ctx->lct_buffer);
+	if (ctx->lls_slt_table) gf_free(ctx->lls_slt_table);
+	if (ctx->lls_time_table) gf_free(ctx->lls_time_table);
+}
+
+char *routeout_strip_base(ROUTEService *serv, char *url)
+{
+	u32 len;
+	if (!url) return NULL;
+	if (!serv->manifest_server && !serv->manifest_url)
+		return gf_strdup(url);
+
+	len = serv->manifest_server ? (u32) strlen(serv->manifest_server) : 0;
+	if (!len || !strncmp(url, serv->manifest_server, len)) {
+		url += len;
+		char *sep = len ? strchr(url, '/') : url;
+		if (sep) {
+			if (len) sep += 1;
+			len = (u32) strlen(serv->manifest_url);
+			if (!strncmp(sep, serv->manifest_url, len)) {
+				return gf_strdup(sep + len);
+			}
+		}
+	}
+	return gf_strdup(url);
+}
+
+#define MULTIPART_BOUNDARY	"_GPAC_BOUNDARY_ROUTE_.67706163_"
+#define ROUTE_INIT_TOI	0xFFFFFFFF
+static GF_Err routeout_check_service_updates(GF_ROUTEOutCtx *ctx, ROUTEService *serv)
+{
+	u32 i, j, count;
+	char temp[1000];
+	char *payload_text = NULL;
+	Bool manifest_updated = GF_FALSE;
+	u32 nb_media=0, nb_media_init=0, nb_raw_files=0;
+
+	count = gf_list_count(serv->pids);
+	//check no changes in init segment or in manifests
+	for (i=0; i<count; i++) {
+		const GF_PropertyValue *p;
+		ROUTEPid *rpid = gf_list_get(serv->pids, i);
+
+		//raw file, nothing to check
+		if (rpid->raw_file) {
+			nb_raw_files++;
+			continue;
+		}
+		//media file, check for init segment and hls child manifest
+		if (!rpid->manifest_type) {
+			nb_media++;
+			while (! rpid->no_init) {
+				GF_FilterPacket *pck = gf_filter_pid_get_packet(rpid->pid);
+				if (!pck) break;
+
+				p = gf_filter_pck_get_property(pck, GF_PROP_PCK_INIT);
+				if (p && p->value.boolean) {
+					const u8 *data;
+					u32 len, crc;
+					data = gf_filter_pck_get_data(pck, &len);
+					crc = gf_crc_32(data, len);
+					//whenever init seg changes, bump stsid version
+					if (crc != rpid->init_seg_crc) {
+						if (rpid->init_seg_data) gf_free(rpid->init_seg_data);
+						rpid->init_seg_data = gf_malloc(len);
+						memcpy(rpid->init_seg_data, data, len);
+						rpid->init_seg_size = len;
+						rpid->init_seg_crc = crc;
+						rpid->init_seg_sent = GF_FALSE;
+						serv->stsid_changed = GF_TRUE;
+						rpid->current_toi = 0;
+
+						p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
+						if (!p) p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PCK_FILENAME);
+						if (rpid->init_seg_name) gf_free(rpid->init_seg_name);
+						rpid->init_seg_name = p ? routeout_strip_base(rpid->route, p->value.string) : NULL;
+					}
+					gf_filter_pid_drop_packet(rpid->pid);
+					continue;
+				}
+
+				break;
+			}
+			if (rpid->init_seg_data || rpid->no_init) {
+				nb_media_init ++;
+				if (serv->manifest_type==2) {
+					if (!rpid->hld_child_pl_name)
+						nb_media_init --;
+				}
+			}
+			continue;
+		}
+		//manifest pid, wait for manifest
+		while (1) {
+			char szLocManfest[100];
+			u32 man_size, man_crc;
+			const char *file_name=NULL, *proto;
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(rpid->pid);
+			if (!pck) break;
+
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
+			if (!p) p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_URL);
+
+			if (p)
+				file_name = p->value.string;
+			else
+				file_name = ctx->dst;
+
+			if (file_name) {
+				proto = strstr(file_name, "://");
+				if (proto) {
+					if (ctx->sock_atsc_lls) {
+						file_name = proto[3] ? proto+3 : NULL;
+					} else {
+						file_name = strchr(proto+3, '/');
+						if (file_name) file_name ++;
+					}
+				}
+			}
+
+			if (!file_name) {
+				snprintf(szLocManfest, 100, "manifest.%s", (serv->manifest_type==2) ? "m3u8" : "mpd");
+				file_name = szLocManfest;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] No manifest name assigned, will use %s\n", file_name));
+			}
+
+			//child subplaylist
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_HLS_REF);
+			if (p && p->value.uint) {
+				u32 k;
+				ROUTEPid *media_pid = NULL;
+				for (k=0; k<count; k++) {
+					media_pid = gf_list_get(serv->pids, k);
+					if (media_pid->hls_ref_id == p->value.longuint)
+						break;
+					media_pid = NULL;
+				}
+				//not yet available - happens when loading an existing m3u8 session
+				if (!media_pid)
+					break;
+
+				const u8 *data;
+				u32 len, crc;
+				data = gf_filter_pck_get_data(pck, &len);
+				crc = gf_crc_32(data, len);
+				if (crc != media_pid->hld_child_pl_crc) {
+					if (media_pid->hld_child_pl) gf_free(media_pid->hld_child_pl);
+					media_pid->hld_child_pl = gf_malloc(len+1);
+					memcpy(media_pid->hld_child_pl, data, len);
+					media_pid->hld_child_pl[len] = 0;
+					media_pid->hld_child_pl_crc = crc;
+
+					if (!media_pid->hld_child_pl_name || strcmp(media_pid->hld_child_pl_name, file_name)) {
+						if (media_pid->hld_child_pl_name) gf_free(media_pid->init_seg_name);
+						media_pid->hld_child_pl_name = routeout_strip_base(rpid->route, (char *)file_name);
+						serv->stsid_changed = GF_TRUE;
+					}
+					media_pid->update_hls_child_pl = GF_TRUE;
+				}
+			} else {
+				const u8 *man_data = gf_filter_pck_get_data(pck, &man_size);
+				man_crc = gf_crc_32(man_data, man_size);
+				if (man_crc != serv->manifest_crc) {
+					serv->manifest_crc = man_crc;
+					if (serv->manifest) gf_free(serv->manifest);
+					serv->manifest = gf_malloc(man_size+1);
+					memcpy(serv->manifest, man_data, man_size);
+					serv->manifest[man_size] = 0;
+					serv->manifest_version++;
+					if (serv->manifest_name) {
+						if (strcmp(serv->manifest_name, file_name)) serv->stsid_changed = GF_TRUE;
+						gf_free(serv->manifest_name);
+					}
+					serv->manifest_name = gf_strdup(file_name);
+					manifest_updated = GF_TRUE;
+
+					if (serv->manifest_server) gf_free(serv->manifest_server);
+					if (serv->manifest_url) gf_free(serv->manifest_url);
+					serv->manifest_server = serv->manifest_url = NULL;
+
+					p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_URL);
+					serv->manifest_url = p ? gf_strdup(p->value.string) : NULL;
+					if (serv->manifest_url) {
+						char *sep = strstr(serv->manifest_url, file_name);
+						if (sep) sep[0] = 0;
+						sep = strstr(serv->manifest_url, "://");
+						if (sep) sep = strchr(sep + 3, '/');
+						if (sep) {
+							serv->manifest_server = serv->manifest_url;
+							serv->manifest_url = gf_strdup(sep+1);
+							sep[0] = 0;
+							sep = strchr(serv->manifest_server + 8, ':');
+							if (sep) sep[0] = 0;
+						}
+					}
+
+
+					p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_MIME);
+					if (p) {
+						if (serv->manifest_mime) gf_free(serv->manifest_mime);
+						serv->manifest_mime = gf_strdup(p->value.string);
+					}
+				}
+			}
+			gf_filter_pid_drop_packet(rpid->pid);
+		}
+	}
+	//not ready, waiting for init
+	if ((nb_media+nb_raw_files==0) || (nb_media_init<nb_media) || (serv->manifest && !nb_media)) {
+		u32 now = gf_sys_clock() - serv->creation_time;
+		if (now > 5000) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] No media PIDs found for HAS service after %d ms, aborting !\n", now));
+			serv->is_done = GF_TRUE;
+			return GF_SERVICE_ERROR;
+		}
+		return GF_OK;
+	}
+
+	//not ready, waiting for manifest
+	if (!serv->manifest && !nb_raw_files) {
+		return GF_OK;
+	}
+	//already setup and no changes
+	else if (!serv->wait_for_inputs) {
+		if (!manifest_updated && !serv->stsid_changed)
+			return GF_OK;
+	}
+	if (serv->wait_for_inputs) {
+		if (!serv->manifest) {
+			assert(nb_raw_files);
+			serv->stsid_changed = GF_TRUE;
+		}
+		serv->wait_for_inputs = GF_FALSE;
+	}
+
+	if (serv->stsid_changed) {
+		serv->stsid_version++;
+
+		for (i=0; i<count; i++) {
+			ROUTEPid *rpid = gf_list_get(serv->pids, i);
+			if (rpid->manifest_type) continue;
+			rpid->clock_at_first_pck = 0;
+		}
+	}
+
+	//ATSC3: mbms enveloppe, service description, astcROUTE bundle
+	if (ctx->sock_atsc_lls) {
+		const GF_PropertyValue *p;
+		char *service_name;
+		ROUTEPid *rpid;
+		u32 service_id = serv->service_id;
+		if (!service_id) {
+			service_id = 1;
+		}
+		gf_dynstrcat(&payload_text, "Content-Type: multipart/related; type=\"application/mbms-envelope+xml\"; boundary=\""MULTIPART_BOUNDARY"\"\r\n\r\n", NULL);
+
+		gf_dynstrcat(&payload_text, "--"MULTIPART_BOUNDARY"\r\nContent-Type: application/mbms-envelope+xml\r\nContent-Location: envelope.xml\r\n\r\n", NULL);
+
+		//dump usd first, then S-TSID then manifest
+		gf_dynstrcat(&payload_text,
+			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+			"<metadataEnvelope xmlns=\"urn:3gpp:metadata:2005:MBMS:envelope\">\n"
+			" <item metadataURI=\"usbd.xml\" version=\"", NULL);
+		snprintf(temp, 100, "%d", serv->stsid_version);
+		gf_dynstrcat(&payload_text, temp, NULL);
+
+		gf_dynstrcat(&payload_text, "\" contentType=\"", NULL);
+		if (ctx->korean)
+			gf_dynstrcat(&payload_text, "application/mbms-user-service-description+xml", NULL);
+		else
+			gf_dynstrcat(&payload_text, "application/route-usd+xml", NULL);
+		gf_dynstrcat(&payload_text, "\"/>\n", NULL);
+
+		gf_dynstrcat(&payload_text,
+			" <item metadataURI=\"stsid.xml\" version=\"", NULL);
+		snprintf(temp, 100, "%d", serv->stsid_version);
+		gf_dynstrcat(&payload_text, temp, NULL);
+
+		gf_dynstrcat(&payload_text, "\" contentType=\"", NULL);
+		if (ctx->korean)
+			gf_dynstrcat(&payload_text, "application/s-tsid", NULL);
+		else
+			gf_dynstrcat(&payload_text, "application/route-s-tsid+xml", NULL);
+		gf_dynstrcat(&payload_text, "\"/>\n", NULL);
+
+
+		if (serv->manifest) {
+			gf_dynstrcat(&payload_text, " <item metadataURI=\"", NULL);
+			gf_dynstrcat(&payload_text, serv->manifest_name, NULL);
+			snprintf(temp, 1000, "\" version=\"%d\" contentType=\"", serv->manifest_version);
+			gf_dynstrcat(&payload_text, temp, NULL);
+			gf_dynstrcat(&payload_text, serv->manifest_mime, NULL);
+			gf_dynstrcat(&payload_text, "\"/>\n", NULL);
+		}
+
+		gf_dynstrcat(&payload_text, "</metadataEnvelope>\n\r\n", NULL);
+
+		gf_dynstrcat(&payload_text, "--"MULTIPART_BOUNDARY"\r\nContent-Type: ", NULL);
+		if (ctx->korean)
+			gf_dynstrcat(&payload_text, "application/mbms-user-service-description+xml", NULL);
+		else
+			gf_dynstrcat(&payload_text, "application/route-usd+xml", NULL);
+		gf_dynstrcat(&payload_text, "\r\nContent-Location: usbd.xml\r\n\r\n", NULL);
+
+		rpid = gf_list_get(serv->pids, 0);
+		p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_SERVICE_NAME);
+		if (p && p->value.string)
+			service_name = p->value.string;
+		else
+			service_name = "GPAC TV";
+
+		snprintf(temp, 1000, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+				"<BundleDescriptionROUTE xmlns=\"tag:atsc.org,2016:XMLSchemas/ATSC3/Delivery/ROUTEUSD/1.0/\">\n"
+				" <UserServiceDescription serviceId=\"%d\">\n"
+				" <Name lang=\"eng\">", service_id);
+		gf_dynstrcat(&payload_text, temp, NULL);
+		gf_dynstrcat(&payload_text, service_name, NULL);
+		gf_dynstrcat(&payload_text, "</Name>\n"
+				" <DeliveryMethod>\n"
+				" <BroadcastAppService>\n", NULL);
+
+		for (i=0;i<count; i++) {
+			rpid = gf_list_get(serv->pids, i);
+			if (rpid->manifest_type) continue;
+			//set template
+			p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_TEMPLATE);
+			if (p) {
+				char *tpl = gf_strdup(p->value.string);
+				char *sep = strchr(tpl, '$');
+				if (sep) sep[0] = 0;
+				if (!strstr(payload_text, tpl)) {
+					gf_dynstrcat(&payload_text, " <BasePattern>", NULL);
+					gf_dynstrcat(&payload_text, tpl, NULL);
+					gf_dynstrcat(&payload_text, "</BasePattern>\n", NULL);
+				}
+				gf_free(tpl);
+			}
+		}
+
+		gf_dynstrcat(&payload_text, " </BroadcastAppService>\n"
+				" </DeliveryMethod>\n"
+				" </UserServiceDescription>\n"
+				"</BundleDescriptionROUTE>\n\r\n", NULL);
+	}
+	//ROUTE: only inject manifest and S-TSID
+	else {
+		gf_dynstrcat(&payload_text, "Content-Type: multipart/related; type=\"", NULL);
+		if (serv->manifest) {
+			gf_dynstrcat(&payload_text, serv->manifest_mime, NULL);
+		}
+		else if (ctx->korean)
+			gf_dynstrcat(&payload_text, "application/s-tsid", NULL);
+		else
+			gf_dynstrcat(&payload_text, "application/route-s-tsid+xml", NULL);
+
+		gf_dynstrcat(&payload_text, "\"; boundary=\""MULTIPART_BOUNDARY"\"\r\n\r\n", NULL);
+	}
+
+	if (serv->manifest) {
+		gf_dynstrcat(&payload_text, "--"MULTIPART_BOUNDARY"\r\nContent-Type: ", NULL);
+		gf_dynstrcat(&payload_text, serv->manifest_mime, NULL);
+		gf_dynstrcat(&payload_text, "\r\nContent-Location: ", NULL);
+		gf_dynstrcat(&payload_text, serv->manifest_name, NULL);
+		gf_dynstrcat(&payload_text, "\r\n\r\n", NULL);
+		gf_dynstrcat(&payload_text, serv->manifest, NULL);
+		gf_dynstrcat(&payload_text, "\r\n\r\n", NULL);
+	}
+
+	gf_dynstrcat(&payload_text, "--"MULTIPART_BOUNDARY"\r\nContent-Type: ", NULL);
+	if (ctx->korean)
+		gf_dynstrcat(&payload_text, "application/s-tsid", NULL);
+	else
+		gf_dynstrcat(&payload_text, "application/route-s-tsid+xml", NULL);
+	gf_dynstrcat(&payload_text, "\r\nContent-Location: stsid.xml\r\n\r\n", NULL);
+
+	gf_dynstrcat(&payload_text, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		"<S-TSID xmlns=\"tag:atsc.org,2016:XMLSchemas/ATSC3/Delivery/S-TSID/1.0/\" xmlns:afdt=\"tag:atsc.org,2016:XMLSchemas/ATSC3/Delivery/ATSC-FDT/1.0/\" xmlns:fdt=\"urn:ietf:params:xml:ns:fdt\">\n", NULL);
+
+	for (j=0; j<gf_list_count(serv->rlcts); j++) {
+		ROUTELCT *rlct = gf_list_get(serv->rlcts, j);
+
+		const char *src_ip;
+		char szIP[GF_MAX_IP_NAME_LEN];
+		src_ip = ctx->ifce;
+		if (!src_ip) {
+			gf_sk_get_local_ip(rlct->sock, szIP);
+			src_ip = szIP;
+		}
+
+		gf_dynstrcat(&payload_text, " <RS dIpAddr=\"", NULL);
+		gf_dynstrcat(&payload_text, rlct->ip, NULL);
+		snprintf(temp, 1000, "\" dPort=\"%d\" sIpAddr=\"", rlct->port);
+		gf_dynstrcat(&payload_text, temp, NULL);
+		gf_dynstrcat(&payload_text, src_ip, NULL);
+		gf_dynstrcat(&payload_text, "\">\n", NULL);
+
+		for (i=0; i<count; i++) {
+			const GF_PropertyValue *p;
+			ROUTEPid *rpid = gf_list_get(serv->pids, i);
+			if (rpid->manifest_type) continue;
+			if (rpid->rlct != rlct) continue;
+
+			if (rpid->bandwidth) {
+				u32 kbps = rpid->bandwidth / 1000;
+				kbps *= 110;
+				kbps /= 100;
+				snprintf(temp, 100, " <LS tsi=\"%d\" bw=\"%d\">\n", rpid->tsi, kbps);
+			} else {
+				snprintf(temp, 100, " <LS tsi=\"%d\">\n", rpid->tsi);
+			}
+			gf_dynstrcat(&payload_text, temp, NULL);
+
+			if (serv->manifest) {
+				gf_dynstrcat(&payload_text, " <SrcFlow rt=\"true\">\n", NULL);
+			} else {
+				gf_dynstrcat(&payload_text, " <SrcFlow rt=\"false\">\n", NULL);
+			}
+
+			if (ctx->korean) {
+				gf_dynstrcat(&payload_text, " <EFDT version=\"0\">\n", NULL);
+			} else {
+				gf_dynstrcat(&payload_text, " <EFDT>\n", NULL);
+			}
+
+			p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_TEMPLATE);
+			if (p) {
+				char *sep;
+				strcpy(temp, p->value.string);
+				sep = strstr(temp, "$Number");
+				if (sep) {
+					sep[0] = 0;
+					strcat(temp, "$TOI");
+					sep = strstr(p->value.string, "$Number");
+					strcat(temp, sep + 7);
+				}
+			}
+
+			if (ctx->korean) {
+				if (p) {
+					gf_dynstrcat(&payload_text, " <FileTemplate>", NULL);
+					gf_dynstrcat(&payload_text, temp, NULL);
+					gf_dynstrcat(&payload_text, "</FileTemplate>\n", NULL);
+				}
+				gf_dynstrcat(&payload_text, " <FDTParameters>\n", NULL);
+			} else {
+				u32 max_size = 0;
+				gf_dynstrcat(&payload_text, " <FDT-Instance afdt:efdtVersion=\"0\"", NULL);
+				if (p) {
+					gf_dynstrcat(&payload_text, " afdt:fileTemplate=\"", NULL);
+					gf_dynstrcat(&payload_text, temp, NULL);
+					gf_dynstrcat(&payload_text, "\"", NULL);
+				}
+
+				if (!rpid->bandwidth || !rpid->dash_dur.den || !rpid->dash_dur.num) {
+					switch (rpid->stream_type) {
+					case GF_STREAM_VISUAL: max_size = 5000000; break;
+					case GF_STREAM_AUDIO: max_size = 1000000; break;
+					default: max_size = 100000; break;
+					}
+				} else {
+					max_size = rpid->bandwidth / 8;
+					max_size *= rpid->dash_dur.num;
+					max_size /= rpid->dash_dur.den;
+					//use 2x avg rate announced as safety
+					max_size *= 2;
+				}
+
+				snprintf(temp, 1000, " Expires=\"4000000000\" afdt:maxTransportSize=\"%d\">\n", max_size);
+				gf_dynstrcat(&payload_text, temp, NULL);
+			}
+
+			if (rpid->init_seg_name) {
+				snprintf(temp, 1000, " <fdt:File Content-Location=\"%s\" TOI=\"%u\"/>\n", rpid->init_seg_name, ROUTE_INIT_TOI);
+				gf_dynstrcat(&payload_text, temp, NULL);
+			}
+			if (rpid->hld_child_pl_name) {
+				snprintf(temp, 1000, " <fdt:File Content-Location=\"%s\" TOI=\"%u\"/>\n", rpid->hld_child_pl_name, ROUTE_INIT_TOI - 1);
+				gf_dynstrcat(&payload_text, temp, NULL);
+			}
+			if (rpid->raw_file) {
+				const char *mime, *url;
+				p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_MIME);
+				if (p && p->value.string && strcmp(p->value.string, "*"))
+					mime = p->value.string;
+				else {
+					mime = "application/octet-string";
+				}
+				p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_ROUTE_NAME);
+				if (p && p->value.string)
+					url = p->value.string;
+				else {
+					p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_URL);
+					url = (p && p->value.string) ? gf_file_basename(p->value.string) : "/dev/null";
+				}
+				snprintf(temp, 1000, " <fdt:File Content-Location=\"%s\" Content-Type=\"%s\" TOI=\"%u\"/>\n", url, mime, rpid->current_toi);
+				gf_dynstrcat(&payload_text, temp, NULL);
+			}
+
+			if (ctx->korean) {
+				gf_dynstrcat(&payload_text, " </FDTParameters>\n", NULL);
+			} else {
+ gf_dynstrcat(&payload_text, " </FDT-Instance>\n", NULL);
+			}
+			gf_dynstrcat(&payload_text, " </EFDT>\n", NULL);
+
+			if (rpid->stream_type) {
+				const char *rep_id;
+				p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_REP_ID);
+				if (p && p->value.string) {
+					rep_id = p->value.string;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Missing representation ID on PID (broken input filter), using \"1\"\n"));
+					rep_id = "1";
+				}
+				gf_dynstrcat(&payload_text, " <ContentInfo>\n", NULL);
+				gf_dynstrcat(&payload_text, " <MediaInfo repId=\"", NULL);
+				gf_dynstrcat(&payload_text, rep_id, NULL);
+				gf_dynstrcat(&payload_text, "\"", NULL);
+				switch (rpid->stream_type) {
+				case GF_STREAM_VISUAL:
+					gf_dynstrcat(&payload_text, " contentType=\"video\"", NULL);
+					break;
+				case GF_STREAM_AUDIO:
+					gf_dynstrcat(&payload_text, " contentType=\"audio\"", NULL);
+					break;
+				case GF_STREAM_TEXT:
+					gf_dynstrcat(&payload_text, " contentType=\"subtitles\"", NULL);
+					break;
+				//other stream types are not mapped in ATSC3, do not set content type
+				}
+				gf_dynstrcat(&payload_text, "/>\n", NULL);
+				gf_dynstrcat(&payload_text, " </ContentInfo>\n", NULL);
+			}
+			//setup payload format - we remove srcFecPayloadId=\"0\" as there is no FEC support yet
+			snprintf(temp, 1000,
+					" <Payload codePoint=\"%d\" formatId=\"%d\" frag=\"0\" order=\"true\"/>\n"
+					, rpid->fmtp, rpid->mode);
+
+			gf_dynstrcat(&payload_text, temp, NULL);
+
+			gf_dynstrcat(&payload_text,
+					" </SrcFlow>\n"
+					" </LS>\n", NULL);
+		}
+		gf_dynstrcat(&payload_text, " </RS>\n", NULL);
+	}
+
+	gf_dynstrcat(&payload_text, "</S-TSID>\n\r\n", NULL);
+
+	gf_dynstrcat(&payload_text, "--"MULTIPART_BOUNDARY"--\n", NULL);
+
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Updated Manifest+S-TSID bundle to:\n%s\n", payload_text));
+
+	//compress and store as final payload
+	if (serv->stsid_bundle) gf_free(serv->stsid_bundle);
+	serv->stsid_bundle = (u8 *) payload_text;
+	serv->stsid_bundle_size = 1 + (u32) strlen(payload_text);
+	gf_gz_compress_payload(&serv->stsid_bundle, serv->stsid_bundle_size, &serv->stsid_bundle_size);
+
+	serv->stsid_bundle_toi = 0x80000000; //compressed
+	if (manifest_updated) serv->stsid_bundle_toi |= (1<<18);
+	if (serv->stsid_changed) {
+		serv->stsid_bundle_toi |= (1<<17);
+		serv->stsid_bundle_toi |= (serv->stsid_version & 0xFF);
+	} else if (manifest_updated) {
+		serv->stsid_bundle_toi |= (serv->manifest_version & 0xFF);
+	}
+
+	serv->stsid_changed = GF_FALSE;
+
+	//reset last sent time
+	serv->last_stsid_clock = 0;
+	return GF_OK;
+}
+
+
+u32 routeout_lct_send(GF_ROUTEOutCtx *ctx, GF_Socket *sock, u32 tsi, u32 toi, u32 codepoint, u8 *payload, u32 len, u32 offset, u32 service_id, u32 total_size, u32 offset_in_frame)
+{
+	u32 max_size = ctx->mtu;
+	u32 send_payl_size;
+	u32 hdr_len = 4;
+	u32 hpos;
+	GF_Err e;
+
+	if (total_size) {
+		//TOL extension
+		if (total_size<=0xFFFFFF) hdr_len += 1;
+		else hdr_len += 2;
+	}
+
+	//start offset is not in header
+	send_payl_size = 4 * (hdr_len+1) + len - offset;
+	if (send_payl_size > max_size) {
+		send_payl_size = max_size - 4 * (hdr_len+1);
+	} else {
+		send_payl_size = len - offset;
+	}
+	ctx->lct_buffer[0] = 0x12; //V=b0001, C=b00, PSI=b10
+	ctx->lct_buffer[1] = 0xA0; //S=b1, 0=b01, h=b0, res=b00, A=b0, B=X
+	//set close flag only if total_len is known
+	if (total_size && (offset + send_payl_size == len))
+		ctx->lct_buffer[1] |= 1;
+
+	ctx->lct_buffer[2] = hdr_len;
+	ctx->lct_buffer[3] = (u8) codepoint;
+	hpos = 4;
+
+#define PUT_U32(_val)\
+	ctx->lct_buffer[hpos] = (_val>>24 & 0xFF);\
+	ctx->lct_buffer[hpos+1] = (_val>>16 & 0xFF);\
+	ctx->lct_buffer[hpos+2] = (_val>>8 & 0xFF);\
+	ctx->lct_buffer[hpos+3] = (_val & 0xFF); \
+	hpos+=4;
+
+	//CCI=0
+	PUT_U32(0);
+	PUT_U32(tsi);
+	PUT_U32(toi);
+
+	//total length
+	if (total_size) {
+		if (total_size<=0xFFFFFF) {
+			ctx->lct_buffer[hpos] = GF_LCT_EXT_TOL24;
+			ctx->lct_buffer[hpos+1] = total_size>>16 & 0xFF;
+			ctx->lct_buffer[hpos+2] = total_size>>8 & 0xFF;
+			ctx->lct_buffer[hpos+3] = total_size & 0xFF;
+			hpos+=4;
+		} else {
+			ctx->lct_buffer[hpos] = GF_LCT_EXT_TOL48;
+			ctx->lct_buffer[hpos+1] = 2; //2 x 32 bits for header ext
+			ctx->lct_buffer[hpos+2] = 0;
+			ctx->lct_buffer[hpos+3] = 0;
+			hpos+=4;
+			PUT_U32(total_size);
+		}
+	}
+
+	//start_offset
+	PUT_U32(offset_in_frame);
+
+	assert(send_payl_size+hpos <= ctx->mtu);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] LCT SID %u TSI %u TOI %u size %u (frag %u total %u) offset %u (%u in obj)\n", service_id, tsi, toi, send_payl_size, len, total_size, offset, offset_in_frame));
+
+	memcpy(ctx->lct_buffer + hpos, payload + offset, send_payl_size);
+	e = gf_sk_send(sock, ctx->lct_buffer, send_payl_size + hpos);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to send LCT object TSI %u TOI %u fragment: %s\n", tsi, toi, gf_error_to_string(e) ));
+	}
+	//store what we actually sent including header for rate estimation
+	ctx->bytes_sent += send_payl_size + hpos;
+	//but return what we sent from the source
+	return send_payl_size;
+}
+
+static GF_Err routeout_service_send_bundle(GF_ROUTEOutCtx *ctx, ROUTEService *serv)
+{
+	u32 offset = 0;
+
+	//we don't regulate
+	while (offset < serv->stsid_bundle_size) {
+		/*send lct with codepoint "NRT - Unsigned Package Mode" (multipart):
+		"In broadcast delivery of SLS for a DASH-formatted streaming Service delivered using ROUTE, since SLS fragments are NRT files in nature,
+		their carriage over the ROUTE session/LCT channel assigned by the SLT shall be in accordance to the Unsigned Packaged Mode or
+		the Signed Package Mode as described in Section A.3.3.4 and A.3.3.5, respectively"
+		*/
+		offset += routeout_lct_send(ctx, serv->rlct_base->sock, 0, serv->stsid_bundle_toi, 3, serv->stsid_bundle, serv->stsid_bundle_size, offset, serv->service_id, serv->stsid_bundle_size, offset);
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Sent service %d bundle (%d bytes)\n", serv->service_id, serv->stsid_bundle_size));
+	return GF_OK;
+}
+
+static void routeout_fetch_packet(GF_ROUTEOutCtx *ctx, ROUTEPid *rpid)
+{
+	const GF_PropertyValue *p;
+	Bool start, end;
+	u64 pck_dur;
+	u64 ts;
+	Bool has_ts;
+	Bool pck_dur_for_segment;
+
+retry:
+
+	rpid->current_pck = gf_filter_pid_get_packet(rpid->pid);
+	if (!rpid->current_pck) {
+		if (gf_filter_pid_is_eos(rpid->pid)) {
+#if 0
+			if (gf_filter_reporting_enabled(filter)) {
+				char szStatus[1024];
+				snprintf(szStatus, 1024, "%s: done - wrote "LLU" bytes", gf_file_basename(ctx->szFileName), ctx->nb_write);
+				gf_filter_update_status(filter, 10000, szStatus);
+			}
+#endif
+
+			if (rpid->route->dash_mode && rpid->res_size) {
+				GF_FilterEvent evt;
+				GF_FEVT_INIT(evt, GF_FEVT_SEGMENT_SIZE, rpid->pid);
+				evt.seg_size.seg_url = NULL;
+
+				if (rpid->route->dash_mode==1) {
+					evt.seg_size.is_init = 1;
+					rpid->route->dash_mode = 2;
+					evt.seg_size.media_range_start = 0;
+					evt.seg_size.media_range_end = 0;
+					gf_filter_pid_send_event(rpid->pid, &evt);
+				} else {
+					evt.seg_size.is_init = 0;
+					evt.seg_size.media_range_start = rpid->offset_at_seg_start;
+					evt.seg_size.media_range_end = rpid->res_size - 1;
+					gf_filter_pid_send_event(rpid->pid, &evt);
+				}
+			}
+			//done
+			rpid->res_size = 0;
+			return;
+		}
+		return;
+	}
+	gf_filter_pck_ref(&rpid->current_pck);
+	gf_filter_pid_drop_packet(rpid->pid);
+
+	gf_filter_pck_get_framing(rpid->current_pck, &start, &end);
+
+	//trash redundant info for raw files
+	if (rpid->raw_file) {
+		u32 dep_flags = gf_filter_pck_get_dependency_flags(rpid->current_pck);
+		//redundant packet, do not store
+		if ((dep_flags & 0x3) == 1) {
+			gf_filter_pck_unref(rpid->current_pck);
+			rpid->current_pck = NULL;
+			goto retry;
+		}
+	}
+
+	rpid->pck_data = gf_filter_pck_get_data(rpid->current_pck, &rpid->pck_size);
+	rpid->pck_offset = 0;
+
+	p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_INIT);
+	if (p && p->value.boolean) {
+		u32 crc;
+		assert(start && end);
+		crc = gf_crc_32(rpid->pck_data, rpid->pck_size);
+		//whenever init seg changes, bump stsid version
+		if (crc != rpid->init_seg_crc) {
+			rpid->init_seg_crc = crc;
+			rpid->route->stsid_changed = GF_TRUE;
+			rpid->current_toi = 0;
+			if (rpid->init_seg_data) gf_free(rpid->init_seg_data);
+			rpid->init_seg_data = gf_malloc(rpid->pck_size);
+			memcpy(rpid->init_seg_data, rpid->pck_data, rpid->pck_size);
+			rpid->init_seg_size = rpid->pck_size;
+			rpid->init_seg_sent = GF_FALSE;
+			p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_FILENAME);
+			if (rpid->init_seg_name) gf_free(rpid->init_seg_name);
+			rpid->init_seg_name = p ? routeout_strip_base(rpid->route, p->value.string) : NULL;
+		}
+		gf_filter_pck_unref(rpid->current_pck);
+		rpid->current_pck = NULL;
+		goto retry;
+	}
+
+	p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PID_HLS_PLAYLIST);
+	if (p && p->value.string) {
+		u32 crc;
+		assert(start && end);
+		crc = gf_crc_32(rpid->pck_data, rpid->pck_size);
+		//whenever init seg changes, bump stsid version
+		if (crc != rpid->hld_child_pl_crc) {
+			rpid->hld_child_pl_crc = crc;
+			if (rpid->hld_child_pl) gf_free(rpid->hld_child_pl);
+			rpid->hld_child_pl = gf_malloc(rpid->pck_size+1);
+			memcpy(rpid->hld_child_pl, rpid->pck_data, rpid->pck_size);
+			rpid->hld_child_pl[rpid->pck_size] = 0;
+
+			if (!rpid->hld_child_pl_name || strcmp(rpid->hld_child_pl_name, p->value.string)) {
+				rpid->route->stsid_changed = GF_TRUE;
+				if (rpid->hld_child_pl_name) gf_free(rpid->hld_child_pl_name);
+				rpid->hld_child_pl_name = routeout_strip_base(rpid->route, p->value.string);
+			}
+		}
+		gf_filter_pck_unref(rpid->current_pck);
+		rpid->current_pck = NULL;
+		goto retry;
+	}
+	if (rpid->route->dash_mode) {
+		p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_FILENUM);
+		if (p) {
+			GF_FilterEvent evt;
+
+			GF_FEVT_INIT(evt, GF_FEVT_SEGMENT_SIZE, rpid->pid);
+			evt.seg_size.seg_url = NULL;
+
+			if (rpid->route->dash_mode==1) {
+				evt.seg_size.is_init = 1;
+				rpid->route->dash_mode = 2;
+				evt.seg_size.media_range_start = 0;
+				evt.seg_size.media_range_end = 0;
+				gf_filter_pid_send_event(rpid->pid, &evt);
+			} else {
+				evt.seg_size.is_init = 0;
+				evt.seg_size.media_range_start = rpid->offset_at_seg_start;
+				evt.seg_size.media_range_end = rpid->res_size - 1;
+				rpid->offset_at_seg_start = evt.seg_size.media_range_end;
+				gf_filter_pid_send_event(rpid->pid, &evt);
+			}
+			if ( gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_FILENAME))
+				start = GF_TRUE;
+		}
+	}
+
+	if (rpid->raw_file) {
+		assert(start && end);
+
+		if (rpid->seg_name) gf_free(rpid->seg_name);
+		rpid->seg_name = "unknown";
+		p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_ROUTE_NAME);
+		if (p)
+			rpid->seg_name = p->value.string;
+		else {
+			p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_URL);
+			if (p) rpid->seg_name = gf_file_basename(p->value.string);
+		}
+		rpid->seg_name = gf_strdup(rpid->seg_name);
+
+		//setup carousel period
+		rpid->carousel_time_us = ctx->carousel;
+		p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_ROUTE_CAROUSEL);
+		if (p) {
+			rpid->carousel_time_us = p->value.frac.num;
+			rpid->carousel_time_us *= 1000000;
+			rpid->carousel_time_us /= p->value.frac.den;
+		}
+		//setup upload time
+		rpid->current_dur_us = ctx->carousel;
+		p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_ROUTE_SENDTIME);
+		if (p) {
+			rpid->current_dur_us = p->value.frac.num;
+			rpid->current_dur_us *= 1000000;
+			rpid->current_dur_us /= p->value.frac.den;
+		}
+		if (rpid->carousel_time_us && (rpid->current_dur_us>rpid->carousel_time_us)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Requested upload time of file "LLU" is greater than its carousel time "LLU", adjusting carousel\n", rpid->current_dur_us, rpid->carousel_time_us));
+			rpid->carousel_time_us = rpid->current_dur_us;
+		}
+		rpid->clock_at_pck = rpid->current_cts_us = rpid->cts_us_at_frame_start = ctx->clock;
+		rpid->full_frame_size = rpid->pck_size;
+		return;
+	}
+
+	if (start) {
+		p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_FILENAME);
+		if (rpid->seg_name) gf_free(rpid->seg_name);
+		if (p) {
+			rpid->seg_name = rpid->use_basename ? gf_file_basename(p->value.string) : p->value.string;
+		} else {
+			rpid->seg_name = "unknown";
+		}
+		rpid->seg_name = gf_strdup(rpid->seg_name);
+
+		//file num increased per packet, open new file
+		p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_FILENUM);
+		if (p)
+			rpid->current_toi = p->value.uint;
+		else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Missing filenum on segment %s, something is wrong in demux chain - assuming +1 increase\n", rpid->seg_name));
+			rpid->current_toi ++;
+		}
+		rpid->frag_idx = 0;
+		rpid->full_frame_size = end ? rpid->pck_size : 0;
+		rpid->cumulated_frag_size = rpid->pck_size;
+		rpid->push_init = GF_TRUE;
+		rpid->frag_offset = 0;
+	} else {
+		rpid->frag_idx++;
+		rpid->cumulated_frag_size += rpid->pck_size;
+		if (end) {
+			rpid->full_frame_size = rpid->cumulated_frag_size;
+			rpid->force_tol_send = GF_TRUE;
+		}
+	}
+
+
+	pck_dur = gf_filter_pck_get_duration(rpid->current_pck);
+	//check if duration is for the entire segment or this fragment (cf forward=file in dmx_dash.c)
+	pck_dur_for_segment = GF_FALSE;
+	if (start) {
+		rpid->pck_dur_at_frame_start = 0;
+		if (gf_filter_pck_get_carousel_version(rpid->current_pck))
+			pck_dur_for_segment = GF_TRUE;
+	}
+
+	ts = gf_filter_pck_get_cts(rpid->current_pck);
+	has_ts = (ts==GF_FILTER_NO_TS) ? GF_FALSE : GF_TRUE;
+
+	if (
+		//no TS and not initial fragment, recompute timing and dur
+		(!start && !has_ts && rpid->bitrate && rpid->pck_dur_at_frame_start)
+		//has TS, initial fragment and duration for the entire segment, recompute dur only
+		|| (has_ts && start && !end && pck_dur && pck_dur_for_segment)
+	) {
+		u64 frag_time, tot_est_size;
+
+		//fragment start, store packed duration
+		if (has_ts) {
+			rpid->pck_dur_at_frame_start = (u32) pck_dur;
+		}
+		//compute estimated file size based on segment duration and rate, use 10% overhead
+		tot_est_size = gf_timestamp_rescale(rpid->bitrate, rpid->timescale, rpid->pck_dur_at_frame_start);
+		tot_est_size /= 8;
+
+		//our estimate was too small...
+		if (tot_est_size < rpid->cumulated_frag_size)
+			tot_est_size = rpid->cumulated_frag_size;
+
+		//compute timing proportional to packet duration, with ratio of current size / tot_est_size
+		pck_dur = rpid->pck_size * rpid->pck_dur_at_frame_start / tot_est_size;
+		if (!pck_dur) pck_dur = 1;
+
+		if (!has_ts) {
+			frag_time = (rpid->cumulated_frag_size-rpid->pck_size) * rpid->pck_dur_at_frame_start / tot_est_size;
+			ts = rpid->cts_at_frame_start + frag_time;
+		} else {
+			frag_time = 0;
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Missing timing for fragment %d of segment %s - timing estimated from bitrate: TS "LLU" ("LLU" in segment) dur "LLU"\n", rpid->frag_idx, rpid->seg_name, ts, frag_time, pck_dur));
+	}
+
+	if (ts!=GF_FILTER_NO_TS) {
+		u64 diff;
+		if (!rpid->clock_at_first_pck) {
+			rpid->clock_at_first_pck = ctx->clock;
+			rpid->cts_first_pck = ts;
+		}
+		//move to microsecs
+		diff = gf_timestamp_rescale(ts - rpid->cts_first_pck, rpid->timescale, 1000000);
+
+		rpid->current_cts_us = rpid->clock_at_first_pck + diff;
+		rpid->clock_at_pck = ctx->clock;
+
+		if (start) {
+			rpid->clock_at_frame_start = ctx->clock;
+			rpid->cts_us_at_frame_start = rpid->current_cts_us;
+			rpid->cts_at_frame_start = ts;
+		}
+
+		rpid->current_dur_us = pck_dur;
+		if (!rpid->current_dur_us) {
+			rpid->current_dur_us = rpid->timescale;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Missing duration on segment %s, something is wrong in demux chain, will not be able to regulate correctly\n", rpid->seg_name));
+		}
+		rpid->current_dur_us = gf_timestamp_rescale(rpid->current_dur_us, rpid->timescale, 1000000);
+	} else if (start && end) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Missing timing on segment %s, using previous fragment timing CTS "LLU" duration "LLU" us\nSomething could be wrong in demux chain, will not be able to regulate correctly\n", rpid->seg_name, rpid->current_cts_us-rpid->clock_at_first_pck, rpid->current_dur_us));
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Missing timing on fragment %d of segment %s, using previous fragment timing CTS "LLU" duration "LLU" us\nSomething could be wrong in demux chain, will not be able to regulate correctly\n", rpid->frag_idx, rpid->seg_name, rpid->current_cts_us-rpid->clock_at_first_pck, rpid->current_dur_us));
+	}
+
+
+	rpid->res_size += rpid->pck_size;
+}
+
+
+static GF_Err routeout_process_service(GF_ROUTEOutCtx *ctx, ROUTEService *serv)
+{
+	u32 i, count, nb_done;
+	GF_Err e;
+
+	e = routeout_check_service_updates(ctx, serv);
+
+	if (serv->stsid_bundle) {
+		u64 diff = ctx->clock - serv->last_stsid_clock;
+		if (diff >= ctx->carousel) {
+			routeout_service_send_bundle(ctx, serv);
+			serv->last_stsid_clock = ctx->clock;
+		} else {
+			u64 next_sched = ctx->carousel - diff;
+			if (next_sched < ctx->reschedule_us)
+				ctx->reschedule_us = next_sched;
+		}
+	} else {
+		//not ready
+		return e;
+	}
+
+	nb_done = 0;
+	count = gf_list_count(serv->pids);
+	for (i=0; i<count; i++) {
+		ROUTEPid *rpid = gf_list_get(serv->pids, i);
+		Bool send_hls_child = rpid->update_hls_child_pl;
+		if (rpid->manifest_type) {
+			nb_done++;
+			continue;
+		}
+
+		if (ctx->reporting_on) {
+			if (rpid->full_frame_size) {
+				ctx->total_size += rpid->full_frame_size;
+			} else {
+				ctx->total_size += rpid->pck_size;
+				ctx->total_size_unknown = GF_TRUE;
+			}
+			ctx->total_bytes += rpid->pck_offset;
+			ctx->nb_resources++;
+		}
+
+next_packet:
+
+		if (!rpid->current_pck) {
+			u32 offset;
+			routeout_fetch_packet(ctx, rpid);
+			if (!rpid->current_pck) {
+				if (gf_filter_pid_is_eos(rpid->pid))
+					nb_done++;
+				continue;
+			}
+
+			if (ctx->reporting_on) {
+				if (rpid->full_frame_size) {
+					ctx->total_size += rpid->full_frame_size;
+				} else {
+					ctx->total_size += rpid->pck_size;
+					ctx->total_size_unknown = GF_TRUE;
+				}
+				ctx->nb_resources++;
+			}
+
+			if (rpid->push_init) {
+				rpid->push_init = GF_FALSE;
+				send_hls_child = GF_TRUE;
+				GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Sending init segment %s\n", rpid->init_seg_name));
+
+				//send init asap (may be empty)
+				offset = 0;
+				while (offset < rpid->init_seg_size) {
+					//we use codepoint 5 (new IS) or 7 (repeated IS)
+					u32 codepoint;
+					if (rpid->init_seg_sent) {
+						codepoint = 7;
+					} else {
+						rpid->init_seg_sent = GF_FALSE;
+						codepoint = 5;
+					}
+					offset += routeout_lct_send(ctx, rpid->rlct->sock, rpid->tsi, ROUTE_INIT_TOI, codepoint, (u8 *) rpid->init_seg_data, rpid->init_seg_size, offset, serv->service_id, rpid->init_seg_size, offset);
+				}
+				if (ctx->reporting_on) {
+					ctx->total_size += rpid->init_seg_size;
+					ctx->total_bytes = rpid->init_seg_size;
+					ctx->nb_resources++;
+				}
+			}
+		}
+		//send child m3u8 asap
+		if (send_hls_child && rpid->hld_child_pl) {
+			u32 hls_len = (u32) strlen(rpid->hld_child_pl);
+			u32 offset = 0;
+			GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Sending HLS sub playlist %s: \n%s\n", rpid->hld_child_pl_name, rpid->hld_child_pl));
+
+			while (offset < hls_len) {
+				//we use codepoint 1 (NRT - file mode) for subplaylists
+				offset += routeout_lct_send(ctx, rpid->rlct->sock, rpid->tsi, ROUTE_INIT_TOI-1, 1, (u8 *) rpid->hld_child_pl, hls_len, offset, serv->service_id, hls_len, offset);
+			}
+			if (ctx->reporting_on) {
+				ctx->total_size += hls_len;
+				ctx->total_bytes = hls_len;
+				ctx->nb_resources++;
+			}
+			rpid->update_hls_child_pl = GF_FALSE;
+		}
+
+		while ((rpid->pck_offset < rpid->pck_size) || rpid->force_tol_send) {
+			u32 sent, codepoint;
+			//we have timing info, let's regulate
+			if (rpid->current_cts_us!=GF_FILTER_NO_TS) {
+				u64 cur_time_us;
+				ctx->clock = gf_sys_clock_high_res();
+				//carousel, not yet ready
+				if (ctx->clock < rpid->clock_at_frame_start)
+					break;
+
+				//send delay proportionnal to send progress - ultimately we should follow the frame timing, not the segment timing
+				//but for the time being we only push complete segments (no LL)
+				//it may happen that pck_size is 0 (last_chunk=0) when we force sending a TOL
+				if (!ctx->noreg && rpid->pck_size) {
+					cur_time_us = rpid->pck_offset;
+					cur_time_us *= rpid->current_dur_us;
+					cur_time_us /= rpid->pck_size;
+					cur_time_us += rpid->current_cts_us;
+
+					if (cur_time_us > ctx->clock ) {
+						u64 next_sched = (cur_time_us - ctx->clock) / 2;
+						if (next_sched < ctx->reschedule_us)
+							ctx->reschedule_us = next_sched;
+						break;
+					}
+				}
+			}
+			//we use codepoint 8 (media segment, file mode) for media segments, otherwise as listed in S-TSID
+			codepoint = rpid->raw_file ? rpid->fmtp : 8;
+			sent = routeout_lct_send(ctx, rpid->rlct->sock, rpid->tsi, rpid->current_toi, codepoint, (u8 *) rpid->pck_data, rpid->pck_size, rpid->pck_offset, serv->service_id, rpid->full_frame_size, rpid->pck_offset + rpid->frag_offset);
+			rpid->pck_offset += sent;
+			if (ctx->reporting_on) {
+				ctx->total_bytes += sent;
+			}
+			rpid->force_tol_send = GF_FALSE;
+		}
+		assert (rpid->pck_offset <= rpid->pck_size);
+
+		if (rpid->pck_offset == rpid->pck_size) {
+			//print fragment push info except if single fragment
+			if (rpid->frag_idx || !rpid->full_frame_size) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] pushed fragment %s#%d (%d bytes) in "LLU" us - target push "LLU" us\n", rpid->seg_name, rpid->frag_idx+1, rpid->pck_size, ctx->clock - rpid->clock_at_pck, rpid->current_dur_us));
+			}
+#ifndef GPAC_DISABLE_LOG
+			//print full object push info
+			if (rpid->full_frame_size && (gf_log_get_tool_level(GF_LOG_ROUTE)>=GF_LOG_INFO)) {
+				char szFInfo[1000], szSID[31];
+				u64 seg_clock, target_push_dur;
+
+				if (rpid->pck_dur_at_frame_start) {
+					target_push_dur = gf_timestamp_rescale(rpid->pck_dur_at_frame_start, rpid->timescale, 1000000);
+				} else {
+					target_push_dur = rpid->current_dur_us + rpid->current_cts_us - rpid->cts_us_at_frame_start;
+				}
+				if (ctx->sock_atsc_lls) {
+					snprintf(szSID, 20, "Service%d ", serv->service_id);
+					szSID[30] = 0;
+				}
+				else
+					szSID[0] = 0;
+
+				if (rpid->frag_idx)
+					snprintf(szFInfo, 100, "%s%s (%d frags %d bytes)", szSID, rpid->seg_name, rpid->frag_idx+1, rpid->full_frame_size);
+				else
+					snprintf(szFInfo, 100, "%s%s (%d bytes)", szSID, rpid->seg_name, rpid->full_frame_size);
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Pushed %s in "LLU" us - target push "LLU" us\n", szFInfo, ctx->clock - rpid->clock_at_frame_start, target_push_dur));
+
+				//real-time stream, check we are not out of sync
+				if (!rpid->raw_file) {
+					//clock time is the clock at first pck of first seg + cts_diff(cur_seg, first_seg)
+					seg_clock = rpid->cts_us_at_frame_start + target_push_dur;
+
+					//if segment clock time is greater than clock, we've been pushing too fast
+					if (seg_clock > ctx->clock) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Segment %s pushed early by "LLU" us\n", rpid->seg_name, seg_clock - ctx->clock));
+					}
+					//otherwise we've been pushing too slowly
+					else if (ctx->clock > 1000 + seg_clock) {
+						GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Segment %s pushed too late by "LLU" us\n", rpid->seg_name, ctx->clock - seg_clock));
+					}
+
+					if (rpid->pck_dur_at_frame_start && ctx->llmode) {
+						u64 seg_rate = gf_timestamp_rescale(rpid->full_frame_size * 8, rpid->pck_dur_at_frame_start, rpid->timescale);
+
+						if (seg_rate > rpid->bitrate) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Segment %s rate "LLU" but stream rate "LLU", updating bitrate\n", rpid->seg_name, seg_rate, rpid->bitrate));
+							rpid->bitrate = (u32) seg_rate;
+						}
+					}
+				}
+			}
+#endif
+			//raw file, keep on sending data if carousel period is set and no new packet
+			if (rpid->raw_file && rpid->carousel_time_us) {
+				GF_FilterPacket *pck_next = gf_filter_pid_get_packet(rpid->pid);
+				if (!pck_next) {
+					rpid->pck_offset = 0;
+					rpid->current_cts_us += rpid->carousel_time_us;
+					rpid->clock_at_pck = rpid->current_cts_us;
+					rpid->clock_at_frame_start += rpid->carousel_time_us;
+					rpid->cts_us_at_frame_start = rpid->current_cts_us;
+					//exit sending for this pid
+					continue;
+				}
+			}
+			gf_filter_pck_unref(rpid->current_pck);
+			rpid->current_pck = NULL;
+			rpid->frag_offset = rpid->cumulated_frag_size;
+			goto next_packet;
+		}
+	}
+	serv->is_done = (nb_done==count) ? GF_TRUE : GF_FALSE;
+	return GF_OK;
+}
+
+#define GF_TAI_UTC_OFFSET	37
+static void routeout_send_lls(GF_ROUTEOutCtx *ctx)
+{
+	char *payload_text = NULL;
+	u8 *payload = NULL, *pay_start;
+	char tmp[2000];
+	u32 i, count, len, comp_size;
+	s32 timezone, h, m;
+	u64 diff = ctx->clock - ctx->last_lls_clock;
+	if (diff < ctx->carousel) {
+		u64 next_sched = ctx->carousel - diff;
+		if (next_sched < ctx->reschedule_us)
+			ctx->reschedule_us = next_sched;
+		return;
+	}
+	ctx->last_lls_clock = ctx->clock;
+
+	if (!ctx->bytes_sent) ctx->clock_stats = ctx->clock;
+
+	//we send 2 LLS tables, SysTime and SLT
+
+	//SysTime
+	if (!ctx->lls_time_table) {
+		gf_dynstrcat(&payload_text, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SystemTime currentUtcOffset=\"", NULL);
+		sprintf(tmp, "%d", GF_TAI_UTC_OFFSET);
+		gf_dynstrcat(&payload_text, tmp, NULL);
+		gf_dynstrcat(&payload_text, "\" utcLocalOffset=\"", NULL);
+		timezone = -gf_net_get_timezone() / 60;
+		h = timezone / 60;
+		m = timezone - h*60;
+		if (m)
+			sprintf(tmp, "%sPT%dH%dM", (h<0) ? "-" : "", ABS(h), m);
+		else
+			sprintf(tmp, "%sPT%dH", (h<0) ? "-" : "", ABS(h));
+		gf_dynstrcat(&payload_text, tmp, NULL);
+		gf_dynstrcat(&payload_text, "\" dsStatus=\"", NULL);
+		gf_dynstrcat(&payload_text, gf_net_time_is_dst() ? "true" : "false", NULL);
+		gf_dynstrcat(&payload_text, "\"/>\n", NULL);
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Updating ATSC3 LLS.SysTime:\n%s\n", payload_text));
+		len = (u32) strlen(payload_text);
+		comp_size = 2*len;
+		payload = gf_malloc(sizeof(char)*(comp_size+4));
+		pay_start = payload + 4;
+		gf_gz_compress_payload_ex((u8 **) &payload_text, len, &comp_size, 0, GF_FALSE, &pay_start);
+		gf_free(payload_text);
+		payload_text = NULL;
+
+		comp_size += 4;
+		//format header
+		payload[0] = 3; //tableID
+		payload[1] = 0; //groupid
+		payload[2] = 0; //lls_group_count_minus_one
+		payload[3] = 1; //lls_table_version
+
+		ctx->lls_time_table = payload;
+		ctx->lls_time_table_len = comp_size;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Sending ATSC3 LLS.SysTime\n"));
+	gf_sk_send(ctx->sock_atsc_lls, ctx->lls_time_table, ctx->lls_time_table_len);
+	ctx->bytes_sent += ctx->lls_time_table_len;
+
+	//SLT
+	if (!ctx->lls_slt_table) {
+		count = gf_list_count(ctx->services);
+		snprintf(tmp, 1000, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SLT bsid=\"%d\">\n", ctx->bsid);
+		gf_dynstrcat(&payload_text, tmp, NULL);
+		for (i=0; i<count; i++) {
+			const GF_PropertyValue *p;
+			const char *src_ip, *service_name;
+			char szIP[GF_MAX_IP_NAME_LEN];
+			ROUTEPid *rpid;
+			ROUTEService *serv = gf_list_get(ctx->services, i);
+			u32 sid = serv->service_id;
+			if (!sid) sid = 1;
+			u32 minor = sid % 1000;
+			if (!minor) minor = 1;
+			u32 major = GF_4CC('G', 'P', 'A', 'C') % 1000;
+
+			rpid = gf_list_get(serv->pids, 0);
+			p = gf_filter_pid_get_property_str(rpid->pid, "ShortServiceName");
+			if (!p)
+				p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_SERVICE_NAME);
+			service_name = (p && p->value.string) ? p->value.string : "GPAC";
+			len = (u32) strlen(service_name);
+			if (len>7) len = 7;
+			strncpy(szIP, service_name, len);
+			szIP[len] = 0;
+
+			snprintf(tmp, 2000,
+				" <Service serviceId=\"%d\" sltSvcSeqNum=\"0 \" serviceCategory=\"1\" globalServiceID=\"urn:atsc:gpac:%d:%d\" majorChannelNo=\"%d\" minorChannelNo=\"%d\" shortServiceName=\"%s\">\n", sid, ctx->bsid, sid, major, minor, szIP);
+			gf_dynstrcat(&payload_text, tmp, NULL);
+
+			src_ip = ctx->ifce;
+			if (!src_ip) {
+				gf_sk_get_local_ip(serv->rlct_base->sock, szIP);
+				src_ip = szIP;
+			}
+			int res = snprintf(tmp, 1000, " <BroadcastSvcSignaling slsProtocol=\"1\" slsDestinationIpAddress=\"%s\" slsDestinationUdpPort=\"%d\" slsSourceIpAddress=\"%s\"/>\n"
+				" </Service>\n", serv->rlct_base->ip, serv->rlct_base->port, src_ip);
+			if (res<0) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] String truncated will trying to write: <BroadcastSvcSignaling slsProtocol=\"1\" slsDestinationIpAddress=\"%s\" slsDestinationUdpPort=\"%d\" slsSourceIpAddress=\"%s\"/>\n", serv->rlct_base->ip, serv->rlct_base->port, src_ip));
+			}
+			gf_dynstrcat(&payload_text, tmp, NULL);
+		}
+		gf_dynstrcat(&payload_text, "</SLT>\n", NULL);
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Updating ATSC3 LLS.SLT:\n%s\n", payload_text));
+
+		len = (u32) strlen(payload_text);
+		comp_size = 2*len;
+		payload = gf_malloc(sizeof(char)*(comp_size+4));
+		pay_start = payload + 4;
+		gf_gz_compress_payload_ex((u8 **) &payload_text, len, &comp_size, 0, GF_FALSE, &pay_start);
+		gf_free(payload_text);
+		payload_text = NULL;
+
+		comp_size += 4;
+		//format header
+		payload[0] = 1; //tableID
+		payload[1] = 0; //groupid
+		payload[2] = 0; //lls_group_count_minus_one
+		payload[3] = 1; //lls_table_version
+
+		ctx->lls_slt_table = payload;
+		ctx->lls_slt_table_len = comp_size;
+	}
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Sending ATSC3 LLS SysTime and SLT\n"));
+	gf_sk_send(ctx->sock_atsc_lls, ctx->lls_slt_table, ctx->lls_slt_table_len);
+	ctx->bytes_sent += ctx->lls_slt_table_len;
+}
+
+static GF_Err routeout_process(GF_Filter *filter)
+{
+	GF_Err e = GF_OK;
+	u32 i, count;
+	Bool all_serv_done = GF_TRUE;
+	GF_ROUTEOutCtx *ctx = (GF_ROUTEOutCtx *) gf_filter_get_udta(filter);
+
+	ctx->clock = gf_sys_clock_high_res();
+	ctx->reschedule_us = MIN(ctx->carousel, 50000);
+	ctx->reporting_on = gf_filter_reporting_enabled(filter);
+	if (ctx->reporting_on) {
+		ctx->total_size_unknown = GF_FALSE;
+		ctx->total_size = 0;
+		ctx->total_bytes = GF_FALSE;
+		ctx->nb_resources = 0;
+	}
+
+	if (ctx->runfor) {
+		if (ctx->clock - ctx->clock_init > ctx->runfor*1000) {
+			if (!ctx->done) {
+				ctx->done = GF_TRUE;
+				count = gf_filter_get_ipid_count(filter);
+				for (i=0; i<count; i++) {
+					GF_FilterEvent evt;
+					GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+					GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
+					gf_filter_pid_send_event(pid, &evt);
+					gf_filter_pid_set_discard(pid, GF_TRUE);
+				}
+			}
+			return GF_EOS;
+		}
+	}
+
+	if (ctx->sock_atsc_lls)
+		routeout_send_lls(ctx);
+
+	count = gf_list_count(ctx->services);
+	for (i=0; i<count; i++) {
+		ROUTEService *serv = gf_list_get(ctx->services, i);
+		if (!serv->is_done) {
+			e |= routeout_process_service(ctx, serv);
+			if (!serv->is_done)
+				all_serv_done = GF_FALSE;
+		}
+	}
+
+	if (all_serv_done) {
+		return e ? e : GF_EOS;
+	}
+
+	if (ctx->clock - ctx->clock_stats >= 1000000) {
+		u64 rate = ctx->bytes_sent * 8 * 1000 / (ctx->clock - ctx->clock_stats);
+		GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Mux rate "LLU" kbps\n", rate));
+		if (ctx->reporting_on) {
+			u32 progress = 0;
+			char szStatus[200];
+			if (!ctx->total_size_unknown && ctx->total_bytes)
+				progress = (u32) (10000*ctx->total_bytes / ctx->total_size);
+
+			if (ctx->sock_atsc_lls) {
+				snprintf(szStatus, 200, "Mux rate "LLU" kbps - %d services - %d active resources %.02f %% done", rate, count, ctx->nb_resources, ((Double)progress) / 100);
+			} else {
+				snprintf(szStatus, 200, "Mux rate "LLU" kbps - %d active resources %.02f %% done", rate, ctx->nb_resources, ((Double)progress) / 100);
+			}
+			gf_filter_update_status(filter, 0, szStatus);
+		}
+		ctx->bytes_sent = 0;
+		ctx->clock_stats = ctx->clock;
+	}
+	ctx->reschedule_us++;
+	gf_filter_ask_rt_reschedule(filter, (u32) ctx->reschedule_us);
+	return e;
+}
+
+static GF_FilterProbeScore routeout_probe_url(const char *url, const char *mime)
+{
+	if (!strnicmp(url, "atsc://", 7)) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "route://", 8)) return GF_FPROBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+static Bool routeout_use_alias(GF_Filter *filter, const char *url, const char *mime)
+{
+	const char *sep;
+	u32 len;
+	GF_ROUTEOutCtx *ctx = (GF_ROUTEOutCtx *) gf_filter_get_udta(filter);
+
+	//atsc, do not analyze IP and port
+	if (ctx->sock_atsc_lls) {
+		if (!strncmp(url, "atsc://", 7)) return GF_TRUE;
+		return GF_FALSE;
+	}
+
+	//check we have same hostname. If so, accept this destination as a source for our filter
+	//- if atsc://, single instance of the filter
+	//- if route://IP:PORT, same instance if same IP:PORT
+	sep = strstr(url, "://");
+	if (!sep) return GF_FALSE;
+	sep += 3;
+	sep = strchr(sep, '/');
+	if (!sep) {
+		if (!strcmp(ctx->dst, url)) return GF_TRUE;
+		return GF_FALSE;
+	}
+	len = (u32) (sep - url);
+	if (!strncmp(ctx->dst, url, len)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+
+#define OFFS(_n)	#_n, offsetof(GF_ROUTEOutCtx, _n)
+
+static const GF_FilterArgs ROUTEOutArgs[] =
+{
+	{ OFFS(dst), "destination URL", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(ext), "set extension for graph resolution, regardless of file extension", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mime), "set mime type for graph resolution", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(ifce), "default interface to use for multicast. If NULL, the default system interface will be used", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(carousel), "carousel period in ms for repeating signaling and raw file data", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(first_port), "port number of first ROUTE session in ATSC mode", GF_PROP_UINT, "6000", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(ip), "multicast IP address for ROUTE session in ATSC mode", GF_PROP_STRING, "225.1.1.0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(ttl), "time-to-live for multicast packets", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(bsid), "ID for ATSC broadcast stream", GF_PROP_UINT, "800", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mtu), "size of LCT MTU in bytes", GF_PROP_UINT, "1472", NULL, 0},
+	{ OFFS(splitlct), "split mode for LCT channels\n"
+		"- off: all streams are in the same LCT channel\n"
+		"- type: each new stream type results in a new LCT channel\n"
+		"- all: all streams are in dedicated LCT channel, the first stream being used for STSID signaling"
+		, GF_PROP_UINT, "off", "off|type|all", 0},
+	{ OFFS(korean), "use Korean version of ATSC 3.0 spec instead of US", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(llmode), "use low-latency mode", GF_PROP_BOOL, "false", NULL, GF_ARG_HINT_EXPERT},
+	{ OFFS(brinc), "bitrate increase in percent when estimating timing in low latency mode", GF_PROP_UINT, "10", NULL, GF_ARG_HINT_EXPERT},
+	{ OFFS(noreg), "disable rate regulation for media segments, pushing them as fast as received", GF_PROP_BOOL, "false", NULL, GF_ARG_HINT_EXPERT},
+
+	{ OFFS(runfor), "run for the given time in ms", GF_PROP_UINT, "0", NULL, 0},
+	{0}
+};
+
+static const GF_FilterCapability ROUTEOutCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_FILE_EXT, "*"),
+};
+
+
+GF_FilterRegister ROUTEOutRegister = {
+	.name = "routeout",
+	GF_FS_SET_DESCRIPTION("ROUTE output")
+	GF_FS_SET_HELP("The ROUTE output filter is used to distribute a live file-based session using ROUTE.\n"
+		"The filter supports DASH and HLS inputs, ATSC3.0 signaling and generic ROUTE signaling.\n"
+		"\n"
+		"The filter is identified using the following URL schemes:\n"
+		"- `atsc://`: session is a full ATSC 3.0 session\n"
+		"- `route://IP:port`: session is a ROUTE session running on given multicast IP and port\n"
+		"\n"
+		"The filter only accepts input PIDs of type `FILE`.\n"
+		"- HAS Manifests files are detected by file extension and/or MIME types, and sent as part of the signaling bundle or as LCT object files for HLS child playlists.\n"
+		"- HAS Media segments are detected using the `OrigStreamType` property, and send as LCT object files using the DASH template string.\n"
+		"- A PID without `OrigStreamType` property set is delivered as a regular LCT object file (called `raw` hereafter).\n"
+		" \n"
+		"For `raw` file PIDs, the filter will look for the following properties:\n"
+		"- `ROUTEName`: set resource name. If not found, uses basename of URL\n"
+		"- `ROUTECarousel`: set repeat period. If not found, uses [-carousel](). If 0, the file is only sent once\n"
+		"- `ROUTEUpload`: set resource upload time. If not found, uses [-carousel](). If 0, the file will be sent as fast as possible.\n"
+		"\n"
+		"When DASHing for ROUTE or single service ATSC, a file extension, either in [-dst]() or in [-ext](), may be used to identify the HAS session type (DASH or HLS).\n"
+		"EX \"route://IP:PORT/manifest.mpd\", \"route://IP:PORT/:ext=mpd\"\n"
+		"\n"
+		"When DASHing for multi-service ATSC, forcing an extension will force all service to use the same formats.\n"
+		"EX \"atsc://:ext=mpd\", \"route://IP:PORT/manifest.mpd\"\n"
+		"If multiple services with different formats are needed, you will need to explicit your filters:\n"
+		"EX gpac -i DASH_URL:#ServiceID=1 dashin:forward=file:FID=1 -i HLS_URL:#ServiceID=2 dashin:forward=file:FID=2 -o atsc://:SID=1,2\n"
+		"EX gpac -i MOVIE1:#ServiceID=1 dasher:FID=1:mname=manifest.mpd -i MOVIE2:#ServiceID=2 dasher:FID=2:mname=manifest.m3u8 -o atsc://:SID=1,2\n"
+		"\n"
+		"Warning: When forwarding an existing DASH/HLS session, do NOT set any extension or manifest name.\n"
+		"\n"
+		"By default, all streams in a service are assigned to a single route session, and differentiated by ROUTE TSI (see [-splitlct]()).\n"
+		"TSI are assigned as follows:\n"
+		"- signaling TSI is always 0\n"
+		"- raw files are assigned TSI 1 and increasing number of TOI\n"
+		"- otherwise, the first PID found is assigned TSI 10, the second TSI 20 etc ...\n"
+		"\n"
+		"Init segments and HLS child playlists are sent before each new segment, independently of [-carousel]().\n"
+		"# ATSC 3.0 mode\n"
+		"In this mode, the filter allows multiple service multiplexing, identified through the `ServiceID` property.\n"
+		"By default, a single multicast IP is used for route sessions, each service will be assigned a different port.\n"
+		"The filter will look for `ROUTEIP` and `ROUTEPort` properties on the incoming PID. If not found, the default [-ip]() and [-port]() will be used.\n"
+		"\n"
+		"The ATSC short service name can be set using PID property `ShortServiceName`. If not found, `ServiceName` is checked, otherwise default to `GPAC`.\n"
+		"\n"
+		"# ROUTE mode\n"
+		"In this mode, only a single service can be distributed by the ROUTE session.\n"
+		"Note: [-ip]() is ignored, and [-first_port]() is used if no port is specified in [-dst]().\n"
+		"The ROUTE session will include a multi-part MIME unsigned package containing manifest and S-TSID, sent on TSI=0.\n"
+		"\n"
+		"# Low latency mode\n"
+		"When using low-latency mode, the input media segments are not re-assembled in a single packet but are instead sent as they are received.\n"
+		"In order for the real-time scheduling of data chunks to work, each fragment of the segment should have a CTS and timestamp describing its timing.\n"
+		"If this is not the case (typically when used with an existing DASH session in file mode), the scheduler will estimate CTS and duration based on the stream bitrate and segment duration. The indicated bitrate is increased by [-brinc]() percent for safety.\n"
+		"If this fails, the filter will trigger warnings and send as fast as possible.\n"
+		"Note: The LCT objects are sent with no length (TOL header) assigned until the final segment size is known, potentially leading to a final 0-size LCT fragment signaling only the final size.\n"
+		"\n"
+		"# Examples\n"
+		"Since the ROUTE filter only consumes files, it is required to insert:\n"
+		"- the dash demultiplexer in file forwarding mode when loading a DASH session\n"
+		"- the dash multiplexer when creating a DASH session\n"
+		"\n"
+		"Multiplexing an existing DASH session in route:\n"
+		"EX gpac -i source.mpd dashin:forward=file -o route://225.1.1.0:6000/\n"
+		"Multiplexing an existing DASH session in atsc:\n"
+		"EX gpac -i source.mpd dashin:forward=file -o atsc://\n"
+		"Dashing and multiplexing in route:\n"
+		"EX gpac -i source.mp4 dasher:profile=live -o route://225.1.1.0:6000/manifest.mpd\n"
+		"Dashing and multiplexing in route Low Latency:\n"
+		"EX gpac -i source.mp4 dasher -o route://225.1.1.0:6000/manifest.mpd:profile=live:cdur=0.2:llmode\n"
+		"\n"
+		"Sending a single file in ROUTE using half a second upload time, 2 seconds carousel:\n"
+		"EX gpac -i URL:#ROUTEUpload=0.5:#ROUTECarousel=2 -o route://225.1.1.0:6000/\n"
+		"\n"
+		"Common mistakes:\n"
+		"EX gpac -i source.mpd -o route://225.1.1.0:6000/\n"
+		"This will only send the manifest file as a regular object and will not load the dash session.\n"
+		"EX gpac -i source.mpd dashin:forward=file -o route://225.1.1.0:6000/manifest.mpd\n"
+		"This will force the ROUTE multiplexer to only accept .mpd files, and will drop all segment files (same if [-ext]() is used).\n"
+		"EX gpac -i source.mpd dasher -o route://225.1.1.0:6000/\n"
+		"EX gpac -i source.mpd dasher -o route://225.1.1.0:6000/manifest.mpd\n"
+		"These will demultiplex the input, re-dash it and send the output of the dasher to ROUTE\n"
+	)
+	.private_size = sizeof(GF_ROUTEOutCtx),
+	.max_extra_pids = -1,
+	.args = ROUTEOutArgs,
+	SETCAPS(ROUTEOutCaps),
+	.probe_url = routeout_probe_url,
+	.initialize = routeout_initialize,
+	.finalize = routeout_finalize,
+	.configure_pid = routeout_configure_pid,
+	.process = routeout_process,
+	.use_alias = routeout_use_alias
+};
+
+
+const GF_FilterRegister *routeout_register(GF_FilterSession *session)
+{
+	return &ROUTEOutRegister;
+}

gpac-1.0.1.tar.gz/src/filters/out_rtp.c -> gpac-2.0.0.tar.gz/src/filters/out_rtp.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019-2020
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / rtp output filter
@@ -108,7 +108,7 @@
 		gf_fprintf(sdp_out, "i=%s\n", info);
 	} else {
 		GF_RTPOutStream *stream = gf_list_get(streams, 0);
-		const char *src = gf_filter_pid_orig_src_args(stream->pid);
+		const char *src = gf_filter_pid_orig_src_args(stream->pid, GF_FALSE);
 		if (!src) src = gf_filter_pid_get_source_filter_name(stream->pid);
 		else {
 			src = gf_file_basename(src);
@@ -128,7 +128,7 @@
 	gf_fprintf(sdp_out, "t=0 0\n");
 
 	if (is_rtsp) {
-		gf_fprintf(sdp_out, "a=control=*\n");
+		gf_fprintf(sdp_out, "a=control:*\n");
 	}
 
 	if (gf_sys_is_test_mode()) {
@@ -152,7 +152,7 @@
 				if (dur>max_dur) max_dur = dur;
 			}
 			p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_PLAYBACK_MODE);
-			if (!p || (p->value.uint<GF_PLAYBACK_MODE_SEEK))
+			if (!p || (p->value.uint<GF_PLAYBACK_MODE_FASTFORWARD))
 				disable_seek = GF_TRUE;
 		}
 
@@ -238,16 +238,26 @@
 			u32 j;
 
 			gf_fprintf(sdp_out, "a=mid:L%d\n", i+1);
-			gf_fprintf(sdp_out, "a=depend:%d lay", gf_rtp_streamer_get_payload_type(stream->rtp) );
+			if ((base_pid_id != stream->id) && stream->depends_on) {
+				GF_RTPOutStream *dep = stream;
+				gf_fprintf(sdp_out, "a=depend:%d lay", gf_rtp_streamer_get_payload_type(stream->rtp) );
+
+				while (dep) {
+					GF_RTPOutStream *base=NULL;
+					for (j=0; j<count; j++) {
+						base = gf_list_get(streams, j);
+						if (dep->depends_on == base->id) break;
+						base = NULL;
+					}
+					if (!base) break;
 
-			for (j=0; j<count; j++) {
-				GF_RTPOutStream *tk = gf_list_get(streams, j);
-				if (tk == stream) continue;
-				if (tk->depends_on == stream->id) {
-					gf_fprintf(sdp_out, " L%d:%d", j+1, gf_rtp_streamer_get_payload_type(tk->rtp) );
+					s32 idx = gf_list_find(streams, base);
+					if (idx<0) break;
+					gf_fprintf(sdp_out, " L%d:%d", idx+1, gf_rtp_streamer_get_payload_type(base->rtp) );
+					dep = base;
 				}
+				gf_fprintf(sdp_out, "\n");
 			}
-			gf_fprintf(sdp_out, "\n");
 		}
 
 		if (is_rtsp) {
@@ -263,7 +273,7 @@
 	Bool disable_mpeg4 = GF_FALSE;
 	u32 flags, average_size, max_size, max_tsdelta, codecid, const_dur, nb_ch, samplerate, max_cts_offset, bandwidth, IV_length, KI_length, dsi_len, max_ptime, au_sn_len;
 	char *dsi;
-	Bool is_crypted;
+	Bool is_crypted, is_enh_dsi = GF_FALSE;
 	const GF_PropertyValue *p;
 
 	*base_pid_id = 0;
@@ -305,6 +315,11 @@
 	u32 cfg_crc=0;
 	dsi = NULL;
 	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DECODER_CONFIG);
+
+	if (!p) {
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+		is_enh_dsi = GF_TRUE;
+	}
 	if (p) {
 		dsi = p->value.data.ptr;
 		dsi_len = p->value.data.size;
@@ -366,6 +381,8 @@
 	stream->avcc = NULL;
 	if (stream->hvcc) gf_odf_hevc_cfg_del(stream->hvcc);
 	stream->hvcc = NULL;
+	if (stream->vvcc) gf_odf_vvc_cfg_del(stream->vvcc);
+	stream->vvcc = NULL;
 
 	stream->avc_nalu_size = 0;
 	switch (codecid) {
@@ -385,33 +402,61 @@
 		break;
 	case GF_CODECID_HEVC:
 	case GF_CODECID_LHVC:
+	case GF_CODECID_VVC:
 		if (dsi) {
-			GF_HEVCConfig *hvcc = gf_odf_hevc_cfg_read(dsi, dsi_len, (codecid==GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE );
-			if (hvcc) {
+			GF_VVCConfig *vvcc = NULL;
+			GF_HEVCConfig *hvcc = NULL;
+			u8 vps_nut=0,sps_nut=0,pps_nut=0;
+			GF_List *param_array = NULL;
+			if (codecid == GF_CODECID_VVC) {
+				vvcc = gf_odf_vvc_cfg_read(dsi, dsi_len);
+				param_array = vvcc->param_array;
+				sps_nut = GF_VVC_NALU_SEQ_PARAM;
+				pps_nut = GF_VVC_NALU_PIC_PARAM;
+				vps_nut = GF_VVC_NALU_VID_PARAM;
+				stream->avc_nalu_size = vvcc->nal_unit_size;
+			} else {
+				hvcc = gf_odf_hevc_cfg_read(dsi, dsi_len, (is_enh_dsi && (codecid==GF_CODECID_LHVC)) ? GF_TRUE : GF_FALSE );
+				param_array = hvcc->param_array;
+				sps_nut = GF_HEVC_NALU_SEQ_PARAM;
+				pps_nut = GF_HEVC_NALU_PIC_PARAM;
+				vps_nut = GF_HEVC_NALU_VID_PARAM;
 				stream->avc_nalu_size = hvcc->nal_unit_size;
+			}
+			if (param_array) {
 				if (stream->inject_ps) {
-					u32 i, count = gf_list_count(hvcc->param_array);
-					GF_HEVCParamArray *vpsa=NULL, *spsa=NULL;
+					u32 i, count = gf_list_count(param_array);
+					GF_NALUFFParamArray *vpsa=NULL, *spsa=NULL, *ppsa=NULL;
+					stream->vvcc = vvcc;
 					stream->hvcc = hvcc;
 					for (i=0; i<count; i++) {
-						GF_HEVCParamArray *pa = gf_list_get(hvcc->param_array, i);
-						if (!vpsa && (pa->type == GF_HEVC_NALU_VID_PARAM)) {
+						GF_NALUFFParamArray *pa = gf_list_get(param_array, i);
+						if (!vpsa && (pa->type == vps_nut)) {
 							vpsa = pa;
-							gf_list_rem(hvcc->param_array, i);
+							gf_list_rem(param_array, i);
 							count--;
 						}
-						else if (!spsa && (pa->type == GF_HEVC_NALU_SEQ_PARAM)) {
+						else if (!spsa && (pa->type == sps_nut)) {
 							spsa = pa;
-							gf_list_rem(hvcc->param_array, i);
+							gf_list_rem(param_array, i);
+							count--;
+						}
+						else if (!ppsa && (pa->type == pps_nut)) {
+							ppsa = pa;
+							gf_list_rem(param_array, i);
 							count--;
 						}
 					}
-					//insert SPS at begining
-					gf_list_insert(hvcc->param_array, spsa, 0);
-					//insert VPS at begining - we now have VPS, SPS and other (PPS, SEI...)
-					gf_list_insert(hvcc->param_array, vpsa, 0);
-				} else
-					gf_odf_hevc_cfg_del(hvcc);
+					//insert PPS at beginning
+					if (ppsa) gf_list_insert(param_array, ppsa, 0);
+					//insert SPS at beginning
+					if (spsa) gf_list_insert(param_array, spsa, 0);
+					//insert VPS at beginning - we now have VPS, SPS and other (PPS, SEI...)
+					if (vpsa) gf_list_insert(param_array, vpsa, 0);
+				} else {
+					if (vvcc) gf_odf_vvc_cfg_del(vvcc);
+					if (hvcc) gf_odf_hevc_cfg_del(hvcc);
+				}
 			}
 		}
 		break;
@@ -421,9 +466,7 @@
 	case GF_CODECID_AAC_MPEG2_SSRP:
 		//we cannot disable mpeg4 payload type, compute default values !!
 		if (!const_dur || !average_size || !max_tsdelta || !max_size) {
-			const_dur = 1024;
-			const_dur *= stream->timescale;
-			const_dur /= samplerate;
+			const_dur = (u32) gf_timestamp_rescale(1024, samplerate, stream->timescale);
 			max_tsdelta = const_dur;
 			average_size = 500;
 			max_size = 1000;
@@ -464,6 +507,9 @@
 		KI_length = p ? p->value.uint : 0;
 	}
 
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DEPENDENCY_ID);
+	if (p) stream->depends_on = p->value.uint;
+
 
 	/*init packetizer*/
 	stream->rtp = gf_rtp_streamer_new(stream->streamtype, codecid, stream->timescale,
@@ -479,7 +525,7 @@
 	}
 
 	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DELAY);
-	stream->ts_delay = p ? p->value.sint : 0;
+	stream->ts_delay = p ? p->value.longsint : 0;
 
 	payt++;
 	stream->microsec_ts_scale_frac.num = 1000000;
@@ -521,6 +567,7 @@
 		if (read != fsize) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPOut] Failed to read SDP from temp file, got %d bytes but expecting %d\n", read, fsize));
 			gf_filter_pck_discard(pck);
+			e = GF_IO_ERR;
 		} else {
 			char c = output[fsize-1];
 			output[fsize-1] = 0;
@@ -528,13 +575,13 @@
 			output[fsize-1] = c;
 			gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
 			gf_filter_pck_send(pck);
+			e = GF_OK;
 		}
 	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPOut] Failed to send SDP file packet\n"));
+		e = GF_OUT_OF_MEM;
 	}
-
 	gf_fclose(sdp_out);
-	return GF_OK;
+	return e;
 }
 
 static u16 rtpout_check_next_port(GF_RTPOutCtx *ctx, u16 first_port)
@@ -549,7 +596,7 @@
 	return first_port;
 }
 
-static void rtpout_del_stream(GF_RTPOutStream *st)
+void rtpout_del_stream(GF_RTPOutStream *st)
 {
 	if (st->rtp) gf_rtp_streamer_del(st->rtp);
 	if (st->pck) gf_filter_pid_drop_packet(st->pid);
@@ -557,6 +604,8 @@
 		gf_odf_avc_cfg_del(st->avcc);
 	if (st->hvcc)
 		gf_odf_hevc_cfg_del(st->hvcc);
+	if (st->vvcc)
+		gf_odf_vvc_cfg_del(st->vvcc);
 	gf_free(st);
 }
 
@@ -665,7 +714,7 @@
 
 	if (ctx->loop) {
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAYBACK_MODE);
-		if (!p || (p->value.uint<GF_PLAYBACK_MODE_SEEK)) {
+		if (!p || (p->value.uint<GF_PLAYBACK_MODE_FASTFORWARD)) {
 			ctx->loop = GF_FALSE;
 			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPOut] PID %s cannot be seek, disabling loop\n", gf_filter_pid_get_name(pid) ));
 		}
@@ -725,7 +774,7 @@
 	GF_Err e;
 	u32 i, count = gf_list_count(pslist);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(pslist, i);
+		GF_NALUFFParam *sl = gf_list_get(pslist, i);
 		e = gf_rtp_streamer_send_data(stream->rtp, (char *) sl->data, sl->size, pck_size, cts, dts, stream->current_sap ? 1 : 0, *au_start, GF_FALSE, stream->pck_num, duration, stream->sample_desc_index);
 		if (e) return e;
 		*au_start = GF_FALSE;
@@ -751,15 +800,12 @@
 
 		if (dts==GF_FILTER_NO_TS) dts=0;
 
-		dts *= 1000000;
-		dts /= stream->timescale;
+		dts = gf_timestamp_rescale(dts, stream->timescale, 1000000);
 		if (min_dts > dts)
 			min_dts = dts;
 
 		if (ctx->tso>0) {
-			u64 offset = ctx->tso;
-			offset *= stream->timescale;
-			offset /= 1000000;
+			u64 offset = gf_timestamp_rescale(ctx->tso, 1000000, stream->timescale);
 			stream->rtp_ts_offset = (u32) offset;
 		}
 	}
@@ -879,8 +925,7 @@
 					stream = gf_list_get(streams, i);
 					u64 dur = stream->current_dts + stream->current_duration - stream->min_dts;
 
-					dur *= 1000000;
-					dur /= stream->timescale;
+					dur = gf_timestamp_rescale(dur, stream->timescale, 1000000);
 
 					if (max_dur < dur) {
 						max_dur = dur;
@@ -897,12 +942,9 @@
 					stream = gf_list_get(streams, i);
 					p = gf_filter_pid_get_property(stream->pid, GF_PROP_NO_TS_LOOP);
 					if (!p || !p->value.boolean) {
-						u64 new_ts;
-						new_ts = max_dur;
-						new_ts *= stream->timescale;
-						new_ts /= 1000000;
+						u64 new_ts = gf_timestamp_rescale(max_dur, 1000000, stream->timescale);
 						stream->ts_offset += new_ts;
-						stream->microsec_ts_offset = (u64) (stream->ts_offset*(1000000.0/stream->timescale) + sys_clock_at_init);
+						stream->microsec_ts_offset = (u64) gf_timestamp_rescale(stream->ts_offset, stream->timescale, 1000000) + sys_clock_at_init;
 					}
 
 					//loop pid: stop and play
@@ -953,16 +995,16 @@
 	dts += stream->rtp_ts_offset;
 	cts += stream->rtp_ts_offset;
 	if (stream->ts_delay>=0) {
-		dts += stream->ts_delay;
-		cts += stream->ts_delay;
+		dts += (u32) stream->ts_delay;
+		cts += (u32) stream->ts_delay;
 	} else {
 		if ((s32) dts >= -stream->ts_delay)
-			dts += stream->ts_delay;
+			dts += (s32) stream->ts_delay;
 		else
 			dts = 0;
 
 		if ((s32) cts >= -stream->ts_delay )
-			cts += stream->ts_delay;
+			cts += (s32) stream->ts_delay;
 		else
 			cts = 0;
 	}
@@ -1012,11 +1054,11 @@
 			if (!e)
 				e = rtpout_send_xps(stream, stream->avcc->pictureParameterSets, &au_start, pck_size, cts, dts, duration);
 		}
-		else if (stream->hvcc && stream->current_sap) {
-			u32 nbps = gf_list_count(stream->hvcc->param_array);
+		else if ((stream->hvcc||stream->vvcc) && stream->current_sap) {
+			GF_List *ar_list = stream->vvcc ? stream->vvcc->param_array : stream->hvcc->param_array;
+			u32 nbps = gf_list_count(ar_list);
 			for (i=0; i<nbps; i++) {
-				GF_HEVCParamArray *pa = gf_list_get(stream->hvcc->param_array, i);
-
+				GF_NALUFFParamArray *pa = gf_list_get(ar_list, i);
 				if (!e)
 					e = rtpout_send_xps(stream, pa->nalus, &au_start, pck_size, cts, dts, duration);
 			}
@@ -1127,20 +1169,20 @@
 	{ OFFS(ip), "destination IP address (NULL is 127.0.0.1)", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(port), "port for first stream in session", GF_PROP_UINT, "7000", NULL, 0},
 	{ OFFS(loop), "loop all streams in session (not always possible depending on source type)", GF_PROP_BOOL, "true", NULL, 0},
-	{ OFFS(mpeg4), "send all streams using MPEG-4 generic payload format if posible", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mpeg4), "send all streams using MPEG-4 generic payload format if possible", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(mtu), "size of RTP MTU in bytes", GF_PROP_UINT, "1460", NULL, 0},
-	{ OFFS(ttl), "time-to-live for muticast packets", GF_PROP_UINT, "2", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ifce), "default network inteface to use", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(payt), "payload type to use for dynamic configs", GF_PROP_UINT, "96", "96-127", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(ttl), "time-to-live for multicast packets", GF_PROP_UINT, "2", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ifce), "default network interface to use", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(payt), "payload type to use for dynamic decoder configurations", GF_PROP_UINT, "96", "96-127", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(delay), "send delay for packet (negative means send earlier)", GF_PROP_SINT, "0", NULL, 0},
 	{ OFFS(tt), "time tolerance in microseconds. Whenever schedule time minus realtime is below this value, the packet is sent right away", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(runfor), "run for the given time in ms. Negative value means run for ever (if loop) or source duration, 0 only outputs the sdp", GF_PROP_SINT, "-1", NULL, 0},
-	{ OFFS(tso), "set timestamp offset in microsecs. Negative value means random initial timestamp", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(tso), "set timestamp offset in microseconds. Negative value means random initial timestamp", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(xps), "force parameter set injection at each SAP. If not set, only inject if different from SDP ones", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(latm), "use latm for AAC payload format", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(dst), "URL for direct RTP mode - see filter help", GF_PROP_NAME, NULL, NULL, 0},
-	{ OFFS(ext), "file extension for direct RTP mode - see filter help", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(mime), "set mime type for direct RTP mode - see filter help", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(dst), "URL for direct RTP mode", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(ext), "file extension for direct RTP mode", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(mime), "set mime type for direct RTP mode", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };
 
@@ -1150,9 +1192,9 @@
 	GF_FS_SET_DESCRIPTION("RTP Streamer")
 	GF_FS_SET_HELP("The RTP streamer handles SDP/RTP output streaming.\n"
 	"# SDP mode\n"
-	"When the destination url is an SDP, the filter outputs an SDP on a file pid and streams RTP packets over UDP, starting from the indicated [-port]().\n"
+	"When the destination URL is an SDP, the filter outputs an SDP on a file PID and streams RTP packets over UDP, starting from the indicated [-port]().\n"
 	"# Direct RTP mode\n"
-	"When the destination url uses the protocol scheme `rtp://IP:PORT`, the filter does not output any SDP and streams a single input over RTP, using PORT indicated in the destination URL, or the first [-port]() configured.\n"
+	"When the destination URL uses the protocol scheme `rtp://IP:PORT`, the filter does not output any SDP and streams a single input over RTP, using PORT indicated in the destination URL, or the first [-port]() configured.\n"
 	"In this mode, it is usually needed to specify the desired format using [-ext]() or [-mime]().\n"
 	"EX gpac -i src -o rtp://localhost:1234/:ext=ts\n"
 	"This will indicate that the RTP streamer expects a MPEG-2 TS mux as an input.\n"
@@ -1160,9 +1202,9 @@
 	"The RTP packets produced have a maximum payload set by the [-mtu]() option (IP packet will be MTU + 40 bytes of IP+UDP+RTP headers).\n"
 	"The real-time scheduling algorithm works as follows:\n"
 	"- first initialize the clock by:\n"
-	" - computing the smallest timestamp for all input pids\n"
-	" - mapping this media time to the system clock\n"
-	"- determine the earliest packet to send next on each input pid, adding [-delay]() if any\n"
+	" - computing the smallest timestamp for all input PIDs\n"
+	" - mapping this media time to the system clock\n"
+	"- determine the earliest packet to send next on each input PID, adding [-delay]() if any\n"
 	"- finally compare the packet mapped timestamp __TS__ to the system clock __SC__. When __TS__ - __SC__ is less than [-tt](), the RTP packets for the source packet are sent\n"
 	)
 	.private_size = sizeof(GF_RTPOutCtx),

gpac-1.0.1.tar.gz/src/filters/out_rtp.h -> gpac-2.0.0.tar.gz/src/filters/out_rtp.h Changed

gpac-1.0.1.tar.gz/src/filters/out_rtsp.c -> gpac-2.0.0.tar.gz/src/filters/out_rtsp.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019-2020
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / rtsp output filter
@@ -57,7 +57,7 @@
 {
 	//options
 	char *dst, *user_agent;
-	GF_List *mounts;
+	GF_PropStringList mounts;
 	u32 port, firstport;
 	Bool xps;
 	u32 mtu;
@@ -197,18 +197,12 @@
 	return GF_OK;
 }
 
-
 static void rtspout_del_stream(GF_RTPOutStream *st)
 {
-	if (st->rtp) gf_rtp_streamer_del(st->rtp);
-	if (st->pck) gf_filter_pid_drop_packet(st->pid);
-	if (st->avcc)
-		gf_odf_avc_cfg_del(st->avcc);
-	if (st->hvcc)
-		gf_odf_hevc_cfg_del(st->hvcc);
-	gf_free(st);
+	rtpout_del_stream(st);
 }
 
+
 static void rtspout_del_session(GF_RTSPOutSession *sess)
 {
 	//server mode, cleanup
@@ -321,7 +315,7 @@
 
 	if (ctx->loop) {
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAYBACK_MODE);
-		if (!p || (p->value.uint<GF_PLAYBACK_MODE_SEEK)) {
+		if (!p || (p->value.uint<GF_PLAYBACK_MODE_FASTFORWARD)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSPOut] PID %s cannot be seek, disabling loop\n", gf_filter_pid_get_name(pid) ));
 
 			sess->loop_disabled = GF_TRUE;
@@ -382,7 +376,7 @@
 	ip = ctx->ifce;
 
 	if (!ctx->dst) {
-		if (!ctx->mounts) {
+		if (! ctx->mounts.nb_items) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSPOut] No root dir for server, cannot run\n" ));
 			return GF_BAD_PARAM;
 		}
@@ -469,15 +463,12 @@
 
 		if (dts==GF_FILTER_NO_TS) dts=0;
 
-		dts *= 1000000;
-		dts /= stream->timescale;
+		dts = gf_timestamp_rescale(dts, stream->timescale, 1000000);
 		if (min_dts > dts)
 			min_dts = dts;
 
 		if (ctx->tso>0) {
-			u64 offset = ctx->tso;
-			offset *= stream->timescale;
-			offset /= 1000000;
+			u64 offset = gf_timestamp_rescale(ctx->tso, 1000000, stream->timescale);
 			stream->rtp_ts_offset = (u32) offset;
 		}
 		stream->current_cts = gf_filter_pck_get_cts(pck);
@@ -594,21 +585,27 @@
 	return gf_rtsp_session_write_interleaved(sess->rtsp, idx, pck, pck_size);
 }
 
-void rtspout_on_filter_setup_error(GF_Filter *f, void *on_setup_error_udta, GF_Err e)
+Bool rtspout_on_filter_setup_error(GF_Filter *f, void *on_setup_error_udta, GF_Err e)
 {
 	GF_RTSPOutSession *sess = (GF_RTSPOutSession *)on_setup_error_udta;
 
 	gf_list_del_item(sess->filter_srcs, f);
-	if (gf_list_count(sess->filter_srcs)) return;
+	//we don't notify error at our session level if the request fails
+	if (gf_list_count(sess->filter_srcs)) return GF_TRUE;
 
 	if (sess->sdp_state != SDP_LOADED) {
 		sess->sdp_state = SDP_LOADED;
 		gf_rtsp_response_reset(sess->response);
 		sess->response->ResponseCode = NC_RTSP_Internal_Server_Error;
+		if ((e == GF_URL_ERROR) || (e == GF_URL_REMOVED) || (e == GF_IP_CONNECTION_FAILURE)) {
+			sess->response->ResponseCode = NC_RTSP_Not_Found;
+		}
 		sess->response->CSeq = sess->command->CSeq;
 		rtspout_send_response(sess->ctx, sess);
 	}
 	rtspout_del_session(sess);
+	//we don't notify error at our session level if the request fails
+	return GF_TRUE;
 }
 
 static GF_Err rtspout_load_media_service(GF_Filter *filter, GF_RTSPOutCtx *ctx, GF_RTSPOutSession *sess, char *src_url)
@@ -721,8 +718,8 @@
 {
 	u32 i;
 	char *src_url=NULL;
-	for (i=0; i<gf_list_count(ctx->mounts); i++) {
-		char *mpoint = gf_list_get(ctx->mounts, i);
+	for (i=0; i<ctx->mounts.nb_items; i++) {
+		char *mpoint = ctx->mounts.vals[i];
 
 		gf_dynstrcat(&src_url, mpoint, NULL);
 		gf_dynstrcat(&src_url, res_path, "/");
@@ -886,7 +883,7 @@
 						else
 							rsp_code = NC_RTSP_Not_Found;
 					} else {
-						if (gf_filter_is_supported_source(filter, src_url, NULL)) {
+						if (gf_filter_is_supported_source(filter, res_path, NULL)) {
 							src_url = gf_strdup(res_path);
 							gf_list_add(paths, src_url);
 						} else {
@@ -949,7 +946,7 @@
 		return GF_OK;
 	}
 
-	//forbid any access to the streams, ony describe is allowed
+	//forbid any access to the streams, only describe is allowed
 	if (sess->mcast_mirror) {
 		gf_rtsp_response_reset(sess->response);
 		sess->response->ResponseCode = NC_RTSP_Unauthorized;
@@ -1142,10 +1139,10 @@
 				sess->loop = GF_TRUE;
 
 			if ((sess->play_state==2) && !sess->command->Range) {
-				u64 ellapsed_us = gf_sys_clock_high_res() - sess->pause_sys_clock;
+				u64 elapsed_us = gf_sys_clock_high_res() - sess->pause_sys_clock;
 				sess->pause_sys_clock = 0;
 				sess->play_state = 1;
-				sess->sys_clock_at_init += ellapsed_us;
+				sess->sys_clock_at_init += elapsed_us;
 
 				gf_rtsp_response_reset(sess->response);
 				sess->response->ResponseCode = NC_RTSP_OK;
@@ -1261,18 +1258,18 @@
 #define OFFS(_n)	#_n, offsetof(GF_RTSPOutCtx, _n)
 static const GF_FilterArgs RTSPOutArgs[] =
 {
-	{ OFFS(dst), "location of destination file - see filter help ", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(dst), "location of destination resource", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(port), "server port", GF_PROP_UINT, "554", NULL, 0},
 	{ OFFS(firstport), "port for first stream in session", GF_PROP_UINT, "6000", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(mtu), "size of RTP MTU in bytes", GF_PROP_UINT, "1460", NULL, 0},
-	{ OFFS(ttl), "time-to-live for muticast packets. A value of 0 uses client requested TTL, or 1", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ifce), "default network inteface to use", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(payt), "payload type to use for dynamic configs", GF_PROP_UINT, "96", "96-127", GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(mpeg4), "send all streams using MPEG-4 generic payload format if posible", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(ttl), "time-to-live for multicast packets (a value of 0 uses client requested TTL, or 1)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ifce), "default network interface to use", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(payt), "payload type to use for dynamic decoder configurations", GF_PROP_UINT, "96", "96-127", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mpeg4), "send all streams using MPEG-4 generic payload format if possible", GF_PROP_BOOL, "false", NULL, 0},
 	{ OFFS(delay), "send delay for packet (negative means send earlier)", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(tt), "time tolerance in microseconds. Whenever schedule time minus realtime is below this value, the packet is sent right away", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(runfor), "run the session for the given time in ms. Negative value means run for ever (if loop) or source duration, 0 only outputs the sdp", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(tso), "set timestamp offset in microsecs. Negative value means random initial timestamp", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(tt), "time tolerance in microsecond (whenever schedule time minus realtime is below this value, the packet is sent right away)", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(runfor), "run the session for the given time in ms. A negative value means run for ever if loop or source duration, value 0 only outputs the sdp", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(tso), "set timestamp offset in microseconds (negative value means random initial timestamp)", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(xps), "force parameter set injection at each SAP. If not set, only inject if different from SDP ones", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(latm), "use latm for AAC payload format", GF_PROP_BOOL, "false", NULL, 0},
 	{ OFFS(mounts), "list of directories to expose in server mode", GF_PROP_STRING_LIST, NULL, NULL, 0},
@@ -1280,8 +1277,8 @@
 	{ OFFS(maxc), "maximum number of connections", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(user_agent), "user agent string, by default solved from GPAC preferences", GF_PROP_STRING, "$GUA", NULL, 0},
 	{ OFFS(close), "close RTSP connection after each request, except when RTP over RTSP is used", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(loop), "loop all streams in session (not always possible depending on source type) - see filter help", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(dynurl), "allow dynamic service assembly - see filter help", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(loop), "loop all streams in session (not always possible depending on source type)", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(dynurl), "allow dynamic service assembly", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(mcast), "control multicast setup of a session\n"
 				"- off: clients are never allowed to create a multicast\n"
 				"- on: clients can create multicast sessions\n"
@@ -1295,31 +1292,31 @@
 GF_FilterRegister RTSPOutRegister = {
 	.name = "rtspout",
 	GF_FS_SET_DESCRIPTION("RTSP Server")
-	GF_FS_SET_HELP("The RTSP server partially implements RTSP 1.0, with support for OPTIONS, DESCRIBE, SETUP, PLAY, PAUSE and TEARDOWN.\n"\
+	GF_FS_SET_HELP("The RTSP server partially implements RTSP 1.0, with support for OPTIONS, DESCRIBE, SETUP, PLAY, PAUSE and TEARDOWN.\n"
 		"Multiple PLAY ranges are not supported, PLAY range end is not supported, PAUSE range is not supported.\n"
-		"Only aggregated control is supported for PLAY and PAUSE, PAUSE/PLAY on single stream is not supported.\n"\
-		"The server only runs on TCP, and handles request in sequence (will not probe for commands until previous response was sent).\n"\
-		"The server supports both RTP over UDP delivery and RTP interleaved over RTSP delivery.\n"\
-		"\n"\
-		"The filter can work as a simple output filter by specifying the [-dst]() option:\n"\
-		"EX gpac -i source -o rtsp://myip/sessionname\n"\
-		"EX gpac -i source dst=rtsp://myip/sessionname\n"\
-		"In this mode, only one session is possible. It is possible to [-loop]() the input source(s).\n"\
-		"\n"\
-		"The filter can work as a regular RTSP server by specifying the [-mounts]() option to indicate paths of media file to be served:\n"\
-		"EX gpac rtspout:mounts=mydir1,mydir2\n"\
-		"In server mode, it is possible to load any source supported by gpac by setting the option [-dynurl]().\n"\
-		"The expected syntax of the dynamic RTSP URLs is `rtsp://servername/?URL1[&URLN]` or `rtsp://servername/@URL1[@URLN]` \n"\
-		"Each URL can be absolute or local, in which case it is resolved against the mount point(s).\n"\
-		"EX gpac -i rtsp://localhost/?pipe://mynamepipe&myfile.mp4 [dst filters]\n"\
-		"The server will resolve this URL in a new session containing streams from myfile.mp4 and streams from pipe mynamepipe.\n"\
-		"When setting [-runfor]() in server mode, the server will exit at the end of the last session being closed.\n"\
-		"\n"\
-		"In both modes, clients can setup multicast if the [-mcast]() option is `on` or `mirror`.\n"\
-		"When [-mcast]() is set to `mirror` mode, any DESCRIBE command on a resource already delivered through a multicast session will use that multicast.\n"\
-		"Consequently, only DESCRIBE methods are processed for such sessions, other methods will return Unauthorized.\n"\
-		"\n"\
-		"The scheduling algorithm and RTP options are the same as the RTP output filter, see [gpac -h rtpout](rtpout)\n"\
+		"Only aggregated control is supported for PLAY and PAUSE, PAUSE/PLAY on single stream is not supported.\n"
+		"The server only runs on TCP, and handles request in sequence: it will not probe for commands until previous response is sent.\n"
+		"The server supports both RTP over UDP delivery and RTP interleaved over RTSP delivery.\n"
+		"\n"
+		"The filter can work as a simple output filter by specifying the [-dst]() option:\n"
+		"EX gpac -i source -o rtsp://myip/sessionname\n"
+		"EX gpac -i source -o rtsp://myip/sessionname\n"
+		"In this mode, only one session is possible. It is possible to [-loop]() the input source(s).\n"
+		"\n"
+		"The filter can work as a regular RTSP server by specifying the [-mounts]() option to indicate paths of media file to be served:\n"
+		"EX gpac rtspout:mounts=mydir1,mydir2\n"
+		"In server mode, it is possible to load any source supported by gpac by setting the option [-dynurl]().\n"
+		"The expected syntax of the dynamic RTSP URLs is `rtsp://servername/?URL1[&URLN]` or `rtsp://servername/@URL1[@URLN]` \n"
+		"Each URL can be absolute or local, in which case it is resolved against the mount point(s).\n"
+		"EX gpac -i rtsp://localhost/?pipe://mynamepipe&myfile.mp4 [dst filters]\n"
+		"The server will resolve this URL in a new session containing streams from `myfile.mp4` and streams from pipe `mynamepipe`.\n"
+		"When setting [-runfor]() in server mode, the server will exit at the end of the last session being closed.\n"
+		"\n"
+		"In both modes, clients can setup multicast if the [-mcast]() option is `on` or `mirror`.\n"
+		"When [-mcast]() is set to `mirror` mode, any DESCRIBE command on a resource already delivered through a multicast session will use that multicast.\n"
+		"Consequently, only DESCRIBE methods are processed for such sessions, other methods will return Unauthorized.\n"
+		"\n"
+		"The scheduling algorithm and RTP options are the same as the RTP output filter, see [gpac -h rtpout](rtpout)\n"
 	)
 	.private_size = sizeof(GF_RTSPOutCtx),
 	.max_extra_pids = -1,

gpac-1.0.1.tar.gz/src/filters/out_sock.c -> gpac-2.0.0.tar.gz/src/filters/out_sock.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / generic socket output filter
@@ -42,7 +42,7 @@
 	Double start, speed;
 	char *dst, *mime, *ext, *ifce;
 	Bool listen;
-	u32 maxc, port, sockbuf, ka, kp, rate;
+	u32 maxc, port, sockbuf, ka, kp, rate, ttl;
 	GF_Fraction pckr, pckd;
 
 	GF_Socket *socket;
@@ -94,6 +94,8 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SockOut] Block patching is not supported by socket output\n"));
 		return GF_NOT_SUPPORTED;
 	}
+	if (!ctx->pid_started)
+		gf_filter_post_process_task(filter);
 	return GF_OK;
 }
 
@@ -197,7 +199,8 @@
 	}
 
 	if (gf_sk_is_multicast_address(url)) {
-		e = gf_sk_setup_multicast(ctx->socket, url, port, 0, 0, ctx->ifce);
+		//server socket, do not bind
+		e = gf_sk_setup_multicast(ctx->socket, url, port, ctx->ttl, GF_TRUE, ctx->ifce);
 		ctx->listen = GF_FALSE;
 	} else if ((sock_type == GF_SOCK_TYPE_UDP)
 #ifdef GPAC_HAS_SOCK_UN
@@ -214,7 +217,7 @@
 			gf_sk_server_mode(ctx->socket, GF_TRUE);
 		}
 	} else {
-		e = gf_sk_connect(ctx->socket, url, port, ctx->ifce);
+		e = gf_sk_connect(ctx->socket, url, port, NULL);
 	}
 
 	if (str) str[0] = ':';
@@ -331,8 +334,11 @@
 				u64 diff = ctx->nb_bytes_sent*8*1000000 / ctx->rate - now;
 				gf_filter_ask_rt_reschedule(filter, (u32) MAX(diff, 1000) );
 				return GF_OK;
-			} else {
-				fprintf(stderr, "[SockOut] Sending at "LLU" kbps \r", ctx->nb_bytes_sent*8*1000/now);
+			} else if (gf_filter_reporting_enabled(filter)) {
+				char szMsg[200];
+				snprintf(szMsg, 199, "Sending at "LLU" kbps\r", ctx->nb_bytes_sent*8*1000/now);
+				szMsg[199] = 0;
+				gf_filter_update_status(filter, 0, szMsg);
 			}
 		}
 	}
@@ -362,6 +368,9 @@
 			if (!ctx->nb_pck_processed)
 				sc->is_tuned = GF_TRUE;
 		}
+		if (!ctx->pid_started) {
+			gf_filter_ask_rt_reschedule(filter, 50000);
+		}
 	}
 	if (!ctx->pid) {
 		if (ctx->listen) gf_filter_post_process_task(filter);
@@ -402,7 +411,7 @@
 
 		if (nb_pck == 1+ctx->nb_pck_processed) {
 			ctx->nb_pck_processed++;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[SockOut] Droping packet %d per user request\r", ctx->nb_pck_processed));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[SockOut] dropping packet %d per user request\r", ctx->nb_pck_processed));
 			gf_filter_pid_drop_packet(ctx->pid);
 			ctx->next_pckd_idx = 0;
 			ctx->nb_pckd_wnd ++;
@@ -508,21 +517,22 @@
 
 static const GF_FilterArgs SockOutArgs[] =
 {
-	{ OFFS(dst), "location of destination file", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(dst), "URL of destination", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(sockbuf), "block size used to read file", GF_PROP_UINT, "65536", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(port), "default port if not specified", GF_PROP_UINT, "1234", NULL, 0},
 	{ OFFS(ifce), "default multicast interface", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ext), "file extension of pipe data - see filter help", GF_PROP_STRING, NULL, NULL, 0},
-	{ OFFS(mime), "mime type of pipe data - see filter help", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(ext), "file extension of pipe data", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(mime), "mime type of pipe data", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(listen), "indicate the output socket works in server mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(maxc), "max number of concurrent connections", GF_PROP_UINT, "+I", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ka), "keep socket alive if no more connections", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(kp), "keep packets in queue if no more clients", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(start), "set playback start offset. Negative value means percent of media dur with -1 <=> dur", GF_PROP_DOUBLE, "0.0", NULL, 0},
-	{ OFFS(speed), "set playback speed. If speed is negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{ OFFS(start), "set playback start offset. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, 0},
+	{ OFFS(speed), "set playback speed. If negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
 	{ OFFS(rate), "set send rate in bps, disabled by default (as fast as possible)", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(pckr), "reverse packet every N - see filter help", GF_PROP_FRACTION, "0/0", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(pckd), "drop packet every N - see filter help", GF_PROP_FRACTION, "0/0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(pckr), "reverse packet every N", GF_PROP_FRACTION, "0/0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(pckd), "drop packet every N", GF_PROP_FRACTION, "0/0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(ttl), "multicast TTL", GF_PROP_UINT, "0", "0-127", GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -539,10 +549,10 @@
 	GF_FS_SET_DESCRIPTION("UDP/TCP output")
 #ifndef GPAC_DISABLE_DOC
 	.help = "This filter handles generic output sockets (mono-directional) in blocking mode only.\n"
-		"The filter can work in server mode, waiting for source connections, or or in client mode, directly connecting.\n"
+		"The filter can work in server mode, waiting for source connections, or in client mode, directly connecting to a server.\n"
 		"In server mode, the filter can be instructed to keep running at the end of the stream.\n"
-		"In server mode, the default behaviour is to keep input packets when no more clients are connected; "
-		"this can be adjusted though the [-kp]() option, however there is no realtime regulation of how fast packets are droped.\n"
+		"In server mode, the default behavior is to keep input packets when no more clients are connected; "
+		"this can be adjusted though the [-kp]() option, however there is no realtime regulation of how fast packets are dropped.\n"
 		"If your sources are not real time, consider adding a real-time scheduler in the chain (cf reframer filter), or set the send [-rate]() option.\n"
 		"\n"
 		"- UDP sockets are used for destinations URLs formatted as `udp://NAME`\n"
@@ -554,12 +564,16 @@
 		"Your platform does not supports unix domain sockets"
 #endif
 		"\n"
+		"When ports are specified in the URL and the default option separators are used (see `gpac -h doc`), the URL must either:\n"
+		"- have a trailing '/', e.g. `udp://localhost:1234/[:opts]`\n"
+		"- use `gpac` escape, e.g. `udp://localhost:1234[:gpac:opts]`\n"
+		"\n"
 		"The socket output can be configured to drop or revert packet order for test purposes.\n"
-		"For both mode, a window size in packets is specified as the drop/revert fraction denominator, and the index of the packet to drop/revert is given as the numerator/\n"
+		"A window size in packets is specified as the drop/revert fraction denominator, and the index of the packet to drop/revert is given as the numerator/\n"
 		"If the numerator is 0, a packet is randomly chosen in that window.\n"
-		"EX :pckd=4/10\n"\
+		"EX :pckd=4/10\n"
 		"This drops every 4th packet of each 10 packet window.\n"
-		"EX :pckr=0/100\n"\
+		"EX :pckr=0/100\n"
 		"This reverts the send order of one random packet in each 100 packet window.\n"
 		"\n",
 #endif //GPAC_DISABLE_DOC

gpac-1.0.1.tar.gz/src/filters/out_video.c -> gpac-2.0.0.tar.gz/src/filters/out_video.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2020
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / video output filter
@@ -36,7 +36,7 @@
 #if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 #define VOUT_USE_OPENGL
 
-//include openGL
+//include OpenGL
 #include "../compositor/gl_inc.h"
 
 #define DEL_SHADER(_a) if (_a) { glDeleteShader(_a); _a = 0; }
@@ -54,13 +54,19 @@
 
 
 static char *default_glsl_vertex = "\
-	attribute vec4 gfVertex;\
-	attribute vec2 gfTexCoord;\
-	varying vec2 TexCoord;\
-	void main(void)\
-	{\
-		gl_Position = gl_ModelViewProjectionMatrix * gfVertex;\
-		TexCoord = gfTexCoord;\
+	attribute vec4 gfVertex;\n\
+	attribute vec4 gfTexCoord;\n\
+	uniform mat4 gfTextureMatrix;\n\
+	uniform bool hasTextureMatrix;\n\
+	varying vec2 TexCoord;\n\
+	void main(void)\n\
+	{\n\
+		gl_Position = gl_ModelViewProjectionMatrix * gfVertex;\n\
+		if (hasTextureMatrix) {\n\
+			TexCoord = vec2(gfTextureMatrix * gfTexCoord);\n\
+		} else {\n\
+			TexCoord = vec2(gfTexCoord);\n\
+		}\n\
 	}";
 
 #endif
@@ -73,23 +79,38 @@
 	MODE_2D_SOFT,
 } GF_VideoOutMode;
 
+
+enum
+{
+	FLIP_NO,
+	FLIP_VERT,
+	FLIP_HORIZ,
+	FLIP_BOTH,
+	FLIP_BOTH2,
+};
+
+
 typedef struct
 {
 	//options
 	char *drv;
 	GF_VideoOutMode disp;
-	Bool vsync, linear, fullscreen, drop, hide;
+	Bool vsync, linear, fullscreen, drop, hide, step;
 	GF_Fraction64 dur;
 	Double speed, hold;
-	u32 back;
-	GF_PropVec2i wsize;
+	u32 back, vflip, vrot;
+	GF_PropVec2i wsize, owsize;
 	GF_PropVec2i wpos;
 	Double start;
-	u32 buffer;
+	u32 buffer, mbuffer, rbuffer;
 	GF_Fraction vdelay;
 	const char *out;
 	GF_PropUIntList dumpframes;
 
+	GF_PropVec4i olwnd;
+	GF_PropVec2i olsize;
+	GF_PropData oldata;
+
 	GF_Filter *filter;
 	GF_FilterPid *pid;
 	u32 width, height, stride, pfmt, timescale;
@@ -97,7 +118,6 @@
 
 	GF_VideoOutput *video_out;
 
-	u32 pck_offset;
 	u64 first_cts_plus_one;
 	u64 clock_at_first_cts, last_frame_clock, clock_at_first_frame;
 	u32 last_pck_dur_us;
@@ -108,6 +128,10 @@
 	Bool has_alpha;
 	u32 nb_frames;
 
+	u32 key_states;
+
+	Float c_w, c_h, c_x, c_y;
+
 	//if source is raw live grab (webcam/etc), we don't trust cts and always draw the frame
 	//this is needed for cases where we have a sudden jump in timestamps as is the case with ffmpeg: not doing so would
 	//hold the frame until its CTS is reached, triggering drops at capture time
@@ -119,6 +143,8 @@
 	GF_SHADERID fragment_shader;
 
 	GF_GLTextureWrapper tx;
+
+	GLuint overlay_tx;
 #endif // VOUT_USE_OPENGL
 
 	u32 num_textures;
@@ -132,18 +158,40 @@
 	Bool force_release;
 	GF_FilterPacket *last_pck;
 
-	s32 pid_delay;
+	s64 pid_delay;
 	Bool buffer_done;
 	Bool no_buffering;
 	Bool dump_done;
 
 	u32 dump_f_idx;
 	char *dump_buffer;
+
+	Bool force_vout;
+
+	Bool do_seek;
+	Bool update_oldata;
+
+	Bool full_range;
+	s32 cmx;
+
+	u64 rebuffer;
+
+	Bool force_reconfig_pid;
+	u32 pid_vflip, pid_vrot;
 } GF_VideoOutCtx;
 
 static GF_Err vout_draw_frame(GF_VideoOutCtx *ctx);
 
+
 #ifdef VOUT_USE_OPENGL
+
+static void vout_make_gl_current(GF_VideoOutCtx *ctx)
+{
+	GF_Event evt;
+	evt.type = GF_EVENT_SET_GL;
+	ctx->video_out->ProcessEvent(ctx->video_out, &evt);
+}
+
 static Bool vout_compile_shader(GF_SHADERID shader_id, const char *name, const char *source)
 {
 	GLint blen = 0;
@@ -172,13 +220,28 @@
 }
 #endif // VOUT_USE_OPENGL
 
+static void vout_reset_overlay(GF_Filter *filter, GF_VideoOutCtx *ctx)
+{
+#ifdef VOUT_USE_OPENGL
+	if (ctx->overlay_tx) {
+		if (filter) {
+			gf_filter_lock(filter, GF_TRUE);
+			vout_make_gl_current(ctx);
+		}
+		glDeleteTextures(1, &ctx->overlay_tx);
+		ctx->overlay_tx = 0;
+		if (filter)
+			gf_filter_lock(filter, GF_FALSE);
+	}
+#endif
+}
 
 static void vout_set_caption(GF_VideoOutCtx *ctx)
 {
 	GF_Event evt;
 	memset(&evt, 0, sizeof(GF_Event));
 	evt.type = GF_EVENT_SET_CAPTION;
-	evt.caption.caption = gf_filter_pid_orig_src_args(ctx->pid);
+	evt.caption.caption = gf_filter_pid_orig_src_args(ctx->pid, GF_FALSE);
 	if (!evt.caption.caption) evt.caption.caption = gf_filter_pid_get_source_filter_name(ctx->pid);
 	if (evt.caption.caption) {
 		if (!strncmp(evt.caption.caption, "src=", 4)) evt.caption.caption += 4;
@@ -187,11 +250,111 @@
 	}
 }
 
+static GF_Err resize_video_output(GF_VideoOutCtx *ctx, u32 dw, u32 dh)
+{
+	GF_Event evt;
+
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_VIDEO_SETUP;
+	evt.setup.width = dw;
+	evt.setup.height = dh;
+
+#ifdef VOUT_USE_OPENGL
+	if (ctx->disp<MODE_2D) {
+		evt.setup.use_opengl = GF_TRUE;
+		//always double buffer
+		evt.setup.back_buffer = gf_opts_get_bool("core", "gl-doublebuf");
+	} else
+#endif
+	{
+		evt.setup.back_buffer = 1;
+	}
+	evt.setup.disable_vsync = !ctx->vsync;
+	ctx->video_out->ProcessEvent(ctx->video_out, &evt);
+	if (evt.setup.use_opengl) {
+		gf_opengl_init();
+	}
+	if (!ctx->in_fullscreen) {
+		ctx->display_width = evt.setup.width;
+		ctx->display_height = evt.setup.height;
+	}
+	ctx->display_changed = GF_TRUE;
+
+#if defined(VOUT_USE_OPENGL) && defined(WIN32)
+	if (evt.setup.use_opengl)
+		gf_opengl_init();
+
+	if ((ctx->disp<MODE_2D) && (glCompileShader == NULL)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[VideoOut] Failed to load OpenGL, fallback to 2D blit\n"));
+		evt.setup.use_opengl = GF_FALSE;
+		evt.setup.back_buffer = 1;
+		ctx->disp = MODE_2D;
+		ctx->video_out->ProcessEvent(ctx->video_out, &evt);
+	}
+#endif
+
+	if (!ctx->in_fullscreen) {
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_SIZE;
+		evt.size.width = dw;
+		evt.size.height = dh;
+		ctx->video_out->ProcessEvent(ctx->video_out, &evt);
+	}
+
+	if (ctx->pid) {
+		GF_FilterEvent fevt;
+		GF_FEVT_INIT(fevt, GF_FEVT_VISIBILITY_HINT, ctx->pid);
+		fevt.visibility_hint.max_x = dw;
+		fevt.visibility_hint.max_y = dh;
+		gf_filter_pid_send_event(ctx->pid, &fevt);
+	}
+	return GF_OK;
+}
+
+static void load_gl_tx_matrix(GF_VideoOutCtx *ctx)
+{
+#ifdef VOUT_USE_OPENGL
+	s32 loc;
+	if (ctx->disp >= MODE_2D) return;
+	glUseProgram(ctx->glsl_program);
+	if (ctx->c_w && ctx->c_h) {
+		Float c_x, c_y;
+		GF_Matrix mx;
+		gf_mx_init(mx);
+		//clean aperture center in pixel coords
+		c_x = ctx->width / 2 + ctx->c_x;
+		c_y = ctx->height / 2 + ctx->c_y;
+		//left/top of clean aperture zone, in pixel coordinates
+		c_x -= ctx->c_w / 2;
+		c_y -= ctx->c_h / 2;
+
+		gf_mx_add_translation(&mx, c_x / ctx->width, c_y / ctx->height, 0);
+		gf_mx_add_scale(&mx, ctx->c_w / ctx->width, ctx->c_h / ctx->height, 1);
+		loc = glGetUniformLocation(ctx->glsl_program, "gfTextureMatrix");
+		if (loc>=0) {
+			glUniformMatrix4fv(loc, 1, GL_FALSE, mx.m);
+			loc = glGetUniformLocation(ctx->glsl_program, "hasTextureMatrix");
+			if (loc>=0)
+				glUniform1i(loc, 1);
+			glUseProgram(0);
+			return;
+		}
+	}
+	loc = glGetUniformLocation(ctx->glsl_program, "hasTextureMatrix");
+	if (loc>=0) glUniform1i(loc, 0);
+	glUseProgram(0);
+#endif
+
+}
+
 static GF_Err vout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	GF_Event evt;
 	const GF_PropertyValue *p;
 	u32 w, h, pfmt, stride, stride_uv, timescale, dw, dh, hw, hh;
+	Bool full_range, check_mx = GF_TRUE;
+	Bool sar_changed = GF_FALSE;
+	s32 cmx;
 	GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) gf_filter_get_udta(filter);
 
 	//if we have a pending packet, draw it now
@@ -231,24 +394,71 @@
 
 	ctx->sar.num = ctx->sar.den = 1;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
-	if (p && p->value.frac.den && p->value.frac.num) ctx->sar = p->value.frac;
+	if (p && p->value.frac.den && p->value.frac.num) {
+		if (ctx->sar.num * p->value.frac.den != p->value.frac.num * ctx->sar.den)
+			sar_changed = GF_TRUE;
+		ctx->sar = p->value.frac;
+	}
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
-	ctx->pid_delay = p ? p->value.sint : 0;
-
-	p = gf_filter_pid_get_property_str(pid, "BufferLength");
-	ctx->no_buffering = (p && !p->value.sint) ? GF_TRUE : GF_FALSE;
-	if (ctx->no_buffering) ctx->buffer_done = GF_TRUE;
+	ctx->pid_delay = p ? p->value.longsint : 0;
 
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAY_BUFFER);
+	ctx->no_buffering = (p && !p->value.uint) ? GF_TRUE : GF_FALSE;
+	if (ctx->no_buffering) {
+		ctx->buffer_done = GF_TRUE;
+		ctx->rebuffer = 0;
+	}
+	if (p && p->value.uint) {
+		if (ctx->buffer < p->value.uint) ctx->buffer = p->value.uint;
+	}
+	
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_RAWGRAB);
 	ctx->raw_grab = (p && p->value.boolean) ? GF_TRUE : GF_FALSE;
 
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_RANGE);
+	full_range = (p && p->value.boolean) ? GF_TRUE : GF_FALSE;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_MX);
+	cmx = p ? (s32) p->value.uint : GF_CICP_MX_UNSPECIFIED;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ROTATE);
+	ctx->pid_vrot = p ? (s32) p->value.uint : ctx->vrot;
+	if (p) check_mx = GF_FALSE;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIRROR);
+	ctx->pid_vflip = p ? (s32) (p->value.uint) : ctx->vflip;
+	if (p) check_mx = GF_FALSE;
+
+	ctx->c_w = ctx->c_h = ctx->c_x = ctx->c_y = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAP_W);
+	if (p && p->value.frac.den) { ctx->c_w = (Float) p->value.frac.num; ctx->c_w /= p->value.frac.den; }
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAP_H);
+	if (p && p->value.frac.den) { ctx->c_h = (Float) p->value.frac.num; ctx->c_h /= p->value.frac.den; }
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAP_X);
+	if (p && p->value.frac.den) { ctx->c_x = (Float) p->value.frac.num; ctx->c_x /= p->value.frac.den; }
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAP_Y);
+	if (p && p->value.frac.den) { ctx->c_y = (Float) p->value.frac.num; ctx->c_y /= p->value.frac.den; }
+
+	if (check_mx) {
+		GF_Err gf_prop_matrix_decompose(const GF_PropertyValue *p, u32 *flip_mode, u32 *rot_mode);
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_TRACK_MATRIX);
+		if (p)
+			gf_prop_matrix_decompose(p, &ctx->pid_vflip, &ctx->pid_vrot);
+	}
+
+
 	if (!ctx->pid) {
 		GF_FilterEvent fevt;
 
 		GF_FEVT_INIT(fevt, GF_FEVT_BUFFER_REQ, pid);
 		fevt.buffer_req.max_buffer_us = ctx->buffer * 1000;
-//		if (!fevt.buffer_req.max_buffer_us) fevt.buffer_req.max_buffer_us = 100000;
+		fevt.buffer_req.max_playout_us = fevt.buffer_req.max_buffer_us;
+		//we have a max buffer
+		if (ctx->mbuffer > ctx->buffer) {
+			fevt.buffer_req.max_buffer_us = ctx->mbuffer * 1000;
+		}
+
 		gf_filter_pid_send_event(pid, &fevt);
 
 		gf_filter_pid_init_play_event(pid, &fevt, ctx->start, ctx->speed, "VideoOut");
@@ -268,8 +478,7 @@
 
 	if (ctx->first_cts_plus_one && ctx->timescale && (ctx->timescale != timescale) ) {
 		ctx->first_cts_plus_one-=1;
-		ctx->first_cts_plus_one *= timescale;
-		ctx->first_cts_plus_one /= ctx->timescale;
+		ctx->first_cts_plus_one = gf_timestamp_rescale(ctx->first_cts_plus_one, ctx->timescale, timescale);
 		ctx->first_cts_plus_one+=1;
 	}
 	if (!timescale) timescale = 1;
@@ -278,10 +487,28 @@
 	//pid not yet ready
 	if (!pfmt || !w || !h) return GF_OK;
 
-	if ((ctx->width==w) && (ctx->height == h) && (ctx->pfmt == pfmt) ) return GF_OK;
+	if ((ctx->width==w) && (ctx->height == h) && (ctx->pfmt == pfmt)
+		&& (full_range==ctx->full_range) && (cmx==ctx->cmx)
+		&& !sar_changed && !ctx->force_reconfig_pid
+	) {
+		load_gl_tx_matrix(ctx);
+		return GF_OK;
+	}
+	ctx->full_range = full_range;
+	ctx->cmx = cmx;
+	if (ctx->c_w && ctx->c_h) {
+		dw = (u32) ctx->c_w;
+		dh = (u32) ctx->c_h;
+	} else {
+		dw = w;
+		dh = h;
+	}
+
+	if ((ctx->disp<MODE_2D) && (ctx->pid_vrot % 2)) {
+		dw = h;
+		dh = w;
+	}
 
-	dw = w;
-	dh = h;
 	if (ctx->sar.den != ctx->sar.num) {
 		dw = dw * ctx->sar.num / ctx->sar.den;
 	}
@@ -300,63 +527,24 @@
 		}
 	}
 
-	if ((dw != ctx->display_width) || (dh != ctx->display_height) ) {
-
-		memset(&evt, 0, sizeof(GF_Event));
-		evt.type = GF_EVENT_VIDEO_SETUP;
-		evt.setup.width = dw;
-		evt.setup.height = dh;
 
-#ifdef VOUT_USE_OPENGL
-		if (ctx->disp<MODE_2D) {
-			evt.setup.use_opengl = GF_TRUE;
-			//always double buffer
-			evt.setup.back_buffer = gf_opts_get_bool("core", "gl-doublebuf");
-		} else
-#endif
-		{
-			evt.setup.back_buffer = 1;
-		}
-		evt.setup.disable_vsync = !ctx->vsync;
-		ctx->video_out->ProcessEvent(ctx->video_out, &evt);
-		if (evt.setup.use_opengl) {
-			gf_opengl_init();
-		}
-		if (!ctx->in_fullscreen) {
-			ctx->display_width = evt.setup.width;
-			ctx->display_height = evt.setup.height;
-		}
-		ctx->display_changed = GF_TRUE;
-
-#if defined(VOUT_USE_OPENGL) && defined(WIN32)
-		if (evt.setup.use_opengl)
-			gf_opengl_init();
-
-		if ((ctx->disp<MODE_2D) && (glCompileShader == NULL)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[VideoOut] Failed to load openGL, fallback to 2D blit\n"));
-			evt.setup.use_opengl = GF_FALSE;
-			evt.setup.back_buffer = 1;
-			ctx->disp = MODE_2D;
-			ctx->video_out->ProcessEvent(ctx->video_out, &evt);
-		}
-#endif
-
-		if (!ctx->in_fullscreen) {
-			memset(&evt, 0, sizeof(GF_Event));
-			evt.type = GF_EVENT_SIZE;
-			evt.size.width = dw;
-			evt.size.height = dh;
-			ctx->video_out->ProcessEvent(ctx->video_out, &evt);
-		}
+	if ((dw != ctx->display_width) || (dh != ctx->display_height) ) {
+		resize_video_output(ctx, dw, dh);
 	} else if ((ctx->wsize.x>0) && (ctx->wsize.y>0)) {
 		ctx->display_width = ctx->wsize.x;
 		ctx->display_height = ctx->wsize.y;
 		ctx->display_changed = GF_TRUE;
 	}
+
+	ctx->owsize.x = ctx->display_width;
+	ctx->owsize.y = ctx->display_height;
+
 	if (ctx->fullscreen) {
 		u32 nw=ctx->display_width, nh=ctx->display_height;
 		ctx->video_out->SetFullScreen(ctx->video_out, GF_TRUE, &nw, &nh);
 		ctx->in_fullscreen = GF_TRUE;
+		ctx->owsize.x = nw;
+		ctx->owsize.y = nh;
 	} else if ((ctx->wpos.x!=-1) && (ctx->wpos.y!=-1)) {
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_MOVE;
@@ -394,10 +582,15 @@
 	case GF_PIXEL_YUV444_10:
 		ctx->bit_depth = 10;
 	case GF_PIXEL_YUV444:
+	case GF_PIXEL_YUVA444:
 		ctx->uv_w = ctx->width;
 		ctx->uv_h = ctx->height;
 		ctx->uv_stride = ctx->stride;
 		ctx->is_yuv = GF_TRUE;
+		if (ctx->pfmt==GF_PIXEL_YUVA444) {
+			ctx->has_alpha = GF_TRUE;
+			//ctx->pfmt = GF_PIXEL_YUV444;
+		}
 		break;
 	case GF_PIXEL_YUV422_10:
 		ctx->bit_depth = 10;
@@ -410,6 +603,8 @@
 	case GF_PIXEL_YUV_10:
 		ctx->bit_depth = 10;
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
+	case GF_PIXEL_YUVA:
 		ctx->uv_w = ctx->width/2;
 		if (ctx->width % 2) ctx->uv_w++;
 		ctx->uv_h = ctx->height/2;
@@ -419,6 +614,8 @@
 			if (ctx->stride%2) ctx->uv_stride ++;
 		}
 		ctx->is_yuv = GF_TRUE;
+		if (ctx->pfmt==GF_PIXEL_YUVA)
+			ctx->has_alpha = GF_TRUE;
 		break;
 	case GF_PIXEL_NV12_10:
 	case GF_PIXEL_NV21_10:
@@ -430,6 +627,11 @@
 		ctx->uv_stride = ctx->stride;
 		ctx->is_yuv = GF_TRUE;
 		break;
+	case GF_PIXEL_UYVY_10:
+	case GF_PIXEL_YUYV_10:
+	case GF_PIXEL_YVYU_10:
+	case GF_PIXEL_VYUY_10:
+		ctx->bit_depth = 10;
 	case GF_PIXEL_UYVY:
 	case GF_PIXEL_YUYV:
 	case GF_PIXEL_YVYU:
@@ -442,6 +644,18 @@
 		}
 		ctx->is_yuv = GF_TRUE;
 		break;
+	case GF_PIXEL_YUV444_PACK:
+	case GF_PIXEL_YUVA444_PACK:
+	case GF_PIXEL_YUV444_10_PACK:
+		ctx->uv_w = ctx->width;
+		ctx->uv_h = ctx->height;
+		ctx->uv_stride = ctx->stride;
+		ctx->is_yuv = GF_TRUE;
+		if (ctx->pfmt==GF_PIXEL_YUVA444_PACK) {
+			ctx->has_alpha = GF_TRUE;
+			//ctx->pfmt = GF_PIXEL_YUV444;
+		}
+		break;
 
 	case GF_PIXEL_ALPHAGREY:
 	case GF_PIXEL_GREYALPHA:
@@ -478,6 +692,7 @@
 		ctx->video_out->ProcessEvent(ctx->video_out, &evt);
 	}
 	
+	vout_make_gl_current(ctx);
 	DEL_SHADER(ctx->vertex_shader);
 	DEL_SHADER(ctx->fragment_shader);
 	DEL_PROGRAM(ctx->glsl_program );
@@ -493,11 +708,11 @@
 		vout_compile_shader(ctx->vertex_shader, "vertex", default_glsl_vertex);
 
 		ctx->fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
-		gf_gl_txw_setup(&ctx->tx, ctx->pfmt, ctx->width, ctx->height, ctx->stride, ctx->uv_stride, ctx->linear, NULL);
+		gf_gl_txw_setup(&ctx->tx, ctx->pfmt, ctx->width, ctx->height, ctx->stride, ctx->uv_stride, ctx->linear, NULL, ctx->full_range, ctx->cmx);
 
 		gf_dynstrcat(&frag_shader_src, "#version 120\n", NULL);
 
-		gf_gl_txw_insert_fragment_shader(ctx->tx.pix_fmt, "maintx", &frag_shader_src);
+		gf_gl_txw_insert_fragment_shader(ctx->tx.pix_fmt, "maintx", &frag_shader_src, GF_FALSE);
 		gf_dynstrcat(&frag_shader_src, "varying vec2 TexCoord;\n"
 										"void main(void) {\n"
 										"gl_FragColor = maintx_sample(TexCoord.st);\n"
@@ -548,6 +763,9 @@
 		} else {
 			glDisable(GL_BLEND);
 		}
+
+		load_gl_tx_matrix(ctx);
+
 	} else
 #endif //VOUT_USE_OPENGL
 	{
@@ -580,6 +798,8 @@
 static Bool vout_on_event(void *cbk, GF_Event *evt)
 {
 	GF_FilterEvent fevt;
+	Bool translate_mouse=GF_FALSE;
+	Bool is_down=GF_FALSE;
 	GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) cbk;
 
 	fevt.base.type = 0;
@@ -589,6 +809,16 @@
 			ctx->display_width = evt->size.width;
 			ctx->display_height = evt->size.height;
 			ctx->display_changed = GF_TRUE;
+			ctx->owsize.x = ctx->display_width;
+			ctx->owsize.y = ctx->display_height;
+			vout_reset_overlay(NULL, ctx);
+
+			if (ctx->pid) {
+				GF_FEVT_INIT(fevt, GF_FEVT_VISIBILITY_HINT, ctx->pid);
+				fevt.visibility_hint.max_x = ctx->display_width;
+				fevt.visibility_hint.max_y = ctx->display_height;
+				gf_filter_pid_send_event(ctx->pid, &fevt);
+			}
 		}
 		break;
 	case GF_EVENT_CLICK:
@@ -598,11 +828,41 @@
 	case GF_EVENT_MOUSEOUT:
 	case GF_EVENT_MOUSEMOVE:
 	case GF_EVENT_MOUSEWHEEL:
-	case GF_EVENT_KEYUP:
-	case GF_EVENT_KEYDOWN:
 	case GF_EVENT_LONGKEYPRESS:
 	case GF_EVENT_TEXTINPUT:
+	case GF_EVENT_MULTITOUCH:
+		translate_mouse = GF_TRUE;
+		GF_FEVT_INIT(fevt, GF_FEVT_USER, ctx->pid);
+		fevt.user_event.event = *evt;
+		break;
 
+	case GF_EVENT_KEYDOWN:
+		is_down = GF_TRUE;
+	case GF_EVENT_KEYUP:
+		switch (evt->key.key_code) {
+		case GF_KEY_SHIFT:
+			if (is_down) {
+				ctx->key_states |= GF_KEY_MOD_SHIFT;
+			} else {
+				ctx->key_states &= ~GF_KEY_MOD_SHIFT;
+			}
+			break;
+		case GF_KEY_CONTROL:
+			if (is_down) {
+				ctx->key_states |= GF_KEY_MOD_CTRL;
+			} else {
+				ctx->key_states &= ~GF_KEY_MOD_CTRL;
+			}
+			break;
+		case GF_KEY_ALT:
+			if (is_down) {
+				ctx->key_states |= GF_KEY_MOD_ALT;
+			} else {
+				ctx->key_states &= ~GF_KEY_MOD_ALT;
+			}
+			break;
+		}
+		evt->key.flags = ctx->key_states;
 		GF_FEVT_INIT(fevt, GF_FEVT_USER, ctx->pid);
 		fevt.user_event.event = *evt;
 		break;
@@ -610,10 +870,29 @@
 	if (gf_filter_ui_event(ctx->filter, evt))
 		return GF_TRUE;
 
-	if (fevt.base.type)
+	//forward event
+	if (fevt.base.type) {
+		//rescale mouse event to original PID size
+		if (translate_mouse) {
+			if (evt->type == GF_EVENT_MULTITOUCH) {
+				Fixed o_x = evt->mtouch.x * (s32) ctx->width / (s32) ctx->display_width;
+				Fixed o_y = evt->mtouch.y * (s32) ctx->height / (s32) ctx->display_height;
+				o_x -= FLT2FIX(ctx->ow);
+				o_y -= FLT2FIX(ctx->oh);
+				fevt.user_event.event.mtouch.x = o_x;
+				fevt.user_event.event.mtouch.y = o_y;
+			} else {
+				s32 o_x = evt->mouse.x * (s32) ctx->width / (s32) ctx->display_width;
+				s32 o_y = evt->mouse.y * (s32) ctx->height / (s32) ctx->display_height;
+				o_x -= (s32) ctx->ow;
+				o_y -= (s32) ctx->oh;
+				fevt.user_event.event.mouse.x = o_x;
+				fevt.user_event.event.mouse.y = o_y;
+			}
+		}
 	 	gf_filter_pid_send_event(ctx->pid, &fevt);
-
-	 return GF_TRUE;
+	}
+	return GF_TRUE;
 }
 
 GF_VideoOutput *gf_filter_claim_opengl_provider(GF_Filter *filter);
@@ -682,10 +961,11 @@
 #endif
 	{
 		if (ctx->disp < MODE_2D) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("No openGL support - using 2D rasterizer!\n", ctx->video_out->module_name));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("No OpenGL support - using 2D rasterizer!\n", ctx->video_out->module_name));
 			ctx->disp = MODE_2D;
 		}
 	}
+
 #ifdef VOUT_USE_OPENGL
 	if (ctx->disp <= MODE_GL_PBO) {
 		GF_Event evt;
@@ -744,9 +1024,67 @@
 
 #ifdef VOUT_USE_OPENGL
 
+static void vout_draw_overlay(GF_VideoOutCtx *ctx)
+{
+	Float dw, dh, ox, oy;
+
+	dw = ((Float)ctx->olwnd.z) / 2;
+	dh = ((Float)ctx->olwnd.w) / 2;
+	ox = ((Float)ctx->olwnd.x);
+	oy = ((Float)ctx->olwnd.y);
+
+	GLfloat squareVertices[] = {
+		ox+dw, oy+dh,
+		ox+dw, oy-dh,
+		ox-dw, oy-dh,
+		ox-dw, oy+dh,
+	};
+
+	GLfloat textureVertices[] = {
+		1.0f, 0.0f,
+		1.0f, 1.0f,
+		0.0f, 1.0f,
+		0.0f, 0.0f,
+	};
+
+#if 0
+	if (flip_texture) {
+		textureVertices[1] = textureVertices[7] = 1.0f;
+		textureVertices[3] = textureVertices[5] = 0.0f;
+	}
+#endif
+
+	u16 indices[4] = {0, 1, 2, 3};
+
+	glMatrixMode(GL_TEXTURE);
+	glLoadIdentity();
+	glMatrixMode(GL_MODELVIEW);
+
+	glEnable(GL_TEXTURE_2D);
+	glEnable(GL_BLEND);
+	glBindTexture(GL_TEXTURE_2D, ctx->overlay_tx);
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glVertexPointer(2, GL_FLOAT, 0, squareVertices);
+	glClientActiveTexture(GL_TEXTURE0);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+	glTexCoordPointer(2, GL_FLOAT, 0, textureVertices);
+
+	glDrawElements(GL_TRIANGLE_FAN, 4, GL_UNSIGNED_SHORT, indices);
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(TEXTURE_TYPE, 0);
+	glDisable(TEXTURE_TYPE);
+}
+
 static void vout_draw_gl_quad(GF_VideoOutCtx *ctx, Bool flip_texture)
 {
 	Float dw, dh;
+	Bool flip_h = GF_FALSE;
+	Bool flip_v = GF_FALSE;
+	u32 i;
 
 	gf_gl_txw_bind(&ctx->tx, "maintx", ctx->glsl_program, 0);
 
@@ -773,21 +1111,62 @@
 		textureVertices[3] = textureVertices[5] = 0.0f;
 	}
 
+	switch (ctx->pid_vflip) {
+	case FLIP_VERT:
+		flip_v = GF_TRUE;
+		break;
+	case FLIP_HORIZ:
+		flip_h = GF_TRUE;
+		break;
+	case FLIP_BOTH:
+	case FLIP_BOTH2:
+		flip_v = GF_TRUE;
+		flip_h = GF_TRUE;
+		break;
+	}
+
+	if (flip_h) {
+		GLfloat v = textureVertices[0];
+		textureVertices[0] = textureVertices[2] = textureVertices[4];
+		textureVertices[4] = textureVertices[6] = v;
+	}
+	if (flip_v) {
+		GLfloat v = textureVertices[1];
+		textureVertices[1] = textureVertices[7] = textureVertices[3];
+		textureVertices[3] = textureVertices[5] = v;
+	}
+
+	for (i=0; i < ctx->pid_vrot; i++) {
+		GLfloat vx = textureVertices[0];
+		GLfloat vy = textureVertices[1];
+
+		textureVertices[0] = textureVertices[2];
+		textureVertices[1] = textureVertices[3];
+		textureVertices[2] = textureVertices[4];
+		textureVertices[3] = textureVertices[5];
+		textureVertices[4] = textureVertices[6];
+		textureVertices[5] = textureVertices[7];
+		textureVertices[6] = vx;
+		textureVertices[7] = vy;
+	}
+
 	int loc = glGetAttribLocation(ctx->glsl_program, "gfVertex");
 	if (loc >= 0) {
 		glVertexAttribPointer(loc, 2, GL_FLOAT, 0, 0, squareVertices);
 		glEnableVertexAttribArray(loc);
 
 		//setup texcoord location
-		loc = glGetAttribLocation(ctx->glsl_program, "gfTexCoord");
-		if (loc >= 0) {
-			glVertexAttribPointer(loc, 2, GL_FLOAT, 0, 0, textureVertices);
-			glEnableVertexAttribArray(loc);
+		int loc2 = glGetAttribLocation(ctx->glsl_program, "gfTexCoord");
+		if (loc2 >= 0) {
+			glVertexAttribPointer(loc2, 2, GL_FLOAT, 0, 0, textureVertices);
+			glEnableVertexAttribArray(loc2);
 
 			glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+			glDisableVertexAttribArray(loc2);
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Failed to gfTexCoord uniform in shader\n"));
 		}
+		glDisableVertexAttribArray(loc);
 	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Failed to gfVertex uniform in shader\n"));
 	}
@@ -809,6 +1188,8 @@
 		if (!ctx->dump_buffer)
 			ctx->dump_buffer = gf_malloc(sizeof(char)*ctx->display_width*ctx->display_height*3);
 
+		glFlush();
+
 		glReadPixels(0, 0, ctx->display_width, ctx->display_height, GL_RGB, GL_UNSIGNED_BYTE, ctx->dump_buffer);
 		GL_CHECK_ERR()
 		fout = gf_fopen(szFileName, "wb");
@@ -819,8 +1200,6 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Error writing frame %d buffer to %s\n", ctx->nb_frames, szFileName));
 		}
 	}
-
-	ctx->video_out->Flush(ctx->video_out, NULL);
 }
 
 static void vout_draw_gl_hw_textures(GF_VideoOutCtx *ctx, GF_FilterFrameInterface *hwf)
@@ -832,8 +1211,6 @@
 	ctx->tx.frame_ifce = hwf;
 	gf_gl_txw_bind(&ctx->tx, "maintx", ctx->glsl_program, 0);
 
-	glMatrixMode(GL_TEXTURE);
-	glLoadIdentity();
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 
@@ -845,29 +1222,40 @@
 static void vout_draw_gl(GF_VideoOutCtx *ctx, GF_FilterPacket *pck)
 {
 	char *data;
-	GF_Event evt;
 	GF_Matrix mx;
 	Float hw, hh;
 	u32 wsize;
 	GF_FilterFrameInterface *frame_ifce;
 
-	if (!ctx->glsl_program) return;
-
-	memset(&evt, 0, sizeof(GF_Event));
-	evt.type = GF_EVENT_SET_GL;
-	ctx->video_out->ProcessEvent(ctx->video_out, &evt);
+	vout_make_gl_current(ctx);
 
 	if (ctx->display_changed) {
+		u32 v_w, v_h;
+		u32 w = ctx->width;
+		u32 h = ctx->height;
+		if (ctx->c_w && ctx->c_h) {
+			w = (u32) ctx->c_w;
+			h = (u32) ctx->c_h;
+		}
+
+		if (ctx->pid_vrot % 2) {
+			v_h = w;
+			v_w = h;
+		} else {
+			v_w = w;
+			v_h = h;
+		}
+
 		//if we fill width to display width and height is outside
-		if (ctx->display_width * ctx->height / ctx->width > ctx->display_height) {
-			ctx->dw = (Float) (ctx->display_height * ctx->width / ctx->height);
+		if (ctx->display_width * v_h / v_w > ctx->display_height) {
+			ctx->dw = (Float) (ctx->display_height * v_w / v_h);
 			ctx->dw *= ctx->sar.num;
 			ctx->dw /= ctx->sar.den;
 			ctx->dh = (Float) ctx->display_height;
 			ctx->oh = (Float) 0;
 			ctx->ow = (Float) (ctx->display_width - ctx->dw ) / 2;
 		} else {
-			ctx->dh = (Float) (ctx->display_width * ctx->height / ctx->width);
+			ctx->dh = (Float) (ctx->display_width * v_h / v_w);
 			ctx->dh *= ctx->sar.den;
 			ctx->dh /= ctx->sar.num;
 			ctx->dw = (Float) ctx->display_width;
@@ -882,15 +1270,19 @@
 		ctx->display_changed = GF_FALSE;
 	}
 
+	glViewport(0, 0, ctx->display_width, ctx->display_height);
+
+	if (!pck)
+		goto exit;
+
+	if (!ctx->glsl_program) return;
 
 	frame_ifce = gf_filter_pck_get_frame_interface(pck);
+	//main framebuffer, just display
 	if (frame_ifce && (frame_ifce->flags & GF_FRAME_IFCE_MAIN_GLFB)) {
-		ctx->video_out->Flush(ctx->video_out, NULL);
-		return;
+		goto exit;
 	}
 
-	glViewport(0, 0, ctx->display_width, ctx->display_height);
-
 	gf_mx_init(mx);
 	hw = ((Float)ctx->display_width)/2;
 	hh = ((Float)ctx->display_height)/2;
@@ -898,9 +1290,6 @@
 	glMatrixMode(GL_PROJECTION);
 	glLoadMatrixf(mx.m);
 
-	glMatrixMode(GL_TEXTURE);
-	glLoadIdentity();
-
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 
@@ -938,16 +1327,56 @@
 
 	if (frame_ifce && frame_ifce->get_gl_texture) {
 		vout_draw_gl_hw_textures(ctx, frame_ifce);
-		return;
+	} else {
+		data = (char*) gf_filter_pck_get_data(pck, &wsize);
+
+		//upload texture
+		gf_gl_txw_upload(&ctx->tx, data, frame_ifce);
+
+		//and draw
+		vout_draw_gl_quad(ctx, GF_FALSE);
 	}
+	glUseProgram(0);
 
-	data = (char*) gf_filter_pck_get_data(pck, &wsize);
+exit:
 
-	//upload texture
-	gf_gl_txw_upload(&ctx->tx, data, frame_ifce);
+	//we don't lock since most of the time overlay is not set
+	if (ctx->oldata.ptr && (ctx->olsize.x>0) && (ctx->olsize.y>0)) {
+		// overlay is set, lock filter to make sure the data is still valid
+		gf_filter_lock(ctx->filter, GF_TRUE);
+		if (ctx->oldata.ptr && ((s32) ctx->oldata.size <= 4 * ctx->olsize.x * ctx->olsize.y) ) {
+			if (!ctx->overlay_tx) {
+				glGenTextures(1, &ctx->overlay_tx);
 
-	//and draw
-	vout_draw_gl_quad(ctx, GF_FALSE);
+				glEnable(GL_TEXTURE_2D);
+#if !defined(GPAC_USE_GLES1X)
+				glBindTexture(GL_TEXTURE_2D, ctx->overlay_tx);
+#if defined(GPAC_USE_GLES2)
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+#else
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+#endif
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+#endif
+
+				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ctx->olsize.x, ctx->olsize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, ctx->oldata.ptr);
+				ctx->update_oldata = GF_FALSE;
+			} else if (ctx->update_oldata) {
+				glEnable(GL_TEXTURE_2D);
+				glBindTexture(GL_TEXTURE_2D, ctx->overlay_tx);
+				glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, ctx->olsize.x, ctx->olsize.y, GL_RGBA, GL_UNSIGNED_BYTE, ctx->oldata.ptr);
+				ctx->update_oldata = GF_FALSE;
+			}
+			vout_draw_overlay(ctx);
+		}
+		gf_filter_lock(ctx->filter, GF_FALSE);
+	}
+
+	//final flush
+	ctx->video_out->Flush(ctx->video_out, NULL);
 }
 #endif
 
@@ -959,6 +1388,9 @@
 	GF_VideoSurface src_surf;
 	GF_Window dst_wnd, src_wnd;
 
+	if (!pck)
+		return;
+
 	memset(&src_surf, 0, sizeof(GF_VideoSurface));
 	src_surf.width = ctx->width;
 	src_surf.height = ctx->height;
@@ -1111,8 +1543,55 @@
 	GF_FilterPacket *pck;
 	GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) gf_filter_get_udta(filter);
 
+	if (ctx->force_vout) {
+		ctx->force_vout = GF_FALSE;
+		ctx->width = ctx->display_width = ctx->olwnd.z;
+		ctx->height = ctx->display_height = ctx->olwnd.w;
+		resize_video_output(ctx, ctx->width, ctx->height);
+		ctx->owsize.x = ctx->display_width;
+		ctx->owsize.y = ctx->display_height;
+	}
+	if (ctx->force_reconfig_pid) {
+		vout_configure_pid(filter, ctx->pid, GF_FALSE);
+		ctx->force_reconfig_pid = GF_FALSE;
+	}
 	ctx->video_out->ProcessEvent(ctx->video_out, NULL);
 
+	if (!ctx->step && !ctx->speed) {
+		//we don't lock here since we don't access the pointer
+		if (ctx->oldata.ptr && ctx->update_oldata)
+			return vout_draw_frame(ctx);
+		gf_filter_ask_rt_reschedule(filter, 50000);
+		return GF_OK;
+	}
+
+	if (ctx->do_seek) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_STOP, ctx->pid);
+		gf_filter_pid_send_event(ctx->pid, &evt);
+
+		gf_filter_pid_init_play_event(ctx->pid, &evt, ctx->start, ctx->speed, "VideoOut");
+		gf_filter_pid_send_event(ctx->pid, &evt);
+		ctx->do_seek = GF_FALSE;
+		if (ctx->last_pck) {
+			gf_filter_pck_unref(ctx->last_pck);
+			ctx->last_pck = NULL;
+		}
+		ctx->nb_frames = 0;
+		ctx->buffer_done = GF_FALSE;
+		ctx->no_buffering = 0;
+		ctx->first_cts_plus_one = 0;
+		ctx->clock_at_first_cts = ctx->last_frame_clock = ctx->clock_at_first_frame = 0;
+		return GF_OK;
+	}
+
+	if (!ctx->pid) {
+		//we don't lock here since we don't access the pointer
+		if (ctx->oldata.ptr && ctx->update_oldata)
+			return vout_draw_frame(ctx);
+		return ctx->oldata.ptr ? GF_OK : GF_EOS;
+	}
+
 	pck = gf_filter_pid_get_packet(ctx->pid);
 	if (!pck) {
 		if (gf_filter_pid_is_eos(ctx->pid)) {
@@ -1132,14 +1611,26 @@
 			if ((ctx->nb_frames>1) && ctx->last_pck_dur_us) {
 				gf_filter_ask_rt_reschedule(filter, ctx->last_pck_dur_us);
 				ctx->last_pck_dur_us = 0;
+				//we don't lock here since we don't access the pointer
+				if (ctx->oldata.ptr && ctx->update_oldata)
+					return vout_draw_frame(ctx);
 				return GF_OK;
 			}
-			//fallthrough
+		} else if (ctx->rbuffer && ctx->buffer_done) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[VideoOut] buffer empty, rebuffering\n"));
+			ctx->rebuffer = gf_sys_clock_high_res();
+			ctx->buffer_done = GF_FALSE;
 		}
+
 		//check if all sinks are done - if not keep requesting a process to pump window event loop
 		if (!gf_filter_all_sinks_done(filter)) {
 			gf_filter_ask_rt_reschedule(filter, 100000);
-			if (ctx->display_changed) goto draw_frame;
+			if (ctx->display_changed)
+				goto draw_frame;
+
+			//we don't lock here since we don't access the pointer
+			if (ctx->oldata.ptr && ctx->update_oldata)
+				return vout_draw_frame(ctx);
 			return GF_OK;
 		}
 		return ctx->aborted ? GF_EOS : GF_OK;
@@ -1187,7 +1678,8 @@
 	if (ctx->buffer) {
 		if (gf_filter_pck_is_blocking_ref(pck)) {
 			ctx->buffer_done = GF_TRUE;
-			ctx->buffer = 0;
+			ctx->rebuffer = 0;
+			ctx->buffer = ctx->rbuffer = 0;
 		} else {
 			//query full buffer duration in us
 			u64 dur = gf_filter_pid_query_buffer_duration(ctx->pid, GF_FALSE);
@@ -1202,14 +1694,32 @@
 						sprintf(szStatus, "buffering %d / %d ms", (u32) (dur/1000), ctx->buffer);
 						gf_filter_update_status(filter, -1, szStatus);
 					}
+					//we don't lock here since we don't access the pointer
+					if (ctx->oldata.ptr && ctx->update_oldata)
+						return vout_draw_frame(ctx);
 					return GF_OK;
 				}
 				ctx->buffer_done = GF_TRUE;
+				if (ctx->rebuffer) {
+					u64 rebuf_time = gf_sys_clock_high_res() - ctx->rebuffer;
+					ctx->rebuffer = 0;
+					GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[VideoOut] rebuffer done in "LLU" ms\n", (u32) (rebuf_time/1000)));
+					if (ctx->clock_at_first_cts)
+						ctx->clock_at_first_cts += rebuf_time;
+				}
+			} else if (ctx->rbuffer) {
+				if ((dur < ctx->rbuffer * 1000) && !gf_filter_pid_has_seen_eos(ctx->pid)) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[VideoOut] buffer %u less than min threshold %u, rebuffering\n", (u32) (dur/1000), ctx->rbuffer));
+					ctx->rebuffer = gf_sys_clock_high_res();
+					ctx->buffer_done = GF_FALSE;
+					return GF_OK;
+				}
 			}
 		}
 	}
 
-	if (ctx->vsync || ctx->drop) {
+
+	if (!ctx->step && (ctx->vsync || ctx->drop)) {
 		u64 ref_clock = 0;
 		u64 cts = gf_filter_pck_get_cts(pck);
 		u64 clock_us, now = gf_sys_clock_high_res();
@@ -1217,8 +1727,8 @@
 		GF_Fraction64 media_ts;
 		s64 delay;
 
-		if (ctx->dur.num) {
-			if ((cts - ctx->first_cts_plus_one + 1) * ctx->dur.den > (u64) (ctx->dur.num * ctx->timescale)) {
+		if (ctx->dur.num && ctx->clock_at_first_cts && ctx->first_cts_plus_one) {
+			if (gf_timestamp_greater(cts - ctx->first_cts_plus_one + 1, ctx->timescale, ctx->dur.num, ctx->dur.den)) {
 				GF_FilterEvent evt;
 				if (ctx->last_pck) {
 					gf_filter_pck_unref(ctx->last_pck);
@@ -1229,12 +1739,14 @@
 				gf_filter_pid_send_event(ctx->pid, &evt);
 				gf_filter_pid_set_discard(ctx->pid, GF_TRUE);
 				return GF_EOS;
+			} else if (gf_filter_pid_has_seen_eos(ctx->pid)) {
+				gf_filter_ask_rt_reschedule(filter, 100000);
 			}
 		}
 
 		delay = ctx->pid_delay;
 		if (ctx->vdelay.den)
-			delay += ctx->vdelay.num * (s32)ctx->timescale / (s32)ctx->vdelay.den;
+			delay += gf_timestamp_rescale(ctx->vdelay.num, ctx->vdelay.den, ctx->timescale);
 
 		if (delay>=0) {
 			cts += delay;
@@ -1245,6 +1757,7 @@
 					ctx->last_pck = NULL;
 				}
 				gf_filter_pid_drop_packet(ctx->pid);
+				gf_filter_ask_rt_reschedule(filter, 50000);
 				return GF_OK;
 			}
 			cts = 0;
@@ -1257,28 +1770,32 @@
 		if (clock_us && media_ts.den) {
 			u32 safety;
 			//ref frame TS in video stream timescale
-			s64 ref_ts = (s64) (media_ts.num * ctx->timescale);
-			ref_ts /= media_ts.den;
-			//compute time ellapsed since last clock ref in timescale
+			u64 ref_ts = gf_timestamp_rescale(media_ts.num, media_ts.den, ctx->timescale);
+
+			//compute time elapsed since last clock ref in timescale
 			s64 diff = now;
 			diff -= (s64) clock_us;
 			if (ctx->timescale!=1000000) {
-				diff *= ctx->timescale;
-				diff /= 1000000;
+				diff = gf_timestamp_rescale(diff, 1000000, ctx->timescale);
 			}
-			assert(diff>=0);
 			//ref stream hypothetical timestamp at now
 			ref_ts += diff;
-			ctx->first_cts_plus_one = cts + 1;
+			if (!ctx->first_cts_plus_one || (cts >= ref_ts)) {
+				ctx->first_cts_plus_one = ref_ts + 1;
+				ctx->clock_at_first_cts = now;
+			}
 
 			//allow 10ms video advance
 			#define DEF_VIDEO_AUDIO_ADVANCE_MS	15
 			safety = DEF_VIDEO_AUDIO_ADVANCE_MS * ctx->timescale / 1000;
-			if (!ctx->raw_grab && ((s64) cts > ref_ts + safety)) {
+			if (!ctx->step && !ctx->raw_grab && (cts > ref_ts + safety)) {
+				u32 resched_time = (u32) gf_timestamp_rescale(cts-ref_ts - safety, ctx->timescale, 1000000);
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] At %d ms display frame CTS "LLU" CTS greater than reference clock CTS "LLU" (%g sec), waiting\n", gf_sys_clock(), cts, ref_ts, ((Double)media_ts.num)/media_ts.den));
 				//the clock is not updated continuously, only when audio sound card writes. We therefore
 				//cannot know if the sampling was recent or old, so ask for a short reschedule time
-				gf_filter_ask_rt_reschedule(filter, (u32) ((cts-ref_ts - safety) * 1000000 / ctx->timescale) );
+				if (resched_time>100000)
+					resched_time = 100000;
+				gf_filter_ask_rt_reschedule(filter, resched_time );
 				//not ready yet
 				return GF_OK;
 			}
@@ -1296,11 +1813,10 @@
 				ctx->clock_at_first_cts = 1 + cts;
 			} else {
 				//comute CTS diff in ms
-				u64 diff = cts - ctx->clock_at_first_cts + 1;
-				diff *= 1000;
-				diff /= ctx->timescale;
+				u64 diff = gf_timestamp_rescale(cts - ctx->clock_at_first_cts + 1, ctx->timescale, 1000);
 				//diff less than 100ms (eg 10fps or more), init on the second frame
-				if (diff<100) {
+				//do not apply this if playing at speed lower than nominal speed
+				if ((diff<100) && (ABS(ctx->speed)>=1)) {
 					ctx->first_cts_plus_one = 1 + cts;
 					ctx->clock_at_first_cts = now;
 				}
@@ -1323,7 +1839,7 @@
 				diff = (s64) ((now - ctx->clock_at_first_cts) * ctx->speed);
 
 				if (ctx->timescale != 1000000)
-					diff -= (s64) ( (cts - ctx->first_cts_plus_one + 1) * 1000000 / ctx->timescale);
+					diff -= (s64) gf_timestamp_rescale(cts - ctx->first_cts_plus_one + 1, ctx->timescale, 1000000);
 				else
 					diff -= (s64) (cts - ctx->first_cts_plus_one + 1);
 
@@ -1331,14 +1847,14 @@
 				diff = (s64) ((now - ctx->clock_at_first_cts) * -ctx->speed);
 
 				if (ctx->timescale != 1000000)
-					diff -= (s64) ( (ctx->first_cts_plus_one-1 - cts) * 1000000 / ctx->timescale);
+					diff -= (s64) gf_timestamp_rescale(ctx->first_cts_plus_one-1 - cts, ctx->timescale, 1000000);
 				else
 					diff -= (s64) (ctx->first_cts_plus_one-1 - cts);
 			}
 
 			if (!ctx->raw_grab && (diff < -2000)) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] At %d ms frame cts "LLU"/%d "LLU" us too early, waiting\n", gf_sys_clock(), cts, ctx->timescale, -diff));
-				if (diff<-1000000) diff = -1000000;
+				if (diff<-100000) diff = -100000;
 				gf_filter_ask_rt_reschedule(filter, (u32) (-diff));
 
 				if (ctx->display_changed) goto draw_frame;
@@ -1352,13 +1868,11 @@
 			}
 
 			if (ctx->timescale != 1000000)
-				ref_clock = diff * ctx->timescale / 1000000 + cts;
+				ref_clock = gf_timestamp_rescale(diff, 1000000, ctx->timescale) + cts;
 			else
 				ref_clock = diff + cts;
 
-			ctx->last_pck_dur_us = gf_filter_pck_get_duration(pck);
-			ctx->last_pck_dur_us *= 1000000;
-			ctx->last_pck_dur_us /= ctx->timescale;
+			ctx->last_pck_dur_us = (u32) gf_timestamp_rescale(gf_filter_pck_get_duration(pck), ctx->timescale, 1000000);
 		}
 		//detach packet from pid, so that we can query next cts
 		gf_filter_pck_ref(&pck);
@@ -1367,12 +1881,8 @@
 		if (ctx->drop) {
 			u64 next_ts;
 			Bool do_drop = GF_FALSE;
-			//peeking next packet CTS might fail if no packet in buffer, in which case we don't drop
-			if (gf_filter_pid_get_first_packet_cts(ctx->pid, &next_ts)) {
-				if (next_ts<ref_clock) {
-					do_drop = GF_TRUE;
-				}
-			} else if (ctx->speed > 2){
+
+			if (ctx->speed > 2){
 				u32 speed = (u32) ABS(ctx->speed);
 
 				ctx->nb_drawn++;
@@ -1382,10 +1892,18 @@
 					ctx->nb_drawn = 0;
 				}
 			}
+			//peeking next packet CTS might fail if no packet in buffer, in which case we don't drop
+			else if (gf_filter_pid_get_first_packet_cts(ctx->pid, &next_ts)) {
+				if (next_ts<ref_clock) {
+					do_drop = GF_TRUE;
+				}
+			}
+
 			if (do_drop) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] At %d ms drop frame "LLU" ms reference clock "LLU" ms\n", gf_sys_clock(), (1000*cts)/ctx->timescale, (1000*ref_clock)/ctx->timescale));
 
 				gf_filter_pck_unref(pck);
+				gf_filter_ask_rt_reschedule(filter, 10);
 				return GF_OK;
 			}
 		}
@@ -1428,13 +1946,17 @@
 		gf_filter_update_status(filter, -1, szStatus);
 	}
 
+	if (ctx->step) {
+		ctx->speed = 0;
+		ctx->step = GF_FALSE;
+	}
 	return vout_draw_frame(ctx);
 }
 
 static GF_Err vout_draw_frame(GF_VideoOutCtx *ctx)
 {
-	ctx->force_release = GF_TRUE;
-	if (ctx->pfmt && ctx->last_pck) {
+	ctx->force_release = GF_FALSE;
+	if ((ctx->pfmt && ctx->last_pck) || !ctx->pid) {
 #ifdef VOUT_USE_OPENGL
 		if (ctx->disp < MODE_2D) {
 			gf_rmt_begin_gl(vout_draw_gl);
@@ -1450,7 +1972,7 @@
 	}
 	if (ctx->no_buffering)
 		ctx->force_release = GF_TRUE;
-	else if (ctx->last_pck && gf_filter_pck_is_blocking_ref(ctx->last_pck) )
+	else if (ctx->speed && ctx->last_pck && gf_filter_pck_is_blocking_ref(ctx->last_pck) )
 		ctx->force_release = GF_TRUE;
 
 	if (ctx->force_release && ctx->last_pck && !ctx->dump_f_idx) {
@@ -1483,32 +2005,139 @@
 	return GF_TRUE;
 }
 
+GF_Err vout_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val)
+{
+	GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) gf_filter_get_udta(filter);
+
+	if (!strcmp(arg_name, "olwnd")) {
+		if (!ctx->pid) {
+			if ((ctx->width != new_val->value.vec4i.z) || (ctx->height != new_val->value.vec4i.w))
+				ctx->force_vout = GF_TRUE;
+		}
+		return GF_OK;
+	} else if (!strcmp(arg_name, "oldata")) {
+		if (new_val->value.data.ptr) {
+			ctx->update_oldata = GF_TRUE;
+		} else {
+			vout_reset_overlay(filter, ctx);
+		}
+		if (!ctx->pid) {
+			if (!ctx->height)
+				ctx->force_vout = GF_TRUE;
+			ctx->update_oldata = GF_TRUE;
+			gf_filter_post_process_task(filter);
+		}
+		return GF_OK;
+	} else if (!strcmp(arg_name, "olsize")) {
+		vout_reset_overlay(filter, ctx);
+		return GF_OK;
+	}
+
+	if (!strcmp(arg_name, "fullscreen")) {
+		if (new_val->value.boolean) {
+			u32 nw=ctx->display_width, nh=ctx->display_height;
+			ctx->video_out->SetFullScreen(ctx->video_out, GF_TRUE, &nw, &nh);
+			ctx->in_fullscreen = GF_TRUE;
+			ctx->owsize.x = nw;
+			ctx->owsize.y = nh;
+		} else {
+			u32 nw=ctx->display_width, nh=ctx->display_height;
+			ctx->video_out->SetFullScreen(ctx->video_out, GF_FALSE, &nw, &nh);
+			ctx->in_fullscreen = GF_FALSE;
+			ctx->owsize.x = ctx->display_width;
+			ctx->owsize.y = ctx->display_height;
+		}
+		return GF_OK;
+	}
+	if (!strcmp(arg_name, "vrot")) {
+		if (ctx->disp<MODE_2D)
+			ctx->force_reconfig_pid = GF_TRUE;
+		return GF_OK;
+	}
+	if (!strcmp(arg_name, "step")) {
+		return GF_OK;
+	}
+	if (!strcmp(arg_name, "start")) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] Seek request to %f\n", new_val->value.number));
+		if (!ctx->pid)
+			return GF_OK;
+		ctx->do_seek = GF_TRUE;
+	}
+	if (!strcmp(arg_name, "speed") && ctx->pid) {
+		GF_FilterEvent fevt;
+		GF_FEVT_INIT(fevt, 0, ctx->pid);
+		if (new_val->value.number) {
+			if (!ctx->speed) {
+				fevt.base.type = GF_FEVT_RESUME;
+			} else {
+				fevt.base.type = GF_FEVT_SET_SPEED;
+				fevt.play.speed = new_val->value.number;
+			}
+		} else {
+			fevt.base.type = GF_FEVT_PAUSE;
+		}
+		gf_filter_pid_send_event(ctx->pid, &fevt);
+	}
+	//reinit clock
+	ctx->first_cts_plus_one = 0;
+	ctx->clock_at_first_cts = ctx->last_frame_clock = ctx->clock_at_first_frame = 0;
+	return GF_OK;
+}
+
+
+
 #define OFFS(_n)	#_n, offsetof(GF_VideoOutCtx, _n)
 
 static const GF_FilterArgs VideoOutArgs[] =
 {
 	{ OFFS(drv), "video driver name", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(vsync), "enable video screen sync", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(drop), "enable droping late frames", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(drop), "enable dropping late frames", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
 	{ OFFS(disp), "display mode\n"
 	"- gl: OpenGL\n"
 	"- pbo: OpenGL with PBO\n"
 	"- blit: 2D hardware blit\n"
 	"- soft: software blit", GF_PROP_UINT, "gl", "gl|pbo|blit|soft", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(start), "set playback start offset. Negative value means percent of media dur with -1 <=> dur", GF_PROP_DOUBLE, "0.0", NULL, 0},
+	{ OFFS(start), "set playback start offset. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, GF_FS_ARG_UPDATE},
 	{ OFFS(dur), "only play the specified duration", GF_PROP_FRACTION64, "0", NULL, 0},
-	{ OFFS(speed), "set playback speed when vsync is on. If speed is negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
-	{ OFFS(hold), "number of seconds to hold display for single-frame streams. A negative value force a hold on last frame for single or multi-frames streams", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{ OFFS(speed), "set playback speed when vsync is on. If speed is negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(hold), "number of seconds to hold display for single-frame streams (a negative value force a hold on last frame for single or multi-frames streams)", GF_PROP_DOUBLE, "1.0", NULL, 0},
 	{ OFFS(linear), "use linear filtering instead of nearest pixel for GL mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(back), "back color for transparent images", GF_PROP_UINT, "0x808080", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(wsize), "default init window size. 0x0 holds the window size of the first frame. Negative values indicate video media size", GF_PROP_VEC2I, "-1x-1", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(wsize), "default init window size\n"
+	"- 0x0 holds the window size of the first frame\n"
+	"- negative values indicate video media size", GF_PROP_VEC2I, "-1x-1", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(wpos), "default position (0,0 top-left)", GF_PROP_VEC2I, "-1x-1", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(vdelay), "set delay in sec, positive value displays after audio clock", GF_PROP_FRACTION, "0", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
 	{ OFFS(hide), "hide output window", GF_PROP_BOOL, "false", NULL, 0},
-	{ OFFS(fullscreen), "use fullcreen", GF_PROP_BOOL, "false", NULL, 0},
-	{ OFFS(buffer), "set buffer in ms", GF_PROP_UINT, "100", NULL, 0},
-	{ OFFS(dumpframes), "ordered list of frames to dump, 1 being first frame - see filter help. Special value 0 means dump all frames", GF_PROP_UINT_LIST, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(out), "radical of dump frame filenames. If no extension is provided, frames are exported as $OUT_%d.PFMT", GF_PROP_STRING, "dump", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(fullscreen), "use fullscreen", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(buffer), "set playout buffer in ms", GF_PROP_UINT, "100", NULL, 0},
+	{ OFFS(mbuffer), "set max buffer occupancy in ms. If less than buffer, use buffer", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(rbuffer), "rebuffer trigger in ms. If 0 or more than buffer, disable rebuffering", GF_PROP_UINT, "0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(dumpframes), "ordered list of frames to dump, 1 being first frame. Special value `0` means dump all frames", GF_PROP_UINT_LIST, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(out), "radical of dump frame filenames. If no extension provided, frames are exported as `$OUT_%d.PFMT`", GF_PROP_STRING, "dump", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(step), "step frame", GF_PROP_BOOL, "false", NULL, GF_ARG_HINT_HIDE|GF_FS_ARG_UPDATE},
+
+	{ OFFS(olwnd), "overlay window position and size", GF_PROP_VEC4I, NULL, NULL, GF_ARG_HINT_HIDE|GF_FS_ARG_UPDATE},
+	{ OFFS(olsize), "overlay texture size (must be RGBA)", GF_PROP_VEC2I, NULL, NULL, GF_ARG_HINT_HIDE|GF_FS_ARG_UPDATE_SYNC},
+	{ OFFS(oldata), "overlay texture data (must be RGBA)", GF_PROP_CONST_DATA, NULL, NULL, GF_ARG_HINT_HIDE|GF_FS_ARG_UPDATE_SYNC},
+	{ OFFS(owsize), "output window size (readonly)", GF_PROP_VEC2I, NULL, NULL, GF_ARG_HINT_EXPERT},
+	{ OFFS(buffer_done), "buffer done indication (readonly)", GF_PROP_BOOL, NULL, NULL, GF_ARG_HINT_EXPERT},
+	{ OFFS(rebuffer), "system time in us at which last rebuffer started, 0 if not rebuffering (readonly)", GF_PROP_LUINT, NULL, NULL, GF_ARG_HINT_EXPERT},
+
+	{ OFFS(vflip), "flip video (GL only)\n"
+		"- no: no flipping\n"
+		"- v: vertical flip\n"
+		"- h: horizontal flip\n"
+		"- vh: horizontal and vertical\n"
+		"- hv: same as vh"
+		, GF_PROP_UINT, "no", "no|v|h|vh|hv", GF_FS_ARG_UPDATE | GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(vrot), "rotate video by given angle\n"
+		"- 0: no rotation\n"
+		"- 90: rotate 90 degree counter clockwise\n"
+		"- 180: rotate 180 degree\n"
+		"- 270: rotate 90 degree clockwise"
+	, GF_PROP_UINT, "0","0|90|180|270", GF_FS_ARG_UPDATE | GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };
 
@@ -1522,14 +2151,14 @@
 GF_FilterRegister VideoOutRegister = {
 	.name = "vout",
 	GF_FS_SET_DESCRIPTION("Video output")
-	GF_FS_SET_HELP("This filter displays a single visual pid in a window.\n"\
-	"The window is created unless a window handle (HWND, xWindow, etc) is indicated in the config file ( [Temp]OSWnd=ptr).\n"\
-	"The output uses GPAC video output module indicated in [-drv]() option or in the config file (see GPAC core help).\n"\
-	"The video output module can be further configured (see GPAC core help).\n"\
-	"The filter can use openGL or 2D blitter of the graphics card, depending on the OS support.\n"\
-	"The filter can be used do dump frames as written on the grapics card.\n"\
-	"In this case, the window is not visible and only the listed frames are drawn to the GPU.\n"\
-	"The pixel format of the dumped frame is always RGB in OpenGL and matches the video backbuffer format in 2D mode.\n"\
+	GF_FS_SET_HELP("This filter displays a single visual input PID in a window.\n"
+	"The window is created unless a window handle (HWND, xWindow, etc) is indicated in the config file ( [Temp]OSWnd=ptr).\n"
+	"The output uses GPAC video output module indicated in [-drv]() option or in the config file (see GPAC core help).\n"
+	"The video output module can be further configured (see GPAC core help).\n"
+	"The filter can use OpenGL or 2D blit of the graphics card, depending on the OS support.\n"
+	"The filter can be used do dump frames as written by the graphics card (GPU read-back) using [-dumpframes]().\n"
+	"In this case, the window is not visible and only the listed frames are drawn to the GPU.\n"
+	"The pixel format of the dumped frame is always RGB in OpenGL and matches the video backbuffer format in 2D mode.\n"
 	)
 	.private_size = sizeof(GF_VideoOutCtx),
 	.flags = GF_FS_REG_MAIN_THREAD,
@@ -1539,7 +2168,8 @@
 	.finalize = vout_finalize,
 	.configure_pid = vout_configure_pid,
 	.process = vout_process,
-	.process_event = vout_process_event
+	.process_event = vout_process_event,
+	.update_arg = vout_update_arg
 };
 
 const GF_FilterRegister *vout_register(GF_FilterSession *session)

gpac-1.0.1.tar.gz/src/filters/reframe_ac3.c -> gpac-2.0.0.tar.gz/src/filters/reframe_ac3.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / AC3 reframer filter
@@ -55,7 +55,7 @@
 	Bool in_seek;
 	u32 timescale;
 
-	GF_AC3Header hdr;
+	GF_AC3Config hdr;
 	u8 *ac3_buffer;
 	u32 ac3_buffer_size, ac3_buffer_alloc, resume_from;
 	u64 byte_offset;
@@ -65,12 +65,14 @@
 	Bool initial_play_done;
 
 	Bool is_eac3;
-	Bool (*ac3_parser_bs)(GF_BitStream*, GF_AC3Header*, Bool);
+	Bool (*ac3_parser_bs)(GF_BitStream*, GF_AC3Config*, Bool);
 
 	GF_FilterPacket *src_pck;
 
 	AC3Idx *indexes;
 	u32 index_alloc_size, index_size;
+	u32 bitrate;
+	Bool copy_props;
 } GF_AC3DmxCtx;
 
 
@@ -83,7 +85,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -114,6 +119,7 @@
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 	}
+	if (ctx->timescale) ctx->copy_props = GF_TRUE;
 	return GF_OK;
 }
 
@@ -121,8 +127,8 @@
 {
 	FILE *stream;
 	GF_BitStream *bs;
-	GF_AC3Header hdr;
-	u64 duration, cur_dur;
+	GF_AC3Config hdr;
+	u64 duration, cur_dur, rate;
 	s32 sr = -1;
 	const GF_PropertyValue *p;
 	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
@@ -140,8 +146,12 @@
 	}
 	ctx->is_file = GF_TRUE;
 
-	stream = gf_fopen(p->value.string, "rb");
-	if (!stream) return;
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
 	ctx->index_size = 0;
 
@@ -172,6 +182,7 @@
 
 		gf_bs_skip_bytes(bs, hdr.framesize);
 	}
+	rate = gf_bs_get_position(bs);
 	gf_bs_del(bs);
 	gf_fclose(stream);
 
@@ -180,40 +191,48 @@
 		ctx->duration.den = sr;
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+		if (duration && !gf_sys_is_test_mode() ) {
+			rate *= 8 * ctx->duration.den;
+			rate /= ctx->duration.num;
+			ctx->bitrate = (u32) rate;
+		}
 	}
 
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
 	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 }
 
 static void ac3dmx_check_pid(GF_Filter *filter, GF_AC3DmxCtx *ctx)
 {
-	GF_BitStream *bs;
 	u8 *data;
 	u32 size;
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
 		ac3dmx_check_dur(filter, ctx);
 	}
-	if ((ctx->sample_rate == ctx->hdr.sample_rate) && (ctx->nb_ch == ctx->hdr.channels) ) return;
+	if ((ctx->sample_rate == ctx->hdr.sample_rate) && (ctx->nb_ch == ctx->hdr.channels) && !ctx->copy_props) return;
 
+	ctx->copy_props = GF_FALSE;
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
+	//don't change codec type if reframing an ES (for HLS SAES)
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLES_PER_FRAME, & PROP_UINT(AC3_FRAME_SIZE) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, & PROP_BOOL(GF_FALSE) );
 
 	if (ctx->duration.num)
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	if (!ctx->timescale && !gf_sys_is_test_mode())
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 
 
 	ctx->nb_ch = ctx->hdr.channels;
 	if (!ctx->timescale) {
 		//we change sample rate, change cts
 		if (ctx->cts && (ctx->sample_rate != ctx->hdr.sample_rate)) {
-			ctx->cts *= ctx->hdr.sample_rate;
-			ctx->cts /= ctx->sample_rate;
+			ctx->cts = gf_timestamp_rescale(ctx->cts, ctx->sample_rate, ctx->hdr.sample_rate);
 		}
 	}
 	ctx->sample_rate = ctx->hdr.sample_rate;
@@ -222,46 +241,16 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, & PROP_UINT(ctx->sample_rate));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, & PROP_UINT(ctx->nb_ch) );
 
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (ctx->is_eac3) {
-		u32 i;
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(GF_CODECID_EAC3) );
-
-		gf_bs_write_int(bs, ctx->hdr.data_rate, 13);
-		gf_bs_write_int(bs, ctx->hdr.nb_streams-1, 3);
-		for (i=0; i<ctx->hdr.nb_streams; i++) {
-			gf_bs_write_int(bs, ctx->hdr.streams[i].fscod, 2);
-			gf_bs_write_int(bs, ctx->hdr.streams[i].bsid, 5);
-			gf_bs_write_int(bs, 0, 1);
-			//TODO, expose asvc as an option of reframer, the info is not carried in the bitstream
-			gf_bs_write_int(bs, ctx->hdr.streams[i].asvc, 1);
-			gf_bs_write_int(bs, ctx->hdr.streams[i].bsmod, 3);
-			gf_bs_write_int(bs, ctx->hdr.streams[i].acmod, 3);
-			gf_bs_write_int(bs, ctx->hdr.streams[i].lfon, 1);
-			gf_bs_write_int(bs, 0, 3);
-			gf_bs_write_int(bs, ctx->hdr.streams[i].num_dep_sub, 4);
-			if (ctx->hdr.streams[i].num_dep_sub) {
-				gf_bs_write_int(bs, ctx->hdr.streams[i].chan_loc, 9);
-			} else {
-				gf_bs_write_int(bs, 0, 1);
-			}
-		}
-	} else {
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(GF_CODECID_AC3) );
-
-		gf_bs_write_int(bs, ctx->hdr.streams[0].fscod, 2);
-		gf_bs_write_int(bs, ctx->hdr.streams[0].bsid, 5);
-		gf_bs_write_int(bs, ctx->hdr.streams[0].bsmod, 3);
-		gf_bs_write_int(bs, ctx->hdr.streams[0].acmod, 3);
-		gf_bs_write_int(bs, ctx->hdr.streams[0].lfon, 1);
-		gf_bs_write_int(bs, ctx->hdr.streams[0].brcode, 5);
-		gf_bs_write_int(bs, 0, 5);
-	}
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(ctx->is_eac3 ? GF_CODECID_EAC3 : GF_CODECID_AC3) );
 
-	gf_bs_get_content(bs, &data, &size);
-	gf_bs_del(bs);
+	ctx->hdr.is_ec3 = ctx->is_eac3;
+	gf_odf_ac3_cfg_write(&ctx->hdr, &data, &size);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY(data, size) );
 
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
+
 	if (ctx->is_file && ctx->index) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
 	}
@@ -466,6 +455,8 @@
 
 		if (!ctx->in_seek) {
 			dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->hdr.framesize, &output);
+			if (!dst_pck) return GF_OUT_OF_MEM;
+			
 			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
 
 			memcpy(output, sync, ctx->hdr.framesize);
@@ -485,7 +476,7 @@
 
 		//truncated last frame
 		if (bytes_to_drop>remain) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ADTSDmx] truncated AC3 frame!\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ADTSDmx] truncated AC3 frame!\n"));
 			bytes_to_drop=remain;
 		}
 
@@ -537,13 +528,16 @@
 	Bool has_broken_frames = GF_FALSE;
 	u32 pos=0;
 	while (1) {
-		GF_AC3Header ahdr;
+		GF_AC3Config ahdr;
 		if (! gf_ac3_parser((u8 *) data, size, &pos, &ahdr, GF_FALSE) )
 		 	break;
 		u32 fsize = ahdr.framesize;
 		if (pos) {
 			nb_frames=0;
 			has_broken_frames = GF_TRUE;
+			//what is before is bigger than max ac3 frame size (1920), this is packaged ac3 (mkv) at best
+			if (pos > 2000)
+				break;
 		}
 		nb_frames++;
 		if (fsize > size+pos) break;
@@ -553,7 +547,7 @@
 		data += fsize+pos;
 	}
 	if (nb_frames>2) {
-		*score = has_broken_frames ? GF_FPROBE_MAYBE_SUPPORTED : GF_FPROBE_SUPPORTED;
+		*score = has_broken_frames ? GF_FPROBE_MAYBE_NOT_SUPPORTED : GF_FPROBE_SUPPORTED;
 		return "audio/ac3";
 	}
 	return NULL;
@@ -564,12 +558,18 @@
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "ac3|eac3"),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/x-ac3|audio/ac3|audio/x-eac3|audio/eac3"),
-	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AC3),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_EAC3),
 	CAP_BOOL(GF_CAPS_OUTPUT_STATIC_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	{0},
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AC3),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_EAC3),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_HLS_SAMPLE_AES_SCHEME),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AC3),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_EAC3),
 	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),

gpac-1.0.1.tar.gz/src/filters/reframe_adts.c -> gpac-2.0.0.tar.gz/src/filters/reframe_adts.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / AAC ADTS reframer filter
@@ -58,6 +58,7 @@
 //	Bool mpeg4;
 	Bool ovsbr;
 	Bool expart;
+	s32 aacchcfg;
 
 	//only one input pid declared
 	GF_FilterPid *ipid;
@@ -81,7 +82,7 @@
 	Bool is_playing;
 	Bool is_file, file_loaded;
 	Bool initial_play_done;
-
+	Bool copy_props;
 	GF_FilterPacket *src_pck;
 
 	ADTSIdx *indexes;
@@ -95,6 +96,9 @@
 	u8 *id3_buffer;
 	u32 id3_buffer_size, id3_buffer_alloc;
 	u32 nb_frames;
+
+	GF_M4ADecSpecInfo acfg;
+	u32 bitrate;
 } GF_ADTSDmxCtx;
 
 
@@ -104,6 +108,7 @@
 	u64 pos;
 
 	while (gf_bs_available(bs)>7) {
+		u32 nb_blocks_per_frame;
 		val = gf_bs_read_u8(bs);
 		if (val!=0xFF) continue;
 		val = gf_bs_read_int(bs, 4);
@@ -120,16 +125,36 @@
 		hdr->sr_idx = gf_bs_read_int(bs, 4);
 		gf_bs_read_int(bs, 1);
 		hdr->nb_ch = gf_bs_read_int(bs, 3);
+		//value 1->6 match channel number, value 7 is 7.1
+		if (hdr->nb_ch==7)
+			hdr->nb_ch = 8;
+
 		gf_bs_read_int(bs, 4);
 		hdr->frame_size = gf_bs_read_int(bs, 13);
 		gf_bs_read_int(bs, 11);
-		gf_bs_read_int(bs, 2);
+
+		nb_blocks_per_frame = gf_bs_read_int(bs, 2);
 		hdr->hdr_size = 7;
+
+		if ((!hdr->nb_ch && (nb_blocks_per_frame<2)) || (nb_blocks_per_frame>2)) {
+			hdr->frame_size = 0;
+			gf_bs_seek(bs, pos+1);
+			continue;
+		}
+
 		if (!hdr->no_crc) {
-			gf_bs_read_u16(bs);
-			hdr->hdr_size = 9;
+			u32 skip;
+			if (!nb_blocks_per_frame) {
+				skip = 2;
+			} else {
+				skip = 2 + 2*nb_blocks_per_frame; //and we have 2 bytes per raw_data_block
+			}
+			hdr->hdr_size += skip;
+			gf_bs_skip_bytes(bs, skip);
 		}
+
 		if (!GF_M4ASampleRates[hdr->sr_idx] || (hdr->frame_size < hdr->hdr_size)) {
+			hdr->frame_size = 0;
 			gf_bs_seek(bs, pos+1);
 			continue;
 		}
@@ -145,11 +170,13 @@
 		gf_bs_skip_bytes(bs, hdr->frame_size);
 		val = gf_bs_read_u8(bs);
 		if (val!=0xFF) {
+			hdr->frame_size = 0;
 			gf_bs_seek(bs, pos+1);
 			continue;
 		}
 		val = gf_bs_read_int(bs, 4);
 		if (val!=0x0F) {
+			hdr->frame_size = 0;
 			gf_bs_read_int(bs, 4);
 			gf_bs_seek(bs, pos+1);
 			continue;
@@ -170,7 +197,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -186,6 +216,7 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 		//we don't update copy props on output for now - if we decide we need it, we will need to also force resengin the decoder config
 	}
+	if (ctx->timescale) ctx->copy_props = GF_TRUE;
 
 	return GF_OK;
 }
@@ -195,7 +226,7 @@
 	FILE *stream;
 	GF_BitStream *bs;
 	ADTSHeader hdr;
-	u64 duration, cur_dur;
+	u64 duration, cur_dur, rate;
 	s32 sr_idx = -1;
 	const GF_PropertyValue *p;
 	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
@@ -213,8 +244,12 @@
 	}
 	ctx->is_file = GF_TRUE;
 
-	stream = gf_fopen(p->value.string, "rb");
-	if (!stream) return;
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
 	ctx->index_size = 0;
 
@@ -245,6 +280,7 @@
 
 		gf_bs_skip_bytes(bs, hdr.frame_size);
 	}
+	rate = gf_bs_get_position(bs);
 	gf_bs_del(bs);
 	gf_fclose(stream);
 
@@ -254,32 +290,46 @@
 			ctx->duration.den = GF_M4ASampleRates[sr_idx];
 
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+			if (duration && !gf_sys_is_test_mode() ) {
+				rate *= 8 * ctx->duration.den;
+				rate /= ctx->duration.num;
+				ctx->bitrate = (u32) rate;
+			}
 		}
 	}
 	
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
 	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 }
 
 static void adts_dmx_check_pid(GF_Filter *filter, GF_ADTSDmxCtx *ctx)
 {
 	GF_BitStream *dsi;
-	GF_M4ADecSpecInfo acfg;
+	Bool use_implicit=GF_FALSE;
 	u8 *dsi_b;
 	u32 i, sbr_sr_idx, dsi_s, sr, sbr_sr, codecid, timescale=0;
 
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
-		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		adts_dmx_check_dur(filter, ctx);
 	}
 
 	if ((ctx->sr_idx == ctx->hdr.sr_idx) && (ctx->nb_ch == ctx->hdr.nb_ch)
-		&& (ctx->is_mp2 == ctx->hdr.is_mp2) && (ctx->profile == ctx->hdr.profile) ) return;
+		&& (ctx->is_mp2 == ctx->hdr.is_mp2) && (ctx->profile == ctx->hdr.profile) && !ctx->copy_props) return;
 
 	//copy properties at init or reconfig
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
+	ctx->copy_props = GF_FALSE;
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+
+	if (ctx->duration.num)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+
+	//don't change codec type if reframing an ES (for HLS SAES)
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_AAC_MPEG4));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLES_PER_FRAME, & PROP_UINT(ctx->frame_size) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, & PROP_BOOL(GF_FALSE) );
@@ -287,9 +337,6 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
 	}
 
-	if (ctx->duration.num)
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
-
 
 	ctx->is_mp2 = ctx->hdr.is_mp2;
 	ctx->nb_ch = ctx->hdr.nb_ch;
@@ -299,8 +346,7 @@
 	if (!ctx->timescale) {
 		//we change sample rate, change cts
 		if (ctx->cts && (ctx->sr_idx != ctx->hdr.sr_idx)) {
-			ctx->cts *= sr;
-			ctx->cts /= GF_M4ASampleRates[ctx->sr_idx];
+			ctx->cts = gf_timestamp_rescale(ctx->cts, GF_M4ASampleRates[ctx->sr_idx], sr);
 		}
 	}
 	ctx->sr_idx = ctx->hdr.sr_idx;
@@ -322,9 +368,9 @@
 	dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	ctx->dts_inc = ctx->frame_size;
 
-	sbr_sr = sr;
-	sbr_sr_idx = ctx->hdr.sr_idx;
 	if (!ctx->ovsbr) {
+		sbr_sr = 0;
+		sbr_sr_idx = 0;
 		for (i=0; i<16; i++) {
 			if (GF_M4ASampleRates[i] == (u32) 2*sr) {
 				sbr_sr_idx = i;
@@ -332,71 +378,75 @@
 				break;
 			}
 		}
+	} else {
+		sbr_sr = sr;
+		sbr_sr_idx = ctx->hdr.sr_idx;
+	}
+
+	ctx->acfg.base_object_type = ctx->hdr.profile;
+	ctx->acfg.base_sr = sr;
+	ctx->acfg.base_sr_index = ctx->hdr.sr_idx;
+	ctx->acfg.nb_chan = ctx->hdr.nb_ch;
+	ctx->acfg.sbr_object_type = 0;
+
+	/*explicit PS signal (non backward-compatible), only for stereo ADTS*/
+	if (ctx->acfg.nb_chan<=2) {
+		if (ctx->ps==AAC_SIGNAL_EXPLICIT) {
+			ctx->acfg.base_object_type = 29;
+			ctx->acfg.sbr_object_type = ctx->hdr.profile;
+			ctx->acfg.sbr_sr = sr;
+			ctx->acfg.sbr_sr_index = ctx->acfg.base_sr_index;
+		} else if (ctx->ps==AAC_SIGNAL_IMPLICIT) {
+			use_implicit = GF_TRUE;
+		}
 	}
 
-	memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
-	acfg.base_object_type = ctx->hdr.profile;
-	acfg.base_sr = sr;
-	acfg.nb_chan = gf_m4a_get_channel_cfg(ctx->hdr.nb_ch);
-	acfg.sbr_object_type = 0;
 	if (ctx->sbr==AAC_SIGNAL_EXPLICIT) {
-		acfg.has_sbr = GF_TRUE;
-		acfg.base_object_type = 5;
-		acfg.sbr_object_type = ctx->hdr.profile;
+		//don't overwrite obj type if explicit PS is used
+		if (ctx->acfg.base_object_type != 29)
+			ctx->acfg.base_object_type = 5;
+		ctx->acfg.sbr_object_type = ctx->hdr.profile;
+		ctx->acfg.sbr_sr = sbr_sr;
+		ctx->acfg.sbr_sr_index = sbr_sr_idx;
+	} else if (ctx->sbr==AAC_SIGNAL_IMPLICIT) {
+		sbr_sr = 0;
+		use_implicit = GF_TRUE;
+	} else {
+		sbr_sr = 0;
+	}
+	ctx->acfg.audioPL = gf_m4a_get_profile(&ctx->acfg);
 
-		/*for better interop, always store using full SR when using explict signaling*/
+	/*for better interop, always store using full SR when using explict signaling*/
+	if (sbr_sr) {
 		ctx->dts_inc *= 2;
 		sr = sbr_sr;
-	} else if (ctx->sbr==AAC_SIGNAL_IMPLICIT) {
-		acfg.has_sbr = GF_TRUE;
-	}
-	if (ctx->ps==AAC_SIGNAL_EXPLICIT) {
-		acfg.has_ps = GF_TRUE;
-		acfg.base_object_type = 29;
-	} else if (ctx->ps==AAC_SIGNAL_IMPLICIT) {
-		acfg.has_ps = GF_TRUE;
 	}
 
-	acfg.audioPL = gf_m4a_get_profile(&acfg);
-	/*explicit SBR or PS signal (non backward-compatible)*/
-	if (ctx->ps==AAC_SIGNAL_EXPLICIT) {
-		gf_bs_write_int(dsi, 29, 5);
-		gf_bs_write_int(dsi, ctx->hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, ctx->hdr.nb_ch, 4);
-		gf_bs_write_int(dsi, sbr_sr ? sbr_sr_idx : ctx->hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, ctx->hdr.profile, 5);
-	}
-	/*explicit SBR signal (non backward-compatible)*/
-	else if (ctx->sbr==AAC_SIGNAL_EXPLICIT) {
-		gf_bs_write_int(dsi, 5, 5);
-		gf_bs_write_int(dsi, ctx->hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, ctx->hdr.nb_ch, 4);
-		gf_bs_write_int(dsi, sbr_sr ? sbr_sr_idx : ctx->hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, ctx->hdr.profile, 5);
-	} else {
-		/*regular AAC*/
-		gf_bs_write_int(dsi, ctx->hdr.profile, 5);
-		gf_bs_write_int(dsi, ctx->hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, ctx->hdr.nb_ch, 4);
-		gf_bs_align(dsi);
+	gf_m4a_write_config_bs(dsi, &ctx->acfg);
+	gf_bs_align(dsi);
+
+	//implicit signaling, not written by gf_m4a_write_config_bs
+	if (use_implicit) {
+		gf_bs_write_int(dsi, 0x2b7, 11); /*sync extension type*/
+		gf_bs_write_int(dsi, 5, 5);	/*audio objectType*/
 		/*implicit AAC SBR signal*/
 		if (ctx->sbr==AAC_SIGNAL_IMPLICIT) {
-			gf_bs_write_int(dsi, 0x2b7, 11); /*sync extension type*/
-			gf_bs_write_int(dsi, 5, 5);	/*SBR objectType*/
 			gf_bs_write_int(dsi, 1, 1);	/*SBR present flag*/
 			gf_bs_write_int(dsi, sbr_sr_idx, 4);
+		} else {
+			gf_bs_write_int(dsi, 0, 1);	/*SBR present flag*/
 		}
 		if (ctx->ps==AAC_SIGNAL_IMPLICIT) {
 			gf_bs_write_int(dsi, 0x548, 11); /*sync extension type*/
 			gf_bs_write_int(dsi, 1, 1);	/* PS present flag */
 		}
+		gf_bs_align(dsi);
 	}
-	gf_bs_align(dsi);
 
 	gf_bs_get_content(dsi, &dsi_b, &dsi_s);
 	gf_bs_del(dsi);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY(dsi_b, dsi_s) );
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PROFILE_LEVEL, & PROP_UINT (acfg.audioPL) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PROFILE_LEVEL, & PROP_UINT (ctx->acfg.audioPL) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, & PROP_UINT(sr));
 
 	timescale = sr;
@@ -405,6 +455,10 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : timescale));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, & PROP_UINT(ctx->nb_ch) );
 
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
+
 	if (ctx->id3_buffer_size) {
 		id3dmx_flush(filter, ctx->id3_buffer, ctx->id3_buffer_size, ctx->opid, ctx->expart ? &ctx->vpid : NULL);
 		ctx->id3_buffer_size = 0;
@@ -573,7 +627,7 @@
 
 	while (remain) {
 		u8 *sync;
-		u32 sync_pos, size, offset, bytes_to_drop=0;
+		u32 sync_pos, size, offset, bytes_to_drop=0, nb_blocks_per_frame;
 
 		if (!ctx->tag_size && (remain>3)) {
 
@@ -623,7 +677,7 @@
 
 		//not sync !
 		if ((sync[1] & 0xF0) != 0xF0) {
-			GF_LOG(ctx->nb_frames ? GF_LOG_WARNING : GF_LOG_DEBUG, GF_LOG_PARSER, ("[ADTSDmx] invalid ADTS sync bytes, resyncing\n"));
+			GF_LOG(ctx->nb_frames ? GF_LOG_WARNING : GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ADTSDmx] invalid ADTS sync bytes, resyncing\n"));
 			ctx->nb_frames = 0;
 			goto drop_byte;
 		}
@@ -649,28 +703,66 @@
 		ctx->hdr.sr_idx = gf_bs_read_int(ctx->bs, 4);
 		gf_bs_read_int(ctx->bs, 1);
 		ctx->hdr.nb_ch = gf_bs_read_int(ctx->bs, 3);
+
 		gf_bs_read_int(ctx->bs, 4);
 		ctx->hdr.frame_size = gf_bs_read_int(ctx->bs, 13);
 		gf_bs_read_int(ctx->bs, 11);
-		gf_bs_read_int(ctx->bs, 2);
+		nb_blocks_per_frame = gf_bs_read_int(ctx->bs, 2);
 		ctx->hdr.hdr_size = 7;
 
 		if (!ctx->hdr.no_crc) {
-			ctx->hdr.hdr_size = 9;
+			u32 skip;
+			if (!nb_blocks_per_frame) {
+				skip = 2;
+			} else {
+				skip = 2 + 2*nb_blocks_per_frame; //and we have 2 bytes per raw_data_block
+			}
+			ctx->hdr.hdr_size += skip;
+			gf_bs_skip_bytes(ctx->bs, skip);
 		}
 
-		if (!ctx->hdr.frame_size || !GF_M4ASampleRates[ctx->hdr.sr_idx] || !ctx->hdr.nb_ch) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[ADTSDmx] invalid ADTS frame header, resyncing\n"));
+		if (!ctx->hdr.frame_size || !GF_M4ASampleRates[ctx->hdr.sr_idx]) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ADTSDmx] Invalid ADTS frame header, resyncing\n"));
 			ctx->nb_frames = 0;
 			goto drop_byte;
 		}
+		if ((nb_blocks_per_frame>2) || (nb_blocks_per_frame && ctx->hdr.nb_ch)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ADTSDmx] Unsupported multi-block ADTS frame header - patch welcome\n"));
+			ctx->nb_frames = 0;
+			goto drop_byte;
+		} else if (!nb_blocks_per_frame) {
+			if (ctx->aacchcfg<0)
+				ctx->hdr.nb_ch = -ctx->aacchcfg;
+			else if (!ctx->hdr.nb_ch)
+				ctx->hdr.nb_ch = ctx->aacchcfg;
+
+			if (!ctx->hdr.nb_ch) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ADTSDmx] Missing channel configuration in ADTS frame header, defaulting to stereo - use `--aacchcfg` to force config\n"));
+				ctx->hdr.nb_ch = ctx->aacchcfg = 2;
+			}
+		}
+
+		if (nb_blocks_per_frame==2) {
+			u32 pos = (u32) gf_bs_get_position(ctx->bs);
+			gf_m4a_parse_program_config_element(ctx->bs, &ctx->acfg);
+			if (!ctx->hdr.no_crc)
+				gf_bs_skip_bytes(ctx->bs, 2); //per block CRC
 
-		//ready to send packet
-		if (ctx->hdr.frame_size + 1 < remain) {
+			ctx->hdr.hdr_size += (u32) gf_bs_get_position(ctx->bs) - pos;
+			ctx->hdr.nb_ch = ctx->acfg.nb_chan;
+		}
+		//value 1->6 match channel number, value 7 is 7.1
+		if (ctx->hdr.nb_ch==7)
+			ctx->hdr.nb_ch = 8;
+
+
+		//ready to send packet, check what we have in frame_size is a sync word
+		//if not enough bytes, store and wait
+		if (ctx->hdr.frame_size + sync_pos + 1 < remain) {
 			u32 next_frame = ctx->hdr.frame_size;
 			//make sure we are sync!
 			if ((sync[next_frame] !=0xFF) || ((sync[next_frame+1] & 0xF0) !=0xF0) ) {
-				GF_LOG(ctx->nb_frames ? GF_LOG_WARNING : GF_LOG_DEBUG, GF_LOG_PARSER, ("[ADTSDmx] invalid next ADTS frame sync, resyncing\n"));
+				GF_LOG(ctx->nb_frames ? GF_LOG_WARNING : GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ADTSDmx] invalid next ADTS frame sync, resyncing\n"));
 				ctx->nb_frames = 0;
 				goto drop_byte;
 			}
@@ -683,6 +775,12 @@
 			break;
 		}
 
+		if (ctx->hdr.frame_size < ctx->hdr.hdr_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ADTSDmx] Corrupted ADTS frame header, resyncing\n"));
+			ctx->nb_frames = 0;
+			goto drop_byte;
+		}
+
 		adts_dmx_check_pid(filter, ctx);
 
 		if (!ctx->is_playing) {
@@ -693,6 +791,9 @@
 		ctx->nb_frames++;
 		size = ctx->hdr.frame_size - ctx->hdr.hdr_size;
 		offset = ctx->hdr.hdr_size;
+		//per raw-block CRC
+		if ((nb_blocks_per_frame==2) && !ctx->hdr.no_crc)
+			size -= 2;
 
 		if (ctx->in_seek) {
 			u64 nb_samples_at_seek = (u64) (ctx->start_range * GF_M4ASampleRates[ctx->sr_idx]);
@@ -710,9 +811,11 @@
 
 		if (!ctx->in_seek) {
 			dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+			if (!dst_pck) return GF_OUT_OF_MEM;
 			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
 
 			memcpy(output, sync + offset, size);
+
 			gf_filter_pck_set_dts(dst_pck, ctx->cts);
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);
 			gf_filter_pck_set_duration(dst_pck, ctx->dts_inc);
@@ -730,7 +833,7 @@
 
 		//truncated last frame
 		if (bytes_to_drop>remain) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ADTSDmx] truncated ADTS frame!\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ADTSDmx] truncated ADTS frame %d bytes but only %d left!\n", bytes_to_drop, remain));
 			bytes_to_drop=remain;
 		}
 
@@ -775,6 +878,7 @@
 	if (ctx->indexes) gf_free(ctx->indexes);
 	if (ctx->adts_buffer) gf_free(ctx->adts_buffer);
 	if (ctx->id3_buffer) gf_free(ctx->id3_buffer);
+	if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
 }
 
 static const char *adts_dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
@@ -815,9 +919,12 @@
 			break;
 		}
 		if ((hdr.hdr_size!=7) && (hdr.hdr_size!=9)) continue;
-		if (!hdr.nb_ch) continue;
+//		if (!hdr.nb_ch) continue;
 		pos = (u32) gf_bs_get_position(bs);
-		if ((next_pos + hdr.hdr_size == pos) && (hdr.sr_idx==prev_hdr.sr_idx) && (hdr.nb_ch==prev_hdr.nb_ch) ) {
+
+		if (!nb_frames) {
+			nb_frames = 1;
+		} else if ((next_pos + hdr.hdr_size == pos) && (hdr.sr_idx==prev_hdr.sr_idx) && (hdr.nb_ch==prev_hdr.nb_ch) ) {
 			nb_frames++;
 			if (max_consecutive_frames<nb_frames) max_consecutive_frames = nb_frames;
 			if (max_consecutive_frames>5)
@@ -832,7 +939,7 @@
 	}
 	gf_bs_del(bs);
 	if (max_consecutive_frames>=4) {
-		*score = has_broken_data ? GF_FPROBE_MAYBE_SUPPORTED : GF_FPROBE_SUPPORTED;
+		*score = has_broken_data ? GF_FPROBE_MAYBE_NOT_SUPPORTED : GF_FPROBE_SUPPORTED;
 		return "audio/aac";
 	}
 	if (has_id3 && max_consecutive_frames) {
@@ -847,7 +954,7 @@
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "aac|adts"),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/x-m4a|audio/aac|audio/aacp|audio/x-aac"),
-	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG4),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_MP),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_LCP),
@@ -855,9 +962,16 @@
 	//we explitely set this one to prevent adts->latm reframer connection
 	CAP_BOOL(GF_CAPS_OUTPUT_STATIC_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	{0},
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG4),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_UNFRAMED_LATM, GF_TRUE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_HLS_SAMPLE_AES_SCHEME),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG4),
 	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED_LATM, GF_TRUE)
 };
 
 
@@ -868,17 +982,18 @@
 	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
 //	{ OFFS(mpeg4), "force signaling as MPEG-4 AAC", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ovsbr), "force oversampling SBR (does not multiply timescales by 2)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(sbr), "set SBR signaling\n"\
-				"- no: no SBR signaling at all\n"\
-				"- imp: backward-compatible SBR signaling (audio signaled as AAC-LC)\n"\
-				"- exp: explicit SBR signaling (audio signaled as AAC-SBR)"\
+	{ OFFS(sbr), "set SBR signaling\n"
+				"- no: no SBR signaling at all\n"
+				"- imp: backward-compatible SBR signaling (audio signaled as AAC-LC)\n"
+				"- exp: explicit SBR signaling (audio signaled as AAC-SBR)"
 				, GF_PROP_UINT, "no", "no|imp|exp", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(ps), "set PS signaling\n"\
-				"- no: no PS signaling at all\n"\
-				"- imp: backward-compatible PS signaling (audio signaled as AAC-LC)\n"\
-				"- exp: explicit PS signaling (audio signaled as AAC-PS)"\
+	{ OFFS(ps), "set PS signaling\n"
+				"- no: no PS signaling at all\n"
+				"- imp: backward-compatible PS signaling (audio signaled as AAC-LC)\n"
+				"- exp: explicit PS signaling (audio signaled as AAC-PS)"
 				, GF_PROP_UINT, "no", "no|imp|exp", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(expart), "expose pictures as a dedicated video pid", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(expart), "expose pictures as a dedicated video PID", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(aacchcfg), "set AAC channel configuration to this value if missing from ADTS header, use negative value to always override", GF_PROP_SINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };

gpac-1.0.1.tar.gz/src/filters/reframe_amr.c -> gpac-2.0.0.tar.gz/src/filters/reframe_amr.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / AMR&EVRC&SMV reframer filter
@@ -45,7 +45,7 @@
 	u32 start_offset;
 	u32 codecid, sample_rate, block_size;
 
-
+	u32 bitrate;
 	u64 file_pos, cts;
 
 	u16 amr_mode_set;
@@ -77,7 +77,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -115,7 +118,7 @@
 {
 	FILE *stream;
 	u32 i;
-	u64 duration, cur_dur;
+	u64 duration, cur_dur, rate;
 	char magic[20];
 	const GF_PropertyValue *p;
 	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
@@ -133,8 +136,12 @@
 	}
 	ctx->is_file = GF_TRUE;
 
-	stream = gf_fopen(p->value.string, "rb");
-	if (!stream) return;
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
 	ctx->codecid = GF_CODECID_NONE;
 	ctx->start_offset = 6;
@@ -211,6 +218,7 @@
 		}
 		if (size) gf_fseek(stream, size, SEEK_CUR);
 	}
+	rate = gf_ftell(stream);
 	gf_fclose(stream);
 
 	if (!ctx->duration.num || (ctx->duration.num  * ctx->sample_rate != duration * ctx->duration.den)) {
@@ -218,6 +226,12 @@
 		ctx->duration.den = ctx->sample_rate;
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+		if (duration && !gf_sys_is_test_mode() ) {
+			rate *= 8 * ctx->duration.den;
+			rate /= ctx->duration.num;
+			ctx->bitrate = (u32) rate;
+		}
 	}
 
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
@@ -247,6 +261,10 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLES_PER_FRAME, & PROP_UINT(ctx->block_size ) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AMR_MODE_SET, & PROP_UINT(ctx->amr_mode_set));
 
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
+
 	if (ctx->is_file && ctx->index) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
 	}
@@ -370,6 +388,7 @@
 		}
 		if (! ctx->in_seek) {
 			dst_pck = gf_filter_pck_new_alloc(ctx->opid, to_send, &output);
+			if (!dst_pck) return GF_OUT_OF_MEM;
 			memcpy(output, data, to_send);
 
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);
@@ -433,7 +452,7 @@
 
 		toc = start[0];
 		if (!toc) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[AMRDmx] Could not find TOC word in packet, droping\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[AMRDmx] Could not find TOC word in packet, dropping\n"));
 			break;
 		}
 		switch (ctx->codecid) {
@@ -490,6 +509,7 @@
 		}
 		if (!ctx->in_seek) {
 			dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+			if (!dst_pck) return GF_OUT_OF_MEM;
 
 			memcpy(output, start, size);

gpac-1.0.1.tar.gz/src/filters/reframe_av1.c -> gpac-2.0.0.tar.gz/src/filters/reframe_av1.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Romain Bouqueau, Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2019
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / AV1 IVF/OBU/annexB reframer filter
@@ -50,8 +50,10 @@
 	GF_Fraction fps;
 	Double index;
 	Bool importer;
-	Bool deps;
+	Bool deps, notime, temporal_delim;
 	
+	u32 bsdbg;
+
 	//only one input pid declared
 	GF_FilterPid *ipid;
 	//only one output pid declared
@@ -80,6 +82,7 @@
 	Bool is_vp9;
 	Bool is_vpX;
 	u32 codecid;
+	u32 num_frames;
 	GF_VPConfig *vp_cfg;
 
 	Bool is_playing;
@@ -96,6 +99,10 @@
 
 	Bool pts_from_file;
 	u64 cumulated_dur, last_pts;
+	u32 bitrate;
+
+	u32 clli_crc, mdcv_crc;
+	Bool copy_props;
 } GF_AV1DmxCtx;
 
 
@@ -106,7 +113,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -121,10 +131,16 @@
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 	}
-	if (ctx->timescale) {
+
+	//if source has no timescale, recompute time
+	if (!ctx->timescale) {
+		ctx->notime = GF_TRUE;
+	} else {
 		//if we have a FPS prop, use it
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
 		if (p) ctx->cur_fps = p->value.frac;
+
+		ctx->copy_props = GF_TRUE;
 	}
 	return GF_OK;
 }
@@ -153,10 +169,10 @@
 	ctx->pts_from_file = GF_FALSE;
 	if (gf_media_probe_ivf(bs)) {
 		u32 width = 0, height = 0;
-		u32 codec_fourcc = 0, frame_rate = 0, time_scale = 0, num_frames = 0;
+		u32 codec_fourcc = 0, timebase_den = 0, timebase_num = 0, num_frames = 0;
 		ctx->bsmode = IVF;
 
-		e = gf_media_parse_ivf_file_header(bs, &width, &height, &codec_fourcc, &frame_rate, &time_scale, &num_frames);
+		e = gf_media_parse_ivf_file_header(bs, &width, &height, &codec_fourcc, &timebase_num, &timebase_den, &num_frames);
 		if (e) return e;
 
 		switch (codec_fourcc) {
@@ -176,11 +192,11 @@
 		case GF_4CC('V', 'P', '1', '0'):
 			ctx->codecid = GF_CODECID_VP10;
 			ctx->vp_cfg = gf_odf_vp_cfg_new();
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[IVF] %s parsing not implemented, import might be uncomplete or broken\n", gf_4cc_to_str(codec_fourcc) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[IVF] %s parsing not implemented, import might be uncomplete or broken\n", gf_4cc_to_str(codec_fourcc) ));
 			break;
 		default:
 			ctx->codecid = codec_fourcc;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[IVF] Unsupported codec FourCC %s\n", gf_4cc_to_str(codec_fourcc) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[IVF] Unsupported codec FourCC %s\n", gf_4cc_to_str(codec_fourcc) ));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		if (ctx->vp_cfg && !ctx->is_vp9) {
@@ -193,38 +209,43 @@
 
 		ctx->state.width = ctx->state.width < width ? width : ctx->state.width;
 		ctx->state.height = ctx->state.height < height ? height : ctx->state.height;
-		ctx->state.tb_num = frame_rate; //time_base.numerator
-		ctx->state.tb_den = time_scale; //time_base.denominator
+		ctx->state.tb_num = timebase_num;
+		ctx->state.tb_den = timebase_den;
+		ctx->num_frames = num_frames;
 
 		if ((!ctx->fps.num || !ctx->fps.den) && ctx->state.tb_num && ctx->state.tb_den && ! ( (ctx->state.tb_num<=1) && (ctx->state.tb_den<=1) ) ) {
 			ctx->cur_fps.num = ctx->state.tb_num;
 			ctx->cur_fps.den = ctx->state.tb_den;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[AV1Dmx] Detected IVF format FPS %d/%d\n", ctx->cur_fps.num, ctx->cur_fps.den));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[AV1Dmx] Detected IVF format FPS %d/%d\n", ctx->cur_fps.num, ctx->cur_fps.den));
 			ctx->pts_from_file = GF_TRUE;
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[AV1Dmx] Detected IVF format\n"));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[AV1Dmx] Detected IVF format\n"));
 		}
 		ctx->file_hdr_size = (u32) gf_bs_get_position(bs);
 		if (last_obu_end) (*last_obu_end) = (u32) gf_bs_get_position(bs);
 		return GF_OK;
 	} else if (gf_media_aom_probe_annexb(bs)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1Dmx] Detected Annex B format\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[AV1Dmx] Detected Annex B format\n"));
 		ctx->bsmode = AnnexB;
 	} else {
 		gf_bs_seek(bs, 0);
 		e = aom_av1_parse_temporal_unit_from_section5(bs, &ctx->state);
 		if (e && !gf_list_count(ctx->state.frame_state.frame_obus) ) {
+			if (e==GF_BUFFER_TOO_SMALL) {
+				gf_av1_reset_state(&ctx->state, GF_FALSE);
+				return GF_BUFFER_TOO_SMALL;
+			}
 			gf_filter_setup_failure(filter, e);
 			ctx->bsmode = UNSUPPORTED;
 			return e;
 		}
 		if (ctx->state.obu_type != OBU_TEMPORAL_DELIMITER) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AV1Dmx] Error OBU stream start with %s, not a temporal delimiter - NOT SUPPORTED\n", gf_av1_get_obu_name(ctx->state.obu_type) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[AV1Dmx] Error OBU stream start with %s, not a temporal delimiter - NOT SUPPORTED\n", gf_av1_get_obu_name(ctx->state.obu_type) ));
 			gf_filter_setup_failure(filter, e);
 			ctx->bsmode = UNSUPPORTED;
 			return e;
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1Dmx] Detected OBUs Section 5 format\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[AV1Dmx] Detected OBUs Section 5 format\n"));
 		ctx->bsmode = OBUs;
 
 		gf_av1_reset_state(&ctx->state, GF_FALSE);
@@ -242,7 +263,7 @@
 	FILE *stream;
 	GF_Err e;
 	GF_BitStream *bs;
-	u64 duration, cur_dur, last_cdur;
+	u64 duration, cur_dur, last_cdur, rate, max_pts, last_pts;
 	AV1State av1state;
 	const char *filepath=NULL;
 	const GF_PropertyValue *p;
@@ -261,18 +282,26 @@
 	ctx->is_file = GF_TRUE;
 
 	if (ctx->index<0) {
-		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
-		if (!p || (p->value.longuint > 100000000)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[AV1/VP9] Source file larger than 100M, skipping indexing\n"));
+		if (gf_opts_get_bool("temp", "force_indexing")) {
+			ctx->index = 1.0;
 		} else {
-			ctx->index = -ctx->index;
+			p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
+			if (!p || (p->value.longuint > 20000000)) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[AV1/VP9] Source file larger than 20M, skipping indexing\n"));
+			} else {
+				ctx->index = -ctx->index;
+			}
 		}
 	}
 	if (ctx->index<=0)
 		return;
 
-	stream = gf_fopen(filepath, "rb");
-	if (!stream) return;
+	stream = gf_fopen_ex(filepath, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
 	ctx->index_size = 0;
 
@@ -285,6 +314,7 @@
 	av1state.skip_frames = GF_TRUE;
 	av1state.config = gf_odf_av1_cfg_new();
 
+	max_pts = last_pts = 0;
 	duration = 0;
 	cur_dur = last_cdur = 0;
 	while (gf_bs_available(bs)) {
@@ -318,8 +348,14 @@
 		 	break;
 
 		if (pts != GF_FILTER_NO_TS) {
+			if (pts + max_pts < last_pts) {
+				max_pts = last_pts + ctx->cur_fps.den;
+			}
+			pts += max_pts;
 			duration = pts;
 			cur_dur = pts - last_cdur;
+
+			last_pts = pts;
 		} else {
 			duration += ctx->cur_fps.den;
 			cur_dur += ctx->cur_fps.den;
@@ -340,6 +376,7 @@
 			cur_dur = 0;
 		}
 	}
+	rate = gf_bs_get_position(bs);
 	gf_bs_del(bs);
 	gf_fclose(stream);
 	gf_odf_av1_cfg_del(av1state.config);
@@ -350,11 +387,13 @@
 		ctx->duration.den = ctx->cur_fps.num;
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
-	}
 
-	//currently not supported because of OBU size field rewrite - could work on some streams but we would
-	//need to analyse all OBUs in the stream for that
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_FALSE) );
+		if (ctx->duration.num && (!gf_sys_is_test_mode() || gf_opts_get_bool("temp", "force_indexing"))) {
+			rate *= 8 * ctx->duration.den;
+			rate /= ctx->duration.num;
+			ctx->bitrate = (u32) rate;
+		}
+	}
 }
 
 
@@ -384,7 +423,7 @@
 				ctx->index = -ctx->index;
 				ctx->file_loaded = GF_FALSE;
 				ctx->duration.den = ctx->duration.num = 0;
-				GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[AV1/VP9Demx] Play request from %d, building index\n", ctx->start_range));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[AV1/VP9Demx] Play request from %d, building index\n", ctx->start_range));
 				av1dmx_check_dur(filter, ctx);
 			}
 
@@ -434,7 +473,7 @@
 	assert(ctx->cur_fps.num);
 	assert(ctx->cur_fps.den);
 
-	if (ctx->timescale) {
+	if (!ctx->notime) {
 		u64 inc = ctx->cur_fps.den;
 		inc *= ctx->timescale;
 		inc /= ctx->cur_fps.num;
@@ -444,6 +483,39 @@
 	}
 }
 
+static void av1dmx_set_mdcv(GF_AV1DmxCtx *ctx, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	u32 i;
+	u64 val;
+	u8 rw_mdcv[24];
+	GF_BitStream *bs_r = gf_bs_new(ctx->state.mdcv_data, 24, GF_BITSTREAM_READ);
+	GF_BitStream *bs_w = gf_bs_new(rw_mdcv, 24, GF_BITSTREAM_WRITE);
+
+	//3x{display_primaries_x, display_primaries_y} + whitePoint_x + whitePoint_y
+	//translate from AV1 representation 0.16 float to MPEG in increments of 0.00002 (1/50000)
+	for (i=0; i<8; i++) {
+		val = gf_bs_read_u16(bs_r);
+		val = (50000 * val) / 65536;
+		gf_bs_write_u16(bs_w, (u32) val);
+	}
+	//max_display_mastering_luminance: 24.8 fixed point in AV1 vs increments of 0.0001 (1/10000) candelas per square metre in MPEG
+	val = gf_bs_read_u32(bs_r);
+	val = (10000 * val) / 256;
+	gf_bs_write_u32(bs_w, (u32) val);
+
+	//min_display_mastering_luminance: 18.14 fixed point in AV1 vs increments of 0.0001 (1/10000) candelas per square metre in MPEG
+	val = gf_bs_read_u32(bs_r);
+	val = (10000 * val) / 16384;
+	gf_bs_write_u32(bs_w, (u32) val);
+	gf_bs_del(bs_r);
+	gf_bs_del(bs_w);
+
+	if (pid) {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_MASTER_DISPLAY_COLOUR, &PROP_DATA(rw_mdcv, 24));
+	} else if (pck) {
+		gf_filter_pck_set_property(pck, GF_PROP_PID_MASTER_DISPLAY_COLOUR, &PROP_DATA(rw_mdcv, 24));
+	}
+}
 static void av1dmx_check_pid(GF_Filter *filter, GF_AV1DmxCtx *ctx)
 {
 	u8 *dsi;
@@ -459,8 +531,10 @@
 	dsi = NULL;
 	dsi_size = 0;
 
+	crc = 0;
 	if (ctx->vp_cfg) {
 		gf_odf_vp_cfg_write(ctx->vp_cfg, &dsi, &dsi_size, ctx->vp_cfg->codec_initdata_size ? GF_TRUE : GF_FALSE);
+		crc = gf_crc_32(dsi, dsi_size);
 	} else if (ctx->is_av1) {
 		//first or config changed, compute dsi
 		while (gf_list_count(ctx->state.config->obu_array)) {
@@ -474,6 +548,9 @@
 			GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*) gf_list_get(ctx->state.frame_state.header_obus, 0);
 			gf_list_add(ctx->state.config->obu_array, a);
 			gf_list_rem(ctx->state.frame_state.header_obus, 0);
+			if (a->obu_type == OBU_SEQUENCE_HEADER) {
+				crc = gf_crc_32(a->obu, (u32) a->obu_length);
+			}
 		}
 		gf_odf_av1_cfg_write(ctx->state.config, &dsi, &dsi_size);
 
@@ -481,11 +558,13 @@
 			ctx->cur_fps.num = ctx->state.tb_num;
 			ctx->cur_fps.den = ctx->state.tb_den;
 		}
-
+		if (!crc) {
+			gf_free(dsi);
+			return;
+		}
 	}
-	crc = gf_crc_32(dsi, dsi_size);
 
-	if (crc == ctx->dsi_crc) {
+	if ((crc == ctx->dsi_crc) && !ctx->copy_props) {
 		gf_free(dsi);
 		return;
 	}
@@ -493,31 +572,72 @@
 
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+	ctx->copy_props = GF_FALSE;
+
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(GF_STREAM_VISUAL));
 
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(ctx->codecid));
 
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->cur_fps.num));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, & PROP_UINT(ctx->state.width));
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT(ctx->state.height));
+	if (ctx->state.sequence_width && ctx->state.sequence_height) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, & PROP_UINT(ctx->state.sequence_width));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT(ctx->state.sequence_height));
+	} else {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, & PROP_UINT(ctx->state.width));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT(ctx->state.height));
+	}
 
 	if (ctx->duration.num)
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
 
+	//currently not supported because of OBU size field rewrite - could work on some streams but we would
+	//need to analyse all OBUs in the stream for that
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, NULL );
+
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
+
 	if (dsi && dsi_size)
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY(dsi, dsi_size));
 
 	if (ctx->is_file && ctx->index) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
 	}
+	if (ctx->num_frames) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NB_FRAMES, & PROP_UINT(ctx->num_frames) );
+	}
 
+	ctx->clli_crc = 0;
+	ctx->mdcv_crc = 0;
 	if (ctx->is_av1) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_PRIMARIES, & PROP_UINT(ctx->state.color_primaries) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_TRANSFER, & PROP_UINT(ctx->state.transfer_characteristics) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, & PROP_UINT(ctx->state.matrix_coefficients) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, & PROP_BOOL(ctx->state.color_range) );
+
+
+		if (ctx->state.clli_valid) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CONTENT_LIGHT_LEVEL, &PROP_DATA(ctx->state.clli_data, 4));
+			ctx->clli_crc = gf_crc_32(ctx->state.clli_data, 4);
+		}
+		if (ctx->state.mdcv_valid) {
+			av1dmx_set_mdcv(ctx, ctx->opid, NULL);
+			ctx->mdcv_crc = gf_crc_32(ctx->state.mdcv_data, 24);
+		}
+
+	}
+	//disabled for the time being, matchin `colr` box will be injected by mp43mx if needed
+	//check vpX specs to see if always needed
+#if 0
+	else if (ctx->vp_cfg) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_PRIMARIES, & PROP_UINT(ctx->vp_cfg->colour_primaries) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_TRANSFER, & PROP_UINT(ctx->vp_cfg->transfer_characteristics) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, & PROP_UINT(ctx->vp_cfg->matrix_coefficients) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, & PROP_BOOL(ctx->vp_cfg->video_fullRange_flag) );
 	}
+#endif
 }
 
 GF_Err av1dmx_parse_ivf(GF_Filter *filter, GF_AV1DmxCtx *ctx)
@@ -543,7 +663,7 @@
 		pts += ctx->cumulated_dur;
 		if (ctx->last_pts && (ctx->last_pts>pts)) {
 			pts -= ctx->cumulated_dur;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[IVF/AV1] Corrupted timestamp "LLU" less than previous timestamp "LLU", assuming concatenation\n", pts, ctx->last_pts));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[IVF/AV1] Corrupted timestamp "LLU" less than previous timestamp "LLU", assuming concatenation\n", pts, ctx->last_pts));
 			ctx->cumulated_dur = ctx->last_pts + ctx->cur_fps.den;
 			ctx->cumulated_dur -= pts;
 			pts = ctx->cumulated_dur;
@@ -606,6 +726,10 @@
 	pos_ivf_hdr = gf_bs_get_position(ctx->bs);
 	e = gf_media_parse_ivf_frame_header(ctx->bs, &frame_size, &pts);
 	if (e) return e;
+	if (!frame_size) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[IVF/VP9] Corrupted frame header !\n"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
 
 	pos = gf_bs_get_position(ctx->bs);
 	if (gf_bs_available(ctx->bs) < frame_size) {
@@ -617,7 +741,7 @@
 		pts += ctx->cumulated_dur;
 		if (ctx->last_pts && (ctx->last_pts>pts)) {
 			pts -= ctx->cumulated_dur;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[IVF/VP9] Corrupted timestamp "LLU" less than previous timestamp "LLU", assuming concatenation\n", pts, ctx->last_pts));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[IVF/VP9] Corrupted timestamp "LLU" less than previous timestamp "LLU", assuming concatenation\n", pts, ctx->last_pts));
 			ctx->cumulated_dur = ctx->last_pts + ctx->cur_fps.den;
 			ctx->cumulated_dur -= pts;
 			pts = ctx->cumulated_dur;
@@ -626,35 +750,35 @@
 	}
 
 	/*check if it is a superframe*/
-	e = gf_media_vp9_parse_superframe(ctx->bs, frame_size, &num_frames_in_superframe, frame_sizes, &superframe_index_size);
+	e = gf_vp9_parse_superframe(ctx->bs, frame_size, &num_frames_in_superframe, frame_sizes, &superframe_index_size);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VP9Dmx] Error parsing superframe structure\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VP9Dmx] Error parsing superframe structure\n"));
 		return e;
 	}
 
 	for (i = 0; i < num_frames_in_superframe; ++i) {
 		u64 pos2 = gf_bs_get_position(ctx->bs);
-		if (gf_media_vp9_parse_sample(ctx->bs, ctx->vp_cfg, &key_frame, &width, &height, &renderWidth, &renderHeight) != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VP9Dmx] Error parsing frame\n"));
+		if (gf_vp9_parse_sample(ctx->bs, ctx->vp_cfg, &key_frame, &width, &height, &renderWidth, &renderHeight) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VP9Dmx] Error parsing frame\n"));
 			return e;
 		}
 		e = gf_bs_seek(ctx->bs, pos2 + frame_sizes[i]);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[VP9Dmx] Seek bad param (offset "LLU") (1)", pos2 + frame_sizes[i]));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VP9Dmx] Seek bad param (offset "LLU") (1)", pos2 + frame_sizes[i]));
 			return e;
 		}
 	}
 	if (gf_bs_get_position(ctx->bs) + superframe_index_size != pos + frame_size) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[VP9Dmx] Inconsistent IVF frame size of "LLU" bytes.\n", frame_size));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, (" Detected %d frames (+ %d bytes for the superframe index):\n", num_frames_in_superframe, superframe_index_size));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[VP9Dmx] Inconsistent IVF frame size of "LLU" bytes.\n", frame_size));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, (" Detected %d frames (+ %d bytes for the superframe index):\n", num_frames_in_superframe, superframe_index_size));
 		for (i = 0; i < num_frames_in_superframe; ++i) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, (" superframe %d, size is %u bytes\n", i, frame_sizes[i]));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, (" superframe %d, size is %u bytes\n", i, frame_sizes[i]));
 		}
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("\n"));
 	}
 	e = gf_bs_seek(ctx->bs, pos + frame_size);
 	if (e) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[VP9Dmx] Seek bad param (offset "LLU") (2)", pos + frame_size));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[VP9Dmx] Seek bad param (offset "LLU") (2)", pos + frame_size));
 		return e;
 	}
 
@@ -714,19 +838,25 @@
 
 static GF_Err av1dmx_parse_flush_sample(GF_Filter *filter, GF_AV1DmxCtx *ctx)
 {
-	u32 pck_size;
-	GF_FilterPacket *pck;
-	u8 *output;
+	u32 pck_size = 0;
+	GF_FilterPacket *pck = NULL;
+	u8 *output = NULL;
 
+	if (!ctx->opid)
+		return GF_NON_COMPLIANT_BITSTREAM;
+		
 	gf_bs_get_content_no_truncate(ctx->state.bs, &ctx->state.frame_obus, &pck_size, &ctx->state.frame_obus_alloc);
 
 	if (!pck_size) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1Dmx] no frame OBU, skipping OBU\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[AV1Dmx] no frame OBU, skipping OBU\n"));
 		return GF_OK;
 	}
 
 	pck = gf_filter_pck_new_alloc(ctx->opid, pck_size, &output);
-	if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, pck);
+	if (!pck) return GF_OUT_OF_MEM;
+
+	if (ctx->src_pck)
+		gf_filter_pck_merge_properties(ctx->src_pck, pck);
 
 	gf_filter_pck_set_cts(pck, ctx->cts);
 	gf_filter_pck_set_sap(pck, ctx->state.frame_state.key_frame ? GF_FILTER_SAP_1 : 0);
@@ -746,6 +876,19 @@
 	 	gf_filter_pck_set_dependency_flags(pck, flags);
 	}
 
+	if (ctx->state.clli_valid) {
+		u32 crc = gf_crc_32(ctx->state.clli_data, 4);
+		if (crc != ctx->clli_crc) {
+			gf_filter_pck_set_property(pck, GF_PROP_PID_CONTENT_LIGHT_LEVEL, &PROP_DATA(ctx->state.clli_data, 4));
+		}
+	}
+	if (ctx->state.mdcv_valid) {
+		u32 crc = gf_crc_32(ctx->state.mdcv_data, 24);
+		if (crc != ctx->mdcv_crc) {
+			av1dmx_set_mdcv(ctx, NULL, pck);
+		}
+	}
+
 	gf_filter_pck_send(pck);
 
 	av1dmx_update_cts(ctx);
@@ -806,7 +949,7 @@
 
 	if (!ctx->opid) {
 		if (ctx->state.obu_type != OBU_TEMPORAL_DELIMITER) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AV1Dmx] output pid not configured (no sequence header yet ?), skipping OBU\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[AV1Dmx] output pid not configured (no sequence header yet ?), skipping OBU\n"));
 		}
 		gf_av1_reset_state(&ctx->state, GF_FALSE);
 		return GF_OK;
@@ -822,6 +965,27 @@
 
 }
 
+GF_Err gf_bs_set_logger(GF_BitStream *bs, void (*on_bs_log)(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3), void *udta);
+static void av1dmx_bs_log(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3)
+{
+	GF_AV1DmxCtx *ctx = (GF_AV1DmxCtx *) udta;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, (" %s", field_name));
+	if (idx1>=0) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("_%d", idx1));
+		if (idx2>=0) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("_%d", idx2));
+			if (idx3>=0) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("_%d", idx3));
+			}
+		}
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("=\""LLD, field_val));
+	if ((ctx->bsdbg==2) && ((s32) nb_bits > 1) )
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("(%u)", nb_bits));
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("\" "));
+}
+
 GF_Err av1dmx_process_buffer(GF_Filter *filter, GF_AV1DmxCtx *ctx, const char *data, u32 data_size, Bool is_copy)
 {
 	u32 last_obu_end = 0;
@@ -830,9 +994,15 @@
 	if (!ctx->bs) ctx->bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
 	else gf_bs_reassign_buffer(ctx->bs, data, data_size);
 
+#ifndef GPAC_DISABLE_LOG
+	if (ctx->bsdbg && gf_log_tool_level_on(GF_LOG_MEDIA, GF_LOG_DEBUG))
+		gf_bs_set_logger(ctx->bs, av1dmx_bs_log, ctx);
+#endif
+
 	//check ivf vs obu vs annexB
 	e = av1dmx_check_format(filter, ctx, ctx->bs, &last_obu_end);
-	if (e) return e;
+	if (e==GF_BUFFER_TOO_SMALL) return GF_OK;
+	else if (e) return e;
 
 	while (gf_bs_available(ctx->bs)) {
 
@@ -913,10 +1083,9 @@
 
 	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
 
-	//input pid sets some timescale - we flushed pending data , update cts
+	//input pid is muxed - we flushed pending data , update cts unless recomputing all times
 	if (ctx->timescale) {
 		Bool start, end;
-		u64 cts;
 
 		e = GF_OK;
 
@@ -945,10 +1114,12 @@
 			if (e) return e;
 		}
 
-		//begining of a new frame
-		cts = gf_filter_pck_get_cts(pck);
-		if (cts != GF_FILTER_NO_TS)
-			ctx->cts = cts;
+		//beginning of a new frame
+		if (!ctx->notime) {
+			u64 cts = gf_filter_pck_get_cts(pck);
+			if (cts != GF_FILTER_NO_TS)
+				ctx->cts = cts;
+		}
 		if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
 		ctx->src_pck = pck;
 		gf_filter_pck_ref_props(&ctx->src_pck);
@@ -984,6 +1155,16 @@
 	return e;
 }
 
+static GF_Err av1dmx_initialize(GF_Filter *filter)
+{
+	GF_AV1DmxCtx *ctx = gf_filter_get_udta(filter);
+	gf_av1_init_state(&ctx->state);
+	if (ctx->temporal_delim)
+		ctx->state.keep_temporal_delim = GF_TRUE;
+
+	return GF_OK;
+}
+
 static void av1dmx_finalize(GF_Filter *filter)
 {
 	GF_AV1DmxCtx *ctx = gf_filter_get_udta(filter);
@@ -1014,9 +1195,11 @@
 		mime = "video/x-ivf";
 	} else {
 		res = gf_media_aom_probe_annexb(bs);
-		if (res) *score = GF_FPROBE_SUPPORTED;
-		else {
+		if (res) {
+			*score = GF_FPROBE_SUPPORTED;
+		} else {
 			AV1State state;
+			Bool has_seq_header = GF_FALSE;
 			GF_Err e;
 			u32 nb_units = 0;
 
@@ -1026,23 +1209,40 @@
 				e = aom_av1_parse_temporal_unit_from_section5(bs, &state);
 				if ((e==GF_OK) || (nb_units && (e==GF_BUFFER_TOO_SMALL) ) ) {
 					if (!nb_units || gf_list_count(state.frame_state.header_obus) || gf_list_count(state.frame_state.frame_obus)) {
+						if (gf_list_count(state.frame_state.header_obus)) {
+							has_seq_header = GF_TRUE;
+						}
 						nb_units++;
 						if (e==GF_BUFFER_TOO_SMALL)
 							nb_units++;
-					} else
+					} else {
+						//we got one frame + seq header without errors, assume maybe supported
+						if (has_seq_header) {
+							res = GF_TRUE;
+							*score = GF_FPROBE_MAYBE_SUPPORTED;
+						}
 						break;
+					}
+				}
+				//very large frame
+				else if (!nb_units && (e==GF_BUFFER_TOO_SMALL)) {
+					if (gf_list_count(state.frame_state.header_obus) && state.width && state.height) {
+						res = GF_TRUE;
+						*score = GF_FPROBE_MAYBE_SUPPORTED;
+					}
+					break;
 				} else {
 					break;
 				}
 				gf_av1_reset_state(&state, GF_FALSE);
-				if (nb_units>2) break;
+				if (nb_units>2) {
+					res = GF_TRUE;
+					*score = GF_FPROBE_SUPPORTED;
+					break;
+				}
 			}
 			gf_odf_av1_cfg_del(state.config);
 			gf_av1_reset_state(&state, GF_TRUE);
-			if (nb_units>2) {
-				res = GF_TRUE;
-				*score = GF_FPROBE_MAYBE_SUPPORTED;
-			}
 		}
 	}
 
@@ -1077,10 +1277,18 @@
 static const GF_FilterArgs AV1DmxArgs[] =
 {
 	{ OFFS(fps), "import frame rate (0 default to FPS from bitstream or 25 Hz)", GF_PROP_FRACTION, "0/1000", NULL, 0},
-	{ OFFS(index), "indexing window length. If 0, bitstream is not probed for duration. A negative value skips the indexing if the source file is larger than 100M (slows down importers) unless a play with start range > 0 is issued, otherwise uses the positive value", GF_PROP_DOUBLE, "-1.0", NULL, 0},
+	{ OFFS(index), "indexing window length. If 0, bitstream is not probed for duration. A negative value skips the indexing if the source file is larger than 100M (slows down importers) unless a play with start range > 0 is issued", GF_PROP_DOUBLE, "-1.0", NULL, 0},
 
 	{ OFFS(importer), "compatibility with old importer", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(deps), "import samples dependencies information", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(deps), "import sample dependency information", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(notime), "ignore input timestamps, rebuild from 0", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(temporal_delim), "keep temporal delimiters in reconstructed frames", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+
+
+	{ OFFS(bsdbg), "debug NAL parsing in `parser@debug logs\n"
+		"- off: not enabled\n"
+		"- on: enabled\n"
+		"- full: enable with number of bits dumped", GF_PROP_UINT, "off", "off|on|full", GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -1091,6 +1299,7 @@
 	GF_FS_SET_HELP("This filter parses AV1 OBU, AV1 AnnexB or IVF with AV1 or VP9 files/data and outputs corresponding visual PID and frames.")
 	.private_size = sizeof(GF_AV1DmxCtx),
 	.args = AV1DmxArgs,
+	.initialize = av1dmx_initialize,
 	.finalize = av1dmx_finalize,
 	SETCAPS(AV1DmxCaps),
 	.configure_pid = av1dmx_configure_pid,

gpac-1.0.1.tar.gz/src/filters/reframe_flac.c -> gpac-2.0.0.tar.gz/src/filters/reframe_flac.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / FLAC reframer filter
@@ -59,6 +59,7 @@
 	Bool is_playing;
 	Bool is_file;
 	Bool initial_play_done, file_loaded;
+	Bool in_error;
 
 	Bool initialized;
 	u32 sample_rate, nb_channels, bits_per_sample, block_size;
@@ -72,6 +73,9 @@
 	Bool recompute_cts;
 	FLACIdx *indexes;
 	u32 index_alloc_size, index_size;
+	u32 bitrate;
+	Bool copy_props;
+	u32 dsi_crc;
 } GF_FLACDmxCtx;
 
 
@@ -84,7 +88,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -103,13 +110,14 @@
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 	}
+	if (ctx->timescale) ctx->copy_props = GF_TRUE;
 	return GF_OK;
 }
 
 static void flac_dmx_check_dur(GF_Filter *filter, GF_FLACDmxCtx *ctx)
 {
-	u64 duration;
-	s32 prev_sr = -1;
+	u64 rate;
+	FILE *stream;
 	const GF_PropertyValue *p;
 	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
 
@@ -126,27 +134,38 @@
 	}
 	ctx->is_file = GF_TRUE;
 
-	/*todo ...*/
-	duration = 0;
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
-	if (!ctx->duration.num || (ctx->duration.num  * prev_sr != duration * ctx->duration.den)) {
-		ctx->duration.num = (s32) duration;
-		ctx->duration.den = prev_sr ;
+	gf_fseek(stream, 0, SEEK_END);
 
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	rate = gf_ftell(stream);
+	gf_fclose(stream);
+	if (ctx->duration.num && !gf_sys_is_test_mode() ) {
+		rate *= 8 * ctx->duration.den;
+		rate /= ctx->duration.num;
+		ctx->bitrate = (u32) rate;
 	}
 
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
 	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 }
 
 static void flac_dmx_check_pid(GF_Filter *filter, GF_FLACDmxCtx *ctx, u8 *dsi, u32 dsi_size)
 {
+	u32 crc = gf_crc_32(dsi, dsi_size);
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
 		flac_dmx_check_dur(filter, ctx);
 	}
+	if ((ctx->dsi_crc == crc) && !ctx->copy_props) return;
+	ctx->dsi_crc = crc;
+	ctx->copy_props = GF_FALSE;
+
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
@@ -156,6 +175,8 @@
 	}
 	if (ctx->duration.num)
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 
 	if (!ctx->timescale) gf_filter_pid_set_name(ctx->opid, "audio");
 
@@ -169,6 +190,10 @@
 
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_BPS, & PROP_UINT(ctx->bits_per_sample) );
 
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
+
 }
 
 static Bool flac_dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
@@ -378,6 +403,9 @@
 	u64 cts = GF_FILTER_NO_TS;
 	FLACHeader hdr;
 
+	if (ctx->in_error)
+		return GF_NON_COMPLIANT_BITSTREAM;
+
 	//always reparse duration
 	if (!ctx->duration.num)
 		flac_dmx_check_dur(filter, ctx);
@@ -484,7 +512,12 @@
 			gf_bs_reassign_buffer(ctx->bs, ctx->flac_buffer, size);
 			u32 magic = gf_bs_read_u32(ctx->bs);
 			if (magic != GF_4CC('f','L','a','C')) {
-
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FLACDmx] invalid FLAC magic\n"));
+				ctx->in_error = GF_TRUE;
+				ctx->flac_buffer_size = 0;
+				if (pck)
+					gf_filter_pid_drop_packet(ctx->ipid);
+				return GF_NON_COMPLIANT_BITSTREAM;
 			}
 			while (gf_bs_available(ctx->bs)) {
 				Bool last = gf_bs_read_int(ctx->bs, 1);
@@ -502,8 +535,9 @@
 					if (min_block_size==max_block_size) ctx->block_size = min_block_size;
 					else ctx->block_size = 0;
 
+					ctx->duration.num = gf_bs_read_long_int(ctx->bs, 36);
+					ctx->duration.den = ctx->sample_rate;
 					//ignore the rest
-					/*total samples*/gf_bs_read_long_int(ctx->bs, 36);
 					gf_bs_skip_bytes(ctx->bs, 16);
 					dsi_end = (u32) gf_bs_get_position(ctx->bs);
 
@@ -514,6 +548,14 @@
 				}
 				if (last) break;
 			}
+			if (!dsi_end) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FLACDmx] invalid FLAC header\n"));
+				ctx->in_error = GF_TRUE;
+				ctx->flac_buffer_size = 0;
+				if (pck)
+					gf_filter_pid_drop_packet(ctx->ipid);
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
 			flac_dmx_check_pid(filter, ctx, ctx->flac_buffer+4, dsi_end-4);
 			remain -= size;
 			start += size;
@@ -524,7 +566,7 @@
 
 		//we have a next frame, check we are synchronize
 		if ((start[0] != 0xFF) && ((start[1]&0xFC) != 0xF8)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[FLACDmx] invalid frame, droping %d bytes and resyncing\n", next_frame));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FLACDmx] invalid frame, dropping %d bytes and resyncing\n", next_frame));
 			start += next_frame;
 			remain -= next_frame;
 			continue;
@@ -553,6 +595,7 @@
 
 		if (!ctx->in_seek) {
 			dst_pck = gf_filter_pck_new_alloc(ctx->opid, next_frame, &output);
+			if (!dst_pck) return GF_OUT_OF_MEM;
 			memcpy(output, start, next_frame);
 
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);

gpac-1.0.1.tar.gz/src/filters/reframe_h263.c -> gpac-2.0.0.tar.gz/src/filters/reframe_h263.c Changed

gpac-1.0.1.tar.gz/src/filters/reframe_img.c -> gpac-2.0.0.tar.gz/src/filters/reframe_img.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / image (jpg/png/bmp/j2k) reframer filter
@@ -244,6 +244,7 @@
 		}
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NB_FRAMES, &PROP_UINT(1) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 
 		if (ext || mime)
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
@@ -276,8 +277,9 @@
 				}
 			}
 		}
-		dst_pck = gf_filter_pck_new_ref(ctx->opid, data+start_offset, size-start_offset, pck);
-		if (!dst_pck) e = GF_OUT_OF_MEM;
+		dst_pck = gf_filter_pck_new_ref(ctx->opid, start_offset, size-start_offset, pck);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+
 		gf_filter_pck_merge_properties(pck, dst_pck);
 		if (ctx->owns_timescale) {
 			gf_filter_pck_set_cts(dst_pck, 0);
@@ -317,6 +319,8 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT(h));
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+	
 	gf_filter_pck_merge_properties(pck, dst_pck);
 	if (ctx->owns_timescale) {
 		gf_filter_pck_set_cts(dst_pck, 0);

gpac-1.0.1.tar.gz/src/filters/reframe_latm.c -> gpac-2.0.0.tar.gz/src/filters/reframe_latm.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / AAC ADTS reframer filter
@@ -70,6 +70,11 @@
 	LATMIdx *indexes;
 	u32 index_alloc_size, index_size;
 	u32 resume_from;
+
+	Bool prev_sap;
+	u32 bitrate;
+	GF_Err in_error;
+	Bool copy_props;
 } GF_LATMDmxCtx;
 
 
@@ -193,7 +198,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -208,6 +216,7 @@
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 	}
+	if (ctx->timescale) ctx->copy_props = GF_TRUE;
 
 	return GF_OK;
 }
@@ -217,7 +226,7 @@
 	FILE *stream;
 	GF_BitStream *bs;
 	GF_M4ADecSpecInfo acfg;
-	u64 duration, cur_dur, cur_pos;
+	u64 duration, cur_dur, cur_pos, rate;
 	s32 sr_idx = -1;
 	const GF_PropertyValue *p;
 	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
@@ -235,8 +244,12 @@
 	}
 	ctx->is_file = GF_TRUE;
 
-	stream = gf_fopen(p->value.string, "rb");
-	if (!stream) return;
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
 	ctx->index_size = 0;
 
@@ -271,6 +284,7 @@
 
 		cur_pos = gf_bs_get_position(bs);
 	}
+	rate = gf_bs_get_position(bs);
 	gf_bs_del(bs);
 	gf_fclose(stream);
 
@@ -280,30 +294,46 @@
 			ctx->duration.den = GF_M4ASampleRates[sr_idx];
 
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+			if (duration && !gf_sys_is_test_mode() ) {
+				rate *= 8 * ctx->duration.den;
+				rate /= ctx->duration.num;
+				ctx->bitrate = (u32) rate;
+			}
 		}
 	}
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
 	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 }
 
 static void latm_dmx_check_pid(GF_Filter *filter, GF_LATMDmxCtx *ctx)
 {
 	u8 *dsi_b;
 	u32 dsi_s, sr, timescale=0;
-
+	u32 codecid;
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
-		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		latm_dmx_check_dur(filter, ctx);
 	}
+	if (!GF_M4ASampleRates[ctx->acfg.base_sr_index]) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[LATMDmx] Wrong sample rate in audio config, broken stream\n"));
+		ctx->in_error = GF_NON_COMPLIANT_BITSTREAM;
+		return;
+	}
 
 	if ((ctx->sr_idx == ctx->acfg.base_sr_index) && (ctx->nb_ch == ctx->acfg.nb_chan )
-		&& (ctx->base_object_type == ctx->acfg.base_object_type) ) return;
+		&& (ctx->base_object_type == ctx->acfg.base_object_type) && !ctx->copy_props) return;
+
+	ctx->copy_props = GF_FALSE;
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 
+	if (ctx->acfg.base_object_type==GF_M4A_USAC)
+		codecid = GF_CODECID_USAC;
+	else
+		codecid = GF_CODECID_AAC_MPEG4;
 	//copy properties at init or reconfig
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_AAC_MPEG4));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( codecid));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLES_PER_FRAME, & PROP_UINT(ctx->frame_size) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, & PROP_BOOL(GF_FALSE) );
 	if (ctx->is_file && ctx->index) {
@@ -311,6 +341,8 @@
 	}
 	if (ctx->duration.num)
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 
 
 	ctx->nb_ch = ctx->acfg.nb_chan;
@@ -320,14 +352,11 @@
 	if (!ctx->timescale) {
 		//we change sample rate, change cts
 		if (ctx->cts && (ctx->sr_idx != ctx->acfg.base_sr_index)) {
-			ctx->cts *= sr;
-			ctx->cts /= GF_M4ASampleRates[ctx->sr_idx];
+			ctx->cts = gf_timestamp_rescale(ctx->cts, GF_M4ASampleRates[ctx->sr_idx], sr);
 		}
 	}
 	ctx->sr_idx = ctx->acfg.base_sr_index;
 
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(GF_CODECID_AAC_MPEG4) );
-
 	ctx->dts_inc = ctx->frame_size;
 	gf_m4a_write_config(&ctx->acfg, &dsi_b, &dsi_s);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY(dsi_b, dsi_s) );
@@ -339,6 +368,9 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : timescale));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, & PROP_UINT(ctx->nb_ch) );
 
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
 }
 
 static Bool latm_dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
@@ -424,10 +456,13 @@
 	GF_LATMDmxCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck, *dst_pck;
 	u32 pos;
-	u8 *data, *output;
-	u32 pck_size, prev_pck_size;
+	u8 *data=NULL, *output;
+	u32 pck_size=0, prev_pck_size;
 	u64 cts = GF_FILTER_NO_TS;
 
+	if (ctx->in_error)
+		return ctx->in_error;
+
 	//always reparse duration
 	if (!ctx->duration.num)
 		latm_dmx_check_dur(filter, ctx);
@@ -448,10 +483,10 @@
 		} else {
 			return GF_OK;
 		}
+	} else {
+		data = (char *) gf_filter_pck_get_data(pck, &pck_size);
 	}
 
-	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
-
 	//input pid sets some timescale - we flushed pending data , update cts
 	if (ctx->timescale && pck) {
 		cts = gf_filter_pck_get_cts(pck);
@@ -505,6 +540,8 @@
 			GF_FilterSAPType sap = GF_FILTER_SAP_1;
 
 			dst_pck = gf_filter_pck_new_alloc(ctx->opid, latm_frame_size, &output);
+			if (!dst_pck) return GF_OUT_OF_MEM;
+
 			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
 
 			memcpy(output, latm_buffer, latm_frame_size);
@@ -514,11 +551,13 @@
 			gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
 
 			/*xHE-AAC, check RAP*/
-			if (ctx->acfg.base_object_type==42) {
-				if (latm_frame_size && (output[0] & 0x80)) {
+			if (ctx->acfg.base_object_type==GF_CODECID_USAC) {
+				if (latm_frame_size && (output[0] & 0x80) && !ctx->prev_sap) {
 					sap = GF_FILTER_SAP_1;
+					ctx->prev_sap = GF_TRUE;
 				} else {
 					sap = GF_FILTER_SAP_NONE;
+					ctx->prev_sap = GF_FALSE;
 				}
 			}
 			gf_filter_pck_set_sap(dst_pck, sap);
@@ -564,18 +603,29 @@
 static const char *latm_dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
 {
 	u32 nb_frames=0;
+	u32 nb_skip=0;
 	GF_M4ADecSpecInfo acfg;
 	GF_BitStream *bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
 	while (1) {
 		u32 nb_skipped = 0;
 		if (!latm_dmx_sync_frame_bs(bs, &acfg, 0, NULL, &nb_skipped)) break;
-		if (nb_skipped)
-			nb_frames=0;
+		if (! GF_M4ASampleRates[acfg.base_sr_index]) {
+			nb_frames = 0;
+			break;
+		}
+
+		if (nb_skipped) {
+			if (nb_skip) {
+				nb_frames = 0;
+				break;
+			}
+			nb_skip++;
+		}
 		nb_frames++;
 	}
 	gf_bs_del(bs);
 	if (nb_frames>=2) {
-		*score = GF_FPROBE_SUPPORTED;
+		*score = nb_skip ? GF_FPROBE_MAYBE_NOT_SUPPORTED : GF_FPROBE_SUPPORTED;
 		return "audio/aac+latm";
 	}
 	return NULL;
@@ -586,11 +636,11 @@
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "latm"),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/aac+latm"),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG4),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_MP),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_LCP),
-	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_SSRP),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG4),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_MP),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_LCP),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_SSRP),
 	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	{0},
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),

gpac-2.0.0.tar.gz/src/filters/reframe_mhas.c Added

@@ -0,0 +1,910 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2020-2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / MHAS reframer filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+#include <gpac/filters.h>
+
+
+static u32 USACSampleRates[] = {96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350, 0, 0,
+	57600, 51200, 40000, 38400, 34150, 28800, 25600, 20000, 19200, 17075, 14400, 12800, 9600};
+
+static u32 nb_usac_sr = GF_ARRAY_LENGTH(USACSampleRates);
+
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} MHASIdx;
+
+typedef struct
+{
+	//filter args
+	Double index;
+	Bool mpha;
+	u32 pcksync;
+	Bool nosync;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	GF_BitStream *bs;
+	u64 file_pos, cts, prev_cts;
+
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale;
+	Bool is_playing;
+	Bool is_file;
+	Bool initial_play_done, file_loaded;
+
+	Bool initialized;
+
+	u8 *mhas_buffer;
+	u32 mhas_buffer_size, mhas_buffer_alloc, resume_from;
+	u64 byte_offset;
+	Bool buffer_too_small;
+
+	GF_FilterPacket *src_pck;
+
+	Bool recompute_cts;
+	MHASIdx *indexes;
+	u32 index_alloc_size, index_size;
+
+	u32 sample_rate, frame_len, PL;
+	s32 cicp_layout_idx, num_speakers;
+	u32 nb_frames;
+
+	u32 nb_unknown_pck;
+	u32 bitrate;
+	Bool copy_props;
+} GF_MHASDmxCtx;
+
+
+
+
+GF_Err mhas_dmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_MHASDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) {
+		ctx->timescale = p->value.uint;
+		//if stream comes from TS or other muxed source unframed, force initial sync check
+		if (!ctx->ipid) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_UNFRAMED);
+			if (p && p->value.boolean)
+				ctx->nosync = GF_TRUE;
+		}
+	}
+	ctx->ipid = pid;
+	p = gf_filter_pid_get_property_str(pid, "nocts");
+	if (p && p->value.boolean) ctx->recompute_cts = GF_TRUE;
+	else ctx->recompute_cts = GF_FALSE;
+
+	if (ctx->timescale && !ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
+	}
+	if (ctx->timescale) ctx->copy_props = GF_TRUE;
+	return GF_OK;
+}
+
+static void mhas_dmx_check_dur(GF_Filter *filter, GF_MHASDmxCtx *ctx)
+{
+	GF_Fraction64 duration;
+	FILE *stream;
+	GF_BitStream *bs;
+	u32 frame_len, cur_dur;
+	Bool mhas_sap;
+	u64 mhas_last_cfg, rate;
+	const GF_PropertyValue *p;
+	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
+
+	if (ctx->index<=0) {
+		ctx->file_loaded = GF_TRUE;
+		return;
+	}
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
+	if (!p || !p->value.string || !strncmp(p->value.string, "gmem://", 7)) {
+		ctx->is_file = GF_FALSE;
+		ctx->file_loaded = GF_TRUE;
+		return;
+	}
+	ctx->is_file = GF_TRUE;
+
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
+
+	ctx->index_size = 0;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+	duration.num = duration.den = 0;
+	frame_len = cur_dur = 0;
+	mhas_last_cfg = 0;
+
+	while (gf_bs_available(bs)) {
+		u32 sync_code = gf_bs_peek_bits(bs, 24, 0);
+		if (sync_code == 0xC001A5) {
+			break;
+		}
+		gf_bs_skip_bytes(bs, 1);
+	}
+	while (gf_bs_available(bs)) {
+		u64 mhas_pck_start, pay_start, parse_end, mhas_size;
+		u32 mhas_type;
+
+		mhas_pck_start = gf_bs_get_position(bs);
+		mhas_type = (u32) gf_mpegh_escaped_value(bs, 3, 8, 8);
+		/*mhas_label = */gf_mpegh_escaped_value(bs, 2, 8, 32);
+		mhas_size = gf_mpegh_escaped_value(bs, 11, 24, 24);
+
+		pay_start = (u32) gf_bs_get_position(bs);
+
+		if (!gf_bs_available(bs) ) break;
+		if (mhas_size > gf_bs_available(bs)) break;
+
+		mhas_sap = 0;
+		//frame
+		if (mhas_type==2) {
+			mhas_sap = gf_bs_read_int(bs, 1);
+			if (!mhas_last_cfg) mhas_sap = 0;
+		//config
+		} else if (mhas_type==1) {
+			u32 sr = 0;
+			/*u32 pl = */gf_bs_read_u8(bs);
+			u32 idx = gf_bs_read_int(bs, 5);
+			if (idx==0x1f)
+				duration.den = gf_bs_read_int(bs, 24);
+			else if (sr < nb_usac_sr) {
+				duration.den = USACSampleRates[idx];
+			}
+			idx = gf_bs_read_int(bs, 3);
+			if ((idx==0) || (idx==2) ) frame_len = 768;
+			else frame_len = 1024;
+
+			mhas_last_cfg = mhas_pck_start;
+		}
+		//audio truncation
+		else if (mhas_type==17) {
+			Bool isActive = gf_bs_read_int(bs, 1);
+			/*Bool ati_reserved = */gf_bs_read_int(bs, 1);
+			Bool trunc_from_begin = gf_bs_read_int(bs, 1);
+			u32 nb_trunc_samples = gf_bs_read_int(bs, 13);
+			if (isActive && !trunc_from_begin) {
+				duration.num -= nb_trunc_samples;
+			}
+		}
+		gf_bs_align(bs);
+		parse_end = (u32) gf_bs_get_position(bs) - pay_start;
+		//remaining of packet payload
+		gf_bs_skip_bytes(bs, mhas_size - parse_end);
+
+		//mhas_sap only set for frames
+		if (mhas_sap && duration.den && (cur_dur >= ctx->index * duration.den) ) {
+			if (!ctx->index_alloc_size) ctx->index_alloc_size = 10;
+			else if (ctx->index_alloc_size == ctx->index_size) ctx->index_alloc_size *= 2;
+			ctx->indexes = gf_realloc(ctx->indexes, sizeof(MHASIdx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = mhas_last_cfg;
+			ctx->indexes[ctx->index_size].duration = ((Double) duration.num) / duration.den;
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+		if (mhas_type==2) {
+			duration.num += frame_len;
+			cur_dur += frame_len;
+			mhas_last_cfg = 0;
+		}
+	}
+
+	rate = gf_bs_get_position(bs);
+	gf_bs_del(bs);
+	gf_fclose(stream);
+
+	if (!ctx->duration.num || (ctx->duration.num * duration.den != duration.num * ctx->duration.den)) {
+		ctx->duration = duration;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+		if (duration.num && !gf_sys_is_test_mode() ) {
+			rate *= 8 * ctx->duration.den;
+			rate /= ctx->duration.num;
+			ctx->bitrate = (u32) rate;
+		}
+	}
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
+	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
+}
+
+static void mhas_dmx_check_pid(GF_Filter *filter, GF_MHASDmxCtx *ctx, u32 PL, u32 sample_rate, u32 frame_len, s32 CICPspeakerLayoutIdx, s32 numSpeakers, u8 *dsi, u32 dsi_size)
+{
+	u32 nb_channels;
+	u64 chan_layout;
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		mhas_dmx_check_dur(filter, ctx);
+	} else {
+		if ((ctx->frame_len == frame_len)
+			&& (ctx->PL == PL)
+			&& (ctx->sample_rate == sample_rate)
+			&& (ctx->cicp_layout_idx == CICPspeakerLayoutIdx)
+			&& (ctx->num_speakers == numSpeakers)
+			&& !ctx->copy_props
+		) {
+			return;
+		}
+	}
+	ctx->frame_len = frame_len;
+	ctx->PL = PL;
+	ctx->sample_rate = sample_rate;
+	ctx->cicp_layout_idx = CICPspeakerLayoutIdx;
+	ctx->num_speakers = numSpeakers;
+	ctx->copy_props = GF_FALSE;
+
+	chan_layout = 0;
+	nb_channels = 0;
+	if (CICPspeakerLayoutIdx>=0) {
+		chan_layout = gf_audio_fmt_get_layout_from_cicp(CICPspeakerLayoutIdx);
+		nb_channels = gf_audio_fmt_get_num_channels_from_layout(chan_layout);
+	} else if (numSpeakers>=0) {
+		nb_channels = numSpeakers;
+	}
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL );
+	if (ctx->is_file && ctx->index) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
+	}
+	if (ctx->duration.num)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+
+	if (!ctx->timescale) gf_filter_pid_set_name(ctx->opid, "audio");
+
+	if (ctx->mpha) {
+		u8 *data = gf_malloc(sizeof(u8) * (dsi_size+5) );
+		if (!data) return;
+		data[0] = 1;
+		data[1] = PL;
+		data[2] = CICPspeakerLayoutIdx;
+		data[3] = dsi_size>>8;
+		data[4] = dsi_size&0xFF;
+		memcpy(data+5, dsi, dsi_size);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_MPHA ) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY( data, (dsi_size+5) ) );
+	} else {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_MHAS ) );
+	}
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : ctx->sample_rate));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, & PROP_UINT(ctx->sample_rate));
+	if (chan_layout)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CHANNEL_LAYOUT, & PROP_LONGUINT(chan_layout) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, & PROP_UINT(nb_channels) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLES_PER_FRAME, & PROP_UINT(ctx->frame_len) );
+
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
+}
+
+static Bool mhas_dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_FilterEvent fevt;
+	GF_MHASDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (evt->base.on_pid != ctx->opid) return GF_TRUE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (!ctx->is_playing) {
+			ctx->is_playing = GF_TRUE;
+		}
+		if (! ctx->is_file) {
+			if (evt->play.start_range || ctx->initial_play_done) {
+				ctx->mhas_buffer_size = 0;
+				ctx->resume_from = 0;
+			}
+			ctx->initial_play_done = GF_TRUE;
+			return GF_FALSE;
+		}
+		mhas_dmx_check_dur(filter, ctx);
+
+		ctx->start_range = evt->play.start_range;
+		ctx->in_seek = GF_TRUE;
+		ctx->file_pos = 0;
+		if (ctx->start_range) {
+			for (i=1; i<ctx->index_size; i++) {
+				if (ctx->indexes[i].duration>ctx->start_range) {
+					ctx->cts = (u64) (ctx->indexes[i-1].duration * ctx->sample_rate);
+					ctx->file_pos = ctx->indexes[i-1].pos;
+					break;
+				}
+			}
+		}
+		if (!ctx->initial_play_done) {
+			ctx->initial_play_done = GF_TRUE;
+			//seek will not change the current source state, don't send a seek
+			if (!ctx->file_pos)
+				return GF_TRUE;
+		}
+		ctx->mhas_buffer_size = 0;
+		ctx->resume_from = 0;
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = ctx->file_pos;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		ctx->is_playing = GF_FALSE;
+		if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+		ctx->src_pck = NULL;
+		//don't cancel event
+		return GF_FALSE;
+
+	case GF_FEVT_SET_SPEED:
+		//cancel event
+		return GF_TRUE;
+	default:
+		break;
+	}
+	//by default don't cancel event - to rework once we have downloading in place
+	return GF_FALSE;
+}
+
+static GFINLINE void mhas_dmx_update_cts(GF_MHASDmxCtx *ctx)
+{
+	if (ctx->timescale) {
+		u64 inc = ctx->frame_len;
+		inc *= ctx->timescale;
+		inc /= ctx->sample_rate;
+		ctx->cts += inc;
+	} else {
+		ctx->cts += ctx->frame_len;
+	}
+}
+
+#ifndef GPAC_DISABLE_LOG
+static const char *mhas_pck_name(u32 pck_type)
+{
+	switch (pck_type) {
+	case 0: return "FILL_DATA";
+	case 1: return "MPEGH3DACFG";
+	case 2: return "MPEGH3DAFRAME";
+	case 3: return "AUDIOSCENEINFO";
+	case 6: return "SYNC";
+	case 7: return "SYNCGAP";
+	case 8: return "MARKER";
+	case 9: return "CRC16";
+	case 10: return "CRC32";
+	case 11: return "DESCRIPTOR";
+	case 12: return "USERINTERACTION";
+	case 13: return "LOUDNESS_DRC";
+	case 14: return "BUFFERINFO";
+	case 15: return "GLOBAL_CRC16";
+	case 16: return "GLOBAL_CRC32";
+	case 17: return "AUDIOTRUNCATION";
+	case 18: return "GENDATA";
+	case 4:
+	case 5:
+	default:
+		return "ISOReserved";
+	}
+	return "error";
+}
+#endif
+
+GF_Err mhas_dmx_process(GF_Filter *filter)
+{
+	GF_MHASDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *in_pck;
+	u8 *output;
+	u8 *start;
+	Bool final_flush=GF_FALSE;
+	u32 pck_size, remain, prev_pck_size;
+	u64 cts = GF_FILTER_NO_TS;
+	u32 au_start = 0;
+	u32 consumed = 0;
+	u32 nb_trunc_samples = 0;
+	Bool trunc_from_begin = 0;
+	Bool has_cfg = 0;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		mhas_dmx_check_dur(filter, ctx);
+
+	if (ctx->opid && !ctx->is_playing)
+		return GF_OK;
+
+	in_pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!in_pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (!ctx->mhas_buffer_size) {
+				if (ctx->opid)
+					gf_filter_pid_set_eos(ctx->opid);
+				if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+				ctx->src_pck = NULL;
+				return GF_EOS;
+			}
+			final_flush = GF_TRUE;
+		} else if (!ctx->resume_from) {
+			return GF_OK;
+		}
+	}
+
+	prev_pck_size = ctx->mhas_buffer_size;
+	if (ctx->resume_from)
+		in_pck = NULL;
+
+	if (in_pck) {
+		u8 *data = (u8 *) gf_filter_pck_get_data(in_pck, &pck_size);
+
+		if (ctx->byte_offset != GF_FILTER_NO_BO) {
+			u64 byte_offset = gf_filter_pck_get_byte_offset(in_pck);
+			if (!ctx->mhas_buffer_size) {
+				ctx->byte_offset = byte_offset;
+			} else if (ctx->byte_offset + ctx->mhas_buffer_size != byte_offset) {
+				ctx->byte_offset = GF_FILTER_NO_BO;
+				if ((byte_offset != GF_FILTER_NO_BO) && (byte_offset>ctx->mhas_buffer_size) ) {
+					ctx->byte_offset = byte_offset - ctx->mhas_buffer_size;
+				}
+			}
+		}
+
+		if (ctx->mhas_buffer_size + pck_size > ctx->mhas_buffer_alloc) {
+			ctx->mhas_buffer_alloc = ctx->mhas_buffer_size + pck_size;
+			ctx->mhas_buffer = gf_realloc(ctx->mhas_buffer, ctx->mhas_buffer_alloc);
+		}
+		memcpy(ctx->mhas_buffer + ctx->mhas_buffer_size, data, pck_size);
+		ctx->mhas_buffer_size += pck_size;
+	}
+
+	//input pid sets some timescale - we flushed pending data , update cts
+	if (ctx->timescale && in_pck) {
+		cts = gf_filter_pck_get_cts(in_pck);
+	}
+
+	if (cts == GF_FILTER_NO_TS) {
+		//avoids updating cts
+		prev_pck_size = 0;
+	}
+
+	remain = ctx->mhas_buffer_size;
+	start = ctx->mhas_buffer;
+
+	if (ctx->resume_from) {
+		start += ctx->resume_from - 1;
+		remain -= ctx->resume_from - 1;
+		ctx->resume_from = 0;
+	}
+
+	while (ctx->nosync && (remain>3)) {
+		//wait till we have a frame header
+		u8 *hdr_start = memchr(start, 0xC0, remain);
+		if (!hdr_start) {
+			remain=0;
+			break;
+		}
+		if ((hdr_start[1]==0x01) && (hdr_start[2]==0xA5)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[MHASDmx] Sync found !\n"));
+			ctx->nosync = GF_FALSE;
+			break;
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[MHASDmx] not sync, skipping byte\n"));
+		start++;
+		remain--;
+	}
+	if (ctx->nosync)
+		goto skip;
+
+	gf_bs_reassign_buffer(ctx->bs, start, remain);
+	ctx->buffer_too_small = GF_FALSE;
+
+	//MHAS packet
+	while (remain > consumed) {
+		u32 pay_start, parse_end, mhas_size, mhas_label;
+		Bool mhas_sap = 0;
+		u32 mhas_type;
+		if (!ctx->is_playing && ctx->opid) {
+			ctx->resume_from = 1;
+			consumed = 0;
+			break;
+		}
+
+		mhas_type = (u32) gf_mpegh_escaped_value(ctx->bs, 3, 8, 8);
+		mhas_label = (u32) gf_mpegh_escaped_value(ctx->bs, 2, 8, 32);
+		mhas_size = (u32) gf_mpegh_escaped_value(ctx->bs, 11, 24, 24);
+
+		if (ctx->buffer_too_small)
+			break;
+
+
+		if (mhas_type>18) {
+			ctx->nb_unknown_pck++;
+			if (ctx->nb_unknown_pck > ctx->pcksync) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[MHASDmx] %d packets of unknwon type, considering sync was lost\n"));
+				consumed = 0;
+				ctx->nosync = GF_TRUE;
+				ctx->nb_unknown_pck = 0;
+				break;
+			}
+		} else if (!mhas_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[MHASDmx] MHAS packet with 0 payload size, considering sync was lost\n"));
+			consumed = 0;
+			ctx->nosync = GF_TRUE;
+			ctx->nb_unknown_pck = 0;
+			break;
+		}
+
+		pay_start = (u32) gf_bs_get_position(ctx->bs);
+
+		if (ctx->buffer_too_small) break;
+		if (mhas_size > gf_bs_available(ctx->bs)) {
+			//incomplete frame, keep in buffer
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[MHASDmx] incomplete packet type %d %s label "LLU" size "LLU" - keeping in buffer\n", mhas_type, mhas_pck_name(mhas_type), mhas_label, mhas_size));
+			break;
+		}
+		//frame
+		if (mhas_type==2) {
+			mhas_sap = gf_bs_peek_bits(ctx->bs, 1, 0);
+			ctx->nb_unknown_pck = 0;
+		}
+		//config
+		else if (mhas_type==1) {
+			s32 CICPspeakerLayoutIdx = -1;
+			s32 numSpeakers = -1;
+			u32 sr = 0;
+			u32 frame_len;
+			u32 pl = gf_bs_read_u8(ctx->bs);
+			u32 idx = gf_bs_read_int(ctx->bs, 5);
+			if (idx==0x1f)
+				sr = gf_bs_read_int(ctx->bs, 24);
+			else if (sr < nb_usac_sr) {
+				sr = USACSampleRates[idx];
+			}
+			ctx->nb_unknown_pck = 0;
+			idx = gf_bs_read_int(ctx->bs, 3);
+			if ((idx==0) || (idx==2) ) frame_len = 768;
+			else frame_len = 1024;
+			gf_bs_read_int(ctx->bs, 1);
+			gf_bs_read_int(ctx->bs, 1);
+
+			//speaker config
+			u32 speakerLayoutType = gf_bs_read_int(ctx->bs, 2);
+			if (speakerLayoutType == 0) {
+				CICPspeakerLayoutIdx = gf_bs_read_int(ctx->bs, 6);
+			} else {
+				numSpeakers = (s32) gf_mpegh_escaped_value(ctx->bs, 5, 8, 16) + 1;
+				//TODO ...
+			}
+
+			mhas_dmx_check_pid(filter, ctx, pl, sr, frame_len, CICPspeakerLayoutIdx, numSpeakers, start + pay_start, (u32) mhas_size);
+
+			has_cfg = GF_TRUE;
+		}
+		//audio truncation
+		else if (mhas_type==17) {
+			Bool isActive = gf_bs_read_int(ctx->bs, 1);
+			/*Bool ati_reserved = */gf_bs_read_int(ctx->bs, 1);
+			trunc_from_begin = gf_bs_read_int(ctx->bs, 1);
+			nb_trunc_samples = gf_bs_read_int(ctx->bs, 13);
+			if (!isActive) {
+				nb_trunc_samples = 0;
+			}
+		}
+		//sync, syncgap
+		else if ((mhas_type==6) || (mhas_type==7)) {
+			ctx->nb_unknown_pck = 0;
+		}
+#if 0
+		//MARKER
+		else if (mhas_type==8) {
+			u8 marker_type = gf_bs_read_u8(ctx->bs);
+			//config reload force
+			if (marker_type==0x01) {}
+			//SAP
+			else if (marker_type==0x02) {
+				has_marker = GF_TRUE;
+			}
+		}
+#endif
+
+		gf_bs_align(ctx->bs);
+		parse_end = (u32) gf_bs_get_position(ctx->bs) - pay_start;
+		//remaining of packet payload
+		gf_bs_skip_bytes(ctx->bs, mhas_size - parse_end);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[MHASDmx] MHAS Packet type %d %s label "LLU" size "LLU"\n", mhas_type, mhas_pck_name(mhas_type), mhas_label, mhas_size));
+
+		if (ctx->timescale && !prev_pck_size && (cts != GF_FILTER_NO_TS) ) {
+			ctx->cts = cts;
+			cts = GF_FILTER_NO_TS;
+		}
+
+		//frame
+		if ((mhas_type==2) && ctx->opid) {
+			GF_FilterPacket *dst;
+			u64 pck_dur = ctx->frame_len;
+
+
+			u32 au_size;
+			if (ctx->mpha) {
+				au_start = pay_start;
+				au_size = mhas_size;
+			} else {
+				au_size = (u32) gf_bs_get_position(ctx->bs) - au_start;
+			}
+
+			if (nb_trunc_samples) {
+				if (trunc_from_begin) {
+					if (!ctx->nb_frames) {
+						s64 offset = trunc_from_begin;
+						if (ctx->timescale) {
+							offset *= ctx->timescale;
+							offset /= ctx->sample_rate;
+						}
+						gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DELAY , &PROP_LONGSINT( -offset));
+					}
+				} else {
+					pck_dur -= nb_trunc_samples;
+				}
+				nb_trunc_samples = 0;
+			}
+
+			if (ctx->timescale) {
+				pck_dur *= ctx->timescale;
+				pck_dur /= ctx->sample_rate;
+			}
+
+			dst = gf_filter_pck_new_alloc(ctx->opid, au_size, &output);
+			if (!dst) break;
+			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst);
+
+			memcpy(output, start + au_start, au_size);
+			if (!has_cfg)
+				mhas_sap = 0;
+
+			if (mhas_sap) {
+				gf_filter_pck_set_sap(dst, GF_FILTER_SAP_1);
+			}
+			gf_filter_pck_set_dts(dst, ctx->cts);
+			gf_filter_pck_set_cts(dst, ctx->cts);
+			gf_filter_pck_set_duration(dst, (u32) pck_dur);
+			if (ctx->byte_offset != GF_FILTER_NO_BO) {
+				u64 offset = (u64) (start - ctx->mhas_buffer);
+				offset += ctx->byte_offset + au_start;
+				gf_filter_pck_set_byte_offset(dst, offset);
+			}
+ 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[MHASDmx] Send AU CTS "LLU" size %d dur %d sap %d\n", ctx->cts, au_size, (u32) pck_dur, mhas_sap));
+			gf_filter_pck_send(dst);
+
+			au_start += au_size;
+			consumed = au_start;
+			ctx->nb_frames ++;
+
+			mhas_dmx_update_cts(ctx);
+			has_cfg = 0;
+
+			if (prev_pck_size) {
+				u64 next_pos = (u64) (start + au_start - ctx->mhas_buffer);
+				//next will be in new packet
+				if (prev_pck_size <= next_pos) {
+					prev_pck_size = 0;
+					if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+					ctx->src_pck = in_pck;
+					if (in_pck)
+						gf_filter_pck_ref_props(&ctx->src_pck);
+
+					if (ctx->timescale && (cts != GF_FILTER_NO_TS) ) {
+						ctx->cts = cts;
+						cts = GF_FILTER_NO_TS;
+					}
+				}
+			}
+			if (remain==consumed)
+				break;
+
+			if (gf_filter_pid_would_block(ctx->opid)) {
+				ctx->resume_from = 1;
+				final_flush = GF_FALSE;
+				break;
+			}
+		}
+	}
+	if (consumed) {
+		assert(remain>=consumed);
+		remain -= consumed;
+		start += consumed;
+	}
+
+skip:
+
+	if (remain < ctx->mhas_buffer_size) {
+		memmove(ctx->mhas_buffer, start, remain);
+		//update byte offset
+		if (ctx->byte_offset != GF_FILTER_NO_BO)
+			ctx->byte_offset += ctx->mhas_buffer_size - remain;
+	}
+	ctx->mhas_buffer_size = remain;
+	if (final_flush)
+		ctx->mhas_buffer_size = 0;
+
+	if (!ctx->mhas_buffer_size) {
+		if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+		ctx->src_pck = NULL;
+	}
+
+	if (in_pck)
+		gf_filter_pid_drop_packet(ctx->ipid);
+
+	return GF_OK;
+}
+
+static void mhas_buffer_too_small(void *udta)
+{
+	GF_MHASDmxCtx *ctx = (GF_MHASDmxCtx *) udta;
+	ctx->buffer_too_small = GF_TRUE;
+}
+
+static GF_Err mhas_dmx_initialize(GF_Filter *filter)
+{
+	GF_MHASDmxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->bs = gf_bs_new((u8 *)ctx, 1, GF_BITSTREAM_READ);
+	gf_bs_set_eos_callback(ctx->bs, mhas_buffer_too_small, ctx);
+	return GF_OK;
+}
+static void mhas_dmx_finalize(GF_Filter *filter)
+{
+	GF_MHASDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->indexes) gf_free(ctx->indexes);
+	if (ctx->mhas_buffer) gf_free(ctx->mhas_buffer);
+	if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+}
+
+
+static const char *mhas_dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	s32 sync_pos = -1;
+	GF_BitStream *bs;
+	u32 nb_mhas_cfg = 0;
+	u32 nb_mhas_frames = 0;
+	u32 nb_mhas_unknown = 0;
+	const u8 *ptr = data;
+	while (ptr) {
+		u32 pos = (u32) (ptr - data);
+		const u8 *sync_start = memchr(ptr, 0xC0, size - pos);
+		if (!sync_start) return NULL;
+		if ((sync_start[1]== 0x01) && (sync_start[2]==0xA5)) {
+			sync_pos = pos;
+			break;
+		}
+		ptr = sync_start+1;
+	}
+	if (sync_pos<0) return NULL;
+	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	gf_bs_skip_bytes(bs, sync_pos);
+
+	while (gf_bs_available(bs)) {
+		u32 type = (u32) gf_mpegh_escaped_value(bs, 3, 8, 8);
+		/*u64 label = */gf_mpegh_escaped_value(bs, 2, 8, 32);
+		u64 mh_size = gf_mpegh_escaped_value(bs, 11, 24, 24);
+		if (mh_size > gf_bs_available(bs))
+			break;
+		//MHAS config
+		if (type==1) nb_mhas_cfg++;
+		else if (type==2) nb_mhas_frames++;
+		else if (type>18) nb_mhas_unknown++;
+		gf_bs_skip_bytes(bs, mh_size);
+	}
+	gf_bs_del(bs);
+	if (!nb_mhas_unknown && nb_mhas_cfg && nb_mhas_frames) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/mpegh";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability MHASDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "mhas"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/mpegh"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_MHAS),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_MHAS),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+
+#define OFFS(_n)	#_n, offsetof(GF_MHASDmxCtx, _n)
+static const GF_FilterArgs MHASDmxArgs[] =
+{
+	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{ OFFS(mpha), "demultiplex MHAS and only forward audio frames", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(pcksync), "number of unknown packets to tolerate before considering sync is lost", GF_PROP_UINT, "4", NULL, 0},
+	{ OFFS(nosync), "initial sync state", GF_PROP_BOOL, "true", NULL, 0},
+
+	{0}
+};
+
+
+GF_FilterRegister MHASDmxRegister = {
+	.name = "rfmhas",
+	GF_FS_SET_DESCRIPTION("MPEH-H Audio Stream reframer")
+	GF_FS_SET_HELP("This filter parses MHAS files/data and outputs corresponding audio PID and frames.\n"
+		"By default, the filter expects a MHAS stream with SYNC packets set, otherwise tune-in will fail. Using [-nosync]()=false can help parsing bitstreams with no SYNC packets.\n"
+		"The default behavior is to dispatch a framed MHAS bitstream. To demultiplex into a raw MPEG-H Audio, use [-mpha]().\n"
+		)
+	.private_size = sizeof(GF_MHASDmxCtx),
+	.args = MHASDmxArgs,
+	.finalize = mhas_dmx_finalize,
+	.initialize = mhas_dmx_initialize,
+	SETCAPS(MHASDmxCaps),
+	.configure_pid = mhas_dmx_configure_pid,
+	.process = mhas_dmx_process,
+	.probe_data = mhas_dmx_probe_data,
+	.process_event = mhas_dmx_process_event
+};
+
+
+const GF_FilterRegister *mhas_dmx_register(GF_FilterSession *session)
+{
+	return &MHASDmxRegister;
+}

gpac-1.0.1.tar.gz/src/filters/reframe_mp3.c -> gpac-2.0.0.tar.gz/src/filters/reframe_mp3.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / MP3 reframer filter
@@ -39,7 +39,7 @@
 {
 	//filter args
 	Double index;
-	Bool expart;
+	Bool expart, forcemp3;
 
 	//only one input pid declared
 	GF_FilterPid *ipid;
@@ -74,6 +74,7 @@
 	u32 id3_buffer_size, id3_buffer_alloc;
 
 	GF_FilterPid *vpid;
+	Bool copy_props;
 } GF_MP3DmxCtx;
 
 
@@ -86,7 +87,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -105,6 +109,7 @@
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 	}
+	if (ctx->timescale) ctx->copy_props = GF_TRUE;
 	return GF_OK;
 }
 
@@ -129,8 +134,12 @@
 	}
 	ctx->is_file = GF_TRUE;
 
-	stream = gf_fopen(p->value.string, "rb");
-	if (!stream) return;
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
 	ctx->index_size = 0;
 
@@ -180,7 +189,6 @@
 
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
 	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 }
 
 
@@ -189,10 +197,10 @@
 {
 	if ((buf[0]==0xFF) || (buf[0]==0xFE)) {
 		const u16 *sptr = (u16 *) (buf+2);
-		s32 len = (s32) ( UTF8_MAX_BYTES_PER_CHAR * gf_utf8_wcslen(sptr) );
+		u32 len = UTF8_MAX_BYTES_PER_CHAR * gf_utf8_wcslen(sptr);
 		char *tmp = gf_malloc(len+1);
-		len = (s32) gf_utf8_wcstombs(tmp, len, &sptr);
-		if (len>=0) {
+		len = gf_utf8_wcstombs(tmp, len, &sptr);
+		if (len != GF_UTF8_FAIL) {
 			tmp[len] = 0;
 			if (is_dyn) {
 				gf_filter_pid_set_property_dyn(apid, name, &PROP_STRING(tmp) );
@@ -200,7 +208,7 @@
 				gf_filter_pid_set_property_str(apid, name, &PROP_STRING(tmp) );
 			}
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[MP3Dmx] Corrupted ID3 text frame %s\n", name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[MP3Dmx] Corrupted ID3 text frame %s\n", name));
 		}
 		gf_free(tmp);
 	} else {
@@ -216,7 +224,7 @@
 {
 	GF_BitStream *bs = gf_bs_new(id3_buf, id3_buf_size, GF_BITSTREAM_READ);
 	char *sep_desc;
-	char *buf=NULL;
+	char *_buf=NULL;
 	u32 buf_alloc=0;
 	gf_bs_skip_bytes(bs, 3);
 	/*u8 major = */gf_bs_read_u8(bs);
@@ -232,6 +240,7 @@
 	}
 
 	while (size && (gf_bs_available(bs)>=10) ) {
+		char *buf;
 		char szTag[1024];
 		char *sep;
 		s32 tag_idx;
@@ -246,24 +255,23 @@
 			break;
 
 		if (size<fsize) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[MP3Dmx] Broken ID3 frame tag %s, size %d but remaining bytes %d\n", gf_4cc_to_str(ftag), fsize, size));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[MP3Dmx] Broken ID3 frame tag %s, size %d but remaining bytes %d\n", gf_4cc_to_str(ftag), fsize, size));
 			break;
 		}
 
 		if (buf_alloc<=fsize) {
-			buf = gf_realloc(buf, fsize+2);
-			buf_alloc = fsize+2;
+			_buf = gf_realloc(_buf, fsize+3);
+			buf_alloc = fsize+3;
 		}
-
-		gf_bs_read_data(bs, buf, fsize);
-		buf[fsize]=0;
-		buf[fsize+1]=0;
+		//read into _buf+1 so that buf+1 is always %2 mem aligned as it can be loaded as unsigned short
+		gf_bs_read_data(bs, _buf+1, fsize);
+		_buf[fsize+1]=0;
+		_buf[fsize+2]=0;
+		buf = _buf+1;
 
 		tag_idx = gf_itags_find_by_id3tag(ftag);
-		if (tag_idx>=0) {
-			const char *tag_name = gf_itags_get_name((u32) tag_idx);
-			id3dmx_set_string(audio_pid, (char *) tag_name, buf+1, GF_FALSE);
-		} else if (ftag==GF_ID3V2_FRAME_TXXX) {
+
+		if (ftag==GF_ID3V2_FRAME_TXXX) {
 			sep = memchr(buf, 0, fsize);
 			if (sep) {
 				if (!stricmp(buf+1, "comment")) {
@@ -289,7 +297,7 @@
 				if (video_pid_p) {
 					e = gf_filter_pid_raw_new(filter, NULL, NULL, buf+1, NULL, sep_desc+1, pic_size, GF_FALSE, video_pid_p);
 					if (e) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[MP3Dmx] error setting up video pid for cover art: %s\n", gf_error_to_string(e) ));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[MP3Dmx] error setting up video pid for cover art: %s\n", gf_error_to_string(e) ));
 					}
 					if (*video_pid_p) {
 						u8 *out_buffer;
@@ -297,9 +305,11 @@
 						gf_filter_pid_set_name(*video_pid_p, "CoverArt");
 						gf_filter_pid_set_property(*video_pid_p, GF_PROP_PID_COVER_ART, &PROP_BOOL(GF_TRUE));
 						dst_pck = gf_filter_pck_new_alloc(*video_pid_p, pic_size, &out_buffer);
-						gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
-						memcpy(out_buffer, sep_desc+1, pic_size);
-						gf_filter_pck_send(dst_pck);
+						if (dst_pck) {
+							gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+							memcpy(out_buffer, sep_desc+1, pic_size);
+							gf_filter_pck_send(dst_pck);
+						}
 
 						gf_filter_pid_set_eos(*video_pid_p);
 					}
@@ -307,6 +317,9 @@
 					gf_filter_pid_set_property(audio_pid, GF_PROP_PID_COVER_ART, &PROP_DATA(sep_desc+1, pic_size) );
 				}
 			}
+		} else if (tag_idx>=0) {
+			const char *tag_name = gf_itags_get_name((u32) tag_idx);
+			id3dmx_set_string(audio_pid, (char *) tag_name, buf+1, GF_FALSE);
 		} else {
 			sprintf(szTag, "tag_%s", gf_4cc_to_str(ftag));
 			if ((ftag>>24) == 'T') {
@@ -314,12 +327,11 @@
 			} else {
 				gf_filter_pid_set_property_dyn(audio_pid, szTag, &PROP_DATA(buf, fsize) );
 			}
-			break;
 		}
 		size -= fsize;
 	}
 	gf_bs_del(bs);
-	if (buf) gf_free(buf);
+	if (_buf) gf_free(_buf);
 }
 static void mp3_dmx_flush_id3(GF_Filter *filter, GF_MP3DmxCtx *ctx)
 {
@@ -338,9 +350,11 @@
 
 	if ((ctx->sr == gf_mp3_sampling_rate(ctx->hdr)) && (ctx->nb_ch == gf_mp3_num_channels(ctx->hdr) )
 		&& (ctx->codecid == gf_mp3_object_type_indication(ctx->hdr) )
+		&& !ctx->copy_props
 	)
 		return;
 
+	ctx->copy_props = GF_FALSE;
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
@@ -350,18 +364,29 @@
 	}
 	if (ctx->duration.num)
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 
 	if (!ctx->timescale) gf_filter_pid_set_name(ctx->opid, "audio");
 
 	ctx->nb_ch = gf_mp3_num_channels(ctx->hdr);
 	ctx->codecid = gf_mp3_object_type_indication(ctx->hdr);
+	switch (gf_mp3_layer(ctx->hdr)) {
+	case 3:
+		if (ctx->forcemp3) {
+			ctx->codecid = GF_CODECID_MPEG_AUDIO;
+		}
+		break;
+	case 1:
+		ctx->codecid = GF_CODECID_MPEG_AUDIO_L1;
+		break;
+	}
 	sr = gf_mp3_sampling_rate(ctx->hdr);
 
 	if (!ctx->timescale) {
 		//we change sample rate, change cts
 		if (ctx->cts && ctx->sr && (ctx->sr != sr)) {
-			ctx->cts *= sr;
-			ctx->cts /= ctx->sr;
+			ctx->cts = gf_timestamp_rescale(ctx->cts, ctx->sr, sr);
 		}
 	}
 	ctx->sr = sr;
@@ -369,9 +394,13 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : sr));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, & PROP_UINT(sr));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, & PROP_UINT(ctx->nb_ch) );
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(gf_mp3_object_type_indication(ctx->hdr) ) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(ctx->codecid ) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLES_PER_FRAME, & PROP_UINT(gf_mp3_window_size(ctx->hdr) ) );
 
+	if (!gf_sys_is_test_mode() ) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(gf_mp3_bit_rate(ctx->hdr) ) );
+	}
+
 	if (ctx->id3_buffer_size)
 		mp3_dmx_flush_id3(filter, ctx);
 
@@ -462,6 +491,7 @@
 {
 	GF_MP3DmxCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck, *dst_pck;
+	Bool is_eos=GF_FALSE;
 	u8 *data, *output;
 	u8 *start;
 	u32 pck_size, remain, prev_pck_size;
@@ -484,6 +514,7 @@
 				ctx->src_pck = NULL;
 				return GF_EOS;
 			}
+			is_eos = GF_TRUE;
 		} else {
 			return GF_OK;
 		}
@@ -592,7 +623,7 @@
 				if ((sync[size]=='T') && (sync[size+1]=='A') && (sync[size+2]=='G')) {
 					skip_id3v1=GF_TRUE;
 				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[MP3Dmx] invalid frame, resyncing\n"));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[MP3Dmx] invalid frame, resyncing\n"));
 					goto drop_byte;
 				}
 			}
@@ -627,6 +658,7 @@
 
 		if (!ctx->in_seek) {
 			dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+			if (!dst_pck) break;
 			memcpy(output, sync, size);
 
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);
@@ -648,7 +680,9 @@
 
 		//truncated last frame
 		if (bytes_to_drop>remain) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[MP3Dmx] truncated frame!\n"));
+			if (!is_eos) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[MP3Dmx] truncated frame!\n"));
+			}
 			bytes_to_drop=remain;
 		}
 
@@ -686,6 +720,14 @@
 	return GF_OK;
 }
 
+static GF_Err mp3_dmx_initialize(GF_Filter *filter)
+{
+	GF_MP3DmxCtx *ctx = gf_filter_get_udta(filter);
+	//in test mode we keep strict signaling, eg MPEG-2 layer 3 is still mpeg2 audio
+	if (gf_sys_is_test_mode()) ctx->forcemp3 = GF_FALSE;
+	return GF_OK;
+}
+
 static void mp3_dmx_finalize(GF_Filter *filter)
 {
 	GF_MP3DmxCtx *ctx = gf_filter_get_udta(filter);
@@ -702,6 +744,10 @@
 	u32 nb_frames=0;
 	u32 pos=0;
 	u32 prev_pos=0;
+	s32 prev_sr_idx=-1;
+	s32 prev_ch=-1;
+	s32 prev_layer=-1;
+	s32 init_pos = -1;
 	Bool has_id3 = GF_FALSE;
 
 	/* Check for ID3 */
@@ -724,10 +770,13 @@
 		u32 hdr = gf_mp3_get_next_header_mem(data, size, &pos);
 		if (!hdr) break;
 
+		if (init_pos<0) init_pos = pos;
+
 		if (gf_mp3_version(hdr) > 3)
 			break;
-		u8 sampleRateIndex = (hdr >> 10) & 0x3;
-		if (sampleRateIndex>2)
+		//check sample rate
+		u8 val = (hdr >> 10) & 0x3;
+		if (val>2)
 			break;
 		u32 fsize = gf_mp3_frame_size(hdr);
 		if (prev_pos && pos) {
@@ -735,6 +784,32 @@
 			break;
 		}
 
+		if (prev_sr_idx>=0) {
+			if ((u8) prev_sr_idx != val) {
+				nb_frames=0;
+				break;
+			}
+		}
+		prev_sr_idx = val;
+
+		val = gf_mp3_num_channels(hdr);
+		if (prev_ch>=0) {
+			if ((u8) prev_ch != val) {
+				nb_frames=0;
+				break;
+			}
+		}
+		prev_ch = val;
+
+		val = gf_mp3_layer(hdr);
+		if (prev_layer>=0) {
+			if ((u8) prev_layer != val) {
+				nb_frames=0;
+				break;
+			}
+		}
+		prev_layer = val;
+
 		if (fsize + pos > size) {
 			nb_frames++;
 			break;
@@ -749,7 +824,7 @@
 	}
 
 	if (nb_frames>=2) {
-		*score = GF_FPROBE_SUPPORTED;
+		*score = (init_pos==0) ? GF_FPROBE_SUPPORTED : GF_FPROBE_MAYBE_NOT_SUPPORTED;
 		return "audio/mp3";
 	}
 	if (nb_frames && has_id3) {
@@ -767,12 +842,14 @@
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_PART3),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO_L1),
 	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	{0},
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO),
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_PART3),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO_L1),
 	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	{0},
 	//also declare generic file output for embedded files (cover art & co), but explicit to skip this cap in chain resolution
@@ -786,7 +863,8 @@
 static const GF_FilterArgs MP3DmxArgs[] =
 {
 	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
-	{ OFFS(expart), "expose pictures as a dedicated video pid", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(expart), "expose pictures as a dedicated video PID", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(forcemp3), "force mp3 signaling for MPEG-2 Audio layer 3", GF_PROP_BOOL, "true", NULL, GF_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -797,6 +875,7 @@
 	GF_FS_SET_HELP("This filter parses MPEG-1/2 audio files/data and outputs corresponding audio PID and frames.")
 	.private_size = sizeof(GF_MP3DmxCtx),
 	.args = MP3DmxArgs,
+	.initialize = mp3_dmx_initialize,
 	.finalize = mp3_dmx_finalize,
 	SETCAPS(MP3DmxCaps),
 	.configure_pid = mp3_dmx_configure_pid,

gpac-1.0.1.tar.gz/src/filters/reframe_mpgvid.c -> gpac-2.0.0.tar.gz/src/filters/reframe_mpgvid.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / MPEG-1/2/4(Part2) video reframer filter
@@ -41,7 +41,7 @@
 	//filter args
 	GF_Fraction fps;
 	Double index;
-	Bool vfr, importer;
+	Bool vfr, importer, notime;
 
 	//only one input pid declared
 	GF_FilterPid *ipid;
@@ -79,12 +79,13 @@
 	Bool initial_play_done;
 
 	Bool input_is_au_start, input_is_au_end;
-	Bool recompute_cts;
+	Bool recompute_cts, copy_props;
 
 	GF_FilterPacket *src_pck;
 
 	MPGVidIdx *indexes;
 	u32 index_alloc_size, index_size;
+	u32 bitrate;
 } GF_MPGVidDmxCtx;
 
 
@@ -96,7 +97,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -156,6 +160,10 @@
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 	}
+	//if source has no timescale, recompute time
+	if (!ctx->timescale) ctx->notime = GF_TRUE;
+	else ctx->copy_props = GF_TRUE;
+
 	return GF_OK;
 }
 
@@ -168,7 +176,7 @@
 	GF_M4VParser *vparser;
 	GF_M4VDecSpecInfo dsi;
 	GF_Err e;
-	u64 duration, cur_dur;
+	u64 duration, cur_dur, rate;
 	const GF_PropertyValue *p;
 	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
 
@@ -185,8 +193,12 @@
 	}
 	ctx->is_file = GF_TRUE;
 
-	stream = gf_fopen(p->value.string, "rb");
-	if (!stream) return;
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
 	ctx->index_size = 0;
 
@@ -229,6 +241,7 @@
 			cur_dur = 0;
 		}
 	}
+	rate = gf_bs_get_position(bs);
 	gf_m4v_parser_del(vparser);
 	gf_fclose(stream);
 
@@ -237,17 +250,24 @@
 		ctx->duration.den = ctx->cur_fps.num;
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+		if (duration && !gf_sys_is_test_mode() ) {
+			rate *= 8 * ctx->duration.den;
+			rate /= ctx->duration.num;
+			ctx->bitrate = (u32) rate;
+		}
 	}
 
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
 	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 }
 
 
 static void mpgviddmx_enqueue_or_dispatch(GF_MPGVidDmxCtx *ctx, GF_FilterPacket *pck, Bool flush_ref, Bool is_eos)
 {
-	//TODO: we are dispatching frames in "negctts mode", ie we may have DTS>CTS
+	if (!is_eos && (!ctx->width || !ctx->height))
+		flush_ref = GF_FALSE;
+
 	//need to signal this for consumers using DTS (eg MPEG-2 TS)
 	if (flush_ref && ctx->pck_queue) {
 		//send all reference packet queued
@@ -264,7 +284,7 @@
 			gf_filter_pck_set_carousel_version(q_pck, 0);
 			cts = gf_filter_pck_get_cts(q_pck);
 			if (cts != GF_FILTER_NO_TS) {
-				//offset the cts of the ref frame to the number of B frames inbetween
+				//offset the cts of the ref frame to the number of B frames in-between
 				if (ctx->last_ref_cts == cts) {
 					cts += ctx->b_frames * ctx->cur_fps.den;
 					gf_filter_pck_set_cts(q_pck, cts);
@@ -292,33 +312,41 @@
 
 static void mpgviddmx_check_pid(GF_Filter *filter, GF_MPGVidDmxCtx *ctx, u32 vosh_size, u8 *data)
 {
+	Bool flush_after = GF_FALSE;
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
-		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		mpgviddmx_check_dur(filter, ctx);
 	}
 
-	if ((ctx->width == ctx->dsi.width) && (ctx->height == ctx->dsi.height)) return;
+	if ((ctx->width == ctx->dsi.width) && (ctx->height == ctx->dsi.height) && !ctx->copy_props) return;
 
 	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+	ctx->copy_props = GF_FALSE;
+	if (ctx->duration.num)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(GF_STREAM_VISUAL));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : ctx->cur_fps.num));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
-	if (ctx->duration.num)
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
-
-	mpgviddmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE, GF_FALSE);
 
+	if (ctx->width && ctx->height) {
+		mpgviddmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE, GF_FALSE);
+	} else {
+		flush_after = GF_TRUE;
+	}
 	ctx->width = ctx->dsi.width;
 	ctx->height = ctx->dsi.height;
+
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, & PROP_UINT( ctx->dsi.width));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT( ctx->dsi.height));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, & PROP_FRAC_INT(ctx->dsi.par_num, ctx->dsi.par_den));
 
 	if (ctx->is_mpg12) {
 		const GF_PropertyValue *cid = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_CODECID);
-		u32 PL = ctx->dsi.VideoPL;
+		u32 PL = 0;
 		if (cid) {
 			switch (cid->value.uint) {
 			case GF_CODECID_MPEG2_MAIN:
@@ -331,14 +359,27 @@
 			default:
 				break;
 			}
+		} else {
+			u32 prof = (ctx->dsi.VideoPL>>4) & 0x7;
+			if (prof==1) PL = GF_CODECID_MPEG2_HIGH;
+			else if (prof==2) PL = GF_CODECID_MPEG2_SNR;
+			else if (prof==3) PL = GF_CODECID_MPEG2_SNR;
+			else if (prof==4) PL = GF_CODECID_MPEG2_MAIN;
+			else if (prof==5) PL = GF_CODECID_MPEG2_SIMPLE;
 		}
-		if (!PL) PL = GF_CODECID_MPEG2_MAIN;
+
+		if (!PL)
+			PL = (ctx->dsi.VideoPL == GF_CODECID_MPEG1) ? GF_CODECID_MPEG1 : GF_CODECID_MPEG2_MAIN;
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(PL));
 	} else {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(GF_CODECID_MPEG4_PART2));
 	}
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PROFILE_LEVEL, & PROP_UINT (ctx->dsi.VideoPL) );
 
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
+
 	ctx->b_frames = 0;
 
 	if (vosh_size) {
@@ -357,7 +398,7 @@
 				i += 4;
 				continue;
 			}
-			frame = strchr(dcfg + i + 4, 'p');
+			frame = memchr(dcfg + i + 4, 'p', vosh_size - i - 4);
 			if (frame) {
 				ctx->forced_packed = GF_TRUE;
 				frame[0] = 'n';
@@ -370,6 +411,18 @@
 	if (ctx->is_file && ctx->index) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
 	}
+
+	if (!gf_sys_is_test_mode()) {
+		if (ctx->dsi.chroma_fmt)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_CHROMAFMT, & PROP_UINT(ctx->dsi.chroma_fmt) );
+
+		if (ctx->is_mpg12)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_INTERLACED, !ctx->dsi.progresive ? & PROP_BOOL(GF_TRUE) : NULL );
+	}
+
+	if (flush_after)
+		mpgviddmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE, GF_FALSE);
+
 }
 
 static Bool mpgviddmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
@@ -449,7 +502,7 @@
 {
 	assert(ctx->cur_fps.num);
 
-	if (ctx->timescale) {
+	if (!ctx->notime) {
 		u64 inc = 3000;
 		if (ctx->cur_fps.den && ctx->cur_fps.num) {
 			inc = ctx->cur_fps.den;
@@ -533,27 +586,34 @@
 	start = data;
 	remain = pck_size;
 
-	//input pid sets some timescale - we flushed pending data , update cts
+	//input pid was muxed - we flushed pending data , update cts
 	if (!ctx->resume_from && ctx->timescale) {
-		u64 ts = gf_filter_pck_get_cts(pck);
-		if (ts != GF_FILTER_NO_TS) {
-			if (!ctx->cts || !ctx->recompute_cts)
-				ctx->cts = ts;
-		}
-		ts = gf_filter_pck_get_dts(pck);
-		if (ts != GF_FILTER_NO_TS) {
-			if (!ctx->dts || !ctx->recompute_cts)
-				ctx->dts = ts;
-
-			if (!ctx->prev_dts) ctx->prev_dts = ts;
-			else if (ctx->prev_dts != ts) {
-				u64 diff = ts;
-				diff -= ctx->prev_dts;
-				if (!ctx->cur_fps.den) ctx->cur_fps.den = (u32) diff;
-				else if (ctx->cur_fps.den > diff)
-					ctx->cur_fps.den = (u32) diff;
+		if (!ctx->notime) {
+			u64 ts = gf_filter_pck_get_cts(pck);
+			if (ts != GF_FILTER_NO_TS) {
+				if (!ctx->cts || !ctx->recompute_cts)
+					ctx->cts = ts;
+			}
+			ts = gf_filter_pck_get_dts(pck);
+			if (ts != GF_FILTER_NO_TS) {
+				if (!ctx->dts || !ctx->recompute_cts) {
+					ctx->dts = ts;
+				}
+
+				if (!ctx->prev_dts) ctx->prev_dts = ts;
+				else if (ctx->prev_dts != ts) {
+					u64 diff = ts;
+					diff -= ctx->prev_dts;
+					if (!ctx->cur_fps.den)
+						ctx->cur_fps.den = (u32) diff;
+					else if (ctx->cur_fps.den > diff)
+						ctx->cur_fps.den = (u32) diff;
+
+					ctx->prev_dts = ts;
+				}
 			}
 		}
+
 		gf_filter_pck_get_framing(pck, &ctx->input_is_au_start, &ctx->input_is_au_end);
 		//this will force CTS recomput of each frame
 		if (ctx->recompute_cts) ctx->input_is_au_start = GF_FALSE;
@@ -617,7 +677,7 @@
 		u8 ftype;
 		u32 tinc;
 		u64 size=0;
-		u64 fstart;
+		u64 fstart=0;
 		Bool is_coded;
 		u32 bytes_from_store = 0;
 		u32 hdr_offset = 0;
@@ -640,18 +700,23 @@
 
 			//no start code in stored buffer
 			if ((current<0) || (current >= (s32) ctx->bytes_in_header) ) {
-				dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->bytes_in_header, &pck_data);
-				if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
-				gf_filter_pck_set_cts(dst_pck, GF_FILTER_NO_TS);
-				gf_filter_pck_set_dts(dst_pck, GF_FILTER_NO_TS);
-				memcpy(pck_data, ctx->hdr_store, ctx->bytes_in_header);
-				gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+				if (ctx->opid) {
+					dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->bytes_in_header, &pck_data);
+					if (!dst_pck) return GF_OUT_OF_MEM;
+
+					if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
+					gf_filter_pck_set_cts(dst_pck, GF_FILTER_NO_TS);
+					gf_filter_pck_set_dts(dst_pck, GF_FILTER_NO_TS);
+					memcpy(pck_data, ctx->hdr_store, ctx->bytes_in_header);
+					gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+
+					if (byte_offset != GF_FILTER_NO_BO) {
+						gf_filter_pck_set_byte_offset(dst_pck, byte_offset - ctx->bytes_in_header);
+					}
 
-				if (byte_offset != GF_FILTER_NO_BO) {
-					gf_filter_pck_set_byte_offset(dst_pck, byte_offset - ctx->bytes_in_header);
+					mpgviddmx_enqueue_or_dispatch(ctx, dst_pck, GF_FALSE, GF_FALSE);
 				}
 
-				mpgviddmx_enqueue_or_dispatch(ctx, dst_pck, GF_FALSE, GF_FALSE);
 				if (current<0) current = -1;
 				else current -= ctx->bytes_in_header;
 				ctx->bytes_in_header = 0;
@@ -670,7 +735,7 @@
 				sc_type_forced = GF_TRUE;
 			}
 		}
-		//no starcode in store, look for startcode in packet
+		//no startcode in store, look for startcode in packet
 		if (current == -1) {
 			//locate next start code
 			current = mpgviddmx_next_start_code(start, remain);
@@ -694,6 +759,8 @@
 				}
 
 				dst_pck = gf_filter_pck_new_alloc(ctx->opid, (u32) size, &pck_data);
+				if (!dst_pck) return GF_OUT_OF_MEM;
+
 				if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
 				memcpy(pck_data, start, (size_t) size);
 				gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
@@ -732,10 +799,12 @@
 		if (current>0) {
 			//flush remaining
 			dst_pck = gf_filter_pck_new_alloc(ctx->opid, current, &pck_data);
+			if (!dst_pck) return GF_OUT_OF_MEM;
+
 			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
 			gf_filter_pck_set_cts(dst_pck, GF_FILTER_NO_TS);
 			gf_filter_pck_set_dts(dst_pck, GF_FILTER_NO_TS);
-			gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_TRUE);
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
 			//bytes were partly in store, partly in packet
 			if (bytes_from_store) {
 				if (byte_offset != GF_FILTER_NO_BO) {
@@ -760,9 +829,15 @@
 			mpgviddmx_enqueue_or_dispatch(ctx, dst_pck, GF_FALSE, GF_FALSE);
 		}
 
-		//parse headers
+		//not enough bytes to parse start code
+		if (remain<5) {
+			memcpy(ctx->hdr_store, start, remain);
+			ctx->bytes_in_header = remain;
+			break;
+		}
 
-		//we have a start code loaded, eg the data packet does not have a full start code at the begining
+		//parse headers
+		//we have a start code loaded, eg the data packet does not have a full start code at the beginning
 		if (sc_type_forced) {
 			gf_bs_reassign_buffer(ctx->bs, start + hdr_offset, remain - hdr_offset);
 			sc_type = forced_sc_type;
@@ -781,18 +856,27 @@
 				//not enough data, accumulate until we can parse the full header
 				if (e==GF_EOS) {
 					if (vosh_start<0) vosh_start = 0;
-					if (ctx->hdr_store_alloc < ctx->hdr_store_size + pck_size - vosh_start) {
-						ctx->hdr_store_alloc = (u32) (ctx->hdr_store_size + pck_size - vosh_start);
-						ctx->hdr_store = gf_realloc(ctx->hdr_store, sizeof(char)*ctx->hdr_store_alloc);
+					if (data == ctx->hdr_store) {
+						memmove(ctx->hdr_store, start, remain);
+						ctx->hdr_store_size = remain;
+					} else {
+						if (ctx->hdr_store_alloc < ctx->hdr_store_size + pck_size - vosh_start) {
+							ctx->hdr_store_alloc = (u32) (ctx->hdr_store_size + pck_size - vosh_start);
+							ctx->hdr_store = gf_realloc(ctx->hdr_store, sizeof(char)*ctx->hdr_store_alloc);
+						}
+						memcpy(ctx->hdr_store + ctx->hdr_store_size, data + vosh_start, (size_t) (pck_size - vosh_start) );
+						ctx->hdr_store_size += pck_size - (u32) vosh_start;
 					}
-					memcpy(ctx->hdr_store + ctx->hdr_store_size, data + vosh_start, (size_t) (pck_size - vosh_start) );
-					ctx->hdr_store_size += pck_size - (u32) vosh_start;
 					gf_filter_pid_drop_packet(ctx->ipid);
 					return GF_OK;
 				} else if (e != GF_OK) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[MPGVid] Failed to parse VOS header: %s\n", gf_error_to_string(e) ));
-				} else {
-					mpgviddmx_check_pid(filter, ctx, 0, NULL);
+				} else if (ctx->dsi.width && ctx->dsi.height) {
+					u32 obj_size = (u32) gf_m4v_get_object_start(ctx->vparser);
+					if (vosh_start<0) vosh_start = 0;
+					vosh_end = start - (u8 *)data + obj_size;
+					vosh_end -= vosh_start;
+					mpgviddmx_check_pid(filter, ctx,(u32) vosh_end, data+vosh_start);
 				}
 				break;
 			case M2V_PIC_START_CODE:
@@ -820,18 +904,24 @@
 				//not enough data, accumulate until we can parse the full header
 				if (e==GF_EOS) {
 					if (vosh_start<0) vosh_start = 0;
-					if (ctx->hdr_store_alloc < ctx->hdr_store_size + pck_size - vosh_start) {
-						ctx->hdr_store_alloc = (u32) (ctx->hdr_store_size + pck_size - (u32) vosh_start);
-						ctx->hdr_store = gf_realloc(ctx->hdr_store, sizeof(char)*ctx->hdr_store_alloc);
+					if (data == ctx->hdr_store) {
+						memmove(ctx->hdr_store, start, remain);
+						ctx->hdr_store_size = remain;
+					} else {
+						if (ctx->hdr_store_alloc < ctx->hdr_store_size + pck_size - vosh_start) {
+							ctx->hdr_store_alloc = (u32) (ctx->hdr_store_size + pck_size - (u32) vosh_start);
+							ctx->hdr_store = gf_realloc(ctx->hdr_store, sizeof(char)*ctx->hdr_store_alloc);
+						}
+						memcpy(ctx->hdr_store + ctx->hdr_store_size, data + vosh_start, (size_t) (pck_size - vosh_start) );
+						ctx->hdr_store_size += pck_size - (u32) vosh_start;
 					}
-					memcpy(ctx->hdr_store + ctx->hdr_store_size, data + vosh_start, (size_t) (pck_size - vosh_start) );
-					ctx->hdr_store_size += pck_size - (u32) vosh_start;
 					gf_filter_pid_drop_packet(ctx->ipid);
 					return GF_OK;
 				} else if (e != GF_OK) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[MPGVid] Failed to parse VOS header: %s\n", gf_error_to_string(e) ));
 				} else {
 					u32 obj_size = (u32) gf_m4v_get_object_start(ctx->vparser);
+					if (vosh_start<0) vosh_start = 0;
 					vosh_end = start - (u8 *)data + obj_size;
 					vosh_end -= vosh_start;
 					mpgviddmx_check_pid(filter, ctx,(u32) vosh_end, data+vosh_start);
@@ -891,7 +981,28 @@
 		gf_m4v_parser_reset(ctx->vparser, sc_type_forced ? forced_sc_type + 1 : 0);
 		size = 0;
 		e = gf_m4v_parse_frame(ctx->vparser, &ctx->dsi, &ftype, &tinc, &size, &fstart, &is_coded);
-		//true if we strip VO and VISOBJ assert(!fstart);
+
+		//only for m1v/m2v, for m4v we mah have fstart>0 when we strip VO and VISOBJ
+		if (ctx->is_mpg12 && fstart && (fstart<remain)) {
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, (u32) fstart, &pck_data);
+			if (!dst_pck) return GF_OUT_OF_MEM;
+
+			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
+			memcpy(pck_data, start, (size_t) fstart);
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+			gf_filter_pck_set_cts(dst_pck, GF_FILTER_NO_TS);
+			gf_filter_pck_set_dts(dst_pck, GF_FILTER_NO_TS);
+
+			if (byte_offset != GF_FILTER_NO_BO) {
+				gf_filter_pck_set_byte_offset(dst_pck, byte_offset);
+				byte_offset+=fstart;
+			}
+
+			mpgviddmx_enqueue_or_dispatch(ctx, dst_pck, GF_FALSE, GF_FALSE);
+
+			start += fstart;
+			remain -= (s32) fstart;
+		}
 
 		//we skipped bytes already in store + end of start code present in packet, so the size of the first object
 		//needs adjustement
@@ -944,7 +1055,7 @@
 		} else {
 			//flush all pending packets
 			mpgviddmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE, GF_FALSE);
-			//remeber the CTS of the last ref
+			//remember the CTS of the last ref
 			ctx->last_ref_cts = ctx->cts;
 			if (ctx->max_b < ctx->b_frames) ctx->max_b = ctx->b_frames;
 			
@@ -957,6 +1068,8 @@
 		ctx->nb_frames++;
 
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, (u32) size, &pck_data);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+
 		if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
 		//bytes come from both our store and the data packet
 		if (bytes_from_store) {
@@ -984,11 +1097,11 @@
 		if (ctx->input_is_au_start) {
 			ctx->input_is_au_start = GF_FALSE;
 		} else {
-			//we use the carrousel flag temporarly to indicate the cts must be recomputed
+			//we use the carousel flag temporarly to indicate the cts must be recomputed
 			gf_filter_pck_set_carousel_version(dst_pck, 1);
 		}
 		gf_filter_pck_set_sap(dst_pck, ftype ? GF_FILTER_SAP_NONE : GF_FILTER_SAP_1);
-		gf_filter_pck_set_duration(dst_pck, ctx->cur_fps.den);
+		if (ctx->cur_fps.den > 0) gf_filter_pck_set_duration(dst_pck, ctx->cur_fps.den);
 		if (ctx->in_seek) gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
 		ctx->frame_started = GF_TRUE;
 
@@ -1005,14 +1118,6 @@
 		assert(remain>=size);
 		start += size;
 		remain -= (s32) size;
-
-
-		//don't demux too much of input, abort when we would block. This avoid dispatching
-		//a huge number of frames in a single call
-		if (!ctx->timescale && gf_filter_pid_would_block(ctx->opid)) {
-			ctx->resume_from = (u32) ((char *)start - (char *)data);
-			return GF_OK;
-		}
 	}
 	gf_filter_pid_drop_packet(ctx->ipid);
 
@@ -1044,21 +1149,23 @@
 	}
 	if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
 	if (ctx->importer) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s Import results: %d VOPs (%d Is - %d Ps - %d Bs)\n", ctx->is_mpg12 ? "MPEG-1/2" : "MPEG-4 (Part 2)", ctx->nb_frames, ctx->nb_i, ctx->nb_p, ctx->nb_b));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s Import results: %d VOPs (%d Is - %d Ps - %d Bs)\n", ctx->is_mpg12 ? "MPEG-1/2" : "MPEG-4 (Part 2)", ctx->nb_frames, ctx->nb_i, ctx->nb_p, ctx->nb_b));
 		if (ctx->nb_b) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("\t%d max consecutive B-frames%s\n", ctx->max_b, ctx->is_packed ? " - packed bitstream" : "" ));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("\t%d max consecutive B-frames%s\n", ctx->max_b, ctx->is_packed ? " - packed bitstream" : "" ));
 		}
 		if (ctx->is_vfr && ctx->nb_b && ctx->is_packed) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Warning: Mix of non-coded frames: packed bitstream and encoder skiped - unpredictable timing\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Warning: Mix of non-coded frames: packed bitstream and encoder skiped - unpredictable timing\n"));
 		}
 	}
 }
 
+u32 gf_m4v_parser_get_obj_type(GF_M4VParser *m4v);
+
 static const char * mpgvdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
 {
 	GF_M4VParser *parser;
 	u8 ftype;
-	u32 tinc, nb_frames;
+	u32 tinc, nb_frames, o_start=0;
 	u64 fsize, start;
 	Bool is_coded;
 	GF_Err e;
@@ -1068,15 +1175,40 @@
 	parser = gf_m4v_parser_new((char*)data, size, GF_FALSE);
 	nb_frames = 0;
 	while (1) {
+		u32 otype;
 		ftype = 0;
 		is_coded = GF_FALSE;
 		e = gf_m4v_parse_frame(parser, &dsi, &ftype, &tinc, &fsize, &start, &is_coded);
-		if (!nb_frames && start)
+		if (!nb_frames && start) o_start = (u32) start;
+
+		otype = gf_m4v_parser_get_obj_type(parser);
+		switch (otype) {
+		case M4V_VOL_START_CODE:
+		case M4V_VOP_START_CODE:
+		case M4V_VISOBJ_START_CODE:
+		case M4V_VOS_START_CODE:
+		case M4V_GOV_START_CODE:
+		case M4V_UDTA_START_CODE:
 			break;
+		default:
+			otype = 0;
+		}
+
+		//if start is more than 4 (start-code size), we have garbage at the beginning, do not parse
+		//except if we have a valid object VOS
+		if (!nb_frames && (start>4) && !otype) {
+			break;
+		}
 		if (is_coded) nb_frames++;
 		if (e==GF_EOS) {
-			if (is_coded) nb_frames++;
 			e = GF_OK;
+			//special case if the only frame we have is not coded
+			if (otype == M4V_VOP_START_CODE) {
+				if (!nb_frames) nb_frames++;
+				is_coded = 1;
+			}
+
+			if (is_coded) nb_frames++;
 			break;
 		}
 		if (ftype>2) break;
@@ -1085,7 +1217,7 @@
 	}
 	gf_m4v_parser_del(parser);
 	if ((e==GF_OK) && (nb_frames>1)) {
-		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		*score = o_start ? GF_FPROBE_MAYBE_NOT_SUPPORTED : GF_FPROBE_MAYBE_SUPPORTED;
 		return "video/mp4v-es";
 	}
 
@@ -1096,8 +1228,11 @@
 		ftype = 0;
 		is_coded = GF_FALSE;
 		e = gf_m4v_parse_frame(parser, &dsi, &ftype, &tinc, &fsize, &start, &is_coded);
-		if (!nb_frames && start)
+
+		//if start is more than 4 (start-code size), we have garbage at the beginning, do not parse
+		if (!nb_frames && (start>4) ) {
 			break;
+		}
 		if (is_coded) nb_frames++;
 		if (e==GF_EOS) {
 			if (is_coded) nb_frames++;
@@ -1110,7 +1245,7 @@
 	}
 	gf_m4v_parser_del(parser);
 	if ((e==GF_OK) && (nb_frames>1)) {
-		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		*score = o_start ? GF_FPROBE_MAYBE_NOT_SUPPORTED : GF_FPROBE_MAYBE_SUPPORTED;
 		return "video/mpgv-es";
 	}
 	return NULL;
@@ -1152,6 +1287,7 @@
 	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
 	{ OFFS(vfr), "set variable frame rate import", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(importer), "compatibility with old importer, displays import results", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(notime), "ignore input timestamps, rebuild from 0", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };
 
@@ -1160,7 +1296,7 @@
 	.name = "rfmpgvid",
 	GF_FS_SET_DESCRIPTION("M1V/M2V/M4V reframer")
 	GF_FS_SET_HELP("This filter parses MPEG-1/2 and MPEG-4 part 2 video files/data and outputs corresponding video PID and frames.\n"
-		"Note: The demux uses negative CTS offsets: CTS is corrrect, but some frames may have DTS greater than CTS.")
+		"Note: The filter uses negative CTS offsets: CTS is correct, but some frames may have DTS greater than CTS.")
 	.private_size = sizeof(GF_MPGVidDmxCtx),
 	.args = MPGVidDmxArgs,
 	.initialize = mpgviddmx_initialize,

gpac-1.0.1.tar.gz/src/filters/reframe_nalu.c -> gpac-2.0.0.tar.gz/src/filters/reframe_nalu.c Changed

@@ -2,10 +2,10 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
- * This file is part of GPAC / NALU (AVC & HEVC) reframer filter
+ * This file is part of GPAC / NALU (AVC, HEVC, VVC) reframer filter
 *
 * GPAC is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -34,11 +34,17 @@
 
 #define CTS_POC_OFFSET_SAFETY	1000
 
-//storage for nal header + slice header when not fully included in an input buffer - this needs to be big enough to hold a slice header
-//note that we only copy the entire input packet in an internal buffer when the current NAL needs to be fully available for parsing (VPS, SPS, PPS),
-//or for temporary storage (SEI)
-//otherwise we copy remaining bytes in the hdr store if a startcode may be split across two input packets
-#define SAFETY_NAL_STORE	50
+GF_Err gf_bs_set_logger(GF_BitStream *bs, void (*on_bs_log)(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3), void *udta);
+
+
+enum
+{
+	DVMODE_NONE=0,
+	DVMODE_AUTO,
+	DVMODE_FORCE,
+	DVMODE_CLEAN,
+	DVMODE_SINGLE,
+};
 
 typedef struct
 {
@@ -64,10 +70,12 @@
 	//filter args
 	GF_Fraction fps;
 	Double index;
-	Bool explicit, force_sync, nosei, importer, subsamples, nosvc, novpsext, deps, seirw, audelim, analyze;
+	Bool explicit, force_sync, nosei, importer, subsamples, nosvc, novpsext, deps, seirw, audelim, analyze, notime;
 	u32 nal_length;
 	u32 strict_poc;
-	GF_Fraction idur;
+	u32 bsdbg;
+	GF_Fraction dur;
+	u32 dv_mode, dv_profile, dv_compatid;
 
 	//only one input pid declared
 	GF_FilterPid *ipid;
@@ -126,7 +134,7 @@
 	Bool nal_adjusted;
 
 	//avc/hevc switch
-	Bool is_hevc;
+	u32 codecid;
 	//name of the logger
 	const char *log_name;
 
@@ -140,19 +148,17 @@
 	//max size of NALUs in the bitstream
 	u32 max_nalu_size;
 
-	//we store a few bytes here to make sure we have at least start code and NAL type
-	//we also store here NALUs we must completely parse (xPS, SEIs)
-	u32 bytes_in_header;
-	char *hdr_store;
-	u32 hdr_store_size, hdr_store_alloc;
+
+	u8 *nal_store;
+	u32 nal_store_size, nal_store_alloc;
 
 	//list of param sets found
-	GF_List *sps, *pps, *vps, *sps_ext, *pps_svc;
+	GF_List *sps, *pps, *vps, *sps_ext, *pps_svc, *vvc_aps_pre, *vvc_dci;
 	//set to true if one of the PS has been modified, will potentially trigger a PID reconfigure
 	Bool ps_modified;
 
 	//stats
-	u32 nb_idr, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_nalus, nb_aud;
+	u32 nb_idr, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_nalus, nb_aud, nb_cra;
 
 	//frame has intra slice
 	Bool has_islice;
@@ -160,6 +166,8 @@
 	GF_FilterSAPType au_sap;
 	//frame first slice
 	Bool first_slice_in_au;
+	//frame first slice
+	Bool au_sap2_poc_reset;
 	//paff used - NEED FURTHER CHECKING
 	Bool is_paff;
 	Bool bottom_field_flag;
@@ -178,8 +186,6 @@
 	//frame has redundant coding
 	Bool has_redundant;
 
-	Bool next_nal_end_skip;
-
 	Bool last_frame_is_idr;
 
 	//buffer to store SEI messages
@@ -206,28 +212,51 @@
 	HEVCState *hevc_state;
 	//shvc stats
 	u32 nb_e_idr, nb_e_i, nb_e_p, nb_e_b;
+	Bool vvc_no_stats;
 
 	LHVCLayerInfo linf[64];
 	u8 max_temporal_id[64];
 	u8 min_layer_id;
 
+	//VVC specific
+	VVCState *vvc_state;
+
 	Bool has_initial_aud;
 	char init_aud[3];
 
-	Bool interlaced, eos_in_bs;
+	Bool interlaced;
 
 	Bool is_mvc;
+
+	u32 bitrate;
+	u32 nb_frames;
+
+	//layer and temporal ID of last VCL nal
+	u8 last_layer_id, last_temporal_id;
+
+	u32 clli_crc, mdcv_crc;
+
+	u32 nb_dv_rpu, nb_dv_el;
 } GF_NALUDmxCtx;
 
+static void naludmx_enqueue_or_dispatch(GF_NALUDmxCtx *ctx, GF_FilterPacket *n_pck, Bool flush_ref);
+static void naludmx_finalize_au_flags(GF_NALUDmxCtx *ctx);
+static void naludmx_reset_param_sets(GF_NALUDmxCtx *ctx, Bool do_free);
+static void naludmx_set_dolby_vision(GF_NALUDmxCtx *ctx);
+
 
 GF_Err naludmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	const GF_PropertyValue *p;
+	u32 old_codecid;
 	GF_NALUDmxCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -247,13 +276,25 @@
 		}
 	}
 
+	old_codecid = ctx->codecid;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
 	if (p) {
 		switch (p->value.uint) {
 		case GF_CODECID_HEVC:
 		case GF_CODECID_LHVC:
-			ctx->is_hevc = GF_TRUE;
+			ctx->codecid = GF_CODECID_HEVC;
+			break;
+		case GF_CODECID_VVC:
+			ctx->codecid = GF_CODECID_VVC;
 			break;
+		case GF_CODECID_AVC:
+		case GF_CODECID_AVC_PS:
+		case GF_CODECID_SVC:
+		case GF_CODECID_MVC:
+			ctx->codecid = GF_CODECID_AVC;
+			break;
+		default:
+			return GF_NOT_SUPPORTED;
 		}
 	}
 	else {
@@ -265,7 +306,12 @@
 			|| strstr(p->value.string, "shvc")
 			|| strstr(p->value.string, "mhvc")
 			|| strstr(p->value.string, "lhvc")
-		) ) ctx->is_hevc = GF_TRUE;
+		) )
+			ctx->codecid = GF_CODECID_HEVC;
+		else if (p && p->value.string && (
+			strstr(p->value.string, "vvc")
+		) )
+			ctx->codecid = GF_CODECID_VVC;
 		else {
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
 			if (p && p->value.string && (
@@ -275,21 +321,42 @@
 				 || strstr(p->value.string, "shvc")
 				 || strstr(p->value.string, "mhvc")
 				 || strstr(p->value.string, "lhvc")
-			 ) ) ctx->is_hevc = GF_TRUE;
+			 ) )
+				ctx->codecid = GF_CODECID_HEVC;
+			else if (p && p->value.string && (
+				 strstr(p->value.string, "vvc")
+				 || strstr(p->value.string, "266")
+				 || strstr(p->value.string, "lvvc")
+			 ) )
+				ctx->codecid = GF_CODECID_VVC;
+			else
+				ctx->codecid = GF_CODECID_AVC;
 		}
 	}
-	if (ctx->is_hevc) {
+
+	if (old_codecid && (old_codecid != ctx->codecid)) {
+		naludmx_reset_param_sets(ctx, GF_FALSE);
+	}
+
+	if (ctx->codecid==GF_CODECID_HEVC) {
 #ifdef GPAC_DISABLE_HEVC
 		return GF_NOT_SUPPORTED;
 #else
 		ctx->log_name = "HEVC";
-		if (ctx->avc_state) gf_free(ctx->avc_state);
+		if (ctx->avc_state) { gf_free(ctx->avc_state); ctx->avc_state = NULL; }
+		if (ctx->vvc_state) { gf_free(ctx->vvc_state); ctx->vvc_state = NULL; }
 		if (!ctx->hevc_state) GF_SAFEALLOC(ctx->hevc_state, HEVCState);
 		ctx->min_layer_id = 0xFF;
 #endif
+	} else if (ctx->codecid==GF_CODECID_VVC) {
+		ctx->log_name = "VVC";
+		if (ctx->hevc_state) { gf_free(ctx->hevc_state); ctx->hevc_state = NULL; }
+		if (ctx->avc_state) { gf_free(ctx->avc_state); ctx->avc_state = NULL; }
+		if (!ctx->vvc_state) GF_SAFEALLOC(ctx->vvc_state, VVCState);
 	} else {
 		ctx->log_name = "AVC|H264";
-		if (ctx->hevc_state) gf_free(ctx->hevc_state);
+		if (ctx->hevc_state) { gf_free(ctx->hevc_state); ctx->hevc_state = NULL; }
+		if (ctx->vvc_state) { gf_free(ctx->vvc_state); ctx->vvc_state = NULL; }
 		if (!ctx->avc_state) GF_SAFEALLOC(ctx->avc_state, AVCState);
 	}
 	if (ctx->timescale && !ctx->opid) {
@@ -298,14 +365,37 @@
 	}
 	ctx->full_au_source = GF_FALSE;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_UNFRAMED_FULL_AU);
-	if (p && p->value.boolean)
+	if (p && p->value.boolean) {
+		GF_FilterEvent fevt;
+		//this is a reframer used after an encoder, we want to make sure we have enough frames to compute POC otherwise we might block the chain
+		//by holding input packets - ask 1s by default
+		GF_FEVT_INIT(fevt, GF_FEVT_BUFFER_REQ, ctx->ipid);
+		fevt.buffer_req.pid_only = GF_TRUE;
+		fevt.buffer_req.max_buffer_us = 1000000;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
 		ctx->full_au_source = GF_TRUE;
+	}
+
+	//if source has no timescale, recompute time
+	if (!ctx->timescale) ctx->notime = GF_TRUE;
 
 	//copy properties at init or reconfig
 	if (ctx->opid) {
+		if (ctx->poc_probe_done) {
+			//full frame mode, flush everything before signaling discontinuity
+			//for other modes discontinuity we signal discontinuity before the current AU being reconstructed
+			if (ctx->full_au_source && ctx->first_pck_in_au)
+				naludmx_finalize_au_flags(ctx);
+
+			naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
+		}
+		ctx->nal_store_size = 0;
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(GF_STREAM_VISUAL));
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(ctx->is_hevc ? GF_CODECID_HEVC : GF_CODECID_AVC));
+		//don't change codec type if reframing an ES (for HLS SAES)
+		if (!ctx->timescale)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(GF_STREAM_VISUAL));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(ctx->codecid));
+
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED_FULL_AU, NULL);
 		if (!gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_ID))
@@ -314,7 +404,7 @@
 		ctx->ps_modified = GF_TRUE;
 		ctx->crc_cfg = ctx->crc_cfg_enh = 0;
 	}
-	
+
 	return GF_OK;
 }
 
@@ -323,9 +413,10 @@
 {
 	FILE *stream;
 	GF_BitStream *bs;
-	u64 duration, cur_dur, nal_start, start_code_pos;
+	u64 duration, cur_dur, nal_start, start_code_pos, rate;
 	AVCState *avc_state = NULL;
 	HEVCState *hevc_state = NULL;
+	VVCState *vvc_state = NULL;
 	Bool first_slice_in_pic = GF_TRUE;
 	const GF_PropertyValue *p;
 	const char *filepath = NULL;
@@ -341,11 +432,15 @@
 	ctx->is_file = GF_TRUE;
 
 	if (ctx->index<0) {
-		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
-		if (!p || (p->value.longuint > 100000000)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[%s] Source file larger than 100M, skipping indexing\n", ctx->log_name));
+		if (gf_opts_get_bool("temp", "force_indexing")) {
+			ctx->index = 1.0;
 		} else {
-			ctx->index = -ctx->index;
+			p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
+			if (!p || (p->value.longuint > 20000000)) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[%s] Source file larger than 20M, skipping indexing\n", ctx->log_name));
+			} else {
+				ctx->index = -ctx->index;
+			}
 		}
 	}
 	if (ctx->index<=0) {
@@ -354,18 +449,26 @@
 		return;
 	}
 
-	if (ctx->is_hevc) {
+	if (ctx->codecid==GF_CODECID_HEVC) {
 		GF_SAFEALLOC(hevc_state, HEVCState);
 		if (!hevc_state) return;
+	} else if (ctx->codecid==GF_CODECID_VVC) {
+		GF_SAFEALLOC(vvc_state, VVCState);
+		if (!vvc_state) return;
 	} else {
 		GF_SAFEALLOC(avc_state, AVCState);
 		if (!avc_state) return;
 	}
 
-	stream = gf_fopen(filepath, "rb");
+	stream = gf_fopen_ex(filepath, NULL, "rb", GF_TRUE);
 	if (!stream) {
 		if (hevc_state) gf_free(hevc_state);
+		if (vvc_state) gf_free(vvc_state);
 		if (avc_state) gf_free(avc_state);
+		if (gf_fileio_is_main_thread(filepath)) {
+			ctx->duration.num = 1;
+			ctx->file_loaded = GF_TRUE;
+		}
 		return;
 	}
 	ctx->index_size = 0;
@@ -400,7 +503,7 @@
 #ifndef GPAC_DISABLE_HEVC
 			u8 temporal_id, layer_id, nal_type;
 
-			res = gf_media_hevc_parse_nalu_bs(bs, hevc_state, &nal_type, &temporal_id, &layer_id);
+			res = gf_hevc_parse_nalu_bs(bs, hevc_state, &nal_type, &temporal_id, &layer_id);
 			if (res>0) first_slice_in_pic = GF_TRUE;
 			switch (nal_type) {
 			case GF_HEVC_NALU_SLICE_IDR_N_LP:
@@ -426,10 +529,12 @@
 				break;
 			}
 #endif // GPAC_DISABLE_HEVC
+		} else if (vvc_state) {
+
 		} else {
 			u32 nal_type;
 			u64 pos = gf_bs_get_position(bs);
-			res = gf_media_avc_parse_nalu(bs, avc_state);
+			res = gf_avc_parse_nalu(bs, avc_state);
 			if (res>0) first_slice_in_pic = GF_TRUE;
 
 			nal_type = avc_state->last_nal_type_parsed;
@@ -437,11 +542,11 @@
 			switch (nal_type) {
 			case GF_AVC_NALU_SEQ_PARAM:
 				gf_bs_seek(bs, pos);
-				gf_media_avc_read_sps_bs(bs, avc_state, GF_FALSE, NULL);
+				gf_avc_read_sps_bs(bs, avc_state, GF_FALSE, NULL);
 				break;
 			case GF_AVC_NALU_PIC_PARAM:
 				gf_bs_seek(bs, pos);
-				gf_media_avc_read_pps_bs(bs, avc_state);
+				gf_avc_read_pps_bs(bs, avc_state);
 				break;
 			case GF_AVC_NALU_IDR_SLICE:
 				is_rap = GF_TRUE;
@@ -488,9 +593,11 @@
 		nal_start = gf_bs_get_position(bs);
 	}
 
+	rate = gf_bs_get_position(bs);
 	gf_bs_del(bs);
 	gf_fclose(stream);
 	if (hevc_state) gf_free(hevc_state);
+	if (vvc_state) gf_free(vvc_state);
 	if (avc_state) gf_free(avc_state);
 
 	if (!ctx->duration.num || (ctx->duration.num * ctx->cur_fps.num != duration * ctx->duration.den)) {
@@ -498,11 +605,17 @@
 		ctx->duration.den = ctx->cur_fps.num;
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+		if (duration && (!gf_sys_is_test_mode() || gf_opts_get_bool("temp", "force_indexing"))) {
+			rate *= 8 * ctx->duration.den;
+			rate /= ctx->duration.num;
+			ctx->bitrate = (u32) rate;
+		}
 	}
 
+
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
 	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 }
 
 
@@ -603,9 +716,9 @@
 				}
 
 				gf_filter_pck_set_cts(q_pck, cts);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[%s] Frame timestamps computed dts "LLU" cts "LLU" (poc %d min poc %d poc_diff %d last IDR DTS "LLU")\n", ctx->log_name, dts, cts, poc, ctx->min_poc, ctx->poc_diff, ctx->dts_last_IDR));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] Frame timestamps computed dts "LLU" cts "LLU" (poc %d min poc %d poc_diff %d last IDR DTS "LLU")\n", ctx->log_name, dts, cts, poc, ctx->min_poc, ctx->poc_diff, ctx->dts_last_IDR));
 
-				if (ctx->importer) {
+				if (ctx->importer && ctx->cur_fps.den) {
 					poc = (s32) ( (s64) cts - (s64) dts);
 					if (poc<0) poc = -poc;
 					poc /= ctx->cur_fps.den;
@@ -623,30 +736,30 @@
 	gf_list_add(ctx->pck_queue, n_pck);
 }
 
-#ifndef GPAC_DISABLE_HEVC
-
-static void naludmx_hevc_add_param(GF_HEVCConfig *cfg, GF_AVCConfigSlot *sl, u8 nal_type)
+static void naludmx_add_param_nalu(GF_List *param_list, GF_NALUFFParam *sl, u8 nal_type)
 {
-	GF_HEVCParamArray *pa = NULL;
+	GF_NALUFFParamArray *pa = NULL;
 	u32 i, count;
-	count = gf_list_count(cfg->param_array);
+	count = gf_list_count(param_list);
 	for (i=0; i<count; i++) {
-		pa = gf_list_get(cfg->param_array, i);
+		pa = gf_list_get(param_list, i);
 		if (pa->type == nal_type) break;
 		pa = NULL;
 	}
 	if (!pa) {
-		GF_SAFEALLOC(pa, GF_HEVCParamArray);
+		GF_SAFEALLOC(pa, GF_NALUFFParamArray);
 		if (!pa) return;
 
 		pa->array_completeness = 1;
 		pa->type = nal_type;
 		pa->nalus = gf_list_new();
-		gf_list_add(cfg->param_array, pa);
+		gf_list_add(param_list, pa);
 	}
 	gf_list_add(pa->nalus, sl);
 }
 
+#ifndef GPAC_DISABLE_HEVC
+
 static void naludmx_hevc_set_parall_type(GF_NALUDmxCtx *ctx, GF_HEVCConfig *hevc_cfg)
 {
 	u32 use_tiles, use_wpp, nb_pps, i, count;
@@ -662,8 +775,8 @@
 	nb_pps = 0;
 
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(ctx->pps, i);
-		s32 idx = gf_media_hevc_read_pps(slc->data, slc->size, &hevc);
+		GF_NALUFFParam *slc = (GF_NALUFFParam*)gf_list_get(ctx->pps, i);
+		s32 idx = gf_hevc_read_pps(slc->data, slc->size, &hevc);
 
 		if (idx>=0) {
 			HEVC_PPS *pps;
@@ -690,11 +803,11 @@
 	u32 data_size;
 	u32 i;
 	HEVC_VPS *vps;
-	GF_AVCConfigSlot *vps_sl = gf_list_get(ctx->vps, 0);
+	GF_NALUFFParam *vps_sl = gf_list_get(ctx->vps, 0);
 	if (!vps_sl) return GF_SERVICE_ERROR;
 
 	vps = &ctx->hevc_state->vps[vps_sl->id];
-	
+
 	if (!vps->vps_extension_found) return GF_OK;
 	if (vps->max_layers<2) return GF_OK;
 
@@ -836,7 +949,7 @@
 		return;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	
+
 	gf_bs_write_int(bs, 0, 2);
 	gf_bs_write_int(bs, nb_layers, 6);
 	for (i=0; i<nb_layers; i++) {
@@ -881,7 +994,7 @@
 	//check we have one pps or sps in base layer
 	count = gf_list_count(ctx->sps);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(ctx->sps, i);
+		GF_NALUFFParam *sl = gf_list_get(ctx->sps, i);
 		layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
 		if (!layer_id) {
 			*has_hevc_base = GF_TRUE;
@@ -890,7 +1003,7 @@
 	}
 	count = gf_list_count(ctx->pps);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(ctx->pps, i);
+		GF_NALUFFParam *sl = gf_list_get(ctx->pps, i);
 		layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
 		if (!layer_id) {
 			*has_hevc_base = GF_TRUE;
@@ -900,24 +1013,24 @@
 	//assign vps first so that they are serialized first
 	count = gf_list_count(ctx->vps);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(ctx->vps, i);
+		GF_NALUFFParam *sl = gf_list_get(ctx->vps, i);
 		HEVC_VPS *vps = &ctx->hevc_state->vps[sl->id];
 
 		if (!i) {
 			hvcc->avgFrameRate = lvcc->avgFrameRate = vps->rates[0].avg_pic_rate;
-			hvcc->constantFrameRate = lvcc->constantFrameRate = vps->rates[0].constand_pic_rate_idc;
+			hvcc->constantFrameRate = lvcc->constantFrameRate = vps->rates[0].constant_pic_rate_idc;
 			hvcc->numTemporalLayers = lvcc->numTemporalLayers = vps->max_sub_layers;
 			hvcc->temporalIdNested = lvcc->temporalIdNested = vps->temporal_id_nesting;
 		}
 		//TODO set scalability mask
 		if (!ctx->analyze)
-			naludmx_hevc_add_param((ctx->explicit || ! (*has_hevc_base) ) ? lvcc : hvcc, sl, GF_HEVC_NALU_VID_PARAM);
+			naludmx_add_param_nalu((ctx->explicit || ! (*has_hevc_base) ) ? lvcc->param_array : hvcc->param_array, sl, GF_HEVC_NALU_VID_PARAM);
 	}
 
 	count = gf_list_count(ctx->sps);
 	for (i=0; i<count; i++) {
 		Bool is_lhvc = GF_FALSE;
-		GF_AVCConfigSlot *sl = gf_list_get(ctx->sps, i);
+		GF_NALUFFParam *sl = gf_list_get(ctx->sps, i);
 		HEVC_SPS *sps = &ctx->hevc_state->sps[sl->id];
 		layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
 		if (!layer_id) *has_hevc_base = GF_TRUE;
@@ -952,7 +1065,7 @@
 			}
 
 			/*disable frame rate scan, most bitstreams have wrong values there*/
-			if (!ctx->timescale && first && (!ctx->fps.num || !ctx->fps.den) && sps->has_timing_info
+			if (ctx->notime && first && (!ctx->fps.num || !ctx->fps.den) && sps->has_timing_info
 				/*if detected FPS is greater than 1000, assume wrong timing info*/
 				&& (sps->time_scale <= 1000*sps->num_units_in_tick)
 			) {
@@ -974,17 +1087,17 @@
 			if (sps->height > max_h) max_h = sps->height;
 		}
 		if (!ctx->analyze)
-			naludmx_hevc_add_param(cfg, sl, GF_HEVC_NALU_SEQ_PARAM);
+			naludmx_add_param_nalu(cfg->param_array, sl, GF_HEVC_NALU_SEQ_PARAM);
 	}
 
 	cfg = ctx->explicit ? lvcc : hvcc;
 	count = gf_list_count(ctx->pps);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(ctx->pps, i);
+		GF_NALUFFParam *sl = gf_list_get(ctx->pps, i);
 		layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
 		if (!layer_id) *has_hevc_base = GF_TRUE;
 		if (!ctx->analyze)
-			naludmx_hevc_add_param(layer_id ? lvcc : cfg, sl, GF_HEVC_NALU_PIC_PARAM);
+			naludmx_add_param_nalu(layer_id ? lvcc->param_array : cfg->param_array, sl, GF_HEVC_NALU_PIC_PARAM);
 	}
 
 	*dsi = *dsi_enh = NULL;
@@ -1009,12 +1122,12 @@
 	}
 	count = gf_list_count(hvcc->param_array);
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *pa = gf_list_get(hvcc->param_array, i);
+		GF_NALUFFParamArray *pa = gf_list_get(hvcc->param_array, i);
 		gf_list_reset(pa->nalus);
 	}
 	count = gf_list_count(lvcc->param_array);
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *pa = gf_list_get(lvcc->param_array, i);
+		GF_NALUFFParamArray *pa = gf_list_get(lvcc->param_array, i);
 		gf_list_reset(pa->nalus);
 	}
 	gf_odf_hevc_cfg_del(hvcc);
@@ -1022,6 +1135,179 @@
 #endif // GPAC_DISABLE_HEVC
 }
 
+
+static void naludmx_create_vvc_decoder_config(GF_NALUDmxCtx *ctx, u8 **dsi, u32 *dsi_size, u8 **dsi_enh, u32 *dsi_enh_size, u32 *max_width, u32 *max_height, u32 *max_enh_width, u32 *max_enh_height, GF_Fraction *sar, Bool *has_vvc_base)
+{
+	u32 i, count;
+	u8 layer_id;
+	Bool first = GF_TRUE;
+	Bool first_lvvc = GF_TRUE;
+	GF_VVCConfig *cfg;
+	u32 max_w, max_h, max_ew, max_eh;
+
+	*has_vvc_base = GF_FALSE;
+
+	max_w = max_h = 0;
+	max_ew = max_eh = 0;
+	sar->num = sar->den = 0;
+
+	cfg = gf_odf_vvc_cfg_new();
+	cfg->nal_unit_size = ctx->nal_length;
+
+	//check we have one pps or sps in base layer
+	count = gf_list_count(ctx->sps);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParam *sl = gf_list_get(ctx->sps, i);
+		layer_id = (sl->data[0] & 0x3f);
+		//todo, base is not always 0 !
+		if (!layer_id) {
+			*has_vvc_base = GF_TRUE;
+			break;
+		}
+	}
+	count = gf_list_count(ctx->pps);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParam *sl = gf_list_get(ctx->pps, i);
+		layer_id = (sl->data[0] & 0x3f);
+		//todo, base is not always 0 !
+		if (!layer_id) {
+			*has_vvc_base = GF_TRUE;
+			break;
+		}
+	}
+	//assign vps first so that they are serialized first
+	count = gf_list_count(ctx->vps);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParam *sl = gf_list_get(ctx->vps, i);
+		VVC_VPS *vps = &ctx->vvc_state->vps[sl->id];
+
+		if (!i) {
+			cfg->avgFrameRate = vps->rates[0].avg_pic_rate;
+			cfg->constantFrameRate = vps->rates[0].constant_pic_rate_idc;
+			cfg->numTemporalLayers = vps->max_sub_layers;
+		}
+		if (!ctx->analyze)
+			naludmx_add_param_nalu(cfg->param_array, sl, GF_VVC_NALU_VID_PARAM);
+	}
+
+	count = gf_list_count(ctx->sps);
+	for (i=0; i<count; i++) {
+		Bool is_lvvc = GF_FALSE;
+		GF_NALUFFParam *sl = gf_list_get(ctx->sps, i);
+		VVC_SPS *sps = &ctx->vvc_state->sps[sl->id];
+		layer_id = sl->data[0] & 0x3f;
+		if (!layer_id) *has_vvc_base = GF_TRUE;
+
+		if (ctx->explicit || layer_id) {
+			is_lvvc = GF_TRUE;
+		}
+
+		if (first || (is_lvvc && first_lvvc) ) {
+			VVC_VPS *vps = &ctx->vvc_state->vps[sps->vps_id];
+			cfg->avgFrameRate = 0;
+			cfg->constantFrameRate = 1;
+			cfg->numTemporalLayers = sps->max_sublayers;
+			cfg->nal_unit_size = ctx->nal_length;
+			cfg->ptl_present = vps->num_ptl ? 1 : 0;
+
+			if (vps->num_ptl) {
+				cfg->num_constraint_info = vps->ptl[0].gci_present ? 1 : 12;
+				cfg->general_profile_idc = vps->ptl[0].general_profile_idc;
+				cfg->general_tier_flag = vps->ptl[0].general_tier_flag;
+				cfg->general_level_idc = vps->ptl[0].general_level_idc;
+				cfg->ptl_frame_only_constraint = vps->ptl[0].frame_only_constraint;
+				cfg->ptl_multilayer_enabled = vps->ptl[0].multilayer_enabled;
+
+				cfg->general_constraint_info = gf_malloc(sizeof(u8) * cfg-> num_constraint_info);
+				if (cfg->general_constraint_info)
+					memcpy(cfg->general_constraint_info, vps->ptl[0].gci, cfg->num_constraint_info);
+
+				//todo set temporal sublayers
+				cfg->ptl_sublayer_present_mask = 0;
+				cfg->num_sub_profiles = 0;
+				cfg->ols_idx = 0;
+			}
+			cfg->chroma_format = sps->chroma_format_idc;
+			cfg->bit_depth = sps->bitdepth;
+			cfg->maxPictureWidth = sps->width;
+			cfg->maxPictureHeight = sps->height;
+
+			if (sps->aspect_ratio_info_present_flag && sps->sar_width && sps->sar_height) {
+				sar->num = sps->sar_width;
+				sar->den = sps->sar_height;
+			}
+
+			/*disable frame rate scan, most bitstreams have wrong values there*/
+			if (ctx->notime && first && (!ctx->fps.num || !ctx->fps.den) && sps->has_timing_info
+				/*if detected FPS is greater than 1000, assume wrong timing info*/
+				&& (sps->time_scale <= 1000*sps->num_units_in_tick)
+			) {
+				ctx->cur_fps.num = sps->time_scale;
+				ctx->cur_fps.den = sps->num_units_in_tick;
+				gf_media_get_reduced_frame_rate(&ctx->cur_fps.num, &ctx->cur_fps.den);
+
+				if (!ctx->fps.num && ctx->dts==ctx->fps.den)
+					ctx->dts = ctx->cur_fps.den;
+			}
+			ctx->fps = ctx->cur_fps;
+		}
+		first = GF_FALSE;
+		if (is_lvvc) {
+			first_lvvc = GF_FALSE;
+			if (sps->width > max_ew) max_ew = sps->width;
+			if (sps->height > max_eh) max_eh = sps->height;
+		} else {
+			if (sps->width > max_w) max_w = sps->width;
+			if (sps->height > max_h) max_h = sps->height;
+		}
+		if (!ctx->analyze)
+			naludmx_add_param_nalu(cfg->param_array, sl, GF_VVC_NALU_SEQ_PARAM);
+	}
+
+	count = gf_list_count(ctx->pps);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParam *sl = gf_list_get(ctx->pps, i);
+		layer_id = sl->data[0] & 0x3F;
+		if (!layer_id) *has_vvc_base = GF_TRUE;
+		if (!ctx->analyze)
+			naludmx_add_param_nalu(cfg->param_array, sl, GF_VVC_NALU_PIC_PARAM);
+	}
+
+	count = gf_list_count(ctx->vvc_dci);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParam *sl = gf_list_get(ctx->vvc_dci, i);
+		layer_id = sl->data[0] & 0x3F;
+		if (!layer_id) *has_vvc_base = GF_TRUE;
+		if (!ctx->analyze)
+			naludmx_add_param_nalu(cfg->param_array, sl, GF_VVC_NALU_DEC_PARAM);
+	}
+
+	count = gf_list_count(ctx->vvc_aps_pre);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParam *sl = gf_list_get(ctx->vvc_aps_pre, i);
+		layer_id = sl->data[0] & 0x3F;
+		if (!layer_id) *has_vvc_base = GF_TRUE;
+		if (!ctx->analyze)
+			naludmx_add_param_nalu(cfg->param_array, sl, GF_VVC_NALU_APS_PREFIX);
+	}
+
+	*dsi = *dsi_enh = NULL;
+	*dsi_size = *dsi_enh_size = 0;
+
+	gf_odf_vvc_cfg_write(cfg, dsi, dsi_size);
+	*max_width = max_w;
+	*max_height = max_h;
+	*max_enh_width = max_ew;
+	*max_enh_height = max_eh;
+
+	count = gf_list_count(cfg->param_array);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParamArray *pa = gf_list_get(cfg->param_array, i);
+		gf_list_reset(pa->nalus);
+	}
+	gf_odf_vvc_cfg_del(cfg);
+}
+
 void naludmx_create_avc_decoder_config(GF_NALUDmxCtx *ctx, u8 **dsi, u32 *dsi_size, u8 **dsi_enh, u32 *dsi_enh_size, u32 *max_width, u32 *max_height, u32 *max_enh_width, u32 *max_enh_height, GF_Fraction *sar)
 {
 	u32 i, count;
@@ -1045,7 +1331,7 @@
 	count = gf_list_count(ctx->sps);
 	for (i=0; i<count; i++) {
 		Bool is_svc = GF_FALSE;
-		GF_AVCConfigSlot *sl = gf_list_get(ctx->sps, i);
+		GF_NALUFFParam *sl = gf_list_get(ctx->sps, i);
 		AVC_SPS *sps = &ctx->avc_state->sps[sl->id];
 		u32 nal_type = sl->data[0] & 0x1F;
 
@@ -1071,7 +1357,7 @@
 			cfg->luma_bit_depth = 8 + sps->luma_bit_depth_m8;
 			cfg->chroma_bit_depth = 8 + sps->chroma_bit_depth_m8;
 			/*try to patch ?*/
-			if (!gf_avc_is_rext_profile(cfg->AVCProfileIndication)
+			if (!gf_avcc_use_extensions(cfg->AVCProfileIndication)
 				&& ((cfg->chroma_format>1) || (cfg->luma_bit_depth>8) || (cfg->chroma_bit_depth>8))
 			) {
 				if ((cfg->luma_bit_depth>8) || (cfg->chroma_bit_depth>8)) {
@@ -1105,15 +1391,15 @@
 					else
 						DeltaTfiDivisorIdx = (ctx->avc_state->sei.pic_timing.pic_struct+1) / 2;
 				}
-				if (!ctx->timescale) {
+				if (ctx->notime && sps->vui.time_scale && sps->vui.num_units_in_tick) {
 					ctx->cur_fps.num = 2 * sps->vui.time_scale;
-					ctx->cur_fps.den = 2 * sps->vui.num_units_in_tick * DeltaTfiDivisorIdx;
+					ctx->cur_fps.den = 2 * sps->vui.num_units_in_tick * DeltaTfiDivisorIdx;
 
 					if (!ctx->fps.num && ctx->dts==ctx->fps.den)
 						ctx->dts = ctx->cur_fps.den;
 				}
 				if (! sps->vui.fixed_frame_rate_flag)
-					GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[%s] Possible Variable Frame Rate: VUI \"fixed_frame_rate_flag\" absent\n", ctx->log_name));
+					GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[%s] Possible Variable Frame Rate: VUI \"fixed_frame_rate_flag\" absent\n", ctx->log_name));
 			}
 			ctx->fps = ctx->cur_fps;
 		}
@@ -1133,7 +1419,7 @@
 	cfg = ctx->explicit ? svcc : avcc;
 	count = gf_list_count(ctx->sps_ext);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(ctx->sps_ext, i);
+		GF_NALUFFParam *sl = gf_list_get(ctx->sps_ext, i);
 		if (!cfg->sequenceParameterSetExtensions) cfg->sequenceParameterSetExtensions = gf_list_new();
 		if (!ctx->analyze)
 			gf_list_add(cfg->sequenceParameterSetExtensions, sl);
@@ -1142,7 +1428,7 @@
 	cfg = ctx->explicit ? svcc : avcc;
 	count = gf_list_count(ctx->pps);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(ctx->pps, i);
+		GF_NALUFFParam *sl = gf_list_get(ctx->pps, i);
 		if (!ctx->analyze)
 			gf_list_add(cfg->pictureParameterSets, sl);
 	}
@@ -1150,7 +1436,7 @@
 	cfg = svcc;
 	count = gf_list_count(ctx->pps_svc);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(ctx->pps_svc, i);
+		GF_NALUFFParam *sl = gf_list_get(ctx->pps_svc, i);
 		if (!ctx->analyze)
 			gf_list_add(cfg->pictureParameterSets, sl);
 	}
@@ -1180,7 +1466,88 @@
 	*max_enh_height = max_eh;
 }
 
-static void naludmx_check_pid(GF_Filter *filter, GF_NALUDmxCtx *ctx)
+static void naludmx_end_access_unit(GF_NALUDmxCtx *ctx)
+{
+	//finalize current fram flags - we will flush(send) later on
+	naludmx_finalize_au_flags(ctx);
+
+	ctx->has_islice = GF_FALSE;
+	ctx->first_slice_in_au = GF_TRUE;
+	ctx->sei_recovery_frame_count = -1;
+	ctx->au_sap = GF_FILTER_SAP_NONE;
+	ctx->au_sap2_poc_reset = GF_FALSE;
+	ctx->bottom_field_flag = GF_FALSE;
+}
+
+static void naludmx_update_clli_mdcv(GF_NALUDmxCtx *ctx, Bool reset_crc)
+{
+	if (!ctx->opid) return;
+
+	if (reset_crc)
+		ctx->clli_crc = 0;
+	if ((ctx->hevc_state && ctx->hevc_state->clli_valid)
+		|| (ctx->vvc_state && ctx->vvc_state->clli_valid)
+	) {
+		u8 *clli = ctx->hevc_state ? ctx->hevc_state->clli_data : ctx->vvc_state->clli_data;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CONTENT_LIGHT_LEVEL, &PROP_DATA(clli, 4));
+		ctx->clli_crc = gf_crc_32(clli, 4);
+	}
+	if (reset_crc)
+		ctx->mdcv_crc = 0;
+
+	if ((ctx->hevc_state && ctx->hevc_state->mdcv_valid)
+		|| (ctx->vvc_state && ctx->vvc_state->mdcv_valid)
+	) {
+		u8 *mdcv = ctx->hevc_state ? ctx->hevc_state->mdcv_data : ctx->vvc_state->mdcv_data;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MASTER_DISPLAY_COLOUR, &PROP_DATA(mdcv, 24));
+		ctx->mdcv_crc = gf_crc_32(mdcv, 24);
+	}
+}
+
+static void naludmx_set_dolby_vision(GF_NALUDmxCtx *ctx)
+{
+	u8 dv_cfg[24];
+
+	switch (ctx->dv_mode) {
+	case DVMODE_NONE:
+	case DVMODE_CLEAN:
+		return;
+	//auto mode, wait until we have RPU or EL to signal profile
+	case DVMODE_AUTO:
+		if (!ctx->nb_dv_rpu && !ctx->nb_dv_el) return;
+		break;
+	}
+
+	u32 dv_level = gf_dolby_vision_level(ctx->width, ctx->height, ctx->cur_fps.num, ctx->cur_fps.den, ctx->codecid);
+
+	if (ctx->dv_profile==8) {
+		if (!ctx->dv_compatid) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] DV profile 8 used but dv_compatid not set, defaulting to bt709 (=2)\n", ctx->log_name));
+			ctx->dv_compatid = 2;
+		}
+	}
+
+	memset(dv_cfg, 0, sizeof(u8)*24);
+	GF_BitStream *bs = gf_bs_new(dv_cfg, 24, GF_BITSTREAM_WRITE);
+	gf_bs_write_u8(bs, 1); //version major
+	gf_bs_write_u8(bs, 0); //version minor
+	gf_bs_write_int(bs, ctx->dv_profile, 7);
+	gf_bs_write_int(bs, dv_level, 6);
+	gf_bs_write_int(bs, ctx->nb_dv_rpu ? 1 : 0, 1); //rpu present
+	gf_bs_write_int(bs, ctx->nb_dv_el ? 1 : 0, 1); //el present
+	gf_bs_write_int(bs, 1, 1); //bl_present_flag always true, we don't split streams
+	gf_bs_write_int(bs, ctx->dv_compatid, 4);
+	//the rest is zero-reserved
+	gf_bs_write_int(bs, 0, 28);
+	gf_bs_write_u32(bs, 0);
+	gf_bs_write_u32(bs, 0);
+	gf_bs_write_u32(bs, 0);
+	gf_bs_write_u32(bs, 0);
+	gf_bs_del(bs);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOLBY_VISION, &PROP_DATA(dv_cfg, 24));
+}
+
+static void naludmx_check_pid(GF_Filter *filter, GF_NALUDmxCtx *ctx, Bool force_au_flush)
 {
 	u32 w, h, ew, eh;
 	u8 *dsi, *dsi_enh;
@@ -1194,12 +1561,14 @@
 		if (ctx->opid && !ctx->ps_modified) return;
 	} else {
 		if (!ctx->ps_modified) return;
+		if (ctx->opid && (!gf_list_count(ctx->sps) || !gf_list_count(ctx->pps)))
+			return;
 	}
 	ctx->ps_modified = GF_FALSE;
 
 	dsi = dsi_enh = NULL;
 
-	if (!ctx->timescale) {
+	if (ctx->notime) {
 		ctx->cur_fps = ctx->fps;
 		if (!ctx->cur_fps.num || !ctx->cur_fps.den) {
 			ctx->cur_fps.num = 25000;
@@ -1207,8 +1576,10 @@
 		}
 	}
 
-	if (ctx->is_hevc) {
+	if (ctx->codecid==GF_CODECID_HEVC) {
 		naludmx_create_hevc_decoder_config(ctx, &dsi, &dsi_size, &dsi_enh, &dsi_enh_size, &w, &h, &ew, &eh, &sar, &has_hevc_base);
+	} else if (ctx->codecid==GF_CODECID_VVC) {
+		naludmx_create_vvc_decoder_config(ctx, &dsi, &dsi_size, &dsi_enh, &dsi_enh_size, &w, &h, &ew, &eh, &sar, &has_hevc_base);
 	} else {
 		naludmx_create_avc_decoder_config(ctx, &dsi, &dsi_size, &dsi_enh, &dsi_enh_size, &w, &h, &ew, &eh, &sar);
 	}
@@ -1216,6 +1587,12 @@
 	if (dsi) crc_cfg = gf_crc_32(dsi, dsi_size);
 	if (dsi_enh) crc_cfg_enh = gf_crc_32(dsi_enh, dsi_enh_size);
 
+	if (!ctx->analyze && (!w || !h)) {
+		if (dsi) gf_free(dsi);
+		if (dsi_enh) gf_free(dsi_enh);
+		return;
+	}
+
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
 
@@ -1232,14 +1609,21 @@
 		return;
 	}
 
+	if (force_au_flush) {
+		naludmx_end_access_unit(ctx);
+	}
+	
 	naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
-	if (!ctx->analyze && gf_list_count(ctx->pck_queue)) {
-		GF_LOG(dsi_enh ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] xPS changed but could not flush frames before signaling state change %s\n", ctx->log_name, dsi_enh ? "- likely scalable xPS update" : "!"));
+	if (!ctx->analyze && (gf_list_count(ctx->pck_queue)>1)) {
+		GF_LOG(dsi_enh ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] xPS changed but could not flush frames before signaling state change %s\n", ctx->log_name, dsi_enh ? "- likely scalable xPS update" : "!"));
 	}
 
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(GF_STREAM_VISUAL));
+
+	//don't change codec type if reframing an ES (for HLS SAES)
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(GF_STREAM_VISUAL));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 	if (!gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_ID))
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(1));
@@ -1265,18 +1649,24 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : ctx->cur_fps.num));
 
 	if (ctx->explicit || !has_hevc_base) {
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(ctx->is_hevc ? GF_CODECID_LHVC : GF_CODECID_SVC));
+		u32 enh_cid = GF_CODECID_SVC;
+		if (ctx->codecid==GF_CODECID_HEVC) enh_cid = GF_CODECID_LHVC;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(enh_cid));
 		if (dsi) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
 	} else {
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(ctx->is_hevc ? GF_CODECID_HEVC : GF_CODECID_AVC));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(ctx->codecid));
 		if (dsi) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
 		if (dsi_enh) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, &PROP_DATA_NO_COPY(dsi_enh, dsi_enh_size) );
 	}
 
-	if (ctx->is_hevc && gf_list_count(ctx->vps) ) {
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
+
+	if ((ctx->codecid==GF_CODECID_HEVC) && gf_list_count(ctx->vps) ) {
 		GF_Err e = naludmx_set_hevc_oinf(ctx, NULL);
 		if (e) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[%s] Failed to create OINF chunk\n", ctx->log_name));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] Failed to create OINF chunk\n", ctx->log_name));
 		}
 		naludmx_set_hevc_linf(ctx);
 	}
@@ -1289,7 +1679,7 @@
 	//set interlaced or remove interlaced property
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_INTERLACED, ctx->interlaced ? & PROP_UINT(GF_TRUE) : NULL);
 
-	if (ctx->is_hevc) {
+	if (ctx->codecid==GF_CODECID_HEVC) {
 		HEVC_SPS *sps = &ctx->hevc_state->sps[ctx->hevc_state->sps_active_idx];
 		if (sps->colour_description_present_flag) {
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_PRIMARIES, & PROP_UINT(sps->colour_primaries) );
@@ -1298,6 +1688,7 @@
 			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, & PROP_BOOL(sps->video_full_range_flag) );
 			has_colr_info = GF_TRUE;
 		}
+	} else if (ctx->codecid==GF_CODECID_VVC) {
 	} else {
 		/*use the last active SPS*/
 		if (ctx->avc_state->sps[ctx->avc_state->sps_active_idx].vui_parameters_present_flag
@@ -1318,6 +1709,11 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, NULL);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, NULL);
 	}
+
+	naludmx_update_clli_mdcv(ctx, GF_TRUE);
+
+	naludmx_set_dolby_vision(ctx);
+
 }
 
 static Bool naludmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
@@ -1332,7 +1728,6 @@
 		if (!ctx->is_playing) {
 			ctx->is_playing = GF_TRUE;
 			ctx->cts = ctx->dts = 0;
-			ctx->bytes_in_header = 0;
 		}
 		if (! ctx->is_file) {
 			if (!ctx->initial_play_done) {
@@ -1341,20 +1736,21 @@
 					return GF_FALSE;
 			}
 			ctx->resume_from = 0;
+			ctx->nal_store_size = 0;
 			return GF_FALSE;
 		}
 		if (ctx->start_range && (ctx->index<0)) {
 			ctx->index = -ctx->index;
 			ctx->file_loaded = GF_FALSE;
 			ctx->duration.den = ctx->duration.num = 0;
-			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[%s] Play request from %d, building index\n", ctx->log_name, ctx->start_range));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[%s] Play request from %d, building index\n", ctx->log_name, ctx->start_range));
 			naludmx_check_dur(filter, ctx);
 		}
 		ctx->start_range = evt->play.start_range;
 		ctx->in_seek = GF_TRUE;
 
 		if (ctx->start_range) {
-			ctx->nb_nalus = ctx->nb_i = ctx->nb_p = ctx->nb_b = ctx->nb_sp = ctx->nb_si = ctx->nb_sei = ctx->nb_idr = 0;
+			ctx->nb_nalus = ctx->nb_i = ctx->nb_p = ctx->nb_b = ctx->nb_sp = ctx->nb_si = ctx->nb_sei = ctx->nb_idr = ctx->nb_cra = 0;
 			for (i=1; i<ctx->index_size; i++) {
 				if (ctx->indexes[i].duration>ctx->start_range) {
 					ctx->cts = ctx->dts = (u64) (ctx->indexes[i-1].duration * ctx->cur_fps.num);
@@ -1366,11 +1762,19 @@
 		if (!ctx->initial_play_done) {
 			ctx->initial_play_done = GF_TRUE;
 			//seek will not change the current source state, don't send a seek
-			if (!file_pos)
+			if (!file_pos) {
+				//very short streams, input is done before we get notified for play and everything stored in memory: flush
+				if (gf_filter_pid_is_eos(ctx->ipid) && (ctx->nal_store_size)) {
+					gf_filter_post_process_task(filter);
+				}
 				return GF_TRUE;
+			}
 		}
+		ctx->nb_frames = 0;
+		ctx->nb_nalus = 0;
 		ctx->resume_from = 0;
-		
+		ctx->nal_store_size = 0;
+
 		//post a seek
 		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
 		fevt.seek.start_offset = file_pos;
@@ -1382,6 +1786,8 @@
 	case GF_FEVT_STOP:
 		//don't cancel event
 		ctx->is_playing = GF_FALSE;
+		ctx->nal_store_size = 0;
+		ctx->resume_from = 0;
 		return GF_FALSE;
 
 	case GF_FEVT_SET_SPEED:
@@ -1398,7 +1804,7 @@
 {
 	assert(ctx->cur_fps.num);
 
-	if (ctx->timescale) {
+	if (!ctx->notime) {
 		//very first frame, no dts diff, assume 3000/90k. It should only hurt if we have several frames packet in the first packet sent
 		u64 dts_inc = ctx->cur_fps.den ? ctx->cur_fps.den : 3000;
 		ctx->cts += dts_inc;
@@ -1413,11 +1819,13 @@
 static void naludmx_queue_param_set(GF_NALUDmxCtx *ctx, char *data, u32 size, u32 ps_type, s32 ps_id)
 {
 	GF_List *list = NULL, *alt_list = NULL;
-	GF_AVCConfigSlot *sl;
-	u32 i, count;
-	u32 crc = gf_crc_32(data, size);
+	GF_NALUFFParam *sl;
+	u32 i, count, crc;
+
+	if (!size) return;
+	crc = gf_crc_32(data, size);
 
-	if (ctx->is_hevc) {
+	if (ctx->codecid==GF_CODECID_HEVC) {
 		switch (ps_type) {
 		case GF_HEVC_NALU_VID_PARAM:
 			if (!ctx->vps) ctx->vps = gf_list_new();
@@ -1433,6 +1841,30 @@
 			assert(0);
 			return;
 		}
+	} else if (ctx->codecid==GF_CODECID_VVC) {
+		switch (ps_type) {
+		case GF_VVC_NALU_VID_PARAM:
+			if (!ctx->vps) ctx->vps = gf_list_new();
+			list = ctx->vps;
+			break;
+		case GF_VVC_NALU_SEQ_PARAM:
+			list = ctx->sps;
+			break;
+		case GF_VVC_NALU_PIC_PARAM:
+			list = ctx->pps;
+			break;
+		case GF_VVC_NALU_DEC_PARAM:
+			if (!ctx->vvc_dci) ctx->vvc_dci = gf_list_new();
+			list = ctx->vvc_dci;
+			break;
+		case GF_VVC_NALU_APS_PREFIX:
+			if (!ctx->vvc_aps_pre) ctx->vvc_aps_pre = gf_list_new();
+			list = ctx->vvc_aps_pre;
+			break;
+		default:
+			assert(0);
+			return;
+		}
 	} else {
 		switch (ps_type) {
 		case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
@@ -1490,7 +1922,7 @@
 	}
 	//TODO we might want to purge the list after a while !!
 
-	GF_SAFEALLOC(sl, GF_AVCConfigSlot);
+	GF_SAFEALLOC(sl, GF_NALUFFParam);
 	if (!sl) return;
 	sl->data = gf_malloc(sizeof(char) * size);
 	if (!sl->data) {
@@ -1506,7 +1938,7 @@
 	gf_list_add(list, sl);
 }
 
-void naludmx_finalize_au_flags(GF_NALUDmxCtx *ctx)
+static void naludmx_finalize_au_flags(GF_NALUDmxCtx *ctx)
 {
 	u64 ts;
 	Bool is_rap = GF_FALSE;
@@ -1515,7 +1947,7 @@
 		return;
 	if (ctx->au_sap) {
 		gf_filter_pck_set_sap(ctx->first_pck_in_au, ctx->au_sap);
-		if (ctx->au_sap == GF_FILTER_SAP_1) {
+		if ((ctx->au_sap == GF_FILTER_SAP_1) || ctx->au_sap2_poc_reset) {
 			ctx->dts_last_IDR = gf_filter_pck_get_dts(ctx->first_pck_in_au);
 			if (ctx->is_paff)
 				ctx->dts_last_IDR *= 2;
@@ -1528,7 +1960,7 @@
 		gf_filter_pck_set_sap(ctx->first_pck_in_au, GF_FILTER_SAP_1);
 		if (!ctx->use_opengop_gdr) {
 			ctx->use_opengop_gdr = 1;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[%s] Forcing non-IDR samples with I slices to be marked as sync points - resulting file will not be ISOBMFF conformant\n", ctx->log_name));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] Forcing non-IDR samples with I slices to be marked as sync points - resulting file will not be ISOBMFF compliant\n", ctx->log_name));
 		}
 		is_rap = GF_TRUE;
 	}
@@ -1557,7 +1989,7 @@
 		/*we store the POC (last POC minus the poc shift) as the CTS offset and re-update the CTS when dispatching*/
 		assert(ctx->last_poc >= ctx->poc_shift);
 		gf_filter_pck_set_cts(ctx->first_pck_in_au, CTS_POC_OFFSET_SAFETY + ctx->last_poc - ctx->poc_shift);
-		//we use the carrousel flag temporarly to indicate the cts must be recomputed
+		//we use the carousel flag temporarly to indicate the cts must be recomputed
 		gf_filter_pck_set_carousel_version(ctx->first_pck_in_au, 1);
 	}
 
@@ -1581,10 +2013,41 @@
 	ctx->has_ref_slices = GF_FALSE;
 	ctx->has_redundant = GF_FALSE;
 
+	if ((ctx->hevc_state && ctx->hevc_state->clli_valid)
+		|| (ctx->vvc_state && ctx->vvc_state->clli_valid)
+	) {
+		u8 *clli = ctx->hevc_state ? ctx->hevc_state->clli_data : ctx->vvc_state->clli_data;
+		u32 crc = gf_crc_32(clli, 4);
+		if (!ctx->clli_crc) {
+			naludmx_update_clli_mdcv(ctx, GF_FALSE);
+		}
+
+		if (crc != ctx->clli_crc) {
+			gf_filter_pck_set_property(ctx->first_pck_in_au, GF_PROP_PID_CONTENT_LIGHT_LEVEL, &PROP_DATA(clli, 4));
+		}
+	}
+	if ((ctx->hevc_state && ctx->hevc_state->mdcv_valid)
+		|| (ctx->vvc_state && ctx->vvc_state->mdcv_valid)
+	) {
+		u8 *mdcv = ctx->hevc_state ? ctx->hevc_state->mdcv_data : ctx->vvc_state->mdcv_data;
+		u32 crc = gf_crc_32(mdcv, 24);
+		if (!ctx->mdcv_crc) {
+			naludmx_update_clli_mdcv(ctx, GF_FALSE);
+		}
+		if (crc != ctx->mdcv_crc) {
+			gf_filter_pck_set_property(ctx->first_pck_in_au, GF_PROP_PID_MASTER_DISPLAY_COLOUR, &PROP_DATA(mdcv, 24));
+		}
+	}
+	if (ctx->hevc_state)
+		ctx->hevc_state->clli_valid = ctx->hevc_state->mdcv_valid = 0;
+	if (ctx->vvc_state)
+		ctx->vvc_state->clli_valid = ctx->vvc_state->mdcv_valid = 0;
+
+
 	//if we reuse input packets timing, we can dispatch asap.
 	//otherwise if poc probe is done (we know the min_poc_diff between images) and we are not in strict mode, dispatch asap
 	//otherwise we will need to wait for the next ref frame to make sure we know all pocs ...
-	if (ctx->timescale || (!ctx->strict_poc && ctx->poc_probe_done) )
+	if (!ctx->notime || (!ctx->strict_poc && ctx->poc_probe_done) )
 		naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
 
 	ctx->first_pck_in_au = NULL;
@@ -1595,47 +2058,16 @@
 	if (ctx->max_nalu_size < size) {
 		ctx->max_nalu_size = size;
 		if (size > ctx->max_nalu_size_allowed) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] nal size %d larger than max allowed size %d - change import settings\n", ctx->log_name, size, ctx->max_nalu_size_allowed ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] nal size %d larger than max allowed size %d - change import settings\n", ctx->log_name, size, ctx->max_nalu_size_allowed ));
 		}
 	}
 }
 
 
-GF_Err naludmx_realloc_last_pck(GF_NALUDmxCtx *ctx, u32 nb_bytes_to_add, u8 **data_ptr)
-{
-	GF_Err e;
-	u8 *pck_data;
-	u32 full_size;
-	GF_FilterPacket *pck = gf_list_last(ctx->pck_queue);
-	*data_ptr = NULL;
-	if (!pck) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] attempt to reallocate a non-existing packet!\n", ctx->log_name));
-		return GF_SERVICE_ERROR;
-	}
-	e = gf_filter_pck_expand(pck, nb_bytes_to_add, &pck_data, data_ptr, &full_size);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Failed to reallocate packet buffer: %s\n", ctx->log_name, gf_error_to_string(e) ));
-		return e;
-	}
-	assert(ctx->bs_w);
-	//rewrite NALU size length
-	full_size -= ctx->nal_length;
-	gf_bs_reassign_buffer(ctx->bs_w, pck_data, ctx->nal_length);
-	gf_bs_write_int(ctx->bs_w, full_size, 8*ctx->nal_length);
-	naludmx_update_nalu_maxsize(ctx, full_size);
-	//rewrite subsample size
-	if (ctx->subsamples) {
-		assert(ctx->subsamp_buffer_size>=14);
-		//reassign to begining of size field (after first u32 flags)
-		gf_bs_reassign_buffer(ctx->bs_w, ctx->subsamp_buffer + ctx->subsamp_buffer_size-14 + 4, 14 - 4);
-		gf_bs_write_u32(ctx->bs_w, full_size + ctx->nal_length);
-	}
-	return GF_OK;
-}
-
 GF_FilterPacket *naludmx_start_nalu(GF_NALUDmxCtx *ctx, u32 nal_size, Bool skip_nal_field, Bool *au_start, u8 **pck_data)
 {
 	GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->opid, nal_size + (skip_nal_field ? 0 : ctx->nal_length), pck_data);
+	if (!dst_pck) return NULL;
 
 	if (!skip_nal_field) {
 		if (!ctx->bs_w) ctx->bs_w = gf_bs_new(*pck_data, ctx->nal_length, GF_BITSTREAM_WRITE);
@@ -1657,14 +2089,15 @@
 			//we don't set the CTS, it will be set once we detect frame end
 			gf_filter_pck_set_dts(dst_pck, ctx->dts);
 		}
-		//we use the carrousel flag temporarly to indicate the cts must be recomputed
-		gf_filter_pck_set_carousel_version(dst_pck, ctx->timescale ? 0 : 1);
+		//we use the carousel flag temporarly to indicate the cts must be recomputed
+		gf_filter_pck_set_carousel_version(dst_pck, ctx->notime ? 1 : 0);
 
 		gf_filter_pck_set_duration(dst_pck, ctx->pck_duration ? ctx->pck_duration : ctx->cur_fps.den);
 		if (ctx->in_seek) gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
 
 		naludmx_update_time(ctx);
 		*au_start = GF_FALSE;
+		ctx->nb_frames++;
 	} else {
 		gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
 	}
@@ -1692,6 +2125,29 @@
 	ctx->subs_mapped_bytes += subs_size + ctx->nal_length;
 }
 
+static void naludmx_push_prefix(GF_NALUDmxCtx *ctx, u8 *data, u32 size, Bool avc_sei_rewrite)
+{
+	if (ctx->sei_buffer_alloc < ctx->sei_buffer_size + size + ctx->nal_length) {
+		ctx->sei_buffer_alloc = ctx->sei_buffer_size + size + ctx->nal_length;
+		ctx->sei_buffer = gf_realloc(ctx->sei_buffer, ctx->sei_buffer_alloc);
+	}
+
+	if (!ctx->bs_w) ctx->bs_w = gf_bs_new(ctx->sei_buffer + ctx->sei_buffer_size, ctx->nal_length + size, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs_w, ctx->sei_buffer + ctx->sei_buffer_size, ctx->nal_length + size);
+	gf_bs_write_int(ctx->bs_w, size, 8*ctx->nal_length);
+	memcpy(ctx->sei_buffer + ctx->sei_buffer_size + ctx->nal_length, data, size);
+
+	if (avc_sei_rewrite) {
+		u32 rw_sei_size = gf_avc_reformat_sei(ctx->sei_buffer + ctx->sei_buffer_size + ctx->nal_length, size, ctx->seirw, ctx->avc_state);
+		if (rw_sei_size < size) {
+			gf_bs_seek(ctx->bs_w, 0);
+			gf_bs_write_int(ctx->bs_w, rw_sei_size, 8*ctx->nal_length);
+			size = rw_sei_size;
+		}
+	}
+	ctx->sei_buffer_size += size + ctx->nal_length;
+}
+
 static s32 naludmx_parse_nal_hevc(GF_NALUDmxCtx *ctx, char *data, u32 size, Bool *skip_nal, Bool *is_slice, Bool *is_islice)
 {
 #ifdef GPAC_DISABLE_HEVC
@@ -1702,13 +2158,15 @@
 	u8 nal_unit_type, temporal_id, layer_id;
 	*skip_nal = GF_FALSE;
 
+	if (size<2) return -1;
+
 	gf_bs_reassign_buffer(ctx->bs_r, data, size);
-	res = gf_media_hevc_parse_nalu_bs(ctx->bs_r, ctx->hevc_state, &nal_unit_type, &temporal_id, &layer_id);
+	res = gf_hevc_parse_nalu_bs(ctx->bs_r, ctx->hevc_state, &nal_unit_type, &temporal_id, &layer_id);
 	ctx->nb_nalus++;
 
 	if (res < 0) {
 		if (res == -1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Warning: Error parsing NAL unit\n", ctx->log_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Warning: Error parsing NAL unit\n", ctx->log_name));
 		}
 		*skip_nal = GF_TRUE;
 	}
@@ -1722,12 +2180,12 @@
 	case GF_HEVC_NALU_VID_PARAM:
 		if (ctx->novpsext) {
 			//this may modify nal_size, but we don't use it for bitstream reading
-			ps_idx = gf_media_hevc_read_vps_ex(data, &size, ctx->hevc_state, GF_TRUE);
+			ps_idx = gf_hevc_read_vps_ex(data, &size, ctx->hevc_state, GF_TRUE);
 		} else {
 			ps_idx = ctx->hevc_state->last_parsed_vps_id;
 		}
 		if (ps_idx<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Error parsing Video Param Set\n", ctx->log_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Video Param Set\n", ctx->log_name));
 		} else {
 			naludmx_queue_param_set(ctx, data, size, GF_HEVC_NALU_VID_PARAM, ps_idx);
 		}
@@ -1736,7 +2194,7 @@
 	case GF_HEVC_NALU_SEQ_PARAM:
 		ps_idx = ctx->hevc_state->last_parsed_sps_id;
 		if (ps_idx<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Error parsing Sequence Param Set\n", ctx->log_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Sequence Param Set\n", ctx->log_name));
 		} else {
 			naludmx_queue_param_set(ctx, data, size, GF_HEVC_NALU_SEQ_PARAM, ps_idx);
 		}
@@ -1745,27 +2203,17 @@
 	case GF_HEVC_NALU_PIC_PARAM:
 		ps_idx = ctx->hevc_state->last_parsed_pps_id;
 		if (ps_idx<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Error parsing Picture Param Set\n", ctx->log_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Picture Param Set\n", ctx->log_name));
 		} else {
 			naludmx_queue_param_set(ctx, data, size, GF_HEVC_NALU_PIC_PARAM, ps_idx);
 		}
 		*skip_nal = GF_TRUE;
 		break;
 	case GF_HEVC_NALU_SEI_PREFIX:
-		gf_media_hevc_parse_sei(data, size, ctx->hevc_state);
+		gf_hevc_parse_sei(data, size, ctx->hevc_state);
 		if (!ctx->nosei) {
 			ctx->nb_sei++;
-
-			if (ctx->sei_buffer_alloc < ctx->sei_buffer_size + size + ctx->nal_length) {
-				ctx->sei_buffer_alloc = ctx->sei_buffer_size + size + ctx->nal_length;
-				ctx->sei_buffer = gf_realloc(ctx->sei_buffer, ctx->sei_buffer_alloc);
-			}
-
-			if (!ctx->bs_w) ctx->bs_w = gf_bs_new(ctx->sei_buffer + ctx->sei_buffer_size, ctx->nal_length + size, GF_BITSTREAM_WRITE);
-			else gf_bs_reassign_buffer(ctx->bs_w, ctx->sei_buffer + ctx->sei_buffer_size, ctx->nal_length + size);
-			gf_bs_write_int(ctx->bs_w, size, 8*ctx->nal_length);
-			memcpy(ctx->sei_buffer + ctx->sei_buffer_size + ctx->nal_length, data, size);
-			ctx->sei_buffer_size += size + ctx->nal_length;
+			naludmx_push_prefix(ctx, data, size, GF_FALSE);
 		} else {
 			ctx->nb_nalus--;
 		}
@@ -1800,6 +2248,8 @@
 	case GF_HEVC_NALU_SLICE_CRA:
 		if (! ctx->is_playing) return 0;
 		*is_slice = GF_TRUE;
+		ctx->last_layer_id = layer_id;
+		ctx->last_temporal_id = temporal_id;
 		if (! *skip_nal) {
 			switch (ctx->hevc_state->s_info.slice_type) {
 			case GF_HEVC_SLICE_TYPE_P:
@@ -1837,15 +2287,27 @@
 
 	//parsing is partial, see https://github.com/DolbyLaboratories/dlb_mp4base/blob/70a2e1d4d99a8439b7b8087bf50dd503eeea2291/src/esparser/parser_hevc.c#L1233
 	case GF_HEVC_NALU_DV_RPU:
-		ctx->hevc_state->dv_rpu = GF_TRUE;
+		if (ctx->dv_mode==DVMODE_CLEAN) {
+			*skip_nal = GF_TRUE;
+		} else {
+			ctx->nb_dv_rpu ++;
+			if (ctx->nb_dv_rpu==1)
+				naludmx_set_dolby_vision(ctx);
+		}
 		break;
 	case GF_HEVC_NALU_DV_EL:
-		ctx->hevc_state->dv_el = GF_TRUE;
+		if ((ctx->dv_mode==DVMODE_CLEAN) || (ctx->dv_mode==DVMODE_SINGLE)) {
+			*skip_nal = GF_TRUE;
+		} else {
+			ctx->nb_dv_el ++;
+			if (ctx->nb_dv_el==1)
+				naludmx_set_dolby_vision(ctx);
+		}
 		break;
 
 	default:
 		if (! ctx->is_playing) return 0;
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[%s] NAL Unit type %d not handled - adding\n", ctx->log_name, nal_unit_type));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] NAL Unit type %d not handled - adding\n", ctx->log_name, nal_unit_type));
 		break;
 	}
 	if (*skip_nal) return res;
@@ -1864,31 +2326,211 @@
 #endif // GPAC_DISABLE_HEVC
 }
 
+
+static s32 naludmx_parse_nal_vvc(GF_NALUDmxCtx *ctx, char *data, u32 size, Bool *skip_nal, Bool *is_slice, Bool *is_islice)
+{
+	s32 ps_idx = 0;
+	s32 res;
+	u8 nal_unit_type, temporal_id, layer_id;
+	*skip_nal = GF_FALSE;
+
+	if (size<2) return -1;
+	gf_bs_reassign_buffer(ctx->bs_r, data, size);
+	res = gf_vvc_parse_nalu_bs(ctx->bs_r, ctx->vvc_state, &nal_unit_type, &temporal_id, &layer_id);
+	ctx->nb_nalus++;
+
+	if (res < 0) {
+		if (res == -1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Warning: Error parsing NAL unit\n", ctx->log_name));
+		}
+		*skip_nal = GF_TRUE;
+	}
+
+	if (layer_id && ctx->nosvc) {
+		*skip_nal = GF_TRUE;
+		return 0;
+	}
+
+	switch (nal_unit_type) {
+	case GF_VVC_NALU_VID_PARAM:
+		if (ctx->novpsext) {
+			//this may modify nal_size, but we don't use it for bitstream reading
+//			ps_idx = gf_hevc_read_vps_ex(data, &size, ctx->hevc_state, GF_TRUE);
+			ps_idx = ctx->vvc_state->last_parsed_vps_id;
+		} else {
+			ps_idx = ctx->vvc_state->last_parsed_vps_id;
+		}
+		if (ps_idx<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Video Param Set\n", ctx->log_name));
+		} else {
+			naludmx_queue_param_set(ctx, data, size, GF_VVC_NALU_VID_PARAM, ps_idx);
+		}
+		*skip_nal = GF_TRUE;
+		break;
+	case GF_VVC_NALU_SEQ_PARAM:
+		ps_idx = ctx->vvc_state->last_parsed_sps_id;
+		if (ps_idx<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Sequence Param Set\n", ctx->log_name));
+		} else {
+			naludmx_queue_param_set(ctx, data, size, GF_VVC_NALU_SEQ_PARAM, ps_idx);
+		}
+		*skip_nal = GF_TRUE;
+		break;
+	case GF_VVC_NALU_PIC_PARAM:
+		ps_idx = ctx->vvc_state->last_parsed_pps_id;
+		if (ps_idx<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Picture Param Set\n", ctx->log_name));
+		} else {
+			naludmx_queue_param_set(ctx, data, size, GF_VVC_NALU_PIC_PARAM, ps_idx);
+		}
+		*skip_nal = GF_TRUE;
+		break;
+	case GF_VVC_NALU_DEC_PARAM:
+		ps_idx = 0;
+		naludmx_queue_param_set(ctx, data, size, GF_VVC_NALU_DEC_PARAM, ps_idx);
+		*skip_nal = GF_TRUE;
+		break;
+	case GF_VVC_NALU_APS_PREFIX:
+		//for now we keep APS in the stream
+#if 0
+		ps_idx = ctx->vvc_state->last_parsed_aps_id;
+		if (ps_idx<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Decoder Param Set\n", ctx->log_name));
+		} else {
+			naludmx_queue_param_set(ctx, data, size, GF_VVC_NALU_APS_PREFIX, ps_idx);
+		}
+		*skip_nal = GF_TRUE;
+#else
+		//same logic as SEI
+		naludmx_push_prefix(ctx, data, size, GF_FALSE);
+		*skip_nal = GF_TRUE;
+#endif
+		break;
+	case GF_VVC_NALU_SEI_PREFIX:
+		gf_vvc_parse_sei(data, size, ctx->vvc_state);
+		if (!ctx->nosei) {
+			ctx->nb_sei++;
+
+			naludmx_push_prefix(ctx, data, size, GF_FALSE);
+		} else {
+			ctx->nb_nalus--;
+		}
+		*skip_nal = GF_TRUE;
+		break;
+	case GF_VVC_NALU_SEI_SUFFIX:
+		if (! ctx->is_playing) return 0;
+		gf_vvc_parse_sei(data, size, ctx->vvc_state);
+		if (ctx->nosei) {
+			*skip_nal = GF_TRUE;
+			ctx->nb_nalus--;
+		} else {
+			ctx->nb_sei++;
+		}
+		break;
+
+	case GF_VVC_NALU_PIC_HEADER:
+		if (! ctx->is_playing) return 0;
+		break;
+
+	/*slice_segment_layer_rbsp*/
+	case GF_VVC_NALU_SLICE_TRAIL:
+	case GF_VVC_NALU_SLICE_STSA:
+	case GF_VVC_NALU_SLICE_RADL:
+	case GF_VVC_NALU_SLICE_RASL:
+	case GF_VVC_NALU_SLICE_IDR_W_RADL:
+	case GF_VVC_NALU_SLICE_IDR_N_LP:
+	case GF_VVC_NALU_SLICE_CRA:
+	case GF_VVC_NALU_SLICE_GDR:
+		if (! ctx->is_playing) return 0;
+		*is_slice = GF_TRUE;
+		ctx->last_layer_id = layer_id;
+		ctx->last_temporal_id = temporal_id;
+		if (! *skip_nal) {
+			switch (ctx->vvc_state->s_info.slice_type) {
+			case GF_VVC_SLICE_TYPE_P:
+				if (layer_id) ctx->nb_e_p++;
+				else ctx->nb_p++;
+				break;
+			case GF_VVC_SLICE_TYPE_I:
+				if (layer_id) ctx->nb_e_i++;
+				else ctx->nb_i++;
+				*is_islice = GF_TRUE;
+				break;
+			case GF_VVC_SLICE_TYPE_B:
+				if (layer_id) ctx->nb_e_b++;
+				else ctx->nb_b++;
+				break;
+			case GF_VVC_SLICE_TYPE_UNKNOWN:
+				ctx->vvc_no_stats = GF_TRUE;
+				break;
+			}
+		}
+		break;
+
+	case GF_VVC_NALU_ACCESS_UNIT:
+		ctx->nb_aud++;
+		//no skip AUD in VVC
+
+		if (!ctx->opid) {
+			ctx->has_initial_aud = GF_TRUE;
+			memcpy(ctx->init_aud, data, 3);
+		}
+		break;
+	/*remove*/
+	case GF_VVC_NALU_FILLER_DATA:
+	case GF_VVC_NALU_END_OF_SEQ:
+	case GF_VVC_NALU_END_OF_STREAM:
+		*skip_nal = GF_TRUE;
+		break;
+
+	case GF_VVC_NALU_OPI:
+		if (! ctx->is_playing) return 0;
+		break;
+
+	default:
+		if (! ctx->is_playing) return 0;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] NAL Unit type %d not handled - adding\n", ctx->log_name, nal_unit_type));
+		break;
+	}
+	if (*skip_nal) return res;
+
+	ctx->linf[layer_id].layer_id_plus_one = layer_id + 1;
+	if (! ctx->linf[layer_id].max_temporal_id ) ctx->linf[layer_id].max_temporal_id = temporal_id;
+	else if (ctx->linf[layer_id].max_temporal_id < temporal_id) ctx->linf[layer_id].max_temporal_id = temporal_id;
+
+	if (! ctx->linf[layer_id].min_temporal_id ) ctx->linf[layer_id].min_temporal_id = temporal_id;
+	else if (ctx->linf[layer_id].min_temporal_id > temporal_id) ctx->linf[layer_id].min_temporal_id = temporal_id;
+
+	if (ctx->max_temporal_id[layer_id] < temporal_id)
+		ctx->max_temporal_id[layer_id] = temporal_id;
+	if (ctx->min_layer_id > layer_id) ctx->min_layer_id = layer_id;
+	return res;
+}
+
 static s32 naludmx_parse_nal_avc(GF_NALUDmxCtx *ctx, char *data, u32 size, u32 nal_type, Bool *skip_nal, Bool *is_slice, Bool *is_islice)
 {
 	s32 ps_idx = 0;
 	s32 res = 0;
 
+	if (!size) return -1;
 	gf_bs_reassign_buffer(ctx->bs_r, data, size);
 	*skip_nal = GF_FALSE;
-	res = gf_media_avc_parse_nalu(ctx->bs_r, ctx->avc_state);
-	if (ctx->eos_in_bs)
-		return -1;
+	res = gf_avc_parse_nalu(ctx->bs_r, ctx->avc_state);
 	if (res < 0) {
 		if (res == -1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Warning: Error parsing NAL unit\n", ctx->log_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Warning: Error parsing NAL unit\n", ctx->log_name));
 		}
 		*skip_nal = GF_TRUE;
 	}
 	ctx->nb_nalus++;
-	
+
 	switch (nal_type) {
 	case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
 	case GF_AVC_NALU_SEQ_PARAM:
 		ps_idx = ctx->avc_state->last_ps_idx;
 		if (ps_idx<0) {
 			if (ctx->avc_state->sps[0].profile_idc) {
-				GF_LOG(ctx->avc_state->sps[0].profile_idc ? GF_LOG_WARNING : GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Error parsing Sequence Param Set\n", ctx->log_name));
+				GF_LOG(ctx->avc_state->sps[0].profile_idc ? GF_LOG_WARNING : GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Sequence Param Set\n", ctx->log_name));
 			}
 		} else {
 			naludmx_queue_param_set(ctx, data, size, GF_AVC_NALU_SEQ_PARAM, ps_idx);
@@ -1899,7 +2541,7 @@
 	case GF_AVC_NALU_PIC_PARAM:
 		ps_idx = ctx->avc_state->last_ps_idx;
 		if (ps_idx<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Error parsing Picture Param Set\n", ctx->log_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Picture Param Set\n", ctx->log_name));
 		} else {
 			naludmx_queue_param_set(ctx, data, size, GF_AVC_NALU_PIC_PARAM, ps_idx);
 		}
@@ -1909,7 +2551,7 @@
 	case GF_AVC_NALU_SEQ_PARAM_EXT:
 		ps_idx = ctx->avc_state->last_ps_idx;
 		if (ps_idx<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Error parsing Sequence Param Set Extension\n", ctx->log_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing Sequence Param Set Extension\n", ctx->log_name));
 		} else {
 			naludmx_queue_param_set(ctx, data, size, GF_AVC_NALU_SEQ_PARAM_EXT, ps_idx);
 		}
@@ -1918,25 +2560,9 @@
 
 	case GF_AVC_NALU_SEI:
 		if (ctx->avc_state->sps_active_idx != -1) {
-			u32 rw_sei_size, sei_size = size;
-			if (ctx->sei_buffer_alloc < ctx->sei_buffer_size + sei_size + ctx->nal_length) {
-				ctx->sei_buffer_alloc = ctx->sei_buffer_size + sei_size + ctx->nal_length;
-				ctx->sei_buffer = gf_realloc(ctx->sei_buffer, ctx->sei_buffer_alloc);
-			}
-
-			if (!ctx->bs_w) ctx->bs_w = gf_bs_new(ctx->sei_buffer + ctx->sei_buffer_size, ctx->nal_length + sei_size, GF_BITSTREAM_WRITE);
-			else gf_bs_reassign_buffer(ctx->bs_w, ctx->sei_buffer + ctx->sei_buffer_size, ctx->nal_length + sei_size);
-			gf_bs_write_int(ctx->bs_w, sei_size, 8*ctx->nal_length);
-
-			memcpy(ctx->sei_buffer + ctx->sei_buffer_size + ctx->nal_length, data, sei_size);
-			rw_sei_size = gf_media_avc_reformat_sei(ctx->sei_buffer + ctx->sei_buffer_size + ctx->nal_length, sei_size, ctx->seirw, ctx->avc_state);
-			if (rw_sei_size < sei_size) {
-				gf_bs_seek(ctx->bs_w, 0);
-				gf_bs_write_int(ctx->bs_w, rw_sei_size, 8*ctx->nal_length);
-			}
+			naludmx_push_prefix(ctx, data, size, GF_TRUE);
 
 			*skip_nal = GF_TRUE;
-			ctx->sei_buffer_size += rw_sei_size + ctx->nal_length;
 
 			if (ctx->nosei) {
 				ctx->sei_buffer_size = 0;
@@ -1998,8 +2624,8 @@
 		if (!ctx->explicit) {
 			u32 i;
 			for (i = 0; i < gf_list_count(ctx->pps); i ++) {
-				GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(ctx->pps, i);
-				if (ctx->avc_state->s_info.pps->id == slc->id) {
+				GF_NALUFFParam *slc = (GF_NALUFFParam*)gf_list_get(ctx->pps, i);
+				if (ctx->avc_state->s_info.pps && ctx->avc_state->s_info.pps->id == slc->id) {
 					/* This PPS is used by an SVC NAL unit, it should be moved to the SVC Config Record) */
 					gf_list_rem(ctx->pps, i);
 					i--;
@@ -2035,20 +2661,33 @@
 	case GF_AVC_NALU_SLICE_AUX:
 		*is_slice = GF_TRUE;
 		break;
+
+	case GF_AVC_NALU_DV_RPU:
+		if (ctx->dv_mode==DVMODE_CLEAN) {
+			*skip_nal = GF_TRUE;
+		} else {
+			ctx->nb_dv_rpu ++;
+			if (ctx->nb_dv_rpu==1)
+				naludmx_set_dolby_vision(ctx);
+		}
+		break;
+	case GF_AVC_NALU_DV_EL:
+		if ((ctx->dv_mode==DVMODE_CLEAN) || (ctx->dv_mode==DVMODE_SINGLE)) {
+			*skip_nal = GF_TRUE;
+		} else {
+			ctx->nb_dv_el ++;
+			if (ctx->nb_dv_el==1)
+				naludmx_set_dolby_vision(ctx);
+		}
+		break;
 	}
 	return res;
 }
 
-static void naludmx_on_eos(void *par)
-{
-	GF_NALUDmxCtx *ctx = (GF_NALUDmxCtx *)par;
-	ctx->eos_in_bs = GF_TRUE;
-}
-
 static void naldmx_switch_timestamps(GF_NALUDmxCtx *ctx, GF_FilterPacket *pck)
 {
 	//input pid sets some timescale - we flushed pending data , update cts
-	if (ctx->timescale) {
+	if (!ctx->notime) {
 		u64 ts = gf_filter_pck_get_cts(pck);
 		if (ts != GF_FILTER_NO_TS) {
 			ctx->prev_cts = ctx->cts;
@@ -2056,59 +2695,102 @@
 		}
 		ts = gf_filter_pck_get_dts(pck);
 		if (ts != GF_FILTER_NO_TS) {
-			GF_FilterClockType ck_type = gf_filter_pid_get_clock_info(ctx->ipid, NULL, NULL);
-			if (ck_type==GF_FILTER_CLOCK_PCR_DISC)
+			if (ctx->full_au_source) {
+				ctx->prev_dts = ctx->dts;
 				ctx->dts = ts;
-			else if (ctx->dts<ts)
-				ctx->dts=ts;
-
-			if (!ctx->prev_dts) ctx->prev_dts = ts;
-			else if (ctx->prev_dts != ts) {
-				u64 diff = ts;
-				diff -= ctx->prev_dts;
-				if (!ctx->cur_fps.den)
-					ctx->cur_fps.den = (u32) diff;
-				else if (ctx->cur_fps.den > diff)
-					ctx->cur_fps.den = (u32) diff;
+			} else {
+				GF_FilterClockType ck_type = gf_filter_pid_get_clock_info(ctx->ipid, NULL, NULL);
+				if (ck_type==GF_FILTER_CLOCK_PCR_DISC)
+					ctx->dts = ts;
+				else if (ctx->dts<ts)
+					ctx->dts=ts;
+
+				if (!ctx->prev_dts) ctx->prev_dts = ts;
+				else if (ctx->prev_dts != ts) {
+					u64 diff = ts;
+					diff -= ctx->prev_dts;
+					if (!ctx->cur_fps.den)
+						ctx->cur_fps.den = (u32) diff;
+					else if (ctx->cur_fps.den > diff)
+						ctx->cur_fps.den = (u32) diff;
 
-				ctx->prev_dts = ts;
+					ctx->prev_dts = ts;
+				}
 			}
 		}
 		ctx->pck_duration = gf_filter_pck_get_duration(pck);
 		if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
 		ctx->src_pck = pck;
 		gf_filter_pck_ref_props(&ctx->src_pck);
-		//store framing flags. If input_is_au_start, the first NAL of the first frame begining in this packet will
+		//store framing flags. If input_is_au_start, the first NAL of the first frame beginning in this packet will
 		//use the DTS/CTS of the input packet, otherwise we will use our internal POC recompute
 		gf_filter_pck_get_framing(pck, &ctx->input_is_au_start, NULL);
 	}
 }
 
+static void naldmx_check_timestamp_switch(GF_NALUDmxCtx *ctx, u32 *nalu_store_before, u32 bytes_drop, Bool *drop_packet, GF_FilterPacket *pck)
+{
+	if (*nalu_store_before) {
+		if (*nalu_store_before > bytes_drop) {
+			*nalu_store_before -= bytes_drop;
+		} else {
+			//all data from previous frame consumed, update timestamps with info from current packet
+			*nalu_store_before = 0;
+			naldmx_switch_timestamps(ctx, pck);
+			if (*drop_packet) {
+				gf_filter_pid_drop_packet(ctx->ipid);
+				*drop_packet = GF_FALSE;
+			}
+		}
+	}
+}
+
+static void naldmx_bs_log(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3)
+{
+	GF_NALUDmxCtx *ctx = (GF_NALUDmxCtx *) udta;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, (" %s", field_name));
+	if (idx1>=0) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("_%d", idx1));
+		if (idx2>=0) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("_%d", idx2));
+			if (idx3>=0) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("_%d", idx3));
+			}
+		}
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("=\""LLD, field_val));
+	if ((ctx->bsdbg==2) && ((s32) nb_bits > 1) )
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("(%u)", nb_bits));
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("\" "));
+}
+
+
 GF_Err naludmx_process(GF_Filter *filter)
 {
 	GF_NALUDmxCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck;
-	GF_Err e;
-	char *data;
 	u8 *start;
-	u32 pck_size;
-	u32 hdr_size_at_resume = 0;
 	u32 nalu_before = ctx->nb_nalus;
+	u32 nalu_store_before = 0;
 	s32 remain;
 	Bool is_eos = GF_FALSE;
+	Bool drop_packet = GF_FALSE;
+	u64 byte_offset = GF_FILTER_NO_BO;
 
 	//always reparse duration
 	if (!ctx->file_loaded)
 		naludmx_check_dur(filter, ctx);
 
 	pck = gf_filter_pid_get_packet(ctx->ipid);
-	if (!pck) {
+	if (!ctx->resume_from && !pck) {
 		if (gf_filter_pid_is_eos(ctx->ipid)) {
-			if (ctx->bytes_in_header || ctx->hdr_store_size) {
-				start = data = ctx->hdr_store;
-				remain = pck_size = ctx->bytes_in_header ? ctx->bytes_in_header : ctx->hdr_store_size;
-				ctx->bytes_in_header = 0;
-				ctx->hdr_store_size = 0;
+			if (ctx->nal_store_size) {
+				if (!ctx->is_playing)
+					return GF_OK;
+
+				start = ctx->nal_store;
+				remain = ctx->nal_store_size;
 				is_eos = GF_TRUE;
 				goto naldmx_flush;
 			}
@@ -2124,10 +2806,10 @@
 			if (!ctx->opid) return GF_EOS;
 
 			gf_filter_pid_set_info(ctx->opid, GF_PROP_PID_MAX_NALU_SIZE, &PROP_UINT(ctx->max_nalu_size) );
-			if (ctx->is_hevc) {
+			if (ctx->codecid==GF_CODECID_HEVC) {
 				naludmx_set_hevc_oinf(ctx, ctx->max_temporal_id);
 				naludmx_set_hevc_linf(ctx);
-				gf_filter_pid_set_property_str(ctx->opid, "hevc:min_lid", &PROP_UINT(ctx->min_layer_id) );
+				gf_filter_pid_set_info_str(ctx->opid, "hevc:min_lid", &PROP_UINT(ctx->min_layer_id) );
 			}
 			if (ctx->opid)
 				gf_filter_pid_set_eos(ctx->opid);
@@ -2136,82 +2818,76 @@
 		return GF_OK;
 	}
 
-	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
-	start = data;
-	remain = pck_size;
+	if (!ctx->is_playing && ctx->opid)
+		return GF_OK;
 
 	//if we have bytes from previous packet in the header, we cannot switch timing until we know what these bytes are
-	if (!ctx->bytes_in_header)
+	if (!ctx->nal_store_size)
 		naldmx_switch_timestamps(ctx, pck);
 
-	//we stored some data to find the complete vosh, aggregate this packet with current one
-	if (!ctx->resume_from && ctx->hdr_store_size) {
-		if (ctx->hdr_store_alloc < ctx->hdr_store_size + pck_size) {
-			ctx->hdr_store_alloc = ctx->hdr_store_size + pck_size;
-			ctx->hdr_store = gf_realloc(ctx->hdr_store, sizeof(char)*ctx->hdr_store_alloc);
-		}
-		hdr_size_at_resume = ctx->hdr_store_size;
-		memcpy(ctx->hdr_store + ctx->hdr_store_size, data, sizeof(char)*pck_size);
-		ctx->hdr_store_size += pck_size;
-		start = data = ctx->hdr_store;
-		remain = pck_size = ctx->hdr_store_size;
+	nalu_store_before = ctx->nal_store_size;
+	if (!ctx->resume_from && pck) {
+		u32 pck_size;
+		const u8 *data = gf_filter_pck_get_data(pck, &pck_size);
+		if (ctx->nal_store_alloc < ctx->nal_store_size + pck_size) {
+			ctx->nal_store_alloc = ctx->nal_store_size + pck_size;
+			ctx->nal_store = gf_realloc(ctx->nal_store, sizeof(char)*ctx->nal_store_alloc);
+			if (!ctx->nal_store) {
+				ctx->nal_store_alloc = 0;
+				return GF_OUT_OF_MEM;
+			}
+		}
+		byte_offset = gf_filter_pck_get_byte_offset(pck);
+		if (byte_offset != GF_FILTER_NO_BO)
+			byte_offset -= ctx->nal_store_size;
+		memcpy(ctx->nal_store + ctx->nal_store_size, data, sizeof(char)*pck_size);
+		ctx->nal_store_size += pck_size;
+		drop_packet = GF_TRUE;
 	}
+	start = ctx->nal_store;
+	remain = ctx->nal_store_size;
 
 	if (ctx->resume_from) {
 		if (ctx->opid && gf_filter_pid_would_block(ctx->opid))
 			return GF_OK;
 
-		//resume from data copied internally
-		if (ctx->hdr_store_size) {
-			assert(ctx->resume_from <= ctx->hdr_store_size);
-			start = data = ctx->hdr_store + ctx->resume_from;
-			remain = pck_size = ctx->hdr_store_size - ctx->resume_from;
-		} else {
-			assert((s32)ctx->resume_from >0);
- if (ctx->resume_from > (u32) remain) {
- GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] something wrong, resuming parsing at %d bytes but only %d bytes in packet, discarding data\n", ctx->log_name, ctx->resume_from, remain));
- } else {
- start += ctx->resume_from;
- remain -= ctx->resume_from;
- }
-		}
+		assert(ctx->resume_from < ctx->nal_store_size);
+		start += ctx->resume_from;
+		remain -= ctx->resume_from;
 		ctx->resume_from = 0;
+
+		if (!pck && gf_filter_pid_is_eos(ctx->ipid))
+			is_eos = GF_TRUE;
 	}
 
 naldmx_flush:
 	if (!ctx->bs_r) {
 		ctx->bs_r = gf_bs_new(start, remain, GF_BITSTREAM_READ);
+
+#ifndef GPAC_DISABLE_LOG
+		if (ctx->bsdbg && gf_log_tool_level_on(GF_LOG_MEDIA, GF_LOG_DEBUG))
+			gf_bs_set_logger(ctx->bs_r, naldmx_bs_log, ctx);
+#endif
+
 	} else {
 		gf_bs_reassign_buffer(ctx->bs_r, start, remain);
 	}
-	if (is_eos)
-		gf_bs_set_eos_callback(ctx->bs_r, naludmx_on_eos, ctx);
-	ctx->eos_in_bs = GF_FALSE;
 
 assert(remain>=0);
- 
+
 	while (remain) {
 		u8 *pck_data;
-		u8 *hdr_start;
-		u32 hdr_avail;
-		u8 *pck_start;
-		u32 pck_avail;
+		u8 *nal_data;
+		u32 nal_size;
 		s32 current;
-		Bool nal_hdr_in_store = GF_FALSE;
-		Bool nal_sc_in_store = GF_FALSE;
-		u32 nal_bytes_from_store = 0;
 		Bool skip_nal = GF_FALSE;
-		u64 size=0;
-		u32 sc_size, store_sc_size=0;
-		u32 bytes_from_store = 0;
-		u32 hdr_offset = 0;
-		Bool full_nal_required = GF_FALSE;
+		u32 sc_size=0;
 		u32 nal_type = 0;
 		u32 nal_ref_idc = 0;
 		s32 next=0;
 		u32 next_sc_size=0;
 		s32 nal_parse_result;
-		Bool slice_is_ref, slice_force_ref;
+		Bool slice_is_idr, slice_force_ref;
 		Bool is_slice = GF_FALSE;
 		Bool is_islice = GF_FALSE;
 		Bool bottom_field_flag = GF_FALSE;
@@ -2223,230 +2899,59 @@
 		Bool bIntraSlice = GF_FALSE;
 		GF_FilterSAPType au_sap_type = GF_FILTER_SAP_NONE;
 		Bool slice_is_b = GF_FALSE;
-		Bool full_nal = GF_FALSE;
+		Bool check_dep = GF_FALSE;
+		Bool force_au_flush = GF_FALSE;
 		s32 slice_poc = 0;
-		u32 next_size = 0;
 
-		Bool copy_last_bytes = GF_FALSE;
-
-		//not enough bytes to parse start code
+		//not enough bytes to parse start code + nal hdr
 		if (!is_eos && (remain<6)) {
-			memcpy(ctx->hdr_store, start, remain);
-			ctx->bytes_in_header = remain;
 			break;
 		}
-		current = -1;
-
-		//we have some potential bytes of a start code in the store, copy some more bytes and check if valid start code.
-		//if not, dispatch these bytes as continuation of the data
-		if (ctx->bytes_in_header) {
-			Bool split_start_code=GF_FALSE;
-
-			memcpy(ctx->hdr_store + ctx->bytes_in_header, start, SAFETY_NAL_STORE - ctx->bytes_in_header);
-			current = gf_media_nalu_next_start_code(ctx->hdr_store, SAFETY_NAL_STORE, &sc_size);
-			if (current==SAFETY_NAL_STORE)
-				current = -1;
-
-			//no start code in stored buffer
-			if (current<0) {
-				if (!ctx->next_nal_end_skip) {
-					e = naludmx_realloc_last_pck(ctx, ctx->bytes_in_header, &pck_data);
-					if (e==GF_OK) {
-						memcpy(pck_data, ctx->hdr_store, ctx->bytes_in_header);
-					}
-				}
-				ctx->bytes_in_header = 0;
-			} else {
-				//if start is greater than stored data, the nal is completely in the input packet (but the start code may not be)
-				if (current + sc_size > ctx->bytes_in_header) {
-					//we need to dispatch current bytes from the header, whether all these bytes were in the previous
-					//packet or some are in the new one does not matter
-
-					bytes_from_store = current;
-					//the offset to the NAL first byte in the store is current+sc_size,
-					//hence current+sc_pos-ctx->bytes_in_header in the new packet
-					hdr_offset = current + sc_size - ctx->bytes_in_header;
-					nal_sc_in_store = GF_TRUE;
-
-					//since the nal is completely in the pes, its timestamp is the one of the source packet, switch timing
-					naldmx_switch_timestamps(ctx, pck);
-				} else {
-					//this is trickier, nal start is in the store buffer
-					u8 lastb2, lastb1, nextb1;
-
-					lastb2 = ctx->hdr_store[ctx->bytes_in_header-2];
-					lastb1 = ctx->hdr_store[ctx->bytes_in_header-1];
-					nextb1 = start[0];
-
-					if (!lastb1 && !lastb2) { split_start_code=GF_TRUE; }
-					else if (!lastb1 && !nextb1) { split_start_code = GF_TRUE; }
-
-					if (split_start_code ) {
-						u32 store_remain = SAFETY_NAL_STORE - (current + sc_size);
-						u32 following_sc_size;
-						s32 following = gf_media_nalu_next_start_code(ctx->hdr_store + current+sc_size, store_remain, &following_sc_size);
-						assert(!current);
-						if ((following>0) && (following + current+sc_size < ctx->bytes_in_header)) {
-							next_size = following - current;
-							nal_bytes_from_store = next_size;
-							store_sc_size = sc_size;
-						} else {
-							split_start_code = 0;
-						}
-					}
 
-					//we still have current bytes to dispatch
-					bytes_from_store = current;
+		//locate next start code
+		current = gf_media_nalu_next_start_code(start, remain, &sc_size);
+		if (current == remain)
+			current = -1;
 
-					//the offset in the STORE is current+sc_size, and we parse the store, not the packet !!
-					hdr_offset = current + sc_size;
-
-					nal_hdr_in_store = GF_TRUE;
-
-
-					if (!split_start_code) {
-						if (sc_size == ctx->bytes_in_header) {
-							nal_hdr_in_store = GF_FALSE;
-							sc_size = 0;
-							hdr_offset=0;
-							nal_bytes_from_store = 0;
-						} else {
-							//we need to copy the nal first bytes from the store
-							nal_bytes_from_store = ctx->bytes_in_header - (current + sc_size);
-						}
-					}
-
-				}
-				if (!split_start_code) {
-					ctx->bytes_in_header = 0;
-				}
-			}
-		}
-		//no starcode in store, look for startcode in packet
-		if (current == -1) {
-			//locate next start code
-			current = gf_media_nalu_next_start_code(start, remain, &sc_size);
-			if (current == remain)
-				current = -1;
-
-			//no start code, dispatch the block
-			if (current<0) {
-				u8 b3, b2, b1;
-				if (! ctx->first_pck_in_au) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] no start code in block and no frame started, discarding data\n", ctx->log_name));
-					break;
-				}
-				size = remain;
-				b3 = start[remain-3];
-				b2 = start[remain-2];
-				b1 = start[remain-1];
-				//we may have a startcode at the end of the packet, store it and don't dispatch the last 3 bytes !
-				if (!is_eos && (!b1 || !b2 || !b3)) {
-					copy_last_bytes = GF_TRUE;
-					assert(size >= 3);
-					size -= 3;
-					ctx->bytes_in_header = 3;
-				}
-				if (!ctx->next_nal_end_skip) {
-					e = naludmx_realloc_last_pck(ctx, (u32) size, &pck_data);
-					if (e==GF_OK)
-						memcpy(pck_data, start, (size_t) size);
-				}
-
-				if (copy_last_bytes) {
-					memcpy(ctx->hdr_store, start+remain-3, 3);
-				}
-				break;
-			}
+		//no start code, gontinue gathering data
+		if (current<0) {
+			break;
 		}
 
 		assert(current>=0);
 
-
-		//skip if no output pid
-		if (!ctx->opid && current) {
+		//unknown data before start of nal, may happen when tuning in, discard
+		if (current) {
 			assert(remain>=current);
- assert((s32) current >= 0);
- 
 			start += current;
 			remain -= current;
 			current = 0;
-			ctx->next_nal_end_skip = GF_FALSE;
+			naldmx_check_timestamp_switch(ctx, &nalu_store_before, current, &drop_packet, pck);
 		}
 
-		//dispatch remaining bytes
-		if (current>0) {
-			e = GF_EOS;
-			//flush remaining bytes in NAL
-			if (!ctx->next_nal_end_skip) {
-				e = naludmx_realloc_last_pck(ctx, current, &pck_data);
-			}
-			//bytes were partly in store, partly in packet
-			if (bytes_from_store) {
-				if (bytes_from_store>=(u32) current) {
-					//we still have that many bytes from the store to dispatch
-//					bytes_from_store -= current;
-				} else {
-					//we are done, the nal header and start code is completely in the new packet
-					u32 shift = current - bytes_from_store;
-//					bytes_from_store = 0;
- assert(remain >= (s32) shift);
- assert((s32) shift >= 0);
-					start += shift;
-					remain -= shift;
-					nal_sc_in_store = 0;
-				}
-				if (e==GF_OK) {
-					memcpy(pck_data, ctx->hdr_store, current);
-				}
-			} else {
-				if (e==GF_OK) {
-					memcpy(pck_data, start, current);
-				}
-				assert(remain>=current);
-				start += current;
-				remain -= current;
-			}
-		}
 		if (!remain)
 			break;
 
-		//nal hdr is in the store, use the store to parse slice header
-		if (nal_hdr_in_store) {
-			hdr_start = ctx->hdr_store + hdr_offset;
-			hdr_avail = SAFETY_NAL_STORE - hdr_offset;
-			pck_start = start;
-			pck_avail = remain;
-			sc_size = 0;
-		}
-		//nal hdr is in new packet at hdr_offset, use the packet to parse slice header
-		else if (nal_sc_in_store) {
-			hdr_start = start + hdr_offset;
-			hdr_avail = remain - hdr_offset;
-			pck_start = hdr_start;
-			pck_avail = hdr_avail;
-			sc_size = 0;
-		}
-		//nal hdr is in new packet start + sc_size, use the packet to parse slice header
-		else {
-			hdr_start = start + sc_size;
-			hdr_avail = remain - sc_size;
-			pck_start = hdr_start;
-			pck_avail = hdr_avail;
+		//not enough bytes to parse start code + nal hdr
+		if (!is_eos && (remain<6)) {
+			break;
 		}
 
+		nal_data = start + sc_size;
+		nal_size = remain - sc_size;
+
 		//figure out which nal we need to completely load
-		if (ctx->is_hevc) {
-			nal_type = hdr_start[0];
+		if (ctx->codecid==GF_CODECID_HEVC) {
+			nal_type = nal_data[0];
 			nal_type = (nal_type & 0x7E) >> 1;
+
 			switch (nal_type) {
 			case GF_HEVC_NALU_VID_PARAM:
 			case GF_HEVC_NALU_SEQ_PARAM:
 			case GF_HEVC_NALU_PIC_PARAM:
+				force_au_flush = GF_TRUE;
 			case GF_HEVC_NALU_SEI_PREFIX:
 			case GF_HEVC_NALU_SEI_SUFFIX:
-				if (!ctx->analyze)
-					full_nal_required = GF_TRUE;
 				break;
 			case GF_HEVC_NALU_SLICE_TRAIL_N:
 			case GF_HEVC_NALU_SLICE_TSA_N:
@@ -2456,123 +2961,109 @@
 			case GF_HEVC_NALU_SLICE_RSV_VCL_N10:
 			case GF_HEVC_NALU_SLICE_RSV_VCL_N12:
 			case GF_HEVC_NALU_SLICE_RSV_VCL_N14:
-				if (ctx->deps) {
-					HEVC_VPS *vps;
-					u32 temporal_id = hdr_start[1] & 0x7;
-					vps = & ctx->hevc_state->vps[ctx->hevc_state->s_info.sps->vps_id];
-					if (temporal_id + 1 < vps->max_sub_layers) {
-						nal_ref_idc = GF_TRUE;
-					}
-				}
+				check_dep = GF_TRUE;
 				break;
 			default:
 				if (nal_type<GF_HEVC_NALU_VID_PARAM)
 					nal_ref_idc = GF_TRUE;
 				break;
 			}
-		} else {
-			nal_type = hdr_start[0] & 0x1F;
+			//check if VPS/SPS/PPS lid/tid are greater than last seen VCL. If not, force a picture flush
+			//not doing so could lead in dispatching the config changed before the current AU is sent
+			if (force_au_flush) {
+				if (!ctx->first_pck_in_au) {
+					force_au_flush = GF_FALSE;
+				} else {
+					u8 layer_id = nal_data[0] & 1;
+					layer_id<<=5;
+					layer_id |= (nal_data[1] & 0xF8) >> 3;
+					u8 temporal_id = nal_data[2] & 0x7;
+					if (ctx->last_layer_id < layer_id)
+						force_au_flush = GF_FALSE;
+					else if (ctx->last_layer_id == layer_id) {
+						if (ctx->last_temporal_id < temporal_id)
+							force_au_flush = GF_FALSE;
+					}
+				}
+			}
+		} else if (ctx->codecid==GF_CODECID_VVC) {
+			nal_type = nal_data[1]>>3;
 			switch (nal_type) {
-			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-			case GF_AVC_NALU_SEQ_PARAM:
-			case GF_AVC_NALU_PIC_PARAM:
-			case GF_AVC_NALU_SVC_PREFIX_NALU:
-			//we also need the SEI in AVC since some SEI messages have to be removed
-			case GF_AVC_NALU_SEI:
-				if (!ctx->analyze)
-					full_nal_required = GF_TRUE;
+			case GF_VVC_NALU_OPI:
+			case GF_VVC_NALU_DEC_PARAM:
+			case GF_VVC_NALU_VID_PARAM:
+			case GF_VVC_NALU_SEQ_PARAM:
+			case GF_VVC_NALU_PIC_PARAM:
+				force_au_flush = GF_TRUE;
+			case GF_VVC_NALU_SEI_PREFIX:
+			case GF_VVC_NALU_SEI_SUFFIX:
+			case GF_VVC_NALU_APS_PREFIX:
+			case GF_VVC_NALU_APS_SUFFIX:
+			case GF_VVC_NALU_PIC_HEADER:
+				break;
+
+			case GF_VVC_NALU_SLICE_TRAIL:
+			case GF_VVC_NALU_SLICE_STSA:
+			case GF_VVC_NALU_SLICE_RADL:
+			case GF_VVC_NALU_SLICE_RASL:
+			case GF_VVC_NALU_SLICE_IDR_W_RADL:
+			case GF_VVC_NALU_SLICE_IDR_N_LP:
+			case GF_VVC_NALU_SLICE_CRA:
+			case GF_VVC_NALU_SLICE_GDR:
+				if (ctx->deps) {
+					check_dep = GF_TRUE;
+				}
 				break;
 			default:
+				if (nal_type<GF_HEVC_NALU_VID_PARAM)
+					nal_ref_idc = GF_TRUE;
 				break;
 			}
-			nal_ref_idc = (hdr_start[0] & 0x60) >> 5;
-		}
-		if (!next_size) {
-			if (full_nal_required && !is_eos) {
-				//we need the full nal loaded
-				next = gf_media_nalu_next_start_code(pck_start, pck_avail, &next_sc_size);
-				if (!ctx->full_au_source && (next==pck_avail))
-					next = -1;
-
-				if (next<0) {
-					if (sc_size) pck_avail += sc_size;
-					if (ctx->hdr_store_alloc < ctx->hdr_store_size + pck_avail) {
-						ctx->hdr_store_alloc = ctx->hdr_store_size + pck_avail;
-						ctx->hdr_store = gf_realloc(ctx->hdr_store, sizeof(char)*ctx->hdr_store_alloc);
-					}
-					memcpy(ctx->hdr_store + ctx->hdr_store_size, start, sizeof(char)*pck_avail);
-					ctx->hdr_store_size += pck_avail;
-					gf_filter_pid_drop_packet(ctx->ipid);
-					return GF_OK;
-				}
-			} else {
-				next = gf_media_nalu_next_start_code(pck_start, pck_avail, &next_sc_size);
-				if ( (next == pck_avail) && !ctx->full_au_source) {
-					if (!is_eos)
-						next = -1;
-					else if (ctx->is_hevc && pck_avail<2)
-						next = -1;
-				}
-			}
-
-			//ok we have either a full nal, or the start of a NAL we can start to process, parse NAL
-			if (next<0) {
-				size = pck_avail;
-				if (!nal_hdr_in_store) {
-					hdr_avail = (u32) size;
-				}
-			} else {
-				full_nal = GF_TRUE;
-				size = next;
-				if (full_nal_required) {
-					if (!nal_bytes_from_store && nal_sc_in_store) {
-						hdr_avail = (u32) size;
-						hdr_start = pck_start;
 
-					} else {
-						size += nal_bytes_from_store;
-						//we require full nal but begining of the nal is in the store, the rest in the current packet.
-						//We must copy the complete nal in the store before parsing it
-						if (nal_bytes_from_store && (size > SAFETY_NAL_STORE)) {
-							u32 copy_size = (u32) (size - nal_bytes_from_store);
-							if (ctx->hdr_store_alloc<copy_size) {
-								ctx->hdr_store_alloc = copy_size;
-								ctx->hdr_store = gf_realloc(ctx->hdr_store, ctx->hdr_store_alloc);
-							}
-							memcpy(ctx->hdr_store + hdr_offset + nal_bytes_from_store, start, copy_size);
-						}
-						hdr_avail = (u32) size;
+			//check if VPS/SPS/PPS/OPI/DEC lid/tid are greater than last seen VCL. If not, force a picture flush
+			//not doing so could lead in dispatching the config changed before the current AU is sent
+			if (force_au_flush) {
+				if (!ctx->first_pck_in_au) {
+					force_au_flush = GF_FALSE;
+				} else {
+					u8 layer_id = nal_data[0] & 0x3f;
+					u8 temporal_id = (nal_data[1] & 0x7);
+					if (ctx->last_layer_id < layer_id)
+						force_au_flush = GF_FALSE;
+					else if (ctx->last_layer_id == layer_id) {
+						if (ctx->last_temporal_id < temporal_id)
+							force_au_flush = GF_FALSE;
 					}
-				} else if (hdr_avail>(u32) size && !nal_bytes_from_store)
-					hdr_avail = (u32) size;
-			}
-			if (!full_nal && (size < SAFETY_NAL_STORE/2)) {
-				assert(!nal_sc_in_store);
-				assert(!nal_hdr_in_store);
-				assert(remain < SAFETY_NAL_STORE);
-				//we may have garbage at the end os stream, if the stream was cancelled in the middle (truncated nal)
-				if (!is_eos) {
-					memcpy(ctx->hdr_store, start, remain);
-					ctx->bytes_in_header = remain;
 				}
-				break;
 			}
 		} else {
-			full_nal = GF_TRUE;
-			size = next_size;
+			nal_type = nal_data[0] & 0x1F;
+			nal_ref_idc = (nal_data[0] & 0x60) >> 5;
 		}
 
-		if (ctx->is_hevc) {
-			nal_parse_result = naludmx_parse_nal_hevc(ctx, hdr_start, hdr_avail, &skip_nal, &is_slice, &is_islice);
-		} else {
-			nal_parse_result = naludmx_parse_nal_avc(ctx, hdr_start, hdr_avail, nal_type, &skip_nal, &is_slice, &is_islice);
+		//locate next NAL start
+		next = gf_media_nalu_next_start_code(nal_data, nal_size, &next_sc_size);
+		if (!is_eos && (next == nal_size) && !ctx->full_au_source) {
+			next = -1;
 		}
 
-		if (ctx->eos_in_bs && is_eos) {
+		//next nal start not found, wait
+		if (next<0) {
 			break;
 		}
 
+		//this is our exact NAL size, without start code
+		nal_size = next;
+
+		if (ctx->codecid==GF_CODECID_HEVC) {
+			nal_parse_result = naludmx_parse_nal_hevc(ctx, nal_data, nal_size, &skip_nal, &is_slice, &is_islice);
+		} else if (ctx->codecid==GF_CODECID_VVC) {
+			nal_parse_result = naludmx_parse_nal_vvc(ctx, nal_data, nal_size, &skip_nal, &is_slice, &is_islice);
+		} else {
+			nal_parse_result = naludmx_parse_nal_avc(ctx, nal_data, nal_size, nal_type, &skip_nal, &is_slice, &is_islice);
+		}
 
+		//dispatch right away if analyze
 		if (ctx->analyze) {
 			skip_nal = GF_FALSE;
 			ctx->sei_buffer_size = 0;
@@ -2580,68 +3071,28 @@
 
 		//new frame - if no slices, we detected the new frame on AU delimiter, don't flush new frame !
 		if ((nal_parse_result>0) && !ctx->first_slice_in_au) {
-			//new frame - we flush later on
-			naludmx_finalize_au_flags(ctx);
-
-			ctx->has_islice = GF_FALSE;
-			ctx->first_slice_in_au = GF_TRUE;
-			ctx->sei_recovery_frame_count = -1;
-			ctx->au_sap = GF_FILTER_SAP_NONE;
-			ctx->bottom_field_flag = GF_FALSE;
+			naludmx_end_access_unit(ctx);
 		}
 
-		if (skip_nal) {
-			assert(remain >= (s32)sc_size+next);
-			if (next<0) {
-				u8 b3, b2, b1;
-				b3 = start[remain-3];
-				b2 = start[remain-2];
-				b1 = start[remain-1];
-				//we may have a startcode at the end of the packet, store it and don't dispatch the last 3 bytes !
-				if (!b1 || !b2 || !b3) {
-					memcpy(ctx->hdr_store, start+remain-3, 3);
-					ctx->bytes_in_header = 3;
-				}
-				ctx->next_nal_end_skip = GF_TRUE;
-				break;
-			}
-			assert(remain >= next);
-			start = pck_start + next;
- assert((u32) (start - (u8*)data) <= pck_size);
-			remain = pck_size - (u32) (start - (u8*)data);
-			if (nal_hdr_in_store) {
-				if (full_nal && ctx->bytes_in_header) {
-					memmove(ctx->hdr_store, hdr_start+nal_bytes_from_store, ctx->bytes_in_header - nal_bytes_from_store);
-					ctx->bytes_in_header -= next_size+store_sc_size;
-				} else {
-					ctx->bytes_in_header = 0;
-				}
-			}
-			continue;
-		}
-		ctx->next_nal_end_skip = GF_FALSE;
+		naludmx_check_pid(filter, ctx, force_au_flush);
+		if (!ctx->opid) skip_nal = GF_TRUE;
 
-		naludmx_check_pid(filter, ctx);
-		if (!ctx->opid) {
- u32 skip = sc_size+next;
-			assert(remain >= (s32) skip);
- if (skip) {
- start += sc_size+next;
- remain -= sc_size+next;
- } else {
- ctx->bytes_in_header = 0;
- }
+		if (skip_nal) {
+			nal_size += sc_size;
+			assert((u32) remain >= nal_size);
+			start += nal_size;
+			remain -= nal_size;
+			naldmx_check_timestamp_switch(ctx, &nalu_store_before, nal_size, &drop_packet, pck);
 			continue;
 		}
 
-		//at this point, we no longer reaggregate packets
-		ctx->hdr_store_size = 0;
-
-
 		if (!ctx->is_playing) {
-			ctx->resume_from = (u32) ( (char *)start - (char *)data);
- assert(ctx->resume_from<=pck_size);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[%s] not yet playing\n", ctx->log_name));
+			ctx->resume_from = (u32) (start - ctx->nal_store);
+ assert(ctx->resume_from<=ctx->nal_store_size);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] not yet playing\n", ctx->log_name));
+
+			if (drop_packet)
+				gf_filter_pid_drop_packet(ctx->ipid);
 			return GF_OK;
 		}
 		if (ctx->in_seek) {
@@ -2653,26 +3104,54 @@
 		}
 
 		if (nal_parse_result<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%s] Error parsing NAL Unit type %d - skipping\n", ctx->log_name, nal_type));
-			assert(remain >= (s32) sc_size+next);
-			start += sc_size+next;
-			remain -= sc_size+next;
+			if (byte_offset != GF_FILTER_NO_BO) {
+				u64 bo = byte_offset;
+				bo += (start - ctx->nal_store);
+
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing NAL Unit %d (byte offset "LLU" size %d type %d frame %d last POC %d) - skipping\n", ctx->log_name, ctx->nb_nalus, bo, nal_size, nal_type, ctx->nb_frames, ctx->last_poc));
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[%s] Error parsing NAL Unit %d (size %d type %d frame %d last POC %d) - skipping\n", ctx->log_name, ctx->nb_nalus, nal_size, nal_type, ctx->nb_frames, ctx->last_poc));
+			}
+			nal_size += sc_size;
+			assert((u32) remain >= nal_size);
+			start += nal_size;
+			remain -= nal_size;
+			naldmx_check_timestamp_switch(ctx, &nalu_store_before, nal_size, &drop_packet, pck);
 			continue;
 		}
 
+		if (check_dep) {
+			if ((ctx->codecid==GF_CODECID_HEVC) && ctx->hevc_state->s_info.sps) {
+				HEVC_VPS *vps;
+				u32 temporal_id = nal_data[1] & 0x7;
+				vps = & ctx->hevc_state->vps[ctx->hevc_state->s_info.sps->vps_id];
+				if (temporal_id + 1 < vps->max_sub_layers) {
+					nal_ref_idc = GF_TRUE;
+				}
+			} else if (ctx->codecid==GF_CODECID_VVC) {
+				if (ctx->vvc_state->s_info.non_ref_pic) {
+					nal_ref_idc = GF_FALSE;
+				} else {
+					//todo
+					nal_ref_idc = GF_TRUE;
+				}
+			}
+		}
+
+
 		if (is_islice) ctx->has_islice = GF_TRUE;
 
 		//store all variables needed to compute POC/CTS and sample SAP and recovery info
-		if (ctx->is_hevc) {
+		if (ctx->codecid==GF_CODECID_HEVC) {
 #ifndef GPAC_DISABLE_HEVC
-			slice_is_ref = gf_media_hevc_slice_is_IDR(ctx->hevc_state);
+			slice_is_idr = gf_hevc_slice_is_IDR(ctx->hevc_state);
 
 			recovery_point_valid = ctx->hevc_state->sei.recovery_point.valid;
 			recovery_point_frame_cnt = ctx->hevc_state->sei.recovery_point.frame_cnt;
-			bIntraSlice = gf_media_hevc_slice_is_intra(ctx->hevc_state);
+			bIntraSlice = gf_hevc_slice_is_intra(ctx->hevc_state);
 
 			au_sap_type = GF_FILTER_SAP_NONE;
-			if (gf_media_hevc_slice_is_IDR(ctx->hevc_state)) {
+			if (gf_hevc_slice_is_IDR(ctx->hevc_state)) {
 				au_sap_type = GF_FILTER_SAP_1;
 			}
 			else {
@@ -2700,6 +3179,64 @@
 				break;
 			}
 #endif // GPAC_DISABLE_HEVC
+		} else if (ctx->codecid==GF_CODECID_VVC) {
+			slice_is_idr = gf_vvc_slice_is_ref(ctx->vvc_state);
+			recovery_point_valid = ctx->vvc_state->s_info.recovery_point_valid;
+			recovery_point_frame_cnt = ctx->vvc_state->s_info.gdr_recovery_count;
+
+//			commented, set below
+//			if (ctx->vvc_state->s_info.irap_or_gdr_pic && !ctx->vvc_state->s_info.gdr_pic)
+//				bIntraSlice = GF_TRUE; //gf_hevc_slice_is_intra(ctx->hevc_state);
+
+			au_sap_type = GF_FILTER_SAP_NONE;
+			if (ctx->vvc_state->s_info.irap_or_gdr_pic && !ctx->vvc_state->s_info.gdr_pic) {
+				bIntraSlice = GF_TRUE;
+
+				switch (ctx->vvc_state->s_info.nal_unit_type) {
+				case GF_VVC_NALU_SLICE_CRA:
+					au_sap_type = GF_FILTER_SAP_3;
+					slice_is_idr = GF_FALSE;
+					break;
+				case GF_VVC_NALU_SLICE_IDR_N_LP:
+					au_sap_type = GF_FILTER_SAP_1;
+					break;
+				case GF_VVC_NALU_SLICE_IDR_W_RADL:
+					au_sap_type = GF_FILTER_SAP_2;
+					slice_is_idr = GF_TRUE;
+					break;
+				}
+			} else {
+				switch (ctx->vvc_state->s_info.nal_unit_type) {
+				case GF_VVC_NALU_SLICE_IDR_N_LP:
+					au_sap_type = GF_FILTER_SAP_1;
+					slice_is_idr = GF_TRUE;
+					bIntraSlice = GF_TRUE;
+					break;
+				case GF_VVC_NALU_SLICE_CRA:
+					au_sap_type = GF_FILTER_SAP_3;
+					bIntraSlice = GF_TRUE;
+					break;
+				case GF_VVC_NALU_SLICE_IDR_W_RADL:
+					bIntraSlice = GF_TRUE;
+					if (ctx->vvc_state->s_info.gdr_pic) {
+						au_sap_type = GF_FILTER_SAP_3;
+					} else {
+						au_sap_type = GF_FILTER_SAP_1;
+						slice_is_idr = GF_TRUE;
+					}
+					break;
+				}
+			}
+
+			slice_poc = ctx->vvc_state->s_info.poc;
+
+			/*need to store TS offsets*/
+			switch (ctx->vvc_state->s_info.slice_type) {
+			case GF_AVC_TYPE_B:
+			case GF_AVC_TYPE2_B:
+				slice_is_b = GF_TRUE;
+				break;
+			}
 		} else {
 
 			/*fixme - we need finer grain for priority*/
@@ -2726,7 +3263,7 @@
 				}
 				if (nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) {
 if (ctx->svc_prefix_buffer_size) {
- GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[%s] broken bitstream, two consecutive SVC prefix NALU without SVC slice inbetween\n", ctx->log_name));
+ GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] broken bitstream, two consecutive SVC prefix NALU without SVC slice in-between\n", ctx->log_name));
 ctx->svc_prefix_buffer_size = 0;
 }
 
@@ -2734,16 +3271,16 @@
 					ctx->svc_nalu_prefix_reserved = avc_svc_subs_reserved;
 					ctx->svc_nalu_prefix_priority = avc_svc_subs_priority;
 
-					ctx->svc_prefix_buffer_size = next;
+					ctx->svc_prefix_buffer_size = nal_size;
 					if (ctx->svc_prefix_buffer_size > ctx->svc_prefix_buffer_alloc) {
 						ctx->svc_prefix_buffer_alloc = ctx->svc_prefix_buffer_size;
 						ctx->svc_prefix_buffer = gf_realloc(ctx->svc_prefix_buffer, ctx->svc_prefix_buffer_size);
 					}
 					memcpy(ctx->svc_prefix_buffer, start+sc_size, ctx->svc_prefix_buffer_size);
 
-					assert( remain >= (s32) sc_size+next );
-					start += sc_size+next;
-					remain -= sc_size+next;
+					assert( (u32) remain >= sc_size + nal_size);
+					start += sc_size + nal_size;
+					remain -= sc_size + nal_size;
 					continue;
 				}
 			} else if (is_slice) {
@@ -2759,11 +3296,11 @@
 				bottom_field_flag = ctx->avc_state->s_info.bottom_field_flag;
 			}
 
-			slice_is_ref = (ctx->avc_state->s_info.nal_unit_type==GF_AVC_NALU_IDR_SLICE) ? GF_TRUE : GF_FALSE;
+			slice_is_idr = (ctx->avc_state->s_info.nal_unit_type==GF_AVC_NALU_IDR_SLICE) ? GF_TRUE : GF_FALSE;
 
 			recovery_point_valid = ctx->avc_state->sei.recovery_point.valid;
 			recovery_point_frame_cnt = ctx->avc_state->sei.recovery_point.frame_cnt;
-			bIntraSlice = gf_media_avc_slice_is_intra(ctx->avc_state);
+			bIntraSlice = gf_avc_slice_is_intra(ctx->avc_state);
 
 			au_sap_type = GF_FILTER_SAP_NONE;
 			if (ctx->avc_state->s_info.nal_unit_type == GF_AVC_NALU_IDR_SLICE)
@@ -2782,8 +3319,12 @@
 		if (is_slice) {
 			Bool first_in_au = ctx->first_slice_in_au;
 
-			if (slice_is_ref)
+			if (slice_is_idr)
 				ctx->nb_idr++;
+
+			if (au_sap_type==GF_FILTER_SAP_3)
+				ctx->nb_cra++;
+
 			slice_force_ref = GF_FALSE;
 
 			/*we only indicate TRUE IDRs for sync samples (cf AVC file format spec).
@@ -2791,8 +3332,6 @@
 			if (ctx->first_slice_in_au) {
 				ctx->first_slice_in_au = GF_FALSE;
 				if (recovery_point_valid) {
-//					if (!ctx->is_hevc) assert(ctx->avc_state->s_info.nal_unit_type!=GF_AVC_NALU_IDR_SLICE || bIntraSlice);
-
 					ctx->sei_recovery_frame_count = recovery_point_frame_cnt;
 
 					/*we allow to mark I-frames as sync on open-GOPs (with sei_recovery_frame_count=0) when forcing sync even when the SEI RP is not available*/
@@ -2800,11 +3339,13 @@
 						ctx->has_islice = 1;
 						if (ctx->use_opengop_gdr == 1) {
 							ctx->use_opengop_gdr = 2; /*avoid message flooding*/
-							GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[%s] No valid SEI Recovery Point found although needed - forcing\n", ctx->log_name));
+							GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] No valid SEI Recovery Point found although needed - forcing\n", ctx->log_name));
 						}
 					}
-					if (ctx->is_hevc) {
+					if (ctx->codecid==GF_CODECID_HEVC) {
 						ctx->hevc_state->sei.recovery_point.valid = 0;
+					} else if (ctx->codecid==GF_CODECID_VVC) {
+						ctx->vvc_state->s_info.recovery_point_valid = 0;
 					} else {
 						ctx->avc_state->sei.recovery_point.valid = 0;
 					}
@@ -2839,6 +3380,10 @@
 
 				if ((slice_poc < 0) && !ctx->last_poc)
 					ctx->poc_diff = 0;
+				else if ((slice_poc < 0) && (-slice_poc < ctx->poc_diff)) {
+					pdiff = -slice_poc;
+					ctx->poc_diff = 0;
+				}
 
 				if (!ctx->poc_diff || (ctx->poc_diff > (s32) pdiff ) ) {
 					ctx->poc_diff = pdiff;
@@ -2849,21 +3394,39 @@
 				}
 				ctx->last_poc = slice_poc;
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[%s] POC is %d - min poc diff %d - slice is ref %d\n", ctx->log_name, slice_poc, ctx->poc_diff, slice_is_ref));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] POC is %d - min poc diff %d - slice is IDR %d (SAP %d)\n", ctx->log_name, slice_poc, ctx->poc_diff, slice_is_idr, au_sap_type));
 
 			/*ref slice, reset poc*/
-			if (slice_is_ref) {
+			if (slice_is_idr) {
 				if (first_in_au) {
-					//two consecutive IDRs, force poc_diff to 0 to force frame dispatch
-					if (ctx->last_frame_is_idr) ctx->poc_diff=1;
+					Bool temp_poc_diff = GF_FALSE;
+					//two consecutive IDRs, force poc_diff to 1 if 0 (when we have intra-only) to force frame dispatch
+					if (ctx->last_frame_is_idr && !ctx->poc_diff) {
+						temp_poc_diff = GF_TRUE;
+						ctx->poc_diff = 1;
+					}
 					//new ref frame, dispatch all pending packets
 					naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
 
-					ctx->max_last_poc = ctx->last_poc = ctx->max_last_b_poc = 0;
-					ctx->poc_shift = 0;
-					//force probing of POC diff, this will prevent dispatching frames with wrong CTS until we have a clue of min poc_diff used
-					ctx->poc_probe_done = 0;
+					//if IDR with DLP (sap2), only reset poc probing if the poc is below current max poc
+					//otherwise assume no diff in poc
+					if ((au_sap_type == GF_FILTER_SAP_2) && (ctx->max_last_poc >= ctx->last_poc) ){
+						ctx->au_sap2_poc_reset = GF_TRUE;
+					}
+
+					if ((au_sap_type == GF_FILTER_SAP_1) || ctx->au_sap2_poc_reset) {
+						if (!ctx->au_sap2_poc_reset)
+							ctx->last_poc = 0;
+
+						ctx->max_last_poc = ctx->last_poc;
+						ctx->max_last_b_poc = ctx->last_poc;
+						ctx->poc_shift = 0;
+						//force probing of POC diff, this will prevent dispatching frames with wrong CTS until we have a clue of min poc_diff used
+						ctx->poc_probe_done = 0;
+					}
 					ctx->last_frame_is_idr = GF_TRUE;
+					if (temp_poc_diff)
+						ctx->poc_diff = 0;
 				}
 			}
 			/*forced ref slice*/
@@ -2906,36 +3469,17 @@
 				if (nal_ref_idc) {
 					ctx->has_ref_slices = GF_TRUE;
 				}
-				if (!ctx->is_hevc && (ctx->avc_state->s_info.redundant_pic_cnt) ) {
+				if ((ctx->codecid==GF_CODECID_AVC) && (ctx->avc_state->s_info.redundant_pic_cnt) ) {
 					ctx->has_redundant = GF_TRUE;
 				}
 			}
 		}
 
-		//we skipped bytes already in store + end of start code present in packet, so the size of the first object
-		//needs adjustement
-		if (nal_hdr_in_store && !next_size && !full_nal_required) {
-			size += nal_bytes_from_store;
-		}
-
-		if (! full_nal) {
-			u8 b3 = start[remain-3];
-			u8 b2 = start[remain-2];
-			u8 b1 = start[remain-1];
-
-			//we may have a startcode at the end of the packet, store it and don't dispatch the last 3 bytes !
-			if (!b1 || !b2 || !b3) {
-				copy_last_bytes = GF_TRUE;
-				assert(size >= 3);
-				size -= 3;
-				ctx->bytes_in_header = 3;
-			}
-		}
 
 		au_start = ctx->first_pck_in_au ? GF_FALSE : GF_TRUE;
 
 		if (ctx->has_initial_aud) {
-			u32 audelim_size = ctx->is_hevc ? 3 : 2;
+			u32 audelim_size = (ctx->codecid!=GF_CODECID_AVC) ? 3 : 2;
 			/*dst_pck = */naludmx_start_nalu(ctx, audelim_size, GF_FALSE, &au_start, &pck_data);
 			memcpy(pck_data + ctx->nal_length , ctx->init_aud, audelim_size);
 			ctx->has_initial_aud = GF_FALSE;
@@ -2963,81 +3507,70 @@
 		}
 
 		//nalu size field
-		/*dst_pck = */naludmx_start_nalu(ctx, (u32) size, GF_FALSE, &au_start, &pck_data);
+		/*dst_pck = */naludmx_start_nalu(ctx, (u32) nal_size, GF_FALSE, &au_start, &pck_data);
 		pck_data += ctx->nal_length;
 
 		//add subsample info before touching the size
 		if (ctx->subsamples) {
-			naludmx_add_subsample(ctx, (u32) size, avc_svc_subs_priority, avc_svc_subs_reserved);
+			naludmx_add_subsample(ctx, (u32) nal_size, avc_svc_subs_priority, avc_svc_subs_reserved);
 		}
 
-		//bytes come from both our store and the data packet
-		if (nal_hdr_in_store) {
-			memcpy(pck_data, hdr_start, nal_bytes_from_store);
-			assert(size >= nal_bytes_from_store);
-			size -= nal_bytes_from_store;
-			if (size)
-				memcpy(pck_data + nal_bytes_from_store, pck_start, (size_t) size);
-
-			if (next_size) {
-				assert(!size);
-				memmove(ctx->hdr_store, hdr_start+nal_bytes_from_store,ctx->bytes_in_header - nal_bytes_from_store);
-				ctx->bytes_in_header -= next_size+store_sc_size;
-				continue;
-			}
-			//we're done consuming data from previous packet, switch timing
-			naldmx_switch_timestamps(ctx, pck);
-		} else {
-			//bytes only come from the data packet
-			memcpy(pck_data, pck_start, (size_t) size);
-		}
-
-		if (! full_nal) {
-			if (copy_last_bytes) {
-				memcpy(ctx->hdr_store, start+remain-3, 3);
-			}
-			break;
-		}
 
-		assert(remain >= size);
-		start = pck_start + size;
- assert((u32) (start - (u8*)data) <= pck_size);
-		remain = pck_size - (u32) (start - (u8*)data);
+		//bytes only come from the data packet
+		memcpy(pck_data, nal_data, (size_t) nal_size);
 
+		nal_size += sc_size;
+		start += nal_size;
+		remain -= nal_size;
+		naldmx_check_timestamp_switch(ctx, &nalu_store_before, nal_size, &drop_packet, pck);
 
 		//don't demux too much of input, abort when we would block. This avoid dispatching
 		//a huge number of frames in a single call
 		if (remain && gf_filter_pid_would_block(ctx->opid)) {
-			ctx->resume_from = (u32) ((char *)start - (char *)data);
-			if (data == ctx->hdr_store) {
-				assert(ctx->resume_from > hdr_size_at_resume);
-				ctx->resume_from -= hdr_size_at_resume;
- } else {
- assert(ctx->resume_from<=pck_size);
- }
+			ctx->resume_from = (u32) (start - ctx->nal_store);
+			assert(ctx->resume_from <= ctx->nal_store_size);
+			assert(ctx->resume_from == ctx->nal_store_size - remain);
+			if (drop_packet)
+				gf_filter_pid_drop_packet(ctx->ipid);
 			return GF_OK;
 		}
 	}
+
+	if (remain) {
+		if (is_eos && (remain == ctx->nal_store_size)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] Incomplete last NAL and eos, discarding\n", ctx->log_name));
+			remain = 0;
+		} else {
+			assert((u32) remain<=ctx->nal_store_size);
+			memmove(ctx->nal_store, start, remain);
+		}
+	}
+	ctx->nal_store_size = remain;
+
+	if (drop_packet)
+		gf_filter_pid_drop_packet(ctx->ipid);
+
 	if (is_eos)
 		return naludmx_process(filter);
 
 	if ((ctx->nb_nalus>nalu_before) && gf_filter_reporting_enabled(filter)) {
 		char szStatus[1024];
 
-		sprintf(szStatus, "%s %dx%d % 10d NALU % 8d I % 8d P % 8d B % 8d SEI", ctx->is_hevc ? "HEVC":"AVC|H264", ctx->width, ctx->height, ctx->nb_nalus, ctx->nb_i, ctx->nb_p, ctx->nb_b, ctx->nb_sei);
+		sprintf(szStatus, "%s %dx%d % 10d NALU % 8d I % 8d P % 8d B % 8d SEI", ctx->log_name, ctx->width, ctx->height, ctx->nb_nalus, ctx->nb_i, ctx->nb_p, ctx->nb_b, ctx->nb_sei);
 		gf_filter_update_status(filter, -1, szStatus);
 	}
+	if (ctx->full_au_source && ctx->poc_probe_done) {
+		if (ctx->first_pck_in_au)
+			naludmx_finalize_au_flags(ctx);
 
-	gf_filter_pid_drop_packet(ctx->ipid);
+		naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
+	}
 	return GF_OK;
 }
 
 static GF_Err naludmx_initialize(GF_Filter *filter)
 {
 	GF_NALUDmxCtx *ctx = gf_filter_get_udta(filter);
-	ctx->hdr_store_size = 0;
-	ctx->hdr_store_alloc = SAFETY_NAL_STORE;
-	ctx->hdr_store = gf_malloc(sizeof(char)*SAFETY_NAL_STORE);
 	ctx->sps = gf_list_new();
 	ctx->pps = gf_list_new();
 	switch (ctx->nal_length) {
@@ -3056,7 +3589,7 @@
 		ctx->nal_adjusted = GF_TRUE;
 		break;
 	default:
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[%s] NAL size length %d is not allowed, defaulting to 4 bytes\n", ctx->log_name));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] NAL size length %d is not allowed, defaulting to 4 bytes\n", ctx->log_name));
 		ctx->max_nalu_size_allowed = 0xFFFFFFFF;
 		ctx->nal_length = 4;
 		break;
@@ -3064,15 +3597,17 @@
 	return GF_OK;
 }
 
-static void naludmx_del_param_list(GF_List *ps)
+static void naludmx_del_param_list(GF_List *ps, Bool do_free)
 {
 	if (!ps) return;
 	while (gf_list_count(ps)) {
-		GF_AVCConfigSlot *sl = gf_list_pop_back(ps);
+		GF_NALUFFParam *sl = gf_list_pop_back(ps);
 		if (sl->data) gf_free(sl->data);
 		gf_free(sl);
 	}
-	gf_list_del(ps);
+
+	if (do_free)
+		gf_list_del(ps);
 }
 
 static void naludmx_log_stats(GF_NALUDmxCtx *ctx)
@@ -3083,47 +3618,61 @@
 	if (ctx->cur_fps.den)
 		nb_frames = (u32) (ctx->dts / ctx->cur_fps.den);
 
-	if (ctx->idur.den && ctx->idur.num) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s duration specified at import time, may have parsed more frames than imported\n", ctx->log_name));
+	if (ctx->dur.den && ctx->dur.num) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s duration specified at import time, may have parsed more frames than imported\n", ctx->log_name));
 		msg_import = "parsed";
 	} else {
 		msg_import = "Import results:";
 	}
 
 	if (ctx->nb_si || ctx->nb_sp) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s %s %d frames (%d NALUs) - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR\n", ctx->log_name, msg_import, nb_frames, ctx->nb_nalus, ctx->nb_i, ctx->nb_p, ctx->nb_b, ctx->nb_sp, ctx->nb_si, ctx->nb_sei, ctx->nb_idr ));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s %d frames (%d NALUs) - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR\n", ctx->log_name, msg_import, nb_frames, ctx->nb_nalus, ctx->nb_i, ctx->nb_p, ctx->nb_b, ctx->nb_sp, ctx->nb_si, ctx->nb_sei, ctx->nb_idr ));
+	} else if (ctx->vvc_no_stats) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s %d samples (%d NALUs) - %d SEI - %d IDR - %d CRA\n",
+			 ctx->log_name, msg_import, nb_frames, ctx->nb_nalus, ctx->nb_sei, ctx->nb_idr, ctx->nb_cra));
 	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s %s %d samples (%d NALUs) - Slices: %d I %d P %d B - %d SEI - %d IDR\n",
-			 ctx->log_name, msg_import, nb_frames, ctx->nb_nalus, ctx->nb_i, ctx->nb_p, ctx->nb_b, ctx->nb_sei, ctx->nb_idr));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s %s %d samples (%d NALUs) - Slices: %d I %d P %d B - %d SEI - %d IDR - %d CRA\n",
+			 ctx->log_name, msg_import, nb_frames, ctx->nb_nalus, ctx->nb_i, ctx->nb_p, ctx->nb_b, ctx->nb_sei, ctx->nb_idr, ctx->nb_cra));
 	}
 
-	if (!ctx->is_hevc) {
+	if (ctx->codecid==GF_CODECID_AVC) {
 		count = gf_list_count(ctx->sps);
 		for (i=0; i<count; i++) {
 			AVC_SPS *sps;
-			GF_AVCConfigSlot *svcc = (GF_AVCConfigSlot*)gf_list_get(ctx->sps, i);
+			GF_NALUFFParam *svcc = (GF_NALUFFParam*)gf_list_get(ctx->sps, i);
 			sps = & ctx->avc_state->sps[svcc->id];
 			if (sps->nb_ei || sps->nb_ep) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s SVC (SSPS ID %d, %dx%d) %s Slices: %d I %d P %d B\n", ctx->log_name, svcc->id - GF_SVC_SSPS_ID_SHIFT, sps->width, sps->height, msg_import, sps->nb_ei, sps->nb_ep, sps->nb_eb ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s SVC (SSPS ID %d, %dx%d) %s Slices: %d I %d P %d B\n", ctx->log_name, svcc->id - GF_SVC_SSPS_ID_SHIFT, sps->width, sps->height, msg_import, sps->nb_ei, sps->nb_ep, sps->nb_eb ));
 			}
 		}
 	} else if (ctx->nb_e_i || ctx->nb_e_p || ctx->nb_e_b) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s L-HEVC %s Slices: %d I %d P %d B\n", ctx->log_name, msg_import, ctx->nb_e_i, ctx->nb_e_p, ctx->nb_e_b ));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s L-HEVC %s Slices: %d I %d P %d B\n", ctx->log_name, msg_import, ctx->nb_e_i, ctx->nb_e_p, ctx->nb_e_b ));
 	}
 
 	if (ctx->max_total_delay>1) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s Stream uses forward prediction - stream CTS offset: %d frames\n", ctx->log_name, ctx->max_total_delay));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s Stream uses forward prediction - stream CTS offset: %d frames\n", ctx->log_name, ctx->max_total_delay));
 	}
 
 	if (!ctx->nal_adjusted) {
 		if ((ctx->max_nalu_size < 0xFF) && (ctx->nal_length>1) ){
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s Max NALU size is %d - stream could be optimized by setting nal_length=1\n", ctx->log_name, ctx->max_nalu_size));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s Max NALU size is %d - stream could be optimized by setting nal_length=1\n", ctx->log_name, ctx->max_nalu_size));
 		} else if ((ctx->max_nalu_size < 0xFFFF) && (ctx->nal_length>2) ){
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s Max NALU size is %d - stream could be optimized by setting nal_length=2\n", ctx->log_name, ctx->max_nalu_size));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%s Max NALU size is %d - stream could be optimized by setting nal_length=2\n", ctx->log_name, ctx->max_nalu_size));
 		}
 	}
 }
 
+static void naludmx_reset_param_sets(GF_NALUDmxCtx *ctx, Bool do_free)
+{
+	naludmx_del_param_list(ctx->sps, do_free);
+	naludmx_del_param_list(ctx->pps, do_free);
+	naludmx_del_param_list(ctx->vps, do_free);
+	naludmx_del_param_list(ctx->sps_ext, do_free);
+	naludmx_del_param_list(ctx->pps_svc, do_free);
+	naludmx_del_param_list(ctx->vvc_aps_pre, do_free);
+	naludmx_del_param_list(ctx->vvc_dci, do_free);
+
+}
 static void naludmx_finalize(GF_Filter *filter)
 {
 	GF_NALUDmxCtx *ctx = gf_filter_get_udta(filter);
@@ -3133,7 +3682,7 @@
 	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
 	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
 	if (ctx->indexes) gf_free(ctx->indexes);
-	if (ctx->hdr_store) gf_free(ctx->hdr_store);
+	if (ctx->nal_store) gf_free(ctx->nal_store);
 	if (ctx->pck_queue) {
 		while (gf_list_count(ctx->pck_queue)) {
 			GF_FilterPacket *pck = gf_list_pop_back(ctx->pck_queue);
@@ -3145,14 +3694,14 @@
 	if (ctx->svc_prefix_buffer) gf_free(ctx->svc_prefix_buffer);
 	if (ctx->subsamp_buffer) gf_free(ctx->subsamp_buffer);
 
-	naludmx_del_param_list(ctx->sps);
-	naludmx_del_param_list(ctx->pps);
-	naludmx_del_param_list(ctx->vps);
-	naludmx_del_param_list(ctx->sps_ext);
-	naludmx_del_param_list(ctx->pps_svc);
+	if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+	ctx->src_pck = NULL;
+
+	naludmx_reset_param_sets(ctx, GF_TRUE);
 
 	if (ctx->avc_state) gf_free(ctx->avc_state);
 	if (ctx->hevc_state) gf_free(ctx->hevc_state);
+	if (ctx->vvc_state) gf_free(ctx->vvc_state);
 }
 
 
@@ -3161,17 +3710,21 @@
 	u32 sc, sc_size;
 	u32 not_hevc=0;
 	u32 not_avc=0;
+	u32 not_vvc=0;
 	u32 nb_hevc=0;
 	u32 nb_avc=0;
+	u32 nb_vvc=0;
 	u32 nb_nalus=0;
 	u32 nb_hevc_zero=0;
 	u32 nb_avc_zero=0;
+	u32 nb_vvc_zero=0;
 	u32 nb_sps_hevc=0,nb_pps_hevc=0,nb_vps_hevc=0;
 	u32 nb_sps_avc=0,nb_pps_avc=0;
+	u32 nb_sps_vvc=0,nb_pps_vvc=0,nb_vps_vvc=0;
 
-	while (size) {
-		u32 avc_type=0;
-		u32 hevc_type=0;
+	while (size>3) {
+		u32 nal_type=0;
+		sc_size = 0;
 		sc = gf_media_nalu_next_start_code(data, size, &sc_size);
 		if (!sc_size) break;
 
@@ -3179,14 +3732,21 @@
 		if (size <= sc + sc_size) break;
 		size -= sc + sc_size;
 
+		if (data[0] & 0x80) {
+			not_avc++;
+			not_hevc++;
+			not_vvc++;
+			continue;
+		}
 		nb_nalus++;
 
-		hevc_type = (data[0] & 0x7E) >> 1;
-		if (hevc_type<=40) {
+		nal_type = (data[0] & 0x7E) >> 1;
+		if (nal_type<=40) {
 			nb_hevc++;
-			switch (hevc_type) {
+			switch (nal_type) {
 			case GF_HEVC_NALU_PIC_PARAM:
-				nb_pps_hevc++;
+				if (nb_sps_hevc)
+					nb_pps_hevc++;
 				break;
 			case GF_HEVC_NALU_SEQ_PARAM:
 				nb_sps_hevc++;
@@ -3202,12 +3762,13 @@
 			not_hevc++;
 		}
 
-		avc_type = data[0] & 0x1F;
-		if (avc_type && avc_type<=24) {
+		nal_type = data[0] & 0x1F;
+		if (nal_type && nal_type<=24) {
 			nb_avc++;
-			switch (avc_type) {
+			switch (nal_type) {
 			case GF_AVC_NALU_PIC_PARAM:
-				nb_pps_avc++;
+				if (nb_sps_avc)
+					nb_pps_avc++;
 				break;
 			case GF_AVC_NALU_SEQ_PARAM:
 				nb_sps_avc++;
@@ -3219,53 +3780,102 @@
 		} else {
 			not_avc++;
 		}
+
+		//check vvc - 2nd bit reserved to 0
+		if (data[0] & 0x40) {
+			not_vvc++;
+			continue;
+		}
+		nal_type = data[1] >> 3;
+		if (nal_type>31) {
+			not_vvc++;
+			continue;
+		}
+		nb_vvc++;
+		switch (nal_type) {
+		case GF_VVC_NALU_PIC_PARAM:
+			if (nb_sps_vvc)
+				nb_pps_vvc++;
+			break;
+		case GF_VVC_NALU_SEQ_PARAM:
+			nb_sps_vvc++;
+			break;
+		case GF_VVC_NALU_VID_PARAM:
+			nb_vps_vvc++;
+			break;
+		case GF_VVC_NALU_ACCESS_UNIT:
+			//to detect files without VPS correctly
+			nb_vps_vvc++;
+			break;
+		case 0:
+			nb_vvc_zero++;
+			break;
+		}
 	}
+
 	if (!nb_sps_avc || !nb_pps_avc) nb_avc=0;
 	if (!nb_sps_hevc || !nb_pps_hevc || !nb_vps_hevc) nb_hevc=0;
+	if (!nb_sps_vvc || !nb_pps_vvc || !nb_vps_vvc) nb_vvc=0;
 	if (not_avc) nb_avc=0;
 	if (not_hevc) nb_hevc=0;
+	if (not_vvc) nb_vvc=0;
 
-	if (not_avc && not_hevc) return NULL;
+	if (not_avc && not_hevc && not_vvc) return NULL;
 	if (nb_avc==nb_avc_zero) nb_avc=0;
 	if (nb_hevc==nb_hevc_zero) nb_hevc=0;
+	if (nb_vvc==nb_vvc_zero) nb_vvc=0;
 
-	if (!nb_hevc && !nb_avc) return NULL;
+	if (!nb_hevc && !nb_avc && !nb_vvc) return NULL;
 	*score = GF_FPROBE_SUPPORTED;
-	if (!nb_hevc) return "video/avc";
-	if (!nb_avc) return "video/hevc";
-	if (nb_hevc>nb_avc) return "video/hevc";
+	if (!nb_hevc) return (nb_vvc>nb_avc) ? "video/vvc" : "video/avc";
+	if (!nb_avc) return (nb_vvc>nb_hevc) ? "video/vvc" : "video/hevc";
+	if (!nb_vvc) return (nb_avc>nb_hevc) ? "video/avc" : "video/hevc";
+
+	if ((nb_hevc>nb_avc) && (nb_hevc>nb_vvc)) return "video/hevc";
+	if ((nb_vvc>nb_avc) && (nb_vvc>nb_hevc)) return "video/vvc";
 	return "video/avc";
 }
 
 static const GF_FilterCapability NALUDmxCaps[] =
 {
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
-	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "264|h264|26L|h26L|h26l|avc|svc|mvc|hevc|hvc|265|h265|shvc|lvhc|mhvc"),
-	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/avc|video/h264|video/svc|video/mvc|video/hevc|video/lhvc|video/shvc|video/mhvc"),
-	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "264|h264|26L|h26L|h26l|avc|svc|mvc|hevc|hvc|265|h265|shvc|lvhc|mhvc|266|vvc|lvvc"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/avc|video/h264|video/svc|video/mvc|video/hevc|video/lhvc|video/shvc|video/mhvc|video/vvc"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AVC),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AVC_PS),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_SVC),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_MVC),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
 	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_LHVC),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_VVC),
 	CAP_BOOL(GF_CAPS_OUTPUT_STATIC_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT_STATIC_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
 	{0},
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AVC),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AVC_PS),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SVC),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MVC),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_LHVC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VVC),
 	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
+	{0},
+	//for HLS-SAES
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_4CC(GF_CAPS_INPUT,GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_HLS_SAMPLE_AES_SCHEME),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AVC),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
 };
 
 #define OFFS(_n)	#_n, offsetof(GF_NALUDmxCtx, _n)
 static const GF_FilterArgs NALUDmxArgs[] =
 {
 	{ OFFS(fps), "import frame rate (0 default to FPS from bitstream or 25 Hz)", GF_PROP_FRACTION, "0/1000", NULL, 0},
-	{ OFFS(index), "indexing window length. If 0, bitstream is not probed for duration. A negative value skips the indexing if the source file is larger than 100M (slows down importers) unless a play with start range > 0 is issued, otherwise uses the positive value", GF_PROP_DOUBLE, "-1.0", NULL, 0},
+	{ OFFS(index), "indexing window length. If 0, bitstream is not probed for duration. A negative value skips the indexing if the source file is larger than 100M (slows down importers) unless a play with start range > 0 is issued", GF_PROP_DOUBLE, "-1.0", NULL, 0},
 	{ OFFS(explicit), "use explicit layered (SVC/LHVC) import", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(strict_poc), "delay frame output of an entire GOP to ensure CTS info is correct when POC suddenly changes\n"
 		"- off: disable GOP buffering\n"
@@ -3275,13 +3885,35 @@
 	{ OFFS(nosvc), "remove all SVC/MVC/LHVC data", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(novpsext), "remove all VPS extensions", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(importer), "compatibility with old importer, displays import results", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(idur), "compatibility with old importer to log imported frames only", GF_PROP_FRACTION, "0", NULL, GF_FS_ARG_HINT_HIDE},
+	{ OFFS(dur), "compatibility with old importer to log imported frames only", GF_PROP_FRACTION, "0", NULL, GF_FS_ARG_HINT_HIDE},
 	{ OFFS(nal_length), "set number of bytes used to code length field: 1, 2 or 4", GF_PROP_UINT, "4", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(subsamples), "import subsamples information", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(deps), "import samples dependencies information", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(deps), "import sample dependency information", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(seirw), "rewrite AVC sei messages for ISOBMFF constraints", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(audelim), "keep Access Unit delimiter in payload", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(analyze), "skip reformat of decoder config and SEI and dispatch all NAL in input order - shall only be used with inspect filter analyze mode!", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_HIDE},
+	{ OFFS(analyze), "skip reformat of decoder config and SEI and dispatch all NAL in input order - shall only be used with inspect filter analyze mode!", GF_PROP_UINT, "off", "off|on|bs|full", GF_FS_ARG_HINT_HIDE},
+	{ OFFS(notime), "ignore input timestamps, rebuild from 0", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+
+	{ OFFS(dv_mode), "signaling for DolbyVision\n"
+	"- none: never signal DV profile\n"
+	"- auto: signal DV profile if RPU or EL are found\n"
+	"- force: always signal DV profile\n"
+	"- clean: do not signal and remove RPU and EL NAL units\n"
+	"- single: remove EL NAL units"
+	, GF_PROP_UINT, "auto", "none|auto|force|clean|single", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(dv_profile), "profile for DolbyVision (currently defined profiles are 4, 5, 7, 8, 9)", GF_PROP_UINT, "5", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(dv_compatid), "cross-compatibility ID for DolbyVision\n"
+		"- none: do not signal compatibility\n"
+		"- hdr10: CTA HDR10, as specified by EBU TR 03\n"
+		"- bt709: SDR BT.709\n"
+		"- hlg709: HLG BT.709 gamut in ITU-R BT.2020\n"
+		"- hlg2100: HLG BT.2100 gamut in ITU-R BT.2020\n"
+		"- bt2020: SDR BT.2020\n"
+		"- brd: Ultra HD Blu-ray Disc HDR", GF_PROP_UINT, "none", "none|hdr10|bt709|hlg709|hlg2100|bt2020|brd", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(bsdbg), "debug NAL parsing in `parser@debug` logs\n"
+		"- off: not enabled\n"
+		"- on: enabled\n"
+		"- full: enable with number of bits dumped", GF_PROP_UINT, "off", "off|on|full", GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -3290,7 +3922,8 @@
 	.name = "rfnalu",
 	GF_FS_SET_DESCRIPTION("AVC/HEVC reframer")
 	GF_FS_SET_HELP("This filter parses AVC|H264 and HEVC files/data and outputs corresponding video PID and frames.\n"
-	"This demuxer only produces ISOBMFF-compatible output: start codes are removed, NALU length field added and avcC/hvcC config created.\nNote: The demux uses negative CTS offsets: CTS is corrrect, but some frames may have DTS greater than CTS.")
+	"This filter produces ISOBMFF-compatible output: start codes are removed, NALU length field added and avcC/hvcC config created.\n"
+	"Note: The filter uses negative CTS offsets: CTS is correct, but some frames may have DTS greater than CTS.")
 	.private_size = sizeof(GF_NALUDmxCtx),
 	.args = NALUDmxArgs,
 	.initialize = naludmx_initialize,

gpac-1.0.1.tar.gz/src/filters/reframe_prores.c -> gpac-2.0.0.tar.gz/src/filters/reframe_prores.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ProRes reframer filter
@@ -34,7 +34,7 @@
 {
 	//filter args
 	GF_Fraction fps;
-	Bool findex;
+	Bool findex, notime;
 	char *cid;
 
 	//only one input pid declared
@@ -67,6 +67,9 @@
 	/*frame index 0/NULL if findex is not set*/
 	u32 nb_frames;
 	u32 *frame_sizes;
+
+	u32 bitrate;
+	Bool copy_props;
 } GF_ProResDmxCtx;
 
 
@@ -77,7 +80,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -92,7 +98,12 @@
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 	}
-	if (ctx->timescale) {
+
+	//if source has no timescale, recompute time
+	if (!ctx->timescale) {
+		ctx->notime = GF_TRUE;
+	} else {
+		ctx->copy_props = GF_TRUE;
 		//if we have a FPS prop, use it
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
 		if (p) ctx->cur_fps = p->value.frac;
@@ -105,7 +116,7 @@
 {
 	FILE *stream;
 	GF_BitStream *bs;
-	u64 duration;
+	u64 duration, rate;
 	u32 idx_size;
 	const char *filepath=NULL;
 	const GF_PropertyValue *p;
@@ -124,18 +135,26 @@
 	ctx->is_file = GF_TRUE;
 
 	if (ctx->findex==1) {
-		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
-		if (!p || (p->value.longuint > 100000000)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[ProResDmx] Source file larger than 100M, skipping indexing\n"));
-		} else {
+		if (gf_opts_get_bool("temp", "force_indexing")) {
 			ctx->findex = 2;
+		} else {
+			p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
+			if (!p || (p->value.longuint > 100000000)) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ProResDmx] Source file larger than 100M, skipping indexing\n"));
+			} else {
+				ctx->findex = 2;
+			}
 		}
 	}
 	if (!ctx->findex)
 		return;
 
-	stream = gf_fopen(filepath, "rb");
-	if (!stream) return;
+	stream = gf_fopen_ex(filepath, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
 	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
 
@@ -160,6 +179,7 @@
 		ctx->frame_sizes[ctx->nb_frames] = fsize;
 		ctx->nb_frames++;
 	}
+	rate = gf_bs_get_position(bs);
 	gf_bs_del(bs);
 	gf_fclose(stream);
 
@@ -168,8 +188,13 @@
 		ctx->duration.den = ctx->cur_fps.num;
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+		if (duration && (!gf_sys_is_test_mode() || gf_opts_get_bool("temp", "force_indexing"))) {
+			rate *= 8 * ctx->duration.den;
+			rate /= ctx->duration.num;
+			ctx->bitrate = (u32) rate;
+		}
 	}
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE) );
 }
 
 
@@ -199,7 +224,7 @@
 				ctx->findex = 2;
 				ctx->file_loaded = GF_FALSE;
 				ctx->duration.den = ctx->duration.num = 0;
-				GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[ProResDmx] Play request from %d, building index\n", ctx->start_range));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ProResDmx] Play request from %d, building index\n", ctx->start_range));
 				proresdmx_check_dur(filter, ctx);
 			}
 			if ((evt->play.speed<0) && (ctx->start_range<0)) {
@@ -295,7 +320,7 @@
 
 #undef CHECK_CFG
 
-	if (same_cfg) return;
+	if (same_cfg && !ctx->copy_props) return;
 	fps.num = fps.den = 0;
 	switch (finfo->framerate_code) {
 	case 1: fps.num = 24000; fps.den = 1001; break;
@@ -327,11 +352,10 @@
 	}
 
 	bitrate = 0;
-	if (ctx->nb_frames && ctx->file_size) {
-		u64 dur = ctx->nb_frames * ctx->cur_fps.den / ctx->cur_fps.num;
+	if (ctx->nb_frames && ctx->file_size && ctx->cur_fps.den) {
 		bitrate = ctx->file_size * 8;
-		bitrate /= dur;
-		bitrate /= 1000000;
+		bitrate *= ctx->cur_fps.num;
+		bitrate /= ctx->nb_frames * ctx->cur_fps.den;
 	}
 	memcpy(&ctx->cur_cfg, finfo, sizeof(GF_ProResFrameInfo));
 	if (ctx->cid && (strlen(ctx->cid)>4)) {
@@ -342,6 +366,7 @@
 		codec_id = GF_CODECID_APCH;
 	}
 
+	ctx->copy_props = GF_FALSE;
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(GF_STREAM_VISUAL));
@@ -381,6 +406,12 @@
 
 	if (ctx->duration.num)
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+
+	if (ctx->bitrate) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->bitrate));
+	}
 
 	/*prores is all intra, we support rewind*/
 	if (ctx->is_file && ctx->findex) {
@@ -549,7 +580,7 @@
 			if (e) return e;
 		}
 
-		//begining of a new frame
+		//beginning of a new frame
 		cts = gf_filter_pck_get_cts(pck);
 		if (cts != GF_FILTER_NO_TS)
 			ctx->cts = cts;
@@ -636,8 +667,8 @@
 {
 	{ OFFS(fps), "import frame rate (0 default to FPS from bitstream or 25 Hz)", GF_PROP_FRACTION, "0/1000", NULL, 0},
 	{ OFFS(findex), "index frames. If true, filter will be able to work in rewind mode", GF_PROP_BOOL, "true", NULL, 0},
-
-	{ OFFS(cid), "set QT 4CC for the imported media. If not set, defaults to 'ap4h' for YUV444 or 'apch' for YUV422", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(cid), "set QT 4CC for the imported media. If not set, default is 'ap4h' for YUV444 and 'apch' for YUV422", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(notime), "ignore input timestamps, rebuild from 0", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{0}
 };

gpac-1.0.1.tar.gz/src/filters/reframe_qcp.c -> gpac-2.0.0.tar.gz/src/filters/reframe_qcp.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / AMR&EVRC&SMV reframer filter
@@ -85,7 +85,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -122,8 +125,12 @@
 	}
 	ctx->is_file = GF_TRUE;
 
-	stream = gf_fopen(p->value.string, "rb");
-	if (!stream) return;
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
 
 	ctx->codecid = 0;
 	ctx->sample_rate = 8000;
@@ -133,7 +140,7 @@
 	if (!ctx->hdr_processed ) {
 		e = qcpdmx_process_header(filter, ctx, NULL, 0, bs);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[QCPDmx] Header parsed error %s\n", gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[QCPDmx] Header parsed error %s\n", gf_error_to_string(e) ));
 		}
 	} else {
 		gf_bs_skip_bytes(bs, 170);
@@ -205,6 +212,7 @@
 		ctx->duration.den = ctx->sample_rate;
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
 	}
 
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
@@ -295,7 +303,7 @@
 
 	gf_bs_read_data(bs, magic, 4);
 	if (strnicmp(magic, "RIFF", 4)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[QCPDmx] Broken file: RIFF header not found\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[QCPDmx] Broken file: RIFF header not found\n"));
 		if (!file_bs) gf_bs_del(bs);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
@@ -304,18 +312,18 @@
 	gf_bs_seek(bs, 8);
 	gf_bs_read_data(bs, magic, 4);
 	if (strnicmp(magic, "QLCM", 4)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[QCPDmx] Broken file: QLCM header not found\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[QCPDmx] Broken file: QLCM header not found\n"));
 		if (!file_bs) gf_bs_del(bs);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
 	if (p && p->value.longuint != riff_size+8) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[QCPDmx] Broken file: RIFF-Size %d got %d\n", p->value.uint - 8, riff_size));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[QCPDmx] Broken file: RIFF-Size %d got %d\n", p->value.uint - 8, riff_size));
 	}
 	/*fmt*/
 	gf_bs_read_data(bs, magic, 4);
 	if (strnicmp(magic, "fmt ", 4)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[QCPDmx] Broken file: FMT not found\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[QCPDmx] Broken file: FMT not found\n"));
 		if (!file_bs) gf_bs_del(bs);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
@@ -338,6 +346,10 @@
 	ctx->sample_rate = gf_bs_read_u16_le(bs);
 	/*bps = */gf_bs_read_u16_le(bs);
 	ctx->rate_table_count = gf_bs_read_u32_le(bs);
+	if (ctx->rate_table_count>8) {
+		if (!file_bs) gf_bs_del(bs);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
 	chunk_size -= 14;
 	/*skip var rate*/
 	for (i=0; i<8; i++) {
@@ -357,14 +369,14 @@
 	} else if (!strncmp(GUID, QCP_SMV_GUID, 16)) {
 		ctx->codecid = GF_CODECID_SMV;
 	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[QCPDmx] Unsupported codec GUID %s\n", GUID));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[QCPDmx] Unsupported codec GUID %s\n", GUID));
 		if (!file_bs) gf_bs_del(bs);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	/*vrat*/
 	gf_bs_read_data(bs, magic, 4);
 	if (strnicmp(magic, "vrat", 4)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[QCPDmx] Broken file: VRAT not found\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[QCPDmx] Broken file: VRAT not found\n"));
 		if (!file_bs) gf_bs_del(bs);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
@@ -443,6 +455,7 @@
 		}
 		if (! ctx->in_seek) {
 			GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->opid, to_send, &output);
+			if (!dst_pck) return GF_OUT_OF_MEM;
 			memcpy(output, data, to_send);
 
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);
@@ -615,6 +628,7 @@
 
 		if (!ctx->in_seek) {
 			GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &pck_data);
+			if (!dst_pck) return GF_OUT_OF_MEM;
 			memcpy(pck_data, start, size);
 
 			gf_filter_pck_set_framing(dst_pck, GF_TRUE, ctx->remaining ? GF_FALSE : GF_TRUE);

gpac-1.0.1.tar.gz/src/filters/reframe_rawpcm.c -> gpac-2.0.0.tar.gz/src/filters/reframe_rawpcm.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / RAW PCM reframer filter
@@ -56,7 +56,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -105,6 +108,10 @@
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
 	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
 
+	if (!gf_sys_is_test_mode() ) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(ctx->sr * ctx->Bps * ctx->ch));
+	}
+
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
 	if (p && p->value.longuint) {
 		u64 nb_frames = p->value.longuint;
@@ -170,6 +177,10 @@
 	case GF_FEVT_STOP:
 		//don't cancel event
 		ctx->is_playing = GF_FALSE;
+		if (ctx->out_pck) {
+			gf_filter_pck_discard(ctx->out_pck);
+			ctx->out_pck = NULL;
+		}
 		return GF_FALSE;
 
 	case GF_FEVT_SET_SPEED:
@@ -213,6 +224,8 @@
 	if (!pck) {
 		if (gf_filter_pid_is_eos(ctx->ipid) && !ctx->reverse_play) {
 			if (ctx->out_pck) {
+				gf_filter_pck_truncate(ctx->out_pck, ctx->nb_bytes_in_frame);
+				gf_filter_pck_set_duration(ctx->out_pck, ctx->nb_bytes_in_frame/ctx->Bps/ctx->ch);
 				pcmreframe_flush_packet(ctx);
 			}
 			if (ctx->opid)
@@ -280,6 +293,11 @@
 	return GF_OK;
 }
 
+static void pcmreframe_finalize(GF_Filter *filter)
+{
+	GF_PCMReframeCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->out_pck) gf_filter_pck_discard(ctx->out_pck);
+}
 
 static GF_FilterCapability PCMReframeCaps[] =
 {
@@ -288,7 +306,7 @@
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/x-pcm"),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
-	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 };
 
 #define OFFS(_n)	#_n, offsetof(GF_PCMReframeCtx, _n)
@@ -309,6 +327,7 @@
 	.private_size = sizeof(GF_PCMReframeCtx),
 	.args = PCMReframeArgs,
 	SETCAPS(PCMReframeCaps),
+	.finalize = pcmreframe_finalize,
 	.configure_pid = pcmreframe_configure_pid,
 	.process = pcmreframe_process,
 	.process_event = pcmreframe_process_event

gpac-1.0.1.tar.gz/src/filters/reframe_rawvid.c -> gpac-2.0.0.tar.gz/src/filters/reframe_rawvid.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2021
 *					All rights reserved
 *
 * This file is part of GPAC / RAW video (YUV,RGB) reframer filter
@@ -40,13 +40,15 @@
 	//only one output pid declared
 	GF_FilterPid *opid;
 
-	Bool file_loaded, is_playing, initial_play_done;
-	u64 cts;
+	Bool file_loaded, is_playing, initial_play_done, is_yuv4mpeg;
+	u64 cts, seek_ts;
 	u32 frame_size, nb_bytes_in_frame;
 	u64 filepos, total_frames;
 	GF_FilterPacket *out_pck;
 	u8 *out_data;
 	Bool reverse_play, done;
+	Bool is_v210;
+	u32 ilace;
 } GF_RawVidReframeCtx;
 
 
@@ -60,18 +62,44 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
 		return GF_NOT_SUPPORTED;
 
 	ctx->ipid = pid;
-	if (!ctx->spfmt) {
+	ctx->is_yuv4mpeg = GF_FALSE;
+	ctx->is_v210 = GF_FALSE;
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_MIME);
+	if (p && p->value.string && !strcmp(p->value.string, "video/x-yuv4mpeg")) {
+		if (!ctx->opid)
+			ctx->opid = gf_filter_pid_new(filter);
+
+		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+		gf_filter_pid_set_framing_mode(ctx->ipid, GF_FALSE);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+		//in yuv4mpeg we don't support rewind playback
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_SEEK));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, &PROP_BOOL(GF_TRUE));
+		ctx->is_yuv4mpeg = GF_TRUE;
+		return GF_OK;
+	}
+	else if (!ctx->spfmt) {
 		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_EXT);
-		if (p && p->value.string) ctx->spfmt = gf_pixel_fmt_parse(p->value.string);
+		if (p && p->value.string) {
+			if (!strcmp(p->value.string, "v210")) {
+				ctx->is_v210 = GF_TRUE;
+			} else {
+				ctx->spfmt = gf_pixel_fmt_parse(p->value.string);
+			}
+		}
 	}
-	if (!ctx->spfmt) {
+	if (!ctx->spfmt && !ctx->is_v210) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[RawVidReframe] Missing pixel format, cannot parse\n"));
 		return GF_BAD_PARAM;
 	}
@@ -81,9 +109,19 @@
 	}
 
 	stride = stride_uv = 0;
-	if (! gf_pixel_get_size_info(ctx->spfmt, ctx->size.x, ctx->size.y, &ctx->frame_size, &stride, &stride_uv, NULL, NULL)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[RawVidReframe] Failed to query pixel format size info\n"));
-		return GF_BAD_PARAM;
+	if (ctx->is_v210) {
+#define V210_HORIZ_ALIGN_PIXEL 48
+		if (ctx->size.x % V210_HORIZ_ALIGN_PIXEL)
+			stride = ((ctx->size.x / V210_HORIZ_ALIGN_PIXEL) + 1) * V210_HORIZ_ALIGN_PIXEL;
+		else
+			stride = ctx->size.x;
+		stride = stride * 16 / 6;
+		ctx->frame_size = stride * ctx->size.y;
+	} else {
+		if (! gf_pixel_get_size_info(ctx->spfmt, ctx->size.x, ctx->size.y, &ctx->frame_size, &stride, &stride_uv, NULL, NULL)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[RawVidReframe] Failed to query pixel format size info\n"));
+			return GF_BAD_PARAM;
+		}
 	}
 
 	if (!ctx->opid)
@@ -92,18 +130,33 @@
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 	gf_filter_pid_set_framing_mode(ctx->ipid, GF_FALSE);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL));
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+	if (ctx->is_v210) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_V210));
+	} else {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+	}
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->size.x));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->size.y));
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->spfmt));
+	if (ctx->spfmt)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->spfmt));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, &PROP_FRAC(ctx->fps));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->fps.num));
+
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(stride));
 	if (stride_uv)
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE_UV, &PROP_UINT(stride_uv));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_REWIND));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, &PROP_BOOL(GF_TRUE));
 
+	if (!gf_sys_is_test_mode() ) {
+		u32 osize = 0;
+		gf_pixel_get_size_info(ctx->spfmt, ctx->size.x, ctx->size.y, &osize, &stride, &stride_uv, NULL, NULL);
+		if (osize) {
+			u32 rate = osize * 8 * ctx->fps.num / ctx->fps.den;
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(rate));
+		}
+	}
+
 
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
 	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
@@ -118,7 +171,9 @@
 	}
 
 	if (!ctx->copy) {
-		gf_filter_pid_set_property_str(ctx->opid, "BufferLength", &PROP_UINT(0));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAY_BUFFER, &PROP_UINT(0));
+		if (!gf_sys_is_test_mode())
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_RE_BUFFER, &PROP_UINT(0));
 	}
 	return GF_OK;
 }
@@ -141,17 +196,30 @@
 		} else {
 			nb_frames = (u32) (ctx->cts / ctx->fps.den);
 		}
-		if (nb_frames>=ctx->total_frames)
+		if (ctx->total_frames && (nb_frames>=ctx->total_frames))
 			nb_frames = (u32) ctx->total_frames-1;
 
 		ctx->cts = nb_frames * ctx->fps.den;
-		ctx->filepos = nb_frames * ctx->frame_size;
-		ctx->reverse_play = (evt->play.speed<0) ? GF_TRUE : GF_FALSE;
+		if (ctx->is_yuv4mpeg) {
+			ctx->seek_ts = ctx->cts;
+			ctx->cts = 0;
+			ctx->filepos = 0;
+			ctx->reverse_play = GF_FALSE;
+		} else {
+			ctx->filepos = nb_frames * ctx->frame_size;
+			ctx->reverse_play = (evt->play.speed<0) ? GF_TRUE : GF_FALSE;
+		}
+		if (!ctx->initial_play_done) {
+			ctx->initial_play_done = GF_TRUE;
+			//seek will not change the current source state, don't send a seek
+			if (!ctx->filepos)
+				return GF_TRUE;
+		}
 
-		//post a seek even for the begining, to try to load frame by frame
+		//post a seek even for the beginning, to try to load frame by frame
 		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
 		fevt.seek.start_offset = ctx->filepos;
-		fevt.seek.hint_block_size = ctx->frame_size;
+		fevt.seek.hint_block_size = ctx->is_yuv4mpeg ? 0 : ctx->frame_size;
 		gf_filter_pid_send_event(ctx->ipid, &fevt);
 
 		//cancel event
@@ -160,6 +228,10 @@
 	case GF_FEVT_STOP:
 		//don't cancel event
 		ctx->is_playing = GF_FALSE;
+		if (ctx->out_pck) {
+			gf_filter_pck_discard(ctx->out_pck);
+			ctx->out_pck = NULL;
+		}
 		return GF_FALSE;
 
 	case GF_FEVT_SET_SPEED:
@@ -178,7 +250,7 @@
 	GF_FilterPacket *pck;
 	u64 byte_offset;
 	char *data;
-	u32 pck_size;
+	u32 pck_size, offset_in_pck;
 
 	if (ctx->done) return GF_EOS;
 
@@ -200,13 +272,101 @@
 
 	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
 	byte_offset = gf_filter_pck_get_byte_offset(pck);
+	offset_in_pck = 0;
 
 	while (pck_size) {
+
+		if (ctx->is_yuv4mpeg && (!ctx->frame_size || !ctx->nb_bytes_in_frame) ) {
+			Bool is_seq_header = GF_FALSE;
+			GF_Fraction old_fps = ctx->fps;
+			while (pck_size && (data[0] != '\n')) {
+				char sep_val;
+				char *sep = strchr(data, ' ');
+				char *sep2 = strchr(data, '\n');
+				if (!sep || (sep > sep2)) sep = sep2;
+				if (!sep) break;
+				sep_val = sep[0];
+				sep[0] = 0;
+				u32 len = (u32) strlen(data);
+				//we allow multiple stream headers
+				if (!strncmp(data, "YUV4MPEG2", len)) {
+					is_seq_header = GF_TRUE;
+				}
+				else if (!strncmp(data, "FRAME", len)) {
+				}
+				else if (data[0] == 'W') ctx->size.x = atoi(data+1);
+				else if (data[0] == 'H') ctx->size.y = atoi(data+1);
+				else if (data[0] == 'F') sscanf(data+1, "%d:%d", &ctx->fps.num, &ctx->fps.den);
+				else if (data[0] == 'A') {
+					GF_Fraction sar;
+					sscanf(data+1, "%d:%d", &sar.num, &sar.den);
+					gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(sar));
+				}
+				else if (data[0] == 'C') {
+					if (!strcmp(data+1, "420jpeg")) ctx->spfmt = GF_PIXEL_YUV;
+					else if (!strcmp(data+1, "420mpeg2")) ctx->spfmt = GF_PIXEL_YUV;
+					else if (!strcmp(data+1, "420paldv")) ctx->spfmt = GF_PIXEL_YUV;
+					else if (!strcmp(data+1, "420")) ctx->spfmt = GF_PIXEL_YUV;
+					else if (!strcmp(data+1, "422")) ctx->spfmt = GF_PIXEL_YUV422;
+					else if (!strcmp(data+1, "444")) ctx->spfmt = GF_PIXEL_YUV444;
+					else if (!strcmp(data+1, "444alpha")) ctx->spfmt = GF_PIXEL_YUVA444;
+					else if (!strcmp(data+1, "mono")) ctx->spfmt = GF_PIXEL_GREYSCALE;
+					else {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[RawVidReframe] Unsupported pixel format %s\n", data+1));
+						sep[0] = sep_val;
+						return GF_NOT_SUPPORTED;
+					}
+				}
+				else if (data[0] == 'I') {
+					if (!strcmp(data+1, "t")) ctx->ilace = 1;
+					else if (!strcmp(data+1, "b")) ctx->ilace = 2;
+					else if (!strcmp(data+1, "?") || !strcmp(data+1, "p")) ctx->ilace = 0;
+					else {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[RawVidReframe] Unsupported interlace mode %s\n", data+1));
+						sep[0] = sep_val;
+						return GF_NOT_SUPPORTED;
+					}
+				}
+				else if (data[0] == 'X') {
+					gf_filter_pid_set_property_str(ctx->opid, "yuv4meg_meta", &PROP_STRING(data+1));
+				}
+				sep[0] = sep_val;
+				data += len;
+				pck_size -= len;
+				byte_offset += len;
+				if (data[0] == ' ') {
+					data++;
+					pck_size--;
+					byte_offset ++;
+				}
+			}
+			byte_offset ++;
+			data++;
+			pck_size--;
+			if (is_seq_header) {
+				//send configure
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->size.x));
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->size.y));
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->spfmt));
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, &PROP_FRAC(ctx->fps));
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->fps.num));
+
+				gf_pixel_get_size_info(ctx->spfmt, ctx->size.x, ctx->size.y, &ctx->frame_size, NULL, NULL, NULL, NULL);
+				if (ctx->seek_ts) {
+					ctx->seek_ts *= ctx->fps.den;
+					ctx->seek_ts /= old_fps.den;
+
+				}
+				//process frame header
+				continue;
+			}
+		}
+
 		Bool use_ref = GF_FALSE;
 		if (!ctx->out_pck) {
 			assert(! ctx->nb_bytes_in_frame);
 			if (!ctx->copy && (pck_size >= ctx->frame_size)) {
-				ctx->out_pck = gf_filter_pck_new_ref(ctx->opid, data, ctx->frame_size, pck);
+				ctx->out_pck = gf_filter_pck_new_ref(ctx->opid, offset_in_pck, ctx->frame_size, pck);
 				use_ref = GF_TRUE;
 			} else {
 				ctx->out_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->frame_size, &ctx->out_data);
@@ -228,11 +388,21 @@
 			if (!use_ref) {
 				memcpy(ctx->out_data + ctx->nb_bytes_in_frame, data, remain);
 			}
-			gf_filter_pck_send(ctx->out_pck);
+			if (ctx->ilace) {
+				gf_filter_pck_set_interlaced(pck, ctx->ilace);
+			}
+			if (ctx->seek_ts && (ctx->seek_ts > ctx->cts)) {
+				gf_filter_pck_discard(ctx->out_pck);
+			} else {
+				ctx->seek_ts = 0;
+				gf_filter_pck_send(ctx->out_pck);
+			}
 
 			pck_size -= remain;
 			data += remain;
 			byte_offset += remain;
+			offset_in_pck += remain;
+			
 			ctx->out_pck = NULL;
 			ctx->nb_bytes_in_frame = 0;
 
@@ -262,6 +432,20 @@
 	return GF_OK;
 }
 
+static void rawvidreframe_finalize(GF_Filter *filter)
+{
+	GF_RawVidReframeCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->out_pck) gf_filter_pck_discard(ctx->out_pck);
+}
+
+static const char *rawvidreframe_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	if ((size>10) && !strncmp(data, "YUV4MPEG2 ", 10)) {
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return "video/x-yuv4mpeg";
+	}
+	return NULL;
+}
 
 static GF_FilterCapability RawVidReframeCaps[] =
 {
@@ -270,7 +454,21 @@
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/x-yuv"),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
-	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "v210"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/x-raw-v210"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_V210),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "y4m"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/x-yuv4mpeg"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 };
 
 #define OFFS(_n)	#_n, offsetof(GF_RawVidReframeCtx, _n)
@@ -287,11 +485,16 @@
 GF_FilterRegister RawVidReframeRegister = {
 	.name = "rfrawvid",
 	GF_FS_SET_DESCRIPTION("RAW video reframer")
-	GF_FS_SET_HELP("This filter parses raw YUV and RGB files/data and outputs corresponding raw video PID and frames.")
+	GF_FS_SET_HELP("This filter parses raw YUV and RGB files/data and outputs corresponding raw video PID and frames.\n"
+	"\n"
+	"The filter also parses YUV4MPEG format.\n"
+	)
 	.private_size = sizeof(GF_RawVidReframeCtx),
 	.args = RawVidReframeArgs,
 	SETCAPS(RawVidReframeCaps),
+	.finalize = rawvidreframe_finalize,
 	.configure_pid = rawvidreframe_configure_pid,
+	.probe_data = rawvidreframe_probe_data,
 	.process = rawvidreframe_process,
 	.process_event = rawvidreframe_process_event
 };

gpac-2.0.0.tar.gz/src/filters/reframe_truehd.c Added

@@ -0,0 +1,700 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / TrueHD reframer filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+#include <gpac/filters.h>
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} TrueHDIdx;
+
+typedef struct
+{
+	u32 frame_size;
+	u32 time;
+	u32 sync;
+	u32 format;
+
+	u32 sample_rate;
+	Bool mc_6_ch, mc_8_ch;
+	u8 ch_2_modif, ch_6_modif, ch_8_modif, ch_6_assign;
+	u16 ch_8_assign;
+	u16 peak_rate;
+} TrueHDHdr;
+
+typedef struct
+{
+	//filter args
+	Double index;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	GF_BitStream *bs;
+	u64 file_pos, cts;
+	u32 sample_rate, nb_ch, format;
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale, frame_dur;
+
+	u8 *truehd_buffer;
+	u32 truehd_buffer_size, truehd_buffer_alloc, resume_from;
+	u64 byte_offset;
+
+	Bool is_playing;
+	Bool is_file, file_loaded;
+	Bool initial_play_done;
+
+	GF_FilterPacket *src_pck;
+
+	TrueHDIdx *indexes;
+	u32 index_alloc_size, index_size;
+	Bool copy_props;
+} GF_TrueHDDmxCtx;
+
+
+
+
+GF_Err truehd_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_TrueHDDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) ctx->timescale = p->value.uint;
+
+	if (ctx->timescale && !ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
+	}
+	if (ctx->timescale) ctx->copy_props = GF_TRUE;
+	return GF_OK;
+}
+
+static GF_Err truehd_parse_frame(GF_BitStream *bs, TrueHDHdr *hdr)
+{
+	memset(hdr, 0, sizeof(TrueHDHdr));
+
+	u32 avail = (u32) gf_bs_available(bs);
+	//we need 8 bytes for base header (up to sync marker)
+	if (avail<8) {
+		hdr->frame_size = 0;
+		return GF_OK;
+	}
+
+	/*u8 nibble = */gf_bs_read_int(bs, 4);
+	hdr->frame_size = 2 * gf_bs_read_int(bs, 12);
+	hdr->time = gf_bs_read_u16(bs);
+	hdr->sync = gf_bs_read_u32(bs);
+	if (hdr->sync != 0xF8726FBA) {
+		hdr->sync = 0;
+		return GF_OK;
+	}
+	avail-=8;
+	//we need 12 bytes until peak rate - to update if we decide to parse more
+	if (avail < 12) {
+		hdr->frame_size = 0;
+		return GF_OK;
+	}
+
+	hdr->format = gf_bs_peek_bits(bs, 32, 0);
+	u8 sr_idx = gf_bs_read_int(bs, 4);
+	switch (sr_idx) {
+	case 0: hdr->sample_rate = 48000; break;
+	case 1: hdr->sample_rate = 96000; break;
+	case 2: hdr->sample_rate = 192000; break;
+	case 8: hdr->sample_rate = 44100; break;
+	case 9: hdr->sample_rate = 88200; break;
+	case 10: hdr->sample_rate = 176400; break;
+	default:
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	hdr->mc_6_ch = gf_bs_read_int(bs, 1);
+	hdr->mc_8_ch = gf_bs_read_int(bs, 1);
+	gf_bs_read_int(bs, 2);
+	hdr->ch_2_modif = gf_bs_read_int(bs, 2);
+	hdr->ch_6_modif = gf_bs_read_int(bs, 2);
+	hdr->ch_6_assign = gf_bs_read_int(bs, 5);
+	hdr->ch_8_modif = gf_bs_read_int(bs, 2);
+	hdr->ch_8_assign = gf_bs_read_int(bs, 13);
+
+	u16 sig = gf_bs_read_u16(bs);
+	if (sig != 0xB752) {
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	gf_bs_read_u16(bs);
+	gf_bs_read_u16(bs);
+	gf_bs_read_int(bs, 1);
+	hdr->peak_rate = gf_bs_read_int(bs, 15);
+
+	return GF_OK;
+}
+
+static u32 truehd_frame_dur(u32 sample_rate)
+{
+
+	switch (sample_rate) {
+	case 48000:
+	case 96000:
+	case 192000:
+		return sample_rate / 1200;
+	case 44100:
+	case 88200:
+	case 176400:
+		return sample_rate * 2 / 2205;
+	default:
+		return 0;
+	}
+}
+static void truehd_check_dur(GF_Filter *filter, GF_TrueHDDmxCtx *ctx)
+{
+	FILE *stream;
+	GF_BitStream *bs;
+	u64 duration, cur_dur;
+	s32 sr = -1;
+	u32 frame_dur = 0;
+	const GF_PropertyValue *p;
+	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
+
+	if (ctx->index<=0) {
+		ctx->file_loaded = GF_TRUE;
+		return;
+	}
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
+	if (!p || !p->value.string || !strncmp(p->value.string, "gmem://", 7)) {
+		ctx->is_file = GF_FALSE;
+		ctx->file_loaded = GF_TRUE;
+		return;
+	}
+	ctx->is_file = GF_TRUE;
+
+	stream = gf_fopen_ex(p->value.string, NULL, "rb", GF_TRUE);
+	if (!stream) {
+		if (gf_fileio_is_main_thread(p->value.string))
+			ctx->file_loaded = GF_TRUE;
+		return;
+	}
+
+	ctx->index_size = 0;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+	duration = 0;
+	cur_dur = 0;
+	while (	gf_bs_available(bs) > 8 ) {
+		TrueHDHdr hdr;
+		u64 pos = gf_bs_get_position(bs);
+		GF_Err e = truehd_parse_frame(bs, &hdr);
+		if (e) break;
+
+		if (hdr.sync) {
+			if ((sr>=0) && (sr != hdr.sample_rate)) {
+				duration *= hdr.sample_rate;
+				duration /= sr;
+
+				cur_dur *= hdr.sample_rate;
+				cur_dur /= sr;
+			}
+			sr = hdr.sample_rate;
+			frame_dur = truehd_frame_dur(hdr.sample_rate);
+		}
+
+		duration += frame_dur;
+		cur_dur += frame_dur;
+
+		if (hdr.sync && (cur_dur > ctx->index * sr)) {
+			if (!ctx->index_alloc_size) ctx->index_alloc_size = 10;
+			else if (ctx->index_alloc_size == ctx->index_size) ctx->index_alloc_size *= 2;
+			ctx->indexes = gf_realloc(ctx->indexes, sizeof(TrueHDIdx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = gf_bs_get_position(bs);
+			ctx->indexes[ctx->index_size].duration = (Double) duration;
+			ctx->indexes[ctx->index_size].duration /= sr;
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+
+		if (!hdr.frame_size) break;
+		gf_bs_seek(bs, pos + hdr.frame_size);
+	}
+	gf_bs_del(bs);
+	gf_fclose(stream);
+
+	if (!ctx->duration.num || (ctx->duration.num * sr != duration * ctx->duration.den)) {
+		ctx->duration.num = (s32) duration;
+		ctx->duration.den = sr;
+
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	}
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
+	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
+}
+
+static void truehd_check_pid(GF_Filter *filter, GF_TrueHDDmxCtx *ctx, TrueHDHdr *hdr)
+{
+	u8 *data;
+	u32 size, max_rate;
+	GF_BitStream *bs;
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		truehd_check_dur(filter, ctx);
+	}
+	if ((ctx->sample_rate == hdr->sample_rate) && (ctx->format == hdr->format) && !ctx->copy_props)
+		return;
+
+	ctx->frame_dur = truehd_frame_dur(hdr->sample_rate);
+	ctx->copy_props = GF_FALSE;
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLES_PER_FRAME, & PROP_UINT(ctx->frame_dur) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, & PROP_BOOL(GF_FALSE) );
+
+	if (ctx->duration.num)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+	if (!ctx->timescale)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+
+	if (hdr->ch_2_modif==1) {
+		ctx->nb_ch = 1;
+	} else {
+		ctx->nb_ch = 2;
+		if (hdr->ch_6_assign) {
+			ctx->nb_ch = 0;
+			if (hdr->ch_6_assign & 1) ctx->nb_ch += 2;
+			if (hdr->ch_6_assign & 1<<1) ctx->nb_ch += 1;
+			if (hdr->ch_6_assign & 1<<2) ctx->nb_ch += 1;
+			if (hdr->ch_6_assign & 1<<3) ctx->nb_ch += 2;
+			if (hdr->ch_6_assign & 1<<4) ctx->nb_ch += 2;
+		}
+		if (hdr->ch_8_assign) {
+			ctx->nb_ch = 0;
+			if (hdr->ch_8_assign & 1) ctx->nb_ch += 2;
+			if (hdr->ch_8_assign & 1<<1) ctx->nb_ch += 1;
+			if (hdr->ch_8_assign & 1<<2) ctx->nb_ch += 1;
+			if (hdr->ch_8_assign & 1<<3) ctx->nb_ch += 2;
+			if (hdr->ch_8_assign & 1<<4) ctx->nb_ch += 2;
+			if (hdr->ch_8_assign & 1<<5) ctx->nb_ch += 2;
+			if (hdr->ch_8_assign & 1<<6) ctx->nb_ch += 2;
+			if (hdr->ch_8_assign & 1<<7) ctx->nb_ch += 1;
+			if (hdr->ch_8_assign & 1<<8) ctx->nb_ch += 1;
+			if (hdr->ch_8_assign & 1<<9) ctx->nb_ch += 2;
+			if (hdr->ch_8_assign & 1<<10) ctx->nb_ch += 2;
+			if (hdr->ch_8_assign & 1<<11) ctx->nb_ch += 1;
+			if (hdr->ch_8_assign & 1<<12) ctx->nb_ch += 1;
+		}
+	}
+
+	if (!ctx->timescale) {
+		//we change sample rate, change cts
+		if (ctx->cts && (ctx->sample_rate != hdr->sample_rate)) {
+			ctx->cts = gf_timestamp_rescale(ctx->cts, ctx->sample_rate, hdr->sample_rate);
+		}
+	}
+	ctx->sample_rate = hdr->sample_rate;
+	ctx->format = hdr->format;
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : ctx->sample_rate));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, & PROP_UINT(ctx->sample_rate));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, & PROP_UINT(ctx->nb_ch) );
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(GF_CODECID_TRUEHD) );
+
+	max_rate = hdr->peak_rate;
+	max_rate *= hdr->sample_rate;
+	max_rate /= 16;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(max_rate) );
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_bs_write_u32(bs, hdr->format);
+	gf_bs_write_int(bs, hdr->peak_rate, 15);
+	gf_bs_write_int(bs, 0, 1);
+	gf_bs_write_u32(bs, 0);
+	gf_bs_get_content(bs, &data, &size);
+	gf_bs_del(bs);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY(data, size) );
+
+	if (ctx->is_file && ctx->index) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
+	}
+}
+
+static Bool truehd_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_FilterEvent fevt;
+	GF_TrueHDDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (!ctx->is_playing) {
+			ctx->is_playing = GF_TRUE;
+			ctx->cts = 0;
+			ctx->truehd_buffer_size = 0;
+			ctx->resume_from = 0;
+		}
+		if (! ctx->is_file) {
+			return GF_FALSE;
+		}
+		ctx->start_range = evt->play.start_range;
+		ctx->in_seek = GF_TRUE;
+		ctx->file_pos = 0;
+		if (ctx->start_range) {
+			for (i=1; i<ctx->index_size; i++) {
+				if (ctx->indexes[i].duration>ctx->start_range) {
+					ctx->cts = (u64) (ctx->indexes[i-1].duration * ctx->sample_rate);
+					ctx->file_pos = ctx->indexes[i-1].pos;
+					break;
+				}
+			}
+		}
+		if (!ctx->initial_play_done) {
+			ctx->initial_play_done = GF_TRUE;
+			//seek will not change the current source state, don't send a seek
+			if (!ctx->file_pos)
+				return GF_TRUE;
+		}
+		ctx->truehd_buffer_size = 0;
+		ctx->resume_from = 0;
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = ctx->file_pos;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		//don't cancel event
+		ctx->is_playing = GF_FALSE;
+		return GF_FALSE;
+
+	case GF_FEVT_SET_SPEED:
+		//cancel event
+		return GF_TRUE;
+	default:
+		break;
+	}
+	//by default don't cancel event - to rework once we have downloading in place
+	return GF_FALSE;
+}
+
+static GFINLINE void truehd_update_cts(GF_TrueHDDmxCtx *ctx, TrueHDHdr *hdr)
+{
+	if (ctx->timescale) {
+		u64 inc = ctx->frame_dur;
+		inc *= ctx->timescale;
+		inc /= ctx->sample_rate;
+		ctx->cts += inc;
+	} else {
+		ctx->cts += ctx->frame_dur;
+	}
+}
+
+GF_Err truehd_process(GF_Filter *filter)
+{
+	GF_TrueHDDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *output;
+	u8 *start;
+	GF_Err e = GF_OK;
+	u32 pck_size, remain, prev_pck_size;
+	u64 cts = GF_FILTER_NO_TS;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		truehd_check_dur(filter, ctx);
+
+	if (ctx->opid && !ctx->is_playing)
+		return GF_OK;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (!ctx->truehd_buffer_size) {
+				if (ctx->opid)
+					gf_filter_pid_set_eos(ctx->opid);
+				if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+				ctx->src_pck = NULL;
+				return GF_EOS;
+			}
+		} else {
+			return GF_OK;
+		}
+	}
+
+	prev_pck_size = ctx->truehd_buffer_size;
+	if (pck && !ctx->resume_from) {
+		const u8 *data = gf_filter_pck_get_data(pck, &pck_size);
+		if (!pck_size) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+
+		if (ctx->byte_offset != GF_FILTER_NO_BO) {
+			u64 byte_offset = gf_filter_pck_get_byte_offset(pck);
+			if (!ctx->truehd_buffer_size) {
+				ctx->byte_offset = byte_offset;
+			} else if (ctx->byte_offset + ctx->truehd_buffer_size != byte_offset) {
+				ctx->byte_offset = GF_FILTER_NO_BO;
+				if ((byte_offset != GF_FILTER_NO_BO) && (byte_offset>ctx->truehd_buffer_size) ) {
+					ctx->byte_offset = byte_offset - ctx->truehd_buffer_size;
+				}
+			}
+		}
+
+		if (ctx->truehd_buffer_size + pck_size > ctx->truehd_buffer_alloc) {
+			ctx->truehd_buffer_alloc = ctx->truehd_buffer_size + pck_size;
+			ctx->truehd_buffer = gf_realloc(ctx->truehd_buffer, ctx->truehd_buffer_alloc);
+			if (!ctx->truehd_buffer) return GF_OUT_OF_MEM;
+		}
+		memcpy(ctx->truehd_buffer + ctx->truehd_buffer_size, data, pck_size);
+		ctx->truehd_buffer_size += pck_size;
+	}
+
+	//input pid sets some timescale - we flushed pending data , update cts
+	if (ctx->timescale && pck) {
+		cts = gf_filter_pck_get_cts(pck);
+	}
+
+	if (cts == GF_FILTER_NO_TS) {
+		//avoids updating cts
+		prev_pck_size = 0;
+	}
+
+	remain = ctx->truehd_buffer_size;
+	start = ctx->truehd_buffer;
+
+	if (ctx->resume_from) {
+		start += ctx->resume_from - 1;
+		remain -= ctx->resume_from - 1;
+		ctx->resume_from = 0;
+	}
+
+	if (!ctx->bs) {
+		ctx->bs = gf_bs_new(start, remain, GF_BITSTREAM_READ);
+	} else {
+		gf_bs_reassign_buffer(ctx->bs, start, remain);
+	}
+	while (remain > 8) {
+		u8 *frame;
+		TrueHDHdr hdr;
+		u32 frame_start, bytes_to_drop=0;
+
+		frame_start = (u32) gf_bs_get_position(ctx->bs);
+		e = truehd_parse_frame(ctx->bs, &hdr);
+		if (e) {
+			remain = 0;
+			break;
+		}
+		if (!hdr.frame_size) {
+			remain = 0;
+			break;
+		}
+
+		//frame not complete, wait
+		if (remain < frame_start + hdr.frame_size)
+			break;
+
+		if (hdr.sync)
+			truehd_check_pid(filter, ctx, &hdr);
+
+		if (!ctx->is_playing) {
+			ctx->resume_from = 1 + ctx->truehd_buffer_size - remain;
+			return GF_OK;
+		}
+
+		frame = start + frame_start;
+
+		if (ctx->in_seek) {
+			u64 nb_samples_at_seek = (u64) (ctx->start_range * hdr.sample_rate);
+			if (ctx->cts + ctx->frame_dur >= nb_samples_at_seek) {
+				//u32 samples_to_discard = (ctx->cts + ctx->dts_inc) - nb_samples_at_seek;
+				ctx->in_seek = GF_FALSE;
+			}
+		}
+
+		bytes_to_drop = hdr.frame_size;
+		if (ctx->timescale && !prev_pck_size && (cts != GF_FILTER_NO_TS) ) {
+			//trust input CTS if diff is more than one sec
+			if ((cts > ctx->cts + ctx->timescale) || (ctx->cts > cts + ctx->timescale))
+				ctx->cts = cts;
+			cts = GF_FILTER_NO_TS;
+		}
+
+		if (!ctx->in_seek) {
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, hdr.frame_size, &output);
+			if (!dst_pck) return GF_OUT_OF_MEM;
+			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
+
+			memcpy(output, frame, hdr.frame_size);
+			gf_filter_pck_set_dts(dst_pck, ctx->cts);
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+			if (hdr.sync)
+				gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+			gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+
+			if (ctx->byte_offset != GF_FILTER_NO_BO) {
+				gf_filter_pck_set_byte_offset(dst_pck, ctx->byte_offset + hdr.frame_size);
+			}
+
+			gf_filter_pck_send(dst_pck);
+		}
+		truehd_update_cts(ctx, &hdr);
+
+		//truncated last frame
+		if (bytes_to_drop > remain) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[TrueHDDmx] truncated TrueHD frame!\n"));
+			bytes_to_drop = remain;
+		}
+
+		if (!bytes_to_drop) {
+			bytes_to_drop = 1;
+		}
+		start += bytes_to_drop;
+		remain -= bytes_to_drop;
+		gf_bs_reassign_buffer(ctx->bs, start, remain);
+
+		if (prev_pck_size) {
+			if (prev_pck_size > bytes_to_drop) prev_pck_size -= bytes_to_drop;
+			else {
+				prev_pck_size=0;
+				if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+				ctx->src_pck = pck;
+				if (pck)
+					gf_filter_pck_ref_props(&ctx->src_pck);
+			}
+		}
+		if (ctx->byte_offset != GF_FILTER_NO_BO)
+			ctx->byte_offset += bytes_to_drop;
+	}
+
+	if (!pck) {
+		ctx->truehd_buffer_size = 0;
+		return truehd_process(filter);
+	} else {
+		if (remain) {
+			memmove(ctx->truehd_buffer, start, remain);
+		}
+		ctx->truehd_buffer_size = remain;
+		gf_filter_pid_drop_packet(ctx->ipid);
+	}
+	return e;
+}
+
+static void truehd_finalize(GF_Filter *filter)
+{
+	GF_TrueHDDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->truehd_buffer) gf_free(ctx->truehd_buffer);
+	if (ctx->indexes) gf_free(ctx->indexes);
+}
+
+static const char *truehd_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	u32 nb_frames=0;
+	GF_BitStream *bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs) > 8 ) {
+		TrueHDHdr hdr;
+		u64 pos = gf_bs_get_position(bs);
+		GF_Err e = truehd_parse_frame(bs, &hdr);
+		if (e || !hdr.frame_size) {
+			nb_frames = 0;
+			break;
+		}
+		if (hdr.sync) nb_frames++;
+		gf_bs_seek(bs, pos + hdr.frame_size);
+	}
+	gf_bs_del(bs);
+	if (nb_frames) {
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return "audio/truehd";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability TrueHDDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "mlp|thd|truehd"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/truehd|audio/x-truehd"),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_TRUEHD),
+	CAP_BOOL(GF_CAPS_OUTPUT_STATIC_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_TRUEHD),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_TrueHDDmxCtx, _n)
+static const GF_FilterArgs TrueHDDmxArgs[] =
+{
+	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{0}
+};
+
+
+GF_FilterRegister TrueHDDmxRegister = {
+	.name = "rftruehd",
+	GF_FS_SET_DESCRIPTION("TrueHD reframer")
+	GF_FS_SET_HELP("This filter parses Dolby TrueHD files/data and outputs corresponding audio PID and frames.")
+	.private_size = sizeof(GF_TrueHDDmxCtx),
+	.args = TrueHDDmxArgs,
+	.finalize = truehd_finalize,
+	SETCAPS(TrueHDDmxCaps),
+	.configure_pid = truehd_configure_pid,
+	.process = truehd_process,
+	.probe_data = truehd_probe_data,
+	.process_event = truehd_process_event
+};
+
+
+const GF_FilterRegister *truehd_register(GF_FilterSession *session)
+{
+	return &TrueHDDmxRegister;
+}
+

gpac-1.0.1.tar.gz/src/filters/reframer.c -> gpac-2.0.0.tar.gz/src/filters/reframer.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / force reframer filter
@@ -37,6 +37,7 @@
 enum
 {
 	REFRAME_ROUND_BEFORE=0,
+	REFRAME_ROUND_SEEK,
 	REFRAME_ROUND_AFTER,
 	REFRAME_ROUND_CLOSEST,
 };
@@ -58,6 +59,16 @@
 	EXTRACT_DUR,
 };
 
+enum
+{
+	RAW_AV=0,
+	RAW_AUDIO,
+	RAW_VIDEO,
+	RAW_NONE,
+};
+
+#define RT_PRECISION_US	2000
+
 typedef struct
 {
 	GF_FilterPid *ipid, *opid;
@@ -68,13 +79,13 @@
 	Bool can_split;
 	Bool all_saps;
 	Bool needs_adjust;
+	Bool use_blocking_refs;
 
 	u64 ts_at_range_start_plus_one;
 	u64 ts_at_range_end;
-	s64 cts_init;
 
 	GF_List *pck_queue;
-	//0: not comuted, 1: computed and valid TS, 2: end of stream on pid
+	//0: not computed, 1: computed and valid TS, 2: end of stream on pid
 	u32 range_start_computed;
 	u64 range_end_reached_ts;
 	u64 prev_sap_ts;
@@ -83,14 +94,32 @@
 	u64 sap_ts_plus_one;
 	Bool first_pck_sent;
 
-	u32 tk_delay;
+	//only positive delay here
+	u64 tk_delay;
+	//only media skip (video, audio priming)
+	u32 ts_sub;
 	Bool in_eos;
 	u32 split_start;
 	u32 split_end;
 
 	GF_FilterPacket *split_pck;
-	GF_FilterPacket *resinsert_single_pck;
+	GF_FilterPacket *reinsert_single_pck;
 	Bool is_playing;
+
+	Bool is_raw;
+	u32 codec_id, stream_type;
+	u32 nb_ch, sample_rate, abps;
+	Bool audio_planar;
+	//for uncompressed audio, number of audio samples to keep from split frame / trash from next split frame
+	//for seek mode, duration of media to keep from split frame / trash from next split frame
+	u32 audio_samples_to_keep;
+
+	u32 nb_frames_until_start;
+
+	Bool seek_mode;
+	u64 probe_ref_frame_ts;
+
+	Bool fetch_done;
 } RTStream;
 
 typedef struct
@@ -102,11 +131,12 @@
 	Bool refs;
 	u32 rt;
 	Double speed;
-	Bool raw;
-	GF_List *xs, *xe;
-	Bool nosap, splitrange, xadjust;
+	u32 raw;
+	GF_PropStringList xs, xe;
+	Bool nosap, splitrange, xadjust, tcmdrw, no_audio_seek, probe_ref;
 	u32 xround;
 	Double seeksafe;
+	GF_PropStringList props;
 
 	//internal
 	Bool filter_sap1;
@@ -126,7 +156,6 @@
 	GF_Fraction64 cur_start, cur_end;
 	u64 start_frame_idx_plus_one, end_frame_idx_plus_one;
 
-	Bool timing_initialized;
 	Bool in_range;
 
 	Bool seekable;
@@ -142,11 +171,22 @@
 	u64 est_file_size;
 	u64 prev_min_ts_computed;
 	u32 prev_min_ts_scale;
-	u32 gop_depth;
 
 	u32 wait_video_range_adjust;
-	Bool is_eos, has_seen_eos;
+	Bool has_seen_eos;
+	u32 eos_state;
 	u32 nb_non_saps;
+
+	u32 nb_video_frames_since_start_at_range_start;
+	u32 nb_video_frames_since_start;
+
+	Bool flush_samples;
+	u64 cumulated_size;
+	u64 last_ts;
+
+	u64 flush_max_ts;
+	u32 flush_max_ts_scale;
+
 } GF_ReframerCtx;
 
 static void reframer_reset_stream(GF_ReframerCtx *ctx, RTStream *st)
@@ -159,9 +199,31 @@
 		gf_list_del(st->pck_queue);
 	}
 	if (st->split_pck) gf_filter_pck_unref(st->split_pck);
-	if (st->resinsert_single_pck) gf_filter_pck_unref(st->resinsert_single_pck);
+	if (st->reinsert_single_pck) gf_filter_pck_unref(st->reinsert_single_pck);
 	gf_free(st);
 }
+
+static void reframer_push_props(GF_ReframerCtx *ctx, RTStream *st)
+{
+	gf_filter_pid_reset_properties(st->opid);
+	gf_filter_pid_copy_properties(st->opid, st->ipid);
+	//if range processing, we drop frames not in the target playback range so do not forward delay
+	if (ctx->range_type && ((st->tk_delay>0) || (!st->tk_delay && !st->ts_sub)) ){
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_DELAY, NULL);
+	}
+	if (ctx->filter_sap1 || ctx->filter_sap2)
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_HAS_SYNC, &PROP_BOOL(GF_FALSE)); //false: all samples are sync
+
+	//seek mode, signal we have sample-accurate seek info for the pid
+	if (st->seek_mode)
+		gf_filter_pid_set_property(st->opid, GF_PROP_PCK_SKIP_BEGIN, &PROP_UINT(1));
+
+	//for old arch compat, signal we must remove edits
+	if (gf_sys_old_arch_compat()) {
+		gf_filter_pid_set_property_str(st->opid, "reframer_rem_edits", &PROP_BOOL(GF_TRUE) );
+	}
+}
+
 GF_Err reframer_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	u32 i;
@@ -171,7 +233,8 @@
 
 	if (is_remove) {
 		if (st) {
-			gf_filter_pid_remove(st->opid);
+			if (st->opid)
+				gf_filter_pid_remove(st->opid);
 			gf_list_del_item(ctx->streams, st);
 			reframer_reset_stream(ctx, st);
 		}
@@ -180,9 +243,7 @@
 	if (! gf_filter_pid_check_caps(pid))
 		return GF_NOT_SUPPORTED;
 
-	if (st) {
-		gf_filter_pid_reset_properties(st->opid);
-	} else {
+	if (!st) {
 		GF_SAFEALLOC(st, RTStream);
 		if (!st) return GF_OUT_OF_MEM;
 		
@@ -194,8 +255,6 @@
 		st->pck_queue = gf_list_new();
 		st->all_saps = GF_TRUE;
 	}
-	//copy properties at init or reconfig
-	gf_filter_pid_copy_properties(st->opid, pid);
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
 	if (p) st->timescale = p->value.uint;
@@ -207,41 +266,69 @@
 	}
 	st->can_split = GF_FALSE;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
-	if (p) {
-		switch (p->value.uint) {
-		case GF_STREAM_TEXT:
-			st->can_split = GF_TRUE;
-			break;
-		}
+	st->stream_type = p ? p->value.uint : 0;
+	switch (st->stream_type) {
+	case GF_STREAM_TEXT:
+	case GF_STREAM_METADATA:
+		st->can_split = GF_TRUE;
+		break;
 	}
-	st->needs_adjust = ctx->xadjust ? GF_TRUE : GF_FALSE;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	st->codec_id = p ? p->value.uint : 0;
+	st->nb_ch = st->abps = st->sample_rate = 0;
+	st->audio_planar = GF_FALSE;
+	st->is_raw = (st->codec_id==GF_CODECID_RAW) ? GF_TRUE : GF_FALSE;
+
+	if (st->is_raw && (st->stream_type==GF_STREAM_AUDIO)) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+		if (p) st->abps = gf_audio_fmt_bit_depth(p->value.uint) / 8;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+		if (p) st->nb_ch = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+		st->sample_rate = p ? p->value.uint : st->timescale;
+		st->abps *= st->nb_ch;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+		if (p && (p->value.uint>GF_AUDIO_FMT_LAST_PACKED))
+			st->audio_planar = GF_TRUE;
+	}
+
+
+	//if non SAP1 detected and xadjust, move directly to needs_adjust=TRUE
+	//otherwise consider we don't need to probe for next sap, this will be updated
+	//if one packet is not sap
+	st->needs_adjust = (ctx->xadjust && !st->all_saps) ? GF_TRUE : GF_FALSE;
 
 	st->tk_delay = 0;
+	st->ts_sub = 0;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
 	if (p) {
 		//delay negative is skip: this is CTS adjustment for B-frames: we keep that notif in the stream
-		if (p->value.sint<0) {
+		if (p->value.longsint<=0) {
 			st->tk_delay = 0;
+			st->ts_sub = (u32) -p->value.longsint;
 		}
 		//delay positive is delay, we keep the value for RT regulation and range
 		else {
-			st->tk_delay = (u32) p->value.sint;
-			//if range processing, we drop frames not in the target playback range so do not forward delay
-			if (ctx->range_type) {
-				gf_filter_pid_set_property(st->opid, GF_PROP_PID_DELAY, NULL);
-			}
+			st->tk_delay = (u64) p->value.longsint;
 		}
 	}
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAYBACK_MODE);
-	if (!p || (p->value.uint < GF_PLAYBACK_MODE_SEEK))
+	if (!p || (p->value.uint < GF_PLAYBACK_MODE_FASTFORWARD))
 		ctx->seekable = GF_FALSE;
 
 
 	ctx->filter_sap1 = ctx->filter_sap2 = ctx->filter_sap3 = ctx->filter_sap4 = ctx->filter_sap_none = GF_FALSE;
 	for (i=0; i<ctx->saps.nb_items; i++) {
 		switch (ctx->saps.vals[i]) {
-		case 1: ctx->filter_sap1 = GF_TRUE; break;
-		case 2: ctx->filter_sap2 = GF_TRUE; break;
+		case 1:
+			ctx->filter_sap1 = GF_TRUE;
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_HAS_SYNC, &PROP_BOOL(GF_FALSE)); //false: all samples are sync
+			break;
+		case 2:
+			ctx->filter_sap2 = GF_TRUE;
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_HAS_SYNC, &PROP_BOOL(GF_FALSE)); //false: all samples are sync
+			break;
 		case 3: ctx->filter_sap3 = GF_TRUE; break;
 		case 4: ctx->filter_sap4 = GF_TRUE; break;
 		default: ctx->filter_sap_none = GF_TRUE; break;
@@ -249,6 +336,30 @@
 	}
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
 
+	//NEVER use seek mode for uncompressed audio, packets are splitted anyway
+	if (ctx->extract_mode==EXTRACT_RANGE) {
+		if (st->abps) {
+			st->seek_mode = GF_FALSE;
+		}
+		//use seek if seek is forced
+		else if (ctx->xround==REFRAME_ROUND_SEEK) {
+			st->seek_mode = GF_TRUE;
+		}
+		//use seek mode for compressed audio with or without priming
+		else if (st->stream_type==GF_STREAM_AUDIO) {
+			st->seek_mode = ctx->no_audio_seek ? GF_FALSE : GF_TRUE;
+		} else {
+			st->seek_mode = GF_FALSE;
+		}
+	} else {
+		st->seek_mode = GF_FALSE;
+	}
+	reframer_push_props(ctx, st);
+
+	if (ctx->cur_range_idx && (ctx->cur_range_idx <= ctx->props.nb_items)) {
+		gf_filter_pid_push_properties(st->opid, ctx->props.vals[ctx->cur_range_idx-1], GF_FALSE, GF_FALSE);
+	}
+
 	return GF_OK;
 }
 
@@ -265,14 +376,21 @@
 		u32 h=0, m=0, s=0, ms=0;
 		if (strchr(date, '.')) {
 			if (sscanf(date, "T%u:%u:%u.%u", &h, &m, &s, &ms) != 4) {
+				h = 0;
 				if (sscanf(date, "T%u:%u.%u", &m, &s, &ms) != 3) {
-					goto exit;
+					m = 0;
+					if (sscanf(date, "T%u.%u", &s, &ms) != 2) {
+						goto exit;
+					}
 				}
 			}
 			if (ms>=1000) ms=0;
 		} else {
 			if (sscanf(date, "T%u:%u:%u", &h, &m, &s) != 3) {
-				goto exit;
+				h = 0;
+				if (sscanf(date, "T%u:%u", &m, &s) != 2) {
+					goto exit;
+				}
 			}
 		}
 		v = h*3600 + m*60 + s;
@@ -286,14 +404,6 @@
 		*frame_idx_plus_one = 1 + atoi(date+1);
 		return GF_TRUE;
 	}
-	if (sscanf(date, LLD"/"LLU, &value->num, &value->den)==2) {
-		return GF_TRUE;
-	}
-	if (sscanf(date, LLU, &v)==1) {
-		value->num = v;
-		value->den = 1000;
-		return GF_TRUE;
-	}
 	if (!strcmp(date, "RAP") || !strcmp(date, "SAP")) {
 		if (extract_mode)
 			*extract_mode = EXTRACT_SAP;
@@ -324,8 +434,12 @@
 		}
 	}
 
+	if (gf_parse_lfrac(date, value)) {
+		return GF_TRUE;
+	}
+
 exit:
-	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] Unrecognized date format %s, expecting TXX:XX:XX[.XX], INT or FRAC\n", date));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] Unrecognized date format %s, expecting THH:MM:SS[.ms], TMM:SS[.ms], TSS[.ms], INT or FRAC\n", date));
 	if (extract_mode)
 		*extract_mode = EXTRACT_NONE;
 	return GF_FALSE;
@@ -335,10 +449,13 @@
 {
 	u32 i, count;
 	Bool do_seek = ctx->seekable;
+	Bool reset_asplit = GF_TRUE;
 	u64 prev_frame = ctx->start_frame_idx_plus_one;
 	GF_Fraction64 prev_end;
 	char *start_date=NULL, *end_date=NULL;
 
+	ctx->nb_video_frames_since_start_at_range_start = ctx->nb_video_frames_since_start;
+
 	if (ctx->extract_mode==EXTRACT_DUR) {
 		ctx->cur_start.num += (ctx->extract_dur.num * ctx->cur_start.den) / ctx->extract_dur.den;
 		ctx->cur_end.num += (ctx->extract_dur.num * ctx->cur_end.den) / ctx->extract_dur.den;
@@ -360,7 +477,7 @@
 	ctx->cur_end.num = 0;
 	ctx->cur_end.den = 0;
 
-	count = gf_list_count(ctx->xs);
+	count = ctx->xs.nb_items;
 	if (!count) {
 		if (ctx->range_type) goto range_done;
 		return;
@@ -368,8 +485,14 @@
 	if (ctx->cur_range_idx>=count) {
 		goto range_done;
 	} else {
-		start_date = gf_list_get(ctx->xs, ctx->cur_range_idx);
-		end_date = gf_list_get(ctx->xe, ctx->cur_range_idx);
+		start_date = ctx->xs.vals[ctx->cur_range_idx];
+		end_date = NULL;
+		if (ctx->cur_range_idx < ctx->xe.nb_items)
+			end_date = ctx->xe.vals[ctx->cur_range_idx];
+		else if (ctx->cur_range_idx + 1 < ctx->xs.nb_items)
+			end_date = ctx->xs.vals[ctx->cur_range_idx+1];
+
+		if (end_date && !end_date[0]) end_date = NULL;
 	}
 	if (!start_date)
 		goto range_done;
@@ -445,10 +568,17 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] cannot parse end date, assuming open range\n"));
 			ctx->range_type = RANGE_OPEN;
 		}
+		else if (gf_timestamp_greater_or_equal(ctx->cur_start.num, ctx->cur_start.den, ctx->cur_end.num, ctx->cur_end.den) ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] End range before start range, assuming open range\n"));
+			ctx->range_type = RANGE_OPEN;
+		}
 	}
 
+	if (prev_end.den && (prev_end.num * ctx->cur_start.den == prev_end.den * ctx->cur_start.num))
+		reset_asplit = GF_FALSE;
+
 	//reset realtime range and issue seek requests
-	if (ctx->rt || do_seek) {
+	if (ctx->rt || do_seek || reset_asplit) {
 		Double start_range = 0;
 		if (do_seek) {
 			start_range = (Double) ctx->cur_start.num;
@@ -458,6 +588,8 @@
 			else
 				start_range = 0;
 			ctx->has_seen_eos = GF_FALSE;
+			ctx->nb_video_frames_since_start_at_range_start = 0;
+			ctx->nb_video_frames_since_start = 0;
 		}
 		count = gf_list_count(ctx->streams);
 		for (i=0; i<count; i++) {
@@ -474,9 +606,26 @@
 				evt.play.start_range = start_range;
 				evt.play.speed = 1;
 				gf_filter_pid_send_event(st->ipid, &evt);
+
+				st->nb_frames = 0;
+			}
+			if (reset_asplit) {
+				st->audio_samples_to_keep = 0;
 			}
 		}
 	}
+
+	if (ctx->cur_range_idx && (ctx->cur_range_idx <= ctx->props.nb_items)) {
+		count = gf_list_count(ctx->streams);
+		for (i=0; i<count; i++) {
+			RTStream *st = gf_list_get(ctx->streams, i);
+
+			reframer_push_props(ctx, st);
+			gf_filter_pid_push_properties(st->opid, ctx->props.vals[ctx->cur_range_idx-1], GF_FALSE, GF_FALSE);
+			gf_filter_pid_set_property_str(st->opid, "period_resume", &PROP_STRING("") );
+		}
+	}
+
 	return;
 
 range_done:
@@ -494,18 +643,6 @@
 
 }
 
-static void reframer_update_ts_shift(GF_ReframerCtx *ctx, s64 diff_ts, u32 timescale)
-{
-	u32 i, count = gf_list_count(ctx->streams);
-	for (i=0; i<count; i++) {
-		s64 ts_shift;
-		RTStream *st = gf_list_get(ctx->streams, i);
-		ts_shift = diff_ts;
-		ts_shift *= st->timescale;
-		ts_shift /= timescale;
-		st->cts_init -= ts_shift;
-	}
-}
 void reframer_drop_packet(GF_ReframerCtx *ctx, RTStream *st, GF_FilterPacket *pck, Bool pck_is_ref)
 {
 	if (pck_is_ref) {
@@ -516,6 +653,20 @@
 	}
 }
 
+void reframer_copy_raw_audio(RTStream *st, const u8 *src, u32 src_size, u32 offset, u8 *dst, u32 nb_samp)
+{
+	if (st->audio_planar) {
+		u32 i, bps, stride;
+		stride = src_size / st->nb_ch;
+		bps = st->abps / st->nb_ch;
+		for (i=0; i<st->nb_ch; i++) {
+			memcpy(dst + i*bps*nb_samp, src + i*stride + offset * bps, nb_samp * bps);
+		}
+	} else {
+		memcpy(dst, src + offset * st->abps, nb_samp * st->abps);
+	}
+}
+
 Bool reframer_send_packet(GF_Filter *filter, GF_ReframerCtx *ctx, RTStream *st, GF_FilterPacket *pck, Bool pck_is_ref)
 {
 	Bool do_send = GF_FALSE;
@@ -531,32 +682,33 @@
 		if (cts_us==GF_FILTER_NO_TS) {
 			do_send = GF_TRUE;
 		} else {
+			RTStream *st_clock = st;
 			u64 clock = ctx->clock_val;
 			cts_us += st->tk_delay;
 
-			cts_us *= 1000000;
-			cts_us /= st->timescale;
+			cts_us = gf_timestamp_rescale(cts_us, st->timescale, 1000000);
 			if (ctx->rt==REFRAME_RT_SYNC) {
 				if (!ctx->clock) ctx->clock = st;
-
-				st = ctx->clock;
+				st_clock = ctx->clock;
 			}
-			if (!st->sys_clock_at_init) {
-				st->cts_us_at_init = cts_us;
-				st->sys_clock_at_init = clock;
+			if (!st_clock->sys_clock_at_init) {
+				st_clock->cts_us_at_init = cts_us;
+				st_clock->sys_clock_at_init = clock;
 				do_send = GF_TRUE;
-			} else if (cts_us < st->cts_us_at_init) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] CTS less than CTS used to initialize clock, not delaying\n"));
+			} else if (cts_us < st_clock->cts_us_at_init) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] CTS less than CTS used to initialize clock by %d ms, not delaying\n", (u32) (st_clock->cts_us_at_init - cts_us)/1000));
 				do_send = GF_TRUE;
 			} else {
-				u64 diff = cts_us - st->cts_us_at_init;
+				u64 diff = cts_us - st_clock->cts_us_at_init;
 				if (ctx->speed>0) diff = (u64) ( diff / ctx->speed);
 				else if (ctx->speed<0) diff = (u64) ( diff / -ctx->speed);
 
-				clock -= st->sys_clock_at_init;
-				if (clock + 1000 >= diff) {
+				clock -= st_clock->sys_clock_at_init;
+				if (clock + RT_PRECISION_US >= diff) {
 					do_send = GF_TRUE;
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Reframer] Sending packet "LLU" us too late (clock diff "LLU" - CTS diff "LLU")\n", 1000+clock - diff, clock, diff));
+					if (clock > diff) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Reframer] Sending packet "LLU" us too late (clock diff "LLU" - CTS diff "LLU")\n", 1000+clock - diff, clock, diff));
+					}
 				} else {
 					diff -= clock;
 					if (!ctx->reschedule_in)
@@ -590,70 +742,211 @@
 
 	//range processing
 	if (st->ts_at_range_start_plus_one) {
+		Bool is_split = GF_FALSE;
 		s64 ts;
-		GF_FilterPacket *new_pck = gf_filter_pck_new_ref(st->opid, NULL, 0, pck);
+		s32 ts_adj = 0;
+		u32 cts_offset=0;
+		u32 dur=0;
+		GF_FilterPacket *new_pck;
+
+		//tmcd, rewrite sample
+		if (ctx->tcmdrw && (st->codec_id==GF_CODECID_TMCD) && st->split_start && ctx->nb_video_frames_since_start_at_range_start) {
+			GF_BitStream *bs;
+			u32 nb_frames;
+			u8 *tcmd_data = NULL;
+			new_pck = gf_filter_pck_new_copy(st->opid, pck, &tcmd_data);
+			if (!new_pck) return GF_FALSE;
+
+			bs = gf_bs_new(tcmd_data, 4, GF_BITSTREAM_READ);
+			nb_frames = gf_bs_read_u32(bs);
+			gf_bs_del(bs);
+			bs = gf_bs_new(tcmd_data, 4, GF_BITSTREAM_WRITE);
+			gf_bs_seek(bs, 0);
+			gf_bs_write_u32(bs, nb_frames+ctx->nb_video_frames_since_start_at_range_start);
+			gf_bs_del(bs);
+			dur = gf_filter_pck_get_duration(pck);
+			if (dur > st->split_start)
+				dur -= st->split_start;
+			if (st->split_end && (dur > st->split_end - st->split_start))
+				dur = st->split_end - st->split_start;
+			ts_adj = st->split_start;
+
+		} else if ((pck == st->split_pck) && st->audio_samples_to_keep) {
+			const u8 *data;
+			u32 pck_size;
+			data = gf_filter_pck_get_data(pck, &pck_size);
+			if (st->abps) {
+				if (st->audio_samples_to_keep * st->abps <= pck_size) {
+					u8 *output;
+					new_pck = gf_filter_pck_new_alloc(st->opid, st->audio_samples_to_keep * st->abps, &output);
+					if (!new_pck) return GF_FALSE;
+					reframer_copy_raw_audio(st, data, pck_size, 0, output, st->audio_samples_to_keep);
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] Broken raw audio frame size/duration: %d samples to keep but packet is smaller (%d samples)\n", st->audio_samples_to_keep, pck_size/st->abps));
+					st->audio_samples_to_keep = 0;
+					new_pck = gf_filter_pck_new_ref(st->opid, 0, 0, pck);
+					if (!new_pck) return GF_FALSE;
+				}
+			} else {
+				new_pck = gf_filter_pck_new_ref(st->opid, 0, 0, pck);
+				if (!new_pck) return GF_FALSE;
+			}
+			dur = st->audio_samples_to_keep;
+		} else if (st->audio_samples_to_keep) {
+			u8 *output;
+			const u8 *data;
+			u32 pck_size;
+			data = gf_filter_pck_get_data(pck, &pck_size);
+			if (st->abps) {
+				if (pck_size < st->audio_samples_to_keep * st->abps) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] Broken raw audio frame size/duration: %d samples to keep but packet is smaller (%d samples)\n", st->audio_samples_to_keep, pck_size/st->abps));
+					st->audio_samples_to_keep = 0;
+				}
+				new_pck = gf_filter_pck_new_alloc(st->opid, pck_size - st->audio_samples_to_keep * st->abps, &output);
+				if (!new_pck) return GF_FALSE;
+
+				reframer_copy_raw_audio(st, data, pck_size, st->audio_samples_to_keep, output, pck_size/st->abps - st->audio_samples_to_keep);
+
+				dur = pck_size/st->abps - st->audio_samples_to_keep;
+
+				cts_offset = st->audio_samples_to_keep;
+				//if first range, add CTS offset to ts at range start
+				if (ctx->cur_range_idx==1)
+					st->ts_at_range_start_plus_one += cts_offset;
+			} else {
+				new_pck = gf_filter_pck_new_ref(st->opid, 0, 0, pck);
+				if (!new_pck) return GF_FALSE;
+
+				dur = gf_filter_pck_get_duration(pck);
+				gf_filter_pck_set_property(new_pck, GF_PROP_PCK_SKIP_BEGIN, &PROP_UINT( st->audio_samples_to_keep ) );
+			}
+			st->audio_samples_to_keep = 0;
+		} else {
+			new_pck = gf_filter_pck_new_ref(st->opid, 0, 0, pck);
+			if (!new_pck) return GF_FALSE;
+		}
 		gf_filter_pck_merge_properties(pck, new_pck);
 
+		if (cts_offset || dur) {
+			if (st->abps && (st->timescale!=st->sample_rate)) {
+				cts_offset = (u32) gf_timestamp_rescale(cts_offset, st->sample_rate, st->timescale);
+				dur *= st->timescale;
+				dur /= st->sample_rate;
+			}
+			gf_filter_pck_set_duration(new_pck, dur);
+		}
+
 		//signal chunk start boundary
 		if (!st->first_pck_sent) {
+			u64 start_t, end_t;
+			char szFileSuf[1000];
 			u32 i, len;
 			char *file_suf_name = NULL;
-			char *start = gf_list_get(ctx->xs, ctx->cur_range_idx-1);
+			char *start = ctx->xs.vals[ctx->cur_range_idx-1];
 			char *end = NULL;
-			if (ctx->range_type==1) end = gf_list_get(ctx->xe, ctx->cur_range_idx-1);
+			if ((ctx->range_type==1) && (ctx->cur_range_idx<ctx->xe.nb_items+1)) {
+				end = ctx->xe.vals[ctx->cur_range_idx-1];
+			}
 			st->first_pck_sent = GF_TRUE;
 
 			if (ctx->extract_mode==EXTRACT_RANGE) {
+
 				gf_filter_pck_set_property(new_pck, GF_PROP_PCK_FILENUM, &PROP_UINT(ctx->cur_range_idx) );
-				gf_dynstrcat(&file_suf_name, start, NULL);
-				if (end)
-					gf_dynstrcat(&file_suf_name, end, "_");
-
-				len = (u32) strlen(file_suf_name);
-				//replace : and / characters
-				for (i=0; i<len; i++) {
-					switch (file_suf_name[i]) {
-					case ':':
-					case '/':
-						file_suf_name[i] = '.';
-						break;
+
+				if (strchr(start, '/')) {
+					start_t = ctx->cur_start.num;
+					start_t /= ctx->cur_start.den;
+					if (ctx->cur_end.den) {
+						end_t = ctx->cur_end.num;
+						end_t /= ctx->cur_end.den;
+						sprintf(szFileSuf, LLU"-"LLU, start_t, end_t);
+					} else {
+						sprintf(szFileSuf, LLU, start_t);
 					}
+					gf_filter_pck_set_property(new_pck, GF_PROP_PCK_FILESUF, &PROP_STRING(szFileSuf) );
+				} else {
+
+					gf_dynstrcat(&file_suf_name, start, NULL);
+					if (end)
+						gf_dynstrcat(&file_suf_name, end, "_");
+
+					len = (u32) strlen(file_suf_name);
+					//replace : and / characters
+					for (i=0; i<len; i++) {
+						switch (file_suf_name[i]) {
+						case ':':
+						case '/':
+							file_suf_name[i] = '.';
+							break;
+						}
+					}
+					gf_filter_pck_set_property(new_pck, GF_PROP_PCK_FILESUF, &PROP_STRING_NO_COPY(file_suf_name) );
 				}
-				gf_filter_pck_set_property(new_pck, GF_PROP_PCK_FILESUF, &PROP_STRING_NO_COPY(file_suf_name) );
 			} else {
-				u64 start_t, end_t;
-				char szFileSuf[1000];
+				gf_filter_pck_set_property(new_pck, GF_PROP_PCK_FILENUM, &PROP_UINT(ctx->file_idx) );
+
 				start_t = ctx->cur_start.num * 1000;
 				start_t /= ctx->cur_start.den;
-				end_t = ctx->cur_end.num * 1000;
-				end_t /= ctx->cur_end.den;
-
-				gf_filter_pck_set_property(new_pck, GF_PROP_PCK_FILENUM, &PROP_UINT(ctx->file_idx) );
-				sprintf(szFileSuf, LLU"-"LLU, start_t, end_t);
+				if (ctx->cur_end.den) {
+					end_t = ctx->cur_end.num * 1000;
+					end_t /= ctx->cur_end.den;
+					sprintf(szFileSuf, LLU"-"LLU, start_t, end_t);
+				} else {
+					sprintf(szFileSuf, LLU, start_t);
+				}
 				gf_filter_pck_set_property(new_pck, GF_PROP_PCK_FILESUF, &PROP_STRING(szFileSuf) );
 			}
+			if (st->nb_frames) {
+				const GF_PropertyValue *p = gf_filter_pid_get_property(st->ipid, GF_PROP_PID_NB_FRAMES);
+				if (p) {
+					gf_filter_pid_set_property(st->opid, GF_PROP_PID_FRAME_OFFSET, &PROP_UINT(st->nb_frames) );
+				}
+			}
+
+			if (ctx->file_idx>1) {
+				gf_filter_pid_set_property(st->opid, GF_PROP_PID_DELAY, NULL);
+			}
 		}
 
 		//rewrite timestamps
-		ts = gf_filter_pck_get_cts(pck);
+		ts = gf_filter_pck_get_cts(pck) + cts_offset;
 
 		if (ts != GF_FILTER_NO_TS) {
+			if (ctx->is_range_extraction
+				&& st->seek_mode
+				&& gf_timestamp_less(ts + ts_adj - st->ts_sub, st->timescale, ctx->cur_start.num, ctx->cur_start.den)
+			) {
+				gf_filter_pck_set_seek_flag(new_pck, GF_TRUE);
+				gf_filter_pck_set_property(new_pck, GF_PROP_PCK_SKIP_BEGIN, NULL);
+				if (st->stream_type!=GF_STREAM_VISUAL) {
+					u32 pck_dur = gf_filter_pck_get_duration(new_pck);
+					if (gf_timestamp_greater(ts + ts_adj + pck_dur - st->ts_sub, st->timescale, ctx->cur_start.num, ctx->cur_start.den)) {
+						u32 ts_diff = (u32) ( gf_timestamp_rescale(ctx->cur_start.num, ctx->cur_start.den, st->timescale) - (ts + ts_adj - st->ts_sub));
+						gf_filter_pck_set_property(new_pck, GF_PROP_PCK_SKIP_BEGIN, &PROP_UINT(ts_diff));
+						gf_filter_pck_set_seek_flag(new_pck, GF_FALSE);
+					}
+				}
+			}
+
 			ts += st->tk_delay;
 			ts += st->ts_at_range_end;
 			ts -= st->ts_at_range_start_plus_one - 1;
-			ts -= st->cts_init;
+
 			if (ts<0) {
-				reframer_update_ts_shift(ctx, -ts, st->timescale);
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] Negative TS while splitting, something went wrong during range estimation, forcing to 0\n"));
 				ts = 0;
 			}
+			if (st->probe_ref_frame_ts && (gf_filter_pck_get_dts(pck) + st->tk_delay + 1 == st->probe_ref_frame_ts)) {
+				gf_filter_pck_set_property(new_pck, GF_PROP_PCK_SKIP_PRES, &PROP_BOOL(GF_TRUE));
+			}
 
 			gf_filter_pck_set_cts(new_pck, (u64) ts);
-			if (ctx->raw) {
+			if (st->is_raw) {
 				gf_filter_pck_set_dts(new_pck, ts);
 			}
 		}
-		if (!ctx->raw) {
-			ts = gf_filter_pck_get_dts(pck);
+		if (!st->is_raw) {
+			ts = gf_filter_pck_get_dts(pck) + cts_offset;
 			if (ts != GF_FILTER_NO_TS) {
 				ts += st->tk_delay;
 				ts -= st->ts_at_range_start_plus_one - 1;
@@ -661,79 +954,60 @@
 				gf_filter_pck_set_dts(new_pck, (u64) ts);
 			}
 		}
+		//packet was split or was re-inserted
 		if (st->split_start) {
-			u32 dur = gf_filter_pck_get_duration(pck);
-			assert(dur>st->split_start);
-			dur -= st->split_start;
-			gf_filter_pck_set_duration(new_pck, dur);
+			if (!dur) {
+				u32 pck_dur = gf_filter_pck_get_duration(pck);
+				//can happen if source packet is less than split period duration, we just copy with no timing adjustment
+				if (pck_dur > st->split_start)
+					pck_dur -= st->split_start;
+				gf_filter_pck_set_duration(new_pck, pck_dur);
+			}
 			st->ts_at_range_start_plus_one += st->split_start;
 			st->split_start = 0;
+			is_split = GF_TRUE;
 		}
 		//last packet and forced duration
 		if (st->split_end && (gf_list_count(st->pck_queue)==1)) {
-			gf_filter_pck_set_duration(new_pck, st->split_end);
+			if (!dur) {
+				gf_filter_pck_set_duration(new_pck, st->split_end);
+			}
 			st->split_end = 0;
+			is_split = GF_TRUE;
+		}
+		//packet reinserted (not split), adjust duration and store offset in split start
+		if (!st->can_split && !is_split && st->reinsert_single_pck) {
+			dur = gf_filter_pck_get_duration(pck);
+			//only for closed range
+			if (st->range_end_reached_ts) {
+				u64 ndur = st->range_end_reached_ts;
+				ndur -= st->ts_at_range_start_plus_one-1;
+				if (ndur && (ndur < dur))
+					gf_filter_pck_set_duration(new_pck, (u32) ndur);
+				st->split_start = (u32) ndur;
+			}
 		}
 
 		gf_filter_pck_send(new_pck);
+
 	} else {
 		gf_filter_pck_forward(pck, st->opid);
 	}
 
+
 	reframer_drop_packet(ctx, st, pck, pck_is_ref);
 	st->nb_frames++;
-	return GF_TRUE;
-}
-
-static Bool reframer_init_timing(GF_Filter *filter, GF_ReframerCtx *ctx)
-{
-	u32 i, count = gf_filter_get_ipid_count(filter);
-	u64 min_dts_plus_one = 0;
-	u32 pid_scale=0;
-	for (i=0; i<count; i++) {
-		u64 ts;
-		GF_FilterPacket *pck;
-		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
-		RTStream *st = ipid ? gf_filter_pid_get_udta(ipid) : NULL;
-		if (!st) continue;
-		
-		pck = gf_filter_pid_get_packet(ipid);
-		if (!pck) {
-			//not ready yet
-			if (st->is_playing && !gf_filter_pid_is_eos(ipid))
-				return GF_FALSE;
-			//not playing or eos
-			continue;
-		}
-		ts = gf_filter_pck_get_dts(pck);
-		ts += st->tk_delay;
 
-		if (!min_dts_plus_one) {
-			min_dts_plus_one = 1 + ts;
-			pid_scale = st->timescale;
-		} else if (ts * pid_scale < (min_dts_plus_one-1) * st->timescale) {
-			min_dts_plus_one = 1 + ts;
-			pid_scale = st->timescale;
+	if (st->stream_type==GF_STREAM_VISUAL) {
+		if (st->nb_frames > ctx->nb_video_frames_since_start) {
+			ctx->nb_video_frames_since_start = st->nb_frames;
 		}
 	}
-	for (i=0; i<count; i++) {
-		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
-		RTStream *st = ipid ? gf_filter_pid_get_udta(ipid) : NULL;
-		if (!st) continue;
-
-		if (!pid_scale) pid_scale = st->timescale;
 
-		st->cts_init = min_dts_plus_one-1;
-		if (st->timescale != pid_scale) {
-			st->cts_init *= st->timescale;
-			st->cts_init /= pid_scale;
-		}
-	}
-	ctx->timing_initialized = GF_TRUE;
 	return GF_TRUE;
 }
 
-static u32 reframer_check_pck_range(GF_ReframerCtx *ctx, RTStream *st, u64 ts, u32 dur, u32 frame_idx)
+static u32 reframer_check_pck_range(GF_ReframerCtx *ctx, RTStream *st, u64 ts, u32 dur, u32 frame_idx, u32 *nb_audio_samples_to_keep)
 {
 	if (ctx->start_frame_idx_plus_one) {
 		//frame not after our range start
@@ -750,12 +1024,41 @@
 		Bool before = GF_FALSE;
 		Bool after = GF_FALSE;
 
-		//ts not after our range start
-		if ((s64) (ts * ctx->cur_start.den) < ctx->cur_start.num * st->timescale) {
+		//check ts not after our range start:
+		//if round_seek mode, check TS+dur is less than or equal to desired start, and we will notify the duration of data to skip from the packet
+		//otherwise, check TS is strictly less than desired start
+		if (st->seek_mode) {
+			if (gf_timestamp_less_or_equal(ts+dur, st->timescale, ctx->cur_start.num, ctx->cur_start.den)) {
+				before = GF_TRUE;
+				if ((st->stream_type==GF_STREAM_AUDIO) && st->ts_sub) {
+					if (gf_timestamp_greater(ts+st->ts_sub, st->timescale, ctx->cur_start.num, ctx->cur_start.den)) {
+						before = GF_FALSE;
+					}
+				}
+			}
+		}
+		else if (gf_timestamp_less(ts, st->timescale, ctx->cur_start.num, ctx->cur_start.den)) {
 			before = GF_TRUE;
+			if (st->abps && gf_timestamp_greater(ts+dur, st->timescale, ctx->cur_start.num, ctx->cur_start.den)) {
+				u64 nb_samp = gf_timestamp_rescale(ctx->cur_start.num, ctx->cur_start.den, st->timescale) - ts;
+				if (st->timescale != st->sample_rate) {
+					nb_samp = gf_timestamp_rescale(nb_samp, st->timescale, st->sample_rate);
+				}
+				*nb_audio_samples_to_keep = (u32) nb_samp;
+				before = GF_FALSE;
+			}
 		}
-		//closed range, check
-		if ((ctx->range_type!=RANGE_OPEN) && ((s64) ((ts+dur) * ctx->cur_end.den) >= ctx->cur_end.num * st->timescale)) {
+		//consider after if time+duration is STRICTLY greater than cut point
+		if ((ctx->range_type!=RANGE_OPEN) && gf_timestamp_greater(ts+dur, st->timescale, ctx->cur_end.num, ctx->cur_end.den)) {
+			if ((st->abps || st->seek_mode )
+				&& gf_timestamp_less(ts, st->timescale, ctx->cur_end.num, ctx->cur_end.den)
+			) {
+				u64 nb_samp = gf_timestamp_rescale(ctx->cur_end.num, ctx->cur_end.den, st->timescale) - ts;
+				if (st->abps && (st->timescale != st->sample_rate)) {
+					nb_samp = gf_timestamp_rescale(nb_samp, st->timescale, st->sample_rate);
+				}
+				*nb_audio_samples_to_keep = (u32)nb_samp;
+			}
 			after = GF_TRUE;
 		}
 		if (before) {
@@ -765,7 +1068,8 @@
 			else
 				return 2;
 		}
-		if (after) return 2;
+		if (after)
+			return 2;
 		return 1;
 	}
 	return 0;
@@ -777,7 +1081,7 @@
 	for (i=0; i<count; i++) {
 		RTStream *st = gf_list_get(ctx->streams, i);
 		u64 ts_rescale = ts;
-		if (st->resinsert_single_pck)
+		if (st->reinsert_single_pck)
 			continue;
 
 		if (st->timescale != timescale) {
@@ -800,6 +1104,36 @@
 	}
 }
 
+//#define DEBUG_RF_MEM_USAGE
+
+#ifdef DEBUG_RF_MEM_USAGE
+static void reframer_dump_mem(GF_ReframerCtx *ctx, char *status)
+{
+	u32 i, count = gf_list_count(ctx->streams);
+	u32 mem_pck = 0;
+	u64 mem_size = 0;
+	u32 mem_saps = 0;
+
+	//check all streams have reached min ts
+	for (i=0; i<count; i++) {
+		u32 j, nb_pck;
+		RTStream *st = gf_list_get(ctx->streams, i);
+		nb_pck = gf_list_count(st->pck_queue);
+
+		for (j=0; j<nb_pck; j++) {
+			u32 size;
+			GF_FilterPacket *pck = gf_list_get(st->pck_queue, j);
+			gf_filter_pck_get_data(pck, &size);
+			mem_size += size;
+			if (gf_filter_pck_get_sap(pck)) mem_saps++;
+			mem_pck++;
+		}
+	}
+	fprintf(stderr, "%s, mem state: %d pck "LLU" KB %d saps\n", status, mem_pck, mem_size/1000, mem_saps);
+}
+#endif
+
+
 static void check_gop_split(GF_ReframerCtx *ctx)
 {
 	u32 i, count = gf_list_count(ctx->streams);
@@ -813,9 +1147,13 @@
 		u32 nb_eos = 0;
 		Bool has_empty_streams = GF_FALSE;
 		Bool wait_for_sap = GF_FALSE;
+		Bool size_split = (ctx->extract_mode==EXTRACT_SIZE) ? GF_TRUE : GF_FALSE;
+
+		ctx->flush_max_ts = 0;
 		for (i=0; i<count; i++) {
 			u32 j, nb_pck, nb_sap;
 			u64 last_sap_ts=0;
+			u64 before_last_sap_ts=0;
 			RTStream *st = gf_list_get(ctx->streams, i);
 			nb_pck = gf_list_count(st->pck_queue);
 			nb_sap = 0;
@@ -829,8 +1167,14 @@
 
 			for (j=0; j<nb_pck; j++) {
 				u64 ts;
-				GF_FilterPacket *pck = gf_list_get(st->pck_queue, j);
-				if (!ctx->raw && !gf_filter_pck_get_sap(pck) ) {
+				GF_FilterPacket *pck;
+				//size split, reverse walk the packet list
+				if (size_split) {
+					pck = gf_list_get(st->pck_queue, nb_pck - j - 1);
+				} else {
+					pck = gf_list_get(st->pck_queue, j);
+				}
+				if (!st->is_raw && !gf_filter_pck_get_sap(pck) ) {
 					continue;
 				}
 				ts = gf_filter_pck_get_dts(pck);
@@ -839,29 +1183,52 @@
 				ts += st->tk_delay;
 
 				nb_sap++;
-				if (nb_sap <= 1 + ctx->gop_depth) {
-					continue;
+				//size split, get the last and before last SAP times
+				if (size_split) {
+					if (nb_sap == 1) {
+						last_sap_ts = ts;
+					}
+					else if (nb_sap == 2) {
+						before_last_sap_ts = ts;
+						break;
+					}
+				}
+				//regular split, get the second SAP time
+				else {
+					if (nb_sap <= 1) {
+						continue;
+					}
+					last_sap_ts = ts;
+					break;
 				}
-
-				last_sap_ts = ts;
-				break;
 			}
+			//size split, if only one SAP in queue, don't take any decision yet
+			if (size_split && !before_last_sap_ts)
+				last_sap_ts = 0;
+
 			//in SAP split, flush as soon as we no longer have 2 consecutive saps
 			if (!last_sap_ts) {
-				if (st->in_eos && !flush_all && !st->resinsert_single_pck) {
+				if (st->in_eos && !flush_all && !st->reinsert_single_pck) {
 					flush_all = GF_TRUE;
 				} else if (!st->all_saps) {
 					wait_for_sap = GF_TRUE;
 				}
 			}
 
+			if (before_last_sap_ts) {
+				if (!ctx->flush_max_ts || gf_timestamp_less(before_last_sap_ts, st->timescale, ctx->flush_max_ts, ctx->flush_max_ts_scale)) {
+					ctx->flush_max_ts = before_last_sap_ts;
+					ctx->flush_max_ts_scale = st->timescale;
+				}
+			}
+
 			if (st->all_saps) {
-				if (!min_ts_a || (last_sap_ts * min_timescale_a < min_ts_a * st->timescale) ) {
+				if (!min_ts_a || gf_timestamp_less(last_sap_ts, st->timescale, min_ts_a, min_timescale_a) ) {
 					min_ts_a = last_sap_ts;
 					min_timescale_a = st->timescale;
 				}
 			} else {
-				if (!min_ts || (last_sap_ts * min_timescale < min_ts * st->timescale) ) {
+				if (!min_ts || gf_timestamp_less(last_sap_ts, st->timescale, min_ts, min_timescale) ) {
 					min_ts = last_sap_ts;
 					min_timescale = st->timescale;
 				}
@@ -891,13 +1258,14 @@
 					ts = gf_filter_pck_get_cts(pck);
 				ts += st->tk_delay;
 				ts += dur;
-				if (!min_ts || (ts * min_timescale > min_ts * st->timescale) ) {
+				if (!min_ts || gf_timestamp_greater(ts, st->timescale, min_ts, min_timescale) ) {
 					min_ts = ts;
 					min_timescale = st->timescale;
 				}
 			}
 		}
 
+		ctx->flush_samples = GF_FALSE;
 		if (!min_ts) {
 			//video not ready, need more input
 			if (wait_for_sap)
@@ -921,15 +1289,15 @@
 			GF_FilterPacket *pck;
 			RTStream *st = gf_list_get(ctx->streams, i);
 			if (st->range_start_computed==2) continue;
-			if (st->resinsert_single_pck) continue;
+			if (st->reinsert_single_pck) continue;
 			pck = gf_list_last(st->pck_queue);
-			assert(pck);
+			if (!pck) continue;
 			ts = gf_filter_pck_get_dts(pck);
 			if (ts==GF_FILTER_NO_TS)
 				ts = gf_filter_pck_get_cts(pck);
 			ts += st->tk_delay;
 
-			if (ts * ctx->min_ts_scale < ctx->min_ts_computed * st->timescale) {
+			if (gf_timestamp_less(ts, st->timescale, ctx->min_ts_computed, ctx->min_ts_scale)) {
 				return;
 			}
 		}
@@ -938,7 +1306,7 @@
 	//check condition
 	if (ctx->extract_mode==EXTRACT_SIZE) {
 		u32 nb_stop_at_min_ts = 0;
-		u64 cumulated_size = 0;
+		u64 cumulated_size = ctx->cumulated_size;
 		Bool use_prev = GF_FALSE;
 		u32 nb_eos = 0;
 
@@ -959,7 +1327,9 @@
 					ts = gf_filter_pck_get_cts(pck);
 				ts += st->tk_delay;
 
-				if (ts * ctx->min_ts_scale >= ctx->min_ts_computed * st->timescale) {
+				if ((ctx->prev_min_ts_computed < ctx->min_ts_computed)
+					&& gf_timestamp_greater_or_equal(ts, st->timescale, ctx->min_ts_computed, ctx->min_ts_scale)
+				) {
 					nb_stop_at_min_ts ++;
 					found = GF_TRUE;
 					break;
@@ -967,10 +1337,16 @@
 				gf_filter_pck_get_data(pck, &size);
 				cumulated_size += size;
 			}
+
 			if ((j==nb_pck) && st->in_eos && !found) {
 				nb_eos++;
 			}
 		}
+
+		if ((nb_stop_at_min_ts + nb_eos) < count) {
+			ctx->flush_samples = GF_FALSE;
+		}
+
 		//not done yet (estimated size less than target split)
 		if (
 			(cumulated_size < ctx->split_size)
@@ -980,17 +1356,59 @@
 		) {
 			if ((nb_stop_at_min_ts + nb_eos) == count) {
 				ctx->est_file_size = cumulated_size;
+				//flush everything until prev_min_ts_computed
+				if (ctx->flush_max_ts) {
+#ifdef DEBUG_RF_MEM_USAGE
+					reframer_dump_mem(ctx, "Requesting sample flush");
+#endif
+					ctx->flush_samples = GF_TRUE;
+					//if first flush, setup streams
+					if (!ctx->cumulated_size) {
+						for (i=0; i<count; i++) {
+							u64 ts;
+							RTStream *st = gf_list_get(ctx->streams, i);
+							GF_FilterPacket *pck = gf_list_get(st->pck_queue, 0);
+							st->range_end_reached_ts = 0;
+							st->first_pck_sent = GF_FALSE;
+
+							if (pck) {
+								ts = gf_filter_pck_get_dts(pck);
+								if (ts==GF_FILTER_NO_TS)
+									ts = gf_filter_pck_get_cts(pck);
+								ts += st->tk_delay;
+								st->ts_at_range_start_plus_one = ts + 1;
+							}
+						}
+					}
+				}
 				ctx->prev_min_ts_computed = ctx->min_ts_computed;
 				ctx->prev_min_ts_scale = ctx->min_ts_scale;
 				ctx->min_ts_computed = 0;
 				ctx->min_ts_scale = 0;
-				ctx->gop_depth++;
 			}
 			return;
 		}
 
+		if (ctx->min_ts_computed && (ctx->prev_min_ts_computed == ctx->min_ts_computed)) {
+			//not end of stream, if size still not reached continue
+			if (!nb_eos) {
+				if (cumulated_size < ctx->split_size) {
+					ctx->min_ts_computed = 0;
+					ctx->min_ts_scale = 0;
+					return;
+				}
+			} else if (nb_eos == count) {
+				//end of stream, force final flush
+				ctx->in_range = GF_TRUE;
+				return;
+			} else if (ctx->min_ts_computed == ctx->prev_min_ts_computed) {
+				ctx->in_range = GF_TRUE;
+				return;
+			}
+		}
+
 		//decide which split size we use
-		if (ctx->xround==REFRAME_ROUND_BEFORE) {
+		if (ctx->xround<=REFRAME_ROUND_SEEK) {
 			use_prev = GF_TRUE;
 		} else if (ctx->xround==REFRAME_ROUND_AFTER) {
 			use_prev = GF_FALSE;
@@ -1017,11 +1435,11 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Reframer] split computed using %s estimation of file size ("LLU")\n", use_prev ? "previous" : "current", ctx->est_file_size));
 		ctx->prev_min_ts_computed = 0;
 		ctx->prev_min_ts_scale = 0;
+		ctx->flush_samples = GF_FALSE;
 	}
 
 	//good to go
 	ctx->in_range = GF_TRUE;
-	ctx->gop_depth = 0;
 	for (i=0; i<count; i++) {
 		u64 ts;
 		RTStream *st = gf_list_get(ctx->streams, i);
@@ -1031,6 +1449,10 @@
 			st->range_end_reached_ts /= ctx->min_ts_scale;
 
 		st->range_end_reached_ts += 1;
+
+		if ((ctx->extract_mode==EXTRACT_SIZE) && ctx->cumulated_size)
+			continue;
+
 		st->first_pck_sent = GF_FALSE;
 		if (pck) {
 			ts = gf_filter_pck_get_dts(pck);
@@ -1046,17 +1468,18 @@
 	}
 	ctx->cur_end.num = ctx->min_ts_computed;
 	ctx->cur_end.den = ctx->min_ts_scale;
-
+	ctx->cumulated_size = 0;
 }
 
 
+
 GF_Err reframer_process(GF_Filter *filter)
 {
 	GF_ReframerCtx *ctx = gf_filter_get_udta(filter);
 	u32 i, nb_eos, nb_end_of_range, count = gf_filter_get_ipid_count(filter);
 
-	if (ctx->is_eos) {
-		return GF_EOS;
+	if (ctx->eos_state) {
+		return (ctx->eos_state==2) ? GF_NOT_SUPPORTED : GF_EOS;
 	}
 	if (ctx->rt) {
 		ctx->reschedule_in = 0;
@@ -1069,7 +1492,7 @@
 		- if packet is in range:
 			- queue it (ref &nd detach from pid)
 			- if pck is SAP and first SAP after start and context is not yet marked "in range":
-				- check if we start from this SAP or from previous SAP (possibly before start) according to cround
+				- check if we start from this SAP or from previous SAP (possibly before start) according to xround
 				- and mark stream as "start ready"
 				- if stream is video and xadjust is set, prevent all other stream processing
 		- if packet is out of range
@@ -1095,15 +1518,22 @@
 	*/
 	if (ctx->range_type && (ctx->range_type!=RANGE_DONE)) {
 		u32 nb_start_range_reached = 0;
+		u32 nb_not_playing = 0;
 		Bool check_split = GF_FALSE;
-		//init timing
-		if (!ctx->timing_initialized) {
-			if (!reframer_init_timing(filter, ctx)) return GF_OK;
+		Bool check_sync = GF_TRUE;
+		u32 nb_streams_fetched=0;
+
+		for (i=0; i<count; i++) {
+			GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+			RTStream *st = gf_filter_pid_get_udta(ipid);
+			st->fetch_done = GF_FALSE;
 		}
 
+refetch_streams:
 		//fetch input packets
 		for (i=0; i<count; i++) {
-			u64 ts;
+			u64 ts, check_ts;
+			u32 nb_audio_samples_to_keep = 0;
 			u32 pck_in_range, dur;
 			Bool is_sap;
 			Bool drop_input = GF_TRUE;
@@ -1111,17 +1541,25 @@
 			GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
 			RTStream *st = gf_filter_pid_get_udta(ipid);
 
+			if (st->fetch_done) continue;
+
 			if (!st->is_playing) {
 				nb_start_range_reached++;
+				nb_not_playing++;
+				st->fetch_done = GF_TRUE;
 				continue;
 			}
 
 			if (st->range_start_computed && !ctx->wait_video_range_adjust) {
 				nb_start_range_reached++;
+				st->fetch_done = GF_TRUE;
 				continue;
 			}
 			//if eos is marked we are flushing so don't check range_end
-			if (!ctx->has_seen_eos && st->range_end_reached_ts) continue;
+			if (!ctx->has_seen_eos && st->range_end_reached_ts) {
+				st->fetch_done = GF_TRUE;
+				continue;
+			}
 
 			if (st->split_pck) {
 				pck = st->split_pck;
@@ -1131,13 +1569,13 @@
 			}
 			if (!pck) {
 				if (gf_filter_pid_is_eos(ipid)) {
-					//special case for PIDs with a single packet, we reinsert them at the begining of each extracted range
+					//special case for PIDs with a single packet, we reinsert them at the beginning of each extracted range
 					//this allows dealing with BIFS/OD/JPEG/PNG tracks
-					if (st->resinsert_single_pck) {
+					if (st->reinsert_single_pck) {
 						if (!ctx->in_range && !st->range_start_computed) {
 							st->range_start_computed = 3;
 							if (!gf_list_count(st->pck_queue)) {
-								pck = st->resinsert_single_pck;
+								pck = st->reinsert_single_pck;
 								gf_filter_pck_ref(&pck);
 								gf_list_add(st->pck_queue, pck);
 								if (!ctx->is_range_extraction) {
@@ -1161,25 +1599,60 @@
 						st->range_start_computed = 2;
 						if (ctx->wait_video_range_adjust && ctx->xadjust && st->needs_adjust) {
 							ctx->wait_video_range_adjust = GF_FALSE;
+							ctx->flush_max_ts_scale = 0;
 						}
 					}
+					if (st->range_start_computed) {
+						nb_start_range_reached++;
+					}
 					//force flush in case of extract dur to avoid creating file with only a few samples of one track only
 					if (st->is_playing && (ctx->extract_mode==EXTRACT_DUR)) {
 						ctx->has_seen_eos = GF_TRUE;
-						ctx->in_range = 1;
 					}
 				}
+				st->fetch_done = GF_TRUE;
 				continue;
 			}
-			st->nb_frames_range++;
 
 			ts = gf_filter_pck_get_dts(pck);
 			if (ts==GF_FILTER_NO_TS)
 				ts = gf_filter_pck_get_cts(pck);
 			ts += st->tk_delay;
 
+			if (gf_timestamp_greater(ts, st->timescale, ctx->last_ts, 1000)) {
+				if (check_sync) {
+					if (st->range_start_computed) nb_start_range_reached++;
+					continue;
+				} else {
+					ctx->last_ts = gf_timestamp_rescale(ts, st->timescale, 1000);
+				}
+			} else {
+				st->fetch_done = GF_TRUE;
+			}
+
+			st->nb_frames_range++;
+			//in range extraction we target the presentation time, use CTS and apply delay
+			if (ctx->is_range_extraction) {
+				check_ts = gf_filter_pck_get_cts(pck) + st->tk_delay;
+				if (check_ts > st->ts_sub) check_ts -= st->ts_sub;
+				else check_ts = 0;
+			} else {
+				check_ts = ts;
+			}
+
 			//if nosap is set, consider all packet SAPs
-			is_sap = (ctx->nosap || ctx->raw || gf_filter_pck_get_sap(pck)) ? GF_TRUE : GF_FALSE;
+			if (ctx->nosap || st->is_raw) {
+				is_sap = GF_TRUE;
+			} else {
+				GF_FilterSAPType sap = gf_filter_pck_get_sap(pck);
+				if ((sap==GF_FILTER_SAP_1) || (sap==GF_FILTER_SAP_2) || (sap==GF_FILTER_SAP_3)) {
+					is_sap = GF_TRUE;
+				} else if ((st->stream_type==GF_STREAM_AUDIO) && (sap==GF_FILTER_SAP_4)) {
+					is_sap = GF_TRUE;
+				} else {
+					is_sap = GF_FALSE;
+				}
+			}
 
 			if (!is_sap) {
 				if (st->all_saps) {
@@ -1202,29 +1675,42 @@
 
 			//SAP or size split, push packet in queue and ask for gop split check
 			if (!ctx->is_range_extraction) {
+				if (gf_filter_pck_is_blocking_ref(pck)) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Reframer] cannot perform size/duration extraction with an input using blocking packet references (PID %s)\n\tCheck filter `%s` settings to allow for data copy\n", gf_filter_pid_get_name(st->ipid), gf_filter_pid_get_source_filter_name(st->ipid) ));
+					ctx->eos_state = 2;
+					return GF_NOT_SUPPORTED;
+				}
 				//add packet
 				gf_filter_pck_ref(&pck);
 				gf_filter_pid_drop_packet(st->ipid);
 				gf_list_add(st->pck_queue, pck);
 				check_split = GF_TRUE;
-				//keep ref to first packet until we see a second one
-				if (st->nb_frames_range==1) {
+				//keep ref to first packet until we see a second one, except if blocking ref
+				//if blocking ref we assume the source is sending enough packets and we won't reinsert any
+				if (!gf_filter_pck_is_blocking_ref(pck) && (st->nb_frames_range==1)) {
 					gf_filter_pck_ref(&pck);
-					st->resinsert_single_pck = pck;
-				} else if (st->resinsert_single_pck) {
-					gf_filter_pck_unref(st->resinsert_single_pck);
-					st->resinsert_single_pck = NULL;
+					st->reinsert_single_pck = pck;
+				} else if (st->reinsert_single_pck) {
+					gf_filter_pck_unref(st->reinsert_single_pck);
+					st->reinsert_single_pck = NULL;
 				}
+				nb_streams_fetched++;
 				continue;
 			}
 			dur = gf_filter_pck_get_duration(pck);
 
 			//dur split or range extraction but we wait for video end range to be adjusted, don't enqueue packet
-			if (ctx->wait_video_range_adjust && !st->needs_adjust)
-				continue;
+			if (ctx->wait_video_range_adjust && !st->needs_adjust) {
+				if (!ctx->flush_max_ts_scale
+					|| gf_timestamp_greater_or_equal(ts, st->timescale, ctx->flush_max_ts, ctx->flush_max_ts_scale)
+				) {
+					if (st->range_start_computed) nb_start_range_reached++;
+					continue;
+				}
+			}
 
 			//check if packet is in our range
-			pck_in_range = reframer_check_pck_range(ctx, st, ts, dur, st->nb_frames_range);
+			pck_in_range = reframer_check_pck_range(ctx, st, check_ts, dur, st->nb_frames_range, &nb_audio_samples_to_keep);
 
 
 			//SAP packet, decide if we cut here or at previous SAP
@@ -1237,56 +1723,98 @@
 					reframer_purge_queues(ctx, ts, st->timescale);
 				}
 
-				//packet in range and global context not yet in range, mark which SAP will be the begining of our range
+				//packet in range and global context not yet in range, mark which SAP will be the beginning of our range
 				if (!ctx->in_range && (pck_in_range==1)) {
-					if (ctx->xround==REFRAME_ROUND_CLOSEST) {
-						Bool cur_closer = GF_FALSE;
-						//check which frame is closer
-						if (ctx->start_frame_idx_plus_one) {
-							s64 diff_prev = ctx->start_frame_idx_plus_one-1;
-							s64 diff_cur = ctx->start_frame_idx_plus_one-1;
-							diff_prev -= st->prev_sap_frame_idx;
-							diff_cur -= st->nb_frames_range;
-							if (ABS(diff_cur) < ABS(diff_prev)) cur_closer = GF_TRUE;
-						} else {
-							s64 diff_prev, diff_cur;
-							u64 start_range_ts = ctx->cur_start.num;
-							start_range_ts *= st->timescale;
-							start_range_ts /= ctx->cur_start.den;
-
-							diff_prev = diff_cur = start_range_ts;
-							diff_prev -= st->prev_sap_ts;
-							diff_cur -= ts;
-							if (ABS(diff_cur) < ABS(diff_prev)) cur_closer = GF_TRUE;
+					if (!st->range_start_computed) {
+						u32 ts_adj = nb_audio_samples_to_keep;
+						if (ts_adj && (st->sample_rate!=st->timescale)) {
+							ts_adj *= st->timescale;
+							ts_adj /= st->sample_rate;
 						}
-						if (cur_closer) {
-							st->sap_ts_plus_one = ts+1;
+
+						if (ctx->xround==REFRAME_ROUND_CLOSEST) {
+							Bool cur_closer = GF_FALSE;
+							//check which frame is closer
+							if (ctx->start_frame_idx_plus_one) {
+								s64 diff_prev = ctx->start_frame_idx_plus_one-1;
+								s64 diff_cur = ctx->start_frame_idx_plus_one-1;
+								diff_prev -= st->prev_sap_frame_idx;
+								diff_cur -= st->nb_frames_range;
+								if (ABS(diff_cur) < ABS(diff_prev)) cur_closer = GF_TRUE;
+							} else {
+								s64 diff_prev, diff_cur;
+								u64 start_range_ts = gf_timestamp_rescale(ctx->cur_start.num, ctx->cur_start.den, st->timescale);
+
+								diff_prev = diff_cur = start_range_ts;
+								diff_prev -= st->prev_sap_ts;
+								diff_cur -= ts+ts_adj;
+								if (ABS(diff_cur) < ABS(diff_prev)) cur_closer = GF_TRUE;
+							}
+							if (cur_closer) {
+								st->sap_ts_plus_one = ts+ts_adj+1;
+								st->nb_frames_until_start = 0;
+							} else {
+								st->sap_ts_plus_one = st->prev_sap_ts + 1;
+							}
+						} else if (ctx->xround<=REFRAME_ROUND_SEEK) {
+							st->sap_ts_plus_one = st->prev_sap_ts+1;
+
+							if ((ctx->extract_mode==EXTRACT_RANGE) && !ctx->start_frame_idx_plus_one) {
+								u64 start_range_ts = gf_timestamp_rescale(ctx->cur_start.num, ctx->cur_start.den, st->timescale);
+								if (ts + ts_adj == start_range_ts) {
+									st->sap_ts_plus_one = ts+ts_adj+1;
+									st->nb_frames_until_start = 0;
+								}
+							}
 						} else {
-							st->sap_ts_plus_one = st->prev_sap_ts + 1;
+							st->sap_ts_plus_one = ts+ts_adj+1;
+							st->nb_frames_until_start = 0;
 						}
-					} else if (ctx->xround==REFRAME_ROUND_BEFORE) {
-						st->sap_ts_plus_one = st->prev_sap_ts+1;
-					} else {
-						st->sap_ts_plus_one = ts+1;
+						st->range_start_computed = 1;
 					}
-					st->range_start_computed = 1;
 					nb_start_range_reached++;
 				}
 				//remember prev sap time
+				ctx->flush_max_ts_scale = 0;
 				if (pck_in_range!=2) {
+					u64 before_prev_sap_ts = st->prev_sap_ts;
 					st->prev_sap_ts = ts;
 					st->prev_sap_frame_idx = st->nb_frames_range;
+					if (!st->range_start_computed && (ctx->xround==REFRAME_ROUND_SEEK) )
+						st->nb_frames_until_start = 1;
+
+					if (ctx->wait_video_range_adjust && before_prev_sap_ts && !st->all_saps) {
+						ctx->flush_max_ts = before_prev_sap_ts;
+						ctx->flush_max_ts_scale = st->timescale;
+					}
 				}
-				//video stream start and xadjust set, prevent all other streams from being processed until wee determine the end of the video range
+				//video stream start and xadjust set, prevent all other streams from being processed until we determine the end of the video range
 				//and re-enable other streams processing
-				if (!ctx->wait_video_range_adjust && ctx->xadjust && st->needs_adjust) {
+				if (!ctx->wait_video_range_adjust && ctx->xadjust && st->needs_adjust && !st->all_saps) {
 					ctx->wait_video_range_adjust = GF_TRUE;
 				}
+			} else if (st->range_start_computed) {
+				nb_start_range_reached++;
 			}
 
 			if ((ctx->extract_mode==EXTRACT_DUR) && ctx->has_seen_eos && (pck_in_range==2))
 				pck_in_range = 1;
 
+			if (!pck_in_range && st->nb_frames_until_start)
+				st->nb_frames_until_start++;
+
+			//video stream and not adjusting to next SAP:, packet was not sap, probe for P/B reference frame :
+			//we include this frame in the output but mark it as skip
+			if (ctx->probe_ref && !ctx->xadjust && (pck_in_range==2) && (st->stream_type==GF_STREAM_VISUAL)) {
+				if (!st->probe_ref_frame_ts) {
+					pck_in_range = 1;
+					st->probe_ref_frame_ts = ts+1;
+				} else {
+					ts = st->probe_ref_frame_ts - 1;
+					st->probe_ref_frame_ts = 0;
+				}
+			}
+
 			//after range: whether SAP or not, mark end of range reached
 			if (pck_in_range==2) {
 				if (!ctx->xadjust || is_sap) {
@@ -1304,7 +1832,7 @@
 
 					//time-based extraction or dur split, try to clone packet
 					if (st->can_split && !ctx->start_frame_idx_plus_one) {
-						if ((s64) (ts * ctx->cur_end.den) < ctx->cur_end.num * st->timescale) {
+						if (gf_timestamp_less(ts, st->timescale, ctx->cur_end.num, ctx->cur_end.den)) {
 							//force enqueing this packet
 							enqueue = GF_TRUE;
 							st->split_end = (u32) ( (ctx->cur_end.num * st->timescale) / ctx->cur_end.den - ts);
@@ -1314,12 +1842,20 @@
 							st->split_pck = pck;
 						}
 					}
+					else if (nb_audio_samples_to_keep && !ctx->start_frame_idx_plus_one) {
+						enqueue = GF_TRUE;
+						gf_filter_pck_ref(&pck);
+						st->split_pck = pck;
+						st->audio_samples_to_keep = nb_audio_samples_to_keep;
+					}
+
 					//video stream end detected and xadjust set, adjust cur_end to match the video stream end range
 					//and re-enable other streams processing
 					if (ctx->wait_video_range_adjust && ctx->xadjust && st->needs_adjust) {
 						ctx->cur_end.num = st->range_end_reached_ts-1;
 						ctx->cur_end.den = st->timescale;
 						ctx->wait_video_range_adjust = GF_FALSE;
+						ctx->flush_max_ts_scale = 0;
 					}
 
 					//do NOT enqueue packet
@@ -1327,19 +1863,28 @@
 						break;
 				}
 			}
+			nb_streams_fetched++;
+
+			//add packet unless blocking ref
+			if (gf_filter_pck_is_blocking_ref(pck) && !pck_in_range) {
+				st->use_blocking_refs = GF_TRUE;
+				if (drop_input)
+					gf_filter_pid_drop_packet(st->ipid);
+				continue;
+			}
 
-			//add packet
 			gf_filter_pck_ref(&pck);
 			gf_list_add(st->pck_queue, pck);
 			if (drop_input) {
 				gf_filter_pid_drop_packet(st->ipid);
-				//keep ref to first packet until we see a second one
-				if (st->nb_frames_range==1) {
+				//keep ref to first packet until we see a second one, except if blocking ref
+				//if blocking ref we assume the source is sending enough packets and we won't reinsert any
+				if (!gf_filter_pck_is_blocking_ref(pck) && (st->nb_frames_range==1)) {
 					gf_filter_pck_ref(&pck);
-					st->resinsert_single_pck = pck;
-				} else if (st->resinsert_single_pck) {
-					gf_filter_pck_unref(st->resinsert_single_pck);
-					st->resinsert_single_pck = NULL;
+					st->reinsert_single_pck = pck;
+				} else if (st->reinsert_single_pck) {
+					gf_filter_pck_unref(st->reinsert_single_pck);
+					st->reinsert_single_pck = NULL;
 				}
 			} else {
 				assert(pck == st->split_pck);
@@ -1348,6 +1893,13 @@
 			}
 		}
 
+		if (check_sync && !nb_streams_fetched && (!nb_start_range_reached || (nb_start_range_reached<count))) {
+			check_sync = GF_FALSE;
+			nb_start_range_reached=0;
+			goto refetch_streams;
+		}
+
+
 		if (check_split) {
 			check_gop_split(ctx);
 		}
@@ -1355,6 +1907,7 @@
 		//all streams reached the start range, compute min ts
 		if (!ctx->in_range
 			&& (nb_start_range_reached==count)
+			&& (nb_not_playing<count)
 			&& ctx->is_range_extraction
 		) {
 			u64 min_ts = 0;
@@ -1378,18 +1931,18 @@
 					continue;
 
 				if (st->can_split) {
-					if (!min_ts_split || ((st->sap_ts_plus_one-1) * min_timescale_split < min_ts_split * st->timescale) ) {
+					if (!min_ts_split || gf_timestamp_less(st->sap_ts_plus_one-1, st->timescale, min_ts_split, min_timescale_split) ) {
 						min_ts_split = st->sap_ts_plus_one;
 						min_timescale_split = st->timescale;
 					}
 				}
 				else if (st->all_saps) {
-					if (!min_ts_a || ((st->sap_ts_plus_one-1) * min_timescale_a < min_ts_a * st->timescale) ) {
+					if (!min_ts_a || gf_timestamp_less(st->sap_ts_plus_one-1, st->timescale, min_ts_a, min_timescale_a) ) {
 						min_ts_a = st->sap_ts_plus_one;
 						min_timescale_a = st->timescale;
 					}
 				} else {
-					if (!min_ts || ((st->sap_ts_plus_one-1) * min_timescale < min_ts * st->timescale) ) {
+					if (!min_ts || gf_timestamp_less(st->sap_ts_plus_one-1, st->timescale, min_ts, min_timescale) ) {
 						min_ts = st->sap_ts_plus_one;
 						min_timescale = st->timescale;
 					}
@@ -1413,41 +1966,73 @@
 				if (ctx->extract_mode==EXTRACT_RANGE) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] All streams in end of stream for desired start range "LLD"/"LLU"\n", ctx->cur_start.num, ctx->cur_start.den));
 				}
-				ctx->is_eos = GF_TRUE;
+				ctx->eos_state = 1;
 			} else {
 				min_ts -= 1;
+
+				if ((ctx->extract_mode==EXTRACT_RANGE) && (ctx->xround!=REFRAME_ROUND_SEEK)) {
+					ctx->cur_start.num = min_ts;
+					ctx->cur_start.den = min_timescale;
+				}
 			}
 			//purge everything before min ts
 			for (i=0; i<count; i++) {
+				Bool start_found = GF_FALSE;
 				GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
 				RTStream *st = gf_filter_pid_get_udta(ipid);
+				if (!st->is_playing) continue;
 
 				while (gf_list_count(st->pck_queue)) {
 					GF_FilterPacket *pck = gf_list_get(st->pck_queue, 0);
 					if (!purge_all) {
 						u32 is_start = 0;
-						u64 ts, ots;
-						u64 dur;
+						u64 ts, ots, check_ts;
+						u64 dur, odur;
+						Bool check_priming = GF_FALSE;
 						ts = gf_filter_pck_get_dts(pck);
 						if (ts==GF_FILTER_NO_TS)
 							ts = gf_filter_pck_get_cts(pck);
 						ts += st->tk_delay;
-						dur = (u64) gf_filter_pck_get_duration(pck);
+						odur = dur = (u64) gf_filter_pck_get_duration(pck);
 						if (!dur) dur=1;
-						ots = ts;
+
+						check_ts = ots = ts;
+						if (st->seek_mode && (st->stream_type==GF_STREAM_AUDIO) && st->ts_sub) {
+							check_priming = GF_TRUE;
+							check_ts += st->ts_sub;
+						}
+
 						if (min_timescale != st->timescale) {
-							ts *= min_timescale;
-							ts /= st->timescale;
-							dur *= min_timescale;
-							dur /= st->timescale;
+							ts = gf_timestamp_rescale(ts, st->timescale, min_timescale);
+							if (check_priming) {
+								check_ts = gf_timestamp_rescale(check_ts, st->timescale, min_timescale);
+							}
+							dur = gf_timestamp_rescale(dur, st->timescale, min_timescale);
 						}
 
 						if (ts >= min_ts) {
 							is_start = 1;
 						}
-						else if (st->can_split && (ts+dur >= min_ts)) {
+						else if (st->can_split && (ts+dur > min_ts)) {
 							is_start = 2;
 						}
+						else if (check_priming && (check_ts >= min_ts)) {
+							is_start = 1;
+						}
+						else if ((st->abps || st->seek_mode) && (ts+dur >= min_ts) && (st->stream_type==GF_STREAM_AUDIO)) {
+							u64 diff;
+							diff = gf_timestamp_rescale(min_ts, min_timescale, st->timescale);
+							diff -= ots;
+							if (st->abps) {
+								if (st->sample_rate != st->timescale) {
+									diff = gf_timestamp_rescale(diff, st->timescale, st->sample_rate);
+								}
+							}
+							if (diff < odur) {
+								st->audio_samples_to_keep = (u32) diff;
+								is_start = 1;
+							}
+						}
 						else if (st->range_start_computed==3) {
 							is_start = 1;
 						}
@@ -1456,17 +2041,16 @@
 							//remember TS at range start
 							s64 orig = min_ts;
 							if (st->timescale != min_timescale) {
-								orig *= st->timescale;
-								orig /= min_timescale;
+								orig = gf_timestamp_rescale(orig, min_timescale, st->timescale);
 							}
 							st->split_start = 0;
 							if (is_start==2) {
 								st->split_start = (u32) (min_ts - ts);
 								if (min_timescale != st->timescale) {
-									st->split_start *= st->timescale;
-									st->split_start /= min_timescale;
+									st->split_start = (u32) gf_timestamp_rescale(st->split_start, min_timescale, st->timescale);
 								}
 							}
+
 							st->ts_at_range_start_plus_one = ots + 1;
 
 							if ((st->range_start_computed==1)
@@ -1474,9 +2058,10 @@
 								&& ctx->splitrange
 								&& (ctx->cur_range_idx>1)
 							) {
-								s32 delay = (s32) ((s64) ots - (s64) orig);
-								gf_filter_pid_set_property(st->opid, GF_PROP_PID_DELAY, &PROP_SINT(delay) );
+								s64 delay = (s64) ots - (s64) orig;
+								gf_filter_pid_set_property(st->opid, GF_PROP_PID_DELAY, &PROP_LONGSINT(delay) );
 							}
+							start_found = GF_TRUE;
 							break;
 						}
 					}
@@ -1484,8 +2069,23 @@
 					gf_filter_pck_unref(pck);
 					st->nb_frames++;
 				}
+				//we couldn't find a sample with dts >= to our min_ts - this happens when the min_ts
+				//is located a few seconds AFTER the target split point
+				//so force stream to reevaluate and enqueue more packets
+				if (!start_found && !st->use_blocking_refs) {
+					st->range_start_computed = 0;
+					return GF_OK;
+				}
+			}
+
+			//OK every stream has now packets starting at the min_ts, ready to go
+			ctx->nb_video_frames_since_start = 0;
+			for (i=0; i<count; i++) {
+				GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+				RTStream *st = gf_filter_pid_get_udta(ipid);
 				//reset start range computed
 				st->range_start_computed = 0;
+
 				if (ctx->extract_mode==EXTRACT_DUR) {
 					st->first_pck_sent = GF_FALSE;
 				} else {
@@ -1496,7 +2096,17 @@
 					gf_filter_pid_get_packet(st->ipid);
 					gf_filter_pid_set_eos(st->opid);
 				}
+
+				if ((st->stream_type==GF_STREAM_VISUAL) && (st->nb_frames > ctx->nb_video_frames_since_start)) {
+					ctx->nb_video_frames_since_start = st->nb_frames;
+					if (st->nb_frames_until_start) {
+						ctx->nb_video_frames_since_start += st->nb_frames_until_start-1;
+						st->nb_frames_until_start = 0;
+					}
+				}
 			}
+			ctx->nb_video_frames_since_start_at_range_start = ctx->nb_video_frames_since_start;
+
 			if (purge_all) {
 				if (ctx->extract_mode!=EXTRACT_RANGE)
 					return GF_EOS;
@@ -1506,11 +2116,18 @@
 
 			//we are in the range
 			ctx->in_range = GF_TRUE;
+#ifdef DEBUG_RF_MEM_USAGE
+			reframer_dump_mem(ctx, "Starting new range");
+#endif
 		}
-		if (!ctx->in_range)
+		if (!ctx->in_range && !ctx->flush_samples)
 			return GF_OK;
 	}
 
+#ifdef DEBUG_RF_MEM_USAGE
+	reframer_dump_mem(ctx, "Processing range");
+#endif
+
 	nb_eos = 0;
 	nb_end_of_range = 0;
 	for (i=0; i<count; i++) {
@@ -1538,7 +2155,6 @@
 						break;
 					}
 				}
-
 			} else {
 				pck = gf_filter_pid_get_packet(ipid);
 			}
@@ -1563,6 +2179,23 @@
 				}
 				break;
 			}
+			//size split, flushing
+			if (ctx->flush_samples) {
+				u32 size;
+				u64 cts;
+
+
+				cts = gf_filter_pck_get_dts(pck);
+				if (cts==GF_FILTER_NO_TS)
+					cts = gf_filter_pck_get_cts(pck);
+				cts += st->tk_delay;
+
+				if (gf_timestamp_greater_or_equal(cts, st->timescale, ctx->flush_max_ts, ctx->flush_max_ts_scale)) {
+					break;
+				}
+				gf_filter_pck_get_data(pck, &size);
+				ctx->cumulated_size += size;
+			}
 
 			if (ctx->refs) {
 				u8 deps = gf_filter_pck_get_dependency_flags(pck);
@@ -1618,16 +2251,15 @@
 			RTStream *st = gf_filter_pid_get_udta(ipid);
 			//we reinsert the same PCK, so the ts_at_range_start_plus is always the packet cts
 			//we therefore need to compute the ts at and as the target end time minus the target start time
-			if (st->resinsert_single_pck) {
-				u64 start = ctx->cur_start.num;
-				start *= st->timescale;
-				start /= ctx->cur_start.den;
-				st->ts_at_range_end = ctx->cur_end.num;
-				st->ts_at_range_end *= st->timescale;
-				st->ts_at_range_end /= ctx->cur_end.den;
-				st->ts_at_range_end -= start;
+			if (st->reinsert_single_pck && ctx->cur_start.den) {
+				u64 start = gf_timestamp_rescale(ctx->cur_start.num, ctx->cur_start.den, st->timescale);
+				//closed range, compute TS at range end
+				if (ctx->cur_end.num && ctx->cur_end.den) {
+					st->ts_at_range_end = gf_timestamp_rescale(ctx->cur_end.num, ctx->cur_end.den, st->timescale);
+					st->ts_at_range_end -= start;
+				}
 			} else {
-				st->ts_at_range_end = (st->range_end_reached_ts - 1) - (st->ts_at_range_start_plus_one - 1);
+				st->ts_at_range_end += (st->range_end_reached_ts - 1) - (st->ts_at_range_start_plus_one - 1);
 			}
 			st->ts_at_range_start_plus_one = 0;
 			st->range_end_reached_ts = 0;
@@ -1653,41 +2285,108 @@
 	if (nb_eos==count) return GF_EOS;
 
 	if (ctx->rt) {
-		if (ctx->reschedule_in>2000) {
-			gf_filter_ask_rt_reschedule(filter, (u32) (ctx->reschedule_in - 2000));
+		//while technically correct this increases the CPU load by shuffling the task around and querying gf_sys_clock_high_res too often
+		//needs more investigation
+		//using a simple callback every RT_PRECISION_US is a good workaround
+#if 0
+		u32 rsus = 0;
+		if (ctx->reschedule_in > RT_PRECISION_US) {
+			rsus = (u32) (ctx->reschedule_in - RT_PRECISION_US);
+			if (rsus<RT_PRECISION_US) rsus = RT_PRECISION_US;
 		} else if (ctx->reschedule_in>1000) {
-			gf_filter_ask_rt_reschedule(filter, (u32) (ctx->reschedule_in / 2));
+			rsus = (u32) (ctx->reschedule_in / 2);
+		}
+		if (rsus) {
+			gf_filter_ask_rt_reschedule(filter, rsus);
 		}
+#else
+		if (ctx->reschedule_in) {
+			gf_filter_ask_rt_reschedule(filter, RT_PRECISION_US);
+		}
+#endif
 	}
 
 	return GF_OK;
 }
 
-static const GF_FilterCapability ReframerRAWCaps[] =
+static const GF_FilterCapability ReframerCaps_RAW_AV[] =
 {
+	//raw audio and video only
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
-	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW)
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	//no restriction for media other than audio and video - cf regular caps for comments
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT_LOADED_FILTER, GF_PROP_PID_CODECID, GF_CODECID_RAW)
+};
+
+
+static const GF_FilterCapability ReframerCaps_RAW_A[] =
+{
+	//raw audio only
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	//no restriction for media other than audio - cf regular caps for comments
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT_LOADED_FILTER, GF_PROP_PID_CODECID, GF_CODECID_RAW)
+};
+
+
+static const GF_FilterCapability ReframerCaps_RAW_V[] =
+{
+	//raw video only
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	//no restriction for media other than video - cf regular caps for comments
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_IN_OUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT_LOADED_FILTER, GF_PROP_PID_CODECID, GF_CODECID_RAW)
 };
 
 static GF_Err reframer_initialize(GF_Filter *filter)
 {
+	GF_Err e;
 	GF_ReframerCtx *ctx = gf_filter_get_udta(filter);
 
 	ctx->streams = gf_list_new();
 	ctx->seekable = GF_TRUE;
-	reframer_load_range(ctx);
-
-	if (ctx->raw) {
-		gf_filter_override_caps(filter, ReframerRAWCaps, sizeof(ReframerRAWCaps) / sizeof(GF_FilterCapability) );
+	if ((ctx->xs.nb_items>1) && (ctx->xround==REFRAME_ROUND_SEEK)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Reframer] `xround=seek` can only be used for single range extraction\n"));
+		return GF_BAD_PARAM;
 	}
 
-#ifdef GPAC_ENABLE_COVERAGE
-	if (gf_sys_is_cov_mode()) {
-		reframer_update_ts_shift(ctx, -1, 1000);
+
+	reframer_load_range(ctx);
+
+	switch (ctx->raw) {
+	case RAW_AV:
+		e = gf_filter_override_caps(filter, ReframerCaps_RAW_AV, GF_ARRAY_LENGTH(ReframerCaps_RAW_AV));
+		break;
+	case RAW_VIDEO:
+		e = gf_filter_override_caps(filter, ReframerCaps_RAW_V, GF_ARRAY_LENGTH(ReframerCaps_RAW_V));
+		break;
+	case RAW_AUDIO:
+		e = gf_filter_override_caps(filter, ReframerCaps_RAW_A, GF_ARRAY_LENGTH(ReframerCaps_RAW_A));
+		break;
+	default:
+		e = GF_OK;
 	}
-#endif
-	return GF_OK;
+	return e;
 }
 
 static Bool reframer_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
@@ -1717,7 +2416,8 @@
 		}
 		st->in_eos = GF_FALSE;
 		st->is_playing = GF_TRUE;
-		ctx->is_eos = GF_FALSE;
+		if (ctx->eos_state==1)
+			ctx->eos_state = 0;
 	} else if (evt->base.type==GF_FEVT_STOP) {
 		st->is_playing = GF_FALSE;
 	}
@@ -1742,7 +2442,7 @@
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	//we do accept everything, including raw streams 
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
-	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	//we don't accept files as input so don't output them
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	//we don't produce RAW streams during dynamic chain resolution - this will avoid loading the filter for compositor/other raw access
@@ -1758,37 +2458,47 @@
 	{ OFFS(exporter), "compatibility with old exporter, displays export results", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(rt), "real-time regulation mode of input\n"
 	"- off: disables real-time regulation\n"
-	"- on: enables real-time regulation, one clock per pid\n"
-	"- sync: enables real-time regulation one clock for all pids", GF_PROP_UINT, "off", "off|on|sync", GF_FS_ARG_HINT_NORMAL},
-	{ OFFS(saps), "drop non-SAP packets, off by default. The list gives the SAP types (0,1,2,3,4) to forward. Note that forwarding only sap 0 will break the decoding", GF_PROP_UINT_LIST, NULL, "0|1|2|3|4", GF_FS_ARG_HINT_NORMAL},
+	"- on: enables real-time regulation, one clock per PID\n"
+	"- sync: enables real-time regulation one clock for all PIDs", GF_PROP_UINT, "off", "off|on|sync", GF_FS_ARG_HINT_NORMAL},
+	{ OFFS(saps), "list of SAP types (0,1,2,3,4) to forward, other packets are dropped (forwarding only sap 0 will break the decoding)", GF_PROP_UINT_LIST, NULL, "0|1|2|3|4", GF_FS_ARG_HINT_NORMAL},
 	{ OFFS(refs), "forward only frames used as reference frames, if indicated in the input stream", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_NORMAL},
-	{ OFFS(speed), "speed for real-time regulation mode - only positive value", GF_PROP_DOUBLE, "1.0", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(raw), "force input streams to be in raw format (i.e. forces decoding of input)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_NORMAL},
-	{ OFFS(frames), "drop all except listed frames (first being 1), off by default", GF_PROP_UINT_LIST, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(xs), "extraction start time(s), see filter help", GF_PROP_STRING_LIST, NULL, NULL, GF_FS_ARG_HINT_NORMAL},
+	{ OFFS(speed), "speed for real-time regulation mode", GF_PROP_DOUBLE, "1.0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(raw), "force input AV streams to be in raw format\n"
+	"- no: do not force decoding of inputs\n"
+	"- av: force decoding of audio and video inputs\n"
+	"- a: force decoding of audio inputs\n"
+	"- v: force decoding of video inputs", GF_PROP_UINT, "no", "av|a|v|no", GF_FS_ARG_HINT_NORMAL},
+	{ OFFS(frames), "drop all except listed frames (first being 1)", GF_PROP_UINT_LIST, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(xs), "extraction start time(s)", GF_PROP_STRING_LIST, NULL, NULL, GF_FS_ARG_HINT_NORMAL},
 	{ OFFS(xe), "extraction end time(s). If less values than start times, the last time interval extracted is an open range", GF_PROP_STRING_LIST, NULL, NULL, GF_FS_ARG_HINT_NORMAL},
-	{ OFFS(xround), "adjustment of extraction start range I-frame\n"
-	"- before: use first I-frame preceeding or equal to start range\n"
-	"- after: use first I-frame (if any) following or equal to start range\n"
-	"- closest: use I-frame closest to start range", GF_PROP_UINT, "before", "before|after|closest", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(xround), "adjust start time of extraction range to I-frame\n"
+	"- before: use first I-frame preceding or matching range start\n"
+	"- seek: see filter help\n"
+	"- after: use first I-frame (if any) following or matching range start\n"
+	"- closest: use I-frame closest to range start", GF_PROP_UINT, "before", "before|seek|after|closest", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(xadjust), "adjust end time of extraction range to be before next I-frame", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(nosap), "do not cut at SAP when extracting range (may result in broken streams)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(splitrange), "signal file boundary at each extraction first packet for template-base file generation", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(seeksafe), "rewind play requests by given seconds (to make sur I-frame preceeding start is catched)", GF_PROP_DOUBLE, "10.0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(seeksafe), "rewind play requests by given seconds (to make sur I-frame preceding start is catched)", GF_PROP_DOUBLE, "10.0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(tcmdrw), "rewrite TCMD samples when splitting", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(props), "extra output PID properties per extraction range", GF_PROP_STRING_LIST, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(no_audio_seek), "disable seek mode on audio streams (no change of priming duration)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(probe_ref), "allow extracted range to be longer in case of B-frames with reference frames presented outside of range", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
 GF_FilterRegister ReframerRegister = {
 	.name = "reframer",
 	GF_FS_SET_DESCRIPTION("Media Reframer")
-	GF_FS_SET_HELP("This filter provides various compressed domain tools on inputs:\n"
-		"- ensure reframing\n"
+	GF_FS_SET_HELP("This filter provides various tools on inputs:\n"
+		"- ensure reframing (1 packet = 1 Access Unit)\n"
 		"- optionally force decoding\n"
 		"- real-time regulation\n"
 		"- packet filtering based on SAP types or frame numbers\n"
-		"- time-range extraction and spliting\n"
-		"This filter forces input pids to be properly framed (1 packet = 1 Access Unit).\n"
-		"It is typcially needed to force remultiplexing in file to file operations when source and destination files use the same format.\n"
+		"- time-range extraction and splitting\n"
+		" \n"
+		"This filter forces input PIDs to be properly framed (1 packet = 1 Access Unit).\n"
+		"It is typically needed to force remultiplexing in file to file operations when source and destination files use the same format.\n"
 		" \n"
 		"# SAP filtering\n"
 		"The filter can remove packets based on their SAP types using [-saps]() option.\n"
@@ -1796,46 +2506,77 @@
 		" \n"
 		"# Frame filtering\n"
 		"This filter can keep only specific Access Units of the source using [-frames]() option.\n"
-		"For example, this can be used to extract only specific key frame of a video to create a HEIF collection.\n"
+		"For example, this can be used to extract only specific key pictures of a video to create a HEIF collection.\n"
 		" \n"
 		"# Frame decoding\n"
 		"This filter can force input media streams to be decoded using the [-raw]() option.\n"
-		"EX gpac src=m.mp4 reframer:raw @ [dst]\n"
+		"EX gpac -i m.mp4 reframer:raw=av [dst]\n"
 		"# Real-time Regulation\n"
 		"The filter can perform real-time regulation of input packets, based on their timescale and timestamps.\n"
 		"For example to simulate a live DASH:\n"
-		"EX gpac src=m.mp4 reframer:rt=on @ dst=live.mpd:dynamic\n"
+		"EX gpac -i m.mp4 reframer:rt=on -o live.mpd:dynamic\n"
 		" \n"
 		"# Range extraction\n"
 		"The filter can perform time range extraction of the source using [-xs]() and [-xe]() options.\n"
 		"The formats allowed for times specifiers are:\n"
-		"- 'T'H:M:S: specify time in hours, minutes, seconds\n"
-		"- 'T'H:M:S.MS: specify time in hours, minutes, seconds and milliseconds\n"
-		"- INT: specify time in millisecond\n"
+		"- 'T'H:M:S, 'T'M:S: specify time in hours, minutes, seconds\n"
+		"- 'T'H:M:S.MS, 'T'M:S.MS, 'T'S.MS: specify time in hours, minutes, seconds and milliseconds\n"
+		"- INT, FLOAT: specify time in seconds\n"
 		"- NUM/DEN: specify time in seconds as fraction\n"
-		"- FNUM: specify time as frame number\n"
+		"- 'F'NUM: specify time as frame number\n"
+		" \n"
 		"In this mode, the timestamps are rewritten to form a continuous timeline.\n"
-		"When multiple ranges are given, the filter will try to seek if supported by source."
+		"When multiple ranges are given, the filter will try to seek if needed and supported by source.\n"
 		"\n"
-		"EX gpac src=m.mp4 reframer:xs=T00:00:10,T00:01:10,T00:02:00:xs=T00:00:20,T00:01:20 [dst]\n"
+		"EX gpac -i m.mp4 reframer:xs=T00:00:10,T00:01:10,T00:02:00:xe=T00:00:20,T00:01:20 [dst]\n"
 		"This will extract the time ranges [10s,20s], [1m10s,1m20s] and all media starting from 2m\n"
 		"\n"
+		"If no end range is found for a given start range:\n"
+		"- if a following start range is set, the end range is set to this next start\n"
+		"- otherwise, the end range is open\n"
+		"\n"
+		"EX gpac -i m.mp4 reframer:xs=0,10,25:xe=5 [dst]\n"
+		"This will extract the time ranges [0s,5s], [10s,25s] and all media starting from 25s\n"
+		"EX gpac -i m.mp4 reframer:xs=0,10,25 [dst]\n"
+		"This will extract the time ranges [0s,10s], [10s,25s] and all media starting from 25s\n"
+		"\n"
 		"It is possible to signal range boundaries in output packets using [-splitrange]().\n"
-		"This will expose on the first packet of each range in each pid the following properties:\n"
-		"- FileNumber: starting at 1 for the first range, to be used as replacement for $num$ in templates\n"
-		"- FileSuffix: corresponding to `StartRange_EndRange` or `StartRange` for open ranges, to be used as replacement for $FS$ in templates\n"
+		"This will expose on the first packet of each range in each PID the following properties:\n"
+		"- `FileNumber`: starting at 1 for the first range, to be used as replacement for $num$ in templates\n"
+		"- `FileSuffix`: corresponding to `StartRange_EndRange` or `StartRange` for open ranges, to be used as replacement for $FS$ in templates\n"
 		"\n"
-		"EX gpac src=m.mp4 reframer:xs=T00:00:10,T00:01:10:xe=T00:00:20:splitrange -o dump_$FS$.264\n"
+		"EX gpac -i m.mp4 reframer:xs=T00:00:10,T00:01:10:xe=T00:00:20:splitrange -o dump_$FS$.264 [dst]\n"
 		"This will create two output files dump_T00.00.10_T00.02.00.264 and dump_T00.01.10.264.\n"
 		"Note: The `:` and `/` characters are replaced by `.` in `FileSuffix` property.\n"
 		"\n"
+		"It is possible to modify PID properties per range using [-props](). Each set of property must be specified using the active separator set.\n"
+		"Warning: The option must be escaped using double separators in order to be parsed properly.\n"
+		"EX gpac -i m.mp4 reframer:xs=0,30::props=#Period=P1,#Period=P2:#foo=bar [dst]\n"
+		"This will assign to output PIDs\n"
+		"- during the range [0,30]: property `Period` to `P1`\n"
+		"- during the range [30, end]: properties `Period` to `P2` and property `foo` to `bar`\n"
+		"\n"
+		"For uncompressed audio PIDs, input frame will be split to closest audio sample number.\n"
+		"\n"
+		"When [-xround]() is set to `seek`, the following applies:\n"
+		"- a single range shall be specified\n"
+		"- the first I-frame preceding or matching the range start is used as split point\n"
+		"- all packets before range start are marked as seek points\n"
+		"- packets overlapping range start are forwarded with a `SkipBegin` property set to the amount of media to skip\n"
+		"- packets overlapping range end are forwarded with an adjusted duration to match the range end\n"
+		"This mode is typically used to extract a range in a frame/sample accurate way, rather than a GOP-aligned way.\n"
+		"\n"
+		"When [-xround]() is not set to `seek`, compressed audio streams will still use seek mode.\n"
+		"Consequently, these streams will have modified edit lists in ISOBMFF which might not be properly handled by players.\n"
+		"This can be avoided using [-no_audio_seek](), but this will introduce audio delay.\n"
+		"\n"
 		"# Other split actions\n"
 		"The filter can perform splitting of the source using [-xs]() option.\n"
 		"The additional formats allowed for [-xs]() option are:\n"
-		"- 'SAP': split source at each SAP/RAP\n"
-		"- 'D'VAL: split source by chunks of VAL ms\n"
-		"- 'D'NUM/DEN: split source by chunks of NUM/DEN seconds\n"
-		"- 'S'VAL: split source by chunks of estimated size VAL bytes, VAL can use property multipliers\n"
+		"- `SAP`: split source at each SAP/RAP\n"
+		"- `D`VAL: split source by chunks of `VAL` ms\n"
+		"- `D`NUM/DEN: split source by chunks of `NUM/DEN` seconds\n"
+		"- `S`VAL: split source by chunks of estimated size `VAL` bytes (can use property multipliers, e.g. `m`)\n"
 		"\n"
 		"Note: In these modes, [-splitrange]() and [-xadjust]() are implicitly set.\n"
 	)
@@ -1843,7 +2584,7 @@
 	.max_extra_pids = (u32) -1,
 	.args = ReframerArgs,
 	//reframer is explicit only, so we don't load the reframer during resolution process
-	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.flags = GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_ALLOW_CYCLIC,
 	SETCAPS(ReframerCaps),
 	.initialize = reframer_initialize,
 	.finalize = reframer_finalize,

gpac-1.0.1.tar.gz/src/filters/resample_audio.c -> gpac-2.0.0.tar.gz/src/filters/resample_audio.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2022
 *					All rights reserved
 *
 * This file is part of GPAC / audio resample filter
@@ -33,7 +33,7 @@
 typedef struct
 {
 	//opts
-	u32 ch, sr, fmt;
+	u32 och, osr, ofmt;
 
 	//internal
 	GF_FilterPid *ipid, *opid;
@@ -42,7 +42,9 @@
 	//output config
 	u32 freq, nb_ch, afmt;
 	u64 ch_cfg;
-	u64 out_cts;
+	u64 out_cts_plus_one;
+	char *olayout;
+
 	//source is planar
 	Bool src_is_planar;
 	GF_AudioInterface input_ai;
@@ -52,6 +54,7 @@
 	u32 size, bytes_consumed;
 	Fixed speed;
 	GF_FilterPacket *in_pck;
+	Bool cfg_changed;
 } GF_ResampleCtx;
 
 
@@ -60,17 +63,30 @@
 	u32 sample_offset;
 	GF_ResampleCtx *ctx = (GF_ResampleCtx *) callback;
 	if (!ctx->data) {
-		*size = 0;
-		return NULL;
+		//fetch data if none present (we may have drop the previous frame while mixing)
+		assert(!ctx->in_pck);
+		ctx->in_pck = gf_filter_pid_get_packet(ctx->ipid);
+		if (!ctx->in_pck) {
+			*size = 0;
+			return NULL;
+		}
+		ctx->data = gf_filter_pck_get_data(ctx->in_pck, &ctx->size);
+		//note we only update CTS when no packet is present at the start of process()
+
+		if (!ctx->data) {
+			*size = 0;
+			return NULL;
+		}
 	}
+
 	assert(ctx->data);
 	*size = ctx->size - ctx->bytes_consumed;
 	sample_offset = ctx->bytes_consumed;
-	//planar mode, bytes consummed correspond to all channels, so move frame pointer
+	//planar mode, bytes consumed correspond to all channels, so move frame pointer
 	//to first sample non consumed = bytes_consumed/nb_channels
 	if (ctx->src_is_planar) {
-		*planar_stride = ctx->size / ctx->nb_ch;
-		sample_offset /= ctx->nb_ch;
+		*planar_stride = ctx->size / ctx->input_ai.chan;
+		sample_offset /= ctx->input_ai.chan;
 	}
 	return (char*)ctx->data + sample_offset;
 }
@@ -84,19 +100,19 @@
 		//trash packet and get a new one
 		gf_filter_pid_drop_packet(ctx->ipid);
 		ctx->data = NULL;
+		ctx->in_pck = NULL;
 		ctx->size = ctx->bytes_consumed = 0;
-		ctx->in_pck = gf_filter_pid_get_packet(ctx->ipid);
-		if (!ctx->in_pck) {
-			return;
-		}
-		ctx->out_cts = gf_filter_pck_get_cts(ctx->in_pck);
-		ctx->data = gf_filter_pck_get_data(ctx->in_pck, &ctx->size);
-		ctx->bytes_consumed = 0;
+		//do NOT fetch data until needed
 	}
 }
 
 static Bool resample_get_config(struct _audiointerface *ai, Bool for_reconf)
 {
+	GF_ResampleCtx *ctx = (GF_ResampleCtx *) ai->callback;
+	if (ctx->cfg_changed) {
+		ctx->cfg_changed = GF_FALSE;
+		return GF_FALSE;
+	}
 	return GF_TRUE;
 }
 static Bool resample_is_muted(void *callback)
@@ -150,6 +166,7 @@
 		if (ctx->opid) {
 			gf_mixer_remove_input(ctx->mixer, &ctx->input_ai);
 			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
 		}
 		if (ctx->in_pck) gf_filter_pid_drop_packet(ctx->ipid);
 		ctx->in_pck = NULL;
@@ -192,12 +209,29 @@
 
 	//initial config
 	if (!ctx->freq || !ctx->nb_ch || !ctx->afmt) {
-		ctx->afmt = ctx->fmt ? ctx->fmt : afmt;
-		ctx->freq = ctx->sr ? ctx->sr : sr;
-		ctx->nb_ch = ctx->ch ? ctx->ch : nb_ch;
+		GF_Err e;
+		ctx->afmt = ctx->ofmt ? ctx->ofmt : afmt;
+		ctx->freq = ctx->osr ? ctx->osr : sr;
+		ctx->nb_ch = ctx->och ? ctx->och : nb_ch;
+
+		if (ctx->olayout) {
+			ch_cfg = gf_audio_fmt_get_layout_from_name(ctx->olayout);
+			if (!ch_cfg) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Resampler] Unrecognized CICP layout %s, will infer layout from channel numbers (%d)", ctx->olayout, ctx->nb_ch));
+			} else {
+				ctx->nb_ch = nb_ch = gf_audio_fmt_get_num_channels_from_layout(ch_cfg);
+			}
+		}
 		ctx->ch_cfg = ch_cfg;
 
-		gf_mixer_set_config(ctx->mixer, ctx->freq, ctx->nb_ch, afmt, ctx->ch_cfg);
+		if (ctx->nb_ch != nb_ch) {
+			//TODO, find LFE and surround
+			u32 cicp = gf_audio_fmt_get_cicp_layout(ctx->nb_ch, 0, 0);
+			ctx->ch_cfg = gf_audio_fmt_get_layout_from_cicp(cicp);
+		}
+
+		e = gf_mixer_set_config(ctx->mixer, ctx->freq, ctx->nb_ch, ctx->afmt, ctx->ch_cfg);
+		if (e) return e;
 	}
 	//input reconfig
 	if ((sr != ctx->input_ai.samplerate) || (nb_ch != ctx->input_ai.chan)
@@ -209,6 +243,7 @@
 		ctx->input_ai.chan = nb_ch;
 		ctx->input_ai.ch_layout = ch_cfg;
 		ctx->src_is_planar = gf_audio_fmt_is_planar(afmt);
+		ctx->cfg_changed = GF_TRUE;
 	}
 
 	ctx->passthrough = GF_FALSE;
@@ -218,6 +253,7 @@
 		ctx->passthrough = GF_TRUE;
 
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(ctx->freq));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->freq));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->afmt));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(ctx->nb_ch));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(ctx->ch_cfg));
@@ -243,14 +279,32 @@
 
 			if (!ctx->in_pck) {
 				if (gf_filter_pid_is_eos(ctx->ipid)) {
-					if (ctx->opid)
-						gf_filter_pid_set_eos(ctx->opid);
-					return GF_EOS;
+					if (ctx->passthrough || ctx->input_ai.is_eos) {
+						if (ctx->opid)
+							gf_filter_pid_set_eos(ctx->opid);
+						return GF_EOS;
+					}
+					ctx->input_ai.is_eos = 1;
+				} else {
+					ctx->input_ai.is_eos = 0;
+					return GF_OK;
+				}
+			} else {
+				ctx->data = gf_filter_pck_get_data(ctx->in_pck, &ctx->size);
+				u64 cts = gf_timestamp_rescale(gf_filter_pck_get_cts(ctx->in_pck), FIX2INT(ctx->speed * ctx->timescale), ctx->freq);
+				if (!ctx->out_cts_plus_one) {
+					ctx->out_cts_plus_one = cts + 1;
+				}
+				//if we drift by more than 200ms, resync to input cts
+				else {
+					s64 diff = cts;
+					diff -= ctx->out_cts_plus_one-1;
+					//200ms max
+					if (ABS(diff) * 1000 > ctx->freq * 200) {
+						ctx->out_cts_plus_one = cts + 1;
+					}
 				}
-				return GF_OK;
 			}
-			ctx->data = gf_filter_pck_get_data(ctx->in_pck, &ctx->size);
-			ctx->out_cts = gf_filter_pck_get_cts(ctx->in_pck);
 		}
 
 		if (ctx->passthrough) {
@@ -260,31 +314,44 @@
 			continue;
 		}
 
-		osize = ctx->size * ctx->nb_ch * bps;
-		osize /= ctx->input_ai.chan * gf_audio_fmt_bit_depth(ctx->input_ai.afmt);
+		if (ctx->in_pck) {
+			osize = ctx->size * ctx->nb_ch * bps;
+			osize /= ctx->input_ai.chan * gf_audio_fmt_bit_depth(ctx->input_ai.afmt);
+			//output in higher samplerate, need more space for same samples
+			if (ctx->freq > ctx->input_ai.samplerate) {
+				osize *= ctx->freq;
+				osize /= ctx->input_ai.samplerate;
+				while (osize % bytes_per_samp)
+					osize++;
+			}
+		} else {
+			//flush remaining samples from mixer, use 20 sample buffer
+			osize = 20*ctx->nb_ch * bps / 8;
+		}
 
 		dstpck = gf_filter_pck_new_alloc(ctx->opid, osize, &output);
-		if (!dstpck) return GF_OK;
-		gf_filter_pck_merge_properties(ctx->in_pck, dstpck);
+		if (!dstpck) return GF_OUT_OF_MEM;
 
-		written = gf_mixer_get_output(ctx->mixer, output, osize, 0);
-		if (written != osize) {
-			gf_filter_pck_truncate(dstpck, written);
-		}
-		gf_filter_pck_set_dts(dstpck, ctx->out_cts);
-		gf_filter_pck_set_cts(dstpck, ctx->out_cts);
-		gf_filter_pck_send(dstpck);
+		if (ctx->in_pck)
+			gf_filter_pck_merge_properties(ctx->in_pck, dstpck);
 
-		if (ctx->timescale==ctx->freq) {
-			ctx->out_cts += written / bytes_per_samp;
+		written = gf_mixer_get_output(ctx->mixer, output, osize, 0);
+		if (!written) {
+			gf_filter_pck_discard(dstpck);
 		} else {
-			u64 ts_inc = written / bytes_per_samp;
-			ts_inc *= ctx->timescale;
-			ts_inc /= ctx->freq;
-
-			ctx->out_cts += ts_inc;
+			u32 dur = written / bytes_per_samp;
+			if (written != osize) {
+				gf_filter_pck_truncate(dstpck, written);
+			}
+			gf_filter_pck_set_dts(dstpck, ctx->out_cts_plus_one - 1);
+			gf_filter_pck_set_cts(dstpck, ctx->out_cts_plus_one - 1);
+			gf_filter_pck_set_duration(dstpck, dur);
+			gf_filter_pck_send(dstpck);
 
+			//out_cts is in output time scale ( = freq), increase by the amount of bytes/bps
+			ctx->out_cts_plus_one += dur;
 		}
+
 		//still some bytes to use from packet, do not discard
 		if (ctx->bytes_consumed<ctx->size) {
 			continue;
@@ -302,6 +369,7 @@
 {
 	u32 sr, nb_ch, afmt;
 	u64 ch_cfg;
+	GF_Err e;
 	const GF_PropertyValue *p;
 	GF_ResampleCtx *ctx = gf_filter_get_udta(filter);
 	if (ctx->opid != pid) return GF_BAD_PARAM;
@@ -337,13 +405,15 @@
 	ctx->nb_ch = nb_ch;
 	ctx->ch_cfg = ch_cfg;
 
-	gf_mixer_set_config(ctx->mixer, ctx->freq, ctx->nb_ch, ctx->afmt, ctx->ch_cfg);
+	e = gf_mixer_set_config(ctx->mixer, ctx->freq, ctx->nb_ch, ctx->afmt, ctx->ch_cfg);
+	if (e) return e;
 	ctx->passthrough = GF_FALSE;
 
 	if ((ctx->input_ai.samplerate==ctx->freq) && (ctx->input_ai.chan==ctx->nb_ch) && (ctx->input_ai.afmt==afmt) && (ctx->speed == FIX_ONE))
 		ctx->passthrough = GF_TRUE;
 
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(sr));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(sr));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(afmt));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(nb_ch));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(ch_cfg));
@@ -358,6 +428,28 @@
 	return GF_OK;
 }
 
+static Bool resample_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	if (((evt->base.type==GF_FEVT_PLAY) || (evt->base.type==GF_FEVT_SET_SPEED) )
+		&& evt->play.speed
+	) {
+		GF_ResampleCtx *ctx = gf_filter_get_udta(filter);
+		ctx->speed = FLT2FIX(evt->play.speed);
+		if (ctx->speed<0) ctx->speed = -ctx->speed;
+
+		ctx->passthrough = GF_FALSE;
+		if (ctx->speed > FIX_ONE) {
+			GF_FilterEvent anevt;
+			GF_FEVT_INIT(anevt, GF_FEVT_BUFFER_REQ, ctx->ipid);
+			anevt.buffer_req.max_buffer_us = FIX2INT( ctx->speed * 100000 );
+			gf_filter_pid_send_event(ctx->ipid, &anevt);
+		}
+		//reset output ts
+		ctx->out_cts_plus_one = 0;
+	}
+	return GF_FALSE;
+}
+
 static const GF_FilterCapability ResamplerCaps[] =
 {
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
@@ -367,11 +459,12 @@
 };
 
 #define OFFS(_n)	#_n, offsetof(GF_ResampleCtx, _n)
-static const GF_FilterArgs ResamplerArgs[] =
+static GF_FilterArgs ResamplerArgs[] =
 {
-	{ OFFS(ch), "desired number of output audio channels - 0 for auto", GF_PROP_UINT, "0", NULL, 0},
-	{ OFFS(sr), "desired sample rate of output audio - 0 for auto", GF_PROP_UINT, "0", NULL, 0},
-	{ OFFS(fmt), "desired format of output audio - none for auto", GF_PROP_PCMFMT, "none", NULL, 0},
+	{ OFFS(och), "desired number of output audio channels (0 for auto)", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(osr), "desired sample rate of output audio (0 for auto)", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(ofmt), "desired format of output audio (`none` for auto)", GF_PROP_PCMFMT, "none", NULL, 0},
+	{ OFFS(olayout), "desired CICP layout of output audio (null for auto)", GF_PROP_STRING, NULL, NULL, 0},
 	{0}
 };
 
@@ -383,15 +476,19 @@
 	.initialize = resample_initialize,
 	.finalize = resample_finalize,
 	.args = ResamplerArgs,
+	.flags = GF_FS_REG_ALLOW_CYCLIC,
 	SETCAPS(ResamplerCaps),
 	.configure_pid = resample_configure_pid,
 	.process = resample_process,
 	.reconfigure_output = resample_reconfigure_output,
+	.process_event = resample_process_event,
 };
 
+const char *gf_audio_fmt_cicp_all_names();
 
 const GF_FilterRegister *resample_register(GF_FilterSession *session)
 {
+	ResamplerArgs[3].min_max_enum = gf_audio_fmt_cicp_all_names();
 	return &ResamplerRegister;
 }
 #else

gpac-2.0.0.tar.gz/src/filters/restamp.c Added

@@ -0,0 +1,480 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom Paris 2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / restamper filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/filters.h>
+#include <gpac/constants.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/mpeg4_odf.h>
+
+typedef struct
+{
+	GF_FilterPid *ipid, *opid;
+	s64 ts_offset;
+	Bool raw_vid_copy;
+	Bool is_audio, is_video;
+	s64 last_min_dts;
+	u32 timescale;
+
+	u64 last_ts;
+	u32 min_dur;
+	u32 rescale;
+	u64 nb_frames;
+	GF_FilterPacket *pck_ref;
+	u32 keep_prev_state;
+} RestampPid;
+
+enum
+{
+	RESTAMP_RAWV_NO=0,
+	RESTAMP_RAWV_FORCE,
+	RESTAMP_RAWV_DYN,
+};
+
+typedef struct
+{
+	GF_Fraction fps, delay_v, delay_a, delay_t, delay_o;
+	u32 rawv;
+
+	GF_List *pids;
+	Bool reconfigure;
+} RestampCtx;
+
+
+static GF_Err restamp_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	GF_Fraction64 fps_scaler;
+	RestampCtx *ctx = (RestampCtx *) gf_filter_get_udta(filter);
+	RestampPid *pctx = gf_filter_pid_get_udta(pid);
+
+	//disconnect of src pid (not yet supported)
+	if (is_remove) {
+		if (pctx) {
+			if (pctx->opid) {
+				gf_filter_pid_remove(pctx->opid);
+			}
+			gf_filter_pid_set_udta(pid, NULL);
+			gf_list_del_item(ctx->pids, pctx);
+ 			gf_free(pctx);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!pctx) {
+		GF_SAFEALLOC(pctx, RestampPid);
+		if (!pctx) return GF_OUT_OF_MEM;
+		pctx->ipid = pid;
+		gf_list_add(ctx->pids, pctx);
+		gf_filter_pid_set_udta(pid, pctx);
+		pctx->opid = gf_filter_pid_new(filter);
+		if (!pctx->opid) return GF_OUT_OF_MEM;
+	}
+
+	pctx->raw_vid_copy = GF_FALSE;
+	pctx->is_audio = GF_FALSE;
+	pctx->rescale = GF_FALSE;
+	pctx->is_video = GF_FALSE;
+	GF_Fraction *delay = NULL;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	assert(prop);
+	switch (prop->value.uint) {
+	case GF_STREAM_VISUAL:
+		pctx->is_video = GF_TRUE;
+		delay = &ctx->delay_v;
+		if (ctx->rawv && (ctx->fps.num>0)) {
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+			if (prop && (prop->value.uint==GF_CODECID_RAW)) {
+				pctx->raw_vid_copy = GF_TRUE;
+			} else {
+				prop = gf_filter_pid_get_property(pid, GF_PROP_PID_HAS_SYNC);
+				if (prop && !prop->value.boolean) {
+					pctx->raw_vid_copy = GF_TRUE;
+				} else {
+					gf_filter_pid_negociate_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+					return GF_OK;
+				}
+			}
+		}
+		break;
+	case GF_STREAM_AUDIO:
+		delay = &ctx->delay_a;
+		pctx->is_audio = GF_TRUE;
+		break;
+	case GF_STREAM_TEXT:
+		delay = &ctx->delay_t;
+		break;
+	default:
+		delay = &ctx->delay_o;
+		break;
+	}
+	gf_filter_pid_copy_properties(pctx->opid, pctx->ipid);
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	u32 timescale = prop ? prop->value.uint : 1000;
+	s64 ts_offset = gf_timestamp_rescale_signed(delay->num, delay->den, timescale);
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+	if (prop) {
+		ts_offset += prop->value.longsint;
+	}
+	if (ts_offset<0) {
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DELAY, &PROP_LONGSINT(ts_offset));
+		ts_offset = 0;
+	} else {
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DELAY, NULL);
+	}
+	pctx->ts_offset = ts_offset;
+	if (timescale && (timescale!=pctx->timescale))
+		pctx->last_min_dts = 0;
+	pctx->timescale = timescale;
+
+	ctx->reconfigure = GF_FALSE;
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	if (pctx->is_audio) return GF_OK;
+
+	if (!ctx->fps.num) return GF_OK;
+
+	gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_MAX_TS_DELTA, NULL);
+	gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_CONSTANT_DURATION, NULL);
+
+	fps_scaler.num = 0;
+	fps_scaler.den = 1;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+	if (prop) {
+		if (ctx->fps.num>0) {
+			fps_scaler.num = prop->value.frac.num;
+			fps_scaler.den = prop->value.frac.den;
+			fps_scaler.num *= ctx->fps.den;
+			fps_scaler.den *= ctx->fps.num;
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_FPS, &PROP_FRAC_INT(ctx->fps.num, ctx->fps.den));
+		} else {
+			GF_Fraction f = prop->value.frac;
+			f.num *= -ctx->fps.num;
+			f.den /= ctx->fps.den;
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_FPS, &PROP_FRAC(f));
+		}
+	}
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
+	if ((ctx->fps.num) && prop) {
+		u64 dur = prop->value.uint;
+		if (ctx->fps.num>0) {
+			if (fps_scaler.num) {
+				dur *= fps_scaler.num;
+				dur /= fps_scaler.den;
+			} else {
+				gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DURATION, NULL);
+			}
+		} else {
+			dur /= -ctx->fps.num;
+			dur *= ctx->fps.den;
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DURATION, &PROP_LONGUINT(dur));
+		}
+	}
+
+	if ((ctx->fps.num>0) && (timescale % ctx->fps.num)) {
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->fps.num));
+		pctx->rescale = GF_TRUE;
+	}
+	return GF_OK;
+}
+
+static u64 restamp_get_timestamp(RestampCtx *ctx, RestampPid *pctx, u64 ots)
+{
+	if (ots == GF_FILTER_NO_TS) return ots;
+	u64 ts;
+	//ots + pctx->ts_offset<0
+	if ((pctx->ts_offset<0) && (ots < (u64) -pctx->ts_offset)) {
+		pctx->ts_offset += (s64) ots + pctx->ts_offset;;
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DELAY, &PROP_LONGSINT(pctx->ts_offset) );
+		ts = 0;
+	}
+	else {
+		ts = ots + pctx->ts_offset;
+	}
+	if (pctx->is_audio || !ctx->fps.num || !pctx->is_video) return ts;
+
+	if (!pctx->last_min_dts) {
+		pctx->last_min_dts = 1 + ts;
+		pctx->last_ts = 1 + ts;
+		if (pctx->raw_vid_copy)
+			pctx->keep_prev_state = 1;
+		return ts;
+	}
+	s64 diff = ts - (pctx->last_min_dts-1);
+	if (ctx->fps.num<0) {
+		diff *= ctx->fps.den;
+		diff /= -ctx->fps.num;
+		ts = pctx->last_min_dts-1 + diff;
+		return ts;
+	}
+
+	if (ots + 1 <= pctx->last_ts) return ts;
+	u64 dur = ots - (pctx->last_ts-1);
+	if (!pctx->min_dur || (dur < pctx->min_dur)) pctx->min_dur = (u32) dur;
+
+
+	if (pctx->raw_vid_copy) {
+		u64 new_ts = pctx->nb_frames * ctx->fps.den;
+		new_ts *= pctx->timescale;
+		new_ts /= ctx->fps.num;
+
+		pctx->keep_prev_state = 0;
+		if (new_ts + pctx->min_dur/2 <= dur) {
+			pctx->keep_prev_state = 1;
+		}
+		else if (dur + pctx->min_dur/2 <= new_ts) {
+			pctx->keep_prev_state = 2;
+			return 0;
+		}
+
+		if (pctx->rescale) {
+			new_ts = pctx->nb_frames * ctx->fps.den;
+		}
+		new_ts += pctx->last_min_dts-1;
+		return new_ts;
+	}
+
+
+	u64 nb_frames = diff / pctx->min_dur;
+	if (!pctx->rescale) {
+		nb_frames *= ((u64) pctx->min_dur * ctx->fps.num) / pctx->timescale;
+	}
+	nb_frames *= ctx->fps.den;
+	ts = pctx->last_min_dts-1 + nb_frames;
+	return ts;
+}
+
+
+static GF_Err restamp_process(GF_Filter *filter)
+{
+	u32 i, count;
+	RestampCtx *ctx = (RestampCtx *) gf_filter_get_udta(filter);
+
+	count = gf_list_count(ctx->pids);
+	for (i=0; i<count; i++) {
+		RestampPid *pctx = gf_list_get(ctx->pids, i);
+		if (!pctx) continue;
+		if (ctx->reconfigure) {
+			restamp_configure_pid(filter, pctx->ipid, GF_FALSE);
+		}
+
+		while (1) {
+			s64 ts;
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(pctx->ipid);
+			if (!pck) {
+				if (gf_filter_pid_is_eos(pctx->ipid)) {
+					gf_filter_pid_set_eos(pctx->opid);
+					if (pctx->pck_ref) {
+						gf_filter_pck_unref(pctx->pck_ref);
+						pctx->pck_ref = NULL;
+					}
+				}
+				break;
+			}
+
+			GF_FilterPacket *opck;
+
+			if (!pctx->raw_vid_copy) {
+				opck = gf_filter_pck_new_ref(pctx->opid, 0, 0, pck);
+				ts = restamp_get_timestamp(ctx, pctx, gf_filter_pck_get_dts(pck) );
+				if (ts != GF_FILTER_NO_TS)
+					gf_filter_pck_set_dts(opck, ts);
+
+
+				ts = restamp_get_timestamp(ctx, pctx, gf_filter_pck_get_cts(pck) );
+				if (ts != GF_FILTER_NO_TS)
+					gf_filter_pck_set_cts(opck, ts);
+
+				if (!pctx->is_audio) {
+					u32 dur = gf_filter_pck_get_duration(pck);
+					if (ctx->fps.num<0) {
+						dur *= ctx->fps.den;
+						dur /= -ctx->fps.num;
+						gf_filter_pck_set_duration(opck, dur);
+					}
+				}
+				gf_filter_pck_send(opck);
+				gf_filter_pid_drop_packet(pctx->ipid);
+			} else {
+				u64 ots = gf_filter_pck_get_cts(pck) ;
+ 				Bool discard = GF_FALSE;
+				pctx->keep_prev_state = 0;
+				ts = restamp_get_timestamp(ctx, pctx, ots);
+
+				if (pctx->keep_prev_state==2) {
+					if (pctx->pck_ref) {
+						gf_filter_pck_unref(pctx->pck_ref);
+						pctx->pck_ref = NULL;
+					}
+					gf_filter_pid_drop_packet(pctx->ipid);
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Restamp] Droping frame TS "LLU"/%u\n", ots, pctx->timescale));
+					continue;
+				}
+
+				if (!pctx->keep_prev_state && pctx->pck_ref) {
+					gf_filter_pck_unref(pctx->pck_ref);
+					pctx->pck_ref = NULL;
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Restamp] Moving to next frame for output TS "LLU"\n", ts));
+				} else if (pctx->pck_ref) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Restamp] Keeping prev frame for output ts "LLU"\n", ts));
+				}
+				if (!pctx->pck_ref) {
+					pctx->pck_ref = pck;
+					gf_filter_pck_ref(&pctx->pck_ref);
+					discard = GF_TRUE;
+				}
+				assert(pctx->pck_ref);
+				opck = gf_filter_pck_new_ref(pctx->opid, 0, 0, pctx->pck_ref);
+				if (ts != GF_FILTER_NO_TS)
+					gf_filter_pck_set_cts(opck, ts);
+				pctx->nb_frames++;
+
+				gf_filter_pck_send(opck);
+
+				if (discard)
+					gf_filter_pid_drop_packet(pctx->ipid);
+			}
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err restamp_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val)
+{
+	RestampCtx *ctx = (RestampCtx *) gf_filter_get_udta(filter);
+	ctx->reconfigure = GF_TRUE;
+	return GF_OK;
+}
+
+static const GF_FilterCapability RestampCapsRawVid[] =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+};
+
+static GF_Err restamp_initialize(GF_Filter *filter)
+{
+	RestampCtx *ctx = (RestampCtx *) gf_filter_get_udta(filter);
+	ctx->pids = gf_list_new();
+
+#ifdef GPAC_ENABLE_COVERAGE
+	restamp_update_arg(filter, NULL, NULL);
+#endif
+
+	if ((u32) ctx->fps.num==ctx->fps.den) ctx->fps.num = 0;
+	if ((u32) -ctx->fps.num==ctx->fps.den) ctx->fps.num = 0;
+
+	if ((ctx->rawv==RESTAMP_RAWV_FORCE) && (ctx->fps.num>0)) {
+		gf_filter_override_caps(filter, RestampCapsRawVid, GF_ARRAY_LENGTH(RestampCapsRawVid) );
+	}
+
+	return GF_OK;
+}
+static void restamp_finalize(GF_Filter *filter)
+{
+	RestampCtx *ctx = (RestampCtx *) gf_filter_get_udta(filter);
+	while (gf_list_count(ctx->pids)) {
+		RestampPid *pctx = gf_list_pop_back(ctx->pids);
+		if (pctx->pck_ref) gf_filter_pck_unref(pctx->pck_ref);
+		gf_free(pctx);
+	}
+	gf_list_del(ctx->pids);
+}
+
+#define OFFS(_n)	#_n, offsetof(RestampCtx, _n)
+static GF_FilterArgs RestampArgs[] =
+{
+	{ OFFS(fps), "target fps", GF_PROP_FRACTION, "0/1", NULL, 0},
+	{ OFFS(delay_v), "delay to add to video streams", GF_PROP_FRACTION, "0/1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(delay_a), "delay to add to audio streams", GF_PROP_FRACTION, "0/1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(delay_t), "delay to add to text streams", GF_PROP_FRACTION, "0/1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(delay_o), "delay to add to other streams", GF_PROP_FRACTION, "0/1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(rawv), "copy video frames\n"
+		"- no: no raw frame copy/drop\n"
+		"- force: force decoding all video streams\n"
+		"- dyn: decoding video streams if not all intra"
+	, GF_PROP_UINT, "no", "no|force|dyn", 0},
+	{0}
+};
+
+static const GF_FilterCapability RestampCaps[] =
+{
+	//we setup 2 caps for dynamic video reconfig
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+};
+
+GF_FilterRegister RestampRegister = {
+	.name = "restamp",
+	GF_FS_SET_DESCRIPTION("Packet timestamp rewriter")
+	GF_FS_SET_HELP("This filter rewrites timing (offsets and rate) of packets.\n"
+	"\n"
+	"The specified delay per stream class can be either positive (stream presented later) or negative (stream presented sooner).\n"
+	"\n"
+	"The specified [-fps]() can be either 0, positive or negative.\n"
+	"- if 0 or if the stream is audio, stream rate is not modified.\n"
+	"- otherwise if negative, stream rate is multiplied by `-fps.num/fps.den`.\n"
+	"- otherwise if positive and the stream is not video, stream rate is not modified.\n"
+	"- otherwise (video PID), constant frame rate is assumed and:\n"
+	" - if [-rawv=no](), video frame rate is changed to the specified rate (speed-up or slow-down).\n"
+	" - if [-rawv=force](), input video stream is decoded and video frames are dropped/copied to match the new rate.\n"
+	" - if [-rawv=dyn](), input video stream is decoded if not all-intra and video frames are dropped/copied to match the new rate.\n"
+	"\n"
+	"Note: frames are simply copied or dropped with no motion compensation.\n"
+	)
+	.private_size = sizeof(RestampCtx),
+	.max_extra_pids = 0xFFFFFFFF,
+	.flags = GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_ALLOW_CYCLIC,
+	.args = RestampArgs,
+	SETCAPS(RestampCaps),
+	.initialize = restamp_initialize,
+	.finalize = restamp_finalize,
+	.configure_pid = restamp_configure_pid,
+	.process = restamp_process,
+	.update_arg = restamp_update_arg
+};
+
+const GF_FilterRegister *restamp_register(GF_FilterSession *session)
+{
+	return (const GF_FilterRegister *) &RestampRegister;
+}

gpac-1.0.1.tar.gz/src/filters/rewrite_adts.c -> gpac-2.0.0.tar.gz/src/filters/rewrite_adts.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / AAC ADTS write filter
@@ -40,7 +40,7 @@
 	//only one output pid declared
 	GF_FilterPid *opid;
 
-	u32 codecid, channels, sr_idx, aac_type;
+	u32 codecid, channels, sr_idx, aac_type, ch_cfg;
 
 	Bool is_latm;
 
@@ -48,6 +48,8 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 	GF_M4ADecSpecInfo acfg;
+	u8 *pce;
+	u32 pce_size;
 #else
 	u8 *dsi;
 	u32 dsi_size;
@@ -64,17 +66,17 @@
 
 GF_Err adtsmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
-	u32 i, sr;
+	u32 i, sr, chan_cfg=0;
 	Bool patch_channels = GF_FALSE;
 	const GF_PropertyValue *p;
-#ifndef GPAC_DISABLE_AV_PARSERS
-	GF_M4ADecSpecInfo acfg;
-#endif
 	GF_ADTSMxCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -84,8 +86,21 @@
 	if (!p) return GF_NOT_SUPPORTED;
 	ctx->codecid = p->value.uint;
 
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	ctx->ipid = pid;
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+	if (ctx->is_latm)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED_LATM, &PROP_BOOL(GF_TRUE) );
+
+	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
-	if (!p) return GF_NOT_SUPPORTED;
+	//not known yet
+	if (!p) return GF_OK;
 	sr = p->value.uint;
 
 	ctx->channels = 0;
@@ -94,7 +109,7 @@
 		ctx->channels = p->value.uint;
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-	memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
+	memset(&ctx->acfg, 0, sizeof(GF_M4ADecSpecInfo));
 #endif
 
 	ctx->aac_type = 0;
@@ -117,31 +132,65 @@
 		ctx->timescale = p->value.uint;
 
 	} else if (ctx->codecid==GF_CODECID_AAC_MPEG4) {
+		//setup default config
+		chan_cfg = ctx->channels;
+		if (chan_cfg==8)
+			chan_cfg = 7;
+
 		if (!ctx->mpeg2) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
 			if (p) {
-				gf_m4a_get_config(p->value.data.ptr, p->value.data.size, &acfg);
-				ctx->aac_type = acfg.base_object_type - 1;
-			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("RFADTS] no AAC decoder config, assuming AAC-LC\n"));
+				gf_m4a_get_config(p->value.data.ptr, p->value.data.size, &ctx->acfg);
+				ctx->aac_type = ctx->acfg.base_object_type - 1;
+				chan_cfg = ctx->acfg.chan_cfg;
+				sr = ctx->acfg.base_sr;
+			} else
+#endif
+			{
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[UFADTS] no AAC decoder config, assuming AAC-LC\n"));
 				ctx->aac_type = GF_M4A_AAC_LC;
+
+				if (!ctx->channels) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[UFADTS] no channel config found for ADTS, forcing stereo\n"));
+					chan_cfg = ctx->channels = 2;
+					patch_channels = GF_TRUE;
+				}
+
+				if (!chan_cfg) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[UFADTS] Unknown channel config, will not be able to signal it in ADTS\n"));
+				}
 			}
-#endif
+		}
+
+		if (chan_cfg>7) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[UFADTS] Unknown channel config, will not be able to signal it in ADTS\n"));
+			chan_cfg = 0;
 		}
 	} else {
 		ctx->aac_type = ctx->codecid - GF_CODECID_AAC_MPEG2_MP;
 	}
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-	if (ctx->channels && acfg.nb_chan && (ctx->channels != acfg.nb_chan)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[RFADTS] Mismatch betwwen container number of channels (%d) and AAC config (%d), using AAC config\n", ctx->channels, acfg.nb_chan));
-		ctx->channels = acfg.nb_chan;
+	if (ctx->channels && ctx->acfg.nb_chan && (ctx->channels != ctx->acfg.nb_chan)) {
+		//do not warn here, as most MP4 files will use nbChan=2 for multichan
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[UFADTS] Mismatch between container number of channels (%d) and AAC config (%d), using AAC config\n", ctx->channels, ctx->acfg.nb_chan));
+		ctx->channels = ctx->acfg.nb_chan;
 		patch_channels = GF_TRUE;
 	}
-	if ((acfg.base_object_type==2) && (acfg.base_sr!=sr)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[RFADTS] Mismatch betwwen container samplerate (%d) and AAC config SBR base samplerate (%d), using AAC config\n", sr, acfg.base_sr));
-		sr = acfg.base_sr;
+	if ((ctx->acfg.base_object_type==2) && (ctx->acfg.base_sr!=sr)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[UFADTS] Mismatch between container samplerate (%d) and AAC config SBR base samplerate (%d), using AAC config\n", sr, ctx->acfg.base_sr));
+		sr = ctx->acfg.base_sr;
+	}
+	if (!ctx->acfg.chan_cfg && ctx->acfg.program_config_element_present) {
+		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		gf_m4a_write_program_config_element_bs(bs, &ctx->acfg);
+		if (ctx->pce) gf_free(ctx->pce);
+		ctx->pce = NULL;
+		gf_bs_get_content(bs, &ctx->pce, &ctx->pce_size);
+		gf_bs_del(bs);
+
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[UFADTS] ADTS will use multiple raw blocks to signal channel configuration\n"));
 	}
 #else
 
@@ -151,12 +200,8 @@
 	ctx->dsi_size = p->value.data.size;
 #endif
 
-	if (ctx->channels>7) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("RFADTS] Invalid channel config %d for ADTS, forcing 7\n", ctx->channels));
-		ctx->channels = 7;
-	} else if (!ctx->channels) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("RFADTS] no channel config found for ADTS, forcing stereo\n"));
-	}
+
+	ctx->ch_cfg = chan_cfg;
 
 	for (i=0; i<16; i++) {
 		if (GF_M4ASampleRates[i] == (u32) sr) {
@@ -165,20 +210,8 @@
 		}
 	}
 
-
-	if (!ctx->opid) {
-		ctx->opid = gf_filter_pid_new(filter);
-	}
-	ctx->ipid = pid;
-	gf_filter_pid_copy_properties(ctx->opid, pid);
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
-	if (ctx->is_latm)
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED_LATM, &PROP_BOOL(GF_TRUE) );
-
 	if (patch_channels)
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(ctx->channels));
-	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
 	return GF_OK;
 }
 
@@ -201,29 +234,45 @@
 	}
 
 	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	if (!pck_size) {
+		//if output and packet properties, forward - this is required for sinks using packets for state signaling
+		//such as TS muxer in dash mode looking for EODS property
+		if (ctx->opid && gf_filter_pck_has_properties(pck))
+			gf_filter_pck_forward(pck, ctx->opid);
+
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
 
 	if (ctx->is_latm) {
 		u32 asize;
 
 		size = pck_size+20;
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+		if (!dst_pck) return GF_OUT_OF_MEM;
 
 		if (!ctx->bs_w) ctx->bs_w = gf_bs_new(output, size, GF_BITSTREAM_WRITE);
 		else gf_bs_reassign_buffer(ctx->bs_w, output, size);
 
 		gf_bs_write_int(ctx->bs_w, 0x2B7, 11);
 		gf_bs_write_int(ctx->bs_w, 0, 13);
+		if (ctx->codecid==GF_CODECID_USAC) {
+			GF_FilterSAPType sap = gf_filter_pck_get_sap(pck);
+			if ((sap == GF_FILTER_SAP_1) || (sap == GF_FILTER_SAP_4_PROL)) {
+				ctx->update_dsi = GF_TRUE;
+			}
+		} else {
 
-		if (ctx->fdsi.num && ctx->fdsi.den) {
-			u64 ts = gf_filter_pck_get_cts(pck);
-			if (ts != GF_FILTER_NO_TS) {
-				if ((ts - ctx->last_cts) * ctx->fdsi.den >= ctx->timescale * ctx->fdsi.num) {
-					ctx->last_cts = ts;
-					ctx->update_dsi = GF_TRUE;
+			if (ctx->fdsi.num && ctx->fdsi.den) {
+				u64 ts = gf_filter_pck_get_cts(pck);
+				if (ts != GF_FILTER_NO_TS) {
+					if (gf_timestamp_greater_or_equal(ts - ctx->last_cts, ctx->timescale, ctx->fdsi.num, ctx->fdsi.den)) {
+						ctx->last_cts = ts;
+						ctx->update_dsi = GF_TRUE;
+					}
 				}
 			}
 		}
-
 		/*same mux config = 0 (refresh aac config)*/
 		if (ctx->update_dsi) {
 			gf_bs_write_int(ctx->bs_w, 0, 1);
@@ -270,8 +319,16 @@
 		output[2] = (size-3) & 0xFF;
 
 	} else {
+		u32 nb_blocks = 0;
 		size = pck_size+7;
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (! ctx->acfg.chan_cfg && ctx->pce_size) {
+			nb_blocks = 2;
+			size += ctx->pce_size;
+		}
+#endif
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+		if (!dst_pck) return GF_OUT_OF_MEM;
 
 		if (!ctx->bs_w) ctx->bs_w = gf_bs_new(output, size, GF_BITSTREAM_WRITE);
 		else gf_bs_reassign_buffer(ctx->bs_w, output, size);
@@ -283,12 +340,21 @@
 		gf_bs_write_int(ctx->bs_w, ctx->aac_type, 2);
 		gf_bs_write_int(ctx->bs_w, ctx->sr_idx, 4);
 		gf_bs_write_int(ctx->bs_w, 0, 1);
-		gf_bs_write_int(ctx->bs_w, ctx->channels, 3);
+		gf_bs_write_int(ctx->bs_w, ctx->ch_cfg, 3);
 		gf_bs_write_int(ctx->bs_w, 0, 4);
-		gf_bs_write_int(ctx->bs_w, 7+pck_size, 13);
+		gf_bs_write_int(ctx->bs_w, size, 13);
 		gf_bs_write_int(ctx->bs_w, 0x7FF, 11);
-		gf_bs_write_int(ctx->bs_w, 0, 2);
-		memcpy(output+7, data, pck_size);
+
+		gf_bs_write_int(ctx->bs_w, nb_blocks, 2);
+
+		output += 7;
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (nb_blocks) {
+			memcpy(output, ctx->pce, ctx->pce_size);
+			output += ctx->pce_size;
+		}
+#endif
+		memcpy(output, data, pck_size);
 	}
 
 	gf_filter_pck_merge_properties(pck, dst_pck);
@@ -306,6 +372,9 @@
 {
 	GF_ADTSMxCtx *ctx = gf_filter_get_udta(filter);
 	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (ctx->pce) gf_free(ctx->pce);
+#endif
 }
 
 static const GF_FilterCapability ADTSMxCaps[] =
@@ -372,6 +441,7 @@
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_MP),
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_LCP),
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_SSRP),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_USAC),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED_LATM, GF_TRUE),
 };

gpac-2.0.0.tar.gz/src/filters/rewrite_mhas.c Added

@@ -0,0 +1,279 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2020-2021
+ *					All rights reserved
+ *
+ * This file is part of GPAC / MHAS write filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/filters.h>
+#include <gpac/constants.h>
+#include <gpac/bitstream.h>
+
+#include <gpac/avparse.h>
+
+
+typedef struct
+{
+	//opts
+	Bool exporter, syncp;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	Bool is_mpha;
+
+	GF_BitStream *bs_w;
+
+	u8 *dsi;
+	u32 dsi_size;
+	u32 dsi_crc;
+	Bool update_dsi;
+	GF_Fraction fdsi;
+	u64 last_cts;
+	u32 timescale;
+} GF_MHASMxCtx;
+
+
+
+
+GF_Err mhasmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 crc;
+	const GF_PropertyValue *p;
+	GF_MHASMxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!p) return GF_NOT_SUPPORTED;
+	ctx->is_mpha = (p->value.uint==GF_CODECID_MPHA) ? GF_TRUE : GF_FALSE;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+	if (!p) return GF_NOT_SUPPORTED;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!p) {
+		if (ctx->is_mpha)
+			return GF_NOT_SUPPORTED;
+		ctx->dsi_crc = 0;
+		ctx->dsi = NULL;
+		ctx->dsi_size = 0;
+	} else if (p->value.data.size<=5) {
+		return GF_NON_COMPLIANT_BITSTREAM;
+	} else {
+		crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+		if (crc != ctx->dsi_crc) {
+			ctx->dsi_crc = crc;
+			ctx->update_dsi = GF_TRUE;
+			ctx->dsi = p->value.data.ptr + 5;
+			ctx->dsi_size = p->value.data.size - 5;
+		}
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (!p) return GF_NOT_SUPPORTED;
+	ctx->timescale = p->value.uint;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	ctx->ipid = pid;
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+	return GF_OK;
+}
+
+
+
+GF_Err mhasmx_process(GF_Filter *filter)
+{
+	GF_MHASMxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *data, *output;
+	u32 pck_size, size;
+	Bool sap;
+	Bool has_sync = GF_FALSE;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	if (!pck_size) {
+		//if output and packet properties, forward - this is required for sinks using packets for state signaling
+		//such as TS muxer in dash mode looking for EODS property
+		if (ctx->opid && gf_filter_pck_has_properties(pck))
+			gf_filter_pck_forward(pck, ctx->opid);
+
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+	sap = (gf_filter_pck_get_sap(pck)==GF_FILTER_SAP_1) ? GF_TRUE : GF_FALSE;
+
+	if (ctx->is_mpha) {
+		u32 hdr_size = 0;
+		if (ctx->syncp || sap) {
+			hdr_size += 3;
+		}
+		if (sap) {
+			hdr_size += ctx->dsi_size + 2; //base header needs 2 bytes
+			if (ctx->dsi_size > 2046)
+				hdr_size += 3;
+		}
+		hdr_size += 2; //base header needs 2 bytes
+		if (pck_size>2046)
+			hdr_size += 3;
+
+		size = pck_size + hdr_size;
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+
+		gf_bs_reassign_buffer(ctx->bs_w, output, size);
+
+		//write MASH headers
+		if (ctx->syncp || sap) {
+			gf_bs_write_u8(ctx->bs_w, 0xC0);
+			gf_bs_write_u8(ctx->bs_w, 0x01);
+			gf_bs_write_u8(ctx->bs_w, 0xA5);
+		}
+		if (sap) {
+			gf_bs_write_int(ctx->bs_w, 1, 3); //pck type = config
+			gf_bs_write_int(ctx->bs_w, 0, 2); //label = 0
+			//size
+			if (ctx->dsi_size > 2046) {
+				gf_bs_write_int(ctx->bs_w, 2047, 11);
+				gf_bs_write_int(ctx->bs_w, ctx->dsi_size - 2047, 24);
+			} else {
+				gf_bs_write_int(ctx->bs_w, ctx->dsi_size, 11);
+			}
+			gf_bs_write_data(ctx->bs_w, ctx->dsi, ctx->dsi_size);
+		}
+		gf_bs_write_int(ctx->bs_w, 2, 3); //pck type = frame
+		gf_bs_write_int(ctx->bs_w, 1, 2); //label
+		if (pck_size > 2046) {
+			gf_bs_write_int(ctx->bs_w, 2047, 11);
+			gf_bs_write_int(ctx->bs_w, pck_size - 2047, 24);
+		} else {
+			gf_bs_write_int(ctx->bs_w, pck_size, 11);
+		}
+		//copy payload
+		memcpy(output+hdr_size, data, pck_size);
+
+	} else {
+		if ((data[0]==0xC0) && (data[1]==0x01) && (data[2]==0xA5))
+			has_sync = GF_TRUE;
+
+		size = pck_size;
+		if ((ctx->syncp && !has_sync) || (sap && !has_sync)) {
+			size += 3;
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+			if (output) {
+				output[0] = 0xC0;
+				output[1] = 0x01;
+				output[2] = 0xA5;
+				memcpy(output+3, data, pck_size);
+			}
+		} else {
+			dst_pck = gf_filter_pck_new_ref(ctx->opid, 0, 0, pck);
+		}
+		if (!dst_pck) return GF_OUT_OF_MEM;
+	}
+
+	gf_filter_pck_merge_properties(pck, dst_pck);
+	gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
+
+	gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+
+	gf_filter_pck_send(dst_pck);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static GF_Err mhasmx_initialize(GF_Filter *filter)
+{
+	GF_MHASMxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->bs_w = gf_bs_new((u8*)ctx, 1, GF_BITSTREAM_WRITE);
+	return GF_OK;
+}
+
+static void mhasmx_finalize(GF_Filter *filter)
+{
+	GF_MHASMxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
+}
+
+static const GF_FilterCapability MHASMxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_MPHA),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_MHAS),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_MHAS),
+	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_MHASMxCtx, _n)
+static const GF_FilterArgs MHASMxArgs[] =
+{
+	{ OFFS(syncp), "if set, insert sync packet at each frame, otherwise only at SAP", GF_PROP_BOOL, "yes", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+
+GF_FilterRegister MHASMxRegister = {
+	.name = "ufmhas",
+	GF_FS_SET_DESCRIPTION("MHAS writer")
+	GF_FS_SET_HELP("This filter converts MPEG-H Audio streams into MHAS encapsulated data.")
+	.private_size = sizeof(GF_MHASMxCtx),
+	.args = MHASMxArgs,
+	.initialize = mhasmx_initialize,
+	.finalize = mhasmx_finalize,
+	SETCAPS(MHASMxCaps),
+	.configure_pid = mhasmx_configure_pid,
+	.process = mhasmx_process
+};
+
+
+const GF_FilterRegister *mhasmx_register(GF_FilterSession *session)
+{
+	return &MHASMxRegister;
+}
+

gpac-1.0.1.tar.gz/src/filters/rewrite_mp4v.c -> gpac-2.0.0.tar.gz/src/filters/rewrite_mp4v.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG-4 part2 video rewrite filter
@@ -51,33 +51,37 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
 		return GF_NOT_SUPPORTED;
 
-	dcd = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
-	if (!dcd) return GF_NON_COMPLIANT_BITSTREAM;
-
-	crc = gf_crc_32(dcd->value.data.ptr, dcd->value.data.size);
-	if (ctx->crc == crc) return GF_OK;
-	ctx->crc = crc;
-
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
 	}
+	ctx->ipid = pid;
+
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, pid);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
 
-	ctx->ipid = pid;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
+	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+
+	dcd = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	//not ready yet
+	if (!dcd) return GF_OK;
+
+	crc = gf_crc_32(dcd->value.data.ptr, dcd->value.data.size);
+	if (ctx->crc == crc) return GF_OK;
+	ctx->crc = crc;
 
 	ctx->dsi = dcd->value.data.ptr;
 	ctx->dsi_size = dcd->value.data.size;
-
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
-	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
 	return GF_OK;
 }
 
@@ -98,6 +102,15 @@
 	}
 
 	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	if (!pck_size) {
+		//if output and packet properties, forward - this is required for sinks using packets for state signaling
+		//such as TS muxer in dash mode looking for EODS property
+		if (ctx->opid && gf_filter_pck_has_properties(pck))
+			gf_filter_pck_forward(pck, ctx->opid);
+
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
 
 	sap_type = gf_filter_pck_get_sap(pck);
 	if (!sap_type) {
@@ -115,6 +128,7 @@
 		size = pck_size + ctx->dsi_size;
 
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+		if (!dst_pck) return GF_OUT_OF_MEM;
 		memcpy(output, ctx->dsi, ctx->dsi_size);
 		memcpy(output+ctx->dsi_size, data, pck_size);
 		gf_filter_pck_merge_properties(pck, dst_pck);
@@ -154,7 +168,7 @@
 GF_FilterRegister M4VMxRegister = {
 	.name = "ufm4v",
 	GF_FS_SET_DESCRIPTION("M4V writer")
-	GF_FS_SET_HELP("This filter converts MPEG-4 part 2 visual streams into dumpable format (reinsert decoder config).")
+	GF_FS_SET_HELP("This filter converts MPEG-4 part 2 visual streams into writable format (reinsert decoder config).")
 	.private_size = sizeof(GF_M4VMxCtx),
 	.args = M4VMxArgs,
 	SETCAPS(M4VMxCaps),

gpac-1.0.1.tar.gz/src/filters/rewrite_nalu.c -> gpac-2.0.0.tar.gz/src/filters/rewrite_nalu.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / NALU video AnnexB write filter
@@ -28,10 +28,17 @@
 #include <gpac/bitstream.h>
 #include <gpac/internal/media_dev.h>
 
+enum
+{
+	UFNAL_AVC,
+	UFNAL_HEVC,
+	UFNAL_VVC,
+};
+
 typedef struct
 {
 	//opts
-	Bool rcfg, delim;
+	Bool rcfg, delim, pps_inband;
 	u32 extract;
 
 	//only one input pid declared
@@ -39,28 +46,31 @@
 	//only one output pid declared
 	GF_FilterPid *opid;
 
-	Bool is_hevc;
+	u32 vtype;
 
 	u32 nal_hdr_size, crc, crc_enh;
-	u8 *dsi;
-	u32 dsi_size;
+	u8 *dsi, *dsi_non_rap;
+	u32 dsi_size, dsi_non_rap_size;
 
 	GF_BitStream *bs_w, *bs_r;
-	u32 nb_nalu, nb_nalu_in_hdr;
+	u32 nb_nalu, nb_nalu_in_hdr, nb_nalu_in_hdr_non_rap;
 	u32 width, height;
 } GF_NALUMxCtx;
 
 
 
 
-static void nalumx_write_ps_list(GF_NALUMxCtx *ctx, GF_BitStream *bs, GF_List *list)
+static void nalumx_write_ps_list(GF_NALUMxCtx *ctx, GF_BitStream *bs, GF_List *list, Bool for_non_rap)
 {
 	u32 i, count = list ? gf_list_count(list) : 0;
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(list, i);
+		GF_NALUFFParam *sl = gf_list_get(list, i);
 		gf_bs_write_u32(bs, 1);
 		gf_bs_write_data(bs, sl->data, sl->size);
-		ctx->nb_nalu_in_hdr++;
+		if (for_non_rap)
+			ctx->nb_nalu_in_hdr_non_rap++;
+		else
+			ctx->nb_nalu_in_hdr++;
 	}
 }
 
@@ -68,25 +78,41 @@
 {
 	u32 i, count = gf_list_count(cfg->param_array);
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *pa = gf_list_get(cfg->param_array, i);
+		GF_NALUFFParamArray *pa = gf_list_get(cfg->param_array, i);
+		if (pa->type == type) return pa->nalus;
+	}
+	return NULL;
+}
+static GF_List *nalumx_get_vvc_ps(GF_VVCConfig *cfg, u8 type)
+{
+	u32 i, count = gf_list_count(cfg->param_array);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParamArray *pa = gf_list_get(cfg->param_array, i);
 		if (pa->type == type) return pa->nalus;
 	}
 	return NULL;
 }
 
-static GF_Err nalumx_make_inband_header(GF_NALUMxCtx *ctx, char *dsi, u32 dsi_len, char *dsi_enh, u32 dsi_enh_len)
+static GF_Err nalumx_make_inband_header(GF_NALUMxCtx *ctx, char *dsi, u32 dsi_len, char *dsi_enh, u32 dsi_enh_len, Bool for_non_rap)
 {
 	GF_BitStream *bs;
 	GF_AVCConfig *avcc = NULL;
 	GF_AVCConfig *svcc = NULL;
 	GF_HEVCConfig *hvcc = NULL;
 	GF_HEVCConfig *lvcc = NULL;
+	GF_VVCConfig *vvcc = NULL;
+	GF_VVCConfig *s_vvcc = NULL;
 
-	if (ctx->is_hevc) {
+	if (ctx->vtype==UFNAL_HEVC) {
 		if (dsi) hvcc = gf_odf_hevc_cfg_read(dsi, dsi_len, GF_FALSE);
 		if (dsi_enh) lvcc = gf_odf_hevc_cfg_read(dsi_enh, dsi_enh_len, GF_TRUE);
 		if (!hvcc && !lvcc) return GF_NON_COMPLIANT_BITSTREAM;
 		ctx->nal_hdr_size = hvcc ? hvcc->nal_unit_size : lvcc->nal_unit_size;
+	} else if (ctx->vtype==UFNAL_VVC) {
+		if (dsi) vvcc = gf_odf_vvc_cfg_read(dsi, dsi_len);
+		if (dsi_enh) s_vvcc = gf_odf_vvc_cfg_read(dsi_enh, dsi_enh_len);
+		if (!vvcc && !s_vvcc) return GF_NON_COMPLIANT_BITSTREAM;
+		ctx->nal_hdr_size = vvcc ? vvcc->nal_unit_size : s_vvcc->nal_unit_size;
 	} else {
 		if (dsi) avcc = gf_odf_avc_cfg_read(dsi, dsi_len);
 		if (dsi_enh) svcc = gf_odf_avc_cfg_read(dsi_enh, dsi_enh_len);
@@ -95,63 +121,84 @@
 	}
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	if (avcc || svcc) {
-		if (avcc) {
-			nalumx_write_ps_list(ctx, bs, avcc->sequenceParameterSets);
+		if (avcc && !for_non_rap) {
+			nalumx_write_ps_list(ctx, bs, avcc->sequenceParameterSets, for_non_rap);
 		}
 
-		if (svcc)
-			nalumx_write_ps_list(ctx, bs, svcc->sequenceParameterSets);
+		if (svcc && !for_non_rap)
+			nalumx_write_ps_list(ctx, bs, svcc->sequenceParameterSets, for_non_rap);
 
-		if (avcc && avcc->sequenceParameterSetExtensions)
-			nalumx_write_ps_list(ctx, bs, avcc->sequenceParameterSetExtensions);
+		if (avcc && avcc->sequenceParameterSetExtensions && !for_non_rap)
+			nalumx_write_ps_list(ctx, bs, avcc->sequenceParameterSetExtensions, for_non_rap);
 
-		if (svcc && svcc->sequenceParameterSetExtensions)
-			nalumx_write_ps_list(ctx, bs, svcc->sequenceParameterSetExtensions);
+		if (svcc && svcc->sequenceParameterSetExtensions && !for_non_rap)
+			nalumx_write_ps_list(ctx, bs, svcc->sequenceParameterSetExtensions, for_non_rap);
 
 		if (avcc)
-			nalumx_write_ps_list(ctx, bs, avcc->pictureParameterSets);
+			nalumx_write_ps_list(ctx, bs, avcc->pictureParameterSets, for_non_rap);
 
 		if (svcc)
-			nalumx_write_ps_list(ctx, bs, svcc->pictureParameterSets);
+			nalumx_write_ps_list(ctx, bs, svcc->pictureParameterSets, for_non_rap);
 	}
 	if (hvcc || lvcc) {
+		if (hvcc && !for_non_rap)
+			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(hvcc, GF_HEVC_NALU_VID_PARAM), for_non_rap);
+		if (lvcc && !for_non_rap)
+			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(lvcc, GF_HEVC_NALU_VID_PARAM), for_non_rap);
+		if (hvcc && !for_non_rap)
+			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(hvcc, GF_HEVC_NALU_SEQ_PARAM), for_non_rap);
+		if (lvcc && !for_non_rap)
+			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(lvcc, GF_HEVC_NALU_SEQ_PARAM), for_non_rap);
 		if (hvcc)
-			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(hvcc, GF_HEVC_NALU_VID_PARAM));
-		if (lvcc)
-			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(lvcc, GF_HEVC_NALU_VID_PARAM));
-		if (hvcc)
-			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(hvcc, GF_HEVC_NALU_SEQ_PARAM));
-		if (lvcc)
-			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(lvcc, GF_HEVC_NALU_SEQ_PARAM));
-		if (hvcc)
-			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(hvcc, GF_HEVC_NALU_PIC_PARAM));
+			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(hvcc, GF_HEVC_NALU_PIC_PARAM), for_non_rap);
 		if (lvcc)
-			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(lvcc, GF_HEVC_NALU_PIC_PARAM));
+			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(lvcc, GF_HEVC_NALU_PIC_PARAM), for_non_rap);
+	}
+
+	if (vvcc || s_vvcc) {
+		u32 dump_types[] = {GF_VVC_NALU_VID_PARAM, GF_VVC_NALU_DEC_PARAM, GF_VVC_NALU_SEQ_PARAM, GF_VVC_NALU_PIC_PARAM, GF_VVC_NALU_APS_PREFIX, GF_VVC_NALU_SEI_PREFIX};
+		u32 i = for_non_rap ? 3 : 0;
+
+		for (; i< GF_ARRAY_LENGTH(dump_types); i++) {
+			if (vvcc)
+				nalumx_write_ps_list(ctx, bs, nalumx_get_vvc_ps(vvcc, dump_types[i]), for_non_rap);
+			if (s_vvcc)
+				nalumx_write_ps_list(ctx, bs, nalumx_get_vvc_ps(s_vvcc, dump_types[i]), for_non_rap);
+		}
+	}
+
+	if (for_non_rap) {
+		if (ctx->dsi_non_rap) gf_free(ctx->dsi_non_rap);
+		gf_bs_get_content(bs, &ctx->dsi_non_rap, &ctx->dsi_non_rap_size);
+	} else {
+		if (ctx->dsi) gf_free(ctx->dsi);
+		gf_bs_get_content(bs, &ctx->dsi, &ctx->dsi_size);
 	}
-	if (ctx->dsi) gf_free(ctx->dsi);
-	gf_bs_get_content(bs, &ctx->dsi, &ctx->dsi_size);
 	gf_bs_del(bs);
 
 	if (avcc) gf_odf_avc_cfg_del(avcc);
 	if (svcc) gf_odf_avc_cfg_del(svcc);
 	if (hvcc) gf_odf_hevc_cfg_del(hvcc);
 	if (lvcc) gf_odf_hevc_cfg_del(lvcc);
-
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+	if (vvcc) gf_odf_vvc_cfg_del(vvcc);
+	if (s_vvcc) gf_odf_vvc_cfg_del(s_vvcc);
 
 	return GF_OK;
 }
 
 GF_Err nalumx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
+	GF_Err e;
 	u32 crc, crc_enh, codecid;
 	const GF_PropertyValue *p, *dcd, *dcd_enh;
 	GF_NALUMxCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -171,14 +218,23 @@
 	dcd_enh = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
 
 	crc_enh = dcd_enh ? gf_crc_32(dcd_enh->value.data.ptr, dcd_enh->value.data.size) : 0;
-	if ((ctx->crc == crc) && (ctx->crc_enh == crc_enh)) return GF_OK;
+	if ((ctx->crc == crc) && (ctx->crc_enh == crc_enh)) {
+		if (ctx->opid) {
+			//copy properties at init or reconfig
+			gf_filter_pid_copy_properties(ctx->opid, pid);
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+		}
+		return GF_OK;
+	}
 	ctx->crc = crc;
 	ctx->crc_enh = crc_enh;
 
 	if ((codecid==GF_CODECID_HEVC) || (codecid==GF_CODECID_LHVC)) {
-		ctx->is_hevc = GF_TRUE;
+		ctx->vtype = UFNAL_HEVC;
+	} else if (codecid==GF_CODECID_VVC) {
+		ctx->vtype = UFNAL_VVC;
 	} else {
-		ctx->is_hevc = GF_FALSE;
+		ctx->vtype = UFNAL_AVC;
 	}
 
 	ctx->width = ctx->height = 0;
@@ -193,22 +249,24 @@
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, pid);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL );
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL );
 
 	ctx->ipid = pid;
 	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
 	if (!dcd && !dcd_enh)
 		return GF_OK;
 
-	return nalumx_make_inband_header(ctx, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0, dcd_enh ? dcd_enh->value.data.ptr : NULL, dcd_enh ? dcd_enh->value.data.size : 0);
+	e = nalumx_make_inband_header(ctx, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0, dcd_enh ? dcd_enh->value.data.ptr : NULL, dcd_enh ? dcd_enh->value.data.size : 0, GF_FALSE);
+	if (e) return e;
+
+	if (!ctx->pps_inband || !ctx->rcfg) return GF_OK;
+	return nalumx_make_inband_header(ctx, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0, dcd_enh ? dcd_enh->value.data.ptr : NULL, dcd_enh ? dcd_enh->value.data.size : 0, GF_TRUE);
 }
 
 
-static Bool nalumx_is_nal_skip(GF_NALUMxCtx *ctx, char *data, u32 pos, Bool *has_nal_delim, u32 *out_temporal_id, u32 *out_layer_id, u8 *avc_hdr)
+static Bool nalumx_is_nal_skip(GF_NALUMxCtx *ctx, u8 *data, u32 pos, Bool *has_nal_delim, u32 *out_temporal_id, u32 *out_layer_id, u8 *avc_hdr)
 {
 	Bool is_layer = GF_FALSE;
-	if (ctx->is_hevc) {
+	if (ctx->vtype==UFNAL_HEVC) {
 		u8 nal_type = (data[pos] & 0x7E) >> 1;
 		u8 temporal_id = data[pos+1] & 0x7;
 		u8 layer_id = data[pos] & 1;
@@ -227,6 +285,23 @@
 			if (layer_id) is_layer = GF_TRUE;
 			break;
 		}
+	} else if (ctx->vtype==UFNAL_VVC) {
+		u8 nal_type = data[pos+1] >> 3;
+		u8 temporal_id = (data[pos+1] & 0x7) - 1;
+		u8 layer_id = data[pos] & 0x3f;
+		if (temporal_id > *out_temporal_id) *out_temporal_id = temporal_id;
+		if (! (*out_layer_id) ) *out_layer_id = layer_id;
+
+		switch (nal_type) {
+		case GF_VVC_NALU_VID_PARAM:
+			break;
+		case GF_VVC_NALU_ACCESS_UNIT:
+			*has_nal_delim = GF_TRUE;
+			break;
+		default:
+			if (layer_id) is_layer = GF_TRUE;
+			break;
+		}
 	} else {
 		u32 nal_type = data[pos] & 0x1F;
 		switch (nal_type) {
@@ -258,14 +333,25 @@
 	GF_NALUMxCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck, *dst_pck;
 	u8 *data, *output;
-	u32 pck_size, size, sap, temporal_id, layer_id;
+	u32 pck_size, size, sap=0, temporal_id, layer_id;
 	u8 avc_hdr;
-	Bool insert_dsi = GF_FALSE;
+	u8 *dsi_buf = NULL;
+	u32 dsi_buf_size = 0, dsi_nb_nal = 0;
+
 	Bool has_nalu_delim = GF_FALSE;
 
 	pck = gf_filter_pid_get_packet(ctx->ipid);
 	if (!pck) {
 		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (!ctx->nb_nalu && ctx->dsi) {
+				dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->dsi_size, &output);
+				if (!dst_pck) return GF_OUT_OF_MEM;
+
+				memcpy(output, ctx->dsi, ctx->dsi_size);
+				gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+				gf_filter_pck_send(dst_pck);
+				ctx->nb_nalu += ctx->nb_nalu_in_hdr;
+			}
 			gf_filter_pid_set_eos(ctx->opid);
 			return GF_EOS;
 		}
@@ -273,12 +359,17 @@
 	}
 
 	if (!ctx->nal_hdr_size) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[NALWrite] no NAL size length field set, assuming 4\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[NALWrite] no NAL size length field set, assuming 4\n"));
 		ctx->nal_hdr_size = 4;
 	}
 
 	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
 	if (!pck_size || !data) {
+		//if output and packet properties, forward - this is required for sinks using packets for state signaling
+		//such as TS muxer in dash mode looking for EODS property
+		if (ctx->opid && gf_filter_pck_has_properties(pck))
+			gf_filter_pck_forward(pck, ctx->opid);
+
 		gf_filter_pid_drop_packet(ctx->ipid);
 		return GF_OK;
 	}
@@ -319,13 +410,14 @@
 	if (!ctx->delim)
 		has_nalu_delim = GF_TRUE;
 
-	//we need to insert NALU delim
+	//we need to insert NALU delim (2 bytes for avc, 3 for hevc or vvc)
 	if (!has_nalu_delim) {
-		size += ctx->is_hevc ? 3 : 2;
+		size += (ctx->vtype != UFNAL_AVC) ? 3 : 2;
 		size += 4;
 	}
 
 	if (ctx->dsi) {
+		Bool insert_dsi = GF_FALSE;
 		sap = gf_filter_pck_get_sap(pck);
 		if (sap && (sap <= GF_FILTER_SAP_3) ) {
 			insert_dsi = GF_TRUE;
@@ -341,11 +433,19 @@
 		}
 
 		if (insert_dsi) {
-			size += ctx->dsi_size;
+			dsi_buf = ctx->dsi;
+			dsi_buf_size = ctx->dsi_size;
+			dsi_nb_nal = ctx->nb_nalu_in_hdr;
+		} else if (ctx->dsi_non_rap) {
+			dsi_buf = ctx->dsi_non_rap;
+			dsi_buf_size = ctx->dsi_non_rap_size;
+			dsi_nb_nal = ctx->nb_nalu_in_hdr_non_rap;
 		}
+		size += dsi_buf_size;
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	if (!ctx->bs_w) ctx->bs_w = gf_bs_new(output, size, GF_BITSTREAM_WRITE);
 	else gf_bs_reassign_buffer(ctx->bs_w, output, size);
@@ -353,7 +453,7 @@
 	// nalu delimiter is not present, write it first
 	if (!has_nalu_delim) {
 		gf_bs_write_u32(ctx->bs_w, 1);
-		if (ctx->is_hevc) {
+		if (ctx->vtype==UFNAL_HEVC) {
 			if (!layer_id)
 				layer_id=1;
 			if (!temporal_id)
@@ -361,12 +461,25 @@
 #ifndef GPAC_DISABLE_HEVC
 			gf_bs_write_int(ctx->bs_w, 0, 1);
 			gf_bs_write_int(ctx->bs_w, GF_HEVC_NALU_ACCESS_UNIT, 6);
-			gf_bs_write_int(ctx->bs_w, layer_id-1, 6); //we should pick the layerID of the following nalus ...
+			gf_bs_write_int(ctx->bs_w, layer_id-1, 6);
 			gf_bs_write_int(ctx->bs_w, temporal_id, 3);
 			/*pic-type - by default we signal all slice types possible*/
 			gf_bs_write_int(ctx->bs_w, 2, 3);
-			gf_bs_write_int(ctx->bs_w, 0, 5);
+			gf_bs_write_int(ctx->bs_w, 1, 1); //stop bit
+			gf_bs_write_int(ctx->bs_w, 0, 4); //4 bits to 0
 #endif
+		} else if (ctx->vtype==UFNAL_VVC) {
+			gf_bs_write_int(ctx->bs_w, 0, 1);
+			gf_bs_write_int(ctx->bs_w, 0, 1);
+			gf_bs_write_int(ctx->bs_w, layer_id, 6);
+			gf_bs_write_int(ctx->bs_w, GF_VVC_NALU_ACCESS_UNIT, 5);
+			gf_bs_write_int(ctx->bs_w, temporal_id+1, 3);
+			gf_bs_write_int(ctx->bs_w, sap ? 1 : 0, 1);
+			/*pic-type - by default we signal all slice types possible*/
+			gf_bs_write_int(ctx->bs_w, 2, 3);
+
+			gf_bs_write_int(ctx->bs_w, 1, 1); //stop bit
+			gf_bs_write_int(ctx->bs_w, 0, 3); //3 bits to 0
 		} else {
 			gf_bs_write_int(ctx->bs_w, (avc_hdr & 0x60) | GF_AVC_NALU_ACCESS_UNIT, 8);
 			gf_bs_write_int(ctx->bs_w, 0xF0 , 8); /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
@@ -401,10 +514,10 @@
 		}
 
 		//insert dsi only after NALUD if any
-		if (insert_dsi && !is_nalu_delim) {
-			insert_dsi = GF_FALSE;
-			gf_bs_write_data(ctx->bs_w, ctx->dsi, ctx->dsi_size);
-			ctx->nb_nalu += ctx->nb_nalu_in_hdr;
+		if (dsi_buf && !is_nalu_delim) {
+			gf_bs_write_data(ctx->bs_w, dsi_buf, dsi_buf_size);
+			ctx->nb_nalu += dsi_nb_nal;
+			dsi_buf = NULL;
 
 			if (!ctx->rcfg) {
 				gf_free(ctx->dsi);
@@ -430,7 +543,7 @@
 	if (gf_filter_reporting_enabled(filter)) {
 		char szStatus[1024];
 
-		sprintf(szStatus, "%s Annex-B %dx%d % 10d NALU", ctx->is_hevc ? "HEVC":"AVC|H264", ctx->width, ctx->height, ctx->nb_nalu);
+		sprintf(szStatus, "%s Annex-B %dx%d % 10d NALU", (ctx->vtype==UFNAL_HEVC) ? "HEVC" : ((ctx->vtype==UFNAL_VVC) ? "VVC" : "AVC|H264"), ctx->width, ctx->height, ctx->nb_nalu);
 		gf_filter_update_status(filter, -1, szStatus);
 
 	}
@@ -443,6 +556,7 @@
 	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
 	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
 	if (ctx->dsi) gf_free(ctx->dsi);
+	if (ctx->dsi_non_rap) gf_free(ctx->dsi_non_rap);
 }
 
 static const GF_FilterCapability NALUMxCaps[] =
@@ -459,6 +573,20 @@
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
 	CAP_UINT(GF_CAPS_INPUT_OUTPUT_OPT,GF_PROP_PID_CODECID, GF_CODECID_LHVC),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_VVC),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	{0},
+	//for HLS-SAES AVC
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_PROTECTION_SCHEME_TYPE, GF_4CC('s','a','e','s') ),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_AVC),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
 };
 
@@ -468,10 +596,11 @@
 {
 	{ OFFS(rcfg), "force repeating decoder config at each I-frame", GF_PROP_BOOL, "true", NULL, 0},
 	{ OFFS(extract), "layer extraction mode\n"
-	"- full: extracts all layers\n"
+	"- all: extracts all layers\n"
 	"- base: extract base layer only\n"
 	"- layer: extract non-base layer(s) only", GF_PROP_UINT, "all", "all|base|layer", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(delim), "insert AU Delimiter NAL", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(pps_inband), "inject PPS at each non SAP frame, ignored if rcfg is not set", GF_PROP_BOOL, "false", NULL, 0},
 	{0}
 };

gpac-1.0.1.tar.gz/src/filters/rewrite_obu.c -> gpac-2.0.0.tar.gz/src/filters/rewrite_obu.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
+ *			Copyright (c) Telecom ParisTech 2018-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / AV1 OBU rewrite filter
@@ -61,7 +61,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -84,8 +87,6 @@
 
 	ctx->ipid = pid;
 
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
-
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_CODECID);
 	ctx->codec_id = p ? p->value.uint : 0;
 	switch (ctx->codec_id) {
@@ -101,7 +102,7 @@
 				ctx->ivf_hdr = 1;
 			}
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[OBUWrite] Couldn't guess desired output format type, assuming plain OBU\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[OBUWrite] Couldn't guess desired output format type, assuming plain OBU\n"));
 		}
 		break;
 	case GF_CODECID_VP8:
@@ -119,7 +120,7 @@
 		GF_AV1_OBUArrayEntry *obu;
 		ctx->av1c = gf_odf_av1_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
 		if (!ctx->av1c) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[OBUWrite] Invalid av1 config\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[OBUWrite] Invalid av1 config\n"));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		ctx->av1b_cfg_size = 0;
@@ -177,6 +178,17 @@
 	}
 
 	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	if (!pck_size) {
+		//if output and packet properties, forward - this is required for sinks using packets for state signaling
+		//such as TS muxer in dash mode looking for EODS property
+		if (ctx->opid && gf_filter_pck_has_properties(pck))
+			gf_filter_pck_forward(pck, ctx->opid);
+
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+
 	hdr_size = 0;
 	size = pck_size;
 	//always add temporal delim
@@ -222,7 +234,7 @@
 			gf_av1_parse_obu_header(ctx->bs_r, &obu_type, &obu_extension_flag, &obu_has_size_field, &temporal_id, &spatial_id);
 
 			if (!obu_has_size_field) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[OBUWrite] OBU without size field, bug in demux filter !!\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[OBUWrite] OBU without size field, bug in demux filter !!\n"));
 				return GF_NON_COMPLIANT_BITSTREAM;
 			}
 			obu_size = (u32)gf_av1_leb128_read(ctx->bs_r, NULL);
@@ -235,7 +247,7 @@
 			if (obu_type==OBU_FRAME) {
 				frame_idx++;
 				if (frame_idx==128) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[OBUWrite] more than 128 frames in a temporal unit not supported\n"));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[OBUWrite] more than 128 frames in a temporal unit not supported\n"));
 					return GF_NOT_SUPPORTED;
 				}
 				if (frame_idx>1)
@@ -260,6 +272,8 @@
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, hdr_size+size, &output);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+	
 	gf_filter_pck_merge_properties(pck, dst_pck);
 
 	if (!ctx->bs_w) ctx->bs_w = gf_bs_new(output, hdr_size+size, GF_BITSTREAM_WRITE);
@@ -322,25 +336,45 @@
 			gf_bs_write_u16_le(ctx->bs_w, 0);
 			gf_bs_write_u16_le(ctx->bs_w, 32);
 
-			gf_bs_write_u32(ctx->bs_w, GF_4CC('A', 'V', '0', '1') ); //codec_fourcc
+			//codec_fourcc
+			switch (ctx->codec_id) {
+			case GF_CODECID_AV1:
+				gf_bs_write_u32(ctx->bs_w, GF_4CC('A', 'V', '0', '1') );
+				break;
+			case GF_CODECID_VP8:
+				gf_bs_write_u32(ctx->bs_w, GF_4CC('V', 'P', '8', '0') );
+				break;
+			case GF_CODECID_VP9:
+				gf_bs_write_u32(ctx->bs_w, GF_4CC('V', 'P', '9', '0') );
+				break;
+			case GF_CODECID_VP10:
+				gf_bs_write_u32(ctx->bs_w, GF_4CC('V', 'P', '1', '0') );
+				break;
+			default:
+				gf_bs_write_u32(ctx->bs_w, ctx->codec_id);
+				break;
+			}
+
 			gf_bs_write_u16_le(ctx->bs_w, ctx->w);
 			gf_bs_write_u16_le(ctx->bs_w, ctx->h);
 			gf_bs_write_u32_le(ctx->bs_w, ctx->fps.num);
 			gf_bs_write_u32_le(ctx->bs_w, ctx->fps.den);
-			gf_bs_write_u32_le(ctx->bs_w, 0); //nb frames
+			const GF_PropertyValue *p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_NB_FRAMES);
+			//nb frames
+			if (p)
+				gf_bs_write_u32_le(ctx->bs_w, p->value.uint );
+			else
+				gf_bs_write_u32_le(ctx->bs_w, 0);
 			gf_bs_write_u32_le(ctx->bs_w, 0);
 			ctx->ivf_hdr = 0;
 		}
 		if (ctx->mode==2) {
-			u64 cts = gf_filter_pck_get_cts(pck);
-			cts *= ctx->fps.den;
-			cts /= ctx->fps.num;
-			cts /= gf_filter_pck_get_timescale(pck);
+			u64 cts = gf_timestamp_rescale(gf_filter_pck_get_cts(pck), ctx->fps.den * gf_filter_pck_get_timescale(pck), ctx->fps.num);
 			gf_bs_write_u32_le(ctx->bs_w, size);
-			gf_bs_write_u64(ctx->bs_w, cts);
+			gf_bs_write_u64_le(ctx->bs_w, cts);
 		}
 		if (ctx->codec_id==GF_CODECID_AV1) {
-			//write temporal delim with obu size set
+			//write temporal delim without obu size set
 			gf_bs_write_u8(ctx->bs_w, 0x12);
 			gf_bs_write_u8(ctx->bs_w, 0);
 
@@ -396,7 +430,10 @@
 GF_FilterRegister OBUMxRegister = {
 	.name = "ufobu",
 	GF_FS_SET_DESCRIPTION("IVF/OBU/annexB writer")
-	GF_FS_SET_HELP("This filter is used to rewrite AV1 OBU bitstream into IVF, annex B or OBU sequence, reinserting the temporal delimiter OBU.")
+	GF_FS_SET_HELP("This filter rewrites VPx or AV1 bitstreams into a IVF, annexB or OBU sequence.\n"
+	"The temporal delimiter OBU is re-inserted in annexB (`.av1` and `.av1b`files, with obu_size set) and OBU sequences (`.obu`files, without obu_size)\n"
+	"Note: VP8/9 codecs will only use IVF output (equivalent to file extension `.ivf` or `:ext=ivf` set on output).\n"
+	)
 	.private_size = sizeof(GF_OBUMxCtx),
 	.args = OBUMxArgs,
 	SETCAPS(OBUMxCaps),

gpac-1.0.1.tar.gz/src/filters/tileagg.c -> gpac-2.0.0.tar.gz/src/filters/tileagg.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2019
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / tile aggregrator filter
@@ -32,119 +32,272 @@
 
 typedef struct
 {
+	GF_FilterPid *pid;
+	u32 id;
+} GF_TileAggInput;
+
+typedef struct
+{
 	//options
 	GF_PropUIntList tiledrop;
+	u32 ttimeout;
 
 	//internal
 	GF_FilterPid *opid;
 	GF_FilterPid *base_ipid;
 	u32 nalu_size_length;
 	u32 base_id;
+	GF_List *ipids;
 
 	GF_BitStream *bs_r;
+
+	u32 flush_packets;
+	const GF_PropertyValue *sabt;
+
+	Bool check_connections;
+	GF_Err in_error;
+	u32 wait_start, wait_pid;
+	Bool is_playing;
+	GF_FEVT_Play play_evt;
+
 } GF_TileAggCtx;
 
+#define TILEAGG_CFG_ERR(_msg) {\
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[TileAgg] Error configuring pid %s: %s\n", gf_filter_pid_get_name(pid), _msg ));\
+		goto config_error;\
+	}
+
 
 static GF_Err tileagg_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	u32 codec_id=0;
 	const GF_PropertyValue *p;
-	GF_HEVCConfig *hvcc;
+	GF_TileAggInput *pctx;
+
 	GF_TileAggCtx *ctx = (GF_TileAggCtx *) gf_filter_get_udta(filter);
+	if (ctx->in_error) return GF_SERVICE_ERROR;
 
+	pctx = gf_filter_pid_get_udta(pid);
 	if (is_remove) {
+		if (pctx) {
+			gf_list_del_item(ctx->ipids, pctx);
+			gf_free(pctx);
+		}
 		if (ctx->base_ipid == pid) {
-			gf_filter_pid_remove(ctx->opid);
-			ctx->opid = NULL;
+			if (ctx->opid) {
+				gf_filter_pid_remove(ctx->opid);
+				ctx->opid = NULL;
+			}
 		}
 		return GF_OK;
 	}
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
-	if (!p) return GF_NOT_SUPPORTED;
+	if (!p) TILEAGG_CFG_ERR("missing CodecID")
 	codec_id = p->value.uint;
 
+	Bool is_base_codec_type = GF_FALSE;
+	if (codec_id==GF_CODECID_HEVC) is_base_codec_type = GF_TRUE;
+	else if (codec_id==GF_CODECID_VVC) is_base_codec_type = GF_TRUE;
 
-	if ((codec_id==GF_CODECID_HEVC) && ctx->base_ipid && (ctx->base_ipid != pid)) return GF_REQUIRES_NEW_INSTANCE;
+	//a single base is allowed per instance
+	if (is_base_codec_type && ctx->base_ipid && (ctx->base_ipid != pid))
+		return GF_REQUIRES_NEW_INSTANCE;
 
-	if ((codec_id==GF_CODECID_HEVC_TILES) && !ctx->base_ipid) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TileAggr] Base HEVC PID not found for tiled HEVC PID %s\n", gf_filter_pid_get_name(pid) ));
-		return GF_NOT_SUPPORTED;
+	//a tile pid connected before our base, check we have the same base ID, otherwise we need a new instance
+	if (is_base_codec_type && !ctx->base_ipid && ctx->base_id) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		if (!p) TILEAGG_CFG_ERR("missing PID ID")
+
+		if (ctx->base_id != p->value.uint)
+			return GF_REQUIRES_NEW_INSTANCE;
+
+		ctx->base_ipid = pid;
+		if (!ctx->opid) {
+			ctx->opid = gf_filter_pid_new(filter);
+		}
 	}
+	//tile pid connecting after another tile pid, we share the same base
+	if (!is_base_codec_type && ctx->base_id) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DEPENDENCY_ID);
+		if (!p) TILEAGG_CFG_ERR("missing PID DependencyID")
 
-	if (!ctx->opid) ctx->opid = gf_filter_pid_new(filter);
+		if (ctx->base_id != p->value.uint)
+			return GF_REQUIRES_NEW_INSTANCE;
+	}
+
+	if (!pctx) {
+		GF_SAFEALLOC(pctx, GF_TileAggInput);
+		pctx->pid = pid;
+		gf_filter_pid_set_udta(pid, pctx);
+		gf_list_add(ctx->ipids, pctx);
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+	pctx->id = p ? p->value.uint : 0;
 
-	if (!ctx->base_ipid) {
+	if (!ctx->base_ipid && is_base_codec_type ) {
 		ctx->base_ipid = pid;
+		if (!ctx->opid) {
+			ctx->opid = gf_filter_pid_new(filter);
+		}
 	}
+	ctx->check_connections = GF_TRUE;
+
 	if (ctx->base_ipid == pid) {
 		gf_filter_pid_copy_properties(ctx->opid, ctx->base_ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TILE_BASE, NULL);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD, NULL);
 		//we keep the SRDREF property to indicate this was a tiled HEVC reassembled
-		gf_filter_pid_set_property_str(ctx->opid, "isom:sabt", NULL);
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
-		if (!p) return GF_NOT_SUPPORTED;
-		hvcc = gf_odf_hevc_cfg_read(p->value.data.ptr, p->value.data.size, GF_FALSE);
-		ctx->nalu_size_length = hvcc ? hvcc->nal_unit_size : 4;
-		if (hvcc) gf_odf_hevc_cfg_del(hvcc);
+		//not ready yet
+		if (!p) return GF_OK;
+
+		if (codec_id==GF_CODECID_HEVC) {
+			GF_HEVCConfig *hvcc = gf_odf_hevc_cfg_read(p->value.data.ptr, p->value.data.size, GF_FALSE);
+			ctx->nalu_size_length = hvcc ? hvcc->nal_unit_size : 4;
+			if (hvcc) gf_odf_hevc_cfg_del(hvcc);
+			gf_filter_pid_set_property_str(ctx->opid, "isom:sabt", NULL);
+			ctx->sabt = gf_filter_pid_get_property_str(pid, "isom:sabt");
+		} else {
+			GF_VVCConfig *vvcc = gf_odf_vvc_cfg_read(p->value.data.ptr, p->value.data.size);
+			ctx->nalu_size_length = vvcc ? vvcc->nal_unit_size : 4;
+			if (vvcc) gf_odf_vvc_cfg_del(vvcc);
+			gf_filter_pid_set_property_str(ctx->opid, "isom:subp", NULL);
+			//todo, need to handle spor override, for now we only support all subpic in order
+//			ctx->sabt = gf_filter_pid_get_property_str(pid, "isom:subp");
+		}
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
-		if (!p) return GF_NOT_SUPPORTED;
+		if (!p) TILEAGG_CFG_ERR("missing PID ID, base PID assigned")
 		ctx->base_id = p->value.uint;
+
 	} else {
+		u32 base_id;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DEPENDENCY_ID);
-		if (!p) return GF_NOT_SUPPORTED;
-		if (ctx->base_id != p->value.uint) return GF_NOT_SUPPORTED;
+		if (!p) TILEAGG_CFG_ERR("missing PID DependencyID, base PID not assigned")
+
+		base_id = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		if (!p || (base_id == p->value.uint)) TILEAGG_CFG_ERR("missing PID ID, base PID not assigned")
+
+		if (!ctx->base_ipid) {
+			ctx->base_id = base_id;
+		}
+		//we already checked the same base ID is used
 	}
 
+	//it may happen that we are already running when we get this pid connection, typically with very large number of tiles
+	//post a play event on pid in this case
+	if (ctx->is_playing) {
+		GF_FilterEvent fevt;
+		fevt.play = ctx->play_evt;
+		fevt.base.on_pid = pid;
+		gf_filter_pid_send_event(pid, &fevt);
+	}
 	return GF_OK;
+
+config_error:
+	if (ctx->opid) gf_filter_pid_set_eos(ctx->opid);
+	if (ctx->base_id) ctx->in_error = GF_NON_COMPLIANT_BITSTREAM;
+	return GF_SERVICE_ERROR;
+
+}
+
+static GF_Err tileagg_set_eos(GF_Filter *filter, GF_TileAggCtx *ctx)
+{
+	u32 i, count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+		gf_filter_pid_set_discard(pid, GF_TRUE);
+	}
+
+	gf_filter_pid_set_eos(ctx->opid);
+	return GF_EOS;
 }
 
 
 static GF_Err tileagg_process(GF_Filter *filter)
 {
 	GF_TileAggCtx *ctx = (GF_TileAggCtx *) gf_filter_get_udta(filter);
-	u32 i, j, count = gf_filter_get_ipid_count(filter);
-	GF_FilterPacket *pck, *dst_pck;
+	u32 i, j;
+	GF_FilterPacket *dst_pck, *base_pck;
+	u32 count;
 	u64 min_cts = GF_FILTER_NO_TS;
-	u32 pck_size, size = 0;
-	u32 pos;
+	u32 pck_size, final_size, size = 0;
+	u32 pos, nb_ready=0;
+	u32 sabt_idx;
 	Bool has_sei_suffix = GF_FALSE;
 	const char *data;
 	u8 *output;
+
+	if (ctx->in_error) {
+		return ctx->in_error;
+	}
 	if (!ctx->base_ipid) return GF_EOS;
 
-	pck = gf_filter_pid_get_packet(ctx->base_ipid);
-	if (!pck) {
+	if (ctx->check_connections) {
+		if (gf_filter_connections_pending(filter)) {
+			return GF_OK;
+		}
+		ctx->check_connections = GF_FALSE;
+	}
+
+
+	base_pck = gf_filter_pid_get_packet(ctx->base_ipid);
+	if (!base_pck) {
+		ctx->flush_packets = 0;
 		if (gf_filter_pid_is_eos(ctx->base_ipid)) {
-			gf_filter_pid_set_eos(ctx->opid);
-			return GF_EOS;
+			return tileagg_set_eos(filter, ctx);
 		}
 		return GF_OK;
 	}
-	min_cts = gf_filter_pck_get_cts(pck);
-	gf_filter_pck_get_data(pck, &pck_size);
+
+	min_cts = gf_filter_pck_get_cts(base_pck);
+	gf_filter_pck_get_data(base_pck, &pck_size);
 	size = pck_size;
 
+	count = gf_list_count(ctx->ipids);
 	for (i=0; i<count; i++) {
+		GF_FilterPacket *pck;
 		u64 cts;
 		Bool do_drop=GF_FALSE;
-		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
-		if (pid==ctx->base_ipid) continue;
+		GF_TileAggInput *pctx = gf_list_get(ctx->ipids, i);
+		if (pctx->pid==ctx->base_ipid) continue;
 		while (1) {
-			pck = gf_filter_pid_get_packet(pid);
-			if (!pck) return GF_OK;
+			pck = gf_filter_pid_get_packet(pctx->pid);
+			if (!pck) {
+				if (gf_filter_pid_is_eos(pctx->pid)) {
+					return tileagg_set_eos(filter, ctx);
+				}
+				//if we are flushing a segment, consider the PID discarded if no packet
+				//otherwise wait for packet
+				if (! ctx->flush_packets) {
+					if (ctx->wait_pid != pctx->id) {
+						ctx->wait_start = gf_sys_clock();
+						ctx->wait_pid = pctx->id;
+						return GF_OK;
+					} else if (!ctx->ttimeout || (gf_sys_clock() - ctx->wait_start < ctx->ttimeout)) {
+						gf_filter_ask_rt_reschedule(filter, 0);
+						return GF_OK;
+					} else {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[TileAgg] No frames on tiled pid %s after %d ms, reaggregating with lost tiles\n", gf_filter_pid_get_name(pctx->pid), gf_sys_clock() - ctx->wait_start ));
+						break;
+					}
+				}
+				break;
+			}
 
 			cts = gf_filter_pck_get_cts(pck);
 			if (cts < min_cts) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[TileAggr] Tiled pid %s with cts "LLU" less than base tile pid cts "LLU" - discarding packet\n", gf_filter_pid_get_name(pid), cts, min_cts ));
-				gf_filter_pid_drop_packet(pid);
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[TileAgg] Tiled pid %s with cts "LLU" less than base tile pid cts "LLU" - discarding packet\n", gf_filter_pid_get_name(pctx->pid), cts, min_cts ));
+				gf_filter_pid_drop_packet(pctx->pid);
 			} else {
 				break;
 			}
 		}
-		assert(pck);
+
+		if (!pck) continue;
+
 		if (cts > min_cts) continue;
 
 		for (j=0; j<ctx->tiledrop.nb_items; j++) {
@@ -152,18 +305,28 @@
 				do_drop=GF_TRUE;
 		}
 		if (do_drop) {
-			gf_filter_pid_drop_packet(pid);
+			gf_filter_pid_drop_packet(pctx->pid);
 			continue;
 		}
 
 		gf_filter_pck_get_data(pck, &pck_size);
 		size += pck_size;
+		nb_ready++;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[TileAgg] reaggregating CTS "LLU" %d ready %d pids (nb flush pck %d)\n", min_cts, nb_ready+1, count, ctx->flush_packets));
+	if (ctx->flush_packets) {
+		ctx->flush_packets--;
 	}
+	ctx->wait_pid = 0;
+
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+	
+	final_size = size;
 
-	pck = gf_filter_pid_get_packet(ctx->base_ipid);
-	gf_filter_pck_merge_properties(pck, dst_pck);
-	data = gf_filter_pck_get_data(pck, &pck_size);
+	gf_filter_pck_merge_properties(base_pck, dst_pck);
+	data = gf_filter_pck_get_data(base_pck, &pck_size);
 
 	//copy all NAL from base except SEI suffixes
 	gf_bs_reassign_buffer(ctx->bs_r, data, pck_size);
@@ -185,28 +348,45 @@
 		pos += nal_size + ctx->nalu_size_length;
 	}
 
-	for (i=0; i<count; i++) {
-		u64 cts;
-		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
-		if (pid==ctx->base_ipid) continue;
-		pck = gf_filter_pid_get_packet(pid);
-		//can happen if we drop one tile
-		if (!pck) continue;
+	sabt_idx = 0;
+	while (1) {
+		u32 pid_id = 0;
+		if (ctx->sabt) {
+			if (sabt_idx >= ctx->sabt->value.uint_list.nb_items)
+				break;
+			pid_id = ctx->sabt->value.uint_list.vals[sabt_idx];
+			sabt_idx++;
+		}
+		for (i=0; i<count; i++) {
+			u64 cts;
+			GF_FilterPacket *pck;
+			GF_TileAggInput *pctx = gf_list_get(ctx->ipids, i);
+			if (pctx->pid==ctx->base_ipid) continue;
+			if (pid_id && (pctx->id != pid_id)) {
+				continue;
+			}
+			pck = gf_filter_pid_get_packet(pctx->pid);
+			//can happen if we drop one tile
+			if (!pck) continue;
 
-		cts = gf_filter_pck_get_cts(pck);
-		if (cts != min_cts) continue;
+			cts = gf_filter_pck_get_cts(pck);
+			if (cts != min_cts) continue;
 
-		data = gf_filter_pck_get_data(pck, &pck_size);
-		memcpy(output+size, data, pck_size);
-		size += pck_size;
+			data = gf_filter_pck_get_data(pck, &pck_size);
+			memcpy(output+size, data, pck_size);
+			size += pck_size;
 
-		gf_filter_pid_drop_packet(pid);
+			gf_filter_pid_drop_packet(pctx->pid);
+			if (pid_id)
+				break;
+		}
+		if (!pid_id)
+			break;
 	}
 
 	//append all SEI suffixes
 	if (has_sei_suffix) {
-		pck = gf_filter_pid_get_packet(ctx->base_ipid);
-		data = gf_filter_pck_get_data(pck, &pck_size);
+		data = gf_filter_pck_get_data(base_pck, &pck_size);
 		gf_bs_reassign_buffer(ctx->bs_r, data, pck_size);
 
 		pos = 0;
@@ -227,6 +407,9 @@
 
 	gf_filter_pid_drop_packet(ctx->base_ipid);
 
+	if (size < 	final_size)
+		gf_filter_pck_truncate(dst_pck, size);
+		
 	gf_filter_pck_send(dst_pck);
 	return GF_OK;
 }
@@ -235,7 +418,7 @@
 {
 	GF_TileAggCtx *ctx = (GF_TileAggCtx *) gf_filter_get_udta(filter);
 	ctx->bs_r = gf_bs_new((char *)ctx, 1, GF_BITSTREAM_READ);
-
+	ctx->ipids = gf_list_new();
 	return GF_OK;
 }
 
@@ -243,35 +426,94 @@
 {
 	GF_TileAggCtx *ctx = (GF_TileAggCtx *) gf_filter_get_udta(filter);
 	gf_bs_del(ctx->bs_r);
+	while (gf_list_count(ctx->ipids)) {
+		GF_TileAggInput *pctx = gf_list_pop_back(ctx->ipids);
+		gf_free(pctx);
+	}
+	gf_list_del(ctx->ipids);
+}
+
+static Bool tileagg_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_TileAggCtx *ctx = (GF_TileAggCtx *) gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		ctx->is_playing = GF_TRUE;
+		ctx->play_evt = evt->play;
+		return GF_FALSE;
+	case GF_FEVT_STOP:
+	{
+		u32 i, count = gf_filter_get_ipid_count(filter);
+		for (i=0; i<count; i++) {
+			GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+			gf_filter_pid_set_discard(pid, GF_FALSE);
+		}
+	}
+		ctx->is_playing = GF_FALSE;
+		return GF_FALSE;
+	case GF_FEVT_PLAY_HINT:
+		if (evt->play.forced_dash_segment_switch) {
+			//this assumes the dashin module performs regulation of output in case of losses
+			//otherwise it may dispatch more than one segment in the input buffer
+			if (!ctx->flush_packets)
+				gf_filter_pid_get_buffer_occupancy(ctx->base_ipid, NULL, &ctx->flush_packets, NULL, NULL);
+			else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[TileAgg] Something is wrong in demuxer, received segment flush event but previous segment is not yet flushed !\n" ));
+			}
+			ctx->wait_start = 0;
+		}
+		return GF_TRUE;
+	default:
+		break;
+	}
+	return GF_FALSE;
 }
 
 static const GF_FilterCapability TileAggCaps[] =
 {
+	//HEVC tiles
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
 	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_TILE_BASE, GF_TRUE),
-
-	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
-	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
 	{0},
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC_TILES),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	{0},
+	//VVC subpic
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VVC),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_TILE_BASE, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_VVC),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VVC_SUBPIC),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_VVC),
 };
 
 #define OFFS(_n)	#_n, offsetof(GF_TileAggCtx, _n)
 
 static const GF_FilterArgs TileAggArgs[] =
 {
-	{ OFFS(tiledrop), "specify indexes of tiles to drop", GF_PROP_UINT_LIST, "", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(tiledrop), "specify indexes of tiles to drop", GF_PROP_UINT_LIST, NULL, NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(ttimeout), "number of milliseconds to wait until considering a tile packet lost, 0 waits forever", GF_PROP_UINT, "10000", NULL, GF_FS_ARG_UPDATE},
 	{0}
 };
 
 GF_FilterRegister TileAggRegister = {
 	.name = "tileagg",
 	GF_FS_SET_DESCRIPTION("HEVC tile aggregator")
-	GF_FS_SET_HELP("This filter reaggregates a set of split tiled HEVC streams (`hvt1` or `hvt2` in isobmff) into a single HEVC stream.")
+	GF_FS_SET_HELP("This filter aggregates a set of split tiled HEVC streams (`hvt1` or `hvt2` in ISOBMFF) into a single HEVC stream.")
 	.private_size = sizeof(GF_TileAggCtx),
 	SETCAPS(TileAggCaps),
 	.initialize = tileagg_initialize,
@@ -279,6 +521,7 @@
 	.args = TileAggArgs,
 	.configure_pid = tileagg_configure_pid,
 	.process = tileagg_process,
+	.process_event = tileagg_process_event,
 	.max_extra_pids = (u32) (-1),
 };

gpac-2.0.0.tar.gz/src/filters/tilesplit.c Added

@@ -0,0 +1,596 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2020-2022
+ *					All rights reserved
+ *
+ * This file is part of GPAC / tile splitting filter
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <gpac/filters.h>
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+#include <gpac/internal/media_dev.h>
+
+#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+
+typedef struct
+{
+	GF_FilterPid *opid;
+	u32 x, y, w, h;
+	GF_BitStream *pck_bs;
+	u8 *pck_buf;
+	u32 pck_buf_alloc;
+	Bool all_intra;
+} TileSplitPid;
+
+
+typedef struct
+{
+	//options
+	GF_PropUIntList tiledrop;
+
+	//internal
+	GF_FilterPid *ipid;
+	GF_FilterPid *base_opid;
+	u32 base_id;
+
+	u32 nb_tiles, nb_alloc_tiles;
+	TileSplitPid *opids;
+
+	HEVCState hevc;
+	u32 nalu_size_length;
+
+	Bool filter_disabled, passthrough;
+	s32 cur_pps_idx;
+
+	u32 width, height;
+
+	GF_BitStream *pck_bs;
+	u8 *pck_buf;
+	u32 pck_buf_alloc;
+} GF_TileSplitCtx;
+
+static void tilesplit_update_pid_props(GF_TileSplitCtx *ctx, TileSplitPid *tinfo)
+{
+	gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_WIDTH, &PROP_UINT(tinfo->w) );
+	gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(tinfo->h) );
+
+#if 0
+	GF_PropertyValue pval;
+	pval.type = GF_PROP_VEC2I;
+	pval.value.vec2i.x = ctx->width;
+	pval.value.vec2i.y = ctx->height;
+	gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_SRD_REF, &pval);
+
+	pval.type = GF_PROP_VEC4I;
+	pval.value.vec4i.x = tinfo->x;
+	pval.value.vec4i.y = tinfo->y;
+	pval.value.vec4i.z = tinfo->w;
+	pval.value.vec4i.w = tinfo->h;
+	gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_SRD, &pval);
+#else
+
+	gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_CROP_POS, &PROP_VEC2I_INT(tinfo->x, tinfo->y) );
+
+#endif
+}
+
+static GF_Err tilesplit_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_PropertyValue pval;
+	const GF_PropertyValue *p;
+	GF_HEVCConfig *hvcc;
+	GF_HEVCConfig tile_cfg;
+	HEVC_PPS *pps;
+	HEVC_SPS *sps;
+	u8 *dsi;
+	u32 dsi_size, bitrate;
+	u32 i, j, count, nb_tiles, PicWidthInCtbsY, PicHeightInCtbsY, tile_y, active_tiles;
+	s32 pps_idx=-1, sps_idx=-1;
+	GF_TileSplitCtx *ctx = (GF_TileSplitCtx *) gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->ipid == pid) {
+			for (i=0; i<ctx->nb_tiles; i++) {
+				if (ctx->opids[i].opid) {
+					gf_filter_pid_remove(ctx->opids[i].opid);
+					ctx->opids[i].opid = NULL;
+				}
+			}
+			ctx->nb_tiles = 0;
+			ctx->ipid = NULL;
+		}
+		return GF_OK;
+	}
+
+	if (!ctx->ipid) {
+		ctx->ipid = pid;
+		ctx->base_opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	}
+	gf_filter_pid_copy_properties(ctx->base_opid, pid);
+	//set SABT to true by default for link resolution
+	gf_filter_pid_set_property(ctx->base_opid, GF_PROP_PID_TILE_BASE, &PROP_BOOL(GF_TRUE) );
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!p) return GF_OK;
+
+	hvcc = gf_odf_hevc_cfg_read(p->value.data.ptr, p->value.data.size, GF_FALSE);
+	if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+
+	ctx->nalu_size_length = hvcc->nal_unit_size;
+	memset(&ctx->hevc, 0, sizeof(HEVCState));
+
+	count = gf_list_count(hvcc->param_array);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParamArray *ar = gf_list_get(hvcc->param_array, i);
+		for (j=0; j < gf_list_count(ar->nalus); j++) {
+			GF_NALUFFParam *sl = gf_list_get(ar->nalus, j);
+			if (!sl) continue;
+			switch (ar->type) {
+			case GF_HEVC_NALU_PIC_PARAM:
+				pps_idx = gf_hevc_read_pps(sl->data, sl->size, &ctx->hevc);
+				break;
+			case GF_HEVC_NALU_SEQ_PARAM:
+				sps_idx = gf_hevc_read_sps(sl->data, sl->size, &ctx->hevc);
+				break;
+			case GF_HEVC_NALU_VID_PARAM:
+				gf_hevc_read_vps(sl->data, sl->size, &ctx->hevc);
+				break;
+			}
+		}
+	}
+	if (pps_idx==-1) return GF_NON_COMPLIANT_BITSTREAM;
+	if (sps_idx==-1) return GF_NON_COMPLIANT_BITSTREAM;
+
+	if (ctx->hevc.pps[pps_idx].loop_filter_across_tiles_enabled_flag)
+		ctx->filter_disabled = GF_FALSE;
+	else
+		ctx->filter_disabled = GF_TRUE;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+	if (p) ctx->base_id = p->value.uint;
+
+	if (! ctx->hevc.pps[pps_idx].tiles_enabled_flag) {
+		gf_odf_hevc_cfg_del(hvcc);
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[TileSplit] Tiles not enabled, using passthrough\n"));
+		gf_filter_pid_set_property(ctx->base_opid, GF_PROP_PID_TILE_BASE, NULL);
+		ctx->passthrough = GF_TRUE;
+		return GF_OK;
+	}
+	ctx->passthrough = GF_FALSE;
+	nb_tiles = ctx->hevc.pps[pps_idx].num_tile_columns * ctx->hevc.pps[pps_idx].num_tile_rows;
+
+	while (nb_tiles < ctx->nb_tiles) {
+		ctx->nb_tiles--;
+		if (ctx->opids[ctx->nb_tiles].opid) {
+			gf_filter_pid_remove(ctx->opids[ctx->nb_tiles].opid);
+			ctx->opids[ctx->nb_tiles].opid = NULL;
+		}
+	}
+
+	if (nb_tiles>ctx->nb_alloc_tiles) {
+		ctx->opids = gf_realloc(ctx->opids, sizeof(TileSplitPid) * nb_tiles);
+		memset(&ctx->opids[ctx->nb_alloc_tiles], 0, sizeof(TileSplitPid) * (nb_tiles-ctx->nb_alloc_tiles) );
+		ctx->nb_alloc_tiles = nb_tiles;
+	}
+
+	/*setup tile info*/
+	ctx->cur_pps_idx = pps_idx;
+	pps = &ctx->hevc.pps[pps_idx];
+	sps = &ctx->hevc.sps[sps_idx];
+
+	ctx->width = sps->width;
+	ctx->height = sps->height;
+
+	PicWidthInCtbsY = sps->width / sps->max_CU_width;
+	if (PicWidthInCtbsY * sps->max_CU_width < sps->width) PicWidthInCtbsY++;
+	PicHeightInCtbsY = sps->height / sps->max_CU_width;
+	if (PicHeightInCtbsY * sps->max_CU_width < sps->height) PicHeightInCtbsY++;
+
+	//setup grid info before sending data
+	//we fill the grid in order of the tiling
+	tile_y = 0;
+	for (i=0; i<pps->num_tile_rows; i++) {
+		u32 tile_x = 0;
+		u32 tile_height;
+		if (pps->uniform_spacing_flag) {
+			tile_height = (i+1)*PicHeightInCtbsY / pps->num_tile_rows - i * PicHeightInCtbsY / pps->num_tile_rows;
+		} else {
+			if (i < pps->num_tile_rows-1) {
+				tile_height = pps->row_height[i];
+			} else if (i) {
+				tile_height = (PicHeightInCtbsY - pps->row_height[i-1]);
+			} else {
+				tile_height = PicHeightInCtbsY;
+			}
+		}
+
+		for (j=0; j < pps->num_tile_columns; j++) {
+			TileSplitPid *tinfo;
+			u32 tile_width;
+
+			if (pps->uniform_spacing_flag) {
+				tile_width = (j+1) * PicWidthInCtbsY / pps->num_tile_columns - j * PicWidthInCtbsY / pps->num_tile_columns;
+			} else {
+				if (j<pps->num_tile_columns-1) {
+					tile_width = pps->column_width[j];
+				} else {
+					tile_width = (PicWidthInCtbsY - pps->column_width[j-1]);
+				}
+			}
+
+			tinfo = &ctx->opids[i * pps->num_tile_columns + j];
+			tinfo->x = tile_x * sps->max_CU_width;
+			tinfo->w = tile_width * sps->max_CU_width;
+			tinfo->y = tile_y * sps->max_CU_width;
+			tinfo->h = tile_height * sps->max_CU_width;
+			tinfo->all_intra = GF_TRUE;
+
+			if (tinfo->x + tinfo->w > sps->width)
+				tinfo->w = sps->width - tinfo->x;
+			if (tinfo->y + tinfo->h > sps->height)
+				tinfo->h = sps->height - tinfo->y;
+
+			tile_x += tile_width;
+		}
+		tile_y += tile_height;
+	}
+
+	pval.type = GF_PROP_VEC2I;
+	pval.value.vec2i.x = ctx->width;
+	pval.value.vec2i.y = ctx->height;
+
+	memcpy(&tile_cfg, hvcc, sizeof(GF_HEVCConfig));
+	tile_cfg.param_array = NULL;
+	gf_odf_hevc_cfg_write(&tile_cfg, &dsi, &dsi_size);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_BITRATE);
+	bitrate = 0;
+	if (p && (p->value.uint>10000)) {
+		bitrate = p->value.uint - 10000;
+		bitrate /= nb_tiles-ctx->tiledrop.nb_items;
+	}
+
+	const char *pname = gf_filter_pid_get_name(ctx->ipid);
+	if (pname) pname = gf_file_basename(pname);
+	if (!pname) pname = "video";
+
+
+	for (i=ctx->nb_tiles; i<nb_tiles; i++) {
+		char szName[GF_MAX_PATH];
+		TileSplitPid *tinfo = &ctx->opids[i];
+		if (!tinfo->opid) {
+			Bool drop = GF_FALSE;
+			for (j=0; j<ctx->tiledrop.nb_items; j++) {
+				if (ctx->tiledrop.vals[j]==i) {
+					drop = GF_TRUE;
+					break;
+				}
+
+			}
+			if (!drop)
+				tinfo->opid = gf_filter_pid_new(filter);
+		}
+
+		if (!tinfo->opid) continue;
+
+		gf_filter_pid_copy_properties(tinfo->opid, pid);
+		gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_HEVC_TILES) );
+		if (dsi)
+			gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(dsi, dsi_size) );
+		else
+			gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
+
+		gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_BITRATE, bitrate ? &PROP_UINT(bitrate) : NULL);
+
+		gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_ID, &PROP_UINT(ctx->base_id + i + 1 ) );
+		gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_ESID, NULL);
+		gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_TILE_ID, &PROP_UINT(i + 1 ) );
+		gf_filter_pid_set_property(tinfo->opid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(ctx->base_id) );
+		tilesplit_update_pid_props(ctx, tinfo);
+
+		sprintf(szName, "%s_tile%d", pname, i+1);
+		gf_filter_pid_set_name(tinfo->opid, szName);
+	}
+	if (dsi) gf_free(dsi);
+	ctx->nb_tiles = nb_tiles;
+	active_tiles = 0;
+	//setup tbas track ref
+	for (i=0; i<nb_tiles; i++) {
+		if (!ctx->opids[i].opid)
+			continue;
+		pval.type = GF_PROP_4CC_LIST;
+		pval.value.uint_list.nb_items = 1;
+		pval.value.uint_list.vals = &ctx->base_id;
+		active_tiles ++;
+		gf_filter_pid_set_property_str(ctx->opids[i].opid, "isom:tbas", &pval);
+	}
+	//setup sabt track ref
+	pval.type = GF_PROP_4CC_LIST;
+	pval.value.uint_list.nb_items = active_tiles;
+	pval.value.uint_list.vals = gf_malloc(sizeof(u32) * active_tiles);
+	active_tiles = 0;
+	for (i=0; i<nb_tiles; i++) {
+		if (!ctx->opids[i].opid)
+			continue;
+		pval.value.uint_list.vals[active_tiles] = ctx->base_id + i + 1;
+		active_tiles++;
+	}
+	gf_filter_pid_set_property_str(ctx->base_opid, "isom:sabt", &pval);
+	gf_free(pval.value.uint_list.vals);
+
+	gf_filter_pid_set_property(ctx->base_opid, GF_PROP_PID_ORIG_SIZE, &PROP_VEC2I_INT(ctx->width, ctx->height) );
+	gf_filter_pid_set_property(ctx->base_opid, GF_PROP_PID_BITRATE, bitrate ? &PROP_UINT(10000) : NULL);
+
+	gf_odf_hevc_cfg_del(hvcc);
+	return GF_OK;
+}
+
+static GF_Err tilesplit_set_eos(GF_Filter *filter, GF_TileSplitCtx *ctx)
+{
+	u32 i;
+	for (i=0; i<ctx->nb_tiles; i++) {
+		if (ctx->opids[i].opid)
+			gf_filter_pid_set_eos(ctx->opids[i].opid);
+	}
+	gf_filter_pid_set_eos(ctx->base_opid);
+	return GF_EOS;
+}
+
+u32 hevc_get_tile_id(HEVCState *hevc, u32 *tile_x, u32 *tile_y, u32 *tile_width, u32 *tile_height);
+
+static GF_Err tilesplit_process(GF_Filter *filter)
+{
+	GF_TileSplitCtx *ctx = (GF_TileSplitCtx *) gf_filter_get_udta(filter);
+	GF_FilterPacket *in_pck, *opck;
+	u32 pck_size, i;
+	GF_Err e = GF_OK;
+	const u8 *in_data;
+	u8 *output;
+
+	in_pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!in_pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			return tilesplit_set_eos(filter, ctx);
+		}
+		return GF_OK;
+	}
+
+	if (ctx->passthrough) {
+		gf_filter_pck_forward(in_pck, ctx->base_opid);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+	in_data = gf_filter_pck_get_data(in_pck, &pck_size);
+	if (!in_data) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+	if (!ctx->pck_bs) ctx->pck_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->pck_bs, ctx->pck_buf, ctx->pck_buf_alloc);
+
+	for (i=0; i<ctx->nb_tiles; i++) {
+		TileSplitPid *tinfo = &ctx->opids[i];
+		if (!tinfo->opid)
+			continue;
+		if (!tinfo->pck_bs) tinfo->pck_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		else gf_bs_reassign_buffer(tinfo->pck_bs, tinfo->pck_buf, tinfo->pck_buf_alloc);
+	}
+
+	while (pck_size) {
+		TileSplitPid *tinfo;
+		u8 temporal_id, layer_id;
+		u8 nal_type = 0;
+		u32 nalu_size = 0;
+		s32 ret;
+		u32 cur_tile;
+		u32 tx, ty, tw, th;
+		for (i=0; i<ctx->nalu_size_length; i++) {
+			nalu_size = (nalu_size<<8) + in_data[i];
+		}
+
+		if (pck_size < nalu_size + ctx->nalu_size_length) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[TileSplit] Corrupted NAL size, %d indicated but %d remaining\n", nalu_size + ctx->nalu_size_length, pck_size));
+			break;
+		}
+
+		ret = gf_hevc_parse_nalu((u8 *) in_data + ctx->nalu_size_length, nalu_size, &ctx->hevc, &nal_type, &temporal_id, &layer_id);
+
+		//error parsing NAL, set nal to fallback to regular import
+		if (ret<0) nal_type = GF_HEVC_NALU_VID_PARAM;
+
+		switch (nal_type) {
+		case GF_HEVC_NALU_SLICE_TRAIL_N:
+		case GF_HEVC_NALU_SLICE_TRAIL_R:
+		case GF_HEVC_NALU_SLICE_TSA_N:
+		case GF_HEVC_NALU_SLICE_TSA_R:
+		case GF_HEVC_NALU_SLICE_STSA_N:
+		case GF_HEVC_NALU_SLICE_STSA_R:
+		case GF_HEVC_NALU_SLICE_BLA_W_LP:
+		case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+		case GF_HEVC_NALU_SLICE_BLA_N_LP:
+		case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+		case GF_HEVC_NALU_SLICE_IDR_N_LP:
+		case GF_HEVC_NALU_SLICE_CRA:
+		case GF_HEVC_NALU_SLICE_RADL_R:
+		case GF_HEVC_NALU_SLICE_RADL_N:
+		case GF_HEVC_NALU_SLICE_RASL_R:
+		case GF_HEVC_NALU_SLICE_RASL_N:
+			tx = ty = tw = th = 0;
+			cur_tile = hevc_get_tile_id(&ctx->hevc, &tx, &ty, &tw, &th);
+			if (cur_tile >= ctx->nb_tiles) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[TileSplit] Tile index %d is greater than number of tiles %d in PPS\n", cur_tile, ctx->nb_tiles));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				goto err_exit;
+			}
+			tinfo = &ctx->opids[cur_tile];
+			if (!tinfo->opid)
+				break;
+
+			if ((tinfo->x != tx) || (tinfo->w != tw) || (tinfo->y != ty) || (tinfo->h != th)) {
+				tinfo->x = tx;
+				tinfo->y = ty;
+				tinfo->w = tw;
+				tinfo->h = th;
+
+				tilesplit_update_pid_props(ctx, tinfo);
+			}
+
+			if (ctx->hevc.s_info.slice_type != GF_HEVC_SLICE_TYPE_I) {
+				tinfo->all_intra = GF_FALSE;
+			}
+
+			gf_bs_write_data(tinfo->pck_bs, (u8 *) in_data, nalu_size + ctx->nalu_size_length);
+			break;
+		//note we don't need to care about sps or pps here, they are not in the bitstream
+		default:
+			gf_bs_write_data(ctx->pck_bs, (u8 *) in_data, nalu_size + ctx->nalu_size_length);
+			break;
+		}
+
+		in_data += nalu_size + ctx->nalu_size_length;
+		pck_size -= nalu_size + ctx->nalu_size_length;
+	}
+
+err_exit:
+	//and flush
+
+	gf_bs_get_content_no_truncate(ctx->pck_bs, &ctx->pck_buf, &pck_size, &ctx->pck_buf_alloc);
+	opck = gf_filter_pck_new_alloc(ctx->base_opid, pck_size, &output);
+	if (opck) {
+		memcpy(output, ctx->pck_buf, pck_size);
+		gf_filter_pck_merge_properties(in_pck, opck);
+		gf_filter_pck_send(opck);
+	} else {
+		e = GF_OUT_OF_MEM;
+	}
+
+	for (i=0; i<ctx->nb_tiles; i++) {
+		TileSplitPid *tinfo = &ctx->opids[i];
+		if (!tinfo->opid) continue;
+
+		gf_bs_get_content_no_truncate(tinfo->pck_bs, &tinfo->pck_buf, &pck_size, &tinfo->pck_buf_alloc);
+		opck = gf_filter_pck_new_alloc(tinfo->opid, pck_size, &output);
+		if (opck) {
+			memcpy(output, tinfo->pck_buf, pck_size);
+			gf_filter_pck_merge_properties(in_pck, opck);
+			gf_filter_pck_send(opck);
+		} else {
+			e = GF_OUT_OF_MEM;
+		}
+	}
+
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return e;
+}
+
+static GF_Err tilesplit_initialize(GF_Filter *filter)
+{
+//	GF_TileSplitCtx *ctx = (GF_TileSplitCtx *) gf_filter_get_udta(filter);
+
+	return GF_OK;
+}
+
+static void tilesplit_finalize(GF_Filter *filter)
+{
+	u32 i;
+	GF_TileSplitCtx *ctx = (GF_TileSplitCtx *) gf_filter_get_udta(filter);
+
+	for (i=0; i<ctx->nb_alloc_tiles; i++) {
+		TileSplitPid *tinfo = &ctx->opids[i];
+		if (tinfo->pck_buf) gf_free(tinfo->pck_buf);
+		if (tinfo->pck_bs) gf_bs_del(tinfo->pck_bs);
+	}
+	if (ctx->opids)
+		gf_free(ctx->opids);
+
+	if (ctx->pck_bs) gf_bs_del(ctx->pck_bs);
+	if (ctx->pck_buf) gf_free(ctx->pck_buf);
+}
+
+
+static const GF_FilterCapability TileSplitCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
+
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_TILE_BASE, GF_TRUE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
+
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC_TILES)
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_TileSplitCtx, _n)
+
+static const GF_FilterArgs TileSplitArgs[] =
+{
+	{ OFFS(tiledrop), "specify indexes of tiles to drop (0-based, in tile raster scan order)", GF_PROP_UINT_LIST, NULL, NULL, GF_FS_ARG_UPDATE},
+	{0}
+};
+
+GF_FilterRegister TileSplitRegister = {
+	.name = "tilesplit",
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	GF_FS_SET_DESCRIPTION("HEVC tile bitstream splitter")
+	GF_FS_SET_HELP("This filter splits an HEVC tiled stream into tiled HEVC streams (`hvt1` or `hvt2` in ISOBMFF)."
+	"\n"
+	"The filter will move to passthrough mode if the bitstream is not tiled.\n"
+	"If the `Bitrate` property is set on the input PID, the output tile PIDs will have a bitrate set to `(Bitrate - 10k)/nb_opids`, 10 kbps being reserved for the base.\n"
+	"\n"
+	"Each tile PID will be assigned the following properties:\n"
+	"- `ID`: equal to the base PID ID (same as input) plus the 1-based index of the tile in raster scan order.\n"
+	"- `TileID`: equal to the 1-based index of the tile in raster scan order.\n"
+	"\n"
+	"Warning: The filter does not check if tiles are independently-coded (MCTS) !\n"
+	"\n"
+	"Warning: Support for dynamic changes of tiling grid has not been tested !\n"
+	)
+	.private_size = sizeof(GF_TileSplitCtx),
+	SETCAPS(TileSplitCaps),
+#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+	.initialize = tilesplit_initialize,
+	.finalize = tilesplit_finalize,
+	.args = TileSplitArgs,
+	.configure_pid = tilesplit_configure_pid,
+#endif
+	.process = tilesplit_process,
+};
+
+
+const GF_FilterRegister *tilesplit_register(GF_FilterSession *session)
+{
+	return &TileSplitRegister;
+}
+
+#endif /* !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS) */
+

gpac-1.0.1.tar.gz/src/filters/tssplit.c -> gpac-2.0.0.tar.gz/src/filters/tssplit.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom Paris 2019
+ *			Copyright (c) Telecom Paris 2019-2022
 *					All rights reserved
 *
 * This file is part of GPAC / MPEG Transport Stream splitter filter
@@ -31,6 +31,8 @@
 
 #include <gpac/mpegts.h>
 
+#ifndef GPAC_DISABLE_MPEG2TS
+
 typedef struct
 {
 	GF_FilterPid *opid;
@@ -81,15 +83,19 @@
 		}
 		u32 osize = size*stream->nb_pck;
 		pck = gf_filter_pck_new_alloc(stream->opid, osize, &buffer);
-		gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
-		memcpy(buffer, stream->pck_buffer, osize);
-		gf_filter_pck_send(pck);
+		if (pck) {
+			gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
+			memcpy(buffer, stream->pck_buffer, osize);
+			gf_filter_pck_send(pck);
+		}
 		stream->nb_pck = 0;
 	} else {
 		pck = gf_filter_pck_new_alloc(stream->opid, size, &buffer);
-		gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
-		memcpy(buffer, data, size);
-		gf_filter_pck_send(pck);
+		if (pck) {
+			gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
+			memcpy(buffer, data, size);
+			gf_filter_pck_send(pck);
+		}
 	}
 }
 
@@ -115,7 +121,7 @@
 		m2tssplit_flush(ctx);
 		while (gf_list_count(ctx->streams) ) {
 			GF_M2TSSplit_SPTS *st = gf_list_pop_back(ctx->streams);
-			gf_filter_pid_remove(st->opid);
+			if (st->opid) gf_filter_pid_remove(st->opid);
 			if (st->pck_buffer) gf_free(st->pck_buffer);
 			gf_free(st);
 		}
@@ -269,9 +275,11 @@
 			//output new PAT
 			if (stream->opid) {
 				GF_FilterPacket *pck = gf_filter_pck_new_alloc(stream->opid, tot_len, &buffer);
-				gf_filter_pck_set_framing(pck, first_pck, GF_FALSE);
-				memcpy(buffer, ctx->tsbuf, tot_len);
-				gf_filter_pck_send(pck);
+				if (pck) {
+					gf_filter_pck_set_framing(pck, first_pck, GF_FALSE);
+					memcpy(buffer, ctx->tsbuf, tot_len);
+					gf_filter_pck_send(pck);
+				}
 			}
 		}
 		return;
@@ -286,9 +294,11 @@
 			if (!stream->opid) continue;
 
 			GF_FilterPacket *pck = gf_filter_pck_new_alloc(stream->opid, stream->pat_pck_size, &buffer);
-			gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
-			memcpy(buffer, stream->pat_pck, stream->pat_pck_size);
-			gf_filter_pck_send(pck);
+			if (pck) {
+				gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
+				memcpy(buffer, stream->pat_pck, stream->pat_pck_size);
+				gf_filter_pck_send(pck);
+			}
 		}
 		return;
 	}
@@ -312,6 +322,9 @@
 			case GF_M2TS_VIDEO_SHVC_TEMPORAL:
 			case GF_M2TS_VIDEO_MHVC:
 			case GF_M2TS_VIDEO_MHVC_TEMPORAL:
+			case GF_M2TS_VIDEO_VVC:
+			case GF_M2TS_VIDEO_VVC_TEMPORAL:
+			case GF_M2TS_VIDEO_VC1:
 			case GF_M2TS_AUDIO_MPEG1:
 			case GF_M2TS_AUDIO_MPEG2:
 			case GF_M2TS_AUDIO_LATM_AAC:
@@ -345,9 +358,11 @@
 			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_SERVICE_ID, &PROP_UINT(prog->number));
 
 			GF_FilterPacket *pck = gf_filter_pck_new_alloc(stream->opid, stream->pat_pck_size, &buffer);
-			gf_filter_pck_set_framing(pck, GF_TRUE, GF_FALSE);
-			memcpy(buffer, stream->pat_pck, stream->pat_pck_size);
-			gf_filter_pck_send(pck);
+			if (pck) {
+				gf_filter_pck_set_framing(pck, GF_TRUE, GF_FALSE);
+				memcpy(buffer, stream->pat_pck, stream->pat_pck_size);
+				gf_filter_pck_send(pck);
+			}
 		}
 		return;
 	}
@@ -460,8 +475,8 @@
 	.name = "tssplit",
 	GF_FS_SET_DESCRIPTION("MPEG Transport Stream splitter")
 	GF_FS_SET_HELP("This filter splits an MPEG-2 transport stream into several single program transport streams.\n"
-	"Only the PAT table is rewritten, the CAT table, PMT and all program streams are forwarded as is.\n"
-	"In [-full]() mode, global DVB tables of the input multiplex are forwarded to each output mux; otherwise these tables are discarded.")
+	"Only the PAT table is rewritten, other tables (PAT, PMT) and streams (PES) are forwarded as is.\n"
+	"If [-dvb]() is set, global DVB tables of the input multiplex are forwarded to each output mux; otherwise these tables are discarded.")
 	.flags = GF_FS_REG_EXPLICIT_ONLY,
 	.private_size = sizeof(GF_M2TSSplitCtx),
 	.initialize = m2tssplit_initialize,
@@ -478,3 +493,4 @@
 	return &M2TSSplitRegister;
 }
 
+#endif /*GPAC_DISABLE_MPEG2TS*/

gpac-1.0.1.tar.gz/src/filters/unit_test_filter.c -> gpac-2.0.0.tar.gz/src/filters/unit_test_filter.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / unit test filters
@@ -174,6 +174,7 @@
 		const u8 *data;
 		u32 pck_size;
 		u8 *data_ptr;
+		u32 data_offset=0;
 		PIDCtx *pidctx = gf_list_get(stack->pids, i);
 		GF_FilterPacket *pck = gf_filter_pid_get_packet(pidctx->src_pid);
 		assert (pck);
@@ -211,9 +212,9 @@
 		//packet reference
 		else {
 			if (stack->framing) {
-				pck_dst = gf_filter_pck_new_ref(pidctx->dst_pid, data_ptr, pck_size, pck);
+				pck_dst = gf_filter_pck_new_ref(pidctx->dst_pid, data_offset, pck_size, pck);
 			} else {
-				pck_dst = gf_filter_pck_new_ref(pidctx->dst_pid, NULL, 0, pck);
+				pck_dst = gf_filter_pck_new_ref(pidctx->dst_pid, 0, 0, pck);
 			}
 		}
 
@@ -237,6 +238,7 @@
 		}
 		//move our data pointer
 		data_ptr += pck_size;
+		data_offset += pck_size;
 
 		} //end framing loop
 
@@ -276,9 +278,11 @@
 		PIDCtx *pidctx=gf_list_get(stack->pids, i);
 
 		if (pidctx->nb_packets==stack->max_pck) {
-			if (stack->gsftest && pidctx->dst_pid) {
-				gf_filter_pid_remove(pidctx->dst_pid);
-				pidctx->dst_pid = NULL;
+			if (stack->gsftest) {
+				if (pidctx->dst_pid) {
+					gf_filter_pid_remove(pidctx->dst_pid);
+					pidctx->dst_pid = NULL;
+				}
 			}
 			nb_eos++;
 			continue;
@@ -339,19 +343,15 @@
 			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','e'), &p);
 			p.type = GF_PROP_VEC2I;
 			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','f'), &p);
-			p.type = GF_PROP_VEC3;
-			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','g'), &p);
 			p.type = GF_PROP_VEC3I;
 			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','h'), &p);
-			p.type = GF_PROP_VEC4;
-			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','i'), &p);
 			p.type = GF_PROP_VEC4I;
 			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','j'), &p);
 			p.type = GF_PROP_STRING_LIST;
-			p.value.string_list = gf_list_new();
-			gf_list_add(p.value.string_list, gf_strdup("custom"));
+			p.value.string_list.nb_items = 1;
+			p.value.string_list.vals = gf_malloc(sizeof(char *));
+			p.value.string_list.vals[0] = gf_strdup("custom");
 			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','k'), &p);
-			p.value.string_list = NULL;
 			p.type = GF_PROP_UINT_LIST;
 			p.value.uint_list.nb_items = 1;
 			p.value.uint_list.vals = &val;
@@ -520,7 +520,7 @@
 		gf_filter_pid_reset_properties(pidctx->src_pid);
 		gf_filter_pck_new_alloc(pidctx->src_pid, 20, &data);
 		gf_filter_pck_new_shared(pidctx->src_pid, "foo", 3, NULL);
-		gf_filter_pck_new_ref(pidctx->src_pid, "foo", 3, NULL);
+		gf_filter_pck_new_ref(pidctx->src_pid, 0, 3, NULL);
 		gf_log_set_strict_error(old_strict);
 	}
 
@@ -708,7 +708,7 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing fraction value\n"));
 		}
 		p = gf_props_parse_value(GF_PROP_FRACTION, "prop", "1.001", NULL, 0);
-		if ((p.value.frac.den != 1000000) ) {
+		if (p.value.frac.num * 1000 != 1001 * p.value.frac.den) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing fraction fp value\n"));
 		}
 		p = gf_props_parse_value(GF_PROP_STRING, "prop", "test", NULL, 0);
@@ -718,7 +718,7 @@
 		if (p.value.string) gf_free(p.value.string);
 
 		p = gf_props_parse_value(GF_PROP_FRACTION64, "prop", "1.001", NULL, 0);
-		if ((p.value.lfrac.den != 1000000) ) {
+		if (p.value.lfrac.num * 1000 != p.value.lfrac.den * 1001) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing fraction64 fp value\n"));
 		}
 		p = gf_props_parse_value(GF_PROP_VEC2I, "prop", "1x1", NULL, 0);
@@ -733,18 +733,10 @@
 		if ((p.value.vec3i.x != 1) || (p.value.vec3i.y != 1) || (p.value.vec3i.z != 1)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing vec3i value\n"));
 		}
-		p = gf_props_parse_value(GF_PROP_VEC3, "prop", "1x1x1", NULL, 0);
-		if ((p.value.vec3.x != 1.0) || (p.value.vec3.y != 1.0) || (p.value.vec3.z != 1.0)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing vec3 value\n"));
-		}
 		p = gf_props_parse_value(GF_PROP_VEC4I, "prop", "1x1x1x1", NULL, 0);
 		if ((p.value.vec4i.x != 1) || (p.value.vec4i.y != 1) || (p.value.vec4i.z != 1) || (p.value.vec4i.w != 1)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing vec4i value\n"));
 		}
-		p = gf_props_parse_value(GF_PROP_VEC4, "prop", "1x1x1x1", NULL, 0);
-		if ((p.value.vec4.x != 1.0) || (p.value.vec4.y != 1.0) || (p.value.vec4.z != 1.0) || (p.value.vec4.w != 1.0)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing vec4 value\n"));
-		}
 		p = gf_props_parse_value(GF_PROP_PIXFMT, "prop", "rgb", NULL, 0);
 		if (p.value.uint != GF_PIXEL_RGB) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing pixfmt value\n"));
@@ -806,9 +798,7 @@
 		gf_props_parse_value(GF_PROP_VEC2I, "prop", NULL, NULL, 0);
 		gf_props_parse_value(GF_PROP_VEC2, "prop", NULL, NULL, 0);
 		gf_props_parse_value(GF_PROP_VEC3I, "prop", NULL, NULL, 0);
-		gf_props_parse_value(GF_PROP_VEC3, "prop", NULL, NULL, 0);
 		gf_props_parse_value(GF_PROP_VEC4I, "prop", NULL, NULL, 0);
-		gf_props_parse_value(GF_PROP_VEC4, "prop", NULL, NULL, 0);
 		gf_props_parse_value(GF_PROP_STRING, "prop", NULL, NULL, 0);
 		gf_props_parse_value(GF_PROP_DATA, "prop", NULL, NULL, 0);
 		gf_props_parse_value(GF_PROP_CONST_DATA, "prop", NULL, NULL, 0);
@@ -823,7 +813,7 @@
 			gf_props_get_type_name(i);
 			p.type = p2.type = i;
 			gf_props_equal(&p, &p2);
-			gf_props_dump_val(&p, dump, GF_FALSE, NULL);
+			gf_props_dump_val(&p, dump, GF_PROP_DUMP_DATA_NONE, NULL);
 		}
 		p.type = GF_PROP_DATA;
 		p.value.data.size = 4;

gpac-1.0.1.tar.gz/src/filters/vcrop.c -> gpac-2.0.0.tar.gz/src/filters/vcrop.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2020
+ *			Copyright (c) Telecom ParisTech 2018-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / video cropping filter
@@ -210,6 +210,8 @@
 		vframe->frame_ifce.user_data = vframe;
 		vframe->frame_ifce.get_plane = vcrop_frame_get_plane;
 		dst_pck = gf_filter_pck_new_frame_interface(ctx->opid, &vframe->frame_ifce, vcrop_packet_destruct);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+
 		//keep a ref to input packet
 		vframe->pck = pck;
 		gf_filter_pck_ref(&vframe->pck);
@@ -222,10 +224,8 @@
 
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &output);
-	if (!dst_pck) {
-		gf_filter_pid_drop_packet(ctx->ipid);
-		return GF_OUT_OF_MEM;
-	}
+	if (!dst_pck) return GF_OUT_OF_MEM;
+	
 	gf_filter_pck_merge_properties(pck, dst_pck);
 	dst_planes[0] = output;
 	if (ctx->nb_planes==1) {
@@ -404,6 +404,7 @@
 	ctx->packed_422 = GF_FALSE;
 	switch (pfmt) {
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_NV21_10:
 	case GF_PIXEL_NV12:
@@ -454,6 +455,7 @@
 	if (is_remove) {
 		if (ctx->opid) {
 			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
 		}
 		return GF_OK;
 	}
@@ -610,7 +612,7 @@
 	GF_FS_SET_DESCRIPTION("Video crop")
 	GF_FS_SET_HELP("This filter is used to crop raw video data.")
 	.private_size = sizeof(GF_VCropCtx),
-	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.flags = GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_ALLOW_CYCLIC,
 	.args = VCropArgs,
 	.configure_pid = vcrop_configure_pid,
 	SETCAPS(VCropCaps),

gpac-1.0.1.tar.gz/src/filters/vflip.c -> gpac-2.0.0.tar.gz/src/filters/vflip.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Samir Mustapha - Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / video flip filter
@@ -271,16 +271,12 @@
 
 	if (frame_ifce){
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &output);
-		gf_filter_pck_merge_properties(pck, dst_pck);
+		if (dst_pck)
+			gf_filter_pck_merge_properties(pck, dst_pck);
 	} else {
 		dst_pck = gf_filter_pck_new_clone(ctx->opid, pck, &output);
 	}
-
-	if (!dst_pck) {
-		gf_filter_pid_drop_packet(ctx->ipid);
-		return GF_OUT_OF_MEM;
-	}
-
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	dst_planes[0] = output;
 	if (ctx->nb_planes==1) {
@@ -356,6 +352,7 @@
 	if (is_remove) {
 		if (ctx->opid) {
 			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
 		}
 		return GF_OK;
 	}
@@ -493,9 +490,9 @@
 GF_FilterRegister VFlipRegister = {
 		.name = "vflip",
 		GF_FS_SET_DESCRIPTION("Video flip")
-		GF_FS_SET_HELP("Filter used to flip video frames vertically, horizontally, in both directions or no flip")
+		GF_FS_SET_HELP("This filter flips uncompressed video frames vertically, horizontally, in both directions or no flip")
 		.private_size = sizeof(GF_VFlipCtx),
-		.flags = GF_FS_REG_EXPLICIT_ONLY,
+		.flags = GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_ALLOW_CYCLIC,
 		.args = VFlipArgs,
 		.configure_pid = vflip_configure_pid,
 		SETCAPS(VFlipCaps),

gpac-1.0.1.tar.gz/src/filters/write_generic.c -> gpac-2.0.0.tar.gz/src/filters/write_generic.c Changed

gpac-1.0.1.tar.gz/src/filters/write_nhml.c -> gpac-2.0.0.tar.gz/src/filters/write_nhml.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / NHML stream to file filter
@@ -115,6 +115,7 @@
 
 	} else if (ctx->opid_info) {
 		gf_filter_pid_remove(ctx->opid_info);
+		ctx->opid_info = NULL;
 	}
 	if (ctx->info_file) gf_free(ctx->info_file);
 	ctx->info_file = NULL;
@@ -193,9 +194,18 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid_nhml);
-		gf_filter_pid_remove(ctx->opid_mdia);
-		if (ctx->opid_info) gf_filter_pid_remove(ctx->opid_info);
+		if (ctx->opid_nhml) {
+			gf_filter_pid_remove(ctx->opid_nhml);
+			ctx->opid_nhml = NULL;
+		}
+		if (ctx->opid_mdia) {
+			gf_filter_pid_remove(ctx->opid_mdia);
+			ctx->opid_mdia = NULL;
+		}
+		if (ctx->opid_info) {
+			gf_filter_pid_remove(ctx->opid_info);
+			ctx->opid_info = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -259,11 +269,11 @@
 	name = (char*) gf_codecid_name(ctx->codecid);
 	if (ctx->exporter) {
 		if (ctx->w && ctx->h) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s - Size %dx%d\n", name, ctx->w, ctx->h));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Exporting %s - Size %dx%d\n", name, ctx->w, ctx->h));
 		} else if (ctx->sr && ctx->chan) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s - SampleRate %d %d channels %d bits per sample\n", name, ctx->sr, ctx->chan, ctx->bps));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Exporting %s - SampleRate %d %d channels %d bits per sample\n", name, ctx->sr, ctx->chan, ctx->bps));
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s\n", name));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Exporting %s\n", name));
 		}
 	}
 
@@ -395,12 +405,11 @@
 	else if (ctx->sr && ctx->chan) {
 		sprintf(nhml, "sampleRate=\"%d\" numChannels=\"%d\" ", ctx->sr, ctx->chan);
 		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
-		sprintf(nhml, "sampleRate=\"%d\" numChannels=\"%d\" ", ctx->sr, ctx->chan);
-		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_AUDIO_FORMAT);
-		if (p)
+		if (p) {
 			sprintf(nhml, "bitsPerSample=\"%d\" ", gf_audio_fmt_bit_depth(p->value.uint));
-		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
 	}
 
 	NHML_PRINT_4CC(0, "codec_vendor", "codecVendor")
@@ -454,18 +463,20 @@
 		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 
 		dst_pck = gf_filter_pck_new_shared(ctx->opid_info, ctx->dcfg, ctx->dcfg_size, NULL);
-		gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
-		gf_filter_pck_set_readonly(dst_pck);
-		gf_filter_pck_send(dst_pck);
+		if (dst_pck) {
+			gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+			gf_filter_pck_set_readonly(dst_pck);
+			gf_filter_pck_send(dst_pck);
+		}
 	}
-
+	
 	NHML_PRINT_STRING(0, "meta:encoding", "encoding")
 	NHML_PRINT_STRING(0, "meta:contentEncoding", "content_encoding")
 	ctx->uncompress = GF_FALSE;
 	if (p) {
 		if (!strcmp(p->value.string, "deflate")) ctx->uncompress = GF_TRUE;
 		else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[NHMLMx] content_encoding %s not supported\n", p->value.string ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[NHMLMx] content_encoding %s not supported\n", p->value.string ));
 		}
 	}
 
@@ -484,6 +495,8 @@
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid_nhml, size, &output);
+	if (!dst_pck) return;
+
 	memcpy(output, ctx->nhml_buffer, size);
 	gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_FALSE);
 	gf_filter_pck_send(dst_pck);
@@ -513,9 +526,12 @@
 		if (pos+size+2 > data_size)
 			break;
 
-		prev = data[pos+2+size];
-		data[pos+2+size] = 0;
 
+		prev = 0;
+		if (pos+2+size<data_size) {
+			prev = data[pos+2+size];
+			data[pos+2+size] = 0;
+		}
 
 		sprintf(nhml, "<DIMSUnit time=\""LLU"\"", cts);
 		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
@@ -577,8 +593,10 @@
 				inflateEnd(&d_stream);
 			}
 #else
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Error: your version of GPAC was compiled with no libz support."));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Error: your version of GPAC was compiled with no libz support."));
 			gf_bs_del(ctx->bs_r);
+			if (prev)
+				data[pos+2+size] = prev;
 			return;
 #endif
 		} else {
@@ -587,7 +605,8 @@
 		sprintf(nhml, "</DIMSUnit>\n");
 		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 
-		data[pos+2+size] = prev;
+		if (prev)
+			data[pos+2+size] = prev;
 		gf_bs_skip_bytes(ctx->bs_r, size-1);
 	}
 
@@ -599,6 +618,8 @@
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid_nhml, size, &output);
+	if (!dst_pck) return;
+
 	memcpy(output, ctx->nhml_buffer, size);
 	gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
 	gf_filter_pck_send(dst_pck);
@@ -628,7 +649,7 @@
 		nhml[0] = 0;
 		break;
 	default:
-		sprintf(nhml, "%s", gf_props_dump_val(att, pval, GF_FALSE, NULL) );
+		sprintf(nhml, "%s", gf_props_dump_val(att, pval, GF_PROP_DUMP_DATA_NONE, NULL) );
 		break;
 	}
 	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
@@ -745,7 +766,7 @@
 
 
 			if (offset_in_sample + s_size > data_size) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Wrong subsample info: sample size %d vs subsample offset+size %dn", data_size, offset_in_sample + s_size));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Wrong subsample info: sample size %d vs subsample offset+size %dn", data_size, offset_in_sample + s_size));
 				break;
 			}
 
@@ -796,15 +817,19 @@
 	}
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid_nhml, size, &output);
-	memcpy(output, ctx->nhml_buffer, size);
-	gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
-	gf_filter_pck_send(dst_pck);
+	if (dst_pck) {
+		memcpy(output, ctx->nhml_buffer, size);
+		gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+		gf_filter_pck_send(dst_pck);
+	}
 
 	ctx->mdia_pos += data_size;
 
 	if (ctx->opid_mdia) {
-		//send data packet
-		dst_pck = gf_filter_pck_new_ref(ctx->opid_mdia, data, data_size, pck);
+		//send the complete data packet
+		dst_pck = gf_filter_pck_new_ref(ctx->opid_mdia, 0, data_size, pck);
+		if (!dst_pck) return;
+
 		gf_filter_pck_merge_properties(pck, dst_pck);
 		//keep byte offset ?
 //		gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
@@ -844,9 +869,11 @@
 					GF_FilterPacket *dst_pck;
 					u8 *output;
 					dst_pck = gf_filter_pck_new_alloc(ctx->opid_nhml, size, &output);
-					memcpy(output, ctx->nhml_buffer, size);
-					gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_TRUE);
-					gf_filter_pck_send(dst_pck);
+					if (dst_pck) {
+						memcpy(output, ctx->nhml_buffer, size);
+						gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_TRUE);
+						gf_filter_pck_send(dst_pck);
+					}
 				}
 				ctx->szRootName = NULL;
 			}
@@ -920,7 +947,7 @@
 {
 	{ OFFS(exporter), "compatibility with old exporter, displays export results", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(dims), "use DIMS mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(name), "set output name of files produced (needed media/info files refered to from XML", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(name), "set output name of media and info files produced", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(nhmlonly), "only dump NHML info, not media", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(pckp), "full NHML dump", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(chksum), "insert frame checksum\n"

gpac-1.0.1.tar.gz/src/filters/write_nhnt.c -> gpac-2.0.0.tar.gz/src/filters/write_nhnt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / NHNT stream to file filter
@@ -94,6 +94,7 @@
 
 	} else if (ctx->opid_info) {
 		gf_filter_pid_remove(ctx->opid_info);
+		ctx->opid_info = NULL;
 	}
 
 	gf_filter_pid_set_property(ctx->opid_mdia, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
@@ -150,9 +151,18 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid_nhnt);
-		gf_filter_pid_remove(ctx->opid_mdia);
-		if (ctx->opid_info) gf_filter_pid_remove(ctx->opid_info);
+		if (ctx->opid_nhnt) {
+			gf_filter_pid_remove(ctx->opid_nhnt);
+			ctx->opid_nhnt = NULL;
+		}
+		if (ctx->opid_mdia) {
+			gf_filter_pid_remove(ctx->opid_mdia);
+			ctx->opid_mdia = NULL;
+		}
+		if (ctx->opid_info) {
+			gf_filter_pid_remove(ctx->opid_info);
+			ctx->opid_info = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -173,7 +183,7 @@
 		ctx->oti = gf_codecid_oti(ctx->codecid);
 	}
 	if (!ctx->oti) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("CodecID %s has no mapping to MPEG-4 systems, cannot use NHNT. Use NHML instead\n", gf_4cc_to_str(cid) ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("CodecID %s has no mapping to MPEG-4 systems, cannot use NHNT. Use NHML instead\n", gf_4cc_to_str(cid) ));
 		return GF_NOT_SUPPORTED;
 	}
 
@@ -201,11 +211,11 @@
 	name = gf_codecid_name(ctx->codecid);
 	if (ctx->exporter) {
 		if (w && h) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s - Size %dx%d\n", name, w, h));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Exporting %s - Size %dx%d\n", name, w, h));
 		} else if (sr && chan) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s - SampleRate %d %d channels %d bits per sample\n", name, sr, chan, bps));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Exporting %s - SampleRate %d %d channels %d bits per sample\n", name, sr, chan, bps));
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s\n", name));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Exporting %s\n", name));
 		}
 	}
 
@@ -226,7 +236,6 @@
 {
 	GF_NHNTDumpCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck, *dst_pck;
-	u8 *data;
 	u8 *output;
 	u32 size, pck_size;
 	u64 dts, cts;
@@ -251,6 +260,8 @@
 		const GF_PropertyValue *p;
 
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid_nhnt, nhnt_hdr_size, &output);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+
 		if (!ctx->bs) ctx->bs = gf_bs_new(output, nhnt_hdr_size, GF_BITSTREAM_WRITE);
 		else gf_bs_reassign_buffer(ctx->bs, output, nhnt_hdr_size);
 
@@ -283,18 +294,22 @@
 
 		if (ctx->opid_info) {
 			dst_pck = gf_filter_pck_new_shared(ctx->opid_info, ctx->dcfg, ctx->dcfg_size, NULL);
-			gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
-			gf_filter_pck_set_readonly(dst_pck);
-			gf_filter_pck_send(dst_pck);
+			if (dst_pck) {
+				gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+				gf_filter_pck_set_readonly(dst_pck);
+				gf_filter_pck_send(dst_pck);
+			}
 		}
 	}
 
 	//get media data
-	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	gf_filter_pck_get_data(pck, &pck_size);
 
 	//nhnt data size
 	size = 3 + 1 + 3*(ctx->large ? 8 : 4);
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid_nhnt, size, &output);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+
 	//send nhnt data
 	gf_bs_reassign_buffer(ctx->bs, output, size);
 
@@ -323,8 +338,10 @@
 	gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
 	gf_filter_pck_send(dst_pck);
 
-	//send data packet
-	dst_pck = gf_filter_pck_new_ref(ctx->opid_mdia, data, pck_size, pck);
+	//send the complete data packet
+	dst_pck = gf_filter_pck_new_ref(ctx->opid_mdia, 0, pck_size, pck);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+	
 	gf_filter_pck_merge_properties(pck, dst_pck);
 	//keep byte offset ?
 //	gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);

gpac-1.0.1.tar.gz/src/filters/write_qcp.c -> gpac-2.0.0.tar.gz/src/filters/write_qcp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / QCP stream to file filter
@@ -70,7 +70,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -124,7 +127,7 @@
 	ctx->first = GF_TRUE;
 
 	if (ctx->exporter) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s - SampleRate %d %d channels %d bits per sample\n", gf_codecid_name(ctx->codecid), sr, chan, bps));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Exporting %s - SampleRate %d %d channels %d bits per sample\n", gf_codecid_name(ctx->codecid), sr, chan, bps));
 	}
 
 	ctx->ipid = pid;
@@ -135,14 +138,14 @@
 
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_MEDIA_DATA_SIZE);
 	if (!p) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[QCP] Unknown total media size, cannot write QCP file right away\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[QCP] Unknown total media size, cannot write QCP file right away\n"));
 		ctx->data_size = 0;
 	} else {
 		ctx->data_size = (u32) p->value.longuint;
 	}
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_NB_FRAMES);
 	if (!p) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[QCP] Unknown total number of media frames, cannot write QCP file\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[QCP] Unknown total number of media frames, cannot write QCP file\n"));
 		ctx->nb_frames = 0;
 	} else {
 		ctx->nb_frames = (u32) p->value.uint;
@@ -204,6 +207,8 @@
 	size += 8;
 	size -= data_size;
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+	if (!dst_pck) return;
+
 	bs = gf_bs_new(output, size, GF_BITSTREAM_WRITE);
 
 	gf_bs_write_data(bs, "RIFF", 4);
@@ -276,10 +281,12 @@
 			}
 			if (ctx->has_qcp_pad) {
 				dst_pck = gf_filter_pck_new_alloc(ctx->opid, 1, &output);
-				output[0] = 0;
-				gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_TRUE);
-				ctx->has_qcp_pad = GF_FALSE;
-				gf_filter_pck_send(dst_pck);
+				if (dst_pck) {
+					output[0] = 0;
+					gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_TRUE);
+					ctx->has_qcp_pad = GF_FALSE;
+					gf_filter_pck_send(dst_pck);
+				}
 			}
 			gf_filter_pid_set_eos(ctx->opid);
 			return GF_EOS;
@@ -310,17 +317,21 @@
 			}
 		}
 		if (!rate_found) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[QCP] Frame size %d not in rate table, ignoring frame\n", pck_size));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[QCP] Frame size %d not in rate table, ignoring frame\n", pck_size));
 			gf_filter_pid_drop_packet(ctx->ipid);
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
-		output[0] = rate_found;
-		memcpy(output+1, data, pck_size);
+		if (dst_pck) {
+			output[0] = rate_found;
+			memcpy(output+1, data, pck_size);
+		}
 	} else {
-		dst_pck = gf_filter_pck_new_ref(ctx->opid, data, size, pck);
+		//send the complete data
+		dst_pck = gf_filter_pck_new_ref(ctx->opid, 0, size, pck);
 	}
+	if (!dst_pck) return GF_OUT_OF_MEM;
 
 	gf_filter_pck_merge_properties(pck, dst_pck);
 	gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
@@ -366,7 +377,7 @@
 GF_FilterRegister QCPMxRegister = {
 	.name = "writeqcp",
 	GF_FS_SET_DESCRIPTION("QCP writer")
-	GF_FS_SET_HELP("This filter converts a single stream to a QCP output file.")
+	GF_FS_SET_HELP("This filter converts a single QCELP, EVRC or MSV stream to a QCP output file.")
 	.private_size = sizeof(GF_QCPMxCtx),
 	.args = QCPMxArgs,
 	SETCAPS(QCPMxCaps),

gpac-1.0.1.tar.gz/src/filters/write_vtt.c -> gpac-2.0.0.tar.gz/src/filters/write_vtt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / WebVTT stream to file filter
@@ -52,6 +52,7 @@
 
 	GF_WebVTTParser *parser;
 
+	Bool dash_mode;
 } GF_WebVTTMxCtx;
 
 static void vttmx_write_cue(void *ctx, GF_WebVTTCue *cue);
@@ -63,7 +64,10 @@
 
 	if (is_remove) {
 		ctx->ipid = NULL;
-		gf_filter_pid_remove(ctx->opid);
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
 		return GF_OK;
 	}
 	if (! gf_filter_pid_check_caps(pid))
@@ -93,7 +97,7 @@
 		ctx->first = GF_TRUE;
 
 		if (ctx->exporter) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s\n", gf_codecid_name(ctx->codecid)));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Exporting %s\n", gf_codecid_name(ctx->codecid)));
 		}
 
 	}
@@ -108,47 +112,62 @@
 		gf_webvtt_parser_cue_callback(ctx->parser, vttmx_write_cue, ctx);
 	}
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
+	ctx->dash_mode = (p && p->value.uint) ? GF_TRUE : GF_FALSE;
+
 	return GF_OK;
 }
 
-void vttmx_timestamp_dump(GF_BitStream *bs, GF_WebVTTTimestamp *ts, Bool dump_hour)
+static void vttmx_timestamp_dump(GF_BitStream *bs, GF_WebVTTTimestamp *ts, Bool dump_hour, Bool write_srt)
 {
 	char szTS[200];
 	szTS[0] = 0;
-	if (dump_hour || ts->hour != 0) {
+	if (dump_hour) {
 		sprintf(szTS, "%02u:", ts->hour);
+		gf_bs_write_data(bs, szTS, (u32) strlen(szTS) );
 	}
-	sprintf(szTS, "%02u:%02u.%03u", ts->min, ts->sec, ts->ms);
+	sprintf(szTS, "%02u:%02u%c%03u", ts->min, ts->sec, write_srt ? ',' : '.', ts->ms);
 	gf_bs_write_data(bs, szTS, (u32) strlen(szTS) );
 }
 
-void webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue)
+void webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue, Bool write_srt)
 {
+	Bool write_hour = GF_FALSE;
 	if (!cue) return;
-	if (cue->pre_text) {
+	if (!write_srt && cue->pre_text) {
 		gf_bs_write_data(bs, cue->pre_text, (u32) strlen(cue->pre_text));
 		gf_bs_write_data(bs, "\n\n", 2);
 	}
-	if (cue->id) gf_bs_write_data(bs, cue->id, (u32) strlen(cue->id) );
-	if (cue->start.hour || cue->end.hour) {
-		vttmx_timestamp_dump(bs, &cue->start, GF_TRUE);
-		gf_bs_write_data(bs, " --> ", 5);
-		vttmx_timestamp_dump(bs, &cue->end, GF_TRUE);
-	} else {
-		vttmx_timestamp_dump(bs, &cue->start, GF_FALSE);
-		gf_bs_write_data(bs, " --> ", 5);
-		vttmx_timestamp_dump(bs, &cue->end, GF_FALSE);
+	if (!write_srt && cue->id) {
+		u32 len = (u32) strlen(cue->id) ;
+		gf_bs_write_data(bs, cue->id, len);
+		if (len && (cue->id[len-1]!='\n'))
+			gf_bs_write_data(bs, "\n", 1);
 	}
-	if (cue->settings) {
+
+	if (gf_opts_get_bool("core", "webvtt-hours")) write_hour = GF_TRUE;
+	else if (cue->start.hour || cue->end.hour) write_hour = GF_TRUE;
+	else if (write_srt) write_hour = GF_TRUE;
+
+	vttmx_timestamp_dump(bs, &cue->start, write_hour, write_srt);
+	gf_bs_write_data(bs, " --> ", 5);
+	vttmx_timestamp_dump(bs, &cue->end, write_hour, write_srt);
+
+	if (!write_srt && cue->settings) {
 		gf_bs_write_data(bs, " ", 1);
 		gf_bs_write_data(bs, cue->settings, (u32) strlen(cue->settings));
 	}
 	gf_bs_write_data(bs, "\n", 1);
 	if (cue->text)
 		gf_bs_write_data(bs, cue->text, (u32) strlen(cue->text));
-	gf_bs_write_data(bs, "\n\n", 2);
 
-	if (cue->post_text) {
+	if (!write_srt)
+		gf_bs_write_data(bs, "\n\n", 2);
+	else
+		gf_bs_write_data(bs, "\n", 1);
+
+	if (!write_srt && cue->post_text) {
 		gf_bs_write_data(bs, cue->post_text, (u32) strlen(cue->post_text));
 		gf_bs_write_data(bs, "\n\n", 2);
 	}
@@ -157,7 +176,7 @@
 static void vttmx_write_cue(void *udta, GF_WebVTTCue *cue)
 {
 	GF_WebVTTMxCtx *ctx = (GF_WebVTTMxCtx *)udta;
-	webvtt_write_cue(ctx->bs_w, cue);
+	webvtt_write_cue(ctx->bs_w, cue, GF_FALSE);
 }
 
 void vttmx_parser_flush(GF_WebVTTMxCtx *ctx)
@@ -177,15 +196,16 @@
 		u32 size;
 		gf_bs_get_content_no_truncate(ctx->bs_w, &ctx->cues_buffer, &size, &ctx->cues_buffer_size);
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
-		memcpy(output, ctx->cues_buffer, size);
+		if (dst_pck) {
+			memcpy(output, ctx->cues_buffer, size);
 
-		gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
+			gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
 
-		gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_TRUE);
-		gf_filter_pck_send(dst_pck);
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_TRUE);
+			gf_filter_pck_send(dst_pck);
+		}
 	}
 
-
 	gf_webvtt_parser_del(ctx->parser);
 	ctx->parser = NULL;
 
@@ -195,7 +215,7 @@
 	GF_WebVTTMxCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck, *dst_pck;
 	u8 *data, *output;
-	u64 start_ts;
+	u64 start_ts, end_ts;
 	u32 i, pck_size, size, timescale;
 	GF_List *cues;
 
@@ -211,11 +231,18 @@
 		return GF_OK;
 	}
 
+	if (ctx->dash_mode && gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM)) {
+		ctx->first = GF_TRUE;
+	}
+
+
 	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
 
 	if (ctx->first && ctx->dcd) {
 		size = (u32) strlen(ctx->dcd)+2;
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+
 		memcpy(output, ctx->dcd, size-2);
 		output[size-2] = '\n';
 		output[size-1] = '\n';
@@ -229,13 +256,16 @@
 	if (!ctx->bs_w) ctx->bs_w = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	else gf_bs_reassign_buffer(ctx->bs_w, ctx->cues_buffer, ctx->cues_buffer_size);
 
-	start_ts = gf_filter_pck_get_cts(pck);
-	start_ts *= 1000;
 	timescale = gf_filter_pck_get_timescale(pck);
 	if (!timescale) timescale=1000;
-	start_ts /= timescale;
 
-	cues = gf_webvtt_parse_cues_from_data(data, pck_size, start_ts);
+	start_ts = gf_filter_pck_get_cts(pck);
+	end_ts = start_ts + gf_filter_pck_get_duration(pck);
+
+	start_ts = gf_timestamp_rescale(start_ts, timescale, 1000);
+	end_ts = gf_timestamp_rescale(end_ts, timescale, 1000);
+
+	cues = gf_webvtt_parse_cues_from_data(data, pck_size, start_ts, end_ts);
 	if (ctx->parser) {
 		gf_webvtt_merge_cues(ctx->parser, start_ts, cues);
 	} else {
@@ -250,12 +280,16 @@
 	gf_bs_get_content_no_truncate(ctx->bs_w, &ctx->cues_buffer, &size, &ctx->cues_buffer_size);
 	if (size) {
 		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
-		memcpy(output, ctx->cues_buffer, size);
+		if (!dst_pck) return GF_OUT_OF_MEM;
 
+		memcpy(output, ctx->cues_buffer, size);
 		gf_filter_pck_merge_properties(pck, dst_pck);
 		gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
-
-
+		if (ctx->dash_mode) {
+			gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_FILENUM, NULL);
+			gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_FILENAME, NULL);
+		}
+		
 		gf_filter_pck_set_framing(dst_pck, ctx->first, GF_FALSE);
 		ctx->first = GF_FALSE;
 
@@ -306,7 +340,7 @@
 GF_FilterRegister WebVTTMxRegister = {
 	.name = "writevtt",
 	GF_FS_SET_DESCRIPTION("WebVTT writer")
-	GF_FS_SET_HELP("This filter converts a single stream to a WebVTT output file.")
+	GF_FS_SET_HELP("This filter converts a single ISOBMFF WebVTT stream to a WebVTT output file.")
 	.private_size = sizeof(GF_WebVTTMxCtx),
 	.args = WebVTTMxArgs,
 	.finalize = vttmx_finalize,

gpac-1.0.1.tar.gz/src/ietf/rtcp.c -> gpac-2.0.0.tar.gz/src/ietf/rtcp.c Changed

gpac-1.0.1.tar.gz/src/ietf/rtp.c -> gpac-2.0.0.tar.gz/src/ietf/rtp.c Changed

gpac-1.0.1.tar.gz/src/ietf/rtp_depacketizer.c -> gpac-2.0.0.tar.gz/src/ietf/rtp_depacketizer.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
 *					All rights reserved
 *
 * This file is part of GPAC / RTP input module
@@ -760,9 +760,9 @@
 	}
 }
 
-#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 
-static void gf_rtp_hevc_flush(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, Bool missed_end)
+static void gf_rtp_hevc_vvc_flush(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, Bool missed_end)
 {
 	u8 *data;
 	u32 data_size, nal_s;
@@ -791,6 +791,9 @@
 	rtp->sl_hdr.randomAccessPointFlag = 0;
 	gf_free(data);
 }
+#endif
+
+#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
 
 static void gf_rtp_parse_hevc(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
@@ -868,7 +871,7 @@
 		Bool is_start = payload[2] & 0x80;
 		Bool is_end = payload[2] & 0x40;
 		/*flush*/
-		if (is_start) gf_rtp_hevc_flush(rtp, hdr, GF_TRUE);
+		if (is_start) gf_rtp_hevc_vvc_flush(rtp, hdr, GF_TRUE);
 
 		nal_type = payload[2] & 0x3F;
 		/*FIXME: strict condition for randomAccessPointFlag because of decoder's issue*/
@@ -892,11 +895,119 @@
 			gf_bs_write_data(rtp->inter_bs, nal_hdr, 2);
 		}
 		gf_bs_write_data(rtp->inter_bs, payload+3, size-3);
-		if (is_end || hdr->Marker) gf_rtp_hevc_flush(rtp, hdr, GF_FALSE);
+		if (is_end || hdr->Marker) gf_rtp_hevc_vvc_flush(rtp, hdr, GF_FALSE);
 	}
 }
 #endif
 
+
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+
+static void gf_rtp_parse_vvc(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
+{
+	u32 nal_type;
+	char nalu_size[4];
+
+	nal_type = payload[1] >> 3;
+
+	/*set start*/
+	if (rtp->sl_hdr.compositionTimeStamp != hdr->TimeStamp) {
+		rtp->sl_hdr.accessUnitEndFlag = 0;
+		rtp->sl_hdr.accessUnitStartFlag = 1;
+		rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
+		rtp->sl_hdr.compositionTimeStampFlag = 1;
+		rtp->sl_hdr.decodingTimeStampFlag = 0;
+		rtp->sl_hdr.randomAccessPointFlag = 0;
+	}
+
+	/*Single NALU*/
+	if (nal_type <= RTP_VVC_AGG_NAL) {
+		if ((nal_type==GF_VVC_NALU_SLICE_IDR_W_RADL)
+			|| (nal_type==GF_VVC_NALU_SLICE_IDR_N_LP)
+			|| (nal_type==GF_VVC_NALU_SLICE_CRA)
+		) {
+			rtp->sl_hdr.randomAccessPointFlag = 1;
+		}
+		rtp->sl_hdr.accessUnitEndFlag = 0;
+
+		/*signal NALU size on 4 bytes*/
+		nalu_size[0] = size>>24;
+		nalu_size[1] = size>>16;
+		nalu_size[2] = size>>8;
+		nalu_size[3] = size&0xFF;
+		rtp->on_sl_packet(rtp->udta, nalu_size, 4, &rtp->sl_hdr, GF_OK);
+
+		rtp->sl_hdr.accessUnitStartFlag = 0;
+		rtp->sl_hdr.compositionTimeStampFlag = 1;
+		rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
+		rtp->sl_hdr.accessUnitEndFlag = hdr->Marker;
+
+		/*send NAL payload*/
+		rtp->on_sl_packet(rtp->udta, payload, size, &rtp->sl_hdr, GF_OK);
+	}
+	/*AP NALU*/
+	else if (nal_type == RTP_VVC_AGG_NAL) {
+		u32 offset = 2;
+		while (offset<size) {
+			u32 nal_size = (u8) payload[offset];
+			nal_size<<=8;
+			nal_size |= (u8) payload[offset+1];
+			offset += 2;
+			nal_type = payload[offset+1] >> 3;
+
+			if ((nal_type==GF_VVC_NALU_SLICE_IDR_W_RADL)
+				|| (nal_type==GF_VVC_NALU_SLICE_IDR_N_LP)
+				|| (nal_type==GF_VVC_NALU_SLICE_CRA)
+			) {
+				rtp->sl_hdr.randomAccessPointFlag = 1;
+			}
+
+			/*signal NALU size on 4 bytes*/
+			nalu_size[0] = nal_size>>24;
+			nalu_size[1] = nal_size>>16;
+			nalu_size[2] = nal_size>>8;
+			nalu_size[3] = nal_size&0xFF;
+			rtp->on_sl_packet(rtp->udta, nalu_size, 4, &rtp->sl_hdr, GF_OK);
+
+			rtp->sl_hdr.accessUnitStartFlag = 0;
+			rtp->sl_hdr.compositionTimeStampFlag = 0;
+			rtp->sl_hdr.accessUnitEndFlag = (hdr->Marker && (offset+nal_size==size)) ? 1 : 0;
+			rtp->on_sl_packet(rtp->udta, payload+offset, nal_size, &rtp->sl_hdr, GF_OK);
+			offset += nal_size;
+		}
+	}
+	/*FU NALU*/
+	else if (nal_type == RTP_VVC_FRAG_NAL) {
+		Bool is_start = payload[2] & 0x80;
+		Bool is_end = payload[2] & 0x40;
+		/*flush*/
+		if (is_start) gf_rtp_hevc_vvc_flush(rtp, hdr, GF_TRUE);
+
+		//FU type in 5 low bits
+		nal_type = payload[2] & 0x1F;
+		if ((nal_type==GF_VVC_NALU_SLICE_IDR_W_RADL)
+			|| (nal_type==GF_VVC_NALU_SLICE_IDR_N_LP)
+			|| (nal_type==GF_VVC_NALU_SLICE_CRA)
+		) {
+			rtp->sl_hdr.randomAccessPointFlag = 1;
+		}
+		/*setup*/
+		if (!rtp->inter_bs) {
+			char nal_hdr[2];
+			rtp->inter_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			/*copy nal header*/
+			nal_hdr[0] = payload[0];
+			/*assign NAL type*/
+			nal_hdr[1] = (nal_type << 3) | (payload[1] & 0x7);
+			/*dummy size field*/
+			gf_bs_write_u32(rtp->inter_bs, 0);
+			gf_bs_write_data(rtp->inter_bs, nal_hdr, 2);
+		}
+		gf_bs_write_data(rtp->inter_bs, payload+3, size-3);
+		if (is_end || hdr->Marker) gf_rtp_hevc_vvc_flush(rtp, hdr, GF_FALSE);
+	}
+}
+#endif
 #ifndef GPAC_DISABLE_AV_PARSERS
 
 static void gf_rtp_parse_latm(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
@@ -922,7 +1033,10 @@
 		rtp->on_sl_packet(rtp->udta, (char *) payload, latm_size, &rtp->sl_hdr, GF_OK);
 		payload += latm_size;
 		remain -= (latm_size+latm_hdr_size);
-		rtp->sl_hdr.compositionTimeStamp += rtp->sl_hdr.au_duration;
+		if (rtp->sl_hdr.au_duration)
+			rtp->sl_hdr.compositionTimeStamp += rtp->sl_hdr.au_duration;
+		else
+			rtp->sl_hdr.compositionTimeStamp += 1024;
 	}
 }
 #endif
@@ -1023,8 +1137,8 @@
 	size -= 2;
 
 	if (!ft) {
-		GF_AC3Header ac3hdr;
-		memset(&ac3hdr, 0, sizeof(GF_AC3Header));
+		GF_AC3Config ac3hdr;
+		memset(&ac3hdr, 0, sizeof(GF_AC3Config));
 		rtp->sl_hdr.accessUnitStartFlag = rtp->sl_hdr.accessUnitEndFlag = 1;
 		while (size) {
 			u32 offset;
@@ -1098,6 +1212,7 @@
 	else if (!stricmp(map->payload_name, "H264-SVC")) return GF_RTP_PAYT_H264_SVC;
 	else if (!stricmp(map->payload_name, "H265")) return GF_RTP_PAYT_HEVC;
 	else if (!stricmp(map->payload_name, "H265-SHVC")) return GF_RTP_PAYT_LHVC;
+	else if (!stricmp(map->payload_name, "H266")) return GF_RTP_PAYT_VVC;
 	else return 0;
 }
 
@@ -1159,6 +1274,7 @@
 		if (!stricmp(param_val, "AAC-hbr") || !stricmp(param_val, "AAC-lbr") || !stricmp(param_val, "CELP-vbr") || !stricmp(param_val, "CELP-cbr")) {
 			rtp->sl_map.StreamType = GF_STREAM_AUDIO;
 			rtp->sl_map.CodecID = GF_CODECID_AAC_MPEG4;
+			rtp->sl_hdr.au_duration = 1024;
 		}
 		/*in case no IOD and no streamType/OTI in the file*/
 		else if (!stricmp(param_val, "avc-video") ) {
@@ -1292,6 +1408,11 @@
 		gf_bs_del(bs);
 		rtp->sl_map.StreamType = GF_STREAM_AUDIO;
 		rtp->sl_map.CodecID = GF_CODECID_AAC_MPEG4;
+		rtp->sl_hdr.au_duration = 1024;
+		if (cfg.base_sr && map && (cfg.base_sr!=map->ClockRate)) {
+			rtp->sl_hdr.au_duration *= map->ClockRate;
+			rtp->sl_hdr.au_duration /= cfg.base_sr;
+		}
 
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_latm;
@@ -1328,10 +1449,12 @@
 		else if (!strnicmp(map->payload_name, "AAC", 3)) {
 			rtp->sl_map.StreamType = GF_STREAM_AUDIO;
 			rtp->sl_map.CodecID = GF_CODECID_AAC_MPEG4;
+			rtp->sl_hdr.au_duration = 1024;
 		}
 		else if (!stricmp(map->payload_name, "MP4A-LATM")) {
 			rtp->sl_map.StreamType = GF_STREAM_AUDIO;
 			rtp->sl_map.CodecID = GF_CODECID_AAC_MPEG4;
+			rtp->sl_hdr.au_duration = 1024;
 		}
 		/*MPEG-4 video, check RAPs if not indicated*/
 		if ((rtp->sl_map.StreamType == GF_STREAM_VISUAL) && (rtp->sl_map.CodecID == GF_CODECID_MPEG4_PART2) && !rtp->sl_map.RandomAccessIndication) {
@@ -1536,7 +1659,7 @@
 
 					nalt = b64_d[0] & 0x1F;
 					if (/*SPS*/(nalt==0x07) || /*PPS*/(nalt==0x08) || /*SSPS*/(nalt==0x0F)) {
-						GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_malloc(sizeof(GF_AVCConfigSlot));
+						GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_malloc(sizeof(GF_NALUFFParam));
 						sl->size = ret;
 						sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
 						memcpy(sl->data, b64_d, sizeof(char)*sl->size);
@@ -1569,18 +1692,30 @@
 	break;
 	case GF_RTP_PAYT_HEVC:
 	case GF_RTP_PAYT_LHVC:
-#ifndef GPAC_DISABLE_HEVC
+	case GF_RTP_PAYT_VVC:
 	{
-		GF_HEVCConfig *hevcc;
+		GF_HEVCConfig *hvcc = NULL;
+		GF_VVCConfig *vvcc = NULL;
+		GF_List **param_array = NULL;
 		if (!map || !media) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP] Missing required payload map\n"));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
-		hevcc = gf_odf_hevc_cfg_new();
-		hevcc->configurationVersion = 1;
-		hevcc->nal_unit_size = 4;
+		if (rtp->payt == GF_RTP_PAYT_VVC) {
+			vvcc = gf_odf_vvc_cfg_new();
+			vvcc->nal_unit_size = 4;
+			rtp->sl_map.CodecID = GF_CODECID_VVC;
+			param_array = &vvcc->param_array;
+			rtp->depacketize = gf_rtp_parse_vvc;
+		} else {
+			hvcc = gf_odf_hevc_cfg_new();
+			hvcc->configurationVersion = 1;
+			hvcc->nal_unit_size = 4;
+			rtp->sl_map.CodecID = GF_CODECID_HEVC;
+			param_array = &hvcc->param_array;
+			rtp->depacketize = gf_rtp_parse_hevc;
+		}
 		rtp->sl_map.StreamType = 4;
-		rtp->sl_map.CodecID = GF_CODECID_HEVC;
 		/*we will signal RAPs*/
 		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		i=0;
@@ -1590,24 +1725,24 @@
 			j=0;
 			while ((att = (GF_X_Attribute *)gf_list_enum(fmtp->Attributes, &j))) {
 				char *nal_ptr, *sep;
-				GF_HEVCParamArray *ar;
+				GF_NALUFFParamArray *ar;
 				if (!stricmp(att->Name, "sprop-vps")) {
-					GF_SAFEALLOC(ar, GF_HEVCParamArray);
+					GF_SAFEALLOC(ar, GF_NALUFFParamArray);
 					if (!ar) return GF_OUT_OF_MEM;
 					ar->nalus = gf_list_new();
-					ar->type = GF_HEVC_NALU_VID_PARAM;
+					ar->type = vvcc ? GF_VVC_NALU_VID_PARAM : GF_HEVC_NALU_VID_PARAM;
 				}
 				else if (!stricmp(att->Name, "sprop-sps")) {
-					GF_SAFEALLOC(ar, GF_HEVCParamArray);
+					GF_SAFEALLOC(ar, GF_NALUFFParamArray);
 					if (!ar) return GF_OUT_OF_MEM;
 					ar->nalus = gf_list_new();
-					ar->type = GF_HEVC_NALU_SEQ_PARAM;
+					ar->type = vvcc ? GF_VVC_NALU_SEQ_PARAM : GF_HEVC_NALU_SEQ_PARAM;
 				}
 				else if (!stricmp(att->Name, "sprop-pps")) {
-					GF_SAFEALLOC(ar, GF_HEVCParamArray);
+					GF_SAFEALLOC(ar, GF_NALUFFParamArray);
 					if (!ar) return GF_OUT_OF_MEM;
 					ar->nalus = gf_list_new();
-					ar->type = GF_HEVC_NALU_PIC_PARAM;
+					ar->type = vvcc? GF_VVC_NALU_PIC_PARAM : GF_HEVC_NALU_PIC_PARAM;
 				}
 				else
 					continue;
@@ -1615,7 +1750,7 @@
 				while (nal_ptr) {
 					u32 b64size, ret;
 					char *b64_d;
-					GF_AVCConfigSlot *sl;
+					GF_NALUFFParam *sl;
 
 					sep = strchr(nal_ptr, ',');
 					if (sep) sep[0] = 0;
@@ -1625,7 +1760,7 @@
 					ret = gf_base64_decode(nal_ptr, b64size, b64_d, b64size);
 					b64_d[ret] = 0;
 
-					sl = (GF_AVCConfigSlot *)gf_malloc(sizeof(GF_AVCConfigSlot));
+					sl = (GF_NALUFFParam *)gf_malloc(sizeof(GF_NALUFFParam));
 					sl->size = ret;
 					sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
 					memcpy(sl->data, b64_d, sizeof(char)*sl->size);
@@ -1640,18 +1775,19 @@
 						break;
 					}
 				}
-				if (!hevcc->param_array) hevcc->param_array = gf_list_new();
-				gf_list_add(hevcc->param_array, ar);
+				if (! *param_array) *param_array = gf_list_new();
+				gf_list_add(*param_array, ar);
 			}
 		}
-		gf_odf_hevc_cfg_write(hevcc, &rtp->sl_map.config, &rtp->sl_map.configSize);
-		gf_odf_hevc_cfg_del(hevcc);
+		if (vvcc) {
+			gf_odf_vvc_cfg_write(vvcc, &rtp->sl_map.config, &rtp->sl_map.configSize);
+			gf_odf_vvc_cfg_del(vvcc);
+		} else {
+			gf_odf_hevc_cfg_write(hvcc, &rtp->sl_map.config, &rtp->sl_map.configSize);
+			gf_odf_hevc_cfg_del(hvcc);
+		}
 	}
-	rtp->depacketize = gf_rtp_parse_hevc;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-	break;
+		break;
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 #if GPAC_ENABLE_3GPP_DIMS_RTP

gpac-1.0.1.tar.gz/src/ietf/rtp_packetizer.c -> gpac-2.0.0.tar.gz/src/ietf/rtp_packetizer.c Changed

gpac-1.0.1.tar.gz/src/ietf/rtp_pck_3gpp.c -> gpac-2.0.0.tar.gz/src/ietf/rtp_pck_3gpp.c Changed

gpac-1.0.1.tar.gz/src/ietf/rtp_pck_mpeg12.c -> gpac-2.0.0.tar.gz/src/ietf/rtp_pck_mpeg12.c Changed

gpac-1.0.1.tar.gz/src/ietf/rtp_pck_mpeg4.c -> gpac-2.0.0.tar.gz/src/ietf/rtp_pck_mpeg4.c Changed

@@ -690,6 +690,166 @@
 	return GF_OK;
 }
 
+GF_Err gp_rtp_builder_do_vvc(GP_RTPPacketizer *builder, u8 *nalu, u32 nalu_size, u8 IsAUEnd, u32 FullAUSize)
+{
+	u32 do_flush, bytesLeft, size;
+
+	do_flush = 0;
+	if (!nalu) do_flush = 1;
+	else if (builder->sl_header.accessUnitStartFlag) do_flush = 1;
+	/*we must NOT fragment a NALU*/
+	else if (builder->bytesInPacket + nalu_size + 4 >= builder->Path_MTU) do_flush = 2; //2 bytes PayloadHdr for AP + 2 bytes NAL size
+	/*aggregation is disabled*/
+	else if (! (builder->flags & GP_RTP_PCK_USE_MULTI) ) do_flush = 2;
+
+	if (builder->bytesInPacket && do_flush) {
+		builder->rtp_header.Marker = (do_flush==1) ? 1 : 0;
+		/*insert payload_hdr in case of AP*/
+		if (strlen(builder->hevc_payload_hdr)) {
+			builder->OnData(builder->cbk_obj, (char *)builder->hevc_payload_hdr, 2, GF_TRUE);
+			memset(builder->hevc_payload_hdr, 0, 2);
+		}
+		builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
+		builder->bytesInPacket = 0;
+	}
+
+	if (!nalu) return GF_OK;
+
+	/*need a new RTP packet*/
+	if (!builder->bytesInPacket) {
+		builder->rtp_header.PayloadType = builder->PayloadType;
+		builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
+		builder->rtp_header.SequenceNumber += 1;
+		builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
+	}
+
+	/*at this point we're sure the NALU fits in current packet OR must be splitted*/
+	/*check that we should use single NALU packet mode or aggreation packets mode*/
+	if (builder->bytesInPacket+nalu_size+4 < builder->Path_MTU) {
+		Bool use_AP = (builder->flags & GP_RTP_PCK_USE_MULTI) ? GF_TRUE : GF_FALSE;
+		/*if this is the AU end and no NALU in packet, go for single NALU packet mode*/
+		if (IsAUEnd && !builder->bytesInPacket) use_AP = GF_FALSE;
+
+		if (use_AP) {
+			char nal_s[2];
+			/*declare PayloadHdr for AP*/
+			if (!builder->bytesInPacket) {
+				//copy everything, reassign type (byte 1 bits 8-3)
+				builder->hevc_payload_hdr[0] = nalu[0];
+				builder->hevc_payload_hdr[1] = (RTP_VVC_AGG_NAL << 3) | (nalu[1] & 0x7);
+			}
+			else {
+				/*F bit of AP is 0 if the F bit of each aggreated NALU is 0; otherwise its must be 1*/
+				/*LayerId and TID must be the lowest value of LayerId and TID of all aggreated NALU*/
+				u8 cur_LayerId, cur_TID, new_LayerId, new_TID;
+
+				builder->hevc_payload_hdr[0] |= (nalu[0] & 0x80);
+				cur_LayerId = (builder->hevc_payload_hdr[0] & 0x3F);
+				new_LayerId = (nalu[0] & 0x3F);
+				if (cur_LayerId > new_LayerId) {
+					builder->hevc_payload_hdr[0] = (builder->hevc_payload_hdr[0] & 0xC0) | new_LayerId;
+				}
+				cur_TID = builder->hevc_payload_hdr[1] & 0x3;
+				new_TID = nalu[1] & 0x3;
+				if (cur_TID > new_TID) {
+					builder->hevc_payload_hdr[1] = (builder->hevc_payload_hdr[1] & 0xF8) | new_TID;
+				}
+			}
+
+			/*add NALU size*/
+			nal_s[0] = nalu_size>>8;
+			nal_s[1] = nalu_size&0x00ff;
+			builder->OnData(builder->cbk_obj, (char *)nal_s, 2, GF_FALSE);
+			builder->bytesInPacket += 2;
+		}
+		/*add data*/
+		if (builder->OnDataReference)
+			builder->OnDataReference(builder->cbk_obj, nalu_size, 0);
+		else
+			builder->OnData(builder->cbk_obj, nalu, nalu_size, GF_FALSE);
+
+		builder->bytesInPacket += nalu_size;
+
+		if (IsAUEnd) {
+			builder->rtp_header.Marker = 1;
+			if (strlen(builder->hevc_payload_hdr)) {
+				builder->OnData(builder->cbk_obj, (char *)builder->hevc_payload_hdr, 2, GF_TRUE);
+				memset(builder->hevc_payload_hdr, 0, 2);
+			}
+			builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
+			builder->bytesInPacket = 0;
+		}
+	}
+	/*fragmentation unit*/
+	else {
+		u32 offset;
+		u8 payload_hdr[2];
+		u8 shdr;
+
+		assert(nalu_size + 4 >=builder->Path_MTU);
+		assert(!builder->bytesInPacket);
+
+		/*FU payload doesn't have the NAL hdr (2 bytes*/
+		bytesLeft = nalu_size - 2;
+		offset = 2;
+		while (bytesLeft) {
+			u8 nut;
+
+			if (3 + bytesLeft > builder->Path_MTU) {
+				size = builder->Path_MTU - 3;
+			} else {
+				size = bytesLeft;
+			}
+
+			/*declare PayloadHdr for FU*/
+			memset(payload_hdr, 0, 2);
+			/*copy everything and assign type*/
+			payload_hdr[0] = nalu[0];
+			payload_hdr[1] = (((u32) RTP_VVC_FRAG_NAL) << 3) | (nalu[1] & 0x7);
+			builder->OnData(builder->cbk_obj, (char *)payload_hdr, 2, GF_FALSE);
+
+			nut = nalu[1] >> 3;
+			/*declare FU header*/
+			shdr = 0;
+			/*assign type*/
+			shdr |= nut;
+			/*start bit*/
+			if (offset==2) shdr |= 0x80;
+			/*end bit*/
+			else if (size == bytesLeft) {
+				shdr |= 0x40;
+				//VCL, last packet of picture, set P bit
+				if (nut <= GF_VVC_NALU_SLICE_GDR) {
+					shdr |= 0x20;
+				}
+			}
+
+			builder->OnData(builder->cbk_obj, &shdr, 1, GF_FALSE);
+
+			/*add data*/
+			if (builder->OnDataReference)
+				builder->OnDataReference(builder->cbk_obj, size, offset);
+			else
+				builder->OnData(builder->cbk_obj, nalu+offset, size, GF_FALSE);
+
+			offset += size;
+			bytesLeft -= size;
+
+			/*flush no matter what (FUs cannot be agreggated)*/
+			builder->rtp_header.Marker = (IsAUEnd && !bytesLeft) ? 1 : 0;
+			builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
+			builder->bytesInPacket = 0;
+
+			if (bytesLeft) {
+				builder->rtp_header.PayloadType = builder->PayloadType;
+				builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
+				builder->rtp_header.SequenceNumber += 1;
+				builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
+			}
+		}
+	}
+	return GF_OK;
+}
 void latm_flush(GP_RTPPacketizer *builder)
 {
 	if (builder->bytesInPacket) {

gpac-1.0.1.tar.gz/src/ietf/rtp_streamer.c -> gpac-2.0.0.tar.gz/src/ietf/rtp_streamer.c Changed

@@ -268,6 +268,7 @@
 	/*MPEG1/2 audio*/
 	case GF_CODECID_MPEG2_PART3:
 	case GF_CODECID_MPEG_AUDIO:
+	case GF_CODECID_MPEG_AUDIO_L1:
 		if (!is_crypted) {
 			rtp_type = GF_RTP_PAYT_MPEG12_AUDIO;
 			/*use official RTP/AVP payload type*/
@@ -331,7 +332,12 @@
 		rtp_type = GF_RTP_PAYT_LHVC;
 		PL_ID = 0x0F;
 		break;
-
+	/*VVC*/
+	case GF_CODECID_VVC:
+		required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
+		rtp_type = GF_RTP_PAYT_VVC;
+		PL_ID = 0x0F;
+		break;
 	case GF_CODECID_H263:
 		rtp_type = GF_RTP_PAYT_H263;
 		required_rate = 90000;
@@ -579,7 +585,7 @@
 				strcat(sdpLine, "; sprop-parameter-sets=");
 				count = gf_list_count(avcc->sequenceParameterSets);
 				for (i=0; i<count; i++) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(avcc->sequenceParameterSets, i);
+					GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(avcc->sequenceParameterSets, i);
 					b64s = gf_base64_encode(sl->data, sl->size, b64, 200);
 					b64[b64s]=0;
 					strcat(sdpLine, b64);
@@ -588,7 +594,7 @@
 				if (i) strcat(sdpLine, ",");
 				count = gf_list_count(avcc->pictureParameterSets);
 				for (i=0; i<count; i++) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(avcc->pictureParameterSets, i);
+					GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(avcc->pictureParameterSets, i);
 					b64s = gf_base64_encode(sl->data, sl->size, b64, 200);
 					b64[b64s]=0;
 					strcat(sdpLine, b64);
@@ -599,35 +605,58 @@
 			strcat(sdpLine, "\n");
 		}
 	}
-	else if ((rtp->packetizer->rtp_payt == GF_RTP_PAYT_HEVC) || (rtp->packetizer->rtp_payt == GF_RTP_PAYT_LHVC)) {
-#ifndef GPAC_DISABLE_HEVC
-		GF_HEVCConfig *hevcc = dsi ? gf_odf_hevc_cfg_read((u8*)dsi, dsi_len, GF_FALSE) : NULL;
-		if (hevcc) {
+	else if ((rtp->packetizer->rtp_payt == GF_RTP_PAYT_HEVC)
+		|| (rtp->packetizer->rtp_payt == GF_RTP_PAYT_LHVC)
+		|| (rtp->packetizer->rtp_payt == GF_RTP_PAYT_VVC)
+	) {
+		GF_VVCConfig *vvcc = NULL;
+		GF_HEVCConfig *hvcc = NULL;
+		GF_List *param_array = NULL;
+		u8 sps_nut=0, pps_nut=0, vps_nut=0;
+		if (rtp->packetizer->rtp_payt == GF_RTP_PAYT_VVC) {
+			vvcc = dsi ? gf_odf_vvc_cfg_read((u8*)dsi, dsi_len) : NULL;
+			param_array = vvcc ? vvcc->param_array : NULL;
+			sps_nut = GF_VVC_NALU_SEQ_PARAM;
+			pps_nut = GF_VVC_NALU_PIC_PARAM;
+			vps_nut = GF_VVC_NALU_VID_PARAM;
+		} else {
+			if (dsi) {
+				hvcc = gf_odf_hevc_cfg_read((u8*)dsi, dsi_len, GF_FALSE);
+			} else if (dsi_enh) {
+				hvcc = gf_odf_hevc_cfg_read((u8*)dsi_enh, dsi_enh_len, GF_TRUE);
+			}
+			param_array = hvcc ? hvcc->param_array : NULL;
+			sps_nut = GF_HEVC_NALU_SEQ_PARAM;
+			pps_nut = GF_HEVC_NALU_PIC_PARAM;
+			vps_nut = GF_HEVC_NALU_VID_PARAM;
+		}
+
+		if (param_array) {
 			u32 count, i, j, b64s;
 			char b64[200];
 			sprintf(sdpLine, "a=fmtp:%d", rtp->packetizer->PayloadType);
-			count = gf_list_count(hevcc->param_array);
+			count = gf_list_count(param_array);
 			for (i = 0; i < count; i++) {
-				GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(hevcc->param_array, i);
-				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+				GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *)gf_list_get(param_array, i);
+				if (ar->type==sps_nut) {
 					strcat(sdpLine, "; sprop-sps=");
-				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+				} else if (ar->type==pps_nut) {
 					strcat(sdpLine, "; sprop-pps=");
-				} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+				} else if (ar->type==vps_nut) {
 					strcat(sdpLine, "; sprop-vps=");
 				}
 				for (j = 0; j < gf_list_count(ar->nalus); j++) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+					GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
 					b64s = gf_base64_encode(sl->data, sl->size, b64, 200);
 					b64[b64s]=0;
 					if (j) strcat(sdpLine, ", ");
 					strcat(sdpLine, b64);
 				}
 			}
-			gf_odf_hevc_cfg_del(hevcc);
+			if (vvcc) gf_odf_vvc_cfg_del(vvcc);
+			if (hvcc) gf_odf_hevc_cfg_del(hvcc);
 			strcat(sdpLine, "\n");
 		}
-#endif
 	}
 	/*MPEG-4 decoder config*/
 	else if (rtp->packetizer->rtp_payt==GF_RTP_PAYT_MPEG4) {

gpac-1.0.1.tar.gz/src/ietf/rtsp_command.c -> gpac-2.0.0.tar.gz/src/ietf/rtsp_command.c Changed

gpac-1.0.1.tar.gz/src/ietf/rtsp_response.c -> gpac-2.0.0.tar.gz/src/ietf/rtsp_response.c Changed

gpac-1.0.1.tar.gz/src/ietf/rtsp_session.c -> gpac-2.0.0.tar.gz/src/ietf/rtsp_session.c Changed

@@ -34,7 +34,7 @@
 
 GF_Err RTSP_UnpackURL(char *sURL, char *Server, u16 *Port, char *Service, Bool *useTCP)
 {
-	char schema[10], *test, text[1024], *retest;
+	char schema[10], *test, text[1024], *retest, *sep;
 	u32 i, len;
 	Bool is_ipv6;
 	if (!sURL) return GF_BAD_PARAM;
@@ -46,6 +46,8 @@
 
 	if (!strchr(sURL, ':')) return GF_BAD_PARAM;
 
+	sep = strchr(sURL, '?');
+	if (sep) sep[0] = 0;
 	//extract the schema
 	i = 0;
 	while (i<=strlen(sURL)) {
@@ -53,6 +55,7 @@
 		schema[i] = sURL[i];
 		i += 1;
 	}
+	if (sep) sep[0] = '?';
 	return GF_BAD_PARAM;
 
 found:
@@ -64,12 +67,17 @@
 		if (test) return GF_NOT_SUPPORTED;
 	*/
 	test = strstr(sURL, "://");
-	if (!test) return GF_URL_ERROR;
+	if (!test) {
+		if (sep) sep[0] = '?';
+		return GF_URL_ERROR;
+	}
 	test += 3;
 	//check for service
 	retest = strstr(test, "/");
-	if (!retest) return GF_URL_ERROR;
-
+	if (!retest) {
+		if (sep) sep[0] = '?';
+		return GF_URL_ERROR;
+	}
 	if (!stricmp(schema, "rtsp") || !stricmp(schema, "satip"))
 		*useTCP = GF_TRUE;
 
@@ -89,6 +97,7 @@
 		text[i] = 0;
 		*Port = atoi(text);
 	}
+
 	//get the server name
 	is_ipv6 = GF_FALSE;
 	len = (u32) strlen(test);
@@ -102,6 +111,7 @@
 	}
 	text[i] = 0;
 	strcpy(Server, text);
+	if (sep) sep[0] = '?';
 
 	while (test[i] != '/') i += 1;
 	strcpy(Service, test+i+1);
@@ -367,7 +377,7 @@
 		/*this may be NULL (data fetched after a teardown) - resync and return*/
 		ch = GetTCPChannel(sess, InterID, InterID, GF_FALSE);
 
-		/*then check wether this is a full packet or a split*/
+		/*then check whether this is a full packet or a split*/
 		if (paySize <= Size-4) {
 			if (ch) {
 				IsRTCP = (ch->rtcpID == InterID) ? GF_TRUE : GF_FALSE;

gpac-1.0.1.tar.gz/src/ietf/sdp.c -> gpac-2.0.0.tar.gz/src/ietf/sdp.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -343,9 +343,7 @@
 	return sdp;
 }
 
-#define SDP_DESTROY(p) if (sdp->p)	\
-					gf_free(sdp->p);	\
-					sdp->p = NULL;
+#define SDP_DESTROY(p) if (sdp->p) { gf_free(sdp->p); sdp->p = NULL; }
 
 
 GF_EXPORT
@@ -446,19 +444,19 @@
 	test = strstr(buf, "d");
 	if (test) {
 		assert(strlen(buf)-strlen(test) < sizeof(num));
-		strncpy(num, buf, strlen(buf)-strlen(test));
+		memcpy(num, buf, MIN(sizeof(num)-1, strlen(buf)-strlen(test)));
 		return (atoi(num)*sign*86400);
 	}
 	test = strstr(buf, "h");
 	if (test) {
 		assert(strlen(buf)-strlen(test) < sizeof(num));
-		strncpy(num, buf, strlen(buf)-strlen(test));
+		memcpy(num, buf, MIN(sizeof(num)-1, strlen(buf)-strlen(test)));
 		return (atoi(num)*sign*3600);
 	}
 	test = strstr(buf, "m");
 	if (test) {
 		assert(strlen(buf)-strlen(test) < sizeof(num));
-		strncpy(num, buf, strlen(buf)-strlen(test));
+		memcpy(num, buf, MIN(sizeof(num)-1, strlen(buf)-strlen(test)));
 		return (atoi(num)*sign*60);
 	}
 	return (atoi(buf) * sign);
@@ -802,7 +800,7 @@
 			if (!map->payload_name || !map->ClockRate) return GF_REMOTE_SERVICE_ERROR;
 		}
 	}
-	//Encryption: nothing tells wether the scope of the global key is eclusive or not.
+	//Encryption: nothing tells whether the scope of the global key is eclusive or not.
 	//we accept a global key + keys per media entry, assuming that the media key primes
 	//on the global key
 
@@ -826,7 +824,7 @@
 	if (str) { \
 		SDP_WRITE_ALLOC_STR_WITHOUT_CHECK(str, space); \
 	}		\
- 
+
 #define SDP_WRITE_ALLOC_INT(d, spa, sig)		\
 	if (sig < 0) { \
 		sprintf(temp, "%d", d);		\

gpac-1.0.1.tar.gz/src/isomedia/avc_ext.c -> gpac-2.0.0.tar.gz/src/isomedia/avc_ext.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -90,7 +90,7 @@
 {
 	u32 i, count = gf_list_count(nalus);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(nalus, i);
+		GF_NALUFFParam *sl = (GF_NALUFFParam*)gf_list_get(nalus, i);
 		if (rewrite_start_codes) gf_bs_write_u32(bs, 1);
 		else gf_bs_write_int(bs, sl->size, 8*nal_unit_size_field);
 		gf_bs_write_data(bs, sl->data, sl->size);
@@ -236,7 +236,7 @@
 
 				}
 			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMF: Extractor size is larger than refered sample size - skipping.\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMF: Extractor size is larger than referred sample size - skipping.\n"));
 			}
 			gf_isom_set_nalu_extract_mode(file, ref_track_num, cur_extract_mode);
 
@@ -343,21 +343,8 @@
 			u8 nal_hdr = gf_bs_read_u8(mdia->nalu_parser);
 			nal_type = nal_hdr & 0x1F;
 
-			switch (nal_type) {
-			/*			case GF_AVC_NALU_SEQ_PARAM:
-						case GF_AVC_NALU_PIC_PARAM:
-						case GF_AVC_NALU_SEQ_PARAM_EXT:
-						case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-		*/
-			case GF_AVC_NALU_IDR_SLICE:
-				return SAP_TYPE_1;
-			case GF_AVC_NALU_ACCESS_UNIT:
-			case GF_AVC_NALU_FILLER_DATA:
-			case GF_AVC_NALU_SEI:
-				break;
-			default:
-				return RAP_NO;
-			}
+			if (nal_type==GF_AVC_NALU_IDR_SLICE) return SAP_TYPE_1;
+			if (nal_type<GF_AVC_NALU_IDR_SLICE) return RAP_NO;
 			gf_bs_skip_bytes(mdia->nalu_parser, size - 1);
 		}
 	}
@@ -371,7 +358,7 @@
 		if (entry->hevc_config) {
 			count = gf_list_count(entry->hevc_config->config->param_array);
 			for (i=0; i<count; i++) {
-				GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(entry->hevc_config->config->param_array, i);
+				GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(entry->hevc_config->config->param_array, i);
 				if (ar->type == GF_HEVC_NALU_VID_PARAM) {
 					if (! *has_vps) *has_vps = GF_TRUE;
 					else continue;
@@ -382,7 +369,7 @@
 		if (entry->lhvc_config) {
 			count = gf_list_count(entry->lhvc_config->config->param_array);
 			for (i=0; i<count; i++) {
-				GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(entry->lhvc_config->config->param_array, i);
+				GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(entry->lhvc_config->config->param_array, i);
 				if (ar->type == GF_HEVC_NALU_VID_PARAM) {
 					if (! *has_vps) *has_vps = GF_TRUE;
 					else continue;
@@ -591,7 +578,7 @@
 		e = gf_bs_reassign_buffer(mdia->nalu_parser, mdia->in_sample_buffer, sample->dataLength);
 		if (e) return e;
 	}
-	//setup ouput
+	//setup output
 	if (!mdia->nalu_out_bs) {
 		u8 *output;
 		u32 outSize;
@@ -731,14 +718,15 @@
 			}
 
 #ifndef GPAC_DISABLE_HEVC
-			/*we already wrote this stuff*/
-			if (nal_type==GF_HEVC_NALU_ACCESS_UNIT) {
+			switch (nal_type) {
+			/*we already wrote AU delim, and we trash aggregators*/
+			case GF_HEVC_NALU_ACCESS_UNIT:
+			case GF_HEVC_NALU_FF_AGGREGATOR:
 				gf_bs_skip_bytes(mdia->nalu_parser, nal_size-2);
 				continue;
-			}
-			switch (nal_type) {
+
 			//extractor
-			case 49:
+			case GF_HEVC_NALU_FF_EXTRACTOR:
 				e = process_extractor(file, mdia, sampleNumber, sample->DTS, nal_size, nal_hdr, nal_unit_size_field, GF_TRUE, rewrite_ps, rewrite_start_codes, extractor_mode);
 				if (e) goto exit;
 				break;
@@ -803,11 +791,12 @@
 
 		switch(nal_type) {
 		case GF_AVC_NALU_ACCESS_UNIT:
-			/*we already wrote this stuff*/
+		case GF_AVC_NALU_FF_AGGREGATOR:
+			/*we already wrote this stuff, and we trash aggregators*/
 			gf_bs_skip_bytes(mdia->nalu_parser, nal_size-1);
 			continue;
 		//extractor
-		case 31:
+		case GF_AVC_NALU_FF_EXTRACTOR:
 			e = process_extractor(file, mdia, sampleNumber, sample->DTS, nal_size, nal_hdr, nal_unit_size_field, GF_FALSE, rewrite_ps, rewrite_start_codes, extractor_mode);
 			if (e) goto exit;
 			break;
@@ -877,10 +866,31 @@
 	return new_cfg;
 }
 
+GF_VVCConfig *VVC_DuplicateConfig(GF_VVCConfig *cfg)
+{
+	u8 *data;
+	u32 data_size;
+	GF_VVCConfig *new_cfg;
+	GF_BitStream *bs;
+
+	if (!cfg) return NULL;
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_odf_vvc_cfg_write_bs(cfg, bs);
+
+	gf_bs_get_content(bs, &data, &data_size);
+	gf_bs_del(bs);
+	bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
+
+	new_cfg = gf_odf_vvc_cfg_read_bs(bs);
+	gf_bs_del(bs);
+	gf_free(data);
+	return new_cfg;
+}
+
 static GF_AVCConfig *AVC_DuplicateConfig(GF_AVCConfig *cfg)
 {
 	u32 i, count;
-	GF_AVCConfigSlot *p1, *p2;
+	GF_NALUFFParam *p1, *p2;
 	GF_AVCConfig *cfg_new;
 	if (!cfg)
 		return NULL;
@@ -897,8 +907,8 @@
 
 	count = gf_list_count(cfg->sequenceParameterSets);
 	for (i=0; i<count; i++) {
-		p1 = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, i);
-		p2 = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+		p1 = (GF_NALUFFParam*)gf_list_get(cfg->sequenceParameterSets, i);
+		p2 = (GF_NALUFFParam*)gf_malloc(sizeof(GF_NALUFFParam));
 		p2->size = p1->size;
 		p2->id = p1->id;
 		p2->data = (char *)gf_malloc(sizeof(char)*p1->size);
@@ -908,8 +918,8 @@
 
 	count = gf_list_count(cfg->pictureParameterSets);
 	for (i=0; i<count; i++) {
-		p1 = (GF_AVCConfigSlot*)gf_list_get(cfg->pictureParameterSets, i);
-		p2 = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+		p1 = (GF_NALUFFParam*)gf_list_get(cfg->pictureParameterSets, i);
+		p2 = (GF_NALUFFParam*)gf_malloc(sizeof(GF_NALUFFParam));
 		p2->size = p1->size;
 		p2->id = p1->id;
 		p2->data = (char*)gf_malloc(sizeof(char)*p1->size);
@@ -921,8 +931,8 @@
 		cfg_new->sequenceParameterSetExtensions = gf_list_new();
 		count = gf_list_count(cfg->sequenceParameterSetExtensions);
 		for (i=0; i<count; i++) {
-			p1 = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSetExtensions, i);
-			p2 = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			p1 = (GF_NALUFFParam*)gf_list_get(cfg->sequenceParameterSetExtensions, i);
+			p2 = (GF_NALUFFParam*)gf_malloc(sizeof(GF_NALUFFParam));
 			p2->size = p1->size;
 			p2->id = p1->id;
 			p2->data = (char*)gf_malloc(sizeof(char)*p1->size);
@@ -939,14 +949,14 @@
 	if (!src_cfg || !dst_cfg) return;
 	cfg = AVC_DuplicateConfig(src_cfg);
 	if (!cfg) return;
-	
+
 	while (gf_list_count(cfg->sequenceParameterSets)) {
-		GF_AVCConfigSlot *p = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, 0);
+		GF_NALUFFParam *p = (GF_NALUFFParam*)gf_list_get(cfg->sequenceParameterSets, 0);
 		gf_list_rem(cfg->sequenceParameterSets, 0);
 		gf_list_insert(dst_cfg->sequenceParameterSets, p, 0);
 	}
 	while (gf_list_count(cfg->pictureParameterSets)) {
-		GF_AVCConfigSlot *p = (GF_AVCConfigSlot*)gf_list_get(cfg->pictureParameterSets, 0);
+		GF_NALUFFParam *p = (GF_NALUFFParam*)gf_list_get(cfg->pictureParameterSets, 0);
 		gf_list_rem(cfg->pictureParameterSets, 0);
 		gf_list_insert(dst_cfg->pictureParameterSets, p, 0);
 	}
@@ -959,11 +969,11 @@
 	//merge all xPS
 	u32 i, j, count = cfg->param_array ? gf_list_count(cfg->param_array) : 0;
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *ar_h = NULL;
+		GF_NALUFFParamArray *ar_h = NULL;
 		u32 count2 = dst_cfg->param_array ? gf_list_count(dst_cfg->param_array) : 0;
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(cfg->param_array, i);
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(cfg->param_array, i);
 		for (j=0; j<count2; j++) {
-			ar_h = (GF_HEVCParamArray*)gf_list_get(dst_cfg->param_array, j);
+			ar_h = (GF_NALUFFParamArray*)gf_list_get(dst_cfg->param_array, j);
 			if (ar_h->type==ar->type) {
 				break;
 			}
@@ -976,7 +986,7 @@
 			i--;
 		} else {
 			while (gf_list_count(ar->nalus)) {
-				GF_AVCConfigSlot *p = (GF_AVCConfigSlot*)gf_list_get(ar->nalus, 0);
+				GF_NALUFFParam *p = (GF_NALUFFParam*)gf_list_get(ar->nalus, 0);
 				gf_list_rem(ar->nalus, 0);
 				if (force_insert)
 					gf_list_insert(ar_h->nalus, p, 0);
@@ -1249,18 +1259,36 @@
 }
 
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
-void gf_media_hevc_parse_ps(GF_HEVCConfig* hevccfg, HEVCState* hevc, u32 nal_type)
+void gf_hevc_parse_ps(GF_HEVCConfig* hevccfg, HEVCState* hevc, u32 nal_type)
 {
 	u32 i, j;
 	if (!hevccfg) return;
-	
+
 	for (i = 0; i < gf_list_count(hevccfg->param_array); i++) {
-		GF_HEVCParamArray* ar = gf_list_get(hevccfg->param_array, i);
+		GF_NALUFFParamArray* ar = gf_list_get(hevccfg->param_array, i);
 		if (ar->type != nal_type) continue;
 		for (j = 0; j < gf_list_count(ar->nalus); j++) {
 			u8 ntype, tid, lid;
-			GF_AVCConfigSlot* sl = gf_list_get(ar->nalus, j);
-			gf_media_hevc_parse_nalu(sl->data, sl->size, hevc, &ntype, &tid, &lid);
+			GF_NALUFFParam* sl = gf_list_get(ar->nalus, j);
+			gf_hevc_parse_nalu(sl->data, sl->size, hevc, &ntype, &tid, &lid);
+		}
+	}
+}
+#endif
+
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+void gf_vvc_parse_ps(GF_VVCConfig* vvccfg, VVCState* vvc, u32 nal_type)
+{
+	u32 i, j;
+	if (!vvccfg) return;
+
+	for (i = 0; i < gf_list_count(vvccfg->param_array); i++) {
+		GF_NALUFFParamArray* ar = gf_list_get(vvccfg->param_array, i);
+		if (ar->type != nal_type) continue;
+		for (j = 0; j < gf_list_count(ar->nalus); j++) {
+			u8 ntype, tid, lid;
+			GF_NALUFFParam* sl = gf_list_get(ar->nalus, j);
+			gf_vvc_parse_nalu(sl->data, sl->size, vvc, &ntype, &tid, &lid);
 		}
 	}
 }
@@ -1300,7 +1328,7 @@
 			mvcg->num_entries += 1;
 		mvcg->num_entries += gf_list_count(entry->avc_config->config->sequenceParameterSetExtensions);
 	}
-	if (entry->mvc_config) {
+	if (entry->mvc_config && entry->mvc_config->config) {
 		mvcg->num_entries += gf_list_count(entry->mvc_config->config->sequenceParameterSets);
 	}
 	mvcg->entries = gf_malloc(sizeof(MVCIEntry)*mvcg->num_entries);
@@ -1330,7 +1358,8 @@
 	return GF_OK;
 }
 
-static GF_AV1Config* AV1_DuplicateConfig(GF_AV1Config const * const cfg) {
+static GF_AV1Config* AV1_DuplicateConfig(GF_AV1Config const * const cfg)
+{
 	u32 i = 0;
 	GF_AV1Config *out = gf_malloc(sizeof(GF_AV1Config));
 
@@ -1374,7 +1403,7 @@
 		av1->emul_esd->decoderConfig->avgBitrate = btrt->avgBitrate;
 		av1->emul_esd->decoderConfig->maxBitrate = btrt->maxBitrate;
 	}
-	if (av1->av1_config) {
+	if (av1->av1_config && av1->av1_config->config) {
 		GF_AV1Config *av1_cfg = AV1_DuplicateConfig(av1->av1_config->config);
 		if (av1_cfg) {
 			gf_odf_av1_cfg_write(av1_cfg, &av1->emul_esd->decoderConfig->decoderSpecificInfo->data, &av1->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
@@ -1425,7 +1454,7 @@
 		vp9->emul_esd->decoderConfig->maxBitrate = btrt->maxBitrate;
 	}
 
-	if (vp9->vp_config) {
+	if (vp9->vp_config && vp9->vp_config->config) {
 		GF_VPConfig *vp9_cfg = VP_DuplicateConfig(vp9->vp_config->config);
 		if (vp9_cfg) {
 			gf_odf_vp_cfg_write(vp9_cfg, &vp9->emul_esd->decoderConfig->decoderSpecificInfo->data, &vp9->emul_esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
@@ -1581,21 +1610,21 @@
 
 
 				while (gf_list_count(a_cfg->config->sequenceParameterSets)) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(a_cfg->config->sequenceParameterSets, 0);
+					GF_NALUFFParam *sl = (GF_NALUFFParam*)gf_list_get(a_cfg->config->sequenceParameterSets, 0);
 					gf_list_rem(a_cfg->config->sequenceParameterSets, 0);
 					if (sl->data) gf_free(sl->data);
 					gf_free(sl);
 				}
 
 				while (gf_list_count(a_cfg->config->pictureParameterSets)) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(a_cfg->config->pictureParameterSets, 0);
+					GF_NALUFFParam *sl = (GF_NALUFFParam*)gf_list_get(a_cfg->config->pictureParameterSets, 0);
 					gf_list_rem(a_cfg->config->pictureParameterSets, 0);
 					if (sl->data) gf_free(sl->data);
 					gf_free(sl);
 				}
 
 				while (gf_list_count(a_cfg->config->sequenceParameterSetExtensions)) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(a_cfg->config->sequenceParameterSetExtensions, 0);
+					GF_NALUFFParam *sl = (GF_NALUFFParam*)gf_list_get(a_cfg->config->sequenceParameterSetExtensions, 0);
 					gf_list_rem(a_cfg->config->sequenceParameterSetExtensions, 0);
 					if (sl->data) gf_free(sl->data);
 					gf_free(sl);
@@ -1714,44 +1743,6 @@
 	return gf_isom_svc_mvc_config_del(the_file, trackNumber, DescriptionIndex, GF_TRUE);
 }
 
-
-GF_EXPORT
-GF_Err gf_isom_set_ipod_compatible(GF_ISOFile *the_file, u32 trackNumber)
-{
-	GF_TrackBox *trak;
-	GF_Err e;
-	GF_MPEGVisualSampleEntryBox *entry;
-
-	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
-	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !trak->Media) return GF_BAD_PARAM;
-	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, 0);
-	if (!entry) return GF_OK;
-	switch (entry->type) {
-	case GF_ISOM_BOX_TYPE_AVC1:
-	case GF_ISOM_BOX_TYPE_AVC2:
-	case GF_ISOM_BOX_TYPE_AVC3:
-	case GF_ISOM_BOX_TYPE_AVC4:
-	case GF_ISOM_BOX_TYPE_SVC1:
-	case GF_ISOM_BOX_TYPE_MVC1:
-	case GF_ISOM_BOX_TYPE_HVC1:
-	case GF_ISOM_BOX_TYPE_HEV1:
-	case GF_ISOM_BOX_TYPE_HVT1:
-		break;
-	default:
-		return GF_OK;
-	}
-
-	if (!entry->ipod_ext) {
-		entry->ipod_ext = (GF_UnknownUUIDBox *) gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_UUID);
-		if (!entry->ipod_ext) return GF_OUT_OF_MEM;
-	}
-	memcpy(entry->ipod_ext->uuid, GF_ISOM_IPOD_EXT, sizeof(u8)*16);
-	entry->ipod_ext->dataSize = 0;
-	return GF_OK;
-}
-
 static GF_Err gf_isom_svc_mvc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, Bool is_mvc, char *URLname, char *URNname, u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -1851,6 +1842,45 @@
 	return e;
 }
 
+
+GF_EXPORT
+GF_Err gf_isom_vvc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_VVCConfig *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	u32 dataRefIndex;
+	GF_SampleDescriptionBox *stsd;
+	GF_MPEGVisualSampleEntryBox *entry;
+
+	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !cfg) return GF_BAD_PARAM;
+
+	//get or create the data ref
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, (char *)URLname, (char *)URNname, &dataRefIndex);
+	if (e) return e;
+	if (!dataRefIndex) {
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, (char *)URLname, (char *)URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	if (!the_file->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	//create a new entry
+	entry = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new_parent(&stsd->child_boxes, GF_ISOM_BOX_TYPE_VVC1);
+	if (!entry) return GF_OUT_OF_MEM;
+	entry->vvc_config = (GF_VVCConfigurationBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_VVCC);
+	if (!entry->vvc_config) return GF_OUT_OF_MEM;
+	entry->vvc_config->config = VVC_DuplicateConfig(cfg);
+	if (!entry->vvc_config->config) return GF_OUT_OF_MEM;
+	entry->dataReferenceIndex = dataRefIndex;
+	*outDescriptionIndex = gf_list_count(stsd->child_boxes);
+	return e;
+}
+
 GF_EXPORT
 GF_Err gf_isom_vp_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_VPConfig *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex, u32 vpx_type)
 {
@@ -1880,7 +1910,7 @@
 	//create a new entry
 	entry = (GF_MPEGVisualSampleEntryBox *)gf_isom_box_new_parent(&stsd->child_boxes, vpx_type);
 	if (!entry) return GF_OUT_OF_MEM;
-	
+
 	entry->vp_config = (GF_VPConfigurationBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_VPCC);
 	if (!entry->vp_config) return GF_OUT_OF_MEM;
 	entry->vp_config->config = VP_DuplicateConfig(cfg);
@@ -1943,17 +1973,17 @@
 	GF_ISOM_LHCC_SET_INBAND
 } HevcConfigUpdateType;
 
-static Bool hevc_cleanup_config(GF_HEVCConfig *cfg, HevcConfigUpdateType operand_type, Bool keep_xps)
+static Bool nalu_cleanup_config(GF_List *param_array, Bool set_inband, Bool keep_xps)
 {
 	u32 i;
-	Bool array_incomplete = (operand_type==GF_ISOM_HVCC_SET_INBAND) ? 1 : 0;
-	if (!cfg) return 0;
+	Bool array_incomplete = set_inband;
+	if (!param_array) return 0;
 
-	for (i=0; i<gf_list_count(cfg->param_array); i++) {
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(cfg->param_array, i);
+	for (i=0; i<gf_list_count(param_array); i++) {
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(param_array, i);
 
-		/*we want to force hev1*/
-		if (operand_type==GF_ISOM_HVCC_SET_INBAND) {
+		/*we want to force inband signaling*/
+		if (set_inband) {
 			ar->array_completeness = 0;
 			if (keep_xps) {
 				array_incomplete=1;
@@ -1961,7 +1991,7 @@
 			}
 
 			while (gf_list_count(ar->nalus)) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(ar->nalus, 0);
+				GF_NALUFFParam *sl = (GF_NALUFFParam*)gf_list_get(ar->nalus, 0);
 				gf_list_rem(ar->nalus, 0);
 				if (sl->data) gf_free(sl->data);
 				gf_free(sl);
@@ -1969,7 +1999,7 @@
 			gf_list_del(ar->nalus);
 			gf_free(ar);
 			ar=NULL;
-			gf_list_rem(cfg->param_array, i);
+			gf_list_rem(param_array, i);
 			i--;
 			continue;
 		}
@@ -2033,11 +2063,17 @@
 			operand_type=GF_ISOM_HVCC_SET_INBAND;
 		}
 		array_incomplete = (operand_type==GF_ISOM_HVCC_SET_INBAND) ? 1 : 0;
-		if (entry->hevc_config && hevc_cleanup_config(entry->hevc_config->config, operand_type, keep_xps)) {
+		if (entry->hevc_config && nalu_cleanup_config(entry->hevc_config->config ? entry->hevc_config->config->param_array : NULL,
+			(operand_type==GF_ISOM_HVCC_SET_INBAND) ? GF_TRUE:GF_FALSE,
+			keep_xps)
+		) {
 			array_incomplete=1;
 		}
 
-		if (entry->lhvc_config && hevc_cleanup_config(entry->lhvc_config->config, operand_type, keep_xps))
+		if (entry->lhvc_config && nalu_cleanup_config(entry->lhvc_config->config ? entry->lhvc_config->config->param_array : NULL,
+			(operand_type==GF_ISOM_HVCC_SET_INBAND),
+			keep_xps)
+		)
 			array_incomplete=1;
 
 		switch (entry->type) {
@@ -2077,7 +2113,7 @@
 					entry->lhvc_config->config = HEVC_DuplicateConfig(cfg);
 					if (!entry->lhvc_config->config) return GF_OUT_OF_MEM;
 				}
-				
+
 				if (operand_type==GF_ISOM_HVCC_SET_LHVC_WITH_BASE_BACKWARD) {
 					if (entry->type==GF_ISOM_BOX_TYPE_HEV2) entry->type = GF_ISOM_BOX_TYPE_HEV1;
 					else entry->type = GF_ISOM_BOX_TYPE_HVC1;
@@ -2159,6 +2195,84 @@
 	}
 }
 
+
+typedef enum
+{
+	GF_ISOM_VVCC_UPDATE = 0,
+	GF_ISOM_VVCC_SET_INBAND,
+} VvcConfigUpdateType;
+
+
+static
+GF_Err gf_isom_vvc_config_update_ex(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_VVCConfig *cfg, u32 operand_type, Bool keep_xps)
+{
+	u32 array_incomplete;
+	GF_TrackBox *trak;
+	GF_Err e;
+	GF_MPEGVisualSampleEntryBox *entry;
+	GF_SampleDescriptionBox *stsd;
+
+	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !DescriptionIndex) return GF_BAD_PARAM;
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	entry = (GF_MPEGVisualSampleEntryBox *)gf_list_get(stsd->child_boxes, DescriptionIndex-1);
+	if (!entry) return GF_BAD_PARAM;
+	switch (entry->type) {
+	case GF_ISOM_BOX_TYPE_VVC1:
+	case GF_ISOM_BOX_TYPE_VVI1:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+
+	if (operand_type <= GF_ISOM_VVCC_SET_INBAND) {
+		if ((operand_type != GF_ISOM_VVCC_SET_INBAND) && !entry->vvc_config) {
+			entry->vvc_config = (GF_VVCConfigurationBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_VVCC);
+			if (!entry->vvc_config) return GF_OUT_OF_MEM;
+		}
+
+		if (cfg) {
+			if (entry->vvc_config->config) gf_odf_vvc_cfg_del(entry->vvc_config->config);
+			entry->vvc_config->config = VVC_DuplicateConfig(cfg);
+		} else {
+			operand_type = GF_ISOM_VVCC_SET_INBAND;
+		}
+		if (operand_type == GF_ISOM_VVCC_UPDATE) {
+			return GF_OK;
+		}
+
+		array_incomplete = (operand_type==GF_ISOM_VVCC_SET_INBAND) ? 1 : 0;
+		if (entry->vvc_config && nalu_cleanup_config(entry->vvc_config->config ? entry->vvc_config->config->param_array : NULL,
+			(operand_type==GF_ISOM_VVCC_SET_INBAND),
+			keep_xps)
+		) {
+			array_incomplete=1;
+		}
+		switch (entry->type) {
+		case GF_ISOM_BOX_TYPE_VVC1:
+		case GF_ISOM_BOX_TYPE_VVI1:
+			entry->type = array_incomplete ? GF_ISOM_BOX_TYPE_VVI1 : GF_ISOM_BOX_TYPE_VVC1;
+			break;
+		}
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_vvc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, Bool keep_xps)
+{
+	return gf_isom_vvc_config_update_ex(the_file, trackNumber, DescriptionIndex, NULL, GF_ISOM_VVCC_SET_INBAND, keep_xps);
+}
+
+GF_EXPORT
+GF_Err gf_isom_vvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_VVCConfig *cfg)
+{
+	return gf_isom_vvc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, GF_ISOM_VVCC_UPDATE, GF_FALSE);
+}
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_EXPORT
@@ -2202,7 +2316,7 @@
 
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
 	if (!entry) return NULL;
-
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
 	if (!entry->avc_config) return NULL;
 	return AVC_DuplicateConfig(entry->avc_config->config);
 }
@@ -2225,11 +2339,76 @@
 		return NULL;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
 	if (!entry) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
 	if (!entry->hevc_config) return NULL;
 	return HEVC_DuplicateConfig(entry->hevc_config->config);
 }
 
 GF_EXPORT
+GF_ISOMVVCType gf_isom_get_vvc_type(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	u32 type;
+	GF_TrackBox *trak;
+	GF_MPEGVisualSampleEntryBox *entry;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !DescriptionIndex) return GF_ISOM_VVCTYPE_NONE;
+	if (!gf_isom_is_video_handler_type(trak->Media->handler->handlerType))
+		return GF_ISOM_VVCTYPE_NONE;
+	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
+	if (!entry) return GF_ISOM_VVCTYPE_NONE;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_ISOM_VVCTYPE_NONE;
+	type = entry->type;
+
+	if (type == GF_ISOM_BOX_TYPE_ENCV) {
+		GF_ProtectionSchemeInfoBox *sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+		if (sinf && sinf->original_format) type = sinf->original_format->data_format;
+	}
+	else if (type == GF_ISOM_BOX_TYPE_RESV) {
+		if (entry->rinf && entry->rinf->original_format) type = entry->rinf->original_format->data_format;
+	}
+
+	switch (type) {
+	case GF_ISOM_BOX_TYPE_VVC1:
+	case GF_ISOM_BOX_TYPE_VVI1:
+		return GF_ISOM_VVCTYPE_ONLY;
+	case GF_ISOM_SUBTYPE_VVS1:
+		return GF_ISOM_VVCTYPE_SUBPIC;
+	case GF_ISOM_SUBTYPE_VVCN:
+		return GF_ISOM_VVCTYPE_NVCL;
+	default:
+		return GF_ISOM_VVCTYPE_NONE;
+	}
+	return GF_ISOM_VVCTYPE_NONE;
+}
+
+GF_EXPORT
+GF_VVCConfig *gf_isom_vvc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	GF_TrackBox *trak;
+	u32 type;
+	GF_MPEGVisualSampleEntryBox *entry;
+	/*todo, add support for subpic track and nvcl tracks*/
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !DescriptionIndex) return NULL;
+	type = gf_isom_get_vvc_type(the_file, trackNumber, DescriptionIndex);
+	if (type==GF_ISOM_VVCTYPE_NONE)
+		return NULL;
+	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
+	if (!entry) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
+
+	if ((type==GF_ISOM_VVCTYPE_SUBPIC) || (type==GF_ISOM_VVCTYPE_NVCL)) {
+		GF_VVCNaluConfigurationBox *vvnc = (GF_VVCNaluConfigurationBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_VVNC);
+		if (!vvnc) return NULL;
+		GF_VVCConfig *vvcc = gf_odf_vvc_cfg_new();
+		vvcc->nal_unit_size = vvnc->nal_unit_size;
+		return vvcc;
+	}
+	if (!entry->vvc_config) return NULL;
+	return VVC_DuplicateConfig(entry->vvc_config->config);
+}
+
+GF_EXPORT
 GF_AVCConfig *gf_isom_svc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -2240,6 +2419,7 @@
 		return NULL;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
 	if (!entry) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
 	if (!entry->svc_config) return NULL;
 	return AVC_DuplicateConfig(entry->svc_config->config);
 }
@@ -2256,6 +2436,7 @@
 		return NULL;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
 	if (!entry) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
 	if (!entry->mvc_config) return NULL;
 	return AVC_DuplicateConfig(entry->mvc_config->config);
 }
@@ -2275,10 +2456,13 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Media || !DescriptionIndex) return NULL;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex - 1);
-	if (!entry || !entry->av1_config) return NULL;
+	if (!entry) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
+	if (!entry->av1_config|| !entry->av1_config->config) return NULL;
 	return AV1_DuplicateConfig(entry->av1_config->config);
 }
 
+
 GF_EXPORT
 GF_VPConfig *gf_isom_vp_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
 {
@@ -2287,7 +2471,9 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Media || !DescriptionIndex) return NULL;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex - 1);
-	if (!entry || !entry->vp_config) return NULL;
+	if (!entry) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
+	if (!entry->vp_config || !entry->vp_config->config) return NULL;
 	return VP_DuplicateConfig(entry->vp_config->config);
 }
 
@@ -2299,7 +2485,9 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Media || !DescriptionIndex) return NULL;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex - 1);
-	if (!entry || !entry->dovi_config) return NULL;
+	if (!entry) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
+	if (!entry->size || !entry->dovi_config) return NULL;
 	return DOVI_DuplicateConfig(&entry->dovi_config->DOVIConfig);
 }
 
@@ -2310,12 +2498,13 @@
 	GF_TrackBox *trak;
 	GF_MPEGVisualSampleEntryBox *entry;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !trak->Media || !DescriptionIndex) return GF_ISOM_AVCTYPE_NONE;
+	if (!trak || !trak->Media || !trak->Media->handler || !DescriptionIndex) return GF_ISOM_AVCTYPE_NONE;
 	if (!gf_isom_is_video_handler_type(trak->Media->handler->handlerType))
 		return GF_ISOM_AVCTYPE_NONE;
 
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
 	if (!entry) return GF_ISOM_AVCTYPE_NONE;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_ISOM_AVCTYPE_NONE;
 
 	type = entry->type;
 
@@ -2334,6 +2523,8 @@
 	case GF_ISOM_BOX_TYPE_AVC4:
 	case GF_ISOM_BOX_TYPE_SVC1:
 	case GF_ISOM_BOX_TYPE_MVC1:
+	case GF_ISOM_BOX_TYPE_DVA1:
+	case GF_ISOM_BOX_TYPE_DVAV:
 		break;
 	default:
 		return GF_ISOM_AVCTYPE_NONE;
@@ -2358,6 +2549,7 @@
 		return GF_ISOM_HEVCTYPE_NONE;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
 	if (!entry) return GF_ISOM_HEVCTYPE_NONE;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_ISOM_HEVCTYPE_NONE;
 	type = entry->type;
 
 	if (type == GF_ISOM_BOX_TYPE_ENCV) {
@@ -2368,10 +2560,6 @@
 		if (entry->rinf && entry->rinf->original_format) type = entry->rinf->original_format->data_format;
 	}
 
-	if (type == GF_ISOM_BOX_TYPE_DVHE) {
-		type = GF_ISOM_BOX_TYPE_HEV1;
-	}
-
 	switch (type) {
 	case GF_ISOM_BOX_TYPE_HVC1:
 	case GF_ISOM_BOX_TYPE_HEV1:
@@ -2380,6 +2568,8 @@
 	case GF_ISOM_BOX_TYPE_LHV1:
 	case GF_ISOM_BOX_TYPE_LHE1:
 	case GF_ISOM_BOX_TYPE_HVT1:
+	case GF_ISOM_BOX_TYPE_DVHE:
+	case GF_ISOM_BOX_TYPE_DVH1:
 		break;
 	default:
 		return GF_ISOM_HEVCTYPE_NONE;
@@ -2403,6 +2593,7 @@
 		return NULL;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
 	if (!entry) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
 	if (!entry->lhvc_config) return NULL;
 	lhvc = HEVC_DuplicateConfig(entry->lhvc_config->config);
 	if (!lhvc) return NULL;
@@ -2549,11 +2740,18 @@
 
 	ISOM_DECREASE_SIZE(ptr, 7) //7 includes the 2 counts of sps and pps
 
+	Bool is_avcc;
+	if ((ptr->type==GF_ISOM_BOX_TYPE_AVCC) || (ptr->type==GF_ISOM_BOX_TYPE_AVCE))
+		is_avcc = GF_TRUE;
+	else
+		is_avcc = GF_FALSE;
+
+	//we don't use gf_odf_avc_cfg_read to deal with missing rext profile signaling on many files
 	ptr->config->configurationVersion = gf_bs_read_u8(bs);
 	ptr->config->AVCProfileIndication = gf_bs_read_u8(bs);
 	ptr->config->profile_compatibility = gf_bs_read_u8(bs);
 	ptr->config->AVCLevelIndication = gf_bs_read_u8(bs);
-	if (ptr->type==GF_ISOM_BOX_TYPE_AVCC) {
+	if (is_avcc) {
 		gf_bs_read_int(bs, 6);
 	} else {
 		ptr->config->complete_representation = gf_bs_read_int(bs, 1);
@@ -2564,8 +2762,8 @@
 	count = gf_bs_read_int(bs, 5);
 
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *) gf_malloc(sizeof(GF_AVCConfigSlot));
 		ISOM_DECREASE_SIZE(ptr, 2)
+		GF_NALUFFParam *sl = (GF_NALUFFParam *) gf_malloc(sizeof(GF_NALUFFParam));
 		sl->size = gf_bs_read_u16(bs);
 		if (!sl->size || (gf_bs_available(bs) < sl->size) || (ptr->size < sl->size) ) {
 			gf_free(sl);
@@ -2580,8 +2778,8 @@
 
 	count = gf_bs_read_u8(bs);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_malloc(sizeof(GF_AVCConfigSlot));
 		ISOM_DECREASE_SIZE(ptr, 2)
+		GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_malloc(sizeof(GF_NALUFFParam));
 		sl->size = gf_bs_read_u16(bs);
 		if (!sl->size || (gf_bs_available(bs) < sl->size) || (ptr->size<sl->size)) {
 			gf_free(sl);
@@ -2594,59 +2792,67 @@
 		ptr->size -= sl->size;
 	}
 
-	if (ptr->type==GF_ISOM_BOX_TYPE_AVCC) {
-		if (gf_avc_is_rext_profile(ptr->config->AVCProfileIndication)) {
-			if (!ptr->size) {
+	//not avcC (svcC; mvcC), no check for rext signaling
+	if (!is_avcc)
+		return GF_OK;
+
+	//not REXT profile, no check for rext signaling
+	if (!gf_avcc_use_extensions(ptr->config->AVCProfileIndication))
+		return GF_OK;
+
+	//non-compliant file (rext signaling missing), try to fill in values from SPS
+	if (!ptr->size) {
+		/*set default values ...*/
+		ptr->config->chroma_format = 1;
+		ptr->config->luma_bit_depth = 8;
+		ptr->config->chroma_bit_depth = 8;
+
 #ifndef GPAC_DISABLE_AV_PARSERS
-				AVCState avc;
-				s32 idx;
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(ptr->config->sequenceParameterSets, 0);
-				idx = sl ? gf_media_avc_read_sps(sl->data+1, sl->size-1, &avc, 0, NULL) : -1;
-
-				if (idx>=0) {
-					ptr->config->chroma_format = avc.sps[idx].chroma_format;
-					ptr->config->luma_bit_depth = 8 + avc.sps[idx].luma_bit_depth_m8;
-					ptr->config->chroma_bit_depth = 8 + avc.sps[idx].chroma_bit_depth_m8;
-				}
-#else
-				/*set default values ...*/
-				ptr->config->chroma_format = 1;
-				ptr->config->luma_bit_depth = 8;
-				ptr->config->chroma_bit_depth = 8;
-#endif
-				return GF_OK;
+		GF_NALUFFParam *sl = (GF_NALUFFParam*)gf_list_get(ptr->config->sequenceParameterSets, 0);
+		if (sl) {
+			AVCState avc;
+			s32 idx;
+			memset(&avc, 0, sizeof(AVCState));
+			idx = gf_avc_read_sps(sl->data, sl->size, &avc, 0, NULL);
+			if (idx>=0) {
+				ptr->config->chroma_format = avc.sps[idx].chroma_format;
+				ptr->config->luma_bit_depth = 8 + avc.sps[idx].luma_bit_depth_m8;
+				ptr->config->chroma_bit_depth = 8 + avc.sps[idx].chroma_bit_depth_m8;
 			}
-			ISOM_DECREASE_SIZE(ptr, 4)
-			gf_bs_read_int(bs, 6);
-			ptr->config->chroma_format = gf_bs_read_int(bs, 2);
-			gf_bs_read_int(bs, 5);
-			ptr->config->luma_bit_depth = 8 + gf_bs_read_int(bs, 3);
-			gf_bs_read_int(bs, 5);
-			ptr->config->chroma_bit_depth = 8 + gf_bs_read_int(bs, 3);
-
-			count = gf_bs_read_int(bs, 8);
-			if (count*2 > ptr->size) {
-				//ffmpeg just ignores this part while allocating bytes (filled with garbage?)
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("AVCC: invalid numOfSequenceParameterSetExt value. Skipping.\n"));
-				return GF_OK;
-			}
-			if (count) {
-				ptr->config->sequenceParameterSetExtensions = gf_list_new();
-				for (i=0; i<count; i++) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_malloc(sizeof(GF_AVCConfigSlot));
-					ISOM_DECREASE_SIZE(ptr, 2)
-					sl->size = gf_bs_read_u16(bs);
-					if ((gf_bs_available(bs) < sl->size) || (ptr->size<sl->size)) {
-						gf_free(sl);
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("AVCC: Not enough bits to parse. Aborting.\n"));
-						return GF_ISOM_INVALID_FILE;
-					}
-					sl->data = (char *)gf_malloc(sizeof(char) * sl->size);
-					gf_bs_read_data(bs, sl->data, sl->size);
-					gf_list_add(ptr->config->sequenceParameterSetExtensions, sl);
-					ptr->size -= sl->size;
-				}
+		}
+#endif
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[isom/avcc] Missing REXT profile signaling, patching.\n"));
+		return GF_OK;
+	}
+	ISOM_DECREASE_SIZE(ptr, 4)
+	gf_bs_read_int(bs, 6);
+	ptr->config->chroma_format = gf_bs_read_int(bs, 2);
+	gf_bs_read_int(bs, 5);
+	ptr->config->luma_bit_depth = 8 + gf_bs_read_int(bs, 3);
+	gf_bs_read_int(bs, 5);
+	ptr->config->chroma_bit_depth = 8 + gf_bs_read_int(bs, 3);
+
+	count = gf_bs_read_int(bs, 8);
+	if (count*2 > ptr->size) {
+		//ffmpeg just ignores this part while allocating bytes (filled with garbage?)
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("AVCC: invalid numOfSequenceParameterSetExt value. Skipping.\n"));
+		return GF_OK;
+	}
+	if (count) {
+		ptr->config->sequenceParameterSetExtensions = gf_list_new();
+		for (i=0; i<count; i++) {
+			ISOM_DECREASE_SIZE(ptr, 2)
+			GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_malloc(sizeof(GF_NALUFFParam));
+			sl->size = gf_bs_read_u16(bs);
+			if ((gf_bs_available(bs) < sl->size) || (ptr->size<sl->size)) {
+				gf_free(sl);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("AVCC: Not enough bits to parse. Aborting.\n"));
+				return GF_ISOM_INVALID_FILE;
 			}
+			sl->data = (char *)gf_malloc(sizeof(char) * sl->size);
+			gf_bs_read_data(bs, sl->data, sl->size);
+			gf_list_add(ptr->config->sequenceParameterSetExtensions, sl);
+			ptr->size -= sl->size;
 		}
 	}
 	return GF_OK;
@@ -2672,11 +2878,17 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 
+	Bool is_avcc;
+	if ((ptr->type==GF_ISOM_BOX_TYPE_AVCC) || (ptr->type==GF_ISOM_BOX_TYPE_AVCE))
+		is_avcc = GF_TRUE;
+	else
+		is_avcc = GF_FALSE;
+
 	gf_bs_write_u8(bs, ptr->config->configurationVersion);
 	gf_bs_write_u8(bs, ptr->config->AVCProfileIndication);
 	gf_bs_write_u8(bs, ptr->config->profile_compatibility);
 	gf_bs_write_u8(bs, ptr->config->AVCLevelIndication);
-	if (ptr->type==GF_ISOM_BOX_TYPE_AVCC) {
+	if (is_avcc) {
 		gf_bs_write_int(bs, 0x3F, 6);
 	} else {
 		gf_bs_write_int(bs, ptr->config->complete_representation, 1);
@@ -2687,7 +2899,7 @@
 	count = gf_list_count(ptr->config->sequenceParameterSets);
 	gf_bs_write_int(bs, count, 5);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *) gf_list_get(ptr->config->sequenceParameterSets, i);
+		GF_NALUFFParam *sl = (GF_NALUFFParam *) gf_list_get(ptr->config->sequenceParameterSets, i);
 		gf_bs_write_u16(bs, sl->size);
 		gf_bs_write_data(bs, sl->data, sl->size);
 	}
@@ -2695,14 +2907,14 @@
 	count = gf_list_count(ptr->config->pictureParameterSets);
 	gf_bs_write_u8(bs, count);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *) gf_list_get(ptr->config->pictureParameterSets, i);
+		GF_NALUFFParam *sl = (GF_NALUFFParam *) gf_list_get(ptr->config->pictureParameterSets, i);
 		gf_bs_write_u16(bs, sl->size);
 		gf_bs_write_data(bs, sl->data, sl->size);
 	}
 
 
-	if (ptr->type==GF_ISOM_BOX_TYPE_AVCC) {
-		if (gf_avc_is_rext_profile(ptr->config->AVCProfileIndication)) {
+	if (is_avcc) {
+		if (gf_avcc_use_extensions(ptr->config->AVCProfileIndication)) {
 			gf_bs_write_int(bs, 0xFF, 6);
 			gf_bs_write_int(bs, ptr->config->chroma_format, 2);
 			gf_bs_write_int(bs, 0xFF, 5);
@@ -2713,7 +2925,7 @@
 			count = ptr->config->sequenceParameterSetExtensions ? gf_list_count(ptr->config->sequenceParameterSetExtensions) : 0;
 			gf_bs_write_u8(bs, count);
 			for (i=0; i<count; i++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *) gf_list_get(ptr->config->sequenceParameterSetExtensions, i);
+				GF_NALUFFParam *sl = (GF_NALUFFParam *) gf_list_get(ptr->config->sequenceParameterSetExtensions, i);
 				gf_bs_write_u16(bs, sl->size);
 				gf_bs_write_data(bs, sl->data, sl->size);
 			}
@@ -2733,18 +2945,19 @@
 	ptr->size += 7;
 	count = gf_list_count(ptr->config->sequenceParameterSets);
 	for (i=0; i<count; i++)
-		ptr->size += 2 + ((GF_AVCConfigSlot *)gf_list_get(ptr->config->sequenceParameterSets, i))->size;
+		ptr->size += 2 + ((GF_NALUFFParam *)gf_list_get(ptr->config->sequenceParameterSets, i))->size;
 
 	count = gf_list_count(ptr->config->pictureParameterSets);
 	for (i=0; i<count; i++)
-		ptr->size += 2 + ((GF_AVCConfigSlot *)gf_list_get(ptr->config->pictureParameterSets, i))->size;
+		ptr->size += 2 + ((GF_NALUFFParam *)gf_list_get(ptr->config->pictureParameterSets, i))->size;
+
 
-	if (ptr->type==GF_ISOM_BOX_TYPE_AVCC) {
-		if (gf_avc_is_rext_profile(ptr->config->AVCProfileIndication)) {
+	if ((ptr->type==GF_ISOM_BOX_TYPE_AVCC) || (ptr->type==GF_ISOM_BOX_TYPE_AVCE)) {
+		if (gf_avcc_use_extensions(ptr->config->AVCProfileIndication)) {
 			ptr->size += 4;
 			count = ptr->config->sequenceParameterSetExtensions ?gf_list_count(ptr->config->sequenceParameterSetExtensions) : 0;
 			for (i=0; i<count; i++)
-				ptr->size += 2 + ((GF_AVCConfigSlot *)gf_list_get(ptr->config->sequenceParameterSetExtensions, i))->size;
+				ptr->size += 2 + ((GF_NALUFFParam *)gf_list_get(ptr->config->sequenceParameterSetExtensions, i))->size;
 		}
 	}
 	return GF_OK;
@@ -2762,15 +2975,23 @@
 
 GF_Err hvcc_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	u64 consummed;
+	u64 consumed;
 	GF_HEVCConfigurationBox *ptr = (GF_HEVCConfigurationBox *)s;
 
 	if (ptr->config) gf_odf_hevc_cfg_del(ptr->config);
 
-	consummed = gf_bs_get_position(bs);
-	ptr->config = gf_odf_hevc_cfg_read_bs(bs, (s->type == GF_ISOM_BOX_TYPE_HVCC) ? GF_FALSE : GF_TRUE);
-	consummed = gf_bs_get_position(bs) - consummed ;
-	ISOM_DECREASE_SIZE(ptr, (u32)consummed)
+	consumed = gf_bs_get_position(bs);
+	switch (s->type) {
+	case GF_ISOM_BOX_TYPE_HVCC:
+	case GF_ISOM_BOX_TYPE_HVCE:
+		ptr->config = gf_odf_hevc_cfg_read_bs(bs, GF_FALSE);
+		break;
+	default:
+		ptr->config = gf_odf_hevc_cfg_read_bs(bs, GF_TRUE);
+		break;
+	}
+	consumed = gf_bs_get_position(bs) - consumed ;
+	ISOM_DECREASE_SIZE(ptr, (u32)consumed)
 
 	return ptr->config ? GF_OK : GF_ISOM_INVALID_FILE;
 }
@@ -2814,15 +3035,152 @@
 
 	count = gf_list_count(ptr->config->param_array);
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(ptr->config->param_array, i);
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(ptr->config->param_array, i);
+		ptr->size += 3;
+		subcount = gf_list_count(ar->nalus);
+		for (j=0; j<subcount; j++) {
+			ptr->size += 2 + ((GF_NALUFFParam *)gf_list_get(ar->nalus, j))->size;
+		}
+	}
+	return GF_OK;
+}
+
+
+
+void vvcc_box_del(GF_Box *s)
+{
+	GF_VVCConfigurationBox *ptr = (GF_VVCConfigurationBox*)s;
+	if (ptr->config) gf_odf_vvc_cfg_del(ptr->config);
+	gf_free(ptr);
+}
+
+GF_Err vvcc_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	u64 consumed;
+	GF_VVCConfigurationBox *ptr = (GF_VVCConfigurationBox *)s;
+
+	if (ptr->config) gf_odf_vvc_cfg_del(ptr->config);
+
+	consumed = gf_bs_get_position(bs);
+	ptr->config = gf_odf_vvc_cfg_read_bs(bs);
+	consumed = gf_bs_get_position(bs) - consumed ;
+	ISOM_DECREASE_SIZE(ptr, (u32)consumed)
+
+	return ptr->config ? GF_OK : GF_ISOM_INVALID_FILE;
+}
+
+GF_Box *vvcc_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_VVCConfigurationBox, GF_ISOM_BOX_TYPE_VVCC);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err vvcc_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_VVCConfigurationBox *ptr = (GF_VVCConfigurationBox *) s;
+	if (!s) return GF_BAD_PARAM;
+	if (!ptr->config) return GF_OK;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	return gf_odf_vvc_cfg_write_bs(ptr->config, bs);
+}
+
+GF_Err vvcc_box_size(GF_Box *s)
+{
+	u32 i, count, j, subcount;
+	GF_VVCConfigurationBox *ptr = (GF_VVCConfigurationBox *)s;
+
+	if (!ptr->config) {
+		ptr->size = 0;
+		return GF_OK;
+	}
+
+	ptr->size += 1;
+	if (ptr->config->ptl_present) {
 		ptr->size += 3;
+		//size PTL
+		if (!ptr->config->general_constraint_info)
+			ptr->config->num_constraint_info = 0;
+		if (!ptr->config->sub_profiles_idc)
+			ptr->config->num_sub_profiles = 0;
+
+		ptr->size += 3 + ptr->config->num_constraint_info;
+		if (ptr->config->numTemporalLayers>1)
+			ptr->size += 1;
+		for (i=0; i<ptr->config->numTemporalLayers; i++) {
+			if (ptr->config->ptl_sublayer_present_mask & (1<<i))
+				ptr->size+=1;
+		}
+		ptr->size += 1 + ptr->config->num_sub_profiles*4;
+		//end size PTL
+		ptr->size += 6;
+	}
+
+	ptr->size += 1;
+	count = gf_list_count(ptr->config->param_array);
+	for (i=0; i<count; i++) {
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(ptr->config->param_array, i);
+		if ((ar->type != GF_VVC_NALU_DEC_PARAM) && (ar->type != GF_VVC_NALU_OPI))
+			ptr->size += 3;
+		else
+			ptr->size += 1;
+
 		subcount = gf_list_count(ar->nalus);
 		for (j=0; j<subcount; j++) {
-			ptr->size += 2 + ((GF_AVCConfigSlot *)gf_list_get(ar->nalus, j))->size;
+			ptr->size += 2 + ((GF_NALUFFParam *)gf_list_get(ar->nalus, j))->size;
 		}
 	}
 	return GF_OK;
 }
+#endif
+
+
+void vvnc_box_del(GF_Box *s)
+{
+	GF_VVCNaluConfigurationBox *ptr = (GF_VVCNaluConfigurationBox*)s;
+	gf_free(ptr);
+}
+
+GF_Err vvnc_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_VVCNaluConfigurationBox *ptr = (GF_VVCNaluConfigurationBox *)s;
+
+	ISOM_DECREASE_SIZE(ptr, 1)
+	gf_bs_read_int(bs, 6);
+	ptr->nal_unit_size = 1 + gf_bs_read_int(bs, 2);
+	return GF_OK;
+}
+
+GF_Box *vvnc_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_VVCNaluConfigurationBox, GF_ISOM_BOX_TYPE_VVNC);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err vvnc_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_VVCNaluConfigurationBox *ptr = (GF_VVCNaluConfigurationBox *) s;
+	if (!s) return GF_BAD_PARAM;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_int(bs, 0, 6);
+	gf_bs_write_int(bs, ptr->nal_unit_size-1, 2);
+	return GF_OK;
+}
+
+GF_Err vvnc_box_size(GF_Box *s)
+{
+	s->size += 1;
+	return GF_OK;
+}
+#endif
 
 GF_Box *av1c_box_new() {
 	GF_AV1ConfigurationBox *tmp = (GF_AV1ConfigurationBox *)gf_malloc(sizeof(GF_AV1ConfigurationBox));
@@ -3156,8 +3514,10 @@
 		op->output_layer_set_idx = gf_bs_read_u16(bs);
 		op->max_temporal_id = gf_bs_read_u8(bs);
 		op->layer_count = gf_bs_read_u8(bs);
-		if (op->layer_count > GF_ARRAY_LENGTH(op->layers_info))
+		if (op->layer_count > GF_ARRAY_LENGTH(op->layers_info)) {
+			gf_free(op);
 			return GF_NON_COMPLIANT_BITSTREAM;
+		}
 		for (j = 0; j < op->layer_count; j++) {
 			op->layers_info[j].ptl_idx = gf_bs_read_u8(bs);
 			op->layers_info[j].layer_id = gf_bs_read_int(bs, 6);

gpac-1.0.1.tar.gz/src/isomedia/box_code_3gpp.c -> gpac-2.0.0.tar.gz/src/isomedia/box_code_3gpp.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -241,6 +241,7 @@
 GF_Box *text_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TextSampleEntryBox, GF_ISOM_BOX_TYPE_TEXT);
+	gf_isom_sample_entry_init((GF_SampleEntryBox *)tmp);
 	return (GF_Box *) tmp;
 }
 
@@ -257,6 +258,7 @@
 GF_Box *tx3g_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_Tx3gSampleEntryBox, GF_ISOM_BOX_TYPE_TX3G);
+	gf_isom_sample_entry_init((GF_SampleEntryBox *)tmp);
 	return (GF_Box *) tmp;
 }
 
@@ -304,13 +306,12 @@
 	rec->text_color = gpp_read_rgba(bs);
 }
 
-GF_Err tx3g_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err tx3g_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_Tx3gSampleEntryBox *ptr = (GF_Tx3gSampleEntryBox*)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_FTAB:
-		if (ptr->font_table) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->font_table = (GF_FontTableBox *)a;
+		BOX_FIELD_ASSIGN(font_table, GF_FontTableBox)
 		break;
 	default:
 		return GF_OK;
@@ -336,7 +337,7 @@
 	gpp_read_style(bs, &ptr->default_style);
 
 
-	return gf_isom_box_array_read(s, bs, tx3g_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 /*this is a quicktime specific box - see apple documentation*/
@@ -346,11 +347,22 @@
 	u16 pSize;
 	GF_TextSampleEntryBox *ptr = (GF_TextSampleEntryBox*)s;
 
-	ISOM_DECREASE_SIZE(ptr, 51);
-
+	ISOM_DECREASE_SIZE(ptr, 8);
 	e = gf_isom_base_sample_entry_read((GF_SampleEntryBox *)ptr, bs);
 	if (e) return e;
 
+	ptr->textJustification = 1;
+
+	//some weird text entries are not QT text nor 3gpp, cf issue #1030
+	if (!ptr->size) {
+		return GF_OK;
+	}
+	if (ptr->size < 43) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Broken text box (%d bytes but min 43 required), skiping parsing.\n", ptr->size));
+		return GF_OK;
+	}
+	ISOM_DECREASE_SIZE(ptr, 43);
+
 	ptr->displayFlags = gf_bs_read_u32(bs);			/*Display flags*/
 	ptr->textJustification = gf_bs_read_u32(bs);	/*Text justification*/
 	gf_bs_read_data(bs, ptr->background_color, 6);	/*Background color*/
@@ -411,7 +423,14 @@
 		ptr->textName[pSize] = '\0';				/*Font name*/
 	}
 	ISOM_DECREASE_SIZE(ptr, pSize);
-	return gf_isom_box_array_read(s, bs, NULL);
+
+	u32 next_size = gf_bs_peek_bits(bs, 32, 0);
+	if (next_size > ptr->size) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Broken text box detected, skiping parsing.\n"));
+		ptr->textJustification = 1;
+		return GF_OK;
+	}
+	return gf_isom_box_array_read(s, bs);
 }
 
 void gpp_write_rgba(GF_BitStream *bs, u32 col)
@@ -471,6 +490,7 @@
 	if (e) return e;
 	gf_bs_write_data(bs, ptr->reserved, 6);
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
+
 	gf_bs_write_u32(bs, ptr->displayFlags);			/*Display flags*/
 	gf_bs_write_u32(bs, ptr->textJustification);	/*Text justification*/
 	gf_bs_write_data(bs, ptr->background_color, 6);	/*Background color*/
@@ -502,8 +522,9 @@
 {
 	GF_TextSampleEntryBox *ptr = (GF_TextSampleEntryBox*)s;
 
+	s->size += 8;
 	/*base + this + string length*/
-	s->size += 51 + 1;
+	s->size += 43 + 1;
 	if (ptr->textName)
 		s->size += strlen(ptr->textName);
 	return GF_OK;
@@ -531,7 +552,7 @@
 	ISOM_DECREASE_SIZE(ptr, 2);
 	ptr->entry_count = gf_bs_read_u16(bs);
 
-	if (ptr->size<ptr->entry_count * GPP_STYLE_SIZE)
+	if (ptr->size / GPP_STYLE_SIZE < ptr->entry_count)
 		return GF_ISOM_INVALID_FILE;
 
 	if (ptr->entry_count) {
@@ -667,7 +688,7 @@
 	ISOM_DECREASE_SIZE(ptr, 6)
 	ptr->highlight_starttime = gf_bs_read_u32(bs);
 	ptr->nb_entries = gf_bs_read_u16(bs);
-	if (ptr->size < ptr->nb_entries * 8)
+	if (ptr->size / 8 < ptr->nb_entries)
 		return GF_ISOM_INVALID_FILE;
 
 	if (ptr->nb_entries) {
@@ -1148,6 +1169,7 @@
 GF_Box *dims_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DIMSSampleEntryBox, GF_ISOM_BOX_TYPE_DIMS);
+	gf_isom_sample_entry_init((GF_SampleEntryBox *)tmp);
 	return (GF_Box*)tmp;
 }
 void dims_box_del(GF_Box *s)
@@ -1156,17 +1178,15 @@
 	gf_free(s);
 }
 
-static GF_Err dims_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err dims_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_DIMSSampleEntryBox *ptr = (GF_DIMSSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_DIMC:
-		if (ptr->config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->config = (GF_DIMSSceneConfigBox*)a;
+		BOX_FIELD_ASSIGN(config, GF_DIMSSceneConfigBox)
 		break;
 	case GF_ISOM_BOX_TYPE_DIST:
-		if (ptr->scripts) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->scripts = (GF_DIMSScriptTypesBox*)a;
+		BOX_FIELD_ASSIGN(scripts, GF_DIMSScriptTypesBox)
 		break;
 	}
 	return GF_OK;
@@ -1180,7 +1200,7 @@
 	if (e) return e;
 
 	ISOM_DECREASE_SIZE(p, 8);
-	return gf_isom_box_array_read(s, bs, dims_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE

gpac-1.0.1.tar.gz/src/isomedia/box_code_adobe.c -> gpac-2.0.0.tar.gz/src/isomedia/box_code_adobe.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Author: Romain Bouqueau, Jean Le Feuvre
- *			Copyright (c) Romain Bouqueau 2012- Telecom Paris 2019-
+ *			Copyright (c) Romain Bouqueau 2012- Telecom Paris 2019-2022
 *				All rights reserved
 *
 * Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
@@ -79,7 +79,8 @@
 	int i;
 	u32 tmp_strsize;
 	char *tmp_str;
-	GF_Err e;
+	Bool zfound=GF_FALSE;
+	GF_Err e = GF_OK;
 
 	ISOM_DECREASE_SIZE(ptr, 25)
 	ptr->bootstrapinfo_version = gf_bs_read_u32(bs);
@@ -94,116 +95,166 @@
 	i=0;
 	if (ptr->size<8) return GF_ISOM_INVALID_FILE;
 	tmp_strsize =(u32)ptr->size;
-	tmp_str = gf_malloc(sizeof(char)*tmp_strsize);
+	tmp_str = gf_malloc(sizeof(char)*(tmp_strsize+1));
 	if (!tmp_str) return GF_OUT_OF_MEM;
-	memset(tmp_str, 0, sizeof(char)*tmp_strsize);
+	memset(tmp_str, 0, sizeof(char)*(tmp_strsize+1) );
 
 	while (tmp_strsize) {
-		ISOM_DECREASE_SIZE(ptr, 1)
+		ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 1)
 		tmp_str[i] = gf_bs_read_u8(bs);
 		tmp_strsize--;
-		if (!tmp_str[i])
+		if (!tmp_str[i]) {
+			zfound = GF_TRUE;
 			break;
+		}
 		i++;
 	}
+	if (!zfound) {
+		e = GF_ISOM_INVALID_FILE;
+		goto exit;
+	}
 	if (i) {
 		ptr->movie_identifier = gf_strdup(tmp_str);
 	}
 
-	ISOM_DECREASE_SIZE(ptr, 1)
+	ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 1)
 	ptr->server_entry_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->server_entry_count; i++) {
 		int j=0;
+		zfound = GF_FALSE;
 		tmp_strsize=(u32)ptr->size;
 		while (tmp_strsize) {
-			ISOM_DECREASE_SIZE(ptr, 1)
+			ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 1)
 			tmp_str[j] = gf_bs_read_u8(bs);
 			tmp_strsize--;
-			if (!tmp_str[j])
+			if (!tmp_str[j]) {
+				zfound = GF_TRUE;
 				break;
+			}
 			j++;
 		}
+		if (!zfound) {
+			e = GF_ISOM_INVALID_FILE;
+			goto exit;
+		}
 		if (j) {
 			gf_list_insert(ptr->server_entry_table, gf_strdup(tmp_str), i);
 		}
 	}
+	if (ptr->server_entry_count != gf_list_count(ptr->server_entry_table)) {
+		e = GF_ISOM_INVALID_FILE;
+		goto exit;
+	}
 
-	ISOM_DECREASE_SIZE(ptr, 1)
+	ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 1)
 	ptr->quality_entry_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->quality_entry_count; i++) {
 		int j=0;
+		zfound = GF_FALSE;
 		tmp_strsize=(u32)ptr->size;
 		while (tmp_strsize) {
-			ISOM_DECREASE_SIZE(ptr, 1)
+			ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 1)
 			tmp_str[j] = gf_bs_read_u8(bs);
 			tmp_strsize--;
-			if (!tmp_str[j])
+			if (!tmp_str[j]) {
+				zfound = GF_TRUE;
 				break;
+			}
 			j++;
 		}
 
+		if (!zfound) {
+			e = GF_ISOM_INVALID_FILE;
+			goto exit;
+		}
 		if (j) {
 			gf_list_insert(ptr->quality_entry_table, gf_strdup(tmp_str), i);
 		}
 	}
+	if (ptr->quality_entry_count != gf_list_count(ptr->quality_entry_table)) {
+		e = GF_ISOM_INVALID_FILE;
+		goto exit;
+	}
 
 	i=0;
 	tmp_strsize=(u32)ptr->size;
+	zfound = GF_FALSE;
 	while (tmp_strsize) {
-		ISOM_DECREASE_SIZE(ptr, 1)
+		ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 1)
 		tmp_str[i] = gf_bs_read_u8(bs);
 		tmp_strsize--;
-		if (!tmp_str[i])
+		if (!tmp_str[i]) {
+			zfound = GF_TRUE;
 			break;
+		}
 		i++;
 	}
+	if (!zfound) {
+		e = GF_ISOM_INVALID_FILE;
+		goto exit;
+	}
+
 	if (i) {
 		ptr->drm_data = gf_strdup(tmp_str);
 	}
 
 	i=0;
 	tmp_strsize=(u32)ptr->size;
+	zfound = GF_FALSE;
 	while (tmp_strsize) {
-		ISOM_DECREASE_SIZE(ptr, 1)
+		ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 1)
 		tmp_str[i] = gf_bs_read_u8(bs);
 		tmp_strsize--;
-		if (!tmp_str[i])
+		if (!tmp_str[i]) {
+			zfound = GF_TRUE;
 			break;
+		}
 		i++;
 	}
+	if (!zfound) {
+		e = GF_ISOM_INVALID_FILE;
+		goto exit;
+	}
+
 	if (i) {
 		ptr->meta_data = gf_strdup(tmp_str);
 	}
 
-	ISOM_DECREASE_SIZE(ptr, 1)
+	ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 1)
 	ptr->segment_run_table_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->segment_run_table_count; i++) {
 		GF_AdobeSegmentRunTableBox *asrt = NULL;
 		e = gf_isom_box_parse((GF_Box **)&asrt, bs);
 		if (e) {
 			if (asrt) gf_isom_box_del((GF_Box*)asrt);
-			gf_free(tmp_str);
-			return e;
+			goto exit;
 		}
 		gf_list_add(ptr->segment_run_table_entries, asrt);
 	}
+	if (ptr->segment_run_table_count != gf_list_count(ptr->segment_run_table_entries)) {
+		e = GF_ISOM_INVALID_FILE;
+		goto exit;
+	}
 
-	ISOM_DECREASE_SIZE(ptr, 1)
+	ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 1)
 	ptr->fragment_run_table_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->fragment_run_table_count; i++) {
 		GF_AdobeFragmentRunTableBox *afrt = NULL;
 		e = gf_isom_box_parse((GF_Box **)&afrt, bs);
 		if (e) {
 			if (afrt) gf_isom_box_del((GF_Box*)afrt);
-			gf_free(tmp_str);
-			return e;
+			goto exit;
 		}
 		gf_list_add(ptr->fragment_run_table_entries, afrt);
 	}
+	if (ptr->fragment_run_table_count != gf_list_count(ptr->fragment_run_table_entries)) {
+		e = GF_ISOM_INVALID_FILE;
+		goto exit;
+	}
 
+exit:
 	gf_free(tmp_str);
-
-	return GF_OK;
+	return e;
 }
 
 GF_Box *abst_box_new()
@@ -351,12 +402,13 @@
 	ptr->time_scale = gf_bs_read_u32(bs);
 
 	ptr->entry_count = gf_bs_read_u32(bs);
-	if (ptr->size < ptr->entry_count * (ptr->long_offsets ? 16 : 12))
+	if (ptr->size / ( (ptr->long_offsets ? 16 : 12) ) < ptr->entry_count)
 		return GF_ISOM_INVALID_FILE;
 
 	for (i=0; i<ptr->entry_count; i++) {
 		GF_AfraEntry *ae = gf_malloc(sizeof(GF_AfraEntry));
 		if (!ae) return GF_OUT_OF_MEM;
+		gf_list_insert(ptr->local_access_entries, ae, i);
 
 		ISOM_DECREASE_SIZE(ptr, 8)
 		ae->time = gf_bs_read_u64(bs);
@@ -367,8 +419,6 @@
 			ISOM_DECREASE_SIZE(ptr, 4)
 			ae->offset = gf_bs_read_u32(bs);
 		}
-
-		gf_list_insert(ptr->local_access_entries, ae, i);
 	}
 
 	if (ptr->global_entries) {
@@ -377,6 +427,8 @@
 		for (i=0; i<ptr->global_entry_count; i++) {
 			GF_GlobalAfraEntry *ae = gf_malloc(sizeof(GF_GlobalAfraEntry));
 			if (!ae) return GF_OUT_OF_MEM;
+			gf_list_insert(ptr->global_access_entries, ae, i);
+
 			ISOM_DECREASE_SIZE(ptr, 8)
 			ae->time = gf_bs_read_u64(bs);
 			if (ptr->long_ids) {
@@ -397,8 +449,6 @@
 				ae->afra_offset = gf_bs_read_u32(bs);
 				ae->offset_from_afra = gf_bs_read_u32(bs);
 			}
-
-			gf_list_insert(ptr->global_access_entries, ae, i);
 		}
 	}
 
@@ -512,22 +562,24 @@
 	for (i=0; i<ptr->quality_entry_count; i++) {
 		int j=0;
 		u32 tmp_strsize=(u32)ptr->size;
-		char *tmp_str = (char*) gf_malloc(tmp_strsize);
+		if (!tmp_strsize) return GF_ISOM_INVALID_FILE;
+		char *tmp_str = (char*) gf_malloc(tmp_strsize+1);
 		if (!tmp_str) return GF_OUT_OF_MEM;
+		tmp_str[tmp_strsize]=0;
 		while (tmp_strsize) {
 			tmp_str[j] = gf_bs_read_u8(bs);
+			ISOM_DECREASE_SIZE(ptr, 1)
 			tmp_strsize--;
 			if (!tmp_str[j])
 				break;
 			j++;
 		}
-		ISOM_DECREASE_SIZE(ptr, j)
 		gf_list_insert(ptr->quality_segment_url_modifiers, tmp_str, i);
 	}
 
 	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->segment_run_entry_count = gf_bs_read_u32(bs);
-	if (ptr->size < ptr->segment_run_entry_count*8)
+	if (ptr->size / 8 < ptr->segment_run_entry_count)
 		return GF_ISOM_INVALID_FILE;
 
 	for (i=0; i<ptr->segment_run_entry_count; i++) {
@@ -627,28 +679,32 @@
 	if (ptr->size < ptr->quality_entry_count)
 		return GF_ISOM_INVALID_FILE;
 
+
 	for (i=0; i<ptr->quality_entry_count; i++) {
 		int j=0;
-		u32 tmp_strsize=(u32)ptr->size-8;
-		char *tmp_str = (char*) gf_malloc(tmp_strsize);
+		u32 tmp_strsize = (u32) ptr->size;
+		if (!tmp_strsize) return GF_ISOM_INVALID_FILE;
+		char *tmp_str = (char*) gf_malloc(tmp_strsize+1);
 		if (!tmp_str) return GF_OUT_OF_MEM;
+		tmp_str[tmp_strsize]=0;
 		while (tmp_strsize) {
 			tmp_str[j] = gf_bs_read_u8(bs);
+			ISOM_DECREASE_SIZE(ptr, 1)
 			tmp_strsize--;
 			if (!tmp_str[j])
 				break;
 			j++;
 		}
-		ISOM_DECREASE_SIZE(ptr, j)
 		gf_list_insert(ptr->quality_segment_url_modifiers, tmp_str, i);
 	}
 
+	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->fragment_run_entry_count = gf_bs_read_u32(bs);
-	if (ptr->size < ptr->fragment_run_entry_count*16)
+	if (ptr->size / 16 < ptr->fragment_run_entry_count)
 		return GF_ISOM_INVALID_FILE;
 	for (i=0; i<ptr->fragment_run_entry_count; i++) {
 		GF_AdobeFragmentRunEntry *fre = gf_malloc(sizeof(GF_AdobeFragmentRunEntry));
-		if (!fre) return GF_ISOM_INVALID_FILE;
+		if (!fre) return GF_OUT_OF_MEM;
 		ISOM_DECREASE_SIZE(ptr, 16)
 		fre->first_fragment = gf_bs_read_u32(bs);
 		fre->first_fragment_timestamp = gf_bs_read_u64(bs);

gpac-1.0.1.tar.gz/src/isomedia/box_code_apple.c -> gpac-2.0.0.tar.gz/src/isomedia/box_code_apple.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2019
+ *			Copyright (c) Telecom ParisTech 2006-2021
 *				All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -107,6 +107,7 @@
 	u32 sub_type;
 	GF_Box *a = NULL;
 	GF_ListItemBox *ptr = (GF_ListItemBox *)s;
+
 	/*iTunes way: there's a data atom containing the data*/
 	sub_type = gf_bs_peek_bits(bs, 32, 4);
 	if (sub_type == GF_ISOM_BOX_TYPE_DATA ) {
@@ -143,7 +144,7 @@
 		u64 pos = gf_bs_get_position(bs);
 		u64 prev_size = s->size;
 		/*try parsing as generic box list*/
-		e = gf_isom_box_array_read(s, bs, NULL);
+		e = gf_isom_box_array_read(s, bs);
 		if (e==GF_OK) return GF_OK;
 		//reset content and retry - this deletes ptr->data !!
 		gf_isom_box_array_del(s->child_boxes);
@@ -170,13 +171,7 @@
 
 GF_Box *ilst_item_box_new()
 {
-	ISOM_DECL_BOX_ALLOC(GF_ListItemBox, GF_ISOM_BOX_TYPE_CPIL); //type will be overwrite
-	tmp->data = (GF_DataBox *)gf_isom_box_new_parent(&tmp->child_boxes, GF_ISOM_BOX_TYPE_DATA);
-	if (tmp->data == NULL) {
-		if (tmp->child_boxes) gf_list_del(tmp->child_boxes);
-		gf_free(tmp);
-		return NULL;
-	}
+	ISOM_DECL_BOX_ALLOC(GF_ListItemBox, GF_ISOM_ITUNE_NAME); //type will be overwrite
 	return (GF_Box *)tmp;
 }
 
@@ -369,7 +364,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_MetaBox *gf_isom_apple_get_meta_extensions(GF_ISOFile *mov)
+GF_Box *gf_isom_get_meta_extensions(GF_ISOFile *mov, Bool for_xtra)
 {
 	u32 i;
 	GF_UserDataMap *map;
@@ -377,57 +372,60 @@
 	if (!mov || !mov->moov) return NULL;
 
 	if (!mov->moov->udta) return NULL;
-	map = udta_getEntry(mov->moov->udta, GF_ISOM_BOX_TYPE_META, NULL);
+	map = udta_getEntry(mov->moov->udta, for_xtra ? GF_ISOM_BOX_TYPE_XTRA : GF_ISOM_BOX_TYPE_META, NULL);
 	if (!map) return NULL;
 
 	for(i = 0; i < gf_list_count(map->boxes); i++) {
 		GF_MetaBox *meta = (GF_MetaBox*)gf_list_get(map->boxes, i);
+		if (for_xtra && (meta->type==GF_ISOM_BOX_TYPE_XTRA)) return (GF_Box *) meta;
 
-		if(meta != NULL && meta->handler != NULL && meta->handler->handlerType == GF_ISOM_HANDLER_TYPE_MDIR) return meta;
+		if(meta != NULL && meta->handler != NULL && meta->handler->handlerType == GF_ISOM_HANDLER_TYPE_MDIR) return (GF_Box *) meta;
 	}
-
 	return NULL;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_MetaBox *gf_isom_apple_create_meta_extensions(GF_ISOFile *mov)
+GF_Box *gf_isom_create_meta_extensions(GF_ISOFile *mov, Bool for_xtra)
 {
 	GF_Err e;
 	u32 i;
 	GF_MetaBox *meta;
 	GF_UserDataMap *map;
+	u32 udta_subtype = for_xtra ? GF_ISOM_BOX_TYPE_XTRA : GF_ISOM_BOX_TYPE_META;
 
 	if (!mov || !mov->moov) return NULL;
 
 	if (!mov->moov->udta) {
-		e = moov_on_child_box((GF_Box*)mov->moov, gf_isom_box_new_parent(&mov->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+		e = moov_on_child_box((GF_Box*)mov->moov, gf_isom_box_new_parent(&mov->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 		if (e) return NULL;
 	}
 
-	map = udta_getEntry(mov->moov->udta, GF_ISOM_BOX_TYPE_META, NULL);
+	map = udta_getEntry(mov->moov->udta, udta_subtype, NULL);
 	if (map) {
-		for(i = 0; i < gf_list_count(map->boxes); i++) {
+		for (i=0; i<gf_list_count(map->boxes); i++) {
 			meta = (GF_MetaBox*)gf_list_get(map->boxes, i);
+			if (for_xtra) return (GF_Box *) meta;
 
-			if(meta != NULL && meta->handler != NULL && meta->handler->handlerType == GF_ISOM_HANDLER_TYPE_MDIR) return meta;
+			if (meta && meta->handler && (meta->handler->handlerType == GF_ISOM_HANDLER_TYPE_MDIR)) return (GF_Box *) meta;
 		}
 	}
 
 	//udta handles children boxes through maps
-	meta = (GF_MetaBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_META);
-
-	if(meta != NULL) {
-		meta->handler = (GF_HandlerBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_HDLR);
-		if(meta->handler == NULL) {
-			gf_isom_box_del((GF_Box *)meta);
-			return NULL;
+	meta = (GF_MetaBox *)gf_isom_box_new(udta_subtype);
+
+	if (meta) {
+		udta_on_child_box((GF_Box *)mov->moov->udta, (GF_Box *)meta, GF_FALSE);
+		if (!for_xtra) {
+			meta->handler = (GF_HandlerBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_HDLR);
+			if(meta->handler == NULL) {
+				gf_isom_box_del((GF_Box *)meta);
+				return NULL;
+			}
+			meta->handler->handlerType = GF_ISOM_HANDLER_TYPE_MDIR;
+			gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_ILST);
 		}
-		meta->handler->handlerType = GF_ISOM_HANDLER_TYPE_MDIR;
-		gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_ILST);
-		udta_on_child_box((GF_Box *)mov->moov->udta, (GF_Box *)meta);
 	}
-
-	return meta;
+	return (GF_Box *) meta;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
@@ -556,7 +554,7 @@
 	ptr->frames_per_counter_tick = gf_bs_read_u8(bs);
 	gf_bs_read_u8(bs); //reserved
 
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *tmcd_box_new()
@@ -846,7 +844,7 @@
 	ptr->bitmap = gf_bs_read_u32(bs);
 	ptr->num_audio_description = gf_bs_read_u32(bs);
 
-	if (ptr->size < ptr->num_audio_description*20)
+	if (ptr->size / 20 < ptr->num_audio_description)
 		return GF_ISOM_INVALID_FILE;
 
 	ptr->audio_descs = gf_malloc(sizeof(GF_AudioChannelDescription) * ptr->num_audio_description);

gpac-1.0.1.tar.gz/src/isomedia/box_code_base.c -> gpac-2.0.0.tar.gz/src/isomedia/box_code_base.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -46,7 +46,7 @@
 
 	ISOM_DECREASE_SIZE(ptr, 4)
 
-	if (ptr->nb_entries > ptr->size / 8) {
+	if ((u64)ptr->nb_entries > ptr->size / 8 || (u64)ptr->nb_entries > (u64)SIZE_MAX/sizeof(u64)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in co64\n", ptr->nb_entries));
 		return GF_ISOM_INVALID_FILE;
 	}
@@ -242,9 +242,10 @@
 	}
 	if (ptr->size) {
 		u32 bytesToRead = (u32) ptr->size;
-		ptr->notice = (char*)gf_malloc(bytesToRead * sizeof(char));
+		ptr->notice = (char*)gf_malloc((bytesToRead+1) * sizeof(char));
 		if (ptr->notice == NULL) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->notice, bytesToRead);
+		ptr->notice[bytesToRead] = 0;
 	}
 	return GF_OK;
 }
@@ -392,7 +393,7 @@
 	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->nb_entries = gf_bs_read_u32(bs);
 
-	if (ptr->nb_entries > ptr->size / 8) {
+	if (ptr->nb_entries > ptr->size / 8 || (u64)ptr->nb_entries > (u64)SIZE_MAX/sizeof(GF_DttsEntry) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in ctts\n", ptr->nb_entries));
 		return GF_ISOM_INVALID_FILE;
 	}
@@ -408,10 +409,12 @@
 			ptr->entries[i].decodingOffset = gf_bs_read_int(bs, 32);
 		else
 			ptr->entries[i].decodingOffset = (s32) gf_bs_read_u32(bs);
-		sampleCount += ptr->entries[i].sampleCount;
 
-		if (ptr->max_ts_delta < ABS(ptr->entries[i].decodingOffset))
-			ptr->max_ts_delta = ABS(ptr->entries[i].decodingOffset);
+		if (ptr->max_cts_delta <= ABS(ptr->entries[i].decodingOffset)) {
+			ptr->max_cts_delta = ABS(ptr->entries[i].decodingOffset);
+			ptr->sample_num_max_cts_delta = sampleCount;
+		}
+		sampleCount += ptr->entries[i].sampleCount;
 	}
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	ptr->w_LastSampleNumber = sampleCount;
@@ -577,10 +580,15 @@
 	GF_DataEntryURLBox *ptr = (GF_DataEntryURLBox *)s;
 
 	if (ptr->size) {
-		ptr->location = (char*)gf_malloc((u32) ptr->size);
+		u32 location_size = (u32) ptr->size;
+		if (location_size < 1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid size %llu in svhd box\n", ptr->size));
+			return GF_ISOM_INVALID_FILE;
+		}
+		ptr->location = (char*)gf_malloc(location_size);
 		if (! ptr->location) return GF_OUT_OF_MEM;
-		gf_bs_read_data(bs, ptr->location, (u32)ptr->size);
-		if (ptr->location[ptr->size-1]) {
+		gf_bs_read_data(bs, ptr->location, location_size);
+		if (ptr->location[location_size-1]) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] url box location is not 0-terminated\n" ));
 			return GF_ISOM_INVALID_FILE;
 		}
@@ -778,7 +786,7 @@
 	if (e == GF_OK) {
 		gf_bs_seek(sub_bs, 0);
 		gf_bs_set_cookie(sub_bs, GF_ISOM_BS_COOKIE_NO_LOGS);
-		e = gf_isom_box_array_read(s, sub_bs, NULL);
+		e = gf_isom_box_array_read(s, sub_bs);
 	}
 	gf_bs_del(sub_bs);
 	if (e==GF_OK) {
@@ -813,6 +821,20 @@
 	ptr->type = type;
 	if (e) return e;
 
+	if (ptr->sai_type) {
+		if (ptr->saio_box) {
+			u64 pos = gf_bs_get_position(bs);
+			gf_bs_seek(bs, ptr->saio_box->offset_first_offset_field);
+			if (ptr->saio_box->version)
+				gf_bs_write_u64(bs, pos);
+			else
+				gf_bs_write_u32(bs, (u32) pos);
+			gf_bs_seek(bs, pos);
+		} else {
+			ptr->sai_offset = gf_bs_get_position(bs);
+		}
+	}
+
 	if (ptr->dataSize && ptr->data) {
 		gf_bs_write_data(bs, ptr->data, ptr->dataSize);
 	}
@@ -840,7 +862,7 @@
 
 GF_Err def_parent_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *def_parent_box_new()
@@ -872,7 +894,7 @@
 
 GF_Err def_parent_full_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *def_parent_full_box_new()
@@ -958,13 +980,12 @@
 }
 
 
-GF_Err dinf_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err dinf_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_DataInformationBox *ptr = (GF_DataInformationBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_DREF:
-		if (ptr->dref) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->dref = (GF_DataReferenceBox *)a;
+		BOX_FIELD_ASSIGN(dref, GF_DataReferenceBox)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -973,7 +994,7 @@
 GF_Err dinf_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_DataInformationBox *dinf;
-	GF_Err e = gf_isom_box_array_read(s, bs, dinf_on_child_box);
+	GF_Err e = gf_isom_box_array_read(s, bs);
 	if (e) {
 		return e;
 	}
@@ -1020,7 +1041,7 @@
 	GF_DataReferenceBox *ptr = (GF_DataReferenceBox *)s;
 	ISOM_DECREASE_SIZE(ptr, 4);
 	gf_bs_read_u32(bs);
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *dref_box_new()
@@ -1063,12 +1084,11 @@
 }
 
 
-GF_Err edts_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err edts_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_EditBox *ptr = (GF_EditBox *)s;
 	if (a->type == GF_ISOM_BOX_TYPE_ELST) {
-		if (ptr->editList) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->editList = (GF_EditListBox *)a;
+		BOX_FIELD_ASSIGN(editList, GF_EditListBox)
 		return GF_OK;
 	} else {
 		return GF_OK;
@@ -1079,7 +1099,7 @@
 
 GF_Err edts_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, edts_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *edts_box_new()
@@ -1157,7 +1177,8 @@
 
 
 	for (entries = 0; entries < nb_entries; entries++) {
-		GF_EdtsEntry *p = (GF_EdtsEntry *) gf_malloc(sizeof(GF_EdtsEntry));
+		GF_EdtsEntry *p;
+		GF_SAFEALLOC(p, GF_EdtsEntry);
 		if (!p) return GF_OUT_OF_MEM;
 		if (ptr->version == 1) {
 			ISOM_DECREASE_SIZE(ptr, 16);
@@ -1170,8 +1191,7 @@
 			p->mediaTime = (s64) tr;
 		}
 		ISOM_DECREASE_SIZE(ptr, 4);
-		p->mediaRate = gf_bs_read_u16(bs);
-		gf_bs_read_u16(bs);
+		p->mediaRate = gf_bs_read_u32(bs);
 		gf_list_add(ptr->entryList, p);
 	}
 	return GF_OK;
@@ -1211,8 +1231,7 @@
 			gf_bs_write_u32(bs, (u32) p->segmentDuration);
 			gf_bs_write_u32(bs, (s32) p->mediaTime);
 		}
-		gf_bs_write_u16(bs, p->mediaRate);
-		gf_bs_write_u16(bs, 0);
+		gf_bs_write_u32(bs, p->mediaRate);
 	}
 	return GF_OK;
 }
@@ -1328,6 +1347,11 @@
 {
 	u32 descSize = 0;
 	GF_ESDBox *ptr = (GF_ESDBox *)s;
+	//make sure we write with no ESID and no OCRESID
+ if (ptr->desc) {
+ ptr->desc->ESID = 0;
+ ptr->desc->OCRESID = 0;
+ }
 	descSize = gf_odf_desc_size((GF_Descriptor *)ptr->desc);
 	ptr->size += descSize;
 	return GF_OK;
@@ -1501,7 +1525,7 @@
 	GF_Err e;
 	GF_GenericSampleEntryBox *ptr = (GF_GenericSampleEntryBox *)s;
 
-	//carefull we are not writing the box type but the entry type so switch for write
+	//careful we are not writing the box type but the entry type so switch for write
 	ptr->type = ptr->EntryType;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
@@ -1551,7 +1575,7 @@
 	GF_Err e;
 	GF_GenericVisualSampleEntryBox *ptr = (GF_GenericVisualSampleEntryBox *)s;
 
-	//carefull we are not writing the box type but the entry type so switch for write
+	//careful we are not writing the box type but the entry type so switch for write
 	ptr->type = ptr->EntryType;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
@@ -1602,7 +1626,7 @@
 	GF_Err e;
 	GF_GenericAudioSampleEntryBox *ptr = (GF_GenericAudioSampleEntryBox *)s;
 
-	//carefull we are not writing the box type but the entry type so switch for write
+	//careful we are not writing the box type but the entry type so switch for write
 	ptr->type = ptr->EntryType;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
@@ -1653,17 +1677,23 @@
 	gf_bs_set_cookie(bs, cookie);
 
 	if (ptr->size) {
-		ptr->nameUTF8 = (char*)gf_malloc((u32) ptr->size);
+		u32 name_size = (u32) ptr->size;
+		if (name_size < 1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid size %llu in hdlr\n", ptr->size));
+			return GF_ISOM_INVALID_FILE;
+		}
+		ptr->nameUTF8 = (char*)gf_malloc(name_size);
 		if (!ptr->nameUTF8) return GF_OUT_OF_MEM;
-		gf_bs_read_data(bs, ptr->nameUTF8, (u32) ptr->size);
+		gf_bs_read_data(bs, ptr->nameUTF8, name_size);
 
 		//patch for old QT files - we cannot rely on checking if str[0]==len(str+1) since we may have
 		//cases where the first character of the string decimal value is indeed the same as the string length!!
 		//we had this issue with encryption_import test
 		//we therefore only check if last char is null, and if not so assume old QT style
-		if (ptr->nameUTF8[ptr->size-1]) {
-			memmove(ptr->nameUTF8, ptr->nameUTF8+1, sizeof(char) * (u32) (ptr->size-1) );
-			ptr->nameUTF8[ptr->size-1] = 0;
+		if (ptr->nameUTF8[name_size-1]) {
+			if (name_size > 1)
+				memmove(ptr->nameUTF8, ptr->nameUTF8+1, sizeof(char) * (u32) (name_size-1) );
+			ptr->nameUTF8[name_size-1] = 0;
 			ptr->store_counted_string = GF_TRUE;
 		}
 	}
@@ -1731,17 +1761,18 @@
 	return (GF_Box *)tmp;
 }
 
-GF_Err hinf_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err hinf_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
-	GF_MAXRBox *maxR;
 	GF_HintInfoBox *hinf = (GF_HintInfoBox *)s;
-	u32 i;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_MAXR:
-		i=0;
-		while ((maxR = (GF_MAXRBox *)gf_list_enum(hinf->child_boxes, &i))) {
-			if ((maxR->type==GF_ISOM_BOX_TYPE_MAXR) && (maxR->granularity == ((GF_MAXRBox *)a)->granularity))
-				ERROR_ON_DUPLICATED_BOX(a, s)
+		if (!is_rem) {
+			u32 i=0;
+			GF_MAXRBox *maxR;
+			while ((maxR = (GF_MAXRBox *)gf_list_enum(hinf->child_boxes, &i))) {
+				if ((maxR->type==GF_ISOM_BOX_TYPE_MAXR) && (maxR->granularity == ((GF_MAXRBox *)a)->granularity))
+					ERROR_ON_DUPLICATED_BOX(a, s)
+			}
 		}
 		break;
 	}
@@ -1751,7 +1782,7 @@
 
 GF_Err hinf_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, hinf_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1834,17 +1865,16 @@
 	gf_free(a);
 }
 
-GF_Err hnti_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err hnti_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
-	GF_HintTrackInfoBox *hnti = (GF_HintTrackInfoBox *)s;
-	if (!hnti || !a) return GF_BAD_PARAM;
+	GF_HintTrackInfoBox *ptr = (GF_HintTrackInfoBox *)s;
+	if (!ptr || !a) return GF_BAD_PARAM;
 
 	switch (a->type) {
 	//this is the value for GF_RTPBox - same as HintSampleEntry for RTP !!!
 	case GF_ISOM_BOX_TYPE_RTP:
 	case GF_ISOM_BOX_TYPE_SDP:
-		if (hnti->SDP) ERROR_ON_DUPLICATED_BOX(a, s)
-		hnti->SDP = a;
+		BOX_FIELD_ASSIGN(SDP, GF_Box)
 		break;
 	default:
 		break;
@@ -1854,7 +1884,7 @@
 
 GF_Err hnti_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, hnti_on_child_box, s->type);
+	return gf_isom_box_array_read_ex(s, bs, s->type);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1888,6 +1918,12 @@
 	if (ptr == NULL) return GF_BAD_PARAM;
 
 	length = (u32) (ptr->size);
+
+	if (length >= (u32)0xFFFFFFFF) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid length %lu in sdp box\n", length));
+		return GF_ISOM_INVALID_FILE;
+	}
+
 	//sdp text has no delimiter !!!
 	ptr->sdpText = (char*)gf_malloc(sizeof(char) * (length+1));
 	if (!ptr->sdpText) return GF_OUT_OF_MEM;
@@ -1945,6 +1981,12 @@
 	ptr->subType = gf_bs_read_u32(bs);
 
 	length = (u32) (ptr->size);
+
+	if (length >= (u32)0xFFFFFFFF) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid length %lu in rtp_hnti box\n", length));
+		return GF_ISOM_INVALID_FILE;
+	}
+
 	//sdp text has no delimiter !!!
 	ptr->sdpText = (char*)gf_malloc(sizeof(char) * (length+1));
 	if (!ptr->sdpText) return GF_OUT_OF_MEM;
@@ -2608,6 +2650,12 @@
 	GF_NameBox *ptr = (GF_NameBox *)s;
 
 	length = (u32) (ptr->size);
+
+	if (length >= (u32)0xFFFFFFFF) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid length %lu in name box\n", length));
+		return GF_ISOM_INVALID_FILE;
+	}
+
 	ptr->string = (char*)gf_malloc(sizeof(char) * (length+1));
 	if (! ptr->string) return GF_OUT_OF_MEM;
 
@@ -2684,17 +2732,15 @@
 	gf_free(s);
 }
 
-GF_Err srpp_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err srpp_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_SRTPProcessBox *ptr = (GF_SRTPProcessBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_SCHI:
-		if (ptr->info) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->info = (GF_SchemeInformationBox *)a;
+		BOX_FIELD_ASSIGN(info, GF_SchemeInformationBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SCHM:
-		if (ptr->scheme_type) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->scheme_type = (GF_SchemeTypeBox *)a;
+		BOX_FIELD_ASSIGN(scheme_type, GF_SchemeTypeBox)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -2709,7 +2755,7 @@
 	ptr->encryption_algorithm_rtcp = gf_bs_read_u32(bs);
 	ptr->integrity_algorithm_rtp = gf_bs_read_u32(bs);
 	ptr->integrity_algorithm_rtcp = gf_bs_read_u32(bs);
-	return gf_isom_box_array_read(s, bs, srpp_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 GF_Box *srpp_box_new()
 {
@@ -2806,7 +2852,17 @@
 	e = gf_odf_desc_read(desc, descSize, &ptr->descriptor);
 	//OK, free our desc
 	gf_free(desc);
-	return e;
+
+	if (e) return e;
+	switch (ptr->descriptor->tag) {
+	case GF_ODF_ISOM_OD_TAG:
+	case GF_ODF_ISOM_IOD_TAG:
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid descriptor in iods, tag %u found but only %u or %u allowed\n", ptr->descriptor->tag, GF_ODF_ISOM_IOD_TAG, GF_ODF_ISOM_OD_TAG ));
+		return GF_ISOM_INVALID_FILE;
+	}
+	return GF_OK;
 }
 
 GF_Box *iods_box_new()
@@ -2864,6 +2920,15 @@
 	ptr->dataSize = s->size;
 	ptr->bsOffset = gf_bs_get_position(bs);
 
+	//store idat for rewrite
+	if (ptr->type==GF_ISOM_BOX_TYPE_IDAT) {
+		ptr->data = gf_malloc(sizeof(u8) * (size_t)ptr->dataSize);
+		if (!ptr->data) return GF_OUT_OF_MEM;
+		gf_bs_read_data(bs, ptr->data, (u32) ptr->dataSize);
+		ptr->size = 0;
+		return GF_OK;
+	}
+
 	//then skip these bytes
 	gf_bs_skip_bytes(bs, ptr->dataSize);
 	return GF_OK;
@@ -3020,23 +3085,20 @@
 }
 
 
-GF_Err mdia_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err mdia_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MediaBox *ptr = (GF_MediaBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_MDHD:
-		if (ptr->mediaHeader) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->mediaHeader = (GF_MediaHeaderBox *)a;
+		BOX_FIELD_ASSIGN(mediaHeader, GF_MediaHeaderBox)
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_HDLR:
-		if (ptr->handler) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->handler = (GF_HandlerBox *)a;
+		BOX_FIELD_ASSIGN(handler, GF_HandlerBox)
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_MINF:
-		if (ptr->information) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->information = (GF_MediaInformationBox *)a;
+		BOX_FIELD_ASSIGN(information, GF_MediaInformationBox)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -3049,7 +3111,7 @@
 	u64 cookie = gf_bs_get_cookie(bs);
 	cookie &= ~GF_ISOM_BS_COOKIE_VISUAL_TRACK;
 	gf_bs_set_cookie(bs, cookie);
-	e = gf_isom_box_array_read(s, bs, mdia_on_child_box);
+	e = gf_isom_box_array_read(s, bs);
 	gf_bs_set_cookie(bs, cookie);
 
 	if (e) return e;
@@ -3089,6 +3151,14 @@
 	gf_isom_check_position(s, (GF_Box*)ptr->mediaHeader, &pos);
 	//then handler
 	gf_isom_check_position(s, (GF_Box*)ptr->handler, &pos);
+
+#if 0
+	//elng before info for CMAF info - we deactiveate for now, no specific errors raised and CMAF should not impose any order
+	GF_Box *elng = gf_isom_box_find_child(ptr->child_boxes, GF_ISOM_BOX_TYPE_ELNG);
+	if (elng)
+		gf_isom_check_position(s, elng, &pos);
+#endif
+
 	//then info
 	gf_isom_check_position(s, (GF_Box*)ptr->information, &pos);
 	return GF_OK;
@@ -3111,15 +3181,15 @@
 	return (GF_Box *)tmp;
 }
 
-GF_Err mfra_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err mfra_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MovieFragmentRandomAccessBox *ptr = (GF_MovieFragmentRandomAccessBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_TFRA:
-		return gf_list_add(ptr->tfra_list, a);
+		BOX_FIELD_LIST_ASSIGN(tfra_list);
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_MFRO:
-		if (ptr->mfro) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->mfro = (GF_MovieFragmentRandomAccessOffsetBox *)a;
+		BOX_FIELD_ASSIGN(mfro, GF_MovieFragmentRandomAccessOffsetBox)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -3127,7 +3197,7 @@
 
 GF_Err mfra_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, mfra_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -3194,6 +3264,10 @@
 	}
 
 	if (ptr->nb_entries) {
+		if ((u64)ptr->nb_entries > (u64)SIZE_MAX/sizeof(GF_RandomAccessEntry)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in traf\n", ptr->nb_entries));
+			return GF_ISOM_INVALID_FILE;
+		}
 		p = (GF_RandomAccessEntry *) gf_malloc(sizeof(GF_RandomAccessEntry) * ptr->nb_entries);
 		if (!p) return GF_OUT_OF_MEM;
 	}
@@ -3456,7 +3530,7 @@
 	gf_free(ptr);
 }
 
-GF_Err minf_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err minf_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MediaInformationBox *ptr = (GF_MediaInformationBox *)s;
 	switch (a->type) {
@@ -3466,18 +3540,15 @@
 	case GF_ISOM_BOX_TYPE_SMHD:
 	case GF_ISOM_BOX_TYPE_HMHD:
 	case GF_ISOM_BOX_TYPE_GMHD:
-		if (ptr->InfoHeader) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->InfoHeader = a;
+		BOX_FIELD_ASSIGN(InfoHeader, GF_Box)
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_DINF:
-		if (ptr->dataInformation) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->dataInformation = (GF_DataInformationBox *)a;
+		BOX_FIELD_ASSIGN(dataInformation, GF_DataInformationBox)
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_STBL:
-		if (ptr->sampleTable ) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->sampleTable = (GF_SampleTableBox *)a;
+		BOX_FIELD_ASSIGN(sampleTable, GF_SampleTableBox)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -3489,7 +3560,7 @@
 	GF_MediaInformationBox *ptr = (GF_MediaInformationBox *)s;
 	GF_Err e;
 
-	e = gf_isom_box_array_read(s, bs, minf_on_child_box);
+	e = gf_isom_box_array_read(s, bs);
 
 	if (!e && ! ptr->dataInformation) {
 		GF_Box *url;
@@ -3551,29 +3622,38 @@
 	gf_list_del(ptr->TrackList);
 	if (ptr->PSSHs) gf_list_del(ptr->PSSHs);
 	if (ptr->mdat) gf_free(ptr->mdat);
+	//happens if error while fragmenting, the emsg boxes are not part of the moof hierarchy !
+	if (ptr->emsgs) {
+		while (1) {
+			GF_Box *emsg = gf_list_pop_front(ptr->emsgs);
+			if (!emsg) break;
+			gf_isom_box_del(emsg);
+		}
+		gf_list_del(ptr->emsgs);
+	}
 	gf_free(ptr);
 }
 
-GF_Err moof_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err moof_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MovieFragmentBox *ptr = (GF_MovieFragmentBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_MFHD:
-		if (ptr->mfhd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->mfhd = (GF_MovieFragmentHeaderBox *) a;
+		BOX_FIELD_ASSIGN(mfhd, GF_MovieFragmentHeaderBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TRAF:
-		return gf_list_add(ptr->TrackList, a);
+		BOX_FIELD_LIST_ASSIGN(TrackList)
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_PSSH:
-		if (!ptr->PSSHs) ptr->PSSHs = gf_list_new();
-		return gf_list_add(ptr->PSSHs, a);
+		BOX_FIELD_LIST_ASSIGN(PSSHs)
+		return GF_OK;
 	}
 	return GF_OK;
 }
 
 GF_Err moof_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, moof_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *moof_box_new()
@@ -3618,46 +3698,56 @@
 	gf_free(ptr);
 }
 
-GF_Err moov_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err moov_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MovieBox *ptr = (GF_MovieBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_IODS:
-		if (ptr->iods) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->iods = (GF_ObjectDescriptorBox *)a;
+		BOX_FIELD_ASSIGN(iods, GF_ObjectDescriptorBox)
 		//if no IOD, delete the box
-		if (!ptr->iods->descriptor) {
+		if (ptr->iods && !ptr->iods->descriptor) {
 			ptr->iods = NULL;
 			gf_isom_box_del_parent(&s->child_boxes, a);
 		}
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_MVHD:
-		if (ptr->mvhd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->mvhd = (GF_MovieHeaderBox *)a;
+		BOX_FIELD_ASSIGN(mvhd, GF_MovieHeaderBox)
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_UDTA:
-		if (ptr->udta) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->udta = (GF_UserDataBox *)a;
+		BOX_FIELD_ASSIGN(udta, GF_UserDataBox)
 		return GF_OK;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	case GF_ISOM_BOX_TYPE_MVEX:
-		if (ptr->mvex) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->mvex = (GF_MovieExtendsBox *)a;
-		ptr->mvex->mov = ptr->mov;
+		BOX_FIELD_ASSIGN(mvex, GF_MovieExtendsBox)
+		if (ptr->mvex)
+			ptr->mvex->mov = ptr->mov;
 		return GF_OK;
 #endif
 
 	case GF_ISOM_BOX_TYPE_META:
-		if (ptr->meta) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->meta = (GF_MetaBox *)a;
+		BOX_FIELD_ASSIGN(meta, GF_MetaBox)
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_TRAK:
-		//set our pointer to this obj
-		((GF_TrackBox *)a)->moov = ptr;
+		if (is_rem) {
+			gf_list_del_item(ptr->trackList, a);
+			return GF_OK;
+		}
+		{
+			GF_TrackBox *tk = (GF_TrackBox *)a;
+			//set our pointer to this obj
+			tk->moov = ptr;
+			tk->index = gf_list_count(ptr->trackList);
+			if (tk->References) {
+				GF_TrackReferenceTypeBox *dpnd=NULL;
+				Track_FindRef(tk, GF_ISOM_REF_BASE, &dpnd);
+				if (dpnd)
+					tk->nb_base_refs = dpnd->trackIDCount;
+			}
+		}
 		return gf_list_add(ptr->trackList, a);
 	}
 	return GF_OK;
@@ -3666,7 +3756,7 @@
 
 GF_Err moov_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, moov_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *moov_box_new()
@@ -3724,7 +3814,7 @@
 	gf_free(ptr);
 }
 
-GF_Err audio_sample_entry_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err audio_sample_entry_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_UnknownBox *wave = NULL;
 	Bool drop_wave=GF_FALSE;
@@ -3732,8 +3822,7 @@
 
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
-		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->esd = (GF_ESDBox *)a;
+		BOX_FIELD_ASSIGN(esd, GF_ESDBox)
 		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		break;
 
@@ -3741,35 +3830,32 @@
 	case GF_ISOM_BOX_TYPE_DEVC:
 	case GF_ISOM_BOX_TYPE_DQCP:
 	case GF_ISOM_BOX_TYPE_DSMV:
-		if (ptr->cfg_3gpp) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->cfg_3gpp = (GF_3GPPConfigBox *) a;
+		BOX_FIELD_ASSIGN(cfg_3gpp, GF_3GPPConfigBox)
 		/*for 3GP config, remember sample entry type in config*/
 		ptr->cfg_3gpp->cfg.type = ptr->type;
 		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		break;
 
 	case GF_ISOM_BOX_TYPE_DOPS:
-		if (ptr->cfg_opus) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->cfg_opus = (GF_OpusSpecificBox *)a;
+		BOX_FIELD_ASSIGN(cfg_opus, GF_OpusSpecificBox)
 		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		break;
 	case GF_ISOM_BOX_TYPE_DAC3:
-		if (ptr->cfg_ac3) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->cfg_ac3 = (GF_AC3ConfigBox *) a;
+		BOX_FIELD_ASSIGN(cfg_ac3, GF_AC3ConfigBox)
 		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		break;
 	case GF_ISOM_BOX_TYPE_DEC3:
-		if (ptr->cfg_ac3) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->cfg_ac3 = (GF_AC3ConfigBox *) a;
+		BOX_FIELD_ASSIGN(cfg_ac3, GF_AC3ConfigBox)
+		break;
+	case GF_ISOM_BOX_TYPE_DMLP:
+		BOX_FIELD_ASSIGN(cfg_mlp, GF_TrueHDConfigBox)
 		break;
 	case GF_ISOM_BOX_TYPE_MHAC:
-		if (ptr->cfg_mha) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->cfg_mha = (GF_MHAConfigBox *) a;
+		BOX_FIELD_ASSIGN(cfg_mha, GF_MHAConfigBox)
 		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		break;
 	case GF_ISOM_BOX_TYPE_DFLA:
-		if (ptr->cfg_flac) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->cfg_flac = (GF_FLACConfigBox *) a;
+		BOX_FIELD_ASSIGN(cfg_flac, GF_FLACConfigBox)
 		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		break;
 
@@ -3777,8 +3863,10 @@
 		wave = (GF_UnknownBox *)a;
 		/*HACK for QT files: get the esds box from the track*/
 		if (s->type == GF_ISOM_BOX_TYPE_MP4A) {
+			if (is_rem) {
+				return GF_OK;
+			}
 			if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-
 			//wave subboxes may have been properly parsed
 			if ((wave->original_4cc == GF_QT_BOX_TYPE_WAVE) && gf_list_count(wave->child_boxes)) {
 				u32 i;
@@ -3841,8 +3929,16 @@
 			cfg_ptr = (GF_Box **) &ptr->cfg_mha;
 			subtype = GF_ISOM_BOX_TYPE_MHAC;
 		}
+		else if (s->type == GF_ISOM_BOX_TYPE_MLPA) {
+			cfg_ptr = (GF_Box **) &ptr->cfg_mlp;
+			subtype = GF_ISOM_BOX_TYPE_DMLP;
+		}
 
 		if (cfg_ptr) {
+			if (is_rem) {
+				*cfg_ptr = NULL;
+				return GF_OK;
+			}
 			if (*cfg_ptr) ERROR_ON_DUPLICATED_BOX(a, ptr)
 
 			//wave subboxes may have been properly parsed
@@ -3922,7 +4018,7 @@
 		ptr->qtff_mode |= GF_ISOM_AUDIO_QTFF_CONVERT_FLAG;
 	}
 
-	e = gf_isom_box_array_read(s, bs, audio_sample_entry_on_child_box);
+	e = gf_isom_box_array_read(s, bs);
 	if (!e) {
 		if (s->type==GF_ISOM_BOX_TYPE_ENCA) {
 			GF_ProtectionSchemeInfoBox *sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(s->child_boxes, GF_ISOM_BOX_TYPE_SINF);
@@ -3958,7 +4054,8 @@
 			ptr->esd = NULL;
 			e = gf_isom_box_parse((GF_Box **)&ptr->esd, mybs);
 			gf_bs_del(mybs);
-			if (e==GF_OK) {
+
+			if ((e==GF_OK) && (ptr->esd->type == GF_ISOM_BOX_TYPE_ESDS)) {
 				if (!ptr->child_boxes) ptr->child_boxes = gf_list_new();
 				gf_list_add(ptr->child_boxes, ptr->esd);
 			} else if (ptr->esd) {
@@ -4011,6 +4108,7 @@
 	gf_isom_check_position(s, (GF_Box *)ptr->cfg_opus, &pos);
 	gf_isom_check_position(s, (GF_Box *)ptr->cfg_ac3, &pos);
 	gf_isom_check_position(s, (GF_Box *)ptr->cfg_flac, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->cfg_mlp, &pos);
 	return GF_OK;
 }
 
@@ -4031,7 +4129,7 @@
 	GF_Err e = gf_isom_base_sample_entry_read((GF_SampleEntryBox *)s, bs);
 	if (e) return e;
 	ISOM_DECREASE_SIZE(s, 8);
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *gen_sample_entry_box_new()
@@ -4074,13 +4172,12 @@
 	gf_free(ptr);
 }
 
-GF_Err mp4s_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err mp4s_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MPEGSampleEntryBox *ptr = (GF_MPEGSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
-		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->esd = (GF_ESDBox *)a;
+		BOX_FIELD_ASSIGN(esd, GF_ESDBox)
 		break;
 	}
 	return GF_OK;
@@ -4095,7 +4192,7 @@
 	if (e) return e;
 
 	ISOM_DECREASE_SIZE(ptr, 8);
-	return gf_isom_box_array_read(s, bs, mp4s_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *mp4s_box_new()
@@ -4152,68 +4249,60 @@
 	gf_free(ptr);
 }
 
-GF_Err video_sample_entry_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err video_sample_entry_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MPEGVisualSampleEntryBox *ptr = (GF_MPEGVisualSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
-		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->esd = (GF_ESDBox *)a;
+		BOX_FIELD_ASSIGN(esd, GF_ESDBox)
 		break;
 	case GF_ISOM_BOX_TYPE_RINF:
-		if (ptr->rinf) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->rinf = (GF_RestrictedSchemeInfoBox *) a;
+		BOX_FIELD_ASSIGN(rinf, GF_RestrictedSchemeInfoBox)
 		break;
 	case GF_ISOM_BOX_TYPE_AVCC:
-		if (ptr->avc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->avc_config = (GF_AVCConfigurationBox *)a;
+		BOX_FIELD_ASSIGN(avc_config, GF_AVCConfigurationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_HVCC:
-		if (ptr->hevc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->hevc_config = (GF_HEVCConfigurationBox *)a;
+		BOX_FIELD_ASSIGN(hevc_config, GF_HEVCConfigurationBox)
+		break;
+	case GF_ISOM_BOX_TYPE_VVCC:
+		BOX_FIELD_ASSIGN(vvc_config, GF_VVCConfigurationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_SVCC:
-		if (ptr->svc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->svc_config = (GF_AVCConfigurationBox *)a;
+		BOX_FIELD_ASSIGN(svc_config, GF_AVCConfigurationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_MVCC:
-		if (ptr->mvc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->mvc_config = (GF_AVCConfigurationBox *)a;
+		BOX_FIELD_ASSIGN(mvc_config, GF_AVCConfigurationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_LHVC:
-		if (ptr->lhvc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->lhvc_config = (GF_HEVCConfigurationBox *)a;
+		BOX_FIELD_ASSIGN(lhvc_config, GF_HEVCConfigurationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_AV1C:
-		if (ptr->av1_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->av1_config = (GF_AV1ConfigurationBox *)a;
+		BOX_FIELD_ASSIGN(av1_config, GF_AV1ConfigurationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_VPCC:
-		if (ptr->vp_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->vp_config = (GF_VPConfigurationBox *)a;
+		BOX_FIELD_ASSIGN(vp_config, GF_VPConfigurationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_DVCC:
-		if (ptr->dovi_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->dovi_config = (GF_DOVIConfigurationBox*)a;
+	case GF_ISOM_BOX_TYPE_DVVC:
+		BOX_FIELD_ASSIGN(dovi_config, GF_DOVIConfigurationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_UUID:
 		if (! memcmp(((GF_UnknownUUIDBox*)a)->uuid, GF_ISOM_IPOD_EXT, 16)) {
-			if (ptr->ipod_ext) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->ipod_ext = (GF_UnknownUUIDBox *)a;
+			BOX_FIELD_ASSIGN(ipod_ext, GF_UnknownUUIDBox)
 		} else {
 			return GF_OK;
 		}
 		break;
 	case GF_ISOM_BOX_TYPE_D263:
-		if (ptr->cfg_3gpp) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->cfg_3gpp = (GF_3GPPConfigBox *)a;
+		BOX_FIELD_ASSIGN(cfg_3gpp, GF_3GPPConfigBox)
 		/*for 3GP config, remember sample entry type in config*/
-		ptr->cfg_3gpp->cfg.type = ptr->type;
+		if (ptr->cfg_3gpp)
+			ptr->cfg_3gpp->cfg.type = ptr->type;
 		break;
 
 	case GF_ISOM_BOX_TYPE_JP2H:
-		if (ptr->jp2h) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->jp2h = (GF_J2KHeaderBox *)a;
+		BOX_FIELD_ASSIGN(jp2h, GF_J2KHeaderBox)
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_PASP:
@@ -4225,7 +4314,7 @@
 	case GF_ISOM_BOX_TYPE_AUXI:
 	case GF_ISOM_BOX_TYPE_RVCC:
 	case GF_ISOM_BOX_TYPE_M4DS:
-		if (!gf_isom_box_check_unique(s->child_boxes, a)) {
+		if (!is_rem && !gf_isom_box_check_unique(s->child_boxes, a)) {
 			ERROR_ON_DUPLICATED_BOX(a, ptr)
 		}
 		return GF_OK;
@@ -4239,7 +4328,7 @@
 	GF_Err e;
 	e = gf_isom_video_sample_entry_read((GF_VisualSampleEntryBox *)s, bs);
 	if (e) return e;
-	e = gf_isom_box_array_read(s, bs, video_sample_entry_on_child_box);
+	e = gf_isom_box_array_read(s, bs);
 	if (e) return e;
 	/*this is an AVC sample desc*/
 	if (mp4v->avc_config || mp4v->svc_config || mp4v->mvc_config)
@@ -4293,6 +4382,7 @@
 
 GF_Err video_sample_entry_box_size(GF_Box *s)
 {
+	GF_Box *b;
 	u32 pos=0;
 	GF_MPEGVisualSampleEntryBox *ptr = (GF_MPEGVisualSampleEntryBox *)s;
 	gf_isom_video_sample_entry_size((GF_VisualSampleEntryBox *)s);
@@ -4314,6 +4404,9 @@
 	gf_isom_check_position(s, (GF_Box *)ptr->hevc_config, &pos);
 	gf_isom_check_position(s, (GF_Box *)ptr->lhvc_config, &pos);
 
+	/*VVC*/
+	gf_isom_check_position(s, (GF_Box *)ptr->vvc_config, &pos);
+	
 	/*AV1*/
 	gf_isom_check_position(s, (GF_Box *)ptr->av1_config, &pos);
 
@@ -4326,6 +4419,11 @@
 	/*DolbyVision*/
 	gf_isom_check_position(s, (GF_Box *)ptr->dovi_config, &pos);
 
+	b = gf_isom_box_find_child(ptr->child_boxes, GF_ISOM_BOX_TYPE_ST3D);
+	if (b) gf_isom_check_position(s, b, &pos);
+
+	b = gf_isom_box_find_child(ptr->child_boxes, GF_ISOM_BOX_TYPE_SV3D);
+	if (b) gf_isom_check_position(s, b, &pos);
 	return GF_OK;
 }
 
@@ -4345,18 +4443,19 @@
 }
 
 
-GF_Err mvex_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err mvex_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MovieExtendsBox *ptr = (GF_MovieExtendsBox *)s;
 
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_TREX:
-		return gf_list_add(ptr->TrackExList, a);
+		BOX_FIELD_LIST_ASSIGN(TrackExList)
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TREP:
-		return gf_list_add(ptr->TrackExPropList, a);
+		BOX_FIELD_LIST_ASSIGN(TrackExPropList)
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_MEHD:
-		if (ptr->mehd) ERROR_ON_DUPLICATED_BOX(a, s)
-		ptr->mehd = (GF_MovieExtendsHeaderBox*)a;
+		BOX_FIELD_ASSIGN(mehd, GF_MovieExtendsHeaderBox)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -4366,7 +4465,7 @@
 
 GF_Err mvex_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, mvex_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *mvex_box_new()
@@ -4901,69 +5000,56 @@
 	gf_free(ptr);
 }
 
-GF_Err stbl_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err stbl_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_SampleTableBox *ptr = (GF_SampleTableBox *)s;
 	if (!a) return GF_OK;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_STTS:
-		if (ptr->TimeToSample) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->TimeToSample = (GF_TimeToSampleBox *)a;
+		BOX_FIELD_ASSIGN(TimeToSample, GF_TimeToSampleBox)
 		break;
 	case GF_ISOM_BOX_TYPE_CTTS:
-		if (ptr->CompositionOffset) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->CompositionOffset = (GF_CompositionOffsetBox *)a;
+		BOX_FIELD_ASSIGN(CompositionOffset, GF_CompositionOffsetBox)
 		break;
 	case GF_ISOM_BOX_TYPE_CSLG:
-		if (ptr->CompositionToDecode) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->CompositionToDecode = (GF_CompositionToDecodeBox *)a;
+		BOX_FIELD_ASSIGN(CompositionToDecode, GF_CompositionToDecodeBox)
 		break;
 	case GF_ISOM_BOX_TYPE_STSS:
-		if (ptr->SyncSample) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->SyncSample = (GF_SyncSampleBox *)a;
+		BOX_FIELD_ASSIGN(SyncSample, GF_SyncSampleBox)
 		break;
 	case GF_ISOM_BOX_TYPE_STSD:
-		if (ptr->SampleDescription) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->SampleDescription =(GF_SampleDescriptionBox *)a;
+		BOX_FIELD_ASSIGN(SampleDescription, GF_SampleDescriptionBox)
 		break;
 	case GF_ISOM_BOX_TYPE_STZ2:
 	case GF_ISOM_BOX_TYPE_STSZ:
-		if (ptr->SampleSize) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->SampleSize = (GF_SampleSizeBox *)a;
+		BOX_FIELD_ASSIGN(SampleSize, GF_SampleSizeBox)
 		break;
 	case GF_ISOM_BOX_TYPE_STSC:
-		if (ptr->SampleToChunk) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->SampleToChunk = (GF_SampleToChunkBox *)a;
+		BOX_FIELD_ASSIGN(SampleToChunk, GF_SampleToChunkBox)
 		break;
 	case GF_ISOM_BOX_TYPE_PADB:
-		if (ptr->PaddingBits) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->PaddingBits = (GF_PaddingBitsBox *) a;
+		BOX_FIELD_ASSIGN(PaddingBits, GF_PaddingBitsBox)
 		break;
 
 	//WARNING: AS THIS MAY CHANGE DYNAMICALLY DURING EDIT,
 	case GF_ISOM_BOX_TYPE_CO64:
 	case GF_ISOM_BOX_TYPE_STCO:
-		if (ptr->ChunkOffset) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->ChunkOffset = a;
-		return GF_OK;
+		BOX_FIELD_ASSIGN(ChunkOffset, GF_Box)
+		break;
 	case GF_ISOM_BOX_TYPE_STSH:
-		if (ptr->ShadowSync) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->ShadowSync = (GF_ShadowSyncBox *)a;
+		BOX_FIELD_ASSIGN(ShadowSync, GF_ShadowSyncBox)
 		break;
 	case GF_ISOM_BOX_TYPE_STDP:
-		if (ptr->DegradationPriority) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->DegradationPriority = (GF_DegradationPriorityBox *)a;
+		BOX_FIELD_ASSIGN(DegradationPriority, GF_DegradationPriorityBox)
 		break;
 	case GF_ISOM_BOX_TYPE_SDTP:
-		if (ptr->SampleDep) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->SampleDep = (GF_SampleDependencyTypeBox *)a;
+		BOX_FIELD_ASSIGN(SampleDep, GF_SampleDependencyTypeBox)
 		break;
 
 	case GF_ISOM_BOX_TYPE_SUBS:
-		if (!ptr->sub_samples) ptr->sub_samples = gf_list_new();
-		gf_list_add(ptr->sub_samples, a);
+		BOX_FIELD_LIST_ASSIGN(sub_samples)
 		//check subsample box
-		{
+		if (!is_rem) {
 			GF_SubSampleInformationBox *subs = (GF_SubSampleInformationBox *)a;
 			GF_SubSampleInfoEntry *ent = gf_list_get(subs->Samples, 0);
 			if (!ent) {
@@ -4978,21 +5064,17 @@
 		break;
 
 	case GF_ISOM_BOX_TYPE_SBGP:
-		if (!ptr->sampleGroups) ptr->sampleGroups = gf_list_new();
-		gf_list_add(ptr->sampleGroups, a);
+	case GF_ISOM_BOX_TYPE_CSGP:
+		BOX_FIELD_LIST_ASSIGN(sampleGroups)
 		break;
 	case GF_ISOM_BOX_TYPE_SGPD:
-		if (!ptr->sampleGroupsDescription) ptr->sampleGroupsDescription = gf_list_new();
-		gf_list_add(ptr->sampleGroupsDescription, a);
+		BOX_FIELD_LIST_ASSIGN(sampleGroupsDescription)
 		break;
-
 	case GF_ISOM_BOX_TYPE_SAIZ:
-		if (!ptr->sai_sizes) ptr->sai_sizes = gf_list_new();
-		gf_list_add(ptr->sai_sizes, a);
+		BOX_FIELD_LIST_ASSIGN(sai_sizes)
 		break;
 	case GF_ISOM_BOX_TYPE_SAIO:
-		if (!ptr->sai_offsets) ptr->sai_offsets = gf_list_new();
-		gf_list_add(ptr->sai_offsets, a);
+		BOX_FIELD_LIST_ASSIGN(sai_offsets)
 		break;
 	}
 	return GF_OK;
@@ -5007,7 +5089,7 @@
 	//we need to parse DegPrior in a special way
 	GF_SampleTableBox *ptr = (GF_SampleTableBox *)s;
 
-	e = gf_isom_box_array_read(s, bs, stbl_on_child_box);
+	e = gf_isom_box_array_read(s, bs);
 	if (e) return e;
 
 	if (!ptr->SyncSample)
@@ -5020,14 +5102,48 @@
 		return GF_OK;
 //	return GF_OK;
 
-	//these boxes are mandatory !
-	if (!ptr->SampleToChunk || !ptr->SampleSize || !ptr->ChunkOffset || !ptr->TimeToSample)
-		return GF_ISOM_INVALID_FILE;
+#define CHECK_BOX(_name) \
+	if (!ptr->_name) {\
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Mandatory box %s is missing\n", #_name)); \
+		return GF_ISOM_INVALID_FILE; \
+	}
+
+	CHECK_BOX(SampleToChunk)
+	CHECK_BOX(SampleSize)
+	CHECK_BOX(ChunkOffset)
+	CHECK_BOX(TimeToSample)
+
 	//sanity check
 	if (ptr->SampleSize->sampleCount) {
 		if (!ptr->TimeToSample->nb_entries || !ptr->SampleToChunk->nb_entries)
 			return GF_ISOM_INVALID_FILE;
 	}
+	u32 i, max_chunks=0;
+	if (ptr->ChunkOffset->type == GF_ISOM_BOX_TYPE_STCO) {
+		max_chunks = ((GF_ChunkOffsetBox *)ptr->ChunkOffset)->nb_entries;
+	}
+	else if (ptr->ChunkOffset->type == GF_ISOM_BOX_TYPE_CO64) {
+		max_chunks = ((GF_ChunkOffsetBox *)ptr->ChunkOffset)->nb_entries;
+	}
+
+	//sanity check on stsc vs chunk offset tables
+	for (i=0; i<ptr->SampleToChunk->nb_entries; i++) {
+		GF_StscEntry *ent = &ptr->SampleToChunk->entries[i];
+		if (!i && (ent->firstChunk!=1)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] first_chunk of first entry shall be 1 but is %u\n", ent->firstChunk));
+			return GF_ISOM_INVALID_FILE;
+		}
+		if (ptr->SampleToChunk->entries[i].firstChunk > max_chunks) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] first_chunk is %u but number of chunks defined %u\n", ptr->SampleToChunk->entries[i].firstChunk, max_chunks));
+			return GF_ISOM_INVALID_FILE;
+		}
+		if (i+1 == ptr->SampleToChunk->nb_entries) break;
+		GF_StscEntry *next_ent = &ptr->SampleToChunk->entries[i+1];
+		if (next_ent->firstChunk < ent->firstChunk) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] first_chunk (%u) for entry %u is greater than first_chunk (%u) for entry %u\n", i+1, ent->firstChunk, i+2, next_ent->firstChunk));
+			return GF_ISOM_INVALID_FILE;
+		}
+	}
 	return GF_OK;
 }
 
@@ -5104,7 +5220,7 @@
 
 	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->nb_entries = gf_bs_read_u32(bs);
-	if (ptr->nb_entries > ptr->size / 4) {
+	if (ptr->nb_entries > ptr->size / 4 || (u64)ptr->nb_entries > (u64)SIZE_MAX/sizeof(u32)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in stco\n", ptr->nb_entries));
 		return GF_ISOM_INVALID_FILE;
 	}
@@ -5236,7 +5352,7 @@
 	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->nb_entries = gf_bs_read_u32(bs);
 
-	if (ptr->nb_entries > ptr->size / 12) {
+	if (ptr->nb_entries > ptr->size / 12 || (u64)ptr->nb_entries > (u64)SIZE_MAX/sizeof(GF_StscEntry)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in stsc\n", ptr->nb_entries));
 		return GF_ISOM_INVALID_FILE;
 	}
@@ -5312,12 +5428,12 @@
 	gf_free(ptr);
 }
 
-GF_Err stsd_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err stsd_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_UnknownBox *def;
 	if (!a) return GF_OK;
 
-	if (gf_box_valid_in_parent(a, "stsd")) {
+	if (is_rem || gf_box_valid_in_parent(a, "stsd")) {
 		return GF_OK;
 	}
 	switch (a->type) {
@@ -5344,7 +5460,7 @@
 	ISOM_DECREASE_SIZE(s, 4)
 	gf_bs_read_u32(bs);
 
-	return gf_isom_box_array_read_ex(s, bs, stsd_on_child_box, GF_ISOM_BOX_TYPE_STSD);
+	return gf_isom_box_array_read_ex(s, bs, GF_ISOM_BOX_TYPE_STSD);
 }
 
 GF_Box *stsd_box_new()
@@ -5403,7 +5519,7 @@
 
 	ISOM_DECREASE_SIZE(s, 4)
 	count = gf_bs_read_u32(bs);
-	if (ptr->size < count*8)
+	if (ptr->size / 8 < count)
 		return GF_ISOM_INVALID_FILE;
 
 	for (i = 0; i < count; i++) {
@@ -5476,7 +5592,7 @@
 
 	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->nb_entries = gf_bs_read_u32(bs);
-	if (ptr->size < ptr->nb_entries * 4) {
+	if (ptr->size / 4 < ptr->nb_entries || (u64)ptr->nb_entries > (u64)SIZE_MAX/sizeof(u32)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in stss\n", ptr->nb_entries));
 		return GF_ISOM_INVALID_FILE;
 	}
@@ -5575,6 +5691,10 @@
 			}
 		}
 	}
+	if (ptr->sampleCount && (u64)ptr->sampleCount > (u64)SIZE_MAX/sizeof(u32)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in stsz\n", ptr->sampleCount));
+		return GF_ISOM_INVALID_FILE;
+	}
 	if (s->type == GF_ISOM_BOX_TYPE_STSZ) {
 		if (! ptr->sampleSize && ptr->sampleCount) {
 			if (ptr->sampleCount > ptr->size / 4) {
@@ -5612,11 +5732,20 @@
 		ptr->alloc_size = ptr->sampleCount;
 
 		for (i = 0; i < ptr->sampleCount; ) {
+			u32 s_size;
 			switch (ptr->sampleSize) {
 			case 4:
-				ptr->sizes[i] = gf_bs_read_int(bs, 4);
+				s_size = ptr->sizes[i] = gf_bs_read_int(bs, 4);
+				if (ptr->max_size < s_size)
+					ptr->max_size = s_size;
+				ptr->total_size += s_size;
+				ptr->total_samples++;
 				if (i+1 < ptr->sampleCount) {
-					ptr->sizes[i+1] = gf_bs_read_int(bs, 4);
+					s_size = ptr->sizes[i+1] = gf_bs_read_int(bs, 4);
+					if (ptr->max_size < s_size)
+						ptr->max_size = s_size;
+					ptr->total_size += s_size;
+					ptr->total_samples++;
 				} else {
 					//0 padding in odd sample count
 					gf_bs_read_int(bs, 4);
@@ -5624,14 +5753,14 @@
 				i += 2;
 				break;
 			default:
-				ptr->sizes[i] = gf_bs_read_int(bs, ptr->sampleSize);
+				s_size = ptr->sizes[i] = gf_bs_read_int(bs, ptr->sampleSize);
+				if (ptr->max_size < s_size)
+					ptr->max_size = s_size;
+				ptr->total_size += s_size;
+				ptr->total_samples++;
 				i += 1;
 				break;
 			}
-			if (ptr->max_size < ptr->sizes[i])
-				ptr->max_size = ptr->sizes[i];
-			ptr->total_size += ptr->sizes[i];
-			ptr->total_samples++;
 		}
 	}
 	return GF_OK;
@@ -5666,12 +5795,12 @@
 	gf_bs_write_u32(bs, ptr->sampleCount);
 
 	if (ptr->type == GF_ISOM_BOX_TYPE_STSZ) {
-		if (! ptr->sampleSize) {
-			for (i = 0; i < ptr->sampleCount; i++) {
-				gf_bs_write_u32(bs, ptr->sizes ? ptr->sizes[i] : 0);
-			}
+		if (ptr->sampleSize) return GF_OK;
+		for (i = 0; i < ptr->sampleCount; i++) {
+			gf_bs_write_u32(bs, ptr->sizes ? ptr->sizes[i] : 0);
 		}
 	} else {
+		if (!ptr->sizes) return GF_ISOM_INVALID_FILE;
 		for (i = 0; i < ptr->sampleCount; ) {
 			switch (ptr->sampleSize) {
 			case 4:
@@ -5708,12 +5837,15 @@
 		ptr->size += (4 * ptr->sampleCount);
 		return GF_OK;
 	}
+	if (!ptr->sizes) return GF_ISOM_INVALID_FILE;
 
+	//compact size table
 	fieldSize = 4;
 	size = ptr->sizes[0];
 
 	for (i=0; i < ptr->sampleCount; i++) {
-		if (ptr->sizes[i] <= 0xF) continue;
+		if (ptr->sizes[i] <= 0xF) {
+		}
 		//switch to 8-bit table
 		else if (ptr->sizes[i] <= 0xFF) {
 			fieldSize = 8;
@@ -5736,6 +5868,7 @@
 		ptr->sampleSize = size;
 		gf_free(ptr->sizes);
 		ptr->sizes = NULL;
+		return GF_OK;
 	}
 
 	if (fieldSize == 32) {
@@ -5779,7 +5912,7 @@
 
 	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->nb_entries = gf_bs_read_u32(bs);
-	if (ptr->size < ptr->nb_entries * 8) {
+	if (ptr->size / 8 < ptr->nb_entries || (u64)ptr->nb_entries > (u64)SIZE_MAX/sizeof(GF_SttsEntry)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in stts\n", ptr->nb_entries));
 		return GF_ISOM_INVALID_FILE;
 	}
@@ -5806,12 +5939,17 @@
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] more than one stts entry at the end of the track with sample_delta=0 - forbidden ! Fixing to 1\n" ));
 				ptr->entries[i].sampleDelta = 1;
 			}
-		} else if ((s32) ptr->entries[i].sampleDelta < 0) {
+		}
+		//cf issue 1644: some media streams may have sample duration > 2^31 (ttml mostly), we cannot patch this
+		//for now we disable the check, one opt could be to have the check only for some media types, or only for the first entry
+#if 0
+		else if ((s32) ptr->entries[i].sampleDelta < 0) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] stts entry %d has negative duration %d - forbidden ! Fixing to 1, sync may get lost (consider reimport raw media)\n", i, (s32) ptr->entries[i].sampleDelta ));
 			ptr->entries[i].sampleDelta = 1;
 		}
+#endif
+
 	}
-	if (ptr->size<(ptr->nb_entries*8)) return GF_ISOM_INVALID_FILE;
 	ISOM_DECREASE_SIZE(ptr, ptr->nb_entries*8);
 
 	//remove the last sample delta.
@@ -6133,58 +6271,59 @@
 	gf_free(ptr);
 }
 
-GF_Err traf_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err traf_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_TrackFragmentBox *ptr = (GF_TrackFragmentBox *)s;
 
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_TFHD:
-		if (ptr->tfhd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->tfhd = (GF_TrackFragmentHeaderBox *) a;
+		BOX_FIELD_ASSIGN(tfhd, GF_TrackFragmentHeaderBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TRUN:
-		return gf_list_add(ptr->TrackRuns, a);
+		BOX_FIELD_LIST_ASSIGN(TrackRuns)
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SDTP:
-		if (ptr->sdtp) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->sdtp = (GF_SampleDependencyTypeBox *)a;
+		BOX_FIELD_ASSIGN(sdtp, GF_SampleDependencyTypeBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TFDT:
-		if (ptr->tfdt) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->tfdt = (GF_TFBaseMediaDecodeTimeBox*) a;
+		BOX_FIELD_ASSIGN(tfdt, GF_TFBaseMediaDecodeTimeBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SUBS:
-		if (!ptr->sub_samples) ptr->sub_samples = gf_list_new();
-		return gf_list_add(ptr->sub_samples, a);
+		BOX_FIELD_LIST_ASSIGN(sub_samples)
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SBGP:
-		if (!ptr->sampleGroups) ptr->sampleGroups = gf_list_new();
-		gf_list_add(ptr->sampleGroups, a);
+	case GF_ISOM_BOX_TYPE_CSGP:
+		BOX_FIELD_LIST_ASSIGN(sampleGroups)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SGPD:
-		if (!ptr->sampleGroupsDescription) ptr->sampleGroupsDescription = gf_list_new();
-		gf_list_add(ptr->sampleGroupsDescription, a);
+		BOX_FIELD_LIST_ASSIGN(sampleGroupsDescription)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SAIZ:
-		if (!ptr->sai_sizes) ptr->sai_sizes = gf_list_new();
-		gf_list_add(ptr->sai_sizes, a);
+		BOX_FIELD_LIST_ASSIGN(sai_sizes)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SAIO:
-		if (!ptr->sai_offsets) ptr->sai_offsets = gf_list_new();
-		gf_list_add(ptr->sai_offsets, a);
+		BOX_FIELD_LIST_ASSIGN(sai_offsets)
 		return GF_OK;
 	//we will throw an error if both PIFF_PSEC and SENC are found. Not such files seen yet
 	case GF_ISOM_BOX_TYPE_UUID:
 		if ( ((GF_UUIDBox *)a)->internal_4cc==GF_ISOM_BOX_UUID_PSEC) {
-			if (ptr->sample_encryption) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->sample_encryption = (GF_SampleEncryptionBox *)a;
-			ptr->sample_encryption->traf = ptr;
+			BOX_FIELD_ASSIGN(sample_encryption, GF_SampleEncryptionBox)
+			if (!is_rem)
+				ptr->sample_encryption->traf = ptr;
+			return GF_OK;
+		} else if ( ((GF_UUIDBox *)a)->internal_4cc==GF_ISOM_BOX_UUID_TFXD) {
+			BOX_FIELD_ASSIGN(tfxd, GF_MSSTimeExtBox)
+			return GF_OK;
+		} else if ( ((GF_UUIDBox *)a)->internal_4cc==GF_ISOM_BOX_UUID_TFRF) {
+			BOX_FIELD_ASSIGN(tfrf, GF_MSSTimeRefBox)
 			return GF_OK;
 		} else {
 			return GF_OK;
 		}
 	case GF_ISOM_BOX_TYPE_SENC:
-		if (ptr->sample_encryption) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->sample_encryption = (GF_SampleEncryptionBox *)a;
-		ptr->sample_encryption->traf = ptr;
+		BOX_FIELD_ASSIGN(sample_encryption, GF_SampleEncryptionBox)
+		if (!is_rem)
+			ptr->sample_encryption->traf = ptr;
 		return GF_OK;
 	}
 	return GF_OK;
@@ -6194,7 +6333,7 @@
 GF_Err traf_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TrackFragmentBox *ptr = (GF_TrackFragmentBox *)s;
-	GF_Err e = gf_isom_box_array_read(s, bs, traf_on_child_box);
+	GF_Err e = gf_isom_box_array_read(s, bs);
 	if (e) return e;
 
 	if (!ptr->tfhd) {
@@ -6214,11 +6353,58 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
+GF_Err traf_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	return gf_isom_box_write_header(s, bs);
+}
+
+GF_Err traf_box_size(GF_Box *s)
+{
+	u32 pos=0;
+	GF_TrackFragmentBox *ptr = (GF_TrackFragmentBox *) s;
+
+	//Header first
+	gf_isom_check_position(s, (GF_Box *)ptr->tfhd, &pos);
+	gf_isom_check_position_list(s, ptr->sub_samples, &pos);
+
+	gf_isom_check_position(s, (GF_Box *)ptr->tfdt, &pos);
+
+	//cmaf-like
+	if (ptr->truns_first) {
+		gf_isom_check_position_list(s, ptr->TrackRuns, &pos);
+		gf_isom_check_position_list(s, ptr->sai_sizes, &pos);
+		gf_isom_check_position_list(s, ptr->sai_offsets, &pos);
+		//senc MUST be after saio in GPAC, as senc writing uses info from saio writing
+		gf_isom_check_position(s, (GF_Box *)ptr->sample_encryption, &pos);
+		gf_isom_check_position_list(s, ptr->sampleGroupsDescription, &pos);
+		gf_isom_check_position_list(s, ptr->sampleGroups, &pos);
+		//subsamples will be last
+	} else {
+		gf_isom_check_position_list(s, ptr->sampleGroupsDescription, &pos);
+		gf_isom_check_position_list(s, ptr->sampleGroups, &pos);
+		gf_isom_check_position_list(s, ptr->sai_sizes, &pos);
+		gf_isom_check_position_list(s, ptr->sai_offsets, &pos);
+		gf_isom_check_position(s, (GF_Box *)ptr->sample_encryption, &pos);
+		gf_isom_check_position_list(s, ptr->TrackRuns, &pos);
+	}
+
+	//when sdtp is present (smooth-like) write it after the trun box
+	gf_isom_check_position(s, (GF_Box *)ptr->sdtp, &pos);
+
+	//tfxd should be last ...
+	if (ptr->tfxd)
+		gf_isom_check_position(s, (GF_Box *)ptr->tfxd, &pos);
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 
 GF_Box *tfxd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MSSTimeExtBox, GF_ISOM_BOX_TYPE_UUID);
 	tmp->internal_4cc = GF_ISOM_BOX_UUID_TFXD;
+	tmp->version = 1;
 	return (GF_Box *)tmp;
 }
 
@@ -6248,61 +6434,111 @@
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 GF_Err tfxd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
-	GF_MSSTimeExtBox *uuid = (GF_MSSTimeExtBox*)s;
+	GF_MSSTimeExtBox *ptr = (GF_MSSTimeExtBox*)s;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 
-	gf_bs_write_u8(bs, 1);
+	gf_bs_write_u8(bs, ptr->version);
 	gf_bs_write_u24(bs, 0);
-	gf_bs_write_u64(bs, uuid->absolute_time_in_track_timescale);
-	gf_bs_write_u64(bs, uuid->fragment_duration_in_track_timescale);
-
+	if (ptr->version) {
+		gf_bs_write_u64(bs, ptr->absolute_time_in_track_timescale);
+		gf_bs_write_u64(bs, ptr->fragment_duration_in_track_timescale);
+	} else {
+		gf_bs_write_u32(bs, (u32) ptr->absolute_time_in_track_timescale);
+		gf_bs_write_u32(bs, (u32) ptr->fragment_duration_in_track_timescale);
+	}
 	return GF_OK;
 }
 
 GF_Err tfxd_box_size(GF_Box *s)
 {
-	s->size += 20;
+	GF_MSSTimeExtBox *ptr = (GF_MSSTimeExtBox*)s;
+	s->size += 4 + (ptr->version ? 16 : 8);
 	return GF_OK;
 }
+#endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Err traf_box_write(GF_Box *s, GF_BitStream *bs)
+
+
+GF_Box *tfrf_box_new()
 {
-	return gf_isom_box_write_header(s, bs);
+	ISOM_DECL_BOX_ALLOC(GF_MSSTimeRefBox, GF_ISOM_BOX_TYPE_UUID);
+	tmp->internal_4cc = GF_ISOM_BOX_UUID_TFRF;
+	return (GF_Box *)tmp;
 }
 
-GF_Err traf_box_size(GF_Box *s)
+void tfrf_box_del(GF_Box *s)
 {
-	u32 pos=0;
-	GF_TrackFragmentBox *ptr = (GF_TrackFragmentBox *) s;
+	GF_MSSTimeRefBox *ptr = (GF_MSSTimeRefBox *)s;
+	if (ptr->frags) gf_free(ptr->frags);
+	gf_free(s);
+}
 
-	//Header first
-	gf_isom_check_position(s, (GF_Box *)ptr->tfhd, &pos);
-	gf_isom_check_position_list(s, ptr->sub_samples, &pos);
 
-	gf_isom_check_position(s, (GF_Box *)ptr->tfdt, &pos);
-	gf_isom_check_position_list(s, ptr->sampleGroupsDescription, &pos);
-	gf_isom_check_position_list(s, ptr->sampleGroups, &pos);
-	gf_isom_check_position_list(s, ptr->sai_sizes, &pos);
-	gf_isom_check_position_list(s, ptr->sai_offsets, &pos);
+GF_Err tfrf_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i;
+	GF_MSSTimeRefBox *ptr = (GF_MSSTimeRefBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 5);
+	ptr->version = gf_bs_read_u8(bs);
+	ptr->flags = gf_bs_read_u24(bs);
+	ptr->frags_count = gf_bs_read_u8(bs);
+	ptr->frags = gf_malloc(sizeof(GF_MSSTimeEntry) * ptr->frags_count);
+	if (!ptr->frags) return GF_OUT_OF_MEM;
 
-	gf_isom_check_position(s, (GF_Box *)ptr->sample_encryption, &pos);
+	for (i=0; i<ptr->frags_count; i++) {
+		if (ptr->version == 0x01) {
+			ISOM_DECREASE_SIZE(ptr, 16);
+			ptr->frags[i].absolute_time_in_track_timescale = gf_bs_read_u64(bs);
+			ptr->frags[i].fragment_duration_in_track_timescale = gf_bs_read_u64(bs);
+		} else {
+			ISOM_DECREASE_SIZE(ptr, 8);
+			ptr->frags[i].absolute_time_in_track_timescale = gf_bs_read_u32(bs);
+			ptr->frags[i].fragment_duration_in_track_timescale = gf_bs_read_u32(bs);
+		}
+	}
+	return GF_OK;
+}
 
-	gf_isom_check_position_list(s, ptr->TrackRuns, &pos);
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
-	//when sdtp is present (smooth-like) write it after the trun box
-	gf_isom_check_position(s, (GF_Box *)ptr->sdtp, &pos);
+GF_Err tfrf_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 i;
+	GF_MSSTimeRefBox *ptr = (GF_MSSTimeRefBox*)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
 
-	//tfxd should be last ...
-	if (ptr->tfxd)
-		gf_isom_check_position(s, (GF_Box *)ptr->tfxd, &pos);
+	gf_bs_write_u8(bs, ptr->version);
+	gf_bs_write_u24(bs, 0);
+	gf_bs_write_u8(bs, ptr->frags_count);
+	for (i=0; i<ptr->frags_count; i++) {
+		if (ptr->version==0x01) {
+			gf_bs_write_u64(bs, ptr->frags[i].absolute_time_in_track_timescale);
+			gf_bs_write_u64(bs, ptr->frags[i].fragment_duration_in_track_timescale);
+		} else {
+			gf_bs_write_u32(bs, (u32) ptr->frags[i].absolute_time_in_track_timescale);
+			gf_bs_write_u32(bs, (u32) ptr->frags[i].fragment_duration_in_track_timescale);
+		}
+	}
 	return GF_OK;
 }
 
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
+GF_Err tfrf_box_size(GF_Box *s)
+{
+	GF_MSSTimeRefBox *ptr = (GF_MSSTimeRefBox*)s;
+	s->size += 5;
+	if (ptr->version) s->size += 16 * ptr->frags_count;
+	else s->size += 8 * ptr->frags_count;
+	return GF_OK;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
 
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
@@ -6317,7 +6553,50 @@
 	gf_free(s);
 }
 
-static void gf_isom_check_sample_desc(GF_TrackBox *trak)
+static void stsd_switch_box(GF_BitStream *bs, GF_Box *box, GF_UnknownBox *a, u8 **data, u32 *data_size, u32 *EntryType, GF_SampleDescriptionBox *stsd, u32 stsd_idx)
+{
+	if (gf_bs_available(bs)) {
+		GF_Err e;
+		u32 count_subb;
+		gf_bs_set_cookie(bs, GF_ISOM_BS_COOKIE_NO_LOGS);
+		e = gf_isom_box_array_read(box, bs);
+		count_subb = box->child_boxes ? gf_list_count(box->child_boxes) : 0;
+		if (count_subb && !e) {
+			u32 i;
+			GF_BitStream *new_dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			//serialize all unknown boxes
+			for (i=0; i<count_subb; i++) {
+				GF_UnknownBox *priv = gf_list_get(box->child_boxes, i);
+				if (priv->type != GF_ISOM_BOX_TYPE_UNKNOWN) continue;
+				gf_bs_write_u32(new_dsi, 8 + priv->dataSize);
+				gf_bs_write_u32(new_dsi, priv->original_4cc);
+				gf_bs_write_data(new_dsi, priv->data, priv->dataSize);
+				gf_list_rem(box->child_boxes, i);
+				gf_isom_box_del((GF_Box*)priv);
+				count_subb--;
+				i--;
+			}
+			if (*data) gf_free(*data);
+			gf_bs_get_content(new_dsi, data, data_size);
+			gf_bs_del(new_dsi);
+		} else {
+			*data_size = 0;
+		}
+	}
+	gf_bs_del(bs);
+	if (!*data_size && *data) {
+		gf_free(*data);
+		*data = NULL;
+	}
+	box->size = 0;
+	*EntryType = a->original_4cc;
+	gf_list_rem(stsd->child_boxes, stsd_idx);
+	gf_isom_box_del((GF_Box *)a);
+	gf_list_insert(stsd->child_boxes, box, stsd_idx);
+}
+
+
+static GF_Err gf_isom_check_sample_desc(GF_TrackBox *trak)
 {
 	GF_BitStream *bs;
 	GF_UnknownBox *a;
@@ -6327,7 +6606,7 @@
 
 	if (!trak->Media || !trak->Media->information) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no media box !\n" ));
-		return;
+		return GF_OK;
 	}
 	if (!trak->Media->information->sampleTable) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no sample table !\n" ));
@@ -6338,34 +6617,74 @@
 	if (!stbl->SampleDescription) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no sample description box !\n" ));
 		stbl->SampleDescription = (GF_SampleDescriptionBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSD);
-		return;
+		return GF_OK;
 	}
 
 	i=0;
-	while ((a = (GF_UnknownBox*)gf_list_enum(trak->Media->information->sampleTable->SampleDescription->child_boxes, &i))) {
+	while ((a = (GF_UnknownBox*)gf_list_enum(stbl->SampleDescription->child_boxes, &i))) {
+		GF_ProtectionSchemeInfoBox *sinf;
+		u32 base_ent_type = 0;
+		u32 type = a->type;
 		switch (a->type) {
-		case GF_ISOM_BOX_TYPE_MP4S:
 		case GF_ISOM_BOX_TYPE_ENCS:
-		case GF_ISOM_BOX_TYPE_MP4A:
 		case GF_ISOM_BOX_TYPE_ENCA:
-		case GF_ISOM_BOX_TYPE_MP4V:
 		case GF_ISOM_BOX_TYPE_ENCV:
 		case GF_ISOM_BOX_TYPE_RESV:
+		case GF_ISOM_BOX_TYPE_ENCT:
+			sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(a->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+			if (!sinf || !sinf->original_format) return GF_ISOM_INVALID_FILE;
+			type = sinf->original_format->data_format;
+			base_ent_type = ((GF_SampleEntryBox *)a)->internal_type;
+			break;
+		}
+
+		switch (type) {
+		case GF_ISOM_BOX_TYPE_MP4S:
+			if (base_ent_type && (base_ent_type != GF_ISOM_SAMPLE_ENTRY_MP4S)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Protected sample entry %s uses incompatible sample description %s\n", gf_4cc_to_str(a->type), gf_4cc_to_str(type) ));
+
+				return GF_ISOM_INVALID_FILE;
+			}
+			continue;
+
 		case GF_ISOM_SUBTYPE_3GP_AMR:
 		case GF_ISOM_SUBTYPE_3GP_AMR_WB:
 		case GF_ISOM_SUBTYPE_3GP_EVRC:
 		case GF_ISOM_SUBTYPE_3GP_QCELP:
 		case GF_ISOM_SUBTYPE_3GP_SMV:
+		case GF_ISOM_BOX_TYPE_MP4A:
+		case GF_ISOM_BOX_TYPE_MP3:
+		case GF_ISOM_BOX_TYPE_MHA1:
+		case GF_ISOM_BOX_TYPE_MHA2:
+		case GF_ISOM_BOX_TYPE_MHM1:
+		case GF_ISOM_BOX_TYPE_MHM2:
+		case GF_ISOM_BOX_TYPE_OPUS:
+		case GF_ISOM_BOX_TYPE_AC3:
+		case GF_ISOM_BOX_TYPE_EC3:
+		case GF_QT_SUBTYPE_RAW_AUD:
+		case GF_QT_SUBTYPE_TWOS:
+		case GF_QT_SUBTYPE_SOWT:
+		case GF_QT_SUBTYPE_FL32:
+		case GF_QT_SUBTYPE_FL64:
+		case GF_QT_SUBTYPE_IN24:
+		case GF_QT_SUBTYPE_IN32:
+		case GF_QT_SUBTYPE_ULAW:
+		case GF_QT_SUBTYPE_ALAW:
+		case GF_QT_SUBTYPE_ADPCM:
+		case GF_QT_SUBTYPE_IMA_ADPCM:
+		case GF_QT_SUBTYPE_DVCA:
+		case GF_QT_SUBTYPE_QDMC:
+		case GF_QT_SUBTYPE_QDMC2:
+		case GF_QT_SUBTYPE_QCELP:
+		case GF_QT_SUBTYPE_kMP3:
+		case GF_ISOM_BOX_TYPE_IPCM:
+		case GF_ISOM_BOX_TYPE_FPCM:
+			if (base_ent_type && (base_ent_type != GF_ISOM_SAMPLE_ENTRY_AUDIO))
+				return GF_ISOM_INVALID_FILE;
+			continue;
+
+		case GF_ISOM_BOX_TYPE_MP4V:
 		case GF_ISOM_SUBTYPE_3GP_H263:
-		case GF_ISOM_BOX_TYPE_GHNT:
-		case GF_ISOM_BOX_TYPE_RTP_STSD:
-		case GF_ISOM_BOX_TYPE_SRTP_STSD:
-		case GF_ISOM_BOX_TYPE_FDP_STSD:
-		case GF_ISOM_BOX_TYPE_RRTP_STSD:
-		case GF_ISOM_BOX_TYPE_RTCP_STSD:
-		case GF_ISOM_BOX_TYPE_METX:
-		case GF_ISOM_BOX_TYPE_METT:
-		case GF_ISOM_BOX_TYPE_STXT:
 		case GF_ISOM_BOX_TYPE_AVC1:
 		case GF_ISOM_BOX_TYPE_AVC2:
 		case GF_ISOM_BOX_TYPE_AVC3:
@@ -6383,57 +6702,64 @@
 		case GF_ISOM_BOX_TYPE_VP08:
 		case GF_ISOM_BOX_TYPE_VP09:
 		case GF_ISOM_BOX_TYPE_AV1C:
-		case GF_ISOM_BOX_TYPE_TX3G:
-		case GF_ISOM_BOX_TYPE_TEXT:
-		case GF_ISOM_BOX_TYPE_ENCT:
-		case GF_ISOM_BOX_TYPE_DIMS:
-		case GF_ISOM_BOX_TYPE_OPUS:
-		case GF_ISOM_BOX_TYPE_AC3:
-		case GF_ISOM_BOX_TYPE_EC3:
-		case GF_ISOM_BOX_TYPE_LSR1:
-		case GF_ISOM_BOX_TYPE_WVTT:
-		case GF_ISOM_BOX_TYPE_STPP:
-		case GF_ISOM_BOX_TYPE_SBTT:
-		case GF_ISOM_BOX_TYPE_MP3:
 		case GF_ISOM_BOX_TYPE_JPEG:
 		case GF_ISOM_BOX_TYPE_PNG:
 		case GF_ISOM_BOX_TYPE_JP2K:
-		case GF_ISOM_BOX_TYPE_MHA1:
-		case GF_ISOM_BOX_TYPE_MHA2:
-		case GF_ISOM_BOX_TYPE_MHM1:
-		case GF_ISOM_BOX_TYPE_MHM2:
 		case GF_ISOM_BOX_TYPE_MJP2:
-		case GF_QT_SUBTYPE_RAW_AUD:
-		case GF_QT_SUBTYPE_TWOS:
-		case GF_QT_SUBTYPE_SOWT:
-		case GF_QT_SUBTYPE_FL32:
-		case GF_QT_SUBTYPE_FL64:
-		case GF_QT_SUBTYPE_IN24:
-		case GF_QT_SUBTYPE_IN32:
-		case GF_QT_SUBTYPE_ULAW:
-		case GF_QT_SUBTYPE_ALAW:
-		case GF_QT_SUBTYPE_ADPCM:
-		case GF_QT_SUBTYPE_IMA_ADPCM:
-		case GF_QT_SUBTYPE_DVCA:
-		case GF_QT_SUBTYPE_QDMC:
-		case GF_QT_SUBTYPE_QDMC2:
-		case GF_QT_SUBTYPE_QCELP:
-		case GF_QT_SUBTYPE_kMP3:
-		case GF_QT_SUBTYPE_RAW_VID:
 		case GF_QT_SUBTYPE_APCH:
 		case GF_QT_SUBTYPE_APCO:
 		case GF_QT_SUBTYPE_APCN:
 		case GF_QT_SUBTYPE_APCS:
 		case GF_QT_SUBTYPE_AP4X:
 		case GF_QT_SUBTYPE_AP4H:
-		case GF_QT_SUBTYPE_YUV422:
+		case GF_ISOM_BOX_TYPE_VVC1:
+		case GF_ISOM_BOX_TYPE_VVI1:
+		case GF_QT_SUBTYPE_RAW_VID:
+		case GF_QT_SUBTYPE_YUYV:
+		case GF_QT_SUBTYPE_UYVY:
 		case GF_QT_SUBTYPE_YUV444:
+		case GF_QT_SUBTYPE_YUVA444:
 		case GF_QT_SUBTYPE_YUV422_10:
 		case GF_QT_SUBTYPE_YUV444_10:
-		case GF_ISOM_BOX_TYPE_IPCM:
-		case GF_ISOM_BOX_TYPE_FPCM:
+		case GF_QT_SUBTYPE_YUV422_16:
+		case GF_QT_SUBTYPE_YUV420:
+		case GF_QT_SUBTYPE_I420:
+		case GF_QT_SUBTYPE_IYUV:
+		case GF_QT_SUBTYPE_YV12:
+		case GF_QT_SUBTYPE_YVYU:
+		case GF_QT_SUBTYPE_RGBA:
+		case GF_QT_SUBTYPE_ABGR:
+		case GF_ISOM_BOX_TYPE_DVHE:
+		case GF_ISOM_BOX_TYPE_DVH1:
+		case GF_ISOM_BOX_TYPE_DVA1:
+		case GF_ISOM_BOX_TYPE_DVAV:
+		case GF_ISOM_BOX_TYPE_DAV1:
+			if (base_ent_type && (base_ent_type != GF_ISOM_SAMPLE_ENTRY_VIDEO))
+				return GF_ISOM_INVALID_FILE;
+			continue;
+
+
+		case GF_ISOM_BOX_TYPE_METX:
+		case GF_ISOM_BOX_TYPE_METT:
+		case GF_ISOM_BOX_TYPE_STXT:
+		case GF_ISOM_BOX_TYPE_TX3G:
+		case GF_ISOM_BOX_TYPE_TEXT:
+		case GF_ISOM_BOX_TYPE_GHNT:
+		case GF_ISOM_BOX_TYPE_RTP_STSD:
+		case GF_ISOM_BOX_TYPE_SRTP_STSD:
+		case GF_ISOM_BOX_TYPE_FDP_STSD:
+		case GF_ISOM_BOX_TYPE_RRTP_STSD:
+		case GF_ISOM_BOX_TYPE_RTCP_STSD:
+		case GF_ISOM_BOX_TYPE_DIMS:
+		case GF_ISOM_BOX_TYPE_LSR1:
+		case GF_ISOM_BOX_TYPE_WVTT:
+		case GF_ISOM_BOX_TYPE_STPP:
+		case GF_ISOM_BOX_TYPE_SBTT:
+			if (base_ent_type && (base_ent_type != GF_ISOM_SAMPLE_ENTRY_GENERIC))
+				return GF_ISOM_INVALID_FILE;
 			continue;
 
+
 		case GF_ISOM_BOX_TYPE_UNKNOWN:
 			break;
 		default:
@@ -6455,37 +6781,6 @@
 			continue;
 		}
 
-#define STSD_SWITCH_BOX(_box) \
-		if (gf_bs_available(bs)) { \
-			u64 pos = gf_bs_get_position(bs); \
-			u32 count_subb = 0; \
-			gf_bs_set_cookie(bs, GF_ISOM_BS_COOKIE_NO_LOGS);\
-			e = gf_isom_box_array_read((GF_Box *) _box, bs, NULL); \
-			count_subb = _box->child_boxes ? gf_list_count(_box->child_boxes) : 0; \
-			if (!count_subb || e) { \
-				gf_bs_seek(bs, pos); \
-				_box->data_size = (u32) gf_bs_available(bs); \
-				if (_box->data_size) { \
-					_box->data = a->data; \
-					a->data = NULL; \
-					memmove(_box->data, _box->data + pos, _box->data_size); \
-				} \
-			} else { \
-				_box->data_size = 0; \
-			} \
-		} \
-		gf_bs_del(bs); \
-		if (!_box->data_size && _box->data) { \
-			gf_free(_box->data); \
-			_box->data = NULL; \
-		} \
-		_box->size = 0; \
-		_box->EntryType = a->original_4cc; \
-		gf_list_rem(trak->Media->information->sampleTable->SampleDescription->child_boxes, i-1); \
-		gf_isom_box_del((GF_Box *)a); \
-		gf_list_insert(trak->Media->information->sampleTable->SampleDescription->child_boxes, _box, i-1); \
-
-
 		/*only process visual or audio
 		note: no need for new_box_parent here since we always store sample descriptions in child_boxes*/
 		switch (trak->Media->handler->handlerType) {
@@ -6498,8 +6793,7 @@
 			genv->size = a->size-8;
 			gf_isom_video_sample_entry_read((GF_VisualSampleEntryBox *) genv, bs);
 
-			STSD_SWITCH_BOX(genv)
-
+			stsd_switch_box(bs, (GF_Box *) genv, a, &genv->data, &genv->data_size, &genv->EntryType, trak->Media->information->sampleTable->SampleDescription, i-1);
 		}
 		break;
 		case GF_ISOM_MEDIA_AUDIO:
@@ -6509,8 +6803,7 @@
 			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
 			gf_isom_audio_sample_entry_read((GF_AudioSampleEntryBox *) gena, bs);
 
-			STSD_SWITCH_BOX(gena)
-
+			stsd_switch_box(bs, (GF_Box *) gena, a, &gena->data, &gena->data_size, &gena->EntryType, trak->Media->information->sampleTable->SampleDescription, i-1);
 		}
 		break;
 
@@ -6521,61 +6814,54 @@
 			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
 
 			e = gf_isom_base_sample_entry_read((GF_SampleEntryBox *)genm, bs);
-			if (e) return;
+			if (e) return e;
 
-			STSD_SWITCH_BOX(genm)
+			stsd_switch_box(bs, (GF_Box *) genm, a, &genm->data, &genm->data_size, &genm->EntryType, trak->Media->information->sampleTable->SampleDescription, i-1);
 		}
 		break;
 		}
-
 	}
+	return GF_OK;
 }
 
 
-GF_Err trak_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err trak_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_TrackBox *ptr = (GF_TrackBox *)s;
 	if (!a) return GF_OK;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_TKHD:
-		if (ptr->Header) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->Header = (GF_TrackHeaderBox *)a;
+		BOX_FIELD_ASSIGN(Header, GF_TrackHeaderBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_EDTS:
-		if (ptr->editBox) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->editBox = (GF_EditBox *)a;
+		BOX_FIELD_ASSIGN(editBox, GF_EditBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_UDTA:
-		if (ptr->udta) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->udta = (GF_UserDataBox *)a;
+		BOX_FIELD_ASSIGN(udta, GF_UserDataBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_META:
-		if (ptr->meta) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->meta = (GF_MetaBox *)a;
+		BOX_FIELD_ASSIGN(meta, GF_MetaBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TREF:
-		if (ptr->References) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->References = (GF_TrackReferenceBox *)a;
+		BOX_FIELD_ASSIGN(References, GF_TrackReferenceBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_MDIA:
-		if (ptr->Media) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->Media = (GF_MediaBox *)a;
-		((GF_MediaBox *)a)->mediaTrack = ptr;
+		BOX_FIELD_ASSIGN(Media, GF_MediaBox)
+		if (!is_rem)
+			((GF_MediaBox *)a)->mediaTrack = ptr;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TRGR:
-		if (ptr->groups) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->groups = (GF_TrackGroupBox *)a;
+		BOX_FIELD_ASSIGN(groups, GF_TrackGroupBox)
 		return GF_OK;
 	case GF_QT_BOX_TYPE_TAPT:
-		if (ptr->Aperture) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->Aperture = (GF_Box *)a;
+		BOX_FIELD_ASSIGN(Aperture, GF_Box)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SENC:
-		ptr->sample_encryption = (GF_SampleEncryptionBox*)a;
+		BOX_FIELD_ASSIGN(sample_encryption, GF_SampleEncryptionBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_UUID:
 		if (((GF_UnknownUUIDBox *)a)->internal_4cc == GF_ISOM_BOX_UUID_PSEC) {
-			ptr->sample_encryption = (GF_SampleEncryptionBox*) a;
+			BOX_FIELD_ASSIGN(sample_encryption, GF_SampleEncryptionBox)
 			return GF_OK;
 		}
 	}
@@ -6588,9 +6874,10 @@
 	GF_Err e;
 	u32 i;
 	GF_TrackBox *ptr = (GF_TrackBox *)s;
-	e = gf_isom_box_array_read(s, bs, trak_on_child_box);
+	e = gf_isom_box_array_read(s, bs);
+	if (e) return e;
+	e = gf_isom_check_sample_desc(ptr);
 	if (e) return e;
-	gf_isom_check_sample_desc(ptr);
 
 	if (!ptr->Header) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing TrackHeaderBox\n"));
@@ -6645,6 +6932,8 @@
 	GF_TrackBox *ptr = (GF_TrackBox *)s;
 
 	if (ptr->sample_encryption && ptr->sample_encryption->load_needed) {
+		if (!ptr->moov || !ptr->moov->mov || !ptr->moov->mov->movieFileMap)
+			return GF_ISOM_INVALID_FILE;
 		GF_Err e = senc_Parse(ptr->moov->mov->movieFileMap->bs, ptr, NULL, ptr->sample_encryption);
 		if (e) return e;
 	}
@@ -6679,6 +6968,10 @@
 	ptr->alternate_group = gf_bs_read_u16(bs);
 	ptr->sub_track_id = gf_bs_read_u32(bs);
 	ptr->attribute_count = ptr->size / 4;
+	if ((u64)ptr->attribute_count > (u64)SIZE_MAX/sizeof(u32)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid size %llu in stri\n", ptr->size));
+		return GF_ISOM_INVALID_FILE;
+	}
 	GF_SAFE_ALLOC_N(ptr->attribute_list, (size_t)ptr->attribute_count, u32);
 	if (!ptr->attribute_list) return GF_OUT_OF_MEM;
 	for (i = 0; i < ptr->attribute_count; i++) {
@@ -6788,18 +7081,16 @@
 	gf_free(s);
 }
 
-GF_Err strk_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err strk_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_SubTrackBox *ptr = (GF_SubTrackBox *)s;
 	if (!a) return GF_OK;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_STRI:
-		if (ptr->info) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->info = (GF_SubTrackInformationBox *)a;
+		BOX_FIELD_ASSIGN(info, GF_SubTrackInformationBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_STRD:
-		if (ptr->strd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->strd = a;
+		BOX_FIELD_ASSIGN(strd, GF_Box)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -6810,7 +7101,7 @@
 {
 	GF_Err e;
 	GF_SubTrackBox *ptr = (GF_SubTrackBox *)s;
-	e = gf_isom_box_array_read(s, bs, strk_on_child_box);
+	e = gf_isom_box_array_read(s, bs);
 	if (e) return e;
 
 	if (!ptr->info) {
@@ -6851,7 +7142,7 @@
 
 GF_Err tref_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, NULL, s->type);
+	return gf_isom_box_array_read_ex(s, bs, s->type);
 }
 
 GF_Box *tref_box_new()
@@ -7043,7 +7334,7 @@
 	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->trackID = gf_bs_read_u32(bs);
 
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *trep_box_new()
@@ -7269,6 +7560,8 @@
 	if (! (ptr->flags & (GF_ISOM_TRUN_DURATION | GF_ISOM_TRUN_SIZE | GF_ISOM_TRUN_FLAGS | GF_ISOM_TRUN_CTS_OFFSET) ) ) {
 		ptr->samples = gf_malloc(sizeof(GF_TrunEntry));
 		if (!ptr->samples) return GF_OUT_OF_MEM;
+		//memset to 0 !!
+		memset(ptr->samples, 0, sizeof(GF_TrunEntry));
 		ptr->sample_alloc = ptr->nb_samples = 1;
 		ptr->samples[0].nb_pack = ptr->sample_count;
 	} else {
@@ -7276,15 +7569,20 @@
 		if (ptr->sample_count * 4 > ptr->size) {
 			ISOM_DECREASE_SIZE(ptr, ptr->sample_count*4);
 		}
+		if ((u64)ptr->sample_count > (u64)SIZE_MAX/sizeof(GF_TrunEntry)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of samples %d in trun\n", ptr->sample_count));
+			return GF_ISOM_INVALID_FILE;
+		}
 		ptr->samples = gf_malloc(sizeof(GF_TrunEntry) * ptr->sample_count);
 		if (!ptr->samples) return GF_OUT_OF_MEM;
 		ptr->sample_alloc = ptr->nb_samples = ptr->sample_count;
+		//memset to 0 upfront
+		memset(ptr->samples, 0, ptr->sample_count * sizeof(GF_TrunEntry));
 
 		//read each entry (even though nothing may be written)
 		for (i=0; i<ptr->sample_count; i++) {
 			u32 trun_size = 0;
 			GF_TrunEntry *p = &ptr->samples[i];
-			memset(p, 0, sizeof(GF_TrunEntry));
 
 			if (ptr->flags & GF_ISOM_TRUN_DURATION) {
 				p->Duration = gf_bs_read_u32(bs);
@@ -7759,7 +8057,7 @@
 	return NULL;
 }
 
-GF_Err udta_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err udta_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_Err e;
 	u32 box_type;
@@ -7780,6 +8078,8 @@
 
 	map = udta_getEntry(ptr, box_type, (a->type==GF_ISOM_BOX_TYPE_UUID) ? & ((GF_UUIDBox *)a)->uuid : NULL);
 	if (map == NULL) {
+		if (is_rem) return GF_OK;
+
 		map = (GF_UserDataMap *) gf_malloc(sizeof(GF_UserDataMap));
 		if (map == NULL) return GF_OUT_OF_MEM;
 		memset(map, 0, sizeof(GF_UserDataMap));
@@ -7795,13 +8095,17 @@
 		e = gf_list_add(ptr->recordList, map);
 		if (e) return e;
 	}
+	if (is_rem) {
+		gf_list_del_item(map->boxes, a);
+		return GF_OK;
+	}
 	return gf_list_add(map->boxes, a);
 }
 
 
 GF_Err udta_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e = gf_isom_box_array_read(s, bs, udta_on_child_box);
+	GF_Err e = gf_isom_box_array_read(s, bs);
 	if (e) return e;
 	if (s->size==4) {
 		u32 val = gf_bs_read_u32(bs);
@@ -8139,9 +8443,9 @@
 	ptr->cleanApertureWidthD = gf_bs_read_u32(bs);
 	ptr->cleanApertureHeightN = gf_bs_read_u32(bs);
 	ptr->cleanApertureHeightD = gf_bs_read_u32(bs);
-	ptr->horizOffN = gf_bs_read_u32(bs);
+	ptr->horizOffN = (s32) gf_bs_read_u32(bs);
 	ptr->horizOffD = gf_bs_read_u32(bs);
-	ptr->vertOffN = gf_bs_read_u32(bs);
+	ptr->vertOffN = (s32) gf_bs_read_u32(bs);
 	ptr->vertOffD = gf_bs_read_u32(bs);
 	return GF_OK;
 }
@@ -8158,9 +8462,9 @@
 	gf_bs_write_u32(bs, ptr->cleanApertureWidthD);
 	gf_bs_write_u32(bs, ptr->cleanApertureHeightN);
 	gf_bs_write_u32(bs, ptr->cleanApertureHeightD);
-	gf_bs_write_u32(bs, ptr->horizOffN);
+	gf_bs_write_u32(bs, (u32) ptr->horizOffN);
 	gf_bs_write_u32(bs, ptr->horizOffD);
-	gf_bs_write_u32(bs, ptr->vertOffN);
+	gf_bs_write_u32(bs, (u32) ptr->vertOffN);
 	gf_bs_write_u32(bs, ptr->vertOffD);
 	return GF_OK;
 }
@@ -8199,16 +8503,13 @@
 }
 
 
-GF_Err metx_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err metx_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MetaDataSampleEntryBox *ptr = (GF_MetaDataSampleEntryBox *)s;
 	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_SINF:
-		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TXTC:
 		//we allow the config box on metx
-		if (ptr->config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->config = (GF_TextConfigBox *)a;
+		BOX_FIELD_ASSIGN(config, GF_TextConfigBox)
 		break;
 	}
 	return GF_OK;
@@ -8306,7 +8607,7 @@
 	}
 	ptr->size = size;
 	gf_free(str);
-	return gf_isom_box_array_read(s, bs, metx_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 
@@ -8415,6 +8716,10 @@
 GF_Err txtc_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TextConfigBox *ptr = (GF_TextConfigBox*)s;
+	if ((u32)ptr->size >= (u32)0xFFFFFFFF) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid size %llu in txtc box\n", ptr->size));
+		return GF_ISOM_INVALID_FILE;
+	}
 	ptr->config = (char *)gf_malloc(sizeof(char)*((u32) ptr->size+1));
 	if (!ptr->config) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, ptr->config, (u32) ptr->size);
@@ -8467,13 +8772,12 @@
 	gf_free(ptr);
 }
 
-GF_Err gf_isom_ac3_config_parse_bs(GF_BitStream *bs, Bool is_ec3, GF_AC3Config *cfg);
 
 GF_Err dac3_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_AC3ConfigBox *ptr = (GF_AC3ConfigBox *)s;
 	if (ptr == NULL) return GF_BAD_PARAM;
-	return gf_isom_ac3_config_parse_bs(bs, ptr->cfg.is_ec3, &ptr->cfg);
+	return gf_odf_ac3_config_parse_bs(bs, ptr->cfg.is_ec3, &ptr->cfg);
 }
 
 
@@ -8488,35 +8792,8 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (ptr->cfg.is_ec3) s->type = GF_ISOM_BOX_TYPE_DAC3;
 	if (e) return e;
-
-	if (ptr->cfg.is_ec3) {
-		u32 i;
-		gf_bs_write_int(bs, ptr->cfg.brcode, 13);
-		gf_bs_write_int(bs, ptr->cfg.nb_streams - 1, 3);
-		for (i=0; i<ptr->cfg.nb_streams; i++) {
-			gf_bs_write_int(bs, ptr->cfg.streams[i].fscod, 2);
-			gf_bs_write_int(bs, ptr->cfg.streams[i].bsid, 5);
-			gf_bs_write_int(bs, ptr->cfg.streams[i].bsmod, 5);
-			gf_bs_write_int(bs, ptr->cfg.streams[i].acmod, 3);
-			gf_bs_write_int(bs, ptr->cfg.streams[i].lfon, 1);
-			gf_bs_write_int(bs, 0, 3);
-			gf_bs_write_int(bs, ptr->cfg.streams[i].nb_dep_sub, 4);
-			if (ptr->cfg.streams[i].nb_dep_sub) {
-				gf_bs_write_int(bs, ptr->cfg.streams[i].chan_loc, 9);
-			} else {
-				gf_bs_write_int(bs, 0, 1);
-			}
-		}
-	} else {
-		gf_bs_write_int(bs, ptr->cfg.streams[0].fscod, 2);
-		gf_bs_write_int(bs, ptr->cfg.streams[0].bsid, 5);
-		gf_bs_write_int(bs, ptr->cfg.streams[0].bsmod, 3);
-		gf_bs_write_int(bs, ptr->cfg.streams[0].acmod, 3);
-		gf_bs_write_int(bs, ptr->cfg.streams[0].lfon, 1);
-		gf_bs_write_int(bs, ptr->cfg.brcode, 5);
-		gf_bs_write_int(bs, 0, 5);
-	}
-	return GF_OK;
+	
+	return gf_odf_ac3_cfg_write_bs(&ptr->cfg, bs);
 }
 
 GF_Err dac3_box_size(GF_Box *s)
@@ -8598,17 +8875,15 @@
 	gf_free(ptr);
 }
 
-GF_Err lsr1_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err lsr1_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_LASeRSampleEntryBox *ptr = (GF_LASeRSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_LSRC:
-		if (ptr->lsr_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->lsr_config = (GF_LASERConfigurationBox *)a;
+		BOX_FIELD_ASSIGN(lsr_config, GF_LASERConfigurationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_M4DS:
-		if (ptr->descr) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->descr = (GF_MPEG4ExtensionDescriptorsBox *)a;
+		BOX_FIELD_ASSIGN(descr, GF_MPEG4ExtensionDescriptorsBox)
 		break;
 	}
 	return GF_OK;
@@ -8624,7 +8899,7 @@
 
 	ISOM_DECREASE_SIZE(ptr, 8);
 
-	return gf_isom_box_array_read(s, bs, lsr1_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *lsr1_box_new()
@@ -8786,9 +9061,10 @@
 	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->subsegment_count = gf_bs_read_u32(bs);
 	//each subseg has at least one range_count (4 bytes), abort if not enough bytes (broken box)
-	if (ptr->size < ptr->subsegment_count*4)
+	if (ptr->size / 4 < ptr->subsegment_count || (u64)ptr->subsegment_count > (u64)SIZE_MAX/sizeof(GF_SubsegmentInfo))
 		return GF_ISOM_INVALID_FILE;
 
+	ptr->subsegment_alloc = ptr->subsegment_count;
 	GF_SAFE_ALLOC_N(ptr->subsegments, ptr->subsegment_count, GF_SubsegmentInfo);
 	if (!ptr->subsegments)
 	 return GF_OUT_OF_MEM;
@@ -8797,7 +9073,7 @@
 		ISOM_DECREASE_SIZE(ptr, 4)
 		subseg->range_count = gf_bs_read_u32(bs);
 		//each range is 4 bytes, abort if not enough bytes
-		if (ptr->size < subseg->range_count*4)
+		if (ptr->size / 4 < subseg->range_count || (u64)subseg->range_count > (u64)SIZE_MAX/sizeof(GF_SubsegmentRangeInfo))
 			return GF_ISOM_INVALID_FILE;
 		subseg->ranges = (GF_SubsegmentRangeInfo*) gf_malloc(sizeof(GF_SubsegmentRangeInfo) * subseg->range_count);
 		if (!subseg->ranges) return GF_OUT_OF_MEM;
@@ -8869,7 +9145,7 @@
 	ISOM_DECREASE_SIZE(ptr, 1)
 	ptr->level_count = gf_bs_read_u8(bs);
 	//each level is at least 5 bytes
-	if (ptr->size < ptr->level_count * 5)
+	if (ptr->size / 5 < ptr->level_count)
 		return GF_ISOM_INVALID_FILE;
 
 	GF_SAFE_ALLOC_N(ptr->levels, ptr->level_count, GF_LevelAssignment);
@@ -8979,6 +9255,11 @@
 	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->subsegment_count = gf_bs_read_u32(bs);
 
+	if ((u64)ptr->subsegment_count > ptr->size / 8 || (u64)ptr->subsegment_count > (u64)SIZE_MAX/sizeof(u64)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of subsegment %d in pcrb\n", ptr->subsegment_count));
+		return GF_ISOM_INVALID_FILE;
+	}
+
 	ptr->pcr_values = gf_malloc(sizeof(u64)*ptr->subsegment_count);
 	if (!ptr->pcr_values) return GF_OUT_OF_MEM;
 	for (i=0; i<ptr->subsegment_count; i++) {
@@ -9210,8 +9491,8 @@
 {
 	GF_TFBaseMediaDecodeTimeBox *ptr = (GF_TFBaseMediaDecodeTimeBox *)s;
 
-	if (ptr->baseMediaDecodeTime<=0xFFFFFFFF) {
-		ptr->version = 0;
+	if (!ptr->version && (ptr->baseMediaDecodeTime<=0xFFFFFFFF)) {
+		//ptr->version = 0;
 		ptr->size += 4;
 	} else {
 		ptr->version = 1;
@@ -9303,7 +9584,7 @@
 	}
 	ptr->entry_count = gf_bs_read_u32(bs);
 
-	if (ptr->size < sizeof(GF_SampleGroupEntry)*ptr->entry_count)
+	if (ptr->size < sizeof(GF_SampleGroupEntry)*ptr->entry_count || (u64)ptr->entry_count > (u64)SIZE_MAX/sizeof(GF_SampleGroupEntry))
 	 return GF_ISOM_INVALID_FILE;
 
 	ptr->sample_entries = gf_malloc(sizeof(GF_SampleGroupEntry)*ptr->entry_count);
@@ -9352,7 +9633,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-static void *sgpd_parse_entry(u32 grouping_type, GF_BitStream *bs, u32 entry_size, u32 *total_bytes)
+static void *sgpd_parse_entry(u32 grouping_type, GF_BitStream *bs, s32 bytes_in_box, u32 entry_size, u32 *total_bytes)
 {
 	Bool null_size_ok = GF_FALSE;
 	GF_DefaultSampleGroupDescriptionEntry *def_ptr;
@@ -9412,25 +9693,95 @@
 	case GF_ISOM_SAMPLE_GROUP_SEIG:
 	{
 		GF_CENCSampleEncryptionGroupEntry *ptr;
+		if (bytes_in_box<3) return NULL;
 		GF_SAFEALLOC(ptr, GF_CENCSampleEncryptionGroupEntry);
 		if (!ptr) return NULL;
-		gf_bs_read_u8(bs); //reserved
+		Bool use_mkey = gf_bs_read_int(bs, 1);
+		gf_bs_read_int(bs, 7); //reserved
 		ptr->crypt_byte_block = gf_bs_read_int(bs, 4);
 		ptr->skip_byte_block = gf_bs_read_int(bs, 4);
 		ptr->IsProtected = gf_bs_read_u8(bs);
-		ptr->Per_Sample_IV_size = gf_bs_read_u8(bs);
-		gf_bs_read_data(bs, (char *)ptr->KID, 16);
-		*total_bytes = 20;
-		if ((ptr->IsProtected == 1) && !ptr->Per_Sample_IV_size) {
-			ptr->constant_IV_size = gf_bs_read_u8(bs);
-			if ((ptr->constant_IV_size != 8) && (ptr->constant_IV_size != 16)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] seig sample group have invalid constant_IV size\n"));
+		bytes_in_box -= 3;
+		if (use_mkey) {
+			u64 pos = gf_bs_get_position(bs);
+			u32 i, count = gf_bs_read_u16(bs);
+			bytes_in_box -= 2;
+			if (bytes_in_box<0) {
+				gf_free(ptr);
+				return NULL;
+			}
+			for (i=0; i<count; i++) {
+				u8 ivsize = gf_bs_read_u8(bs);
+				gf_bs_skip_bytes(bs, 16);
+				bytes_in_box -= 17;
+				if (!ivsize) {
+					//const IV
+					ivsize = gf_bs_read_u8(bs);
+					gf_bs_skip_bytes(bs, ivsize);
+					bytes_in_box -= 1 + ivsize;
+				}
+				if (bytes_in_box<0) {
+					gf_free(ptr);
+					return NULL;
+				}
+			}
+			ptr->key_info_size = 1 + (u32) (gf_bs_get_position(bs) - pos);
+			ptr->key_info = gf_malloc(sizeof(u8) * ptr->key_info_size);
+			if (!ptr->key_info) {
 				gf_free(ptr);
 				return NULL;
 			}
-			gf_bs_read_data(bs, (char *)ptr->constant_IV, ptr->constant_IV_size);
-			*total_bytes += 1 + ptr->constant_IV_size;
+			gf_bs_seek(bs, pos);
+			ptr->key_info[0] = 1;
+			gf_bs_read_data(bs, ptr->key_info + 1, ptr->key_info_size - 1);
+			*total_bytes = 3 + ptr->key_info_size - 1;
+
+			if (!gf_cenc_validate_key_info(ptr->key_info, ptr->key_info_size)) {
+				gf_free(ptr->key_info);
+				gf_free(ptr);
+				return NULL;
+			}
+		} else {
+			bin128 kid;
+			u8 const_iv_size = 0;
+			u8 iv_size = gf_bs_read_u8(bs);
+			gf_bs_read_data(bs, kid, 16);
+			bytes_in_box -= 17;
+			if (bytes_in_box<0) {
+				gf_free(ptr);
+				return NULL;
+			}
+
+			*total_bytes = 20;
+			if ((ptr->IsProtected == 1) && !iv_size) {
+				const_iv_size = gf_bs_read_u8(bs);
+				if ((const_iv_size != 8) && (const_iv_size != 16)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] seig sample group have invalid constant_IV size\n"));
+					gf_free(ptr);
+					return NULL;
+				}
+			}
+			ptr->key_info_size = 20;
+			if (!iv_size && ptr->IsProtected) {
+				ptr->key_info_size += 1 + const_iv_size;
+			}
+			ptr->key_info = gf_malloc(sizeof(u8) * ptr->key_info_size);
+			if (!ptr->key_info) {
+				gf_free(ptr);
+				return NULL;
+			}
+			ptr->key_info[0] = 0;
+			ptr->key_info[1] = 0;
+			ptr->key_info[2] = 0;
+			ptr->key_info[3] = iv_size;
+			memcpy(ptr->key_info+4, kid, 16);
+			if (!iv_size && ptr->IsProtected) {
+				ptr->key_info[20] = const_iv_size;
+				gf_bs_read_data(bs, (char *)ptr->key_info+21, const_iv_size);
+				*total_bytes += 1 + const_iv_size;
+			}
 		}
+
 		if (!entry_size) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] seig sample group does not indicate entry size, deprecated in spec\n"));
 		}
@@ -9503,6 +9854,59 @@
 	case GF_ISOM_SAMPLE_GROUP_LBLI:
 		entry_size = 2;
 		break;
+	case GF_ISOM_SAMPLE_GROUP_SPOR:
+	{
+		u32 i;
+		GF_SubpictureOrderEntry *ptr;
+		GF_SAFEALLOC(ptr, GF_SubpictureOrderEntry);
+		if (!ptr) return NULL;
+		ptr->subpic_id_info_flag = gf_bs_read_int(bs, 1);
+		ptr->num_subpic_ref_idx = gf_bs_read_int(bs, 15);
+		*total_bytes = 2;
+		ptr->subp_track_ref_idx = gf_malloc(sizeof(u16) * ptr->num_subpic_ref_idx);
+		if (!ptr->subp_track_ref_idx) {
+			gf_free(ptr);
+			return NULL;
+		}
+		for (i=0; i<ptr->num_subpic_ref_idx; i++) {
+			ptr->subp_track_ref_idx[i] = gf_bs_read_u16(bs);
+			*total_bytes += 2;
+		}
+		if (ptr->subpic_id_info_flag) {
+			ptr->spinfo.subpic_id_len_minus1 = gf_bs_read_int(bs, 4);
+			ptr->spinfo.subpic_id_bit_pos = gf_bs_read_int(bs, 12);
+			ptr->spinfo.start_code_emul_flag = gf_bs_read_int(bs, 1);
+			ptr->spinfo.pps_sps_subpic_id_flag = gf_bs_read_int(bs, 1);
+			if (ptr->spinfo.pps_sps_subpic_id_flag) {
+				ptr->spinfo.xps_id = gf_bs_read_int(bs, 6);
+			} else {
+				ptr->spinfo.xps_id = gf_bs_read_int(bs, 4);
+				gf_bs_read_int(bs, 2);
+			}
+			*total_bytes += 3;
+		}
+		return ptr;
+	}
+	case GF_ISOM_SAMPLE_GROUP_SULM:
+	{
+		u32 i;
+		GF_SubpictureLayoutMapEntry *ptr;
+		GF_SAFEALLOC(ptr, GF_SubpictureLayoutMapEntry);
+		if (!ptr) return NULL;
+		ptr->groupID_info_4cc = gf_bs_read_u32(bs);
+		ptr->nb_entries = 1 + gf_bs_read_u16(bs);
+		*total_bytes = 6;
+		ptr->groupIDs = gf_malloc(sizeof(u16) * ptr->nb_entries);
+		if (!ptr->groupIDs) {
+			gf_free(ptr);
+			return NULL;
+		}
+		for (i=0; i<ptr->nb_entries; i++) {
+			ptr->groupIDs[i] = gf_bs_read_u16(bs);
+			*total_bytes += 2;
+		}
+		return ptr;
+	}
 	default:
 		break;
 	}
@@ -9526,24 +9930,46 @@
 	return def_ptr;
 }
 
-static void	sgpd_del_entry(u32 grouping_type, void *entry)
+void sgpd_del_entry(u32 grouping_type, void *entry)
 {
 	switch (grouping_type) {
 	case GF_ISOM_SAMPLE_GROUP_SYNC:
 	case GF_ISOM_SAMPLE_GROUP_ROLL:
 	case GF_ISOM_SAMPLE_GROUP_PROL:
 	case GF_ISOM_SAMPLE_GROUP_RAP:
-	case GF_ISOM_SAMPLE_GROUP_SEIG:
 	case GF_ISOM_SAMPLE_GROUP_TELE:
 	case GF_ISOM_SAMPLE_GROUP_SAP:
 		gf_free(entry);
 		return;
+	case GF_ISOM_SAMPLE_GROUP_SEIG:
+	{
+		GF_CENCSampleEncryptionGroupEntry *seig = (GF_CENCSampleEncryptionGroupEntry *)entry;
+		if (seig->key_info) gf_free(seig->key_info);
+		gf_free(entry);
+	}
+		return;
 	case GF_ISOM_SAMPLE_GROUP_OINF:
 		gf_isom_oinf_del_entry(entry);
 		return;
 	case GF_ISOM_SAMPLE_GROUP_LINF:
 		gf_isom_linf_del_entry(entry);
 		return;
+	case GF_ISOM_SAMPLE_GROUP_SPOR:
+	{
+		GF_SubpictureOrderEntry *spor = (GF_SubpictureOrderEntry *)entry;
+		if (spor->subp_track_ref_idx) gf_free(spor->subp_track_ref_idx);
+		gf_free(spor);
+	}
+		return;
+
+	case GF_ISOM_SAMPLE_GROUP_SULM:
+	{
+		GF_SubpictureLayoutMapEntry *sulm = (GF_SubpictureLayoutMapEntry *) entry;
+		if (sulm->groupIDs) gf_free(sulm->groupIDs);
+		gf_free(sulm);
+		return;
+	}
+
 	default:
 	{
 		GF_DefaultSampleGroupDescriptionEntry *ptr = (GF_DefaultSampleGroupDescriptionEntry *)entry;
@@ -9578,16 +10004,26 @@
 		gf_bs_write_int(bs, 0, 7);
 		return;
 	case GF_ISOM_SAMPLE_GROUP_SEIG:
-		gf_bs_write_u8(bs, 0x0);
-		gf_bs_write_int(bs, ((GF_CENCSampleEncryptionGroupEntry*)entry)->crypt_byte_block, 4);
-		gf_bs_write_int(bs, ((GF_CENCSampleEncryptionGroupEntry*)entry)->skip_byte_block, 4);
-		gf_bs_write_u8(bs, ((GF_CENCSampleEncryptionGroupEntry *)entry)->IsProtected);
-		gf_bs_write_u8(bs, ((GF_CENCSampleEncryptionGroupEntry *)entry)->Per_Sample_IV_size);
-		gf_bs_write_data(bs, (char *)((GF_CENCSampleEncryptionGroupEntry *)entry)->KID, 16);
-		if ((((GF_CENCSampleEncryptionGroupEntry *)entry)->IsProtected == 1) && !((GF_CENCSampleEncryptionGroupEntry *)entry)->Per_Sample_IV_size) {
-			gf_bs_write_u8(bs, ((GF_CENCSampleEncryptionGroupEntry *)entry)->constant_IV_size);
-			gf_bs_write_data(bs, (char *)((GF_CENCSampleEncryptionGroupEntry *)entry)->constant_IV, ((GF_CENCSampleEncryptionGroupEntry *)entry)->constant_IV_size);
+	{
+		GF_CENCSampleEncryptionGroupEntry *seig = (GF_CENCSampleEncryptionGroupEntry *)entry;
+		Bool use_mkey = seig->key_info[0];
+		u32 nb_keys = 1;
+		if (use_mkey) {
+			nb_keys = seig->key_info[1];
+			nb_keys<<=8;
+			nb_keys |= seig->key_info[2];
 		}
+		gf_bs_write_int(bs, use_mkey ? 1 : 0, 1);
+		gf_bs_write_int(bs, 0, 7);
+		gf_bs_write_int(bs, seig->crypt_byte_block, 4);
+		gf_bs_write_int(bs, seig->skip_byte_block, 4);
+		gf_bs_write_u8(bs, seig->IsProtected);
+		if (nb_keys>1) {
+			gf_bs_write_data(bs, seig->key_info+1, seig->key_info_size-1);
+		} else {
+			gf_bs_write_data(bs, seig->key_info+3, seig->key_info_size - 3);
+		}
+	}
 		return;
 	case GF_ISOM_SAMPLE_GROUP_OINF:
 		gf_isom_oinf_write_entry(entry, bs);
@@ -9595,6 +10031,43 @@
 	case GF_ISOM_SAMPLE_GROUP_LINF:
 		gf_isom_linf_write_entry(entry, bs);
 		return;
+
+	case GF_ISOM_SAMPLE_GROUP_SPOR:
+	{
+		u32 i;
+		GF_SubpictureOrderEntry *spor = (GF_SubpictureOrderEntry *) entry;
+		gf_bs_write_int(bs, spor->subpic_id_info_flag, 1);
+		gf_bs_write_int(bs, spor->num_subpic_ref_idx, 15);
+		for (i=0; i<spor->num_subpic_ref_idx; i++) {
+			gf_bs_write_u16(bs, spor->subp_track_ref_idx[i]);
+		}
+		if (spor->subpic_id_info_flag) {
+			gf_bs_write_int(bs, spor->spinfo.subpic_id_len_minus1, 4);
+			gf_bs_write_int(bs, spor->spinfo.subpic_id_bit_pos, 12);
+			gf_bs_write_int(bs, spor->spinfo.start_code_emul_flag, 1);
+			gf_bs_write_int(bs, spor->spinfo.pps_sps_subpic_id_flag, 1);
+			if (spor->spinfo.pps_sps_subpic_id_flag) {
+				gf_bs_write_int(bs, spor->spinfo.xps_id, 6);
+			} else {
+				gf_bs_write_int(bs, spor->spinfo.xps_id, 4);
+				gf_bs_write_int(bs, 0, 2);
+			}
+		}
+		return;
+	}
+
+	case GF_ISOM_SAMPLE_GROUP_SULM:
+	{
+		u32 i;
+		GF_SubpictureLayoutMapEntry *sulm = (GF_SubpictureLayoutMapEntry *) entry;
+		gf_bs_write_u32(bs, sulm->groupID_info_4cc);
+		gf_bs_write_u16(bs, sulm->nb_entries - 1);
+		for (i=0; i<sulm->nb_entries; i++) {
+			gf_bs_write_u16(bs, sulm->groupIDs[i]);
+		}
+		return;
+	}
+
 	default:
 	{
 		GF_DefaultSampleGroupDescriptionEntry *ptr = (GF_DefaultSampleGroupDescriptionEntry *)entry;
@@ -9624,11 +10097,33 @@
 	case GF_ISOM_SAMPLE_GROUP_STSA:
 		return 0;
 	case GF_ISOM_SAMPLE_GROUP_SEIG:
-		return ((((GF_CENCSampleEncryptionGroupEntry *)entry)->IsProtected == 1) && !((GF_CENCSampleEncryptionGroupEntry *)entry)->Per_Sample_IV_size) ? 21 + ((GF_CENCSampleEncryptionGroupEntry *)entry)->constant_IV_size : 20;
+	{
+		GF_CENCSampleEncryptionGroupEntry *seig = (GF_CENCSampleEncryptionGroupEntry *)entry;
+		Bool use_mkey = seig->key_info[0] ? GF_TRUE : GF_FALSE;
+		if (use_mkey) {
+			return 3 + seig->key_info_size-1;
+		}
+		return seig->key_info_size; //== 3 + (seig->key_info_size-3);
+	}
 	case GF_ISOM_SAMPLE_GROUP_OINF:
 		return gf_isom_oinf_size_entry(entry);
 	case GF_ISOM_SAMPLE_GROUP_LINF:
 		return gf_isom_linf_size_entry(entry);
+	case GF_ISOM_SAMPLE_GROUP_SPOR:
+	{
+		GF_SubpictureOrderEntry *spor = (GF_SubpictureOrderEntry *)entry;
+		u32 s = 2 + 2*spor->num_subpic_ref_idx;
+		if (spor->subpic_id_info_flag) {
+			s += 3;
+		}
+		return s;
+	}
+	case GF_ISOM_SAMPLE_GROUP_SULM:
+	{
+		GF_SubpictureLayoutMapEntry *sulm = (GF_SubpictureLayoutMapEntry *) entry;
+		return 6 + 2*sulm->nb_entries;
+	}
+
 	default:
 		return ((GF_DefaultSampleGroupDescriptionEntry *)entry)->length;
 	}
@@ -9685,13 +10180,12 @@
 			size = gf_bs_read_u32(bs);
 			ISOM_DECREASE_SIZE(p, 4);
 		}
-		ptr = sgpd_parse_entry(p->grouping_type, bs, size, &parsed_bytes);
+		ptr = sgpd_parse_entry(p->grouping_type, bs, (s32) p->size, size, &parsed_bytes);
 		//don't return an error, just stop parsing so that we skip over the sgpd box
 		if (!ptr) return GF_OK;
+		gf_list_add(p->group_descriptions, ptr);
 
 		ISOM_DECREASE_SIZE(p, parsed_bytes);
-
-		gf_list_add(p->group_descriptions, ptr);
 		entry_count--;
 	}
 	return GF_OK;
@@ -9700,7 +10194,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_Err sgpd_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	u32 i;
+	u32 i, nb_descs;
 	GF_SampleGroupDescriptionBox *p = (GF_SampleGroupDescriptionBox *)s;
 	GF_Err e;
 	e = gf_isom_full_box_write(s, bs);
@@ -9709,9 +10203,10 @@
 	gf_bs_write_u32(bs, p->grouping_type);
 	if (p->version>=1) gf_bs_write_u32(bs, p->default_length);
 	if (p->version>=2) gf_bs_write_u32(bs, p->default_description_index);
-	gf_bs_write_u32(bs, gf_list_count(p->group_descriptions) );
+	nb_descs = gf_list_count(p->group_descriptions);
+	gf_bs_write_u32(bs, nb_descs);
 
-	for (i=0; i<gf_list_count(p->group_descriptions); i++) {
+	for (i=0; i<nb_descs; i++) {
 		void *ptr = gf_list_get(p->group_descriptions, i);
 		if ((p->version >= 1) && !p->default_length) {
 			u32 size = sgpd_size_entry(p->grouping_type, ptr);
@@ -9724,30 +10219,35 @@
 
 GF_Err sgpd_box_size(GF_Box *s)
 {
-	u32 i;
+	u32 i, nb_descs;
+	Bool use_def_size = GF_TRUE;
 	GF_SampleGroupDescriptionBox *p = (GF_SampleGroupDescriptionBox *)s;
 
 	p->size += 8;
 
 	//we force all sample groups to version 1, v0 being deprecated
-	p->version=1;
+	if (!p->version)
+		p->version = 1;
 	p->size += 4;
 
-	if (p->version>=2) p->size += 4;
+	if (p->version>=2)
+		p->size += 4;
 	p->default_length = 0;
 
-	for (i=0; i<gf_list_count(p->group_descriptions); i++) {
+	nb_descs = gf_list_count(p->group_descriptions);
+	for (i=0; i<nb_descs; i++) {
 		void *ptr = gf_list_get(p->group_descriptions, i);
 		u32 size = sgpd_size_entry(p->grouping_type, ptr);
 		p->size += size;
-		if (!p->default_length) {
+		if (use_def_size && !p->default_length) {
 			p->default_length = size;
 		} else if (p->default_length != size) {
+			use_def_size = GF_FALSE;
 			p->default_length = 0;
 		}
 	}
 	if (p->version>=1) {
-		if (!p->default_length) p->size += gf_list_count(p->group_descriptions)*4;
+		if (!p->default_length) p->size += nb_descs * 4;
 	}
 	return GF_OK;
 }
@@ -9777,7 +10277,7 @@
 	ptr->sample_count = gf_bs_read_u32(bs);
 
 	if (ptr->default_sample_info_size == 0) {
-		if (ptr->size < sizeof(u8)*ptr->sample_count)
+		if (ptr->size < ptr->sample_count)
 		 return GF_ISOM_INVALID_FILE;
 
 		ptr->sample_info_size = gf_malloc(sizeof(u8)*ptr->sample_count);
@@ -9860,7 +10360,7 @@
 
 	if (ptr->entry_count) {
 		u32 i;
-		if (ptr->size < (ptr->version == 0 ? 4 : 8) * ptr->entry_count)
+		if (ptr->size / (ptr->version == 0 ? 4 : 8) < ptr->entry_count || (u64)ptr->entry_count > (u64)SIZE_MAX/sizeof(u64))
 			return GF_ISOM_INVALID_FILE;
 		ptr->offsets = gf_malloc(sizeof(u64)*ptr->entry_count);
 		if (!ptr->offsets)
@@ -9904,6 +10404,18 @@
 	gf_bs_write_u32(bs, ptr->entry_count);
 	if (ptr->entry_count) {
 		u32 i;
+		if (ptr->sai_data) {
+			if (ptr->sai_data->sai_offset) {
+				if (ptr->version==0) {
+					gf_bs_write_u32(bs, (u32) ptr->sai_data->sai_offset);
+				} else {
+					gf_bs_write_u64(bs, ptr->sai_data->sai_offset);
+				}
+				return GF_OK;
+			}
+			ptr->sai_data->saio_box = ptr;
+		}
+
 		//store position in bitstream before writing data - offsets can be NULL if a single offset is rewritten later on (cf senc_box_write)
 		ptr->offset_first_offset_field = gf_bs_get_position(bs);
 		if (ptr->version==0) {
@@ -10031,16 +10543,18 @@
 }
 
 
-GF_Err trgr_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err trgr_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_TrackGroupBox *ptr = (GF_TrackGroupBox *)s;
+
+	BOX_FIELD_LIST_ASSIGN(groups)
 	return gf_list_add(ptr->groups, a);
 }
 
 
 GF_Err trgr_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, trgr_on_child_box, s->type);
+	return gf_isom_box_array_read_ex(s, bs, s->type);
 }
 
 
@@ -10191,20 +10705,18 @@
 }
 
 
-GF_Err fiin_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err fiin_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	FDItemInformationBox *ptr = (FDItemInformationBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_PAEN:
-		if (!ptr->partition_entries) ptr->partition_entries = gf_list_new();
-		return gf_list_add(ptr->partition_entries, a);
+		BOX_FIELD_LIST_ASSIGN(partition_entries)
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SEGR:
-		if (ptr->session_info) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->session_info = (FDSessionGroupBox *)a;
+		BOX_FIELD_ASSIGN(session_info, FDSessionGroupBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_GITN:
-		if (ptr->group_id_to_name) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->group_id_to_name = (GroupIdToNameBox *)a;
+		BOX_FIELD_ASSIGN(group_id_to_name, GroupIdToNameBox)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -10216,7 +10728,7 @@
 
 	ISOM_DECREASE_SIZE(ptr, 2);
 	gf_bs_read_u16(bs);
-	return gf_isom_box_array_read(s, bs, fiin_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 
@@ -10258,21 +10770,18 @@
 }
 
 
-GF_Err paen_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err paen_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	FDPartitionEntryBox *ptr = (FDPartitionEntryBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_FPAR:
-		if (ptr->blocks_and_symbols) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->blocks_and_symbols = (FilePartitionBox *)a;
+		BOX_FIELD_ASSIGN(blocks_and_symbols, FilePartitionBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_FECR:
-		if (ptr->FEC_symbol_locations) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->FEC_symbol_locations = (FECReservoirBox *)a;
+		BOX_FIELD_ASSIGN(FEC_symbol_locations, FECReservoirBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_FIRE:
-		if (ptr->File_symbol_locations) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->File_symbol_locations = (FileReservoirBox *)a;
+		BOX_FIELD_ASSIGN(File_symbol_locations, FileReservoirBox)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -10280,7 +10789,7 @@
 
 GF_Err paen_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, fiin_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -10324,6 +10833,11 @@
 	*out_str = gf_malloc(sizeof(char)*len);
 	if (! *out_str) return GF_OUT_OF_MEM;
 
+	if (!s->size) {
+		*out_str[0] = 0;
+		return GF_OK;
+	}
+
 	while (1) {
 		ISOM_DECREASE_SIZE(s, 1 );
 		(*out_str)[i] = gf_bs_read_u8(bs);
@@ -10368,7 +10882,7 @@
 
 	ISOM_DECREASE_SIZE(ptr, (ptr->version ? 4 : 2) );
 	ptr->nb_entries = gf_bs_read_int(bs, ptr->version ? 32 : 16);
-	if (ptr->nb_entries > UINT_MAX / 6)
+	if (ptr->nb_entries > ptr->size / 6 || (u64)ptr->nb_entries > (u64)SIZE_MAX/sizeof(FilePartitionEntry))
 		return GF_ISOM_INVALID_FILE;
 
 	ISOM_DECREASE_SIZE(ptr, ptr->nb_entries * 6 );
@@ -10454,6 +10968,11 @@
 	ISOM_DECREASE_SIZE(ptr, (ptr->version ? 4 : 2) );
 	ptr->nb_entries = gf_bs_read_int(bs, ptr->version ? 32 : 16);
 
+	if (ptr->nb_entries > ptr->size / (ptr->version ? 8 : 6) || (u64)ptr->nb_entries > (u64)SIZE_MAX/sizeof(FECReservoirEntry) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in fecr\n", ptr->nb_entries));
+		return GF_ISOM_INVALID_FILE;
+	}
+
 	ISOM_DECREASE_SIZE(ptr, ptr->nb_entries * (ptr->version ? 8 : 6) );
 	GF_SAFE_ALLOC_N(ptr->entries, ptr->nb_entries, FECReservoirEntry);
 	if (!ptr->entries) return GF_OUT_OF_MEM;
@@ -10613,10 +11132,12 @@
 	u32 i;
 	GroupIdToNameBox *ptr = (GroupIdToNameBox *)s;
 	if (ptr == NULL) return;
-	for (i=0; i<ptr->nb_entries; i++) {
-		if (ptr->entries[i].name) gf_free(ptr->entries[i].name);
+	if (ptr->entries) {
+		for (i=0; i<ptr->nb_entries; i++) {
+			if (ptr->entries[i].name) gf_free(ptr->entries[i].name);
+		}
+		gf_free(ptr->entries);
 	}
-	if (ptr->entries) gf_free(ptr->entries);
 	gf_free(ptr);
 }
 
@@ -10628,7 +11149,7 @@
 
 	ISOM_DECREASE_SIZE(ptr, 2);
 	ptr->nb_entries = gf_bs_read_u16(bs);
-	if (ptr->size < ptr->nb_entries*4)
+	if (ptr->size / 4 < ptr->nb_entries)
 		return GF_ISOM_INVALID_FILE;
 
 	GF_SAFE_ALLOC_N(ptr->entries, ptr->nb_entries, GroupIdNameEntry);
@@ -10717,7 +11238,7 @@
 	ptr->info.transport_object_identifier = gf_bs_read_u16(bs);
 	ISOM_DECREASE_SIZE(ptr, 2);
 	ptr->header_ext_count = gf_bs_read_u16(bs);
-	if (ptr->size < ptr->header_ext_count*2) {
+	if (ptr->size / 2 < ptr->header_ext_count) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in fdpa\n", ptr->header_ext_count));
 		return GF_ISOM_INVALID_FILE;
 	}
@@ -10887,23 +11408,22 @@
 	gf_free(ptr);
 }
 
-GF_Err fdsa_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err fdsa_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_HintSample *ptr = (GF_HintSample *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_FDPA:
-		gf_list_add(ptr->packetTable, a);
-		break;
+		BOX_FIELD_LIST_ASSIGN(packetTable)
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_EXTR:
-		if (ptr->extra_data) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->extra_data = (GF_ExtraDataBox*)a;
+		BOX_FIELD_ASSIGN(extra_data, GF_ExtraDataBox)
 		break;
 	}
 	return GF_OK;
 }
 GF_Err fdsa_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, fdsa_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 
@@ -10950,6 +11470,10 @@
 	u32 i;
 	GF_TrickPlayBox *ptr = (GF_TrickPlayBox *) s;
 	ptr->entry_count = (u32) ptr->size;
+	if ((u64)ptr->entry_count > (u64)SIZE_MAX/sizeof(GF_TrickPlayBoxEntry)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid size %llu in trik\n", ptr->size));
+		return GF_ISOM_INVALID_FILE;
+	}
 	ptr->entries = (GF_TrickPlayBoxEntry *) gf_malloc(ptr->entry_count * sizeof(GF_TrickPlayBoxEntry) );
 	if (!ptr->entries) return GF_OUT_OF_MEM;
 
@@ -11005,16 +11529,18 @@
 
 	ISOM_DECREASE_SIZE(s, 256)
 	gf_bs_read_data(bs, (char *) ptr->baseLocation, 256);
+	ptr->baseLocation[256]=0;
 	ISOM_DECREASE_SIZE(s, 256)
 	gf_bs_read_data(bs, (char *) ptr->basePurlLocation, 256);
 	ISOM_DECREASE_SIZE(s, 512)
+	ptr->basePurlLocation[256]=0;
 	gf_bs_skip_bytes(bs, 512);
 	return GF_OK;
 }
 
 GF_Box *bloc_box_new()
 {
-	ISOM_DECL_BOX_ALLOC(GF_BaseLocationBox, GF_ISOM_BOX_TYPE_TRIK);
+	ISOM_DECL_BOX_ALLOC(GF_BaseLocationBox, GF_ISOM_BOX_TYPE_BLOC);
 	return (GF_Box *)tmp;
 }
 
@@ -11155,30 +11681,85 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+void mhap_box_del(GF_Box *s)
+{
+	GF_MHACompatibleProfilesBox *ptr = (GF_MHACompatibleProfilesBox *) s;
+	if (ptr->compat_profiles) gf_free(ptr->compat_profiles);
+	gf_free(s);
+}
+
+GF_Err mhap_box_read(GF_Box *s,GF_BitStream *bs)
+{
+	u32 i;
+	GF_MHACompatibleProfilesBox *ptr = (GF_MHACompatibleProfilesBox *) s;
+
+	ISOM_DECREASE_SIZE(s, 1)
+	ptr->num_profiles = gf_bs_read_u8(bs);
+	if (!ptr->num_profiles) return GF_OK;
+
+	ISOM_DECREASE_SIZE(s, ptr->num_profiles)
+	ptr->compat_profiles = gf_malloc(sizeof(u8) * ptr->num_profiles);
+	if (!ptr->compat_profiles) return GF_OUT_OF_MEM;
+	for (i=0; i<ptr->num_profiles; i++) {
+		ptr->compat_profiles[i] = gf_bs_read_u8(bs);
+	}
+	return GF_OK;
+}
+
+GF_Box *mhap_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_MHACompatibleProfilesBox, GF_ISOM_BOX_TYPE_MHAP);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err mhap_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i;
+	GF_Err e;
+	GF_MHACompatibleProfilesBox *ptr = (GF_MHACompatibleProfilesBox *) s;
+
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, ptr->num_profiles);
+	for (i=0; i<ptr->num_profiles; i++) {
+		gf_bs_write_u8(bs, ptr->compat_profiles[i]);
+	}
+	return GF_OK;
+}
+
+GF_Err mhap_box_size(GF_Box *s)
+{
+	GF_MHACompatibleProfilesBox *ptr = (GF_MHACompatibleProfilesBox *) s;
+	s->size += 1 + ptr->num_profiles;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 
 void jp2h_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err jp2h_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err jp2h_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_J2KHeaderBox *ptr = (GF_J2KHeaderBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_IHDR:
-		if (ptr->ihdr) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->ihdr = (GF_J2KImageHeaderBox*)a;
+		BOX_FIELD_ASSIGN(ihdr, GF_J2KImageHeaderBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_COLR:
-		if (ptr->colr) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->colr = (GF_ColourInformationBox*)a;
+		BOX_FIELD_ASSIGN(colr, GF_ColourInformationBox)
 		return GF_OK;
 	}
 	return GF_OK;
 }
 GF_Err jp2h_box_read(GF_Box *s,GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, jp2h_on_child_box, s->type);
+	return gf_isom_box_array_read_ex(s, bs, s->type);
 }
 
 GF_Box *jp2h_box_new()
@@ -11279,7 +11860,6 @@
 GF_Err dvcC_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
-	u32 data[5];
 	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox *)s;
 
 	//GF_DOVIDecoderConfigurationRecord
@@ -11291,13 +11871,19 @@
 	ptr->DOVIConfig.rpu_present_flag = gf_bs_read_int(bs, 1);
 	ptr->DOVIConfig.el_present_flag = gf_bs_read_int(bs, 1);
 	ptr->DOVIConfig.bl_present_flag = gf_bs_read_int(bs, 1);
-
-	memset(data, 0, sizeof(u32)*5);
-	gf_bs_read_data(bs, (char*)data, 20);
-	for (i = 0; i < 5; ++i) {
-		if (data[i] != 0) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] dvcC reserved bytes are not zero\n"));
-			//return GF_ISOM_INVALID_FILE;
+	ptr->DOVIConfig.dv_bl_signal_compatibility_id = gf_bs_read_int(bs, 4);
+	if (gf_bs_read_int(bs, 28) != 0)
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] dvcC reserved bits are not zero\n"));
+
+	for (i = 0; i < 4; i++) {
+		if (gf_bs_read_u32(bs) != 0) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] dvcC reserved bits are not zero\n"));
+		}
+	}
+	if (ptr->DOVIConfig.dv_profile==8) {
+		if (!ptr->DOVIConfig.dv_bl_signal_compatibility_id || (ptr->DOVIConfig.dv_bl_signal_compatibility_id>2) ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] dvcC profile 8 but compatibility ID %d is not 1 or 2, patching to 2\n", ptr->DOVIConfig.dv_bl_signal_compatibility_id));
+			ptr->DOVIConfig.dv_bl_signal_compatibility_id = 2;
 		}
 	}
 	return GF_OK;
@@ -11321,11 +11907,12 @@
 	gf_bs_write_int(bs, ptr->DOVIConfig.rpu_present_flag, 1);
 	gf_bs_write_int(bs, ptr->DOVIConfig.el_present_flag, 1);
 	gf_bs_write_int(bs, ptr->DOVIConfig.bl_present_flag, 1);
- gf_bs_write_u32(bs, 0);
- gf_bs_write_u32(bs, 0);
- gf_bs_write_u32(bs, 0);
- gf_bs_write_u32(bs, 0);
- gf_bs_write_u32(bs, 0);
+	gf_bs_write_int(bs, ptr->DOVIConfig.dv_bl_signal_compatibility_id, 4);
+	gf_bs_write_int(bs, 0, 28);
+	gf_bs_write_u32(bs, 0);
+	gf_bs_write_u32(bs, 0);
+	gf_bs_write_u32(bs, 0);
+	gf_bs_write_u32(bs, 0);
 
 	return GF_OK;
 }
@@ -11337,7 +11924,38 @@
 	ptr->size += 24;
 	return GF_OK;
 }
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *dvvC_box_new()
+{
+	GF_DOVIConfigurationBox *tmp = (GF_DOVIConfigurationBox *)gf_malloc(sizeof(GF_DOVIConfigurationBox));
+	if (tmp == NULL) return NULL;
+	memset(tmp, 0, sizeof(GF_DOVIConfigurationBox));
+	tmp->type = GF_ISOM_BOX_TYPE_DVVC;
+	return (GF_Box *)tmp;
+}
 
+void dvvC_box_del(GF_Box *s)
+{
+	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox*)s;
+	gf_free(ptr);
+}
+
+GF_Err dvvC_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	return dvcC_box_read(s, bs);
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err dvvC_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	return dvcC_box_write(s, bs);
+}
+
+GF_Err dvvC_box_size(GF_Box *s)
+{
+	return dvcC_box_size(s);
+}
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
@@ -11497,7 +12115,7 @@
 			break;
 		}
 	}
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Box *mvcg_box_new()
@@ -11596,10 +12214,11 @@
 	ptr->min_temporal_id = gf_bs_read_int(bs, 3);
 	ptr->max_temporal_id = gf_bs_read_int(bs, 3);
 	ptr->num_views = gf_bs_read_u16(bs);
-	if (6 * ptr->num_views > ptr->size)
+	if (ptr->num_views > ptr->size / 6)
 		return GF_ISOM_INVALID_FILE;
 
 	ptr->views = gf_malloc(sizeof(ViewIDEntry)*ptr->num_views);
+	memset(ptr->views, 0, sizeof(ViewIDEntry)*ptr->num_views);
 	for (i=0; i<ptr->num_views; i++) {
 		u32 j;
 		ISOM_DECREASE_SIZE(s, 6)
@@ -11615,7 +12234,7 @@
 		ptr->views[i].base_view_type = gf_bs_read_int(bs, 2);
 		ptr->views[i].num_ref_views = gf_bs_read_int(bs, 10);
 
-		if (2 * ptr->views[i].num_ref_views > ptr->size)
+		if (ptr->views[i].num_ref_views > ptr->size / 2)
 			return GF_ISOM_INVALID_FILE;
 
 		ptr->views[i].view_refs = gf_malloc(sizeof(ViewIDRefViewEntry)*ptr->views[i].num_ref_views);
@@ -11937,7 +12556,6 @@
 {
 	GF_EventMessageBox *ptr = (GF_EventMessageBox*) s;
 
-	ptr->size += 4;
 	if (ptr->version) {
 		ptr->size += 20;
 	} else {
@@ -11953,4 +12571,575 @@
 }
 #endif // GPAC_DISABLE_ISOM_WRITE
 
+
+
+
+GF_Box *csgp_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_CompactSampleGroupBox, GF_ISOM_BOX_TYPE_CSGP);
+	return (GF_Box *)tmp;
+}
+void csgp_box_del(GF_Box *a)
+{
+	GF_CompactSampleGroupBox *p = (GF_CompactSampleGroupBox *)a;
+	if (p->patterns) {
+		u32 i;
+		for (i=0; i<p->pattern_count; i++) {
+			gf_free(p->patterns[i].sample_group_description_indices);
+		}
+		gf_free(p->patterns);
+	}
+	gf_free(p);
+}
+
+u32 get_size_by_code(u32 code)
+{
+	if (code==0) return 4;
+	if (code==1) return 8;
+	if (code==2) return 16;
+	return 32;
+}
+GF_Err csgp_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i, bits, gidx_mask;
+	Bool index_msb_indicates_fragment_local_description, grouping_type_parameter_present;
+	u32 pattern_size, scount_size, index_size;
+	GF_CompactSampleGroupBox *ptr = (GF_CompactSampleGroupBox *)s;
+
+	ISOM_DECREASE_SIZE(ptr, 8);
+	ptr->version = gf_bs_read_u8(bs);
+	ptr->flags = gf_bs_read_u24(bs);
+
+	index_msb_indicates_fragment_local_description = (ptr->flags & (1<<7)) ? GF_TRUE : GF_FALSE;
+	grouping_type_parameter_present = (ptr->flags & (1<<6)) ? GF_TRUE : GF_FALSE;
+
+	pattern_size = get_size_by_code( ((ptr->flags>>4) & 0x3) );
+	scount_size = get_size_by_code( ((ptr->flags>>2) & 0x3) );
+	index_size = get_size_by_code( (ptr->flags & 0x3) );
+
+	if (((pattern_size==4) && (scount_size!=4)) || ((pattern_size!=4) && (scount_size==4))) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] compact sample gorup pattern_size and sample_count_size mare not both 4 bits\n"));
+		return GF_ISOM_INVALID_FILE;
+	}
+
+	ptr->grouping_type = gf_bs_read_u32(bs);
+	if (grouping_type_parameter_present) {
+		ISOM_DECREASE_SIZE(ptr, 4);
+		ptr->grouping_type_parameter = gf_bs_read_u32(bs);
+	}
+	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->pattern_count = gf_bs_read_u32(bs);
+
+
+	if ( (ptr->size / ( (pattern_size + scount_size) / 8 ) < ptr->pattern_count) || (u64)ptr->pattern_count > (u64)SIZE_MAX/sizeof(GF_CompactSampleGroupPattern) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] compact sample gorup pattern_count value (%lu) invalid\n", ptr->pattern_count));
+		return GF_ISOM_INVALID_FILE;
+	}
+
+	ptr->patterns = gf_malloc(sizeof(GF_CompactSampleGroupPattern) * ptr->pattern_count);
+	if (!ptr->patterns) return GF_OUT_OF_MEM;
+
+	bits = 0;
+	for (i=0; i<ptr->pattern_count; i++) {
+		ptr->patterns[i].length = gf_bs_read_int(bs, pattern_size);
+		ptr->patterns[i].sample_count = gf_bs_read_int(bs, scount_size);
+		bits += pattern_size + scount_size;
+		if (! (bits % 8)) {
+			bits/=8;
+			ISOM_DECREASE_SIZE(ptr, bits);
+			bits=0;
+		}
+		if ( (u64)ptr->patterns[i].length > (u64)SIZE_MAX/sizeof(u32) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] compact sample gorup pattern #%d value (%lu) invalid\n", i, ptr->patterns[i].length));
+			ptr->patterns[i].sample_group_description_indices = NULL;
+			return GF_ISOM_INVALID_FILE;
+		}
+		ptr->patterns[i].sample_group_description_indices = gf_malloc(sizeof(u32) * ptr->patterns[i].length);
+		if (!ptr->patterns[i].sample_group_description_indices) return GF_OUT_OF_MEM;
+	}
+	bits = 0;
+	gidx_mask = ((u32)1) << (index_size-1);
+	for (i=0; i<ptr->pattern_count; i++) {
+		u32 j;
+		for (j=0; j<ptr->patterns[i].length; j++) {
+			u32 idx = gf_bs_read_int(bs, index_size);
+			if (index_msb_indicates_fragment_local_description) {
+				//MSB set, this is a index of a group described in the fragment
+				if (idx & gidx_mask) {
+					idx += 0x10000;
+					idx &= ~gidx_mask;
+				}
+			}
+			ptr->patterns[i].sample_group_description_indices[j] = idx;
+			bits += index_size;
+
+			if (! (bits % 8)) {
+				bits/=8;
+				ISOM_DECREASE_SIZE(ptr, bits);
+				bits=0;
+			}
+		}
+	}
+	if (bits)
+		gf_bs_align(bs);
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err csgp_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i;
+	GF_Err e;
+	GF_CompactSampleGroupBox *ptr = (GF_CompactSampleGroupBox*)s;
+	u32 pattern_size = get_size_by_code( ((ptr->flags>>4) & 0x3) );
+	u32 scount_size = get_size_by_code( ((ptr->flags>>2) & 0x3) );
+	u32 index_size = get_size_by_code( (ptr->flags & 0x3) );
+
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u8(bs, ptr->version);
+	gf_bs_write_int(bs, ptr->flags, 24);
+	gf_bs_write_u32(bs, ptr->grouping_type);
+
+	if (ptr->flags & (1<<6))
+		gf_bs_write_u32(bs, ptr->grouping_type_parameter);
+
+	gf_bs_write_u32(bs, ptr->pattern_count);
+
+	for (i = 0; i<ptr->pattern_count; i++ ) {
+		gf_bs_write_int(bs, ptr->patterns[i].length, pattern_size);
+		gf_bs_write_int(bs, ptr->patterns[i].sample_count, scount_size);
+	}
+
+	for (i = 0; i<ptr->pattern_count; i++ ) {
+		u32 j;
+		for (j=0; j<ptr->patterns[i].length; j++) {
+			u32 idx = ptr->patterns[i].sample_group_description_indices[j];
+			if (idx > 0x10000) {
+				idx -= 0x10000;
+				gf_bs_write_int(bs, 1, 1);
+				gf_bs_write_int(bs, idx, index_size-1);
+			} else {
+				gf_bs_write_int(bs, idx, index_size);
+			}
+		}
+	}
+	gf_bs_align(bs);
+	return GF_OK;
+}
+
+GF_Err csgp_box_size(GF_Box *s)
+{
+	u32 i, bits;
+	GF_CompactSampleGroupBox *ptr = (GF_CompactSampleGroupBox*)s;
+	u32 pattern_size = get_size_by_code( ((ptr->flags>>4) & 0x3) );
+	u32 scount_size = get_size_by_code( ((ptr->flags>>2) & 0x3) );
+	u32 index_size = get_size_by_code( (ptr->flags & 0x3) );
+
+	ptr->size += 12; //v, flags , grouping_type, pattern_length
+	if (ptr->flags & (1<<6))
+		ptr->size+=4;
+
+	ptr->size += ptr->pattern_count * (pattern_size + scount_size) / 8;
+	bits=0;
+	for (i=0; i<ptr->pattern_count; i++)
+		bits += ptr->patterns[i].length * index_size;
+	ptr->size += bits/8;
+	if (bits % 8) ptr->size++;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *dmlp_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_TrueHDConfigBox, GF_ISOM_BOX_TYPE_DMLP);
+	return (GF_Box *)tmp;
+}
+
+void dmlp_box_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+
+GF_Err dmlp_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_TrueHDConfigBox *ptr = (GF_TrueHDConfigBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 10)
+	ptr->format_info = gf_bs_read_u32(bs);
+	ptr->peak_data_rate = gf_bs_read_int(bs, 15);
+	gf_bs_read_int(bs, 1);
+	gf_bs_read_u32(bs);
+	return GF_OK;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err dmlp_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_TrueHDConfigBox *ptr = (GF_TrueHDConfigBox *)s;
+
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u32(bs, ptr->format_info);
+	gf_bs_write_int(bs, ptr->peak_data_rate, 15);
+	gf_bs_write_int(bs, 0, 1);
+	gf_bs_write_u32(bs, 0);
+	return GF_OK;
+}
+
+GF_Err dmlp_box_size(GF_Box *s)
+{
+	s->size += 10;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *xtra_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_XtraBox, GF_ISOM_BOX_TYPE_XTRA);
+	tmp->tags = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+void xtra_box_del(GF_Box *s)
+{
+	GF_XtraBox *ptr = (GF_XtraBox *)s;
+	while (gf_list_count(ptr->tags)) {
+		GF_XtraTag *tag = gf_list_pop_back(ptr->tags);
+		if (tag->name) gf_free(tag->name);
+		if (tag->prop_value) gf_free(tag->prop_value);
+		gf_free(tag);
+	}
+	gf_list_del(ptr->tags);
+	gf_free(s);
+}
+
+GF_Err xtra_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_XtraBox *ptr = (GF_XtraBox *)s;
+	while (ptr->size) {
+		GF_XtraTag *tag;
+		u32 prop_type = 0;
+
+		char *data=NULL, *data2=NULL;
+		ISOM_DECREASE_SIZE_NO_ERR(ptr, 8)
+		s32 tag_size = gf_bs_read_u32(bs);
+		u32 name_size = gf_bs_read_u32(bs);
+		if (tag_size < 8) return GF_ISOM_INVALID_FILE;
+
+		tag_size -= 8;
+		if ((tag_size>ptr->size) || (name_size>ptr->size)) {
+			return GF_ISOM_INVALID_FILE;
+		}
+		ISOM_DECREASE_SIZE_NO_ERR(ptr, 10)
+
+		ISOM_DECREASE_SIZE_NO_ERR(ptr, name_size)
+		data = gf_malloc(sizeof(char) * (name_size+1));
+		gf_bs_read_data(bs, data, name_size);
+		data[name_size] = 0;
+		tag_size-=name_size;
+
+		u32 flags = gf_bs_read_u32(bs);
+		u32 prop_size = gf_bs_read_u32(bs);
+		tag_size-=8;
+
+		if (prop_size>4) {
+			tag_size-=2;
+			prop_type = gf_bs_read_u16(bs);
+			prop_size -= 6;
+			ISOM_DECREASE_SIZE_NO_ERR(ptr, prop_size)
+			data2 = gf_malloc(sizeof(char) * (prop_size));
+			gf_bs_read_data(bs, data2, prop_size);
+			tag_size-=prop_size;
+		} else {
+			prop_size = 0;
+		}
+		GF_SAFEALLOC(tag, GF_XtraTag)
+		tag->flags = flags;
+		tag->name = data;
+		tag->prop_size = prop_size;
+		tag->prop_value = data2;
+		tag->prop_type = prop_type;
+		gf_list_add(ptr->tags, tag);
+
+		if (tag_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isom] invalid tag size in Xtra !\n"));
+		}
+	}
+	return GF_OK;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err xtra_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_XtraBox *ptr = (GF_XtraBox *)s;
+	u32 i, count = gf_list_count(ptr->tags);
+
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	for (i=0; i<count; i++) {
+		GF_XtraTag *tag = gf_list_get(ptr->tags, i);
+		u32 tag_size = 16;
+		u32 name_len = tag->name ? (u32) strlen(tag->name) : 0;
+		tag_size += name_len;
+		if (tag->prop_value) {
+			tag_size += 2 + tag->prop_size;
+		}
+		gf_bs_write_u32(bs, tag_size);
+		gf_bs_write_u32(bs, name_len);
+		gf_bs_write_data(bs, tag->name, name_len);
+		gf_bs_write_u32(bs, tag->flags);
+		gf_bs_write_u32(bs, 6 + tag->prop_size);
+		gf_bs_write_u16(bs, tag->prop_type);
+		gf_bs_write_data(bs, tag->prop_value, tag->prop_size);
+	}
+	return GF_OK;
+}
+
+GF_Err xtra_box_size(GF_Box *s)
+{
+	GF_XtraBox *ptr = (GF_XtraBox *)s;
+	u32 i, count = gf_list_count(ptr->tags);
+	for (i=0; i<count; i++) {
+		GF_XtraTag *tag = gf_list_get(ptr->tags, i);
+		ptr->size += 18 + (u32) strlen(tag->name) + tag->prop_size;
+	}
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+
+GF_Box *st3d_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_Stereo3DBox, GF_ISOM_BOX_TYPE_ST3D);
+	return (GF_Box *)tmp;
+}
+
+void st3d_box_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+
+GF_Err st3d_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Stereo3DBox *ptr = (GF_Stereo3DBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 1)
+	ptr->stereo_type = gf_bs_read_u8(bs);
+	return GF_OK;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err st3d_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_Stereo3DBox *ptr = (GF_Stereo3DBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, ptr->stereo_type);
+	return GF_OK;
+}
+
+GF_Err st3d_box_size(GF_Box *s)
+{
+	s->size += 1;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+
+GF_Box *svhd_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_SphericalVideoInfoBox, GF_ISOM_BOX_TYPE_SVHD);
+	return (GF_Box *)tmp;
+}
+
+void svhd_box_del(GF_Box *s)
+{
+	GF_SphericalVideoInfoBox *ptr = (GF_SphericalVideoInfoBox *)s;
+	if (ptr->string) gf_free(ptr->string);
+	gf_free(s);
+}
+
+
+GF_Err svhd_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_SphericalVideoInfoBox *ptr = (GF_SphericalVideoInfoBox *)s;
+	if ((u32)ptr->size >= (u32)0xFFFFFFFF) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid size %llu in svhd box\n", ptr->size));
+		return GF_ISOM_INVALID_FILE;
+	}
+	ptr->string = gf_malloc(sizeof(char) * ((u32) ptr->size+1));
+	if (!ptr->string) return GF_OUT_OF_MEM;
+	gf_bs_read_data(bs, ptr->string, (u32) ptr->size);
+	ptr->string[ptr->size] = 0;
+	return GF_OK;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err svhd_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_SphericalVideoInfoBox *ptr = (GF_SphericalVideoInfoBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	if (ptr->string)
+		gf_bs_write_data(bs, ptr->string, (u32) strlen(ptr->string));
+	gf_bs_write_u8(bs, 0);
+	return GF_OK;
+}
+
+GF_Err svhd_box_size(GF_Box *s)
+{
+	GF_SphericalVideoInfoBox *ptr = (GF_SphericalVideoInfoBox *)s;
+	if (ptr->string)
+		s->size += (u32) strlen(ptr->string);
+	s->size += 1;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+GF_Box *prhd_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ProjectionHeaderBox, GF_ISOM_BOX_TYPE_PRHD);
+	return (GF_Box *)tmp;
+}
+
+void prhd_box_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+
+GF_Err prhd_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_ProjectionHeaderBox *ptr = (GF_ProjectionHeaderBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 12)
+	ptr->yaw = (s32) gf_bs_read_u32(bs);
+	ptr->pitch = (s32) gf_bs_read_u32(bs);
+	ptr->roll = (s32) gf_bs_read_u32(bs);
+	return GF_OK;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err prhd_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ProjectionHeaderBox *ptr = (GF_ProjectionHeaderBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u32(bs, ptr->yaw);
+	gf_bs_write_u32(bs, ptr->pitch);
+	gf_bs_write_u32(bs, ptr->roll);
+	return GF_OK;
+}
+
+GF_Err prhd_box_size(GF_Box *s)
+{
+	s->size += 12;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *proj_type_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ProjectionTypeBox, GF_ISOM_BOX_TYPE_EQUI); //will be overwritten
+	return (GF_Box *)tmp;
+}
+
+void proj_type_box_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+GF_Err proj_type_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_ProjectionTypeBox *ptr = (GF_ProjectionTypeBox *)s;
+
+	if (ptr->type==GF_ISOM_BOX_TYPE_CBMP) {
+		ISOM_DECREASE_SIZE(ptr, 8)
+		ptr->layout = gf_bs_read_u32(bs);
+		ptr->padding = gf_bs_read_u32(bs);
+	}
+	else if (ptr->type==GF_ISOM_BOX_TYPE_EQUI) {
+		ISOM_DECREASE_SIZE(ptr, 16)
+		ptr->bounds_top = gf_bs_read_u32(bs);
+		ptr->bounds_bottom = gf_bs_read_u32(bs);
+		ptr->bounds_left = gf_bs_read_u32(bs);
+		ptr->bounds_right = gf_bs_read_u32(bs);
+	} else {
+		ISOM_DECREASE_SIZE(ptr, 8)
+		ptr->crc = gf_bs_read_u32(bs);
+		ptr->encoding_4cc = gf_bs_read_u32(bs);
+	}
+	return gf_isom_box_array_read(s, bs);
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err proj_type_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ProjectionTypeBox *ptr = (GF_ProjectionTypeBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	if (ptr->type==GF_ISOM_BOX_TYPE_CBMP) {
+		gf_bs_write_u32(bs, ptr->layout);
+		gf_bs_write_u32(bs, ptr->padding);
+	}
+	else if (ptr->type==GF_ISOM_BOX_TYPE_EQUI) {
+		gf_bs_write_u32(bs, ptr->bounds_top);
+		gf_bs_write_u32(bs, ptr->bounds_bottom);
+		gf_bs_write_u32(bs, ptr->bounds_left);
+		gf_bs_write_u32(bs, ptr->bounds_right);
+	} else {
+		gf_bs_write_u32(bs, ptr->crc);
+		gf_bs_write_u32(bs, ptr->encoding_4cc);
+	}
+	return GF_OK;
+}
+
+GF_Err proj_type_box_size(GF_Box *s)
+{
+	GF_ProjectionTypeBox *ptr = (GF_ProjectionTypeBox *)s;
+	if (ptr->type==GF_ISOM_BOX_TYPE_CBMP)
+		s->size += 8;
+	else if (ptr->type==GF_ISOM_BOX_TYPE_EQUI)
+		s->size += 16;
+	else
+		s->size += 8;
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-1.0.1.tar.gz/src/isomedia/box_code_drm.c -> gpac-2.0.0.tar.gz/src/isomedia/box_code_drm.c Changed

@@ -1,8 +1,8 @@
 /*
 *			GPAC - Multimedia Framework C SDK
 *
- *			Authors: Cyril Concolato, Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2019
+ *			Authors: Jean Le Feuvre, Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2005-2021
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -39,21 +39,18 @@
 	gf_free(s);
 }
 
-GF_Err sinf_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err sinf_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_ProtectionSchemeInfoBox *ptr = (GF_ProtectionSchemeInfoBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_FRMA:
-		if (ptr->original_format) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->original_format = (GF_OriginalFormatBox*)a;
+		BOX_FIELD_ASSIGN(original_format, GF_OriginalFormatBox)
 		break;
 	case GF_ISOM_BOX_TYPE_SCHM:
-		if (ptr->scheme_type) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->scheme_type = (GF_SchemeTypeBox*)a;
+		BOX_FIELD_ASSIGN(scheme_type, GF_SchemeTypeBox)
 		break;
 	case GF_ISOM_BOX_TYPE_SCHI:
-		if (ptr->info) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->info = (GF_SchemeInformationBox*)a;
+		BOX_FIELD_ASSIGN(info, GF_SchemeInformationBox)
 		break;
 	}
 	return GF_OK;
@@ -61,7 +58,7 @@
 
 GF_Err sinf_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, sinf_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -111,7 +108,10 @@
 	if (!s) return GF_BAD_PARAM;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
-	gf_bs_write_u32(bs, ptr->data_format);
+	if (ptr->gnr_type)
+		gf_bs_write_u32(bs, ptr->gnr_type);
+	else
+		gf_bs_write_u32(bs, ptr->data_format);
 	return GF_OK;
 }
 
@@ -148,9 +148,10 @@
 
 	if (ptr->size && (ptr->flags & 0x000001)) {
 		u32 len = (u32) (ptr->size);
-		ptr->URI = (char*)gf_malloc(sizeof(char)*len);
+		ptr->URI = (char*)gf_malloc(sizeof(char)*(len+1));
 		if (!ptr->URI) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->URI, len);
+		ptr->URI[len] = 0;
 	}
 	return GF_OK;
 }
@@ -196,38 +197,31 @@
 	gf_free(s);
 }
 
-GF_Err schi_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err schi_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_SchemeInformationBox *ptr = (GF_SchemeInformationBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_IKMS:
-		if (ptr->ikms) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->ikms = (GF_ISMAKMSBox*)a;
+		BOX_FIELD_ASSIGN(ikms, GF_ISMAKMSBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ISFM:
-		if (ptr->isfm) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->isfm = (GF_ISMASampleFormatBox*)a;
+		BOX_FIELD_ASSIGN(isfm, GF_ISMASampleFormatBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ISLT:
-		if (ptr->islt) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->islt = (GF_ISMACrypSaltBox*)a;
+		BOX_FIELD_ASSIGN(islt, GF_ISMACrypSaltBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ODKM:
-		if (ptr->odkm) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->odkm = (GF_OMADRMKMSBox*)a;
+		BOX_FIELD_ASSIGN(odkm, GF_OMADRMKMSBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TENC:
-		if (ptr->tenc) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->tenc = (GF_TrackEncryptionBox *)a;
+		BOX_FIELD_ASSIGN(tenc, GF_TrackEncryptionBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ADKM:
-		if (ptr->adkm) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->adkm = (GF_AdobeDRMKeyManagementSystemBox *)a;
+		BOX_FIELD_ASSIGN(adkm, GF_AdobeDRMKeyManagementSystemBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_UUID:
 		if (((GF_UUIDBox*)a)->internal_4cc==GF_ISOM_BOX_UUID_TENC) {
-			if (ptr->piff_tenc) return GF_ISOM_INVALID_FILE;
-			ptr->piff_tenc = (GF_PIFFTrackEncryptionBox *)a;
+			BOX_FIELD_ASSIGN(piff_tenc, GF_PIFFTrackEncryptionBox)
 			return GF_OK;
 		} else {
 			return GF_OK;
@@ -238,7 +232,7 @@
 
 GF_Err schi_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, schi_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -465,7 +459,7 @@
 
 	ISOM_DECREASE_SIZE(ptr, (cid_len+ri_len+ptr->TextualHeadersLen) );
 
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -593,7 +587,7 @@
 
 GF_Err mdri_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -716,17 +710,15 @@
 	gf_free(s);
 }
 
-GF_Err odkm_Add(GF_Box *s, GF_Box *a)
+GF_Err odkm_Add(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_OMADRMKMSBox *ptr = (GF_OMADRMKMSBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_OHDR:
-		if (ptr->hdr) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->hdr = (GF_OMADRMCommonHeaderBox *)a;
+		BOX_FIELD_ASSIGN(hdr, GF_OMADRMCommonHeaderBox)
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ODAF:
-		if (ptr->fmt) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->fmt = (GF_OMADRMAUFormatBox*)a;
+		BOX_FIELD_ASSIGN(fmt, GF_OMADRMAUFormatBox)
 		return GF_OK;
 	}
 	return GF_OK;
@@ -734,7 +726,7 @@
 
 GF_Err odkm_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, odkm_Add);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -782,7 +774,7 @@
 		ISOM_DECREASE_SIZE(ptr, 4);
 		if (ptr->KID_count) {
 			u32 i;
-			if (ptr->size < ptr->KID_count * sizeof(bin128))
+			if (ptr->size / sizeof(bin128) < ptr->KID_count)
 				return GF_ISOM_INVALID_FILE;
 			ptr->KIDs = gf_malloc(ptr->KID_count*sizeof(bin128));
 			if (!ptr->KIDs)
@@ -861,11 +853,13 @@
 
 GF_Err tenc_box_read(GF_Box *s, GF_BitStream *bs)
 {
+	u8 iv_size;
 	GF_TrackEncryptionBox *ptr = (GF_TrackEncryptionBox*)s;
 
-	ISOM_DECREASE_SIZE(ptr, 20);
+	ISOM_DECREASE_SIZE(ptr, 3);
 
 	gf_bs_read_u8(bs); //reserved
+
 	if (!ptr->version) {
 		gf_bs_read_u8(bs); //reserved
 	} else {
@@ -873,17 +867,29 @@
 		ptr->skip_byte_block = gf_bs_read_int(bs, 4);
 	}
 	ptr->isProtected = gf_bs_read_u8(bs);
-	ptr->Per_Sample_IV_Size = gf_bs_read_u8(bs);
-	gf_bs_read_data(bs, (char *) ptr->KID, 16);
 
 
-	if ((ptr->isProtected == 1) && !ptr->Per_Sample_IV_Size) {
-		ptr->constant_IV_size = gf_bs_read_u8(bs);
-		if (ptr->constant_IV_size > sizeof(ptr->constant_IV))
-			return GF_ISOM_INVALID_FILE;
-
-		ISOM_DECREASE_SIZE(ptr, (1 + ptr->constant_IV_size) );
-		gf_bs_read_data(bs, (char *) ptr->constant_IV, ptr->constant_IV_size);
+	ISOM_DECREASE_SIZE(ptr, 17);
+
+	ptr->key_info[0] = 0;
+	ptr->key_info[1] = 0;
+	ptr->key_info[2] = 0;
+	ptr->key_info[3] = iv_size = gf_bs_read_u8(bs);
+	gf_bs_read_data(bs, ptr->key_info+4, 16);
+	if (!iv_size && ptr->isProtected) {
+		ISOM_DECREASE_SIZE(ptr, 1);
+		iv_size = ptr->key_info[20] = gf_bs_read_u8(bs);
+		ISOM_DECREASE_SIZE(ptr, ptr->key_info[20]);
+		if ((iv_size!=8) && (iv_size!=16)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid constant IV size %d, must be 8 or 16\n", (u32) iv_size));
+			ptr->key_info[20] = 16;
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_bs_read_data(bs, ptr->key_info+21, iv_size);
+	}
+	else if ((iv_size!=0) && (iv_size!=8) && (iv_size!=16)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid IV size %d, must be 0, 8 or 16\n", (u32) iv_size));
+		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	return GF_OK;
 }
@@ -898,19 +904,21 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 
-	gf_bs_write_u8(bs, 0x0); //reserved
+	gf_bs_write_u8(bs, 0); //reserved
+
 	if (!ptr->version) {
-		gf_bs_write_u8(bs, 0x0); //reserved
+		gf_bs_write_u8(bs, 0); //reserved
 	} else {
 		gf_bs_write_int(bs, ptr->crypt_byte_block, 4);
 		gf_bs_write_int(bs, ptr->skip_byte_block, 4);
 	}
 	gf_bs_write_u8(bs, ptr->isProtected);
-	gf_bs_write_u8(bs, ptr->Per_Sample_IV_Size);
-	gf_bs_write_data(bs, (char *) ptr->KID, 16);
-	if ((ptr->isProtected == 1) && !ptr->Per_Sample_IV_Size) {
-		gf_bs_write_u8(bs, ptr->constant_IV_size);
-		gf_bs_write_data(bs,(char *) ptr->constant_IV, ptr->constant_IV_size);
+
+	gf_bs_write_u8(bs, ptr->key_info[3]);
+	gf_bs_write_data(bs, ptr->key_info + 4, 16);
+	if ((ptr->isProtected == 1) && !ptr->key_info[3]) {
+		gf_bs_write_u8(bs, ptr->key_info[20]);
+		gf_bs_write_data(bs, ptr->key_info + 21, ptr->key_info[20]);
 	}
 	return GF_OK;
 }
@@ -918,9 +926,11 @@
 GF_Err tenc_box_size(GF_Box *s)
 {
 	GF_TrackEncryptionBox *ptr = (GF_TrackEncryptionBox*)s;
-	ptr->size += 20;
-	if ((ptr->isProtected == 1) && !ptr->Per_Sample_IV_Size) {
-		ptr->size += 1 + ptr->constant_IV_size;
+	ptr->size += 3;
+
+	ptr->size += 17;
+	if ((ptr->isProtected == 1) && ! ptr->key_info[3]) {
+		ptr->size += 1 + ptr->key_info[20];
 	}
 	return GF_OK;
 }
@@ -949,8 +959,11 @@
 
 	ISOM_DECREASE_SIZE(ptr, 20);
 	ptr->AlgorithmID = gf_bs_read_int(bs, 24);
-	ptr->IV_size = gf_bs_read_u8(bs);
-	gf_bs_read_data(bs, (char *) ptr->KID, 16);
+	ptr->key_info[0] = 0;
+	ptr->key_info[1] = 0;
+	ptr->key_info[2] = 0;
+	ptr->key_info[3] = gf_bs_read_u8(bs);
+	gf_bs_read_data(bs, ptr->key_info+4, 16);
 	return GF_OK;
 }
 
@@ -968,8 +981,8 @@
 	gf_bs_write_u24(bs, ptr->flags);
 
 	gf_bs_write_int(bs, ptr->AlgorithmID, 24);
-	gf_bs_write_u8(bs, ptr->IV_size);
-	gf_bs_write_data(bs, (char *) ptr->KID, 16);
+	gf_bs_write_u8(bs, ptr->key_info[3]);
+	gf_bs_write_data(bs, ptr->key_info+4, 16);
 	return GF_OK;
 }
 
@@ -986,7 +999,7 @@
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleEncryptionBox, GF_ISOM_BOX_TYPE_UUID);
 	tmp->internal_4cc = GF_ISOM_BOX_UUID_PSEC;
-	tmp->is_piff = GF_TRUE;
+	tmp->piff_type = 1;
 	return (GF_Box *)tmp;
 }
 
@@ -1109,19 +1122,14 @@
 	sample_count = gf_list_count(ptr->samp_aux_info);
 	gf_bs_write_u32(bs, sample_count);
 	if (sample_count) {
-		u32 i, j;
+		u32 i;
 		e = store_senc_info((GF_SampleEncryptionBox *)ptr, bs);
 		if (e) return e;
 
 		for (i = 0; i < sample_count; i++) {
 			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
-			if (! sai->IV_size) continue;
-			gf_bs_write_data(bs, (char *)sai->IV, sai->IV_size);
-			gf_bs_write_u16(bs, sai->subsample_count);
-			for (j = 0; j < sai->subsample_count; j++) {
-				gf_bs_write_u16(bs, sai->subsamples[j].bytes_clear_data);
-				gf_bs_write_u32(bs, sai->subsamples[j].bytes_encrypted_data);
-			}
+			if (! sai->cenc_data_size) continue;
+			gf_bs_write_data(bs, (char *)sai->cenc_data, sai->cenc_data_size);
 		}
 	}
 	return GF_OK;
@@ -1146,8 +1154,8 @@
 
 	for (i = 0; i < sample_count; i++) {
 		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
-		if (! sai->IV_size) continue;
-		ptr->size += 2 + sai->IV_size + 6*sai->subsample_count;
+		if (! sai->cenc_data_size) continue;
+		ptr->size += sai->cenc_data_size;
 	}
 	return GF_OK;
 }
@@ -1163,6 +1171,8 @@
 
 void piff_pssh_box_del(GF_Box *s)
 {
+	GF_PIFFProtectionSystemHeaderBox *ptr = (GF_PIFFProtectionSystemHeaderBox*)s;
+	if (ptr->private_data) gf_free(ptr->private_data);
 	gf_free(s);
 }
 
@@ -1177,7 +1187,7 @@
 	gf_bs_read_data(bs, (char *) ptr->SystemID, 16);
 	ptr->private_data_size = gf_bs_read_u32(bs);
 
-	if (ptr->size < sizeof(char)*ptr->private_data_size)
+	if (ptr->size < ptr->private_data_size)
 	 return GF_ISOM_INVALID_FILE;
 	ptr->private_data = gf_malloc(sizeof(char)*ptr->private_data_size);
 	if (!ptr->private_data)
@@ -1231,6 +1241,45 @@
 	gf_free(s);
 }
 
+
+u8 key_info_get_iv_size(const u8 *key_info, u32 key_info_size, u32 idx, u8 *const_iv_size, const u8 **const_iv)
+{
+	u32 i=0, kpos=3;
+	if (const_iv_size) *const_iv_size = 0;
+	if (const_iv) *const_iv = NULL;
+
+	if (!key_info || !key_info_size)
+		return 0;
+
+	while (1) {
+		u8 civ_size=0;
+		const u8 *civ = NULL;
+		u8 iv_size = key_info[kpos];
+		kpos += 17;
+
+		if (!iv_size) {
+			if (kpos>key_info_size)
+				break;
+			civ_size = key_info[kpos];
+			civ = key_info + kpos + 1;
+			kpos += 1 + civ_size;
+		}
+
+		if (kpos>key_info_size)
+			break;
+
+		if (i+1==idx) {
+			if (const_iv_size) *const_iv_size = civ_size;
+			if (const_iv) *const_iv = civ;
+			return iv_size;
+		}
+		i++;
+		if (kpos==key_info_size)
+			break;
+	}
+	return 0;
+}
+
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc)
 #else
@@ -1239,27 +1288,30 @@
 {
 	GF_Err e;
 	Bool parse_failed = GF_FALSE;
-	u32 i, j, count, sample_number;
+	u32 i, count, sample_number;
 	u32 senc_size = (u32) senc->size;
 	u32 subs_size = 0, def_IV_size;
 	u64 pos = gf_bs_get_position(bs);
 	Bool do_warn = GF_TRUE;
+	Bool use_multikey = GF_FALSE;
+	Bool patch_subsamples_present = GF_FALSE;
 
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (!traf)
 		return GF_BAD_PARAM;
 #endif
 
-	gf_bs_seek(bs, senc->bs_offset);
-
 	//BOX + version/flags
 	if (senc_size<12) return GF_BAD_PARAM;
 	senc_size -= 12;
 
-	if (senc->is_piff) {
+	if (senc->piff_type==1) {
 		//UUID
 		if (senc_size<16) return GF_BAD_PARAM;
 		senc_size -= 16;
+	} else if (!senc->piff_type) {
+		if (senc->version==1)
+			use_multikey = GF_TRUE;
 	}
 	if (senc->flags & 2) subs_size = 8;
 
@@ -1270,6 +1322,8 @@
 	if (trak) sample_number += trak->sample_count_at_seg_start;
 #endif
 
+	gf_bs_seek(bs, senc->bs_offset);
+
 	count = gf_bs_read_u32(bs);
 	senc_size -= 4;
 
@@ -1285,18 +1339,52 @@
 		def_IV_size = 0;
 	}
 
+	if (gf_opts_get_bool("core", "piff-force-subsamples") && !(senc->flags & 0x00000002))
+		patch_subsamples_present = GF_TRUE;
+
 	if (!senc->samp_aux_info) senc->samp_aux_info = gf_list_new();
 	for (i=0; i<count; i++) {
+		const u8 *key_info=NULL;
+		u32 key_info_size=0;
 		Bool is_encrypted;
 		GF_CENCSampleAuxInfo *sai;
-		GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
-		if (!sai) return GF_OUT_OF_MEM;
+		u8 IV_size=0;
+		//u32 nb_keys = 0;
+		u32 nb_bytes_subsample = 6;
+		u32 nb_subs_bits = 16;
 
+		GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
+		if (!sai) {
+			gf_bs_seek(bs, pos);
+			return GF_OUT_OF_MEM;
+		}
 		if (trak) {
-			e = gf_isom_get_sample_cenc_info_ex(trak, traf, senc, sample_number, &is_encrypted, &sai->IV_size, NULL, NULL, NULL, NULL, NULL);
+			e = gf_isom_get_sample_cenc_info_internal(trak, traf, senc, sample_number, &is_encrypted, NULL, NULL, &key_info, &key_info_size);
+			if (! key_info) {
+				if (!key_info_size && is_encrypted) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] no key info and no associated IV size !\n" ));
+					gf_free(sai);
+					return GF_ISOM_INVALID_FILE;
+				}
+				IV_size = key_info_size; //piff default
+				use_multikey = GF_FALSE;
+				senc->piff_type = 2;
+			} else if (use_multikey) {
+				//nb_keys = key_info[1];
+				//nb_keys <<= 8;
+				//nb_keys |= key_info[2];
+				nb_bytes_subsample = 8;
+				nb_subs_bits = 32;
+			} else {
+				IV_size = key_info[3];
+			}
+
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] could not get cenc info for sample %d: %s\n", sample_number, gf_error_to_string(e) ));
 				gf_isom_cenc_samp_aux_info_del(sai);
+				gf_bs_seek(bs, pos);
+				if (trak->moov->mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)
+					return GF_OK;
 				return e;
 			}
 		}
@@ -1307,9 +1395,9 @@
 				do_warn = GF_FALSE;
 			}
 			is_encrypted = GF_TRUE;
-			sai->IV_size = def_IV_size;
+			IV_size = def_IV_size;
 		}
-		if (senc_size < sai->IV_size) {
+		if (senc_size < IV_size) {
 			parse_failed = GF_TRUE;
 			gf_isom_cenc_samp_aux_info_del(sai);
 			break;
@@ -1319,44 +1407,71 @@
 
 		//subsample info is only signaled for encrypted samples
 		if (is_encrypted) {
-			if (sai->IV_size > GF_ARRAY_LENGTH(sai->IV)) {
-				gf_isom_cenc_samp_aux_info_del(sai);
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isobmf] Failed to parse SENC box, invalid SAI size\n" ));
-				return GF_ISOM_INVALID_FILE;
+			u64 sai_start = gf_bs_get_position(bs);
+			u32 nb_subs = 0;
+
+			if (use_multikey) {
+				u32 j;
+				u32 nb_iv_init = gf_bs_read_u16(bs);
+				for (j=0; j<nb_iv_init; j++) {
+					u32 idx = gf_bs_read_u16(bs);
+					IV_size = key_info_get_iv_size(key_info, key_info_size, idx, NULL, NULL);
+					if (!IV_size) {
+						gf_isom_cenc_samp_aux_info_del(sai);
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isobmf] Failed to parse SENC box, invalid SAI multikey with IV size 0\n" ));
+						gf_bs_seek(bs, pos);
+						return GF_ISOM_INVALID_FILE;
+					}
+					gf_bs_skip_bytes(bs, IV_size);
+				}
+
+			} else {
+				if (IV_size > 16) {
+					gf_isom_cenc_samp_aux_info_del(sai);
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isobmf] Failed to parse SENC box, invalid SAI size\n" ));
+					gf_bs_seek(bs, pos);
+					return GF_ISOM_INVALID_FILE;
+				}
+				if (IV_size) {
+					gf_bs_skip_bytes(bs, IV_size);
+				}
 			}
-			if (sai->IV_size) {
-				gf_bs_read_data(bs, (char *)sai->IV, sai->IV_size);
-				senc_size -= sai->IV_size;
+			if (senc->flags & 0x00000002) {
+				nb_subs = gf_bs_read_int(bs, nb_subs_bits);
 			}
 
-			if (senc->flags & 0x00000002) {
-				sai->subsample_count = gf_bs_read_u16(bs);
-				sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
-				if (!sai->subsamples) return GF_OUT_OF_MEM;
+			sai->cenc_data_size = (u32) (gf_bs_get_position(bs) - sai_start);
+			sai->cenc_data_size += nb_subs * nb_bytes_subsample;
+			gf_bs_seek(bs, sai_start);
 
-				if ((s32) senc_size < 2 + sai->subsample_count * 6) {
-					parse_failed = GF_TRUE;
-					gf_isom_cenc_samp_aux_info_del(sai);
-					break;
-				}
+			if ((s32) senc_size < sai->cenc_data_size) {
+				parse_failed = GF_TRUE;
+				gf_isom_cenc_samp_aux_info_del(sai);
+				break;
+			}
 
-				for (j = 0; j < sai->subsample_count; j++) {
-					if (gf_bs_get_size(bs) - gf_bs_get_position(bs) < 6) {
-						gf_isom_cenc_samp_aux_info_del(sai);
-						if (trak && trak->moov && trak->moov->mov && trak->moov->mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) {
-							gf_bs_seek(bs, pos);
-							GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isobmf] Failed to parse SENC box, invalid SAI size\n" ));
-							return GF_OK;
-						}
-						return GF_ISOM_INVALID_FILE;
-					}
-					sai->subsamples[j].bytes_clear_data = gf_bs_read_u16(bs);
-					sai->subsamples[j].bytes_encrypted_data = gf_bs_read_u32(bs);
-				}
-				senc_size -= 2 + sai->subsample_count * 6;
+			sai->cenc_data = gf_malloc(sizeof(u8) * sai->cenc_data_size);
+			if (!sai->cenc_data) {
+				gf_isom_cenc_samp_aux_info_del(sai);
+				gf_bs_seek(bs, pos);
+				return GF_OUT_OF_MEM;
+			}
+			gf_bs_read_data(bs, sai->cenc_data, sai->cenc_data_size);
+			senc_size -= sai->cenc_data_size;
+
+			if (patch_subsamples_present) {
+				gf_bs_read_int(bs, nb_subs_bits);
 			}
 		} else {
 			i--;
+			sai->isNotProtected = 1;
+		}
+
+		if (senc->internal_4cc == GF_ISOM_BOX_UUID_PSEC) {
+			sai->key_info_size = IV_size;
+		} else {
+			sai->key_info = key_info;
+			sai->key_info_size = key_info_size;
 		}
 		gf_list_add(senc->samp_aux_info, sai);
 	}
@@ -1389,12 +1504,18 @@
 GF_Err senc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
-	u32 i, j;
-	u32 sample_count;
+	u32 i;
+	u32 sample_count, nb_crypt_samples;
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *) s;
 
 	sample_count = gf_list_count(ptr->samp_aux_info);
-	if (!sample_count) {
+	//temp patch until we cleanup the spec...
+	nb_crypt_samples = 0;
+	for (i = 0; i < sample_count; i++) {
+		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+		if (!sai->isNotProtected) nb_crypt_samples++;
+	}
+	if (!nb_crypt_samples) {
 		ptr->size = 0;
 		return GF_OK;
 	}
@@ -1405,25 +1526,16 @@
 	gf_bs_write_u8(bs, ptr->version);
 	gf_bs_write_u24(bs, ptr->flags);
 
-	gf_bs_write_u32(bs, sample_count);
+	gf_bs_write_u32(bs, nb_crypt_samples);
 
 	e = store_senc_info(ptr, bs);
 	if (e) return e;
 
 	for (i = 0; i < sample_count; i++) {
 		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
-
-		//for cbcs scheme, IV_size is 0, constant IV shall be used. It is written in tenc box rather than in sai
-		if (sai->IV_size)
-			gf_bs_write_data(bs, (char *)sai->IV, sai->IV_size);
-
-		if (ptr->flags & 0x00000002) {
-			gf_bs_write_u16(bs, sai->subsample_count);
-			for (j = 0; j < sai->subsample_count; j++) {
-				gf_bs_write_u16(bs, sai->subsamples[j].bytes_clear_data);
-				gf_bs_write_u32(bs, sai->subsamples[j].bytes_encrypted_data);
-			}
-		}
+		if (sai->isNotProtected || !sai->cenc_data_size)
+			continue;
+		gf_bs_write_data(bs, sai->cenc_data, sai->cenc_data_size);
 	}
 	return GF_OK;
 }
@@ -1431,11 +1543,17 @@
 GF_Err senc_box_size(GF_Box *s)
 {
 	u32 sample_count;
-	u32 i;
+	u32 i, nb_crypt_samples;
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox*)s;
 	sample_count = gf_list_count(ptr->samp_aux_info);
+	//temp patch until we cleanup the spec...
+	nb_crypt_samples=0;
+	for (i = 0; i < sample_count; i++) {
+		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+		if (!sai->isNotProtected) nb_crypt_samples++;
+	}
 
-	if (!sample_count) {
+	if (!nb_crypt_samples) {
 		ptr->size = 0;
 		return GF_OK;
 	}
@@ -1446,11 +1564,9 @@
 	ptr->size += 4; //sample count
 	for (i = 0; i < sample_count; i++) {
 		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
-
-		ptr->size += sai->IV_size;
-
-		if (ptr->flags & 0x00000002)
-			ptr->size += 2 + 6*sai->subsample_count;
+		if (sai->isNotProtected)
+			continue;
+		ptr->size += sai->cenc_data_size;
 	}
 	return GF_OK;
 }
@@ -1471,17 +1587,15 @@
 	gf_free(s);
 }
 
-GF_Err adkm_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err adkm_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_AHDR:
-		if (ptr->header) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->header = (GF_AdobeDRMHeaderBox *)a;
+		BOX_FIELD_ASSIGN(header, GF_AdobeDRMHeaderBox)
 		break;
 	case GF_ISOM_BOX_TYPE_ADAF:
-		if (ptr->au_format) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->au_format = (GF_AdobeDRMAUFormatBox *)a;
+		BOX_FIELD_ASSIGN(au_format, GF_AdobeDRMAUFormatBox)
 		break;
 	}
 	return GF_OK;
@@ -1489,7 +1603,7 @@
 
 GF_Err adkm_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, adkm_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1522,13 +1636,12 @@
 }
 
 
-GF_Err ahdr_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err ahdr_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_APRM:
-		if (ptr->std_enc_params) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->std_enc_params = (GF_AdobeStdEncryptionParamsBox *)a;
+		BOX_FIELD_ASSIGN(std_enc_params, GF_AdobeStdEncryptionParamsBox)
 		break;
 	}
 	return GF_OK;
@@ -1536,7 +1649,7 @@
 
 GF_Err ahdr_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, ahdr_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1567,17 +1680,15 @@
 	gf_free(s);
 }
 
-GF_Err aprm_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err aprm_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_AEIB:
-		if (ptr->enc_info) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->enc_info = (GF_AdobeEncryptionInfoBox *)a;
+		BOX_FIELD_ASSIGN(enc_info, GF_AdobeEncryptionInfoBox)
 		break;
 	case GF_ISOM_BOX_TYPE_AKEY:
-		if (ptr->key_info) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->key_info = (GF_AdobeKeyInfoBox *)a;
+		BOX_FIELD_ASSIGN(key_info, GF_AdobeKeyInfoBox)
 		break;
 	}
 	return GF_OK;
@@ -1585,7 +1696,7 @@
 
 GF_Err aprm_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, aprm_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1676,13 +1787,12 @@
 	gf_free(s);
 }
 
-GF_Err akey_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err akey_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_FLXS:
-		if (ptr->params) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->params = (GF_AdobeFlashAccessParamsBox *)a;
+		BOX_FIELD_ASSIGN(params, GF_AdobeFlashAccessParamsBox)
 		break;
 	}
 	return GF_OK;
@@ -1690,7 +1800,7 @@
 
 GF_Err akey_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, akey_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE

gpac-1.0.1.tar.gz/src/isomedia/box_code_meta.c -> gpac-2.0.0.tar.gz/src/isomedia/box_code_meta.c Changed

@@ -54,6 +54,7 @@
 	ptr->IPMP_control = NULL;
 	ptr->item_refs = NULL;
 	ptr->item_props = NULL;
+	ptr->groups_list = NULL;
 }
 
 void meta_box_del(GF_Box *s)
@@ -63,41 +64,36 @@
 }
 
 
-GF_Err meta_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err meta_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_MetaBox *ptr = (GF_MetaBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_HDLR:
-		if (ptr->handler) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->handler = (GF_HandlerBox*)a;
+		BOX_FIELD_ASSIGN(handler, GF_HandlerBox)
 		break;
 	case GF_ISOM_BOX_TYPE_PITM:
-		if (ptr->primary_resource) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->primary_resource = (GF_PrimaryItemBox*)a;
+		BOX_FIELD_ASSIGN(primary_resource, GF_PrimaryItemBox)
 		break;
 	case GF_ISOM_BOX_TYPE_DINF:
-		if (ptr->file_locations) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->file_locations = (GF_DataInformationBox*)a;
+		BOX_FIELD_ASSIGN(file_locations, GF_DataInformationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_ILOC:
-		if (ptr->item_locations) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->item_locations = (GF_ItemLocationBox*)a;
+		BOX_FIELD_ASSIGN(item_locations, GF_ItemLocationBox)
 		break;
 	case GF_ISOM_BOX_TYPE_IPRO:
-		if (ptr->protections) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->protections = (GF_ItemProtectionBox*)a;
+		BOX_FIELD_ASSIGN(protections, GF_ItemProtectionBox)
 		break;
 	case GF_ISOM_BOX_TYPE_IINF:
-		if (ptr->item_infos) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->item_infos = (GF_ItemInfoBox*)a;
+		BOX_FIELD_ASSIGN(item_infos, GF_ItemInfoBox)
 		break;
 	case GF_ISOM_BOX_TYPE_IREF:
-		if (ptr->item_refs) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->item_refs = (GF_ItemReferenceBox*)a;
+		BOX_FIELD_ASSIGN(item_refs, GF_ItemReferenceBox);
 		break;
 	case GF_ISOM_BOX_TYPE_IPRP:
-		if (ptr->item_props) ERROR_ON_DUPLICATED_BOX(a, ptr)
-		ptr->item_props = (GF_ItemPropertiesBox*)a;
+		BOX_FIELD_ASSIGN(item_props, GF_ItemPropertiesBox)
+		break;
+	case GF_ISOM_BOX_TYPE_GRPL:
+		BOX_FIELD_ASSIGN(groups_list, GF_GroupListBox)
 		break;
 	}
 	return GF_OK;
@@ -107,13 +103,13 @@
 {
 	u64 pos = gf_bs_get_position(bs);
 	u64 size = s->size;
-	GF_Err e = gf_isom_box_array_read(s, bs, meta_on_child_box);
+	GF_Err e = gf_isom_box_array_read(s, bs);
 	/*try to hack around QT files which don't use a full box for meta, rewind 4 bytes*/
 	if (e && (pos>4) ) {
 		gf_bs_seek(bs, pos-4);
 		meta_reset(s);
 		s->size = size+4;
-		e = gf_isom_box_array_read(s, bs, meta_on_child_box);
+		e = gf_isom_box_array_read(s, bs);
 	}
 	return e;
 }
@@ -137,6 +133,7 @@
 	gf_isom_check_position(s, (GF_Box *)ptr->item_infos, &pos);
 	gf_isom_check_position(s, (GF_Box *)ptr->item_refs, &pos);
 	gf_isom_check_position(s, (GF_Box *)ptr->item_props, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->groups_list, &pos);
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -193,7 +190,7 @@
 {
 	GF_BinaryXMLBox *ptr = (GF_BinaryXMLBox *)s;
 	if (ptr == NULL) return;
-	if (ptr->data_length && ptr->data) gf_free(ptr->data);
+	if (ptr->data) gf_free(ptr->data);
 	gf_free(ptr);
 }
 
@@ -285,7 +282,8 @@
 	}
 
 	for (i = 0; i < item_count; i++) {
-		GF_ItemLocationEntry *location_entry = (GF_ItemLocationEntry *)gf_malloc(sizeof(GF_ItemLocationEntry));
+		GF_ItemLocationEntry *location_entry;
+		GF_SAFEALLOC(location_entry, GF_ItemLocationEntry);
 		if (!location_entry) return GF_OUT_OF_MEM;
 
 		gf_list_add(ptr->location_entries, location_entry);
@@ -314,7 +312,8 @@
 		extent_count = gf_bs_read_u16(bs);
 		location_entry->extent_entries = gf_list_new();
 		for (j = 0; j < extent_count; j++) {
-			GF_ItemExtentEntry *extent_entry = (GF_ItemExtentEntry *)gf_malloc(sizeof(GF_ItemExtentEntry));
+			GF_ItemExtentEntry *extent_entry;
+			GF_SAFEALLOC(extent_entry, GF_ItemExtentEntry);
 			if (!extent_entry) return GF_OUT_OF_MEM;
 			
 			gf_list_add(location_entry->extent_entries, extent_entry);
@@ -479,17 +478,20 @@
 	gf_free(ptr);
 }
 
-GF_Err ipro_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err ipro_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_ItemProtectionBox *ptr = (GF_ItemProtectionBox *)s;
-	if (a->type == GF_ISOM_BOX_TYPE_SINF)
-		return gf_list_add(ptr->protection_information, a);
-
+	if (a->type == GF_ISOM_BOX_TYPE_SINF) {
+		BOX_FIELD_LIST_ASSIGN(protection_information)
+		return GF_OK;
+	}
 	return GF_OK;
 }
 GF_Err ipro_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, ipro_on_child_box);
+	ISOM_DECREASE_SIZE(s, 2)
+	gf_bs_read_u16(bs);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -566,10 +568,13 @@
 				ptr->content_type = (char*)gf_malloc(sizeof(char)*string_len);
 				if (!ptr->content_type) return GF_OUT_OF_MEM;
 				memcpy(ptr->content_type, buf+string_start, string_len);
-			} else {
+			} else if (!ptr->content_encoding) {
 				ptr->content_encoding = (char*)gf_malloc(sizeof(char)*string_len);
 				if (!ptr->content_encoding) return GF_OUT_OF_MEM;
 				memcpy(ptr->content_encoding, buf+string_start, string_len);
+			} else {
+				//we could throw an error but we silently accept this infe
+				break;
 			}
 			string_start += string_len;
 			string_len = 0;
@@ -580,9 +585,24 @@
 		string_len++;
 	}
 	gf_free(buf);
+
 	if (!ptr->item_name || (!ptr->content_type && ptr->version < 2)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isoff] Infe without name or content type !\n"));
 	}
+
+	if (ptr->item_name && !ptr->item_name[0]) {
+		gf_free(ptr->item_name);
+		ptr->item_name = NULL;
+	}
+	if (ptr->content_type && !ptr->content_type[0]) {
+		gf_free(ptr->content_type);
+		ptr->content_type = NULL;
+	}
+	if (ptr->content_encoding && !ptr->content_encoding[0]) {
+		gf_free(ptr->content_encoding);
+		ptr->content_encoding = NULL;
+	}
+	
 	return GF_OK;
 }
 
@@ -681,12 +701,13 @@
 	gf_free(ptr);
 }
 
-GF_Err iinf_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err iinf_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_ItemInfoBox *ptr = (GF_ItemInfoBox *)s;
 
 	if (a->type == GF_ISOM_BOX_TYPE_INFE) {
-		return gf_list_add(ptr->item_infos, a);
+		BOX_FIELD_LIST_ASSIGN(item_infos)
+		return GF_OK;
 	} else {
 		return GF_OK;
 	}
@@ -703,7 +724,7 @@
 		ISOM_DECREASE_SIZE(s, 4)
 		gf_bs_read_u32(bs);
 	}
-	return gf_isom_box_array_read(s, bs, iinf_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -735,10 +756,11 @@
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Err iref_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err iref_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
 	GF_ItemReferenceBox *ptr = (GF_ItemReferenceBox *)s;
-	return gf_list_add(ptr->references, a);
+	BOX_FIELD_LIST_ASSIGN(references)
+	return GF_OK;
 }
 
 void iref_box_del(GF_Box *s)
@@ -752,7 +774,7 @@
 
 GF_Err iref_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, iref_on_child_box, s->type);
+	return gf_isom_box_array_read_ex(s, bs, s->type);
 }
 
 GF_Box *iref_box_new()
@@ -795,7 +817,7 @@
 	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->from_item_id = gf_bs_read_u16(bs);
 	ptr->reference_count = gf_bs_read_u16(bs);
-	if (ptr->size < ptr->reference_count*2)
+	if (ptr->size / 2 < ptr->reference_count)
 		return GF_ISOM_INVALID_FILE;
 
 	ptr->to_item_IDs = (u32 *)gf_malloc(ptr->reference_count * sizeof(u32));

gpac-1.0.1.tar.gz/src/isomedia/box_dump.c -> gpac-2.0.0.tar.gz/src/isomedia/box_dump.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -211,7 +211,7 @@
 {
 	GF_MovieBox *p = (GF_MovieBox *) a;
 	gf_isom_box_dump_start(a, "MovieBox", trace);
-	if (p->compressed_diff)
+	if (p->internal_flags & GF_ISOM_BOX_COMPRESSED)
 		gf_fprintf(trace, "compressedSize=\""LLU"\"", p->size - p->compressed_diff);
 	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MovieBox", a, trace);
@@ -591,6 +591,10 @@
 	case GF_ISOM_SUBTYPE_HEV2:
 		name = "HEVCSampleEntryBox";
 		break;
+	case GF_ISOM_SUBTYPE_VVC1:
+	case GF_ISOM_SUBTYPE_VVI1:
+		name = "VVCSampleEntryBox";
+		break;
 	case GF_ISOM_SUBTYPE_LHV1:
 	case GF_ISOM_SUBTYPE_LHE1:
 		name = "LHEVCSampleEntryBox";
@@ -617,10 +621,18 @@
 		name = "RGBSampleEntryBox";
 		full_dump=GF_TRUE;
 		break;
-	case GF_QT_SUBTYPE_YUV422:
+	case GF_QT_SUBTYPE_YUYV:
+		name = "YUV422SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_UYVY:
 		name = "YUV422SampleEntryBox";
 		full_dump=GF_TRUE;
 		break;
+	case GF_QT_SUBTYPE_YUV420:
+		name = "YUV420SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
 	case GF_QT_SUBTYPE_YUV422_10:
 		name = "YUV422_10_SampleEntryBox";
 		full_dump=GF_TRUE;
@@ -633,6 +645,43 @@
 		name = "YUV444_10_SampleEntryBox";
 		full_dump=GF_TRUE;
 		break;
+	case GF_QT_SUBTYPE_RAW_VID:
+		name = "RGB_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_YUVA444:
+		name = "YUVA_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_YUV422_16:
+		name = "YUV420_16_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_I420:
+		name = "I420_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_IYUV:
+		name = "IUYV_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_YV12:
+		name = "YV12_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_YVYU:
+		name = "YVYU_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_RGBA:
+		name = "RGBA_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_ABGR:
+		name = "ABGR_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+
 	default:
 		//DO NOT TOUCH FOR NOW, this breaks all hashes
 		name = "MPEGVisualSampleDescriptionBox";
@@ -680,7 +729,19 @@
 	gf_fprintf(trace, " DataReferenceIndex=\"%d\"", p->dataReferenceIndex);
 	if (p->version)
 		gf_fprintf(trace, " Version=\"%d\"", p->version);
-	gf_fprintf(trace, " SampleRate=\"%d\"", p->samplerate_hi);
+
+	if (p->samplerate_lo) {
+		if (p->type==GF_ISOM_SUBTYPE_MLPA) {
+			u32 sr = p->samplerate_hi;
+			sr <<= 16;
+			sr |= p->samplerate_lo;
+			gf_fprintf(trace, " SampleRate=\"%d\"", sr);
+		} else {
+			gf_fprintf(trace, " SampleRate=\"%d.%d\"", p->samplerate_hi, p->samplerate_lo);
+		}
+	} else {
+		gf_fprintf(trace, " SampleRate=\"%d\"", p->samplerate_hi);
+	}
 	gf_fprintf(trace, " Channels=\"%d\" BitsPerSample=\"%d\"", p->channel_count, p->bitspersample);
 	if (p->qtff_mode) {
 		gf_fprintf(trace, " isQTFF=\"%d\"", p->qtff_mode);
@@ -752,6 +813,11 @@
 	case GF_ISOM_BOX_TYPE_MHM2:
 		szName = "MHASampleEntry";
 		break;
+	case GF_ISOM_BOX_TYPE_MLPA:
+		if (!p->cfg_mlp)
+		 	error = "";
+		szName = "TrueHDSampleEntry";
+		break;
 	default:
 		szName = "AudioSampleDescriptionBox";
 		break;
@@ -788,6 +854,38 @@
 	return GF_OK;
 }
 
+static void gnr_dump_exts(u8 *data, u32 data_size, FILE *trace)
+{
+	GF_List *list = NULL;
+	GF_Err e = GF_OK;
+	if (!data) return;
+
+	GF_BitStream *bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
+	gf_bs_set_cookie(bs, GF_ISOM_BS_COOKIE_NO_LOGS);
+	while (gf_bs_available(bs)) {
+		GF_Box *abox=NULL;
+		e = gf_isom_box_parse(&abox, bs);
+		if (!abox) break;
+		if (!list) list = gf_list_new();
+		gf_list_add(list, abox);
+	}
+	gf_bs_del(bs);
+
+	if (!e && gf_list_count(list)) {
+		gf_fprintf(trace, ">\n");
+		while (gf_list_count(list)) {
+			GF_Box *a = gf_list_pop_front(list);
+			gf_isom_box_dump(a, trace);
+			gf_isom_box_del(a);
+		}
+	} else {
+		dump_data_attribute(trace, "data", data, data_size);
+		gf_fprintf(trace, ">\n");
+	}
+	if (list)
+		gf_isom_box_array_del(list);
+}
+
 GF_Err gnrm_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_GenericSampleEntryBox *p = (GF_GenericSampleEntryBox *)a;
@@ -795,8 +893,10 @@
 		a->type = p->EntryType;
 
 	gf_isom_box_dump_start(a, "SampleDescriptionEntryBox", trace);
-	gf_fprintf(trace, "DataReferenceIndex=\"%d\" ExtensionDataSize=\"%d\">\n", p->dataReferenceIndex, p->data_size);
+	gf_fprintf(trace, "DataReferenceIndex=\"%d\" ExtensionDataSize=\"%d\"", p->dataReferenceIndex, p->data_size);
 	a->type = GF_ISOM_BOX_TYPE_GNRM;
+	gnr_dump_exts(p->data, p->data_size, trace);
+
 	gf_isom_box_dump_done("SampleDescriptionEntryBox", a, trace);
 	return GF_OK;
 }
@@ -808,9 +908,12 @@
 		a->type = p->EntryType;
 
 	gf_isom_box_dump_start(a, "VisualSampleDescriptionBox", trace);
-	gf_fprintf(trace, "DataReferenceIndex=\"%d\" Version=\"%d\" Revision=\"%d\" Vendor=\"%d\" TemporalQuality=\"%d\" SpacialQuality=\"%d\" Width=\"%d\" Height=\"%d\" HorizontalResolution=\"%d\" VerticalResolution=\"%d\" CompressorName=\"%s\" BitDepth=\"%d\">\n",
+	gf_fprintf(trace, "DataReferenceIndex=\"%d\" Version=\"%d\" Revision=\"%d\" Vendor=\"%d\" TemporalQuality=\"%d\" SpacialQuality=\"%d\" Width=\"%d\" Height=\"%d\" HorizontalResolution=\"%d\" VerticalResolution=\"%d\" CompressorName=\"%s\" BitDepth=\"%d\"",
 	 p->dataReferenceIndex, p->version, p->revision, p->vendor, p->temporal_quality, p->spatial_quality, p->Width, p->Height, p->horiz_res, p->vert_res, isalnum(p->compressor_name[0]) ? p->compressor_name : p->compressor_name+1, p->bit_depth);
+
 	a->type = GF_ISOM_BOX_TYPE_GNRV;
+	gnr_dump_exts(p->data, p->data_size, trace);
+
 	gf_isom_box_dump_done("VisualSampleDescriptionBox", a, trace);
 	return GF_OK;
 }
@@ -822,9 +925,12 @@
 		a->type = p->EntryType;
 
 	gf_isom_box_dump_start(a, "AudioSampleDescriptionBox", trace);
-	gf_fprintf(trace, "DataReferenceIndex=\"%d\" Version=\"%d\" Revision=\"%d\" Vendor=\"%d\" ChannelCount=\"%d\" BitsPerSample=\"%d\" Samplerate=\"%d\">\n",
+	gf_fprintf(trace, "DataReferenceIndex=\"%d\" Version=\"%d\" Revision=\"%d\" Vendor=\"%d\" ChannelCount=\"%d\" BitsPerSample=\"%d\" Samplerate=\"%d\"",
 	 p->dataReferenceIndex, p->version, p->revision, p->vendor, p->channel_count, p->bitspersample, p->samplerate_hi);
+
 	a->type = GF_ISOM_BOX_TYPE_GNRA;
+	gnr_dump_exts(p->data, p->data_size, trace);
+
 	gf_isom_box_dump_done("AudioSampleDescriptionBox", a, trace);
 	return GF_OK;
 }
@@ -979,7 +1085,12 @@
 
 	i=0;
 	while ((t = (GF_EdtsEntry *)gf_list_enum(p->entryList, &i))) {
-		gf_fprintf(trace, "<EditListEntry Duration=\""LLD"\" MediaTime=\""LLD"\" MediaRate=\"%u\"/>\n", t->segmentDuration, t->mediaTime, t->mediaRate);
+		u32 rate_int = t->mediaRate>>16;
+		u32 rate_frac = t->mediaRate&0xFFFF;
+		if (rate_frac)
+			gf_fprintf(trace, "<EditListEntry Duration=\""LLD"\" MediaTime=\""LLD"\" MediaRate=\"%u.%u\"/>\n", t->segmentDuration, t->mediaTime, rate_int, rate_frac*100/0xFFFF);
+		else
+			gf_fprintf(trace, "<EditListEntry Duration=\""LLD"\" MediaTime=\""LLD"\" MediaRate=\"%u\"/>\n", t->segmentDuration, t->mediaTime, rate_int);
 	}
 	if (!p->size) {
 		gf_fprintf(trace, "<EditListEntry Duration=\"\" MediaTime=\"\" MediaRate=\"\"/>\n");
@@ -1346,15 +1457,30 @@
 
 GF_Err unkn_box_dump(GF_Box *a, FILE * trace)
 {
+	Bool str_dump = GF_FALSE;
 	const char *name = "UnknownBox";
 	GF_UnknownBox *u = (GF_UnknownBox *)a;
-	if (!a->type && (a->size==8))
+	if (!a->type && (a->size==8)) {
 		name = "TerminatorBox";
+	} else if (u->original_4cc==GF_4CC('n','a','m','e') && (u->dataSize>4) && !u->data[0] && !u->data[1] && !u->data[2] && !u->data[3]) {
+		name = "iTunesName";
+		str_dump = GF_TRUE;
+	} else if (u->original_4cc==GF_4CC('m','e','a','n') && (u->dataSize>4) && !u->data[0] && !u->data[1] && !u->data[2] && !u->data[3]) {
+		name = "iTunesMean";
+		str_dump = GF_TRUE;
+	}
 
 	gf_isom_box_dump_start(a, name, trace);
 
-	if (u->dataSize && u->dataSize<100)
+	if (str_dump) {
+		u32 i;
+		gf_fprintf(trace, " value=\"");
+		for (i=4; i<u->dataSize; i++)
+			gf_fprintf(trace, "%c", (char) u->data[i]);
+		gf_fprintf(trace, "\"");
+	} else if (u->dataSize && u->dataSize<100) {
 		dump_data_attribute(trace, "data", u->data, u->dataSize);
+	}
 
 	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done(name, a, trace);
@@ -1464,7 +1590,22 @@
 {
 	u32 i, count;
 	GF_AVCConfigurationBox *p = (GF_AVCConfigurationBox *) a;
-	const char *name = (p->type==GF_ISOM_BOX_TYPE_MVCC) ? "MVC" : (p->type==GF_ISOM_BOX_TYPE_SVCC) ? "SVC" : "AVC";
+	const char *name;
+	switch (p->type) {
+	case GF_ISOM_BOX_TYPE_MVCC:
+		name = "MVC";
+		break;
+	case GF_ISOM_BOX_TYPE_SVCC:
+		name = "SVC";
+		break;
+	case GF_ISOM_BOX_TYPE_AVCE:
+		name = "DV-AVC";
+		break;
+	default:
+		name = "AVC";
+		break;
+	}
+
 	char boxname[256];
 	sprintf(boxname, "%sConfigurationBox", name);
 	gf_isom_box_dump_start(a, boxname, trace);
@@ -1499,7 +1640,7 @@
 		gf_fprintf(trace, " complete_representation=\"%d\"", p->config->complete_representation);
 
 	if (p->type==GF_ISOM_BOX_TYPE_AVCC) {
-		if (gf_avc_is_rext_profile(p->config->AVCProfileIndication)) {
+		if (gf_avcc_use_extensions(p->config->AVCProfileIndication)) {
 			gf_fprintf(trace, " chroma_format=\"%s\" luma_bit_depth=\"%d\" chroma_bit_depth=\"%d\"", gf_avc_hevc_get_chroma_format_name(p->config->chroma_format), p->config->luma_bit_depth, p->config->chroma_bit_depth);
 		}
 	}
@@ -1508,14 +1649,14 @@
 
 	count = gf_list_count(p->config->sequenceParameterSets);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *c = (GF_AVCConfigSlot *)gf_list_get(p->config->sequenceParameterSets, i);
+		GF_NALUFFParam *c = (GF_NALUFFParam *)gf_list_get(p->config->sequenceParameterSets, i);
 		gf_fprintf(trace, "<SequenceParameterSet size=\"%d\" content=\"", c->size);
 		dump_data(trace, c->data, c->size);
 		gf_fprintf(trace, "\"/>\n");
 	}
 	count = gf_list_count(p->config->pictureParameterSets);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *c = (GF_AVCConfigSlot *)gf_list_get(p->config->pictureParameterSets, i);
+		GF_NALUFFParam *c = (GF_NALUFFParam *)gf_list_get(p->config->pictureParameterSets, i);
 		gf_fprintf(trace, "<PictureParameterSet size=\"%d\" content=\"", c->size);
 		dump_data(trace, c->data, c->size);
 		gf_fprintf(trace, "\"/>\n");
@@ -1524,7 +1665,7 @@
 	if (p->config->sequenceParameterSetExtensions) {
 		count = gf_list_count(p->config->sequenceParameterSetExtensions);
 		for (i=0; i<count; i++) {
-			GF_AVCConfigSlot *c = (GF_AVCConfigSlot *)gf_list_get(p->config->sequenceParameterSetExtensions, i);
+			GF_NALUFFParam *c = (GF_NALUFFParam *)gf_list_get(p->config->sequenceParameterSetExtensions, i);
 			gf_fprintf(trace, "<SequenceParameterSetExtensions size=\"%d\" content=\"", c->size);
 			dump_data(trace, c->data, c->size);
 			gf_fprintf(trace, "\"/>\n");
@@ -1540,7 +1681,18 @@
 GF_Err hvcc_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, count;
-	const char *name = (a->type==GF_ISOM_BOX_TYPE_HVCC) ? "HEVC" : "L-HEVC";
+	const char *name;
+	switch (a->type) {
+	case GF_ISOM_BOX_TYPE_HVCC:
+		name = "HEVC";
+		break;
+	case GF_ISOM_BOX_TYPE_HVCE:
+		name = "DV-HEVC";
+		break;
+	default:
+		name = "L-HEVC";
+		break;
+	}
 	char boxname[256];
 	GF_HEVCConfigurationBox *p = (GF_HEVCConfigurationBox *) a;
 
@@ -1597,11 +1749,11 @@
 	count = gf_list_count(p->config->param_array);
 	for (i=0; i<count; i++) {
 		u32 nalucount, j;
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(p->config->param_array, i);
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(p->config->param_array, i);
 		gf_fprintf(trace, "<ParameterSetArray nalu_type=\"%d\" complete_set=\"%d\">\n", ar->type, ar->array_completeness);
 		nalucount = gf_list_count(ar->nalus);
 		for (j=0; j<nalucount; j++) {
-			GF_AVCConfigSlot *c = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+			GF_NALUFFParam *c = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
 			gf_fprintf(trace, "<ParameterSet size=\"%d\" content=\"", c->size);
 			dump_data(trace, c->data, c->size);
 			gf_fprintf(trace, "\"/>\n");
@@ -1615,6 +1767,86 @@
 	return GF_OK;
 }
 
+GF_Err vvcc_box_dump(GF_Box *a, FILE * trace)
+{
+	u32 i, count;
+	char boxname[256];
+	GF_VVCConfigurationBox *p = (GF_VVCConfigurationBox *) a;
+
+	sprintf(boxname, "VVCConfigurationBox");
+	gf_isom_box_dump_start(a, boxname, trace);
+	gf_fprintf(trace, ">\n");
+
+	if (! p->config) {
+		if (p->size) {
+			gf_fprintf(trace, "\n");
+		} else {
+			gf_fprintf(trace, "<VVCDecoderConfigurationRecord nal_unit_size=\"\" configurationVersion=\"\" ");
+			gf_fprintf(trace, "general_profile_idc=\"\" general_tier_flag=\"\" general_sub_profile_idc=\"\" general_constraint_info=\"\" general_level_idc=\"\" ");
+			gf_fprintf(trace, "chroma_format=\"\" luma_bit_depth=\"\" chroma_bit_depth=\"\" avgFrameRate=\"\" constantFrameRate=\"\" numTemporalLayers=\"\" maxWidth=\"\" maxHeight=\"\"");
+
+			gf_fprintf(trace, ">\n");
+			gf_fprintf(trace, "<ParameterSetArray nalu_type=\"\" complete_set=\"\">\n");
+			gf_fprintf(trace, "<ParameterSet size=\"\" content=\"\"/>\n");
+			gf_fprintf(trace, "</ParameterSetArray>\n");
+			gf_fprintf(trace, "</VVCDecoderConfigurationRecord>\n");
+		}
+		gf_fprintf(trace, "</VVCConfigurationBox>\n");
+		return GF_OK;
+	}
+
+	gf_fprintf(trace, "<VVCDecoderConfigurationRecord nal_unit_size=\"%d\" ", p->config->nal_unit_size);
+	if (p->config->ptl_present) {
+
+		gf_fprintf(trace, "chroma_format=\"%s\" chroma_bit_depth=\"%u\" avgFrameRate=\"%u\" constantFrameRate=\"%u\" numTemporalLayers=\"%u\" maxWidth=\"%u\" maxHeight=\"%u\" ",
+			gf_avc_hevc_get_chroma_format_name(p->config->chroma_format),
+			p->config->bit_depth, p->config->avgFrameRate, p->config->constantFrameRate, p->config->numTemporalLayers, p->config->maxPictureWidth, p->config->maxPictureHeight);
+
+		gf_fprintf(trace, "general_profile_idc=\"%u\" ", p->config->general_profile_idc);
+		gf_fprintf(trace, "general_tier_flag=\"%u\" ", p->config->general_tier_flag);
+		gf_fprintf(trace, "general_sub_profile_idc=\"%u\" ", p->config->general_sub_profile_idc);
+		if (p->config->general_constraint_info) {
+			gf_fprintf(trace, "general_constraint_info=\"");
+			dump_data_hex(trace, p->config->general_constraint_info, p->config->num_constraint_info);
+			gf_fprintf(trace, "\" ");
+		}
+		gf_fprintf(trace, "general_level_idc=\"%u\" ", p->config->general_level_idc);
+	}
+	gf_fprintf(trace, ">\n");
+
+	count = gf_list_count(p->config->param_array);
+	for (i=0; i<count; i++) {
+		u32 nalucount, j;
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(p->config->param_array, i);
+		gf_fprintf(trace, "<ParameterSetArray nalu_type=\"%d\" complete_set=\"%d\">\n", ar->type, ar->array_completeness);
+		nalucount = gf_list_count(ar->nalus);
+		for (j=0; j<nalucount; j++) {
+			GF_NALUFFParam *c = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
+			gf_fprintf(trace, "<ParameterSet size=\"%d\" content=\"", c->size);
+			dump_data(trace, c->data, c->size);
+			gf_fprintf(trace, "\"/>\n");
+		}
+		gf_fprintf(trace, "</ParameterSetArray>\n");
+	}
+
+	gf_fprintf(trace, "</VVCDecoderConfigurationRecord>\n");
+
+	gf_isom_box_dump_done(boxname, a, trace);
+	return GF_OK;
+}
+
+
+GF_Err vvnc_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_VVCNaluConfigurationBox *p = (GF_VVCNaluConfigurationBox *) a;
+
+	gf_isom_box_dump_start(a, "VVCNaluConfigurationBox", trace);
+	gf_fprintf(trace, " nal_unit_size=\"%d\">\n", p->nal_unit_size);
+	gf_isom_box_dump_done("VVCNaluConfigurationBox", a, trace);
+	return GF_OK;
+}
+
+
 GF_Err av1c_box_dump(GF_Box *a, FILE *trace) {
 	GF_AV1ConfigurationBox *ptr = (GF_AV1ConfigurationBox*)a;
 	gf_fprintf(trace, "<AV1ConfigurationBox>\n");
@@ -1771,6 +2003,7 @@
 	gf_fprintf(trace, ">\n");
 	gf_fprintf(trace, "<DefaultBox>\n");
 	tx3g_dump_box(trace, &p->default_box);
+	gf_isom_box_dump_done("DefaultBox", a, trace);
 
 	gf_fprintf(trace, "<DefaultStyle>\n");
 	tx3g_dump_style(trace, &p->default_style);
@@ -2350,7 +2583,7 @@
 	p = (GF_MovieFragmentBox *)a;
 	gf_isom_box_dump_start(a, "MovieFragmentBox", trace);
 	gf_fprintf(trace, "TrackFragments=\"%d\"", gf_list_count(p->TrackList));
-	if (p->compressed_diff)
+	if (p->internal_flags & GF_ISOM_BOX_COMPRESSED)
 		gf_fprintf(trace, " compressedSize=\""LLU"\"", p->size - p->compressed_diff);
 	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MovieFragmentBox", a, trace);
@@ -2431,6 +2664,20 @@
 	return GF_OK;
 }
 
+GF_Err tfrf_box_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_MSSTimeRefBox *ptr = (GF_MSSTimeRefBox*)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "MSSTimeReferenceBox", trace);
+	gf_fprintf(trace, "FragmentsCount=\"%d\">\n", ptr->frags_count);
+	gf_fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"%d\"/>\n", ptr->version, ptr->flags);
+	for (i=0; i<ptr->frags_count; i++) {
+		gf_fprintf(trace, "<Fragment AbsoluteTime=\""LLU"\" FragmentDuration=\""LLU"\">\n", ptr->frags[i].absolute_time_in_track_timescale, ptr->frags[i].fragment_duration_in_track_timescale);
+	}
+	gf_isom_box_dump_done("MSSTimeReferenceBox", a, trace);
+	return GF_OK;
+}
 GF_Err trun_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, flags;
@@ -2787,7 +3034,7 @@
 {
 	u32 i, j, count, di, nb_descs, shift_offset[20], so_count;
 	u64 last_DTS;
-	size_t len;
+	u32 len;
 	GF_Box *a;
 	Bool has_scroll;
 	char szDur[100];
@@ -3003,7 +3250,7 @@
 				str = s_txt->text;
 				len = gf_utf8_mbstowcs((u16*)utf16Line, 10000, (const char **) &str);
 			}
-			if (len != (size_t) -1) {
+			if (len != GF_UTF8_FAIL) {
 				utf16Line[len] = 0;
 				for (j=0; j<len; j++) {
 					if ((utf16Line[j]=='\n') || (utf16Line[j]=='\r') || (utf16Line[j]==0x85) || (utf16Line[j]==0x2028) || (utf16Line[j]==0x2029) ) {
@@ -3137,6 +3384,7 @@
 	u64 start, end;
 	GF_Tx3gSampleEntryBox *txtd;
 	char szDur[100];
+	Bool is_wvtt = GF_FALSE;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, track);
 	u32 subtype = gf_isom_get_media_subtype(the_file, track, 1);
 	if (!trak) return GF_BAD_PARAM;
@@ -3156,7 +3404,9 @@
 	case GF_ISOM_SUBTYPE_TX3G:
 	case GF_ISOM_SUBTYPE_TEXT:
 	case GF_ISOM_SUBTYPE_STXT:
+		break;
 	case GF_ISOM_SUBTYPE_WVTT:
+		is_wvtt = GF_TRUE;
 		break;
 	default:
 		return GF_NOT_SUPPORTED;
@@ -3183,27 +3433,44 @@
 		} else {
 			end = gf_isom_get_media_duration(the_file, track) ;
 		}
-		cur_frame++;
-		gf_fprintf(dump, "%d\n", cur_frame);
-		tx3g_format_time(start, ts, szDur, GF_TRUE);
-		gf_fprintf(dump, "%s --> ", szDur);
-		tx3g_format_time(end, ts, szDur, GF_TRUE);
-		gf_fprintf(dump, "%s\n", szDur);
-
-		if (subtype == GF_ISOM_SUBTYPE_WVTT) {
-			u64 start_ts;
-			void webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue);
+		if (!is_wvtt) {
+			cur_frame++;
+			gf_fprintf(dump, "%d\n", cur_frame);
+			tx3g_format_time(start, ts, szDur, GF_TRUE);
+			gf_fprintf(dump, "%s --> ", szDur);
+			tx3g_format_time(end, ts, szDur, GF_TRUE);
+			gf_fprintf(dump, "%s\n", szDur);
+		}
+
+
+		if (is_wvtt) {
+			u64 start_ts, end_ts;
+			void webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue, Bool write_srt);
 			GF_List *cues;
+			u32 nb_cues;
 			u8 *data;
 			u32 data_len;
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 			start_ts = s->DTS * 1000;
 			start_ts /= trak->Media->mediaHeader->timeScale;
-			cues = gf_webvtt_parse_cues_from_data(s->data, s->dataLength, start_ts);
+			end_ts = end * 1000;
+			end_ts /= trak->Media->mediaHeader->timeScale;
+			cues = gf_webvtt_parse_cues_from_data(s->data, s->dataLength, start_ts, end_ts);
+			gf_isom_sample_del(&s);
+			nb_cues = gf_list_count(cues);
+
+			if (!nb_cues) {
+				gf_list_del(cues);
+				continue;
+			}
+
+			cur_frame++;
+			gf_fprintf(dump, "%d\n", cur_frame);
+
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			for (j = 0; j < gf_list_count(cues); j++) {
 				GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, j);
-				webvtt_write_cue(bs, cue);
+				webvtt_write_cue(bs, cue, GF_TRUE);
 				gf_webvtt_cue_del(cue);
 			}
 			gf_list_del(cues);
@@ -3220,11 +3487,13 @@
 			continue;
 		} else if (subtype == GF_ISOM_SUBTYPE_STXT) {
 			if (s->dataLength)
-			gf_fprintf(dump, "%s\n", s->data);
+				gf_fprintf(dump, "%s\n", s->data);
+			gf_isom_sample_del(&s);
 			continue;
 		}
 		else if ((subtype!=GF_ISOM_SUBTYPE_TX3G) && (subtype!=GF_ISOM_SUBTYPE_TEXT)) {
 			gf_fprintf(dump, "unknwon\n");
+			gf_isom_sample_del(&s);
 			continue;
 		}
 		bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
@@ -3246,9 +3515,8 @@
 				len = txt->len;
 			} else {
 				u8 *str = (u8 *) (txt->text);
-				size_t res = gf_utf8_mbstowcs(utf16Line, 10000, (const char **) &str);
-				if (res==(size_t)-1) return GF_NON_COMPLIANT_BITSTREAM;
-				len = (u32) res;
+				len = gf_utf8_mbstowcs(utf16Line, 10000, (const char **) &str);
+				if (len == GF_UTF8_FAIL) return GF_NON_COMPLIANT_BITSTREAM;
 				utf16Line[len] = 0;
 			}
 			char_num = 0;
@@ -3266,7 +3534,7 @@
 						if (txt->styles->styles[k].startCharOffset>char_num) continue;
 						if (txt->styles->styles[k].endCharOffset<char_num+1) continue;
 
-						if (txt->styles->styles[k].style_flags & (GF_TXT_STYLE_ITALIC | GF_TXT_STYLE_BOLD | GF_TXT_STYLE_UNDERLINED)) {
+						if (txt->styles->styles[k].style_flags & (GF_TXT_STYLE_ITALIC | GF_TXT_STYLE_BOLD | GF_TXT_STYLE_UNDERLINED | GF_TXT_STYLE_STRIKETHROUGH)) {
 							new_styles = txt->styles->styles[k].style_flags;
 							new_color = txt->styles->styles[k].text_color;
 							break;
@@ -3277,7 +3545,9 @@
 					if ((new_styles & GF_TXT_STYLE_BOLD) && !(styles & GF_TXT_STYLE_BOLD)) gf_fprintf(dump, "");
 					if ((new_styles & GF_TXT_STYLE_ITALIC) && !(styles & GF_TXT_STYLE_ITALIC)) gf_fprintf(dump, "");
 					if ((new_styles & GF_TXT_STYLE_UNDERLINED) && !(styles & GF_TXT_STYLE_UNDERLINED)) gf_fprintf(dump, "");
+					if ((new_styles & GF_TXT_STYLE_STRIKETHROUGH) && !(styles & GF_TXT_STYLE_STRIKETHROUGH)) gf_fprintf(dump, "<strike>");
 
+					if ((styles & GF_TXT_STYLE_STRIKETHROUGH) && !(new_styles & GF_TXT_STYLE_STRIKETHROUGH)) gf_fprintf(dump, "</strike>");
 					if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) gf_fprintf(dump, "");
 					if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) gf_fprintf(dump, "");
 					if ((styles & GF_TXT_STYLE_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) gf_fprintf(dump, "");
@@ -3302,21 +3572,22 @@
 				}
 
 				if (!is_new_line) {
-					size_t sl;
+					u32 sl;
 					char szChar[30];
 					s16 swT[2], *swz;
 					swT[0] = utf16Line[j];
 					swT[1] = 0;
 					swz= (s16 *)swT;
 					sl = gf_utf8_wcstombs(szChar, 30, (const unsigned short **) &swz);
-					if (sl == (size_t)-1) sl=0;
-					szChar[(u32) sl]=0;
+					if (sl == GF_UTF8_FAIL) sl=0;
+					szChar[sl]=0;
 					gf_fprintf(dump, "%s", szChar);
 				}
 				char_num++;
 			}
 			new_styles = 0;
 			if (new_styles != styles) {
+				if (styles & GF_TXT_STYLE_STRIKETHROUGH) gf_fprintf(dump, "</strike>");
 				if (styles & GF_TXT_STYLE_UNDERLINED) gf_fprintf(dump, "");
 				if (styles & GF_TXT_STYLE_ITALIC) gf_fprintf(dump, "");
 				if (styles & GF_TXT_STYLE_BOLD) gf_fprintf(dump, "");
@@ -3594,8 +3865,10 @@
 		switch (entry->type) {
 		case GF_ISOM_BOX_TYPE_ENCA:
 		case GF_ISOM_BOX_TYPE_ENCV:
-		case GF_ISOM_BOX_TYPE_ENCT:
 		case GF_ISOM_BOX_TYPE_ENCS:
+		case GF_ISOM_BOX_TYPE_ENCT:
+		case GF_ISOM_BOX_TYPE_ENCF:
+		case GF_ISOM_BOX_TYPE_ENCM:
 			break;
 		default:
 			continue;
@@ -3644,116 +3917,75 @@
 
 GF_Err ilst_item_box_dump(GF_Box *a, FILE * trace)
 {
-	u32 val;
+	u32 val, itype=0;
 	Bool no_dump = GF_FALSE;
-	char *name = "UnknownBox";
+	Bool unknown = GF_FALSE;
+	GF_DataBox *dbox = NULL;
+	const char *name = "UnknownBox";
 	GF_ListItemBox *itune = (GF_ListItemBox *)a;
-	switch (itune->type) {
-	case GF_ISOM_BOX_TYPE_0xA9NAM:
-		name = "NameBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9CMT:
-		name = "CommentBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9DAY:
-		name = "CreatedBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9ART:
-		name = "ArtistBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9TRK:
-		name = "TrackBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9ALB:
-		name = "AlbumBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9COM:
-		name = "CompositorBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9WRT:
-		name = "WriterBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9TOO:
-		name = "ToolBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9CPY:
-		name = "CopyrightBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9DES:
-		name = "DescriptionBox";
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9GEN:
-	case GF_ISOM_BOX_TYPE_GNRE:
-		name = "GenreBox";
-		break;
-	case GF_ISOM_BOX_TYPE_aART:
-		name = "AlbumArtistBox";
-		break;
-	case GF_ISOM_BOX_TYPE_PGAP:
-		name = "GapelessBox";
-		break;
-	case GF_ISOM_BOX_TYPE_DISK:
-		name = "DiskBox";
-		break;
-	case GF_ISOM_BOX_TYPE_TRKN:
-		name = "TrackNumberBox";
-		break;
-	case GF_ISOM_BOX_TYPE_TMPO:
-		name = "TempoBox";
-		break;
-	case GF_ISOM_BOX_TYPE_CPIL:
-		name = "CompilationBox";
-		break;
-	case GF_ISOM_BOX_TYPE_COVR:
-		name = "CoverArtBox";
-		no_dump = GF_TRUE;
-		break;
-	case GF_ISOM_BOX_TYPE_iTunesSpecificInfo:
+
+
+	if (itune->type==GF_ISOM_BOX_TYPE_iTunesSpecificInfo) {
 		name = "iTunesSpecificBox";
 		no_dump = GF_TRUE;
-		break;
-	case GF_ISOM_BOX_TYPE_0xA9GRP:
-		name = "GroupBox";
-		break;
-	case GF_ISOM_ITUNE_ENCODER:
-		name = "EncoderBox";
-		break;
+		dbox = itune->data;
+	} else if (itune->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
+		dbox = (GF_DataBox *) gf_isom_box_find_child(itune->child_boxes, GF_ISOM_BOX_TYPE_DATA);
+		unknown = GF_TRUE;
+	} else {
+		s32 idx = gf_itags_find_by_itag(itune->type);
+		if (idx>=0) {
+			name = gf_itags_get_name((u32) idx);
+			itype = gf_itags_get_type((u32) idx);
+			dbox = itune->data;
+		}
 	}
 	gf_isom_box_dump_start(a, name, trace);
 
-	if (!no_dump && itune->data) {
+	if (!no_dump && dbox) {
 		GF_BitStream *bs;
 		switch (itune->type) {
-		case GF_ISOM_BOX_TYPE_DISK:
-		case GF_ISOM_BOX_TYPE_TRKN:
-			bs = gf_bs_new(itune->data->data, itune->data->dataSize, GF_BITSTREAM_READ);
+		case GF_ISOM_ITUNE_DISK:
+		case GF_ISOM_ITUNE_TRACKNUMBER:
+			bs = gf_bs_new(dbox->data, dbox->dataSize, GF_BITSTREAM_READ);
 			gf_bs_read_int(bs, 16);
 			val = gf_bs_read_int(bs, 16);
-			if (itune->type==GF_ISOM_BOX_TYPE_DISK) {
+			if (itune->type==GF_ISOM_ITUNE_DISK) {
 				gf_fprintf(trace, " DiskNumber=\"%d\" NbDisks=\"%d\" ", val, gf_bs_read_int(bs, 16) );
 			} else {
 				gf_fprintf(trace, " TrackNumber=\"%d\" NbTracks=\"%d\" ", val, gf_bs_read_int(bs, 16) );
 			}
 			gf_bs_del(bs);
 			break;
-		case GF_ISOM_BOX_TYPE_TMPO:
-			bs = gf_bs_new(itune->data->data, itune->data->dataSize, GF_BITSTREAM_READ);
+		case GF_ISOM_ITUNE_TEMPO:
+			bs = gf_bs_new(dbox->data, dbox->dataSize, GF_BITSTREAM_READ);
 			gf_fprintf(trace, " BPM=\"%d\" ", gf_bs_read_int(bs, 16) );
 			gf_bs_del(bs);
 			break;
-		case GF_ISOM_BOX_TYPE_CPIL:
-			gf_fprintf(trace, " IsCompilation=\"%s\" ", (itune->data && itune->data->data && itune->data->data[0]) ? "yes" : "no");
+		case GF_ISOM_ITUNE_COMPILATION:
+			gf_fprintf(trace, " IsCompilation=\"%s\" ", (dbox && dbox->data && dbox->data[0]) ? "yes" : "no");
+			break;
+		case GF_ISOM_ITUNE_GAPLESS:
+			gf_fprintf(trace, " IsGapeless=\"%s\" ", (dbox && dbox->data && itune->data->data[0]) ? "yes" : "no");
 			break;
-		case GF_ISOM_BOX_TYPE_PGAP:
-			gf_fprintf(trace, " IsGapeless=\"%s\" ", (itune->data && itune->data->data && itune->data->data[0]) ? "yes" : "no");
+		case GF_ISOM_ITUNE_GENRE:
+			if (dbox && dbox->data && itune->data->dataSize>=2) {
+				u32 genre = itune->data->data[0];
+				genre<<=8;
+				genre |= itune->data->data[1];
+				gf_fprintf(trace, " value=\"%s\" ", gf_id3_get_genre((u32) genre));
+			}
 			break;
 		default:
-			if (strcmp(name, "UnknownBox") && itune->data && itune->data->data) {
+			if (dbox && dbox->data) {
 				gf_fprintf(trace, " value=\"");
-				if (itune->data && itune->data->data[0]) {
-					dump_data_string(trace, itune->data->data, itune->data->dataSize);
+				if (!unknown && (itype==GF_ITAG_STR)) {
+					dump_data_string(trace, dbox->data, dbox->dataSize);
+				}
+				else if (!unknown && gf_utf8_is_legal(dbox->data, dbox->dataSize) ) {
+					dump_data_string(trace, dbox->data, dbox->dataSize);
 				} else {
-					dump_data(trace, itune->data->data, itune->data->dataSize);
+					dump_data(trace, dbox->data, dbox->dataSize);
 				}
 				gf_fprintf(trace, "\" ");
 			}
@@ -4071,7 +4303,7 @@
 GF_Err txtc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextConfigBox *ptr = (GF_TextConfigBox*)a;
-	const char *name = "TextConfigBox";
+	const char *name = (ptr->type==GF_ISOM_BOX_TYPE_TXTC) ? "TextConfigBox" : "MIMEBox";
 
 	gf_isom_box_dump_start(a, name, trace);
 	gf_fprintf(trace, ">\n");
@@ -4157,17 +4389,33 @@
 	return GF_OK;
 }
 
+GF_Err dmlp_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_TrueHDConfigBox *p = (GF_TrueHDConfigBox *)a;
+
+	gf_isom_box_dump_start(a, "TrueHDConfigBox", trace);
+	gf_fprintf(trace, "format_info=\"%u\" peak_data_rate=\"%u\">\n",
+			p->format_info, p->peak_data_rate);
+	gf_isom_box_dump_done("TrueHDConfigBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err dvcC_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DOVIConfigurationBox *p = (GF_DOVIConfigurationBox *)a;
 	gf_isom_box_dump_start(a, "DOVIConfigurationBox", trace);
-	gf_fprintf(trace, "dv_version_major=\"%u\" dv_version_minor=\"%u\" dv_profile=\"%u\" dv_level=\"%u\" rpu_present_flag=\"%u\" el_present_flag=\"%u\" bl_present_flag=\"%u\">\n",
+	gf_fprintf(trace, "dv_version_major=\"%u\" dv_version_minor=\"%u\" dv_profile=\"%u\" dv_level=\"%u\" rpu_present_flag=\"%u\" el_present_flag=\"%u\" bl_present_flag=\"%u\" compatibility_id=\"%u\">\n",
 		p->DOVIConfig.dv_version_major, p->DOVIConfig.dv_version_minor, p->DOVIConfig.dv_profile, p->DOVIConfig.dv_level,
-		p->DOVIConfig.rpu_present_flag, p->DOVIConfig.el_present_flag, p->DOVIConfig.bl_present_flag);
+		p->DOVIConfig.rpu_present_flag, p->DOVIConfig.el_present_flag, p->DOVIConfig.bl_present_flag, p->DOVIConfig.dv_bl_signal_compatibility_id);
 	gf_isom_box_dump_done("DOVIConfigurationBox", a, trace);
 	return GF_OK;
 }
 
+GF_Err dvvC_box_dump(GF_Box *a, FILE * trace)
+{
+	return dvcC_box_dump(a, trace);
+}
+
 GF_Err lsrc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_LASERConfigurationBox *p = (GF_LASERConfigurationBox *)a;
@@ -4195,7 +4443,7 @@
 	gf_isom_box_dump_start(a, "SegmentIndexBox", trace);
 
 	gf_fprintf(trace, "reference_ID=\"%d\" timescale=\"%d\" earliest_presentation_time=\""LLD"\" first_offset=\""LLD"\"", p->reference_ID, p->timescale, p->earliest_presentation_time, p->first_offset);
-		if (p->compressed_diff)
+	if (p->internal_flags & GF_ISOM_BOX_COMPRESSED)
 		gf_fprintf(trace, " compressedSize=\""LLU"\"", p->size - p->compressed_diff);
 	gf_fprintf(trace, ">\n");
 
@@ -4216,7 +4464,7 @@
 	gf_isom_box_dump_start(a, "SubsegmentIndexBox", trace);
 
 	gf_fprintf(trace, "subsegment_count=\"%d\"", p->subsegment_count);
-	if (p->compressed_diff)
+	if (p->internal_flags & GF_ISOM_BOX_COMPRESSED)
 		gf_fprintf(trace, " compressedSize=\""LLU"\"", p->size - p->compressed_diff);
 	gf_fprintf(trace, ">\n");
 
@@ -4398,15 +4646,20 @@
 		if (isalnum(ptr->grouping_type_parameter&0xFF)) {
 			gf_fprintf(trace, " grouping_type_parameter=\"%s\"", gf_4cc_to_str(ptr->grouping_type_parameter) );
 		} else {
-			gf_fprintf(trace, " grouping_type_parameter=\"%d\"", ptr->grouping_type_parameter);
+			gf_fprintf(trace, " grouping_type_parameter=\"%u\"", ptr->grouping_type_parameter);
 		}
 	}
 	gf_fprintf(trace, ">\n");
 	for (i=0; i<ptr->entry_count; i++) {
-		gf_fprintf(trace, "<SampleGroupBoxEntry sample_count=\"%d\" group_description_index=\"%d\"/>\n", ptr->sample_entries[i].sample_count, ptr->sample_entries[i].group_description_index );
+		GF_SampleGroupEntry *pe = &ptr->sample_entries[i];
+		if (pe->group_description_index>0x10000) {
+			gf_fprintf(trace, "<SampleGroupBoxEntry sample_count=\"%u\" group_description_index=\"%u\" group_description_in_traf=\"1\" />\n", pe->sample_count, pe->group_description_index-0x10000);
+		} else {
+			gf_fprintf(trace, "<SampleGroupBoxEntry sample_count=\"%u\" group_description_index=\"%u\"/>\n", ptr->sample_entries[i].sample_count, ptr->sample_entries[i].group_description_index );
+		}
 	}
 	if (!ptr->size) {
-		gf_fprintf(trace, "<SampleGroupBoxEntry sample_count=\"\" group_description_index=\"\"/>\n");
+		gf_fprintf(trace, "<SampleGroupBoxEntry sample_count=\"\" group_description_index=\"\" group_description_in_traf=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("SampleGroupBox", a, trace);
 	return GF_OK;
@@ -4417,7 +4670,7 @@
 	u32 i, count;
 
 	if (!ptr) {
-		gf_fprintf(trace, "<OperatingPointsInformation scalability_mask=\"Multiview|Spatial scalability|Auxilary|unknown\" num_profile_tier_level=\"\" num_operating_points=\"\" dependency_layers=\"\">\n");
+		gf_fprintf(trace, "<OperatingPointsInformation scalability_mask=\"Multiview|Spatial scalability|Auxiliary|unknown\" num_profile_tier_level=\"\" num_operating_points=\"\" dependency_layers=\"\">\n");
 
 		gf_fprintf(trace, " <ProfileTierLevel general_profile_space=\"\" general_tier_flag=\"\" general_profile_idc=\"\" general_profile_compatibility_flags=\"\" general_constraint_indicator_flags=\"\" />\n");
 
@@ -4439,7 +4692,7 @@
 		gf_fprintf(trace, "Spatial scalability");
 		break;
 	case 8:
-		gf_fprintf(trace, "Auxilary");
+		gf_fprintf(trace, "Auxiliary");
 		break;
 	default:
 		gf_fprintf(trace, "unknown");
@@ -4629,13 +4882,50 @@
 			gf_fprintf(trace, "<SyncSampleGroupEntry NAL_unit_type=\"%d\"/>\n", ((GF_SYNCEntry*)entry)->NALU_type);
 			break;
 		case GF_ISOM_SAMPLE_GROUP_SEIG:
-			gf_fprintf(trace, "<CENCSampleEncryptionGroupEntry IsEncrypted=\"%d\" IV_size=\"%d\" KID=\"", ((GF_CENCSampleEncryptionGroupEntry*)entry)->IsProtected, ((GF_CENCSampleEncryptionGroupEntry*)entry)->Per_Sample_IV_size);
-			dump_data_hex(trace, (char *)((GF_CENCSampleEncryptionGroupEntry*)entry)->KID, 16);
-			if ((((GF_CENCSampleEncryptionGroupEntry*)entry)->IsProtected == 1) && !((GF_CENCSampleEncryptionGroupEntry*)entry)->Per_Sample_IV_size) {
-				gf_fprintf(trace, "\" constant_IV_size=\"%d\" constant_IV=\"", ((GF_CENCSampleEncryptionGroupEntry*)entry)->constant_IV_size);
-				dump_data_hex(trace, (char *)((GF_CENCSampleEncryptionGroupEntry*)entry)->constant_IV, ((GF_CENCSampleEncryptionGroupEntry*)entry)->constant_IV_size);
+		{
+			GF_CENCSampleEncryptionGroupEntry *seig = (GF_CENCSampleEncryptionGroupEntry *)entry;
+			Bool use_mkey = seig->key_info[0] ? GF_TRUE : GF_FALSE;
+
+			gf_fprintf(trace, "<CENCSampleEncryptionGroupEntry IsEncrypted=\"%d\"", seig->IsProtected);
+			if (use_mkey) {
+				u32 k, nb_keys, kpos=3;
+				nb_keys = seig->key_info[1];
+				nb_keys <<= 8;
+				nb_keys |= seig->key_info[2];
+
+				gf_fprintf(trace, ">\n");
+				for (k=0; k<nb_keys; k++) {
+					if (kpos + 17 > seig->key_info_size)
+						break;
+					u8 iv_size = seig->key_info[kpos];
+					gf_fprintf(trace, "<CENCKey IV_size=\"%d\" KID=\"", iv_size);
+					dump_data_hex(trace, seig->key_info+kpos+1, 16);
+					kpos += 17;
+					gf_fprintf(trace, "\"");
+					if ((seig->IsProtected == 1) && !iv_size) {
+						if (kpos + 1 >= seig->key_info_size)
+							break;
+						u8 const_IV_size = seig->key_info[kpos];
+						gf_fprintf(trace, " constant_IV_size=\"%d\" constant_IV=\"", const_IV_size);
+						if (kpos + 1 + const_IV_size >= seig->key_info_size)
+							break;
+						dump_data_hex(trace, (char *)seig->key_info + kpos + 1, const_IV_size);
+						kpos += 1 + const_IV_size;
+						gf_fprintf(trace, "\"");
+					}
+					gf_fprintf(trace, "/>\n");
+				}
+				gf_fprintf(trace, "</CENCSampleEncryptionGroupEntry>\n");
+			} else {
+				gf_fprintf(trace, " IV_size=\"%d\" KID=\"", seig->key_info[3]);
+				dump_data_hex(trace, seig->key_info+4, 16);
+				if ((seig->IsProtected == 1) && !seig->key_info[3]) {
+					gf_fprintf(trace, "\" constant_IV_size=\"%d\" constant_IV=\"", seig->key_info[20]);
+					dump_data_hex(trace, (char *)seig->key_info + 21, seig->key_info[20]);
+				}
+				gf_fprintf(trace, "\"/>\n");
 			}
-			gf_fprintf(trace, "\"/>\n");
+		}
 			break;
 		case GF_ISOM_SAMPLE_GROUP_OINF:
 			oinf_entry_dump(entry, trace);
@@ -4653,6 +4943,33 @@
 		case GF_ISOM_SAMPLE_GROUP_SAP:
 			gf_fprintf(trace, "<SAPEntry dependent_flag=\"%d\" SAP_type=\"%d\" />\n", ((GF_SAPEntry*)entry)->dependent_flag, ((GF_SAPEntry*)entry)->SAP_type);
 			break;
+		case GF_ISOM_SAMPLE_GROUP_SPOR:
+		{
+			GF_SubpictureOrderEntry *spor = (GF_SubpictureOrderEntry *) entry;
+			gf_fprintf(trace, "<SubPictureOrderEntry subpic_id_info_flag=\"%d\" refs=\"", spor->subpic_id_info_flag);
+			for (i=0; i<spor->num_subpic_ref_idx; i++) {
+				if (i) gf_fprintf(trace, " ");
+				gf_fprintf(trace, "%d", spor->subp_track_ref_idx[i]);
+			}
+			gf_fprintf(trace, "\"");
+			if (spor->subpic_id_info_flag) {
+				gf_fprintf(trace, " subpic_id_len_minus1=\"%d\" subpic_id_bit_pos=\"%d\" start_code_emul_flag=\"%d\"", spor->spinfo.subpic_id_len_minus1, spor->spinfo.subpic_id_bit_pos, spor->spinfo.start_code_emul_flag);
+				gf_fprintf(trace, " %s=\"%d\"", spor->spinfo.pps_sps_subpic_id_flag ? "pps_id" : "sps_id", spor->spinfo.xps_id);
+			}
+			gf_fprintf(trace, "/>\n");
+		}
+			break;
+		case GF_ISOM_SAMPLE_GROUP_SULM:
+		{
+			GF_SubpictureLayoutMapEntry *sulm = (GF_SubpictureLayoutMapEntry *) entry;
+			gf_fprintf(trace, "<SubPictureLayoutMapEntry groupID_info_4cc=\"%s\" groupIDs=\"", gf_4cc_to_str(sulm->groupID_info_4cc) );
+			for (i=0; i<sulm->nb_entries; i++) {
+				if (i) gf_fprintf(trace, " ");
+				gf_fprintf(trace, "%d", sulm->groupIDs[i]);
+			}
+			gf_fprintf(trace, "\"/>\n");
+		}
+			break;
 		default:
 			gf_fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"%d\" data=\"", ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
 			dump_data(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data, ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
@@ -4694,6 +5011,13 @@
 		case GF_ISOM_SAMPLE_GROUP_SAP:
 			gf_fprintf(trace, "<SAPEntry dependent_flag=\"\" SAP_type=\"\" />\n");
 			break;
+		case GF_ISOM_SAMPLE_GROUP_SPOR:
+			gf_fprintf(trace, "<SubPictureOrderEntry subpic_id_info_flag=\"\" refs=\"\" subpic_id_len_minus1=\"\" subpic_id_bit_pos=\"\" start_code_emul_flag=\"\" pps_id=\"\" sps_id=\"\" />\n");
+			break;
+		case GF_ISOM_SAMPLE_GROUP_SULM:
+			gf_fprintf(trace, "<SubPictureLayoutMapEntry groupID_info_4cc=\"\" groupIDs=\"\" />\n");
+			break;
+
 		default:
 			gf_fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"\" data=\"\"/>\n");
 		}
@@ -4813,17 +5137,23 @@
 	gf_isom_box_dump_start(a, "TrackEncryptionBox", trace);
 
 	gf_fprintf(trace, "isEncrypted=\"%d\"", ptr->isProtected);
-	if (ptr->Per_Sample_IV_Size)
-		gf_fprintf(trace, " IV_size=\"%d\" KID=\"", ptr->Per_Sample_IV_Size);
+
+	if (ptr->key_info[3])
+		gf_fprintf(trace, " IV_size=\"%d\" KID=\"", ptr->key_info[3]);
 	else {
-		gf_fprintf(trace, " constant_IV_size=\"%d\" constant_IV=\"", ptr->constant_IV_size);
-		dump_data_hex(trace, (char *) ptr->constant_IV, ptr->constant_IV_size);
+		gf_fprintf(trace, " constant_IV_size=\"%d\" constant_IV=\"", ptr->key_info[20]);
+		dump_data_hex(trace, (char *) ptr->key_info+21, ptr->key_info[20]);
 		gf_fprintf(trace, "\" KID=\"");
 	}
-	dump_data_hex(trace, (char *) ptr->KID, 16);
+	dump_data_hex(trace, (char *) ptr->key_info+4, 16);
 	if (ptr->version)
 		gf_fprintf(trace, "\" crypt_byte_block=\"%d\" skip_byte_block=\"%d", ptr->crypt_byte_block, ptr->skip_byte_block);
 	gf_fprintf(trace, "\">\n");
+
+	if (!ptr->size) {
+		gf_fprintf(trace, " IV_size=\"\" KID=\"\" constant_IV_size=\"\" constant_IV=\"\" crypt_byte_block=\"\" skip_byte_block=\"\">\n");
+		gf_fprintf(trace, "<TENCKey IV_size=\"\" KID=\"\" const_IV_size=\"\" constIV=\"\"/>\n");
+	}
 	gf_isom_box_dump_done("TrackEncryptionBox", a, trace);
 	return GF_OK;
 }
@@ -4853,110 +5183,159 @@
 	gf_isom_box_dump_start(a, "PIFFTrackEncryptionBox", trace);
 	fprintf(trace, "Version=\"%d\" Flags=\"%d\" ", ptr->version, ptr->flags);
 
-	gf_fprintf(trace, "AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
-	dump_data_hex(trace,(char *) ptr->KID, 16);
+	gf_fprintf(trace, "AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->key_info[3]);
+	dump_data_hex(trace,(char *) ptr->key_info+4, 16);
 	gf_fprintf(trace, "\">\n");
 	gf_isom_box_dump_done("PIFFTrackEncryptionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err piff_psec_box_dump(GF_Box *a, FILE * trace)
-{
-	u32 i, j, sample_count;
-	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *) a;
-	if (!a) return GF_BAD_PARAM;
-
-	gf_isom_box_dump_start(a, "PIFFSampleEncryptionBox", trace);
-	fprintf(trace, "Version=\"%d\" Flags=\"%d\" ", ptr->version, ptr->flags);
-	sample_count = gf_list_count(ptr->samp_aux_info);
-	gf_fprintf(trace, "sampleCount=\"%d\"", sample_count);
-	if (ptr->flags & 1) {
-		gf_fprintf(trace, " AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
-		dump_data(trace, (char *) ptr->KID, 16);
-		gf_fprintf(trace, "\"");
-	}
-	gf_fprintf(trace, ">\n");
-
-	if (sample_count) {
-		for (i=0; i<sample_count; i++) {
-			GF_CENCSampleAuxInfo *cenc_sample = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
-
-			if (cenc_sample) {
-				gf_fprintf(trace, "<PIFFSampleEncryptionEntry sampleNumber=\"%d\" IV_size=\"%u\"", i+1, cenc_sample->IV_size);
-				if (cenc_sample->IV_size) {
-					gf_fprintf(trace, " IV=\"");
-					dump_data_hex(trace, (char *) cenc_sample->IV, cenc_sample->IV_size);
-					gf_fprintf(trace, "\"");
-				}
-				if (ptr->flags & 0x2) {
-					gf_fprintf(trace, " SubsampleCount=\"%d\"", cenc_sample->subsample_count);
-					gf_fprintf(trace, ">\n");
-
-					for (j=0; j<cenc_sample->subsample_count; j++) {
-						gf_fprintf(trace, "<PIFFSubSampleEncryptionEntry NumClearBytes=\"%d\" NumEncryptedBytes=\"%d\"/>\n", cenc_sample->subsamples[j].bytes_clear_data, cenc_sample->subsamples[j].bytes_encrypted_data);
-					}
-				} else {
-					gf_fprintf(trace, ">\n");
-				}
-				gf_fprintf(trace, "</PIFFSampleEncryptionEntry>\n");
-			}
-		}
-	}
-	if (!ptr->size) {
-		gf_fprintf(trace, "<PIFFSampleEncryptionEntry IV=\"\" SubsampleCount=\"\">\n");
-		gf_fprintf(trace, "<PIFFSubSampleEncryptionEntry NumClearBytes=\"\" NumEncryptedBytes=\"\"/>\n");
-		gf_fprintf(trace, "</PIFFSampleEncryptionEntry>\n");
-	}
-	gf_isom_box_dump_done("PIFFSampleEncryptionBox", a, trace);
-	return GF_OK;
-}
+u8 key_info_get_iv_size(const u8 *key_info, u32 key_info_size, u32 idx, u8 *const_iv_size, const u8 **const_iv);
 
 GF_Err senc_box_dump(GF_Box *a, FILE * trace)
 {
-	u32 i, j, sample_count;
+	u32 i, sample_count;
+	const char *name;
+	GF_BitStream *bs = NULL;
+	u32 piff_IV_size = 0;
+	Bool use_multikey = GF_FALSE;
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *) a;
 	if (!a) return GF_BAD_PARAM;
 
 	if (dump_skip_samples)
 		return GF_OK;
 
-	gf_isom_box_dump_start(a, "SampleEncryptionBox", trace);
+	if (ptr->internal_4cc == GF_ISOM_BOX_UUID_PSEC)
+		name = "PIFFSampleEncryptionBox";
+	else
+		name = "SampleEncryptionBox";
+
+	gf_isom_box_dump_start(a, name, trace);
+
+	if (ptr->internal_4cc == GF_ISOM_BOX_UUID_PSEC) {
+		gf_fprintf(trace, "Version=\"%d\" Flags=\"%d\" ", ptr->version, ptr->flags);
+		if (ptr->flags & 1) {
+			gf_fprintf(trace, " AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
+			dump_data(trace, (char *) ptr->KID, 16);
+			gf_fprintf(trace, "\"");
+			piff_IV_size = ptr->IV_size;
+		}
+	}
+
 	sample_count = gf_list_count(ptr->samp_aux_info);
 	gf_fprintf(trace, "sampleCount=\"%d\">\n", sample_count);
-	//WARNING - PSEC (UUID) IS TYPECASTED TO SENC (FULL BOX) SO WE CANNOT USE USUAL FULL BOX FUNCTIONS
-	gf_fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"0x%X\"/>\n", ptr->version, ptr->flags);
+	if (ptr->internal_4cc != GF_ISOM_BOX_UUID_PSEC) {
+		//WARNING - PSEC (UUID) IS TYPECASTED TO SENC (FULL BOX) SO WE CANNOT USE USUAL FULL BOX FUNCTIONS
+		gf_fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"0x%X\"/>\n", ptr->version, ptr->flags);
+
+		if ((ptr->version==1) && !ptr->piff_type)
+			use_multikey = GF_TRUE;
+	}
+
+
 	for (i=0; i<sample_count; i++) {
-		GF_CENCSampleAuxInfo *cenc_sample = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+		u32 nb_keys=0;
+		u32 iv_size=0;
+		u32 subs_bits=16;
+		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+		if (!sai) break;
+		if (sai->isNotProtected) continue;
+
+		gf_fprintf(trace, "<SampleEncryptionEntry sampleNumber=\"%d\"", i+1);
+		if (sai->key_info) {
+			if (!use_multikey) {
+				iv_size = sai->key_info[3];
+			} else {
+				nb_keys = sai->key_info[1];
+				nb_keys <<= 8;
+				nb_keys |= sai->key_info[2];
+				subs_bits = 32;
+			}
+		}
+		//piff
+		else {
+			iv_size = piff_IV_size ? piff_IV_size : sai->key_info_size;
+		}
 
-		if (cenc_sample) {
-			gf_fprintf(trace, "<SampleEncryptionEntry sampleNumber=\"%d\" IV_size=\"%u\"", i+1, cenc_sample->IV_size);
-			if (cenc_sample->IV_size) {
+		if (!bs)
+			bs = gf_bs_new(sai->cenc_data, sai->cenc_data_size, GF_BITSTREAM_READ);
+		else
+			gf_bs_reassign_buffer(bs, sai->cenc_data, sai->cenc_data_size);
+
+		if (!use_multikey) {
+			gf_fprintf(trace, " IV_size=\"%u\"", iv_size);
+			if (iv_size) {
 				gf_fprintf(trace, " IV=\"");
-				dump_data_hex(trace, (char *) cenc_sample->IV, cenc_sample->IV_size);
+				if (iv_size <= sai->cenc_data_size) {
+					dump_data_hex(trace, (char *) sai->cenc_data, iv_size);
+				} else {
+					gf_fprintf(trace, "CORRUPTED");
+				}
 				gf_fprintf(trace, "\"");
+				gf_bs_skip_bytes(bs, iv_size);
 			}
-			if (ptr->flags & 0x2) {
-				gf_fprintf(trace, " SubsampleCount=\"%d\"", cenc_sample->subsample_count);
-				gf_fprintf(trace, ">\n");
+		} else {
+			u32 k, nb_ivs = gf_bs_read_u16(bs);
+			if (nb_ivs) {
+				gf_fprintf(trace, " multiIV=\"[");
+			}
+			for (k=0; k<nb_ivs; k++) {
+				u32 pos;
+				u32 idx = gf_bs_read_u16(bs);
+				u8 mk_iv_size = key_info_get_iv_size(sai->key_info, sai->key_info_size, idx, NULL, NULL);
+				pos = (u32) gf_bs_get_position(bs);
+				if (mk_iv_size + pos <= sai->cenc_data_size) {
+					gf_fprintf(trace, "%sidx:%d,iv_size:%d,IV:", k ? "," : "", idx, mk_iv_size);
+					dump_data_hex(trace, (char *) sai->cenc_data+pos, mk_iv_size);
+				} else {
+					gf_fprintf(trace, "%sidx:%d,iv_size:%d,IV:CORRUPTED", k ? "," : "", idx, mk_iv_size);
+				}
+				gf_bs_skip_bytes(bs, mk_iv_size);
+			}
+			if (nb_ivs) {
+				gf_fprintf(trace, "]\"");
+			}
+		}
+		if (use_multikey || ((ptr->flags & 0x2) && (sai->cenc_data_size>iv_size)) ) {
+			u32 j, nb_subs;
+
+			nb_subs = gf_bs_read_int(bs, subs_bits);
+			gf_fprintf(trace, " SubsampleCount=\"%u\"", nb_subs);
+			gf_fprintf(trace, ">\n");
 
-				for (j=0; j<cenc_sample->subsample_count; j++) {
-					gf_fprintf(trace, "<SubSampleEncryptionEntry NumClearBytes=\"%d\" NumEncryptedBytes=\"%d\"/>\n", cenc_sample->subsamples[j].bytes_clear_data, cenc_sample->subsamples[j].bytes_encrypted_data);
+			for (j=0; j<nb_subs; j++) {
+				u32 clear, crypt;
+				gf_fprintf(trace, "<SubSampleEncryptionEntry");
+				if (nb_keys>1) {
+					u32 kidx = gf_bs_read_u16(bs);
+					gf_fprintf(trace, " MultiKeyIndex=\"%u\"", kidx);
 				}
-			} else {
-				gf_fprintf(trace, ">\n");
+				clear = gf_bs_read_u16(bs);
+				crypt = gf_bs_read_u32(bs);
+				gf_fprintf(trace, " NumClearBytes=\"%u\" NumEncryptedBytes=\"%u\"/>\n", clear, crypt);
 			}
-			gf_fprintf(trace, "</SampleEncryptionEntry>\n");
+		} else {
+			gf_fprintf(trace, ">\n");
 		}
+		gf_fprintf(trace, "</SampleEncryptionEntry>\n");
 	}
+	if (bs)
+		gf_bs_del(bs);
+		
 	if (!ptr->size) {
 		gf_fprintf(trace, "<SampleEncryptionEntry sampleCount=\"\" IV=\"\" SubsampleCount=\"\">\n");
 		gf_fprintf(trace, "<SubSampleEncryptionEntry NumClearBytes=\"\" NumEncryptedBytes=\"\"/>\n");
 		gf_fprintf(trace, "</SampleEncryptionEntry>\n");
 	}
-	gf_isom_box_dump_done("SampleEncryptionBox", a, trace);
+	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
+GF_Err piff_psec_box_dump(GF_Box *a, FILE * trace)
+{
+	return senc_box_dump(a, trace);
+}
+
 GF_Err prft_box_dump(GF_Box *a, FILE * trace)
 {
 	Double fracs;
@@ -5059,6 +5438,26 @@
 	return GF_OK;
 }
 
+GF_Err a1lx_box_dump(GF_Box *a, FILE * trace)
+{
+ GF_AV1LayeredImageIndexingPropertyBox *ptr = (GF_AV1LayeredImageIndexingPropertyBox*)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "AV1LayeredImageIndexingPropertyBox", trace);
+	gf_fprintf(trace, "large_size=\"%d\" layer_size0=\"%d\" layer_size1=\"%d\" layer_size2=\"%d\">\n", ptr->large_size, ptr->layer_size[0], ptr->layer_size[1], ptr->layer_size[2]);
+	gf_isom_box_dump_done("AV1LayeredImageIndexingPropertyBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err a1op_box_dump(GF_Box *a, FILE * trace)
+{
+ GF_AV1OperatingPointSelectorPropertyBox *ptr = (GF_AV1OperatingPointSelectorPropertyBox*)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "AV1OperatingPointSelectorPropertyBox", trace);
+	gf_fprintf(trace, "op_index=\"%d\">\n", ptr->op_index);
+	gf_isom_box_dump_done("AV1OperatingPointSelectorPropertyBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err colr_box_dump(GF_Box *a, FILE * trace)
 {
 	u8 *prof_data_64=NULL;
@@ -5144,6 +5543,16 @@
 	return GF_OK;
 }
 
+GF_Err imir_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_ImageMirrorBox *ptr = (GF_ImageMirrorBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "ImageMirrorBox", trace);
+	gf_fprintf(trace, "axis=\"%s\">\n", (ptr->axis ? "horizontal" : "vertical"));
+	gf_isom_box_dump_done("ImageMirrorBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err clli_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ContentLightLevelBox *ptr = (GF_ContentLightLevelBox *)a;
@@ -5332,6 +5741,15 @@
 	case GF_ISOM_BOX_TYPE_STRD:
 		name = "SubTrackDefinitionBox";
 		break;
+	case GF_ISOM_BOX_TYPE_SV3D:
+		name = "SphericalVideoBox";
+		break;
+	case GF_ISOM_BOX_TYPE_PROJ:
+		name = "ProjectionBox";
+		break;
+	case GF_ISOM_BOX_TYPE_OTYP:
+		name = "OriginalFileTypeBox";
+		break;
 	}
 
 	gf_isom_box_dump_start(a, name, trace);
@@ -5578,11 +5996,30 @@
 
 	gf_isom_box_dump_start(a, "MHAConfigurationBox", trace);
 
-	gf_fprintf(trace, "configurationVersion=\"%d\" mpegh3daProfileLevelIndication=\"%d\" referenceChannelLayout=\"%d\">\n", p->configuration_version, p->mha_pl_indication, p->reference_channel_layout);
+	gf_fprintf(trace, "configurationVersion=\"%d\" mpegh3daProfileLevelIndication=\"0x%02X\" referenceChannelLayout=\"%d\" data=\"", p->configuration_version, p->mha_pl_indication, p->reference_channel_layout);
+	dump_data(trace, p->mha_config, p->mha_config_size);
+	gf_fprintf(trace, "\">\n");
+
 	gf_isom_box_dump_done("MHAConfigurationBox", a, trace);
 	return GF_OK;
 }
 
+GF_Err mhap_box_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_MHACompatibleProfilesBox *p = (GF_MHACompatibleProfilesBox *) a;
+
+	gf_isom_box_dump_start(a, "MHACompatibleProfilesBox", trace);
+	gf_fprintf(trace, "compatible_profiles=\"");
+	for (i=0; i<p->num_profiles; i++) {
+		if (i)
+			gf_fprintf(trace, " ", p->compat_profiles[i]);
+		gf_fprintf(trace, "%d", p->compat_profiles[i]);
+	}
+	gf_fprintf(trace, "\">\n");
+	gf_isom_box_dump_done("MHACompatibleProfilesBox", a, trace);
+	return GF_OK;
+}
 GF_Err tmcd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TimeCodeSampleEntryBox *p = (GF_TimeCodeSampleEntryBox *) a;
@@ -5798,7 +6235,8 @@
 	GF_EventMessageBox *p = (GF_EventMessageBox *) a;
 
 	gf_isom_box_dump_start(a, "EventMessageBox", trace);
-	fprintf(trace, "timescale=\"%u\" presentation_time_delta=\""LLU"\" event_duration=\"%u\" event_id=\"%u\">\n", p->timescale, p->presentation_time_delta, p->event_duration, p->event_id);
+	fprintf(trace, "timescale=\"%u\" presentation_time%s=\""LLU"\" event_duration=\"%u\" event_id=\"%u\"",
+		p->timescale, (p->version==0) ? "_delta" : "", p->presentation_time_delta, p->event_duration, p->event_id);
 
 	if (p->scheme_id_uri)
 		fprintf(trace, " scheme_id_uri=\"%s\"", p->scheme_id_uri);
@@ -5808,9 +6246,182 @@
 	if (p->message_data)
 		dump_data_attribute(trace, " message_data", p->message_data, p->message_data_size);
 
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("EventMessageBox", a, trace);
 	return GF_OK;
 }
 
+GF_Err csgp_box_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_CompactSampleGroupBox *ptr = (GF_CompactSampleGroupBox*)a;
+	Bool use_msb_traf = ptr->flags & (1<<7);
+	Bool use_grpt_param = ptr->flags & (1<<6);
+
+	gf_isom_box_dump_start(a, "CompactSampleGroupBox", trace);
+	fprintf(trace, "version=\"%u\" index_msb_indicates_fragment_local_description=\"%d\" grouping_type_parameter_present=\"%d\" pattern_size_code=\"%d\" count_size_code=\"%d\" index_size_code=\"%d\" grouping_type=\"%s\" pattern_count=\"%d\"",
+		ptr->version,
+		use_msb_traf,
+		use_grpt_param,
+		((ptr->flags>>4) & 0x3),
+		((ptr->flags>>2) & 0x3),
+		(ptr->flags & 0x3),
+		gf_4cc_to_str(ptr->grouping_type),
+		ptr->pattern_count
+	);
+
+	if (use_grpt_param)
+		fprintf(trace, " grouping_type_paramter=\"%u\"", ptr->grouping_type_parameter);
+	fprintf(trace, ">\n");
+
+	for (i=0; i<ptr->pattern_count; i++) {
+		u32 j;
+		fprintf(trace, "<Pattern length=\"%u\" sample_count=\"%u\" sample_group_indices=\"", ptr->patterns[i].length, ptr->patterns[i].sample_count);
+		for (j=0; j<ptr->patterns[i].length; j++) {
+			u32 idx = ptr->patterns[i].sample_group_description_indices[j];
+			if (j) fprintf(trace, " ");
+			if (use_msb_traf && (idx>0x10000))
+				fprintf(trace, "%d(traf)", idx-0x10000);
+			else
+				fprintf(trace, "%d", idx);
+		}
+		fprintf(trace, "\"/>\n");
+	}
+
+	gf_isom_box_dump_done("CompactSampleGroupBox", a, trace);
+	return GF_OK;
+}
+
+
+GF_Err ienc_box_dump(GF_Box *a, FILE * trace)
+{
+	u32 i, nb_keys, kpos;
+	GF_ItemEncryptionPropertyBox *ptr = (GF_ItemEncryptionPropertyBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "ItemEncryptionPropertyBox", trace);
+	if (ptr->version)
+		gf_fprintf(trace, " skip_byte_block=\"%d\" crypt_byte_block=\"%d\"", ptr->skip_byte_block, ptr->crypt_byte_block);
+	gf_fprintf(trace, ">\n");
+	nb_keys = ptr->key_info ? ptr->key_info[2] : 0;
+	kpos = 3;
+	for (i = 0; i < nb_keys; i++) {
+		u8 iv_size = ptr->key_info[kpos];
+		gf_fprintf(trace, "<KeyInfo KID=\"");
+		dump_data_hex(trace, ptr->key_info + kpos + 1, 16);
+		gf_fprintf(trace, "\"");
+		kpos+=17;
+		if (iv_size) {
+			gf_fprintf(trace, " IV_size=\"%d\"/>\n", iv_size);
+		} else {
+			iv_size = ptr->key_info[kpos];
+			gf_fprintf(trace, " constant_IV_size=\"%d\" constant_IV=\"", iv_size);
+			dump_data_hex(trace, ptr->key_info + kpos + 1, iv_size);
+			gf_fprintf(trace, "\"/>\n");
+			kpos += 1 + iv_size;
+		}
+	}
+	if (!ptr->size)
+		gf_fprintf(trace, "<KeyInfo KID=\"\" IV_size=\"\" constant_IV_size=\"\" constant_IV=\"\" />\n");
+
+	gf_isom_box_dump_done("ItemEncryptionPropertyBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err iaux_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_AuxiliaryInfoPropertyBox *ptr = (GF_AuxiliaryInfoPropertyBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "ItemAuxiliaryInformationBox", trace);
+	gf_fprintf(trace, " aux_info_type=\"%d\" aux_info_parameter=\"%d\">\n", ptr->aux_info_type, ptr->aux_info_parameter);
+	gf_isom_box_dump_done("ItemAuxiliaryInformationBox", a, trace);
+	return GF_OK;
+}
+
+#include <gpac/utf.h>
+
+GF_Err xtra_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_XtraBox *ptr = (GF_XtraBox *)a;
+	u32 i, count = gf_list_count(ptr->tags);
+
+	gf_isom_box_dump_start(a, "XtraBox", trace);
+	gf_fprintf(trace, ">\n");
+	for (i=0; i<count; i++) {
+		GF_XtraTag *tag = gf_list_get(ptr->tags, i);
+
+		gf_fprintf(trace, "<WMATag name=\"%s\" version=\"%d\" type=\"%d\"", tag->name, tag->flags, tag->prop_type);
+		if (!tag->prop_type) {
+			u16 *src_str = (u16 *) tag->prop_value;
+			u32 len = UTF8_MAX_BYTES_PER_CHAR * gf_utf8_wcslen(src_str);
+			char *utf8str = (char *)gf_malloc(len + 1);
+			u32 res_len = gf_utf8_wcstombs(utf8str, len, (const unsigned short **) &src_str);
+			if (res_len != GF_UTF8_FAIL) {
+				utf8str[res_len] = 0;
+
+				gf_fprintf(trace, " value=\"%s\">\n", utf8str);
+			}
+			gf_free(utf8str);
+		} else {
+			gf_fprintf(trace, " value=\"");
+			dump_data_hex(trace, tag->prop_value, tag->prop_size);
+			gf_fprintf(trace, "\">\n");
+		}
+	}
+	gf_isom_box_dump_done("XtraBox", a, trace);
+	return GF_OK;
+}
+
+
+GF_Err st3d_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_Stereo3DBox *ptr = (GF_Stereo3DBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "Stereo3DBox", trace);
+	gf_fprintf(trace, " stereo_type=\"%d\">\n", ptr->stereo_type);
+	gf_isom_box_dump_done("Stereo3DBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err svhd_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_SphericalVideoInfoBox *ptr = (GF_SphericalVideoInfoBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "SphericalVideoInfoBox", trace);
+	gf_fprintf(trace, " info=\"%s\">\n", ptr->string);
+	gf_isom_box_dump_done("SphericalVideoInfoBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err prhd_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_ProjectionHeaderBox *ptr = (GF_ProjectionHeaderBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "ProjectionHeaderBox", trace);
+	gf_fprintf(trace, " yaw=\"%d\" pitch=\"%d\" roll=\"%d\">\n", ptr->yaw, ptr->pitch, ptr->roll);
+	gf_isom_box_dump_done("ProjectionHeaderBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err proj_type_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_ProjectionTypeBox *ptr = (GF_ProjectionTypeBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	if (ptr->type == GF_ISOM_BOX_TYPE_CBMP) {
+		gf_isom_box_dump_start(a, "CubemapProjectionBox", trace);
+		gf_fprintf(trace, " layout=\"%d\" padding=\"%d\">\n", ptr->layout, ptr->padding);
+		gf_isom_box_dump_done("CubemapProjectionBox", a, trace);
+	}
+	else if (ptr->type == GF_ISOM_BOX_TYPE_EQUI) {
+		gf_isom_box_dump_start(a, "EquirectangularProjectionBox", trace);
+		gf_fprintf(trace, " top=\"%d\" bottom=\"%d\" left=\"%d\" right=\"%d\">\n", ptr->bounds_top, ptr->bounds_bottom, ptr->bounds_left, ptr->bounds_right);
+		gf_isom_box_dump_done("EquirectangularProjectionBox", a, trace);
+	}
+	else if (ptr->type == GF_ISOM_BOX_TYPE_MSHP) {
+		gf_isom_box_dump_start(a, "MeshProjectionBox", trace);
+		gf_fprintf(trace, " crc=\"%08X\" encoding=\"%s\" left=\"%d\" right=\"%d\">\n", ptr->crc, gf_4cc_to_str(ptr->encoding_4cc) );
+		gf_isom_box_dump_done("MeshProjectionBox", a, trace);
+	}
+	return GF_OK;
+}
 
 #endif /*GPAC_DISABLE_ISOM_DUMP*/

gpac-1.0.1.tar.gz/src/isomedia/box_funcs.c -> gpac-2.0.0.tar.gz/src/isomedia/box_funcs.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -88,10 +88,12 @@
 
 static GF_Err gf_isom_full_box_read(GF_Box *ptr, GF_BitStream *bs);
 
+u64 unused_bytes = 0;
+
 GF_Err gf_isom_box_parse_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type, Bool is_root_box)
 {
 	u32 type, uuid_type, hdr_size, restore_type;
-	u64 size, start, comp_start, payload_start, end;
+	u64 size, start, comp_start, end;
 	char uuid[16];
 	GF_Err e;
 	GF_BitStream *uncomp_bs = NULL;
@@ -130,7 +132,8 @@
 				size = gf_bs_available(bs) + 8;
 			} else {
 				if (!skip_logs) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Read Box type %s (0x%08X) at position "LLU" has size 0 but is not at root/file level, skipping\n", gf_4cc_to_str(type), type, start));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Read Box type %s (0x%08X) at position "LLU" has size 0 but is not at root/file level !\n", gf_4cc_to_str(type), type, start));
+					return GF_ISOM_INVALID_FILE;
 				}
 				return GF_OK;
 			}
@@ -139,6 +142,7 @@
 			Bool do_uncompress = GF_FALSE;
 			u8 *compb = NULL;
 			u32 osize = 0;
+			u32 otype = type;
 			if (type==GF_4CC('!', 'm', 'o', 'f')) {
 				do_uncompress = GF_TRUE;
 				type = GF_ISOM_BOX_TYPE_MOOF;
@@ -161,7 +165,11 @@
 
 				compressed_size = (u32) (size - 8);
 				gf_bs_read_data(bs, compb, compressed_size);
-				gf_gz_decompress_payload(compb, compressed_size, &uncomp_data, &osize);
+				e = gf_gz_decompress_payload(compb, compressed_size, &uncomp_data, &osize);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Failed to uncompress payload for box type %s (0x%08X)\n", gf_4cc_to_str(otype), otype));
+					return e;
+				}
 
 				//keep size as complete box size for tests below
 				size = osize + 8;
@@ -243,10 +251,6 @@
 	if (restore_type)
 		newBox->type = restore_type;
 
-	payload_start = gf_bs_get_position(bs);
-
-retry_unknown_box:
-
 	end = gf_bs_available(bs);
 	if (size - hdr_size > end ) {
 		newBox->size = size - hdr_size - end;
@@ -258,6 +262,10 @@
 
 	e = gf_isom_full_box_read(newBox, bs);
 	if (!e) e = gf_isom_box_read(newBox, bs);
+	if (e) {
+		if (gf_opts_get_bool("core", "no-check"))
+			e = GF_OK;
+	}
 	newBox->size = size;
 	end = gf_bs_get_position(bs);
 
@@ -288,6 +296,7 @@
 		else if (type==GF_ISOM_BOX_TYPE_SSIX) {
 			((GF_SubsegmentIndexBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
 		}
+		newBox->internal_flags = GF_ISOM_BOX_COMPRESSED;
 	}
 
 
@@ -295,14 +304,6 @@
 		gf_isom_box_del(newBox);
 		*outBox = NULL;
 
-		if (parent_type==GF_ISOM_BOX_TYPE_STSD) {
-			newBox = gf_isom_box_new(GF_ISOM_BOX_TYPE_UNKNOWN);
-			if (!newBox) return GF_OUT_OF_MEM;
-			((GF_UnknownBox *)newBox)->original_4cc = type;
-			newBox->size = size;
-			gf_bs_seek(bs, payload_start);
-			goto retry_unknown_box;
-		}
 		if (!skip_logs) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Read Box \"%s\" (start "LLU") failed (%s) - skipping\n", gf_4cc_to_str(type), start, gf_error_to_string(e)));
 		}
@@ -321,6 +322,7 @@
 		if (!skip_logs) {
 			if ((to_skip!=4) || gf_bs_peek_bits(bs, 32, 0)) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" (start "LLU") has %u extra bytes\n", gf_4cc_to_str(type), start, to_skip));
+				unused_bytes += to_skip;
 			}
 		}
 		gf_bs_skip_bytes(bs, to_skip);
@@ -336,7 +338,7 @@
 	return gf_isom_box_parse_ex(outBox, bs, 0, GF_FALSE);
 }
 
-void gf_isom_box_array_del(GF_List *boxlist)
+void gf_isom_box_array_reset(GF_List *boxlist)
 {
 	u32 count, i;
 	if (!boxlist) return;
@@ -345,6 +347,11 @@
 		GF_Box *a = (GF_Box *)gf_list_get(boxlist, i);
 		if (a) gf_isom_box_del(a);
 	}
+}
+
+void gf_isom_box_array_del(GF_List *boxlist)
+{
+	gf_isom_box_array_reset(boxlist);
 	gf_list_del(boxlist);
 }
 
@@ -367,9 +374,9 @@
 }
 
 
-GF_Err gf_isom_box_array_read(GF_Box *parent, GF_BitStream *bs, GF_Err (*check_child_box)(GF_Box *par, GF_Box *b))
+GF_Err gf_isom_box_array_read(GF_Box *parent, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(parent, bs, check_child_box, parent->type);
+	return gf_isom_box_array_read_ex(parent, bs, parent->type);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -512,20 +519,30 @@
 		GF_Err a_name##_box_size(GF_Box *s);\
 		GF_Err a_name##_box_dump(GF_Box *a, FILE * trace);
 
+#define ISOM_BOX_IMPL_DECL_CHILD(a_name) \
+		GF_Box * a_name##_box_new(); \
+		void a_name##_box_del(GF_Box *); \
+		GF_Err a_name##_box_read(GF_Box *s, GF_BitStream *bs); \
+		GF_Err a_name##_box_write(GF_Box *s, GF_BitStream *bs); \
+		GF_Err a_name##_box_size(GF_Box *s);\
+		GF_Err a_name##_box_dump(GF_Box *a, FILE * trace);\
+		GF_Err a_name##_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem);\
+
+
 ISOM_BOX_IMPL_DECL(reftype)
 ISOM_BOX_IMPL_DECL(ireftype)
 ISOM_BOX_IMPL_DECL(free)
 ISOM_BOX_IMPL_DECL(wide)
 ISOM_BOX_IMPL_DECL(mdat)
-ISOM_BOX_IMPL_DECL(moov)
+ISOM_BOX_IMPL_DECL_CHILD(moov)
 ISOM_BOX_IMPL_DECL(mvhd)
 ISOM_BOX_IMPL_DECL(mdhd)
 ISOM_BOX_IMPL_DECL(vmhd)
 ISOM_BOX_IMPL_DECL(smhd)
 ISOM_BOX_IMPL_DECL(hmhd)
 ISOM_BOX_IMPL_DECL(nmhd)
-ISOM_BOX_IMPL_DECL(stbl)
-ISOM_BOX_IMPL_DECL(dinf)
+ISOM_BOX_IMPL_DECL_CHILD(stbl)
+ISOM_BOX_IMPL_DECL_CHILD(dinf)
 ISOM_BOX_IMPL_DECL(url)
 ISOM_BOX_IMPL_DECL(urn)
 ISOM_BOX_IMPL_DECL(cprt)
@@ -533,14 +550,14 @@
 ISOM_BOX_IMPL_DECL(chpl)
 ISOM_BOX_IMPL_DECL(hdlr)
 ISOM_BOX_IMPL_DECL(iods)
-ISOM_BOX_IMPL_DECL(trak)
-ISOM_BOX_IMPL_DECL(mp4s)
-ISOM_BOX_IMPL_DECL(audio_sample_entry)
+ISOM_BOX_IMPL_DECL_CHILD(trak)
+ISOM_BOX_IMPL_DECL_CHILD(mp4s)
+ISOM_BOX_IMPL_DECL_CHILD(audio_sample_entry)
 ISOM_BOX_IMPL_DECL(gen_sample_entry)
-ISOM_BOX_IMPL_DECL(edts)
-ISOM_BOX_IMPL_DECL(udta)
+ISOM_BOX_IMPL_DECL_CHILD(edts)
+ISOM_BOX_IMPL_DECL_CHILD(udta)
 ISOM_BOX_IMPL_DECL(dref)
-ISOM_BOX_IMPL_DECL(stsd)
+ISOM_BOX_IMPL_DECL_CHILD(stsd)
 ISOM_BOX_IMPL_DECL(stts)
 ISOM_BOX_IMPL_DECL(ctts)
 ISOM_BOX_IMPL_DECL(stsh)
@@ -553,11 +570,11 @@
 ISOM_BOX_IMPL_DECL(sdtp)
 ISOM_BOX_IMPL_DECL(co64)
 ISOM_BOX_IMPL_DECL(esds)
-ISOM_BOX_IMPL_DECL(minf)
+ISOM_BOX_IMPL_DECL_CHILD(minf)
 ISOM_BOX_IMPL_DECL(tkhd)
 ISOM_BOX_IMPL_DECL(tref)
-ISOM_BOX_IMPL_DECL(mdia)
-ISOM_BOX_IMPL_DECL(mfra)
+ISOM_BOX_IMPL_DECL_CHILD(mdia)
+ISOM_BOX_IMPL_DECL_CHILD(mfra)
 ISOM_BOX_IMPL_DECL(tfra)
 ISOM_BOX_IMPL_DECL(mfro)
 ISOM_BOX_IMPL_DECL(uuid)
@@ -568,11 +585,12 @@
 ISOM_BOX_IMPL_DECL(pdin)
 ISOM_BOX_IMPL_DECL(def_parent)
 ISOM_BOX_IMPL_DECL(def_parent_full)
+ISOM_BOX_IMPL_DECL(csgp)
 
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
-ISOM_BOX_IMPL_DECL(hinf)
+ISOM_BOX_IMPL_DECL_CHILD(hinf)
 ISOM_BOX_IMPL_DECL(trpy)
 ISOM_BOX_IMPL_DECL(totl)
 ISOM_BOX_IMPL_DECL(nump)
@@ -594,12 +612,12 @@
 ISOM_BOX_IMPL_DECL(tims)
 ISOM_BOX_IMPL_DECL(tsro)
 ISOM_BOX_IMPL_DECL(ghnt)
-ISOM_BOX_IMPL_DECL(hnti)
+ISOM_BOX_IMPL_DECL_CHILD(hnti)
 ISOM_BOX_IMPL_DECL(sdp)
 ISOM_BOX_IMPL_DECL(rtpo)
 ISOM_BOX_IMPL_DECL(tssy)
 ISOM_BOX_IMPL_DECL(rssr)
-ISOM_BOX_IMPL_DECL(srpp)
+ISOM_BOX_IMPL_DECL_CHILD(srpp)
 ISOM_BOX_IMPL_DECL(rtp_hnti)
 
 #endif
@@ -610,30 +628,31 @@
 
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-ISOM_BOX_IMPL_DECL(mvex)
+ISOM_BOX_IMPL_DECL_CHILD(mvex)
 ISOM_BOX_IMPL_DECL(trex)
-ISOM_BOX_IMPL_DECL(moof)
+ISOM_BOX_IMPL_DECL_CHILD(moof)
 ISOM_BOX_IMPL_DECL(mfhd)
-ISOM_BOX_IMPL_DECL(traf)
+ISOM_BOX_IMPL_DECL_CHILD(traf)
 ISOM_BOX_IMPL_DECL(tfhd)
 ISOM_BOX_IMPL_DECL(trun)
 ISOM_BOX_IMPL_DECL(styp)
 ISOM_BOX_IMPL_DECL(mehd)
 /*smooth streaming timing*/
 ISOM_BOX_IMPL_DECL(tfxd)
+ISOM_BOX_IMPL_DECL(tfrf)
 
 #endif
 
 /*avc ext*/
 ISOM_BOX_IMPL_DECL(avcc)
-ISOM_BOX_IMPL_DECL(video_sample_entry)
+ISOM_BOX_IMPL_DECL_CHILD(video_sample_entry)
 ISOM_BOX_IMPL_DECL(m4ds)
 ISOM_BOX_IMPL_DECL(btrt)
 ISOM_BOX_IMPL_DECL(mehd)
 
 /*3GPP streaming text*/
 ISOM_BOX_IMPL_DECL(ftab)
-ISOM_BOX_IMPL_DECL(tx3g)
+ISOM_BOX_IMPL_DECL_CHILD(tx3g)
 ISOM_BOX_IMPL_DECL(text)
 ISOM_BOX_IMPL_DECL(styl)
 ISOM_BOX_IMPL_DECL(hlit)
@@ -650,26 +669,26 @@
 
 /*WebVTT boxes*/
 ISOM_BOX_IMPL_DECL(boxstring);
-ISOM_BOX_IMPL_DECL(vtcu)
+ISOM_BOX_IMPL_DECL_CHILD(vtcu)
 ISOM_BOX_IMPL_DECL(vtte)
-ISOM_BOX_IMPL_DECL(wvtt)
+ISOM_BOX_IMPL_DECL_CHILD(wvtt)
 
 #endif //GPAC_DISABLE_VTT
 
 /* Items functions */
-ISOM_BOX_IMPL_DECL(meta)
+ISOM_BOX_IMPL_DECL_CHILD(meta)
 ISOM_BOX_IMPL_DECL(xml)
 ISOM_BOX_IMPL_DECL(bxml)
 ISOM_BOX_IMPL_DECL(iloc)
 ISOM_BOX_IMPL_DECL(pitm)
-ISOM_BOX_IMPL_DECL(ipro)
+ISOM_BOX_IMPL_DECL_CHILD(ipro)
 ISOM_BOX_IMPL_DECL(infe)
-ISOM_BOX_IMPL_DECL(iinf)
-ISOM_BOX_IMPL_DECL(iref)
-ISOM_BOX_IMPL_DECL(sinf)
+ISOM_BOX_IMPL_DECL_CHILD(iinf)
+ISOM_BOX_IMPL_DECL_CHILD(iref)
+ISOM_BOX_IMPL_DECL_CHILD(sinf)
 ISOM_BOX_IMPL_DECL(frma)
 ISOM_BOX_IMPL_DECL(schm)
-ISOM_BOX_IMPL_DECL(schi)
+ISOM_BOX_IMPL_DECL_CHILD(schi)
 ISOM_BOX_IMPL_DECL(enca)
 ISOM_BOX_IMPL_DECL(encs)
 ISOM_BOX_IMPL_DECL(encv)
@@ -708,18 +727,19 @@
 
 ISOM_BOX_IMPL_DECL(pasp)
 ISOM_BOX_IMPL_DECL(clap)
-ISOM_BOX_IMPL_DECL(metx)
+ISOM_BOX_IMPL_DECL_CHILD(metx)
 ISOM_BOX_IMPL_DECL(txtc)
 ISOM_BOX_IMPL_DECL(tsel)
 ISOM_BOX_IMPL_DECL(dimC)
-ISOM_BOX_IMPL_DECL(dims)
+ISOM_BOX_IMPL_DECL_CHILD(dims)
 ISOM_BOX_IMPL_DECL(diST)
 ISOM_BOX_IMPL_DECL(ac3)
 ISOM_BOX_IMPL_DECL(ec3)
 ISOM_BOX_IMPL_DECL(dac3)
 ISOM_BOX_IMPL_DECL(dec3)
+ISOM_BOX_IMPL_DECL(dmlp)
 ISOM_BOX_IMPL_DECL(lsrc)
-ISOM_BOX_IMPL_DECL(lsr1)
+ISOM_BOX_IMPL_DECL_CHILD(lsr1)
 ISOM_BOX_IMPL_DECL(mvcg)
 ISOM_BOX_IMPL_DECL(vwid)
 
@@ -763,6 +783,8 @@
 ISOM_BOX_IMPL_DECL(av1c)
 ISOM_BOX_IMPL_DECL(dOps)
 ISOM_BOX_IMPL_DECL(prft)
+ISOM_BOX_IMPL_DECL(vvcc)
+ISOM_BOX_IMPL_DECL(vvnc)
 
 //VPx
 ISOM_BOX_IMPL_DECL(vpcc)
@@ -772,13 +794,13 @@
 ISOM_BOX_IMPL_DECL(trep)
 
 //FEC
-ISOM_BOX_IMPL_DECL(fiin)
-ISOM_BOX_IMPL_DECL(paen)
+ISOM_BOX_IMPL_DECL_CHILD(fiin)
+ISOM_BOX_IMPL_DECL_CHILD(paen)
 ISOM_BOX_IMPL_DECL(fpar)
 ISOM_BOX_IMPL_DECL(fecr)
 ISOM_BOX_IMPL_DECL(segr)
 ISOM_BOX_IMPL_DECL(gitn)
-ISOM_BOX_IMPL_DECL(fdsa)
+ISOM_BOX_IMPL_DECL_CHILD(fdsa)
 ISOM_BOX_IMPL_DECL(fdpa)
 ISOM_BOX_IMPL_DECL(extr)
 
@@ -786,11 +808,11 @@
 /*
 	Adobe's protection boxes
 */
-ISOM_BOX_IMPL_DECL(adkm)
-ISOM_BOX_IMPL_DECL(ahdr)
-ISOM_BOX_IMPL_DECL(aprm)
+ISOM_BOX_IMPL_DECL_CHILD(adkm)
+ISOM_BOX_IMPL_DECL_CHILD(ahdr)
+ISOM_BOX_IMPL_DECL_CHILD(aprm)
 ISOM_BOX_IMPL_DECL(aeib)
-ISOM_BOX_IMPL_DECL(akey)
+ISOM_BOX_IMPL_DECL_CHILD(akey)
 ISOM_BOX_IMPL_DECL(flxs)
 ISOM_BOX_IMPL_DECL(adaf)
 
@@ -800,19 +822,26 @@
 ISOM_BOX_IMPL_DECL(pixi)
 ISOM_BOX_IMPL_DECL(rloc)
 ISOM_BOX_IMPL_DECL(irot)
+ISOM_BOX_IMPL_DECL(imir)
 ISOM_BOX_IMPL_DECL(ipco)
-ISOM_BOX_IMPL_DECL(iprp)
+ISOM_BOX_IMPL_DECL_CHILD(iprp)
 ISOM_BOX_IMPL_DECL(ipma)
-ISOM_BOX_IMPL_DECL(trgr)
+ISOM_BOX_IMPL_DECL_CHILD(trgr)
 ISOM_BOX_IMPL_DECL(trgt)
+ISOM_BOX_IMPL_DECL(ienc)
+ISOM_BOX_IMPL_DECL(iaux)
 
 /* MIAF declarations */
 ISOM_BOX_IMPL_DECL(clli)
 ISOM_BOX_IMPL_DECL(mdcv)
 
+/* AVIF declarations */
+ISOM_BOX_IMPL_DECL(a1lx)
+ISOM_BOX_IMPL_DECL(a1op)
+
 ISOM_BOX_IMPL_DECL(grpl)
 
-ISOM_BOX_IMPL_DECL(strk)
+ISOM_BOX_IMPL_DECL_CHILD(strk)
 ISOM_BOX_IMPL_DECL(stri)
 ISOM_BOX_IMPL_DECL(stsg)
 ISOM_BOX_IMPL_DECL(elng)
@@ -825,41 +854,61 @@
 ISOM_BOX_IMPL_DECL(bloc)
 ISOM_BOX_IMPL_DECL(ainf)
 ISOM_BOX_IMPL_DECL(mhac)
+ISOM_BOX_IMPL_DECL(mhap)
 
 ISOM_BOX_IMPL_DECL(grptype)
 
-ISOM_BOX_IMPL_DECL(jp2h)
+ISOM_BOX_IMPL_DECL_CHILD(jp2h)
 ISOM_BOX_IMPL_DECL(ihdr)
 ISOM_BOX_IMPL_DECL(load)
 
 /* Dolby Vision */
 ISOM_BOX_IMPL_DECL(dvcC)
+ISOM_BOX_IMPL_DECL(dvvC)
 ISOM_BOX_IMPL_DECL(dvhe)
 ISOM_BOX_IMPL_DECL(dfla)
 
 ISOM_BOX_IMPL_DECL(pcmC)
 ISOM_BOX_IMPL_DECL(chnl)
 
+ISOM_BOX_IMPL_DECL(xtra)
+
+ISOM_BOX_IMPL_DECL(st3d)
+ISOM_BOX_IMPL_DECL(svhd)
+ISOM_BOX_IMPL_DECL(prhd)
+ISOM_BOX_IMPL_DECL(proj_type)
+//ISOM_BOX_IMPL_DECL(mesh)
 
 
 #define BOX_DEFINE(__type, b_rad, __par) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, "p12", GF_FALSE}
 
+#define BOX_DEFINE_CHILD(__type, b_rad, __par) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, "p12", GF_FALSE, b_rad##_on_child_box}
+
 #define BOX_DEFINE_S(__type, b_rad, __par, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, __spec, GF_FALSE }
 
+#define BOX_DEFINE_S_CHILD(__type, b_rad, __par, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, __spec, GF_FALSE, b_rad##_on_child_box}
+
 #define FBOX_DEFINE(__type, b_rad, __par, __max_v) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, "p12", GF_FALSE }
 
+#define FBOX_DEFINE_CHILD(__type, b_rad, __par, __max_v) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, "p12", GF_FALSE, b_rad##_on_child_box}
+
 #define FBOX_DEFINE_FLAGS(__type, b_rad, __par, __max_v, flags) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, flags, __par, "p12", GF_FALSE }
 
 #define FBOX_DEFINE_FLAGS_S(__type, b_rad, __par, __max_v, flags, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, flags, __par, __spec, GF_FALSE }
 
 #define FBOX_DEFINE_S(__type, b_rad, __par, __max_v, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, __spec, GF_FALSE }
 
+#define FBOX_DEFINE_S_CHILD(__type, b_rad, __par, __max_v, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, __spec, GF_FALSE, b_rad##_on_child_box}
+
 #define TREF_DEFINE(__type, b_rad, __par, __4cc, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, __4cc, 0, 0, __par, __spec, GF_FALSE }
 
 #define TRGT_DEFINE(__type, b_rad, __par, __4cc, max_version, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, __4cc, 1+max_version, 0, __par, __spec, GF_FALSE }
 
 #define SGPD_DEFINE(__type, b_rad, __par, __4cc, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, __4cc, 1, 0, __par, __spec, GF_FALSE }
 
+#define ITUNES_TAG(_val) \
+	BOX_DEFINE_S( _val, ilst_item, "ilst data", "apple")
+
 static struct box_registry_entry {
 	u32 box_4cc;
 	GF_Box * (*new_fn)();
@@ -874,6 +923,7 @@
 	const char *parents_4cc;
 	const char *spec;
 	Bool disabled;
+	GF_Err (*add_rem_fn)(GF_Box *par, GF_Box *b, Bool is_remove);
 } box_registry [] =
 {
 	//DO NOT MOVE THE FIRST ENTRY
@@ -946,6 +996,7 @@
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_TSCL, "p15"),
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_VIPR, "p15"),
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_LBLI, "p15"),
+	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_SPOR, "p15"),
 
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_3GAG, "3gpp"),
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_AVCB, "3gpp"),
@@ -965,7 +1016,7 @@
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_SKIP, free, "*"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_MDAT, mdat, "file"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_IDAT, mdat, "meta"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_MOOV, moov, "file"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_MOOV, moov, "file"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_MVHD, mvhd, "moov", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_MDHD, mdhd, "mdia", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_VMHD, vmhd, "minf", 0),
@@ -973,18 +1024,18 @@
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_HMHD, hmhd, "minf", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_NMHD, nmhd, "minf", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STHD, nmhd, "minf", 0),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_STBL, stbl, "minf"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_DINF, dinf, "minf meta"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_STBL, stbl, "minf"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_DINF, dinf, "minf meta"),
 	FBOX_DEFINE_FLAGS( GF_ISOM_BOX_TYPE_URL, url, "dref", 0, 1),
 	FBOX_DEFINE_FLAGS( GF_ISOM_BOX_TYPE_URN, urn, "dref", 0, 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_CPRT, cprt, "udta", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_KIND, kind, "udta", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_HDLR, hdlr, "mdia meta minf", 0),	//minf container is OK in QT ...
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_TRAK, trak, "moov"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_EDTS, edts, "trak"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_UDTA, udta, "moov trak moof traf"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_TRAK, trak, "moov"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_EDTS, edts, "trak"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_UDTA, udta, "moov trak moof traf"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_DREF, dref, "dinf", 0),
-	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STSD, stsd, "stbl", 0),
+	FBOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_STSD, stsd, "stbl", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STTS, stts, "stbl", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_CTTS, ctts, "stbl", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_CSLG, cslg, "stbl trep", 1),
@@ -998,67 +1049,69 @@
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STDP, stdp, "stbl", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_SDTP, sdtp, "stbl traf", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_CO64, co64, "stbl", 0),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_MINF, minf, "mdia"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_MINF, minf, "mdia"),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_TKHD, tkhd, "trak", 1, 0x000001 | 0x000002 | 0x000004 | 0x000008),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_TREF, tref, "trak"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_MDIA, mdia, "trak"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_MFRA, mfra, "file"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_MDIA, mdia, "trak"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_MFRA, mfra, "file"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_MFRO, mfro, "mfra", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_TFRA, tfra, "mfra", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_ELNG, elng, "mdia", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_PDIN, pdin, "file", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_SBGP, sbgp, "stbl traf", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", 2),
+	BOX_DEFINE( GF_ISOM_BOX_TYPE_CSGP, csgp, "stbl traf"),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_SAIZ, saiz, "stbl traf", 0, 0),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_SAIZ, saiz, "stbl traf", 0, 1),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_SAIO, saio, "stbl traf", 1, 0),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_SAIO, saio, "stbl traf", 1, 1),
 	FBOX_DEFINE_FLAGS( GF_ISOM_BOX_TYPE_SUBS, subs, "stbl traf", 0, 7), //warning flags are not used as a bit mask but as an enum!!
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_TRGR, trgr, "trak"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_FTYP, ftyp, "file"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_TRGR, trgr, "trak"),
+	BOX_DEFINE( GF_ISOM_BOX_TYPE_FTYP, ftyp, "file otyp"),
+	BOX_DEFINE( GF_ISOM_BOX_TYPE_OTYP, def_parent, "file"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_PADB, padb, "stbl", 0),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_BTRT, btrt, "sample_entry"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_PASP, pasp, "video_sample_entry ipco"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_CLAP, clap, "video_sample_entry ipco"),
-	FBOX_DEFINE( GF_ISOM_BOX_TYPE_META, meta, "file moov trak moof traf udta", 0),	//apple uses meta in moov->udta
+	FBOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_META, meta, "file moov trak moof traf udta", 0),	//apple uses meta in moov->udta
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_XML, xml, "meta", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_BXML, bxml, "meta", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_ILOC, iloc, "meta", 2),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_PITM, pitm, "meta", 1),
-	FBOX_DEFINE( GF_ISOM_BOX_TYPE_IPRO, ipro, "meta", 0),
+	FBOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_IPRO, ipro, "meta", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_INFE, infe, "iinf", 3),
-	FBOX_DEFINE( GF_ISOM_BOX_TYPE_IINF, iinf, "meta", 1),
-	FBOX_DEFINE( GF_ISOM_BOX_TYPE_IREF, iref, "meta", 1),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_SINF, sinf, "ipro sample_entry"),
+	FBOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_IINF, iinf, "meta", 1),
+	FBOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_IREF, iref, "meta", 1),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_SINF, sinf, "ipro sample_entry"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_RINF, sinf, "sample_entry"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_FRMA, frma, "sinf rinf"),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_SCHM, schm, "sinf rinf", 0, 1),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_SCHI, schi, "sinf rinf"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_ENCA, audio_sample_entry, "stsd"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_ENCV, video_sample_entry, "stsd"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_RESV, video_sample_entry, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_SCHI, schi, "sinf rinf"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_ENCA, audio_sample_entry, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_ENCV, video_sample_entry, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_RESV, video_sample_entry, "stsd"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_TSEL, tsel, "udta", 0),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_STRK, strk, "udta"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_STRK, strk, "udta"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STRI, stri, "strk", 0),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_STRD, def_parent, "strk"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STSG, stsg, "strd", 0),
 
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_ENCS, mp4s, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_ENCS, mp4s, "stsd"),
 	//THIS HAS TO BE FIXED, not extensible
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_ENCT, mp4s, "stsd"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_ENCM, mp4s, "stsd"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_ENCF, mp4s, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_ENCT, mp4s, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_ENCM, mp4s, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_ENCF, mp4s, "stsd"),
 
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_METX, metx, "stsd"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_METT, metx, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_METX, metx, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_METT, metx, "stsd"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STVI, stvi, "schi", 0),
 
 
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_CHNL, chnl, "audio_sample_entry", 0),
 
 	//FEC
-	FBOX_DEFINE( GF_ISOM_BOX_TYPE_FIIN, fiin, "meta", 0),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_PAEN, paen, "fiin"),
+	FBOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_FIIN, fiin, "meta", 0),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_PAEN, paen, "fiin"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_FPAR, fpar, "paen", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_FECR, fecr, "paen", 1),
 	//fire uses the same box syntax as fecr
@@ -1067,7 +1120,7 @@
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_GITN, gitn, "fiin", 0),
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_FDSA, fdsa, "fdp_sample"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_FDSA, fdsa, "fdp_sample"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_FDPA, fdpa, "fdsa"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_EXTR, extr, "fdsa"),
 #endif
@@ -1089,9 +1142,9 @@
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_FDP_STSD, ghnt, "stsd"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_RRTP_STSD, ghnt, "stsd"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_RTCP_STSD, ghnt, "stsd"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_HNTI, hnti, "udta"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_HNTI, hnti, "udta"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_SDP, sdp, "hnti"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_HINF, hinf, "udta"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_HINF, hinf, "udta"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_TRPY, trpy, "hinf"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_NUMP, nump, "hinf"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_TPYL, tpyl, "hinf"),
@@ -1118,19 +1171,19 @@
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_NAME, name, "udta"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_TSSY, tssy, "rrtp"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_RSSR, rssr, "rrtp"),
-	FBOX_DEFINE( GF_ISOM_BOX_TYPE_SRPP, srpp, "srtp", 0),
+	FBOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_SRPP, srpp, "srtp", 0),
 
 #endif
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_MVEX, mvex, "moov"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_MVEX, mvex, "moov"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_MEHD, mehd, "mvex", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_TREX, trex, "mvex", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_LEVA, leva, "mvex", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_TREP, trep, "mvex", 0),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_MOOF, moof, "file"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_MOOF, moof, "file"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_MFHD, mfhd, "moof", 0),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_TRAF, traf, "moof"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_TRAF, traf, "moof"),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_TFHD, tfhd, "traf", 0, 0x000001|0x000002|0x000008|0x000010|0x000020|0x010000|0x020000),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_TRUN, trun, "traf", 0, 0x000001|0x000004|0x000100|0x000200|0x000400|0x000800),
 #ifdef GF_ENABLE_CTRN
@@ -1148,74 +1201,82 @@
 
 	//part14 boxes
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_IODS, iods, "moov", 0, "p14"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MP4S, mp4s, "stsd", "p14"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MP4V, video_sample_entry, "stsd", "p14"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MP4A, audio_sample_entry, "stsd", "p14"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MP4S, mp4s, "stsd", "p14"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MP4V, video_sample_entry, "stsd", "p14"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MP4A, audio_sample_entry, "stsd", "p14"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_M4DS, m4ds, "sample_entry", "p14"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_ESDS, esds, "mp4a mp4s mp4v encv enca encs resv wave", 0, "p14"),
 
 	//part 15 boxes
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AVCC, avcc, "avc1 avc2 avc3 avc4 encv resv ipco", "p15"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AVCC, avcc, "avc1 avc2 avc3 avc4 encv resv ipco dva1 dvav", "p15"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_SVCC, avcc, "avc1 avc2 avc3 avc4 svc1 svc2 encv resv", "p15"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MVCC, avcc, "avc1 avc2 avc3 avc4 mvc1 mvc2 encv resv", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HVCC, hvcc, "hvc1 hev1 hvc2 hev2 encv resv ipco dvhe", "p15"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HVCC, hvcc, "hvc1 hev1 hvc2 hev2 encv resv ipco dvh1 dvhe", "p15"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_LHVC, hvcc, "hvc1 hev1 hvc2 hev2 lhv1 lhe1 encv resv ipco", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AVC1, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AVC2, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AVC3, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AVC4, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_SVC1, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MVC1, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HVC1, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HEV1, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HVC2, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HEV2, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_LHV1, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_LHE1, video_sample_entry, "stsd", "p15"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HVT1, video_sample_entry, "stsd", "p15"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_VVCC, vvcc, "vvc1 vvi1 encv resv ipco dvhe", 0, "p15"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_VVNC, vvnc, "vvs1 encv resv ipco dvhe", 0, "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_AVC1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_AVC2, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_AVC3, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_AVC4, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_SVC1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MVC1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_HVC1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_HEV1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_HVC2, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_HEV2, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_LHV1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_LHE1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_HVT1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_VVC1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_VVI1, video_sample_entry, "stsd", "p15"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_VVS1, video_sample_entry, "stsd", "p15"),
 	FBOX_DEFINE_S(GF_ISOM_BOX_TYPE_MVCI, def_parent_full, "minf", 0, "p15"),
 	FBOX_DEFINE_S(GF_ISOM_BOX_TYPE_MVCG, mvcg, "mvci", 0, "p15"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_VWID, vwid, "video_sample_entry", 0, "p15"),
 
 	//mpegh 3D audio boxes
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHA1, audio_sample_entry, "stsd", "mpegh3Daudio"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHA2, audio_sample_entry, "stsd", "mpegh3Daudio"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHM1, audio_sample_entry, "stsd", "mpegh3Daudio"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHM2, audio_sample_entry, "stsd", "mpegh3Daudio"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MHA1, audio_sample_entry, "stsd", "mpegh3Daudio"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MHA2, audio_sample_entry, "stsd", "mpegh3Daudio"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MHM1, audio_sample_entry, "stsd", "mpegh3Daudio"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MHM2, audio_sample_entry, "stsd", "mpegh3Daudio"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHAC, mhac, "mha1 mha2 mhm1 mhm2 wave", "mpegh3Daudio"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHAP, mhap, "mha1 mha2 mhm1 mhm2 wave", "mpegh3Daudio"),
 
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IPCM, audio_sample_entry, "stsd", "23003_5"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_FPCM, audio_sample_entry, "stsd", "23003_5"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_IPCM, audio_sample_entry, "stsd", "23003_5"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_FPCM, audio_sample_entry, "stsd", "23003_5"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_PCMC, pcmC, "ipcm fpcm", 0, "23003_5"),
 
 	//AV1 in ISOBMFF boxes
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_AV01, video_sample_entry, "stsd", "av1"),
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_AV1C, av1c, "av01 encv resv ipco", "av1"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_AV01, video_sample_entry, "stsd", "av1"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_AV1C, av1c, "av01 encv resv ipco dav1", "av1"),
 
 	// VP8-9 boxes
 	FBOX_DEFINE_FLAGS_S( GF_ISOM_BOX_TYPE_VPCC, vpcc, "vp08 vp09 encv resv", 1, 0, "vp"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VP08, video_sample_entry, "stsd", "vp"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VP09, video_sample_entry, "stsd", "vp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_VP08, video_sample_entry, "stsd", "vp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_VP09, video_sample_entry, "stsd", "vp"),
 	FBOX_DEFINE_FLAGS_S(GF_ISOM_BOX_TYPE_SMDM, SmDm, "vp08 vp09 encv resv", 1, 0, "vp"),
 	FBOX_DEFINE_FLAGS_S(GF_ISOM_BOX_TYPE_COLL, CoLL, "vp08 vp09 encv resv", 1, 0, "vp"),
 
 	//Opus in ISOBMFF boxes
 #ifndef GPAC_DISABLE_OGG
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_OPUS, audio_sample_entry, "stsd", "Opus"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_OPUS, audio_sample_entry, "stsd", "Opus"),
 	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DOPS, dOps, "Opus wave enca", "Opus"),
 #endif
 
 	//part20 boxes
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_LSR1, lsr1, "stsd", "p20"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_LSR1, lsr1, "stsd", "p20"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_LSRC, lsrc, "lsr1", "p20"),
 
 	//part30 boxes
 #ifndef GPAC_DISABLE_TTXT
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_STXT, metx, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_STXT, metx, "stsd"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_TXTC, txtc, "stxt mett sbtt", 0),
+	//we allow mime in any sample entry, not restricted in the spec ...
+	FBOX_DEFINE( GF_ISOM_BOX_TYPE_MIME, txtc, "sample_entry", 0),
 #ifndef GPAC_DISABLE_VTT
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_WVTT, wvtt, "stsd", "p30"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VTCC_CUE, vtcu, "vtt_sample", "p30"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_WVTT, wvtt, "stsd", "p30"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_VTCC_CUE, vtcu, "vtt_sample", "p30"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VTTE, vtte, "vtt_sample", "p30"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VTTC_CONFIG, boxstring, "wvtt", "p30"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_CTIM, boxstring, "vttc", "p30"),
@@ -1224,12 +1285,12 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_PAYL, boxstring, "vttc", "p30"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VTTA, boxstring, "vttc", "p30"),
 #endif
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_STPP, metx, "stsd"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_SBTT, metx, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_STPP, metx, "stsd"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_SBTT, metx, "stsd"),
 #endif
 
 	//Image File Format
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IPRP, iprp, "meta", "iff"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_IPRP, iprp, "meta", "iff"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IPCO, ipco, "iprp", "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_ISPE, ispe, "ipco", 0, "iff"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_COLR, colr, "video_sample_entry ipco encv resv", "iff"),
@@ -1238,6 +1299,7 @@
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_PIXI, pixi, "ipco", 0, "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_RLOC, rloc, "ipco", 0, "iff"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IROT, irot, "ipco", "iff"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IMIR, imir, "ipco", "iff"),
 	FBOX_DEFINE_FLAGS_S( GF_ISOM_BOX_TYPE_IPMA, ipma, "iprp", 1, 1, "iff"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_GRPL, grpl, "meta", "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_CCST, ccst, "sample_entry", 0, "iff"),
@@ -1246,28 +1308,34 @@
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_AUXC, auxc, "ipco", 0, "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_OINF, oinf, "ipco", 0, "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_TOLS, tols, "ipco", 0, "iff"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_IENC, ienc, "ipco", 0, "cenc"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_IAUX, iaux, "ipco", 0, "cenc"),
 
 	//MIAF
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_CLLI, clli, "mp4v jpeg avc1 avc2 avc3 avc4 svc1 svc2 hvc1 hev1 hvc2 hev2 lhv1 lhe1 encv resv", "miaf"),
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_MDCV, mdcv, "mp4v jpeg avc1 avc2 avc3 avc4 svc1 svc2 hvc1 hev1 hvc2 hev2 lhv1 lhe1 encv resv", "miaf"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_CLLI, clli, "video_sample_entry ipco encv resv", "p12"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_MDCV, mdcv, "video_sample_entry ipco encv resv", "p12"),
+
+	//AVIF
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_A1LX, a1lx, "ipco", "avif"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_A1OP, a1op, "ipco", "avif"),
 
 	//other MPEG boxes
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_RVCC, rvcc, "avc1 avc2 avc3 avc4 svc1 svc2 hvc1 hev1 hvc2 hev2 lhv1 lhe1 encv resv", "rvc"),
 
 	//3GPP boxes
-	BOX_DEFINE_S( GF_ISOM_SUBTYPE_3GP_AMR, audio_sample_entry, "stsd", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_SUBTYPE_3GP_AMR_WB, audio_sample_entry, "stsd", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_SUBTYPE_3GP_QCELP, audio_sample_entry, "stsd", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_SUBTYPE_3GP_EVRC, audio_sample_entry, "stsd", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_SUBTYPE_3GP_SMV, audio_sample_entry, "stsd", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_SUBTYPE_3GP_H263, video_sample_entry, "stsd", "3gpp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_SUBTYPE_3GP_AMR, audio_sample_entry, "stsd", "3gpp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_SUBTYPE_3GP_AMR_WB, audio_sample_entry, "stsd", "3gpp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_SUBTYPE_3GP_QCELP, audio_sample_entry, "stsd", "3gpp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_SUBTYPE_3GP_EVRC, audio_sample_entry, "stsd", "3gpp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_SUBTYPE_3GP_SMV, audio_sample_entry, "stsd", "3gpp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_SUBTYPE_3GP_H263, video_sample_entry, "stsd", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DAMR, gppc, "samr sawb enca", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DEVC, gppc, "sevc enca", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DQCP, gppc, "sqcp enca", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DSMV, gppc, "ssmv enca", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_D263, gppc, "s263 encv", "3gpp"),
 	//3gpp timed text
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_TX3G, tx3g, "stsd", "3gpp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_TX3G, tx3g, "stsd", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_TEXT, text, "stsd", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_FTAB, ftab, "tx3g text enct", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_STYL, styl, "text_sample", "3gpp"),
@@ -1280,13 +1348,13 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_BLNK, blnk, "text_sample", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_TWRP, twrp, "text_sample", "3gpp"),
 	//3GPP dims
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DIMS, dims, "stsd", "3gpp"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_DIMS, dims, "stsd", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DIMC, dimC, "dims encs", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DIST, diST, "stsd", "3gpp"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DIST, diST, "dims", "3gpp"),
 
 
 	//CENC boxes
-	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_PSSH, pssh, "moov moof", 0, "cenc"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_PSSH, pssh, "moov moof meta", 0, "cenc"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_TENC, tenc, "schi", 1, "cenc"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_SENC, senc, "trak traf", "cenc"),
 
@@ -1305,34 +1373,57 @@
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_ODAF, iSFM, "schi", 0, "oma"),
 
 	//apple boxes
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MP3, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MP3, audio_sample_entry, "stsd", "apple"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_CHPL, chpl, "udta", 0, "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VOID, void, "", "apple"),
 	BOX_DEFINE_S(GF_QT_BOX_TYPE_WIDE, wide, "*", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_ILST, ilst, "meta", "apple"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_DATA, databox, "ilst *", 0, "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9NAM, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9CMT, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9DAY, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9ART, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9TRK, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9ALB, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9COM, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9WRT, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9TOO, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9CPY, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9DES, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9GEN, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9GRP, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9ENC, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_aART, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_PGAP, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_GNRE, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DISK, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_TRKN, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_TMPO, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_CPIL, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_COVR, ilst_item, "ilst data", "apple"),
+
+	ITUNES_TAG(GF_ISOM_ITUNE_NAME),
+	ITUNES_TAG(GF_ISOM_ITUNE_ARTIST),
+	ITUNES_TAG(GF_ISOM_ITUNE_ALBUM_ARTIST),
+	ITUNES_TAG(GF_ISOM_ITUNE_ALBUM),
+	ITUNES_TAG(GF_ISOM_ITUNE_GROUP),
+	ITUNES_TAG(GF_ISOM_ITUNE_WRITER),
+	ITUNES_TAG(GF_ISOM_ITUNE_COMMENT),
+	ITUNES_TAG(GF_ISOM_ITUNE_GENRE_USER),
+	ITUNES_TAG(GF_ISOM_ITUNE_GENRE),
+	ITUNES_TAG(GF_ISOM_ITUNE_CREATED),
+	ITUNES_TAG(GF_ISOM_ITUNE_TRACKNUMBER),
+	ITUNES_TAG(GF_ISOM_ITUNE_DISK),
+	ITUNES_TAG(GF_ISOM_ITUNE_TEMPO),
+	ITUNES_TAG(GF_ISOM_ITUNE_COMPILATION),
+	ITUNES_TAG(GF_ISOM_ITUNE_TV_SHOW),
+	ITUNES_TAG(GF_ISOM_ITUNE_TV_EPISODE),
+	ITUNES_TAG(GF_ISOM_ITUNE_TV_SEASON),
+	ITUNES_TAG(GF_ISOM_ITUNE_TV_EPISODE_NUM),
+	ITUNES_TAG(GF_ISOM_ITUNE_TV_NETWORK),
+	ITUNES_TAG(GF_ISOM_ITUNE_DESCRIPTION),
+	ITUNES_TAG(GF_ISOM_ITUNE_LONG_DESCRIPTION),
+	ITUNES_TAG(GF_ISOM_ITUNE_LYRICS),
+	ITUNES_TAG(GF_ISOM_ITUNE_SORT_NAME),
+	ITUNES_TAG(GF_ISOM_ITUNE_SORT_ARTIST),
+	ITUNES_TAG(GF_ISOM_ITUNE_SORT_ALB_ARTIST),
+	ITUNES_TAG(GF_ISOM_ITUNE_SORT_ALBUM),
+	ITUNES_TAG(GF_ISOM_ITUNE_SORT_COMPOSER),
+	ITUNES_TAG(GF_ISOM_ITUNE_SORT_SHOW),
+	ITUNES_TAG(GF_ISOM_ITUNE_COVER_ART),
+	ITUNES_TAG(GF_ISOM_ITUNE_COPYRIGHT),
+	ITUNES_TAG(GF_ISOM_ITUNE_TOOL),
+	ITUNES_TAG(GF_ISOM_ITUNE_ENCODER),
+	ITUNES_TAG(GF_ISOM_ITUNE_PURCHASE_DATE),
+	ITUNES_TAG(GF_ISOM_ITUNE_PODCAST),
+	ITUNES_TAG(GF_ISOM_ITUNE_PODCAST_URL),
+	ITUNES_TAG(GF_ISOM_ITUNE_KEYWORDS),
+	ITUNES_TAG(GF_ISOM_ITUNE_CATEGORY),
+	ITUNES_TAG(GF_ISOM_ITUNE_HD_VIDEO),
+	ITUNES_TAG(GF_ISOM_ITUNE_MEDIA_TYPE),
+	ITUNES_TAG(GF_ISOM_ITUNE_RATING),
+	ITUNES_TAG(GF_ISOM_ITUNE_GAPLESS),
+	ITUNES_TAG(GF_ISOM_ITUNE_COMPOSER),
+	ITUNES_TAG(GF_ISOM_ITUNE_TRACK),
+	ITUNES_TAG(GF_ISOM_ITUNE_CONDUCTOR),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_iTunesSpecificInfo, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_GMHD, def_parent, "minf", "apple"),
 	BOX_DEFINE_S(GF_QT_BOX_TYPE_LOAD, load, "trak", "apple"),
@@ -1358,37 +1449,64 @@
 	//QT and prores sample entry types
 	BOX_DEFINE_S( GF_QT_BOX_TYPE_TMCD, tmcd, "stsd", "apple"),
 	BOX_DEFINE_S( GF_QT_SUBTYPE_C608, gen_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_APCH, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_APCO, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_APCS, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_APCN, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_AP4X, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_AP4H, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_RAW_VID, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_RAW_AUD, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_TWOS, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_SOWT, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_FL32, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_FL64, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_IN24, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_IN32, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_ULAW, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_ALAW, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_ADPCM, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_IMA_ADPCM, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_DVCA, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_QDMC, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_QDMC2, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_QCELP, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_SUBTYPE_kMP3, audio_sample_entry, "stsd", "apple"),
-
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_APCH, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_APCO, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_APCS, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_APCN, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_AP4X, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_AP4H, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_RAW_AUD, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_TWOS, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_SOWT, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_FL32, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_FL64, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_IN24, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_IN32, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_ULAW, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_ALAW, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_ADPCM, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_IMA_ADPCM, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_DVCA, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_QDMC, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_QDMC2, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_QCELP, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_kMP3, audio_sample_entry, "stsd", "apple"),
+
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_RAW_VID, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YUYV, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_UYVY, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YUV444, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YUVA444, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YUV422_10, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YUV444_10, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YUV422_16, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YUV420, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_I420, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_IYUV, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YV12, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YVYU, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_RGBA, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_ABGR, video_sample_entry, "stsd", "apple"),
+	
+	
 	//dolby boxes
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AC3, audio_sample_entry, "stsd", "dolby"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_EC3, audio_sample_entry, "stsd", "dolby"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DAC3, dac3, "ac-3 wave", "dolby"),
-	{GF_ISOM_BOX_TYPE_DEC3, dec3_box_new, dac3_box_del, dac3_box_read, dac3_box_write, dac3_box_size, dac3_box_dump, 0, 0, 0, "ec-3 enca", "dolby" },
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DVCC, dvcC, "dvhe dvav dva1 dvh1 avc1 avc2 avc3 avc4 hev1 encv resv", "DolbyVision"),
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DVHE, video_sample_entry, "stsd", "DolbyVision"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_AC3, audio_sample_entry, "stsd", "dolby"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_EC3, audio_sample_entry, "stsd", "dolby"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DAC3, dac3, "ac-3 wave enca", "dolby"),
+	{GF_ISOM_BOX_TYPE_DEC3, dec3_box_new, dac3_box_del, dac3_box_read, dac3_box_write, dac3_box_size, dac3_box_dump, 0, 0, 0, "ec-3 wave enca", "dolby" },
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DVCC, dvcC, "dvav dva1 dvhe dvh1 dav1 avc1 avc2 avc3 avc4 hev1 hvc1 av01 encv resv", "DolbyVision"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DVVC, dvvC, "dvav dva1 dvhe dvh1 dav1 avc1 avc2 avc3 avc4 hev1 hvc1 av01 encv resv", "DolbyVision"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DVHE, video_sample_entry, "stsd", "DolbyVision"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DVH1, video_sample_entry, "stsd", "DolbyVision"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DVA1, video_sample_entry, "stsd", "DolbyVision"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DVAV, video_sample_entry, "stsd", "DolbyVision"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DAV1, video_sample_entry, "stsd", "DolbyVision"),
+	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_MLPA, audio_sample_entry, "stsd", "dolby"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DMLP, dmlp, "mlpa enca", "dolby"),
+
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HVCE, hvcc, "hvc1 hev1 hvc2 hev2 encv resv ipco dvh1 dvhe", "DolbyVision"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AVCE, avcc, "avc1 avc2 avc3 avc4 encv resv ipco dva1 dvav", "DolbyVision"),
+
 
 	//Adobe boxes
 #ifndef GPAC_DISABLE_ISOM_ADOBE
@@ -1398,12 +1516,12 @@
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_AFRT, afrt, "abst", 0, "adobe"),
 #endif
 	/*Adobe's protection boxes*/
-	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_ADKM, adkm, "schi", 0, "adobe"),
-	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_AHDR, ahdr, "adkm", 0, "adobe"),
+	FBOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_ADKM, adkm, "schi", 0, "adobe"),
+	FBOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_AHDR, ahdr, "adkm", 0, "adobe"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_ADAF, adaf, "adkm", 0, "adobe"),
-	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_APRM, aprm, "ahdr", 0, "adobe"),
+	FBOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_APRM, aprm, "ahdr", 0, "adobe"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_AEIB, aeib, "aprm", 0, "adobe"),
-	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_AKEY, akey, "aprm", 0, "adobe"),
+	FBOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_AKEY, akey, "aprm", 0, "adobe"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_FLXS, flxs, "akey", "adobe"),
 
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_TRIK, trik, "traf", 0, "dece"),
@@ -1417,25 +1535,45 @@
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_PSEC, piff_psec, "trak traf", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_PSSH, piff_pssh, "moov moof", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TFXD, tfxd, "traf", "smooth"),
+	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TFRF, tfrf, "traf", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_MSSM, uuid, "file", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TFRF, uuid, "traf", "smooth"),
 
 
 	//J2K boxes
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_MJP2, video_sample_entry, "stsd", "j2k"),
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_JP2H, jp2h, "mjp2 encv", "j2k"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_MJP2, video_sample_entry, "stsd", "j2k"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_JP2H, jp2h, "mjp2 encv", "j2k"),
 	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_IHDR, ihdr, "jp2h", "j2k"),
 
 	/* Image tracks */
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_JPEG, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_JP2K, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_PNG, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_JPEG, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_JP2K, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_PNG, video_sample_entry, "stsd", "apple"),
 
 
-	//Opus in ISOBMFF boxes
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_FLAC, audio_sample_entry, "stsd", "Flac"),
+	//flac in ISOBMFF boxes
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_FLAC, audio_sample_entry, "stsd", "Flac"),
 	FBOX_DEFINE_S(GF_ISOM_BOX_TYPE_DFLA, dfla, "fLaC enca", 0, "Flac"),
 
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_XTRA, xtra, "udta", "WMA"),
+
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_ST3D, st3d, "video_sample_entry", 0, "youtube"),
+
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_SV3D, def_parent, "video_sample_entry", "youtube"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_SVHD, svhd, "sv3d", 0, "youtube"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_PROJ, def_parent, "sv3d", "youtube"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_PRHD, prhd, "proj", 0, "youtube"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_CBMP, proj_type, "proj", 0, "youtube"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_EQUI, proj_type, "proj", 0, "youtube"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_MESH, proj_type, "proj", 0, "youtube"),
+
+/*
+	GF_ISOM_BOX_TYPE_CBMP	= GF_4CC( 'c', 'b', 'm', 'p' ),
+	GF_ISOM_BOX_TYPE_EQUI	= GF_4CC( 'e', 'q', 'u', 'i' ),
+	GF_ISOM_BOX_TYPE_MSHP	= GF_4CC( 'm', 's', 'h', 'p' ),
+	GF_ISOM_BOX_TYPE_MESH	= GF_4CC( 'm', 'e', 's', 'h' ),
+*/
+
 };
 
 Bool gf_box_valid_in_parent(GF_Box *a, const char *parent_4cc)
@@ -1518,7 +1656,13 @@
 			case GF_ISOM_BOX_TYPE_iTunesSpecificInfo:
 			case GF_QT_BOX_TYPE_WAVE:
 				break;
+			//some sample descritions are handled as generic ones but we know them, don't warn
+			case GF_ISOM_BOX_TYPE_STSD:
+				if (boxType==GF_ISOM_SUBTYPE_FFV1) break;
+				//fallthrough
 			default:
+				if (boxType==GF_ISOM_BOX_TYPE_GDAT) break;
+
 				if (is_root_box) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[iso file] Unknown top-level box type %s\n", gf_4cc_to_str(boxType)));
 				} else if (parentType) {
@@ -1570,7 +1714,7 @@
 	return gf_isom_box_new_ex(boxType, 0, 0, GF_FALSE);
 }
 
-GF_Err gf_isom_box_array_read_ex(GF_Box *parent, GF_BitStream *bs, GF_Err (*check_child_box)(GF_Box *par, GF_Box *b), u32 parent_type)
+GF_Err gf_isom_box_array_read_ex(GF_Box *parent, GF_BitStream *bs, u32 parent_type)
 {
 	GF_Err e;
 	GF_Box *a = NULL;
@@ -1590,6 +1734,10 @@
 			if (!skip_logs) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" is larger than container box\n", gf_4cc_to_str(a->type)));
 			}
+			if (!gf_opts_get_bool("core", "no-check")) {
+				gf_isom_box_del(a);
+				return GF_ISOM_INVALID_FILE;
+			}
 			parent->size = 0;
 		} else {
 			parent->size -= a->size;
@@ -1636,8 +1784,8 @@
 		e = gf_list_add(parent->child_boxes, a);
 		if (e) return e;
 
-		if (check_child_box) {
-			e = check_child_box(parent, a);
+		if (parent->registry->add_rem_fn) {
+			e = parent->registry->add_rem_fn(parent, a, GF_FALSE);
 			if (e) {
 				if (e == GF_ISOM_INVALID_MEDIA) return GF_OK;
 				//if the box is no longer present, consider it destroyed
@@ -1667,7 +1815,7 @@
 	} else {
 		a_box_registry->del_fn(a);
 	}
-	//delet the other boxes after deleting the box for dumper case where all child boxes are stored in otherbox
+	//delete the other boxes after deleting the box for dumper case where all child boxes are stored in otherbox
 	if (child_boxes) {
 		gf_isom_box_array_del(child_boxes);
 	}
@@ -1705,7 +1853,8 @@
 
 	s32 cur_pos = gf_list_find(s->child_boxes, child);
 
-	assert (cur_pos >= 0);
+	//happens when partially cloning boxes 
+	if (cur_pos < 0) return;
 
 	if (cur_pos != (s32) *pos) {
 		gf_list_del_item(s->child_boxes, child);
@@ -1749,9 +1898,7 @@
 	}
 	pos = gf_bs_get_position(bs) - pos;
 	if (pos != a->size) {
-		if ((a->type==GF_ISOM_BOX_TYPE_MDAT) || (a->type==GF_ISOM_BOX_TYPE_IDAT)) {
-
-		} else {
+		if (a->type != GF_ISOM_BOX_TYPE_MDAT) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box %s wrote "LLU" bytes but size is "LLU"\n", gf_4cc_to_str(a->type), pos, a->size ));
 		}
 	}
@@ -1905,9 +2052,12 @@
 	if (a->registry->max_version_plus_one) {
 		gf_fprintf(trace, "Version=\"%d\" Flags=\"%d\" ", ((GF_FullBox*)a)->version,((GF_FullBox*)a)->flags);
 	}
-
 	gf_fprintf(trace, "Specification=\"%s\" ", a->registry->spec);
-	gf_fprintf(trace, "Container=\"%s\" ", a->registry->parents_4cc);
+
+	//don't write containers in test mode, that would require rewriting hashes whenever spec changes
+	if (!gf_sys_is_test_mode()) {
+		gf_fprintf(trace, "Container=\"%s\" ", a->registry->parents_4cc);
+	}
 	return GF_OK;
 }
 
@@ -1992,6 +2142,13 @@
 	gf_isom_box_del(b);
 }
 
+void gf_isom_box_remove_from_parent(GF_Box *parent_box, GF_Box *box)
+{
+	if (parent_box && parent_box->registry && parent_box->registry->add_rem_fn) {
+		parent_box->registry->add_rem_fn(parent_box, box, GF_TRUE);
+	}
+}
+
 GF_Box *gf_isom_box_new_parent(GF_List **parent, u32 code)
 {
 	GF_Box *b = gf_isom_box_new(code);

gpac-1.0.1.tar.gz/src/isomedia/data_map.c -> gpac-2.0.0.tar.gz/src/isomedia/data_map.c Changed

@@ -25,6 +25,7 @@
 
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/network.h>
+#include <gpac/thread.h>
 
 
 /*File Mapping object, read-only mode on complete files (no download)*/
@@ -122,7 +123,7 @@
 		return GF_OK;
 	}
 	//we need a temp file ...
-	if (!strcmp(location, "mp4_tmp_edit")) {
+	if (!strcmp(location, "_gpac_isobmff_tmp_edit")) {
 #ifndef GPAC_DISABLE_ISOM_WRITE
 		*outDataMap = gf_isom_fdm_new_temp(parentPath);
 		if (! (*outDataMap)) {
@@ -391,18 +392,16 @@
 	tmp->type = GF_ISOM_DATA_FILE;
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	//open a temp file
-	if (!strcmp(sPath, "mp4_tmp_edit")) {
+	if (!strcmp(sPath, "_gpac_isobmff_tmp_edit")) {
 		//create a temp file (that only occurs in EDIT/WRITE mode)
 		tmp->stream = gf_file_temp(&tmp->temp_file);
 //		bs_mode = GF_BITSTREAM_READ;
 	}
 #endif
 	if (!strncmp(sPath, "gmem://", 7)) {
-		u32 size;
-		u8 *mem_address;
-		if (gf_blob_get_data(sPath, &mem_address, &size) != GF_OK)
+		if (sscanf(sPath, "gmem://%p", &tmp->blob) != 1)
 			return NULL;
-		tmp->bs = gf_bs_new((const char *)mem_address, size, GF_BITSTREAM_READ);
+		tmp->bs = gf_bs_new(tmp->blob->data, tmp->blob->size, GF_BITSTREAM_READ);
 		if (!tmp->bs) {
 			gf_free(tmp);
 			return NULL;
@@ -490,7 +489,14 @@
 	if (fileOffset > gf_bs_get_size(ptr->bs))
 		return 0;
 
-	if (gf_bs_get_position(ptr->bs) != fileOffset) {
+	if (ptr->blob) {
+		gf_mx_p(ptr->blob->mx);
+		gf_bs_reassign_buffer(ptr->bs, ptr->blob->data, ptr->blob->size);
+		if (gf_bs_seek(ptr->bs, fileOffset) != GF_OK) {
+			gf_mx_v(ptr->blob->mx);
+			return 0;
+		}
+	} else if (gf_bs_get_position(ptr->bs) != fileOffset) {
 		//we are not at the previous location, do a seek
 		if (gf_bs_seek(ptr->bs, fileOffset) != GF_OK) return 0;
 	}
@@ -514,6 +520,10 @@
 		}
 	}
 	ptr->last_acces_was_read = 1;
+
+	if (ptr->blob) {
+		gf_mx_v(ptr->blob->mx);
+	}
 	return bytesRead;
 }

gpac-1.0.1.tar.gz/src/isomedia/drm_sample.c -> gpac-2.0.0.tar.gz/src/isomedia/drm_sample.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 * Authors: Cyril Concolato / Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2019
+ *			Copyright (c) Telecom ParisTech 2005-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -24,6 +24,7 @@
 */
 
 #include <gpac/internal/isomedia_dev.h>
+#include <gpac/constants.h>
 
 #ifndef GPAC_DISABLE_ISOM
 
@@ -365,6 +366,8 @@
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_OMADRM_SCHEME, &sea);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ADOBE_SCHEME, &sea);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_PIFF_SCHEME, &sea);
+	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_SVE1_SCHEME, &sea);
+	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_HLS_SAMPLE_AES_SCHEME, &sea);
 	if (!sinf) return GF_OK;
 
 	sea->type = sinf->original_format->data_format;
@@ -414,6 +417,7 @@
 {
 	u32 original_format;
 	GF_Err e;
+	u32 gnr_type=0;
 	GF_SampleEntryBox *sea;
 	GF_ProtectionSchemeInfoBox *sinf;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -424,10 +428,13 @@
 
 	original_format = sea->type;
 	if (original_format==GF_ISOM_BOX_TYPE_GNRA) {
+		gnr_type = original_format;
 		original_format = ((GF_GenericAudioSampleEntryBox*)sea)->EntryType;
 	} else if (original_format==GF_ISOM_BOX_TYPE_GNRV) {
+		gnr_type = original_format;
 		original_format = ((GF_GenericVisualSampleEntryBox*)sea)->EntryType;
 	} else if (original_format==GF_ISOM_BOX_TYPE_GNRM) {
+		gnr_type = original_format;
 		original_format = ((GF_GenericSampleEntryBox*)sea)->EntryType;
 	}
 
@@ -453,6 +460,8 @@
 	case GF_ISOM_BOX_TYPE_AVC4:
 	case GF_ISOM_BOX_TYPE_SVC1:
 	case GF_ISOM_BOX_TYPE_MVC1:
+	case GF_ISOM_BOX_TYPE_DVA1:
+	case GF_ISOM_BOX_TYPE_DVAV:
 		if (is_isma)
 			original_format = GF_ISOM_BOX_TYPE_264B;
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
@@ -464,14 +473,21 @@
 	case GF_ISOM_BOX_TYPE_LHE1:
 	case GF_ISOM_BOX_TYPE_LHV1:
 	case GF_ISOM_BOX_TYPE_HVT1:
+	case GF_ISOM_BOX_TYPE_DVHE:
+	case GF_ISOM_BOX_TYPE_DVH1:
 		if (is_isma)
 			original_format = GF_ISOM_BOX_TYPE_265B;
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
+	case GF_ISOM_BOX_TYPE_VVC1:
+	case GF_ISOM_BOX_TYPE_VVI1:
+		sea->type = GF_ISOM_BOX_TYPE_ENCV;
+		break;
 	case GF_ISOM_BOX_TYPE_VP09:
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
 	case GF_ISOM_BOX_TYPE_AV01:
+	case GF_ISOM_BOX_TYPE_DAV1:
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4S:
@@ -520,8 +536,12 @@
 
 	sinf->original_format = (GF_OriginalFormatBox *)gf_isom_box_new_parent(&sinf->child_boxes, GF_ISOM_BOX_TYPE_FRMA);
 	if (!sinf->original_format) return GF_OUT_OF_MEM;
-	sinf->original_format->data_format = original_format;
-
+	if (gnr_type) {
+		sinf->original_format->data_format = gnr_type;
+		sinf->original_format->gnr_type = original_format;
+	} else {
+		sinf->original_format->data_format = original_format;
+	}
 	//common to isma, cenc and oma
 	sinf->info = (GF_SchemeInformationBox *)gf_isom_box_new_parent(&sinf->child_boxes, GF_ISOM_BOX_TYPE_SCHI);
 
@@ -667,23 +687,34 @@
 		if (!sinf) sinf = isom_get_sinf_entry(trak, i+1, GF_ISOM_CENS_SCHEME, NULL);
 		if (!sinf) sinf = isom_get_sinf_entry(trak, i+1, GF_ISOM_CBCS_SCHEME, NULL);
 		if (!sinf) sinf = isom_get_sinf_entry(trak, i+1, GF_ISOM_PIFF_SCHEME, NULL);
+		if (!sinf) sinf = isom_get_sinf_entry(trak, i+1, GF_ISOM_SVE1_SCHEME, NULL);
+		if (!sinf) sinf = isom_get_sinf_entry(trak, i+1, GF_HLS_SAMPLE_AES_SCHEME, NULL);
 
 		if (!sinf) continue;
 
 		/*non-encrypted or non-CENC*/
-		if (!sinf->info || (!sinf->info->tenc && !sinf->info->piff_tenc) || !sinf->scheme_type)
+		if (!sinf->scheme_type)
 			return GF_FALSE;
 
-		//TODO: validate the fields in tenc for each scheme type
+		switch (sinf->scheme_type->scheme_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
+		case GF_ISOM_SVE1_SCHEME:
+		case GF_HLS_SAMPLE_AES_SCHEME:
+			return GF_TRUE;
+		default:
+			return GF_FALSE;
+		}
 		return GF_TRUE;
-
 	}
 	return GF_FALSE;
 
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_cenc_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, u32 *outIVLength)
+GF_Err gf_isom_get_cenc_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion)
 {
 	GF_TrackBox *trak;
 	GF_ProtectionSchemeInfoBox *sinf;
@@ -697,6 +728,8 @@
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENS_SCHEME, NULL);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBCS_SCHEME, NULL);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_PIFF_SCHEME, NULL);
+	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_SVE1_SCHEME, NULL);
+	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_HLS_SAMPLE_AES_SCHEME, NULL);
 
 	if (!sinf) return GF_BAD_PARAM;
 
@@ -706,27 +739,22 @@
 	}
 	if (outSchemeType) *outSchemeType = sinf->scheme_type->scheme_type;
 	if (outSchemeVersion) *outSchemeVersion = sinf->scheme_type->scheme_version;
-
-	if (outIVLength) {
-		if (sinf->info && sinf->info->tenc)
-			*outIVLength = sinf->info->tenc->Per_Sample_IV_Size;
-		else
-			*outIVLength = 0;
-	}
-
 	return GF_OK;
 }
 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err gf_isom_set_cenc_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type,
- u32 scheme_version, u32 default_IsEncrypted, u8 default_IV_size,	bin128 default_KID,
-								 u8 default_crypt_byte_block, u8 default_skip_byte_block,
-								 u8 default_constant_IV_size, bin128 default_constant_IV)
+ u32 scheme_version, u32 default_IsEncrypted, u8 default_crypt_byte_block, u8 default_skip_byte_block,
+								 u8 *key_info, u32 key_info_size)
 {
 	GF_Err e;
 	GF_ProtectionSchemeInfoBox *sinf;
 
+	if (!gf_cenc_validate_key_info(key_info, key_info_size))
+		return GF_BAD_PARAM;
+
 	//setup generic protection
 	e = isom_set_protected_entry(the_file, trackNumber, desc_index, 0, 0, scheme_type, scheme_version, NULL, GF_FALSE, &sinf);
 	if (e) return e;
@@ -735,24 +763,26 @@
 		sinf->info->piff_tenc = (GF_PIFFTrackEncryptionBox *) gf_isom_box_new_parent(&sinf->info->child_boxes, GF_ISOM_BOX_UUID_TENC);
 		if (!sinf->info->piff_tenc) return GF_OUT_OF_MEM;
 		sinf->info->piff_tenc->AlgorithmID = 1;
-		sinf->info->piff_tenc->IV_size = default_IV_size;
-		memcpy(sinf->info->piff_tenc->KID, default_KID, 16*sizeof(char));
-	} else {
+		sinf->info->piff_tenc->key_info[0] = 0;
+		sinf->info->piff_tenc->key_info[1] = 0;
+		sinf->info->piff_tenc->key_info[2] = 0;
+		sinf->info->piff_tenc->key_info[3] = key_info[3];
+		memcpy(sinf->info->piff_tenc->key_info+4, key_info+4, 16*sizeof(char));
+	}
+	//tenc only for mkey
+	else if (!key_info[0]) {
+		if (key_info_size<20) return GF_BAD_PARAM;
 		sinf->info->tenc = (GF_TrackEncryptionBox *)gf_isom_box_new_parent(&sinf->info->child_boxes, GF_ISOM_BOX_TYPE_TENC);
 		if (!sinf->info->tenc) return GF_OUT_OF_MEM;
 
 		sinf->info->tenc->isProtected = default_IsEncrypted;
-		sinf->info->tenc->Per_Sample_IV_Size = default_IV_size;
-		memcpy(sinf->info->tenc->KID, default_KID, 16*sizeof(char));
 		if ((scheme_type == GF_ISOM_CENS_SCHEME) || (scheme_type == GF_ISOM_CBCS_SCHEME)) {
 			sinf->info->tenc->version = 1;
 			sinf->info->tenc->crypt_byte_block = default_crypt_byte_block;
 			sinf->info->tenc->skip_byte_block = default_skip_byte_block;
 		}
-		if (scheme_type == GF_ISOM_CBCS_SCHEME) {
-			sinf->info->tenc->constant_IV_size = default_constant_IV_size;
-			memcpy(sinf->info->tenc->constant_IV, default_constant_IV, 16*sizeof(char));
-		}
+		if (key_info_size>37) key_info_size = 37;
+		memcpy(sinf->info->tenc->key_info, key_info, key_info_size);
 	}
 	return GF_OK;
 }
@@ -842,18 +872,25 @@
 }
 #endif
 
-GF_Err gf_cenc_set_pssh(GF_ISOFile *file, bin128 systemID, u32 version, u32 KID_count, bin128 *KIDs, u8 *data, u32 len, Bool use_piff)
+GF_Err gf_cenc_set_pssh(GF_ISOFile *file, bin128 systemID, u32 version, u32 KID_count, bin128 *KIDs, u8 *data, u32 len, u32 pssh_mode)
 {
 	GF_ProtectionSystemHeaderBox *pssh = NULL;
 	GF_PIFFProtectionSystemHeaderBox *pssh_piff = NULL;
 	u32 i=0;
 	GF_Box *a;
-	GF_List **child_boxes = NULL;
-	if (file->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) {
+	GF_List **child_boxes = NULL, *moof_pssh = NULL;
+
+	if (pssh_mode==2) {
+		if (!file->meta) return GF_BAD_PARAM;
+		if (!file->meta->child_boxes) file->meta->child_boxes = gf_list_new();
+		child_boxes = &file->meta->child_boxes;
+	} else if (file->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) {
 		if (!file->moof) return GF_BAD_PARAM;
 		if (!file->moof->PSSHs) file->moof->PSSHs = gf_list_new();
-		child_boxes = &file->moof->PSSHs;
+		child_boxes = &file->moof->child_boxes;
+		moof_pssh = file->moof->PSSHs;
 	} else {
+		if (!file->moov) return GF_BAD_PARAM;
 		if (!file->moov->child_boxes) file->moov->child_boxes = gf_list_new();
 		child_boxes = &file->moov->child_boxes;
 	}
@@ -879,16 +916,18 @@
 	}
 
 	if (!pssh && !pssh_piff) {
-		if (use_piff) {
+		if (pssh_mode==1) {
 			pssh_piff = (GF_PIFFProtectionSystemHeaderBox *)gf_isom_box_new_parent(child_boxes, GF_ISOM_BOX_UUID_PSSH);
 			if (!pssh_piff) return GF_IO_ERR;
 			memcpy((char *)pssh_piff->SystemID, systemID, sizeof(bin128));
 			pssh_piff->version = version;
+			if (moof_pssh) gf_list_add(moof_pssh, pssh_piff);
 		} else {
 			pssh = (GF_ProtectionSystemHeaderBox *)gf_isom_box_new_parent(child_boxes, GF_ISOM_BOX_TYPE_PSSH);
 			if (!pssh) return GF_IO_ERR;
 			memcpy((char *)pssh->SystemID, systemID, sizeof(bin128));
 			pssh->version = version;
+			if (moof_pssh) gf_list_add(moof_pssh, pssh);
 		}
 	}
 
@@ -1058,7 +1097,7 @@
 		return NULL;
 	psec->version = version;
 	psec->flags = flags;
-	psec->is_piff = GF_TRUE;
+	psec->piff_type = 1;
 	if (psec->flags & 0x1) {
 		psec->AlgorithmID = AlgorithmID;
 		psec->IV_size = IV_size;
@@ -1083,29 +1122,32 @@
 	return senc;
 }
 
-GF_Err gf_isom_cenc_allocate_storage(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u32 AlgorithmID, u8 IV_size, bin128 KID)
+GF_Err gf_isom_cenc_allocate_storage(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
 	if (trak->sample_encryption) return GF_OK;
-	switch (container_type) {
-	case GF_ISOM_BOX_UUID_PSEC:
-		trak->sample_encryption = (GF_SampleEncryptionBox *)gf_isom_create_piff_psec_box(1, 0, AlgorithmID, IV_size, KID);
-		break;
-	case GF_ISOM_BOX_TYPE_SENC:
-		trak->sample_encryption = (GF_SampleEncryptionBox *)gf_isom_create_samp_enc_box(0, 0);
-		break;
-	default:
-		return GF_NOT_SUPPORTED;
-	}
+	trak->sample_encryption = (GF_SampleEncryptionBox *)gf_isom_create_samp_enc_box(0, 0);
+	//senc will be written and destroyed with the other boxes
+	if (!trak->child_boxes) trak->child_boxes = gf_list_new();
+	return gf_list_add(trak->child_boxes, trak->sample_encryption);
+}
+
+GF_Err gf_isom_piff_allocate_storage(GF_ISOFile *the_file, u32 trackNumber, u32 AlgorithmID, u8 IV_size, bin128 KID)
+{
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	if (trak->sample_encryption) return GF_OK;
+	trak->sample_encryption = (GF_SampleEncryptionBox *)gf_isom_create_piff_psec_box(1, 0, AlgorithmID, IV_size, KID);
 	//senc will be written and destroyed with the other boxes
 	if (!trak->child_boxes) trak->child_boxes = gf_list_new();
 	return gf_list_add(trak->child_boxes, trak->sample_encryption);
 }
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 len, Bool saio_32bits)
+void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 len, Bool saio_32bits, Bool use_multikey)
 {
 	u32 i;
 	GF_List **child_boxes = stbl ? &stbl->child_boxes : &traf->child_boxes;
@@ -1114,11 +1156,11 @@
 		if (!senc->cenc_saiz) return;
 		//as per 3rd edition of cenc "so content SHOULD be created omitting these optional fields" ...
 		senc->cenc_saiz->aux_info_type = 0;
-		senc->cenc_saiz->aux_info_type_parameter = 0;
+		senc->cenc_saiz->aux_info_type_parameter = use_multikey ? 1 : 0;
 		if (stbl)
-			stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz);
+			stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz, GF_FALSE);
 		else
-			traf_on_child_box((GF_Box*)traf, (GF_Box *)senc->cenc_saiz);
+			traf_on_child_box((GF_Box*)traf, (GF_Box *)senc->cenc_saiz, GF_FALSE);
 	}
 	if (!senc->cenc_saio) {
 		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new_parent(child_boxes, GF_ISOM_BOX_TYPE_SAIO);
@@ -1127,12 +1169,12 @@
 		senc->cenc_saio->version = saio_32bits ? 0 : 1;
 		//as per 3rd edition of cenc "so content SHOULD be created omitting these optional fields" ...
 		senc->cenc_saio->aux_info_type = 0;
-		senc->cenc_saio->aux_info_type_parameter = 0;
+		senc->cenc_saiz->aux_info_type_parameter = use_multikey ? 1 : 0;
 		senc->cenc_saio->entry_count = 1;
 		if (stbl)
-			stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saio);
+			stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saio, GF_FALSE);
 		else
-			traf_on_child_box((GF_Box*)traf, (GF_Box *)senc->cenc_saio);
+			traf_on_child_box((GF_Box*)traf, (GF_Box *)senc->cenc_saio, GF_FALSE);
 	}
 
 	if (!senc->cenc_saiz->sample_count || ((senc->cenc_saiz->default_sample_info_size==len) && len) ) {
@@ -1156,16 +1198,21 @@
 	}
 }
 
-GF_Err gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u64 offset, u32 len)
+GF_Err gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u32 sample_number, u64 offset, u32 len)
 {
-	u32 i;
+	u32 i;
+	Bool is_first_saiz = GF_FALSE;
 	assert(stbl);
+
 	if (!senc->cenc_saiz) {
 		senc->cenc_saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_SAIZ);
 		if (!senc->cenc_saiz) return GF_OUT_OF_MEM;
 		senc->cenc_saiz->aux_info_type = GF_ISOM_CENC_SCHEME;
 		senc->cenc_saiz->aux_info_type_parameter = 0;
-		stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz);
+		stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz, GF_FALSE);
+		if (!sample_number) return GF_BAD_PARAM;
+		senc->cenc_saiz->sample_count = sample_number - 1;
+		is_first_saiz = GF_TRUE;
 	}
 	if (!senc->cenc_saio) {
 		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_SAIO);
@@ -1174,16 +1221,25 @@
 		senc->cenc_saio->version = 1;
 		senc->cenc_saio->aux_info_type = GF_ISOM_CENC_SCHEME;
 		senc->cenc_saio->aux_info_type_parameter = 0;
-		stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saio);
+		stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saio, GF_FALSE);
 	}
 
+	if (sample_number <= senc->cenc_saiz->sample_count)
+		return GF_BAD_PARAM;
+	if (sample_number <= senc->cenc_saio->entry_count)
+		return GF_BAD_PARAM;
+
 	if (!senc->cenc_saiz->sample_count || (!senc->cenc_saiz->sample_alloc && (senc->cenc_saiz->default_sample_info_size==len))) {
 		senc->cenc_saiz->sample_count ++;
 		senc->cenc_saiz->default_sample_info_size = len;
 	} else {
-		if (senc->cenc_saiz->sample_count + 1 > senc->cenc_saiz->sample_alloc) {
-			if (!senc->cenc_saiz->sample_alloc) senc->cenc_saiz->sample_alloc = senc->cenc_saiz->sample_count + 1;
-			else senc->cenc_saiz->sample_alloc *= 2;
+		u32 sample_diff = sample_number - senc->cenc_saiz->sample_count;
+
+		if (senc->cenc_saiz->sample_count + sample_diff > senc->cenc_saiz->sample_alloc) {
+			senc->cenc_saiz->sample_alloc *= 2;
+			if (senc->cenc_saiz->sample_alloc < senc->cenc_saiz->sample_count + sample_diff) {
+				senc->cenc_saiz->sample_alloc = senc->cenc_saiz->sample_count + sample_diff;
+			}
 			senc->cenc_saiz->sample_info_size = (u8*)gf_realloc(senc->cenc_saiz->sample_info_size, sizeof(u8)*(senc->cenc_saiz->sample_alloc));
 			if (!senc->cenc_saiz->sample_info_size) return GF_OUT_OF_MEM;
 		}
@@ -1192,24 +1248,41 @@
 			for (i=0; i<senc->cenc_saiz->sample_count; i++)
 				senc->cenc_saiz->sample_info_size[i] = senc->cenc_saiz->default_sample_info_size;
 			senc->cenc_saiz->default_sample_info_size = 0;
+		} else if (is_first_saiz) {
+			memset(senc->cenc_saiz->sample_info_size, 0, sizeof(u8)*(senc->cenc_saiz->sample_alloc));
 		}
-		senc->cenc_saiz->sample_info_size[senc->cenc_saiz->sample_count] = len;
-		senc->cenc_saiz->sample_count++;
+		for (i=0; i<sample_diff-1; i++) {
+			senc->cenc_saiz->sample_info_size[senc->cenc_saiz->sample_count + i] = 0;
+		}
+		senc->cenc_saiz->sample_info_size[senc->cenc_saiz->sample_count + sample_diff-1] = len;
+		senc->cenc_saiz->sample_count += sample_diff;
 	}
 
-	if (!senc->cenc_saio->entry_count) {
+	if (!senc->cenc_saio->entry_count && !is_first_saiz) {
 		senc->cenc_saio->offsets = (u64 *)gf_malloc(sizeof(u64));
 		if (!senc->cenc_saio->offsets) return GF_OUT_OF_MEM;
 		senc->cenc_saio->offsets[0] = offset;
 		senc->cenc_saio->entry_count ++;
 		senc->cenc_saio->entry_alloc = 1;
 	} else {
-		if (senc->cenc_saio->entry_count >= senc->cenc_saio->entry_alloc) {
-			senc->cenc_saio->entry_alloc += 50;
+		u32 sample_diff;
+
+		if (is_first_saiz)
+			senc->cenc_saio->entry_count = senc->cenc_saio->entry_alloc = sample_number - 1;
+
+		sample_diff = sample_number - senc->cenc_saio->entry_count;
+		if (senc->cenc_saio->entry_count + sample_diff > senc->cenc_saio->entry_alloc) {
+			senc->cenc_saio->entry_alloc += MAX(50, sample_diff);
 			senc->cenc_saio->offsets = (u64*)gf_realloc(senc->cenc_saio->offsets, sizeof(u64)*(senc->cenc_saio->entry_alloc));
 			if (!senc->cenc_saio->offsets) return GF_OUT_OF_MEM;
 		}
-		senc->cenc_saio->offsets[senc->cenc_saio->entry_count] = offset;
+		if (is_first_saiz) {
+			memset(senc->cenc_saio->offsets, 0, sizeof(u64)*(senc->cenc_saio->entry_alloc));
+		}
+		for (i=0; i<sample_diff-1; i++) {
+			senc->cenc_saio->offsets[senc->cenc_saio->entry_count + i] = 0;
+		}
+		senc->cenc_saio->offsets[senc->cenc_saio->entry_count + sample_diff-1] = offset;
 		senc->cenc_saio->entry_count++;
 	}
 	if (offset > 0xFFFFFFFFUL)
@@ -1218,9 +1291,8 @@
 }
 #endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 
-GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u8 IV_size, u8 *buf, u32 len, Bool use_subsamples, u8 *clear_IV, Bool use_saio_32bit)
+GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u8 *buf, u32 len, Bool use_subsamples, Bool use_saio_32bit, Bool use_multikey)
 {
-	u32 i;
 	GF_SampleEncryptionBox *senc;
 	GF_CENCSampleAuxInfo *sai;
 	GF_SampleTableBox *stbl;
@@ -1232,6 +1304,7 @@
 	switch (container_type) {
 	case GF_ISOM_BOX_UUID_PSEC:
 	case GF_ISOM_BOX_TYPE_SENC:
+	case 0:
 		senc = trak->sample_encryption;
 		break;
 	default:
@@ -1239,61 +1312,30 @@
 	}
 
 	if (len && buf) {
-		GF_BitStream *bs = gf_bs_new(buf, len, GF_BITSTREAM_READ);
-
 		GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
 		if (!sai) return GF_OUT_OF_MEM;
-		gf_list_add(senc->samp_aux_info, sai);
-
-		sai->IV_size = IV_size;
-		gf_bs_read_data(bs, (char *)sai->IV, IV_size);
-		if (use_subsamples) {
-			sai->subsample_count = gf_bs_read_u16(bs);
-			if (sai->subsample_count) senc->flags = 0x00000002;
-			sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
-			if (!sai->subsamples) return GF_OUT_OF_MEM;
-
-			for (i = 0; i < sai->subsample_count; i++) {
-				sai->subsamples[i].bytes_clear_data = gf_bs_read_u16(bs);
-				sai->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(bs);
-			}
+		sai->cenc_data_size = len;
+		sai->cenc_data = gf_malloc(sizeof(u8) * len);
+		if (!sai->cenc_data) {
+			gf_free(sai);
+			return GF_OUT_OF_MEM;
 		}
-		gf_bs_del(bs);
-	} else if (len) {
-		u32 olen = len;
+		memcpy(sai->cenc_data, buf, len);
 
+		gf_list_add(senc->samp_aux_info, sai);
+	} else {
 		GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
 		if (!sai) return GF_OUT_OF_MEM;
 		gf_list_add(senc->samp_aux_info, sai);
-
-		sai->IV_size = IV_size;
-		if (clear_IV) memcpy(sai->IV, clear_IV, sizeof(bin128));
-		if (use_subsamples) {
-			sai->subsample_count = 1;
-			/*if (sai->subsample_count) */senc->flags = 0x00000002;
-			while (olen>0xFFFF) {
-				olen -= 0xFFFF;
-				sai->subsample_count ++;
-			}
-			sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
-			if (!sai->subsamples) return GF_OUT_OF_MEM;
-
-			olen = len;
-			for (i = 0; i < sai->subsample_count; i++) {
-				if (olen<0xFFFF) {
-					sai->subsamples[i].bytes_clear_data = olen;
-				} else {
-					sai->subsamples[i].bytes_clear_data = 0xFFFF;
-					olen -= 0xFFFF;
-				}
-				sai->subsamples[i].bytes_encrypted_data = 0;
-			}
-		}
-		len = IV_size + 2 + 6*sai->subsample_count;
+		sai->isNotProtected = 1;
 	}
+	if (use_subsamples)
+		senc->flags = 0x00000002;
+	if (use_multikey)
+		senc->version = 1;
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-	gf_isom_cenc_set_saiz_saio(senc, stbl, NULL, len, use_saio_32bit);
+	gf_isom_cenc_set_saiz_saio(senc, stbl, NULL, sai->cenc_data_size, use_saio_32bit, use_multikey);
 #endif
 
 	return GF_OK;
@@ -1304,7 +1346,7 @@
 void gf_isom_cenc_samp_aux_info_del(GF_CENCSampleAuxInfo *samp)
 {
 	if (!samp) return;
-	if (samp->subsamples) gf_free(samp->subsamples);
+	if (samp->cenc_data) gf_free(samp->cenc_data);
 	gf_free(samp);
 }
 
@@ -1320,11 +1362,24 @@
 	has_saiz = has_saio = GF_FALSE;
 
 	if (stbl) {
+		if (!stbl->patch_piff_psec) {
+			stbl->patch_piff_psec = gf_opts_get_bool("core", "piff-force-subsamples") ? 2 : 1;
+		}
+		if (stbl->patch_piff_psec==2)
+			return GF_FALSE;
 		sai_sizes = stbl->sai_sizes;
 		sai_offsets = stbl->sai_offsets;
 	}
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	else if (_traf) {
+		if (traf->trex && traf->trex->track && traf->trex->track->Media->information->sampleTable) {
+			GF_SampleTableBox *_stbl = traf->trex->track->Media->information->sampleTable;
+			if (!_stbl->patch_piff_psec) {
+				_stbl->patch_piff_psec = gf_opts_get_bool("core", "piff-force-subsamples") ? 2 : 1;
+			}
+			if (_stbl->patch_piff_psec==2)
+				return GF_FALSE;
+		}
 		sai_sizes = traf->sai_sizes;
 		sai_offsets = traf->sai_offsets;
 	}
@@ -1397,6 +1452,9 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] saio box without flags nor aux info type and no default scheme, ignoring\n"));
 			continue;
 		}
+		//special case for query on a file that has just been imported but not yet written: saio offset is NULL, we must use senc
+		if (saio->entry_count && !saio->offsets)
+			continue;
 		switch (saio_aux_info_type) {
 		case GF_ISOM_CENC_SCHEME:
 		case GF_ISOM_CBC_SCHEME:
@@ -1423,7 +1481,7 @@
 #endif
 
 
-static GF_Err isom_cenc_get_sai_by_saiz_saio(GF_MediaBox *mdia, u32 sampleNumber, u32 scheme_type, u8 IV_size, GF_CENCSampleAuxInfo **sai, u8 **out_buffer, u32 *out_size)
+static GF_Err isom_cenc_get_sai_by_saiz_saio(GF_MediaBox *mdia, u32 sampleNumber, u32 scheme_type, u8 **out_buffer, u32 *out_size)
 {
 	u32 prev_sai_size, size, i, j, nb_saio;
 	u64 cur_position, offset;
@@ -1433,6 +1491,8 @@
 	nb_saio = size = prev_sai_size = 0;
 	offset = 0;
 
+	if (! out_buffer || !out_size) return GF_BAD_PARAM;
+
 	for (i = 0; i < gf_list_count(mdia->information->sampleTable->sai_offsets); i++) {
 		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(mdia->information->sampleTable->sai_offsets, i);
 		u32 aux_info_type = saio->aux_info_type;
@@ -1449,10 +1509,13 @@
 			continue;
 		}
 
-		if (saio->entry_count == 1)
+		if (saio->entry_count == 1) {
 			offset = saio->offsets[0];
-		else
+		} else if (sampleNumber>saio->entry_count) {
+			return GF_ISOM_INVALID_FILE;
+		} else {
 			offset = saio->offsets[sampleNumber-1];
+		}
 		nb_saio = saio->entry_count;
 		saio_cenc = saio;
 		break;
@@ -1475,7 +1538,7 @@
 			continue;
 		}
 		if (sampleNumber>saiz->sample_count) {
-			return GF_NON_COMPLIANT_BITSTREAM;
+			return GF_ISOM_INVALID_FILE;
 		}
 		if ((nb_saio==1) && !saio_cenc->total_size) {
 			for (j = 0; j < saiz->sample_count; j++) {
@@ -1485,10 +1548,22 @@
 		if (saiz->cached_sample_num+1== sampleNumber) {
 			prev_sai_size = saiz->cached_prev_size;
 		} else {
+			if (sampleNumber > saiz->sample_count)
+				return GF_ISOM_INVALID_FILE;
+
 			for (j = 0; j < sampleNumber-1; j++)
 				prev_sai_size += saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
 		}
-		size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[sampleNumber-1];
+		if (saiz->default_sample_info_size) {
+			size = saiz->default_sample_info_size;
+		} else if (sampleNumber > saiz->sample_count) {
+			return GF_ISOM_INVALID_FILE;
+		} else if (!saiz->sample_info_size) {
+			//CBCS
+			size = 0;
+		} else {
+			size = saiz->sample_info_size[sampleNumber-1];
+		}
 		saiz_cenc=saiz;
 		break;
 	}
@@ -1523,49 +1598,28 @@
 	cur_position = gf_bs_get_position(mdia->information->dataHandler->bs);
 	gf_bs_seek(mdia->information->dataHandler->bs, offset);
 
-	if (sai) {
-		*sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
-		if (! *sai) return GF_OUT_OF_MEM;
-		memset(*sai, 0, sizeof(GF_CENCSampleAuxInfo));
-
-		if (size) {
-			gf_bs_read_data(mdia->information->dataHandler->bs, (char *)(*sai)->IV, IV_size);
-			if (size > IV_size) {
-				(*sai)->subsample_count = gf_bs_read_u16(mdia->information->dataHandler->bs);
-				(*sai)->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
-				if (! (*sai)->subsamples) return GF_OUT_OF_MEM;
-				for (i = 0; i < (*sai)->subsample_count; i++) {
-					(*sai)->subsamples[i].bytes_clear_data = gf_bs_read_u16(mdia->information->dataHandler->bs);
-					(*sai)->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(mdia->information->dataHandler->bs);
-				}
-			}
+	if (out_buffer) {
+		if ((*out_size) < size) {
+			(*out_buffer) = gf_realloc((*out_buffer), sizeof(char)*(size) );
+			if (! *out_buffer) return GF_OUT_OF_MEM;
 		}
-	} else if (out_size) {
-		if (out_buffer) {
-			if ((*out_size) < size) {
-				(*out_buffer) = gf_realloc((*out_buffer), sizeof(char)*(size) );
-				if (! *out_buffer) return GF_OUT_OF_MEM;
-			}
-			gf_bs_read_data(mdia->information->dataHandler->bs, (*out_buffer), size);
-		}
-		(*out_size) = size;
+		gf_bs_read_data(mdia->information->dataHandler->bs, (*out_buffer), size);
 	}
+	(*out_size) = size;
+
 	gf_bs_seek(mdia->information->dataHandler->bs, cur_position);
 
 	return e;
 }
 
-
-static GF_Err gf_isom_cenc_get_sample_aux_info_internal(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 sampleDescIndex, GF_CENCSampleAuxInfo **sai, u32 *container_type, u8 **out_buffer, u32 *outSize)
+GF_EXPORT
+GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 sampleDescIndex, u32 *container_type, u8 **out_buffer, u32 *outSize)
 {
 	GF_TrackBox *trak;
 	GF_SampleTableBox *stbl;
 	GF_SampleEncryptionBox *senc = NULL;
 	u32 type, scheme_type = -1;
 	GF_CENCSampleAuxInfo *a_sai;
-	u8 IV_size, constant_IV_size;
-	bin128 constant_IV;
-	Bool is_Protected;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
@@ -1586,23 +1640,17 @@
 		if (container_type) *container_type = type;
 	}
 
-	if (!sai && !out_buffer) return GF_OK; /*we need only container_type*/
+	if (!out_buffer) return GF_OK; /*we need only container_type*/
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	sampleNumber -= trak->sample_count_at_seg_start;
 #endif
 
-	if (sai && *sai) {
-		gf_isom_cenc_samp_aux_info_del(*sai);
-		*sai = NULL;
-	}
-	gf_isom_get_cenc_info(the_file, trackNumber, sampleDescIndex, NULL, &scheme_type, NULL, NULL);
-	gf_isom_get_sample_cenc_info_ex(trak, NULL, senc, sampleNumber, &is_Protected, &IV_size, NULL, NULL, NULL, &constant_IV_size, &constant_IV);
+	gf_isom_get_cenc_info(the_file, trackNumber, sampleDescIndex, NULL, &scheme_type, NULL);
 
 	/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
-	if ((!type || !sai) && gf_isom_cenc_has_saiz_saio_track(stbl, scheme_type)) {
-		return isom_cenc_get_sai_by_saiz_saio(trak->Media, sampleNumber, scheme_type, IV_size, sai, out_buffer, outSize);
-
+	if (gf_isom_cenc_has_saiz_saio_track(stbl, scheme_type)) {
+		return isom_cenc_get_sai_by_saiz_saio(trak->Media, sampleNumber, scheme_type, out_buffer, outSize);
 	}
 	if (!senc)
 		return GF_OK;
@@ -1624,61 +1672,57 @@
 			a_sai = (GF_CENCSampleAuxInfo *)gf_list_get(senc->samp_aux_info, sampleNumber-1);
 		break;
 	}
+	//not present, check we use constant IV and no IV size
 	if (!a_sai) {
-		if (!IV_size && constant_IV_size) return GF_OK;
+		const u8 *key_info=NULL;
+		u32 key_info_size=0;
+		u8 IV_size=0, constant_IV_size=0;
+		Bool is_Protected;
+
+		gf_isom_get_sample_cenc_info_internal(trak, NULL, senc, sampleNumber, &is_Protected, NULL, NULL, &key_info, &key_info_size);
+		if (!key_info) {
+			IV_size = key_info_size; //piff default
+		} else {
+			IV_size = key_info[3];
+			if (!IV_size)
+				constant_IV_size = key_info[20];
+		}
+		if (!IV_size && constant_IV_size)
+			return GF_OK;
 		return GF_NOT_FOUND;
 	}
 
-	if (!sai)
-		return GF_BAD_PARAM;
-
-	GF_SAFEALLOC((*sai), GF_CENCSampleAuxInfo);
-	if (!(*sai) ) return GF_OUT_OF_MEM;
-	if (senc) {
-		u8 size;
-		(*sai)->IV_size = a_sai->IV_size;
-		size = ((*sai)->IV_size != 0) ? (*sai)->IV_size : 8/*default for modern PIFF/CENC with AES-CTR*/;
-		memmove((*sai)->IV, a_sai->IV, size);
-		(*sai)->subsample_count = a_sai->subsample_count;
-		if ((*sai)->subsample_count > 0) {
-			(*sai)->subsamples = (GF_CENCSubSampleEntry*)gf_malloc(sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
-			if (! (*sai)->subsamples) return GF_OUT_OF_MEM;
-			memmove((*sai)->subsamples, a_sai->subsamples, sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
-		}
+	if (*outSize < a_sai->cenc_data_size) {
+		*out_buffer = gf_realloc(*out_buffer, sizeof(char) * a_sai->cenc_data_size);
+		if (! *out_buffer) return GF_OUT_OF_MEM;
+		*outSize = a_sai->cenc_data_size;
 	}
-
+	memcpy(*out_buffer, a_sai->cenc_data, a_sai->cenc_data_size);
 	return GF_OK;
 }
 
-GF_EXPORT
-GF_Err gf_isom_cenc_get_sample_aux_info_buffer(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 sampleDescIndex, u32 *container_type, u8 **out_buffer, u32 *outSize)
-{
-	return gf_isom_cenc_get_sample_aux_info_internal(the_file, trackNumber, sampleNumber, sampleDescIndex, NULL, container_type, out_buffer, outSize);
-}
+u32 gf_isom_has_cenc_sample_group_ex(GF_TrackBox *trak);
 
-GF_EXPORT
-GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 sampleDescIndex, GF_CENCSampleAuxInfo **sai, u32 *container_type)
-{
-	return gf_isom_cenc_get_sample_aux_info_internal(the_file, trackNumber, sampleNumber, sampleDescIndex, sai, container_type, NULL, NULL);
-}
-
-void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID, u8 *constant_IV_size, bin128 *constant_IV, u8 *crypt_byte_block, u8 *skip_byte_block)
+void gf_isom_cenc_get_default_info_internal(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 {
 	GF_ProtectionSchemeInfoBox *sinf;
-	if (default_IsEncrypted) *default_IsEncrypted = 0;
-	if (default_IV_size) *default_IV_size = 0;
-	if (default_KID) memset(*default_KID, 0, 16);
-	if (constant_IV_size) *constant_IV_size = 0;
-	if (constant_IV) memset(*constant_IV, 0, 16);
+
+
+	//setup all default as not encrypted
+	if (default_IsEncrypted) *default_IsEncrypted = GF_FALSE;
 	if (crypt_byte_block) *crypt_byte_block = 0;
 	if (skip_byte_block) *skip_byte_block = 0;
 	if (container_type) *container_type = 0;
+	if (key_info) *key_info = NULL;
+	if (key_info_size) *key_info_size = 0;
 
 	sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENC_SCHEME, NULL);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBC_SCHEME, NULL);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENS_SCHEME, NULL);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBCS_SCHEME, NULL);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_PIFF_SCHEME, NULL);
+	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_SVE1_SCHEME, NULL);
+	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_HLS_SAMPLE_AES_SCHEME, NULL);
 
 	if (!sinf) {
 		u32 i, nb_stsd = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
@@ -1689,44 +1733,64 @@
 			sentry = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, i);
 			a_sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(sentry->child_boxes, GF_ISOM_BOX_TYPE_SINF);
 			if (!a_sinf) continue;
-
-			if (default_IsEncrypted) *default_IsEncrypted = GF_FALSE;
-			if (default_IV_size) *default_IV_size = 0;
-			if (default_KID) memset(*default_KID, 0, 16);
-			if (constant_IV_size) *constant_IV_size = 0;
-			if (constant_IV) memset(*constant_IV, 0, 16);
-			if (crypt_byte_block) *crypt_byte_block = 0;
-			if (skip_byte_block) *skip_byte_block = 0;
+			//signal default (not encrypted)
 			return;
 		}
 	}
 
 	if (sinf && sinf->info && sinf->info->tenc) {
 		if (default_IsEncrypted) *default_IsEncrypted = sinf->info->tenc->isProtected;
-		if (default_IV_size) *default_IV_size = sinf->info->tenc->Per_Sample_IV_Size;
-		if (default_KID) memmove(*default_KID, sinf->info->tenc->KID, 16);
-		if (constant_IV_size) *constant_IV_size = sinf->info->tenc->constant_IV_size;
-		if (constant_IV) memmove(*constant_IV, sinf->info->tenc->constant_IV, 16);
 		if (crypt_byte_block) *crypt_byte_block = sinf->info->tenc->crypt_byte_block;
 		if (skip_byte_block) *skip_byte_block = sinf->info->tenc->skip_byte_block;
+		if (key_info) *key_info = sinf->info->tenc->key_info;
+		if (key_info_size) {
+			*key_info_size = 20;
+			if (!sinf->info->tenc->key_info[3])
+				*key_info_size += 1 + sinf->info->tenc->key_info[20];
+		}
+
 		//set default value, overwritten below
 		if (container_type) *container_type = GF_ISOM_BOX_TYPE_SENC;
 	} else if (sinf && sinf->info && sinf->info->piff_tenc) {
-		if (default_IsEncrypted) *default_IsEncrypted = 1;
-		if (default_IV_size) *default_IV_size = sinf->info->piff_tenc->IV_size;
-		if (default_KID) memmove(*default_KID, sinf->info->piff_tenc->KID, 16);
+		if (default_IsEncrypted) *default_IsEncrypted = GF_TRUE;
+		if (key_info) *key_info = sinf->info->piff_tenc->key_info;
+		if (key_info_size) *key_info_size = 19;
 		//set default value, overwritten below
 		if (container_type) *container_type = GF_ISOM_BOX_UUID_PSEC;
 	} else {
-		if (! trak->moov->mov->is_smooth) {
-			trak->moov->mov->is_smooth = GF_TRUE;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] senc box without tenc, assuming MS smooth+piff\n"));
+		u32 i, count = 0;
+		GF_CENCSampleEncryptionGroupEntry *seig_entry = NULL;
+
+		if (!trak->moov->mov->is_smooth)
+			count = gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription);
+
+		for (i=0; i<count; i++) {
+			GF_SampleGroupDescriptionBox *sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
+			if (sgdesc->grouping_type!=GF_ISOM_SAMPLE_GROUP_SEIG) continue;
+			if (sgdesc->default_description_index)
+				seig_entry = gf_list_get(sgdesc->group_descriptions, sgdesc->default_description_index-1);
+			else
+				seig_entry = gf_list_get(sgdesc->group_descriptions, 0);
+			if (seig_entry && !seig_entry->key_info[0])
+				seig_entry = NULL;
+			break;
+		}
+		if (seig_entry) {
+			if (default_IsEncrypted) *default_IsEncrypted = seig_entry->IsProtected;
+			if (crypt_byte_block) *crypt_byte_block = seig_entry->crypt_byte_block;
+			if (skip_byte_block) *skip_byte_block = seig_entry->skip_byte_block;
+			if (key_info) *key_info = seig_entry->key_info;
+			if (key_info_size) *key_info_size = seig_entry->key_info_size;
+			if (container_type) *container_type = GF_ISOM_BOX_TYPE_SENC;
+		} else {
+			if (! trak->moov->mov->is_smooth ) {
+				trak->moov->mov->is_smooth = GF_TRUE;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] senc box without tenc, assuming MS smooth+piff\n"));
+			}
+			if (default_IsEncrypted) *default_IsEncrypted = GF_TRUE;
+			//set default value, overwritten below
+			if (container_type) *container_type = GF_ISOM_BOX_UUID_PSEC;
 		}
-		if (default_IsEncrypted) *default_IsEncrypted = GF_TRUE;
-		//leave as 0 to make sure we use the default IV size from PIFF_PSEC if any ...
-		if (default_IV_size) *default_IV_size = 0;
-		//set default value, overwritten below
-		if (container_type) *container_type = GF_ISOM_BOX_UUID_PSEC;
 	}
 
 	if (container_type && trak->sample_encryption) {
@@ -1736,11 +1800,12 @@
 }
 
 GF_EXPORT
-void gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID, u8 *constant_IV_size, bin128 *constant_IV, u8 *crypt_byte_block, u8 *skip_byte_block)
+GF_Err gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return;
-	gf_isom_cenc_get_default_info_ex(trak, sampleDescriptionIndex, container_type, default_IsEncrypted, default_IV_size, default_KID, constant_IV_size, constant_IV, crypt_byte_block, skip_byte_block);
+	if (!trak) return GF_BAD_PARAM;
+	gf_isom_cenc_get_default_info_internal(trak, sampleDescriptionIndex, container_type, default_IsEncrypted, crypt_byte_block, skip_byte_block, key_info, key_info_size);
+	return GF_OK;
 }
 
 /*
@@ -1852,26 +1917,6 @@
 	return GF_OK;
 }
 
-GF_EXPORT
-Bool gf_isom_cenc_is_pattern_mode(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex)
-{
-	GF_TrackBox *trak;
-	GF_ProtectionSchemeInfoBox *sinf;
-
-	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return GF_FALSE;
-
-	sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENS_SCHEME, NULL);
-	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBCS_SCHEME, NULL);
-
-	if (!sinf) return GF_FALSE;
-
-	if (!sinf->info || !sinf->info->tenc || !sinf->info->tenc->crypt_byte_block || !sinf->info->tenc->skip_byte_block)
-		return GF_FALSE;
-
-	return GF_TRUE;
-}
-
 
 #if 0 //unused
 /*! removes the IPMPX tools from files
@@ -1889,4 +1934,46 @@
 #endif
 
 
+Bool gf_cenc_validate_key_info(const u8 *key_info, u32 key_info_size)
+{
+	u32 i, n_keys, kpos, nb_missing = 19;
+	if (!key_info|| (key_info_size<19))
+		goto exit;
+
+	n_keys = 1;
+	if (key_info[0]) {
+		n_keys = key_info[1];
+		n_keys <<= 8;
+		n_keys |= key_info[2];
+	}
+	kpos=3;
+	for (i=0;i<n_keys; i++) {
+		u8 iv_size;
+		if (kpos + 17 > key_info_size) {
+			nb_missing = kpos + 17 - key_info_size;
+			goto exit;
+		}
+		iv_size = key_info[kpos];
+		kpos += 17;
+		if (!iv_size) {
+			if (kpos + 1 > key_info_size) {
+				nb_missing = kpos + 1 - key_info_size;
+				goto exit;
+			}
+			iv_size = key_info[kpos];
+			if (kpos + 1 + iv_size > key_info_size) {
+				nb_missing = kpos + 1 + iv_size - key_info_size;
+				goto exit;
+			}
+			kpos += 1 + iv_size;
+		}
+	}
+	return GF_TRUE;
+
+exit:
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Invalid key info format, missing %d bytes\n", nb_missing));
+	return GF_FALSE;
+}
+
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-1.0.1.tar.gz/src/isomedia/hint_track.c -> gpac-2.0.0.tar.gz/src/isomedia/hint_track.c Changed

@@ -43,6 +43,9 @@
 u32 GetHintFormat(GF_TrackBox *trak)
 {
 	GF_HintMediaHeaderBox *hmhd = (GF_HintMediaHeaderBox *)trak->Media->information->InfoHeader;
+	if (hmhd && (hmhd->type != GF_ISOM_BOX_TYPE_HMHD))
+		return 0;
+		
 	if (!hmhd || !hmhd->subType) {
 		GF_Box *a = (GF_Box *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, 0);
 		if (!hmhd) return a ? a->type : 0;
@@ -123,7 +126,7 @@
 	if (!trak->References) {
 		tref = (GF_TrackReferenceBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_TREF);
 		if (!tref) return GF_OUT_OF_MEM;
-		e = trak_on_child_box((GF_Box*)trak, (GF_Box *)tref);
+		e = trak_on_child_box((GF_Box*)trak, (GF_Box *)tref, GF_FALSE);
 		if (e) return e;
 	}
 	tref = trak->References;
@@ -146,13 +149,13 @@
 		//create one
 		udta = (GF_UserDataBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA);
 		if (!udta) return GF_OUT_OF_MEM;
-		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) udta);
+		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) udta, GF_FALSE);
 		if (e) return e;
 	}
 	udta = trak->udta;
 
 	//HNTI
-	e = udta_on_child_box((GF_Box *)udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_HNTI));
+	e = udta_on_child_box((GF_Box *)udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_HNTI), GF_FALSE);
 	if (e) return e;
 
 	/*
@@ -235,6 +238,8 @@
 
 	//OK, create a new HintSampleDesc
 	hdesc = (GF_HintSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, HintDescriptionIndex - 1);
+	if (!hdesc) return GF_BAD_PARAM;
+
 	count = gf_list_count(hdesc->child_boxes);
 
 	for (i=0; i< count; i++) {
@@ -266,6 +271,7 @@
 
 	//OK, create a new HintSampleDesc
 	hdesc = (GF_HintSampleEntryBox *) gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, HintDescriptionIndex - 1);
+	if (!hdesc) return GF_BAD_PARAM;
 	count = gf_list_count(hdesc->child_boxes);
 
 	for (i=0; i< count; i++) {
@@ -298,6 +304,7 @@
 
 	//OK, create a new HintSampleDesc
 	hdesc = (GF_HintSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, HintDescriptionIndex - 1);
+	if (!hdesc) return GF_BAD_PARAM;
 	count = gf_list_count(hdesc->child_boxes);
 
 	for (i=0; i< count; i++) {
@@ -756,7 +763,7 @@
 
 	hnti = (GF_HintTrackInfoBox *)gf_list_get(map->boxes, 0);
 	if (!hnti->SDP) {
-		e = hnti_on_child_box((GF_Box*)hnti, gf_isom_box_new_parent(&hnti->child_boxes, GF_ISOM_BOX_TYPE_SDP));
+		e = hnti_on_child_box((GF_Box*)hnti, gf_isom_box_new_parent(&hnti->child_boxes, GF_ISOM_BOX_TYPE_SDP), GF_FALSE);
 		if (e) return e;
 	}
 	sdp = (GF_SDPBox *) hnti->SDP;
@@ -825,20 +832,20 @@
 
 	//check if we have a udta ...
 	if (!movie->moov->udta) {
-		e = moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+		e = moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 		if (e) return e;
 	}
 	//find a hnti in the udta
 	map = udta_getEntry(movie->moov->udta, GF_ISOM_BOX_TYPE_HNTI, NULL);
 	if (!map) {
-		e = udta_on_child_box((GF_Box *)movie->moov->udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_HNTI));
+		e = udta_on_child_box((GF_Box *)movie->moov->udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_HNTI), GF_FALSE);
 		if (e) return e;
 		map = udta_getEntry(movie->moov->udta, GF_ISOM_BOX_TYPE_HNTI, NULL);
 	}
 
 	//there should be one and only one hnti
 	if (!gf_list_count(map->boxes) ) {
-		e = udta_on_child_box((GF_Box *)movie->moov->udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_HNTI));
+		e = udta_on_child_box((GF_Box *)movie->moov->udta, gf_isom_box_new(GF_ISOM_BOX_TYPE_HNTI), GF_FALSE);
 		if (e) return e;
 	}
 	else if (gf_list_count(map->boxes) < 1) return GF_ISOM_INVALID_FILE;
@@ -848,7 +855,7 @@
 	if (!hnti->SDP) {
 		GF_Box *a = gf_isom_box_new_ex(GF_ISOM_BOX_TYPE_RTP, GF_ISOM_BOX_TYPE_HNTI, 0, GF_FALSE);
 		if (!a) return GF_OUT_OF_MEM;
-		hnti_on_child_box((GF_Box*)hnti, a);
+		hnti_on_child_box((GF_Box*)hnti, a, GF_FALSE);
 		if (!hnti->child_boxes) hnti->child_boxes = gf_list_new();
 		gf_list_add(hnti->child_boxes, a);
 	}

gpac-1.0.1.tar.gz/src/isomedia/hinting.c -> gpac-2.0.0.tar.gz/src/isomedia/hinting.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -31,7 +31,8 @@
 {
 	GF_HintSampleEntryBox *tmp;
 	GF_SAFEALLOC(tmp, GF_HintSampleEntryBox);
-	if (tmp == NULL) return NULL;
+	if (!tmp) return NULL;
+	gf_isom_sample_entry_init((GF_SampleEntryBox *)tmp);
 
 	//this type is used internally for protocols that share the same base entry
 	//currently only RTP uses this, but a flexMux could use this entry too...
@@ -45,6 +46,7 @@
 {
 	GF_HintSampleEntryBox *ptr;
 
+	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
 	ptr = (GF_HintSampleEntryBox *)s;
 	if (ptr->hint_sample) gf_isom_hint_sample_del(ptr->hint_sample);
 	gf_free(ptr);
@@ -74,7 +76,7 @@
 		ptr->FEC_overhead = gf_bs_read_u16(bs);
 
 	}
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -676,6 +678,7 @@
 		while (tempSize < TLVsize) {
 			e = gf_isom_box_parse(&a, bs);
 			if (e) return e;
+			if (!a) continue;
 			gf_list_add(ptr->TLV, a);
 			tempSize += (u32) a->size;
 		}

gpac-1.0.1.tar.gz/src/isomedia/iff.c -> gpac-2.0.0.tar.gz/src/isomedia/iff.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -83,6 +83,113 @@
 	}
 }
 
+GF_Box *a1lx_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AV1LayeredImageIndexingPropertyBox, GF_ISOM_BOX_TYPE_A1LX);
+	return (GF_Box *)tmp;
+}
+
+void a1lx_box_del(GF_Box *a)
+{
+	GF_AV1LayeredImageIndexingPropertyBox *p = (GF_AV1LayeredImageIndexingPropertyBox *)a;
+	gf_free(p);
+}
+
+GF_Err a1lx_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i;
+	GF_AV1LayeredImageIndexingPropertyBox *p = (GF_AV1LayeredImageIndexingPropertyBox *)s;
+	
+	ISOM_DECREASE_SIZE(p, 1);
+	gf_bs_read_int(bs, 7);
+	p->large_size = gf_bs_read_int(bs, 1);
+	for (i=0; i<3; i++) {
+		if (p->large_size) {
+			ISOM_DECREASE_SIZE(p, 4);
+			p->layer_size[i] = gf_bs_read_u32(bs);
+		} else {
+			ISOM_DECREASE_SIZE(p, 2);
+			p->layer_size[i] = gf_bs_read_u16(bs);
+		}
+	}
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err a1lx_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i;
+	GF_Err e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	GF_AV1LayeredImageIndexingPropertyBox *p = (GF_AV1LayeredImageIndexingPropertyBox*)s;
+
+	gf_bs_write_int(bs, 0, 7);
+	gf_bs_write_int(bs, p->large_size ? 1 : 0, 1);
+	for (i=0; i<3; i++) {
+		if (p->large_size) {
+			gf_bs_write_u32(bs, p->layer_size[i]);
+		} else {
+			gf_bs_write_u16(bs, p->layer_size[i]);
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err a1lx_box_size(GF_Box *s)
+{
+	GF_AV1LayeredImageIndexingPropertyBox *p = (GF_AV1LayeredImageIndexingPropertyBox*)s;
+
+	//if large was set, do not override
+	if (! p->large_size) {
+		if (p->layer_size[0]>0xFFFF) p->large_size = 1;
+		else if (p->layer_size[1]>0xFFFF) p->large_size = 1;
+		else if (p->layer_size[2]>0xFFFF) p->large_size = 1;
+	}
+
+	p->size += (p->large_size ? 4 : 2) * 3 + 1;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *a1op_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AV1OperatingPointSelectorPropertyBox, GF_ISOM_BOX_TYPE_A1OP);
+	return (GF_Box *)tmp;
+}
+
+void a1op_box_del(GF_Box *a)
+{
+	GF_AV1OperatingPointSelectorPropertyBox *p = (GF_AV1OperatingPointSelectorPropertyBox *)a;
+	gf_free(p);
+}
+
+GF_Err a1op_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_AV1OperatingPointSelectorPropertyBox *p = (GF_AV1OperatingPointSelectorPropertyBox *)s;
+	p->op_index = gf_bs_read_u8(bs);
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err a1op_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	GF_AV1OperatingPointSelectorPropertyBox *p = (GF_AV1OperatingPointSelectorPropertyBox*)s;
+	gf_bs_write_u8(bs, p->op_index);
+	return GF_OK;
+}
+
+GF_Err a1op_box_size(GF_Box *s)
+{
+	GF_AV1OperatingPointSelectorPropertyBox *p = (GF_AV1OperatingPointSelectorPropertyBox*)s;
+	p->size += 1;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_Box *colr_box_new()
@@ -361,6 +468,45 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+GF_Box *imir_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ImageMirrorBox, GF_ISOM_BOX_TYPE_IMIR);
+	return (GF_Box *)tmp;
+}
+
+void imir_box_del(GF_Box *a)
+{
+	GF_ImageMirrorBox *p = (GF_ImageMirrorBox *)a;
+	gf_free(p);
+}
+
+GF_Err imir_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_ImageMirrorBox *p = (GF_ImageMirrorBox *)s;
+	p->axis = gf_bs_read_u8(bs) & 0x1;
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err imir_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ImageMirrorBox *p = (GF_ImageMirrorBox*)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, p->axis);
+	return GF_OK;
+}
+
+GF_Err imir_box_size(GF_Box *s)
+{
+	GF_ImageMirrorBox *p = (GF_ImageMirrorBox*)s;
+	p->size += 1;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 GF_Box *ipco_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ItemPropertyContainerBox, GF_ISOM_BOX_TYPE_IPCO);
@@ -375,7 +521,7 @@
 
 GF_Err ipco_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -403,17 +549,15 @@
 	gf_free(s);
 }
 
-static GF_Err iprp_on_child_box(GF_Box *s, GF_Box *a)
+GF_Err iprp_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
-	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
+	GF_ItemPropertiesBox *ptr = (GF_ItemPropertiesBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_IPCO:
-		if (p->property_container) ERROR_ON_DUPLICATED_BOX(a, p)
-		p->property_container = (GF_ItemPropertyContainerBox*)a;
+		BOX_FIELD_ASSIGN(property_container, GF_ItemPropertyContainerBox)
 		break;
 	case GF_ISOM_BOX_TYPE_IPMA:
-		if (p->property_association) ERROR_ON_DUPLICATED_BOX(a, p)
-		p->property_association = (GF_ItemPropertyAssociationBox*)a;
+		BOX_FIELD_ASSIGN(property_association, GF_ItemPropertyAssociationBox)
 		break;
 	default:
 		return GF_OK;
@@ -423,7 +567,7 @@
 
 GF_Err iprp_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, iprp_on_child_box);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -581,7 +725,7 @@
 
 GF_Err grpl_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, NULL, s->type);
+	return gf_isom_box_array_read_ex(s, bs, s->type);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -617,7 +761,7 @@
 	ptr->group_id = gf_bs_read_u32(bs);
 	ptr->entity_id_count = gf_bs_read_u32(bs);
 
-	if (ptr->entity_id_count*4 > ptr->size) return GF_ISOM_INVALID_FILE;
+	if (ptr->entity_id_count > ptr->size / 4) return GF_ISOM_INVALID_FILE;
 
 	ptr->entity_ids = (u32 *) gf_malloc(ptr->entity_id_count * sizeof(u32));
 	if (!ptr->entity_ids) return GF_OUT_OF_MEM;
@@ -952,12 +1096,139 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
+GF_Box *ienc_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ItemEncryptionPropertyBox, GF_ISOM_BOX_TYPE_IENC);
+	return (GF_Box *)tmp;
+}
+
+void ienc_box_del(GF_Box *a)
+{
+	GF_ItemEncryptionPropertyBox *p = (GF_ItemEncryptionPropertyBox *)a;
+	if (p->key_info) gf_free(p->key_info);
+	gf_free(p);
+}
+
+GF_Err ienc_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 nb_keys;
+	GF_ItemEncryptionPropertyBox *p = (GF_ItemEncryptionPropertyBox *)s;
+
+	ISOM_DECREASE_SIZE(p, 3)
+	gf_bs_read_u8(bs);
+	if (p->version == 0) {
+		gf_bs_read_u8(bs);
+	} else {
+		p->skip_byte_block = gf_bs_read_int(bs, 4);
+		p->crypt_byte_block = gf_bs_read_int(bs, 4);
+	}
+	nb_keys = gf_bs_read_u8(bs);
+	if (nb_keys * (sizeof(bin128)+1) > p->size)
+		return GF_NON_COMPLIANT_BITSTREAM;
+	p->key_info_size = (u32) (3+p->size);
+	p->key_info = gf_malloc(sizeof(u8) * p->key_info_size);
+	if (!p->key_info) return GF_OUT_OF_MEM;
+	p->key_info[0] = 1;
+	p->key_info[1] = 0;
+	p->key_info[2] = nb_keys;
+	gf_bs_read_data(bs, p->key_info+3, (u32) p->size);
+	p->size = 0;
+	if (!gf_cenc_validate_key_info(p->key_info, p->key_info_size))
+		return GF_ISOM_INVALID_FILE;
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err ienc_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 nb_keys;
+	GF_ItemEncryptionPropertyBox *p = (GF_ItemEncryptionPropertyBox*)s;
+	if (p->skip_byte_block || p->crypt_byte_block)
+		p->version = 1;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, 0);
+	if (p->version) {
+		gf_bs_write_int(bs, p->skip_byte_block, 4);
+		gf_bs_write_int(bs, p->crypt_byte_block, 4);
+	} else {
+		gf_bs_write_u8(bs, 0);
+	}
+	if (p->key_info[0]) {
+		if (p->key_info[1]) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Too many keys for ienc box, max is 255)\n"))
+			return GF_BAD_PARAM;
+		}
+		nb_keys = p->key_info[2];
+	} else {
+		nb_keys = 1;
+	}
+	gf_bs_write_u8(bs, nb_keys);
+	gf_bs_write_data(bs, p->key_info+3, p->key_info_size-3);
+	return GF_OK;
+}
+
+GF_Err ienc_box_size(GF_Box *s)
+{
+	GF_ItemEncryptionPropertyBox *p = (GF_ItemEncryptionPropertyBox*)s;
+	if (!p->key_info || (p->key_info_size<19))
+		return GF_BAD_PARAM;
+	p->size += 3 + p->key_info_size-3;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+GF_Box *iaux_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AuxiliaryInfoPropertyBox, GF_ISOM_BOX_TYPE_IAUX);
+	return (GF_Box *)tmp;
+}
+
+void iaux_box_del(GF_Box *a)
+{
+	gf_free(a);
+}
+
+GF_Err iaux_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_AuxiliaryInfoPropertyBox *p = (GF_AuxiliaryInfoPropertyBox *)s;
+
+	ISOM_DECREASE_SIZE(p, 8)
+	p->aux_info_type = gf_bs_read_u32(bs);
+	p->aux_info_parameter = gf_bs_read_u32(bs);
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err iaux_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AuxiliaryInfoPropertyBox *p = (GF_AuxiliaryInfoPropertyBox*)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u32(bs, p->aux_info_type);
+	gf_bs_write_u32(bs, p->aux_info_parameter);
+	return GF_OK;
+}
+
+GF_Err iaux_box_size(GF_Box *s)
+{
+	GF_AuxiliaryInfoPropertyBox *p = (GF_AuxiliaryInfoPropertyBox*)s;
+	p->size += 8;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
 
 static GF_Err gf_isom_iff_create_image_item_from_track_internal(GF_ISOFile *movie, Bool root_meta, u32 meta_track_number, u32 imported_track, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props, GF_List *item_extent_refs, u32 sample_number) {
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	GF_Err e;
-	u32 imported_sample_desc_index = 1;
-//	u32 sample_index = 1;
 	u32 w, h, hSpacing, vSpacing;
 	u8 num_channels;
 	u8 bits_per_channel[3];
@@ -966,10 +1237,24 @@
 	u32 timescale;
 	u32 item_type = 0;
 	GF_ImageItemProperties local_image_props;
+	GF_ImageItemProtection ipro, *orig_ipro = NULL;
 	Bool config_needed = 0;
 	GF_Box *config_box = NULL;
-	//u32 media_brand = 0;
+	Bool is_cenc = GF_FALSE;
+	Bool is_first = GF_TRUE;
+	Bool neg_time = (image_props && image_props->time<0) ? GF_TRUE : GF_FALSE;
+	u8 *sai = NULL;
+	u32 sai_size = 0, sai_alloc_size = 0;
 	u32 sample_desc_index = 0;
+	GF_ISOFile *fsrc = movie;
+	Bool reset_brands = GF_FALSE;
+
+	//only reset brands if first item import
+	if (!gf_isom_get_meta_item_count(movie, root_meta, meta_track_number))
+		reset_brands = GF_TRUE;
+
+	if (image_props && image_props->src_file)
+		fsrc = image_props->src_file;
 
 	if (image_props && image_props->tile_mode != TILE_ITEM_NONE) {
 		/* Processing the input file in Tiled mode:
@@ -982,7 +1267,10 @@
 		GF_TileItemMode orig_tile_mode;
 
 #if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
-		e = gf_media_split_hevc_tiles(movie, 0);
+		if (image_props->src_file)
+			e = GF_SERVICE_ERROR;
+		else
+			e = gf_media_split_hevc_tiles(movie, 0);
 #else
 		e = GF_NOT_SUPPORTED;
 #endif
@@ -1000,9 +1288,10 @@
 			gf_list_add(tile_item_ids, tile_item_id);
 			e = gf_isom_get_reference(movie, imported_track, GF_ISOM_REF_SABT, 1, &tile_track);
 			if (e) return e;
-			sprintf(sz_item_name, "%s-Tile%d", (item_name ? item_name : "Image"), i + 1);
+			if (item_name)
+				sprintf(sz_item_name, "%s-Tile%d", item_name, i + 1);
 			if (orig_tile_mode != TILE_ITEM_SINGLE || image_props->single_tile_number == i + 1) {
-				e = gf_isom_iff_create_image_item_from_track(movie, root_meta, meta_track_number, tile_track, sz_item_name, *tile_item_id, NULL, NULL);
+				e = gf_isom_iff_create_image_item_from_track(movie, root_meta, meta_track_number, tile_track, item_name ? sz_item_name : NULL, *tile_item_id, NULL, NULL);
 			}
 			if (e) return e;
 			gf_isom_remove_track(movie, tile_track);
@@ -1011,9 +1300,10 @@
 			}
 			if (e) return e;
 		}
-		sprintf(sz_item_name, "%s-TileBase", (item_name ? item_name : "Image"));
+		if (item_name)
+			sprintf(sz_item_name, "%s-TileBase", item_name);
 		if (orig_tile_mode == TILE_ITEM_ALL_BASE) {
-			gf_isom_iff_create_image_item_from_track(movie, root_meta, meta_track_number, imported_track, sz_item_name, item_id, image_props, tile_item_ids);
+			gf_isom_iff_create_image_item_from_track(movie, root_meta, meta_track_number, imported_track, item_name ? sz_item_name : NULL, item_id, image_props, tile_item_ids);
 		}
 		else if (orig_tile_mode == TILE_ITEM_ALL_GRID) {
 			// TODO
@@ -1026,11 +1316,147 @@
 		return GF_OK;
 	}
 
+	if (!image_props) {
+		image_props = &local_image_props;
+		memset(image_props, 0, sizeof(GF_ImageItemProperties));
+	} else {
+		orig_ipro = image_props->cenc_info;
+		image_props->cenc_info = NULL;
+	}
+
+	if (!imported_track) {
+		GF_ImageItemProperties src_props;
+		u32 item_idx, ref_id;
+		u32 scheme_type=0, scheme_version=0;
+		const char *orig_item_name, *orig_item_mime_type, *orig_item_encoding;
+		if (!image_props->item_ref_id) return GF_BAD_PARAM;
+
+		if (gf_isom_meta_get_item_ref_count(fsrc, GF_TRUE, 0, image_props->item_ref_id, GF_4CC('d','i','m','g')) > 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Cannnot import derived image, only native image import is supported\n"));
+			return GF_NOT_SUPPORTED;
+		}
+
+		item_idx = gf_isom_get_meta_item_by_id(fsrc, GF_TRUE, 0, image_props->item_ref_id);
+		if (!item_idx) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: No item with ID %d, cannnot import\n", image_props->item_ref_id));
+			return GF_BAD_PARAM;
+		}
+		orig_item_name = orig_item_mime_type = orig_item_encoding = NULL;
+		gf_isom_get_meta_item_info(fsrc, GF_TRUE, 0, item_idx, &ref_id, &item_type, &scheme_type, &scheme_version, NULL, NULL, NULL, &orig_item_name, &orig_item_mime_type, &orig_item_encoding);
+
+		if (!ref_id) return GF_BAD_PARAM;
+		if (ref_id != image_props->item_ref_id) return GF_ISOM_INVALID_FILE;
+
+		gf_isom_get_meta_image_props(fsrc, GF_TRUE, 0, ref_id, &src_props);
+
+		image_props->config = src_props.config;
+		image_props->width = src_props.width;
+		image_props->height = src_props.height;
+		image_props->num_channels = src_props.num_channels;
+		memcpy(image_props->av1_layer_size, src_props.av1_layer_size, sizeof(u32)*3);
+		memcpy(image_props->bits_per_channel, src_props.bits_per_channel, sizeof(u32)*3);
+		if (!image_props->hSpacing && !image_props->vSpacing) {
+			image_props->hSpacing = src_props.hSpacing;
+			image_props->vSpacing = src_props.vSpacing;
+		}
+		if (image_props->copy_props) {
+			if (!image_props->hOffset && !image_props->vOffset) {
+				image_props->hOffset = src_props.hOffset;
+				image_props->vOffset = src_props.vOffset;
+			}
+			if (!image_props->clap_wden) {
+				image_props->clap_wnum = src_props.clap_wnum;
+				image_props->clap_wden = src_props.clap_wden;
+				image_props->clap_hnum = src_props.clap_hnum;
+				image_props->clap_hden = src_props.clap_hden;
+				image_props->clap_honum = src_props.clap_honum;
+				image_props->clap_hoden = src_props.clap_hoden;
+				image_props->clap_vonum = src_props.clap_vonum;
+				image_props->clap_voden = src_props.clap_voden;
+			}
+			if (!image_props->alpha) image_props->alpha = src_props.alpha;
+			if (!image_props->depth) image_props->depth = src_props.depth;
+			if (!image_props->hidden) image_props->hidden = src_props.hidden;
+			if (!image_props->angle) image_props->angle = src_props.angle;
+			if (!image_props->mirror) image_props->mirror = src_props.mirror;
+			if (!image_props->av1_op_index) image_props->av1_op_index = src_props.av1_op_index;
+		}
+		if (!item_name) item_name = orig_item_name;
+
+		if (!image_props->use_reference || (fsrc == image_props->src_file)) {
+			u8 *data = NULL;
+			u32 size=0;
+			e = gf_isom_extract_meta_item_mem(fsrc, GF_TRUE, 0, ref_id, &data, &size, &size, NULL, GF_FALSE);
+			if (e) return GF_BAD_PARAM;
+
+			e = gf_isom_add_meta_item_memory(movie, root_meta, meta_track_number, item_name, &item_id, item_type, NULL, NULL, image_props, data, size, NULL);
+			if (data) gf_free(data);
+		} else {
+			e = gf_isom_add_meta_item_sample_ref(movie, root_meta, meta_track_number, item_name, &item_id, item_type, NULL, NULL, image_props, 0, ref_id);
+		}
+		return e;
+	}
+
 import_next_sample:
 
+	timescale = gf_isom_get_media_timescale(fsrc, imported_track);
+	if (image_props->sample_num) {
+		sample_number = image_props->sample_num;
+		sample = gf_isom_get_sample(fsrc, imported_track, sample_number, &sample_desc_index);
+		e = gf_isom_last_error(fsrc);
+	} else if (image_props->time<0) {
+		sample = gf_isom_get_sample(fsrc, imported_track, sample_number, &sample_desc_index);
+		e = gf_isom_last_error(fsrc);
+	} else {
+		e = gf_isom_get_sample_for_media_time(fsrc, imported_track, (u64)(image_props->time*timescale), &sample_desc_index, GF_ISOM_SEARCH_SYNC_FORWARD, &sample, &sample_number, NULL);
+	}
+	if (e || !sample || !sample->IsRAP) {
+		if (!sample) {
+			if (is_first) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("No sample found%s\n", (image_props->time<0) ? "" : " for requested time"));
+			} else {
+				e = GF_OK;
+				goto exit;
+			}
+		} else if ((image_props->time<0) || (image_props->step_time)) {
+			if (image_props->sample_num) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: imported sample %d (DTS "LLU") is not a sync sample (RAP %d size %d)\n", sample_number, sample->DTS, sample->IsRAP, sample->dataLength));
+			} else if (image_props->step_time) {
+				gf_isom_sample_del(&sample);
+				e = GF_OK;
+				goto exit;
+			} else {
+				gf_isom_sample_del(&sample);
+				sample_number++;
+				if (sample_number == gf_isom_get_sample_count(fsrc, imported_track)) {
+					e = GF_OK;
+					goto exit;
+				}
+				goto import_next_sample;
+			}
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error no sync sample found after time %g\n", image_props->time));
+		}
+		if (!e) e = GF_BAD_PARAM;
+		goto exit;
+	}
+
 	/* Check if the track type is supported as item type */
 	/* Get the config box if needed */
-	subtype = gf_isom_get_media_subtype(movie, imported_track, imported_sample_desc_index);
+	subtype = gf_isom_get_media_subtype(fsrc, imported_track, sample_desc_index);
+	if (gf_isom_is_media_encrypted(fsrc, imported_track, sample_desc_index)) {
+		if (gf_isom_is_cenc_media(fsrc, imported_track, sample_desc_index)) {
+			e = gf_isom_get_original_format_type(fsrc, imported_track, sample_desc_index, &subtype);
+			if (e) goto exit;
+			is_cenc = GF_TRUE;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Protected sample not using CENC, cannot add as item\n"));
+			e = GF_BAD_PARAM;
+			goto exit;
+		}
+	}
+
+
 	switch (subtype) {
 	case GF_ISOM_SUBTYPE_AVC_H264:
 	case GF_ISOM_SUBTYPE_AVC2_H264:
@@ -1038,9 +1464,9 @@
 	case GF_ISOM_SUBTYPE_AVC4_H264:
 		//FIXME: in avc1 with multiple descriptor, we should take the right description index
 		config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_AVCC);
-		if (!config_box) return GF_OUT_OF_MEM;
-		((GF_AVCConfigurationBox *)config_box)->config = gf_isom_avc_config_get(movie, imported_track, imported_sample_desc_index);
-		if (! ((GF_AVCConfigurationBox *)config_box)->config) return GF_OUT_OF_MEM;
+		if (!config_box) { e = GF_OUT_OF_MEM; goto exit; }
+		((GF_AVCConfigurationBox *)config_box)->config = gf_isom_avc_config_get(fsrc, imported_track, sample_desc_index);
+		if (! ((GF_AVCConfigurationBox *)config_box)->config) { e = GF_OUT_OF_MEM; goto exit; }
 		item_type = GF_ISOM_SUBTYPE_AVC_H264;
 		config_needed = 1;
 		num_channels = 3;
@@ -1050,9 +1476,9 @@
 		break;
 	case GF_ISOM_SUBTYPE_SVC_H264:
 		config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_SVCC);
-		if (!config_box) return GF_OUT_OF_MEM;
-		((GF_AVCConfigurationBox *)config_box)->config = gf_isom_svc_config_get(movie, imported_track, imported_sample_desc_index);
-		if (! ((GF_AVCConfigurationBox *)config_box)->config) return GF_OUT_OF_MEM;
+		if (!config_box) { e = GF_OUT_OF_MEM; goto exit; }
+		((GF_AVCConfigurationBox *)config_box)->config = gf_isom_svc_config_get(fsrc, imported_track, sample_desc_index);
+		if (! ((GF_AVCConfigurationBox *)config_box)->config) { e = GF_OUT_OF_MEM; goto exit; }
 		item_type = GF_ISOM_SUBTYPE_SVC_H264;
 		config_needed = 1;
 		num_channels = 3;
@@ -1062,9 +1488,9 @@
 		break;
 	case GF_ISOM_SUBTYPE_MVC_H264:
 		config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_MVCC);
-		if (!config_box) return GF_OUT_OF_MEM;
-		((GF_AVCConfigurationBox *)config_box)->config = gf_isom_mvc_config_get(movie, imported_track, imported_sample_desc_index);
-		if (! ((GF_AVCConfigurationBox *)config_box)->config) return GF_OUT_OF_MEM;
+		if (!config_box) { e = GF_OUT_OF_MEM; goto exit; }
+		((GF_AVCConfigurationBox *)config_box)->config = gf_isom_mvc_config_get(fsrc, imported_track, sample_desc_index);
+		if (! ((GF_AVCConfigurationBox *)config_box)->config) { e = GF_OUT_OF_MEM; goto exit; }
 		item_type = GF_ISOM_SUBTYPE_MVC_H264;
 		config_needed = 1;
 		num_channels = 3;
@@ -1080,9 +1506,9 @@
 	case GF_ISOM_SUBTYPE_LHV1:
 	case GF_ISOM_SUBTYPE_LHE1:
 		config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
-		if (!config_box) return GF_OUT_OF_MEM;
-		((GF_HEVCConfigurationBox *)config_box)->config = gf_isom_hevc_config_get(movie, imported_track, imported_sample_desc_index);
-		if (! ((GF_HEVCConfigurationBox *)config_box)->config) return GF_OUT_OF_MEM;
+		if (!config_box) { e = GF_OUT_OF_MEM; goto exit; }
+		((GF_HEVCConfigurationBox *)config_box)->config = gf_isom_hevc_config_get(fsrc, imported_track, sample_desc_index);
+		if (! ((GF_HEVCConfigurationBox *)config_box)->config) { e = GF_OUT_OF_MEM; goto exit; }
 		if (subtype == GF_ISOM_SUBTYPE_HVT1) {
 			item_type = GF_ISOM_SUBTYPE_HVT1;
 		}
@@ -1091,8 +1517,8 @@
 		}
 		config_needed = 1;
 		if (!((GF_HEVCConfigurationBox *)config_box)->config) {
-			((GF_HEVCConfigurationBox *)config_box)->config = gf_isom_lhvc_config_get(movie, imported_track, imported_sample_desc_index);
-			if (! ((GF_HEVCConfigurationBox *)config_box)->config) return GF_OUT_OF_MEM;
+			((GF_HEVCConfigurationBox *)config_box)->config = gf_isom_lhvc_config_get(fsrc, imported_track, sample_desc_index);
+			if (! ((GF_HEVCConfigurationBox *)config_box)->config) { e = GF_OUT_OF_MEM; goto exit; }
 			item_type = GF_ISOM_SUBTYPE_LHV1;
 		}
 		num_channels = 3;
@@ -1104,9 +1530,9 @@
 	case GF_ISOM_SUBTYPE_AV01:
 		{
 			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_AV1C);
-			if (!config_box) return GF_OUT_OF_MEM;
-			((GF_AV1ConfigurationBox *)config_box)->config = gf_isom_av1_config_get(movie, imported_track, imported_sample_desc_index);
-			if (! ((GF_AV1ConfigurationBox *)config_box)->config) return GF_OUT_OF_MEM;
+			if (!config_box) { e = GF_OUT_OF_MEM; goto exit; }
+			((GF_AV1ConfigurationBox *)config_box)->config = gf_isom_av1_config_get(fsrc, imported_track, sample_desc_index);
+			if (! ((GF_AV1ConfigurationBox *)config_box)->config) { e = GF_OUT_OF_MEM; goto exit; }
 			item_type = GF_ISOM_SUBTYPE_AV01;
 			config_needed = 1;
 			u8 depth = ((GF_AV1ConfigurationBox *)config_box)->config->high_bitdepth ? (((GF_AV1ConfigurationBox *)config_box)->config->twelve_bit ? 12 : 10 ) : 8;
@@ -1121,33 +1547,58 @@
 				bits_per_channel[1] = depth;
 				bits_per_channel[2] = depth;
 			}
+			// presence of OBU SH in config is not recommended and properties should be used instead of metadata OBUs
+			while (gf_list_count(((GF_AV1ConfigurationBox *)config_box)->config->obu_array)) {
+				GF_AV1_OBUArrayEntry *obu = gf_list_pop_back(((GF_AV1ConfigurationBox *)config_box)->config->obu_array);
+				if (obu) {
+					if (obu->obu) gf_free(obu->obu);
+					gf_free(obu);
+				}
+			}
+			gf_list_del(((GF_AV1ConfigurationBox *)config_box)->config->obu_array);
+			((GF_AV1ConfigurationBox *)config_box)->config->obu_array = NULL;
+			e = gf_media_av1_layer_size_get(fsrc, imported_track, sample_number, image_props->av1_op_index, image_props->av1_layer_size);
+ if (e) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("AV1 operating point index out of range for stream\n"));
+ goto exit;
+ }
 			//media_brand = GF_ISOM_BRAND_AVIF;
 		}
 		break;
+
+	case GF_ISOM_SUBTYPE_VVC1:
+		config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_VVCC);
+		if (!config_box) { e = GF_OUT_OF_MEM; goto exit; }
+		((GF_VVCConfigurationBox *)config_box)->config = gf_isom_vvc_config_get(fsrc, imported_track, sample_desc_index);
+		if (! ((GF_VVCConfigurationBox *)config_box)->config) { e = GF_OUT_OF_MEM; goto exit; }
+		item_type = GF_ISOM_SUBTYPE_VVC1;
+
+		config_needed = 1;
+		num_channels = 3;
+		bits_per_channel[0] = ((GF_VVCConfigurationBox *)config_box)->config->bit_depth;
+		bits_per_channel[1] = bits_per_channel[2] = bits_per_channel[0];
+		//media_brand = GF_ISOM_BRAND_HEIC;
+		break;
 	default:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Codec not supported to create HEIF image items\n"));
-		return GF_NOT_SUPPORTED;
+		e = GF_NOT_SUPPORTED;
+		goto exit;
 	}
 	if (config_needed && !config_box && !((GF_AVCConfigurationBox *)config_box)->config) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Image type %s requires a missing configuration box\n", gf_4cc_to_str(item_type)));
-		return GF_BAD_PARAM;
+		e = GF_BAD_PARAM;
+		goto exit;
 	}
 	/* Get some images properties from the track data */
-	e = gf_isom_get_visual_info(movie, imported_track, imported_sample_desc_index, &w, &h);
+	e = gf_isom_get_visual_info(fsrc, imported_track, sample_desc_index, &w, &h);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error determining image size\n"));
-		if (config_box) gf_isom_box_del(config_box);
-		return e;
+		goto exit;
 	}
-	e = gf_isom_get_pixel_aspect_ratio(movie, imported_track, imported_sample_desc_index, &hSpacing, &vSpacing);
+	e = gf_isom_get_pixel_aspect_ratio(fsrc, imported_track, sample_desc_index, &hSpacing, &vSpacing);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error determining image aspect ratio\n"));
-		if (config_box) gf_isom_box_del(config_box);
-		return e;
-	}
-	if (!image_props) {
-		image_props = &local_image_props;
-		memset(image_props, 0, sizeof(GF_ImageItemProperties));
+		goto exit;
 	}
 	if (!image_props->width && !image_props->height) {
 		image_props->width = w;
@@ -1164,64 +1615,354 @@
 		image_props->bits_per_channel[1] = bits_per_channel[1];
 		image_props->bits_per_channel[2] = bits_per_channel[2];
 	}
+	if (is_cenc) {
+		Bool Is_Encrypted;
+
+		memset(&ipro, 0, sizeof(GF_ImageItemProtection));
+		gf_isom_get_cenc_info(fsrc, imported_track, sample_desc_index, NULL, &ipro.scheme_type, &ipro.scheme_version);
+		e = gf_isom_get_sample_cenc_info(fsrc, imported_track, sample_desc_index, &Is_Encrypted, &ipro.crypt_byte_block, &ipro.skip_byte_block, &ipro.key_info, &ipro.key_info_size);
+		if (e) goto exit;
+
+		if (Is_Encrypted) {
+			sai_size = sai_alloc_size;
+			e = gf_isom_cenc_get_sample_aux_info(fsrc, imported_track, sample_number, sample_desc_index, NULL, &sai, &sai_size);
+			if (e) goto exit;
+
+			if (sai_size > sai_alloc_size)
+				sai_alloc_size = sai_size;
+
+			ipro.sai_data = sai;
+			ipro.sai_data_size = sai_size;
+			image_props->cenc_info = &ipro;
+
+			if (is_first) {
+				u32 i, nb_pssh = gf_isom_get_pssh_count(fsrc);
+				for (i=0; i<nb_pssh; i++) {
+					bin128 SystemID;
+					u32 version;
+					u32 KID_count;
+					const bin128 *KIDs;
+					const u8 *private_data;
+					u32 private_data_size;
+
+					gf_isom_get_pssh_info(fsrc, i+1, SystemID, &version, &KID_count, &KIDs, &private_data, &private_data_size);
+					
+					gf_cenc_set_pssh(movie, SystemID, version, KID_count, (bin128 *) KIDs, (u8 *) private_data, private_data_size, 2);
+				}
+			}
 
-	timescale = gf_isom_get_media_timescale(movie, imported_track);
-	if (image_props->time<0) {
-		sample = gf_isom_get_sample(movie, imported_track, sample_number, &sample_desc_index);
-	} else {
-		e = gf_isom_get_sample_for_media_time(movie, imported_track, (u64)(image_props->time*timescale), &sample_desc_index, GF_ISOM_SEARCH_SYNC_FORWARD, &sample, NULL, NULL);
+		} else {
+			image_props->cenc_info = NULL;
+		}
 	}
-	if (sample_desc_index != imported_sample_desc_index) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Warning sample description index for sync sample differ from config\n"));
+	if (!item_id) {
+		e = gf_isom_meta_get_next_item_id(movie, root_meta, meta_track_number, &item_id);
+		if (e) goto exit;
 	}
-	if (e || !sample || !sample->IsRAP) {
-		if (!sample) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("No sample found%s\n", (image_props->time<0) ? "" : " for requested time"));
-		} else if (image_props->time<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: imported sample %d (DTS "LLU") is not a sync sample (RAP %d size %d)\n", sample_number, sample->DTS, sample->IsRAP, sample->dataLength));
+	if (image_props->use_reference) {
+		if (image_props->sample_num) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("referring trackID %d sample %d as item %d\n", imported_track, sample_number, item_id));
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error no sync sample found after time %g\n", image_props->time));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("referring trackID %d sample at time %.3f as item %d\n", imported_track, (sample->DTS+sample->CTS_Offset)*1.0/timescale, item_id));
 		}
-		if (sample) gf_isom_sample_del(&sample);
-		if (config_box) gf_isom_box_del(config_box);
-		return GF_BAD_PARAM;
+		e = gf_isom_add_meta_item_sample_ref(movie, root_meta, meta_track_number, item_name, &item_id, item_type, NULL, NULL, image_props, imported_track, sample_number);
+	} else {
+
+		if (image_props->sample_num) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Adding sample %d as item %d\n", sample_number, item_id));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Adding sample at time %.3f as item %d\n", (sample->DTS+sample->CTS_Offset)*1.0/timescale, item_id));
+		}
+		e = gf_isom_add_meta_item_memory(movie, root_meta, meta_track_number, item_name, &item_id, item_type, NULL, NULL, image_props, sample->data, sample->dataLength, item_extent_refs);
 	}
 
-	if (!item_id) {
-		e = gf_isom_meta_get_next_item_id(movie, root_meta, meta_track_number, &item_id);
-		if (e) return e;
+	image_props->cenc_info = NULL;
+
+	if (reset_brands) {
+		gf_isom_set_brand_info(movie, GF_ISOM_BRAND_MIF1, 0);
+		gf_isom_reset_alt_brands(movie);
+
+		// TODO Analyze configuration to determine the brand */
+		//if (media_brand) {
+		//	gf_isom_modify_alternate_brand(movie, media_brand, GF_TRUE);
+		//}
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Adding sample from time %.3f as item %d\n", sample->DTS*1.0/timescale, item_id));
-	e = gf_isom_add_meta_item_memory(movie, root_meta, meta_track_number, (!item_name || !strlen(item_name) ? "Image" : item_name), item_id, item_type, NULL, NULL, image_props, sample->data, sample->dataLength, item_extent_refs);
+	
+	if (neg_time)
+		image_props->time = -1;
+
+	if (!e && !image_props->sample_num && ((image_props->time<0) || image_props->end_time || image_props->step_time)) {
+		if (image_props->end_time || image_props->step_time) {
+			Double t = (Double) (sample->DTS + sample->CTS_Offset);
+			t /= timescale;
+			if (image_props->step_time) {
+				t += image_props->step_time;
+			} else {
+				//step 1ms
+				t += 0.001;
+			}
 
-	gf_isom_set_brand_info(movie, GF_ISOM_BRAND_MIF1, 0);
-	gf_isom_reset_alt_brands(movie);
-	// TODO Analyze configuration to determine the brand */
-	//if (media_brand) {
-	//	gf_isom_modify_alternate_brand(movie, media_brand, GF_TRUE);
-	//}
-	gf_isom_sample_del(&sample);
-	if (config_box) gf_isom_box_del(config_box);
+			if ((image_props->end_time>0) && (t>image_props->end_time)) {
+				goto exit;
+			}
+			image_props->time = t;
+		}
 
-	if (image_props->time<0) {
-		if (sample_number >= gf_isom_get_sample_count(movie, imported_track)) return e;
-		sample_number++;
 		item_id=0;
+		gf_isom_sample_del(&sample);
+		if (config_box) {
+			gf_isom_box_del(config_box);
+			config_box = NULL;
+		}
+		is_first = GF_FALSE;
+		if (sample_number >= gf_isom_get_sample_count(fsrc, imported_track)) return e;
+		sample_number++;
 		//avoid recursion this could get quite big
 		goto import_next_sample;
 	}
+
+exit:
+	if (sai) gf_free(sai);
+	gf_isom_sample_del(&sample);
+	if (config_box) gf_isom_box_del(config_box);
+	image_props->cenc_info = orig_ipro;
 	return e;
+
+
 #else
 	return GF_NOT_SUPPORTED;
 #endif
 
 }
 
+static
+GF_Err gf_isom_iff_create_image_grid_item_internal(GF_ISOFile *movie, Bool root_meta, u32 meta_track_number, const char *item_name, u32 *item_id, GF_ImageItemProperties *image_props) {
+	GF_Err e = GF_OK;
+	u32 grid4cc = GF_4CC('g', 'r', 'i', 'd');
+	GF_BitStream *grid_bs;
+	if (image_props->num_grid_rows < 1 || image_props->num_grid_columns < 1 || image_props->num_grid_rows > 256 || image_props->num_grid_columns > 256) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Wrong grid parameters: %d, %d\n", image_props->num_grid_rows, image_props->num_grid_columns));
+		return GF_BAD_PARAM;
+	}
+	if (image_props->width == 0 || image_props->height == 0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("At least one grid dimension set to 0: %d, %d\n", image_props->width, image_props->height));
+		return GF_BAD_PARAM;
+	}
+	grid_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (!grid_bs) return GF_OUT_OF_MEM;
+	gf_bs_write_u8(grid_bs, 0); //version
+	gf_bs_write_u8(grid_bs, (image_props->width > 1<<16 || image_props->height > 1<<16) ? 1 : 0); // flags
+	gf_bs_write_u8(grid_bs, image_props->num_grid_rows-1);
+	gf_bs_write_u8(grid_bs, image_props->num_grid_columns-1);
+	gf_bs_write_u16(grid_bs, image_props->width);
+	gf_bs_write_u16(grid_bs, image_props->height);
+	u8 *grid_data;
+	u32 grid_data_size;
+	gf_bs_get_content(grid_bs, &grid_data, &grid_data_size);
+	e = gf_isom_add_meta_item_memory(movie, root_meta, meta_track_number, item_name, item_id, grid4cc, NULL, NULL, image_props, grid_data, grid_data_size, NULL);
+	gf_free(grid_data);
+	gf_bs_del(grid_bs);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_isom_iff_create_image_grid_item(GF_ISOFile *movie, Bool root_meta, u32 meta_track_number, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props)
+{
+	return gf_isom_iff_create_image_grid_item_internal(movie, root_meta, meta_track_number, item_name, &item_id, image_props);
+}
+
+static GF_Err iff_create_auto_grid(GF_ISOFile *movie, Bool root_meta, u32 meta_track_number, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props)
+{
+	GF_Err e;
+	GF_ImageItemProperties props;
+	u32 w=0, h=0;
+	u32 *imgs_ids=NULL;
+	u32 nb_imgs=0, nb_src_imgs;
+	u32 nb_cols, nb_rows;
+	u32 last_valid_nb_cols;
+	Bool first_pass = GF_TRUE;
+	Double ar;
+	u32 i, nb_items = gf_isom_get_meta_item_count(movie, root_meta, meta_track_number);
+	for (i=0; i<nb_items; i++) {
+		u32 an_item_id, item_type;
+		gf_isom_get_meta_item_info(movie, root_meta, meta_track_number, i+1, &an_item_id, &item_type, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+		if (!item_id) continue;
+		if (item_type==GF_ISOM_ITEM_TYPE_AUXI) continue;
+
+		memset(&props, 0, sizeof(props));
+		gf_isom_get_meta_image_props(movie, root_meta, meta_track_number, an_item_id, &props);
+		if (!props.width || !props.height) continue;
+
+		if (!w) w = props.width;
+		if (!h) h = props.height;
+
+		if ((w != props.width) || (h != props.height)) {
+			if (imgs_ids) gf_free(imgs_ids);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Auto grid can only be generated for images of the same size - try using `-add-image-grid`\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		imgs_ids = gf_realloc(imgs_ids, sizeof(u32) * (nb_imgs+1));
+		if (!imgs_ids) return GF_OUT_OF_MEM;
+		imgs_ids[nb_imgs] = an_item_id;
+		nb_imgs++;
+	}
+
+	if (!nb_imgs || !w || !h) {
+		if (imgs_ids) gf_free(imgs_ids);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("No image items found\n"));
+		return GF_BAD_PARAM;
+	}
+
+	//try roughly the same aspect ratio
+	if (image_props->auto_grid_ratio) {
+		ar = image_props->auto_grid_ratio;
+	} else {
+		ar = w;
+		ar /= h;
+	}
+	nb_src_imgs = nb_imgs;
+
+recompute_grid:
+	nb_cols=1;
+	nb_rows=1;
+	last_valid_nb_cols = 0;
+
+	if (nb_imgs>1) {
+		while (nb_cols < nb_imgs) {
+			Double target_ar = ((Double) nb_cols) * w;
+			nb_rows = nb_imgs / nb_cols;
+			if (nb_rows * nb_cols != nb_imgs) {
+				nb_cols++;
+				continue;
+			}
+			target_ar /= ((Double)nb_rows) * h;
+			if (target_ar >= ar) break;
+			last_valid_nb_cols = nb_cols;
+			nb_cols++;
+		}
+	}
+	if ((nb_cols==nb_imgs) && last_valid_nb_cols) {
+		nb_cols = last_valid_nb_cols;
+		nb_rows = nb_imgs / nb_cols;
+	}
+
+	if (first_pass && (nb_imgs>1) && ((nb_cols==1) || (nb_rows==1) ) ) {
+		if (nb_imgs % 2) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Not an even number of images, removing last item from grid\n"));
+			nb_imgs--;
+			first_pass = GF_FALSE;
+			goto recompute_grid;
+		}
+	}
+
+	memset(&props, 0, sizeof(props));
+	if (image_props)
+		memcpy(&props, image_props, sizeof(props));
+	props.hidden = GF_FALSE;
+	props.width = nb_cols * w;
+	props.height = nb_rows * h;
+	props.num_grid_rows = nb_rows;
+	props.num_grid_columns = nb_cols;
+	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Grid: %u rows %u cols - size %ux%u pixels\n", nb_cols, nb_rows, props.width, props.height));
+
+	e = gf_isom_iff_create_image_grid_item_internal(movie, root_meta, meta_track_number, item_name, &item_id, &props);
+	if (e) {
+		gf_free(imgs_ids);
+		return e;
+	}
+
+	for (i=0; i<nb_imgs; i++) {
+		e = gf_isom_meta_add_item_ref(movie, root_meta, meta_track_number, item_id, imgs_ids[i], GF_4CC('d','i','m','g'), NULL);
+		if (e) goto exit;
+	}
+
+	//we might want an option to avoid this?
+	//if (image_props->hidden)
+	{
+		GF_MetaBox *meta = gf_isom_get_meta(movie, root_meta, meta_track_number);
+		for (i=0; i<nb_src_imgs; i++) {
+			GF_ItemInfoEntryBox *iinf;
+			u32 j=0;
+			while ((iinf = (GF_ItemInfoEntryBox *)gf_list_enum(meta->item_infos->item_infos, &j))) {
+				if (iinf->item_ID == imgs_ids[i]) {
+					iinf->flags |= 0x1;
+					break;
+				}
+			}
+		}
+		e = gf_isom_set_meta_primary_item(movie, root_meta, meta_track_number, item_id);
+	}
+
+exit:
+	gf_free(imgs_ids);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_isom_iff_create_image_overlay_item(GF_ISOFile *movie, Bool root_meta, u32 meta_track_number, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props) {
+	u32 i;
+	Bool use32bitFields = GF_FALSE;
+	GF_Err e = GF_OK;
+	u32 overlay4cc = GF_4CC('i', 'o', 'v', 'l');
+	GF_BitStream *overlay_bs;
+	if (image_props->overlay_count == 0 || image_props->width == 0 || image_props->height == 0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Unusual overlay parameters: %d, %d, %d\n", image_props->overlay_count, image_props->width, image_props->height));
+	}
+	if (image_props->width <= 1<<16 || image_props->height <= 1<<16) {
+		for (i=0; i< image_props->overlay_count; i++) {
+			if ( image_props->overlay_offsets[i].horizontal > 1<<16 ||
+				image_props->overlay_offsets[i].vertical > 1<<16) {
+				use32bitFields = GF_TRUE;
+				break;
+			}
+		}
+	} else {
+		use32bitFields = GF_TRUE;
+	}
+	overlay_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (!overlay_bs) return GF_OUT_OF_MEM;
+	gf_bs_write_u8(overlay_bs, 0); // version
+	gf_bs_write_u8(overlay_bs, use32bitFields ? 1 : 0); // flags
+	gf_bs_write_u16(overlay_bs, image_props->overlay_canvas_fill_value_r);
+	gf_bs_write_u16(overlay_bs, image_props->overlay_canvas_fill_value_g);
+	gf_bs_write_u16(overlay_bs, image_props->overlay_canvas_fill_value_b);
+	gf_bs_write_u16(overlay_bs, image_props->overlay_canvas_fill_value_a);
+	gf_bs_write_u16(overlay_bs, image_props->width);
+	gf_bs_write_u16(overlay_bs, image_props->height);
+	for (i = 0; i <image_props->overlay_count; i++) {
+		gf_bs_write_u16(overlay_bs, image_props->overlay_offsets[i].horizontal);
+		gf_bs_write_u16(overlay_bs, image_props->overlay_offsets[i].vertical);
+	}
+	u8 *overlay_data;
+	u32 overlay_data_size;
+	gf_bs_get_content(overlay_bs, &overlay_data, &overlay_data_size);
+	e = gf_isom_add_meta_item_memory(movie, root_meta, meta_track_number, item_name, &item_id, overlay4cc, NULL, NULL, image_props, overlay_data, overlay_data_size, NULL);
+	gf_free(overlay_data);
+	gf_bs_del(overlay_bs);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_isom_iff_create_image_identity_item(GF_ISOFile *movie, Bool root_meta, u32 meta_track_number, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props) {
+	GF_Err e = GF_OK;
+	u32 identity4cc = GF_4CC('i', 'd', 'e', 'n');
+	if (image_props->width == 0 || image_props->height == 0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("At least one identity dimension set to 0: %d, %d\n", image_props->width, image_props->height));
+	}
+	e = gf_isom_add_meta_item_memory(movie, root_meta, meta_track_number, item_name, &item_id, identity4cc, NULL, NULL, image_props, NULL, 0, NULL);
+	return e;
+}
+
 GF_EXPORT
 GF_Err gf_isom_iff_create_image_item_from_track(GF_ISOFile *movie, Bool root_meta, u32 meta_track_number, u32 imported_track, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props, GF_List *item_extent_refs)
 {
 
+	if (image_props && image_props->auto_grid)
+		return iff_create_auto_grid(movie, root_meta, meta_track_number, item_name, item_id, image_props);
+
 	return gf_isom_iff_create_image_item_from_track_internal(movie, root_meta, meta_track_number, imported_track, item_name, item_id, image_props, item_extent_refs, 1);
 }
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-1.0.1.tar.gz/src/isomedia/isom_intern.c -> gpac-2.0.0.tar.gz/src/isomedia/isom_intern.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -25,6 +25,7 @@
 
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/network.h>
+#include <gpac/thread.h>
 
 #ifndef GPAC_DISABLE_ISOM
 
@@ -64,6 +65,7 @@
 
 	i=0;
 	while ((traf = (GF_TrackFragmentBox*)gf_list_enum(moof->TrackList, &i))) {
+		u32 prev_sample_count;
 		if (!traf->tfhd) {
 			trak = NULL;
 			traf->trex = NULL;
@@ -86,8 +88,10 @@
 			return GF_ISOM_INVALID_FILE;
 		}
 
-		e = MergeTrack(trak, traf, moof, mov->current_top_box_start, moof->compressed_diff, &base_data_offset, !trak->first_traf_merged);
+		prev_sample_count = trak->Media->information->sampleTable->SampleSize ? trak->Media->information->sampleTable->SampleSize->sampleCount : 0;
+		e = MergeTrack(trak, traf, moof, mov->current_top_box_start, moof->compressed_diff, &base_data_offset);
 		if (e) return e;
+		trak->first_traf_merged = GF_TRUE;
 
 		trak->present_in_scalable_segment = 1;
 
@@ -96,7 +100,54 @@
 		if (trak->Header->duration > MaxDur)
 			MaxDur = trak->Header->duration;
 
-		trak->first_traf_merged = GF_TRUE;
+		//we have PSSH per moov, internally remap as a sample group of type PSSH
+		if (gf_list_count(moof->PSSHs)) {
+			u8 *pssh_data;
+			u32 pssh_len;
+			u32 j, k, nb_pssh = gf_list_count(moof->PSSHs);
+			GF_BitStream *pssh_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			gf_bs_write_u32(pssh_bs, nb_pssh);
+			for (j=0; j<nb_pssh; j++) {
+				GF_ProtectionSystemHeaderBox *pssh = gf_list_get(moof->PSSHs, j);
+				gf_bs_write_data(pssh_bs, pssh->SystemID, 16);
+				gf_bs_write_u32(pssh_bs, pssh->version);
+				if (pssh->version) {
+					gf_bs_write_u32(pssh_bs, pssh->KID_count);
+					for (k=0; k<pssh->KID_count; k++) {
+						gf_bs_write_data(pssh_bs, pssh->KIDs[k], 16);
+					}
+				}
+				gf_bs_write_u32(pssh_bs, pssh->private_data_size);
+				gf_bs_write_data(pssh_bs, pssh->private_data, pssh->private_data_size);
+			}
+			gf_bs_get_content(pssh_bs, &pssh_data, &pssh_len);
+			gf_bs_del(pssh_bs);
+
+			gf_isom_set_sample_group_description_internal(mov, gf_list_find(mov->moov->trackList, trak)+1, 1+prev_sample_count, GF_4CC('P','S','S','H'), 0, pssh_data, pssh_len, GF_FALSE);
+			gf_free(pssh_data);
+		}
+
+
+		//we have emsg, internally remap as a sample group of type EMSG
+		if (gf_list_count(mov->emsgs)) {
+			u8 *emsg_data;
+			u32 emsg_len;
+			u32 j, nb_emsg = gf_list_count(mov->emsgs);
+			GF_BitStream *emsg_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			for (j=0; j<nb_emsg; j++) {
+				GF_Box *emsg = gf_list_get(mov->emsgs, j);
+				gf_isom_box_write(emsg, emsg_bs);
+			}
+			gf_bs_get_content(emsg_bs, &emsg_data, &emsg_len);
+			gf_bs_del(emsg_bs);
+
+			gf_isom_set_sample_group_description_internal(mov, gf_list_find(mov->moov->trackList, trak)+1, 1+prev_sample_count, GF_4CC('E','M','S','G'), 0, emsg_data, emsg_len, GF_FALSE);
+			gf_free(emsg_data);
+		}
+	}
+	if (mov->emsgs) {
+		gf_isom_box_array_del(mov->emsgs);
+		mov->emsgs = NULL;
 	}
 
 	if (moof->child_boxes) {
@@ -118,6 +169,8 @@
 				pssh->private_data = (u8 *)gf_malloc(pssh->private_data_size*sizeof(char));
 				if (!pssh->private_data) return GF_OUT_OF_MEM;
 				memmove(pssh->private_data, ((GF_ProtectionSystemHeaderBox *)a)->private_data, pssh->private_data_size);
+				pssh->moof_defined = 1;
+				mov->has_pssh_moof = GF_TRUE;
 			}
 		}
 	}
@@ -188,7 +241,10 @@
 
 void gf_isom_push_mdat_end(GF_ISOFile *mov, u64 mdat_end)
 {
-	u32 i, count = gf_list_count(mov->moov->trackList);
+	u32 i, count;
+	if (!mov || !mov->moov) return;
+
+	count = gf_list_count(mov->moov->trackList);
 	for (i=0; i<count; i++) {
 		u32 j;
 		GF_TrafToSampleMap *traf_map;
@@ -205,7 +261,8 @@
 	}
 }
 
-void gf_isom_setup_traf_inheritance(GF_ISOFile *mov)
+#ifdef GF_ENABLE_CTRN
+static void gf_isom_setup_traf_inheritance(GF_ISOFile *mov)
 {
 	u32 i, count;
 	if (!mov->moov->mvex)
@@ -223,10 +280,68 @@
 		}
 	}
 }
+#endif
 
 #endif
 
-GF_Err gf_isom_parse_movie_boxes(GF_ISOFile *mov, u32 *boxType, u64 *bytesMissing, Bool progressive_mode)
+//for now we only use regular sample to group internally (except when dumping), not the pattern version
+//we unrill the pattern and replace the compact version with a regular one
+static void convert_compact_sample_groups(GF_List *child_boxes, GF_List *sampleGroups)
+{
+	u32 i;
+	for (i=0; i<gf_list_count(sampleGroups); i++) {
+		u32 j;
+		GF_SampleGroupBox *sbgp;
+		GF_CompactSampleGroupBox *csgp = gf_list_get(sampleGroups, i);
+		if (csgp->type != GF_ISOM_BOX_TYPE_CSGP) continue;
+
+		gf_list_rem(sampleGroups, i);
+		gf_list_del_item(child_boxes, csgp);
+
+		sbgp = (GF_SampleGroupBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SBGP);
+		gf_list_insert(sampleGroups, sbgp, i);
+		gf_list_add(child_boxes, sbgp);
+		i--;
+
+		sbgp->grouping_type = csgp->grouping_type;
+		if (csgp->grouping_type_parameter) {
+			sbgp->grouping_type_parameter = csgp->grouping_type_parameter;
+			sbgp->version = 1;
+		}
+		sbgp->entry_count = 0;
+		for (j=0; j<csgp->pattern_count; j++) {
+			u32 k=0;
+			u32 nb_samples = csgp->patterns[j].sample_count;
+			//unroll the pattern
+			while (nb_samples) {
+				u32 nb_same_index=1;
+				if (csgp->patterns[j].length<=k)
+					break;
+				u32 sg_idx = csgp->patterns[j].sample_group_description_indices[k];
+				while (nb_same_index+k<csgp->patterns[j].length) {
+					if (csgp->patterns[j].sample_group_description_indices[k+nb_same_index] != sg_idx)
+						break;
+					nb_same_index++;
+				}
+				sbgp->sample_entries = gf_realloc(sbgp->sample_entries, sizeof(GF_SampleGroupEntry) * (sbgp->entry_count+1));
+				if (nb_same_index>nb_samples)
+					nb_same_index = nb_samples;
+
+				sbgp->sample_entries[sbgp->entry_count].sample_count = nb_same_index;
+				sbgp->sample_entries[sbgp->entry_count].group_description_index = sg_idx;
+				nb_samples -= nb_same_index;
+				sbgp->entry_count++;
+				k+= nb_same_index;
+				if (k==csgp->patterns[j].length)
+					k = 0;
+			}
+		}
+		gf_isom_box_del((GF_Box*)csgp);
+	}
+}
+
+
+static GF_Err gf_isom_parse_movie_boxes_internal(GF_ISOFile *mov, u32 *boxType, u64 *bytesMissing, Bool progressive_mode)
 {
 	GF_Box *a;
 	u64 totSize, mdat_end=0;
@@ -252,7 +367,7 @@
 		*bytesMissing = 0;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 		mov->current_top_box_start = gf_bs_get_position(mov->movieFileMap->bs) + mov->bytes_removed;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Starting to parse a top-level box at position %d\n", mov->current_top_box_start));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Parsing a top-level box at position %d\n", mov->current_top_box_start));
 #endif
 
 		e = gf_isom_parse_root_box(&a, mov->movieFileMap->bs, boxType, bytesMissing, progressive_mode);
@@ -283,15 +398,19 @@
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->moov = (GF_MovieBox *)a;
+			mov->original_moov_offset = mov->current_top_box_start;
 			/*set our pointer to the movie*/
 			mov->moov->mov = mov;
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			if (mov->moov->mvex) mov->moov->mvex->mov = mov;
 
+#ifdef GF_ENABLE_CTRN
 			if (! (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)) {
 				gf_isom_setup_traf_inheritance(mov);
 			}
 #endif
+
+#endif
 			e = gf_list_add(mov->TopBoxes, a);
 			if (e) return e;
 
@@ -302,6 +421,10 @@
 return GF_ISOM_INVALID_FILE;
 }
 
+ if (mov->meta) {
+				gf_isom_meta_restore_items_ref(mov, mov->meta);
+			}
+
 			//dump senc info in dump mode
 			if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) {
 				u32 k;
@@ -313,6 +436,14 @@
 						if (e) return e;
 					}
 				}
+			} else {
+				u32 k;
+				for (k=0; k<gf_list_count(mov->moov->trackList); k++) {
+					GF_TrackBox *trak = (GF_TrackBox *)gf_list_get(mov->moov->trackList, k);
+					if (trak->Media->information->sampleTable->sampleGroups) {
+						convert_compact_sample_groups(trak->Media->information->sampleTable->child_boxes, trak->Media->information->sampleTable->sampleGroups);
+					}
+				}
 			}
 
 if (mdat_end && mov->signal_frag_bounds && !(mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) ) {
@@ -329,16 +460,30 @@
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->meta = (GF_MetaBox *)a;
+			mov->original_meta_offset = mov->current_top_box_start;
 			e = gf_list_add(mov->TopBoxes, a);
 			if (e) {
 				return e;
 			}
 			totSize += a->size;
+			gf_isom_meta_restore_items_ref(mov, mov->meta);
 			break;
 
 		/*we only keep the MDAT in READ for dump purposes*/
 		case GF_ISOM_BOX_TYPE_MDAT:
+			if (!mov->first_data_toplevel_offset) {
+				mov->first_data_toplevel_offset = mov->current_top_box_start;
+				mov->first_data_toplevel_size = a->size;
+			}
 			totSize += a->size;
+
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+			if (mov->emsgs) {
+				gf_isom_box_array_del(mov->emsgs);
+				mov->emsgs = NULL;
+			}
+#endif
+
 			if (mov->openMode == GF_ISOM_OPEN_READ) {
 				if (!mov->mdat) {
 					mov->mdat = (GF_MediaDataBox *) a;
@@ -380,7 +525,7 @@
 			/*ONE AND ONLY ONE FTYP*/
 			if (mov->brand) {
 				gf_isom_box_del(a);
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate FTYP detected!\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate 'ftyp' detected!\n"));
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->brand = (GF_FileTypeBox *)a;
@@ -389,11 +534,39 @@
 			if (e) return e;
 			break;
 
+		case GF_ISOM_BOX_TYPE_OTYP:
+			/*ONE AND ONLY ONE FTYP*/
+			if (mov->otyp) {
+				gf_isom_box_del(a);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate 'otyp' detected!\n"));
+				return GF_ISOM_INVALID_FILE;
+			}
+
+			if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) {
+				mov->otyp = (GF_Box *)a;
+				totSize += a->size;
+				e = gf_list_add(mov->TopBoxes, a);
+				if (e) return e;
+			} else {
+				GF_FileTypeBox *brand = (GF_FileTypeBox *) gf_isom_box_find_child(a->child_boxes, GF_ISOM_BOX_TYPE_FTYP);
+				if (brand) {
+					s32 pos;
+					gf_list_del_item(a->child_boxes, brand);
+					pos = gf_list_del_item(mov->TopBoxes, mov->brand);
+					gf_isom_box_del((GF_Box *) mov->brand);
+					mov->brand = brand;
+					if (pos<0) pos=0;
+					gf_list_insert(mov->TopBoxes, brand, pos);
+				}
+				gf_isom_box_del(a);
+			}
+			break;
+
 		case GF_ISOM_BOX_TYPE_PDIN:
 			/*ONE AND ONLY ONE PDIN*/
 			if (mov->pdin) {
 				gf_isom_box_del(a);
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate PDIN detected!\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate 'pdin'' detected!\n"));
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->pdin = (GF_ProgressiveDownloadBox *) a;
@@ -421,6 +594,10 @@
 
 		case GF_ISOM_BOX_TYPE_SIDX:
 		case GF_ISOM_BOX_TYPE_SSIX:
+			if (mov->moov && !mov->first_data_toplevel_offset) {
+				mov->first_data_toplevel_offset = mov->current_top_box_start;
+				mov->first_data_toplevel_size = a->size;
+			}
 			totSize += a->size;
 			if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) {
 				e = gf_list_add(mov->TopBoxes, a);
@@ -456,8 +633,10 @@
 			break;
 
 		case GF_ISOM_BOX_TYPE_MOOF:
+			//no support for inplace rewrite for fragmented files
+			gf_isom_disable_inplace_rewrite(mov);
 			if (!mov->moov) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Movie fragment but no moov (yet) - possibly broken parsing!\n"));
+				GF_LOG(mov->moof ? GF_LOG_DEBUG : GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Movie fragment but no moov (yet) - possibly broken parsing!\n"));
 			}
 			if (mov->single_moof_mode) {
 				mov->single_moof_state++;
@@ -475,6 +654,14 @@
 			FixTrackID(mov);
 			if (! (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)) {
 				FixSDTPInTRAF(mov->moof);
+			} else {
+				u32 k;
+				for (k=0; k<gf_list_count(mov->moof->TrackList); k++) {
+					GF_TrackFragmentBox *traf = (GF_TrackFragmentBox *)gf_list_get(mov->moof->TrackList, k);
+					if (traf->sampleGroups) {
+						convert_compact_sample_groups(traf->child_boxes, traf->sampleGroups);
+					}
+				}
 			}
 
 			/*read & debug: store at root level*/
@@ -499,10 +686,12 @@
 						//we should only parse senc/psec when no saiz/saio is present, otherwise we fetch the info directly
 						if (traf->trex && traf->tfhd && traf->trex->track && traf->sample_encryption) {
 							GF_TrackBox *trak = GetTrackbyID(mov->moov, traf->tfhd->trackID);
-							trak->current_traf_stsd_idx = traf->tfhd->sample_desc_index ? traf->tfhd->sample_desc_index : traf->trex->def_sample_desc_index;
-							e = senc_Parse(mov->movieFileMap->bs, trak, traf, traf->sample_encryption);
-							if (e) return e;
-							trak->current_traf_stsd_idx = 0;
+							if (trak) {
+								trak->current_traf_stsd_idx = traf->tfhd->sample_desc_index ? traf->tfhd->sample_desc_index : traf->trex->def_sample_desc_index;
+								e = senc_Parse(mov->movieFileMap->bs, trak, traf, traf->sample_encryption);
+								if (e) return e;
+								trak->current_traf_stsd_idx = 0;
+							}
 						}
 					}
 				} else {
@@ -571,6 +760,14 @@
 			}
 #endif
 		//fallthrough
+		case GF_ISOM_BOX_TYPE_EMSG:
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+			if (! (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)) {
+				if (!mov->emsgs) mov->emsgs = gf_list_new();
+				gf_list_add(mov->emsgs, a);
+				break;
+			}
+#endif
 
 		default:
 			totSize += a->size;
@@ -594,14 +791,17 @@
 		return GF_ISOM_INCOMPLETE_FILE;
 	}
 	/*we MUST have movie header*/
-	if (mov->moov && !mov->moov->mvhd) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing MVHD in MOOV!\n"));
-		return GF_ISOM_INVALID_FILE;
-	}
-	/*we MUST have meta handler*/
-	if (mov->meta && !mov->meta->handler) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing handler in META!\n"));
-		return GF_ISOM_INVALID_FILE;
+	if (!gf_opts_get_bool("core", "no-check")) {
+		if (mov->moov && !mov->moov->mvhd) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing MVHD in MOOV!\n"));
+			return GF_ISOM_INVALID_FILE;
+		}
+
+		/*we MUST have meta handler*/
+		if (mov->meta && !mov->meta->handler) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing handler in META!\n"));
+			return GF_ISOM_INVALID_FILE;
+		}
 	}
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -633,6 +833,30 @@
 	return GF_OK;
 }
 
+extern u64 unused_bytes;
+
+GF_Err gf_isom_parse_movie_boxes(GF_ISOFile *mov, u32 *boxType, u64 *bytesMissing, Bool progressive_mode)
+{
+	GF_Err e;
+	GF_Blob *blob = NULL;
+
+	//if associated file is a blob, lock blob before parsing !
+	if (mov->movieFileMap && ((mov->movieFileMap->type == GF_ISOM_DATA_MEM) || (mov->movieFileMap->type == GF_ISOM_DATA_FILE))) {
+		blob = ((GF_FileDataMap *)mov->movieFileMap)->blob;
+	}
+
+	if (blob)
+		gf_mx_p(blob->mx);
+
+	unused_bytes = 0;
+	e = gf_isom_parse_movie_boxes_internal(mov, boxType, bytesMissing, progressive_mode);
+
+	if (blob)
+		gf_mx_v(blob->mx);
+	return e;
+
+}
+
 GF_ISOFile *gf_isom_new_movie()
 {
 	GF_ISOFile *mov = (GF_ISOFile*)gf_malloc(sizeof(GF_ISOFile));
@@ -672,9 +896,20 @@
 		mov->store_traf_map = GF_TRUE;
 #endif
 
-	if ( (OpenMode == GF_ISOM_OPEN_READ) || (OpenMode == GF_ISOM_OPEN_READ_DUMP) ) {
-		//always in read ...
-		mov->openMode = GF_ISOM_OPEN_READ;
+	if ( (OpenMode == GF_ISOM_OPEN_READ) || (OpenMode == GF_ISOM_OPEN_READ_DUMP) || (OpenMode == GF_ISOM_OPEN_READ_EDIT) ) {
+		if (OpenMode == GF_ISOM_OPEN_READ_EDIT) {
+			mov->openMode = GF_ISOM_OPEN_READ_EDIT;
+
+			// create a memory edit map in case we add samples, typically during import
+			e = gf_isom_datamap_new(NULL, tmp_dir, GF_ISOM_DATA_MAP_WRITE, & mov->editFileMap);
+			if (e) {
+				gf_isom_set_last_error(NULL, e);
+				gf_isom_delete_movie(mov);
+				return NULL;
+			}
+		} else {
+			mov->openMode = GF_ISOM_OPEN_READ;
+		}
 		mov->es_id_default_sync = -1;
 		//for open, we do it the regular way and let the GF_DataMap assign the appropriate struct
 		//this can be FILE (the only one supported...) as well as remote
@@ -690,9 +925,7 @@
 		}
 
 		if (OpenMode == GF_ISOM_OPEN_READ_DUMP) {
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 			mov->FragmentsFlags |= GF_ISOM_FRAG_READ_DEBUG;
-#endif
 		}
 	} else {
 
@@ -723,7 +956,7 @@
 			return NULL;
 		}
 		//and create a temp fileName for the edit
-		e = gf_isom_datamap_new("mp4_tmp_edit", tmp_dir, GF_ISOM_DATA_MAP_WRITE, & mov->editFileMap);
+		e = gf_isom_datamap_new("_gpac_isobmff_tmp_edit", tmp_dir, GF_ISOM_DATA_MAP_WRITE, & mov->editFileMap);
 		if (e) {
 			gf_isom_set_last_error(NULL, e);
 			gf_isom_delete_movie(mov);
@@ -927,11 +1160,11 @@
 
 	if (last_is_empty) {
 		ent = (GF_EdtsEntry *)gf_list_last(trak->editBox->editList->entryList);
-		if (ent->mediaRate==1) {
+		if (ent->mediaRate == 0x10000) {
 			*MediaTime = movieTime + ent->mediaTime;
 		} else {
 			ent = (GF_EdtsEntry *)gf_list_get(trak->editBox->editList->entryList, 0);
-			if (ent->mediaRate==-1) {
+			if (ent->mediaRate == -0x10000) {
 				u64 dur = (u64) (ent->segmentDuration * scale_ts);
 				*MediaTime = (movieTime > dur) ? (movieTime-dur) : 0;
 			}
@@ -1033,7 +1266,7 @@
 	ent = NULL;
 	i=0;
 	while ((ent = (GF_EdtsEntry *)gf_list_enum(trak->editBox->editList->entryList, &i))) {
-		if (time * trak->Media->mediaHeader->timeScale >= movieTime * trak->moov->mvhd->timeScale) {
+		if (gf_timestamp_greater_or_equal(time, trak->moov->mvhd->timeScale, movieTime, trak->Media->mediaHeader->timeScale)) {
 			/*skip empty edits*/
 			if (ent->mediaTime >= 0) {
 				*OutMovieTime = time * trak->Media->mediaHeader->timeScale / trak->moov->mvhd->timeScale;
@@ -1062,15 +1295,15 @@
 	i=0;
 	while ((ent = (GF_EdtsEntry *)gf_list_enum(trak->editBox->editList->entryList, &i))) {
 		if (ent->mediaTime == -1) {
-			if ( (time + ent->segmentDuration) * trak->Media->mediaHeader->timeScale >= movieTime * trak->moov->mvhd->timeScale) {
-				*OutMovieTime = time * trak->Media->mediaHeader->timeScale / trak->moov->mvhd->timeScale;
+			if ( gf_timestamp_greater_or_equal(time + ent->segmentDuration, trak->moov->mvhd->timeScale, movieTime, trak->Media->mediaHeader->timeScale)) {
+				*OutMovieTime = gf_timestamp_rescale(time, trak->moov->mvhd->timeScale, trak->Media->mediaHeader->timeScale);
 				return GF_OK;
 			}
 			continue;
 		}
 		/*get the first entry whose end is greater than or equal to the desired time*/
 		time += ent->segmentDuration;
-		if ( time * trak->Media->mediaHeader->timeScale >= movieTime * trak->moov->mvhd->timeScale) {
+		if (gf_timestamp_greater_or_equal(time, trak->moov->mvhd->timeScale, movieTime, trak->Media->mediaHeader->timeScale)) {
 			*OutMovieTime = time * trak->Media->mediaHeader->timeScale / trak->moov->mvhd->timeScale;
 			return GF_OK;
 		}
@@ -1108,7 +1341,7 @@
 	mvhd->timeScale = 600;
 
 	file->interleavingTime = mvhd->timeScale;
-	moov_on_child_box((GF_Box*)file->moov, (GF_Box *)mvhd);
+	moov_on_child_box((GF_Box*)file->moov, (GF_Box *)mvhd, GF_FALSE);
 	gf_list_add(file->TopBoxes, file->moov);
 	return GF_OK;
 }
@@ -1145,7 +1378,7 @@
 	} else {
 		//we are in EDIT mode but we are creating the file -> temp file
 		mov->finalName = fileName ? gf_strdup(fileName) : NULL;
-		e = gf_isom_datamap_new("mp4_tmp_edit", tmp_dir, GF_ISOM_DATA_MAP_WRITE, &mov->editFileMap);
+		e = gf_isom_datamap_new("_gpac_isobmff_tmp_edit", tmp_dir, GF_ISOM_DATA_MAP_WRITE, &mov->editFileMap);
 		if (e) {
 			gf_isom_set_last_error(NULL, e);
 			gf_isom_delete_movie(mov);
@@ -1164,7 +1397,7 @@
 	}
 	gf_list_add(mov->TopBoxes, mov->mdat);
 
-	//default behaviour is capture mode, no interleaving (eg, no rewrite of mdat)
+	//default behavior is capture mode, no interleaving (eg, no rewrite of mdat)
 	mov->storageMode = GF_ISOM_STORE_FLAT;
 	return mov;
 
@@ -1174,7 +1407,7 @@
 	return NULL;
 }
 
-GF_EdtsEntry *CreateEditEntry(u64 EditDuration, u64 MediaTime, u8 EditMode)
+GF_EdtsEntry *CreateEditEntry(u64 EditDuration, u64 MediaTime, u32 MediaRate, u8 EditMode)
 {
 	GF_EdtsEntry *ent;
 
@@ -1183,7 +1416,7 @@
 
 	switch (EditMode) {
 	case GF_ISOM_EDIT_EMPTY:
-		ent->mediaRate = 1;
+		ent->mediaRate = 0x10000;
 		ent->mediaTime = -1;
 		break;
 
@@ -1192,7 +1425,7 @@
 		ent->mediaTime = MediaTime;
 		break;
 	default:
-		ent->mediaRate = 1;
+		ent->mediaRate = MediaRate;
 		ent->mediaTime = MediaTime;
 		break;
 	}

gpac-1.0.1.tar.gz/src/isomedia/isom_read.c -> gpac-2.0.0.tar.gz/src/isomedia/isom_read.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -84,6 +84,13 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_set_inplace_padding(GF_ISOFile *file, u32 padding)
+{
+	if (!file) return GF_BAD_PARAM;
+	file->padding = padding;
+	return GF_OK;
+}
 /**************************************************************
 					Sample Manip
 **************************************************************/
@@ -119,6 +126,9 @@
 	case GF_ISOM_BOX_TYPE_SIDX:
 	case GF_ISOM_BOX_TYPE_EMSG:
 	case GF_ISOM_BOX_TYPE_PRFT:
+ //we map free as segment when it is first in the file - a regular file shall start with ftyp or a file sig, not free
+ //since our route stack may patch boxes to free for incomplete segments, we must map this to free
+ case GF_ISOM_BOX_TYPE_FREE:
 		return 3;
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 	/*Adobe specific*/
@@ -127,7 +137,6 @@
 #endif
 #endif
 	case GF_ISOM_BOX_TYPE_MDAT:
-	case GF_ISOM_BOX_TYPE_FREE:
 	case GF_ISOM_BOX_TYPE_SKIP:
 	case GF_ISOM_BOX_TYPE_UDTA:
 	case GF_ISOM_BOX_TYPE_META:
@@ -148,12 +157,15 @@
 	if (!strncmp(fileName, "gmem://", 7)) {
 		u32 size;
 		u8 *mem_address;
-		if (gf_blob_get_data(fileName, &mem_address, &size) != GF_OK) {
+		if (gf_blob_get(fileName, &mem_address, &size, NULL) != GF_OK) {
 			return 0;
 		}
-		if (!size) return 0;
-		if (size > start_range + 8)
+ if (size && (size > start_range + 8)) {
 			type = GF_4CC(mem_address[start_range + 4], mem_address[start_range + 5], mem_address[start_range + 6], mem_address[start_range + 7]);
+ }
+ gf_blob_release(fileName);
+	} else if (!strncmp(fileName, "isobmff://", 10)) {
+		return 2;
 	} else {
 		u32 nb_read;
 		unsigned char data[4];
@@ -242,13 +254,14 @@
 		else if (!strncmp(val, "w=", 2)) width = atoi(val+2);
 		else if (!strncmp(val, "h=", 2)) height = atoi(val+2);
 		else if (!strncmp(val, "scale=", 6)) timescale = atoi(val+6);
-		else if (!strncmp(val, "tfdt=", 5)) tfdt = atoi(val+5);
-
+		else if (!strncmp(val, "tfdt=", 5)) {
+			sscanf(val+5, LLX, &tfdt);
+		}
 		if (!sep) break;
 		sep[0] = ' ';
 		val = sep+1;
 	}
-	if (!stricmp(sz4cc, "H264")) {
+	if (!stricmp(sz4cc, "H264") || !stricmp(sz4cc, "AVC1")) {
 	}
 	else if (!stricmp(sz4cc, "AACL")) {
 	}
@@ -318,9 +331,10 @@
 	if (!stbl->SampleDescription) return GF_OUT_OF_MEM;
 
 	trak->dts_at_seg_start = tfdt;
+	trak->dts_at_next_frag_start = tfdt;
 
 
-	if (!stricmp(sz4cc, "H264")) {
+	if (!stricmp(sz4cc, "H264") || !stricmp(sz4cc, "AVC1")) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 		u32 pos = 0;
 		u32 end, sc_size=0;
@@ -342,13 +356,13 @@
 		gf_media_nalu_next_start_code((u8 *) CodecParams, CodecParamLen, &sc_size);
 		pos += sc_size;
 		while (pos<CodecParamLen) {
-			GF_AVCConfigSlot *slc;
+			GF_NALUFFParam *slc;
 			u8 nal_type;
 			char *nal = &CodecParams[pos];
 			end = gf_media_nalu_next_start_code(nal, CodecParamLen-pos, &sc_size);
 			if (!end) end = CodecParamLen;
 
-			GF_SAFEALLOC(slc, GF_AVCConfigSlot);
+			GF_SAFEALLOC(slc, GF_NALUFFParam);
 			if (!slc) break;
 			slc->size = end;
 			slc->data = gf_malloc(sizeof(char)*slc->size);
@@ -358,7 +372,7 @@
 			nal_type = nal[0] & 0x1F;
 			if (nal_type == GF_AVC_NALU_SEQ_PARAM) {
 /*				AVCState avcc;
-				u32 idx = gf_media_avc_read_sps(slc->data, slc->size, &avcc, 0, NULL);
+				u32 idx = gf_avc_read_sps(slc->data, slc->size, &avcc, 0, NULL);
 				avc->avc_config->config->profile_compatibility = avcc.sps[idx].prof_compat;
 				avc->avc_config->config->AVCProfileIndication = avcc.sps[idx].profile_idc;
 				avc->avc_config->config->AVCLevelIndication = avcc.sps[idx].level_idc;
@@ -443,9 +457,11 @@
 			return e;
 		}
 
-		if (end_range>start_range) {
-			gf_bs_seek(movie->movieFileMap->bs, end_range+1);
-			gf_bs_truncate(movie->movieFileMap->bs);
+		if (start_range || end_range) {
+			if (end_range>start_range) {
+				gf_bs_seek(movie->movieFileMap->bs, end_range+1);
+				gf_bs_truncate(movie->movieFileMap->bs);
+			}
 			gf_bs_seek(movie->movieFileMap->bs, start_range);
 		}
 		e = gf_isom_parse_movie_boxes(movie, outBoxType, BytesMissing, GF_TRUE);
@@ -499,6 +515,7 @@
 		movie = gf_isom_create_movie(fileName, OpenMode, tmp_dir);
 		break;
 	case GF_ISOM_OPEN_EDIT:
+	case GF_ISOM_OPEN_READ_EDIT:
 	case GF_ISOM_OPEN_KEEP_FRAGMENTS:
 		movie = gf_isom_open_file(fileName, OpenMode, tmp_dir);
 		break;
@@ -551,7 +568,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	//write our movie to the file
-	if (movie->openMode != GF_ISOM_OPEN_READ) {
+	if ((movie->openMode != GF_ISOM_OPEN_READ) && (movie->openMode != GF_ISOM_OPEN_READ_EDIT)) {
 		gf_isom_get_duration(movie);
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 		//movie fragment mode, just store the fragment
@@ -625,7 +642,7 @@
 GF_EXPORT
 void gf_isom_disable_odf_conversion(GF_ISOFile *movie, Bool disable)
 {
-	if (movie) movie->disable_odf_translate = disable;
+	if (movie) movie->disable_odf_translate = disable ? 1 : 0;
 }
 
 //this funct is used for exchange files, where the iods contains an OD
@@ -677,7 +694,17 @@
 
 	//duplicate our descriptor
 	movie->LastError = gf_odf_desc_copy((GF_Descriptor *) movie->moov->iods->descriptor, &desc);
-	if (movie->LastError) return NULL;
+	if (movie->LastError) {
+		if (od) {
+			gf_list_del(od->ESDescriptors);
+			gf_free(od);
+		}
+		if (iod) {
+			gf_list_del(iod->ESDescriptors);
+			gf_free(iod);
+		}
+		return NULL;
+	}
 
 	if (!useIOD) {
 		isom_od = (GF_IsomObjectDescriptor *)desc;
@@ -886,13 +913,46 @@
 #endif
 	return 0;
 }
+
+GF_EXPORT
+u64 gf_isom_segment_get_fragment_size(GF_ISOFile *file, u32 moof_index, u32 *moof_size)
+{
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (!file) return 0;
+	u32 moof_sn=0;
+	Bool moof_after_mdat = GF_FALSE;
+	u64 size=0;
+	u32 i, count = gf_list_count(file->TopBoxes);
+	if (moof_size) *moof_size = 0;
+	for (i=0; i<count; i++) {
+		GF_Box *b = gf_list_get(file->TopBoxes, i);
+		size += b->size;
+		if (b->type == GF_ISOM_BOX_TYPE_MOOF) {
+			if (!moof_after_mdat && (moof_sn == moof_index))
+				return size - b->size;
+
+			if (moof_size) *moof_size = (u32) b->size;
+			moof_sn++;
+			if (moof_after_mdat && (moof_sn == moof_index))
+				return size;
+			if (moof_after_mdat) size=0;
+			if ((moof_sn>1) && !moof_after_mdat) size = b->size;
+		}
+		if (b->type == GF_ISOM_BOX_TYPE_MDAT) {
+			if (!moof_sn) moof_after_mdat = GF_TRUE;
+		}
+	}
+	return size;
+#endif
+	return 0;
+}
 #endif
 
 //return the timescale of the movie, 0 if error
 GF_EXPORT
 u32 gf_isom_get_timescale(GF_ISOFile *movie)
 {
-	if (!movie || !movie->moov) return 0;
+	if (!movie || !movie->moov || !movie->moov->mvhd) return 0;
 	return movie->moov->mvhd->timeScale;
 }
 
@@ -901,7 +961,7 @@
 GF_EXPORT
 u64 gf_isom_get_duration(GF_ISOFile *movie)
 {
-	if (!movie || !movie->moov) return 0;
+	if (!movie || !movie->moov || !movie->moov->mvhd) return 0;
 
 	//if file was open in Write or Edit mode, recompute the duration
 	//the duration of a movie is the MaxDuration of all the tracks...
@@ -916,7 +976,7 @@
 GF_EXPORT
 u64 gf_isom_get_original_duration(GF_ISOFile *movie)
 {
-	if (!movie || !movie->moov) return 0;
+	if (!movie || !movie->moov|| !movie->moov->mvhd) return 0;
 	return movie->moov->mvhd->original_duration;
 }
 
@@ -931,6 +991,18 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_get_track_creation_time(GF_ISOFile *movie, u32 trackNumber, u64 *creationTime, u64 *modificationTime)
+{
+	GF_TrackBox *trak;
+	if (!movie || !movie->moov) return GF_BAD_PARAM;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return 0;
+
+	if (creationTime) *creationTime = trak->Media->mediaHeader->creationTime;
+	if (creationTime) *modificationTime = trak->Media->mediaHeader->modificationTime;
+	return GF_OK;
+}
 
 //check the presence of a track in IOD. 0: NO, 1: YES, 2: ERROR
 GF_EXPORT
@@ -1074,7 +1146,7 @@
 		GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
 		if (!trak->udta) {
-			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 			if (e) return e;
 		}
 		udta = trak->udta;
@@ -1117,6 +1189,24 @@
 }
 
 
+//Return the number of track references of a track for a given ReferenceType
+//return 0 if error
+GF_EXPORT
+const GF_ISOTrackID *gf_isom_enum_track_references(GF_ISOFile *movie, u32 trackNumber, u32 idx, u32 *referenceType, u32 *referenceCount)
+{
+	GF_TrackBox *trak;
+	GF_TrackReferenceTypeBox *dpnd;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return NULL;
+	if (!trak->References) return NULL;
+	dpnd = gf_list_get(trak->References->child_boxes, idx);
+	if (!dpnd) return NULL;
+	*referenceType = dpnd->reference_type;
+	*referenceCount = dpnd->trackIDCount;
+	return dpnd->trackIDs;
+}
+
+
 //Return the referenced track number for a track and a given ReferenceType and Index
 //return -1 if error, 0 if the reference is a NULL one, or the trackNumber
 GF_EXPORT
@@ -1161,7 +1251,7 @@
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 
 	*refTrackID = 0;
-	if (!trak || !trak->References) return GF_BAD_PARAM;
+	if (!trak || !trak->References || !referenceIndex) return GF_BAD_PARAM;
 
 	dpnd = NULL;
 	e = Track_FindRef(trak, referenceType, &dpnd);
@@ -1652,7 +1742,10 @@
 GF_EXPORT
 Bool gf_isom_enable_raw_pack(GF_ISOFile *the_file, u32 trackNumber, u32 pack_num_samples)
 {
+	u32 afmt, bps, nb_ch;
+	Bool from_qt=GF_FALSE;
 	GF_TrackBox *trak;
+	GF_MPEGAudioSampleEntryBox *entry;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_FALSE;
 	trak->pack_num_samples = 0;
@@ -1667,7 +1760,51 @@
 	//and sample with constant size
 	if (!trak->Media->information->sampleTable->SampleSize || !trak->Media->information->sampleTable->SampleSize->sampleSize) return GF_FALSE;
 	trak->pack_num_samples = pack_num_samples;
-	return pack_num_samples ? GF_TRUE : GF_FALSE;
+
+	if (!pack_num_samples) return GF_FALSE;
+
+	entry = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, 0);
+	if (!entry) return GF_FALSE;
+
+	if (entry->internal_type!=GF_ISOM_SAMPLE_ENTRY_AUDIO) return GF_FALSE;
+
+	//sanity check, some files have wrong stsz sampleSize for raw audio !
+	afmt = gf_audio_fmt_from_isobmf(entry->type);
+	bps = gf_audio_fmt_bit_depth(afmt) / 8;
+	if (!bps) {
+		//unknown format, try QTv2
+		if (entry->qtff_mode && (entry->internal_type==GF_ISOM_SAMPLE_ENTRY_AUDIO)) {
+			bps = entry->extensions[8]<<24 | entry->extensions[9]<<16 | entry->extensions[10]<<8 | entry->extensions[11];
+			from_qt = GF_TRUE;
+		}
+	}
+	nb_ch = entry->channel_count;
+	if (entry->qtff_mode && (entry->version==2)) {
+		//QTFFv2 audio, channel count is 32 bit, after 32bit size of struct and 64 bit samplerate
+		//hence start at 12 in extensions
+		nb_ch = entry->extensions[11]<<24 | entry->extensions[12]<<16 | entry->extensions[13]<<8 | entry->extensions[14];
+	}
+
+	if (bps) {
+		u32 res = trak->Media->information->sampleTable->SampleSize->sampleSize % bps;
+		if (res) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("ISOBMF: size mismatch for raw audio sample description: constant sample size %d but %d bytes per channel for %s%s!\n", trak->Media->information->sampleTable->SampleSize->sampleSize,
+					bps,
+					gf_4cc_to_str(entry->type),
+					from_qt ? " (as indicated in QT sample description)" : ""
+				));
+			trak->Media->information->sampleTable->SampleSize->sampleSize = bps * nb_ch;
+		}
+	}
+	return GF_TRUE;
+}
+
+Bool gf_isom_has_time_offset_table(GF_ISOFile *the_file, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media->information->sampleTable->CompositionOffset) return GF_FALSE;
+	return GF_TRUE;
 }
 
 GF_EXPORT
@@ -1726,6 +1863,13 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 	if (!trak->Media->information->sampleTable->SampleDep) return GF_BAD_PARAM;
+
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (sampleNumber <= trak->sample_count_at_seg_start)
+		return GF_BAD_PARAM;
+	sampleNumber -= trak->sample_count_at_seg_start;
+#endif
+
 	return stbl_GetSampleDepType(trak->Media->information->sampleTable->SampleDep, sampleNumber, isLeading, dependsOn, dependedOn, redundant);
 }
 
@@ -1849,7 +1993,7 @@
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->CompositionOffset) return 0;
 
-	return trak->Media->information->sampleTable->CompositionOffset->max_ts_delta;
+	return trak->Media->information->sampleTable->CompositionOffset->max_cts_delta;
 }
 
 
@@ -2152,7 +2296,7 @@
 	//only check duration if initially set - do not check duration as updated after fragment merge since that duration does not take
 	//into account tfdt
 	if (trak->Header->initial_duration
-		&& (movieTime * trak->moov->mvhd->timeScale > trak->Header->initial_duration * trak->Media->mediaHeader->timeScale)
+		&& gf_timestamp_greater(movieTime, trak->Media->mediaHeader->timeScale, trak->Header->initial_duration, trak->moov->mvhd->timeScale)
 	) {
 		if (sampleNumber) *sampleNumber = 0;
 		*StreamDescriptionIndex = 0;
@@ -2217,8 +2361,13 @@
 				return e;
 #endif
 
-			if (nextMediaTime && (nextMediaTime-1 != movieTime))
-				return gf_isom_get_sample_for_movie_time(the_file, trackNumber, nextMediaTime-1, StreamDescriptionIndex, SearchMode, sample, sampleNumber, data_offset);
+			if ((SearchMode==GF_ISOM_SEARCH_SYNC_BACKWARD) || (SearchMode==GF_ISOM_SEARCH_BACKWARD)) {
+				if (nextMediaTime && (nextMediaTime-1 < movieTime))
+					return gf_isom_get_sample_for_movie_time(the_file, trackNumber, nextMediaTime-1, StreamDescriptionIndex, SearchMode, sample, sampleNumber, data_offset);
+			} else {
+				if (nextMediaTime && (nextMediaTime-1 > movieTime))
+					return gf_isom_get_sample_for_movie_time(the_file, trackNumber, nextMediaTime-1, StreamDescriptionIndex, SearchMode, sample, sampleNumber, data_offset);
+			}
 		}
 		return e;
 	}
@@ -2284,16 +2433,26 @@
 	ent = (GF_EdtsEntry*)gf_list_get(trak->editBox->editList->entryList, 0);
 	if (!ent) return GF_TRUE;
 	/*mediaRate>0, the track playback shall start at media time>0 -> mediaOffset is < 0 */
-	if ((count==1) && (ent->mediaRate==1)) {
+	if ((count==1) && (ent->mediaRate == 0x10000) && (ent->mediaTime>=0)) {
 		*mediaOffset = - ent->mediaTime;
 		return GF_FALSE;
 	} else if (count==2) {
-		/*mediaRate==-1, the track playback shall be empty for segmentDuration -> mediaOffset is > 0 */
-		if ((ent->mediaRate==-1) || (ent->mediaTime==-1)) {
+		/*mediaTime==-1, the track playback shall be empty for segmentDuration -> mediaOffset is > 0 */
+		if ((ent->mediaRate == -0x10000) || (ent->mediaTime==-1)) {
 			Double time = (Double) ent->segmentDuration;
 			time /= trak->moov->mvhd->timeScale;
 			time *= trak->Media->mediaHeader->timeScale;
 			*mediaOffset = (s64) time;
+
+			//check next entry, if we start from mediaOffset > 0 this may still result in a skip
+			ent = (GF_EdtsEntry*)gf_list_get(trak->editBox->editList->entryList, 1);
+			//next entry playback rate is not nominal, we need edit list handling
+			if (ent->mediaRate != 0x10000)
+				return GF_TRUE;
+
+			if (ent->mediaTime > 0) {
+				*mediaOffset -= ent->mediaTime;
+			}
 			return GF_FALSE;
 		}
 	}
@@ -2567,7 +2726,7 @@
 			memcpy(*userData, ptr->data, sizeof(char)*ptr->dataSize);
 			*userDataSize = ptr->dataSize;
 			return GF_OK;
-		} else if (ptr->type != GF_ISOM_BOX_TYPE_UUID) {
+		} else if (ptr->type == GF_ISOM_BOX_TYPE_UUID) {
 			GF_UnknownUUIDBox *p_uuid = (GF_UnknownUUIDBox *)ptr;
 			*userData = (char *)gf_malloc(sizeof(char)*p_uuid->dataSize);
 			if (!*userData) return GF_OUT_OF_MEM;
@@ -2575,7 +2734,25 @@
 			*userDataSize = p_uuid->dataSize;
 			return GF_OK;
 		} else {
-			return GF_ISOM_INVALID_FILE;
+			char *str = NULL;
+			switch (ptr->type) {
+			case GF_ISOM_BOX_TYPE_NAME:
+			//case GF_QT_BOX_TYPE_NAME: same as above
+				str = ((GF_NameBox *)ptr)->string;
+				break;
+			case GF_ISOM_BOX_TYPE_KIND:
+				str = ((GF_KindBox *)ptr)->value;
+				break;
+			}
+			if (str) {
+				u32 len = (u32) strlen(str) + 1;
+				*userData = (char *)gf_malloc(sizeof(char) * len);
+				if (!*userData) return GF_OUT_OF_MEM;
+				memcpy(*userData, str, sizeof(char)*len);
+				*userDataSize = len;
+				return GF_OK;
+			}
+			return GF_NOT_SUPPORTED;
 		}
 	}
 
@@ -2855,6 +3032,7 @@
 
 	if (!movie->moov->mvex)
 		return GF_OK;
+
 	//ok parse root boxes
 	return gf_isom_parse_movie_boxes(movie, NULL, MissingBytes, GF_TRUE);
 #endif
@@ -2960,27 +3138,123 @@
 #endif
 }
 
+//reset SampleTable boxes, but do not destroy them if memory reuse is possible
+//this reduces free/alloc time when many fragments
+static void gf_isom_recreate_tables(GF_TrackBox *trak)
+{
+	u32 j;
+	GF_Box *a;
+	GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
+
+	if (stbl->ChunkOffset) {
+		if (stbl->ChunkOffset->type==GF_ISOM_BOX_TYPE_CO64) {
+			GF_ChunkLargeOffsetBox *co64 = (GF_ChunkLargeOffsetBox *)stbl->ChunkOffset;
+			co64->nb_entries = 0;
+		} else {
+			GF_ChunkOffsetBox *stco = (GF_ChunkOffsetBox *)stbl->ChunkOffset;
+			stco->nb_entries = 0;
+		}
+	}
+
+	if (stbl->CompositionOffset) {
+		stbl->CompositionOffset->nb_entries = 0;
+		stbl->CompositionOffset->w_LastSampleNumber = 0;
+		stbl->CompositionOffset->r_currentEntryIndex = 0;
+		stbl->CompositionOffset->r_FirstSampleInEntry = 0;
+		stbl->CompositionOffset->max_cts_delta = 0;
+	}
+
+	if (stbl->DegradationPriority) {
+		stbl->DegradationPriority->nb_entries = 0;
+	}
+
+	if (stbl->PaddingBits) {
+		stbl->PaddingBits->SampleCount = 0;
+	}
+
+	if (stbl->SampleDep) {
+		stbl->SampleDep->sampleCount = 0;
+	}
+
+	if (stbl->SampleSize) {
+		stbl->SampleSize->sampleSize = 0;
+		stbl->SampleSize->sampleCount = 0;
+	}
+
+	if (stbl->SampleToChunk) {
+		stbl->SampleToChunk->nb_entries = 0;
+		stbl->SampleToChunk->currentIndex = 0;
+		stbl->SampleToChunk->firstSampleInCurrentChunk = 0;
+		stbl->SampleToChunk->currentChunk = 0;
+		stbl->SampleToChunk->ghostNumber = 0;
+		stbl->SampleToChunk->w_lastSampleNumber = 0;
+		stbl->SampleToChunk->w_lastChunkNumber = 0;
+	}
+
+	if (stbl->ShadowSync) {
+ gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *) stbl->ShadowSync);
+ stbl->ShadowSync = (GF_ShadowSyncBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSH);
+	}
+
+	if (stbl->SyncSample) {
+		stbl->SyncSample->nb_entries = 0;
+		stbl->SyncSample->r_LastSyncSample = 0;
+		stbl->SyncSample->r_LastSampleIndex = 0;
+	}
+
+	if (stbl->TimeToSample) {
+		stbl->TimeToSample->nb_entries = 0;
+		stbl->TimeToSample->r_FirstSampleInEntry = 0;
+		stbl->TimeToSample->r_currentEntryIndex = 0;
+		stbl->TimeToSample->r_CurrentDTS = 0;
+	}
 
-#define RECREATE_BOX(_a, __cast)	\
- if (_a) {	\
- type = _a->type;\
- gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *)_a);\
- _a = __cast gf_isom_box_new_parent(&stbl->child_boxes, type);\
- }\
+	gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_offsets);
+	stbl->sai_offsets = NULL;
+
+	gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_sizes);
+	stbl->sai_sizes = NULL;
+
+	gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sampleGroups);
+	stbl->sampleGroups = NULL;
+
+	if (trak->sample_encryption) {
+		if (trak->Media->information->sampleTable->child_boxes) {
+			gf_list_del_item(trak->Media->information->sampleTable->child_boxes, trak->sample_encryption);
+		}
+		gf_isom_box_del_parent(&trak->child_boxes, (GF_Box*)trak->sample_encryption);
+		trak->sample_encryption = NULL;
+	}
+
+	j = stbl->nb_sgpd_in_stbl;
+	while ((a = (GF_Box *)gf_list_enum(stbl->sampleGroupsDescription, &j))) {
+		gf_isom_box_del_parent(&stbl->child_boxes, a);
+		j--;
+		gf_list_rem(stbl->sampleGroupsDescription, j);
+	}
+
+	if (stbl->traf_map) {
+		for (j=0; j<stbl->traf_map->nb_entries; j++) {
+			if (stbl->traf_map->frag_starts[j].moof_template)
+				gf_free(stbl->traf_map->frag_starts[j].moof_template);
+		}
+		memset(stbl->traf_map->frag_starts, 0, sizeof(GF_TrafMapEntry)*stbl->traf_map->nb_alloc);
+		stbl->traf_map->nb_entries = 0;
+	}
+}
 
 
 GF_EXPORT
 GF_Err gf_isom_reset_tables(GF_ISOFile *movie, Bool reset_sample_count)
 {
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	u32 i, j;
+	u32 i;
 
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
-		GF_Box *a;
 		GF_TrackBox *trak = (GF_TrackBox *)gf_list_get(movie->moov->trackList, i);
 
-		u32 type, dur;
+		u32 dur;
 		u64 dts;
 		GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
 
@@ -2993,32 +3267,8 @@
 			}
 		}
 
-		RECREATE_BOX(stbl->ChunkOffset, (GF_Box *));
-		RECREATE_BOX(stbl->CompositionOffset, (GF_CompositionOffsetBox *));
-		RECREATE_BOX(stbl->DegradationPriority, (GF_DegradationPriorityBox *));
-		RECREATE_BOX(stbl->PaddingBits, (GF_PaddingBitsBox *));
-		RECREATE_BOX(stbl->SampleDep, (GF_SampleDependencyTypeBox *));
-		RECREATE_BOX(stbl->SampleSize, (GF_SampleSizeBox *));
-		RECREATE_BOX(stbl->SampleToChunk, (GF_SampleToChunkBox *));
-		RECREATE_BOX(stbl->ShadowSync, (GF_ShadowSyncBox *));
-		RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
-		RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
-
-		gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_offsets);
-		stbl->sai_offsets = NULL;
-
-		gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_sizes);
-		stbl->sai_sizes = NULL;
-
-		gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sampleGroups);
-		stbl->sampleGroups = NULL;
-
-		j = stbl->nb_sgpd_in_stbl;
-		while ((a = (GF_Box *)gf_list_enum(stbl->sampleGroupsDescription, &j))) {
-			gf_isom_box_del_parent(&stbl->child_boxes, a);
-			j--;
-			gf_list_rem(stbl->sampleGroupsDescription, j);
-		}
+		//recreate all boxes
+		gf_isom_recreate_tables(trak);
 
 #if 0
 		j = stbl->nb_stbl_boxes;
@@ -3075,13 +3325,13 @@
 
 
 		if (reset_tables) {
-			u32 type, dur;
+			u32 dur;
 			u64 dts;
 			GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
 
 			if (has_scalable) {
 				//check if the base reference is in the file - if not, do not consider the track is scalable.
-				if (gf_isom_get_reference_count(movie, i+1, GF_ISOM_REF_BASE) > 0) {
+				if (trak->nb_base_refs) {
 					u32 on_track=0;
 					GF_TrackBox *base;
 					gf_isom_get_reference(movie, i+1, GF_ISOM_REF_BASE, 1, &on_track);
@@ -3105,49 +3355,8 @@
 				}
 			}
 
-			RECREATE_BOX(stbl->ChunkOffset, (GF_Box *));
-			RECREATE_BOX(stbl->CompositionOffset, (GF_CompositionOffsetBox *));
-			RECREATE_BOX(stbl->DegradationPriority, (GF_DegradationPriorityBox *));
-			RECREATE_BOX(stbl->PaddingBits, (GF_PaddingBitsBox *));
-			RECREATE_BOX(stbl->SampleDep, (GF_SampleDependencyTypeBox *));
-			RECREATE_BOX(stbl->SampleSize, (GF_SampleSizeBox *));
-			RECREATE_BOX(stbl->SampleToChunk, (GF_SampleToChunkBox *));
-			RECREATE_BOX(stbl->ShadowSync, (GF_ShadowSyncBox *));
-			RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
-			RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
-
-			gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_offsets);
-			stbl->sai_offsets = NULL;
-
-			gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_sizes);
-			stbl->sai_sizes = NULL;
-
-			gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sampleGroups);
-			stbl->sampleGroups = NULL;
-
-			if (trak->sample_encryption) {
-				if (trak->Media->information->sampleTable->child_boxes) {
-					gf_list_del_item(trak->Media->information->sampleTable->child_boxes, trak->sample_encryption);
-				}
-				gf_isom_box_del_parent(&trak->child_boxes, (GF_Box*)trak->sample_encryption);
-				trak->sample_encryption = NULL;
-			}
+			gf_isom_recreate_tables(trak);
 
-			j = stbl->nb_sgpd_in_stbl;
-			while ((a = (GF_Box *)gf_list_enum(stbl->sampleGroupsDescription, &j))) {
-				gf_isom_box_del_parent(&stbl->child_boxes, a);
-				j--;
-				gf_list_rem(stbl->sampleGroupsDescription, j);
-			}
-
-			if (stbl->traf_map) {
-				for (j=0; j<stbl->traf_map->nb_entries; j++) {
-					if (stbl->traf_map->frag_starts[j].moof_template)
-						gf_free(stbl->traf_map->frag_starts[j].moof_template);
-				}
-				memset(stbl->traf_map->frag_starts, 0, sizeof(GF_TrafMapEntry)*stbl->traf_map->nb_alloc);
-				stbl->traf_map->nb_entries = 0;
-			}
 
 #if 0 // TO CHECK
 			j = ptr->nb_stbl_boxes;
@@ -3159,17 +3368,24 @@
 		}
 
 
-		j = 0;
-		while ((a = (GF_Box *)gf_list_enum(movie->moov->child_boxes, &j))) {
-			if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
-				gf_isom_box_del_parent(&movie->moov->child_boxes, a);
-				j--;
+		if (movie->has_pssh_moof) {
+			j = 0;
+			while ((a = (GF_Box *)gf_list_enum(movie->moov->child_boxes, &j))) {
+				if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
+					GF_ProtectionSystemHeaderBox *pssh = (GF_ProtectionSystemHeaderBox *)a;
+					if (pssh->moof_defined) {
+						gf_isom_box_del_parent(&movie->moov->child_boxes, a);
+						j--;
+					}
+				}
 			}
+			movie->has_pssh_moof = GF_FALSE;
 		}
 	}
 
 	gf_isom_datamap_del(movie->movieFileMap);
 	movie->movieFileMap = NULL;
+
 #endif
 	return GF_OK;
 }
@@ -3209,9 +3425,11 @@
 	movie->moov->compressed_diff = 0;
 	movie->current_top_box_start = 0;
 
-	if (end_range > start_range) {
-		gf_bs_seek(movie->movieFileMap->bs, end_range+1);
-		gf_bs_truncate(movie->movieFileMap->bs);
+	if (start_range || end_range) {
+		if (end_range > start_range) {
+			gf_bs_seek(movie->movieFileMap->bs, end_range+1);
+			gf_bs_truncate(movie->movieFileMap->bs);
+		}
 		gf_bs_seek(movie->movieFileMap->bs, start_range);
 		movie->current_top_box_start = start_range;
 	}
@@ -3476,7 +3694,7 @@
 GF_Err gf_isom_get_audio_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 *SampleRate, u32 *Channels, u32 *bitsPerSample)
 {
 	GF_TrackBox *trak;
-	GF_SampleEntryBox *entry;
+	GF_AudioSampleEntryBox *entry;
 	GF_SampleDescriptionBox *stsd = NULL;
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
@@ -3487,15 +3705,23 @@
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
 	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) return movie->LastError = GF_BAD_PARAM;
 
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_AudioSampleEntryBox *)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
 	//no support for generic sample entries (eg, no MPEG4 descriptor)
 	if (entry == NULL) return GF_BAD_PARAM;
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_AUDIO) return GF_BAD_PARAM;
 
-	if (SampleRate) (*SampleRate) = ((GF_AudioSampleEntryBox*)entry)->samplerate_hi;
-	if (Channels) (*Channels) = ((GF_AudioSampleEntryBox*)entry)->channel_count;
-	if (bitsPerSample) (*bitsPerSample) = (u8) ((GF_AudioSampleEntryBox*)entry)->bitspersample;
+	if (SampleRate) {
+		(*SampleRate) = entry->samplerate_hi;
+		if (entry->type==GF_ISOM_BOX_TYPE_MLPA) {
+			u32 sr = entry->samplerate_hi;
+			sr <<= 16;
+			sr |= entry->samplerate_lo;
+			(*SampleRate) = sr;
+		}
+	}
+	if (Channels) (*Channels) = entry->channel_count;
+	if (bitsPerSample) (*bitsPerSample) = (u8) entry->bitspersample;
 
 	return GF_OK;
 }
@@ -3672,6 +3898,51 @@
 	return size;
 }
 
+GF_EXPORT
+u64 gf_isom_get_first_mdat_start(GF_ISOFile *movie)
+{
+	u64 offset;
+	if (!movie) return 0;
+	offset = movie->first_data_toplevel_offset + 8;
+	if (movie->first_data_toplevel_size > 0xFFFFFFFFUL)
+		offset += 8;
+	return offset;
+}
+
+static u64 box_unused_bytes(GF_Box *b)
+{
+	u32 i, count;
+	u64 size = 0;
+	switch (b->type) {
+	case GF_QT_BOX_TYPE_WIDE:
+	case GF_ISOM_BOX_TYPE_FREE:
+	case GF_ISOM_BOX_TYPE_SKIP:
+		size += b->size;
+		break;
+	}
+	count = gf_list_count(b->child_boxes);
+	for (i=0; i<count; i++) {
+		GF_Box *child = gf_list_get(b->child_boxes, i);
+		size += box_unused_bytes(child);
+	}
+	return size;
+}
+
+extern u64 unused_bytes;
+
+GF_EXPORT
+u64 gf_isom_get_unused_box_bytes(GF_ISOFile *movie)
+{
+	u64 size = unused_bytes;
+	u32 i, count;
+	if (!movie) return 0;
+	count = gf_list_count(movie->TopBoxes);
+	for (i=0; i<count; i++) {
+		GF_Box *b = gf_list_get(movie->TopBoxes, i);
+		size += box_unused_bytes(b);
+	}
+	return size;
+}
 
 GF_EXPORT
 void gf_isom_set_default_sync_track(GF_ISOFile *movie, u32 trackNumber)
@@ -3802,6 +4073,7 @@
 			case GF_ISOM_SUBTYPE_MPEG4_CRYP:
 			{
 				GF_DecoderConfig *dcd = gf_isom_get_decoder_config(file, i+1, 1);
+				if (!dcd) break;
 				switch (dcd->streamType) {
 				case GF_STREAM_VISUAL:
 					if (dcd->objectTypeIndication==GF_CODECID_MPEG4_PART2) nb_m4v++;
@@ -3818,6 +4090,7 @@
 						break;
 					case GF_CODECID_MPEG2_PART3:
 					case GF_CODECID_MPEG_AUDIO:
+					case GF_CODECID_MPEG_AUDIO_L1:
 						nb_mp3++;
 						break;
 					case GF_CODECID_EVRC:
@@ -3891,7 +4164,7 @@
 	return GF_ISOM_BRAND_3GG6;
 }
 
-GF_ItemListBox *gf_ismo_locate_box(GF_List *list, u32 boxType, bin128 UUID)
+GF_ItemListBox *gf_isom_locate_box(GF_List *list, u32 boxType, bin128 UUID)
 {
 	u32 i;
 	GF_Box *box;
@@ -3920,19 +4193,19 @@
 	*data = NULL;
 	*data_len = 0;
 
-	meta = gf_isom_apple_get_meta_extensions(mov);
+	meta = (GF_MetaBox *) gf_isom_get_meta_extensions(mov, GF_FALSE);
 	if (!meta) return GF_URL_ERROR;
 
-	ilst = gf_ismo_locate_box(meta->child_boxes, GF_ISOM_BOX_TYPE_ILST, NULL);
+	ilst = gf_isom_locate_box(meta->child_boxes, GF_ISOM_BOX_TYPE_ILST, NULL);
 	if (!ilst) return GF_URL_ERROR;
 
-	if (tag==GF_ISOM_ITUNE_PROBE) return GF_OK;
+	if (tag==GF_ISOM_ITUNE_PROBE) return gf_list_count(ilst->child_boxes) ? GF_OK : GF_URL_ERROR;
 
 	i=0;
 	while ( (info=(GF_ListItemBox*)gf_list_enum(ilst->child_boxes, &i))) {
 		if (info->type==tag) break;
 		/*special cases*/
-		if ((tag==GF_ISOM_ITUNE_GENRE) && (info->type==(u32) GF_ISOM_BOX_TYPE_0xA9GEN)) break;
+		if ((tag==GF_ISOM_ITUNE_GENRE) && (info->type==(u32) GF_ISOM_ITUNE_GENRE_USER)) break;
 		info = NULL;
 	}
 	if (!info || !info->data || !info->data->data) return GF_URL_ERROR;
@@ -3952,7 +4225,163 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_apple_enum_tag(GF_ISOFile *mov, u32 idx, GF_ISOiTunesTag *out_tag, const u8 **data, u32 *data_len, u64 *out_int_val, u32 *out_int_val2, u32 *out_flags)
+{
+	u32 i, child_index;
+	GF_ListItemBox *info;
+	GF_ItemListBox *ilst;
+	GF_MetaBox *meta;
+	GF_DataBox *dbox = NULL;
+	u32 itype, tag_val;
+	s32 tag_idx;
+	*data = NULL;
+	*data_len = 0;
+
+	meta = (GF_MetaBox *) gf_isom_get_meta_extensions(mov, GF_FALSE);
+	if (!meta) return GF_URL_ERROR;
+
+	ilst = gf_isom_locate_box(meta->child_boxes, GF_ISOM_BOX_TYPE_ILST, NULL);
+	if (!ilst) return GF_URL_ERROR;
+
+	child_index = i = 0;
+	while ( (info=(GF_ListItemBox*)gf_list_enum(ilst->child_boxes, &i))) {
+		GF_DataBox *data_box = NULL;
+		if (gf_itags_find_by_itag(info->type)<0) {
+			if (info->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
+				data_box = (GF_DataBox *) gf_isom_box_find_child(info->child_boxes, GF_ISOM_BOX_TYPE_DATA);
+				if (!data_box) continue;
+				tag_val = ((GF_UnknownBox *)info)->original_4cc;
+			}
+		} else {
+			data_box = info->data;
+			tag_val = info->type;
+		}
+		if (child_index==idx) {
+			dbox = data_box;
+			break;
+		}
+		child_index++;
+	}
+	if (!dbox) return GF_URL_ERROR;
+
+	*out_flags = dbox->flags;
+	*out_tag = tag_val;
+	if (!dbox->data) {
+		*data = NULL;
+		*data_len = 1;
+		return GF_OK;
+	}
+
+	tag_idx = gf_itags_find_by_itag(info->type);
+	if (tag_idx<0) {
+		*data = dbox->data;
+		*data_len = dbox->dataSize;
+		return GF_OK;
+	}
+
+	if ((tag_val == GF_ISOM_ITUNE_GENRE) && (dbox->flags == 0) && (dbox->dataSize>=2)) {
+		u32 int_val = dbox->data[0];
+		int_val <<= 8;
+		int_val |= dbox->data[1];
+		*data = NULL;
+		*data_len = 0;
+		*out_int_val = int_val;
+		return GF_OK;
+	}
+
+	itype = gf_itags_get_type((u32) tag_idx);
+	switch (itype) {
+	case GF_ITAG_BOOL:
+	case GF_ITAG_INT8:
+		if (dbox->dataSize) *out_int_val = dbox->data[0];
+		break;
+	case GF_ITAG_INT16:
+		if (dbox->dataSize>1) {
+			u16 v = dbox->data[0];
+			v<<=8;
+			v |= dbox->data[1];
+			*out_int_val = v;
+		}
+		break;
+	case GF_ITAG_INT32:
+		if (dbox->dataSize>3) {
+			u32 v = dbox->data[0];
+			v<<=8;
+			v |= dbox->data[1];
+			v<<=8;
+			v |= dbox->data[2];
+			v<<=8;
+			v |= dbox->data[3];
+			*out_int_val = v;
+		}
+		break;
+	case GF_ITAG_INT64:
+		if (dbox->dataSize>7) {
+			u64 v = dbox->data[0];
+			v<<=8;
+			v |= dbox->data[1];
+			v<<=8;
+			v |= dbox->data[2];
+			v<<=8;
+			v |= dbox->data[3];
+			v<<=8;
+			v |= dbox->data[4];
+			v<<=8;
+			v |= dbox->data[5];
+			v<<=8;
+			v |= dbox->data[6];
+			v<<=8;
+			v |= dbox->data[7];
+			*out_int_val = v;
+		}
+		break;
+	case GF_ITAG_FRAC6:
+	case GF_ITAG_FRAC8:
+		if (dbox->dataSize>5) {
+			u32 v = dbox->data[2];
+			v<<=8;
+			v |= dbox->data[3];
+			*out_int_val = v;
+			v = dbox->data[4];
+			v<<=8;
+			v |= dbox->data[5];
+			*out_int_val2 = v;
+		}
+		break;
+	default:
+		*data = dbox->data;
+		*data_len = dbox->dataSize;
+		break;
+	}
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_isom_wma_enum_tag(GF_ISOFile *mov, u32 idx, char **out_tag, const u8 **data, u32 *data_len, u32 *version, u32 *data_type)
+{
+	GF_XtraBox *xtra;
+	GF_XtraTag *tag;
+
+	*out_tag = NULL;
+	*data = NULL;
+	*data_len = 0;
+	*version = 0;
+	*data_type = 0;
+
+	xtra = (GF_XtraBox *) gf_isom_get_meta_extensions(mov, GF_TRUE);
+	if (!xtra) return GF_URL_ERROR;
 
+	tag = gf_list_get(xtra->tags, idx);
+	if (!tag) return GF_NOT_FOUND;
+	*out_tag = tag->name;
+	*data_len = tag->prop_size;
+	*data = tag->prop_value;
+	*version = tag->flags;
+	*data_type = tag->prop_type;
+	return GF_OK;
+}
 
 
 GF_EXPORT
@@ -3963,9 +4392,9 @@
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Header) return GF_BAD_PARAM;
-	*alternateGroupID = trak->Header->alternate_group;
-	*nb_groups = 0;
-	if (!trak->udta) return GF_OK;
+	if (alternateGroupID) *alternateGroupID = trak->Header->alternate_group;
+	if (nb_groups) *nb_groups = 0;
+	if (!trak->udta || !nb_groups) return GF_OK;
 
 	map = udta_getEntry(trak->udta, GF_ISOM_BOX_TYPE_TSEL, NULL);
 	if (!map) return GF_OK;
@@ -3986,6 +4415,8 @@
 	map = udta_getEntry(trak->udta, GF_ISOM_BOX_TYPE_TSEL, NULL);
 	if (!map) return NULL;
 	tsel = (GF_TrackSelectionBox*)gf_list_get(map->boxes, group_index-1);
+	if (!tsel) return NULL;
+	
 	*switchGroupID = tsel->switchGroup;
 	*criteriaListSize = tsel->attributeListCount;
 	return (const u32 *) tsel->attributeList;
@@ -4055,6 +4486,7 @@
 	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, track);
 	if (!trak) return GF_BAD_PARAM;
 	if (!trak->Media->information->sampleTable->sub_samples) return 0;
+	if (!sampleNumber) return 1;
 	return gf_isom_sample_get_subsample_entry(movie, track, sampleNumber, flags, NULL);
 }
 
@@ -4126,7 +4558,8 @@
 #ifdef GPAC_DISABLE_ISOM_FRAGMENTS
 	}
 #else
-		trak->dts_at_seg_start = 0;
+		//do not reset tfdt for LL-HLS case where parts do not contain a TFDT
+		//trak->dts_at_seg_start = 0;
 		if (!keep_sample_count)
 			trak->sample_count_at_seg_start = 0;
 	}
@@ -4272,6 +4705,130 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_get_sample_to_group_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 grouping_type, u32 grouping_type_param, u32 *sampleGroupDescIndex)
+{
+	GF_TrackBox *trak;
+	u32 i, count;
+
+	if (!grouping_type || !sampleGroupDescIndex) return GF_BAD_PARAM;
+
+	*sampleGroupDescIndex = 0;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	if (!trak->Media->information->sampleTable->sampleGroups) return GF_OK;
+
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (sample_number <= trak->sample_count_at_seg_start) return GF_BAD_PARAM;
+	sample_number -= trak->sample_count_at_seg_start;
+#endif
+
+	count = gf_list_count(trak->Media->information->sampleTable->sampleGroups);
+	for (i=0; i<count; i++) {
+		GF_SampleGroupBox *sg;
+		u32 j;
+		u32 first_sample_in_entry, last_sample_in_entry;
+		first_sample_in_entry = 1;
+		sg = (GF_SampleGroupBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
+		if (sg->grouping_type != grouping_type) continue;
+		if (sg->grouping_type_parameter != grouping_type_param) continue;
+
+		for (j=0; j<sg->entry_count; j++) {
+			last_sample_in_entry = first_sample_in_entry + sg->sample_entries[j].sample_count - 1;
+			if ((sample_number<first_sample_in_entry) || (sample_number>last_sample_in_entry)) {
+				first_sample_in_entry = last_sample_in_entry+1;
+				continue;
+			}
+			/*we found our sample*/
+			*sampleGroupDescIndex = sg->sample_entries[j].group_description_index;
+			return GF_OK;
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err gf_isom_enum_sample_group(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 *sgrp_idx, u32 *sgrp_type, u32 *sgrp_parameter, const u8 **sgrp_data, u32 *sgrp_size)
+{
+	GF_TrackBox *trak;
+	u32 i, count;
+
+	if (!sgrp_idx || !sgrp_type) return GF_BAD_PARAM;
+	if (sgrp_parameter) *sgrp_parameter = 0;
+	if (sgrp_data) *sgrp_data = NULL;
+	if (sgrp_size) *sgrp_size = 0;
+	*sgrp_type = 0;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	if (!trak->Media->information->sampleTable->sampleGroups) return GF_OK;
+
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (sample_number <= trak->sample_count_at_seg_start) return GF_BAD_PARAM;
+	sample_number -= trak->sample_count_at_seg_start;
+#endif
+
+	count = gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription);
+	for (i=0; i<count; i++) {
+		GF_SampleGroupBox *sg;
+		u32 j;
+		GF_SampleGroupDescriptionBox *sgd = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
+
+		switch (sgd->grouping_type) {
+		case GF_ISOM_SAMPLE_GROUP_ROLL:
+		case GF_ISOM_SAMPLE_GROUP_PROL:
+		case GF_ISOM_SAMPLE_GROUP_TELE:
+		case GF_ISOM_SAMPLE_GROUP_RAP:
+		case GF_ISOM_SAMPLE_GROUP_SYNC:
+		case GF_ISOM_SAMPLE_GROUP_SEIG:
+		case GF_ISOM_SAMPLE_GROUP_OINF:
+		case GF_ISOM_SAMPLE_GROUP_LINF:
+		case GF_ISOM_SAMPLE_GROUP_TRIF:
+		case GF_ISOM_SAMPLE_GROUP_NALM:
+		case GF_ISOM_SAMPLE_GROUP_SAP:
+		case GF_ISOM_SAMPLE_GROUP_SPOR:
+		case GF_ISOM_SAMPLE_GROUP_SULM:
+			continue;
+		default:
+			break;
+		}
+		if (*sgrp_idx>i) continue;
+
+		for (j=0; j<gf_list_count(trak->Media->information->sampleTable->sampleGroups); j++) {
+			sg = (GF_SampleGroupBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroups, j);
+			if (sg->grouping_type == sgd->grouping_type) break;
+			sg = NULL;
+		}
+		u32 sgd_index = sgd->default_description_index;
+		if (sg) {
+			u32 snum=0;
+			for (j=0; j<sg->entry_count; j++) {
+				if (snum + sg->sample_entries[j].sample_count>= sample_number) {
+					sgd_index = sg->sample_entries[j].group_description_index;
+					break;
+				}
+				snum += sg->sample_entries[j].sample_count;
+			}
+		}
+
+		*sgrp_type = sgd->grouping_type;
+		if (sgrp_parameter && sg) *sgrp_parameter = sg->grouping_type_parameter;
+
+		if (sgd_index) {
+			GF_DefaultSampleGroupDescriptionEntry *entry = gf_list_get(sgd->group_descriptions, sgd_index-1);
+			if (entry) {
+				if (sgrp_data) *sgrp_data = entry->data;
+				if (sgrp_size) *sgrp_size = entry->length;
+			}
+		}
+
+		(*sgrp_idx)++;
+		return GF_OK;
+	}
+	return GF_OK;
+}
+
+
 GF_DefaultSampleGroupDescriptionEntry * gf_isom_get_sample_group_info_entry(GF_ISOFile *the_file, GF_TrackBox *trak, u32 grouping_type, u32 sample_group_description_index, u32 *default_index, GF_SampleGroupDescriptionBox **out_sgdp)
 {
 	u32 i, count;
@@ -4467,6 +5024,14 @@
 	file->keep_utc = keep_utc;
 }
 
+GF_EXPORT
+Bool gf_isom_has_keep_utc_times(GF_ISOFile *file)
+{
+	if (!file) return GF_FALSE;
+	return file->keep_utc;
+}
+
+
 
 GF_EXPORT
 u32 gf_isom_get_pssh_count(GF_ISOFile *file)
@@ -4474,9 +5039,17 @@
 	u32 count=0;
 	u32 i=0;
 	GF_Box *a_box;
-	while ((a_box = (GF_Box*)gf_list_enum(file->moov->child_boxes, &i))) {
-		if (a_box->type != GF_ISOM_BOX_TYPE_PSSH) continue;
-		count++;
+	if (file->moov) {
+		while ((a_box = (GF_Box*)gf_list_enum(file->moov->child_boxes, &i))) {
+			if (a_box->type != GF_ISOM_BOX_TYPE_PSSH) continue;
+			count++;
+		}
+	}
+	if (file->meta) {
+		while ((a_box = (GF_Box*)gf_list_enum(file->meta->child_boxes, &i))) {
+			if (a_box->type != GF_ISOM_BOX_TYPE_PSSH) continue;
+			count++;
+		}
 	}
 	return count;
 }
@@ -4517,11 +5090,20 @@
 {
 	u32 count=1;
 	u32 i=0;
-	GF_ProtectionSystemHeaderBox *pssh;
-	while ((pssh = (GF_ProtectionSystemHeaderBox *)gf_list_enum(file->moov->child_boxes, &i))) {
-		if (pssh->type != GF_ISOM_BOX_TYPE_PSSH) continue;
-		if (count == pssh_index) break;
-		count++;
+	GF_ProtectionSystemHeaderBox *pssh=NULL;
+	if (file->moov) {
+		while ((pssh = (GF_ProtectionSystemHeaderBox *)gf_list_enum(file->moov->child_boxes, &i))) {
+			if (pssh->type != GF_ISOM_BOX_TYPE_PSSH) continue;
+			if (count == pssh_index) break;
+			count++;
+		}
+	}
+	if (!pssh && file->meta) {
+		while ((pssh = (GF_ProtectionSystemHeaderBox *)gf_list_enum(file->meta->child_boxes, &i))) {
+			if (pssh->type != GF_ISOM_BOX_TYPE_PSSH) continue;
+			if (count == pssh_index) break;
+			count++;
+		}
 	}
 	if (!pssh) return GF_BAD_PARAM;
 
@@ -4534,11 +5116,10 @@
 	return GF_OK;
 }
 
-GF_EXPORT
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *IV_size, bin128 *KID, u8 *crypt_byte_block, u8 *skip_byte_block, u8 *constant_IV_size, bin128 *constant_IV)
+GF_Err gf_isom_get_sample_cenc_info_internal(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 #else
-GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, void *traf, GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *IV_size, bin128 *KID, u8 *crypt_byte_block, u8 *skip_byte_block, u8 *constant_IV_size, bin128 *constant_IV)
+GF_Err gf_isom_get_sample_cenc_info_internal(GF_TrackBox *trak, void *traf, GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 #endif
 {
 	GF_SampleGroupBox *sample_group;
@@ -4550,14 +5131,12 @@
 	u32 first_sample_in_entry, last_sample_in_entry;
 	GF_CENCSampleEncryptionGroupEntry *entry;
 
-	if (IsEncrypted) *IsEncrypted = 0;
-	if (IV_size) *IV_size = 0;
-	if (KID) memset(*KID, 0, 16);
+	if (IsEncrypted) *IsEncrypted = GF_FALSE;
 	if (crypt_byte_block) *crypt_byte_block = 0;
 	if (skip_byte_block) *skip_byte_block = 0;
-	if (constant_IV_size) *constant_IV_size = 0;
-	if (constant_IV) memset(*constant_IV, 0, 16);
-
+	if (key_info) *key_info = NULL;
+	if (key_info_size) *key_info_size = 0;
+	
 	if (!trak) return GF_BAD_PARAM;
 
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
@@ -4574,7 +5153,8 @@
 		descIndex = trak->current_traf_stsd_idx;
 		if (!descIndex) descIndex = 1;
 	}
-	gf_isom_cenc_get_default_info_ex(trak, descIndex, NULL, IsEncrypted, IV_size, KID, constant_IV_size, constant_IV, crypt_byte_block, skip_byte_block);
+
+	gf_isom_cenc_get_default_info_internal(trak, descIndex, NULL, IsEncrypted, crypt_byte_block, skip_byte_block, key_info, key_info_size);
 
 	sample_group = NULL;
 	group_desc_index = 0;
@@ -4654,27 +5234,26 @@
 	if (!entry) return GF_ISOM_INVALID_FILE;
 
 	if (IsEncrypted) *IsEncrypted = entry->IsProtected;
-	if (IV_size) *IV_size = entry->Per_Sample_IV_size;
-	if (KID) memmove(*KID, entry->KID, 16);
 	if (crypt_byte_block) *crypt_byte_block = entry->crypt_byte_block;
 	if (skip_byte_block) *skip_byte_block = entry->skip_byte_block;
-	if (constant_IV_size) *constant_IV_size = entry->constant_IV_size;
-	if (constant_IV) memmove(*constant_IV, entry->constant_IV, 16);
+
+	if (key_info) *key_info = entry->key_info;
+	if (key_info_size) *key_info_size = entry->key_info_size;
 
 exit:
 	//in PIFF we may have default values if no TENC is present: 8 bytes for IV size
-	if (( (senc && senc->is_piff) || (trak->moov && trak->moov->mov->is_smooth) ) && IV_size && !(*IV_size) ) {
+	if (( (senc && senc->piff_type==1) || (trak->moov && trak->moov->mov->is_smooth) ) && key_info && ! (*key_info) ) {
 		if (!senc) {
-			*IV_size = 8;
 			if (IsEncrypted) *IsEncrypted = GF_TRUE;
+			if (key_info_size) *key_info_size = 8;
 		} else {
-			if (!senc->is_piff) {
-				senc->is_piff = GF_TRUE;
+			if (!senc->piff_type) {
+				senc->piff_type = 2;
 				senc->IV_size = 8;
 			}
 			assert(senc->IV_size);
-			*IV_size = senc->IV_size;
 			if (IsEncrypted) *IsEncrypted = GF_TRUE;
+			if (key_info_size) *key_info_size = senc->IV_size;
 		}
 	}
 
@@ -4682,15 +5261,15 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *movie, u32 track, u32 sample_number, Bool *IsEncrypted, u8 *IV_size, bin128 *KID,
-									u8 *crypt_byte_block, u8 *skip_byte_block, u8 *constant_IV_size, bin128 *constant_IV)
+GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *movie, u32 track, u32 sample_number, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, track);
 	GF_SampleEncryptionBox *senc = trak->sample_encryption;
 
-	return gf_isom_get_sample_cenc_info_ex(trak, NULL, senc, sample_number, IsEncrypted, IV_size, KID, crypt_byte_block, skip_byte_block, constant_IV_size, constant_IV);
+	return gf_isom_get_sample_cenc_info_internal(trak, NULL, senc, sample_number, IsEncrypted, crypt_byte_block, skip_byte_block, key_info, key_info_size);
 }
 
+
 GF_EXPORT
 Bool gf_isom_get_last_producer_time_box(GF_ISOFile *file, GF_ISOTrackID *refTrackID, u64 *ntp, u64 *timestamp, Bool reset_info)
 {
@@ -4726,6 +5305,19 @@
 }
 
 GF_EXPORT
+u64 gf_isom_get_smooth_next_tfdt(GF_ISOFile *the_file, u32 trackNumber)
+{
+#ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
+	return 0;
+#else
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return 0;
+	return trak->dts_at_next_frag_start;
+#endif
+}
+
+GF_EXPORT
 Bool gf_isom_is_smooth_streaming_moov(GF_ISOFile *the_file)
 {
 	return the_file ? the_file->is_smooth : GF_FALSE;
@@ -4989,6 +5581,7 @@
 	if (grouping_type) {
 		sgpd_write_entry(grouping_type, ptr1, bs1);
 	} else {
+		gf_isom_box_size((GF_Box *)ptr1);
 		gf_isom_box_write((GF_Box *)ptr1, bs1);
 	}
 	gf_bs_get_content(bs1, &buf1, &len1);
@@ -5065,4 +5658,415 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+const u8 *gf_isom_get_mpegh_compatible_profiles(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescIndex, u32 *nb_compat_profiles)
+{
+	GF_SampleEntryBox *ent;
+	GF_MHACompatibleProfilesBox *mhap;
+	GF_TrackBox *trak;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media || !nb_compat_profiles) return NULL;
+	*nb_compat_profiles = 0;
+	ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, sampleDescIndex-1);
+	if (!ent) return NULL;
+	mhap = (GF_MHACompatibleProfilesBox *) gf_isom_box_find_child(ent->child_boxes, GF_ISOM_BOX_TYPE_MHAP);
+	if (!mhap) return NULL;
+	*nb_compat_profiles = mhap->num_profiles;
+	return mhap->compat_profiles;
+}
+
+const void *gf_isom_get_tfrf(GF_ISOFile *movie, u32 trackNumber)
+{
+#ifdef GPAC_DISABLE_ISOM_FRAGMENTS
+	return NULL;
+#else
+	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return NULL;
+
+	return trak->tfrf;
+#endif
+}
+
+GF_Err gf_isom_get_y3d_info(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescriptionIndex, GF_ISOM_Y3D_Info *info)
+{
+	GF_SampleEntryBox *ent;
+	GF_TrackBox *trak;
+	Bool found = GF_FALSE;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media || !info) return GF_BAD_PARAM;
+
+	ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, sampleDescriptionIndex-1);
+	if (!ent) return GF_BAD_PARAM;
+
+	memset(info, 0, sizeof(GF_ISOM_Y3D_Info));
+
+	GF_Stereo3DBox *st3d = (GF_Stereo3DBox *) gf_isom_box_find_child(ent->child_boxes, GF_ISOM_BOX_TYPE_ST3D);
+	if (st3d) {
+		found = GF_TRUE;
+		info->stereo_type = st3d->stereo_type;
+	}
+
+	GF_Box *sv3d = gf_isom_box_find_child(ent->child_boxes, GF_ISOM_BOX_TYPE_SV3D);
+	if (!sv3d) {
+		return found ? GF_OK : GF_NOT_FOUND;
+	}
+	GF_SphericalVideoInfoBox *svhd = (GF_SphericalVideoInfoBox *) gf_isom_box_find_child(sv3d->child_boxes, GF_ISOM_BOX_TYPE_SVHD);
+	if (svhd && strlen(svhd->string)) info->meta_data = svhd->string;
+
+	GF_Box *proj = gf_isom_box_find_child(sv3d->child_boxes, GF_ISOM_BOX_TYPE_PROJ);
+	if (!proj)
+		return found ? GF_OK : GF_NOT_FOUND;
+
+	GF_ProjectionHeaderBox *projh = (GF_ProjectionHeaderBox *) gf_isom_box_find_child(proj->child_boxes, GF_ISOM_BOX_TYPE_PRHD);
+	if (projh) {
+		info->yaw = projh->yaw;
+		info->pitch = projh->pitch;
+		info->roll = projh->roll;
+		info->pose_present = GF_TRUE;
+	}
+
+	GF_ProjectionTypeBox *projt = (GF_ProjectionTypeBox *) gf_isom_box_find_child(proj->child_boxes, GF_ISOM_BOX_TYPE_CBMP);
+	if (projt) {
+		info->layout = projt->layout;
+		info->padding = projt->padding;
+		info->projection_type = 1;
+	} else {
+		projt = (GF_ProjectionTypeBox *) gf_isom_box_find_child(proj->child_boxes, GF_ISOM_BOX_TYPE_EQUI);
+		if (projt) {
+			info->top = projt->bounds_top;
+			info->bottom = projt->bounds_bottom;
+			info->left = projt->bounds_left;
+			info->right = projt->bounds_right;
+			info->projection_type = 2;
+		} else {
+			projt = (GF_ProjectionTypeBox *) gf_isom_box_find_child(proj->child_boxes, GF_ISOM_BOX_TYPE_EQUI);
+			if (projt) {
+				info->projection_type = 3;
+			}
+		}
+	}
+	return GF_OK;
+}
+
+
+GF_EXPORT
+u32 gf_isom_get_chunk_count(GF_ISOFile *movie, u32 trackNumber)
+{
+	GF_ChunkOffsetBox *stco;
+	GF_TrackBox *trak;
+	if (!movie || !movie->moov || !trackNumber) return 0;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->ChunkOffset ) return 0;
+
+	stco = (GF_ChunkOffsetBox *) trak->Media->information->sampleTable->ChunkOffset;
+	if (stco->type == GF_ISOM_BOX_TYPE_STCO)
+		return stco->nb_entries;
+	if (stco->type == GF_ISOM_BOX_TYPE_CO64)
+		return ((GF_ChunkLargeOffsetBox *) stco)->nb_entries;
+	return 0;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_chunk_info(GF_ISOFile *movie, u32 trackNumber, u32 chunk_num, u64 *chunk_offset, u32 *first_sample_num, u32 *sample_per_chunk, u32 *sample_desc_idx, u32 *cache_1, u32 *cache_2)
+{
+	GF_ChunkOffsetBox *stco = NULL;
+	GF_ChunkLargeOffsetBox *co64 = NULL;
+	GF_SampleToChunkBox *stsc = NULL;
+	GF_TrackBox *trak;
+	u32 i, nb_entries, nb_samples, sample_desc_index;
+	if (!movie || !movie->moov || !trackNumber || !chunk_num) return GF_BAD_PARAM;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->ChunkOffset ) return GF_BAD_PARAM;
+
+	stsc = (GF_SampleToChunkBox *) trak->Media->information->sampleTable->SampleToChunk;
+	stco = (GF_ChunkOffsetBox *) trak->Media->information->sampleTable->ChunkOffset;
+	if (stco->type == GF_ISOM_BOX_TYPE_CO64) {
+		stco = NULL;
+		co64 = (GF_ChunkLargeOffsetBox *) trak->Media->information->sampleTable->ChunkOffset;
+		nb_entries = co64->nb_entries;
+	} else {
+		nb_entries = stco->nb_entries;
+	}
+	if (chunk_num>nb_entries) return GF_BAD_PARAM;
+
+	sample_desc_index = 0;
+	nb_samples = 1;
+	i=0;
+
+	if (cache_1 && cache_2) {
+		if (chunk_num==1) {
+			*cache_1 = 0;
+			*cache_2 = 1;
+		}
+		i = *cache_1;
+		nb_samples = *cache_2;
+	}
+
+	for (; i<stsc->nb_entries; i++) {
+		u32 nb_chunks_before;
+
+		if (stsc->entries[i].firstChunk == chunk_num) {
+			sample_desc_index = stsc->entries[i].sampleDescriptionIndex;
+			if (sample_per_chunk)
+				*sample_per_chunk = stsc->entries[i].samplesPerChunk;
+			break;
+		}
+		assert(stsc->entries[i].firstChunk<chunk_num);
+
+		if ((i+1 == stsc->nb_entries)
+			|| (stsc->entries[i+1].firstChunk>chunk_num)
+		) {
+			nb_chunks_before = chunk_num - stsc->entries[i].firstChunk;
+			nb_samples += stsc->entries[i].samplesPerChunk * nb_chunks_before;
+			sample_desc_index = stsc->entries[i].sampleDescriptionIndex;
+			if (sample_per_chunk)
+				*sample_per_chunk = stsc->entries[i].samplesPerChunk;
+			break;
+		}
+		assert(stsc->entries[i+1].firstChunk > stsc->entries[i].firstChunk);
+
+		nb_chunks_before = stsc->entries[i+1].firstChunk - stsc->entries[i].firstChunk;
+		nb_samples += stsc->entries[i].samplesPerChunk * nb_chunks_before;
+
+		if (cache_1 && cache_2) {
+			*cache_1 = i+1;
+			*cache_2 = nb_samples;
+		}
+	}
+
+	if (first_sample_num) *first_sample_num = nb_samples;
+	if (sample_desc_idx) *sample_desc_idx = sample_desc_index;
+	if (chunk_offset) {
+		if (stco)
+			*chunk_offset = stco->offsets[chunk_num-1];
+		else
+			*chunk_offset = co64->offsets[chunk_num-1];
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_clean_aperture(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 *cleanApertureWidthN, u32 *cleanApertureWidthD, u32 *cleanApertureHeightN, u32 *cleanApertureHeightD, s32 *horizOffN, u32 *horizOffD, s32 *vertOffN, u32 *vertOffD)
+{
+	GF_TrackBox *trak;
+	GF_SampleEntryBox *entry;
+	GF_SampleDescriptionBox *stsd;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
+		return movie->LastError = GF_BAD_PARAM;
+	}
+	entry = (GF_SampleEntryBox *)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
+	if (entry == NULL) return GF_BAD_PARAM;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
+
+	GF_CleanApertureBox *clap = (GF_CleanApertureBox *)gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_CLAP);
+
+	if (cleanApertureWidthN) *cleanApertureWidthN = clap ? clap->cleanApertureWidthN : 0;
+	if (cleanApertureWidthD) *cleanApertureWidthD = clap ? clap->cleanApertureWidthD : 0;
+	if (cleanApertureHeightN) *cleanApertureHeightN = clap ? clap->cleanApertureHeightN : 0;
+	if (cleanApertureHeightD) *cleanApertureHeightD = clap ? clap->cleanApertureHeightD : 0;
+	if (horizOffN) *horizOffN = clap ? clap->horizOffN : 0;
+	if (horizOffD) *horizOffD = clap ? clap->horizOffD : 0;
+	if (vertOffN) *vertOffN = clap ? clap->vertOffN : 0;
+	if (vertOffD) *vertOffD = clap ? clap->vertOffD : 0;
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_isom_get_track_group(GF_ISOFile *file, u32 track_number, u32 track_group_type)
+{
+	u32 i;
+	GF_TrackGroupTypeBox *trgt;
+	GF_TrackBox *trak;
+
+	trak = gf_isom_get_track_from_file(file, track_number);
+	if (!trak) return 0;
+	if (!trak->groups) return 0;
+
+	for (i=0; i<gf_list_count(trak->groups->groups); i++) {
+		trgt = gf_list_get(trak->groups->groups, i);
+		if (trgt->group_type == track_group_type) {
+			return trgt->track_group_id;
+		}
+	}
+	return 0;
+}
+
+GF_EXPORT
+const GF_MasteringDisplayColourVolumeInfo *gf_isom_get_mastering_display_colour_info(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex)
+{
+	GF_TrackBox* trak;
+	GF_SampleEntryBox* entry;
+	GF_SampleDescriptionBox* stsd;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return NULL;
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd) return NULL;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
+		return NULL;
+	}
+	entry = (GF_SampleEntryBox*)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
+	if (entry == NULL) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
+
+	GF_MasteringDisplayColourVolumeBox *mdcvb = (GF_MasteringDisplayColourVolumeBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_MDCV);
+	if (!mdcvb) return NULL;
+
+	return &mdcvb->mdcv;
+}
+
+GF_EXPORT
+const GF_ContentLightLevelInfo *gf_isom_get_content_light_level_info(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex)
+{
+	GF_TrackBox* trak;
+	GF_SampleEntryBox* entry;
+	GF_SampleDescriptionBox* stsd;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return NULL;
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd) return NULL;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
+		return NULL;
+	}
+	entry = (GF_SampleEntryBox*)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
+	if (entry == NULL) return NULL;
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return NULL;
+
+	GF_ContentLightLevelBox *cllib = (GF_ContentLightLevelBox *)gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_CLLI);
+	if (!cllib) return NULL;
+	return &cllib->clli;
+}
+
+
+GF_Err gf_isom_enum_sample_aux_data(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 *sai_idx, u32 *sai_type, u32 *sai_parameter, u8 **sai_data, u32 *sai_size)
+{
+	GF_TrackBox *trak;
+	u32 i, count;
+
+	if (!sai_type || !sai_idx || !sai_data || !sai_size) return GF_BAD_PARAM;
+	if (sai_parameter) *sai_parameter = 0;
+	*sai_type = 0;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	if (!trak->Media->information->sampleTable->sai_sizes) return GF_OK;
+	if (!trak->Media->information->sampleTable->sai_offsets) return GF_OK;
+
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (sample_number <= trak->sample_count_at_seg_start) return GF_BAD_PARAM;
+	sample_number -= trak->sample_count_at_seg_start;
+#endif
+
+	count = gf_list_count(trak->Media->information->sampleTable->sai_sizes);
+	for (i=0; i<count; i++) {
+		GF_Err e;
+		GF_SampleAuxiliaryInfoSizeBox *saiz;
+		GF_SampleAuxiliaryInfoOffsetBox *saio=NULL;
+		u32 j;
+		saiz = (GF_SampleAuxiliaryInfoSizeBox*)gf_list_get(trak->Media->information->sampleTable->sai_sizes, i);
+
+		switch (saiz->aux_info_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
+		case GF_ISOM_PIFF_SCHEME:
+		case 0:
+			continue;
+		default:
+			break;
+		}
+		if (*sai_idx>i) continue;
+
+		for (j=0; j<gf_list_count(trak->Media->information->sampleTable->sai_offsets); j++) {
+			saio = (GF_SampleAuxiliaryInfoOffsetBox*)gf_list_get(trak->Media->information->sampleTable->sai_offsets, j);
+			if ((saio->aux_info_type == saiz->aux_info_type) && (saio->aux_info_type_parameter == saiz->aux_info_type_parameter)) break;
+			saio = NULL;
+		}
+		if (!saio) continue;
+		if (!saio->offsets && !saio->sai_data) continue;
+
+		u64 offset = saio->offsets ? saio->offsets[0] : 0;
+		u32 nb_saio = saio->entry_count;
+		if ((nb_saio>1) && (saio->entry_count != saiz->sample_count)) continue;
+
+		*sai_type = saiz->aux_info_type;
+		if (sai_parameter) *sai_parameter = saiz->aux_info_type_parameter;
+
+		(*sai_idx)++;
+
+		if (nb_saio == 1) {
+			for (j=0; j < sample_number-1; j++) {
+				u32 size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
+				offset += size;
+			}
+		} else {
+			offset = saio->offsets[sample_number-1];
+		}
+
+		*sai_size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
+		if (*sai_size) {
+			*sai_data = gf_malloc( *sai_size);
+			if (! *sai_data) return GF_OUT_OF_MEM;
+		}
+
+		e = GF_OK;
+		if (saio->sai_data) {
+			if (offset + *sai_size <= saio->sai_data->dataSize) {
+				memcpy(*sai_data, saio->sai_data->data + offset, *sai_size);
+			} else {
+				e = GF_IO_ERR;
+			}
+		} else {
+			u64 cur_position = gf_bs_get_position(the_file->movieFileMap->bs);
+			gf_bs_seek(the_file->movieFileMap->bs, offset);
+
+			u32 nb_read = gf_bs_read_data(the_file->movieFileMap->bs, *sai_data, *sai_size);
+			if (nb_read != *sai_size) e = GF_IO_ERR;
+			gf_bs_seek(the_file->movieFileMap->bs, cur_position);
+		}
+
+		if (e) {
+			gf_free(*sai_data);
+			*sai_data = NULL;
+			*sai_size = 0;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] Failed to clone sai data: %s\n", gf_error_to_string(e) ));
+		}
+		return e;
+	}
+	return GF_OK;
+}
+
+GF_Err gf_isom_pop_emsg(GF_ISOFile *the_file, u8 **emsg_data, u32 *emsg_size)
+{
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	GF_Box *emsg = gf_list_pop_front(the_file->emsgs);
+	if (!emsg) return GF_NOT_FOUND;
+
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	//write everything
+	gf_isom_box_size(emsg);
+	gf_isom_box_write(emsg, bs);
+	gf_bs_get_content(bs, emsg_data, emsg_size);
+	gf_isom_box_del(emsg);
+	return GF_OK;
+
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-1.0.1.tar.gz/src/isomedia/isom_store.c -> gpac-2.0.0.tar.gz/src/isomedia/isom_store.c Changed

@@ -1,9 +1,8 @@
-
 /*
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -43,8 +42,13 @@
 		if (a->type == GF_ISOM_BOX_TYPE_FREE) {
 			_free = (GF_FreeSpaceBox *)a;
 			if (_free->dataSize) {
-				if (!strcmp(_free->data, GPAC_ISOM_CPRT_NOTICE_VERSION)) return GF_OK;
-				if (strstr(_free->data, GPAC_ISOM_CPRT_NOTICE)) {
+				u32 cp_len = (u32) strlen(GPAC_ISOM_CPRT_NOTICE_VERSION);
+				if ((cp_len==_free->dataSize) && !memcmp(_free->data, GPAC_ISOM_CPRT_NOTICE_VERSION, _free->dataSize)) return GF_OK;
+
+				cp_len = (u32) strlen(GPAC_ISOM_CPRT_NOTICE);
+				if (cp_len>_free->dataSize)
+					cp_len = _free->dataSize;
+				if (!memcmp(_free->data, GPAC_ISOM_CPRT_NOTICE, cp_len)) {
 					gf_free(_free->data);
 					_free->data = gf_strdup(gf_sys_is_test_mode() ? GPAC_ISOM_CPRT_NOTICE : GPAC_ISOM_CPRT_NOTICE_VERSION);
 					_free->dataSize = 1 + (u32) strlen(_free->data);
@@ -95,13 +99,16 @@
 	char *buffer;
 	u32 alloc_size;
 	GF_ISOFile *movie;
-	u32 total_samples, nb_done;
+	u64 total_samples, nb_done;
 } MovieWriter;
 
 void CleanWriters(GF_List *writers)
 {
 	while (gf_list_count(writers)) {
 		TrackWriter *writer = (TrackWriter*)gf_list_get(writers, 0);
+		//in case we have an error in the middle of file write, remove our created stco and stsc from sample table
+		gf_list_del_item(writer->stbl->child_boxes, writer->stco);
+		gf_list_del_item(writer->stbl->child_boxes, writer->stsc);
 		gf_isom_box_del(writer->stco);
 		gf_isom_box_del((GF_Box *)writer->stsc);
 		gf_free(writer);
@@ -150,8 +157,24 @@
 
 	trackCount = gf_list_count(movie->moov->trackList);
 	for (i = 0; i < trackCount; i++) {
+		GF_SampleTableBox *stbl;
 		trak = gf_isom_get_track(movie->moov, i+1);
 
+		stbl = (trak->Media && trak->Media->information) ? trak->Media->information->sampleTable : NULL;
+		if (!stbl || !stbl->SampleSize || !stbl->ChunkOffset || !stbl->SampleToChunk || !stbl->SampleSize) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[Isom] Box '%s' missing from track, cannot write\n",
+				!trak->Media ? "mdia" :
+				!trak->Media->information ? "minf" :
+				!stbl ? "stbl" :
+				!stbl->SampleSize ? "stsz" :
+				!stbl->ChunkOffset ? "stco" :
+				!stbl->SampleToChunk ? "stsc" :
+				"stsz"
+			));
+
+			return GF_ISOM_INVALID_FILE;
+		}
+
 		GF_SAFEALLOC(writer, TrackWriter);
 		if (!writer) goto exit;
 		writer->sampleNumber = 1;
@@ -186,7 +209,11 @@
 		}
 		if (!writer->stco) return GF_OUT_OF_MEM;
 		/*stops from chunk escape*/
-		if (interleaving) writer->stbl->MaxSamplePerChunk = 0;
+		if (interleaving)
+			writer->stbl->MaxSamplePerChunk = 0;
+		else if (writer->stbl->MaxChunkDur && trak->Media->mediaHeader->duration) {
+			writer->stbl->MaxSamplePerChunk = (u32) ((u64) writer->stbl->MaxChunkDur * writer->stbl->SampleSize->sampleCount / trak->Media->mediaHeader->duration);
+		}
 		/*for progress, assume only one descIndex*/
 		if (Media_IsSelfContained(writer->mdia, 1))
 			mw->total_samples += writer->stbl->SampleSize->sampleCount;
@@ -216,89 +243,118 @@
 static void ShiftMetaOffset(GF_MetaBox *meta, u64 offset)
 {
 	u32 i, count;
+	u64 max_offset = 0;
 	if (!meta->item_locations) return;
 
 	count = gf_list_count(meta->item_locations->location_entries);
 	for (i=0; i<count; i++) {
 		GF_ItemLocationEntry *iloc = (GF_ItemLocationEntry *)gf_list_get(meta->item_locations->location_entries, i);
 		if (iloc->data_reference_index) continue;
-		if (iloc->construction_method == 2) continue;
+		//idat or item ref offset, don't shift offset
+		if (iloc->construction_method) continue;
 		if (!iloc->base_offset) {
 			GF_ItemExtentEntry *entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
 			if (entry && !entry->extent_length && !entry->original_extent_offset && (gf_list_count(iloc->extent_entries)==1) )
 				continue;
 		}
-
 		iloc->base_offset += offset;
+		if (max_offset < iloc->base_offset)
+			max_offset = iloc->base_offset;
 	}
+
+	/*update offset & size length fields*/
+	if (max_offset>0xFFFFFFFF) meta->item_locations->base_offset_size = 8;
+	else if (max_offset) meta->item_locations->base_offset_size = 4;
 }
 
+
+static GF_Err shift_chunk_offsets(GF_SampleToChunkBox *stsc, GF_MediaBox *mdia, GF_Box *_stco, u64 offset, Bool force_co64, GF_Box **new_stco)
+{
+	u32 j, k, l, last;
+	GF_StscEntry *ent;
+
+	if (!stsc || !_stco) return GF_ISOM_INVALID_FILE;
+
+	//we have to proceed entry by entry in case a part of the media is not self-contained...
+	for (j=0; j<stsc->nb_entries; j++) {
+		ent = &stsc->entries[j];
+		if (!Media_IsSelfContained(mdia, ent->sampleDescriptionIndex))
+			continue;
+		//OK, get the chunk(s) number(s) and "shift" its (their) offset(s).
+		if (_stco->type == GF_ISOM_BOX_TYPE_STCO) {
+			GF_ChunkLargeOffsetBox *new_stco64 = NULL;
+			GF_ChunkOffsetBox *stco = (GF_ChunkOffsetBox *) _stco;
+
+			//be careful for the last entry, nextChunk is set to 0 in edit mode...
+			last = ent->nextChunk ? ent->nextChunk : stco->nb_entries + 1;
+			for (k = ent->firstChunk; k < last; k++) {
+				if (stco->nb_entries < k)
+					return GF_ISOM_INVALID_FILE;
+
+				//we need to rewrite the table: only allocate co64 if not done previously and convert all offsets
+				//to co64. Then (whether co64 was created or not) adjust the offset
+				//Do not reassign table until we are done with the current sampleToChunk processing
+				//since we have a test on stco->offsets[k-1], we need to keep stco untouched
+				if (new_stco64 || force_co64 || (stco->offsets[k-1] + offset > 0xFFFFFFFF)) {
+					if (!new_stco64) {
+						new_stco64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
+						if (!new_stco64) return GF_OUT_OF_MEM;
+						new_stco64->nb_entries = stco->nb_entries;
+						new_stco64->offsets = (u64 *) gf_malloc(new_stco64->nb_entries * sizeof(u64));
+						if (!new_stco64->offsets) return GF_OUT_OF_MEM;
+						//copy over the stco table
+						for (l = 0; l < new_stco64->nb_entries; l++) {
+							new_stco64->offsets[l] = (u64) stco->offsets[l];
+						}
+					}
+					new_stco64->offsets[k-1] += offset;
+				} else {
+					stco->offsets[k-1] += (u32) offset;
+				}
+			}
+			if (new_stco64) {
+				*new_stco = (GF_Box *) new_stco64;
+				_stco = (GF_Box *) new_stco64;
+				new_stco64 = NULL;
+			}
+		} else {
+			GF_ChunkLargeOffsetBox *stco64 = (GF_ChunkLargeOffsetBox *) _stco;
+			//be careful for the last entry ...
+			last = ent->nextChunk ? ent->nextChunk : stco64->nb_entries + 1;
+			for (k = ent->firstChunk; k < last; k++) {
+				if (stco64->nb_entries < k)
+					return GF_ISOM_INVALID_FILE;
+				stco64->offsets[k-1] += offset;
+			}
+		}
+	}
+	return GF_OK;
+}
 static GF_Err ShiftOffset(GF_ISOFile *file, GF_List *writers, u64 offset)
 {
-	u32 i, j, k, l, last;
+	u32 i;
 	TrackWriter *writer;
-	GF_StscEntry *ent;
 
 	if (file->meta) ShiftMetaOffset(file->meta, offset);
 	if (file->moov && file->moov->meta) ShiftMetaOffset(file->moov->meta, offset);
 
 	i=0;
 	while ((writer = (TrackWriter *)gf_list_enum(writers, &i))) {
+		GF_Err e;
+		GF_Box *new_stco=NULL;
 		if (writer->mdia->mediaTrack->meta) ShiftMetaOffset(writer->mdia->mediaTrack->meta, offset);
+		if (writer->all_dref_mode==ISOM_DREF_EXT)
+			continue;
 
-		//we have to proceed entry by entry in case a part of the media is not self-contained...
-		for (j=0; j<writer->stsc->nb_entries; j++) {
-			ent = &writer->stsc->entries[j];
-			if ((writer->all_dref_mode==ISOM_DREF_EXT) || !Media_IsSelfContained(writer->mdia, ent->sampleDescriptionIndex))
-				continue;
+		e = shift_chunk_offsets(writer->stsc, writer->mdia, writer->stco, offset, file->force_co64, &new_stco);
+		if (e) return e;
 
-			//OK, get the chunk(s) number(s) and "shift" its (their) offset(s).
-			if (writer->stco->type == GF_ISOM_BOX_TYPE_STCO) {
-				GF_ChunkLargeOffsetBox *new_stco64 = NULL;
-				GF_ChunkOffsetBox *stco = (GF_ChunkOffsetBox *) writer->stco;
-
-				//be carefull for the last entry, nextChunk is set to 0 in edit mode...
-				last = ent->nextChunk ? ent->nextChunk : stco->nb_entries + 1;
-				for (k = ent->firstChunk; k < last; k++) {
-
-					//we need to rewrite the table: only allocate co64 if not done previously and convert all offsets
-					//to co64. Then (whether co64 was created or not) adjust the offset
-					//Do not reassign table until we are done with the current sampleToChunk processing
-					//since we have a test on stco->offsets[k-1], we need to keep stco untouched
-					if (new_stco64 || file->force_co64 || (stco->offsets[k-1] + offset > 0xFFFFFFFF)) {
-						if (!new_stco64) {
-							new_stco64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
-							if (!new_stco64) return GF_OUT_OF_MEM;
-							new_stco64->nb_entries = stco->nb_entries;
-							new_stco64->offsets = (u64 *) gf_malloc(new_stco64->nb_entries * sizeof(u64));
-							if (!new_stco64->offsets) return GF_OUT_OF_MEM;
-							//copy over the stco table
-							for (l = 0; l < new_stco64->nb_entries; l++) {
-								new_stco64->offsets[l] = (u64) stco->offsets[l];
-							}
-						}
-						new_stco64->offsets[k-1] += offset;
-					} else {
-						stco->offsets[k-1] += (u32) offset;
-					}
-				}
-				if (new_stco64) {
-					//done with this sampleToChunk entry, replace the box if we moved to co64
-					gf_isom_box_del(writer->stco);
-					writer->stco = (GF_Box *)new_stco64;
-					new_stco64 = NULL;
-				}
-			} else {
-				GF_ChunkLargeOffsetBox *stco64 = (GF_ChunkLargeOffsetBox *) writer->stco;
-				//be carefull for the last entry ...
-				last = ent->nextChunk ? ent->nextChunk : stco64->nb_entries + 1;
-				for (k = ent->firstChunk; k < last; k++) {
-					stco64->offsets[k-1] += offset;
-				}
-			}
+		if (new_stco) {
+			//done with this sampleToChunk entry, replace the box if we moved to co64
+			gf_isom_box_del(writer->stco);
+			writer->stco = (GF_Box *) new_stco;
 		}
 	}
-
 	return GF_OK;
 
 }
@@ -322,8 +378,8 @@
 			*box_csize = (u32) root_box->size;
 
 		gf_bs_get_content(comp_bs, &box_data, &box_size);
-		gf_gz_compress_payload_ex(&box_data, box_size, &comp_size, 8, GF_TRUE, NULL);
-		if (mov->force_compress || (comp_size + COMP_BOX_COST_BYTES < box_size)) {
+		gf_gz_compress_payload_ex(&box_data, box_size, &comp_size, 8, GF_FALSE, NULL);
+		if ((mov->compress_flags & GF_ISOM_COMP_FORCE_ALL) || (comp_size + COMP_BOX_COST_BYTES < box_size)) {
 			if (bs) {
 				gf_bs_write_u32(bs, comp_size+8);
 				gf_bs_write_u32(bs, repl_type);
@@ -332,7 +388,7 @@
 			if (box_csize)
 				*box_csize = comp_size + COMP_BOX_COST_BYTES;
 		} else if (bs) {
-			gf_bs_write_data(bs, box_data, box_size);
+			gf_isom_box_write(root_box, bs);
 		}
 		gf_free(box_data);
 	}
@@ -384,7 +440,7 @@
 		e = gf_isom_box_size((GF_Box *)movie->moov);
 		if (e) return e;
 
-		if ((movie->compress_mode==GF_ISO_COMP_ALL) || (movie->compress_mode==GF_ISO_COMP_MOOV)) {
+		if ((movie->compress_mode==GF_ISOM_COMP_ALL) || (movie->compress_mode==GF_ISOM_COMP_MOOV)) {
 			e = gf_isom_write_compressed_box(movie, (GF_Box *) movie->moov, GF_4CC('!', 'm', 'o', 'v'), bs, NULL);
 		} else {
 			e = gf_isom_box_write((GF_Box *)movie->moov, bs);
@@ -540,6 +596,160 @@
 	*samp_size = nb_in_run * tkw->constant_size;
 }
 
+
+//replace the chunk and offset tables...
+static GF_Err store_meta_item_sample_ref_offsets(GF_ISOFile *movie, GF_List *writers, GF_MetaBox *meta)
+{
+	u32 i, count;
+	TrackWriter *writer;
+	GF_Box *stco;
+	GF_SampleToChunkBox *stsc;
+	u64 max_base_offset = 0;
+	u64 max_ext_offset = 0;
+	u64 max_ext_length = 0;
+
+	if (!movie->moov) return GF_OK;
+	if (!meta->item_locations) return GF_OK;
+	if (!meta->use_item_sample_sharing) return GF_OK;
+
+	//switch all our tables
+	if (writers) {
+		i=0;
+		while ((writer = (TrackWriter*)gf_list_enum(writers, &i))) {
+			//don't delete them !!!
+			stsc = writer->stbl->SampleToChunk;
+			stco = writer->stbl->ChunkOffset;
+			s32 stsc_pos = gf_list_del_item(writer->stbl->child_boxes, stsc);
+			s32 stco_pos = gf_list_del_item(writer->stbl->child_boxes, stco);
+			writer->stbl->SampleToChunk = writer->stsc;
+			writer->stbl->ChunkOffset = writer->stco;
+			gf_list_insert(writer->stbl->child_boxes, writer->stsc, stsc_pos);
+			gf_list_insert(writer->stbl->child_boxes, writer->stco, stco_pos);
+			writer->stco = stco;
+			writer->stsc = stsc;
+		}
+	}
+
+	count = gf_list_count(meta->item_locations->location_entries);
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_ItemExtentEntry *entry;
+		GF_ItemLocationEntry *iloc = (GF_ItemLocationEntry *)gf_list_get(meta->item_locations->location_entries, i);
+		/*get item info*/
+		GF_ItemInfoEntryBox *iinf = NULL;
+		j=0;
+		while ((iinf = (GF_ItemInfoEntryBox *)gf_list_enum(meta->item_infos->item_infos, &j))) {
+			if (iinf->item_ID==iloc->item_ID) break;
+		}
+		if (!iinf) continue;
+
+		if (iloc->base_offset > max_base_offset)
+			max_base_offset = iloc->base_offset;
+
+		if (!iinf->tk_id || !iinf->sample_num) {
+			for (j=0; j<gf_list_count(iloc->extent_entries); j++) {
+				entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, j);
+				if (entry->extent_offset > max_ext_offset)
+					max_ext_offset = entry->extent_offset;
+				if (entry->extent_length > max_ext_length)
+					max_ext_length = entry->extent_length;
+			}
+			continue;
+		}
+
+		entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
+		if (!entry) continue;
+
+		GF_ISOSample *samp = gf_isom_get_sample_info(movie, gf_isom_get_track_by_id(movie, iinf->tk_id), iinf->sample_num, NULL, &entry->extent_offset);
+		if (samp) gf_isom_sample_del(&samp);
+		entry->extent_offset -= iloc->base_offset;
+		if (entry->extent_offset > max_ext_offset)
+			max_ext_offset = entry->extent_offset;
+		if (entry->extent_length > max_ext_length)
+			max_ext_length = entry->extent_length;
+	}
+
+	/*update offset & size length fields*/
+	if (max_base_offset>0xFFFFFFFF) meta->item_locations->base_offset_size = 8;
+	else if (max_base_offset) meta->item_locations->base_offset_size = 4;
+
+	if (max_ext_length>0xFFFFFFFF) meta->item_locations->length_size = 8;
+	else if (max_ext_length) meta->item_locations->length_size = 4;
+
+	if (max_ext_offset>0xFFFFFFFF) meta->item_locations->offset_size = 8;
+	else if (max_ext_offset) meta->item_locations->offset_size = 4;
+
+	//and re-switch our table. We have to do it that way because it is
+	//needed when the moov is written first
+	if (writers) {
+		i=0;
+		while ((writer = (TrackWriter*)gf_list_enum(writers, &i))) {
+			//don't delete them !!!
+			stsc = writer->stsc;
+			stco = writer->stco;
+			writer->stsc = writer->stbl->SampleToChunk;
+			writer->stco = writer->stbl->ChunkOffset;
+			s32 stsc_pos = gf_list_del_item(writer->stbl->child_boxes, writer->stsc);
+			s32 stco_pos = gf_list_del_item(writer->stbl->child_boxes, writer->stco);
+
+			writer->stbl->SampleToChunk = stsc;
+			writer->stbl->ChunkOffset = stco;
+			gf_list_insert(writer->stbl->child_boxes, stsc, stsc_pos);
+			gf_list_insert(writer->stbl->child_boxes, stco, stco_pos);
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err store_meta_item_references(GF_ISOFile *movie, GF_List *writers, GF_MetaBox *meta)
+{
+	u32 i, count;
+	GF_Err e = store_meta_item_sample_ref_offsets(movie, writers, meta);
+	if (e) return e;
+
+	if (!meta->use_item_item_sharing) return GF_OK;
+
+	count = gf_list_count(meta->item_locations->location_entries);
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_ItemExtentEntry *entry;
+		GF_ItemLocationEntry *iloc = (GF_ItemLocationEntry *)gf_list_get(meta->item_locations->location_entries, i);
+		/*get item info*/
+		GF_ItemInfoEntryBox *iinf = NULL;
+		j=0;
+		while ((iinf = (GF_ItemInfoEntryBox *)gf_list_enum(meta->item_infos->item_infos, &j))) {
+			if (iinf->item_ID==iloc->item_ID) break;
+		}
+		if (!iinf) continue;
+		if (iinf->ref_it_id) continue;
+
+		entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
+		if (!entry) continue;
+
+		for (j=i+1; j<count; j++) {
+			u32 k;
+			GF_ItemExtentEntry *entry2;
+			GF_ItemLocationEntry *iloc2 = (GF_ItemLocationEntry *)gf_list_get(meta->item_locations->location_entries, j);
+			/*get item info*/
+			GF_ItemInfoEntryBox *iinf2 = NULL;
+			k=0;
+			while ((iinf2 = (GF_ItemInfoEntryBox *)gf_list_enum(meta->item_infos->item_infos, &k))) {
+				if (iinf2->item_ID==iloc2->item_ID) break;
+			}
+			if (!iinf2) continue;
+			if (!iinf2->ref_it_id) continue;
+			if (iinf2->ref_it_id != iinf->item_ID) continue;
+
+			entry2 = (GF_ItemExtentEntry *)gf_list_get(iloc2->extent_entries, 0);
+			if (!entry2) continue;
+			entry2->extent_length = entry->extent_length;
+			entry2->extent_offset = entry->extent_offset;
+			iloc2->base_offset = iloc->base_offset;
+		}
+	}
+	return GF_OK;
+}
+
 GF_Err DoWriteMeta(GF_ISOFile *file, GF_MetaBox *meta, GF_BitStream *bs, Bool Emulation, u64 baseOffset, u64 *mdatSize)
 {
 	GF_ItemExtentEntry *entry;
@@ -548,8 +758,9 @@
 
 	maxExtendOffset = 0;
 	maxExtendSize = 0;
-	*mdatSize = 0;
+	if (mdatSize) *mdatSize = 0;
 	if (!meta->item_locations) return GF_OK;
+	if (!meta->item_infos) return GF_OK;
 
 	count = gf_list_count(meta->item_locations->location_entries);
 	for (i=0; i<count; i++) {
@@ -571,18 +782,23 @@
 			}
 		}
 
+		if (!iinf || iinf->ref_it_id) {
+			continue;
+		}
+
 		it_size = 0;
 		/*for self contained only*/
 		if (!iloc->data_reference_index) {
-			if (iloc->construction_method != 2) {
+			//update offset only if not idat nor item ref offset
+			if (! iloc->construction_method) {
 				iloc->base_offset = baseOffset;
 			}
 
 			/*new resource*/
-			if (iinf && iinf->full_path) {
+			if (iinf->full_path || (iinf->tk_id && iinf->sample_num)) {
 				FILE *src=NULL;
 
-				if (!iinf->data_len) {
+				if (!iinf->data_len && iinf->full_path) {
 					src = gf_fopen(iinf->full_path, "rb");
 					if (!src) continue;
 					it_size = gf_fsize(src);
@@ -600,9 +816,20 @@
 				entry->extent_offset = 0;
 				entry->extent_length = it_size;
 
+				//shared data, do not count it
+				if (iinf->tk_id && iinf->sample_num) {
+					it_size = 0;
+//					maxExtendOffset = 0xFFFFFFFFFFUL;
+					if (Emulation) {
+						meta->use_item_sample_sharing = 1;
+					}
+				}
+
 				/*OK write to mdat*/
 				if (!Emulation) {
-					if (src) {
+					if (iinf->tk_id && iinf->sample_num) {
+					}
+					else if (src) {
 						char cache_data[4096];
 						u64 remain = entry->extent_length;
 						while (remain) {
@@ -623,9 +850,11 @@
 				while ((entry = (GF_ItemExtentEntry *)gf_list_enum(iloc->extent_entries, &j))) {
 					if (entry->extent_index) continue;
 					if (j && (maxExtendOffset<it_size) ) maxExtendOffset = it_size;
-					/*compute new offset*/
-					entry->extent_offset = baseOffset + it_size;
 
+					//update offset only if not idat nor item ref offset
+					if (! iloc->construction_method) {
+						entry->extent_offset = it_size;
+					}
 					it_size += entry->extent_length;
 					if (maxExtendSize<entry->extent_length) maxExtendSize = entry->extent_length;
 
@@ -645,7 +874,8 @@
 				}
 			}
 			baseOffset += it_size;
-			*mdatSize += it_size;
+			if (mdatSize)
+				*mdatSize += it_size;
 		} else {
 			/*we MUST have at least one extent for the dref data*/
 			if (!gf_list_count(iloc->extent_entries)) {
@@ -659,6 +889,7 @@
 			entry->extent_length = 0;
 		}
 	}
+
 	/*update offset & size length fields*/
 	if (baseOffset>0xFFFFFFFF) meta->item_locations->base_offset_size = 8;
 	else if (baseOffset) meta->item_locations->base_offset_size = 4;
@@ -693,7 +924,7 @@
 			StartOffset += size;
 		}
 		if (movie->moov && movie->moov->meta) {
-			e = DoWriteMeta(movie, movie->meta, bs, Emulation, StartOffset, &size);
+			e = DoWriteMeta(movie, movie->moov->meta, bs, Emulation, StartOffset, &size);
 			if (e) return e;
 			mdatSize += size;
 			StartOffset += size;
@@ -701,7 +932,7 @@
 		i=0;
 		while ((writer = (TrackWriter*)gf_list_enum(writers, &i))) {
 			if (writer->mdia->mediaTrack->meta) {
-				e = DoWriteMeta(movie, movie->meta, bs, Emulation, StartOffset, &size);
+				e = DoWriteMeta(movie, writer->mdia->mediaTrack->meta, bs, Emulation, StartOffset, &size);
 				if (e) return e;
 				mdatSize += size;
 				StartOffset += size;
@@ -783,7 +1014,7 @@
 
 
 //write the file track by track, with moov box before or after the mdat
-static GF_Err WriteFlat(MovieWriter *mw, u8 moovFirst, GF_BitStream *bs, Bool non_seakable, Bool for_fragments, GF_BitStream *moov_bs)
+static GF_Err WriteFlat(MovieWriter *mw, u8 moovFirst, GF_BitStream *bs, Bool non_seekable, Bool for_fragments, GF_BitStream *moov_bs)
 {
 	GF_Err e;
 	u32 i;
@@ -805,7 +1036,7 @@
 	if (e) goto exit;
 
 	if (!moovFirst) {
-		if ((movie->openMode == GF_ISOM_OPEN_WRITE) && !non_seakable) {
+		if ((movie->openMode == GF_ISOM_OPEN_WRITE) && !non_seekable) {
 			begin = 0;
 			totSize = gf_isom_datamap_get_offset(movie->editFileMap);
 			/*start boxes have not been written yet, do it*/
@@ -825,6 +1056,14 @@
 					totSize += movie->brand->size;
 					begin += movie->brand->size;
 				}
+				if (movie->otyp) {
+					e = gf_isom_box_size((GF_Box *)movie->otyp);
+					if (e) goto exit;
+					e = gf_isom_box_write((GF_Box *)movie->otyp, movie->editFileMap->bs);
+					if (e) goto exit;
+					totSize += movie->otyp->size;
+					begin += movie->otyp->size;
+				}
 				if (movie->pdin) {
 					e = gf_isom_box_size((GF_Box *)movie->pdin);
 					if (e) goto exit;
@@ -835,11 +1074,24 @@
 				}
 			} else {
 				if (movie->is_jp2) begin += 12;
-				if (movie->brand) begin += movie->brand->size;
-				if (movie->pdin) begin += movie->pdin->size;
+				if (movie->brand) {
+					e = gf_isom_box_size((GF_Box *)movie->brand);
+					if (e) goto exit;
+					begin += movie->brand->size;
+				}
+				if (movie->otyp) {
+					e = gf_isom_box_size((GF_Box *)movie->otyp);
+					if (e) goto exit;
+					begin += movie->otyp->size;
+				}
+				if (movie->pdin) {
+					e = gf_isom_box_size((GF_Box *)movie->pdin);
+					if (e) goto exit;
+					begin += movie->pdin->size;
+				}
 			}
 			totSize -= begin;
-		} else if (!non_seakable || for_fragments) {
+		} else if (!non_seekable || for_fragments) {
 			if (movie->is_jp2) {
 				gf_bs_write_u32(bs, 12);
 				gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_JP);
@@ -851,6 +1103,12 @@
 				e = gf_isom_box_write((GF_Box *)movie->brand, bs);
 				if (e) goto exit;
 			}
+			if (movie->otyp) {
+				e = gf_isom_box_size((GF_Box *)movie->otyp);
+				if (e) goto exit;
+				e = gf_isom_box_write((GF_Box *)movie->otyp, bs);
+				if (e) goto exit;
+			}
 			/*then progressive download*/
 			if (movie->pdin) {
 				e = gf_isom_box_size((GF_Box *)movie->pdin);
@@ -869,6 +1127,7 @@
 			case GF_ISOM_BOX_TYPE_META:
 				moov_meta_pos = i-1;
 			case GF_ISOM_BOX_TYPE_FTYP:
+			case GF_ISOM_BOX_TYPE_OTYP:
 			case GF_ISOM_BOX_TYPE_PDIN:
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 			case GF_ISOM_BOX_TYPE_AFRA:
@@ -883,7 +1142,7 @@
 					if (e) goto exit;
 					continue;
 				}
-				if (non_seakable) {
+				if (non_seekable) {
 					begin = gf_bs_get_position(bs);
 					//do a sim pass to get the true mdat size
 					e = DoWrite(mw, writers, bs, 1, begin);
@@ -957,6 +1216,10 @@
 				if (e) goto exit;
 			}
 		}
+		//get real sample offsets for meta items
+		if (movie->meta) {
+			store_meta_item_references(movie, writers, movie->meta);
+		}
 		//OK, write the movie box.
 		e = WriteMoovAndMeta(movie, writers, moov_bs ? moov_bs : bs);
 		if (e) goto exit;
@@ -1001,6 +1264,7 @@
 			case GF_ISOM_BOX_TYPE_MOOV:
 			case GF_ISOM_BOX_TYPE_META:
 			case GF_ISOM_BOX_TYPE_FTYP:
+			case GF_ISOM_BOX_TYPE_OTYP:
 			case GF_ISOM_BOX_TYPE_PDIN:
 			case GF_ISOM_BOX_TYPE_MDAT:
 				break;
@@ -1030,6 +1294,12 @@
 		e = gf_isom_box_write((GF_Box *)movie->brand, bs);
 		if (e) goto exit;
 	}
+	if (movie->otyp) {
+		e = gf_isom_box_size((GF_Box *)movie->otyp);
+		if (e) goto exit;
+		e = gf_isom_box_write((GF_Box *)movie->otyp, bs);
+		if (e) goto exit;
+	}
 	/*then progressive dnload*/
 	if (movie->pdin) {
 		e = gf_isom_box_size((GF_Box *)movie->pdin);
@@ -1047,6 +1317,7 @@
 			moov_meta_pos = i-1;
 			break;
 		case GF_ISOM_BOX_TYPE_FTYP:
+		case GF_ISOM_BOX_TYPE_OTYP:
 		case GF_ISOM_BOX_TYPE_PDIN:
 		case GF_ISOM_BOX_TYPE_MDAT:
 			break;
@@ -1111,6 +1382,7 @@
 		case GF_ISOM_BOX_TYPE_MOOV:
 		case GF_ISOM_BOX_TYPE_META:
 		case GF_ISOM_BOX_TYPE_FTYP:
+		case GF_ISOM_BOX_TYPE_OTYP:
 		case GF_ISOM_BOX_TYPE_PDIN:
 		case GF_ISOM_BOX_TYPE_MDAT:
 			break;
@@ -1138,7 +1410,7 @@
 	s64 res;
 	u32 descIndex, sampSize, chunkNumber;
 	u16 curGroupID, curTrackPriority;
-	Bool forceNewChunk, writeGroup;
+	Bool forceNewChunk=0, writeGroup;
 	GF_StscEntry *stsc_ent;
 	//this is used to emulate the write ...
 	u64 offset, totSize, sampOffset;
@@ -1388,9 +1660,9 @@
 					stbl_GetSampleDTS_and_Duration(tmp->stbl->TimeToSample, tmp->sampleNumber, &DTS, &sample_dur);
 
 					//can this sample fit in our chunk ?
-					if ( ( (DTS - tmp->DTSprev) + tmp->chunkDur) * moov_timescale > movie->interleavingTime * tmp->timeScale
+					if (gf_timestamp_greater((DTS - tmp->DTSprev) + tmp->chunkDur, tmp->timeScale, movie->interleavingTime, moov_timescale)
 					 /*drift check: reject sample if outside our check window*/
-					 || (drift_inter && chunkLastDTS && ( ((u64)tmp->DTSprev*chunkLastScale) > ((u64)chunkLastDTS*tmp->timeScale)) )
+					 || (drift_inter && chunkLastDTS && gf_timestamp_greater(tmp->DTSprev, tmp->timeScale, chunkLastDTS, chunkLastScale) )
 					 ) {
 						//in case the sample is longer than InterleaveTime
 						if (!tmp->chunkDur) {
@@ -1509,6 +1781,34 @@
 }
 
 
+static GF_Err write_blank_data(GF_BitStream *bs, u32 size)
+{
+	u8 data[1000];
+
+	memset(data, 0, 1000);
+	strcpy(data, gf_sys_is_test_mode() ? GPAC_ISOM_CPRT_NOTICE : GPAC_ISOM_CPRT_NOTICE_VERSION);
+
+	while (size) {
+		if (size > 1000) {
+			gf_bs_write_data(bs, data, 1000);
+			size-=1000;
+		} else {
+			gf_bs_write_data(bs, data, size);
+			break;
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err write_free_box(GF_BitStream *bs, u32 size)
+{
+	if (size<8) return GF_BAD_PARAM;
+	gf_bs_write_u32(bs, size);
+	gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_FREE);
+	return write_blank_data(bs, size-8);
+}
+
+
 static GF_Err WriteInterleaved(MovieWriter *mw, GF_BitStream *bs, Bool drift_inter)
 {
 	GF_Err e;
@@ -1520,9 +1820,10 @@
 	GF_ISOFile *movie = mw->movie;
 
 	//first setup the writers
-	e = SetupWriters(mw, writers, 1);
-	if (e) goto exit;
-
+	if (movie->no_inplace_rewrite) {
+		e = SetupWriters(mw, writers, 1);
+		if (e) goto exit;
+	}
 
 	if (movie->is_jp2) {
 		gf_bs_write_u32(bs, 12);
@@ -1535,6 +1836,12 @@
 		e = gf_isom_box_write((GF_Box *)movie->brand, bs);
 		if (e) goto exit;
 	}
+	if (movie->otyp) {
+		e = gf_isom_box_size((GF_Box *)movie->otyp);
+		if (e) goto exit;
+		e = gf_isom_box_write((GF_Box *)movie->otyp, bs);
+		if (e) goto exit;
+	}
 	if (movie->pdin) {
 		e = gf_isom_box_size((GF_Box *)movie->pdin);
 		if (e) goto exit;
@@ -1551,6 +1858,7 @@
 			moov_meta_pos = i-1;
 			break;
 		case GF_ISOM_BOX_TYPE_FTYP:
+		case GF_ISOM_BOX_TYPE_OTYP:
 		case GF_ISOM_BOX_TYPE_PDIN:
 		case GF_ISOM_BOX_TYPE_MDAT:
 			break;
@@ -1578,12 +1886,24 @@
 	if (e) goto exit;
 
 	firstSize = GetMoovAndMetaSize(movie, writers);
+	if (movie->padding)
+		firstSize += movie->padding;
+
 	offset = firstSize;
 	if (movie->mdat && movie->mdat->dataSize) offset += 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
 	e = ShiftOffset(movie, writers, offset);
 	if (e) goto exit;
+
+	//get real sample offsets for meta items
+	if (movie->meta) {
+		store_meta_item_references(movie, writers, movie->meta);
+	}
+
 	//get the size and see if it has changed (eg, we moved to 64 bit offsets)
 	finalSize = GetMoovAndMetaSize(movie, writers);
+	if (movie->padding)
+		finalSize += movie->padding;
+
 	if (firstSize != finalSize) {
 		finalOffset = finalSize;
 		if (movie->mdat && movie->mdat->dataSize) finalOffset += 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
@@ -1593,11 +1913,22 @@
 		e = ShiftOffset(movie, writers, finalOffset - offset);
 		if (e) goto exit;
 		/*firstSize = */GetMoovAndMetaSize(movie, writers);
+
+		//readjust real sample offsets for meta items
+		if (movie->meta) {
+			store_meta_item_references(movie, writers, movie->meta);
+		}
 	}
+
 	//now write our stuff
 	e = WriteMoovAndMeta(movie, writers, bs);
 	if (e) goto exit;
 
+	if (movie->padding) {
+		e = write_free_box(bs, movie->padding);
+		if (e) goto exit;
+	}
+
 	/*we have 8 extra bytes for large size (not computed in gf_isom_box_size) */
 	if (movie->mdat && movie->mdat->dataSize) {
 		if (movie->mdat->dataSize > 0xFFFFFFFF) movie->mdat->dataSize += 8;
@@ -1612,7 +1943,6 @@
 	e = DoInterleave(mw, writers, bs, 0, 0, drift_inter);
 	if (e) goto exit;
 
-
 	//then the rest
 	i=0;
 	while ((a = (GF_Box*)gf_list_enum(movie->TopBoxes, &i))) {
@@ -1622,6 +1952,7 @@
 		case GF_ISOM_BOX_TYPE_MOOV:
 		case GF_ISOM_BOX_TYPE_META:
 		case GF_ISOM_BOX_TYPE_FTYP:
+		case GF_ISOM_BOX_TYPE_OTYP:
 		case GF_ISOM_BOX_TYPE_PDIN:
 		case GF_ISOM_BOX_TYPE_MDAT:
 			break;
@@ -1639,6 +1970,393 @@
 	return e;
 }
 
+
+void purge_free_boxes(GF_Box *par)
+{
+	u32 i, count = gf_list_count(par->child_boxes);
+	for (i=0; i<count; i++) {
+		GF_Box *child = gf_list_get(par->child_boxes, i);
+		if ((child->type==GF_ISOM_BOX_TYPE_FREE) || (child->type==GF_ISOM_BOX_TYPE_SKIP)) {
+			gf_list_rem(par->child_boxes, i);
+			i--;
+			count--;
+			gf_isom_box_del(child);
+			continue;
+		}
+
+		if (child->type==GF_ISOM_BOX_TYPE_UDTA) {
+			GF_UserDataBox *udta = (GF_UserDataBox *)child;
+			u32 k, nb_maps = gf_list_count(udta->recordList);
+			for (k=0; k<nb_maps; k++) {
+				GF_UserDataMap *map = gf_list_get(udta->recordList, k);
+				if ((map->boxType == GF_ISOM_BOX_TYPE_FREE) || (map->boxType == GF_ISOM_BOX_TYPE_SKIP)) {
+					gf_isom_box_array_del(map->boxes);
+					gf_free(map);
+					gf_list_rem(udta->recordList, k);
+					k--;
+					nb_maps--;
+				}
+			}
+		}
+		purge_free_boxes(child);
+	}
+}
+
+static GF_Err inplace_shift_moov_meta_offsets(GF_ISOFile *movie, u32 shift_offset)
+{
+	u32 i, count = 0;
+	if (movie->meta) {
+		ShiftMetaOffset(movie->meta, shift_offset);
+	}
+
+	if (movie->moov) {
+		if (movie->moov->meta) 
+			ShiftMetaOffset(movie->moov->meta, shift_offset);
+
+		count = gf_list_count(movie->moov->trackList);
+	}
+	//shift offsets
+	for (i=0; i<count; i++) {
+		GF_Err e;
+		GF_SampleTableBox *stbl;
+		GF_Box *new_stco = NULL;
+		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
+
+		if (trak->meta)
+			ShiftMetaOffset(trak->meta, shift_offset);
+
+		stbl = trak->Media->information->sampleTable;
+		e = shift_chunk_offsets(stbl->SampleToChunk, trak->Media, stbl->ChunkOffset, shift_offset, movie->force_co64, &new_stco);
+		if (e) return e;
+
+		if (new_stco) {
+			gf_list_del_item(stbl->child_boxes, stbl->ChunkOffset);
+			gf_isom_box_del(stbl->ChunkOffset);
+			stbl->ChunkOffset = new_stco;
+			gf_list_add(stbl->child_boxes, new_stco);
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err inplace_shift_mdat(MovieWriter *mw, u64 *shift_offset, GF_BitStream *bs, Bool moov_first)
+{
+	GF_Err e;
+	u8 data[1024];
+	GF_ISOFile *movie = mw->movie;
+	u64 moov_size = 0;
+	u64 meta_size = 0;
+	u64 cur_r, cur_w, byte_offset, orig_offset;
+
+	orig_offset = gf_bs_get_position(bs);
+
+	if (moov_first) {
+		if (movie->meta) {
+			e = gf_isom_box_size((GF_Box *)movie->meta);
+			if (e) return e;
+			meta_size = movie->meta->size;
+		}
+		if (movie->moov) {
+			e = gf_isom_box_size((GF_Box *)movie->moov);
+			if (e) return e;
+			moov_size = movie->moov->size;
+		}
+	}
+	//shift offsets, potentially in 2 pass if we moov from 32bit offsets to 64 bit offsets
+	e = inplace_shift_moov_meta_offsets(movie, (u32) *shift_offset);
+	if (e) return e;
+
+	if (moov_first) {
+		u32 reshift = 0;
+		if (movie->meta) {
+			e = gf_isom_box_size((GF_Box *)movie->meta);
+			if (e) return e;
+			if (meta_size < movie->meta->size) {
+				reshift += (u32) (movie->meta->size - meta_size);
+			}
+		}
+		if (movie->moov) {
+			e = gf_isom_box_size((GF_Box *)movie->moov);
+			if (e) return e;
+			if (moov_size < movie->moov->size) {
+				reshift += (u32) (movie->moov->size - moov_size);
+			}
+		}
+
+		if (reshift) {
+			e = inplace_shift_moov_meta_offsets(movie, reshift);
+			if (e) return e;
+			*shift_offset += reshift;
+		}
+	}
+
+	//move data
+
+	gf_bs_seek(bs, gf_bs_get_size(bs));
+	cur_r = gf_bs_get_position(bs);
+	write_blank_data(bs, (u32) *shift_offset);
+	cur_w = gf_bs_get_position(bs);
+
+	byte_offset = movie->first_data_toplevel_offset;
+
+	mw->total_samples = cur_r - byte_offset;
+	mw->nb_done = 0;
+	muxer_report_progress(mw);
+
+	while (cur_r > byte_offset) {
+		u32 nb_write;
+		u32 move_bytes = 1024;
+		if (cur_r - byte_offset < move_bytes)
+			move_bytes = (u32) (cur_r - byte_offset);
+
+		gf_bs_seek(bs, cur_r - move_bytes);
+		nb_write = (u32) gf_bs_read_data(bs, data, move_bytes);
+		if (nb_write!=move_bytes) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[Isom] Read error, got %d bytes but had %d to read\n", nb_write, move_bytes));
+			return GF_IO_ERR;
+		}
+
+		gf_bs_seek(bs, cur_w - move_bytes);
+		nb_write = (u32) gf_bs_write_data(bs, data, move_bytes);
+
+		if (nb_write!=move_bytes) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOM] Write error, wrote %d bytes but had %d to write\n", nb_write, move_bytes));
+			return GF_IO_ERR;
+		}
+		cur_r -= move_bytes;
+		cur_w -= move_bytes;
+
+		mw->nb_done += move_bytes;
+		muxer_report_progress(mw);
+	}
+	gf_bs_seek(bs, orig_offset);
+
+	return GF_OK;
+}
+
+static GF_Err WriteInplace(MovieWriter *mw, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 i;
+	u64 size=0;
+	u64 offset, shift_offset;
+	Bool moov_first;
+	u32 mdat_offset = 0;
+	u64 moov_meta_offset;
+	u32 rewind_meta=0;
+	u64 shift_meta = 0;
+	s32 moov_meta_pos=-1;
+	s32 mdat_pos=-1;
+	GF_Box *a;
+	GF_ISOFile *movie = mw->movie;
+
+	//get size of all boxes before moov/meta/mdat
+	if (movie->is_jp2) mdat_offset += 12;
+	if (movie->brand) {
+		e = gf_isom_box_size((GF_Box *)movie->brand);
+		if (e) return e;
+		mdat_offset += (u32) movie->brand->size;
+	}
+	if (movie->otyp) {
+		e = gf_isom_box_size((GF_Box *)movie->otyp);
+		if (e) return e;
+		mdat_offset += (u32) movie->otyp->size;
+	}
+	if (movie->pdin) {
+		e = gf_isom_box_size((GF_Box *)movie->pdin);
+		if (e) return e;
+		mdat_offset += (u32) movie->pdin->size;
+	}
+
+	i=0;
+	while ((a = (GF_Box*)gf_list_enum(movie->TopBoxes, &i))) {
+		switch (a->type) {
+		case GF_ISOM_BOX_TYPE_MOOV:
+		case GF_ISOM_BOX_TYPE_META:
+			moov_meta_pos = i-1;
+			break;
+		case GF_ISOM_BOX_TYPE_MDAT:
+			mdat_pos = i-1;
+			break;
+		case GF_ISOM_BOX_TYPE_FTYP:
+		case GF_ISOM_BOX_TYPE_OTYP:
+		case GF_ISOM_BOX_TYPE_PDIN:
+			break;
+		default:
+			if ((moov_meta_pos<0) && (mdat_pos<0) ) {
+				e = gf_isom_box_size(a);
+				if (e) return e;
+				mdat_offset += (u32) a->size;
+			}
+			break;
+		}
+	}
+
+	if (movie->meta) {
+		purge_free_boxes((GF_Box*)movie->meta);
+		store_meta_item_references(movie, NULL, movie->meta);
+	}
+	if (movie->moov)
+		purge_free_boxes((GF_Box*)movie->moov);
+
+	moov_meta_offset = movie->original_moov_offset;
+	if (movie->original_meta_offset && (moov_meta_offset > movie->original_meta_offset))
+		moov_meta_offset = movie->original_meta_offset;
+
+	//mdat was before moof, check if we need to shift it due to brand changes
+	if (moov_meta_offset > movie->first_data_toplevel_offset) {
+		moov_first = GF_FALSE;
+		if (mdat_offset < movie->first_data_toplevel_offset) {
+			rewind_meta = (u32) movie->first_data_toplevel_offset - mdat_offset;
+			if ((movie->first_data_toplevel_size<0xFFFFFFFFUL)
+				&& (movie->first_data_toplevel_size+rewind_meta > 0xFFFFFFFFUL)
+				&& (rewind_meta<8)
+			) {
+				shift_meta = 8 - rewind_meta;
+			}
+		} else {
+			shift_meta = mdat_offset - (u32) movie->first_data_toplevel_offset;
+		}
+
+		if (shift_meta) {
+			e = inplace_shift_mdat(mw, &shift_meta, bs, GF_FALSE);
+			if (e) return e;
+			moov_meta_offset += shift_meta;
+		}
+	} else {
+		moov_first = GF_TRUE;
+	}
+
+	//write everything before moov/meta/mdat
+	if (movie->is_jp2) {
+		gf_bs_write_u32(bs, 12);
+		gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_JP);
+		gf_bs_write_u32(bs, 0x0D0A870A);
+	}
+	if (movie->brand) {
+		e = gf_isom_box_write((GF_Box *)movie->brand, bs);
+		if (e) return e;
+	}
+	if (movie->otyp) {
+		e = gf_isom_box_write((GF_Box *)movie->otyp, bs);
+		if (e) return e;
+	}
+	if (movie->pdin) {
+		e = gf_isom_box_write((GF_Box *)movie->pdin, bs);
+		if (e) return e;
+	}
+
+	//write all boxes before moov
+	i=0;
+	while ((a = (GF_Box*)gf_list_enum(movie->TopBoxes, &i))) {
+		switch (a->type) {
+		case GF_ISOM_BOX_TYPE_MOOV:
+		case GF_ISOM_BOX_TYPE_META:
+		case GF_ISOM_BOX_TYPE_FTYP:
+		case GF_ISOM_BOX_TYPE_OTYP:
+		case GF_ISOM_BOX_TYPE_PDIN:
+		case GF_ISOM_BOX_TYPE_MDAT:
+			break;
+		default:
+			if (((s32) (i-1) < moov_meta_pos) && ((s32)(i-1) < mdat_pos)) {
+				e = gf_isom_box_write(a, bs);
+				if (e) return e;
+			}
+			break;
+		}
+	}
+
+	if (!moov_first) {
+		if (rewind_meta) {
+			//rewrite mdat header
+			u64 mdat_size = movie->first_data_toplevel_size + rewind_meta;
+			if (mdat_size>0xFFFFFFUL) gf_bs_write_u32(bs, 1);
+			else gf_bs_write_u32(bs, (u32) mdat_size);
+			gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_MDAT);
+			if (mdat_size>0xFFFFFFUL) gf_bs_write_u64(bs, mdat_size);
+		}
+
+		gf_bs_seek(bs, moov_meta_offset);
+		if (movie->meta) {
+			e = gf_isom_box_size((GF_Box *)movie->meta);
+			if (e) return e;
+			e = gf_isom_box_write((GF_Box *)movie->meta, bs);
+			if (e) return e;
+		}
+		if (movie->moov) {
+			e = gf_isom_box_size((GF_Box *)movie->moov);
+			if (e) return e;
+			e = gf_isom_box_write((GF_Box *)movie->moov, bs);
+			if (e) return e;
+		}
+		//trash all boxes after moov/meta
+		size = gf_bs_get_size(bs);
+		offset = gf_bs_get_position(bs);
+		//size has reduced, pad at end with a free box
+		if (offset < size) {
+			u32 free_size = 0;
+			if (size - offset > 8)
+				free_size = (u32) (size - offset - 8);
+
+			gf_bs_write_u32(bs, free_size+8);
+			gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_FREE);
+			while (free_size) {
+				gf_bs_write_u8(bs, 0);
+				free_size--;
+			}
+		}
+		return GF_OK;
+	}
+
+	//moov+meta before mdat, remember start pos and compute moov/meta size
+	offset = gf_bs_get_position(bs);
+	if (movie->meta) {
+		e = gf_isom_box_size((GF_Box *)movie->meta);
+		if (e) return e;
+		size += movie->meta->size;
+		if (movie->meta->size > 0xFFFFFFFF) size += 8;
+	}
+	if (movie->moov) {
+		e = gf_isom_box_size((GF_Box *)movie->moov);
+		if (e) return e;
+		size += movie->moov->size;
+		if (movie->moov->size > 0xFFFFFFFF) size += 8;
+	}
+
+	shift_offset = 0;
+	//we need to shift mdat
+	if (offset + size > movie->first_data_toplevel_offset) {
+		shift_offset = 8 + offset + size - movie->first_data_toplevel_offset;
+	} else {
+		u64 pad = movie->first_data_toplevel_offset - offset - size;
+		//less than 8 bytes available between end of moov/meta and original mdat, shift so that we can insert a free box
+		if (pad < 8) {
+			shift_offset = 8 - pad;
+		}
+	}
+	if (movie->padding && (shift_offset < movie->padding))
+		shift_offset = movie->padding;
+
+	//move data
+	if (shift_offset) {
+		e = inplace_shift_mdat(mw, &shift_offset, bs, GF_TRUE);
+		if (e) return e;
+	}
+	//write meta and moov
+	if (movie->meta) {
+		e = gf_isom_box_write((GF_Box *)movie->meta, bs);
+		if (e) return e;
+	}
+	if (movie->moov) {
+		e = gf_isom_box_write((GF_Box *)movie->moov, bs);
+		if (e) return e;
+	}
+	//insert a free box in-between
+	size = movie->first_data_toplevel_offset + shift_offset - gf_bs_get_position(bs);
+	return write_free_box(bs, (u32) size);
+}
+
+
 extern u32 default_write_buffering_size;
 GF_Err gf_isom_flush_chunk(GF_TrackBox *trak, Bool is_final);
 
@@ -1656,6 +2374,34 @@
 	memset(&mw, 0, sizeof(mw));
 	mw.movie = movie;
 
+	if ((movie->compress_flags & GF_ISOM_COMP_WRAP_FTYPE) && !movie->otyp && movie->brand) {
+		u32 i, found=0;
+		for (i=0; i<movie->brand->altCount; i++) {
+			if ((movie->brand->altBrand[i] == GF_ISOM_BRAND_COMP)
+				|| (movie->brand->altBrand[i] == GF_ISOM_BRAND_ISOC)
+			) {
+				found = 1;
+				break;
+			}
+		}
+		if (!found) {
+			u32 brand = (movie->compress_mode==GF_ISOM_COMP_ALL) ? GF_ISOM_BRAND_COMP : GF_ISOM_BRAND_ISOC;
+			u32 pos = gf_list_find(movie->TopBoxes, movie->brand);
+			GF_Box *otyp = gf_isom_box_new(GF_ISOM_BOX_TYPE_OTYP);
+			gf_list_rem(movie->TopBoxes, pos);
+			gf_list_insert(movie->TopBoxes, otyp, pos);
+			otyp->child_boxes = gf_list_new();
+			gf_list_add(otyp->child_boxes, movie->brand);
+			movie->otyp = otyp;
+			movie->brand = (GF_FileTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_FTYP);
+			gf_list_insert(movie->TopBoxes, movie->brand, pos);
+			movie->brand->majorBrand = brand;
+			movie->brand->altCount = 1;
+			movie->brand->altBrand = gf_malloc(sizeof(u32));
+			movie->brand->altBrand[0] = brand;
+		}
+	}
+
 
 	if (movie->moov) {
 		u32 i;
@@ -1669,7 +2415,7 @@
 			if (gf_sys_is_test_mode()) {
 				trak->Header->creationTime = 0;
 				trak->Header->modificationTime = 0;
-				if (trak->Media->handler->nameUTF8 && strstr(trak->Media->handler->nameUTF8, "@GPAC")) {
+				if (trak->Media->handler && trak->Media->handler->nameUTF8 && strstr(trak->Media->handler->nameUTF8, "@GPAC")) {
 					gf_free(trak->Media->handler->nameUTF8);
 					trak->Media->handler->nameUTF8 = gf_strdup("MediaHandler");
 				}
@@ -1762,6 +2508,7 @@
 		FILE *stream=NULL;
 		Bool is_stdout = GF_FALSE;
 		GF_BitStream *bs=NULL;
+
 		if (!strcmp(movie->finalName, "_gpac_isobmff_redirect")) {
 			if (!movie->on_block_out) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] Missing output block callback, cannot write\n"));
@@ -1769,6 +2516,12 @@
 			}
 			bs = gf_bs_new_cbk(movie->on_block_out, movie->on_block_out_usr_data, movie->on_block_out_block_size);
 			is_stdout = GF_TRUE;
+		} else if (gf_isom_is_inplace_rewrite(movie)) {
+			stream = gf_fopen(movie->fileName, "r+b");
+			if (!stream)
+				return GF_IO_ERR;
+			bs = gf_bs_from_file(stream, GF_BITSTREAM_WRITE);
+			gf_bs_seek(bs, 0);
 		} else {
 			if (!strcmp(movie->finalName, "std"))
 				is_stdout = GF_TRUE;
@@ -1785,20 +2538,24 @@
 			return GF_OUT_OF_MEM;
 		}
 
-		switch (movie->storageMode) {
-		case GF_ISOM_STORE_TIGHT:
-		case GF_ISOM_STORE_INTERLEAVED:
-			e = WriteInterleaved(&mw, bs, 0);
-			break;
-		case GF_ISOM_STORE_DRIFT_INTERLEAVED:
-			e = WriteInterleaved(&mw, bs, 1);
-			break;
-		case GF_ISOM_STORE_STREAMABLE:
-			e = WriteFlat(&mw, 1, bs, is_stdout, GF_FALSE, NULL);
-			break;
-		default:
-			e = WriteFlat(&mw, 0, bs, is_stdout, GF_FALSE, NULL);
-			break;
+		if (movie->no_inplace_rewrite) {
+			switch (movie->storageMode) {
+			case GF_ISOM_STORE_TIGHT:
+			case GF_ISOM_STORE_INTERLEAVED:
+				e = WriteInterleaved(&mw, bs, 0);
+				break;
+			case GF_ISOM_STORE_DRIFT_INTERLEAVED:
+				e = WriteInterleaved(&mw, bs, 1);
+				break;
+			case GF_ISOM_STORE_STREAMABLE:
+				e = WriteFlat(&mw, 1, bs, is_stdout, GF_FALSE, NULL);
+				break;
+			default:
+				e = WriteFlat(&mw, 0, bs, is_stdout, GF_FALSE, NULL);
+				break;
+			}
+		} else {
+			e = WriteInplace(&mw, bs);
 		}
 
 		gf_bs_del(bs);

gpac-1.0.1.tar.gz/src/isomedia/isom_write.c -> gpac-2.0.0.tar.gz/src/isomedia/isom_write.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -57,7 +57,10 @@
 GF_Err FlushCaptureMode(GF_ISOFile *movie)
 {
 	GF_Err e;
-	if (movie->openMode != GF_ISOM_OPEN_WRITE) return GF_OK;
+	if (movie->openMode != GF_ISOM_OPEN_WRITE) {
+		if (!movie->editFileMap) return GF_ISOM_INVALID_MODE;
+		return GF_OK;
+	}
 	/*make sure nothing was added*/
 	if (gf_bs_get_position(movie->editFileMap->bs)) return GF_OK;
 
@@ -124,7 +127,7 @@
 	iods = (GF_ObjectDescriptorBox *) gf_isom_box_new_parent(&moov->child_boxes, GF_ISOM_BOX_TYPE_IODS);
 	if (!iods) return GF_OUT_OF_MEM;
 	iods->descriptor = od;
-	return moov_on_child_box((GF_Box*)moov, (GF_Box *)iods);
+	return moov_on_child_box((GF_Box*)moov, (GF_Box *)iods, GF_FALSE);
 }
 
 //add a track to the root OD
@@ -214,26 +217,38 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_creation_time(GF_ISOFile *movie, u64 time)
+GF_Err gf_isom_set_creation_time(GF_ISOFile *movie, u64 ctime, u64 mtime)
 {
 	if (!movie || !movie->moov) return GF_BAD_PARAM;
-	movie->moov->mvhd->creationTime = time;
-	movie->moov->mvhd->modificationTime = time;
+	movie->moov->mvhd->creationTime = ctime;
+	movie->moov->mvhd->modificationTime = mtime;
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_track_creation_time(GF_ISOFile *movie,u32 trackNumber, u64 time)
+GF_Err gf_isom_set_track_creation_time(GF_ISOFile *movie,u32 trackNumber, u64 ctime, u64 mtime)
 {
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
-	trak->Header->creationTime = time;
-	trak->Header->modificationTime = time;
+	trak->Header->creationTime = ctime;
+	trak->Header->modificationTime = mtime;
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_set_media_creation_time(GF_ISOFile *movie,u32 trackNumber, u64 ctime, u64 mtime)
+{
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	if (!trak->Media || !trak->Media->mediaHeader) return GF_ISOM_INVALID_FILE;
+
+	trak->Media->mediaHeader->creationTime = ctime;
+	trak->Media->mediaHeader->modificationTime = mtime;
+	return GF_OK;
+}
 
 //sets the enable flag of a track
 GF_EXPORT
@@ -421,6 +436,7 @@
 	GF_TrackBox *trak;
 	u32 i;
 	GF_Err e;
+	if (!timeScale) return GF_BAD_PARAM;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 	e = gf_isom_insert_moov(movie);
@@ -461,7 +477,7 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_set_pl_indication(GF_ISOFile *movie, u8 PL_Code, GF_ISOProfileLevelType ProfileLevel)
+GF_Err gf_isom_set_pl_indication(GF_ISOFile *movie, GF_ISOProfileLevelType PL_Code, u8 ProfileLevel)
 {
 	GF_IsomInitialObjectDescriptor *iod;
 	GF_Err e;
@@ -493,6 +509,8 @@
 	case GF_ISOM_PL_INLINE:
 		iod->inlineProfileFlag = ProfileLevel ? 1 : 0;
 		break;
+	default:
+		break;
 	}
 	return GF_OK;
 }
@@ -682,9 +700,6 @@
 				udta = trak->udta;
 				trak->udta = NULL;
 				gf_isom_box_del((GF_Box*)trak);
-			} else {
-				if (trak->References) gf_isom_box_del_parent(&trak->child_boxes, (GF_Box*)trak->References);
-				trak->References = NULL;
 			}
 		}
 	}
@@ -714,9 +729,9 @@
 		//OK, add this media to our track
 		mdia->mediaTrack = trak;
 
-		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) tkhd);
+		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) tkhd, GF_FALSE);
 		if (e) goto err_exit;
-		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) mdia);
+		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) mdia, GF_FALSE);
 		if (e) goto err_exit;
 		tkhd->trackID = trakID;
 
@@ -774,7 +789,7 @@
 	}
 
 	//OK, add our trak
-	e = moov_on_child_box((GF_Box*)movie->moov, (GF_Box *)trak);
+	e = moov_on_child_box((GF_Box*)movie->moov, (GF_Box *)trak, GF_FALSE);
 	if (e) goto err_exit;
 	//set the new ID available
 	if (trakID+1> movie->moov->mvhd->nextTrackID)
@@ -1245,10 +1260,11 @@
 		if (cum_dur <= dur_num || !nb_samp) return GF_OK;
 		avg_dur = (u32) (dur_num / nb_samp);
 
-		for (i=0; i<stts->nb_entries; i++) {
-			ent = (GF_SttsEntry*) &stts->entries[i];
-			ent->sampleDelta = avg_dur;
+		stts->entries[0].sampleDelta = avg_dur;
+		for (i=1; i<stts->nb_entries; i++) {
+			stts->entries[0].sampleCount += stts->entries[i].sampleCount;
 		}
+		stts->nb_entries = 1;
 		stts->w_LastDTS = dur_num - avg_dur;
 		return GF_OK;
 	}
@@ -1343,6 +1359,8 @@
 	if (e) return e;
 	if (!movie->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	gf_isom_disable_inplace_rewrite(movie);
 	return GF_OK;
 }
 
@@ -1381,6 +1399,35 @@
 	return GF_OK;
 }
 
+//for gf_isom_remove_sample and gf_isom_remove_track: check all items sharing their data with a sample being removed
+//and remove sharing flag
+// sample_number can be 0 for complete track removal
+static void gf_isom_meta_track_remove(GF_ISOFile *movie, GF_TrackBox *trak, u32 sample_number)
+{
+	u32 i, count;
+	if (!movie || !movie->meta || !movie->meta->use_item_sample_sharing)
+		return;
+
+	count = gf_list_count(movie->meta->item_locations->location_entries);
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_ItemLocationEntry *iloc = (GF_ItemLocationEntry *)gf_list_get(movie->meta->item_locations->location_entries, i);
+		/*get item info*/
+		GF_ItemInfoEntryBox *iinf = NULL;
+		j=0;
+		while ((iinf = (GF_ItemInfoEntryBox *)gf_list_enum(movie->meta->item_infos->item_infos, &j))) {
+			if (iinf->item_ID==iloc->item_ID) break;
+		}
+		if (!iinf || !iinf->tk_id) continue;
+		if (iinf->tk_id != trak->Header->trackID) continue;
+
+		if (sample_number && (iinf->sample_num != sample_number)) continue;
+		iinf->tk_id = 0;
+		iinf->sample_num = 0;
+	}
+}
+
+
 
 //Remove a given sample
 GF_EXPORT
@@ -1441,6 +1488,10 @@
 	e = stbl_RemoveSampleGroup(trak->Media->information->sampleTable, sampleNumber);
 	if (e) return e;
 
+	gf_isom_disable_inplace_rewrite(movie);
+
+	gf_isom_meta_track_remove(movie, trak, sampleNumber);
+
 	return SetTrackDuration(trak);
 }
 
@@ -1463,6 +1514,7 @@
 		if (movie->finalName) gf_free(movie->finalName);
 		movie->finalName = gf_strdup(filename);
 		if (!movie->finalName) return GF_OUT_OF_MEM;
+		gf_isom_disable_inplace_rewrite(movie);
 	}
 	return GF_OK;
 }
@@ -1537,7 +1589,7 @@
 	if (!trak->References) {
 		tref = (GF_TrackReferenceBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_TREF);
 		if (!tref) return GF_OUT_OF_MEM;
-		e = trak_on_child_box((GF_Box*)trak, (GF_Box *)tref);
+		e = trak_on_child_box((GF_Box*)trak, (GF_Box *)tref, GF_FALSE);
 		if (e) return e;
 	}
 	tref = trak->References;
@@ -1710,6 +1762,9 @@
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
+	if (hSpacing<0) hSpacing = 1;
+	if (vSpacing<0) vSpacing = 1;
+
 	GF_PixelAspectRatioBox *pasp = (GF_PixelAspectRatioBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_PASP);
 	if (!hSpacing || !vSpacing || ((hSpacing == vSpacing) && !force_par)) {
 		if (pasp) gf_isom_box_del_parent(&entry->child_boxes, (GF_Box *)pasp);
@@ -1780,11 +1835,14 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_dolby_vision_profile(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 dv_profile)
+GF_Err gf_isom_set_dolby_vision_profile(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_DOVIDecoderConfigurationRecord *dvcc)
 {
 	GF_Err e;
 	GF_TrackBox* trak;
-	GF_SampleEntryBox* entry;
+	GF_Box *dv_cfge = NULL;
+	GF_MPEGVisualSampleEntryBox* entry;
+	Bool switch_type = GF_FALSE;
+	Bool is_avc = GF_FALSE;
 	GF_SampleDescriptionBox* stsd;
 	GF_DOVIConfigurationBox* dovi = NULL;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
@@ -1798,7 +1856,7 @@
 	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox*)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
 	//no support for generic sample entries (eg, no MPEG4 descriptor)
 	if (entry == NULL) return GF_BAD_PARAM;
 	if (!movie->keep_utc)
@@ -1806,19 +1864,102 @@
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_OK;
 
-	dovi = ((GF_MPEGVisualSampleEntryBox*)entry)->dovi_config;
-	if (!dv_profile) {
-		if (dovi) gf_isom_box_del((GF_Box*)dovi);
-		((GF_MPEGVisualSampleEntryBox*)entry)->dovi_config = NULL;
+	if (dvcc) {
+		switch_type = dvcc->force_dv;
+		switch (dvcc->dv_profile) {
+		case 1:
+		case 3:
+		case 5:
+			switch_type = 1;
+			break;
+		}
+	}
+
+	switch (entry->type) {
+	case GF_ISOM_BOX_TYPE_HEV1:
+	case GF_ISOM_BOX_TYPE_HEV2:
+	case GF_ISOM_BOX_TYPE_DVHE:
+		entry->type = switch_type ? GF_ISOM_BOX_TYPE_DVHE : GF_ISOM_BOX_TYPE_HEV1;
+		break;
+	case GF_ISOM_BOX_TYPE_HVC1:
+	case GF_ISOM_BOX_TYPE_HVC2:
+	case GF_ISOM_BOX_TYPE_DVH1:
+		entry->type = switch_type ? GF_ISOM_BOX_TYPE_DVH1 : GF_ISOM_BOX_TYPE_HVC1;
+		break;
+	case GF_ISOM_BOX_TYPE_AVC1:
+	case GF_ISOM_BOX_TYPE_DVA1:
+		is_avc = GF_TRUE;
+		entry->type = switch_type ? GF_ISOM_BOX_TYPE_DVA1 : GF_ISOM_BOX_TYPE_AVC1;
+		break;
+	case GF_ISOM_BOX_TYPE_AVC3:
+	case GF_ISOM_BOX_TYPE_DVAV:
+		is_avc = GF_TRUE;
+		entry->type = switch_type ? GF_ISOM_BOX_TYPE_DVAV : GF_ISOM_BOX_TYPE_AVC3;
+		break;
+	case GF_ISOM_BOX_TYPE_AV01:
+	case GF_ISOM_BOX_TYPE_DAV1:
+		entry->type = switch_type ? GF_ISOM_BOX_TYPE_DAV1 : GF_ISOM_BOX_TYPE_AV01;
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+
+	u32 dve_type = is_avc ? GF_ISOM_BOX_TYPE_AVCE : GF_ISOM_BOX_TYPE_HVCE;
+	dv_cfge = gf_isom_box_find_child(entry->child_boxes, dve_type);
+
+	dovi = entry->dovi_config;
+	if (!dvcc) {
+		if (dovi) gf_isom_box_del_parent(&entry->child_boxes, (GF_Box*)dovi);
+		entry->dovi_config = NULL;
+
+		if (dv_cfge) gf_isom_box_del_parent(&entry->child_boxes, dv_cfge);
+		//reverse entry type
+		switch (entry->type) {
+		case GF_ISOM_BOX_TYPE_DVHE:
+			entry->type = GF_ISOM_BOX_TYPE_HEV1;
+			break;
+		case GF_ISOM_BOX_TYPE_DVH1:
+			entry->type = GF_ISOM_BOX_TYPE_HVC1;
+			break;
+		case GF_ISOM_BOX_TYPE_DVA1:
+			entry->type = GF_ISOM_BOX_TYPE_AVC1;
+			break;
+		case GF_ISOM_BOX_TYPE_DVAV:
+			entry->type = GF_ISOM_BOX_TYPE_AVC3;
+			break;
+		case GF_ISOM_BOX_TYPE_DAV1:
+			entry->type = GF_ISOM_BOX_TYPE_AV01;
+			break;
+		default:
+			break;
+		}
 		return GF_OK;
 	}
 	if (!dovi) {
 		dovi = (GF_DOVIConfigurationBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_DVCC);
 		if (!dovi) return GF_OUT_OF_MEM;
-		((GF_MPEGVisualSampleEntryBox*)entry)->dovi_config = dovi;
+		entry->dovi_config = dovi;
+	}
+	if (dvcc->dv_profile < 8) {
+		dovi->type = GF_ISOM_BOX_TYPE_DVCC;
+	} else {
+		dovi->type = GF_ISOM_BOX_TYPE_DVVC;
+	}
+	dovi->DOVIConfig = *dvcc;
+
+	if (dv_cfge) gf_isom_box_del_parent(&entry->child_boxes, dv_cfge);
+	dv_cfge = NULL;
+
+	//inject avcE / hvcE if enhancement layer and RPU present in single-track case
+	//not clear from the spec what is supposed to be in these, we just clone avcC/hvcC
+	if (dvcc->bl_present_flag && dvcc->el_present_flag && dvcc->rpu_present_flag) {
+		GF_Box *src = is_avc ? (GF_Box *)entry->avc_config : (GF_Box *)entry->hevc_config;
+		if (!src) return GF_BAD_PARAM;
+		e = gf_isom_clone_box(src, &dv_cfge);
+		if (e) return e;
+		dv_cfge->type = dve_type;
+		gf_list_add(entry->child_boxes, dv_cfge);
 	}
-	entry->type = GF_ISOM_BOX_TYPE_DVHE;
-	dovi->DOVIConfig.dv_profile = dv_profile;
 	return GF_OK;
 }
 
@@ -1850,24 +1991,32 @@
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
 	GF_MasteringDisplayColourVolumeBox *mdcvb = (GF_MasteringDisplayColourVolumeBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_MDCV);
-	if (!mdcvb) {
-		mdcvb = (GF_MasteringDisplayColourVolumeBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_MDCV);
-		if (!mdcvb) return GF_OUT_OF_MEM;
+	if (mdcv) {
+		if (!mdcvb) {
+			mdcvb = (GF_MasteringDisplayColourVolumeBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_MDCV);
+			if (!mdcvb) return GF_OUT_OF_MEM;
+		}
+		mdcvb->mdcv = *mdcv;
+	} else {
+		if (mdcvb) gf_isom_box_del_parent(&entry->child_boxes, (GF_Box *) mdcvb);
 	}
-	mdcvb->mdcv = *mdcv;
 
 	/*clli*/
 	GF_ContentLightLevelBox *cllib = (GF_ContentLightLevelBox *)gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_CLLI);
-	if (!cllib) {
-		cllib = (GF_ContentLightLevelBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_CLLI);
-		if (!cllib) return GF_OUT_OF_MEM;
+	if (clli) {
+		if (!cllib) {
+			cllib = (GF_ContentLightLevelBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_CLLI);
+			if (!cllib) return GF_OUT_OF_MEM;
+		}
+		cllib->clli = *clli;
+	} else {
+		if (cllib) gf_isom_box_del_parent(&entry->child_boxes, (GF_Box *) cllib);
 	}
-	cllib->clli = *clli;
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_clean_aperture(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 cleanApertureWidthN, u32 cleanApertureWidthD, u32 cleanApertureHeightN, u32 cleanApertureHeightD, u32 horizOffN, u32 horizOffD, u32 vertOffN, u32 vertOffD)
+GF_Err gf_isom_set_clean_aperture(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 cleanApertureWidthN, u32 cleanApertureWidthD, u32 cleanApertureHeightN, u32 cleanApertureHeightD, s32 horizOffN, u32 horizOffD, s32 vertOffN, u32 vertOffD)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -2147,8 +2296,14 @@
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_AUDIO) return GF_BAD_PARAM;
 	aud_entry = (GF_AudioSampleEntryBox*) entry;
-	aud_entry->samplerate_hi = sampleRate;
-	aud_entry->samplerate_lo = 0;
+
+	if (entry->type==GF_ISOM_BOX_TYPE_MLPA) {
+		aud_entry->samplerate_hi = sampleRate>>16;
+		aud_entry->samplerate_lo = sampleRate & 0x0000FFFF;
+	} else {
+		aud_entry->samplerate_hi = sampleRate;
+		aud_entry->samplerate_lo = 0;
+	}
 	aud_entry->bitspersample = bitsPerSample;
 
 	switch (asemode) {
@@ -2315,7 +2470,12 @@
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_AUDIO) return GF_BAD_PARAM;
 	aud_entry = (GF_AudioSampleEntryBox*) entry;
 	if (aud_entry->qtff_mode) {
-		e = gf_isom_set_audio_info(movie, trackNumber, sampleDescriptionIndex, aud_entry->samplerate_hi, aud_entry->channel_count, (u8) aud_entry->bitspersample, GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG);
+		u32 sr = aud_entry->samplerate_hi;
+		if (aud_entry->type==GF_ISOM_BOX_TYPE_MLPA) {
+			sr <<= 16;
+			sr |= aud_entry->samplerate_lo;
+		}
+		e = gf_isom_set_audio_info(movie, trackNumber, sampleDescriptionIndex, sr, aud_entry->channel_count, (u8) aud_entry->bitspersample, GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG);
 		if (e) return e;
 	}
 	chnl = (GF_ChannelLayoutBox *) gf_isom_box_find_child(aud_entry->child_boxes, GF_ISOM_BOX_TYPE_CHNL);
@@ -2344,6 +2504,8 @@
 	case GF_ISOM_STORE_TIGHT:
 	case GF_ISOM_STORE_FASTSTART:
 		movie->storageMode = storageMode;
+		//specifying a storage mode disables inplace rewrite
+		gf_isom_disable_inplace_rewrite(movie);
 		return GF_OK;
 	default:
 		return GF_BAD_PARAM;
@@ -2352,11 +2514,11 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_enable_compression(GF_ISOFile *file, GF_ISOCompressMode compress_mode, Bool force_compress)
+GF_Err gf_isom_enable_compression(GF_ISOFile *file, GF_ISOCompressMode compress_mode, u32 compress_flags)
 {
 	if (!file) return GF_BAD_PARAM;
 	file->compress_mode = compress_mode;
-	file->force_compress = force_compress;
+	file->compress_flags = compress_flags;
 	return GF_OK;
 }
 
@@ -2372,8 +2534,7 @@
 //update or insert a new edit segment in the track time line. Edits are used to modify
 //the media normal timing. EditTime and EditDuration are expressed in Movie TimeScale
 //If a segment with EditTime already exists, IT IS ERASED
-GF_EXPORT
-GF_Err gf_isom_set_edit(GF_ISOFile *movie, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, GF_ISOEditType EditMode)
+static GF_Err gf_isom_set_edit_internal(GF_ISOFile *movie, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, u32 media_rate, GF_ISOEditType EditMode)
 {
 	GF_TrackBox *trak;
 	GF_EditBox *edts;
@@ -2393,13 +2554,13 @@
 	if (! edts) {
 		edts = (GF_EditBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_EDTS);
 		if (!edts) return GF_OUT_OF_MEM;
-		trak_on_child_box((GF_Box*)trak, (GF_Box *)edts);
+		trak_on_child_box((GF_Box*)trak, (GF_Box *)edts, GF_FALSE);
 	}
 	elst = edts->editList;
 	if (!elst) {
 		elst = (GF_EditListBox *) gf_isom_box_new_parent(&edts->child_boxes, GF_ISOM_BOX_TYPE_ELST);
 		if (!elst) return GF_OUT_OF_MEM;
-		edts_on_child_box((GF_Box*)edts, (GF_Box *)elst);
+		edts_on_child_box((GF_Box*)edts, (GF_Box *)elst, GF_FALSE);
 	}
 
 	startTime = 0;
@@ -2412,12 +2573,21 @@
 		startTime += ent->segmentDuration;
 	}
 
-	//not found, add a new entry and adjust the prev one if any
+	//not found, add a new entry, insert empty one if gap
 	if (!ent) {
-		newEnt = CreateEditEntry(EditDuration, MediaTime, EditMode);
+		Bool empty_inserted = GF_FALSE;
+		if (startTime != EditTime) {
+			newEnt = CreateEditEntry(EditTime - startTime, 0, 0, GF_ISOM_EDIT_EMPTY);
+			if (!newEnt) return GF_OUT_OF_MEM;
+			empty_inserted = GF_TRUE;
+			gf_list_add(elst->entryList, newEnt);
+		}
+		newEnt = CreateEditEntry(EditDuration, MediaTime, media_rate, EditMode);
 		if (!newEnt) return GF_OUT_OF_MEM;
 		gf_list_add(elst->entryList, newEnt);
-		return SetTrackDuration(trak);
+		e = SetTrackDuration(trak);
+		if (e) return e;
+		return empty_inserted ? GF_EOS : GF_OK;
 	}
 
 	startTime -= ent->segmentDuration;
@@ -2429,7 +2599,7 @@
 		ent->segmentDuration = EditDuration;
 		switch (EditMode) {
 		case GF_ISOM_EDIT_EMPTY:
-			ent->mediaRate = 1;
+			ent->mediaRate = 0x10000;
 			ent->mediaTime = -1;
 			break;
 		case GF_ISOM_EDIT_DWELL:
@@ -2437,7 +2607,7 @@
 			ent->mediaTime = MediaTime;
 			break;
 		default:
-			ent->mediaRate = 1;
+			ent->mediaRate = media_rate;
 			ent->mediaTime = MediaTime;
 			break;
 		}
@@ -2448,7 +2618,7 @@
 	//Note: we don't change the next one as it is unknown to us in
 	//a lot of case (the author's changes)
 	ent->segmentDuration = EditTime - startTime;
-	newEnt = CreateEditEntry(EditDuration, MediaTime, EditMode);
+	newEnt = CreateEditEntry(EditDuration, MediaTime, media_rate, EditMode);
 	if (!newEnt) return GF_OUT_OF_MEM;
 	//is it the last entry ???
 	if (i >= gf_list_count(elst->entryList) - 1) {
@@ -2462,6 +2632,19 @@
 	}
 }
 
+GF_EXPORT
+GF_Err gf_isom_set_edit(GF_ISOFile *movie, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, GF_ISOEditType EditMode)
+{
+	return gf_isom_set_edit_internal(movie, trackNumber, EditTime, EditDuration, MediaTime, 0x10000, EditMode);
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_edit_with_rate(GF_ISOFile *movie, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, u32 media_rate)
+{
+	return gf_isom_set_edit_internal(movie, trackNumber, EditTime, EditDuration, MediaTime, media_rate, GF_ISOM_EDIT_NORMAL);
+
+}
+
 //remove the edit segments for the whole track
 GF_EXPORT
 GF_Err gf_isom_remove_edits(GF_ISOFile *movie, u32 trackNumber)
@@ -2528,13 +2711,13 @@
 	if (!trak->editBox) {
 		GF_EditBox *edts = (GF_EditBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_EDTS);
 		if (!edts) return GF_OUT_OF_MEM;
-		trak_on_child_box((GF_Box*)trak, (GF_Box *)edts);
+		trak_on_child_box((GF_Box*)trak, (GF_Box *)edts, GF_FALSE);
 		assert(trak->editBox);
 	}
 	if (!trak->editBox->editList) {
 		GF_EditListBox *elst = (GF_EditListBox *) gf_isom_box_new_parent(&trak->editBox->child_boxes, GF_ISOM_BOX_TYPE_ELST);
 		if (!elst) return GF_OUT_OF_MEM;
-		edts_on_child_box((GF_Box*)trak->editBox, (GF_Box *)elst);
+		edts_on_child_box((GF_Box*)trak->editBox, (GF_Box *)elst, GF_FALSE);
 		assert(trak->editBox->editList);
 	}
 	ent = (GF_EdtsEntry *)gf_malloc(sizeof(GF_EdtsEntry));
@@ -2543,7 +2726,7 @@
 	ent->segmentDuration = EditDuration;
 	switch (EditMode) {
 	case GF_ISOM_EDIT_EMPTY:
-		ent->mediaRate = 1;
+		ent->mediaRate = 0x10000;
 		ent->mediaTime = -1;
 		break;
 	case GF_ISOM_EDIT_DWELL:
@@ -2551,7 +2734,7 @@
 		ent->mediaTime = MediaTime;
 		break;
 	default:
-		ent->mediaRate = 1;
+		ent->mediaRate = 0x10000;
 		ent->mediaTime = MediaTime;
 		break;
 	}
@@ -2577,7 +2760,7 @@
 	ent->segmentDuration = EditDuration;
 	switch (EditMode) {
 	case GF_ISOM_EDIT_EMPTY:
-		ent->mediaRate = 1;
+		ent->mediaRate = 0x10000;
 		ent->mediaTime = -1;
 		break;
 	case GF_ISOM_EDIT_DWELL:
@@ -2585,7 +2768,7 @@
 		ent->mediaTime = MediaTime;
 		break;
 	default:
-		ent->mediaRate = 1;
+		ent->mediaRate = 0x10000;
 		ent->mediaTime = MediaTime;
 		break;
 	}
@@ -2640,6 +2823,7 @@
 	i=0;
 	while ((trak = (GF_TrackBox *)gf_list_enum(movie->moov->trackList, &i))) {
 		if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_OD) continue;
+
 		//this is an OD track...
 		j = gf_isom_get_sample_count(movie, i);
 		for (k=0; k < j; k++) {
@@ -2663,7 +2847,6 @@
 	//note that we don't touch scal references, as we don't want to rewrite AVC/HEVC samples ...
 	i=0;
 	while ((trak = (GF_TrackBox *)gf_list_enum(movie->moov->trackList, &i))) {
-		if (trak == the_trak) continue;
 		if (! trak->References || ! gf_list_count(trak->References->child_boxes)) continue;
 
 		j=0;
@@ -2703,6 +2886,10 @@
 		}
 	}
 
+	gf_isom_disable_inplace_rewrite(movie);
+
+	gf_isom_meta_track_remove(movie, the_trak, 0);
+
 	//delete the track
 	gf_isom_box_del_parent(&movie->moov->child_boxes, (GF_Box *)the_trak);
 
@@ -2740,7 +2927,7 @@
 	if (e) return e;
 
 	if (!movie->moov->udta) {
-		e = moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+		e = moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 		if (e) return e;
 	}
 	map = udta_getEntry(movie->moov->udta, GF_ISOM_BOX_TYPE_CPRT, NULL);
@@ -2767,7 +2954,7 @@
 	ptr->notice = (char*)gf_malloc(sizeof(char) * (strlen(notice)+1));
 	if (!ptr->notice) return GF_OUT_OF_MEM;
 	strcpy(ptr->notice, notice);
-	return udta_on_child_box((GF_Box *)movie->moov->udta, (GF_Box *) ptr);
+	return udta_on_child_box((GF_Box *)movie->moov->udta, (GF_Box *) ptr, GF_FALSE);
 }
 
 GF_EXPORT
@@ -2789,7 +2976,7 @@
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
 		if (!trak->udta) {
-			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 			if (e) return e;
 		}
 		udta = trak->udta;
@@ -2818,7 +3005,7 @@
 
 	ptr->schemeURI = gf_strdup(schemeURI);
 	if (value) ptr->value = gf_strdup(value);
-	return udta_on_child_box((GF_Box *)udta, (GF_Box *) ptr);
+	return udta_on_child_box((GF_Box *)udta, (GF_Box *) ptr, GF_FALSE);
 }
 
 GF_EXPORT
@@ -2838,7 +3025,7 @@
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
 		if (!trak->udta) {
-			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 			if (e) return e;
 		}
 		udta = trak->udta;
@@ -2883,13 +3070,13 @@
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
 		if (!trak->udta) {
-			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 			if (e) return e;
 		}
 		udta = trak->udta;
 	} else {
 		if (!movie->moov->udta) {
-			e = moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+			e = moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 			if (e) return e;
 		}
 		udta = movie->moov->udta;
@@ -2899,7 +3086,7 @@
 	map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_CHPL, NULL);
 	if (!map) {
 		ptr = (GF_ChapterListBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_CHPL);
-		e = udta_on_child_box((GF_Box *)udta, (GF_Box *) ptr);
+		e = udta_on_child_box((GF_Box *)udta, (GF_Box *) ptr, GF_FALSE);
 		if (e) return e;
 		map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_CHPL, NULL);
 	} else {
@@ -3149,10 +3336,20 @@
 
 
 GF_EXPORT
+GF_Err gf_isom_disable_brand_rewrite(GF_ISOFile *movie, Bool do_disable)
+{
+	if (!movie) return GF_BAD_PARAM;
+	movie->disable_brand_rewrite = do_disable ? 1: 0;
+	return GF_OK;
+}
+
+GF_EXPORT
 GF_Err gf_isom_set_brand_info(GF_ISOFile *movie, u32 MajorBrand, u32 MinorVersion)
 {
 	u32 i, *p;
 
+	if (!movie) return GF_BAD_PARAM;
+	if (movie->disable_brand_rewrite) return GF_OK;
 	if (!MajorBrand) return GF_BAD_PARAM;
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
@@ -3202,6 +3399,8 @@
 {
 	u32 i, k, *p;
 
+	if (!movie) return GF_BAD_PARAM;
+	if (movie->disable_brand_rewrite) return GF_OK;
 	if (!Brand) return GF_BAD_PARAM;
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
@@ -3238,10 +3437,12 @@
 	//add it
 	p = (u32*)gf_malloc(sizeof(u32)*(movie->brand->altCount + 1));
 	if (!p) return GF_OUT_OF_MEM;
-	memcpy(p, movie->brand->altBrand, sizeof(u32)*movie->brand->altCount);
+	if (movie->brand->altBrand) {
+		memcpy(p, movie->brand->altBrand, sizeof(u32)*movie->brand->altCount);
+		gf_free(movie->brand->altBrand);
+	}
 	p[movie->brand->altCount] = Brand;
 	movie->brand->altCount += 1;
-	gf_free(movie->brand->altBrand);
 	movie->brand->altBrand = p;
 	return GF_OK;
 
@@ -3269,11 +3470,13 @@
 }
 
 
-GF_EXPORT
-GF_Err gf_isom_reset_alt_brands(GF_ISOFile *movie)
+GF_Err gf_isom_reset_alt_brands_ex(GF_ISOFile *movie, Bool leave_empty)
 {
 	u32 *p;
 
+	if (!movie) return GF_BAD_PARAM;
+	if (movie->disable_brand_rewrite) return GF_OK;
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (! (movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY)) {
 		GF_Err e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
@@ -3289,14 +3492,24 @@
 		if (!movie->brand) return GF_OUT_OF_MEM;
 		gf_list_add(movie->TopBoxes, movie->brand);
 	}
-	p = (u32*)gf_malloc(sizeof(u32));
-	if (!p) return GF_OUT_OF_MEM;
-	p[0] = movie->brand->majorBrand;
-	movie->brand->altCount = 1;
 	gf_free(movie->brand->altBrand);
-	movie->brand->altBrand = p;
+	if (leave_empty) {
+		movie->brand->altCount = 0;
+		movie->brand->altBrand = NULL;
+	} else {
+		p = (u32*)gf_malloc(sizeof(u32));
+		if (!p) return GF_OUT_OF_MEM;
+		p[0] = movie->brand->majorBrand;
+		movie->brand->altCount = 1;
+		movie->brand->altBrand = p;
+	}
 	return GF_OK;
 }
+GF_EXPORT
+GF_Err gf_isom_reset_alt_brands(GF_ISOFile *movie)
+{
+	return gf_isom_reset_alt_brands_ex(movie, GF_FALSE);
+}
 
 #if 0 //unused
 GF_Err gf_isom_set_sample_padding_bits(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber, u8 NbBits)
@@ -3385,12 +3598,13 @@
 
 	if (trackNumber) {
 		trak = gf_isom_get_track_from_file(movie, trackNumber);
-		if (!trak) return GF_BAD_PARAM;
+		if (!trak) return GF_EOS;
 		udta = trak->udta;
 	} else {
 		udta = movie->moov->udta;
 	}
-	if (!udta) return GF_BAD_PARAM;
+	//do not return any error if no udta
+	if (!udta) return GF_EOS;
 
 	i=0;
 	while ((map = (GF_UserDataMap*)gf_list_enum(udta->recordList, &i))) {
@@ -3425,10 +3639,10 @@
 	if (trackNumber) {
 		trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
-		if (!trak->udta) trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+		if (!trak->udta) trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 		udta = trak->udta;
 	} else {
-		if (!movie->moov->udta) moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+		if (!movie->moov->udta) moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 		udta = movie->moov->udta;
 	}
 	if (!udta) return GF_OUT_OF_MEM;
@@ -3444,7 +3658,7 @@
 			memcpy(a->data, data, DataLength);
 			a->dataSize = DataLength;
 		}
-		return udta_on_child_box((GF_Box *)udta, (GF_Box *) a);
+		return udta_on_child_box((GF_Box *)udta, (GF_Box *) a, GF_FALSE);
 	} else {
 		GF_UnknownUUIDBox *a = (GF_UnknownUUIDBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_UUID);
 		if (!a) return GF_OUT_OF_MEM;
@@ -3455,7 +3669,7 @@
 			memcpy(a->data, data, DataLength);
 			a->dataSize = DataLength;
 		}
-		return udta_on_child_box((GF_Box *)udta, (GF_Box *) a);
+		return udta_on_child_box((GF_Box *)udta, (GF_Box *) a, GF_FALSE);
 	}
 	return GF_OK;
 }
@@ -3474,11 +3688,11 @@
 	if (trackNumber) {
 		trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
-		if (!trak->udta) trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+		if (!trak->udta) trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 		udta = trak->udta;
 	} else {
 		if (!movie->moov) return GF_BAD_PARAM;
-		if (!movie->moov->udta) moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+		if (!movie->moov->udta) moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 		udta = movie->moov->udta;
 	}
 	if (!udta) return GF_OUT_OF_MEM;
@@ -3488,7 +3702,7 @@
 		GF_Box *a;
 		e = gf_isom_box_parse(&a, bs);
 		if (e) break;
-		e = udta_on_child_box((GF_Box *)udta, a);
+		e = udta_on_child_box((GF_Box *)udta, a, GF_FALSE);
 		if (e) break;
 	}
 	gf_bs_del(bs);
@@ -3538,9 +3752,15 @@
 	if (!e) e = gf_isom_box_write((GF_Box *) src, bs);
 	gf_bs_get_content(bs, &data, &data_size);
 	gf_bs_del(bs);
-	if (e) return e;
+	if (e) {
+		if (data) gf_free(data);
+		return e;
+	}
 	bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
-	if (!bs) return GF_OUT_OF_MEM;
+	if (!bs) {
+		if (data) gf_free(data);
+		return GF_OUT_OF_MEM;
+	}
 	e = gf_isom_box_parse(dst, bs);
 	gf_bs_del(bs);
 	gf_free(data);
@@ -3719,6 +3939,7 @@
 	GF_DataReferenceBox *dref;
 	GF_SampleTableBox *stbl, *stbl_temp;
 	GF_SampleEncryptionBox *senc;
+	GF_List *gpac_internals = NULL;
 	u32 i, count;
 
 	*output = NULL;
@@ -3751,7 +3972,12 @@
 	stbl_temp->sampleGroupsDescription = stbl->sampleGroupsDescription;
 	count = gf_list_count(stbl->sampleGroupsDescription);
 	for (i=0;i<count; i++) {
-		GF_Box *b = gf_list_get(stbl->sampleGroupsDescription, i);
+		GF_SampleGroupDescriptionBox *b = gf_list_get(stbl->sampleGroupsDescription, i);
+		//don't add our internal sample groups
+		if (b->grouping_type==GF_4CC('E','M','S','G'))
+			continue;
+		if (b->grouping_type==GF_4CC('P','S','S','H'))
+			continue;
 		gf_list_add(stbl_temp->child_boxes, b);
 	}
 	/*clone CompositionToDecode table, we may remove it later*/
@@ -3759,6 +3985,19 @@
 	gf_list_add(stbl_temp->child_boxes, stbl->CompositionToDecode);
 
 
+	count = gf_list_count(trak->child_boxes);
+	for (i=0;i<count; i++) {
+		GF_UnknownBox *b = gf_list_get(trak->child_boxes, i);
+		if (b->type != GF_ISOM_BOX_TYPE_UNKNOWN) continue;
+		if (b->original_4cc==GF_ISOM_BOX_TYPE_GDAT) {
+			if (!gpac_internals) gpac_internals = gf_list_new();
+			gf_list_add(gpac_internals, b);
+			gf_list_rem(trak->child_boxes, i);
+			i--;
+			count--;
+		}
+	}
+
 	//don't serialize senc
 	senc = trak->sample_encryption;
 	if (senc) {
@@ -3797,6 +4036,11 @@
 	stbl_temp->CompositionToDecode = NULL;
 	gf_list_del_item(stbl_temp->child_boxes, stbl->CompositionToDecode);
 	gf_isom_box_del((GF_Box *)stbl_temp);
+
+	if (gpac_internals) {
+		gf_list_transfer(trak->child_boxes, gpac_internals);
+		gf_list_del(gpac_internals);
+	}
 	return GF_OK;
 
 }
@@ -3878,7 +4122,6 @@
 	u8 *data;
 	const u8 *buffer;
 	u32 data_size;
-	Double ts_scale;
 	u32 i, count;
 	GF_Err e;
 	GF_SampleTableBox *stbl, *stbl_temp;
@@ -3967,7 +4210,7 @@
 		return e;
 	}
 
-
+	gf_isom_disable_inplace_rewrite(dest_file);
 
 	/*create default boxes*/
 	stbl = new_tk->Media->information->sampleTable;
@@ -3980,8 +4223,11 @@
 	stbl->TimeToSample = (GF_TimeToSampleBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STTS);
 	if (!stbl->TimeToSample) return GF_OUT_OF_MEM;
 
+	if (flags & GF_ISOM_CLONE_TRACK_DROP_ID)
+		new_tk->Header->trackID = 0;
+
 	/*check trackID validity before adding track*/
-	if (gf_isom_get_track_by_id(dest_file, new_tk->Header->trackID)) {
+	if (!new_tk->Header->trackID || gf_isom_get_track_by_id(dest_file, new_tk->Header->trackID)) {
 		u32 ID = 1;
 		while (1) {
 			if (RequestTrack(dest_file->moov, ID)) break;
@@ -3992,7 +4238,7 @@
 	}
 	if (!dest_file->moov->child_boxes) dest_file->moov->child_boxes = gf_list_new();
 	gf_list_add(dest_file->moov->child_boxes, new_tk);
-	moov_on_child_box((GF_Box*)dest_file->moov, (GF_Box *)new_tk);
+	moov_on_child_box((GF_Box*)dest_file->moov, (GF_Box *)new_tk, GF_FALSE);
 
 	/*set originalID*/
 	new_tk->originalID = trak->Header->trackID;
@@ -4001,14 +4247,16 @@
 	new_tk->originalFile = gf_crc_32(buffer, (u32) strlen(buffer));
 
 	/*rewrite edit list segmentDuration to new movie timescale*/
-	ts_scale = dest_file->moov->mvhd->timeScale;
-	ts_scale /= orig_file->moov->mvhd->timeScale;
-	new_tk->Header->duration = (u64) (s64) ((s64) new_tk->Header->duration * ts_scale);
-	if (new_tk->editBox && new_tk->editBox->editList) {
-		count = gf_list_count(new_tk->editBox->editList->entryList);
-		for (i=0; i<count; i++) {
-			GF_EdtsEntry *ent = (GF_EdtsEntry *)gf_list_get(new_tk->editBox->editList->entryList, i);
-			ent->segmentDuration = (u64) (s64) ((s64) ent->segmentDuration * ts_scale);
+	if (dest_file->moov->mvhd->timeScale != orig_file->moov->mvhd->timeScale) {
+		Double ts_scale = dest_file->moov->mvhd->timeScale;
+		ts_scale /= orig_file->moov->mvhd->timeScale;
+		new_tk->Header->duration = (u64) (new_tk->Header->duration * ts_scale);
+		if (new_tk->editBox && new_tk->editBox->editList) {
+			count = gf_list_count(new_tk->editBox->editList->entryList);
+			for (i=0; i<count; i++) {
+				GF_EdtsEntry *ent = (GF_EdtsEntry *)gf_list_get(new_tk->editBox->editList->entryList, i);
+				ent->segmentDuration = (u64) (ent->segmentDuration * ts_scale);
+			}
 		}
 	}
 
@@ -4043,6 +4291,17 @@
 		}
 	}
 
+	//purge all 'gpac' boxes at track level
+	for (i=0; i<gf_list_count(new_tk->child_boxes); i++) {
+		GF_UnknownBox *b = (GF_UnknownBox *)gf_list_get(new_tk->child_boxes, i);
+		if (b->type != GF_ISOM_BOX_TYPE_UNKNOWN) continue;
+		if (b->original_4cc==GF_ISOM_BOX_TYPE_GDAT) {
+			gf_list_rem(new_tk->child_boxes, i);
+			i--;
+			gf_isom_box_del((GF_Box*)b);
+		}
+	}
+
 	*dest_track = gf_list_count(dest_file->moov->trackList);
 
 	if (dest_file->moov->mvhd->nextTrackID<= new_tk->Header->trackID)
@@ -4091,6 +4350,7 @@
 	GF_Err e;
 	u32 dataRefIndex;
 u32 mtype;
+	u32 internal_type;
 
 	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -4101,6 +4361,7 @@
 
 	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, orig_desc_index-1);
 	if (!entry) return GF_BAD_PARAM;
+	internal_type = ((GF_SampleEntryBox *)entry)->internal_type;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
@@ -4113,6 +4374,33 @@
 	gf_bs_del(bs);
 	gf_free(data);
 	if (e) return e;
+	if (entry->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
+		GF_UnknownBox *ubox = (GF_UnknownBox*)entry;
+		if (internal_type == GF_ISOM_SAMPLE_ENTRY_VIDEO) {
+			GF_GenericVisualSampleEntryBox *ve = (GF_GenericVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRV);
+			ve->EntryType = ubox->type;
+			ve->data = ubox->data;
+			ve->data_size = ubox->dataSize;
+			entry = (GF_Box *) ve;
+		}
+		else if (internal_type == GF_ISOM_SAMPLE_ENTRY_AUDIO) {
+			GF_GenericAudioSampleEntryBox *ae = (GF_GenericAudioSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRA);
+			ae->EntryType = ubox->type;
+			ae->data = ubox->data;
+			ae->data_size = ubox->dataSize;
+			entry = (GF_Box *) ae;
+		}
+		else {
+			GF_GenericSampleEntryBox *ge = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
+			ge->EntryType = ubox->type;
+			ge->data = ubox->data;
+			ge->data_size = ubox->dataSize;
+			entry = (GF_Box *) ge;
+		}
+		ubox->data = NULL;
+		ubox->dataSize = 0;
+		gf_isom_box_del((GF_Box *)ubox);
+	}
 
 	/*get new track and insert clone*/
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -4149,6 +4437,8 @@
 {
 	GF_TrackBox *trak;
 	GF_Err e;
+	u8 **wrap_data;
+	u32 *wrap_size;
 	u32 dataRefIndex;
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
@@ -4198,15 +4488,8 @@
 		entry->horiz_res = udesc->h_res ? udesc->h_res : 0x00480000;
 		entry->vert_res = udesc->v_res ? udesc->v_res : 0x00480000;
 		entry->bit_depth = udesc->depth ? udesc->depth : 0x18;
-		if (udesc->extension_buf && udesc->extension_buf_size) {
-			entry->data = (char*)gf_malloc(sizeof(char) * udesc->extension_buf_size);
-			if (!entry->data) {
-				gf_isom_box_del((GF_Box *) entry);
-				return GF_OUT_OF_MEM;
-			}
-			memcpy(entry->data, udesc->extension_buf, udesc->extension_buf_size);
-			entry->data_size = udesc->extension_buf_size;
-		}
+		wrap_data = &entry->data;
+		wrap_size = &entry->data_size;
 		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->child_boxes, entry);
 	}
 	else if (trak->Media->handler->handlerType==GF_ISOM_MEDIA_AUDIO) {
@@ -4236,15 +4519,8 @@
 		gena->samplerate_lo = 0;
 		gena->qtff_mode = udesc->is_qtff ? GF_ISOM_AUDIO_QTFF_ON_NOEXT : GF_ISOM_AUDIO_QTFF_NONE;
 
-		if (udesc->extension_buf && udesc->extension_buf_size) {
-			gena->data = (char*)gf_malloc(sizeof(char) * udesc->extension_buf_size);
-			if (!gena->data) {
-				gf_isom_box_del((GF_Box *) gena);
-				return GF_OUT_OF_MEM;
-			}
-			memcpy(gena->data, udesc->extension_buf, udesc->extension_buf_size);
-			gena->data_size = udesc->extension_buf_size;
-		}
+		wrap_data = &gena->data;
+		wrap_size = &gena->data_size;
 		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->child_boxes, gena);
 	}
 	else {
@@ -4263,20 +4539,23 @@
 			gf_isom_box_del((GF_Box *)genm);
 			return GF_NOT_SUPPORTED;
 		}
-
 		genm->dataReferenceIndex = dataRefIndex;
-		if (udesc->extension_buf && udesc->extension_buf_size) {
-			genm->data = (char*)gf_malloc(sizeof(char) * udesc->extension_buf_size);
-			if (!genm->data) {
-				gf_isom_box_del((GF_Box *) genm);
-				return GF_OUT_OF_MEM;
-			}
-			memcpy(genm->data, udesc->extension_buf, udesc->extension_buf_size);
-			genm->data_size = udesc->extension_buf_size;
-		}
+		wrap_data = &genm->data;
+		wrap_size = &genm->data_size;
 		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->child_boxes, genm);
 	}
 	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
+
+	if (udesc->extension_buf && udesc->extension_buf_size) {
+		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		if (udesc->ext_box_wrap) {
+			gf_bs_write_u32(bs, 8+udesc->extension_buf_size);
+			gf_bs_write_u32(bs, udesc->ext_box_wrap);
+		}
+		gf_bs_write_data(bs, udesc->extension_buf, udesc->extension_buf_size);
+		gf_bs_get_content(bs, wrap_data, wrap_size);
+		gf_bs_del(bs);
+	}
 	return e;
 }
 
@@ -4406,7 +4685,7 @@
 	if (!tref) {
 		tref = (GF_TrackReferenceBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_TREF);
 		if (!tref) return GF_OUT_OF_MEM;
-		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) tref);
+		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) tref, GF_FALSE);
 		if (e) return e;
 	}
 	//find a ref of the given type
@@ -4422,47 +4701,41 @@
 	return reftype_AddRefTrack(dpnd, ReferencedTrackID, NULL);
 }
 
-//removes a track reference
-#if 0 //unused
-GF_Err gf_isom_remove_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferenceIndex)
+GF_EXPORT
+GF_Err gf_isom_purge_track_reference(GF_ISOFile *the_file, u32 trackNumber)
 {
-	GF_Err e;
 	GF_TrackBox *trak;
-	GF_TrackReferenceBox *tref;
-	GF_TrackReferenceTypeBox *dpnd;
-	u32 i, k, *newIDs;
+	GF_TrackReferenceTypeBox *ref;
+	u32 i=0;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !ReferenceIndex) return GF_BAD_PARAM;
+	if (!trak) return GF_BAD_PARAM;
 
 	//no tref, nothing to remove
-	tref = trak->References;
-	if (!tref) return GF_OK;
-	//find a ref of the given type otherwise return
-	e = Track_FindRef(trak, referenceType, &dpnd);
-	if (e || !dpnd) return GF_OK;
-	//remove the ref
-	if (ReferenceIndex > dpnd->trackIDCount) return GF_BAD_PARAM;
-	//last one
-	if (dpnd->trackIDCount==1) {
-		gf_isom_box_del_parent(&tref->child_boxes, (GF_Box *) dpnd);
-		return GF_OK;
-	}
-	k = 0;
-	newIDs = (u32*)gf_malloc(sizeof(u32)*(dpnd->trackIDCount-1));
-	if (!newIDs) return GF_OUT_OF_MEM;
+	if (!trak->References) return GF_OK;
 
-	for (i=0; i<dpnd->trackIDCount; i++) {
-		if (i+1 != ReferenceIndex) {
-			newIDs[k] = dpnd->trackIDs[i];
-			k++;
+	while ((ref = gf_list_enum(trak->References->child_boxes, &i))) {
+		u32 k;
+		if (!ref->reference_type) continue;
+
+		for (k=0; k<ref->trackIDCount; k++) {
+			u32 tk = gf_isom_get_track_by_id(the_file, ref->trackIDs[k]);
+			if (!tk) {
+				memmove(&ref->trackIDs[k], &ref->trackIDs[k+1], ref->trackIDCount-k-1);
+				k--;
+				ref->trackIDCount--;
+			}
 		}
+		if (!ref->trackIDCount) {
+			i--;
+			gf_isom_box_del_parent(&trak->References->child_boxes, (GF_Box *) ref);
+		}
+	}
+	if (!trak->References->child_boxes || !gf_list_count(trak->References->child_boxes)) {
+		gf_isom_box_del_parent(&trak->child_boxes, (GF_Box *) trak->References);
+		trak->References = NULL;
 	}
-	gf_free(dpnd->trackIDs);
-	dpnd->trackIDCount -= 1;
-	dpnd->trackIDs = newIDs;
 	return GF_OK;
 }
-#endif
 
 //sets a track reference
 GF_EXPORT
@@ -4480,7 +4753,24 @@
 	return GF_OK;
 }
 
+GF_Err gf_isom_remove_track_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 ref_type)
+{
+	GF_TrackBox *trak;
+	u32 i=0;
+	GF_TrackReferenceTypeBox *ref;
+	trak = gf_isom_get_track_from_file(isom_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
 
+	if (!trak->References) return GF_OK;
+	while ((ref = gf_list_enum(trak->References->child_boxes, &i))) {
+		if (ref->reference_type == ref_type) {
+			gf_isom_box_del_parent(&trak->References->child_boxes, (GF_Box *)ref);
+			break;
+		}
+	}
+	return GF_OK;
+
+}
 
 //changes track ID
 GF_EXPORT
@@ -4677,7 +4967,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_media_timescale(GF_ISOFile *the_file, u32 trackNumber, u32 newTS, u32 new_tsinc, Bool force_rescale)
+GF_Err gf_isom_set_media_timescale(GF_ISOFile *the_file, u32 trackNumber, u32 newTS, u32 new_tsinc, u32 force_rescale_type)
 {
 	Double scale;
 	u32 old_ts_inc=0;
@@ -4690,6 +4980,7 @@
 	if ((trak->Media->mediaHeader->timeScale==newTS) && !new_tsinc)
 		return GF_EOS;
 
+	if (!newTS) newTS = trak->Media->mediaHeader->timeScale;
 	scale = newTS;
 	scale /= trak->Media->mediaHeader->timeScale;
 	old_timescale = trak->Media->mediaHeader->timeScale;
@@ -4707,105 +4998,130 @@
 			else if (old_ts_inc<stbl->TimeToSample->entries[i].sampleDelta)
 				old_ts_inc = stbl->TimeToSample->entries[i].sampleDelta;
 		}
-		if ((old_timescale==newTS) && (old_ts_inc==new_tsinc))
+
+		if ((old_timescale==newTS) && (old_ts_inc==new_tsinc) && (force_rescale_type!=2) )
 			return GF_EOS;
 
-		force_rescale = GF_TRUE;
-		stbl->TimeToSample->entries[0].sampleDelta = new_tsinc;
+		if (!force_rescale_type)
+			force_rescale_type = 1;
+		else if (force_rescale_type==2) {
+			gf_free(stbl->TimeToSample->entries);
+			stbl->TimeToSample->alloc_size = 1;
+			stbl->TimeToSample->nb_entries = 1;
+			stbl->TimeToSample->entries = gf_malloc(sizeof(GF_SttsEntry));
+			stbl->TimeToSample->entries[0].sampleDelta = new_tsinc;
+			stbl->TimeToSample->entries[0].sampleCount = stbl->SampleSize->sampleCount;
+		}
+
+
+		for (i=0; i<stbl->TimeToSample->nb_entries; i++) {
+			stbl->TimeToSample->entries[i].sampleDelta = new_tsinc;
+		}
+
 		if (stbl->CompositionOffset) {
 			for (i=0; i<stbl->CompositionOffset->nb_entries; i++) {
 				u32 old_offset = stbl->CompositionOffset->entries[i].decodingOffset;
-				old_offset *= new_tsinc;
-				old_offset /= old_ts_inc;
+				if (force_rescale_type==2) {
+					u32 val = old_offset ;
+					//get number of TS delta
+					old_offset /= old_ts_inc;
+					if (old_offset * old_ts_inc < val)
+						old_offset++;
+					old_offset *= new_tsinc;
+				} else {
+					old_offset *= new_tsinc;
+					old_offset /= old_ts_inc;
+				}
 				stbl->CompositionOffset->entries[i].decodingOffset = old_offset;
 			}
 		}
-		if (stbl->CompositionToDecode) {
-			stbl->CompositionToDecode->compositionEndTime *= new_tsinc;
-			stbl->CompositionToDecode->compositionEndTime /= old_ts_inc;
-
-			stbl->CompositionToDecode->compositionStartTime *= new_tsinc;
-			stbl->CompositionToDecode->compositionStartTime /= old_ts_inc;
 
-			stbl->CompositionToDecode->compositionToDTSShift *= new_tsinc;
-			stbl->CompositionToDecode->compositionToDTSShift /= old_ts_inc;
-
-			stbl->CompositionToDecode->greatestDecodeToDisplayDelta *= new_tsinc;
-			stbl->CompositionToDecode->greatestDecodeToDisplayDelta /= old_ts_inc;
+#define RESCALE_TSVAL(_tsval) {\
+			s64 val = ((s64) _tsval) * new_tsinc;\
+			val /= old_ts_inc;\
+			_tsval = (s32) val;\
+		}
 
-			stbl->CompositionToDecode->leastDecodeToDisplayDelta *= new_tsinc;
-			stbl->CompositionToDecode->leastDecodeToDisplayDelta /= old_ts_inc;
+		if (stbl->CompositionToDecode) {
+			RESCALE_TSVAL(stbl->CompositionToDecode->compositionEndTime)
+			RESCALE_TSVAL(stbl->CompositionToDecode->compositionStartTime)
+			RESCALE_TSVAL(stbl->CompositionToDecode->compositionToDTSShift)
+			RESCALE_TSVAL(stbl->CompositionToDecode->greatestDecodeToDisplayDelta)
+			RESCALE_TSVAL(stbl->CompositionToDecode->leastDecodeToDisplayDelta)
 		}
 		if (trak->editBox) {
 			GF_EdtsEntry *ent;
 			i=0;
 			while ((ent = (GF_EdtsEntry*)gf_list_enum(trak->editBox->editList->entryList, &i))) {
-				ent->mediaTime *= new_tsinc;
-				ent->mediaTime /= old_ts_inc;
+				RESCALE_TSVAL(ent->mediaTime)
 			}
 		}
-	}
-
-	if (!force_rescale) {
-		u32 i, k, idx, last_delta;
-		u64 cur_dts;
-		u64*DTSs = NULL;
-		s64*CTSs = NULL;
+#undef RESCALE_TSVAL
 
-		if (trak->editBox) {
-			GF_EdtsEntry *ent;
-			i=0;
-			while ((ent = (GF_EdtsEntry*)gf_list_enum(trak->editBox->editList->entryList, &i))) {
-				ent->mediaTime = (u32) (scale*ent->mediaTime);
-			}
-		}
-		if (! stbl || !stbl->TimeToSample || !stbl->TimeToSample->nb_entries) {
-			return SetTrackDuration(trak);
-		}
+		return SetTrackDuration(trak);
+	}
 
-		idx = 0;
-		cur_dts = 0;
-		//unpack the DTSs
-		DTSs = (u64*)gf_malloc(sizeof(u64) * (stbl->SampleSize->sampleCount) );
-		if (!DTSs) return GF_OUT_OF_MEM;
+	//rescale timings
+	u32 i, k, idx, last_delta;
+	u64 cur_dts;
+	u64*DTSs = NULL;
+	s64*CTSs = NULL;
 
-		CTSs = NULL;
-		if (stbl->CompositionOffset) {
-			CTSs = (s64*)gf_malloc(sizeof(u64) * (stbl->SampleSize->sampleCount) );
-			if (!CTSs) return GF_OUT_OF_MEM;
+	if (trak->editBox) {
+		GF_EdtsEntry *ent;
+		i=0;
+		while ((ent = (GF_EdtsEntry*)gf_list_enum(trak->editBox->editList->entryList, &i))) {
+			ent->mediaTime = (u32) (scale*ent->mediaTime);
 		}
+	}
+	if (! stbl || !stbl->TimeToSample || !stbl->TimeToSample->nb_entries) {
+		return SetTrackDuration(trak);
+	}
 
-		for (i=0; i<stbl->TimeToSample->nb_entries; i++) {
-			for (k=0; k<stbl->TimeToSample->entries[i].sampleCount; k++) {
-				cur_dts += stbl->TimeToSample->entries[i].sampleDelta;
-				DTSs[idx] = (u64) (cur_dts * scale);
-
-				if (stbl->CompositionOffset) {
-					s32 cts_o;
-					stbl_GetSampleCTS(stbl->CompositionOffset, idx+1, &cts_o);
-					CTSs[idx] = (s64) ( ((s64) cur_dts + cts_o) * scale);
-				}
+	idx = 0;
+	cur_dts = 0;
+	//unpack the DTSs
+	DTSs = (u64*)gf_malloc(sizeof(u64) * (stbl->SampleSize->sampleCount) );
+	if (!DTSs) return GF_OUT_OF_MEM;
+
+	CTSs = NULL;
+	if (stbl->CompositionOffset) {
+		CTSs = (s64*)gf_malloc(sizeof(u64) * (stbl->SampleSize->sampleCount) );
+		if (!CTSs) return GF_OUT_OF_MEM;
+	}
+
+	for (i=0; i<stbl->TimeToSample->nb_entries; i++) {
+		for (k=0; k<stbl->TimeToSample->entries[i].sampleCount; k++) {
+			cur_dts += stbl->TimeToSample->entries[i].sampleDelta;
+			DTSs[idx] = (u64) (cur_dts * scale);
+
+			if (stbl->CompositionOffset) {
+				s32 cts_o;
+				stbl_GetSampleCTS(stbl->CompositionOffset, idx+1, &cts_o);
+				CTSs[idx] = (s64) ( ((s64) cur_dts + cts_o) * scale);
+			}
+			idx++;
+		}
+	}
+	last_delta = (u32) (stbl->TimeToSample->entries[stbl->TimeToSample->nb_entries-1].sampleDelta * scale);
+
+	//repack DTS
+	if (stbl->SampleSize->sampleCount) {
+		stbl->TimeToSample->entries = gf_realloc(stbl->TimeToSample->entries, sizeof(GF_SttsEntry)*stbl->SampleSize->sampleCount);
+		memset(stbl->TimeToSample->entries, 0, sizeof(GF_SttsEntry)*stbl->SampleSize->sampleCount);
+		stbl->TimeToSample->entries[0].sampleDelta = (u32) DTSs[0];
+		stbl->TimeToSample->entries[0].sampleCount = 1;
+		idx=0;
+		for (i=1; i< stbl->SampleSize->sampleCount - 1; i++) {
+			if (DTSs[i+1] - DTSs[i] == stbl->TimeToSample->entries[idx].sampleDelta) {
+				stbl->TimeToSample->entries[idx].sampleCount++;
+			} else {
 				idx++;
+				stbl->TimeToSample->entries[idx].sampleDelta = (u32) ( DTSs[i+1] - DTSs[i] );
+				stbl->TimeToSample->entries[idx].sampleCount=1;
 			}
 		}
-		last_delta = (u32) (stbl->TimeToSample->entries[stbl->TimeToSample->nb_entries-1].sampleDelta * scale);
-
-		//repack DTS
-		if (stbl->SampleSize->sampleCount) {
-			stbl->TimeToSample->entries = gf_realloc(stbl->TimeToSample->entries, sizeof(GF_SttsEntry)*stbl->SampleSize->sampleCount);
-			memset(stbl->TimeToSample->entries, 0, sizeof(GF_SttsEntry)*stbl->SampleSize->sampleCount);
-			stbl->TimeToSample->entries[0].sampleDelta = (u32) DTSs[0];
-			stbl->TimeToSample->entries[0].sampleCount = 1;
-			idx=0;
-			for (i=1; i< stbl->SampleSize->sampleCount - 1; i++) {
-				if (DTSs[i+1] - DTSs[i] == stbl->TimeToSample->entries[idx].sampleDelta) {
-					stbl->TimeToSample->entries[idx].sampleCount++;
-				} else {
-					idx++;
-					stbl->TimeToSample->entries[idx].sampleDelta = (u32) ( DTSs[i+1] - DTSs[i] );
-					stbl->TimeToSample->entries[idx].sampleCount=1;
-				}
-			}
+		if (stbl->SampleSize->sampleCount > 1) {
 			//add the sample delta for the last sample
 			if (stbl->TimeToSample->entries[idx].sampleDelta == last_delta) {
 				stbl->TimeToSample->entries[idx].sampleCount++;
@@ -4818,39 +5134,40 @@
 			stbl->TimeToSample->nb_entries = idx+1;
 			stbl->TimeToSample->entries = gf_realloc(stbl->TimeToSample->entries, sizeof(GF_SttsEntry)*stbl->TimeToSample->nb_entries);
 		}
+	}
 
-		if (CTSs && stbl->SampleSize->sampleCount>0) {
-			//repack CTS
-			stbl->CompositionOffset->entries = gf_realloc(stbl->CompositionOffset->entries, sizeof(GF_DttsEntry)*stbl->SampleSize->sampleCount);
-			memset(stbl->CompositionOffset->entries, 0, sizeof(GF_DttsEntry)*stbl->SampleSize->sampleCount);
-			stbl->CompositionOffset->entries[0].decodingOffset = (s32) (CTSs[0] - DTSs[0]);
-			stbl->CompositionOffset->entries[0].sampleCount = 1;
-			idx=0;
-			for (i=1; i< stbl->SampleSize->sampleCount; i++) {
-				s32 cts_o = (s32) (CTSs[i] - DTSs[i]);
-				if (cts_o == stbl->CompositionOffset->entries[idx].decodingOffset) {
-					stbl->CompositionOffset->entries[idx].sampleCount++;
-				} else {
-					idx++;
-					stbl->CompositionOffset->entries[idx].decodingOffset = cts_o;
-					stbl->CompositionOffset->entries[idx].sampleCount=1;
-				}
+	if (CTSs && stbl->SampleSize->sampleCount>0) {
+		//repack CTS
+		stbl->CompositionOffset->entries = gf_realloc(stbl->CompositionOffset->entries, sizeof(GF_DttsEntry)*stbl->SampleSize->sampleCount);
+		memset(stbl->CompositionOffset->entries, 0, sizeof(GF_DttsEntry)*stbl->SampleSize->sampleCount);
+		stbl->CompositionOffset->entries[0].decodingOffset = (s32) (CTSs[0] - DTSs[0]);
+		stbl->CompositionOffset->entries[0].sampleCount = 1;
+		idx=0;
+		for (i=1; i< stbl->SampleSize->sampleCount; i++) {
+			s32 cts_o = (s32) (CTSs[i] - DTSs[i]);
+			if (cts_o == stbl->CompositionOffset->entries[idx].decodingOffset) {
+				stbl->CompositionOffset->entries[idx].sampleCount++;
+			} else {
+				idx++;
+				stbl->CompositionOffset->entries[idx].decodingOffset = cts_o;
+				stbl->CompositionOffset->entries[idx].sampleCount=1;
 			}
-			stbl->CompositionOffset->nb_entries = idx+1;
-			stbl->CompositionOffset->entries = gf_realloc(stbl->CompositionOffset->entries, sizeof(GF_DttsEntry)*stbl->CompositionOffset->nb_entries);
-
-			gf_free(CTSs);
 		}
-		gf_free(DTSs);
+		stbl->CompositionOffset->nb_entries = idx+1;
+		stbl->CompositionOffset->entries = gf_realloc(stbl->CompositionOffset->entries, sizeof(GF_DttsEntry)*stbl->CompositionOffset->nb_entries);
 
-		if (stbl->CompositionToDecode) {
-			stbl->CompositionToDecode->compositionEndTime = (s32) (stbl->CompositionToDecode->compositionEndTime * scale);
-			stbl->CompositionToDecode->compositionStartTime = (s32)(stbl->CompositionToDecode->compositionStartTime * scale);
-			stbl->CompositionToDecode->compositionToDTSShift = (s32)(stbl->CompositionToDecode->compositionToDTSShift * scale);
-			stbl->CompositionToDecode->greatestDecodeToDisplayDelta = (s32)(stbl->CompositionToDecode->greatestDecodeToDisplayDelta * scale);
-			stbl->CompositionToDecode->leastDecodeToDisplayDelta = (s32)(stbl->CompositionToDecode->leastDecodeToDisplayDelta * scale);
-		}
+		gf_free(CTSs);
 	}
+	gf_free(DTSs);
+
+	if (stbl->CompositionToDecode) {
+		stbl->CompositionToDecode->compositionEndTime = (s32) (stbl->CompositionToDecode->compositionEndTime * scale);
+		stbl->CompositionToDecode->compositionStartTime = (s32)(stbl->CompositionToDecode->compositionStartTime * scale);
+		stbl->CompositionToDecode->compositionToDTSShift = (s32)(stbl->CompositionToDecode->compositionToDTSShift * scale);
+		stbl->CompositionToDecode->greatestDecodeToDisplayDelta = (s32)(stbl->CompositionToDecode->greatestDecodeToDisplayDelta * scale);
+		stbl->CompositionToDecode->leastDecodeToDisplayDelta = (s32)(stbl->CompositionToDecode->leastDecodeToDisplayDelta * scale);
+	}
+
 	return SetTrackDuration(trak);
 }
 
@@ -4911,14 +5228,15 @@
 
 	need_memcmp = GF_TRUE;
 	for (i=0; i<count; i++) {
-		GF_Box *ent1 = (GF_Box *)gf_list_get(trak1->Media->information->sampleTable->SampleDescription->child_boxes, i);
-		GF_Box *ent2 = (GF_Box *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->child_boxes, i);
+		GF_SampleEntryBox *ent1 = (GF_SampleEntryBox *)gf_list_get(trak1->Media->information->sampleTable->SampleDescription->child_boxes, i);
+		GF_SampleEntryBox *ent2 = (GF_SampleEntryBox *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->child_boxes, i);
 
-		if (sdesc_index1) ent1 = (GF_Box *)gf_list_get(trak1->Media->information->sampleTable->SampleDescription->child_boxes, sdesc_index1 - 1);
-		if (sdesc_index2) ent2 = (GF_Box *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->child_boxes, sdesc_index2 - 1);
+		if (sdesc_index1) ent1 = (GF_SampleEntryBox *)gf_list_get(trak1->Media->information->sampleTable->SampleDescription->child_boxes, sdesc_index1 - 1);
+		if (sdesc_index2) ent2 = (GF_SampleEntryBox *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->child_boxes, sdesc_index2 - 1);
 
 		if (!ent1 || !ent2) return GF_FALSE;
 		if (ent1->type != ent2->type) return GF_FALSE;
+		if (ent1->internal_type != ent2->internal_type) return GF_FALSE;
 
 		switch (ent1->type) {
 		/*for MPEG-4 streams, only compare decSpecInfo (bitrate may not be the same but that's not an issue)*/
@@ -4938,6 +5256,8 @@
 			if (!esd1->decoderConfig->decoderSpecificInfo && esd2->decoderConfig->decoderSpecificInfo) return GF_FALSE;
 			if (esd1->decoderConfig->decoderSpecificInfo && !esd2->decoderConfig->decoderSpecificInfo) return GF_FALSE;
 			if (!esd1->decoderConfig->decoderSpecificInfo || !esd2->decoderConfig->decoderSpecificInfo) continue;
+			if (esd1->decoderConfig->decoderSpecificInfo->dataLength != esd2->decoderConfig->decoderSpecificInfo->dataLength)
+				return GF_FALSE;
 			if (memcmp(esd1->decoderConfig->decoderSpecificInfo->data, esd2->decoderConfig->decoderSpecificInfo->data, sizeof(char)*esd1->decoderConfig->decoderSpecificInfo->dataLength)!=0) return GF_FALSE;
 			break;
 		case GF_ISOM_BOX_TYPE_HVT1:
@@ -4955,6 +5275,13 @@
 		case GF_ISOM_BOX_TYPE_LHE1:
 		case GF_ISOM_BOX_TYPE_LHV1:
 		case GF_ISOM_BOX_TYPE_AV01:
+		case GF_ISOM_BOX_TYPE_VVC1:
+		case GF_ISOM_BOX_TYPE_VVI1:
+		case GF_ISOM_BOX_TYPE_DVHE:
+		case GF_ISOM_BOX_TYPE_DVH1:
+		case GF_ISOM_BOX_TYPE_DVA1:
+		case GF_ISOM_BOX_TYPE_DVAV:
+		case GF_ISOM_BOX_TYPE_DAV1:
 		{
 			GF_MPEGVisualSampleEntryBox *avc1 = (GF_MPEGVisualSampleEntryBox *)ent1;
 			GF_MPEGVisualSampleEntryBox *avc2 = (GF_MPEGVisualSampleEntryBox *)ent2;
@@ -5059,18 +5386,41 @@
 		case GF_QT_SUBTYPE_QDMC2:
 		case GF_QT_SUBTYPE_QCELP:
 		case GF_QT_SUBTYPE_kMP3:
-			return GF_TRUE;
-		case GF_QT_SUBTYPE_RAW_VID:
 		case GF_QT_SUBTYPE_APCH:
 		case GF_QT_SUBTYPE_APCO:
 		case GF_QT_SUBTYPE_APCN:
 		case GF_QT_SUBTYPE_APCS:
 		case GF_QT_SUBTYPE_AP4X:
 		case GF_QT_SUBTYPE_AP4H:
-		case GF_QT_SUBTYPE_YUV422:
+		case GF_QT_SUBTYPE_RAW_VID:
+		case GF_QT_SUBTYPE_YUYV:
+		case GF_QT_SUBTYPE_UYVY:
 		case GF_QT_SUBTYPE_YUV444:
+		case GF_QT_SUBTYPE_YUVA444:
 		case GF_QT_SUBTYPE_YUV422_10:
 		case GF_QT_SUBTYPE_YUV444_10:
+		case GF_QT_SUBTYPE_YUV422_16:
+		case GF_QT_SUBTYPE_YUV420:
+		case GF_QT_SUBTYPE_I420:
+		case GF_QT_SUBTYPE_IYUV:
+		case GF_QT_SUBTYPE_YV12:
+		case GF_QT_SUBTYPE_YVYU:
+		case GF_QT_SUBTYPE_RGBA:
+		case GF_QT_SUBTYPE_ABGR:
+		default:
+			if (ent1->internal_type == GF_ISOM_SAMPLE_ENTRY_VIDEO) {
+				GF_VisualSampleEntryBox *vent1 = (GF_VisualSampleEntryBox *) ent1;
+				GF_VisualSampleEntryBox *vent2 = (GF_VisualSampleEntryBox *) ent2;
+				if (vent1->Width != vent2->Width) return GF_FALSE;
+				if (vent1->Height != vent2->Height) return GF_FALSE;
+			}
+			else if (ent1->internal_type == GF_ISOM_SAMPLE_ENTRY_AUDIO) {
+				GF_AudioSampleEntryBox *aent1 = (GF_AudioSampleEntryBox *) ent1;
+				GF_AudioSampleEntryBox *aent2 = (GF_AudioSampleEntryBox *) ent2;
+				if (aent1->samplerate_hi != aent2->samplerate_hi) return GF_FALSE;
+				if (aent1->samplerate_lo != aent2->samplerate_lo) return GF_FALSE;
+				if (aent1->channel_count != aent2->channel_count) return GF_FALSE;
+			}
 			return GF_TRUE;
 		}
 
@@ -5217,6 +5567,21 @@
 }
 
 
+//set the max SamplesPerChunk (for file optimization)
+GF_EXPORT
+GF_Err gf_isom_hint_max_chunk_duration(GF_ISOFile *movie, u32 trackNumber, u32 maxChunkDur)
+{
+	GF_TrackBox *trak;
+
+	if (movie->openMode == GF_ISOM_OPEN_READ) return GF_ISOM_INVALID_MODE;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	trak->Media->information->sampleTable->MaxChunkDur = maxChunkDur;
+	return GF_OK;
+}
+
+
 GF_EXPORT
 GF_Err gf_isom_set_extraction_slc(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const GF_SLConfig *slConfig)
 {
@@ -5224,6 +5589,7 @@
 	GF_SampleEntryBox *entry;
 	GF_Err e;
 	GF_SLConfig **slc;
+	GF_ESDBox *esds;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
@@ -5234,19 +5600,25 @@
 	//we must be sure we are not using a remote ESD
 	switch (entry->type) {
 	case GF_ISOM_BOX_TYPE_MP4S:
-		if (((GF_MPEGSampleEntryBox *)entry)->esd->desc->slConfig->predefined != SLPredef_MP4) return GF_BAD_PARAM;
+		esds = ((GF_MPEGSampleEntryBox *)entry)->esd;
+		if (!esds || !esds->desc || !esds->desc->slConfig || (esds->desc->slConfig->predefined != SLPredef_MP4))
+			return GF_ISOM_INVALID_FILE;
 		slc = & ((GF_MPEGSampleEntryBox *)entry)->slc;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4A:
-		if (((GF_MPEGAudioSampleEntryBox *)entry)->esd->desc->slConfig->predefined != SLPredef_MP4) return GF_BAD_PARAM;
+		esds = ((GF_MPEGAudioSampleEntryBox *)entry)->esd;
+		if (!esds || !esds->desc || !esds->desc->slConfig || (esds->desc->slConfig->predefined != SLPredef_MP4))
+			return GF_ISOM_INVALID_FILE;
 		slc = & ((GF_MPEGAudioSampleEntryBox *)entry)->slc;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4V:
-		if (((GF_MPEGVisualSampleEntryBox *)entry)->esd->desc->slConfig->predefined != SLPredef_MP4) return GF_BAD_PARAM;
+		esds = ((GF_MPEGVisualSampleEntryBox *)entry)->esd;
+		if (!esds || !esds->desc || !esds->desc->slConfig || (esds->desc->slConfig->predefined != SLPredef_MP4))
+			return GF_ISOM_INVALID_FILE;
 		slc = & ((GF_MPEGVisualSampleEntryBox *)entry)->slc;
 		break;
 	default:
-		return GF_BAD_PARAM;
+		return GF_OK;
 	}
 
 	if (*slc) {
@@ -5316,21 +5688,33 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_make_interleave(GF_ISOFile *file, Double TimeInSec)
+GF_Err gf_isom_make_interleave_ex(GF_ISOFile *file, GF_Fraction *fTimeInSec)
 {
 	GF_Err e;
-	if (!file) return GF_BAD_PARAM;
+	u64 itime;
+	if (!file || !fTimeInSec->den || (fTimeInSec->num<=0)) return GF_BAD_PARAM;
 
+	itime = (u64) fTimeInSec->num;
+	itime *= gf_isom_get_timescale(file);
+	itime /= fTimeInSec->den;
 	if (file->storageMode==GF_ISOM_STORE_FASTSTART) {
-		return gf_isom_set_interleave_time(file, (u32) (TimeInSec * gf_isom_get_timescale(file)));
+		return gf_isom_set_interleave_time(file, (u32) itime);
 	}
 	if (gf_isom_get_mode(file) < GF_ISOM_OPEN_EDIT) return GF_BAD_PARAM;
 	e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_DRIFT_INTERLEAVED);
 	if (e) return e;
-	return gf_isom_set_interleave_time(file, (u32) (TimeInSec * gf_isom_get_timescale(file)));
+	return gf_isom_set_interleave_time(file, (u32) itime);
 }
 
+GF_EXPORT
+GF_Err gf_isom_make_interleave(GF_ISOFile *file, Double TimeInSec)
+{
+	GF_Fraction f;
+	f.num = (s32) (TimeInSec * 1000);
+	f.den = 1000;
+	return gf_isom_make_interleave_ex(file, &f);
 
+}
 GF_EXPORT
 GF_Err gf_isom_set_handler_name(GF_ISOFile *the_file, u32 trackNumber, const char *nameUTF8)
 {
@@ -5477,7 +5861,15 @@
 
 	entry = (GF_SampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, sampleDescriptionIndex - 1);
 	if (!entry) return GF_BAD_PARAM;
-	entry->type = new_type;
+	if (entry->type==GF_ISOM_BOX_TYPE_GNRV) {
+		((GF_GenericVisualSampleEntryBox *)entry)->EntryType = new_type;
+	} else if (entry->type==GF_ISOM_BOX_TYPE_GNRA) {
+		((GF_GenericAudioSampleEntryBox *)entry)->EntryType = new_type;
+	} else if (entry->type==GF_ISOM_BOX_TYPE_GNRM) {
+		((GF_GenericSampleEntryBox *)entry)->EntryType = new_type;
+	} else {
+		entry->type = new_type;
+	}
 	return GF_OK;
 }
 
@@ -5560,32 +5952,59 @@
 	return GF_OK;
 }
 
-/*Apple extensions*/
 
 GF_EXPORT
-GF_Err gf_isom_apple_set_tag(GF_ISOFile *mov, GF_ISOiTunesTag tag, const u8 *data, u32 data_len)
+GF_Err gf_isom_apple_set_tag(GF_ISOFile *mov, GF_ISOiTunesTag tag, const u8 *data, u32 data_len, u64 int_val, u32 int_val2)
 {
-	GF_BitStream *bs;
 	GF_Err e;
 	GF_ItemListBox *ilst;
 	GF_MetaBox *meta;
 	GF_ListItemBox *info;
-	u32 btype, i;
-
+	u32 btype, i, itype;
+	s32 tag_idx;
+	u32 n=0, d=0;
+	u8 loc_data[10];
+	u32 int_flags = 0x15;
+	GF_DataBox *dbox;
 
 	e = CanAccessMovie(mov, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
-	meta = gf_isom_apple_create_meta_extensions(mov);
+	tag_idx = gf_itags_find_by_itag(tag);
+	if (tag_idx<0) {
+		itype = GF_ITAG_STR;
+	} else {
+		itype = gf_itags_get_type(tag_idx);
+	}
+	meta = (GF_MetaBox *) gf_isom_create_meta_extensions(mov, GF_FALSE);
 	if (!meta) return GF_BAD_PARAM;
 
-	ilst = gf_ismo_locate_box(meta->child_boxes, GF_ISOM_BOX_TYPE_ILST, NULL);
+	ilst = gf_isom_locate_box(meta->child_boxes, GF_ISOM_BOX_TYPE_ILST, NULL);
 	if (!ilst) {
 		ilst = (GF_ItemListBox *) gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_ILST);
 	}
 
+	if (tag==GF_ISOM_ITUNE_RESET) {
+		gf_isom_box_del_parent(&meta->child_boxes, (GF_Box *) ilst);
+		//if last, delete udta - we may still have a handler box remaining
+		if ((gf_list_count(meta->child_boxes) <= 1) && (gf_list_count(mov->moov->udta->recordList)==1)) {
+			gf_isom_box_del_parent(&mov->moov->child_boxes, (GF_Box *) mov->moov->udta);
+			mov->moov->udta = NULL;
+		}
+		return GF_OK;
+	}
+
 	if (tag==GF_ISOM_ITUNE_GENRE) {
-		btype = data ? GF_ISOM_BOX_TYPE_0xA9GEN : GF_ISOM_BOX_TYPE_GNRE;
+		if (!int_val && data) {
+			int_val = gf_id3_get_genre_tag(data);
+			if (int_val) {
+				data = NULL;
+				data_len = 0;
+				itype = GF_ITAG_INT16;
+				int_flags = 0;
+			}
+		}
+		btype = data ? GF_ISOM_ITUNE_GENRE_USER : GF_ISOM_ITUNE_GENRE;
 	} else {
 		btype = tag;
 	}
@@ -5597,73 +6016,152 @@
 			info = NULL;
 			break;
 		}
+		if (info->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
+			GF_UnknownBox *u = (GF_UnknownBox *) info;
+			if (u->original_4cc==btype) {
+				gf_isom_box_del_parent(&ilst->child_boxes, (GF_Box *) info);
+				info = NULL;
+				break;
+			}
+		}
 	}
 
-	if (data != NULL) {
+	if (!data && data_len) {
+		if (!gf_list_count(ilst->child_boxes) )
+			gf_isom_box_del_parent(&meta->child_boxes, (GF_Box *) ilst);
+		return GF_OK;
+	}
+
+	//watch out for cprt, we don't want to create a regular cprt box
+	if (btype==GF_ISOM_ITUNE_COPYRIGHT) {
+		info = (GF_ListItemBox *)gf_isom_box_new(GF_ISOM_ITUNE_TOOL);
+		info->type = GF_ISOM_ITUNE_COPYRIGHT;
+	} else {
 		info = (GF_ListItemBox *)gf_isom_box_new(btype);
-		if (info == NULL) return GF_OUT_OF_MEM;
-		switch (btype) {
-		case GF_ISOM_BOX_TYPE_TRKN:
-		case GF_ISOM_BOX_TYPE_DISK:
-		case GF_ISOM_BOX_TYPE_GNRE:
-			info->data->flags = 0x0;
-			break;
-		case GF_ISOM_BOX_TYPE_PGAP:
-		case GF_ISOM_BOX_TYPE_CPIL:
-			info->data->flags = 0x15;
-			break;
-		default:
-			if (info->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
-				info = (GF_ListItemBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TRKN);
-				if (info == NULL) return GF_OUT_OF_MEM;
-				info->type = btype;
+	}
+	if (info == NULL) return GF_OUT_OF_MEM;
+
+	dbox = (GF_DataBox *)gf_isom_box_new_parent(&info->child_boxes, GF_ISOM_BOX_TYPE_DATA);
+	if (!dbox) {
+		gf_isom_box_del((GF_Box *)info);
+		return GF_OUT_OF_MEM;
+	}
+	if (info->type!=GF_ISOM_BOX_TYPE_UNKNOWN) {
+		info->data = dbox;
+	}
+
+	switch (itype) {
+	case GF_ITAG_FRAC6:
+	case GF_ITAG_FRAC8:
+		if (data && data_len) {
+			if (sscanf(data, "%u/%u", &n, &d) != 2) {
+				n = d = 0;
+				if (sscanf(data, "%u", &n) != 1)
+					n = 0;
 			}
-			info->data->flags = 0x1;
-			break;
+		} else {
+			n = (u32) int_val;
+			d = int_val2;
 		}
-		if (tag==GF_ISOM_ITUNE_COVER_ART) {
-			if (data_len & 0x80000000) {
-				data_len = (data_len & 0x7FFFFFFF);
-				info->data->flags = 14;
-			} else {
-				info->data->flags = 13;
-			}
+		if (n) {
+			memset(loc_data, 0, sizeof(char) * 8);
+			data_len = (itype == GF_ITAG_FRAC6) ? 6 : 8;
+			loc_data[3] = n;
+			loc_data[2] = n >> 8;
+			loc_data[5] = d;
+			loc_data[4] = d >> 8;
+			data = loc_data;
+		} else {
+			data = NULL;
 		}
-		info->data->dataSize = data_len;
-		info->data->data = (char*)gf_malloc(sizeof(char)*data_len);
-		if (!info->data->data) return GF_OUT_OF_MEM;
-		memcpy(info->data->data , data, sizeof(char)*data_len);
-	}
-	else if (data_len && (tag==GF_ISOM_ITUNE_GENRE)) {
-		info = (GF_ListItemBox *)gf_isom_box_new(btype);
-		if (info == NULL) return GF_OUT_OF_MEM;
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_u16(bs, data_len);
-		gf_bs_get_content(bs, & info->data->data, &info->data->dataSize);
-		info->data->flags = 0x0;
-		gf_bs_del(bs);
-	} else if (data_len && (tag==GF_ISOM_ITUNE_COMPILATION)) {
-		info = (GF_ListItemBox *)gf_isom_box_new(btype);
-		if (info == NULL) return GF_OUT_OF_MEM;
-		info->data->data = (char*)gf_malloc(sizeof(char));
-		if (!info->data->data) return GF_OUT_OF_MEM;
-		info->data->data[0] = 1;
-		info->data->dataSize = 1;
-		info->data->flags = 21;
-	} else if (data_len && (tag==GF_ISOM_ITUNE_TEMPO)) {
-		info = (GF_ListItemBox *)gf_isom_box_new(btype);
-		if (info == NULL) return GF_OUT_OF_MEM;
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_u16(bs, data_len);
-		gf_bs_get_content(bs, &info->data->data, &info->data->dataSize);
-		info->data->flags = 0x15;
-		gf_bs_del(bs);
+		dbox->flags = 0x15;
+		break;
+	case GF_ITAG_BOOL:
+		loc_data[0] = 0;
+		if (data && data_len) {
+			if ( !strcmp(data, "yes") || !strcmp(data, "1") || !strcmp(data, "true"))
+				loc_data[0] = 1;
+		} else {
+			loc_data[0] = int_val ? 1 : 0;
+		}
+		data = loc_data;
+		data_len = 1;
+		dbox->flags = int_flags;
+		break;
+	case GF_ITAG_INT8:
+		loc_data[0] = 0;
+		if (data && data_len) int_val = atoi(data);
+		loc_data[0] = (u8) int_val;
+		data = loc_data;
+		data_len = 1;
+		dbox->flags = int_flags;
+		break;
+	case GF_ITAG_INT16:
+		loc_data[0] = 0;
+		if (data && data_len) int_val = atoi(data);
+		loc_data[1] = (u8) int_val;
+		loc_data[0] = (u8) (int_val>>8);
+		data = loc_data;
+		data_len = 2;
+		dbox->flags = int_flags;
+		break;
+	case GF_ITAG_INT32:
+		loc_data[0] = 0;
+		if (data && data_len) int_val = atoi(data);
+		loc_data[3] = (u8) int_val;
+		loc_data[2] = (u8) (int_val>>8);
+		loc_data[1] = (u8) (int_val>>16);
+		loc_data[0] = (u8) (int_val>>24);
+		data = loc_data;
+		data_len = 4;
+		dbox->flags = int_flags;
+		break;
+	case GF_ITAG_INT64:
+		loc_data[0] = 0;
+		if (data && data_len) sscanf(data, LLU, &int_val);
+		loc_data[7] = (u8) int_val;
+		loc_data[6] = (u8) (int_val>>8);
+		loc_data[5] = (u8) (int_val>>16);
+		loc_data[4] = (u8) (int_val>>24);
+		loc_data[3] = (u8) (int_val>>32);
+		loc_data[2] = (u8) (int_val>>40);
+		loc_data[1] = (u8) (int_val>>48);
+		loc_data[0] = (u8) (int_val>>56);
+		data = loc_data;
+		data_len = 8;
+		dbox->flags = int_flags;
+		break;
+	default:
+		dbox->flags = 1;
+		break;
 	}
 
-	if (!info || (tag==GF_ISOM_ITUNE_ALL) ) {
-		if (!gf_list_count(ilst->child_boxes) || (tag==GF_ISOM_ITUNE_ALL) ) {
-			gf_isom_box_del_parent(&meta->child_boxes, (GF_Box *) ilst);
+	if (!data) return GF_BAD_PARAM;
+
+
+	if (tag==GF_ISOM_ITUNE_COVER_ART) {
+		info->data->flags = 0;
+		/*check for PNG sig*/
+		if ((data_len>4) && (data[0] == 0x89) && (data[1] == 0x50) && (data[2] == 0x4E) && (data[3] == 0x47) ) {
+			info->data->flags = 14;
+		}
+		//JPG and JFIF - do not check second tag type
+		else if ((data_len>4) && (data[0] == 0xFF) && (data[1] == 0xD8) && (data[2] == 0xFF) /*&& ((data[3] == 0xE0) || (data[3] == 0xDB))*/ ) {
+			info->data->flags = 13;
+		}
+		//GIF
+		else if ((data_len>3) && (data[0] == 'G') && (data[1] == 'I') && (data[2] == 'F') ) {
+			info->data->flags = 12;
 		}
+	}
+
+	dbox->dataSize = data_len;
+	dbox->data = (char*)gf_malloc(sizeof(char)*data_len);
+	if (!dbox->data) return GF_OUT_OF_MEM;
+	memcpy(dbox->data, data, sizeof(char)*data_len);
+
+	if (!info && !gf_list_count(ilst->child_boxes) ) {
+		gf_isom_box_del_parent(&meta->child_boxes, (GF_Box *) ilst);
 		return GF_OK;
 	}
 	if (!ilst->child_boxes) ilst->child_boxes = gf_list_new();
@@ -5671,6 +6169,70 @@
 	return gf_list_add(ilst->child_boxes, info);
 }
 
+#include <gpac/utf.h>
+
+GF_EXPORT
+GF_Err gf_isom_wma_set_tag(GF_ISOFile *mov, char *name, char *value)
+{
+	GF_Err e;
+	GF_XtraTag *tag=NULL;
+	u32 count, i;
+	GF_XtraBox *xtra;
+
+	e = CanAccessMovie(mov, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	gf_isom_create_meta_extensions(mov, GF_FALSE);
+
+	xtra = (GF_XtraBox *) gf_isom_create_meta_extensions(mov, GF_TRUE);
+	if (!xtra) return GF_BAD_PARAM;
+
+	count = gf_list_count(xtra->tags);
+	for (i=0; i<count; i++) {
+		tag = gf_list_get(xtra->tags, i);
+		if (name && tag->name && !strcmp(tag->name, name)) {
+
+		} else {
+			tag = NULL;
+			continue;
+		}
+
+		if (!value) {
+			gf_list_rem(xtra->tags, i);
+			gf_free(tag->name);
+			if (tag->prop_value) gf_free(tag->prop_value);
+			gf_free(tag);
+			return GF_OK;
+		}
+		gf_free(tag->prop_value);
+		tag->prop_value = 0;
+	}
+	if (!tag) {
+		if (!name) return GF_OK;
+
+		GF_SAFEALLOC(tag, GF_XtraTag);
+		tag->name = gf_strdup(name);
+		tag->prop_type = 0;
+		tag->flags = 1;
+		gf_list_add(xtra->tags, tag);
+	}
+
+	u32 len = (u32) strlen(value);
+	tag->prop_value = gf_malloc(sizeof(u16) * (len+1) );
+	memset(tag->prop_value, 0, sizeof(u16) * (len+1) );
+	if (len) {
+		u32 _len = gf_utf8_mbstowcs((u16 *) tag->prop_value, len, (const char **) &value);
+		if (_len == GF_UTF8_FAIL) _len = 0;
+		tag->prop_value[2 * _len] = 0;
+		tag->prop_value[2 * _len + 1] = 0;
+		tag->prop_size = 2 * _len + 2;
+	} else {
+		tag->prop_size = 2;
+	}
+	return GF_OK;
+}
+
+
 GF_EXPORT
 GF_Err gf_isom_set_alternate_group_id(GF_ISOFile *movie, u32 trackNumber, u32 groupId)
 {
@@ -5753,7 +6315,7 @@
 	tsel = NULL;
 	if (*switchGroupID) {
 		if (!trak->udta) {
-			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA));
+			e = trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 			if (e) return e;
 		}
 
@@ -5771,7 +6333,7 @@
 		if (!tsel) {
 			tsel = (GF_TrackSelectionBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_TSEL);
 			if (!tsel) return GF_OUT_OF_MEM;
-			e = udta_on_child_box((GF_Box *)trak->udta, (GF_Box *) tsel);
+			e = udta_on_child_box((GF_Box *)trak->udta, (GF_Box *) tsel, GF_FALSE);
 			if (e) return e;
 		}
 
@@ -5894,7 +6456,7 @@
 
 	GF_RVCConfigurationBox *rvcc = (GF_RVCConfigurationBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_RVCC);
 	if (rvcc && rvcc->rvc_meta_idx) {
-		gf_isom_remove_meta_item(movie, GF_FALSE, track, rvcc->rvc_meta_idx);
+		gf_isom_remove_meta_item(movie, GF_FALSE, track, rvcc->rvc_meta_idx, GF_FALSE, NULL);
 		rvcc->rvc_meta_idx = 0;
 	}
 
@@ -5904,10 +6466,11 @@
 	}
 	rvcc->predefined_rvc_config = rvc_predefined;
 	if (!rvc_predefined) {
+		u32 it_id=0;
 		e = gf_isom_set_meta_type(movie, GF_FALSE, track, GF_META_TYPE_RVCI);
 		if (e) return e;
 		gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_ISO2, GF_TRUE);
-		e = gf_isom_add_meta_item_memory(movie, GF_FALSE, track, "rvcconfig.xml", 0, GF_META_ITEM_TYPE_MIME, mime, NULL, NULL, data, size, NULL);
+		e = gf_isom_add_meta_item_memory(movie, GF_FALSE, track, "rvcconfig.xml", &it_id, GF_META_ITEM_TYPE_MIME, mime, NULL, NULL, data, size, NULL);
 		if (e) return e;
 		rvcc->rvc_meta_idx = gf_isom_get_meta_item_count(movie, GF_FALSE, track);
 	}
@@ -5916,11 +6479,11 @@
 
 /*for now not exported*/
 /*expands sampleGroup table for the given grouping type and sample_number. If sample_number is 0, just appends an entry at the end of the table*/
-static GF_Err gf_isom_add_sample_group_entry(GF_List *sampleGroups, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, u32 sampleGroupDescriptionIndex, GF_List *parent)
+static GF_Err gf_isom_add_sample_group_entry(GF_List *sampleGroups, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, u32 sampleGroupDescriptionIndex, GF_List *parent, GF_SampleTableBox *stbl)
 {
 	GF_SampleGroupBox *sgroup = NULL;
 	u32 i, count, last_sample_in_entry;
-
+	Bool all_samples = GF_FALSE;
 	assert(sampleGroups);
 	count = gf_list_count(sampleGroups);
 	for (i=0; i<count; i++) {
@@ -5947,6 +6510,9 @@
 				sample_number += sgroup->sample_entries[i].sample_count;
 			}
 		}
+	} else if (sample_number==(u32) -1) {
+		all_samples = GF_TRUE;
+		sample_number = 1;
 	}
 
 	if (!sgroup->entry_count) {
@@ -5961,12 +6527,22 @@
 		}
 		sgroup->sample_entries[idx].sample_count = 1;
 		sgroup->sample_entries[idx].group_description_index = sampleGroupDescriptionIndex;
+		if (all_samples && stbl) {
+			sgroup->sample_entries[idx].sample_count = stbl->SampleSize->sampleCount;
+		}
+		return GF_OK;
+	}
+	if (all_samples && stbl) {
+		sgroup->entry_count = 1;
+		sgroup->sample_entries[0].group_description_index = sampleGroupDescriptionIndex;
+		sgroup->sample_entries[0].sample_count = stbl->SampleSize->sampleCount;
 		return GF_OK;
 	}
 	last_sample_in_entry = 0;
 	for (i=0; i<sgroup->entry_count; i++) {
 		/*TODO*/
-		if (last_sample_in_entry + sgroup->sample_entries[i].sample_count > sample_number) return GF_NOT_SUPPORTED;
+		if (last_sample_in_entry + sgroup->sample_entries[i].sample_count > sample_number)
+			return GF_NOT_SUPPORTED;
 		last_sample_in_entry += sgroup->sample_entries[i].sample_count;
 	}
 
@@ -6125,11 +6701,10 @@
 		parent = stbl->child_boxes;
 	}
 
-	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, entry_idx, parent);
+	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, entry_idx, parent, stbl);
 }
 
-/*for now not exported*/
-static GF_Err gf_isom_set_sample_group_info(GF_ISOFile *movie, u32 track, u32 trafID, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *udta, void *(*sg_create_entry)(void *udta), Bool (*sg_compare_entry)(void *udta, void *entry))
+static GF_Err gf_isom_set_sample_group_info_internal(GF_ISOFile *movie, u32 track, u32 trafID, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *udta, void *(*sg_create_entry)(void *udta), Bool (*sg_compare_entry)(void *udta, void *entry))
 {
 	GF_Err e;
 	GF_TrackBox *trak=NULL;
@@ -6169,23 +6744,48 @@
 }
 
 
-GF_EXPORT
-GF_Err gf_isom_add_sample_group_info(GF_ISOFile *movie, u32 track, u32 grouping_type, void *data, u32 data_size, Bool is_default, u32 *sampleGroupDescriptionIndex)
+GF_Err gf_isom_add_sample_group_info_internal(GF_ISOFile *movie, u32 track, u32 grouping_type, void *data, u32 data_size, Bool is_default, u32 *sampleGroupDescriptionIndex, Bool *is_traf_sgpd, Bool check_access)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	GF_TrackFragmentBox *traf=NULL;
+#else
+	void *traf=NULL;
+#endif
+	u32 trafID=0;
 	GF_DefaultSampleGroupDescriptionEntry *entry=NULL;
 	GF_SampleGroupDescriptionBox *sgdesc = NULL;
 
 	if (sampleGroupDescriptionIndex) *sampleGroupDescriptionIndex = 0;
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
 
-	trak = gf_isom_get_track_from_file(movie, track);
-	if (!trak) return GF_BAD_PARAM;
+	if (movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) {
+		trak = gf_isom_get_track_from_file(movie, track);
+		if (!trak) return GF_BAD_PARAM;
+		trafID = trak->Header->trackID;
+	}
+
+	if (trafID) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+		if (!movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) )
+			return GF_BAD_PARAM;
+
+		traf = gf_isom_get_traf(movie, trafID);
+#else
+		return GF_NOT_SUPPORTED;
+#endif
+	} else {
+		if (check_access) {
+			e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+			if (e) return e;
+		}
 
+		trak = gf_isom_get_track_from_file(movie, track);
+		if (!trak) return GF_BAD_PARAM;
+	}
 
-	sgdesc = get_sgdp(trak->Media->information->sampleTable, NULL, grouping_type, NULL);
+	//get sample group desc for this grouping type
+	sgdesc = get_sgdp(trak->Media->information->sampleTable, traf, grouping_type, is_traf_sgpd);
 	if (!sgdesc) return GF_OUT_OF_MEM;
 
 	if (grouping_type==GF_ISOM_SAMPLE_GROUP_OINF) {
@@ -6197,6 +6797,11 @@
 			gf_isom_oinf_del_entry(ptr);
 			return e;
 		}
+		//not in track, create new sgdp
+		if (traf && ! *is_traf_sgpd) {
+			sgdesc = get_sgdp(NULL, traf, grouping_type, is_traf_sgpd);
+			if (!sgdesc) return GF_OUT_OF_MEM;
+		}
 		e = gf_list_add(sgdesc->group_descriptions, ptr);
 		if (e) return e;
 		entry = (GF_DefaultSampleGroupDescriptionEntry *) ptr;
@@ -6209,6 +6814,12 @@
 			gf_isom_linf_del_entry(ptr);
 			return e;
 		}
+
+		if (traf && ! *is_traf_sgpd) {
+			sgdesc = get_sgdp(NULL, traf, grouping_type, is_traf_sgpd);
+			if (!sgdesc) return GF_OUT_OF_MEM;
+		}
+
 		e = gf_list_add(sgdesc->group_descriptions, ptr);
 		if (e) return e;
 		entry = (GF_DefaultSampleGroupDescriptionEntry *) ptr;
@@ -6232,6 +6843,12 @@
 			}
 			entry->length = data_size;
 			memcpy(entry->data, data, sizeof(char) * data_size);
+
+			if (traf && ! *is_traf_sgpd) {
+				sgdesc = get_sgdp(NULL, traf, grouping_type, is_traf_sgpd);
+				if (!sgdesc) return GF_OUT_OF_MEM;
+			}
+
 			e = gf_list_add(sgdesc->group_descriptions, entry);
 			if (e) {
 				gf_free(entry->data);
@@ -6250,6 +6867,80 @@
 
 	return GF_OK;
 }
+GF_EXPORT
+GF_Err gf_isom_add_sample_group_info(GF_ISOFile *movie, u32 track, u32 grouping_type, void *data, u32 data_size, Bool is_default, u32 *sampleGroupDescriptionIndex)
+{
+	return gf_isom_add_sample_group_info_internal(movie, track, grouping_type, data, data_size, is_default, sampleGroupDescriptionIndex, NULL, GF_TRUE);
+}
+
+GF_Err gf_isom_set_sample_group_description_internal(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size, Bool check_access)
+{
+	u32 sampleGroupDescriptionIndex, trafID=0;
+	GF_Err e;
+	Bool is_traf_sgpd;
+	GF_List *groupList=NULL, *parent=NULL;
+	e = gf_isom_add_sample_group_info_internal(movie, track, grouping_type, data, data_size, GF_FALSE, &sampleGroupDescriptionIndex, &is_traf_sgpd, check_access);
+	if (e) return e;
+
+
+	GF_SampleTableBox *stbl=NULL;
+	GF_TrackBox *trak=NULL;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	GF_TrackFragmentBox *traf=NULL;
+#endif
+	if (movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) {
+		trak = gf_isom_get_track_from_file(movie, track);
+		if (!trak) return GF_BAD_PARAM;
+		trafID = trak->Header->trackID;
+	}
+
+	if (trafID) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+		if (!movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) )
+			return GF_BAD_PARAM;
+
+		traf = gf_isom_get_traf(movie, trafID);
+#else
+		return GF_NOT_SUPPORTED;
+#endif
+
+	} else if (track) {
+		if (check_access) {
+			e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+			if (e) return e;
+		}
+
+		trak = gf_isom_get_track_from_file(movie, track);
+		if (!trak) return GF_BAD_PARAM;
+	}
+
+	/*look in stbl or traf for sample sampleGroups*/
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (traf) {
+		if (!traf->sampleGroups)
+			traf->sampleGroups = gf_list_new();
+		groupList = traf->sampleGroups;
+		parent = traf->child_boxes;
+		if (sampleGroupDescriptionIndex && is_traf_sgpd)
+			sampleGroupDescriptionIndex |= 0x10000;
+	} else
+#endif
+	{
+		stbl = trak->Media->information->sampleTable;
+		if (!stbl->sampleGroups)
+			stbl->sampleGroups = gf_list_new();
+		groupList = stbl->sampleGroups;
+		parent = stbl->child_boxes;
+	}
+
+	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex, parent, stbl);
+
+}
+
+GF_Err gf_isom_set_sample_group_description(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size)
+{
+	return gf_isom_set_sample_group_description_internal(movie, track, sample_number, grouping_type, grouping_type_parameter, data, data_size, GF_TRUE);
+}
 
 GF_EXPORT
 GF_Err gf_isom_remove_sample_group(GF_ISOFile *movie, u32 track, u32 grouping_type)
@@ -6307,7 +6998,7 @@
 		trak->Media->information->sampleTable->sampleGroups = gf_list_new();
 
 	groupList = trak->Media->information->sampleTable->sampleGroups;
-	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex, trak->Media->information->sampleTable->child_boxes);
+	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex, trak->Media->information->sampleTable->child_boxes, trak->Media->information->sampleTable);
 }
 
 void *sg_rap_create_entry(void *udta)
@@ -6332,12 +7023,12 @@
 GF_EXPORT
 GF_Err gf_isom_set_sample_rap_group(GF_ISOFile *movie, u32 track, u32 sample_number, Bool is_rap, u32 num_leading_samples)
 {
-	return gf_isom_set_sample_group_info(movie, track, 0, sample_number, GF_ISOM_SAMPLE_GROUP_RAP, 0, &num_leading_samples, is_rap ? sg_rap_create_entry : NULL, is_rap ? sg_rap_compare_entry : NULL);
+	return gf_isom_set_sample_group_info_internal(movie, track, 0, sample_number, GF_ISOM_SAMPLE_GROUP_RAP, 0, &num_leading_samples, is_rap ? sg_rap_create_entry : NULL, is_rap ? sg_rap_compare_entry : NULL);
 }
 
 GF_Err gf_isom_fragment_set_sample_rap_group(GF_ISOFile *movie, GF_ISOTrackID trackID, u32 sample_number_in_frag, Bool is_rap, u32 num_leading_samples)
 {
-	return gf_isom_set_sample_group_info(movie, 0, trackID, sample_number_in_frag, GF_ISOM_SAMPLE_GROUP_RAP, 0, &num_leading_samples, is_rap ? sg_rap_create_entry : NULL, is_rap ? sg_rap_compare_entry : NULL);
+	return gf_isom_set_sample_group_info_internal(movie, 0, trackID, sample_number_in_frag, GF_ISOM_SAMPLE_GROUP_RAP, 0, &num_leading_samples, is_rap ? sg_rap_create_entry : NULL, is_rap ? sg_rap_compare_entry : NULL);
 }
 
 
@@ -6366,7 +7057,7 @@
 	if (roll_type==GF_ISOM_SAMPLE_PREROLL_NONE)
 		roll_type = 0;
 
-	return gf_isom_set_sample_group_info(movie, track, 0, sample_number, grp_type, 0, &roll_distance, roll_type ? sg_roll_create_entry : NULL, roll_type ? sg_roll_compare_entry : NULL);
+	return gf_isom_set_sample_group_info_internal(movie, track, 0, sample_number, grp_type, 0, &roll_distance, roll_type ? sg_roll_create_entry : NULL, roll_type ? sg_roll_compare_entry : NULL);
 }
 
 GF_EXPORT
@@ -6376,7 +7067,7 @@
 	if (roll_type==GF_ISOM_SAMPLE_PREROLL_NONE)
 		roll_type = 0;
 
-	return gf_isom_set_sample_group_info(movie, 0, trackID, sample_number_in_frag, grp_type, 0, &roll_distance, roll_type ? sg_roll_create_entry : NULL, roll_type ? sg_roll_compare_entry : NULL);
+	return gf_isom_set_sample_group_info_internal(movie, 0, trackID, sample_number_in_frag, grp_type, 0, &roll_distance, roll_type ? sg_roll_create_entry : NULL, roll_type ? sg_roll_compare_entry : NULL);
 }
 
 
@@ -6387,6 +7078,12 @@
 	if (!entry) return NULL;
 	from_entry = (GF_CENCSampleEncryptionGroupEntry *)udta;
 	memcpy(entry, from_entry, sizeof(GF_CENCSampleEncryptionGroupEntry) );
+	entry->key_info = gf_malloc(sizeof(u8) * entry->key_info_size);
+	if (!entry->key_info) {
+		gf_free(entry);
+		return NULL;
+	}
+	memcpy(entry->key_info, from_entry->key_info, entry->key_info_size);
 	return entry;
 }
 
@@ -6394,37 +7091,60 @@
 {
 	GF_CENCSampleEncryptionGroupEntry *entry = (GF_CENCSampleEncryptionGroupEntry *)_entry;
 	GF_CENCSampleEncryptionGroupEntry *with_entry = (GF_CENCSampleEncryptionGroupEntry *)udta;
-	if (!memcmp(entry, with_entry, sizeof(GF_CENCSampleEncryptionGroupEntry)))
-		return GF_TRUE;
 
+	if (entry->IsProtected != with_entry->IsProtected) return GF_FALSE;
+	if (entry->skip_byte_block != with_entry->skip_byte_block) return GF_FALSE;
+	if (entry->crypt_byte_block != with_entry->crypt_byte_block) return GF_FALSE;
+	if (entry->key_info_size != with_entry->key_info_size) return GF_FALSE;
+
+	if (!memcmp(entry->key_info, with_entry->key_info, with_entry->key_info_size))
+		return GF_TRUE;
 	return GF_FALSE;
 }
 
 
 /*sample encryption information group can be in stbl or traf*/
 GF_EXPORT
-GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *movie, u32 track, u32 sample_number, u8 isEncrypted, u8 IV_size, bin128 KeyID, u8 crypt_byte_block, u8 skip_byte_block, u8 constant_IV_size, bin128 constant_IV)
+GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *movie, u32 track, u32 sample_number, u8 isEncrypted, u8 crypt_byte_block, u8 skip_byte_block, u8 *key_info, u32 key_info_size)
 {
 	GF_CENCSampleEncryptionGroupEntry entry;
-	if ((IV_size!=0) && (IV_size!=8) && (IV_size!=16)) return GF_BAD_PARAM;
+	if (!key_info || (key_info_size<19))
+		return GF_BAD_PARAM;
 
 	memset(&entry, 0, sizeof(GF_CENCSampleEncryptionGroupEntry));
 	entry.crypt_byte_block = crypt_byte_block;
 	entry.skip_byte_block = skip_byte_block;
 	entry.IsProtected = isEncrypted;
-	entry.Per_Sample_IV_size = IV_size;
-	if (!IV_size && isEncrypted) {
-		entry.constant_IV_size = constant_IV_size;
-		memcpy(entry.constant_IV, constant_IV, constant_IV_size);
-	}
-	memcpy(entry.KID, KeyID, 16);
-	return gf_isom_set_sample_group_info(movie, track, 0, sample_number, GF_ISOM_SAMPLE_GROUP_SEIG, 0, &entry, sg_encryption_create_entry, sg_encryption_compare_entry);
+	entry.key_info = key_info;
+	entry.key_info_size = key_info_size;
+
+	return gf_isom_set_sample_group_info_internal(movie, track, 0, sample_number, GF_ISOM_SAMPLE_GROUP_SEIG, 0, &entry, sg_encryption_create_entry, sg_encryption_compare_entry);
 }
 
+
+
 GF_EXPORT
 GF_Err gf_isom_set_sample_cenc_default_group(GF_ISOFile *movie, u32 track, u32 sample_number)
 {
-	return gf_isom_set_sample_group_info(movie, track, 0, sample_number, GF_ISOM_SAMPLE_GROUP_SEIG, 0, NULL, NULL, NULL);
+	return gf_isom_set_sample_group_info_internal(movie, track, 0, sample_number, GF_ISOM_SAMPLE_GROUP_SEIG, 0, NULL, NULL, NULL);
+}
+
+GF_Err gf_isom_force_ctts(GF_ISOFile *file, u32 track)
+{
+	GF_TrackBox *trak;
+	GF_Err e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+ 	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) return GF_BAD_PARAM;
+	if (trak->Media->information->sampleTable->CompositionOffset) return GF_OK;
+
+	trak->Media->information->sampleTable->CompositionOffset = (GF_CompositionOffsetBox *) gf_isom_box_new_parent(&trak->Media->information->sampleTable->child_boxes, GF_ISOM_BOX_TYPE_CTTS);
+	if (!trak->Media->information->sampleTable->CompositionOffset) return GF_OUT_OF_MEM;
+	trak->Media->information->sampleTable->CompositionOffset->nb_entries = 1;
+	trak->Media->information->sampleTable->CompositionOffset->entries = gf_malloc(sizeof(GF_DttsEntry));
+	trak->Media->information->sampleTable->CompositionOffset->entries[0].decodingOffset = 0;
+	trak->Media->information->sampleTable->CompositionOffset->entries[0].sampleCount = 	trak->Media->information->sampleTable->SampleSize->sampleCount;
+	return GF_OK;
 }
 
 GF_Err gf_isom_set_ctts_v1(GF_ISOFile *file, u32 track, u32 ctts_shift)
@@ -6442,7 +7162,11 @@
 	if (!trak) return GF_BAD_PARAM;
 
 	ctts = trak->Media->information->sampleTable->CompositionOffset;
-	shift = ctts->version ? ctts_shift : ctts->entries[0].decodingOffset;
+	if (ctts->version) {
+		shift = ctts_shift;
+	} else {
+		shift = ctts->nb_entries ? ctts->entries[0].decodingOffset : 0;
+	}
 	leastCTTS = GF_INT_MAX;
 	greatestCTTS = 0;
 	for (i=0; i<ctts->nb_entries; i++) {
@@ -6694,78 +7418,147 @@
 	}
 
 	/*copy sampleToGroup info if any*/
-	if (src_trak->Media->information->sampleTable->sampleGroups) {
+	count = 0;
+	if (src_trak->Media->information->sampleTable->sampleGroups)
 		count = gf_list_count(src_trak->Media->information->sampleTable->sampleGroups);
-		for (i=0; i<count; i++) {
-			GF_SampleGroupBox *sg;
-			u32 j, k, default_index;
-			u32 first_sample_in_entry, last_sample_in_entry, group_desc_index_src, group_desc_index_dst;
-			first_sample_in_entry = 1;
-
-			sg = (GF_SampleGroupBox*)gf_list_get(src_trak->Media->information->sampleTable->sampleGroups, i);
-			for (j=0; j<sg->entry_count; j++) {
-				last_sample_in_entry = first_sample_in_entry + sg->sample_entries[j].sample_count - 1;
-				if ((sampleNumber<first_sample_in_entry) || (sampleNumber>last_sample_in_entry)) {
-					first_sample_in_entry = last_sample_in_entry+1;
-					continue;
-				}
 
-				if (!dst_trak->Media->information->sampleTable->sampleGroups)
-					dst_trak->Media->information->sampleTable->sampleGroups = gf_list_new();
+	for (i=0; i<count; i++) {
+		GF_SampleGroupBox *sg;
+		u32 j, k, default_index;
+		u32 first_sample_in_entry, last_sample_in_entry, group_desc_index_src, group_desc_index_dst;
+		first_sample_in_entry = 1;
+
+		sg = (GF_SampleGroupBox*)gf_list_get(src_trak->Media->information->sampleTable->sampleGroups, i);
+		for (j=0; j<sg->entry_count; j++) {
+			last_sample_in_entry = first_sample_in_entry + sg->sample_entries[j].sample_count - 1;
+			if ((sampleNumber<first_sample_in_entry) || (sampleNumber>last_sample_in_entry)) {
+				first_sample_in_entry = last_sample_in_entry+1;
+				continue;
+			}
+
+			if (!dst_trak->Media->information->sampleTable->sampleGroups)
+				dst_trak->Media->information->sampleTable->sampleGroups = gf_list_new();
 
-				group_desc_index_src = group_desc_index_dst = sg->sample_entries[j].group_description_index;
+			group_desc_index_src = group_desc_index_dst = sg->sample_entries[j].group_description_index;
 
-				if (group_desc_index_src) {
-					GF_SampleGroupDescriptionBox *sgd_src, *sgd_dst;
-					GF_DefaultSampleGroupDescriptionEntry *sgde_src, *sgde_dst;
+			if (group_desc_index_src) {
+				GF_SampleGroupDescriptionBox *sgd_src, *sgd_dst;
+				GF_DefaultSampleGroupDescriptionEntry *sgde_src, *sgde_dst;
 
-					group_desc_index_dst = 0;
-					//check that the sample group description exists !!
-					sgde_src = gf_isom_get_sample_group_info_entry(src, src_trak, sg->grouping_type, sg->sample_entries[j].group_description_index, &default_index, &sgd_src);
+				group_desc_index_dst = 0;
+				//check that the sample group description exists !!
+				sgde_src = gf_isom_get_sample_group_info_entry(src, src_trak, sg->grouping_type, sg->sample_entries[j].group_description_index, &default_index, &sgd_src);
 
-					if (!sgde_src) break;
+				if (!sgde_src) break;
 
-					if (!dst_trak->Media->information->sampleTable->sampleGroupsDescription)
-						dst_trak->Media->information->sampleTable->sampleGroupsDescription = gf_list_new();
+				if (!dst_trak->Media->information->sampleTable->sampleGroupsDescription)
+					dst_trak->Media->information->sampleTable->sampleGroupsDescription = gf_list_new();
 
+				sgd_dst = NULL;
+				for (k=0; k< gf_list_count(dst_trak->Media->information->sampleTable->sampleGroupsDescription); k++) {
+					sgd_dst = gf_list_get(dst_trak->Media->information->sampleTable->sampleGroupsDescription, k);
+					if (sgd_dst->grouping_type==sgd_src->grouping_type) break;
 					sgd_dst = NULL;
-					for (k=0; k< gf_list_count(dst_trak->Media->information->sampleTable->sampleGroupsDescription); k++) {
-						sgd_dst = gf_list_get(dst_trak->Media->information->sampleTable->sampleGroupsDescription, k);
-						if (sgd_dst->grouping_type==sgd_src->grouping_type) break;
-						sgd_dst = NULL;
-					}
-					if (!sgd_dst) {
-						gf_isom_clone_box( (GF_Box *) sgd_src, (GF_Box **) &sgd_dst);
-						if (!sgd_dst) return GF_OUT_OF_MEM;
-						gf_list_add(dst_trak->Media->information->sampleTable->sampleGroupsDescription, sgd_dst);
-					}
+				}
+				if (!sgd_dst) {
+					gf_isom_clone_box( (GF_Box *) sgd_src, (GF_Box **) &sgd_dst);
+					if (!sgd_dst) return GF_OUT_OF_MEM;
+					gf_list_add(dst_trak->Media->information->sampleTable->sampleGroupsDescription, sgd_dst);
+				}
 
-					//find the same entry
-					for (k=0; k<gf_list_count(sgd_dst->group_descriptions); k++) {
-						sgde_dst = gf_list_get(sgd_dst->group_descriptions, i);
-						if (gf_isom_is_identical_sgpd(sgde_src, sgde_dst, sgd_src->grouping_type)) {
-							group_desc_index_dst = k+1;
-							break;
-						}
-					}
-					if (!group_desc_index_dst) {
-						GF_SampleGroupDescriptionBox *cloned=NULL;
-						gf_isom_clone_box( (GF_Box *) sgd_src, (GF_Box **) &cloned);
-						if (!cloned) return GF_OUT_OF_MEM;
-						sgde_dst = gf_list_get(cloned->group_descriptions, group_desc_index_dst);
-						gf_list_rem(cloned->group_descriptions, group_desc_index_dst);
-						gf_isom_box_del( (GF_Box *) cloned);
-						gf_list_add(sgd_dst->group_descriptions, sgde_dst);
-						group_desc_index_dst = gf_list_count(sgd_dst->group_descriptions);
+				//find the same entry
+				for (k=0; k<gf_list_count(sgd_dst->group_descriptions); k++) {
+					sgde_dst = gf_list_get(sgd_dst->group_descriptions, k);
+					if (gf_isom_is_identical_sgpd(sgde_src, sgde_dst, sgd_src->grouping_type)) {
+						group_desc_index_dst = k+1;
+						break;
 					}
 				}
+				if (!group_desc_index_dst) {
+					GF_SampleGroupDescriptionBox *cloned=NULL;
+					gf_isom_clone_box( (GF_Box *) sgd_src, (GF_Box **) &cloned);
+					if (!cloned) return GF_OUT_OF_MEM;
+					sgde_dst = gf_list_get(cloned->group_descriptions, group_desc_index_dst);
+					gf_list_rem(cloned->group_descriptions, group_desc_index_dst);
+					gf_isom_box_del( (GF_Box *) cloned);
+					gf_list_add(sgd_dst->group_descriptions, sgde_dst);
+					group_desc_index_dst = gf_list_count(sgd_dst->group_descriptions);
+				}
+			}
 
 
-				/*found our sample, add it to trak->sampleGroups*/
-				e = gf_isom_add_sample_group_entry(dst_trak->Media->information->sampleTable->sampleGroups, dst_sample_num, sg->grouping_type, sg->grouping_type_parameter, group_desc_index_dst, dst_trak->Media->information->sampleTable->child_boxes);
-				if (e) return e;
-				break;
+			/*found our sample, add it to trak->sampleGroups*/
+			e = gf_isom_add_sample_group_entry(dst_trak->Media->information->sampleTable->sampleGroups, dst_sample_num, sg->grouping_type, sg->grouping_type_parameter, group_desc_index_dst, dst_trak->Media->information->sampleTable->child_boxes, NULL);
+			if (e) return e;
+			break;
+		}
+	}
+
+	//copy auxiliary info
+	count = gf_list_count(src_trak->Media->information->sampleTable->sai_sizes);
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_SampleAuxiliaryInfoOffsetBox *saio = NULL;
+		GF_SampleAuxiliaryInfoSizeBox *saiz = gf_list_get(src_trak->Media->information->sampleTable->sai_sizes, i);
+
+		switch (saiz->aux_info_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
+		case GF_ISOM_PIFF_SCHEME:
+		case 0:
+			continue;
+		default:
+			break;
+		}
+		//no aux sample associated
+		if (saiz->sample_count<sampleNumber) continue;
+		//no size associated
+		if (!saiz->sample_info_size[sampleNumber-1]) continue;
+
+		for (j=0; j<gf_list_count(src_trak->Media->information->sampleTable->sai_offsets); j++) {
+			saio = gf_list_get(src_trak->Media->information->sampleTable->sai_offsets, j);
+			if ((saio->aux_info_type==saiz->aux_info_type) && (saio->aux_info_type_parameter==saiz->aux_info_type_parameter)) break;
+			saio=NULL;
+		}
+		if (!saio) continue;
+		if (!saio->offsets && !saio->sai_data) continue;
+
+		u64 offset = saio->offsets ? saio->offsets[0] : 0;
+		u32 nb_saio = saio->entry_count;
+		if ((nb_saio>1) && (saio->entry_count != saiz->sample_count)) continue;
+
+		u32 size;
+
+		if (nb_saio == 1) {
+			for (j=0; j < sampleNumber-1; j++) {
+				size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
+				offset += size;
 			}
+		} else {
+			offset = saio->offsets[sampleNumber-1];
+		}
+
+		size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
+
+		if (saio->sai_data) {
+			e = gf_isom_add_sample_aux_info_internal(dst_trak, NULL, j+1, saiz->aux_info_type, saiz->aux_info_type_parameter, saio->sai_data->data + offset, size);
+		} else {
+			u8 *sai = gf_malloc(size);
+			if (!sai) return GF_OUT_OF_MEM;
+
+			u64 cur_position = gf_bs_get_position(src_trak->moov->mov->movieFileMap->bs);
+			gf_bs_seek(src_trak->moov->mov->movieFileMap->bs, offset);
+
+			gf_bs_read_data(src_trak->moov->mov->movieFileMap->bs, sai, size);
+			gf_bs_seek(src_trak->moov->mov->movieFileMap->bs, cur_position);
+			e = gf_isom_add_sample_aux_info_internal(dst_trak, NULL, j+1, saiz->aux_info_type, saiz->aux_info_type_parameter, sai, size);
+			gf_free(sai);
+		}
+
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] Failed to clone sai data: %s\n", gf_error_to_string(e) ));
 		}
 	}
 	return GF_OK;
@@ -6824,7 +7617,7 @@
 	i=0;
 	while ((trak = (GF_TrackBox *)gf_list_enum(movie->moov->trackList, &i))) {
 		if( (movie->LastError = SetTrackDuration(trak))	) return movie->LastError;
-		if (trak->Header->duration > maxDur)
+		if (trak->Header && (trak->Header->duration > maxDur))
 			maxDur = trak->Header->duration;
 	}
 	movie->moov->mvhd->duration = maxDur;
@@ -6863,8 +7656,9 @@
 		GF_EditListBox *elst = trak->editBox->editList;
 		i=0;
 		while ((ent = (GF_EdtsEntry*)gf_list_enum(elst->entryList, &i))) {
-			if (ent->segmentDuration > trackDuration)
+			if ((ent->mediaTime>=0) && (ent->mediaRate==1) && (ent->segmentDuration > trackDuration))
 				ent->segmentDuration = trackDuration;
+
 			if (!ent->segmentDuration) {
 				u64 diff;
 				ent->segmentDuration = trackDuration;
@@ -7134,6 +7928,17 @@
 	return GF_OK;
 }
 
+
+#ifdef GPAC_DISABLE_CORE_TOOLS
+
+GF_EXPORT
+GF_Err gf_isom_apply_box_patch(GF_ISOFile *file, GF_ISOTrackID globalTrackID, const char *box_patch_filename, Bool for_fragments)
+{
+	return GF_NOT_SUPPORTED;
+}
+
+#else
+
 #include <gpac/xml.h>
 GF_EXPORT
 GF_Err gf_isom_apply_box_patch(GF_ISOFile *file, GF_ISOTrackID globalTrackID, const char *box_patch_filename, Bool for_fragments)
@@ -7221,6 +8026,7 @@
 		}
 
 		while (box_path && (path_len>=4)) {
+			u32 parent_list_box_type;
 			GF_List **parent_list;
 			u32 box_type = GF_4CC(box_path[0],box_path[1],box_path[2],box_path[3]);
 			GF_Box *box=NULL;
@@ -7272,6 +8078,7 @@
 
 			if (parent_box && !parent_box->child_boxes) parent_box->child_boxes = gf_list_new();
 			parent_list = parent_box ? &parent_box->child_boxes : &file->TopBoxes;
+			parent_list_box_type = parent_box ? parent_box->type : 0;
 
 			// '+' is append after, '-' is insert before
 			if (path_len && ((box_path[0]=='-') || (box_path[0]=='+')) ) {
@@ -7307,6 +8114,9 @@
 					if ((GF_Box *) file->meta == box) file->meta = NULL;
 					break;
 				}
+				if (parent_box) {
+					gf_isom_box_remove_from_parent(parent_box, box);
+				}
 				gf_isom_box_del_parent(parent_list, box);
 			} else {
 				u32 size;
@@ -7357,7 +8167,7 @@
 					gf_bs_seek(bs, 0);
 					while (gf_bs_available(bs)) {
 						GF_Box *new_box;
-						e = gf_isom_box_parse_ex(&new_box, bs, box->type, parent_box ? GF_FALSE : GF_TRUE);
+						e = gf_isom_box_parse_ex(&new_box, bs, (insert_pos<0) ? box->type : parent_list_box_type, parent_box ? GF_FALSE : GF_TRUE);
 						if (e) {
 							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] failed to parse box\n", box_path));
 							gf_bs_del(bs);
@@ -7387,6 +8197,9 @@
 	return e;
 }
 
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
+
+
 GF_EXPORT
 GF_Err gf_isom_set_track_magic(GF_ISOFile *movie, u32 trackNumber, u64 magic)
 {
@@ -7438,4 +8251,320 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_set_ipod_compatible(GF_ISOFile *the_file, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	GF_MPEGVisualSampleEntryBox *entry;
+
+	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, 0);
+	if (!entry) return GF_OK;
+	switch (entry->type) {
+	case GF_ISOM_BOX_TYPE_AVC1:
+	case GF_ISOM_BOX_TYPE_AVC2:
+	case GF_ISOM_BOX_TYPE_AVC3:
+	case GF_ISOM_BOX_TYPE_AVC4:
+	case GF_ISOM_BOX_TYPE_SVC1:
+	case GF_ISOM_BOX_TYPE_MVC1:
+	case GF_ISOM_BOX_TYPE_HVC1:
+	case GF_ISOM_BOX_TYPE_HEV1:
+	case GF_ISOM_BOX_TYPE_HVT1:
+		break;
+	default:
+		return GF_OK;
+	}
+
+	if (!entry->ipod_ext) {
+		entry->ipod_ext = (GF_UnknownUUIDBox *) gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_UUID);
+		if (!entry->ipod_ext) return GF_OUT_OF_MEM;
+	}
+	memcpy(entry->ipod_ext->uuid, GF_ISOM_IPOD_EXT, sizeof(u8)*16);
+	entry->ipod_ext->dataSize = 4;
+	entry->ipod_ext->data = gf_malloc(sizeof(u8)*4);
+	if (!entry->ipod_ext->data) return GF_OUT_OF_MEM;
+	memset(entry->ipod_ext->data, 0, sizeof(u8)*4);
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_isom_is_inplace_rewrite(GF_ISOFile *movie)
+{
+	if (!movie) return GF_FALSE;
+	if (!movie->no_inplace_rewrite) {
+		//things where added to the file, no inplace rewrite
+		if (movie->editFileMap && gf_bs_get_size(movie->editFileMap->bs))
+			movie->no_inplace_rewrite = GF_TRUE;
+		//block redirect (used by mp4mx), no inplace rewrite
+		else if (movie->on_block_out || !strcmp(movie->finalName, "_gpac_isobmff_redirect"))
+			movie->no_inplace_rewrite = GF_TRUE;
+		//stdout redirect, no inplace rewrite
+		else if (!strcmp(movie->finalName, "std"))
+			movie->no_inplace_rewrite = GF_TRUE;
+		//new file, no inplace rewrite
+		else if (!movie->fileName)
+			movie->no_inplace_rewrite = GF_TRUE;
+	}
+	if (movie->no_inplace_rewrite) return GF_FALSE;
+
+	return GF_TRUE;
+}
+
+GF_EXPORT
+void gf_isom_disable_inplace_rewrite(GF_ISOFile *movie)
+{
+	if (movie)
+		movie->no_inplace_rewrite = GF_TRUE;
+}
+
+
+GF_Err gf_isom_set_y3d_info(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescriptionIndex, GF_ISOM_Y3D_Info *info)
+{
+	GF_Err e;
+	u32 proj_type;
+	GF_SampleEntryBox *ent;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media || !info) return GF_BAD_PARAM;
+
+	ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, sampleDescriptionIndex-1);
+	if (!ent) return GF_BAD_PARAM;
+
+	if (info->projection_type > GF_PROJ360_EQR) return GF_NOT_SUPPORTED;
+
+	GF_Stereo3DBox *st3d = (GF_Stereo3DBox *) gf_isom_box_find_child(ent->child_boxes, GF_ISOM_BOX_TYPE_ST3D);
+	if (st3d) {
+		if (info->stereo_type) {
+			st3d->stereo_type = info->stereo_type;
+		} else {
+			gf_isom_box_del_parent(&ent->child_boxes, (GF_Box *) st3d);
+		}
+	} else if (info->stereo_type) {
+		st3d = (GF_Stereo3DBox *) gf_isom_box_new_parent(&ent->child_boxes, GF_ISOM_BOX_TYPE_ST3D);
+		if (!st3d) return GF_OUT_OF_MEM;
+		st3d->stereo_type = info->stereo_type;
+	}
+
+
+	GF_Box *sv3d = gf_isom_box_find_child(ent->child_boxes, GF_ISOM_BOX_TYPE_SV3D);
+	if (sv3d && !info->projection_type) {
+		gf_isom_box_del_parent(&ent->child_boxes, sv3d);
+		return GF_OK;
+	}
+
+	if (!sv3d && !info->projection_type) {
+		return GF_OK;
+	}
+	if (!sv3d) {
+		sv3d = gf_isom_box_new_parent(&ent->child_boxes, GF_ISOM_BOX_TYPE_SV3D);
+		if (!sv3d) return GF_OUT_OF_MEM;
+	}
+
+	//svhd mandatory
+	GF_SphericalVideoInfoBox *svhd = (GF_SphericalVideoInfoBox *) gf_isom_box_find_child(sv3d->child_boxes, GF_ISOM_BOX_TYPE_SVHD);
+	if (svhd) {
+		if (svhd->string) gf_free(svhd->string);
+	} else {
+		svhd = (GF_SphericalVideoInfoBox *) gf_isom_box_new_parent(&sv3d->child_boxes, GF_ISOM_BOX_TYPE_SVHD);
+		if (!svhd) return GF_OUT_OF_MEM;
+	}
+	svhd->string = gf_strdup(info->meta_data ? info->meta_data : "");
+
+	//proj mandatory
+	GF_Box *proj = gf_isom_box_find_child(sv3d->child_boxes, GF_ISOM_BOX_TYPE_PROJ);
+	if (!proj) {
+		proj = (GF_Box *) gf_isom_box_new_parent(&sv3d->child_boxes, GF_ISOM_BOX_TYPE_PROJ);
+		if (!proj) return GF_OUT_OF_MEM;
+	}
+
+	GF_ProjectionHeaderBox *projh = (GF_ProjectionHeaderBox *) gf_isom_box_find_child(proj->child_boxes, GF_ISOM_BOX_TYPE_PRHD);
+	//prj header mandatory
+	if (!projh) {
+		projh = (GF_ProjectionHeaderBox *) gf_isom_box_new_parent(&proj->child_boxes, GF_ISOM_BOX_TYPE_PRHD);
+		if (!projh) return GF_OUT_OF_MEM;
+	}
+	projh->yaw = info->yaw;
+	projh->pitch = info->pitch;
+	projh->roll = info->roll;
+
+	proj_type = (info->projection_type==GF_PROJ360_CUBE_MAP) ? GF_ISOM_BOX_TYPE_CBMP : GF_ISOM_BOX_TYPE_EQUI;
+
+	GF_ProjectionTypeBox *projt = (GF_ProjectionTypeBox *) gf_isom_box_find_child(proj->child_boxes, proj_type);
+	if (!projt) {
+		projt = (GF_ProjectionTypeBox *) gf_isom_box_new_parent(&proj->child_boxes, proj_type);
+		if (!projt) return GF_OUT_OF_MEM;
+	}
+	if (info->projection_type==GF_PROJ360_CUBE_MAP) {
+		projt->layout = info->layout;
+		projt->padding = info->padding;
+	} else {
+		projt->bounds_top = info->top;
+		projt->bounds_bottom = info->bottom;
+		projt->bounds_left = info->left;
+		projt->bounds_right = info->right;
+	}
+
+	//remove other ones
+	GF_Box *b = gf_isom_box_new_parent(&proj->child_boxes, GF_ISOM_BOX_TYPE_MSHP);
+	if (b) gf_isom_box_del_parent(&proj->child_boxes, b);
+	if (info->projection_type==GF_PROJ360_CUBE_MAP) {
+		b = gf_isom_box_new_parent(&proj->child_boxes, GF_ISOM_BOX_TYPE_EQUI);
+		if (b) gf_isom_box_del_parent(&proj->child_boxes, b);
+	} else {
+		b = gf_isom_box_new_parent(&proj->child_boxes, GF_ISOM_BOX_TYPE_EQUI);
+		if (b) gf_isom_box_del_parent(&proj->child_boxes, b);
+
+	}
+	return GF_OK;
+}
+
+
+GF_Err gf_isom_add_sample_aux_info_internal(GF_TrackBox *trak, void *_traf, u32 sampleNumber, u32 aux_type, u32 aux_info, u8 *data, u32 size)
+{
+	u32 i, count;
+	GF_List **child_box_cont, **child_box_sai, **child_box_saiz, **child_box_saio;
+	GF_UnknownBox *sai_cont = NULL;
+
+	if (!trak && !_traf) return GF_BAD_PARAM;
+
+	if (trak) {
+		child_box_cont = &trak->child_boxes;
+		child_box_sai = &trak->Media->information->sampleTable->child_boxes;
+		child_box_saiz = &trak->Media->information->sampleTable->sai_sizes;
+		child_box_saio = &trak->Media->information->sampleTable->sai_offsets;
+	} else {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+		GF_TrackFragmentBox *traf = (GF_TrackFragmentBox *)_traf;
+
+		child_box_cont = &traf->child_boxes;
+		child_box_sai = &traf->child_boxes;
+		child_box_saiz = &traf->sai_sizes;
+		child_box_saio = &traf->sai_offsets;
+#endif
+	}
+
+	count = gf_list_count(*child_box_cont);
+	for (i=0; i<count; i++) {
+		GF_UnknownBox *unkn = gf_list_get(*child_box_cont, i);
+		if (unkn->type != GF_ISOM_BOX_TYPE_UNKNOWN) continue;
+		if (unkn->original_4cc != GF_ISOM_BOX_TYPE_GDAT) continue;
+		if (unkn->sai_type != aux_type) continue;
+		if (unkn->sai_aux_info != aux_info) continue;
+		sai_cont = unkn;
+		break;
+	}
+	if (!sai_cont) {
+		sai_cont = (GF_UnknownBox *) gf_isom_box_new_parent(child_box_cont, GF_ISOM_BOX_TYPE_UNKNOWN);
+		if (!sai_cont) return GF_OUT_OF_MEM;
+		sai_cont->original_4cc = GF_ISOM_BOX_TYPE_GDAT;
+		sai_cont->sai_type = aux_type;
+		sai_cont->sai_aux_info = aux_info;
+	}
+	sai_cont->data = gf_realloc(sai_cont->data, (size+sai_cont->dataSize));
+	if (!sai_cont->data) return GF_OUT_OF_MEM;
+	memcpy(sai_cont->data+sai_cont->dataSize, data, size);
+	sai_cont->dataSize += size;
+
+	GF_SampleAuxiliaryInfoSizeBox *saiz=NULL;
+	GF_SampleAuxiliaryInfoOffsetBox *saio=NULL;
+	count = gf_list_count(*child_box_saiz);
+	for (i=0; i<count; i++) {
+		saiz = gf_list_get(*child_box_saiz, i);
+		if ((saiz->aux_info_type==aux_type) && (saiz->aux_info_type_parameter==aux_info)) break;
+		saiz = NULL;
+	}
+	if (!saiz) {
+		saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new_parent(child_box_sai, GF_ISOM_BOX_TYPE_SAIZ);
+		if (!saiz) return GF_OUT_OF_MEM;
+		if (! *child_box_saiz) *child_box_saiz = gf_list_new();
+		gf_list_add(*child_box_saiz, saiz);
+
+		saiz->aux_info_type = aux_type;
+		saiz->aux_info_type_parameter = aux_info;
+	}
+
+	if (saiz->sample_count >= sampleNumber)
+		return GF_BAD_PARAM;
+
+	if ( (!saiz->sample_count && (sampleNumber==1))
+		|| ((saiz->default_sample_info_size==size) && size)
+	) {
+		saiz->sample_count ++;
+		saiz->default_sample_info_size = size;
+	} else {
+		if (sampleNumber > saiz->sample_alloc) {
+			if (!saiz->sample_alloc) saiz->sample_alloc = sampleNumber;
+			else saiz->sample_alloc *= 2;
+			saiz->sample_info_size = (u8*)gf_realloc(saiz->sample_info_size, sizeof(u8)*(saiz->sample_alloc));
+		}
+
+		if (saiz->default_sample_info_size) {
+			for (i=0; i<saiz->sample_count; i++)
+				saiz->sample_info_size[i] = saiz->default_sample_info_size;
+			saiz->default_sample_info_size = 0;
+		}
+		for (i=saiz->sample_count; i<sampleNumber-1; i++)
+			saiz->sample_info_size[i] = 0;
+
+		saiz->sample_info_size[sampleNumber-1] = size;
+		saiz->sample_count = sampleNumber;
+	}
+
+
+	count = gf_list_count(*child_box_saio);
+	for (i=0; i<count; i++) {
+		saio = gf_list_get(*child_box_saio, i);
+		if ((saio->aux_info_type==aux_type) && (saio->aux_info_type_parameter==aux_info)) break;
+		saio = NULL;
+	}
+	if (!saio) {
+		saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new_parent(child_box_sai, GF_ISOM_BOX_TYPE_SAIO);
+		if (!saio) return GF_OUT_OF_MEM;
+		if (! *child_box_saio) *child_box_saio = gf_list_new();
+		gf_list_add(*child_box_saio, saio);
+		saio->aux_info_type = aux_type;
+		saio->aux_info_type_parameter = aux_info;
+	}
+	if (!saio->sai_data) saio->sai_data = sai_cont;
+	saio->version = 1;
+	saio->entry_count = 1;
+
+	return GF_OK;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+GF_Err gf_isom_fragment_set_sample_aux_info(GF_ISOFile *movie, u32 trackID, u32 sample_number_in_frag, u32 aux_type, u32 aux_info, u8 *data, u32 size)
+{
+	GF_TrackFragmentBox *traf;
+	if (!movie || !movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
+
+	traf = gf_isom_get_traf(movie, trackID);
+	if (!traf) return GF_BAD_PARAM;
+	return gf_isom_add_sample_aux_info_internal(NULL, traf, sample_number_in_frag, aux_type, aux_info, data, size);
+}
+#endif
+
+GF_Err gf_isom_add_sample_aux_info(GF_ISOFile *file, u32 track, u32 sampleNumber, u32 aux_type, u32 aux_info, u8 *data, u32 size)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) return GF_BAD_PARAM;
+
+	return gf_isom_add_sample_aux_info_internal(trak, NULL, sampleNumber, aux_type, aux_info, data, size);
+}
+
 #endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

gpac-1.0.1.tar.gz/src/isomedia/media.c -> gpac-2.0.0.tar.gz/src/isomedia/media.c Changed

@@ -99,7 +99,7 @@
 		memset(szName, 0, 80);
 		strcpy(szName, "QCELP-13K(GPAC-emulated)");
 		gf_bs_write_data(bs, szName, 80);
-		ent = &stbl->TimeToSample->entries[0];
+		ent = stbl->TimeToSample->nb_entries ? &stbl->TimeToSample->entries[0] : NULL;
 		sample_rate = entry->samplerate_hi;
 		block_size = ent ? ent->sampleDelta : 160;
 		gf_bs_write_u16_le(bs, 8*sample_size*sample_rate/block_size);
@@ -181,8 +181,11 @@
 		break;
 	}
 
+
 	switch (type) {
 	case GF_ISOM_BOX_TYPE_MP4V:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO)
+			return GF_ISOM_INVALID_MEDIA;
 		ESDa = ((GF_MPEGVisualSampleEntryBox*)entry)->esd;
 		if (ESDa) esd = (GF_ESD *) ESDa->desc;
 		/*avc1 encrypted*/
@@ -200,10 +203,19 @@
 	case GF_ISOM_BOX_TYPE_264B:
 	case GF_ISOM_BOX_TYPE_265B:
 	case GF_ISOM_BOX_TYPE_DVHE:
+	case GF_ISOM_BOX_TYPE_DVH1:
+	case GF_ISOM_BOX_TYPE_DVA1:
+	case GF_ISOM_BOX_TYPE_DVAV:
+	case GF_ISOM_BOX_TYPE_VVC1:
+	case GF_ISOM_BOX_TYPE_VVI1:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO)
+			return GF_ISOM_INVALID_MEDIA;
 		esd = ((GF_MPEGVisualSampleEntryBox*) entry)->emul_esd;
 		break;
 	case GF_ISOM_BOX_TYPE_SVC1:
 	case GF_ISOM_BOX_TYPE_MVC1:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO)
+			return GF_ISOM_INVALID_MEDIA;
 		if ((mdia->mediaTrack->extractor_mode & 0x0000FFFF) != GF_ISOM_NALU_EXTRACT_INSPECT)
 			AVC_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*) entry, mdia);
 		else
@@ -212,22 +224,31 @@
 		break;
 	case GF_ISOM_BOX_TYPE_LHE1:
 	case GF_ISOM_BOX_TYPE_LHV1:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO)
+			return GF_ISOM_INVALID_MEDIA;
 		if ((mdia->mediaTrack->extractor_mode & 0x0000FFFF) != GF_ISOM_NALU_EXTRACT_INSPECT)
 			HEVC_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*) entry, mdia);
 		else
 			HEVC_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*) entry, NULL);
 		esd = ((GF_MPEGVisualSampleEntryBox*) entry)->emul_esd;
 		break;
+	case GF_ISOM_BOX_TYPE_DAV1:
 	case GF_ISOM_BOX_TYPE_AV01:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO)
+			return GF_ISOM_INVALID_MEDIA;
 		AV1_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*)entry, mdia);
 		esd = ((GF_MPEGVisualSampleEntryBox*)entry)->emul_esd;
 		break;
 	case GF_ISOM_BOX_TYPE_VP08:
 	case GF_ISOM_BOX_TYPE_VP09:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO)
+			return GF_ISOM_INVALID_MEDIA;
 		VP9_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*)entry, mdia);
 		esd = ((GF_MPEGVisualSampleEntryBox*)entry)->emul_esd;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4A:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_AUDIO)
+			return GF_ISOM_INVALID_MEDIA;
 {
 GF_MPEGAudioSampleEntryBox *ase = (GF_MPEGAudioSampleEntryBox*)entry;
 ESDa = ase->esd;
@@ -246,6 +267,7 @@
 					make_mp4a = GF_TRUE;
 				}
 				if (make_mp4a) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 					GF_M4ADecSpecInfo aacinfo;
 					memset(&aacinfo, 0, sizeof(GF_M4ADecSpecInfo));
 					aacinfo.nb_chan = ase->channel_count;
@@ -255,6 +277,9 @@
 					(*out_esd)->decoderConfig->streamType = GF_STREAM_AUDIO;
 					(*out_esd)->decoderConfig->objectTypeIndication = GF_CODECID_AAC_MPEG4;
 					gf_m4a_write_config(&aacinfo, &(*out_esd)->decoderConfig->decoderSpecificInfo->data, &(*out_esd)->decoderConfig->decoderSpecificInfo->dataLength);
+#else
+					return GF_NOT_SUPPORTED;
+#endif
 				}
 }
 }
@@ -268,6 +293,9 @@
 #ifndef GPAC_DISABLE_TTXT
 	case GF_ISOM_BOX_TYPE_TX3G:
 	case GF_ISOM_BOX_TYPE_TEXT:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_GENERIC)
+			return GF_ISOM_INVALID_MEDIA;
+
 		if (!true_desc_only && mdia->mediaTrack->moov->mov->convert_streaming_text) {
 			GF_Err e = gf_isom_get_ttxt_esd(mdia, out_esd);
 			if (e) return e;
@@ -278,6 +306,8 @@
 #endif
 #ifndef GPAC_DISABLE_VTT
 	case GF_ISOM_BOX_TYPE_WVTT:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_GENERIC)
+			return GF_ISOM_INVALID_MEDIA;
 	{
 		GF_WebVTTSampleEntryBox*vtte = (GF_WebVTTSampleEntryBox*)entry;
 		esd = gf_odf_desc_esd_new(2);
@@ -302,13 +332,18 @@
 	case GF_ISOM_SUBTYPE_3GP_EVRC:
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 	case GF_ISOM_SUBTYPE_3GP_SMV:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_AUDIO)
+			return GF_ISOM_INVALID_MEDIA;
 		if (!true_desc_only) {
 			GF_Err e = gf_isom_get_3gpp_audio_esd(mdia->information->sampleTable, type, (GF_GenericAudioSampleEntryBox*)entry, out_esd);
 			if (e) return e;
 			break;
 		} else return GF_ISOM_INVALID_MEDIA;
 
-	case GF_ISOM_SUBTYPE_OPUS: {
+	case GF_ISOM_SUBTYPE_OPUS:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_AUDIO)
+			return GF_ISOM_INVALID_MEDIA;
+	{
 		GF_OpusSpecificBox *e = ((GF_MPEGAudioSampleEntryBox*)entry)->cfg_opus;
 		GF_BitStream *bs_out;
 		if (!e) {
@@ -329,6 +364,8 @@
 		break;
 	}
 	case GF_ISOM_SUBTYPE_3GP_H263:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO)
+			return GF_ISOM_INVALID_MEDIA;
 		if (true_desc_only) {
 			return GF_ISOM_INVALID_MEDIA;
 		} else {
@@ -340,6 +377,8 @@
 		}
 
 	case GF_ISOM_SUBTYPE_MP3:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_AUDIO)
+			return GF_ISOM_INVALID_MEDIA;
 		if (true_desc_only) {
 			return GF_ISOM_INVALID_MEDIA;
 		} else {
@@ -351,6 +390,8 @@
 		}
 
 	case GF_ISOM_SUBTYPE_LSR1:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_GENERIC)
+			return GF_ISOM_INVALID_MEDIA;
 		if (true_desc_only) {
 			return GF_ISOM_INVALID_MEDIA;
 		} else {
@@ -369,6 +410,9 @@
 	case GF_ISOM_SUBTYPE_MH3D_MHA2:
 	case GF_ISOM_SUBTYPE_MH3D_MHM1:
 	case GF_ISOM_SUBTYPE_MH3D_MHM2:
+		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_AUDIO)
+			return GF_ISOM_INVALID_MEDIA;
+
 		if (true_desc_only) {
 			return GF_ISOM_INVALID_MEDIA;
 		} else {
@@ -430,7 +474,7 @@
 	u32 bytesRead;
 	u32 dataRefIndex, chunkNumber;
 	u64 offset, new_size;
-	u32 sdesc_idx;
+	u32 sdesc_idx, data_size;
 	GF_SampleEntryBox *entry;
 	GF_StscEntry *stsc_entry;
 
@@ -466,7 +510,7 @@
 		(*samp)->CTS_Offset = 0;
 	}
 	//the size
-	e = stbl_GetSampleSize(mdia->information->sampleTable->SampleSize, sampleNumber, &(*samp)->dataLength);
+	e = stbl_GetSampleSize(mdia->information->sampleTable->SampleSize, sampleNumber, &data_size);
 	if (e) return e;
 	//the RAP
 	if (mdia->information->sampleTable->SyncSample) {
@@ -497,12 +541,12 @@
 
 	//the data info
 	if (!sIDX && !no_data) return GF_BAD_PARAM;
-	if (!sIDX && !out_offset) return GF_OK;
-	if (!sIDX) return GF_OK;
-
+//	if (!sIDX && !out_offset) return GF_OK;
+	if (!sIDX) {
+		(*samp)->dataLength = data_size;
+		return GF_OK;
+	}
 	(*sIDX) = sdesc_idx;
-//	e = stbl_GetSampleInfos(mdia->information->sampleTable, sampleNumber, &offset, &chunkNumber, sIDX, &stsc_entry);
-//	if (e) return e;
 
 	//then get the DataRef
 	e = Media_GetSampleDesc(mdia, sdesc_idx, &entry, &dataRefIndex);
@@ -517,7 +561,18 @@
 	}
 
 
-	if (no_data) return GF_OK;
+	if (no_data) {
+		(*samp)->dataLength = data_size;
+		if ( ((*samp)->dataLength != 0) && mdia->mediaTrack->pack_num_samples) {
+			u32 idx_in_chunk = sampleNumber - mdia->information->sampleTable->SampleToChunk->firstSampleInCurrentChunk;
+			u32 left_in_chunk = stsc_entry->samplesPerChunk - idx_in_chunk;
+			if (left_in_chunk > mdia->mediaTrack->pack_num_samples)
+				left_in_chunk = mdia->mediaTrack->pack_num_samples;
+			(*samp)->dataLength *= left_in_chunk;
+			(*samp)->nb_pack = left_in_chunk;
+		}
+		return GF_OK;
+	}
 
 	// Open the data handler - check our mode, don't reopen in read only if this is
 	//the same entry. In other modes we have no choice because the main data map is
@@ -549,45 +604,47 @@
 			offset -= real_offset;
 		}
 	}
-	if ((*samp)->dataLength != 0) {
+
+	if (data_size != 0) {
 		if (mdia->mediaTrack->pack_num_samples) {
 			u32 idx_in_chunk = sampleNumber - mdia->information->sampleTable->SampleToChunk->firstSampleInCurrentChunk;
 			u32 left_in_chunk = stsc_entry->samplesPerChunk - idx_in_chunk;
 			if (left_in_chunk > mdia->mediaTrack->pack_num_samples)
 				left_in_chunk = mdia->mediaTrack->pack_num_samples;
-			(*samp)->dataLength *= left_in_chunk;
+			data_size *= left_in_chunk;
 			(*samp)->nb_pack = left_in_chunk;
 		}
 
 		/*and finally get the data, include padding if needed*/
 		if ((*samp)->alloc_size) {
-			if ((*samp)->alloc_size < (*samp)->dataLength + mdia->mediaTrack->padding_bytes) {
-				(*samp)->data = (char *) gf_realloc((*samp)->data, sizeof(char) * ( (*samp)->dataLength + mdia->mediaTrack->padding_bytes) );
+			if ((*samp)->alloc_size < data_size + mdia->mediaTrack->padding_bytes) {
+				(*samp)->data = (char *) gf_realloc((*samp)->data, sizeof(char) * ( data_size + mdia->mediaTrack->padding_bytes) );
 				if (! (*samp)->data) return GF_OUT_OF_MEM;
 
-				(*samp)->alloc_size = (*samp)->dataLength + mdia->mediaTrack->padding_bytes;
+				(*samp)->alloc_size = data_size + mdia->mediaTrack->padding_bytes;
 			}
 		} else {
-			(*samp)->data = (char *) gf_malloc(sizeof(char) * ( (*samp)->dataLength + mdia->mediaTrack->padding_bytes) );
+			(*samp)->data = (char *) gf_malloc(sizeof(char) * ( data_size + mdia->mediaTrack->padding_bytes) );
 			if (! (*samp)->data) return GF_OUT_OF_MEM;
 		}
+		(*samp)->dataLength = data_size;
 		if (mdia->mediaTrack->padding_bytes)
-			memset((*samp)->data + (*samp)->dataLength, 0, sizeof(char) * mdia->mediaTrack->padding_bytes);
+			memset((*samp)->data + data_size, 0, sizeof(char) * mdia->mediaTrack->padding_bytes);
 
 		//check if we can get the sample (make sure we have enougth data...)
 		new_size = gf_bs_get_size(mdia->information->dataHandler->bs);
-		if (offset + (*samp)->dataLength > new_size) {
+		if (offset + data_size > new_size) {
 			//always refresh the size to avoid wrong info on http/ftp
 			new_size = gf_bs_get_refreshed_size(mdia->information->dataHandler->bs);
-			if (offset + (*samp)->dataLength > new_size) {
-				mdia->BytesMissing = offset + (*samp)->dataLength - new_size;
+			if (offset + data_size > new_size) {
+				mdia->BytesMissing = offset + data_size - new_size;
 				return GF_ISOM_INCOMPLETE_FILE;
 			}
 		}
 
 		bytesRead = gf_isom_datamap_get_data(mdia->information->dataHandler, (*samp)->data, (*samp)->dataLength, offset);
 		//if bytesRead != sampleSize, we have an IO err
-		if (bytesRead < (*samp)->dataLength) {
+		if (bytesRead < data_size) {
 			return GF_IO_ERR;
 		}
 		mdia->BytesMissing = 0;
@@ -628,7 +685,6 @@
 
 GF_Err Media_CheckDataEntry(GF_MediaBox *mdia, u32 dataEntryIndex)
 {
-
 	GF_DataEntryURLBox *entry;
 	GF_DataMap *map;
 	GF_Err e;
@@ -639,8 +695,10 @@
 	if (entry->flags == 1) return GF_OK;
 
 	//ok, not self contained, let's go for it...
-	//we don't know what's a URN yet
-	if (entry->type == GF_ISOM_BOX_TYPE_URN) return GF_NOT_SUPPORTED;
+	//we only support alias and URL boxes
+	if ((entry->type != GF_ISOM_BOX_TYPE_URL) && (entry->type != GF_QT_BOX_TYPE_ALIS) )
+		return GF_NOT_SUPPORTED;
+
 	if (mdia->mediaTrack->moov->mov->openMode == GF_ISOM_OPEN_WRITE) {
 		e = gf_isom_datamap_new(entry->location, NULL, GF_ISOM_DATA_MAP_READ, &map);
 	} else {
@@ -669,7 +727,7 @@
 	}
 	if (!a) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] broken file: Data reference index set to %d but no data reference entry found\n", drefIndex));
-		return 0;
+		return 1;
 	}
 	if (a->flags & 1) return 1;
 	/*QT specific*/
@@ -683,7 +741,7 @@
 	u32 i, count;
 
 	nb_ext = nb_self = 0;
-	count = gf_list_count(mdia->information->sampleTable->SampleDescription->child_boxes);
+	count = mdia->information->sampleTable->SampleDescription ? gf_list_count(mdia->information->sampleTable->SampleDescription->child_boxes) : 0;
 	for (i=0; i<count; i++) {
 		if (Media_IsSelfContained(mdia, i+1)) nb_self++;
 		else nb_ext++;
@@ -784,8 +842,7 @@
 	GF_Err e;
 	GF_ESD *esd;
 	u64 DTS;
-	GF_SttsEntry *ent;
-	u32 nbSamp;
+	u32 nbSamp, dur;
 
 	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable)
 		return GF_ISOM_INVALID_FILE;
@@ -795,11 +852,7 @@
 
 	nbSamp = trak->Media->information->sampleTable->SampleSize->sampleCount;
 
-	//we need to check how many samples we have.
-	// == 1 -> last sample duration == default duration
-	// > 1 -> last sample duration == prev sample duration
-	switch (nbSamp) {
-	case 0:
+	if (nbSamp == 0) {
 		trak->Media->mediaHeader->duration = 0;
 		if (Track_IsMPEG4Stream(trak->Media->handler->handlerType)) {
 			Media_GetESD(trak->Media, 1, &esd, 1);
@@ -807,71 +860,35 @@
 
 		}
 		return GF_OK;
+	}
 
-//	case 1:
-//		trak->Media->mediaHeader->duration = trak->Media->mediaHeader->timeScale;
-//		return GF_OK;
-
-	default:
-		//we assume a constant frame rate for the media and assume the last sample
-		//will be hold the same time as the prev one
-		e = stbl_GetSampleDTS(trak->Media->information->sampleTable->TimeToSample, nbSamp, &DTS);
-		if (e < 0) {
-			return e;
-		}
-		if (trak->Media->information->sampleTable->TimeToSample->nb_entries > 0) {
-			ent = &trak->Media->information->sampleTable->TimeToSample->entries[trak->Media->information->sampleTable->TimeToSample->nb_entries-1];
-		} else {
-			ent = NULL;
-		}
-		trak->Media->mediaHeader->duration = DTS;
+	//get last sample
+	e = stbl_GetSampleDTS_and_Duration(trak->Media->information->sampleTable->TimeToSample, nbSamp, &DTS, &dur);
+	if (e < 0) return e;
+	DTS += dur;
+	trak->Media->mediaHeader->duration = DTS;
 
+	//do not do that for old arch compat which was not taking into account cts offset
+	if (gf_sys_old_arch_compat() || !trak->Media->information->sampleTable->CompositionOffset)
+		return GF_OK;
 
-#if 1
-		if (ent) trak->Media->mediaHeader->duration += ent->sampleDelta;
-#else
-		if (!ent) {
-			u64 DTSprev;
-			stbl_GetSampleDTS(trak->Media->information->sampleTable->TimeToSample, nbSamp-1, &DTSprev);
-			trak->Media->mediaHeader->duration += (DTS - DTSprev);
-		} else {
-#ifndef GPAC_DISABLE_ISOM_WRITE
-			if (trak->moov->mov->editFileMap && trak->Media->information->sampleTable->CompositionOffset) {
-				u32 count, i;
-				u64 max_ts;
-				GF_DttsEntry *cts_ent;
-				GF_CompositionOffsetBox *ctts = trak->Media->information->sampleTable->CompositionOffset;
-				if (ctts->w_LastSampleNumber==nbSamp) {
-					count = gf_list_count(ctts->entryList);
-					max_ts = trak->Media->mediaHeader->duration;
-					while (count) {
-						count -= 1;
-						cts_ent = gf_list_get(ctts->entryList, count);
-						if (nbSamp<cts_ent->sampleCount) break;
-
-						for (i=0; i<cts_ent->sampleCount; i++) {
-							stbl_GetSampleDTS(trak->Media->information->sampleTable->TimeToSample, nbSamp-i, &DTS);
-							if ((s32) cts_ent->decodingOffset < 0) max_ts = DTS;
-							else max_ts = DTS + cts_ent->decodingOffset;
-							if (max_ts>=trak->Media->mediaHeader->duration) {
-								trak->Media->mediaHeader->duration = max_ts;
-							} else {
-								break;
-							}
-						}
-						if (max_ts<trak->Media->mediaHeader->duration) {
-							break;
-						}
-						nbSamp-=cts_ent->sampleCount;
-					}
-				}
-			}
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-			trak->Media->mediaHeader->duration += ent->sampleDelta;
+	//try to set duration according to spec: "should be the largest composition timestamp plus the duration of that sample"
+	//browse from sample_num_max_cts_delta (updated in read and edit to point to sample number with max cts offset)
+	u32 s_idx, min = trak->Media->information->sampleTable->CompositionOffset->sample_num_max_cts_delta;
+	if (!min) return GF_OK;
+	for (s_idx=min; s_idx<=nbSamp; s_idx++) {
+		u64 a_dts;
+		u32 a_dur;
+		s32 cts_o;
+		stbl_GetSampleCTS(trak->Media->information->sampleTable->CompositionOffset, s_idx, &cts_o);
+		if (cts_o<=0) continue;
+		stbl_GetSampleDTS_and_Duration(trak->Media->information->sampleTable->TimeToSample, s_idx, &a_dts, &a_dur);
+		if (a_dts + a_dur + (u32) cts_o > DTS) {
+			DTS = a_dts + (u32) cts_o + a_dur;
 		}
-#endif
-		return GF_OK;
 	}
+	trak->Media->mediaHeader->duration = DTS;
+	return GF_OK;
 }
 
 
@@ -1000,7 +1017,7 @@
 	//The first non sync sample we see must create a syncTable
 	if (sample->IsRAP) {
 		//insert it only if we have a sync table and if we have an IDR slice
-		if (stbl->SyncSample && (sample->IsRAP == RAP)) {
+		if (stbl->SyncSample && ((sample->IsRAP == RAP) || (sample->IsRAP == SAP_TYPE_2))) {
 			e = stbl_AddRAP(stbl->SyncSample, sampleNumber);
 			if (e) return e;
 		}

gpac-1.0.1.tar.gz/src/isomedia/media_odf.c -> gpac-2.0.0.tar.gz/src/isomedia/media_odf.c Changed

@@ -131,8 +131,9 @@
 				//then rewrite the ESDesc
 				j=0;
 				while ((ref = (GF_ES_ID_Ref*)gf_list_enum(isom_od->ES_ID_RefDescriptors, &j))) {
+					if (!mpod->trackIDs || !ref->trackRef || (ref->trackRef>mpod->trackIDCount)) continue;
 					//if the ref index is not valid, skip this desc...
-					if (!mpod->trackIDs || gf_isom_get_track_from_id(mdia->mediaTrack->moov, mpod->trackIDs[ref->trackRef - 1]) == NULL) continue;
+					if (gf_isom_get_track_from_id(mdia->mediaTrack->moov, mpod->trackIDs[ref->trackRef - 1]) == NULL) continue;
 					//OK, get the esd
 					e = GetESDForTime(mdia->mediaTrack->moov, mpod->trackIDs[ref->trackRef - 1], sample->DTS, &esd);
 					if (!e) e = gf_odf_desc_add_desc((GF_Descriptor *) od, (GF_Descriptor *) esd);
@@ -160,6 +161,7 @@
 			esdU2->ODID = esdU->ODID;
 			i=0;
 			while ((ref = (GF_ES_ID_Ref*)gf_list_enum(esdU->ESDescriptors, &i))) {
+				if (!mpod->trackIDs || !ref->trackRef || (ref->trackRef>mpod->trackIDCount)) continue;
 				//if the ref index is not valid, skip this desc...
 				if (gf_isom_get_track_from_id(mdia->mediaTrack->moov, mpod->trackIDs[ref->trackRef - 1]) == NULL) continue;
 				//OK, get the esd
@@ -187,6 +189,7 @@
 			skipped = 0;
 			//get the ES_ID in the mpod indicated in the ES_ID[]
 			for (i = 0; i < esdR->NbESDs; i++) {
+				if (!mpod->trackIDs || !esdR->ES_ID[i] || (esdR->ES_ID[i]>mpod->trackIDCount)) continue;
 				//if the ref index is not valid, remove this desc...
 				if (gf_isom_get_track_from_id(mdia->mediaTrack->moov, mpod->trackIDs[esdR->ES_ID[i] - 1]) == NULL) {
 					skipped ++;
@@ -256,7 +259,7 @@
 	if (!tref) {
 		tref = (GF_TrackReferenceBox *) gf_isom_box_new_parent(&mdia->mediaTrack->child_boxes, GF_ISOM_BOX_TYPE_TREF);
 		if (!tref) return GF_OUT_OF_MEM;
-		e = trak_on_child_box((GF_Box*)mdia->mediaTrack, (GF_Box *) tref);
+		e = trak_on_child_box((GF_Box*)mdia->mediaTrack, (GF_Box *) tref, GF_FALSE);
 		if (e) return e;
 	}
 	//then find the OD reference, and create it if none

gpac-1.0.1.tar.gz/src/isomedia/meta.c -> gpac-2.0.0.tar.gz/src/isomedia/meta.c Changed

@@ -127,7 +127,7 @@
 
 GF_EXPORT
 GF_Err gf_isom_get_meta_item_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num,
- u32 *itemID, u32 *type, u32 *protection_idx, Bool *is_self_reference,
+ u32 *itemID, u32 *type, u32 *protection_scheme, u32 *protection_scheme_version, Bool *is_self_reference,
 const char **item_name, const char **item_mime_type, const char **item_encoding,
 const char **item_url, const char **item_urn)
 {
@@ -140,7 +140,6 @@
 	if (!iinf) return GF_BAD_PARAM;
 
 	if (itemID) (*itemID) = iinf->item_ID;
-	if (protection_idx) (*protection_idx) = iinf->item_protection_index;
 	if (item_name) (*item_name) = iinf->item_name;
 	if (item_mime_type) (*item_mime_type) = iinf->content_type;
 	if (item_encoding) (*item_encoding) = iinf->content_encoding;
@@ -150,12 +149,33 @@
 	if (item_url) (*item_url) = NULL;
 	if (item_urn) (*item_urn) = NULL;
 
+
+	if (iinf->item_protection_index) {
+		GF_ProtectionSchemeInfoBox *sinf;
+		if (!meta->protections) return GF_ISOM_INVALID_FILE;
+		sinf = gf_list_get(meta->protections->protection_information, iinf->item_protection_index-1);
+		if (!sinf) return GF_ISOM_INVALID_FILE;
+
+		if (sinf->scheme_type) {
+			if (protection_scheme) *protection_scheme = sinf->scheme_type->scheme_type;
+			if (protection_scheme_version) *protection_scheme_version = sinf->scheme_type->scheme_version;
+		} else {
+			if (protection_scheme) *protection_scheme = GF_4CC('u','k','n','w');
+			if (protection_scheme_version) *protection_scheme_version = 0;
+
+		}
+	} else {
+		if (protection_scheme) *protection_scheme = 0;
+		if (protection_scheme_version) *protection_scheme_version = 0;
+	}
+
 	count = gf_list_count(meta->item_locations->location_entries);
 	for (i=0; i<count; i++) {
 		GF_ItemLocationEntry *iloc = (GF_ItemLocationEntry *)gf_list_get(meta->item_locations->location_entries, i);
 		if (iloc->item_ID==iinf->item_ID) {
 			if (iloc->data_reference_index) {
 				GF_Box *a = (GF_Box *)gf_list_get(meta->file_locations->dref->child_boxes, iloc->data_reference_index-1);
+				if (!a) return GF_ISOM_INVALID_FILE;
 				if (a->type==GF_ISOM_BOX_TYPE_URL) {
 					if (item_url) (*item_url) = ((GF_DataEntryURLBox*)a)->location;
 				} else if (a->type==GF_ISOM_BOX_TYPE_URN) {
@@ -165,6 +185,8 @@
 				break;
 			} else if (is_self_reference && !iloc->base_offset) {
 				GF_ItemExtentEntry *entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
+				if (!entry) return GF_ISOM_INVALID_FILE;
+
 				if (!entry->extent_length
 #ifndef GPAC_DISABLE_ISOM_WRITE
 				 && !entry->original_extent_offset
@@ -178,6 +200,18 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_get_meta_item_flags(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num)
+{
+	GF_ItemInfoEntryBox *iinf;
+	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
+	if (!meta || !meta->item_infos || !meta->item_locations) return 0;
+
+	iinf = (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, item_num-1);
+	if (!iinf) return 0;
+	return iinf->flags;
+}
+
+GF_EXPORT
 u32 gf_isom_get_meta_item_by_id(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_ID)
 {
 	u32 i, count;
@@ -197,6 +231,7 @@
 	char szPath[1024];
 	FILE *resource = NULL;
 	u32 i, count;
+	GF_Err e;
 	GF_ItemLocationEntry *location_entry;
 	u32 item_num;
 	u32 item_type = 0;
@@ -226,16 +261,6 @@
 		location_entry = NULL;
 	}
 
-	// switch (item_type) {
-	// case GF_ISOM_SUBTYPE_HVC1:
-	// case GF_ISOM_SUBTYPE_AVC_H264:
-	// case GF_ISOM_SUBTYPE_JPEG:
-	// 	break;
-	// default:
-	// 	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[IsoMedia] Extracting item type %s not supported\n", gf_4cc_to_str(item_type) ));
-	// 	return GF_NOT_SUPPORTED;
-	// }
-
 	if (!location_entry) return GF_BAD_PARAM;
 
 	/* offsets are expressed from the start of the idat box instead of the start of the file */
@@ -263,6 +288,7 @@
 	else if (location_entry->data_reference_index) {
 		char *item_url = NULL, *item_urn = NULL;
 		GF_Box *a = (GF_Box *)gf_list_get(meta->file_locations->dref->child_boxes, location_entry->data_reference_index-1);
+		if (!a) return GF_ISOM_INVALID_FILE;
 		if (a->type==GF_ISOM_BOX_TYPE_URL) {
 			item_url = ((GF_DataEntryURLBox*)a)->location;
 		} else if (a->type==GF_ISOM_BOX_TYPE_URN) {
@@ -315,10 +341,10 @@
 		}
 		nb_assoc = gf_list_count(meta->item_props->property_association->entries);
 		for (i=0; i<nb_assoc; i++) {
-			GF_ItemPropertyAssociationEntry *e = gf_list_get(meta->item_props->property_association->entries, i);
-			if (e->item_id!=item_id) continue;
-			for (j=0; j<e->nb_associations; j++) {
-				u32 idx = e->associations[j].index;
+			GF_ItemPropertyAssociationEntry *ent = gf_list_get(meta->item_props->property_association->entries, i);
+			if (ent->item_id!=item_id) continue;
+			for (j=0; j<ent->nb_associations; j++) {
+				u32 idx = ent->associations[j].index;
 				if (! idx) continue;
 				hvcc = gf_list_get(meta->item_props->property_container->child_boxes, idx - 1);
 				if (!hvcc) {
@@ -359,6 +385,7 @@
 		}
 	}
 
+	e = GF_OK;
 	for (i=0; i<count; i++) {
 		char buf_cache[4096];
 		u64 remain;
@@ -368,8 +395,16 @@
 		remain = extent_entry->extent_length;
 		while (remain) {
 			if (nalu_size_length) {
+				if (remain < nalu_size_length) {
+					e = GF_ISOM_INVALID_FILE;
+					break;
+				}
+
 				u32 nal_size = gf_bs_read_int(file->movieFileMap->bs, 8*nalu_size_length);
-				assert(remain>nalu_size_length);
+				if (remain - nalu_size_length < nal_size) {
+					e = GF_ISOM_INVALID_FILE;
+					break;
+				}
 
 				if (use_annex_b)
 					gf_bs_write_u32(item_bs, 1);
@@ -395,11 +430,11 @@
 	if (out_data) {
 		gf_bs_get_content_no_truncate(item_bs, out_data, out_size, out_alloc_size);
 	}
+	gf_bs_del(item_bs);
 	if (resource) {
 		gf_fclose(resource);
 	}
-	gf_bs_del(item_bs);
-	return GF_OK;
+	return e;
 }
 
 GF_EXPORT
@@ -415,6 +450,100 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_extract_meta_item_get_cenc_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, Bool *is_protected,
+	u8 *skip_byte_block, u8 *crypt_byte_block, const u8 **key_info, u32 *key_info_size, u32 *aux_info_type_param,
+	u8 **cenc_sai_data, u32 *cenc_sai_data_size, u32 *cenc_sai_alloc_size)
+{
+	u32 count, i;
+	u32 j, sai_item_id;
+	Bool found = GF_FALSE;
+	GF_ItemPropertyAssociationBox *ipma = NULL;
+	GF_ItemPropertyContainerBox *ipco = NULL;
+	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
+	if (!meta) return GF_BAD_PARAM;
+
+	ipma = meta->item_props->property_association;
+	ipco = meta->item_props->property_container;
+
+	count = gf_list_count(ipma->entries);
+	for (i = 0; i < count; i++) {
+		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ipma->entries, i);
+		if (entry->item_id != item_id) continue;
+		for (j = 0; j < entry->nb_associations; j++) {
+			GF_ItemEncryptionPropertyBox *ienc;
+			u32 index = entry->associations[j].index;
+			ienc = index ? (GF_ItemEncryptionPropertyBox *)gf_list_get(ipco->child_boxes, index - 1) : NULL;
+			if (!ienc) continue;
+
+			if (ienc->type!=GF_ISOM_BOX_TYPE_IENC) continue;
+			if (ienc->key_info_size<19) return GF_ISOM_INVALID_FILE;
+			
+			*skip_byte_block = ienc->skip_byte_block;
+			*crypt_byte_block = ienc->crypt_byte_block;
+			*key_info = ienc->key_info;
+			*key_info_size = ienc->key_info_size;
+			found = GF_TRUE;
+			break;
+		}
+		if (found) break;
+	}
+	if (!found) {
+		*is_protected = GF_FALSE;
+		return GF_OK;
+	}
+	*is_protected = GF_TRUE;
+	sai_item_id = 0;
+
+	//look for item reference
+	if (!meta->item_refs)
+		return GF_ISOM_INVALID_FILE;
+	count = gf_list_count(meta->item_refs->references);
+	for (i=0; i<count; i++) {
+		GF_ItemReferenceTypeBox *iref = gf_list_get(meta->item_refs->references, i);
+		if (iref->reference_type!=GF_ISOM_REF_AUXR) continue;
+		sai_item_id = iref->to_item_IDs[0];
+		break;
+	}
+	if (!sai_item_id) return GF_ISOM_INVALID_FILE;
+
+	if (aux_info_type_param) {
+		count = gf_list_count(ipma->entries);
+		found = GF_FALSE;
+		for (i = 0; i < count; i++) {
+			GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ipma->entries, i);
+			if (entry->item_id != sai_item_id) continue;
+			for (j = 0; j < entry->nb_associations; j++) {
+				GF_AuxiliaryInfoPropertyBox *iaux;
+				u32 index = entry->associations[j].index;
+				iaux = index ? (GF_AuxiliaryInfoPropertyBox *)gf_list_get(ipco->child_boxes, index - 1) : NULL;
+				if (!iaux) continue;
+
+				if (iaux->type!=GF_ISOM_BOX_TYPE_IAUX) continue;
+				switch (iaux->aux_info_type) {
+				case GF_ISOM_CENC_SCHEME:
+				case GF_ISOM_CENS_SCHEME:
+				case GF_ISOM_CBC_SCHEME:
+				case GF_ISOM_CBCS_SCHEME:
+				case 0:
+					break;
+				default:
+					continue;
+				}
+				*aux_info_type_param = iaux->aux_info_parameter;
+				found = GF_TRUE;
+				break;
+			}
+			if (found) break;
+		}
+	}
+	if (!cenc_sai_data)
+		return GF_OK;
+
+	return gf_isom_extract_meta_item_mem(file, root_meta, track_num, sai_item_id, cenc_sai_data, cenc_sai_data_size, cenc_sai_alloc_size, NULL, GF_FALSE);
+}
+
+
+GF_EXPORT
 u32 gf_isom_get_meta_primary_item_id(GF_ISOFile *file, Bool root_meta, u32 track_num)
 {
 	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
@@ -550,7 +679,7 @@
 
 GF_EXPORT
 GF_Err gf_isom_get_meta_image_props(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, GF_ImageItemProperties *prop) {
-	u32 count, i;
+	u32 count, i, inum;
 	u32 j;
 	GF_ItemPropertyAssociationBox *ipma = NULL;
 	GF_ItemPropertyContainerBox *ipco = NULL;
@@ -563,60 +692,102 @@
 	ipma = meta->item_props->property_association;
 	ipco = meta->item_props->property_container;
 
+	inum = gf_isom_get_meta_item_by_id(file, root_meta, track_num, item_id);
+	i = gf_isom_get_meta_item_flags(file, root_meta, track_num, inum);
+	if (i & 0x1)
+		prop->hidden = GF_TRUE;
+
 	count = gf_list_count(ipma->entries);
 	for (i = 0; i < count; i++) {
 		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ipma->entries, i);
-		if (entry->item_id == item_id) {
-			for (j = 0; j < entry->nb_associations; j++) {
-				GF_Box *b;
-				u32 index = entry->associations[j].index;
-				b = index ? (GF_Box *)gf_list_get(ipco->child_boxes, index - 1) : NULL;
-				if (!b) continue;
-
-				switch (b->type) {
-				case GF_ISOM_BOX_TYPE_ISPE:
-				{
-					GF_ImageSpatialExtentsPropertyBox *ispe = (GF_ImageSpatialExtentsPropertyBox *)b;
-					prop->width = ispe->image_width;
-					prop->height = ispe->image_height;
-				}
-				break;
-				case GF_ISOM_BOX_TYPE_RLOC:
-				{
-					GF_RelativeLocationPropertyBox *rloc = (GF_RelativeLocationPropertyBox *)b;
-					prop->hOffset = rloc->horizontal_offset;
-					prop->vOffset = rloc->vertical_offset;
-				}
-				break;
-				case GF_ISOM_BOX_TYPE_PASP:
-				{
-					GF_PixelAspectRatioBox *pasp = (GF_PixelAspectRatioBox *)b;
-					prop->hSpacing = pasp->hSpacing;
-					prop->vSpacing = pasp->vSpacing;
+		if (entry->item_id != item_id) continue;
+		for (j = 0; j < entry->nb_associations; j++) {
+			GF_Box *b;
+			u32 index = entry->associations[j].index;
+			b = index ? (GF_Box *)gf_list_get(ipco->child_boxes, index - 1) : NULL;
+			if (!b) continue;
+
+			switch (b->type) {
+			case GF_ISOM_BOX_TYPE_ISPE:
+			{
+				GF_ImageSpatialExtentsPropertyBox *ispe = (GF_ImageSpatialExtentsPropertyBox *)b;
+				prop->width = ispe->image_width;
+				prop->height = ispe->image_height;
+			}
+			break;
+			case GF_ISOM_BOX_TYPE_RLOC:
+			{
+				GF_RelativeLocationPropertyBox *rloc = (GF_RelativeLocationPropertyBox *)b;
+				prop->hOffset = rloc->horizontal_offset;
+				prop->vOffset = rloc->vertical_offset;
+			}
+			break;
+			case GF_ISOM_BOX_TYPE_PASP:
+			{
+				GF_PixelAspectRatioBox *pasp = (GF_PixelAspectRatioBox *)b;
+				prop->hSpacing = pasp->hSpacing;
+				prop->vSpacing = pasp->vSpacing;
+			}
+			break;
+			case GF_ISOM_BOX_TYPE_PIXI:
+			{
+				u32 k;
+				GF_PixelInformationPropertyBox *pixi = (GF_PixelInformationPropertyBox *)b;
+				if (pixi->num_channels > 3) {
+					return GF_BAD_PARAM;
 				}
-				break;
-				case GF_ISOM_BOX_TYPE_PIXI:
-				{
-					GF_PixelInformationPropertyBox *pixi = (GF_PixelInformationPropertyBox *)b;
-					if (pixi->num_channels > 3) {
-						return GF_BAD_PARAM;
+				prop->num_channels = pixi->num_channels;
+				for(k = 0; k < 3; k++) {
+					if (k < pixi->num_channels) {
+						prop->bits_per_channel[k] = pixi->bits_per_channel[k];
+					} else {
+						prop->bits_per_channel[k] = 0;
 					}
-					prop->num_channels = pixi->num_channels;
-					memset(prop->bits_per_channel, 0, 3);
-					memcpy(prop->bits_per_channel, pixi->bits_per_channel, pixi->num_channels);
-				}
-				break;
-				case GF_ISOM_BOX_TYPE_IROT:
-				{
-					GF_ImageRotationBox *irot = (GF_ImageRotationBox *)b;
-					prop->angle = irot->angle * 90;
 				}
+			}
+			break;
+			case GF_ISOM_BOX_TYPE_IROT:
+			{
+				GF_ImageRotationBox *irot = (GF_ImageRotationBox *)b;
+				prop->angle = irot->angle * 90;
+			}
+			break;
+			case GF_ISOM_BOX_TYPE_IMIR:
+			{
+				GF_ImageMirrorBox *imir = (GF_ImageMirrorBox *)b;
+				prop->mirror = imir->axis+1;
+			}
+			break;
+			case GF_ISOM_BOX_TYPE_CLAP:
+			{
+				GF_CleanApertureBox *clap = (GF_CleanApertureBox *)b;
+				prop->clap_hden = clap->cleanApertureHeightD;
+				prop->clap_hnum = clap->cleanApertureHeightN;
+				prop->clap_wden = clap->cleanApertureWidthD;
+				prop->clap_wnum = clap->cleanApertureWidthN;
+				prop->clap_hoden = clap->horizOffD;
+				prop->clap_honum = clap->horizOffN;
+				prop->clap_voden = clap->vertOffD;
+				prop->clap_vonum = clap->vertOffN;
+			}
+			break;
+			case GF_ISOM_BOX_TYPE_A1LX:
+			{
+				GF_AV1LayeredImageIndexingPropertyBox *a1lx = (GF_AV1LayeredImageIndexingPropertyBox *)b;
+				memcpy(prop->av1_layer_size, a1lx->layer_size, sizeof(prop->av1_layer_size));
+			}
+			break;
+			case GF_ISOM_BOX_TYPE_A1OP:
+			{
+				GF_AV1OperatingPointSelectorPropertyBox *a1op = (GF_AV1OperatingPointSelectorPropertyBox *)b;
+				prop->av1_op_index = a1op->op_index;
+			}
+			case GF_ISOM_BOX_TYPE_HVCC:
+			case GF_ISOM_BOX_TYPE_AVCC:
+			case GF_ISOM_BOX_TYPE_AV1C:
+			case GF_ISOM_BOX_TYPE_VVCC:
+				prop->config = b;
 				break;
-				case GF_ISOM_BOX_TYPE_HVCC:
-				case GF_ISOM_BOX_TYPE_AVCC:
-					prop->config = b;
-					break;
-				}
 			}
 		}
 	}
@@ -662,6 +833,29 @@
 			}
 		}
 		break;
+		case GF_ISOM_BOX_TYPE_IMIR:
+		{
+			GF_ImageMirrorBox *imir = (GF_ImageMirrorBox *)b;
+			if (prop->mirror && imir->axis == prop->mirror-1) {
+				return i;
+			}
+		}
+		break;
+		case GF_ISOM_BOX_TYPE_CLAP:
+		{
+			GF_CleanApertureBox *clap = (GF_CleanApertureBox *)b;
+			if (prop->clap_hden == clap->cleanApertureHeightD &&
+				prop->clap_hnum == clap->cleanApertureHeightN &&
+				prop->clap_wden == clap->cleanApertureWidthD &&
+				prop->clap_wnum == clap->cleanApertureWidthN &&
+				prop->clap_hoden == clap->horizOffD &&
+				prop->clap_honum == clap->horizOffN &&
+				prop->clap_voden == clap->vertOffD &&
+				prop->clap_vonum == clap->vertOffN) {
+				return i;
+			}
+		}
+		break;
 		case GF_ISOM_BOX_TYPE_PIXI:
 		{
 			GF_PixelInformationPropertyBox *pixi = (GF_PixelInformationPropertyBox *)b;
@@ -676,6 +870,37 @@
 			}
 		}
 		break;
+		case GF_ISOM_BOX_TYPE_IENC:
+		{
+			GF_ItemEncryptionPropertyBox *ienc = (GF_ItemEncryptionPropertyBox *)b;
+			if (prop->cenc_info
+				&& (prop->cenc_info->skip_byte_block == ienc->skip_byte_block)
+				&& (prop->cenc_info->crypt_byte_block == ienc->crypt_byte_block)
+				&& (prop->cenc_info->key_info_size == ienc->key_info_size)
+				&& prop->cenc_info->key_info && ienc->key_info
+				&& !memcmp(prop->cenc_info->key_info, ienc->key_info, ienc->key_info_size)
+			) {
+				return i;
+			}
+		}
+		break;
+		case GF_ISOM_BOX_TYPE_A1LX:
+		{
+			GF_AV1LayeredImageIndexingPropertyBox *a1lx = (GF_AV1LayeredImageIndexingPropertyBox *)b;
+			if (memcmp(prop->av1_layer_size, a1lx->layer_size, sizeof(prop->av1_layer_size)) == 0) {
+				return i;
+			}
+		}
+		break;
+		case GF_ISOM_BOX_TYPE_A1OP:
+		{
+			GF_AV1OperatingPointSelectorPropertyBox *a1op = (GF_AV1OperatingPointSelectorPropertyBox *)b;
+			if (prop->av1_op_index == a1op->op_index) {
+				return i;
+			}
+		}
+		break;
+		
 		default:
 			if (gf_isom_box_equal(prop->config, b)) {
 				return i;
@@ -804,6 +1029,33 @@
 		searchprop.hSpacing = 0;
 		searchprop.vSpacing = 0;
 	}
+	if (image_props->clap_wnum || image_props->clap_wden || image_props->clap_hnum || image_props->clap_hden || image_props->clap_honum || image_props->clap_hoden || image_props->clap_vonum || image_props->clap_voden) {
+		searchprop.clap_wnum = image_props->clap_wnum;
+		searchprop.clap_wden = image_props->clap_wden;
+		searchprop.clap_hnum = image_props->clap_hnum;
+		searchprop.clap_hden = image_props->clap_hden;
+		searchprop.clap_honum = image_props->clap_honum;
+		searchprop.clap_hoden = image_props->clap_hoden;
+		searchprop.clap_vonum = image_props->clap_vonum;
+		searchprop.clap_voden = image_props->clap_voden;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_CleanApertureBox *clap = (GF_CleanApertureBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_CLAP);
+			if (!clap) return GF_OUT_OF_MEM;
+			clap->cleanApertureHeightD = image_props->clap_hden;
+			clap->cleanApertureHeightN = image_props->clap_hnum;
+			clap->cleanApertureWidthD = image_props->clap_wden;
+			clap->cleanApertureWidthN = image_props->clap_wnum;
+			clap->horizOffD = image_props->clap_hoden;
+			clap->horizOffN = image_props->clap_honum;
+			clap->vertOffD = image_props->clap_voden;
+			clap->vertOffN = image_props->clap_vonum;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
+		}
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
+		searchprop.clap_wnum = searchprop.clap_wden = searchprop.clap_hnum = searchprop.clap_hden = searchprop.clap_honum = searchprop.clap_hoden = searchprop.clap_vonum = searchprop.clap_voden = 0;
+	}
 	if (image_props->angle) {
 		searchprop.angle = image_props->angle;
 		prop_index = meta_find_prop(ipco, &searchprop);
@@ -817,6 +1069,19 @@
 		if (e) return e;
 		searchprop.angle = 0;
 	}
+	if (image_props->mirror) {
+		searchprop.mirror = image_props->mirror;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_ImageMirrorBox *imir = (GF_ImageMirrorBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_IMIR);
+			if (!imir) return GF_OUT_OF_MEM;
+			imir->axis = image_props->mirror-1;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
+		}
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
+		searchprop.mirror = 0;
+	}
 	if (image_props->config) {
 		searchprop.config = image_props->config;
 		prop_index = meta_find_prop(ipco, &searchprop);
@@ -841,9 +1106,25 @@
 		if (e) return e;
 		searchprop.alpha = GF_FALSE;
 	}
+	if (image_props->depth) {
+		searchprop.depth = image_props->depth;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_AuxiliaryTypePropertyBox *auxC = (GF_AuxiliaryTypePropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_AUXC);
+			if (!auxC) return GF_OUT_OF_MEM;
+			auxC->aux_urn = gf_strdup("urn:mpeg:mpegB:cicp:systems:auxiliary:depth");
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
+		}
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
+		searchprop.alpha = GF_FALSE;
+	}
 	if (image_props->num_channels) {
+		u32 k;
 		searchprop.num_channels = image_props->num_channels;
-		memcpy(searchprop.bits_per_channel, image_props->bits_per_channel, 3);
+		for (k=0; k<3; k++) {
+			searchprop.bits_per_channel[k] = image_props->bits_per_channel[k];
+		}
 		prop_index = meta_find_prop(ipco, &searchprop);
 		if (prop_index < 0) {
 			GF_PixelInformationPropertyBox *pixi = (GF_PixelInformationPropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_PIXI);
@@ -851,13 +1132,90 @@
 			pixi->num_channels = image_props->num_channels;
 			pixi->bits_per_channel = gf_malloc(pixi->num_channels);
 			if (!pixi->bits_per_channel) return GF_OUT_OF_MEM;
-			memcpy(pixi->bits_per_channel, image_props->bits_per_channel, image_props->num_channels);
+			for (k=0; k<pixi->num_channels; k++) {
+				pixi->bits_per_channel[k] = image_props->bits_per_channel[k];
+			}
 			prop_index = gf_list_count(ipco->child_boxes) - 1;
 		}
 		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
 		if (e) return e;
 		searchprop.num_channels = 0;
 	}
+	if ((image_props->av1_layer_size[0] != image_props->av1_layer_size[1]) ||
+		(image_props->av1_layer_size[1] != image_props->av1_layer_size[2]) ||
+		(image_props->av1_layer_size[0] != image_props->av1_layer_size[2])) {
+		memcpy(searchprop.av1_layer_size, image_props->av1_layer_size, sizeof(searchprop.av1_layer_size));
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_AV1LayeredImageIndexingPropertyBox *a1lx = (GF_AV1LayeredImageIndexingPropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_A1LX);
+			if (!a1lx) return GF_OUT_OF_MEM;
+			a1lx->large_size = 1;
+			memcpy(a1lx->layer_size, image_props->av1_layer_size, sizeof(a1lx->layer_size));
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
+		}
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_FALSE);
+		if (e) return e;
+		memset(searchprop.av1_layer_size, 0, sizeof(searchprop.av1_layer_size));
+	}
+	if (image_props->av1_op_index) {
+		searchprop.av1_op_index = image_props->av1_op_index;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_AV1OperatingPointSelectorPropertyBox *a1op = (GF_AV1OperatingPointSelectorPropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_A1OP);
+			if (!a1op) return GF_OUT_OF_MEM;
+			a1op->op_index = image_props->av1_op_index;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
+		}
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
+		searchprop.av1_op_index = 0;
+	}
+
+	if (image_props->aux_urn) {
+		GF_AuxiliaryTypePropertyBox *auxC = (GF_AuxiliaryTypePropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_AUXC);
+		if (!auxC) return GF_OUT_OF_MEM;
+		auxC->aux_urn = gf_strdup(image_props->aux_urn);
+		prop_index = gf_list_count(ipco->child_boxes) - 1;
+		if (image_props->aux_data && image_props->aux_data_len) {
+			auxC->data_size = image_props->aux_data_len;
+			auxC->data = gf_malloc(sizeof(u8) * image_props->aux_data_len);
+			if (!auxC->data) return GF_OUT_OF_MEM;
+			memcpy(auxC->data, image_props->aux_data, sizeof(u8) * image_props->aux_data_len);
+		}
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
+	}
+
+	if (image_props->cenc_info) {
+		GF_ItemEncryptionPropertyBox *ienc = NULL;
+
+		if (!gf_cenc_validate_key_info(image_props->cenc_info->key_info, image_props->cenc_info->key_info_size))
+			return GF_BAD_PARAM;
+
+		searchprop.cenc_info = image_props->cenc_info;
+
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			ienc = (GF_ItemEncryptionPropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_IENC);
+			if (!ienc) return GF_OUT_OF_MEM;
+			ienc->skip_byte_block = image_props->cenc_info->skip_byte_block;
+			ienc->crypt_byte_block = image_props->cenc_info->crypt_byte_block;
+			ienc->key_info_size = image_props->cenc_info->key_info_size;
+			ienc->key_info = gf_malloc(sizeof(u8) * image_props->cenc_info->key_info_size);
+			if (!ienc->key_info) {
+				gf_free(ienc);
+				return GF_OUT_OF_MEM;
+			}
+			memcpy(ienc->key_info, image_props->cenc_info->key_info, image_props->cenc_info->key_info_size);
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
+		}
+
+		//add property
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
+		searchprop.cenc_info = NULL;
+	}
+
 	return GF_OK;
 }
 
@@ -886,14 +1244,23 @@
 	else {
 		*item_id = lastItemID + 1;
 	}
+	if (meta->groups_list) {
+		u32 i;
+		u32 groups_count = gf_list_count(meta->groups_list->child_boxes);
+		for (i = 0; i < groups_count; i++) {
+			GF_EntityToGroupTypeBox *g = (GF_EntityToGroupTypeBox *)gf_list_get(meta->groups_list->child_boxes, i);
+			if (g->group_id > lastItemID) lastItemID = g->group_id;
+		}
+		*item_id = lastItemID+1;
+	}
 	return GF_OK;
 }
 
 GF_Err gf_isom_add_meta_item_extended(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path,
- const char *item_name, u32 item_id, u32 item_type, const char *mime_type, const char *content_encoding,
+ const char *item_name, u32 *io_item_id, u32 item_type, const char *mime_type, const char *content_encoding,
 GF_ImageItemProperties *image_props,
 const char *URL, const char *URN,
- char *data, u32 data_len, GF_List *item_extent_refs)
+ char *data, u32 data_len, GF_List *item_extent_refs, u32 tk_id, u32 sample_num)
 {
 	u32 i;
 	GF_Err e;
@@ -901,8 +1268,8 @@
 	GF_ItemInfoEntryBox *infe;
 	GF_MetaBox *meta;
 	u32 lastItemID = 0;
+	u32 item_id = io_item_id ? *io_item_id : 0;
 
-	if (!self_reference && !resource_path && !data && !item_extent_refs) return GF_BAD_PARAM;
 	e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 	meta = gf_isom_get_meta(file, root_meta, track_num);
@@ -947,12 +1314,26 @@
 	} else {
 		infe->item_ID = ++lastItemID;
 	}
-
+	if (io_item_id) *io_item_id = infe->item_ID;
+	
+	if (tk_id && sample_num) {
+		data_len = gf_isom_get_sample_size(file, tk_id, sample_num);
+		if (item_name)
+			infe->item_name = gf_strdup(item_name);
+	}
+	else if (!tk_id && sample_num) {
+		data_len = 0;
+		if (item_name)
+			infe->item_name = gf_strdup(item_name);
+	}
 	/*get relative name*/
-	if (item_name) {
+	else if (item_name) {
 		infe->item_name = gf_strdup(item_name);
+		file->no_inplace_rewrite = GF_TRUE;
 	} else if (resource_path) {
-		infe->item_name = gf_strdup(gf_file_basename( resource_path ));
+		//don't write an item name if not set
+		//infe->item_name = gf_strdup(gf_file_basename( resource_path ));
+		file->no_inplace_rewrite = GF_TRUE;
 	}
 
 	infe->item_type = item_type;
@@ -992,6 +1373,78 @@
 		}
 		e = meta_process_image_properties(meta, infe->item_ID, image_props);
 		if (e) return e;
+
+		if (image_props->cenc_info) {
+			GF_ProtectionSchemeInfoBox *sinf;
+			u32 cenc_item_id = infe->item_ID + 1;
+
+			//create a new auxi item
+			e = gf_isom_add_meta_item_memory(file, root_meta, track_num, NULL, &cenc_item_id, GF_ISOM_ITEM_TYPE_AUXI, NULL, NULL, NULL, (u8 *) image_props->cenc_info->sai_data, image_props->cenc_info->sai_data_size, NULL);
+			if (e) return e;
+			//add item reference
+			e = gf_isom_meta_add_item_ref(file, root_meta, track_num, infe->item_ID, cenc_item_id, GF_ISOM_REF_AUXR, NULL);
+			if (e) return e;
+
+			//multikey, we MUST have a 'iaux' prop with aux_info_type_param=1 associated
+			if (image_props->cenc_info->key_info[0]) {
+				GF_ItemPropertyContainerBox *ipco = meta->item_props->property_container;
+				GF_ItemPropertyAssociationBox *ipma = meta->item_props->property_association;
+				u32 k, pcount = gf_list_count(ipco->child_boxes);
+				s32 prop_index = -1;
+				for (k=0; k<pcount; k++) {
+					GF_AuxiliaryInfoPropertyBox *b = (GF_AuxiliaryInfoPropertyBox*)gf_list_get(ipco->child_boxes, k);
+					if (b->type != GF_ISOM_BOX_TYPE_IAUX) continue;
+					switch (b->aux_info_type) {
+					case GF_ISOM_CENC_SCHEME:
+					case GF_ISOM_CENS_SCHEME:
+					case GF_ISOM_CBC_SCHEME:
+					case GF_ISOM_CBCS_SCHEME:
+					case 0:
+						break;
+					default:
+						continue;
+					}
+					if (b->aux_info_parameter!=1) continue;
+					prop_index = k;
+					break;
+				}
+
+				if (prop_index < 0) {
+					GF_AuxiliaryInfoPropertyBox *iaux = (GF_AuxiliaryInfoPropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_IAUX);
+					if (!iaux) return GF_OUT_OF_MEM;
+					iaux->aux_info_parameter = 1;
+					prop_index = gf_list_count(ipco->child_boxes) - 1;
+				}
+
+				//add property
+				e = meta_add_item_property_association(ipma, cenc_item_id, prop_index + 1, GF_TRUE);
+				if (e) return e;
+			}
+
+			//look for scheme in ipro
+			if (!meta->protections) {
+				meta->protections = (GF_ItemProtectionBox *) gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_IPRO);
+				if (!meta->protections) return GF_OUT_OF_MEM;
+			}
+			sinf = NULL;
+			for (i=0; i<gf_list_count(meta->protections->protection_information); i++) {
+				sinf = gf_list_get(meta->protections->protection_information, i);
+				if (sinf->scheme_type && (sinf->scheme_type->scheme_type==image_props->cenc_info->scheme_type)
+					&& (sinf->scheme_type->scheme_version==image_props->cenc_info->scheme_version))
+					break;
+				sinf = NULL;
+			}
+			if (!sinf) {
+				sinf = (GF_ProtectionSchemeInfoBox *)gf_isom_box_new_parent(&meta->protections->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+				if (!sinf) return GF_OUT_OF_MEM;
+				gf_list_add(meta->protections->protection_information, sinf);
+				sinf->scheme_type = (GF_SchemeTypeBox *)gf_isom_box_new_parent(&sinf->child_boxes, GF_ISOM_BOX_TYPE_SCHM);
+				if (!sinf->scheme_type) return GF_OUT_OF_MEM;
+				sinf->scheme_type->scheme_type = image_props->cenc_info->scheme_type;
+				sinf->scheme_type->scheme_version = image_props->cenc_info->scheme_version;
+			}
+			infe->item_protection_index = 1 + gf_list_find(meta->protections->protection_information, sinf);
+		}
 	}
 
 	/*0: the current file*/
@@ -1041,7 +1494,48 @@
 			gf_isom_meta_add_item_ref(file, root_meta, track_num, infe->item_ID, *item_index, GF_ISOM_REF_ILOC, &(entry->extent_index));
 		}
 	}
-	else {
+	else if (tk_id && sample_num) {
+		if ((file->openMode == GF_ISOM_OPEN_WRITE) || (file->openMode == GF_ISOM_OPEN_EDIT)) {
+			GF_ItemExtentEntry *entry;
+			GF_SAFEALLOC(entry, GF_ItemExtentEntry);
+			if (!entry) return GF_OUT_OF_MEM;
+
+			entry->extent_length = data_len;
+			location_entry->base_offset = 0;
+			GF_ISOSample *samp = gf_isom_get_sample_info(file, tk_id, sample_num, NULL, &entry->extent_offset);
+			if (samp) gf_isom_sample_del(&samp);
+			gf_list_add(location_entry->extent_entries, entry);
+
+			if (data_len>0xFFFFFFFF) meta->item_locations->length_size = 8;
+			else if (! meta->item_locations->base_offset_size) meta->item_locations->length_size = 4;
+
+			//for in-place rewrite + add-image
+			if (file->openMode == GF_ISOM_OPEN_EDIT) {
+				location_entry->base_offset = 0;
+				infe->tk_id = tk_id;
+				infe->sample_num = sample_num;
+				infe->data_len = data_len;
+			}
+		} else {
+			infe->tk_id = tk_id;
+			infe->sample_num = sample_num;
+			infe->data_len = data_len;
+			file->no_inplace_rewrite = GF_TRUE;
+		}
+		meta->use_item_sample_sharing = 1;
+	}
+	else if (!tk_id && sample_num) {
+		GF_ItemExtentEntry *entry;
+		GF_SAFEALLOC(entry, GF_ItemExtentEntry);
+		if (!entry) return GF_OUT_OF_MEM;
+
+		entry->extent_length = data_len;
+		gf_list_add(location_entry->extent_entries, entry);
+		infe->ref_it_id = sample_num;
+		infe->data_len = data_len;
+		meta->use_item_item_sharing = 1;
+	}
+	else if (data || resource_path){
 		/*capture mode, write to disk*/
 		if ((file->openMode == GF_ISOM_OPEN_WRITE) && !location_entry->data_reference_index) {
 			FILE *src;
@@ -1097,7 +1591,7 @@
 				memcpy(infe->full_path, data, sizeof(char) * data_len);
 				infe->data_len = data_len;
 			}
-			else {
+			else if (resource_path) {
 				infe->full_path = gf_strdup(resource_path);
 				infe->data_len = 0;
 			}
@@ -1111,17 +1605,90 @@
 const char *mime_type, const char *content_encoding, const char *URL, const char *URN,
 GF_ImageItemProperties *image_props)
 {
-	return gf_isom_add_meta_item_extended(file, root_meta, track_num, self_reference, resource_path, item_name, item_id, item_type, mime_type, content_encoding, image_props, URL, URN, NULL, 0, NULL);
+	return gf_isom_add_meta_item_extended(file, root_meta, track_num, self_reference, resource_path, item_name, &item_id, item_type, mime_type, content_encoding, image_props, URL, URN, NULL, 0, NULL, 0, 0);
+}
+
+GF_EXPORT
+GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, u32 *item_id, u32 item_type, const char *mime_type, const char *content_encoding, GF_ImageItemProperties *image_props, char *data, u32 data_len, GF_List *item_extent_refs)
+{
+	return gf_isom_add_meta_item_extended(file, root_meta, track_num, GF_FALSE, NULL, item_name, item_id, item_type, mime_type, content_encoding, image_props, NULL, NULL, data, data_len, item_extent_refs, 0, 0);
 }
 
 GF_EXPORT
-GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, u32 item_id, u32 item_type, const char *mime_type, const char *content_encoding, GF_ImageItemProperties *image_props, char *data, u32 data_len, GF_List *item_extent_refs)
+GF_Err gf_isom_add_meta_item_sample_ref(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, u32 *item_id, u32 item_type, const char *mime_type, const char *content_encoding, GF_ImageItemProperties *image_props, u32 tk_id, u32 sample_num)
+{
+	return gf_isom_add_meta_item_extended(file, root_meta, track_num, GF_FALSE, NULL, item_name, item_id, item_type, mime_type, content_encoding, image_props, NULL, NULL, NULL, 0, NULL, tk_id, sample_num);
+}
+
+static Bool meta_use_item_prop_idx(GF_MetaBox *meta, u32 prop_idx)
+{
+	u32 k, i, count = gf_list_count(meta->item_props->property_association->entries);
+	for (i=0; i<count; i++) {
+		GF_ItemPropertyAssociationEntry *pa_ent = gf_list_get(meta->item_props->property_association->entries, i);
+		for (k=0; k<pa_ent->nb_associations; k++) {
+			if (pa_ent->associations[k].index == prop_idx) return GF_TRUE;
+		}
+	}
+	return GF_FALSE;
+}
+
+static void meta_shift_item_prop_idx(GF_MetaBox *meta, u32 prop_idx)
+{
+	u32 k, i, count = gf_list_count(meta->item_props->property_association->entries);
+	for (i=0; i<count; i++) {
+		GF_ItemPropertyAssociationEntry *pa_ent = gf_list_get(meta->item_props->property_association->entries, i);
+		for (k=0; k<pa_ent->nb_associations; k++) {
+			if (pa_ent->associations[k].index > prop_idx) {
+				pa_ent->associations[k].index--;
+			}
+		}
+	}
+}
+
+static void meta_cleanup_associations(GF_MetaBox *meta)
+{
+	u32 i, count = gf_list_count(meta->item_props->property_container->child_boxes);
+	for (i=0; i<count; i++) {
+		u32 prop_idx = i+1;
+		if (meta_use_item_prop_idx(meta, prop_idx)) continue;
+
+		meta_shift_item_prop_idx(meta, prop_idx);
+		GF_Box *prop = gf_list_get(meta->item_props->property_container->child_boxes, i);
+		gf_isom_box_del_parent(&meta->item_props->property_container->child_boxes, prop);
+		i--;
+		count--;
+	}
+}
+
+static void meta_cleanup_item_association(GF_MetaBox *meta, GF_ItemPropertyAssociationEntry *pa_ent, const char *keep_props)
 {
-	return gf_isom_add_meta_item_extended(file, root_meta, track_num, GF_FALSE, NULL, item_name, item_id, item_type, mime_type, content_encoding, image_props, NULL, NULL, data, data_len, item_extent_refs);
+	u32 i;
+	GF_ItemPropertyContainerBox *ipco = meta->item_props->property_container;
+
+	for (i=0; i<pa_ent->nb_associations; i++) {
+		GF_Box *prop;
+		Bool do_rem = GF_TRUE;
+		if (!pa_ent->associations[i].index) continue;
+		prop = gf_list_get(ipco->child_boxes, pa_ent->associations[i].index-1);
+		if (prop && keep_props) {
+			const char *p4cc = gf_4cc_to_str(prop->type);
+			if (keep_props && strstr(keep_props, p4cc))
+				do_rem = GF_FALSE;
+		}
+
+		if (do_rem) {
+			if (i+1<pa_ent->nb_associations) {
+				memmove(&pa_ent->associations[i], &pa_ent->associations[i+1], sizeof(GF_ItemPropertyAssociationSlot)*(pa_ent->nb_associations-i-1));
+			}
+			pa_ent->nb_associations--;
+			i--;
+		}
+	}
 }
 
+
 GF_EXPORT
-GF_Err gf_isom_remove_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id)
+GF_Err gf_isom_remove_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, Bool keep_refs, const char *keep_props)
 {
 	GF_ItemInfoEntryBox *iinf;
 	u32 i, count;
@@ -1130,7 +1697,10 @@
 	if (!meta || !meta->item_infos || !meta->item_locations) return GF_BAD_PARAM;
 
 	item_num = gf_isom_get_meta_item_by_id(file, root_meta, track_num, item_id);
-	if (!item_num) return GF_BAD_PARAM;
+	if (!item_num) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: No item with ID %d in file, cannnot remove\n"));
+		return GF_NOT_FOUND;
+	}
 	iinf = (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, item_num-1);
 	gf_list_rem(meta->item_infos->item_infos, item_num-1);
 
@@ -1138,7 +1708,7 @@
 	for (i=0; i<count; i++) {
 		GF_ItemLocationEntry *iloc = (GF_ItemLocationEntry *)gf_list_get(meta->item_locations->location_entries, i);
 		if (iloc->item_ID==iinf->item_ID) {
-			/*FIXME: remove data ref...*/
+			/*TODO: remove data ref...*/
 			if (iloc->data_reference_index) { }
 
 			gf_list_rem(meta->item_locations->location_entries, i);
@@ -1146,6 +1716,81 @@
 			break;
 		}
 	}
+
+	if (meta->item_props && meta->item_props->property_association) {
+		Bool cleanup_associations = GF_FALSE;
+		GF_ItemPropertyAssociationBox *ipma = meta->item_props->property_association;
+		count = gf_list_count(ipma->entries);
+		for (i=0; i<count; i++) {
+			GF_ItemPropertyAssociationEntry *pa_ent = gf_list_get(ipma->entries, i);
+			if (pa_ent->item_id == iinf->item_ID) {
+				meta_cleanup_item_association(meta, pa_ent, keep_props);
+				if (!pa_ent->nb_associations) {
+					gf_free(pa_ent->associations);
+					gf_free(pa_ent);
+					gf_list_rem(ipma->entries, i);
+				}
+				cleanup_associations = GF_TRUE;
+				break;
+			}
+		}
+
+		if (cleanup_associations) {
+			meta_cleanup_associations(meta);
+		}
+	}
+
+	if (!keep_refs && meta->item_refs) {
+		count = gf_list_count(meta->item_refs->references);
+		for (i=0; i<count; i++) {
+			GF_ItemReferenceTypeBox *iref = gf_list_get(meta->item_refs->references, i);
+			Bool do_delete = GF_FALSE;
+			if (iref->from_item_id == item_id) {
+				do_delete = GF_FALSE;
+			} else {
+				u32 k;
+				for (k=0; k<iref->reference_count; k++) {
+					if (iref->to_item_IDs[k] != item_id) continue;
+					if (k+1<iref->reference_count)
+						memmove(&iref->to_item_IDs[k], &iref->to_item_IDs[k+1], sizeof(u32)*(iref->reference_count-k-1));
+					iref->reference_count--;
+					k--;
+				}
+				if (!iref->reference_count) {
+					do_delete = GF_TRUE;
+				}
+			}
+			if (do_delete) {
+				gf_isom_box_del_parent(&meta->item_refs->child_boxes, (GF_Box *) iref);
+				gf_list_rem(meta->item_refs->references, i);
+				i--;
+				count--;
+			}
+		}
+	}
+
+	//rewrite item sharing ids
+	if (meta->use_item_item_sharing) {
+		u32 new_ref_id = 0;
+		count = gf_list_count(meta->item_infos->item_infos);
+		for (i=0; i<count; i++) {
+			GF_ItemInfoEntryBox *iinf2 = (GF_ItemInfoEntryBox *) gf_list_get(meta->item_infos->item_infos, i);
+			if (iinf2->ref_it_id != iinf->item_ID) continue;
+
+			if (new_ref_id) {
+				iinf2->ref_it_id = new_ref_id;
+			} else {
+				new_ref_id = iinf2->item_ID;
+				iinf2->ref_it_id = 0;
+				if (iinf->tk_id) {
+					iinf2->tk_id = iinf->tk_id;
+					iinf2->sample_num = iinf->sample_num;
+					iinf2->data_len = iinf->data_len;
+				}
+			}
+		}
+	}
+
 	gf_isom_box_del_parent(&meta->item_infos->child_boxes, (GF_Box *)iinf);
 	return GF_OK;
 }
@@ -1214,4 +1859,173 @@
 
 }
 
+void gf_isom_meta_restore_items_ref(GF_ISOFile *movie, GF_MetaBox *meta)
+{
+	u32 i, nb_items, nb_tracks;
+	if (!meta->item_locations || !meta->item_infos) return;
+	nb_tracks = movie->moov ? gf_list_count(movie->moov->trackList) : 0;
+	nb_items = gf_list_count(meta->item_locations->location_entries);
+	for (i=0; i<nb_items; i++) {
+		u32 j;
+		u64 item_offset;
+		GF_ItemExtentEntry *entry;
+		GF_ItemLocationEntry *iloc = (GF_ItemLocationEntry *)gf_list_get(meta->item_locations->location_entries, i);
+		/*get item info*/
+		GF_ItemInfoEntryBox *iinf = NULL;
+		j=0;
+		while ((iinf = (GF_ItemInfoEntryBox *)gf_list_enum(meta->item_infos->item_infos, &j))) {
+			if (iinf->item_ID==iloc->item_ID) break;
+			iinf = NULL;
+		}
+		if (!iinf) continue;
+		if (iinf->ref_it_id) continue;
+
+		if (gf_list_count(iloc->extent_entries) != 1) continue;
+		entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
+		if (!entry) continue;
+		item_offset = iloc->base_offset + entry->extent_offset;
+
+		for (j=0;j<nb_tracks; j++) {
+			GF_TrackBox *trak;
+			GF_SampleSizeBox *stsz;
+			u32 k;
+			trak = gf_list_get(movie->moov->trackList, j);
+			if (! gf_isom_is_video_handler_type(trak->Media->handler->handlerType))
+				continue;
+
+			stsz = trak->Media->information->sampleTable->SampleSize;
+			if (!stsz->sampleCount) continue;
+			for (k=0; k<stsz->sampleCount; k++) {
+				GF_Err e;
+				u32 chunk, di, samp_size;
+				u64 samp_offset;
+				samp_size = stsz->sampleSize ? stsz->sampleSize : stsz->sizes[k];
+				if (samp_size != entry->extent_length)
+					continue;
+
+				e = stbl_GetSampleInfos(trak->Media->information->sampleTable, k+1, &samp_offset, &chunk, &di, NULL);
+				if (e) continue;
+				if (samp_offset == item_offset) {
+					iinf->tk_id = trak->Header->trackID;
+					iinf->sample_num = k+1;
+					iinf->data_len = (u32) entry->extent_length;
+					meta->use_item_sample_sharing = 1;
+					break;
+				}
+			}
+			if (iinf->tk_id) break;
+		}
+
+		//restore all item refs
+		for (j=i+1;j<nb_items; j++) {
+			u32 k;
+			u64 item_offset2;
+			GF_ItemExtentEntry *entry2;
+			GF_ItemLocationEntry *iloc2 = (GF_ItemLocationEntry *)gf_list_get(meta->item_locations->location_entries, j);
+			/*get item info*/
+			GF_ItemInfoEntryBox *iinf2 = NULL;
+			k=0;
+			while ((iinf2 = (GF_ItemInfoEntryBox *)gf_list_enum(meta->item_infos->item_infos, &k))) {
+				if (iinf2->item_ID==iloc2->item_ID) break;
+				iinf2 = NULL;
+			}
+			if (!iinf2) continue;
+			if (gf_list_count(iloc2->extent_entries) != 1) continue;
+			entry2 = (GF_ItemExtentEntry *)gf_list_get(iloc2->extent_entries, 0);
+			if (!entry2) continue;
+			item_offset2 = iloc2->base_offset + entry2->extent_offset;
+
+			if (item_offset == item_offset2) {
+				iinf2->ref_it_id = iinf->item_ID;
+				meta->use_item_item_sharing = 1;
+			}
+		}
+	}
+}
+
+GF_EXPORT
+GF_Err gf_isom_meta_add_item_group(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, u32 group_id, u32 group_type)
+{
+	u32 i, count;
+	GF_EntityToGroupTypeBox *group;
+	s32 index = -1;
+	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
+	if (!meta) return GF_BAD_PARAM;
+	if (!group_type) return GF_BAD_PARAM;
+	if (!group_id) {
+		GF_Err e = gf_isom_meta_get_next_item_id(file, root_meta, track_num, &group_id);
+		if (e != GF_OK) return e;
+	}
+	if (!meta->groups_list) {
+		meta->groups_list = (GF_GroupListBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_GRPL);
+		if (!meta->groups_list) return GF_OUT_OF_MEM;
+		meta->groups_list->child_boxes = gf_list_new();
+		if (!meta->groups_list->child_boxes) return GF_OUT_OF_MEM;
+	}
+	count = gf_list_count(meta->groups_list->child_boxes);
+	for (i = 0; i < count; i++) {
+		group = (GF_EntityToGroupTypeBox *)gf_list_get(meta->groups_list->child_boxes, i);
+		if (group->grouping_type == group_type && group->group_id == group_id) {
+			index = i;
+			break;
+		}
+	}
+	if (index < 0) {
+		group = (GF_EntityToGroupTypeBox *)gf_isom_box_new_parent(&meta->groups_list->child_boxes, GF_ISOM_BOX_TYPE_GRPT);
+		if (!group) return GF_OUT_OF_MEM;
+		group->grouping_type = group_type;
+		group->group_id = group_id;
+		group->entity_ids = NULL;
+		group->entity_id_count = 0;
+	} else {
+		group = (GF_EntityToGroupTypeBox *)gf_list_get(meta->groups_list->child_boxes, index);
+	}
+
+	group->entity_ids = (u32 *)gf_realloc(group->entity_ids, (group->entity_id_count + 1) * sizeof(u32));
+	if (!group->entity_ids) return GF_OUT_OF_MEM;
+	group->entity_ids[group->entity_id_count] = item_id;
+	group->entity_id_count++;
+
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_isom_meta_get_item_ref_count(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 from_id, u32 type)
+{
+	u32 i, count;
+	GF_ItemReferenceTypeBox *ref;
+	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
+	if (!meta || !type || !from_id) return 0;
+	if (!meta->item_refs) return 0;
+
+	count = gf_list_count(meta->item_refs->references);
+	for (i = 0; i < count; i++) {
+		ref = (GF_ItemReferenceTypeBox *)gf_list_get(meta->item_refs->references, i);
+		if (ref->from_item_id == from_id && ref->reference_type == type) {
+			return ref->reference_count;
+		}
+	}
+	return 0;
+}
+
+GF_EXPORT
+u32 gf_isom_meta_get_item_ref_id(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 from_id, u32 type, u32 ref_idx)
+{
+	u32 i, count;
+	GF_ItemReferenceTypeBox *ref;
+	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
+	if (!meta || !type || !from_id || !ref_idx) return 0;
+	if (!meta->item_refs) return 0;
+
+	count = gf_list_count(meta->item_refs->references);
+	for (i = 0; i < count; i++) {
+		ref = (GF_ItemReferenceTypeBox *)gf_list_get(meta->item_refs->references, i);
+		if (ref->from_item_id == from_id && ref->reference_type == type) {
+			if (ref_idx>ref->reference_count) return 0;
+			return ref->to_item_IDs[ref_idx-1];
+		}
+	}
+	return 0;
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-1.0.1.tar.gz/src/isomedia/movie_fragments.c -> gpac-2.0.0.tar.gz/src/isomedia/movie_fragments.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -56,14 +56,22 @@
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err gf_isom_set_movie_duration(GF_ISOFile *movie, u64 duration)
+GF_Err gf_isom_set_movie_duration(GF_ISOFile *movie, u64 duration, Bool remove_mehd)
 {
-	if (!movie->moov->mvex) return GF_BAD_PARAM;
-	if (!movie->moov->mvex->mehd) {
-		movie->moov->mvex->mehd = (GF_MovieExtendsHeaderBox *) gf_isom_box_new_parent(&movie->moov->mvex->child_boxes, GF_ISOM_BOX_TYPE_MEHD);
-		if (!movie->moov->mvex->mehd) return GF_OUT_OF_MEM;
+	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
+
+	if (remove_mehd) {
+		if (!movie->moov->mvex->mehd) {
+			gf_isom_box_del_parent(&movie->moov->mvex->child_boxes, (GF_Box*)movie->moov->mvex->mehd);
+			movie->moov->mvex->mehd = NULL;
+		}
+	} else {
+		if (!movie->moov->mvex->mehd) {
+			movie->moov->mvex->mehd = (GF_MovieExtendsHeaderBox *) gf_isom_box_new_parent(&movie->moov->mvex->child_boxes, GF_ISOM_BOX_TYPE_MEHD);
+			if (!movie->moov->mvex->mehd) return GF_OUT_OF_MEM;
+		}
+		movie->moov->mvex->mehd->fragment_duration = duration;
 	}
-	movie->moov->mvex->mehd->fragment_duration = duration;
 	movie->moov->mvhd->duration = 0;
 	return GF_OK;
 }
@@ -273,7 +281,7 @@
 	if (!movie->moov->mvex) {
 		mvex = (GF_MovieExtendsBox *) gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_MVEX);
 		if (!mvex) return GF_OUT_OF_MEM;
-		moov_on_child_box((GF_Box*)movie->moov, (GF_Box *) mvex);
+		moov_on_child_box((GF_Box*)movie->moov, (GF_Box *) mvex, GF_FALSE);
 	} else {
 		mvex = movie->moov->mvex;
 	}
@@ -287,7 +295,7 @@
 		trex = (GF_TrackExtendsBox *) gf_isom_box_new_parent(&mvex->child_boxes, GF_ISOM_BOX_TYPE_TREX);
 		if (!trex) return GF_OUT_OF_MEM;
 		trex->trackID = TrackID;
-		mvex_on_child_box((GF_Box*)mvex, (GF_Box *) trex);
+		mvex_on_child_box((GF_Box*)mvex, (GF_Box *) trex, GF_FALSE);
 	}
 	trex->track = trak;
 	return gf_isom_change_track_fragment_defaults(movie, TrackID, DefaultSampleDescriptionIndex, DefaultSampleDuration, DefaultSampleSize, DefaultSampleIsSync, DefaultSamplePadding, DefaultDegradationPriority, force_traf_flags);
@@ -343,7 +351,7 @@
 			//create MVEX if needed
 			if (!movie->moov->mvex) {
 				mvex = (GF_MovieExtendsBox *) gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_MVEX);
-				moov_on_child_box((GF_Box*)movie->moov, (GF_Box *) mvex);
+				moov_on_child_box((GF_Box*)movie->moov, (GF_Box *) mvex, GF_FALSE);
 			} else {
 				mvex = movie->moov->mvex;
 			}
@@ -360,7 +368,7 @@
 			trex->track = trak;
 			if (force_traf_flags) trex->cannot_use_default = GF_TRUE;
 			gf_list_add(mvex->child_boxes, trex);
-			mvex_on_child_box((GF_Box*)mvex, (GF_Box *) trex);
+			mvex_on_child_box((GF_Box*)mvex, (GF_Box *) trex, GF_FALSE);
 		}
 	}
 	gf_bs_del(bs);
@@ -429,8 +437,12 @@
 	i=0;
 	while ((trun = (GF_TrackFragmentRunBox *)gf_list_enum(traf->TrackRuns, &i))) {
 		for (j=0; j<trun->nb_samples; j++) {
+			u32 ssize;
 			ent = &trun->samples[j];
-			ret = GetNumUsedValues(traf, ent->size, 2);
+			ssize = ent->size;
+			if (ent->nb_pack>1)
+				ssize /= ent->nb_pack;
+			ret = GetNumUsedValues(traf, ssize, 2);
 			if (ret>MaxNum || (ret==1)) {
 				//at least 2 sizes so we must specify all sizes
 				if (MaxNum) {
@@ -438,7 +450,7 @@
 					goto escape_size;
 				}
 				MaxNum = ret;
-				DefValue = ent->size;
+				DefValue = ssize;
 			}
 		}
 	}
@@ -516,6 +528,22 @@
 			traf->interleave_id = Param;
 		}
 		break;
+	case GF_ISOM_TRAF_TRUNS_FIRST:
+		traf = gf_isom_get_traf(movie, TrackID);
+		if (!traf) return GF_BAD_PARAM;
+		traf->truns_first = Param;
+		break;
+	case GF_ISOM_TRAF_TRUN_V1:
+		traf = gf_isom_get_traf(movie, TrackID);
+		if (!traf) return GF_BAD_PARAM;
+		traf->truns_v1 = Param;
+		break;
+	case GF_ISOM_TRAF_USE_LARGE_TFDT:
+		traf = gf_isom_get_traf(movie, TrackID);
+		if (!traf) return GF_BAD_PARAM;
+		traf->large_tfdt = Param;
+		movie->force_sidx_v1 = Param ? GF_TRUE : GF_FALSE;
+		break;
 	}
 	return GF_OK;
 }
@@ -618,7 +646,8 @@
 				if (j==1 || (trun->nb_samples==1) ) RunFlags = ent->flags;
 
 				if (ssize != RunSize) RunSize = 0;
-				if (ent->Duration != RunDur) RunDur = 0;
+				if (ent->Duration != RunDur)
+					RunDur = 0;
 				if (j && (RunFlags != ent->flags)) NeedFlags = 1;
 			}
 			if (ent->CTS_Offset) UseCTS = 1;
@@ -1155,6 +1184,17 @@
 		gf_bs_write_u64(bs, movie->moof->ntp);
 		gf_bs_write_u64(bs, movie->moof->timestamp);
 	}
+	if (movie->moof->emsgs) {
+		while (1) {
+			GF_Box *emsg = gf_list_pop_front(movie->moof->emsgs);
+			if (!emsg) break;
+			gf_isom_box_size(emsg);
+			gf_isom_box_write(emsg, bs);
+			gf_isom_box_del(emsg);
+		}
+		gf_list_del(movie->moof->emsgs);
+		movie->moof->emsgs = NULL;
+	}
 
 	if (moof_size) *moof_size = (u32) movie->moof->size;
 
@@ -1169,7 +1209,7 @@
 	if (movie->on_block_out)
 		gf_bs_prevent_dispatch(bs, GF_TRUE);
 
-	if (movie->compress_mode>GF_ISO_COMP_MOOV) {
+	if (movie->compress_mode>GF_ISOM_COMP_MOOV) {
 		e = gf_isom_write_compressed_box(movie, (GF_Box *) movie->moof, GF_4CC('!', 'm', 'o', 'f'), bs, moof_size);
 	} else {
 		e = gf_isom_box_write((GF_Box *) movie->moof, bs);
@@ -1329,6 +1369,19 @@
 
 		movie->styp_written = GF_TRUE;
 	}
+
+	if (movie->emsgs) {
+		while (1) {
+			GF_Box *b = gf_list_pop_front(movie->emsgs);
+			if (!b) break;
+			gf_isom_box_size(b);
+			gf_isom_box_write(b, movie->editFileMap->bs);
+			gf_isom_box_del(b);
+		}
+		gf_list_del(movie->emsgs);
+		movie->emsgs = NULL;
+	}
+
 	return GF_OK;
 }
 
@@ -1719,6 +1772,8 @@
 		} else {
 			sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
 			if (!sidx) return GF_OUT_OF_MEM;
+			if (movie->force_sidx_v1)
+				sidx->version = 1;
 		}
 		sidx->reference_ID = referenceTrackID;
 		sidx->timescale = trak->Media->mediaHeader->timeScale;
@@ -2184,7 +2239,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_flush_sidx(GF_ISOFile *movie, u32 sidx_max_size, Bool exact_range)
+GF_Err gf_isom_flush_sidx(GF_ISOFile *movie, u32 sidx_max_size, Bool force_v1)
 {
 	GF_BitStream *bs;
 	GF_Err e;
@@ -2202,7 +2257,7 @@
 	
 	assert(movie->root_sidx_index == movie->root_sidx->nb_refs);
 
-	if (exact_range)
+	if (force_v1)
 		movie->root_sidx->version = 1;
 		
 	e = gf_isom_box_size((GF_Box*)movie->root_sidx);
@@ -2251,7 +2306,7 @@
 		if (movie->root_ssix) {
 			gf_isom_box_size((GF_Box *) movie->root_ssix);
 
-			if (movie->compress_mode>=GF_ISO_COMP_MOOF_SSIX) {
+			if (movie->compress_mode>=GF_ISOM_COMP_MOOF_SSIX) {
 				u32 ssix_comp_size;
 				//compute ssix compressed size by using NULL destination bitstream
 				//not really optimum since we compress twice the ssix, to optimize ...
@@ -2262,7 +2317,7 @@
 			}
 		}
 		if (!e) {
-			if (movie->compress_mode>=GF_ISO_COMP_MOOF_SIDX) {
+			if (movie->compress_mode>=GF_ISOM_COMP_MOOF_SIDX) {
 				e = gf_isom_write_compressed_box(movie, (GF_Box *) movie->root_sidx, GF_4CC('!', 's', 'i', 'x'), bs, NULL);
 			} else {
 				e = gf_isom_box_write((GF_Box *) movie->root_sidx, bs);
@@ -2270,7 +2325,7 @@
 		}
 
 		if (!e && movie->root_ssix) {
-			if (movie->compress_mode>=GF_ISO_COMP_MOOF_SSIX) {
+			if (movie->compress_mode>=GF_ISOM_COMP_MOOF_SSIX) {
 				e = gf_isom_write_compressed_box(movie, (GF_Box *) movie->root_ssix, GF_4CC('!', 's', 's', 'x'), bs, NULL);
 			} else {
 				e = gf_isom_box_write((GF_Box *) movie->root_ssix, bs);
@@ -2488,6 +2543,15 @@
 			gf_list_add(movie->TopBoxes, movie->brand);
 			continue;
 		}
+		if (a->type==GF_ISOM_BOX_TYPE_OTYP) {
+			if (movie->otyp) {
+				gf_list_del_item(movie->TopBoxes, movie->otyp);
+				gf_isom_box_del(movie->otyp);
+			}
+			movie->otyp = (GF_Box *) a;
+			gf_list_add(movie->TopBoxes, movie->otyp);
+			continue;
+		}
 		if (a->type==GF_ISOM_BOX_TYPE_MOOF) {
 			u32 i, count, j, nb_trex;
 			s32 idx;
@@ -2609,6 +2673,9 @@
 		traf_2->IFrameSwitching = traf->IFrameSwitching;
 		traf_2->use_sample_interleave = traf->use_sample_interleave;
 		traf_2->interleave_id = traf->interleave_id;
+		traf_2->truns_first = traf->truns_first;
+		traf_2->truns_v1 = traf->truns_v1;
+		traf_2->large_tfdt = traf->large_tfdt;
 		traf_2->DataCache = traf->DataCache;
 		traf_2->tfhd->sample_desc_index = DescIndex;
 
@@ -2660,6 +2727,8 @@
 		trun->ctso_multiplier = traf->trex->def_sample_duration;
 #endif
 		trun->interleave_id = traf->interleave_id;
+		if (traf->truns_v1)
+			trun->version = 1;
 
 		//if we use data caching, create a bitstream
 		if (traf->DataCache)
@@ -2684,8 +2753,9 @@
 	}
 
 	if (prev_ent && prev_ent->dts && sample->DTS) {
-		if (prev_ent->Duration != sample->DTS - prev_ent->dts)
-			prev_ent->Duration = (u32) (sample->DTS - prev_ent->dts);
+		u32 nsamp = prev_ent->nb_pack ? prev_ent->nb_pack : 1;
+		if (nsamp*prev_ent->Duration != sample->DTS - prev_ent->dts)
+			prev_ent->Duration = (u32) (sample->DTS - prev_ent->dts) / nsamp;
 	}
 	if (trun->nb_samples >= trun->sample_alloc) {
 		trun->sample_alloc += 50;
@@ -2740,11 +2810,10 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_fragment_set_cenc_sai(GF_ISOFile *output, GF_ISOTrackID TrackID, u32 IV_size, u8 *sai_b, u32 sai_b_size, Bool use_subsamples, Bool use_saio_32bit)
+GF_Err gf_isom_fragment_set_cenc_sai(GF_ISOFile *output, GF_ISOTrackID TrackID, u8 *sai_b, u32 sai_b_size, Bool use_subsamples, Bool use_saio_32bit, Bool use_multikey)
 {
 	GF_CENCSampleAuxInfo *sai;
 	GF_TrackFragmentBox *traf = gf_isom_get_traf(output, TrackID);
-	u32 i;
 	GF_SampleEncryptionBox *senc;
 
 	if (!traf) return GF_BAD_PARAM;
@@ -2769,77 +2838,33 @@
 	}
 	senc = (GF_SampleEncryptionBox *) traf->sample_encryption;
 
-	if (!IV_size && !sai_b_size && !sai_b) {
-		gf_isom_cenc_set_saiz_saio(senc, NULL, traf, 0, use_saio_32bit);
+	if (!sai_b_size && !sai_b) {
+		gf_isom_cenc_set_saiz_saio(senc, NULL, traf, 0, use_saio_32bit, use_multikey);
 		return GF_OK;
 	}
 
 	GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
 	if (!sai) return GF_OUT_OF_MEM;
-	sai->IV_size = IV_size;
+
 	if (sai_b && sai_b_size) {
-		GF_BitStream *bs;
-		if (sai_b_size < IV_size) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isofile] corrupted SAI info size %d but IV size %d\n", sai_b_size, IV_size ));
+		sai->cenc_data_size = sai_b_size;
+		sai->cenc_data = gf_malloc(sizeof(u8) * sai_b_size);
+		if (!sai->cenc_data) {
 			gf_free(sai);
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		bs = gf_bs_new(sai_b, sai_b_size, GF_BITSTREAM_READ);
-		gf_bs_read_data(bs, sai->IV, IV_size);
-		if (use_subsamples) {
-			sai->subsample_count = gf_bs_read_u16(bs);
-			if (sai_b_size < IV_size + 2 + sai->subsample_count*6) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isofile] corrupted SAI info size %d but IV size %d subsamples %d (6 bytes each)\n", sai_b_size, IV_size, sai->subsample_count));
-				gf_bs_del(bs);
-				gf_free(sai);
-				return GF_NON_COMPLIANT_BITSTREAM;
-			}
-
-			sai->subsamples = gf_malloc(sizeof(GF_CENCSubSampleEntry)*sai->subsample_count);
-			if (!sai->subsamples) {
-				gf_free(sai);
-				return GF_OUT_OF_MEM;
-			}
-			for (i=0; i<sai->subsample_count; i++) {
-				sai->subsamples[i].bytes_clear_data = gf_bs_read_u16(bs);
-				sai->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(bs);
-			}
-		}
-		gf_bs_del(bs);
-	} else if (sai_b_size) {
-		u32 olen = sai_b_size;
-		if (use_subsamples) {
-			sai->subsample_count = 1;
-			/*if (sai->subsample_count) */ senc->flags = 0x00000002;
-			while (olen>0xFFFF) {
-				olen -= 0xFFFF;
-				sai->subsample_count ++;
-			}
-			sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
-			olen = sai_b_size;
-			for (i = 0; i < sai->subsample_count; i++) {
-				if (olen<0xFFFF) {
-					sai->subsamples[i].bytes_clear_data = olen;
-				} else {
-					sai->subsamples[i].bytes_clear_data = 0xFFFF;
-					olen -= 0xFFFF;
-				}
-				sai->subsamples[i].bytes_encrypted_data = 0;
-			}
+			return GF_OUT_OF_MEM;
 		}
+		memcpy(sai->cenc_data, sai_b, sai_b_size);
+	} else {
+		sai->isNotProtected = 1;
 	}
 
 	gf_list_add(senc->samp_aux_info, sai);
-	if (sai->subsample_count) senc->flags = 0x00000002;
+	if (use_subsamples)
+		senc->flags = 0x00000002;
+	if (use_multikey)
+		senc->version = 1;
 
-	//no subsample (not NAL-based data), saiz is IV size only
-	if (! sai->subsample_count) {
-		gf_isom_cenc_set_saiz_saio(senc, NULL, traf, IV_size, use_saio_32bit);
-	}
-	// subsamples ( NAL-based data), saiz is IV size + nb subsamples (2 bytes) + 6 bytes per subsample
-	else {
-		gf_isom_cenc_set_saiz_saio(senc, NULL, traf, IV_size + 2+6*sai->subsample_count, use_saio_32bit);
-	}
+	gf_isom_cenc_set_saiz_saio(senc, NULL, traf, sai->cenc_data_size, use_saio_32bit, use_multikey);
 	return GF_OK;
 }
 
@@ -2977,7 +3002,7 @@
 		}
 	}
 
-	return gf_isom_add_sample_group_entry(traf->sampleGroups, 0, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex);
+	return gf_isom_add_sample_group_entry(traf->sampleGroups, 0, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex, NULL);
 }
 /*copy over the subsample and sampleToGroup information of the given sample from the source track/file to the last sample added to the current track fragment of the destination file*/
 GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, GF_ISOTrackID TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber, Bool sgpd_in_traf)
@@ -3201,6 +3226,8 @@
 		if (!traf->tfdt) return GF_OUT_OF_MEM;
 	}
 	traf->tfdt->baseMediaDecodeTime = decode_time;
+	if (traf->large_tfdt)
+		traf->tfdt->version = 1;
 	return GF_OK;
 }
 
@@ -3232,4 +3259,25 @@
 	return 0;
 }
 
+GF_Err gf_isom_set_emsg(GF_ISOFile *movie, u8 *data, u32 size)
+{
+	if (!movie || !data) return GF_BAD_PARAM;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (!movie->moof) return GF_BAD_PARAM;
+
+	GF_BitStream *bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs)) {
+		GF_Box *emsg;
+		GF_Err e = gf_isom_box_parse(&emsg, bs);
+		if (e) break;
+
+		if (!movie->moof->emsgs) movie->moof->emsgs = gf_list_new();
+		gf_list_add(movie->moof->emsgs, emsg);
+	}
+	gf_bs_del(bs);
+#endif
+	return GF_OK;
+}
+
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-1.0.1.tar.gz/src/isomedia/sample_descs.c -> gpac-2.0.0.tar.gz/src/isomedia/sample_descs.c Changed

gpac-1.0.1.tar.gz/src/isomedia/stbl_read.c -> gpac-2.0.0.tar.gz/src/isomedia/stbl_read.c Changed

gpac-1.0.1.tar.gz/src/isomedia/stbl_write.c -> gpac-2.0.0.tar.gz/src/isomedia/stbl_write.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -37,11 +37,20 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
+
+#define CHECK_PACK(_e) \
+	if (!nb_pack) nb_pack = 1; \
+	else if ((s32) nb_pack < 0) { \
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Too many samples %u in packed sample\n", nb_pack)); \
+		return _e; \
+	}
+
+
 //adds a DTS in the table and get the sample number of this new sample
 //we could return an error if a sample with the same DTS already exists
 //but this is not true for QT or MJ2K, only for MP4...
 //we assume the authoring tool tries to create a compliant MP4 file.
-GF_Err stbl_AddDTS(GF_SampleTableBox *stbl, u64 DTS, u32 *sampleNumber, u32 LastAUDefDuration, u32 nb_packed_samples)
+GF_Err stbl_AddDTS(GF_SampleTableBox *stbl, u64 DTS, u32 *sampleNumber, u32 LastAUDefDuration, u32 nb_pack)
 {
 	u32 i, j, sampNum;
 	u64 *DTSs, curDTS;
@@ -54,8 +63,9 @@
 	stts->r_FirstSampleInEntry = 0;
 
 	*sampleNumber = 0;
-	if (!nb_packed_samples)
-		nb_packed_samples=1;
+
+	CHECK_PACK(GF_BAD_PARAM)
+
 
 	//if we don't have an entry, that's the first one...
 	if (!stts->nb_entries) {
@@ -65,25 +75,30 @@
 		stts->nb_entries = 1;
 		stts->entries = gf_malloc(sizeof(GF_SttsEntry));
 		if (!stts->entries) return GF_OUT_OF_MEM;
-		stts->entries[0].sampleCount = nb_packed_samples;
-		stts->entries[0].sampleDelta = (nb_packed_samples>1) ? 0 : LastAUDefDuration;
+		stts->entries[0].sampleCount = nb_pack;
+		stts->entries[0].sampleDelta = (nb_pack>1) ? 0 : LastAUDefDuration;
 		(*sampleNumber) = 1;
-		stts->w_currentSampleNum = nb_packed_samples;
+		stts->w_currentSampleNum = nb_pack;
 		return GF_OK;
 	}
 	//check the last DTS - we allow 0-duration samples (same DTS)
 	if (DTS >= stts->w_LastDTS) {
+		u32 nb_extra = 0;
 		ent = &stts->entries[stts->nb_entries-1];
 		if (!ent->sampleDelta && (ent->sampleCount>1)) {
 			ent->sampleDelta = (u32) ( DTS / ent->sampleCount);
 			stts->w_LastDTS = DTS - ent->sampleDelta;
 		}
 		//OK, we're adding at the end
-		if (DTS == stts->w_LastDTS + ent->sampleDelta) {
+		if ((DTS == stts->w_LastDTS + ent->sampleDelta)
+			//for raw audio, consider (dts==last_dts) and (dts==last_dts+2*delta) as sample append to cope with
+			//timescale vs samplerate precision
+			|| ((nb_pack>1) && ((DTS == stts->w_LastDTS) || (DTS == stts->w_LastDTS + 2*ent->sampleDelta) ))
+		) {
 			(*sampleNumber) = stts->w_currentSampleNum + 1;
-			ent->sampleCount += nb_packed_samples;
-			stts->w_currentSampleNum += nb_packed_samples;
-			stts->w_LastDTS = DTS + ent->sampleDelta * (nb_packed_samples-1);
+			ent->sampleCount += nb_pack;
+			stts->w_currentSampleNum += nb_pack;
+			stts->w_LastDTS = DTS + ent->sampleDelta * (nb_pack-1);
 			return GF_OK;
 		}
 		//we need to split the entry
@@ -112,20 +127,43 @@
 		}
 		//we definitely need to split the entry ;)
 		ent->sampleCount --;
-		if (stts->alloc_size==stts->nb_entries) {
+
+		if (nb_pack>1)
+			nb_extra = 1;
+
+		if (stts->alloc_size <= stts->nb_entries + nb_extra) {
 			ALLOC_INC(stts->alloc_size);
 			stts->entries = gf_realloc(stts->entries, sizeof(GF_SttsEntry)*stts->alloc_size);
 			if (!stts->entries) return GF_OUT_OF_MEM;
 			memset(&stts->entries[stts->nb_entries], 0, sizeof(GF_SttsEntry)*(stts->alloc_size-stts->nb_entries) );
 		}
+
+		if (nb_extra)
+			nb_extra = stts->entries[stts->nb_entries-1].sampleDelta;
+
 		ent = &stts->entries[stts->nb_entries];
 		stts->nb_entries++;
 
-		ent->sampleCount = 2;
+		if (nb_pack==1) {
+			ent->sampleCount = 2;
+			ent->sampleDelta = (u32) (DTS - stts->w_LastDTS);
+			stts->w_LastDTS = DTS;
+			(*sampleNumber) = stts->w_currentSampleNum+1;
+			stts->w_currentSampleNum += 1;
+			return GF_OK;
+		}
+
+		ent->sampleCount = 1;
 		ent->sampleDelta = (u32) (DTS - stts->w_LastDTS);
+
+		ent = &stts->entries[stts->nb_entries];
+		stts->nb_entries++;
+
+		ent->sampleCount = nb_pack;
+		ent->sampleDelta = nb_extra;
 		stts->w_LastDTS = DTS;
-		stts->w_currentSampleNum ++;
-		(*sampleNumber) = stts->w_currentSampleNum;
+		(*sampleNumber) = stts->w_currentSampleNum + 1;
+		stts->w_currentSampleNum += nb_pack;
 		return GF_OK;
 	}
 
@@ -233,16 +271,27 @@
 		ctts->nb_entries++;
 		ctts->w_LastSampleNumber++;
 		if (offset<0) ctts->version=1;
+		if (ABS(offset) >= ctts->max_cts_delta) {
+			ctts->max_cts_delta = ABS(offset);
+			ctts->sample_num_max_cts_delta = ctts->w_LastSampleNumber;
+		}
 		return GF_OK;
 	}
 	//check if we're working in order...
 	if (ctts->w_LastSampleNumber < sampleNumber) {
+		GF_Err e;
 		//add some 0 till we get to the sample
 		while (ctts->w_LastSampleNumber + 1 != sampleNumber) {
-			GF_Err e = AddCompositionOffset(ctts, 0);
+			e = AddCompositionOffset(ctts, 0);
 			if (e) return e;
 		}
-		return AddCompositionOffset(ctts, offset);
+		e = AddCompositionOffset(ctts, offset);
+		if (e) return e;
+		if (ABS(offset) >= ctts->max_cts_delta) {
+			ctts->max_cts_delta = ABS(offset);
+			ctts->sample_num_max_cts_delta = ctts->w_LastSampleNumber;
+		}
+		return GF_OK;
 	}
 
 	//NOPE we are inserting a sample...
@@ -259,6 +308,10 @@
 			if (sampNum+1==sampleNumber) {
 				CTSs[sampNum] = offset;
 				sampNum ++;
+				if (ABS(offset) >= ctts->max_cts_delta) {
+					ctts->max_cts_delta = ABS(offset);
+					ctts->sample_num_max_cts_delta = sampNum;
+				}
 			}
 			CTSs[sampNum] = ctts->entries[i].decodingOffset;
 			sampNum ++;
@@ -365,7 +418,7 @@
 }
 
 //add size
-GF_Err stbl_AddSize(GF_SampleSizeBox *stsz, u32 sampleNumber, u32 size, u32 nb_pack_samples)
+GF_Err stbl_AddSize(GF_SampleSizeBox *stsz, u32 sampleNumber, u32 size, u32 nb_pack)
 {
 	u32 i, k;
 	u32 *newSizes;
@@ -373,24 +426,26 @@
 
 	if (sampleNumber > stsz->sampleCount + 1) return GF_BAD_PARAM;
 
-	if (!nb_pack_samples) nb_pack_samples = 1;
-	else if (nb_pack_samples>1)
-		size /= nb_pack_samples;
+	CHECK_PACK(GF_BAD_PARAM)
+
+	if (nb_pack>1)
+		size /= nb_pack;
+
 
 	//all samples have the same size
 	if (stsz->sizes == NULL) {
 		//1 first sample added in NON COMPACT MODE
-		if (! stsz->sampleCount && (stsz->type != GF_ISOM_BOX_TYPE_STZ2) ) {
-			stsz->sampleCount = nb_pack_samples;
+		if (! stsz->sampleCount && (stsz->type != GF_ISOM_BOX_TYPE_STZ2) && size) {
+			stsz->sampleCount = nb_pack;
 			stsz->sampleSize = size;
 			return GF_OK;
 		}
 		//2- sample has the same size
-		if (stsz->sampleSize == size) {
-			stsz->sampleCount += nb_pack_samples;
+		if ((stsz->sampleSize == size) && size) {
+			stsz->sampleCount += nb_pack;
 			return GF_OK;
 		}
-		if (nb_pack_samples>1) {
+		if (nb_pack>1) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Inserting packed samples with different sizes is not yet supported\n" ));
 			return GF_NOT_SUPPORTED;
 		}
@@ -670,7 +725,7 @@
 }
 
 //used in edit/write, where sampleNumber == chunkNumber
-GF_Err stbl_AddChunkOffset(GF_MediaBox *mdia, u32 sampleNumber, u32 StreamDescIndex, u64 offset, u32 nb_pack_samples)
+GF_Err stbl_AddChunkOffset(GF_MediaBox *mdia, u32 sampleNumber, u32 StreamDescIndex, u64 offset, u32 nb_pack)
 {
 	GF_SampleTableBox *stbl;
 	GF_ChunkOffsetBox *stco;
@@ -685,8 +740,7 @@
 	stsc = stbl->SampleToChunk;
 
 //	if (stsc->w_lastSampleNumber + 1 < sampleNumber ) return GF_BAD_PARAM;
-	if (!nb_pack_samples)
-		nb_pack_samples = 1;
+	CHECK_PACK(GF_BAD_PARAM)
 
 	if (!stsc->nb_entries || (stsc->nb_entries + 2 >= stsc->alloc_size)) {
 		if (!stsc->alloc_size) stsc->alloc_size = 1;
@@ -702,7 +756,7 @@
 		if (stsc->nb_entries) stsc->entries[stsc->nb_entries-1].nextChunk = stsc->w_lastChunkNumber;
 
 		new_chunk_idx = stsc->w_lastChunkNumber;
-		stsc->w_lastSampleNumber = sampleNumber + nb_pack_samples-1;
+		stsc->w_lastSampleNumber = sampleNumber + nb_pack-1;
 		stsc->nb_entries += 1;
 	} else {
 		u32 cur_samp = 1;
@@ -757,11 +811,11 @@
 	}
 	ent->isEdited = (Media_IsSelfContained(mdia, StreamDescIndex)) ? 1 : 0;
 	ent->sampleDescriptionIndex = StreamDescIndex;
-	ent->samplesPerChunk = nb_pack_samples;
+	ent->samplesPerChunk = nb_pack;
 	ent->nextChunk = ent->firstChunk+1;
 
 	//OK, now if we've inserted a chunk, update the sample to chunk info...
-	if (sampleNumber + nb_pack_samples - 1 == stsc->w_lastSampleNumber) {
+	if (sampleNumber + nb_pack - 1 == stsc->w_lastSampleNumber) {
 		if (stsc->nb_entries)
 			stsc->entries[stsc->nb_entries-1].nextChunk = ent->firstChunk;
 
@@ -1032,8 +1086,6 @@
 //always called before removing the sample from SampleSize
 GF_Err stbl_RemoveDTS(GF_SampleTableBox *stbl, u32 sampleNumber, u32 nb_samples, u32 LastAUDefDuration)
 {
-	u64 *DTSs, curDTS;
-	u32 i, j, k, sampNum;
 	GF_SttsEntry *ent;
 	GF_TimeToSampleBox *stts;
 
@@ -1054,6 +1106,8 @@
 		ent->sampleCount--;
 		if (!ent->sampleCount) stts->nb_entries--;
 	} else {
+		u64 *DTSs, curDTS;
+		u32 i, j, k, sampNum;
 		u32 tot_samples, nb_written=0;
 		//unpack the DTSs...
 		DTSs = (u64*)gf_malloc(sizeof(u64) * (stbl->SampleSize->sampleCount - 1));
@@ -1088,20 +1142,25 @@
 			assert(nb_written + nb_samples == stbl->SampleSize->sampleCount);
 		}
 		j=0;
-		stts->nb_entries = 1;
-		stts->entries[0].sampleCount = 1;
-		if (stbl->SampleSize->sampleCount == 2) {
-			stts->entries[0].sampleDelta = LastAUDefDuration;
-		} else {
-			stts->entries[0].sampleDelta = (u32) DTSs[1] /*- DTSs[0]*/;
-		}
-		sampNum = 1;
 
 		if (nb_samples==1) {
 			tot_samples = stbl->SampleSize->sampleCount - 1;
 		} else {
 			tot_samples = stbl->SampleSize->sampleCount - nb_samples;
 		}
+		if (tot_samples) {
+			sampNum = 1;
+			stts->nb_entries = 1;
+			stts->entries[0].sampleCount = 1;
+			if (stbl->SampleSize->sampleCount == 2) {
+				stts->entries[0].sampleDelta = LastAUDefDuration;
+			} else {
+				stts->entries[0].sampleDelta = (u32) DTSs[1] /*- DTSs[0]*/;
+			}
+		} else {
+			sampNum = 0;
+			stts->nb_entries = 0;
+		}
 
 		for (i=1; i<tot_samples; i++) {
 			if (i+1 == tot_samples) {
@@ -1121,10 +1180,11 @@
 				j++;
 				stts->entries[j].sampleCount = 1;
 				stts->entries[j].sampleDelta = (u32) (DTSs[i+1] - DTSs[i]);
+				assert(stts->entries[j].sampleDelta);
 				sampNum ++;
 			}
 		}
-		stts->w_LastDTS = DTSs[tot_samples - 1];
+		stts->w_LastDTS = tot_samples ? DTSs[tot_samples - 1] : 0;
 		gf_free(DTSs);
 		assert(sampNum == tot_samples);
 		assert(sampNum + nb_samples == stbl->SampleSize->sampleCount);
@@ -1147,6 +1207,7 @@
 
 	assert(ctts->unpack_mode);
 	if ((nb_samples>1) && (sampleNumber>1)) return GF_BAD_PARAM;
+	ctts->max_cts_delta = 0;
 
 	//last one...
 	if (stbl->SampleSize->sampleCount == 1) {
@@ -1562,7 +1623,8 @@
 {
 	GF_TimeToSampleBox *stts = stbl->TimeToSample;
 
-	if (!nb_pack) nb_pack = 1;
+	CHECK_PACK(GF_ISOM_INVALID_FILE)
+
 	if (stts->nb_entries) {
 		if (stts->entries[stts->nb_entries-1].sampleDelta == duration) {
 			stts->entries[stts->nb_entries-1].sampleCount += nb_pack;
@@ -1585,9 +1647,9 @@
 GF_Err stbl_AppendSize(GF_SampleTableBox *stbl, u32 size, u32 nb_pack)
 {
 	u32 i;
-	if (!nb_pack) nb_pack = 1;
+	CHECK_PACK(GF_ISOM_INVALID_FILE)
 
-	if (!stbl->SampleSize->sampleCount) {
+	if (!stbl->SampleSize->sampleCount && size) {
 		stbl->SampleSize->sampleSize = size;
 		stbl->SampleSize->sampleCount += nb_pack;
 		return GF_OK;
@@ -1596,22 +1658,23 @@
 		stbl->SampleSize->sampleCount += nb_pack;
 		return GF_OK;
 	}
+
 	if (!stbl->SampleSize->sizes || (stbl->SampleSize->sampleCount+nb_pack > stbl->SampleSize->alloc_size)) {
-		Bool init_table = (stbl->SampleSize->sizes==NULL) ? 1 : 0;
 		ALLOC_INC(stbl->SampleSize->alloc_size);
-		if (stbl->SampleSize->sampleCount+nb_pack > stbl->SampleSize->alloc_size)
+		if (stbl->SampleSize->sampleCount+nb_pack > stbl->SampleSize->alloc_size) {
 			stbl->SampleSize->alloc_size = stbl->SampleSize->sampleCount+nb_pack;
+		}
 
 		stbl->SampleSize->sizes = (u32 *)gf_realloc(stbl->SampleSize->sizes, sizeof(u32)*stbl->SampleSize->alloc_size);
 		if (!stbl->SampleSize->sizes) return GF_OUT_OF_MEM;
 		memset(&stbl->SampleSize->sizes[stbl->SampleSize->sampleCount], 0, sizeof(u32) * (stbl->SampleSize->alloc_size - stbl->SampleSize->sampleCount) );
-
-		if (init_table) {
-			for (i=0; i<stbl->SampleSize->sampleCount; i++)
-				stbl->SampleSize->sizes[i] = stbl->SampleSize->sampleSize;
-		}
 	}
-	stbl->SampleSize->sampleSize = 0;
+	//copy over sample size
+	if (stbl->SampleSize->sampleSize) {
+		for (i=0; i<stbl->SampleSize->sampleCount; i++)
+			stbl->SampleSize->sizes[i] = stbl->SampleSize->sampleSize;
+		stbl->SampleSize->sampleSize = 0;
+	}
 	for (i=0; i<nb_pack; i++) {
 		stbl->SampleSize->sizes[stbl->SampleSize->sampleCount+i] = size;
 	}
@@ -1695,10 +1758,11 @@
 	}
 	//ok we need a new entry - this assumes this function is called AFTER AppendChunk
 	ent = &stsc->entries[stsc->nb_entries];
+	memset(ent, 0, sizeof(GF_StscEntry));
 	ent->firstChunk = nextChunk;
 	ent->sampleDescriptionIndex = DescIndex;
 	ent->samplesPerChunk = samplesInChunk;
-	ent->isEdited = 0;
+
 	stsc->nb_entries++;
 	return GF_OK;
 }
@@ -1741,7 +1805,7 @@
 	return GF_OK;
 }
 
-GF_Err stbl_AppendTrafMap(GF_SampleTableBox *stbl, Bool is_seg_start, u64 seg_start_offset, u64 frag_start_offset, u8 *moof_template, u32 moof_template_size, u64 sidx_start, u64 sidx_end)
+GF_Err stbl_AppendTrafMap(GF_SampleTableBox *stbl, Bool is_seg_start, u64 seg_start_offset, u64 frag_start_offset, u8 *moof_template, u32 moof_template_size, u64 sidx_start, u64 sidx_end, u32 nb_pack_samples)
 {
 	GF_TrafToSampleMap *tmap;
 	GF_TrafMapEntry *tmap_ent;
@@ -1771,6 +1835,9 @@
 
 	memset(tmap_ent, 0, sizeof(GF_TrafMapEntry));
 	tmap_ent->sample_num = stbl->SampleSize->sampleCount;
+	if (nb_pack_samples)
+		tmap_ent->sample_num -= tmap_ent->sample_num-1;
+
 	tmap_ent->moof_template = moof_template;
 	tmap_ent->moof_template_size = moof_template_size;
 	tmap_ent->moof_start = frag_start_offset;
@@ -1821,7 +1888,10 @@
 	ctts->nb_entries++;
 	if (offset<0) ctts->version=1;
 
-	if (ABS(offset) > ctts->max_ts_delta) ctts->max_ts_delta = ABS(offset);
+	if (ABS(offset) >= ctts->max_cts_delta) {
+		ctts->max_cts_delta = ABS(offset);
+		ctts->sample_num_max_cts_delta = ctts->w_LastSampleNumber;
+	}
 
 	return GF_OK;
 }
@@ -1986,6 +2056,7 @@
 		stco = (GF_ChunkOffsetBox *) *old_stco;
 		//if dataOffset is bigger than 0xFFFFFFFF, move to LARGE offset
 		if (offset > 0xFFFFFFFF) {
+			s32 prev_pos = gf_list_find(stbl->child_boxes, *old_stco);
 			co64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
 			if (!co64) return GF_OUT_OF_MEM;
 			co64->nb_entries = stco->nb_entries + 1;
@@ -2004,7 +2075,9 @@
 			*old_stco = (GF_Box *)co64;
 
 			assert (stbl->child_boxes);
-			gf_list_add(stbl->child_boxes, *old_stco);
+			//register new box only if old one was registered
+			if (prev_pos>=0)
+				gf_list_insert(stbl->child_boxes, *old_stco, prev_pos);
 			return GF_OK;
 		}
 		//OK, stick with regular...
@@ -2062,7 +2135,7 @@
 		//3 - make sure we do not exceed the MaxSamplesPerChunk and we have the same descIndex
 		if (StreamDescIndex != cur_ent->sampleDescriptionIndex)
 			newChunk = 1;
-		if (stbl->MaxSamplePerChunk && cur_ent->samplesPerChunk == stbl->MaxSamplePerChunk)
+		if (stbl->MaxSamplePerChunk && cur_ent->samplesPerChunk >= stbl->MaxSamplePerChunk)
 			newChunk = 1;
 	}

gpac-1.0.1.tar.gz/src/isomedia/track.c -> gpac-2.0.0.tar.gz/src/isomedia/track.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -387,7 +387,7 @@
 	if (e) return e;
 
 	//assert the timeScales are non-NULL
-	if (!trak->moov->mvhd->timeScale || !trak->Media->mediaHeader->timeScale) return GF_ISOM_INVALID_FILE;
+	if (!trak->moov->mvhd || !trak->moov->mvhd->timeScale || !trak->Media->mediaHeader->timeScale) return GF_ISOM_INVALID_FILE;
 	trackDuration = (trak->Media->mediaHeader->duration * trak->moov->mvhd->timeScale) / trak->Media->mediaHeader->timeScale;
 
 	//if we have an edit list, the duration is the sum of all the editList
@@ -404,6 +404,9 @@
 	if (!trackDuration) {
 		trackDuration = (trak->Media->mediaHeader->duration * trak->moov->mvhd->timeScale) / trak->Media->mediaHeader->timeScale;
 	}
+	if (!trak->Header) {
+		return GF_OK;
+	}
 	trak->Header->duration = trackDuration;
 	if (!trak->moov->mov->keep_utc && !gf_sys_is_test_mode() )
 		trak->Header->modificationTime = gf_isom_get_mp4time();
@@ -439,12 +442,12 @@
 #endif
 
 
-GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_MovieFragmentBox *moof_box, u64 moof_offset, s32 compressed_diff, u64 *cumulated_offset, Bool is_first_merge)
+GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_MovieFragmentBox *moof_box, u64 moof_offset, s32 compressed_diff, u64 *cumulated_offset)
 {
 	u32 i, j, chunk_size, track_num;
-	u64 base_offset, data_offset, traf_duration;
+	u64 base_offset, data_offset, traf_duration, tfdt;
 	u32 def_duration, DescIndex, def_size, def_flags;
-	u32 duration, size, flags, prev_trun_data_offset, sample_index;
+	u32 duration, size, flags, prev_trun_data_offset, sample_index, num_first_sample_in_traf;
 	u8 pad, sync;
 	u16 degr;
 	Bool first_samp_in_traf=GF_TRUE;
@@ -452,12 +455,13 @@
 	u8 *moof_template=NULL;
 	u32 moof_template_size=0;
 	Bool is_seg_start = GF_FALSE;
-	u64 seg_start=0, sidx_start=0, sidx_end=0, frag_start=0;
+	u64 seg_start=0, sidx_start=0, sidx_end=0, frag_start=0, last_dts=0;
 	GF_TrackFragmentRunBox *trun;
 	GF_TrunEntry *ent;
 #ifdef GF_ENABLE_CTRN
 	GF_TrackFragmentBox *traf_ref = NULL;
 #endif
+	Bool is_first_merge = !trak->first_traf_merged;
 
 	GF_Err stbl_AppendTime(GF_SampleTableBox *stbl, u32 duration, u32 nb_pack);
 	GF_Err stbl_AppendSize(GF_SampleTableBox *stbl, u32 size, u32 nb_pack);
@@ -522,19 +526,47 @@
 	data_offset = 0;
 	traf_duration = 0;
 
-	/*in playback mode*/
-	if (traf->tfdt && is_first_merge) {
-#ifndef GPAC_DISABLE_LOG
-		if (trak->moov->mov->NextMoofNumber && trak->present_in_scalable_segment && trak->sample_count_at_seg_start && (trak->dts_at_seg_start != traf->tfdt->baseMediaDecodeTime)) {
-			s32 drift = (s32) ((s64) traf->tfdt->baseMediaDecodeTime - (s64)trak->dts_at_seg_start);
-			if (drift<0) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Warning: TFDT timing "LLD" less than cumulated timing "LLD" - using tfdt\n", traf->tfdt->baseMediaDecodeTime, trak->dts_at_seg_start ));
-			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[iso file] TFDT timing "LLD" higher than cumulated timing "LLD" (last sample got extended in duration)\n", traf->tfdt->baseMediaDecodeTime, trak->dts_at_seg_start ));
+	num_first_sample_in_traf = trak->Media->information->sampleTable->SampleSize->sampleCount;
+
+	if (traf->tfdt)
+		tfdt = traf->tfdt->baseMediaDecodeTime;
+	else if (traf->tfxd)
+		tfdt = traf->tfxd->absolute_time_in_track_timescale;
+	else
+		tfdt = 0;
+
+	if (tfdt) {
+		//do this test for each fragment merged as soon as we have a tfdt, so that we detect samples with extended duration
+		//if trak->moov->mov->NextMoofNumber is 0 we initialize or seek so skip test
+		if (trak->moov->mov->NextMoofNumber && trak->dts_at_next_frag_start) {
+			s32 diff = (s32) ((s64) tfdt - (s64) trak->dts_at_next_frag_start);
+			if (diff < 0) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Warning: TFDT timing "LLD" less than cumulated timing "LLD" - using tfdt\n", tfdt, trak->dts_at_next_frag_start ));
+			}
+			//sample dur was extended, adjust track duration
+			else if (diff > 0) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[iso file] TFDT timing "LLD" higher than cumulated timing "LLD" (last sample got extended in duration)\n", tfdt, trak->dts_at_next_frag_start ));
+				traf_duration += diff;
 			}
 		}
-#endif
-		trak->dts_at_seg_start = traf->tfdt->baseMediaDecodeTime;
+		//remember dts if this is the first fragment we merge (either after a table reset or at first segment start)
+		if (is_first_merge) {
+			trak->dts_at_seg_start = tfdt;
+			trak->dts_at_next_frag_start = tfdt;
+		}
+	} else if (is_first_merge && trak->moov->mov->is_smooth) {
+		trak->dts_at_seg_start = trak->dts_at_next_frag_start;
+	}
+
+	if (traf->tfxd) {
+		trak->last_tfxd_value = traf->tfxd->absolute_time_in_track_timescale;
+		trak->last_tfxd_value += traf->tfxd->fragment_duration_in_track_timescale;
+	}
+	if (traf->tfrf) {
+		if (trak->tfrf) gf_isom_box_del_parent(&trak->child_boxes, (GF_Box *)trak->tfrf);
+		trak->tfrf = traf->tfrf;
+		gf_list_del_item(traf->child_boxes, traf->tfrf);
+		gf_list_add(trak->child_boxes, trak->tfrf);
 	}
 
 	if (trak->moov->mov->signal_frag_bounds) {
@@ -602,7 +634,6 @@
 		store_traf_map = GF_TRUE;
 	}
 
-
 	sample_index = 0;
 	i=0;
 	while ((trun = (GF_TrackFragmentRunBox *)gf_list_enum(traf->TrackRuns, &i))) {
@@ -675,6 +706,8 @@
 			ent->flags = flags;
 			ent->CTS_Offset = cts_offset;
 
+			last_dts += duration;
+
 			//add size first
 			if (!trak->Media->information->sampleTable->SampleSize) {
 				trak->Media->information->sampleTable->SampleSize = (GF_SampleSizeBox *) gf_isom_box_new_parent(&trak->Media->information->sampleTable->child_boxes, GF_ISOM_BOX_TYPE_STSZ);
@@ -753,13 +786,13 @@
 
 			if (store_traf_map && first_samp_in_traf) {
 				first_samp_in_traf = GF_FALSE;
-				e = stbl_AppendTrafMap(trak->Media->information->sampleTable, is_seg_start, seg_start, frag_start, moof_template, moof_template_size, sidx_start, sidx_end);
+				e = stbl_AppendTrafMap(trak->Media->information->sampleTable, is_seg_start, seg_start, frag_start, moof_template, moof_template_size, sidx_start, sidx_end, ent->nb_pack);
 				if (e) return e;
 				//do not deallocate, the memory is now owned by traf map
 				moof_template = NULL;
 				moof_template_size = 0;
 			}
-			if (ent->nb_pack) {
+			if (ent->nb_pack>1) {
 				j+= ent->nb_pack-1;
 				traf_duration += ent->nb_pack*duration;
 				continue;
@@ -790,27 +823,21 @@
 			if (e) return e;
 		}
 	}
-	if (traf_duration && trak->editBox && trak->editBox->editList) {
-		for (i=0; i<gf_list_count(trak->editBox->editList->entryList); i++) {
-			GF_EdtsEntry *edts_e = gf_list_get(trak->editBox->editList->entryList, i);
-			if (edts_e->was_empty_dur) {
-				u64 extend_dur = traf_duration;
-				extend_dur *= trak->moov->mvhd->timeScale;
-				extend_dur /= trak->Media->mediaHeader->timeScale;
-				edts_e->segmentDuration += extend_dur;
-			}
-			else if (!edts_e->segmentDuration) {
-				edts_e->was_empty_dur = GF_TRUE;
-				if ((s64) traf_duration > edts_e->mediaTime)
-					traf_duration -= edts_e->mediaTime;
-				else
-					traf_duration = 0;
-
-				edts_e->segmentDuration = traf_duration;
-				edts_e->segmentDuration *= trak->moov->mvhd->timeScale;
-				edts_e->segmentDuration /= trak->Media->mediaHeader->timeScale;
-			}
 
+	//remember target next dts - last_dts is the duration in media timescale, dos not include tfdt
+	trak->dts_at_next_frag_start += last_dts;
+
+	if (traf_duration && trak->editBox && trak->editBox->editList) {
+		//append to last edit only, adding edits on the fly is not possible in isobmff
+		GF_EdtsEntry *edts_e = gf_list_last(trak->editBox->editList->entryList);
+		if (edts_e && (edts_e->was_empty_dur || !edts_e->segmentDuration)) {
+			//extend last edit duration by the amount of media received in fragment (traf duration)
+			//regardless of the mediaTime offset of the edit (cf #2985)
+			u64 extend_dur = traf_duration;
+			extend_dur *= trak->moov->mvhd->timeScale;
+			extend_dur /= trak->Media->mediaHeader->timeScale;
+			edts_e->segmentDuration += extend_dur;
+			edts_e->was_empty_dur = GF_TRUE;
 		}
 	}
 
@@ -823,7 +850,7 @@
 		GF_List *groups;
 		GF_List *groupDescs;
 		Bool is_identical_sgpd = GF_TRUE;
-		u32 *new_idx = NULL;
+		u32 *new_idx = NULL, new_idx_count=0;
 
 		if (!trak->Media->information->sampleTable->sampleGroups)
 			trak->Media->information->sampleTable->sampleGroups = gf_list_new();
@@ -856,7 +883,8 @@
 				if (is_identical_sgpd)
 					continue;
 
-				new_idx = (u32 *)gf_malloc(gf_list_count(sgdesc->group_descriptions)*sizeof(u32));
+				new_idx_count = gf_list_count(sgdesc->group_descriptions);
+				new_idx = (u32 *)gf_malloc(new_idx_count * sizeof(u32));
 				if (!new_idx) return GF_OUT_OF_MEM;
 
 				count = 0;
@@ -870,7 +898,8 @@
 							new_idx[count] = j + 1;
 							count ++;
 							new_entry = GF_FALSE;
-							gf_free(sgpd_entry);
+
+							sgpd_del_entry(new_sgdesc->grouping_type, sgpd_entry);
 							break;
 						}
 					}
@@ -905,6 +934,14 @@
 				stbl_group->grouping_type_parameter = frag_group->grouping_type_parameter;
 				stbl_group->version = frag_group->version;
 				gf_list_add(groups, stbl_group);
+				//we created a new sample to group, the first num_first_sample_in_traf are not mapped to any description
+				if (num_first_sample_in_traf) {
+					stbl_group->entry_count = 1;
+					stbl_group->sample_entries = gf_malloc(sizeof(GF_SampleGroupEntry));
+					if (!stbl_group->sample_entries) return GF_OUT_OF_MEM;
+					stbl_group->sample_entries[0].group_description_index = 0;
+					stbl_group->sample_entries[0].sample_count = num_first_sample_in_traf;
+				}
 			}
 
 			if (is_identical_sgpd) {
@@ -926,10 +963,33 @@
 					stbl_group->entry_count += frag_group->entry_count;
 				}
 			} else {
-				stbl_group->sample_entries = gf_realloc(stbl_group->sample_entries, sizeof(GF_SampleGroupEntry) * (stbl_group->entry_count + frag_group->entry_count));
+				u32 samples_in_stbl_group = 0;
+				for (j=0; j<stbl_group->entry_count; j++) {
+					samples_in_stbl_group += stbl_group->sample_entries[j].sample_count;
+				}
+				u32 num_entries = stbl_group->entry_count + frag_group->entry_count;
+				if (samples_in_stbl_group < num_first_sample_in_traf) num_entries++;
+
+				stbl_group->sample_entries = gf_realloc(stbl_group->sample_entries, sizeof(GF_SampleGroupEntry) * num_entries);
+				//set unmapped entries to 0
+				if (samples_in_stbl_group < num_first_sample_in_traf) {
+					stbl_group->sample_entries[stbl_group->entry_count].sample_count = num_first_sample_in_traf - samples_in_stbl_group;
+					stbl_group->sample_entries[stbl_group->entry_count].group_description_index = 0;
+					stbl_group->entry_count++;
+				}
+
 				//adjust sgpd index
-				for (j = 0; j < frag_group->entry_count; j++)
-					frag_group->sample_entries[j].group_description_index = new_idx[j];
+				for (j = 0; j < frag_group->entry_count; j++) {
+					u32 sgidx = frag_group->sample_entries[j].group_description_index;
+					if (sgidx > 0x10000) {
+						sgidx -= 0x10001;
+						if (sgidx>=new_idx_count) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isobmf] corrupted sample group index in fragment %d but only %d group descriptions in fragment\n", sgidx, new_idx_count));
+						} else {
+							frag_group->sample_entries[j].group_description_index = new_idx[sgidx];
+						}
+					}
+				}
 				memcpy(&stbl_group->sample_entries[stbl_group->entry_count], &frag_group->sample_entries[0], sizeof(GF_SampleGroupEntry) * frag_group->entry_count);
 				stbl_group->entry_count += frag_group->entry_count;
 			}
@@ -944,9 +1004,8 @@
 		|| traf->sample_encryption) {
 		/*Merge sample auxiliary encryption information*/
 		GF_SampleEncryptionBox *senc = NULL;
-		GF_List *sais = NULL;
 		u32 scheme_type;
-		gf_isom_get_cenc_info(trak->moov->mov, track_num, DescIndex, NULL, &scheme_type, NULL, NULL);
+		gf_isom_get_cenc_info(trak->moov->mov, track_num, DescIndex, NULL, &scheme_type, NULL);
 
 		if (traf->sample_encryption) {
 			for (i = 0; i < gf_list_count(trak->Media->information->sampleTable->child_boxes); i++) {
@@ -966,7 +1025,7 @@
 				senc = trak->sample_encryption;
 
 			if (!senc) {
-				if (traf->sample_encryption->is_piff) {
+				if (traf->sample_encryption->piff_type==1) {
 					senc = (GF_SampleEncryptionBox *)gf_isom_create_piff_psec_box(1, 0x2, 0, 0, NULL);
 				} else {
 					senc = gf_isom_create_samp_enc_box(1, 0x2);
@@ -978,8 +1037,6 @@
 				if (!trak->child_boxes) trak->child_boxes = gf_list_new();
 				gf_list_add(trak->child_boxes, senc);
 			}
-
-			sais = traf->sample_encryption->samp_aux_info;
 		}
 
 		/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
@@ -1003,10 +1060,13 @@
 				if ((aux_info_type == GF_ISOM_CENC_SCHEME) || (aux_info_type == GF_ISOM_CBC_SCHEME) ||
 					(aux_info_type == GF_ISOM_CENS_SCHEME) || (aux_info_type == GF_ISOM_CBCS_SCHEME) ||
 					(gf_list_count(traf->sai_offsets) == 1)) {
-					offset = saio->offsets[0] + moof_offset;
-					nb_saio = saio->entry_count;
-					break;
+					if (saio->offsets && saio->entry_count) {
+						offset = saio->offsets[0] + moof_offset;
+						nb_saio = saio->entry_count;
+						break;
+					}
 				}
+				saio = NULL;
 			}
 			for (i = 0; i < gf_list_count(traf->sai_sizes); i++) {
 				saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(traf->sai_sizes, i);
@@ -1018,73 +1078,67 @@
 					(gf_list_count(traf->sai_sizes) == 1)) {
 					break;
 				}
+				saiz = NULL;
 			}
-			if (saiz && saio) {
+			if (saiz && saio && senc) {
 				for (i = 0; i < saiz->sample_count; i++) {
 					GF_CENCSampleAuxInfo *sai;
-
+					const u8 *key_info=NULL;
+					u32 key_info_size, samp_num;
 					u64 cur_position;
 					if (nb_saio != 1)
 						offset = saio->offsets[i] + moof_offset;
 					size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[i];
 
-
 					cur_position = gf_bs_get_position(trak->moov->mov->movieFileMap->bs);
 					gf_bs_seek(trak->moov->mov->movieFileMap->bs, offset);
 
 					GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
 					if (!sai) return GF_OUT_OF_MEM;
 
-					e = gf_isom_get_sample_cenc_info_ex(trak, traf, senc, i+1, &is_encrypted, &sai->IV_size, NULL, NULL, NULL, NULL, NULL);
+					samp_num = num_first_sample_in_traf + i + 1;
+
+					trak->current_traf_stsd_idx = DescIndex;
+					e = gf_isom_get_sample_cenc_info_internal(trak, traf, senc, samp_num, &is_encrypted, NULL, NULL, &key_info, &key_info_size);
+					trak->current_traf_stsd_idx = 0;
 					if (e) {
 						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] could not get cenc info for sample %d: %s\n", i+1, gf_error_to_string(e) ));
 						return e;
 					}
 
 					if (is_encrypted) {
-						gf_bs_read_data(trak->moov->mov->movieFileMap->bs, (char *)sai->IV, sai->IV_size);
-						if (size > sai->IV_size) {
-							sai->subsample_count = gf_bs_read_u16(trak->moov->mov->movieFileMap->bs);
-							sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry)*sai->subsample_count);
-							if (!sai->subsamples) return GF_OUT_OF_MEM;
-							for (j = 0; j < sai->subsample_count; j++) {
-								sai->subsamples[j].bytes_clear_data = gf_bs_read_u16(trak->moov->mov->movieFileMap->bs);
-								sai->subsamples[j].bytes_encrypted_data = gf_bs_read_u32(trak->moov->mov->movieFileMap->bs);
-							}
-						}
+						sai->cenc_data_size = size;
+						sai->cenc_data = gf_malloc(sizeof(u8)*size);
+						if (!sai->cenc_data) return GF_OUT_OF_MEM;
+						gf_bs_read_data(trak->moov->mov->movieFileMap->bs, sai->cenc_data, sai->cenc_data_size);
 					} else {
-						sai->IV_size=0;
-						sai->subsample_count=0;
+						sai->isNotProtected=1;
 					}
 
+					if (key_info) {
+						//not multikey
+						if (!key_info[0]) {
+							//size greater than IV
+							if (size > key_info[3])
+								senc->flags = 0x00000002;
+						}
+						//multikey, always use subsamples
+						else {
+							senc->flags = 0x00000002;
+						}
+					}
+
+
 					gf_bs_seek(trak->moov->mov->movieFileMap->bs, cur_position);
 
 					gf_list_add(senc->samp_aux_info, sai);
-					if (sai->subsample_count) senc->flags = 0x00000002;
-					e = gf_isom_cenc_merge_saiz_saio(senc, trak->Media->information->sampleTable, offset, size);
+
+					e = gf_isom_cenc_merge_saiz_saio(senc, trak->Media->information->sampleTable, samp_num, offset, size);
 					if (e) return e;
 					if (nb_saio == 1)
 						offset += size;
 				}
 			}
-		} else if (sais) {
-			for (i = 0; i < gf_list_count(sais); i++) {
-				GF_CENCSampleAuxInfo *sai, *new_sai;
-
-				sai = (GF_CENCSampleAuxInfo *)gf_list_get(sais, i);
-
-				new_sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
-				if (!new_sai) return GF_OUT_OF_MEM;
-				new_sai->IV_size = sai->IV_size;
-				memmove((char *)new_sai->IV, (const char*)sai->IV, 16);
-				new_sai->subsample_count = sai->subsample_count;
-				new_sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(new_sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
-				if (!new_sai->subsamples) return GF_OUT_OF_MEM;
-				memmove(new_sai->subsamples, sai->subsamples, new_sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
-
-				gf_list_add(senc->samp_aux_info, new_sai);
-				if (sai->subsample_count) senc->flags = 0x00000002;
-			}
 		} else if (traf->sample_encryption) {
 			senc_Parse(trak->moov->mov->movieFileMap->bs, trak, traf, traf->sample_encryption);
 			trak->sample_encryption->AlgorithmID = traf->sample_encryption->AlgorithmID;
@@ -1092,8 +1146,76 @@
 				trak->sample_encryption->IV_size = traf->sample_encryption->IV_size;
 			if (!trak->sample_encryption->samp_aux_info) trak->sample_encryption->samp_aux_info = gf_list_new();
 			gf_list_transfer(trak->sample_encryption->samp_aux_info, traf->sample_encryption->samp_aux_info);
+			if (traf->sample_encryption->flags & 0x00000002)
+				trak->sample_encryption->flags |= 0x00000002;
+		}
+	}
+
+	/*merge other saio*/
+	for (i=0; i<gf_list_count(traf->sai_sizes); i++) {
+		GF_SampleAuxiliaryInfoOffsetBox *saio = NULL;
+		GF_SampleAuxiliaryInfoSizeBox *saiz = gf_list_get(traf->sai_sizes, i);
+		switch (saiz->aux_info_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
+		case GF_ISOM_PIFF_SCHEME:
+		case 0:
+			continue;
+		default:
+			break;
+		}
+		for (j=0; j<gf_list_count(traf->sai_offsets); j++) {
+			saio = gf_list_get(traf->sai_offsets, j);
+			if ((saio->aux_info_type==saiz->aux_info_type) && (saio->aux_info_type_parameter==saiz->aux_info_type_parameter)) break;
+			saio=NULL;
+		}
+		if (!saio) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isobmf] No saio for saiz type %s aux info type %d, cannot merge SAI\n", gf_4cc_to_str(saiz->aux_info_type), saiz->aux_info_type_parameter));
+			continue;
+		}
+		if (!saio->offsets) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] No offset in saio type %s aux info type %d, cannot merge SAI\n", gf_4cc_to_str(saiz->aux_info_type), saiz->aux_info_type_parameter));
+			continue;
+		}
+		u64 offset = saio->offsets[0] + moof_offset;
+		u32 nb_saio = saio->entry_count;
+		if ((nb_saio>1) && (saio->entry_count != saiz->sample_count)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] Number of size and offset mismatch in auxiliary type %s aux info type %d, cannot merge SAI\n", gf_4cc_to_str(saiz->aux_info_type), saiz->aux_info_type_parameter));
+			continue;
+		}
+
+		u32 sai_max_size=0;
+		u8 *sai = NULL;
+		for (j=0; j < saiz->sample_count; j++) {
+			if (nb_saio != 1)
+				offset = saio->offsets[j] + moof_offset;
+			size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
+
+			u64 cur_position = gf_bs_get_position(trak->moov->mov->movieFileMap->bs);
+			gf_bs_seek(trak->moov->mov->movieFileMap->bs, offset);
+
+			u32 samp_num = num_first_sample_in_traf + j + 1;
+
+			if (sai_max_size<size) {
+				sai_max_size = size;
+				sai = gf_realloc(sai, sai_max_size);
+			}
+			gf_bs_read_data(trak->moov->mov->movieFileMap->bs, sai, size);
+			gf_bs_seek(trak->moov->mov->movieFileMap->bs, cur_position);
+
+			GF_Err e = gf_isom_add_sample_aux_info_internal(trak, NULL, samp_num, saiz->aux_info_type, saiz->aux_info_type_parameter, sai, size);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] Failed to merge sai data: %s\n", gf_error_to_string(e) ));
+			}
+
+			if (nb_saio == 1)
+				offset += size;
 		}
+		if (sai) gf_free(sai);
 	}
+
 	return GF_OK;
 }
 
@@ -1167,25 +1289,25 @@
 	if (!mdhd) {
 		mdhd = (GF_MediaHeaderBox *) gf_isom_box_new_parent( & ((*mdia)->child_boxes), GF_ISOM_BOX_TYPE_MDHD);
 		if (! mdhd) { e = GF_OUT_OF_MEM; goto err_exit; }
-		e = mdia_on_child_box((GF_Box*)*mdia, (GF_Box *) mdhd);
+		e = mdia_on_child_box((GF_Box*)*mdia, (GF_Box *) mdhd, GF_FALSE);
 		if (e) goto err_exit;
 	}
 	if (!hdlr) {
 		hdlr = (GF_HandlerBox *) gf_isom_box_new_parent(& ((*mdia)->child_boxes), GF_ISOM_BOX_TYPE_HDLR);
 		if (! hdlr) { e = GF_OUT_OF_MEM; goto err_exit; }
-		e = mdia_on_child_box((GF_Box*)*mdia, (GF_Box *) hdlr);
+		e = mdia_on_child_box((GF_Box*)*mdia, (GF_Box *) hdlr, GF_FALSE);
 		if (e) goto err_exit;
 	}
 	if (!minf) {
 		minf = (GF_MediaInformationBox *) gf_isom_box_new_parent(& ((*mdia)->child_boxes), GF_ISOM_BOX_TYPE_MINF);
 		if (! minf) { e = GF_OUT_OF_MEM; goto err_exit; }
-		e = mdia_on_child_box((GF_Box*)*mdia, (GF_Box *) minf);
+		e = mdia_on_child_box((GF_Box*)*mdia, (GF_Box *) minf, GF_FALSE);
 		if (e) goto err_exit;
 	}
 	if (!dinf) {
 		dinf = (GF_DataInformationBox *) gf_isom_box_new_parent(&minf->child_boxes, GF_ISOM_BOX_TYPE_DINF);
 		if (! dinf) { e = GF_OUT_OF_MEM; goto err_exit; }
-		e = minf_on_child_box((GF_Box*)minf, (GF_Box *) dinf);
+		e = minf_on_child_box((GF_Box*)minf, (GF_Box *) dinf, GF_FALSE);
 		if (e) goto err_exit;
 	}
 
@@ -1271,7 +1393,7 @@
 		if (!minf->child_boxes) minf->child_boxes = gf_list_new();
 		gf_list_add(minf->child_boxes, mediaInfo);
 
-		e = minf_on_child_box((GF_Box*)minf, (GF_Box *) mediaInfo);
+		e = minf_on_child_box((GF_Box*)minf, (GF_Box *) mediaInfo, GF_FALSE);
 		if (e) goto err_exit;
 	}
 
@@ -1284,7 +1406,7 @@
 		//Create a data reference WITHOUT DATA ENTRY (we don't know anything yet about the media Data)
 		dref = (GF_DataReferenceBox *) gf_isom_box_new_parent(&dinf->child_boxes, GF_ISOM_BOX_TYPE_DREF);
 		if (! dref) { e = GF_OUT_OF_MEM; goto err_exit; }
-		e = dinf_on_child_box((GF_Box*)dinf, (GF_Box *)dref);
+		e = dinf_on_child_box((GF_Box*)dinf, (GF_Box *)dref, GF_FALSE);
 		if (e) goto err_exit;
 	}
 
@@ -1293,7 +1415,7 @@
 		stbl = (GF_SampleTableBox *) gf_isom_box_new_parent(&minf->child_boxes, GF_ISOM_BOX_TYPE_STBL);
 		if (! stbl) { e = GF_OUT_OF_MEM; goto err_exit; }
 
-		e = minf_on_child_box((GF_Box*)minf, (GF_Box *) stbl);
+		e = minf_on_child_box((GF_Box*)minf, (GF_Box *) stbl, GF_FALSE);
 		if (e) goto err_exit;
 	}
 	if (!stbl->SampleDescription) {
@@ -1365,7 +1487,7 @@
 		if (!trak->References) {
 			tref = (GF_TrackReferenceBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_TREF);
 			if (!tref) return GF_OUT_OF_MEM;
-			e = trak_on_child_box((GF_Box*)trak, (GF_Box *)tref);
+			e = trak_on_child_box((GF_Box*)trak, (GF_Box *)tref, GF_FALSE);
 			if (e) return e;
 		}
 		tref = trak->References;
@@ -1442,7 +1564,7 @@
 		esd->langDesc = NULL;
 	}
 
-	//we have a streamDescritpionIndex, use it
+	//we have a streamDescriptionIndex, use it
 	if (StreamDescriptionIndex) {
 		u32 entry_type;
 		entry = (GF_MPEGSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, StreamDescriptionIndex - 1);
@@ -1460,9 +1582,12 @@
 			break;
 		case GF_ISOM_BOX_TYPE_MP4V:
 			entry_v = (GF_MPEGVisualSampleEntryBox*) entry;
-			//OK, delete the previous ESD
-			gf_odf_desc_del((GF_Descriptor *) entry_v->esd->desc);
-			entry_v->esd->desc = esd;
+			if (entry_v->esd) {
+				gf_odf_desc_del((GF_Descriptor *) entry_v->esd->desc);
+				entry_v->esd->desc = esd;
+			} else {
+				return GF_ISOM_INVALID_MEDIA;
+			}
 			break;
 		case GF_ISOM_BOX_TYPE_MP4A:
 			entry_a = (GF_MPEGAudioSampleEntryBox*) entry;
@@ -1489,6 +1614,8 @@
 		case GF_ISOM_BOX_TYPE_LHE1:
 		case GF_ISOM_BOX_TYPE_LHV1:
 		case GF_ISOM_BOX_TYPE_HVT1:
+		case GF_ISOM_BOX_TYPE_VVC1:
+		case GF_ISOM_BOX_TYPE_VVI1:
 			e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry, esd);
 			if (e) return e;
 			break;
@@ -1497,6 +1624,7 @@
 			if (e) return e;
 			break;
 		case GF_ISOM_BOX_TYPE_AV01:
+		case GF_ISOM_BOX_TYPE_DAV1:
 		case GF_ISOM_BOX_TYPE_AV1C:
 		case GF_ISOM_BOX_TYPE_OPUS:
 		case GF_ISOM_BOX_TYPE_DOPS:
@@ -1515,9 +1643,12 @@
 		//need to check we're not in URL mode where only ONE description is allowed...
 		StreamDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
 		if (StreamDescriptionIndex) {
+			GF_ESD *old_esd=NULL;
 			entry = (GF_MPEGSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, StreamDescriptionIndex - 1);
 			if (!entry) return GF_ISOM_INVALID_FILE;
-			if (entry->esd && entry->esd->desc->URLString) return GF_BAD_PARAM;
+			//get ESD (only if present, do not emulate)
+			Media_GetESD(trak->Media, StreamDescriptionIndex, &old_esd, GF_TRUE);
+			if (old_esd && old_esd->URLString) return GF_BAD_PARAM;
 		}
 
 		//OK, check the handler and create the entry
@@ -1535,6 +1666,11 @@
 				if (!entry_v) return GF_OUT_OF_MEM;
 				e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry_v, esd);
 				if (e) return e;
+			} else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_VVC) {
+				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_VVC1);
+				if (!entry_v) return GF_OUT_OF_MEM;
+				e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry_v, esd);
+				if (e) return e;
 			} else {
 				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MP4V);
 				if (!entry_v) return GF_OUT_OF_MEM;
@@ -1599,7 +1735,7 @@
 			trak->Media->information->sampleTable->SampleDescription->child_boxes = gf_list_new();
 		gf_list_add(trak->Media->information->sampleTable->SampleDescription->child_boxes, entry);
 		
-		e = stsd_on_child_box((GF_Box*)trak->Media->information->sampleTable->SampleDescription, (GF_Box *) entry);
+		e = stsd_on_child_box((GF_Box*)trak->Media->information->sampleTable->SampleDescription, (GF_Box *) entry, GF_FALSE);
 		if (e) return e;
 		if(outStreamIndex) *outStreamIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
 	}

gpac-1.0.1.tar.gz/src/isomedia/tx3g.c -> gpac-2.0.0.tar.gz/src/isomedia/tx3g.c Changed

@@ -28,14 +28,29 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
+static u32 rgb_48_to_32(char *val)
+{
+	u32 res = 0x0;
+	u32 i;
+
+	for (i=0; i<3; i++) {
+		u32 v = val[2*i];
+		v<<=8;
+		v|=val[2*i + 1];
+		v/=0xFF;
+
+		res <<= 8;
+		res |= v;
+	}
+	return res;
+}
 
 GF_Err gf_isom_get_text_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, GF_TextSampleDescriptor **out_desc)
 {
 	GF_TrackBox *trak;
 	u32 i;
-	Bool is_qt_text = GF_FALSE;
-	GF_Tx3gSampleEntryBox *txt;
-
+	GF_Tx3gSampleEntryBox *txt = NULL;
+	GF_TextSampleEntryBox *qt_txt = NULL;
 	if (!descriptionIndex || !out_desc) return GF_BAD_PARAM;
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
@@ -55,7 +70,8 @@
 	case GF_ISOM_BOX_TYPE_TX3G:
 		break;
 	case GF_ISOM_BOX_TYPE_TEXT:
-		is_qt_text = GF_TRUE;
+		qt_txt = (GF_TextSampleEntryBox *)txt;
+		txt = NULL;
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -63,20 +79,27 @@
 
 	(*out_desc) = (GF_TextSampleDescriptor *) gf_odf_desc_new(GF_ODF_TX3G_TAG);
 	if (! (*out_desc) ) return GF_OUT_OF_MEM;
-	(*out_desc)->back_color = txt->back_color;
-	(*out_desc)->default_pos = txt->default_box;
-	(*out_desc)->default_style = txt->default_style;
-	(*out_desc)->displayFlags = txt->displayFlags;
-	(*out_desc)->vert_justif = txt->vertical_justification;
-	(*out_desc)->horiz_justif = txt->horizontal_justification;
-	if (is_qt_text) {
-		GF_TextSampleEntryBox *qt_txt = (GF_TextSampleEntryBox *) txt;
+
+	if (qt_txt) {
+		(*out_desc)->back_color = rgb_48_to_32(qt_txt->background_color);
+		(*out_desc)->default_pos = qt_txt->default_box;
+		(*out_desc)->default_style.style_flags = 0; //todo, expose qt_txt->fontFace;
+		(*out_desc)->default_style.text_color = rgb_48_to_32(qt_txt->foreground_color);
+		(*out_desc)->displayFlags = qt_txt->displayFlags;
+		(*out_desc)->vert_justif = -1;
+		(*out_desc)->horiz_justif = qt_txt->textJustification;
 		if (qt_txt->textName) {
 			(*out_desc)->font_count = 1;
 			(*out_desc)->fonts = (GF_FontRecord *) gf_malloc(sizeof(GF_FontRecord));
 			(*out_desc)->fonts[0].fontName = gf_strdup(qt_txt->textName);
 		}
 	} else {
+		(*out_desc)->back_color = txt->back_color;
+		(*out_desc)->default_pos = txt->default_box;
+		(*out_desc)->default_style = txt->default_style;
+		(*out_desc)->displayFlags = txt->displayFlags;
+		(*out_desc)->vert_justif = txt->vertical_justification;
+		(*out_desc)->horiz_justif = txt->horizontal_justification;
 		(*out_desc)->font_count = txt->font_table->entry_count;
 		(*out_desc)->fonts = (GF_FontRecord *) gf_malloc(sizeof(GF_FontRecord) * txt->font_table->entry_count);
 		for (i=0; i<txt->font_table->entry_count; i++) {
@@ -695,15 +718,16 @@
 #define SAMPLE_INDEX_OFFSET		129
 
 
-static void gf_isom_write_tx3g(GF_Tx3gSampleEntryBox *a, GF_BitStream *bs, u32 sidx, u32 sidx_offset)
+static void gf_isom_write_tx3g(GF_Tx3gSampleEntryBox *_a, GF_BitStream *bs, u32 sidx, u32 sidx_offset)
 {
 	u32 size, j, fount_count;
-	Bool is_qt_text = (a->type==GF_ISOM_BOX_TYPE_TEXT) ? GF_TRUE : GF_FALSE;
 	const char *qt_fontname = NULL;
 	void gpp_write_rgba(GF_BitStream *bs, u32 col);
 	void gpp_write_box(GF_BitStream *bs, GF_BoxRecord *rec);
 	void gpp_write_style(GF_BitStream *bs, GF_StyleRecord *rec);
 
+	GF_TextSampleEntryBox *qt = (_a->type==GF_ISOM_BOX_TYPE_TEXT) ? (GF_TextSampleEntryBox *)_a : NULL;
+	GF_Tx3gSampleEntryBox *ttxt = (_a->type!=GF_ISOM_BOX_TYPE_TEXT) ? (GF_Tx3gSampleEntryBox *)_a : NULL;
 
 	if (sidx_offset) gf_bs_write_u8(bs, sidx + sidx_offset);
 
@@ -711,32 +735,40 @@
 	size = 8 + 18 + 8 + 12;
 	size += 8 + 2;
 	fount_count = 0;
-	if (is_qt_text) {
-		GF_TextSampleEntryBox *qt = (GF_TextSampleEntryBox *)a;
-		if (qt->textName) {
-			qt_fontname = qt->textName;
-			fount_count = 1;
-		}
-	} else {
-		if (a->font_table) {
-			fount_count = a->font_table->entry_count;
-			for (j=0; j<fount_count; j++) {
-				size += 3;
-				if (a->font_table->fonts[j].fontName) size += (u32) strlen(a->font_table->fonts[j].fontName);
-			}
+	if (qt && qt->textName) {
+		qt_fontname = qt->textName;
+		fount_count = 1;
+	} else if (ttxt && ttxt->font_table) {
+		fount_count = ttxt->font_table->entry_count;
+		for (j=0; j<fount_count; j++) {
+			size += 3;
+			if (ttxt->font_table->fonts[j].fontName)
+				size += (u32) strlen(ttxt->font_table->fonts[j].fontName);
 		}
 	}
 	/*write TextSampleEntry box*/
 	gf_bs_write_u32(bs, size);
-	gf_bs_write_u32(bs, a->type);
-	gf_bs_write_data(bs, a->reserved, 6);
-	gf_bs_write_u16(bs, a->dataReferenceIndex);
-	gf_bs_write_u32(bs, a->displayFlags);
-	gf_bs_write_u8(bs, a->horizontal_justification);
-	gf_bs_write_u8(bs, a->vertical_justification);
-	gpp_write_rgba(bs, a->back_color);
-	gpp_write_box(bs, &a->default_box);
-	gpp_write_style(bs, &a->default_style);
+	gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_TX3G);
+	gf_bs_write_data(bs, _a->reserved, 6);
+	gf_bs_write_u16(bs, _a->dataReferenceIndex);
+	gf_bs_write_u32(bs, _a->displayFlags);
+	if (qt) {
+		GF_StyleRecord sr;
+		memset(&sr, 0, sizeof(GF_StyleRecord));
+		gf_bs_write_u8(bs, qt->textJustification);
+		gf_bs_write_u8(bs, (u8) -1);
+		gpp_write_rgba(bs, rgb_48_to_32(qt->background_color) );
+		gpp_write_box(bs, &qt->default_box);
+		sr.text_color = rgb_48_to_32(qt->foreground_color);
+		sr.style_flags = 0; //todo expose qt->fontFace;
+		gpp_write_style(bs, &sr);
+	} else {
+		gf_bs_write_u8(bs, ttxt->horizontal_justification);
+		gf_bs_write_u8(bs, ttxt->vertical_justification);
+		gpp_write_rgba(bs, ttxt->back_color);
+		gpp_write_box(bs, &ttxt->default_box);
+		gpp_write_style(bs, &ttxt->default_style);
+	}
 	/*write font table box*/
 	size -= (8 + 18 + 8 + 12);
 	gf_bs_write_u32(bs, size);
@@ -744,7 +776,7 @@
 
 	gf_bs_write_u16(bs, fount_count);
 	for (j=0; j<fount_count; j++) {
-		if (is_qt_text) {
+		if (qt) {
 			gf_bs_write_u16(bs, 0);
 			if (qt_fontname) {
 				u32 len = (u32) strlen(qt_fontname);
@@ -754,11 +786,11 @@
 				gf_bs_write_u8(bs, 0);
 			}
 		} else {
-			gf_bs_write_u16(bs, a->font_table->fonts[j].fontID);
-			if (a->font_table->fonts[j].fontName) {
-				u32 len = (u32) strlen(a->font_table->fonts[j].fontName);
+			gf_bs_write_u16(bs, ttxt->font_table->fonts[j].fontID);
+			if (ttxt->font_table->fonts[j].fontName) {
+				u32 len = (u32) strlen(ttxt->font_table->fonts[j].fontName);
 				gf_bs_write_u8(bs, len);
-				gf_bs_write_data(bs, a->font_table->fonts[j].fontName, len);
+				gf_bs_write_data(bs, ttxt->font_table->fonts[j].fontName, len);
 			} else {
 				gf_bs_write_u8(bs, 0);
 			}
@@ -888,6 +920,8 @@
 	GF_TrackBox *trak;
 	GF_Tx3gSampleEntryBox *a;
 
+	*tx3g = NULL;
+	*tx3g_size = 0;
 	trak = gf_isom_get_track_from_file(file, track);
 	if (!trak) return GF_BAD_PARAM;
 
@@ -897,8 +931,6 @@
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_isom_write_tx3g(a, bs, sidx, sidx_offset);
-	*tx3g = NULL;
-	*tx3g_size = 0;
 	gf_bs_get_content(bs, tx3g, tx3g_size);
 	gf_bs_del(bs);
 	return GF_OK;

gpac-1.0.1.tar.gz/src/jsmods/WebGLRenderingContextBase.c -> gpac-2.0.0.tar.gz/src/jsmods/WebGLRenderingContextBase.c Changed

gpac-1.0.1.tar.gz/src/jsmods/core.c -> gpac-2.0.0.tar.gz/src/jsmods/core.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2007-2020
+ *			Copyright (c) Telecom ParisTech 2007-2022
 *			All rights reserved
 *
 * This file is part of GPAC / JavaScript libgpac Core bindings
@@ -31,18 +31,290 @@
 #include <gpac/setup.h>
 
 #ifdef GPAC_HAS_QJS
+#include <gpac/main.h>
+#include <gpac/thread.h>
 #include <gpac/bitstream.h>
 #include <gpac/network.h>
 #include <gpac/base_coding.h>
+#include <gpac/filters.h>
 
 #include "../scenegraph/qjs_common.h"
 
+
+static void qjs_init_runtime_libc(JSRuntime *rt);
+static void qjs_uninit_runtime_libc(JSRuntime *rt);
+
+typedef struct
+{
+	JSRuntime *js_runtime;
+	u32 nb_inst;
+	JSContext *ctx;
+
+	GF_Mutex *mx;
+	GF_List *allocated_contexts;
+} GF_JSRuntime;
+
+static GF_JSRuntime *js_rt = NULL;
+
+JSContext *gf_js_create_context()
+{
+	JSContext *ctx;
+	if (!js_rt) {
+		JSRuntime *js_runtime = JS_NewRuntime();
+		if (!js_runtime) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[ECMAScript] Cannot allocate ECMAScript runtime\n"));
+			return NULL;
+		}
+		GF_SAFEALLOC(js_rt, GF_JSRuntime);
+		if (!js_rt) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[JS] Failed to create script runtime\n"));
+			return NULL;
+		}
+		js_rt->js_runtime = js_runtime;
+		js_rt->allocated_contexts = gf_list_new();
+		js_rt->mx = gf_mx_new("JavaScript");
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[ECMAScript] ECMAScript runtime allocated %p\n", js_runtime));
+
+		qjs_init_runtime_libc(js_rt->js_runtime);
+	}
+	js_rt->nb_inst++;
+
+	gf_mx_p(js_rt->mx);
+
+	ctx = JS_NewContext(js_rt->js_runtime);
+
+	gf_list_add(js_rt->allocated_contexts, ctx);
+	gf_mx_v(js_rt->mx);
+
+	return ctx;
+}
+
+void gf_js_delete_context(JSContext *ctx)
+{
+	if (!js_rt) return;
+
+	gf_js_call_gc(ctx);
+
+	gf_mx_p(js_rt->mx);
+	gf_list_del_item(js_rt->allocated_contexts, ctx);
+	JS_FreeContext(ctx);
+	gf_mx_v(js_rt->mx);
+	gf_js_call_gc(NULL);
+
+	js_rt->nb_inst --;
+	if (js_rt->nb_inst == 0) {
+		//persistent context, do not delete runtime but perform GC
+		if (gf_opts_get_bool("temp", "peristent-jsrt")) {
+			JS_RunGC(js_rt->js_runtime);
+			return;
+		}
+
+		qjs_uninit_runtime_libc(js_rt->js_runtime);
+		JS_FreeRuntime(js_rt->js_runtime);
+		gf_list_del(js_rt->allocated_contexts);
+		gf_mx_del(js_rt->mx);
+		gf_free(js_rt);
+		js_rt = NULL;
+	}
+}
+GF_EXPORT
+void gf_js_delete_runtime()
+{
+	if (js_rt) {
+		JS_FreeRuntime(js_rt->js_runtime);
+		gf_list_del(js_rt->allocated_contexts);
+		gf_mx_del(js_rt->mx);
+		gf_free(js_rt);
+		js_rt = NULL;
+	}
+}
+
+void gf_js_call_gc(JSContext *c)
+{
+	gf_js_lock(c, 1);
+	JS_RunGC(js_rt->js_runtime);
+	gf_js_lock(c, 0);
+}
+
+Bool gs_js_context_is_valid(JSContext *ctx)
+{
+	if (gf_list_find(js_rt->allocated_contexts, ctx) < 0)
+		return GF_FALSE;
+	return GF_TRUE;
+}
+
+/*
+ * locking/try-locking the JS context
+ *
+ * */
+GF_EXPORT
+void gf_js_lock(struct JSContext *cx, Bool LockIt)
+{
+	if (!js_rt) return;
+
+	if (LockIt) {
+		gf_mx_p(js_rt->mx);
+	} else {
+		gf_mx_v(js_rt->mx);
+	}
+}
+
+GF_EXPORT
+Bool gf_js_try_lock(struct JSContext *cx)
+{
+	assert(cx);
+	if (gf_mx_try_lock(js_rt->mx)) {
+		return 1;
+	}
+	return 0;
+}
+
+JSRuntime *gf_js_get_rt()
+{
+	if (!js_rt) return NULL;
+	return js_rt->js_runtime;
+}
+
+
+
+static JSValue js_print_ex(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, u32 ltool, u32 error_type)
+{
+ int i=0;
+ Bool first=GF_TRUE;
+ s32 logl = GF_LOG_INFO;
+ JSValue v, g;
+ const char *c_logname=NULL;
+ const char *log_name = "JS";
+
+ if ((argc>1) && JS_IsNumber(argv[0])) {
+		JS_ToInt32(ctx, &logl, argv[0]);
+		i=1;
+	}
+
+	if (error_type)
+		logl = GF_LOG_ERROR;
+	g = JS_GetGlobalObject(ctx);
+	v = JS_GetPropertyStr(ctx, g, "_gpac_log_name");
+	if (!JS_IsUndefined(v) && !JS_IsNull(v)) {
+		c_logname = JS_ToCString(ctx, v);
+		JS_FreeValue(ctx, v);
+		if (c_logname) {
+			log_name = c_logname;
+			if (!strlen(log_name))
+				log_name = NULL;
+		}
+	}
+	JS_FreeValue(ctx, g);
+
+	if (log_name) {
+#ifndef GPAC_DISABLE_LOG
+		GF_LOG(logl, ltool, ("[%s] ", log_name));
+#else
+		fprintf(stderr, "[%s] ", log_name);
+#endif
+	}
+	if (error_type==2) {
+#ifndef GPAC_DISABLE_LOG
+		GF_LOG(logl, ltool, ("Throw "));
+#else
+		fprintf(stderr, "Throw ");
+#endif
+	}
+
+ for (; i < argc; i++) {
+		const char *str = JS_ToCString(ctx, argv[i]);
+ if (!str) return GF_JS_EXCEPTION(ctx);
+
+ if (logl==-1) {
+			gf_sys_format_help(stderr, GF_PRINTARG_HIGHLIGHT_FIRST, "%s\n", str);
+		} else if (logl==-2) {
+			gf_sys_format_help(stderr, 0, "%s\n", str);
+		} else if (logl<0) {
+			fprintf(stderr, "%s%s", (first) ? "" : " ", str);
+		} else {
+#ifndef GPAC_DISABLE_LOG
+			GF_LOG(logl, ltool, ("%s%s", (first) ? "" : " ", str));
+#else
+			fprintf(stderr, "%s%s", (first) ? "" : " ", str);
+#endif
+			if (JS_IsException(argv[i])) {
+				js_dump_error_exc(ctx, argv[i]);
+			}
+		}
+ JS_FreeCString(ctx, str);
+ first=GF_FALSE;
+ }
+#ifndef GPAC_DISABLE_LOG
+ 	GF_LOG(logl, ltool, ("\n"));
+#else
+	fprintf(stderr, "\n");
+#endif
+	if (c_logname) JS_FreeCString(ctx, c_logname);
+	return JS_UNDEFINED;
+}
+JSValue js_print(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return js_print_ex(ctx, this_val, argc, argv, GF_LOG_CONSOLE, GF_FALSE);
+}
+
+void js_dump_error_exc(JSContext *ctx, const JSValue exception_val)
+{
+ Bool is_error;
+	u32 err_type = 1;
+ is_error = JS_IsError(ctx, exception_val);
+ if (!is_error) err_type = 2;
+
+ js_print_ex(ctx, JS_NULL, 1, (JSValueConst *)&exception_val, GF_LOG_SCRIPT, err_type);
+
+ if (is_error) {
+ JSValue val = JS_GetPropertyStr(ctx, exception_val, "stack");
+ if (!JS_IsUndefined(val)) {
+			const char *stack = JS_ToCString(ctx, val);
+#ifndef GPAC_DISABLE_LOG
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("%s\n", stack) );
+#else
+			fprintf(stderr, "%s\n", stack);
+#endif
+ JS_FreeCString(ctx, stack);
+ }
+ JS_FreeValue(ctx, val);
+ }
+}
+
+void js_dump_error(JSContext *ctx)
+{
+ JSValue exception_val = JS_GetException(ctx);
+	js_dump_error_exc(ctx, exception_val);
+ JS_FreeValue(ctx, exception_val);
+}
+
+#ifdef GPAC_DISABLE_QJS_LIBC
+void js_std_loop(JSContext *ctx)
+{
+	while (1) {
+		JSContext *ctx1;
+		int err = JS_ExecutePendingJob(JS_GetRuntime(ctx), &ctx1);
+		if (err <= 0) {
+			if (err < 0) {
+				js_dump_error(ctx1);
+			}
+			break;
+		}
+	}
+}
+#endif
+
+
+
+
 #define JS_CGETSET_MAGIC_DEF_ENUM(name, fgetter, fsetter, magic) { name, JS_PROP_CONFIGURABLE|JS_PROP_ENUMERABLE, JS_DEF_CGETSET_MAGIC, magic, .u = { .getset = { .get = { .getter_magic = fgetter }, .set = { .setter_magic = fsetter } } } }
 
 
 static JSClassID bitstream_class_id = 0;
 static JSClassID sha1_class_id = 0;
 static JSClassID file_class_id = 0;
+static JSClassID fileio_class_id = 0;
+static JSClassID amix_class_id = 0;
 
 typedef struct
 {
@@ -85,101 +357,101 @@
 static JSValue js_bs_get_u8(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_bs_read_u8(bs) );
 }
 static JSValue js_bs_get_s8(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s8 v;
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	v = (s8) gf_bs_read_u8(bs);
 	return JS_NewInt32(ctx, v );
 }
 static JSValue js_bs_get_u16(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_bs_read_u16(bs) );
 }
 static JSValue js_bs_get_u16_le(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_bs_read_u16_le(bs) );
 }
 static JSValue js_bs_get_s16(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s16 v;
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	v = (s16) gf_bs_read_u16(bs);
 	return JS_NewInt32(ctx, v );
 }
 static JSValue js_bs_get_u24(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_bs_read_u24(bs) );
 }
 static JSValue js_bs_get_s32(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s32 v;
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	v = (s32) gf_bs_read_u32(bs);
 	return JS_NewInt32(ctx, v);
 }
 static JSValue js_bs_get_u32(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_bs_read_u32(bs) );
 }
 static JSValue js_bs_get_u32_le(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_bs_read_u32_le(bs) );
 }
 static JSValue js_bs_get_u64(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt64(ctx, gf_bs_read_u64(bs) );
 }
 static JSValue js_bs_get_u64_le(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt64(ctx, gf_bs_read_u64_le(bs) );
 }
 static JSValue js_bs_get_s64(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s64 v;
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	v = (s64) gf_bs_read_u64(bs);
 	return JS_NewInt64(ctx, v );
 }
 static JSValue js_bs_get_float(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewFloat64(ctx, gf_bs_read_float(bs) );
 }
 static JSValue js_bs_get_double(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	return JS_NewFloat64(ctx, gf_bs_read_double(bs) );
 }
 static JSValue js_bs_get_bits(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s32 nb_bits;
 	GET_JSBS
-	if (!bs || !argc) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &nb_bits, argv[0])) return JS_EXCEPTION;
+	if (!bs || !argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &nb_bits, argv[0])) return GF_JS_EXCEPTION(ctx);
 	if (nb_bits<=32)
 		return JS_NewInt32(ctx, gf_bs_read_int(bs, nb_bits) );
 	return JS_NewInt64(ctx, gf_bs_read_long_int(bs, nb_bits) );
@@ -192,20 +464,20 @@
 	size_t data_size;
 	u8 *data=NULL;
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
-	if (argc<1) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
+	if (argc<1) return GF_JS_EXCEPTION(ctx);
 
 	if (JS_IsObject(argv[0])) {
 		data = JS_GetArrayBuffer(ctx, &data_size, argv[0]);
 		if (argc>1) {
-			if (JS_ToInt32(ctx, &nb_bytes, argv[1])) return JS_EXCEPTION;
+			if (JS_ToInt32(ctx, &nb_bytes, argv[1])) return GF_JS_EXCEPTION(ctx);
 			if ((mode==2) && (argc>2)) {
-				if (JS_ToInt64(ctx, &offset, argv[2])) return JS_EXCEPTION;
+				if (JS_ToInt64(ctx, &offset, argv[2])) return GF_JS_EXCEPTION(ctx);
 
 			}
 		}
 	}
-	if (!data) return JS_EXCEPTION;
+	if (!data) return GF_JS_EXCEPTION(ctx);
 
 	if (nb_bytes> (s32) data_size) nb_bytes = (s32) data_size;
 	else if (!nb_bytes) nb_bytes = (s32) data_size;
@@ -230,43 +502,43 @@
 {
 	s32 nb_bytes;
 	GET_JSBS
-	if (!bs || !argc) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &nb_bytes, argv[0])) return JS_EXCEPTION;
+	if (!bs || !argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &nb_bytes, argv[0])) return GF_JS_EXCEPTION(ctx);
 	gf_bs_skip_bytes(bs, nb_bytes);
 	return JS_UNDEFINED;
 }
 static JSValue js_bs_is_align(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	if (gf_bs_is_align(bs)) return JS_TRUE;
 	return JS_FALSE;
 }
 static JSValue js_bs_align(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	gf_bs_align(bs);
 	return JS_UNDEFINED;
 }
 static JSValue js_bs_truncate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	gf_bs_truncate(bs);
 	return JS_UNDEFINED;
 }
 static JSValue js_bs_flush(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	gf_bs_flush(bs);
 	return JS_UNDEFINED;
 }
 static JSValue js_bs_epb_mode(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GET_JSBS
-	if (!bs || !argc) return JS_EXCEPTION;
+	if (!bs || !argc) return GF_JS_EXCEPTION(ctx);
 	gf_bs_enable_emulation_byte_removal(bs, (JS_ToBool(ctx, argv[0])) ? GF_TRUE : GF_FALSE);
 	return JS_UNDEFINED;
 }
@@ -276,10 +548,10 @@
 	u64 byte_offset=0;
 	s32 nb_bits;
 	GET_JSBS
-	if (!bs || !argc) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &nb_bits, argv[0])) return JS_EXCEPTION;
+	if (!bs || !argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &nb_bits, argv[0])) return GF_JS_EXCEPTION(ctx);
 	if (argc>1) {
-		if (JS_ToInt64(ctx, &byte_offset, argv[1])) return JS_EXCEPTION;
+		if (JS_ToInt64(ctx, &byte_offset, argv[1])) return GF_JS_EXCEPTION(ctx);
 	}
 	return JS_NewInt32(ctx, gf_bs_peek_bits(bs, nb_bits, byte_offset));
 }
@@ -288,8 +560,8 @@
 {
 	s64 val;
 	GET_JSBS
-	if (!bs || !argc) return JS_EXCEPTION;
-	if (JS_ToInt64(ctx, &val, argv[0])) return JS_EXCEPTION;
+	if (!bs || !argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt64(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
 	switch (mode) {
 	case 0: gf_bs_write_u8(bs, (u32) val); break;
 	case 1: gf_bs_write_u8(bs, (u32) val); break;
@@ -359,9 +631,9 @@
 	s64 val;
 	s32 nb_bits;
 	GET_JSBS
-	if (!bs || (argc!=2)) return JS_EXCEPTION;
-	if (JS_ToInt64(ctx, &val, argv[0])) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &nb_bits, argv[1])) return JS_EXCEPTION;
+	if (!bs || (argc!=2)) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt64(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &nb_bits, argv[1])) return GF_JS_EXCEPTION(ctx);
 	if (nb_bits<=32)
 		gf_bs_write_int(bs, (u32) val, nb_bits);
 	else
@@ -372,8 +644,8 @@
 {
 	Double val;
 	GET_JSBS
-	if (!bs || (argc!=1)) return JS_EXCEPTION;
-	if (JS_ToFloat64(ctx, &val, argv[0])) return JS_EXCEPTION;
+	if (!bs || (argc!=1)) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToFloat64(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
 	gf_bs_write_float(bs, (Float) val);
 	return JS_UNDEFINED;
 }
@@ -381,8 +653,8 @@
 {
 	Double val;
 	GET_JSBS
-	if (!bs || (argc!=1)) return JS_EXCEPTION;
-	if (JS_ToFloat64(ctx, &val, argv[0])) return JS_EXCEPTION;
+	if (!bs || (argc!=1)) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToFloat64(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
 	gf_bs_write_double(bs, val);
 	return JS_UNDEFINED;
 }
@@ -401,7 +673,7 @@
 	u32 size;
 	JSValue res;
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	gf_bs_get_content(bs, &data, &size);
 
 	if (data) {
@@ -418,10 +690,10 @@
 	GF_Err e;
 	JSBitstream *jssrcbs;
 	GET_JSBS
-	if (!bs || !argc) return JS_EXCEPTION;
+	if (!bs || !argc) return GF_JS_EXCEPTION(ctx);
 
 	jssrcbs = JS_GetOpaque(argv[0], bitstream_class_id);
-	if (!jssrcbs || !jssrcbs->bs) return JS_EXCEPTION;
+	if (!jssrcbs || !jssrcbs->bs) return GF_JS_EXCEPTION(ctx);
 	if (argc>1) {
 		keep_src = JS_ToBool(ctx, argv[1]);
 	}
@@ -444,7 +716,7 @@
 static JSValue js_bs_prop_get(JSContext *ctx, JSValueConst this_val, int magic)
 {
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 	switch (magic) {
 	case JS_BS_POS:
 		return JS_NewInt64(ctx, gf_bs_get_position(bs));
@@ -468,11 +740,11 @@
 {
 	s64 ival;
 	GET_JSBS
-	if (!bs) return JS_EXCEPTION;
+	if (!bs) return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case JS_BS_POS:
-		if (JS_ToInt64(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt64(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_bs_seek(bs, ival);
 		break;
 	}
@@ -554,7 +826,7 @@
 			size_t data_size;
 
 			data = JS_GetArrayBuffer(ctx, &data_size, argv[0]);
-			if (!data) return JS_EXCEPTION;
+			if (!data) return GF_JS_EXCEPTION(ctx);
 			if ((argc>1) && JS_ToBool(ctx, argv[1])) {
 				bs = gf_bs_new(data, data_size, GF_BITSTREAM_WRITE);
 			} else {
@@ -562,7 +834,7 @@
 			}
 		}
 	} else {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	}
 	GF_SAFEALLOC(jbs, JSBitstream);
 	if (!jbs) {
@@ -728,7 +1000,11 @@
 	case JS_SYS_OLD_ARCH:
 		return JS_NewBool(ctx, gf_sys_old_arch_compat() );
 	case JS_SYS_LOG_COLOR:
+#ifdef GPAC_DISABLE_LOG
+		return JS_NewBool(ctx, GF_FALSE );
+#else
 		return JS_NewBool(ctx, gf_log_use_color() );
+#endif
 	case JS_SYS_QUIET:
 		return JS_NewBool(ctx, gf_sys_is_quiet() );
 	case JS_SYS_USERNAME:
@@ -778,7 +1054,7 @@
 	const char *prop_val;
 	switch (magic) {
 	case JS_SYS_LAST_WORK_DIR:
-		if (!JS_IsString(value)) return JS_EXCEPTION;
+		if (!JS_IsString(value)) return GF_JS_EXCEPTION(ctx);
 		prop_val = JS_ToCString(ctx, value);
 		gf_opts_set_key("General", "LastWorkingDir", prop_val);
 		JS_FreeCString(ctx, prop_val);
@@ -791,10 +1067,10 @@
 {
 	u32 idx;
 	Bool used;
-	if (argc < 2) return JS_EXCEPTION;
+	if (argc < 2) return GF_JS_EXCEPTION(ctx);
 
 	if (JS_ToInt32(ctx, &idx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	used = JS_ToBool(ctx, argv[1]);
 
 	gf_sys_mark_arg_used(idx, used);
@@ -920,13 +1196,13 @@
 	}
 #endif
 
-	err = gf_enum_directory(url ? url : dir, 1, js_enum_dir_fct, &cbk, NULL);
-	if (err) return JS_EXCEPTION;
+	err = gf_enum_directory(url ? url : dir, 1, js_enum_dir_fct, &cbk, filter);
+	if (err) return GF_JS_EXCEPTION(ctx);
 
 	if (!dir_only) {
 		cbk.is_dir = 0;
 		err = gf_enum_directory(url ? url : dir, 0, js_enum_dir_fct, &cbk, filter);
-		if (err) return JS_EXCEPTION;
+		if (err) return GF_JS_EXCEPTION(ctx);
 	}
 
 	if (url) gf_free(url);
@@ -939,9 +1215,9 @@
 static JSValue js_sys_error_string(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_Err e;
-	if (argc < 1) return JS_EXCEPTION;
+	if (argc < 1) return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt32(ctx, (int32_t *) &e, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	return JS_NewString(ctx, gf_error_to_string(e) );
 }
 
@@ -981,7 +1257,7 @@
 static JSValue js_sys_prompt_echo_off(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	Bool echo_off;
-	if (!argc) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
 	echo_off = JS_ToBool(ctx, argv[0]);
 	if (argc<2)
 		gf_prompt_set_echo_off(echo_off);
@@ -990,8 +1266,8 @@
 static JSValue js_sys_prompt_code(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s32 code;
-	if (!argc) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &code, argv[0])) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &code, argv[0])) return GF_JS_EXCEPTION(ctx);
 
 	gf_sys_set_console_code(stderr, code);
 	return JS_UNDEFINED;
@@ -1008,6 +1284,36 @@
 	return res;
 }
 
+const char *gf_dom_get_friendly_name(u32 key_identifier);
+
+static JSValue js_sys_keyname(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+#ifndef GPAC_DISABLE_SVG
+	u32 code;
+	if (JS_ToInt32(ctx, &code, argv[0])) return GF_JS_EXCEPTION(ctx);
+	return JS_NewString(ctx, gf_dom_get_friendly_name(code));
+#else
+	return js_throw_err(ctx, GF_NOT_SUPPORTED);
+#endif
+}
+
+GF_EventType gf_dom_event_type_by_name(const char *name);
+
+static JSValue js_sys_evt_by_name(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+#ifndef GPAC_DISABLE_SVG
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	const char *name = JS_ToCString(ctx, argv[0]);
+	if (!name) return GF_JS_EXCEPTION(ctx);
+	JSValue res = JS_NewInt32(ctx, gf_dom_event_type_by_name(name));
+	JS_FreeCString(ctx, name);
+	return res;
+#else
+	return js_throw_err(ctx, GF_NOT_SUPPORTED);
+#endif
+
+}
+
 
 static JSValue js_sys_gc(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
@@ -1026,8 +1332,8 @@
 static JSValue js_sys_4cc_to_str(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	u64 val;
-	if (!argc) return JS_EXCEPTION;
-	if (JS_ToInt64(ctx, &val, argv[0])) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt64(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
 	return JS_NewString(ctx, gf_4cc_to_str((u32) val) );
 }
 
@@ -1053,9 +1359,9 @@
 static JSValue js_sys_getenv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	const char *str, *val;
-	if (!argc) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
 	str = JS_ToCString(ctx, argv[0]);
-	if (!str) return JS_EXCEPTION;
+	if (!str) return GF_JS_EXCEPTION(ctx);
 	val = getenv(str);
 	JS_FreeCString(ctx, str);
 	return val ? JS_NewString(ctx, val) : JS_NULL;
@@ -1068,33 +1374,117 @@
 	if (argc==1) {
 		u64 time;
 		const char *date = JS_ToCString(ctx, argv[0]);
-		if (!date) return JS_EXCEPTION;
+		if (!date) return GF_JS_EXCEPTION(ctx);
 		time = gf_net_parse_date(date);
 		JS_FreeCString(ctx, date);
 		return JS_NewInt64(ctx, time);
 	}
 
-	if (argc != 6) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &y, argv[0])) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &mo, argv[1])) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &d, argv[2])) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &h, argv[3])) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &m, argv[4])) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &s, argv[5])) return JS_EXCEPTION;
+	if (argc != 6) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &y, argv[0])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &mo, argv[1])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &d, argv[2])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &h, argv[3])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &m, argv[4])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &s, argv[5])) return GF_JS_EXCEPTION(ctx);
 
 	return JS_NewInt64(ctx, gf_net_get_utc_ts(y, mo, d, h, m, s) );
 }
 
+static JSValue js_sys_get_ntp(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 sec, frac;
+	gf_net_get_ntp(&sec, &frac);
+	JSValue ret = JS_NewObject(ctx);
+	if (JS_IsException(ret)) return ret;
+	JS_SetPropertyStr(ctx, ret, "n", JS_NewInt64(ctx, sec));
+	JS_SetPropertyStr(ctx, ret, "d", JS_NewInt64(ctx, frac));
+	return ret;
+}
+
+static JSValue js_sys_ntp_shift(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue v;
+	u64 sec, frac, shift;
+	s64 frac_usec;
+	if ((argc<2) || !JS_IsObject(argv[0]))
+		return GF_JS_EXCEPTION(ctx);
+
+	v = JS_GetPropertyStr(ctx, argv[0], "n");
+	if (JS_IsNull(v)) return GF_JS_EXCEPTION(ctx);
+	JS_ToInt64(ctx, &sec, v);
+	JS_FreeValue(ctx, v);
+
+	v = JS_GetPropertyStr(ctx, argv[0], "d");
+	if (JS_IsNull(v)) return GF_JS_EXCEPTION(ctx);
+	JS_ToInt64(ctx, &frac, v);
+	JS_FreeValue(ctx, v);
+
+	JS_ToInt64(ctx, &shift, argv[1]);
+	frac_usec = (s64) (frac * 1000000) / 0xFFFFFFFFULL;
+	frac_usec += shift;
+	while (frac_usec<0) {
+		frac_usec += 1000000;
+		sec -= 1;
+	}
+	while (frac_usec>1000000) {
+		frac_usec -= 1000000;
+		sec += 1;
+	}
+	frac = (frac_usec * 0xFFFFFFFFULL) / 1000000;
+	v = JS_NewObject(ctx);
+	if (JS_IsException(v)) return v;
+	JS_SetPropertyStr(ctx, v, "n", JS_NewInt64(ctx, sec));
+	JS_SetPropertyStr(ctx, v, "d", JS_NewInt64(ctx, frac));
+	return v;
+}
+
+
+static JSValue js_sys_sleep(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 sleep_for=0;
+	if (argc==1) {
+		if (JS_ToInt32(ctx, &sleep_for, argv[0]))
+			return GF_JS_EXCEPTION(ctx);
+	}
+	gf_sleep(sleep_for);
+	return JS_UNDEFINED;
+}
+
 
+static JSValue js_sys_exit(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 rval=0;
+	if (argc==2) {
+		return JS_UNDEFINED;
+	}
+	if (argc==1) {
+		if (JS_ToInt32(ctx, &rval, argv[0]))
+			return GF_JS_EXCEPTION(ctx);
+	}
+	exit(rval);
+	return JS_UNDEFINED;
+}
 static JSValue js_sys_crc32(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	const u8 *data;
 	size_t data_size;
 
-	if (!argc || !JS_IsObject(argv[0])) return JS_EXCEPTION;
-	data = JS_GetArrayBuffer(ctx, &data_size, argv[0] );
-	if (!data) return JS_EXCEPTION;
-	return JS_NewInt32(ctx, gf_crc_32(data, (u32) data_size) );
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_IsString(argv[0])) {
+		u32 crc=0;
+		const char *str = JS_ToCString(ctx, argv[0]);
+		if (str) {
+			crc = gf_crc_32(str, (u32) strlen(str) );
+			JS_FreeCString(ctx, str);
+		}
+		return JS_NewInt32(ctx, crc );
+	} else {
+		data = JS_GetArrayBuffer(ctx, &data_size, argv[0] );
+		if (!data) return GF_JS_EXCEPTION(ctx);
+		return JS_NewInt32(ctx, gf_crc_32(data, (u32) data_size) );
+	}
+	return GF_JS_EXCEPTION(ctx);
 }
 
 static JSValue js_sys_sha1(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
@@ -1103,21 +1493,21 @@
 	const u8 *data;
 	size_t data_size;
 
-	if (!argc) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
 	if (JS_IsString(argv[0])) {
 		const char *filename = JS_ToCString(ctx, argv[0]);
-		if (!filename) return JS_EXCEPTION;
+		if (!filename) return GF_JS_EXCEPTION(ctx);
 		gf_sha1_file(filename, csum);
 		JS_FreeCString(ctx, filename);
 		return JS_NewArrayBufferCopy(ctx, csum, GF_SHA1_DIGEST_SIZE);
 	} else if (JS_IsObject(argv[0])) {
 		data = JS_GetArrayBuffer(ctx, &data_size, argv[0] );
-		if (!data) return JS_EXCEPTION;
+		if (!data) return GF_JS_EXCEPTION(ctx);
 
 		gf_sha1_csum((u8 *) data, (u32) data_size, csum);
 		return JS_NewArrayBufferCopy(ctx, csum, GF_SHA1_DIGEST_SIZE);
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(ctx);
 }
 
 
@@ -1126,19 +1516,76 @@
 	const char *filename;
 	u8 *data;
 	u32 data_size;
+	Bool as_utf8 = GF_FALSE;
 	GF_Err e;
 	JSValue res;
-	if (!argc || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	if (!argc || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(ctx);
 	filename = JS_ToCString(ctx, argv[0]);
-	if (!filename) return JS_EXCEPTION;
+	if (!filename) return GF_JS_EXCEPTION(ctx);
+	if ((argc>1) && JS_ToBool(ctx, argv[1]))
+		as_utf8 = GF_TRUE;
 
 	e = gf_file_load_data(filename, &data, &data_size);
-	if (!data) res = js_throw_err_msg(ctx, e, "Failed to load file %s", filename);
-	else res = JS_NewArrayBuffer(ctx, data, data_size, js_gpac_free, NULL, 0);
+	if (e) {
+		res = js_throw_err_msg(ctx, e, "Failed to load file %s", filename);
+	} else if (as_utf8) {
+		if (!data || gf_utf8_is_legal(data, data_size)) {
+			res = JS_NewString(ctx, data ? (const char *) data : "");
+		} else {
+			res = js_throw_err_msg(ctx, GF_NON_COMPLIANT_BITSTREAM, "Invalid UTF8 data in file %s", filename);
+		}
+		if (data)
+			gf_free(data);
+	} else {
+		res = JS_NewArrayBuffer(ctx, data, data_size, js_gpac_free, NULL, 0);
+	}
 	JS_FreeCString(ctx, filename);
 	return res;
 }
 
+/* load and evaluate a file */
+static JSValue js_sys_load_script(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+ const char *filename;
+ u8 *data=NULL;
+ u32 data_size;
+ JSValue res;
+ GF_Err e;
+	char *full_url = NULL;
+
+	if (!argc || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(ctx);
+ filename = JS_ToCString(ctx, argv[0]);
+ if (!filename) return GF_JS_EXCEPTION(ctx);
+
+	if ((argc>1) && JS_ToBool(ctx, argv[1]) ) {
+		const char *par_url = jsf_get_script_filename(ctx);
+		full_url = gf_url_concatenate(par_url, filename);
+		JS_FreeCString(ctx, filename);
+		filename = full_url;
+	}
+
+	e = gf_file_load_data(filename, &data, &data_size);
+	if (e) {
+		res = js_throw_err_msg(ctx, e, "Failed to load file %s", filename);
+	} else if (data) {
+		if (!gf_utf8_is_legal(data, data_size)) {
+			res = js_throw_err_msg(ctx, e, "Script file %s is not UTF-8", filename);
+		} else {
+			res = JS_Eval(ctx, (char *)data, data_size, filename, JS_EVAL_TYPE_GLOBAL);
+		}
+	} else {
+		res = JS_UNDEFINED;
+	}
+ if (data) gf_free(data);
+
+ if (full_url)
+		gf_free(full_url);
+ else
+		JS_FreeCString(ctx, filename);
+ return res;
+}
+
+
 static JSValue js_sys_compress_ex(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, Bool is_decomp)
 {
 	const u8 *data;
@@ -1147,9 +1594,9 @@
 	u8 *out_ptr = NULL;
 	JSValue res;
 	GF_Err e;
-	if (!argc || !JS_IsObject(argv[0])) return JS_EXCEPTION;
+	if (!argc || !JS_IsObject(argv[0])) return GF_JS_EXCEPTION(ctx);
 	data = JS_GetArrayBuffer(ctx, &data_size, argv[0] );
-	if (!data) return JS_EXCEPTION;
+	if (!data) return GF_JS_EXCEPTION(ctx);
 	if (is_decomp) {
 		e = gf_gz_decompress_payload((u8*) data, (u32) data_size, &out_ptr, &out_size);
 	} else {
@@ -1169,6 +1616,75 @@
 	return js_sys_compress_ex(ctx, this_val, argc, argv, GF_TRUE);
 }
 
+static JSValue js_sys_url_cat(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *parent;
+	const char *src;
+	char *url;
+	JSValue res;
+	if (argc<2) return GF_JS_EXCEPTION(ctx);
+	parent = JS_ToCString(ctx, argv[0]);
+	src = JS_ToCString(ctx, argv[1]);
+	url = gf_url_concatenate(parent, src);
+	if (url) {
+		res = JS_NewString(ctx, url);
+		gf_free(url);
+	} else {
+		res = JS_NewString(ctx, src);
+	}
+	JS_FreeCString(ctx, parent);
+	JS_FreeCString(ctx, src);
+	return res;
+}
+
+
+static JSValue js_sys_rect_union_ex(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, Bool is_inter)
+{
+	GF_Rect rc1, rc2;
+	Double fval;
+	JSValue v;
+	int res;
+	if (argc<2) return GF_JS_EXCEPTION(ctx);
+
+#define GET_PROP(_obj, _n, _f)\
+	_f = 0;\
+	v = JS_GetPropertyStr(ctx, _obj, _n);\
+	res = JS_ToFloat64(ctx, &fval, v);\
+	if (!res) _f = FLT2FIX(fval);\
+	JS_FreeValue(ctx, v);\
+
+	GET_PROP(argv[0], "x", rc1.x)
+	GET_PROP(argv[0], "y", rc1.y)
+	GET_PROP(argv[0], "w", rc1.width)
+	GET_PROP(argv[0], "h", rc1.height)
+	GET_PROP(argv[1], "x", rc2.x)
+	GET_PROP(argv[1], "y", rc2.y)
+	GET_PROP(argv[1], "w", rc2.width)
+	GET_PROP(argv[1], "h", rc2.height)
+
+#undef GET_PROP
+
+	if (is_inter) {
+		gf_rect_intersect(&rc1, &rc2);
+	} else {
+		gf_rect_union(&rc1, &rc2);
+	}
+	v = JS_NewObject(ctx);
+	JS_SetPropertyStr(ctx, v, "x", JS_NewFloat64(ctx, FIX2FLT(rc1.x) ));
+	JS_SetPropertyStr(ctx, v, "y", JS_NewFloat64(ctx, FIX2FLT(rc1.y) ));
+	JS_SetPropertyStr(ctx, v, "w", JS_NewFloat64(ctx, FIX2FLT(rc1.width) ));
+	JS_SetPropertyStr(ctx, v, "h", JS_NewFloat64(ctx, FIX2FLT(rc1.height) ));
+	return v;
+}
+static JSValue js_sys_rect_union(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return js_sys_rect_union_ex(ctx, this_val, argc, argv, GF_FALSE);
+}
+static JSValue js_sys_rect_intersect(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return js_sys_rect_union_ex(ctx, this_val, argc, argv, GF_TRUE);
+}
+
 enum
 {
 	OPT_RMDIR,
@@ -1189,9 +1705,9 @@
 	char *ext;
 	GF_Err e;
 	JSValue res;
-	if (!argc || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	if (!argc || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(ctx);
 	dirname = JS_ToCString(ctx, argv[0]);
-	if (!dirname) return JS_EXCEPTION;
+	if (!dirname) return GF_JS_EXCEPTION(ctx);
 
 	res = JS_UNDEFINED;
 	switch (file_opt) {
@@ -1207,7 +1723,7 @@
 		res = JS_NewBool(ctx, gf_dir_exists(dirname) );
 		break;
 	case OPT_DIRCLEAN:
-		e = gf_cleanup_dir(dirname);
+		e = gf_dir_cleanup(dirname);
 		if (e) res = js_throw_err_msg(ctx, e, "Failed to clean dir %s", dirname);
 		break;
 	case OPT_FILEBASENAME:
@@ -1288,15 +1804,15 @@
 {
 	const char *sec, *key, *val;
 	JSValue res;
-	if (argc!=2) return JS_EXCEPTION;
+	if (argc!=2) return GF_JS_EXCEPTION(ctx);
 	sec = JS_ToCString(ctx, argv[0]);
-	if (!sec) return JS_EXCEPTION;
+	if (!sec) return GF_JS_EXCEPTION(ctx);
 	key = JS_ToCString(ctx, argv[1]);
 	if (!key) {
 		JS_FreeCString(ctx, sec);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	}
-	val = gf_opts_get_key_restricted(sec, key);
+	val = gf_opts_get_key(sec, key);
 	res = val ? JS_NewString(ctx, val) : JS_NULL;
 	JS_FreeCString(ctx, sec);
 	JS_FreeCString(ctx, key);
@@ -1306,13 +1822,13 @@
 static JSValue js_sys_set_opt(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	const char *sec, *key, *val;
-	if (argc<2) return JS_EXCEPTION;
+	if (argc<2) return GF_JS_EXCEPTION(ctx);
 	sec = JS_ToCString(ctx, argv[0]);
-	if (!sec) return JS_EXCEPTION;
+	if (!sec) return GF_JS_EXCEPTION(ctx);
 	key = JS_ToCString(ctx, argv[1]);
 	if (!key) {
 		JS_FreeCString(ctx, sec);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	}
 	val = NULL;
 	if (argc>2)
@@ -1338,12 +1854,12 @@
 	u8 *out_ptr = NULL;
 	JSValue res;
 	GF_Err e;
-	if (!argc) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
 
 	if (is_dec) {
 		u32 len;
 		const char *str = JS_ToCString(ctx, argv[0]);
-		if (!str) return JS_EXCEPTION;
+		if (!str) return GF_JS_EXCEPTION(ctx);
 		len = (u32) strlen(str);
 		out_ptr = gf_malloc(sizeof(u8) * len);
 		if (!out_ptr) {
@@ -1360,7 +1876,7 @@
 		const u8 *data;
 		size_t data_size;
 		data = JS_GetArrayBuffer(ctx, &data_size, argv[0] );
-		if (!data) return JS_EXCEPTION;
+		if (!data) return GF_JS_EXCEPTION(ctx);
 		out_ptr = gf_malloc(sizeof(u8) * (1 + data_size * 2) );
 		if (!out_ptr) {
 			e = GF_OUT_OF_MEM;
@@ -1402,32 +1918,509 @@
 static JSValue js_sys_ntohl(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s64 val;
-	if (!argc) return JS_EXCEPTION;
-	if (JS_ToInt64(ctx, &val, argv[0])) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt64(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_ntohl((u32) val));
 }
 static JSValue js_sys_ntohs(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s64 val;
-	if (!argc) return JS_EXCEPTION;
-	if (JS_ToInt64(ctx, &val, argv[0])) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt64(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_ntohs((u16) val));
 }
 static JSValue js_sys_htonl(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s64 val;
-	if (!argc) return JS_EXCEPTION;
-	if (JS_ToInt64(ctx, &val, argv[0])) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt64(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_htonl((u32) val));
 }
 static JSValue js_sys_htons(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	s64 val;
-	if (!argc) return JS_EXCEPTION;
-	if (JS_ToInt64(ctx, &val, argv[0])) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt64(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
 	return JS_NewInt32(ctx, gf_htons((u16) val));
 }
 
+GF_Err jsf_ToProp_ex(GF_Filter *filter, JSContext *ctx, JSValue value, u32 p4cc, GF_PropertyValue *prop, u32 prop_type);
+
+static JSValue js_pixfmt_size(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 w, h, osize;
+	GF_PropertyValue prop;
+	if (argc<3) return GF_JS_EXCEPTION(ctx);
+	GF_Err e = jsf_ToProp_ex(NULL, ctx, argv[0], 0, &prop, GF_PROP_PIXFMT);
+	if (e) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &w, argv[1])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &h, argv[2])) return GF_JS_EXCEPTION(ctx);
+
+	if (!gf_pixel_get_size_info(prop.value.uint, w, h, &osize, NULL, NULL, NULL, NULL))
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Unknown pixel format %d\n", prop.value.uint);
+	return JS_NewInt32(ctx, osize);
+}
+
+static JSValue js_pixfmt_transparent(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_PropertyValue prop;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	GF_Err e = jsf_ToProp_ex(NULL, ctx, argv[0], 0, &prop, GF_PROP_PIXFMT);
+	if (e) return GF_JS_EXCEPTION(ctx);
+
+	return JS_NewBool(ctx, 	gf_pixel_fmt_is_transparent(prop.value.uint) );
+}
+
+static JSValue js_pixfmt_yuv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_PropertyValue prop;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+	GF_Err e = jsf_ToProp_ex(NULL, ctx, argv[0], 0, &prop, GF_PROP_PIXFMT);
+	if (e) return GF_JS_EXCEPTION(ctx);
+
+	return JS_NewBool(ctx, gf_pixel_fmt_is_yuv(prop.value.uint) );
+}
+
+static JSValue js_pcmfmt_depth(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_PropertyValue prop;
+	if (argc!=1) return GF_JS_EXCEPTION(ctx);
+	GF_Err e = jsf_ToProp_ex(NULL, ctx, argv[0], 0, &prop, GF_PROP_PCMFMT);
+	if (e) return GF_JS_EXCEPTION(ctx);
+	return JS_NewInt32(ctx, gf_audio_fmt_bit_depth(prop.value.uint)/8 );
+}
+
+#include <gpac/color.h>
+
+static JSValue js_color_lerp(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *str;
+	u32 col1, col2;
+	char szCol[12];
+	Double interp, minterp, a1, r1, g1, b1, a2, r2, g2, b2;
+	u8 r, g, b, a;
+
+	if (argc!=3)
+		return GF_JS_EXCEPTION(ctx);
+	if (JS_ToFloat64(ctx, &interp, argv[0]))
+		return GF_JS_EXCEPTION(ctx);
+
+	if (interp<0) interp=0;
+	else if (interp>1) interp=1;
+	minterp = 1-interp;
+
+	str = JS_ToCString(ctx, argv[1]);
+	if (!str) return GF_JS_EXCEPTION(ctx);
+	col1 = gf_color_parse(str);
+	JS_FreeCString(ctx, str);
+
+	str = JS_ToCString(ctx, argv[2]);
+	if (!str) return GF_JS_EXCEPTION(ctx);
+	col2 = gf_color_parse(str);
+	JS_FreeCString(ctx, str);
+
+	a1 = GF_COL_A(col1) / 255.0;
+	a2 = GF_COL_A(col2) / 255.0;
+	r1 = GF_COL_R(col1) / 255.0;
+	r2 = GF_COL_R(col2) / 255.0;
+	g1 = GF_COL_G(col1) / 255.0;
+	g2 = GF_COL_G(col2) / 255.0;
+	b1 = GF_COL_B(col1) / 255.0;
+	b2 = GF_COL_B(col2) / 255.0;
+
+	a = (u8) ((a1 * minterp + a2 * interp) * 255);
+	r = (u8) ((r1 * minterp + r2 * interp) * 255);
+	g = (u8) ((g1 * minterp + g2 * interp) * 255);
+	b = (u8) ((b1 * minterp + b2 * interp) * 255);
+
+	if (!a && !r && !g && !b)
+		return JS_NewString(ctx, "none");
+
+	sprintf(szCol, "0x%02X%02X%02X%02X", a, r, g, b);
+	return JS_NewString(ctx, szCol);
+}
+
+static JSValue js_color_get_component(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *str;
+	u32 comp_idx, color;
+	Double comp;
+	if (argc!=2)
+		return GF_JS_EXCEPTION(ctx);
+
+	str = JS_ToCString(ctx, argv[0]);
+	if (!str) return GF_JS_EXCEPTION(ctx);
+	color = gf_color_parse(str);
+	JS_FreeCString(ctx, str);
+
+	if (JS_ToInt32(ctx, &comp_idx, argv[1]))
+		return GF_JS_EXCEPTION(ctx);
+
+	switch (comp_idx) {
+	case 0: comp = GF_COL_A(color); break;
+	case 1: comp = GF_COL_R(color); break;
+	case 2: comp = GF_COL_G(color); break;
+	case 3: comp = GF_COL_B(color); break;
+	default: return GF_JS_EXCEPTION(ctx);
+	}
+	comp /= 255.0;
+	return JS_NewFloat64(ctx, comp);
+}
+
+typedef struct
+{
+	u64 last_sample_time, frame_ts;
+	u32 samples_used, consumed, nb_samples, channels;
+	u32 fade;
+	JSValue jspid;
+	Double volume;
+	u8 *data;
+	size_t data_size;
+} PidMix;
+
+typedef struct
+{
+	u32 channels, samples_gap, fade_len;
+	Double *chan_buf;
+	u32 max_pid_channels;
+	Double *in_chan_buf;
+	u32 nb_inputs;
+	PidMix *inputs;
+
+	u32 sample_size;
+	Double (*get_sample)(u8 *data);
+	void (*set_sample)(u8 *data, Double val);
+} AMixCtx;
+
+static JSValue js_audio_mix(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 nb_samples, i, j, k, nb_src, fade_length=0;
+	u64 audio_time;
+	JSValue v;
+	s32 res;
+	size_t ab_size;
+	u8 *mix_ab;
+	u32 max_chan = 0;
+	PidMix *pids;
+	AMixCtx *mix = JS_GetOpaque(this_val, amix_class_id);
+	if (!mix) return GF_JS_EXCEPTION(ctx);
+
+	if (argc != 3) return GF_JS_EXCEPTION(ctx);
+
+	if (JS_ToInt64(ctx, &audio_time, argv[0])) return GF_JS_EXCEPTION(ctx);
+	mix_ab = JS_GetArrayBuffer(ctx, &ab_size, argv[1]);
+	if (!mix_ab) return GF_JS_EXCEPTION(ctx);
+	nb_samples = (u32) (ab_size / mix->channels / mix->sample_size);
+
+	v = JS_GetPropertyStr(ctx, argv[2], "length");
+	if (JS_IsException(v)) return GF_JS_EXCEPTION(ctx);
+
+	if (JS_ToInt32(ctx, &nb_src, v)) {
+		JS_FreeValue(ctx, v);
+		return GF_JS_EXCEPTION(ctx);
+	}
+	JS_FreeValue(ctx, v);
+
+	if (mix->nb_inputs < nb_src) {
+		mix->inputs = gf_realloc(mix->inputs, sizeof(PidMix) * nb_src);
+		if (!mix->inputs) return js_throw_err(ctx, GF_OUT_OF_MEM);
+		mix->nb_inputs = nb_src;
+	}
+	pids = mix->inputs;
+
+	//update current input states
+	for (i=0; i<nb_src; i++) {
+		PidMix *pid = &pids[i];
+		pid->jspid = JS_GetPropertyUint32(ctx, argv[2], i);
+
+		v = JS_GetPropertyStr(ctx, pid->jspid, "last_sample_time");
+		res = JS_ToInt64(ctx, &pid->last_sample_time, v);
+		JS_FreeValue(ctx, v);
+		//assume first sample if not set
+		if (res) pid->last_sample_time = 0;
+
+		v = JS_GetPropertyStr(ctx, pid->jspid, "frame_ts");
+		res = JS_ToInt64(ctx, &pid->frame_ts, v);
+		JS_FreeValue(ctx, v);
+		//we must have a frame timestamp in audio timescale
+		if (res) return GF_JS_EXCEPTION(ctx);
+
+		v = JS_GetPropertyStr(ctx, pid->jspid, "samples_used");
+		res = JS_ToInt32(ctx, &pid->samples_used, v);
+		JS_FreeValue(ctx, v);
+		//if not set, assume first sample
+		if (res) pid->samples_used = 0;
+
+		v = JS_GetPropertyStr(ctx, pid->jspid, "channels");
+		res = JS_ToInt32(ctx, &pid->channels, v);
+		JS_FreeValue(ctx, v);
+		//we must have the number of channels for this source
+		if (res || !pid->channels) return GF_JS_EXCEPTION(ctx);
+
+		//we must have the audio data
+		v = JS_GetPropertyStr(ctx, pid->jspid, "data");
+		pid->data = JS_GetArrayBuffer(ctx, &pid->data_size, v);
+		JS_FreeValue(ctx, v);
+
+		v = JS_GetPropertyStr(ctx, pid->jspid, "nb_samples");
+		res = JS_ToInt32(ctx, &pid->nb_samples, v);
+		JS_FreeValue(ctx, v);
+		//if not set, derive from data size
+		if (res) {
+			pid->nb_samples = (u32) (pid->data_size / pid->channels / mix->sample_size);
+		}
+		v = JS_GetPropertyStr(ctx, pid->jspid, "fade");
+		res = JS_ToInt32(ctx, &pid->fade, v);
+		JS_FreeValue(ctx, v);
+		if (res) pid->fade = 0;
+		if (pid->fade) fade_length++;
+
+		v = JS_GetPropertyStr(ctx, pid->jspid, "volume");
+		res = JS_ToFloat64(ctx, &pid->volume, v);
+		JS_FreeValue(ctx, v);
+		if (res) pid->volume = 1.0;
+
+		if (pid->channels>max_chan)
+			max_chan = pid->channels;
+
+		pid->consumed = 0;
+	}
+	if (max_chan > mix->max_pid_channels) {
+		mix->in_chan_buf = gf_realloc(mix->in_chan_buf, sizeof(Double) * max_chan);
+		if (!mix->in_chan_buf) return js_throw_err(ctx, GF_OUT_OF_MEM);
+		mix->max_pid_channels = max_chan;
+	}
+	if (fade_length) {
+		fade_length = MIN(mix->fade_len, nb_samples);
+	}
+
+	for (i=0; i<nb_samples; i++) {
+		u32 active=0;
+		memset(mix->chan_buf, 0, sizeof(Double) * mix->channels);
+
+		for (j=0; j<nb_src; j++) {
+			PidMix *pid = &pids[j];
+
+			//for the time being, as soon as we start writing audio we no longer check sync
+			if (!pid->last_sample_time) {
+				if (pid->frame_ts + pid->samples_used > audio_time + i) {
+					continue;
+				}
+				pid->last_sample_time = 1; //pid.frame_ts + pid.sample_used;
+				JS_SetPropertyStr(ctx, pid->jspid, "last_sample_time", JS_NewInt64(ctx, pid->last_sample_time) );
+			} else {
+				//audio discontinuity
+				if (pid->frame_ts + pid->samples_used > audio_time + i + mix->samples_gap) {
+					continue;
+				}
+			}
+
+			u32 s_pos = pid->samples_used + pid->consumed;
+			if (s_pos >= pid->nb_samples) {
+				assert(0);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[AVMix] error mixing\n"));
+			}
+			u32 pos = s_pos * pid->channels;
+			u8 *buf = pid->data + mix->sample_size * pos;
+			for (k=0; k<pid->channels; k++) {
+				mix->in_chan_buf[k] = mix->get_sample(buf);
+				buf += mix->sample_size;
+			}
+
+			active += 1;
+
+			Double fade_scale = 1;
+			if (pid->fade) {
+				//fade from 0 to 1 starting at pos=0 up to fade_length
+				if (pid->fade==1) {
+					if (s_pos<fade_length) {
+						fade_scale = s_pos/fade_length;
+					} else {
+						pid->fade = 0;
+						JS_SetPropertyStr(ctx, pid->jspid, "fade", JS_NewInt32(ctx, pid->fade) );
+					}
+				}
+				//fade from 1 to 0 starting at pos=nb_samples-fade_length up to nb_samples
+				else if (pid->fade==2) {
+					if (s_pos>nb_samples-fade_length ) {
+						fade_scale = (nb_samples - s_pos)/fade_length;
+					}
+				}
+			}
+			fade_scale *= pid->volume;
+
+			//todo , proper down/up mix ...
+			for (k=0; k<mix->channels; k++) {
+				Double s_val;
+				if (pid->channels < k )
+					s_val = mix->in_chan_buf[0];
+				else
+				s_val = mix->in_chan_buf[k];
+
+				mix->chan_buf[k] += s_val * fade_scale;
+			}
+			pid->consumed ++;
+		}
+
+		u8 *dst = mix_ab + mix->sample_size * (i * mix->channels);
+		for (j=0; j< mix->channels; j++) {
+			Double sval = active ? (mix->chan_buf[j] / active) : 0;
+			mix->set_sample(dst, sval);
+			dst += mix->sample_size;
+		}
+	}
+
+	//update pid values
+	for (i=0; i<nb_src; i++) {
+		PidMix *pid = &pids[i];
+		pid->samples_used += pid->consumed;
+		JS_SetPropertyStr(ctx, pid->jspid, "samples_used", JS_NewInt32(ctx, pid->samples_used));
+
+		JS_FreeValue(ctx, pid->jspid);
+	}
+	return JS_UNDEFINED;
+}
+
+static Double amix_get_s16(u8 *data)
+{
+	u16 val = data[1];
+	val <<= 8;
+	val |= data[0];
+	return ((Double) (s16) val) / 65535;
+
+}
+static void amix_set_s16(u8 *data, Double val)
+{
+	val *= 65535;
+	u16 res = (u16) val;
+	data[0] = res & 0xFF;
+	data[1] = (res>>8) & 0xFF;
+}
+static Double amix_get_s32(u8 *data)
+{
+	u32 val = data[3];
+	val <<= 8;
+	val |= data[2];
+	val <<= 8;
+	val |= data[1];
+	val <<= 8;
+	val |= data[0];
+	return ((Double) (s32) val) / 0xFFFFFFFF;
+
+}
+static void amix_set_s32(u8 *data, Double val)
+{
+	val *= 0xFFFFFFFF;
+	u32 res = (u32) val;
+	data[0] = res & 0xFF;
+	data[1] = (res>>8) & 0xFF;
+	data[2] = (res>>16) & 0xFF;
+	data[3] = (res>>24) & 0xFF;
+}
+static Double amix_get_flt(u8 *data)
+{
+	return (Double) *(Float *)data;
+}
+static void amix_set_flt(u8 *data, Double val)
+{
+	*(Float *)data = (Float) val;
+}
+static Double amix_get_dbl(u8 *data)
+{
+	return *(Double *)data;
+}
+static void amix_set_dbl(u8 *data, Double val)
+{
+	*(Double *)data = val;
+}
+
+
+static void js_amix_finalize(JSRuntime *rt, JSValue obj)
+{
+	AMixCtx *mix = JS_GetOpaque(obj, amix_class_id);
+	if (!mix) return;
+
+	if (mix->chan_buf) gf_free(mix->chan_buf);
+	if (mix->inputs) gf_free(mix->inputs);
+	if (mix->in_chan_buf) gf_free(mix->in_chan_buf);
+	gf_free(mix);
+}
+
+JSClassDef amixClass = {
+ "FILE",
+ .finalizer = js_amix_finalize,
+};
+
+static const JSCFunctionListEntry amix_funcs[] = {
+	JS_CFUNC_DEF("mix", 0, js_audio_mix),
+};
+
+static JSValue amix_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	u32 a_fmt=0;
+	u32 channels, samples_gap, fade_len;
+	AMixCtx *mix;
+	JSValue anobj;
+
+	if (argc != 4) return js_throw_err(ctx, GF_BAD_PARAM);
+
+	const char *fmt = JS_ToCString(ctx, argv[0]);
+	if (!fmt) return GF_JS_EXCEPTION(ctx);
+	//we only support these formats for the time being, all in packed mode
+	if (!strcmp(fmt, "s16")) a_fmt = 1;
+	else if (!strcmp(fmt, "s32")) a_fmt = 2;
+	else if (!strcmp(fmt, "flt")) a_fmt = 3;
+	else if (!strcmp(fmt, "dbl")) a_fmt = 4;
+	JS_FreeCString(ctx, fmt);
+	if (!a_fmt) return GF_JS_EXCEPTION(ctx);
+
+	if (JS_ToInt32(ctx, &channels, argv[1])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &samples_gap, argv[2])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &fade_len, argv[3])) return GF_JS_EXCEPTION(ctx);
+	if (!channels) return js_throw_err(ctx, GF_BAD_PARAM);
+
+	GF_SAFEALLOC(mix, AMixCtx);
+	mix->channels = channels;
+	mix->samples_gap = samples_gap;
+	mix->fade_len = fade_len;
+	mix->chan_buf = gf_malloc(sizeof(Double) * channels);
+	if (!mix->chan_buf) {
+		gf_free(mix);
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
+
+	switch (a_fmt) {
+	case 1:
+		mix->sample_size = 2;
+		mix->get_sample = amix_get_s16;
+		mix->set_sample = amix_set_s16;
+		break;
+	case 2:
+		mix->sample_size = 4;
+		mix->get_sample = amix_get_s32;
+		mix->set_sample = amix_set_s32;
+		break;
+	case 3:
+		mix->sample_size = 4;
+		mix->get_sample = amix_get_flt;
+		mix->set_sample = amix_set_flt;
+		break;
+	case 4:
+		mix->sample_size = 8;
+		mix->get_sample = amix_get_dbl;
+		mix->set_sample = amix_set_dbl;
+		break;
+	}
+
+	anobj = JS_NewObjectClass(ctx, amix_class_id);
+	if (JS_IsException(anobj)) {
+		gf_free(mix);
+		return anobj;
+	}
+	JS_SetOpaque(anobj, mix);
+	return anobj;
+}
+
 static const JSCFunctionListEntry sys_funcs[] = {
 JS_CGETSET_MAGIC_DEF_ENUM("nb_cores", js_sys_prop_get, NULL, JS_SYS_NB_CORES),
 JS_CGETSET_MAGIC_DEF_ENUM("sampling_period_duration", js_sys_prop_get, NULL, JS_SYS_SAMPLE_DUR),
@@ -1478,20 +2471,28 @@
 JS_CFUNC_DEF("prompt_code", 0, js_sys_prompt_code),
 JS_CFUNC_DEF("prompt_size", 0, js_sys_prompt_size),
 
+ JS_CFUNC_DEF("keyname", 0, js_sys_keyname),
+ JS_CFUNC_DEF("get_event_type", 0, js_sys_evt_by_name),
 JS_CFUNC_DEF("gc", 0, js_sys_gc),
 
 	JS_CFUNC_DEF("enum_directory", 0, js_sys_enum_directory),
 	JS_CFUNC_DEF("clock_ms", 0, js_sys_clock),
 	JS_CFUNC_DEF("clock_us", 0, js_sys_clock_high_res),
+	JS_CFUNC_DEF("sleep", 0, js_sys_sleep),
+	JS_CFUNC_DEF("exit", 0, js_sys_exit),
 	JS_CFUNC_DEF("fcc_to_str", 0, js_sys_4cc_to_str),
 	JS_CFUNC_DEF("rand_init", 0, js_sys_rand_init),
 	JS_CFUNC_DEF("rand", 0, js_sys_rand),
 	JS_CFUNC_DEF("rand64", 0, js_sys_rand64),
 	JS_CFUNC_DEF("getenv", 0, js_sys_getenv),
 	JS_CFUNC_DEF("get_utc", 0, js_sys_get_utc),
+	JS_CFUNC_DEF("get_ntp", 0, js_sys_get_ntp),
+	JS_CFUNC_DEF("ntp_shift", 0, js_sys_ntp_shift),
+
 	JS_CFUNC_DEF("crc32", 0, js_sys_crc32),
 	JS_CFUNC_DEF("sha1", 0, js_sys_sha1),
 	JS_CFUNC_DEF("load_file", 0, js_sys_file_data),
+	JS_CFUNC_DEF("load_script", 0, js_sys_load_script),
 	JS_CFUNC_DEF("compress", 0, js_sys_compress),
 	JS_CFUNC_DEF("decompress", 0, js_sys_decompress),
 	JS_CFUNC_DEF("rmdir", 0, js_sys_rmdir),
@@ -1518,6 +2519,17 @@
 	JS_CFUNC_DEF("htonl", 0, js_sys_htonl),
 	JS_CFUNC_DEF("htons", 0, js_sys_htons),
 
+	JS_CFUNC_DEF("pixfmt_size", 0, js_pixfmt_size),
+	JS_CFUNC_DEF("pixfmt_transparent", 0, js_pixfmt_transparent),
+	JS_CFUNC_DEF("pixfmt_yuv", 0, js_pixfmt_yuv),
+	JS_CFUNC_DEF("pcmfmt_depth", 0, js_pcmfmt_depth),
+	JS_CFUNC_DEF("color_lerp", 0, js_color_lerp),
+	JS_CFUNC_DEF("color_component", 0, js_color_get_component),
+	JS_CFUNC_DEF("url_cat", 0, js_sys_url_cat),
+	JS_CFUNC_DEF("rect_union", 0, js_sys_rect_union),
+	JS_CFUNC_DEF("rect_intersect", 0, js_sys_rect_intersect),
+
+	JS_CFUNC_DEF("_avmix_audio", 0, js_audio_mix),
 };
 
 
@@ -1545,7 +2557,7 @@
 		}
 		JS_SetOpaque(this_val, sha1);
 	}
-	if (!argc) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
 	data = JS_GetArrayBuffer(ctx, &data_size, argv[0]);
 	gf_sha1_update(sha1, (u8 *) data, (u32) data_size);
 
@@ -1555,7 +2567,7 @@
 {
 	u8 output[GF_SHA1_DIGEST_SIZE];
 	GF_SHA1Context *sha1 = JS_GetOpaque(this_val, sha1_class_id);
-	if (!sha1) return JS_EXCEPTION;
+	if (!sha1) return GF_JS_EXCEPTION(ctx);
 	gf_sha1_finish(sha1, output);
 	JS_SetOpaque(this_val, NULL);
 	return JS_NewArrayBufferCopy(ctx, output, GF_SHA1_DIGEST_SIZE);
@@ -1609,7 +2621,7 @@
 static JSValue js_file_prop_get(JSContext *ctx, JSValueConst this_val, int magic)
 {
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case JS_FILE_POS:
@@ -1630,11 +2642,11 @@
 {
 	s64 lival;
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case JS_FILE_POS:
-		if (JS_ToInt64(ctx, &lival, value)) return JS_EXCEPTION;
+		if (JS_ToInt64(ctx, &lival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_fseek(f, lival, SEEK_SET);
 		break;
 	}
@@ -1643,14 +2655,14 @@
 static JSValue js_file_flush(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
 	gf_fflush(f);
 	return JS_UNDEFINED;
 }
 static JSValue js_file_close(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
 	gf_fclose(f);
 	JS_SetOpaque(this_val, NULL);
 	return JS_UNDEFINED;
@@ -1662,13 +2674,13 @@
 	u32 read;
 	s32 nb_bytes=0;
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f) return JS_EXCEPTION;
-	if (!argc) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
+	if (!argc) return GF_JS_EXCEPTION(ctx);
 
 	data = JS_GetArrayBuffer(ctx, &size, argv[0]);
-	if (!data) return JS_EXCEPTION;
+	if (!data) return GF_JS_EXCEPTION(ctx);
 	if (argc>1) {
-		if (JS_ToInt32(ctx, &nb_bytes, argv[1])) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &nb_bytes, argv[1])) return GF_JS_EXCEPTION(ctx);
 	}
 	if (!nb_bytes) nb_bytes = (s32) size;
 	else if (nb_bytes > (s32) size) nb_bytes = (s32) size;
@@ -1676,13 +2688,28 @@
 	read = (u32) gf_fread((void *) data, nb_bytes, f);
 	return JS_NewInt64(ctx, read);
 }
+
+static JSValue js_file_seek(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	s64 pos;
+	s32 whence, res;
+	FILE *f = JS_GetOpaque(this_val, file_class_id);
+	if (!f) return GF_JS_EXCEPTION(ctx);
+	if (argc!=2) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt64(ctx, &pos, argv[0])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &whence, argv[1])) return GF_JS_EXCEPTION(ctx);
+
+	res = gf_fseek(f, pos, whence);
+	return JS_NewInt32(ctx, res);
+}
+
 static JSValue js_file_gets(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	char *data=NULL;
 	char temp[1025];
 	JSValue res;
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
 
 	temp[1024] = 0;
 	while (1) {
@@ -1707,7 +2734,7 @@
 {
 	char res[2];
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
 
 	res[0] = gf_fgetc(f);
 	res[1] = 0;
@@ -1721,13 +2748,13 @@
 	u32 read;
 	s32 nb_bytes=0;
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f) return JS_EXCEPTION;
-	if (!argc) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
+	if (!argc) return GF_JS_EXCEPTION(ctx);
 
 	data = JS_GetArrayBuffer(ctx, &size, argv[0]);
-	if (!data) return JS_EXCEPTION;
+	if (!data) return GF_JS_EXCEPTION(ctx);
 	if (argc>1) {
-		if (JS_ToInt32(ctx, &nb_bytes, argv[1])) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &nb_bytes, argv[1])) return GF_JS_EXCEPTION(ctx);
 	}
 	if (!nb_bytes) nb_bytes = (u32) size;
 	else if (nb_bytes > (s32) size) nb_bytes = (u32) size;
@@ -1739,10 +2766,10 @@
 {
 	const char *string;
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f || !argc) return JS_EXCEPTION;
+	if (!f || !argc) return GF_JS_EXCEPTION(ctx);
 
 	string = JS_ToCString(ctx, argv[0]);
-	if (!string) return JS_EXCEPTION;
+	if (!string) return GF_JS_EXCEPTION(ctx);
 	gf_fputs(string, f);
 	JS_FreeCString(ctx, string);
 	return JS_UNDEFINED;
@@ -1752,15 +2779,15 @@
 {
 	int val=0;
 	FILE *f = JS_GetOpaque(this_val, file_class_id);
-	if (!f || !argc) return JS_EXCEPTION;
+	if (!f || !argc) return GF_JS_EXCEPTION(ctx);
 
 	if (JS_IsString(argv[0])) {
 		const char *string = JS_ToCString(ctx, argv[0]);
-		if (!string) return JS_EXCEPTION;
+		if (!string) return GF_JS_EXCEPTION(ctx);
 		val = string[0];
 		JS_FreeCString(ctx, string);
 	} else {
-		if (JS_ToInt32(ctx, &val, argv[0])) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &val, argv[0])) return GF_JS_EXCEPTION(ctx);
 	}
 	gf_fputc(val, f);
 	return JS_UNDEFINED;
@@ -1776,6 +2803,7 @@
 	JS_CFUNC_DEF("flush", 0, js_file_flush),
 	JS_CFUNC_DEF("close", 0, js_file_close),
 	JS_CFUNC_DEF("read", 0, js_file_read),
+	JS_CFUNC_DEF("seek", 0, js_file_seek),
 	JS_CFUNC_DEF("gets", 0, js_file_gets),
 	JS_CFUNC_DEF("getc", 0, js_file_getc),
 	JS_CFUNC_DEF("write", 0, js_file_write),
@@ -1807,7 +2835,7 @@
 		if (!name || !mode) {
 			e = GF_BAD_PARAM;
 		} else {
-			f = gf_fopen_ex(name, parent_io, mode);
+			f = gf_fopen_ex(name, parent_io, mode, GF_FALSE);
 			if (!f) e = GF_URL_ERROR;
 		}
 		if (name) JS_FreeCString(ctx, name);
@@ -1829,6 +2857,499 @@
 }
 
 
+typedef struct
+{
+	JSValue open, close, read, write, tell, seek, eof, exists, factory_obj;
+	JSContext *ctx;
+	u32 all_refs;
+	GF_List *url_pending;
+	Bool lock;
+	struct __jsf_fileio *root;
+} JSFileIOFactoryCtx;
+
+typedef struct __jsf_fileio
+{
+	JSFileIOFactoryCtx *factory;
+	JSValue js_obj;
+	GF_FileIO *gfio;
+	u32 nb_refs;
+} JSFileIOCtx;
+
+static void js_fileio_gc_mark(JSRuntime *rt, JSValueConst this_val, JS_MarkFunc *mark_func)
+{
+	JSFileIOCtx *ioctx = JS_GetOpaque(this_val, fileio_class_id);
+	if (!ioctx) return;
+	if (ioctx->factory->root == ioctx) {
+		JSFileIOFactoryCtx *iofac = ioctx->factory;
+		JS_MarkValue(rt, iofac->open, mark_func);
+		JS_MarkValue(rt, iofac->close, mark_func);
+		JS_MarkValue(rt, iofac->write, mark_func);
+		JS_MarkValue(rt, iofac->read, mark_func);
+		JS_MarkValue(rt, iofac->tell, mark_func);
+		JS_MarkValue(rt, iofac->seek, mark_func);
+		JS_MarkValue(rt, iofac->eof, mark_func);
+		JS_MarkValue(rt, iofac->exists, mark_func);
+		JS_MarkValue(rt, iofac->factory_obj, mark_func);
+	}
+	JS_MarkValue(rt, ioctx->js_obj, mark_func);
+}
+
+static void js_fileio_finalize(JSRuntime *rt, JSValue obj)
+{
+	FILE *f = JS_GetOpaque(obj, file_class_id);
+	if (!f) return;
+	gf_fclose(f);
+}
+
+JSClassDef fileioClass = {
+ "FILEIO",
+ .finalizer = js_fileio_finalize,
+	.gc_mark = js_fileio_gc_mark
+};
+
+
+enum
+{
+	JS_FILEIO_URL = 0,
+	JS_FILEIO_RES_URL,
+	JS_FILEIO_PARENT,
+};
+
+static JSValue js_fileio_prop_get(JSContext *ctx, JSValueConst this_val, int magic)
+{
+	JSFileIOCtx *ioctx = JS_GetOpaque(this_val, fileio_class_id);
+	if (!ioctx) return GF_JS_EXCEPTION(ctx);
+
+	switch (magic) {
+	case JS_FILEIO_URL:
+		return JS_NewString(ctx, gf_fileio_url(ioctx->gfio) );
+	case JS_FILEIO_RES_URL:
+		return JS_NewString(ctx, gf_fileio_resource_url(ioctx->gfio) );
+	case JS_FILEIO_PARENT:
+		return JS_DupValue(ctx, ioctx->factory->factory_obj);
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue js_fileio_protect(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSFileIOCtx *ioctx = JS_GetOpaque(this_val, fileio_class_id);
+	if (!ioctx) return JS_UNDEFINED;
+	if (!ioctx->factory->lock) {
+		ioctx->factory->lock = GF_TRUE;
+		ioctx->factory->all_refs++;
+	}
+	return JS_UNDEFINED;
+}
+
+static void js_fileio_factory_delete(JSContext *ctx, JSFileIOFactoryCtx *iofac, JSFileIOCtx *ioctx_deleted)
+{
+	while (gf_list_count(iofac->url_pending)) {
+		JSFileIOCtx *ioctx = gf_list_pop_back(iofac->url_pending);
+		gf_fileio_del(ioctx->gfio);
+		gf_free(ioctx);
+	}
+	gf_list_del(iofac->url_pending);
+
+	JS_SetOpaque(iofac->factory_obj, NULL);
+	JS_FreeValue(ctx, iofac->factory_obj);
+	JS_FreeValue(ctx, iofac->open);
+	JS_FreeValue(ctx, iofac->close);
+	JS_FreeValue(ctx, iofac->read);
+	JS_FreeValue(ctx, iofac->write);
+	JS_FreeValue(ctx, iofac->seek);
+	JS_FreeValue(ctx, iofac->tell);
+	JS_FreeValue(ctx, iofac->eof);
+	JS_FreeValue(ctx, iofac->exists);
+
+	//detach root (might have been closed before)
+	if (!ioctx_deleted || (ioctx_deleted->factory->root != ioctx_deleted) ) {
+		JS_SetOpaque(iofac->root->js_obj, NULL);
+		JS_FreeValue(ctx, iofac->root->js_obj);
+		gf_fileio_del(iofac->root->gfio);
+		gf_free(iofac->root);
+	}
+	gf_free(iofac);
+}
+
+static JSValue js_fileio_destroy(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSFileIOCtx *ioctx = JS_GetOpaque(this_val, fileio_class_id);
+	if (!ioctx) return JS_UNDEFINED;
+	if (!ioctx->factory->lock) return JS_UNDEFINED;
+
+	ioctx->factory->lock = GF_FALSE;
+	ioctx->factory->all_refs--;
+	if (!ioctx->factory->all_refs) {
+		js_fileio_factory_delete(ctx, ioctx->factory, NULL);
+	}
+	return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry fileio_funcs[] = {
+ JS_CGETSET_MAGIC_DEF_ENUM("url", js_fileio_prop_get, NULL, JS_FILEIO_URL),
+ JS_CGETSET_MAGIC_DEF_ENUM("resource_url", js_fileio_prop_get, NULL, JS_FILEIO_RES_URL),
+ JS_CGETSET_MAGIC_DEF_ENUM("parent", js_fileio_prop_get, NULL, JS_FILEIO_PARENT),
+	JS_CFUNC_DEF("protect", 0, js_fileio_protect),
+	JS_CFUNC_DEF("destroy", 0, js_fileio_destroy),
+};
+
+static GF_Err jsfio_seek(GF_FileIO *fileio, u64 offset, s32 whence)
+{
+	JSValue argv[2], res;
+	s32 ret;
+	JSFileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->gfio) return GF_BAD_PARAM;
+	JSContext *ctx = ioctx->factory->ctx;
+
+	gf_js_lock(ctx, GF_TRUE);
+
+	argv[0] = JS_NewInt64(ctx, offset);
+	argv[1] = JS_NewInt64(ctx, whence);
+	res = JS_Call(ctx, ioctx->factory->seek, ioctx->js_obj, 2, argv);
+	JS_ToInt32(ctx, &ret, res);
+	JS_FreeValue(ctx, res);
+	gf_js_lock(ctx, GF_FALSE);
+	return ret;
+}
+static u32 jsfio_read(GF_FileIO *fileio, u8 *buffer, u32 bytes)
+{
+	JSValue argv[1], res;
+	u32 ret;
+	JSFileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->gfio) return GF_BAD_PARAM;
+	JSContext *ctx = ioctx->factory->ctx;
+	gf_js_lock(ctx, GF_TRUE);
+	argv[0] = JS_NewArrayBuffer(ctx, buffer, bytes, NULL, 0, 0);
+	res = JS_Call(ctx, ioctx->factory->read, ioctx->js_obj, 1, argv);
+	JS_FreeValue(ctx, argv[0]);
+	JS_ToInt32(ctx, &ret, res);
+	JS_FreeValue(ctx, res);
+	gf_js_lock(ctx, GF_FALSE);
+	return ret;
+}
+static u32 jsfio_write(GF_FileIO *fileio, u8 *buffer, u32 bytes)
+{
+	JSValue argv[1], res;
+	u32 ret;
+	JSFileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->gfio) return GF_BAD_PARAM;
+	JSContext *ctx = ioctx->factory->ctx;
+
+	gf_js_lock(ctx, GF_TRUE);
+	argv[0] = JS_NewArrayBuffer(ctx, buffer, bytes, NULL, 0, 0);
+	res = JS_Call(ctx, ioctx->factory->write, ioctx->js_obj, 1, argv);
+	JS_FreeValue(ctx, argv[0]);
+	JS_ToInt32(ctx, &ret, res);
+	JS_FreeValue(ctx, res);
+	gf_js_lock(ctx, GF_FALSE);
+	return ret;
+}
+
+static s64 jsfio_tell(GF_FileIO *fileio)
+{
+	JSValue res;
+	s64 ret;
+	JSFileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->gfio) return GF_BAD_PARAM;
+	JSContext *ctx = ioctx->factory->ctx;
+	gf_js_lock(ctx, GF_TRUE);
+	res = JS_Call(ctx, ioctx->factory->tell, ioctx->js_obj, 0, NULL);
+	JS_ToInt64(ctx, &ret, res);
+	JS_FreeValue(ctx, res);
+	gf_js_lock(ctx, GF_FALSE);
+	return ret;
+}
+
+static Bool jsfio_eof(GF_FileIO *fileio)
+{
+	JSValue res;
+	s32 ret;
+	JSFileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->gfio) return GF_BAD_PARAM;
+	JSContext *ctx = ioctx->factory->ctx;
+	gf_js_lock(ctx, GF_TRUE);
+	res = JS_Call(ctx, ioctx->factory->eof, ioctx->js_obj, 0, NULL);
+	JS_ToInt32(ctx, &ret, res);
+	JS_FreeValue(ctx, res);
+	gf_js_lock(ctx, GF_FALSE);
+	return ret ? GF_TRUE : GF_FALSE;
+}
+
+static GF_FileIO *jsfio_open(GF_FileIO *fileio_ref, const char *url, const char *mode, GF_Err *out_err)
+{
+	JSValue args[2], res;
+	Bool do_delete = GF_FALSE;
+	JSFileIOCtx *ioctx_ref = gf_fileio_get_udta(fileio_ref);
+	if (!ioctx_ref || !ioctx_ref->gfio) return NULL;
+	JSContext *ctx = ioctx_ref->factory->ctx;
+	gf_js_lock(ctx, GF_TRUE);
+
+	*out_err = GF_OK;
+
+	if (!strcmp(mode, "url")) {
+		JSFileIOCtx *ioctx;
+		if (!url) return NULL;
+		GF_SAFEALLOC(ioctx, JSFileIOCtx);
+		if (!ioctx) return NULL;
+		char *path = gf_url_concatenate(gf_fileio_resource_url(ioctx_ref->gfio), url);
+
+		if (JS_IsUndefined(ioctx_ref->factory->write)) {
+			ioctx->gfio = gf_fileio_new((char *) path, ioctx, jsfio_open, jsfio_seek, jsfio_read, NULL, jsfio_tell, jsfio_eof, NULL);
+		} else if (JS_IsUndefined(ioctx_ref->factory->read)) {
+			ioctx->gfio = gf_fileio_new((char *) path, ioctx, jsfio_open, jsfio_seek, NULL, jsfio_write, jsfio_tell, jsfio_eof, NULL);
+		} else {
+			ioctx->gfio = gf_fileio_new((char *) path, ioctx, jsfio_open, jsfio_seek, jsfio_read, jsfio_write, jsfio_tell, jsfio_eof, NULL);
+		}
+		gf_free(path);
+		if (!ioctx->gfio) {
+			gf_free(ioctx);
+			gf_js_lock(ctx, GF_FALSE);
+			return NULL;
+		}
+		ioctx->factory = ioctx_ref->factory;
+		ioctx->js_obj = JS_UNDEFINED;
+		gf_list_add(ioctx->factory->url_pending, ioctx);
+		ioctx_ref->factory->all_refs++;
+		gf_js_lock(ctx, GF_FALSE);
+		return ioctx->gfio;
+	}
+
+	if (!strcmp(mode, "probe")) {
+		args[0] = JS_NewString(ctx, url);
+		res = JS_Call(ctx, ioctx_ref->factory->exists, ioctx_ref->factory->factory_obj, 1, args);
+		JS_FreeValue(ctx, args[0]);
+		if (!JS_ToBool(ctx, res)) *out_err = GF_URL_ERROR;
+		JS_FreeValue(ctx, res);
+		gf_js_lock(ctx, GF_FALSE);
+		return NULL;
+	}
+
+	if (!strcmp(mode, "ref")) {
+		ioctx_ref->nb_refs++;
+		ioctx_ref->factory->all_refs++;
+		gf_js_lock(ctx, GF_FALSE);
+		return fileio_ref;
+	}
+	if (!strcmp(mode, "unref")) {
+		if (!ioctx_ref->nb_refs) return NULL;
+		ioctx_ref->nb_refs--;
+		ioctx_ref->factory->all_refs--;
+		if (ioctx_ref->nb_refs) {
+			gf_js_lock(ctx, GF_FALSE);
+			return fileio_ref;
+		}
+		//close
+		url = NULL;
+		mode = NULL;
+		do_delete = GF_TRUE;
+	}
+
+
+	if (mode && !strcmp(mode, "close")) {
+		if (!JS_IsUndefined(ioctx_ref->js_obj)) {
+			ioctx_ref->factory->all_refs--;
+			res = JS_Call(ctx, ioctx_ref->factory->close, ioctx_ref->js_obj, 0, NULL);
+			JS_FreeValue(ctx, res);
+		}
+		if (ioctx_ref->nb_refs) {
+			gf_js_lock(ctx, GF_FALSE);
+			return NULL;
+		}
+		do_delete = GF_TRUE;
+	}
+	if (do_delete) {
+		JS_SetOpaque(ioctx_ref->js_obj, NULL);
+		JS_FreeValue(ctx, ioctx_ref->js_obj);
+		ioctx_ref->js_obj = JS_UNDEFINED;
+
+		//closing the root object
+		if (!ioctx_ref->factory->all_refs) {
+			js_fileio_factory_delete(ctx, ioctx_ref->factory, ioctx_ref);
+
+			gf_fileio_del(ioctx_ref->gfio);
+			gf_free(ioctx_ref);
+		} else if (ioctx_ref->factory->root != ioctx_ref) {
+			gf_fileio_del(ioctx_ref->gfio);
+			gf_free(ioctx_ref);
+		}
+
+		gf_js_lock(ctx, GF_FALSE);
+		return NULL;
+	}
+
+	JSFileIOCtx *ioctx = NULL;
+	Bool created = GF_FALSE;
+	//open, create a new obj if underlying file object is not undefined (ie, it is open)
+	if (JS_IsUndefined(ioctx_ref->js_obj) ) {
+		ioctx = ioctx_ref;
+		if (gf_list_del_item(ioctx_ref->factory->url_pending, ioctx)>=0) {
+			ioctx_ref->factory->all_refs--;
+		}
+	}
+	if (!ioctx) {
+		u32 i, count = gf_list_count(ioctx_ref->factory->url_pending);
+		for (i=0; i<count; i++) {
+			ioctx = gf_list_get(ioctx_ref->factory->url_pending, i);
+			const char *a_url = gf_fileio_resource_url(ioctx->gfio);
+			if (!strcmp(url, a_url)) {
+				ioctx_ref->factory->all_refs--;
+				gf_list_rem(ioctx_ref->factory->url_pending, i);
+				break;
+			}
+			ioctx = NULL;
+		}
+	}
+
+	if (!ioctx) {
+		GF_SAFEALLOC(ioctx, JSFileIOCtx);
+		if (!ioctx) {
+			*out_err = GF_OUT_OF_MEM;
+			gf_js_lock(ctx, GF_FALSE);
+			return NULL;
+		}
+		ioctx->factory = ioctx_ref->factory;
+		created = GF_TRUE;
+	}
+
+	ioctx->js_obj = JS_NewObjectClass(ctx, fileio_class_id);
+	if (JS_IsException(ioctx->js_obj)) {
+		JS_FreeValue(ctx, ioctx->js_obj);
+		ioctx->js_obj = JS_UNDEFINED;
+		if (created) gf_free(ioctx);
+		*out_err = GF_OUT_OF_MEM;
+		gf_js_lock(ctx, GF_FALSE);
+		return NULL;
+	}
+	JS_SetOpaque(ioctx->js_obj, ioctx);
+
+	char *path = NULL;
+	if (!strnicmp(url, "gfio://", 7)) {
+		url = gf_fileio_translate_url(url);
+	} else if (created) {
+		path = gf_url_concatenate( gf_fileio_resource_url(ioctx_ref->gfio), url);
+		url = path;
+	}
+
+	if (created) {
+		if (JS_IsUndefined(ioctx->factory->write)) {
+			ioctx->gfio = gf_fileio_new((char *) url, ioctx, jsfio_open, jsfio_seek, jsfio_read, NULL, jsfio_tell, jsfio_eof, NULL);
+		} else if (JS_IsUndefined(ioctx->factory->read)) {
+			ioctx->gfio = gf_fileio_new((char *) url, ioctx, jsfio_open, jsfio_seek, NULL, jsfio_write, jsfio_tell, jsfio_eof, NULL);
+		} else {
+			ioctx->gfio = gf_fileio_new((char *) url, ioctx, jsfio_open, jsfio_seek, jsfio_read, jsfio_write, jsfio_tell, jsfio_eof, NULL);
+		}
+	}
+
+	args[0] = JS_NewString(ctx, url);
+	args[1] = JS_NewString(ctx, mode);
+	res = JS_Call(ctx, ioctx_ref->factory->open, ioctx->js_obj, 2, args);
+
+	JS_FreeValue(ctx, args[0]);
+	JS_FreeValue(ctx, args[1]);
+	if (path) gf_free(path);
+
+	if (JS_IsBool(res) && JS_ToBool(ctx, res) ) {
+		ioctx_ref->factory->all_refs++;
+		gf_js_lock(ctx, GF_FALSE);
+		return ioctx->gfio;
+	}
+	JS_ToInt32(ctx, (int32_t *) out_err, res);
+
+	JS_SetOpaque(ioctx->js_obj, NULL);
+	JS_FreeValue(ctx, ioctx->js_obj);
+	ioctx->js_obj = JS_UNDEFINED;
+	if (created) {
+		gf_fileio_del(ioctx->gfio);
+		gf_free(ioctx);
+	}
+	gf_js_lock(ctx, GF_FALSE);
+	return NULL;
+}
+
+
+static JSValue fileio_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	JSValue anobj;
+	JSFileIOCtx *ioctx;
+	char *full_url;
+	const char *parent;
+
+	if (argc != 9) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(ctx);
+	//open
+	if (!JS_IsFunction(ctx, argv[1]) || JS_IsNull(argv[1])) return GF_JS_EXCEPTION(ctx);
+	//close
+	if (!JS_IsFunction(ctx, argv[2]) || JS_IsNull(argv[2])) return GF_JS_EXCEPTION(ctx);
+	//write, can be null
+	if (!JS_IsFunction(ctx, argv[3]) || JS_IsNull(argv[3])) {
+		if (!JS_IsFunction(ctx, argv[4]) || JS_IsNull(argv[4])) return GF_JS_EXCEPTION(ctx);
+	}
+	//read, can be null
+	if (!JS_IsFunction(ctx, argv[4]) || JS_IsNull(argv[4])) {
+		if (!JS_IsFunction(ctx, argv[3]) || JS_IsNull(argv[3])) return GF_JS_EXCEPTION(ctx);
+	}
+	//seek
+	if (!JS_IsFunction(ctx, argv[5]) || JS_IsNull(argv[5])) return GF_JS_EXCEPTION(ctx);
+	//tell
+	if (!JS_IsFunction(ctx, argv[6]) || JS_IsNull(argv[6])) return GF_JS_EXCEPTION(ctx);
+	//eos
+	if (!JS_IsFunction(ctx, argv[7]) || JS_IsNull(argv[7])) return GF_JS_EXCEPTION(ctx);
+	//exists
+	if (!JS_IsFunction(ctx, argv[8]) || JS_IsNull(argv[8])) return GF_JS_EXCEPTION(ctx);
+
+	const char *url = JS_ToCString(ctx, argv[0]);
+	if (!url) return GF_JS_EXCEPTION(ctx);
+
+	GF_SAFEALLOC(ioctx, JSFileIOCtx);
+	if (!ioctx) return js_throw_err(ctx, GF_OUT_OF_MEM);
+	GF_SAFEALLOC(ioctx->factory, JSFileIOFactoryCtx);
+	if (!ioctx->factory) {
+		gf_free(ioctx);
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
+	ioctx->factory->url_pending = gf_list_new();
+	if (!ioctx->factory->url_pending) {
+		gf_free(ioctx->factory);
+		gf_free(ioctx);
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
+
+	anobj = JS_NewObjectClass(ctx, fileio_class_id);
+	if (JS_IsException(anobj)) {
+		gf_free(ioctx);
+		return anobj;
+	}
+	JS_SetOpaque(anobj, ioctx);
+	ioctx->factory->open = JS_DupValue(ctx, argv[1]);
+	ioctx->factory->close = JS_DupValue(ctx, argv[2]);
+	ioctx->factory->write = JS_DupValue(ctx, argv[3]);
+	ioctx->factory->read = JS_DupValue(ctx, argv[4]);
+	ioctx->factory->seek = JS_DupValue(ctx, argv[5]);
+	ioctx->factory->tell = JS_DupValue(ctx, argv[6]);
+	ioctx->factory->eof = JS_DupValue(ctx, argv[7]);
+	ioctx->factory->exists = JS_DupValue(ctx, argv[8]);
+	ioctx->factory->factory_obj = JS_DupValue(ctx, anobj);
+	ioctx->factory->ctx = ctx;
+	ioctx->js_obj = JS_UNDEFINED;
+	ioctx->factory->root = ioctx;
+
+	parent = jsf_get_script_filename(ctx);
+	full_url = gf_url_concatenate(parent, url);
+
+	if (JS_IsUndefined(ioctx->factory->write)) {
+		ioctx->gfio = gf_fileio_new((char *) full_url, ioctx, jsfio_open, jsfio_seek, jsfio_read, NULL, jsfio_tell, jsfio_eof, NULL);
+	} else if (JS_IsUndefined(ioctx->factory->read)) {
+		ioctx->gfio = gf_fileio_new((char *) full_url, ioctx, jsfio_open, jsfio_seek, NULL, jsfio_write, jsfio_tell, jsfio_eof, NULL);
+	} else {
+		ioctx->gfio = gf_fileio_new((char *) full_url, ioctx, jsfio_open, jsfio_seek, jsfio_read, jsfio_write, jsfio_tell, jsfio_eof, NULL);
+	}
+	JS_FreeCString(ctx, url);
+	gf_free(full_url);
+	return anobj;
+}
+
+
 static int js_gpaccore_init(JSContext *ctx, JSModuleDef *m)
 {
 	JSValue proto, ctor;
@@ -1841,6 +3362,12 @@
 
 		JS_NewClassID(&file_class_id);
 		JS_NewClass(JS_GetRuntime(ctx), file_class_id, &fileClass);
+
+		JS_NewClassID(&amix_class_id);
+		JS_NewClass(JS_GetRuntime(ctx), amix_class_id, &amixClass);
+
+		JS_NewClassID(&fileio_class_id);
+		JS_NewClass(JS_GetRuntime(ctx), fileio_class_id, &fileioClass);
 	}
 
 	JSValue core_o = JS_NewObject(ctx);
@@ -1872,6 +3399,9 @@
 	DEF_CONST(GF_CONSOLE_ITALIC)
 	DEF_CONST(GF_CONSOLE_UNDERLINED)
 	DEF_CONST(GF_CONSOLE_STRIKE)
+	DEF_CONST(SEEK_SET)
+	DEF_CONST(SEEK_CUR)
+	DEF_CONST(SEEK_END)
 
 #undef DEF_CONST
 
@@ -1897,6 +3427,20 @@
 	ctor = JS_NewCFunction2(ctx, file_constructor, "File", 1, JS_CFUNC_constructor, 0);
 JS_SetModuleExport(ctx, m, "File", ctor);
 
+	//amix constructor
+	proto = JS_NewObjectClass(ctx, amix_class_id);
+	JS_SetPropertyFunctionList(ctx, proto, amix_funcs, countof(amix_funcs));
+	JS_SetClassProto(ctx, amix_class_id, proto);
+	ctor = JS_NewCFunction2(ctx, amix_constructor, "AudioMixer", 1, JS_CFUNC_constructor, 0);
+ JS_SetModuleExport(ctx, m, "AudioMixer", ctor);
+
+	//FILEIO constructor
+	proto = JS_NewObjectClass(ctx, fileio_class_id);
+	JS_SetPropertyFunctionList(ctx, proto, fileio_funcs, countof(fileio_funcs));
+	JS_SetClassProto(ctx, fileio_class_id, proto);
+	ctor = JS_NewCFunction2(ctx, fileio_constructor, "FileIO", 1, JS_CFUNC_constructor, 0);
+ JS_SetModuleExport(ctx, m, "FileIO", ctor);
+
 	return 0;
 }
 
@@ -1911,9 +3455,231 @@
 	JS_AddModuleExport(ctx, m, "Bitstream");
 	JS_AddModuleExport(ctx, m, "SHA1");
 	JS_AddModuleExport(ctx, m, "File");
+	JS_AddModuleExport(ctx, m, "FileIO");
+	JS_AddModuleExport(ctx, m, "AudioMixer");
 	return;
 }
 
+void qjs_module_init_scenejs(JSContext *ctx);
+void qjs_module_init_storage(JSContext *ctx);
+void qjs_module_init_xhr(JSContext *c);
+void qjs_module_init_evg(JSContext *c);
+void qjs_module_init_webgl(JSContext *c);
+void qjs_module_init_gpaccore(JSContext *c);
+
+#ifndef GPAC_DISABLE_QJS_LIBC
+#include "../quickjs/quickjs-libc.h"
+void qjs_module_init_qjs_libc(JSContext *ctx)
+{
+#ifdef CONFIG_BIGNUM
+ if (bignum_ext) {
+ JS_AddIntrinsicBigFloat(ctx);
+ JS_AddIntrinsicBigDecimal(ctx);
+ JS_AddIntrinsicOperators(ctx);
+ JS_EnableBignumExt(ctx, TRUE);
+ }
+#endif
+ /* system modules */
+ js_init_module_std(ctx, "std");
+ js_init_module_os(ctx, "os");
+}
+#endif // GPAC_DISABLE_QJS_LIBC
+
+
+void qjs_init_all_modules(JSContext *ctx, Bool no_webgl, Bool for_vrml)
+{
+	//init modules
+	qjs_module_init_gpaccore(ctx);
+
+#ifndef GPAC_DISABLE_QJS_LIBC
+	qjs_module_init_qjs_libc(ctx);
+#endif
+
+	//vrml, init scene JS but do not init xhr (defined in DOM JS)
+	if (for_vrml) {
+#if !defined(GPAC_DISABLE_PLAYER)
+		qjs_module_init_scenejs(ctx);
+#endif
+	} else {
+		qjs_module_init_xhr(ctx);
+	}
+	qjs_module_init_evg(ctx);
+	qjs_module_init_storage(ctx);
+
+	if (!no_webgl && !for_vrml)
+		qjs_module_init_webgl(ctx);
+}
+
+
+int js_module_set_import_meta(JSContext *ctx, JSValueConst func_val, JS_BOOL use_realpath, JS_BOOL is_main);
+
+
+#ifndef GPAC_STATIC_BUILD
+
+#if defined(WIN32) || defined(_WIN32_WCE)
+#include <windows.h>
+#else
+#include <dlfcn.h>
+#endif
+
+typedef JSModuleDef *(JSInitModuleFunc)(JSContext *ctx, const char *module_name);
+
+static JSModuleDef *qjs_module_loader_dyn_lib(JSContext *ctx,
+ const char *module_name)
+{
+	JSModuleDef *m=NULL;
+	void *hd;
+	JSInitModuleFunc *init;
+	char *filename;
+
+	if (!strchr(module_name, '/') || !strchr(module_name, '\\')) {
+		/* must add a '/' so that the DLL is not searched in the system library paths */
+		filename = gf_malloc(strlen(module_name) + 2 + 1);
+		if (!filename) return NULL;
+		strcpy(filename, "./");
+		strcpy(filename + 2, module_name);
+	} else {
+		filename = (char *)module_name;
+	}
+
+	/* load dynamic lib */
+#ifdef WIN32
+	hd = LoadLibrary(filename);
+#else
+	hd = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
+#endif
+
+	if (filename != module_name)
+		gf_free(filename);
+
+	if (!hd) {
+		JS_ThrowReferenceError(ctx, "could not load module filename '%s' as shared library", module_name);
+		return NULL;
+	}
+
+#ifdef WIN32
+	init = (JSInitModuleFunc *) GetProcAddress(hd, "js_init_module");
+#else
+	init = (JSInitModuleFunc *) dlsym(hd, "js_init_module");
+#endif
+
+	if (!init) {
+		JS_ThrowReferenceError(ctx, "could not load module filename '%s': js_init_module not found", module_name);
+	} else {
+		m = init(ctx, module_name);
+		if (!m) {
+			JS_ThrowReferenceError(ctx, "could not load module filename '%s': initialization error", module_name);
+		}
+	}
+#ifdef WIN32
+	FreeLibrary(hd);
+#else
+	dlclose(hd);
+#endif
+
+	return m;
+}
+
+#endif // GPAC_STATIC_BUILD
+
+JSModuleDef *qjs_module_loader(JSContext *ctx, const char *module_name, void *opaque)
+{
+	JSModuleDef *m;
+	const char *fext = gf_file_ext_start(module_name);
+
+	if (fext && (!strcmp(fext, ".so") || !strcmp(fext, ".dll") || !strcmp(fext, ".dylib")) ) {
+#ifndef GPAC_STATIC_BUILD
+		m = qjs_module_loader_dyn_lib(ctx, module_name);
+#else
+		JS_ThrowReferenceError(ctx, "could not load module filename '%s', dynamic library loading disabled in build", module_name);
+		m = NULL;
+#endif
+	} else {
+		u32 buf_len;
+		u8 *buf;
+		JSValue func_val;
+		char *url;
+		const char *par_url = jsf_get_script_filename(ctx);
+		url = gf_url_concatenate(par_url, module_name);
+
+		GF_Err e = gf_file_load_data(url ? url : module_name, &buf, &buf_len);
+		if (url) gf_free(url);
+
+		if (e != GF_OK) {
+			JS_ThrowReferenceError(ctx, "could not load module filename '%s': %s", module_name, gf_error_to_string(e) );
+			return NULL;
+		}
+		/* compile the module */
+		func_val = JS_Eval(ctx, buf ? (char *) buf : "", buf_len, module_name, JS_EVAL_TYPE_MODULE | JS_EVAL_FLAG_COMPILE_ONLY);
+		gf_free(buf);
+		if (JS_IsException(func_val))
+			return NULL;
+		/* XXX: could propagate the exception */
+		js_module_set_import_meta(ctx, func_val, GF_TRUE, GF_FALSE);
+		/* the module is already referenced, so we must free it */
+		m = JS_VALUE_GET_PTR(func_val);
+		JS_FreeValue(ctx, func_val);
+	}
+	return m;
+}
+
+#ifndef GPAC_DISABLE_QJS_LIBC
+
+static JSContext *JS_NewWorkerContext(JSRuntime *rt)
+{
+	JSContext *ctx = JS_NewContext(rt);
+	if (!ctx)
+ return NULL;
+
+	JSValue global_obj = JS_GetGlobalObject(ctx);
+	js_load_constants(ctx, global_obj);
+	JS_FreeValue(ctx, global_obj);
+
+	//disable WebGL and scene.js modules for workers
+	qjs_init_all_modules(ctx, GF_TRUE, GF_FALSE);
+	return ctx;
+}
+
+void js_promise_rejection_tracker(JSContext *ctx, JSValueConst promise, JSValueConst reason, JS_BOOL is_handled, void *opaque)
+{
+ if (!is_handled) {
+ GF_LOG(GF_LOG_WARNING, GF_LOG_CONSOLE, ("Possibly unhandled promise rejection: "));
+ js_dump_error_exc(ctx, reason);
+ }
+}
+#endif
+
+static void qjs_init_runtime_libc(JSRuntime *rt)
+{
+ 	if (gf_opts_get_bool("core", "no-js-mods"))
+		return;
+
+ /* module loader */
+	JS_SetModuleLoaderFunc(rt, NULL, qjs_module_loader, NULL);
+
+#ifndef GPAC_DISABLE_QJS_LIBC
+
+ js_std_set_worker_new_context_func(JS_NewWorkerContext);
+ js_std_init_handlers(rt);
+
+
+ if (gf_opts_get_bool("core", "unhandled-rejection")) {
+ JS_SetHostPromiseRejectionTracker(rt, js_promise_rejection_tracker, NULL);
+ }
+#endif
+
+}
+
+static void qjs_uninit_runtime_libc(JSRuntime *rt)
+{
+ 	if (gf_opts_get_bool("core", "no-js-mods"))
+		return;
+
+#ifndef GPAC_DISABLE_QJS_LIBC
+	js_std_free_handlers(rt);
+#endif
+
+}
 
 #endif

gpac-1.0.1.tar.gz/src/jsmods/evg.c -> gpac-2.0.0.tar.gz/src/jsmods/evg.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *			All rights reserved
 *
 * This file is part of GPAC / JavaScript vector graphics bindings
@@ -50,12 +50,23 @@
 #include <gpac/avparse.h>
 #include <gpac/network.h>
 
+#ifdef GPAC_HAS_FFMPEG
+#include "../filters/ff_common.h"
+#endif
+
+#ifndef GPAC_DISABLE_3D
+#include <gpac/internal/mesh.h>
+#endif
+
 
 #define EVG_GET_FLOAT(_name, _jsval) { Double _v; if (JS_ToFloat64(ctx, &_v, _jsval)) return js_throw_err(ctx, GF_BAD_PARAM); _name = (Float) _v; }
 #define CLAMPCOLF(_name) if (_name<0) _name=0; else if (_name>1.0) _name=1.0;
 
 uint8_t *evg_get_array(JSContext *ctx, JSValueConst obj, u32 *size);
 
+//test code, unused
+//#define BUILTIN_SHADERS
+
 //not used, wau too slow - we kept the code for future testing
 //#define EVG_USE_JS_SHADER
 
@@ -64,17 +75,28 @@
 	u32 width, height, pf, stride, stride_uv, nb_comp;
 	char *data;
 	u32 data_size;
-	Bool owns_data;
+	u8 owns_data;
+	u8 wide;
 	u32 flags;
 	GF_EVGStencil *stencil;
-	JSValue param_fun, obj;
+	JSValue param_fun, obj, par_obj;
 	JSContext *ctx;
+
+#ifndef GPAC_DISABLE_3D
+	char *named_tx;
+	void *gl_named_tx;
+	u8 force_resetup;
+#endif //GPAC_DISABLE_3D
+
+
+#ifdef GPAC_HAS_FFMPEG
+	struct SwsContext *swscaler;
+#endif
 } GF_JSTexture;
 
 #define MAX_ATTR_DIM	4
 typedef struct
 {
-	Float values[MAX_ATTR_DIM];
 	u32 dim;
 	u8 comp_type;
 } EVG_VAIRes;
@@ -127,13 +149,26 @@
 	COMP_V2_YZ = COMP_Y|COMP_Z,
 	COMP_V3 = COMP_X|COMP_Y|COMP_Z,
 	COMP_V4 = COMP_X|COMP_Y|COMP_Z|COMP_Q,
+
 	COMP_BOOL,
 	COMP_INT,
-	COMP_FLOAT
+	COMP_FLOAT,
+	//for builtin shaders only
+	COMP_TX,
+
+	COMP_FLAG_INT = 1<<6
 };
 
 typedef struct
 {
+	s32 x;
+	s32 y;
+	s32 z;
+	s32 q;
+} GF_IVec4;
+
+typedef struct
+{
 	u8 op_type;
 	u8 cond_type;
 	u8 left_value_type;
@@ -161,6 +196,7 @@
 
 	union {
 		Float vec[4];
+		s32 veci[4];
 		s32 ival;
 		Bool bval;
 	};
@@ -179,11 +215,13 @@
 		GF_Vec4 vecval;
 		s32 ival;
 		Bool bval;
+		void *ptr;
 	};
 	u8 value_type;
 } ShaderVar;
 
-typedef struct
+
+typedef struct __evg_shader
 {
 	u32 mode;
 	u32 nb_ops, alloc_ops;
@@ -191,6 +229,14 @@
 	u32 nb_vars, alloc_vars;
 	ShaderVar *vars;
 	Bool invalid, disable_early_z;
+	Bool has_branches;
+	GF_List *vars_stack;
+
+#ifdef BUILTIN_SHADERS
+	//native shaders
+	Bool (*frag_shader)(void *udta, GF_EVGFragmentParam *frag);
+	Bool (*frag_shader_init)(void *udta, GF_EVGFragmentParam *frag, u32 th_id, Bool is_cleanup);
+#endif
 } EVGShader;
 
 typedef struct
@@ -227,7 +273,9 @@
 {
 	GF_FontManager *fm;
 	GF_Path *path;
-	char *fontname;
+	char **fontnames;
+	u32 nb_fonts;
+
 	Double font_size;
 	u32 align;
 	u32 baseline;
@@ -240,11 +288,11 @@
 	Fixed min_x, min_y, max_x, max_y, max_w, max_h;
 	GF_Font *font;
 	Bool path_for_centered;
+	Bool right_to_left;
 } GF_JSText;
 
 
 JSClassID canvas_class_id;
-JSClassID canvas3d_class_id;
 JSClassID path_class_id;
 JSClassID mx2d_class_id;
 JSClassID colmx_class_id;
@@ -252,6 +300,7 @@
 JSClassID texture_class_id;
 JSClassID text_class_id;
 JSClassID matrix_class_id;
+JSClassID mesh_class_id;
 #ifdef EVG_USE_JS_SHADER
 JSClassID fragment_class_id;
 JSClassID vertex_class_id;
@@ -274,35 +323,7 @@
 	JS_FreeValueRT(rt, canvas->frag_shader);
 	JS_FreeValueRT(rt, canvas->vert_shader);
 
-	if (canvas->owns_data)
-		gf_free(canvas->data);
-	if (canvas->surface)
-		gf_evg_surface_delete(canvas->surface);
-	gf_free(canvas);
-}
 
-static void canvas_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
-{
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
-	if (!canvas) return;
-	JS_MarkValue(rt, canvas->alpha_cbk, mark_func);
-	JS_MarkValue(rt, canvas->frag_shader, mark_func);
-	JS_MarkValue(rt, canvas->vert_shader, mark_func);
-}
-
-JSClassDef canvas_class = {
-	"Canvas",
-	.finalizer = canvas_finalize,
-	.gc_mark = canvas_gc_mark
-};
-
-static void canvas3d_finalize(JSRuntime *rt, JSValue obj)
-{
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
-	if (!canvas) return;
-	JS_FreeValueRT(rt, canvas->alpha_cbk);
-	JS_FreeValueRT(rt, canvas->frag_shader);
-	JS_FreeValueRT(rt, canvas->vert_shader);
 #ifdef EVG_USE_JS_SHADER
 	JS_FreeValueRT(rt, canvas->frag_obj);
 	JS_FreeValueRT(rt, canvas->vert_obj);
@@ -316,13 +337,14 @@
 	gf_free(canvas);
 }
 
-static void canvas3d_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
+static void canvas_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
 {
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
 	if (!canvas) return;
 	JS_MarkValue(rt, canvas->alpha_cbk, mark_func);
 	JS_MarkValue(rt, canvas->frag_shader, mark_func);
 	JS_MarkValue(rt, canvas->vert_shader, mark_func);
+
 #ifdef EVG_USE_JS_SHADER
 	JS_MarkValue(rt, canvas->frag_obj, mark_func);
 	JS_MarkValue(rt, canvas->vert_obj, mark_func);
@@ -330,10 +352,10 @@
 	JS_MarkValue(rt, canvas->depth_buffer, mark_func);
 }
 
-JSClassDef canvas3d_class = {
-	"Canvas3D",
-	.finalizer = canvas3d_finalize,
-	.gc_mark = canvas3d_gc_mark
+JSClassDef canvas_class = {
+	"Canvas",
+	.finalizer = canvas_finalize,
+	.gc_mark = canvas_gc_mark
 };
 
 enum
@@ -345,6 +367,9 @@
 	GF_EVG_CLIPPER,
 	GF_EVG_COMPOSITE_OP,
 	GF_EVG_ALPHA_FUN,
+	GF_EVG_IS_YUV,
+	GF_EVG_BIT_DEPTH,
+	GF_EVG_MASK_MODE,
 	GF_EVG_FRAG_SHADER,
 	GF_EVG_VERT_SHADER,
 	GF_EVG_CCW,
@@ -360,6 +385,7 @@
 	GF_EVG_DEPTH_BUFFER,
 	GF_EVG_DEPTH_TEST,
 	GF_EVG_WRITE_DEPTH,
+	GF_EVG_RASTER_LEVEL,
 };
 
 u8 evg_get_alpha(void *cbk, u8 src_alpha, s32 x, s32 y)
@@ -376,77 +402,86 @@
 
 }
 
-static JSValue canvas_constructor_internal(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv, Bool is_3d)
+static JSValue canvas_constructor_internal(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv, GF_JSCanvas *canvas_reconfig)
 {
 	u32 width, height, pf=0, osize;
 	size_t data_size=0;
 	u8 *data=NULL;
 	u32 stride = 0;
 	u32 stride_uv = 0;
-	GF_JSCanvas *canvas;
+	GF_JSCanvas *the_canvas = NULL;
+	GF_JSCanvas *canvas = NULL;
 	GF_Err e;
 
 	if (argc<3)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	if (JS_ToInt32(c, &width, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	if (JS_ToInt32(c, &height, argv[1]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	if (JS_IsString(argv[2])) {
 		const char *str = JS_ToCString(c, argv[2]);
 		pf = gf_pixel_fmt_parse(str);
 		JS_FreeCString(c, str);
 	} else if (JS_ToInt32(c, &pf, argv[2])) {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	if (!width || !height || !pf)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	if (argc>3) {
 		s32 idx=0;
 		if (JS_IsObject(argv[3])) {
 			data = JS_GetArrayBuffer(c, &data_size, argv[3]);
-			if (!data) return JS_EXCEPTION;
+			if (!data) return GF_JS_EXCEPTION(c);
 			idx=1;
 		} else if (!JS_IsInteger(argv[3]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 
 		if (argc>3+idx) {
 			if (JS_ToInt32(c, &stride, argv[3+idx]))
-				return JS_EXCEPTION;
+				return GF_JS_EXCEPTION(c);
 			if (argc>4+idx) {
 				if (JS_ToInt32(c, &stride_uv, argv[4+idx]))
-					return JS_EXCEPTION;
+					return GF_JS_EXCEPTION(c);
 			}
 		}
 	}
-	GF_SAFEALLOC(canvas, GF_JSCanvas);
 
-	if (!canvas)
-		return JS_EXCEPTION;
+	if (!canvas_reconfig) {
+		GF_SAFEALLOC(the_canvas, GF_JSCanvas);
+
+		if (!the_canvas)
+			return GF_JS_EXCEPTION(c);
+	}
 
 	if (!gf_pixel_get_size_info(pf, width, height, &osize, &stride, &stride_uv, NULL, NULL)) {
-		gf_free(canvas);
-		return JS_EXCEPTION;
+		if (canvas)
+			gf_free(canvas);
+		return GF_JS_EXCEPTION(c);
 	}
 	if (data && (data_size<osize)) {
-		gf_free(canvas);
-		return JS_EXCEPTION;
+		if (the_canvas)
+			gf_free(the_canvas);
+		return GF_JS_EXCEPTION(c);
 	}
+	canvas = canvas_reconfig ? canvas_reconfig : the_canvas;
 
 	canvas->mem_size = osize;
 	canvas->width = width;
 	canvas->height = height;
 	canvas->pf = pf;
 	canvas->stride = stride;
-	canvas->alpha_cbk = JS_UNDEFINED;
-	canvas->frag_shader = JS_UNDEFINED;
-	canvas->vert_shader = JS_UNDEFINED;
+	if (the_canvas) {
+		canvas->alpha_cbk = JS_UNDEFINED;
+		canvas->frag_shader = JS_UNDEFINED;
+		canvas->vert_shader = JS_UNDEFINED;
 #ifdef EVG_USE_JS_SHADER
-	canvas->frag_obj = JS_UNDEFINED;
-	canvas->vert_obj = JS_UNDEFINED;
+		canvas->frag_obj = JS_UNDEFINED;
+		canvas->vert_obj = JS_UNDEFINED;
 #endif
-	canvas->depth_buffer = JS_UNDEFINED;
+		canvas->depth_buffer = JS_UNDEFINED;
+	}
 	canvas->ctx = c;
 	if (data) {
 		canvas->data = data;
@@ -455,29 +490,31 @@
 		canvas->data = gf_malloc(sizeof(u8)*osize);
 		canvas->owns_data = GF_TRUE;
 	}
-	if (is_3d) {
-		canvas->surface = gf_evg_surface3d_new();
-#ifdef EVG_USE_JS_SHADER
-		canvas->frag_obj = JS_NewObjectClass(c, fragment_class_id);
-		JS_SetOpaque(canvas->frag_obj, NULL);
-		canvas->vert_obj = JS_NewObjectClass(c, vertex_class_id);
-		JS_SetOpaque(canvas->vert_obj, NULL);
-#endif
-	} else {
+
+	e = GF_OK;
+	if (the_canvas) {
 		canvas->surface = gf_evg_surface_new(GF_TRUE);
 		canvas->center_coords = GF_TRUE;
 	}
-	if (!canvas->surface)
+
+	if (!canvas->surface) {
 		e = GF_BAD_PARAM;
-	else
+	} else if (!e) {
 		e = gf_evg_surface_attach_to_buffer(canvas->surface, canvas->data, canvas->width, canvas->height, 0, canvas->stride, canvas->pf);
+	}
+
 	if (e) {
+		if (canvas_reconfig)
+			return GF_JS_EXCEPTION(c);
 		if (canvas->owns_data) gf_free(canvas->data);
 		gf_evg_surface_delete(canvas->surface);
 		gf_free(canvas);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
-	canvas->obj = JS_NewObjectClass(c, is_3d ? canvas3d_class_id : canvas_class_id);
+	if (canvas_reconfig)
+		return JS_UNDEFINED;
+
+	canvas->obj = JS_NewObjectClass(c, canvas_class_id);
 	if (JS_IsException(canvas->obj)) return canvas->obj;
 
 	JS_SetOpaque(canvas->obj, canvas);
@@ -486,48 +523,80 @@
 
 static JSValue canvas_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
 {
-	return canvas_constructor_internal(c, new_target, argc, argv, GF_FALSE);
+	return canvas_constructor_internal(c, new_target, argc, argv, NULL);
 }
 
 static JSValue canvas_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
-	if (!canvas) return JS_EXCEPTION;
+	if (!canvas) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case GF_EVG_CENTERED: return JS_NewBool(c, canvas->center_coords);
 	case GF_EVG_COMPOSITE_OP: return JS_NewInt32(c, canvas->composite_op);
 	case GF_EVG_ALPHA_FUN: return JS_DupValue(c, canvas->alpha_cbk);
+	case GF_EVG_FRAG_SHADER: return JS_DupValue(c, canvas->frag_shader);
+	case GF_EVG_VERT_SHADER: return JS_DupValue(c, canvas->vert_shader);
+	case GF_EVG_DEPTH_BUFFER: return JS_DupValue(c, canvas->depth_buffer);
+	case GF_EVG_RASTER_LEVEL: return JS_NewInt32(c, gf_evg_surface_get_raster_level(canvas->surface));
+	case GF_EVG_IS_YUV:
+		if (gf_pixel_fmt_is_yuv(canvas->pf)) return JS_TRUE;
+		return JS_FALSE;
+	case GF_EVG_BIT_DEPTH:
+		return JS_NewInt32(c, gf_pixel_is_wide_depth(canvas->pf));
+	case GF_EVG_MASK_MODE:
+		return JS_NewInt32(c, gf_evg_surface_get_mask_mode(canvas->surface) );
+	case GF_EVG_CLIPPER:
+		return gf_evg_surface_use_clipper(canvas->surface) ? JS_TRUE : JS_FALSE;
 	}
 	return JS_UNDEFINED;
 }
 
-Bool canvas_get_irect(JSContext *c, JSValueConst obj, GF_IRect *rc)
+Bool canvas_get_irect(JSContext *c, JSValueConst obj, GF_IRect *rc, Bool reset)
 {
 	JSValue v;
+	Double fval;
 	int res;
-	memset(rc, 0, sizeof(GF_IRect));
+	if (reset)
+		memset(rc, 0, sizeof(GF_IRect));
 
-#define GET_PROP( _n, _f)\
+#define GET_PROP( _n, _f, _mandat)\
 	v = JS_GetPropertyStr(c, obj, _n);\
-	res = JS_ToInt32(c, &(rc->_f), v);\
-	JS_FreeValue(c, v);\
-	if (res) return GF_FALSE;\
-
-	GET_PROP("x", x)
-	GET_PROP("y", y)
-	GET_PROP("w", width)
-	GET_PROP("h", height)
+	if (JS_IsUndefined(v)) {\
+		if (_mandat) return GF_FALSE;\
+	} else {\
+		if (JS_IsInteger(v)) \
+			res = JS_ToInt32(c, &(rc->_f), v);\
+		else {\
+			res = JS_ToFloat64(c, &fval, v);\
+			rc->_f = (s32) fval;\
+		}\
+		JS_FreeValue(c, v);\
+		if (res) return GF_FALSE;\
+	}\
+
+	GET_PROP("x", x, 0)
+	GET_PROP("y", y, 0)
+	GET_PROP("w", width, 1)
+	GET_PROP("h", height, 1)
 #undef GET_PROP
+
 	return GF_TRUE;
 }
 
-static JSValue canvas_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+static Bool evg_frag_shader_ops(void *udta, GF_EVGFragmentParam *frag);
+static Bool evg_frag_shader_ops_init(void *udta, GF_EVGFragmentParam *frag, u32 th_id, Bool is_cleanup);
+static Bool evg_vert_shader_ops(void *udta, GF_EVGVertexParam *frag);
+
+static JSValue canvas_setProperty(JSContext *ctx, JSValueConst obj, JSValueConst value, int magic)
 {
+	Float f;
+	s32 ival;
+	GF_Err e = GF_OK;
 	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
-	if (!canvas) return JS_EXCEPTION;
+	if (!canvas) return GF_JS_EXCEPTION(ctx);
 	switch (magic) {
 	case GF_EVG_CENTERED:
-		canvas->center_coords = JS_ToBool(c, value) ? GF_TRUE : GF_FALSE;
+		canvas->center_coords = JS_ToBool(ctx, value) ? GF_TRUE : GF_FALSE;
 		gf_evg_surface_set_center_coords(canvas->surface, canvas->center_coords);
 		return JS_UNDEFINED;
 
@@ -564,35 +633,173 @@
 			gf_evg_surface_set_matrix_3d(canvas->surface, mx);
 		}
 		return JS_UNDEFINED;
+	case GF_EVG_RASTER_LEVEL:
+		JS_ToInt32(ctx, &ival, value);
+		gf_evg_surface_set_raster_level(canvas->surface, ival);
+		return JS_UNDEFINED;
+
 	case GF_EVG_CLIPPER:
 		if (JS_IsNull(value)) {
 			gf_evg_surface_set_clipper(canvas->surface, NULL);
 		} else {
 			GF_IRect rc;
-			canvas_get_irect(c, value, &rc);
+			canvas_get_irect(ctx, value, &rc, GF_TRUE);
 			gf_evg_surface_set_clipper(canvas->surface, &rc);
 		}
 		return JS_UNDEFINED;
+
 	case GF_EVG_COMPOSITE_OP:
-		if (JS_ToInt32(c, &canvas->composite_op, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &canvas->composite_op, value)) return GF_JS_EXCEPTION(ctx);
 		gf_evg_surface_set_composite_mode(canvas->surface, canvas->composite_op);
 		break;
 	case GF_EVG_ALPHA_FUN:
-		JS_FreeValue(c, canvas->alpha_cbk);
-		if (JS_IsNull(value) || !JS_IsFunction(c, value)) {
+		JS_FreeValue(ctx, canvas->alpha_cbk);
+		if (JS_IsNull(value) || !JS_IsFunction(ctx, value)) {
 			canvas->alpha_cbk = JS_UNDEFINED;
 			gf_evg_surface_set_alpha_callback(canvas->surface, NULL, NULL);
 		} else {
-			canvas->alpha_cbk = JS_DupValue(c, value);
+			canvas->alpha_cbk = JS_DupValue(ctx, value);
 			gf_evg_surface_set_alpha_callback(canvas->surface, evg_get_alpha, canvas);
 		}
 		return JS_UNDEFINED;
+
+	//3D extensions
+	case GF_EVG_FRAG_SHADER:
+		JS_FreeValue(ctx, canvas->frag_shader);
+		canvas->frag_shader = JS_UNDEFINED;
+		canvas->frag = NULL;
+		if (JS_IsNull(value)) {
+			canvas->frag_shader = JS_UNDEFINED;
+			e = gf_evg_surface_set_fragment_shader(canvas->surface, NULL, NULL, NULL);
+#ifdef EVG_USE_JS_SHADER
+		} else if (JS_IsFunction(ctx, value)) {
+			canvas->frag_shader = JS_DupValue(ctx, value);
+			e = gf_evg_surface_set_fragment_shader(canvas->surface, evg_frag_shader_fun, NULL, canvas);
+#endif
+		} else if (JS_IsObject(value)) {
+			canvas->frag = JS_GetOpaque(value, shader_class_id);
+			if (!canvas->frag || (canvas->frag->mode != GF_EVG_SHADER_FRAGMENT))
+				return js_throw_err_msg(ctx, GF_BAD_PARAM, "Invalid fragment shader object");
+			canvas->frag_shader = JS_DupValue(ctx, value);
+
+#ifdef BUILTIN_SHADERS
+			if (canvas->frag->frag_shader) {
+				e = gf_evg_surface_set_fragment_shader(canvas->surface, canvas->frag->frag_shader, canvas->frag->frag_shader_init, canvas->frag);
+			} else
+#endif
+			{
+				e = gf_evg_surface_set_fragment_shader(canvas->surface, evg_frag_shader_ops, evg_frag_shader_ops_init, canvas);
+			}
+			if (!e) e = gf_evg_surface_disable_early_depth(canvas->surface, canvas->frag->disable_early_z);
+		} else {
+			canvas->frag_shader = JS_UNDEFINED;
+			e = gf_evg_surface_set_fragment_shader(canvas->surface, NULL, NULL, NULL);
+		}
+		break;
+	case GF_EVG_VERT_SHADER:
+		JS_FreeValue(ctx, canvas->vert_shader);
+		canvas->vert_shader = JS_UNDEFINED;
+		canvas->vert = NULL;
+		if (JS_IsNull(value)) {
+			canvas->vert_shader = JS_UNDEFINED;
+			e = gf_evg_surface_set_vertex_shader(canvas->surface, NULL, NULL);
+#ifdef EVG_USE_JS_SHADER
+		} else if (JS_IsFunction(ctx, value)) {
+			canvas->vert_shader = JS_DupValue(ctx, value);
+			e = gf_evg_surface_set_vertex_shader(canvas->surface, evg_vert_shader_fun, canvas);
+#endif
+		} else if (JS_IsObject(value)) {
+			canvas->vert = JS_GetOpaque(value, shader_class_id);
+			if (!canvas->vert || (canvas->vert->mode != GF_EVG_SHADER_VERTEX))
+				return js_throw_err_msg(ctx, GF_BAD_PARAM, "Invalid fragment shader object");
+			canvas->vert_shader = JS_DupValue(ctx, value);
+			e = gf_evg_surface_set_vertex_shader(canvas->surface, evg_vert_shader_ops, canvas);
+		} else {
+			canvas->frag_shader = JS_UNDEFINED;
+			e = gf_evg_surface_set_fragment_shader(canvas->surface, NULL, NULL, NULL);
+		}
+		break;
+	case GF_EVG_CCW:
+		e = gf_evg_surface_set_ccw(canvas->surface, JS_ToBool(ctx, value) );
+		break;
+	case GF_EVG_BACKCULL:
+		e = gf_evg_surface_set_backcull(canvas->surface, JS_ToBool(ctx, value) );
+		break;
+	case GF_EVG_ANTIALIAS:
+		e = gf_evg_surface_set_antialias(canvas->surface, JS_ToBool(ctx, value) );
+		break;
+
+	case GF_EVG_DEPTH_BUFFER:
+	{
+		Float *depthb;
+		u32 dsize;
+		JS_FreeValue(ctx, canvas->depth_buffer);
+		canvas->depth_buffer = JS_UNDEFINED;
+		depthb = (Float *) evg_get_array(ctx, value, &dsize);
+		if (!depthb) {
+			canvas->depth_buffer = JS_NULL;
+			e = gf_evg_surface_set_depth_buffer(canvas->surface, NULL);
+		} else {
+			u32 req_size = canvas->width*canvas->height*sizeof(Float);
+			if (req_size>dsize) {
+				e = GF_BAD_PARAM;
+				gf_evg_surface_set_depth_buffer(canvas->surface, NULL);
+			} else {
+				canvas->depth_buffer = JS_DupValue(ctx, value);
+				e = gf_evg_surface_set_depth_buffer(canvas->surface, depthb);
+			}
+		}
+		break;
 	}
+
+	case GF_EVG_MINDEPTH:
+		EVG_GET_FLOAT(f, value);
+		e = gf_evg_surface_set_min_depth(canvas->surface, f);
+		break;
+	case GF_EVG_MAXDEPTH:
+		EVG_GET_FLOAT(f, value);
+		e = gf_evg_surface_set_max_depth(canvas->surface, f);
+		break;
+	case GF_EVG_DEPTHTEST:
+		if (JS_ToInt32(ctx, &ival, value))
+			return js_throw_err(ctx, GF_BAD_PARAM);
+		e = gf_evg_set_depth_test(canvas->surface, ival);
+		break;
+	case GF_EVG_POINTSIZE:
+		EVG_GET_FLOAT(f, value);
+		e = gf_evg_surface_set_point_size(canvas->surface, f);
+		break;
+	case GF_EVG_POINTSMOOTH:
+		e = gf_evg_surface_set_point_smooth(canvas->surface, JS_ToBool(ctx, value) );
+		break;
+	case GF_EVG_LINESIZE:
+		EVG_GET_FLOAT(f, value);
+		e = gf_evg_surface_set_line_size(canvas->surface, f);
+		break;
+	case GF_EVG_CLIP_ZERO:
+		e = gf_evg_surface_set_clip_zero(canvas->surface, JS_ToBool(ctx, value) ? GF_TRUE : GF_FALSE);
+		break;
+	case GF_EVG_DEPTH_TEST:
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
+		e = gf_evg_set_depth_test(canvas->surface, ival);
+		break;
+	case GF_EVG_WRITE_DEPTH:
+		e = gf_evg_surface_write_depth(canvas->surface, JS_ToBool(ctx, value) ? GF_TRUE : GF_FALSE);
+		break;
+	case GF_EVG_MASK_MODE:
+		if (JS_ToInt32(ctx, &ival, value))
+			return js_throw_err(ctx, GF_BAD_PARAM);
+		e = gf_evg_surface_set_mask_mode(canvas->surface, ival);
+		break;
+	}
+	if (e)
+		return js_throw_err(ctx, e);
+
 	return JS_UNDEFINED;
 }
 
 
-static JSValue canvas_clear_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool use_float, Bool is_3d)
+static JSValue canvas_clear_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool use_float)
 {
 	s32 i;
 	s32 idx=0;
@@ -600,19 +807,19 @@
 	GF_IRect rc, *irc;
 	u32 r=0, g=0, b=0, a=255;
 	GF_Color col;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, is_3d ? canvas3d_class_id : canvas_class_id);
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
 	if (!canvas)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	irc = NULL;
 	if (argc && JS_IsObject(argv[0])) {
 		irc = &rc;
 		idx=1;
-		if (!canvas_get_irect(c, argv[0], &rc))
-			return JS_EXCEPTION;
+		if (!canvas_get_irect(c, argv[0], &rc, GF_TRUE))
+			return GF_JS_EXCEPTION(c);
 	}
 	if ((argc>idx) && JS_IsString(argv[idx])) {
-		const char *str = JS_ToCString(c, argv[0]);
+		const char *str = JS_ToCString(c, argv[idx]);
 		col = gf_color_parse(str);
 		JS_FreeCString(c, str);
 	} else {
@@ -622,10 +829,10 @@
 			if (use_float) {
 				Double d;
 				if (JS_ToFloat64(c, &d, argv[i]))
-					return JS_EXCEPTION;
+					return GF_JS_EXCEPTION(c);
 				v = (s32) (d*255);
 			} else if (JS_ToInt32(c, &v, argv[i])) {
-				return JS_EXCEPTION;
+				return GF_JS_EXCEPTION(c);
 			}
 
 			if (v<0) v = 0;
@@ -640,19 +847,19 @@
 	}
 	e = gf_evg_surface_clear(canvas->surface, irc, col);
 	if (e)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	return JS_UNDEFINED;
 }
 static JSValue canvas_clear(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	return canvas_clear_ex(c, obj, argc, argv, GF_FALSE, GF_FALSE);
+	return canvas_clear_ex(c, obj, argc, argv, GF_FALSE);
 }
 static JSValue canvas_clearf(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	return canvas_clear_ex(c, obj, argc, argv, GF_TRUE, GF_FALSE);
+	return canvas_clear_ex(c, obj, argc, argv, GF_TRUE);
 }
 
-static JSValue canvas_rgb_yuv(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool to_rgb, Bool is_3d)
+static JSValue canvas_rgb_yuv(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool to_rgb)
 {
 	GF_Err e;
 	Double _r=0, _g=0, _b=0, _a=1.0;
@@ -661,16 +868,16 @@
 	u32 arg_idx=0;
 	Float y, u, v;
 	JSValue ret;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, is_3d ? canvas3d_class_id : canvas_class_id);
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
 	if (!canvas || !argc)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	if (JS_IsBool(argv[0])) {
 		as_array = JS_ToBool(c, argv[0]);
 		arg_idx=1;
 	}
 	if (!get_color_from_args(c, argc, argv, arg_idx, &_a, &_r, &_g, &_b))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	r = (Float) _r;
 	g = (Float) _g;
 	b = (Float) _b;
@@ -681,7 +888,7 @@
 		e = gf_gf_evg_rgb_to_yuv_f(canvas->surface, r, g, b, &y, &u, &v);
 	}
 	if (e)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	if (as_array) {
 		ret = JS_NewArray(c);
 		JS_SetPropertyStr(c, ret, "length", JS_NewInt32(c, 4) );
@@ -699,20 +906,26 @@
 	return ret;
 }
 
-static JSValue canvas_reassign_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool is_3d)
+static JSValue canvas_reassign(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Err e;
 	u8 *data;
 	size_t data_size=0;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, is_3d ? canvas3d_class_id : canvas_class_id);
-	if (!canvas || !argc) return JS_EXCEPTION;
-	if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas || !argc) return GF_JS_EXCEPTION(c);
 
 	if (canvas->owns_data) {
 		gf_free(canvas->data);
 		canvas->owns_data = GF_FALSE;
 	}
 	canvas->data = NULL;
+
+	if (argc==1) {
+		if (!JS_IsObject(argv[0])) return GF_JS_EXCEPTION(c);
+	} else {
+		return canvas_constructor_internal(c, obj, argc, argv, canvas);
+	}
+
 	data = JS_GetArrayBuffer(c, &data_size, argv[0]);
 	if (!data || (data_size<canvas->mem_size)) {
 		e = GF_BAD_PARAM;
@@ -720,86 +933,321 @@
 		canvas->data = data;
 		e = gf_evg_surface_attach_to_buffer(canvas->surface, canvas->data, canvas->width, canvas->height, 0, canvas->stride, canvas->pf);
 	}
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_UNDEFINED;
 }
 
-static JSValue canvas_reassign(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+static JSValue canvas_toYUV(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	return canvas_reassign_ex(c, obj, argc, argv, GF_FALSE);
+	return canvas_rgb_yuv(c, obj, argc, argv, GF_FALSE);
 }
 
-static JSValue canvas_toYUV(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+static JSValue canvas_toRGB(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	return canvas_rgb_yuv(c, obj, argc, argv, GF_FALSE, GF_FALSE);
+	return canvas_rgb_yuv(c, obj, argc, argv, GF_TRUE);
 }
 
-static JSValue canvas_toRGB(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+static GF_EVGStencil *get_stencil(JSContext *c, JSValue v)
 {
-	return canvas_rgb_yuv(c, obj, argc, argv, GF_TRUE, GF_FALSE);
+	GF_JSTexture *tx;
+	GF_EVGStencil *stencil = JS_GetOpaque(v, stencil_class_id);
+	if (stencil) return stencil;
+	tx = JS_GetOpaque(v, texture_class_id);
+	if (tx) return tx->stencil;
+	return NULL;
 }
 
 static JSValue canvas_fill(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	GF_EVGStencil *stencil;
-	GF_JSTexture *tx;
+	GF_EVGStencil *sten1 = NULL;
+	GF_EVGStencil *sten2 = NULL;
+	GF_EVGStencil *sten3 = NULL;
+	u32 sten_idx=1;
+	u32 operand = 0;
+	GF_Err e;
+	Float op_params[4] = {0};
 	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
-	if (!canvas || !argc) return JS_EXCEPTION;
-	stencil = JS_GetOpaque(argv[0], stencil_class_id);
-	if (stencil) {
-		gf_evg_surface_fill(canvas->surface, stencil);
-		return JS_UNDEFINED;
+	if (!canvas) return GF_JS_EXCEPTION(c);
+
+	if (!argc) {
+		if (!JS_IsUndefined(canvas->frag_shader)) {
+			gf_evg_surface_fill(canvas->surface, NULL);
+			return JS_UNDEFINED;
+		}
+		return GF_JS_EXCEPTION(c);
 	}
-	tx = JS_GetOpaque(argv[0], texture_class_id);
-	if (tx) {
-		gf_evg_surface_fill(canvas->surface, tx->stencil);
-		return JS_UNDEFINED;
+
+	if (JS_IsObject(argv[0])) {
+		sten1 = get_stencil(c, argv[0]);
+		if (!sten1) return GF_JS_EXCEPTION(c);
+		e = gf_evg_surface_fill(canvas->surface, sten1);
+		return e ? GF_JS_EXCEPTION(c) : JS_UNDEFINED;
 	}
-	return JS_EXCEPTION;
+
+	if (JS_ToInt32(c, &operand, argv[0]))
+		return GF_JS_EXCEPTION(c);
+	if (JS_IsArray(c, argv[1])) {
+		JSValue v;
+		u32 i, nb_items;
+		v = JS_GetPropertyStr(c, argv[1], "length");
+		JS_ToInt32(c, &nb_items, v);
+		JS_FreeValue(c, v);
+		if (nb_items>4) nb_items=3;
+		for (i=0; i<nb_items; i++) {
+			Double d;
+			v = JS_GetPropertyUint32(c, argv[1], i);
+			JS_ToFloat64(c, &d, v);
+			JS_FreeValue(c, v);
+			op_params[i] = (Float) d;
+		}
+		sten_idx = 2;
+	}
+	else if (JS_IsNumber(argv[1])) {
+		Double d;
+		JS_ToFloat64(c, &d, argv[1]);
+		op_params[0] = (Float) d;
+		sten_idx = 2;
+	}
+	sten1 = get_stencil(c, argv[sten_idx]);
+	if (!sten1) return GF_JS_EXCEPTION(c);
+	if ((u32) argc>sten_idx+1)
+		sten2 = get_stencil(c, argv[sten_idx+1]);
+	if ((u32) argc>sten_idx+2)
+		sten3 = get_stencil(c, argv[sten_idx+2]);
+	e = gf_evg_surface_multi_fill(canvas->surface, operand, sten1, sten2, sten3, op_params);
+	return e ? GF_JS_EXCEPTION(c) : JS_UNDEFINED;
 }
 
-static const JSCFunctionListEntry canvas_funcs[] =
+static JSValue canvas_blit(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	JS_CGETSET_MAGIC_DEF("centered", canvas_getProperty, canvas_setProperty, GF_EVG_CENTERED),
-	JS_CGETSET_MAGIC_DEF("path", NULL, canvas_setProperty, GF_EVG_PATH),
-	JS_CGETSET_MAGIC_DEF("clipper", NULL, canvas_setProperty, GF_EVG_CLIPPER),
-	JS_CGETSET_MAGIC_DEF("matrix", NULL, canvas_setProperty, GF_EVG_MATRIX),
-	JS_CGETSET_MAGIC_DEF("matrix3d", NULL, canvas_setProperty, GF_EVG_MATRIX_3D),
-	JS_CGETSET_MAGIC_DEF("compositeOperation", canvas_getProperty, canvas_setProperty, GF_EVG_COMPOSITE_OP),
-	JS_CGETSET_MAGIC_DEF("on_alpha", canvas_getProperty, canvas_setProperty, GF_EVG_ALPHA_FUN),
-	JS_CFUNC_DEF("clear", 0, canvas_clear),
-	JS_CFUNC_DEF("clearf", 0, canvas_clearf),
-	JS_CFUNC_DEF("fill", 0, canvas_fill),
-	JS_CFUNC_DEF("reassign", 0, canvas_reassign),
-	JS_CFUNC_DEF("toYUV", 0, canvas_toYUV),
-	JS_CFUNC_DEF("toRGB", 0, canvas_toRGB),
-};
+#ifdef GPAC_HAS_FFMPEG
+	GF_JSTexture *tx;
+	GF_IRect dst_rc, src_rc;
+	enum AVPixelFormat pf_src, pf_dst;
+	double par_p[2];
+	u8 *src_data[5];
+	u8 *dst_data[5];
+	u32 src_stride[5];
+	u32 dst_stride[5];
+	u32 swsmode = 0;
+	u32 bpp, arg_idx=0;
 
+	GF_Err gf_evg_stencil_get_texture_planes(GF_EVGStencil *stencil, u8 **pY_or_RGB, u8 **pU, u8 **pV, u8 **pA, u32 *stride, u32 *stride_uv);
 
-static JSValue canvas3d_clear(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
-{
-	return canvas_clear_ex(c, obj, argc, argv, GF_FALSE, GF_TRUE);
-}
-static JSValue canvas3d_clearf(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
-{
-	return canvas_clear_ex(c, obj, argc, argv, GF_TRUE, GF_TRUE);
-}
-static JSValue canvas3d_reassign(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
-{
-	return canvas_reassign_ex(c, obj, argc, argv, GF_TRUE);
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas || !argc) return GF_JS_EXCEPTION(c);
+
+	if (!JS_IsObject(argv[0]))
+		return GF_JS_EXCEPTION(c);
+
+	tx = JS_GetOpaque(argv[0], texture_class_id);
+	if (!tx) return GF_JS_EXCEPTION(c);
+
+	pf_src = ffmpeg_pixfmt_from_gpac(tx->pf);
+	pf_dst = ffmpeg_pixfmt_from_gpac(canvas->pf);
+	if ((pf_src==AV_PIX_FMT_NONE) || (pf_dst==AV_PIX_FMT_NONE))
+		return js_throw_err(c, GF_NOT_SUPPORTED);
+
+	dst_rc.x = dst_rc.y = 0;
+	dst_rc.width = canvas->width;
+	dst_rc.height = canvas->height;
+
+	src_rc.x = src_rc.y = 0;
+	src_rc.width = tx->width;
+	src_rc.height = tx->height;
+
+	//get dst and src rectangles
+	if ((1+arg_idx < (u32) argc) && (JS_IsNull(argv[1+arg_idx]) || canvas_get_irect(c, argv[1+arg_idx], &dst_rc, GF_FALSE))) {
+		arg_idx++;
+		if ((1+arg_idx < (u32) argc) && (JS_IsNull(argv[1+arg_idx]) || canvas_get_irect(c, argv[1+arg_idx], &src_rc, GF_FALSE))) {
+			arg_idx++;
+		}
+	}
+
+	if (!dst_rc.width || !dst_rc.height) return JS_UNDEFINED;
+	if (!src_rc.width || !src_rc.height) return JS_UNDEFINED;
+
+
+	if ((1+arg_idx < (u32) argc) && JS_IsObject(argv[1+arg_idx])) {
+		u32 nb_params=0;
+		JSValue v = JS_GetPropertyStr(c, argv[1+arg_idx], "mode");
+		if (JS_IsString(v)) {
+			const char *smode = JS_ToCString(c, v);
+			if (!strcmp(smode, "fastbilinear")) swsmode = SWS_FAST_BILINEAR;
+			else if (!strcmp(smode, "bilinear")) swsmode = SWS_BILINEAR;
+			else if (!strcmp(smode, "bicubic")) { swsmode = SWS_BICUBIC; nb_params=2; }
+			else if (!strcmp(smode, "X")) swsmode = SWS_X;
+			else if (!strcmp(smode, "point")) swsmode = SWS_POINT;
+			else if (!strcmp(smode, "area")) swsmode = SWS_AREA;
+			else if (!strcmp(smode, "bicublin")) swsmode = SWS_BICUBLIN;
+			else if (!strcmp(smode, "gauss")) { swsmode = SWS_GAUSS; nb_params=1; }
+			else if (!strcmp(smode, "sinc")) swsmode = SWS_SINC;
+			else if (!strcmp(smode, "lanzcos")) { swsmode = SWS_LANCZOS; nb_params=1; }
+			else if (!strcmp(smode, "spline")) swsmode = SWS_SPLINE;
+
+			JS_FreeCString(c, smode);
+		}
+		JS_FreeValue(c, v);
+		if (nb_params) {
+			v = JS_GetPropertyStr(c, argv[1+arg_idx], "p1");
+			JS_ToFloat64(c, &par_p[0], v);
+			JS_FreeValue(c, v);
+			if (nb_params>1) {
+				v = JS_GetPropertyStr(c, argv[1+arg_idx], "p2");
+				JS_ToFloat64(c, &par_p[0], v);
+				JS_FreeValue(c, v);
+			}
+		}
+	}
+
+	if ((dst_rc.x<0) || (dst_rc.x+dst_rc.width > (s32) canvas->width)
+		|| (dst_rc.y<0) || (dst_rc.y+dst_rc.height > (s32) canvas->height)
+	) {
+		return js_throw_err(c, GF_BAD_PARAM);
+	}
+
+	if ((src_rc.x<0) || (src_rc.x+src_rc.width > (s32) tx->width)
+		|| (src_rc.y<0) || (src_rc.y+src_rc.height > (s32) tx->height)
+	) {
+		return js_throw_err(c, GF_BAD_PARAM);
+	}
+
+	par_p[0] = par_p[1] = 0;
+	tx->swscaler = sws_getCachedContext(tx->swscaler, src_rc.width, src_rc.height, pf_src, dst_rc.width, dst_rc.height, pf_dst, swsmode, NULL, NULL, par_p);
+
+	if (!tx->swscaler) {
+		return js_throw_err(c, GF_BAD_PARAM);
+	}
+	memset(src_data, 0, sizeof(u8*) * 5);
+	memset(dst_data, 0, sizeof(u8*) * 5);
+	memset(src_stride, 0, sizeof(u32) * 5);
+	memset(dst_stride, 0, sizeof(u32) * 5);
+
+	bpp = gf_pixel_get_bytes_per_pixel(canvas->pf);
+	dst_data[0] = canvas->data + dst_rc.x*bpp + dst_rc.y * canvas->stride;
+	dst_stride[0] = canvas->stride;
+
+	if (gf_pixel_fmt_is_yuv(canvas->pf)) {
+		u32 nb_planes, uv_height, off_x, off_y;
+
+		gf_pixel_get_size_info(canvas->pf, canvas->width, canvas->height, NULL, &dst_stride[0], &dst_stride[1], &nb_planes, &uv_height);
+
+		off_x = dst_rc.x * dst_stride[1] / dst_stride[0];
+		off_y = dst_rc.y * uv_height / canvas->height;
+
+		if (nb_planes==1) {
+		} else if (nb_planes==2) {
+			dst_data[1] = canvas->data + dst_stride[0] * canvas->height;
+			dst_data[1] += off_x * bpp + off_y * dst_stride[1];
+
+		} else if (nb_planes==3) {
+			dst_stride[2] = dst_stride[1];
+			dst_data[1] = canvas->data + dst_stride[0] * canvas->height;
+			dst_data[2] = dst_data[1] + dst_stride[1] * uv_height;
+
+			dst_data[1] += off_x * bpp + off_y * dst_stride[1];
+			dst_data[2] += off_x * bpp + off_y * dst_stride[2];
+		} else if (nb_planes==4) {
+			dst_stride[2] = dst_stride[1];
+			dst_stride[3] = dst_stride[0];
+			dst_data[1] = canvas->data + dst_stride[0] * canvas->height;
+			dst_data[2] = dst_data[1] + dst_stride[1] * uv_height;
+			dst_data[3] = dst_data[2] + dst_stride[2] * uv_height;
+
+			dst_data[1] += off_x * bpp + off_y * dst_stride[1];
+			dst_data[2] += off_x * bpp + off_y * dst_stride[2];
+			dst_data[3] += dst_rc.x * bpp + dst_rc.y * dst_stride[3];
+		}
+	}
+
+	gf_evg_stencil_get_texture_planes((GF_EVGStencil *) tx->stencil, &src_data[0], &src_data[1], &src_data[2], &src_data[3], &src_stride[0], &src_stride[1]);
+
+	if (src_data[3])
+		src_stride[3] = src_stride[0];
+	if (src_data[2])
+		src_stride[2] = src_stride[1];
+
+	bpp = gf_pixel_get_bytes_per_pixel(tx->pf);
+	src_data[0] += src_rc.x*bpp + src_rc.y * tx->stride;
+
+	if (gf_pixel_fmt_is_yuv(tx->pf)) {
+		u32 nb_planes, uv_height, off_x, off_y;
+
+		gf_pixel_get_size_info(tx->pf, tx->width, tx->height, NULL, &src_stride[0], &src_stride[1], &nb_planes, &uv_height);
+
+		off_x = src_rc.x * src_stride[1] / src_stride[0];
+		off_y = src_rc.y * uv_height / tx->height;
+		if (off_y != src_rc.y) {
+			while (off_y % 2)
+				off_y--;
+		}
+
+		if (nb_planes==1) {
+		} else if (nb_planes==2) {
+			src_data[1] += (off_x/2) * 2*bpp + off_y * src_stride[1];
+			src_data[2] = NULL;
+			src_stride[2] = 0;
+
+		} else if (nb_planes==3) {
+			src_data[1] += off_x * bpp + off_y * src_stride[1];
+			src_data[2] += off_x * bpp + off_y * src_stride[2];
+		} else if (nb_planes==4) {
+			src_data[1] += off_x * bpp + off_y * src_stride[1];
+			src_data[2] += off_x * bpp + off_y * src_stride[2];
+			src_data[3] += src_rc.x * bpp + src_rc.y * src_stride[3];
+		}
+	}
+
+
+	int res = sws_scale(tx->swscaler, (const u8**) src_data, src_stride, 0, src_rc.height, dst_data, dst_stride);
+	if (res != dst_rc.height)
+		return js_throw_err(c, GF_BAD_PARAM);
+
+	return JS_UNDEFINED;
+#else
+	return js_throw_err(c, GF_NOT_SUPPORTED);
+#endif
 }
 
-static JSValue canvas3d_toYUV(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+
+static JSValue canvas_enable_threading(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	return canvas_rgb_yuv(c, obj, argc, argv, GF_FALSE, GF_TRUE);
+	GF_Err e;
+	s32 nb_threads = -1;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas) return GF_JS_EXCEPTION(c);
+	if (argc) {
+		if (JS_ToInt32(c, &nb_threads, argv[0]))
+			return GF_JS_EXCEPTION(c);
+	}
+	e = gf_evg_enable_threading(canvas->surface, nb_threads);
+	if (e) return js_throw_err(c, e);
+	return JS_UNDEFINED;
 }
 
-static JSValue canvas3d_toRGB(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+static JSValue canvas_enable_3d(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	return canvas_rgb_yuv(c, obj, argc, argv, GF_TRUE, GF_TRUE);
+	GF_Err e;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas) return GF_JS_EXCEPTION(c);
+	e = gf_evg_surface_enable_3d(canvas->surface);
+	if (e) return js_throw_err(c, e);
+
+#ifdef EVG_USE_JS_SHADER
+	JS_FreeValue(c, the_canvas->frag_obj);
+	the_canvas->frag_obj = JS_NewObjectClass(c, fragment_class_id);
+	JS_SetOpaque(the_canvas->frag_obj, NULL);
+
+	JS_FreeValue(c, the_canvas->vert_obj);
+	the_canvas->vert_obj = JS_NewObjectClass(c, vertex_class_id);
+	JS_SetOpaque(the_canvas->vert_obj, NULL);
+#endif
+
+	return JS_UNDEFINED;
 }
 
-Bool vai_call_lerp(EVG_VAI *vai, GF_EVGFragmentParam *frag);
+static Bool vai_call_lerp(EVG_VAI *vai, GF_EVGFragmentParam *frag, Float *values);
+static Bool vai_call_lerp_init(EVG_VAI *vai, GF_EVGFragmentParam *frag);
 
 #ifdef EVG_USE_JS_SHADER
 static Bool evg_frag_shader_fun(void *udta, GF_EVGFragmentParam *frag)
@@ -834,164 +1282,12 @@
 }
 #endif
 
-static JSValue canvas3d_getProperty(JSContext *c, JSValueConst obj, int magic)
-{
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
-	if (!canvas) return JS_EXCEPTION;
-	switch (magic) {
-	case GF_EVG_FRAG_SHADER: return JS_DupValue(c, canvas->frag_shader);
-	case GF_EVG_VERT_SHADER: return JS_DupValue(c, canvas->vert_shader);
-	case GF_EVG_DEPTH_BUFFER: return JS_DupValue(c, canvas->depth_buffer);
-	}
-	return JS_UNDEFINED;
-}
-
-static Bool evg_frag_shader_ops(void *udta, GF_EVGFragmentParam *frag);
-static Bool evg_vert_shader_ops(void *udta, GF_EVGVertexParam *frag);
-
-static JSValue canvas3d_setProperty(JSContext *ctx, JSValueConst obj, JSValueConst value, int magic)
-{
-	Float f;
-	s32 ival;
-	GF_Err e = GF_OK;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
-	if (!canvas) return JS_EXCEPTION;
-	switch (magic) {
-	case GF_EVG_CLIPPER:
-		if (JS_IsNull(value)) {
-			e = gf_evg_surface_set_clipper(canvas->surface, NULL);
-		} else {
-			GF_IRect rc;
-			canvas_get_irect(ctx, value, &rc);
-			e = gf_evg_surface_set_clipper(canvas->surface, &rc);
-		}
-		break;
-	case GF_EVG_FRAG_SHADER:
-		JS_FreeValue(ctx, canvas->frag_shader);
-		canvas->frag_shader = JS_UNDEFINED;
-		canvas->frag = NULL;
-		if (JS_IsNull(value)) {
-			canvas->frag_shader = JS_UNDEFINED;
-			e = gf_evg_surface_set_fragment_shader(canvas->surface, NULL, NULL);
-#ifdef EVG_USE_JS_SHADER
-		} else if (JS_IsFunction(ctx, value)) {
-			canvas->frag_shader = JS_DupValue(ctx, value);
-			e = gf_evg_surface_set_fragment_shader(canvas->surface, evg_frag_shader_fun, canvas);
-#endif
-		} else if (JS_IsObject(value)) {
-			canvas->frag = JS_GetOpaque(value, shader_class_id);
-			if (!canvas->frag || (canvas->frag->mode != GF_EVG_SHADER_FRAGMENT))
-				return js_throw_err_msg(ctx, GF_BAD_PARAM, "Invalid fragment shader object");
-			canvas->frag_shader = JS_DupValue(ctx, value);
-			e = gf_evg_surface_set_fragment_shader(canvas->surface, evg_frag_shader_ops, canvas);
-			if (!e) e = gf_evg_surface_disable_early_depth(canvas->surface, canvas->frag->disable_early_z);
-		} else {
-			canvas->frag_shader = JS_UNDEFINED;
-			e = gf_evg_surface_set_fragment_shader(canvas->surface, NULL, NULL);
-		}
-		break;
-	case GF_EVG_VERT_SHADER:
-		JS_FreeValue(ctx, canvas->vert_shader);
-		canvas->vert_shader = JS_UNDEFINED;
-		canvas->vert = NULL;
-		if (JS_IsNull(value)) {
-			canvas->vert_shader = JS_UNDEFINED;
-			e = gf_evg_surface_set_vertex_shader(canvas->surface, NULL, NULL);
-#ifdef EVG_USE_JS_SHADER
-		} else if (JS_IsFunction(ctx, value)) {
-			canvas->vert_shader = JS_DupValue(ctx, value);
-			e = gf_evg_surface_set_vertex_shader(canvas->surface, evg_vert_shader_fun, canvas);
-#endif
-		} else if (JS_IsObject(value)) {
-			canvas->vert = JS_GetOpaque(value, shader_class_id);
-			if (!canvas->vert || (canvas->vert->mode != GF_EVG_SHADER_VERTEX))
-				return js_throw_err_msg(ctx, GF_BAD_PARAM, "Invalid fragment shader object");
-			canvas->vert_shader = JS_DupValue(ctx, value);
-			e = gf_evg_surface_set_vertex_shader(canvas->surface, evg_vert_shader_ops, canvas);
-		} else {
-			canvas->frag_shader = JS_UNDEFINED;
-			e = gf_evg_surface_set_fragment_shader(canvas->surface, NULL, NULL);
-		}
-		break;
-	case GF_EVG_CCW:
-		e = gf_evg_surface_set_ccw(canvas->surface, JS_ToBool(ctx, value) );
-		break;
-	case GF_EVG_BACKCULL:
-		e = gf_evg_surface_set_backcull(canvas->surface, JS_ToBool(ctx, value) );
-		break;
-	case GF_EVG_ANTIALIAS:
-		e = gf_evg_surface_set_antialias(canvas->surface, JS_ToBool(ctx, value) );
-		break;
-
-	case GF_EVG_DEPTH_BUFFER:
-	{
-		Float *depthb;
-		u32 dsize;
-		JS_FreeValue(ctx, canvas->depth_buffer);
-		canvas->depth_buffer = JS_UNDEFINED;
-		depthb = (Float *) evg_get_array(ctx, value, &dsize);
-		if (!depthb) {
-			canvas->depth_buffer = JS_NULL;
-			e = gf_evg_surface_set_depth_buffer(canvas->surface, NULL);
-		} else {
-			u32 req_size = canvas->width*canvas->height*sizeof(Float);
-			if (req_size>dsize) {
-				e = GF_BAD_PARAM;
-				gf_evg_surface_set_depth_buffer(canvas->surface, NULL);
-			} else {
-				canvas->depth_buffer = JS_DupValue(ctx, value);
-				e = gf_evg_surface_set_depth_buffer(canvas->surface, depthb);
-			}
-		}
-		break;
-	}
-
-	case GF_EVG_MINDEPTH:
-		EVG_GET_FLOAT(f, value);
-		e = gf_evg_surface_set_min_depth(canvas->surface, f);
-		break;
-	case GF_EVG_MAXDEPTH:
-		EVG_GET_FLOAT(f, value);
-		e = gf_evg_surface_set_max_depth(canvas->surface, f);
-		break;
-	case GF_EVG_DEPTHTEST:
-		if (JS_ToInt32(ctx, &ival, value))
-			return js_throw_err(ctx, GF_BAD_PARAM);
-		e = gf_evg_set_depth_test(canvas->surface, ival);
-		break;
-	case GF_EVG_POINTSIZE:
-		EVG_GET_FLOAT(f, value);
-		e = gf_evg_surface_set_point_size(canvas->surface, f);
-		break;
-	case GF_EVG_POINTSMOOTH:
-		e = gf_evg_surface_set_point_smooth(canvas->surface, JS_ToBool(ctx, value) );
-		break;
-	case GF_EVG_LINESIZE:
-		EVG_GET_FLOAT(f, value);
-		e = gf_evg_surface_set_line_size(canvas->surface, f);
-		break;
-	case GF_EVG_CLIP_ZERO:
-		e = gf_evg_surface_set_clip_zero(canvas->surface, JS_ToBool(ctx, value) ? GF_TRUE : GF_FALSE);
-		break;
-	case GF_EVG_DEPTH_TEST:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
-		e = gf_evg_set_depth_test(canvas->surface, ival);
-		break;
-	case GF_EVG_WRITE_DEPTH:
-		e = gf_evg_surface_write_depth(canvas->surface, JS_ToBool(ctx, value) ? GF_TRUE : GF_FALSE);
-		break;
-	}
-	if (e) return js_throw_err(ctx, e);
-
-	return JS_UNDEFINED;
-}
-
-static JSValue canvas3d_set_matrix(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool is_proj)
+static JSValue canvas_set_matrix_3d(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool is_proj)
 {
 	GF_Err e;
 	GF_Matrix mx;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
-	if (!canvas) return JS_EXCEPTION;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas) return GF_JS_EXCEPTION(c);
 
 	gf_mx_init(mx);
 	if (argc) {
@@ -1000,13 +1296,13 @@
 			JSValue v = JS_GetPropertyStr(c, argv[0], "length");
 			JS_ToInt32(c, &len, v);
 			JS_FreeValue(c, v);
-			if (len < 16) return JS_EXCEPTION;
+			if (len < 16) return GF_JS_EXCEPTION(c);
 			for (i=0; i<16; i++) {
 				Double val=0;
 				v = JS_GetPropertyUint32(c, argv[0], i);
 				s32 res = JS_ToFloat64(c, &val, v);
 				JS_FreeValue(c, v);
-				if (res) return JS_EXCEPTION;
+				if (res) return GF_JS_EXCEPTION(c);
 				mx.m[i] = FLT2FIX(val);
 			}
 		} else {
@@ -1017,15 +1313,15 @@
 		e = gf_evg_surface_set_projection(canvas->surface, &mx);
 	else
 		e = gf_evg_surface_set_modelview(canvas->surface, &mx);
-	return e ? JS_EXCEPTION : JS_UNDEFINED;
+	return e ? GF_JS_EXCEPTION(c) : JS_UNDEFINED;
 }
-static JSValue canvas3d_projection(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+static JSValue canvas_projection(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	return canvas3d_set_matrix(c, obj, argc, argv, GF_TRUE);
+	return canvas_set_matrix_3d(c, obj, argc, argv, GF_TRUE);
 }
-static JSValue canvas3d_modelview(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+static JSValue canvas_modelview(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
-	return canvas3d_set_matrix(c, obj, argc, argv, GF_FALSE);
+	return canvas_set_matrix_3d(c, obj, argc, argv, GF_FALSE);
 }
 
 uint8_t *evg_get_array(JSContext *ctx, JSValueConst obj, u32 *size)
@@ -1046,45 +1342,45 @@
 	*size = (u32) psize;
 	return res;
 }
-static JSValue canvas3d_draw_array(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+static JSValue canvas_draw_array(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	uint8_t *indices=NULL;
 	uint8_t *vertices=NULL;
 	u32 idx_size=0, vx_size, nb_comp=3;
 	GF_Err e;
 	GF_EVGPrimitiveType prim_type=GF_EVG_TRIANGLES;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
-	if (!canvas || argc<2) return JS_EXCEPTION;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas || argc<2) return GF_JS_EXCEPTION(c);
 
 	indices = evg_get_array(c, argv[0], &idx_size);
 	vertices = evg_get_array(c, argv[1], &vx_size);
-	if (!indices || ! vertices) return JS_EXCEPTION;
+	if (!indices || ! vertices) return GF_JS_EXCEPTION(c);
 	if (argc>2) {
 		JS_ToInt32(c, (s32 *)&prim_type, argv[2]);
-		if (!prim_type) return JS_EXCEPTION;
+		if (!prim_type) return GF_JS_EXCEPTION(c);
 		if (argc>3) {
 			JS_ToInt32(c, &nb_comp, argv[3]);
-			if ((nb_comp<2) || (nb_comp>4)) return JS_EXCEPTION;
+			if ((nb_comp<2) || (nb_comp>4)) return GF_JS_EXCEPTION(c);
 		}
 	}
 	if (vx_size % nb_comp)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	idx_size /= sizeof(s32);
 	vx_size /= sizeof(Float);
 	e = gf_evg_surface_draw_array(canvas->surface, (u32 *)indices, idx_size, (Float *)vertices, vx_size, nb_comp, prim_type);
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 
 	return JS_UNDEFINED;
 }
 
 static void text_update_path(GF_JSText *txt, Bool for_centered);
 
-static JSValue canvas3d_draw_path(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
+static JSValue canvas_draw_path(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Err e = GF_OK;
 	Float z = 0;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
-	if (!canvas || argc<1) return JS_EXCEPTION;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas || argc<1) return GF_JS_EXCEPTION(ctx);
 	if (argc>1) {
 		EVG_GET_FLOAT(z, argv[1]);
 	}
@@ -1102,25 +1398,25 @@
 	if (e) return js_throw_err(ctx, e);
 	return JS_UNDEFINED;
 }
-static JSValue canvas3d_clear_depth(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
+static JSValue canvas_clear_depth(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Err e;
 	Float depth = 1.0;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
-	if (!canvas) return JS_EXCEPTION;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas) return GF_JS_EXCEPTION(ctx);
 	if (argc)
 		EVG_GET_FLOAT(depth, argv[0]);
 
 	e = gf_evg_surface_clear_depth(canvas->surface, depth);
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(ctx);
 	return JS_UNDEFINED;
 }
-static JSValue canvas3d_viewport(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
+static JSValue canvas_viewport(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	s32 x, y, w, h;
 	GF_Err e;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
-	if (!canvas) return JS_EXCEPTION;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas) return GF_JS_EXCEPTION(ctx);
 	if (argc) {
 		if (argc<4) return js_throw_err(ctx, GF_BAD_PARAM);
 		if (JS_ToInt32(ctx, &x, argv[0])) return js_throw_err(ctx, GF_BAD_PARAM);;
@@ -1133,13 +1429,14 @@
 		h = canvas->height;
 	}
 	e = gf_evg_surface_viewport(canvas->surface, x, y, w, h);
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(ctx);
 	return JS_UNDEFINED;
 }
 
 
 enum
 {
+	//0 reserved for last op
 	EVG_OP_IF=1,
 	EVG_OP_ELSE,
 	EVG_OP_ELSEIF,
@@ -1206,6 +1503,9 @@
 	VAR_FRAG_Y,
 	VAR_FRAG_DEPTH,
 	VAR_FRAG_W,
+	VAR_FRAG_TX_COORD,
+	VAR_FRAG_TX_COORDI,
+	VAR_FRAG_ODD,
 	VAR_UNIFORM,
 	VAR_VERTEX_IN,
 	VAR_VERTEX_OUT,
@@ -1268,205 +1568,272 @@
 
 */
 
-static Bool evg_shader_ops(GF_JSCanvas *canvas, EVGShader *shader, GF_EVGFragmentParam *frag, GF_EVGVertexParam *vert)
+static Bool evg_shader_ops(GF_JSCanvas *canvas, EVGShader *shader, GF_EVGFragmentParam *frag, GF_EVGVertexParam *vert, ShaderVar *vars)
 {
-	u32 op_idx, dim;
+	register u32 dim;
+	Bool frag_valid = GF_FALSE;
 	GF_Vec4 tmpl, tmpr;
 	GF_Vec4 *left_val, *right_val, *right2_val;
-	u32 if_level=0;
-	u32 nif_level=0;
-	Bool cond_res;
+	GF_IVec4 *right_vali;
+	register u32 if_level=0;
+	register u32 nif_level=0;
+	register Bool cond_res;
+	register ShaderOp *op = &shader->ops[0];
+
+	//assign to dummy values, this will prevent any badly formatted shader to assign a value to a NULL left-val or read a null right-val
+//	tmpl.x = tmpl.y = tmpl.z = tmpl.q = 0;
+//	tmpr.x = tmpr.y = tmpr.z = tmpr.q = 0;
+//	memset(&tmpl, 0, sizeof(tmpl));
+//	tmpr = tmpl;
 
-	//assign to dummy values, this will prevent any badly formated shader to assign a value to a NULL left-val or read a null right-val
-	tmpl.x = tmpl.y = tmpl.z = tmpl.q = 0;
 	left_val = &tmpl;
-	tmpr.x = tmpr.y = tmpr.z = tmpr.q = 0;
 	right_val = &tmpr;
+	right_vali = (GF_IVec4 *) &tmpr;
 
-	for (op_idx=0; op_idx<shader->nb_ops; op_idx++) {
+	while ((++op)->op_type) {
 		u32 next_idx, idx, var_idx;
 		Bool has_next, norm_result=GF_FALSE;
 		u8 right_val_type, left_val_type=0;
 		u8 *left_val_type_ptr=NULL;
-		ShaderOp *op = &shader->ops[op_idx];
 
-		if (op->op_type==EVG_OP_GOTO) {
-			u32 stack_idx = op->left_value;
-			if (op->uni_name) stack_idx = op->ival;
+		if (shader->has_branches) {
+			if (op->op_type == EVG_OP_GOTO) {
+				u32 stack_idx = op->left_value;
+				if (op->uni_name) stack_idx = op->ival;
 
-			if (!stack_idx || (stack_idx > shader->nb_ops)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Shader] Invalid goto operation, stack index %d not in stack indices [1, %d]\n", op->left_value, shader->nb_ops));
-				shader->invalid = GF_TRUE;
-				return GF_FALSE;
+				if (!stack_idx || (stack_idx > shader->nb_ops)) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Shader] Invalid goto operation, stack index %d not in stack indices [1, %d]\n", op->left_value, shader->nb_ops));
+					shader->invalid = GF_TRUE;
+					return GF_FALSE;
+				}
+				//op index in goto are 1-based, and our first op is a dummy one
+				op = &shader->ops[stack_idx];
+			} else if (op->op_type == EVG_OP_ELSE) {
+				if (nif_level) {
+					if (nif_level==1) {
+						nif_level=0;
+						if_level++;
+					}
+				} else if (if_level) {
+					if_level--;
+					nif_level++;
+				}
+				continue;
+			} else if (op->op_type == EVG_OP_END) {
+				assert(nif_level || if_level);
+				if (nif_level) nif_level--;
+				else if (if_level) if_level--;
+				continue;
 			}
-			op_idx = stack_idx - 1;
-			op = &shader->ops[op_idx];
-		}
 
-		if (op->op_type==EVG_OP_ELSE) {
 			if (nif_level) {
-				if (nif_level==1) {
-					nif_level=0;
-					if_level++;
+				if (op->op_type==EVG_OP_IF) {
+					nif_level++;
 				}
-			} else if (if_level) {
-				if_level--;
-				nif_level++;
-			}
-			continue;
-		}
-		if (op->op_type==EVG_OP_END) {
-			assert(nif_level || if_level);
-			if (nif_level) nif_level--;
-			else if (if_level) if_level--;
-			continue;
-		}
-		if (nif_level) {
-			if (op->op_type==EVG_OP_IF) {
-				nif_level++;
+				continue;
 			}
-			continue;
 		}
 
 		dim=4;
-		if (op->left_value==VAR_FRAG_ARGB) {
+		switch (op->left_value) {
+		case VAR_FRAG_ARGB:
 			left_val = &frag->color;
 			left_val_type = COMP_V4;
 			frag->frag_valid = GF_EVG_FRAG_RGB;
-		} else if (op->left_value==VAR_FRAG_YUV) {
+			frag_valid=GF_TRUE;
+			break;
+		case VAR_FRAG_YUV:
 			left_val = &frag->color;
 			left_val_type = COMP_V4;
 			frag->frag_valid = GF_EVG_FRAG_YUV;
-		} else if (op->left_value==VAR_FRAG_X) {
+			frag_valid=GF_TRUE;
+			break;
+		case VAR_FRAG_X:
 			left_val = &tmpl;
 			tmpl.x = frag->screen_x;
 			left_val_type = COMP_FLOAT;
-		} else if (op->left_value==VAR_FRAG_Y) {
+			break;
+		case VAR_FRAG_Y:
 			left_val = &tmpl;
 			tmpl.x = frag->screen_y;
 			left_val_type = COMP_FLOAT;
-		} else if (op->left_value==VAR_FRAG_W) {
+			break;
+		case VAR_FRAG_W:
 			left_val = &tmpl;
 			tmpl.x = frag->persp_denum;
 			left_val_type = COMP_FLOAT;
-		} else if (op->left_value==VAR_FRAG_DEPTH) {
+			break;
+		case VAR_FRAG_DEPTH:
 			left_val = (GF_Vec4 *) &frag->depth;
 			left_val_type = COMP_FLOAT;
-		} else if (op->left_value==VAR_VERTEX_IN) {
+			break;
+		case VAR_FRAG_ODD:
+			left_val = &tmpl;
+			tmpl.x = frag->odd_flag;
+			left_val_type = COMP_BOOL;
+			break;
+		case VAR_VERTEX_IN:
 			left_val = (GF_Vec4 *) &vert->in_vertex;
 			left_val_type = COMP_V4;
-		} else if (op->left_value==VAR_VERTEX_OUT) {
+			break;
+		case VAR_VERTEX_OUT:
 			left_val = (GF_Vec4 *) &vert->out_vertex;
 			left_val_type = COMP_V4;
-		} else if (op->left_value==VAR_VAI) {
+			break;
+		case VAR_VAI:
 			left_val = (GF_Vec4 *) &op->vai.vai->anchors[vert->vertex_idx_in_prim];
 			left_val_type = COMP_V4;
 			norm_result = op->vai.vai->normalize;
-		} else if (op->left_value) {
+			break;
+		case 0:
+			break;
+		default:
+			{
 			u32 l_var_idx = op->left_value - EVG_FIRST_VAR_ID-1;
-			left_val = &shader->vars[l_var_idx].vecval;
-			left_val_type = shader->vars[l_var_idx].value_type;
-			left_val_type_ptr = & shader->vars[l_var_idx].value_type;
+			left_val = &vars[l_var_idx].vecval;
+			left_val_type = vars[l_var_idx].value_type;
+			left_val_type_ptr = & vars[l_var_idx].value_type;
+			}
+			break;
 		}
 
 		if (op->right_value>EVG_FIRST_VAR_ID) {
 			var_idx = op->right_value - EVG_FIRST_VAR_ID-1;
-			right_val = &shader->vars[var_idx].vecval;
-			right_val_type = shader->vars[var_idx].value_type;
-		} else if ((op->right_value==VAR_VAI) && op->vai.vai) {
-			vai_call_lerp(op->vai.vai, frag);
-			dim = MIN(4, op->vai.vai->result.dim);
-			right_val = (GF_Vec4 *) &op->vai.vai->result.values[0];
-			right_val_type = op->vai.vai->result.comp_type;
-		} else if ((op->right_value==VAR_VA) && op->va.va) {
-			u32 va_idx, j, nb_v_per_prim=3;
-			EVG_VA *va = op->va.va;
+			right_val = &vars[var_idx].vecval;
+			right_val_type = vars[var_idx].value_type;
+		} else {
+			right_val_type = 0;
 
-			if (vert->ptype == GF_EVG_LINES)
-				nb_v_per_prim=2;
-			else if (vert->ptype == GF_EVG_POINTS)
-				nb_v_per_prim=1;
+			switch (op->right_value) {
+			case VAR_VAI:
+				if (op->vai.vai) {
+					vai_call_lerp(op->vai.vai, frag, (Float *) &tmpr);
+//					dim = MIN(4, op->vai.vai->result.dim);
+					dim = op->vai.vai->result.dim;
+					right_val = &tmpr;
+					right_val_type = op->vai.vai->result.comp_type;
+				}
+				break;
+			case VAR_VA:
+				if (op->va.va) {
+					u32 va_idx, j, nb_v_per_prim=3;
+					EVG_VA *va = op->va.va;
+
+					if (vert->ptype == GF_EVG_LINES)
+						nb_v_per_prim=2;
+					else if (vert->ptype == GF_EVG_POINTS)
+						nb_v_per_prim=1;
 
-			if (va->interp_type==GF_EVG_VAI_PRIMITIVE) {
-				va_idx = vert->prim_index * va->nb_comp;
-			}
-			else if (va->interp_type==GF_EVG_VAI_VERTEX_INDEX) {
-				va_idx = vert->vertex_idx * va->nb_comp;
-			} else {
-				va_idx = vert->prim_index * nb_v_per_prim * va->nb_comp;
-			}
+					if (va->interp_type==GF_EVG_VAI_PRIMITIVE) {
+						va_idx = vert->prim_index * va->nb_comp;
+					}
+					else if (va->interp_type==GF_EVG_VAI_VERTEX_INDEX) {
+						va_idx = vert->vertex_idx * va->nb_comp;
+					} else {
+						va_idx = vert->prim_index * nb_v_per_prim * va->nb_comp;
+					}
 
-			if (va_idx+va->nb_comp > va->nb_values)
-				return GF_FALSE;
+					if (va_idx+va->nb_comp > va->nb_values)
+						return GF_FALSE;
 
-			right_val = &tmpr;
-			right_val->x = right_val->y = right_val->z = right_val->q = 0;
-			assert(va->nb_comp<=4);
-			for (j=0; j<va->nb_comp; j++) {
-				((Float *)right_val)[j] = va->values[va_idx+j];
-			}
-			if (va->normalize) {
-				if (va->nb_comp==2) {
-					Float len;
-					if (!right_val->x) len = ABS(right_val->y);
-					else if (!right_val->y) len = ABS(right_val->x);
-					else len = sqrtf(right_val->x*right_val->x + right_val->y*right_val->y);
-					if (len) {
-						right_val->x/=len;
-						right_val->y/=len;
+					right_val = &tmpr;
+					right_val->x = right_val->y = right_val->z = right_val->q = 0;
+					assert(va->nb_comp<=4);
+					for (j=0; j<va->nb_comp; j++) {
+						((Float *)right_val)[j] = va->values[va_idx+j];
 					}
-				} else {
-					gf_vec_norm((GF_Vec *) right_val);
-				}
+					if (va->normalize) {
+						if (va->nb_comp==2) {
+							Float len;
+							if (!right_val->x) len = ABS(right_val->y);
+							else if (!right_val->y) len = ABS(right_val->x);
+							else len = sqrtf(right_val->x*right_val->x + right_val->y*right_val->y);
+							if (len) {
+								right_val->x/=len;
+								right_val->y/=len;
+							}
+						} else {
+							gf_vec_norm((GF_Vec *) right_val);
+						}
 
+					}
+					right_val_type = va->att_type;
+				}
+				break;
+			case VAR_MATRIX:
+				if (op->mx.mx) {
+					if (op->op_type==EVG_OP_MUL) {
+						gf_mx_apply_vec_4x4(op->mx.mx, left_val);
+						continue;
+					}
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Shader] Invalid operation for right value matrix\n"));
+					shader->invalid = GF_TRUE;
+					return GF_FALSE;
+				}
+				break;
+			case VAR_FRAG_ARGB:
+				right_val = &frag->color;
+				right_val_type = COMP_V4;
+				break;
+			case VAR_FRAG_YUV:
+				right_val = &frag->color;
+				right_val_type = COMP_V4;
+				break;
+			case VAR_FRAG_X:
+				right_val = &tmpr;
+				tmpr.x = frag->screen_x;
+				right_val_type = COMP_FLOAT;
+				break;
+			case VAR_FRAG_Y:
+				right_val = &tmpr;
+				tmpr.x = frag->screen_y;
+				right_val_type = COMP_FLOAT;
+				break;
+			case VAR_FRAG_W:
+				right_val = &tmpr;
+				tmpr.x = frag->persp_denum;
+				right_val_type = COMP_FLOAT;
+				break;
+			case VAR_FRAG_DEPTH:
+				right_val = &tmpr;
+				tmpr.x = frag->depth;
+				right_val_type = COMP_FLOAT;
+				break;
+			case VAR_VERTEX_IN:
+				right_val = &vert->in_vertex;
+				right_val_type = COMP_V4;
+				break;
+			case VAR_VERTEX_OUT:
+				right_val = &vert->out_vertex;
+				right_val_type = COMP_V4;
+				break;
+			case VAR_FRAG_TX_COORD:
+				right_val = &tmpr;
+				right_val->x = ((Float)frag->tx_x) / frag->tx_width;
+				right_val->y = ((Float)frag->tx_y) / frag->tx_height;
+				right_val_type = COMP_V2_XY;
+				break;
+			case VAR_FRAG_TX_COORDI:
+				right_val = &tmpr;
+				right_vali->x = frag->tx_x;
+				right_vali->y = frag->tx_y;
+				right_val_type = COMP_V2_XY | COMP_FLAG_INT;
+				break;
+			case VAR_FRAG_ODD:
+				right_val = &tmpr;
+				right_val->x = frag->odd_flag;
+				right_val_type = COMP_BOOL;
+				break;
+			default:
+				if (!op->right_value || (op->right_value==VAR_UNIFORM) ) {
+					right_val = (GF_Vec4 *) &op->vec[0];
+					right_val_type = op->right_value_type;
+				}
+				break;
 			}
-			right_val_type = va->att_type;
-		} else if ((op->right_value==VAR_MATRIX) && op->mx.mx) {
-			if (op->op_type==EVG_OP_MUL) {
-				gf_mx_apply_vec_4x4(op->mx.mx, left_val);
-				continue;
-			}
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Shader] Invalid operation for right value matrix\n"));
-			shader->invalid = GF_TRUE;
-			return GF_FALSE;
-		} else if (op->right_value==VAR_FRAG_ARGB) {
-			right_val = &frag->color;
-			right_val_type = COMP_V4;
-		} else if (op->right_value==VAR_FRAG_YUV) {
-			right_val = &frag->color;
-			right_val_type = COMP_V4;
-		} else if (op->right_value==VAR_FRAG_X) {
-			right_val = &tmpr;
-			tmpr.x = frag->screen_x;
-			right_val_type = COMP_FLOAT;
-		} else if (op->right_value==VAR_FRAG_Y) {
-			right_val = &tmpr;
-			tmpr.x = frag->screen_y;
-			right_val_type = COMP_FLOAT;
-		} else if (op->right_value==VAR_FRAG_W) {
-			right_val = &tmpr;
-			tmpr.x = frag->persp_denum;
-			right_val_type = COMP_FLOAT;
-		} else if (op->right_value==VAR_FRAG_DEPTH) {
-			right_val = &tmpr;
-			tmpr.x = frag->depth;
-			right_val_type = COMP_FLOAT;
-		} else if (op->right_value==VAR_VERTEX_IN) {
-			right_val = &vert->in_vertex;
-			right_val_type = COMP_V4;
-		} else if (op->right_value==VAR_VERTEX_OUT) {
-			right_val = &vert->out_vertex;
-			right_val_type = COMP_V4;
-		} else if (!op->right_value || (op->right_value==VAR_UNIFORM) ) {
-			right_val = (GF_Vec4 *) &op->vec[0];
-			right_val_type = op->right_value_type;
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Shader] Invalid right-value in operation %d\n", op_idx));
-			shader->invalid = GF_TRUE;
-			return GF_FALSE;
 		}
 		if (!right_val_type) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Shader] Invalid right-value type in operation %d\n", op_idx));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Shader] Invalid right-value type in operation (stack index %d)\n", (u32) ((op - shader->ops) / sizeof(ShaderOp)) ));
 			shader->invalid = GF_TRUE;
 			return GF_FALSE;
 		}
@@ -1504,44 +1871,57 @@
 					left_val_type = *left_val_type_ptr = right_val_type;
 				}
 
-				if (right_val_type==COMP_BOOL) {
-					if (left_val_type_ptr) {
-						*((Bool *) left_val) = *((Bool *) right_val) ? GF_TRUE : GF_FALSE;
-					} else {
-						left_val->x = (Float) ( *(Bool *) right_val ? 1.0 : 0.0 );
-						left_val->y = left_val->z = left_val->q = left_val->x;
-					}
-				} else if (right_val_type==COMP_INT) {
-					if (left_val_type_ptr || (left_val_type==COMP_INT)) {
-						*((s32 *) left_val) = *(s32 *) right_val;
-					} else {
-						left_val->x = (Float) *(s32 *) right_val;
-						left_val->y = left_val->z = left_val->q = left_val->x;
-					}
-				} else if (right_val_type==COMP_FLOAT) {
-					if (left_val_type_ptr) {
-						*((Float *) left_val) = *(Float *) right_val;
-					} else {
-						left_val->x = *(Float *) right_val;
-						left_val->y = left_val->z = left_val->q = left_val->x;
-					}
-				} else if ((right_val_type==COMP_V4) || (op->right_value_type==COMP_V4)) {
+				if (op->right_value_type==COMP_V4) {
 					*left_val = *right_val;
 					if (dim<4) left_val->q = 1.0;
 				} else {
-					Float *srcs = (Float *) &right_val->x;
-
-					GET_FIRST_COMP
-					if (left_val_type & COMP_X) { left_val->x = srcs[idx]; GET_NEXT_COMP }
-					if (left_val_type & COMP_Y) { left_val->y = srcs[idx]; GET_NEXT_COMP }
-					if (left_val_type & COMP_Z) { left_val->z = srcs[idx]; GET_NEXT_COMP }
-					if (dim<4) left_val->q = 1.0;
-					else if (left_val_type & COMP_Q) { left_val->q = srcs[idx]; }
+					switch (right_val_type) {
+					case COMP_BOOL:
+						if (left_val_type_ptr) {
+							*((Bool *) left_val) = *((Bool *) right_val) ? GF_TRUE : GF_FALSE;
+						} else {
+							left_val->x = (Float) ( *(Bool *) right_val ? 1.0 : 0.0 );
+							left_val->y = left_val->z = left_val->q = left_val->x;
+						}
+						break;
+					case COMP_INT:
+						if (left_val_type_ptr || (left_val_type==COMP_INT)) {
+							*((s32 *) left_val) = *(s32 *) right_val;
+						} else {
+							left_val->x = (Float) *(s32 *) right_val;
+							left_val->y = left_val->z = left_val->q = left_val->x;
+						}
+						break;
+					case COMP_FLOAT:
+						if (left_val_type_ptr) {
+							*((Float *) left_val) = *(Float *) right_val;
+						} else {
+							left_val->x = *(Float *) right_val;
+							left_val->y = left_val->z = left_val->q = left_val->x;
+						}
+						break;
+					case COMP_V4:
+						*left_val = *right_val;
+						if (dim<4) left_val->q = 1.0;
+						break;
+					default:
+					{
+						Float *srcs = (Float *) &right_val->x;
+
+						GET_FIRST_COMP
+						if (left_val_type & COMP_X) { left_val->x = srcs[idx]; GET_NEXT_COMP }
+						if (left_val_type & COMP_Y) { left_val->y = srcs[idx]; GET_NEXT_COMP }
+						if (left_val_type & COMP_Z) { left_val->z = srcs[idx]; GET_NEXT_COMP }
+						if (dim<4) left_val->q = 1.0;
+						else if (left_val_type & COMP_Q) { left_val->q = srcs[idx]; }
+					}
+						break;
+					}
 				}
 			}
 			//partial assignment, only valid for float sources
 			else {
-				Bool use_const = GF_FALSE;
+				Bool use_const;
 				Float cval;
 				if (right_val_type==COMP_FLOAT) {
 					use_const = GF_TRUE;
@@ -1549,7 +1929,10 @@
 				} else if (right_val_type==COMP_INT) {
 					use_const = GF_TRUE;
 					cval = (Float) ( *(s32*)right_val);
+				} else {
+					use_const = GF_FALSE;
 				}
+
 				if (use_const) {
 					if (op->left_value_type & COMP_X) left_val->x = cval;
 					if (op->left_value_type & COMP_Y) left_val->y = cval;
@@ -1571,7 +1954,8 @@
 
 #define BASE_OP(_opv, _opv2)\
 			if (op->left_value_type==COMP_V4) {\
-				if (right_val_type==COMP_INT) {\
+				switch (right_val_type) {\
+				case COMP_INT: \
 					if (left_val_type == COMP_INT) {\
 						*((s32 *) left_val) _opv *(s32 *) right_val;\
 					} else if (left_val_type == COMP_FLOAT) {\
@@ -1582,7 +1966,8 @@
 						left_val->z _opv *(s32 *) right_val;\
 						left_val->q _opv *(s32 *) right_val;\
 					}\
-				} else if (right_val_type==COMP_FLOAT) {\
+					break;\
+				case COMP_FLOAT:\
 					if (left_val_type == COMP_INT) {\
 						left_val->x = *((s32 *) left_val) _opv2 right_val->x;\
 						*left_val_type_ptr = COMP_FLOAT;\
@@ -1594,8 +1979,11 @@
 						left_val->z _opv right_val->x;\
 						left_val->q _opv right_val->x;\
 					}\
-				} else if (right_val_type==COMP_BOOL) {\
-				} else {\
+					break;\
+				case COMP_BOOL:\
+					break;\
+				default:\
+				{\
 					Float *srcs = (Float *) &right_val->x;\
 					GET_FIRST_COMP\
 					if (left_val_type & COMP_X) { left_val->x _opv srcs[idx]; GET_NEXT_COMP } \
@@ -1603,6 +1991,8 @@
 					if (left_val_type & COMP_Z) { left_val->z _opv srcs[idx]; GET_NEXT_COMP } \
 					if (left_val_type & COMP_Q) { left_val->q _opv srcs[idx]; }\
 				}\
+					break;\
+				}\
 			}\
 			else {\
 				Bool use_const = GF_FALSE;\
@@ -1648,8 +2038,10 @@
 #define BASE_COND(_opv)\
 		cond_res=GF_FALSE;\
 		if (op->left_value_type==COMP_V4) {\
-			if ((right_val_type==COMP_INT) || (right_val_type==COMP_BOOL)) {\
-				if (left_val_type == COMP_INT) {\
+			switch (right_val_type) {\
+			case COMP_INT:\
+			case COMP_BOOL:\
+				if ((left_val_type == COMP_INT) || (left_val_type == COMP_BOOL)) {\
 					cond_res = ( *((s32 *) left_val) _opv *(s32 *) right_val) ? GF_TRUE : GF_FALSE;\
 				} else if (left_val_type == COMP_FLOAT) {\
 					cond_res = (left_val->x _opv *(s32 *) right_val) ? GF_TRUE : GF_FALSE;\
@@ -1659,7 +2051,8 @@
 							(left_val->z _opv *(s32 *) right_val) && \
 							(left_val->q _opv *(s32 *) right_val) ) ? GF_TRUE : GF_FALSE;\
 				}\
-			} else if (right_val_type==COMP_FLOAT) {\
+				break;\
+			case COMP_FLOAT:\
 				if (left_val_type == COMP_INT) {\
 					cond_res = ( *((s32 *) left_val) _opv right_val->x) ? GF_TRUE : GF_FALSE;\
 				} else if (left_val_type == COMP_FLOAT) {\
@@ -1670,7 +2063,9 @@
 							(left_val->z _opv right_val->x) && \
 							(left_val->q _opv right_val->x) ) ? GF_TRUE : GF_FALSE;\
 				}\
-			} else {\
+				break;\
+			default:\
+			{\
 				cond_res=GF_TRUE;\
 				Float *srcs = (Float *) &right_val->x;\
 				GET_FIRST_COMP\
@@ -1679,6 +2074,8 @@
 				if (left_val_type & COMP_Z) { if (! (left_val->z _opv srcs[idx]) ) cond_res = GF_FALSE; GET_NEXT_COMP } \
 				if (left_val_type & COMP_Q) { if (! (left_val->q _opv srcs[idx]) ) cond_res = GF_FALSE; }\
 			}\
+				break;\
+			}\
 		}\
 		else {\
 			Bool use_const = GF_FALSE;\
@@ -1706,13 +2103,26 @@
 			}\
 		}
 
-			if (op->cond_type==EVG_OP_LESS) { BASE_COND(<) }
-			else if (op->cond_type==EVG_OP_LESS_EQUAL) { BASE_COND(<=) }
-			else if (op->cond_type==EVG_OP_GREATER) { BASE_COND(>) }
-			else if (op->cond_type==EVG_OP_GREATER_EQUAL) { BASE_COND(>=) }
-			else if (op->cond_type==EVG_OP_EQUAL) { BASE_COND(==) }
-			else if (op->cond_type==EVG_OP_NOT_EQUAL) { BASE_COND(!=) }
-			else break;
+			switch (op->cond_type) {
+			case EVG_OP_LESS:
+				{ BASE_COND(<) }
+				break;
+			case EVG_OP_LESS_EQUAL:
+				{ BASE_COND(<=) }
+				break;
+			case EVG_OP_GREATER:
+				{ BASE_COND(>) }
+				break;
+			case EVG_OP_GREATER_EQUAL:
+				{ BASE_COND(>=) }
+				break;
+			case EVG_OP_EQUAL:
+				{ BASE_COND(==) }
+				break;
+			case EVG_OP_NOT_EQUAL:
+				{ BASE_COND(!=) }
+				break;
+			}
 
 			if (cond_res) if_level++;
 			else nif_level++;
@@ -1723,10 +2133,21 @@
 			if (left_val_type_ptr) {
 				*left_val_type_ptr = COMP_V4;
 			}
-			if (op->left_value_type==COMP_V4) {
-				gf_evg_stencil_get_pixel_f(op->tx->stencil, right_val->x, right_val->y, &left_val->x, &left_val->y, &left_val->z, &left_val->q);
+			if ((right_val_type==(COMP_V2_XY|COMP_FLAG_INT)) && (op->left_value == VAR_FRAG_ARGB)) {
+				u32 tx = ((GF_IVec4 *)right_val)->x * op->tx->width / frag->tx_width;
+				u32 ty = ((GF_IVec4 *)right_val)->y * op->tx->height / frag->tx_height;
+				if (op->tx->wide) {
+					frag->color_pack_wide = gf_evg_stencil_get_pixel_wide(op->tx->stencil, tx, ty);
+				} else {
+					frag->color_pack = gf_evg_stencil_get_pixel(op->tx->stencil, tx, ty);
+				}
+				frag->frag_valid = GF_EVG_FRAG_RGB_PACK;
+				frag_valid=GF_TRUE;
+			}
+			else if (op->left_value_type==COMP_V4) {
+				*left_val = gf_evg_stencil_get_pixel_f(op->tx->stencil, right_val->x, right_val->y);
 			} else {
-				gf_evg_stencil_get_pixel_f(op->tx->stencil, right_val->x, right_val->y, &tmpr.x, &tmpr.y, &tmpr.z, &tmpr.q);
+				tmpr = gf_evg_stencil_get_pixel_f(op->tx->stencil, right_val->x, right_val->y);
 				if (op->left_value_type & COMP_X) left_val->x = tmpr.x;
 				if (op->left_value_type & COMP_Y) left_val->y = tmpr.y;
 				if (op->left_value_type & COMP_Z) left_val->z = tmpr.z;
@@ -1738,10 +2159,22 @@
 			if (left_val_type_ptr) {
 				*left_val_type_ptr = COMP_V4;
 			}
-			if (op->left_value_type==COMP_V4) {
-				gf_evg_stencil_get_pixel_yuv_f(op->tx->stencil, right_val->x, right_val->y, &left_val->x, &left_val->y, &left_val->z, &left_val->q);
+
+			if ((right_val_type==(COMP_V2_XY|COMP_FLAG_INT)) && (op->left_value == VAR_FRAG_YUV)) {
+				u32 tx = ((GF_IVec4 *)right_val)->x * op->tx->width / frag->tx_width;
+				u32 ty = ((GF_IVec4 *)right_val)->y * op->tx->height / frag->tx_height;
+				if (op->tx->wide) {
+					frag->color_pack_wide = gf_evg_stencil_get_pixel_yuv_wide(op->tx->stencil, tx, ty);
+				} else {
+					frag->color_pack = gf_evg_stencil_get_pixel_yuv(op->tx->stencil, tx, ty);
+				}
+				frag->frag_valid = GF_EVG_FRAG_YUV_PACK;
+				frag_valid=GF_TRUE;
+			}
+			else if (op->left_value_type==COMP_V4) {
+				*left_val = gf_evg_stencil_get_pixel_yuv_f(op->tx->stencil, right_val->x, right_val->y);
 			} else {
-				gf_evg_stencil_get_pixel_yuv_f(op->tx->stencil, right_val->x, right_val->y, &tmpr.x, &tmpr.y, &tmpr.z, &tmpr.q);
+				tmpr = gf_evg_stencil_get_pixel_yuv_f(op->tx->stencil, right_val->x, right_val->y);
 				if (op->left_value_type & COMP_X) left_val->x = tmpr.x;
 				if (op->left_value_type & COMP_Y) left_val->y = tmpr.y;
 				if (op->left_value_type & COMP_Z) left_val->z = tmpr.z;
@@ -1750,7 +2183,7 @@
 			break;
 		case EVG_OP_DISCARD:
 			frag->frag_valid = 0;
-			return GF_TRUE;
+			return GF_FALSE;
 		case EVG_OP_NORMALIZE:
 			if (left_val_type_ptr) {
 				*left_val_type_ptr = COMP_V4;
@@ -1768,8 +2201,8 @@
 			if (left_val_type_ptr) {
 				*left_val_type_ptr = COMP_FLOAT;
 			}
-			right2_val = &shader->vars[op->right_value_second - EVG_FIRST_VAR_ID-1].vecval;
-			//right2_val_type = shader->vars[op->right_value_second - EVG_FIRST_VAR_ID-1].value_type;
+			right2_val = &vars[op->right_value_second - EVG_FIRST_VAR_ID-1].vecval;
+			//right2_val_type = vars[op->right_value_second - EVG_FIRST_VAR_ID-1].value_type;
 			gf_vec_diff(tmpr, *right_val, *right2_val);
 			left_val->x = gf_vec_len_p( (GF_Vec *) &tmpr);
 			break;
@@ -1778,16 +2211,16 @@
 			if (left_val_type_ptr) {
 				*left_val_type_ptr = COMP_FLOAT;
 			}
-			right2_val = &shader->vars[op->right_value_second - EVG_FIRST_VAR_ID-1].vecval;
-			//right2_val_type = shader->vars[op->right_value_second - EVG_FIRST_VAR_ID-1].value_type;
+			right2_val = &vars[op->right_value_second - EVG_FIRST_VAR_ID-1].vecval;
+			//right2_val_type = vars[op->right_value_second - EVG_FIRST_VAR_ID-1].value_type;
 			left_val->x = gf_vec_dot_p( (GF_Vec *) right_val, (GF_Vec *) right2_val);
 			break;
 		case EVG_OP_CROSS:
 			if (left_val_type_ptr) {
 				*left_val_type_ptr = COMP_V4;
 			}
-			right2_val = &shader->vars[op->right_value_second - EVG_FIRST_VAR_ID-1].vecval;
-			//right2_val_type = shader->vars[op->right_value_second - EVG_FIRST_VAR_ID-1].value_type;
+			right2_val = &vars[op->right_value_second - EVG_FIRST_VAR_ID-1].vecval;
+			//right2_val_type = vars[op->right_value_second - EVG_FIRST_VAR_ID-1].value_type;
 			* (GF_Vec *) left_val = gf_vec_cross_p( (GF_Vec *) right_val, (GF_Vec *) right2_val);
 			break;
 
@@ -1796,7 +2229,7 @@
 		*left_val_type_ptr = right_val_type;\
 	}\
 	var_idx = op->right_value_second - EVG_FIRST_VAR_ID-1;\
-	right2_val = &shader->vars[var_idx].vecval;\
+	right2_val = &vars[var_idx].vecval;\
 	if (right_val_type==COMP_FLOAT) {\
 		left_val->x = __fun(right_val->x, right2_val->x);\
 	} else {\
@@ -1910,8 +2343,8 @@
 				*left_val_type_ptr = right_val_type;
 			}
 			var_idx = op->right_value_second - EVG_FIRST_VAR_ID-1;
-			right2_val = &shader->vars[var_idx].vecval;
-			//right2_val_type = shader->vars[var_idx].value_type;
+			right2_val = &vars[var_idx].vecval;
+			//right2_val_type = vars[var_idx].value_type;
 			if (right_val_type==COMP_FLOAT) {
 				left_val->x = evg_float_clamp(left_val->x, right_val->x, right2_val->x);
 			} else {
@@ -1946,7 +2379,7 @@
 
 		case EVG_OP_PRINT:
 			if (op->right_value>EVG_FIRST_VAR_ID) {
-				fprintf(stderr, "%s: ", shader->vars[op->right_value - EVG_FIRST_VAR_ID - 1].name);
+				fprintf(stderr, "%s: ", vars[op->right_value - EVG_FIRST_VAR_ID - 1].name);
 			}
 			if (right_val_type==COMP_FLOAT) {
 				fprintf(stderr, "%g\n", right_val->x);
@@ -1963,20 +2396,58 @@
 			break;
 		}
 	}
-	return GF_TRUE;
+	return frag_valid;
 }
 
+static GF_JSTexture *tx = NULL;
+
 static Bool evg_frag_shader_ops(void *udta, GF_EVGFragmentParam *frag)
 {
 	GF_JSCanvas *canvas = (GF_JSCanvas *)udta;
+	return evg_shader_ops(canvas, canvas->frag, frag, NULL, frag->shader_udta);
+}
+
+static Bool evg_frag_shader_ops_init(void *udta, GF_EVGFragmentParam *frag, u32 th_id, Bool is_cleanup)
+{
+	u32 i;
+	GF_JSCanvas *canvas = (GF_JSCanvas *)udta;
 	if (!canvas->frag || canvas->frag->invalid) return GF_FALSE;
-	return evg_shader_ops(canvas, canvas->frag, frag, NULL);
+
+	if (!th_id) {
+		for (i=0; i<canvas->frag->nb_ops; i++) {
+			if (canvas->frag->ops[i].right_value==VAR_VAI) {
+				if (!vai_call_lerp_init(canvas->frag->ops[i].vai.vai, frag))
+					return GF_FALSE;
+			}
+		}
+		frag->shader_udta = canvas->frag->vars;
+		tx = canvas->frag->ops[1].tx;
+		return GF_TRUE;
+	}
+
+	if (is_cleanup) {
+		if (frag->shader_udta) {
+			gf_list_add(canvas->frag->vars_stack, frag->shader_udta);
+			frag->shader_udta = NULL;
+		}
+	} else {
+		ShaderVar *vars = gf_list_pop_back(canvas->frag->vars_stack);
+		if (!vars) {
+			vars = gf_malloc(sizeof(ShaderVar) * canvas->frag->nb_vars);
+			if (!vars) return GF_FALSE;
+			memcpy(vars, canvas->frag->vars, sizeof(ShaderVar) * canvas->frag->nb_vars);
+		}
+		frag->shader_udta = vars;
+	}
+
+	return GF_TRUE;
 }
+
 static Bool evg_vert_shader_ops(void *udta, GF_EVGVertexParam *vert)
 {
 	GF_JSCanvas *canvas = (GF_JSCanvas *)udta;
 	if (!canvas->vert || canvas->vert->invalid) return GF_FALSE;
-	return evg_shader_ops(canvas, canvas->vert, NULL, vert);
+	return evg_shader_ops(canvas, canvas->vert, NULL, vert, canvas->vert->vars);
 }
 
 static void shader_reset(JSRuntime *rt, EVGShader *shader)
@@ -2003,7 +2474,7 @@
 			gf_free(shader->ops[i].uni_name);
 			shader->ops[i].uni_name = NULL;
 		}
-		if (shader->ops[i].op_type==EVG_OP_SAMPLER) {
+		if ((shader->ops[i].op_type==EVG_OP_SAMPLER) || (shader->ops[i].op_type==EVG_OP_SAMPLER_YUV)) {
 			JS_FreeValueRT(rt, shader->ops[i].tx_ref);
 			shader->ops[i].tx_ref = JS_UNDEFINED;
 		}
@@ -2011,12 +2482,28 @@
 	}
 	shader->nb_ops = 0;
 	for (i=0; i<shader->nb_vars; i++) {
-		if (shader->vars[i].name) gf_free(shader->vars[i].name);
+		if (
+#ifdef BUILTIN_SHADERS
+			!shader->frag_shader &&
+#endif
+			shader->vars[i].name
+		) {
+			gf_free(shader->vars[i].name);
+		}
 		shader->vars[i].name = NULL;
 	}
 	shader->nb_vars = 0;
 	shader->invalid = GF_FALSE;
 	shader->disable_early_z = GF_FALSE;
+	shader->has_branches = GF_FALSE;
+}
+
+static void shader_reset_vars_stack(EVGShader *shader)
+{
+	while (gf_list_count(shader->vars_stack)) {
+		ShaderVar *vars = gf_list_pop_back(shader->vars_stack);
+		gf_free(vars);
+	}
 }
 static void shader_finalize(JSRuntime *rt, JSValue obj)
 {
@@ -2025,6 +2512,8 @@
 	shader_reset(rt, shader);
 	gf_free(shader->ops);
 	gf_free(shader->vars);
+	shader_reset_vars_stack(shader);
+	gf_list_del(shader->vars_stack);
 	gf_free(shader);
 }
 
@@ -2071,6 +2560,9 @@
 		if (!strcmp(val_name, "fragX")) return VAR_FRAG_X;
 		if (!strcmp(val_name, "fragY")) return VAR_FRAG_Y;
 		if (!strcmp(val_name, "fragW")) return VAR_FRAG_W;
+		if (!strcmp(val_name, "txCoord")) return VAR_FRAG_TX_COORD;
+		if (!strcmp(val_name, "txCoordi")) return VAR_FRAG_TX_COORDI;
+		if (!strcmp(val_name, "fragOdd")) return VAR_FRAG_ODD;
 	}
 	if (shader->mode==GF_EVG_SHADER_VERTEX) {
 		if (!strcmp(val_name, "vertex")) return VAR_VERTEX_IN;
@@ -2099,6 +2591,39 @@
 	return COMP_V4;
 }
 
+#ifdef BUILTIN_SHADERS
+static JSValue shader_push_builtin(JSContext *ctx, EVGShader *shader, int argc, JSValueConst *argv)
+{
+	u32 i;
+	Double dval;
+	const char *pname;
+	if (argc<2) return JS_UNDEFINED;
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(ctx);
+	pname = JS_ToCString(ctx, argv[0]);
+	for (i=0; i<shader->nb_vars; i++) {
+		ShaderVar *var = &shader->vars[i];
+		if (!var->name || strcmp(var->name, pname)) continue;
+		switch (var->value_type) {
+		case COMP_INT:
+			if (JS_ToInt32(ctx, &var->ival, argv[1])) return js_throw_err_msg(ctx, GF_BAD_PARAM, "Bad value specified for %s (int type)", var->name);
+			break;
+		case COMP_BOOL:
+			var->bval = JS_ToBool(ctx, argv[1]);
+			break;
+		case COMP_FLOAT:
+			if (JS_ToFloat64(ctx, &dval, argv[1])) return js_throw_err_msg(ctx, GF_BAD_PARAM, "Bad value specified for %s (float type)", var->name);
+			var->vecval.x = (Float) dval;
+			break;
+		case COMP_TX:
+			var->ptr = JS_GetOpaque(argv[1], texture_class_id);
+			if (!var->ptr) return js_throw_err_msg(ctx, GF_BAD_PARAM, "Bad value specified for %s (texture type)", var->name);
+			break;
+		}
+		break;
+	}
+	return JS_UNDEFINED;
+}
+#endif
 
 static JSValue shader_push(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
 {
@@ -2113,12 +2638,28 @@
 	u8 cond_type=0;
 	ShaderOp new_op;
 	EVGShader *shader = JS_GetOpaque(obj, shader_class_id);
-	if (!shader) return JS_EXCEPTION;
+	if (!shader) return GF_JS_EXCEPTION(ctx);
+
+#ifdef BUILTIN_SHADERS
+	if (shader->frag_shader)
+		return shader_push_builtin(ctx, shader, argc, argv);
+#endif
+
 	shader->invalid = GF_FALSE;
 	if (!argc) {
 		shader_reset(JS_GetRuntime(ctx), shader);
 		return JS_UNDEFINED;
 	}
+	if (!shader->nb_ops) {
+		if (shader->alloc_ops <= 2) {
+			shader->alloc_ops = 2;
+			shader->ops = gf_realloc(shader->ops, sizeof(ShaderOp)*shader->alloc_ops);
+			shader->ops[shader->nb_ops].uni_name = NULL;
+		}
+		shader->ops[0].op_type = 0;
+		shader->ops[1].op_type = 0;
+		shader->nb_ops = 1;
+	}
 
 	memset(&new_op, 0, sizeof(ShaderOp));
 	new_op.op_type = 0;
@@ -2153,9 +2694,11 @@
 			}
 			var_idx=1;
 			val_name = arg_str;
+			shader->has_branches = GF_TRUE;
 		}
 		else if (!strcmp(val_name, "else")) {
 			op_type = EVG_OP_ELSE;
+			shader->has_branches = GF_TRUE;
 			JS_FreeCString(ctx, arg_str);
 			goto op_parsed;
 		}
@@ -2170,10 +2713,12 @@
 		}
 		else if (!strcmp(val_name, "elseif")) {
 			op_type = EVG_OP_ELSEIF;
+			shader->has_branches = GF_TRUE;
 			var_idx=1;
 		}
 		else if (!strcmp(val_name, "goto")) {
 			op_type = EVG_OP_GOTO;
+			shader->has_branches = GF_TRUE;
 			JS_FreeCString(ctx, arg_str);
 
 			if (JS_IsString(argv[1])) {
@@ -2192,6 +2737,7 @@
 			goto op_parsed;
 		}
 		else if (!strcmp(val_name, "end")) {
+			shader->has_branches = GF_TRUE;
 			op_type = EVG_OP_END;
 			JS_FreeCString(ctx, arg_str);
 			goto op_parsed;
@@ -2222,6 +2768,7 @@
 			if (shader->alloc_vars <= shader->nb_vars) {
 				shader->alloc_vars = shader->nb_vars+1;
 				shader->vars = gf_realloc(shader->vars, sizeof(ShaderVar)*shader->alloc_vars);
+				shader_reset_vars_stack(shader);
 			}
 			shader->vars[shader->nb_vars].name = gf_strdup(val_name);
 			shader->nb_vars++;
@@ -2355,7 +2902,7 @@
 		op_type = EVG_OP_CLAMP;
 		dual_right_val = GF_TRUE;
 	} else {
-		JS_FreeCString(ctx, val_name);
+		JS_FreeCString(ctx, op_name);
 		shader->invalid = GF_TRUE;
 		return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid operand type, must be a string");
 	}
@@ -2392,7 +2939,7 @@
 	else if (JS_IsArray(ctx, argv[var_idx+2])) {
 		u32 idx, length;
 		JSValue comp = JS_GetPropertyStr(ctx, argv[var_idx+2], "length");
-		if (JS_ToInt32(ctx, &length, comp)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &length, comp)) return GF_JS_EXCEPTION(ctx);
 		JS_FreeValue(ctx, comp);
 		if (length>4) length=4;
 		right_value_type = 0;
@@ -2487,8 +3034,8 @@
 		new_op.tx_ref = JS_DupValue(ctx, new_op.tx_ref);
 	}
 
-	if (shader->alloc_ops <= shader->nb_ops) {
-		shader->alloc_ops = shader->nb_ops+1;
+	if (shader->alloc_ops <= shader->nb_ops+1) {
+		shader->alloc_ops = shader->nb_ops+2;
 		shader->ops = gf_realloc(shader->ops, sizeof(ShaderOp)*shader->alloc_ops);
 		shader->ops[shader->nb_ops].uni_name = NULL;
 	}
@@ -2500,15 +3047,17 @@
 	shader->ops[shader->nb_ops] = new_op;
 	shader->ops[shader->nb_ops].uni_name = uni_name;
 	shader->nb_ops++;
-	return JS_NewInt32(ctx, shader->nb_ops);
+	shader->ops[shader->nb_ops].op_type = 0;
+	//return 1-based index of op, excluding first dummy op (we hide it)
+	return JS_NewInt32(ctx, shader->nb_ops-1);
 }
 
 static JSValue shader_update(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	u32 i;
 	EVGShader *shader = JS_GetOpaque(obj, shader_class_id);
-	if (!shader) return JS_EXCEPTION;
-	if (shader->invalid) return JS_EXCEPTION;
+	if (!shader) return GF_JS_EXCEPTION(ctx);
+	if (shader->invalid) return GF_JS_EXCEPTION(ctx);
 
 	for (i=0; i<shader->nb_ops; i++) {
 		JSValue v;
@@ -2523,7 +3072,7 @@
 		else if (JS_IsNumber(v)) {
 			if (JS_IsInteger(v)) {
 				op->right_value_type = COMP_INT;
-				if (JS_ToInt32(ctx, &op->ival, v)) return JS_EXCEPTION;
+				if (JS_ToInt32(ctx, &op->ival, v)) return GF_JS_EXCEPTION(ctx);
 			} else {
 				op->right_value_type = COMP_FLOAT;
 				EVG_GET_FLOAT(op->vec[0], v)
@@ -2532,7 +3081,7 @@
 		else if (JS_IsArray(ctx, v)) {
 			u32 idx, length;
 			JSValue comp = JS_GetPropertyStr(ctx, v, "length");
-			if (JS_ToInt32(ctx, &length, comp)) return JS_EXCEPTION;
+			if (JS_ToInt32(ctx, &length, comp)) return GF_JS_EXCEPTION(ctx);
 			JS_FreeValue(ctx, comp);
 			if (length>4) length=4;
 			op->right_value_type = 0;
@@ -2549,7 +3098,7 @@
 			u32 idx;
 			u8 *data = evg_get_array(ctx, v, &data_size);
 			if (data) {
-				if (data_size%4) return JS_EXCEPTION;
+				if (data_size%4) return GF_JS_EXCEPTION(ctx);
 				vals = (Float*)data;
 				data_size/= sizeof(Float);
 				if (data_size>4) data_size=4;
@@ -2595,60 +3144,157 @@
 	JS_CFUNC_DEF("update", 0, shader_update),
 };
 
-static JSValue canvas3d_new_shader(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
+//test code
+#ifdef BUILTIN_SHADERS
+Bool rvideo_shader(void *udta, GF_EVGFragmentParam *frag)
+{
+	EVGShader *shader = udta;
+	GF_JSTexture *tx = shader->vars[0].ptr;
+
+	u32 col = gf_evg_stencil_get_pixel_yuv(tx->stencil, frag->tx_x * tx->width / frag->tx_width, frag->tx_y * tx->height / frag->tx_height);
+	if (shader->vars[1].ival) {
+		if (frag->odd_flag) {
+			u8 a, r, g, b;
+			a = GF_COL_A(col);
+			r = 0xFF - GF_COL_R(col);
+			g = 0xFF - GF_COL_G(col);
+			b = 0xFF - GF_COL_B(col);
+			col = GF_COL_ARGB(a, r, g, b);
+		}
+	}
+	frag->color_pack = col;
+	frag->frag_valid = GF_EVG_FRAG_YUV_PACK;
+	return GF_TRUE;
+}
+Bool builtin_shader_check(void *udta, GF_EVGFragmentParam *frag, u32 th_id, Bool is_cleanup)
+{
+	u32 i;
+	EVGShader *shader;
+	if (is_cleanup) return GF_TRUE;
+	shader = udta;
+	for (i=0; i<shader->nb_vars; i++) {
+		if ((shader->vars[i].value_type == COMP_TX) && !shader->vars[i].ptr)
+			return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
+EVGShader *load_builtin_shader(const char *sname, GF_Err *e)
+{
+	EVGShader *shader;
+	if (!strcmp(sname, "rvideo")) {
+		GF_SAFEALLOC(shader, EVGShader);
+		if (!shader) { *e = GF_OUT_OF_MEM; return NULL;}
+
+		shader->nb_vars = 4;
+		shader->vars = gf_malloc(sizeof(ShaderVar)*shader->nb_vars);
+		if (!shader->vars) { *e = GF_OUT_OF_MEM; gf_free(shader); return NULL;}
+		shader->vars[0].name = "tx";
+		shader->vars[0].value_type = COMP_TX;
+		shader->vars[1].name = "odd";
+		shader->vars[1].value_type = COMP_INT;
+		shader->frag_shader = rvideo_shader;
+		shader->frag_shader_init = builtin_shader_check;
+		return shader;
+	}
+	return NULL;
+}
+#endif
+
+static JSValue canvas_new_shader(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	EVGShader *shader;
 	u32 mode;
 	JSValue res;
-	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
-	if (!canvas) return JS_EXCEPTION;
-	if (!argc) return JS_EXCEPTION;
-	JS_ToInt32(ctx, &mode, argv[0]);
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas) return GF_JS_EXCEPTION(ctx);
+	if (!argc) return GF_JS_EXCEPTION(ctx);
+
+#ifdef BUILTIN_SHADERS
+	if (JS_IsString(argv[0])) {
+		GF_Err e = GF_OK;
+		const char *sname = JS_ToCString(ctx, argv[0]);
+		shader = load_builtin_shader(sname, &e);
+		if (!shader) {
+			res = js_throw_err_msg(ctx, GF_BAD_PARAM, "Error loading native shader %s: %s", sname, gf_error_to_string(e) );
+			JS_FreeCString(ctx, sname);
+			return res;
+		}
+		JS_FreeCString(ctx, sname);
+		shader->mode = GF_EVG_SHADER_FRAGMENT;
+
+		res = JS_NewObjectClass(ctx, shader_class_id);
+		JS_SetOpaque(res, shader);
+		return res;
+	}
+#endif
+
+	if (JS_ToInt32(ctx, &mode, argv[0]))
+		return GF_JS_EXCEPTION(ctx);
+
+	if ((mode != GF_EVG_SHADER_FRAGMENT) && (mode != GF_EVG_SHADER_VERTEX))
+		return GF_JS_EXCEPTION(ctx);
 	GF_SAFEALLOC(shader, EVGShader);
-	if (!shader)
+	if (!shader) {
 		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
 	shader->mode = mode;
+	shader->vars_stack = gf_list_new();
+
 	res = JS_NewObjectClass(ctx, shader_class_id);
 	JS_SetOpaque(res, shader);
 	return res;
 }
 
-static const JSCFunctionListEntry canvas3d_funcs[] =
-{
-	JS_CGETSET_MAGIC_DEF("clipper", NULL, canvas3d_setProperty, GF_EVG_CLIPPER),
-	JS_CGETSET_MAGIC_DEF("fragment", canvas3d_getProperty, canvas3d_setProperty, GF_EVG_FRAG_SHADER),
-	JS_CGETSET_MAGIC_DEF("vertex", canvas3d_getProperty, canvas3d_setProperty, GF_EVG_VERT_SHADER),
-	JS_CGETSET_MAGIC_DEF("ccw", NULL, canvas3d_setProperty, GF_EVG_CCW),
-	JS_CGETSET_MAGIC_DEF("backcull", NULL, canvas3d_setProperty, GF_EVG_BACKCULL),
-	JS_CGETSET_MAGIC_DEF("antialias", NULL, canvas3d_setProperty, GF_EVG_ANTIALIAS),
-	JS_CGETSET_MAGIC_DEF("min_depth", NULL, canvas3d_setProperty, GF_EVG_MINDEPTH),
-	JS_CGETSET_MAGIC_DEF("max_depth", NULL, canvas3d_setProperty, GF_EVG_MAXDEPTH),
-	JS_CGETSET_MAGIC_DEF("point_size", NULL, canvas3d_setProperty, GF_EVG_POINTSIZE),
-	JS_CGETSET_MAGIC_DEF("point_smooth", NULL, canvas3d_setProperty, GF_EVG_POINTSMOOTH),
-	JS_CGETSET_MAGIC_DEF("line_size", NULL, canvas3d_setProperty, GF_EVG_LINESIZE),
-	JS_CGETSET_MAGIC_DEF("clip_zero", NULL, canvas3d_setProperty, GF_EVG_CLIP_ZERO),
-	JS_CGETSET_MAGIC_DEF("depth_test", NULL, canvas3d_setProperty, GF_EVG_DEPTH_TEST),
-	JS_CGETSET_MAGIC_DEF("write_depth", NULL, canvas3d_setProperty, GF_EVG_WRITE_DEPTH),
-	JS_CGETSET_MAGIC_DEF("depth_buffer", canvas3d_getProperty, canvas3d_setProperty, GF_EVG_DEPTH_BUFFER),
-
-	JS_CFUNC_DEF("clear", 0, canvas3d_clear),
-	JS_CFUNC_DEF("clearf", 0, canvas3d_clearf),
-	JS_CFUNC_DEF("reassign", 0, canvas3d_reassign),
-	JS_CFUNC_DEF("projection", 0, canvas3d_projection),
-	JS_CFUNC_DEF("modelview", 0, canvas3d_modelview),
-	JS_CFUNC_DEF("draw_array", 0, canvas3d_draw_array),
-	JS_CFUNC_DEF("draw_path", 0, canvas3d_draw_path),
-	JS_CFUNC_DEF("clear_depth", 0, canvas3d_clear_depth),
-	JS_CFUNC_DEF("viewport", 0, canvas3d_viewport),
-	JS_CFUNC_DEF("new_shader", 0, canvas3d_new_shader),
-	JS_CFUNC_DEF("toYUV", 0, canvas3d_toYUV),
-	JS_CFUNC_DEF("toRGB", 0, canvas3d_toRGB),
-};
 
-static JSValue canvas3d_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+static const JSCFunctionListEntry canvas_funcs[] =
 {
-	return canvas_constructor_internal(c, new_target, argc, argv, GF_TRUE);
-}
+	JS_CGETSET_MAGIC_DEF("centered", canvas_getProperty, canvas_setProperty, GF_EVG_CENTERED),
+	JS_CGETSET_MAGIC_DEF("path", NULL, canvas_setProperty, GF_EVG_PATH),
+	JS_CGETSET_MAGIC_DEF("clipper", NULL, canvas_setProperty, GF_EVG_CLIPPER),
+	JS_CGETSET_MAGIC_DEF("has_clipper", canvas_getProperty, NULL, GF_EVG_CLIPPER),
+	JS_CGETSET_MAGIC_DEF("matrix", NULL, canvas_setProperty, GF_EVG_MATRIX),
+	JS_CGETSET_MAGIC_DEF("matrix3d", NULL, canvas_setProperty, GF_EVG_MATRIX_3D),
+	JS_CGETSET_MAGIC_DEF("compositeOperation", canvas_getProperty, canvas_setProperty, GF_EVG_COMPOSITE_OP),
+	JS_CGETSET_MAGIC_DEF("level", canvas_getProperty, canvas_setProperty, GF_EVG_RASTER_LEVEL),
+	JS_CGETSET_MAGIC_DEF("on_alpha", canvas_getProperty, canvas_setProperty, GF_EVG_ALPHA_FUN),
+	JS_CGETSET_MAGIC_DEF("is_yuv", canvas_getProperty, NULL, GF_EVG_IS_YUV),
+	JS_CGETSET_MAGIC_DEF("depth", canvas_getProperty, NULL, GF_EVG_BIT_DEPTH),
+	JS_CGETSET_MAGIC_DEF("mask_mode", canvas_getProperty, canvas_setProperty, GF_EVG_MASK_MODE),
+	JS_CFUNC_DEF("enable_threading", 0, canvas_enable_threading),
+	JS_CFUNC_DEF("enable_3d", 0, canvas_enable_3d),
+	JS_CFUNC_DEF("clear", 0, canvas_clear),
+	JS_CFUNC_DEF("clearf", 0, canvas_clearf),
+	JS_CFUNC_DEF("fill", 0, canvas_fill),
+	JS_CFUNC_DEF("reassign", 0, canvas_reassign),
+	JS_CFUNC_DEF("toYUV", 0, canvas_toYUV),
+	JS_CFUNC_DEF("toRGB", 0, canvas_toRGB),
+	JS_CFUNC_DEF("blit", 0, canvas_blit),
+
+	//3D extensions
+	JS_CGETSET_MAGIC_DEF("fragment", canvas_getProperty, canvas_setProperty, GF_EVG_FRAG_SHADER),
+	JS_CGETSET_MAGIC_DEF("vertex", canvas_getProperty, canvas_setProperty, GF_EVG_VERT_SHADER),
+	JS_CGETSET_MAGIC_DEF("ccw", NULL, canvas_setProperty, GF_EVG_CCW),
+	JS_CGETSET_MAGIC_DEF("backcull", NULL, canvas_setProperty, GF_EVG_BACKCULL),
+	JS_CGETSET_MAGIC_DEF("antialias", NULL, canvas_setProperty, GF_EVG_ANTIALIAS),
+	JS_CGETSET_MAGIC_DEF("min_depth", NULL, canvas_setProperty, GF_EVG_MINDEPTH),
+	JS_CGETSET_MAGIC_DEF("max_depth", NULL, canvas_setProperty, GF_EVG_MAXDEPTH),
+	JS_CGETSET_MAGIC_DEF("point_size", NULL, canvas_setProperty, GF_EVG_POINTSIZE),
+	JS_CGETSET_MAGIC_DEF("point_smooth", NULL, canvas_setProperty, GF_EVG_POINTSMOOTH),
+	JS_CGETSET_MAGIC_DEF("line_size", NULL, canvas_setProperty, GF_EVG_LINESIZE),
+	JS_CGETSET_MAGIC_DEF("clip_zero", NULL, canvas_setProperty, GF_EVG_CLIP_ZERO),
+	JS_CGETSET_MAGIC_DEF("depth_test", NULL, canvas_setProperty, GF_EVG_DEPTH_TEST),
+	JS_CGETSET_MAGIC_DEF("write_depth", NULL, canvas_setProperty, GF_EVG_WRITE_DEPTH),
+	JS_CGETSET_MAGIC_DEF("depth_buffer", canvas_getProperty, canvas_setProperty, GF_EVG_DEPTH_BUFFER),
+
+	JS_CFUNC_DEF("projection", 0, canvas_projection),
+	JS_CFUNC_DEF("modelview", 0, canvas_modelview),
+	JS_CFUNC_DEF("draw_array", 0, canvas_draw_array),
+	JS_CFUNC_DEF("draw_path", 0, canvas_draw_path),
+	JS_CFUNC_DEF("clear_depth", 0, canvas_clear_depth),
+	JS_CFUNC_DEF("viewport", 0, canvas_viewport),
+	JS_CFUNC_DEF("new_shader", 0, canvas_new_shader),
+};
 
 #ifdef EVG_USE_JS_SHADER
 
@@ -2676,7 +3322,7 @@
 static JSValue fragment_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_EVGFragmentParam *frag = JS_GetOpaque(obj, fragment_class_id);
-	if (!frag) return JS_EXCEPTION;
+	if (!frag) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case EVG_FRAG_SCREENX: return JS_NewFloat64(c, frag->screen_x);
 	case EVG_FRAG_SCREENY: return JS_NewFloat64(c, frag->screen_y);
@@ -2690,7 +3336,7 @@
 	GF_EVGFragmentType frag_type = GF_EVG_FRAG_RGB;
 
 	GF_EVGFragmentParam *frag = JS_GetOpaque(obj, fragment_class_id);
-	if (!frag) return JS_EXCEPTION;
+	if (!frag) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case EVG_FRAG_DEPTH:
 		EVG_GET_FLOAT(frag->depth, value)
@@ -2736,7 +3382,7 @@
 			Double a, r, g, b;
 			a=1.0;
 			if (!get_color_from_args(ctx, 1, &value, 0, &a, &r, &g, &b))
-				return JS_EXCEPTION;
+				return GF_JS_EXCEPTION(c);
 			frag->color.q = (Float) a;
 			frag->color.x = (Float) r;
 			frag->color.y = (Float) g;
@@ -2754,7 +3400,7 @@
 			frag->color.z = vr->values[2];
 			frag->frag_valid = frag_type;
 		} else
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 	default:
 		return JS_UNDEFINED;
 	}
@@ -2793,7 +3439,7 @@
 {
 	JSValue res;
 	GF_EVGVertexParam *vert= JS_GetOpaque(obj, vertex_class_id);
-	if (!vert) return JS_EXCEPTION;
+	if (!vert) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case EVG_VERTEX_IN: 
 		res = JS_NewObject(c);
@@ -2810,7 +3456,7 @@
 	Double _f;
 	JSValue v;
 	GF_EVGVertexParam *vert= JS_GetOpaque(obj, vertex_class_id);
-	if (!vert) return JS_EXCEPTION;
+	if (!vert) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case EVG_VERTEX_OUT:
 		v = JS_GetPropertyStr(ctx, value, "x");
@@ -2839,10 +3485,10 @@
 };
 #endif // EVG_USE_JS_SHADER
 
-Bool vai_call_lerp(EVG_VAI *vai, GF_EVGFragmentParam *frag)
+static Bool vai_call_lerp_init(EVG_VAI *vai, GF_EVGFragmentParam *frag)
 {
 	u32 i;
-	
+
 	//different primitive, setup inperpolation points
 	if (frag->prim_index != vai->prim_idx) {
 		u32 idx;
@@ -2850,13 +3496,7 @@
 		//no values, this is a VAI filled by the vertex shader
 		if (!vai->values) {
 		} else if (vai->interp_type==GF_EVG_VAI_PRIMITIVE) {
-			idx = frag->prim_index * vai->nb_comp;
-			if (idx+vai->nb_comp > vai->nb_values)
-				return GF_FALSE;
 
-			for (i=0; i<vai->nb_comp; i++) {
-				vai->result.values[i] = vai->values[idx+i];
-			}
 		} else if (frag->ptype!=GF_EVG_POINTS) {
 			u32 nb_v_per_prim = 3;
 			if (frag->ptype==GF_EVG_LINES)
@@ -2897,33 +3537,47 @@
 			}
 		}
 	}
+	return GF_TRUE;
+}
+
+static Bool vai_call_lerp(EVG_VAI *vai, GF_EVGFragmentParam *frag, Float *values)
+{
+	u32 i;
+
 	if (vai->interp_type==GF_EVG_VAI_PRIMITIVE) {
+		u32 idx;
+		idx = vai->prim_idx * vai->nb_comp;
+		if (idx+vai->nb_comp > vai->nb_values)
+			return GF_FALSE;
+		for (i=0; i<vai->nb_comp; i++) {
+			values[i] = vai->values[idx+i];
+		}
 		return GF_TRUE;
 	}
 
 	if (frag->ptype==GF_EVG_LINES) {
 		for (i=0; i<vai->nb_comp; i++) {
 			Float v = frag->pbc1 * vai->anchors[0][i] + frag->pbc2 * vai->anchors[1][i];
-			vai->result.values[i] = v / frag->persp_denum;
+			values[i] = v / frag->persp_denum;
 		}
 	} else {
 		for (i=0; i<vai->nb_comp; i++) {
 			Float v = (Float) ( frag->pbc1 * vai->anchors[0][i] + frag->pbc2 * vai->anchors[1][i] + frag->pbc3 * vai->anchors[2][i] );
-			vai->result.values[i] = v / frag->persp_denum;
+			values[i] = v / frag->persp_denum;
 		}
 	}
 	if (vai->normalize) {
 		if (vai->nb_comp==2) {
 			Float len;
-			if (!vai->result.values[0]) len = ABS(vai->result.values[1]);
-			else if (!vai->result.values[1]) len = ABS(vai->result.values[0]);
-			else len = sqrtf(vai->result.values[0]*vai->result.values[0] + vai->result.values[1]*vai->result.values[1]);
+			if (!values[0]) len = ABS(values[1]);
+			else if (!values[1]) len = ABS(values[0]);
+			else len = sqrtf(values[0]*values[0] + values[1]*values[1]);
 			if (len) {
-				vai->result.values[0]/=len;
-				vai->result.values[1]/=len;
+				values[0]/=len;
+				values[1]/=len;
 			}
 		} else {
-			gf_vec_norm((GF_Vec *) &vai->result.values[0]);
+			gf_vec_norm((GF_Vec *) &values[0]);
 		}
 	}
 	return GF_TRUE;
@@ -2933,12 +3587,12 @@
 static JSValue vai_lerp(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	EVG_VAI *vai = JS_GetOpaque(obj, vai_class_id);
-	if (!vai || !argc) return JS_EXCEPTION;
+	if (!vai || !argc) return GF_JS_EXCEPTION(c);
 	GF_EVGFragmentParam *frag = JS_GetOpaque(argv[0], fragment_class_id);
-	if (!frag) return JS_EXCEPTION;
+	if (!frag) return GF_JS_EXCEPTION(c);
 
 	if (!vai_call_lerp(vai, frag))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, vai->res);
 }
 #endif
@@ -2946,7 +3600,7 @@
 static JSValue vai_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	EVG_VAI *vai = JS_GetOpaque(obj, vai_class_id);
-	if (!vai) return JS_EXCEPTION;
+	if (!vai) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case 0:
 		vai->normalize = JS_ToBool(c, value) ? GF_TRUE : GF_FALSE;
@@ -2968,20 +3622,20 @@
 
 	if (argc>=2) {
 		data = evg_get_array(c, argv[0], &data_size);
-		if (!data) return JS_EXCEPTION;
-		if (JS_ToInt32(c, &nb_comp, argv[1])) return JS_EXCEPTION;
+		if (!data) return GF_JS_EXCEPTION(c);
+		if (JS_ToInt32(c, &nb_comp, argv[1])) return GF_JS_EXCEPTION(c);
 		if (nb_comp>MAX_ATTR_DIM)
 			return js_throw_err_msg(c, GF_BAD_PARAM, "Dimension too big, max is %d", MAX_ATTR_DIM);
 
-		if (data_size % sizeof(Float)) return JS_EXCEPTION;
+		if (data_size % sizeof(Float)) return GF_JS_EXCEPTION(c);
 		data_size /= sizeof(Float);
-		if (data_size % nb_comp) return JS_EXCEPTION;
+		if (data_size % nb_comp) return GF_JS_EXCEPTION(c);
 
 		if (argc>2) {
-			if (JS_ToInt32(c, &interp_type, argv[2])) return JS_EXCEPTION;
+			if (JS_ToInt32(c, &interp_type, argv[2])) return GF_JS_EXCEPTION(c);
 		}
 	} else {
-		if (JS_ToInt32(c, &nb_comp, argv[0])) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &nb_comp, argv[0])) return GF_JS_EXCEPTION(c);
 	}
 
 	GF_SAFEALLOC(vai, EVG_VAI);
@@ -3057,17 +3711,17 @@
 		return js_throw_err_msg(c, GF_BAD_PARAM, "Missing parameter / data for VertexAttrib");
 
 	data = evg_get_array(c, argv[0], &data_size);
-	if (!data) return JS_EXCEPTION;
-	if (JS_ToInt32(c, &nb_comp, argv[1])) return JS_EXCEPTION;
+	if (!data) return GF_JS_EXCEPTION(c);
+	if (JS_ToInt32(c, &nb_comp, argv[1])) return GF_JS_EXCEPTION(c);
 	if (nb_comp>MAX_ATTR_DIM)
 		return js_throw_err_msg(c, GF_BAD_PARAM, "Dimension too big, max is %d", MAX_ATTR_DIM);
 
-	if (data_size % sizeof(Float)) return JS_EXCEPTION;
+	if (data_size % sizeof(Float)) return GF_JS_EXCEPTION(c);
 	data_size /= sizeof(Float);
-	if (data_size % nb_comp) return JS_EXCEPTION;
+	if (data_size % nb_comp) return GF_JS_EXCEPTION(c);
 
 	if (argc>2) {
-		if (JS_ToInt32(c, &interp_type, argv[2])) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &interp_type, argv[2])) return GF_JS_EXCEPTION(c);
 	}
 
 	GF_SAFEALLOC(va, EVG_VA);
@@ -3091,7 +3745,7 @@
 static JSValue va_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	EVG_VA *va = JS_GetOpaque(obj, va_class_id);
-	if (!va) return JS_EXCEPTION;
+	if (!va) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case 0:
 		va->normalize = JS_ToBool(c, value) ? GF_TRUE : GF_FALSE;
@@ -3129,7 +3783,7 @@
 static JSValue vaires_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	EVG_VAIRes *vr = JS_GetOpaque(obj, vaires_class_id);
-	if (!vr) return JS_EXCEPTION;
+	if (!vr) return GF_JS_EXCEPTION(c);
 	if (magic<MAX_ATTR_DIM) {
 		return JS_NewFloat64(c, vr->values[magic]);
 	}
@@ -3176,27 +3830,30 @@
 	MX2D_YY,
 	MX2D_TY,
 	MX2D_IDENTITY,
+	MX2D_3D,
 };
 
 static JSValue mx2d_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
 	if ((magic>=MX2D_XX) && (magic<=MX2D_TY)) {
 		return JS_NewFloat64(c, FIX2FLT(mx->m[magic]));
 	}
 	if (magic==MX2D_IDENTITY)
 		return JS_NewBool(c, gf_mx2d_is_identity(*mx));
+	if (magic==MX2D_3D)
+		return JS_FALSE;
 	return JS_UNDEFINED;
 }
 static JSValue mx2d_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
 	if ((magic>=MX2D_XX) && (magic<=MX2D_TY)) {
 		Double d;
 		if (JS_ToFloat64(c, &d, value))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 		mx->m[magic] = FIX2FLT(d);
 		return JS_UNDEFINED;
 	}
@@ -3211,9 +3868,9 @@
 static JSValue mx2d_multiply(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
+	if (!mx || !argc) return GF_JS_EXCEPTION(c);
 	GF_Matrix2D *amx = JS_GetOpaque(argv[0], mx2d_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
 	if ((argc>1) && JS_ToBool(c, argv[1]))
 		gf_mx2d_pre_multiply(mx, amx);
 	else
@@ -3225,12 +3882,12 @@
 {
 	Double tx, ty;
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx || (argc<1)) return JS_EXCEPTION;
+	if (!mx || (argc<1)) return GF_JS_EXCEPTION(c);
 
 	if (JS_IsObject(argv[0])) {
 		JSValue v;
 #define GETD(_arg, _name, _res)\
-		if (! JS_IsObject(_arg)) return JS_EXCEPTION;\
+		if (! JS_IsObject(_arg)) return GF_JS_EXCEPTION(c);\
 		v = JS_GetPropertyStr(c, _arg, _name);\
 		JS_ToFloat64(c, &_res, v);\
 		JS_FreeValue(c, v);\
@@ -3240,10 +3897,10 @@
 #undef GETD
 
 	} else if (argc==2) {
-		if (JS_ToFloat64(c, &tx, argv[0])) return JS_EXCEPTION;
-		if (JS_ToFloat64(c, &ty, argv[1])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &tx, argv[0])) return GF_JS_EXCEPTION(c);
+		if (JS_ToFloat64(c, &ty, argv[1])) return GF_JS_EXCEPTION(c);
 	} else {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	gf_mx2d_add_translation(mx, FLT2FIX(tx), FLT2FIX(ty));
 	return JS_DupValue(c, obj);
@@ -3252,10 +3909,10 @@
 {
 	Double cx, cy, a;
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx || (argc<3)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &cx, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &cy, argv[1])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &a, argv[2])) return JS_EXCEPTION;
+	if (!mx || (argc<3)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &cx, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &cy, argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &a, argv[2])) return GF_JS_EXCEPTION(c);
 	gf_mx2d_add_rotation(mx, FLT2FIX(cx), FLT2FIX(cy), FLT2FIX(a) );
 	return JS_DupValue(c, obj);
 }
@@ -3263,30 +3920,30 @@
 {
 	Double sx, sy;
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx || (argc<2)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &sx, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &sy, argv[1])) return JS_EXCEPTION;
+	if (!mx || (argc<2)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &sx, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &sy, argv[1])) return GF_JS_EXCEPTION(c);
 	if (argc==2) {
 		gf_mx2d_add_scale(mx, FLT2FIX(sx), FLT2FIX(sy));
 		return JS_DupValue(c, obj);
 	} else if (argc==5) {
 		Double cx, cy, a;
-		if (JS_ToFloat64(c, &cx, argv[2])) return JS_EXCEPTION;
-		if (JS_ToFloat64(c, &cy, argv[3])) return JS_EXCEPTION;
-		if (JS_ToFloat64(c, &a, argv[4])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &cx, argv[2])) return GF_JS_EXCEPTION(c);
+		if (JS_ToFloat64(c, &cy, argv[3])) return GF_JS_EXCEPTION(c);
+		if (JS_ToFloat64(c, &a, argv[4])) return GF_JS_EXCEPTION(c);
 		gf_mx2d_add_scale_at(mx, FLT2FIX(sx), FLT2FIX(sy), FLT2FIX(cx), FLT2FIX(cy), FLT2FIX(a));
 		return JS_DupValue(c, obj);
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 static JSValue mx2d_skew(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	Double sx, sy;
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx || (argc<2)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &sx, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &sy, argv[1])) return JS_EXCEPTION;
+	if (!mx || (argc<2)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &sx, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &sy, argv[1])) return GF_JS_EXCEPTION(c);
 	gf_mx2d_add_skew(mx, FLT2FIX(sx), FLT2FIX(sy));
 	return JS_DupValue(c, obj);
 }
@@ -3294,8 +3951,8 @@
 {
 	Double s;
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &s, argv[0])) return JS_EXCEPTION;
+	if (!mx || !argc) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &s, argv[0])) return GF_JS_EXCEPTION(c);
 	gf_mx2d_add_skew_x(mx, FLT2FIX(s));
 	return JS_DupValue(c, obj);
 }
@@ -3303,8 +3960,8 @@
 {
 	Double s;
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &s, argv[0])) return JS_EXCEPTION;
+	if (!mx || !argc) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &s, argv[0])) return GF_JS_EXCEPTION(c);
 	gf_mx2d_add_skew_y(mx, FLT2FIX(s));
 	return JS_DupValue(c, obj);
 }
@@ -3317,24 +3974,24 @@
 	int res;
 	u32 is_rect=0;
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx || !argc || !JS_IsObject(argv[0])) return JS_EXCEPTION;
+	if (!mx || !argc || !JS_IsObject(argv[0])) return GF_JS_EXCEPTION(c);
 	v = JS_GetPropertyStr(c, argv[0], "x");
 	res = JS_ToFloat64(c, &d, v);
 	JS_FreeValue(c, v);
-	if (res) return JS_EXCEPTION;
+	if (res) return GF_JS_EXCEPTION(c);
 	x = FLT2FIX(d);
 
 	v = JS_GetPropertyStr(c, argv[0], "y");
 	res = JS_ToFloat64(c, &d, v);
 	JS_FreeValue(c, v);
-	if (res) return JS_EXCEPTION;
+	if (res) return GF_JS_EXCEPTION(c);
 	y = FLT2FIX(d);
 
 	v = JS_GetPropertyStr(c, argv[0], "w");
 	if (!JS_IsUndefined(v) && JS_IsNumber(v)) {
 		res = JS_ToFloat64(c, &d, v);
 		JS_FreeValue(c, v);
-		if (res) return JS_EXCEPTION;
+		if (res) return GF_JS_EXCEPTION(c);
 		is_rect++;
 		w = FLT2FIX(d);
 	}
@@ -3344,7 +4001,7 @@
 	if (!JS_IsUndefined(v) && JS_IsNumber(v)) {
 		res = JS_ToFloat64(c, &d, v);
 		JS_FreeValue(c, v);
-		if (res) return JS_EXCEPTION;
+		if (res) return GF_JS_EXCEPTION(c);
 		is_rect++;
 		h = FLT2FIX(d);
 	}
@@ -3374,13 +4031,13 @@
 		JS_SetPropertyStr(c, v, "y", JS_NewFloat64(c, FIX2FLT(pt.y)));
 		return v;
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 static JSValue mx2d_inverse(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
 	gf_mx2d_inverse(mx);
 	return JS_DupValue(c, obj);
 }
@@ -3390,7 +4047,13 @@
 	GF_Matrix2D *nmx;
 	JSValue nobj;
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
+	if (argc) {
+		GF_Matrix2D *mx_from = JS_GetOpaque(argv[0], mx2d_class_id);
+		if (!mx_from) return GF_JS_EXCEPTION(c);
+		gf_mx2d_copy(*mx, *mx_from);
+		return JS_UNDEFINED;
+	}
 	GF_SAFEALLOC(nmx, GF_Matrix2D);
 	if (!nmx)
 		return js_throw_err(c, GF_OUT_OF_MEM);
@@ -3406,7 +4069,7 @@
 	GF_Point2D translate;
 	Fixed rotate;
 	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
 	if (!gf_mx2d_decompose(mx, &scale, &rotate, &translate))
 		return JS_NULL;
 	if (opt==0) {
@@ -3424,7 +4087,7 @@
 	if (opt==2) {
 		return JS_NewFloat64(c, FIX2FLT(rotate) );
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 static JSValue mx2d_get_scale(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
@@ -3449,6 +4112,7 @@
 	JS_CGETSET_MAGIC_DEF("yy", mx2d_getProperty, mx2d_setProperty, MX2D_YY),
 	JS_CGETSET_MAGIC_DEF("ty", mx2d_getProperty, mx2d_setProperty, MX2D_TY),
 	JS_CGETSET_MAGIC_DEF("identity", mx2d_getProperty, mx2d_setProperty, MX2D_IDENTITY),
+	JS_CGETSET_MAGIC_DEF("is3D", mx2d_getProperty, NULL, MX2D_3D),
 	JS_CFUNC_DEF("get_scale", 0, mx2d_get_scale),
 	JS_CFUNC_DEF("get_translate", 0, mx2d_get_translate),
 	JS_CFUNC_DEF("get_rotate", 0, mx2d_get_rotate),
@@ -3482,7 +4146,7 @@
 		u32 i;
 		Double d;
 		for (i=0; i<6; i++) {
-			if (JS_ToFloat64(c, &d, argv[i])) return JS_EXCEPTION;
+			if (JS_ToFloat64(c, &d, argv[i])) return GF_JS_EXCEPTION(c);
 			mx->m[i] = FLT2FIX(d);
 		}
 	}
@@ -3513,12 +4177,27 @@
 	if ((argc==1) && JS_IsObject(argv[0])) {
 		GF_ColorMatrix *acmx = JS_GetOpaque(argv[0], colmx_class_id);
 		if (acmx) gf_cmx_copy(cmx, acmx);
+		else if (JS_IsArray(c, argv[0])) {
+			u32 i;
+			Double d;
+			for (i=0; i<20; i++) {
+				JSValue v = JS_GetPropertyUint32(c, argv[0], i);
+				if (JS_IsException(v)) return GF_JS_EXCEPTION(c);
+				if (JS_ToFloat64(c, &d, v)) {
+					JS_FreeValue(c, v);
+					return GF_JS_EXCEPTION(c);
+				}
+				cmx->m[i] = FLT2FIX(d);
+				JS_FreeValue(c, v);
+			}
+			cmx->identity = 0;
+		}
 	}
 	else if (argc==20) {
 		u32 i;
 		Double d;
 		for (i=0; i<20; i++) {
-			if (JS_ToFloat64(c, &d, argv[i])) return JS_EXCEPTION;
+			if (JS_ToFloat64(c, &d, argv[i])) return GF_JS_EXCEPTION(c);
 			cmx->m[i] = FLT2FIX(d);
 		}
 		cmx->identity = 0;
@@ -3554,7 +4233,7 @@
 static JSValue colmx_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_ColorMatrix *cmx = JS_GetOpaque(obj, colmx_class_id);
-	if (!cmx) return JS_EXCEPTION;
+	if (!cmx) return GF_JS_EXCEPTION(c);
 	if ((magic>=CMX_MRR) && (magic<=CMX_TA)) {
 		return JS_NewFloat64(c, FIX2FLT(cmx->m[magic]));
 	}
@@ -3565,24 +4244,28 @@
 static JSValue colmx_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	GF_ColorMatrix *cmx = JS_GetOpaque(obj, colmx_class_id);
-	if (!cmx) return JS_EXCEPTION;
+	if (!cmx) return GF_JS_EXCEPTION(c);
 	if ((magic>=CMX_MRR) && (magic<=CMX_TA)) {
 		Double d;
 		if (JS_ToFloat64(c, &d, value))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 		cmx->m[magic] = FIX2FLT(d);
 		cmx->identity = GF_FALSE;
 		return JS_UNDEFINED;
 	}
+	if (magic==CMX_IDENTITY) {
+		gf_cmx_init(cmx);
+		return JS_UNDEFINED;
+	}
 	return JS_UNDEFINED;
 }
 
 static JSValue colmx_multiply(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_ColorMatrix *cmx = JS_GetOpaque(obj, colmx_class_id);
-	if (!cmx || !argc) return JS_EXCEPTION;
+	if (!cmx || !argc) return GF_JS_EXCEPTION(c);
 	GF_ColorMatrix *with = JS_GetOpaque(argv[0], colmx_class_id);
-	if (!cmx) return JS_EXCEPTION;
+	if (!cmx) return GF_JS_EXCEPTION(c);
 	gf_cmx_multiply(cmx, with);
 	return JS_DupValue(c, obj);
 }
@@ -3640,7 +4323,7 @@
 	JSValue nobj;
 	Double r=0, g=0, b=0, a=1.0;
 	GF_ColorMatrix *cmx = JS_GetOpaque(obj, colmx_class_id);
-	if (!cmx || !argc) return JS_EXCEPTION;
+	if (!cmx || !argc) return GF_JS_EXCEPTION(c);
 	if (JS_IsString(argv[0])) {
 		const char *str = JS_ToCString(c, argv[0]);
 		col = gf_color_parse(str);
@@ -3659,7 +4342,7 @@
 
 	} else if (JS_IsObject(argv[0])) {
 		if (!get_color(c, argv[0], &a, &r, &g, &b))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 		if (use_int) {
 			r*=255;
 			g*=255;
@@ -3672,7 +4355,7 @@
 			col = GF_COL_ARGB(a, r, g, b);
 		}
 	} else {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	if (use_int) {
 		GF_Color res = gf_cmx_apply(cmx, col);
@@ -3693,7 +4376,7 @@
 		JS_SetPropertyStr(c, nobj, "a", JS_NewFloat64(c, FIX2FLT(fa)) );
 		return nobj;
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 static JSValue colmx_apply(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
@@ -3726,7 +4409,7 @@
 	JS_CGETSET_MAGIC_DEF("ab", colmx_getProperty, colmx_setProperty, CMX_MAB),
 	JS_CGETSET_MAGIC_DEF("aa", colmx_getProperty, colmx_setProperty, CMX_MAA),
 	JS_CGETSET_MAGIC_DEF("ta", colmx_getProperty, colmx_setProperty, CMX_TA),
-	JS_CGETSET_MAGIC_DEF("identity", colmx_getProperty, NULL, CMX_IDENTITY),
+	JS_CGETSET_MAGIC_DEF("identity", colmx_getProperty, colmx_setProperty, CMX_IDENTITY),
 
 	JS_CFUNC_DEF("multiply", 0, colmx_multiply),
 	JS_CFUNC_DEF("apply", 0, colmx_apply),
@@ -3749,7 +4432,7 @@
 static JSValue path_close_reset(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, u32 opt)
 {
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp) return JS_EXCEPTION;
+	if (!gp) return GF_JS_EXCEPTION(c);
 	if (opt==0) {
 		gf_path_close(gp);
 		return JS_DupValue(c, obj);
@@ -3762,10 +4445,9 @@
 		JSValue nobj = JS_NewObjectClass(c, path_class_id);
 		if (JS_IsException(nobj)) return nobj;
 		JS_SetOpaque(nobj, gf_path_clone(gp));
-		gf_path_reset(gp);
 		return nobj;
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 static JSValue path_reset(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
@@ -3784,14 +4466,14 @@
 	Double x=0, y=0;
 	GF_Err e;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || (argc<2)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &x, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y, argv[1])) return JS_EXCEPTION;
+	if (!gp || (argc<2)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &x, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y, argv[1])) return GF_JS_EXCEPTION(c);
 	if (is_line)
 		e = gf_path_add_line_to(gp, FLT2FIX(x), FLT2FIX(y));
 	else
 		e = gf_path_add_move_to(gp, FLT2FIX(x), FLT2FIX(y));
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 static JSValue path_line_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
@@ -3807,15 +4489,15 @@
 	Double c1_x=0, c1_y=0, c2_x=0, c2_y=0, x=0, y=0;
 	GF_Err e;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || (argc<6)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &c1_x, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &c1_y, argv[1])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &c2_x, argv[2])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &c2_y, argv[3])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &x, argv[4])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y, argv[5])) return JS_EXCEPTION;
+	if (!gp || (argc<6)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &c1_x, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &c1_y, argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &c2_x, argv[2])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &c2_y, argv[3])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &x, argv[4])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y, argv[5])) return GF_JS_EXCEPTION(c);
 	e = gf_path_add_cubic_to(gp, FLT2FIX(c1_x), FLT2FIX(c1_y), FLT2FIX(c2_x), FLT2FIX(c2_y), FLT2FIX(x), FLT2FIX(y));
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 static JSValue path_quadratic_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
@@ -3823,13 +4505,13 @@
 	Double c_x=0, c_y=0, x=0, y=0;
 	GF_Err e;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || (argc<4)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &c_x, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &c_y, argv[1])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &x, argv[2])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y, argv[3])) return JS_EXCEPTION;
+	if (!gp || (argc<4)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &c_x, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &c_y, argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &x, argv[2])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y, argv[3])) return GF_JS_EXCEPTION(c);
 	e = gf_path_add_quadratic_to(gp, FLT2FIX(c_x), FLT2FIX(c_y), FLT2FIX(x), FLT2FIX(y));
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 
@@ -3840,12 +4522,12 @@
 	GF_Err e;
 
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || (argc<3)) return JS_EXCEPTION;
+	if (!gp || (argc<3)) return GF_JS_EXCEPTION(c);
 
 	if (JS_IsObject(argv[0])) {
 		JSValue v;
 #define GETD(_arg, _name, _res)\
-		if (! JS_IsObject(_arg)) return JS_EXCEPTION;\
+		if (! JS_IsObject(_arg)) return GF_JS_EXCEPTION(c);\
 		v = JS_GetPropertyStr(c, _arg, _name);\
 		JS_ToFloat64(c, &_res, v);\
 		JS_FreeValue(c, v);\
@@ -3856,20 +4538,20 @@
 
 		idx=1;
 	} else if (argc>=4) {
-		if (JS_ToFloat64(c, &ox, argv[0])) return JS_EXCEPTION;
-		if (JS_ToFloat64(c, &oy, argv[1])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &ox, argv[0])) return GF_JS_EXCEPTION(c);
+		if (JS_ToFloat64(c, &oy, argv[1])) return GF_JS_EXCEPTION(c);
 		idx=2;
 	} else {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
-	if (JS_ToFloat64(c, &w, argv[idx])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &h, argv[idx+1])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &w, argv[idx])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &h, argv[idx+1])) return GF_JS_EXCEPTION(c);
 	if ((argc>idx+2) && JS_ToBool(c, argv[idx+2])) {
 		e = gf_path_add_rect_center(gp, FLT2FIX(ox), FLT2FIX(oy), FLT2FIX(w), FLT2FIX(h));
 	} else {
 		e = gf_path_add_rect(gp, FLT2FIX(ox), FLT2FIX(oy), FLT2FIX(w), FLT2FIX(h));
 	}
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 
@@ -3877,15 +4559,16 @@
 {
 	Double cx=0, cy=0, a_axis=0, b_axis=0;
 	GF_Err e;
+	Bool valid = GF_TRUE;
 	u32 idx=0;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp) return JS_EXCEPTION;
+	if (!gp) return GF_JS_EXCEPTION(c);
 	if (argc==3) {
 		JSValue v;
 #define GETD(_arg, _name, _res)\
-		if (! JS_IsObject(_arg)) return JS_EXCEPTION;\
+		if (! JS_IsObject(_arg)) return GF_JS_EXCEPTION(c);\
 		v = JS_GetPropertyStr(c, _arg, _name);\
-		JS_ToFloat64(c, &_res, v);\
+		if (JS_ToFloat64(c, &_res, v)) valid = GF_FALSE;\
 		JS_FreeValue(c, v);\
 
 		GETD(argv[0], "x", cx);
@@ -3894,16 +4577,18 @@
 
 		idx=1;
 	} else if (argc==4) {
-		if (JS_ToFloat64(c, &cx, argv[0])) return JS_EXCEPTION;
-		if (JS_ToFloat64(c, &cy, argv[1])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &cx, argv[0])) return GF_JS_EXCEPTION(c);
+		if (JS_ToFloat64(c, &cy, argv[1])) return GF_JS_EXCEPTION(c);
 		idx=2;
 	} else {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
-	if (JS_ToFloat64(c, &a_axis, argv[idx])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &b_axis, argv[idx+1])) return JS_EXCEPTION;
+	if (!valid) return GF_JS_EXCEPTION(c);
+
+	if (JS_ToFloat64(c, &a_axis, argv[idx])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &b_axis, argv[idx+1])) return GF_JS_EXCEPTION(c);
 	e = gf_path_add_ellipse(gp, FLT2FIX(cx), FLT2FIX(cy), FLT2FIX(a_axis), FLT2FIX(b_axis));
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 
@@ -3913,7 +4598,7 @@
 	s32 i;
 	GF_Point2D *pts;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || (argc<3)) return JS_EXCEPTION;
+	if (!gp || (argc<3)) return GF_JS_EXCEPTION(c);
 	pts = gf_malloc(sizeof(GF_Point2D)* argc);
 	memset(pts, 0, sizeof(GF_Point2D)* argc);
 	for (i=0; i<argc; i++) {
@@ -3932,7 +4617,7 @@
 	}
 	e = gf_path_add_bezier(gp, pts, argc);
 	gf_free(pts);
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 
@@ -3942,17 +4627,17 @@
 	Bool cw_flag = GF_FALSE;
 	GF_Err e;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || (argc<6)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &end_x, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &end_y, argv[1])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &fa_x, argv[2])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &fa_y, argv[3])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &fb_x, argv[4])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &fb_y, argv[5])) return JS_EXCEPTION;
+	if (!gp || (argc<6)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &end_x, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &end_y, argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &fa_x, argv[2])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &fa_y, argv[3])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &fb_x, argv[4])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &fb_y, argv[5])) return GF_JS_EXCEPTION(c);
 	if (argc>6) cw_flag = JS_ToBool(c, argv[6]);
 
 	e = gf_path_add_svg_arc_to(gp, FLT2FIX(end_x), FLT2FIX(end_y), FLT2FIX(fa_x), FLT2FIX(fa_y), FLT2FIX(fb_x), FLT2FIX(fb_y), cw_flag);
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 
@@ -3963,19 +4648,19 @@
 	Bool large_arc_flag=GF_FALSE, sweep_flag=GF_FALSE;
 	GF_Err e;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || (argc<4)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &end_x, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &end_y, argv[1])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &r_x, argv[2])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &r_y, argv[3])) return JS_EXCEPTION;
+	if (!gp || (argc<4)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &end_x, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &end_y, argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &r_x, argv[2])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &r_y, argv[3])) return GF_JS_EXCEPTION(c);
 	if (argc>4) {
-		if (JS_ToFloat64(c, &x_axis_rotation, argv[4])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &x_axis_rotation, argv[4])) return GF_JS_EXCEPTION(c);
 		if (argc>5) large_arc_flag = JS_ToBool(c, argv[5]);
 		if (argc>6) sweep_flag = JS_ToBool(c, argv[6]);
 	}
 	e = gf_path_add_svg_arc_to(gp, FLT2FIX(end_x), FLT2FIX(end_y), FLT2FIX(r_x), FLT2FIX(r_y), FLT2FIX(x_axis_rotation), large_arc_flag, sweep_flag);
 
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 
@@ -3985,14 +4670,14 @@
 	u32 close=0;
 	GF_Err e;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || (argc<3)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &radius, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &start, argv[1])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &end, argv[2])) return JS_EXCEPTION;
+	if (!gp || (argc<3)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &radius, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &start, argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &end, argv[2])) return GF_JS_EXCEPTION(c);
 	if (argc>3)
-		if (JS_ToInt32(c, &close, argv[3])) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &close, argv[3])) return GF_JS_EXCEPTION(c);
 	e = gf_path_add_arc(gp, FLT2FIX(radius), FLT2FIX(start), FLT2FIX(end), close);
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 
@@ -4001,20 +4686,20 @@
 	GF_Err e;
 	GF_Matrix2D *mx=NULL;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || !argc) return JS_EXCEPTION;
+	if (!gp || !argc) return GF_JS_EXCEPTION(c);
 	GF_Path *subgp = JS_GetOpaque(argv[0], path_class_id);
-	if (!gp) return JS_EXCEPTION;
+	if (!subgp) return GF_JS_EXCEPTION(c);
 	if (argc>1)
 		mx = JS_GetOpaque(argv[1], mx2d_class_id);
 	e = gf_path_add_subpath(gp, subgp, mx);
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	return JS_DupValue(c, obj);
 }
 
 static JSValue path_flatten(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp) return JS_EXCEPTION;
+	if (!gp) return GF_JS_EXCEPTION(c);
 	gf_path_flatten(gp);
 	return JS_DupValue(c, obj);
 }
@@ -4023,7 +4708,7 @@
 	JSValue nobj;
 	GF_Path *gp_flat;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp) return JS_EXCEPTION;
+	if (!gp) return GF_JS_EXCEPTION(c);
 	gp_flat = gf_path_get_flatten(gp);
 	if (!gp) return JS_NULL;
 	nobj = JS_NewObjectClass(c, path_class_id);
@@ -4036,29 +4721,29 @@
 {
 	Double x, y;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || !argc) return JS_EXCEPTION;
+	if (!gp || !argc) return GF_JS_EXCEPTION(c);
 	if (argc==1) {
 		Double d;
 		int res;
 		JSValue v;
-		if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+		if (!JS_IsObject(argv[0])) return GF_JS_EXCEPTION(c);
 #define GETIT(_arg, _name, _var) \
 		v = JS_GetPropertyStr(c, _arg, _name);\
 		res = JS_ToFloat64(c, &d, v);\
 		JS_FreeValue(c, v);\
-		if (res) return JS_EXCEPTION;\
+		if (res) return GF_JS_EXCEPTION(c);\
 		_var = FLT2FIX(d);\
 
 		GETIT(argv[0], "x", x)
 		GETIT(argv[0], "y", y)
 #undef GETIT
 	} else if (argc==2) {
-		if (JS_ToFloat64(c, &x, argv[0])) return JS_EXCEPTION;
-		if (JS_ToFloat64(c, &y, argv[0])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &x, argv[0])) return GF_JS_EXCEPTION(c);
+		if (JS_ToFloat64(c, &y, argv[1])) return GF_JS_EXCEPTION(c);
 	} else {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
-	return JS_NewBool(c, gf_path_point_over(gp, FLT2FIX(x), FLT2FIX(y)));
+	return gf_path_point_over(gp, FLT2FIX(x), FLT2FIX(y)) ? JS_TRUE : JS_FALSE;
 }
 
 
@@ -4071,7 +4756,7 @@
 	Double d;
 	int i, res;
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp || !argc || !JS_IsObject(argv[0]) ) return JS_EXCEPTION;
+	if (!gp || !argc || !JS_IsObject(argv[0]) ) return GF_JS_EXCEPTION(c);
 	memset(&pen, 0, sizeof(GF_PenSettings));
 
 #define GETIT_F(_arg, _name, _var) \
@@ -4079,7 +4764,7 @@
 		if (!JS_IsUndefined(v)) {\
 			res = JS_ToFloat64(c, &d, v);\
 			JS_FreeValue(c, v);\
-			if (res) return JS_EXCEPTION;\
+			if (res) return GF_JS_EXCEPTION(c);\
 			_var = FLT2FIX(d);\
 		}\
 
@@ -4088,7 +4773,7 @@
 		if (!JS_IsUndefined(v)) {\
 			res = JS_ToInt32(c, &i, v);\
 			JS_FreeValue(c, v);\
-			if (res) return JS_EXCEPTION;\
+			if (res) return GF_JS_EXCEPTION(c);\
 			_var = i;\
 		}\
 
@@ -4112,13 +4797,17 @@
 		v = JS_GetPropertyStr(c, dashes, "length");
 		JS_ToInt32(c, &dash.num_dash, v);
 		JS_FreeValue(c, v);
-		pen.dash_set = &dash;
-		dash.dashes = gf_malloc(sizeof(Fixed)*dash.num_dash);
-		for (i=0; i<(int) dash.num_dash; i++) {
-			v = JS_GetPropertyUint32(c, dashes, i);
-			JS_ToFloat64(c, &d, v);
-			dash.dashes[i] = FLT2FIX(d);
-			JS_FreeValue(c, v);
+		if (dash.num_dash) {
+			pen.dash_set = &dash;
+			dash.dashes = gf_malloc(sizeof(Fixed)*dash.num_dash);
+			for (i=0; i<(int) dash.num_dash; i++) {
+				v = JS_GetPropertyUint32(c, dashes, i);
+				JS_ToFloat64(c, &d, v);
+				dash.dashes[i] = FLT2FIX(d);
+				JS_FreeValue(c, v);
+			}
+			if (!pen.dash)
+				pen.dash = GF_DASH_STYLE_CUSTOM;
 		}
 	}
 	JS_FreeValue(c, dashes);
@@ -4126,18 +4815,43 @@
 	outline = gf_path_get_outline(gp, pen);
 	if (dash.dashes) gf_free(dash.dashes);
 
-	if (!outline) return JS_EXCEPTION;
+	if (!outline) return GF_JS_EXCEPTION(c);
 	v = JS_NewObjectClass(c, path_class_id);
 	JS_SetOpaque(v, outline);
 	return v;
 }
 
+
+static JSValue path_transform(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	GF_Matrix2D *mx=NULL;
+	GF_Path *path;
+	JSValue v;
+	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
+	if (!gp || !argc) return GF_JS_EXCEPTION(c);
+	mx = JS_GetOpaque(argv[0], mx2d_class_id);
+
+	path = gf_path_new();
+	if (!path) return GF_JS_EXCEPTION(c);
+	e = gf_path_add_subpath(path, gp, mx);
+	if (e) {
+		gf_path_del(path);
+		return GF_JS_EXCEPTION(c);
+	}
+	v = JS_NewObjectClass(c, path_class_id);
+	JS_SetOpaque(v, path);
+	return v;
+}
+
 enum
 {
 	PATH_EMPTY=0,
 	PATH_ZERO_NONZERO,
+	PATH_FILL_EVEN,
 	PATH_BOUNDS,
 	PATH_CONTROL_BOUNDS,
+	PATH_IS_RECTANGLE
 };
 
 
@@ -4150,7 +4864,7 @@
 	 	e = gf_path_get_control_bounds(gp, &rc);
 	else
 		e = gf_path_get_bounds(gp, &rc);
-	if (e) return JS_EXCEPTION;
+	if (e) return GF_JS_EXCEPTION(c);
 	nobj = JS_NewObject(c);
 	JS_SetPropertyStr(c, nobj, "x", JS_NewFloat64(c, rc.x));
 	JS_SetPropertyStr(c, nobj, "y", JS_NewFloat64(c, rc.y));
@@ -4158,28 +4872,50 @@
 	JS_SetPropertyStr(c, nobj, "h", JS_NewFloat64(c, rc.height));
 	return nobj;
 }
+static Bool path_check_rect(GF_Path *gp)
+{
+	u32 i;
+	if (gp->n_contours != 1) return GF_FALSE;
+	if (gp->contours[0] != 4) return GF_FALSE;
+
+	for (i=0; i<4; i++) {
+		if ((gp->points[i].x != gp->points[0].x) && (gp->points[i].x != gp->points[2].x)) return GF_FALSE;
+		if ((gp->points[i].y != gp->points[0].y) && (gp->points[i].y != gp->points[2].y)) return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
 static JSValue path_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp) return JS_EXCEPTION;
+	if (!gp) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case PATH_EMPTY: return JS_NewBool(c, gf_path_is_empty(gp));
 	case PATH_ZERO_NONZERO: return JS_NewBool(c, gp->flags & GF_PATH_FILL_ZERO_NONZERO);
+	case PATH_FILL_EVEN: return JS_NewBool(c, gp->flags & GF_PATH_FILL_EVEN);
 	case PATH_BOUNDS: return path_bounds_ex(c, gp, GF_FALSE);
 	case PATH_CONTROL_BOUNDS: return path_bounds_ex(c, gp, GF_TRUE);
+	case PATH_IS_RECTANGLE: return path_check_rect(gp) ? JS_TRUE : JS_FALSE;
 	}
 	return JS_UNDEFINED;
 }
 static JSValue path_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
-	if (!gp) return JS_EXCEPTION;
+	if (!gp) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case PATH_ZERO_NONZERO:
 	 	if (JS_ToBool(c, value))
 	 		gp->flags |= GF_PATH_FILL_ZERO_NONZERO;
 		else
 	 		gp->flags &= ~GF_PATH_FILL_ZERO_NONZERO;
+		break;
+	case PATH_FILL_EVEN:
+	 	if (JS_ToBool(c, value))
+	 		gp->flags |= GF_PATH_FILL_EVEN;
+		else
+	 		gp->flags &= ~GF_PATH_FILL_EVEN;
+		break;
 	}
 	return JS_UNDEFINED;
 }
@@ -4187,7 +4923,7 @@
 {
 	JSValue obj;
 	GF_Path *path = gf_path_new();
-	if (!path) return JS_EXCEPTION;
+	if (!path) return GF_JS_EXCEPTION(c);
 	obj = JS_NewObjectClass(c, path_class_id);
 	if (JS_IsException(obj)) return obj;
 	JS_SetOpaque(obj, path);
@@ -4197,8 +4933,10 @@
 {
 	JS_CGETSET_MAGIC_DEF("empty", path_getProperty, NULL, PATH_EMPTY),
 	JS_CGETSET_MAGIC_DEF("zero_fill", path_getProperty, path_setProperty, PATH_ZERO_NONZERO),
+	JS_CGETSET_MAGIC_DEF("even_fill", path_getProperty, path_setProperty, PATH_FILL_EVEN),
 	JS_CGETSET_MAGIC_DEF("bounds", path_getProperty, NULL, PATH_BOUNDS),
 	JS_CGETSET_MAGIC_DEF("ctrl_bounds", path_getProperty, NULL, PATH_CONTROL_BOUNDS),
+	JS_CGETSET_MAGIC_DEF("is_rectangle", path_getProperty, NULL, PATH_IS_RECTANGLE),
 
 	JS_CFUNC_DEF("point_over", 0, path_point_over),
 	JS_CFUNC_DEF("get_flatten", 0, path_get_flat),
@@ -4218,6 +4956,7 @@
 	JS_CFUNC_DEF("reset", 0, path_reset),
 	JS_CFUNC_DEF("close", 0, path_close),
 	JS_CFUNC_DEF("outline", 0, path_outline),
+	JS_CFUNC_DEF("transform", 0, path_transform),
 
 };
 
@@ -4235,9 +4974,11 @@
 
 enum
 {
+	STENCIL_SOLID,
 	STENCIL_CMX,
 	STENCIL_MAT,
 	STENCIL_GRADMOD,
+	STENCIL_MAT_AUTO,
 };
 
 static JSValue stencil_set_linear(JSContext *c, GF_EVGStencil *stencil, int argc, JSValueConst *argv)
@@ -4247,13 +4988,13 @@
 	Double d;
 	Fixed start_x=0, start_y=0, end_x=0, end_y=0;
 	s32 idx=0;
-	if (argc<2) return JS_EXCEPTION;
+	if (argc<2) return GF_JS_EXCEPTION(c);
 
 #define GETIT(_arg, _name, _var) \
 		v = JS_GetPropertyStr(c, _arg, _name);\
 		res = JS_ToFloat64(c, &d, v);\
 		JS_FreeValue(c, v);\
-		if (res) return JS_EXCEPTION;\
+		if (res) return GF_JS_EXCEPTION(c);\
 		_var = FLT2FIX(d);\
 
 	if (JS_IsObject(argv[0])) {
@@ -4261,9 +5002,9 @@
 		GETIT(argv[0], "y", start_y)
 		idx=1;
 	} else {
-		if (JS_ToFloat64(c, &d, argv[0])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[0])) return GF_JS_EXCEPTION(c);
 		start_x = FLT2FIX(d);
-		if (JS_ToFloat64(c, &d, argv[1])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[1])) return GF_JS_EXCEPTION(c);
 		start_y = FLT2FIX(d);
 		idx=2;
 	}
@@ -4276,9 +5017,9 @@
 		GETIT(argv[idx], "x", end_x)
 		GETIT(argv[idx], "y", end_y)
 	} else if (argc>idx+1) {
-		if (JS_ToFloat64(c, &d, argv[idx])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[idx])) return GF_JS_EXCEPTION(c);
 		end_x = FLT2FIX(d);
-		if (JS_ToFloat64(c, &d, argv[idx+1])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[idx+1])) return GF_JS_EXCEPTION(c);
 		end_y = FLT2FIX(d);
 	}
 #undef GETIT
@@ -4293,13 +5034,13 @@
 	Double d;
 	Fixed cx=0, cy=0, fx=0, fy=0, rx=0, ry=0;
 	s32 idx=0;
-	if (argc<3) return JS_EXCEPTION;
+	if (argc<3) return GF_JS_EXCEPTION(c);
 
 #define GETIT(_arg, _name, _var) \
 		v = JS_GetPropertyStr(c, _arg, _name);\
 		res = JS_ToFloat64(c, &d, v);\
 		JS_FreeValue(c, v);\
-		if (res) return JS_EXCEPTION;\
+		if (res) return GF_JS_EXCEPTION(c);\
 		_var = FLT2FIX(d);\
 
 	if (JS_IsObject(argv[0])) {
@@ -4307,9 +5048,9 @@
 		GETIT(argv[0], "y", cy)
 		idx+=1;
 	} else {
-		if (JS_ToFloat64(c, &d, argv[0])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[0])) return GF_JS_EXCEPTION(c);
 		cx = FLT2FIX(d);
-		if (JS_ToFloat64(c, &d, argv[1])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[1])) return GF_JS_EXCEPTION(c);
 		cy = FLT2FIX(d);
 		idx+=2;
 	}
@@ -4319,9 +5060,9 @@
 		GETIT(argv[idx], "y", fy)
 		idx+=1;
 	} else if (argc>idx+1) {
-		if (JS_ToFloat64(c, &d, argv[idx])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[idx])) return GF_JS_EXCEPTION(c);
 		fx = FLT2FIX(d);
-		if (JS_ToFloat64(c, &d, argv[idx+1])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[idx+1])) return GF_JS_EXCEPTION(c);
 		fy = FLT2FIX(d);
 		idx+=2;
 	}
@@ -4330,9 +5071,9 @@
 		GETIT(argv[idx], "x", rx)
 		GETIT(argv[idx], "y", ry)
 	} else if (argc>idx+1) {
-		if (JS_ToFloat64(c, &d, argv[idx])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[idx])) return GF_JS_EXCEPTION(c);
 		rx = FLT2FIX(d);
-		if (JS_ToFloat64(c, &d, argv[idx+1])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &d, argv[idx+1])) return GF_JS_EXCEPTION(c);
 		ry = FLT2FIX(d);
 	}
 #undef GETIT
@@ -4345,14 +5086,14 @@
 {
 	GF_StencilType type;
 	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
-	if (!stencil) return JS_EXCEPTION;
+	if (!stencil) return GF_JS_EXCEPTION(c);
 
 	type = gf_evg_stencil_type(stencil);
 	if (type==GF_STENCIL_LINEAR_GRADIENT)
 		return stencil_set_linear(c, stencil, argc, argv);
 	if (type==GF_STENCIL_RADIAL_GRADIENT)
 		return stencil_set_radial(c, stencil, argc, argv);
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 Bool get_color_from_args(JSContext *c, int argc, JSValueConst *argv, u32 idx, Double *a, Double *r, Double *g, Double *b)
@@ -4367,6 +5108,8 @@
 		*r = ((Double)GF_COL_R(col)) / 255;
 		*g = ((Double)GF_COL_G(col)) / 255;
 		*b = ((Double)GF_COL_B(col)) / 255;
+	} else if (JS_IsNull(argv[idx])) {
+		*a = *r = *g = *b = 0;
 	} else if (JS_IsObject(argv[idx])) {
 		if (!get_color(c, argv[idx], a, r, g, b)) {
 			return GF_FALSE;
@@ -4396,14 +5139,14 @@
 	GF_StencilType type;
 	GF_Color col;
 	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
-	if (!stencil) return JS_EXCEPTION;
+	if (!stencil) return GF_JS_EXCEPTION(c);
 	type = gf_evg_stencil_type(stencil);
-	if ((type!=GF_STENCIL_LINEAR_GRADIENT) && (type!=GF_STENCIL_RADIAL_GRADIENT)) return JS_EXCEPTION;
+	if ((type!=GF_STENCIL_LINEAR_GRADIENT) && (type!=GF_STENCIL_RADIAL_GRADIENT)) return GF_JS_EXCEPTION(c);
 	if (!argc) {
 		gf_evg_stencil_set_gradient_interpolation(stencil, NULL, NULL, 0);
 		return JS_UNDEFINED;
 	}
-	if (JS_ToFloat64(c, &pos, argv[0])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &pos, argv[0])) return GF_JS_EXCEPTION(c);
 
 	if (JS_IsString(argv[1])) {
 		const char *str = JS_ToCString(c, argv[1]);
@@ -4412,7 +5155,7 @@
 	} else {
 		Double r=0, g=0, b=0, a=1.0;
 		if (!get_color_from_args(c, argc, argv, 1, &a, &r, &g, &b)) {
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 		}
 		if (!use_int) {
 			a *= 255;
@@ -4439,9 +5182,9 @@
 	Double r=0, g=0, b=0, a=1.0;
 	GF_StencilType type;
 	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
-	if (!stencil) return JS_EXCEPTION;
+	if (!stencil) return GF_JS_EXCEPTION(c);
 	type = gf_evg_stencil_type(stencil);
-	if (type!=GF_STENCIL_SOLID) return JS_EXCEPTION;
+	if (type!=GF_STENCIL_SOLID) return GF_JS_EXCEPTION(c);
 
 	if (JS_IsString(argv[0])) {
 		GF_Color col;
@@ -4451,7 +5194,7 @@
 		gf_evg_stencil_set_brush_color(stencil, col);
 		return JS_UNDEFINED;
 	} else if (!get_color_from_args(c, argc, argv, 0, &a, &r, &g, &b)) {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	if (!use_int) {
 		r*=255;
@@ -4472,6 +5215,23 @@
 	return stencil_set_color_ex(c, obj, argc, argv, GF_FALSE);
 }
 
+
+static JSValue stencil_get_color(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_StencilType type;
+	GF_Color col;
+	char szCol[11];
+	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
+	if (!stencil) return GF_JS_EXCEPTION(c);
+	type = gf_evg_stencil_type(stencil);
+	if (type!=GF_STENCIL_SOLID) return GF_JS_EXCEPTION(c);
+
+	col = gf_evg_stencil_get_brush_color(stencil);
+	sprintf(szCol, "0x%02X%02X%02X%02X", GF_COL_A(col), GF_COL_R(col), GF_COL_G(col), GF_COL_B(col) );
+	return JS_NewString(c, szCol);
+}
+
+
 static JSValue stencil_set_alpha_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool use_int)
 {
 	Double a=1.0;
@@ -4479,7 +5239,7 @@
 	if (!stencil) {
 		GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
 		if (!tx || !tx->stencil)
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 		stencil = tx->stencil;
 	}
 
@@ -4504,11 +5264,63 @@
 	return stencil_set_alpha_ex(c, obj, argc, argv, GF_FALSE);
 }
 
+
+static JSValue stencil_get_alphaf(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
+	if (!stencil) {
+		GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+		if (!tx || !tx->stencil)
+			return GF_JS_EXCEPTION(c);
+		stencil = tx->stencil;
+	}
+	Double res = gf_evg_stencil_get_alpha(stencil);
+	return JS_NewFloat64(c, res/255.0);
+}
+
+
+static JSValue stencil_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
+	if (!stencil) return GF_JS_EXCEPTION(c);
+	switch (magic) {
+	case STENCIL_SOLID:
+		if (gf_evg_stencil_type(stencil) == GF_STENCIL_SOLID) return JS_TRUE;
+		return JS_FALSE;
+	case STENCIL_MAT:
+	{
+		GF_Matrix2D mx, *mxp;
+		if (! gf_evg_stencil_get_matrix(stencil, &mx)) return JS_NULL;
+		GF_SAFEALLOC(mxp, GF_Matrix2D);
+		if (!mxp) return js_throw_err(c, GF_OUT_OF_MEM);
+		gf_mx2d_copy(*mxp, mx);
+		JSValue res = JS_NewObjectClass(c, mx2d_class_id);
+		JS_SetOpaque(res, mxp);
+		return res;
+	}
+		break;
+	case STENCIL_MAT_AUTO:
+		if (gf_evg_stencil_get_auto_matrix(stencil)) return JS_TRUE;
+		return JS_FALSE;
+	case STENCIL_CMX:
+	{
+		GF_ColorMatrix *cmx;
+		GF_SAFEALLOC(cmx, GF_ColorMatrix);
+		if (!cmx) return js_throw_err(c, GF_OUT_OF_MEM);
+		gf_evg_stencil_get_color_matrix(stencil, cmx);
+		obj = JS_NewObjectClass(c, colmx_class_id);
+		JS_SetOpaque(obj, cmx);
+		return obj;
+	}
+	}
+
+	return JS_UNDEFINED;
+}
 static JSValue stencil_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	u32 v;
 	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
-	if (!stencil) return JS_EXCEPTION;
+	if (!stencil) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case STENCIL_CMX:
@@ -4520,7 +5332,7 @@
 		}
 		return JS_UNDEFINED;
 	case STENCIL_GRADMOD:
-		if (JS_ToInt32(c, &v, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &v, value)) return GF_JS_EXCEPTION(c);
 		gf_evg_stencil_set_gradient_mode(stencil, v);
 		return JS_UNDEFINED;
 	case STENCIL_MAT:
@@ -4531,19 +5343,26 @@
 			gf_evg_stencil_set_matrix(stencil, mx);
 		}
 		return JS_UNDEFINED;
+	case STENCIL_MAT_AUTO:
+		gf_evg_stencil_set_auto_matrix(stencil, JS_ToBool(c, value) ? GF_TRUE : GF_FALSE);
+		return JS_UNDEFINED;
 	}
 	return JS_UNDEFINED;
 }
 
 static const JSCFunctionListEntry stencil_funcs[] =
 {
+	JS_CGETSET_MAGIC_DEF("solid_brush", stencil_getProperty, NULL, STENCIL_SOLID),
 	JS_CGETSET_MAGIC_DEF("pad", NULL, stencil_setProperty, STENCIL_GRADMOD),
-	JS_CGETSET_MAGIC_DEF("cmx", NULL, stencil_setProperty, STENCIL_CMX),
-	JS_CGETSET_MAGIC_DEF("mx", NULL, stencil_setProperty, STENCIL_MAT),
+	JS_CGETSET_MAGIC_DEF("cmx", stencil_getProperty, stencil_setProperty, STENCIL_CMX),
+	JS_CGETSET_MAGIC_DEF("mx", stencil_getProperty, stencil_setProperty, STENCIL_MAT),
+	JS_CGETSET_MAGIC_DEF("auto_mx", stencil_getProperty, stencil_setProperty, STENCIL_MAT_AUTO),
 	JS_CFUNC_DEF("set_color", 0, stencil_set_color),
 	JS_CFUNC_DEF("set_colorf", 0, stencil_set_colorf),
 	JS_CFUNC_DEF("set_alpha", 0, stencil_set_alpha),
 	JS_CFUNC_DEF("set_alphaf", 0, stencil_set_alphaf),
+	JS_CFUNC_DEF("get_alphaf", 0, stencil_get_alphaf),
+	JS_CFUNC_DEF("get_color", 0, stencil_get_color),
 	JS_CFUNC_DEF("set_points", 0, stencil_set_points),
 	JS_CFUNC_DEF("set_stop", 0, stencil_set_stop),
 	JS_CFUNC_DEF("set_stopf", 0, stencil_set_stopf),
@@ -4554,7 +5373,7 @@
 {
 	JSValue obj;
 	GF_EVGStencil *stencil = gf_evg_stencil_new(type);
-	if (!stencil) return JS_EXCEPTION;
+	if (!stencil) return GF_JS_EXCEPTION(c);
 	obj = JS_NewObjectClass(c, stencil_class_id);
 	if (JS_IsException(obj)) return obj;
 	JS_SetOpaque(obj, stencil);
@@ -4591,6 +5410,19 @@
 	if (tx->stencil)
 		gf_evg_stencil_delete(tx->stencil);
 	JS_FreeValueRT(rt, tx->param_fun);
+	JS_FreeValueRT(rt, tx->par_obj);
+
+#ifndef GPAC_DISABLE_3D
+	if (tx->named_tx) {
+		gf_free(tx->named_tx);
+	}
+#endif
+
+#ifdef GPAC_HAS_FFMPEG
+	if (tx->swscaler)
+		sws_freeContext(tx->swscaler);
+#endif
+
 	gf_free(tx);
 }
 
@@ -4599,6 +5431,7 @@
 	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
 	if (!tx) return;
 	JS_MarkValue(rt, tx->param_fun, mark_func);
+	JS_MarkValue(rt, tx->par_obj, mark_func);
 }
 
 JSClassDef texture_class = {
@@ -4617,6 +5450,7 @@
 	TX_FLIP_X,
 	TX_FLIP_Y,
 	TX_MAT,
+	TX_MAT_AUTO,
 	TX_WIDTH,
 	TX_HEIGHT,
 	TX_NB_COMP,
@@ -4627,7 +5461,7 @@
 static JSValue texture_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
-	if (!tx || !tx->stencil) return JS_EXCEPTION;
+	if (!tx || !tx->stencil) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case TX_REPEAT_S:
 		return JS_NewBool(c, (tx->flags & GF_TEXTURE_REPEAT_S));
@@ -4647,8 +5481,33 @@
 		return JS_NewInt32(c, tx->nb_comp);
 	case TX_DATA:
 		if (tx->owns_data)
-			return JS_NewArrayBuffer(c, (u8 *) tx->data, tx->data_size, NULL, NULL, GF_TRUE);
+			return JS_NewArrayBuffer(c, (u8 *) tx->data, tx->data_size, NULL, NULL, 0/*1*/);
 		return JS_NULL;
+
+	case TX_MAT:
+	{
+		GF_Matrix2D mx, *mxp;
+		if (! gf_evg_stencil_get_matrix(tx->stencil, &mx)) return JS_NULL;
+		GF_SAFEALLOC(mxp, GF_Matrix2D);
+		if (!mxp) return js_throw_err(c, GF_OUT_OF_MEM);
+		gf_mx2d_copy(*mxp, mx);
+		JSValue res = JS_NewObjectClass(c, mx2d_class_id);
+		JS_SetOpaque(res, mxp);
+		return res;
+	}
+	case TX_MAT_AUTO:
+		if (gf_evg_stencil_get_auto_matrix(tx->stencil)) return JS_TRUE;
+		return JS_FALSE;
+	case TX_CMX:
+	{
+		GF_ColorMatrix *cmx;
+		GF_SAFEALLOC(cmx, GF_ColorMatrix);
+		if (!cmx) return js_throw_err(c, GF_OUT_OF_MEM);
+		gf_evg_stencil_get_color_matrix(tx->stencil, cmx);
+		obj = JS_NewObjectClass(c, colmx_class_id);
+		JS_SetOpaque(obj, cmx);
+		return obj;
+	}
 	}
 	return JS_UNDEFINED;
 }
@@ -4656,11 +5515,11 @@
 {
 	u32 v;
 	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
-	if (!tx || !tx->stencil) return JS_EXCEPTION;
+	if (!tx || !tx->stencil) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case TX_FILTER:
-		if (JS_ToInt32(c, &v, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &v, value)) return GF_JS_EXCEPTION(c);
 		gf_evg_stencil_set_filter(tx->stencil, v);
 		return JS_UNDEFINED;
 	case TX_CMX:
@@ -4699,6 +5558,9 @@
 			gf_evg_stencil_set_matrix(tx->stencil, mx);
 		}
 		return JS_UNDEFINED;
+	case TX_MAT_AUTO:
+		gf_evg_stencil_set_auto_matrix(tx->stencil, JS_ToBool(c, value) ? GF_TRUE : GF_FALSE);
+		return JS_UNDEFINED;
 	}
 	return JS_UNDEFINED;
 }
@@ -4782,15 +5644,14 @@
 static JSValue texture_convert(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, u32 conv_type)
 {
 	JSValue nobj;
+	GF_Err e;
 	u32 i, j, dst_pf, nb_comp;
 	GF_JSCanvas *canvas=NULL;
-	GF_JSTexture *tx_hsv;
+	GF_JSTexture *tx_conv;
 	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
-	if (!tx || !tx->stencil) return JS_EXCEPTION;
+	if (!tx || !tx->stencil) return GF_JS_EXCEPTION(c);
 	if (argc) {
 		canvas = JS_GetOpaque(argv[0], canvas_class_id);
-		if (!canvas)
-			canvas = JS_GetOpaque(argv[0], canvas3d_class_id);
 	}
 	if ((conv_type==EVG_CONV_YUV_TO_RGB) || (conv_type==EVG_CONV_RGB_TO_YUV)) {
 		if (!canvas) return js_throw_err_msg(c, GF_BAD_PARAM, "Missing canvas parameter for RBG/YUV conversion");
@@ -4803,29 +5664,37 @@
 	case GF_PIXEL_ABGR:
 	case GF_PIXEL_ALPHAGREY:
 	case GF_PIXEL_GREYALPHA:
-		dst_pf = GF_PIXEL_RGBA;
+		if (conv_type == EVG_CONV_RGB_TO_YUV ) {
+			dst_pf = GF_PIXEL_YUVA444_PACK;
+		} else {
+			dst_pf = GF_PIXEL_RGBA;
+		}
 		nb_comp = 4;
 		break;
 	default:
-		dst_pf = GF_PIXEL_RGB;
+		if (conv_type == EVG_CONV_RGB_TO_YUV ) {
+			dst_pf = GF_PIXEL_YUV444_PACK;
+		} else {
+			dst_pf = GF_PIXEL_RGB;
+		}
 		nb_comp = 3;
 		break;
 	}
 
-	GF_SAFEALLOC(tx_hsv, GF_JSTexture);
-	if (!tx_hsv)
+	GF_SAFEALLOC(tx_conv, GF_JSTexture);
+	if (!tx_conv)
 		return js_throw_err(c, GF_OUT_OF_MEM);
-	tx_hsv->width = tx->width;
-	tx_hsv->height = tx->height;
-	tx_hsv->pf = dst_pf;
-	tx_hsv->nb_comp = nb_comp;
-	gf_pixel_get_size_info(tx_hsv->pf, tx_hsv->width, tx_hsv->height, &tx_hsv->data_size, &tx_hsv->stride, &tx_hsv->stride_uv, NULL, NULL);
-	tx_hsv->data = gf_malloc(sizeof(char)*tx_hsv->data_size);
-	tx_hsv->owns_data = GF_TRUE;
-
-	for (j=0; j<tx_hsv->height; j++) {
-		u8 *dst = tx_hsv->data + j*tx_hsv->stride;
-		for (i=0; i<tx_hsv->width; i++) {
+	tx_conv->width = tx->width;
+	tx_conv->height = tx->height;
+	tx_conv->pf = dst_pf;
+	tx_conv->nb_comp = nb_comp;
+	gf_pixel_get_size_info(tx_conv->pf, tx_conv->width, tx_conv->height, &tx_conv->data_size, &tx_conv->stride, &tx_conv->stride_uv, NULL, NULL);
+	tx_conv->data = gf_malloc(sizeof(char)*tx_conv->data_size);
+	tx_conv->owns_data = GF_TRUE;
+
+	for (j=0; j<tx_conv->height; j++) {
+		u8 *dst = tx_conv->data + j*tx_conv->stride;
+		for (i=0; i<tx_conv->width; i++) {
 			u8 a, r, g, b;
 			u32 col = gf_evg_stencil_get_pixel(tx->stencil, i, j);
 
@@ -4865,10 +5734,21 @@
 			}
 		}
 	}
-	tx_hsv->stencil = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
-	gf_evg_stencil_set_texture(tx_hsv->stencil, tx_hsv->data, tx_hsv->width, tx_hsv->height, tx_hsv->stride, tx_hsv->pf);
+	tx_conv->stencil = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
+	if (!tx_conv->stencil) {
+		e = GF_OUT_OF_MEM;
+	} else {
+		e = gf_evg_stencil_set_texture(tx_conv->stencil, tx_conv->data, tx_conv->width, tx_conv->height, tx_conv->stride, tx_conv->pf);
+	}
+	if (e) {
+		gf_evg_stencil_delete(tx_conv->stencil);
+		gf_free(tx_conv->data);
+		gf_free(tx_conv);
+		return js_throw_err_msg(c, e, "Failed to convert image: %s", gf_error_to_string(e));
+	}
+
 	nobj = JS_NewObjectClass(c, texture_class_id);
-	JS_SetOpaque(nobj, tx_hsv);
+	JS_SetOpaque(nobj, tx_conv);
 	return nobj;
 }
 static JSValue texture_rgb2hsv(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
@@ -4895,10 +5775,10 @@
 	GF_IRect src;
 	GF_JSTexture *tx_split;
 	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
-	if (!tx || !tx->stencil || !argc) return JS_EXCEPTION;
+	if (!tx || !tx->stencil || !argc) return GF_JS_EXCEPTION(c);
 
-	if (JS_ToInt32(c, &idx, argv[0])) return JS_EXCEPTION;
-	if (idx>=tx->nb_comp) return JS_EXCEPTION;
+	if (JS_ToInt32(c, &idx, argv[0])) return GF_JS_EXCEPTION(c);
+	if (idx>=tx->nb_comp) return GF_JS_EXCEPTION(c);
 
 	src.x = src.y = 0;
 	src.width = tx->width;
@@ -4906,14 +5786,14 @@
 	if (argc>1) {
 		JSValue v;
 		int res;
-		if (!JS_IsObject(argv[1])) return JS_EXCEPTION;
+		if (!JS_IsObject(argv[1])) return GF_JS_EXCEPTION(c);
 
 #define GETIT(_name, _var) \
 		v = JS_GetPropertyStr(c, argv[1], _name);\
 		res = JS_ToInt32(c, &(src._var), v);\
 		JS_FreeValue(c, v);\
-		if (res) return JS_EXCEPTION;\
-		if (src._var<0) return JS_EXCEPTION;\
+		if (res) return GF_JS_EXCEPTION(c);\
+		if (src._var<0) return GF_JS_EXCEPTION(c);\
 
 		GETIT("x", x)
 		GETIT("y", y)
@@ -4966,10 +5846,10 @@
 	s32 knorm=0;
 	GF_JSTexture *tx_conv;
 	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
-	if (!tx || !tx->stencil || !argc) return JS_EXCEPTION;
+	if (!tx || !tx->stencil || !argc) return GF_JS_EXCEPTION(c);
 
 	if (!JS_IsObject(argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	v = JS_GetPropertyStr(c, argv[0], "w");
 	JS_ToInt32(c, &kw, v);
@@ -4982,19 +5862,19 @@
 		JS_ToInt32(c, &knorm, v);
 	JS_FreeValue(c, v);
 	if (!kh || !kw)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	if (!(kh%2) || !(kw%2))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	kernv = JS_GetPropertyStr(c, argv[0], "k");
 	if (JS_IsUndefined(kernv))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	v = JS_GetPropertyStr(c, kernv, "length");
 	JS_ToInt32(c, &kl, v);
 	JS_FreeValue(c, v);
 	if (kl < kw * kh) {
 		JS_FreeValue(c, kernv);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	kl = kw*kh;
 	kdata = gf_malloc(sizeof(s32)*kl);
@@ -5079,7 +5959,6 @@
 	return nobj;
 }
 
-
 static JSValue texture_update(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Err e;
@@ -5090,7 +5969,10 @@
 	u8 *p_a=NULL;
 
 	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
-	if (!tx || !tx->stencil || !argc) return JS_EXCEPTION;
+	if (!tx || !tx->stencil || !argc) return GF_JS_EXCEPTION(c);
+
+	JS_FreeValue(c, tx->par_obj);
+	tx->par_obj = JS_UNDEFINED;
 
 	if (JS_IsObject(argv[0])) {
 		//create from canvas object
@@ -5102,11 +5984,25 @@
 			stride_uv = canvas->stride_uv;
 			data = canvas->data;
 			pf = canvas->pf;
+			tx->par_obj = JS_DupValue(c, argv[0]);
 		}
 		//create from filter packet
 		else if (jsf_is_packet(c, argv[0])) {
 			e = jsf_get_filter_packet_planes(c, argv[0], &width, &height, &pf, &stride, &stride_uv, (const u8 **)&data, (const u8 **)&p_u, (const u8 **)&p_v, (const u8 **)&p_a);
 			if (e) return js_throw_err(c, e);
+#ifndef GPAC_DISABLE_3D
+			if (tx->gl_named_tx) {
+				JSValue wgl_named_texture_upload(JSContext *c, JSValueConst pck_obj, void *named_tx, Bool force_resetup);
+
+				if (pf != tx->pf) {
+					tx->pf = pf;
+					tx->force_resetup = GF_TRUE;
+				}
+				JSValue res = wgl_named_texture_upload(c, argv[0], tx->gl_named_tx, tx->force_resetup);
+				tx->force_resetup = GF_FALSE;
+				if (JS_IsException(res)) return res;
+			}
+#endif //GPAC_DISABLE_3D
 		} else {
 			return js_throw_err(c, GF_BAD_PARAM);
 		}
@@ -5142,39 +6038,39 @@
 	Bool as_array=GF_FALSE;
 	JSValue ret;
 	Double x, y;
-	Float r, g, b, a;
+	GF_Vec4 col;
 
 	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
-	if (!tx || !tx->stencil || (argc<2) ) return JS_EXCEPTION;
+	if (!tx || !tx->stencil || (argc<2) ) return GF_JS_EXCEPTION(c);
 
 	if (is_float) {
-		if (JS_ToFloat64(c, &x, argv[0])) return JS_EXCEPTION;
-		if (JS_ToFloat64(c, &y, argv[1])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &x, argv[0])) return GF_JS_EXCEPTION(c);
+		if (JS_ToFloat64(c, &y, argv[1])) return GF_JS_EXCEPTION(c);
 	} else {
 		s32 _x, _y;
-		if (JS_ToInt32(c, &_x, argv[0])) return JS_EXCEPTION;
-		if (JS_ToInt32(c, &_y, argv[1])) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &_x, argv[0])) return GF_JS_EXCEPTION(c);
+		if (JS_ToInt32(c, &_y, argv[1])) return GF_JS_EXCEPTION(c);
 		x = ((Float)_x) / tx->width;
 		y = ((Float)_y) / tx->height;
 	}
 	if ((argc>2) && JS_ToBool(c, argv[2]))
 		as_array = GF_TRUE;
 
-	gf_evg_stencil_get_pixel_f(tx->stencil, (Float) x, (Float) y, &r, &g, &b, &a);
+	col = gf_evg_stencil_get_pixel_f(tx->stencil, (Float) x, (Float) y);
 
 	if (as_array) {
 		ret = JS_NewArray(c);
 		JS_SetPropertyStr(c, ret, "length", JS_NewInt32(c, 4) );
-		JS_SetPropertyUint32(c, ret, 0, JS_NewFloat64(c, r) );
-		JS_SetPropertyUint32(c, ret, 1, JS_NewFloat64(c, g) );
-		JS_SetPropertyUint32(c, ret, 2, JS_NewFloat64(c, b) );
-		JS_SetPropertyUint32(c, ret, 3, JS_NewFloat64(c, a) );
+		JS_SetPropertyUint32(c, ret, 0, JS_NewFloat64(c, col.x) );
+		JS_SetPropertyUint32(c, ret, 1, JS_NewFloat64(c, col.y) );
+		JS_SetPropertyUint32(c, ret, 2, JS_NewFloat64(c, col.z) );
+		JS_SetPropertyUint32(c, ret, 3, JS_NewFloat64(c, col.q) );
 	} else {
 		ret = JS_NewObject(c);
-		JS_SetPropertyStr(c, ret, "r", JS_NewFloat64(c, r) );
-		JS_SetPropertyStr(c, ret, "g", JS_NewFloat64(c, g) );
-		JS_SetPropertyStr(c, ret, "b", JS_NewFloat64(c, b) );
-		JS_SetPropertyStr(c, ret, "a", JS_NewFloat64(c, a) );
+		JS_SetPropertyStr(c, ret, "r", JS_NewFloat64(c, col.x) );
+		JS_SetPropertyStr(c, ret, "g", JS_NewFloat64(c, col.y) );
+		JS_SetPropertyStr(c, ret, "b", JS_NewFloat64(c, col.z) );
+		JS_SetPropertyStr(c, ret, "a", JS_NewFloat64(c, col.q) );
 	}
 	return ret;
 }
@@ -5243,6 +6139,7 @@
 }
 static GF_Err texture_load_file(JSContext *c, GF_JSTexture *tx, const char *fileName, Bool rel_to_script)
 {
+	char szPath[GF_MAX_PATH];
 	u8 *data;
 	u32 size;
 	GF_Err e;
@@ -5253,6 +6150,11 @@
 		full_url = gf_url_concatenate(par_url, fileName);
 		fileName = full_url;
 	}
+	if (!strncmp(fileName, "$GSHARE/", 8)) {
+		gf_opts_default_shared_directory(szPath);
+		strcat(szPath, fileName + 7);
+		fileName = szPath;
+	}
 	if (!gf_file_exists(fileName) || (gf_file_load_data(fileName, &data, &size) != GF_OK)) {
 		if (full_url) gf_free(full_url);
 		return GF_URL_ERROR;
@@ -5263,11 +6165,99 @@
 	return e;
 }
 
+static JSValue texture_load(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx || !tx->stencil || (argc<1) ) return GF_JS_EXCEPTION(c);
+
+	if (JS_IsString(argv[0])) {
+		JSValue ret = JS_UNDEFINED;
+		Bool rel_to_script = GF_FALSE;
+		const char *str = JS_ToCString(c, argv[0]);
+		if (argc>1) rel_to_script = JS_ToBool(c, argv[1]);
+		e = texture_load_file(c, tx, str, rel_to_script);
+		if (e) {
+			ret = js_throw_err_msg(c, e, "Failed to load texture file %s: %s", str, gf_error_to_string(e));
+		}
+		JS_FreeCString(c, str);
+		return ret;
+	}
+	if (JS_IsArrayBuffer(c, argv[0])) {
+		size_t data_size;
+		u8 *data = JS_GetArrayBuffer(c, &data_size, argv[0]);
+		if (!data) {
+			e = GF_BAD_PARAM;
+		} else {
+			e = texture_load_data(c, tx, data, (u32) data_size);
+		}
+		if (e) {
+			return js_throw_err_msg(c, e, "Failed to load texture: %s", gf_error_to_string(e));
+		}
+		return JS_UNDEFINED;
+	}
+	
+	return GF_JS_EXCEPTION(c);
+}
+
+static JSValue texture_set_named(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx || !tx->stencil || (argc<1) ) return GF_JS_EXCEPTION(c);
+
+#ifndef GPAC_DISABLE_3D
+	const char *str = JS_ToCString(c, argv[0]);
+	if (tx->named_tx) gf_free(tx->named_tx);
+	tx->named_tx = str ? gf_strdup(str) : NULL;
+	JS_FreeCString(c, str);
+#endif
+	return JS_UNDEFINED;
+}
+
+static JSValue texture_set_pad_color(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 color = 0;
+	GF_Err e;
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx || !tx->stencil) return GF_JS_EXCEPTION(c);
+	if (argc) {
+		Double a, r, g, b;
+		if (!get_color_from_args(c, argc, argv, 0, &a, &r, &g, &b))
+			return GF_JS_EXCEPTION(c);
+
+		a*=255;
+		r*=255;
+		g*=255;
+		b*=255;
+		color = GF_COL_ARGB(a, r, g, b);
+	}
+	e = gf_evg_stencil_set_pad_color(tx->stencil, color);
+	if (e) {
+		return js_throw_err_msg(c, e, "Failed to set texture pad color: %s", gf_error_to_string(e));
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue texture_get_pad_color(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	char szCol[12];
+	u32 color = 0;
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx || !tx->stencil) return GF_JS_EXCEPTION(c);
+
+	color = gf_evg_stencil_get_pad_color(tx->stencil);
+	if (!color) return JS_NewString(c, "none");
+	sprintf(szCol, "0x%02X%02X%02X%02X", GF_COL_A(color), GF_COL_R(color), GF_COL_G(color), GF_COL_B(color) );
+	return JS_NewString(c, szCol);
+}
+
+
 static const JSCFunctionListEntry texture_funcs[] =
 {
 	JS_CGETSET_MAGIC_DEF("filtering", NULL, texture_setProperty, TX_FILTER),
-	JS_CGETSET_MAGIC_DEF("cmx", NULL, texture_setProperty, TX_CMX),
-	JS_CGETSET_MAGIC_DEF("mx", NULL, texture_setProperty, TX_MAT),
+	JS_CGETSET_MAGIC_DEF("cmx", texture_getProperty, texture_setProperty, TX_CMX),
+	JS_CGETSET_MAGIC_DEF("mx", texture_getProperty, texture_setProperty, TX_MAT),
+	JS_CGETSET_MAGIC_DEF("auto_mx", texture_getProperty, texture_setProperty, TX_MAT_AUTO),
 	JS_CGETSET_MAGIC_DEF("repeat_s", texture_getProperty, texture_setProperty, TX_REPEAT_S),
 	JS_CGETSET_MAGIC_DEF("repeat_t", texture_getProperty, texture_setProperty, TX_REPEAT_T),
 	JS_CGETSET_MAGIC_DEF("flip_h", texture_getProperty, texture_setProperty, TX_FLIP_X),
@@ -5280,6 +6270,7 @@
 
 	JS_CFUNC_DEF("set_alpha", 0, stencil_set_alpha),
 	JS_CFUNC_DEF("set_alphaf", 0, stencil_set_alphaf),
+	JS_CFUNC_DEF("get_alphaf", 0, stencil_get_alphaf),
 	JS_CFUNC_DEF("rgb2hsv", 0, texture_rgb2hsv),
 	JS_CFUNC_DEF("hsv2rgb", 0, texture_hsv2rgb),
 	JS_CFUNC_DEF("rgb2yuv", 0, texture_rgb2yuv),
@@ -5289,7 +6280,10 @@
 	JS_CFUNC_DEF("update", 0, texture_update),
 	JS_CFUNC_DEF("get_pixelf", 0, texture_get_pixelf),
 	JS_CFUNC_DEF("get_pixel", 0, texture_get_pixel),
-
+	JS_CFUNC_DEF("load", 0, texture_load),
+	JS_CFUNC_DEF("set_named", 0, texture_set_named),
+	JS_CFUNC_DEF("set_pad_color", 0, texture_set_pad_color),
+	JS_CFUNC_DEF("get_pad_color", 0, texture_get_pad_color),
 };
 
 
@@ -5298,6 +6292,12 @@
 	Double compv;
 	JSValue ret, v, argv[2];
 	GF_JSTexture *tx = (GF_JSTexture *)cbk;
+
+	if (!gf_js_try_lock(tx->ctx)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONSOLE, ("[JS] Failed to lock JS context in parametric texture, cannot fetch pixel\n" ));
+		return;
+	}
+
 	argv[0] = JS_NewInt32(tx->ctx, x);
 	argv[1] = JS_NewInt32(tx->ctx, y);
 	ret = JS_Call(tx->ctx, tx->param_fun, tx->obj, 2, argv);
@@ -5321,6 +6321,8 @@
 
 #undef GETCOMP
 	JS_FreeValue(tx->ctx, ret);
+
+	gf_js_lock(tx->ctx, GF_FALSE);
 }
 
 static JSValue texture_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
@@ -5341,8 +6343,11 @@
 	tx->stencil = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
 	if (!tx->stencil) {
 		gf_free(tx);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
+	tx->param_fun = JS_UNDEFINED;
+	tx->obj = JS_UNDEFINED;
+	tx->par_obj = JS_UNDEFINED;
 	if (!argc) goto done;
 
 	if (JS_IsString(argv[0])) {
@@ -5370,6 +6375,7 @@
 			stride_uv = canvas->stride_uv;
 			data = canvas->data;
 			pf = canvas->pf;
+			tx->par_obj = JS_DupValue(c, argv[0]);
 		}
 		//create from filter packet
 		else if (jsf_is_packet(c, argv[0])) {
@@ -5388,6 +6394,7 @@
 					gf_free(tx);
 					return js_throw_err_msg(c, e, "Failed to load texture: %s", gf_error_to_string(e));
 				}
+				tx->par_obj = JS_DupValue(c, argv[0]);
 				goto done;
 			}
 			goto error;
@@ -5395,6 +6402,7 @@
 	}
 	//arraybuffer
 	else {
+		Bool is_ab = GF_FALSE;
 		if (argc<4) goto error;
 		if (JS_ToInt32(c, &width, argv[0])) goto error;
 		if (JS_ToInt32(c, &height, argv[1])) goto error;
@@ -5410,6 +6418,7 @@
 		}
 		else if (JS_IsObject(argv[3])) {
 			data = JS_GetArrayBuffer(c, &data_size, argv[3]);
+			is_ab = GF_TRUE;
 		}
 		if (!width || !height || !pf || (!data && JS_IsUndefined(tx_fun)))
 			goto error;
@@ -5422,6 +6431,9 @@
 					goto error;
 			}
 		}
+		if (is_ab) {
+			tx->par_obj = JS_DupValue(c, argv[3]);
+		}
 	}
 
 	tx->owns_data = GF_FALSE;
@@ -5448,6 +6460,7 @@
 done:
 	if (tx->pf) {
 		tx->nb_comp = gf_pixel_get_nb_comp(tx->pf);
+		tx->wide = (gf_pixel_is_wide_depth(tx->pf)>8) ? 1 : 0;
 		gf_pixel_get_size_info(tx->pf, tx->width, tx->height, NULL, NULL, NULL, NULL, NULL);
 	}
 	obj = JS_NewObjectClass(c, texture_class_id);
@@ -5486,6 +6499,24 @@
 	return GF_TRUE;
 }
 
+#ifndef GPAC_DISABLE_3D
+const char *js_evg_get_texture_named(JSContext *ctx, JSValue this_obj)
+{
+	GF_JSTexture *tx = JS_GetOpaque(this_obj, texture_class_id);
+	if (!tx) return NULL;
+	return tx->named_tx;
+}
+
+void js_evg_set_named_texture_gl(JSContext *ctx, JSValue this_obj, void *gl_named_tx)
+{
+	GF_JSTexture *tx = JS_GetOpaque(this_obj, texture_class_id);
+	if (!tx) return;
+	tx->gl_named_tx = gl_named_tx;
+	tx->force_resetup = GF_TRUE;
+}
+#endif
+
+
 static void text_reset(GF_JSText *txt)
 {
 	if (txt->path) gf_path_del(txt->path);
@@ -5496,12 +6527,26 @@
 	}
 	txt->min_x = txt->min_y = txt->max_x = txt->max_y = txt->max_w = txt->max_h = 0;
 }
+
+static void text_reset_fonts(GF_JSText *txt)
+{
+	if (txt->fontnames) {
+		u32 i;
+		for (i=0; i<txt->nb_fonts; i++) {
+			gf_free(txt->fontnames[i]);
+		}
+		gf_free(txt->fontnames);
+		txt->fontnames = NULL;
+		txt->nb_fonts = 0;
+	}
+}
+
 static void text_finalize(JSRuntime *rt, JSValue obj)
 {
 	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
 	if (!txt) return;
 	text_reset(txt);
-	if (txt->fontname) gf_free(txt->fontname);
+	text_reset_fonts(txt);
 	gf_list_del(txt->spans);
 	gf_free(txt);
 }
@@ -5543,9 +6588,18 @@
 static JSValue text_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
-	if (!txt) return JS_EXCEPTION;
+	if (!txt) return GF_JS_EXCEPTION(c);
 	switch (magic) {
-	case TXT_FONT: return JS_NewString(c, txt->fontname);
+	case TXT_FONT:
+	{
+		u32 i;
+		JSValue res = JS_NewArray(c);
+		JS_SetPropertyStr(c, res, "length", JS_NewInt32(c, txt->nb_fonts) );
+		for (i=0; i<txt->nb_fonts; i++) {
+			JS_SetPropertyUint32(c, res, i, JS_NewString(c, txt->fontnames[i]) );
+		}
+		return res;
+	}
 	case TXT_BASELINE: return JS_NewInt32(c, txt->baseline);
 	case TXT_ALIGN: return JS_NewInt32(c, txt->align);
 	case TXT_FONTSIZE: return JS_NewFloat64(c, txt->font_size);
@@ -5564,7 +6618,7 @@
 
 static void text_update_path(GF_JSText *txt, Bool for_centered)
 {
-	Fixed cy, ascent, descent, scale_x, ls;
+	Fixed cy, off_x, ascent, descent, scale_x, ls;
 	u32 i, nb_lines;
 
 	if ((txt->path_for_centered == for_centered) && txt->path) {
@@ -5598,7 +6652,9 @@
 		Fixed mid = (ascent + descent)/2;
 		cy = mid;
 	}
+	off_x = 0;
 
+	txt->right_to_left = GF_FALSE;
 	txt->path = gf_path_new();
 	nb_lines = gf_list_count(txt->spans);
 	for (i=0; i<nb_lines; i++) {
@@ -5607,6 +6663,10 @@
 		GF_Path *path;
 		GF_Matrix2D mx;
 		GF_TextSpan *span = gf_list_get(txt->spans, i);
+
+		if (span->flags & GF_TEXT_SPAN_RIGHT_TO_LEFT)
+			txt->right_to_left = GF_TRUE;
+
 		if ((txt->align == TXT_AL_LEFT)
 		|| ((txt->align == TXT_AL_START) && !(span->flags & GF_TEXT_SPAN_RIGHT_TO_LEFT))
 		|| ((txt->align == TXT_AL_END) && (span->flags & GF_TEXT_SPAN_RIGHT_TO_LEFT))
@@ -5623,7 +6683,7 @@
 		}
 		gf_mx2d_init(mx);
 
-		gf_mx2d_add_translation(&mx, cx, cy);
+		gf_mx2d_add_translation(&mx, off_x+cx, cy);
 		if (scale_x)
 			gf_mx2d_add_scale(&mx, scale_x, FIX_ONE);
 
@@ -5641,16 +6701,21 @@
 		gf_path_del(path);
 		span->flags = flags;
 
-		if (txt->path_for_centered)
-			cy -= ls;
-		else
-			cy += ls;
+		if (!txt->horizontal) {
+			off_x += ls;
+		} else {
+			if (txt->path_for_centered)
+				cy -= ls;
+			else
+				cy += ls;
+		}
 	}
 }
 static void text_set_path(GF_JSCanvas *canvas, GF_JSText *txt)
 {
 	text_update_path(txt, canvas->center_coords);
 	gf_evg_surface_set_path(canvas->surface, txt->path);
+	gf_evg_surface_force_aa(canvas->surface);
 }
 
 static void text_set_text_from_value(GF_JSText *txt, GF_Font *font, JSContext *c, JSValueConst value)
@@ -5659,9 +6724,9 @@
 	char *start = (char *) str;
 	while (start) {
 		GF_TextSpan *span;
-		char *nline = strchr(str, '\n');
+		char *nline = strchr(start, '\n');
 		if (nline) nline[0] = 0;
-		span = gf_font_manager_create_span(txt->fm, font, (char *) str, FLT2FIX(txt->font_size), GF_FALSE, GF_FALSE, GF_FALSE, NULL, GF_FALSE, 0, NULL);
+		span = gf_font_manager_create_span(txt->fm, font, (char *) start, FLT2FIX(txt->font_size), GF_FALSE, GF_FALSE, GF_FALSE, NULL, GF_FALSE, 0, NULL);
 		if (span) {
 			if (txt->horizontal)
 				span->flags |= GF_TEXT_SPAN_HORIZONTAL;
@@ -5680,7 +6745,7 @@
 	JSValue nobj;
 	Bool is_center = GF_TRUE;
 	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
-	if (!txt) return JS_EXCEPTION;
+	if (!txt) return GF_JS_EXCEPTION(c);
 	if (argc) is_center = JS_ToBool(c, argv[0]);
 
 	text_update_path(txt, is_center);
@@ -5694,12 +6759,14 @@
 {
 	s32 i, j, nb_lines;
 	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
-	if (!txt) return JS_EXCEPTION;
+	if (!txt) return GF_JS_EXCEPTION(c);
 	text_reset(txt);
 	if (!argc) return JS_UNDEFINED;
 
-	txt->font = gf_font_manager_set_font(txt->fm, &txt->fontname, 1, txt->styles);
-	if (!txt->font) return js_throw_err_msg(c, GF_NOT_FOUND, "Font %s not found and no default font available - check your GPAC configuration", txt->fontname);
+	txt->font = gf_font_manager_set_font(txt->fm, txt->fontnames, txt->nb_fonts, txt->styles);
+	if (!txt->font)
+		return js_throw_err_msg(c, GF_NOT_FOUND, "Fonts not found (first was %s) and no default font available!\n"
+			"Check your GPAC configuration, or use `-rescan-fonts` to refresh font directory.\n", txt->fontnames ? txt->fontnames[0] : "none");
 
 	for (i=0; i<argc; i++) {
 		if (JS_IsArray(c, argv[i])) {
@@ -5721,13 +6788,15 @@
 	for (i=0; i<nb_lines; i++) {
 		GF_TextSpan *span = gf_list_get(txt->spans, i);
 		gf_font_manager_refresh_span_bounds(span);
+		span->bounds.y += FLT2FIX( i*txt->lineSpacing );
+
 		if (!txt->max_h && !txt->max_w) {
 			txt->max_w = span->bounds.width;
 			txt->max_h = span->bounds.height;
 			txt->min_x = span->bounds.x;
 			txt->min_y = span->bounds.y;
 			txt->max_x = txt->min_x + span->bounds.width;
-			txt->max_y = txt->min_y + span->bounds.x;
+			txt->max_y = txt->min_y + span->bounds.height;
 		} else {
 			if (txt->min_x > span->bounds.x)
 				txt->min_x = span->bounds.x;
@@ -5751,23 +6820,46 @@
 {
 	const char *str;
 	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
-	if (!txt) return JS_EXCEPTION;
+	if (!txt) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case TXT_FONT:
-		str = JS_ToCString(c, value);
-		if (txt->fontname) gf_free(txt->fontname);
-		txt->fontname = str ? gf_strdup(str) : NULL;
-		JS_FreeCString(c, str);
+	{
+		text_reset_fonts(txt);
+		if (JS_IsArray(c, value)) {
+			u32 i, nb_fonts;
+			JSValue res = JS_GetPropertyStr(c, value, "length");
+			if (JS_ToInt32(c, &nb_fonts, res)) {
+				JS_FreeValue(c, res);
+				return GF_JS_EXCEPTION(c);
+			}
+			JS_FreeValue(c, res);
+			txt->nb_fonts = nb_fonts;
+			txt->fontnames = gf_malloc(sizeof(char *) * nb_fonts);
+			for (i=0; i<nb_fonts; i++) {
+				res = JS_GetPropertyUint32(c, value, i);
+				str = JS_ToCString(c, res);
+				txt->fontnames[i] = gf_strdup(str ? str : "SANS");
+				JS_FreeCString(c, str);
+				JS_FreeValue(c, res);
+			}
+		} else {
+			txt->nb_fonts = 1;
+			txt->fontnames = gf_malloc(sizeof(char *));
+			str = JS_ToCString(c, value);
+			txt->fontnames[0] = gf_strdup(str ? str : "SANS");
+			JS_FreeCString(c, str);
+		}
+	}
 		break;
 	case TXT_BASELINE:
-		if (JS_ToInt32(c, &txt->baseline, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &txt->baseline, value)) return GF_JS_EXCEPTION(c);
 		return JS_UNDEFINED;
 	case TXT_ALIGN:
-		if (JS_ToInt32(c, &txt->align, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &txt->align, value)) return GF_JS_EXCEPTION(c);
 		return JS_UNDEFINED;
 	case TXT_FONTSIZE:
-		if (JS_ToFloat64(c, &txt->font_size, value)) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &txt->font_size, value)) return GF_JS_EXCEPTION(c);
 		break;
 	case TXT_HORIZ:
 		txt->horizontal = JS_ToBool(c, value);
@@ -5813,10 +6905,25 @@
 {
 	JSValue res;
 	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
-	if (!txt) return JS_EXCEPTION;
+	if (!txt) return GF_JS_EXCEPTION(c);
 	res = JS_NewObject(c);
-	JS_SetPropertyStr(c, res, "width", JS_NewFloat64(c, txt->max_w) );
-	JS_SetPropertyStr(c, res, "height", JS_NewFloat64(c, txt->max_h) );
+
+	if (txt->horizontal) {
+		JS_SetPropertyStr(c, res, "width", JS_NewFloat64(c, txt->max_w) );
+		JS_SetPropertyStr(c, res, "height", JS_NewFloat64(c, txt->max_y-txt->min_y) );
+	} else {
+		GF_Rect rc;
+		if (txt->path) gf_path_del(txt->path);
+		txt->path = NULL;
+		text_update_path(txt, GF_TRUE);
+		gf_path_get_bounds(txt->path, &rc);
+		if (txt->path) gf_path_del(txt->path);
+		txt->path = NULL;
+		JS_SetPropertyStr(c, res, "width", JS_NewFloat64(c, rc.width) );
+		JS_SetPropertyStr(c, res, "height", JS_NewFloat64(c, rc.height) );
+	}
+
+	JS_SetPropertyStr(c, res, "right_to_left", JS_NewBool(c, txt->right_to_left) );
 	if (txt->font) {
 		JS_SetPropertyStr(c, res, "em_size", JS_NewInt32(c, txt->font->em_size) );
 		JS_SetPropertyStr(c, res, "ascent", JS_NewInt32(c, txt->font->ascent) );
@@ -5863,18 +6970,14 @@
 
 	if (!txt->fm) {
 		gf_free(txt);
-		return JS_EXCEPTION;
+		return js_throw_err_msg(c, GF_IO_ERR, "Failed to load font manager\n");
 	}
 	txt->spans = gf_list_new();
 	if (!txt->spans) {
 		gf_free(txt);
-		return JS_EXCEPTION;
-	}
-	if (argc) {
-		const char *str = JS_ToCString(c, argv[0]);
-		if (str) txt->fontname = gf_strdup(str);
-		JS_FreeCString(c, str);
+		return GF_JS_EXCEPTION(c);
 	}
+
 	txt->font_size = 12.0;
 	txt->horizontal = GF_TRUE;
 	txt->align = TXT_AL_START;
@@ -5891,6 +6994,7 @@
 enum
 {
 	MX_PROP_IDENTITY=0,
+	MX_PROP_3D,
 	MX_PROP_YAW,
 	MX_PROP_PITCH,
 	MX_PROP_ROLL,
@@ -5943,9 +7047,12 @@
 	GF_Vec4 ro;
 	u32 i;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(ctx);
 	switch (magic) {
-	case MX_PROP_IDENTITY: return JS_NewBool(ctx, gf_mx2d_is_identity(*mx));
+	case MX_PROP_IDENTITY:
+		return JS_NewBool(ctx, gf_mx_is_identity(*mx));
+	case MX_PROP_3D:
+		return JS_TRUE;
 	case MX_PROP_YAW:
 		gf_mx_get_yaw_pitch_roll(mx, &yaw, &pitch, &roll);
 		return JS_NewFloat64(ctx, FIX2FLT(yaw));
@@ -5986,7 +7093,7 @@
 	JSValue v;
 	u32 i, len;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(ctx);
 
 
 	switch (magic) {
@@ -5994,12 +7101,12 @@
 	 	gf_mx_init(*mx);
 	 	break;
 	case MX_PROP_M:
-		if (!JS_IsArray(ctx, value)) return JS_EXCEPTION;
+		if (!JS_IsArray(ctx, value)) return GF_JS_EXCEPTION(ctx);
 		v = JS_GetPropertyStr(ctx, value, "length");
 		len=0;
 		JS_ToInt32(ctx, &len, v);
 		JS_FreeValue(ctx, v);
-		if (len != 16) return JS_EXCEPTION;
+		if (len != 16) return GF_JS_EXCEPTION(ctx);
 		for (i=0; i<len; i++) {
 			Double _d;
 			v = JS_GetPropertyUint32(ctx, value, i);
@@ -6015,19 +7122,30 @@
 
 static JSValue mx_copy(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
+	GF_Matrix *mx2;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
-	GF_Matrix *mx2 = JS_GetOpaque(argv[0], matrix_class_id);
-	if (!mx2) return JS_EXCEPTION;
-	gf_mx_copy(*mx, *mx2);
-	return JS_DupValue(ctx, this_val);
+	if (!mx)
+		return GF_JS_EXCEPTION(ctx);
+	if (argc) {
+		mx2 = JS_GetOpaque(argv[0], matrix_class_id);
+		if (!mx2)
+			return GF_JS_EXCEPTION(ctx);
+		gf_mx_copy(*mx, *mx2);
+		return JS_DupValue(ctx, this_val);
+	}
+	GF_SAFEALLOC(mx2, GF_Matrix);
+	if (!mx2) return GF_JS_EXCEPTION(ctx);
+	JSValue res = JS_NewObjectClass(ctx, matrix_class_id);
+	JS_SetOpaque(res, mx2);
+	gf_mx_copy(*mx2, *mx);
+	return res;
 }
 static JSValue mx_equal(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
+	if (!mx || !argc) return GF_JS_EXCEPTION(ctx);
 	GF_Matrix *mx2 = JS_GetOpaque(argv[0], matrix_class_id);
-	if (!mx2) return JS_EXCEPTION;
+	if (!mx2) return GF_JS_EXCEPTION(ctx);
 	if (gf_mx_equal(mx, mx2)) return JS_TRUE;
 	return JS_FALSE;
 }
@@ -6088,12 +7206,16 @@
 {
 	Double vx, vy, vz;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
+	if (!mx || !argc) return GF_JS_EXCEPTION(ctx);
 	if (!JS_IsObject(argv[0])) {
-		if (argc<3) return JS_EXCEPTION;
+		if (argc<2) return GF_JS_EXCEPTION(ctx);
 		EVG_GET_FLOAT(vx, argv[0])
 		EVG_GET_FLOAT(vy, argv[1])
-		EVG_GET_FLOAT(vz, argv[2])
+		if (argc==3) {
+			EVG_GET_FLOAT(vz, argv[2])
+		} else {
+			vz = 0;
+		}
 	} else {
 		WGL_GET_VEC3(vx, vy, vz, argv[0])
 	}
@@ -6104,9 +7226,9 @@
 {
 	Double vx, vy, vz;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
+	if (!mx || !argc) return GF_JS_EXCEPTION(ctx);
 	if (!JS_IsObject(argv[0])) {
-		if (argc<3) return JS_EXCEPTION;
+		if (argc<3) return GF_JS_EXCEPTION(ctx);
 		EVG_GET_FLOAT(vx, argv[0])
 		EVG_GET_FLOAT(vy, argv[1])
 		EVG_GET_FLOAT(vz, argv[2])
@@ -6120,9 +7242,9 @@
 {
 	Double vx, vy, vz, angle;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
+	if (!mx || !argc) return GF_JS_EXCEPTION(ctx);
 	if (!JS_IsObject(argv[0])) {
-		if (argc<4) return JS_EXCEPTION;
+		if (argc<4) return GF_JS_EXCEPTION(ctx);
 		EVG_GET_FLOAT(vx, argv[0])
 		EVG_GET_FLOAT(vy, argv[1])
 		EVG_GET_FLOAT(vz, argv[2])
@@ -6135,22 +7257,37 @@
 }
 static JSValue mx_add(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
+	GF_Matrix *_mx2 = NULL;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
+	if (!mx || !argc)
+		return GF_JS_EXCEPTION(ctx);
 	GF_Matrix *mx2 = JS_GetOpaque(argv[0], matrix_class_id);
-	if (!mx2) return JS_EXCEPTION;
+
+	if (!mx2) {
+		GF_Matrix2D *mx2_2D = JS_GetOpaque(argv[0], mx2d_class_id);
+		if (!mx2_2D)
+			return GF_JS_EXCEPTION(ctx);
+
+		GF_SAFEALLOC(_mx2, GF_Matrix);
+		if (!_mx2)
+			return GF_JS_EXCEPTION(ctx);
+		gf_mx_from_mx2d(_mx2, mx2_2D);
+		mx2 = _mx2;
+	}
 	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
 		gf_mx_add_matrix_4x4(mx, mx2);
 	} else {
 		gf_mx_add_matrix(mx, mx2);
 	}
+	if (_mx2) gf_free(_mx2);
+
 	return JS_DupValue(ctx, this_val);
 }
 
 static JSValue mx_inverse(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(ctx);
 	if (argc && JS_ToBool(ctx, argv[0])) {
 		gf_mx_inverse_4x4(mx);
 	} else {
@@ -6162,7 +7299,7 @@
 static JSValue mx_transpose(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(ctx);
 	gf_mx_transpose(mx);
 	return JS_DupValue(ctx, this_val);
 }
@@ -6174,16 +7311,21 @@
 	GF_Vec4 pt4;
 	JSValue v, res;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || !argc) return JS_EXCEPTION;
-	if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+	if (!mx || !argc) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsObject(argv[0])) return GF_JS_EXCEPTION(ctx);
 
 	/*try rect*/
 	v = JS_GetPropertyStr(ctx, argv[0], "width");
+	if (JS_IsUndefined(v))
+		v = JS_GetPropertyStr(ctx, argv[0], "w");
+
 	if (!JS_IsUndefined(v)) {
 		GF_Rect rc;
 		EVG_GET_FLOAT(width, v);
 		JS_FreeValue(ctx, v);
 		v = JS_GetPropertyStr(ctx, argv[0], "height");
+		if (JS_IsUndefined(v))
+			v = JS_GetPropertyStr(ctx, argv[0], "h");
 		EVG_GET_FLOAT(height, v);
 		JS_FreeValue(ctx, v);
 		v = JS_GetPropertyStr(ctx, argv[0], "x");
@@ -6206,7 +7348,7 @@
 	if (JS_IsUndefined(v)) v = JS_GetPropertyStr(ctx, argv[0], "angle");
 	if (!JS_IsUndefined(v)) {
 		Double _v;
-		if (JS_ToFloat64(ctx, &_v, v)) return JS_EXCEPTION;
+		if (JS_ToFloat64(ctx, &_v, v)) return GF_JS_EXCEPTION(ctx);
 		pt4.q = FLT2FIX(_v);
 
 		WGL_GET_VEC3F(pt4, argv[0])
@@ -6237,7 +7379,7 @@
 {
 	Double left, right, bottom, top, z_near, z_far;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || (argc<6)) return JS_EXCEPTION;
+	if (!mx || (argc<6)) return GF_JS_EXCEPTION(ctx);
 	EVG_GET_FLOAT(left, argv[0])
 	EVG_GET_FLOAT(right, argv[1])
 	EVG_GET_FLOAT(bottom, argv[2])
@@ -6255,7 +7397,7 @@
 {
 	Double fov, ar, z_near, z_far;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || (argc<4)) return JS_EXCEPTION;
+	if (!mx || (argc<4)) return GF_JS_EXCEPTION(ctx);
 	EVG_GET_FLOAT(fov, argv[0])
 	EVG_GET_FLOAT(ar, argv[1])
 	EVG_GET_FLOAT(z_near, argv[2])
@@ -6271,7 +7413,7 @@
 {
 	GF_Vec pos, target, up;
 	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
-	if (!mx || (argc<3) ) return JS_EXCEPTION;
+	if (!mx || (argc!=3) ) return GF_JS_EXCEPTION(ctx);
 
 	WGL_GET_VEC3F(pos, argv[0]);
 	WGL_GET_VEC3F(target, argv[1]);
@@ -6284,6 +7426,7 @@
 static const JSCFunctionListEntry mx_funcs[] =
 {
 	JS_CGETSET_MAGIC_DEF("identity", mx_getProperty, mx_setProperty, MX_PROP_IDENTITY),
+	JS_CGETSET_MAGIC_DEF("is3D", mx_getProperty, mx_setProperty, MX_PROP_3D),
 	JS_CGETSET_MAGIC_DEF("m", mx_getProperty, mx_setProperty, MX_PROP_M),
 	JS_CGETSET_MAGIC_DEF("yaw", mx_getProperty, NULL, MX_PROP_YAW),
 	JS_CGETSET_MAGIC_DEF("pitch", mx_getProperty, NULL, MX_PROP_PITCH),
@@ -6321,8 +7464,11 @@
 	JS_SetOpaque(res, mx);
 	if (argc) {
 		GF_Matrix *from = JS_GetOpaque(argv[0], matrix_class_id);
+		GF_Matrix2D *from2D = JS_GetOpaque(argv[0], mx2d_class_id);
 		if (from) {
 			gf_mx_copy(*mx, *from);
+		} else if (from2D) {
+			gf_mx_from_mx2d(mx, from2D);
 		} else if (argc>=3) {
 			GF_Vec x_axis, y_axis, z_axis;
 			WGL_GET_VEC3F(x_axis, argv[0])
@@ -6335,6 +7481,73 @@
 }
 
 
+#ifndef GPAC_DISABLE_3D
+static void mesh_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_Mesh *mesh = JS_GetOpaque(obj, mesh_class_id);
+	if (mesh) mesh_free(mesh);
+}
+
+JSClassDef mesh_class = {
+	.class_name = "Mesh",
+	.finalizer = mesh_finalize
+};
+
+
+Bool mesh_gl_update_buffers(GF_Mesh *mesh);
+
+static JSValue mesh_update_gl(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Mesh *mesh = JS_GetOpaque(this_val, mesh_class_id);
+	if (!mesh) return GF_JS_EXCEPTION(ctx);
+	Bool res = mesh_gl_update_buffers(mesh);
+	if (!res) return GF_JS_EXCEPTION(ctx);
+	return JS_UNDEFINED;
+}
+
+JSValue mesh_gl_draw(JSContext *ctx, GF_Mesh *mesh, int argc, JSValueConst *argv);
+
+static JSValue mesh_draw(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Mesh *mesh = JS_GetOpaque(this_val, mesh_class_id);
+	if (!mesh) return GF_JS_EXCEPTION(ctx);
+	return mesh_gl_draw(ctx, mesh, argc, argv);
+}
+
+static const JSCFunctionListEntry mesh_funcs[] =
+{
+	JS_CFUNC_DEF("update_gl", 0, mesh_update_gl),
+	JS_CFUNC_DEF("draw", 0, mesh_draw),
+};
+
+static JSValue mesh_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	GF_Mesh *mesh;
+	GF_Path *gp = NULL;
+
+	if (argc==1) {
+		gp = JS_GetOpaque(argv[0], path_class_id);
+		if (!gp) return GF_JS_EXCEPTION(ctx);
+	}
+
+	mesh = new_mesh();
+	if (!mesh)
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+
+	res = JS_NewObjectClass(ctx, mesh_class_id);
+	JS_SetOpaque(res, mesh);
+
+	if (gp)
+		mesh_from_path(mesh, gp);
+
+	return res;
+}
+
+
+#endif //GPAC_DISABLE_3D
+
+
 static JSValue evg_pixel_size(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	u32 pfmt=0;
@@ -6386,8 +7599,10 @@
 		JS_NewClassID(&matrix_class_id);
 		JS_NewClass(rt, matrix_class_id, &matrix_class);
 
-		JS_NewClassID(&canvas3d_class_id);
-		JS_NewClass(rt, canvas3d_class_id, &canvas3d_class);
+#ifndef GPAC_DISABLE_3D
+		JS_NewClassID(&mesh_class_id);
+		JS_NewClass(rt, mesh_class_id, &mesh_class);
+#endif
 
 		JS_NewClassID(&shader_class_id);
 		JS_NewClass(rt, shader_class_id, &shader_class);
@@ -6442,10 +7657,6 @@
 JS_SetPropertyFunctionList(c, proto, mx_funcs, countof(mx_funcs));
 JS_SetClassProto(c, matrix_class_id, proto);
 
-	proto = JS_NewObject(c);
- JS_SetPropertyFunctionList(c, proto, canvas3d_funcs, countof(canvas3d_funcs));
- JS_SetClassProto(c, canvas3d_class_id, proto);
-
 #ifdef EVG_USE_JS_SHADER
 	proto = JS_NewObject(c);
 JS_SetPropertyFunctionList(c, proto, fragment_funcs, countof(fragment_funcs));
@@ -6472,10 +7683,15 @@
 JS_SetPropertyFunctionList(c, proto, va_funcs, countof(va_funcs));
 JS_SetClassProto(c, va_class_id, proto);
 
+#ifndef GPAC_DISABLE_3D
+	proto = JS_NewObject(c);
+ JS_SetPropertyFunctionList(c, proto, mesh_funcs, countof(mesh_funcs));
+ JS_SetClassProto(c, mesh_class_id, proto);
+#endif
 
 	global = JS_GetGlobalObject(c);
 	JS_SetPropertyStr(c, global, "GF_GRADIENT_MODE_PAD", JS_NewInt32(c, GF_GRADIENT_MODE_PAD));
-	JS_SetPropertyStr(c, global, "GF_GRADIENT_MODE_STREAD", JS_NewInt32(c, GF_GRADIENT_MODE_SPREAD));
+	JS_SetPropertyStr(c, global, "GF_GRADIENT_MODE_SPREAD", JS_NewInt32(c, GF_GRADIENT_MODE_SPREAD));
 	JS_SetPropertyStr(c, global, "GF_GRADIENT_MODE_REPEAT", JS_NewInt32(c, GF_GRADIENT_MODE_REPEAT));
 
 	JS_SetPropertyStr(c, global, "GF_TEXTURE_FILTER_HIGH_SPEED", JS_NewInt32(c, GF_TEXTURE_FILTER_HIGH_SPEED));
@@ -6566,6 +7782,26 @@
 	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_GREATER", JS_NewInt32(c, GF_EVGDEPTH_GREATER));
 	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_GREATER_EQUAL", JS_NewInt32(c, GF_EVGDEPTH_GREATER_EQUAL));
 
+	JS_SetPropertyStr(c, global, "GF_EVG_OPERAND_NONE", JS_NewInt32(c, GF_EVG_OPERAND_NONE));
+	JS_SetPropertyStr(c, global, "GF_EVG_OPERAND_MIX", JS_NewInt32(c, GF_EVG_OPERAND_MIX));
+	JS_SetPropertyStr(c, global, "GF_EVG_OPERAND_MIX_ALPHA", JS_NewInt32(c, GF_EVG_OPERAND_MIX_ALPHA));
+	JS_SetPropertyStr(c, global, "GF_EVG_OPERAND_REPLACE_ALPHA", JS_NewInt32(c, GF_EVG_OPERAND_REPLACE_ALPHA));
+	JS_SetPropertyStr(c, global, "GF_EVG_OPERAND_REPLACE_ONE_MINUS_ALPHA", JS_NewInt32(c, GF_EVG_OPERAND_REPLACE_ONE_MINUS_ALPHA));
+	JS_SetPropertyStr(c, global, "GF_EVG_OPERAND_MIX_DYN", JS_NewInt32(c, GF_EVG_OPERAND_MIX_DYN));
+	JS_SetPropertyStr(c, global, "GF_EVG_OPERAND_MIX_DYN_ALPHA", JS_NewInt32(c, GF_EVG_OPERAND_MIX_DYN_ALPHA));
+	JS_SetPropertyStr(c, global, "GF_EVG_OPERAND_ODD_FILL", JS_NewInt32(c, GF_EVG_OPERAND_ODD_FILL));
+
+	JS_SetPropertyStr(c, global, "GF_RASTER_HIGH_SPEED", JS_NewInt32(c, GF_RASTER_HIGH_SPEED));
+	JS_SetPropertyStr(c, global, "GF_RASTER_MID", JS_NewInt32(c, GF_RASTER_MID));
+	JS_SetPropertyStr(c, global, "GF_RASTER_HIGH_QUALITY", JS_NewInt32(c, GF_RASTER_HIGH_QUALITY));
+
+	JS_SetPropertyStr(c, global, "GF_EVGMASK_NONE", JS_NewInt32(c, GF_EVGMASK_NONE));
+	JS_SetPropertyStr(c, global, "GF_EVGMASK_DRAW", JS_NewInt32(c, GF_EVGMASK_DRAW));
+	JS_SetPropertyStr(c, global, "GF_EVGMASK_DRAW_NO_CLEAR", JS_NewInt32(c, GF_EVGMASK_DRAW_NO_CLEAR));
+	JS_SetPropertyStr(c, global, "GF_EVGMASK_USE", JS_NewInt32(c, GF_EVGMASK_USE));
+	JS_SetPropertyStr(c, global, "GF_EVGMASK_USE_INV", JS_NewInt32(c, GF_EVGMASK_USE_INV));
+	JS_SetPropertyStr(c, global, "GF_EVGMASK_RECORD", JS_NewInt32(c, GF_EVGMASK_RECORD));
+
 	JS_FreeValue(c, global);
 
 
@@ -6586,8 +7822,6 @@
 JS_SetModuleExport(c, m, "RadialGradient", ctor);
 	ctor = JS_NewCFunction2(c, texture_constructor, "Texture", 1, JS_CFUNC_constructor, 0);
 JS_SetModuleExport(c, m, "Texture", ctor);
-	ctor = JS_NewCFunction2(c, canvas3d_constructor, "Canvas3D", 1, JS_CFUNC_constructor, 0);
- JS_SetModuleExport(c, m, "Canvas3D", ctor);
 	ctor = JS_NewCFunction2(c, text_constructor, "Text", 1, JS_CFUNC_constructor, 0);
 JS_SetModuleExport(c, m, "Text", ctor);
 	ctor = JS_NewCFunction2(c, mx_constructor, "Matrix", 1, JS_CFUNC_constructor, 0);
@@ -6597,9 +7831,19 @@
 	ctor = JS_NewCFunction2(c, va_constructor, "VertexAttrib", 1, JS_CFUNC_constructor, 0);
 JS_SetModuleExport(c, m, "VertexAttrib", ctor);
 
+#ifndef GPAC_DISABLE_3D
+	ctor = JS_NewCFunction2(c, mesh_constructor, "Mesh", 1, JS_CFUNC_constructor, 0);
+ JS_SetModuleExport(c, m, "Mesh", ctor);
+#endif
+
 	ctor = JS_NewCFunction2(c, evg_pixel_size, "PixelSize", 1, JS_CFUNC_generic, 0);
 JS_SetModuleExport(c, m, "PixelSize", ctor);
 
+#ifdef GPAC_HAS_FFMPEG
+ JS_SetModuleExport(c, m, "BlitEnabled", JS_TRUE);
+#else
+ JS_SetModuleExport(c, m, "BlitEnabled", JS_FALSE);
+#endif
 	return 0;
 }
 
@@ -6619,10 +7863,11 @@
 	JS_AddModuleExport(ctx, m, "Texture");
 	JS_AddModuleExport(ctx, m, "Text");
 	JS_AddModuleExport(ctx, m, "Matrix");
-	JS_AddModuleExport(ctx, m, "Canvas3D");
+	JS_AddModuleExport(ctx, m, "Mesh");
 JS_AddModuleExport(ctx, m, "VertexAttribInterpolator");
 JS_AddModuleExport(ctx, m, "VertexAttrib");
 JS_AddModuleExport(ctx, m, "PixelSize");
+ JS_AddModuleExport(ctx, m, "BlitEnabled");
 return;
 }

gpac-1.0.1.tar.gz/src/jsmods/scene_js.c -> gpac-2.0.0.tar.gz/src/jsmods/scene_js.c Changed

@@ -96,6 +96,7 @@
 	GJS_OM_PROP_MAX_RATE,
 	GJS_OM_PROP_SERVICE_HANDLER,
 	GJS_OM_PROP_CODEC,
+	GJS_OM_PROP_NB_VIEWS,
 	GJS_OM_PROP_NB_QUALITIES,
 	GJS_OM_PROP_MAX_BUFFER,
 	GJS_OM_PROP_MIN_BUFFER,
@@ -123,6 +124,7 @@
 	GJS_OM_PROP_DEPENDENT_GROUPS,
 	GJS_OM_PROP_DISABLED,
 	GJS_OM_PROP_NTP_SENDER_DIFF,
+	GJS_OM_PROP_BUFFERING,
 };
 
 enum {
@@ -208,7 +210,7 @@
 	char *str;
 	GF_SCENEJSExt *ext = JS_GetOpaque(this_val, scene_class_id);
 	GF_Compositor *compositor = ext ? ext->compositor : NULL;
-	if (!ext || !compositor) return JS_EXCEPTION;
+	if (!ext || !compositor) return GF_JS_EXCEPTION(ctx);
 
 	switch (prop_id) {
 
@@ -310,13 +312,13 @@
 	const char *prop_val;
 	GF_SCENEJSExt *ext = JS_GetOpaque(this_val, scene_class_id);
 	GF_Compositor *compositor = ext ? ext->compositor : NULL;
-	if (!ext || !compositor) return JS_EXCEPTION;
+	if (!ext || !compositor) return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case GJS_SCENE_PROP_CAPTION:
 	{
 		GF_Event evt;
-		if (!JS_IsString(value)) return JS_EXCEPTION;
+		if (!JS_IsString(value)) return GF_JS_EXCEPTION(ctx);
 		prop_val = JS_ToCString(ctx, value);
 		evt.type = GF_EVENT_SET_CAPTION;
 		if (prop_val && !strnicmp(prop_val, "gpac://", 7)) {
@@ -346,7 +348,7 @@
 		break;
 
 	case GJS_SCENE_PROP_NAVIGATION:
-		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 		gf_sc_set_option(compositor, GF_OPT_NAVIGATION, (u32) ival);
 		break;
 	case GJS_SCENE_PROP_NAVIGATION_TYPE:
@@ -380,10 +382,10 @@
 	char arg_val[GF_PROP_DUMP_ARG_SIZE];
 	s32 idx = -1;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor) return JS_EXCEPTION;
-	if (argc < 2) return JS_EXCEPTION;
-	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
-	if (!JS_IsString(argv[1]) && !JS_IsNumber(argv[1])) return JS_EXCEPTION;
+	if (!compositor) return GF_JS_EXCEPTION(ctx);
+	if (argc < 2) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsString(argv[1]) && !JS_IsNumber(argv[1])) return GF_JS_EXCEPTION(ctx);
 
 	sec_name = JS_ToCString(ctx, argv[0]);
 	key_name = NULL;
@@ -420,10 +422,10 @@
 {
 	const char *sec_name, *key_name, *key_val;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor) return JS_EXCEPTION;
-	if (argc < 3) return JS_EXCEPTION;
-	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
-	if (!JS_IsString(argv[1])) return JS_EXCEPTION;
+	if (!compositor) return GF_JS_EXCEPTION(ctx);
+	if (argc < 3) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsString(argv[1])) return GF_JS_EXCEPTION(ctx);
 
 	sec_name = JS_ToCString(ctx, argv[0]);
 	key_name = JS_ToCString(ctx, argv[1]);
@@ -449,8 +451,8 @@
 {
 	u32 r, g, b, a, i;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor) return JS_EXCEPTION;
-	if (argc < 3) return JS_EXCEPTION;
+	if (!compositor) return GF_JS_EXCEPTION(ctx);
+	if (argc < 3) return GF_JS_EXCEPTION(ctx);
 	r = g = b = 0;
 	a = 255;
 	for (i=0; i<(u32) argc; i++) {
@@ -458,7 +460,7 @@
 		u32 v;
 		if (! JS_ToFloat64(ctx, &d, argv[i])) {
 		} else {
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		}
 		d*=255;
 		v = 0;
@@ -480,11 +482,11 @@
 static JSValue scenejs_switch_quality(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor) return JS_EXCEPTION;
-	if (argc < 1) return JS_EXCEPTION;
+	if (!compositor) return GF_JS_EXCEPTION(ctx);
+	if (argc < 1) return GF_JS_EXCEPTION(ctx);
 
 	if (!JS_IsBool(argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	Bool up = JS_ToBool(ctx, argv[0]) ? GF_TRUE : GF_FALSE;
 	gf_scene_switch_quality(compositor->root_scene, up);
 	return JS_UNDEFINED;
@@ -496,7 +498,7 @@
 {
 	GF_Event evt;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor) return JS_EXCEPTION;
+	if (!compositor) return GF_JS_EXCEPTION(ctx);
 
 	memset(&evt, 0, sizeof(GF_Event));
 	evt.type = GF_EVENT_RELOAD;
@@ -509,14 +511,14 @@
 {
 	u32 type;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor) return JS_EXCEPTION;
-	if (argc < 1) return JS_EXCEPTION;
+	if (!compositor) return GF_JS_EXCEPTION(ctx);
+	if (argc < 1) return GF_JS_EXCEPTION(ctx);
 
 	if (! JS_IsInteger(argv[0]) ) {
 		return JS_NewBool(ctx, 0);
 	}
 	if (JS_ToInt32(ctx, &type, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	return JS_NewBool(ctx, gf_sc_navigation_supported(compositor, type) ? 1 : 0 );
 }
 
@@ -525,14 +527,14 @@
 	Bool override_size_info = 0;
 	u32 w, h;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor) return JS_EXCEPTION;
-	if (argc<2) return JS_EXCEPTION;
+	if (!compositor) return GF_JS_EXCEPTION(ctx);
+	if (argc<2) return GF_JS_EXCEPTION(ctx);
 
 	w = h = 0;
 	if (JS_ToInt32(ctx, &w, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt32(ctx, &h, argv[1]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (argc > 2)
 		override_size_info = JS_ToBool(ctx, argv[2]);
@@ -580,7 +582,7 @@
 {
 	Bool type_3d;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!argc) return JS_EXCEPTION;
+	if (!argc) return GF_JS_EXCEPTION(ctx);
 	type_3d = JS_ToBool(ctx, argv[0]);
 
 	if (compositor->inherit_type_3d != type_3d) {
@@ -595,14 +597,14 @@
 {
 	GF_Event evt;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (argc < 2) return JS_EXCEPTION;
+	if (argc < 2) return GF_JS_EXCEPTION(ctx);
 
 	evt.type = GF_EVENT_MOVE;
 	evt.move.relative = 1;
 	if (JS_ToInt32(ctx, &evt.move.x, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt32(ctx, &evt.move.y, argv[1]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (argc ==3) {
 		evt.move.relative = JS_ToBool(ctx, argv[2]);
@@ -617,7 +619,7 @@
 {
 	GF_SceneGraph *sg = NULL;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor) return JS_EXCEPTION;
+	if (!compositor) return GF_JS_EXCEPTION(ctx);
 
 	if (!argc || !JS_IsObject(argv[0]) ) {
 		sg = compositor->root_scene->graph;
@@ -746,14 +748,17 @@
 return JS_NewString(ctx, odi.service_handler ? odi.service_handler : "unloaded");
 	case GJS_OM_PROP_CODEC:
 		gf_odm_get_object_info(odm, &odi);
- return JS_NewString(ctx, odi.codec_name ? odi.codec_name : "unloaded");
+		return JS_NewString(ctx, odi.codec_name ? odi.codec_name : "unloaded");
+	case GJS_OM_PROP_NB_VIEWS:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, (odi.nb_views>1) ? odi.nb_views : 0);
 	case GJS_OM_PROP_NB_QUALITIES:
 		//use HAS qualities
 		if (odm->pid) {
 			u32 nb_qualities = 0;
 			GF_PropertyEntry *pe=NULL;
 			const GF_PropertyValue *prop = gf_filter_pid_get_info_str(odm->pid, "has:qualities", &pe);
-			if (prop) nb_qualities = gf_list_count( prop->value.string_list);
+			if (prop) nb_qualities = prop->value.string_list.nb_items;
 			gf_filter_release_property(pe);
 
 			if (nb_qualities)
@@ -933,7 +938,10 @@
 		return JS_NewBool(ctx, GF_FALSE );
 
 	case GJS_OM_PROP_SCALABLE_ENHANCEMENT:
-		return JS_NewBool(ctx, odm && (odm->lower_layer_odm || odm->scalable_addon));
+		if (odm->lower_layer_odm) return JS_TRUE;
+		if (odm->subscene && !odm->pid && odm->addon && !gf_list_count(odm->subscene->resources))
+			return JS_TRUE;
+		return JS_FALSE;
 
 	case GJS_OM_PROP_MAIN_ADDON_MEDIATIME:
 		scene = odm->subscene ? odm->subscene : odm->parentscene;
@@ -955,25 +963,25 @@
 		return JS_NewFloat64(ctx, -1);
 
 	case GJS_OM_PROP_DEPENDENT_GROUPS:
-	{
-#if FILTER_FIXME
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_SERVICE_QUALITY_QUERY;
-		com.base.on_channel = gf_list_get(odm->channels, 0);
-
-		gf_term_service_command(odm->net_service, &com);
-		if (com.quality_query.index) {
-			return JS_NewInt32(ctx, com.quality_query.dependent_group_index);
+		if (odm->pid) {
+			GF_PropertyEntry *pe=NULL;
+			const GF_PropertyValue *p = gf_filter_pid_get_info_str(odm->pid, "has:group_deps", &pe);
+			if (p) {
+				u32 v = p->value.uint;
+				gf_filter_release_property(pe);
+				return JS_NewInt32(ctx, v);
+			}
 		}
-#endif
 		return JS_NewInt32(ctx, 0);
-	}
 
 	case GJS_OM_PROP_IS_VR_SCENE:
 		return JS_NewBool(ctx, odm->subscene && odm->subscene->vr_type);
 	case GJS_OM_PROP_DISABLED:
 		return JS_NewBool(ctx, odm->redirect_url ? 1 : 0);
+	case GJS_OM_PROP_BUFFERING:
+		if (odm->parentscene)
+			return JS_NewBool(ctx, odm->parentscene->nb_buffering ? 1 : 0);
+		return JS_NewBool(ctx, odm->subscene->nb_buffering ? 1 : 0);
 	}
 	return JS_UNDEFINED;
 }
@@ -989,27 +997,34 @@
 	Bool ilced=GF_FALSE, disabled=GF_FALSE, selected=GF_FALSE, automatic=GF_FALSE;
 	Double fps=30.0;
 	s32 idx;
-#if 0 //FILTER_FIXME
 	s32 dep_idx=0;
-#endif
 
-	if (!odm) return JS_EXCEPTION;
-	if (argc<1) return JS_EXCEPTION;
+	if (!odm) return GF_JS_EXCEPTION(ctx);
+	if (argc<1) return GF_JS_EXCEPTION(ctx);
 	if (JS_ToInt32(ctx, &idx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
-#if 0 //FILTER_FIXME
-	if (argc>=2) dep_idx = JSVAL_TO_INT(argv[1]);
-#endif
+	if ((argc>=2) && JS_ToInt32(ctx, &dep_idx, argv[1]))
+		return GF_JS_EXCEPTION(ctx);
 
 	if (!odm->pid) return JS_NULL;
 
-	prop = gf_filter_pid_get_info_str(odm->pid, "has:qualities", &pe);
+	if (dep_idx) {
+		char szName[100];
+		sprintf(szName, "has:deps_%d_qualities", dep_idx);
+		prop = gf_filter_pid_get_info_str(odm->pid, szName, &pe);
+	} else {
+		prop = gf_filter_pid_get_info_str(odm->pid, "has:qualities", &pe);
+	}
 	if (!prop || (prop->type!=GF_PROP_STRING_LIST)) {
 		gf_filter_release_property(pe);
 		return JS_NULL;
 	}
-	qdesc = gf_list_get(prop->value.string_list, idx);
+	qdesc = NULL;
+
+	if (idx < (s32) prop->value.string_list.nb_items)
+		qdesc = prop->value.string_list.vals[idx];
+
 	if (!qdesc) {
 		gf_filter_release_property(pe);
 		return JS_NULL;
@@ -1039,6 +1054,7 @@
 		else if (!strncmp(qdesc, "ch=", 3)) ch = atoi(qdesc+3);
 		else if (!strcmp(qdesc, "interlaced")) ilced = GF_TRUE;
 		else if (!strcmp(qdesc, "disabled")) disabled = GF_TRUE;
+		else if (!strcmp(qdesc, "selected")) selected = GF_TRUE;
 		else if (!strncmp(qdesc, "fps=", 4)) {
 			u32 fd=25, fn=1;
 			if (sscanf(qdesc, "fps=%d/%d", &fn, &fd) != 2) {
@@ -1054,14 +1070,27 @@
 		sep[0]=':';
 		qdesc = sep+2;
 	}
-	prop = gf_filter_pid_get_info_str(odm->pid, "has:selected", &pe);
-	if (prop && (prop->value.uint==idx))
-		selected = GF_TRUE;
-	prop = gf_filter_pid_get_info_str(odm->pid, "has:auto", &pe);
-	if (prop && prop->value.boolean)
-		automatic = GF_TRUE;
-	prop = gf_filter_pid_get_info_str(odm->pid, "has:tilemode", &pe);
-	if (prop) tile_adaptation_mode = prop->value.uint;
+
+	if (!dep_idx) {
+		prop = gf_filter_pid_get_info_str(odm->pid, "has:selected", &pe);
+		if (prop && (prop->value.uint==idx))
+			selected = GF_TRUE;
+		prop = gf_filter_pid_get_info_str(odm->pid, "has:auto", &pe);
+		if (prop && prop->value.boolean)
+			automatic = GF_TRUE;
+		prop = gf_filter_pid_get_info_str(odm->pid, "has:tilemode", &pe);
+		if (prop) tile_adaptation_mode = prop->value.uint;
+	} else if (dep_idx>0) {
+		prop = gf_filter_pid_get_info_str(odm->pid, "has:deps_selected", &pe);
+		if (prop && (prop->type==GF_PROP_SINT_LIST)) {
+			if ((u32) dep_idx<=prop->value.sint_list.nb_items) {
+				s32 sel = prop->value.sint_list.vals[dep_idx-1];
+				if ((sel>=0) && (idx==sel)) {
+					selected = GF_TRUE;
+				}
+			}
+		}
+	}
 
 	gf_filter_release_property(pe);
 
@@ -1084,8 +1113,10 @@
 	JS_SetPropertyStr(ctx, a, "disabled", JS_NewBool(ctx, disabled));
 	JS_SetPropertyStr(ctx, a, "is_selected", JS_NewBool(ctx, selected));
 	JS_SetPropertyStr(ctx, a, "automatic", JS_NewBool(ctx, automatic));
-	JS_SetPropertyStr(ctx, a, "tile_mode", JS_NewInt32(ctx, tile_adaptation_mode));
-	JS_SetPropertyStr(ctx, a, "dependent_groups", JS_NewInt32(ctx, dependent_group_index));
+	if (!dep_idx) {
+		JS_SetPropertyStr(ctx, a, "tile_mode", JS_NewInt32(ctx, tile_adaptation_mode));
+		JS_SetPropertyStr(ctx, a, "dependent_groups", JS_NewInt32(ctx, dependent_group_index));
+	}
 
 	return a;
 }
@@ -1095,27 +1126,30 @@
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
 	s32 x, y, w, h;
 
-	if (!odm) return JS_EXCEPTION;
+	if (!odm) return GF_JS_EXCEPTION(ctx);
 
 	x = y = w = h = 0;
 	if (argc) {
-#if 0 //FILTER_FIXME
+		u32 srdw, srdh;
+		const GF_PropertyValue *p;
+		GF_PropertyEntry *pe=NULL;
 	 	s32 dep_idx;
 	 	if (JS_ToInt32(ctx, &dep_idx, argv[0]) )
-	 		return JS_EXCEPTION;
-
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_CHAN_GET_SRD;
-		com.base.on_channel = gf_list_get(odm->channels, 0);
-		com.srd.dependent_group_index = dep_idx;
-
-		if (gf_term_service_command(odm->net_service, &com) == GF_OK) {
-			x = com.srd.x;
-			y = com.srd.y;
-			w = com.srd.w;
-			h = com.srd.h;
+	 		return GF_JS_EXCEPTION(ctx);
+		if (dep_idx<=0)
+	 		return GF_JS_EXCEPTION(ctx);
+		dep_idx--;
+		p = gf_filter_pid_get_info_str(odm->pid, "has:groups_srd", &pe);
+		if (p && (p->type==GF_PROP_STRING_LIST)) {
+			char *srd;
+			if ((u32) dep_idx>=p->value.string_list.nb_items) {
+				gf_filter_release_property(pe);
+				return GF_JS_EXCEPTION(ctx);
+			}
+			srd = p->value.string_list.vals[dep_idx];
+			sscanf(srd, "%dx%dx%dx%d@%dx%d", &x, &y, &w, &h, &srdw, &srdh);
 		}
-#endif
+		gf_filter_release_property(pe);
 	} else if (odm && odm->mo && odm->mo->srd_w && odm->mo->srd_h) {
 		x = odm->mo->srd_x;
 		y = odm->mo->srd_y;
@@ -1144,13 +1178,13 @@
 	GF_Filter *f;
 	GF_Scene *scene;
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
-	if (!odm || !argc) return JS_EXCEPTION;
+	if (!odm || !argc) return GF_JS_EXCEPTION(ctx);
 
 	f = jsff_get_filter(ctx, argv[0]);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(ctx);
 
 	scene = odm->subscene ? odm->subscene : odm->parentscene;
-	if (!scene) return JS_EXCEPTION;
+	if (!scene) return GF_JS_EXCEPTION(ctx);
 	if (gf_filter_in_parent_chain(f, scene->compositor->filter))
 		return JS_FALSE;
 
@@ -1170,7 +1204,7 @@
 	GF_FilterEvent evt;
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
 
-	if (!odm || !odm->pid) return JS_EXCEPTION;
+	if (!odm || !odm->pid) return GF_JS_EXCEPTION(ctx);
 
 	if ((argc>=1) && JS_IsString(argv[0])) {
 		const char *ID = JS_ToCString(ctx, argv[0]);
@@ -1183,12 +1217,12 @@
 
 		if (argc>=2) {
 			if (JS_ToInt32(ctx, &dep_idx, argv[1]))
-				return JS_EXCEPTION;
+				return GF_JS_EXCEPTION(ctx);
 		}
 	}
 	else if ((argc==1) && JS_IsInteger(argv[0])) {
 		if (JS_ToInt32(ctx, &tile_mode, argv[0]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(ctx);
 		if (tile_mode<0)
 			return JS_UNDEFINED;
 	}
@@ -1208,7 +1242,7 @@
 static JSValue gjs_odm_disable_main_addon(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
-	if (!odm) return JS_EXCEPTION;
+	if (!odm) return GF_JS_EXCEPTION(ctx);
 	if (!odm->subscene || !odm->subscene->main_addon_selected) return JS_UNDEFINED;
 
 	gf_scene_resume_live(odm->subscene);
@@ -1219,11 +1253,11 @@
 {
 	u32 sid;
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
-	if (!odm) return JS_EXCEPTION;
-	if (argc<1) return JS_EXCEPTION;
+	if (!odm) return GF_JS_EXCEPTION(ctx);
+	if (argc<1) return GF_JS_EXCEPTION(ctx);
 
 	if (JS_ToInt32(ctx, &sid, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	gf_scene_set_service_id(odm->subscene ? odm->subscene : odm->parentscene, sid);
 	return JS_UNDEFINED;
@@ -1232,7 +1266,7 @@
 static JSValue gjs_odm_select(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
-	if (!odm) return JS_EXCEPTION;
+	if (!odm) return GF_JS_EXCEPTION(ctx);
 
 #ifndef GPAC_DISABLE_PLAYER
 	gf_scene_select_object(odm->parentscene, odm);
@@ -1246,9 +1280,9 @@
 	u32 idx;
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
 
-	if (!odm) return JS_EXCEPTION;
-	if (argc<1) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &idx, argv[0])) return JS_EXCEPTION;
+	if (!odm) return GF_JS_EXCEPTION(ctx);
+	if (argc<1) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &idx, argv[0])) return GF_JS_EXCEPTION(ctx);
 
 	if (odm->subscene) {
 		an_odm = gf_list_get(odm->subscene->resources, idx);
@@ -1265,10 +1299,10 @@
 {
 	u32 pos, size;
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
-	if (!odm) return JS_EXCEPTION;
-	if (argc<2) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &pos, argv[0])) return JS_EXCEPTION;
-	if (JS_ToInt32(ctx, &size, argv[1])) return JS_EXCEPTION;
+	if (!odm) return GF_JS_EXCEPTION(ctx);
+	if (argc<2) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &pos, argv[0])) return GF_JS_EXCEPTION(ctx);
+	if (JS_ToInt32(ctx, &size, argv[1])) return GF_JS_EXCEPTION(ctx);
 	if (odm->subscene)
 		gf_scene_set_addon_layout_info(odm->subscene, pos, size);
 	return JS_UNDEFINED;
@@ -1277,7 +1311,6 @@
 static void do_enable_addon(GF_ObjectManager *odm, char *addon_url, Bool enable_if_defined, Bool disable_if_defined )
 {
 	if (addon_url) {
-#ifdef FILTER_FIXME
 		GF_AssociatedContentLocation addon_info;
 		memset(&addon_info, 0, sizeof(GF_AssociatedContentLocation));
 		addon_info.external_URL = addon_url;
@@ -1285,7 +1318,6 @@
 		addon_info.enable_if_defined = enable_if_defined;
 		addon_info.disable_if_defined = disable_if_defined;
 		gf_scene_register_associated_media(odm->subscene ? odm->subscene : odm->parentscene, &addon_info);
-#endif
 	}
 }
 
@@ -1294,7 +1326,7 @@
 	Bool do_disable = GF_FALSE;
 	const char *addon_url = NULL;
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
-	if (!odm || !argc) return JS_EXCEPTION;
+	if (!odm || !argc) return GF_JS_EXCEPTION(ctx);
 
 	if (! JS_IsString(argv[0]) ) {
 #ifdef GPAC_ENABLE_COVERAGE
@@ -1318,8 +1350,8 @@
 {
 	const char *addon_url = NULL;
 	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
-	if (!odm || !argc) return JS_EXCEPTION;
-	if (! JS_IsString(argv[0]) ) return JS_EXCEPTION;
+	if (!odm || !argc) return GF_JS_EXCEPTION(ctx);
+	if (! JS_IsString(argv[0]) ) return GF_JS_EXCEPTION(ctx);
 
 	addon_url = JS_ToCString(ctx, argv[0]);
 	if (addon_url && strcmp(addon_url, "gtest")) {
@@ -1338,7 +1370,7 @@
 	GF_SCENEJSExt *sjs = JS_GetOpaque(this_val, scene_class_id);
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
 	GF_Scene *scene = compositor->root_scene;
-	if (!sjs) return JS_EXCEPTION;
+	if (!sjs) return GF_JS_EXCEPTION(ctx);
 
 	if (JS_IsString(argv[0]) ) {
 		const char *url;
@@ -1383,7 +1415,7 @@
 static JSValue gpacevt_getProperty(JSContext *ctx, JSValueConst this_val, int magic)
 {
 	GF_SCENEJSExt *sjs = JS_GetOpaque(this_val, gpacevt_class_id);
-	if (!sjs || !sjs->evt) return JS_EXCEPTION;
+	if (!sjs || !sjs->evt) return GF_JS_EXCEPTION(ctx);
 	GF_Event *evt = sjs->evt;
 
 	switch (magic) {
@@ -1510,10 +1542,10 @@
 {
 	GF_SCENEJSExt *sjs = JS_GetOpaque(this_val, scene_class_id);
 	if (!sjs || !argc)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	if (!JS_IsNull(argv[0]) && !JS_IsUndefined(argv[0]) && !JS_IsFunction(ctx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	JS_FreeValue(sjs->c, sjs->evt_fun);
 	sjs->evt_fun = JS_DupValue(ctx, argv[0]);
@@ -1532,7 +1564,7 @@
 {
 	GF_Node *elt;
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor || !argc) return JS_EXCEPTION;
+	if (!compositor || !argc) return GF_JS_EXCEPTION(ctx);
 
 	if (JS_IsNull(argv[0])) {
 		gf_sc_focus_switch_ring(compositor, 0, NULL, 0);
@@ -1550,7 +1582,7 @@
 		JS_FreeCString(ctx, focus_type);
 	} else if (JS_IsObject(argv[0])) {
 		elt = gf_sg_js_get_node(ctx, argv[0]);
-		if (!elt) return JS_EXCEPTION;
+		if (!elt) return GF_JS_EXCEPTION(ctx);
 		gf_sc_focus_switch_ring(compositor, 0, elt, 2);
 	}
 	return JS_UNDEFINED;
@@ -1567,10 +1599,10 @@
 #endif
 	GF_Scene *scene=NULL;
 	GF_SCENEJSExt *sjs = (GF_SCENEJSExt *)JS_GetOpaque(this_val, scene_class_id);
-	if (!sjs || !argc || !JS_IsObject(argv[0])) return JS_EXCEPTION;
+	if (!sjs || !argc || !JS_IsObject(argv[0])) return GF_JS_EXCEPTION(ctx);
 
 	elt = gf_sg_js_get_node(ctx, argv[0]);
-	if (!elt) return JS_EXCEPTION;
+	if (!elt) return GF_JS_EXCEPTION(ctx);
 	switch (elt->sgprivate->tag) {
 #ifndef GPAC_DISABLE_VRML
 	case TAG_MPEG4_Inline:
@@ -1591,9 +1623,9 @@
 		break;
 #endif
 	default:
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 	}
-	if (!scene) return JS_EXCEPTION;
+	if (!scene) return GF_JS_EXCEPTION(ctx);
 
 
 	scene_obj = JS_NewObjectClass(ctx, any_class_id);
@@ -1610,7 +1642,7 @@
 static JSValue scenejs_show_keyboard(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_Compositor *compositor = scenejs_get_compositor(ctx, this_val);
-	if (!compositor || !argc) return JS_EXCEPTION;
+	if (!compositor || !argc) return GF_JS_EXCEPTION(ctx);
 
 	GF_Event evt;
 	memset(&evt, 0, sizeof(GF_Event));
@@ -1699,6 +1731,7 @@
 	JS_CGETSET_MAGIC_DEF("max_bitrate", odm_getProperty, NULL, GJS_OM_PROP_MAX_RATE),
 	JS_CGETSET_MAGIC_DEF("service_handler", odm_getProperty, NULL, GJS_OM_PROP_SERVICE_HANDLER),
 	JS_CGETSET_MAGIC_DEF("codec", odm_getProperty, NULL, GJS_OM_PROP_CODEC),
+	JS_CGETSET_MAGIC_DEF("nb_views", odm_getProperty, NULL, GJS_OM_PROP_NB_VIEWS),
 	JS_CGETSET_MAGIC_DEF("nb_qualities", odm_getProperty, NULL, GJS_OM_PROP_NB_QUALITIES),
 	JS_CGETSET_MAGIC_DEF("max_buffer", odm_getProperty, NULL, GJS_OM_PROP_MAX_BUFFER),
 	JS_CGETSET_MAGIC_DEF("min_buffer", odm_getProperty, NULL, GJS_OM_PROP_MIN_BUFFER),
@@ -1726,6 +1759,7 @@
 	JS_CGETSET_MAGIC_DEF("dependent_groups", odm_getProperty, NULL, GJS_OM_PROP_DEPENDENT_GROUPS),
 	JS_CGETSET_MAGIC_DEF("vr_scene", odm_getProperty, NULL, GJS_OM_PROP_IS_VR_SCENE),
 	JS_CGETSET_MAGIC_DEF("disabled", odm_getProperty, NULL, GJS_OM_PROP_DISABLED),
+	JS_CGETSET_MAGIC_DEF("buffering", odm_getProperty, NULL, GJS_OM_PROP_BUFFERING),
 
 	JS_CFUNC_DEF("declare_addon", 0, gjs_odm_declare_addon),
 	JS_CFUNC_DEF("enable_addon", 0, gjs_odm_enable_addon),
@@ -1769,7 +1803,8 @@
 	/*if we destroy the script context holding the gpac event filter (only one for the time being), remove the filter*/
 	JS_FreeValueRT(rt, sjs->evt_fun);
 	if (sjs->evt_filter.udta) {
-		gf_filter_remove_event_listener(sjs->compositor->filter, &sjs->evt_filter);
+		if (sjs->compositor)
+			gf_filter_remove_event_listener(sjs->compositor->filter, &sjs->evt_filter);
 		sjs->evt_filter.udta = NULL;
 	}
 
@@ -1833,7 +1868,9 @@
 		GF_FilterSession *fs = sjs->compositor->filter->session;
 
 		//don't check error code, this may fail if global JS has been set but the script may still run
-		gf_fs_load_js_api(c, fs);
+		if (gf_fs_load_js_api(c, fs) == GF_OK) {
+			scene->attached_session = fs;
+		}
 	}
 
 	sjs->evt_obj = JS_NewObjectClass(c, gpacevt_class_id);

gpac-1.0.1.tar.gz/src/jsmods/storage.c -> gpac-2.0.0.tar.gz/src/jsmods/storage.c Changed

@@ -65,11 +65,11 @@
 	const char *sec_name, *key_name;
 	s32 idx = -1;
 	GF_Config *config = JS_GetOpaque(this_val, storage_class_id);
-	if (!config) return JS_EXCEPTION;
-	if (argc < 2) return JS_EXCEPTION;
+	if (!config) return GF_JS_EXCEPTION(ctx);
+	if (argc < 2) return GF_JS_EXCEPTION(ctx);
 
-	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
-	if (!JS_IsString(argv[1]) && !JS_IsInteger(argv[1])) return JS_EXCEPTION;
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsString(argv[1]) && !JS_IsInteger(argv[1])) return GF_JS_EXCEPTION(ctx);
 
 	sec_name = JS_ToCString(ctx, argv[0]);
 	if (!strcmp(sec_name, "GPAC")) {
@@ -105,11 +105,11 @@
 {
 	const char *sec_name, *key_name, *key_val;
 	GF_Config *config = JS_GetOpaque(this_val, storage_class_id);
-	if (!config) return JS_EXCEPTION;
-	if (argc < 3) return JS_EXCEPTION;
+	if (!config) return GF_JS_EXCEPTION(ctx);
+	if (argc < 3) return GF_JS_EXCEPTION(ctx);
 
-	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
-	if (!JS_IsString(argv[1])) return JS_EXCEPTION;
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsString(argv[1])) return GF_JS_EXCEPTION(ctx);
 
 	sec_name = JS_ToCString(ctx, argv[0]);
 	if (!strcmp(sec_name, "GPAC")) {
@@ -132,7 +132,7 @@
 static JSValue js_storage_save(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_Config *config = JS_GetOpaque(this_val, storage_class_id);
-	if (!config) return JS_EXCEPTION;
+	if (!config) return GF_JS_EXCEPTION(ctx);
 	gf_cfg_save(config);
 	return JS_UNDEFINED;
 }
@@ -154,7 +154,7 @@
 	char temp[3];
 
 	if (!JS_IsString(argv[0]) )
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(ctx);
 
 	storage_url = JS_ToCString(ctx, argv[0]);
 	if (!storage_url) return JS_NULL;

gpac-1.0.1.tar.gz/src/jsmods/webgl.c -> gpac-2.0.0.tar.gz/src/jsmods/webgl.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2022
 *			All rights reserved
 *
 * This file is part of GPAC / JavaScript WebGL bindings
@@ -36,6 +36,8 @@
 
 #include "webgl.h"
 
+#include <gpac/internal/mesh.h>
+
 JSClassID WebGLRenderingContextBase_class_id;
 
 static void webgl_finalize(JSRuntime *rt, JSValue obj)
@@ -65,8 +67,11 @@
 	glDeleteTextures(1, &glctx->tex_id);
 	glDeleteRenderbuffers(1, &glctx->depth_id);
 	glDeleteFramebuffers(1, &glctx->fbo_id);
+	if (glctx->pix_data) gf_free(glctx->pix_data);
+	if (glctx->pix_line) gf_free(glctx->pix_line);
 	gf_free(glctx);
 }
+
 static void webgl_gc_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
 {
 	u32 i, count;
@@ -122,6 +127,7 @@
 	GF_WebGLObject *glo = JS_GetOpaque(obj, _name##_class_id);\
 	if (!glo) return;\
 	if (glo->gl_id) _destr(1, &glo->gl_id);\
+	if (glo->par_ctx) gf_list_del_item(glo->par_ctx->all_objects, glo);\
 	gf_free(glo);\
 }\
 JSClassDef _name##_class =\
@@ -135,6 +141,7 @@
 {\
 	GF_WebGLObject *glo = JS_GetOpaque(obj, _name##_class_id);\
 	if (!glo) return;\
+	if (glo->par_ctx) gf_list_del_item(glo->par_ctx->all_objects, glo);\
 	gf_free(glo);\
 }\
 JSClassDef _name##_class =\
@@ -161,8 +168,11 @@
 {
 	GF_WebGLNamedTexture *named_tx = JS_GetOpaque(obj, NamedTexture_class_id);
 	if (!named_tx) return;
-	if (named_tx->par_ctx)
+	if (named_tx->par_ctx) {
 		gf_list_del_item(named_tx->par_ctx->named_textures, named_tx);
+		if (named_tx->par_ctx->bound_named_texture == named_tx)
+			named_tx->par_ctx->bound_named_texture = NULL;
+	}
 
 	if (named_tx->tx.nb_textures) glDeleteTextures(named_tx->tx.nb_textures, named_tx->tx.textures);
 	if (named_tx->tx_name) gf_free(named_tx->tx_name);
@@ -181,12 +191,17 @@
 	JSValue v;
 	int res;
 	u32 i, len;
-	if (!JS_IsArray(ctx, val)) return GF_FALSE;
-	v = JS_GetPropertyStr(ctx, val, "length");
-	res = JS_ToInt32(ctx, &len, v);
-	JS_FreeValue(ctx, v);
-	if (res) return GF_FALSE;
-
+	if (JS_IsArray(ctx, val) || JS_IsObject(val) ) {
+		v = JS_GetPropertyStr(ctx, val, "length");
+		if (JS_IsException(v))
+			res = 1;
+		else
+			res = JS_ToInt32(ctx, &len, v);
+		JS_FreeValue(ctx, v);
+		if (res) return GF_FALSE;
+	} else {
+		return GF_FALSE;
+	}
 	if (! *values) {
 		*values = gf_malloc(sizeof(s32) * len);
 		*v_size = len;
@@ -208,11 +223,19 @@
 	JSValue v;
 	int res;
 	u32 i, len;
-	if (!JS_IsArray(ctx, val)) return GF_FALSE;
-	v = JS_GetPropertyStr(ctx, val, "length");
-	res = JS_ToInt32(ctx, &len, v);
-	JS_FreeValue(ctx, v);
-	if (res) return GF_FALSE;
+
+	if (JS_IsArray(ctx, val) || JS_IsObject(val) ) {
+		v = JS_GetPropertyStr(ctx, val, "length");
+		if (JS_IsException(v))
+			res = 1;
+		else
+			res = JS_ToInt32(ctx, &len, v);
+
+		JS_FreeValue(ctx, v);
+		if (res) return GF_FALSE;
+	} else {
+		return GF_FALSE;
+	}
 
 	if (! *values) {
 		*values = gf_malloc(sizeof(Float) * len);
@@ -239,10 +262,15 @@
 	JSValue v;
 	/*ArrayBuffer*/
 	size_t psize;
-	uint8_t *res = JS_GetArrayBuffer(ctx, &psize, obj);
-	if (res) {
-		*size = (u32) psize;
-		return res;
+	uint8_t *res;
+	if (JS_IsArrayBuffer(ctx, obj)) {
+		res = JS_GetArrayBuffer(ctx, &psize, obj);
+		if (res) {
+			*size = (u32) psize;
+			return res;
+		}
+		*size = 0;
+		return NULL;
 	}
 	/*ArrayView*/
 	v = JS_GetPropertyStr(ctx, obj, "buffer");
@@ -377,6 +405,7 @@
 
 static JSValue wgl_getExtension(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
+#if 0
 	const char *gl_exts, *ext;
 	Bool found = GF_FALSE;
 	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
@@ -392,6 +421,8 @@
 
 	JS_FreeCString(ctx, ext);
 	if (!found) return JS_NULL;
+#endif
+
 	return JS_NULL;
 }
 
@@ -539,11 +570,14 @@
 	case GL_SCISSOR_TEST:
 	case GL_STENCIL_TEST:
 #if 0
-	case GL_UNPACK_FLIP_Y_WEBGL:
 	case GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL:
 #endif
 		glGetBooleanv(pname, bools);
 		return bools[0] ? JS_TRUE : JS_FALSE;
+	case GL_UNPACK_FLIP_Y_WEBGL:
+		if (glc->bound_texture && glc->bound_texture->flip_y) return JS_TRUE;
+		if (glc->bound_named_texture && glc->bound_named_texture->flip_y) return JS_TRUE;
+		return JS_FALSE;
 
 	//floats
 	case GL_DEPTH_CLEAR_VALUE:
@@ -702,7 +736,7 @@
 #else
 	range[0] = 0;
 	range[1] = 128;
-	precision = 128;
+	precision = 1;
 #endif
 	ret = JS_NewObject(ctx);
 	JS_SetPropertyStr(ctx, ret, "rangeMin", JS_NewInt32(ctx, range[0]));
@@ -767,6 +801,30 @@
 	glGetTexParameteriv(target, pname, &params);
 	return JS_NewInt32(ctx, params);
 }
+
+JSValue wgl_pixelStorei(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 pname = 0;
+	s32 param = 0;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(pname, argv[0]);
+	WGL_GET_S32(param, argv[1]);
+	if (pname==GL_UNPACK_FLIP_Y_WEBGL) {
+		if (glc->bound_named_texture)
+			glc->bound_named_texture->flip_y = param ? GF_TRUE : GF_FALSE;
+		else if (glc->bound_texture)
+			glc->bound_texture->flip_y = param ? GF_TRUE : GF_FALSE;
+		return ret_val_js;
+	}
+	glPixelStorei(pname, param);
+	return ret_val_js;
+}
+
+
 static JSValue wgl_getUniform(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GLint program_shader=0;
@@ -787,7 +845,7 @@
 	WGL_GET_GLID(program_shader, argv[0], WebGLProgram_class_id);
 	WGL_GET_GLID(location, argv[1], WebGLUniformLocation_class_id);
 
-	//openGL doesn't provide a way to get a uniform type from its location
+	//OpenGL doesn't provide a way to get a uniform type from its location
 	//we need to browse all active uniforms by name in the program
 	//then look for the location of each uniform and check against the desired location
 
@@ -996,7 +1054,7 @@
 {
 	GLint shader=0;
 	Bool has_gptx=GF_FALSE;
-	char *source, *gf_source=NULL;
+	char *source, *gf_source=NULL, *patch_precision = NULL;
 	const char *final_source;
 	u32 len = 0;
 	u32 count, i;
@@ -1070,8 +1128,8 @@
 					return ret;
 				}
 				//insert our uniform declaration and code
-				if (gf_gl_txw_insert_fragment_shader(named_tx->tx.pix_fmt, named_tx->tx_name, &gf_source_pass1))
-					named_tx->shader_attached = GF_TRUE;
+				if (gf_gl_txw_insert_fragment_shader(named_tx->tx.pix_fmt, named_tx->tx_name, &gf_source_pass1, named_tx->flip_y))
+					named_tx->shader_attached = 1;
 				continue;
 			}
 			c = sep[0];
@@ -1132,22 +1190,42 @@
 	} else {
 		final_source = source;
 	}
-	len = (u32) strlen(final_source);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONSOLE, ("[WebGL] Shader rewritten as\n%s", final_source));
 
+	if (!final_source) {
+		JS_FreeCString(ctx, source);
+		return js_throw_err_msg(ctx, WGL_INVALID_VALUE, "Failed to rewrite shader");
+	}
+
+	if (strstr(final_source, "highp") || strstr(final_source, "mediump") || strstr(final_source, "lowp")) {
+		while (1) {
+			char *next = strstr(final_source, "precision ");
+			if (!next) break;
+			final_source = strchr(next, '\n');
+		}
+		patch_precision = NULL;
+		gf_dynstrcat(&patch_precision, "#define highp\n#define mediump\n#define lowp\n", NULL);
+		gf_dynstrcat(&patch_precision, final_source, NULL);
+		final_source = patch_precision;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONSOLE, ("[WebGL] Shader source is\n%s", final_source));
+
+	len = (u32) strlen(final_source);
 	glShaderSource(shader, 1, &final_source, &len);
 
 	JS_FreeCString(ctx, source);
 	if (gf_source) gf_free(gf_source);
+	if (patch_precision) gf_free(patch_precision);
 	return JS_UNDEFINED;
 }
 
 const GF_FilterPacket *jsf_get_packet(JSContext *c, JSValue obj);
 
-static JSValue wgl_named_texture_upload(JSContext *c, JSValueConst pck_obj, GF_WebGLNamedTexture *named_tx)
+JSValue wgl_named_texture_upload(JSContext *c, JSValueConst pck_obj, void *_named_tx, Bool force_resetup)
 {
 	GF_FilterPacket *pck = NULL;
 	GF_FilterFrameInterface *frame_ifce = NULL;
+	GF_WebGLNamedTexture *named_tx = (GF_WebGLNamedTexture *)_named_tx;
 	const u8 *data=NULL;
 
 	/*try GF_FilterPacket*/
@@ -1164,15 +1242,17 @@
 	}
 
 	//setup texture
-	if (!named_tx->tx.pix_fmt) {
+	if (!named_tx->tx.pix_fmt || force_resetup) {
 		u32 pix_fmt=0, width=0, height=0, stride=0, uv_stride=0;
 		if (pck) {
 			jsf_get_filter_packet_planes(c, pck_obj, &width, &height, &pix_fmt, &stride, &uv_stride, NULL, NULL, NULL, NULL);
 		} else {
 			js_evg_get_texture_info(c, pck_obj, &width, &height, &pix_fmt, NULL, &stride, NULL, NULL, &uv_stride, NULL);
 		}
+		if (force_resetup)
+			named_tx->tx.uniform_setup = GF_FALSE;
 
-		if (!gf_gl_txw_setup(&named_tx->tx, pix_fmt, width, height, stride, uv_stride, GF_FALSE, frame_ifce)) {
+		if (!gf_gl_txw_setup(&named_tx->tx, pix_fmt, width, height, stride, uv_stride, GF_FALSE, frame_ifce, named_tx->tx.fullrange, named_tx->tx.mx_cicp)) {
 			return js_throw_err_msg(c, WGL_INVALID_VALUE, "[WebGL] Pixel format %s unknown, cannot setup NamedTexture\n", gf_4cc_to_str(pix_fmt));
 		}
 	}
@@ -1185,9 +1265,21 @@
 			if (!data)
 				return js_throw_err_msg(c, WGL_INVALID_VALUE, "[WebGL] Unable to fetch packet data, cannot setup NamedTexture\n");
 		} else {
-			js_evg_get_texture_info(c, pck_obj, NULL, NULL, NULL, (u8 **) &data, NULL, NULL, NULL, NULL, NULL);
+			u32 pix_fmt=0, width=0, height=0, stride=0, uv_stride=0;
+			js_evg_get_texture_info(c, pck_obj, &width, &height, &pix_fmt, (u8 **) &data, &stride, NULL, NULL, &uv_stride, NULL);
 			if (!data)
 				return js_throw_err_msg(c, WGL_INVALID_VALUE, "[WebGL] Unable to fetch EVG texture data, cannot setup NamedTexture\n");
+
+			if (pix_fmt != named_tx->tx.pix_fmt)
+				return js_throw_err_msg(c, WGL_INVALID_VALUE, "[WebGL] EVG texture pixel format changed, shader must be recomputed\n");
+
+			//optim for EVG texture if change of res but not pixel format, resetup texture
+			if ((width != named_tx->tx.width) || (height != named_tx->tx.height)) {
+				gf_gl_txw_reset(&named_tx->tx);
+				if (!gf_gl_txw_setup(&named_tx->tx, pix_fmt, width, height, stride, uv_stride, GF_FALSE, NULL, named_tx->tx.fullrange, named_tx->tx.mx_cicp)) {
+					return js_throw_err_msg(c, WGL_INVALID_VALUE, "[WebGL] Pixel format %s unknown, cannot setup NamedTexture\n", gf_4cc_to_str(pix_fmt));
+				}
+			}
 		}
 	}
 
@@ -1196,6 +1288,45 @@
 	return JS_UNDEFINED;
 }
 
+const char *js_evg_get_texture_named(JSContext *ctx, JSValue this_obj);
+void js_evg_set_named_texture_gl(JSContext *ctx, JSValue this_obj, void *gl_named_tx);
+
+static void wgl_tex_image_2d(GF_WebGLContext *glc, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const u8 *pixels)
+{
+	u32 bpp=3;
+	u32 i;
+	if (!glc->bound_texture) return;
+
+	glc->bound_texture->tx_height = height;
+
+	if (!glc->bound_texture->flip_y) {
+		glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+		return;
+	}
+
+	switch (format) {
+	case GF_PIXEL_GREYSCALE:
+		bpp = 1;
+		break;
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		bpp = 2;
+		break;
+	case GF_PIXEL_RGB:
+		bpp = 3;
+		break;
+	case GF_PIXEL_RGBA:
+		bpp = 4;
+		break;
+	}
+	glTexImage2D(target, level, internalformat, width, height, border, format, type, NULL);
+
+	for (i=0; i<(u32) height; i++) {
+		const u8 *pix_buf = pixels + bpp * width * (height-i-1);
+		glTexSubImage2D(target, level, 0, i, width, 1, format, type, pix_buf);
+	}
+}
+
 static JSValue wgl_texImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	u32 target = 0;
@@ -1242,13 +1373,43 @@
 		WGL_GET_U32(type, argv[7]);
 		pix_buf = wgl_GetArrayBuffer(ctx, &pix_buf_size, argv[8]);
 
-		glTexImage2D(target, level, internalformat, width, height, border, format, type, pix_buf);
+		wgl_tex_image_2d(glc, target, level, internalformat, width, height, border, format, type, pix_buf);
 		return JS_UNDEFINED;
 	}
 
+	if (js_evg_is_texture(ctx, argv[5]) && !glc->bound_named_texture) {
+		const char *tx_named = js_evg_get_texture_named(ctx, argv[5]);
+		if (tx_named && glc->bound_texture) {
+			GF_WebGLNamedTexture *named_tx;
+
+			GF_SAFEALLOC(named_tx, GF_WebGLNamedTexture);
+			if (!named_tx) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+			named_tx->par_ctx = glc;
+			named_tx->tx_name = gf_strdup(tx_named);
+			named_tx->tx.mx_cicp = -1;
+			named_tx->shader_attached = 0;
+			named_tx->flip_y = glc->bound_texture->flip_y;
+			js_evg_set_named_texture_gl(ctx, argv[5], named_tx);
+
+			JS_SwitchClassID(glc->bound_texture->obj, NamedTexture_class_id);
+			JS_SetOpaque(glc->bound_texture->obj, named_tx);
+			gf_list_add(glc->named_textures, named_tx);
+			gf_list_del_item(glc->all_objects, glc->bound_texture);
+
+			JS_FreeValue(ctx, glc->bound_texture->obj);
+			glDeleteTextures(1, &glc->bound_texture->gl_id);
+
+			gf_free(glc->bound_texture);
+			glc->bound_texture = NULL;
+			glc->bound_texture_target = 0;
+			glc->bound_named_texture = named_tx;
+		}
+
+	}
+
 	/*bound texture is a named texture, use tx.upload() */
 	if (glc->bound_named_texture) {
-		return wgl_named_texture_upload(ctx, argv[5], glc->bound_named_texture);
+		return wgl_named_texture_upload(ctx, argv[5], glc->bound_named_texture, GF_FALSE);
 	}
 
 	/*check if this is an EVG texture*/
@@ -1256,33 +1417,72 @@
 		switch (pixfmt) {
 		case GF_PIXEL_GREYSCALE:
 			format = GL_LUMINANCE;
+			internalformat = GL_RGB;
 			type = GL_TEXTURE_2D;
 			break;
 		case GF_PIXEL_ALPHAGREY:
 		case GF_PIXEL_GREYALPHA:
 			format = GL_LUMINANCE_ALPHA;
 			type = GL_UNSIGNED_BYTE;
+			internalformat = GL_RGBA;
 			break;
 		case GF_PIXEL_RGB:
 			format = GL_RGB;
 			type = GL_UNSIGNED_BYTE;
+			internalformat = GL_RGB;
 			break;
 		case GF_PIXEL_RGBA:
 			format = GL_RGBA;
 			type = GL_UNSIGNED_BYTE;
+			internalformat = GL_RGBA;
 			break;
 		default:
+			//not set yet
+			if (!width && !height && !pixfmt) return JS_UNDEFINED;
 			return js_throw_err_msg(ctx, WGL_INVALID_ENUM, "[WebGL] Pixel format %s not yet mapped to texImage2D", gf_pixel_fmt_name(pixfmt) );
 		}
 		internalformat = GL_RGBA;
 		target = GL_TEXTURE_2D;
-		glTexImage2D(target, level, internalformat, width, height, border, format, type, pix_buf);
+		wgl_tex_image_2d(glc, target, level, internalformat, width, height, border, format, type, pix_buf);
 		return JS_UNDEFINED;
 	}
 	/*otherwise not supported*/
 	return js_throw_err(ctx, WGL_INVALID_OPERATION);
 }
 
+void wgl_tex_sub_image_2d(GF_WebGLContext *glc, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, u8 *pixels)
+{
+	u32 i, bpp=3;
+	if (!glc->bound_texture) return;
+	if (!glc->bound_texture->flip_y) {
+		glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+		return;
+	}
+	if (!glc->bound_texture->tx_height) return;
+	if ((yoffset<0) || (yoffset+height > (s32) glc->bound_texture->tx_height)) return;
+
+	switch (format) {
+	case GF_PIXEL_GREYSCALE:
+		bpp = 1;
+		break;
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		bpp = 2;
+		break;
+	case GF_PIXEL_RGB:
+		bpp = 3;
+		break;
+	case GF_PIXEL_RGBA:
+		bpp = 4;
+		break;
+	}
+
+	for (i=0; i<(u32) height; i++) {
+		const u8 *pix_buf = pixels + bpp * width * (height - (i+yoffset) - 1) + xoffset*bpp;
+		glTexSubImage2D(target, level, xoffset, i+yoffset, width, 1, format, type, pix_buf);
+	}
+}
+
 static JSValue wgl_texSubImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	u32 target = 0;
@@ -1296,7 +1496,10 @@
 	u32 pixfmt, stride, stride_uv;
 	u8 *pix_buf, *p_u, *p_v, *p_a;
 	u32 pix_buf_size=0;
-	WGL_CHECK_CONTEXT
+
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
 	if (argc<7) return js_throw_err(ctx, WGL_INVALID_VALUE);
 
 	WGL_GET_U32(target, argv[0]);
@@ -1322,7 +1525,7 @@
 		pix_buf = wgl_GetArrayBuffer(ctx, &pix_buf_size, argv[8]);
 		if (!pix_buf) return js_throw_err(ctx, WGL_INVALID_VALUE);
 
-		glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pix_buf);
+		wgl_tex_sub_image_2d(glc, target, level, xoffset, yoffset, width, height, format, type, pix_buf);
 		return JS_UNDEFINED;
 	}
 
@@ -1349,7 +1552,7 @@
 		default:
 			return js_throw_err_msg(ctx, WGL_INVALID_ENUM, "[WebGL] Pixel format %s not yet mapped to texImage2D", gf_pixel_fmt_name(pixfmt) );
 		}
-		glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pix_buf);
+		wgl_tex_sub_image_2d(glc, target, level, xoffset, yoffset, width, height, format, type, pix_buf);
 		return JS_UNDEFINED;
 	}
 	return js_throw_err(ctx, WGL_INVALID_OPERATION);
@@ -1386,20 +1589,45 @@
 	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
 	if (!glc) return js_throw_err(ctx, WGL_INVALID_VALUE);
 
-	if (argc && JS_IsString(argv[0])) {
+	if (argc && (JS_IsString(argv[0]) || JS_IsNull(argv[0]))) {
 		GF_WebGLNamedTexture *named_tx;
-		const char *tx_name;
-		tx_name = JS_ToCString(ctx, argv[0]);
-		if (!tx_name) return js_throw_err(ctx, WGL_INVALID_VALUE);
+		const char *tx_name = NULL;
+
+		if (!JS_IsNull(argv[0])) {
+			tx_name = JS_ToCString(ctx, argv[0]);
+			if (!tx_name) return js_throw_err(ctx, WGL_INVALID_VALUE);
+		}
 
 		GF_SAFEALLOC(named_tx, GF_WebGLNamedTexture);
 		if (!named_tx) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+		if (!tx_name) {
+			char szName[100];
+			sprintf(szName, "_gfnt_%p", named_tx);
+			named_tx->tx_name = gf_strdup(szName);
+		} else {
+			named_tx->tx_name = gf_strdup(tx_name);
+			JS_FreeCString(ctx, tx_name);
+		}
 		named_tx->par_ctx = glc;
-		named_tx->tx_name = gf_strdup(tx_name);
-		JS_FreeCString(ctx, tx_name);
+		named_tx->tx.mx_cicp = -1;
 		ret_val_js = JS_NewObjectClass(ctx, NamedTexture_class_id);
 		JS_SetOpaque(ret_val_js, named_tx);
 		gf_list_add(glc->named_textures, named_tx);
+
+		if ((argc>1) && JS_IsObject(argv[1])) {
+			JSValue v = JS_GetPropertyStr(ctx, argv[1], "fullrange");
+			if (JS_IsBool(v) && JS_ToBool(ctx, v))
+				named_tx->tx.fullrange = GF_TRUE;
+
+			v = JS_GetPropertyStr(ctx, argv[1], "matrix");
+			if (JS_IsInteger(v)) {
+				JS_ToInt32(ctx, &named_tx->tx.mx_cicp, v);
+			} else if (JS_IsString(v)) {
+				const char *cicp = JS_ToCString(ctx, v);
+				named_tx->tx.mx_cicp = gf_cicp_parse_color_matrix(cicp);
+				JS_FreeCString(ctx, cicp);
+			}
+		}
 	} else {
 		GF_WebGLObject *wglo;
 		GF_SAFEALLOC(wglo, GF_WebGLObject);
@@ -1425,6 +1653,8 @@
 	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
 	if (!glc|| (argc<2)) return js_throw_err(ctx, WGL_INVALID_VALUE);
 	glc->bound_named_texture = NULL;
+	glc->bound_texture = NULL;
+	glc->bound_texture_target = 0;
 
 	WGL_GET_U32(target, argv[0]);
 	tx = JS_GetOpaque(argv[1], WebGLTexture_class_id);
@@ -1435,6 +1665,8 @@
 		return ret_val_js;
 	}
 	if (tx) {
+		glc->bound_texture = tx;
+		glc->bound_texture_target = target;
 		glBindTexture(target, tx->gl_id);
 		return ret_val_js;
 	}
@@ -1481,11 +1713,16 @@
 				break;
 			}
 		}
-		if (uni_loc==-1)
+		if (uni_loc==-1) {
+			JS_FreeCString(ctx, name);
 			return JS_NULL;
+		}
 	}
 	GF_SAFEALLOC(wglo, GF_WebGLObject);
-	if (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+	if (!wglo) {
+		JS_FreeCString(ctx, name);
+		return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+	}
 	wglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
 	wglo->gl_id = uni_loc;
 
@@ -1525,6 +1762,8 @@
 	GF_WebGLContext *glc = (GF_WebGLContext *)f_ifce->user_data;
 	if (!glc) return;
 
+	gf_js_lock(glc->ctx, GF_TRUE);
+
 	if (is_depth)
 		fun = &glc->depth_frame_flush;
 	else
@@ -1537,6 +1776,7 @@
 		JS_FreeValue(glc->ctx, *fun);
 		*fun = JS_UNDEFINED;
 	}
+	gf_js_lock(glc->ctx, GF_FALSE);
 }
 void webgl_pck_tex_del(GF_Filter *filter, GF_FilterPid *PID, GF_FilterPacket *pck)
 {
@@ -1548,7 +1788,7 @@
 	webgl_pck_tex_depth_del(filter, PID, pck, GF_TRUE);
 }
 
-JSValue webgl_get_frame_interface(JSContext *ctx, int argc, JSValueConst *argv, gf_fsess_packet_destructor *pck_del, GF_FilterFrameInterface **f_ifce)
+JSValue webgl_get_frame_interface(JSContext *ctx, int argc, JSValueConst *argv, GF_FilterPid *for_pid, gf_fsess_packet_destructor *pck_del, GF_FilterFrameInterface **f_ifce)
 {
 	JSValue *frame_flush_fun = NULL;
 	GF_WebGLContext *glc;
@@ -1569,6 +1809,17 @@
 		*pck_del = webgl_pck_tex_del;
 		frame_flush_fun = &glc->tex_frame_flush;
 		*f_ifce = &glc->tex_f_ifce;
+
+		const GF_PropertyValue *p = gf_filter_pid_get_property(for_pid, GF_PROP_PID_PIXFMT);
+		if (p && (p->value.uint == GF_PIXEL_RGB)) {
+			glc->fetch_required_pfmt = 1;
+		}
+		else if (p && (p->value.uint == GF_PIXEL_RGBA)) {
+			glc->fetch_required_pfmt = 2;
+		}
+		else {
+			return js_throw_err_msg(ctx, GF_BAD_PARAM, "Only RGB and RGBA output format supported for WebGL output\n");
+		}
 	}
 	if (!JS_IsUndefined(*frame_flush_fun))
 		return js_throw_err(ctx, WGL_INVALID_OPERATION);
@@ -1603,6 +1854,75 @@
 		gf_mx_add_scale(texcoordmatrix, FIX_ONE, -FIX_ONE, FIX_ONE);
 	return GF_OK;
 }
+
+GF_Err webgl_get_plane(GF_FilterFrameInterface *ifce, u32 plane_idx, const u8 **outPlane, u32 *outStride)
+{
+	GF_WebGLContext *glc = ifce->user_data;
+	if (!glc) return GF_BAD_PARAM;
+	if (plane_idx) return GF_BAD_PARAM;
+
+	gf_js_lock(glc->ctx, GF_TRUE);
+
+	if (glc->fetch_required_pfmt) {
+		u32 i, hy;
+		jsf_set_gl_active(glc->ctx);
+
+		if (glc->creation_attrs.primary) {
+			glBindFramebuffer(GL_FRAMEBUFFER, 0);
+		} else {
+			glBindFramebuffer(GL_FRAMEBUFFER, glc->fbo_id);
+
+			GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+			switch (status) {
+			case GL_FRAMEBUFFER_COMPLETE:
+				break;
+			default:
+				gf_js_lock(glc->ctx, GF_FALSE);
+				return GF_IO_ERR;
+			}
+		}
+		if (!glc->pix_data || !glc->pix_line) {
+			u32 bpp = (glc->fetch_required_pfmt==2) ? 4 : 3;
+			bpp *= glc->width;
+			if (!glc->pix_data) {
+				//we allocate one extra line at the end, workaround for ffsws sometimes trying to access one extra line
+				glc->pix_data = gf_malloc(sizeof(u8) * bpp * (glc->height+1) );
+				if (!glc->pix_data) {
+					gf_js_lock(glc->ctx, GF_FALSE);
+					return GF_OUT_OF_MEM;
+				}
+			}
+			if (!glc->pix_line) {
+				glc->pix_line = gf_malloc(sizeof(u8) * bpp);
+				if (!glc->pix_line) {
+					gf_js_lock(glc->ctx, GF_FALSE);
+					return GF_OUT_OF_MEM;
+				}
+			}
+		}
+
+		glReadPixels(0, 0, glc->width, glc->height, (glc->fetch_required_pfmt==2) ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE, glc->pix_data);
+
+		hy = glc->height/2;
+		glc->pix_stride = (glc->fetch_required_pfmt==2) ? 4 : 3;
+		glc->pix_stride *= glc->width;
+		glc->fetch_required_pfmt = 0;
+
+		for (i=0; i<hy; i++) {
+			memcpy(glc->pix_line, glc->pix_data + i * glc->pix_stride, glc->pix_stride);
+			memcpy(glc->pix_data + i * glc->pix_stride, glc->pix_data + (glc->height - 1 - i) * glc->pix_stride, glc->pix_stride);
+			memcpy(glc->pix_data + (glc->height - 1 - i) * glc->pix_stride, glc->pix_line, glc->pix_stride);
+		}
+	}
+
+	*outPlane = glc->pix_data;
+	*outStride = glc->pix_stride;
+
+	gf_js_lock(glc->ctx, GF_FALSE);
+	return GF_OK;
+}
+
+
 static JSValue webgl_setup_fbo(JSContext *ctx, GF_WebGLContext *glc, u32 width, u32 height)
 {
 	glc->width = width;
@@ -1684,6 +2004,12 @@
 }
 
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+
+	if (glc->pix_data) {
+		gf_free(glc->pix_data);
+		glc->pix_data = NULL;
+	}
 	return JS_UNDEFINED;
 }
 static JSValue webgl_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv)
@@ -1785,6 +2111,7 @@
 	if (glc->creation_attrs.primary)
 		glc->tex_f_ifce.flags |= GF_FRAME_IFCE_MAIN_GLFB;
 	glc->tex_f_ifce.get_gl_texture = webgl_get_texture;
+	glc->tex_f_ifce.get_plane = webgl_get_plane;
 	glc->tex_f_ifce.user_data = glc;
 	glc->tex_frame_flush = JS_UNDEFINED;
 
@@ -1808,6 +2135,20 @@
 
 	return v;
 }
+static JSValue wgl_texture_name(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_WebGLNamedTexture *named_tx = NULL;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc || !argc) return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	named_tx = JS_GetOpaque(argv[0], NamedTexture_class_id);
+	if (!named_tx) {
+		GF_WebGLObject *tx = JS_GetOpaque(argv[0], WebGLTexture_class_id);
+		if (tx) return JS_NULL;
+		return GF_JS_EXCEPTION(ctx);
+	}
+	return JS_NewString(ctx, named_tx->tx_name);
+}
 
 static JSValue wgl_activate_gl(JSContext *ctx, GF_WebGLContext *glc, Bool activate)
 {
@@ -1836,9 +2177,21 @@
 			GF_WebGLNamedTexture *named_tx = gf_list_get(glc->named_textures, i);
 			named_tx->tx.frame_ifce = NULL;
 		}
-		glc->active_texture = 0;
-		glc->active_program = 0;
-		glc->bound_named_texture = NULL;
+
+		//restore prev program, texture and rebind
+		glUseProgram(glc->active_program);
+		if (glc->active_texture) {
+			glActiveTexture(glc->active_texture);
+
+			if (glc->bound_named_texture && glc->active_program && glc->bound_named_texture->shader_attached) {
+				if (!gf_gl_txw_bind(&glc->bound_named_texture->tx, glc->bound_named_texture->tx_name, glc->active_program, glc->active_texture)) {
+					return js_throw_err(ctx, WGL_INVALID_OPERATION);
+				}
+			}
+			else if (glc->bound_texture && glc->active_program) {
+				glBindTexture(glc->bound_texture_target, glc->bound_texture->gl_id);
+			}
+		}
 	} else {
 #if!defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
@@ -1890,13 +2243,11 @@
 	return wgl_activate_gl(ctx, glc, GF_TRUE);
 }
 
-
-
 static JSValue wgl_named_tx_upload(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	GF_WebGLNamedTexture *named_tx = JS_GetOpaque(this_val, NamedTexture_class_id);
 	if (!named_tx|| (argc<1)) return js_throw_err(ctx, WGL_INVALID_VALUE);
-	return wgl_named_texture_upload(ctx, argv[0], named_tx);
+	return wgl_named_texture_upload(ctx, argv[0], named_tx, GF_FALSE);
 }
 static JSValue wgl_named_tx_reconfigure(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
@@ -1905,16 +2256,16 @@
 
 	gf_gl_txw_reset(&named_tx->tx);
 
-	named_tx->shader_attached = GF_FALSE;
+	named_tx->shader_attached = 0;
 	return JS_UNDEFINED;
 }
 
-
 /*GPAC extensions*/
 static const JSCFunctionListEntry webgl_funcs[] =
 {
 	JS_CFUNC_DEF("activate", 0, wgl_activate),
 	JS_CFUNC_DEF("resize", 0, wgl_resize),
+	JS_CFUNC_DEF("textureName", 0, wgl_texture_name),
 };
 
 enum
@@ -1966,6 +2317,121 @@
 	JS_CFUNC_DEF("upload", 0, wgl_named_tx_upload),
 };
 
+/*GL-sepcifc code for mesh*/
+Bool mesh_gl_update_buffers(GF_Mesh *mesh)
+{
+	if (!mesh->vbo) {
+		glGenBuffers(1, &mesh->vbo);
+		if (!mesh->vbo) return GF_FALSE;
+	}
+	glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
+	glBufferData(GL_ARRAY_BUFFER, mesh->v_count * sizeof(GF_Vertex) , mesh->vertices, (mesh->vbo_dynamic) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
+
+	if (!mesh->vbo_idx) {
+		glGenBuffers(1, &mesh->vbo_idx);
+		if (!mesh->vbo_idx) return GF_FALSE;
+	}
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh->vbo_idx);
+	glBufferData(GL_ELEMENT_ARRAY_BUFFER, mesh->i_count*sizeof(IDX_TYPE), mesh->indices, (mesh->vbo_dynamic) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
+
+	return GF_TRUE;
+}
+
+JSValue mesh_gl_draw(JSContext *ctx, GF_Mesh *mesh, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	s32 vx_index = -1;
+	s32 norm_index = -1;
+	s32 color_index = -1;
+	s32 tx_index = -1;
+	void *idx_addr = NULL;
+	u32 prim_type;
+
+	if (argc<2) return GF_JS_EXCEPTION(ctx);
+	GF_WebGLContext *glctx = JS_GetOpaque(argv[0], WebGLRenderingContextBase_class_id);
+	if (!glctx) return GF_JS_EXCEPTION(ctx);
+
+	if (!mesh->vbo) return GF_JS_EXCEPTION(ctx);
+	if (!mesh->vbo_idx) return GF_JS_EXCEPTION(ctx);
+
+	WGL_GET_U32(vx_index, argv[1]);
+	if (argc==3) {
+		WGL_GET_U32(tx_index, argv[2]);
+	} else if (argc==4) {
+		WGL_GET_U32(norm_index, argv[2]);
+		WGL_GET_U32(tx_index, argv[3]);
+	} else if (argc>=5) {
+		WGL_GET_U32(norm_index, argv[2]);
+		WGL_GET_U32(color_index, argv[3]);
+		WGL_GET_U32(tx_index, argv[4]);
+	}
+
+	if (vx_index<0) return GF_JS_EXCEPTION(ctx);
+
+	glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
+	glEnableVertexAttribArray(vx_index);
+#if defined(GPAC_FIXED_POINT)
+	glVertexAttribPointer(vx_index, 3, GL_FIXED, GL_TRUE, sizeof(GF_Vertex), NULL);
+#else
+	glVertexAttribPointer(vx_index, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), NULL);
+#endif
+	GL_CHECK_ERR()
+
+	if (norm_index>=0) {
+#ifdef MESH_USE_FIXED_NORMAL
+		glVertexAttribPointer(norm_index, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), (void *) MESH_NORMAL_OFFSET);
+#else
+		glVertexAttribPointer(norm_index, 3, GL_BYTE, GL_FALSE, sizeof(GF_Vertex), (void *) MESH_NORMAL_OFFSET);
+#endif
+		glEnableVertexAttribArray(norm_index);
+		GL_CHECK_ERR()
+	}
+
+	if (color_index>=0) {
+		//for now colors are 8bit/comp RGB(A), so used GL_UNSIGNED_BYTE and GL_TRUE for normalizing values
+		if (mesh->flags & MESH_HAS_ALPHA) {
+			glEnable(GL_BLEND);
+			glVertexAttribPointer(color_index, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(GF_Vertex), (void *) MESH_COLOR_OFFSET);
+		} else {
+			glVertexAttribPointer(color_index, 3, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(GF_Vertex), (void *) MESH_COLOR_OFFSET);
+		}
+		glEnableVertexAttribArray(color_index);
+		GL_CHECK_ERR()
+	}
+
+	if (tx_index>=0) {
+		glVertexAttribPointer(tx_index, 2, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), (void *) MESH_TEX_OFFSET);
+		glEnableVertexAttribArray(tx_index);
+		GL_CHECK_ERR()
+	}
+
+	switch (mesh->mesh_type) {
+	case MESH_LINESET:
+		prim_type = GL_LINES;
+		break;
+	case MESH_POINTSET:
+		prim_type = GL_POINTS;
+		break;
+	default:
+		prim_type = GL_TRIANGLES;
+		break;
+	}
+
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh->vbo_idx);
+
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
+	glDrawElements(prim_type, mesh->i_count, GL_UNSIGNED_SHORT, idx_addr);
+#else
+	glDrawElements(prim_type, mesh->i_count, GL_UNSIGNED_INT, idx_addr);
+#endif
+
+
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+
+	return ret_val_js;
+
+
+}
 
 static int js_webgl_load_module(JSContext *c, JSModuleDef *m)
 {

gpac-1.0.1.tar.gz/src/jsmods/webgl.h -> gpac-2.0.0.tar.gz/src/jsmods/webgl.h Changed

@@ -79,24 +79,32 @@
 	GLint active_texture;
 
 	struct _wgl_named_texture *bound_named_texture;
+	struct __wgl_object *bound_texture;
+	u32 bound_texture_target;
+
+	u32 fetch_required_pfmt, pix_stride;
+	u8 *pix_data, *pix_line;
 } GF_WebGLContext;
 
-typedef struct
+typedef struct __wgl_object
 {
 	GLuint gl_id;
 	GF_WebGLContext *par_ctx;
 	JSValue obj; //object reference
 	JSClassID class_id; //object class
+	u32 tx_height; //for textures
+	u8 flip_y; //for textures
 } GF_WebGLObject;
 
 
 typedef struct _wgl_named_texture
 {
-	Bool shader_attached;
 	GF_WebGLContext *par_ctx;
 	char *tx_name;
-
 	GF_GLTextureWrapper tx;
+
+	u8 shader_attached;
+	u8 flip_y;
 } GF_WebGLNamedTexture;
 
 Bool js_evg_get_texture_info(JSContext *ctx, JSValue this_obj, u32 *width, u32 *height, u32 *pixfmt, u8 **p_data, u32 *stride, u8 **p_u, u8 **p_v, u32 *stride_uv, u8 **p_a);
@@ -119,6 +127,8 @@
 #define WGL_INVALID_OPERATION 0x0502
 #define WGL_OUT_OF_MEMORY 0x0505
 
+#define GL_UNPACK_FLIP_Y_WEBGL	0x9240
+
 
 enum
 {

gpac-1.0.1.tar.gz/src/jsmods/xhr.c -> gpac-2.0.0.tar.gz/src/jsmods/xhr.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2007-2020
+ *			Copyright (c) Telecom ParisTech 2007-2021
 *			All rights reserved
 *
 * This file is part of GPAC / JavaScript XmlHttpRequest bindings
@@ -154,9 +154,11 @@
 
 	GF_DOMEventTarget *event_target;
 
+#ifndef GPAC_DISABLE_SVG
 	/* dom graph in which the XHR is created */
 	GF_SceneGraph *owning_graph;
-#ifndef GPAC_DISABLE_SVG
+	Bool local_graph;
+
 	/* dom graph used to parse XML into */
 	GF_SceneGraph *document;
 #endif
@@ -268,14 +270,14 @@
 static void xml_http_del_data(XMLHTTPContext *ctx)
 {
 	if (!JS_IsUndefined(ctx->arraybuffer)) {
-		JS_DetachArrayBuffer(ctx->c, ctx->arraybuffer);
 		JS_FreeValue(ctx->c, ctx->arraybuffer);
 		ctx->arraybuffer = JS_UNDEFINED;
 	}
-	if (ctx->data) {
+	//only free data if no arraybuffer was used to fetch it
+	else if (ctx->data) {
 		gf_free(ctx->data);
-		ctx->data = NULL;
 	}
+	ctx->data = NULL;
 	ctx->size = 0;
 }
 
@@ -363,11 +365,25 @@
 	JS_FreeValueRT(rt, ctx->onreadystatechange);
 	JS_FreeValueRT(rt, ctx->ontimeout);
 	xml_http_reset(ctx);
+
 #ifndef GPAC_DISABLE_SVG
-	if (ctx->event_target)
+	if (ctx->event_target) {
+		if (ctx->local_graph) {
+			while (gf_list_count(ctx->event_target->listeners)) {
+				GF_Node *listener = gf_list_get(ctx->event_target->listeners, 0);
+				gf_dom_listener_del(listener, ctx->event_target);
+			}
+		}
 		gf_dom_event_target_del(ctx->event_target);
+	}
+
+	if (ctx->local_graph) {
+		dom_js_unload();
+		gf_sg_del(ctx->owning_graph);
+	}
 #endif
 
+
 	gf_free(ctx);
 }
 
@@ -388,7 +404,10 @@
 		XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
 		if (!ctx) return;
 
-		*sg = xml_get_scenegraph(c);
+		if (ctx->local_graph)
+			*sg = ctx->owning_graph;
+		else
+			*sg = xml_get_scenegraph(c);
 		*target = ctx->event_target;
 	}
 }
@@ -402,13 +421,20 @@
 	GF_SAFEALLOC(p, XMLHTTPContext);
 	if (!p) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[WHR] Failed to allocate XHR object\n"));
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	obj = JS_NewObjectClass(c, xhrClass.class_id);
 	p->c = c;
 	p->_this = obj;
-	p->owning_graph = xml_get_scenegraph(c);
+
 #ifndef GPAC_DISABLE_SVG
+	p->owning_graph = xml_get_scenegraph(c);
+	if (!p->owning_graph) {
+		p->local_graph = GF_TRUE;
+		p->owning_graph = gf_sg_new();
+		dom_js_load(p->owning_graph, c);
+	}
+
 	if (p->owning_graph)
 		p->event_target = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_XHR, p);
 #endif
@@ -457,13 +483,14 @@
 		JS_FreeValue(ctx->c, ret);
 	}
 
-	js_do_loop(ctx->c);
+	js_std_loop(ctx->c);
 	gf_js_lock(ctx->c, GF_FALSE);
 
+#ifndef GPAC_DISABLE_VRML
 	if (! ctx->owning_graph) return;
+	if (ctx->local_graph) return;
 
 	/*Flush BIFS eventOut events*/
-#ifndef GPAC_DISABLE_VRML
 	scene = (GF_SceneGraph *)JS_GetContextOpaque(ctx->c);
 	/*this is a scene, we look for a node (if scene is used, this is DOM-based scripting not VRML*/
 	if (scene->__reserved_null == 0) return;
@@ -481,23 +508,23 @@
 	GF_SceneGraph *scene;
 
 	ctx = (XMLHTTPContext *) JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx) return JS_EXCEPTION;
+	if (!ctx) return GF_JS_EXCEPTION(c);
 
 	/*reset*/
 	if (ctx->readyState) xml_http_reset(ctx);
 
-	if (argc<2) return JS_EXCEPTION;
+	if (argc<2) return GF_JS_EXCEPTION(c);
 	/*method is a string*/
-	if (!JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (!JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 	/*url is a string*/
-	if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+	if (!JS_CHECK_STRING(argv[1])) return GF_JS_EXCEPTION(c);
 
 	xml_http_reset(ctx);
 	val = JS_ToCString(c, argv[0]);
 	if (strcmp(val, "GET") && strcmp(val, "POST") && strcmp(val, "HEAD")
 	 && strcmp(val, "PUT") && strcmp(val, "DELETE") && strcmp(val, "OPTIONS") ) {
 		JS_FreeCString(c, val);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 
 	ctx->method = gf_strdup(val);
@@ -513,11 +540,18 @@
 	val = JS_ToCString(c, argv[1]);
 	par.uri.url = (char *) val;
 	ctx->url = NULL;
-	if (scene && scene->script_action) {
+
+	if (!strncmp(val, "gpac://", 7)) {
+		ctx->url = gf_strdup(val+7);
+	}
+	else if (scene && scene->script_action) {
 		scene->script_action(scene->script_action_cbck, GF_JSAPI_OP_RESOLVE_URI, scene->RootNode, &par);
 		ctx->url = par.uri.url;
 	} else {
-		ctx->url = gf_strdup(val);
+		const char *par_url = jsf_get_script_filename(c);
+		ctx->url = gf_url_concatenate(par_url, val);
+		if (!ctx->url)
+			ctx->url = gf_strdup(val);
 	}
 	JS_FreeCString(c, val);
 
@@ -527,10 +561,10 @@
 		val = NULL;
 		ctx->async = JS_ToBool(c, argv[2]) ? GF_TRUE : GF_FALSE;
 		if (argc>3) {
-			if (!JS_CHECK_STRING(argv[3])) return JS_EXCEPTION;
+			if (!JS_CHECK_STRING(argv[3])) return GF_JS_EXCEPTION(c);
 			/*TODO*/
 			if (argc>4) {
-				if (!JS_CHECK_STRING(argv[4])) return JS_EXCEPTION;
+				if (!JS_CHECK_STRING(argv[4])) return GF_JS_EXCEPTION(c);
 				val = JS_ToCString(c, argv[4]);
 				/*TODO*/
 			} else {
@@ -553,12 +587,12 @@
 {
 	const char *hdr, *val;
 	XMLHTTPContext *ctx = (XMLHTTPContext *) JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx) return JS_EXCEPTION;
+	if (!ctx) return GF_JS_EXCEPTION(c);
 
-	if (ctx->readyState!=XHR_READYSTATE_OPENED) return JS_EXCEPTION;
-	if (argc!=2) return JS_EXCEPTION;
-	if (!JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
-	if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+	if (ctx->readyState!=XHR_READYSTATE_OPENED) return GF_JS_EXCEPTION(c);
+	if (argc!=2) return GF_JS_EXCEPTION(c);
+	if (!JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
+	if (!JS_CHECK_STRING(argv[1])) return GF_JS_EXCEPTION(c);
 
 	hdr = JS_ToCString(c, argv[0]);
 	val = JS_ToCString(c, argv[1]);
@@ -743,7 +777,7 @@
 	case GF_NETIO_GET_CONTENT:
 		if (ctx->data) {
 			parameter->data = ctx->data;
-			parameter->size = (u32) strlen(ctx->data);
+			parameter->size = ctx->size;
 		}
 		goto exit;
 	case GF_NETIO_PARSE_HEADER:
@@ -784,7 +818,6 @@
 
 			/*detach arraybuffer if any*/
 			if (!JS_IsUndefined(ctx->arraybuffer)) {
-				JS_DetachArrayBuffer(ctx->c, ctx->arraybuffer);
 				JS_FreeValue(ctx->c, ctx->arraybuffer);
 				ctx->arraybuffer = JS_UNDEFINED;
 			}
@@ -807,7 +840,7 @@
 				JS_SetPropertyStr(ctx->c, prog_evt, "total", JS_NewInt64(ctx->c, tot_size));
 				JS_SetPropertyStr(ctx->c, prog_evt, "bps", JS_NewInt64(ctx->c, bps*8));
 				if (ctx->responseType==XHR_RESPONSETYPE_PUSH) {
-					buffer_ab = JS_NewArrayBuffer(ctx->c, (u8 *) parameter->data, parameter->size, NULL, ctx, 1);
+					buffer_ab = JS_NewArrayBuffer(ctx->c, (u8 *) parameter->data, parameter->size, NULL, ctx, 0/*1*/);
 					JS_SetPropertyStr(ctx->c, prog_evt, "buffer", buffer_ab);
 				}
 
@@ -831,6 +864,10 @@
 		/* No return, go till the end of the function */
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] Download error: %s\n", gf_error_to_string(parameter->error)));
 		break;
+	case GF_NETIO_REQUEST_SESSION:
+	case GF_NETIO_CANCEL_STREAM:
+		parameter->error = GF_NOT_SUPPORTED;
+		return;
 	}
 	if (ctx->async) {
 		xml_http_terminate(ctx, parameter->error);
@@ -929,11 +966,12 @@
 	GF_JSAPIParam par;
 	GF_SceneGraph *scene;
 	const char *data = NULL;
+	u32 data_size = 0;
 	XMLHTTPContext *ctx = (XMLHTTPContext *) JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx) return JS_EXCEPTION;
+	if (!ctx) return GF_JS_EXCEPTION(c);
 
-	if (ctx->readyState!=XHR_READYSTATE_OPENED) return JS_EXCEPTION;
-	if (ctx->sess) return JS_EXCEPTION;
+	if (ctx->readyState!=XHR_READYSTATE_OPENED) return GF_JS_EXCEPTION(c);
+	if (ctx->sess) return GF_JS_EXCEPTION(c);
 
 	scene = xml_get_scenegraph(c);
 	if (scene) {
@@ -943,24 +981,29 @@
 	} else {
 		par.dnld_man = jsf_get_download_manager(c);
 	}
-	if (!par.dnld_man) return JS_EXCEPTION;
+	if (!par.dnld_man) return GF_JS_EXCEPTION(c);
 
 	if (argc) {
 		if (JS_IsNull(argv[0])) {
-		} else if (JS_IsObject(argv[0])) {
-//			if (!GF_JS_InstanceOf(c, JSValue_TO_OBJECT(argv[0]), &documentClass, NULL) ) return JS_TRUE;
-
+		} else if (JS_IsArrayBuffer(c, argv[0])) {
+			size_t asize;
+			data = JS_GetArrayBuffer(c, &asize, argv[0] );
+			if (data) data_size = (u32) asize;
+		} else if (JS_IsObject(argv[0])) {
 			/*NOT SUPPORTED YET, we must serialize the sg*/
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 		} else {
-			if (!JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+			if (!JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 			data = JS_ToCString(c, argv[0]);
+			data_size = (u32) strlen(data);
 		}
 	}
 
 	/*reset previous text*/
 	xml_http_del_data(ctx);
 	ctx->data = data ? gf_strdup(data) : NULL;
+	ctx->size = data_size;
+
 	JS_FreeCString(c, data);
 
 	if (!strncmp(ctx->url, "http://", 7)) {
@@ -977,7 +1020,7 @@
 			}
 		}
 		ctx->sess = gf_dm_sess_new(par.dnld_man, ctx->url, flags, xml_http_on_data, ctx, &e);
-		if (!ctx->sess) return JS_EXCEPTION;
+		if (!ctx->sess) return GF_JS_EXCEPTION(c);
 
 		/*start our download (whether the session is threaded or not)*/
 		e = gf_dm_sess_process(ctx->sess);
@@ -1001,11 +1044,15 @@
 {
 	GF_DownloadSession *sess;
 	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx) return JS_EXCEPTION;
+	if (!ctx) return GF_JS_EXCEPTION(c);
 
 	sess = ctx->sess;
 	ctx->sess = NULL;
-	if (sess) gf_dm_sess_del(sess);
+	if (sess) {
+		//abort first, so that on HTTP/2 this results in RST_STREAM
+		gf_dm_sess_abort(sess);
+		gf_dm_sess_del(sess);
+	}
 
 	xml_http_fire_event(ctx, GF_EVENT_ABORT);
 	xml_http_reset(ctx);
@@ -1015,28 +1062,16 @@
 	return JS_TRUE;
 }
 
-static JSValue xml_http_wait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
-{
-	u32 ms = 1000;
-	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx) return JS_EXCEPTION;
-	if (argc)
-		JS_ToInt32(ctx->c, &ms, argv[0]);
-	if (ms>1000) ms=1000;
-	gf_sleep(ms);
-	return JS_TRUE;
-}
-
 static JSValue xml_http_get_all_headers(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	u32 nb_hdr;
 	char *szVal = NULL;
 	JSValue res;
 	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx) return JS_EXCEPTION;
+	if (!ctx) return GF_JS_EXCEPTION(c);
 
 	/*must be received or loaded*/
-	if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_EXCEPTION;
+	if (ctx->readyState<XHR_READYSTATE_LOADING) return GF_JS_EXCEPTION(c);
 	nb_hdr = 0;
 	if (ctx->recv_headers) {
 		while (ctx->recv_headers[nb_hdr]) {
@@ -1061,11 +1096,11 @@
 	const char *hdr;
 	char *szVal = NULL;
 	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx) return JS_EXCEPTION;
+	if (!ctx) return GF_JS_EXCEPTION(c);
 
-	if (!JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (!JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 	/*must be received or loaded*/
-	if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_EXCEPTION;
+	if (ctx->readyState<XHR_READYSTATE_LOADING) return GF_JS_EXCEPTION(c);
 	hdr = JS_ToCString(c, argv[0]);
 
 	nb_hdr = 0;
@@ -1105,9 +1140,9 @@
 {
 	const char *mime;
 	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx || !argc) return JS_EXCEPTION;
+	if (!ctx || !argc) return GF_JS_EXCEPTION(c);
 
-	if (!JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (!JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 	mime = JS_ToCString(c, argv[0]);
 	if (ctx->mime) gf_free(ctx->mime);
 	ctx->mime = gf_strdup(mime);
@@ -1115,10 +1150,17 @@
 	return JS_TRUE;
 }
 
+static void xml_http_array_buffer_free(JSRuntime *rt, void *opaque, void *ptr)
+{
+	//might already been destroyed !
+//	XMLHTTPContext *ctx = (XMLHTTPContext *)opaque;
+	gf_free(ptr);
+}
+
 static JSValue xml_http_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx) return JS_EXCEPTION;
+	if (!ctx) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case XHR_ONABORT: return JS_DupValue(c, ctx->onabort);
@@ -1172,10 +1214,10 @@
 
 			case XHR_RESPONSETYPE_ARRAYBUFFER:
 				if (JS_IsUndefined(ctx->arraybuffer)) {
-					ctx->arraybuffer = JS_NewArrayBuffer(c, ctx->data, ctx->size, NULL, ctx, 1);
+					ctx->arraybuffer = JS_NewArrayBuffer(c, ctx->data, ctx->size, xml_http_array_buffer_free, ctx, 0/*1*/);
 				}
 				return JS_DupValue(c, ctx->arraybuffer);
-				break;
+
 			case XHR_RESPONSETYPE_DOCUMENT:
 #ifndef GPAC_DISABLE_SVG
 				if (ctx->data) {
@@ -1198,7 +1240,7 @@
 			case XHR_RESPONSETYPE_JSON:
 				return JS_ParseJSON(c, ctx->data, ctx->size, "responseJSON");
 			case XHR_RESPONSETYPE_PUSH:
-				return JS_EXCEPTION;
+				return GF_JS_EXCEPTION(c);
 			default:
 				/*other	types not supported	*/
 				break;
@@ -1220,7 +1262,7 @@
 		return ctx->withCredentials ? JS_TRUE : JS_FALSE;
 	case XHR_UPLOAD:
 		/* TODO */
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	case XHR_RESPONSETYPE:
 		switch (ctx->responseType) {
 		case XHR_RESPONSETYPE_NONE: return JS_NewString(c, "");
@@ -1259,7 +1301,7 @@
 static JSValue xml_http_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
-	if (!ctx) return JS_EXCEPTION;
+	if (!ctx) return GF_JS_EXCEPTION(c);
 
 #define SET_CBK(_sym) \
 		if (JS_IsFunction(c, value) || JS_IsUndefined(value) || JS_IsNull(value)) {\
@@ -1267,7 +1309,7 @@
 			ctx->_sym = JS_DupValue(c, value);\
 			return JS_TRUE;\
 		}\
-		return JS_EXCEPTION;\
+		return GF_JS_EXCEPTION(c);\
 
 	switch (magic) {
 	case XHR_ONERROR:
@@ -1295,7 +1337,7 @@
 		SET_CBK(ontimeout)
 
 	case XHR_TIMEOUT:
-		if (JS_ToInt32(c, &ctx->timeout, value)) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &ctx->timeout, value)) return GF_JS_EXCEPTION(c);
 		return JS_TRUE;
 
 	case XHR_WITHCREDENTIALS:
@@ -1327,7 +1369,7 @@
 	case XHR_CACHE:
 	{
 		const char *str = JS_ToCString(c, value);
-		if (!str) return JS_EXCEPTION;
+		if (!str) return GF_JS_EXCEPTION(c);
 		if (!strcmp(str, "normal")) {
 			ctx->cache = XHR_CACHETYPE_NORMAL;
 		} else if (!strcmp(str, "none")) {
@@ -1374,7 +1416,6 @@
 	JS_CFUNC_DEF("overrideMimeType", 1, xml_http_overrideMimeType),
 	JS_CFUNC_DEF("send", 0, xml_http_send),
 	JS_CFUNC_DEF("setRequestHeader", 2, xml_http_set_header),
-	JS_CFUNC_DEF("wait", 0, xml_http_wait),
 
 	/*eventTarget interface*/
 	JS_DOM3_EVENT_TARGET_INTERFACE
@@ -1393,6 +1434,9 @@
 	JS_MarkValue(rt, ctx->onprogress, mark_func);
 	JS_MarkValue(rt, ctx->onreadystatechange, mark_func);
 	JS_MarkValue(rt, ctx->ontimeout, mark_func);
+
+	if (!JS_IsUndefined(ctx->arraybuffer))
+		JS_MarkValue(rt, ctx->arraybuffer, mark_func);
 }
 
 static JSValue xhr_load_class(JSContext *c)

gpac-1.0.1.tar.gz/src/laser/lsr_dec.c -> gpac-2.0.0.tar.gz/src/laser/lsr_dec.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2019
+ *			Copyright (c) Telecom ParisTech 2005-2022
 *					All rights reserved
 *
 * This file is part of GPAC / LASeR codec sub-project
@@ -31,10 +31,15 @@
 #ifndef GPAC_DISABLE_LASER
 
 
-#define GF_LSR_READ_INT(_codec, _val, _nbBits, _str)	{\
-	(_val) = gf_bs_read_int(_codec->bs, _nbBits);	\
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] %s\t\t%d\t\t%d\n", _str, _nbBits, _val)); \
+#define GF_LSR_READ_INT(_codec, _val, _nbBits, _str) {\
+	if (_nbBits/8 > gf_bs_available(lsr->bs)) {\
+		lsr->last_error = GF_NON_COMPLIANT_BITSTREAM;\
+		(_val) = 0;\
+	} else {\
+		(_val) = gf_bs_read_int(_codec->bs, _nbBits);	\
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] %s\t\t%d\t\t%d\n", _str, _nbBits, _val)); \
 	}\
+}
 
 
 static void lsr_read_group_content(GF_LASeRCodec *lsr, GF_Node *elt, Bool skip_object_content);
@@ -162,8 +167,11 @@
 
 void lsr_end_of_stream(void *co)
 {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[LASeR] memory overread - corrupted decoding\n"));
-	((GF_LASeRCodec *) co)->last_error = GF_NON_COMPLIANT_BITSTREAM;
+	GF_LASeRCodec *codec = (GF_LASeRCodec *)co;
+	if (codec->last_error != GF_NON_COMPLIANT_BITSTREAM) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[LASeR] memory overread - corrupted decoding\n"));
+		((GF_LASeRCodec *) co)->last_error = GF_NON_COMPLIANT_BITSTREAM;
+	}
 }
 
 GF_EXPORT
@@ -379,6 +387,7 @@
 			val = lsr_read_vluimsbf5(lsr, "len");//len in BITS
 			GF_LSR_READ_INT(lsr, val, val, "reserved_val");
 			GF_LSR_READ_INT(lsr, val, 1, "hasNextExtension");
+			if (lsr->last_error) return;
 		} while (val);
 	}
 }
@@ -503,10 +512,18 @@
 				return;
 			}
 			*str = (char*)gf_malloc(sizeof(char)*(len+1));
+			if (!*str) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				return;
+			}
 			gf_bs_read_data(lsr->bs, *str, len);
 			(*str) [len] = 0;
 		}
 	} else {
+		if (len > gf_bs_available(lsr->bs) ) {
+			lsr->last_error = GF_NON_COMPLIANT_BITSTREAM;
+			return;
+		}
 		while (len) {
 			gf_bs_read_int(lsr->bs, 8);
 			len--;
@@ -548,6 +565,8 @@
 					iri->string = gf_strdup(cur);
 					iri->type = XMLRI_STRING;
 					gf_list_add(l, iri);
+				} else {
+					lsr->last_error = GF_OUT_OF_MEM;
 				}
 			} else {
 				gf_list_add(l, gf_strdup(cur));
@@ -562,6 +581,8 @@
 					iri->string = gf_strdup(cur);
 					iri->type = XMLRI_STRING;
 					gf_list_add(l, iri);
+				} else {
+					lsr->last_error = GF_OUT_OF_MEM;
 				}
 			} else {
 				gf_list_add(l, gf_strdup(cur));
@@ -578,6 +599,8 @@
 				iri->string = gf_strdup(sep+1);
 				iri->type = XMLRI_STRING;
 				gf_list_add(l, iri);
+			} else {
+				lsr->last_error = GF_OUT_OF_MEM;
 			}
 		} else {
 			gf_list_add(l, gf_strdup(sep+1));
@@ -611,8 +634,17 @@
 		} else {
 			u32 len_rad, len;
 			len = lsr_read_vluimsbf5(lsr, "len");
+			if (len > gf_bs_available(lsr->bs)) {
+				lsr->last_error = GF_NON_COMPLIANT_BITSTREAM;
+				return;
+			}
 			len_rad = s ? (u32) strlen(s) : 0;
 			iri->string = (char*)gf_malloc(sizeof(char)*(len_rad+1+len+1));
+			if (!iri->string) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				return;
+			}
+
 			iri->string[0] = 0;
 			if (s) {
 				strcpy(iri->string, s);
@@ -672,6 +704,8 @@
 			iri.type = 0xFF;
 			lsr_read_any_uri(lsr, &iri, name);
 			gf_node_unregister_iri(lsr->sg, &iri);
+			gf_list_del_item(lsr->deferred_hrefs, &iri);
+
 			paint->type = SVG_PAINT_URI;
 			if (iri.string) {
 				paint->type = SVG_PAINT_URI;
@@ -734,7 +768,9 @@
 	count = gf_list_count(lsr->deferred_hrefs);
 	for (i=0; i<count; i++) {
 		XMLRI *href = (XMLRI *)gf_list_get(lsr->deferred_hrefs, i);
-		char *str_id = href->string;
+		char *str_id = href ? href->string : NULL;
+		if (!str_id) return;
+		
 		if (str_id[0] == '#') str_id++;
 		/*skip 'N'*/
 		str_id++;
@@ -1232,7 +1268,10 @@
 	u32 val;
 
 	GF_SAFEALLOC(t, SMIL_Time);
-	if (!t) return NULL;
+	if (!t) {
+		lsr->last_error = GF_OUT_OF_MEM;
+		return NULL;
+	}
 	t->type = GF_SMIL_TIME_CLOCK;
 
 	GF_LSR_READ_INT(lsr, val, 1, "hasEvent");
@@ -1297,6 +1336,8 @@
 		if (v) {
 			v->type = GF_SMIL_TIME_INDEFINITE;
 			gf_list_add(*times, v);
+		} else {
+			lsr->last_error = GF_OUT_OF_MEM;
 		}
 		return;
 	}
@@ -1304,6 +1345,7 @@
 	for (i=0; i<count; i++) {
 		v = lsr_read_smil_time(lsr, n);
 		gf_list_add(*times, v);
+		if (lsr->last_error) return;
 	}
 }
 
@@ -1470,9 +1512,14 @@
 				da->array.count = lsr_read_vluimsbf5(lsr, "len");
 				da->array.vals = (Fixed*)gf_malloc(sizeof(Fixed)*da->array.count);
 				da->array.units = (u8*)gf_malloc(sizeof(u8)*da->array.count);
+				if (!da->array.vals || !da->array.units) {
+					lsr->last_error = GF_OUT_OF_MEM;
+					return;
+				}
 				for (j=0; j<da->array.count; j++) {
 					da->array.vals[j] = lsr_read_fixed_16_8(lsr, "dash");
 					da->array.units[j] = 0;
+					if (lsr->last_error) return;
 				}
 			}
 		}
@@ -1528,6 +1575,7 @@
 			for (j=0; j<fcount; j++) {
 				u32 fval;
 				GF_LSR_READ_INT(lsr, fval, 6, "feature");
+				if (lsr->last_error) return;
 			}
 		}
 		break;
@@ -1582,8 +1630,7 @@
 			lsr_read_matrix(lsr, info.far_ptr);
 			break;
 		case TAG_SVG_ATT_text_decoration:
-			/*FIXME ASAP*/
-			assert(0);
+			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "textDecoration", GF_FALSE, GF_FALSE);
 			break;
 
 		case TAG_SVG_ATT_font_variant:
@@ -1644,7 +1691,7 @@
 			lsr_read_duration_ex(lsr, NULL, 0, info.far_ptr, "min", 0);
 			break;
 		}
-		if (lsr->last_error) break;
+		if (lsr->last_error) return;
 	}
 }
 
@@ -1741,55 +1788,135 @@
 	lsr_read_attribute_name_ex(lsr, n, GF_TRUE);
 }
 
-static void lsr_translate_anim_value(SMIL_AnimateValue *val, u32 coded_type)
+static void lsr_delete_anim_value(GF_LASeRCodec *lsr, SMIL_AnimateValue *val, u32 coded_type)
 {
-	switch (val->type) {
-	case SVG_StrokeDashArray_datatype:
-	{
-		SVG_StrokeDashArray *da;
-		GF_List *l = (GF_List *)val->value;
-		u32 i;
-		GF_SAFEALLOC(da, SVG_StrokeDashArray);
-		if (!da) return;
-		da->array.count = gf_list_count(l);
-		if (!da->array.count) {
-			da->type = SVG_STROKEDASHARRAY_INHERIT;
-		} else {
-			da->type = SVG_STROKEDASHARRAY_ARRAY;
-			da->array.vals = (Fixed *) gf_malloc(sizeof(Fixed)*da->array.count);
-			da->array.units = (u8 *) gf_malloc(sizeof(u8)*da->array.count);
-			for (i=0; i<da->array.count; i++) {
-				Fixed *v = (Fixed *)gf_list_get(l, i);
-				da->array.vals[i] = *v;
-				da->array.units[i] = 0;
+	//unable to transform, free mem and reset
+	switch (coded_type) {
+	case 0://SVG_string *
+		gf_free(* (SVG_String *)val->value);
+		gf_free(val->value);
+		break;
+	case 1://SVG_Number *
+		gf_free(val->value);
+		break;
+	case 2: //SVG_PathData *
+		gf_svg_delete_attribute_value(SVG_PathData_datatype, val->value, NULL);
+		break;
+	case 3: //SVG_Points *pts
+		gf_svg_delete_attribute_value(SVG_Points_datatype, val->value, NULL);
+		break;
+	case 4: //SVG_Number*
+		gf_free(val->value);
+		break;
+	case 5://SVG_Paint
+		gf_free(val->value);
+		break;
+	case 6://u8*
+		gf_free(val->value);
+		break;
+	case 7: //list of u8 *
+	case 8: //list of floats
+		{
+			GF_List *l = (GF_List *) val->value;
+			while (gf_list_count(l)) {
+				void *v = gf_list_pop_back(l);
 				gf_free(v);
 			}
 			gf_list_del(l);
-			val->value = da;
 		}
+		break;
+	/*point */
+	case 9: //SVG_Point *
+		gf_free(val->value);
+		break;
+	case 10: //u32 *
+		gf_free(val->value);
+		break;
+	case 11: //SVG_FontFamily *
+	{
+		SVG_FontFamily *ft = (SVG_FontFamily *) val->value;
+		if (ft->value) gf_free(ft->value);
+		gf_free(ft);
 	}
-	break;
-	case SVG_ViewBox_datatype:
+		break;
+	case 12:
 	{
-		SVG_ViewBox *vb;
-		GF_List *l = (GF_List *)val->value;
-		GF_SAFEALLOC(vb, SVG_ViewBox);
-		if (!vb) return;
-		if (gf_list_count(l)==4) {
-			vb->x = * ((Fixed *)gf_list_get(l, 0));
-			vb->y = * ((Fixed *)gf_list_get(l, 1));
-			vb->width = * ((Fixed *)gf_list_get(l, 2));
-			vb->height = * ((Fixed *)gf_list_get(l, 3));
+		XMLRI *iri = (XMLRI *)val->value;
+		gf_list_del_item(lsr->deferred_hrefs, iri);
+		gf_node_unregister_iri(lsr->sg, iri);
+		if (iri->string) gf_free(iri->string);
+		gf_free(iri);
+	}
+	default:
+		break;
+	}
+	val->value = NULL;
+}
+
+static void lsr_translate_anim_value(GF_LASeRCodec *lsr, SMIL_AnimateValue *val, u32 coded_type)
+{
+	switch (val->type) {
+	case SVG_StrokeDashArray_datatype:
+		//if list of fixed only
+		if (coded_type == 8) {
+			SVG_StrokeDashArray *da;
+			GF_List *l = (GF_List *)val->value;
+			u32 i;
+			GF_SAFEALLOC(da, SVG_StrokeDashArray);
+			if (!da) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				return;
+			}
+			da->array.count = gf_list_count(l);
+			if (!da->array.count) {
+				da->type = SVG_STROKEDASHARRAY_INHERIT;
+			} else {
+				da->type = SVG_STROKEDASHARRAY_ARRAY;
+				da->array.vals = (Fixed *) gf_malloc(sizeof(Fixed)*da->array.count);
+				da->array.units = (u8 *) gf_malloc(sizeof(u8)*da->array.count);
+				if (!da->array.vals || !da->array.units) {
+					lsr->last_error = GF_OUT_OF_MEM;
+					return;
+				}
+
+				for (i=0; i<da->array.count; i++) {
+					Fixed *v = (Fixed *)gf_list_get(l, i);
+					da->array.vals[i] = *v;
+					da->array.units[i] = 0;
+					gf_free(v);
+				}
+			}
+			gf_list_del(l);
+			val->value = da;
+			return;
 		}
-		while (gf_list_count(l)) {
-			Fixed *v = (Fixed *)gf_list_last(l);
-			gf_free(v);
-			gf_list_rem_last(l);
+		break;
+	case SVG_ViewBox_datatype:
+		//if list of fixed only
+		if (coded_type == 8) {
+			SVG_ViewBox *vb;
+			GF_List *l = (GF_List *)val->value;
+			GF_SAFEALLOC(vb, SVG_ViewBox);
+			if (!vb) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				return;
+			}
+			if (gf_list_count(l)==4) {
+				vb->x = * ((Fixed *)gf_list_get(l, 0));
+				vb->y = * ((Fixed *)gf_list_get(l, 1));
+				vb->width = * ((Fixed *)gf_list_get(l, 2));
+				vb->height = * ((Fixed *)gf_list_get(l, 3));
+			}
+			while (gf_list_count(l)) {
+				Fixed *v = (Fixed *)gf_list_last(l);
+				gf_free(v);
+				gf_list_rem_last(l);
+			}
+			gf_list_del(l);
+			val->value = vb;
+			return;
 		}
-		gf_list_del(l);
-		val->value = vb;
-	}
-	break;
+		break;
 	case SVG_Coordinates_datatype:
 	{
 		SVG_Coordinates *coords;
@@ -1798,8 +1925,13 @@
 			/*allocated value is already an SVG number*/
 			gf_list_add(l, val->value);
 			coords = (SVG_Coordinates*)gf_malloc(sizeof(SVG_Coordinates));
-			*coords = l;
-			val->value = coords;
+			if (!coords) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				*coords = l;
+				val->value = coords;
+			}
+			return;
 		} else if (coded_type==8) {
 			GF_List *l = (GF_List *)val->value;
 			u32 i, count = gf_list_count(l);
@@ -1807,18 +1939,28 @@
 				SVG_Coordinate *c;
 				Fixed *v = (Fixed *)gf_list_get(l, i);
 				c = (SVG_Coordinate*)gf_malloc(sizeof(SVG_Coordinate));
-				c->type = SVG_NUMBER_VALUE;
-				c->value = *v;
+				if (!c) {
+					lsr->last_error = GF_OUT_OF_MEM;
+				} else {
+					c->type = SVG_NUMBER_VALUE;
+					c->value = *v;
+				}
 				gf_free(v);
 				gf_list_rem(l, i);
-				gf_list_insert(l, c, i);
+				if (c)
+					gf_list_insert(l, c, i);
 			}
 			coords = (SVG_Coordinates*)gf_malloc(sizeof(SVG_Coordinates));
-			*coords = (GF_List *) val->value;
-			val->value = coords;
+			if (!coords) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				*coords = (GF_List *) val->value;
+				val->value = coords;
+			}
+			return;
 		}
 	}
-	break;
+		break;
 	case SVG_Motion_datatype:
 		if (coded_type==9) {
 			GF_Matrix2D *mat;
@@ -1829,31 +1971,55 @@
 				mat->m[2] = pt->x;
 				mat->m[5] = pt->y;
 				val->value = mat;
+			} else {
+				lsr->last_error = GF_OUT_OF_MEM;
 			}
 			gf_free(pt);
+			return;
 		}
 		break;
+	default:
+		break;
 	}
+	lsr_delete_anim_value(lsr, val, coded_type);
 }
-static void lsr_translate_anim_values(SMIL_AnimateValues *val, u32 coded_type)
+
+
+static void lsr_translate_anim_values(GF_LASeRCodec *lsr, SMIL_AnimateValues *val, u32 coded_type)
 {
 	u32 i, count;
+	Bool handled = GF_FALSE;
 	GF_List *list, *new_list;
 
 	list = val->values;
 	switch (val->type) {
 	case SVG_StrokeDashArray_datatype:
+		if (coded_type == 8) handled = GF_TRUE;
 		break;
 	case SVG_ViewBox_datatype:
+		if (coded_type == 8) handled = GF_TRUE;
 		break;
 	case SVG_Coordinates_datatype:
+		if (coded_type == 8) handled = GF_TRUE;
 		break;
 	case SVG_Motion_datatype:
-		if (coded_type!=9) return;
+		if (coded_type==9) handled = GF_TRUE;
 		break;
 	default:
+		break;
+	}
+	if (!handled) {
+		while (gf_list_count(list)) {
+			SMIL_AnimateValue a_val;
+			a_val.type = 0;
+			a_val.value = gf_list_pop_back(list);
+			lsr_delete_anim_value(lsr, &a_val, coded_type);
+		}
+		gf_list_del(list);
+		val->values = gf_list_new();
 		return;
 	}
+
 	val->values = new_list = gf_list_new();
 	count = gf_list_count(list);
 	for (i=0; i<count; i++) {
@@ -1864,7 +2030,10 @@
 			GF_List *l = (GF_List *)gf_list_get(list, i);
 			u32 j;
 			GF_SAFEALLOC(da, SVG_StrokeDashArray);
-			if (!da) return;
+			if (!da) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				return;
+			}
 			da->array.count = gf_list_count(l);
 			if (!da->array.count) {
 				da->type = SVG_STROKEDASHARRAY_INHERIT;
@@ -1872,6 +2041,10 @@
 				da->type = SVG_STROKEDASHARRAY_ARRAY;
 				da->array.vals = (Fixed *)gf_malloc(sizeof(Fixed)*da->array.count);
 				da->array.units = (u8 *) gf_malloc(sizeof(u8)*da->array.count);
+				if (!da->array.vals || !da->array.units) {
+					lsr->last_error = GF_OUT_OF_MEM;
+					return;
+				}
 				for (j=0; j<da->array.count; j++) {
 					Fixed *v = (Fixed *)gf_list_get(l, j);
 					da->array.vals[j] = *v;
@@ -1888,7 +2061,10 @@
 			SVG_ViewBox *vb;
 			GF_List *l = (GF_List *)gf_list_get(list, i);
 			GF_SAFEALLOC(vb, SVG_ViewBox);
-			if (!vb) return;
+			if (!vb) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				return;
+			}
 			if (gf_list_count(l)==4) {
 				vb->x = * ((Fixed *)gf_list_get(l, 0));
 				vb->y = * ((Fixed *)gf_list_get(l, 1));
@@ -1911,30 +2087,43 @@
 			u32 j, count2;
 			count2 = gf_list_count(l);
 			for (j=0; j<count2; j++) {
-				SVG_Coordinate *c = (SVG_Coordinate *)gf_malloc(sizeof(SVG_Coordinate));
 				Fixed *v = (Fixed *)gf_list_get(l, j);
-				c->type = SVG_NUMBER_VALUE;
-				c->value = *v;
+				SVG_Coordinate *c = (SVG_Coordinate *)gf_malloc(sizeof(SVG_Coordinate));
+				if (!c) {
+					lsr->last_error = GF_OUT_OF_MEM;
+				} else {
+					c->type = SVG_NUMBER_VALUE;
+					c->value = *v;
+				}
 				gf_list_rem(l, j);
-				gf_list_insert(l, c, j);
 				gf_free(v);
+				if (c)
+					gf_list_insert(l, c, j);
 			}
 
 			coords = (SVG_Coordinates*)gf_malloc(sizeof(SVG_Coordinates));
-			*coords = l;
-			gf_list_add(new_list, coords);
+			if (!coords) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				*coords = l;
+				gf_list_add(new_list, coords);
+			}
 		}
 		break;
 
 		case SVG_Motion_datatype:
 		{
-			GF_Matrix2D *m = (GF_Matrix2D *)gf_malloc(sizeof(GF_Matrix2D ));
 			GF_Point2D *pt = (GF_Point2D *)gf_list_get(list, i);
-			gf_mx2d_init(*m);
-			m->m[2] = pt->x;
-			m->m[5] = pt->y;
+			GF_Matrix2D *m = (GF_Matrix2D *)gf_malloc(sizeof(GF_Matrix2D ));
+			if (!m) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				gf_mx2d_init(*m);
+				m->m[2] = pt->x;
+				m->m[5] = pt->y;
+				gf_list_add(new_list, m);
+			}
 			gf_free(pt);
-			gf_list_add(new_list, m);
 		}
 			break;
 		}
@@ -2056,7 +2245,7 @@
 			value = info.far_ptr;
 			coded_type = value->type;
 			value->type = is_animateMotion ? SVG_Motion_datatype : name->type;
-			lsr_translate_anim_value(value, coded_type);
+			lsr_translate_anim_value(lsr, value, coded_type);
 		}
 	}
 	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_by, GF_FALSE, GF_FALSE, &info)==GF_OK) {
@@ -2066,7 +2255,7 @@
 			value = info.far_ptr;
 			coded_type = value->type;
 			value->type = is_animateMotion ? SVG_Motion_datatype : name->type;
-			lsr_translate_anim_value(value, coded_type);
+			lsr_translate_anim_value(lsr, value, coded_type);
 		}
 	}
 	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_to, GF_FALSE, GF_FALSE, &info)==GF_OK) {
@@ -2076,7 +2265,7 @@
 			value = info.far_ptr;
 			coded_type = value->type;
 			value->type = is_animateMotion ? SVG_Motion_datatype : name->type;
-			lsr_translate_anim_value(value, coded_type);
+			lsr_translate_anim_value(lsr, value, coded_type);
 		}
 	}
 	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_values, GF_FALSE, GF_FALSE, &info)==GF_OK) {
@@ -2087,7 +2276,7 @@
 			coded_type = values->type;
 			values->type = is_animateMotion ? SVG_Motion_datatype : name->type;
 			values->laser_strings = 0;
-			lsr_translate_anim_values(values, coded_type);
+			lsr_translate_anim_values(lsr, values, coded_type);
 		}
 	}
 
@@ -2173,11 +2362,18 @@
 		string = NULL;
 		lsr_read_byte_align_string(lsr, &string, name);
 		GF_SAFEALLOC(svg_string, SVG_String);
-		if (!svg_string) return NULL;
+		if (!svg_string) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		*svg_string = string;
 		return svg_string;
 	case 1:
 		num = (SVG_Number*)gf_malloc(sizeof(SVG_Number));
+		if (!num) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		if (escapeFlag) {
 			num->type = (escape_val==1) ? SVG_NUMBER_INHERIT : SVG_NUMBER_VALUE;
 		} else {
@@ -2188,17 +2384,29 @@
 	case 2:
 	{
 		SVG_PathData *pd = (SVG_PathData *)gf_svg_create_attribute_value(SVG_PathData_datatype);
-		lsr_read_path_type(lsr, NULL, 0, pd, name);
+		if (!pd) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
+			lsr_read_path_type(lsr, NULL, 0, pd, name);
+		}
 		return pd;
 	}
 	case 3:
 	{
 		SVG_Points *pts = (SVG_Points *)gf_svg_create_attribute_value(SVG_Points_datatype);
-		lsr_read_point_sequence(lsr, *pts, name);
+		if (!pts) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
+			lsr_read_point_sequence(lsr, *pts, name);
+		}
 		return pts;
 	}
 	case 4:
 		num = (SVG_Number*)gf_malloc(sizeof(SVG_Number));
+		if (!num) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		if (escapeFlag) {
 			num->type = (escape_val==1) ? SVG_NUMBER_INHERIT : SVG_NUMBER_VALUE;
 		} else {
@@ -2208,7 +2416,10 @@
 		return num;
 	case 5:
 		GF_SAFEALLOC(paint, SVG_Paint);
-		if (!paint) return NULL;
+		if (!paint) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		if (escapeFlag) {
 			paint->type = SVG_PAINT_INHERIT;
 		} else {
@@ -2217,18 +2428,31 @@
 		return paint;
 	case 6:
 		enum_val = (u8*)gf_malloc(sizeof(u8));
-		*enum_val = lsr_read_vluimsbf5(lsr, name);
+		if (!enum_val) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
+			*enum_val = lsr_read_vluimsbf5(lsr, name);
+		}
 		return enum_val;
 	/*TODO check this is correct*/
 	case 7:
 	{
 		GF_List *l = gf_list_new();
+		if (!l) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		u32 i, count;
 		count = lsr_read_vluimsbf5(lsr, "count");
 		for (i=0; i<count; i++) {
 			u8 *v = (u8 *)gf_malloc(sizeof(u8));
-			*v = lsr_read_vluimsbf5(lsr, "val");
-			gf_list_add(l, v);
+			if (!v) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				*v = lsr_read_vluimsbf5(lsr, "val");
+				gf_list_add(l, v);
+			}
+			if (lsr->last_error) break;
 		}
 		return l;
 	}
@@ -2236,12 +2460,21 @@
 	case 8: // floats
 	{
 		GF_List *l = gf_list_new();
+		if (!l) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		u32 i, count;
 		count = lsr_read_vluimsbf5(lsr, "count");
 		for (i=0; i<count; i++) {
 			Fixed *v = (Fixed *)gf_malloc(sizeof(Fixed));
-			*v = lsr_read_fixed_16_8(lsr, "val");
-			gf_list_add(l, v);
+			if (!v) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				*v = lsr_read_fixed_16_8(lsr, "val");
+				gf_list_add(l, v);
+			}
+			if (lsr->last_error) break;
 		}
 		return l;
 	}
@@ -2249,6 +2482,10 @@
 	/*point */
 	case 9:
 		pt = (SVG_Point*)gf_malloc(sizeof(SVG_Point));
+		if (!pt) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		GF_LSR_READ_INT(lsr, flag, lsr->coord_bits, "valX");
 		pt->x = lsr_translate_coords(lsr, flag, lsr->coord_bits);
 		GF_LSR_READ_INT(lsr, flag, lsr->coord_bits, "valY");
@@ -2256,14 +2493,21 @@
 		return pt;
 	case 10:
 		id_val = (u32*)gf_malloc(sizeof(u32));
-		*id_val = lsr_read_vluimsbf5(lsr, name);
+		if (!id_val) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
+			*id_val = lsr_read_vluimsbf5(lsr, name);
+		}
 		return id_val;
 	case 11:
 	{
 		SVG_FontFamily *ft;
 		u32 idx;
 		GF_SAFEALLOC(ft, SVG_FontFamily);
-		if (!ft) return NULL;
+		if (!ft) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		if (escapeFlag) {
 			ft->type = SVG_FONTFAMILY_INHERIT;
 		} else {
@@ -2276,8 +2520,11 @@
 	}
 	case 12:
 		GF_SAFEALLOC(iri, XMLRI);
-		if (iri)
+		if (!iri) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
 			lsr_read_any_uri(lsr, iri, name);
+		}
 		return iri;
 	default:
 		lsr_read_extension(lsr, name);
@@ -2286,7 +2533,7 @@
 	return NULL;
 }
 
-static void lsr_translate_anim_trans_value(SMIL_AnimateValue *val, u32 transform_type)
+static void lsr_translate_anim_trans_value(GF_LASeRCodec *lsr, SMIL_AnimateValue *val, u32 transform_type)
 {
 	SVG_Point_Angle *p;
 	Fixed *f;
@@ -2312,77 +2559,102 @@
 		val->type = SVG_Transform_datatype;
 		break;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[LSR Parsing] unknown datatype for animate transform.\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[LSR Parsing] unknown datatype for animate transform.\n"));
 		return;
 	}
 	if (!val->value) return;
 	switch (transform_type) {
 	case SVG_TRANSFORM_ROTATE:
-		p = (SVG_Point_Angle*)gf_malloc(sizeof(SVG_Point_Angle));
-		p->x = p->y = 0;
 		if (coded_type==8) {
+			p = (SVG_Point_Angle*)gf_malloc(sizeof(SVG_Point_Angle));
+			if (!p) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				break;
+			}
+			p->x = p->y = 0;
 			GF_List *l = (GF_List *)val->value;
 			f = (Fixed*)gf_list_get(l, 0);
-			if (f) {
-				p->angle = *f;
-				gf_free(f);
-			}
+			if (f) p->angle = *f;
+
 			f = (Fixed*)gf_list_get(l, 1);
-			if (f) {
-				p->x = *f;
-				gf_free(f);
-			}
+			if (f) p->x = *f;
+
 			f = (Fixed*)gf_list_get(l, 2);
-			if (f) {
-				p->y = *f;
+			if (f) p->y = *f;
+
+			while (gf_list_count(l)) {
+				f = gf_list_pop_back(l);
 				gf_free(f);
 			}
 			gf_list_del(l);
-		} else {
+			p->angle = gf_muldiv(p->angle, GF_PI, INT2FIX(180) );
+			val->value = p;
+			return;
+		} else if ((coded_type==1) || (coded_type==4)) {
+			p = (SVG_Point_Angle*)gf_malloc(sizeof(SVG_Point_Angle));
+			if (!p) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				break;
+			}
+			p->x = p->y = 0;
 			p->angle = ((SVG_Number *)val->value)->value;
 			gf_free(val->value);
+			p->angle = gf_muldiv(p->angle, GF_PI, INT2FIX(180) );
+			val->value = p;
+			return;
 		}
-		p->angle = gf_muldiv(p->angle, GF_PI, INT2FIX(180) );
-		val->value = p;
 		break;
 	case SVG_TRANSFORM_SCALE:
 		if (coded_type==8) {
 			SVG_Point *pt;
 			GF_List *l = (GF_List *)val->value;
 			GF_SAFEALLOC(pt , SVG_Point);
-			if (!pt) return;
-			f = (Fixed*)gf_list_get(l, 0);
-			if (f) {
-				pt->x = *f;
-				gf_free(f);
+			if (!pt) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				break;
 			}
+			f = (Fixed*)gf_list_get(l, 0);
+			if (f) pt->x = *f;
 			f = (Fixed*)gf_list_get(l, 1);
-			if (f) {
-				pt->y = *f;
+			if (f) pt->y = *f;
+			else pt->y = pt->x;
+
+			while (gf_list_count(l)) {
+				f = gf_list_pop_back(l);
 				gf_free(f);
 			}
-			else pt->y = pt->x;
 			gf_list_del(l);
 			val->value = pt;
+			return;
 		}
 		break;
 	case SVG_TRANSFORM_SKEWX:
 	case SVG_TRANSFORM_SKEWY:
-		f = (Fixed*)gf_malloc(sizeof(Fixed));
-		*f = ((SVG_Number *)val->value)->value;
-		gf_free(val->value);
-		val->value = f;
+		if ((coded_type==1) || (coded_type==4)) {
+			f = (Fixed*)gf_malloc(sizeof(Fixed));
+			if (!f) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				break;
+			}
+			*f = ((SVG_Number *)val->value)->value;
+			gf_free(val->value);
+			val->value = f;
+			return;
+		}
 		break;
 	}
+	//not handled
+	lsr_delete_anim_value(lsr, val, coded_type);
 }
 
-static void lsr_translate_anim_trans_values(SMIL_AnimateValues *val, u32 transform_type)
+static void lsr_translate_anim_trans_values(GF_LASeRCodec *lsr, SMIL_AnimateValues *val, u32 transform_type)
 {
 	u32 count, i, coded_type;
 	SVG_Point_Angle *p;
 	SVG_Point *pt;
 	Fixed *f;
 	GF_List *l;
+	Bool handled = GF_FALSE;
 
 	coded_type = val->type;
 	switch(transform_type) {
@@ -2390,24 +2662,39 @@
 		val->type = SVG_Transform_Translate_datatype;
 		break;
 	case SVG_TRANSFORM_SCALE:
+		if (coded_type==8) handled = GF_TRUE;
 		val->type = SVG_Transform_Scale_datatype;
 		break;
 	case SVG_TRANSFORM_ROTATE:
+		if ((coded_type==8) || (coded_type==1)) handled = GF_TRUE;
 		val->type = SVG_Transform_Rotate_datatype;
 		break;
 	case SVG_TRANSFORM_SKEWX:
+		if ((coded_type==1) || (coded_type==4)) handled = GF_TRUE;
 		val->type = SVG_Transform_SkewX_datatype;
 		break;
 	case SVG_TRANSFORM_SKEWY:
+		if ((coded_type==1) || (coded_type==4)) handled = GF_TRUE;
 		val->type = SVG_Transform_SkewY_datatype;
 		break;
 	case SVG_TRANSFORM_MATRIX:
 		val->type = SVG_Transform_datatype;
 		break;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] unknown datatype for animate transform.\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[SVG Parsing] unknown datatype for animate transform.\n"));
+		break;
+	}
+
+	if (!handled) {
+		while (gf_list_count(val->values)) {
+			SMIL_AnimateValue a_val;
+			a_val.type = 0;
+			a_val.value = gf_list_pop_back(val->values);
+			lsr_delete_anim_value(lsr, &a_val, coded_type);
+		}
 		return;
 	}
+
 	count = gf_list_count(val->values);
 	if (!count) return;
 
@@ -2419,12 +2706,14 @@
 		switch (transform_type) {
 		case SVG_TRANSFORM_ROTATE:
 			GF_SAFEALLOC(p, SVG_Point_Angle);
-			if (!p) return;
-
+			if (!p) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				return;
+			}
 			if (coded_type==8) {
 				l = (GF_List*)a_val;
 				f = (Fixed*)gf_list_get(l, 0);
-				p->angle = *f;
+				if (f) p->angle = *f;
 				f = (Fixed*)gf_list_get(l, 1);
 				if (f) p->x = *f;
 				f = (Fixed*)gf_list_get(l, 2);
@@ -2446,19 +2735,30 @@
 		case SVG_TRANSFORM_SKEWX:
 		case SVG_TRANSFORM_SKEWY:
 			f = (Fixed*)gf_malloc(sizeof(Fixed));
-			*f = ((SVG_Number *)a_val)->value;
+			if (!f) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				*f = ((SVG_Number *)a_val)->value;
+			}
 			gf_free(a_val);
 			gf_list_rem(val->values, i);
-			gf_list_insert(val->values, f, i);
+			if (f)
+				gf_list_insert(val->values, f, i);
 			break;
 		case SVG_TRANSFORM_SCALE:
 			pt = (SVG_Point*)gf_malloc(sizeof(SVG_Point));
+			if (!pt)
+				lsr->last_error = GF_OUT_OF_MEM;
+
 			l = (GF_List*)a_val;
-			f = (Fixed*)gf_list_get(l, 0);
-			if (f) pt->x = *f;
-			f = (Fixed*)gf_list_get(l, 1);
-			if (f) pt->y = *f;
-			else pt->y = pt->x;
+			if (pt) {
+				f = (Fixed*)gf_list_get(l, 0);
+				if (f) pt->x = *f;
+				f = (Fixed*)gf_list_get(l, 1);
+				if (f) pt->y = *f;
+				else pt->y = pt->x;
+			}
+
 			while (gf_list_count(l)) {
 				f = (Fixed*)gf_list_last(l);
 				gf_list_rem_last(l);
@@ -2466,7 +2766,8 @@
 			}
 			gf_list_del(l);
 			gf_list_rem(val->values, i);
-			gf_list_insert(val->values, pt, i);
+			if (pt)
+				gf_list_insert(val->values, pt, i);
 			break;
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[LASeR] unknown transform type %d\n", transform_type));
@@ -2488,7 +2789,7 @@
 		((SMIL_AnimateValue*)info.far_ptr)->type = coded_type;
 
 		if (tr_type) {
-			lsr_translate_anim_trans_value(info.far_ptr, *tr_type);
+			lsr_translate_anim_trans_value(lsr, info.far_ptr, *tr_type);
 		}
 	}
 }
@@ -2508,15 +2809,16 @@
 
 	GF_LSR_READ_INT(lsr, coded_type, 4, "type");
 	values->type = coded_type;
-	values->laser_strings = 1;
+	values->laser_strings = 0;
 
 	count = lsr_read_vluimsbf5(lsr, "count");
 	for (i=0; i<count; i++) {
 		void *att = lsr_read_an_anim_value(lsr, coded_type, "a_value");
 		if (att) gf_list_add(values->values, att);
+		if (lsr->last_error) return;
 	}
 	if (tr_type) {
-		lsr_translate_anim_trans_values(info.far_ptr, *tr_type);
+		lsr_translate_anim_trans_values(lsr, info.far_ptr, *tr_type);
 	}
 }
 #define lsr_read_anim_value(_a, _b, _c, _d) lsr_read_anim_value_ex(_a, _b, _c, _d, NULL)
@@ -2557,6 +2859,7 @@
 	for (i=0; i<count; i++) {
 		Fixed *f = lsr_read_fraction_12_item(lsr);
 		gf_list_add( *((SMIL_KeyTimes*)info.far_ptr), f);
+		if (lsr->last_error) return;
 	}
 }
 static void lsr_read_float_list(GF_LASeRCodec *lsr, GF_Node *n, u32 tag, SVG_Coordinates*coords, const char *name)
@@ -2580,16 +2883,26 @@
 	if (tag == TAG_SVG_ATT_text_rotate) {
 		for (i=0; i<count; i++) {
 			SVG_Number *num = (SVG_Number *)gf_malloc(sizeof(SVG_Number));
-			num->type = SVG_NUMBER_VALUE;
-			num->value = lsr_read_fixed_16_8(lsr, "val");
-			gf_list_add(*coords, num);
+			if (!num) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				num->type = SVG_NUMBER_VALUE;
+				num->value = lsr_read_fixed_16_8(lsr, "val");
+				gf_list_add(*coords, num);
+			}
+			if (lsr->last_error) return;
 		}
 	}
 	else {
 		for (i=0; i<count; i++) {
 			Fixed *num = (Fixed *)gf_malloc(sizeof(Fixed));
-			*num = lsr_read_fixed_16_8(lsr, "val");
+			if (!num) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				*num = lsr_read_fixed_16_8(lsr, "val");
+			}
 			gf_list_add(*coords, num);
+			if (lsr->last_error) return;
 		}
 	}
 }
@@ -2613,16 +2926,25 @@
 			GF_LSR_READ_INT(lsr, nb_bits, 5, "bits");
 			for (i=0; i<count; i++) {
 				SVG_Point *pt = (SVG_Point *)gf_malloc(sizeof(SVG_Point));
-				gf_list_add(pts, pt);
-				GF_LSR_READ_INT(lsr, v, nb_bits, "x");
-				pt->x = lsr_translate_coords(lsr, v, nb_bits);
-				GF_LSR_READ_INT(lsr, v, nb_bits, "y");
-				pt->y = lsr_translate_coords(lsr, v, nb_bits);
+				if (!pt) {
+					lsr->last_error = GF_OUT_OF_MEM;
+				} else {
+					gf_list_add(pts, pt);
+					GF_LSR_READ_INT(lsr, v, nb_bits, "x");
+					pt->x = lsr_translate_coords(lsr, v, nb_bits);
+					GF_LSR_READ_INT(lsr, v, nb_bits, "y");
+					pt->y = lsr_translate_coords(lsr, v, nb_bits);
+				}
+				if (lsr->last_error) return;
 			}
 		} else {
 			u32 nb_dx, nb_dy, k;
 			Fixed x, y;
 			SVG_Point *pt = (SVG_Point *)gf_malloc(sizeof(SVG_Point));
+			if (!pt) {
+				lsr->last_error = GF_OUT_OF_MEM;
+				return;
+			}
 			gf_list_add(pts, pt);
 
 			GF_LSR_READ_INT(lsr, nb_dx, 5, "bits");
@@ -2635,13 +2957,18 @@
 			GF_LSR_READ_INT(lsr, nb_dy, 5, "bitsy");
 			for (i=1; i<count; i++) {
 				pt = (SVG_Point *)gf_malloc(sizeof(SVG_Point));
-				gf_list_add(pts, pt);
-				GF_LSR_READ_INT(lsr, k, nb_dx, "dx");
-				pt->x = x + lsr_translate_coords(lsr, k, nb_dx);
-				x = pt->x;
-				GF_LSR_READ_INT(lsr, k, nb_dy, "dy");
-				pt->y = y + lsr_translate_coords(lsr, k, nb_dy);
-				y = pt->y;
+				if (!pt) {
+					lsr->last_error = GF_OUT_OF_MEM;
+				} else {
+					gf_list_add(pts, pt);
+					GF_LSR_READ_INT(lsr, k, nb_dx, "dx");
+					pt->x = x + lsr_translate_coords(lsr, k, nb_dx);
+					x = pt->x;
+					GF_LSR_READ_INT(lsr, k, nb_dy, "dy");
+					pt->y = y + lsr_translate_coords(lsr, k, nb_dy);
+					y = pt->y;
+				}
+				if (lsr->last_error) return;
 			}
 		}
 	}
@@ -2741,6 +3068,7 @@
 			gf_path_close(path);
 			break;
 		}
+		if (lsr->last_error) break;
 	}
 	goto exit;
 
@@ -2771,6 +3099,10 @@
 	count = lsr_read_vluimsbf5(lsr, "nbOfTypes");
 	for (i=0; i<count; i++) {
 		u8 *type = (u8 *)gf_malloc(sizeof(u8));
+		if (!type) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return;
+		}
 		GF_LSR_READ_INT(lsr, c, 5, name);
 
 		switch (c) {
@@ -2906,10 +3238,6 @@
 	if (!count) return;
 	count = lsr_read_vluimsbf5(lsr, "nb_coords");
 	if (!count) return;
-	if (count>1000000) {
-		lsr->last_error = GF_NON_COMPLIANT_BITSTREAM;
-		return;
-	}
 
 	lsr->last_error = gf_node_get_attribute_by_tag(elt, tag, GF_TRUE, 0, &info);
 
@@ -2924,6 +3252,7 @@
 		GF_LSR_READ_INT(lsr, res, lsr->coord_bits, name);
 		f->value = lsr_translate_coords(lsr, res, lsr->coord_bits);
 		gf_list_add(*(SVG_Coordinates*)info.far_ptr, f);
+		if (lsr->last_error) return;
 	}
 }
 
@@ -4452,7 +4781,7 @@
 		count = lsr_read_vluimsbf5(lsr, "occ0");
 		for (i=0; i<count; i++) {
 			GF_Node *n;
-			if (lsr->last_error) break;
+			if (lsr->last_error) return;
 			n = lsr_read_scene_content_model(lsr, (SVG_Element*)elt);
 			if (n) {
 				gf_node_register(n, elt);
@@ -4497,18 +4826,23 @@
 static void *lsr_read_update_value_indexed(GF_LASeRCodec *lsr, GF_Node*node, u32 fieldType, void *rep_val, u32 idx, Bool is_insert, Bool is_com, u32 *single_field_type)
 {
 	Fixed *f_val;
-	SVG_Point *pt;
 	SVG_Number num;
 
 	switch (fieldType) {
 	case SVG_Points_datatype/*ITYPE_point*/:
 	{
+		SVG_Point *pt;
 		ListOfXXX *res;
 		GF_SAFEALLOC(res, ListOfXXX);
-		if (!res) return NULL;
+		if (!res) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		*res = gf_list_new();
 		pt = (SVG_Point*)gf_malloc(sizeof(SVG_Point));
-		if (pt) {
+		if (!pt) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
 			lsr_read_coordinate(lsr, &num, 0, "coordX");
 			pt->x = num.value;
 			lsr_read_coordinate(lsr, &num, 0, "coordY");
@@ -4521,10 +4855,15 @@
 	{
 		ListOfXXX *res;
 		GF_SAFEALLOC(res, ListOfXXX);
-		if (!res) return NULL;
+		if (!res) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		*res = gf_list_new();
 		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
-		if (f_val) {
+		if (!f_val) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
 			*f_val = lsr_read_fixed_16_8(lsr, "floatValue");
 			gf_list_add(*res, f_val);
 		}
@@ -4535,15 +4874,18 @@
 		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
 		if (!f_val) {
 			lsr->last_error = GF_OUT_OF_MEM;
-			return NULL;
+		} else {
+			*f_val = lsr_read_fixed_16_8(lsr, "floatValue");
 		}
-		*f_val = lsr_read_fixed_16_8(lsr, "floatValue");
 		return f_val;
 	case SMIL_KeyTimes_datatype/*ITYPE_keyTime*/:
 	{
 		ListOfXXX *res;
 		GF_SAFEALLOC(res, ListOfXXX);
-		if (!res) return NULL;
+		if (!res) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		*res = gf_list_new();
 		f_val = lsr_read_fraction_12_item(lsr);
 		if (f_val) gf_list_add(*res, f_val);
@@ -4553,13 +4895,17 @@
 	{
 		ListOfXXX *res;
 		GF_SAFEALLOC(res, ListOfXXX);
-		if (!res) return NULL;
+		if (!res) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		*res = gf_list_new();
-		pt = (SVG_Point*)gf_malloc(sizeof(SVG_Point));
-		if (pt) {
-			pt->x = lsr_read_fixed_clamp(lsr, "valueX");
-			pt->y = lsr_read_fixed_clamp(lsr, "valueY");
-			gf_list_add(*res, pt);
+		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
+		if (!f_val) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
+			*f_val = lsr_read_fixed_clamp(lsr, "value");
+			gf_list_add(*res, f_val);
 		}
 		return res;
 	}
@@ -4567,9 +4913,16 @@
 	{
 		ListOfXXX *res;
 		GF_SAFEALLOC(res, ListOfXXX);
-		if (!res) return NULL;
+		if (!res) {
+			lsr->last_error = GF_OUT_OF_MEM;
+			return NULL;
+		}
 		*res = gf_list_new();
-		gf_list_add(*res, lsr_read_smil_time(lsr, node) );
+		if (! *res) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
+			gf_list_add(*res, lsr_read_smil_time(lsr, node) );
+		}
 		return res;
 	}
 	default:
@@ -5093,7 +5446,6 @@
 				} else if (idx==-1) {
 					lsr_read_update_value(lsr, (GF_Node*)n, fieldIndex, field_type, info.far_ptr, n->sgprivate->tag);
 				} else {
-					SVG_Point *pt;
 					Fixed *v1, *v2;
 					//SMIL_Time *t;
 					void *prev, *new_item;
@@ -5119,12 +5471,8 @@
 						break;
 					/*list of floats - to check when implementing it...*/
 					case SMIL_KeyPoints_datatype/*ITYPE_0to1 - keyPoints*/:
-						pt = (SVG_Point*) gf_list_pop_front(*(GF_List **)tmp);
-						v1 = (Fixed *) gf_malloc(sizeof(Fixed));
-						*v1 = pt->x;
-						v2 = (Fixed *) gf_malloc(sizeof(Fixed));
-						*v2 = pt->y;
-						gf_free(pt);
+						v1 = (Fixed *) gf_list_pop_front(*(GF_List **)tmp);
+						v2 = (Fixed *) gf_list_pop_front(*(GF_List **)tmp);
 						gf_list_del(*(GF_List **)tmp);
 						gf_free(tmp);
 
@@ -5252,12 +5600,14 @@
 				gf_node_register(field->new_node, NULL);
 				if (att_type>=0) field->fieldIndex = gf_lsr_anim_type_to_attribute(att_type);
 			} else {
+				field->fieldType = SVG_NodeList_datatype;
 				field->field_ptr = &field->node_list;
 				while (count) {
 					GF_Node *new_node = lsr_read_update_content_model(lsr, (SVG_Element *) n);
 					gf_node_register(new_node, NULL);
 					gf_node_list_add_child_last(& field->node_list, new_node, &last);
 					count--;
+					if (lsr->last_error) return lsr->last_error;
 				}
 			}
 		} else {
@@ -5288,6 +5638,7 @@
 						gf_node_register(new_node, n);
 					}
 					count--;
+					if (lsr->last_error) return lsr->last_error;
 				}
 				gf_node_changed(n, NULL);
 			}
@@ -5332,6 +5683,7 @@
 			field->pos = idx;
 			if (att_type>=0) {
 				field->fieldIndex = gf_lsr_anim_type_to_attribute(att_type);
+				if (!com->node) return GF_SG_UNKNOWN_NODE;
 				gf_node_get_field(com->node, field->fieldIndex, &info);
 				field->fieldType = info.fieldType;
 			}
@@ -5441,6 +5793,7 @@
 		GF_LSR_READ_INT(lsr, flag, 1, "reserved");
 
 		lsr_get_attribute_name(lsr);
+		if (lsr->last_error) return lsr->last_error;
 	}
 	lsr_read_byte_align_string(lsr, NULL, "groupID");
 	lsr_read_any_attribute(lsr, NULL, 1);
@@ -5499,7 +5852,11 @@
 			com_list = NULL;
 			up->data_size = s_len;
 			up->data = (char*)gf_malloc(sizeof(char)*s_len);
-			gf_bs_read_data(lsr->bs, up->data, s_len);
+			if (!up->data) {
+				lsr->last_error = GF_OUT_OF_MEM;
+			} else {
+				gf_bs_read_data(lsr->bs, up->data, s_len);
+			}
 			goto exit;
 		}
 		/*memory mode, decode commands*/
@@ -5596,6 +5953,7 @@
 							lsr_read_private_element_container(lsr);
 							break;
 						}
+						if (lsr->last_error) return lsr->last_error;
 					}
 				}
 			}
@@ -5673,13 +6031,17 @@
 
 	if (flag) {
 		count = lsr_read_vluimsbf5(lsr, "count");
+		if (count>gf_bs_available(lsr->bs)) return lsr->last_error = GF_NON_COMPLIANT_BITSTREAM;
 		lsr->col_table = (LSRCol*)gf_realloc(lsr->col_table, sizeof(LSRCol)*(lsr->nb_cols+count));
+		if (!lsr->col_table)
+			return lsr->last_error = GF_OUT_OF_MEM;
 		for (i=0; i<count; i++) {
 			LSRCol c;
 			GF_LSR_READ_INT(lsr, c.r, lsr->info->cfg.colorComponentBits, "red");
 			GF_LSR_READ_INT(lsr, c.g, lsr->info->cfg.colorComponentBits, "green");
 			GF_LSR_READ_INT(lsr, c.b, lsr->info->cfg.colorComponentBits, "blue");
 			lsr->col_table[lsr->nb_cols+i] = c;
+			if (lsr->last_error) return lsr->last_error;
 		}
 		lsr->nb_cols += count;
 	}
@@ -5695,6 +6057,7 @@
 			char *ft = NULL;
 			lsr_read_byte_align_string(lsr, &ft, "font");
 			gf_list_add(lsr->font_table, ft);
+			if (lsr->last_error) return lsr->last_error;
 		}
 	}
 	lsr->fontIndexBits = gf_get_bit_size(count);
@@ -5708,6 +6071,7 @@
 		for (i=0; i<count; i++) {
 			lsr->privateData_id_index++;
 			lsr_read_byte_align_string(lsr, NULL, "privateDataIdentifier");
+			if (lsr->last_error) return lsr->last_error;
 		}
 	}
 	/*
@@ -5736,6 +6100,7 @@
 					lsr_read_byte_align_string(lsr, NULL, "tag");
 				}
 			}
+			if (lsr->last_error) return lsr->last_error;
 		}
 	}
 	/*
@@ -5745,6 +6110,7 @@
 	for (i=0; i<count; i++) {
 		/*u32 locID = */lsr_read_vluimsbf5(lsr, "binaryIdForThisStringID");
 		lsr_read_byte_align_string(lsr, NULL, "stringID");
+		if (lsr->last_error) return lsr->last_error;
 	}
 	GF_LSR_READ_INT(lsr, flag, 1, "hasExtension");
 	if (flag) {
@@ -5755,6 +6121,7 @@
 		for (i=0; i<count; i++) {
 			/*u32 locID = */lsr_read_vluimsbf5(lsr, "localStreamIdForThisGlobal");
 			lsr_read_byte_align_string(lsr, NULL, "globalName");
+			if (lsr->last_error) return lsr->last_error;
 		}
 		pos = gf_bs_get_bit_offset(lsr->bs) - pos;
 		if (len<pos)

gpac-1.0.1.tar.gz/src/laser/lsr_enc.c -> gpac-2.0.0.tar.gz/src/laser/lsr_enc.c Changed

@@ -593,13 +593,19 @@
 {
 	s32 res, max;
 
+	if (!nb_bits) return 0;
+
 	res = FIX2INT( gf_divfix(x, lsr->res_factor) );
 	/*don't loose too much*/
 	if (!res && x) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] resolution factor %g too small to allow coding of %g - adjusting to smallest integer!\n", lsr->res_factor, FIX2FLT(x) ));
 		res = (x>0) ? 1 : -1;
 	}
-	max = (1<<(nb_bits-1)) - 1;
+	if (nb_bits>=32)
+		max = 0xFFFFFFFF;
+	else
+		max = (1<<(nb_bits-1)) - 1;
+
 	if (res>=0) {
 		if (res > max) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] nb_bits %d not large enough to encode positive number %g!\n", nb_bits, FIX2FLT(x) ));
@@ -3708,9 +3714,8 @@
 		break;
 		case SMIL_KeyPoints_datatype:/*0to1*/
 		{
-			SVG_Point *pt = (SVG_Point*)gf_list_get(*(GF_List **)val, 0);
-			lsr_write_fixed_clamp(lsr, pt->x, "value_x");
-			lsr_write_fixed_clamp(lsr, pt->y, "value_y");
+			Fixed *f = (Fixed*)gf_list_get(*(GF_List **)val, 0);
+			lsr_write_fixed_clamp(lsr, *f, "value");
 		}
 		break;
 		case SMIL_KeySplines_datatype:/*float*/

gpac-1.0.1.tar.gz/src/media_tools/ait.c -> gpac-2.0.0.tar.gz/src/media_tools/ait.c Changed

gpac-1.0.1.tar.gz/src/media_tools/av_parsers.c -> gpac-2.0.0.tar.gz/src/media_tools/av_parsers.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre, Romain Bouqueau, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Media Tools sub-project
@@ -33,6 +33,41 @@
 #include <gpac/internal/ogg.h>
 #endif
 
+//uncomment/define globally to remove all bitstream parsing logging from code (this will break inspect mode ananlyze=bs)
+//#define GPAC_DISABLE_AVPARSE_LOGS
+
+#ifndef GPAC_DISABLE_AVPARSE_LOGS
+void gf_bs_log_idx(GF_BitStream *bs, u32 nBits, const char *fname, s64 val, s32 idx1, s32 idx2, s32 idx3);
+
+#define gf_bs_log(_bs, _nBits, _fname, _val) gf_bs_log_idx(_bs, _nBits, _fname, _val, -1, -1, -1)
+
+u32 gf_bs_read_int_log_idx3(GF_BitStream *bs, u32 nBits, const char *fname, s32 idx1, s32 idx2, s32 idx3)
+{
+	u32 val = gf_bs_read_int(bs, nBits);
+	gf_bs_log_idx(bs, nBits, fname, val, idx1, idx2, idx3);
+	return val;
+}
+
+#define gf_bs_read_int_log(_bs, _nBits, _fname) gf_bs_read_int_log_idx3(_bs, _nBits, _fname, -1, -1, -1)
+#define gf_bs_read_int_log_idx(_bs, _nBits, _fname, _idx) gf_bs_read_int_log_idx3(_bs, _nBits, _fname, _idx, -1, -1)
+#define gf_bs_read_int_log_idx2(_bs, _nBits, _fname, _idx1, _idx2) gf_bs_read_int_log_idx3(_bs, _nBits, _fname, (s32) _idx1, (s32) _idx2, -1)
+
+
+#else
+
+#define gf_bs_log(_bs, _nBits, _fname, _val)
+#define gf_bs_log_idx(_bs, _nBits, _fname, _val, _idx1, _idx2, _idx3)
+
+#define gf_bs_read_int_log(_bs, _nbb, _f) gf_bs_read_int(_bs, _nbb)
+#define gf_bs_read_int_log_idx(_bs, _nbb, _f, _idx) gf_bs_read_int(_bs, _nbb)
+#define gf_bs_read_int_log_idx2(_bs, _nbb, _f, _idx1, _idx2) gf_bs_read_int(_bs, _nbb)
+#define gf_bs_read_int_log_idx3(_bs, _nbb, _f, _idx1, _idx2, _idx3) gf_bs_read_int(_bs, _nbb)
+
+#endif
+
+
+
+
 static const struct {
 	u32 w, h;
 } std_par[] =
@@ -55,6 +90,18 @@
 		}
 		i++;
 	}
+	//not standard one, reduce by power of 2
+	i = 2;
+	while (1) {
+		if (w <= i) return;
+		if (h <= i) return;
+
+		if (w % i) return;
+		if (h % i) return;
+		*width = w / i;
+		*height = h / i;
+		i *= 2;
+	}
 }
 
 GF_EXPORT
@@ -440,7 +487,9 @@
 			gf_bs_read_data(m4v->bs, (char *)p, 4);
 			ext_type = ((p[0] >> 4) & 0xf);
 			if (ext_type == 1) {
-				dsi->VideoPL = 0x65;
+				dsi->VideoPL = (p[0]&0xf) | ((p[1] >> 4) & 0xf);
+				dsi->progresive = (p[1] & 0x8) ? 1 : 0;
+				dsi->chroma_fmt = (p[1]>>1) & 0x3;
 				dsi->height = ((p[1] & 0x1) << 13) | ((p[2] & 0x80) << 5) | (dsi->height & 0x0fff);
 				dsi->width = (((p[2] >> 5) & 0x3) << 12) | (dsi->width & 0x0fff);
 			}
@@ -457,7 +506,6 @@
 			break;
 		}
 	}
-	M4V_Reset(m4v, 0);
 	return GF_OK;
 }
 
@@ -500,7 +548,8 @@
 		dsi->par_den = m4v_sar[par].h;
 	}
 	if (gf_bs_read_int(m4v->bs, 1)) {
-		gf_bs_read_int(m4v->bs, 3);
+		dsi->chroma_fmt = gf_bs_read_int(m4v->bs, 2);
+		gf_bs_read_int(m4v->bs, 1);
 		if (gf_bs_read_int(m4v->bs, 1)) gf_bs_read_int(m4v->bs, 79);
 	}
 	dsi->has_shape = gf_bs_read_int(m4v->bs, 2);
@@ -528,14 +577,16 @@
 		dsi->time_increment = gf_bs_read_int(m4v->bs, dsi->NumBitsTimeIncrement);
 	}
 	if (!dsi->has_shape) {
-		gf_bs_read_int(m4v->bs, 1);
+		gf_bs_read_int(m4v->bs, 1); //marker bit
 		dsi->width = gf_bs_read_int(m4v->bs, 13);
-		gf_bs_read_int(m4v->bs, 1);
+		gf_bs_read_int(m4v->bs, 1); //marker bit
 		dsi->height = gf_bs_read_int(m4v->bs, 13);
+		gf_bs_read_int(m4v->bs, 1); //marker bit
+		dsi->progresive = !gf_bs_read_int(m4v->bs, 1);
 	} else {
 		dsi->width = dsi->height = 0;
 	}
-
+	gf_bs_align(m4v->bs);
 }
 
 static GF_Err gf_m4v_parse_config_mpeg4(GF_M4VParser *m4v, GF_M4VDecSpecInfo *dsi)
@@ -601,12 +652,12 @@
 	firstObj = 1;
 	hasVOP = 0;
 	*is_coded = GF_FALSE;
-	m4v->current_object_type = (u32)-1;
 	*frame_type = 0;
 
 	if (!m4v->step_mode)
 		M4V_Reset(m4v, m4v->current_object_start);
 
+	m4v->current_object_type = (u32)-1;
 	go = 1;
 	while (go) {
 		o_type = M4V_LoadObject(m4v);
@@ -932,7 +983,9 @@
 	{33, "MPEG-1 Audio Layer-2"},
 	{34, "MPEG-1 Audio Layer-3"},
 	{35, "MPEG-4 Audio DST"},
-	{36, "MPEG-4 Audio ALS"}
+	{36, "MPEG-4 Audio ALS"},
+	{37, "MPEG-4 Audio SLS"},
+	{42, "MPEG Audio xHE-AAC"},
 };
 
 GF_EXPORT
@@ -1010,6 +1063,8 @@
 	{0x38, "Baseline MPEG Surround Profile @ Level 4"},
 	{0x39, "Baseline MPEG Surround Profile @ Level 5"},
 	{0x3A, "Baseline MPEG Surround Profile @ Level 6"},
+	{0x3B, "High Definition AAC Profile @ Level 1"},
+	{0x3C, "ALS Simple Profile @ Level 1"},
 	{0x50, "AAC Profile @ Level 6"},
 	{0x51, "AAC Profile @ Level 7"},
 	{0x52, "High Efficiency AAC Profile @ Level 6"},
@@ -1064,50 +1119,120 @@
 	}
 }
 
+GF_EXPORT
+GF_Err gf_m4a_parse_program_config_element(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg)
+{
+	u32 i;
+
+	cfg->program_config_element_present = 1;
+	cfg->cpe_channels = 0;
+
+	cfg->element_instance_tag = gf_bs_read_int_log(bs, 4, "element_instance_tag");
+	cfg->object_type = gf_bs_read_int_log(bs, 2, "object_type");
+	cfg->sampling_frequency_index = gf_bs_read_int_log(bs, 4, "sampling_frequency_index");
+	cfg->num_front_channel_elements = gf_bs_read_int_log(bs, 4, "num_front_channel_elements");
+	cfg->num_side_channel_elements = gf_bs_read_int_log(bs, 4, "num_side_channel_elements");
+	cfg->num_back_channel_elements = gf_bs_read_int_log(bs, 4, "num_back_channel_elements");
+	cfg->num_lfe_channel_elements = gf_bs_read_int_log(bs, 2, "num_lfe_channel_elements");
+	cfg->num_assoc_data_elements = gf_bs_read_int_log(bs, 3, "num_assoc_data_elements");
+	cfg->num_valid_cc_elements = gf_bs_read_int_log(bs, 4, "num_valid_cc_elements");
+	cfg->mono_mixdown_present = (Bool)gf_bs_read_int_log(bs, 1, "mono_mixdown_present");
+	if (cfg->mono_mixdown_present) {
+		cfg->mono_mixdown_element_number = gf_bs_read_int_log(bs, 4, "mono_mixdown_element_number");
+	}
+	cfg->stereo_mixdown_present = gf_bs_read_int_log(bs, 1, "stereo_mixdown_present");
+	if (cfg->stereo_mixdown_present) {
+		cfg->stereo_mixdown_element_number = gf_bs_read_int_log(bs, 4, "stereo_mixdown_element_number");
+	}
+	cfg->matrix_mixdown_idx_present = gf_bs_read_int_log(bs, 1, "matrix_mixdown_idx_present");
+	if (cfg->matrix_mixdown_idx_present) {
+		cfg->matrix_mixdown_idx = gf_bs_read_int_log(bs, 2, "matrix_mixdown_idx");
+		cfg->pseudo_surround_enable = gf_bs_read_int_log(bs, 1, "pseudo_surround_enable");
+	}
+	for (i = 0; i < cfg->num_front_channel_elements; i++) {
+		cfg->front_element_is_cpe[i] = gf_bs_read_int_log_idx(bs, 1, "front_element_is_cpe", i);
+		cfg->front_element_tag_select[i] = gf_bs_read_int_log_idx(bs, 4, "front_element_tag_select", i);
+		if (cfg->front_element_is_cpe[i]) cfg->cpe_channels++;
+	}
+	for (i = 0; i < cfg->num_side_channel_elements; i++) {
+		cfg->side_element_is_cpe[i] = gf_bs_read_int_log_idx(bs, 1, "side_element_is_cpe", i);
+		cfg->side_element_tag_select[i] = gf_bs_read_int_log_idx(bs, 4, "side_element_tag_select", i);
+		if (cfg->side_element_is_cpe[i]) cfg->cpe_channels++;
+	}
+	for (i = 0; i < cfg->num_back_channel_elements; i++) {
+		cfg->back_element_is_cpe[i] = gf_bs_read_int_log_idx(bs, 1, "back_element_is_cpe", i);
+		cfg->back_element_tag_select[i] = gf_bs_read_int_log_idx(bs, 4, "back_element_tag_select", i);
+		if (cfg->back_element_is_cpe[i]) cfg->cpe_channels++;
+	}
+	for (i = 0; i < cfg->num_lfe_channel_elements; i++) {
+		cfg->lfe_element_tag_select[i] = gf_bs_read_int_log_idx(bs, 4, "lfe_element_tag_select", i);
+	}
+	for (i = 0; i < cfg->num_assoc_data_elements; i++) {
+		cfg->assoc_data_element_tag_select[i] = gf_bs_read_int_log_idx(bs, 4, "assoc_data_element_tag_select", i);
+	}
+
+	for (i = 0; i < cfg->num_valid_cc_elements; i++) {
+		cfg->cc_element_is_ind_sw[i] = gf_bs_read_int_log_idx(bs, 1, "cc_element_is_ind_sw", i);
+		cfg->valid_cc_element_tag_select[i] = gf_bs_read_int_log_idx(bs, 4, "valid_cc_element_tag_select", i);
+	}
+	gf_bs_align(bs);
+	cfg->comment_field_bytes = gf_bs_read_int_log(bs, 8, "comment_field_bytes");
+	gf_bs_read_data(bs, (char *)cfg->comments, cfg->comment_field_bytes);
+
+	cfg->nb_chan = cfg->num_front_channel_elements + cfg->num_back_channel_elements + cfg->num_side_channel_elements + cfg->num_lfe_channel_elements;
+	cfg->nb_chan += cfg->cpe_channels;
 
+	return GF_OK;
+}
 
 GF_EXPORT
 GF_Err gf_m4a_parse_config(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg, Bool size_known)
 {
-	u32 channel_configuration = 0;
+	u32 audio_obj_type;
 	memset(cfg, 0, sizeof(GF_M4ADecSpecInfo));
-	cfg->base_object_type = gf_bs_read_int(bs, 5);
+	cfg->base_object_type = gf_bs_read_int_log(bs, 5, "base_object_type");
 	/*extended object type*/
 	if (cfg->base_object_type == 31) {
-		cfg->base_object_type = 32 + gf_bs_read_int(bs, 6);
+		cfg->base_object_type = 32 + gf_bs_read_int_log(bs, 6, "extended_base_object_type");
 	}
-	cfg->base_sr_index = gf_bs_read_int(bs, 4);
+	cfg->base_sr_index = gf_bs_read_int_log(bs, 4, "base_samplerate_index");
 	if (cfg->base_sr_index == 0x0F) {
-		cfg->base_sr = gf_bs_read_int(bs, 24);
+		cfg->base_sr = gf_bs_read_int_log(bs, 24, "base_samplerate");
 	}
 	else {
 		cfg->base_sr = GF_M4ASampleRates[cfg->base_sr_index];
 	}
 
-	channel_configuration = gf_bs_read_int(bs, 4);
-
-	if (channel_configuration) {
-		cfg->nb_chan = GF_M4ANumChannels[channel_configuration - 1];
+	cfg->chan_cfg = gf_bs_read_int_log(bs, 4, "channel_configuration");
+	if (cfg->chan_cfg) {
+		cfg->nb_chan = GF_M4ANumChannels[cfg->chan_cfg - 1];
 	}
 
+	audio_obj_type = cfg->base_object_type;
 	if (cfg->base_object_type == 5 || cfg->base_object_type == 29) {
 		if (cfg->base_object_type == 29) {
 			cfg->has_ps = 1;
 			cfg->nb_chan = 1;
 		}
 		cfg->has_sbr = GF_TRUE;
-		cfg->sbr_sr_index = gf_bs_read_int(bs, 4);
+		cfg->sbr_sr_index = gf_bs_read_int_log(bs, 4, "sbr_samplerate_index");
 		if (cfg->sbr_sr_index == 0x0F) {
-			cfg->sbr_sr = gf_bs_read_int(bs, 24);
+			cfg->sbr_sr = gf_bs_read_int_log(bs, 24, "sbr_samplerate");
 		}
 		else {
 			cfg->sbr_sr = GF_M4ASampleRates[cfg->sbr_sr_index];
 		}
-		cfg->sbr_object_type = gf_bs_read_int(bs, 5);
+		cfg->sbr_object_type = gf_bs_read_int_log(bs, 5, "sbr_object_type");
+		if (cfg->sbr_object_type==31)
+			cfg->sbr_object_type = 32 + gf_bs_read_int_log(bs, 6, "audioObjectTypeExt");
+		audio_obj_type = cfg->sbr_object_type;
+		if (cfg->sbr_object_type==22) {
+			/*ext_chan_cfg = */gf_bs_read_int_log(bs, 4, "channel_configuration");
+		}
 	}
 
 	/*object cfg*/
-	switch (cfg->base_object_type) {
+	switch (audio_obj_type) {
 	case 1:
 	case 2:
 	case 3:
@@ -1120,98 +1245,42 @@
 	case 21:
 	case 22:
 	case 23:
+	case 42:
 	{
 		Bool ext_flag;
-		/*frame length flag*/
-		/*fl_flag = */gf_bs_read_int(bs, 1);
-		/*depends on core coder*/
-		if (gf_bs_read_int(bs, 1))
-			/*delay = */gf_bs_read_int(bs, 14);
-		ext_flag = gf_bs_read_int(bs, 1);
-
-		if (!channel_configuration) {
-			u32 i, cpe_channels=0;
-			cfg->program_config_element_present = 1;
-			cfg->element_instance_tag = gf_bs_read_int(bs, 4);
-			cfg->object_type = gf_bs_read_int(bs, 2);
-			cfg->sampling_frequency_index = gf_bs_read_int(bs, 4);
-			cfg->num_front_channel_elements = gf_bs_read_int(bs, 4);
-			cfg->num_side_channel_elements = gf_bs_read_int(bs, 4);
-			cfg->num_back_channel_elements = gf_bs_read_int(bs, 4);
-			cfg->num_lfe_channel_elements = gf_bs_read_int(bs, 2);
-			cfg->num_assoc_data_elements = gf_bs_read_int(bs, 3);
-			cfg->num_valid_cc_elements = gf_bs_read_int(bs, 4);
-			cfg->mono_mixdown_present = (Bool)gf_bs_read_int(bs, 1);
-			if (cfg->mono_mixdown_present) {
-				cfg->mono_mixdown_element_number = gf_bs_read_int(bs, 4);
-			}
-			cfg->stereo_mixdown_present = gf_bs_read_int(bs, 1);
-			if (cfg->stereo_mixdown_present) {
-				cfg->stereo_mixdown_element_number = gf_bs_read_int(bs, 4);
-			}
-			cfg->matrix_mixdown_idx_present = gf_bs_read_int(bs, 1);
-			if (cfg->matrix_mixdown_idx_present) {
-				cfg->matrix_mixdown_idx = gf_bs_read_int(bs, 2);
-				cfg->pseudo_surround_enable = gf_bs_read_int(bs, 1);
-			}
-			for (i = 0; i < cfg->num_front_channel_elements; i++) {
-				cfg->front_element_is_cpe[i] = gf_bs_read_int(bs, 1);
-				cfg->front_element_tag_select[i] = gf_bs_read_int(bs, 4);
-				if (cfg->front_element_is_cpe[i]) cpe_channels++;
-			}
-			for (i = 0; i < cfg->num_side_channel_elements; i++) {
-				cfg->side_element_is_cpe[i] = gf_bs_read_int(bs, 1);
-				cfg->side_element_tag_select[i] = gf_bs_read_int(bs, 4);
-				if (cfg->side_element_is_cpe[i]) cpe_channels++;
-			}
-			for (i = 0; i < cfg->num_back_channel_elements; i++) {
-				cfg->back_element_is_cpe[i] = gf_bs_read_int(bs, 1);
-				cfg->back_element_tag_select[i] = gf_bs_read_int(bs, 4);
-				if (cfg->back_element_is_cpe[i]) cpe_channels++;
-			}
-			for (i = 0; i < cfg->num_lfe_channel_elements; i++) {
-				cfg->lfe_element_tag_select[i] = gf_bs_read_int(bs, 4);
-			}
-			for (i = 0; i < cfg->num_assoc_data_elements; i++) {
-				cfg->assoc_data_element_tag_select[i] = gf_bs_read_int(bs, 4);
-			}
-
-			for (i = 0; i < cfg->num_valid_cc_elements; i++) {
-				cfg->cc_element_is_ind_sw[i] = gf_bs_read_int(bs, 1);
-				cfg->valid_cc_element_tag_select[i] = gf_bs_read_int(bs, 4);
-			}
-			gf_bs_align(bs);
-			cfg->comment_field_bytes = gf_bs_read_int(bs, 8);
-			gf_bs_read_data(bs, (char *)cfg->comments, cfg->comment_field_bytes);
+		gf_bs_read_int_log(bs, 1, "frame_length_flag");
+		if (gf_bs_read_int_log(bs, 1, "depends_on_core_coder"))
+			gf_bs_read_int_log(bs, 14, "delay");
+		ext_flag = gf_bs_read_int_log(bs, 1, "extension_flag");
 
-			cfg->nb_chan = cfg->num_front_channel_elements + cfg->num_back_channel_elements + cfg->num_side_channel_elements + cfg->num_lfe_channel_elements;
-			cfg->nb_chan += cpe_channels;
+		if (!cfg->chan_cfg) {
+			gf_m4a_parse_program_config_element(bs, cfg);
 		}
 
 		if ((cfg->base_object_type == 6) || (cfg->base_object_type == 20)) {
-			gf_bs_read_int(bs, 3);
+			gf_bs_read_int_log(bs, 3, "layerN");
 		}
 		if (ext_flag) {
 			if (cfg->base_object_type == 22) {
-				gf_bs_read_int(bs, 5);
-				gf_bs_read_int(bs, 11);
+				gf_bs_read_int_log(bs, 5, "numOfSubFrame");
+				gf_bs_read_int_log(bs, 11, "layer_length");
 			}
 			if ((cfg->base_object_type == 17)
 				|| (cfg->base_object_type == 19)
 				|| (cfg->base_object_type == 20)
 				|| (cfg->base_object_type == 23)
-				) {
-				gf_bs_read_int(bs, 1);
-				gf_bs_read_int(bs, 1);
-				gf_bs_read_int(bs, 1);
+			) {
+				gf_bs_read_int_log(bs, 1, "aacSectionDataResilienceFlag");
+				gf_bs_read_int_log(bs, 1, "aacScalefactorDataResilienceFlag");
+				gf_bs_read_int_log(bs, 1, "aacSpectralDataResilienceFlag");
 			}
-			/*ext_flag = */gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log(bs, 1, "extensionFlag3");
 		}
 	}
 	break;
 	}
 	/*ER cfg*/
-	switch (cfg->base_object_type) {
+	switch (audio_obj_type) {
 	case 17:
 	case 19:
 	case 20:
@@ -1223,11 +1292,11 @@
 	case 26:
 	case 27:
 	{
-		u32 epConfig = gf_bs_read_int(bs, 2);
+		u32 epConfig = gf_bs_read_int_log(bs, 2, "epConfig");
 		if ((epConfig == 2) || (epConfig == 3)) {
 		}
 		if (epConfig == 3) {
-			gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log(bs, 1, "directMapping");
 		}
 	}
 	break;
@@ -1237,13 +1306,13 @@
 		while (gf_bs_available(bs) >= 2) {
 			u32 sync = gf_bs_peek_bits(bs, 11, 0);
 			if (sync == 0x2b7) {
-				gf_bs_read_int(bs, 11);
-				cfg->sbr_object_type = gf_bs_read_int(bs, 5);
-				cfg->has_sbr = gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 11, "syncExtensionType");
+				cfg->sbr_object_type = gf_bs_read_int_log(bs, 5, "extensionAudioObjectType ");
+				cfg->has_sbr = gf_bs_read_int_log(bs, 1, "sbrPresentFlag");
 				if (cfg->has_sbr) {
-					cfg->sbr_sr_index = gf_bs_read_int(bs, 4);
+					cfg->sbr_sr_index = gf_bs_read_int_log(bs, 4, "extensionSamplingFrequencyIndex");
 					if (cfg->sbr_sr_index == 0x0F) {
-						cfg->sbr_sr = gf_bs_read_int(bs, 24);
+						cfg->sbr_sr = gf_bs_read_int_log(bs, 24, "extensionSamplingFrequency");
 					}
 					else {
 						cfg->sbr_sr = GF_M4ASampleRates[cfg->sbr_sr_index];
@@ -1251,8 +1320,8 @@
 				}
 			}
 			else if (sync == 0x548) {
-				gf_bs_read_int(bs, 11);
-				cfg->has_ps = gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 11, "syncExtensionType");
+				cfg->has_ps = gf_bs_read_int_log(bs, 1, "hasParametricStereo");
 				if (cfg->has_ps)
 					cfg->nb_chan = 1;
 			}
@@ -1299,6 +1368,61 @@
 }
 
 GF_EXPORT
+GF_Err gf_m4a_write_program_config_element_bs(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg)
+{
+	u32 i;
+	gf_bs_write_int(bs, cfg->element_instance_tag, 4);
+	gf_bs_write_int(bs, cfg->object_type, 2);
+	gf_bs_write_int(bs, cfg->sampling_frequency_index, 4);
+	gf_bs_write_int(bs, cfg->num_front_channel_elements, 4);
+	gf_bs_write_int(bs, cfg->num_side_channel_elements, 4);
+	gf_bs_write_int(bs, cfg->num_back_channel_elements, 4);
+	gf_bs_write_int(bs, cfg->num_lfe_channel_elements, 2);
+	gf_bs_write_int(bs, cfg->num_assoc_data_elements, 3);
+	gf_bs_write_int(bs, cfg->num_valid_cc_elements, 4);
+	gf_bs_write_int(bs, cfg->mono_mixdown_present, 1);
+	if (cfg->mono_mixdown_present) {
+		gf_bs_write_int(bs, cfg->mono_mixdown_element_number, 4);
+	}
+	gf_bs_write_int(bs, cfg->stereo_mixdown_present, 1);
+	if (cfg->stereo_mixdown_present) {
+		gf_bs_write_int(bs, cfg->stereo_mixdown_element_number, 4);
+	}
+	gf_bs_write_int(bs, cfg->matrix_mixdown_idx_present, 1);
+	if (cfg->matrix_mixdown_idx_present) {
+		gf_bs_write_int(bs, cfg->matrix_mixdown_idx, 2);
+		gf_bs_write_int(bs, cfg->pseudo_surround_enable, 1);
+	}
+	for (i = 0; i < cfg->num_front_channel_elements; i++) {
+		gf_bs_write_int(bs, cfg->front_element_is_cpe[i], 1);
+		gf_bs_write_int(bs, cfg->front_element_tag_select[i], 4);
+	}
+	for (i = 0; i < cfg->num_side_channel_elements; i++) {
+		gf_bs_write_int(bs, cfg->side_element_is_cpe[i], 1);
+		gf_bs_write_int(bs, cfg->side_element_tag_select[i], 4);
+	}
+	for (i = 0; i < cfg->num_back_channel_elements; i++) {
+		gf_bs_write_int(bs, cfg->back_element_is_cpe[i], 1);
+		gf_bs_write_int(bs, cfg->back_element_tag_select[i], 4);
+	}
+	for (i = 0; i < cfg->num_lfe_channel_elements; i++) {
+		gf_bs_write_int(bs, cfg->lfe_element_tag_select[i], 4);
+	}
+	for (i = 0; i < cfg->num_assoc_data_elements; i++) {
+		gf_bs_write_int(bs, cfg->assoc_data_element_tag_select[i], 4);
+	}
+
+	for (i = 0; i < cfg->num_valid_cc_elements; i++) {
+		gf_bs_write_int(bs, cfg->cc_element_is_ind_sw[i], 1);
+		gf_bs_write_int(bs, cfg->valid_cc_element_tag_select[i], 4);
+	}
+	gf_bs_align(bs);
+	gf_bs_write_int(bs, cfg->comment_field_bytes, 8);
+	gf_bs_write_data(bs, (char *)cfg->comments, cfg->comment_field_bytes);
+	return GF_OK;
+}
+
+GF_EXPORT
 GF_Err gf_m4a_write_config_bs(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg)
 {
 	if (!cfg->base_sr_index) {
@@ -1331,9 +1455,13 @@
 
 	if (cfg->program_config_element_present) {
 		gf_bs_write_int(bs, 0, 4);
-	}
-	else {
-		gf_bs_write_int(bs, gf_m4a_get_channel_cfg(cfg->nb_chan), 4);
+	} else {
+		cfg->chan_cfg = gf_m4a_get_channel_cfg(cfg->nb_chan);
+		if (!cfg->chan_cfg) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AAC] Cannot write decoder config, ProgramConfigElement is missing and channel configuration is not a predefined one !\n"));
+			return GF_BAD_PARAM;
+		}
+		gf_bs_write_int(bs, cfg->chan_cfg, 4);
 	}
 
 	if (cfg->base_object_type == 5 || cfg->base_object_type == 29) {
@@ -1363,6 +1491,7 @@
 	case 21:
 	case 22:
 	case 23:
+	case 42:
 	{
 		/*frame length flag*/
 		gf_bs_write_int(bs, 0, 1);
@@ -1372,55 +1501,7 @@
 		gf_bs_write_int(bs, 0, 1);
 
 		if (cfg->program_config_element_present) {
-			u32 i;
-			gf_bs_write_int(bs, cfg->element_instance_tag, 4);
-			gf_bs_write_int(bs, cfg->object_type, 2);
-			gf_bs_write_int(bs, cfg->sampling_frequency_index, 4);
-			gf_bs_write_int(bs, cfg->num_front_channel_elements, 4);
-			gf_bs_write_int(bs, cfg->num_side_channel_elements, 4);
-			gf_bs_write_int(bs, cfg->num_back_channel_elements, 4);
-			gf_bs_write_int(bs, cfg->num_lfe_channel_elements, 2);
-			gf_bs_write_int(bs, cfg->num_assoc_data_elements, 3);
-			gf_bs_write_int(bs, cfg->num_valid_cc_elements, 4);
-			gf_bs_write_int(bs, cfg->mono_mixdown_present, 1);
-			if (cfg->mono_mixdown_present) {
-				gf_bs_write_int(bs, cfg->mono_mixdown_element_number, 4);
-			}
-			gf_bs_write_int(bs, cfg->stereo_mixdown_present, 1);
-			if (cfg->stereo_mixdown_present) {
-				gf_bs_write_int(bs, cfg->stereo_mixdown_element_number, 4);
-			}
-			gf_bs_write_int(bs, cfg->matrix_mixdown_idx_present, 1);
-			if (cfg->matrix_mixdown_idx_present) {
-				gf_bs_write_int(bs, cfg->matrix_mixdown_idx, 2);
-				gf_bs_write_int(bs, cfg->pseudo_surround_enable, 1);
-			}
-			for (i = 0; i < cfg->num_front_channel_elements; i++) {
-				gf_bs_write_int(bs, cfg->front_element_is_cpe[i], 1);
-				gf_bs_write_int(bs, cfg->front_element_tag_select[i], 4);
-			}
-			for (i = 0; i < cfg->num_side_channel_elements; i++) {
-				gf_bs_write_int(bs, cfg->side_element_is_cpe[i], 1);
-				gf_bs_write_int(bs, cfg->side_element_tag_select[i], 4);
-			}
-			for (i = 0; i < cfg->num_back_channel_elements; i++) {
-				gf_bs_write_int(bs, cfg->back_element_is_cpe[i], 1);
-				gf_bs_write_int(bs, cfg->back_element_tag_select[i], 4);
-			}
-			for (i = 0; i < cfg->num_lfe_channel_elements; i++) {
-				gf_bs_write_int(bs, cfg->lfe_element_tag_select[i], 4);
-			}
-			for (i = 0; i < cfg->num_assoc_data_elements; i++) {
-				gf_bs_write_int(bs, cfg->assoc_data_element_tag_select[i], 4);
-			}
-
-			for (i = 0; i < cfg->num_valid_cc_elements; i++) {
-				gf_bs_write_int(bs, cfg->cc_element_is_ind_sw[i], 1);
-				gf_bs_write_int(bs, cfg->valid_cc_element_tag_select[i], 4);
-			}
-			gf_bs_align(bs);
-			gf_bs_write_int(bs, cfg->comment_field_bytes, 8);
-			gf_bs_write_data(bs, (char *)cfg->comments, cfg->comment_field_bytes);
+			gf_m4a_write_program_config_element_bs(bs, cfg);
 		}
 
 		if ((cfg->base_object_type == 6) || (cfg->base_object_type == 20)) {
@@ -1431,24 +1512,7 @@
 	}
 	/*ER cfg - not supported*/
 
-	/*implicit sbr - not used yet*/
-#if 0
-	if ((cfg->base_object_type != 5) && (cfg->base_object_type != 29)) {
-		gf_bs_write_int(bs, 0x2b7, 11);
-		cfg->sbr_object_type = gf_bs_read_int(bs, 5);
-		cfg->has_sbr = gf_bs_read_int(bs, 1);
-		if (cfg->has_sbr) {
-			cfg->sbr_sr_index = gf_bs_read_int(bs, 4);
-			if (cfg->sbr_sr_index == 0x0F) {
-				cfg->sbr_sr = gf_bs_read_int(bs, 24);
-			}
-			else {
-				cfg->sbr_sr = GF_M4ASampleRates[cfg->sbr_sr_index];
-			}
-		}
-	}
-#endif
-
+	/*implicit sbr/ps signaling not written here, cf reframe_adts*/
 	return GF_OK;
 }
 
@@ -1465,26 +1529,34 @@
 
 /*AV1 parsing*/
 
-static u32 av1_read_ns(GF_BitStream *bs, u32 n)
+static u32 av1_read_ns(GF_BitStream *bs, u32 n, const char *fname)
 {
-	u32 v;
+	u32 v, res;
 	Bool extra_bit;
 	int w = (u32)(log(n) / log(2)) + 1;
 	u32 m = (1 << w) - n;
 	assert(w < 32);
 	v = gf_bs_read_int(bs, w - 1);
-	if (v < m)
+	if (v < m) {
+		if (fname) {
+			gf_bs_log(bs, w-1, fname, v);
+		}
 		return v;
+	}
 	extra_bit = gf_bs_read_int(bs, 1);
-	return (v << 1) - m + extra_bit;
+	res = (v << 1) - m + extra_bit;
+	if (fname) {
+		gf_bs_log(bs, w, fname, res);
+	}
+	return res;
 }
 
 static void av1_color_config(GF_BitStream *bs, AV1State *state)
 {
-	state->config->high_bitdepth = gf_bs_read_int(bs, 1);
+	state->config->high_bitdepth = gf_bs_read_int_log(bs, 1, "high_bitdepth");
 	state->bit_depth = 8;
 	if (state->config->seq_profile == 2 && state->config->high_bitdepth) {
-		state->config->twelve_bit = gf_bs_read_int(bs, 1);
+		state->config->twelve_bit = gf_bs_read_int_log(bs, 1, "twelve_bit");
 		state->bit_depth = state->config->twelve_bit ? 12 : 10;
 	}
 	else if (state->config->seq_profile <= 2) {
@@ -1496,14 +1568,14 @@
 		state->config->monochrome = GF_FALSE;
 	}
 	else {
-		state->config->monochrome = gf_bs_read_int(bs, 1);
+		state->config->monochrome = gf_bs_read_int_log(bs, 1, "monochrome");
 	}
 	/*NumPlanes = mono_chrome ? 1 : 3;*/
-	state->color_description_present_flag = gf_bs_read_int(bs, 1);
+	state->color_description_present_flag = gf_bs_read_int_log(bs, 1, "color_description_present_flag");
 	if (state->color_description_present_flag) {
-		state->color_primaries = gf_bs_read_int(bs, 8);
-		state->transfer_characteristics = gf_bs_read_int(bs, 8);
-		state->matrix_coefficients = gf_bs_read_int(bs, 8);
+		state->color_primaries = gf_bs_read_int_log(bs, 8, "color_primaries");
+		state->transfer_characteristics = gf_bs_read_int_log(bs, 8, "transfer_characteristics");
+		state->matrix_coefficients = gf_bs_read_int_log(bs, 8, "matrix_coefficients");
 	}
 	else {
 		state->color_primaries = 2/*CP_UNSPECIFIED*/;
@@ -1511,7 +1583,7 @@
 		state->matrix_coefficients = 2/*MC_UNSPECIFIED*/;
 	}
 	if (state->config->monochrome) {
-		state->color_range = gf_bs_read_int(bs, 1);
+		state->color_range = gf_bs_read_int_log(bs, 1, "color_range");
 		state->config->chroma_subsampling_x = GF_TRUE;
 		state->config->chroma_subsampling_y = GF_TRUE;
 		state->config->chroma_sample_position = 0/*CSP_UNKNOWN*/;
@@ -1529,7 +1601,7 @@
 		state->config->chroma_subsampling_x = GF_FALSE;
 		state->config->chroma_subsampling_y = GF_FALSE;
 
-		state->color_range = gf_bs_read_int(bs, 1);
+		state->color_range = gf_bs_read_int_log(bs, 1, "color_range");
 		if (state->config->seq_profile == 0) {
 			state->config->chroma_subsampling_x = GF_TRUE;
 			state->config->chroma_subsampling_y = GF_TRUE;
@@ -1540,9 +1612,9 @@
 		}
 		else {
 			if (state->bit_depth == 12) {
-				state->config->chroma_subsampling_x = gf_bs_read_int(bs, 1);
+				state->config->chroma_subsampling_x = gf_bs_read_int_log(bs, 1, "chroma_subsampling_x");
 				if (state->config->chroma_subsampling_x)
-					state->config->chroma_subsampling_y = gf_bs_read_int(bs, 1);
+					state->config->chroma_subsampling_y = gf_bs_read_int_log(bs, 1, "chroma_subsampling_y");
 				else
 					state->config->chroma_subsampling_y = GF_FALSE;
 			}
@@ -1552,14 +1624,16 @@
 			}
 		}
 		if (state->config->chroma_subsampling_x && state->config->chroma_subsampling_y) {
-			state->config->chroma_sample_position = gf_bs_read_int(bs, 2);
+			state->config->chroma_sample_position = gf_bs_read_int_log(bs, 2, "chroma_sample_position");
 		}
 	}
-	state->separate_uv_delta_q = gf_bs_read_int(bs, 1);
+	state->separate_uv_delta_q = gf_bs_read_int_log(bs, 1, "separate_uv_delta_q");
 }
 
 
-static u32 uvlc(GF_BitStream *bs) {
+static u32 av1_uvlc(GF_BitStream *bs, const char *fname)
+{
+	u32 res;
 	u8 leadingZeros = 0;
 	while (1) {
 		Bool done = gf_bs_read_int(bs, 1);
@@ -1570,18 +1644,26 @@
 	if (leadingZeros >= 32) {
 		return 0xFFFFFFFF;
 	}
-	return gf_bs_read_int(bs, leadingZeros) + (1 << leadingZeros) - 1;
+	res = gf_bs_read_int(bs, leadingZeros) + (1 << leadingZeros) - 1;
+	gf_bs_log(bs, 2*leadingZeros, fname, res);
+	return res;
 }
 
 static void timing_info(GF_BitStream *bs, AV1State *state) {
 	u32 time_scale = 0;
-	/*num_units_in_display_tick*/ gf_bs_read_int(bs, 32);
-	time_scale = gf_bs_read_int(bs, 32);
-	state->equal_picture_interval = gf_bs_read_int(bs, 1);
+	u32 num_units_in_display_tick = gf_bs_read_int_log(bs, 32, "num_units_in_display_tick");
+	if (num_units_in_display_tick == 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] num_units_in_display_tick must be greater than 0.\n"));
+	}
+	time_scale = gf_bs_read_int_log(bs, 32, "time_scale");
+	if (time_scale == 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] time_scale must be greater than 0.\n"));
+	}
+	state->equal_picture_interval = gf_bs_read_int_log(bs, 1, "equal_picture_interval");
 	if (state->equal_picture_interval) {
-		u32 num_ticks_per_picture_minus_1 = uvlc(bs);
-		state->tb_num = (num_ticks_per_picture_minus_1 + 1);
-		state->tb_den = time_scale;
+		u32 num_ticks_per_picture_minus_1 = av1_uvlc(bs, "num_ticks_per_picture_minus_1");
+		state->tb_num = time_scale;
+		state->tb_den = (num_ticks_per_picture_minus_1 + 1)*num_units_in_display_tick;
 	}
 	else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] VFR not supported.\n"));
@@ -1590,39 +1672,39 @@
 }
 
 static void decoder_model_info(AV1State *state, GF_BitStream *bs) {
-	state->buffer_delay_length = 1 + gf_bs_read_int(bs, 5);
-	/*num_units_in_decoding_tick =*/ gf_bs_read_int(bs, 32);
-	state->buffer_removal_time_length = gf_bs_read_int(bs, 5);
-	state->frame_presentation_time_length = 1 + gf_bs_read_int(bs, 5);
+	state->buffer_delay_length = 1 + gf_bs_read_int_log(bs, 5, "buffer_delay_length_minus1");
+	gf_bs_read_int_log(bs, 32, "num_units_in_decoding_tick");
+	state->buffer_removal_time_length = gf_bs_read_int_log(bs, 5, "buffer_removal_time_length");
+	state->frame_presentation_time_length = 1 + gf_bs_read_int_log(bs, 5, "frame_presentation_time_length_minus1");
 }
 
 static void operating_parameters_info(GF_BitStream *bs, const u8 idx, const u8 buffer_delay_length_minus_1) {
 	const u8 n = buffer_delay_length_minus_1 + 1;
-	/*decoder_buffer_delay[op] =*/ gf_bs_read_int(bs, n);
-	/*encoder_buffer_delay[op] =*/ gf_bs_read_int(bs, n);
-	/*low_delay_mode_flag[op] =*/ gf_bs_read_int(bs, 1);
+	gf_bs_read_int_log(bs, n, "decoder_buffer_delay");
+	gf_bs_read_int_log(bs, n, "encoder_buffer_delay");
+	gf_bs_read_int_log(bs, 1, "low_delay_mode_flag");
 }
 
 static void av1_parse_sequence_header_obu(GF_BitStream *bs, AV1State *state)
 {
 	u8 buffer_delay_length_minus_1 = 0;
 	state->frame_state.seen_seq_header = GF_TRUE;
-	state->config->seq_profile = gf_bs_read_int(bs, 3);
-	state->still_picture = gf_bs_read_int(bs, 1);
-	state->reduced_still_picture_header = gf_bs_read_int(bs, 1);
+	state->config->seq_profile = gf_bs_read_int_log(bs, 3, "seq_profile");
+	state->still_picture = gf_bs_read_int_log(bs, 1, "still_picture");
+	state->reduced_still_picture_header = gf_bs_read_int_log(bs, 1, "reduced_still_picture_header");
 	if (state->reduced_still_picture_header) {
 		//timing_info_present_flag = GF_FALSE;
 		//initial_display_delay_present_flag = GF_FALSE;
 		state->operating_points_count = 1;
-		state->config->seq_level_idx_0 = gf_bs_read_int(bs, 5);
+		state->config->seq_level_idx_0 = gf_bs_read_int_log(bs, 5, "seq_level_idx_0");
 	}
 	else {
 		u8 i = 0;
 		Bool initial_display_delay_present_flag;
-		Bool timing_info_present_flag = gf_bs_read_int(bs, 1);
+		Bool timing_info_present_flag = gf_bs_read_int_log(bs, 1, "timing_info_present_flag");
 		if (timing_info_present_flag) {
 			timing_info(bs, state);
-			state->decoder_model_info_present_flag = gf_bs_read_int(bs, 1);
+			state->decoder_model_info_present_flag = gf_bs_read_int_log(bs, 1, "decoder_model_info_present_flag");
 			if (state->decoder_model_info_present_flag) {
 				decoder_model_info(state, bs);
 			}
@@ -1630,23 +1712,23 @@
 		else {
 			state->decoder_model_info_present_flag = GF_FALSE;
 		}
-		initial_display_delay_present_flag = gf_bs_read_int(bs, 1);
-		state->operating_points_count = 1 + gf_bs_read_int(bs, 5);
+		initial_display_delay_present_flag = gf_bs_read_int_log(bs, 1, "initial_display_delay_present_flag");
+		state->operating_points_count = 1 + gf_bs_read_int_log(bs, 5, "operating_points_count_minus1");
 		for (i = 0; i < state->operating_points_count; i++) {
 			u8 seq_level_idx_i, seq_tier = 0;
 
-			state->operating_point_idc[i] = gf_bs_read_int(bs, 12);
+			state->operating_point_idc[i] = gf_bs_read_int_log_idx(bs, 12, "operating_point_idc", i);
 
-			seq_level_idx_i = gf_bs_read_int(bs, 5);
+			seq_level_idx_i = gf_bs_read_int_log_idx(bs, 5, "seq_level_idx", i);
 			if (i == 0) state->config->seq_level_idx_0 = seq_level_idx_i;
 
 			if (seq_level_idx_i > 7) {
-				seq_tier = gf_bs_read_int(bs, 1);
+				seq_tier = gf_bs_read_int_log_idx(bs, 1, "seq_tier", i);
 			}
 			if (i == 0) state->config->seq_tier_0 = seq_tier;
 
 			if (state->decoder_model_info_present_flag) {
-				state->decoder_model_present_for_this_op[i] = gf_bs_read_int(bs, 1);
+				state->decoder_model_present_for_this_op[i] = gf_bs_read_int_log_idx(bs, 1, "decoder_model_present_for_this_op", i);
 				if (state->decoder_model_present_for_this_op[i]) {
 					operating_parameters_info(bs, i, buffer_delay_length_minus_1);
 				}
@@ -1655,8 +1737,8 @@
 				state->decoder_model_present_for_this_op[i] = 0;
 			}
 			if (initial_display_delay_present_flag) {
-				if (gf_bs_read_int(bs, 1) /*initial_display_delay_present_for_this_op[i]*/) {
-					/*initial_display_delay_minus_1[i] =*/ gf_bs_read_int(bs, 4);
+				if (gf_bs_read_int_log_idx(bs, 1, "initial_display_delay_present_for_this_op", i) ) {
+					gf_bs_read_int_log_idx(bs, 4, "initial_display_delay_minus1", i);
 				}
 			}
 		}
@@ -1665,21 +1747,23 @@
 	//operatingPoint = av1_choose_operating_point(bs);
 	state->OperatingPointIdc = 0;//TODO: operating_point_idc[operatingPoint];
 
-	state->frame_width_bits_minus_1 = gf_bs_read_int(bs, 4);
-	state->frame_height_bits_minus_1 = gf_bs_read_int(bs, 4);
-	state->width = gf_bs_read_int(bs, state->frame_width_bits_minus_1 + 1) + 1;
-	state->height = gf_bs_read_int(bs, state->frame_height_bits_minus_1 + 1) + 1;
+	state->frame_width_bits_minus_1 = gf_bs_read_int_log(bs, 4, "frame_width_bits_minus1");
+	state->frame_height_bits_minus_1 = gf_bs_read_int_log(bs, 4, "frame_height_bits_minus1");
+	state->width = gf_bs_read_int_log(bs, state->frame_width_bits_minus_1 + 1, "width_minus1") + 1;
+	state->height = gf_bs_read_int_log(bs, state->frame_height_bits_minus_1 + 1, "height_minus1") + 1;
+	state->sequence_width = state->width;
+	state->sequence_height = state->height;
 	state->frame_id_numbers_present_flag = GF_FALSE;
 	if (!state->reduced_still_picture_header) {
-		state->frame_id_numbers_present_flag = gf_bs_read_int(bs, 1);
+		state->frame_id_numbers_present_flag = gf_bs_read_int_log(bs, 1, "frame_id_numbers_present_flag");
 	}
 	if (state->frame_id_numbers_present_flag) {
-		state->delta_frame_id_length_minus_2 = gf_bs_read_int(bs, 4);
-		state->additional_frame_id_length_minus_1 = gf_bs_read_int(bs, 3);
+		state->delta_frame_id_length_minus_2 = gf_bs_read_int_log(bs, 4, "delta_frame_id_length_minus2");
+		state->additional_frame_id_length_minus_1 = gf_bs_read_int_log(bs, 3, "additional_frame_id_length_minus1");
 	}
-	state->use_128x128_superblock = gf_bs_read_int(bs, 1);
-	/*enable_filter_intra =*/ gf_bs_read_int(bs, 1);
-	/*enable_intra_edge_filter =*/ gf_bs_read_int(bs, 1);
+	state->use_128x128_superblock = gf_bs_read_int_log(bs, 1, "use_128x128_superblock");
+	gf_bs_read_int_log(bs, 1, "enable_filter_intra");
+	gf_bs_read_int_log(bs, 1, "enable_intra_edge_filter");
 	if (state->reduced_still_picture_header) {
 		/*enable_interintra_compound = 0;
 		enable_masked_compound = 0;
@@ -1694,43 +1778,43 @@
 	}
 	else {
 		Bool seq_choose_screen_content_tools;
-		/*enable_interintra_compound =*/ gf_bs_read_int(bs, 1);
-		/*enable_masked_compound =*/ gf_bs_read_int(bs, 1);
-		state->enable_warped_motion = gf_bs_read_int(bs, 1);
-		/*enable_dual_filter =*/ gf_bs_read_int(bs, 1);
-		state->enable_order_hint = gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log(bs, 1, "enable_interintra_compound");
+		gf_bs_read_int_log(bs, 1, "enable_masked_compound");
+		state->enable_warped_motion = gf_bs_read_int_log(bs, 1, "enable_warped_motion");
+		gf_bs_read_int_log(bs, 1, "enable_dual_filter");
+		state->enable_order_hint = gf_bs_read_int_log(bs, 1, "enable_order_hint");
 		if (state->enable_order_hint) {
-			/*enable_jnt_comp =*/ gf_bs_read_int(bs, 1);
-			state->enable_ref_frame_mvs = gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log(bs, 1, "enable_jnt_comp");
+			state->enable_ref_frame_mvs = gf_bs_read_int_log(bs, 1, "enable_ref_frame_mvs");
 		}
 		else {
 			/*enable_jnt_comp = 0*/;
 			/*enable_ref_frame_mvs = 0*/;
 		}
-		seq_choose_screen_content_tools = gf_bs_read_int(bs, 1);
+		seq_choose_screen_content_tools = gf_bs_read_int_log(bs, 1, "seq_choose_screen_content_tools");
 		state->seq_force_screen_content_tools = 0;
 		if (seq_choose_screen_content_tools) {
 			state->seq_force_screen_content_tools = 2/*SELECT_SCREEN_CONTENT_TOOLS*/;
 		}
 		else {
-			state->seq_force_screen_content_tools = gf_bs_read_int(bs, 1);
+			state->seq_force_screen_content_tools = gf_bs_read_int_log(bs, 1, "seq_force_screen_content_tools");
 		}
 
 		state->seq_force_integer_mv = 0;
 		if (state->seq_force_screen_content_tools > 0) {
-			const Bool seq_choose_integer_mv = gf_bs_read_int(bs, 1);
+			const Bool seq_choose_integer_mv = gf_bs_read_int_log(bs, 1, "seq_choose_integer_mv");
 			if (seq_choose_integer_mv) {
 				state->seq_force_integer_mv = 2/*SELECT_INTEGER_MV*/;
 			}
 			else {
-				state->seq_force_integer_mv = gf_bs_read_int(bs, 1);
+				state->seq_force_integer_mv = gf_bs_read_int_log(bs, 1, "seq_force_integer_mv");
 			}
 		}
 		else {
 			state->seq_force_integer_mv = 2/*SELECT_INTEGER_MV*/;
 		}
 		if (state->enable_order_hint) {
-			u8 order_hint_bits_minus_1 = gf_bs_read_int(bs, 3);
+			u8 order_hint_bits_minus_1 = gf_bs_read_int_log(bs, 3, "order_hint_bits_minus1");
 			state->OrderHintBits = order_hint_bits_minus_1 + 1;
 		}
 		else {
@@ -1738,11 +1822,11 @@
 		}
 	}
 
-	state->enable_superres = gf_bs_read_int(bs, 1);
-	state->enable_cdef = gf_bs_read_int(bs, 1);
-	state->enable_restoration = gf_bs_read_int(bs, 1);
+	state->enable_superres = gf_bs_read_int_log(bs, 1, "enable_superres");
+	state->enable_cdef = gf_bs_read_int_log(bs, 1, "enable_cdef");
+	state->enable_restoration = gf_bs_read_int_log(bs, 1, "enable_restoration");
 	av1_color_config(bs, state);
-	state->film_grain_params_present = gf_bs_read_int(bs, 1);
+	state->film_grain_params_present = gf_bs_read_int_log(bs, 1, "film_grain_params_present");
 }
 
 
@@ -1761,11 +1845,11 @@
 	return GF_TRUE;
 }
 
-GF_Err gf_media_parse_ivf_file_header(GF_BitStream *bs, u32 *width, u32 *height, u32 *codec_fourcc, u32 *frame_rate, u32 *time_scale, u32 *num_frames)
+GF_Err gf_media_parse_ivf_file_header(GF_BitStream *bs, u32 *width, u32 *height, u32 *codec_fourcc, u32 *timebase_num, u32 *timebase_den, u32 *num_frames)
 {
 	u32 dw = 0;
 
-	if (!width || !height || !codec_fourcc || !frame_rate || !time_scale || !num_frames) {
+	if (!width || !height || !codec_fourcc || !timebase_den || !timebase_num || !num_frames) {
 		assert(0);
 		return GF_BAD_PARAM;
 	}
@@ -1798,8 +1882,8 @@
 	*width = gf_bs_read_u16_le(bs);
 	*height = gf_bs_read_u16_le(bs);
 
-	*frame_rate = gf_bs_read_u32_le(bs);
-	*time_scale = gf_bs_read_u32_le(bs);
+	*timebase_num = gf_bs_read_u32_le(bs);
+	*timebase_den = gf_bs_read_u32_le(bs);
 
 	*num_frames = gf_bs_read_u32_le(bs);
 	gf_bs_read_u32_le(bs); //skip unused
@@ -1810,6 +1894,8 @@
 GF_Err gf_media_parse_ivf_frame_header(GF_BitStream *bs, u64 *frame_size, u64 *pts)
 {
 	if (!frame_size) return GF_BAD_PARAM;
+	if (gf_bs_available(bs) < 12)
+		return GF_BUFFER_TOO_SMALL;
 
 	*frame_size = gf_bs_read_u32_le(bs);
 	if (*frame_size > 256 * 1024 * 1024) {
@@ -1823,7 +1909,7 @@
 	return GF_OK;
 }
 
-GF_Err gf_media_vp9_parse_superframe(GF_BitStream *bs, u64 ivf_frame_size, u32 *num_frames_in_superframe, u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME], u32 *superframe_index_size)
+GF_Err gf_vp9_parse_superframe(GF_BitStream *bs, u64 ivf_frame_size, u32 *num_frames_in_superframe, u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME], u32 *superframe_index_size)
 {
 	u32 byte, bytes_per_framesize;
 	u64 pos = gf_bs_get_position(bs), i = 0;
@@ -1840,6 +1926,8 @@
 	e = gf_bs_seek(bs, pos + ivf_frame_size - 1);
 	if (e) return e;
 
+	gf_bs_mark_overflow(bs, GF_TRUE);
+
 	byte = gf_bs_read_u8(bs);
 	if ((byte & 0xe0) != 0xc0)
 		goto exit; /*no superframe*/
@@ -1851,9 +1939,10 @@
 	*superframe_index_size = 2 + bytes_per_framesize * *num_frames_in_superframe;
 	gf_bs_seek(bs, pos + ivf_frame_size - *superframe_index_size);
 	byte = gf_bs_read_u8(bs);
-	if ((byte & 0xe0) != 0xc0)
+	if ((byte & 0xe0) != 0xc0) {
+		e = GF_NON_COMPLIANT_BITSTREAM;
 		goto exit; /*no superframe*/
-
+	}
 	frame_sizes[0] = 0;
 	for (i = 0; i < *num_frames_in_superframe; ++i) {
 		gf_bs_read_data(bs, (char*)(frame_sizes + i), bytes_per_framesize);
@@ -1861,20 +1950,24 @@
 
 exit:
 	gf_bs_seek(bs, pos);
+
+	if (gf_bs_is_overflow(bs)) e = GF_NON_COMPLIANT_BITSTREAM;
+
 	return e;
 }
 
+
 static Bool vp9_frame_sync_code(GF_BitStream *bs)
 {
-	u8 val = gf_bs_read_int(bs, 8);
+	u8 val = gf_bs_read_int_log(bs, 8, "syncbyte1");
 	if (val != 0x49)
 		return GF_FALSE;
 
-	val = gf_bs_read_int(bs, 8);
+	val = gf_bs_read_int_log(bs, 8, "syncbyte2");
 	if (val != 0x83)
 		return GF_FALSE;
 
-	val = gf_bs_read_int(bs, 8);
+	val = gf_bs_read_int_log(bs, 8, "syncbyte3");
 	if (val != 0x42)
 		return GF_FALSE;
 
@@ -1894,30 +1987,32 @@
 
 static const int VP9_CS_to_23001_8_colour_primaries[] = { -1/*undefined*/, 5, 1, 6, 7, 9, -1/*reserved*/, 1 };
 static const int VP9_CS_to_23001_8_transfer_characteristics[] = { -1/*undefined*/, 5, 1, 6, 7, 9, -1/*reserved*/, 13 };
+static const int VP9_CS_to_23001_8_matrix_coefficients[] = { -1/*undefined*/, 6, 1, -1, -1, 9, -1/*reserved*/, 0 };
 
 static GF_Err vp9_color_config(GF_BitStream *bs, GF_VPConfig *vp9_cfg)
 {
 	VP9_color_space color_space;
 
 	if (vp9_cfg->profile >= 2) {
-		Bool ten_or_twelve_bit = gf_bs_read_int(bs, 1);
+		Bool ten_or_twelve_bit = gf_bs_read_int_log(bs, 1, "ten_or_twelve_bit");
 		vp9_cfg->bit_depth = ten_or_twelve_bit ? 12 : 10;
 	}
 	else {
 		vp9_cfg->bit_depth = 8;
 	}
 
-	color_space = gf_bs_read_int(bs, 3);
+	color_space = gf_bs_read_int_log(bs, 3, "color_space");
 	vp9_cfg->colour_primaries = VP9_CS_to_23001_8_colour_primaries[color_space];
 	vp9_cfg->transfer_characteristics = VP9_CS_to_23001_8_transfer_characteristics[color_space];
+	vp9_cfg->matrix_coefficients = VP9_CS_to_23001_8_matrix_coefficients[color_space];
 	if (color_space != CS_RGB) {
-		vp9_cfg->video_fullRange_flag = gf_bs_read_int(bs, 1);
+		vp9_cfg->video_fullRange_flag = gf_bs_read_int_log(bs, 1, "video_fullRange_flag");
 		if (vp9_cfg->profile == 1 || vp9_cfg->profile == 3) {
 			u8 subsampling_x, subsampling_y, subsampling_xy_to_chroma_subsampling[2][2] = { {3, 0}, {2, 0} };
-			subsampling_x = gf_bs_read_int(bs, 1);
-			subsampling_y = gf_bs_read_int(bs, 1);
+			subsampling_x = gf_bs_read_int_log(bs, 1, "subsampling_x");
+			subsampling_y = gf_bs_read_int_log(bs, 1, "subsampling_x");
 			vp9_cfg->chroma_subsampling = subsampling_xy_to_chroma_subsampling[subsampling_x][subsampling_y];
-			Bool reserved_zero = gf_bs_read_int(bs, 1);
+			Bool reserved_zero = gf_bs_read_int_log(bs, 1, "reserved_zero");
 			if (reserved_zero) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VP9] color config reserved zero (1) is not zero.\n"));
 				return GF_NON_COMPLIANT_BITSTREAM;
@@ -1931,7 +2026,7 @@
 		vp9_cfg->video_fullRange_flag = GF_TRUE;
 		if (vp9_cfg->profile == 1 || vp9_cfg->profile == 3) {
 			vp9_cfg->chroma_subsampling = 3;
-			Bool reserved_zero = gf_bs_read_int(bs, 1);
+			Bool reserved_zero = gf_bs_read_int_log(bs, 1, "reserved_zero");
 			if (reserved_zero) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VP9] color config reserved zero (2) is not zero.\n"));
 				return GF_NON_COMPLIANT_BITSTREAM;
@@ -1952,11 +2047,11 @@
 
 static void vp9_frame_size(GF_BitStream *bs, int *FrameWidth, int *FrameHeight, int *Sb64Cols, int *Sb64Rows)
 {
-	int frame_width_minus_1 = gf_bs_read_int(bs, 16);
-	int frame_height_minus_1 = gf_bs_read_int(bs, 16);
+	int frame_width_minus_1 = gf_bs_read_int_log(bs, 16, "frame_width_minus_1");
+	int frame_height_minus_1 = gf_bs_read_int_log(bs, 16, "frame_height_minus_1");
 	if (frame_width_minus_1 + 1 != *FrameWidth || frame_height_minus_1 + 1 != *FrameHeight) {
 		if (*FrameWidth || *FrameHeight)
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[VP9] inconsistent frame dimensions: previous was %dx%d, new one is %dx%d.\n", *FrameWidth, *FrameHeight, frame_width_minus_1 + 1, frame_height_minus_1 + 1));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[VP9] inconsistent frame dimensions: previous was %dx%d, new one is %dx%d.\n", *FrameWidth, *FrameHeight, frame_width_minus_1 + 1, frame_height_minus_1 + 1));
 	}
 	*FrameWidth = frame_width_minus_1 + 1;
 	*FrameHeight = frame_height_minus_1 + 1;
@@ -1965,10 +2060,10 @@
 
 static void vp9_render_size(GF_BitStream *bs, int FrameWidth, int FrameHeight, int *renderWidth, int *renderHeight)
 {
-	Bool render_and_frame_size_different = gf_bs_read_int(bs, 1);
+	Bool render_and_frame_size_different = gf_bs_read_int_log(bs, 1, "render_and_frame_size_different");
 	if (render_and_frame_size_different == 1) {
-		int render_width_minus_1 = gf_bs_read_int(bs, 16);
-		int render_height_minus_1 = gf_bs_read_int(bs, 16);
+		int render_width_minus_1 = gf_bs_read_int_log(bs, 16, "render_width_minus_1");
+		int render_height_minus_1 = gf_bs_read_int_log(bs, 16, "render_height_minus_1");
 		*renderWidth = render_width_minus_1 + 1;
 		*renderHeight = render_height_minus_1 + 1;
 	}
@@ -1978,38 +2073,50 @@
 	}
 }
 
-static s64 vp9_s(GF_BitStream *bs, int n) {
+static s64 vp9_s(GF_BitStream *bs, int n, const char *fname, u32 idx) {
 	s64 value = gf_bs_read_int(bs, n);
 	Bool sign = gf_bs_read_int(bs, 1);
-	return sign ? -value : value;
+	if (sign) value = -value;
+	gf_bs_log_idx(bs, n+1, fname, value, idx, -1, -1);
+	return value;
 }
 
 static void vp9_loop_filter_params(GF_BitStream *bs)
 {
-	/*loop_filter_level = */gf_bs_read_int(bs, 6);
-	/*loop_filter_sharpness = */gf_bs_read_int(bs, 3);
-	Bool loop_filter_delta_enabled = gf_bs_read_int(bs, 1);
+	/*loop_filter_level = */gf_bs_read_int_log(bs, 6, "loop_filter_level");
+	/*loop_filter_sharpness = */gf_bs_read_int_log(bs, 3, "loop_filter_sharpness");
+	Bool loop_filter_delta_enabled = gf_bs_read_int_log(bs, 1, "loop_filter_delta_enabled");
 	if (loop_filter_delta_enabled == 1) {
-		Bool loop_filter_delta_update = gf_bs_read_int(bs, 1);
+		Bool loop_filter_delta_update = gf_bs_read_int_log(bs, 1, "loop_filter_delta_update");
 		if (loop_filter_delta_update == GF_TRUE) {
 			int i;
 			for (i = 0; i < 4; i++) {
-				Bool update_ref_delta = gf_bs_read_int(bs, 1);
+				Bool update_ref_delta = gf_bs_read_int_log_idx(bs, 1, "update_ref_delta", i);
 				if (update_ref_delta == GF_TRUE)
-					/*loop_filter_ref_deltas[i] =*/ vp9_s(bs, 6);
+					vp9_s(bs, 6, "loop_filter_ref_deltas", i);
 			}
 			for (i = 0; i < 2; i++) {
-				Bool update_mode_delta = gf_bs_read_int(bs, 1);
+				Bool update_mode_delta = gf_bs_read_int_log_idx(bs, 1, "update_mode_delta", i);
 				if (update_mode_delta == GF_TRUE)
-					/*loop_filter_mode_deltas[i] =*/ vp9_s(bs, 6);
+					vp9_s(bs, 6, "loop_filter_mode_deltas", i);
 			}
 		}
 	}
 }
 
+static void vp9_delta_q(GF_BitStream *bs) {
+	Bool delta_coded = gf_bs_read_int_log(bs, 1, "delta_coded");
+	if (delta_coded) {
+		gf_bs_read_int_log(bs, 4, "delta_q");
+	}
+}
+
 static void vp9_quantization_params(GF_BitStream *bs)
 {
-	/*base_q_idx = */gf_bs_read_int(bs, 8);
+	/*base_q_idx = */gf_bs_read_int_log(bs, 8, "base_q_idx");
+	vp9_delta_q(bs); // delta_q_y_dc
+	vp9_delta_q(bs); // delta_q_uv_dc
+	vp9_delta_q(bs); // delta_q_uv_ac
 }
 
 #define VP9_MAX_SEGMENTS 8
@@ -2020,33 +2127,45 @@
 #define VP9_MIN_TILE_WIDTH_B64 4
 #define VP9_MAX_TILE_WIDTH_B64 64
 
+static void vp9_read_prob(GF_BitStream *bs)
+{
+	Bool prob_coded = gf_bs_read_int_log(bs, 1, "prob_coded");
+	if (prob_coded) {
+		gf_bs_read_int_log(bs, 8, "prob");
+	}
+}
+
 static void vp9_segmentation_params(GF_BitStream *bs)
 {
-	Bool segmentation_enabled = gf_bs_read_int(bs, 1);
+	Bool segmentation_enabled = gf_bs_read_int_log(bs, 1, "segmentation_enabled");
 	if (segmentation_enabled == 1) {
 		int i;
-		Bool segmentation_update_map = gf_bs_read_int(bs, 1);
+		Bool segmentation_update_map = gf_bs_read_int_log(bs, 1, "segmentation_update_map");
 		if (segmentation_update_map) {
-			for (i = 0; i < 7; i++)
-				/*segmentation_tree_probs[i] = read_prob()*/
-				/*segmentation_temporal_update = */gf_bs_read_int(bs, 1);
-			/*for (i = 0; i < 3; i++)
-				segmentation_pred_prob[i] = segmentation_temporal_update ? read_prob() : 255*/
+			for (i = 0; i < 7; i++) {
+				vp9_read_prob(bs);
+			}
+			Bool segmentation_temporal_update = gf_bs_read_int_log(bs, 1, "segmentation_temporal_update");
+			for (i = 0; i < 3; i++) {
+				if (segmentation_temporal_update) {
+					vp9_read_prob(bs);
+				}
+			}
 		}
-		Bool segmentation_update_data = gf_bs_read_int(bs, 1);
+		Bool segmentation_update_data = gf_bs_read_int_log(bs, 1, "segmentation_update_data");
 		if (segmentation_update_data == 1) {
-			/*segmentation_abs_or_delta_update =*/ gf_bs_read_int(bs, 1);
+			/*segmentation_abs_or_delta_update =*/ gf_bs_read_int_log(bs, 1, "segmentation_abs_or_delta_update");
 			for (i = 0; i < VP9_MAX_SEGMENTS; i++) {
 				int j;
 				for (j = 0; j < VP9_SEG_LVL_MAX; j++) {
 					/*feature_value = 0*/
-					Bool feature_enabled = gf_bs_read_int(bs, 1);
+					Bool feature_enabled = gf_bs_read_int_log(bs, 1, "feature_enabled");
 					/*FeatureEnabled[i][j] = feature_enabled*/
 					if (feature_enabled) {
 						int bits_to_read = segmentation_feature_bits[j];
-						/*feature_value =*/ gf_bs_read_int(bs, bits_to_read);
+						/*feature_value =*/ gf_bs_read_int_log(bs, bits_to_read, "feature_value");
 						if (segmentation_feature_signed[j] == 1) {
-							/*Bool feature_sign = */gf_bs_read_int(bs, 1);
+							/*Bool feature_sign = */gf_bs_read_int_log(bs, 1, "feature_sign");
 							/*if (feature_sign == 1)
 								feature_value *= -1*/
 						}
@@ -2081,15 +2200,15 @@
 	int maxLog2TileCols = calc_max_log2_tile_cols(Sb64Cols);
 	int tile_cols_log2 = minLog2TileCols;
 	while (tile_cols_log2 < maxLog2TileCols) {
-		Bool increment_tile_cols_log2 = gf_bs_read_int(bs, 1);
+		Bool increment_tile_cols_log2 = gf_bs_read_int_log(bs, 1, "increment_tile_cols_log2");
 		if (increment_tile_cols_log2)
 			tile_cols_log2++;
 		else
 			break;
 	}
-	tile_rows_log2 = gf_bs_read_int(bs, 1);
+	tile_rows_log2 = gf_bs_read_int_log(bs, 1, "tile_rows_log2");
 	if (tile_rows_log2) {
-		/*Bool increment_tile_rows_log2 = */gf_bs_read_int(bs, 1);
+		/*Bool increment_tile_rows_log2 = */gf_bs_read_int_log(bs, 1, "increment_tile_rows_log2");
 		//tile_rows_log2 += increment_tile_rows_log2;
 	}
 }
@@ -2100,7 +2219,7 @@
 	Bool found_ref;
 	int i;
 	for (i = 0; i < 3; i++) {
-		found_ref = gf_bs_read_int(bs, 1);
+		found_ref = gf_bs_read_int_log(bs, 1, "found_ref");
 		if (found_ref) {
 			*FrameWidth = RefFrameWidth [ref_frame_idx[i]];
 			*FrameHeight = RefFrameHeight[ref_frame_idx[i]];
@@ -2119,16 +2238,16 @@
 
 static void vp9_read_interpolation_filter(GF_BitStream *bs)
 {
-	Bool is_filter_switchable = gf_bs_read_int(bs, 1);
+	Bool is_filter_switchable = gf_bs_read_int_log(bs, 1, "is_filter_switchable");
 	if (!is_filter_switchable) {
-		/*raw_interpolation_filter = */gf_bs_read_int(bs, 2);
+		/*raw_interpolation_filter = */gf_bs_read_int_log(bs, 2, "raw_interpolation_filter");
 	}
 }
 
 
 #define VP9_KEY_FRAME 0
 
-GF_Err gf_media_vp9_parse_sample(GF_BitStream *bs, GF_VPConfig *vp9_cfg, Bool *key_frame, u32 *FrameWidth, u32 *FrameHeight, u32 *renderWidth, u32 *renderHeight)
+GF_Err gf_vp9_parse_sample(GF_BitStream *bs, GF_VPConfig *vp9_cfg, Bool *key_frame, u32 *FrameWidth, u32 *FrameHeight, u32 *renderWidth, u32 *renderHeight)
 {
 	Bool FrameIsIntra = GF_FALSE, profile_low_bit, profile_high_bit, show_existing_frame = GF_FALSE, frame_type = GF_FALSE, show_frame = GF_FALSE, error_resilient_mode = GF_FALSE;
 	/*u8 frame_context_idx = 0, reset_frame_context = 0, frame_marker = 0*/;
@@ -2138,27 +2257,27 @@
 	assert(bs && key_frame);
 
 	/*uncompressed header*/
-	/*frame_marker = */gf_bs_read_int(bs, 2);
-	profile_low_bit = gf_bs_read_int(bs, 1);
-	profile_high_bit = gf_bs_read_int(bs, 1);
+	/*frame_marker = */gf_bs_read_int_log(bs, 2, "frame_marker");
+	profile_low_bit = gf_bs_read_int_log(bs, 1, "profile_low_bit");
+	profile_high_bit = gf_bs_read_int_log(bs, 1, "profile_high_bit");
 	vp9_cfg->profile = (profile_high_bit << 1) + profile_low_bit;
 	if (vp9_cfg->profile == 3) {
-		Bool reserved_zero = gf_bs_read_int(bs, 1);
+		Bool reserved_zero = gf_bs_read_int_log(bs, 1, "reserved_zero");
 		if (reserved_zero) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VP9] uncompressed header reserved zero is not zero.\n"));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 	}
 
-	show_existing_frame = gf_bs_read_int(bs, 1);
+	show_existing_frame = gf_bs_read_int_log(bs, 1, "show_existing_frame");
 	if (show_existing_frame == GF_TRUE) {
-		/*frame_to_show_map_idx = */gf_bs_read_int(bs, 3);
+		/*frame_to_show_map_idx = */gf_bs_read_int_log(bs, 3, "frame_to_show_map_idx");
 		return GF_OK;
 	}
 
-	frame_type = gf_bs_read_int(bs, 1);
-	show_frame = gf_bs_read_int(bs, 1);
-	error_resilient_mode = gf_bs_read_int(bs, 1);
+	frame_type = gf_bs_read_int_log(bs, 1, "frame_type");
+	show_frame = gf_bs_read_int_log(bs, 1, "show_frame");
+	error_resilient_mode = gf_bs_read_int_log(bs, 1, "error_resilient_mode");
 	if (frame_type == VP9_KEY_FRAME) {
 		if (!vp9_frame_sync_code(bs))
 			return GF_NON_COMPLIANT_BITSTREAM;
@@ -2175,12 +2294,12 @@
 		*key_frame = GF_FALSE;
 
 		if (show_frame == GF_FALSE) {
-			intra_only = gf_bs_read_int(bs, 1);
+			intra_only = gf_bs_read_int_log(bs, 1, "intra_only");
 		}
 		FrameIsIntra = intra_only;
 
 		if (error_resilient_mode == GF_FALSE) {
-			/*reset_frame_context = */gf_bs_read_int(bs, 2);
+			/*reset_frame_context = */gf_bs_read_int_log(bs, 2, "reset_frame_context");
 		}
 
 		if (intra_only == GF_TRUE) {
@@ -2195,32 +2314,33 @@
 				u8 color_space = CS_BT_601;
 				vp9_cfg->colour_primaries = VP9_CS_to_23001_8_colour_primaries[color_space];
 				vp9_cfg->transfer_characteristics = VP9_CS_to_23001_8_transfer_characteristics[color_space];
+				vp9_cfg->matrix_coefficients = VP9_CS_to_23001_8_matrix_coefficients[color_space];
 				vp9_cfg->chroma_subsampling = 0;
 				vp9_cfg->bit_depth = 8;
 			}
-			refresh_frame_flags = gf_bs_read_int(bs, 8);
+			refresh_frame_flags = gf_bs_read_int_log(bs, 8, "refresh_frame_flags");
 			vp9_frame_size(bs, FrameWidth, FrameHeight, &Sb64Cols, &Sb64Rows);
 			vp9_render_size(bs, *FrameWidth, *FrameHeight, renderWidth, renderHeight);
 		}
 		else {
-			refresh_frame_flags = gf_bs_read_int(bs, 8);
+			refresh_frame_flags = gf_bs_read_int_log(bs, 8, "refresh_frame_flags");
 			u8 ref_frame_idx[3];
 			for (i = 0; i < 3; i++) {
-				ref_frame_idx[i] = gf_bs_read_int(bs, 3);
-				/*ref_frame_sign_bias[LAST_FRAME + i] = */gf_bs_read_int(bs, 1);
+				ref_frame_idx[i] = gf_bs_read_int_log_idx(bs, 3, "ref_frame_idx", i);
+				/*ref_frame_sign_bias[LAST_FRAME + i] = */gf_bs_read_int_log_idx(bs, 1, "ref_frame_sign_bias", i);
 			}
 			vp9_frame_size_with_refs(bs, refresh_frame_flags, ref_frame_idx, vp9_cfg->RefFrameWidth, vp9_cfg->RefFrameHeight, FrameWidth, FrameHeight, renderWidth, renderHeight, &Sb64Cols, &Sb64Rows);
-			/*allow_high_precision_mv = */gf_bs_read_int(bs, 1);
+			/*allow_high_precision_mv = */gf_bs_read_int_log(bs, 1, "allow_high_precision_mv");
 			vp9_read_interpolation_filter(bs);
 		}
 	}
 
 	if (error_resilient_mode == 0) {
-		/*refresh_frame_context = */gf_bs_read_int(bs, 1);
-		/*frame_parallel_decoding_mode = */gf_bs_read_int(bs, 1);
+		/*refresh_frame_context = */gf_bs_read_int_log(bs, 1, "refresh_frame_context");
+		/*frame_parallel_decoding_mode = */gf_bs_read_int_log(bs, 1, "frame_parallel_decoding_mode");
 	}
 
-	/*frame_context_idx = */gf_bs_read_int(bs, 2);
+	/*frame_context_idx = */gf_bs_read_int_log(bs, 2, "frame_context_idx");
 	if (FrameIsIntra || error_resilient_mode) {
 		/*setup_past_independence + save_probs ...*/
 		//frame_context_idx = 0;
@@ -2231,7 +2351,7 @@
 	vp9_segmentation_params(bs);
 	vp9_tile_info(bs, Sb64Cols);
 
-	/*header_size_in_bytes = */gf_bs_read_int(bs, 16);
+	/*header_size_in_bytes = */gf_bs_read_int_log(bs, 16, "header_size_in_bytes");
 
 	/*Reference frame update process (8.10 - partial)*/
 	for (i = 0; i < VP9_NUM_REF_FRAMES; i++) {
@@ -2375,7 +2495,7 @@
 	else {
 		GF_SAFEALLOC(a, GF_AV1_OBUArrayEntry);
 		if (!a) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AV1] Failed to allocate OBU\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] Failed to allocate OBU\n"));
 			return;
 		}
 	}
@@ -2452,7 +2572,7 @@
 		}
 	}
 	if (!obu_list) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AV1] internal error, no OBU list cannot add\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] internal error, no OBU list cannot add\n"));
 		gf_free(a->obu);
 		gf_free(a);
 		return;
@@ -2488,19 +2608,19 @@
 		if (!gf_bs_available(bs))
 			return state->unframed ? GF_BUFFER_TOO_SMALL : GF_OK;
 
-		u64 pos = gf_bs_get_position(bs), obu_length = 0;
+		u64 pos = gf_bs_get_position(bs), obu_size = 0;
 
-		e = gf_media_aom_av1_parse_obu(bs, &state->obu_type, &obu_length, NULL, state);
+		e = gf_av1_parse_obu(bs, &state->obu_type, &obu_size, NULL, state);
 		if (e)
 			return e;
 
-		if (obu_length != gf_bs_get_position(bs) - pos) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AV1] OBU (Section 5) frame size "LLU" different from consumed bytes "LLU".\n", obu_length, gf_bs_get_position(bs) - pos));
+		if (obu_size != gf_bs_get_position(bs) - pos) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] OBU (Section 5) frame size "LLU" different from consumed bytes "LLU".\n", obu_size, gf_bs_get_position(bs) - pos));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] Section5 OBU detected (size "LLU")\n", obu_length));
-		av1_populate_state_from_obu(bs, pos, obu_length, state->obu_type, state);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[AV1] Section5 OBU detected (size "LLU")\n", obu_size));
+		av1_populate_state_from_obu(bs, pos, obu_size, state->obu_type, state);
 	}
 
 	return GF_OK;
@@ -2580,7 +2700,7 @@
 	u64 tusize, sz;
 	if (!bs || !state) return GF_BAD_PARAM;
 
-	state->bs_overread = GF_FALSE;
+	gf_bs_mark_overflow(bs, GF_TRUE);
 	tusize = sz = gf_av1_leb128_read(bs, NULL);
 	tupos = gf_bs_get_position(bs);
 	if (!sz) {
@@ -2588,54 +2708,54 @@
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] Annex B temporal unit detected (size "LLU") ***** \n", sz));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[AV1] Annex B temporal unit detected (size "LLU") ***** \n", sz));
 	while (sz > 0) {
 		u8 Leb128Bytes = 0;
 		u64 frame_unit_size = gf_av1_leb128_read(bs, &Leb128Bytes);
 
-		if (state->bs_overread) {
+		if (gf_bs_is_overflow(bs)) {
 			return GF_BUFFER_TOO_SMALL;
 		}
 		if (sz < Leb128Bytes + frame_unit_size) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] Annex B sz("LLU") < Leb128Bytes("LLU") + frame_unit_size("LLU")\n", sz, Leb128Bytes, frame_unit_size));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] Annex B frame unit detected (size "LLU")\n", frame_unit_size));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[AV1] Annex B frame unit detected (size "LLU")\n", frame_unit_size));
 		sz -= Leb128Bytes + frame_unit_size;
 
 		while (frame_unit_size > 0) {
-			u64 pos, obu_length = gf_av1_leb128_read(bs, &Leb128Bytes);
+			u64 pos, obu_size = gf_av1_leb128_read(bs, &Leb128Bytes);
 
-			if (state->bs_overread) {
+			if (gf_bs_is_overflow(bs)) {
 				return GF_BUFFER_TOO_SMALL;
 			}
-			if (frame_unit_size < Leb128Bytes + obu_length) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] Annex B frame_unit_size("LLU") < Leb128Bytes("LLU") + obu_length("LLU")\n", frame_unit_size, Leb128Bytes, obu_length));
+			if (frame_unit_size < Leb128Bytes + obu_size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] Annex B frame_unit_size("LLU") < Leb128Bytes("LLU") + obu_length("LLU")\n", frame_unit_size, Leb128Bytes, obu_size));
 				return GF_NON_COMPLIANT_BITSTREAM;
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] Annex B OBU detected (size "LLU")\n", obu_length));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[AV1] Annex B OBU detected (size "LLU")\n", obu_size));
 			pos = gf_bs_get_position(bs);
 			frame_unit_size -= Leb128Bytes;
 
-			e = gf_media_aom_av1_parse_obu(bs, &state->obu_type, &obu_length, NULL, state);
+			e = gf_av1_parse_obu(bs, &state->obu_type, &obu_size, NULL, state);
 			if (e) return e;
 
-			if (obu_length != gf_bs_get_position(bs) - pos) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AV1] Annex B frame size "LLU" different from consumed bytes "LLU".\n", obu_length, gf_bs_get_position(bs) - pos));
+			if (obu_size != gf_bs_get_position(bs) - pos) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Annex B frame size "LLU" different from consumed bytes "LLU".\n", obu_size, gf_bs_get_position(bs) - pos));
 				return GF_NON_COMPLIANT_BITSTREAM;
 			}
 
-			av1_populate_state_from_obu(bs, pos, obu_length, state->obu_type, state);
-			if (frame_unit_size < obu_length) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] Annex B frame_unit_size("LLU") < OBU size ("LLU")\n", frame_unit_size, obu_length));
+			av1_populate_state_from_obu(bs, pos, obu_size, state->obu_type, state);
+			if (frame_unit_size < obu_size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] Annex B frame_unit_size("LLU") < OBU size ("LLU")\n", frame_unit_size, obu_size));
 				return GF_NON_COMPLIANT_BITSTREAM;
 			}
-			frame_unit_size -= obu_length;
+			frame_unit_size -= obu_size;
 		}
 	}
 	assert(sz == 0);
 	if (tusize != gf_bs_get_position(bs) - tupos) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AV1] Annex B TU size "LLU" different from consumed bytes "LLU".\n", tusize, gf_bs_get_position(bs) - tupos));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Annex B TU size "LLU" different from consumed bytes "LLU".\n", tusize, gf_bs_get_position(bs) - tupos));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	return GF_OK;
@@ -2648,19 +2768,19 @@
 	if (gf_bs_available(bs)<12) return GF_EOS;
 	e = gf_media_parse_ivf_frame_header(bs, &frame_size, &pts_ignored);
 	if (e) return e;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] IVF frame detected (size "LLU")\n", frame_size));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[AV1] IVF frame detected (size "LLU")\n", frame_size));
 
 	if (gf_bs_available(bs) < frame_size) return GF_EOS;
 
 	while (frame_size > 0) {
 		u64 obu_size = 0, pos = gf_bs_get_position(bs);
 
-		e = gf_media_aom_av1_parse_obu(bs, &state->obu_type, &obu_size, NULL, state);
+		e = gf_av1_parse_obu(bs, &state->obu_type, &obu_size, NULL, state);
 		if (e != GF_OK)
 			return e;
 
 		if (obu_size != gf_bs_get_position(bs) - pos) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AV1] IVF frame size "LLU" different from consumed bytes "LLU".\n", obu_size, gf_bs_get_position(bs) - pos));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] IVF frame size "LLU" different from consumed bytes "LLU".\n", obu_size, gf_bs_get_position(bs) - pos));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 
@@ -2692,13 +2812,14 @@
 	return k;
 }
 
-static u64 aom_av1_le(GF_BitStream *bs, u32 n) {
+static u64 aom_av1_le(GF_BitStream *bs, u32 n, const char *name) {
 	u32 i = 0;
 	u64 t = 0;
 	for (i = 0; i < n; i++) {
 		u8 byte = gf_bs_read_int(bs, 8);
 		t += (byte << (i * 8));
 	}
+	gf_bs_log(bs, n*8, name, t);
 	return t;
 }
 
@@ -2718,12 +2839,12 @@
 	u32 maxLog2tileCols = aom_av1_tile_log2(1, MIN(sbCols, AV1_MAX_TILE_COLS));
 	u32 maxLog2tileRows = aom_av1_tile_log2(1, MIN(sbRows, AV1_MAX_TILE_ROWS));
 	u32 minLog2Tiles = MAX(minLog2tileCols, aom_av1_tile_log2(maxTileAreaSb, sbRows * sbCols));
-	Bool uniform_tile_spacing_flag = gf_bs_read_int(bs, 1);
+	Bool uniform_tile_spacing_flag = gf_bs_read_int_log(bs, 1, "uniform_tile_spacing_flag");
 	if (uniform_tile_spacing_flag) {
 		u32 startSb, tileWidthSb, tileHeightSb, minLog2tileRows;
 		state->tileColsLog2 = minLog2tileCols;
 		while (state->tileColsLog2 < maxLog2tileCols) {
-			Bool increment_tile_cols_log2 = gf_bs_read_int(bs, 1);
+			Bool increment_tile_cols_log2 = gf_bs_read_int_log(bs, 1, "increment_tile_cols_log2");
 			if (increment_tile_cols_log2 == 1)
 				state->tileColsLog2++;
 			else
@@ -2739,7 +2860,7 @@
 		minLog2tileRows = MAX((int)(minLog2Tiles - state->tileColsLog2), 0);
 		state->tileRowsLog2 = minLog2tileRows;
 		while (state->tileRowsLog2 < maxLog2tileRows) {
-			Bool increment_tile_rows_log2 = gf_bs_read_int(bs, 1);
+			Bool increment_tile_rows_log2 = gf_bs_read_int_log(bs, 1, "increment_tile_rows_log2");
 			if (increment_tile_rows_log2 == 1)
 				state->tileRowsLog2++;
 			else
@@ -2759,7 +2880,7 @@
 		startSb = 0;
 		for (i = 0; startSb < sbCols; i++) {
 			u32 maxWidth = MIN((int)(sbCols - startSb), maxTileWidthSb);
-			u32 width_in_sbs_minus_1 = av1_read_ns(bs, maxWidth);
+			u32 width_in_sbs_minus_1 = av1_read_ns(bs, maxWidth, "width_in_sbs_minus_1");
 			u32 sizeSb = width_in_sbs_minus_1 + 1;
 			widestTileSb = MAX(sizeSb, widestTileSb);
 			startSb += sizeSb;
@@ -2780,7 +2901,7 @@
 		startSb = 0;
 		for (i = 0; startSb < sbRows; i++) {
 			u32 maxHeight = MIN((int)(sbRows - startSb), maxTileHeightSb);
-			u32 height_in_sbs_minus_1 = av1_read_ns(bs, maxHeight);
+			u32 height_in_sbs_minus_1 = av1_read_ns(bs, maxHeight, "height_in_sbs_minus_1");
 			u32 sizeSb = height_in_sbs_minus_1 + 1;
 			startSb += sizeSb;
 		}
@@ -2789,8 +2910,8 @@
 		state->tileRowsLog2 = aom_av1_tile_log2(1, state->tileRows);
 	}
 	if (state->tileColsLog2 > 0 || state->tileRowsLog2 > 0) {
-		/*context_update_tile_id = */gf_bs_read_int(bs, state->tileRowsLog2 + state->tileColsLog2);
-		state->tile_size_bytes = gf_bs_read_int(bs, 2) + 1;
+		gf_bs_read_int_log(bs, state->tileRowsLog2 + state->tileColsLog2, "context_update_tile_id");
+		state->tile_size_bytes = gf_bs_read_int_log(bs, 2, "tile_size_bytes_minus1") + 1;
 	}
 }
 
@@ -2800,13 +2921,13 @@
 	Bool use_superres;
 
 	if (state->enable_superres) {
-		use_superres = gf_bs_read_int(bs, 1);
+		use_superres = gf_bs_read_int_log(bs, 1, "use_superres");
 	}
 	else {
 		use_superres = GF_FALSE;
 	}
 	if (use_superres) {
-		u8 coded_denom = gf_bs_read_int(bs, AV1_SUPERRES_DENOM_BITS);
+		u8 coded_denom = gf_bs_read_int_log(bs, AV1_SUPERRES_DENOM_BITS, "coded_denom");
 		SuperresDenom = coded_denom + AV1_SUPERRES_DENOM_MIN;
 	}
 	else {
@@ -2821,11 +2942,14 @@
 	if (frame_size_override_flag) {
 		u32 frame_width_minus_1, frame_height_minus_1;
 		u8 n = state->frame_width_bits_minus_1 + 1;
-		frame_width_minus_1 = gf_bs_read_int(bs, n);
+		frame_width_minus_1 = gf_bs_read_int_log(bs, n, "frame_width_minus_1");
 		n = state->frame_height_bits_minus_1 + 1;
-		frame_height_minus_1 = gf_bs_read_int(bs, n);
+		frame_height_minus_1 = gf_bs_read_int_log(bs, n, "frame_height_minus_1");
 		state->width = frame_width_minus_1 + 1;
 		state->height = frame_height_minus_1 + 1;
+	} else {
+		state->width = state->sequence_width;
+		state->height = state->sequence_height;
 	}
 	superres_params(bs, state);
 	//compute_image_size(); //no bits
@@ -2833,10 +2957,10 @@
 
 static void av1_render_size(GF_BitStream *bs)
 {
-	Bool render_and_frame_size_different = gf_bs_read_int(bs, 1);
+	Bool render_and_frame_size_different = gf_bs_read_int_log(bs, 1, "render_and_frame_size_different_flag");
 	if (render_and_frame_size_different == GF_TRUE) {
-		/*render_width_minus_1 =*/ gf_bs_read_int(bs, 16);
-		/*render_height_minus_1 =*/ gf_bs_read_int(bs, 16);
+		gf_bs_read_int_log(bs, 16, "render_width_minus_1");
+		gf_bs_read_int_log(bs, 16, "render_height_minus_1");
 		//RenderWidth = render_width_minus_1 + 1;
 		//RenderHeight = render_height_minus_1 + 1;
 	}
@@ -2848,26 +2972,22 @@
 
 static void read_interpolation_filter(GF_BitStream *bs)
 {
-	Bool is_filter_switchable = gf_bs_read_int(bs, 1);
+	Bool is_filter_switchable = gf_bs_read_int_log(bs, 1, "is_filter_switchable");
 	if (!is_filter_switchable) {
-		/*interpolation_filter =*/ gf_bs_read_int(bs, 2);
+		/*interpolation_filter =*/ gf_bs_read_int_log(bs, 2, "interpolation_filter");
 	}
 }
 
-static void frame_size_with_refs(GF_BitStream *bs, AV1State *state, Bool frame_size_override_flag)
+static void frame_size_with_refs(GF_BitStream *bs, AV1State *state, Bool frame_size_override_flag, s8 *ref_frame_idx)
 {
 	Bool found_ref = GF_FALSE;
 	u32 i = 0;
 	for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
-		found_ref = gf_bs_read_int(bs, 1);
+		found_ref = gf_bs_read_int_log_idx(bs, 1, "found_ref", i);
 		if (found_ref == 1) {
-#if 0
-			UpscaledWidth = RefUpscaledWidth[ref_frame_idx[i]];
-			FrameWidth = UpscaledWidth;
-			FrameHeight = RefFrameHeight[ref_frame_idx[i]];
-			RenderWidth = RefRenderWidth[ref_frame_idx[i]];
-			RenderHeight = RefRenderHeight[ref_frame_idx[i]];
-#endif
+			state->UpscaledWidth = state->RefUpscaledWidth[ref_frame_idx[i]];
+			state->width = state->UpscaledWidth;
+			state->height = state->RefFrameHeight[ref_frame_idx[i]];
 			break;
 		}
 	}
@@ -2881,13 +3001,13 @@
 	}
 }
 
-static s32 av1_delta_q(GF_BitStream *bs)
+static s32 av1_delta_q(GF_BitStream *bs, const char *name_flag, const char *name)
 {
-	Bool delta_coded = gf_bs_read_int(bs, 1);
+	Bool delta_coded = gf_bs_read_int_log(bs, 1, name_flag);
 	s32 delta_q = 0;
 	if (delta_coded) {
 		u32 signMask = 1 << (7 - 1);
-		delta_q = gf_bs_read_int(bs, 7);
+		delta_q = gf_bs_read_int_log(bs, 7, name);
 		if (delta_q & signMask)
 			delta_q = delta_q - 2 * signMask;
 	}
@@ -2955,7 +3075,7 @@
 		s32 b2 = i ? k + i - 1 : k;
 		s32 a = 1 << b2;
 		if (numSyms <= mk + 3 * a) {
-			s32 subexp_final_bits = av1_read_ns(bs, numSyms - mk);
+			s32 subexp_final_bits = av1_read_ns(bs, numSyms - mk, NULL);
 			return subexp_final_bits + mk;
 		}
 		else {
@@ -3072,6 +3192,8 @@
 			state->RefOrderHint[i] = state->frame_state.order_hint;
 			state->SavedGmParams[i] = state->GmParams;
 			state->RefFrameType[i] = state->frame_state.frame_type;
+			state->RefUpscaledWidth[i] = state->UpscaledWidth;
+			state->RefFrameHeight[i] = state->height;
 		}
 	}
 	state->frame_state.seen_frame_header = GF_FALSE;
@@ -3241,18 +3363,18 @@
 		frame_state->show_existing_frame = 0;
 	}
 	else {
-		frame_state->show_existing_frame = gf_bs_read_int(bs, 1);
+		frame_state->show_existing_frame = gf_bs_read_int_log(bs, 1, "show_existing_frame");
 		if (frame_state->show_existing_frame == GF_TRUE) {
-			frame_state->frame_to_show_map_idx = gf_bs_read_int(bs, 3);
+			frame_state->frame_to_show_map_idx = gf_bs_read_int_log(bs, 3, "frame_to_show_map_idx");
 			frame_state->frame_type = state->RefFrameType[frame_state->frame_to_show_map_idx];
 
 			if (state->decoder_model_info_present_flag && !state->equal_picture_interval) {
-				/*frame_presentation_time = */gf_bs_read_int(bs, state->frame_presentation_time_length);
+				gf_bs_read_int_log(bs, state->frame_presentation_time_length, "frame_presentation_time");
 			}
 
 			frame_state->refresh_frame_flags = 0;
 			if (state->frame_id_numbers_present_flag) {
-				/*display_frame_id = */gf_bs_read_int(bs, idLen);
+				gf_bs_read_int_log(bs, idLen, "display_frame_id");
 			}
 			if (frame_state->frame_type == AV1_KEY_FRAME) {
 				frame_state->refresh_frame_flags = AV1_ALL_FRAMES;
@@ -3263,26 +3385,26 @@
 			}*/
 			return;
 		}
-		frame_state->frame_type = gf_bs_read_int(bs, 2);
+		frame_state->frame_type = gf_bs_read_int_log(bs, 2, "frame_type");
 		FrameIsIntra = (frame_state->frame_type == AV1_INTRA_ONLY_FRAME || frame_state->frame_type == AV1_KEY_FRAME);
-		frame_state->show_frame = gf_bs_read_int(bs, 1);
+		frame_state->show_frame = gf_bs_read_int_log(bs, 1, "show_frame");
 		if (frame_state->is_first_frame) {
 			frame_state->key_frame = frame_state->seen_seq_header && frame_state->show_frame && frame_state->frame_type == AV1_KEY_FRAME && frame_state->seen_frame_header;
 		}
 		if (frame_state->show_frame && state->decoder_model_info_present_flag && !state->equal_picture_interval) {
-			/*frame_presentation_time = */gf_bs_read_int(bs, state->frame_presentation_time_length);
+			gf_bs_read_int_log(bs, state->frame_presentation_time_length, "frame_presentation_time");
 		}
 		if (frame_state->show_frame) {
 			showable_frame = frame_state->frame_type != AV1_KEY_FRAME;
 
 		}
 		else {
-			showable_frame = gf_bs_read_int(bs, 1);
+			showable_frame = gf_bs_read_int_log(bs, 1, "showable_frame");
 		}
 		if (frame_state->frame_type == AV1_SWITCH_FRAME || (frame_state->frame_type == AV1_KEY_FRAME && frame_state->show_frame))
 			error_resilient_mode = GF_TRUE;
 		else
-			error_resilient_mode = gf_bs_read_int(bs, 1);
+			error_resilient_mode = gf_bs_read_int_log(bs, 1, "error_resilient_mode");
 	}
 
 	if ((frame_state->frame_type == AV1_KEY_FRAME) && frame_state->show_frame) {
@@ -3296,16 +3418,16 @@
 		}
 	}
 
-	disable_cdf_update = gf_bs_read_int(bs, 1);
+	disable_cdf_update = gf_bs_read_int_log(bs, 1, "disable_cdf_update");
 	if (state->seq_force_screen_content_tools == 2/*SELECT_SCREEN_CONTENT_TOOLS*/) {
-		allow_screen_content_tools = gf_bs_read_int(bs, 1);
+		allow_screen_content_tools = gf_bs_read_int_log(bs, 1, "allow_screen_content_tools");
 	}
 	else {
 		allow_screen_content_tools = state->seq_force_screen_content_tools;
 	}
 	if (allow_screen_content_tools) {
 		if (state->seq_force_integer_mv == 2/*SELECT_INTEGER_MV*/) {
-			force_integer_mv = gf_bs_read_int(bs, 1);
+			force_integer_mv = gf_bs_read_int_log(bs, 1, "force_integer_mv");
 		}
 		else {
 			force_integer_mv = state->seq_force_integer_mv;
@@ -3318,25 +3440,25 @@
 		force_integer_mv = 1;
 	}
 	if (state->frame_id_numbers_present_flag) {
-		/*current_frame_id = */gf_bs_read_int(bs, idLen);
+		gf_bs_read_int_log(bs, idLen, "current_frame_id");
 	}
 	if (frame_state->frame_type == AV1_SWITCH_FRAME)
 		frame_size_override_flag = GF_TRUE;
 	else if (state->reduced_still_picture_header)
 		frame_size_override_flag = GF_FALSE;
 	else
-		frame_size_override_flag = gf_bs_read_int(bs, 1);
+		frame_size_override_flag = gf_bs_read_int_log(bs, 1, "frame_size_override_flag");
 
-	frame_state->order_hint = gf_bs_read_int(bs, state->OrderHintBits);
+	frame_state->order_hint = gf_bs_read_int_log(bs, state->OrderHintBits, "order_hint");
 	if (FrameIsIntra || error_resilient_mode) {
 		primary_ref_frame = AV1_PRIMARY_REF_NONE;
 	}
 	else {
-		primary_ref_frame = gf_bs_read_int(bs, 3);
+		primary_ref_frame = gf_bs_read_int_log(bs, 3, "primary_ref_frame");
 	}
 
 	if (state->decoder_model_info_present_flag) {
-		u8 buffer_removal_time_present_flag = gf_bs_read_int(bs, 1);
+		u8 buffer_removal_time_present_flag = gf_bs_read_int_log(bs, 1, "buffer_removal_time_present_flag");
 		if (buffer_removal_time_present_flag) {
 			u32 opNum;
 			for (opNum = 0; opNum < state->operating_points_count; opNum++) {
@@ -3345,7 +3467,7 @@
 					u8 inTemporalLayer = (opPtIdc >> state->temporal_id) & 1;
 					u8 inSpatialLayer = (opPtIdc >> (state->spatial_id + 8)) & 1;
 					if (opPtIdc == 0 || (inTemporalLayer && inSpatialLayer)) {
-						/*buffer_removal_time[opNum] = */gf_bs_read_int(bs, state->buffer_removal_time_length);
+						gf_bs_read_int_log_idx(bs, state->buffer_removal_time_length, "buffer_removal_time", opNum);
 					}
 				}
 			}
@@ -3356,13 +3478,13 @@
 		frame_state->refresh_frame_flags = AV1_ALL_FRAMES;
 	}
 	else {
-		frame_state->refresh_frame_flags = gf_bs_read_int(bs, 8);
+		frame_state->refresh_frame_flags = gf_bs_read_int_log(bs, 8, "refresh_frame_flags");
 	}
 	if (!FrameIsIntra || frame_state->refresh_frame_flags != AV1_ALL_FRAMES) {
 		if (error_resilient_mode && state->enable_order_hint) {
 			u32 i = 0;
 			for (i = 0; i < AV1_NUM_REF_FRAMES; i++) {
-				u8 ref_order_hint = gf_bs_read_int(bs, state->OrderHintBits);
+				u8 ref_order_hint = gf_bs_read_int_log_idx(bs, state->OrderHintBits, "ref_order_hint", i);
 				if (ref_order_hint != state->RefOrderHint[i]) {
 					state->RefValid[i] = 0;
 				}
@@ -3376,7 +3498,7 @@
 		av1_frame_size(bs, state, frame_size_override_flag);
 		av1_render_size(bs);
 		if (allow_screen_content_tools && state->UpscaledWidth == state->width) {
-			allow_intrabc = gf_bs_read_int(bs, 1);
+			allow_intrabc = gf_bs_read_int_log(bs, 1, "allow_intrabc");
 		}
 	}
 	else {
@@ -3384,33 +3506,33 @@
 			av1_frame_size(bs, state, frame_size_override_flag);
 			av1_render_size(bs);
 			if (allow_screen_content_tools && state->UpscaledWidth == state->width) {
-				allow_intrabc = gf_bs_read_int(bs, 1);
+				allow_intrabc = gf_bs_read_int_log(bs, 1, "allow_intrabc");
 			}
 		}
 		else {
 			u32 i = 0;
 			Bool frame_refs_short_signaling = GF_FALSE;
 			if (state->enable_order_hint) {
-				frame_refs_short_signaling = gf_bs_read_int(bs, 1);
+				frame_refs_short_signaling = gf_bs_read_int_log(bs, 1, "frame_refs_short_signaling");
 				if (frame_refs_short_signaling) {
-					u8 last_frame_idx = gf_bs_read_int(bs, 3);
-					u8 gold_frame_idx = gf_bs_read_int(bs, 3);
+					u8 last_frame_idx = gf_bs_read_int_log(bs, 3, "last_frame_idx");
+					u8 gold_frame_idx = gf_bs_read_int_log(bs, 3, "gold_frame_idx");
 					av1_set_frame_refs(state, last_frame_idx, gold_frame_idx, ref_frame_idx);
 				}
 			}
 			for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
 				if (!frame_refs_short_signaling)
-					ref_frame_idx[i] = gf_bs_read_int(bs, 3);
+					ref_frame_idx[i] = gf_bs_read_int_log_idx(bs, 3, "ref_frame_idx", i);
 
 				if (state->frame_id_numbers_present_flag) {
 					u32 n = state->delta_frame_id_length_minus_2 + 2;
-					/*delta_frame_id_minus_1 =*/ gf_bs_read_int(bs, n);
+					/*delta_frame_id_minus_1 =*/ gf_bs_read_int_log_idx(bs, n, "delta_frame_id_minus1", i);
 					//DeltaFrameId = delta_frame_id_minus_1 + 1;
 					//expectedFrameId[i] = ((current_frame_id + (1 << idLen) - DeltaFrameId) % (1 << idLen));
 				}
 			}
 			if (frame_size_override_flag && !error_resilient_mode) {
-				frame_size_with_refs(bs, state, frame_size_override_flag);
+				frame_size_with_refs(bs, state, frame_size_override_flag, ref_frame_idx);
 			}
 			else {
 				av1_frame_size(bs, state, frame_size_override_flag);
@@ -3418,14 +3540,14 @@
 			}
 			frame_state->allow_high_precision_mv = 0;
 			if (!force_integer_mv) {
-				frame_state->allow_high_precision_mv = gf_bs_read_int(bs, 1);
+				frame_state->allow_high_precision_mv = gf_bs_read_int_log(bs, 1, "allow_high_precision_mv");
 			}
 
 			read_interpolation_filter(bs);
 
-			/*is_motion_mode_switchable =*/ gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log(bs, 1, "is_motion_mode_switchable");
 			if (!(error_resilient_mode || !state->enable_ref_frame_mvs)) {
-				/*use_ref_frame_mvs = */gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 1, "use_ref_frame_mvs");
 			}
 		}
 	}
@@ -3450,7 +3572,7 @@
 	}
 
 	if (!(state->reduced_still_picture_header || disable_cdf_update))
-		/*disable_frame_end_update_cdf = */gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log(bs, 1, "disable_frame_end_update_cdf");
 
 	if (primary_ref_frame == AV1_PRIMARY_REF_NONE) {
 		//init_non_coeff_cdfs();
@@ -3463,29 +3585,29 @@
 
 	av1_parse_tile_info(bs, state);
 	//quantization_params( ):
-	u8 base_q_idx = gf_bs_read_int(bs, 8);
+	u8 base_q_idx = gf_bs_read_int_log(bs, 8, "base_q_idx");
 	s32 DeltaQUDc = 0;
 	s32 DeltaQUAc = 0;
 	s32 DeltaQVDc = 0;
 	s32 DeltaQVAc = 0;
-	s32 DeltaQYDc = av1_delta_q(bs);
+	s32 DeltaQYDc = av1_delta_q(bs, "DeltaQYDc_coded", "DeltaQYDc");
 	if (!state->config->monochrome) {
 		u8 diff_uv_delta = 0;
 		if (state->separate_uv_delta_q)
-			diff_uv_delta = gf_bs_read_int(bs, 1);
+			diff_uv_delta = gf_bs_read_int_log(bs, 1, "diff_uv_delta");
 
-		DeltaQUDc = av1_delta_q(bs);
-		DeltaQUAc = av1_delta_q(bs);
+		DeltaQUDc = av1_delta_q(bs, "DeltaQUDc_coded", "DeltaQUDc");
+		DeltaQUAc = av1_delta_q(bs, "DeltaQUAc_coded", "DeltaQUAc");
 		if (diff_uv_delta) {
-			DeltaQVDc = av1_delta_q(bs);
-			DeltaQVAc = av1_delta_q(bs);
+			DeltaQVDc = av1_delta_q(bs, "DeltaQVDc_coded", "DeltaQVDc");
+			DeltaQVAc = av1_delta_q(bs, "DeltaQVAc_coded", "DeltaQVAc");
 		}
 	}
-	if (/*using_qmatrix*/gf_bs_read_int(bs, 1)) {
-		/*qm_y = */gf_bs_read_int(bs, 4);
-		/*qm_y = */gf_bs_read_int(bs, 4);
-		if (!state->separate_uv_delta_q) {
-			/*qm_v = */gf_bs_read_int(bs, 4);
+	if (gf_bs_read_int_log(bs, 1, "using_qmatrix")) {
+		gf_bs_read_int_log(bs, 4, "qm_y");
+		gf_bs_read_int_log(bs, 4, "qm_u");
+		if (state->separate_uv_delta_q) {
+			gf_bs_read_int_log(bs, 4, "qm_v");
 		}
 	}
 
@@ -3493,31 +3615,31 @@
 	s32 seg_features_SEG_LVL_ALT_Q[8] = { 0,0,0,0,0,0,0,0 };
 
 	//segmentation_params( ):
-	u8 segmentation_enabled = gf_bs_read_int(bs, 1);
+	u8 segmentation_enabled = gf_bs_read_int_log(bs, 1, "segmentation_enabled");
 	if (segmentation_enabled) {
 		/*u8 segmentation_temporal_update = 0;*/
 		u8 segmentation_update_data = 1;
 		if (primary_ref_frame != AV1_PRIMARY_REF_NONE) {
-			u8 segmentation_update_map = gf_bs_read_int(bs, 1);
+			u8 segmentation_update_map = gf_bs_read_int_log(bs, 1, "segmentation_update_map");
 			if (segmentation_update_map == 1)
-				/*segmentation_temporal_update = */gf_bs_read_int(bs, 1);
-			segmentation_update_data = gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 1, "segmentation_temporal_update");
+			segmentation_update_data = gf_bs_read_int_log(bs, 1, "segmentation_update_data");
 		}
 		if (segmentation_update_data == 1) {
 			u32 i, j;
 			for (i = 0; i < 8/*=MAX_SEGMENTS*/; i++) {
 				for (j = 0; j < 8 /*=SEG_LVL_MAX*/; j++) {
-					if (/*feature_enabled = */gf_bs_read_int(bs, 1) == 1) {
+					if (/*feature_enabled = */gf_bs_read_int_log_idx2(bs, 1, "feature_enabled", i, j) == 1) {
 						s32 val;
 						u32 bitsToRead = Segmentation_Feature_Bits[j];
 						//this is SEG_LVL_ALT_Q
 						if (!j) seg_features_SEG_LVL_ALT_Q_enabled[i] = 1;
 
 						if (Segmentation_Feature_Signed[j] == 1) {
-							val = gf_bs_read_int(bs, 1 + bitsToRead);
+							val = gf_bs_read_int_log_idx2(bs, 1 + bitsToRead, "signed_feature_value", i, j);
 						}
 						else {
-							val = gf_bs_read_int(bs, bitsToRead);
+							val = gf_bs_read_int_log_idx2(bs, bitsToRead, "feature_value", i, j);
 						}
 						if (!j) seg_features_SEG_LVL_ALT_Q[i] = val;
 					}
@@ -3532,10 +3654,10 @@
 	/*u8 delta_q_res = 0;*/
 	u8 delta_q_present = 0;
 	if (base_q_idx > 0) {
-		delta_q_present = gf_bs_read_int(bs, 1);
+		delta_q_present = gf_bs_read_int_log(bs, 1, "delta_q_present");
 	}
 	if (delta_q_present) {
-		/*delta_q_res = */gf_bs_read_int(bs, 2);
+		gf_bs_read_int_log(bs, 2, "delta_q_res");
 	}
 
 	//delta_lf_params():
@@ -3544,11 +3666,11 @@
 	u8 delta_lf_multi = 0;*/
 	if (delta_q_present) {
 		if (!allow_intrabc) {
-			delta_lf_present = gf_bs_read_int(bs, 1);
+			delta_lf_present = gf_bs_read_int_log(bs, 1, "delta_lf_present");
 		}
 		if (delta_lf_present) {
-			/*delta_lf_res = */gf_bs_read_int(bs, 2);
-			/*delta_lf_multi = */gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log(bs, 2, "delta_lf_res");
+			gf_bs_read_int_log(bs, 1, "delta_lf_multi");
 		}
 	}
 
@@ -3564,30 +3686,30 @@
 
 	//loop_filter_params():
 	if (!CodedLossless && !allow_intrabc) {
-		u8 loop_filter_level_0 = gf_bs_read_int(bs, 6);
-		u8 loop_filter_level_1 = gf_bs_read_int(bs, 6);
+		u8 loop_filter_level_0 = gf_bs_read_int_log(bs, 6, "loop_filter_level_0");
+		u8 loop_filter_level_1 = gf_bs_read_int_log(bs, 6, "loop_filter_level_1");
 		if (!state->config->monochrome) {
 			if (loop_filter_level_0 || loop_filter_level_1) {
-				/*u8 loop_filter_level_2 = */gf_bs_read_int(bs, 6);
-				/*u8 loop_filter_level_3 = */gf_bs_read_int(bs, 6);
+				gf_bs_read_int_log(bs, 6, "loop_filter_level_2");
+				gf_bs_read_int_log(bs, 6, "loop_filter_level_3");
 			}
 		}
-		/*u8 loop_filter_sharpness = */gf_bs_read_int(bs, 3);
-		u8 loop_filter_delta_enabled = gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log(bs, 3, "loop_filter_sharpness");
+		u8 loop_filter_delta_enabled = gf_bs_read_int_log(bs, 1, "loop_filter_delta_enabled");
 		if (loop_filter_delta_enabled == 1) {
-			u8 loop_filter_delta_update = gf_bs_read_int(bs, 1);
+			u8 loop_filter_delta_update = gf_bs_read_int_log(bs, 1, "loop_filter_delta_update");
 			if (loop_filter_delta_update) {
 				u32 i;
 				for (i = 0; i < 8/*TOTAL_REFS_PER_FRAME*/; i++) {
-					u8 update_ref_delta = gf_bs_read_int(bs, 1);
+					u8 update_ref_delta = gf_bs_read_int_log_idx(bs, 1, "update_ref_delta", i);
 					if (update_ref_delta == 1) {
-						/*u8 loop_filter_ref_deltas_i = */gf_bs_read_int(bs, 1 + 6);
+						gf_bs_read_int_log_idx(bs, 1 + 6, "loop_filter_ref_deltas", i);
 					}
 				}
 				for (i = 0; i < 2; i++) {
-					u8 update_mode_delta = gf_bs_read_int(bs, 1);
+					u8 update_mode_delta = gf_bs_read_int_log_idx(bs, 1, "update_mode_delta", i);
 					if (update_mode_delta) {
-						/*u8 loop_filter_mode_deltas_i = */gf_bs_read_int(bs, 1 + 6);
+						gf_bs_read_int_log_idx(bs, 1 + 6, "loop_filter_mode_deltas", i);
 					}
 				}
 			}
@@ -3595,15 +3717,15 @@
 	}
 	//cdef_params( ):
 	if (!CodedLossless && !allow_intrabc && state->enable_cdef) {
-		/*u8 cdef_damping_minus_3 = */gf_bs_read_int(bs, 2);
-		u8 cdef_bits = gf_bs_read_int(bs, 2);
+		gf_bs_read_int_log(bs, 2, "cdef_damping_minus_3");
+		u8 cdef_bits = gf_bs_read_int_log(bs, 2, "cdef_bits");
 		u32 i, num_cd = 1 << cdef_bits;
 		for (i = 0; i < num_cd; i++) {
-			/*u8 cdef_y_pri_strength_i = */gf_bs_read_int(bs, 4);
-			/*u8 cdef_y_sec_strength_i = */gf_bs_read_int(bs, 2);
+			gf_bs_read_int_log_idx(bs, 4, "cdef_y_pri_strength", i);
+			gf_bs_read_int_log_idx(bs, 2, "cdef_y_sec_strength", i);
 			if (!state->config->monochrome) {
-				/*u8 cdef_uv_pri_strength_i = */gf_bs_read_int(bs, 4);
-				/*u8 cdef_uv_sec_strength_i = */gf_bs_read_int(bs, 2);
+				gf_bs_read_int_log_idx(bs, 4, "cdef_uv_pri_strength", i);
+				gf_bs_read_int_log_idx(bs, 2, "cdef_uv_sec_strength", i);
 			}
 		}
 	}
@@ -3614,7 +3736,7 @@
 		u8 UsesLr = 0;
 		u8 usesChromaLr = 0;
 		for (i = 0; i < nb_planes; i++) {
-			u8 lr_type = gf_bs_read_int(bs, 2);
+			u8 lr_type = gf_bs_read_int_log_idx(bs, 2, "lr_type", i);
 			//FrameRestorationType[i] = Remap_Lr_Type[lr_type]
 			if (lr_type != AV1_RESTORE_NONE) {
 				UsesLr = 1;
@@ -3625,17 +3747,17 @@
 		}
 		if (UsesLr) {
 			if (state->use_128x128_superblock) {
-				/*u8 lr_unit_shift_minus_1 = */gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 1, "lr_unit_shift_minus_1");
 			}
 			else {
-				u8 lr_unit_shift = gf_bs_read_int(bs, 1);
+				u8 lr_unit_shift = gf_bs_read_int_log(bs, 1, "lr_unit_shift");
 				if (lr_unit_shift) {
-					/*u8 lr_unit_extra_shift = */gf_bs_read_int(bs, 1);
+					gf_bs_read_int_log(bs, 1, "lr_unit_extra_shift");
 					//lr_unit_shift += lr_unit_extra_shift;
 				}
 			}
 			if (state->config->chroma_subsampling_x && state->config->chroma_subsampling_y && usesChromaLr) {
-				/*u8 lr_uv_shift = */gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 1, "lr_uv_shift");
 			}
 		}
 	}
@@ -3643,7 +3765,7 @@
 	if (CodedLossless == 1) {
 	}
 	else {
-		/*tx_mode_select = */gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log(bs, 1, "tx_mode_select");
 	}
 
 	//frame_reference_mode( ):
@@ -3651,7 +3773,7 @@
 	if (FrameIsIntra) {
 	}
 	else {
-		reference_select = gf_bs_read_int(bs, 1);
+		reference_select = gf_bs_read_int_log(bs, 1, "reference_select");
 	}
 
 	//skip_mode_params( ):
@@ -3710,7 +3832,7 @@
 		}
 	}
 	if (skipModeAllowed) {
-		/*skip_mode_present = */gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log(bs, 1, "skip_mode_present");
 	}
 
 
@@ -3718,10 +3840,10 @@
 
 	}
 	else {
-		/*allow_warped_motion = */gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log(bs, 1, "allow_warped_motion");
 	}
 
-	/*reduced_tx = */gf_bs_read_int(bs, 1);
+	gf_bs_read_int_log(bs, 1, "reduced_tx");
 
 	//global_motion_params( )
 	u32 ref;
@@ -3735,14 +3857,14 @@
 		u32 refs;
 		for (refs = AV1_LAST_FRAME; refs <= AV1_ALTREF_FRAME; refs++) {
 			u8 type = AV1_GMC_IDENTITY;
-			Bool is_global = gf_bs_read_int(bs, 1);
+			Bool is_global = gf_bs_read_int_log_idx(bs, 1, "is_global", refs);
 			if (is_global) {
-				Bool is_rot_zoom = gf_bs_read_int(bs, 1);
+				Bool is_rot_zoom = gf_bs_read_int_log_idx(bs, 1, "is_rot_zoom", refs);
 				if (is_rot_zoom) {
 					type = AV1_GMC_ROTZOOM;
 				}
 				else {
-					Bool is_trans = gf_bs_read_int(bs, 1);
+					Bool is_trans = gf_bs_read_int_log_idx(bs, 1, "is_translation", refs);
 					type = is_trans ? AV1_GMC_TRANSLATION : AV1_GMC_AFFINE;
 
 				}
@@ -3772,24 +3894,25 @@
 	if (!state->film_grain_params_present || (!state->frame_state.show_frame && !showable_frame)) {
 	}
 	else {
-		u8 apply_grain = gf_bs_read_int(bs, 1);
+		u8 apply_grain = gf_bs_read_int_log(bs, 1, "apply_grain");
 		if (apply_grain) {
-			/*u8 grain_seed = */gf_bs_read_int(bs, 16);
+			gf_bs_read_int_log(bs, 16, "grain_seed");
 			u8 update_grain = 1;
 			if (state->frame_state.frame_type == AV1_INTER_FRAME) {
-				update_grain = gf_bs_read_int(bs, 1);
+				update_grain = gf_bs_read_int_log(bs, 1, "update_grain");
 			}
 			if (!update_grain) {
-				/*u8 film_grain_params_ref_idx = */gf_bs_read_int(bs, 3);
+				gf_bs_read_int_log(bs, 3, "film_grain_params_ref_idx");
 			}
 			else {
-				u32 i, num_y_points = gf_bs_read_int(bs, 4);
+				u32 i, num_y_points = gf_bs_read_int_log(bs, 4, "num_y_points");
 				for (i = 0; i < num_y_points; i++) {
-					/*u8 point_y_value = */gf_bs_read_int(bs, 8);
-					/*u8 point_y_scaling = */gf_bs_read_int(bs, 8);
+					gf_bs_read_int_log_idx(bs, 8, "point_y_value", i);
+					gf_bs_read_int_log_idx(bs, 8, "point_y_scaling", i);
 				}
 				u8 chroma_scaling_from_luma = 0;
-				if (!state->config->monochrome) chroma_scaling_from_luma = gf_bs_read_int(bs, 1);
+				if (!state->config->monochrome)
+					chroma_scaling_from_luma = gf_bs_read_int_log(bs, 1, "chroma_scaling_from_luma");
 
 				u8 num_cb_points = 0;
 				u8 num_cr_points = 0;
@@ -3798,51 +3921,51 @@
 					) {
 				}
 				else {
-					num_cb_points = gf_bs_read_int(bs, 4);
+					num_cb_points = gf_bs_read_int_log(bs, 4, "num_cb_points");
 					for (i = 0; i < num_cb_points; i++) {
-						/*point_cb_value[ i ] = */gf_bs_read_int(bs, 8);
-						/*point_cb_scaling[ i ] = */gf_bs_read_int(bs, 8);
+						gf_bs_read_int_log_idx(bs, 8, "point_cb_value", i);
+						gf_bs_read_int_log_idx(bs, 8, "point_cb_scaling", i);
 					}
-					num_cr_points = gf_bs_read_int(bs, 4);
+					num_cr_points = gf_bs_read_int_log(bs, 4, "num_cr_points");
 					for (i = 0; i < num_cr_points; i++) {
-						/*point_cb_value[ i ] = */gf_bs_read_int(bs, 8);
-						/*point_cb_scaling[ i ] = */gf_bs_read_int(bs, 8);
+						gf_bs_read_int_log_idx(bs, 8, "point_cr_value", i);
+						gf_bs_read_int_log_idx(bs, 8, "point_cr_scaling", i);
 					}
 				}
-				/*u8 grain_scaling_minus_8 = */gf_bs_read_int(bs, 2);
-				u8 ar_coeff_lag = gf_bs_read_int(bs, 2);
+				gf_bs_read_int_log(bs, 2, "grain_scaling_minus_8");
+				u8 ar_coeff_lag = gf_bs_read_int_log(bs, 2, "ar_coeff_lag");
 				u16 numPosLuma = 2 * ar_coeff_lag * (ar_coeff_lag + 1);
 				u16 numPosChroma = numPosLuma;
 				if (num_y_points) {
 					numPosChroma = numPosLuma + 1;
 					for (i = 0; i < numPosLuma; i++) {
-						/*ar_coeffs_y_plus_128[ i ] = */gf_bs_read_int(bs, 8);
+						gf_bs_read_int_log_idx(bs, 8, "ar_coeffs_y_plus_128", i);
 					}
 				}
 				if (chroma_scaling_from_luma || num_cb_points) {
 					for (i = 0; i < numPosChroma; i++) {
-						/*ar_coeffs_cb_plus_128[ i ] =*/gf_bs_read_int(bs, 8);
+						gf_bs_read_int_log_idx(bs, 8, "ar_coeffs_cb_plus_128", i);
 					}
 				}
 				if (chroma_scaling_from_luma || num_cr_points) {
 					for (i = 0; i < numPosChroma; i++) {
-						/*ar_coeffs_cr_plus_128[ i ] =*/gf_bs_read_int(bs, 8);
+						gf_bs_read_int_log_idx(bs, 8, "ar_coeffs_cr_plus_128", i);
 					}
 				}
-				/*u8 ar_coeff_shift_minus_6 = */gf_bs_read_int(bs, 2);
-				/*u8 grain_scale_shift = */gf_bs_read_int(bs, 2);
+				gf_bs_read_int_log(bs, 2, "ar_coeff_shift_minus_6");
+				gf_bs_read_int_log(bs, 2, "grain_scale_shift");
 				if (num_cb_points) {
-					/*u8 cb_mult = */gf_bs_read_int(bs, 8);
-					/*u8 cb_luma_mult = */gf_bs_read_int(bs, 8);
-					/*u8 cb_offset = */gf_bs_read_int(bs, 9);
+					gf_bs_read_int_log(bs, 8, "cb_mult");
+					gf_bs_read_int_log(bs, 8, "cb_luma_mult");
+					gf_bs_read_int_log(bs, 9, "cb_offset");
 				}
 				if (num_cr_points) {
-					/*u8 cr_mult = */gf_bs_read_int(bs, 8);
-					/*u8 cr_luma_mult = */gf_bs_read_int(bs, 8);
-					/*u8 cr_offset = */gf_bs_read_int(bs, 9);
+					gf_bs_read_int_log(bs, 8, "cr_mult");
+					gf_bs_read_int_log(bs, 8, "cr_luma_mult");
+					gf_bs_read_int_log(bs, 9, "cr_offset");
 				}
-				/*u8 overlap_flag = */gf_bs_read_int(bs, 1);
-				/*u8 clip_to_restricted_range = */gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 1, "overlap_flag");
+				gf_bs_read_int_log(bs, 1, "clip_to_restricted_range");
 			}
 		}
 	}
@@ -3889,9 +4012,18 @@
 		gf_list_del(l1);
 		gf_list_del(l2);
 		if (state->bs) {
-			if (gf_bs_get_position(state->bs)) {
-				u32 size;
-				gf_bs_get_content_no_truncate(state->bs, &state->frame_obus, &size, &state->frame_obus_alloc);
+			u32 size, asize=0;
+			u8 *ptr=NULL;
+			//detach BS internal buffer
+			gf_bs_get_content_no_truncate(state->bs, &ptr, &size, &asize);
+			//avoid double free, cf issue 1893
+			if (ptr != state->frame_obus) {
+				gf_free(ptr);
+			}
+			if (state->frame_obus) {
+				gf_free(state->frame_obus);
+				state->frame_obus = NULL;
+				state->frame_obus_alloc = 0;
 			}
 			gf_bs_del(state->bs);
 		}
@@ -3912,7 +4044,7 @@
 	Bool tile_start_and_end_present_flag = GF_FALSE;
 	GF_Err e = GF_OK;
 	if (numTiles > 1)
-		tile_start_and_end_present_flag = gf_bs_read_int(bs, 1);
+		tile_start_and_end_present_flag = gf_bs_read_int_log(bs, 1, "tile_start_and_end_present_flag");
 
 	if (numTiles == 1 || !tile_start_and_end_present_flag) {
 		tg_start = 0;
@@ -3922,8 +4054,8 @@
 	}
 	else {
 		u32 tileBits = state->tileColsLog2 + state->tileRowsLog2;
-		/*state->frame_state.tg[state->frame_state.tg_idx].start_idx*/ tg_start = gf_bs_read_int(bs, tileBits);
-		/*state->frame_state.tg[state->frame_state.tg_idx].end_idx*/ tg_end = gf_bs_read_int(bs, tileBits);
+		/*state->frame_state.tg[state->frame_state.tg_idx].start_idx*/ tg_start = gf_bs_read_int_log(bs, tileBits, "tg_start");
+		/*state->frame_state.tg[state->frame_state.tg_idx].end_idx*/ tg_end = gf_bs_read_int_log(bs, tileBits, "tg_end");
 	}
 	/*state->frame_state.tg_idx++;*/
 
@@ -3944,7 +4076,7 @@
 			tile_size = (u32)(obu_size - (pos - obu_start));
 		}
 		else {
-			u64 tile_size_minus_1 = aom_av1_le(bs, state->tile_size_bytes);
+			u64 tile_size_minus_1 = aom_av1_le(bs, state->tile_size_bytes, "tile_size_minus_1");
 			pos = gf_bs_get_position(bs);
 			tile_start_offset = (u32)(pos - obu_start);
 			tile_size = (u32)(tile_size_minus_1 + 1/* + state->tile_size_bytes*/);
@@ -3998,32 +4130,47 @@
 	return av1_parse_tile_group(bs, state, obu_start, obu_size);
 }
 
-static void on_aom_av1_eos(void *_state)
+static void av1_parse_obu_metadata(AV1State *state, GF_BitStream *bs)
 {
-	AV1State *state = (AV1State *)_state;
-	state->bs_overread = GF_TRUE;
+	u32 metadata_type = (u32)gf_av1_leb128_read(bs, NULL);
+
+	switch (metadata_type) {
+	case OBU_METADATA_TYPE_ITUT_T35:
+		break;
+	case OBU_METADATA_TYPE_HDR_CLL:
+		gf_bs_read_data(bs, state->clli_data, 4);
+		state->clli_valid = 1;
+		break;
+	case OBU_METADATA_TYPE_HDR_MDCV:
+		gf_bs_read_data(bs, state->mdcv_data, 24);
+		state->mdcv_valid = 1;
+		break;
+	default:
+		break;
+	}
 }
 
 GF_EXPORT
-GF_Err gf_media_aom_av1_parse_obu(GF_BitStream *bs, ObuType *obu_type, u64 *obu_size, u32 *obu_hdr_size, AV1State *state)
+GF_Err gf_av1_parse_obu(GF_BitStream *bs, ObuType *obu_type, u64 *obu_size, u32 *obu_hdr_size, AV1State *state)
 {
 	GF_Err e = GF_OK;
-	u32 hdr_size;
+	u32 i, hdr_size;
 	u64 pos = gf_bs_get_position(bs);
 
 	if (!bs || !obu_type || !state)
 		return GF_BAD_PARAM;
 
-	state->bs_overread = GF_FALSE;
-	gf_bs_set_eos_callback(bs, on_aom_av1_eos, state);
+	gf_bs_mark_overflow(bs, GF_TRUE);
 
 	state->obu_extension_flag = state->obu_has_size_field = 0;
 	state->temporal_id = state->spatial_id = 0;
 	state->frame_state.uncompressed_header_bytes = 0;
 	e = gf_av1_parse_obu_header(bs, obu_type, &state->obu_extension_flag, &state->obu_has_size_field, &state->temporal_id, &state->spatial_id);
+	if (gf_bs_is_overflow(bs)) e = GF_NON_COMPLIANT_BITSTREAM;
 	if (e)
 		return e;
 
+	//at this point obu_size is either zero or the size of the containing buffer (likely the Temporal Unit)
 	if (state->obu_has_size_field) {
 		*obu_size = (u32)gf_av1_leb128_read(bs, NULL);
 	}
@@ -4037,14 +4184,14 @@
 		}
 	}
 	hdr_size = (u32)(gf_bs_get_position(bs) - pos);
-	if ((gf_bs_available(bs) < *obu_size) || state->bs_overread) {
+	if (gf_bs_is_overflow(bs) || (gf_bs_available(bs) < *obu_size) ) {
 		gf_bs_seek(bs, pos);
 		return GF_BUFFER_TOO_SMALL;
 	}
+	//gpac's internal obu_size includes the header + the payload
 	*obu_size += hdr_size;
 	if (obu_hdr_size) *obu_hdr_size = hdr_size;
 
-
 	if (*obu_type != OBU_SEQUENCE_HEADER && *obu_type != OBU_TEMPORAL_DELIMITER &&
 		state->OperatingPointIdc != 0 && state->obu_extension_flag == 1)
 	{
@@ -4058,10 +4205,16 @@
 	}
 
 	e = GF_OK;
+
+	/* for AVIF a1lx */
+	for (i = state->spatial_id; i < 4; i++) {
+		state->layer_size[i] = (u32) (pos + *obu_size);
+	}
+
 	switch (*obu_type) {
 	case OBU_SEQUENCE_HEADER:
 		av1_parse_sequence_header_obu(bs, state);
-		if (gf_bs_get_position(bs) > pos + *obu_size) {
+		if (gf_bs_is_overflow(bs) || (gf_bs_get_position(bs) > pos + *obu_size)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Sequence header parsing consumed too many bytes !\n"));
 			e = GF_NON_COMPLIANT_BITSTREAM;
 		}
@@ -4069,34 +4222,16 @@
 		break;
 
 	case OBU_METADATA:
-#if 0
-		//TODO + sample groups
-		const ObuMetadataType metadata_type = (u32)read_leb128(bs, NULL); we should check for 16 bits limit(AV1MetadataSampleGroupEntry) for ISOBMFF bindings, see https ://github.com/AOMediaCodec/av1-isobmff/pull/86#issuecomment-416659538
-		if (metadata_type == OBU_METADATA_TYPE_ITUT_T35) {
-		}
-		else if (metadata_type == OBU_METADATA_TYPE_HDR_CLL) {
-		}
-		else if (metadata_type == OBU_METADATA_TYPE_HDR_MDCV) {
-		}
-		else if (metadata_type == OBU_METADATA_TYPE_SCALABILITY) {
-		}
-		else if (metadata_type == METADATA_TYPE_TIMECODE) {
-		}
-#endif
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[AV1] parsing for metadata is not implemented. Forwarding.\n"));
-
-		if (gf_bs_get_position(bs) > pos + *obu_size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Metadata parsing consumed too many bytes !\n"));
-			e = GF_NON_COMPLIANT_BITSTREAM;
-		}
+		av1_parse_obu_metadata(state, bs);
 		gf_bs_seek(bs, pos + *obu_size);
+		if (gf_bs_is_overflow(bs)) e = GF_NON_COMPLIANT_BITSTREAM;
 		break;
 
 	case OBU_FRAME_HEADER:
 	case OBU_REDUNDANT_FRAME_HEADER:
 		if (state->config) {
 			av1_parse_frame_header(bs, state);
-			if (gf_bs_get_position(bs) > pos + *obu_size) {
+			if (gf_bs_is_overflow(bs) || (gf_bs_get_position(bs) > pos + *obu_size)) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Frame header parsing consumed too many bytes !\n"));
 				e = GF_NON_COMPLIANT_BITSTREAM;
 			}
@@ -4105,7 +4240,7 @@
 		break;
 	case OBU_FRAME:
 		e = av1_parse_frame(bs, state, pos, *obu_size);
-		if (gf_bs_get_position(bs) != pos + *obu_size) {
+		if (gf_bs_is_overflow(bs) || (gf_bs_get_position(bs) != pos + *obu_size)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Frame parsing did not consume the right number of bytes !\n"));
 			e = GF_NON_COMPLIANT_BITSTREAM;
 		}
@@ -4114,7 +4249,7 @@
 	case OBU_TILE_GROUP:
 		if (state->config) {
 			e = av1_parse_tile_group(bs, state, pos, *obu_size);
-			if (gf_bs_get_position(bs) != pos + *obu_size) {
+			if (gf_bs_is_overflow(bs) || (gf_bs_get_position(bs) != pos + *obu_size)) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Tile group parsing did not consume the right number of bytes !\n"));
 				e = GF_NON_COMPLIANT_BITSTREAM;
 			}
@@ -4123,6 +4258,7 @@
 		break;
 	case OBU_TEMPORAL_DELIMITER:
 		state->frame_state.seen_frame_header = GF_FALSE;
+		state->clli_valid = state->mdcv_valid = 0;
 	case OBU_PADDING:
 		gf_bs_seek(bs, pos + *obu_size);
 		break;
@@ -4505,30 +4641,17 @@
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
-
-GF_EXPORT
-Bool gf_avc_is_rext_profile(u8 profile_idc)
+Bool gf_avcc_use_extensions(u8 profile_idc)
 {
 	switch (profile_idc) {
-	case 100:
-	case 110:
-	case 122:
-	case 244:
-	case 44:
-	case 83:
-	case 86:
-	case 118:
-	case 128:
-	case 138:
-	case 139:
-	case 134:
-	case 135:
-		return GF_TRUE;
-	default:
+	case 66:
+	case 77:
+	case 88:
 		return GF_FALSE;
+	default:
+		return GF_TRUE;
 	}
 }
-
 GF_EXPORT
 const char *gf_avc_get_profile_name(u8 video_prof)
 {
@@ -4588,56 +4711,79 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-
-static u8 avc_golomb_bits[256] = {
-	8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3,
-	3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2,
-	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0
-};
-
-u32 gf_bs_get_ue(GF_BitStream *bs)
+u32 gf_bs_read_ue_log_idx3(GF_BitStream *bs, const char *fname, s32 idx1, s32 idx2, s32 idx3)
 {
-	u8 coded;
-	u32 bits = 0, read = 0;
-	while (1) {
-		read = gf_bs_peek_bits(bs, 8, 0);
-		if (read) break;
-		//check whether we still have bits once the peek is done since we may have less than 8 bits available
-		if (!gf_bs_available(bs)) {
-			//log moved as debug, erro log thrown by gf_bs_read_*
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[AVC/HEVC] Not enough bits in bitstream !!\n"));
-			return 0;
+	u32 val=0, code;
+	s32 nb_lead = -1;
+	u32 bits = 0;
+	for (code=0; !code; nb_lead++) {
+		if (nb_lead>=32) {
+			break;
+		}
+		code = gf_bs_read_int(bs, 1);
+		bits++;
+	}
+
+	if (nb_lead>=32) {
+		if (gf_bs_is_overflow(bs)<2) {
+			//gf_bs_read_int keeps returning 0 on EOS, so if no more bits available, rbsp was truncated otherwise code is broken in rbsp)
+			//we only test once nb_lead>=32 to avoid testing at each bit read
+			if (!gf_bs_available(bs)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[Core] exp-golomb read failed, not enough bits in bitstream !\n"));
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[Core] corrupted exp-golomb code, %d leading zeros, max 31 allowed !\n", nb_lead));
+			}
+			gf_bs_mark_overflow(bs, GF_FALSE);
 		}
-		gf_bs_read_int(bs, 8);
-		bits += 8;
+		return 0;
 	}
-	coded = avc_golomb_bits[read];
-	gf_bs_read_int(bs, coded);
-	bits += coded;
-	return gf_bs_read_int(bs, bits + 1) - 1;
+
+	if (nb_lead) {
+		u32 leads=1;
+		val = gf_bs_read_int(bs, nb_lead);
+		leads <<= nb_lead;
+		leads -= 1;
+		val += leads;
+//		val += (1 << nb_lead) - 1;
+		bits += nb_lead;
+	}
+
+	if (fname) {
+		gf_bs_log_idx(bs, bits, fname, val, idx1, idx2, idx3);
+	}
+	return val;
+}
+
+#define gf_bs_read_ue_log_idx2(_bs, _fname, _idx1, _idx2) gf_bs_read_ue_log_idx3(_bs, _fname, (s32) _idx1, (s32) _idx2, -1)
+#define gf_bs_read_ue_log_idx(_bs, _fname, _idx) gf_bs_read_ue_log_idx3(_bs, _fname, (s32) _idx, -1, -1)
+#define gf_bs_read_ue_log(_bs, _fname) gf_bs_read_ue_log_idx3(_bs, _fname, -1, -1, -1)
+
+
+u32 gf_bs_read_ue(GF_BitStream *bs)
+{
+	return gf_bs_read_ue_log(bs, NULL);
 }
 
-s32 gf_bs_get_se(GF_BitStream *bs)
+s32 gf_bs_read_se(GF_BitStream *bs)
 {
-	u32 v = gf_bs_get_ue(bs);
+	u32 v = gf_bs_read_ue(bs);
 	if ((v & 0x1) == 0) return (s32)(0 - (v >> 1));
 	return (v + 1) >> 1;
 }
 
-void gf_bs_set_ue(GF_BitStream *bs, u32 num) {
+s32 gf_bs_read_se_log_idx2(GF_BitStream *bs, const char *fname, s32 idx1, s32 idx2)
+{
+	s32 res = gf_bs_read_se(bs);
+	if (fname)
+		gf_bs_log_idx(bs, -1, fname, res, idx1, idx2, -1);
+	return res;
+}
+#define gf_bs_read_se_log_idx(_bs, _fname, _idx) gf_bs_read_se_log_idx2(_bs, _fname, (s32) _idx, -1)
+#define gf_bs_read_se_log(_bs, _fname) gf_bs_read_se_log_idx2(_bs, _fname, -1, -1)
+
+
+
+void gf_bs_write_ue(GF_BitStream *bs, u32 num) {
 	s32 length = 1;
 	s32 temp = ++num;
 
@@ -4650,7 +4796,19 @@
 	gf_bs_write_int(bs, num, (length + 1) >> 1);
 }
 
-void gf_bs_set_se(GF_BitStream *bs, s32 num)
+static u32 gf_get_ue_nb_bits(u32 num) {
+	s32 length = 1;
+	s32 temp = ++num;
+
+	while (temp != 1) {
+		temp >>= 1;
+		length += 2;
+	}
+
+	return (length >> 1) + ( (length + 1) >> 1);
+}
+
+void gf_bs_write_se(GF_BitStream *bs, s32 num)
 {
 	u32 v;
 	if (num <= 0)
@@ -4658,7 +4816,7 @@
 	else
 		v = (num << 1) - 1;
 
-	gf_bs_set_ue(bs, v);
+	gf_bs_write_ue(bs, v);
 }
 
 u32 gf_media_nalu_is_start_code(GF_BitStream *bs)
@@ -4773,7 +4931,7 @@
 	return data_len;
 }
 
-Bool gf_media_avc_slice_is_intra(AVCState *avc)
+Bool gf_avc_slice_is_intra(AVCState *avc)
 {
 	switch (avc->s_info.slice_type) {
 	case GF_AVC_TYPE_I:
@@ -4787,7 +4945,7 @@
 }
 
 #if 0 //unused
-Bool gf_media_avc_slice_is_IDR(AVCState *avc)
+Bool gf_avc_slice_is_IDR(AVCState *avc)
 {
 	if (avc->sei.recovery_point.valid)
 	{
@@ -4796,15 +4954,13 @@
 	}
 	if (avc->s_info.nal_unit_type != GF_AVC_NALU_IDR_SLICE)
 		return 0;
-	return gf_media_avc_slice_is_intra(avc);
+	return gf_avc_slice_is_intra(avc);
 }
 #endif
 
-struct sar_ {
+static const struct {
 	u32 w, h;
-};
-
-static const struct sar_ avc_sar[] = {
+} avc_hevc_sar[] = {
 	{ 0, 0 }, { 1, 1 }, { 12, 11 }, { 10, 11 },
 	{ 16, 11 }, { 40, 33 }, { 24, 11 }, { 20, 11 },
 	{ 32, 11 }, { 80, 33 }, { 18, 11 }, { 15, 11 },
@@ -4814,28 +4970,29 @@
 
 
 /*ISO 14496-10 (N11084) E.1.2*/
-static void avc_parse_hrd_parameters(GF_BitStream *bs, AVC_HRD *hrd)
+static s32 avc_parse_hrd_parameters(GF_BitStream *bs, AVC_HRD *hrd)
 {
 	int i, cpb_cnt_minus1;
 
-	cpb_cnt_minus1 = gf_bs_get_ue(bs);		/*cpb_cnt_minus1*/
-	if (cpb_cnt_minus1 > 31)
+	cpb_cnt_minus1 = gf_bs_read_ue_log(bs, "cpb_cnt_minus1");
+	if (cpb_cnt_minus1 > 31) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] invalid cpb_cnt_minus1 value: %d (expected in [0;31])\n", cpb_cnt_minus1));
-	gf_bs_read_int(bs, 4);				/*bit_rate_scale*/
-	gf_bs_read_int(bs, 4);				/*cpb_size_scale*/
+		return -1;
+	}
+	gf_bs_read_int_log(bs, 4, "bit_rate_scale");
+	gf_bs_read_int_log(bs, 4, "cpb_size_scale");
 
 	/*for( SchedSelIdx = 0; SchedSelIdx <= cpb_cnt_minus1; SchedSelIdx++ ) {*/
 	for (i = 0; i <= cpb_cnt_minus1; i++) {
-		gf_bs_get_ue(bs);					/*bit_rate_value_minus1[ SchedSelIdx ]*/
-		gf_bs_get_ue(bs);					/*cpb_size_value_minus1[ SchedSelIdx ]*/
-		gf_bs_read_int(bs, 1);			/*cbr_flag[ SchedSelIdx ]*/
-	}
-	gf_bs_read_int(bs, 5);											/*initial_cpb_removal_delay_length_minus1*/
-	hrd->cpb_removal_delay_length_minus1 = gf_bs_read_int(bs, 5);	/*cpb_removal_delay_length_minus1*/
-	hrd->dpb_output_delay_length_minus1 = gf_bs_read_int(bs, 5);	/*dpb_output_delay_length_minus1*/
-	hrd->time_offset_length = gf_bs_read_int(bs, 5);				/*time_offset_length*/
-
-	return;
+		gf_bs_read_ue_log_idx(bs, "bit_rate_value_minus1", i);
+		gf_bs_read_ue_log_idx(bs, "cpb_size_value_minus1", i);
+		gf_bs_read_int_log_idx(bs, 1, "cbr_flag", i);
+	}
+	gf_bs_read_int_log(bs, 5, "initial_cpb_removal_delay_length_minus1");
+	hrd->cpb_removal_delay_length_minus1 = gf_bs_read_int_log(bs, 5, "cpb_removal_delay_length_minus1");
+	hrd->dpb_output_delay_length_minus1 = gf_bs_read_int_log(bs, 5, "dpb_output_delay_length_minus1");
+	hrd->time_offset_length = gf_bs_read_int_log(bs, 5, "time_offset_length");
+	return 0;
 }
 
 /*returns the nal_size without emulation prevention bytes*/
@@ -4981,7 +5138,7 @@
 	return nal_size - emulation_bytes_count;
 }
 
-static s32 gf_media_avc_read_sps_bs_internal(GF_BitStream *bs, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos, u32 nal_hdr)
+static s32 gf_avc_read_sps_bs_internal(GF_BitStream *bs, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos, u32 nal_hdr)
 {
 	AVC_SPS *sps;
 	s32 mb_width, mb_height, sps_id = -1;
@@ -4997,25 +5154,24 @@
 	}
 
 	if (!nal_hdr) {
-		/*nal_hdr =*/ gf_bs_read_int(bs, 8);
+		gf_bs_read_int_log(bs, 1, "forbidden_zero_bit");
+		gf_bs_read_int_log(bs, 2, "nal_ref_idc");
+		gf_bs_read_int_log(bs, 5, "nal_unit_type");
 	}
-	profile_idc = gf_bs_read_int(bs, 8);
+	profile_idc = gf_bs_read_int_log(bs, 8, "profile_idc");
 
-	pcomp = gf_bs_read_int(bs, 8);
+	pcomp = gf_bs_read_int_log(bs, 8, "profile_compatibility");
 	/*sanity checks*/
 	if (pcomp & 0x3)
 		return -1;
 
-	level_idc = gf_bs_read_int(bs, 8);
+	level_idc = gf_bs_read_int_log(bs, 8, "level_idc");
 
 	/*SubsetSps is used to be sure that AVC SPS are not going to be scratched
 	by subset SPS. According to the SVC standard, subset SPS can have the same sps_id
 	than its base layer, but it does not refer to the same SPS. */
-	sps_id = gf_bs_get_ue(bs) + GF_SVC_SSPS_ID_SHIFT * subseq_sps;
-	if (sps_id >= 32) {
-		return -1;
-	}
-	if (sps_id < 0) {
+	sps_id = gf_bs_read_ue_log(bs, "sps_id") + GF_SVC_SSPS_ID_SHIFT * subseq_sps;
+	if ((sps_id < 0) || (sps_id >= 32)) {
 		return -1;
 	}
 
@@ -5038,10 +5194,10 @@
 	case 86:
 	case 118:
 	case 128:
-		chroma_format_idc = gf_bs_get_ue(bs);
+		chroma_format_idc = gf_bs_read_ue_log(bs, "chroma_format_idc");
 		sps->ChromaArrayType = chroma_format_idc;
 		if (chroma_format_idc == 3) {
-			separate_colour_plane_flag = gf_bs_read_int(bs, 1);
+			separate_colour_plane_flag = gf_bs_read_int_log(bs, 1, "separate_colour_plane_flag");
 			/*
 			Depending on the value of separate_colour_plane_flag, the value of the variable ChromaArrayType is assigned as follows.
 			\96	If separate_colour_plane_flag is equal to 0, ChromaArrayType is set equal to chroma_format_idc.
@@ -5049,19 +5205,19 @@
 			*/
 			if (separate_colour_plane_flag) sps->ChromaArrayType = 0;
 		}
-		luma_bd = gf_bs_get_ue(bs);
-		chroma_bd = gf_bs_get_ue(bs);
-		/*qpprime_y_zero_transform_bypass_flag = */ gf_bs_read_int(bs, 1);
+		luma_bd = gf_bs_read_ue_log(bs, "luma_bit_depth");
+		chroma_bd = gf_bs_read_ue_log(bs, "chroma_bit_depth");
+		/*qpprime_y_zero_transform_bypass_flag = */ gf_bs_read_int_log(bs, 1, "qpprime_y_zero_transform_bypass_flag");
 		/*seq_scaling_matrix_present_flag*/
-		if (gf_bs_read_int(bs, 1)) {
+		if (gf_bs_read_int_log(bs, 1, "seq_scaling_matrix_present_flag")) {
 			u32 k;
 			for (k = 0; k < 8; k++) {
-				if (gf_bs_read_int(bs, 1)) {
+				if (gf_bs_read_int_log_idx(bs, 1, "seq_scaling_list_present_flag", k)) {
 					u32 z, last = 8, next = 8;
 					u32 sl = k < 6 ? 16 : 64;
 					for (z = 0; z < sl; z++) {
 						if (next) {
-							s32 delta = gf_bs_get_se(bs);
+							s32 delta = gf_bs_read_se(bs);
 							next = (last + delta + 256) % 256;
 						}
 						last = next ? next : last;
@@ -5075,43 +5231,49 @@
 	sps->profile_idc = profile_idc;
 	sps->level_idc = level_idc;
 	sps->prof_compat = pcomp;
-	sps->log2_max_frame_num = gf_bs_get_ue(bs) + 4;
-	sps->poc_type = gf_bs_get_ue(bs);
+	sps->log2_max_frame_num = gf_bs_read_ue_log(bs, "log2_max_frame_num") + 4;
+	sps->poc_type = gf_bs_read_ue_log(bs, "poc_type");
 	sps->chroma_format = chroma_format_idc;
 	sps->luma_bit_depth_m8 = luma_bd;
 	sps->chroma_bit_depth_m8 = chroma_bd;
 
 	if (sps->poc_type == 0) {
-		sps->log2_max_poc_lsb = gf_bs_get_ue(bs) + 4;
+		sps->log2_max_poc_lsb = gf_bs_read_ue_log(bs, "log2_max_poc_lsb") + 4;
 	}
 	else if (sps->poc_type == 1) {
-		sps->delta_pic_order_always_zero_flag = gf_bs_read_int(bs, 1);
-		sps->offset_for_non_ref_pic = gf_bs_get_se(bs);
-		sps->offset_for_top_to_bottom_field = gf_bs_get_se(bs);
-		sps->poc_cycle_length = gf_bs_get_ue(bs);
+		sps->delta_pic_order_always_zero_flag = gf_bs_read_int_log(bs, 1, "delta_pic_order_always_zero_flag");
+		sps->offset_for_non_ref_pic = gf_bs_read_se_log(bs, "offset_for_non_ref_pic");
+		sps->offset_for_top_to_bottom_field = gf_bs_read_se_log(bs, "offset_for_top_to_bottom_field");
+		sps->poc_cycle_length = gf_bs_read_ue_log(bs, "poc_cycle_length");
 		if (sps->poc_cycle_length > GF_ARRAY_LENGTH(sps->offset_for_ref_frame)) {
+			sps->poc_cycle_length = 255;
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] offset_for_ref_frame overflow from poc_cycle_length\n"));
 			return -1;
 		}
-		for (i = 0; i < sps->poc_cycle_length; i++) sps->offset_for_ref_frame[i] = gf_bs_get_se(bs);
+		for (i = 0; i < sps->poc_cycle_length; i++)
+			sps->offset_for_ref_frame[i] = gf_bs_read_se_log_idx(bs, "offset_for_ref_frame", i);
 	}
 	if (sps->poc_type > 2) {
 		return -1;
 	}
-	sps->max_num_ref_frames = gf_bs_get_ue(bs);
-	sps->gaps_in_frame_num_value_allowed_flag = gf_bs_read_int(bs, 1);
-	mb_width = gf_bs_get_ue(bs) + 1;
-	mb_height = gf_bs_get_ue(bs) + 1;
+	sps->max_num_ref_frames = gf_bs_read_ue_log(bs, "max_num_ref_frames");
+	sps->gaps_in_frame_num_value_allowed_flag = gf_bs_read_int_log(bs, 1, "gaps_in_frame_num_value_allowed_flag");
+	mb_width = gf_bs_read_ue_log(bs, "pic_width_in_mbs_minus1") + 1;
+	mb_height = gf_bs_read_ue_log(bs, "pic_height_in_map_units_minus1") + 1;
+	//5.1 level max frame size in MBs is 36864, we set our limit at 16k x 16x pixels (eg 1 M MBs) for fuzzed stream detection
+	if ( (u64) mb_width * (u64) mb_height > 1000000) {
+		return -1;
+	}
 
-	sps->frame_mbs_only_flag = gf_bs_read_int(bs, 1);
+	sps->frame_mbs_only_flag = gf_bs_read_int_log(bs, 1, "frame_mbs_only_flag");
 
 	sps->width = mb_width * 16;
 	sps->height = (2 - sps->frame_mbs_only_flag) * mb_height * 16;
 
-	if (!sps->frame_mbs_only_flag) sps->mb_adaptive_frame_field_flag = gf_bs_read_int(bs, 1);
-	gf_bs_read_int(bs, 1); /*direct_8x8_inference_flag*/
+	if (!sps->frame_mbs_only_flag) sps->mb_adaptive_frame_field_flag = gf_bs_read_int_log(bs, 1, "mb_adaptive_frame_field_flag");
+	gf_bs_read_int_log(bs, 1, "direct_8x8_inference_flag");
 
-	if (gf_bs_read_int(bs, 1)) { /*crop*/
+	if (gf_bs_read_int_log(bs, 1, "frame_cropping_flag")) {
 		int CropUnitX, CropUnitY, SubWidthC = -1, SubHeightC = -1;
 
 		if (chroma_format_idc == 1) {
@@ -5134,10 +5296,10 @@
 			CropUnitY = SubHeightC * (2 - sps->frame_mbs_only_flag);
 		}
 
-		cl = gf_bs_get_ue(bs); /*crop_left*/
-		cr = gf_bs_get_ue(bs); /*crop_right*/
-		ct = gf_bs_get_ue(bs); /*crop_top*/
-		cb = gf_bs_get_ue(bs); /*crop_bottom*/
+		cl = gf_bs_read_ue_log(bs, "frame_crop_left_offset");
+		cr = gf_bs_read_ue_log(bs, "frame_crop_right_offset");
+		ct = gf_bs_read_ue_log(bs, "frame_crop_top_offset");
+		cb = gf_bs_read_ue_log(bs, "frame_crop_bottom_offset");
 
 		sps->width -= CropUnitX * (cl + cr);
 		sps->height -= CropUnitY * (ct + cb);
@@ -5155,26 +5317,26 @@
 		*vui_flag_pos = (u32)gf_bs_get_bit_offset(bs);
 	}
 	/*vui_parameters_present_flag*/
-	sps->vui_parameters_present_flag = gf_bs_read_int(bs, 1);
+	sps->vui_parameters_present_flag = gf_bs_read_int_log(bs, 1, "vui_parameters_present_flag");
 	if (sps->vui_parameters_present_flag) {
-		sps->vui.aspect_ratio_info_present_flag = gf_bs_read_int(bs, 1);
+		sps->vui.aspect_ratio_info_present_flag = gf_bs_read_int_log(bs, 1, "aspect_ratio_info_present_flag");
 		if (sps->vui.aspect_ratio_info_present_flag) {
-			s32 aspect_ratio_idc = gf_bs_read_int(bs, 8);
+			s32 aspect_ratio_idc = gf_bs_read_int_log(bs, 8, "aspect_ratio_idc");
 			if (aspect_ratio_idc == 255) {
-				sps->vui.par_num = gf_bs_read_int(bs, 16); /*AR num*/
-				sps->vui.par_den = gf_bs_read_int(bs, 16); /*AR den*/
+				sps->vui.par_num = gf_bs_read_int_log(bs, 16, "aspect_ratio_num");
+				sps->vui.par_den = gf_bs_read_int_log(bs, 16, "aspect_ratio_den");
 			}
-			else if (aspect_ratio_idc < sizeof(avc_sar) / sizeof(struct sar_)) {
-				sps->vui.par_num = avc_sar[aspect_ratio_idc].w;
-				sps->vui.par_den = avc_sar[aspect_ratio_idc].h;
+			else if (aspect_ratio_idc < GF_ARRAY_LENGTH(avc_hevc_sar) ) {
+				sps->vui.par_num = avc_hevc_sar[aspect_ratio_idc].w;
+				sps->vui.par_den = avc_hevc_sar[aspect_ratio_idc].h;
 			}
 			else {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] Unknown aspect_ratio_idc: your video may have a wrong aspect ratio. Contact the GPAC team!\n"));
 			}
 		}
-		sps->vui.overscan_info_present_flag = gf_bs_read_int(bs, 1);
+		sps->vui.overscan_info_present_flag = gf_bs_read_int_log(bs, 1, "overscan_info_present_flag");
 		if (sps->vui.overscan_info_present_flag)
-			gf_bs_read_int(bs, 1);		/* overscan_appropriate_flag */
+			gf_bs_read_int_log(bs, 1, "overscan_appropriate_flag");
 
 		/* default values */
 		sps->vui.video_format = 5;
@@ -5182,42 +5344,42 @@
 		sps->vui.transfer_characteristics = 2;
 		sps->vui.matrix_coefficients = 2;
 		/* now read values if possible */
-		sps->vui.video_signal_type_present_flag = gf_bs_read_int(bs, 1);
+		sps->vui.video_signal_type_present_flag = gf_bs_read_int_log(bs, 1, "video_signal_type_present_flag");
 		if (sps->vui.video_signal_type_present_flag) {
-			sps->vui.video_format = gf_bs_read_int(bs, 3);
-			sps->vui.video_full_range_flag = gf_bs_read_int(bs, 1);
-			sps->vui.colour_description_present_flag = gf_bs_read_int(bs, 1);
+			sps->vui.video_format = gf_bs_read_int_log(bs, 3, "video_format");
+			sps->vui.video_full_range_flag = gf_bs_read_int_log(bs, 1, "video_full_range_flag");
+			sps->vui.colour_description_present_flag = gf_bs_read_int_log(bs, 1, "colour_description_present_flag");
 			if (sps->vui.colour_description_present_flag) {
-				sps->vui.colour_primaries = gf_bs_read_int(bs, 8);
-				sps->vui.transfer_characteristics = gf_bs_read_int(bs, 8);
-				sps->vui.matrix_coefficients = gf_bs_read_int(bs, 8);
+				sps->vui.colour_primaries = gf_bs_read_int_log(bs, 8, "colour_primaries");
+				sps->vui.transfer_characteristics = gf_bs_read_int_log(bs, 8, "transfer_characteristics");
+				sps->vui.matrix_coefficients = gf_bs_read_int_log(bs, 8, "matrix_coefficients");
 			}
 		}
 
-		if (gf_bs_read_int(bs, 1)) {	/* chroma_location_info_present_flag */
-			gf_bs_get_ue(bs);				/* chroma_sample_location_type_top_field */
-			gf_bs_get_ue(bs);				/* chroma_sample_location_type_bottom_field */
+		if (gf_bs_read_int_log(bs, 1, "chroma_location_info_present_flag")) {
+			gf_bs_read_ue_log(bs, "chroma_sample_location_type_top_field");
+			gf_bs_read_ue_log(bs, "chroma_sample_location_type_bottom_field");
 		}
 
-		sps->vui.timing_info_present_flag = gf_bs_read_int(bs, 1);
+		sps->vui.timing_info_present_flag = gf_bs_read_int_log(bs, 1, "timing_info_present_flag");
 		if (sps->vui.timing_info_present_flag) {
-			sps->vui.num_units_in_tick = gf_bs_read_int(bs, 32);
-			sps->vui.time_scale = gf_bs_read_int(bs, 32);
-			sps->vui.fixed_frame_rate_flag = gf_bs_read_int(bs, 1);
+			sps->vui.num_units_in_tick = gf_bs_read_int_log(bs, 32, "num_units_in_tick");
+			sps->vui.time_scale = gf_bs_read_int_log(bs, 32, "time_scale");
+			sps->vui.fixed_frame_rate_flag = gf_bs_read_int_log(bs, 1, "fixed_frame_rate_flag");
 		}
 
-		sps->vui.nal_hrd_parameters_present_flag = gf_bs_read_int(bs, 1);
+		sps->vui.nal_hrd_parameters_present_flag = gf_bs_read_int_log(bs, 1, "nal_hrd_parameters_present_flag");
 		if (sps->vui.nal_hrd_parameters_present_flag)
-			avc_parse_hrd_parameters(bs, &sps->vui.hrd);
+			if (avc_parse_hrd_parameters(bs, &sps->vui.hrd)<0) return -1;
 
-		sps->vui.vcl_hrd_parameters_present_flag = gf_bs_read_int(bs, 1);
+		sps->vui.vcl_hrd_parameters_present_flag = gf_bs_read_int_log(bs, 1, "vcl_hrd_parameters_present_flag");
 		if (sps->vui.vcl_hrd_parameters_present_flag)
-			avc_parse_hrd_parameters(bs, &sps->vui.hrd);
+			if (avc_parse_hrd_parameters(bs, &sps->vui.hrd)<0) return -1;
 
 		if (sps->vui.nal_hrd_parameters_present_flag || sps->vui.vcl_hrd_parameters_present_flag)
-			sps->vui.low_delay_hrd_flag = gf_bs_read_int(bs, 1);
+			sps->vui.low_delay_hrd_flag = gf_bs_read_int_log(bs, 1, "low_delay_hrd_flag");
 
-		sps->vui.pic_struct_present_flag = gf_bs_read_int(bs, 1);
+		sps->vui.pic_struct_present_flag = gf_bs_read_int_log(bs, 1, "pic_struct_present_flag");
 	}
 	/*end of seq_parameter_set_data*/
 
@@ -5226,56 +5388,55 @@
 			u8 extended_spatial_scalability_idc;
 			/*parsing seq_parameter_set_svc_extension*/
 
-			/*inter_layer_deblocking_filter_control_present_flag=*/	gf_bs_read_int(bs, 1);
-			extended_spatial_scalability_idc = gf_bs_read_int(bs, 2);
+			gf_bs_read_int_log(bs, 1, "inter_layer_deblocking_filter_control_present_flag");
+			extended_spatial_scalability_idc = gf_bs_read_int_log(bs, 2, "extended_spatial_scalability_idc");
 			if (sps->ChromaArrayType == 1 || sps->ChromaArrayType == 2) {
-				/*chroma_phase_x_plus1_flag*/ gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 1, "chroma_phase_x_plus1_flag");
 			}
 			if (sps->ChromaArrayType == 1) {
-				/*chroma_phase_y_plus1*/ gf_bs_read_int(bs, 2);
+				gf_bs_read_int_log(bs, 2, "chroma_phase_y_plus1");
 			}
 			if (extended_spatial_scalability_idc == 1) {
 				if (sps->ChromaArrayType > 0) {
-					/*seq_ref_layer_chroma_phase_x_plus1_flag*/gf_bs_read_int(bs, 1);
-					/*seq_ref_layer_chroma_phase_y_plus1*/gf_bs_read_int(bs, 2);
+					gf_bs_read_int_log(bs, 1, "seq_ref_layer_chroma_phase_x_plus1_flag");
+					gf_bs_read_int_log(bs, 2, "seq_ref_layer_chroma_phase_y_plus1");
 				}
-				/*seq_scaled_ref_layer_left_offset*/ gf_bs_get_se(bs);
-				/*seq_scaled_ref_layer_top_offset*/gf_bs_get_se(bs);
-				/*seq_scaled_ref_layer_right_offset*/gf_bs_get_se(bs);
-				/*seq_scaled_ref_layer_bottom_offset*/gf_bs_get_se(bs);
-			}
-			if (/*seq_tcoeff_level_prediction_flag*/gf_bs_read_int(bs, 1)) {
-				/*adaptive_tcoeff_level_prediction_flag*/ gf_bs_read_int(bs, 1);
-			}
-			/*slice_header_restriction_flag*/gf_bs_read_int(bs, 1);
-
-			/*svc_vui_parameters_present*/
-			if (gf_bs_read_int(bs, 1)) {
-				u32 vui_ext_num_entries_minus1 = gf_bs_get_ue(bs);
+				gf_bs_read_se_log(bs, "seq_scaled_ref_layer_left_offset");
+				gf_bs_read_se_log(bs, "seq_scaled_ref_layer_top_offset");
+				gf_bs_read_se_log(bs, "seq_scaled_ref_layer_right_offset");
+				gf_bs_read_se_log(bs, "seq_scaled_ref_layer_bottom_offset");
+			}
+			if (gf_bs_read_int_log(bs, 1, "seq_tcoeff_level_prediction_flag")) {
+				gf_bs_read_int_log(bs, 1, "adaptive_tcoeff_level_prediction_flag");
+			}
+			gf_bs_read_int_log(bs, 1, "slice_header_restriction_flag");
+
+			if (gf_bs_read_int_log(bs, 1, "svc_vui_parameters_present")) {
+				u32 vui_ext_num_entries_minus1 = gf_bs_read_ue_log(bs, "vui_ext_num_entries_minus1");
 
 				for (i = 0; i <= vui_ext_num_entries_minus1; i++) {
 					u8 vui_ext_nal_hrd_parameters_present_flag, vui_ext_vcl_hrd_parameters_present_flag, vui_ext_timing_info_present_flag;
-					/*u8 vui_ext_dependency_id =*/ gf_bs_read_int(bs, 3);
-					/*u8 vui_ext_quality_id =*/ gf_bs_read_int(bs, 4);
-					/*u8 vui_ext_temporal_id =*/ gf_bs_read_int(bs, 3);
-					vui_ext_timing_info_present_flag = gf_bs_read_int(bs, 1);
+					gf_bs_read_int_log(bs, 3, "vui_ext_dependency_id");
+					gf_bs_read_int_log(bs, 4, "vui_ext_quality_id");
+					gf_bs_read_int_log(bs, 3, "vui_ext_temporal_id");
+					vui_ext_timing_info_present_flag = gf_bs_read_int_log(bs, 1, "vui_ext_timing_info_present_flag");
 					if (vui_ext_timing_info_present_flag) {
-						/*u32 vui_ext_num_units_in_tick = */gf_bs_read_int(bs, 32);
-						/*u32 vui_ext_time_scale = */gf_bs_read_int(bs, 32);
-						/*u8 vui_ext_fixed_frame_rate_flag = */gf_bs_read_int(bs, 1);
+						gf_bs_read_int_log(bs, 32, "vui_ext_num_units_in_tick");
+						gf_bs_read_int_log(bs, 32, "vui_ext_time_scale");
+						gf_bs_read_int_log(bs, 1, "vui_ext_fixed_frame_rate_flag");
 					}
-					vui_ext_nal_hrd_parameters_present_flag = gf_bs_read_int(bs, 1);
+					vui_ext_nal_hrd_parameters_present_flag = gf_bs_read_int_log(bs, 1, "vui_ext_nal_hrd_parameters_present_flag");
 					if (vui_ext_nal_hrd_parameters_present_flag) {
 						//hrd_parameters( )
 					}
-					vui_ext_vcl_hrd_parameters_present_flag = gf_bs_read_int(bs, 1);
+					vui_ext_vcl_hrd_parameters_present_flag = gf_bs_read_int_log(bs, 1, "vui_ext_vcl_hrd_parameters_present_flag");
 					if (vui_ext_vcl_hrd_parameters_present_flag) {
 						//hrd_parameters( )
 					}
 					if (vui_ext_nal_hrd_parameters_present_flag || vui_ext_vcl_hrd_parameters_present_flag) {
-						/*vui_ext_low_delay_hrd_flag*/gf_bs_read_int(bs, 1);
+						gf_bs_read_int_log(bs, 1, "vui_ext_low_delay_hrd_flag");
 					}
-					/*vui_ext_pic_struct_present_flag*/gf_bs_read_int(bs, 1);
+					gf_bs_read_int_log(bs, 1, "vui_ext_pic_struct_present_flag");
 				}
 			}
 		}
@@ -5284,7 +5445,7 @@
 			return sps_id;
 		}
 
-		if (gf_bs_read_int(bs, 1)) {
+		if (gf_bs_read_int_log(bs, 1, "additional_extension2")) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] skipping parsing end of Subset SPS (additional_extension2)\n"));
 			return sps_id;
 		}
@@ -5293,13 +5454,13 @@
 }
 
 GF_EXPORT
-s32 gf_media_avc_read_sps_bs(GF_BitStream *bs, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos)
+s32 gf_avc_read_sps_bs(GF_BitStream *bs, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos)
 {
-	return gf_media_avc_read_sps_bs_internal(bs, avc, subseq_sps, vui_flag_pos, 0);
+	return gf_avc_read_sps_bs_internal(bs, avc, subseq_sps, vui_flag_pos, 0);
 }
 
 GF_EXPORT
-s32 gf_media_avc_read_sps(const u8 *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos)
+s32 gf_avc_read_sps(const u8 *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos)
 {
 	s32 sps_id = -1;
 	GF_BitStream *bs;
@@ -5323,7 +5484,7 @@
 		goto exit;
 	}
 
-	sps_id = gf_media_avc_read_sps_bs(bs, avc, subseq_sps, vui_flag_pos);
+	sps_id = gf_avc_read_sps_bs(bs, avc, subseq_sps, vui_flag_pos);
 
 exit:
 	gf_bs_del(bs);
@@ -5331,7 +5492,7 @@
 	return sps_id;
 }
 
-static s32 gf_media_avc_read_pps_bs_internal(GF_BitStream *bs, AVCState *avc, u32 nal_hdr)
+static s32 gf_avc_read_pps_bs_internal(GF_BitStream *bs, AVCState *avc, u32 nal_hdr)
 {
 	s32 pps_id;
 	AVC_PPS *pps;
@@ -5339,82 +5500,84 @@
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
 
 	if (!nal_hdr) {
-		/*nal_hdr = */gf_bs_read_u8(bs);
+		gf_bs_read_int_log(bs, 1, "forbidden_zero_bit");
+		gf_bs_read_int_log(bs, 2, "nal_ref_idc");
+		gf_bs_read_int_log(bs, 5, "nal_unit_type");
 	}
-	pps_id = gf_bs_get_ue(bs);
-	if (pps_id >= 255) {
+	pps_id = gf_bs_read_ue_log(bs, "pps_id");
+	if ((pps_id<0) || (pps_id >= 255)) {
 		return -1;
 	}
 	pps = &avc->pps[pps_id];
 	pps->id = pps_id;
 
 	if (!pps->status) pps->status = 1;
-	pps->sps_id = gf_bs_get_ue(bs);
-	if (pps->sps_id >= 32) {
+	pps->sps_id = gf_bs_read_ue_log(bs, "sps_id");
+	if ((pps->sps_id<0) || (pps->sps_id >= 32)) {
 		pps->sps_id = 0;
 		return -1;
 	}
-	/*sps_id may be refer to regular SPS or subseq sps, depending on the coded slice refering to the pps*/
+	/*sps_id may be refer to regular SPS or subseq sps, depending on the coded slice referring to the pps*/
 	if (!avc->sps[pps->sps_id].state && !avc->sps[pps->sps_id + GF_SVC_SSPS_ID_SHIFT].state) {
 		return -1;
 	}
 	avc->pps_active_idx = pps->id; /*set active sps*/
 	avc->sps_active_idx = pps->sps_id; /*set active sps*/
-	pps->entropy_coding_mode_flag = gf_bs_read_int(bs, 1);
-	pps->pic_order_present = gf_bs_read_int(bs, 1);
-	pps->slice_group_count = gf_bs_get_ue(bs) + 1;
+	pps->entropy_coding_mode_flag = gf_bs_read_int_log(bs, 1, "entropy_coding_mode_flag");
+	pps->pic_order_present = gf_bs_read_int_log(bs, 1, "pic_order_present");
+	pps->slice_group_count = gf_bs_read_ue_log(bs, "slice_group_count_minus1") + 1;
 	if (pps->slice_group_count > 1) {
 		u32 iGroup;
-		pps->mb_slice_group_map_type = gf_bs_get_ue(bs);
+		pps->mb_slice_group_map_type = gf_bs_read_ue_log(bs, "mb_slice_group_map_type");
 		if (pps->mb_slice_group_map_type == 0) {
 			for (iGroup = 0; iGroup <= pps->slice_group_count - 1; iGroup++)
-				/*run_length_minus1[iGroup] = */ gf_bs_get_ue(bs);
+				gf_bs_read_ue_log_idx(bs, "run_length_minus1", iGroup);
 		}
 		else if (pps->mb_slice_group_map_type == 2) {
 			for (iGroup = 0; iGroup < pps->slice_group_count - 1; iGroup++) {
-				/*top_left[iGroup] = */ gf_bs_get_ue(bs);
-				/*bottom_right[iGroup] = */ gf_bs_get_ue(bs);
+				gf_bs_read_ue_log_idx(bs, "top_left", iGroup);
+				gf_bs_read_ue_log_idx(bs, "bottom_right", iGroup);
 			}
 		}
 		else if (pps->mb_slice_group_map_type == 3 || pps->mb_slice_group_map_type == 4 || pps->mb_slice_group_map_type == 5) {
-			/*slice_group_change_direction_flag =*/ gf_bs_read_int(bs, 1);
-			/*slice_group_change_rate_minus1 = */ gf_bs_get_ue(bs);
+			gf_bs_read_int_log(bs, 1, "slice_group_change_direction_flag");
+			gf_bs_read_ue_log(bs, "slice_group_change_rate_minus1");
 		}
 		else if (pps->mb_slice_group_map_type == 6) {
 			u32 i;
-			pps->pic_size_in_map_units_minus1 = gf_bs_get_ue(bs);
+			pps->pic_size_in_map_units_minus1 = gf_bs_read_ue_log(bs, "pic_size_in_map_units_minus1");
 			for (i = 0; i <= pps->pic_size_in_map_units_minus1; i++) {
-				/*slice_group_id[i] = */ gf_bs_read_int(bs, (u32)ceil(log(pps->slice_group_count) / log(2)));
+				gf_bs_read_int_log_idx(bs, (u32)ceil(log(pps->slice_group_count) / log(2)), "slice_group_id", i);
 			}
 		}
 	}
-	pps->num_ref_idx_l0_default_active_minus1 = gf_bs_get_ue(bs);
-	pps->num_ref_idx_l1_default_active_minus1 = gf_bs_get_ue(bs);
+	pps->num_ref_idx_l0_default_active_minus1 = gf_bs_read_ue_log(bs, "num_ref_idx_l0_default_active_minus1");
+	pps->num_ref_idx_l1_default_active_minus1 = gf_bs_read_ue_log(bs, "num_ref_idx_l1_default_active_minus1");
 
 	/*
 	if ((pps->ref_count[0] > 32) || (pps->ref_count[1] > 32)) goto exit;
 	*/
 
-	pps->weighted_pred_flag = gf_bs_read_int(bs, 1);
-	/*pps->weighted_bipred_idc = */gf_bs_read_int(bs, 2);
-	/*pps->init_qp = */gf_bs_get_se(bs) /*+ 26*/;
-	/*pps->init_qs= */gf_bs_get_se(bs) /*+ 26*/;
-	/*pps->chroma_qp_index_offset = */gf_bs_get_se(bs);
-	pps->deblocking_filter_control_present_flag = gf_bs_read_int(bs, 1);
-	/*pps->constrained_intra_pred = */gf_bs_read_int(bs, 1);
-	pps->redundant_pic_cnt_present = gf_bs_read_int(bs, 1);
+	pps->weighted_pred_flag = gf_bs_read_int_log(bs, 1, "weighted_pred_flag");
+	gf_bs_read_int_log(bs, 2, "weighted_bipred_idc");
+	gf_bs_read_se_log(bs, "init_qp_minus26");
+	gf_bs_read_se_log(bs, "init_qs_minus26");
+	gf_bs_read_se_log(bs, "chroma_qp_index_offset");
+	pps->deblocking_filter_control_present_flag = gf_bs_read_int_log(bs, 1, "deblocking_filter_control_present_flag");
+	gf_bs_read_int_log(bs, 1, "constrained_intra_pred");
+	pps->redundant_pic_cnt_present = gf_bs_read_int_log(bs, 1, "redundant_pic_cnt_present");
 
 	return pps_id;
 }
 
 GF_EXPORT
-s32 gf_media_avc_read_pps_bs(GF_BitStream *bs, AVCState *avc)
+s32 gf_avc_read_pps_bs(GF_BitStream *bs, AVCState *avc)
 {
-	return gf_media_avc_read_pps_bs_internal(bs, avc, 0);
+	return gf_avc_read_pps_bs_internal(bs, avc, 0);
 }
 
 GF_EXPORT
-s32 gf_media_avc_read_pps(const u8 *pps_data, u32 pps_size, AVCState *avc)
+s32 gf_avc_read_pps(const u8 *pps_data, u32 pps_size, AVCState *avc)
 {
 	GF_BitStream *bs;
 	s32 pps_id;
@@ -5425,20 +5588,20 @@
 		return -1;
 	}
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
-	pps_id = gf_media_avc_read_pps_bs(bs, avc);
+	pps_id = gf_avc_read_pps_bs(bs, avc);
 	gf_bs_del(bs);
 	return pps_id;
 }
 
 #if 0 //unused
 
-s32 gf_media_avc_read_sps_ext(const char *spse_data, u32 spse_size)
+s32 gf_avc_read_sps_ext(const char *spse_data, u32 spse_size)
 {
 	GF_BitStream *bs;
 	s32 sps_id;
 
 	bs = gf_bs_new(spse_data, spse_size, GF_BITSTREAM_READ);
-	sps_id = gf_media_avc_read_sps_ext_bs(bs);
+	sps_id = gf_avc_read_sps_ext_bs(bs);
 
 	gf_bs_del(bs);
 	return sps_id;
@@ -5447,81 +5610,83 @@
 
 static s32 SVC_ReadNal_header_extension(GF_BitStream *bs, SVC_NALUHeader *NalHeader)
 {
-	gf_bs_read_int(bs, 1); //reserved_one_bits
-	NalHeader->idr_pic_flag = gf_bs_read_int(bs, 1); //idr_flag
-	NalHeader->priority_id = gf_bs_read_int(bs, 6); //priority_id
-	gf_bs_read_int(bs, 1); //no_inter_layer_pred_flag
-	NalHeader->dependency_id = gf_bs_read_int(bs, 3); //DependencyId
-	NalHeader->quality_id = gf_bs_read_int(bs, 4); //quality_id
-	NalHeader->temporal_id = gf_bs_read_int(bs, 3); //temporal_id
-	gf_bs_read_int(bs, 1); //use_ref_base_pic_flag
-	gf_bs_read_int(bs, 1); //discardable_flag
-	gf_bs_read_int(bs, 1); //output_flag
-	gf_bs_read_int(bs, 2); //reserved_three_2bits
+	gf_bs_read_int_log(bs, 1, "reserved_one_bit");
+	NalHeader->idr_pic_flag = gf_bs_read_int_log(bs, 1, "idr_flag");
+	NalHeader->priority_id = gf_bs_read_int_log(bs, 6, "priority_id");
+	gf_bs_read_int_log(bs, 1, "no_inter_layer_pred_flag");
+	NalHeader->dependency_id = gf_bs_read_int_log(bs, 3, "DependencyId");
+	NalHeader->quality_id = gf_bs_read_int_log(bs, 4, "quality_id");
+	NalHeader->temporal_id = gf_bs_read_int_log(bs, 3, "temporal_id");
+	gf_bs_read_int_log(bs, 1, "use_ref_base_pic_flag");
+	gf_bs_read_int_log(bs, 1, "discardable_flag");
+	gf_bs_read_int_log(bs, 1, "output_flag");
+	gf_bs_read_int_log(bs, 2, "reserved_three_2bits");
 	return 1;
 }
 
 static void ref_pic_list_modification(GF_BitStream *bs, u32 slice_type) {
 	if (slice_type % 5 != 2 && slice_type % 5 != 4) {
-		if (/*ref_pic_list_modification_flag_l0*/ gf_bs_read_int(bs, 1)) {
-			u32 modification_of_pic_nums_idc;
+		if (gf_bs_read_int_log(bs, 1, "ref_pic_list_modification_flag_l0")) {
+			u32 idx=0, modification_of_pic_nums_idc;
 			do {
-				modification_of_pic_nums_idc = gf_bs_get_ue(bs);
+				modification_of_pic_nums_idc = gf_bs_read_ue_log_idx(bs, "modification_of_pic_nums_idc", idx);
 				if (modification_of_pic_nums_idc == 0 || modification_of_pic_nums_idc == 1) {
-					/*abs_diff_pic_num_minus1 =*/ gf_bs_get_ue(bs);
+					gf_bs_read_ue_log_idx(bs, "abs_diff_pic_num_minus1", idx);
 				}
 				else if (modification_of_pic_nums_idc == 2) {
-					/*long_term_pic_num =*/ gf_bs_get_ue(bs);
+					gf_bs_read_ue_log_idx(bs, "long_term_pic_num", idx);
 				}
+				idx++;
 			} while ((modification_of_pic_nums_idc != 3) && gf_bs_available(bs));
 		}
 	}
 	if (slice_type % 5 == 1) {
-		if (/*ref_pic_list_modification_flag_l1*/ gf_bs_read_int(bs, 1)) {
-			u32 modification_of_pic_nums_idc;
+		if (gf_bs_read_int_log(bs, 1, "ref_pic_list_modification_flag_l1")) {
+			u32 idx=0, modification_of_pic_nums_idc;
 			do {
-				modification_of_pic_nums_idc = gf_bs_get_ue(bs);
+				modification_of_pic_nums_idc = gf_bs_read_ue_log_idx(bs, "modification_of_pic_nums_idc", idx);
 				if (modification_of_pic_nums_idc == 0 || modification_of_pic_nums_idc == 1) {
-					/*abs_diff_pic_num_minus1 =*/ gf_bs_get_ue(bs);
+					gf_bs_read_ue_log_idx(bs, "abs_diff_pic_num_minus1", idx);
 				}
 				else if (modification_of_pic_nums_idc == 2) {
-					/*long_term_pic_num =*/ gf_bs_get_ue(bs);
+					gf_bs_read_ue_log_idx(bs, "long_term_pic_num", idx);
 				}
+				idx++;
 			} while ((modification_of_pic_nums_idc != 3) && gf_bs_available(bs));
 		}
 	}
 }
 
-static void pred_weight_table(GF_BitStream *bs, u32 slice_type, u32 ChromaArrayType, u32 num_ref_idx_l0_active_minus1, u32 num_ref_idx_l1_active_minus1) {
+static void avc_pred_weight_table(GF_BitStream *bs, u32 slice_type, u32 ChromaArrayType, u32 num_ref_idx_l0_active_minus1, u32 num_ref_idx_l1_active_minus1) {
 	u32 i, j;
-	/*luma_log2_weight_denom =*/ gf_bs_get_ue(bs);
+	gf_bs_read_ue_log(bs, "luma_log2_weight_denom");
 	if (ChromaArrayType != 0) {
-		/*chroma_log2_weight_denom =*/ gf_bs_get_ue(bs);
+		gf_bs_read_ue_log(bs, "chroma_log2_weight_denom");
 	}
 	for (i = 0; i <= num_ref_idx_l0_active_minus1; i++) {
-		if (/*luma_weight_l0_flag*/ gf_bs_read_int(bs, 1)) {
-			/*luma_weight_l0[i] =*/ gf_bs_get_se(bs);
-			/*luma_offset_l0[i] =*/ gf_bs_get_se(bs);
+		if (gf_bs_read_int_log_idx(bs, 1, "luma_weight_l0_flag", i)) {
+			gf_bs_read_se_log_idx(bs, "luma_weight_l0", i);
+			gf_bs_read_se_log_idx(bs, "luma_offset_l0", i);
 		}
 		if (ChromaArrayType != 0) {
-			if (/*chroma_weight_l0_flag*/ gf_bs_read_int(bs, 1))
+			if (gf_bs_read_int_log_idx(bs, 1, "chroma_weight_l0_flag", i))
 				for (j = 0; j < 2; j++) {
-					/*chroma_weight_l0[i][j] =*/ gf_bs_get_se(bs);
-					/*chroma_offset_l0[i][j] =*/ gf_bs_get_se(bs);
+					gf_bs_read_se_log_idx2(bs, "chroma_weight_l0", i, j);
+					gf_bs_read_se_log_idx2(bs, "chroma_offset_l0", i, j);
 				}
 		}
 	}
 	if (slice_type % 5 == 1) {
 		for (i = 0; i <= num_ref_idx_l1_active_minus1; i++) {
-			if (/*luma_weight_l1_flag*/ gf_bs_read_int(bs, 1)) {
-				/*luma_weight_l1[i] =*/ gf_bs_get_se(bs);
-				/*luma_offset_l1[i] =*/ gf_bs_get_se(bs);
+			if (gf_bs_read_int_log_idx(bs, 1, "luma_weight_l1_flag", i)) {
+				gf_bs_read_se_log_idx(bs, "luma_weight_l1", i);
+				gf_bs_read_se_log_idx(bs, "luma_offset_l1", i);
 			}
 			if (ChromaArrayType != 0) {
-				if (/*chroma_weight_l1_flag*/ gf_bs_read_int(bs, 1)) {
+				if (gf_bs_read_int_log_idx(bs, 1, "chroma_weight_l1_flag", i)) {
 					for (j = 0; j < 2; j++) {
-						/*chroma_weight_l1[i][j] =*/ gf_bs_get_se(bs);
-						/*chroma_offset_l1[i][j] =*/ gf_bs_get_se(bs);
+						gf_bs_read_se_log_idx2(bs, "chroma_weight_l1", i, j);
+						gf_bs_read_se_log_idx2(bs, "chroma_offset_l1", i, j);
 					}
 				}
 			}
@@ -5531,22 +5696,23 @@
 
 static void dec_ref_pic_marking(GF_BitStream *bs, Bool IdrPicFlag) {
 	if (IdrPicFlag) {
-		/*no_output_of_prior_pics_flag =*/ gf_bs_read_int(bs, 1);
-		/*long_term_reference_flag =*/ gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log(bs, 1, "no_output_of_prior_pics_flag");
+		gf_bs_read_int_log(bs, 1, "long_term_reference_flag");
 	}
 	else {
-		if (/*adaptive_ref_pic_marking_mode_flag*/ gf_bs_read_int(bs, 1)) {
-			u32 memory_management_control_operation;
+		if (gf_bs_read_int_log(bs, 1, "adaptive_ref_pic_marking_mode_flag")) {
+			u32 idx=0, memory_management_control_operation;
 			do {
-				memory_management_control_operation = gf_bs_get_ue(bs);
+				memory_management_control_operation = gf_bs_read_ue_log_idx(bs, "memory_management_control_operation", idx);
 				if (memory_management_control_operation == 1 || memory_management_control_operation == 3)
-					/*difference_of_pic_nums_minus1 =*/ gf_bs_get_ue(bs);
+					gf_bs_read_ue_log_idx(bs, "difference_of_pic_nums_minus1", idx);
 				if (memory_management_control_operation == 2)
-					/*long_term_pic_num =*/ gf_bs_get_ue(bs);
+					gf_bs_read_ue_log_idx(bs, "long_term_pic_num", idx);
 				if (memory_management_control_operation == 3 || memory_management_control_operation == 6)
-					/*long_term_frame_idx =*/ gf_bs_get_ue(bs);
+					gf_bs_read_ue_log_idx(bs, "long_term_frame_idx", idx);
 				if (memory_management_control_operation == 4)
-					/*max_long_term_frame_idx_plus1 =*/ gf_bs_get_ue(bs);
+					gf_bs_read_ue_log_idx(bs, "max_long_term_frame_idx_plus1", idx);
+				idx++;
 			} while (memory_management_control_operation != 0);
 		}
 	}
@@ -5557,61 +5723,62 @@
 	s32 pps_id, num_ref_idx_l0_active_minus1 = 0, num_ref_idx_l1_active_minus1 = 0;
 
 	/*s->current_picture.reference= h->nal_ref_idc != 0;*/
-	/*first_mb_in_slice = */gf_bs_get_ue(bs);
-	si->slice_type = gf_bs_get_ue(bs);
+	gf_bs_read_ue_log(bs, "first_mb_in_slice");
+	si->slice_type = gf_bs_read_ue_log(bs, "slice_type");
 	if (si->slice_type > 9) return -1;
 
-	pps_id = gf_bs_get_ue(bs);
-	if (pps_id > 255) return -1;
+	pps_id = gf_bs_read_ue_log(bs, "pps_id");
+	if ((pps_id<0) || (pps_id > 255)) return -1;
 	si->pps = &avc->pps[pps_id];
 	if (!si->pps->slice_group_count) return -2;
+	if (si->pps->sps_id>=255) return -1;
 	si->sps = &avc->sps[si->pps->sps_id];
 	if (!si->sps->log2_max_frame_num) return -2;
 	avc->sps_active_idx = si->pps->sps_id;
 	avc->pps_active_idx = pps_id;
 
-	si->frame_num = gf_bs_read_int(bs, si->sps->log2_max_frame_num);
+	si->frame_num = gf_bs_read_int_log(bs, si->sps->log2_max_frame_num, "frame_num");
 
 	si->field_pic_flag = 0;
 	si->bottom_field_flag = 0;
 	if (!si->sps->frame_mbs_only_flag) {
-		si->field_pic_flag = gf_bs_read_int(bs, 1);
+		si->field_pic_flag = gf_bs_read_int_log(bs, 1, "field_pic_flag");
 		if (si->field_pic_flag)
-			si->bottom_field_flag = gf_bs_read_int(bs, 1);
+			si->bottom_field_flag = gf_bs_read_int_log(bs, 1, "bottom_field_flag");
 	}
 
 	if ((si->nal_unit_type == GF_AVC_NALU_IDR_SLICE) || svc_idr_flag)
-		si->idr_pic_id = gf_bs_get_ue(bs);
+		si->idr_pic_id = gf_bs_read_ue_log(bs, "idr_pic_id");
 
 	if (si->sps->poc_type == 0) {
-		si->poc_lsb = gf_bs_read_int(bs, si->sps->log2_max_poc_lsb);
+		si->poc_lsb = gf_bs_read_int_log(bs, si->sps->log2_max_poc_lsb, "poc_lsb");
 		if (si->pps->pic_order_present && !si->field_pic_flag) {
-			si->delta_poc_bottom = gf_bs_get_se(bs);
+			si->delta_poc_bottom = gf_bs_read_se_log(bs, "poc_lsb");
 		}
 	}
 	else if ((si->sps->poc_type == 1) && !si->sps->delta_pic_order_always_zero_flag) {
-		si->delta_poc[0] = gf_bs_get_se(bs);
+		si->delta_poc[0] = gf_bs_read_se_log(bs, "delta_poc0");
 		if ((si->pps->pic_order_present == 1) && !si->field_pic_flag)
-			si->delta_poc[1] = gf_bs_get_se(bs);
+			si->delta_poc[1] = gf_bs_read_se_log(bs, "delta_poc1");
 	}
 
 	if (si->pps->redundant_pic_cnt_present) {
-		si->redundant_pic_cnt = gf_bs_get_ue(bs);
+		si->redundant_pic_cnt = gf_bs_read_ue_log(bs, "redundant_pic_cnt");
 	}
 
 	if (si->slice_type % 5 == GF_AVC_TYPE_B) {
-		/*direct_spatial_mv_pred_flag = */gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log(bs, 1, "direct_spatial_mv_pred_flag");
 	}
 
 	num_ref_idx_l0_active_minus1 = si->pps->num_ref_idx_l0_default_active_minus1;
 	num_ref_idx_l1_active_minus1 = si->pps->num_ref_idx_l1_default_active_minus1;
 
 	if (si->slice_type % 5 == GF_AVC_TYPE_P || si->slice_type % 5 == GF_AVC_TYPE_SP || si->slice_type % 5 == GF_AVC_TYPE_B) {
-		Bool num_ref_idx_active_override_flag = gf_bs_read_int(bs, 1);
+		Bool num_ref_idx_active_override_flag = gf_bs_read_int_log(bs, 1, "num_ref_idx_active_override_flag");
 		if (num_ref_idx_active_override_flag) {
-			num_ref_idx_l0_active_minus1 = gf_bs_get_ue(bs);
+			num_ref_idx_l0_active_minus1 = gf_bs_read_ue_log(bs, "num_ref_idx_l0_active_minus1");
 			if (si->slice_type % 5 == GF_AVC_TYPE_B) {
-				num_ref_idx_l1_active_minus1 = gf_bs_get_ue(bs);
+				num_ref_idx_l1_active_minus1 = gf_bs_read_ue_log(bs, "num_ref_idx_l1_active_minus1");
 			}
 		}
 	}
@@ -5628,7 +5795,7 @@
 
 	if ((si->pps->weighted_pred_flag && (si->slice_type % 5 == GF_AVC_TYPE_P || si->slice_type % 5 == GF_AVC_TYPE_SP))
 		|| (si->pps->weighted_bipred_idc == 1 && si->slice_type % 5 == GF_AVC_TYPE_B)) {
-		pred_weight_table(bs, si->slice_type, si->sps->ChromaArrayType, num_ref_idx_l0_active_minus1, num_ref_idx_l1_active_minus1);
+		avc_pred_weight_table(bs, si->slice_type, si->sps->ChromaArrayType, num_ref_idx_l0_active_minus1, num_ref_idx_l1_active_minus1);
 	}
 
 	if (si->nal_ref_idc != 0) {
@@ -5636,28 +5803,27 @@
 	}
 
 	if (si->pps->entropy_coding_mode_flag && si->slice_type % 5 != GF_AVC_TYPE_I && si->slice_type % 5 != GF_AVC_TYPE_SI) {
-		/*cabac_init_idc = */gf_bs_get_ue(bs);
+		gf_bs_read_ue_log(bs, "cabac_init_idc");
 	}
 
-	/*slice_qp_delta = */gf_bs_get_se(bs);
+	/*slice_qp_delta = */gf_bs_read_se(bs);
 	if (si->slice_type % 5 == GF_AVC_TYPE_SP || si->slice_type % 5 == GF_AVC_TYPE_SI) {
 		if (si->slice_type % 5 == GF_AVC_TYPE_SP) {
-			/*sp_for_switch_flag = */gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log(bs, 1, "sp_for_switch_flag");
 		}
-		/*slice_qs_delta = */gf_bs_get_se(bs);
+		gf_bs_read_se_log(bs, "slice_qs_delta");
 	}
 
 	if (si->pps->deblocking_filter_control_present_flag) {
-		if (/*disable_deblocking_filter_idc*/ gf_bs_get_ue(bs) != 1) {
-			/*slice_alpha_c0_offset_div2 =*/ gf_bs_get_se(bs);
-			/*slice_beta_offset_div2 =*/ gf_bs_get_se(bs);
+		if (gf_bs_read_ue_log(bs, "disable_deblocking_filter_idc") != 1) {
+			gf_bs_read_se_log(bs, "slice_alpha_c0_offset_div2");
+			gf_bs_read_se_log(bs, "slice_beta_offset_div2");
 		}
 	}
 
 	if (si->pps->slice_group_count > 1 && si->pps->mb_slice_group_map_type >= 3 && si->pps->mb_slice_group_map_type <= 5) {
-		/*slice_group_change_cycle = */gf_bs_read_int(bs, (u32)ceil(log1p((si->pps->pic_size_in_map_units_minus1 + 1) / (si->pps->slice_group_change_rate_minus1 + 1) ) / log(2)));
+		gf_bs_read_int_log(bs, (u32)ceil(log1p((si->pps->pic_size_in_map_units_minus1 + 1) / (si->pps->slice_group_change_rate_minus1 + 1) ) / log(2)), "slice_group_change_cycle");
 	}
-
 	return 0;
 }
 
@@ -5667,12 +5833,12 @@
 	s32 pps_id;
 
 	/*s->current_picture.reference= h->nal_ref_idc != 0;*/
-	/*first_mb_in_slice = */gf_bs_get_ue(bs);
-	si->slice_type = gf_bs_get_ue(bs);
+	gf_bs_read_ue_log(bs, "first_mb_in_slice");
+	si->slice_type = gf_bs_read_ue_log(bs, "slice_type");
 	if (si->slice_type > 9) return -1;
 
-	pps_id = gf_bs_get_ue(bs);
-	if (pps_id > 255)
+	pps_id = gf_bs_read_ue_log(bs, "pps_id");
+	if ((pps_id<0) || (pps_id > 255))
 		return -1;
 	si->pps = &avc->pps[pps_id];
 	si->pps->id = pps_id;
@@ -5682,32 +5848,32 @@
 	if (!si->sps->log2_max_frame_num)
 		return -2;
 
-	si->frame_num = gf_bs_read_int(bs, si->sps->log2_max_frame_num);
+	si->frame_num = gf_bs_read_int_log(bs, si->sps->log2_max_frame_num, "frame_num");
 
 	si->field_pic_flag = 0;
 	if (si->sps->frame_mbs_only_flag) {
 		/*s->picture_structure= PICT_FRAME;*/
 	}
 	else {
-		si->field_pic_flag = gf_bs_read_int(bs, 1);
-		if (si->field_pic_flag) si->bottom_field_flag = gf_bs_read_int(bs, 1);
+		si->field_pic_flag = gf_bs_read_int_log(bs, 1, "field_pic_flag");
+		if (si->field_pic_flag) si->bottom_field_flag = gf_bs_read_int_log(bs, 1, "bottom_field_flag");
 	}
-	if (si->nal_unit_type == GF_AVC_NALU_IDR_SLICE || si->NalHeader.idr_pic_flag)
-		si->idr_pic_id = gf_bs_get_ue(bs);
+	if (si->nal_unit_type == GF_AVC_NALU_IDR_SLICE || si->svc_nalhdr.idr_pic_flag)
+		si->idr_pic_id = gf_bs_read_ue_log(bs, "idr_pic_id");
 
 	if (si->sps->poc_type == 0) {
-		si->poc_lsb = gf_bs_read_int(bs, si->sps->log2_max_poc_lsb);
+		si->poc_lsb = gf_bs_read_int_log(bs, si->sps->log2_max_poc_lsb, "poc_lsb");
 		if (si->pps->pic_order_present && !si->field_pic_flag) {
-			si->delta_poc_bottom = gf_bs_get_se(bs);
+			si->delta_poc_bottom = gf_bs_read_se_log(bs, "delta_poc_bottom");
 		}
 	}
 	else if ((si->sps->poc_type == 1) && !si->sps->delta_pic_order_always_zero_flag) {
-		si->delta_poc[0] = gf_bs_get_se(bs);
+		si->delta_poc[0] = gf_bs_read_se_log(bs, "delta_poc0");
 		if ((si->pps->pic_order_present == 1) && !si->field_pic_flag)
-			si->delta_poc[1] = gf_bs_get_se(bs);
+			si->delta_poc[1] = gf_bs_read_se_log(bs, "delta_poc1");
 	}
 	if (si->pps->redundant_pic_cnt_present) {
-		si->redundant_pic_cnt = gf_bs_get_ue(bs);
+		si->redundant_pic_cnt = gf_bs_read_ue_log(bs, "redundant_pic_cnt");
 	}
 	return 0;
 }
@@ -5717,10 +5883,10 @@
 {
 	AVCSeiRecoveryPoint *rp = &avc->sei.recovery_point;
 
-	rp->frame_cnt = gf_bs_get_ue(bs);
-	rp->exact_match_flag = gf_bs_read_int(bs, 1);
-	rp->broken_link_flag = gf_bs_read_int(bs, 1);
-	rp->changing_slice_group_idc = gf_bs_read_int(bs, 2);
+	rp->frame_cnt = gf_bs_read_ue_log(bs, "frame_cnt");
+	rp->exact_match_flag = gf_bs_read_int_log(bs, 1, "exact_match_flag");
+	rp->broken_link_flag = gf_bs_read_int_log(bs, 1, "broken_link_flag");
+	rp->changing_slice_group_idc = gf_bs_read_int_log(bs, 2, "changing_slice_group_idc");
 	rp->valid = 1;
 
 	return 0;
@@ -5739,46 +5905,46 @@
 		return 1;
 	}
 	if (avc->sps[sps_id].vui.nal_hrd_parameters_present_flag || avc->sps[sps_id].vui.vcl_hrd_parameters_present_flag) { /*CpbDpbDelaysPresentFlag, see 14496-10(2003) E.11*/
-		gf_bs_read_int(bs, 1 + avc->sps[sps_id].vui.hrd.cpb_removal_delay_length_minus1); /*cpb_removal_delay*/
-		gf_bs_read_int(bs, 1 + avc->sps[sps_id].vui.hrd.dpb_output_delay_length_minus1); /*dpb_output_delay*/
+		gf_bs_read_int_log(bs, 1 + avc->sps[sps_id].vui.hrd.cpb_removal_delay_length_minus1, "cpb_removal_delay_minus1");
+		gf_bs_read_int_log(bs, 1 + avc->sps[sps_id].vui.hrd.dpb_output_delay_length_minus1, "dpb_output_delay_minus1");
 	}
 
 	/*ISO 14496-10 (2003), D.8.2: we need to get pic_struct in order to know if we display top field first or bottom field first*/
 	if (avc->sps[sps_id].vui.pic_struct_present_flag) {
 		int i;
-		pt->pic_struct = gf_bs_read_int(bs, 4);
+		pt->pic_struct = gf_bs_read_int_log(bs, 4, "pic_struct");
 		if (pt->pic_struct > 8) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] invalid pic_struct value %d\n", pt->pic_struct));
 			return 1;
 		}
 
 		for (i = 0; i < NumClockTS[pt->pic_struct]; i++) {
-			if (gf_bs_read_int(bs, 1)) {/*clock_timestamp_flag[i]*/
+			if (gf_bs_read_int_log_idx(bs, 1, "clock_timestamp_flag", i)) {
 				Bool full_timestamp_flag;
-				gf_bs_read_int(bs, 2);						/*ct_type*/
-				gf_bs_read_int(bs, 1);						/*nuit_field_based_flag*/
-				gf_bs_read_int(bs, 5);						/*counting_type*/
-				full_timestamp_flag = gf_bs_read_int(bs, 1);/*full_timestamp_flag*/
-				gf_bs_read_int(bs, 1);						/*discontinuity_flag*/
-				gf_bs_read_int(bs, 1);						/*cnt_dropped_flag*/
-				gf_bs_read_int(bs, 8);						/*n_frames*/
+				gf_bs_read_int_log_idx(bs, 2, "ct_type", i);
+				gf_bs_read_int_log_idx(bs, 1, "nuit_field_based_flag", i);
+				gf_bs_read_int_log_idx(bs, 5, "counting_type", i);
+				full_timestamp_flag = gf_bs_read_int_log_idx(bs, 1, "full_timestamp_flag", i);
+				gf_bs_read_int_log_idx(bs, 1, "discontinuity_flag", i);
+				gf_bs_read_int_log_idx(bs, 1, "cnt_dropped_flag", i);
+				gf_bs_read_int_log_idx(bs, 8, "n_frames", i);
 				if (full_timestamp_flag) {
-					gf_bs_read_int(bs, 6);					/*seconds_value*/
-					gf_bs_read_int(bs, 6);					/*minutes_value*/
-					gf_bs_read_int(bs, 5);					/*hours_value*/
+					gf_bs_read_int_log_idx(bs, 6, "seconds_value", i);
+					gf_bs_read_int_log_idx(bs, 6, "minutes_value", i);
+					gf_bs_read_int_log_idx(bs, 5, "hours_value", i);
 				}
 				else {
-					if (gf_bs_read_int(bs, 1)) {			/*seconds_flag*/
-						gf_bs_read_int(bs, 6);				/*seconds_value*/
-						if (gf_bs_read_int(bs, 1)) {		/*minutes_flag*/
-							gf_bs_read_int(bs, 6);			/*minutes_value*/
-							if (gf_bs_read_int(bs, 1)) {	/*hours_flag*/
-								gf_bs_read_int(bs, 5);		/*hours_value*/
+					if (gf_bs_read_int_log_idx(bs, 1, "seconds_flag", i)) {
+						gf_bs_read_int_log_idx(bs, 6, "seconds_value", i);
+						if (gf_bs_read_int_log_idx(bs, 1, "minutes_flag", i)) {
+							gf_bs_read_int_log_idx(bs, 6, "minutes_value", i);
+							if (gf_bs_read_int_log_idx(bs, 1, "hours_flag", i)) {
+								gf_bs_read_int_log_idx(bs, 5, "hours_value", i);
 							}
 						}
 					}
 					if (avc->sps[sps_id].vui.hrd.time_offset_length > 0)
-						gf_bs_read_int(bs, avc->sps[sps_id].vui.hrd.time_offset_length);	/*time_offset*/
+						gf_bs_read_int_log_idx(bs, avc->sps[sps_id].vui.hrd.time_offset_length, "time_offset", i);
 				}
 			}
 		}
@@ -5921,7 +6087,7 @@
 }
 
 GF_EXPORT
-s32 gf_media_avc_parse_nalu(GF_BitStream *bs, AVCState *avc)
+s32 gf_avc_parse_nalu(GF_BitStream *bs, AVCState *avc)
 {
 	u8 idr_flag;
 	s32 slice, ret;
@@ -5929,6 +6095,8 @@
 	AVCSliceInfo n_state;
 
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
+	if (!gf_bs_available(bs)) return -1;
+	gf_bs_mark_overflow(bs, GF_TRUE);
 
 	nal_hdr = gf_bs_read_u8(bs);
 
@@ -5947,7 +6115,9 @@
 		break;
 
 	case GF_AVC_NALU_SVC_SLICE:
-		SVC_ReadNal_header_extension(bs, &n_state.NalHeader);
+		SVC_ReadNal_header_extension(bs, &n_state.svc_nalhdr);
+		if (gf_bs_is_overflow(bs)) return -1;
+
 		// slice buffer - read the info and compare.
 		/*ret = */svc_parse_slice(bs, avc, &n_state);
 		if (avc->s_info.nal_ref_idc) {
@@ -5964,7 +6134,8 @@
 		return 0;
 
 	case GF_AVC_NALU_SVC_PREFIX_NALU:
-		SVC_ReadNal_header_extension(bs, &n_state.NalHeader);
+		SVC_ReadNal_header_extension(bs, &avc->s_info.svc_nalhdr);
+		if (gf_bs_is_overflow(bs)) return -1;
 		return 0;
 
 	case GF_AVC_NALU_IDR_SLICE:
@@ -5975,6 +6146,7 @@
 		slice = 1;
 		/* slice buffer - read the info and compare.*/
 		ret = avc_parse_slice(bs, avc, idr_flag, &n_state);
+		if (gf_bs_is_overflow(bs)) ret = -1;
 		if (ret < 0) return ret;
 		ret = 0;
 		if (
@@ -5997,7 +6169,8 @@
 			ret = 1;
 			break;
 		}
-		assert(avc->s_info.sps);
+		if (!avc->s_info.sps)
+			return -1;
 
 		if (avc->s_info.sps->poc_type == n_state.sps->poc_type) {
 			if (!avc->s_info.sps->poc_type) {
@@ -6034,20 +6207,24 @@
 		}
 		break;
 	case GF_AVC_NALU_SEQ_PARAM:
-		avc->last_ps_idx = gf_media_avc_read_sps_bs_internal(bs, avc, 0, NULL, nal_hdr);
+		avc->last_ps_idx = gf_avc_read_sps_bs_internal(bs, avc, 0, NULL, nal_hdr);
+		if (gf_bs_is_overflow(bs)) return -1;
 		if (avc->last_ps_idx < 0) return -1;
 		return 0;
 
 	case GF_AVC_NALU_PIC_PARAM:
-		avc->last_ps_idx = gf_media_avc_read_pps_bs_internal(bs, avc, nal_hdr);
+		avc->last_ps_idx = gf_avc_read_pps_bs_internal(bs, avc, nal_hdr);
+		if (gf_bs_is_overflow(bs)) return -1;
 		if (avc->last_ps_idx < 0) return -1;
 		return 0;
 	case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-		avc->last_ps_idx = gf_media_avc_read_sps_bs_internal(bs, avc, 1, NULL, nal_hdr);
+		avc->last_ps_idx = gf_avc_read_sps_bs_internal(bs, avc, 1, NULL, nal_hdr);
+		if (gf_bs_is_overflow(bs)) return -1;
 		if (avc->last_ps_idx < 0) return -1;
 		return 0;
 	case GF_AVC_NALU_SEQ_PARAM_EXT:
-		avc->last_ps_idx = (s32) gf_bs_get_ue(bs);
+		avc->last_ps_idx = (s32) gf_bs_read_ue(bs);
+		if (gf_bs_is_overflow(bs)) return -1;
 		if (avc->last_ps_idx < 0) return -1;
 		return 0;
 
@@ -6084,7 +6261,7 @@
 }
 
 
-u32 gf_media_avc_reformat_sei(u8 *buffer, u32 nal_size, Bool isobmf_rewrite, AVCState *avc)
+u32 gf_avc_reformat_sei(u8 *buffer, u32 nal_size, Bool isobmf_rewrite, AVCState *avc)
 {
 	u32 ptype, psize, hdr, var;
 	u32 start;
@@ -6129,6 +6306,7 @@
 		if (start + psize >= nal_size) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] SEI user message type %d size error (%d but %d remain), keeping full SEI untouched\n", ptype, psize, nal_size - start));
 			if (bs_dest) gf_bs_del(bs_dest);
+			gf_bs_del(bs);
 			return nal_size;
 		}
 		switch (ptype) {
@@ -6219,23 +6397,331 @@
 		u8 *dst_no_epb = NULL;
 		u32 dst_no_epb_size = 0;
 		gf_bs_get_content(bs_dest, &dst_no_epb, &dst_no_epb_size);
-		nal_size = gf_media_nalu_add_emulation_bytes(buffer, dst_no_epb, dst_no_epb_size);
+		if (dst_no_epb) {
+			u32 nb_bytes_add = gf_media_nalu_emulation_bytes_add_count(dst_no_epb, dst_no_epb_size);
+			//if result fits into source buffer, reformat
+			//otherwise ignore and return source (happens in some fuzzing cases, cf issue 1903)
+			if (dst_no_epb_size + nb_bytes_add <= nal_size)
+				nal_size = gf_media_nalu_add_emulation_bytes(buffer, dst_no_epb, dst_no_epb_size);
+
+			gf_free(dst_no_epb);
+		}
 	}
 	if (bs_dest) gf_bs_del(bs_dest);
 	return nal_size;
 }
 
 
-static u8 avc_get_sar_idx(u32 w, u32 h)
+static u8 avc_hevc_get_sar_idx(u32 w, u32 h)
 {
-	u32 i;
-	for (i = 0; i < 14; i++) {
-		if ((avc_sar[i].w == w) && (avc_sar[i].h == h)) return i;
+	u32 i, count = GF_ARRAY_LENGTH(avc_hevc_sar);
+	for (i = 0; i < count; i++) {
+		if ((avc_hevc_sar[i].w == w) && (avc_hevc_sar[i].h == h))
+			return i;
 	}
 	return 0xFF;
 }
 
-GF_Err gf_media_avc_change_par(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d)
+static void avc_hevc_vvc_rewrite_vui(GF_VUIInfo *vui_info, GF_BitStream *orig, GF_BitStream *mod, Bool is_vvc)
+{
+	/* VUI present flag*/
+	Bool vui_present_flag = gf_bs_read_int(orig, 1);
+
+	/*setup default values*/
+	Bool aspect_ratio_info_present_flag = 0;
+	s32 aspect_ratio_idc = -1;
+	u32 ar_n=0, ar_d=0;
+	Bool overscan_info_present_flag = 0;
+	u32 overscan_info=0;
+	u32 video_signal_type_present_flag=0;
+	u32 video_format = 5;
+	u32 video_full_range_flag = 0;
+	u32 colour_description_present_flag = 0;
+	u32 colour_primaries = 2;
+	u32 transfer_characteristics = 2;
+	u32 matrix_coefficients = 2;
+	//VVC
+	Bool progressive_source_flag = 1;
+	Bool interlaced_source_flag = 0;
+	Bool non_packed_constraint_flag = 0;
+	Bool non_projected_constraint_flag = 0;
+	Bool aspect_ratio_constant_flag = 1;
+	u32 vui_start_pos = 0;
+	u32 orig_vvc_payload_size = 0;
+	Bool vui_chroma_loc_info_present_flag=0;
+	u32 chroma_loc1=0, chroma_loc2=0;
+	u32 final_vvc_payload_size = 8; //4 first bits + 4 flags (ar, overscan and colour desc, chroma pos)
+	u32 mod_vui_start_pos = 0;
+
+	//if VUI is present, read all SAR and overscan values
+	if (vui_present_flag) { /* VUI found in input bitstream */
+		if (is_vvc) {
+			//align
+			orig_vvc_payload_size = 8 * ( 1 + gf_bs_read_ue(orig) );
+			gf_bs_align(orig);
+			vui_start_pos = gf_bs_get_bit_offset(orig);
+
+			progressive_source_flag = gf_bs_read_int(orig, 1);
+			interlaced_source_flag = gf_bs_read_int(orig, 1);
+			non_packed_constraint_flag = gf_bs_read_int(orig, 1);
+			non_projected_constraint_flag = gf_bs_read_int(orig, 1);
+		}
+		aspect_ratio_info_present_flag = gf_bs_read_int(orig, 1);
+
+		if (aspect_ratio_info_present_flag) {
+			if (is_vvc) {
+				aspect_ratio_constant_flag = gf_bs_read_int(orig, 1);
+			}
+			aspect_ratio_idc = gf_bs_read_int(orig, 8); /*aspect_ratio_idc*/
+			if (aspect_ratio_idc == 255) {
+				ar_n = gf_bs_read_int(orig, 16); /*sar_width*/
+				ar_d = gf_bs_read_int(orig, 16); /*sar_height*/
+			}
+		}
+
+		/*overscan_info_present_flag */
+		overscan_info_present_flag = gf_bs_read_int(orig, 1);
+		if(overscan_info_present_flag) {
+			overscan_info = gf_bs_read_int(orig, 1);
+		}
+
+		/* read all video signal related flags first */
+		video_signal_type_present_flag = gf_bs_read_int(orig, 1);
+
+		if (video_signal_type_present_flag) {
+			if (!is_vvc) {
+				video_format = gf_bs_read_int(orig, 3);
+				video_full_range_flag = gf_bs_read_int(orig, 1);
+				colour_description_present_flag = gf_bs_read_int(orig, 1);
+			} else {
+				colour_description_present_flag = 1;
+			}
+
+			if (colour_description_present_flag) {
+				colour_primaries = gf_bs_read_int(orig, 8);
+				transfer_characteristics = gf_bs_read_int(orig, 8);
+				matrix_coefficients = gf_bs_read_int(orig, 8);
+				if (is_vvc) {
+					video_full_range_flag = gf_bs_read_int(orig, 1);
+				}
+			}
+		}
+		if (is_vvc) {
+			vui_chroma_loc_info_present_flag = gf_bs_read_int(orig, 1);
+			if (vui_chroma_loc_info_present_flag) {
+				if (progressive_source_flag && !interlaced_source_flag) {
+					chroma_loc1 = gf_bs_read_ue(orig);
+				} else {
+					chroma_loc1 = gf_bs_read_ue(orig);
+					chroma_loc2 = gf_bs_read_ue(orig);
+				}
+			}
+		}
+		//not VVC: don't read the rest
+	}
+
+	//recompute values
+	//no change
+	if ((vui_info->ar_num<0) || (vui_info->ar_den<0)) {
+	}
+	//remove par
+	else if ((vui_info->ar_num==0) || (vui_info->ar_den==0)) {
+		aspect_ratio_info_present_flag = 0;
+	}
+	//set par
+	else {
+		aspect_ratio_info_present_flag = 1;
+	}
+
+	//add par size
+	if (aspect_ratio_info_present_flag) {
+		ar_n = vui_info->ar_num;
+		ar_d = vui_info->ar_den;
+		aspect_ratio_idc = avc_hevc_get_sar_idx((u32) ar_n, (u32) ar_d);
+		if (is_vvc) {
+			final_vvc_payload_size += 9;
+			if (aspect_ratio_idc==0xFF)
+				final_vvc_payload_size += 32;
+		}
+	}
+
+	if (vui_info->remove_video_info) {
+		video_signal_type_present_flag = 0;
+	}
+	/* correct the values of each flags */
+	else if ((vui_info->fullrange==0) && (vui_info->video_format==5) && (vui_info->color_prim==2) && (vui_info->color_tfc==2) && (vui_info->color_matrix==2)) {
+		video_signal_type_present_flag = 0; /* all default, nothing to write*/
+	} else {
+		video_signal_type_present_flag = 1;
+		video_format = (vui_info->video_format < 0) ? video_format : vui_info->video_format;
+		video_full_range_flag = (vui_info->fullrange < 0) ? video_full_range_flag : vui_info->fullrange;
+		if ((vui_info->color_prim==2) && (vui_info->color_tfc==2) && (vui_info->color_matrix==2)) {
+			colour_description_present_flag = 0;
+		} else {
+			colour_description_present_flag = 1;
+			colour_primaries = (vui_info->color_prim < 0) ? colour_primaries : vui_info->color_prim;
+			transfer_characteristics = (vui_info->color_tfc < 0) ? transfer_characteristics : vui_info->color_tfc;
+			matrix_coefficients = (vui_info->color_matrix < 0) ? matrix_coefficients : vui_info->color_matrix;
+		}
+		if ((colour_primaries==2) && (transfer_characteristics==2) && (matrix_coefficients==2)) {
+			colour_description_present_flag = 0;
+			if ((video_format==5) && (video_full_range_flag==0))
+				video_signal_type_present_flag = 0;
+		}
+
+		if (is_vvc) {
+			if (!video_full_range_flag && !colour_description_present_flag) {
+				video_signal_type_present_flag = 0;
+			} else {
+				final_vvc_payload_size += 25;
+			}
+		}
+	}
+
+	if (is_vvc && vui_chroma_loc_info_present_flag) {
+		if (progressive_source_flag && !interlaced_source_flag) {
+			final_vvc_payload_size += gf_get_ue_nb_bits(chroma_loc1);
+		} else {
+			final_vvc_payload_size += gf_get_ue_nb_bits(chroma_loc1);
+			final_vvc_payload_size += gf_get_ue_nb_bits(chroma_loc2);
+		}
+	}
+
+	//always rewrite VUI
+	gf_bs_write_int(mod, 1, 1);
+	if (is_vvc) {
+		while (final_vvc_payload_size%8)
+			final_vvc_payload_size++;
+		final_vvc_payload_size/=8;
+
+		gf_bs_write_ue(mod, final_vvc_payload_size-1);
+		gf_bs_align(mod);
+		mod_vui_start_pos = gf_bs_get_bit_offset(mod);
+		final_vvc_payload_size *= 8;
+
+		gf_bs_write_int(mod, progressive_source_flag, 1);
+		gf_bs_write_int(mod, interlaced_source_flag, 1);
+		gf_bs_write_int(mod, non_packed_constraint_flag, 1);
+		gf_bs_write_int(mod, non_projected_constraint_flag, 1);
+	}
+
+	gf_bs_write_int(mod, aspect_ratio_info_present_flag, 1);
+	if (aspect_ratio_info_present_flag) {
+		if (is_vvc)
+			gf_bs_write_int(mod, aspect_ratio_constant_flag, 1);
+
+		gf_bs_write_int(mod, aspect_ratio_idc, 8);
+		if (aspect_ratio_idc == 255) {
+			gf_bs_write_int(mod, ar_n, 16);
+			gf_bs_write_int(mod, ar_d, 16);
+		}
+		if (vui_info->update) {
+			vui_info->ar_num = ar_n;
+			vui_info->ar_den = ar_d;
+		}
+	}
+	gf_bs_write_int(mod, overscan_info_present_flag, 1);
+	if (overscan_info_present_flag) {
+		gf_bs_write_int(mod, overscan_info, 1);
+	}
+
+	gf_bs_write_int(mod, video_signal_type_present_flag, 1);
+	if (video_signal_type_present_flag) {
+		if (!is_vvc) {
+			gf_bs_write_int(mod, video_format, 3);
+			gf_bs_write_int(mod, video_full_range_flag, 1);
+			gf_bs_write_int(mod, colour_description_present_flag, 1);
+		} else {
+			colour_description_present_flag = 1;
+		}
+
+		if (colour_description_present_flag) {
+			gf_bs_write_int(mod, colour_primaries, 8);
+			gf_bs_write_int(mod, transfer_characteristics, 8);
+			gf_bs_write_int(mod, matrix_coefficients, 8);
+			if (is_vvc)
+				gf_bs_write_int(mod, video_full_range_flag, 1);
+		}
+
+		if (vui_info->update) {
+			vui_info->video_format = video_format;
+			vui_info->fullrange = video_full_range_flag;
+			if (colour_description_present_flag) {
+				vui_info->color_prim = colour_primaries;
+				vui_info->color_tfc = transfer_characteristics;
+				vui_info->color_matrix = matrix_coefficients;
+			}
+		}
+	}
+
+	if (is_vvc) {
+		//write vui_chroma_loc_info_present_flag
+		gf_bs_write_int(mod, vui_chroma_loc_info_present_flag, 1);
+		if (vui_chroma_loc_info_present_flag) {
+			if (progressive_source_flag && !interlaced_source_flag) {
+				gf_bs_write_ue(mod, chroma_loc1);
+			} else {
+				gf_bs_write_ue(mod, chroma_loc1);
+				gf_bs_write_ue(mod, chroma_loc2);
+			}
+		}
+		//we don't copy over vui extension (they're not supposed to be present), but we must parse them
+		if (vui_present_flag) {
+			//we are byte aligned for vui_paramaters
+			Bool more_data_in_payload = GF_TRUE;
+			vui_start_pos = gf_bs_get_bit_offset(orig) - vui_start_pos;
+			if (gf_bs_is_align(orig) && (vui_start_pos == orig_vvc_payload_size))
+				more_data_in_payload = GF_FALSE;
+
+			u32 nb_bits = orig_vvc_payload_size - vui_start_pos;
+			if (more_data_in_payload) {
+				if (nb_bits<8) {
+					u32 val = gf_bs_peek_bits(orig, nb_bits, 0);
+					u32 bit_pos = 1<<(nb_bits-1);
+					if (val == bit_pos)
+						more_data_in_payload = 0;
+				}
+			}
+			if (more_data_in_payload) {
+				while (nb_bits) {
+					nb_bits--;
+					gf_bs_read_int(orig, 1); //vui_reserved_payload_extension_data
+					//load next 32 bits, if only 1 at MSB and 0 afterwards, done
+					if (nb_bits<32) {
+						u32 val = gf_bs_peek_bits(orig, nb_bits, 0);
+						u32 bit_pos = 1<<(nb_bits-1);
+						if (val == bit_pos)
+							break;
+					}
+				}
+
+				//then byte alignment of vui_payload
+				gf_bs_read_int(orig, 1); //vui_payload_bit_equal_to_one
+				gf_bs_align(orig);
+			}
+		}
+		mod_vui_start_pos = gf_bs_get_bit_offset(mod) - mod_vui_start_pos;
+		//check if we need explicit align
+		if (!gf_bs_is_align(mod) || (mod_vui_start_pos != final_vvc_payload_size)) {
+			gf_bs_write_int(mod, 1, 1); //vui_payload_bit_equal_to_one
+			gf_bs_align(mod);
+		}
+		return;
+	}
+
+	/*no VUI in input bitstream but we just inserted one, set all remaining vui flags to 0*/
+	if (!vui_present_flag) {
+		gf_bs_write_int(mod, 0, 1);		/*chroma_location_info_present_flag */
+		gf_bs_write_int(mod, 0, 1);		/*timing_info_present_flag*/
+		gf_bs_write_int(mod, 0, 1);		/*nal_hrd_parameters_present*/
+		gf_bs_write_int(mod, 0, 1);		/*vcl_hrd_parameters_present*/
+		gf_bs_write_int(mod, 0, 1);		/*pic_struct_present*/
+		gf_bs_write_int(mod, 0, 1);		/*bitstream_restriction*/
+	}
+	/*otherwise we copy over the bits from the input bitrate*/
+}
+
+GF_Err gf_avc_change_vui(GF_AVCConfig *avcc, GF_VUIInfo *vui_info)
 {
 	GF_BitStream *orig, *mod;
 	AVCState avc;
@@ -6247,13 +6733,13 @@
 	memset(&avc, 0, sizeof(AVCState));
 	avc.sps_active_idx = -1;
 
-	i = 0;
+	i=0;
 	while ((slc = (GF_AVCConfigSlot *)gf_list_enum(avcc->sequenceParameterSets, &i))) {
 		u8 *no_emulation_buf = NULL;
 		u32 no_emulation_buf_size = 0, emulation_bytes = 0;
-		idx = gf_media_avc_read_sps(slc->data, slc->size, &avc, 0, &bit_offset);
-		if (idx < 0) {
-			if (orig)
+		idx = gf_avc_read_sps(slc->data, slc->size, &avc, 0, &bit_offset);
+		if (idx<0) {
+			if ( orig )
 				gf_bs_del(orig);
 			continue;
 		}
@@ -6274,44 +6760,8 @@
 			gf_bs_write_int(mod, flag, 1);
 			bit_offset--;
 		}
-		/*check VUI*/
-		flag = gf_bs_read_int(orig, 1);
-		gf_bs_write_int(mod, 1, 1); /*vui_parameters_present_flag*/
-		if (flag) {
-			/*aspect_ratio_info_present_flag*/
-			if (gf_bs_read_int(orig, 1)) {
-				s32 aspect_ratio_idc = gf_bs_read_int(orig, 8);
-				if (aspect_ratio_idc == 255) {
-					gf_bs_read_int(orig, 16); /*AR num*/
-					gf_bs_read_int(orig, 16); /*AR den*/
-				}
-			}
-		}
-		if ((ar_d < 0) || (ar_n < 0)) {
-			/*no AR signaled*/
-			gf_bs_write_int(mod, 0, 1);
-		}
-		else {
-			u32 sarx;
-			gf_bs_write_int(mod, 1, 1);
-			sarx = avc_get_sar_idx((u32)ar_n, (u32)ar_d);
-			gf_bs_write_int(mod, sarx, 8);
-			if (sarx == 0xFF) {
-				gf_bs_write_int(mod, ar_n, 16);
-				gf_bs_write_int(mod, ar_d, 16);
-			}
-		}
-		/*no VUI in input bitstream, set all vui flags to 0*/
-		if (!flag) {
-			gf_bs_write_int(mod, 0, 1);		/*overscan_info_present_flag */
-			gf_bs_write_int(mod, 0, 1);		/*video_signal_type_present_flag */
-			gf_bs_write_int(mod, 0, 1);		/*chroma_location_info_present_flag */
-			gf_bs_write_int(mod, 0, 1);		/*timing_info_present_flag*/
-			gf_bs_write_int(mod, 0, 1);		/*nal_hrd_parameters_present*/
-			gf_bs_write_int(mod, 0, 1);		/*vcl_hrd_parameters_present*/
-			gf_bs_write_int(mod, 0, 1);		/*pic_struct_present*/
-			gf_bs_write_int(mod, 0, 1);		/*bitstream_restriction*/
-		}
+
+		avc_hevc_vvc_rewrite_vui(vui_info, orig, mod, GF_FALSE);
 
 		/*finally copy over remaining*/
 		while (gf_bs_bits_available(orig)) {
@@ -6325,8 +6775,8 @@
 		/*set anti-emulation*/
 		gf_bs_get_content(mod, &no_emulation_buf, &flag);
 		emulation_bytes = gf_media_nalu_emulation_bytes_add_count(no_emulation_buf, flag);
-		if (flag + emulation_bytes + 1 > slc->size)
-			slc->data = (char*)gf_realloc(slc->data, flag + emulation_bytes + 1);
+		if (flag+emulation_bytes+1>slc->size)
+			slc->data = (char*)gf_realloc(slc->data, flag+emulation_bytes+1);
 		slc->size = gf_media_nalu_add_emulation_bytes(no_emulation_buf, slc->data + 1, flag) + 1;
 
 		gf_bs_del(mod);
@@ -6336,6 +6786,37 @@
 }
 
 GF_EXPORT
+GF_Err gf_avc_change_par(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d)
+{
+	GF_VUIInfo vuii;
+	memset(&vuii, 0, sizeof(GF_VUIInfo));
+	vuii.ar_num = ar_n;
+	vuii.ar_den = ar_d;
+	vuii.fullrange = -1;
+	vuii.video_format = -1;
+	vuii.color_prim = -1;
+	vuii.color_tfc = -1;
+	vuii.color_matrix = -1;
+	return gf_avc_change_vui(avcc, &vuii);
+}
+
+GF_EXPORT
+GF_Err gf_avc_change_color(GF_AVCConfig *avcc, s32 fullrange, s32 vidformat, s32 colorprim, s32 transfer, s32 colmatrix)
+{
+	GF_VUIInfo vuii;
+	memset(&vuii, 0, sizeof(GF_VUIInfo));
+	vuii.ar_num = -1;
+	vuii.ar_den = -1;
+	vuii.fullrange = fullrange;
+	vuii.video_format = vidformat;
+	vuii.color_prim = colorprim;
+	vuii.color_tfc = transfer;
+	vuii.color_matrix = colmatrix;
+	return gf_avc_change_vui(avcc, &vuii);
+}
+
+
+GF_EXPORT
 GF_Err gf_avc_get_sps_info(u8 *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d)
 {
 	AVCState avc;
@@ -6343,7 +6824,7 @@
 	memset(&avc, 0, sizeof(AVCState));
 	avc.sps_active_idx = -1;
 
-	idx = gf_media_avc_read_sps(sps_data, sps_size, &avc, 0, NULL);
+	idx = gf_avc_read_sps(sps_data, sps_size, &avc, 0, NULL);
 	if (idx < 0) {
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
@@ -6371,8 +6852,8 @@
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
 	/*nal hdr*/ gf_bs_read_int(bs, 8);
 
-	*pps_id = gf_bs_get_ue(bs);
-	*sps_id = gf_bs_get_ue(bs);
+	*pps_id = gf_bs_read_ue(bs);
+	*sps_id = gf_bs_read_ue(bs);
 
 exit:
 	gf_bs_del(bs);
@@ -6385,7 +6866,7 @@
 HEVC parsing
 **********/
 
-Bool gf_media_hevc_slice_is_intra(HEVCState *hevc)
+Bool gf_hevc_slice_is_intra(HEVCState *hevc)
 {
 	switch (hevc->s_info.nal_unit_type) {
 	case GF_HEVC_NALU_SLICE_BLA_W_LP:
@@ -6400,7 +6881,7 @@
 	}
 }
 
-Bool gf_media_hevc_slice_is_IDR(HEVCState *hevc)
+Bool gf_hevc_slice_is_IDR(HEVCState *hevc)
 {
 	if (hevc->sei.recovery_point.valid)
 	{
@@ -6416,12 +6897,12 @@
 	}
 }
 
-static Bool parse_short_term_ref_pic_set(GF_BitStream *bs, HEVC_SPS *sps, u32 idx_rps)
+static Bool hevc_parse_short_term_ref_pic_set(GF_BitStream *bs, HEVC_SPS *sps, u32 idx_rps)
 {
 	u32 i;
 	Bool inter_ref_pic_set_prediction_flag = 0;
 	if (idx_rps != 0)
-		inter_ref_pic_set_prediction_flag = gf_bs_read_int(bs, 1);
+		inter_ref_pic_set_prediction_flag = gf_bs_read_int_log_idx(bs, 1, "inter_ref_pic_set_prediction_flag", idx_rps);
 
 	if (inter_ref_pic_set_prediction_flag) {
 		HEVC_ReferencePictureSets *ref_ps, *rps;
@@ -6432,12 +6913,12 @@
 		s32 deltaRPS;
 		u32 k = 0, k0 = 0, k1 = 0;
 		if (idx_rps == sps->num_short_term_ref_pic_sets)
-			delta_idx_minus1 = gf_bs_get_ue(bs);
+			delta_idx_minus1 = gf_bs_read_ue_log_idx(bs, "delta_idx_minus1", idx_rps);
 
 		assert(delta_idx_minus1 <= idx_rps - 1);
 		ref_idx = idx_rps - 1 - delta_idx_minus1;
-		delta_rps_sign = gf_bs_read_int(bs, 1);
-		abs_delta_rps_minus1 = gf_bs_get_ue(bs);
+		delta_rps_sign = gf_bs_read_int_log_idx(bs, 1, "delta_rps_sign", idx_rps);
+		abs_delta_rps_minus1 = gf_bs_read_ue_log_idx(bs, "abs_delta_rps_minus1", idx_rps);
 		deltaRPS = (1 - (delta_rps_sign << 1)) * (abs_delta_rps_minus1 + 1);
 
 		rps = &sps->rps[idx_rps];
@@ -6445,10 +6926,10 @@
 		nb_ref_pics = ref_ps->num_negative_pics + ref_ps->num_positive_pics;
 		for (i = 0; i <= nb_ref_pics; i++) {
 			s32 ref_idc;
-			s32 used_by_curr_pic_flag = gf_bs_read_int(bs, 1);
+			s32 used_by_curr_pic_flag = gf_bs_read_int_log_idx2(bs, 1, "used_by_curr_pic_flag", idx_rps, i);
 			ref_idc = used_by_curr_pic_flag ? 1 : 0;
 			if (!used_by_curr_pic_flag) {
-				used_by_curr_pic_flag = gf_bs_read_int(bs, 1);
+				used_by_curr_pic_flag = gf_bs_read_int_log_idx2(bs, 1, "used_by_curr_pic_flag", idx_rps, i);
 				ref_idc = used_by_curr_pic_flag << 1;
 			}
 			if ((ref_idc == 1) || (ref_idc == 2)) {
@@ -6469,25 +6950,25 @@
 	}
 	else {
 		s32 prev = 0, poc;
-		sps->rps[idx_rps].num_negative_pics = gf_bs_get_ue(bs);
-		sps->rps[idx_rps].num_positive_pics = gf_bs_get_ue(bs);
+		sps->rps[idx_rps].num_negative_pics = gf_bs_read_ue_log_idx(bs, "num_negative_pics", idx_rps);
+		sps->rps[idx_rps].num_positive_pics = gf_bs_read_ue_log_idx(bs, "num_positive_pics", idx_rps);
 		if (sps->rps[idx_rps].num_negative_pics > 16)
 			return GF_FALSE;
 		if (sps->rps[idx_rps].num_positive_pics > 16)
 			return GF_FALSE;
 		for (i = 0; i < sps->rps[idx_rps].num_negative_pics; i++) {
-			u32 delta_poc_s0_minus1 = gf_bs_get_ue(bs);
+			u32 delta_poc_s0_minus1 = gf_bs_read_ue_log_idx2(bs, "delta_poc_s0_minus1", idx_rps, i);
 			poc = prev - delta_poc_s0_minus1 - 1;
 			prev = poc;
 			sps->rps[idx_rps].delta_poc[i] = poc;
-			/*used_by_curr_pic_s1_flag[ i ] = */gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log_idx2(bs, 1, "delta_poc_s0_minus1", idx_rps, i);
 		}
 		for (i = 0; i < sps->rps[idx_rps].num_positive_pics; i++) {
-			u32 delta_poc_s1_minus1 = gf_bs_get_ue(bs);
+			u32 delta_poc_s1_minus1 = gf_bs_read_ue_log_idx2(bs, "delta_poc_s1_minus1" , idx_rps, i);
 			poc = prev + delta_poc_s1_minus1 + 1;
 			prev = poc;
 			sps->rps[idx_rps].delta_poc[i] = poc;
-			/*used_by_curr_pic_s1_flag[ i ] = */gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log_idx2(bs, 1, "used_by_curr_pic_s1_flag", idx_rps, i);
 		}
 	}
 	return GF_TRUE;
@@ -6502,32 +6983,32 @@
 
 	num_ref_idx = num_ref_idx_l0_active;
 
-	/*luma_log2_weight_denom=*/gf_bs_get_ue(bs);
+	gf_bs_read_ue_log(bs, "luma_log2_weight_denom");
 	if (ChromaArrayType != 0)
-		/*delta_chroma_log2_weight_denom=*/gf_bs_get_se(bs);
+		gf_bs_read_se_log(bs, "delta_chroma_log2_weight_denom");
 
 parse_weights:
 	for (i = 0; i < num_ref_idx; i++) {
-		luma_weights[i] = gf_bs_read_int(bs, 1);
-		//infered to be 0 if not present
+		luma_weights[i] = gf_bs_read_int_log_idx(bs, 1, "luma_weights", i);
+		//inferred to be 0 if not present
 		chroma_weights[i] = 0;
 	}
 	if (ChromaArrayType != 0) {
 		for (i = 0; i < num_ref_idx; i++) {
-			chroma_weights[i] = gf_bs_read_int(bs, 1);
+			chroma_weights[i] = gf_bs_read_int_log_idx(bs, 1, "chroma_weights", i);
 		}
 	}
 	for (i = 0; i < num_ref_idx; i++) {
 		if (luma_weights[i]) {
-			/*delta_luma_weight_l0[ i ]=*/gf_bs_get_se(bs);
-			/*luma_offset_l0[ i ]=*/gf_bs_get_se(bs);
+			gf_bs_read_se_log_idx(bs, "delta_luma_weight_l0", i);
+			gf_bs_read_se_log_idx(bs, "luma_offset_l0", i);
 		}
 		if (chroma_weights[i]) {
-			/*delta_chroma_weight_l0[ i ][ 0 ]=*/gf_bs_get_se(bs);
-			/*delta_chroma_offset_l0[ i ][ 0 ]=*/gf_bs_get_se(bs);
+			gf_bs_read_se_log_idx(bs, "delta_chroma_weight_l0_0", i);
+			gf_bs_read_se_log_idx(bs, "delta_chroma_offset_l0_0", i);
 
-			/*delta_chroma_weight_l0[ i ][ 1 ]=*/gf_bs_get_se(bs);
-			/*delta_chroma_offset_l0[ i ][ 1 ]=*/gf_bs_get_se(bs);
+			gf_bs_read_se_log_idx(bs, "delta_chroma_weight_l0_1", i);
+			gf_bs_read_se_log_idx(bs, "delta_chroma_offset_l0_1", i);
 		}
 	}
 
@@ -6543,7 +7024,7 @@
 Bool ref_pic_lists_modification(GF_BitStream *bs, u32 slice_type, u32 num_ref_idx_l0_active, u32 num_ref_idx_l1_active)
 {
 	//u32 i;
-	Bool ref_pic_list_modification_flag_l0 = gf_bs_read_int(bs, 1);
+	Bool ref_pic_list_modification_flag_l0 = gf_bs_read_int_log(bs, 1, "ref_pic_list_modification_flag_l0");
 	if (ref_pic_list_modification_flag_l0) {
 		/*for (i=0; i<num_ref_idx_l0_active; i++) {
 			list_entry_l0[i] = *//*gf_bs_read_int(bs, (u32)ceil(log(getNumPicTotalCurr())/log(2)));
@@ -6551,7 +7032,7 @@
 		return GF_FALSE;
 	}
 	if (slice_type == GF_HEVC_SLICE_TYPE_B) {
-		Bool ref_pic_list_modification_flag_l1 = gf_bs_read_int(bs, 1);
+		Bool ref_pic_list_modification_flag_l1 = gf_bs_read_int_log(bs, 1, "ref_pic_list_modification_flag_l1");
 		if (ref_pic_list_modification_flag_l1) {
 			/*for (i=0; i<num_ref_idx_l1_active; i++) {
 				list_entry_l1[i] = *//*gf_bs_read_int(bs, (u32)ceil(log(getNumPicTotalCurr()) / log(2)));
@@ -6574,7 +7055,7 @@
 	Bool RapPicFlag = GF_FALSE;
 	Bool IDRPicFlag = GF_FALSE;
 
-	si->first_slice_segment_in_pic_flag = gf_bs_read_int(bs, 1);
+	si->first_slice_segment_in_pic_flag = gf_bs_read_int_log(bs, 1, "first_slice_segment_in_pic_flag");
 
 	switch (si->nal_unit_type) {
 	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
@@ -6591,11 +7072,11 @@
 	}
 
 	if (RapPicFlag) {
-		/*Bool no_output_of_prior_pics_flag = */gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log(bs, 1, "no_output_of_prior_pics_flag");
 	}
 
-	pps_id = gf_bs_get_ue(bs);
-	if (pps_id >= 64)
+	pps_id = gf_bs_read_ue_log(bs, "pps_id");
+	if ((pps_id<0) || (pps_id >= 64))
 		return -1;
 
 	pps = &hevc->pps[pps_id];
@@ -6604,14 +7085,14 @@
 	si->pps = pps;
 
 	if (!si->first_slice_segment_in_pic_flag && pps->dependent_slice_segments_enabled_flag) {
-		si->dependent_slice_segment_flag = gf_bs_read_int(bs, 1);
+		si->dependent_slice_segment_flag = gf_bs_read_int_log(bs, 1, "dependent_slice_segment_flag");
 	}
 	else {
 		si->dependent_slice_segment_flag = GF_FALSE;
 	}
 
 	if (!si->first_slice_segment_in_pic_flag) {
-		si->slice_segment_address = gf_bs_read_int(bs, sps->bitsSliceSegmentAddress);
+		si->slice_segment_address = gf_bs_read_int_log(bs, sps->bitsSliceSegmentAddress, "slice_segment_address");
 	}
 	else {
 		si->slice_segment_address = 0;
@@ -6625,15 +7106,15 @@
 		Bool slice_deblocking_filter_disabled_flag = 0;
 
 		//"slice_reserved_undetermined_flag[]"
-		gf_bs_read_int(bs, pps->num_extra_slice_header_bits);
+		gf_bs_read_int_log(bs, pps->num_extra_slice_header_bits, "slice_reserved_undetermined_flag");
 
-		si->slice_type = gf_bs_get_ue(bs);
+		si->slice_type = gf_bs_read_ue_log(bs, "slice_type");
 
 		if (pps->output_flag_present_flag)
-			/*pic_output_flag = */gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log(bs, 1, "pic_output_flag");
 
 		if (sps->separate_colour_plane_flag == 1)
-			/*colour_plane_id = */gf_bs_read_int(bs, 2);
+			gf_bs_read_int_log(bs, 2, "colour_plane_id");
 
 		if (IDRPicFlag) {
 			si->poc_lsb = 0;
@@ -6643,13 +7124,13 @@
 
 		}
 		else {
-			si->poc_lsb = gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
+			si->poc_lsb = gf_bs_read_int_log(bs, sps->log2_max_pic_order_cnt_lsb, "poc_lsb");
 
 			//if not asked to parse full header, abort once we have the poc
 			if (!hevc->full_slice_header_parse) return 0;
 
-			if (/*short_term_ref_pic_set_sps_flag =*/gf_bs_read_int(bs, 1) == 0) {
-				Bool ret = parse_short_term_ref_pic_set(bs, sps, sps->num_short_term_ref_pic_sets);
+			if (gf_bs_read_int_log(bs, 1, "short_term_ref_pic_set_sps_flag") == 0) {
+				Bool ret = hevc_parse_short_term_ref_pic_set(bs, sps, sps->num_short_term_ref_pic_sets);
 				if (!ret)
 					return -1;
 			}
@@ -6659,7 +7140,7 @@
 				while ((u32)(1 << numbits) < sps->num_short_term_ref_pic_sets)
 					numbits++;
 				if (numbits > 0)
-					/*s32 short_term_ref_pic_set_idx = */gf_bs_read_int(bs, numbits);
+					gf_bs_read_int_log(bs, numbits, "short_term_ref_pic_set_idx");
 				/*else
 					short_term_ref_pic_set_idx = 0;*/
 			}
@@ -6671,35 +7152,35 @@
 				memset(DeltaPocMsbCycleLt, 0, sizeof(u8) * 32);
 				
 				if (sps->num_long_term_ref_pic_sps > 0) {
-					num_long_term_sps = gf_bs_get_ue(bs);
+					num_long_term_sps = gf_bs_read_ue_log(bs, "num_long_term_sps");
 				}
-				num_long_term_pics = gf_bs_get_ue(bs);
+				num_long_term_pics = gf_bs_read_ue_log(bs, "num_long_term_pics");
 
 				for (i = 0; i < num_long_term_sps + num_long_term_pics; i++) {
 					if (i < num_long_term_sps) {
 						if (sps->num_long_term_ref_pic_sps > 1)
-							/*u8 lt_idx_sps = */gf_bs_read_int(bs, gf_get_bit_size(sps->num_long_term_ref_pic_sps));
+							gf_bs_read_int_log_idx(bs, gf_get_bit_size(sps->num_long_term_ref_pic_sps), "lt_idx_sps", i);
 					}
 					else {
-						/*PocLsbLt[ i ] = */ gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
-						/*UsedByCurrPicLt[ i ] = */ gf_bs_read_int(bs, 1);
+						gf_bs_read_int_log_idx(bs, sps->log2_max_pic_order_cnt_lsb, "PocLsbLt", i);
+						gf_bs_read_int_log_idx(bs, 1, "UsedByCurrPicLt", i);
 					}
-					if (/*delta_poc_msb_present_flag[ i ] = */ gf_bs_read_int(bs, 1)) {
+					if (gf_bs_read_int_log_idx(bs, 1, "delta_poc_msb_present_flag", i)) {
 						if (i == 0 || i == num_long_term_sps)
-							DeltaPocMsbCycleLt[i] = gf_bs_get_ue(bs);
+							DeltaPocMsbCycleLt[i] = gf_bs_read_ue_log_idx(bs, "DeltaPocMsbCycleLt", i);
 						else
-							DeltaPocMsbCycleLt[i] = gf_bs_get_ue(bs) + DeltaPocMsbCycleLt[i - 1];
+							DeltaPocMsbCycleLt[i] = gf_bs_read_ue_log_idx(bs, "DeltaPocMsbCycleLt", i) + DeltaPocMsbCycleLt[i - 1];
 					}
 				}
 			}
 			if (sps->temporal_mvp_enable_flag)
-				slice_temporal_mvp_enabled_flag = gf_bs_read_int(bs, 1);
+				slice_temporal_mvp_enabled_flag = gf_bs_read_int_log(bs, 1, "slice_temporal_mvp_enabled_flag");
 		}
 		if (sps->sample_adaptive_offset_enabled_flag) {
 			u32 ChromaArrayType = sps->separate_colour_plane_flag ? 0 : sps->chroma_format_idc;
-			slice_sao_luma_flag = gf_bs_read_int(bs, 1);
+			slice_sao_luma_flag = gf_bs_read_int_log(bs, 1, "slice_sao_luma_flag");
 			if (ChromaArrayType != 0)
-				slice_sao_chroma_flag = gf_bs_read_int(bs, 1);
+				slice_sao_chroma_flag = gf_bs_read_int_log(bs, 1, "slice_sao_chroma_flag");
 		}
 
 		if (si->slice_type == GF_HEVC_SLICE_TYPE_P || si->slice_type == GF_HEVC_SLICE_TYPE_B) {
@@ -6709,10 +7190,10 @@
 			if (si->slice_type == GF_HEVC_SLICE_TYPE_B)
 				num_ref_idx_l1_active = pps->num_ref_idx_l1_default_active;
 
-			if ( /*num_ref_idx_active_override_flag =*/gf_bs_read_int(bs, 1)) {
-				num_ref_idx_l0_active = 1 + gf_bs_get_ue(bs);
+			if (gf_bs_read_int_log(bs, 1, "num_ref_idx_active_override_flag")) {
+				num_ref_idx_l0_active = 1 + gf_bs_read_ue_log(bs, "num_ref_idx_l0_active");
 				if (si->slice_type == GF_HEVC_SLICE_TYPE_B)
-					num_ref_idx_l1_active = 1 + gf_bs_get_ue(bs);
+					num_ref_idx_l1_active = 1 + gf_bs_read_ue_log(bs, "num_ref_idx_l1_active");
 			}
 
 			if (pps->lists_modification_present_flag /*TODO: && NumPicTotalCurr > 1*/) {
@@ -6723,20 +7204,20 @@
 			}
 
 			if (si->slice_type == GF_HEVC_SLICE_TYPE_B)
-				/*mvd_l1_zero_flag=*/gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 1, "mvd_l1_zero_flag");
 			if (pps->cabac_init_present_flag)
-				/*cabac_init_flag=*/gf_bs_read_int(bs, 1);
+				gf_bs_read_int_log(bs, 1, "cabac_init_flag");
 
 			if (slice_temporal_mvp_enabled_flag) {
 				// When collocated_from_l0_flag is not present, it is inferred to be equal to 1.
 				Bool collocated_from_l0_flag = 1;
 				if (si->slice_type == GF_HEVC_SLICE_TYPE_B)
-					collocated_from_l0_flag = gf_bs_read_int(bs, 1);
+					collocated_from_l0_flag = gf_bs_read_int_log(bs, 1, "collocated_from_l0_flag");
 
 				if ((collocated_from_l0_flag && (num_ref_idx_l0_active > 1))
 					|| (!collocated_from_l0_flag && (num_ref_idx_l1_active > 1))
-					) {
-					/*collocated_ref_idx=*/gf_bs_get_ue(bs);
+				) {
+					gf_bs_read_ue_log(bs, "collocated_ref_idx");
 				}
 			}
 
@@ -6745,30 +7226,30 @@
 				) {
 				hevc_pred_weight_table(bs, hevc, si, pps, sps, num_ref_idx_l0_active, num_ref_idx_l1_active);
 			}
-			/*five_minus_max_num_merge_cand=*/gf_bs_get_ue(bs);
+			gf_bs_read_ue_log(bs, "five_minus_max_num_merge_cand");
 		}
 		si->slice_qp_delta_start_bits = (s32) (gf_bs_get_position(bs) - 1) * 8 + gf_bs_get_bit_position(bs);
-		/*slice_qp_delta = */si->slice_qp_delta = gf_bs_get_se(bs);
+		si->slice_qp_delta = gf_bs_read_se_log(bs, "slice_qp_delta");
 
 		if (pps->slice_chroma_qp_offsets_present_flag) {
-			/*slice_cb_qp_offset=*/gf_bs_get_se(bs);
-			/*slice_cr_qp_offset=*/gf_bs_get_se(bs);
+			gf_bs_read_se_log(bs, "slice_cb_qp_offset");
+			gf_bs_read_se_log(bs, "slice_cr_qp_offset");
 		}
 		if (pps->deblocking_filter_override_enabled_flag) {
-			deblocking_filter_override_flag = gf_bs_read_int(bs, 1);
+			deblocking_filter_override_flag = gf_bs_read_int_log(bs, 1, "deblocking_filter_override_flag");
 		}
 
 		if (deblocking_filter_override_flag) {
-			slice_deblocking_filter_disabled_flag = gf_bs_read_int(bs, 1);
+			slice_deblocking_filter_disabled_flag = gf_bs_read_int_log(bs, 1, "slice_deblocking_filter_disabled_flag");
 			if (!slice_deblocking_filter_disabled_flag) {
-				/*slice_beta_offset_div2=*/ gf_bs_get_se(bs);
-				/*slice_tc_offset_div2=*/gf_bs_get_se(bs);
+				gf_bs_read_se_log(bs, "slice_beta_offset_div2");
+				gf_bs_read_se_log(bs, "slice_tc_offset_div2");
 			}
 		}
 		if (pps->loop_filter_across_slices_enabled_flag
 			&& (slice_sao_luma_flag || slice_sao_chroma_flag || !slice_deblocking_filter_disabled_flag)
-			) {
-			/*slice_loop_filter_across_slices_enabled_flag = */gf_bs_read_int(bs, 1);
+		) {
+			gf_bs_read_int_log(bs, 1, "slice_loop_filter_across_slices_enabled_flag");
 		}
 	}
 	//dependent slice segment
@@ -6780,9 +7261,9 @@
 	si->entry_point_start_bits = ((u32)gf_bs_get_position(bs) - 1) * 8 + gf_bs_get_bit_position(bs);
 
 	if (pps->tiles_enabled_flag || pps->entropy_coding_sync_enabled_flag) {
-		u32 num_entry_point_offsets = gf_bs_get_ue(bs);
+		u32 num_entry_point_offsets = gf_bs_read_ue_log(bs, "num_entry_point_offsets");
 		if (num_entry_point_offsets > 0) {
-			u32 offset = gf_bs_get_ue(bs) + 1;
+			u32 offset = gf_bs_read_ue_log(bs, "offset") + 1;
 			u32 segments = offset >> 4;
 			s32 remain = (offset & 15);
 
@@ -6802,7 +7283,7 @@
 	}
 
 	if (pps->slice_segment_header_extension_present_flag) {
-		u32 size_ext = gf_bs_get_ue(bs);
+		u32 size_ext = gf_bs_read_ue_log(bs, "size_ext");
 		while (size_ext) {
 			gf_bs_read_int(bs, 8);
 			size_ext--;
@@ -6811,7 +7292,7 @@
 
 	si->header_size_bits = (gf_bs_get_position(bs) - 1) * 8 + gf_bs_get_bit_position(bs); // av_parser.c modified on 16 jan. 2019 
 
-	if (gf_bs_read_int(bs, 1) == 0) {
+	if (gf_bs_read_int_log(bs, 1, "byte_align") == 0) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("Error parsing slice header: byte_align not found at end of header !\n"));
 	}
 
@@ -6820,7 +7301,7 @@
 	return 0;
 }
 
-void gf_media_hevc_parse_sei(char *buffer, u32 nal_size, HEVCState *hevc)
+static void gf_hevc_vvc_parse_sei(char *buffer, u32 nal_size, HEVCState *hevc, VVCState *vvc)
 {
 	u32 ptype, psize, hdr;
 	u64 start;
@@ -6836,6 +7317,7 @@
 
 	/*parse SEI*/
 	while (gf_bs_available(bs)) {
+		u32 consumed;
 		ptype = 0;
 		while (gf_bs_peek_bits(bs, 8, 0)==0xFF) {
 			gf_bs_read_int(bs, 8);
@@ -6851,28 +7333,55 @@
 
 		start = gf_bs_get_position(bs);
 		if (start+psize >= nal_size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[hevc-h265] SEI user message type %d size error (%d but %d remain), skipping SEI message\n", ptype, psize, nal_size-start));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[%s] SEI user message type %d size error (%d but %d remain), skipping SEI message\n", hevc ? "HEVC" : "VVC", ptype, psize, nal_size-start));
 			break;
 		}
 
 		switch (ptype) {
 		case 4: /*user registered ITU-T T35*/
-		{
-			GF_BitStream * itu_t_t35_bs = gf_bs_new(buffer + start, psize, GF_BITSTREAM_READ);
-			avc_parse_itu_t_t35_sei(itu_t_t35_bs, &hevc->sei.dovi);
-			gf_bs_del(itu_t_t35_bs);
-		}
-		default: break;
+			if (hevc) {
+				avc_parse_itu_t_t35_sei(bs, &hevc->sei.dovi);
+			}
+			break;
+		case 144:
+			//clli
+			if (hevc) {
+				gf_bs_read_data(bs, hevc->clli_data, 4);
+				hevc->clli_valid = 1;
+			} else {
+				gf_bs_read_data(bs, vvc->clli_data, 4);
+				vvc->clli_valid = 1;
+			}
+			break;
+		case 137:
+			//mdcv
+			if (hevc) {
+				gf_bs_read_data(bs, hevc->mdcv_data, 24);
+				hevc->mdcv_valid = 1;
+			} else {
+				gf_bs_read_data(bs, vvc->mdcv_data, 24);
+				vvc->mdcv_valid = 1;
+			}
+			break;
+		default:
+			break;
 		}
 
-		gf_bs_skip_bytes(bs, (u64) psize);
 		gf_bs_align(bs);
+		consumed = (u32) (gf_bs_get_position(bs) - start);
+		psize-=consumed;
+		gf_bs_skip_bytes(bs, psize);
 		if (gf_bs_available(bs) <= 2)
 			break;
 	}
 	gf_bs_del(bs);
 }
 
+void gf_hevc_parse_sei(char *buffer, u32 nal_size, HEVCState *hevc)
+{
+	gf_hevc_vvc_parse_sei(buffer, nal_size, hevc, NULL);
+}
+
 static void hevc_compute_poc(HEVCSliceInfo *si)
 {
 	u32 max_poc_lsb = 1 << (si->sps->log2_max_pic_order_cnt_lsb);
@@ -6907,16 +7416,16 @@
 static Bool hevc_parse_nal_header(GF_BitStream *bs, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
 {
 	u32 val;
-	val = gf_bs_read_int(bs, 1);
+	val = gf_bs_read_int_log(bs, 1, "forbidden_zero");
 	if (val) return GF_FALSE;
 
-	val = gf_bs_read_int(bs, 6);
+	val = gf_bs_read_int_log(bs, 6, "nuh_type");
 	if (nal_unit_type) *nal_unit_type = val;
 
-	val = gf_bs_read_int(bs, 6);
+	val = gf_bs_read_int_log(bs, 6, "layerID");
 	if (layer_id) *layer_id = val;
 
-	val = gf_bs_read_int(bs, 3);
+	val = gf_bs_read_int_log(bs, 3, "temporalID");
 	if (!val)
 		return GF_FALSE;
 	val -= 1;
@@ -6925,26 +7434,26 @@
 }
 
 
-void profile_tier_level(GF_BitStream *bs, Bool ProfilePresentFlag, u8 MaxNumSubLayersMinus1, HEVC_ProfileTierLevel *ptl)
+void hevc_profile_tier_level(GF_BitStream *bs, Bool ProfilePresentFlag, u8 MaxNumSubLayersMinus1, HEVC_ProfileTierLevel *ptl, u32 idx)
 {
 	u32 i;
 	if (ProfilePresentFlag) {
-		ptl->profile_space = gf_bs_read_int(bs, 2);
-		ptl->tier_flag = gf_bs_read_int(bs, 1);
-		ptl->profile_idc = gf_bs_read_int(bs, 5);
-
-		ptl->profile_compatibility_flag = gf_bs_read_int(bs, 32);
-
-		ptl->general_progressive_source_flag = gf_bs_read_int(bs, 1);
-		ptl->general_interlaced_source_flag = gf_bs_read_int(bs, 1);
-		ptl->general_non_packed_constraint_flag = gf_bs_read_int(bs, 1);
-		ptl->general_frame_only_constraint_flag = gf_bs_read_int(bs, 1);
+		ptl->profile_space = gf_bs_read_int_log_idx(bs, 2, "profile_space", idx);
+		ptl->tier_flag = gf_bs_read_int_log_idx(bs, 1, "tier_flag", idx);
+		ptl->profile_idc = gf_bs_read_int_log_idx(bs, 5, "profile_idc", idx);
+
+		ptl->profile_compatibility_flag = gf_bs_read_int_log_idx(bs, 32, "profile_compatibility_flag", idx);
+
+		ptl->general_progressive_source_flag = gf_bs_read_int_log_idx(bs, 1, "general_progressive_source_flag", idx);
+		ptl->general_interlaced_source_flag = gf_bs_read_int_log_idx(bs, 1, "general_interlaced_source_flag", idx);
+		ptl->general_non_packed_constraint_flag = gf_bs_read_int_log_idx(bs, 1, "general_non_packed_constraint_flag", idx);
+		ptl->general_frame_only_constraint_flag = gf_bs_read_int_log_idx(bs, 1, "general_frame_only_constraint_flag", idx);
 		ptl->general_reserved_44bits = gf_bs_read_long_int(bs, 44);
 	}
-	ptl->level_idc = gf_bs_read_int(bs, 8);
+	ptl->level_idc = gf_bs_read_int_log(bs, 8, "level_idc");
 	for (i = 0; i < MaxNumSubLayersMinus1; i++) {
-		ptl->sub_ptl[i].profile_present_flag = gf_bs_read_int(bs, 1);
-		ptl->sub_ptl[i].level_present_flag = gf_bs_read_int(bs, 1);
+		ptl->sub_ptl[i].profile_present_flag = gf_bs_read_int_log_idx2(bs, 1, "profile_present_flag", idx, i);
+		ptl->sub_ptl[i].level_present_flag = gf_bs_read_int_log_idx2(bs, 1, "level_present_flag", idx, i);
 	}
 	if (MaxNumSubLayersMinus1 > 0) {
 		for (i = MaxNumSubLayersMinus1; i < 8; i++) {
@@ -6954,18 +7463,18 @@
 
 	for (i = 0; i < MaxNumSubLayersMinus1; i++) {
 		if (ptl->sub_ptl[i].profile_present_flag) {
-			ptl->sub_ptl[i].profile_space = gf_bs_read_int(bs, 2);
-			ptl->sub_ptl[i].tier_flag = gf_bs_read_int(bs, 1);
-			ptl->sub_ptl[i].profile_idc = gf_bs_read_int(bs, 5);
-			ptl->sub_ptl[i].profile_compatibility_flag = gf_bs_read_int(bs, 32);
-			/*ptl->sub_ptl[i].progressive_source_flag =*/ gf_bs_read_int(bs, 1);
-			/*ptl->sub_ptl[i].interlaced_source_flag =*/ gf_bs_read_int(bs, 1);
-			/*ptl->sub_ptl[i].non_packed_constraint_flag =*/ gf_bs_read_int(bs, 1);
-			/*ptl->sub_ptl[i].frame_only_constraint_flag =*/ gf_bs_read_int(bs, 1);
+			ptl->sub_ptl[i].profile_space = gf_bs_read_int_log_idx2(bs, 2, "sublayer_profile_space", idx, i);
+			ptl->sub_ptl[i].tier_flag = gf_bs_read_int_log_idx2(bs, 1, "sublayer_tier_flag", idx, i);
+			ptl->sub_ptl[i].profile_idc = gf_bs_read_int_log_idx2(bs, 5, "sublayer_profile_idc", idx, i);
+			ptl->sub_ptl[i].profile_compatibility_flag = gf_bs_read_int_log_idx2(bs, 32, "sublayer_profile_compatibility_flag", idx, i);
+			/*ptl->sub_ptl[i].progressive_source_flag =*/ gf_bs_read_int_log_idx2(bs, 1, "sublayer_progressive_source_flag", idx, i);
+			/*ptl->sub_ptl[i].interlaced_source_flag =*/ gf_bs_read_int_log_idx2(bs, 1, "sublayer_interlaced_source_flag", idx, i);
+			/*ptl->sub_ptl[i].non_packed_constraint_flag =*/ gf_bs_read_int_log_idx2(bs, 1, "sublayer_non_packed_constraint_flag", idx, i);
+			/*ptl->sub_ptl[i].frame_only_constraint_flag =*/ gf_bs_read_int_log_idx2(bs, 1, "sublayer_frame_only_constraint_flag", idx, i);
 			/*ptl->sub_ptl[i].reserved_44bits =*/ gf_bs_read_long_int(bs, 44);
 		}
 		if (ptl->sub_ptl[i].level_present_flag)
-			ptl->sub_ptl[i].level_idc = gf_bs_read_int(bs, 8);
+			ptl->sub_ptl[i].level_idc = gf_bs_read_int_log_idx2(bs, 8, "sublayer_level_idc", idx, i);
 	}
 }
 
@@ -7006,25 +7515,25 @@
 	return numViews;
 }
 
-static void lhvc_parse_rep_format(HEVC_RepFormat *fmt, GF_BitStream *bs)
+static void lhvc_parse_rep_format(HEVC_RepFormat *fmt, GF_BitStream *bs, u32 idx)
 {
 	u8 chroma_bitdepth_present_flag;
-	fmt->pic_width_luma_samples = gf_bs_read_int(bs, 16);
-	fmt->pic_height_luma_samples = gf_bs_read_int(bs, 16);
-	chroma_bitdepth_present_flag = gf_bs_read_int(bs, 1);
+	fmt->pic_width_luma_samples = gf_bs_read_int_log_idx(bs, 16, "pic_width_luma_samples", idx);
+	fmt->pic_height_luma_samples = gf_bs_read_int_log_idx(bs, 16, "pic_height_luma_samples", idx);
+	chroma_bitdepth_present_flag = gf_bs_read_int_log_idx(bs, 1, "chroma_bitdepth_present_flag", idx);
 	if (chroma_bitdepth_present_flag) {
-		fmt->chroma_format_idc = gf_bs_read_int(bs, 2);
+		fmt->chroma_format_idc = gf_bs_read_int_log_idx(bs, 2, "chroma_format_idc", idx);
 
 		if (fmt->chroma_format_idc == 3)
-			fmt->separate_colour_plane_flag = gf_bs_read_int(bs, 1);
-		fmt->bit_depth_luma = 8 + gf_bs_read_int(bs, 4);
-		fmt->bit_depth_chroma = 8 + gf_bs_read_int(bs, 4);
-	}
-	if (/*conformance_window_vps_flag*/ gf_bs_read_int(bs, 1)) {
-		/*conf_win_vps_left_offset*/gf_bs_get_ue(bs);
-		/*conf_win_vps_right_offset*/gf_bs_get_ue(bs);
-		/*conf_win_vps_top_offset*/gf_bs_get_ue(bs);
-		/*conf_win_vps_bottom_offset*/gf_bs_get_ue(bs);
+			fmt->separate_colour_plane_flag = gf_bs_read_int_log_idx(bs, 1, "separate_colour_plane_flag", idx);
+		fmt->bit_depth_luma = 8 + gf_bs_read_int_log_idx(bs, 4, "bit_depth_luma_minus8", idx);
+		fmt->bit_depth_chroma = 8 + gf_bs_read_int_log_idx(bs, 4, "bit_depth_chroma_minus8", idx);
+	}
+	if (gf_bs_read_int_log_idx(bs, 1, "conformance_window_vps_flag", idx)) {
+		gf_bs_read_ue_log_idx(bs, "conf_win_vps_left_offset", idx);
+		gf_bs_read_ue_log_idx(bs, "conf_win_vps_right_offset", idx);
+		gf_bs_read_ue_log_idx(bs, "conf_win_vps_top_offset", idx);
+		gf_bs_read_ue_log_idx(bs, "conf_win_vps_bottom_offset", idx);
 	}
 }
 
@@ -7051,12 +7560,12 @@
 
 	vps->vps_extension_found = 1;
 	if ((vps->max_layers > 1) && vps->base_layer_internal_flag)
-		profile_tier_level(bs, 0, vps->max_sub_layers - 1, &vps->ext_ptl[0]);
+		hevc_profile_tier_level(bs, 0, vps->max_sub_layers - 1, &vps->ext_ptl[0], 0);
 
-	splitting_flag = gf_bs_read_int(bs, 1);
+	splitting_flag = gf_bs_read_int_log(bs, 1, "splitting_flag");
 	num_scalability_types = 0;
 	for (i = 0; i < 16; i++) {
-		vps->scalability_mask[i] = gf_bs_read_int(bs, 1);
+		vps->scalability_mask[i] = gf_bs_read_int_log_idx(bs, 1, "scalability_mask", i);
 		num_scalability_types += vps->scalability_mask[i];
 	}
 	if (num_scalability_types >= 16) {
@@ -7064,7 +7573,7 @@
 	}
 	dimension_id_len[0] = 0;
 	for (i = 0; i < (num_scalability_types - splitting_flag); i++) {
-		dimension_id_len[i] = 1 + gf_bs_read_int(bs, 3);
+		dimension_id_len[i] = 1 + gf_bs_read_int_log_idx(bs, 3, "dimension_id_len_minus1", i);
 	}
 
 	if (splitting_flag) {
@@ -7077,12 +7586,12 @@
 		dim_bit_offset[num_scalability_types] = 6;
 	}
 
-	vps_nuh_layer_id_present_flag = gf_bs_read_int(bs, 1);
+	vps_nuh_layer_id_present_flag = gf_bs_read_int_log(bs, 1, "vps_nuh_layer_id_present_flag");
 	vps->layer_id_in_nuh[0] = 0;
 	vps->layer_id_in_vps[0] = 0;
 	for (i = 1; i < vps->max_layers; i++) {
 		if (vps_nuh_layer_id_present_flag) {
-			vps->layer_id_in_nuh[i] = gf_bs_read_int(bs, 6);
+			vps->layer_id_in_nuh[i] = gf_bs_read_int_log_idx(bs, 6, "layer_id_in_nuh", i);
 		}
 		else {
 			vps->layer_id_in_nuh[i] = i;
@@ -7091,7 +7600,7 @@
 
 		if (!splitting_flag) {
 			for (j = 0; j < num_scalability_types; j++) {
-				vps->dimension_id[i][j] = gf_bs_read_int(bs, dimension_id_len[j]);
+				vps->dimension_id[i][j] = gf_bs_read_int_log_idx2(bs, dimension_id_len[j], "dimension_id", i, j);
 			}
 		}
 	}
@@ -7106,16 +7615,16 @@
 			vps->dimension_id[0][j] = 0;
 	}
 
-	view_id_len = gf_bs_read_int(bs, 4);
+	view_id_len = gf_bs_read_int_log(bs, 4, "view_id_len");
 	if (view_id_len > 0) {
 		for (i = 0; i < lhvc_get_num_views(vps); i++) {
-			/*m_viewIdVal[i] = */ gf_bs_read_int(bs, view_id_len);
+			gf_bs_read_int_log_idx(bs, view_id_len, "view_id_val", i);
 		}
 	}
 
 	for (i = 1; i < vps->max_layers; i++) {
 		for (j = 0; j < i; j++) {
-			vps->direct_dependency_flag[i][j] = gf_bs_read_int(bs, 1);
+			vps->direct_dependency_flag[i][j] = gf_bs_read_int_log_idx(bs, 1, "direct_dependency_flag", i);
 		}
 	}
 
@@ -7173,34 +7682,34 @@
 
 	num_add_layer_set = 0;
 	if (num_indepentdent_layers > 1)
-		num_add_layer_set = gf_bs_get_ue(bs);
+		num_add_layer_set = gf_bs_read_ue_log(bs, "num_add_layer_set");
 
 	for (i = 0; i < num_add_layer_set; i++)
 		for (j = 1; j < num_indepentdent_layers; j++) {
 			nb_bits = 1;
 			while ((1 << nb_bits) < (num_layers_in_tree_partition[j] + 1))
 				nb_bits++;
-			/*highest_layer_idx_plus1[i][j]*/gf_bs_read_int(bs, nb_bits);
+			gf_bs_read_int_log_idx2(bs, nb_bits, "highest_layer_idx_plus1", i, j);
 		}
 
 
-	if (/*vps_sub_layers_max_minus1_present_flag*/gf_bs_read_int(bs, 1)) {
+	if (gf_bs_read_int_log(bs, 1, "vps_sub_layers_max_minus1_present_flag")) {
 		for (i = 0; i < vps->max_layers; i++) {
-			/*sub_layers_vps_max_minus1[ i ]*/gf_bs_read_int(bs, 3);
+			gf_bs_read_int_log_idx(bs, 3, "sub_layers_vps_max_minus1", i);
 		}
 	}
 
-	if (/*max_tid_ref_present_flag = */gf_bs_read_int(bs, 1)) {
+	if (gf_bs_read_int_log(bs, 1, "max_tid_ref_present_flag")) {
 		for (i = 0; i < (vps->max_layers - 1); i++) {
 			for (j = i + 1; j < vps->max_layers; j++) {
 				if (vps->direct_dependency_flag[j][i])
-					/*max_tid_il_ref_pics_plus1[ i ][ j ]*/gf_bs_read_int(bs, 3);
+					gf_bs_read_int_log_idx2(bs, 3, "max_tid_il_ref_pics_plus1", i, j);
 			}
 		}
 	}
-	/*default_ref_layers_active_flag*/gf_bs_read_int(bs, 1);
+	gf_bs_read_int_log(bs, 1, "default_ref_layers_active_flag");
 
-	vps->num_profile_tier_level = 1 + gf_bs_get_ue(bs);
+	vps->num_profile_tier_level = 1 + gf_bs_read_ue_log(bs, "num_profile_tier_level");
 	if (vps->num_profile_tier_level > MAX_LHVC_LAYERS) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] Wrong number of PTLs in VPS %d\n", vps->num_profile_tier_level));
 		vps->num_profile_tier_level = 1;
@@ -7208,20 +7717,25 @@
 	}
 
 	for (i = vps->base_layer_internal_flag ? 2 : 1; i < vps->num_profile_tier_level; i++) {
-		Bool vps_profile_present_flag = gf_bs_read_int(bs, 1);
-		profile_tier_level(bs, vps_profile_present_flag, vps->max_sub_layers - 1, &vps->ext_ptl[i - 1]);
+		Bool vps_profile_present_flag = gf_bs_read_int_log_idx(bs, 1, "vps_profile_present_flag", i);
+		hevc_profile_tier_level(bs, vps_profile_present_flag, vps->max_sub_layers - 1, &vps->ext_ptl[i - 1], i-1);
 	}
 
 	NumLayerSets = vps->num_layer_sets + num_add_layer_set;
 	num_add_olss = 0;
 
 	if (NumLayerSets > 1) {
-		num_add_olss = gf_bs_get_ue(bs);
-		default_output_layer_idc = gf_bs_read_int(bs, 2);
+		num_add_olss = gf_bs_read_ue_log(bs, "num_add_olss");
+		default_output_layer_idc = gf_bs_read_int_log(bs, 2, "default_output_layer_idc");
 		default_output_layer_idc = default_output_layer_idc < 2 ? default_output_layer_idc : 2;
 	}
 	vps->num_output_layer_sets = num_add_olss + NumLayerSets;
 
+	if (vps->num_output_layer_sets > MAX_LHVC_LAYERS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] Wrong number of output layer sets in VPS %d, max %d supported\n", vps->num_output_layer_sets, MAX_LHVC_LAYERS));
+		vps->num_output_layer_sets = 1;
+		return GF_FALSE;
+	}
 
 	layer_set_idx_for_ols_minus1[0] = 1;
 	vps->output_layer_flag[0][0] = 1;
@@ -7231,7 +7745,7 @@
 			nb_bits = 1;
 			while ((1 << nb_bits) < (NumLayerSets - 1))
 				nb_bits++;
-			layer_set_idx_for_ols_minus1[i] = gf_bs_read_int(bs, nb_bits);
+			layer_set_idx_for_ols_minus1[i] = gf_bs_read_int_log_idx(bs, nb_bits, "layer_set_idx_for_ols_minus1", i);
 		}
 		else
 			layer_set_idx_for_ols_minus1[i] = 0;
@@ -7239,7 +7753,7 @@
 
 		if ((i > (vps->num_layer_sets - 1)) || (default_output_layer_idc == 2)) {
 			for (j = 0; j < vps->num_layers_in_id_list[ols_ids_to_ls_idx]; j++)
-				vps->output_layer_flag[i][j] = gf_bs_read_int(bs, 1);
+				vps->output_layer_flag[i][j] = gf_bs_read_int_log_idx2(bs, 1, "output_layer_flag", i, j);
 		}
 
 		if ((default_output_layer_idc == 0) || (default_output_layer_idc == 1)) {
@@ -7283,7 +7797,7 @@
 			nb_bits++;
 		for (j = 0; j < vps->num_layers_in_id_list[ols_ids_to_ls_idx]; j++)
 			if (vps->necessary_layers_flag[i][j] && vps->num_profile_tier_level)
-				vps->profile_tier_level_idx[i][j] = gf_bs_read_int(bs, nb_bits);
+				vps->profile_tier_level_idx[i][j] = gf_bs_read_int_log_idx2(bs, nb_bits, "profile_tier_level_idx", i, j);
 			else
 				vps->profile_tier_level_idx[i][j] = 0;
 
@@ -7296,10 +7810,10 @@
 			}
 		}
 		if (nb_output_layers_in_output_layer_set[i] == 1 && ols_highest_output_layer_id[i] > 0)
-			vps->alt_output_layer_flag[i] = gf_bs_read_int(bs, 1);
+			vps->alt_output_layer_flag[i] = gf_bs_read_int_log_idx(bs, 1, "alt_output_layer_flag", i);
 	}
 
-	vps->num_rep_formats = 1 + gf_bs_get_ue(bs);
+	vps->num_rep_formats = 1 + gf_bs_read_ue_log(bs, "num_rep_formats_minus1");
 	if (vps->num_rep_formats > 16) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] Wrong number of rep formats in VPS %d\n", vps->num_rep_formats));
 		vps->num_rep_formats = 0;
@@ -7307,10 +7821,10 @@
 	}
 
 	for (i = 0; i < vps->num_rep_formats; i++) {
-		lhvc_parse_rep_format(&vps->rep_formats[i], bs);
+		lhvc_parse_rep_format(&vps->rep_formats[i], bs, i);
 	}
 	if (vps->num_rep_formats > 1)
-		rep_format_idx_present_flag = gf_bs_read_int(bs, 1);
+		rep_format_idx_present_flag = gf_bs_read_int_log(bs, 1, "rep_format_idx_present_flag");
 	else
 		rep_format_idx_present_flag = 0;
 
@@ -7320,7 +7834,7 @@
 		nb_bits++;
 	for (i = vps->base_layer_internal_flag ? 1 : 0; i < vps->max_layers; i++) {
 		if (rep_format_idx_present_flag) {
-			vps->rep_format_idx[i] = gf_bs_read_int(bs, nb_bits);
+			vps->rep_format_idx[i] = gf_bs_read_int_log_idx(bs, nb_bits, "rep_format_idx", i);
 		}
 		else {
 			vps->rep_format_idx[i] = i < vps->num_rep_formats - 1 ? i : vps->num_rep_formats - 1;
@@ -7331,74 +7845,75 @@
 	return GF_TRUE;
 }
 
-static void sub_layer_hrd_parameters(GF_BitStream *bs, int subLayerId, u32 cpb_cnt, Bool sub_pic_hrd_params_present_flag)
+static void sub_layer_hrd_parameters(GF_BitStream *bs, int subLayerId, u32 cpb_cnt, Bool sub_pic_hrd_params_present_flag, u32 idx1, u32 idx2)
 {
 	u32 i;
 	if (!gf_bs_available(bs)) return;
 
 	for (i = 0; i <= cpb_cnt; i++) {
-		/*bit_rate_value_minus1[i] = */gf_bs_get_ue(bs);
-		/*cpb_size_value_minus1[i] = */gf_bs_get_ue(bs);
+		gf_bs_read_ue_log_idx3(bs, "bit_rate_value_minus1", idx1, idx2, i);
+		gf_bs_read_ue_log_idx3(bs, "cpb_size_value_minus1", idx1, idx2, i);
 		if (sub_pic_hrd_params_present_flag) {
-			/*cpb_size_du_value_minus1[i] = */gf_bs_get_ue(bs);
-			/*bit_rate_du_value_minus1[i] = */gf_bs_get_ue(bs);
+			gf_bs_read_ue_log_idx3(bs, "cpb_size_du_value_minus1", idx1, idx2, i);
+			gf_bs_read_ue_log_idx3(bs, "bit_rate_du_value_minus1", idx1, idx2, i);
 		}
-		/*cbr_flag[i] = */gf_bs_read_int(bs, 1);
+		gf_bs_read_int_log_idx3(bs, 1, "cbr_flag", idx1, idx2, i);
 	}
 }
 
-static void hevc_parse_hrd_parameters(GF_BitStream *bs, Bool commonInfPresentFlag, int maxNumSubLayersMinus1)
+static void hevc_parse_hrd_parameters(GF_BitStream *bs, Bool commonInfPresentFlag, int maxNumSubLayersMinus1, u32 idx)
 {
 	int i;
 	Bool nal_hrd_parameters_present_flag = GF_FALSE;
 	Bool vcl_hrd_parameters_present_flag = GF_FALSE;
 	Bool sub_pic_hrd_params_present_flag = GF_FALSE;
+
 	if (commonInfPresentFlag) {
-		nal_hrd_parameters_present_flag = gf_bs_read_int(bs, 1);
-		vcl_hrd_parameters_present_flag = gf_bs_read_int(bs, 1);
+		nal_hrd_parameters_present_flag = gf_bs_read_int_log_idx(bs, 1, "nal_hrd_parameters_present_flag", idx);
+		vcl_hrd_parameters_present_flag = gf_bs_read_int_log_idx(bs, 1, "vcl_hrd_parameters_present_flag", idx);
 		if (nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag) {
-			sub_pic_hrd_params_present_flag = gf_bs_read_int(bs, 1);
+			sub_pic_hrd_params_present_flag = gf_bs_read_int_log_idx(bs, 1, "sub_pic_hrd_params_present_flag", idx);
 			if (sub_pic_hrd_params_present_flag) {
-				/*tick_divisor_minus2 = */gf_bs_read_int(bs, 8);
-				/*du_cpb_removal_delay_increment_length_minus1 = */gf_bs_read_int(bs, 5);
-				/*sub_pic_cpb_params_in_pic_timing_sei_flag = */gf_bs_read_int(bs, 1);
-				/*dpb_output_delay_du_length_minus1 = */gf_bs_read_int(bs, 5);
+				gf_bs_read_int_log_idx(bs, 8, "tick_divisor_minus2", idx);
+				gf_bs_read_int_log_idx(bs, 5, "du_cpb_removal_delay_increment_length_minus1", idx);
+				gf_bs_read_int_log_idx(bs, 1, "sub_pic_cpb_params_in_pic_timing_sei_flag", idx);
+				gf_bs_read_int_log_idx(bs, 5, "dpb_output_delay_du_length_minus1", idx);
 			}
-			/*bit_rate_scale = */gf_bs_read_int(bs, 4);
-			/*cpb_size_scale = */gf_bs_read_int(bs, 4);
+			gf_bs_read_int_log_idx(bs, 4, "bit_rate_scale", idx);
+			gf_bs_read_int_log_idx(bs, 4, "cpb_size_scale", idx);
 			if (sub_pic_hrd_params_present_flag) {
-				/*cpb_size_du_scale = */gf_bs_read_int(bs, 4);
+				gf_bs_read_int_log_idx(bs, 4, "cpb_size_du_scale", idx);
 			}
-			/*initial_cpb_removal_delay_length_minus1 = */gf_bs_read_int(bs, 5);
-			/*au_cpb_removal_delay_length_minus1 = */gf_bs_read_int(bs, 5);
-			/*dpb_output_delay_length_minus1 = */gf_bs_read_int(bs, 5);
+			gf_bs_read_int_log_idx(bs, 5, "initial_cpb_removal_delay_length_minus1", idx);
+			gf_bs_read_int_log_idx(bs, 5, "au_cpb_removal_delay_length_minus1", idx);
+			gf_bs_read_int_log_idx(bs, 5, "dpb_output_delay_length_minus1", idx);
 		}
 	}
 	for (i = 0; i <= maxNumSubLayersMinus1; i++) {
-		Bool fixed_pic_rate_general_flag_i = gf_bs_read_int(bs, 1);
+		Bool fixed_pic_rate_general_flag_i = gf_bs_read_int_log_idx(bs, 1, "fixed_pic_rate_general_flag", idx);
 		Bool fixed_pic_rate_within_cvs_flag_i = GF_TRUE;
 		Bool low_delay_hrd_flag_i = GF_FALSE;
 		u32 cpb_cnt_minus1_i = 0;
 		if (!fixed_pic_rate_general_flag_i) {
-			fixed_pic_rate_within_cvs_flag_i = gf_bs_read_int(bs, 1);
+			fixed_pic_rate_within_cvs_flag_i = gf_bs_read_int_log_idx(bs, 1, "fixed_pic_rate_within_cvs_flag", idx);
 		}
 		if (fixed_pic_rate_within_cvs_flag_i)
-			/*elemental_duration_in_tc_minus1[i] = */gf_bs_get_ue(bs);
+			gf_bs_read_ue_log_idx(bs, "elemental_duration_in_tc_minus1", idx);
 		else
-			low_delay_hrd_flag_i = gf_bs_read_int(bs, 1);
+			low_delay_hrd_flag_i = gf_bs_read_int_log_idx(bs, 1, "low_delay_hrd_flag", idx);
 		if (!low_delay_hrd_flag_i) {
-			cpb_cnt_minus1_i = gf_bs_get_ue(bs);
+			cpb_cnt_minus1_i = gf_bs_read_ue_log_idx(bs, "cpb_cnt_minus1", idx);
 		}
 		if (nal_hrd_parameters_present_flag) {
-			sub_layer_hrd_parameters(bs, i, cpb_cnt_minus1_i, sub_pic_hrd_params_present_flag);
+			sub_layer_hrd_parameters(bs, i, cpb_cnt_minus1_i, sub_pic_hrd_params_present_flag, idx, i);
 		}
 		if (vcl_hrd_parameters_present_flag) {
-			sub_layer_hrd_parameters(bs, i, cpb_cnt_minus1_i, sub_pic_hrd_params_present_flag);
+			sub_layer_hrd_parameters(bs, i, cpb_cnt_minus1_i, sub_pic_hrd_params_present_flag, idx, i);
 		}
 	}
 }
 
-static s32 gf_media_hevc_read_vps_bs_internal(GF_BitStream *bs, HEVCState *hevc, Bool stop_at_vps_ext)
+static s32 gf_hevc_read_vps_bs_internal(GF_BitStream *bs, HEVCState *hevc, Bool stop_at_vps_ext)
 {
 	u8 vps_sub_layer_ordering_info_present_flag, vps_extension_flag;
 	u32 i, j;
@@ -7407,9 +7922,9 @@
 	u8 layer_id_included_flag[MAX_LHVC_LAYERS][64];
 
 	//nalu header already parsed
-	vps_id = gf_bs_read_int(bs, 4);
+	vps_id = gf_bs_read_int_log(bs, 4, "vps_id");
 
-	if (vps_id >= 16) return -1;
+	if ((vps_id<0) || (vps_id >= 16)) return -1;
 
 	vps = &hevc->vps[vps_id];
 	vps->bit_pos_vps_extensions = -1;
@@ -7418,37 +7933,37 @@
 		vps->state = 1;
 	}
 
-	vps->base_layer_internal_flag = gf_bs_read_int(bs, 1);
-	vps->base_layer_available_flag = gf_bs_read_int(bs, 1);
-	vps->max_layers = 1 + gf_bs_read_int(bs, 6);
+	vps->base_layer_internal_flag = gf_bs_read_int_log(bs, 1, "base_layer_internal_flag");
+	vps->base_layer_available_flag = gf_bs_read_int_log(bs, 1, "base_layer_available_flag");
+	vps->max_layers = 1 + gf_bs_read_int_log(bs, 6, "max_layers_minus1");
 	if (vps->max_layers > MAX_LHVC_LAYERS) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] sorry, %d layers in VPS but only %d supported\n", vps->max_layers, MAX_LHVC_LAYERS));
 		return -1;
 	}
-	vps->max_sub_layers = gf_bs_read_int(bs, 3) + 1;
-	vps->temporal_id_nesting = gf_bs_read_int(bs, 1);
-	/* vps_reserved_ffff_16bits = */ gf_bs_read_int(bs, 16);
-	profile_tier_level(bs, 1, vps->max_sub_layers - 1, &vps->ptl);
+	vps->max_sub_layers = gf_bs_read_int_log(bs, 3, "max_sub_layers_minus1") + 1;
+	vps->temporal_id_nesting = gf_bs_read_int_log(bs, 1, "temporal_id_nesting");
+	gf_bs_read_int_log(bs, 16, "vps_reserved_ffff_16bits");
+	hevc_profile_tier_level(bs, 1, vps->max_sub_layers - 1, &vps->ptl, 0);
 
-	vps_sub_layer_ordering_info_present_flag = gf_bs_read_int(bs, 1);
+	vps_sub_layer_ordering_info_present_flag = gf_bs_read_int_log(bs, 1, "vps_sub_layer_ordering_info_present_flag");
 	for (i = (vps_sub_layer_ordering_info_present_flag ? 0 : vps->max_sub_layers - 1); i < vps->max_sub_layers; i++) {
-		/*vps_max_dec_pic_buffering_minus1[i] = */gf_bs_get_ue(bs);
-		/*vps_max_num_reorder_pics[i] = */gf_bs_get_ue(bs);
-		/*vps_max_latency_increase_plus1[i] = */gf_bs_get_ue(bs);
+		gf_bs_read_ue_log_idx(bs, "vps_max_dec_pic_buffering_minus1", i);
+		gf_bs_read_ue_log_idx(bs, "vps_max_num_reorder_pics", i);
+		gf_bs_read_ue_log_idx(bs, "vps_max_latency_increase_plus1", i);
 	}
-	vps->max_layer_id = gf_bs_read_int(bs, 6);
+	vps->max_layer_id = gf_bs_read_int_log(bs, 6, "max_layer_id");
 	if (vps->max_layer_id > MAX_LHVC_LAYERS) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] VPS max layer ID %u but GPAC only supports %u\n", vps->max_layer_id, MAX_LHVC_LAYERS));
 		return -1;
 	}
-	vps->num_layer_sets = gf_bs_get_ue(bs) + 1;
+	vps->num_layer_sets = gf_bs_read_ue_log(bs, "num_layer_sets_minus1") + 1;
 	if (vps->num_layer_sets > MAX_LHVC_LAYERS) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] Wrong number of layer sets in VPS %d\n", vps->num_layer_sets));
 		return -1;
 	}
 	for (i = 1; i < vps->num_layer_sets; i++) {
 		for (j = 0; j <= vps->max_layer_id; j++) {
-			layer_id_included_flag[i][j] = gf_bs_read_int(bs, 1);
+			layer_id_included_flag[i][j] = gf_bs_read_int_log_idx2(bs, 1, "layer_id_included_flag", i, j);
 		}
 	}
 	vps->num_layers_in_id_list[0] = 1;
@@ -7464,27 +7979,27 @@
 		}
 		vps->num_layers_in_id_list[i] = n;
 	}
-	if (/*vps_timing_info_present_flag*/gf_bs_read_int(bs, 1)) {
+	if (gf_bs_read_int_log(bs, 1, "vps_timing_info_present_flag")) {
 		u32 vps_num_hrd_parameters;
-		/*u32 vps_num_units_in_tick = */gf_bs_read_int(bs, 32);
-		/*u32 vps_time_scale = */gf_bs_read_int(bs, 32);
-		if (/*vps_poc_proportional_to_timing_flag*/gf_bs_read_int(bs, 1)) {
-			/*vps_num_ticks_poc_diff_one_minus1*/gf_bs_get_ue(bs);
+		gf_bs_read_int_log(bs, 32, "vps_num_units_in_tick");
+		gf_bs_read_int_log(bs, 32, "vps_time_scale");
+		if (gf_bs_read_int_log(bs, 1, "vps_poc_proportional_to_timing_flag")) {
+			gf_bs_read_ue_log(bs, "vps_num_ticks_poc_diff_one_minus1");
 		}
-		vps_num_hrd_parameters = gf_bs_get_ue(bs);
+		vps_num_hrd_parameters = gf_bs_read_ue_log(bs, "vps_num_hrd_parameters");
 		for (i = 0; i < vps_num_hrd_parameters; i++) {
 			Bool cprms_present_flag = GF_TRUE;
-			/*hrd_layer_set_idx[i] = */gf_bs_get_ue(bs);
+			gf_bs_read_ue_log_idx(bs, "hrd_layer_set_idx", i);
 			if (i > 0)
-				cprms_present_flag = gf_bs_read_int(bs, 1);
-			hevc_parse_hrd_parameters(bs, cprms_present_flag, vps->max_sub_layers - 1);
+				cprms_present_flag = gf_bs_read_int_log(bs, 1, "cprms_present_flag");
+			hevc_parse_hrd_parameters(bs, cprms_present_flag, vps->max_sub_layers - 1, i);
 		}
 	}
 	if (stop_at_vps_ext) {
 		return vps_id;
 	}
 
-	vps_extension_flag = gf_bs_read_int(bs, 1);
+	vps_extension_flag = gf_bs_read_int_log(bs, 1, "vps_extension_flag");
 	if (vps_extension_flag) {
 		Bool res;
 		gf_bs_align(bs);
@@ -7493,7 +8008,7 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] Failed to parse VPS extensions\n"));
 			return -1;
 		}
-		if (/*vps_extension2_flag*/gf_bs_read_int(bs, 1)) {
+		if (gf_bs_read_int_log(bs, 1, "vps_extension2_flag")) {
 #if 0
 			while (gf_bs_available(bs)) {
 				/*vps_extension_data_flag */ gf_bs_read_int(bs, 1);
@@ -7506,7 +8021,7 @@
 }
 
 GF_EXPORT
-s32 gf_media_hevc_read_vps_ex(u8 *data, u32 *size, HEVCState *hevc, Bool remove_extensions)
+s32 gf_hevc_read_vps_ex(u8 *data, u32 *size, HEVCState *hevc, Bool remove_extensions)
 {
 	GF_BitStream *bs;
 	char *data_without_emulation_bytes = NULL;
@@ -7530,7 +8045,7 @@
 
 	if (!hevc_parse_nal_header(bs, NULL, NULL, NULL)) goto exit;
 
-	vps_id = gf_media_hevc_read_vps_bs_internal(bs, hevc, remove_extensions);
+	vps_id = gf_hevc_read_vps_bs_internal(bs, hevc, remove_extensions);
 	if (vps_id < 0) goto exit;
 
 	if (remove_extensions) {
@@ -7575,18 +8090,18 @@
 }
 
 GF_EXPORT
-s32 gf_media_hevc_read_vps(u8 *data, u32 size, HEVCState *hevc)
+s32 gf_hevc_read_vps(u8 *data, u32 size, HEVCState *hevc)
 {
-	return gf_media_hevc_read_vps_ex(data, &size, hevc, GF_FALSE);
+	return gf_hevc_read_vps_ex(data, &size, hevc, GF_FALSE);
 }
 
 GF_EXPORT
-s32 gf_media_hevc_read_vps_bs(GF_BitStream *bs, HEVCState *hevc)
+s32 gf_hevc_read_vps_bs(GF_BitStream *bs, HEVCState *hevc)
 {
 	if (!bs || !hevc) return -1;
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
 	if (!hevc_parse_nal_header(bs, NULL, NULL, NULL)) return -1;
-	return gf_media_hevc_read_vps_bs_internal(bs, hevc, GF_FALSE);
+	return gf_hevc_read_vps_bs_internal(bs, hevc, GF_FALSE);
 }
 
 static void hevc_scaling_list_data(GF_BitStream *bs)
@@ -7594,18 +8109,19 @@
 	u32 i, sizeId, matrixId;
 	for (sizeId = 0; sizeId < 4; sizeId++) {
 		for (matrixId = 0; matrixId < 6; matrixId += (sizeId == 3) ? 3 : 1) {
-			u32 scaling_list_pred_mode_flag_sizeId_matrixId = gf_bs_read_int(bs, 1);
+			u32 idx = sizeId*100 + 10*matrixId;
+			u32 scaling_list_pred_mode_flag_sizeId_matrixId = gf_bs_read_int_log_idx(bs, 1, "scaling_list_pred_mode_flag_sizeId_matrixId", idx);
 			if (!scaling_list_pred_mode_flag_sizeId_matrixId) {
-				/*scaling_list_pred_matrix_id_delta[ sizeId ][ matrixId ] =*/ gf_bs_get_ue(bs);
+				gf_bs_read_ue_log_idx(bs, "scaling_list_pred_matrix_id_delta", idx);
 			}
 			else {
 				//u32 nextCoef = 8;
 				u32 coefNum = MIN(64, (1 << (4 + (sizeId << 1))));
 				if (sizeId > 1) {
-					/*scaling_list_dc_coef_minus8[ sizeId - 2 ][ matrixId ] = */gf_bs_get_se(bs);
+					gf_bs_read_se_log_idx(bs, "scaling_list_dc_coef_minus8", idx);
 				}
 				for (i = 0; i < coefNum; i++) {
-					/*scaling_list_delta_coef = */gf_bs_get_se(bs);
+					gf_bs_read_se_log_idx2(bs, "scaling_list_delta_coef", idx, i);
 				}
 			}
 		}
@@ -7623,7 +8139,7 @@
 	{ 64, 33 }, { 160,99 }, { 4,3}, { 3,2}, { 2,1}
 };
 
-static s32 gf_media_hevc_read_sps_bs_internal(GF_BitStream *bs, HEVCState *hevc, u8 layer_id, u32 *vui_flag_pos)
+static s32 gf_hevc_read_sps_bs_internal(GF_BitStream *bs, HEVCState *hevc, u8 layer_id, u32 *vui_flag_pos)
 {
 	s32 vps_id, sps_id = -1;
 	u32 i, nb_CTUs, depth;
@@ -7636,24 +8152,24 @@
 	if (vui_flag_pos) *vui_flag_pos = 0;
 
 	//nalu header already parsed
-	vps_id = gf_bs_read_int(bs, 4);
-	if (vps_id >= 16) {
+	vps_id = gf_bs_read_int_log(bs, 4, "vps_id");
+	if ((vps_id<0) || (vps_id >= 16)) {
 		return -1;
 	}
 	memset(&ptl, 0, sizeof(ptl));
 	max_sub_layers_minus1 = 0;
 	sps_ext_or_max_sub_layers_minus1 = 0;
 	if (layer_id == 0)
-		max_sub_layers_minus1 = gf_bs_read_int(bs, 3);
+		max_sub_layers_minus1 = gf_bs_read_int_log(bs, 3, "max_sub_layers_minus1");
 	else
-		sps_ext_or_max_sub_layers_minus1 = gf_bs_read_int(bs, 3);
+		sps_ext_or_max_sub_layers_minus1 = gf_bs_read_int_log(bs, 3, "sps_ext_or_max_sub_layers_minus1");
 	multiLayerExtSpsFlag = (layer_id != 0) && (sps_ext_or_max_sub_layers_minus1 == 7);
 	if (!multiLayerExtSpsFlag) {
-		/*temporal_id_nesting_flag = */gf_bs_read_int(bs, 1);
-		profile_tier_level(bs, 1, max_sub_layers_minus1, &ptl);
+		gf_bs_read_int_log(bs, 1, "temporal_id_nesting_flag");
+		hevc_profile_tier_level(bs, 1, max_sub_layers_minus1, &ptl, 0);
 	}
 
-	sps_id = gf_bs_get_ue(bs);
+	sps_id = gf_bs_read_ue_log(bs, "sps_id");
 	if ((sps_id < 0) || (sps_id >= 16)) {
 		return -1;
 	}
@@ -7676,11 +8192,13 @@
 
 	//sps_rep_format_idx = 0;
 	if (multiLayerExtSpsFlag) {
-		sps->update_rep_format_flag = gf_bs_read_int(bs, 1);
+		sps->update_rep_format_flag = gf_bs_read_int_log(bs, 1, "update_rep_format_flag");
 		if (sps->update_rep_format_flag) {
-			sps->rep_format_idx = gf_bs_read_int(bs, 8);
-		}
-		else {
+			sps->rep_format_idx = gf_bs_read_int_log(bs, 8, "rep_format_idx");
+			if (sps->rep_format_idx>15) {
+				return -1;
+			}
+		} else {
 			sps->rep_format_idx = vps->rep_format_idx[layer_id];
 		}
 		sps->width = vps->rep_formats[sps->rep_format_idx].pic_width_luma_samples;
@@ -7694,12 +8212,12 @@
 		sps->ptl = vps->ext_ptl[0];
 	}
 	else {
-		sps->chroma_format_idc = gf_bs_get_ue(bs);
+		sps->chroma_format_idc = gf_bs_read_ue_log(bs, "chroma_format_idc");
 		if (sps->chroma_format_idc == 3)
-			sps->separate_colour_plane_flag = gf_bs_read_int(bs, 1);
-		sps->width = gf_bs_get_ue(bs);
-		sps->height = gf_bs_get_ue(bs);
-		if ((sps->cw_flag = gf_bs_read_int(bs, 1))) {
+			sps->separate_colour_plane_flag = gf_bs_read_int_log(bs, 1, "separate_colour_plane_flag");
+		sps->width = gf_bs_read_ue_log(bs, "width");
+		sps->height = gf_bs_read_ue_log(bs, "height");
+		if ((sps->cw_flag = gf_bs_read_int_log(bs, 1, "conformance_window_flag"))) {
 			u32 SubWidthC, SubHeightC;
 
 			if (sps->chroma_format_idc == 1) {
@@ -7713,40 +8231,40 @@
 				SubWidthC = SubHeightC = 1;
 			}
 
-			sps->cw_left = gf_bs_get_ue(bs);
-			sps->cw_right = gf_bs_get_ue(bs);
-			sps->cw_top = gf_bs_get_ue(bs);
-			sps->cw_bottom = gf_bs_get_ue(bs);
+			sps->cw_left = gf_bs_read_ue_log(bs, "conformance_window_left");
+			sps->cw_right = gf_bs_read_ue_log(bs, "conformance_window_right");
+			sps->cw_top = gf_bs_read_ue_log(bs, "conformance_window_top");
+			sps->cw_bottom = gf_bs_read_ue_log(bs, "conformance_window_bottom");
 
 			sps->width -= SubWidthC * (sps->cw_left + sps->cw_right);
 			sps->height -= SubHeightC * (sps->cw_top + sps->cw_bottom);
 		}
-		sps->bit_depth_luma = 8 + gf_bs_get_ue(bs);
-		sps->bit_depth_chroma = 8 + gf_bs_get_ue(bs);
+		sps->bit_depth_luma = 8 + gf_bs_read_ue_log(bs, "bit_depth_luma_minus8");
+		sps->bit_depth_chroma = 8 + gf_bs_read_ue_log(bs, "bit_depth_chroma_minus8");
 	}
 
-	sps->log2_max_pic_order_cnt_lsb = 4 + gf_bs_get_ue(bs);
+	sps->log2_max_pic_order_cnt_lsb = 4 + gf_bs_read_ue_log(bs, "log2_max_pic_order_cnt_lsb_minus4");
 
 	if (!multiLayerExtSpsFlag) {
-		sps->sub_layer_ordering_info_present_flag = gf_bs_read_int(bs, 1);
+		sps->sub_layer_ordering_info_present_flag = gf_bs_read_int_log(bs, 1, "sub_layer_ordering_info_present_flag");
 		for (i = sps->sub_layer_ordering_info_present_flag ? 0 : sps->max_sub_layers_minus1; i <= sps->max_sub_layers_minus1; i++) {
-			/*max_dec_pic_buffering = */ gf_bs_get_ue(bs);
-			/*num_reorder_pics = */ gf_bs_get_ue(bs);
-			/*max_latency_increase = */ gf_bs_get_ue(bs);
+			gf_bs_read_ue_log_idx(bs, "max_dec_pic_buffering", i);
+			gf_bs_read_ue_log_idx(bs, "num_reorder_pics", i);
+			gf_bs_read_ue_log_idx(bs, "max_latency_increase", i);
 		}
 	}
 
-	sps->log2_min_luma_coding_block_size = 3 + gf_bs_get_ue(bs);
-	sps->log2_diff_max_min_luma_coding_block_size = gf_bs_get_ue(bs);
+	sps->log2_min_luma_coding_block_size = 3 + gf_bs_read_ue_log(bs, "log2_min_luma_coding_block_size_minus3");
+	sps->log2_diff_max_min_luma_coding_block_size = gf_bs_read_ue_log(bs, "log2_diff_max_min_luma_coding_block_size");
 	sps->max_CU_width = (1 << (sps->log2_min_luma_coding_block_size + sps->log2_diff_max_min_luma_coding_block_size));
 	sps->max_CU_height = (1 << (sps->log2_min_luma_coding_block_size + sps->log2_diff_max_min_luma_coding_block_size));
 
-	sps->log2_min_transform_block_size = 2 + gf_bs_get_ue(bs);
-	sps->log2_max_transform_block_size = sps->log2_min_transform_block_size + gf_bs_get_ue(bs);
+	sps->log2_min_transform_block_size = 2 + gf_bs_read_ue_log(bs, "log2_min_transform_block_size_minus2");
+	sps->log2_max_transform_block_size = sps->log2_min_transform_block_size + gf_bs_read_ue_log(bs, "log2_max_transform_block_size");
 
 	depth = 0;
-	sps->max_transform_hierarchy_depth_inter = gf_bs_get_ue(bs);
-	sps->max_transform_hierarchy_depth_intra = gf_bs_get_ue(bs);
+	sps->max_transform_hierarchy_depth_inter = gf_bs_read_ue_log(bs, "max_transform_hierarchy_depth_inter");
+	sps->max_transform_hierarchy_depth_intra = gf_bs_read_ue_log(bs, "max_transform_hierarchy_depth_intra");
 	while ((u32)(sps->max_CU_width >> sps->log2_diff_max_min_luma_coding_block_size) > (u32)(1 << (sps->log2_min_transform_block_size + depth)))
 	{
 		depth++;
@@ -7759,67 +8277,67 @@
 		sps->bitsSliceSegmentAddress++;
 	}
 
-	sps->scaling_list_enable_flag = gf_bs_read_int(bs, 1);
+	sps->scaling_list_enable_flag = gf_bs_read_int_log(bs, 1, "scaling_list_enable_flag");
 	if (sps->scaling_list_enable_flag) {
 		sps->infer_scaling_list_flag = 0;
 		sps->scaling_list_ref_layer_id = 0;
 		if (multiLayerExtSpsFlag) {
-			sps->infer_scaling_list_flag = gf_bs_read_int(bs, 1);
+			sps->infer_scaling_list_flag = gf_bs_read_int_log(bs, 1, "infer_scaling_list_flag");
 		}
 		if (sps->infer_scaling_list_flag) {
-			sps->scaling_list_ref_layer_id = gf_bs_read_int(bs, 6);
+			sps->scaling_list_ref_layer_id = gf_bs_read_int_log(bs, 6, "scaling_list_ref_layer_id");
 		}
 		else {
-			sps->scaling_list_data_present_flag = gf_bs_read_int(bs, 1);
+			sps->scaling_list_data_present_flag = gf_bs_read_int_log(bs, 1, "scaling_list_data_present_flag");
 			if (sps->scaling_list_data_present_flag) {
 				hevc_scaling_list_data(bs);
 			}
 		}
 	}
-	sps->asymmetric_motion_partitions_enabled_flag = gf_bs_read_int(bs, 1);
-	sps->sample_adaptive_offset_enabled_flag = gf_bs_read_int(bs, 1);
-	if ( (sps->pcm_enabled_flag = gf_bs_read_int(bs, 1)) ) {
-		sps->pcm_sample_bit_depth_luma_minus1 = gf_bs_read_int(bs, 4);
-		sps->pcm_sample_bit_depth_chroma_minus1 = gf_bs_read_int(bs, 4);
-		sps->log2_min_pcm_luma_coding_block_size_minus3 = gf_bs_get_ue(bs);
-		sps->log2_diff_max_min_pcm_luma_coding_block_size = gf_bs_get_ue(bs);
-		sps->pcm_loop_filter_disable_flag = gf_bs_read_int(bs, 1);
+	sps->asymmetric_motion_partitions_enabled_flag = gf_bs_read_int_log(bs, 1, "asymmetric_motion_partitions_enabled_flag");
+	sps->sample_adaptive_offset_enabled_flag = gf_bs_read_int_log(bs, 1, "sample_adaptive_offset_enabled_flag");
+	if ( (sps->pcm_enabled_flag = gf_bs_read_int_log(bs, 1, "pcm_enabled_flag")) ) {
+		sps->pcm_sample_bit_depth_luma_minus1 = gf_bs_read_int_log(bs, 4, "pcm_sample_bit_depth_luma_minus1");
+		sps->pcm_sample_bit_depth_chroma_minus1 = gf_bs_read_int_log(bs, 4, "pcm_sample_bit_depth_chroma_minus1");
+		sps->log2_min_pcm_luma_coding_block_size_minus3 = gf_bs_read_ue_log(bs, "log2_min_pcm_luma_coding_block_size_minus3");
+		sps->log2_diff_max_min_pcm_luma_coding_block_size = gf_bs_read_ue_log(bs, "log2_diff_max_min_pcm_luma_coding_block_size");
+		sps->pcm_loop_filter_disable_flag = gf_bs_read_int_log(bs, 1, "pcm_loop_filter_disable_flag");
 	}
-	sps->num_short_term_ref_pic_sets = gf_bs_get_ue(bs);
+	sps->num_short_term_ref_pic_sets = gf_bs_read_ue_log(bs, "num_short_term_ref_pic_sets");
 	if (sps->num_short_term_ref_pic_sets > 64) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] Invalid number of short term reference picture sets %d\n", sps->num_short_term_ref_pic_sets));
 		return -1;
 	}
 
 	for (i = 0; i < sps->num_short_term_ref_pic_sets; i++) {
-		Bool ret = parse_short_term_ref_pic_set(bs, sps, i);
+		Bool ret = hevc_parse_short_term_ref_pic_set(bs, sps, i);
 		/*cannot parse short_term_ref_pic_set, skip VUI parsing*/
 		if (!ret) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] Invalid short_term_ref_pic_set\n"));
 			return -1;
 		}
 	}
-	sps->long_term_ref_pics_present_flag = gf_bs_read_int(bs, 1);
+	sps->long_term_ref_pics_present_flag = gf_bs_read_int_log(bs, 1, "long_term_ref_pics_present_flag");
 	if (sps->long_term_ref_pics_present_flag) {
-		sps->num_long_term_ref_pic_sps = gf_bs_get_ue(bs);
+		sps->num_long_term_ref_pic_sps = gf_bs_read_ue_log(bs, "num_long_term_ref_pic_sps");
 		for (i = 0; i < sps->num_long_term_ref_pic_sps; i++) {
-			/*lt_ref_pic_poc_lsb_sps=*/gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
-			/*used_by_curr_pic_lt_sps_flag*/gf_bs_read_int(bs, 1);
+			gf_bs_read_int_log_idx(bs, sps->log2_max_pic_order_cnt_lsb, "lt_ref_pic_poc_lsb_sps", i);
+			gf_bs_read_int_log_idx(bs, 1, "used_by_curr_pic_lt_sps_flag", i);
 		}
 	}
-	sps->temporal_mvp_enable_flag = gf_bs_read_int(bs, 1);
-	sps->strong_intra_smoothing_enable_flag = gf_bs_read_int(bs, 1);
+	sps->temporal_mvp_enable_flag = gf_bs_read_int_log(bs, 1, "temporal_mvp_enable_flag");
+	sps->strong_intra_smoothing_enable_flag = gf_bs_read_int_log(bs, 1, "strong_intra_smoothing_enable_flag");
 
 	if (vui_flag_pos)
 		*vui_flag_pos = (u32)gf_bs_get_bit_offset(bs);
 
-	if ((sps->vui_parameters_present_flag = gf_bs_read_int(bs, 1)) ) {
-		sps->aspect_ratio_info_present_flag = gf_bs_read_int(bs, 1);
+	if ((sps->vui_parameters_present_flag = gf_bs_read_int_log(bs, 1, "vui_parameters_present_flag")) ) {
+		sps->aspect_ratio_info_present_flag = gf_bs_read_int_log(bs, 1, "aspect_ratio_info_present_flag");
 		if (sps->aspect_ratio_info_present_flag) {
-			sps->sar_idc = gf_bs_read_int(bs, 8);
+			sps->sar_idc = gf_bs_read_int_log(bs, 8, "aspect_ratio_idc");
 			if (sps->sar_idc == 255) {
-				sps->sar_width = gf_bs_read_int(bs, 16);
-				sps->sar_height = gf_bs_read_int(bs, 16);
+				sps->sar_width = gf_bs_read_int_log(bs, 16, "aspect_ratio_width");
+				sps->sar_height = gf_bs_read_int_log(bs, 16, "aspect_ratio_height");
 			}
 			else if (sps->sar_idc < 17) {
 				sps->sar_width = hevc_sar[sps->sar_idc].w;
@@ -7827,62 +8345,62 @@
 			}
 		}
 
-		if ((sps->overscan_info_present = gf_bs_read_int(bs, 1)))
-			sps->overscan_appropriate = gf_bs_read_int(bs, 1);
+		if ((sps->overscan_info_present = gf_bs_read_int_log(bs, 1, "overscan_info_present")))
+			sps->overscan_appropriate = gf_bs_read_int_log(bs, 1, "overscan_appropriate");
 
-		sps->video_signal_type_present_flag = gf_bs_read_int(bs, 1);
+		sps->video_signal_type_present_flag = gf_bs_read_int_log(bs, 1, "video_signal_type_present_flag");
 		if (sps->video_signal_type_present_flag) {
-			sps->video_format = gf_bs_read_int(bs, 3);
-			sps->video_full_range_flag = gf_bs_read_int(bs, 1);
-			if ((sps->colour_description_present_flag = gf_bs_read_int(bs, 1))) {
-				sps->colour_primaries = gf_bs_read_int(bs, 8);
-				sps->transfer_characteristic = gf_bs_read_int(bs, 8);
-				sps->matrix_coeffs = gf_bs_read_int(bs, 8);
+			sps->video_format = gf_bs_read_int_log(bs, 3, "video_format");
+			sps->video_full_range_flag = gf_bs_read_int_log(bs, 1, "video_full_range_flag");
+			if ((sps->colour_description_present_flag = gf_bs_read_int_log(bs, 1, "colour_description_present_flag"))) {
+				sps->colour_primaries = gf_bs_read_int_log(bs, 8, "colour_primaries");
+				sps->transfer_characteristic = gf_bs_read_int_log(bs, 8, "transfer_characteristic");
+				sps->matrix_coeffs = gf_bs_read_int_log(bs, 8, "matrix_coefficients");
 			}
 		}
 
-		if ((sps->chroma_loc_info_present_flag = gf_bs_read_int(bs, 1))) {
-			sps->chroma_sample_loc_type_top_field = gf_bs_get_ue(bs);
-			sps->chroma_sample_loc_type_bottom_field = gf_bs_get_ue(bs);
+		if ((sps->chroma_loc_info_present_flag = gf_bs_read_int_log(bs, 1, "chroma_loc_info_present_flag"))) {
+			sps->chroma_sample_loc_type_top_field = gf_bs_read_ue_log(bs, "chroma_sample_loc_type_top_field");
+			sps->chroma_sample_loc_type_bottom_field = gf_bs_read_ue_log(bs, "chroma_sample_loc_type_bottom_field");
 		}
 
-		sps->neutra_chroma_indication_flag = gf_bs_read_int(bs, 1);
-		sps->field_seq_flag = gf_bs_read_int(bs, 1);
-		sps->frame_field_info_present_flag = gf_bs_read_int(bs, 1);
+		sps->neutra_chroma_indication_flag = gf_bs_read_int_log(bs, 1, "neutra_chroma_indication_flag");
+		sps->field_seq_flag = gf_bs_read_int_log(bs, 1, "field_seq_flag");
+		sps->frame_field_info_present_flag = gf_bs_read_int_log(bs, 1, "frame_field_info_present_flag");
 
-		if ((sps->default_display_window_flag = gf_bs_read_int(bs, 1))) {
-			sps->left_offset = gf_bs_get_ue(bs);
-			sps->right_offset = gf_bs_get_ue(bs);
-			sps->top_offset = gf_bs_get_ue(bs);
-			sps->bottom_offset = gf_bs_get_ue(bs);
+		if ((sps->default_display_window_flag = gf_bs_read_int_log(bs, 1, "default_display_window_flag"))) {
+			sps->left_offset = gf_bs_read_ue_log(bs, "display_window_left_offset");
+			sps->right_offset = gf_bs_read_ue_log(bs, "display_window_right_offset");
+			sps->top_offset = gf_bs_read_ue_log(bs, "display_window_top_offset");
+			sps->bottom_offset = gf_bs_read_ue_log(bs, "display_window_bottom_offset");
 		}
 
-		sps->has_timing_info = gf_bs_read_int(bs, 1);
+		sps->has_timing_info = gf_bs_read_int_log(bs, 1, "has_timing_info");
 		if (sps->has_timing_info) {
-			sps->num_units_in_tick = gf_bs_read_int(bs, 32);
-			sps->time_scale = gf_bs_read_int(bs, 32);
-			sps->poc_proportional_to_timing_flag = gf_bs_read_int(bs, 1);
+			sps->num_units_in_tick = gf_bs_read_int_log(bs, 32, "num_units_in_tick");
+			sps->time_scale = gf_bs_read_int_log(bs, 32, "time_scale");
+			sps->poc_proportional_to_timing_flag = gf_bs_read_int_log(bs, 1, "poc_proportional_to_timing_flag");
 			if (sps->poc_proportional_to_timing_flag)
-				sps->num_ticks_poc_diff_one_minus1 = gf_bs_get_ue(bs);
-			if ((sps->hrd_parameters_present_flag = gf_bs_read_int(bs, 1))) {
+				sps->num_ticks_poc_diff_one_minus1 = gf_bs_read_ue_log(bs, "num_ticks_poc_diff_one_minus1");
+			if ((sps->hrd_parameters_present_flag = gf_bs_read_int_log(bs, 1, "hrd_parameters_present_flag"))) {
 				//				GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[HEVC] HRD param parsing not implemented\n"));
 				return sps_id;
 			}
 		}
 
-		if (/*bitstream_restriction_flag=*/gf_bs_read_int(bs, 1)) {
-			/*tiles_fixed_structure_flag = */gf_bs_read_int(bs, 1);
-			/*motion_vectors_over_pic_boundaries_flag = */gf_bs_read_int(bs, 1);
-			/*restricted_ref_pic_lists_flag = */gf_bs_read_int(bs, 1);
-			/*min_spatial_segmentation_idc = */gf_bs_get_ue(bs);
-			/*max_bytes_per_pic_denom = */gf_bs_get_ue(bs);
-			/*max_bits_per_min_cu_denom = */gf_bs_get_ue(bs);
-			/*log2_max_mv_length_horizontal = */gf_bs_get_ue(bs);
-			/*log2_max_mv_length_vertical = */gf_bs_get_ue(bs);
+		if (gf_bs_read_int_log(bs, 1, "bitstream_restriction_flag")) {
+			gf_bs_read_int_log(bs, 1, "tiles_fixed_structure_flag");
+			gf_bs_read_int_log(bs, 1, "motion_vectors_over_pic_boundaries_flag");
+			gf_bs_read_int_log(bs, 1, "restricted_ref_pic_lists_flag");
+			gf_bs_read_ue_log(bs, "min_spatial_segmentation_idc");
+			gf_bs_read_ue_log(bs, "max_bytes_per_pic_denom");
+			gf_bs_read_ue_log(bs, "max_bits_per_min_cu_denom");
+			gf_bs_read_ue_log(bs, "log2_max_mv_length_horizontal");
+			gf_bs_read_ue_log(bs, "log2_max_mv_length_vertical");
 		}
 	}
 
-	if (/*sps_extension_flag*/gf_bs_read_int(bs, 1)) {
+	if (gf_bs_read_int_log(bs, 1, "sps_extension_flag")) {
 #if 0
 		while (gf_bs_available(bs)) {
 			/*sps_extension_data_flag */ gf_bs_read_int(bs, 1);
@@ -7895,7 +8413,7 @@
 }
 
 GF_EXPORT
-s32 gf_media_hevc_read_sps_ex(char *data, u32 size, HEVCState *hevc, u32 *vui_flag_pos)
+s32 gf_hevc_read_sps_ex(char *data, u32 size, HEVCState *hevc, u32 *vui_flag_pos)
 {
 	GF_BitStream *bs;
 	s32 sps_id = -1;
@@ -7908,7 +8426,7 @@
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
 
 	if (!hevc_parse_nal_header(bs, NULL, NULL, &layer_id)) goto exit;
-	sps_id = gf_media_hevc_read_sps_bs_internal(bs, hevc, layer_id, vui_flag_pos);
+	sps_id = gf_hevc_read_sps_bs_internal(bs, hevc, layer_id, vui_flag_pos);
 
 exit:
 	if (bs) gf_bs_del(bs);
@@ -7916,30 +8434,30 @@
 }
 
 GF_EXPORT
-s32 gf_media_hevc_read_sps(u8 *data, u32 size, HEVCState *hevc)
+s32 gf_hevc_read_sps(u8 *data, u32 size, HEVCState *hevc)
 {
-	return gf_media_hevc_read_sps_ex(data, size, hevc, NULL);
+	return gf_hevc_read_sps_ex(data, size, hevc, NULL);
 }
 
 GF_EXPORT
-s32 gf_media_hevc_read_sps_bs(GF_BitStream *bs, HEVCState *hevc)
+s32 gf_hevc_read_sps_bs(GF_BitStream *bs, HEVCState *hevc)
 {
 	u8 layer_id;
 	if (!bs || !hevc) return -1;
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
 	if (!hevc_parse_nal_header(bs, NULL, NULL, &layer_id)) return -1;
-	return gf_media_hevc_read_sps_bs_internal(bs, hevc, layer_id, NULL);
+	return gf_hevc_read_sps_bs_internal(bs, hevc, layer_id, NULL);
 }
 
 
-static s32 gf_media_hevc_read_pps_bs_internal(GF_BitStream *bs, HEVCState *hevc)
+static s32 gf_hevc_read_pps_bs_internal(GF_BitStream *bs, HEVCState *hevc)
 {
 	u32 i;
 	s32 pps_id;
 	HEVC_PPS *pps;
 
 	//NAL header already read
-	pps_id = gf_bs_get_ue(bs);
+	pps_id = gf_bs_read_ue_log(bs, "pps_id");
 
 	if ((pps_id < 0) || (pps_id >= 64)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] wrong PPS ID %d in PPS\n", pps_id));
@@ -7951,63 +8469,64 @@
 		pps->id = pps_id;
 		pps->state = 1;
 	}
-	pps->sps_id = gf_bs_get_ue(bs);
-	if (pps->sps_id > 16) {
+	pps->sps_id = gf_bs_read_ue_log(bs, "sps_id");
+	if (((s32)pps->sps_id<0) || (pps->sps_id >= 16)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] wrong SPS ID %d in PPS\n", pps->sps_id));
+		pps->sps_id=0;
 		return -1;
 	}
 	hevc->sps_active_idx = pps->sps_id; /*set active sps*/
-	pps->dependent_slice_segments_enabled_flag = gf_bs_read_int(bs, 1);
+	pps->dependent_slice_segments_enabled_flag = gf_bs_read_int_log(bs, 1, "dependent_slice_segments_enabled_flag");
 
-	pps->output_flag_present_flag = gf_bs_read_int(bs, 1);
-	pps->num_extra_slice_header_bits = gf_bs_read_int(bs, 3);
-	pps->sign_data_hiding_flag = gf_bs_read_int(bs, 1);
-	pps->cabac_init_present_flag = gf_bs_read_int(bs, 1);
-	pps->num_ref_idx_l0_default_active = 1 + gf_bs_get_ue(bs);
-	pps->num_ref_idx_l1_default_active = 1 + gf_bs_get_ue(bs);
-	pps->pic_init_qp_minus26 = gf_bs_get_se(bs);
-	pps->constrained_intra_pred_flag = gf_bs_read_int(bs, 1);
-	pps->transform_skip_enabled_flag = gf_bs_read_int(bs, 1);
-	if ((pps->cu_qp_delta_enabled_flag = gf_bs_read_int(bs, 1)))
-		pps->diff_cu_qp_delta_depth = gf_bs_get_ue(bs);
-
-	pps->pic_cb_qp_offset = gf_bs_get_se(bs);
-	pps->pic_cr_qp_offset = gf_bs_get_se(bs);
-	pps->slice_chroma_qp_offsets_present_flag = gf_bs_read_int(bs, 1);
-	pps->weighted_pred_flag = gf_bs_read_int(bs, 1);
-	pps->weighted_bipred_flag = gf_bs_read_int(bs, 1);
-	pps->transquant_bypass_enable_flag = gf_bs_read_int(bs, 1);
-	pps->tiles_enabled_flag = gf_bs_read_int(bs, 1);
-	pps->entropy_coding_sync_enabled_flag = gf_bs_read_int(bs, 1);
+	pps->output_flag_present_flag = gf_bs_read_int_log(bs, 1, "output_flag_present_flag");
+	pps->num_extra_slice_header_bits = gf_bs_read_int_log(bs, 3, "num_extra_slice_header_bits");
+	pps->sign_data_hiding_flag = gf_bs_read_int_log(bs, 1, "sign_data_hiding_flag");
+	pps->cabac_init_present_flag = gf_bs_read_int_log(bs, 1, "cabac_init_present_flag");
+	pps->num_ref_idx_l0_default_active = 1 + gf_bs_read_ue_log(bs, "num_ref_idx_l0_default_active");
+	pps->num_ref_idx_l1_default_active = 1 + gf_bs_read_ue_log(bs, "num_ref_idx_l1_default_active");
+	pps->pic_init_qp_minus26 = gf_bs_read_se_log(bs, "pic_init_qp_minus26");
+	pps->constrained_intra_pred_flag = gf_bs_read_int_log(bs, 1, "constrained_intra_pred_flag");
+	pps->transform_skip_enabled_flag = gf_bs_read_int_log(bs, 1, "transform_skip_enabled_flag");
+	if ((pps->cu_qp_delta_enabled_flag = gf_bs_read_int_log(bs, 1, "cu_qp_delta_enabled_flag")))
+		pps->diff_cu_qp_delta_depth = gf_bs_read_ue_log(bs, "diff_cu_qp_delta_depth");
+
+	pps->pic_cb_qp_offset = gf_bs_read_se_log(bs, "pic_cb_qp_offset");
+	pps->pic_cr_qp_offset = gf_bs_read_se_log(bs, "pic_cr_qp_offset");
+	pps->slice_chroma_qp_offsets_present_flag = gf_bs_read_int_log(bs, 1, "slice_chroma_qp_offsets_present_flag");
+	pps->weighted_pred_flag = gf_bs_read_int_log(bs, 1, "weighted_pred_flag");
+	pps->weighted_bipred_flag = gf_bs_read_int_log(bs, 1, "weighted_bipred_flag");
+	pps->transquant_bypass_enable_flag = gf_bs_read_int_log(bs, 1, "transquant_bypass_enable_flag");
+	pps->tiles_enabled_flag = gf_bs_read_int_log(bs, 1, "tiles_enabled_flag");
+	pps->entropy_coding_sync_enabled_flag = gf_bs_read_int_log(bs, 1, "entropy_coding_sync_enabled_flag");
 	if (pps->tiles_enabled_flag) {
-		pps->num_tile_columns = 1 + gf_bs_get_ue(bs);
-		pps->num_tile_rows = 1 + gf_bs_get_ue(bs);
-		pps->uniform_spacing_flag = gf_bs_read_int(bs, 1);
+		pps->num_tile_columns = 1 + gf_bs_read_ue_log(bs, "num_tile_columns_minus1");
+		pps->num_tile_rows = 1 + gf_bs_read_ue_log(bs, "num_tile_rows_minus1");
+		pps->uniform_spacing_flag = gf_bs_read_int_log(bs, 1, "uniform_spacing_flag");
 		if (!pps->uniform_spacing_flag) {
 			for (i = 0; i < pps->num_tile_columns - 1; i++) {
-				pps->column_width[i] = 1 + gf_bs_get_ue(bs);
+				pps->column_width[i] = 1 + gf_bs_read_ue_log_idx(bs, "column_width_minus1", i);
 			}
 			for (i = 0; i < pps->num_tile_rows - 1; i++) {
-				pps->row_height[i] = 1 + gf_bs_get_ue(bs);
+				pps->row_height[i] = 1 + gf_bs_read_ue_log_idx(bs, "row_height_minus1", i);
 			}
 		}
-		pps->loop_filter_across_tiles_enabled_flag = gf_bs_read_int(bs, 1);
+		pps->loop_filter_across_tiles_enabled_flag = gf_bs_read_int_log(bs, 1, "loop_filter_across_tiles_enabled_flag");
 	}
-	pps->loop_filter_across_slices_enabled_flag = gf_bs_read_int(bs, 1);
-	if ((pps->deblocking_filter_control_present_flag = gf_bs_read_int(bs, 1))) {
-		pps->deblocking_filter_override_enabled_flag = gf_bs_read_int(bs, 1);
-		if (! (pps->pic_disable_deblocking_filter_flag = gf_bs_read_int(bs, 1))) {
-			pps->beta_offset_div2 = gf_bs_get_se(bs);
-			pps->tc_offset_div2 = gf_bs_get_se(bs);
+	pps->loop_filter_across_slices_enabled_flag = gf_bs_read_int_log(bs, 1, "loop_filter_across_slices_enabled_flag");
+	if ((pps->deblocking_filter_control_present_flag = gf_bs_read_int_log(bs, 1, "deblocking_filter_control_present_flag"))) {
+		pps->deblocking_filter_override_enabled_flag = gf_bs_read_int_log(bs, 1, "deblocking_filter_override_enabled_flag");
+		if (! (pps->pic_disable_deblocking_filter_flag = gf_bs_read_int_log(bs, 1, "pic_disable_deblocking_filter_flag"))) {
+			pps->beta_offset_div2 = gf_bs_read_se_log(bs, "beta_offset_div2");
+			pps->tc_offset_div2 = gf_bs_read_se_log(bs, "tc_offset_div2");
 		}
 	}
-	if ((pps->pic_scaling_list_data_present_flag = gf_bs_read_int(bs, 1))) {
+	if ((pps->pic_scaling_list_data_present_flag = gf_bs_read_int_log(bs, 1, "pic_scaling_list_data_present_flag"))) {
 		hevc_scaling_list_data(bs);
 	}
-	pps->lists_modification_present_flag = gf_bs_read_int(bs, 1);
-	pps->log2_parallel_merge_level_minus2 = gf_bs_get_ue(bs);
-	pps->slice_segment_header_extension_present_flag = gf_bs_read_int(bs, 1);
-	if ( /*pps_extension_flag= */gf_bs_read_int(bs, 1)) {
+	pps->lists_modification_present_flag = gf_bs_read_int_log(bs, 1, "lists_modification_present_flag");
+	pps->log2_parallel_merge_level_minus2 = gf_bs_read_ue_log(bs, "log2_parallel_merge_level_minus2");
+	pps->slice_segment_header_extension_present_flag = gf_bs_read_int_log(bs, 1, "slice_segment_header_extension_present_flag");
+	if (gf_bs_read_int_log(bs, 1, "pps_extension_flag")) {
 #if 0
 		while (gf_bs_available(bs)) {
 			/*pps_extension_data_flag */ gf_bs_read_int(bs, 1);
@@ -8020,7 +8539,7 @@
 
 
 GF_EXPORT
-s32 gf_media_hevc_read_pps(u8 *data, u32 size, HEVCState *hevc)
+s32 gf_hevc_read_pps(u8 *data, u32 size, HEVCState *hevc)
 {
 	GF_BitStream *bs;
 	s32 pps_id = -1;
@@ -8031,7 +8550,7 @@
 
 	if (!hevc_parse_nal_header(bs, NULL, NULL, NULL)) goto exit;
 
-	pps_id = gf_media_hevc_read_pps_bs_internal(bs, hevc);
+	pps_id = gf_hevc_read_pps_bs_internal(bs, hevc);
 
 exit:
 	if (bs) gf_bs_del(bs);
@@ -8039,22 +8558,25 @@
 }
 
 GF_EXPORT
-s32 gf_media_hevc_read_pps_bs(GF_BitStream *bs, HEVCState *hevc)
+s32 gf_hevc_read_pps_bs(GF_BitStream *bs, HEVCState *hevc)
 {
 	if (!bs || !hevc) return -1;
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
 	if (!hevc_parse_nal_header(bs, NULL, NULL, NULL)) return -1;
-	return gf_media_hevc_read_pps_bs_internal(bs, hevc);
+	return gf_hevc_read_pps_bs_internal(bs, hevc);
 }
 
 GF_EXPORT
-s32 gf_media_hevc_parse_nalu_bs(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
+s32 gf_hevc_parse_nalu_bs(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
 {
 	Bool is_slice = GF_FALSE;
 	s32 ret = -1;
 	HEVCSliceInfo n_state;
 
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
+	if (gf_bs_available(bs)<2) return -1;
+
+	gf_bs_mark_overflow(bs, GF_TRUE);
 
 	memcpy(&n_state, &hevc->s_info, sizeof(HEVCSliceInfo));
 	if (!hevc_parse_nal_header(bs, nal_unit_type, temporal_id, layer_id)) return -1;
@@ -8106,15 +8628,15 @@
 		}
 		break;
 	case GF_HEVC_NALU_SEQ_PARAM:
-		hevc->last_parsed_sps_id = gf_media_hevc_read_sps_bs_internal(bs, hevc, *layer_id, NULL);
+		hevc->last_parsed_sps_id = gf_hevc_read_sps_bs_internal(bs, hevc, *layer_id, NULL);
 		ret = (hevc->last_parsed_sps_id>=0) ? 0 : -1;
 		break;
 	case GF_HEVC_NALU_PIC_PARAM:
-		hevc->last_parsed_pps_id = gf_media_hevc_read_pps_bs_internal(bs, hevc);
+		hevc->last_parsed_pps_id = gf_hevc_read_pps_bs_internal(bs, hevc);
 		ret = (hevc->last_parsed_pps_id>=0) ? 0 : -1;
 		break;
 	case GF_HEVC_NALU_VID_PARAM:
-		hevc->last_parsed_vps_id = gf_media_hevc_read_vps_bs_internal(bs, hevc, GF_FALSE);
+		hevc->last_parsed_vps_id = gf_hevc_read_vps_bs_internal(bs, hevc, GF_FALSE);
 		ret = (hevc->last_parsed_vps_id>=0) ? 0 : -1;
 		break;
 	default:
@@ -8122,6 +8644,9 @@
 		break;
 	}
 
+	if (gf_bs_is_overflow(bs))
+		ret = -1;
+
 	/* save _prev values */
 	if ((ret>0) && hevc->s_info.sps) {
 		n_state.frame_num_offset_prev = hevc->s_info.frame_num_offset;
@@ -8139,11 +8664,13 @@
 }
 
 GF_EXPORT
-s32 gf_media_hevc_parse_nalu(u8 *data, u32 size, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
+s32 gf_hevc_parse_nalu(u8 *data, u32 size, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
 {
 	GF_BitStream *bs = NULL;
 	s32 ret = -1;
 
+	if (size<2) return -1;
+
 	if (!hevc) {
 		if (nal_unit_type) (*nal_unit_type) = (data[0] & 0x7E) >> 1;
 		if (layer_id) {
@@ -8160,29 +8687,21 @@
 	if (!bs) return -1;
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
 
-	ret = gf_media_hevc_parse_nalu_bs(bs, hevc, nal_unit_type, temporal_id, layer_id);
+	ret = gf_hevc_parse_nalu_bs(bs, hevc, nal_unit_type, temporal_id, layer_id);
 
 	gf_bs_del(bs);
 	return ret;
 }
 
-static u8 hevc_get_sar_idx(u32 w, u32 h)
-{
-	u32 i;
-	for (i = 0; i < 14; i++) {
-		if ((avc_sar[i].w == w) && (avc_sar[i].h == h)) return i;
-	}
-	return 0xFF;
-}
-
-GF_Err gf_media_hevc_change_par(GF_HEVCConfig *hvcc, s32 ar_n, s32 ar_d)
+GF_EXPORT
+GF_Err gf_hevc_change_vui(GF_HEVCConfig *hvcc, GF_VUIInfo *vui_info)
 {
 	GF_BitStream *orig, *mod;
 	HEVCState hevc;
 	u32 i, bit_offset, flag;
 	s32 idx;
-	GF_HEVCParamArray *spss;
-	GF_AVCConfigSlot *slc;
+	GF_NALUFFParamArray *spss;
+	GF_NALUFFParam *slc;
 	orig = NULL;
 
 	memset(&hevc, 0, sizeof(HEVCState));
@@ -8190,7 +8709,7 @@
 
 	i = 0;
 	spss = NULL;
-	while ((spss = (GF_HEVCParamArray *)gf_list_enum(hvcc->param_array, &i))) {
+	while ((spss = (GF_NALUFFParamArray *)gf_list_enum(hvcc->param_array, &i))) {
 		if (spss->type == GF_HEVC_NALU_SEQ_PARAM)
 			break;
 		spss = NULL;
@@ -8198,7 +8717,7 @@
 	if (!spss) return GF_NON_COMPLIANT_BITSTREAM;
 
 	i = 0;
-	while ((slc = (GF_AVCConfigSlot *)gf_list_enum(spss->nalus, &i))) {
+	while ((slc = (GF_NALUFFParam *)gf_list_enum(spss->nalus, &i))) {
 		u8 *no_emulation_buf;
 		u32 no_emulation_buf_size, emulation_bytes;
 
@@ -8206,7 +8725,7 @@
 		no_emulation_buf = gf_malloc((slc->size) * sizeof(char));
 		no_emulation_buf_size = gf_media_nalu_remove_emulation_bytes(slc->data, no_emulation_buf, slc->size);
 
-		idx = gf_media_hevc_read_sps_ex(no_emulation_buf, no_emulation_buf_size, &hevc, &bit_offset);
+		idx = gf_hevc_read_sps_ex(no_emulation_buf, no_emulation_buf_size, &hevc, &bit_offset);
 		if (idx < 0) {
 			if (orig)
 				gf_bs_del(orig);
@@ -8225,47 +8744,7 @@
 			bit_offset--;
 		}
 
-		/*check VUI*/
-		flag = gf_bs_read_int(orig, 1);
-		gf_bs_write_int(mod, 1, 1); /*vui_parameters_present_flag*/
-		if (flag) {
-			/*aspect_ratio_info_present_flag*/
-			if (gf_bs_read_int(orig, 1)) {
-				s32 aspect_ratio_idc = gf_bs_read_int(orig, 8);
-				if (aspect_ratio_idc == 255) {
-					gf_bs_read_int(orig, 16); /*AR num*/
-					gf_bs_read_int(orig, 16); /*AR den*/
-				}
-			}
-		}
-		if ((ar_d < 0) || (ar_n < 0)) {
-			/*no AR signaled*/
-			gf_bs_write_int(mod, 0, 1);
-		}
-		else {
-			u32 sarx;
-			gf_bs_write_int(mod, 1, 1);
-			sarx = hevc_get_sar_idx((u32)ar_n, (u32)ar_d);
-			gf_bs_write_int(mod, sarx, 8);
-			if (sarx == 0xFF) {
-				gf_bs_write_int(mod, ar_n, 16);
-				gf_bs_write_int(mod, ar_d, 16);
-			}
-		}
-		/*no VUI in input bitstream, set all vui flags to 0*/
-		if (!flag) {
-			gf_bs_write_int(mod, 0, 1);		/*overscan_info_present_flag */
-			gf_bs_write_int(mod, 0, 1);		/*video_signal_type_present_flag */
-			gf_bs_write_int(mod, 0, 1);		/*chroma_location_info_present_flag */
-
-			gf_bs_write_int(mod, 0, 1); /*neutra_chroma_indication_flag */;
-			gf_bs_write_int(mod, 0, 1); /*field_seq_flag */;
-			gf_bs_write_int(mod, 0, 1); /*frame_field_info_present_flag*/;
-			gf_bs_write_int(mod, 0, 1); /*default_display_window_flag*/;
-
-			gf_bs_write_int(mod, 0, 1);		/*timing_info_present_flag*/
-			gf_bs_write_int(mod, 0, 1);		/*bitstream_restriction*/
-		}
+		avc_hevc_vvc_rewrite_vui(vui_info, orig, mod, GF_FALSE);
 
 		/*finally copy over remaining*/
 		while (gf_bs_bits_available(orig)) {
@@ -8290,11 +8769,43 @@
 	return GF_OK;
 }
 
+
+GF_EXPORT
+GF_Err gf_hevc_change_par(GF_HEVCConfig *hvcc, s32 ar_n, s32 ar_d)
+{
+	GF_VUIInfo vuii;
+	memset(&vuii, 0, sizeof(GF_VUIInfo));
+	vuii.ar_num = ar_n;
+	vuii.ar_den = ar_d;
+	vuii.fullrange = -1;
+	vuii.video_format = -1;
+	vuii.color_prim = -1;
+	vuii.color_tfc = -1;
+	vuii.color_matrix = -1;
+	return gf_hevc_change_vui(hvcc, &vuii);
+}
+
+GF_EXPORT
+GF_Err gf_hevc_change_color(GF_HEVCConfig *hvcc, s32 fullrange, s32 vidformat, s32 colorprim, s32 transfer, s32 colmatrix)
+{
+	GF_VUIInfo vuii;
+	memset(&vuii, 0, sizeof(GF_VUIInfo));
+	vuii.ar_num = -1;
+	vuii.ar_den = -1;
+	vuii.fullrange = fullrange;
+	vuii.video_format = vidformat;
+	vuii.color_prim = colorprim;
+	vuii.color_tfc = transfer;
+	vuii.color_matrix = colmatrix;
+	return gf_hevc_change_vui(hvcc, &vuii);
+}
+
+
 GF_EXPORT
 GF_Err gf_hevc_get_sps_info_with_state(HEVCState *hevc, u8 *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d)
 {
 	s32 idx;
-	idx = gf_media_hevc_read_sps(sps_data, sps_size, hevc);
+	idx = gf_hevc_read_sps(sps_data, sps_size, hevc);
 	if (idx < 0) {
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
@@ -8391,7 +8902,7 @@
 	return ac3_sizecod_to_bitrate[brcode];
 }
 
-Bool gf_ac3_parser(u8 *buf, u32 buflen, u32 *pos, GF_AC3Header *hdr, Bool full_parse)
+Bool gf_ac3_parser(u8 *buf, u32 buflen, u32 *pos, GF_AC3Config *hdr, Bool full_parse)
 {
 	GF_BitStream *bs;
 	Bool ret;
@@ -8408,7 +8919,7 @@
 }
 
 GF_EXPORT
-Bool gf_ac3_parser_bs(GF_BitStream *bs, GF_AC3Header *hdr, Bool full_parse)
+Bool gf_ac3_parser_bs(GF_BitStream *bs, GF_AC3Config *hdr, Bool full_parse)
 {
 	u32 fscod, frmsizecod, bsid, ac3_mod, freq, framesize, bsmod, syncword;
 	u64 pos;
@@ -8422,12 +8933,12 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AC3] Wrong sync word detected (0x%X - expecting 0x0B77).\n", syncword));
 		return GF_FALSE;
 	}
-	gf_bs_read_u16(bs); //crc1
-	fscod = gf_bs_read_int(bs, 2);
-	frmsizecod = gf_bs_read_int(bs, 6);
-	bsid = gf_bs_read_int(bs, 5);
-	bsmod = gf_bs_read_int(bs, 3);
-	ac3_mod = gf_bs_read_int(bs, 3);
+	gf_bs_read_int_log(bs, 16, "crc1");
+	fscod = gf_bs_read_int_log(bs, 2, "fscod");
+	frmsizecod = gf_bs_read_int_log(bs, 6, "frmsizecod");
+	bsid = gf_bs_read_int_log(bs, 5, "bsid");
+	bsmod = gf_bs_read_int_log(bs, 3, "bsmod");
+	ac3_mod = gf_bs_read_int_log(bs, 3, "ac3_mod");
 	if (frmsizecod >= 2 * sizeof(ac3_sizecod_to_bitrate) / sizeof(u32))
 		return GF_FALSE;
 
@@ -8465,17 +8976,17 @@
 		hdr->streams[0].acmod = ac3_mod;
 		hdr->streams[0].lfon = 0;
 		hdr->streams[0].fscod = fscod;
-		hdr->streams[0].brcode = frmsizecod / 2;
+		hdr->brcode = frmsizecod / 2;
 	}
 	if (ac3_mod >= 2 * sizeof(ac3_mod_to_chans) / sizeof(u32))
 		return GF_FALSE;
 
 	hdr->channels = ac3_mod_to_chans[ac3_mod];
-	if ((ac3_mod & 0x1) && (ac3_mod != 1)) gf_bs_read_int(bs, 2);
-	if (ac3_mod & 0x4) gf_bs_read_int(bs, 2);
-	if (ac3_mod == 0x2) gf_bs_read_int(bs, 2);
-	/*LFEon*/
-	if (gf_bs_read_int(bs, 1)) {
+	if ((ac3_mod & 0x1) && (ac3_mod != 1)) gf_bs_read_int_log(bs, 2, "cmixlev");
+	if (ac3_mod & 0x4) gf_bs_read_int_log(bs, 2, "surmixlev");
+	if (ac3_mod == 0x2) gf_bs_read_int_log(bs, 2, "dsurmod");
+
+	if (gf_bs_read_int_log(bs, 1, "lfeon")) {
 		hdr->channels += 1;
 		hdr->streams[0].lfon = 1;
 	}
@@ -8486,7 +8997,7 @@
 }
 
 GF_EXPORT
-Bool gf_eac3_parser_bs(GF_BitStream *bs, GF_AC3Header *hdr, Bool full_parse)
+Bool gf_eac3_parser_bs(GF_BitStream *bs, GF_AC3Config *hdr, Bool full_parse)
 {
 	u32 fscod, bsid, ac3_mod, freq, framesize, syncword, substreamid, lfon, channels, numblkscod, strmtyp, frmsiz;
 	u64 pos;
@@ -8501,7 +9012,7 @@
 	pos = gf_bs_get_position(bs);
 	framesize = 0;
 	numblkscod = 0;
-	memset(hdr, 0, sizeof(GF_AC3Header));
+	memset(hdr, 0, sizeof(GF_AC3Config));
 
 block:
 	syncword = gf_bs_read_u16(bs);
@@ -8510,8 +9021,8 @@
 		return GF_FALSE;
 	}
 
-	strmtyp = gf_bs_read_int(bs, 2);
-	substreamid = gf_bs_read_int(bs, 3);
+	strmtyp = gf_bs_read_int_log(bs, 2, "strmtyp");
+	substreamid = gf_bs_read_int_log(bs, 3, "substreamid");
 	//next main (independent) AU, done with this frame
 	if ((strmtyp!=0x1) && ((hdr->substreams >> substreamid) & 0x1)) {
 		hdr->framesize = framesize;
@@ -8519,15 +9030,15 @@
 		return GF_TRUE;
 	}
 
-	frmsiz = gf_bs_read_int(bs, 11);
+	frmsiz = gf_bs_read_int_log(bs, 11, "frmsiz");
 	framesize += 2 * (1 + frmsiz);
-	fscod = gf_bs_read_int(bs, 2);
+	fscod = gf_bs_read_int_log(bs, 2, "fscod");
 	if (fscod == 0x3) {
-		fscod = gf_bs_read_int(bs, 2);
+		fscod = gf_bs_read_int_log(bs, 2, "fscod2");
 		numblkscod += 6;
 	}
 	else {
-		numblkscod += gf_bs_read_int(bs, 2);
+		numblkscod += gf_bs_read_int_log(bs, 2, "numblkscod");
 	}
 	assert(numblkscod <= 9);
 
@@ -8563,25 +9074,25 @@
 		return GF_FALSE;
 	}
 
-	ac3_mod = gf_bs_read_int(bs, 3);
-	lfon = gf_bs_read_int(bs, 1);
-	bsid = gf_bs_read_int(bs, 5);
+	ac3_mod = gf_bs_read_int_log(bs, 3, "ac3_mod");
+	lfon = gf_bs_read_int_log(bs, 1, "lfon");
+	bsid = gf_bs_read_int_log(bs, 5, "bsid");
 	if (!substreamid && (bsid != 16/*E-AC3*/))
 		return GF_FALSE;
-	/*dialnorm=*/gf_bs_read_int(bs, 5);
-	if (/*compre=*/gf_bs_read_int(bs, 1)) {
-		/*compr=*/gf_bs_read_int(bs, 8);
+	gf_bs_read_int_log(bs, 5, "dialnorm");
+	if (gf_bs_read_int_log(bs, 1, "compre")) {
+		gf_bs_read_int_log(bs, 8, "compr");
 	}
 	if (ac3_mod==0) {
-		/*dialnorm2=*/gf_bs_read_int(bs, 5);
-		if (/*compr2e=*/gf_bs_read_int(bs, 1)) {
-			/*compr2=*/gf_bs_read_int(bs, 8);
+		gf_bs_read_int_log(bs, 5, "dialnorm2");
+		if (gf_bs_read_int_log(bs, 1, "compr2e")) {
+			gf_bs_read_int_log(bs, 8, "compr2");
 		}
 	}
 	chanmap = 0;
 	if (strmtyp==0x1) {
-		if (/*chanmape=*/gf_bs_read_int(bs, 1)) {
-			chanmap = gf_bs_read_int(bs, 16);
+		if (gf_bs_read_int_log(bs, 1, "chanmape")) {
+			chanmap = gf_bs_read_int_log(bs, 16, "chanmap");
 		}
 	}
 
@@ -8600,17 +9111,17 @@
 			hdr->streams[substreamid].bsmod = 0;
 			hdr->streams[substreamid].acmod = ac3_mod;
 			hdr->streams[substreamid].fscod = fscod;
-			hdr->streams[substreamid].brcode = 0;
+			hdr->brcode = 0;
 		}
 		hdr->nb_streams++;
 		//not clear if this is only for the independent streams
-		hdr->data_rate += ((frmsiz+1) * freq) / (numblks[numblkscod]*16) / 1000;
+		hdr->brcode += ((frmsiz+1) * freq) / (numblks[numblkscod]*16) / 1000;
 
 		if (lfon)
 			hdr->channels += 1;
 
 	} else {
-		hdr->streams[substreamid].num_dep_sub = substreamid;
+		hdr->streams[substreamid].nb_dep_sub = substreamid;
 		hdr->streams[substreamid].chan_loc |= chanmap;
 	}
 
@@ -8988,22 +9499,2088 @@
 }
 
 GF_EXPORT
-s32 gf_mpegh_get_mhas_pl(u8 *ptr, u32 size)
+s32 gf_mpegh_get_mhas_pl(u8 *ptr, u32 size, u64 *ch_layout)
 {
-	GF_BitStream *bs = gf_bs_new(ptr, size, GF_BITSTREAM_READ);
+	s32 PL = -1;
+	GF_BitStream *bs;
+	u32 i;
+	s32 sync_pos=-1;
+
+	if (!ptr || !size) return 0;
+	
+	for (i=0; i<size-3; i++) {
+		if ((ptr[i]==0xC0) && (ptr[i+1]== 0x01) && (ptr[i+2]==0xA5)) {
+			sync_pos = i;
+			break;
+		}
+	}
+	if (sync_pos<0) return 0;
+	if (ch_layout) *ch_layout = 0;
+	bs = gf_bs_new(ptr, size, GF_BITSTREAM_READ);
+	gf_bs_skip_bytes(bs, sync_pos);
 
 	while (gf_bs_available(bs)) {
 		u32 type = (u32) gf_mpegh_escaped_value(bs, 3, 8, 8);
 		/*u64 label = */gf_mpegh_escaped_value(bs, 2, 8, 32);
 		u64 mh_size = gf_mpegh_escaped_value(bs, 11, 24, 24);
+		if (mh_size > gf_bs_available(bs))
+			break;
 		//MHAS config
 		if (type==1) {
-			u32 PL = gf_bs_read_int(bs, 8);
-			gf_bs_del(bs);
-			return PL;
+			PL = gf_bs_read_int(bs, 8);
+			if (ch_layout) {
+				u32 idx = gf_bs_read_int(bs, 5);
+				if (idx==0x1f)
+					gf_bs_read_int(bs, 24);
+				/*idx = */gf_bs_read_int(bs, 3);
+				gf_bs_read_int(bs, 1);
+				gf_bs_read_int(bs, 1);
+
+				//speaker config
+				idx = gf_bs_read_int(bs, 2);
+				if (idx == 0) {
+					*ch_layout = gf_audio_fmt_get_layout_from_cicp( gf_bs_read_int(bs, 6) );
+				}
+			}
+			break;
 		}
 		gf_bs_skip_bytes(bs, mh_size);
 	}
 	gf_bs_del(bs);
+	return PL;
+}
+
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+GF_EXPORT
+void gf_vvc_parse_sei(char *buffer, u32 nal_size, VVCState *vvc)
+{
+	gf_hevc_vvc_parse_sei(buffer, nal_size, NULL, vvc);
+}
+
+static Bool vvc_parse_nal_header(GF_BitStream *bs, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
+{
+	u32 val;
+	val = gf_bs_read_int_log(bs, 1, "forbidden_zero");
+	if (val) return GF_FALSE;
+	val = gf_bs_read_int_log(bs, 1, "reserved_zero");
+	if (val) return GF_FALSE;
+
+	val = gf_bs_read_int_log(bs, 6, "layerID");
+	if (layer_id) *layer_id = val;
+
+	val = gf_bs_read_int_log(bs, 5, "nuh_type");
+	if (nal_unit_type) *nal_unit_type = val;
+
+	val = gf_bs_read_int_log(bs, 3, "temporalID");
+	if (!val) return GF_FALSE;
+	val -= 1;
+	if (temporal_id) *temporal_id = val;
+	return GF_TRUE;
+}
+
+static void vvc_profile_tier_level(GF_BitStream *bs, VVC_ProfileTierLevel *ptl, u32 idx)
+{
+	u32 i;
+	if (ptl->pt_present) {
+		ptl->general_profile_idc = gf_bs_read_int_log_idx(bs, 7, "general_profile_idc", idx);
+		ptl->general_tier_flag = gf_bs_read_int_log_idx(bs, 1, "general_tier_flag", idx);
+	}
+	ptl->general_level_idc = gf_bs_read_int_log_idx(bs, 8, "general_level_idc", idx);
+	ptl->frame_only_constraint = gf_bs_read_int_log_idx(bs, 1, "frame_only_constraint", idx);
+	ptl->multilayer_enabled = gf_bs_read_int_log_idx(bs, 1, "multilayer_enabled", idx);
+	//general constraints info - max size if 1 + 81 + 8 + 255
+	if (ptl->pt_present) {
+		//		general_constraints_info
+		ptl->gci_present = gf_bs_read_int_log_idx(bs, 1, "gci_present", idx);
+		if (ptl->gci_present) {
+			u8 res;
+			ptl->gci[0] = 0x80;
+			ptl->gci[0] |= gf_bs_read_int(bs, 7);
+			//71 buts till reserved, so 71-7 = 64bits = 8 bytes till reserved
+			gf_bs_read_data(bs, ptl->gci+1, 8);
+			ptl->gci[10] = gf_bs_read_int(bs, 2)<<6;
+			//skip extensions
+			ptl->gci[11] = 0;
+			res = gf_bs_read_int(bs, 8);
+			gf_bs_read_int(bs, res);
+		}
+		gf_bs_align(bs);
+	}
+	for (i=ptl->ptl_max_tid; i>0; i--) {
+		ptl->sub_ptl[i-1].level_present_flag = gf_bs_read_int_log_idx2(bs, 1, "level_present_flag", idx, i);
+	}
+	gf_bs_align(bs);
+	for (i=ptl->ptl_max_tid; i>0; i--) {
+		if (ptl->sub_ptl[i-1].level_present_flag)
+			ptl->sub_ptl[i-1].sublayer_level_idc = gf_bs_read_int_log_idx2(bs, 8, "sublayer_level_idc", idx, i);
+	}
+	if (ptl->pt_present) {
+		ptl->num_sub_profiles = gf_bs_read_int_log_idx(bs, 8, "num_sub_profiles", idx);
+		for (i=0; i<ptl->num_sub_profiles; i++) {
+			ptl->sub_profile_idc[i] = gf_bs_read_int_log_idx2(bs, 32, "sub_profile_idc", idx, i);
+		}
+	}
+}
+
+static s32 gf_vvc_read_vps_bs_internal(GF_BitStream *bs, VVCState *vvc, Bool stop_at_vps_ext)
+{
+	u32 i, j;
+	s32 vps_id;
+	VVC_VPS *vps;
+	Bool vps_default_ptl_dpb_hrd_max_tid_flag=0;
+
+	//nalu header already parsed
+	vps_id = gf_bs_read_int_log(bs, 4, "vps_id");
+	if ((vps_id<0) || (vps_id >= 16)) return -1;
+	if (!vps_id) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] VPS ID 0 is forbidden\n"));
+		return -1;
+	}
+	vps = &vvc->vps[vps_id];
+	if (!vps->state) {
+		vps->id = vps_id;
+		vps->state = 1;
+	}
+	vps->max_layers = 1 + gf_bs_read_int_log(bs, 6, "max_layers");
+	if (vps->max_layers > MAX_LHVC_LAYERS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] sorry, %d layers in VPS but only %d supported\n", vps->max_layers, MAX_LHVC_LAYERS));
+		return -1;
+	}
+	vps->max_sub_layers = gf_bs_read_int_log(bs, 3, "max_sub_layers_minus1") + 1;
+
+	if ((vps->max_layers>1) && (vps->max_sub_layers>1))
+		vps_default_ptl_dpb_hrd_max_tid_flag = gf_bs_read_int_log(bs, 1, "vps_default_ptl_dpb_hrd_max_tid_flag");
+
+	if (vps->max_layers>1)
+		vps->all_layers_independent = gf_bs_read_int_log(bs, 1, "all_layers_independent");
+
+	for (i=0; i<vps->max_layers; i++) {
+		u32 layer_id = gf_bs_read_int_log_idx(bs, 6, "layer_id", i);
+		if (layer_id>vps->max_layer_id) vps->max_layer_id = layer_id;
+		if (i && !vps->all_layers_independent) {
+			Bool layer_indep = gf_bs_read_int_log_idx(bs, 1, "layer_independent", i);
+			if (!layer_indep) {
+				Bool vps_max_tid_ref_present_flag = gf_bs_read_int_log_idx(bs, 1, "vps_max_tid_ref_present_flag", i);
+				for (j=0; j<i; j++) {
+					Bool vps_direct_ref_layer_flag = gf_bs_read_int_log_idx2(bs, 1, "vps_direct_ref_layer_flag", i, j);
+					if (vps_max_tid_ref_present_flag && vps_direct_ref_layer_flag) {
+						gf_bs_read_int_log_idx2(bs, 3, "vps_max_tid_il_ref_pics_plus1", i, j);
+					}
+				}
+			}
+		}
+	}
+	vps->num_ptl = 1;
+	if (vps->max_layers > 1) {
+		if (vps->all_layers_independent) {
+			vps->each_layer_is_ols = gf_bs_read_int_log(bs, 1, "each_layer_is_ols");
+		}
+		if (!vps->each_layer_is_ols) {
+			u32 vps_ols_mode_idc = 2;
+			if (!vps->all_layers_independent) {
+				vps_ols_mode_idc = gf_bs_read_int_log(bs, 2, "vps_ols_mode_idc");
+			}
+			if (vps_ols_mode_idc==2) {
+				u8 vps_num_output_layer_sets = 2 + gf_bs_read_int_log(bs, 8, "vps_num_output_layer_sets_minus2");
+				for (i=0; i<vps_num_output_layer_sets; i++) {
+					for (j=0; j<vps->max_layers; j++) {
+						gf_bs_read_int_log_idx2(bs, 1, "vps_ols_output_layer_flag", i, j);
+					}
+				}
+			}
+		}
+		vps->num_ptl = 1 + gf_bs_read_int_log(bs, 8, "num_ptl_minus1");
+	}
+	vps->ptl[0].pt_present = 1;
+	for (i=0; i<vps->num_ptl; i++) {
+		if (i)
+			vps->ptl[i].pt_present = gf_bs_read_int_log_idx(bs, 1, "pt_present", i);
+		if (!vps_default_ptl_dpb_hrd_max_tid_flag)
+			vps->ptl[i].ptl_max_tid = gf_bs_read_int_log_idx(bs, 3, "ptl_max_tid", i);
+		else
+			vps->ptl[i].ptl_max_tid = vps->max_sub_layers - 1;
+	}
+	//align
+	gf_bs_align(bs);
+
+	for (i=0; i<vps->num_ptl; i++) {
+		vvc_profile_tier_level(bs, &vps->ptl[i], i);
+	}
+
+	//TODO, parse multilayer stuff
+	return vps_id;
+}
+
+static s32 vvc_parse_ref_pic_list_struct(GF_BitStream *bs, VVC_SPS *sps, u32 listIdx, u32 rplsIdx, VVC_RefPicList *rpl)
+{
+	u32 i;
+	memset(rpl, 0, sizeof(VVC_RefPicList));
+	rpl->num_ref_entries = gf_bs_read_ue_log_idx2(bs, "num_ref_entries", listIdx, rplsIdx);
+	if (rpl->num_ref_entries>=VVC_MAX_REF_PICS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] num_ref_entries %d exceeds maximum allowed value %d\n", rpl->num_ref_entries, VVC_MAX_REF_PICS));
+		return -1;
+	}
+
+	rpl->ltrp_in_header_flag = 1;
+	if (sps->long_term_ref_pics_flag
+		&& rplsIdx < sps->num_ref_pic_lists[listIdx]
+		&& (rpl->num_ref_entries > 0)
+	) {
+		rpl->ltrp_in_header_flag = gf_bs_read_int_log_idx2(bs, 1, "ltrp_in_header_flag", listIdx, rplsIdx);
+	}
+	for (i=0; i < rpl->num_ref_entries; i++) {
+		Bool inter_layer_ref_pic_flag = 0;
+		if (sps->inter_layer_prediction_enabled_flag) {
+			inter_layer_ref_pic_flag = gf_bs_read_int_log_idx3(bs, 1, "inter_layer_ref_pic_flag", listIdx, rplsIdx, i);
+		}
+		if (!inter_layer_ref_pic_flag) {
+			u32 AbsDeltaPocSt;
+			Bool st_ref_pic_flag = 1;
+			if (sps->long_term_ref_pics_flag) {
+				st_ref_pic_flag = gf_bs_read_int_log_idx3(bs, 1, "st_ref_pic_flag", listIdx, rplsIdx, i);
+			}
+			if (st_ref_pic_flag) {
+				u32 abs_delta_poc_st = gf_bs_read_ue_log_idx3(bs, "abs_delta_poc_st", listIdx, rplsIdx, i);
+
+				if ((sps->weighted_pred_flag || sps->weighted_bipred_flag) && (i!=0)) {
+					AbsDeltaPocSt = abs_delta_poc_st;
+				} else {
+					AbsDeltaPocSt = abs_delta_poc_st + 1;
+				}
+				if (AbsDeltaPocSt>0) {
+					gf_bs_read_int_log_idx3(bs, 1, "strp_entry_sign_flag", listIdx, rplsIdx, i);
+				}
+				rpl->nb_short_term_pictures++;
+				rpl->ref_pic_type[i] = VVC_RPL_ST;
+			} else if( !rpl->ltrp_in_header_flag) {
+				gf_bs_read_int_log_idx3(bs, sps->log2_max_poc_lsb, "rpls_poc_lsb_lt", listIdx, rplsIdx, i);
+				rpl->nb_long_term_pictures++;
+				rpl->ref_pic_type[i] = VVC_RPL_LT;
+			}
+		} else {
+			gf_bs_read_ue_log_idx3(bs, "ilrp_idx", listIdx, rplsIdx, i);
+			rpl->nb_inter_layer_pictures ++;
+			rpl->ref_pic_type[i] = VVC_RPL_IL;
+		}
+	}
+	return 0;
+}
+
+static void vvc_parse_general_timing_hrd_parameters(GF_BitStream *bs, VVC_SPS *sps, VVC_VPS *vps, Bool *general_nal_hrd_params_present_flag, Bool *general_vcl_hrd_params_present_flag, Bool *general_du_hrd_params_present_flag, u32 *hrd_cpb_cnt_minus1)
+{
+	sps->has_timing_info = 1;
+	sps->num_units_in_tick = gf_bs_read_int_log(bs, 32, "num_units_in_tick");
+	sps->time_scale = gf_bs_read_int_log(bs, 32, "timescale");
+	*general_du_hrd_params_present_flag = GF_FALSE;
+	*general_nal_hrd_params_present_flag = gf_bs_read_int_log(bs, 1, "general_nal_hrd_params_present_flag");
+	*general_vcl_hrd_params_present_flag = gf_bs_read_int_log(bs, 1, "general_vcl_hrd_params_present_flag");
+	if (*general_nal_hrd_params_present_flag || *general_vcl_hrd_params_present_flag) {
+		gf_bs_read_int_log(bs, 1, "general_same_pic_timing_in_all_ols_flag");
+		*general_du_hrd_params_present_flag = gf_bs_read_int_log(bs, 1, "general_du_hrd_params_present_flag");
+		if (*general_du_hrd_params_present_flag)
+			gf_bs_read_int_log(bs, 8, "tick_divisor_minus2");
+		gf_bs_read_int_log(bs, 4, "bit_rate_scale");
+		gf_bs_read_int_log(bs, 4, "cpb_size_scale");
+		if (*general_du_hrd_params_present_flag)
+			gf_bs_read_int_log(bs, 4, "cpb_size_du_scale");
+		*hrd_cpb_cnt_minus1 = gf_bs_read_ue_log(bs, "hrd_cpb_cnt_minus1");
+	}
+}
+
+static void vvc_parse_sublayer_hrd_parameters(GF_BitStream *bs, u32 subLayerId, Bool general_du_hrd_params_present_flag, u32 hrd_cpb_cnt_minus1)
+{
+	u32 j;
+	for (j=0; j <= hrd_cpb_cnt_minus1; j++) {
+		gf_bs_read_ue_log_idx2(bs, "bit_rate_value_minus1", subLayerId, j);
+		gf_bs_read_ue_log_idx2(bs, "cpb_size_value_minus1", subLayerId, j);
+		if( general_du_hrd_params_present_flag ) {
+			gf_bs_read_ue_log_idx2(bs, "cpb_size_du_value_minus1", subLayerId, j);
+			gf_bs_read_ue_log_idx2(bs, "bit_rate_du_value_minus1", subLayerId, j);
+		}
+		gf_bs_read_int_log_idx2(bs, 1, "cbr_flag", subLayerId, j);
+	}
+}
+
+static void vvc_parse_ols_timing_hrd_parameters(GF_BitStream *bs, u32 firstSubLayer, u32 MaxSubLayersVal, Bool general_nal_hrd_params_present_flag, Bool general_vcl_hrd_params_present_flag, Bool general_du_hrd_params_present_flag, u32 hrd_cpb_cnt_minus1)
+{
+	u32 i;
+	for (i=firstSubLayer; i<=MaxSubLayersVal; i++) {
+		Bool fixed_pic_rate_within_cvs_flag = GF_TRUE;
+		if (! gf_bs_read_int_log_idx(bs, 1, "fixed_pic_rate_general_flag", i)) {
+			fixed_pic_rate_within_cvs_flag = gf_bs_read_int_log_idx(bs, 1, "fixed_pic_rate_within_cvs_flag", i);
+		}
+		if (fixed_pic_rate_within_cvs_flag) {
+			gf_bs_read_ue_log(bs, "elemental_duration_in_tc_minus1");
+		} else if ( (general_nal_hrd_params_present_flag || general_vcl_hrd_params_present_flag)
+			&& (hrd_cpb_cnt_minus1 ==0)
+		) {
+			gf_bs_read_int_log_idx(bs, 1, "low_delay_hrd_flag", i);
+		}
+		if (general_nal_hrd_params_present_flag) {
+			vvc_parse_sublayer_hrd_parameters(bs, i, general_du_hrd_params_present_flag, hrd_cpb_cnt_minus1);
+		}
+		if (general_vcl_hrd_params_present_flag) {
+			vvc_parse_sublayer_hrd_parameters(bs, i, general_du_hrd_params_present_flag, hrd_cpb_cnt_minus1);
+		}
+	}
+}
+
+static s32 gf_vvc_read_sps_bs_internal(GF_BitStream *bs, VVCState *vvc, u8 layer_id, u32 *vui_flag_pos)
+{
+	s32 vps_id, sps_id;
+	u32 i, CtbSizeY;
+	VVC_SPS *sps;
+	u8 sps_ptl_dpb_hrd_params_present_flag;
+
+	if (vui_flag_pos) *vui_flag_pos = 0;
+
+	sps_id = gf_bs_read_int_log(bs, 4, "sps_id");
+	if ((sps_id<0) || (sps_id >= 16)) {
+		return -1;
+	}
+	vps_id = gf_bs_read_int_log(bs, 4, "vps_id");
+	if ((vps_id<0) || (vps_id >= 16)) {
+		return -1;
+	}
+	if (!vps_id && !vvc->vps[0].state) {
+		vvc->vps[0].state = 1;
+		vvc->vps[0].num_ptl = 1;
+		vvc->vps[0].max_layers = 1;
+		vvc->vps[0].all_layers_independent = 1;
+	}
+
+	sps = &vvc->sps[sps_id];
+	if (!sps->state) {
+		sps->state = 1;
+		sps->id = sps_id;
+		sps->vps_id = vps_id;
+	}
+	sps->max_sublayers = 1 + gf_bs_read_int_log(bs, 3, "max_sublayers_minus1");
+	sps->chroma_format_idc = gf_bs_read_int_log(bs, 2, "chroma_format_idc");
+	sps->log2_ctu_size = 5 + gf_bs_read_int_log(bs, 2, "log2_ctu_size_minus5");
+	CtbSizeY = 1<<sps->log2_ctu_size;
+
+	sps_ptl_dpb_hrd_params_present_flag = gf_bs_read_int_log(bs, 1, "sps_ptl_dpb_hrd_params_present_flag");
+	if (sps_ptl_dpb_hrd_params_present_flag) {
+		VVC_ProfileTierLevel ptl, *p_ptl;
+		if (sps->vps_id) {
+			p_ptl = &ptl;
+		} else {
+			p_ptl = &vvc->vps[0].ptl[0];
+		}
+		memset(p_ptl, 0, sizeof(VVC_ProfileTierLevel));
+		p_ptl->pt_present = 1;
+		p_ptl->ptl_max_tid = sps->max_sublayers-1;
+		vvc_profile_tier_level(bs, p_ptl, 0);
+	}
+	sps->gdr_enabled = gf_bs_read_int_log(bs, 1, "gdr_enabled");
+	sps->ref_pic_resampling = gf_bs_read_int_log(bs, 1, "ref_pic_resampling");
+	if (sps->ref_pic_resampling)
+		sps->res_change_in_clvs = gf_bs_read_int_log(bs, 1, "res_change_in_clvs");
+	sps->width = gf_bs_read_ue_log(bs, "width");
+	sps->height = gf_bs_read_ue_log(bs, "height");
+	sps->conf_window = gf_bs_read_int_log(bs, 1, "conformance_window_present_flag");
+	if (sps->conf_window) {
+		u32 SubWidthC, SubHeightC;
+		sps->cw_left = gf_bs_read_ue_log(bs, "conformance_window_left");
+		sps->cw_right = gf_bs_read_ue_log(bs, "conformance_window_right");
+		sps->cw_top = gf_bs_read_ue_log(bs, "conformance_window_top");
+		sps->cw_bottom = gf_bs_read_ue_log(bs, "conformance_window_bottom");
+
+
+		if (sps->chroma_format_idc == 1) {
+			SubWidthC = SubHeightC = 2;
+		} else if (sps->chroma_format_idc == 2) {
+			SubWidthC = 2;
+			SubHeightC = 1;
+		} else {
+			SubWidthC = SubHeightC = 1;
+		}
+		sps->width -= SubWidthC * (sps->cw_left + sps->cw_right);
+		sps->height -= SubHeightC * (sps->cw_top + sps->cw_bottom);
+	}
+	
+	sps->subpic_info_present = gf_bs_read_int_log(bs, 1, "subpic_info_present");
+	if (sps->subpic_info_present) {
+		sps->nb_subpics = 1 + gf_bs_read_ue_log(bs, "nb_subpics_minus1");
+		if (sps->nb_subpics>1) {
+			u32 tmpWidthVal, tmpHeightVal;
+			sps->independent_subpic_flags = gf_bs_read_int_log(bs, 1, "independent_subpic_flags");
+			sps->subpic_same_size = gf_bs_read_int_log(bs, 1, "subpic_same_size");
+
+			tmpWidthVal = (sps->width + CtbSizeY-1) / CtbSizeY;
+			tmpWidthVal = gf_get_bit_size(tmpWidthVal);
+			tmpHeightVal = (sps->height + CtbSizeY-1) / CtbSizeY;
+			tmpHeightVal = gf_get_bit_size(tmpHeightVal);
+
+			for (i=0; i<sps->nb_subpics; i++) {
+				if( !sps->subpic_same_size || !i) {
+					if (i && (sps->width > CtbSizeY))
+						gf_bs_read_int_log(bs, tmpWidthVal, "subpic_ctu_top_left_x");
+					if (i && (sps->height > CtbSizeY))
+						gf_bs_read_int_log(bs, tmpHeightVal, "subpic_ctu_top_left_y");
+					if ((i+1 < sps->nb_subpics) && (sps->width > CtbSizeY))
+						gf_bs_read_int_log(bs, tmpWidthVal, "subpic_width_minus1");
+					if ((i+1 < sps->nb_subpics) && (sps->height > CtbSizeY))
+						gf_bs_read_int_log(bs, tmpHeightVal, "subpic_height_minus1");
+				}
+				if (!sps->independent_subpic_flags) {
+					gf_bs_read_int_log(bs, 1, "subpic_treated_as_pic_flag");
+					gf_bs_read_int_log(bs, 1, "loop_filter_across_subpic_enabled_flag");
+				}
+			}
+			sps->subpicid_len = gf_bs_read_ue_log(bs, "subpic_id_len_minus1") + 1;
+			sps->subpicid_mapping_explicit = gf_bs_read_int_log(bs, 1, "subpic_id_mapping_explicitly_signalled_flag");
+			if (sps->subpicid_mapping_explicit) {
+				sps->subpicid_mapping_present = gf_bs_read_int_log(bs, 1, "subpic_id_mapping_present_flag");
+				if (sps->subpicid_mapping_present) {
+					for (i=0; i<sps->nb_subpics; i++) {
+						gf_bs_read_ue_log(bs, "subpic_id");
+					}
+				}
+			}
+		}
+	} else {
+		sps->nb_subpics = 1;
+	}
+	sps->bitdepth = gf_bs_read_ue_log(bs, "bitdepth_minus8") + 8;
+	sps->entropy_coding_sync_enabled_flag = gf_bs_read_int_log(bs, 1, "entropy_coding_sync_enabled_flag");
+	sps->entry_point_offsets_present_flag = gf_bs_read_int_log(bs, 1, "entry_point_offsets_present_flag");
+	sps->log2_max_poc_lsb = 4 + gf_bs_read_int_log(bs, 4, "log2_max_poc_lsb_minus4");
+	if ((sps->poc_msb_cycle_flag = gf_bs_read_int_log(bs, 1, "poc_msb_cycle_flag")))
+		sps->poc_msb_cycle_len = 1 + gf_bs_read_ue_log(bs, "poc_msb_cycle_len_minus1");
+
+	u8 sps_num_extra_ph_bits = 8 * gf_bs_read_int_log(bs, 2, "sps_num_extra_ph_bytes");
+	for (i=0; i<sps_num_extra_ph_bits; i++) {
+		if (gf_bs_read_int_log_idx(bs, 1, "extra_ph_bit_present_flag", 1))
+			sps->ph_num_extra_bits++;
+	}
+	u8 sps_num_extra_sh_bits = 8 * gf_bs_read_int_log(bs, 2, "num_extra_sh_bytes");
+	for (i=0; i<sps_num_extra_sh_bits; i++) {
+		if (gf_bs_read_int_log_idx(bs, 1, "extra_sh_bit_present_flag", i))
+			sps->sh_num_extra_bits++;
+	}
+
+	if (sps_ptl_dpb_hrd_params_present_flag) {
+		u8 sps_sublayer_dpb_params_flag = 0;
+		if (sps->max_sublayers>1) {
+			sps_sublayer_dpb_params_flag = gf_bs_read_int_log(bs, 1, "sps_sublayer_dpb_params_flag");
+		}
+		for (i=(sps_sublayer_dpb_params_flag ? 0 : sps->max_sublayers-1); i < sps->max_sublayers; i++ ) {
+			gf_bs_read_ue_log_idx(bs, "dpb_max_dec_pic_buffering_minus1", i);
+			gf_bs_read_ue_log_idx(bs, "dpb_max_num_reorder_pics", i);
+			gf_bs_read_ue_log_idx(bs, "dpb_max_latency_increase_plus1", i);
+		}
+	}
+	gf_bs_read_ue_log(bs, "sps_log2_min_luma_coding_block_size_minus2");
+	sps->partition_constraints_override_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_partition_constraints_override_enabled_flag");
+	gf_bs_read_ue_log(bs, "sps_log2_min_luma_coding_block_size_minus2");
+	u8 sps_max_mtt_hierarchy_depth_intra_slice_luma = gf_bs_read_ue_log(bs, "sps_max_mtt_hierarchy_depth_intra_slice_luma");
+	if (sps_max_mtt_hierarchy_depth_intra_slice_luma != 0) {
+		gf_bs_read_ue_log(bs, "sps_log2_diff_max_bt_min_qt_intra_slice_luma");
+		gf_bs_read_ue_log(bs, "sps_log2_diff_max_tt_min_qt_intra_slice_luma");
+	}
+	u8 sps_qtbtt_dual_tree_intra_flag = 0;
+	if (sps->chroma_format_idc) {
+		sps_qtbtt_dual_tree_intra_flag = gf_bs_read_int_log(bs, 1, "sps_qtbtt_dual_tree_intra_flag");
+	}
+	if (sps_qtbtt_dual_tree_intra_flag) {
+		gf_bs_read_ue_log(bs, "sps_log2_diff_min_qt_min_cb_intra_slice_chroma");
+		u8 sps_max_mtt_hierarchy_depth_intra_slice_chroma = gf_bs_read_ue_log(bs, "sps_max_mtt_hierarchy_depth_intra_slice_chroma");
+		if( sps_max_mtt_hierarchy_depth_intra_slice_chroma != 0) {
+			gf_bs_read_ue_log(bs, "sps_log2_diff_max_bt_min_qt_intra_slice_chroma");
+			gf_bs_read_ue_log(bs, "sps_log2_diff_max_tt_min_qt_intra_slice_chroma");
+		}
+	}
+
+	gf_bs_read_ue_log(bs, "sps_log2_diff_min_qt_min_cb_inter_slice");
+	u8 sps_max_mtt_hierarchy_depth_inter_slice = gf_bs_read_ue_log(bs, "sps_max_mtt_hierarchy_depth_inter_slice");
+	if (sps_max_mtt_hierarchy_depth_inter_slice != 0) {
+		gf_bs_read_ue_log(bs, "sps_log2_diff_max_bt_min_qt_inter_slice");
+		gf_bs_read_ue_log(bs, "sps_log2_diff_max_tt_min_qt_inter_slice");
+	}
+	u8 max_luma_transform_size_64_flag = 0;
+	if (CtbSizeY > 32) {
+		max_luma_transform_size_64_flag = gf_bs_read_int_log(bs, 1, "sps_max_luma_transform_size_64_flag");
+	}
+	sps->transform_skip_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_transform_skip_enabled_flag");
+
+	if (sps->transform_skip_enabled_flag) {
+		gf_bs_read_ue_log(bs, "sps_log2_transform_skip_max_size_minus2");
+		gf_bs_read_int_log(bs, 1, "sps_bdpcm_enabled_flag");
+	}
+	if (gf_bs_read_int_log(bs, 1, "sps_mts_enabled_flag")) {
+		gf_bs_read_int_log(bs, 1, "sps_explicit_mts_intra_enabled_flag");
+		gf_bs_read_int_log(bs, 1, "sps_explicit_mts_inter_enabled_flag");
+	}
+	Bool lfnst_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_lfnst_enabled_flag");
+	sps->joint_cbcr_enabled_flag = 0;
+	if (sps->chroma_format_idc) {
+		sps->joint_cbcr_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_joint_cbcr_enabled_flag");
+		u8 sps_same_qp_table_for_chroma_flag = gf_bs_read_int_log(bs, 1, "sps_same_qp_table_for_chroma_flag");
+		u32 numQpTables = sps_same_qp_table_for_chroma_flag ? 1 : (sps->joint_cbcr_enabled_flag ? 3 : 2);
+		for (i=0; i<numQpTables; i++) {
+			gf_bs_read_se_log_idx(bs, "sps_qp_table_start_minus26", i);
+			u32 j, sps_num_points_in_qp_table = 1 + gf_bs_read_ue_log_idx(bs, "sps_num_points_in_qp_table_minus1", i);
+			for (j=0; j<sps_num_points_in_qp_table; j++) {
+				gf_bs_read_ue_log_idx2(bs, "sps_delta_qp_in_val_minus1", i, j);
+				gf_bs_read_ue_log_idx2(bs, "sps_delta_qp_diff_val", i, j);
+			}
+		}
+	}
+	sps->sao_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_sao_enabled_flag");
+	sps->alf_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_alf_enabled_flag");
+	if (sps->alf_enabled_flag && sps->chroma_format_idc) {
+		sps->ccalf_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_ccalf_enabled_flag");
+	}
+	sps->lmcs_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_lmcs_enabled_flag");
+	sps->weighted_pred_flag = gf_bs_read_int_log(bs, 1, "sps_weighted_pred_flag");
+	sps->weighted_bipred_flag = gf_bs_read_int_log(bs, 1, "sps_weighted_bipred_flag");
+	sps->long_term_ref_pics_flag = gf_bs_read_int_log(bs, 1, "sps_long_term_ref_pics_flag");
+	if (sps->vps_id>0)
+		sps->inter_layer_prediction_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_inter_layer_prediction_enabled_flag");
+	sps->idr_rpl_present_flag = gf_bs_read_int_log(bs, 1, "sps_idr_rpl_present_flag");
+	u32 sps_rpl1_same_as_rpl0 = gf_bs_read_int_log(bs, 1, "sps_rpl1_same_as_rpl0_flag") ? 1: 2;
+	for (i=0; i<sps_rpl1_same_as_rpl0; i++) {
+		u32 j;
+		sps->num_ref_pic_lists[i] = gf_bs_read_ue_log_idx(bs, "sps_num_ref_pic_lists", i);
+		for (j=0; j<sps->num_ref_pic_lists[i]; j++) {
+			s32 res = vvc_parse_ref_pic_list_struct(bs, sps, i, j, &sps->rps[i][j]);
+			if (res<0) return res;
+		}
+	}
+	gf_bs_read_int_log(bs, 1, "sps_ref_wraparound_enabled_flag");
+	sps->temporal_mvp_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_temporal_mvp_enabled_flag");
+	if (sps->temporal_mvp_enabled_flag) {
+		gf_bs_read_int_log(bs, 1, "sps_sbtmvp_enabled_flag");
+	}
+	Bool amvr_enabled = gf_bs_read_int_log(bs, 1, "sps_amvr_enabled_flag");
+	sps->bdof_control_present_in_ph_flag = 0;
+	if (gf_bs_read_int_log(bs, 1, "sps_bdof_enabled_flag")) {
+		sps->bdof_control_present_in_ph_flag = gf_bs_read_int_log(bs, 1, "sps_bdof_control_present_in_ph_flag");
+	}
+	gf_bs_read_int_log(bs, 1, "sps_smvd_enabled_flag");
+	sps->dmvr_control_present_in_ph_flag = 0;
+	if (gf_bs_read_int_log(bs, 1, "sps_dmvr_enabled_flag")) {
+		sps->dmvr_control_present_in_ph_flag = gf_bs_read_int_log(bs, 1, "sps_dmvr_control_present_in_ph_flag");
+	}
+	sps->mmvd_fullpel_only_enabled_flag = 0;
+	if (gf_bs_read_int_log(bs, 1, "sps_mmvd_enabled_flag")) {
+		sps->mmvd_fullpel_only_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_mmvd_fullpel_only_enabled_flag");
+	}
+	u32 MaxNumMergeCand = 6 - gf_bs_read_ue_log(bs, "sps_six_minus_max_num_merge_cand");
+
+	sps->prof_control_present_in_ph_flag = 0;
+	gf_bs_read_int_log(bs, 1, "sps_sbt_enabled_flag");
+	if (gf_bs_read_int_log(bs, 1, "sps_affine_enabled_flag")) {
+		gf_bs_read_ue_log(bs, "sps_five_minus_max_num_subblock_merge_cand");
+		gf_bs_read_int_log(bs, 1, "sps_6param_affine_enabled_flag");
+		if (amvr_enabled) {
+			gf_bs_read_int_log(bs, 1, "sps_affine_amvr_enabled_flag");
+		}
+		if (gf_bs_read_int_log(bs, 1, "sps_affine_prof_enabled_flag")) {
+			sps->prof_control_present_in_ph_flag = gf_bs_read_int_log(bs, 1, "sps_prof_control_present_in_ph_flag");
+		}
+	}
+
+	gf_bs_read_int_log(bs, 1, "sps_bcw_enabled_flag");
+	gf_bs_read_int_log(bs, 1, "sps_ciip_enabled_flag");
+	if (MaxNumMergeCand >= 2) {
+		Bool gpm_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_gpm_enabled_flag");
+		if (gpm_enabled_flag && (MaxNumMergeCand >= 3)) {
+			gf_bs_read_ue_log(bs, "sps_max_num_merge_cand_minus_max_num_gpm_cand");
+		}
+	}
+	gf_bs_read_ue_log(bs, "sps_log2_parallel_merge_level_minus2");
+
+	gf_bs_read_int_log(bs, 1, "sps_isp_enabled_flag");
+	gf_bs_read_int_log(bs, 1, "sps_mrl_enabled_flag");
+	gf_bs_read_int_log(bs, 1, "sps_mip_enabled_flag");
+	if (sps->chroma_format_idc != 0) {
+		gf_bs_read_int_log(bs, 1, "sps_cclm_enabled_flag");
+	}
+	if (sps->chroma_format_idc == 1) {
+		gf_bs_read_int_log(bs, 1, "sps_chroma_horizontal_collocated_flag");
+		gf_bs_read_int_log(bs, 1, "sps_chroma_vertical_collocated_flag");
+	}
+	Bool act_enabled_flag = GF_FALSE;
+	Bool palette_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_palette_enabled_flag");
+	if ((sps->chroma_format_idc == 3) && !max_luma_transform_size_64_flag) {
+		act_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_act_enabled_flag");
+	}
+	if (sps->transform_skip_enabled_flag || palette_enabled_flag) {
+		gf_bs_read_ue_log(bs, "sps_min_qp_prime_ts");
+	}
+	if (gf_bs_read_int_log(bs, 1, "sps_ibc_enabled_flag")) {
+		gf_bs_read_ue_log(bs, "sps_six_minus_max_num_ibc_merge_cand");
+	}
+	if (gf_bs_read_int_log(bs, 1, "sps_ladf_enabled_flag")) {
+		u32 num_ladf_intervals_minus2 = gf_bs_read_int_log(bs, 2, "sps_num_ladf_intervals_minus2");
+		gf_bs_read_se_log(bs, "sps_ladf_lowest_interval_qp_offset");
+		for (i=0; i<num_ladf_intervals_minus2+1; i++) {
+			gf_bs_read_se_log_idx(bs, "sps_ladf_qp_offset", i);
+			gf_bs_read_ue_log_idx(bs, "sps_ladf_delta_threshold_minus1", i);
+		}
+	}
+	sps->explicit_scaling_list_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_explicit_scaling_list_enabled_flag");
+	if (lfnst_enabled_flag && sps->explicit_scaling_list_enabled_flag) {
+		gf_bs_read_int_log(bs, 1, "sps_scaling_matrix_for_lfnst_disabled_flag");
+	}
+	Bool scaling_matrix_for_alternative_colour_space_disabled_flag = 0;
+	if (act_enabled_flag && sps->explicit_scaling_list_enabled_flag) {
+		scaling_matrix_for_alternative_colour_space_disabled_flag = gf_bs_read_int_log(bs, 1, "sps_scaling_matrix_for_alternative_colour_space_disabled_flag");
+	}
+	if (scaling_matrix_for_alternative_colour_space_disabled_flag) {
+		gf_bs_read_int_log(bs, 1, "sps_scaling_matrix_designated_colour_space_flag");
+	}
+	sps->dep_quant_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_dep_quant_enabled_flag");
+	sps->sign_data_hiding_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_sign_data_hiding_enabled_flag");
+	sps->virtual_boundaries_enabled_flag = gf_bs_read_int_log(bs, 1, "sps_virtual_boundaries_enabled_flag");
+	if (sps->virtual_boundaries_enabled_flag) {
+		sps->virtual_boundaries_present_flag = gf_bs_read_int_log(bs, 1, "sps_virtual_boundaries_present_flag");
+		if (sps->virtual_boundaries_present_flag) {
+			u32 num_virtual_boundaries = gf_bs_read_ue_log(bs, "sps_num_ver_virtual_boundaries");
+			for (i=0; i<num_virtual_boundaries; i++) {
+				gf_bs_read_ue_log_idx(bs, "sps_virtual_boundary_pos_x_minus1", i);
+			}
+			num_virtual_boundaries = gf_bs_read_ue_log(bs, "sps_num_hor_virtual_boundaries");
+			for (i=0; i<num_virtual_boundaries; i++) {
+				gf_bs_read_ue_log_idx(bs, "sps_virtual_boundary_pos_y_minus1", i);
+			}
+		}
+	}
+
+	if (sps_ptl_dpb_hrd_params_present_flag) {
+		if (gf_bs_read_int_log(bs, 1, "sps_timing_hrd_params_present_flag")) {
+			Bool general_nal_hrd_params_present_flag, general_vcl_hrd_params_present_flag, general_du_hrd_params_present_flag;
+			u32 hrd_cpb_cnt_minus1=0;
+			u32 sublayer_cpb_params_present_flag = 0;
+			vvc_parse_general_timing_hrd_parameters(bs, sps, NULL, &general_nal_hrd_params_present_flag, &general_vcl_hrd_params_present_flag, &general_du_hrd_params_present_flag, &hrd_cpb_cnt_minus1);
+			if (sps->max_sublayers > 1) {
+				sublayer_cpb_params_present_flag = gf_bs_read_int_log(bs, 1, "sps_sublayer_cpb_params_present_flag");
+			}
+			u32 firstSubLayer = sublayer_cpb_params_present_flag ? 0 : sps->max_sublayers - 1;
+			vvc_parse_ols_timing_hrd_parameters(bs, firstSubLayer, sps->max_sublayers-1, general_nal_hrd_params_present_flag, general_vcl_hrd_params_present_flag, general_du_hrd_params_present_flag, hrd_cpb_cnt_minus1);
+
+		}
+	}
+
+	gf_bs_read_int_log(bs, 1, "sps_field_seq_flag");
+	if (vui_flag_pos) {
+		*vui_flag_pos = (u32)gf_bs_get_bit_offset(bs);
+	}
+	//all this to get to VUI !!!
+	if (gf_bs_read_int_log(bs, 1, "sps_vui_parameters_present_flag")) {
+		gf_bs_read_ue_log(bs, "sps_vui_payload_size_minus1");
+		while (!gf_bs_is_align(bs)) {
+			gf_bs_read_int_log(bs, 1, "sps_vui_alignment_zero_bit");
+		}
+		//vui parameters
+		Bool vui_progressive_source_flag = gf_bs_read_int_log(bs, 1, "vui_progressive_source_flag");
+		Bool vui_interlaced_source_flag = gf_bs_read_int_log(bs, 1, "vui_interlaced_source_flag");
+		gf_bs_read_int_log(bs, 1, "vui_non_packed_constraint_flag");
+		gf_bs_read_int_log(bs, 1, "vui_non_projected_constraint_flag");
+		sps->aspect_ratio_info_present_flag = gf_bs_read_int_log(bs, 1, "vui_aspect_ratio_info_present_flag");
+		if (sps->aspect_ratio_info_present_flag) {
+			gf_bs_read_int_log(bs, 1, "vui_aspect_ratio_constant_flag");
+			sps->sar_idc = gf_bs_read_int_log(bs, 8, "vui_aspect_ratio_idc");
+			if (sps->sar_idc== 0xFF) {
+				sps->sar_width = gf_bs_read_int_log(bs, 16, "vui_sar_width");
+				sps->sar_height = gf_bs_read_int_log(bs, 16, "vui_sar_height");
+			}
+		}
+		sps->overscan_info_present_flag = gf_bs_read_int_log(bs, 1, "vui_overscan_info_present_flag");
+		if (sps->overscan_info_present_flag) {
+			gf_bs_read_int_log(bs, 1, "vui_overscan_appropriate_flag");
+		}
+		sps->colour_description_present_flag = gf_bs_read_int_log(bs, 1, "vui_colour_description_present_flag");
+		if (sps->colour_description_present_flag) {
+			sps->colour_primaries = gf_bs_read_int_log(bs, 8, "vui_colour_primaries");
+			sps->transfer_characteristics = gf_bs_read_int_log(bs, 8, "vui_transfer_characteristics");
+			sps->matrix_coefficients = gf_bs_read_int_log(bs, 8, "vui_matrix_coeffs");
+			sps->video_full_range_flag = gf_bs_read_int_log(bs, 1, "vui_full_range_flag");
+		}
+		if (gf_bs_read_int_log(bs, 1, " vui_chroma_loc_info_present_flag")) {
+			if (vui_progressive_source_flag && !vui_interlaced_source_flag) {
+				gf_bs_read_ue_log(bs, "vui_chroma_sample_loc_type_frame");
+			} else {
+				gf_bs_read_ue_log(bs, "vui_chroma_sample_loc_type_top_field");
+				gf_bs_read_ue_log(bs, "vui_chroma_sample_loc_type_bottom_field");
+			}
+		}
+		//WE DON'T PARSE vui_payload_bit_equal_to_one because we dont parse the rest (sps extensions)
+		//if needed, see rewrite_vui code
+	}
+	return sps_id;
+}
+
+static s32 gf_vvc_read_pps_bs_internal(GF_BitStream *bs, VVCState *vvc)
+{
+	u32 i;
+	s32 pps_id;
+	VVC_PPS *pps;
+
+	//NAL header already read
+	pps_id = gf_bs_read_int_log(bs, 6, "pps_id");
+
+	if ((pps_id < 0) || (pps_id >= 64)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] wrong PPS ID %d in PPS\n", pps_id));
+		return -1;
+	}
+	pps = &vvc->pps[pps_id];
+
+	if (!pps->state) {
+		pps->id = pps_id;
+		pps->state = 1;
+	}
+	pps->sps_id = gf_bs_read_int_log(bs, 4, "sps_id");
+	if (((s32)pps->sps_id<0) || (pps->sps_id >= 16)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] wrong SPS ID %d in PPS\n", pps->sps_id));
+		pps->sps_id=0;
+		return -1;
+	}
+	vvc->sps_active_idx = pps->sps_id; /*set active sps*/
+	pps->mixed_nal_types = gf_bs_read_int_log(bs, 1, "mixed_nal_types");
+	pps->width = gf_bs_read_ue_log(bs, "width");
+	pps->height = gf_bs_read_ue_log(bs, "height");
+	pps->conf_window = gf_bs_read_int_log(bs, 1, "conformance_window_flag");
+	if (pps->conf_window) {
+		pps->cw_left = gf_bs_read_ue_log(bs, "conf_win_left_offset");
+		pps->cw_right = gf_bs_read_ue_log(bs, "conf_win_right_offset");
+		pps->cw_top = gf_bs_read_ue_log(bs, "conf_win_top_offset");
+		pps->cw_bottom = gf_bs_read_ue_log(bs, "conf_win_bottom_offset");
+	}
+	//scaling window
+	if (gf_bs_read_int_log(bs, 1, "scaling_window_explicit_signaling_flag")) {
+		gf_bs_read_se_log(bs, "scaling_win_left_offset");
+		gf_bs_read_se_log(bs, "scaling_win_right_offset");
+		gf_bs_read_se_log(bs, "scaling_win_top_offset");
+		gf_bs_read_se_log(bs, "scaling_win_bottom_offset");
+	}
+	pps->output_flag_present_flag = gf_bs_read_int_log(bs, 1, "output_flag_present_flag");
+	pps->no_pic_partition_flag = gf_bs_read_int_log(bs, 1, "no_pic_partition_flag");
+	pps->subpic_id_mapping_present_flag = gf_bs_read_int_log(bs, 1, "subpic_id_mapping_present_flag");
+	u32 pps_num_subpics = 1;
+	if (pps->subpic_id_mapping_present_flag) {
+		u32 pps_subpic_id_len;
+		if (!pps->no_pic_partition_flag) {
+			pps_num_subpics = 1+gf_bs_read_ue_log(bs, "pps_num_subpics_minus1");
+		}
+		pps_subpic_id_len = 1 + gf_bs_read_ue(bs);
+		for (i=0; i<pps_num_subpics; i++) {
+			gf_bs_read_int_log_idx(bs, pps_subpic_id_len, "subpic_id", i);
+		}
+	}
+	pps->single_slice_per_subpic_flag = 1;
+	pps->num_slices_in_pic = 1;
+
+	pps->num_tiles_in_pic = 0;
+	if (!pps->no_pic_partition_flag) {
+		u32 ctu_size = 5 + gf_bs_read_int_log(bs, 2, "pps_log2_ctu_size_minus5");
+		u32 num_exp_tile_columns = 1 + gf_bs_read_ue_log(bs, "num_exp_tile_columns_minus1");
+		u32 num_exp_tile_rows = 1 + gf_bs_read_ue_log(bs, "num_exp_tile_rows_minus1");
+
+		ctu_size = 1<<ctu_size;
+		pps->pic_width_in_ctbsY = pps->width / ctu_size;
+		if (pps->pic_width_in_ctbsY * ctu_size < pps->width) pps->pic_width_in_ctbsY++;
+		pps->pic_height_in_ctbsY = pps->height / ctu_size;
+		if (pps->pic_height_in_ctbsY * ctu_size < pps->height) pps->pic_height_in_ctbsY++;
+
+		u32 nb_ctb_left = pps->pic_width_in_ctbsY;
+		pps->num_tile_cols=0;
+		u32 nb_ctb_last=0;
+		for (i=0; i<num_exp_tile_columns; i++) {
+			u32 nb_ctb_width = 1 + gf_bs_read_ue_log_idx(bs, "tile_column_width_minus1", i);
+			nb_ctb_left -= nb_ctb_width;
+			pps->tile_cols_width_ctb[i] = nb_ctb_width;
+			nb_ctb_last = nb_ctb_width;
+			pps->num_tile_cols++;
+		}
+		u32 uni_size_ctb = nb_ctb_last;
+		while (nb_ctb_left >= uni_size_ctb) {
+			nb_ctb_left -= uni_size_ctb;
+			pps->tile_cols_width_ctb[pps->num_tile_cols] = uni_size_ctb;
+			pps->num_tile_cols++;
+		}
+		if (nb_ctb_left>0) {
+			pps->tile_cols_width_ctb[pps->num_tile_cols] = nb_ctb_left;
+			pps->num_tile_cols++;
+		}
+
+		nb_ctb_left = pps->pic_height_in_ctbsY;
+		nb_ctb_last=0;
+		pps->num_tile_rows=0;
+		for (i=0; i<num_exp_tile_rows; i++) {
+			u32 nb_ctb_height = 1 + gf_bs_read_ue_log_idx(bs, "tile_row_height_minus1", i);
+			nb_ctb_left -= nb_ctb_height;
+			pps->tile_rows_height_ctb[i] = nb_ctb_height;
+			pps->num_tile_rows++;
+			nb_ctb_last = nb_ctb_height;
+		}
+		uni_size_ctb = nb_ctb_last;
+		while (nb_ctb_left >= uni_size_ctb) {
+			nb_ctb_left -= uni_size_ctb;
+			pps->tile_rows_height_ctb[pps->num_tile_rows] = uni_size_ctb;
+			pps->num_tile_rows++;
+		}
+		if (nb_ctb_left>0) {
+			pps->tile_rows_height_ctb[pps->num_tile_rows] = nb_ctb_left;
+			pps->num_tile_rows++;
+		}
+
+		pps->num_tiles_in_pic = pps->num_tile_cols * pps->num_tile_rows;
+		pps->slice_address_len = gf_get_bit_size(pps->num_tiles_in_pic);
+		if (pps->num_tiles_in_pic > 1) {
+			gf_bs_read_int_log(bs, 1, "pps_loop_filter_across_tiles_enabled_flag");
+			pps->rect_slice_flag = gf_bs_read_int_log(bs, 1, "pps_rect_slice_flag");
+		}
+
+		if (pps->rect_slice_flag) {
+			pps->single_slice_per_subpic_flag = gf_bs_read_int_log(bs, 1, "pps_single_slice_per_subpic_flag");
+			pps->num_slices_in_pic = pps_num_subpics;
+		}
+
+		if (pps->rect_slice_flag && !pps->single_slice_per_subpic_flag) {
+			pps->num_slices_in_pic = 1 + gf_bs_read_ue_log(bs, "pps_num_slices_in_pic_minus1");
+			u8 tile_idx_delta_present_flag = 0;
+			if (pps->num_slices_in_pic > 1) {
+				tile_idx_delta_present_flag = gf_bs_read_int_log(bs, 1, "pps_tile_idx_delta_present_flag");
+			}
+			for (i=0; i<pps->num_slices_in_pic-1; i++) {
+				//TODO FIXME we assume single slice per tile
+				u32 SliceTopLeftTileIdx=0;
+				u32 RowHeightVal=0;
+
+
+				u32 slice_width_in_tiles_minus1=0;
+				u32 slice_height_in_tiles_minus1=0;
+				if (SliceTopLeftTileIdx % pps->num_tile_cols != pps->num_tile_cols - 1) {
+					slice_width_in_tiles_minus1 = gf_bs_read_ue_log_idx(bs, "pps_slice_width_in_tiles_minus1", i);
+				}
+
+				if ( (SliceTopLeftTileIdx / pps->num_tile_cols != pps->num_tile_rows - 1)
+					&& (tile_idx_delta_present_flag || (SliceTopLeftTileIdx % pps->num_tile_cols == 0) )
+				) {
+					slice_height_in_tiles_minus1 = gf_bs_read_ue_log_idx(bs, "pps_slice_height_in_tiles_minus1", i);
+				}
+
+				if (!slice_width_in_tiles_minus1 && !slice_height_in_tiles_minus1 && (RowHeightVal > 1 )
+				) {
+					u32 j, num_exp_slices_in_tile = gf_bs_read_ue_log_idx(bs, "pps_num_exp_slices_in_tile", i);
+					for (j=0; j<num_exp_slices_in_tile; j++) {
+						gf_bs_read_ue_log_idx2 (bs, "pps_exp_slice_height_in_ctus_minus1", i, j);
+					}
+					//TODO FIXME i += NumSlicesInTile[ i ] − 1
+				}
+
+				if (tile_idx_delta_present_flag && (i < pps->num_slices_in_pic)) {
+					gf_bs_read_se_log_idx(bs, "pps_tile_idx_delta_val", i);
+				}
+
+			}
+		}
+		if (!pps->rect_slice_flag || pps->single_slice_per_subpic_flag || (pps->num_slices_in_pic > 1)) {
+			gf_bs_read_int_log(bs, 1, "pps_loop_filter_across_slices_enabled_flag");
+		}
+	}
+
+
+	pps->cabac_init_present_flag = gf_bs_read_int_log(bs, 1, "pps_cabac_init_present_flag");
+	for (i=0; i<2; i++) {
+		pps->num_ref_idx_default_active[i] = 1 + gf_bs_read_ue_log_idx(bs, "pps_num_ref_idx_default_active_minus1", i);
+	}
+	pps->rpl1_idx_present_flag = gf_bs_read_int_log(bs, 1, "pps_rpl1_idx_present_flag");
+	pps->weighted_pred_flag = gf_bs_read_int_log(bs, 1, "pps_weighted_pred_flag");
+	pps->weighted_bipred_flag = gf_bs_read_int_log(bs, 1, "pps_weighted_bipred_flag");
+	if (gf_bs_read_int_log(bs, 1, "pps_ref_wraparound_enabled_flag")) {
+		gf_bs_read_ue_log(bs, "pps_pic_width_minus_wraparound_offset");
+	}
+	gf_bs_read_se_log(bs, "pps_init_qp_minus26");
+	pps->cu_qp_delta_enabled_flag = gf_bs_read_int_log(bs, 1, "pps_cu_qp_delta_enabled_flag");
+	pps->slice_chroma_qp_offsets_present_flag = 0;
+	pps->chroma_tool_offsets_present_flag = gf_bs_read_int_log(bs, 1, "pps_chroma_tool_offsets_present_flag");
+	if (pps->chroma_tool_offsets_present_flag) {
+		gf_bs_read_se_log(bs, "pps_cb_qp_offset");
+		gf_bs_read_se_log(bs, "pps_cr_qp_offset");
+		u8 joint_cbcr_qp_offset_present_flag = gf_bs_read_int_log(bs, 1, "pps_joint_cbcr_qp_offset_present_flag");
+		if (joint_cbcr_qp_offset_present_flag) {
+			gf_bs_read_se_log(bs, "pps_joint_cbcr_qp_offset_value");
+		}
+		pps->slice_chroma_qp_offsets_present_flag = gf_bs_read_int_log(bs, 1, "pps_slice_chroma_qp_offsets_present_flag");
+		pps->cu_chroma_qp_offset_list_enabled_flag = gf_bs_read_int_log(bs, 1, "pps_cu_chroma_qp_offset_list_enabled_flag");
+		if (pps->cu_chroma_qp_offset_list_enabled_flag) {
+			u32 pps_chroma_qp_offset_list_len = 1 + gf_bs_read_ue_log(bs, "pps_chroma_qp_offset_list_len_minus1");
+			for (i=0; i<pps_chroma_qp_offset_list_len; i++) {
+				gf_bs_read_se_log_idx(bs, "pps_cb_qp_offset_list", i);
+				gf_bs_read_se_log_idx(bs, "pps_cr_qp_offset_list", i);
+				if (joint_cbcr_qp_offset_present_flag) {
+					gf_bs_read_se_log_idx(bs, "pps_joint_cbcr_qp_offset_list", i);
+				}
+			}
+		}
+	}
+
+	pps->dbf_info_in_ph_flag = 0;
+	pps->deblocking_filter_disabled_flag = 0;
+	pps->deblocking_filter_override_enabled_flag = 0;
+	if (gf_bs_read_int_log(bs, 1, "pps_deblocking_filter_control_present_flag")) {
+		pps->deblocking_filter_override_enabled_flag = gf_bs_read_int_log(bs, 1, "pps_deblocking_filter_override_enabled_flag");
+		pps->deblocking_filter_disabled_flag = gf_bs_read_int_log(bs, 1, "pps_deblocking_filter_disabled_flag");
+
+		if (!pps->no_pic_partition_flag && pps->deblocking_filter_override_enabled_flag) {
+			pps->dbf_info_in_ph_flag = gf_bs_read_int_log(bs, 1, "pps_dbf_info_in_ph_flag");
+		}
+		if (!pps->deblocking_filter_disabled_flag) {
+			gf_bs_read_se_log(bs, "pps_luma_beta_offset_div2");
+			gf_bs_read_se_log(bs, "pps_luma_tc_offset_div2");
+			if (pps->chroma_tool_offsets_present_flag) {
+				gf_bs_read_se_log(bs, "pps_cb_beta_offset_div2");
+				gf_bs_read_se_log(bs, "pps_cb_tc_offset_div2");
+				gf_bs_read_se_log(bs, "pps_cr_beta_offset_div2");
+				gf_bs_read_se_log(bs, "pps_cr_tc_offset_div2");
+			}
+		}
+	}
+	pps->wp_info_in_ph_flag = 0;
+	pps->qp_delta_info_in_ph_flag = 0;
+	pps->sao_info_in_ph_flag = 0;
+	if (!pps->no_pic_partition_flag) {
+		pps->rpl_info_in_ph_flag = gf_bs_read_int_log(bs, 1, "pps_rpl_info_in_ph_flag");
+		pps->sao_info_in_ph_flag = gf_bs_read_int_log(bs, 1, "pps_sao_info_in_ph_flag");
+		pps->alf_info_in_ph_flag = gf_bs_read_int_log(bs, 1, "pps_alf_info_in_ph_flag");
+		if ( (pps->weighted_pred_flag || pps->weighted_bipred_flag) && pps->rpl_info_in_ph_flag) {
+			pps->wp_info_in_ph_flag = gf_bs_read_int_log(bs, 1, "pps_wp_info_in_ph_flag");
+		}
+		pps->qp_delta_info_in_ph_flag = gf_bs_read_int_log(bs, 1, "pps_qp_delta_info_in_ph_flag");
+	}
+	pps->picture_header_extension_present_flag = gf_bs_read_int_log(bs, 1, "pps_picture_header_extension_present_flag");
+	pps->slice_header_extension_present_flag = gf_bs_read_int_log(bs, 1, "pps_slice_header_extension_present_flag");
+
+	//TODO
+	if (gf_bs_read_int_log(bs, 1, "pps_extension_flag")) {
+		//while ( more_rbsp_data()) bit(1);
+	}
+	//rbsp_trailing_bits()
+	return pps_id;
+}
+
+
+static s32 vvc_parse_ref_pic_lists(GF_BitStream *bs, VVCSliceInfo *si, Bool is_pic_header)
+{
+	u32 i;
+	s32 *p_rpl_idx = is_pic_header ? &si->ph_rpl_idx[0] : &si->rpl_idx[0];
+
+	u8 rpl_sps_flag_prev=0;
+	for (i=0; i<2; i++) {
+		VVC_RefPicList *rpl=NULL;
+		u32 j;
+		u8 rpl_sps_flag=0;
+		u32 rpl_idx = 0;
+		if ((si->sps->num_ref_pic_lists[i]>0) && (!i || si->pps->rpl1_idx_present_flag)) {
+			rpl_sps_flag = gf_bs_read_int_log_idx(bs, 1, "rpl_sps_flag", i);
+		}
+		/*
+		When rpl_sps_flag[ i ] is not present, it is inferred as follows:
+		⎯ If sps_num_ref_pic_lists[ i ] is equal to 0, the value of rpl_sps_flag[ i ] is inferred to be equal to 0.
+		⎯ Otherwise (sps_num_ref_pic_lists[ i ] is greater than 0), when pps_rpl1_idx_present_flag is equal to 0 and i is equal to 1, the value of rpl_sps_flag[ 1 ] is inferred to be equal to rpl_sps_flag[ 0 ].
+		*/
+		else {
+			if (si->sps->num_ref_pic_lists[i]==0) {
+				rpl_sps_flag = 0;
+			} else {
+				rpl_sps_flag = rpl_sps_flag_prev;
+			}
+		}
+		rpl_sps_flag_prev = rpl_sps_flag;
+		if (is_pic_header) {
+			rpl = &si->ph_rpl[i];
+		} else {
+			rpl = &si->rpl[i];
+		}
+
+		if (rpl_sps_flag) {
+			if ((si->sps->num_ref_pic_lists[i]>1) && (!i || si->pps->rpl1_idx_present_flag)) {
+				u32 nb_bits = gf_get_bit_size(si->sps->num_ref_pic_lists[i]);
+				rpl_idx = gf_bs_read_int_log_idx(bs, nb_bits, "rpl_idx", i);
+			}
+			else if (si->sps->num_ref_pic_lists[i] == 1) {
+				rpl_idx = 0;
+			} else {
+				assert(p_rpl_idx[0] != -1);
+				rpl_idx = p_rpl_idx[0];
+			}
+			p_rpl_idx[i] = rpl_idx;
+			if (rpl_idx>=VVC_MAX_REF_PICS) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[VVC] Picture header RplIdx %d greater than max allowed %d\n", rpl_idx, VVC_MAX_REF_PICS));
+				return -1;
+			}
+
+			memcpy(rpl, &si->sps->rps[i][rpl_idx], sizeof(VVC_RefPicList));
+
+		} else {
+			s32 res = vvc_parse_ref_pic_list_struct(bs, si->sps, i, si->sps->num_ref_pic_lists[i], rpl);
+			if (res<0) return res;
+			p_rpl_idx[i] = -1;
+		}
+
+		if (rpl->nb_long_term_pictures) {
+			for (j=0; j<rpl->num_ref_entries; j++) {
+				if (rpl->ref_pic_type[j] != VVC_RPL_LT) continue;
+
+				if (rpl->ltrp_in_header_flag) {
+					gf_bs_read_int_log_idx2(bs, si->sps->log2_max_poc_lsb, "poc_lsb_lt", i, j);
+				}
+				if (gf_bs_read_int_log_idx2(bs, 1, "delta_poc_msb_cycle_present_flag", i, j)) {
+					gf_bs_read_ue_log_idx2(bs, "delta_poc_msb_cycle_lt", i, j);
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+static s32 vvc_pred_weight_table(GF_BitStream *bs, VVCState *vvc, VVCSliceInfo *si, VVC_PPS *pps, VVC_SPS *sps, u32 *num_ref_idx_active)
+{
+	u32 i, num_weights;
+	u8 weights[VVC_MAX_REF_PICS];
+	gf_bs_read_ue_log(bs, "luma_log2_weight_denom");
+	if (sps->chroma_format_idc) {
+		gf_bs_read_se_log(bs, "delta_chroma_log2_weight_denom");
+	}
+	if (pps->wp_info_in_ph_flag) {
+		num_weights = gf_bs_read_ue_log(bs, "num_l0_weights");
+	} else {
+		num_weights = num_ref_idx_active[0];
+	}
+	if (num_weights>VVC_MAX_REF_PICS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] num weights L0 %d greater than max allowed %d\n", num_weights, VVC_MAX_REF_PICS));
+		return -1;
+	}
+
+	memset(weights, 0, sizeof(u8)*VVC_MAX_REF_PICS);
+	for (i=0; i<num_weights; i++) {
+		if (gf_bs_read_int_log_idx(bs, 1, "luma_weight_l0_flag", i))
+			weights[i] |= 1;
+	}
+	if (sps->chroma_format_idc) {
+		for (i=0; i<num_weights; i++) {
+			if (gf_bs_read_int_log_idx(bs, 1, "chroma_weight_l0_flag", i))
+				weights[i] |= 2;
+		}
+	}
+	for (i=0; i<num_weights; i++) {
+		if (weights[i] & 1) {
+			gf_bs_read_se_log_idx(bs, "delta_luma_weight_l0", i);
+			gf_bs_read_se_log_idx(bs, "luma_offset_l0", i);
+		}
+		if (weights[i] & 2) {
+			gf_bs_read_se_log_idx2(bs, "delta_chroma_weight_l0", i, 0);
+			gf_bs_read_se_log_idx2(bs, "delta_chroma_offset_l0", i, 0);
+			gf_bs_read_se_log_idx2(bs, "delta_chroma_weight_l0", i, 1);
+			gf_bs_read_se_log_idx2(bs, "delta_chroma_offset_l0", i, 1);
+		}
+	}
+	num_weights = 0;
+	if (pps->weighted_bipred_flag && pps->wp_info_in_ph_flag && (si->ph_rpl[1].num_ref_entries > 0)) {
+		num_weights = gf_bs_read_ue_log(bs, "num_l1_weights");
+	}
+	if (!num_weights) return 0;
+
+	if (num_weights>VVC_MAX_REF_PICS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] num weights L1 %d greater than max allowed %d\n", num_weights, VVC_MAX_REF_PICS));
+		return -1;
+	}
+
+	memset(weights, 0, sizeof(u8)*VVC_MAX_REF_PICS);
+	for (i=0; i<num_weights; i++) {
+		if (gf_bs_read_int_log_idx(bs, 1, "luma_weight_l1_flag", i))
+			weights[i] |= 1;
+	}
+	if (sps->chroma_format_idc) {
+		for (i=0; i<num_weights; i++) {
+			if (gf_bs_read_int_log_idx(bs, 1, "chroma_weight_l1_flag", i))
+				weights[i] |= 2;
+		}
+	}
+	for (i=0; i<num_weights; i++) {
+		if (weights[i] & 1) {
+			gf_bs_read_se_log_idx(bs, "delta_luma_weight_l1", i);
+			gf_bs_read_se_log_idx(bs, "luma_offset_l1", i);
+		}
+		if (weights[i] & 2) {
+			gf_bs_read_se_log_idx2(bs, "delta_chroma_weight_l1", i, 0);
+			gf_bs_read_se_log_idx2(bs, "delta_chroma_offset_l1", i, 0);
+			gf_bs_read_se_log_idx2(bs, "delta_chroma_weight_l1", i, 1);
+			gf_bs_read_se_log_idx2(bs, "delta_chroma_offset_l1", i, 1);
+		}
+	}
+	return 0;
+}
+
+static s32 vvc_parse_picture_header(GF_BitStream *bs, VVCState *vvc, VVCSliceInfo *si)
+{
+	s32 pps_id;
+
+	si->irap_or_gdr_pic = gf_bs_read_int_log(bs, 1, "irap_or_gdr_pic");
+	si->non_ref_pic = gf_bs_read_int_log(bs, 1, "non_ref_pic");
+	if (si->irap_or_gdr_pic)
+		si->gdr_pic = gf_bs_read_int_log(bs, 1, "gdr_pic");
+
+	si->intra_slice_allowed_flag = 1;
+	if ((si->inter_slice_allowed_flag = gf_bs_read_int_log(bs, 1, "inter_slice_allowed_flag")))
+		si->intra_slice_allowed_flag = gf_bs_read_int_log(bs, 1, "intra_slice_allowed_flag");
+
+	pps_id = gf_bs_read_ue_log(bs, "pps_id");
+	if ((pps_id<0) || (pps_id >= 64))
+		return -1;
+	si->pps = &vvc->pps[pps_id];
+	si->sps = &vvc->sps[si->pps->sps_id];
+	si->poc_lsb = gf_bs_read_int_log(bs, si->sps->log2_max_poc_lsb, "poc_lsb");
+
+	si->recovery_point_valid = 0;
+	si->gdr_recovery_count = 0;
+	if (si->gdr_pic) {
+		si->recovery_point_valid = 1;
+		si->gdr_recovery_count = gf_bs_read_ue_log(bs, "gdr_recovery_count");
+	}
+	gf_bs_read_int_log(bs, si->sps->ph_num_extra_bits, "ph_extra_bits");
+
+	if (si->sps->poc_msb_cycle_flag) {
+		if ( (si->poc_msb_cycle_present_flag = gf_bs_read_int_log(bs, 1, "poc_msb_cycle_present_flag"))) {
+			si->poc_msb_cycle = gf_bs_read_int_log(bs, si->sps->poc_msb_cycle_len, "poc_msb_cycle");
+		}
+	}
+
+	if (si->sps->alf_enabled_flag && si->pps->alf_info_in_ph_flag ) {
+		if (gf_bs_read_int_log(bs, 1, "ph_alf_enabled_flag")) {
+			u32 i, nb_aps_id = gf_bs_read_int_log(bs, 3, "ph_num_alf_aps_ids_luma");
+			for (i=0; i<nb_aps_id; i++) {
+				gf_bs_read_int_log_idx(bs, 3, "ph_alf_aps_id_luma", i);
+			}
+			u8 alf_cb_enabled_flag = 0, alf_cr_enabled_flag=0;
+			if (si->sps->chroma_format_idc) {
+				alf_cb_enabled_flag = gf_bs_read_int_log(bs, 1, "ph_alf_cb_enabled_flag");
+				alf_cr_enabled_flag = gf_bs_read_int_log(bs, 1, "ph_alf_cr_enabled_flag");
+			}
+			if (alf_cb_enabled_flag || alf_cr_enabled_flag) {
+				gf_bs_read_int_log(bs, 3, "ph_alf_aps_id_chroma");
+			}
+			if (si->sps->ccalf_enabled_flag ) {
+				if (gf_bs_read_int_log(bs, 1, "ph_alf_cc_cb_enabled_flag")) {
+					gf_bs_read_int_log(bs, 3, "ph_alf_cc_cb_aps_id");
+				}
+				if (gf_bs_read_int_log(bs, 1, "ph_alf_cc_cr_enabled_flag")) {
+					gf_bs_read_int_log(bs, 3, "ph_alf_cc_cr_aps_id");
+				}
+			}
+		}
+	}
+	si->lmcs_enabled_flag = 0;
+	if (si->sps->lmcs_enabled_flag) {
+		si->lmcs_enabled_flag = gf_bs_read_int_log(bs, 1, "ph_lmcs_enabled_flag");
+		if (si->lmcs_enabled_flag) {
+			gf_bs_read_int_log(bs, 2, "ph_lmcs_aps_id");
+			if (si->sps->chroma_format_idc) {
+				gf_bs_read_int_log(bs, 1, "ph_chroma_residual_scale_flag");
+			}
+		}
+	}
+	si->explicit_scaling_list_enabled_flag = 0;
+	if (si->sps->explicit_scaling_list_enabled_flag) {
+		si->explicit_scaling_list_enabled_flag = gf_bs_read_int_log(bs, 1, "ph_explicit_scaling_list_enabled_flag");
+		if (si->explicit_scaling_list_enabled_flag) {
+			gf_bs_read_int_log(bs, 3, "ph_scaling_list_aps_id");
+		}
+	}
+	if (si->sps->virtual_boundaries_enabled_flag && !si->sps->virtual_boundaries_present_flag) {
+		if (gf_bs_read_int_log(bs, 1, "ph_virtual_boundaries_present_flag")) {
+			u32 i, nb_virt_boundaries = gf_bs_read_ue_log(bs, "ph_num_ver_virtual_boundaries");
+			for (i=0; i<nb_virt_boundaries; i++) {
+				gf_bs_read_ue_log_idx(bs, "ph_virtual_boundary_pos_x_minus1", i);
+			}
+			nb_virt_boundaries = gf_bs_read_ue_log(bs, "ph_num_hor_virtual_boundaries");
+			for (i=0; i<nb_virt_boundaries; i++) {
+				gf_bs_read_ue_log_idx(bs, "ph_virtual_boundary_pos_x_minus1", i);
+			}
+		}
+	}
+	if (si->pps->output_flag_present_flag && !si->non_ref_pic) {
+		gf_bs_read_int_log(bs, 1, "ph_pic_output_flag");
+	}
+	if (si->pps->rpl_info_in_ph_flag) {
+		s32 res = vvc_parse_ref_pic_lists(bs, si, GF_TRUE);
+		if (res<0) return res;
+	}
+	u8 partition_constraints_override_flag = 0;
+	if (si->sps->partition_constraints_override_enabled_flag) {
+		partition_constraints_override_flag = gf_bs_read_int_log(bs, 1, "ph_partition_constraints_override_flag");
+	}
+	if (si->intra_slice_allowed_flag) {
+		if (partition_constraints_override_flag) {
+			gf_bs_read_ue_log(bs, "ph_log2_diff_min_qt_min_cb_inter_slice");
+			u32 max_mtt_hierarchy_depth_inter_slice = gf_bs_read_ue_log(bs, "ph_max_mtt_hierarchy_depth_inter_slice");
+			if (max_mtt_hierarchy_depth_inter_slice) {
+				gf_bs_read_ue_log(bs, "ph_log2_diff_max_bt_min_qt_inter_slice");
+				gf_bs_read_ue_log(bs, "ph_log2_diff_max_tt_min_qt_inter_slice");
+			}
+		}
+		if (si->pps->cu_qp_delta_enabled_flag) {
+			gf_bs_read_ue_log(bs, "ph_cu_qp_delta_subdiv_inter_slice");
+		}
+		if (si->pps->cu_chroma_qp_offset_list_enabled_flag) {
+			gf_bs_read_ue_log(bs, "ph_cu_chroma_qp_offset_subdiv_intra_slice");
+		}
+	}
+	si->temporal_mvp_enabled_flag = 0;
+	if (si->inter_slice_allowed_flag) {
+		if (partition_constraints_override_flag) {
+			gf_bs_read_ue_log(bs, "ph_log2_diff_min_qt_min_cb_inter_slice");
+			u32 max_mtt_hierarchy_depth_inter_slice = gf_bs_read_ue_log(bs, "ph_max_mtt_hierarchy_depth_inter_slice");
+			if (max_mtt_hierarchy_depth_inter_slice) {
+				gf_bs_read_ue_log(bs, "ph_log2_diff_max_bt_min_qt_inter_slice");
+				gf_bs_read_ue_log(bs, "ph_log2_diff_max_tt_min_qt_inter_slice");
+			}
+		}
+		if (si->pps->cu_qp_delta_enabled_flag) {
+			gf_bs_read_ue_log(bs, "ph_cu_qp_delta_subdiv_inter_slice");
+		}
+		if (si->pps->cu_chroma_qp_offset_list_enabled_flag) {
+			gf_bs_read_ue_log(bs, "ph_cu_chroma_qp_offset_subdiv_inter_slice");
+		}
+		if (si->sps->temporal_mvp_enabled_flag) {
+			si->temporal_mvp_enabled_flag = gf_bs_read_int_log(bs, 1, "ph_temporal_mvp_enabled_flag");
+			if (si->temporal_mvp_enabled_flag && si->pps->rpl_info_in_ph_flag) {
+				u8 collocated_from_l0_flag = 1;
+				if (si->ph_rpl[1].num_ref_entries>0)
+					collocated_from_l0_flag = gf_bs_read_int_log(bs, 1, "ph_collocated_from_l0_flag");
+
+				if ( (collocated_from_l0_flag && si->ph_rpl[0].num_ref_entries > 1)
+					|| (!collocated_from_l0_flag && si->ph_rpl[1].num_ref_entries > 1)
+				) {
+					gf_bs_read_ue_log(bs, "ph_collocated_ref_idx");
+				}
+			}
+		}
+		if (si->sps->mmvd_fullpel_only_enabled_flag) {
+			gf_bs_read_int_log(bs, 1, "ph_mmvd_fullpel_only_flag");
+		}
+		u8 presenceFlag = 0;
+		if (!si->pps->rpl_info_in_ph_flag) {
+			presenceFlag = 1;
+		}
+		else if (si->ph_rpl[1].num_ref_entries > 0) {
+			presenceFlag = 1;
+		}
+		if (presenceFlag) {
+			gf_bs_read_int_log(bs, 1, "ph_mvd_l1_zero_flag");
+			if (si->sps->bdof_control_present_in_ph_flag)
+				gf_bs_read_int_log(bs, 1, "ph_bdof_disabled_flag");
+			if (si->sps->dmvr_control_present_in_ph_flag)
+				gf_bs_read_int_log(bs, 1, "ph_dmvr_disabled_flag");
+		}
+		if (si->sps->prof_control_present_in_ph_flag)
+			gf_bs_read_int_log(bs, 1, "ph_prof_disabled_flag");
+
+		if ( (si->pps->weighted_pred_flag || si->pps->weighted_bipred_flag) && si->pps->wp_info_in_ph_flag) {
+			s32 res = vvc_pred_weight_table(bs, vvc, si, si->pps, si->sps, NULL);
+			if (res<0) return res;
+		}
+	}
+	if (si->pps->qp_delta_info_in_ph_flag) {
+		gf_bs_read_se_log(bs, "ph_qp_delta");
+	}
+	if (si->sps->joint_cbcr_enabled_flag) {
+		gf_bs_read_int_log(bs, 1, "ph_joint_cbcr_sign_flag");
+	}
+	if (si->sps->sao_enabled_flag && si->pps->sao_info_in_ph_flag) {
+		gf_bs_read_int_log(bs, 1, "ph_sao_luma_enabled_flag");
+		if (si->sps->chroma_format_idc)
+			gf_bs_read_int_log(bs, 1, "ph_sao_chroma_enabled_flag");
+	}
+	if (si->pps->dbf_info_in_ph_flag) {
+		if (gf_bs_read_int_log(bs, 1, "ph_deblocking_params_present_flag")) {
+			//defaults to 0
+			u8 deblocking_filter_disabled_flag = 0;
+
+			if (!si->pps->deblocking_filter_disabled_flag) {
+				deblocking_filter_disabled_flag = gf_bs_read_int_log(bs, 1, "deblocking_filter_disabled_flag");
+			}
+			if (!deblocking_filter_disabled_flag) {
+				gf_bs_read_se_log(bs, "ph_luma_beta_offset_div2");
+				gf_bs_read_se_log(bs, "ph_luma_tc_offset_div2");
+				if (si->pps->chroma_tool_offsets_present_flag) {
+					gf_bs_read_se_log(bs, "ph_cb_beta_offset_div2");
+					gf_bs_read_se_log(bs, "ph_cb_tc_offset_div2");
+					gf_bs_read_se_log(bs, "ph_cr_beta_offset_div2");
+					gf_bs_read_se_log(bs, "ph_cr_tc_offset_div2");
+				}
+			}
+		}
+	}
+	if (si->pps->picture_header_extension_present_flag) {
+		u32 i=0, num_ext = gf_bs_read_ue_log(bs, "ph_extension_length");
+		while (i<num_ext) {
+			gf_bs_read_int_log_idx(bs, 8, "ph_extension_data_byte", i);
+			i++;
+		}
+	}
+	return 0;
+}
+
+static s32 vvc_get_ctb_info_in_slice(VVCSliceInfo *si, u32 sh_slice_address, u32 sh_num_tiles_in_slice, s32 ctu_index)
+{
+	if (si->pps->rect_slice_flag) {
+/*
+	TODO
+		u32 picLevelSliceIdx = sh_slice_address;
+		for (j=0; j<CurrSubpicIdx; j++) {
+			picLevelSliceIdx += NumSlicesInSubpic[j];
+
+		u32 NumCtusInCurrSlice = NumCtusInSlice[picLevelSliceIdx];
+		for (i=0; i<NumCtusInCurrSlice; i++)
+			CtbAddrInCurrSlice[i] = CtbAddrInSlice[ picLevelSliceIdx ][ i ]
+*/
+
+	} else {
+		u32 i, tidx, NumCtusInCurrSlice = 0;
+
+		for (tidx=sh_slice_address; tidx < sh_slice_address + sh_num_tiles_in_slice; tidx++) {
+			u32 ctb_y, ctb_x;
+			u32 tileX = tidx % si->pps->num_tile_cols;
+			u32 tileY = tidx / si->pps->num_tile_cols;
+			u32 min_ctbx=0;
+			u32 max_ctbx=0;
+			u32 min_ctby=0;
+			u32 max_ctby=0;
+
+			for (i=0; i<tileY; i++) min_ctby += si->pps->tile_rows_height_ctb[i];
+			max_ctby = min_ctby + si->pps->tile_rows_height_ctb[i];
+
+			for (i=0; i<tileX; i++) min_ctbx += si->pps->tile_cols_width_ctb[i];
+			max_ctbx = min_ctbx + si->pps->tile_cols_width_ctb[i];
+
+
+			for (ctb_y=min_ctby; ctb_y < max_ctby; ctb_y++) {
+				for (ctb_x=min_ctbx; ctb_x < max_ctbx; ctb_x++) {
+					if (ctu_index>=0) {
+						if (ctu_index == NumCtusInCurrSlice)
+							return ctb_y * si->pps->pic_width_in_ctbsY + ctb_x;
+					}
+					NumCtusInCurrSlice++;
+				}
+			}
+		}
+		if (ctu_index>=0) return -1;
+		return NumCtusInCurrSlice;
+	}
 	return -1;
 }
+
+static u32 vvc_ctb_to_tile_row_bd(VVCSliceInfo *si, u32 ctb_addr_y)
+{
+	u32 i, tile_y = 0;
+	u32 tile_row_bd_val = 0;
+
+	for (i=0; i <= si->pps->pic_height_in_ctbsY; i++) {
+		if (i == tile_row_bd_val + si->pps->tile_rows_height_ctb[tile_y]) {
+			tile_row_bd_val += si->pps->tile_rows_height_ctb[tile_y];
+			tile_y++;
+		}
+		if (ctb_addr_y == i) return tile_row_bd_val;
+	}
+	return 0;
+}
+
+static u32 vvc_ctb_to_tile_col_bd(VVCSliceInfo *si, u32 ctb_addr_x)
+{
+	u32 i, tile_x = 0;
+	u32 tile_col_bd_val = 0;
+	for (i=0; i <= si->pps->pic_width_in_ctbsY; i++) {
+		if (i == tile_col_bd_val + si->pps->tile_cols_width_ctb[tile_x] ) {
+			tile_col_bd_val += si->pps->tile_cols_width_ctb[tile_x];
+			tile_x++;
+		}
+		if (ctb_addr_x == i) return tile_col_bd_val;
+	}
+	return 0;
+}
+
+static u32 vvc_get_num_entry_points(VVCSliceInfo *si, u32 sh_slice_address, u32 sh_num_tiles_in_slice)
+{
+	if (!si->sps->entry_point_offsets_present_flag) return 0;
+
+	u32 nb_entry_points = 0;
+	u32 prev_ctb_addr_y=0;
+	u32 prev_ctb_to_tile_row_bd, prev_ctb_to_tile_col_bd;
+	s32 i;
+	s32 nb_ctus_in_slice = vvc_get_ctb_info_in_slice(si, sh_slice_address, sh_num_tiles_in_slice, -1);
+	if (nb_ctus_in_slice<0) return 0;
+
+	for (i=0; i < nb_ctus_in_slice; i++ ) {
+		s32 addr;
+		u32 ctb_addr_x, ctb_addr_y;
+		u32 ctb_to_tile_row_bd, ctb_to_tile_col_bd;
+
+		addr = vvc_get_ctb_info_in_slice(si, sh_slice_address, sh_num_tiles_in_slice, i);
+		if (addr<0) return 0;
+		ctb_addr_x = (u32) ( addr % si->pps->pic_width_in_ctbsY );
+		ctb_addr_y = (u32) ( addr / si->pps->pic_width_in_ctbsY );
+
+		ctb_to_tile_row_bd = vvc_ctb_to_tile_row_bd(si, ctb_addr_y);
+		ctb_to_tile_col_bd = vvc_ctb_to_tile_col_bd(si, ctb_addr_x);
+
+		if (i) {
+
+			if ( ctb_to_tile_row_bd != prev_ctb_to_tile_row_bd
+				|| ctb_to_tile_col_bd != prev_ctb_to_tile_col_bd
+				|| ((ctb_addr_y != prev_ctb_addr_y) && si->sps->entropy_coding_sync_enabled_flag)
+			) {
+				nb_entry_points++;
+			}
+
+		}
+
+		prev_ctb_addr_y = ctb_addr_y;
+		prev_ctb_to_tile_row_bd = ctb_to_tile_row_bd;
+		prev_ctb_to_tile_col_bd = ctb_to_tile_col_bd;
+	}
+	return nb_entry_points;
+}
+
+static s32 vvc_parse_slice(GF_BitStream *bs, VVCState *vvc, VVCSliceInfo *si)
+{
+	u32 i, slice_address=0, num_tiles_in_slice=1;
+
+	si->picture_header_in_slice_header_flag = gf_bs_read_int_log(bs, 1, "picture_header_in_slice_header_flag");
+	if (si->picture_header_in_slice_header_flag) {
+		s32 res = vvc_parse_picture_header(bs, vvc, si);
+		if (res<0) return res;
+	}
+	if (!si->sps) return -1;
+	if (!si->pps) return -1;
+	si->slice_type = GF_VVC_SLICE_TYPE_I;
+	if (si->sps->subpic_info_present) {
+		gf_bs_read_int_log(bs, si->sps->subpicid_len, "subpic_id");
+	}
+
+	if (si->pps->rect_slice_flag) {
+		if ((si->sps->nb_subpics==1) && (si->pps->num_slices_in_pic<=1)) {
+
+		} else {
+			if (vvc->parse_mode==1) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[VVC] sub-picture parsing not yet implemented, wrong slice header size estimation (result might be non-compliant) - patch welcome\n"));
+
+				gf_bs_align(bs);
+				si->payload_start_offset = (u32) gf_bs_get_position(bs);
+				return -2;
+			}
+			if (vvc->parse_mode) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[VVC] sub-picture parsing not supported, aborting slice header parsing - patch welcome\n"));
+			}
+			return 0;
+			//TODO
+	// update CurrSubpicIdx
+	//		if (NumSlicesInSubpic[CurrSubpicIdx] > 1) {
+	//			sh_slice_address
+	//		}
+		}
+	} else {
+		if (si->pps->num_tiles_in_pic > 1) {
+			slice_address = gf_bs_read_int_log(bs, si->pps->slice_address_len, "sh_slice_address");
+		}
+	}
+
+	gf_bs_read_int_log(bs, si->sps->sh_num_extra_bits, "num_extra_bits");
+
+	if (!si->pps->rect_slice_flag && (si->pps->num_tiles_in_pic - slice_address > 1)) {
+		num_tiles_in_slice = 1 + gf_bs_read_ue_log(bs, "sh_num_tiles_in_slice_minus1");
+	}
+
+	if (si->inter_slice_allowed_flag )
+		si->slice_type = gf_bs_read_ue_log(bs, "slice_type");
+
+	if (!vvc->parse_mode) return 0;
+
+	switch (si->nal_unit_type) {
+	case GF_VVC_NALU_SLICE_IDR_W_RADL:
+	case GF_VVC_NALU_SLICE_IDR_N_LP:
+	case GF_VVC_NALU_SLICE_CRA:
+	case GF_VVC_NALU_SLICE_GDR:
+		gf_bs_read_int_log(bs, 1, "sh_no_output_of_prior_pics_flag");
+		break;
+	}
+	if (si->sps->alf_enabled_flag && !si->pps->alf_info_in_ph_flag) {
+		if (gf_bs_read_int_log(bs, 1, "sh_alf_enabled_flag")) {
+			u32 nb_vals = gf_bs_read_int_log(bs, 3, "sh_num_alf_aps_ids_luma");
+			for (i=0; i<nb_vals; i++) {
+				gf_bs_read_int_log(bs, 3, "sh_alf_aps_id_luma");
+			}
+			u8 sh_alf_cb_enabled_flag = 0;
+			u8 sh_alf_cr_enabled_flag = 0;
+			if (si->sps->chroma_format_idc) {
+				sh_alf_cb_enabled_flag = gf_bs_read_int_log(bs, 1, "sh_alf_cb_enabled_flag");
+				sh_alf_cr_enabled_flag = gf_bs_read_int_log(bs, 1, "sh_alf_cr_enabled_flag");
+			}
+			if (sh_alf_cb_enabled_flag || sh_alf_cr_enabled_flag) {
+				gf_bs_read_int_log(bs, 3, "sh_alf_aps_id_chroma");
+			}
+			if (si->sps->ccalf_enabled_flag) {
+				if (gf_bs_read_int_log(bs, 1, "sh_alf_cc_cb_enabled_flag")) {
+					gf_bs_read_int_log(bs, 3, "sh_alf_cc_cb_aps_id");
+				}
+				if (gf_bs_read_int_log(bs, 1, "sh_alf_cc_cr_enabled_flag")) {
+					gf_bs_read_int_log(bs, 3, "sh_alf_cc_cr_aps_id");
+				}
+			}
+		}
+	}
+	if (si->lmcs_enabled_flag && !si->picture_header_in_slice_header_flag) {
+		gf_bs_read_int_log(bs, 1, "sh_lmcs_used_flag");
+	}
+	if (si->explicit_scaling_list_enabled_flag && !si->picture_header_in_slice_header_flag) {
+		gf_bs_read_int_log(bs, 3, "sh_explicit_scaling_list_used_flag");
+	}
+
+	if (si->pps->rpl_info_in_ph_flag) {
+		si->rpl[0] = si->ph_rpl[0];
+		si->rpl[1] = si->ph_rpl[1];
+	} else {
+		memset(&si->rpl[0], 0, sizeof(VVC_RefPicList));
+		memset(&si->rpl[1], 0, sizeof(VVC_RefPicList));
+	}
+
+	if (!si->pps->rpl_info_in_ph_flag
+		&& ( ( (si->nal_unit_type != GF_VVC_NALU_SLICE_IDR_N_LP) && (si->nal_unit_type != GF_VVC_NALU_SLICE_IDR_W_RADL) ) || si->sps->idr_rpl_present_flag)
+	) {
+		s32 res = vvc_parse_ref_pic_lists(bs, si, GF_FALSE);
+		if (res<0) return (vvc->parse_mode==1) ? res : 0;
+	}
+
+	u32 num_ref_idx_active[2] = {0, 0};
+
+	if (
+		((si->slice_type != GF_VVC_SLICE_TYPE_I) && (si->rpl[0].num_ref_entries > 1) )
+		|| ((si->slice_type == GF_VVC_SLICE_TYPE_B) && (si->rpl[1].num_ref_entries > 1))
+	) {
+		if (gf_bs_read_int_log(bs, 1, "sh_num_ref_idx_active_override_flag")) {
+			//L0
+			u32 nb_active = 0;
+			if (si->rpl[0].num_ref_entries>1) {
+				nb_active = 1 + gf_bs_read_ue_log_idx(bs, "sh_num_ref_idx_active_minus1", 0);
+			}
+			num_ref_idx_active[0] = nb_active;
+			//L1
+			if (si->slice_type == GF_VVC_SLICE_TYPE_B) {
+				nb_active = 0;
+				if (si->rpl[1].num_ref_entries>1) {
+					nb_active = 1 + gf_bs_read_ue_log_idx(bs, "sh_num_ref_idx_active_minus1", 1);
+				}
+				num_ref_idx_active[1] = nb_active;
+			} else {
+				num_ref_idx_active[1] = 0;
+			}
+		} else {
+			if (si->rpl[0].num_ref_entries >= si->pps->num_ref_idx_default_active[0]) {
+				num_ref_idx_active[0] = si->pps->num_ref_idx_default_active[0];
+			} else {
+				num_ref_idx_active[0] = si->rpl[0].num_ref_entries;
+			}
+			if (si->slice_type == GF_VVC_SLICE_TYPE_B) {
+				if (si->rpl[1].num_ref_entries >= si->pps->num_ref_idx_default_active[1]) {
+					num_ref_idx_active[1] = si->pps->num_ref_idx_default_active[1];
+				} else {
+					num_ref_idx_active[1] = si->rpl[1].num_ref_entries;
+				}
+			} else {
+				num_ref_idx_active[1] = 0;
+			}
+		}
+	} else {
+ num_ref_idx_active[0] = (si->slice_type == GF_VVC_SLICE_TYPE_I) ? 0 : 1;
+ num_ref_idx_active[1] = (si->slice_type == GF_VVC_SLICE_TYPE_B) ? 1 : 0;
+	}
+
+	if (si->slice_type != GF_VVC_SLICE_TYPE_I) {
+		if (si->pps->cabac_init_present_flag)
+			gf_bs_read_int_log(bs, 1, "sh_cabac_init_flag");
+
+		if (si->temporal_mvp_enabled_flag && !si->pps->rpl_info_in_ph_flag) {
+			u8 collocated_from_l0_flag = 0;
+			if (si->slice_type == GF_VVC_SLICE_TYPE_B) {
+				collocated_from_l0_flag = gf_bs_read_int_log(bs, 1, "sh_collocated_from_l0_flag");
+			}
+			if ( (collocated_from_l0_flag && (num_ref_idx_active[0] > 1))
+				|| (!collocated_from_l0_flag && (num_ref_idx_active[1] > 1))
+			) {
+				gf_bs_read_ue_log(bs, "sh_collocated_ref_idx");
+			}
+		}
+		if (!si->pps->wp_info_in_ph_flag
+			&& (
+				(si->pps->weighted_pred_flag && (si->slice_type == GF_VVC_SLICE_TYPE_P) )
+				|| (si->pps->weighted_bipred_flag && (si->slice_type == GF_VVC_SLICE_TYPE_B))
+			)
+		) {
+			s32 res = vvc_pred_weight_table(bs, vvc, si, si->pps, si->sps, num_ref_idx_active);
+			if (res<0) return (vvc->parse_mode==1) ? res : 0;
+		}
+	}
+	if (!si->pps->qp_delta_info_in_ph_flag) {
+		gf_bs_read_se_log(bs, "sh_qp_delta");
+	}
+	if (si->pps->slice_chroma_qp_offsets_present_flag) {
+		gf_bs_read_se_log(bs, "sh_cb_qp_offset");
+		gf_bs_read_se_log(bs, "sh_cr_qp_offset");
+		if (si->sps->joint_cbcr_enabled_flag)
+			gf_bs_read_se_log(bs, "sh_joint_cbcr_qp_offset");
+	}
+	if (si->pps->cu_chroma_qp_offset_list_enabled_flag)
+		gf_bs_read_int_log(bs, 1, "sh_cu_chroma_qp_offset_enabled_flag");
+	if (si->sps->sao_enabled_flag && !si->pps->sao_info_in_ph_flag) {
+		gf_bs_read_int_log(bs, 1, "sh_sao_luma_used_flag");
+		if (si->sps->chroma_format_idc)
+			gf_bs_read_int_log(bs, 1, "sh_sao_chroma_used_flag");
+	}
+
+	if (si->pps->deblocking_filter_override_enabled_flag && !si->pps->dbf_info_in_ph_flag) {
+		if (gf_bs_read_int_log(bs, 1, "sh_deblocking_params_present_flag")) {
+			u8 deblocking_params_present_flag=0;
+			if (!si->pps->deblocking_filter_disabled_flag) {
+				deblocking_params_present_flag = gf_bs_read_int_log(bs, 1, "sh_deblocking_filter_disabled_flag");
+			}
+			if (deblocking_params_present_flag) {
+				gf_bs_read_se_log(bs, "sh_luma_beta_offset_div2");
+				gf_bs_read_se_log(bs, "sh_luma_tc_offset_div2");
+				if (si->pps->chroma_tool_offsets_present_flag) {
+					gf_bs_read_se_log(bs, "sh_cb_beta_offset_div2");
+					gf_bs_read_se_log(bs, "sh_cb_tc_offset_div2");
+					gf_bs_read_se_log(bs, "sh_cr_beta_offset_div2");
+					gf_bs_read_se_log(bs, "sh_cr_tc_offset_div2");
+				}
+			}
+		}
+	}
+
+	u8 dep_quant_used_flag = 0;
+	if (si->sps->dep_quant_enabled_flag) {
+		dep_quant_used_flag = gf_bs_read_int_log(bs, 1, "sh_dep_quant_used_flag");
+	}
+	u8 sign_data_hiding_used_flag = 0;
+	if (si->sps->sign_data_hiding_enabled_flag && !dep_quant_used_flag) {
+		sign_data_hiding_used_flag = gf_bs_read_int_log(bs, 1, "sh_sign_data_hiding_used_flag");
+	}
+	u8 ts_residual_coding_disabled_flag = 0;
+	if (si->sps->transform_skip_enabled_flag && !dep_quant_used_flag && !sign_data_hiding_used_flag) {
+		ts_residual_coding_disabled_flag = gf_bs_read_int_log(bs, 1, "sh_ts_residual_coding_disabled_flag");
+	}
+	if (!ts_residual_coding_disabled_flag && si->sps->ts_residual_coding_rice_present_in_sh_flag) {
+		gf_bs_read_int_log(bs, 3, "sh_ts_residual_coding_rice_idx_minus1");
+	}
+	if (si->sps->reverse_last_sig_coeff_enabled_flag) {
+		gf_bs_read_int_log(bs, 1, "sh_reverse_last_sig_coeff_flag");
+	}
+	if (si->pps->slice_header_extension_present_flag) {
+		u32 j=0, slice_header_extension_length = gf_bs_read_ue_log(bs, "sh_slice_header_extension_length");
+		while (j<slice_header_extension_length) {
+			gf_bs_read_int_log_idx(bs, 8, "sh_slice_header_extension_data_byte", j);
+			j++;
+		}
+	}
+
+	if (!si->pps->rect_slice_flag && !si->pps->num_tile_cols && !si->pps->num_tile_rows) {
+	} else {
+		if (si->sps->entry_point_offsets_present_flag && si->pps->rect_slice_flag) {
+			if (vvc->parse_mode==1) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[VVC] Entry point offsets parsing for sub-picture not yet implemented, wrong slice header size estimation (result might be non-compliant) - patch welcome\n"));
+
+				gf_bs_align(bs);
+				si->payload_start_offset = (u32) gf_bs_get_position(bs);
+				return -2;
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[VVC] Entry point offsets parsing for sub-picture not yet implemented, aborting slice header parsing - patch welcome\n"));
+			return 0;
+		}
+
+		u32 nb_entry_points = vvc_get_num_entry_points(si, slice_address, num_tiles_in_slice);
+		if (nb_entry_points) {
+			u32 nb_bits = 1 + gf_bs_read_ue_log(bs, "sh_entry_offset_len_minus1");
+			for (i=0; i<nb_entry_points; i++) {
+				gf_bs_read_int_log_idx(bs, nb_bits, "sh_entry_point_offset_minus1", i);
+			}
+		}
+	}
+
+	u8 align_bit = gf_bs_read_int(bs, 1);
+	if (align_bit != 1) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[VVC] Align bit at end of slice header not set to 1 !\n"));
+		//return error only for strict mdoe
+		if (vvc->parse_mode==1) {
+			return -1;
+		}
+	}
+	gf_bs_align(bs);
+	//end of slice header
+	si->payload_start_offset = (u32) gf_bs_get_position(bs);
+	return 0;
+}
+
+static void vvc_compute_poc(VVCSliceInfo *si, Bool poc_reset)
+{
+	u32 max_poc_lsb = 1 << (si->sps->log2_max_poc_lsb);
+
+	if (si->poc_msb_cycle_present_flag) {
+		si->poc_msb = si->poc_msb_cycle * max_poc_lsb;
+	} else if (poc_reset) {
+		si->poc_msb = 0;
+	} else {
+		if ((si->poc_lsb < si->poc_lsb_prev) && (si->poc_lsb_prev - si->poc_lsb >= max_poc_lsb / 2))
+			si->poc_msb = si->poc_msb_prev + max_poc_lsb;
+		else if ((si->poc_lsb > si->poc_lsb_prev) && (si->poc_lsb - si->poc_lsb_prev > max_poc_lsb / 2))
+			si->poc_msb = si->poc_msb_prev - max_poc_lsb;
+		else
+			si->poc_msb = si->poc_msb_prev;
+	}
+
+	si->poc = si->poc_msb + si->poc_lsb;
+}
+
+
+GF_EXPORT
+s32 gf_vvc_parse_nalu_bs(GF_BitStream *bs, VVCState *vvc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
+{
+	Bool is_slice = GF_FALSE;
+	s32 ret = -1;
+	Bool poc_reset = GF_FALSE;
+	VVCSliceInfo n_state;
+
+	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
+	if (gf_bs_available(bs)<2) return -1;
+	gf_bs_mark_overflow(bs, GF_TRUE);
+
+	memcpy(&n_state, &vvc->s_info, sizeof(VVCSliceInfo));
+	if (!vvc_parse_nal_header(bs, nal_unit_type, temporal_id, layer_id)) return -1;
+
+	n_state.nal_unit_type = *nal_unit_type;
+
+	switch (n_state.nal_unit_type) {
+	case GF_VVC_NALU_ACCESS_UNIT:
+	case GF_VVC_NALU_END_OF_SEQ:
+	case GF_VVC_NALU_END_OF_STREAM:
+		//don't restore slice info, we don't have any change and n_state.poc_lsb / n_state.poc_msb is not valid
+		vvc->s_info.nal_unit_type = n_state.nal_unit_type;
+		return 1;
+
+	case GF_VVC_NALU_SLICE_IDR_W_RADL:
+	case GF_VVC_NALU_SLICE_IDR_N_LP:
+		poc_reset = GF_TRUE;
+	case GF_VVC_NALU_SLICE_TRAIL:
+	case GF_VVC_NALU_SLICE_STSA:
+	case GF_VVC_NALU_SLICE_RADL:
+	case GF_VVC_NALU_SLICE_RASL:
+	case GF_VVC_NALU_SLICE_CRA:
+	case GF_VVC_NALU_SLICE_GDR:
+		/* slice - read the info and compare.*/
+		ret = vvc_parse_slice(bs, vvc, &n_state);
+		if (ret < 0) {
+			memcpy(&vvc->s_info, &n_state, sizeof(VVCSliceInfo));
+			return ret;
+		}
+		
+		ret = 0;
+		if (n_state.compute_poc_defer || n_state.picture_header_in_slice_header_flag) {
+			is_slice = GF_TRUE;
+			n_state.compute_poc_defer = 0;
+
+			vvc_compute_poc(&n_state, poc_reset);
+			if (vvc->s_info.poc != n_state.poc) {
+				ret = 1;
+				break;
+			}
+			if (!(*layer_id) || (n_state.prev_layer_id_plus1 && ((*layer_id) <= n_state.prev_layer_id_plus1 - 1))) {
+				ret = 1;
+				break;
+			}
+		}
+		break;
+
+	case GF_VVC_NALU_PIC_HEADER:
+		if (vvc_parse_picture_header(bs, vvc, &n_state)<0) {
+			ret = -1;
+			break;
+		}
+		is_slice = GF_TRUE;
+
+		//we cannot compute poc until we know the first picture unit type, since IDR will reset poc count
+		//and irap_or_gdr_pic=0 does not prevent IDR from following
+		n_state.compute_poc_defer = 1;
+
+		if (!(*layer_id) || (n_state.prev_layer_id_plus1 && ((*layer_id) <= n_state.prev_layer_id_plus1 - 1))) {
+			ret = 1;
+		}
+		break;
+	case GF_VVC_NALU_SEQ_PARAM:
+		vvc->last_parsed_sps_id = gf_vvc_read_sps_bs_internal(bs, vvc, *layer_id, NULL);
+		ret = (vvc->last_parsed_sps_id>=0) ? 0 : -1;
+		break;
+	case GF_VVC_NALU_PIC_PARAM:
+		vvc->last_parsed_pps_id = gf_vvc_read_pps_bs_internal(bs, vvc);
+		ret = (vvc->last_parsed_pps_id>=0) ? 0 : -1;
+		break;
+	case GF_VVC_NALU_VID_PARAM:
+		vvc->last_parsed_vps_id = gf_vvc_read_vps_bs_internal(bs, vvc, GF_FALSE);
+		ret = (vvc->last_parsed_vps_id>=0) ? 0 : -1;
+		break;
+	case GF_VVC_NALU_DEC_PARAM:
+		ret = 0;
+		break;
+	case GF_VVC_NALU_APS_PREFIX:
+		//we use the mix aps type + aps id (first 8 bits) as unique identifier
+		vvc->last_parsed_aps_id = gf_bs_read_int_log(bs, 8, "aps_id");
+		ret = 0;
+		break;
+	default:
+		ret = 0;
+		break;
+	}
+	if (gf_bs_is_overflow(bs)) ret = -1;
+
+	/* save current POC lsb/msb to prev values */
+	if ((ret>0) && vvc->s_info.sps) {
+		if (!n_state.compute_poc_defer) {
+			n_state.poc_lsb_prev = n_state.poc_lsb;
+			n_state.poc_msb_prev = n_state.poc_msb;
+		}
+		if (is_slice)
+			n_state.prev_layer_id_plus1 = *layer_id + 1;
+	}
+
+	memcpy(&vvc->s_info, &n_state, sizeof(VVCSliceInfo));
+
+	return ret;
+}
+
+GF_EXPORT
+s32 gf_vvc_parse_nalu(u8 *data, u32 size, VVCState *vvc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
+{
+	GF_BitStream *bs = NULL;
+	s32 ret;
+
+	if (size<2) return -1;
+
+	if (!vvc) {
+		if (nal_unit_type) (*nal_unit_type) = data[1] >> 3;
+		if (layer_id) (*layer_id) = data[0] & 0x3f;
+		if (temporal_id) (*temporal_id) = (data[1] & 0x7);
+		return -1;
+	}
+	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	if (!bs) return -1;
+	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
+
+	ret = gf_vvc_parse_nalu_bs(bs, vvc, nal_unit_type, temporal_id, layer_id);
+	gf_bs_del(bs);
+	return ret;
+}
+
+Bool gf_vvc_slice_is_ref(VVCState *vvc)
+{
+	if (!vvc->s_info.irap_or_gdr_pic) {
+		return GF_FALSE;
+	}
+	if (vvc->s_info.gdr_pic) {
+		if (vvc->s_info.recovery_point_valid) {
+			vvc->s_info.recovery_point_valid = 0;
+			return GF_TRUE;
+		}
+		return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
+
+GF_EXPORT
+GF_Err gf_vvc_change_vui(GF_VVCConfig *vvcc, GF_VUIInfo *vui_info)
+{
+	GF_BitStream *orig, *mod;
+	VVCState *vvc;
+	u32 i, bit_offset, flag;
+	s32 idx;
+	GF_NALUFFParamArray *spss;
+	GF_NALUFFParam *slc;
+	orig = NULL;
+
+	GF_SAFEALLOC(vvc, VVCState);
+	if (!vvc) return GF_OUT_OF_MEM;
+	vvc->sps_active_idx = -1;
+
+	i = 0;
+	spss = NULL;
+	while ((spss = (GF_NALUFFParamArray *)gf_list_enum(vvcc->param_array, &i))) {
+		if (spss->type == GF_VVC_NALU_SEQ_PARAM)
+			break;
+		spss = NULL;
+	}
+	if (!spss) {
+		gf_free(vvc);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	i = 0;
+	while ((slc = (GF_NALUFFParam *)gf_list_enum(spss->nalus, &i))) {
+		u8 *no_emulation_buf;
+		u32 no_emulation_buf_size, emulation_bytes;
+		u8 nal_unit_type, temporal_id, layer_id;
+
+		/*SPS may still contains emulation bytes*/
+		no_emulation_buf = gf_malloc((slc->size) * sizeof(char));
+		no_emulation_buf_size = gf_media_nalu_remove_emulation_bytes(slc->data, no_emulation_buf, slc->size);
+
+		orig = gf_bs_new(no_emulation_buf, no_emulation_buf_size, GF_BITSTREAM_READ);
+		vvc_parse_nal_header(orig, &nal_unit_type, &temporal_id, &layer_id);
+		idx = gf_vvc_read_sps_bs_internal(orig, vvc, layer_id, &bit_offset);
+
+		if (idx < 0) {
+			if (orig)
+				gf_bs_del(orig);
+			gf_free(no_emulation_buf);
+			gf_bs_del(orig);
+			continue;
+		}
+
+		gf_bs_seek(orig, 0);
+		mod = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		/*copy over till vui flag*/
+		assert(bit_offset >= 0);
+		while (bit_offset) {
+			flag = gf_bs_read_int(orig, 1);
+			gf_bs_write_int(mod, flag, 1);
+			bit_offset--;
+		}
+
+		avc_hevc_vvc_rewrite_vui(vui_info, orig, mod, GF_TRUE);
+
+		/*finally copy over remaining*/
+		while (gf_bs_bits_available(orig)) {
+			flag = gf_bs_read_int(orig, 1);
+			gf_bs_write_int(mod, flag, 1);
+		}
+		gf_bs_del(orig);
+		orig = NULL;
+		gf_free(no_emulation_buf);
+
+		/*set anti-emulation*/
+		gf_bs_get_content(mod, &no_emulation_buf, &no_emulation_buf_size);
+		emulation_bytes = gf_media_nalu_emulation_bytes_add_count(no_emulation_buf, no_emulation_buf_size);
+		if (no_emulation_buf_size + emulation_bytes > slc->size)
+			slc->data = (char*)gf_realloc(slc->data, no_emulation_buf_size + emulation_bytes);
+
+		slc->size = gf_media_nalu_add_emulation_bytes(no_emulation_buf, slc->data, no_emulation_buf_size);
+
+		gf_bs_del(mod);
+		gf_free(no_emulation_buf);
+	}
+	gf_free(vvc);
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_vvc_change_par(GF_VVCConfig *vvcc, s32 ar_n, s32 ar_d)
+{
+	GF_VUIInfo vuii;
+	memset(&vuii, 0, sizeof(GF_VUIInfo));
+	vuii.ar_num = ar_n;
+	vuii.ar_den = ar_d;
+	vuii.fullrange = -1;
+	vuii.video_format = -1;
+	vuii.color_prim = -1;
+	vuii.color_tfc = -1;
+	vuii.color_matrix = -1;
+	return gf_vvc_change_vui(vvcc, &vuii);
+}
+
+GF_EXPORT
+GF_Err gf_vvc_change_color(GF_VVCConfig *vvcc, s32 fullrange, s32 vidformat, s32 colorprim, s32 transfer, s32 colmatrix)
+{
+	GF_VUIInfo vuii;
+	memset(&vuii, 0, sizeof(GF_VUIInfo));
+	vuii.ar_num = -1;
+	vuii.ar_den = -1;
+	vuii.fullrange = fullrange;
+	vuii.video_format = vidformat;
+	vuii.color_prim = colorprim;
+	vuii.color_tfc = transfer;
+	vuii.color_matrix = colmatrix;
+	return gf_vvc_change_vui(vvcc, &vuii);
+}
+
+
+GF_EXPORT
+GF_Err gf_vvc_get_sps_info(u8 *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d)
+{
+	VVCState *vvc;
+	s32 idx;
+	GF_SAFEALLOC(vvc, VVCState);
+	if (!vvc) return GF_OUT_OF_MEM;
+	vvc->sps_active_idx = -1;
+
+	GF_BitStream *bs = gf_bs_new(sps_data, sps_size, GF_BITSTREAM_READ);
+	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
+
+	u8 nal_unit_type, temporal_id, layer_id;
+
+	vvc_parse_nal_header(bs, &nal_unit_type, &temporal_id, &layer_id);
+	idx = gf_vvc_read_sps_bs_internal(bs, vvc, layer_id, NULL);
+	gf_bs_del(bs);
+	if (idx < 0) {
+		gf_free(vvc);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (sps_id) *sps_id = idx;
+
+	if (width) *width = vvc->sps[idx].width;
+	if (height) *height = vvc->sps[idx].height;
+	if (par_n) *par_n = vvc->sps[idx].aspect_ratio_info_present_flag ? vvc->sps[idx].sar_width : (u32)-1;
+	if (par_d) *par_d = vvc->sps[idx].aspect_ratio_info_present_flag ? vvc->sps[idx].sar_height : (u32)-1;
+	gf_free(vvc);
+	return GF_OK;
+}
+
+
+GF_EXPORT
+const char *gf_vvc_get_profile_name(u8 video_prof)
+{
+	switch (video_prof) {
+	case 1:
+		return "Main 10";
+	case 65:
+		return "Main 10 Still Picture";
+	case 17:
+		return "Multilayer Main 10";
+	case 2:
+		return "Main 12";
+	case 10:
+		return "Main 12 Intra";
+	case 66:
+		return "Main 12 Still Picture";
+	case 34:
+		return "Main 12 4:4:4";
+	case 42:
+		return "Main 12 4:4:4 Intra";
+	case 98:
+		return "Main 12 4:4:4 Still Picture";
+	case 36:
+		return "Main 16 4:4:4";
+	case 44:
+		return "Main 16 4:4:4 Intra";
+	case 100:
+		return "Main 16 4:4:4 Still Picture";
+	default:
+		return "Unknown";
+	}
+}
+#endif /*GPAC_DISABLE_AV_PARSERS*/

gpac-1.0.1.tar.gz/src/media_tools/avilib.c -> gpac-2.0.0.tar.gz/src/media_tools/avilib.c Changed

@@ -123,8 +123,8 @@
 
 static u64 str2ullong(unsigned char *str)
 {
-	u64 r = (str[0] | (str[1]<<8) | (str[2]<<16) | (str[3]<<24));
-	u64 s = (str[4] | (str[5]<<8) | (str[6]<<16) | (str[7]<<24));
+	u64 r = ((u32)str[0] | ((u32)str[1]<<8) | ((u32)str[2]<<16) | ((u32)str[3]<<24));
+	u64 s = ((u32)str[4] | ((u32)str[5]<<8) | ((u32)str[6]<<16) | ((u32)str[7]<<24));
 #ifdef __GNUC__
 	return ((s<<32)&0xffffffff00000000ULL)|(r&0xffffffff);
 #else
@@ -134,11 +134,11 @@
 
 static u32 str2ulong(unsigned char *str)
 {
-	return ( str[0] | (str[1]<<8) | (str[2]<<16) | (str[3]<<24) );
+	return ( (u32)str[0] | ((u32)str[1]<<8) | ((u32)str[2]<<16) | ((u32)str[3]<<24) );
 }
 static u32 str2ushort(unsigned char *str)
 {
-	return ( str[0] | (str[1]<<8) );
+	return ( (u32)str[0] | ((u32)str[1]<<8) );
 }
 
 // bit 31 denotes a keyframe
@@ -705,10 +705,12 @@
 }
 
 #define OUT4CC(s) \
- if(nhb<=HEADERBYTES-4) memcpy(AVI_header+nhb,s,4); nhb += 4
+ if(nhb<=HEADERBYTES-4) memcpy(AVI_header+nhb,s,4); \
+ nhb += 4
 
 #define OUTLONG(n) \
- if(nhb<=HEADERBYTES-4) long2str(AVI_header+nhb, (s32)(n)); nhb += 4
+ if(nhb<=HEADERBYTES-4) long2str(AVI_header+nhb, (s32)(n)); \
+ nhb += 4
 
 #define OUTSHRT(n) \
 if(nhb<=HEADERBYTES-2) { \
@@ -1060,7 +1062,7 @@
 	}
 
 
-	/* Try to ouput the index entries. This may fail e.g. if no space
+	/* Try to output the index entries. This may fail e.g. if no space
 	 is left on device. We will report this as an error, but we still
 	 try to write the header correctly (so that the file still may be
 	 readable in the most cases */

gpac-1.0.1.tar.gz/src/media_tools/crypt_tools.c -> gpac-2.0.0.tar.gz/src/media_tools/crypt_tools.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Media Tools sub-project
@@ -53,8 +53,10 @@
 		return GF_CRYPT_TYPE_CBCS;
 	else if (!stricmp(cr_type, "OMA"))
 		return GF_ISOM_OMADRM_SCHEME;
+	else if (!stricmp(cr_type, "HLS SAES"))
+		return GF_HLS_SAMPLE_AES_SCHEME;
 
-	GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Unrecognized crypto type %s\n", cr_type));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[CENC] Unrecognized crypto type %s\n", cr_type));
 	return 0;
 }
 
@@ -78,17 +80,31 @@
 		}
 		return;
 	}
+
+
 	if (!strcmp(node_name, "CrypTrack")) {
+		Bool has_key = GF_FALSE;
 		Bool has_common_key = GF_TRUE;
 		GF_SAFEALLOC(tkc, GF_TrackCryptInfo);
 		if (!tkc) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Cannnot allocate crypt track, skipping\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[CENC] Cannnot allocate crypt track, skipping\n"));
+			info->last_parse_error = GF_OUT_OF_MEM;
 			return;
 		}
 		//by default track is encrypted
 		tkc->IsEncrypted = 1;
 		tkc->sai_saved_box_type = GF_ISOM_BOX_TYPE_SENC;
 		tkc->scheme_type = info->def_crypt_type;
+
+		//allocate a key to store the default values in single-key mode
+		tkc->keys = gf_malloc(sizeof(GF_CryptKeyInfo));
+		if (!tkc->keys) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[CENC] Cannnot allocate key IDs\n"));
+			gf_free(tkc);
+			info->last_parse_error = GF_OUT_OF_MEM;
+			return;
+		}
+		memset(tkc->keys, 0, sizeof(GF_CryptKeyInfo));
 		gf_list_add(info->tcis, tkc);
 
 		for (i=0; i<nb_attributes; i++) {
@@ -108,13 +124,11 @@
 			}
 			else if (!stricmp(att->name, "key")) {
 				GF_Err e;
-				if (!tkc->keys) {
-					tkc->KID_count = 1;
-					tkc->keys = gf_malloc(sizeof(bin128));
-				}
-				e = gf_bin128_parse(att->value, tkc->keys[0] );
+				has_key = GF_TRUE;
+				e = gf_bin128_parse(att->value, tkc->keys[0].key );
 if (e != GF_OK) {
- GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse key value in CrypTrack\n"));
+ GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Cannnot parse key value in CrypTrack\n"));
+					info->last_parse_error = GF_BAD_PARAM;
 return;
 }
 			}
@@ -128,7 +142,7 @@
 					u32 v;
 					sprintf(szV, "%c%c", sKey[j], sKey[j+1]);
 					sscanf(szV, "%x", &v);
-					tkc->first_IV[j/2] = v;
+					tkc->keys[0].IV[j/2] = v;
 					if (j>=30) break;
 				}
 			}
@@ -165,7 +179,7 @@
 				}
 				else if (!stricmp(att->value, "None")) {
 				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Unrecognized selective mode %s, ignoring\n", att->value));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Unrecognized selective mode %s, ignoring\n", att->value));
 				}
 			}
 			else if (!stricmp(att->name, "clearStsd")) {
@@ -173,7 +187,7 @@
 				else if (!strcmp(att->value, "before")) tkc->force_clear_stsd_idx = 1;
 				else if (!strcmp(att->value, "after")) tkc->force_clear_stsd_idx = 2;
 				else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Unrecognized clear stsd type %s, defaulting to no stsd for clear samples\n", att->value));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Unrecognized clear stsd type %s, defaulting to no stsd for clear samples\n", att->value));
 				}
 			}
 			else if (!stricmp(att->name, "Preview")) {
@@ -191,7 +205,7 @@
 				else if (!strcmp(att->value, "None")) tkc->encryption = 0;
 				else if (!strcmp(att->value, "AES_128_CTR") || !strcmp(att->value, "default")) tkc->encryption = 2;
 				else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Unrecognized encryption algo %s, ignoring\n", att->value));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Unrecognized encryption algo %s, ignoring\n", att->value));
 				}
 			}
 			else if (!stricmp(att->name, "transactionID")) {
@@ -206,7 +220,7 @@
 					tkc->IsEncrypted = 0;
 			}
 			else if (!stricmp(att->name, "IV_size")) {
-				tkc->IV_size = atoi(att->value);
+				tkc->keys[0].IV_size = atoi(att->value);
 			}
 			else if (!stricmp(att->name, "first_IV")) {
 				char *sKey = att->value;
@@ -218,25 +232,51 @@
 						char szV[5];
 						sprintf(szV, "%c%c", sKey[j], sKey[j+1]);
 						sscanf(szV, "%x", &v);
-						tkc->first_IV[j/2] = v;
+						tkc->keys[0].IV[j/2] = v;
 					}
-					if (!tkc->IV_size) tkc->IV_size = (u8) strlen(sKey) / 2;
+					if (!tkc->keys[0].IV_size) tkc->keys[0].IV_size = (u8) strlen(sKey) / 2;
 				}
 			}
 			else if (!stricmp(att->name, "saiSavedBox")) {
 				if (!stricmp(att->value, "uuid_psec")) tkc->sai_saved_box_type = GF_ISOM_BOX_UUID_PSEC;
 				else if (!stricmp(att->value, "senc")) tkc->sai_saved_box_type = GF_ISOM_BOX_TYPE_SENC;
 				else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Unrecognized SAI location %s, ignoring\n", att->value));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Unrecognized SAI location %s, ignoring\n", att->value));
 				}
 			}
 			else if (!stricmp(att->name, "keyRoll")) {
 				if (!strncmp(att->value, "idx=", 4))
 					tkc->defaultKeyIdx = atoi(att->value+4);
-				else if (!strncmp(att->value, "roll=", 5))
-					tkc->keyRoll = atoi(att->value+5);
+				else if (!strncmp(att->value, "roll", 4) || !strncmp(att->value, "samp", 4)) {
+					tkc->roll_type = GF_KEYROLL_SAMPLES;
+					if (att->value[4]=='=') tkc->keyRoll = atoi(att->value+5);
+					if (!tkc->keyRoll) tkc->keyRoll = 1;
+				}
+				else if (!strncmp(att->value, "seg", 3)) {
+					tkc->roll_type = GF_KEYROLL_SEGMENTS;
+					if (att->value[3]=='=') tkc->keyRoll = atoi(att->value+4);
+					if (!tkc->keyRoll) tkc->keyRoll = 1;
+				} else if (!strncmp(att->value, "period", 6)) {
+					tkc->roll_type = GF_KEYROLL_PERIODS;
+					if (att->value[6]=='=') tkc->keyRoll = atoi(att->value+7);
+					if (!tkc->keyRoll) tkc->keyRoll = 1;
+				} else if (!strcmp(att->value, "rap")) {
+					tkc->roll_type = GF_KEYROLL_SAPS;
+					if (att->value[3]=='=') tkc->keyRoll = atoi(att->value+4);
+					if (!tkc->keyRoll) tkc->keyRoll = 1;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Unrecognized roll parameter %s, ignoring\n", att->value));
+				}
+			}
+			else if (!stricmp(att->name, "random")) {
+				if (!strcmp(att->value, "true") || !strcmp(att->value, "1") || !strcmp(att->value, "yes")) {
+					tkc->rand_keys=GF_TRUE;
+				}
+				else if (!strcmp(att->value, "false") || !strcmp(att->value, "0") || !strcmp(att->value, "no")) {
+					tkc->rand_keys=GF_FALSE;
+				}
 				else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Unrecognized roll parameter %s, ignoring\n", att->value));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Unrecognized random parameter %s, ignoring\n", att->value));
 				}
 			}
 			else if (!stricmp(att->name, "metadata")) {
@@ -255,8 +295,10 @@
 				tkc->clear_bytes = atoi(att->value);
 			}
 			else if (!stricmp(att->name, "constant_IV_size")) {
-				tkc->constant_IV_size = atoi(att->value);
-				assert((tkc->constant_IV_size == 8) || (tkc->constant_IV_size == 16));
+				tkc->keys[0].constant_IV_size = atoi(att->value);
+				if ((tkc->keys[0].constant_IV_size != 8) && (tkc->keys[0].constant_IV_size != 16)) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Constant IV size %d is not 8 or 16\n", att->value));
+				}
 			}
 			else if (!stricmp(att->name, "constant_IV")) {
 				char *sKey = att->value;
@@ -268,10 +310,10 @@
 						char szV[5];
 						sprintf(szV, "%c%c", sKey[j], sKey[j+1]);
 						sscanf(szV, "%x", &v);
-						tkc->constant_IV[j/2] = v;
+						tkc->keys[0].IV[j/2] = v;
 					}
+					if (!tkc->keys[0].constant_IV_size) tkc->keys[0].constant_IV_size = (u8) strlen(sKey) / 2;
 				}
-				if (!tkc->constant_IV_size) tkc->constant_IV_size = (u8) strlen(sKey) / 2;
 			}
 			else if (!stricmp(att->name, "encryptSliceHeader")) {
 				tkc->allow_encrypted_slice_header = !strcmp(att->value, "yes") ? GF_TRUE : GF_FALSE;
@@ -281,35 +323,83 @@
 				else if (!strcmp(att->value, "always")) tkc->block_align = 2;
 				else tkc->block_align = 0;
 			}
+			else if (!stricmp(att->name, "subsamples")) {
+				char *val = att->value;
+				while (val) {
+					char *sep = strchr(val, ';');
+					if (sep) sep[0] = 0;
+					if (!strncmp(val, "subs=", 5)) {
+						if (tkc->subs_crypt) gf_free(tkc->subs_crypt);
+						tkc->subs_crypt = gf_strdup(val+4);
+					}
+					else if (!strncmp(val, "rand", 4)) {
+						tkc->subs_rand = 2;
+						if (val[4]=='=')
+							tkc->subs_rand = atoi(val+5);
+					}
+					else {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[CENC] unrecognized attribute value %s for `subsamples`, ignoring\n", val));
+					}
+					if (!sep) break;
+					sep[0] = ';';
+					val = sep+1;
+				}
+			}
+			else if (!stricmp(att->name, "multiKey")) {
+				if (!strcmp(att->value, "all") || !strcmp(att->value, "on")) tkc->multi_key = GF_TRUE;
+				else if (!strcmp(att->value, "no")) tkc->multi_key = GF_FALSE;
+				else {
+					char *val = att->value;
+					tkc->multi_key = GF_TRUE;
+					while (val) {
+						char *sep = strchr(val, ';');
+						if (sep) sep[0] = 0;
+						if (!strncmp(val, "roll=", 5)) {
+							tkc->mkey_roll_plus_one = 1 + atoi(val+5);
+						}
+						else if (!strncmp(val, "subs=", 5)) {
+							if (tkc->mkey_subs) gf_free(tkc->mkey_subs);
+							tkc->mkey_subs = gf_strdup(val+5);
+						}
+						else {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[CENC] unrecognized attribute value %s for `multiKey`, ignoring\n", val));
+							tkc->multi_key = GF_FALSE;
+							if (sep) sep[0] = ';';
+							break;
+						}
+						if (!sep) break;
+						sep[0] = ';';
+						val = sep+1;
+					}
+				}
+			}
 		}
 		if (tkc->scheme_type==GF_CRYPT_TYPE_PIFF) {
 			tkc->sai_saved_box_type = GF_ISOM_BOX_UUID_PSEC;
 		}
 		if (has_common_key) info->has_common_key = 1;
 
-		if ((tkc->IV_size != 0) && (tkc->IV_size != 8) && (tkc->IV_size != 16)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] wrong IV size %d for AES-128, using 16\n", (u32) tkc->IV_size));
-			tkc->IV_size = 16;
+		if ((tkc->keys[0].IV_size != 0) && (tkc->keys[0].IV_size != 8) && (tkc->keys[0].IV_size != 16)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[CENC] wrong IV size %d for AES-128, using 16\n", (u32) tkc->keys[0].IV_size));
+			tkc->keys[0].IV_size = 16;
 		}
 
 		if ((tkc->scheme_type == GF_CRYPT_TYPE_CENC) || (tkc->scheme_type == GF_CRYPT_TYPE_CBC1)) {
 			if (tkc->crypt_byte_block || tkc->skip_byte_block) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, crypt_byte_block and skip_byte_block shall be 0\n", gf_4cc_to_str(tkc->scheme_type) ));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[CENC] Using scheme type %s, crypt_byte_block and skip_byte_block shall be 0\n", gf_4cc_to_str(tkc->scheme_type) ));
 				tkc->crypt_byte_block = tkc->skip_byte_block = 0;
 			}
 		}
 
 		if ((tkc->scheme_type == GF_CRYPT_TYPE_CENC) || (tkc->scheme_type == GF_CRYPT_TYPE_CBC1) || (tkc->scheme_type == GF_CRYPT_TYPE_CENS)) {
-			if (tkc->constant_IV_size) {
-				if (!tkc->IV_size) {
-					tkc->IV_size = tkc->constant_IV_size;
-					memcpy(tkc->first_IV, tkc->constant_IV, 16);
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, constant IV shall not be used, using constant IV as first IV\n", gf_4cc_to_str(tkc->scheme_type)));
-					tkc->constant_IV_size = 0;
+			if (tkc->keys[0].constant_IV_size) {
+				if (!tkc->keys[0].IV_size) {
+					tkc->keys[0].IV_size = tkc->keys[0].constant_IV_size;
+					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[CENC] Using scheme type %s, constant IV shall not be used, using constant IV as first IV\n", gf_4cc_to_str(tkc->scheme_type)));
+					tkc->keys[0].constant_IV_size = 0;
 				} else {
-					tkc->constant_IV_size = 0;
-					memset(tkc->constant_IV, 0, 16);
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, constant IV shall not be used, ignoring\n", gf_4cc_to_str(tkc->scheme_type)));
+					tkc->keys[0].constant_IV_size = 0;
+					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[CENC] Using scheme type %s, constant IV shall not be used, ignoring\n", gf_4cc_to_str(tkc->scheme_type)));
 				}
 			}
 		}
@@ -318,32 +408,71 @@
 			tkc->encryption = 2;
 		}
 
+		if (has_key) tkc->nb_keys = 1;
 	}
 
 	if (!strcmp(node_name, "key")) {
+		u32 IV_size, const_IV_size;
+		Bool kas_civ = GF_FALSE;
 		tkc = (GF_TrackCryptInfo *)gf_list_last(info->tcis);
-		tkc->KIDs = (bin128 *)gf_realloc(tkc->KIDs, sizeof(bin128)*(tkc->KID_count+1));
-		tkc->keys = (bin128 *)gf_realloc(tkc->keys, sizeof(bin128)*(tkc->KID_count+1));
+		if (!tkc) return;
+		//only realloc for 2nd and more
+		if (tkc->nb_keys) {
+			tkc->keys = (GF_CryptKeyInfo *)gf_realloc(tkc->keys, sizeof(GF_CryptKeyInfo)*(tkc->nb_keys+1));
+			memset(&tkc->keys[tkc->nb_keys], 0, sizeof(GF_CryptKeyInfo));
+		}
+		IV_size = tkc->keys[0].IV_size;
+		const_IV_size = tkc->keys[0].constant_IV_size;
 
 		for (i=0; i<nb_attributes; i++) {
 			att = (GF_XMLAttribute *) &attributes[i];
 
 			if (!stricmp(att->name, "KID")) {
-				GF_Err e = gf_bin128_parse(att->value, tkc->KIDs[tkc->KID_count]);
+				GF_Err e = gf_bin128_parse(att->value, tkc->keys[tkc->nb_keys].KID);
 if (e != GF_OK) {
- GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse KID\n"));
+ GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Cannnot parse KID\n"));
 return;
 }
 			}
 			else if (!stricmp(att->name, "value")) {
-				GF_Err e = gf_bin128_parse(att->value, tkc->keys[tkc->KID_count]);
+				GF_Err e = gf_bin128_parse(att->value, tkc->keys[tkc->nb_keys].key);
 if (e != GF_OK) {
- GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse key value\n"));
+ GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Cannnot parse key value\n"));
 return;
 }
 			}
+			else if (!stricmp(att->name, "hlsInfo")) {
+				if (!strstr(att->value, "URI=\"")) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[CENC] Missing URI in HLS info %s\n", att->value));
+ return;
+				}
+				tkc->keys[tkc->nb_keys].hls_info = gf_strdup(att->value);
+			}
+			else if (!stricmp(att->name, "IV_size")) {
+				IV_size = atoi(att->value);
+			}
+			else if (!stricmp(att->name, "constant_IV")) {
+				char *sKey = att->value;
+				if (!strnicmp(sKey, "0x", 2)) sKey += 2;
+				if ((strlen(sKey) == 16) || (strlen(sKey) == 32)) {
+					u32 j;
+					for (j=0; j<strlen(sKey); j+=2) {
+						u32 v;
+						char szV[5];
+						sprintf(szV, "%c%c", sKey[j], sKey[j+1]);
+						sscanf(szV, "%x", &v);
+						tkc->keys[tkc->nb_keys].IV[j/2] = v;
+					}
+					const_IV_size = (u8) strlen(sKey) / 2;
+					kas_civ = GF_TRUE;
+				}
+			}
 		}
-		tkc->KID_count++;
+		tkc->keys[tkc->nb_keys].IV_size = IV_size;
+		tkc->keys[tkc->nb_keys].constant_IV_size = const_IV_size;
+		if (!kas_civ && tkc->nb_keys)
+			memcpy(tkc->keys[tkc->nb_keys].IV, tkc->keys[0].IV, 16);
+		tkc->nb_keys++;
 	}
 }
 
@@ -376,13 +505,19 @@
 void gf_crypt_info_del(GF_CryptInfo *info)
 {
 	while (gf_list_count(info->tcis)) {
+		u32 i;
 		GF_TrackCryptInfo *tci = (GF_TrackCryptInfo *)gf_list_last(info->tcis);
-		if (tci->KIDs) gf_free(tci->KIDs);
+		for (i=0; i<tci->nb_keys; i++) {
+			if (tci->keys[i].hls_info)
+				gf_free(tci->keys[i].hls_info);
+		}
 		if (tci->keys) gf_free(tci->keys);
 		if (tci->metadata) gf_free(tci->metadata);
 		if (tci->KMS_URI) gf_free(tci->KMS_URI);
 		if (tci->Scheme_URI) gf_free(tci->Scheme_URI);
 		if (tci->TextualHeaders) gf_free(tci->TextualHeaders);
+		if (tci->subs_crypt) gf_free(tci->subs_crypt);
+		if (tci->mkey_subs) gf_free(tci->mkey_subs);
 		gf_list_rem_last(info->tcis);
 		gf_free(tci);
 	}
@@ -404,10 +539,14 @@
 	sax = gf_xml_sax_new(cryptinfo_node_start, cryptinfo_node_end, cryptinfo_text, info);
 	e = gf_xml_sax_parse_file(sax, file, NULL);
 	if (e<0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[DRM] Failed to parse DRM config file: %s", gf_xml_sax_get_error(sax) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[DRM] Failed to parse DRM config file: %s", gf_xml_sax_get_error(sax) ));
 		if (out_err) *out_err = e;
 		gf_crypt_info_del(info);
 		info = NULL;
+	} else if (info->last_parse_error) {
+		if (out_err) *out_err = info->last_parse_error;
+		gf_crypt_info_del(info);
+		info = NULL;
 	} else {
 		if (out_err) *out_err = GF_OK;
 	}
@@ -415,6 +554,8 @@
 	return info;
 }
 
+extern char gf_prog_lf;
+
 static Bool on_decrypt_event(void *_udta, GF_Event *evt)
 {
 	Double progress;
@@ -429,16 +570,17 @@
 
 	*prev_progress = (u32) progress;
 #ifndef GPAC_DISABLE_LOG
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Decrypting: % 2.2f %%\r", progress));
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Decrypting: % 2.2f %%%c", progress, gf_prog_lf));
 #else
-	fprintf(stderr, "Decrypting: % 2.2f %%\r", progress);
+	fprintf(stderr, "Decrypting: % 2.2f %%%c", progress, gf_prog_lf);
 #endif
 	return GF_FALSE;
 }
 
 static GF_Err gf_decrypt_file_ex(GF_ISOFile *mp4, const char *drm_file, const char *dst_file, Double interleave_time, const char *fragment_name, u32 fs_dump_flags)
 {
-	char szArgs[4096];
+	char *szArgs = NULL;
+	char an_arg[100];
 	GF_Filter *src, *dst, *dcrypt;
 	GF_FilterSession *fsess;
 	GF_Err e = GF_OK;
@@ -446,46 +588,63 @@
 
 	fsess = gf_fs_new_defaults(0);
 	if (!fsess) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Decrypter] Failed to create filter session\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Decrypter] Failed to create filter session\n"));
 		return GF_OUT_OF_MEM;
 	}
-	sprintf(szArgs, "mp4dmx:mov=%p", mp4);
+
+	sprintf(an_arg, "mp4dmx:mov=%p", mp4);
+	gf_dynstrcat(&szArgs, an_arg, NULL);
 	if (fragment_name) {
-		strcat(szArgs, ":sigfrag:catseg=");
-		strcat(szArgs, fragment_name);
+		gf_dynstrcat(&szArgs, ":sigfrag:catseg=", NULL);
+		gf_dynstrcat(&szArgs, fragment_name, NULL);
 	}
 	src = gf_fs_load_filter(fsess, szArgs, &e);
+	gf_free(szArgs);
+	szArgs = NULL;
+
 	if (!src) {
 		gf_fs_del(fsess);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Decrypter] Cannot load demux filter for source file\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Decrypter] Cannot load demux filter for source file\n"));
 		return e;
 	}
 
-	sprintf(szArgs, "cdcrypt:FID=1:cfile=%s", drm_file);
+	gf_dynstrcat(&szArgs, "cdcrypt:FID=1", NULL);
+	if (drm_file) {
+		gf_dynstrcat(&szArgs, ":cfile=", NULL);
+		gf_dynstrcat(&szArgs, drm_file, NULL);
+	}
 	dcrypt = gf_fs_load_filter(fsess, szArgs, &e);
+	gf_free(szArgs);
+	szArgs = NULL;
 	if (!dcrypt) {
 		gf_fs_del(fsess);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Decrypter] Cannot load decryptor filter\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Decrypter] Cannot load decryptor filter\n"));
 		return e;
 	}
 
-	sprintf(szArgs, "SID=1");
+	gf_dynstrcat(&szArgs, "SID=1", NULL);
 	if (fragment_name) {
-		strcat(szArgs, ":sseg:noinit:store=frag:cdur=1000000000");
+		gf_dynstrcat(&szArgs, ":sseg:noinit:store=frag:refrag:cdur=1000000000", NULL);
 	} else {
 		if (interleave_time) {
-			char an_arg[100];
 			sprintf(an_arg, ":cdur=%g", interleave_time);
-			strcat(szArgs, an_arg);
+			gf_dynstrcat(&szArgs, an_arg, NULL);
 		} else {
-			strcat(szArgs, ":store=flat");
+			gf_dynstrcat(&szArgs, ":store=flat", NULL);
 		}
 	}
+	gf_dynstrcat(&szArgs, ":xps_inband=auto", NULL);
+	
+	if (gf_isom_has_keep_utc_times(mp4))
+		gf_dynstrcat(&szArgs, ":keep_utc", NULL);
 
 	dst = gf_fs_load_destination(fsess, dst_file, szArgs, NULL, &e);
+	gf_free(szArgs);
+	szArgs = NULL;
+
 	if (!dst) {
 		gf_fs_del(fsess);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Decrypter] Cannot load destination muxer\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Decrypter] Cannot load destination muxer\n"));
 		return GF_FILTER_NOT_FOUND;
 	}
 
@@ -509,6 +668,8 @@
 	if (!e) e = gf_fs_get_last_connect_error(fsess);
 	if (!e) e = gf_fs_get_last_process_error(fsess);
 
+	if (!e) gf_fs_print_unused_args(fsess, NULL);
+	gf_fs_print_non_connected(fsess);
 	if (fs_dump_flags & 1) gf_fs_print_stats(fsess);
 	if (fs_dump_flags & 2) gf_fs_print_connections(fsess);
 
@@ -540,9 +701,9 @@
 
 	*prev_progress = (u32) progress;
 #ifndef GPAC_DISABLE_LOG
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Encrypting: % 2.2f %%\r", progress));
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Encrypting: % 2.2f %%%c", progress, gf_prog_lf));
 #else
-	fprintf(stderr, "Encrypting: % 2.2f %%\r", progress);
+	fprintf(stderr, "Encrypting: % 2.2f %%%c", progress, gf_prog_lf);
 #endif
 	return GF_FALSE;
 }
@@ -559,7 +720,7 @@
 
 	fsess = gf_fs_new_defaults(0);
 	if (!fsess) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Encrypter] Failed to create filter session\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Encrypter] Failed to create filter session\n"));
 		return GF_OUT_OF_MEM;
 	}
 
@@ -576,7 +737,7 @@
 
 	if (!src) {
 		gf_fs_del(fsess);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Encrypter] Cannot load demux for source file: %s\n", gf_error_to_string(e)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Encrypter] Cannot load demux for source file: %s\n", gf_error_to_string(e)));
 		return e;
 	}
 
@@ -589,13 +750,13 @@
 
 	if (!crypt) {
 		gf_fs_del(fsess);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Encrypter] Cannot load encryptor: %s\n", gf_error_to_string(e) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Encrypter] Cannot load encryptor: %s\n", gf_error_to_string(e) ));
 		return e;
 	}
 
 	gf_dynstrcat(&szArgs, "SID=1", NULL);
 	if (fragment_name) {
-		gf_dynstrcat(&szArgs, ":sseg:noinit:store=frag:cdur=1000000000", NULL);
+		gf_dynstrcat(&szArgs, ":sseg:noinit:store=frag:refrag:cdur=1000000000", NULL);
 	} else {
 		if (interleave_time) {
 			sprintf(an_arg, ":cdur=%g", interleave_time);
@@ -604,8 +765,12 @@
 			gf_dynstrcat(&szArgs, ":store=flat", NULL);
 		}
 	}
+	gf_dynstrcat(&szArgs, ":xps_inband=auto", NULL);
+
+	if (gf_isom_has_keep_utc_times(mp4))
+		gf_dynstrcat(&szArgs, ":keep_utc", NULL);
 
-	arg_dst = gf_url_colon_suffix(dst_file);
+	arg_dst = gf_url_colon_suffix(dst_file, '=');
 	if (arg_dst) {
 		gf_dynstrcat(&szArgs, arg_dst, NULL);
 		arg_dst[0]=0;
@@ -616,7 +781,7 @@
 	szArgs = NULL;
 	if (!dst) {
 		gf_fs_del(fsess);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Encrypter] Cannot load destination muxer\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[Encrypter] Cannot load destination muxer\n"));
 		return GF_FILTER_NOT_FOUND;
 	}
 
@@ -639,6 +804,8 @@
 	if (!e) e = gf_fs_get_last_connect_error(fsess);
 	if (!e) e = gf_fs_get_last_process_error(fsess);
 
+	if (!e) gf_fs_print_unused_args(fsess, NULL);
+	gf_fs_print_non_connected(fsess);
 	if (fs_dump_flags & 1) gf_fs_print_stats(fsess);
 	if (fs_dump_flags & 2) gf_fs_print_connections(fsess);
 	gf_fs_del(fsess);

gpac-1.0.1.tar.gz/src/media_tools/dash_client.c -> gpac-2.0.0.tar.gz/src/media_tools/dash_client.c Changed

@@ -1,8 +1,8 @@
-/**
+/*
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2010-2020
+ *			Copyright (c) Telecom ParisTech 2010-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Adaptive HTTP Streaming
@@ -23,7 +23,6 @@
 *
 */
 
-#include <gpac/thread.h>
 #include <gpac/network.h>
 #include <gpac/dash.h>
 #include <gpac/mpd.h>
@@ -46,6 +45,7 @@
 /*set to 1 if you want MPD to use SegmentTimeline*/
 #define M3U8_TO_MPD_USE_SEGTIMELINE	0
 
+
 typedef enum {
 	GF_DASH_STATE_STOPPED = 0,
 	/*period setup and playback chain creation*/
@@ -53,9 +53,20 @@
 	/*request to start playback chain*/
 	GF_DASH_STATE_CONNECTING,
 	GF_DASH_STATE_RUNNING,
+
+	GF_DASH_STATE_CHAIN_NEXT,
+	GF_DASH_STATE_CHAIN_FALLBACK,
 } GF_DASH_STATE;
 
 
+enum
+{
+	GF_DASH_CHAIN_REG=0,
+	GF_DASH_CHAIN_PUSH,
+	GF_DASH_CHAIN_POP
+};
+
+
 //shifts AST in the past(>0) or future (<0) so that client starts request in the future or in the past
 //#define FORCE_DESYNC	4000
 
@@ -76,7 +87,8 @@
 
 	u32 max_cache_duration, max_width, max_height;
 	u8 max_bit_per_pixel;
-	u32 auto_switch_count;
+	s32 auto_switch_count;
+	Bool auto_switch_loop;
 	Bool keep_files, disable_switching, allow_local_mpd_update, estimate_utc_drift, ntp_forced;
 	Bool is_m3u8, is_smooth;
 	Bool split_adaptation_set;
@@ -115,14 +127,9 @@
 	/*list of groups in the active period*/
 	GF_List *groups;
 
-	/*Main Thread handling segment downloads and MPD/M3U8 update*/
-	GF_Thread *dash_thread;
-	/*mutex for MPD updates and group access*/
-	GF_Mutex *dash_mutex;
-
 	/* one of the above state*/
 	GF_DASH_STATE dash_state;
-	Bool mpd_stop_request;
+
 	Bool in_period_setup;
 	Bool all_groups_done_notified;
 
@@ -139,31 +146,42 @@
 	u32 min_wait_sys_clock;
 
 	Bool force_mpd_update;
+	u32 force_period_reload;
 
 	u32 user_buffer_ms;
 
 	u32 min_timeout_between_404, segment_lost_after_ms;
 
-	GF_DASHThreadMode thread_mode;
-
 	Bool ignore_xlink;
 
-	//0: not atsc - 1: atsc but clock not init 2- atsc clock init
-	u32 atsc_clock_state;
-	//atsc AST shift in ms
-	u32 atsc_ast_shift;
+	//0: not ROUTE - 1: ROUTE but clock not init - 2: ROUTE clock init
+	u32 route_clock_state;
+	//ROUTE AST shift in ms
+	u32 route_ast_shift;
+	u32 route_skip_segments_ms;
+ Bool route_low_latency;
+	u32 route_last_retune;
 
 	Bool initial_period_tunein;
+	u32 preroll_state;
+
+	Bool llhls_single_range;
+	Bool m3u8_reload_master;
+	u32 hls_reload_time;
+
 
 	//in ms
 	u32 time_in_tsb, prev_time_in_tsb;
 	u32 tsb_exceeded;
-	s32 debug_group_index;
+	const u32 *dbg_grps_index;
+	u32 nb_dbg_grps;
 	Bool disable_speed_adaptation;
 
 	Bool period_groups_setup;
 	u32 tile_rate_decrease;
 	GF_DASHTileAdaptationMode tile_adapt_mode;
+	Bool disable_low_quality_tiles;
+	u32 chaining_mode, chain_stack_state;
 
 	GF_List *SRDs;
 
@@ -173,24 +191,48 @@
 												 u32 dl_rate, Double speed, Double max_available_speed, Bool force_lower_complexity,
 												 GF_MPD_Representation *rep, Bool go_up_bitrate);
 
-	GF_Err (*rate_adaptation_download_monitor)(GF_DashClient *dash, GF_DASH_Group *group);
+	s32 (*rate_adaptation_download_monitor)(GF_DashClient *dash, GF_DASH_Group *group, u32 bits_per_sec, u64 total_bytes, u64 bytes_done, u64 us_since_start, u32 buffer_dur_ms, u32 current_seg_dur);
+
+	//for custom algo, total rate of all active groups being downloaded
+	u32 total_rate;
+
+	gf_dash_rate_adaptation rate_adaptation_algo_custom;
+	gf_dash_download_monitor rate_adaptation_download_monitor_custom;
+	void *udta_custom_algo;
+
+	/*if set, enables group selection at dash client level, otherwise leave the decision to the user app*/
+	Bool enable_group_selection;
+
+
+	char *chain_next, *chain_fallback;
+	GF_List *chain_stack;
 };
 
 static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group, Double seek_to, Bool is_dynamic);
 
 
+enum
+{
+	SEG_FLAG_LOOP_DETECTED = 1,
+	SEG_FLAG_DEP_FOLLOWING = 1<<1,
+	SEG_FLAG_DISABLED = 1<<2,
+};
+
 typedef struct
 {
-	char *cache;
 	char *url;
 	u64 start_range, end_range;
 	/*representation index in adaptation_set->representations*/
 	u32 representation_index;
-	Bool loop_detected;
 	u32 duration;
+	u32 dep_group_idx;
 	char *key_url;
 	bin128 key_IV;
-	Bool has_dep_following;
+	u32 seg_number;
+	const char *seg_name_start;
+	GF_Fraction64 time;
+
+	u32 flags;
 } segment_cache_entry;
 
 typedef enum
@@ -217,23 +259,27 @@
 	u32 prev_active_rep_index;
 
 	Bool timeline_setup;
+	Bool force_timeline_reeval;
+	Bool first_hls_chunk;
 
 	GF_DASHGroupSelection selection;
 
 	/*may be mpd@time_shift_buffer_depth or rep@time_shift_buffer_depth*/
 	u32 time_shift_buffer_depth;
 
-	Bool bitstream_switching, dont_delete_first_segment;
+	Bool bitstream_switching;
 	GF_DASH_Group *depend_on_group;
 	Bool done;
 	//if set, will redownload the last segment partially downloaded
 	Bool force_switch_bandwidth;
 	Bool min_bandwidth_selected;
-	u32 download_start_time;
+
 	u32 active_bitrate, max_bitrate, min_bitrate;
 	u32 min_representation_bitrate;
 
 	u32 nb_segments_in_rep;
+	//cached index of this group in dash->groups to avoid using gf_list_find
+	u32 groups_idx;
 
 	/* Segment duration as advertised in the MPD
 	 for the real duration of the segment being downloaded see current_downloaded_segment_duration */
@@ -256,17 +302,15 @@
 	u64 ast_at_init;
 	u32 ast_offset;
 
-	/*next file (cached) to delete at next GF_NET_SERVICE_QUERY_NEXT for this group*/
-	char * urlToDeleteNext;
-	volatile u32 max_cached_segments, nb_cached_segments, max_buffer_segments;
+	Bool init_segment_is_media;
+
+	u32 max_cached_segments, nb_cached_segments;
 	segment_cache_entry *cached;
 
-	GF_DASHFileIOSession segment_download;
-	//0: not set, 1: abort because group has been stopped - 2: abort because bandwidth was too low
-	u32 download_abort_type;
 	/*usually 0-0 (no range) but can be non-zero when playing local MPD/DASH sessions*/
 	u64 bs_switching_init_segment_url_start_range, bs_switching_init_segment_url_end_range;
 	char *bs_switching_init_segment_url;
+	const char *bs_switching_init_segment_url_name_start;
 
 	u32 nb_segments_done;
 	u32 last_segment_time;
@@ -278,17 +322,16 @@
 
 	Bool segment_must_be_streamed;
 	Bool broken_timing;
-	Bool buffering;
+
 	u32 maybe_end_of_stream;
 	u32 cache_duration;
 	u32 time_at_first_reload_required;
 	u32 force_representation_idx_plus_one;
 
 	Bool force_segment_switch;
-	Bool is_downloading;
 	Bool loop_detected;
 
-	u32 time_at_first_failure;
+	u32 time_at_first_failure, time_at_last_request;
 	Bool prev_segment_ok, segment_in_valid_range;
 	//this is the number of 404
 	u32 nb_consecutive_segments_lost;
@@ -324,7 +367,7 @@
 	u32 buffer_occupancy_at_last_seg;
 
 	u32 m3u8_start_media_seq;
-	u64 hls_next_start_time;
+	u32 hls_next_seq_num;
 
 	GF_List *groups_depending_on;
 	u32 current_dep_idx;
@@ -334,18 +377,16 @@
 	u32 srd_x, srd_y, srd_w, srd_h, srd_row_idx, srd_col_idx;
 	struct _dash_srd_desc *srd_desc;
 
-	/*mutex for group->cache access (read and write in download)*/
-	GF_Mutex *cache_mutex;
-
-	GF_Thread *download_th;
-	Bool download_th_done;
-
 	/*current index of the base URL used*/
 	u32 current_base_url_idx;
 
 	u32 quality_degradation_hint;
 
 	Bool rate_adaptation_postponed;
+	Bool update_tile_qualities;
+
+	//for dash custom, allows temporary disabling a group
+	Bool disabled;
 
 	/* current segment index in BBA and BOLA algorithm */
 	u32 current_index;
@@ -353,8 +394,21 @@
 	//in non-threaded mode, indicates that the demux for this group has nothing to do...
 	Bool force_early_fetch;
 	Bool is_low_latency;
+
+	u32 hint_visible_width, hint_visible_height;
+
+	//last chunk scheduled for download
+	GF_MPD_SegmentURL *llhls_edge_chunk;
+	Bool llhls_last_was_merged;
+	s32 llhls_switch_request;
+	u32 last_mpd_change_time;
+	Bool no_init_seg;
 };
 
+//wait time before requesting again a M3U8 child playlist update when something goes wrong during the update: either same file or the expected next segment is not there
+#define HLS_MIN_RELOAD_TIME(_dash) _dash->hls_reload_time = 50 + gf_sys_clock();
+
+
 static void gf_dash_solve_period_xlink(GF_DashClient *dash, GF_List *period_list, u32 period_idx);
 
 struct _dash_srd_desc
@@ -455,7 +509,7 @@
 		return GF_FALSE;
 	}
 	cache_name = dash->dash_io->get_cache_name(dash->dash_io, session);
-	gf_blob_get_data(cache_name, &data, &len);
+	gf_blob_get(cache_name, &data, &len, NULL);
 
 	if (!strcmp(scheme_id, "urn:mpeg:dash:utc:http-head:2014")) {
 		const char *hdr = dash->dash_io->get_header_value(dash->dash_io, session, "Date");
@@ -476,19 +530,26 @@
 		else if (!strcmp(scheme_id, "urn:mpeg:dash:utc:http-ntp:2014")) {
 			u64 ntp_ts;
 			if (sscanf((char *) data, LLU, &ntp_ts) == 1) {
-				*utc = gf_net_ntp_to_utc(ntp_ts);
+				//ntp value not counted since 1900, assume format is seconds till 1 jan 1970
+				if (ntp_ts<=GF_NTP_SEC_1900_TO_1970) {
+					*utc = ntp_ts*1000;
+				} else {
+					*utc = gf_net_ntp_to_utc(ntp_ts);
+				}
 			} else {
 				res = GF_FALSE;
 			}
 		}
 	}
-
+ gf_blob_release(cache_name);
+ 
 	dash->dash_io->del(dash->dash_io, session);
 	return res;
 }
 
+GF_Err gf_dash_download_resource(GF_DashClient *dash, GF_DASHFileIOSession *sess, const char *url, u64 start_range, u64 end_range, u32 persistent_mode, GF_DASH_Group *group);
 
-static void gf_dash_group_timeline_setup(GF_MPD *mpd, GF_DASH_Group *group, u64 fetch_time)
+static void gf_dash_group_timeline_setup_single(GF_MPD *mpd, GF_DASH_Group *group, u64 fetch_time)
 {
 	GF_MPD_SegmentTimeline *timeline = NULL;
 	GF_MPD_Representation *rep = NULL;
@@ -499,8 +560,11 @@
 	u32 ast_diff, start_number;
 	Double ast_offset = 0;
 
-	if (mpd->type==GF_MPD_TYPE_STATIC)
+	if (mpd->type==GF_MPD_TYPE_STATIC) {
+		if (group->dash->route_clock_state)
+			goto setup_route;
 		return;
+	}
 
 	//always init clock even if active period is a remote one
 #if 0
@@ -508,9 +572,67 @@
 		return;
 #endif
 
-	/*M3U8 does not use NTP sync */
-	if (group->dash->is_m3u8)
+	/*M3U8 does not use NTP sync, we solve edge while loading subplaylist */
+	if (group->dash->is_m3u8) {
+		return;
+	}
+
+	if (group->dash->is_smooth) {
+		u32 seg_idx = 0;
+		u64 timeshift = 0;
+		if (group->dash->initial_time_shift_value && ((s32) mpd->time_shift_buffer_depth>=0)) {
+			if (group->dash->initial_time_shift_value<=100) {
+				timeshift = mpd->time_shift_buffer_depth;
+				timeshift *= group->dash->initial_time_shift_value;
+				timeshift /= 100;
+			} else {
+				timeshift = (u32) group->dash->initial_time_shift_value;
+				if (timeshift > mpd->time_shift_buffer_depth) timeshift = mpd->time_shift_buffer_depth;
+			}
+			timeshift = mpd->time_shift_buffer_depth - timeshift;
+		}
+
+		if (!timeshift && group->adaptation_set->smooth_max_chunks) {
+			seg_idx = group->adaptation_set->smooth_max_chunks;
+		} else {
+			u32 i, count;
+			u64 start = 0;
+			u64 cumulated_dur = 0;
+			GF_MPD_SegmentTimeline *stl;
+			if (!group->adaptation_set->segment_template || !group->adaptation_set->segment_template->segment_timeline)
+				return;
+
+			timeshift *= group->adaptation_set->segment_template->timescale;
+			timeshift /= 1000;
+			stl = group->adaptation_set->segment_template->segment_timeline;
+			count = gf_list_count(stl->entries);
+			for (i=0; i<count; i++) {
+				u64 dur;
+				GF_MPD_SegmentTimelineEntry *e = gf_list_get(stl->entries, i);
+				if (!e->duration)
+					continue;
+				if (e->start_time)
+					start = e->start_time;
+
+				dur = e->duration * (e->repeat_count+1);
+				if (cumulated_dur + dur >= timeshift) {
+					u32 nb_segs = (u32) ( (timeshift - cumulated_dur) / e->duration );
+					seg_idx += nb_segs;
+					break;
+				}
+				cumulated_dur += dur;
+				start += dur;
+				seg_idx += e->repeat_count+1;
+				if (group->adaptation_set->smooth_max_chunks && (seg_idx>=group->adaptation_set->smooth_max_chunks)) {
+					seg_idx = group->adaptation_set->smooth_max_chunks;
+					break;
+				}
+			}
+		}
+		group->download_segment_index = (seg_idx>1) ? seg_idx - 1 : 0;
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Smooth group tuned in at segment %d\n", group->download_segment_index));
 		return;
+	}
 
 	if (group->broken_timing )
 		return;
@@ -522,21 +644,28 @@
 		return;
 	}
 
-	if (!fetch_time) {
-		//when we initialize the timeline without an explicit fetch time, use our local clock - this allows for better precision
-		//when trying to locate the live edge
-		fetch_time = gf_net_get_utc();
+	if ((group->dash->preroll_state<2) && group->dash->initial_period_tunein && gf_list_count(group->dash->mpd->periods)) {
+		GF_MPD_Period *ap = gf_list_get(group->dash->mpd->periods, 0);
+		if (ap->is_preroll) {
+			group->dash->preroll_state = 1;
+		}
+	}
+	if (group->dash->preroll_state == 1) {
+		group->broken_timing = GF_TRUE;
+		return;
 	}
-	//if ATSC and clock not setup, do it
-	val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-dash-atsc");
+
+	//if ROUTE and clock not setup, do it
+setup_route:
+	val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-route");
 	if (val && !group->dash->utc_drift_estimate) {
 		u32 i;
 		GF_MPD_Period *dyn_period=NULL;
-		Bool found = GF_FALSE;
+		u32 found = 0;
 		u64 timeline_offset_ms=0;
-		if (!group->dash->atsc_clock_state) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Detected ATSC DASH service ID %s\n", val));
-			group->dash->atsc_clock_state = 1;
+		if (!group->dash->route_clock_state) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Detected ROUTE DASH service ID %s\n", val));
+			group->dash->route_clock_state = 1;
 		}
 
 		for (i=0; i<gf_list_count(group->dash->mpd->periods); i++) {
@@ -546,7 +675,18 @@
 			dyn_period = NULL;
 		}
 		if (!dyn_period) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ATSC with no dynamic period, cannot init clock yet\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ROUTE with no dynamic period, cannot init clock yet\n"));
+			return;
+		}
+
+		//for m3u8 we force refreshing the root manifest, because the download session might be tuned on a child playlist
+		//which will not have the x-route-first-seg set
+		if (group->dash->is_m3u8) {
+			gf_dash_download_resource(group->dash, &(group->dash->mpd_dnload), group->dash->base_url, 0, 0, 1, NULL);
+		}
+		val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-route-first-seg");
+		if (!val) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Waiting for ROUTE clock ...\n"));
 			return;
 		}
 
@@ -555,11 +695,6 @@
 			u32 j, len, nb_space=0;
 			GF_MPD_AdaptationSet *set;
 			char *sep, *start, *end, *seg_url = NULL;
-			val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-dash-first-seg");
-			if (!val) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Waiting for ATSC clock ...\n"));
-				return;
-			}
 
 			set = gf_list_get(dyn_period->adaptation_sets, i);
 			for (j=0; j<gf_list_count(set->representations); j++) {
@@ -568,7 +703,23 @@
 
 				dyn_period->duration = 0;
 
-				gf_mpd_resolve_url(group->dash->mpd, rep, set, dyn_period, "./", 0, GF_MPD_RESOLVE_URL_MEDIA_NOSTART, 9876, 0, &seg_url, &sr, &sr, &seg_dur, NULL, NULL, NULL);
+				if (group->dash->is_m3u8) {
+					u32 k, count;
+					if (found) break;
+					if (!rep->segment_list)
+						continue;
+					count = gf_list_count(rep->segment_list->segment_URLs);
+					for (k=0; k<count; k++) {
+						GF_MPD_SegmentURL *surl = gf_list_get(rep->segment_list->segment_URLs, k);
+						if (surl->media && strstr(surl->media, val)) {
+							found = k+1;
+							break;
+						}
+					}
+					continue;
+				}
+
+				gf_mpd_resolve_url(group->dash->mpd, rep, set, dyn_period, "./", 0, GF_MPD_RESOLVE_URL_MEDIA_NOSTART, 9876, 0, &seg_url, &sr, &sr, &seg_dur, NULL, NULL, NULL, NULL);
 
 				dyn_period->duration = dur;
 
@@ -587,7 +738,7 @@
 					u32 number=0;
 					char szTemplate[100];
 
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Resolve ATSC clock on bootstrap segment URL %s template %s\n", val, seg_url+2));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Resolve ROUTE clock on bootstrap segment URL %s template %s\n", val, seg_url+2));
 
 					strcpy(szTemplate, seg_url+2);
 					strcat(szTemplate, "%");
@@ -600,18 +751,25 @@
 					strcat(szTemplate, end);
 					if (sscanf(val, szTemplate, &number) == 1) {
 						u32 startNum = 1;
-						//safety check for now, in case one of the segment is send too early compared to the rest
-						if (number) number--;
 						if (dyn_period->segment_template) startNum = dyn_period->segment_template->start_number;
 						if (set->segment_template) startNum = set->segment_template->start_number;
 						if (rep->segment_template) startNum = rep->segment_template->start_number;
 						if (number>=startNum) {
-							timeline_offset_ms = seg_dur*(number-startNum);
+ //clock is init which means the segment is available, so the timeline offset must match the AST of the segment (includes seg dur)
+
+ const char *ll_val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-route-ll");
+ if (ll_val && !strcmp(ll_val, "yes")) {
+ //low latency case, we are currently receiving the segment
+ group->dash->route_low_latency = GF_TRUE;
+ number--;
+ }
+ 
+ timeline_offset_ms = seg_dur * ( 1 + number - startNum);
 						}
-						found = GF_TRUE;
+						found = 1;
 					}
 				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] ATSC bootstrap segment URL %s does not match template %s for rep #%d\n", val, seg_url+2, j+1));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] ROUTE bootstrap segment URL %s does not match template %s for rep #%d\n", val, seg_url+2, j+1));
 				}
 				gf_free(seg_url);
 				if (found) break;
@@ -619,29 +777,53 @@
 			if (found) break;
 		}
 		if (found) {
-			//adjust so that nb_seg = current_time/segdur = (fetch-ast)/seg_dur;
-			// = (fetch- ( mpd->availabilityStartTime + group->dash->utc_shift + group->dash->utc_drift_estimate) / segdur;
-			//hence nb_seg*seg_dur = fetch - mpd->availabilityStartTime - group->dash->utc_shift - group->dash->utc_drift_estimate
-			//so group->dash->utc_drift_estimate = fetch - (mpd->availabilityStartTime + nb_seg*seg_dur)
-
+			if (group->dash->is_m3u8) {
+				//purge segments (we assume we roughly are in the same state on all child playlists, we could keep one for safety)
+				for (i=0; i<gf_list_count(dyn_period->adaptation_sets); i++) {
+					u32 j;
+					GF_MPD_AdaptationSet *set = gf_list_get(dyn_period->adaptation_sets, i);
+					for (j=0; j<gf_list_count(set->representations); j++) {
+						u32 to_rem;
+						rep = gf_list_get(set->representations, j);
+						if (!rep->segment_list) continue;
+						to_rem = found-1;
+						while (to_rem) {
+							GF_MPD_SegmentURL *surl = gf_list_pop_front(rep->segment_list->segment_URLs);
+							gf_mpd_segment_url_free(surl);
+							to_rem--;
+						}
+					}
+				}
+			} else {
+				//adjust so that nb_seg = current_time/segdur = (fetch-ast)/seg_dur;
+				// = (fetch- ( mpd->availabilityStartTime + group->dash->utc_shift + group->dash->utc_drift_estimate) / segdur;
+				//hence nb_seg*seg_dur = fetch - mpd->availabilityStartTime - group->dash->utc_shift - group->dash->utc_drift_estimate
+				//so group->dash->utc_drift_estimate = fetch - (mpd->availabilityStartTime + nb_seg*seg_dur)
 
-			u64 utc = mpd->availabilityStartTime + dyn_period->start + timeline_offset_ms;
-			group->dash->utc_drift_estimate = ((s64) fetch_time - (s64) utc);
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff of ATSC broadcast "LLD" ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU" - bootstraping on segment %s\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime, val));
 
-			group->dash->atsc_clock_state = 2;
+				u64 utc = mpd->availabilityStartTime + dyn_period->start + timeline_offset_ms;
+				group->dash->utc_drift_estimate = ((s64) fetch_time - (s64) utc);
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff of ROUTE broadcast "LLD" ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU" - bootstraping on segment %s\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime, val));
+			}
+			group->dash->route_clock_state = 2;
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Failed to setup ATSC clock from segment template with bootstrap URL %s, using NTP\n", val));
-			group->dash->atsc_clock_state = 3;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Failed to setup ROUTE clock from segment template with bootstrap URL %s, using NTP\n", val));
+			group->dash->route_clock_state = 3;
+		}
+		if (mpd->type==GF_MPD_TYPE_STATIC) {
+			if (found)
+				group->dash->route_skip_segments_ms = (u32) timeline_offset_ms;
+			group->timeline_setup = GF_TRUE;
+			return;
 		}
 	}
 	else if (val) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] ATSC clock already setup - UTC diff of ATSC broadcast "LLD" ms\n", group->dash->utc_drift_estimate));
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] ROUTE clock already setup - UTC diff of ROUTE broadcast "LLD" ms\n", group->dash->utc_drift_estimate));
 	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] No ATSC entity on HTPP request\n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] No ROUTE entity on HTTP request\n"));
 	}
 
-	if (!group->dash->atsc_clock_state || (group->dash->atsc_clock_state>2)) {
+	if (!group->dash->route_clock_state || (group->dash->route_clock_state>2)) {
 		GF_MPD_ProducerReferenceTime *pref = gf_list_get(group->adaptation_set->producer_reference_time, 0);
 		if (pref)
 			utc_timing = pref->utc_timing;
@@ -684,7 +866,7 @@
 		}
 	}
 
-	if ((!group->dash->atsc_clock_state || (group->dash->atsc_clock_state>2))
+	if ((!group->dash->route_clock_state || (group->dash->route_clock_state>2))
 		&& !group->dash->ntp_forced
 		&& group->dash->estimate_utc_drift
 		&& !group->dash->utc_drift_estimate
@@ -709,10 +891,11 @@
 
 			//HTTP date is in second - if the clock diff is less than 1 sec, we cannot infer anything
 			if (ABS(drift_estimate) > 1000) {
-				group->dash->utc_drift_estimate = drift_estimate;
+				group->dash->utc_drift_estimate = 1 + drift_estimate;
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff between client and server "LLD" ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU"\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime));
 			} else {
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] No UTC diff between client and server (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU"\n", fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime));
+				group->dash->utc_drift_estimate = 1;
 			}
 		}
 	}
@@ -780,6 +963,8 @@
 		u64 start = 0;
 		for (i=0; i<gf_list_count(group->dash->mpd->periods); i++) {
 			GF_MPD_Period *ap = gf_list_get(group->dash->mpd->periods, i);
+			if (ap->is_preroll) continue;
+
 			if (ap->start) start = ap->start;
 
 			if (group->dash->initial_period_tunein
@@ -801,10 +986,11 @@
 	}
 
 	//compute current time in period
-	if (current_time < group->period->start)
+	if (current_time < group->period->start) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Period will start in %d ms\n", group->period->start - current_time));
 		current_time = 0;
-	else {
-		if (group->dash->initial_period_tunein) {
+	} else {
+		if (group->dash->initial_period_tunein || group->force_timeline_reeval) {
 			current_time -= group->period->start;
 		} else {
 			//initial period was setup, consider we are moving to a new period, so time in this period is 0
@@ -874,6 +1060,8 @@
 		if (rep->segment_template->start_number) start_number = rep->segment_template->start_number;
 		if (rep->segment_template->availability_time_offset) ast_offset = rep->segment_template->availability_time_offset;
 	}
+	if (start_number==(u32) -1)
+		start_number = 1;
 
 	group->is_low_latency = GF_FALSE;
 	if (group->dash->low_latency_mode==GF_DASH_LL_DISABLE) {
@@ -960,8 +1148,8 @@
 		}
 		//check if we're ahead of time but "reasonnably" ahead (max 1 min) - otherwise consider the timing is broken
 		if ((current_time_rescale + last_s_dur >= segtime) && (current_time_rescale <= segtime + 60*timescale)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] current time "LLU" is greater than last SegmentTimeline end "LLU" - defaulting to last entry in SegmentTimeline\n", current_time_rescale, segtime));
-			group->download_segment_index = seg_idx-1;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] current time "LLU" is greater than last SegmentTimeline end "LLU" by %g sec - defaulting to last entry in SegmentTimeline\n", current_time_rescale, segtime, (Double) (current_time_rescale - segtime)/timescale ));
+			group->download_segment_index = (seg_idx > 2) ? (seg_idx-2) : 0;
 			group->nb_segments_in_rep = seg_idx;
 			//we can't trust our UTC check, play from last segment with start_range=0 (eg from start of first segment)
 			group->start_playback_range = 0;
@@ -988,16 +1176,20 @@
 		nb_seg /= group->segment_duration;
 		shift = (u32) nb_seg;
 
-		if ((group->dash->atsc_clock_state == 2) && shift) {
-			//shift currently points to the next segment after the one used for clock bootstrap, use the right one
-			shift--;
-			//avoid querying too early the cache since segments do not usually arrive exactly on time ...
-			availabilityStartTime += group->dash->atsc_ast_shift;
+		if ((group->dash->route_clock_state == 2) && shift) {
+			//shift currently points to the next segment after the one used for clock bootstrap
+ if (!group->dash->route_low_latency)
+ shift--;
+ //avoid querying too early the cache since segments do not usually arrive exactly on time ...
+			availabilityStartTime += group->dash->route_ast_shift;
 		}
 
-		if (group->dash->initial_period_tunein) {
+		if (group->dash->initial_period_tunein || group->force_timeline_reeval) {
 			u64 seg_start_ms, seg_end_ms;
-
+			if (group->force_timeline_reeval) {
+				group->start_number_at_last_ast = 0;
+				group->force_timeline_reeval = GF_FALSE;
+			}
 			seg_start_ms = (u64) (group->segment_duration * (shift+start_number) * 1000);
 			seg_end_ms = (u64) (seg_start_ms + group->segment_duration*1000);
 			//we are in the right period
@@ -1027,7 +1219,7 @@
 
 		if (!group->dash->initial_time_shift_value) {
 			Double time_in_seg;
-			//by default playback starts at begining of segment
+			//by default playback starts at beginning of segment
 			group->start_playback_range = shift * group->segment_duration;
 
 			time_in_seg = (Double) current_time/1000.0;
@@ -1095,26 +1287,24 @@
 	}
 }
 
+static void gf_dash_group_timeline_setup(GF_MPD *mpd, GF_DASH_Group *group, u64 fetch_time)
+{
+	u32 i;
 
+	if (!fetch_time) {
+		//when we initialize the timeline without an explicit fetch time, use our local clock - this allows for better precision
+		//when trying to locate the live edge
+		fetch_time = gf_net_get_utc();
+	}
+	gf_dash_group_timeline_setup_single(mpd, group, fetch_time);
 
-
-
-/*!
-* Returns true if given mime type is a MPD file
-\param mime the mime-type to check
-\return true if mime-type if MPD-OK
-*/
-static Bool gf_dash_is_dash_mime(const char *mime) {
-	u32 i;
-	if (!mime)
-		return GF_FALSE;
-	for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i] ; i++) {
-		if ( !stricmp(mime, GF_DASH_MPD_MIME_TYPES[i]))
-			return GF_TRUE;
+	//also init all dependend groups for the same time
+	for (i=0; i<gf_list_count(group->groups_depending_on); i++) {
+		GF_DASH_Group *d_grp = gf_list_get(group->groups_depending_on, i);
+		gf_dash_group_timeline_setup_single(mpd, d_grp, fetch_time);
+		d_grp->timeline_setup = GF_TRUE;
 	}
-	return GF_FALSE;
 }
-
 /*!
 * Returns true if mime type of a given URL is an M3U8 mime-type
 \param url The url to check
@@ -1135,31 +1325,38 @@
 	return GF_FALSE;
 }
 
-static Bool gf_dash_is_smooth_mime(const char *url, const char * mime)
+GF_EXPORT
+GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 group_idx, u32 bits_per_sec, u64 total_bytes, u64 bytes_done, u64 us_since_start)
 {
-	u32 i;
-	if (!url || !mime)
-		return GF_FALSE;
-	if (strstr(url, ".mpd") || strstr(url, ".MPD"))
-		return GF_FALSE;
+	s32 res;
+	GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
+	if (!group) return GF_BAD_PARAM;
 
-	for (i = 0 ; GF_DASH_SMOOTH_MIME_TYPES[i] ; i++) {
-		if ( !stricmp(mime, GF_DASH_SMOOTH_MIME_TYPES[i]))
-			return GF_TRUE;
+	if (! dash->rate_adaptation_download_monitor) return GF_OK;
+	//do not abort if other groups depend on this one
+	if (group->groups_depending_on) return GF_OK;
+	if (group->dash->disable_switching) return GF_OK;
+	if (!total_bytes || !bytes_done || !bits_per_sec) return GF_OK;
+	if (total_bytes == bytes_done) {
+		//in test mode always call to make sure we cover the callback
+		if (!gf_sys_is_test_mode())
+			return GF_OK;
 	}
-	return GF_FALSE;
-}
 
+	//force a call go query buffer
+	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CODEC_STAT_QUERY, group_idx, GF_OK);
 
-GF_EXPORT
-GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 idx)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group) return GF_BAD_PARAM;
+	res = dash->rate_adaptation_download_monitor(dash, group, bits_per_sec, total_bytes, bytes_done, us_since_start, group->buffer_occupancy_ms, (u32) group->current_downloaded_segment_duration);
 
-	if (dash->rate_adaptation_download_monitor)
-		return dash->rate_adaptation_download_monitor(dash, group);
+	if (res==-1) return GF_OK;
 
+	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_ABORT_DOWNLOAD, group->groups_idx, GF_OK);
+
+	//internal return value, switching has already been setup
+	if (res<0) return GF_OK;
+
+	group->force_segment_switch = GF_TRUE;
+	group->force_representation_idx_plus_one = (u32) res + 1;
 	return GF_OK;
 }
 
@@ -1182,13 +1379,13 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading %s starting at UTC "LLU" ms\n", url, gf_net_get_utc() ));
 
 	if (group) {
-		group_idx = gf_list_find(group->dash->groups, group);
+		group_idx = group->groups_idx;
 	}
 
 	if (! *sess) {
 		*sess = dash_io->create(dash_io, persistent_mode ? 1 : 0, url, group_idx);
 		if (!(*sess)) {
-			if (dash->atsc_clock_state)
+			if (dash->route_clock_state)
 				return GF_IP_NETWORK_EMPTY;
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot try to download %s... out of memory ?\n", url));
 			return GF_OUT_OF_MEM;
@@ -1198,16 +1395,12 @@
 		if (persistent_mode!=2) {
 			e = dash_io->setup_from_url(dash_io, *sess, url, group_idx);
 			if (e) {
-				//with ATSC we may have 404 right away if nothing in cache yet, not an error
-				GF_LOG(dash->atsc_clock_state ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup downloader for url %s: %s\n", url, gf_error_to_string(e) ));
+				//with ROUTE we may have 404 right away if nothing in cache yet, not an error
+				GF_LOG(dash->route_clock_state ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup downloader for url %s: %s\n", url, gf_error_to_string(e) ));
 				return e;
 			}
 		}
 	}
-	if (group) {
-		group->is_downloading = GF_TRUE;
-		group->download_start_time = gf_sys_clock();
-	}
 
 retry:
 
@@ -1220,9 +1413,6 @@
 				return gf_dash_download_resource(dash, sess, url, start_range, end_range, persistent_mode ? 1 : 0, group);
 			}
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot setup byte-range download for %s: %s\n", url, gf_error_to_string(e) ));
-			if (group)
-				group->is_downloading = GF_FALSE;
-
 			return e;
 		}
 	}
@@ -1238,27 +1428,12 @@
 			if (mime && !group->service_mime) {
 				group->service_mime = gf_strdup(mime);
 			}
-			/*we allow servers to give us broken mim types for the representation served ...*/
-#if 0
-			else if (mime && stricmp(group->service_mime, mime)) {
-				GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-				if (! gf_dash_get_mime_type(NULL, rep, group->adaptation_set) )
-					rep->mime_type = gf_strdup(mime);
-				rep->disabled = 1;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Disabling representation since mime does not match: expected %s, but had %s for %s!\n", group->service_mime, mime, url));
-				group->force_switch_bandwidth = 1;
-				if (group->segment_download) dash_io->abort(dash_io, group->segment_download);
-				group->is_downloading = 0;
-				return GF_OK;
-			}
-#endif
+
 
 			/*file cannot be cached on disk !*/
 			if (dash_io->get_cache_name(dash_io, *sess ) == NULL) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s cannot be cached on disk, will use direct streaming\n", url));
 				group->segment_must_be_streamed = GF_TRUE;
-				if (group->segment_download) dash_io->abort(dash_io, group->segment_download);
-				group->is_downloading = GF_TRUE;
 				return GF_OK;
 			}
 			group->segment_must_be_streamed = GF_FALSE;
@@ -1270,10 +1445,7 @@
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At "LLU" error %s - released dl_mutex\n", gf_net_get_utc(), gf_error_to_string(e)));
 	}
-	if (group && group->download_abort_type) {
-		group->is_downloading = GF_FALSE;
-		return GF_IP_CONNECTION_CLOSED;
-	}
+
 	switch (e) {
 	case GF_IP_CONNECTION_FAILURE:
 	case GF_IP_NETWORK_FAILURE:
@@ -1283,8 +1455,6 @@
 			*sess = dash_io->create(dash_io, 0, url, group_idx);
 			if (! (*sess)) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retry to download %s... out of memory ?\n", url));
-				if (group)
-					group->is_downloading = GF_FALSE;
 				return GF_OUT_OF_MEM;
 			}
 
@@ -1302,12 +1472,9 @@
 		break;
 	default:
 		//log as warning, maybe the dash client can recover from this error
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Failed to download %s = %s...\n", url, gf_error_to_string(e)));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Failed to download %s: %s\n", url, gf_error_to_string(e)));
 		break;
 	}
-	if (group)
-		group->is_downloading = GF_FALSE;
-
 	return e;
 }
 
@@ -1530,14 +1697,15 @@
 		repeat = ent->repeat_count+1;
 		while (repeat) {
 			if (start_timescale==timescale) {
-				if (start_time == segment_start ) return idx;
+				if (start_time == segment_start )
+					return idx;
 				if (start_time > segment_start) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Warning: segment timeline entry start "LLU" greater than segment start "LLU", using current entry\n", start_time, segment_start));
 					return idx;
 				}
 			} else {
-				if (start_time*start_timescale == segment_start * timescale) return idx;
-				if (start_time*start_timescale > segment_start * timescale) {
+				if (gf_timestamp_equal(start_time, timescale, segment_start, start_timescale)) return idx;
+				if (gf_timestamp_greater(start_time, timescale, segment_start, start_timescale)) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Warning: segment timeline entry start "LLU" greater than segment start "LLU", using current entry\n", start_time, segment_start));
 					return idx;
 				}
@@ -1549,9 +1717,11 @@
 	}
 	//end of list in regular case: segment was the last one of the previous list and no changes happend
 	if (start_timescale==timescale) {
-		if (start_time == segment_start ) return idx;
+		if (start_time == segment_start )
+			return idx;
 	} else {
-		if (start_time*start_timescale == segment_start * timescale) return idx;
+		if (start_time*start_timescale == segment_start * timescale)
+			return idx;
 	}
 
 	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: could not find previous segment start in current timeline ! seeking to end of timeline\n"));
@@ -1624,10 +1794,23 @@
 
 #ifndef GPAC_DISABLE_LOG
 	if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO) ) {
+		u64 start = 0;
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Old SegmentTimeline: \n"));
+		for (idx=0; idx<gf_list_count(old_timeline->entries); idx++) {
+			ent = gf_list_get(old_timeline->entries, idx);
+			if (ent->start_time) start = ent->start_time;
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tt="LLU" d=%d r=%d (current start "LLU")\n", ent->start_time, ent->duration, ent->repeat_count, start));
+			start += ent->duration * (1+ent->repeat_count);
+		}
+
+
+		start = 0;
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] New SegmentTimeline: \n"));
 		for (idx=0; idx<gf_list_count(new_timeline->entries); idx++) {
 			ent = gf_list_get(new_timeline->entries, idx);
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tt="LLU" d=%d r=%d\n", ent->start_time, ent->duration, ent->repeat_count));
+			if (ent->start_time) start = ent->start_time;
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tt="LLU" d=%d r=%d (current start "LLU")\n", ent->start_time, ent->duration, ent->repeat_count, start));
+			start += ent->duration * (1+ent->repeat_count);
 		}
 	}
 #endif
@@ -1662,7 +1845,8 @@
 		}
 		/*this entry is in our range, keep it and make sure it has a start time*/
 		if (start_time + ent->duration >= min_start) {
-			if (!ent->start_time) ent->start_time = start_time;
+			if (!ent->start_time)
+				ent->start_time = start_time;
 			break;
 		}
 		start_time += ent->duration;
@@ -1696,7 +1880,7 @@
 	return nb_removed;
 }
 
-static GF_Err gf_dash_solve_representation_xlink(GF_DashClient *dash, GF_MPD_Representation *rep)
+static GF_Err gf_dash_solve_representation_xlink(GF_DashClient *dash, GF_MPD_Representation *rep, u8 last_sig[GF_SHA1_DIGEST_SIZE])
 {
 	u32 count, i;
 	GF_Err e;
@@ -1704,6 +1888,7 @@
 	const char *local_url;
 	char *url;
 	GF_DOMParser *parser;
+	u8 signature[GF_SHA1_DIGEST_SIZE];
 	if (!rep->segment_list->xlink_href) return GF_BAD_PARAM;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resolving Representation SegmentList XLINK %s\n", rep->segment_list->xlink_href));
@@ -1740,6 +1925,13 @@
 		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
 	}
 
+	gf_sha1_file(local_url, signature);
+	if (! memcmp(signature, last_sig, GF_SHA1_DIGEST_SIZE)) {
+		if (is_local) gf_free(url);
+		return GF_EOS;
+	}
+	memcpy(last_sig, signature, GF_SHA1_DIGEST_SIZE);
+
 	parser = gf_xml_dom_new();
 	e = gf_xml_dom_parse(parser, local_url, NULL, NULL);
 	if (is_local) gf_free(url);
@@ -1797,10 +1989,149 @@
 
 static void gf_dash_mark_group_done(GF_DASH_Group *group)
 {
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d group is done\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set) ));
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d group is done\n", 1+group->groups_idx ));
 	group->done = GF_TRUE;
 }
 
+
+static const char *dash_strip_base_url(const char *url, const char *base_url)
+{
+	const char *url_start = gf_url_get_path(url);
+	const char *base_url_start = gf_url_get_path(base_url);
+	const char *base_url_end = base_url_start ? strrchr(base_url_start, '/') : NULL;
+
+	if (base_url_start && url_start) {
+		u32 diff = (u32) (base_url_end - base_url_start);
+		if (!strncmp(url_start, base_url_start, diff))
+			return url_start + diff + 1;
+	}
+	return url;
+}
+
+static GF_Err gf_dash_solve_m3u8_representation_xlink(GF_DASH_Group *group, GF_MPD_Representation *rep, Bool *is_static, u64 *duration, u8 signature[GF_SHA1_DIGEST_SIZE])
+{
+	GF_Err e;
+	char *xlink_copy;
+	const char *name, *local_url;
+	GF_DashClient *dash = group->dash;
+	if (!dash->dash_io->manifest_updated) {
+		return gf_m3u8_solve_representation_xlink(rep, dash->base_url, &dash->getter, is_static, duration, signature);
+	}
+
+	xlink_copy = gf_url_concatenate(dash->base_url, rep->segment_list->xlink_href);
+	e = gf_m3u8_solve_representation_xlink(rep, dash->base_url, &dash->getter, is_static, duration, signature);
+	//do not notify m3u8 update if same as last one
+	if (e==GF_EOS) {
+		gf_free(xlink_copy);
+		return e;
+	}
+	
+	if (gf_url_is_local(xlink_copy)) {
+		local_url = xlink_copy;
+	} else {
+		local_url = dash->getter.get_cache_name(&dash->getter);
+	}
+	name = dash_strip_base_url(xlink_copy, dash->base_url);
+	dash->dash_io->manifest_updated(dash->dash_io, name, local_url, group->groups_idx);
+	gf_free(xlink_copy);
+	return e;
+}
+
+static u32 ls_hls_purge_segments(s32 live_edge_idx, GF_List *l)
+{
+	u32 i=0, count = gf_list_count(l);
+	u32 nb_removed_before_live = 0;
+
+	//first remove all ll chunks until live edge if set
+	if (live_edge_idx>=0) {
+		count = live_edge_idx;
+
+		for (i=0; i<count; i++) {
+			GF_MPD_SegmentURL *seg = gf_list_get(l, i);
+			if (!seg->hls_ll_chunk_type)
+				continue;
+
+			gf_list_rem(l, i);
+			gf_mpd_segment_url_free(seg);
+			i--;
+			count--;
+			live_edge_idx--;
+			nb_removed_before_live++;
+		}
+		if (live_edge_idx<0) return nb_removed_before_live;
+		count = gf_list_count(l);
+		//skip live edge
+		i++;
+
+		//skip parts following live edge
+		while (i<count) {
+			GF_MPD_SegmentURL *seg = gf_list_get(l, i);
+			if (!seg->hls_ll_chunk_type)
+				break;
+			i++;
+		}
+	}
+
+	//locate last full seg
+	while (i<count) {
+		GF_MPD_SegmentURL *seg = gf_list_get(l, count-1);
+		if (!seg->hls_ll_chunk_type)
+			break;
+		count--;
+		if (!count) break;
+	}
+	//purge the rest
+	for (; i<count; i++) {
+		GF_MPD_SegmentURL *seg = gf_list_get(l, i);
+		if (!seg->hls_ll_chunk_type)
+			continue;
+
+		gf_list_rem(l, i);
+		gf_mpd_segment_url_free(seg);
+		i--;
+		count--;
+	}
+	return nb_removed_before_live;
+}
+
+static void dash_check_chaining(GF_DashClient *dash, char *scheme_id, char **chain_ptr, u32 stack_state)
+{
+	char *sep;
+	GF_MPD_Descriptor *chaining = gf_mpd_get_descriptor(dash->mpd->essential_properties, scheme_id);
+	if (!chaining)
+		chaining = gf_mpd_get_descriptor(dash->mpd->supplemental_properties, scheme_id);
+
+	if (chain_ptr) {
+		if (*chain_ptr) gf_free(*chain_ptr);
+		*chain_ptr = NULL;
+	}
+
+	if (!chaining) return;
+
+	dash->chain_stack_state = stack_state;
+	if ((stack_state==GF_DASH_CHAIN_POP) && !gf_list_count(dash->chain_stack))
+		dash->chain_stack_state = GF_DASH_CHAIN_REG;
+
+	if (!chain_ptr) return;
+
+	if (*chain_ptr) gf_free(*chain_ptr);
+	sep = strchr(chaining->value, ' ');
+	if (sep) sep[0] = 0;
+	*chain_ptr = gf_url_concatenate(dash->base_url, chaining->value);
+	if (!*chain_ptr)
+		*chain_ptr = gf_strdup(chaining->value);
+	if (sep) sep[0] = ' ';
+
+	if (*chain_ptr && (chain_ptr == &dash->chain_fallback)) {
+		if (!strcmp(dash->chain_fallback, dash->base_url)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Chain fallback URL is same as manifest, disabling fallback\n"));
+			gf_free(dash->chain_fallback);
+			dash->chain_fallback = NULL;
+		}
+	}
+}
+
+
 static GF_Err gf_dash_update_manifest(GF_DashClient *dash)
 {
 	GF_Err e;
@@ -1809,21 +2140,30 @@
 	u64 fetch_time=0;
 	GF_DOMParser *mpd_parser;
 	u8 signature[GF_SHA1_DIGEST_SIZE];
-	GF_MPD_Period *period, *new_period;
+	GF_MPD_Period *period=NULL, *new_period=NULL;
 	const char *local_url;
 	char mime[128];
 	char * purl;
-	Double timeline_start_time;
+	Double timeline_start_time=0;
 	GF_MPD *new_mpd=NULL;
 	Bool fetch_only = GF_FALSE;
+	u32 nb_group_unchanged = 0;
+	Bool has_reps_unchanged = GF_FALSE;
+
+	//HLS: do not reload the playlist, directly update the reps
+	if (dash->is_m3u8 && !dash->m3u8_reload_master) {
+		new_mpd = NULL;
+		new_period = NULL;
+		fetch_time = dash_get_fetch_time(dash);
+		period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+		goto process_m3u8_manifest;
+	}
 
 	if (!dash->mpd_dnload) {
 		local_url = purl = NULL;
 		if (!gf_list_count(dash->mpd->locations)) {
-			FILE *t = gf_fopen(dash->base_url, "rt");
-			if (t) {
+			if (gf_file_exists(dash->base_url)) {
 				local_url = dash->base_url;
-				gf_fclose(t);
 			}
 			if (!local_url) {
 				/*we will no longer attempt to update the MPD ...*/
@@ -1869,8 +2209,12 @@
 		e = gf_dash_download_resource(dash, &(dash->mpd_dnload), purl, 0, 0, 0, NULL);
 		if (e!=GF_OK) {
 			if (!dash->in_error) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: download problem %s for MPD file\n", gf_error_to_string(e)));
-				dash->in_error = GF_TRUE;
+				if (e==GF_URL_ERROR) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update manifest: %s, aborting\n", gf_error_to_string(e)));
+					dash->in_error = GF_TRUE;
+				} else {
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Error while fetching new manifest (%s) - will retry later\n", gf_error_to_string(e)));
+				}
 			}
 			gf_free(purl);
 			//try to refetch MPD every second
@@ -1896,8 +2240,6 @@
 				gf_mpd_del(new_mpd);
 				return GF_NON_COMPLIANT_BITSTREAM;
 			}
-		} else if (strlen(mime) && !gf_dash_is_dash_mime(mime)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] mime '%s' should be m3u8 or mpd\n", mime));
 		}
 
 		gf_free(purl);
@@ -1910,7 +2252,6 @@
 			dash->base_url = gf_strdup(purl);
 
 		}
-
 		purl = NULL;
 	}
 
@@ -1954,6 +2295,11 @@
 		dash->reload_count = 0;
 		memcpy(dash->lastMPDSignature, signature, GF_SHA1_DIGEST_SIZE);
 
+		if (dash->dash_io->manifest_updated) {
+			char *szName = gf_file_basename(dash->base_url);
+			dash->dash_io->manifest_updated(dash->dash_io, szName, local_url, -1);
+		}
+
 		/* It means we have to reparse the file ... */
 		/* parse the MPD */
 		mpd_parser = gf_xml_dom_new();
@@ -1964,7 +2310,10 @@
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		new_mpd = gf_mpd_new();
-		e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), new_mpd, purl);
+		if (dash->is_smooth)
+			e = gf_mpd_init_smooth_from_dom(gf_xml_dom_get_root(mpd_parser), new_mpd, purl);
+		else
+			e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), new_mpd, purl);
 		gf_xml_dom_del(mpd_parser);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in MPD creation %s\n", gf_error_to_string(e)));
@@ -1993,7 +2342,7 @@
 #endif
 
 	//if current period was a remote period, do a pass on the new manifest periods, check for xlink
-	if (period->origin_base_url) {
+	if (period->origin_base_url || period->broken_xlink) {
 restart_period_check:
 		for (i=0; i<gf_list_count(new_mpd->periods); i++) {
 			new_period = gf_list_get(new_mpd->periods, i);
@@ -2010,7 +2359,7 @@
 				}
 				//this is a static period xlink, no need to further update the mpd, jsut swap the old periods in the new MPD
 
-				base_url = period->origin_base_url;
+				base_url = period->origin_base_url ? period->origin_base_url : period->broken_xlink;
 				if (!base_url) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - found new Xlink period overlapping a non-xlink period in original manifest\n"));
 					gf_mpd_del(new_mpd);
@@ -2020,8 +2369,9 @@
 				gf_list_rem(new_mpd->periods, i);
 				for (j=0; j<gf_list_count(dash->mpd->periods); j++) {
 					GF_MPD_Period *ap = gf_list_get(dash->mpd->periods, j);
-					if (!ap->origin_base_url) continue;
-					if (strcmp(ap->origin_base_url, base_url)) continue;
+					if (!ap->origin_base_url && !ap->broken_xlink) continue;
+					if (ap->origin_base_url && strcmp(ap->origin_base_url, base_url)) continue;
+					if (ap->broken_xlink && strcmp(ap->broken_xlink, base_url)) continue;
 					gf_list_rem(dash->mpd->periods, j);
 					j--;
 					gf_list_insert(new_mpd->periods, ap, insert_idx);
@@ -2051,7 +2401,7 @@
 
 			//assume the old period is no longer valid
 			dash->active_period_index = 0;
-			dash->request_period_switch = GF_TRUE;
+			dash->request_period_switch = 1;
 			for (i=0; i<gf_list_count(dash->groups); i++) {
 				GF_DASH_Group *group = gf_list_get(dash->groups, i);
 				gf_dash_mark_group_done(group);
@@ -2101,9 +2451,12 @@
 		return e;
 	}
 
+process_m3u8_manifest:
+
 	for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
-		GF_MPD_AdaptationSet *set, *new_set;
+		GF_MPD_AdaptationSet *set, *new_set=NULL;
 		u32 rep_i;
+		u32 nb_rep_unchanged = 0;
 		GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
 
 		/*update info even if the group is not selected !*/
@@ -2111,38 +2464,45 @@
 			continue;
 
 		set = group->adaptation_set;
-		new_set = gf_list_get(new_period->adaptation_sets, group_idx);
 
-		//sort by bandwidth and quality
-		for (rep_i = 1; rep_i < gf_list_count(new_set->representations); rep_i++) {
-			Bool swap=GF_FALSE;
-			GF_MPD_Representation *r2 = gf_list_get(new_set->representations, rep_i);
-			GF_MPD_Representation *r1 = gf_list_get(new_set->representations, rep_i-1);
-			if (r1->bandwidth > r2->bandwidth) {
-				swap=GF_TRUE;
-			} else if ((r1->bandwidth == r2->bandwidth) && (r1->quality_ranking<r2->quality_ranking)) {
-				swap=GF_TRUE;
-			}
-			if (swap) {
-				gf_list_rem(new_set->representations, rep_i);
-				gf_list_insert(new_set->representations, r2, rep_i-1);
-				rep_i=0;
+		if (new_period) {
+			new_set = gf_list_get(new_period->adaptation_sets, group_idx);
+
+			//sort by bandwidth and quality
+			for (rep_i = 1; rep_i < gf_list_count(new_set->representations); rep_i++) {
+				Bool swap=GF_FALSE;
+				GF_MPD_Representation *r2 = gf_list_get(new_set->representations, rep_i);
+				GF_MPD_Representation *r1 = gf_list_get(new_set->representations, rep_i-1);
+				if (r1->bandwidth > r2->bandwidth) {
+					swap=GF_TRUE;
+				} else if ((r1->bandwidth == r2->bandwidth) && (r1->quality_ranking<r2->quality_ranking)) {
+					swap=GF_TRUE;
+				}
+				if (swap) {
+					gf_list_rem(new_set->representations, rep_i);
+					gf_list_insert(new_set->representations, r2, rep_i-1);
+					rep_i=0;
+				}
 			}
-		}
 
-		if (gf_list_count(new_set->representations) != gf_list_count(group->adaptation_set->representations)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing representation in adaptation set\n"));
-			gf_mpd_del(new_mpd);
-			return GF_NON_COMPLIANT_BITSTREAM;
+			if (gf_list_count(new_set->representations) != gf_list_count(group->adaptation_set->representations)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing representation in adaptation set\n"));
+				gf_mpd_del(new_mpd);
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
 		}
 
 		/*get all representations in both periods*/
 		for (rep_idx = 0; rep_idx <gf_list_count(group->adaptation_set->representations); rep_idx++) {
 			GF_List *segments, *new_segments;
 			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_idx);
-			GF_MPD_Representation *new_rep = gf_list_get(new_set->representations, rep_idx);
+			GF_MPD_Representation *new_rep = new_set ? gf_list_get(new_set->representations, rep_idx) : NULL;
+			GF_MPD_Representation *hls_temp_rep = NULL;
+
+			rep->playback.not_modified = GF_FALSE;
 
 			if (rep->segment_base || group->adaptation_set->segment_base || period->segment_base) {
+				assert(new_rep);
 				if (!new_rep->segment_base && !new_set->segment_base && !new_period->segment_base) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment base as previous version\n"));
 					gf_mpd_del(new_mpd);
@@ -2154,6 +2514,7 @@
 			}
 
 			else if (rep->segment_template || group->adaptation_set->segment_template || period->segment_template) {
+				assert(new_rep);
 				if (!new_rep->segment_template && !new_set->segment_template && !new_period->segment_template) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment template as previous version\n"));
 					gf_mpd_del(new_mpd);
@@ -2183,11 +2544,29 @@
 				/*OK, this rep is fine*/
 			}
 			else {
+				Bool same_rep = GF_FALSE;
 				/*we're using segment list*/
 				assert(rep->segment_list || group->adaptation_set->segment_list || period->segment_list);
 
-				//if we have a xlink_href in segment_list, solve it
-				while (new_rep->segment_list->xlink_href && (group->active_rep_index==rep_idx)) {
+				//HLS case
+				if (!new_rep) {
+					assert(rep->segment_list);
+					assert(rep->segment_list->previous_xlink_href || rep->segment_list->xlink_href);
+					hls_temp_rep = gf_mpd_representation_new();
+					GF_SAFEALLOC(hls_temp_rep->segment_list, GF_MPD_SegmentList);
+					hls_temp_rep->segment_list->segment_URLs = gf_list_new();
+					if (rep->segment_list->xlink_href)
+						hls_temp_rep->segment_list->xlink_href = gf_strdup(rep->segment_list->xlink_href);
+					else
+						hls_temp_rep->segment_list->xlink_href = gf_strdup(rep->segment_list->previous_xlink_href);
+
+					new_rep = hls_temp_rep;
+				}
+				if (group->active_rep_index!=rep_idx)
+					same_rep = GF_TRUE;
+
+				//if we have a xlink_href in segment_list, solve it for the active quality only
+				while (new_rep->segment_list->xlink_href && !same_rep) {
 					u32 retry=10;
 					Bool is_static = GF_FALSE;
 					u64 dur = 0;
@@ -2198,11 +2577,18 @@
 
 					while (retry) {
 						if (dash->is_m3u8) {
-							e = gf_m3u8_solve_representation_xlink(new_rep, &group->dash->getter, &is_static, &dur);
+							if (!rep_idx)
+								rep_idx = 0;
+							e = gf_dash_solve_m3u8_representation_xlink(group, new_rep, &is_static, &dur, rep->playback.xlink_digest);
 						} else {
-							e = gf_dash_solve_representation_xlink(group->dash, new_rep);
+							e = gf_dash_solve_representation_xlink(group->dash, new_rep, rep->playback.xlink_digest);
 						}
 						if (e==GF_OK) break;
+						if (e==GF_EOS) {
+							same_rep = GF_TRUE;
+							e = GF_OK;
+							break;
+						}
 						if (e==GF_NON_COMPLIANT_BITSTREAM) break;
 						if (e==GF_OUT_OF_MEM) break;
 						if (group->dash->dash_state != GF_DASH_STATE_RUNNING)
@@ -2212,19 +2598,34 @@
 						retry --;
 					}
 
+					if (same_rep) break;
+
 					if (e==GF_OK) {
 						if (dash->is_m3u8 && is_static) {
 							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[m3u8] MPD type changed from dynamic to static\n"));
 							group->dash->mpd->type = GF_MPD_TYPE_STATIC;
-							group->dash->mpd->media_presentation_duration = dur;
 							group->dash->mpd->minimum_update_period = 0;
-							group->period->duration = dur;
+							if (group->dash->mpd->media_presentation_duration < dur)
+								group->dash->mpd->media_presentation_duration = dur;
+							if (group->period->duration < dur)
+								group->period->duration = dur;
 						}
 					}
 				}
 
+				if (same_rep==GF_TRUE) {
+					rep->playback.not_modified = GF_TRUE;
+					nb_rep_unchanged ++;
+					has_reps_unchanged = GF_TRUE;
+					if (hls_temp_rep)
+						gf_mpd_representation_free(hls_temp_rep);
+					if (group->hls_next_seq_num) {
+						HLS_MIN_RELOAD_TIME(dash)
+					}
+					continue;
+				}
 
-				if (!new_rep->segment_list && !new_set->segment_list && !new_period->segment_list) {
+				if (!new_rep->segment_list && (!new_set || !new_set->segment_list) && (!new_period || !new_period->segment_list)) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment list as previous version\n"));
 					gf_mpd_del(new_mpd);
 					return GF_NON_COMPLIANT_BITSTREAM;
@@ -2235,74 +2636,296 @@
 				if (set->segment_list && set->segment_list->segment_URLs) segments = set->segment_list->segment_URLs;
 				if (rep->segment_list && rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
 
-				if (new_period->segment_list && new_period->segment_list->segment_URLs) new_segments = new_period->segment_list->segment_URLs;
-				if (new_set->segment_list && new_set->segment_list->segment_URLs) new_segments = new_set->segment_list->segment_URLs;
+				if (new_period && new_period->segment_list && new_period->segment_list->segment_URLs) new_segments = new_period->segment_list->segment_URLs;
+				if (new_set && new_set->segment_list && new_set->segment_list->segment_URLs) new_segments = new_set->segment_list->segment_URLs;
 				if (new_rep->segment_list && new_rep->segment_list->segment_URLs) new_segments = new_rep->segment_list->segment_URLs;
 
+				Bool skip_next_seg_url = GF_FALSE;
+				Bool has_ll_hls = GF_FALSE;
+				Bool live_edge_passed = GF_FALSE;
+				u32 dld_index_offset = 0;
+				GF_MPD_SegmentURL *first_added_chunk = NULL;
+				GF_MPD_SegmentURL *hls_last_chunk = group->llhls_edge_chunk;
+
+				if (dash->is_m3u8 && group->is_low_latency) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation #%d: merging segments, current live chunk %s\n", rep_idx+1, hls_last_chunk ? hls_last_chunk->media : "none"));
+
+					//active rep, figure out the diff between the scheduled last chunk and the download index
+					//typically if update_mpd is called after a segment is downloaded but before next segment is evaluated for download
+					//there is a diff of 1 seg
+					//we reapply this diff when updating download_segment_index below
+					if ((group->active_rep_index==rep_idx) && hls_last_chunk) {
+						s32 pos = gf_list_find(segments, hls_last_chunk);
+						if ((pos>=0) && (pos < group->download_segment_index))
+							dld_index_offset = (s32) group->download_segment_index - pos;
+					}
+				}
 
+//#define DUMP_LIST
+
+				if (dash->is_m3u8) {
+					//preprocess new segment list, starting from end and locate the most recent full segment already present
+					// in old list before the live edge
+					//we start browsing from old list since it is likely the last segments in new list are not present at all in the old
+					u32 nb_new_segs = gf_list_count(new_segments);
+					u32 nb_old_segs = gf_list_count(segments);
+					s32 purge_segs_until = -1;
+
+#ifdef DUMP_LIST
+					fprintf(stderr, "New list received:\n");
+					for (i=0; i<nb_new_segs; i++) {
+						GF_MPD_SegmentURL *surl = gf_list_get(new_segments, i);
+						fprintf(stderr, "\tsegment %s - chunk type %d\n", surl->media, surl->hls_ll_chunk_type);
+					}
+#endif
+
+
+					for (j=nb_old_segs; j>0; j--) {
+						GF_MPD_SegmentURL *old_seg = gf_list_get(segments, j-1);
+						//ignore chunks
+						if (old_seg->hls_ll_chunk_type) continue;
+						//if live edge dont't trash anything after it, append and parts merge is done below
+						if (hls_last_chunk && (hls_last_chunk->hls_seq_num <= old_seg->hls_seq_num)) continue;
+						for (i=nb_new_segs; i>0; i--) {
+							GF_MPD_SegmentURL *new_seg = gf_list_get(new_segments, i-1);
+							//ignore chunks
+							if (new_seg->hls_ll_chunk_type) continue;
+
+							//match, we will trash everything in new list until this point
+							if (old_seg->hls_seq_num == new_seg->hls_seq_num) {
+								purge_segs_until = (s32) i-1;
+								break;
+							}
+						}
+						if (purge_segs_until>=0) break;
+					}
+					while (purge_segs_until>=0) {
+						GF_MPD_SegmentURL *new_seg = gf_list_pop_front(new_segments);
+						gf_mpd_segment_url_free(new_seg);
+						purge_segs_until--;
+					}
+				}
+
+				//browse new list - this is for both DASH or HLS
 				for (i=0; i<gf_list_count(new_segments); i++) {
 					GF_MPD_SegmentURL *new_seg = gf_list_get(new_segments, i);
+					u32 nb_segs = gf_list_count(segments);
 					Bool found = GF_FALSE;
-					for (j=0; j<gf_list_count(segments); j++) {
+
+					//part of a segment
+					if (new_seg->hls_ll_chunk_type) {
+						has_ll_hls = GF_TRUE;
+
+						//remaining chunk of our live edge, add it (skip loop below)
+						if (skip_next_seg_url)
+							nb_segs = 0;
+					}
+
+					//find this segment in the old list
+					for (j = 0; j<nb_segs; j++) {
 						GF_MPD_SegmentURL *seg = gf_list_get(segments, j);
-						if (seg->media && new_seg->media && !strcmp(seg->media, new_seg->media)) {
-							found=1;
-							break;
+
+						//compare only segs or parts
+						if (new_seg->hls_ll_chunk_type && !seg->hls_ll_chunk_type)
+							continue;
+						if (!new_seg->hls_ll_chunk_type && seg->hls_ll_chunk_type)
+							continue;
+
+						//full segment
+						if (!seg->media || !new_seg->media || strcmp(seg->media, new_seg->media))
+							continue;
+
+						if (seg->media_range && new_seg->media_range) {
+							if ((seg->media_range->start_range != new_seg->media_range->start_range) ||
+								(seg->media_range->end_range != new_seg->media_range->end_range)
+							) {
+								continue;
+							}
 						}
-						if (seg->media_range && new_seg->media_range && (seg->media_range->start_range==new_seg->media_range->start_range) && (seg->media_range->end_range==new_seg->media_range->end_range) ) {
-							found=1;
-							break;
+						//we already had the segment, do not add
+						found = 1;
+
+						//this is the live edge !
+						if (seg==hls_last_chunk) {
+							skip_next_seg_url = GF_TRUE;
 						}
+						break;
 					}
+
+					//remove all part before live edge - parts after live edge with a full seg following will be purged once merged
+					if (!found && !skip_next_seg_url && new_seg->hls_ll_chunk_type && !live_edge_passed) {
+						found = GF_TRUE;
+					}
+					//first full seg after our live edge, insert before the first fragment of this segment still in our list
+					if (!new_seg->hls_ll_chunk_type && skip_next_seg_url && !found) {
+						//starting from our current live edge, rewind and insert after the first full segment found
+						s32 pos = group->download_segment_index;
+						//in case the download index is already on the next, not present segment
+						if (pos && (pos >= (s32) gf_list_count(segments)))
+							pos -= 1;
+
+						while (pos>0) {
+							GF_MPD_SegmentURL *prev = gf_list_get(segments, pos);
+							if (!prev) break;
+							if (!prev->hls_ll_chunk_type) {
+								gf_list_insert(segments, new_seg, pos+1);
+								pos = pos+1;
+								break;
+							}
+							pos--;
+						}
+						assert(pos>=0);
+						if (pos==0) {
+							gf_list_insert(segments, new_seg, 0);
+						}
+						//remove from new segments
+						gf_list_rem(new_segments, i);
+						i--;
+
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation #%d: Injecting segment %s before LL chunk\n", rep_idx+1, new_seg->media));
+						found = GF_TRUE;
+						//no longer at live edge point
+						skip_next_seg_url = GF_FALSE;
+						//edge is now passed, do not discard following parts
+						live_edge_passed = GF_TRUE;
+						first_added_chunk = NULL;
+					}
+
 					/*this is a new segment, merge it: we remove from new list and push to old one, before doing a final swap
 					this ensures that indexing in the segment_list is still correct after merging*/
 					if (!found) {
 						gf_list_rem(new_segments, i);
 						i--;
+
+						if (new_seg->hls_ll_chunk_type) {
+							if (!first_added_chunk) {
+								first_added_chunk = new_seg;
+							}
+						} else {
+							//we just flushed a new full seg, remove all parts
+							if (first_added_chunk) {
+								s32 pos = gf_list_find(segments, first_added_chunk);
+								assert(pos>=0);
+								while (pos < (s32) gf_list_count(segments)) {
+									GF_MPD_SegmentURL *surl = gf_list_pop_back(segments);
+									assert(surl->hls_ll_chunk_type);
+									gf_mpd_segment_url_free(surl);
+								}
+								first_added_chunk = NULL;
+							}
+						}
+
 						gf_list_add(segments, new_seg);
 						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation #%d: Adding new segment %s\n", rep_idx+1, new_seg->media));
 					}
 				}
 				/*what else should we check ?*/
 
+#ifdef DUMP_LIST
+				fprintf(stderr, "updated segment list before purge\n");
+				for (i=0; i<gf_list_count(segments); i++) {
+					GF_MPD_SegmentURL *surl = gf_list_get(segments, i);
+					fprintf(stderr, "\tsegment %s - chunk type %d\n", surl->media, surl->hls_ll_chunk_type);
+				}
+#endif
+
+				if (dash->is_m3u8) {
+					//also remove all segments older than min seq num in new rep
+					while (1) {
+						GF_MPD_SegmentURL *old_seg = gf_list_get(segments, 0);
+						if (!old_seg) break;
+						if (old_seg->hls_seq_num >= new_rep->m3u8_media_seq_min)
+							break;
+
+						gf_list_rem(segments, 0);
+						gf_mpd_segment_url_free(old_seg);
+						//rewind the current download index for non low-latency cases
+						//it is recomputed below for low-latency cases
+						if (group->download_segment_index) {
+							group->download_segment_index--;
+						}
+					}
+				} else {
+					//todo for MPD with rep update on xlink (no existing profile use this)
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation using segment list in live: purging not implemented, patch welcome\n"));
+				}
+
 				/*swap segment list content*/
 				gf_list_swap(new_segments, segments);
 
-				//HLS live: if a new time is set (active group only), we just switched betwwe qualities
+				/*LL-HLS, cleanup everything except part around "our" live edge and part at manifest live edge*/
+				if (has_ll_hls) {
+					s32 live_edge_idx = -1;
+					//active rep, find live edge index before purge
+					if (group->llhls_edge_chunk && (group->active_rep_index==rep_idx)) {
+						live_edge_idx = gf_list_find(new_segments, group->llhls_edge_chunk);
+					}
+					ls_hls_purge_segments(live_edge_idx, new_segments);
+
+					//active rep, update download_segment_index after purge
+					if (group->llhls_edge_chunk && (group->active_rep_index==rep_idx)) {
+						live_edge_idx = gf_list_find(new_segments, group->llhls_edge_chunk);
+						if (live_edge_idx>=0)
+							group->download_segment_index = (u32) live_edge_idx + dld_index_offset;
+					}
+				}
+
+#ifdef DUMP_LIST
+				fprintf(stderr, "%d updated segment list - min/max seq num in new list %d / %d\n", gf_sys_clock(), new_rep->m3u8_media_seq_min, new_rep->m3u8_media_seq_max);
+
+				for (i=0; i<gf_list_count(new_segments); i++) {
+					GF_MPD_SegmentURL *surl = gf_list_get(new_segments, i);
+					fprintf(stderr, "\tsegment %s - chunk type %d\n", surl->media, surl->hls_ll_chunk_type);
+				}
+#endif
+
+				//HLS live: if a new time is set (active group only), we just switched between qualities
 				//locate the segment with the same start time in the manifest, and purge previous ones
 				//it may happen that the manifest does still not contain the segment we are looking for, force an MPD update
-				if (group->hls_next_start_time && (group->active_rep_index==rep_idx)) {
-					u32 k;
+				if (group->hls_next_seq_num && (group->active_rep_index==rep_idx)) {
+					Bool found = GF_FALSE;
+					u32 k, count = gf_list_count(new_segments);
 
-					for (k=0; k<gf_list_count(new_segments); k++) {
-						s64 diff;
-						GF_MPD_SegmentURL *segu = (GF_MPD_SegmentURL *) gf_list_get(new_segments, k);
-						diff = (s64) group->hls_next_start_time;
-						diff -= (s64) segu->hls_utc_start_time;
-						if (abs( (s32) diff)<200) {
-							group->download_segment_index = k;
-							group->hls_next_start_time=0;
+					//browse new segment list in reverse order, looking for our desired seq num
+					for (k=count; k>0; k--) {
+						GF_MPD_SegmentURL *segu = (GF_MPD_SegmentURL *) gf_list_get(new_segments, k-1);
+						if (segu->hls_ll_chunk_type && !segu->is_first_part)
+							continue;
+
+						if (group->hls_next_seq_num == segu->hls_seq_num) {
+							group->download_segment_index = k-1;
+							found = GF_TRUE;
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] HLS switching qualities on %s%s\n", segu->media, segu->hls_ll_chunk_type ? " - live edge" : ""));
 							break;
 						}
-						//purge old segments
-						if (segu->hls_utc_start_time < group->hls_next_start_time) {
-							gf_mpd_segment_url_free(segu);
-							gf_list_rem(new_segments, k);
-							k--;
+						/*
+						"In order to play the presentation normally, the next Media Segment to load is the one with the
+						lowest Media Sequence Number that is greater than the Media Sequence Number of the last Media Segment loaded."
+
+						so we store this one, but continue until we find an exact match, if any
+						*/
+						else if (segu->hls_seq_num > group->hls_next_seq_num) {
+							group->download_segment_index = k-1;
+							found = GF_TRUE;
 						}
-						if (segu->hls_utc_start_time > group->hls_next_start_time) {
-							group->download_segment_index = k;
-							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Waiting for HLS segment start "LLU" but found segment at "LLU" - missing segment ?\n", group->hls_next_start_time, segu->hls_utc_start_time));
-							group->hls_next_start_time=0;
+						//seg num is lower than our requested next, abort browsing
+						else
 							break;
-						}
 					}
 					//not yet available
-					if (group->hls_next_start_time) {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Cannot find segment for given HLS start time "LLU" - forcing manifest update\n", group->hls_next_start_time));
-						dash->force_mpd_update=GF_TRUE;
-						//force sleep of half sec to avoid updating manifest too often - this will need refinement for low latency !!
-						gf_sleep(500);
+					if (!found) {
+						//use group last modification time
+						u32 timer = gf_sys_clock() - group->last_mpd_change_time;
+						if (!group->segment_duration || (timer < group->segment_duration * 2000) ) {
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Cannot find segment for given HLS SN %d - forcing manifest update\n", group->hls_next_seq_num));
+							HLS_MIN_RELOAD_TIME(dash)
+						} else {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment list has not been updated for more than %d ms - assuming end of period\n", timer));
+							gf_dash_mark_group_done(group);
+							group->hls_next_seq_num = 0;
+						}
+					} else {
+						group->hls_next_seq_num = 0;
 					}
 				}
 
@@ -2338,33 +2961,70 @@
 			/*what else should we check ??*/
 
 
-			/*switch all internal GPAC stuff*/
-			memcpy(&new_rep->playback, &rep->playback, sizeof(GF_DASH_RepresentationPlayback));
-			if (rep->playback.cached_init_segment_url) rep->playback.cached_init_segment_url = NULL;
-
-			if (!new_rep->mime_type) {
-				new_rep->mime_type = rep->mime_type;
-				rep->mime_type = NULL;
+			if (hls_temp_rep) {
+				//reswap segment lists: new segments contain the actual list
+				rep->segment_list->segment_URLs = new_segments;
+				new_rep->segment_list->segment_URLs = segments;
+				//gf_list_swap(new_segments, segments);
+
+				//destroy temporary rep
+				gf_mpd_representation_free(hls_temp_rep);
+				group->last_mpd_change_time = gf_sys_clock();
+			} else {
+				/*switch all internal GPAC stuff*/
+				memcpy(&new_rep->playback, &rep->playback, sizeof(GF_DASH_RepresentationPlayback));
+				if (rep->playback.cached_init_segment_url) rep->playback.cached_init_segment_url = NULL;
+
+				if (!new_rep->mime_type) {
+					new_rep->mime_type = rep->mime_type;
+					rep->mime_type = NULL;
+				}
 			}
 		}
 
 		/*update segmentTimeline at AdaptationSet level before switching the set (old setup needed to compute current timing of each group) */
-		e = gf_dash_merge_segment_timeline(group, NULL, set->segment_list, set->segment_template, new_set->segment_list, new_set->segment_template, timeline_start_time);
-		if (e) {
-			gf_mpd_del(new_mpd);
-			return e;
+		if (new_set) {
+			e = gf_dash_merge_segment_timeline(group, NULL, set->segment_list, set->segment_template, new_set->segment_list, new_set->segment_template, timeline_start_time);
+			if (e) {
+				gf_mpd_del(new_mpd);
+				return e;
+			}
+
+			if (nb_rep_unchanged == gf_list_count(new_set->representations))
+				nb_group_unchanged++;
+			else
+				group->last_mpd_change_time = gf_sys_clock();
 		}
 	}
 	//good to go, switch pointers
-	for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
+	for (group_idx=0; group_idx<gf_list_count(dash->groups) && new_period; group_idx++) {
 		Double seg_dur;
 		Bool reset_segment_count;
+		GF_MPD_AdaptationSet *new_as;
 		GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
+
 		/*update group/period to new period*/
 		j = gf_list_find(group->period->adaptation_sets, group->adaptation_set);
-		group->adaptation_set = gf_list_get(new_period->adaptation_sets, j);
+		new_as = gf_list_get(new_period->adaptation_sets, j);
+		assert(new_as);
+
+		if (has_reps_unchanged) {
+			//swap all unchanged reps from old MPD to new MPD
+			for (j=0; j<gf_list_count(group->adaptation_set->representations); j++) {
+				GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, j);
+				GF_MPD_Representation *new_rep = gf_list_get(new_as->representations, j);
+				if (!rep->playback.not_modified) continue;
+				gf_list_rem(group->adaptation_set->representations, j);
+				gf_list_rem(new_as->representations, j);
+				gf_list_insert(group->adaptation_set->representations, new_rep, j);
+				gf_list_insert(new_as->representations, rep, j);
+				rep->playback.not_modified = GF_FALSE;
+			}
+		}
+
+		/*swap group period/AS to new period/AS*/
+		group->adaptation_set = new_as;
 		group->period = new_period;
-		assert(group->adaptation_set);
 
 		j = gf_list_count(group->adaptation_set->representations);
 		assert(j);
@@ -2379,7 +3039,7 @@
 		}
 
 		if (force_timeline_setup) {
-			group->timeline_setup = 0;
+			group->timeline_setup = GF_FALSE;
 			group->start_number_at_last_ast = 0;
 			gf_dash_group_timeline_setup(new_mpd, group, fetch_time);
 		}
@@ -2438,28 +3098,138 @@
 
 exit:
 	/*swap MPDs*/
-	if (dash->mpd) {
-		if (!new_mpd->minimum_update_period && (new_mpd->type==GF_MPD_TYPE_DYNAMIC))
-			new_mpd->minimum_update_period = dash->mpd->minimum_update_period;
-		gf_mpd_del(dash->mpd);
+	if (new_mpd) {
+		if (dash->mpd) {
+			if (!new_mpd->minimum_update_period && (new_mpd->type==GF_MPD_TYPE_DYNAMIC))
+				new_mpd->minimum_update_period = dash->mpd->minimum_update_period;
+			gf_mpd_del(dash->mpd);
+		}
+		dash->mpd = new_mpd;
+
+		if (dash->chaining_mode) {
+			dash_check_chaining(dash, "urn:mpeg:dash:mpd-chaining:2016", &dash->chain_next, 0);
+			dash_check_chaining(dash, "urn:mpeg:dash:fallback:2016", &dash->chain_fallback, 0);
+			dash_check_chaining(dash, "urn:mpeg:dash:origin-set:2019", NULL, GF_DASH_CHAIN_PUSH);
+			dash_check_chaining(dash, "urn:mpeg:dash:origin-back:2019", NULL, GF_DASH_CHAIN_POP);
+		}
 	}
-	dash->mpd = new_mpd;
 	dash->last_update_time = gf_sys_clock();
 	dash->mpd_fetch_time = fetch_time;
 
 #ifndef GPAC_DISABLE_LOG
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Manifest after update:\n"));
-	for (i=0; i<gf_list_count(new_mpd->periods); i++) {
-		GF_MPD_Period *ap = gf_list_get(new_mpd->periods, i);
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tP#%d: start "LLU" - duration " LLU" - xlink %s\n", i+1, ap->start, ap->duration, ap->xlink_href ? ap->xlink_href : ap->origin_base_url ? ap->origin_base_url : "none"));
+	if (new_period) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Manifest after update:\n"));
+		for (i=0; i<gf_list_count(new_mpd->periods); i++) {
+			GF_MPD_Period *ap = gf_list_get(new_mpd->periods, i);
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tP#%d: start "LLU" - duration " LLU" - xlink %s\n", i+1, ap->start, ap->duration, ap->xlink_href ? ap->xlink_href : ap->origin_base_url ? ap->origin_base_url : "none"));
+		}
 	}
 #endif
 
 	return GF_OK;
 }
 
+static void m3u8_setup_timeline(GF_DASH_Group *group, GF_MPD_Representation *rep)
+{
+	u64 timeshift = 0;
+	u64 tsb_depth = 0;
+	u32 i, count;
+
+	if (!group->dash->initial_time_shift_value || !rep->segment_list) return;
+
+	count = gf_list_count(rep->segment_list->segment_URLs);
+	for (i=0; i<count; i++) {
+		GF_MPD_SegmentURL *s = gf_list_get(rep->segment_list->segment_URLs, i);
+		tsb_depth += s->duration;
+	}
+
+	if (group->dash->initial_time_shift_value<=100) {
+		timeshift = tsb_depth;
+		timeshift *= group->dash->initial_time_shift_value;
+		timeshift /= 100;
+	} else {
+		timeshift = (u32) group->dash->initial_time_shift_value;
+		timeshift *= rep->segment_list->timescale;
+		timeshift /= 1000;
+		if (timeshift > tsb_depth) timeshift = tsb_depth;
+	}
+	tsb_depth = 0;
+	for (i=count; i>0; i--) {
+		GF_MPD_SegmentURL *s = gf_list_get(rep->segment_list->segment_URLs, i-1);
+		tsb_depth += s->duration;
+		//only check on independent parts
+		if (s->hls_ll_chunk_type == 1)
+			continue;
+		if (tsb_depth > timeshift) {
+			group->download_segment_index = i-1;
+			break;
+		}
+	}
+}
+
 
-static void gf_dash_set_group_representation(GF_DASH_Group *group, GF_MPD_Representation *rep)
+static GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url, char **out_key_url, bin128 *out_key_iv, Bool *data_url_process, u32 *out_start_number)
+{
+	GF_Err e;
+	GF_MPD_AdaptationSet *set = group->adaptation_set;
+	GF_MPD_Period *period = group->period;
+	u32 timescale;
+
+	if (!mpd_url) return GF_BAD_PARAM;
+
+	if (!strncmp(mpd_url, "gfio://", 7))
+		mpd_url = gf_file_basename(gf_fileio_translate_url(mpd_url));
+
+	if (!group->timeline_setup) {
+		gf_dash_group_timeline_setup(mpd, group, 0);
+		//we must wait for ROUTE clock to initialize, even if first period is static remote (we need to know when to tune)
+		if (group->dash->route_clock_state==1)
+			return GF_IP_NETWORK_EMPTY;
+
+		if (group->dash->reinit_period_index)
+			return GF_IP_NETWORK_EMPTY;
+
+		group->timeline_setup = GF_TRUE;
+		item_index = group->download_segment_index;
+	}
+
+	gf_mpd_resolve_segment_duration(rep, set, period, segment_duration, &timescale, NULL, NULL);
+	*segment_duration = (resolve_type==GF_MPD_RESOLVE_URL_MEDIA) ? (u32) ((Double) ((*segment_duration) * 1000.0) / timescale) : 0;
+	e = gf_mpd_resolve_url(mpd, rep, set, period, mpd_url, group->current_base_url_idx, resolve_type, item_index, group->nb_segments_purged, out_url, out_range_start, out_range_end, segment_duration, is_in_base_url, out_key_url, out_key_iv, out_start_number);
+
+
+	if (e == GF_NON_COMPLIANT_BITSTREAM) {
+//		group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
+	}
+	if (!*out_url) {
+		return e;
+	}
+
+	if (*out_url && data_url_process && !strncmp(*out_url, "data:", 5)) {
+		char *sep;
+		sep = strstr(*out_url, ";base64,");
+		if (sep) {
+			GF_Blob *blob;
+			u32 len;
+			sep+=8;
+			len = (u32)strlen(sep) + 1;
+			GF_SAFEALLOC(blob, GF_Blob);
+			if (!blob) return GF_OUT_OF_MEM;
+
+			blob->data = (char *)gf_malloc(len);
+			blob->size = gf_base64_decode(sep, len, blob->data, len);
+			sprintf(*out_url, "gmem://%p", blob);
+			*data_url_process = GF_TRUE;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("data scheme with encoding different from base64 not supported\n"));
+		}
+	}
+
+	return e;
+}
+
+
+static void gf_dash_set_group_representation(GF_DASH_Group *group, GF_MPD_Representation *rep, Bool is_next_schedule)
 {
 #ifndef GPAC_DISABLE_LOG
 	u32 width=0, height=0, samplerate=0;
@@ -2469,20 +3239,63 @@
 	s32 timeshift;
 	GF_MPD_AdaptationSet *set;
 	GF_MPD_Period *period;
-	u32 nb_segs;
+	u32 ol_nb_segs_in_rep;
 	u32 i = gf_list_find(group->adaptation_set->representations, rep);
 	u32 prev_active_rep_index = group->active_rep_index;
 	u32 nb_cached_seg_per_rep = group->max_cached_segments / gf_dash_group_count_rep_needed(group);
 	assert((s32) i >= 0);
 
+	if (group->llhls_edge_chunk && group->llhls_edge_chunk->hls_ll_chunk_type) {
+		group->llhls_switch_request = i;
+		return;
+	}
+	group->llhls_switch_request = -1;
+
+	//we do not support switching in the middle of a segment
+	if (group->llhls_edge_chunk && group->llhls_edge_chunk->hls_ll_chunk_type) {
+		return;
+	}
+
+
+
 	/* in case of dependent representations: we set max_complementary_rep_index than active_rep_index*/
-	if (group->base_rep_index_plus_one)
+	if (group->base_rep_index_plus_one) {
 		group->max_complementary_rep_index = i;
-	else
+	} else {
+		//if VVC RPR switching, don't allow downswitch to more than half size (max for rpr)
+		//pickup lowest quality above current rep that fits rpr downsampling requirements
+		if (rep->playback.vvc_rpr_switch) {
+#ifndef GPAC_DISABLE_LOGS
+			u32 req_w=rep->width, req_h=rep->height;
+#endif
+			GF_MPD_Representation *orep = gf_list_get(group->adaptation_set->representations, prev_active_rep_index);
+			while (orep->playback.vvc_rpr_switch) {
+				if (!rep->playback.disabled
+					&& (rep->width * 2 >= orep->width)
+					&& (rep->height * 2 >= orep->height)
+				) {
+#ifndef GPAC_DISABLE_LOGS
+					if (req_w < rep->width) {
+						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Cannot switch VVC RPR from %dx%d to %dx%d, using higher resolution %dx%d\n", orep->width, orep->height, req_w, req_h, rep->width, rep->height));
+					}
+#endif
+					break;
+				}
+
+				i++;
+				if (i>=prev_active_rep_index) {
+					i = prev_active_rep_index;
+					rep = orep;
+					break;
+				}
+				rep = gf_list_get(group->adaptation_set->representations, i);
+			}
+		}
 		group->active_rep_index = i;
+	}
 	group->active_bitrate = rep->bandwidth;
 	group->max_cached_segments = nb_cached_seg_per_rep * gf_dash_group_count_rep_needed(group);
-	nb_segs = group->nb_segments_in_rep;
+	ol_nb_segs_in_rep = group->nb_segments_in_rep;
 
 	group->min_bandwidth_selected = GF_TRUE;
 	for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
@@ -2496,35 +3309,32 @@
 	while (rep->segment_list && rep->segment_list->xlink_href) {
 		Bool is_static = GF_FALSE;
 		u64 dur = 0;
-		u32 retry=10;
 		GF_Err e=GF_OK;
 
 		if (rep->segment_list->consecutive_xlink_count) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Resolving a XLINK pointed from another XLINK (%d consecutive XLINK in segment list)\n", rep->segment_list->consecutive_xlink_count));
 		}
 
-		while (retry) {
-			if (group->dash->is_m3u8) {
-				e = gf_m3u8_solve_representation_xlink(rep, &group->dash->getter, &is_static, &dur);
-			} else {
-				e = gf_dash_solve_representation_xlink(group->dash, rep);
-			}
-			if (e==GF_OK) break;
-			if (e==GF_NON_COMPLIANT_BITSTREAM) break;
-			if (group->dash->dash_state != GF_DASH_STATE_RUNNING)
-				break;
-
-			retry--;
-			gf_sleep(100);
+		if (group->dash->is_m3u8) {
+			e = gf_dash_solve_m3u8_representation_xlink(group, rep, &is_static, &dur, rep->playback.xlink_digest);
+		} else {
+			e = gf_dash_solve_representation_xlink(group->dash, rep, rep->playback.xlink_digest);
 		}
+		if (is_static)
+			group->dash->mpd->type = GF_MPD_TYPE_STATIC;
 
 		//after resolving xlink: if this represenstation is marked as disabled, we have nothing to do
 		if (rep->playback.disabled)
 			return;
 
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Could not reslove XLINK %s in time - using old representation\n", (rep->segment_list && rep->segment_list->xlink_href) ? rep->segment_list->xlink_href : ""));
-			group->active_rep_index = prev_active_rep_index;
+			if (group->dash->dash_state != GF_DASH_STATE_RUNNING) {
+				group->dash->force_period_reload = 1;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Could not reslove XLINK %s of initial rep, will retry\n", (rep->segment_list && rep->segment_list->xlink_href) ? rep->segment_list->xlink_href : "", gf_error_to_string(e) ));
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Could not reslove XLINK %s in time: %s - using old representation\n", (rep->segment_list && rep->segment_list->xlink_href) ? rep->segment_list->xlink_href : "", gf_error_to_string(e) ));
+				group->active_rep_index = prev_active_rep_index;
+			}
 			return;
 		}
 
@@ -2532,77 +3342,127 @@
 		//if this is static, we need to update infos in mpd and period
 		if (group->dash->is_m3u8 && is_static) {
 			group->dash->mpd->type = GF_MPD_TYPE_STATIC;
-			group->dash->mpd->media_presentation_duration = dur;
 			group->dash->mpd->minimum_update_period = 0;
-			group->period->duration = dur;
+			if (group->dash->mpd->media_presentation_duration < dur)
+				group->dash->mpd->media_presentation_duration = dur;
+			if (group->period->duration < dur)
+				group->period->duration = dur;
 		}
 	}
 
 	if (group->dash->is_m3u8) {
 		//here we change to another representation: we need to remove all URLs from segment list and adjust the download segment index for this group
 		if (group->dash->dash_state == GF_DASH_STATE_RUNNING) {
-			u32 next_media_seq = group->m3u8_start_media_seq + group->download_segment_index;
+			u32 group_dld_index = group->download_segment_index;
+			u32 next_media_seq;
+			Bool found = GF_FALSE;
+			Bool is_dynamic = (group->dash->mpd->type==GF_MPD_TYPE_DYNAMIC) ? GF_TRUE : GF_FALSE;
+			u32 nb_segs;
 			GF_MPD_Representation *prev_active_rep = (GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, prev_active_rep_index);
+			GF_MPD_SegmentURL *last_seg_url;
+			assert(rep->segment_list);
+			assert(prev_active_rep->segment_list);
+
+			last_seg_url = gf_list_get(prev_active_rep->segment_list->segment_URLs, group_dld_index);
+			if (last_seg_url)
+				next_media_seq = last_seg_url->hls_seq_num;
+			else {
+				last_seg_url = gf_list_get(prev_active_rep->segment_list->segment_URLs, group_dld_index-1);
+				if (last_seg_url)
+					next_media_seq = last_seg_url->hls_seq_num+1;
+				else
+					next_media_seq = rep->m3u8_media_seq_max;
+			}
 
-			if (group->dash->mpd->type == GF_MPD_TYPE_DYNAMIC) {
-				u64 current_start_time = 0;
-				Bool next_found=GF_FALSE;
-
-				//find the start time of the next segment on the old representation
-				GF_MPD_SegmentURL *seg_url = gf_list_get(prev_active_rep->segment_list->segment_URLs, group->download_segment_index);
-				if (!seg_url) {
-					//end of segment list, assume next was last one plus duration
-					seg_url = gf_list_last(prev_active_rep->segment_list->segment_URLs);
-					if (seg_url) current_start_time = seg_url->hls_utc_start_time + (seg_url->duration ? seg_url->duration : prev_active_rep->segment_list->duration);
-				} else {
-					current_start_time = seg_url->hls_utc_start_time;
-				}
-				group->hls_next_start_time = 0;
+			nb_segs = gf_list_count(rep->segment_list->segment_URLs);
+			for (k=nb_segs; k>0; k--) {
+				GF_MPD_SegmentURL *seg_url = (GF_MPD_SegmentURL *) gf_list_get(rep->segment_list->segment_URLs, k-1);
+				if (seg_url->hls_ll_chunk_type) continue;
 
-				//check in new list where the start is
-				for (k=0; rep->segment_list && k<gf_list_count(rep->segment_list->segment_URLs); k++) {
-					s64 start_diff;
-					seg_url = (GF_MPD_SegmentURL *) gf_list_get(rep->segment_list->segment_URLs, k);
-
-					start_diff = (s64) current_start_time;
-					start_diff -= (s64) seg_url->hls_utc_start_time;
-					//Warning, we may have precision issues in start times, add 200 ms for safety
-					if (ABS(start_diff) <= 200) {
-						group->download_segment_index = k;
-						next_media_seq = rep->m3u8_media_seq_min + group->download_segment_index;
-						next_found = GF_TRUE;
-						break;
-					}
-					if (current_start_time < seg_url->hls_utc_start_time) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Switching to HLS start time "LLU" but found earlier segment with start time "LLU" - probably lost one segment\n", current_start_time, seg_url->hls_utc_start_time));
-						group->download_segment_index = k;
-						next_media_seq = rep->m3u8_media_seq_min + group->download_segment_index;
-						next_found = GF_TRUE;
-						break;
-					}
+				if (next_media_seq == seg_url->hls_seq_num) {
+					group->download_segment_index = k-1;
+					found = GF_TRUE;
+					break;
 				}
-				//no segment in the new playlist is found for this start time, force an MPD update
-				if (!next_found) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] No segment in new rep for current HLS time "LLU", updating manifest\n", current_start_time));
-					group->hls_next_start_time = current_start_time;
-					//this will force the MPD update below
-					next_media_seq = 1+rep->m3u8_media_seq_max;
+				/*
+				"In order to play the presentation normally, the next Media Segment to load is the one with the
+				lowest Media Sequence Number that is greater than the Media Sequence Number of the last Media Segment loaded."
+
+				so we store this one, but continue until we find an exact match, if any
+				*/
+				else if (next_media_seq < seg_url->hls_seq_num) {
+					group->download_segment_index = k-1;
+					found = GF_TRUE;
+				}
+				//segment before our current target, abort
+				else {
+					break;
 				}
 			}
 
-			if (rep->m3u8_media_seq_min > next_media_seq) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Something wrong here: next media segment %d vs min media segment in segment list %d - some segments missing\n", next_media_seq, rep->m3u8_media_seq_min));
-				group->download_segment_index = rep->m3u8_media_seq_min;
-			} else if (rep->m3u8_media_seq_max < next_media_seq) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Too late: next media segment %d vs max media segment in segment list %d - force updating mpd\n", next_media_seq, rep->m3u8_media_seq_max));
-				group->dash->force_mpd_update = GF_TRUE;
+			if (!found) {
+				if (is_dynamic) {
+					//we switch quality but next seg is not known, force an update NOW
+					group->dash->force_mpd_update = GF_TRUE;
+					group->hls_next_seq_num = next_media_seq;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] next media segment %d not found in new variant stream (min %d - max %d), aborting\n", next_media_seq, rep->m3u8_media_seq_min, rep->m3u8_media_seq_max));
+					group->done = GF_TRUE;
+				}
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] next media segment %d found in segment list (min %d - max %d) - adjusting download segment index\n", next_media_seq, rep->m3u8_media_seq_min, rep->m3u8_media_seq_max));
-				group->download_segment_index = next_media_seq - rep->m3u8_media_seq_min;
+				if (is_dynamic) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] HLS next seg %d found in new rep, no manifest update\n", next_media_seq));
+				}
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] after switching download segment index should be %d\n", group->download_segment_index));
 		}
+
+		//switching to a rep for which we didn't solve the init segment yet
+		if (!rep->playback.cached_init_segment_url) {
+			GF_Err e;
+			Bool timeline_setup = group->timeline_setup;
+			char *r_base_init_url = NULL;
+			u64 r_start = 0, r_end = 0, r_dur = 0;
+
+			e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &r_base_init_url, &r_start, &r_end, &r_dur, NULL, &rep->playback.key_url, &rep->playback.key_IV, &rep->playback.owned_gmem, NULL);
+
+			group->timeline_setup = timeline_setup;
+			if (!e && r_base_init_url) {
+				rep->playback.cached_init_segment_url = r_base_init_url;
+				rep->playback.init_start_range = r_start;
+				rep->playback.init_end_range = r_end;
+				rep->playback.init_seg_name_start = dash_strip_base_url(r_base_init_url, group->dash->base_url);
+			} else if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
+				rep->playback.disabled = 1;
+			}
+		}
+
 		group->m3u8_start_media_seq = rep->m3u8_media_seq_min;
+		if (rep->m3u8_low_latency)
+			group->is_low_latency = GF_TRUE;
+		if (group->dash->mpd->type==GF_MPD_TYPE_STATIC)
+			group->timeline_setup = GF_TRUE;
+
+		if (!group->current_downloaded_segment_duration && rep->segment_list && rep->segment_list->timescale)
+			group->current_downloaded_segment_duration = rep->segment_list->duration * 1000 / rep->segment_list->timescale;
+
+		//setup tune point
+		if (!group->timeline_setup) {
+			//tune to last entry (live edge)
+			group->download_segment_index = rep->m3u8_media_seq_indep_last;
+			if (rep->m3u8_low_latency && rep->segment_list) {
+				u32 nb_removed = ls_hls_purge_segments(group->download_segment_index, rep->segment_list->segment_URLs);
+				group->download_segment_index -= nb_removed;
+			}
+			//if TSB set, roll back
+			m3u8_setup_timeline(group, rep);
+			group->timeline_setup = GF_TRUE;
+			group->first_hls_chunk = GF_TRUE;
+		} else {
+			if (rep->m3u8_low_latency && rep->segment_list) {
+				ls_hls_purge_segments(-1, rep->segment_list->segment_URLs);
+			}
+		}
 	}
 
 	set = group->adaptation_set;
@@ -2624,13 +3484,13 @@
 			if (framerate->den) den = framerate->den;
 		}
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d changed quality to bitrate %d kbps - Width %d Height %d FPS %d/%d (playback speed %g)\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth/1024, width, height, num, den, group->dash->speed));
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d changed quality to bitrate %d kbps - Width %d Height %d FPS %d/%d (playback speed %g)\n", 1+group->groups_idx, rep->bandwidth/1000, width, height, num, den, group->dash->speed));
 	}
 	else if (samplerate) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d changed quality to bitrate %d kbps - sample rate %u (playback speed %g)\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth/1024, samplerate, group->dash->speed));
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d changed quality to bitrate %d kbps - sample rate %u (playback speed %g)\n", 1+group->groups_idx, rep->bandwidth/1000, samplerate, group->dash->speed));
 	}
 	else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d changed quality to bitrate %d kbps (playback speed %g)\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth/1024, group->dash->speed));
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d changed quality to bitrate %d kbps (playback speed %g)\n", 1+group->groups_idx, rep->bandwidth/1000, group->dash->speed));
 	}
 #endif
 
@@ -2638,7 +3498,7 @@
 
 	/*if broken indication in duration restore previous seg count*/
 	if (group->dash->ignore_mpd_duration)
-		group->nb_segments_in_rep = nb_segs;
+		group->nb_segments_in_rep = ol_nb_segs_in_rep;
 
 	timeshift = (s32) (rep->segment_base ? rep->segment_base->time_shift_buffer_depth : (rep->segment_list ? rep->segment_list->time_shift_buffer_depth : (rep->segment_template ? rep->segment_template->time_shift_buffer_depth : -1) ) );
 	if (timeshift == -1) timeshift = (s32) (set->segment_base ? set->segment_base->time_shift_buffer_depth : (set->segment_list ? set->segment_list->time_shift_buffer_depth : (set->segment_template ? set->segment_template->time_shift_buffer_depth : -1) ) );
@@ -2647,7 +3507,7 @@
 	if (timeshift == -1) timeshift = (s32) group->dash->mpd->time_shift_buffer_depth;
 	group->time_shift_buffer_depth = (u32) timeshift;
 
-	group->dash->dash_io->on_dash_event(group->dash->dash_io, GF_DASH_EVENT_QUALITY_SWITCH, gf_list_find(group->dash->groups, group), GF_OK);
+	group->dash->dash_io->on_dash_event(group->dash->dash_io, GF_DASH_EVENT_QUALITY_SWITCH, group->groups_idx, GF_OK);
 }
 
 static void gf_dash_switch_group_representation(GF_DashClient *mpd, GF_DASH_Group *group)
@@ -2659,7 +3519,7 @@
 	bandwidth = 0;
 	min_bandwidth = (u32) -1;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Checking representations between %d and %d kbps\n", group->min_bitrate/1024, group->max_bitrate/1024));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Checking representations between %d and %d kbps\n", group->min_bitrate/1000, group->max_bitrate/1000));
 
 	if (group->force_representation_idx_plus_one) {
 		rep_sel = gf_list_get(group->adaptation_set->representations, group->force_representation_idx_plus_one - 1);
@@ -2699,72 +3559,12 @@
 
 	if (i != group->active_rep_index) {
 		if (min_bandwidth_selected) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] No representation found with bandwidth below %d kbps - using representation @ %d kbps\n", group->max_bitrate/1024, rep_sel->bandwidth/1024));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] No representation found with bandwidth below %d kbps - using representation @ %d kbps\n", group->max_bitrate/1000, rep_sel->bandwidth/1000));
 		}
-		gf_dash_set_group_representation(group, rep_sel);
+		gf_dash_set_group_representation(group, rep_sel, GF_FALSE);
 	}
 }
 
-
-static GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url, char **out_key_url, bin128 *out_key_iv, Bool *data_url_process)
-{
-	GF_Err e;
-	GF_MPD_AdaptationSet *set = group->adaptation_set;
-	GF_MPD_Period *period = group->period;
-	u32 timescale;
-
-	if (!mpd_url) return GF_BAD_PARAM;
-	
-	if (!strncmp(mpd_url, "gfio://", 7))
-		mpd_url = gf_file_basename(gf_fileio_translate_url(mpd_url));
-
-	if (!group->timeline_setup) {
-		gf_dash_group_timeline_setup(mpd, group, 0);
-		//we must wait for ATSC 3.0 clock to initialize, even if first period is static remote (we need to know when to tune)
-		if (group->dash->atsc_clock_state==1)
-			return GF_IP_NETWORK_EMPTY;
-
-		if (group->dash->reinit_period_index)
-			return GF_IP_NETWORK_EMPTY;
-		group->timeline_setup = 1;
-		item_index = group->download_segment_index;
-	}
-
-	gf_mpd_resolve_segment_duration(rep, set, period, segment_duration, &timescale, NULL, NULL);
-	*segment_duration = (resolve_type==GF_MPD_RESOLVE_URL_MEDIA) ? (u32) ((Double) ((*segment_duration) * 1000.0) / timescale) : 0;
-	e = gf_mpd_resolve_url(mpd, rep, set, period, mpd_url, group->current_base_url_idx, resolve_type, item_index, group->nb_segments_purged, out_url, out_range_start, out_range_end, segment_duration, is_in_base_url, out_key_url, out_key_iv);
-
-
-	if (e == GF_NON_COMPLIANT_BITSTREAM) {
-//		group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
-	}
-	if (!*out_url) {
-		return e;
-	}
-
-	if (*out_url && data_url_process && !strncmp(*out_url, "data:", 5)) {
-		char *sep;
-		sep = strstr(*out_url, ";base64,");
-		if (sep) {
-			GF_Blob *blob;
-			u32 len;
-			sep+=8;
-			len = (u32)strlen(sep) + 1;
-			GF_SAFEALLOC(blob, GF_Blob);
-			if (!blob) return GF_OUT_OF_MEM;
-
-			blob->data = (char *)gf_malloc(len);
-			blob->size = gf_base64_decode(sep, len, blob->data, len);
-			sprintf(*out_url, "gmem://%p", blob);
-			*data_url_process = GF_TRUE;
-		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("data scheme with encoding different from base64 not supported\n"));
-		}
-	}
-
-	return e;
-}
-
 /* Estimate the maximum speed that we can play, using our statistic. If it is below the max_playout_rate in MPD, return max_playout_rate*/
 static Double gf_dash_get_max_available_speed(GF_DashClient *dash, GF_DASH_Group *group, GF_MPD_Representation *rep)
 {
@@ -2798,163 +3598,199 @@
 	return max_available_speed;
 }
 
-static void dash_store_stats(GF_DashClient *dash, GF_DASH_Group *group, u32 bytes_per_sec, u32 file_size, Bool is_broadcast)
+static void dash_store_stats(GF_DashClient *dash, GF_DASH_Group *group, u32 bytes_per_sec, u32 file_size, Bool is_broadcast, u32 cur_dep_idx, u64 us_since_start)
 {
-	const char *url;
+#ifndef GPAC_DISABLE_LOG
+	const char *url=NULL, *full_url=NULL;
+#endif
 	GF_MPD_Representation *rep;
 
 	if (!group->nb_cached_segments)
 		return;
-	url = strrchr( group->cached[group->nb_cached_segments-1].url, '/');
-	if (!url) url = strrchr( group->cached[group->nb_cached_segments-1].url, '\\');
-	if (url) url+=1;
-	else url = group->cached[group->nb_cached_segments-1].url;
+
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) {
+		GF_DASH_Group *bgroup = group->depend_on_group ? group->depend_on_group : group;
+		if (cur_dep_idx) {
+			u32 i=0;
+			while (i<bgroup->nb_cached_segments) {
+				full_url = bgroup->cached[i].url;
+				if (group->depend_on_group) {
+					if (bgroup->cached[i].dep_group_idx==cur_dep_idx)
+						break;
+				} else {
+					if (bgroup->cached[i].representation_index==cur_dep_idx)
+						break;
+				}
+				i++;
+			}
+		} else {
+			full_url = group->cached[0].url;
+		}
+		url = strrchr(full_url, '/');
+		if (!url) url = strrchr(full_url, '\\');
+		if (url) url+=1;
+		else url = full_url;
+	}
+#endif
+
+	
+	if (!bytes_per_sec && group->local_files) {
+		bytes_per_sec = (u32) -1;
+		bytes_per_sec /= 8;
+	}
 
 	group->total_size = file_size;
 	//in broadcast mode, just store the rate
 	if (is_broadcast) group->bytes_per_sec = bytes_per_sec;
 	//otherwise store the min rate we got (to deal with complementary representations)
-	else if (!group->bytes_per_sec || group->bytes_per_sec > bytes_per_sec) group->bytes_per_sec = bytes_per_sec;
+	else if (!group->bytes_per_sec || group->bytes_per_sec > bytes_per_sec)
+		group->bytes_per_sec = bytes_per_sec;
 
 	group->last_segment_time = gf_sys_clock();
 	group->nb_segments_since_switch ++;
 
-	if (!dash->thread_mode) {
-		group->prev_segment_ok = GF_TRUE;
-		if (group->time_at_first_failure) {
+	group->prev_segment_ok = GF_TRUE;
+	dash->route_last_retune = 0;
+
+	if (group->time_at_first_failure) {
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) {
 			if (group->current_base_url_idx) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 by switching baseURL\n", url));
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 - was our download schedule %d too early ?\n", url, gf_sys_clock() - group->time_at_first_failure));
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 - was our download schedule %d too early ?\n", url, group->time_at_last_request - group->time_at_first_failure));
 			}
-			group->time_at_first_failure = 0;
 		}
-		group->nb_consecutive_segments_lost = 0;
-		group->current_base_url_idx = 0;
+#endif
+		group->time_at_first_failure = 0;
 	}
+	group->nb_consecutive_segments_lost = 0;
+	group->current_base_url_idx = 0;
+
 
 	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 	rep->playback.broadcast_flag = is_broadcast;
 
+	/*
+	we "merged" the following segments with the current one in a single open byte-range: the downloaded segment duration indicated
+	is the one of the PART, NOT of the segment
+	We need to compute (for ABR logic) the segment duration but we likely don't have the information since we issued this merge
+	on the live edge and have not performed a forced manifest update since then, so last PARTs are not known
+
+	We therefore assume a default duration of the average indicated, and check (in case we are lucky) if we have the full segment in the
+	list (i.e. before live edge)
+	if not, we SHOULD force an update just to fetch this duration before calling the ABR, but if the ABR decides to change right now
+	we would fetch this manifest for nothing, and we are already fetching a LOT of manifests in HLS...
+	So for the time being, we assume the target duration is a good approximation
+	*/
+	if (dash->llhls_single_range && group->llhls_last_was_merged) {
+		u64 duration;
+		assert(rep->segment_list);
+		assert(rep->segment_list->timescale);
+		duration = rep->segment_list->duration;
+		if (group->llhls_edge_chunk) {
+			s32 pos = group->download_segment_index-1;
+			while (pos>=0) {
+				GF_MPD_SegmentURL *surl = gf_list_get(rep->segment_list->segment_URLs, pos);
+				if (surl->hls_seq_num < group->llhls_edge_chunk->hls_seq_num) break;
+				if (!surl->hls_ll_chunk_type) {
+					duration = surl->duration;
+					break;
+				}
+				pos--;
+			}
+			group->current_downloaded_segment_duration = duration * 1000 / rep->segment_list->timescale;
+		}
+	}
+
 #ifndef GPAC_DISABLE_LOG
 	if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) {
 		u32 i, buffer_ms = 0;
-		Double bitrate, time;
+		Double bitrate, time_sec;
 		//force a call go query buffer
-		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CODEC_STAT_QUERY, gf_list_find(dash->groups, group), GF_OK);
+		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CODEC_STAT_QUERY, group->groups_idx, GF_OK);
 		buffer_ms = group->buffer_occupancy_ms;
 		for (i=0; i < group->nb_cached_segments; i++) {
 			buffer_ms += group->cached[i].duration;
 		}
 
 		bitrate=0;
-		time=0;
+		time_sec=0;
 		if (group->current_downloaded_segment_duration) {
 			bitrate = 8*group->total_size;
 			bitrate /= group->current_downloaded_segment_duration;
 		}
 
-		if (bytes_per_sec) {
-			time = group->total_size;
-			time /= bytes_per_sec;
+		if (!us_since_start) {
+			if (bytes_per_sec) {
+				time_sec = group->total_size;
+				time_sec /= bytes_per_sec;
+			}
+		} else {
+			time_sec = (Double) us_since_start;
+			time_sec /= 1000000;
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d got %s stats: %d bytes in %g sec (%d kbps) - duration %g sec - Media Rate: indicated %d - computed %d kbps - buffer %d ms\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), url, group->total_size, time, 8*bytes_per_sec/1000, group->current_downloaded_segment_duration/1000.0, rep->bandwidth/1000, (u32) bitrate, buffer_ms));
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d got %s stats: %d bytes in %.03g sec at %d kbps - dur %g sec - bitrate: %d (avg %d) kbps - buffer %d ms\n", 1+group->groups_idx, url, group->total_size, time_sec, 8*bytes_per_sec/1000, group->current_downloaded_segment_duration/1000.0, (u32) bitrate, rep->bandwidth/1000, buffer_ms));
 	}
 #endif
 }
 
-static GF_Err dash_do_rate_monitor_default(GF_DashClient *dash, GF_DASH_Group *group)
+static s32 dash_do_rate_monitor_default(GF_DashClient *dash, GF_DASH_Group *group, u32 bits_per_sec, u64 total_bytes, u64 bytes_done, u64 us_since_start, u32 buffer_dur_ms, u32 current_seg_dur)
 {
-	Bool default_switch_mode = GF_FALSE;
-	u32 download_rate, set_idx, time_since_start, done, tot_size, time_until_end;
-	if (group->depend_on_group) return GF_BAD_PARAM;
-	if (group->dash->disable_switching) return GF_OK;
-
-	if (group->buffering)
-		return GF_OK;
-
-	if (group->segment_download) {
-		download_rate = group->dash->dash_io->get_bytes_per_sec(group->dash->dash_io, group->segment_download);
-		done = group->dash->dash_io->get_bytes_done(group->dash->dash_io, group->segment_download);
-		tot_size = group->dash->dash_io->get_total_size(group->dash->dash_io, group->segment_download);
-	} else {
-		download_rate = group->bytes_per_sec;
-		done = group->bytes_done;
-		tot_size = group->total_size;
-
-	}
-	if (!download_rate) return GF_OK;
-
-	time_until_end = 0;
-	if (tot_size) {
-		time_until_end = 1000*(tot_size-done) / download_rate;
-	}
-
-	download_rate *= 8;
-	if (download_rate<group->min_bitrate) group->min_bitrate = download_rate;
-	if (download_rate>group->max_bitrate) group->max_bitrate = download_rate;
+	Bool default_switch_mode;
+	u32 time_until_end;
 
-	if (download_rate > group->active_bitrate) {
-		return GF_OK;
+	//do not abort if we are downloading faster than current rate
+	if (bits_per_sec > group->active_bitrate) {
+		return -1;
 	}
 
-	set_idx = gf_list_find(group->period->adaptation_sets, group->adaptation_set)+1;
-	time_since_start = gf_sys_clock() - group->download_start_time;
-
 	if (group->min_bandwidth_selected) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is"
-				" %d kbps - no lower bitrate available ...\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
-		return GF_OK;
+				" %d kbps - no lower bitrate available ...\n", 1+group->groups_idx, bits_per_sec/1000, group->active_bitrate/1000 ));
+		return -1;
 	}
 
-	//TODO - when do we start checking ?
-	if (time_since_start < 200) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps but "
-				"media bitrate is %d kbps\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
-		return GF_OK;
+	//we start checking after 100ms
+	if (us_since_start < 100000) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps (media bitrate %d kbps) but 100ms only elapsed, waiting\n", 1+group->groups_idx, bits_per_sec/1000, group->active_bitrate/1000 ));
+		return -1;
 	}
 
-	if (time_until_end) {
-		u32 i, cache_dur=0;
-		for (i=1; i<group->nb_cached_segments; i++) {
-			cache_dur += group->cached[i].duration;
-		}
-		//we have enough cache data to go until end of this download, perform rate switching at next segment
-		if (time_until_end<cache_dur) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps but "
-					"media bitrate is %d kbps - %d till end of download and %d in cache - "
-					"going on with download\n", set_idx, download_rate/1024, group->active_bitrate/1024,time_until_end, cache_dur ));
-			return GF_OK;
-		}
-	}
+	time_until_end = (u32) (8000*(total_bytes-bytes_done) / bits_per_sec);
 
-	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but "
-			"media bitrate is %d kbps - %d/%d in cache - killing connection and "
-			"switching\n", set_idx, download_rate/1024, group->active_bitrate/1024, group->nb_cached_segments, group->max_cached_segments ));
-
-	if (dash->thread_mode) {
-		group->download_abort_type = 2;
-		group->dash->dash_io->abort(group->dash->dash_io, group->segment_download);
-	} else {
-		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_ABORT_DOWNLOAD, gf_list_find(dash->groups, group), GF_OK);
+	if (bits_per_sec<group->min_bitrate)
+		group->min_bitrate = bits_per_sec;
+	if (bits_per_sec>group->max_bitrate)
+		group->max_bitrate = bits_per_sec;
+
+	//we have enough cache data to go until end of this download, perform rate switching at next segment
+	if (time_until_end < buffer_dur_ms) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps (media bitrate %d kbps) - %d ms until end of download and %d ms in buffer, not aborting\n", 1+group->groups_idx, bits_per_sec/1000, group->active_bitrate/1000, time_until_end, buffer_dur_ms));
+		return -1;
 	}
+
+	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is %d kbps - %d ms until end of download but %d ms in buffer - aborting segment download\n", 1+group->groups_idx, bits_per_sec/1000, group->active_bitrate/1000, buffer_dur_ms));
+
 	//in live we just abort current download and go to next. In onDemand, we may want to rebuffer
-	default_switch_mode = (group->dash->mpd->type==GF_MPD_TYPE_DYNAMIC) ? GF_FALSE : GF_TRUE;
+	default_switch_mode = (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) ? GF_FALSE : GF_TRUE;
 
+	us_since_start /= 1000;
 	//if we have time to download from another rep ?
-	if (group->current_downloaded_segment_duration <= time_since_start) {
+	if (current_seg_dur <= us_since_start) {
 		//don't force bandwidth switch (it's too late anyway, consider we lost the segment), let the rate adaptation decide
 		group->force_switch_bandwidth = default_switch_mode;
 
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Download time longer than segment duration - trying to resync on next "
-				"segment\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Download time longer than segment duration - trying to resync on next segment\n"));
 	} else {
 		u32 target_rate;
 		//compute min bitrate needed to fetch the segment in another rep, with the time remaining
-		Double ratio = ((u32)group->current_downloaded_segment_duration - time_since_start);
-		ratio /= (u32)group->current_downloaded_segment_duration;
+		Double ratio = (Double) ((u32)current_seg_dur - us_since_start);
+		ratio /= (u32) current_seg_dur;
 
-		target_rate = (u32) (download_rate * ratio);
+		target_rate = (u32) (bits_per_sec * ratio);
 
 		if (target_rate < group->min_representation_bitrate) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Download rate lower than min available rate ...\n"));
@@ -2968,7 +3804,7 @@
 		//cap max bitrate for next rate adaptation pass
 		group->max_bitrate = target_rate;
 	}
-	return GF_OK;
+	return -2;
 }
 
 static s32 dash_do_rate_adaptation_legacy_rate(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
@@ -3074,7 +3910,7 @@
 	}
 
 	if (!new_rep || (new_rep == rep)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d no better match for requested bandwidth %d - not switching (AS bitrate %d)!\n", 1 + gf_list_find(group->period->adaptation_sets, group->adaptation_set), dl_rate, rep->bandwidth));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d no better match for requested bandwidth %d - not switching (AS bitrate %d)!\n", 1 + group->groups_idx, dl_rate, rep->bandwidth));
 		do_switch = GF_FALSE;
 	}
 
@@ -3115,10 +3951,8 @@
 		dl_rate = group->min_representation_bitrate;
 	}
 
-	/* buffer_max_ms is non-null when the adaptation algorithm requires buffer information (e.g. GF_DASH_ALGO_GPAC_LEGACY_BUFFER ) */
-	/* if the cache is full (i.e. player did not fetch downloaded data yet)
-	 if we are below half of the buffer don't try to go up and limit rate to less than our current rep bandwidth*/
-	if (group->buffer_max_ms && (group->nb_cached_segments<group->max_cached_segments)) {
+	//we have buffered output
+	if (group->buffer_max_ms) {
 		u32 buf_high_threshold, buf_low_threshold;
 		s32 occ;
 
@@ -3146,17 +3980,17 @@
 				dl_rate = (rep->bandwidth > 10) ? rep->bandwidth - 10 : 1;
 			}
 			go_up_bitrate = GF_FALSE;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d bitrate %d bps buffer max %d current %d refill since last %d - running low, switching down, target rate %d\n", 1 + gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth, group->buffer_max_ms, group->buffer_occupancy_ms, occ, dl_rate));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d bitrate %d bps buffer max %d current %d refill since last %d - running low, switching down, target rate %d\n", 1 + group->groups_idx, rep->bandwidth, group->buffer_max_ms, group->buffer_occupancy_ms, occ, dl_rate));
 		}
 		//switch up if above max threshold and buffer refill is fast enough
 		else if ((occ>0) && (group->buffer_occupancy_ms > buf_high_threshold)) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d bitrate %d bps buffer max %d current %d refill since last %d - running high, will try to switch up, target rate %d\n", 1 + gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth, group->buffer_max_ms, group->buffer_occupancy_ms, occ, dl_rate));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d bitrate %d bps buffer max %d current %d refill since last %d - running high, will try to switch up, target rate %d\n", 1 + group->groups_idx, rep->bandwidth, group->buffer_max_ms, group->buffer_occupancy_ms, occ, dl_rate));
 			go_up_bitrate = GF_TRUE;
 		}
 		//don't do anything in the middle range of the buffer or if refill not fast enough
 		else {
 			do_switch = GF_FALSE;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d bitrate %d bps buffer max %d current %d refill since last %d - steady\n", 1 + gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth, group->buffer_max_ms, group->buffer_occupancy_ms, occ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d bitrate %d bps buffer max %d current %d refill since last %d - steady\n", 1 + group->groups_idx, rep->bandwidth, group->buffer_max_ms, group->buffer_occupancy_ms, occ));
 		}
 	}
 
@@ -3237,7 +4071,17 @@
 	rate_max = ((GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, gf_list_count(group->adaptation_set->representations) - 1))->bandwidth;
 
 	if (!buf_max) buf_max = 3*segment_duration_ms;
-	/* if the current buffer cannot hold an entire new segment, we indicate that we don't want to download it
+
+	/* buffer level higher than max buffer, keep high quality*/
+	if (group->buffer_occupancy_ms > buf_max) {
+		return gf_list_count(group->adaptation_set->representations) - 1;
+	}
+	/* we cannot run bba if segments are longer than the max buffer*/
+	if (buf_max < segment_duration_ms) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] BBA-0: max buffer %d shorter than segment duration %d, cannot adapt - will use current quality\n", buf_max, group->buffer_occupancy_ms));
+		return group->active_rep_index;
+	}
+	/* if the current buffer cannot hold an entire new segment, we indicate that we don't want to download it now
 	 NOTE: This is not described in the paper
 	*/
 	if (group->buffer_occupancy_ms + segment_duration_ms > buf_max) {
@@ -3496,7 +4340,9 @@
 	 All adaptation algorithms should use this value */
 	speed = dash->speed;
 	if (speed<0) speed = -speed;
-	dl_rate = (u32) (8*group->bytes_per_sec / speed);
+	dl_rate = (u32) (8 * (u64) group->bytes_per_sec / speed);
+	if ((s32) dl_rate < 0)
+		dl_rate = GF_INT_MAX;
 
 	/* Get the active representation in the AdaptationSet */
 	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
@@ -3505,15 +4351,13 @@
 	if not force, let algorithm know that they should switch to a lower resolution*/
 	max_available_speed = gf_dash_get_max_available_speed(dash, base_group, rep);
 	if (!dash->disable_speed_adaptation && !rep->playback.waiting_codec_reset) {
-		if (max_available_speed && (speed > max_available_speed)) {
+		if (max_available_speed && (0.9 * speed > max_available_speed)) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Forcing a lower complexity to achieve desired playback speed\n"));
 			force_lower_complexity = GF_TRUE;
-		}
-		else {
+		} else {
 			force_lower_complexity = GF_FALSE;
 		}
-	}
-	else {
+	} else {
 		force_lower_complexity = GF_FALSE;
 	}
 
@@ -3523,13 +4367,7 @@
 	group->codec_reset = 0;
 	/* the DASH Client asks the player for its buffer level
 	 (uses a function pointer to avoid depenencies on the player code, to reuse the DASH client in different situations)*/
-	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CODEC_STAT_QUERY, gf_list_find(group->dash->groups, group), GF_OK);
-
-	//adjust buffer with current segments not yet consumed by player
-	for (k=0; k<group->nb_cached_segments; k++) {
-		group->buffer_occupancy_ms += group->cached[k].duration;
-	}
-
+	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CODEC_STAT_QUERY, group->groups_idx, GF_OK);
 
 	/* If the playback for the current representation was waiting for a codec reset and it happened,
 	 indicate that this representation does not need a reset anymore */
@@ -3542,11 +4380,11 @@
 	if (group->base_rep_index_plus_one) {
 		group->active_rep_index = group->max_complementary_rep_index;
 	}
-	if (group->dash->atsc_clock_state) {
+	if (group->dash->route_clock_state) {
 		rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 		if (rep->playback.broadcast_flag && (dl_rate < rep->bandwidth)) {
 			dl_rate = rep->bandwidth+1;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d representation %d segment sent over broadcast, forcing bandwidth to %d\n", 1 + gf_list_find(group->period->adaptation_sets, group->adaptation_set), group->active_rep_index, dl_rate));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d representation %d segment sent over broadcast, forcing bandwidth to %d\n", 1 + group->groups_idx, group->active_rep_index, dl_rate));
 		}
 	}
 
@@ -3584,15 +4422,23 @@
 		return;
 	}
 	group->rate_adaptation_postponed = GF_FALSE;
-
+	if (new_index < 0) {
+		if (new_index == -2) {
+			group->disabled = GF_TRUE;
+		}
+		group->active_rep_index = old_index;
+		return;
+	}
+	group->disabled = GF_FALSE;
 	if (new_index != group->active_rep_index) {
 		GF_MPD_Representation *new_rep = gf_list_get(group->adaptation_set->representations, (u32)new_index);
 		if (!new_rep) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: Cannot find new representation index %d\n", new_index));
+			group->active_rep_index = old_index;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Cannot find new representation index %d, using previous one\n", new_index));
 			return;
 		}
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d switching after playing %d segments, from rep %d to rep %d\n", 1 + gf_list_find(group->period->adaptation_sets, group->adaptation_set),
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d switching after playing %d segments, from rep %d to rep %d\n", 1 + group->groups_idx,
 				group->nb_segments_since_switch, group->active_rep_index, new_index));
 		group->nb_segments_since_switch = 0;
 
@@ -3601,7 +4447,7 @@
 			new_rep->playback.waiting_codec_reset = GF_TRUE;
 		}
 		/* request downloads for the new representation */
-		gf_dash_set_group_representation(group, new_rep);
+		gf_dash_set_group_representation(group, new_rep, GF_FALSE);
 
 		/* Reset smoothing of switches
 		(note: should really apply only to algorithms using the switch_probe_count (smoothing the aggressiveness of the change)
@@ -3615,7 +4461,7 @@
 	} else {
 		group->active_rep_index = old_index;
 		if (force_lower_complexity) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Speed %f is too fast to play - speed down\n", dash->speed));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Forced to lower quality/rate because of playback speed %f higher than max speed possible %f, but no other quality available: cannot switch down\n", speed, max_available_speed));
 			/*FIXME: should do something here*/
 		}
 	}
@@ -3645,19 +4491,16 @@
 {
 	GF_Err e;
 	char *base_init_url;
-	char *init_segment_local_url=NULL;
 	GF_MPD_Representation *rep;
 	u64 start_range, end_range;
-	char mime[128];
-	const char *mime_type;
 	Bool data_url_processed = GF_FALSE;
 	/* This variable is 0 if there is a initURL, the index of first segment downloaded otherwise */
 	u32 nb_segment_read = 0;
-	u32 file_size=0, Bps= 0;
 	char *base_url=NULL;
 	char *base_url_orig=NULL;
 	char *key_url=NULL;
 	bin128 key_iv;
+	u32 start_number = 0;
 
 	if (!dash || !group)
 		return GF_BAD_PARAM;
@@ -3678,7 +4521,7 @@
 		base_url = (char *) gf_file_basename(gf_fileio_resource_url(gfio));
 	}
 
-	e = gf_dash_resolve_url(dash->mpd, rep, group, base_url, GF_MPD_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, &data_url_processed);
+	e = gf_dash_resolve_url(dash->mpd, rep, group, base_url, GF_MPD_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, &data_url_processed, NULL);
 	if (e) {
 		if (e != GF_IP_NETWORK_EMPTY) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve initialization URL: %s\n", gf_error_to_string(e) ));
@@ -3693,67 +4536,77 @@
 	/*no error and no init segment, go for media segment - this is needed for TS so that the set of media streams can be
 	declared to the player */
 	if (!base_init_url) {
-		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, NULL);
+		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, NULL, &start_number);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media URL: %s\n", gf_error_to_string(e) ));
 			return e;
 		}
 		nb_segment_read = 1;
-	} else if (!group->bitstream_switching) {
-		group->dont_delete_first_segment = 1;
+		group->no_init_seg = GF_TRUE;
+	} else if (dash->is_m3u8) {
+		char *tmp_url=NULL;
+		u64 dur, sr, er;
+		u32 startnum;
+		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &tmp_url, &sr, &er, &dur, NULL, &key_url, &key_iv, NULL, &startnum);
+		if (tmp_url) gf_free(tmp_url);
 	}
 
 	base_url = base_url_orig;
 	base_init_url = gf_dash_get_fileio_url(base_url, base_init_url);
 
+	if (nb_segment_read) group->init_segment_is_media = GF_TRUE;
+
 	if (!strstr(base_init_url, "://") || !strnicmp(base_init_url, "file://", 7) || !strnicmp(base_init_url, "gmem://", 7)
 		|| !strnicmp(base_init_url, "views://", 8) || !strnicmp(base_init_url, "mosaic://", 9)
 		|| !strnicmp(base_init_url, "isobmff://", 10) || !strnicmp(base_init_url, "gfio://", 7)
 	) {
 		//if file-based, check if file exists, if not switch base URL
 		if ( strnicmp(base_init_url, "gmem://", 7) && strnicmp(base_init_url, "gfio://", 7)) {
-			FILE *ftest = gf_fopen(base_init_url, "rb");
-			if (!ftest) {
+			if (! gf_file_exists_ex(base_init_url, dash->base_url) ) {
 				if (group->current_base_url_idx + 1 < gf_mpd_get_base_url_count(dash->mpd, group->period, group->adaptation_set, rep) ){
 					group->current_base_url_idx++;
 					gf_free(base_init_url);
 					return gf_dash_download_init_segment(dash, group);
 				}
-			} else {
-				file_size = (u32) gf_fsize(ftest);
-				gf_fclose(ftest);
 			}
 		}
 		//we don't reset the baseURL index until we are done fetching all init segments
 
 		assert(!group->nb_cached_segments);
-		group->cached[0].cache = gf_strdup(base_init_url);
-		group->cached[0].url = gf_strdup(base_init_url);
+		//transfer mem
+		group->cached[0].url = base_init_url;
 		group->cached[0].representation_index = group->active_rep_index;
 		group->prev_active_rep_index = group->active_rep_index;
 		if (key_url) {
 			group->cached[0].key_url = key_url;
 			memcpy(group->cached[0].key_IV, key_iv, sizeof(bin128));
 		}
+		group->cached[0].seg_number = start_number + group->download_segment_index;
 
 		group->nb_cached_segments = 1;
 		/*do not erase local files*/
 		group->local_files = group->was_segment_base ? 0 : 1;
 
 		group->download_segment_index += nb_segment_read;
-		init_segment_local_url = group->cached[0].cache;
 		if (group->bitstream_switching) {
-			group->bs_switching_init_segment_url = gf_strdup(init_segment_local_url);
+			group->bs_switching_init_segment_url = gf_strdup(base_init_url);
 			group->bs_switching_init_segment_url_start_range = start_range;
 			group->bs_switching_init_segment_url_end_range = end_range;
+			group->bs_switching_init_segment_url_name_start = dash_strip_base_url(group->bs_switching_init_segment_url, base_url);
 			if (data_url_processed) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("URL with data scheme not handled for Bistream Switching Segments, probable memory leak"));
 			}
 		} else {
-			rep->playback.cached_init_segment_url = gf_strdup(init_segment_local_url);
+			if (rep->playback.cached_init_segment_url) gf_free(rep->playback.cached_init_segment_url);
+			rep->playback.cached_init_segment_url = gf_strdup(base_init_url);
 			rep->playback.owned_gmem = data_url_processed;
 			rep->playback.init_start_range = start_range;
 			rep->playback.init_end_range = end_range;
+			rep->playback.init_seg_name_start = dash_strip_base_url(rep->playback.cached_init_segment_url, base_url);
+			if (key_url) {
+				rep->playback.key_url = gf_strdup(key_url);
+				memcpy(rep->playback.key_IV, key_iv, sizeof(bin128) );
+			}
 		}
 
 
@@ -3767,21 +4620,22 @@
 				if (a_rep==rep) continue;
 				if (a_rep->playback.disabled) continue;
 
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL, &a_rep->playback.key_url, &a_rep->playback.key_IV, &a_rep->playback.owned_gmem);
+				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL, &a_rep->playback.key_url, &a_rep->playback.key_IV, &a_rep->playback.owned_gmem, NULL);
 				if (!e && a_base_init_url) {
+					if (a_rep->playback.cached_init_segment_url) gf_free(a_rep->playback.cached_init_segment_url);
 					a_rep->playback.cached_init_segment_url = a_base_init_url;
 					a_rep->playback.init_start_range = a_start;
-					a_rep->playback.init_end_range =a_end ;
+					a_rep->playback.init_end_range = a_end;
+					a_rep->playback.init_seg_name_start = dash_strip_base_url(a_base_init_url, base_url);
 				} else if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
 					a_rep->playback.disabled = 1;
 				}
 			}
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] First segment is %s \n", init_segment_local_url));
-		gf_free(base_init_url);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] First segment is %s \n", base_init_url));
+		//do NOT free base_init_url, it is now in group->cached[0].url
 		group->current_base_url_idx=0;
-		dash_store_stats(dash, group, 0, file_size, GF_FALSE);
 		return GF_OK;
 	}
 
@@ -3789,213 +4643,62 @@
 	group->min_bitrate = (u32)-1;
 
 
-	if (!dash->thread_mode) {
-
-		if (dash->atsc_clock_state && !group->period->origin_base_url) {
-			GF_DASHFileIOSession sess = NULL;
-			/*check the init segment has been received*/
-			e = gf_dash_download_resource(dash, &sess, base_init_url, start_range, end_range, 1, NULL);
-			dash->dash_io->del(dash->dash_io, sess);
-
-			if (e==GF_OK) {
-
-			} else {
-				return e;
-			}
-		}
-
-		assert(!group->nb_cached_segments);
-		group->cached[0].url = base_init_url;
-		group->cached[0].cache = gf_strdup(base_init_url);
-		group->cached[0].representation_index = group->active_rep_index;
-		group->cached[0].duration = (u32) group->current_downloaded_segment_duration;
-
-		if (group->bitstream_switching) {
-			group->bs_switching_init_segment_url = gf_strdup(base_init_url);
-			group->bs_switching_init_segment_url_start_range = start_range;
-			group->bs_switching_init_segment_url_end_range = end_range;
-			if (data_url_processed) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("URL with data scheme not handled for Bistream Switching Segments, probable memory leak"));
-			}
-		} else {
-			rep->playback.cached_init_segment_url = gf_strdup(base_init_url);
-			rep->playback.init_start_range = start_range;
-			rep->playback.init_end_range = end_range;
-			rep->playback.owned_gmem = data_url_processed;
-		}
-		group->nb_cached_segments = 1;
-		group->download_segment_index += nb_segment_read;
-
-		/*download all init segments if any*/
-		if (!group->bitstream_switching) {
-			u32 k;
-			for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
-				char *a_base_init_url = NULL;
-				u64 a_start, a_end, a_dur;
-				GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, k);
-				if (a_rep==rep) continue;
-				if (a_rep->playback.disabled) continue;
-
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL, &a_rep->playback.key_url, &a_rep->playback.key_IV, &a_rep->playback.owned_gmem);
-				if (!e && a_base_init_url) {
+	if (dash->route_clock_state && !group->period->origin_base_url) {
+		GF_DASHFileIOSession sess = NULL;
+		/*check the init segment has been received*/
+		e = gf_dash_download_resource(dash, &sess, base_init_url, start_range, end_range, 1, NULL);
+		dash->dash_io->del(dash->dash_io, sess);
 
-					a_rep->playback.cached_init_segment_url = a_base_init_url;
-					a_rep->playback.init_start_range = a_start;
-					a_rep->playback.init_end_range = a_end;
-				} else if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - disabling representation\n", gf_error_to_string(e) ));
-					a_rep->playback.disabled = 1;
+		if (e!=GF_OK) {
+			//ROUTE + segment format not using init segment, we must wait for the segment to be available
+			//i fnot available after segment duration, check next segment
+			if (group->no_init_seg) {
+				u32 ck = gf_sys_clock();
+				if (!group->time_at_first_failure) {
+					group->time_at_first_failure = ck;
+				} else if (ck - group->time_at_first_failure > group->current_downloaded_segment_duration) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Bootstrap segment %s not found after %d ms, checking next one\n", base_init_url, ck - group->time_at_first_failure));
+					group->time_at_first_failure = 0;
+					group->download_segment_index++;
 				}
 			}
-		}
-		return GF_OK;
-	}
-
-	/*use persistent connection for segment downloads*/
-	e = gf_dash_download_resource(dash, &(group->segment_download), base_init_url, start_range, end_range, 1, group);
-
-	if ((e==GF_OK) && group->force_switch_bandwidth && !dash->auto_switch_count) {
-		gf_free(base_init_url);
-		if (key_url) gf_free(key_url);
-		gf_dash_switch_group_representation(dash, group);
-		return gf_dash_download_init_segment(dash, group);
-	}
-
-	if ((e==GF_URL_ERROR) && base_init_url) {
-		if (group->current_base_url_idx + 1 < gf_mpd_get_base_url_count(dash->mpd, group->period, group->adaptation_set, rep) ){
-			group->current_base_url_idx++;
 			gf_free(base_init_url);
-			if (key_url) gf_free(key_url);
-			return gf_dash_download_init_segment(dash, group);
-		}
-	}
-
-
-	if ((e==GF_URL_ERROR) && base_init_url && !group->download_abort_type) { /* We have a 404 and started with segments */
-		/* It is possible that the first segment has been deleted while we made the first request...
-		 * so we try with the next segment on some M3U8 servers */
-		gf_free(base_init_url);
-		if (key_url) gf_free(key_url);
-		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index + 1, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, NULL);
-		if (e != GF_OK) {
 			return e;
 		}
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Download of first segment failed... retrying with second one : %s\n", base_init_url));
-		nb_segment_read = 2;
-		/*use persistent connection for segment downloads*/
-		e = gf_dash_download_resource(dash, &(group->segment_download), base_init_url, 0, 0, 1, group);
-	} /* end of 404 */
-
-
-	if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
-		group->download_abort_type = 0;
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading init segment (seek ?)%s \n", base_init_url));
-		gf_free(base_init_url);
-		if (key_url) gf_free(key_url);
-		return GF_OK;
-	}
-
-	if (e!= GF_OK && !group->segment_must_be_streamed) {
-		gf_free(base_init_url);
-		if (key_url) gf_free(key_url);
-		if (!group->dash->atsc_clock_state || (group->dash->atsc_clock_state==3)) {
-			dash->mpd_stop_request = 1;
-		}
-		return e;
-	}
-
-
-	if (!group->nb_segments_in_rep) {
-		if (dash->mpd->type==GF_MPD_TYPE_STATIC) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] 0 segments in static representation (MPD duration "LLU", will probably have 404\n", group->dash->mpd->media_presentation_duration));
-		}
-	} else if (!group->groups_depending_on && (group->nb_segments_in_rep < group->max_cached_segments)) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resizing to %u max_cached_segments elements instead of %u.\n", group->nb_segments_in_rep, group->max_cached_segments));
-		/* OK, we have a problem, it may ends download */
-		group->max_cached_segments = group->nb_segments_in_rep;
-	}
-
-	/* Mime-Type check */
-	mime_type = dash->dash_io->get_mime(dash->dash_io, group->segment_download) ;
-	strcpy(mime, mime_type ? mime_type : "");
-	strlwr(mime);
-
-	if (dash->mimeTypeForM3U8Segments)
-		gf_free(dash->mimeTypeForM3U8Segments);
-	dash->mimeTypeForM3U8Segments = gf_strdup( mime );
-	mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
-	if (!rep->mime_type) {
-		rep->mime_type = gf_strdup( mime_type ? mime_type : mime );
-
-	//disable mime type check
-#if 0
-		mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
-	}
-	if (stricmp(mime, mime_type)) {
-		Bool valid = GF_FALSE;
-		char *stype1, *stype2;
-		stype1 = strchr(mime_type, '/');
-		stype2 = strchr(mime, '/');
-		if (stype1 && stype2 && !strcmp(stype1, stype2)) valid = 1;
-
-		if (!valid) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Mime '%s' is not correct for '%s', it should be '%s'\n", mime, base_init_url, mime_type));
-			dash->mpd_stop_request = 0;
-			gf_free(base_init_url);
-			if (key_url) gf_free(key_url);
-			return GF_BAD_PARAM;
-		}
-	}
-	if (!rep->mime_type) {
-		rep->mime_type = gf_strdup( mime_type ? mime_type : mime );
-#endif
-	}
-
-	if (group->segment_must_be_streamed ) {
-		init_segment_local_url = (char *) dash->dash_io->get_url(dash->dash_io, group->segment_download);
-		e = GF_OK;
-	} else {
-		init_segment_local_url = (char *) dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
 	}
 
-	if ((e!=GF_OK) || !init_segment_local_url) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error with initialization segment: download result:%s, cache file: %s\n", gf_error_to_string(e), init_segment_local_url ? init_segment_local_url : "UNKNOWN"));
-		dash->mpd_stop_request = 1;
-		gf_free(base_init_url);
-		if (key_url) gf_free(key_url);
-		return GF_BAD_PARAM;
-	}
-
-	file_size = dash->dash_io->get_total_size(dash->dash_io, group->segment_download) ;
-	Bps = dash->dash_io->get_bytes_per_sec(dash->dash_io, group->segment_download) ;
-
 	assert(!group->nb_cached_segments);
-	group->cached[0].cache = gf_strdup(init_segment_local_url);
-	group->cached[0].url = gf_strdup( dash->dash_io->get_url(dash->dash_io, group->segment_download) );
+	group->cached[0].url = base_init_url;
 	group->cached[0].representation_index = group->active_rep_index;
 	group->cached[0].duration = (u32) group->current_downloaded_segment_duration;
 
 	if (group->bitstream_switching) {
-		group->bs_switching_init_segment_url = gf_strdup(init_segment_local_url);
-		group->bs_switching_init_segment_url_start_range = 0;
-		group->bs_switching_init_segment_url_end_range = 0;
+		group->bs_switching_init_segment_url = gf_strdup(base_init_url);
+		group->bs_switching_init_segment_url_name_start = dash_strip_base_url(group->bs_switching_init_segment_url, base_url);
+
+		group->bs_switching_init_segment_url_start_range = start_range;
+		group->bs_switching_init_segment_url_end_range = end_range;
 		if (data_url_processed) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("URL with data scheme not handled for Bistream Switching Segments, probable memory leak"));
 		}
 	} else {
-		rep->playback.cached_init_segment_url = gf_strdup(init_segment_local_url);
-		rep->playback.init_start_range = 0;
-		rep->playback.init_end_range = 0;
+		if (rep->playback.cached_init_segment_url) gf_free(rep->playback.cached_init_segment_url);
+		rep->playback.cached_init_segment_url = gf_strdup(base_init_url);
+		rep->playback.init_start_range = start_range;
+		rep->playback.init_end_range = end_range;
 		rep->playback.owned_gmem = data_url_processed;
+		rep->playback.init_seg_name_start = dash_strip_base_url(rep->playback.cached_init_segment_url, base_url);
+		if (key_url) {
+			rep->playback.key_url = key_url;
+			memcpy(rep->playback.key_IV, key_iv, sizeof(bin128) );
+			key_url = NULL;
+		}
 	}
-
+	if (key_url) gf_free(key_url);
+	
 	group->nb_cached_segments = 1;
 	group->download_segment_index += nb_segment_read;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Adding initialization segment %s to cache: %s\n", init_segment_local_url, group->cached[0].url ));
-
-	gf_free(base_init_url);
-
 	/*download all init segments if any*/
 	if (!group->bitstream_switching) {
 		u32 k;
@@ -4006,81 +4709,59 @@
 			if (a_rep==rep) continue;
 			if (a_rep->playback.disabled) continue;
 
-			e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL, &a_rep->playback.key_url, &a_rep->playback.key_IV, &a_rep->playback.owned_gmem);
+			e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL, &a_rep->playback.key_url, &a_rep->playback.key_IV, &a_rep->playback.owned_gmem, NULL);
 			if (!e && a_base_init_url) {
-				e = gf_dash_download_resource(dash, &(group->segment_download), a_base_init_url, a_start, a_end, 1, group);
-
-				if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
-					group->download_abort_type = 0;
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading init segment (seek ?)%s \n", a_base_init_url));
-
-					gf_free(a_base_init_url);
-					return GF_OK;
-				}
-
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retrieve initialization segment %s for representation: %s - discarding representation\n", a_base_init_url, gf_error_to_string(e) ));
-					a_rep->playback.disabled = 1;
-				} else {
-					a_rep->playback.cached_init_segment_url = gf_strdup( dash->dash_io->get_cache_name(dash->dash_io, group->segment_download) );
-					a_rep->playback.init_start_range = 0;
-					a_rep->playback.init_end_range = 0;
-				}
-				gf_free(a_base_init_url);
+				if (a_rep->playback.cached_init_segment_url) gf_free(a_rep->playback.cached_init_segment_url);
+				a_rep->playback.cached_init_segment_url = a_base_init_url;
+				a_rep->playback.init_start_range = a_start;
+				a_rep->playback.init_end_range = a_end;
+				a_rep->playback.init_seg_name_start = dash_strip_base_url(a_rep->playback.cached_init_segment_url, base_url);
 			} else if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - disabling representation\n", gf_error_to_string(e) ));
 				a_rep->playback.disabled = 1;
 			}
-
 		}
 	}
-	//reset baseURL idx to use first base URL
-	group->current_base_url_idx = 0;
-	/*if this was not an init segment, perform rate adaptation*/
-	if (nb_segment_read) {
-		dash_store_stats(dash, group, Bps, file_size, GF_FALSE);
-		dash_do_rate_adaptation(dash, group);
-	}
-
-	if (dash->atsc_clock_state) {
-		u32 i, j;
-		for (i=0; i<gf_list_count(group->adaptation_set->representations); i++) {
-			GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, i);
-			for (j=0; j<gf_list_count(a_rep->base_URLs); j++) {
-				GF_MPD_BaseURL *b_url = gf_list_get(a_rep->base_URLs, j);
-				char *nURL = gf_url_concatenate(dash->base_url, b_url->URL);
-				if (nURL) {
-					u32 len = (u32) strlen(nURL);
-					if (nURL[len] != '/') {
-						e = gf_dash_download_resource(dash, &(group->segment_download), nURL, 0, 0, 1, group);
-						if (!e) {
-							const char *redirected_url = dash->dash_io->get_url(dash->dash_io, group->segment_download);
-							if (redirected_url && strcmp(redirected_url, nURL)) {
-								b_url->redirection = gf_strdup(redirected_url);
-							}
-						}
-					}
-					gf_free(nURL);
-				}
-			}
-		}
-	}
-
 	return GF_OK;
 }
 
+
 static void gf_dash_skip_disabled_representation(GF_DASH_Group *group, GF_MPD_Representation *rep, Bool for_autoswitch)
 {
 	s32 rep_idx, orig_idx;
 	u32 bandwidth = 0xFFFFFFFF;
-	if (for_autoswitch && group->segment_download) {
-		bandwidth = 8*group->dash->dash_io->get_bytes_per_sec(group->dash->dash_io, group->segment_download);
-	}
 
 	rep_idx = orig_idx = gf_list_find(group->adaptation_set->representations, rep);
 	while (1) {
-		rep_idx++;
-		if (rep_idx==gf_list_count(group->adaptation_set->representations)) rep_idx = 0;
+		u32 nb_reps = gf_list_count(group->adaptation_set->representations);
+		if (for_autoswitch && (group->dash->auto_switch_count<0)) {
+			if (rep_idx) rep_idx--;
+			else {
+				if (!group->dash->auto_switch_loop) {
+					rep_idx = nb_reps - 1;
+				} else {
+					group->dash->auto_switch_count = -group->dash->auto_switch_count;
+					rep_idx ++;
+					if ((u32) rep_idx > nb_reps - 1)
+						rep_idx = nb_reps - 1;
+				}
+			}
+		} else {
+			rep_idx++;
+			if (rep_idx==nb_reps) {
+				if (for_autoswitch) {
+					if (!group->dash->auto_switch_loop) {
+						rep_idx = 0;
+					} else {
+						group->dash->auto_switch_count = -group->dash->auto_switch_count;
+						if (nb_reps>=2)
+							rep_idx = nb_reps - 2;
+					}
+				} else {
+					rep_idx = 0;
+				}
+			}
+		}
 		//none other than current one
 		if (orig_idx==rep_idx) return;
 
@@ -4092,40 +4773,26 @@
 		//go to next rep
 	}
 	assert(rep && !rep->playback.disabled);
-	gf_dash_set_group_representation(group, rep);
+	gf_dash_set_group_representation(group, rep, GF_FALSE);
 }
 
 
 static void gf_dash_group_reset_cache_entry(segment_cache_entry *cached)
 {
-	gf_free(cached->cache);
-	gf_free(cached->url);
+	if (cached->url) gf_free(cached->url);
 	if (cached->key_url) gf_free(cached->key_url);
 	memset(cached, 0, sizeof(segment_cache_entry));
 }
 
 static void gf_dash_group_reset(GF_DashClient *dash, GF_DASH_Group *group)
 {
-	if (group->urlToDeleteNext) {
-		if (!dash->keep_files && !group->local_files)
-			if (dash->dash_io) dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
-
-		gf_free(group->urlToDeleteNext);
-		group->urlToDeleteNext = NULL;
-	}
-	if (group->segment_download) {
-		if (dash->dash_io) dash->dash_io->del(dash->dash_io, group->segment_download);
-		group->segment_download = NULL;
-	}
 	while (group->nb_cached_segments) {
 		group->nb_cached_segments--;
-		if (!dash->keep_files && !group->local_files)
-			gf_file_delete(group->cached[group->nb_cached_segments].cache);
-
 		gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
 	}
+	group->llhls_edge_chunk = NULL;
 
-	group->timeline_setup = 0;
+	group->timeline_setup = GF_FALSE;
 }
 
 static void gf_dash_reset_groups(GF_DashClient *dash)
@@ -4144,11 +4811,6 @@
 		if (group->service_mime)
 			gf_free(group->service_mime);
 
-		if (group->download_th)
-			gf_th_del(group->download_th);
-
-		if (group->cache_mutex)
-			gf_mx_del(group->cache_mutex);
 		if (group->bs_switching_init_segment_url)
 			gf_free(group->bs_switching_init_segment_url);
 
@@ -4220,7 +4882,7 @@
 		rep = gf_dash_find_rep(dash, rep->dependency_id, &group);
 		if (sep) sep[0] = ' ';
 	}
-	return gf_list_find(dash->groups, group);
+	return group->groups_idx;
 }
 
 GF_EXPORT
@@ -4228,7 +4890,7 @@
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return GF_FALSE;
-	return group->depend_on_group ? gf_list_find(dash->groups, group->depend_on_group) : -1;
+	return group->depend_on_group ? group->depend_on_group->groups_idx : -1;
 }
 
 GF_EXPORT
@@ -4247,7 +4909,7 @@
 	if (!group || !group->groups_depending_on) return -1;
 	group_depending_on = gf_list_get(group->groups_depending_on, group_depending_on_dep_idx);
 	if (!group_depending_on) return -1;
-	return gf_list_find(dash->groups, group_depending_on);
+	return group_depending_on->groups_idx;
 }
 
 /* create groups (implementation of adaptations set) */
@@ -4283,7 +4945,7 @@
 		if (found) continue;
 
 		if (! gf_list_count(set->representations)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Empty adaptation set found (ID %s) - ignoring\n", set->id));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Empty adaptation set found (ID %d) - ignoring\n", set->id));
 			continue;
 		}
 
@@ -4293,13 +4955,6 @@
 		group->dash = dash;
 		group->adaptation_set = set;
 		group->period = period;
-		if (dash->thread_mode) {
-			if (dash->thread_mode == GF_DASH_THREAD_ALL)
-				group->download_th = gf_th_new("DashGroupDownload");
-
-			group->cache_mutex = gf_mx_new("DashGroupMutex");
-		}
-
 		group->bitstream_switching = (set->bitstream_switching || period->bitstream_switching) ? GF_TRUE : GF_FALSE;
 
 		seg_dur = 0;
@@ -4424,6 +5079,9 @@
 				group->max_complementary_rep_index = j;
 			if (!rep->playback.disabled && rep->dependency_id)
 				nb_dependent_rep++;
+
+			if (set->bitstream_switching && (set->starts_with_sap==3) && strstr(rep->codecs, "vvi"))
+				rep->playback.vvc_rpr_switch = GF_TRUE;
 		}
 
 		if (!seg_dur && !dash->is_m3u8) {
@@ -4434,30 +5092,7 @@
 		if (group->cache_duration < dash->mpd->min_buffer_time)
 			group->cache_duration = dash->mpd->min_buffer_time;
 
-		//we want at least 2 segments available in the cache, in order to perform rate adaptation with one cache ahead
-		group->max_cached_segments = 2;
-		if (seg_dur) {
-			while (group->max_cached_segments * seg_dur * 1000 < group->cache_duration)
-				group->max_cached_segments ++;
-
-			group->max_buffer_segments = group->max_cached_segments;
-
-#if 0
-			/*unless we are in low latency modes*/
-			if (dash->max_cache_duration>1000) {
-				/*we need one more entry in cache for segment being currently played*/
-				if (group->max_cached_segments<3)
-					group->max_cached_segments ++;
-			}
-#endif
-			group->max_cached_segments *= (nb_dependent_rep+1);
-			group->max_buffer_segments *= (nb_dependent_rep+1);
-		}
-
-		if (!dash->thread_mode) {
-			group->max_cached_segments = (nb_dependent_rep+1);
-			group->max_buffer_segments = (nb_dependent_rep+1);
-		}
+		group->max_cached_segments = (nb_dependent_rep+1);
 
 		if (!has_dependent_representations)
 			group->base_rep_index_plus_one = 0; // all representations in this group are independent
@@ -4472,6 +5107,7 @@
 			gf_free(group);
 			return GF_OUT_OF_MEM;
 		}
+		group->groups_idx = gf_list_count(dash->groups);
 		e = gf_list_add(dash->groups, group);
 		if (e) {
 			gf_free(group->cached);
@@ -4502,7 +5138,6 @@
 			u32 nb_dep_groups = gf_list_count(group->groups_depending_on);
 			//all dependent groups will be stored in the base group
 			group->max_cached_segments *= (1+nb_dep_groups);
-			group->max_buffer_segments *= (1+nb_dep_groups);
 			group->cached = gf_realloc(group->cached, sizeof(segment_cache_entry)*group->max_cached_segments);
 			memset(group->cached, 0, sizeof(segment_cache_entry)*group->max_cached_segments);
 
@@ -4593,10 +5228,11 @@
 	if (!strncmp(cache_name, "gmem://", 7)) {
 		u32 size;
 		u8 *mem_address;
-		e = gf_blob_get_data(cache_name, &mem_address, &size);
+		e = gf_blob_get(cache_name, &mem_address, &size, NULL);
 		if (e) return e;
 
 		bs = gf_bs_new(mem_address, size, GF_BITSTREAM_READ);
+ gf_blob_release(cache_name);
 	} else {
 		f = gf_fopen(cache_name, "rb");
 		if (!f) return GF_IO_ERR;
@@ -4634,9 +5270,9 @@
 		GF_Err e;
 		u32 size;
 		u8 *mem_address;
-		e = gf_blob_get_data(cache_name, &mem_address, &size);
+		e = gf_blob_get(cache_name, &mem_address, &size, NULL);
 		if (e) return e;
-
+ gf_blob_release(cache_name);
 		if (offset+8 > size)
 			return GF_IO_ERR;
 		mem_address += offset;
@@ -4666,10 +5302,10 @@
 	GF_Err e = GF_OK;
 	char *init_url = NULL;
 	char *index_url = NULL;
-	GF_DASHFileIOSession *download_sess = &group->segment_download;
+	GF_DASHFileIOSession *download_sess;
 	GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, 0);
 
-	if (!group->dash->thread_mode) download_sess = &group->dash->mpd_dnload;
+	download_sess = &group->dash->mpd_dnload;
 
 	if (!rep->segment_base && !group->adaptation_set->segment_base && !group->period->segment_base) {
 		if (rep->segment_template || group->adaptation_set->segment_template || group->period->segment_template) return GF_OK;
@@ -4734,10 +5370,10 @@
 		rep = gf_list_get(group->adaptation_set->representations, i);
 
 		index_in_base = init_in_base = GF_FALSE;
-		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &init_url, &init_start_range, &init_end_range, &duration, &init_in_base, NULL, NULL, NULL);
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &init_url, &init_start_range, &init_end_range, &duration, &init_in_base, NULL, NULL, NULL, NULL);
 		if (e) goto exit;
 
-		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INDEX, 0, &index_url, &index_start_range, &index_end_range, &duration, &index_in_base, NULL, NULL, NULL);
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INDEX, 0, &index_url, &index_start_range, &index_end_range, &duration, &index_in_base, NULL, NULL, NULL, NULL);
 		if (e) goto exit;
 
 
@@ -4750,6 +5386,10 @@
 				}
 				rep->segment_list->segment_URLs = gf_list_new();
 
+				if (rep->segment_base) rep->segment_list->presentation_time_offset = rep->segment_base->presentation_time_offset;
+				else if (group->adaptation_set->segment_base) rep->segment_list->presentation_time_offset = group->adaptation_set->segment_base->presentation_time_offset;
+				else if (group->period->segment_base) rep->segment_list->presentation_time_offset = group->period->segment_base->presentation_time_offset;
+
 				if (init_in_base) {
 					GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
 					if (!rep->segment_list->initialization_segment) {
@@ -4837,18 +5477,17 @@
 						goto exit;
 					}
 
-					if (!group->dash->thread_mode) {
-						rep->segment_list->initialization_segment->sourceURL = gf_strdup(init_url);
-						GF_SAFEALLOC(rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
-						if (rep->segment_list->initialization_segment->byte_range) {
-							rep->segment_list->initialization_segment->byte_range->start_range = init_start_range;
-							rep->segment_list->initialization_segment->byte_range->end_range = init_end_range ? init_end_range : (sidx_start-1);
-						}
+					rep->segment_list->initialization_segment->sourceURL = gf_strdup(init_url);
+					GF_SAFEALLOC(rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
+					if (rep->segment_list->initialization_segment->byte_range) {
+						rep->segment_list->initialization_segment->byte_range->start_range = init_start_range;
+						rep->segment_list->initialization_segment->byte_range->end_range = init_end_range ? init_end_range : (sidx_start-1);
 					}
+
 					//we need to store the init segment since it has the same name as the rest of the segments and will be destroyed when cleaning up the cache ..
 					else if (!strnicmp(cache_name, "gmem://", 7)) {
 						u8 *mem_address;
-						e = gf_blob_get_data(cache_name, &mem_address, &rep->playback.init_segment.size);
+						e = gf_blob_get(cache_name, &mem_address, &rep->playback.init_segment.size, NULL);
 						if (e) {
 							goto exit;
 						}
@@ -4858,6 +5497,7 @@
 						sprintf(szName, "gmem://%p", &rep->playback.init_segment);
 						rep->segment_list->initialization_segment->sourceURL = gf_strdup(szName);
 						rep->segment_list->initialization_segment->is_resolved = GF_TRUE;
+ gf_blob_release(cache_name);
 					} else {
 						FILE *t = gf_fopen(cache_name, "rb");
 						if (t) {
@@ -4875,12 +5515,6 @@
 							}
 						}
 					}
-					if (group->dash->thread_mode) {
-						cache_name = rep->segment_list->initialization_segment->sourceURL;
-						//cleanup cache right away
-						group->dash->dash_io->delete_cache_file(group->dash->dash_io, *download_sess, init_url);
-					}
-
 				}
 				if (index_in_base) {
 					sidx_file = (char *)cache_name;
@@ -4901,10 +5535,8 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to load segment index for this representation - disabling\n"));
 		}
 
-		if (!group->dash->thread_mode) {
-			//cleanup cache right away
-			group->dash->dash_io->delete_cache_file(group->dash->dash_io, *download_sess, init_url);
-		}
+		//cleanup cache right away
+		group->dash->dash_io->delete_cache_file(group->dash->dash_io, *download_sess, init_url);
 
 		/*reset all seg based stuff*/
 		if (rep->segment_base) {
@@ -4941,13 +5573,11 @@
 	GF_DOMParser *parser;
 	GF_MPD *new_mpd;
 	GF_MPD_Period *period;
+	u32 nb_inserted = 0;
 	GF_DASHFileIOSession xlink_sess=NULL;
 
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-
 	period = gf_list_get(period_list, period_idx);
-	if (!period->xlink_href || (dash->atsc_clock_state==1)) {
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
+	if (!period->xlink_href || (dash->route_clock_state==1)) {
 		return;
 	}
 	start = period->start;
@@ -4957,7 +5587,6 @@
 		//spec is not very clear here, I suppose it means "remove the element"
 		gf_list_rem(period_list, period_idx);
 		gf_mpd_period_free(period);
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		return;
 	}
 
@@ -5014,7 +5643,6 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot download xlink from periods %s: error %s\n", period->xlink_href, gf_error_to_string(e)));
 		gf_free(period->xlink_href);
 		period->xlink_href = NULL;
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		if (xlink_sess) dash->dash_io->del(dash->dash_io, xlink_sess);
 		if (url) gf_free(url);
 		return;
@@ -5042,7 +5670,6 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot parse xlink periods: error in XML parsing %s\n", gf_error_to_string(e)));
 		gf_free(period->xlink_href);
 		period->xlink_href = NULL;
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		if (url) gf_free(url);
 		return;
 	}
@@ -5063,7 +5690,6 @@
 		gf_free(period->xlink_href);
 		period->xlink_href = NULL;
 		gf_mpd_del(new_mpd);
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		if (url) gf_free(url);
 		return;
 	}
@@ -5085,6 +5711,7 @@
 		gf_list_rem(new_mpd->periods, 0);
 		//forbiden
 		if (inserted_period->xlink_href && inserted_period->xlink_actuate_on_load) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Invalid remote period with xlink:actuate=\"onLoad\" and xlink:href set, removing parent period.\n"));
 			gf_mpd_period_free(inserted_period);
 			continue;
 		}
@@ -5094,6 +5721,7 @@
 
 		gf_list_insert(period_list, inserted_period, period_idx);
 		period_idx++;
+		nb_inserted++;
 
 		if (period->duration) {
 			//truncate duration
@@ -5108,12 +5736,16 @@
 	}
 	if (url) gf_free(url);
 
-	//this will do the garbage collection
-	gf_list_add(new_mpd->periods, period);
-
+	if (!nb_inserted && gf_list_count(period->adaptation_sets)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] No periods inserted during ad insertion, but origin period not empty - ignoring ad insertion.\n"));
+		gf_list_insert(period_list, period, period_idx);
+		period->broken_xlink = period->xlink_href;
+		period->xlink_href = NULL;
+	} else {
+		//this will do the garbage collection
+		gf_list_add(new_mpd->periods, period);
+	}
 	gf_mpd_del(new_mpd);
-
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 }
 
 static u32 gf_dash_get_tiles_quality_rank(GF_DashClient *dash, GF_DASH_Group *tile_group)
@@ -5128,9 +5760,13 @@
 	if (tile_group->quality_degradation_hint) {
 		u32 v = tile_group->quality_degradation_hint * MAX(srd->srd_nb_rows, srd->srd_nb_cols);
 		v/=100;
+		if (dash->disable_low_quality_tiles)
+			tile_group->disabled = GF_TRUE;
 		return v;
 	}
+	tile_group->disabled = GF_FALSE;
 
+	//TODO - use visibility rect as well
 
 	switch (dash->tile_adapt_mode) {
 	case GF_DASH_ADAPT_TILE_NONE:
@@ -5166,7 +5802,7 @@
 }
 
 //used upon startup of the session only
-static void gf_dash_set_tiles_quality(GF_DashClient *dash, struct _dash_srd_desc *srd)
+static void gf_dash_set_tiles_quality(GF_DashClient *dash, struct _dash_srd_desc *srd, Bool force_all)
 {
 	u32 i, count;
 	Bool tiles_use_lowest = (dash->first_select_mode==GF_DASH_SELECT_BANDWIDTH_HIGHEST_TILES) ? GF_TRUE : GF_FALSE;
@@ -5177,6 +5813,12 @@
 		u32 lower_quality;
 		if (group->srd_desc != srd) continue;
 
+		//dynamic changes of qualities, only update if changed
+		if (!force_all) {
+			if (!group->update_tile_qualities) continue;
+			group->update_tile_qualities = GF_FALSE;
+		}
+
 		lower_quality = gf_dash_get_tiles_quality_rank(dash, group);
 		if (!lower_quality) continue;
 
@@ -5185,8 +5827,7 @@
 		} else {
 			lower_quality = 0;
 		}
-		gf_dash_set_group_representation(group,
-		 gf_list_get(group->adaptation_set->representations, lower_quality) );
+		gf_dash_set_group_representation(group, gf_list_get(group->adaptation_set->representations, lower_quality), GF_FALSE);
 	}
 }
 
@@ -5223,7 +5864,7 @@
 		retry --;
 	}
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-	if (period->xlink_href && (dash->atsc_clock_state!=1) ) {
+	if (period->xlink_href && (dash->route_clock_state!=1) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Too many xlink indirections on the same period - not supported\n"));
 		return GF_NOT_SUPPORTED;
 	}
@@ -5252,10 +5893,6 @@
 	/*setup all groups*/
 	gf_dash_setup_groups(dash);
 
-	if (dash->debug_group_index>=0) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Debuging adaptation set #%d in period, ignoring other ones!\n\n", dash->debug_group_index + 1));
-	}
-
 	nb_groups_ok = 0;
 	for (group_i=0; group_i<gf_list_count(dash->groups); group_i++) {
 		GF_MPD_Representation *rep_sel;
@@ -5270,9 +5907,19 @@
 
 		active_rep = 0;
 
-		if ((dash->debug_group_index>=0) && (group_i != (u32) dash->debug_group_index)) {
-			group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
-			continue;
+		if (dash->dbg_grps_index) {
+			Bool disable = GF_TRUE;
+			u32 gidx;
+			for (gidx=0; gidx<dash->nb_dbg_grps; gidx++) {
+				if (group_i == dash->dbg_grps_index[gidx]) {
+					disable = GF_FALSE;
+					break;
+				}
+			}
+			if (disable) {
+				group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
+				continue;
+			}
 		}
 
 		nb_rep = gf_list_count(group->adaptation_set->representations);
@@ -5321,6 +5968,8 @@
 						group->srd_desc->srd_fh = h;
 				}
 
+			} else if (!strcmp(mpd_desc->scheme_id_uri, "http://dashif.org/guidelines/trickmode") ) {
+				continue;
 			} else {
 				//we don't know any defined scheme for now
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet with unrecognized EssentialProperty %s - ignoring because not supported\n", mpd_desc->scheme_id_uri));
@@ -5458,8 +6107,8 @@
 					}
 				}
 			}
-			//move to highest rate if ATSC session and rep is not a remote one (baseURL set)
-			if (dash->atsc_clock_state && (first_select_mode==GF_DASH_SELECT_BANDWIDTH_LOWEST) && !gf_list_count(rep->base_URLs))
+			//move to highest rate if ROUTE session and rep is not a remote one (baseURL set)
+			if (dash->route_clock_state && (first_select_mode==GF_DASH_SELECT_BANDWIDTH_LOWEST) && !gf_list_count(rep->base_URLs))
 				first_select_mode = GF_DASH_SELECT_BANDWIDTH_HIGHEST;
 
 			switch (first_select_mode) {
@@ -5504,7 +6153,14 @@
 
 		rep_sel = gf_list_get(group->adaptation_set->representations, active_rep);
 
-		gf_dash_set_group_representation(group, rep_sel);
+		gf_dash_set_group_representation(group, rep_sel, GF_FALSE);
+		if (group->dash->force_period_reload) {
+			gf_dash_reset_groups(dash);
+			dash->period_groups_setup = GF_FALSE;
+			dash->dash_state = GF_DASH_STATE_SETUP;
+			return GF_OK;
+		}
+		
 		// active representation is marked as disabled, we need to redo the selection
 		if (rep_sel->playback.disabled)
 			goto select_active_rep;
@@ -5556,6 +6212,7 @@
 			if (dg1_weight > dg2_weight) {
 				gf_list_rem(dash->groups, j);
 				gf_list_insert(dash->groups, dg2, j-1);
+				dg2->groups_idx = j-1;
 				j=0;
 			}
 		}
@@ -5603,7 +6260,7 @@
 			}
 
 		}
-		gf_dash_set_tiles_quality(dash, srd);
+		gf_dash_set_tiles_quality(dash, srd, GF_TRUE);
 	}
 
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
@@ -5651,7 +6308,7 @@
 			return;
 		}
 		if (((s32) group->time_shift_buffer_depth > 0) && (now > group->time_shift_buffer_depth)) {
-			group->download_segment_index ++;
+			group->download_segment_index++;
 			nb_dropped ++;
 			group->dash->time_in_tsb = 0;
 			continue;
@@ -5688,20 +6345,30 @@
 	}
 }
 
-/*TODO decide what is the best, fetch from another representation or ignore ...*/
+/*
+Called when error in download
+WARNING: group->download_segment_index already points to the NEXT segment, not the current one
+*/
 static DownloadGroupStatus on_group_download_error(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group, GF_Err e, GF_MPD_Representation *rep, char *new_base_seg_url, char *key_url, Bool has_dep_following)
 {
 	u32 clock_time;
 	Bool will_retry = GF_FALSE;
 	Bool is_live = GF_FALSE;
+ u32 min_wait;
 	if (!dash || !group)
 		return GF_DASH_DownloadCancel;
 
 	clock_time = gf_sys_clock();
 
-	dash_set_min_wait(dash, dash->min_timeout_between_404);
+ min_wait = dash->min_timeout_between_404;
+ if (dash->route_clock_state) {
+ if (!group->period->origin_base_url)
+ min_wait = 50; //50 ms between retries if route and not a remote period
+ }
+
+ dash_set_min_wait(dash, min_wait);
 
-	group->retry_after_utc = dash->min_timeout_between_404 + gf_net_get_utc();
+	group->retry_after_utc = min_wait + gf_net_get_utc();
 	if (!group->period->origin_base_url && (dash->mpd->type==GF_MPD_TYPE_DYNAMIC))
 		is_live = GF_TRUE;
 
@@ -5710,7 +6377,7 @@
 	}
 	//failure on last segment in non dynamic mode: likely due to rounding in dash segment duration, assume no error
 	//in dynamic mode, we need to check if this is a download schedule issue
-	else if (!is_live && group->period->duration && (group->download_segment_index + 1 >= (s32) group->nb_segments_in_rep) ) {
+	else if (!is_live && group->period->duration && (group->download_segment_index >= (s32) group->nb_segments_in_rep) ) {
 		gf_dash_mark_group_done(group);
 	}
 	else if (group->maybe_end_of_stream) {
@@ -5722,54 +6389,74 @@
 		group->maybe_end_of_stream++;
 	} else if (group->segment_in_valid_range) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - segment was lost at server/proxy side\n", new_base_seg_url, gf_error_to_string(e)));
-		if (dash->speed >= 0) {
-			group->download_segment_index++;
-		} else if (group->download_segment_index) {
-			group->download_segment_index--;
-		} else {
+
+		if ((dash->speed < 0) && !group->download_segment_index) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
 			gf_dash_mark_group_done(group);
 		}
+		group->current_dep_idx=0;
 		group->segment_in_valid_range=0;
-	} else if (group->prev_segment_ok && !group->time_at_first_failure) {
-		if (!group->loop_detected) {
-			group->time_at_first_failure = clock_time;
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - starting countdown for %d ms\n", new_base_seg_url, gf_error_to_string(e), group->current_downloaded_segment_duration));
+ }
+ //ROUTE case, the file was removed from cache by the route demuxer
+ else if (e==GF_URL_REMOVED) {
+		group->current_dep_idx=0;
+	} else if (group->prev_segment_ok && !group->time_at_first_failure && !group->loop_detected) {
+ group->time_at_first_failure = clock_time;
+ GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - starting countdown for %d ms (delay between retry %d ms)\n", new_base_seg_url, gf_error_to_string(e), group->current_downloaded_segment_duration, min_wait));
 
-			will_retry = GF_TRUE;
-		}
+ will_retry = GF_TRUE;
 	}
 	//if multiple baseURL, try switching the base
 	else if ((e==GF_URL_ERROR) && (group->current_base_url_idx + 1 < gf_mpd_get_base_url_count(dash->mpd, group->period, group->adaptation_set, rep) )) {
 		group->current_base_url_idx++;
 		if (new_base_seg_url) gf_free(new_base_seg_url);
 		if (key_url) gf_free(key_url);
+
+		//we are retrying with a different base URL, rewind segment index
+		if (dash->speed>=0) {
+			group->download_segment_index--;
+		} else {
+			group->download_segment_index++;
+		}
 		return dash_download_group_download(dash, group, base_group, has_dep_following);
 	}
 	//if previous segment download was OK, we are likely asking too early - retry for the complete duration in case one segment was lost - we add some default safety safety
 	else if (group->prev_segment_ok && (clock_time - group->time_at_first_failure <= group->current_downloaded_segment_duration + dash->segment_lost_after_ms )) {
 		will_retry = GF_TRUE;
 	} else {
-		if ((group->dash->atsc_clock_state==2) && (e==GF_URL_ERROR)) {
-			const char *val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-atsc-loop");
+		if ((group->dash->route_clock_state==2) && (e==GF_URL_ERROR)) {
+			const char *val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-route-loop");
 			Bool is_loop = (val && !strcmp(val, "yes")) ? GF_TRUE : GF_FALSE;
+			if (!is_loop && dash->route_last_retune && (gf_sys_clock() - dash->route_last_retune > 10000)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ROUTE lost signal for 10s, aborting\n"));
+				gf_dash_mark_group_done(group);
+				if (new_base_seg_url) gf_free(new_base_seg_url);
+				if (key_url) gf_free(key_url);
+				return GF_DASH_DownloadCancel;
+			}
 			//if explicit loop or more than 5 consecutive seg lost restart synchro
-			if ((group->nb_consecutive_segments_lost >= 5) || is_loop) {
+			else if ((group->nb_consecutive_segments_lost >= 5) || is_loop) {
 				u32 i=0;
 				if (is_loop) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ATSC loop detected, reseting timeline\n"));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ROUTE loop detected, resetting timeline\n"));
 				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ATSC lost %d consecutive segments, resetup tune-in\n", group->nb_consecutive_segments_lost));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ROUTE lost %d consecutive segments, resetup tune-in\n", group->nb_consecutive_segments_lost));
 				}
 				dash->utc_drift_estimate = 0;
 				dash->initial_period_tunein = GF_TRUE;
-				dash->atsc_clock_state = 1;
+				dash->route_clock_state = 1;
+				dash->route_last_retune = gf_sys_clock();
+
 				while ((group = gf_list_enum(dash->groups, &i))) {
 					group->start_number_at_last_ast = 0;
-					gf_dash_group_timeline_setup(dash->mpd, group, 0);
+					if (!group->depend_on_group)
+						gf_dash_group_timeline_setup(dash->mpd, group, 0);
+
+					group->current_dep_idx=0;
 					group->loop_detected = is_loop;
 					group->time_at_first_failure = 0;
 					group->prev_segment_ok = GF_TRUE;
+					group->nb_consecutive_segments_lost = 0;
 				}
 				if (new_base_seg_url) gf_free(new_base_seg_url);
 				if (key_url) gf_free(key_url);
@@ -5779,38 +6466,49 @@
 		if (group->prev_segment_ok) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment %s: %s - waited %d ms but segment still not available, checking next one ...\n", new_base_seg_url, gf_error_to_string(e), clock_time - group->time_at_first_failure));
 			group->time_at_first_failure = 0;
-			group->prev_segment_ok = GF_FALSE;
+			//for route we still consider the previous segment valid and don't attempt to resync the timeline
+			if (!group->dash->route_clock_state) {
+				group->prev_segment_ok = GF_FALSE;
+
+				if ((dash->mpd->type==GF_MPD_TYPE_STATIC) && (dash->chaining_mode==2) && dash->chain_fallback) {
+					dash->dash_state = GF_DASH_STATE_CHAIN_FALLBACK;
+				}
+			}
 		}
 		group->nb_consecutive_segments_lost ++;
 
 		//we are lost ....
-		if (group->nb_consecutive_segments_lost == 20) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Too many consecutive segments not found, sync or signal has been lost - entering end of stream detection mode\n"));
+		if (group->nb_consecutive_segments_lost >= 10) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Too many consecutive segments not found (broken source, sync or signal lost...) - entering end of stream detection mode\n"));
 			dash_set_min_wait(dash, 1000);
 			group->maybe_end_of_stream = 1;
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment %s: %s\n", new_base_seg_url, gf_error_to_string(e)));
-			if (dash->speed >= 0) {
-				group->download_segment_index++;
-			} else if (group->download_segment_index) {
-				group->download_segment_index--;
-			} else {
+			if ((dash->speed < 0) && !group->download_segment_index) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
 				gf_dash_mark_group_done(group);
 			}
+			group->current_dep_idx=0;
 		}
 	}
 	//if retry, do not reset dependency status
 	if (!will_retry) {
 		if (rep->dependency_id) {
 			segment_cache_entry *cache_entry = &base_group->cached[base_group->nb_cached_segments];
-			cache_entry->has_dep_following = 0;
+			cache_entry->flags &= ~SEG_FLAG_DEP_FOLLOWING;
 		}
 
 		if (group->base_rep_index_plus_one) {
 			group->active_rep_index = group->base_rep_index_plus_one - 1;
 			group->has_pending_enhancement = GF_FALSE;
 		}
+	} else {
+		//we are retrying, rewind segment index
+		if (dash->speed>=0) {
+			group->download_segment_index--;
+		} else {
+			group->download_segment_index++;
+		}
 	}
 
 	if (new_base_seg_url) gf_free(new_base_seg_url);
@@ -5828,32 +6526,66 @@
 	bin128 key_iv;
 	u64 start_range, end_range;
 	Bool use_byterange;
+	u32 llhls_live_edge_type=0;
 	u32 representation_index;
-	u32 clock_time, file_size=0, Bps=0;
-	Bool empty_file = GF_FALSE;
+	u32 clock_time;
 	Bool remote_file = GF_FALSE;
-	const char *local_file_name = NULL;
-	const char *resource_name = NULL;
-	const char *hdr = NULL;
 	const char *base_url = NULL;
+	u32 start_number=0;
+	u64 seg_dur;
+	u32 seg_scale;
+	segment_cache_entry *cache_entry;
+
 	GF_MPD_Type dyn_type = dash->mpd->type;
 	if (group->period->origin_base_url)
 		dyn_type = group->period->type;
 
-	if (group->done) return GF_DASH_DownloadSuccess;
-	if (!base_group) return GF_DASH_DownloadSuccess;
+	if (group->done)
+		return GF_DASH_DownloadSuccess;
+	if (!base_group)
+		return GF_DASH_DownloadSuccess;
+
+	//we are waiting for the playlist to be updated to find the next segment to play
+	if (group->hls_next_seq_num) {
+		return GF_DASH_DownloadCancel;
+	}
 
 	if (group->selection != GF_DASH_GROUP_SELECTED) return GF_DASH_DownloadSuccess;
 
 	if (base_group->nb_cached_segments>=base_group->max_cached_segments) {
 		return GF_DASH_DownloadCancel;
 	}
+	if (!group->timeline_setup) {
+		gf_dash_group_timeline_setup(dash->mpd, group, 0);
+		group->timeline_setup = GF_TRUE;
+	}
 
 	/*remember the active rep index, since group->active_rep_index may change because of bandwidth control algorithm*/
 	representation_index = group->active_rep_index;
 	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 	rep->playback.broadcast_flag = GF_FALSE;
 
+llhls_rety:
+	//special case for LL-HLS: if we have a switch request pending, check if next fragment is the first of a new seg
+	//or a complete seg (we do not switch in the middle of a segment)
+	if (group->llhls_switch_request>=0) {
+		GF_MPD_SegmentURL *hlsseg = gf_list_get(rep->segment_list->segment_URLs, group->download_segment_index);
+		if (hlsseg && (! hlsseg->hls_ll_chunk_type || hlsseg->is_first_part)) {
+			rep = gf_list_get(group->adaptation_set->representations, group->llhls_switch_request);
+			group->llhls_edge_chunk = NULL;
+			gf_dash_set_group_representation(group, rep, GF_TRUE);
+			assert(group->llhls_switch_request<0);
+			//we are waiting for playlist update, return
+			if (group->hls_next_seq_num) {
+				return GF_DASH_DownloadCancel;
+			}
+			//otherwise new rep is set
+			representation_index = group->active_rep_index;
+			rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+			rep->playback.broadcast_flag = GF_FALSE;
+		}
+	}
+
 	/* if the index of the segment to be downloaded is greater or equal to the last segment (as seen in the playlist),
 	 we need to check if a new playlist is ready */
 	if (group->nb_segments_in_rep && (group->download_segment_index >= (s32) group->nb_segments_in_rep)) {
@@ -5874,7 +6606,7 @@
 		}
 		if (update_playlist) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playlist should be updated, postponing group download until playlist is updated\n"));
-			dash->force_mpd_update = 1;
+			dash->force_mpd_update = GF_TRUE;
 			return GF_DASH_DownloadCancel;
 		}
 		/* Now that the playlist is up to date, we can check again */
@@ -5895,10 +6627,23 @@
 				else if (! group->maybe_end_of_stream) {
 					u32 now = gf_sys_clock();
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] End of segment list reached (%d segments but idx is %d), waiting for next MPD update\n", group->nb_segments_in_rep, group->download_segment_index));
+
 					if (group->nb_cached_segments) {
-						if (dash->is_m3u8 && (group->nb_cached_segments <= 1)) {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] There is only %d segment in cache, force MPD update\n", group->nb_cached_segments));
+						return GF_DASH_DownloadCancel;
+					}
+
+					if (dash->is_m3u8 && (dyn_type==GF_MPD_TYPE_DYNAMIC)) {
+						if (!group->time_at_first_reload_required)
+							group->time_at_first_reload_required = now;
+
+						//use group last modification time
+						timer = now - group->last_mpd_change_time;
+						if (timer < group->segment_duration * 2000) {
+							//no more segment, force a manifest update now
 							dash->force_mpd_update = GF_TRUE;
+						} else {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] HLS Segment list has not been updated for more than %d ms - assuming end of session\n", now - group->time_at_first_reload_required));
+							gf_dash_mark_group_done(group);
 						}
 						return GF_DASH_DownloadCancel;
 					}
@@ -5913,7 +6658,9 @@
 						if (now - group->time_at_first_reload_required < dash->mpd->minimum_update_period)
 							return GF_DASH_DownloadCancel;
 					} else if (dyn_type==GF_MPD_TYPE_DYNAMIC) {
-						if (timer < group->nb_segments_in_rep * group->segment_duration * 1000)
+						//use group last modification time
+						timer = now - group->last_mpd_change_time;
+						if (timer < 2 * group->segment_duration * 2000)
 							return GF_DASH_DownloadCancel;
 					}
 
@@ -5925,8 +6672,9 @@
 				/* if not, we are really at the end of the playlist, we can quit */
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] End of period reached for group\n"));
 				gf_dash_mark_group_done(group);
-				if (!dash->request_period_switch && !group->has_pending_enhancement && !has_dep_following)
-					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, gf_list_find(dash->groups, base_group), GF_OK);
+				if (!dash->request_period_switch && !group->has_pending_enhancement && !has_dep_following) {
+					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, base_group->groups_idx, GF_OK);
+				}
 				return GF_DASH_DownloadCancel;
 			}
 		}
@@ -5941,14 +6689,14 @@
 	}
 
 	/*check availablity start time of segment in Live !!*/
-	if (!group->broken_timing && (dyn_type==GF_MPD_TYPE_DYNAMIC) && !dash->is_m3u8) {
+	if (!group->broken_timing && (dyn_type==GF_MPD_TYPE_DYNAMIC) && !dash->is_m3u8 && !dash->is_smooth) {
 		s32 to_wait = 0;
 		u32 seg_dur_ms=0;
-#ifndef GPAC_DISABLE_LOG
-		u32 start_number = gf_dash_get_start_number(group, rep);
-#endif
 		s64 segment_ast = (s64) gf_dash_get_segment_availability_start_time(dash->mpd, group, group->download_segment_index, &seg_dur_ms);
 		s64 now = (s64) gf_net_get_utc();
+#ifndef GPAC_DISABLE_LOG
+		start_number = gf_dash_get_start_number(group, rep);
+#endif
 
 
 		if (group->retry_after_utc > (u64) now) {
@@ -5963,7 +6711,7 @@
 
 		if (group->force_early_fetch) {
 			if (to_wait>1) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Set #%d demux empty but wait time for segment %d is still %d ms, forcing scheduling\n", 1+gf_list_find(dash->groups, group), group->download_segment_index + start_number, to_wait));
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Set #%d demux empty but wait time for segment %d is still %d ms, forcing scheduling\n", 1+group->groups_idx, group->download_segment_index + start_number, to_wait));
 				to_wait = 0;
 			} else {
 				//we officially reached segment AST
@@ -5973,7 +6721,7 @@
 
 		/*if segment AST is greater than now, it is not yet available - we would need an estimate on how long the request takes to be sent to the server in order to be more reactive ...*/
 		if (to_wait > 1) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) is not yet available on server - requesting later in %d ms\n", 1+gf_list_find(dash->groups, group), gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init + group->ast_offset)/1000.0, to_wait));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) is not yet available on server - requesting later in %d ms\n", 1+group->groups_idx, gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init + group->ast_offset)/1000.0, to_wait));
 			if (group->last_segment_time) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
 			}
@@ -5982,23 +6730,26 @@
 
 			return GF_DASH_DownloadCancel;
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) should now be available on server since %d ms - requesting it\n", 1+gf_list_find(dash->groups, group), gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init + group->ast_offset)/1000.0, -to_wait));
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) should now be available on server since %d ms - requesting it\n", 1+group->groups_idx, gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init + group->ast_offset)/1000.0, -to_wait));
 
 			if (group->last_segment_time) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
 			}
-#if 0
-			/*check if we are in the segment availability end time*/
-			if (now < segment_ast + seg_dur_ms + group->time_shift_buffer_depth )
-				in_segment_avail_time = 1;
-#endif
 		}
-	}
+ group->time_at_last_request = gf_sys_clock();
+ }
 
 	base_url = dash->base_url;
 	if (group->period->origin_base_url) base_url = group->period->origin_base_url;
 	/* At this stage, there are some segments left to be downloaded */
-	e = gf_dash_resolve_url(dash->mpd, rep, group, base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, NULL);
+	e = gf_dash_resolve_url(dash->mpd, rep, group, base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, NULL, &start_number);
+
+
+	if ((e==GF_EOS)	&& group->llhls_edge_chunk && group->llhls_edge_chunk->hls_ll_chunk_type) {
+		//no more segments, force update now
+		dash->force_mpd_update = GF_TRUE;
+		return GF_DASH_DownloadCancel;
+	}
 
 	if (e || !new_base_seg_url) {
 		if (e==GF_EOS) {
@@ -6008,20 +6759,60 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error resolving URL of next segment: %s\n", gf_error_to_string(e) ));
 		}
 		if (new_base_seg_url) gf_free(new_base_seg_url);
+		if (key_url) gf_free(key_url);
+		group->llhls_edge_chunk = NULL;
 		return GF_DASH_DownloadCancel;
 	}
+
+	if (dash->is_m3u8 && group->is_low_latency) {
+		assert(rep->segment_list);
+		GF_MPD_SegmentURL *hlsseg = gf_list_get(rep->segment_list->segment_URLs, group->download_segment_index);
+		assert(hlsseg);
+
+		if (dash->llhls_single_range && hlsseg->media_range && (hlsseg->can_merge || group->llhls_last_was_merged) ) {
+			//if not very first request (tune in) and not first part of seg, if mergeable issue a single byterange
+			if (!group->first_hls_chunk && hlsseg->media_range->start_range) {
+				if (!hlsseg->can_merge) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] LL-HLS part cannot be merged with previously open byte-range request, disabling merging !\n"));
+					dash->llhls_single_range = GF_FALSE;
+				}
+				group->download_segment_index++;
+				if (new_base_seg_url) gf_free(new_base_seg_url);
+				new_base_seg_url = NULL;
+				if (key_url) gf_free(key_url);
+				key_url = NULL;
+				goto llhls_rety;
+			}
+			group->first_hls_chunk = GF_FALSE;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Changing LL-HLS request %s @ "LLU"->"LLU" to open end range\n", new_base_seg_url, start_range, end_range));
+			end_range = (u64) -1;
+			llhls_live_edge_type = 2;
+			group->llhls_last_was_merged = GF_TRUE;
+		} else {
+			group->llhls_last_was_merged = GF_FALSE;
+			if (hlsseg->hls_ll_chunk_type)
+				llhls_live_edge_type = 1;
+		}
+		group->llhls_edge_chunk = hlsseg;
+	}
 	use_byterange = (start_range || end_range) ? 1 : 0;
 
-	if (use_byterange) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Queuing new segment: %s (range: "LLD"-"LLD")\n", new_base_seg_url, start_range, end_range));
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) {
+		if (llhls_live_edge_type==2) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Queing next segment: %s (live edge merged range: "LLU" -> END)\n", gf_file_basename(new_base_seg_url), start_range));
+		} else if (use_byterange) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Queing next %s: %s (range: "LLU" -> "LLU")\n", (llhls_live_edge_type==1) ? "LL-HLS part" : "segment", gf_file_basename(new_base_seg_url), start_range, end_range));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Queing next %s: %s\n", (llhls_live_edge_type==1) ? "LL-HLS part" : "segment", gf_file_basename(new_base_seg_url)));
+		}
 	}
+#endif
 
 	/*local file*/
 	if (strnicmp(base_url, "gfio://", 7)
 		&& (!strstr(new_base_seg_url, "://") || (!strnicmp(new_base_seg_url, "file://", 7) || !strnicmp(new_base_seg_url, "gmem://", 7) ) )
 	) {
-		FILE *ftest;
-		resource_name = local_file_name = (char *) new_base_seg_url;
 		e = GF_OK;
 		/*do not erase local files*/
 		group->local_files = 1;
@@ -6031,178 +6822,114 @@
 			/*restart*/
 			return GF_DASH_DownloadRestart;
 		}
-		ftest = gf_fopen(local_file_name, "rb");
-		if (!ftest) {
+		if (! gf_file_exists_ex(new_base_seg_url, dash->base_url)) {
 			if (group->current_base_url_idx + 1 < gf_mpd_get_base_url_count(dash->mpd, group->period, group->adaptation_set, rep) ){
 				group->current_base_url_idx++;
 				if (new_base_seg_url) gf_free(new_base_seg_url);
 				if (key_url) gf_free(key_url);
+
 				return dash_download_group_download(dash, group, base_group, has_dep_following);
 			} else if (group->period->duration && (group->download_segment_index + 1 == group->nb_segments_in_rep) ) {
 				if (new_base_seg_url) gf_free(new_base_seg_url);
 				gf_dash_mark_group_done(group);
 				return GF_DASH_DownloadCancel;
 			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] File %s not found on disk\n", local_file_name));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] File %s not found on disk\n", new_base_seg_url));
 				group->current_base_url_idx = 0;
-				return on_group_download_error(dash, group, base_group, GF_NOT_FOUND, rep, new_base_seg_url, key_url, has_dep_following);
-			}
-		} else {
-			file_size = (u32) gf_fsize(ftest);
-			gf_fclose(ftest);
-		}
-		group->current_base_url_idx = 0;
-	} else if (dash->thread_mode) {
-		base_group->max_bitrate = 0;
-		base_group->min_bitrate = (u32)-1;
-
-		/*use persistent connection for segment downloads*/
-		if (use_byterange) {
-			e = gf_dash_download_resource(dash, &(base_group->segment_download), new_base_seg_url, start_range, end_range, 1, base_group);
-		} else {
-			e = gf_dash_download_resource(dash, &(base_group->segment_download), new_base_seg_url, 0, 0, 1, base_group);
-		}
-
-		if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
-			base_group->download_abort_type = 0;
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading segment (seek ?)%s \n", new_base_seg_url));
-			if (new_base_seg_url) gf_free(new_base_seg_url);
-			if (key_url) gf_free(key_url);
-			return GF_DASH_DownloadSuccess;
-		}
-
-		if (e != GF_OK) {
-			return on_group_download_error(dash, group, base_group, e, rep, new_base_seg_url, key_url, has_dep_following);
-		}
-
-		group->prev_segment_ok = GF_TRUE;
-		if (group->time_at_first_failure) {
-			if (group->current_base_url_idx) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 by switching baseURL\n", new_base_seg_url));
-			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 - was our download schedule %d ms too early ?\n", new_base_seg_url, gf_sys_clock() - group->time_at_first_failure));
+				//increment seg index before calling download_error
+				if (dash->speed >= 0) {
+					group->download_segment_index++;
+				} else if (group->download_segment_index) {
+					group->download_segment_index--;
+				}
+				return on_group_download_error(dash, group, base_group, GF_URL_ERROR, rep, new_base_seg_url, key_url, has_dep_following);
 			}
-			group->time_at_first_failure = 0;
 		}
-		group->nb_consecutive_segments_lost = 0;
 		group->current_base_url_idx = 0;
-
-		if ((e==GF_OK) && group->force_switch_bandwidth) {
-			if (!dash->auto_switch_count) {
-				gf_dash_switch_group_representation(dash, group);
-				if (new_base_seg_url) gf_free(new_base_seg_url);
-				if (key_url) gf_free(key_url);
-				/*restart*/
-				return GF_DASH_DownloadRestart;
-			}
-			if (rep->playback.disabled) {
-				gf_dash_skip_disabled_representation(group, rep, GF_FALSE);
-				if (new_base_seg_url) gf_free(new_base_seg_url);
-				if (key_url) gf_free(key_url);
-				/*restart*/
-				return GF_DASH_DownloadRestart;
-			}
-		}
-		group->segment_must_be_streamed = base_group->segment_must_be_streamed;
-
-		if (group->segment_must_be_streamed)
-			local_file_name = dash->dash_io->get_url(dash->dash_io, base_group->segment_download);
-		else
-			local_file_name = dash->dash_io->get_cache_name(dash->dash_io, base_group->segment_download);
-
-		file_size = dash->dash_io->get_total_size(dash->dash_io, base_group->segment_download);
-		if (file_size==0) {
-			empty_file = GF_TRUE;
-		}
-		resource_name = dash->dash_io->get_url(dash->dash_io, base_group->segment_download);
-
-		Bps = dash->dash_io->get_bytes_per_sec(dash->dash_io, base_group->segment_download);
-	}//unthreaded mode
-	else {
-		resource_name = local_file_name = new_base_seg_url;
+	} else {
 		remote_file = GF_TRUE;
-
-		hdr = dash->dash_io->get_header_value(dash->dash_io, base_group->segment_download, "x-atsc");
-		if (hdr && !strcmp(hdr, "yes"))
-			rep->playback.broadcast_flag = GF_TRUE;
 	}
 
-	if (local_file_name && (e == GF_OK || group->segment_must_be_streamed || !dash->thread_mode ) ) {
-		if (group->cache_mutex) gf_mx_p(group->cache_mutex);
 
-		assert(base_group->nb_cached_segments<base_group->max_cached_segments);
-		assert(local_file_name);
-
-		if (!empty_file) {
-			segment_cache_entry *cache_entry = &base_group->cached[base_group->nb_cached_segments];
-
-			cache_entry->cache = gf_strdup(local_file_name);
-			cache_entry->url = gf_strdup( resource_name );
-			if (use_byterange && remote_file) {
-				cache_entry->start_range = start_range;
-				cache_entry->end_range = end_range;
-			} else {
-				cache_entry->start_range = 0;
-				cache_entry->end_range = 0;
-			}
-			cache_entry->representation_index = representation_index;
-			cache_entry->duration = (u32) group->current_downloaded_segment_duration;
-			cache_entry->loop_detected = group->loop_detected;
-			cache_entry->has_dep_following = has_dep_following;
-			if (key_url) {
-				cache_entry->key_url = key_url;
-				memcpy(cache_entry->key_IV, key_iv, sizeof(bin128));
-				key_url = NULL;
-			}
-
-			group->loop_detected = GF_FALSE;
-
-			if (group->local_files && use_byterange) {
-				cache_entry->start_range = start_range;
-				cache_entry->end_range = end_range;
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Added file to cache (%u/%u in cache): %s\n", base_group->nb_cached_segments+1, base_group->max_cached_segments, cache_entry->url));
+	assert(base_group->nb_cached_segments<base_group->max_cached_segments);
+	cache_entry = &base_group->cached[base_group->nb_cached_segments];
 
-			base_group->nb_cached_segments++;
-		}
-		if (file_size)
-			dash_store_stats(dash, group, Bps, file_size, rep->playback.broadcast_flag);
-
-		/* download enhancement representation of this segment*/
-		if ((representation_index != group->max_complementary_rep_index) && rep->playback.enhancement_rep_index_plus_one) {
-			group->active_rep_index = rep->playback.enhancement_rep_index_plus_one - 1;
-			group->has_pending_enhancement = GF_TRUE;
-		}
-		/* if we have downloaded all enhancement representations of this segment, restart from base representation and increase dowloaded segment index by 1*/
-		else {
-			if (group->base_rep_index_plus_one) group->active_rep_index = group->base_rep_index_plus_one - 1;
-			if (dash->speed >= 0) {
-				group->download_segment_index++;
-			} else if (group->download_segment_index) {
-				group->download_segment_index--;
-			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
-				gf_dash_mark_group_done(group);
-			}
-			group->has_pending_enhancement = GF_FALSE;
+	//assign url
+	cache_entry->url = new_base_seg_url;
+	if (use_byterange && remote_file) {
+		cache_entry->start_range = start_range;
+		cache_entry->end_range = end_range;
+	} else {
+		cache_entry->start_range = 0;
+		cache_entry->end_range = 0;
+	}
+	cache_entry->representation_index = representation_index;
+	cache_entry->duration = (u32) group->current_downloaded_segment_duration;
+	cache_entry->flags = group->loop_detected ? SEG_FLAG_LOOP_DETECTED : 0;
+	cache_entry->dep_group_idx = group->depend_on_group ? group->depend_on_group->current_dep_idx : group->current_dep_idx;
+	if (has_dep_following) cache_entry->flags |= SEG_FLAG_DEP_FOLLOWING;
+	if (group->disabled)
+		cache_entry->flags |= SEG_FLAG_DISABLED;
+	if (key_url) {
+		cache_entry->key_url = key_url;
+		memcpy(cache_entry->key_IV, key_iv, sizeof(bin128));
+		//set to NULL since we stored it, so that it won't be freed when exiting this function
+		key_url = NULL;
+	}
+
+	cache_entry->time.num = gf_dash_get_segment_start_time_with_timescale(group, &seg_dur, &seg_scale);
+	cache_entry->time.den = seg_scale;
+
+	cache_entry->seg_number = group->download_segment_index + start_number;
+	cache_entry->seg_name_start = dash_strip_base_url(cache_entry->url, base_url);
+	group->loop_detected = GF_FALSE;
+
+	if (group->local_files && use_byterange) {
+		cache_entry->start_range = start_range;
+		cache_entry->end_range = end_range;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Added file to cache (%u/%u in cache): %s\n", base_group->nb_cached_segments+1, base_group->max_cached_segments, cache_entry->url));
+
+	base_group->nb_cached_segments++;
+
+	/* download enhancement representation of this segment*/
+	if ((representation_index != group->max_complementary_rep_index) && rep->playback.enhancement_rep_index_plus_one) {
+		group->active_rep_index = rep->playback.enhancement_rep_index_plus_one - 1;
+		group->has_pending_enhancement = GF_TRUE;
+	}
+	/* if we have downloaded all enhancement representations of this segment, restart from base representation and increase downloaded segment index by 1*/
+	else {
+		if (group->base_rep_index_plus_one) group->active_rep_index = group->base_rep_index_plus_one - 1;
+		if (dash->speed >= 0) {
+			group->download_segment_index++;
+		} else if (group->download_segment_index) {
+			group->download_segment_index--;
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
+			gf_dash_mark_group_done(group);
 		}
-		if (dash->auto_switch_count) {
+		group->has_pending_enhancement = GF_FALSE;
+	}
+	if (dash->auto_switch_count) {
+		if (group->llhls_edge_chunk && group->llhls_edge_chunk->hls_ll_chunk_type) {
+			if (group->llhls_edge_chunk->is_first_part)
+				group->nb_segments_done++;
+		} else {
 			group->nb_segments_done++;
-			if (group->nb_segments_done==dash->auto_switch_count) {
-				group->nb_segments_done=0;
-				gf_dash_skip_disabled_representation(group, rep, GF_TRUE);
-			}
 		}
+		if (group->nb_segments_done==ABS(dash->auto_switch_count) ) {
+			group->nb_segments_done=0;
+			gf_dash_skip_disabled_representation(group, rep, GF_TRUE);
+		}
+	}
 
-		if (group->cache_mutex) gf_mx_v(group->cache_mutex);
-
-		//do not notify segments if there is a pending period switch - since these are decided by the user, we don't
-		//want to notify old segments
-		if (!dash->request_period_switch && !group->has_pending_enhancement && !has_dep_following)
-			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, gf_list_find(dash->groups, base_group), GF_OK);
-
+	//do not notify segments if there is a pending period switch - since these are decided by the user, we don't
+	//want to notify old segments
+	if (!dash->request_period_switch && !group->has_pending_enhancement && !has_dep_following) {
+		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, base_group->groups_idx, GF_OK);
 	}
-	if (new_base_seg_url) gf_free(new_base_seg_url);
+
+	//do NOT free new_base_seg_url, it is now in cache_entry->url
 	if (key_url) gf_free(key_url);
 	if (e) return GF_DASH_DownloadCancel;
 	return GF_DASH_DownloadSuccess;
@@ -6229,12 +6956,12 @@
 			if ((i+1==count) && !dep_group->groups_depending_on)
 				has_dep_following = GF_FALSE;
 
+			group->current_dep_idx = i + 1;
 			res = dash_download_group(dash, dep_group, base_group, has_dep_following);
 			if (res==GF_DASH_DownloadRestart) {
 				i--;
 				continue;
 			}
-			group->current_dep_idx = i + 1;
 			if (res==GF_DASH_DownloadCancel)
 				return GF_DASH_DownloadCancel;
 		}
@@ -6250,17 +6977,18 @@
 	u32 min_bandwidth = 0;
 	Bool force_rep_idx = GF_FALSE;
 	Bool local_file_mode = GF_FALSE;
+	Bool use_custom_algo = GF_FALSE;
 	GF_MPD_Representation *rep, *rep_new;
-	u32 total_rate, max_fsize, bandwidths[20], groups_per_quality[20], max_level;
+	u32 total_rate, bandwidths[20], groups_per_quality[20], max_level;
 	u32 q_idx, nb_qualities = 0;
 	u32 i, count = gf_list_count(dash->groups), local_files = 0;
+	u64 cumulated_rate=0, cumulated_size=0;
 
 	//initialize min/max bandwidth
 	min_bandwidth = 0;
 	max_level = 0;
 	total_rate = (u32) -1;
 	nb_qualities = 1;
-	max_fsize = 0;
 
 	//get max qualities due to SRD descriptions
 	//for now, consider all non-SRDs group to run in max quality
@@ -6276,35 +7004,47 @@
 		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
 		if (group->local_files) local_files ++;
 		if (!group->bytes_per_sec) {
-			if (!for_postponed_only && !dash->thread_mode)
+			if (!for_postponed_only && !group->disabled)
 				return;
 			continue;
 		}
 		if (group->done) continue;
 
+		//change of tile qualities
+		if (group->update_tile_qualities) {
+			group->update_tile_qualities = GF_FALSE;
+			if (!dash->rate_adaptation_algo_custom) {
+				if (group->srd_desc)
+					gf_dash_set_tiles_quality(dash, group->srd_desc, GF_FALSE);
+			}
+		}
+
+
 		group->backup_Bps = group->bytes_per_sec;
 		//only count broadband ones
-		if (dash->atsc_clock_state && !gf_list_count(group->period->base_URLs) && !gf_list_count(group->adaptation_set->base_URLs) && !group->period->origin_base_url) {
+		if (dash->route_clock_state && !gf_list_count(group->period->base_URLs) && !gf_list_count(group->adaptation_set->base_URLs) && !group->period->origin_base_url) {
 			u32 j;
 			//get all active rep, count bandwidth for broadband ones
 			for (j=0; j<=group->max_complementary_rep_index; j++) {
 				rep = gf_list_get(group->adaptation_set->representations, j);
 				//this rep is not in broadcast, add bandwidth
 				if (gf_list_count(rep->base_URLs)) {
-					total_rate = group->bytes_per_sec;
+					cumulated_rate += ((u64) group->bytes_per_sec) * group->total_size;
+					cumulated_size += group->total_size;
 				}
 			}
 		} else {
-			//use rate of largest downloaded file to perform rate adaptation
-			//TODO: we should split rate adaptation per baseURL
-			if (!max_fsize || (max_fsize<group->total_size)) {
-				if (total_rate > group->bytes_per_sec) {
-					total_rate = group->bytes_per_sec;
-					max_fsize = group->total_size;
-				}
-			}
+			//weighted everage of download rates vs file size - using the min will not work for very small files
+			//for which the rate estimation may be low due to round-trip request time
+			//TODO we should do the weighted average per base URL for finer results
+			cumulated_rate += ((u64) group->bytes_per_sec) * group->total_size;
+			cumulated_size += group->total_size;
 		}
 	}
+	if (cumulated_size) {
+		total_rate = (u32) (cumulated_rate / cumulated_size);
+	}
+
 	if (total_rate == (u32) -1) {
 		total_rate = 0;
 	}
@@ -6315,7 +7055,13 @@
 		return;
 	}
 
- for (q_idx=0; q_idx<nb_qualities; q_idx++) {
+	if (dash->rate_adaptation_algo_custom) {
+		use_custom_algo = GF_TRUE;
+		dash->total_rate = total_rate;
+		goto custom_algo;
+	}
+
+	for (q_idx=0; q_idx<nb_qualities; q_idx++) {
 		bandwidths[q_idx] = 0;
 		groups_per_quality[q_idx] = 0;
 
@@ -6347,13 +7093,14 @@
 					rep_target = (nb_qualities - quality_rank) * nb_reps / nb_qualities;
 
 				rep = gf_list_get(group->adaptation_set->representations, rep_target);
+				//in bits per sec!
 				total_rate += rep->bandwidth;
 			}
 		}
 		min_bandwidth += bandwidths[q_idx];
 	}
 	if (local_file_mode) {
-		//total rate is in bytes per second, and add a safety of 10 bytes to ensure selection
+		//total rate is in bytes per second, and add a safety of 10 bytes/s to ensure selection
 		total_rate = 10 + total_rate / 8;
 	}
 
@@ -6390,7 +7137,7 @@
 					rep_new = gf_list_get(group->adaptation_set->representations, group->target_new_rep+1);
 					diff = rep_new->bandwidth - diff;
 
-					if (dash->atsc_clock_state) {
+					if (dash->route_clock_state) {
 						//if baseURL in period or adaptation set, we assume we are in broadband mode, otherwise we re in broadcast, don't count bitrate
 						if (!gf_list_count(group->period->base_URLs) && !gf_list_count(group->adaptation_set->base_URLs)) {
 							//new rep is in broadcast, force diff to 0 to select the rep
@@ -6459,6 +7206,8 @@
 		}
 	}
 
+custom_algo:
+
 	//GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DEBUG. 2. dowload at %d \n", 8*bandwidths[q_idx]/1000));
 	//bandwitdh sharing done, perform rate adaptation with theses new numbers
 	for (i=0; i<count; i++) {
@@ -6466,48 +7215,49 @@
 		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
 		if (group->done) continue;
 
-		if (force_rep_idx) {
-			rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep);
-			//add 100 bytes/sec to make sure we select the target one
-			group->bytes_per_sec = 100 + rep->bandwidth / 8;
-		}
-		//decrease by quality level
-		else if (dash->tile_rate_decrease) {
-			quality_rank = gf_dash_get_tiles_quality_rank(dash, group);
-			if (quality_rank >= nb_qualities) quality_rank = nb_qualities-1;
-			assert(groups_per_quality[quality_rank]);
-			group->bytes_per_sec = bandwidths[quality_rank] / groups_per_quality[quality_rank];
+		//in custom algo case, we don't change the bitrate of the group
+		if (!use_custom_algo) {
+			if (force_rep_idx) {
+				rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep);
+				//add 100 bytes/sec to make sure we select the target one
+				group->bytes_per_sec = 100 + rep->bandwidth / 8;
+			}
+			//decrease by quality level
+			else if (dash->tile_rate_decrease) {
+				quality_rank = gf_dash_get_tiles_quality_rank(dash, group);
+				if (quality_rank >= nb_qualities) quality_rank = nb_qualities-1;
+				assert(groups_per_quality[quality_rank]);
+				group->bytes_per_sec = bandwidths[quality_rank] / groups_per_quality[quality_rank];
+			}
 		}
 
 		if (for_postponed_only) {
 			if (group->rate_adaptation_postponed)
 				dash_do_rate_adaptation(dash, group);
+			group->bytes_per_sec = group->backup_Bps;
 		} else {
 			dash_do_rate_adaptation(dash, group);
+			//reset/restore bytes_per_sec once all groups have been called
 		}
-		group->bytes_per_sec = group->backup_Bps;
 	}
-}
-
 
-static u32 dash_download_threaded(void *par)
-{
-	GF_DASH_Group *group = (GF_DASH_Group *) par;
-	if (!group) return 0;
-	group->download_th_done = GF_FALSE;
+	if (!for_postponed_only) {
+		for (i=0; i<count; i++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, i);
+			if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+			if (group->done) continue;
 
-	while (1) {
-		DownloadGroupStatus res = dash_download_group(group->dash, group, group, group->groups_depending_on ? GF_TRUE : GF_FALSE);
-		if (res==GF_DASH_DownloadRestart) {
-			continue;
+			if (!group->rate_adaptation_postponed)
+				group->bytes_per_sec = 0;
+			else
+				group->bytes_per_sec = group->backup_Bps;
 		}
-		break;
 	}
-	group->download_th_done = GF_TRUE;
-	return 0;
 }
 
 
+
+
 static GF_Err dash_setup_period_and_groups(GF_DashClient *dash)
 {
 	u32 i, group_count;
@@ -6523,6 +7273,8 @@
 			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, -1, e);
 			return e;
 		}
+		if (dash->force_period_reload) return GF_OK;
+
 		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SELECT_GROUPS, -1, GF_OK);
 
 		dash->period_groups_setup = GF_TRUE;
@@ -6538,15 +7290,10 @@
 
 		if (group->group_setup) continue;
 
-		if (group->cache_mutex) gf_mx_p(group->cache_mutex);
 		e = gf_dash_download_init_segment(dash, group);
 
-		if (group->cache_mutex) gf_mx_v(group->cache_mutex);
 		//might happen with broadcast DASH (eg ATSC3)
 		if (e == GF_IP_NETWORK_EMPTY) {
-			if (dash->mpd_stop_request)
-				return GF_OK;
-
 			if (dash->reinit_period_index) {
 				gf_dash_reset_groups(dash);
 				dash->active_period_index = dash->reinit_period_index-1;
@@ -6558,6 +7305,10 @@
 			return e;
 		}
 		group->group_setup = GF_TRUE;
+		if (dash->initial_period_tunein && !dash->route_clock_state) {
+			group->timeline_setup = GF_FALSE;
+			group->force_timeline_reeval = GF_TRUE;
+		}
 		if (e) break;
 	}
 	dash->initial_period_tunein = GF_FALSE;
@@ -6575,7 +7326,6 @@
 
 static void dash_do_groups(GF_DashClient *dash)
 {
-	GF_Err e;
 	u32 i, group_count = gf_list_count(dash->groups);
 
 	dash->min_wait_ms_before_next_request = 0;
@@ -6584,97 +7334,63 @@
 	for (i=0; i<group_count; i++) {
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
 		if (group->selection != GF_DASH_GROUP_SELECTED) {
-			if (group->nb_cached_segments && !group->dont_delete_first_segment) {
+			if (group->nb_cached_segments) {
 				gf_dash_group_reset(dash, group);
 			}
-			group->download_th_done = GF_TRUE;
 			continue;
 		}
 
 		if (group->depend_on_group) continue;
 		//not yet scheduled for download
 		if (group->rate_adaptation_postponed) {
-			group->download_th_done = GF_TRUE;
 			continue;
 		}
 
-		if (dash->thread_mode == GF_DASH_THREAD_ALL) {
-			group->download_th_done = GF_FALSE;
-			e = gf_th_run(group->download_th, dash_download_threaded, group);
-			if (e!=GF_OK) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot launch download thread for AdaptationSet #%d - error %s\n", i+1, gf_error_to_string(e)));
-				group->download_th_done = GF_TRUE;
-			}
-		} else {
-			DownloadGroupStatus res;
-			group->download_th_done = GF_FALSE;
-			res = dash_download_group(dash, group, group, group->groups_depending_on ? GF_TRUE : GF_FALSE);
-			if (res==GF_DASH_DownloadRestart) {
-				i--;
-				continue;
-			}
-			group->download_th_done = GF_TRUE;
-		}
-	}
-
-	while (dash->thread_mode == GF_DASH_THREAD_ALL) {
-		Bool all_done = GF_TRUE;
-		for (i=0; i<group_count; i++) {
-			GF_DASH_Group *group = gf_list_get(dash->groups, i);
-			if (group->selection != GF_DASH_GROUP_SELECTED) {
-				continue;
-			}
-			if (group->depend_on_group) continue;
-			//not yet scheduled for download
-			if (group->rate_adaptation_postponed) continue;
-
-			if (!group->download_th_done) {
-				all_done = GF_FALSE;
-				break;
-			}
+		DownloadGroupStatus res;
+		res = dash_download_group(dash, group, group, group->groups_depending_on ? GF_TRUE : GF_FALSE);
+		if (res==GF_DASH_DownloadRestart) {
+			i--;
+			continue;
 		}
-		if (all_done)
-			break;
-
-		if (dash->thread_mode)
-			gf_sleep(1);
 	}
-	//in non threaded mode we need to wait for the stats
-	if (dash->thread_mode)
-		dash_global_rate_adaptation(dash, GF_FALSE);
 }
 
 static GF_Err dash_check_mpd_update_and_cache(GF_DashClient *dash, Bool *cache_is_full)
 {
 	GF_Err e = GF_OK;
 	u32 i, group_count;
-	u32 timer = gf_sys_clock() - dash->last_update_time;
+	u32 now = gf_sys_clock();
+	u32 timer = now - dash->last_update_time;
 	Bool has_postponed_rate_adaptation;
 
 	(*cache_is_full) = GF_TRUE;
 	has_postponed_rate_adaptation = GF_FALSE;
 
 	group_count = gf_list_count(dash->groups);
+
 	/*refresh MPD*/
-	if (dash->force_mpd_update || (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period))) {
-		u32 diff = gf_sys_clock();
-		if (dash->force_mpd_update || dash->mpd->minimum_update_period) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] At %d Time to update the playlist (%u ms elapsed since last refresh and min reload rate is %u)\n", gf_sys_clock() , timer, dash->mpd->minimum_update_period));
+	if (dash->force_mpd_update
+		//regular MPD update
+		|| (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period))
+		//pending HLS playlist refresh
+		|| (dash->hls_reload_time && (now > dash->hls_reload_time))
+	) {
+		if (dash->force_mpd_update) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Forcing playlist refresh (last segment reached)\n"));
+		} else if (dash->mpd->minimum_update_period) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Update the playlist (%u ms elapsed since last refresh / min reload rate %u ms)\n", gf_sys_clock() , timer, dash->mpd->minimum_update_period));
 		}
-		dash->force_mpd_update = 0;
-
-		if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
+		dash->force_mpd_update = GF_FALSE;
+		dash->hls_reload_time = 0;
 		e = gf_dash_update_manifest(dash);
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-
-		diff = gf_sys_clock() - diff;
 		if (e) {
 			if (!dash->in_error) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
 			}
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated MPD in %d ms\n", diff));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated MPD in %d ms\n", gf_sys_clock() - now));
 		}
+		(*cache_is_full) = GF_FALSE;
 	} else {
 		Bool all_groups_done = GF_TRUE;
 		Bool cache_full = GF_TRUE;
@@ -6683,16 +7399,10 @@
 
 		/*wait if nothing is ready to be downloaded*/
 		if (dash->min_wait_ms_before_next_request > 1) {
-			if (dash->thread_mode) {
-				u32 sleep_for = MIN(dash->min_wait_ms_before_next_request/2, 1000);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] No segments available on the server until %d ms - going to sleep for %d ms\n", dash->min_wait_ms_before_next_request, sleep_for));
-				gf_sleep(sleep_for);
-			} else {
-				if (gf_sys_clock() < dash->min_wait_sys_clock + dash->min_wait_ms_before_next_request) {
-					return GF_EOS;
-				}
-				dash->min_wait_ms_before_next_request = 0;
+			if (gf_sys_clock() < dash->min_wait_sys_clock + dash->min_wait_ms_before_next_request) {
+				return GF_EOS;
 			}
+			dash->min_wait_ms_before_next_request = 0;
 		}
 
 		/*check if cache is not full*/
@@ -6702,18 +7412,16 @@
 			GF_MPD_Type type = dash->mpd->type;
 			GF_DASH_Group *group = gf_list_get(dash->groups, i);
 
-			if (group->period->origin_base_url)
-				type = group->period->type;
-
-			if (group->cache_mutex) gf_mx_p(group->cache_mutex);
-
 			if ((group->selection != GF_DASH_GROUP_SELECTED)
 				|| group->depend_on_group
+				|| !group->adaptation_set
 				|| (group->done && !group->nb_cached_segments)
 			) {
-				if (group->cache_mutex) gf_mx_v(group->cache_mutex);
 				continue;
 			}
+			if (group->period->origin_base_url)
+				type = group->period->type;
+
 			all_groups_done = 0;
 			if (type==GF_MPD_TYPE_DYNAMIC) {
 				gf_dash_group_check_time(group);
@@ -6735,7 +7443,6 @@
 			if (group->rate_adaptation_postponed)
 				has_postponed_rate_adaptation = GF_TRUE;
 
-			if (group->cache_mutex) gf_mx_v(group->cache_mutex);
 			if (!cache_full)
 				break;
 		}
@@ -6759,6 +7466,7 @@
 				dash->next_period_checked = 1;
 			}
 			if (all_groups_done && dash->request_period_switch) {
+				Bool is_chain = GF_FALSE;
 				gf_dash_reset_groups(dash);
 				if (dash->request_period_switch == 1) {
 					if (dash->speed<0) {
@@ -6776,11 +7484,29 @@
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Switching to period #%d\n", dash->active_period_index+1));
 				dash->dash_state = GF_DASH_STATE_SETUP;
 
+				if (dash->active_period_index >= gf_list_count(dash->mpd->periods)) {
+					if (dash->chain_next) {
+						if (dash->chain_stack_state==GF_DASH_CHAIN_PUSH) {
+							if (!dash->chain_stack) dash->chain_stack = gf_list_new();
+							gf_list_add(dash->chain_stack, gf_strdup(dash->base_url));
+						}
+					} else if (dash->chain_stack_state==GF_DASH_CHAIN_POP) {
+						dash->chain_next = gf_list_pop_back(dash->chain_stack);
+					}
+					assert(dash->chain_next);
+					dash->chain_stack_state = 0;
+					dash->dash_state = GF_DASH_STATE_CHAIN_NEXT;
+					is_chain = GF_TRUE;
+				} else if (dash->preroll_state==1) {
+					is_chain = GF_TRUE;
+					dash->preroll_state = 2;
+					dash->initial_period_tunein = GF_TRUE;
+				}
+
 				if (!dash->all_groups_done_notified) {
 					dash->all_groups_done_notified = GF_TRUE;
-					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_END_OF_PERIOD, 0, GF_OK);
+					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_END_OF_PERIOD, is_chain, GF_OK);
 				}
-
 			} else {
 				(*cache_is_full) = GF_TRUE;
 				return GF_OK;
@@ -6788,7 +7514,7 @@
 		}
 	}
 
-	if (!dash->mpd_stop_request && has_postponed_rate_adaptation) {
+	if (has_postponed_rate_adaptation) {
 		dash_global_rate_adaptation(dash, GF_TRUE);
 	}
 	return GF_OK;
@@ -6798,28 +7524,72 @@
 {
 	GF_Err e;
 	Bool cache_is_full;
-	if (dash->mpd_stop_request) return GF_EOS;
+
+retry:
+	if (dash->in_error) return GF_SERVICE_ERROR;
+
+	if (dash->force_period_reload) {
+		if (gf_sys_clock() - dash->force_period_reload < 500) return GF_OK;
+		dash->force_period_reload = 0;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Retrying period reload after previous failure\n"));
+	}
 
 	switch (dash->dash_state) {
+	case GF_DASH_STATE_CHAIN_FALLBACK:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in playback, loading fallback MPD\n"));
+		gf_dash_reset_groups(dash);
+		dash->request_period_switch = 0;
+		dash->active_period_index = gf_list_count(dash->mpd->periods);
+		dash->period_groups_setup = GF_FALSE;
+		if (dash->chain_next) gf_free(dash->chain_next);
+		dash->chain_next = dash->chain_fallback;
+		dash->chain_fallback = NULL;
+
+		dash->dash_state = GF_DASH_STATE_CHAIN_NEXT;
+		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_END_OF_PERIOD, GF_TRUE, GF_OK);
+		//fallthrough
+
+	case GF_DASH_STATE_CHAIN_NEXT:
+	{
+		char *next_mpd = dash->chain_next;
+		dash->chain_next = NULL;
+		char *fallback_mpd = dash->chain_fallback;
+		dash->chain_fallback = NULL;
+		e = gf_dash_open(dash, next_mpd);
+
+		if (e) {
+			if (fallback_mpd) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Failed to open DASH MPD %s in chain: %s - using fallback %s\n", next_mpd, gf_error_to_string(e), fallback_mpd));
+				e = gf_dash_open(dash, fallback_mpd);
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to open DASH MPD %s in chain: %s\n", next_mpd, gf_error_to_string(e) ));
+			}
+		}
+		gf_free(next_mpd);
+		if (fallback_mpd) gf_free(fallback_mpd);
+		return e;
+	}
 	case GF_DASH_STATE_SETUP:
 		dash->in_period_setup = 1;
 		e = dash_setup_period_and_groups(dash);
 		if (e) return e;
 
+		if (dash->force_period_reload) {
+			dash->force_period_reload = gf_sys_clock();
+			return GF_OK;
+		}
+
 		dash->last_update_time = gf_sys_clock();
-		if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 		dash->dash_state = GF_DASH_STATE_CONNECTING;
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-		return GF_OK;
 
+		//fallthrough
+		
 	case GF_DASH_STATE_CONNECTING:
 		/*ask the user to connect to desired groups*/
 		e = dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CREATE_PLAYBACK, -1, GF_OK);
 		if (e) return e;
-		if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 		dash->in_period_setup = 0;
 		dash->dash_state = GF_DASH_STATE_RUNNING;
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		dash->min_wait_ms_before_next_request = 0;
 		return GF_OK;
 	case GF_DASH_STATE_RUNNING:
@@ -6827,8 +7597,12 @@
 		if (e || cache_is_full) {
 			return GF_OK;
 		}
+
 		if (dash->dash_state == GF_DASH_STATE_SETUP)
 			return GF_OK;
+		//we rerun here, otherwise the user might think we are done...
+		if ((dash->dash_state==GF_DASH_STATE_CHAIN_NEXT) || (dash->dash_state==GF_DASH_STATE_CHAIN_FALLBACK))
+			goto retry;
 
 		dash->initial_period_tunein = GF_FALSE;
 		dash_do_groups(dash);
@@ -6841,81 +7615,9 @@
 
 GF_Err gf_dash_process(GF_DashClient *dash)
 {
-	if (dash->thread_mode) return GF_BAD_PARAM;
 	return gf_dash_process_internal(dash);
 }
 
-static u32 dash_main_thread_proc(void *par)
-{
-	GF_Err e;
-	u32 ret = 0;
-	Bool go_on = GF_TRUE;
-	GF_DashClient *dash = (GF_DashClient*) par;
-
-	if (!dash)
-		return 0;
-
-	if (!dash->mpd) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Incorrect state, no dash->mpd for URL=%s, already stopped ?\n", dash->base_url));
-		return 1;
-	}
-
-restart_period:
-
-	/* Setting the download status in exclusive code */
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-	dash->dash_state = GF_DASH_STATE_SETUP;
-	dash->period_groups_setup = GF_FALSE;
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-
-	//period setup state
-	e = gf_dash_process_internal(dash);
-	if (e) {
-		ret = 1;
-		goto exit;
-	}
-
-	//group creation
-	e = gf_dash_process_internal(dash);
-	if (e || dash->mpd_stop_request) {
-		ret = 1;
-		goto exit;
-	}
-
-	while (go_on) {
-		Bool cache_is_full = GF_FALSE;
-
-
-		/*wait until next segment is needed*/
-		while (!dash->mpd_stop_request) {
-			e = dash_check_mpd_update_and_cache(dash, &cache_is_full);
-			if (e || ! cache_is_full) break;
-
-			if (dash->dash_state == GF_DASH_STATE_SETUP)
-				goto restart_period;
-
-			gf_sleep(30);
-		}
-
-		/* stop the thread if requested */
-		if (dash->mpd_stop_request) {
-			break;
-		}
-		dash_do_groups(dash);
-	}
-
-exit:
-	/* Signal that the download thread has ended */
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-
-	/*an error occured during playback chain creation and we couldn't release our plyayback chain in time, do it now*/
-	if (dash->dash_state == GF_DASH_STATE_CONNECTING)
-		gf_dash_reset_groups(dash);
-
-	dash->dash_state = GF_DASH_STATE_STOPPED;
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-	return ret;
-}
 
 static u32 gf_dash_period_index_from_time(GF_DashClient *dash, u64 time)
 {
@@ -6972,49 +7674,6 @@
 	return active_period_plus_one ? active_period_plus_one-1 : 0;
 }
 
-static void gf_dash_download_stop(GF_DashClient *dash)
-{
-	u32 i;
-	assert(dash);
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-	if (dash->groups) {
-		for (i=0; i<gf_list_count(dash->groups); i++) {
-			GF_DASH_Group *group = gf_list_get(dash->groups, i);
-			assert(group);
-			if ((group->selection == GF_DASH_GROUP_SELECTED) && group->segment_download) {
-				dash->dash_io->abort(dash->dash_io, group->segment_download);
-				gf_dash_mark_group_done(group);
-			}
-		}
-	}
-	if (!dash->thread_mode) {
-		dash->mpd_stop_request = GF_TRUE;
-		return;
-	}
-	
-	/* stop the download thread */
-	dash->mpd_stop_request = GF_TRUE;
-	if (dash->dash_state != GF_DASH_STATE_STOPPED) {
-		dash->mpd_stop_request = 1;
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-		while (1) {
-			/* waiting for the download thread to stop */
-			if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-			if (dash->dash_state == GF_DASH_STATE_STOPPED) {
-				/* it's stopped we can continue */
-				if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-				break;
-			}
-			if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-		}
-	} else {
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-	}
-	dash->mpd_stop_request = GF_TRUE;
-}
-
-
-
 static Bool gf_dash_seek_periods(GF_DashClient *dash, Double seek_time)
 {
 	Double start_time;
@@ -7026,7 +7685,6 @@
 	Bool at_period_boundary=GF_FALSE;
 	u32 i, period_idx;
 	u32 nb_retry = 10;
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 
 	dash->start_range_period = 0;
 	start_time = 0;
@@ -7071,7 +7729,6 @@
 		at_period_boundary = GF_TRUE;
 	}
 
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 	if (at_period_boundary) return GF_TRUE;
 	return dash->request_period_switch ? 1 : 0;
 }
@@ -7083,8 +7740,6 @@
 
 	if (group->selection==GF_DASH_GROUP_NOT_SELECTABLE) return;
 	
-	if (group->cache_mutex) gf_mx_p(group->cache_mutex);
-
 	group->force_segment_switch = 0;
 	if (!is_dynamic) {
 		/*figure out where to seek*/
@@ -7104,7 +7759,6 @@
 		}
 		/*we are seeking in our download range, just go on*/
 		if ((segment_idx>=first_downloaded) && (segment_idx<=last_downloaded)) {
-			if (group->cache_mutex) gf_mx_v(group->cache_mutex);
 			return;
 		}
 
@@ -7112,38 +7766,16 @@
 		group->download_segment_index = segment_idx;
 	} else {
 		group->start_number_at_last_ast = 0;
-		/*remember to adjust time in timeline steup*/
+		/*remember to adjust time in timeline setup*/
 		group->start_playback_range = seek_to;
-		group->timeline_setup = 0;
+		group->timeline_setup = GF_FALSE;
 	}
 
-
-	if (group->segment_download)
-		dash->dash_io->abort(dash->dash_io, group->segment_download);
-
-	if (group->urlToDeleteNext) {
-		if (!dash->keep_files && !group->local_files)
-			dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
-
-		gf_free(group->urlToDeleteNext);
-		group->urlToDeleteNext = NULL;
-	}
-
-	if (group->segment_download) {
-		dash->dash_io->abort(dash->dash_io, group->segment_download);
-		dash->dash_io->del(dash->dash_io, group->segment_download);
-		group->segment_download = NULL;
-	}
 	while (group->nb_cached_segments) {
 		group->nb_cached_segments--;
-		if (!dash->keep_files && !group->local_files && !group->segment_must_be_streamed)
-			gf_file_delete(group->cached[group->nb_cached_segments].cache);
-
 		gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
 	}
 	group->done = 0;
-
-	if (group->cache_mutex) gf_mx_v(group->cache_mutex);
 }
 
 GF_EXPORT
@@ -7151,17 +7783,13 @@
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
 	if (!group) return;
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 	gf_dash_seek_group(dash, group, seek_to, (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) ? GF_TRUE : GF_FALSE);
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 }
 
 static void gf_dash_seek_groups(GF_DashClient *dash, Double seek_time, Bool is_dynamic)
 {
 	u32 i;
 
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-
 	if (dash->active_period_index) {
 		Double dur = 0;
 		for (i=0; i<dash->active_period_index; i++) {
@@ -7174,22 +7802,22 @@
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
 		gf_dash_seek_group(dash, group, seek_time, is_dynamic);
 	}
-
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 }
 
 
 static GF_Err http_ifce_get(GF_FileDownload *getter, char *url)
 {
 	GF_Err e;
+	Bool owns_sess = GF_FALSE;
 	GF_DASHFileIOSession *sess;
 	GF_DashClient *dash = (GF_DashClient*) getter->udta;
 	if (!getter->session) {
-		if (!dash->mpd_dnload || (dash->thread_mode!=GF_DASH_THREAD_NONE)) {
+		if (!dash->mpd_dnload) {
 			sess = dash->dash_io->create(dash->dash_io, 1, url, -1);
 			if (!sess) return GF_IO_ERR;
 			getter->session = sess;
 			e = GF_OK;
+			owns_sess = GF_TRUE;
 		} else {
 			sess = getter->session = dash->mpd_dnload;
 			e = dash->dash_io->setup_from_url(dash->dash_io, getter->session, url, -1);
@@ -7205,8 +7833,8 @@
 		}
 		e = dash->dash_io->setup_from_url(dash->dash_io, getter->session, url, group_idx);
 		if (e) {
-			//with ATSC we may have 404 right away if nothing in cache yet, not an error
-			GF_LOG(dash->atsc_clock_state ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup downloader for url %s: %s\n", url, gf_error_to_string(e) ));
+			//with ROUTE we may have 404 right away if nothing in cache yet, not an error
+			GF_LOG(dash->route_clock_state ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup downloader for url %s: %s\n", url, gf_error_to_string(e) ));
 			return e;
 		}
 		sess = (GF_DASHFileIOSession *)getter->session;
@@ -7215,9 +7843,11 @@
 		e = dash->dash_io->init(dash->dash_io, sess);
 
 	if (e) {
-		dash->dash_io->del(dash->dash_io, sess);
-		if (getter->session == sess)
-			getter->session = NULL;
+		if (owns_sess) {
+			dash->dash_io->del(dash->dash_io, sess);
+			if (getter->session == sess)
+				getter->session = NULL;
+		}
 		return e;
 	}
 	return dash->dash_io->run(dash->dash_io, sess);
@@ -7254,6 +7884,13 @@
 	memset( dash->lastMPDSignature, 0, GF_SHA1_DIGEST_SIZE);
 	dash->reload_count = 0;
 
+	dash->initial_period_tunein = GF_TRUE;
+	dash->route_clock_state = dash->reload_count = dash->last_update_time = 0;
+	memset(dash->lastMPDSignature, 0, sizeof(char)*GF_SHA1_DIGEST_SIZE);
+	dash->utc_drift_estimate = 0;
+	dash->time_in_tsb = dash->prev_time_in_tsb = 0;
+	dash->reinit_period_index = 0;
+
 	if (dash->base_url) gf_free(dash->base_url);
 	sep_cgi = strrchr(manifest_url, '?');
 	if (sep_cgi) sep_cgi[0] = 0;
@@ -7294,17 +7931,6 @@
 		strlwr(mime);
 
 		reloc_url = dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload);
-		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
-		if (gf_dash_is_m3u8_mime(reloc_url, mime) || strstr(reloc_url, ".m3u8") || strstr(reloc_url, ".M3U8")) {
-			dash->is_m3u8 = 1;
-		} else if (gf_dash_is_smooth_mime(reloc_url, mime)) {
-			dash->is_smooth = 1;
-		} else if (!gf_dash_is_dash_mime(mime) && !strstr(reloc_url, ".mpd") && !strstr(reloc_url, ".MPD")) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] mime '%s' for '%s' should be m3u8 or mpd\n", mime, reloc_url));
-			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-			dash->mpd_dnload = NULL;
-			return GF_REMOTE_SERVICE_ERROR;
-		}
 
 		/*if relocated use new URL as base URL for all requests*/
 		if (strcmp(reloc_url, manifest_url)) {
@@ -7322,8 +7948,6 @@
 	} else {
 		local_url = manifest_url;
 		is_local = 1;
-		if (strstr(manifest_url, ".m3u8"))
-			dash->is_m3u8 = 1;
 	}
 
 	if (is_local && strncmp(manifest_url, "gfio://", 7)) {
@@ -7356,6 +7980,21 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD creation problem %s\n", gf_error_to_string(e)));
 		goto exit;
 	}
+	if (dash->dash_io->manifest_updated) {
+		const char *szName = gf_file_basename(manifest_url);
+		dash->dash_io->manifest_updated(dash->dash_io, szName, local_url, -1);
+	}
+
+	//peek payload, check if m3u8 - MPD and SmoothStreaming are checked after
+	char szLine[100];
+	FILE *f = gf_fopen(local_url, "r");
+	if (f) {
+		gf_fread(szLine, 100, f);
+		gf_fclose(f);
+	}
+	szLine[99] = 0;
+	if (strstr(szLine, "#EXTM3U"))
+		dash->is_m3u8 = 1;
 
 	if (dash->is_m3u8) {
 		if (is_local) {
@@ -7372,6 +8011,10 @@
 
 			e = gf_m3u8_to_mpd(local_url, redirected_url, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, M3U8_TO_MPD_USE_SEGTIMELINE, &dash->getter, dash->mpd, GF_FALSE, dash->keep_files);
 		}
+
+		if (!e && dash->split_adaptation_set)
+			gf_mpd_split_adaptation_sets(dash->mpd);
+
 	} else {
 		u32 res = gf_dash_check_mpd_root_type(local_url);
 		if (res==2) {
@@ -7384,7 +8027,7 @@
 			return GF_URL_ERROR;
 		}
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] parsing MPD %s\n", local_url));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] parsing %s manifest %s\n", dash->is_smooth ? "SmoothStreaming" : "DASH-MPD", local_url));
 
 		/* parse the MPD */
 		mpd_parser = gf_xml_dom_new();
@@ -7414,13 +8057,14 @@
 		if (dash->ignore_xlink)
 			dash_purge_xlink(dash->mpd);
 
-		if (!is_local) {
-			const char *hdr = dash->dash_io->get_header_value(dash->dash_io, dash->mpd_dnload, "x-dash-atsc");
-			if (hdr) {
-				if (!dash->atsc_clock_state) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Detected ATSC DASH service ID %s\n", hdr));
-					dash->atsc_clock_state = 1;
-				}
+	}
+	//for both DASH and HLS, we support ROUTE
+	if (!is_local) {
+		const char *hdr = dash->dash_io->get_header_value(dash->dash_io, dash->mpd_dnload, "x-route");
+		if (hdr) {
+			if (!dash->route_clock_state) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Detected ROUTE DASH service ID %s\n", hdr));
+				dash->route_clock_state = 1;
 			}
 		}
 	}
@@ -7452,14 +8096,16 @@
 		goto exit;
 	}
 
-	dash->dash_state = GF_DASH_STATE_SETUP;
-	dash->mpd_stop_request = 0;
-	if (dash->thread_mode) {
-		return gf_th_run(dash->dash_thread, dash_main_thread_proc, dash);
-	} else {
-		return GF_OK;
+	if (dash->chaining_mode) {
+		dash_check_chaining(dash, "urn:mpeg:dash:mpd-chaining:2016", &dash->chain_next, 0);
+		dash_check_chaining(dash, "urn:mpeg:dash:fallback:2016", &dash->chain_fallback, 0);
+		dash_check_chaining(dash, "urn:mpeg:dash:origin-set:2019", NULL, GF_DASH_CHAIN_PUSH);
+		dash_check_chaining(dash, "urn:mpeg:dash:origin-back:2019", NULL, GF_DASH_CHAIN_POP);
 	}
 
+	dash->dash_state = GF_DASH_STATE_SETUP;
+	return GF_OK;
+
 exit:
 	if (dash->dash_io) {
 		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
@@ -7478,21 +8124,29 @@
 	assert(dash);
 
 	if (dash->dash_io) {
-		gf_dash_download_stop(dash);
-		if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 		if (dash->mpd_dnload) {
+			if (dash->mpd_dnload == dash->getter.session)
+				dash->getter.session = NULL;
 			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
 			dash->mpd_dnload = NULL;
 		}
 
-		if (dash->getter.del_session)
+		if (dash->getter.del_session && dash->getter.session)
 			dash->getter.del_session(&dash->getter);
-
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 	}
-	if (dash->mpd)
+	if (dash->mpd) {
 		gf_mpd_del(dash->mpd);
-	dash->mpd = NULL;
+		dash->mpd = NULL;
+	}
+	if (dash->chain_next) {
+		gf_free(dash->chain_next);
+		dash->chain_next = NULL;
+	}
+	if (dash->chain_fallback) {
+		gf_free(dash->chain_fallback);
+		dash->chain_fallback = NULL;
+	}
+	dash->chain_stack_state = 0;
 
 	if (dash->dash_state != GF_DASH_STATE_CONNECTING)
 		gf_dash_reset_groups(dash);
@@ -7529,8 +8183,54 @@
 	}
 }
 
+static s32 dash_do_rate_adaptation_custom(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
+		 	 	 	 	 	 	 	 	 u32 dl_rate, Double speed, Double max_available_speed, Bool force_lower_complexity,
+										 	 GF_MPD_Representation *rep, Bool go_up_bitrate)
+{
+	GF_DASHCustomAlgoInfo stats;
+	u32 g_idx = group->groups_idx;
+	u32 b_idx = base_group->groups_idx;
+
+	stats.download_rate = dl_rate;
+	stats.file_size = group->total_size;
+	stats.speed = speed;
+	stats.max_available_speed = max_available_speed;
+	stats.display_width = group->hint_visible_width;
+	stats.display_height = group->hint_visible_height;
+	stats.active_quality_idx = group->active_rep_index;
+	stats.buffer_min_ms = group->buffer_min_ms;
+	stats.buffer_max_ms = group->buffer_max_ms;
+	stats.buffer_occupancy_ms = group->buffer_occupancy_ms;
+	stats.quality_degradation_hint = group->quality_degradation_hint;
+	stats.total_rate = dash->total_rate;
+
+	return dash->rate_adaptation_algo_custom(dash->udta_custom_algo, g_idx, b_idx, force_lower_complexity, &stats);
+
+}
+
+static s32 dash_do_rate_monitor_custom(GF_DashClient *dash, GF_DASH_Group *group, u32 bits_per_sec, u64 total_bytes, u64 bytes_done, u64 us_since_start, u32 buffer_dur_ms, u32 current_seg_dur)
+{
+	u32 g_idx = group->groups_idx;
+	return dash->rate_adaptation_download_monitor_custom(dash->udta_custom_algo, g_idx, bits_per_sec, total_bytes, bytes_done, us_since_start, buffer_dur_ms, current_seg_dur);
+}
+
 GF_EXPORT
-GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io, GF_DASHThreadMode thread_mode, u32 max_cache_duration, u32 auto_switch_count, Bool keep_files, Bool disable_switching, GF_DASHInitialSelectionMode first_select_mode, u32 initial_time_shift_percent)
+void gf_dash_set_algo_custom(GF_DashClient *dash, void *udta,
+		gf_dash_rate_adaptation algo_custom,
+		gf_dash_download_monitor download_monitor_custom)
+{
+	dash->adaptation_algorithm = GF_DASH_ALGO_CUSTOM;
+	dash->rate_adaptation_algo = dash_do_rate_adaptation_custom;
+	dash->rate_adaptation_download_monitor = dash_do_rate_monitor_custom;
+
+	dash->udta_custom_algo = udta;
+	dash->rate_adaptation_algo_custom = algo_custom;
+	dash->rate_adaptation_download_monitor_custom = download_monitor_custom;
+
+}
+
+GF_EXPORT
+GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io, u32 max_cache_duration, s32 auto_switch_count, Bool keep_files, Bool disable_switching, GF_DASHInitialSelectionMode first_select_mode, u32 initial_time_shift_percent)
 {
 	GF_DashClient *dash;
 	if (!dash_io) {
@@ -7543,15 +8243,10 @@
 	dash->dash_io = dash_io;
 	dash->speed = 1.0;
 	dash->is_rt_speed = GF_TRUE;
-	dash->thread_mode = thread_mode;
 	dash->low_latency_mode = GF_DASH_LL_STRICT;
 
 	//wait one segment to validate we have enough bandwidth
 	dash->probe_times_before_switch = 1;
-	if (dash->thread_mode) {
-		dash->dash_thread = gf_th_new("DashClientMainThread");
-		dash->dash_mutex = gf_mx_new("DashClientMainMutex");
-	}
 	//FIXME: mime type for segments MUST be mp2t, webvtt or a Packed Audio file (like AAC)
 	dash->mimeTypeForM3U8Segments = gf_strdup( "video/mp2t" );
 
@@ -7559,25 +8254,25 @@
 	dash->initial_time_shift_value = initial_time_shift_percent;
 
 	dash->auto_switch_count = auto_switch_count;
+	dash->auto_switch_loop = GF_FALSE;
 	dash->keep_files = keep_files;
 	dash->disable_switching = disable_switching;
 	dash->first_select_mode = first_select_mode;
 	dash->min_timeout_between_404 = 500;
 	dash->segment_lost_after_ms = 100;
-	dash->debug_group_index = -1;
+	dash->dbg_grps_index = NULL;
 	dash->tile_rate_decrease = 100;
-	dash->atsc_ast_shift = 1000;
+	dash->route_ast_shift = 1000;
 	dash->initial_period_tunein = GF_TRUE;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Client created\n"));
 
 #ifdef GPAC_ENABLE_COVERAGE
 	if (gf_sys_is_cov_mode()) {
 		on_group_download_error(NULL, NULL, NULL, GF_OK, NULL, NULL, NULL, GF_FALSE);
-		dash_download_threaded(NULL);
-		dash_main_thread_proc(NULL);
 		gf_dash_is_running(dash);
 	}
 #endif
+
 	return dash;
 }
 
@@ -7587,9 +8282,12 @@
 	//force group cleanup
 	dash->dash_state = GF_DASH_STATE_STOPPED;
 	gf_dash_close(dash);
-	if (dash->dash_thread)
-		gf_th_del(dash->dash_thread);
-	if (dash->dash_mutex) gf_mx_del(dash->dash_mutex);
+
+	while (gf_list_count(dash->chain_stack)) {
+		char *url = gf_list_pop_back(dash->chain_stack);
+		gf_free(url);
+	}
+	gf_list_del(dash->chain_stack);
 
 	if (dash->mimeTypeForM3U8Segments) gf_free(dash->mimeTypeForM3U8Segments);
 	if (dash->base_url) gf_free(dash->base_url);
@@ -7610,11 +8308,31 @@
 }
 
 GF_EXPORT
+void gf_dash_enable_single_range_llhls(GF_DashClient *dash, Bool enable)
+{
+	dash->llhls_single_range = enable;
+}
+
+GF_EXPORT
+void gf_dash_enable_group_selection(GF_DashClient *dash, Bool enable)
+{
+	dash->enable_group_selection = enable;
+}
+
+GF_EXPORT
 void gf_dash_set_agressive_adaptation(GF_DashClient *dash, Bool agressive_switch)
 {
 	dash->agressive_switching = agressive_switch;
 }
 
+GF_EXPORT
+void gf_dash_set_auto_switch(GF_DashClient *dash, s32 auto_switch_count, Bool auto_switch_loop)
+{
+	if (!dash) return;
+	dash->auto_switch_count = auto_switch_count;
+	dash->auto_switch_loop = auto_switch_loop;
+}
+
 
 GF_EXPORT
 u32 gf_dash_get_group_count(GF_DashClient *dash)
@@ -7666,7 +8384,7 @@
 
 
 GF_EXPORT
-void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up, Bool immediate_switch)
+void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up)
 {
 	u32 i;
 	for (i=0; i<gf_list_count(dash->groups); i++) {
@@ -7708,8 +8426,6 @@
 		if (switch_to_rep_idx && (switch_to_rep_idx-1 != current_idx) ) {
 			u32 nb_cached_seg_per_rep = group->max_cached_segments / gf_dash_group_count_rep_needed(group);
 
-			if (group->cache_mutex) gf_mx_p(group->cache_mutex);
-
 			group->force_switch_bandwidth = 1;
 			if (!group->base_rep_index_plus_one)
 				group->force_representation_idx_plus_one = switch_to_rep_idx;
@@ -7717,6 +8433,9 @@
 				group->max_complementary_rep_index = switch_to_rep_idx-1;
 
 
+			//deprecated code from old arch, dasher no longer downloads segments and cannot do immediate switch
+			//cf https://github.com/gpac/gpac/issues/1852
+#if 0
 			if (group->local_files || immediate_switch) {
 				u32 keep_seg_index = 0;
 				//keep all scalable enhancements of the first segment
@@ -7741,9 +8460,6 @@
 						group->nb_cached_segments--;
 						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Group %d switching quality - delete cached segment: %s\n", i, group->cached[group->nb_cached_segments].url));
 
-						if (!group->local_files && group->cached[group->nb_cached_segments].cache) {
-							gf_file_delete( group->cached[group->nb_cached_segments].cache );
-						}
 						gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
 
 						group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
@@ -7772,10 +8488,6 @@
 							group->nb_cached_segments--;
 							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Group %d switching quality - delete cached segment: %s\n", i, group->cached[group->nb_cached_segments].url));
 
-							if (!group->local_files && group->cached[group->nb_cached_segments].cache) {
-								gf_file_delete( group->cached[group->nb_cached_segments].cache );
-							}
-
 							gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
 
 							group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
@@ -7803,13 +8515,13 @@
 					}
 				}
 			}
+#endif
+
 			/*resize max cached segment*/
 			group->max_cached_segments = nb_cached_seg_per_rep * gf_dash_group_count_rep_needed(group);
 
 			if (group->srd_desc)
-				gf_dash_set_tiles_quality(dash, group->srd_desc);
-
-			if (group->cache_mutex) gf_mx_v(group->cache_mutex);
+				gf_dash_set_tiles_quality(dash, group->srd_desc, GF_TRUE);
 		}
 	}
 }
@@ -7838,6 +8550,10 @@
 Bool gf_dash_is_m3u8(GF_DashClient *dash) {
 	return dash->is_m3u8;
 }
+GF_EXPORT
+Bool gf_dash_is_smooth_streaming(GF_DashClient *dash) {
+	return dash->is_smooth;
+}
 
 GF_EXPORT
 const char *gf_dash_group_get_segment_mime(GF_DashClient *dash, u32 idx)
@@ -7891,7 +8607,7 @@
 }
 
 GF_EXPORT
-const char *gf_dash_group_get_segment_init_keys(GF_DashClient *dash, u32 idx, bin128 *key_IV)
+const char *gf_dash_group_get_segment_init_keys(GF_DashClient *dash, u32 idx, u32 *crypt_type, bin128 *key_IV)
 {
 	GF_MPD_Representation *rep;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
@@ -7900,10 +8616,28 @@
 	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 	if (!rep) return NULL;
 
+	if (crypt_type) {
+		*crypt_type = rep->crypto_type;
+	}
 	if (key_IV) memcpy(*key_IV, rep->playback.key_IV, sizeof(bin128));
 	return rep->playback.key_url;
 }
 
+Bool gf_dash_group_init_segment_is_media(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return GF_FALSE;
+	return group->init_segment_is_media;
+}
+
+GF_EXPORT
+s32 gf_dash_group_get_id(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return -1;
+	return group->adaptation_set->group;
+}
+
 GF_EXPORT
 void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select)
 {
@@ -7916,8 +8650,9 @@
 	if ((group->selection==GF_DASH_GROUP_NOT_SELECTED) && select) needs_resetup = 1;
 
 	group->selection = select ? GF_DASH_GROUP_SELECTED : GF_DASH_GROUP_NOT_SELECTED;
+
 	/*this set is part of a group, make sure no all other sets from the indicated group are unselected*/
-	if (select && (group->adaptation_set->group>=0)) {
+	if (dash->enable_group_selection && select && (group->adaptation_set->group>=0)) {
 		u32 i;
 		for (i=0; i<gf_dash_get_group_count(dash); i++) {
 			GF_DASH_Group *agroup = gf_list_get(dash->groups, i);
@@ -7932,7 +8667,8 @@
 			}
 		}
 	}
-	//TODO: recompute grop download index based on current playback ...
+
+	//TODO: recompute group download index based on current playback ...
 	if (needs_resetup) {
 
 	}
@@ -7944,19 +8680,21 @@
 	u32 i, len;
 	s32 lang_idx;
 	GF_List *groups_selected;
-	if (!lang_code_rfc_5646) return;
+	if (!lang_code_rfc_5646) lang_code_rfc_5646 = "und";
 
 	groups_selected = gf_list_new();
 
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-
 	//first pass, check exact match
 	for (i=0; i<gf_list_count(dash->groups); i++) {
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
 		if (group->selection==GF_DASH_GROUP_NOT_SELECTABLE) continue;
-		if (!group->adaptation_set->lang) continue;
 
-		if (!stricmp(group->adaptation_set->lang, lang_code_rfc_5646)) {
+		//select groups with no language info or undetermined or matching our code
+		if (!group->adaptation_set->lang
+			|| !stricmp(group->adaptation_set->lang, lang_code_rfc_5646)
+			|| !strnicmp(group->adaptation_set->lang, "und", 3)
+			|| !strnicmp(group->adaptation_set->lang, "unkn", 4)
+		) {
 			gf_dash_group_select(dash, i, 1);
 			gf_list_add(groups_selected, group);
 		}
@@ -7975,7 +8713,7 @@
 			if (gf_list_find(groups_selected, group) >= 0) continue;
 
 			//check we didn't select one AS in this group in the previous pass or in this pass
-			if (group->adaptation_set->group>=0) {
+			if (dash->enable_group_selection && group->adaptation_set->group>=0) {
 				u32 k;
 				Bool found = GF_FALSE;
 				for (k=0; k<gf_list_count(groups_selected); k++) {
@@ -7988,6 +8726,7 @@
 				}
 				if (found) continue;
 			}
+
 			//get the 2 or 3 land code
 			sep = strchr(group->adaptation_set->lang, '-');
 			if (sep) {
@@ -8000,14 +8739,14 @@
 			 ) {
 				gf_dash_group_select(dash, i, 1);
 				gf_list_add(groups_selected, group);
+			} else {
+				gf_dash_group_select(dash, i, 0);
 			}
 
 			if (sep) sep[0] = '-';
 		}
 	}
 
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-
 	gf_list_del(groups_selected);
 }
 
@@ -8040,8 +8779,6 @@
 GF_EXPORT
 Bool gf_dash_in_last_period(GF_DashClient *dash, Bool check_eos)
 {
-	Bool res;
-
 	switch (dash->dash_state) {
 	case GF_DASH_STATE_SETUP:
 	case GF_DASH_STATE_CONNECTING:
@@ -8050,16 +8787,15 @@
 		break;
 	}
 	
-	res = (dash->active_period_index+1 < gf_list_count(dash->mpd->periods)) ? 0 : 1;
-	//this code seems buggy, commented for now
-#if 0
-	if (res && dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
-		GF_MPD_Period*period = gf_list_last(dash->mpd->periods);
-		//consider we are
-		if (!period->duration || dash->mpd->media_presentation_duration) res = GF_FALSE;
-	}
-#endif
-	return res;
+	if (dash->active_period_index+1 < gf_list_count(dash->mpd->periods))
+		return GF_FALSE;
+
+	//check chaining
+	if (dash->chain_next) return GF_FALSE;
+	if ((dash->chain_stack_state==GF_DASH_CHAIN_POP) && gf_list_count(dash->chain_stack))
+		return GF_FALSE;
+
+	return GF_TRUE;
 }
 GF_EXPORT
 Bool gf_dash_in_period_setup(GF_DashClient *dash)
@@ -8076,7 +8812,7 @@
 	if (dash->speed == speed) return;
 
 	for (i=0; i<gf_list_count(dash->groups); i++) {
-		GF_DASH_Group *group = (GF_DASH_Group *)gf_list_get(dash->groups, i);
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
 		GF_MPD_Representation *active_rep;
 		Double max_available_speed;
 		if (!group || (group->selection != GF_DASH_GROUP_SELECTED)) continue;
@@ -8115,84 +8851,95 @@
 	}
 }
 
-
 GF_EXPORT
-u32 gf_dash_group_get_max_segments_in_cache(GF_DashClient *dash, u32 idx)
+GF_Err gf_dash_group_get_segment_duration(GF_DashClient *dash, u32 idx, u32 *dur, u32 *timescale)
 {
+	GF_MPD_Representation *rep;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (group) return group->max_cached_segments;
-	return 0;
-}
+	if (!group) return GF_BAD_PARAM;
+	if (!group->adaptation_set) return GF_BAD_PARAM;
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	if (!rep) return GF_BAD_PARAM;
 
+	*dur = 0;
+	*timescale = 0;
+	if (rep->segment_template) { *dur = (u32) rep->segment_template->duration; (*timescale) = rep->segment_template->timescale; }
+	else if (rep->segment_list) { *dur = (u32) rep->segment_list->duration; *timescale = rep->segment_list->timescale; }
+
+	if (group->adaptation_set->segment_template && ! *dur) *dur = (u32) group->adaptation_set->segment_template->duration;
+	else if (group->adaptation_set->segment_list && ! *dur) *dur = (u32) group->adaptation_set->segment_list->duration;
 
-GF_EXPORT
-u32 gf_dash_group_get_num_segments_ready(GF_DashClient *dash, u32 idx, Bool *group_is_done)
-{
-	u32 res = 0;
-	GF_DASH_Group *group;
+	if (group->adaptation_set->segment_template && ! *timescale) *timescale = group->adaptation_set->segment_template->timescale;
+	else if (group->adaptation_set->segment_list && ! *timescale) *timescale = group->adaptation_set->segment_list->timescale;
 
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-	group = gf_list_get(dash->groups, idx);
-	if (!group) {
-		*group_is_done = 1;
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-		return 0;
-	}
-	if (group->cache_mutex) gf_mx_p(group->cache_mutex);
+	if (group->period->segment_template && ! *dur) *dur = (u32) group->period->segment_template->timescale;
+	else if (group->period->segment_list && ! *dur) *dur = (u32) group->period->segment_list->timescale;
 
-	*group_is_done = group->done;
-	res = group->nb_cached_segments;
+	if (group->period->segment_template && ! *timescale) *timescale = group->period->segment_template->timescale;
+	else if (group->period->segment_list && ! *timescale) *timescale = group->period->segment_list->timescale;
+	return GF_OK;
+}
 
-	if (group->buffering) {
-		res = 0;
-	}
+GF_EXPORT
+GF_Err gf_dash_group_next_seg_info(GF_DashClient *dash, u32 group_idx, u32 dependent_representation_index, const char **seg_name, u32 *seg_number, GF_Fraction64 *seg_time, u32 *seg_dur_ms, const char **init_segment)
+{
+	GF_Err res = GF_OK;
+	GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
+	if (!group) return GF_BAD_PARAM;
 
-	if (group->cache_mutex) gf_mx_v(group->cache_mutex);
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
+	if (init_segment) {
+		if (group->bs_switching_init_segment_url) {
+			*init_segment = group->bs_switching_init_segment_url_name_start;
+		} else {
+			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+			*init_segment = rep ? rep->playback.init_seg_name_start : NULL;
+		}
+	} else {
+		u32 rep_idx = dependent_representation_index;
+		if (group->nb_cached_segments <= rep_idx) {
+			res = GF_BUFFER_TOO_SMALL;
+		} else {
+			if (seg_name) *seg_name = group->cached[rep_idx].seg_name_start;
+			if (seg_number) *seg_number = group->cached[rep_idx].seg_number;
+			if (seg_time) *seg_time = group->cached[rep_idx].time;
+			if (seg_dur_ms) *seg_dur_ms = group->cached[rep_idx].duration;
+		}
+	}
 	return res;
 }
 
 GF_EXPORT
+const char *gf_dash_group_get_representation_id(GF_DashClient *dash, u32 idx)
+{
+	GF_MPD_Representation *rep;
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return NULL;
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	return rep->id;
+}
+
+
+GF_EXPORT
 void gf_dash_group_discard_segment(GF_DashClient *dash, u32 idx)
 {
 	GF_DASH_Group *group;
 	Bool delete_next;
 
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 	group = gf_list_get(dash->groups, idx);
-	if (group->cache_mutex) gf_mx_p(group->cache_mutex);
 
 discard_segment:
 	if (!group->nb_cached_segments) {
-		if (group->cache_mutex) gf_mx_v(group->cache_mutex);
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		return;
 	}
-	delete_next = group->cached[0].has_dep_following ? GF_TRUE : GF_FALSE;
-
-	if (group->cached[0].cache) {
-		if (group->urlToDeleteNext) {
-			if (!group->local_files && !dash->keep_files && strncmp(group->urlToDeleteNext, "gmem://", 7) )
-				dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
-
-			gf_free(group->urlToDeleteNext);
-			group->urlToDeleteNext = NULL;
-		}
-		assert(group->cached[0].url);
+	delete_next = (group->cached[0].flags & SEG_FLAG_DEP_FOLLOWING) ? GF_TRUE : GF_FALSE;
+	assert(group->cached[0].url);
 
-		if (group->dont_delete_first_segment) {
-			group->dont_delete_first_segment = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] deleting cache file %s : %s (kept in HTTP cache)\n", group->cached[0].url, group->cached[0].cache));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] deleting cache file %s : %s\n", group->cached[0].url, group->cached[0].cache));
-			group->urlToDeleteNext = gf_strdup( group->cached[0].url );
-		}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] removing segment %s from list\n", group->cached[0].url));
 
-		//remember the representation index of the last segment
-		group->prev_active_rep_index = group->cached[0].representation_index;
+	//remember the representation index of the last segment
+	group->prev_active_rep_index = group->cached[0].representation_index;
 
-		gf_dash_group_reset_cache_entry(&group->cached[0]);
-	}
+	gf_dash_group_reset_cache_entry(&group->cached[0]);
 
 	memmove(&group->cached[0], &group->cached[1], sizeof(segment_cache_entry)*(group->nb_cached_segments-1));
 	memset(&(group->cached[group->nb_cached_segments-1]), 0, sizeof(segment_cache_entry));
@@ -8204,29 +8951,24 @@
 
 	/*if we have dependency representations, we need also discard them*/
 	if (group->base_rep_index_plus_one) {
-		if (group->cached[0].cache && (group->cached[0].representation_index != group->base_rep_index_plus_one-1))
+		if (group->cached[0].url && (group->cached[0].representation_index != group->base_rep_index_plus_one-1))
 			goto discard_segment;
 	}
-
-	if (group->cache_mutex) gf_mx_v(group->cache_mutex);
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 }
 
 GF_EXPORT
 void gf_dash_set_group_done(GF_DashClient *dash, u32 idx, Bool done)
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (group) {
-		if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-		if (group->cache_mutex) gf_mx_p(group->cache_mutex);
-		group->done = done;
-		if (done && group->segment_download) {
-			group->download_abort_type = 1;
-			dash->dash_io->abort(dash->dash_io, group->segment_download);
-		}
-		if (group->cache_mutex) gf_mx_v(group->cache_mutex);
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-	}
+	if (group) group->done = done;
+}
+
+GF_EXPORT
+Bool gf_dash_get_group_done(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (group) return group->done;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -8258,19 +9000,13 @@
 	if (switching_index) *switching_index = -1;
 	if (has_next_segment) *has_next_segment = GF_FALSE;
 
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 	group = gf_list_get(dash->groups, idx);
 
 	if (!group) {
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		return GF_BAD_PARAM;
 	}
 
-	if (group->cache_mutex) gf_mx_p(group->cache_mutex);
-
 	if (!group->nb_cached_segments) {
-		if (group->cache_mutex) gf_mx_v(group->cache_mutex);
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		if (group->done) return GF_EOS;
 		if ((dash->low_latency_mode==GF_DASH_LL_EARLY_FETCH)
 			&& group->is_low_latency
@@ -8284,7 +9020,7 @@
 	}
 
 	/*check the dependent rep is in the cache and does not target next segment (next in time)*/
-	has_dep_following = group->cached[0].has_dep_following;
+	has_dep_following = (group->cached[0].flags & SEG_FLAG_DEP_FOLLOWING) ? GF_TRUE : GF_FALSE;
 	index = 0;
 	while (dependent_representation_index) {
 		GF_Err err = GF_OK;
@@ -8292,7 +9028,7 @@
 		if (has_dep_following) {
 			if (index+1 >= group->nb_cached_segments)
 				err = GF_BUFFER_TOO_SMALL;
-			else if (! group->cached[index].has_dep_following)
+			else if (! (group->cached[index].flags & SEG_FLAG_DEP_FOLLOWING) )
 				err = GF_BAD_PARAM;
 		} else {
 			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
@@ -8303,14 +9039,13 @@
 		}
 
 		if (err) {
-			if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 			return err;
 		}
 		index ++;
 		dependent_representation_index--;
 	}
 
-	*url = group->cached[index].cache;
+	*url = group->cached[index].url;
 	if (start_range)
 		*start_range = group->cached[index].start_range;
 	if (end_range)
@@ -8332,80 +9067,39 @@
 	}
 	group->force_segment_switch = 0;
 
-	if (group->cached[index].has_dep_following) {
-		if (has_next_segment) *has_next_segment = GF_TRUE;
-	} else if ((index+1<group->max_cached_segments) && group->cached[index+1].cache && group->adaptation_set) {
-		GF_MPD_Representation *rep;
-
-		rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
-		if (rep && (rep->playback.enhancement_rep_index_plus_one == group->cached[index+1].representation_index+1) ) {
-			if (has_next_segment)
+	if (has_next_segment) {
+		if (group->cached[index].flags & SEG_FLAG_DEP_FOLLOWING) {
+			*has_next_segment = GF_TRUE;
+		} else if ((index+1<group->max_cached_segments) && group->cached[index+1].url && group->adaptation_set) {
+			GF_MPD_Representation *rep;
+
+			rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
+			if (rep && (rep->playback.enhancement_rep_index_plus_one == group->cached[index+1].representation_index+1) ) {
 				*has_next_segment = GF_TRUE;
+			}
+		} else if (group->has_pending_enhancement) {
+			*has_next_segment = GF_TRUE;
 		}
 	}
-	if (group->cache_mutex) gf_mx_v(group->cache_mutex);
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
+	if (group->cached[index].flags & SEG_FLAG_DISABLED)
+		return GF_URL_REMOVED;
 	return GF_OK;
 }
 
-GF_EXPORT
-GF_Err gf_dash_group_probe_current_download_segment_location(GF_DashClient *dash, u32 idx, const char **url, s32 *switching_index, const char **switching_url, const char **original_url, Bool *switched)
-{
-	GF_DASH_Group *group;
-
-	if (url) *url = NULL;
-	if (switching_url) *switching_url = NULL;
-	if (original_url) *original_url = NULL;
-	if (switching_index) *switching_index = -1;
-
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
-	group = gf_list_get(dash->groups, idx);
-	if (!group) {
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-		return GF_BAD_PARAM;
-	}
-
-	if (!group->is_downloading) {
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-		return GF_OK;
-	}
-
-	*switched = GF_FALSE;
-	if (group->download_abort_type==2) {
-		group->download_abort_type = 0;
-		*switched = GF_TRUE;
-	}
-
-	//no download yet
-	if ( ! dash->dash_io->get_bytes_done(dash->dash_io, group->segment_download)) {
-		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-		return GF_OK;
-	}
-
-	if (url) *url = dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
-	if (original_url) *original_url = dash->dash_io->get_url(dash->dash_io, group->segment_download);
-
-	if (group->active_rep_index != group->prev_active_rep_index) {
-		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-		if (switching_index)
-			*switching_index = group->active_rep_index;
-		if (switching_url)
-			*switching_url = rep->playback.cached_init_segment_url;
-	}
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
-	return GF_OK;
-}
 
 GF_EXPORT
 void gf_dash_seek(GF_DashClient *dash, Double start_range)
 {
 	Bool is_dynamic = GF_FALSE;
-	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Seek request - playing from %g\n", start_range));
 
 	//are we live ? if so adjust start range
-	if (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
+	if (dash->preroll_state == 1) {
+		dash->initial_period_tunein = GF_TRUE;
+		start_range = 0;
+	}
+	else if (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
 		u64 now, availabilityStartTime;
 		availabilityStartTime = dash->mpd->availabilityStartTime + dash->utc_shift;
 		availabilityStartTime += dash->utc_drift_estimate;
@@ -8421,7 +9115,7 @@
 		start_range = (Double) now;
 		start_range /= 1000;
 
-		is_dynamic = 1;
+		is_dynamic = GF_TRUE;
 		dash->initial_period_tunein = GF_TRUE;
 	}
 
@@ -8430,7 +9124,6 @@
 		/*if no, seek in group*/
 		gf_dash_seek_groups(dash, start_range, is_dynamic);
 	}
-	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 }
 
 GF_EXPORT
@@ -8488,7 +9181,9 @@
 Bool gf_dash_group_loop_detected(GF_DashClient *dash, u32 idx)
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	return (group && group->nb_cached_segments) ? group->cached[0].loop_detected : GF_FALSE;
+	if (!group || !group->nb_cached_segments)
+		return GF_FALSE;
+	return (group->cached[0].flags & SEG_FLAG_LOOP_DETECTED) ? GF_TRUE : GF_FALSE;
 }
 
 GF_EXPORT
@@ -8512,6 +9207,18 @@
 	return dash ? dash->mpd->min_buffer_time : 0;
 }
 
+Bool gf_dash_is_low_latency(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return GF_FALSE;
+	return group->is_low_latency;
+}
+u32 gf_dash_get_max_segment_duration(GF_DashClient *dash)
+{
+	return dash ? dash->mpd->max_segment_duration : 0;
+}
+
+
 #if 0 //unused
 GF_Err gf_dash_resync_to_segment(GF_DashClient *dash, const char *latest_segment_name, const char *earliest_segment_name)
 {
@@ -8530,7 +9237,7 @@
 		for (j=0; j<gf_list_count(group->adaptation_set->representations); j++) {
 			GF_Err e;
 			rep = gf_list_get(group->adaptation_set->representations, j);
-			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE, i, &seg_url, &start_range, &end_range, &current_dur, NULL, NULL, NULL, NULL);
+			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE, i, &seg_url, &start_range, &end_range, &current_dur, NULL, NULL, NULL, NULL, NULL);
 			if (e)
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media template URL: %s\n", gf_error_to_string(e)));
 
@@ -8698,9 +9405,10 @@
 }
 
 GF_EXPORT
-void gf_dash_debug_group(GF_DashClient *dash, s32 group_index)
+void gf_dash_debug_groups(GF_DashClient *dash, const u32 *groups_idx, u32 nb_groups)
 {
-	dash->debug_group_index = group_index;
+	dash->dbg_grps_index = groups_idx;
+	dash->nb_dbg_grps = nb_groups;
 }
 
 GF_EXPORT
@@ -8731,9 +9439,12 @@
 	GF_MPD_Period *period;
 	if (!dash || !dash->mpd) return 0;
 
+	if (dash->preroll_state==1) return 0;
+
 	start = 0;
 	for (i=0; i<=dash->active_period_index; i++) {
 		period = gf_list_get(dash->mpd->periods, i);
+		if (period->is_preroll) continue;
 		if (period->start) start = period->start;
 
 		if (i<dash->active_period_index) start += period->duration;
@@ -8762,7 +9473,7 @@
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index+1);
 
 	if (!period) {
-		//infered from MPD duration
+		//inferred from MPD duration
 		if (dash->mpd->media_presentation_duration) return dash->mpd->media_presentation_duration - start;
 		//duration is not known (live)
 		if (dash->mpd->type==GF_MPD_TYPE_STATIC) {
@@ -8817,11 +9528,118 @@
 	return gf_list_count(group->adaptation_set->content_component);
 }
 
+GF_EXPORT
+char *gf_dash_group_get_template(GF_DashClient *dash, u32 idx, u32 *segment_timeline_timescale, const char **init_url)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	GF_MPD_Representation *rep;
+	const char *tpl;
+	char *solved_template;
+	if (init_url) *init_url = NULL;
+	if (segment_timeline_timescale) *segment_timeline_timescale = 0;
+
+	if (!group) return NULL;
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	if (!rep)
+		rep = gf_list_get(group->adaptation_set->representations, 0);
+
+	tpl = NULL;
+	if (rep && rep->segment_template) tpl = rep->segment_template->media;
+	if (!tpl && group->adaptation_set && group->adaptation_set->segment_template) tpl = group->adaptation_set->segment_template->media;
+	if (!tpl && group->period && group->period->segment_template) tpl = group->period->segment_template->media;
+
+	if (segment_timeline_timescale) {
+		if (rep && rep->segment_template && rep->segment_template->segment_timeline)
+			*segment_timeline_timescale = rep->segment_template->timescale;
+		else if (group->adaptation_set && group->adaptation_set->segment_template && group->adaptation_set->segment_template->segment_timeline)
+			*segment_timeline_timescale = group->adaptation_set->segment_template->timescale;
+		else if (group->period && group->period->segment_template && group->period->segment_template->segment_timeline)
+			*segment_timeline_timescale = group->period->segment_template->timescale;
+	}
+	if (init_url) {
+		const char *init = NULL;
+		if (rep && rep->segment_template && rep->segment_template->initialization) init = rep->segment_template->initialization;
+		else if (group->adaptation_set && group->adaptation_set->segment_template && group->adaptation_set->segment_template->initialization) init = group->adaptation_set->segment_template->initialization;
+		else if (group->period && group->period->segment_template && group->period->segment_template->initialization)
+			init = group->period->segment_template->initialization;
+
+		if (!init) {
+			if (rep && rep->segment_list && rep->segment_list->initialization_segment)
+				init = rep->segment_list->initialization_segment->sourceURL;
+			else if (group->adaptation_set && group->adaptation_set->segment_list && group->adaptation_set->segment_list->initialization_segment)
+				init = group->adaptation_set->segment_list->initialization_segment->sourceURL;
+			else if (group->period && group->period->segment_list && group->period->segment_list->initialization_segment)
+				init = group->period->segment_list->initialization_segment->sourceURL;
+		}
+		if (!init) {
+			if (rep && rep->segment_base) {
+				GF_MPD_BaseURL *base_url = gf_list_get(rep->base_URLs, 0);
+				if (base_url) init = base_url->URL;
+			}
+		}
+		*init_url = init;
+	}
+
+	if (tpl) {
+		u64 range_start, range_end, segment_duration_in_ms;
+		gf_mpd_resolve_url(dash->mpd, rep, group->adaptation_set, group->period, "", 0, GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE_NO_BASE, 0, 0, &solved_template, &range_start, &range_end, &segment_duration_in_ms, NULL, NULL, NULL, NULL);
+		return solved_template;
+	}
+	if (dash->is_m3u8 && rep) {
+		char *ext;
+		u32 i, len, last_num, last_non_num;
+		GF_MPD_SegmentURL *first_seg = gf_list_get(rep->segment_list->segment_URLs, 0);
+		//GF_MPD_SegmentURL *last_seg = gf_list_last(rep->segment_list->segment_URLs);
+		if (!first_seg) return NULL;
+		if (!first_seg->media) return NULL;
+		if (first_seg->media_range) return NULL;
+
+		solved_template = NULL;
+		ext = strrchr(first_seg->media, '.');
+		if (ext) ext[0] = 0;
+		gf_dynstrcat(&solved_template, first_seg->media, NULL);
+		if (ext) ext[0] = '.';
+		len = (u32) strlen(solved_template);
+		last_num = last_non_num = 0;
+		for (i=len; i>0; i--) {
+			if (isdigit(solved_template[i-1])) {
+				if (!last_num) last_num = i-1;
+			} else {
+				if (last_num) {
+					last_non_num = i-1;
+					break;
+				}
+			}
+		}
+		if (!last_non_num || (last_num>=last_non_num+1)) {
+			u32 num;
+			char szVal[100];
+			solved_template[last_num] = 0;
+			num = atoi(solved_template+last_non_num+1);
+			snprintf(szVal, 100, "%u", num);
+			len = (u32) strlen(szVal);
+			if (len < last_num - last_non_num) {
+				u32 pad = last_num - last_non_num - len;
+				snprintf(szVal, 100, "$Number%%0%dd$", pad);
+				gf_dynstrcat(&solved_template, szVal, NULL);
+			} else {
+				gf_dynstrcat(&solved_template, "$Number$", NULL);
+			}
+			gf_dynstrcat(&solved_template, first_seg->media + last_num + 1, NULL);
+			return solved_template;
+		}
+
+	}
+
+	return NULL;
+}
+
 
 GF_EXPORT
 GF_Err gf_dash_group_get_quality_info(GF_DashClient *dash, u32 idx, u32 quality_idx, GF_DASHQualityInfo *quality)
 {
 	GF_MPD_Fractional *sar;
+	u32 timescale = 0;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	GF_MPD_Representation *rep;
 	if (!group || !quality) return GF_BAD_PARAM;
@@ -8850,12 +9668,37 @@
 	quality->ID = rep->id;
 	quality->interlaced = (rep->scan_type == GF_MPD_SCANTYPE_INTERLACED) ? 1 : ( (group->adaptation_set->scan_type == GF_MPD_SCANTYPE_INTERLACED) ? 1 : 0);
 
+	if (group->was_segment_base && rep->segment_list)
+		quality->seg_urls = rep->segment_list->segment_URLs;
+
 	//scalable rep, selected quality is max_complementary_rep_index
 	if (group->base_rep_index_plus_one) {
 		quality->is_selected = (quality_idx==group->max_complementary_rep_index) ? 1 : 0;
 	} else {
 		quality->is_selected = (quality_idx==group->active_rep_index) ? 1 : 0;
 	}
+
+	if (rep->segment_template) {
+		if (!quality->ast_offset) quality->ast_offset = rep->segment_template->availability_time_offset;
+		if (!timescale) timescale = rep->segment_template->timescale;
+		if (!quality->average_duration) quality->average_duration = (Double) rep->segment_template->duration;
+	}
+	if (group->adaptation_set->segment_template) {
+		if (!quality->ast_offset) quality->ast_offset = group->adaptation_set->segment_template->availability_time_offset;
+		if (!timescale) timescale = group->adaptation_set->segment_template->timescale;
+		if (!quality->average_duration) quality->average_duration = (Double) group->adaptation_set->segment_template->duration;
+	}
+	if (group->period->segment_template) {
+		if (!quality->ast_offset) quality->ast_offset = group->period->segment_template->availability_time_offset;
+		if (!timescale) timescale = group->period->segment_template->timescale;
+		if (!quality->average_duration) quality->average_duration = (Double) group->period->segment_template->duration;
+	}
+
+	if (timescale) {
+		quality->average_duration /= timescale;
+	} else {
+		quality->average_duration = 0;
+	}
 	return GF_OK;
 }
 
@@ -8960,17 +9803,6 @@
 	return group->active_rep_index;
 }
 
-
-GF_EXPORT
-u32 gf_dash_group_get_download_rate(GF_DashClient *dash, u32 idx)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group || !group->segment_download) return 0;
-
-	return dash->dash_io->get_bytes_per_sec(dash->dash_io, group->segment_download);
-}
-
-
 GF_EXPORT
 GF_Err gf_dash_set_timeshift(GF_DashClient *dash, u32 ms_in_timeshift)
 {
@@ -8988,7 +9820,7 @@
 GF_EXPORT
 void gf_dash_group_set_codec_stat(GF_DashClient *dash, u32 idx, u32 avg_dec_time, u32 max_dec_time, u32 irap_avg_dec_time, u32 irap_max_dec_time, Bool codec_reset, Bool decode_only_rap)
 {
-	GF_DASH_Group *group = (GF_DASH_Group *)gf_list_get(dash->groups, idx);
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return;
 	group->avg_dec_time = avg_dec_time;
 	group->max_dec_time = max_dec_time;
@@ -9001,7 +9833,7 @@
 GF_EXPORT
 void gf_dash_group_set_buffer_levels(GF_DashClient *dash, u32 idx, u32 buffer_min_ms, u32 buffer_max_ms, u32 buffer_occupancy_ms)
 {
-	GF_DASH_Group *group = (GF_DASH_Group *)gf_list_get(dash->groups, idx);
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return;
 	group->buffer_min_ms = buffer_min_ms;
 	group->buffer_max_ms = buffer_max_ms;
@@ -9050,12 +9882,25 @@
 	dash->tile_adapt_mode = mode;
 	dash->tile_rate_decrease = (tile_rate_decrease<100) ? tile_rate_decrease : 100;
 	for (i=0; i<gf_list_count(dash->groups); i++) {
-		GF_DASH_Group *group = (GF_DASH_Group *)gf_list_get(dash->groups, i);
-		if (group->srd_desc) gf_dash_set_tiles_quality(dash, group->srd_desc);
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		if (group->srd_desc) gf_dash_set_tiles_quality(dash, group->srd_desc, GF_TRUE);
 	}
 }
 
 GF_EXPORT
+void gf_dash_disable_low_quality_tiles(GF_DashClient *dash, Bool disable_tiles)
+{
+	dash->disable_low_quality_tiles = disable_tiles;
+}
+
+GF_EXPORT
+void gf_dash_set_chaining_mode(GF_DashClient *dash, u32 chaining_mode)
+{
+	dash->chaining_mode = chaining_mode;
+}
+
+
+GF_EXPORT
 Bool gf_dash_group_get_srd_info(GF_DashClient *dash, u32 idx, u32 *srd_id, u32 *srd_x, u32 *srd_y, u32 *srd_w, u32 *srd_h, u32 *srd_width, u32 *srd_height)
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
@@ -9083,9 +9928,9 @@
 }
 
 GF_EXPORT
-void gf_dash_set_atsc_ast_shift(GF_DashClient *dash, u32 ast_shift)
+void gf_dash_set_route_ast_shift(GF_DashClient *dash, u32 ast_shift)
 {
-	dash->atsc_ast_shift = ast_shift;
+	dash->route_ast_shift = ast_shift;
 }
 
 GF_EXPORT
@@ -9120,9 +9965,10 @@
 		group->quality_degradation_hint = 0;
 	}
 
+	//for both regular or tiled, store visible width/height
+	group->hint_visible_width = max_x - min_x;
+	group->hint_visible_height = max_y - min_y;
 
-	//TODO - single video, we may want to switch down quality if not a lot of the video is visible
-	//we will need the zoom factor as well
 	if (!group->groups_depending_on) return GF_OK;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Group Visible rect %d,%d,%d,%d \n", min_x, max_x, min_y, max_y));
@@ -9130,8 +9976,10 @@
 	for (i=0; i<count; i++) {
 		Bool is_visible = GF_TRUE;
 		GF_DASH_Group *a_group = gf_list_get(group->groups_depending_on, i);
+		u32 old_hint;
 		if (!a_group->srd_w || !a_group->srd_h) continue;
 
+		old_hint = a_group->quality_degradation_hint;
 		if (is_gaze) {
 
 			if (min_x < a_group->srd_x)
@@ -9157,22 +10005,26 @@
 			else if (a_group->srd_y+a_group->srd_h < min_y) is_visible = GF_FALSE;
 
 		}
-
 		a_group->quality_degradation_hint = is_visible ? 0 : 100;
+		if (old_hint != a_group->quality_degradation_hint) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Group SRD %d,%d,%d,%d is %s\n", a_group->srd_x, a_group->srd_w, a_group->srd_y, a_group->srd_h, is_visible ? "visible" : "hidden"));
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Group SRD %d,%d,%d,%d is %s\n", a_group->srd_x, a_group->srd_w, a_group->srd_y, a_group->srd_h, is_visible ? "visible" : "hidden"));
+			//remember to update tile quality for non-custom algo
+			a_group->update_tile_qualities = GF_TRUE;
+			group->update_tile_qualities = GF_TRUE;
+		}
 	}
 	return GF_OK;
 }
 
-void gf_dash_set_group_download_state(GF_DashClient *dash, u32 idx, GF_Err err)
+void gf_dash_set_group_download_state(GF_DashClient *dash, u32 idx, u32 cur_dep_idx, GF_Err err)
 {
 	GF_MPD_Representation *rep;
 	Bool has_dep_following;
+	u32 resume_from_dep_group, i;
 	char *key_url, *url;
 	GF_DASH_Group *base_group;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (dash->thread_mode) return;
 	if (!group) return;
 
 	//we forced early fetch because demux was empty, consider all errors as 404
@@ -9186,38 +10038,85 @@
 	}
 	if (!group->nb_cached_segments) return;
 	rep = gf_list_get(group->adaptation_set->representations, group->cached[0].representation_index);
-	//FILTER_FIXME: find base group and current cache idx for scalability
-	has_dep_following = group->cached[0].has_dep_following;
+
+	while (group->cached[0].representation_index < cur_dep_idx) {
+		gf_free(group->cached[0].key_url);
+		gf_free(group->cached[0].url);
+		group->nb_cached_segments--;
+		memmove(&group->cached[0], &group->cached[1], sizeof(segment_cache_entry) * group->nb_cached_segments);
+		if (!group->nb_cached_segments)
+			break;
+	}
+	has_dep_following = (group->cached[0].flags & SEG_FLAG_DEP_FOLLOWING) ? GF_TRUE : GF_FALSE;
+
+	//detach URL and key URL, they will be freed in on_group_download_error below
 	key_url = group->cached[0].key_url;
 	url = group->cached[0].url;
-	gf_free(group->cached[0].cache);
-	group->nb_cached_segments--;
-	assert(!group->nb_cached_segments);
+	group->cached[0].url = NULL;
+	group->cached[0].key_url = NULL;
+	//remember for which dependent group we failed
+	resume_from_dep_group = group->cached[0].dep_group_idx;
 
 	base_group = group;
 	while (base_group->depend_on_group) {
 		base_group = base_group->depend_on_group;
 	}
-	on_group_download_error(dash, group, base_group, err, rep, url, key_url, has_dep_following);
 
+	//rewind segment index for all following dep groups
+	for (i=1; i < group->nb_cached_segments; i++) {
+		if (!group->cached[i].dep_group_idx) break;
+		GF_DASH_Group *dep_grp = gf_list_get(base_group->groups_depending_on, group->cached[i].dep_group_idx - 1);
+		if (!dep_grp) break;
 
-	if (dash->speed>=0) {
-		group->download_segment_index--;
-	} else {
-		group->download_segment_index++;
+		if (dash->speed>=0) {
+			dep_grp->download_segment_index--;
+		} else {
+			dep_grp->download_segment_index++;
+		}
+	}
+
+	//reset cache but do not reset timeline nor LLHLS live chunk
+	while (group->nb_cached_segments) {
+		group->nb_cached_segments--;
+		gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
+	}
+
+	//restore current dependent group - if the error triggers moving to next segment, this will be reseted
+	if (group->groups_depending_on) {
+		group->current_dep_idx = resume_from_dep_group;
+	}
+
+	on_group_download_error(dash, group, base_group, err, rep, url, key_url, has_dep_following);
+
+	//error (segment skipped), we assume time alignment of dependent groups
+	if (group->groups_depending_on && !group->current_dep_idx) {
+		for (i=0; i<gf_list_count(group->groups_depending_on); i++) {
+			GF_DASH_Group *dep_grp = gf_list_get(base_group->groups_depending_on, i);
+			dep_grp->download_segment_index = group->download_segment_index;
+		}
 	}
 }
 
-void gf_dash_group_store_stats(GF_DashClient *dash, u32 idx, u32 bytes_per_sec, u32 file_size, u32 bytes_done, Bool is_broadcast)
+void gf_dash_group_store_stats(GF_DashClient *dash, u32 idx, u32 dep_rep_idx, u32 bytes_per_sec, u64 file_size, Bool is_broadcast, u64 us_since_start)
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (dash->thread_mode) return;
 	if (!group) return;
 	if (!group->nb_cached_segments) return;
 
-	dash_store_stats(dash, group, bytes_per_sec, file_size, is_broadcast);
+	if (group->groups_depending_on) {
+		Bool is_last = (dep_rep_idx == gf_list_count(group->groups_depending_on)) ? GF_TRUE : GF_FALSE;
+		if (dep_rep_idx) {
+			group = gf_list_get(group->groups_depending_on, dep_rep_idx-1);
+			if (!group)
+				return;
+		}
+		dash_store_stats(dash, group, bytes_per_sec, (u32) file_size, is_broadcast, dep_rep_idx, us_since_start);
+
+		if (is_last)
+			dash_global_rate_adaptation(dash, GF_FALSE);
+	} else {
+		dash_store_stats(dash, group, bytes_per_sec, (u32) file_size, is_broadcast, dep_rep_idx, us_since_start);
 
-	if (file_size==bytes_done) {
 		dash_global_rate_adaptation(dash, GF_FALSE);
 	}
 }
@@ -9225,8 +10124,8 @@
 u32 gf_dash_get_min_wait_ms(GF_DashClient *dash)
 {
 	if (dash && dash->min_wait_ms_before_next_request) {
-		u32 ellapsed = gf_sys_clock() - dash->min_wait_sys_clock;
-		if (ellapsed < dash->min_wait_ms_before_next_request) dash->min_wait_ms_before_next_request -= ellapsed;
+		u32 elapsed = gf_sys_clock() - dash->min_wait_sys_clock;
+		if (elapsed < dash->min_wait_ms_before_next_request) dash->min_wait_ms_before_next_request -= elapsed;
 		else dash->min_wait_ms_before_next_request = 0;
 		return dash->min_wait_ms_before_next_request;
 	}
@@ -9253,7 +10152,7 @@
 }
 
 GF_EXPORT
-u32 gf_dash_group_get_as_id(GF_DashClient *dash, u32 group_idx)
+s32 gf_dash_group_get_as_id(GF_DashClient *dash, u32 group_idx)
 {
 	GF_DASH_Group *group;
 	if (!dash) return 0;
@@ -9262,5 +10161,77 @@
 	return group->adaptation_set->id;
 }
 
+
+GF_Err gf_dash_group_push_tfrf(GF_DashClient *dash, u32 group_idx, void *_tfrf, u32 timescale)
+{
+	GF_MSSTimeRefBox *tfrf = (GF_MSSTimeRefBox *)_tfrf;
+	u32 i;
+	GF_MPD_SegmentTemplate *stpl;
+	GF_DASH_Group *group;
+	if (!dash) return GF_BAD_PARAM;
+	if (!dash->is_smooth) return GF_OK;
+	if (dash->mpd->type != GF_MPD_TYPE_DYNAMIC) return GF_OK;
+
+	group = gf_list_get(dash->groups, group_idx);
+	if (!group) return GF_BAD_PARAM;
+	if (!group->adaptation_set || !group->adaptation_set->segment_template || !group->adaptation_set->segment_template->segment_timeline)
+		return GF_BAD_PARAM;
+
+	stpl = group->adaptation_set->segment_template;
+
+	for (i=0; i<tfrf->frags_count; i++) {
+		u32 k, nb_segs;
+		Bool exists = GF_FALSE;
+		GF_MPD_SegmentTimelineEntry *se = NULL;
+		u64 start = 0;
+		u64 frag_time = tfrf->frags[i].absolute_time_in_track_timescale;
+		u64 frag_dur = tfrf->frags[i].fragment_duration_in_track_timescale;
+		if (timescale != stpl->timescale) {
+			frag_time *= stpl->timescale;
+			frag_time /= timescale;
+			frag_dur *= stpl->timescale;
+			frag_dur /= timescale;
+		}
+		nb_segs = gf_list_count(stpl->segment_timeline->entries);
+		for (k=0; k<nb_segs; k++) {
+			u64 se_dur;
+			se = gf_list_get(stpl->segment_timeline->entries, k);
+			if (se->start_time)
+				start = se->start_time;
+			se_dur = se->duration * (1+se->repeat_count);
+			if (start + se_dur <= frag_time) {
+				start += se_dur;
+				continue;
+			}
+			exists = GF_TRUE;
+			break;
+		}
+		if (!exists) {
+			if (se && se->duration==frag_dur) {
+				se->repeat_count++;
+			} else {
+				GF_SAFEALLOC(se, GF_MPD_SegmentTimelineEntry);
+				if (frag_time != start)
+					se->start_time = frag_time;
+				se->duration = (u32) frag_dur;
+				gf_list_add(stpl->segment_timeline->entries, se);
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Smooth push new fragment start "LLU" dur "LLU" (inserted at start_time "LLU")\n", frag_time, frag_dur, start));
+			group->nb_segments_in_rep++;
+		}
+	}
+	return GF_OK;
+}
+
+Bool gf_dash_group_has_init_segment(GF_DashClient *dash, u32 group_idx)
+{
+	GF_DASH_Group *group;
+	if (!dash) return GF_FALSE;
+	group = gf_list_get(dash->groups, group_idx);
+	if (!group) return GF_FALSE;
+	if (group->no_init_seg) return GF_FALSE;
+	return GF_TRUE;
+}
+
 #endif //GPAC_DISABLE_DASH_CLIENT

gpac-1.0.1.tar.gz/src/media_tools/dash_segmenter.c -> gpac-2.0.0.tar.gz/src/media_tools/dash_segmenter.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre , Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / Media Tools sub-project
@@ -61,7 +61,6 @@
 	Bool daisy_chain_sidx, use_ssix;
 
 	Bool fragments_start_with_rap;
-	char *tmpdir;
 	Double mpd_update_time;
 	s32 time_shift_depth;
 	u32 min_buffer_time;
@@ -104,6 +103,7 @@
 	Bool enable_mix_codecs;
 	Bool enable_sar_mix;
 	Bool check_duration;
+	Bool merge_last_seg;
 
 	const char *dash_state;
 
@@ -114,6 +114,7 @@
 	u32 print_stats_graph;
 	s32 dash_filter_idx_plus_one;
 	u32 last_prog;
+	Bool keep_utc;
 };
 
 
@@ -140,7 +141,6 @@
 	dasher->mpd_name = gf_strdup(mpdName);
 
 	dasher->dash_scale = dash_timescale ? dash_timescale : 1000;
-	if (tmp_dir) dasher->tmpdir = gf_strdup(tmp_dir);
 	dasher->profile = dash_profile;
 	dasher->dash_state = dasher_context_file;
 	dasher->inputs = gf_list_new();
@@ -160,6 +160,7 @@
 {
 	gf_list_reset(dasher->inputs);
 	if (dasher->fsess) {
+		gf_fs_print_unused_args(dasher->fsess, "smode");
 		gf_fs_del(dasher->fsess);
 		dasher->fsess = NULL;
 	}
@@ -170,7 +171,6 @@
 {
 	if (dasher->seg_rad_name) gf_free(dasher->seg_rad_name);
 	gf_dasher_clean_inputs(dasher);
-	gf_free(dasher->tmpdir);
 	gf_free(dasher->mpd_name);
 	if (dasher->title) gf_free(dasher->title);
 	if (dasher->moreInfoURL) gf_free(dasher->moreInfoURL);
@@ -273,9 +273,9 @@
 GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Double default_fragment_duration, Double sub_duration)
 {
 	if (!dasher) return GF_BAD_PARAM;
-	dasher->segment_duration = default_segment_duration * 1000 / dasher->dash_scale;
+	dasher->segment_duration = default_segment_duration;
 	if (default_fragment_duration)
-		dasher->fragment_duration = default_fragment_duration * 1000 / dasher->dash_scale;
+		dasher->fragment_duration = default_fragment_duration;
 	else
 		dasher->fragment_duration = dasher->segment_duration;
 	dasher->sub_duration = sub_duration;
@@ -308,6 +308,14 @@
 
 }
 
+GF_EXPORT
+GF_Err gf_dasher_keep_source_utc(GF_DASHSegmenter *dasher, Bool keep_utc)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->keep_utc = keep_utc;
+	return GF_OK;
+
+}
 
 GF_EXPORT
 GF_Err gf_dasher_enable_sidx(GF_DASHSegmenter *dasher, Bool enable_sidx, u32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool use_ssix)
@@ -446,6 +454,14 @@
 }
 
 GF_EXPORT
+GF_Err gf_dasher_set_last_segment_merge(GF_DASHSegmenter *dasher, Bool merge_last_seg)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->merge_last_seg = merge_last_seg;
+	return GF_OK;
+}
+
+GF_EXPORT
 GF_Err gf_dasher_set_cues(GF_DASHSegmenter *dasher, const char *cues_file, Bool strict_cues)
 {
 	dasher->cues_file = cues_file;
@@ -469,6 +485,8 @@
 	return GF_OK;
 }
 
+extern char gf_prog_lf;
+
 static Bool on_dasher_event(void *_udta, GF_Event *evt)
 {
 	u32 i, count;
@@ -495,9 +513,9 @@
 	dasher->last_prog = stats.percent / 100;
 
 	if ( stats.status) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Dashing %s\r", stats.status));
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Dashing %s%c", stats.status, gf_prog_lf));
 	} else if (stats.percent>0) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Dashing: % 2.2f %%\r", ((Double)stats.percent) / 100));
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Dashing: % 2.2f %%%c", ((Double)stats.percent) / 100, gf_prog_lf));
 	}
 	return GF_FALSE;
 }
@@ -510,6 +528,7 @@
 	char *sep_ext;
 	char *args=NULL, szArg[1024];
 	Bool multi_period = GF_FALSE;
+	Bool use_filter_chains = GF_FALSE;
 
 	if (!dasher->mpd_name) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Missing MPD name\n"));
@@ -530,7 +549,7 @@
 		return GF_OUT_OF_MEM;
 	}
 
-	sep_ext = gf_url_colon_suffix(dasher->mpd_name);
+	sep_ext = gf_url_colon_suffix(dasher->mpd_name, '=');
 	if (sep_ext) {
 		if (sep_ext[1] == '\\') sep_ext = strchr(sep_ext+1, ':');
 		else if (sep_ext[1]=='/') {
@@ -542,7 +561,11 @@
 		sep_ext[0] = 0;
 	}
 
-	sprintf(szArg, "segdur=%g", dasher->segment_duration);
+	if (dasher->segment_duration == (u32) dasher->segment_duration) {
+		sprintf(szArg, "segdur=%u/%u", (u32) dasher->segment_duration, dasher->dash_scale);
+	} else {
+		sprintf(szArg, "segdur=%g", dasher->segment_duration/dasher->dash_scale);
+	}
 	e = gf_dynstrcat(&args, szArg, ":");
 
 	if (sep_ext)
@@ -571,6 +594,9 @@
 	case GF_DASH_BSMODE_INBAND:
 		e |= gf_dynstrcat(&args, "bs_switch=inband", ":");
 		break;
+	case GF_DASH_BSMODE_INBAND_PPS:
+		e |= gf_dynstrcat(&args, "bs_switch=pps", ":");
+		break;
 	case GF_DASH_BSMODE_MERGED:
 		e |= gf_dynstrcat(&args, "bs_switch=on", ":");
 		break;
@@ -581,7 +607,7 @@
 		e |= gf_dynstrcat(&args, "bs_switch=force", ":");
 		break;
 	}
-	//avcp, hvcp, aacp not mapped
+
 	if (dasher->seg_rad_name) {
 		sprintf(szArg, "template=%s", dasher->seg_rad_name);
 		e |= gf_dynstrcat(&args, szArg, ":");
@@ -623,6 +649,9 @@
 	case GF_DASH_PROFILE_AVC264_ONDEMAND:
 		e |= gf_dynstrcat(&args, "profile=dashavc264.onDemand", ":");
 		break;
+	case GF_DASH_PROFILE_DASHIF_LL:
+		e |= gf_dynstrcat(&args, "profile=dashif.ll", ":");
+		break;
 	}
 	if (dasher->cp_location_mode==GF_DASH_CPMODE_REPRESENTATION) e |= gf_dynstrcat(&args, "cp=rep", ":");
 	else if (dasher->cp_location_mode==GF_DASH_CPMODE_BOTH) e |= gf_dynstrcat(&args, "cp=both", ":");
@@ -661,7 +690,8 @@
 		}
 	}
 	if (dasher->sub_duration) {
-		sprintf(szArg, "subdur=%g", dasher->sub_duration);
+		//subdur is in seconds in dasher filter
+		sprintf(szArg, "subdur=%g", dasher->sub_duration/dasher->dash_scale);
 		e |= gf_dynstrcat(&args, szArg, ":");
 	}
 	if (dasher->dash_state) {
@@ -686,7 +716,11 @@
 		diff -= dasher->segment_duration;
 		if (diff<0) diff = -diff;
 		if (diff > 0.01) {
-			sprintf(szArg, "cdur=%g", dasher->fragment_duration);
+			if (dasher->fragment_duration == (u32) dasher->fragment_duration) {
+				sprintf(szArg, "cdur=%u/%u", (u32) dasher->fragment_duration, dasher->dash_scale);
+			} else {
+				sprintf(szArg, "cdur=%g", dasher->fragment_duration/dasher->dash_scale);
+			}
 			e |= gf_dynstrcat(&args, szArg, ":");
 		}
 	}
@@ -733,10 +767,6 @@
 	}
 
 	if (dasher->fragments_start_with_rap) e |= gf_dynstrcat(&args, "sfrag", ":");
-	if (dasher->tmpdir) {
-		sprintf(szArg, "tmpd=%s", dasher->tmpdir );
-		e |= gf_dynstrcat(&args, szArg, ":");
-	}
 
 	if (dasher->cues_file) {
 		sprintf(szArg, "cues=%s", dasher->cues_file );
@@ -753,6 +783,12 @@
 	else if (dasher->split_mode==GF_DASH_SPLIT_IN)
 		e |= gf_dynstrcat(&args, "sbound=in", ":");
 
+	if (dasher->merge_last_seg)
+		e |= gf_dynstrcat(&args, "last_seg_merge", ":");
+
+	if (dasher->keep_utc)
+		e |= gf_dynstrcat(&args, "keep_utc", ":");
+
 	//finally append profiles/info/etc with double separators as these may contain ':'
 	if (dasher->dash_profile_extension) {
 		sprintf(szArg, "profX=%s", dasher->dash_profile_extension);
@@ -813,7 +849,7 @@
 
 	for (i=0; i<count; i++) {
 		GF_DashSegmenterInput *di = gf_list_get(dasher->inputs, i);
-		if (di->periodID || di->period_duration || di->xlink) {
+		if (di->periodID || (di->period_duration.num && di->period_duration.den) || di->xlink) {
 			multi_period = GF_TRUE;
 		}
 		di->period_order=0;
@@ -842,27 +878,34 @@
 			cur_period_order++;
 		}
 	}
+	for (i=0; i<count; i++) {
+		GF_DashSegmenterInput *di = gf_list_get(dasher->inputs, i);
+		if (di->filter_chain) {
+			use_filter_chains = GF_TRUE;
+			break;
+		}
+	}
 
 	for (i=0; i<count; i++) {
 		u32 j;
 		GF_Filter *src = NULL;
 		GF_Filter *rt = NULL;
-		const char *url = "null";
+		const char *url = NULL;
 		char *frag=NULL;
 		GF_DashSegmenterInput *di = gf_list_get(dasher->inputs, i);
 
 		if (dasher->real_time) {
 			rt = gf_fs_load_filter(dasher->fsess, "reframer:rt=sync", NULL);
 		}
-		if (di->file_name && strlen(di->file_name)) url = di->file_name;
-		if (!stricmp(url, "null")) url = NULL;
+		if (di->file_name && strlen(di->file_name) && stricmp(di->file_name, "null") )
+			url = di->file_name;
+
 		if (url) {
 			frag = strrchr(di->file_name, '#');
 			if (frag) frag[0] = 0;
 		}
 
 		args = NULL;
-
 		//if source is isobmf using extractors, we want to keep the extractors
 		e = gf_dynstrcat(&args, "smode=splitx", ":");
 
@@ -883,7 +926,7 @@
 		}
 
 		//set all args
-		if (di->representationID && strcmp(di->representationID, "NULL")) {
+		if (!use_filter_chains && di->representationID && strcmp(di->representationID, "NULL")) {
 			sprintf(szArg, "#Representation=%s", di->representationID );
 			e |= gf_dynstrcat(&args, szArg, ":");
 		}
@@ -900,22 +943,24 @@
 			sprintf(szArg, "#PStart=-%d", di->period_order);
 			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-		if (di->period_duration) {
-			if (!url) {
-				sprintf(szArg, "#PDur=%g", di->period_duration );
-				e |= gf_dynstrcat(&args, szArg, ":");
-			} else {
-				sprintf(szArg, "#DashDur=%g", di->period_duration );
-				e |= gf_dynstrcat(&args, szArg, ":");
-			}
+
+		if (di->period_duration.num && di->period_duration.den) {
+			if (di->period_duration.den==1)
+				sprintf(szArg, "#PDur=%d", di->period_duration.num );
+			else
+				sprintf(szArg, "#PDur=%d/%u", di->period_duration.num, di->period_duration.den );
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
 
-		if (di->dash_duration) {
-			sprintf(szArg, "#DashDur=%g", di->period_duration );
+		if (di->dash_duration.num && di->dash_duration.den) {
+			if (di->dash_duration.den==1)
+				sprintf(szArg, "#DashDur=%d", di->dash_duration.num );
+			else
+				sprintf(szArg, "#DashDur=%d/%u", di->dash_duration.num, di->dash_duration.den);
 			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-		if (url && di->media_duration) {
-			sprintf(szArg, "#CDur=%g", di->media_duration );
+		if (url && di->media_duration.num && di->media_duration.den) {
+			sprintf(szArg, "#ClampDur="LLU"/"LLD"", di->media_duration.num, di->media_duration.den );
 			e |= gf_dynstrcat(&args, szArg, ":");
 		}
 
@@ -998,7 +1043,6 @@
 
 		if (di->sscale) e |= gf_dynstrcat(&args, "#SingleScale=true", ":");
 
-
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to setup source arguments for %s\n", di->file_name));
 			if (frag) frag[0] = '#';
@@ -1022,17 +1066,35 @@
 			src = rt;
 		}
 
-		if (!di->filter_chain) continue;
-
+		if (!di->filter_chain) {
+			//assign this source 
+			gf_filter_set_source(dasher->output, src, NULL);
+			continue;
+		}
 		//create the filter chain between source (or rt if it was set) and dasher
 
 		//filter chain
 		GF_Filter *prev_filter=src;
 		char *fargs = (char *) di->filter_chain;
+		char *sep1 = strstr(fargs, "@@");
+		char *sep2 = strstr(fargs, "@");
+		Bool old_syntax = GF_FALSE;
+		if (sep1 && sep2 && (sep1==sep2))
+			old_syntax = GF_TRUE;
+
 		while (fargs) {
 			GF_Filter *f;
-			char *sep = strstr(fargs, "@@");
+			char *sep;
+			Bool end_of_sub_chain = GF_FALSE;
+			if (old_syntax) {
+				sep = strstr(fargs, "@@");
+			} else {
+				sep = strstr(fargs, "@");
+				if (sep && (sep[1] == '@'))
+					end_of_sub_chain = GF_TRUE;
+			}
 			if (sep) sep[0] = 0;
+
 			f = gf_fs_load_filter(dasher->fsess, fargs, &e);
 			if (!f) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to load filter %s: %s\n", fargs, gf_error_to_string(e) ));
@@ -1044,7 +1106,15 @@
 			prev_filter = f;
 			if (!sep) break;
 			sep[0] = '@';
-			fargs = sep+2;
+			if (old_syntax || end_of_sub_chain) {
+				fargs = sep+2;
+				if (end_of_sub_chain && prev_filter) {
+					gf_filter_set_source(dasher->output, prev_filter, NULL);
+					prev_filter = src;
+				}
+			} else {
+				fargs = sep+1;
+			}
 		}
 		if (prev_filter) {
 			gf_filter_set_source(dasher->output, prev_filter, NULL);
@@ -1056,6 +1126,7 @@
 
 GF_Err dash_state_check_timing(const char *dash_state, u64 *next_gen_ntp_ms, u32 *next_time_ms)
 {
+#ifndef GPAC_DISABLE_CORE_TOOLS
 	u64 next_gen_ntp = 0;
 	GF_Err e = GF_OK;
 	GF_DOMParser *mpd_parser;
@@ -1093,6 +1164,9 @@
 		}
 	}
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
 }
 
 GF_EXPORT
@@ -1135,6 +1209,7 @@
 	e = gf_fs_run(dasher->fsess);
 	if (e>0) e = GF_OK;
 
+	gf_fs_print_non_connected(dasher->fsess);
 	if (dasher->print_stats_graph & 1) gf_fs_print_stats(dasher->fsess);
 	if (dasher->print_stats_graph & 2) gf_fs_print_connections(dasher->fsess);
 
@@ -1146,6 +1221,7 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
 
 	if (dasher->no_cache) {
+		if (!e) gf_fs_print_unused_args(dasher->fsess, "smode");
 		gf_fs_del(dasher->fsess);
 		dasher->fsess = NULL;
 	}

gpac-1.0.1.tar.gz/src/media_tools/dvb_mpe.c -> gpac-2.0.0.tar.gz/src/media_tools/dvb_mpe.c Changed

@@ -162,7 +162,7 @@
 	if (ts->direct_mpe) {
 		if (table_id != GF_M2TS_TABLE_ID_DSM_CC_PRIVATE) return;
 		if (section_number != last_section_number) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("MPE IP datagram on several section not supported\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MPE IP datagram on several section not supported\n"));
 			return;
 		}
 		/* send the IP data :
@@ -328,7 +328,7 @@
 			/* compare the destination ip address and the ESG Bootstrap address */
 			Boostrap_ip = gf_m2ts_compare_ip(ip_packet->u8_rx_adr,ip_address_bootstrap);
 			if(Boostrap_ip) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("ESG Bootstrap found !\n"));
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("ESG Bootstrap found !\n"));
 			}
 		} else {
 			offset += (ip_packet->u32_total_length);
@@ -442,7 +442,7 @@
 	/*ip_packet->data = gf_malloc((ip_packet->u32_total_length-ip_packet->u32_hdr_length)*sizeof(char));
 	memcpy(ip_packet->data,datagram+offset+20,(ip_packet->u32_total_length-ip_packet->u32_hdr_length)*sizeof(char));*/
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("TX addr: %d.%d.%d.%d RX addr : %d.%d.%d.%d port:%d(0x%x) \n",ip_packet->u8_tx_adr[0],ip_packet->u8_tx_adr[1],ip_packet->u8_tx_adr[2],ip_packet->u8_tx_adr[3],ip_packet->u8_rx_adr[0],ip_packet->u8_rx_adr[1],ip_packet->u8_rx_adr[2],ip_packet->u8_rx_adr[3],ip_packet->u32_rx_udp_port,ip_packet->u32_rx_udp_port));
+	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("TX addr: %d.%d.%d.%d RX addr : %d.%d.%d.%d port:%d(0x%x) \n",ip_packet->u8_tx_adr[0],ip_packet->u8_tx_adr[1],ip_packet->u8_tx_adr[2],ip_packet->u8_tx_adr[3],ip_packet->u8_rx_adr[0],ip_packet->u8_rx_adr[1],ip_packet->u8_rx_adr[2],ip_packet->u8_rx_adr[3],ip_packet->u32_rx_udp_port,ip_packet->u32_rx_udp_port));
 
 	return 1;
 
@@ -706,7 +706,7 @@
 }
 
 
-/*generate RS code and fullfill the RS table of MPE_FEC_FRAME*/
+/*generate RS code and fill the RS table of MPE_FEC_FRAME*/
 void encode_fec(MPE_FEC_FRAME * mff)
 {
 #if 0
@@ -722,8 +722,8 @@
 		/* ************** */
 		/* Encode data into codeword, adding NPAR parity bytes */
 		encode_data(adt_rs_en_buffer, cols, adt_rs_en_buffer);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("Encoded data is : \"%s\"\n", adt_rs_en_buffer));
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("data with error is: \"%s\"\n", adt_rs_en_buffer));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Encoded data is : \"%s\"\n", adt_rs_en_buffer));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("data with error is: \"%s\"\n", adt_rs_en_buffer));
 		/*set a row of RS into RS table*/
 		setRowRS ( mff, i , (unsigned char *)(adt_rs_en_buffer + cols) );
 	}
@@ -763,7 +763,7 @@
 			/* TODO: set the erasures and errors based on the MFF */
 			if(correct_errors_erasures (linebuffer, ML, nerasures, erasures) == 0)
 			{
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("Correction Error line %d \n", i));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Correction Error line %d \n", i));
 			}
 
 			/* TODO: replace the current line in MFF */
@@ -884,13 +884,13 @@
 	if (!ts->ip_platform) return;
 
 	/* provider and ip platform name */
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" IP Platform : %s provided by %s \n",ip_platform->name,ip_platform->provider_name));
+	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" IP Platform : %s provided by %s \n",ip_platform->name,ip_platform->provider_name));
 
 	assert(ip_platform->ip_streams);
 	i_streams = gf_list_count(ip_platform->ip_streams);
 	for(i=0; i<i_streams; i++) {
 		GF_M2TS_IP_Stream *ip_stream_buff = gf_list_get(ip_platform->ip_streams, i);
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("PID:%d - Target IP adress: \n", ip_stream_buff->PID));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("PID:%d - Target IP address: \n", ip_stream_buff->PID));
 		/*Print the target IP address */
 		u32 i_targets = gf_list_count(ip_stream_buff->targets);
 		for(j=0; j<i_targets; j++)
@@ -900,75 +900,75 @@
 			l=0;
 
 			ip_address = ip_targets->address;
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("%d.%d.%d.%d/%d ",ip_address[0],ip_address[1],ip_address[2],ip_address[3],ip_targets->slash_mask));
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" RX port :"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("%d.%d.%d.%d/%d ",ip_address[0],ip_address[1],ip_address[2],ip_address[3],ip_targets->slash_mask));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" RX port :"));
 			while(ip_targets->rx_port[l] != 0)
 			{
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" %d ",ip_targets->rx_port[l]));
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" %d ",ip_targets->rx_port[l]));
 				l++;
 			}
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("\n"));
 		}
 
 		/*Print the time slice fec descriptor */
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Time Slice Fec Descriptor : \n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Time Slice Fec Descriptor : \n"));
 
 		if(ip_stream_buff->time_slice_fec.time_slicing==0)
 		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" No Time Slicing \n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" No Time Slicing \n"));
 		} else
 		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Time Slicing\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Time Slicing\n"));
 		}
 
 		if(ip_stream_buff->time_slice_fec.mpe_fec==0)
 		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" No MPE FEC used \n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" No MPE FEC used \n"));
 		} else
 		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" MPE FEC used \n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" MPE FEC used \n"));
 		}
 
 		switch(ip_stream_buff->time_slice_fec.frame_size)
 		{
 		case 0:
 		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Frame size : 256 rows \n"));
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Max Burst Duration 512 kbits\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Frame size : 256 rows \n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Max Burst Duration 512 kbits\n"));
 		}
 		break;
 		case 1:
 		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Frame size : 512 rows \n"));
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Max Burst Duration 1024 kbits\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Frame size : 512 rows \n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Max Burst Duration 1024 kbits\n"));
 		}
 		break;
 		case 2:
 		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Frame size : 768 rows \n"));
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Max Burst Duration 1536 kbits\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Frame size : 768 rows \n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Max Burst Duration 1536 kbits\n"));
 		}
 		break;
 		case 3:
 		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Frame size : 1024 rows \n"));
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Max Burst Duration 2048 kbits\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Frame size : 1024 rows \n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Max Burst Duration 2048 kbits\n"));
 		}
 		break;
 		default:
 			break;
 		}
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Time Slice Fec ID : %x\n",ip_stream_buff->time_slice_fec.time_slice_fec_id));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" Time Slice Fec ID : %x\n",ip_stream_buff->time_slice_fec.time_slice_fec_id));
 
 		/* Locayion descriptor */
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Location Descriptor \n"));
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Network ID:%d \n",ip_stream_buff->location.network_id));
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Original Network ID:%d \n",ip_stream_buff->location.original_network_id));
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Transport Stream ID:%d \n",ip_stream_buff->location.transport_stream_id));
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Service ID:%d \n",ip_stream_buff->location.service_id));
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Component Tag:%d \n",ip_stream_buff->location.component_tag));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Location Descriptor \n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Network ID:%d \n",ip_stream_buff->location.network_id));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Original Network ID:%d \n",ip_stream_buff->location.original_network_id));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Transport Stream ID:%d \n",ip_stream_buff->location.transport_stream_id));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Service ID:%d \n",ip_stream_buff->location.service_id));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Component Tag:%d \n",ip_stream_buff->location.component_tag));
 	}
 }
 
@@ -1023,7 +1023,7 @@
 		}
 
 		if (e != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Server Bind Error: %s\n", gf_error_to_string(e)));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Server Bind Error: %s\n", gf_error_to_string(e)));
 			Sock_Struct->bind_failure = 1;
 		}
 		gf_list_add(ts->ip_platform->socket_struct, Sock_Struct);
@@ -1035,7 +1035,7 @@
 
 	e = gf_sk_send(Sock_Struct->sock, ip_packet->data, ip_packet->u32_udp_data_size - 8);
 	if (e != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Error sending to \n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error sending to \n"));
 	}
 	if (yield) gf_sleep(10);
 
@@ -1058,7 +1058,7 @@
 	mff->p_rs = (u8 *)gf_calloc(MPE_RS_COLS*rows,sizeof(u8));
 
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("MPE_RS_COLS*rows :%d \n",MPE_RS_COLS*rows));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("MPE_RS_COLS*rows :%d \n",MPE_RS_COLS*rows));
 
 	mff->capacity_total = mff->col_adt*rows;
 	mff->p_error_adt = (u32 *)gf_calloc(mff->col_adt*rows,sizeof(u32));
@@ -1129,7 +1129,7 @@
 void addPadding(MPE_FEC_FRAME *mff , u32 offset)
 {
 	u32 i = 0;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("add paddings from %d to the end %d\n", offset, mff->capacity_total ));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("add paddings from %d to the end %d\n", offset, mff->capacity_total ));
 	for ( i = offset ; i <mff->capacity_total; i ++ )
 		mff -> p_adt [i] = 0xff ;
 }
@@ -1141,13 +1141,13 @@
 	u32 k = 0;
 	for ( i = 0; i < length ; i ++ ) {
 		if (k == 0) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("%x0 : ", row_num));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("%x0 : ", row_num));
 			k = 0;
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("%#x ", data[i]));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("%#x ", data[i]));
 		k++;
 		if (k == 16) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("\n"));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
 			k = 0;
 			row_num ++;
 		}
@@ -1164,17 +1164,17 @@
 
 
 	if (offset >= mff->capacity_total) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("Offset %d bigger than capacity %d \n", offset, mff->capacity_total ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Offset %d bigger than capacity %d \n", offset, mff->capacity_total ));
 	}
 	if (offset+length >= mff->capacity_total) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("Offset+length %d+%d bigger than capacity %d \n", offset, length, mff->capacity_total ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Offset+length %d+%d bigger than capacity %d \n", offset, length, mff->capacity_total ));
 	}
 	if (mff->current_offset_adt != offset) {
 		if (mff->current_offset_adt > offset) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("We missed an offset reset (%d to %d)\n", mff->current_offset_adt, offset));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("We missed an offset reset (%d to %d)\n", mff->current_offset_adt, offset));
 			mff->current_offset_adt = offset;
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("there is an error hole in the ADT from %d to %d \n", mff->current_offset_adt, offset));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("there is an error hole in the ADT from %d to %d \n", mff->current_offset_adt, offset));
 		}
 		setErrorIndicator( mff->p_error_adt , mff->current_offset_adt , (offset - mff->current_offset_adt)*sizeof(u32) ) ;
 		mpe_error_holes->offset = mff->current_offset_adt;
@@ -1191,7 +1191,7 @@
 void setColRS( MPE_FEC_FRAME * mff, u32 offset, u8 * pds, u32 length )
 {
 	if ( mff->current_offset_rs != offset)	{
-		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("there is an error hole in the RS from %d to %d \n", mff->current_offset_rs, offset ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("there is an error hole in the RS from %d to %d \n", mff->current_offset_rs, offset ));
 		setErrorIndicator( mff->p_error_rs , mff->current_offset_rs , (offset - mff->current_offset_rs)*sizeof(u32));
 		mff->current_offset_rs = offset;
 	}
@@ -1235,9 +1235,9 @@
 		}
 		base += mff->rows ;
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, (" the erasure locations is:\n"));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, (" the erasure locations is:\n"));
 	for ( i = 0; i < nb ; i ++ )
-		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("%d ", errasures[i]));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("%d ", errasures[i]));
 	return nb;
 }

gpac-1.0.1.tar.gz/src/media_tools/gpac_ogg.c -> gpac-2.0.0.tar.gz/src/media_tools/gpac_ogg.c Changed

@@ -40,9 +40,6 @@
 
 
 #ifdef GPAC_CONFIG_WIN32
-static u32 mask8B[]=
-{0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff};
-
 void oggpack_writeinit(oggpack_buffer *b) {
 	memset(b,0,sizeof(*b));
 	b->ptr = b->buffer = (unsigned char *)gf_malloc(BUFFER_INCREMENT);
@@ -53,6 +50,9 @@
 
 
 #if 0 //unused
+static u32 mask8B[] =
+{ 0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff };
+
 
 void oggpackB_writeinit(oggpack_buffer *b) {
 	oggpack_writeinit(b);
@@ -536,16 +536,16 @@
 
 s32 ogg_page_serialno(ogg_page *og) {
 	return(og->header[14] |
-	 (og->header[15]<<8) |
-	 (og->header[16]<<16) |
-	 (og->header[17]<<24));
+	 ((u32) og->header[15]<<8) |
+	 ((u32) og->header[16]<<16) |
+	 ((u32) og->header[17]<<24));
 }
 
 s32 ogg_page_pageno(ogg_page *og) {
-	return(og->header[18] |
-	 (og->header[19]<<8) |
-	 (og->header[20]<<16) |
-	 (og->header[21]<<24));
+	return((u32) og->header[18] |
+	 ((u32) og->header[19]<<8) |
+	 ((u32) og->header[20]<<16) |
+	 ((u32) og->header[21]<<24));
 }

gpac-1.0.1.tar.gz/src/media_tools/img.c -> gpac-2.0.0.tar.gz/src/media_tools/img.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -81,7 +81,7 @@
 
 		/*get frame header FFC0*/
 		while (gf_bs_available(bs)) {
-			u32 w, h;
+			u32 w, h,length;
 			if (gf_bs_read_u8(bs) != 0xFF) continue;
 			if (!offset) offset = (u32)gf_bs_get_position(bs) - 1;
 
@@ -101,14 +101,16 @@
 			case 0xCD:
 			case 0xCE:
 			case 0xCF:
-				gf_bs_skip_bytes(bs, 3);
+                length = gf_bs_read_u16(bs);
+                /*prec = */gf_bs_read_u8(bs);
 				h = gf_bs_read_int(bs, 16);
 				w = gf_bs_read_int(bs, 16);
+                nb_comp = gf_bs_read_int(bs, 8);
+                if (length != 8 + 3*nb_comp) continue;  //This is not the right marker
 				if ((w > *width) || (h > *height)) {
 					*width = w;
 					*height = h;
 				}
-				nb_comp = gf_bs_read_int(bs, 8);
 				break;
 			}
 		}
@@ -350,7 +352,7 @@
 	}
 	if (jpx.cinfo.rec_outbuf_height>JPEG_MAX_SCAN_BLOCK_HEIGHT) {
 		jpeg_destroy_decompress(&jpx.cinfo);
-		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[gf_img_jpeg_dec] : jpx.cinfo.rec_outbuf_height>JPEG_MAX_SCAN_BLOCK_HEIGHT\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[gf_img_jpeg_dec] : jpx.cinfo.rec_outbuf_height>JPEG_MAX_SCAN_BLOCK_HEIGHT\n"));
 		return GF_IO_ERR;
 	}

gpac-1.0.1.tar.gz/src/media_tools/isom_hinter.c -> gpac-2.0.0.tar.gz/src/media_tools/isom_hinter.c Changed

@@ -333,7 +333,9 @@
 					required_rate = sample_rate;
 				}
 				/*MPEG1/2 audio*/
-				else if ((streamType==GF_STREAM_AUDIO) && ((codecid==GF_CODECID_MPEG2_PART3) || (codecid==GF_CODECID_MPEG_AUDIO))) {
+				else if ((streamType==GF_STREAM_AUDIO)
+					&& ((codecid==GF_CODECID_MPEG2_PART3) || (codecid==GF_CODECID_MPEG_AUDIO) || (codecid==GF_CODECID_MPEG_AUDIO_L1))
+				) {
 					GF_ISOSample *samp = NULL;
 					if (!is_crypted)
 						 samp = gf_isom_get_sample(file, TrackNum, 1, NULL);
@@ -402,8 +404,9 @@
 				else if (gf_isom_has_sync_shadows(file, TrackNum) || gf_isom_has_sample_dependency(file, TrackNum)) {
 					flags |= GP_RTP_PCK_SYSTEMS_CAROUSEL;
 				}
-				gf_odf_desc_del((GF_Descriptor*)esd);
 			}
+			if (esd)
+				gf_odf_desc_del((GF_Descriptor*)esd);
 			break;
 		case GF_ISOM_SUBTYPE_3GP_H263:
 			hintType = GF_RTP_PAYT_H263;
@@ -479,6 +482,26 @@
 			break;
 		}
 		break;
+		case GF_ISOM_SUBTYPE_VVC1:
+		case GF_ISOM_SUBTYPE_VVI1:
+		case GF_ISOM_SUBTYPE_VVS1:
+		{
+			GF_VVCConfig *vvcc = gf_isom_vvc_config_get(file, TrackNum, 1);
+			if (!vvcc) {
+				*e = GF_NON_COMPLIANT_BITSTREAM;
+				return NULL;
+			}
+			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
+			hintType = GF_RTP_PAYT_VVC;
+			streamType = GF_STREAM_VISUAL;
+			avc_nalu_size = vvcc->nal_unit_size;
+			codecid = GF_CODECID_VVC;
+			PL_ID = 0x0F;
+			flags |= GP_RTP_PCK_USE_MULTI;
+			gf_odf_vvc_cfg_del(vvcc);
+			break;
+		}
+		break;
 		case GF_ISOM_SUBTYPE_3GP_QCELP:
 			required_rate = 8000;
 			hintType = GF_RTP_PAYT_QCELP;
@@ -640,7 +663,11 @@
 	if (hintType==GF_RTP_PAYT_MPEG4) {
 		tmp->rtp_p->slMap.CodecID = codecid;
 		/*set this SL for extraction.*/
-		gf_isom_set_extraction_slc(file, TrackNum, 1, &my_sl);
+		*e = gf_isom_set_extraction_slc(file, TrackNum, 1, &my_sl);
+		if (*e) {
+			gf_hinter_track_del(tmp);
+			return NULL;
+		}
 	}
 	tmp->bandwidth = bandwidth;
 
@@ -657,8 +684,6 @@
 	gf_isom_set_track_priority_in_group(file, TrackNum, InterleaveGroupPriority+1);
 	gf_isom_set_track_priority_in_group(file, tmp->HintTrack, InterleaveGroupPriority);
 
-#if 0
-#endif
 	*e = GF_OK;
 	return tmp;
 }
@@ -793,8 +818,12 @@
 				}
 				remain -= size;
 				tkHint->rtp_p->sl_header.accessUnitEndFlag = remain ? 0 : 1;
-				e = gf_rtp_builder_process(tkHint->rtp_p, ptr, size, (u8) !remain, samp->dataLength, duration, (u8) (descIndex + GF_RTP_TX3G_SIDX_OFFSET) );
-				ptr += size;
+				if (!size) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[rtp hinter] Broken AVC nalu encapsulation: NALU size is 0, ignoring it\n", size));
+				} else {
+					e = gf_rtp_builder_process(tkHint->rtp_p, ptr, size, (u8) !remain, samp->dataLength, duration, (u8) (descIndex + GF_RTP_TX3G_SIDX_OFFSET) );
+					ptr += size;
+				}
 				tkHint->rtp_p->sl_header.accessUnitStartFlag = 0;
 			}
 		} else {
@@ -825,7 +854,7 @@
 
 	count = gf_list_count(nalus);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(nalus, i);
+		GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(nalus, i);
 		b64s = gf_base64_encode(sl->data, sl->size, b64, 200);
 		b64[b64s]=0;
 		strcat(sdpLine, b64);
@@ -942,9 +971,14 @@
 		strcat(sdpLine, "; tx3g=");
 		for (i=0; i<gf_isom_get_sample_description_count(tkHint->file, tkHint->TrackNum); i++) {
 			u8 *tx3g;
+			GF_Err e;
 			char buffer[2000];
 			u32 tx3g_len, len;
-			gf_isom_text_get_encoded_tx3g(tkHint->file, tkHint->TrackNum, i+1, GF_RTP_TX3G_SIDX_OFFSET, &tx3g, &tx3g_len);
+			e = gf_isom_text_get_encoded_tx3g(tkHint->file, tkHint->TrackNum, i+1, GF_RTP_TX3G_SIDX_OFFSET, &tx3g, &tx3g_len);
+			if (e) {
+				if (i) continue;
+				return GF_ISOM_INVALID_FILE;
+			}
 			len = gf_base64_encode(tx3g, tx3g_len, buffer, 2000);
 			gf_free(tx3g);
 			buffer[len] = 0;
@@ -967,6 +1001,8 @@
 		if (avcc) {
 			sprintf(sdpLine, "a=fmtp:%d profile-level-id=%02X%02X%02X; packetization-mode=1", tkHint->rtp_p->PayloadType, avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
 		} else {
+			if (!svcc)
+				return GF_ISOM_INVALID_FILE;
 			sprintf(sdpLine, "a=fmtp:%d profile-level-id=%02X%02X%02X; packetization-mode=1", tkHint->rtp_p->PayloadType, svcc->AVCProfileIndication, svcc->profile_compatibility, svcc->AVCLevelIndication);
 		}
 
@@ -1187,7 +1223,7 @@
 			esd = gf_isom_get_esd(file, odT, 1);
 			if (gf_isom_get_sample_count(file, odT)==1) {
 				samp = gf_isom_get_sample(file, odT, 1, &descIndex);
-				if (gf_hinter_can_embbed_data(samp->data, samp->dataLength, GF_STREAM_OD)) {
+				if (samp && gf_hinter_can_embbed_data(samp->data, samp->dataLength, GF_STREAM_OD)) {
 					InitSL_NULL(&slc);
 					slc.predefined = 0;
 					slc.hasRandomAccessUnitsOnlyFlag = 1;
@@ -1202,9 +1238,11 @@
 					buf64[size64] = 0;
 					sprintf(sdpLine, "data:application/mpeg4-od-au;base64,%s", buf64);
 
-					esd->decoderConfig->avgBitrate = 0;
-					esd->decoderConfig->bufferSizeDB = samp->dataLength;
-					esd->decoderConfig->maxBitrate = 0;
+					if (esd->decoderConfig) {
+						esd->decoderConfig->avgBitrate = 0;
+						esd->decoderConfig->bufferSizeDB = samp->dataLength;
+						esd->decoderConfig->maxBitrate = 0;
+					}
 					size64 = (u32) strlen(sdpLine)+1;
 					esd->URLString = (char*)gf_malloc(sizeof(char) * size64);
 					strcpy(esd->URLString, sdpLine);
@@ -1224,8 +1262,8 @@
 		esd = gf_isom_get_esd(file, sceneT, 1);
 		if (gf_isom_get_sample_count(file, sceneT)==1) {
 			samp = gf_isom_get_sample(file, sceneT, 1, &descIndex);
-			if (gf_hinter_can_embbed_data(samp->data, samp->dataLength, GF_STREAM_SCENE)) {
-
+			if (samp && gf_hinter_can_embbed_data(samp->data, samp->dataLength, GF_STREAM_SCENE)) {
+				InitSL_NULL(&slc);
 				slc.timeScale = slc.timestampResolution = gf_isom_get_media_timescale(file, sceneT);
 				slc.OCRResolution = 1000;
 				slc.startCTS = samp->DTS+samp->CTS_Offset;
@@ -1237,9 +1275,11 @@
 				buf64[size64] = 0;
 				sprintf(sdpLine, "data:application/mpeg4-bifs-au;base64,%s", buf64);
 
-				esd->decoderConfig->avgBitrate = 0;
-				esd->decoderConfig->bufferSizeDB = samp->dataLength;
-				esd->decoderConfig->maxBitrate = 0;
+				if (esd->decoderConfig) {
+					esd->decoderConfig->avgBitrate = 0;
+					esd->decoderConfig->bufferSizeDB = samp->dataLength;
+					esd->decoderConfig->maxBitrate = 0;
+				}
 				esd->URLString = (char*)gf_malloc(sizeof(char) * (strlen(sdpLine)+1));
 				strcpy(esd->URLString, sdpLine);
 			} else {
@@ -1248,10 +1288,13 @@
 			}
 			gf_isom_sample_del(&samp);
 		}
-		if (remove_ocr) esd->OCRESID = 0;
-		else if (esd->OCRESID == esd->ESID) esd->OCRESID = 0;
 
-		gf_list_add(iod->ESDescriptors, esd);
+		if (esd) {
+			if (remove_ocr) esd->OCRESID = 0;
+			else if (esd->OCRESID == esd->ESID) esd->OCRESID = 0;
+
+			gf_list_add(iod->ESDescriptors, esd);
+		}
 
 		if (is_ok) {
 			u32 has_a, has_v, has_i_a, has_i_v;
@@ -1259,12 +1302,14 @@
 			for (i=0; i<gf_isom_get_track_count(file); i++) {
 				esd = gf_isom_get_esd(file, i+1, 1);
 				if (!esd) continue;
-				if (esd->decoderConfig->streamType==GF_STREAM_VISUAL) {
-					if (esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2) has_i_v ++;
-					else has_v++;
-				} else if (esd->decoderConfig->streamType==GF_STREAM_AUDIO) {
-					if (esd->decoderConfig->objectTypeIndication==GF_CODECID_AAC_MPEG4) has_i_a ++;
-					else has_a++;
+				if (esd->decoderConfig) {
+					if (esd->decoderConfig->streamType==GF_STREAM_VISUAL) {
+						if (esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2) has_i_v ++;
+						else has_v++;
+					} else if (esd->decoderConfig->streamType==GF_STREAM_AUDIO) {
+						if (esd->decoderConfig->objectTypeIndication==GF_CODECID_AAC_MPEG4) has_i_a ++;
+						else has_a++;
+					}
 				}
 				gf_odf_desc_del((GF_Descriptor *)esd);
 			}

gpac-1.0.1.tar.gz/src/media_tools/isom_tools.c -> gpac-2.0.0.tar.gz/src/media_tools/isom_tools.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Media Tools sub-project
@@ -59,10 +59,10 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 			GF_AVCConfig *avcc = gf_isom_avc_config_get(file, track, 1);
 			if (rewrite_bs) {
-				gf_media_avc_change_par(avcc, ar_num, ar_den);
+				gf_avc_change_par(avcc, ar_num, ar_den);
 				e = gf_isom_avc_config_update(file, track, 1, avcc);
 			} else {
-				GF_AVCConfigSlot *sl = gf_list_get(avcc->sequenceParameterSets, 0);
+				GF_NALUFFParam *sl = gf_list_get(avcc->sequenceParameterSets, 0);
 				if (sl) {
 					gf_avc_get_sps_info(sl->data, sl->size, NULL, NULL, NULL, &ar_num, &ar_den);
 				} else {
@@ -74,18 +74,20 @@
 #endif
 		}
 #if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
-		else if (stype==GF_ISOM_SUBTYPE_HVC1) {
+		else if ((stype==GF_ISOM_SUBTYPE_HVC1) || (stype==GF_ISOM_SUBTYPE_HVC2)
+			|| (stype==GF_ISOM_SUBTYPE_HEV1) || (stype==GF_ISOM_SUBTYPE_HEV2)
+		) {
 			GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(file, track, 1);
 			if (rewrite_bs) {
-				gf_media_hevc_change_par(hvcc, ar_num, ar_den);
+				gf_hevc_change_par(hvcc, ar_num, ar_den);
 				e = gf_isom_hevc_config_update(file, track, 1, hvcc);
 			} else {
 				u32 i=0;
-				GF_HEVCParamArray *ar;
+				GF_NALUFFParamArray *ar;
 				ar_num = ar_den = 0;
 				while ( (ar = gf_list_enum(hvcc->param_array, &i))) {
 					if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
-						GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, 0);
+						GF_NALUFFParam *sl = gf_list_get(ar->nalus, 0);
 						if (sl)
 							gf_hevc_get_sps_info(sl->data, sl->size, NULL, NULL, NULL, &ar_num, &ar_den);
 						break;
@@ -105,6 +107,30 @@
 			return GF_NOT_SUPPORTED;
 		}
 #endif
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+		else if ((stype==GF_ISOM_SUBTYPE_VVC1) || (stype==GF_ISOM_SUBTYPE_VVI1)
+		) {
+			GF_VVCConfig *vvcc = gf_isom_vvc_config_get(file, track, 1);
+			if (rewrite_bs) {
+				gf_vvc_change_par(vvcc, ar_num, ar_den);
+				e = gf_isom_vvc_config_update(file, track, 1, vvcc);
+			} else {
+				u32 i=0;
+				GF_NALUFFParamArray *ar;
+				ar_num = ar_den = 0;
+				while ( (ar = gf_list_enum(vvcc->param_array, &i))) {
+					if (ar->type==GF_VVC_NALU_SEQ_PARAM) {
+						GF_NALUFFParam *sl = gf_list_get(ar->nalus, 0);
+						if (sl)
+							gf_vvc_get_sps_info(sl->data, sl->size, NULL, NULL, NULL, &ar_num, &ar_den);
+						break;
+					}
+				}
+			}
+			gf_odf_vvc_cfg_del(vvcc);
+			if (e) return e;
+		}
+#endif
 		else if (stype==GF_ISOM_SUBTYPE_MPEG4) {
 			GF_ESD *esd = gf_isom_get_esd(file, track, 1);
 			if (!esd || !esd->decoderConfig || (esd->decoderConfig->streamType!=4) ) {
@@ -162,6 +188,53 @@
 }
 
 GF_EXPORT
+GF_Err gf_media_change_color(GF_ISOFile *file, u32 track, s32 fullrange, s32 vidformat, s32 colorprim, s32 transfer, s32 colmatrix)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	GF_Err e;
+	u32 stype = gf_isom_get_media_subtype(file, track, 1);
+	if ((stype==GF_ISOM_SUBTYPE_AVC_H264)
+			|| (stype==GF_ISOM_SUBTYPE_AVC2_H264)
+			|| (stype==GF_ISOM_SUBTYPE_AVC3_H264)
+			|| (stype==GF_ISOM_SUBTYPE_AVC4_H264)
+	) {
+		GF_AVCConfig *avcc = gf_isom_avc_config_get(file, track, 1);
+		gf_avc_change_color(avcc, fullrange, vidformat, colorprim, transfer, colmatrix);
+		e = gf_isom_avc_config_update(file, track, 1, avcc);
+		gf_odf_avc_cfg_del(avcc);
+		if (e) return e;
+		//remove any colr box
+		return gf_isom_set_visual_color_info(file, track, 1, 0, 0, 0, 0, 0, NULL, 0);
+	}
+	if ((stype==GF_ISOM_SUBTYPE_HEV1)
+			|| (stype==GF_ISOM_SUBTYPE_HEV2)
+			|| (stype==GF_ISOM_SUBTYPE_HVC1)
+			|| (stype==GF_ISOM_SUBTYPE_HVC2)
+			|| (stype==GF_ISOM_SUBTYPE_LHV1)
+			|| (stype==GF_ISOM_SUBTYPE_LHE1)
+	) {
+		GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(file, track, 1);
+		gf_hevc_change_color(hvcc, fullrange, vidformat, colorprim, transfer, colmatrix);
+		e = gf_isom_hevc_config_update(file, track, 1, hvcc);
+		gf_odf_hevc_cfg_del(hvcc);
+		if (e) return e;
+		//remove any colr box
+		return gf_isom_set_visual_color_info(file, track, 1, 0, 0, 0, 0, 0, NULL, 0);
+	}
+	if ((stype==GF_ISOM_SUBTYPE_VVC1) || (stype==GF_ISOM_SUBTYPE_VVI1) ) {
+		GF_VVCConfig *vvcc = gf_isom_vvc_config_get(file, track, 1);
+		gf_vvc_change_color(vvcc, fullrange, vidformat, colorprim, transfer, colmatrix);
+		e = gf_isom_vvc_config_update(file, track, 1, vvcc);
+		gf_odf_vvc_cfg_del(vvcc);
+		if (e) return e;
+		//remove any colr box
+		return gf_isom_set_visual_color_info(file, track, 1, 0, 0, 0, 0, 0, NULL, 0);
+	}
+#endif
+	return GF_NOT_SUPPORTED;
+}
+
+GF_EXPORT
 GF_Err gf_media_remove_non_rap(GF_ISOFile *file, u32 track, Bool non_ref_only)
 {
 	GF_Err e;
@@ -256,7 +329,7 @@
 					u32 to_read = (u32) ((box_size-bsize<4096) ? (box_size-bsize) : 4096);
 					read = gf_bs_read_data(bs, (char *) block, to_read);
 					if (!read || (read != to_read) ) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("corrupted isobmf file, box read "LLU" but expected still "LLU" bytes\n", bsize, box_size));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("corrupted isobmf file, box read "LLU" but expected still "LLU" bytes\n", bsize, box_size));
 						break;
 					}
 					gf_sha1_update(ctx, block, to_read);
@@ -369,7 +442,7 @@
 case GF_ISOM_MEDIA_AUXV:
 case GF_ISOM_MEDIA_PICT:
 			image_track = 0;
-			if (esd && ((esd->decoderConfig->objectTypeIndication==GF_CODECID_JPEG) || (esd->decoderConfig->objectTypeIndication==GF_CODECID_PNG)) )
+			if (esd && esd->decoderConfig && ((esd->decoderConfig->objectTypeIndication==GF_CODECID_JPEG) || (esd->decoderConfig->objectTypeIndication==GF_CODECID_PNG)) )
 				image_track = 1;
 
 			/*remove image tracks if wanted*/
@@ -377,13 +450,13 @@
 				/*only ONE video stream possible with ISMA*/
 				if (VID) {
 					if (esd) gf_odf_desc_del((GF_Descriptor*)esd);
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA convert] More than one video track found, cannot convert file - remove extra track(s)\n"));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ISMA convert] More than one video track found, cannot convert file - remove extra track(s)\n"));
 					return GF_NOT_SUPPORTED;
 				}
 				VID = gf_isom_get_track_id(mp4file, i+1);
 				is_image = image_track;
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ISMA convert] Visual track ID %d: only one sample found, assuming image and removing track\n", gf_isom_get_track_id(mp4file, i+1) ) );
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ISMA convert] Visual track ID %d: only one sample found, assuming image and removing track\n", gf_isom_get_track_id(mp4file, i+1) ) );
 				gf_isom_remove_track(mp4file, i+1);
 				i -= 1;
 				Tracks = gf_isom_get_track_count(mp4file);
@@ -392,7 +465,7 @@
 		case GF_ISOM_MEDIA_AUDIO:
 			if (AID) {
 				if (esd) gf_odf_desc_del((GF_Descriptor*)esd);
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA convert] More than one audio track found, cannot convert file - remove extra track(s)\n") );
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ISMA convert] More than one audio track found, cannot convert file - remove extra track(s)\n") );
 				return GF_NOT_SUPPORTED;
 			}
 			AID = gf_isom_get_track_id(mp4file, i+1);
@@ -400,9 +473,9 @@
 		/*clean file*/
 		default:
 			if (mType==GF_ISOM_MEDIA_HINT) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ISMA convert] Removing Hint track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ISMA convert] Removing Hint track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ISMA convert] Removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ISMA convert] Removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 			}
 			gf_isom_remove_track(mp4file, i+1);
 			i -= 1;
@@ -468,16 +541,21 @@
 			if (!w || !h) {
 				gf_isom_get_visual_info(mp4file, VideoTrack, 1, &w, &h);
 #ifndef GPAC_DISABLE_AV_PARSERS
-				if ((v_esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2) && (v_esd->decoderConfig->streamType==GF_STREAM_VISUAL)) {
+				if (v_esd->decoderConfig
+					&& (v_esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2)
+					&& (v_esd->decoderConfig->streamType==GF_STREAM_VISUAL)
+					&& v_esd->decoderConfig->decoderSpecificInfo
+					&& v_esd->decoderConfig->decoderSpecificInfo->data
+				) {
 					GF_M4VDecSpecInfo dsi;
 					gf_m4v_get_config(v_esd->decoderConfig->decoderSpecificInfo->data, v_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
 					if (!is_image && (!w || !h)) {
 						w = dsi.width;
 						h = dsi.height;
 						gf_isom_set_visual_info(mp4file, VideoTrack, 1, w, h);
-						GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ISMA convert] Adjusting visual track size to %d x %d\n", w, h));
+						GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ISMA convert] Adjusting visual track size to %d x %d\n", w, h));
 					}
-					if (dsi.par_num && (dsi.par_den!=dsi.par_num)) {
+					if (dsi.par_num && dsi.par_den && (dsi.par_den!=dsi.par_num)) {
 						w *= dsi.par_num;
 						w /= dsi.par_den;
 					}
@@ -510,7 +588,10 @@
 			}
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-			if (a_esd->decoderConfig->objectTypeIndication == GF_CODECID_AAC_MPEG4) {
+			if (a_esd->decoderConfig && (a_esd->decoderConfig->objectTypeIndication == GF_CODECID_AAC_MPEG4)
+				&& a_esd->decoderConfig->decoderSpecificInfo
+				&& a_esd->decoderConfig->decoderSpecificInfo->data
+			) {
 				GF_M4ADecSpecInfo cfg;
 				gf_m4a_get_config(a_esd->decoderConfig->decoderSpecificInfo->data, a_esd->decoderConfig->decoderSpecificInfo->dataLength, &cfg);
 				audioPL = cfg.audioPL;
@@ -542,6 +623,8 @@
 	if (!odT) return gf_isom_last_error(mp4file);
 
 	_esd = gf_odf_desc_esd_new(SLPredef_MP4);
+	if (!_esd) return GF_OUT_OF_MEM;
+
 	_esd->decoderConfig->bufferSizeDB = samp->dataLength;
 	_esd->decoderConfig->objectTypeIndication = GF_CODECID_OD_V1;
 	_esd->decoderConfig->streamType = GF_STREAM_OD;
@@ -559,6 +642,8 @@
 	if (!bifsT) return gf_isom_last_error(mp4file);
 
 	_esd = gf_odf_desc_esd_new(SLPredef_MP4);
+	if (!_esd) return GF_OUT_OF_MEM;
+	
 	_esd->decoderConfig->bufferSizeDB = 20;
 	_esd->decoderConfig->objectTypeIndication = GF_CODECID_BIFS_V2;
 	_esd->decoderConfig->streamType = GF_STREAM_SCENE;
@@ -666,7 +751,7 @@
 case GF_ISOM_MEDIA_PICT:
 			/*remove image tracks if wanted*/
 			if (gf_isom_get_sample_count(mp4file, i+1)<=1) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[3GPP convert] Visual track ID %d: only one sample found\n", gf_isom_get_track_id(mp4file, i+1) ));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[3GPP convert] Visual track ID %d: only one sample found\n", gf_isom_get_track_id(mp4file, i+1) ));
 				//goto remove_track;
 			}
 
@@ -689,18 +774,24 @@
 			case GF_ISOM_SUBTYPE_MPEG4:
 			{
 				GF_ESD *esd = gf_isom_get_esd(mp4file, i+1, 1);
+				u32 oti = (esd && esd->decoderConfig) ? esd->decoderConfig->objectTypeIndication : 0;
+				gf_odf_desc_del((GF_Descriptor *)esd);
 				/*both MPEG4-Video and H264/AVC/SVC are supported*/
-				if ((esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2) || (esd->decoderConfig->objectTypeIndication==GF_CODECID_AVC) || (esd->decoderConfig->objectTypeIndication==GF_CODECID_SVC) || (esd->decoderConfig->objectTypeIndication==GF_CODECID_MVC)) {
+				switch (oti) {
+				case GF_CODECID_MPEG4_PART2:
+				case GF_CODECID_AVC:
+				case GF_CODECID_SVC:
+				case GF_CODECID_MVC:
 					nb_vid++;
-				} else {
-					GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Video format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
+					break;
+				default:
+					GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Video format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 					goto remove_track;
 				}
-				gf_odf_desc_del((GF_Descriptor *)esd);
 			}
 			break;
 			default:
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Video format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Video format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 				goto remove_track;
 			}
 			break;
@@ -721,7 +812,10 @@
 			case GF_ISOM_SUBTYPE_MPEG4:
 			{
 				GF_ESD *esd = gf_isom_get_esd(mp4file, i+1, 1);
-				switch (esd->decoderConfig->objectTypeIndication) {
+				u32 oti = (esd && esd->decoderConfig) ? esd->decoderConfig->objectTypeIndication : 0;
+				gf_odf_desc_del((GF_Descriptor *)esd);
+
+				switch (oti) {
 				case GF_CODECID_QCELP:
 				case GF_CODECID_EVRC:
 				case GF_CODECID_SMV:
@@ -730,14 +824,13 @@
 					nb_aud++;
 					break;
 				default:
-					GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Audio format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
+					GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Audio format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 					goto remove_track;
 				}
-				gf_odf_desc_del((GF_Descriptor *)esd);
 			}
 			break;
 			default:
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Audio format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Audio format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 				goto remove_track;
 			}
 			break;
@@ -756,9 +849,9 @@
 		/*clean file*/
 		default:
 			if (mType==GF_ISOM_MEDIA_HINT) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Removing Hint track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Removing Hint track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Removing system track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Removing system track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
 			}
 
 remove_track:
@@ -777,7 +870,7 @@
 		gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP6, GF_FALSE);
 		gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP5, GF_FALSE);
 		gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GG6, GF_FALSE);
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Setting major brand to 3GPP2\n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Setting major brand to 3GPP2\n"));
 	} else {
 		/*update FType*/
 		if ((nb_vid>1) || (nb_aud>1) || (nb_txt>1)) {
@@ -786,25 +879,25 @@
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP6, GF_FALSE);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP5, GF_FALSE);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP4, GF_FALSE);
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Setting major brand to 3GPP Generic file\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Setting major brand to 3GPP Generic file\n"));
 		} else if (nb_txt) {
 			gf_isom_set_brand_info(mp4file, GF_ISOM_BRAND_3GP6, 1024);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP5, GF_TRUE);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP4, GF_TRUE);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GG6, GF_FALSE);
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Setting major brand to 3GPP V6 file\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Setting major brand to 3GPP V6 file\n"));
 		} else if (nb_avc) {
 			gf_isom_set_brand_info(mp4file, GF_ISOM_BRAND_3GP6, 0/*1024*/);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_AVC1, GF_TRUE);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP5, GF_FALSE);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP4, GF_FALSE);
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Setting major brand to 3GPP V6 file + AVC compatible\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Setting major brand to 3GPP V6 file + AVC compatible\n"));
 		} else {
 			gf_isom_set_brand_info(mp4file, GF_ISOM_BRAND_3GP5, 0/*1024*/);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP6, 0);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP4, GF_TRUE);
 			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GG6, GF_FALSE);
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Setting major brand to 3GPP V5 file\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[3GPP convert] Setting major brand to 3GPP V5 file\n"));
 		}
 	}
 	/*add/remove MP4 brands and add isom*/
@@ -838,7 +931,7 @@
 		}
 	}
 	if ((nb_v != 1) && (nb_a!=1)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[PSP convert] Movies need one audio track and one video track\n" ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[PSP convert] Movies need one audio track and one video track\n" ));
 		return GF_BAD_PARAM;
 	}
 	for (i=0; i<count; i++) {
@@ -847,15 +940,18 @@
 		case GF_ISOM_MEDIA_AUDIO:
 			/*if no edit list, add one*/
 			if (!gf_isom_get_edits_count(mp4, i+1)) {
-				gf_isom_remove_edits(mp4, i+1);
-				gf_isom_append_edit(mp4, i+1, gf_isom_get_track_duration(mp4, i+1), 0, GF_ISOM_EDIT_NORMAL);
+				GF_ISOSample *samp = gf_isom_get_sample_info(mp4, i+1, 1, NULL, NULL);
+				if (samp) {
+					gf_isom_append_edit(mp4, i+1, gf_isom_get_track_duration(mp4, i+1), samp->CTS_Offset, GF_ISOM_EDIT_NORMAL);
+					gf_isom_sample_del(&samp);
+				}
 			}
 			/*add PSP UUID*/
 			gf_isom_remove_uuid(mp4, i+1, psp_track_uuid);
 			gf_isom_add_uuid(mp4, i+1, psp_track_uuid, (char *) psp_track_sig, 28);
 			break;
 		default:
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[PSP convert] Removing track ID %d\n", gf_isom_get_track_id(mp4, i+1) ));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[PSP convert] Removing track ID %d\n", gf_isom_get_track_id(mp4, i+1) ));
 			gf_isom_remove_track(mp4, i+1);
 			i -= 1;
 			count -= 1;
@@ -867,6 +963,124 @@
 	return GF_OK;
 }
 
+GF_Err gf_media_get_color_info(GF_ISOFile *file, u32 track, u32 sampleDescriptionIndex, u32 *colour_type, u16 *colour_primaries, u16 *transfer_characteristics, u16 *matrix_coefficients, Bool *full_range_flag)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	u32 stype = gf_isom_get_media_subtype(file, track, sampleDescriptionIndex);
+	if ((stype==GF_ISOM_SUBTYPE_AVC_H264)
+			|| (stype==GF_ISOM_SUBTYPE_AVC2_H264)
+			|| (stype==GF_ISOM_SUBTYPE_AVC3_H264)
+			|| (stype==GF_ISOM_SUBTYPE_AVC4_H264)
+	) {
+		AVCState avc;
+		GF_AVCConfig *avcc = gf_isom_avc_config_get(file, track, sampleDescriptionIndex);
+		u32 i;
+		s32 idx;
+		GF_NALUFFParam *slc;
+
+		memset(&avc, 0, sizeof(AVCState));
+		avc.sps_active_idx = -1;
+
+		i=0;
+		while ((slc = (GF_NALUFFParam *)gf_list_enum(avcc->sequenceParameterSets, &i))) {
+			idx = gf_avc_read_sps(slc->data, slc->size, &avc, 0, NULL);
+
+			if (idx<0) continue;
+			if (! avc.sps[idx].vui_parameters_present_flag )
+				continue;
+
+			*colour_type = avc.sps[idx].vui.video_format;
+			*colour_primaries = avc.sps[idx].vui.colour_primaries;
+			*transfer_characteristics = avc.sps[idx].vui.transfer_characteristics;
+			*matrix_coefficients = avc.sps[idx].vui.matrix_coefficients;
+			*full_range_flag = avc.sps[idx].vui.video_full_range_flag;
+			gf_odf_avc_cfg_del(avcc);
+			return GF_OK;
+		}
+		gf_odf_avc_cfg_del(avcc);
+		return GF_NOT_FOUND;
+	}
+	if ((stype==GF_ISOM_SUBTYPE_HEV1)
+			|| (stype==GF_ISOM_SUBTYPE_HEV2)
+			|| (stype==GF_ISOM_SUBTYPE_HVC1)
+			|| (stype==GF_ISOM_SUBTYPE_HVC2)
+			|| (stype==GF_ISOM_SUBTYPE_LHV1)
+			|| (stype==GF_ISOM_SUBTYPE_LHE1)
+	) {
+		HEVCState hvc;
+		GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(file, track, sampleDescriptionIndex);
+		u32 i;
+		GF_NALUFFParamArray *pa;
+
+		memset(&hvc, 0, sizeof(HEVCState));
+		hvc.sps_active_idx = -1;
+
+		i=0;
+		while ((pa = (GF_NALUFFParamArray *)gf_list_enum(hvcc->param_array, &i))) {
+			GF_NALUFFParam *slc;
+			u32 j;
+			s32 idx;
+			if (pa->type != GF_HEVC_NALU_SEQ_PARAM) continue;
+
+			j=0;
+			while ((slc = (GF_NALUFFParam *)gf_list_enum(pa->nalus, &j))) {
+				idx = gf_hevc_read_sps(slc->data, slc->size, &hvc);
+
+				if (idx<0) continue;
+				if (! hvc.sps[idx].vui_parameters_present_flag)
+					continue;
+
+				*colour_type = hvc.sps[idx].video_format;
+				*colour_primaries = hvc.sps[idx].colour_primaries;
+				*transfer_characteristics = hvc.sps[idx].transfer_characteristic;
+				*matrix_coefficients = hvc.sps[idx].matrix_coeffs;
+				*full_range_flag = hvc.sps[idx].video_full_range_flag;
+				gf_odf_hevc_cfg_del(hvcc);
+				return GF_OK;
+			}
+		}
+		gf_odf_hevc_cfg_del(hvcc);
+		return GF_NOT_FOUND;
+	}
+	if (stype==GF_ISOM_SUBTYPE_AV01) {
+		AV1State av1;
+
+		gf_av1_init_state(&av1);
+		av1.config = gf_isom_av1_config_get(file, track, sampleDescriptionIndex);
+		if (av1.config) {
+			u32 i;
+			for (i=0; i<gf_list_count(av1.config->obu_array); i++) {
+				GF_BitStream *bs;
+				ObuType obu_type = 0;
+				u32 hdr_size = 0;
+				u64 obu_size = 0;
+				GF_AV1_OBUArrayEntry *obu = gf_list_get(av1.config->obu_array, i);
+				bs = gf_bs_new(obu->obu, (u32) obu->obu_length, GF_BITSTREAM_READ);
+				gf_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, &av1);
+				gf_bs_del(bs);
+
+				if (av1.color_description_present_flag) {
+					*colour_type = 0;
+					*colour_primaries = av1.color_primaries;
+					*transfer_characteristics = av1.transfer_characteristics;
+					*matrix_coefficients = av1.matrix_coefficients;
+					*full_range_flag = av1.color_range;
+					if (av1.config) gf_odf_av1_cfg_del(av1.config);
+					gf_av1_reset_state(&av1, GF_TRUE);
+					return GF_OK;
+				}
+			}
+		}
+		if (av1.config) gf_odf_av1_cfg_del(av1.config);
+		gf_av1_reset_state(&av1, GF_TRUE);
+		return GF_NOT_FOUND;
+	}
+
+#endif
+	return GF_NOT_SUPPORTED;
+}
+
+
 GF_EXPORT
 GF_Err gf_media_check_qt_prores(GF_ISOFile *mp4)
 {
@@ -905,7 +1119,7 @@
 		}
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[QTFF/ProRes] Adjusting %s compliancy\n", prores_type ? "ProRes" : "QTFF"));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[QTFF/ProRes] Adjusting %s compliancy\n", prores_type ? "ProRes" : "QTFF"));
 
 	//adjust audio tracks
 	for (i=0; i<count; i++) {
@@ -918,9 +1132,10 @@
 			u32 sr, nb_ch, bps;
 			gf_isom_get_audio_info(mp4, i+1, 1, &sr, &nb_ch, &bps);
 			gf_isom_set_audio_info(mp4, i+1, 1, sr, nb_ch, bps, GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF);
+
+			gf_isom_hint_max_chunk_duration(mp4, i+1, gf_isom_get_media_timescale(mp4, i+1) / 2);
 			continue;
 		}
-		if (mtype!=GF_ISOM_MEDIA_VISUAL) continue;
 	}
 	//make QT
 	gf_isom_remove_root_od(mp4);
@@ -931,21 +1146,21 @@
 		u32 brand, version;
 		gf_isom_get_brand_info(mp4, &brand, &version, NULL);
 		if (brand != GF_ISOM_BRAND_QT) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ProRes] Cannot change brand from \"%s\" to \"qt \", flat storage used. Try using different storage mode\n", gf_4cc_to_str(brand)));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ProRes] Cannot change brand from \"%s\" to \"qt \", flat storage used. Try using different storage mode\n", gf_4cc_to_str(brand)));
 		}
 	}
 
 	if (!video_tk) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[QTFF] No visual track\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[QTFF] No visual track\n"));
 		return GF_OK;
 	}
 
 	if (nb_video_tracks>1) {
 		if (prores_type) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("QTFF] cannot adjust params to prores, %d video tracks present\n", nb_video_tracks));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("QTFF] cannot adjust params to prores, %d video tracks present\n", nb_video_tracks));
 			return GF_BAD_PARAM;
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ProRes] no prores codec found but %d video tracks, not adjusting file\n", nb_video_tracks));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ProRes] no prores codec found but %d video tracks, not adjusting file\n", nb_video_tracks));
 		return GF_OK;
 	}
 
@@ -971,7 +1186,7 @@
 		}
 	}
 	if (!def_dur) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ProRes] cannot estimate default sample duration for video track\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ProRes] cannot estimate default sample duration for video track\n"));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
@@ -1007,14 +1222,18 @@
 				gf_bs_del(bs);
 			}
 			gf_isom_sample_del(&s);
+		} else {
+			e = gf_media_get_color_info(mp4, video_tk, 1, &colour_type, &colour_primaries, &transfer_characteristics, &matrix_coefficients, &full_range_flag);
+			if (e)
+				colour_primaries=0;
 		}
 		if (!colour_primaries) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ProRes] No color info present in visual track, defaulting to BT709\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ProRes] No color info present in visual track, defaulting to BT709\n"));
 			colour_primaries = 1;
 			transfer_characteristics = 1;
 			matrix_coefficients = 1;
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ProRes] No color info present in visual track, extracting from first ProRes frame\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ProRes] No color info present in visual track, extracting from %s\n", prores_type ? "first ProRes frame" : "sample description"));
 		}
 		gf_isom_set_visual_color_info(mp4, video_tk, 1, GF_4CC('n','c','l','c'), colour_primaries, transfer_characteristics, matrix_coefficients, GF_FALSE, NULL, 0);
 	} else if (e) {
@@ -1038,7 +1257,7 @@
 
 	if (!target_ts) {
 		if (prores_type) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ProRes] Unrecognized frame rate %g\n", ((Double)timescale)/def_dur ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ProRes] Unrecognized frame rate %g\n", ((Double)timescale)/def_dur ));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		} else {
 			target_ts = timescale;
@@ -1046,8 +1265,8 @@
 	}
 
 	if (target_ts != timescale) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ProRes] Adjusting timescale to %d\n", target_ts));
-		gf_isom_set_media_timescale(mp4, video_tk, target_ts, 0, GF_FALSE);
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ProRes] Adjusting timescale to %d\n", target_ts));
+		gf_isom_set_media_timescale(mp4, video_tk, target_ts, 0, 0);
 	}
 	gf_isom_set_timescale(mp4, target_ts);
 	if ((w<=720) && (h<=576)) chunk_size = 2000000;
@@ -1091,6 +1310,8 @@
 	case GF_ISOM_SUBTYPE_AV01:
 	case GF_ISOM_SUBTYPE_VP09:
 	case GF_ISOM_SUBTYPE_VP08:
+	case GF_ISOM_SUBTYPE_VVC1:
+	case GF_ISOM_SUBTYPE_VVI1:
 	case GF_ISOM_SUBTYPE_MH3D_MHA1:
 	case GF_ISOM_SUBTYPE_MH3D_MHA2:
 	case GF_ISOM_SUBTYPE_MH3D_MHM1:
@@ -1101,7 +1322,10 @@
 	if (subtype == GF_ISOM_SUBTYPE_OPUS) {
 		esd = gf_isom_get_esd(mp4, track, 1);
 		if (!esd) return NULL;
-
+		if (!esd->decoderConfig) {
+			gf_odf_desc_del((GF_Descriptor *)esd);
+			return NULL;
+		}
 		esd->decoderConfig->objectTypeIndication = GF_CODECID_OPUS;
 		return esd;
 	}
@@ -1110,6 +1334,7 @@
 		GF_BitStream *bs;
 		GF_DIMSDescription dims;
 		esd = gf_odf_desc_esd_new(0);
+		if (!esd) return NULL;
 		esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
 		esd->ESID = gf_isom_get_track_id(mp4, track);
 		esd->OCRESID = esd->ESID;
@@ -1142,7 +1367,7 @@
 GF_ESD *gf_media_map_item_esd(GF_ISOFile *mp4, u32 item_id)
 {
 	u32 item_type;
-	u32 prot_idx;
+	u32 prot_scheme, prot_scheme_version;
 	Bool is_self_ref;
 	const char *name;
 	const char *mime;
@@ -1155,12 +1380,14 @@
 	u32 item_idx = gf_isom_get_meta_item_by_id(mp4, GF_TRUE, 0, item_id);
 	if (!item_idx) return NULL;
 
-	e = gf_isom_get_meta_item_info(mp4, GF_TRUE, 0, item_idx, &item_id, &item_type, &prot_idx, &is_self_ref, &name, &mime, &encoding, &url, &urn);
+	e = gf_isom_get_meta_item_info(mp4, GF_TRUE, 0, item_idx, &item_id, &item_type, &prot_scheme, &prot_scheme_version, &is_self_ref, &name, &mime, &encoding, &url, &urn);
 	if (e != GF_OK) return NULL;
 
 	if (item_type == GF_ISOM_SUBTYPE_HVC1) {
 		GF_ImageItemProperties props;
 		esd = gf_odf_desc_esd_new(0);
+		if (!esd) return NULL;
+
 		if (item_id > (1 << 16)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
 		}
@@ -1176,9 +1403,13 @@
 		esd->slConfig->useTimestampsFlag = 1;
 		esd->slConfig->timestampResolution = 1000;
 		return esd;
-	} else if (item_type == GF_ISOM_SUBTYPE_AVC_H264) {
+	}
+
+	if (item_type == GF_ISOM_SUBTYPE_AVC_H264) {
 		GF_ImageItemProperties props;
 		esd = gf_odf_desc_esd_new(0);
+		if (!esd) return NULL;
+
 		if (item_id > (1 << 16)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
 		}
@@ -1194,9 +1425,34 @@
 		esd->slConfig->useTimestampsFlag = 1;
 		esd->slConfig->timestampResolution = 1000;
 		return esd;
-	} else if ((item_type == GF_ISOM_SUBTYPE_JPEG) || (mime && !strcmp(mime, "image/jpeg")) ){
+	}
+
+	if (item_type == GF_ISOM_SUBTYPE_AV01) {
 		GF_ImageItemProperties props;
 		esd = gf_odf_desc_esd_new(0);
+		if (!esd) return NULL;
+		if (item_id > (1 << 16)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
+		}
+		esd->ESID = (u16)item_id;
+		esd->OCRESID = esd->ESID;
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_AV1;
+		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
+		if (e == GF_OK && props.config) {
+			gf_odf_av1_cfg_write( ((GF_AV1ConfigurationBox *)props.config)->config, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+		}
+		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+		esd->slConfig->useTimestampsFlag = 1;
+		esd->slConfig->timestampResolution = 1000;
+		return esd;
+	}
+
+	if ((item_type == GF_ISOM_SUBTYPE_JPEG) || (mime && !strcmp(mime, "image/jpeg")) ){
+		GF_ImageItemProperties props;
+		esd = gf_odf_desc_esd_new(0);
+		if (!esd) return NULL;
+
 		if (item_id > (1 << 16)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
 		}
@@ -1212,9 +1468,13 @@
 		esd->slConfig->useTimestampsFlag = 1;
 		esd->slConfig->timestampResolution = 1000;
 		return esd;
-	} else if ((item_type == GF_ISOM_SUBTYPE_PNG) || (mime && !strcmp(mime, "image/png")) ){
+	}
+
+	if ((item_type == GF_ISOM_SUBTYPE_PNG) || (mime && !strcmp(mime, "image/png")) ){
 		GF_ImageItemProperties props;
 		esd = gf_odf_desc_esd_new(0);
+		if (!esd) return NULL;
+
 		if (item_id > (1 << 16)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
 		}
@@ -1230,10 +1490,30 @@
 		esd->slConfig->useTimestampsFlag = 1;
 		esd->slConfig->timestampResolution = 1000;
 		return esd;
-	} else {
+	}
 
-		return NULL;
+	if (item_type == GF_ISOM_SUBTYPE_VVC1) {
+		GF_ImageItemProperties props;
+		esd = gf_odf_desc_esd_new(0);
+		if (!esd) return NULL;
+
+		if (item_id > (1 << 16)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
+		}
+		esd->ESID = (u16)item_id;
+		esd->OCRESID = esd->ESID;
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_VVC;
+		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
+		if (e == GF_OK && props.config) {
+			gf_odf_vvc_cfg_write(((GF_VVCConfigurationBox *)props.config)->config, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+		}
+		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+		esd->slConfig->useTimestampsFlag = 1;
+		esd->slConfig->timestampResolution = 1000;
+		return esd;
 	}
+	return NULL;
 }
 
 #endif /*GPAC_DISABLE_ISOM*/
@@ -1298,7 +1578,7 @@
 static Bool gf_isom_has_svc_explicit(GF_ISOFile *file, u32 track)
 {
 	GF_AVCConfig *svccfg;
-	GF_AVCConfigSlot *slc;
+	GF_NALUFFParam *slc;
 	u32 i;
 	u8 type;
 	Bool ret = 0;
@@ -1309,7 +1589,7 @@
 
 	for (i = 0; i < gf_list_count(svccfg->sequenceParameterSets); i++)
 	{
-		slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, i);
+		slc = (GF_NALUFFParam *)gf_list_get(svccfg->sequenceParameterSets, i);
 		type = slc->data[0] & 0x1F;
 		if (type == GF_AVC_NALU_SEQ_PARAM)
 		{
@@ -1348,7 +1628,7 @@
 	GF_AVCConfig *svccfg, *cfg;
 	u32 num_svc_track, num_sample, svc_track, dst_track, ref_trackID, ref_trackNum, max_id, di, width, height, size, nalu_size_length, i, j, t, max_size, num_pps, num_sps, num_subseq, NALUnitHeader, data_offset, data_length, count, timescale, cur_extract_mode;
 	GF_Err e;
-	GF_AVCConfigSlot *slc, *sl;
+	GF_NALUFFParam *slc, *sl;
 	AVCState avc;
 	s32 sps_id, pps_id;
 	GF_ISOSample *samp, *dst_samp;
@@ -1430,9 +1710,9 @@
 	count = 0;
 	for (i = 0; i < num_sps; i++)
 	{
-		slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, i);
+		slc = (GF_NALUFFParam *)gf_list_get(svccfg->sequenceParameterSets, i);
 		nal_type = slc->data[0] & 0x1F;
-		sps_id = gf_media_avc_read_sps(slc->data, slc->size, &avc, 0, NULL);
+		sps_id = gf_avc_read_sps(slc->data, slc->size, &avc, 0, NULL);
 		if (sps_id < 0) {
 			e = GF_NON_COMPLIANT_BITSTREAM;
 			goto exit;
@@ -1450,8 +1730,8 @@
 	pps = (s32 *) gf_malloc(num_pps * sizeof(s32));
 	for (j = 0; j < num_pps; j++)
 	{
-		slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
-		pps_id = gf_media_avc_read_pps(slc->data, slc->size, &avc);
+		slc = (GF_NALUFFParam *)gf_list_get(svccfg->pictureParameterSets, j);
+		pps_id = gf_avc_read_pps(slc->data, slc->size, &avc);
 		if (pps_id < 0) {
 			e = GF_NON_COMPLIANT_BITSTREAM;
 			goto exit;
@@ -1489,7 +1769,7 @@
 			max_size = size;
 		}
 
-		gf_media_avc_parse_nalu(bs, &avc);
+		gf_avc_parse_nalu(bs, &avc);
 		nal_type = avc.last_nal_type_parsed;
 
 		e = gf_bs_seek(bs, offset+nalu_size_length/8);
@@ -1543,6 +1823,13 @@
 		}
 		gf_isom_set_track_enabled(file, svc_track, GF_TRUE);
 		gf_isom_set_track_reference(file, svc_track, GF_ISOM_REF_BASE, ref_trackID);
+		//copy over edit list
+		for (i=0; i<gf_isom_get_edits_count(file, track); i++) {
+			GF_ISOEditType emode;
+			u64 etime, edur, mtime;
+			gf_isom_get_edit(file, track, i+1, &etime, &edur, &mtime, &emode);
+			gf_isom_set_edit(file, svc_track, etime, edur, mtime, emode);
+		}
 		cfg = gf_odf_avc_cfg_new();
 		cfg->complete_representation = 1; //SVC
 		/*this layer depends on the base layer and the lower layers*/
@@ -1567,8 +1854,8 @@
 			cfg->AVCLevelIndication = avc.sps[sps_id].level_idc;
 			cfg->AVCProfileIndication = avc.sps[sps_id].profile_idc;
 			cfg->nal_unit_size = svccfg->nal_unit_size;
-			slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, sps_track[t]);
-			sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			slc = (GF_NALUFFParam *)gf_list_get(svccfg->sequenceParameterSets, sps_track[t]);
+			sl = (GF_NALUFFParam*)gf_malloc(sizeof(GF_NALUFFParam));
 			sl->id = slc->id;
 			sl->size = slc->size;
 			sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
@@ -1579,8 +1866,8 @@
 				pps_id = pps[j];
 				if (is_subseq_pps[j] && (avc.pps[pps_id].sps_id == sps_id))
 				{
-					slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
-					sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+					slc = (GF_NALUFFParam *)gf_list_get(svccfg->pictureParameterSets, j);
+					sl = (GF_NALUFFParam*)gf_malloc(sizeof(GF_NALUFFParam));
 					sl->id = slc->id;
 					sl->size = slc->size;
 					sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
@@ -1605,8 +1892,8 @@
 				cfg->AVCLevelIndication = avc.sps[sps_id].level_idc;
 				cfg->AVCProfileIndication = avc.sps[sps_id].profile_idc;
 				cfg->nal_unit_size = svccfg->nal_unit_size;
-				slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, sps_track[i]);
-				sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+				slc = (GF_NALUFFParam *)gf_list_get(svccfg->sequenceParameterSets, sps_track[i]);
+				sl = (GF_NALUFFParam*)gf_malloc(sizeof(GF_NALUFFParam));
 				sl->id = slc->id;
 				sl->size = slc->size;
 				sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
@@ -1617,8 +1904,8 @@
 					pps_id = pps[j];
 					if (avc.pps[pps_id].sps_id == sps_id)
 					{
-						slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
-						sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+						slc = (GF_NALUFFParam *)gf_list_get(svccfg->pictureParameterSets, j);
+						sl = (GF_NALUFFParam*)gf_malloc(sizeof(GF_NALUFFParam));
 						sl->id = slc->id;
 						sl->size = slc->size;
 						sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
@@ -1714,7 +2001,7 @@
 				max_size = size;
 			}
 
-			gf_media_avc_parse_nalu(bs, &avc);
+			gf_avc_parse_nalu(bs, &avc);
 			nal_type = avc.last_nal_type_parsed;
 			e = gf_bs_seek(bs, offset+nalu_size_length/8);
 			if (e)
@@ -1858,8 +2145,8 @@
 
 			for (i = 0; i < gf_list_count(svccfg->sequenceParameterSets); i++)
 			{
-				slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, i);
-				sps_id = gf_media_avc_read_sps(slc->data, slc->size, &avc, 0, NULL);
+				slc = (GF_NALUFFParam *)gf_list_get(svccfg->sequenceParameterSets, i);
+				sps_id = gf_avc_read_sps(slc->data, slc->size, &avc, 0, NULL);
 				if (sps_id < 0) {
 					e = GF_NON_COMPLIANT_BITSTREAM;
 					goto exit;
@@ -1876,8 +2163,8 @@
 
 			for (j = 0; j < gf_list_count(svccfg->pictureParameterSets); j++)
 			{
-				slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
-				pps_id = gf_media_avc_read_pps(slc->data, slc->size, &avc);
+				slc = (GF_NALUFFParam *)gf_list_get(svccfg->pictureParameterSets, j);
+				pps_id = gf_avc_read_pps(slc->data, slc->size, &avc);
 				if (pps_id < 0) {
 					e = GF_NON_COMPLIANT_BITSTREAM;
 					goto exit;
@@ -1946,7 +2233,7 @@
 	u8 nal_type;
 	Bool first_sample;
 	u64 first_DTS, offset, dur;
-	GF_AVCConfigSlot *slc, *sl;
+	GF_NALUFFParam *slc, *sl;
 
 	e = GF_OK;
 	di = 1;
@@ -2033,8 +2320,8 @@
 		svccfg->nal_unit_size = cfg->nal_unit_size;
 		for (i = 0; i < gf_list_count(cfg->sequenceParameterSets); i++)
 		{
-			slc = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSets, i);
-			sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			slc = (GF_NALUFFParam *)gf_list_get(cfg->sequenceParameterSets, i);
+			sl = (GF_NALUFFParam*)gf_malloc(sizeof(GF_NALUFFParam));
 			sl->id = slc->id;
 			sl->size = slc->size;
 			sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
@@ -2043,8 +2330,8 @@
 		}
 		for (i = 0; i < gf_list_count(cfg->pictureParameterSets); i++)
 		{
-			slc = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, i);
-			sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			slc = (GF_NALUFFParam *)gf_list_get(cfg->pictureParameterSets, i);
+			sl = (GF_NALUFFParam*)gf_malloc(sizeof(GF_NALUFFParam));
 			sl->id = slc->id;
 			sl->size = slc->size;
 			sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
@@ -2158,7 +2445,7 @@
 				gf_bs_read_data(bs, buffer, size);
 				nal_type = buffer[0] & 0x1F;
 				/*skip extractor*/
-				if (nal_type == 31)
+				if (nal_type == GF_AVC_NALU_FF_EXTRACTOR)
 					continue;
 				/*copy to new bitstream*/
 				gf_bs_write_int(dst_bs, size, nalu_size_length);
@@ -2241,15 +2528,15 @@
 
 #if !defined(GPAC_DISABLE_HEVC)
 /* Split LHVC layers */
-static GF_HEVCParamArray *alloc_hevc_param_array(GF_HEVCConfig *hevc_cfg, u8 type)
+static GF_NALUFFParamArray *alloc_hevc_param_array(GF_HEVCConfig *hevc_cfg, u8 type)
 {
-	GF_HEVCParamArray *ar;
+	GF_NALUFFParamArray *ar;
 	u32 i, count = hevc_cfg->param_array ? gf_list_count(hevc_cfg->param_array) : 0;
 	for (i=0; i<count; i++) {
 		ar = gf_list_get(hevc_cfg->param_array, i);
 		if (ar->type==type) return ar;
 	}
-	GF_SAFEALLOC(ar, GF_HEVCParamArray);
+	GF_SAFEALLOC(ar, GF_NALUFFParamArray);
 	if (!ar) return NULL;
 	ar->nalus = gf_list_new();
 	ar->type = type;
@@ -2311,10 +2598,10 @@
 		count = gf_list_count(hevccfg->param_array);
 		for (i=0; i<count; i++) {
 			u32 j, count2;
-			GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(hevccfg->param_array, i);
+			GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *)gf_list_get(hevccfg->param_array, i);
 			count2 = gf_list_count(ar->nalus);
 			for (j=0; j<count2; j++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+				GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
 				//u8 nal_type = (sl->data[0] & 0x7E) >> 1;
 				u8 layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
 				u8 temporal_id_plus_one = sl->data[1] & 0x07;
@@ -2334,10 +2621,10 @@
 		count = gf_list_count(lhvccfg->param_array);
 		for (i=0; i<count; i++) {
 			u32 j, count2;
-			GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(lhvccfg->param_array, i);
+			GF_NALUFFParamArray *ar = (GF_NALUFFParamArray *)gf_list_get(lhvccfg->param_array, i);
 			count2 = gf_list_count(ar->nalus);
 			for (j=0; j<count2; j++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+				GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
 				//u8 nal_type = (sl->data[0] & 0x7E) >> 1;
 				u8 layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
 				u8 temporal_id_plus_one = sl->data[1] & 0x07;
@@ -2471,15 +2758,15 @@
 		count = gf_list_count(cur_cfg->param_array);
 		for (i=0; i<count; i++) {
 			u32 count2;
-			GF_HEVCParamArray *s_ar;
-			GF_HEVCParamArray *ar = gf_list_get(cur_cfg->param_array, i);
+			GF_NALUFFParamArray *s_ar;
+			GF_NALUFFParamArray *ar = gf_list_get(cur_cfg->param_array, i);
 			if ((pass==0) && (ar->type!=GF_HEVC_NALU_VID_PARAM)) continue;
 			else if ((pass==1) && (ar->type!=GF_HEVC_NALU_SEQ_PARAM)) continue;
 			else if ((pass==2) && (ar->type!=GF_HEVC_NALU_PIC_PARAM)) continue;
 
 			count2 = gf_list_count(ar->nalus);
 			for (j=0; j<count2; j++) {
-				GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, j);
+				GF_NALUFFParam *sl = gf_list_get(ar->nalus, j);
 //				u8 nal_type = (sl->data[0] & 0x7E) >> 1;
 				u8 layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
 
@@ -2491,9 +2778,9 @@
 						if (lh > sti[layer_id].height) sti[layer_id].height = lh;
 					}
 				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
-					gf_media_hevc_read_pps(sl->data, sl->size, &hevc_state);
+					gf_hevc_read_pps(sl->data, sl->size, &hevc_state);
 				} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
-					gf_media_hevc_read_vps(sl->data, sl->size, &hevc_state);
+					gf_hevc_read_vps(sl->data, sl->size, &hevc_state);
 				}
 
 				//don't touch base layer
@@ -2535,7 +2822,7 @@
 		gf_isom_set_cts_packing(file, track, GF_TRUE);
 	}
 
-	//CLARIFY wether this is correct: we duplicate all VPS in the enhancement layer ...
+	//CLARIFY whether this is correct: we duplicate all VPS in the enhancement layer ...
 	//we do this because if we split the tracks some info for setting up the enhancement layer
 	//is in the VPS
 	if (extractor_mode != GF_LHVC_EXTRACTORS_ON) {
@@ -2543,23 +2830,23 @@
 		count = gf_list_count(hevccfg->param_array);
 		for (i=0; i<count; i++) {
 			u32 count2;
-			GF_HEVCParamArray *s_ar;
-			GF_HEVCParamArray *ar = gf_list_get(hevccfg->param_array, i);
+			GF_NALUFFParamArray *s_ar;
+			GF_NALUFFParamArray *ar = gf_list_get(hevccfg->param_array, i);
 			if (ar->type != GF_HEVC_NALU_VID_PARAM) continue;
 			count2 = gf_list_count(ar->nalus);
 			for (j=0; j<count2; j++) {
-				GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, j);
+				GF_NALUFFParam *sl = gf_list_get(ar->nalus, j);
 				u8 layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
 				if (layer_id) continue;
 
 				for (k=0; k <= max_layer_id; k++) {
-					GF_AVCConfigSlot *sl2;
+					GF_NALUFFParam *sl2;
 					if (!sti[k].lhvccfg) continue;
 
 					s_ar = alloc_hevc_param_array(sti[k].lhvccfg, ar->type);
 					s_ar->array_completeness = ar->array_completeness;
 
-					GF_SAFEALLOC(sl2, GF_AVCConfigSlot);
+					GF_SAFEALLOC(sl2, GF_NALUFFParam);
 					if (!sl2) break;
 					sl2->data = gf_malloc(sl->size);
 					if (!sl2->data) {
@@ -2582,7 +2869,7 @@
 		e = gf_isom_lhvc_config_update(file, track, 1, NULL, GF_ISOM_LEHVC_WITH_BASE_BACKWARD);
 	}
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[HEVC] Failed to update HEVC/LHVC config\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVC] Failed to update HEVC/LHVC config\n"));
 		goto exit;
 	}
 
@@ -2673,9 +2960,9 @@
 						if (lh > sti[layer_id].height) sti[layer_id].height = lh;
 					}
 				} else if (nal_type==GF_HEVC_NALU_PIC_PARAM) {
-					gf_media_hevc_read_pps(sample->data + offset, nal_size, &hevc_state);
+					gf_hevc_read_pps(sample->data + offset, nal_size, &hevc_state);
 				} else if (nal_type==GF_HEVC_NALU_VID_PARAM) {
-					gf_media_hevc_read_vps(sample->data + offset, nal_size, &hevc_state);
+					gf_hevc_read_vps(sample->data + offset, nal_size, &hevc_state);
 				}
 			}
 
@@ -2736,7 +3023,7 @@
 					if (e) goto exit;
 				}
 				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[HEVC] Failed to update HEVC/LHVC config\n"));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVC] Failed to update HEVC/LHVC config\n"));
 					goto exit;
 				}
 
@@ -2778,7 +3065,7 @@
 					//extractor size 5
 					gf_bs_write_int(xbs, 2*nal_unit_size + 5, 8*nal_unit_size);
 					gf_bs_write_int(xbs, 0, 1);
-					gf_bs_write_int(xbs, 49, 6); //extractor
+					gf_bs_write_int(xbs, GF_HEVC_NALU_FF_EXTRACTOR, 6); //extractor
 					gf_bs_write_int(xbs, k, 6);
 					gf_bs_write_int(xbs, sti[k].max_temporal_id_sample, 3);
 					gf_bs_write_u8(xbs, 0); //constructor type 0
@@ -2809,7 +3096,7 @@
 				sti[j].data_offset = sample->dataLength;
 				e = gf_isom_add_sample(file, sti[j].track_num, 1, sample);
 				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[HEVC] Failed to add HEVC/LHVC sample to track %d\n", sti[j].track_num));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVC] Failed to add HEVC/LHVC sample to track %d\n", sti[j].track_num));
 					goto exit;
 				}
 				gf_free(sample->data);
@@ -2820,7 +3107,7 @@
 					gf_bs_get_content(sti[j].bs, &sample->data, &sample->dataLength);
 					e = gf_isom_append_sample_data(file, sti[j].track_num, sample->data, sample->dataLength);
 					if (e) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[HEVC] Failed to append HEVC/LHVC data to sample (track %d)\n", sti[j].track_num));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVC] Failed to append HEVC/LHVC data to sample (track %d)\n", sti[j].track_num));
 						goto exit;
 					}
 				}
@@ -2853,7 +3140,7 @@
 					e = gf_isom_update_sample(file, sti[j].track_num, sample_num+1, sample, 1);
 				}
 				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[HEVC] Failed to %s HEVC/LHVC sample (track %d, base sample num %d)\n", j ? "add" : "update", sti[j].track_num, sample_num+1));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVC] Failed to %s HEVC/LHVC sample (track %d, base sample num %d)\n", j ? "add" : "update", sti[j].track_num, sample_num+1));
 					goto exit;
 				}
 			}
@@ -2861,7 +3148,7 @@
 			else if (!j) {
 				e = gf_isom_remove_sample(file, sti[j].track_num, sample_num+1);
 				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[HEVC] Failed to remove HEVC/LHVC sample (track %d)\n", sti[j].track_num));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVC] Failed to remove HEVC/LHVC sample (track %d)\n", sti[j].track_num));
 					goto exit;
 				}
 				sample_num--;
@@ -2960,7 +3247,7 @@
 #endif /*GPAC_DISABLE_HEVC*/
 
 GF_EXPORT
-GF_Err gf_media_change_pl(GF_ISOFile *file, u32 track, u32 profile, u32 level)
+GF_Err gf_media_change_pl(GF_ISOFile *file, u32 track, u32 profile, u32 compat, u32 level)
 {
 	u32 i, count, stype;
 	GF_Err e;
@@ -2979,10 +3266,11 @@
 
 	avcc = gf_isom_avc_config_get(file, track, 1);
 	if (level) avcc->AVCLevelIndication = level;
+	if (compat) avcc->profile_compatibility = compat;
 	if (profile) avcc->AVCProfileIndication = profile;
 	count = gf_list_count(avcc->sequenceParameterSets);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *slc = gf_list_get(avcc->sequenceParameterSets, i);
+		GF_NALUFFParam *slc = gf_list_get(avcc->sequenceParameterSets, i);
 		if (profile) slc->data[1] = profile;
 		if (level) slc->data[3] = level;
 	}
@@ -3072,6 +3360,8 @@
 	char data[11];
 	u32 di, data_size=7;
 	GF_BitStream *bs;
+	//avoid gcc warnings
+	memset(data, 0, 11);
 	//write TRIF sample group description
 	bs = gf_bs_new((const char*)data, 11, GF_BITSTREAM_WRITE);
 	gf_bs_write_u16(bs, id);	//groupID
@@ -3132,19 +3422,19 @@
 
 	count = gf_list_count(hvcc->param_array);
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *ar = gf_list_get(hvcc->param_array, i);
+		GF_NALUFFParamArray *ar = gf_list_get(hvcc->param_array, i);
 		for (j=0; j < gf_list_count(ar->nalus); j++) {
-			GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, j);
+			GF_NALUFFParam *sl = gf_list_get(ar->nalus, j);
 			if (!sl) continue;
 			switch (ar->type) {
 			case GF_HEVC_NALU_PIC_PARAM:
-				pps_idx = gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
+				pps_idx = gf_hevc_read_pps(sl->data, sl->size, &hevc);
 				break;
 			case GF_HEVC_NALU_SEQ_PARAM:
-				sps_idx = gf_media_hevc_read_sps(sl->data, sl->size, &hevc);
+				sps_idx = gf_hevc_read_sps(sl->data, sl->size, &hevc);
 				break;
 			case GF_HEVC_NALU_VID_PARAM:
-				gf_media_hevc_read_vps(sl->data, sl->size, &hevc);
+				gf_hevc_read_vps(sl->data, sl->size, &hevc);
 				break;
 			}
 		}
@@ -3167,17 +3457,17 @@
 			for (j=0; j<nalu_size_length; j++) {
 				nalu_size = (nalu_size<<8) + data[j];
 			}
-			gf_media_hevc_parse_nalu(data + nalu_size_length, nalu_size, &hevc, &nal_type, &temporal_id, &layer_id);
+			gf_hevc_parse_nalu(data + nalu_size_length, nalu_size, &hevc, &nal_type, &temporal_id, &layer_id);
 
 			switch (nal_type) {
 			case GF_HEVC_NALU_PIC_PARAM:
-				pps_idx = gf_media_hevc_read_pps((char *) data+nalu_size_length, nalu_size, &hevc);
+				pps_idx = gf_hevc_read_pps((char *) data+nalu_size_length, nalu_size, &hevc);
 				break;
 			case GF_HEVC_NALU_SEQ_PARAM:
-				sps_idx = gf_media_hevc_read_sps((char *) data+nalu_size_length, nalu_size, &hevc);
+				sps_idx = gf_hevc_read_sps((char *) data+nalu_size_length, nalu_size, &hevc);
 				break;
 			case GF_HEVC_NALU_VID_PARAM:
-				gf_media_hevc_read_vps((char *) data+nalu_size_length, nalu_size, &hevc);
+				gf_hevc_read_vps((char *) data+nalu_size_length, nalu_size, &hevc);
 				break;
 			}
 			data += nalu_size + nalu_size_length;
@@ -3194,7 +3484,7 @@
 
 	if (! hevc.pps[pps_idx].tiles_enabled_flag) {
 		hevc_add_trif(file, track, gf_isom_get_track_id(file, track), GF_TRUE, 1, filter_disabled, 0, 0, hevc.sps[pps_idx].width, hevc.sps[pps_idx].height, GF_TRUE);
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[HEVC Tiles] Tiles not enabled, signal only single tile full picture\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[HEVC Tiles] Tiles not enabled, signal only single tile full picture\n"));
 		return GF_OK;
 	}
 
@@ -3259,7 +3549,7 @@
 			for (j=0; j<nalu_size_length; j++) {
 				nalu_size = (nalu_size<<8) + data[j];
 			}
-			ret = gf_media_hevc_parse_nalu(data + nalu_size_length, nalu_size, &hevc, &nal_type, &temporal_id, &layer_id);
+			ret = gf_hevc_parse_nalu(data + nalu_size_length, nalu_size, &hevc, &nal_type, &temporal_id, &layer_id);
 
 			//error parsing NAL, set nal to fallback to regular import
 			if (ret<0) nal_type = GF_HEVC_NALU_VID_PARAM;
@@ -3284,7 +3574,7 @@
 				tx = ty = tw = th = 0;
 				cur_tile = hevc_get_tile_id(&hevc, &tx, &ty, &tw, &th);
 				if (cur_tile>=nb_tiles) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[HEVC Tiles] Tile index %d is greater than number of tiles %d in PPS\n", cur_tile, nb_tiles));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[HEVC Tiles] Tile index %d is greater than number of tiles %d in PPS\n", cur_tile, nb_tiles));
 					e = GF_NON_COMPLIANT_BITSTREAM;
 				}
 				if (e)
@@ -3442,6 +3732,8 @@
 	GF_FilterSession *fsess;
 } FragCallback;
 
+extern char gf_prog_lf;
+
 static Bool on_frag_event(void *_udta, GF_Event *evt)
 {
 	u32 i, count;
@@ -3471,9 +3763,9 @@
 	fc->last_prog = stats.percent / 100;
 
 #ifndef GPAC_DISABLE_LOG
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Fragmenting: % 2.2f %%\r", ((Double)stats.percent) / 100));
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Fragmenting: % 2.2f %%%c", ((Double)stats.percent) / 100, gf_prog_lf));
 #else
-	fprintf(stderr, "Fragmenting: % 2.2f %%\r", ((Double)stats.percent) / 100);
+	fprintf(stderr, "Fragmenting: % 2.2f %%%c", ((Double)stats.percent) / 100, gf_prog_lf);
 #endif
 	return GF_FALSE;
 }
@@ -3488,7 +3780,7 @@
 	GF_FilterSession *fsess = gf_fs_new_defaults(0);
 
 	if (!fsess) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Failed to create filter session\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Failed to create filter session\n"));
 		return GF_OUT_OF_MEM;
 	}
 
@@ -3527,18 +3819,312 @@
 #endif
 
 	e = gf_fs_run(fsess);
+	if (e==GF_EOS) e = GF_OK;
+	if (!e) e = gf_fs_get_last_connect_error(fsess);
+	if (!e) e = gf_fs_get_last_process_error(fsess);
 	gf_fs_del(fsess);
-	return (e<GF_OK) ? e : GF_OK;
+	return e;
 }
 
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
+
+GF_Err rfc_6381_get_codec_aac(char *szCodec, u32 codec_id, u8 *dsi, u32 dsi_size, Bool force_sbr)
+{
+	if (dsi && dsi_size) {
+		u8 audio_object_type;
+		if (dsi_size < 2) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[RFC6381-AAC] invalid DSI size %u < 2\n", dsi_size));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		/*5 first bits of AAC config*/
+		audio_object_type = (dsi[0] & 0xF8) >> 3;
+		if (audio_object_type == 31) { /*escape code*/
+			const u8 audio_object_type_ext = ((dsi[0] & 0x07) << 3) + ((dsi[1] & 0xE0) >> 5);
+			audio_object_type = 32 + audio_object_type_ext;
+		}
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (force_sbr && (audio_object_type==2) ) {
+			GF_M4ADecSpecInfo a_cfg;
+			GF_Err e = gf_m4a_get_config(dsi, dsi_size, &a_cfg);
+			if (e==GF_OK) {
+				if (a_cfg.sbr_sr)
+					audio_object_type = a_cfg.sbr_object_type;
+				if (a_cfg.has_ps)
+					audio_object_type = 29;
+			}
+		}
+#endif
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X.%01d", gf_codecid_oti(codec_id), audio_object_type);
+		return GF_OK;
+	}
+
+	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X", codec_id);
+
+	switch (codec_id) {
+	case GF_CODECID_AAC_MPEG4:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	case GF_CODECID_AAC_MPEG2_SSRP:
+	case GF_CODECID_USAC:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[RFC6381-AAC] Cannot find AAC config, using default %s\n", szCodec));
+		break;
+	}
+	return GF_OK;
+}
+
+GF_Err rfc_6381_get_codec_m4v(char *szCodec, u32 codec_id, u8 *dsi, u32 dsi_size)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (dsi && dsi_size) {
+		GF_M4VDecSpecInfo m4vc;
+		gf_m4v_get_config(dsi, dsi_size, &m4vc);
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X.%01x", codec_id, m4vc.VideoPL);
+		return GF_OK;
+	}
+#endif
+	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X", codec_id);
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[RFC6381-M4V] Cannot find M4V config, using default %s\n", szCodec));
+	return GF_OK;
+}
+
+GF_Err rfc_6381_get_codec_avc(char *szCodec, u32 subtype, GF_AVCConfig *avcc)
+{
+	assert(avcc);
+	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02X%02X%02X", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
+	return GF_OK;
+}
+
+GF_Err rfc_6381_get_codec_hevc(char *szCodec, u32 subtype, GF_HEVCConfig *hvcc)
+{
+	u8 c;
+	char szTemp[RFC6381_CODEC_NAME_SIZE_MAX];
+	assert(hvcc);
+
+	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.", gf_4cc_to_str(subtype));
+	if (hvcc->profile_space==1) strcat(szCodec, "A");
+	else if (hvcc->profile_space==2) strcat(szCodec, "B");
+	else if (hvcc->profile_space==3) strcat(szCodec, "C");
+	//profile idc encoded as a decimal number
+	sprintf(szTemp, "%d", hvcc->profile_idc);
+	strcat(szCodec, szTemp);
+	//general profile compatibility flags: hexa, bit-reversed
+	{
+		u32 val = hvcc->general_profile_compatibility_flags;
+		u32 i, res = 0;
+		for (i=0; i<32; i++) {
+			res |= val & 1;
+			if (i==31) break;
+			res <<= 1;
+			val >>=1;
+		}
+		sprintf(szTemp, ".%X", res);
+		strcat(szCodec, szTemp);
+	}
+
+	if (hvcc->tier_flag) strcat(szCodec, ".H");
+	else strcat(szCodec, ".L");
+	sprintf(szTemp, "%d", hvcc->level_idc);
+	strcat(szCodec, szTemp);
+
+	c = hvcc->progressive_source_flag << 7;
+	c |= hvcc->interlaced_source_flag << 6;
+	c |= hvcc->non_packed_constraint_flag << 5;
+	c |= hvcc->frame_only_constraint_flag << 4;
+	c |= (hvcc->constraint_indicator_flags >> 40);
+	sprintf(szTemp, ".%X", c);
+	strcat(szCodec, szTemp);
+	if (hvcc->constraint_indicator_flags & 0xFFFFFFFF) {
+		c = (hvcc->constraint_indicator_flags >> 32) & 0xFF;
+		sprintf(szTemp, ".%X", c);
+		strcat(szCodec, szTemp);
+		if (hvcc->constraint_indicator_flags & 0x00FFFFFF) {
+			c = (hvcc->constraint_indicator_flags >> 24) & 0xFF;
+			sprintf(szTemp, ".%X", c);
+			strcat(szCodec, szTemp);
+			if (hvcc->constraint_indicator_flags & 0x0000FFFF) {
+				c = (hvcc->constraint_indicator_flags >> 16) & 0xFF;
+				sprintf(szTemp, ".%X", c);
+				strcat(szCodec, szTemp);
+				if (hvcc->constraint_indicator_flags & 0x000000FF) {
+					c = (hvcc->constraint_indicator_flags >> 8) & 0xFF;
+					sprintf(szTemp, ".%X", c);
+					strcat(szCodec, szTemp);
+					c = (hvcc->constraint_indicator_flags ) & 0xFF;
+					sprintf(szTemp, ".%X", c);
+					strcat(szCodec, szTemp);
+				}
+			}
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err rfc_6381_get_codec_av1(char *szCodec, u32 subtype, GF_AV1Config *av1c, COLR colr)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	GF_Err e;
+	u32 i = 0;
+	AV1State av1_state;
+	assert(av1c);
+
+	gf_av1_init_state(&av1_state);
+	av1_state.config = av1c;
+
+	for (i = 0; i < gf_list_count(av1c->obu_array); ++i) {
+		GF_BitStream *bs;
+		GF_AV1_OBUArrayEntry *a = gf_list_get(av1c->obu_array, i);
+		bs = gf_bs_new(a->obu, a->obu_length, GF_BITSTREAM_READ);
+		if (!av1_is_obu_header(a->obu_type))
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISOM Tools] AV1: unexpected obu_type %d when computing RFC6381. Parsing anyway.\n", a->obu_type, gf_4cc_to_str(subtype)));
+
+		e = aom_av1_parse_temporal_unit_from_section5(bs, &av1_state);
+		gf_bs_del(bs);
+		bs = NULL;
+		if (e) {
+			return e;
+		}
+	}
+
+	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%01u.%02u%c.%02u", gf_4cc_to_str(subtype),
+		av1_state.config->seq_profile, av1_state.config->seq_level_idx_0, av1_state.config->seq_tier_0 ? 'H' : 'M', av1_state.bit_depth);
+
+	if (av1_state.color_description_present_flag) {
+		char tmp[RFC6381_CODEC_NAME_SIZE_MAX];
+		snprintf(tmp, RFC6381_CODEC_NAME_SIZE_MAX, ".%01u.%01u%01u%01u.%02u.%02u.%02u.%01u",
+			av1_state.config->monochrome, av1_state.config->chroma_subsampling_x, av1_state.config->chroma_subsampling_y,
+			av1_state.config->chroma_subsampling_x && av1_state.config->chroma_subsampling_y ? av1_state.config->chroma_sample_position : 0,
+			colr.override == GF_TRUE ? colr.colour_primaries : av1_state.color_primaries,
+			colr.override == GF_TRUE ? colr.transfer_characteristics : av1_state.transfer_characteristics,
+			colr.override == GF_TRUE ? colr.matrix_coefficients : av1_state.matrix_coefficients,
+			colr.override == GF_TRUE ? colr.full_range : av1_state.color_range);
+		strcat(szCodec, tmp);
+	} else {
+		if ((av1_state.color_primaries == 2) && (av1_state.transfer_characteristics == 2) && (av1_state.matrix_coefficients == 2) && av1_state.color_range == GF_FALSE) {
+
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[AV1] incoherent color characteristics primaries %d transfer %d matrix %d color range %d\n",
+				av1_state.color_primaries, av1_state.transfer_characteristics, av1_state.matrix_coefficients, av1_state.color_range));
+		}
+	}
+	gf_av1_reset_state(&av1_state, GF_TRUE);
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
+GF_Err rfc_6381_get_codec_vpx(char *szCodec, u32 subtype, GF_VPConfig *vpcc, COLR colr)
+{
+	assert(vpcc);
+	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02u.%02x.%02u.%02u.%02u.%02u.%02u.%02u", gf_4cc_to_str(subtype),
+		vpcc->profile,
+		vpcc->level,
+		vpcc->bit_depth,
+		vpcc->chroma_subsampling,
+		colr.override == GF_TRUE ? colr.colour_primaries : vpcc->colour_primaries,
+		colr.override == GF_TRUE ? colr.transfer_characteristics : vpcc->transfer_characteristics,
+		colr.override == GF_TRUE ? colr.matrix_coefficients : vpcc->matrix_coefficients,
+		colr.override == GF_TRUE ? colr.full_range : vpcc->video_fullRange_flag);
+	return GF_OK;
+}
+
+GF_Err rfc_6381_get_codec_dolby_vision(char *szCodec, u32 subtype, GF_DOVIDecoderConfigurationRecord *dovi)
+{
+	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02u.%02u", gf_4cc_to_str(subtype), dovi->dv_profile, dovi->dv_level);
+	return GF_OK;
+}
+
+static char base32_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+
+GF_Err rfc_6381_get_codec_vvc(char *szCodec, u32 subtype, GF_VVCConfig *vvcc)
+{
+	assert(vvcc);
+	u32 i, pos, len;
+
+	if ( (subtype==GF_4CC('v','v','c','N')) || (subtype==GF_4CC('v','v','s','1')) ) {
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+	} else {
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%d.%s%d", gf_4cc_to_str(subtype), vvcc->general_profile_idc, vvcc->general_tier_flag ? "H" : "L", vvcc->general_level_idc);
+	}
+
+	u8 buf[256];
+	GF_BitStream *bs = gf_bs_new(buf, 256, GF_BITSTREAM_WRITE);
+	gf_bs_write_int(bs, vvcc->ptl_frame_only_constraint, 1);
+	gf_bs_write_int(bs, vvcc->ptl_multilayer_enabled, 1);
+	for (i=0; i<vvcc->num_constraint_info; i++) {
+		gf_bs_write_int(bs, vvcc->general_constraint_info[i], 8);
+	}
+	gf_bs_align(bs);
+	pos = (u32) gf_bs_get_position(bs);
+	gf_bs_del(bs);
+	while (pos && (buf[pos-1]==0)) {
+		pos--;
+	}
+	if (!pos) {
+		strcat(szCodec, ".CA");
+		return GF_OK;
+	}
+	strcat(szCodec, ".C");
+	len = (u32) strlen(szCodec);
+	bs = gf_bs_new(buf, pos, GF_BITSTREAM_READ);
+	while (1) {
+		u32 nb_bits = (u32) ( 8*gf_bs_available(bs) + gf_bs_bits_available(bs) );
+		if (!nb_bits) break;
+		if (nb_bits>5) nb_bits = 5;
+		u32 c = gf_bs_read_int(bs, nb_bits);
+		while (nb_bits<5) {
+			c <<= 1;
+			nb_bits++;
+		}
+		char b32_char = base32_chars[c];
+		//should not happen, we use 100 bytes by default and max general_constraint_info is 63 bytes
+		if (len >= RFC6381_CODEC_NAME_SIZE_MAX) {
+			return GF_OUT_OF_MEM;
+		}
+		szCodec[len] = b32_char;
+		len++;
+		szCodec[len] = 0;
+	}
+
+	return GF_OK;
+}
+GF_Err rfc_6381_get_codec_mpegha(char *szCodec, u32 subtype, u8 *dsi, u32 dsi_size, s32 pl)
+{
+	if (dsi && (dsi_size>=2) ) {
+		pl = dsi[1];
+	}
+	if (pl<0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Cannot find MPEG-H Audio Config or audio PL, defaulting to profile 0x01\n"));
+	}
+	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.0x%02X", gf_4cc_to_str(subtype), pl);
+	return GF_OK;
+}
+
+GF_Err rfc6381_codec_name_default(char *szCodec, u32 subtype, u32 codec_id)
+{
+	if (codec_id && (codec_id<GF_CODECID_LAST_MPEG4_MAPPING)) {
+		u32 stype = gf_codecid_type(codec_id);
+		if (stype==GF_STREAM_VISUAL)
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X", codec_id);
+		else if (stype==GF_STREAM_AUDIO)
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X", codec_id);
+		else
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4s.%02X", codec_id);
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("Codec parameters not known - using default value \"%s\"\n", gf_4cc_to_str(subtype) ));
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+	}
+	return GF_OK;
+}
+
 #ifndef GPAC_DISABLE_ISOM
 
 GF_EXPORT
 GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec, Bool force_inband, Bool force_sbr)
 {
 	GF_ESD *esd;
+	GF_Err e;
 	GF_AVCConfig *avcc;
 #ifndef GPAC_DISABLE_HEVC
 	GF_HEVCConfig *hvcc;
@@ -3546,20 +4132,19 @@
 	u32 subtype = gf_isom_get_media_subtype(movie, track, 1);
 
 	if (subtype == GF_ISOM_SUBTYPE_MPEG4_CRYP) {
-		GF_Err e;
 		u32 originalFormat=0;
 		if (gf_isom_is_ismacryp_media(movie, track, 1)) {
 			e = gf_isom_get_ismacryp_info(movie, track, 1, &originalFormat, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 		} else if (gf_isom_is_omadrm_media(movie, track, 1)) {
 			e = gf_isom_get_omadrm_info(movie, track, 1, &originalFormat, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 		} else if(gf_isom_is_cenc_media(movie, track, 1)) {
-			e = gf_isom_get_cenc_info(movie, track, 1, &originalFormat, NULL, NULL, NULL);
+			e = gf_isom_get_cenc_info(movie, track, 1, &originalFormat, NULL, NULL);
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOM Tools] Unkown protection scheme type %s\n", gf_4cc_to_str( gf_isom_is_media_encrypted(movie, track, 1)) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ISOM Tools] Unknown protection scheme type %s\n", gf_4cc_to_str( gf_isom_is_media_encrypted(movie, track, 1)) ));
 			e = gf_isom_get_original_format_type(movie, track, 1, &originalFormat);
 		}
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOM Tools] Error fetching protection information\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ISOM Tools] Error fetching protection information\n"));
 			return e;
 		}
 
@@ -3573,57 +4158,30 @@
 			switch (esd->decoderConfig->streamType) {
 			case GF_STREAM_AUDIO:
 				if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-					u8 audio_object_type;
-					if (esd->decoderConfig->decoderSpecificInfo->dataLength < 2) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[RFC6381-AAC] invalid DSI size %u < 2\n", esd->decoderConfig->decoderSpecificInfo->dataLength));
-						return GF_NON_COMPLIANT_BITSTREAM;
-					}
-					/*5 first bits of AAC config*/
-					audio_object_type = (esd->decoderConfig->decoderSpecificInfo->data[0] & 0xF8) >> 3;
-					if (audio_object_type == 31) { /*escape code*/
-						const u8 audio_object_type_ext = ((esd->decoderConfig->decoderSpecificInfo->data[0] & 0x07) << 3) + ((esd->decoderConfig->decoderSpecificInfo->data[1] & 0xE0) >> 5);
-						audio_object_type = 32 + audio_object_type_ext;
-					}
-	#ifndef GPAC_DISABLE_AV_PARSERS
-					if (force_sbr && (audio_object_type==2) ) {
-						GF_M4ADecSpecInfo a_cfg;
-						GF_Err e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
-						if (e==GF_OK) {
-							if (a_cfg.sbr_sr)
-								audio_object_type = a_cfg.sbr_object_type;
-							if (a_cfg.has_ps)
-								audio_object_type = 29;
-						}
-					}
-	#endif
-					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X.%01d", esd->decoderConfig->objectTypeIndication, audio_object_type);
+					e = rfc_6381_get_codec_aac(szCodec, esd->decoderConfig->objectTypeIndication, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, force_sbr);
 				} else {
-					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X", esd->decoderConfig->objectTypeIndication);
+					e = rfc_6381_get_codec_aac(szCodec, esd->decoderConfig->objectTypeIndication, NULL, 0, force_sbr);
 				}
 				break;
 			case GF_STREAM_VISUAL:
-	#ifndef GPAC_DISABLE_AV_PARSERS
-				if (esd->decoderConfig->decoderSpecificInfo) {
-					GF_M4VDecSpecInfo dsi;
-					gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X.%01x", esd->decoderConfig->objectTypeIndication, dsi.VideoPL);
-				} else
-	#endif
-				{
-					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X", esd->decoderConfig->objectTypeIndication);
+				if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+					e = rfc_6381_get_codec_m4v(szCodec, esd->decoderConfig->objectTypeIndication, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+				} else {
+					e = rfc_6381_get_codec_m4v(szCodec, esd->decoderConfig->objectTypeIndication, NULL, 0);
 				}
 				break;
 			default:
 				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4s.%02X", esd->decoderConfig->objectTypeIndication);
+				e = GF_OK;
 				break;
 			}
 			gf_odf_desc_del((GF_Descriptor *)esd);
-			return GF_OK;
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[RFC6381] Cannot find ESD. Aborting.\n"));
-			if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
-			return GF_ISOM_INVALID_FILE;
+			return e;
 		}
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[RFC6381] Cannot find ESD. Aborting.\n"));
+		if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
+		return GF_ISOM_INVALID_FILE;
+
 	case GF_ISOM_SUBTYPE_AVC_H264:
 	case GF_ISOM_SUBTYPE_AVC2_H264:
 	case GF_ISOM_SUBTYPE_AVC3_H264:
@@ -3637,26 +4195,25 @@
 				subtype = GF_ISOM_SUBTYPE_AVC4_H264;
 		}
 		if (avcc) {
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02X%02X%02X", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
+			e = rfc_6381_get_codec_avc(szCodec, subtype, avcc);
 			gf_odf_avc_cfg_del(avcc);
-			return GF_OK;
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Cannot find AVC configuration box"));
-			return GF_ISOM_INVALID_FILE;
+			return e;
 		}
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Cannot find AVC configuration box"));
+		return GF_ISOM_INVALID_FILE;
+
 	case GF_ISOM_SUBTYPE_SVC_H264:
 	case GF_ISOM_SUBTYPE_MVC_H264:
 		avcc = gf_isom_mvc_config_get(movie, track, 1);
 		if (!avcc) avcc = gf_isom_svc_config_get(movie, track, 1);
 		if (avcc) {
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02X%02X%02X", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
+			e = rfc_6381_get_codec_avc(szCodec, subtype, avcc);
 			gf_odf_avc_cfg_del(avcc);
-			return GF_OK;
-		}
-		else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Cannot find AVC configuration box"));
-			return GF_ISOM_INVALID_FILE;
+			return e;
 		}
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Cannot find SVC/MVC configuration box\n"));
+		return GF_ISOM_INVALID_FILE;
+
 #ifndef GPAC_DISABLE_HEVC
 	case GF_ISOM_SUBTYPE_HVC1:
 	case GF_ISOM_SUBTYPE_HEV1:
@@ -3681,123 +4238,33 @@
 			hvcc = gf_isom_hevc_config_get(movie, refTrack, 1);
 		}
 		if (hvcc) {
-			u8 c;
-			char szTemp[RFC6381_CODEC_NAME_SIZE_MAX];
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.", gf_4cc_to_str(subtype));
-			if (hvcc->profile_space==1) strcat(szCodec, "A");
-			else if (hvcc->profile_space==2) strcat(szCodec, "B");
-			else if (hvcc->profile_space==3) strcat(szCodec, "C");
-			//profile idc encoded as a decimal number
-			sprintf(szTemp, "%d", hvcc->profile_idc);
-			strcat(szCodec, szTemp);
-			//general profile compatibility flags: hexa, bit-reversed
-			{
-				u32 val = hvcc->general_profile_compatibility_flags;
-				u32 i, res = 0;
-				for (i=0; i<32; i++) {
-					res |= val & 1;
-					if (i==31) break;
-					res <<= 1;
-					val >>=1;
-				}
-				sprintf(szTemp, ".%X", res);
-				strcat(szCodec, szTemp);
-			}
-
-			if (hvcc->tier_flag) strcat(szCodec, ".H");
-			else strcat(szCodec, ".L");
-			sprintf(szTemp, "%d", hvcc->level_idc);
-			strcat(szCodec, szTemp);
-
-			c = hvcc->progressive_source_flag << 7;
-			c |= hvcc->interlaced_source_flag << 6;
-			c |= hvcc->non_packed_constraint_flag << 5;
-			c |= hvcc->frame_only_constraint_flag << 4;
-			c |= (hvcc->constraint_indicator_flags >> 40);
-			sprintf(szTemp, ".%X", c);
-			strcat(szCodec, szTemp);
-			if (hvcc->constraint_indicator_flags & 0xFFFFFFFF) {
-				c = (hvcc->constraint_indicator_flags >> 32) & 0xFF;
-				sprintf(szTemp, ".%X", c);
-				strcat(szCodec, szTemp);
-				if (hvcc->constraint_indicator_flags & 0x00FFFFFF) {
-					c = (hvcc->constraint_indicator_flags >> 24) & 0xFF;
-					sprintf(szTemp, ".%X", c);
-					strcat(szCodec, szTemp);
-					if (hvcc->constraint_indicator_flags & 0x0000FFFF) {
-						c = (hvcc->constraint_indicator_flags >> 16) & 0xFF;
-						sprintf(szTemp, ".%X", c);
-						strcat(szCodec, szTemp);
-						if (hvcc->constraint_indicator_flags & 0x000000FF) {
-							c = (hvcc->constraint_indicator_flags >> 8) & 0xFF;
-							sprintf(szTemp, ".%X", c);
-							strcat(szCodec, szTemp);
-							c = (hvcc->constraint_indicator_flags ) & 0xFF;
-							sprintf(szTemp, ".%X", c);
-							strcat(szCodec, szTemp);
-						}
-					}
-				}
-			}
+			e = rfc_6381_get_codec_hevc(szCodec, subtype, hvcc);
 			gf_odf_hevc_cfg_del(hvcc);
-		} else {
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+			return e;
 		}
-		return GF_OK;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("HEVCConfig not compliant\n"));
+		return GF_ISOM_INVALID_FILE;
+#else
+		return GF_NOT_SUPPORTED;
 #endif
 
 #if !defined(GPAC_DISABLE_AV1) && !defined(GPAC_DISABLE_AV_PARSERS)
-	case GF_ISOM_SUBTYPE_AV01: {
-		GF_AV1Config *av1c;
-		AV1State av1_state;
-		u32 i = 0;
-
-		gf_av1_init_state(&av1_state);
-		av1c = gf_isom_av1_config_get(movie, track, 1);
-		if (!av1c) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] No config found for AV1 file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
-			return GF_BAD_PARAM;
-		}
-		av1_state.config = av1c;
-
-		for (i = 0; i < gf_list_count(av1c->obu_array); ++i) {
-			GF_Err e;
-			GF_AV1_OBUArrayEntry *a = gf_list_get(av1c->obu_array, i);
-			GF_BitStream *bs = gf_bs_new(a->obu, a->obu_length, GF_BITSTREAM_READ);
-			if (!av1_is_obu_header(a->obu_type))
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOM Tools] AV1: unexpected obu_type %d when computing RFC6381. PArsing anyway.\n", a->obu_type, gf_4cc_to_str(subtype)));
-
-			e = aom_av1_parse_temporal_unit_from_section5(bs, &av1_state);
-			gf_bs_del(bs);
-
-			if (e) {
-				gf_odf_av1_cfg_del(av1c);
-				gf_av1_reset_state(&av1_state, GF_TRUE);
-				return e;
-			}
-		}
-
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%01u.%u%c.%u.%01u.%01u%01u%01u", gf_4cc_to_str(subtype),
-			av1_state.config->seq_profile, av1_state.config->seq_level_idx_0, av1_state.config->seq_tier_0 ? 'H' : 'M',
-			av1_state.bit_depth, av1_state.config->monochrome,
-			av1_state.config->chroma_subsampling_x, av1_state.config->chroma_subsampling_y,
-			av1_state.config->chroma_subsampling_x && av1_state.config->chroma_subsampling_y ? av1_state.config->chroma_sample_position : 0);
-
-		if (av1_state.color_description_present_flag) {
-			char tmp[RFC6381_CODEC_NAME_SIZE_MAX];
-			snprintf(tmp, RFC6381_CODEC_NAME_SIZE_MAX, "%01u.%01u.%01u.%01u", av1_state.color_primaries, av1_state.transfer_characteristics, av1_state.matrix_coefficients, av1_state.color_range);
-			strcat(szCodec, tmp);
-		} else {
-			if ((av1_state.color_primaries == 2) && (av1_state.transfer_characteristics == 2) && (av1_state.matrix_coefficients == 2) && av1_state.color_range == GF_FALSE) {
-
-			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[AV1] incoherent color characteristics primaries %d transfer %d matrix %d color range %d\n", av1_state.color_primaries, av1_state.transfer_characteristics, av1_state.matrix_coefficients, av1_state.color_range));
+	case GF_ISOM_SUBTYPE_AV01:
+	{
+		GF_AV1Config *av1c = gf_isom_av1_config_get(movie, track, 1);
+		if (av1c) {
+			u32 colour_type;
+			COLR colr;
+			memset(&colr, 0, sizeof(colr));
+			if (GF_OK == gf_isom_get_color_info(movie, track, 1, &colour_type, &colr.colour_primaries, &colr.transfer_characteristics, &colr.matrix_coefficients, &colr.full_range)) {
+				colr.override = GF_TRUE;
 			}
+			e = rfc_6381_get_codec_av1(szCodec, subtype, av1c, colr);
+			gf_odf_av1_cfg_del(av1c);
+			return e;
 		}
-
-		gf_odf_av1_cfg_del(av1c);
-		gf_av1_reset_state(&av1_state, GF_TRUE);
-		return GF_OK;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ISOM Tools] No config found for AV1 file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+		return GF_BAD_PARAM;
 	}
 #endif /*!defined(GPAC_DISABLE_AV1) && !defined(GPAC_DISABLE_AV_PARSERS)*/
 
@@ -3805,46 +4272,149 @@
 	case GF_ISOM_SUBTYPE_VP09:
 	{
 		GF_VPConfig *vpcc = gf_isom_vp_config_get(movie, track, 1);
-		if (!vpcc) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
-			return GF_BAD_PARAM;
+		if (vpcc) {
+			u32 colour_type;
+			COLR colr;
+			memset(&colr, 0, sizeof(colr));
+			if (GF_OK == gf_isom_get_color_info(movie, track, 1, &colour_type, &colr.colour_primaries, &colr.transfer_characteristics, &colr.matrix_coefficients, &colr.full_range)) {
+				colr.override = GF_TRUE;
+			}
+			e = rfc_6381_get_codec_vpx(szCodec, subtype, vpcc, colr);
+			gf_odf_vp_cfg_del(vpcc);
+			return e;
 		}
-
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02u.%02x.%02u.%02u.%02u.%02u.%02u.%02u", gf_4cc_to_str(subtype),
-			vpcc->profile,
-			vpcc->level,
-			vpcc->bit_depth,
-			vpcc->chroma_subsampling,
-			vpcc->colour_primaries,
-			vpcc->transfer_characteristics,
-			vpcc->matrix_coefficients,
-			vpcc->video_fullRange_flag);
-
-		gf_odf_vp_cfg_del(vpcc);
-		return GF_OK;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ISOM Tools] No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+		return GF_BAD_PARAM;
 	}
 
 	case GF_ISOM_SUBTYPE_DVHE:
+	case GF_ISOM_SUBTYPE_DVH1:
+	case GF_ISOM_SUBTYPE_DVA1:
+	case GF_ISOM_SUBTYPE_DVAV:
+	case GF_ISOM_SUBTYPE_DAV1:
 	{
 		GF_DOVIDecoderConfigurationRecord *dovi = gf_isom_dovi_config_get(movie, track, 1);
 		if (!dovi) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] No config found for Dolby Vision file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
-			return GF_BAD_PARAM;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[ISOM Tools] No config found for Dolby Vision file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02u.%02u", gf_4cc_to_str(subtype),
-			dovi->dv_profile, dovi->dv_level);
-
+		e = rfc_6381_get_codec_dolby_vision(szCodec, subtype, dovi);
 		gf_odf_dovi_cfg_del(dovi);
-		return GF_OK;
+		return e;
+	}
+
+	case GF_ISOM_SUBTYPE_VVC1:
+	case GF_ISOM_SUBTYPE_VVI1:
+	{
+		GF_VVCConfig *vvcc = gf_isom_vvc_config_get(movie, track, 1);
+		if (vvcc) {
+			if (force_inband) subtype = GF_ISOM_SUBTYPE_VVI1;
+
+			e = rfc_6381_get_codec_vvc(szCodec, subtype, vvcc);
+			gf_odf_vvc_cfg_del(vvcc);
+			return e;
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ISOM Tools] No config found for VVC file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+		return GF_BAD_PARAM;
+	}
+
+	case GF_ISOM_SUBTYPE_MH3D_MHA1:
+	case GF_ISOM_SUBTYPE_MH3D_MHA2:
+	case GF_ISOM_SUBTYPE_MH3D_MHM1:
+	case GF_ISOM_SUBTYPE_MH3D_MHM2:
+	{
+		esd = gf_media_map_esd(movie, track, 1);
+		if (!esd || !esd->decoderConfig || !esd->decoderConfig->decoderSpecificInfo
+			|| !esd->decoderConfig->decoderSpecificInfo->data
+		) {
+			e = rfc_6381_get_codec_mpegha(szCodec, subtype, NULL, 0, -1);
+		} else {
+			e = rfc_6381_get_codec_mpegha(szCodec, subtype, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, -1);
+		}
+		if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
+		return e;
 	}
 
 	default:
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] codec parameters not known - setting codecs string to default value \"%s\"\n", gf_4cc_to_str(subtype) ));
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		return GF_OK;
+		return rfc6381_codec_name_default(szCodec, subtype, gf_codec_id_from_isobmf(subtype));
+
 	}
 	return GF_OK;
 }
 
+
+GF_Err gf_media_av1_layer_size_get(GF_ISOFile *file, u32 trackNumber, u32 sample_number, u8 op_index, u32 layer_size[3])
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	u32 i;
+	AV1State av1;
+	ObuType obu_type;
+	u64 obu_size = 0;
+	u32 hdr_size;
+	GF_BitStream *bs;
+	u32 sdidx;
+	GF_ISOSample *samp;
+	GF_Err e = GF_OK;
+
+	samp = gf_isom_get_sample(file, trackNumber, sample_number, &sdidx);
+	if (!samp) return GF_BAD_PARAM;
+
+	if (!sdidx) {
+		gf_isom_sample_del(&samp);
+		return GF_BAD_PARAM;
+	}
+	if (gf_isom_get_media_subtype(file, trackNumber, sdidx) != GF_ISOM_SUBTYPE_AV01) {
+		gf_isom_sample_del(&samp);
+		return GF_BAD_PARAM;
+	}
+
+	gf_av1_init_state(&av1);
+	av1.config = gf_isom_av1_config_get(file, trackNumber, sdidx);
+	if (!av1.config) {
+		gf_isom_sample_del(&samp);
+		return GF_ISOM_INVALID_FILE;
+	}
+
+	for (i=0; i<gf_list_count(av1.config->obu_array); i++) {
+		GF_AV1_OBUArrayEntry *obu = gf_list_get(av1.config->obu_array, i);
+		bs = gf_bs_new(obu->obu, (u32) obu->obu_length, GF_BITSTREAM_READ);
+		e = gf_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, &av1);
+		gf_bs_del(bs);
+		if (e) break;
+	}
+
+	if (!e) {
+		bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+		while (gf_bs_available(bs)) {
+			e = gf_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, &av1);
+			if (e) break;
+		}
+		gf_bs_del(bs);
+	}
+	gf_isom_sample_del(&samp);
+
+ if (op_index > av1.operating_points_count) {
+ if (av1.config) gf_odf_av1_cfg_del(av1.config);
+ gf_av1_reset_state(&av1, GF_TRUE);
+ return GF_BAD_PARAM;
+ }
+
+	for (i=0; i<3; i++) {
+		if (av1.layer_size[i+1]==av1.layer_size[i]) {
+			layer_size[i] = 0;
+		} else {
+			layer_size[i] = av1.layer_size[i];
+		}
+	}
+
+	if (av1.config) gf_odf_av1_cfg_del(av1.config);
+	gf_av1_reset_state(&av1, GF_TRUE);
+
+	return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
 #endif //GPAC_DISABLE_ISOM

gpac-1.0.1.tar.gz/src/media_tools/m2ts_mux.c -> gpac-2.0.0.tar.gz/src/media_tools/m2ts_mux.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre , Cyril Concolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / MPEG2-TS multiplexer sub-project
@@ -57,7 +57,6 @@
 	GF_SEG_BOUNDARY_FORCE_PCR,
 };
 
-
 static GFINLINE Bool gf_m2ts_time_less(GF_M2TS_Time *a, GF_M2TS_Time *b) {
 	if (a->sec>b->sec) return GF_FALSE;
 	if (a->sec==b->sec) return (a->nanosec<b->nanosec) ? GF_TRUE : GF_FALSE;
@@ -717,6 +716,9 @@
 	return 0;
 }
 
+static void gf_m2ts_program_stream_format_updated(GF_M2TS_Mux_Stream *stream);
+static s32 gf_m2ts_find_stream(GF_M2TS_Mux_Program *program, u32 pid, u32 stream_id, GF_M2TS_Mux_Stream **out_stream);
+
 u32 gf_m2ts_stream_process_pmt(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
 {
 	if (stream->table_needs_update) { /* generate table payload */
@@ -730,6 +732,12 @@
 		if (!stream->program->pcr)
 			abort();
 
+		es = stream->program->streams;
+		while (es) {
+			gf_m2ts_program_stream_format_updated(es);
+			es = es->next;
+		}
+
 		bs = gf_bs_new(NULL,0,GF_BITSTREAM_WRITE);
 		gf_bs_write_int(bs,	0x7, 3); // reserved
 		gf_bs_write_int(bs,	stream->program->pcr->pid, 13);
@@ -798,32 +806,67 @@
 				gf_bs_write_data(bs, desc->data, desc->data_len);
 			}
 		}
-
 		es = stream->program->streams;
 		while (es) {
+			u32 force_reg = 0;
 			Bool has_lang = GF_FALSE;
 			u32 es_info_length = 0;
 			u8 type = es->mpeg2_stream_type;
 			nb_streams++;
+			GF_AVCConfig *avcc = NULL;
+			GF_HEVCConfig *hvcc = NULL;
 
 			switch (es->mpeg2_stream_type) {
 			case GF_M2TS_AUDIO_AC3:
-			case GF_M2TS_VIDEO_VC1:
+			case GF_M2TS_AUDIO_EC3:
+				//reg desc
 				es_info_length += 2 + 4;
+				//AC3/EC3 desc
+				es_info_length += 2;
 				type = GF_M2TS_PRIVATE_DATA;
 				break;
-			case GF_M2TS_AUDIO_EC3:
-				es_info_length += 2;
+			case GF_M2TS_VIDEO_VC1:
+			case GF_M2TS_AUDIO_DTS:
+			case GF_M2TS_AUDIO_OPUS:
+				//reg desc
+				es_info_length += 2 + 4;
 				type = GF_M2TS_PRIVATE_DATA;
 				break;
+			case GF_M2TS_VIDEO_HEVC:
+			case GF_M2TS_VIDEO_H264:
+				//check dv
+				if (es->ifce->caps & GF_ESI_FORCE_DOLBY_VISION) {
+					type = GF_M2TS_PRIVATE_DATA;
+					force_reg = GF_M2TS_RA_STREAM_DOVI;
+					//reg desc
+					es_info_length += 2 + 4;
+				}
+
+				if (es->ifce->dv_info[0]) {
+					u32 dv_len = 5;
+					if (! (es->ifce->dv_info[3] & 0x1)) dv_len+=2;
+					es_info_length += 2 + dv_len;
+				}
+				break;
 			default:
 				if (es->force_reg_desc) {
-					es_info_length += 2 + 4 + 4;
+					es_info_length += 2 + 4;
+					if (!es->ifce->ra_code)
+						es_info_length += 4;
 					type = GF_M2TS_PRIVATE_DATA;
 				}
 				break;
 			}
 
+			if (es->ifce->decoder_config && (es->mpeg2_stream_type==GF_M2TS_VIDEO_H264)) {
+				avcc = gf_odf_avc_cfg_read(es->ifce->decoder_config, es->ifce->decoder_config_size);
+				if (avcc) es_info_length += 6;
+			}
+			if (es->ifce->decoder_config && (es->mpeg2_stream_type==GF_M2TS_VIDEO_HEVC) && !es->ifce->depends_on_stream) {
+				hvcc = gf_odf_hevc_cfg_read(es->ifce->decoder_config, es->ifce->decoder_config_size, GF_FALSE);
+				if (hvcc) es_info_length += 15;
+			}
+
 			gf_bs_write_int(bs,	type, 8);
 			gf_bs_write_int(bs,	0x7, 3); // reserved
 			gf_bs_write_int(bs,	es->pid, 13);
@@ -864,37 +907,115 @@
 				gf_bs_write_int(bs,	es->ifce->lang & 0xFF, 8);
 			}
 
+			//AVC descriptor
+			if (avcc) {
+				gf_bs_write_int(bs,	GF_M2TS_AVC_VIDEO_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	4, 8);
+				gf_bs_write_u8(bs, avcc->AVCProfileIndication);
+				gf_bs_write_u8(bs, avcc->profile_compatibility);
+				gf_bs_write_u8(bs, avcc->AVCLevelIndication);
+				gf_bs_write_u8(bs, 0);
+				gf_odf_avc_cfg_del(avcc);
+			}
+			//HEVC descriptor
+			if (hvcc) {
+				gf_bs_write_int(bs,	GF_M2TS_HEVC_VIDEO_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	13, 8);
+				gf_bs_write_int(bs, hvcc->profile_space, 2);
+				gf_bs_write_int(bs, hvcc->tier_flag, 1);
+				gf_bs_write_int(bs, hvcc->profile_idc, 5);
+				gf_bs_write_u32(bs, hvcc->general_profile_compatibility_flags);
+				gf_bs_write_int(bs, hvcc->progressive_source_flag, 1);
+				gf_bs_write_int(bs, hvcc->interlaced_source_flag, 1);
+				gf_bs_write_int(bs, hvcc->non_packed_constraint_flag, 1);
+				gf_bs_write_int(bs, hvcc->frame_only_constraint_flag, 1);
+				gf_bs_write_long_int(bs, hvcc->constraint_indicator_flags, 44);
+				gf_bs_write_int(bs, hvcc->level_idc, 8);
+				gf_bs_write_int(bs, 0, 1);//temporal subset
+				gf_bs_write_int(bs, 0, 1);//still present
+				gf_bs_write_int(bs, 0, 1);//24h present
+				gf_bs_write_int(bs, 1, 1);//sub_pic_hrd_params_not_present_flag: we don't know, set to 1
+				gf_bs_write_int(bs, 0, 2);//reserved
+				gf_bs_write_int(bs, 2, 2);//HDR_WCG_idc
+				gf_odf_hevc_cfg_del(hvcc);
+			}
+
 			switch (es->mpeg2_stream_type) {
 			case GF_M2TS_AUDIO_AC3:
+				gf_bs_write_int(bs,	GF_M2TS_DVB_AC3_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	0, 8); //todo
+				//also write reg desc
 				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8);
 				gf_bs_write_int(bs,	4, 8);
-				gf_bs_write_int(bs,	'A', 8);
-				gf_bs_write_int(bs,	'C', 8);
-				gf_bs_write_int(bs,	'-', 8);
-				gf_bs_write_int(bs,	'3', 8);
+				gf_bs_write_u32(bs,	GF_M2TS_RA_STREAM_AC3);
 				break;
 			case GF_M2TS_VIDEO_VC1:
 				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8);
 				gf_bs_write_int(bs,	4, 8);
-				gf_bs_write_int(bs,	'V', 8);
-				gf_bs_write_int(bs,	'C', 8);
-				gf_bs_write_int(bs,	'-', 8);
-				gf_bs_write_int(bs,	'1', 8);
+				gf_bs_write_u32(bs,	GF_M2TS_RA_STREAM_VC1);
 				break;
 			case GF_M2TS_AUDIO_EC3:
 				gf_bs_write_int(bs,	GF_M2TS_DVB_EAC3_DESCRIPTOR, 8);
-				gf_bs_write_int(bs,	0, 8); //check what is in this desc
+				gf_bs_write_int(bs,	0, 8); //todo
+
+				//also write reg desc
+				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	4, 8);
+				gf_bs_write_u32(bs,	GF_M2TS_RA_STREAM_EAC3);
+				break;
+			case GF_M2TS_AUDIO_DTS:
+				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	4, 8);
+				gf_bs_write_u32(bs,	GF_M2TS_RA_STREAM_DTS3);
+				break;
+			case GF_M2TS_AUDIO_OPUS:
+				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	4, 8);
+				gf_bs_write_u32(bs,	GF_M2TS_RA_STREAM_OPUS);
 				break;
 			default:
 				if (es->force_reg_desc && es->ifce && es->ifce->codecid) {
 					gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8);
-					gf_bs_write_int(bs,	8, 8);
-					gf_bs_write_int(bs,	GF_M2TS_RA_STREAM_GPAC, 32);
-					gf_bs_write_int(bs,	es->ifce->codecid, 32);
+					if (es->ifce->ra_code) {
+						gf_bs_write_int(bs,	4, 8);
+						gf_bs_write_int(bs,	es->ifce->ra_code, 32);
+					} else {
+						gf_bs_write_int(bs,	8, 8);
+						gf_bs_write_int(bs,	GF_M2TS_RA_STREAM_GPAC, 32);
+						gf_bs_write_int(bs,	es->ifce->codecid, 32);
+					}
 				}
 				break;
 			}
 
+			if (force_reg) {
+				//also write reg desc
+				gf_bs_write_int(bs,	GF_M2TS_REGISTRATION_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	4, 8);
+				gf_bs_write_u32(bs,	force_reg);
+			}
+
+			if (es->ifce->dv_info[0]) {
+				u32 len = 5;
+				if (! (es->ifce->dv_info[3] & 0x1)) len+=2;
+
+				gf_bs_write_int(bs,	GF_M2TS_DOLBY_VISION_DESCRIPTOR, 8);
+				gf_bs_write_int(bs,	len, 8);
+				gf_bs_write_u8(bs, es->ifce->dv_info[0]);
+				gf_bs_write_u8(bs, es->ifce->dv_info[1]);
+				gf_bs_write_u8(bs, es->ifce->dv_info[2]);
+				gf_bs_write_u8(bs, es->ifce->dv_info[3]);
+				//base later not present
+				if (! (es->ifce->dv_info[3] & 0x1)) {
+					GF_M2TS_Mux_Stream *base_st = NULL;
+					gf_m2ts_find_stream(es->program, 0, es->ifce->depends_on_stream, &base_st);
+					gf_bs_write_int(bs, base_st ? base_st->pid : 0, 13);
+					gf_bs_write_int(bs, 0, 3);
+				}
+				//4bits compatid + 4 bits 0
+				gf_bs_write_u8(bs, es->ifce->dv_info[4]);
+			}
+
 			if (es->loop_descriptors)
 			{
 				for (i=0; i<gf_list_count(es->loop_descriptors); i++)
@@ -931,14 +1052,14 @@
 	u64 pcr_offset;
 
 	if (*dts > *cts) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: DTS "LLD" is greater than CTS "LLD" (like ISOBMF CTTSv1 input) - adjusting to CTS\n", stream->pid, *dts, *cts));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: DTS "LLD" is greater than CTS "LLD" (like ISOBMFF CTTSv1 input) - adjusting to CTS\n", stream->pid, *dts, *cts));
 		*dts = *cts;
 	}
 
 	/*Rescale our timestamps and express them in PCR*/
 	if (stream->ts_scale.den) {
-		*cts = *cts * stream->ts_scale.num / stream->ts_scale.den ;
-		*dts = *dts * stream->ts_scale.num / stream->ts_scale.den ;
+		*cts = gf_timestamp_rescale(*cts, stream->ts_scale.den, stream->ts_scale.num);
+		*dts = gf_timestamp_rescale(*dts, stream->ts_scale.den, stream->ts_scale.num);
 		if (duration) *duration = (u32)( *duration * stream->ts_scale.num / stream->ts_scale.den ) ;
 	}
 	if (!stream->program->initial_ts_set) {
@@ -1052,6 +1173,8 @@
 	return 1;
 }
 
+
+
 static u32 gf_m2ts_stream_process_pes(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
 {
 	u64 time_inc;
@@ -1149,13 +1272,25 @@
 					stream->program->pcr_init_time = gf_rand();
 			}
 
+			if (stream->program->pcr_offset==(u64)-1) {
+				stream->program->pcr_offset = 0;
+				if (muxer->fixed_rate) {
+					//estimate frame send time in 90khz
+					u64 r = (stream->curr_pck.data_len * 8);
+					r *= 90000;
+					r /= muxer->bit_rate;
+					r *= 5; //assume 5 frames of offset
+					stream->program->pcr_offset = r;
+				}
+			}
+
 			if (stream->program->force_first_pts) {
 				u64 first_pts = stream->curr_pck.cts;
 				u64 first_dts = stream->curr_pck.dts;
 
 				if (stream->ts_scale.den) {
-					first_pts = first_pts * stream->ts_scale.num / stream->ts_scale.den;
-					first_dts = first_dts * stream->ts_scale.num / stream->ts_scale.den;
+					first_pts = gf_timestamp_rescale(first_pts, stream->ts_scale.den, stream->ts_scale.num);
+					first_dts = gf_timestamp_rescale(first_dts, stream->ts_scale.den, stream->ts_scale.num);
 				}
 
 				/*the final PTS is computed by:
@@ -1189,7 +1324,7 @@
 			stream->program->ts_time_at_pcr_init = muxer->time;
 			stream->program->num_pck_at_pcr_init = muxer->tot_pck_sent;
 
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Initializing PCR for program number %d: PCR %d - mux time %d:%09d\n", stream->pid, stream->program->number, stream->program->pcr_init_time, muxer->time.sec, muxer->time.nanosec));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Initializing PCR for program number %d: PCR %d - mux time %d:%09d\n", stream->pid, stream->program->number, stream->program->pcr_init_time, muxer->time.sec, muxer->time.nanosec));
 		} else {
 			/*PES has been sent, discard internal buffer*/
 			if (stream->discard_data) gf_free(stream->curr_pck.data);
@@ -1277,7 +1412,7 @@
 
 		/*same mux config = 0 (refresh aac config)*/
 		next_time = gf_sys_clock();
-		if (stream->ifce->decoder_config && (stream->latm_last_aac_time + stream->ifce->repeat_rate < next_time)) {
+		if (stream->ifce->decoder_config && (stream->latm_last_aac_time + stream->refresh_rate_ms < next_time)) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 			GF_M4ADecSpecInfo cfg;
 #endif
@@ -1334,6 +1469,7 @@
 	break;
 	/*perform ADTS encapsulation*/
 	case GF_M2TS_AUDIO_AAC:
+	case GF_M2TS_HLS_AAC_CRYPT:
 		if (stream->ifce->decoder_config) {
 			GF_BitStream *bs;
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -1352,7 +1488,10 @@
 			gf_bs_write_int(bs, cfg.base_object_type-1, 2);
 			gf_bs_write_int(bs, cfg.base_sr_index, 4);
 			gf_bs_write_int(bs, 0, 1);
-			gf_bs_write_int(bs, cfg.nb_chan, 3);
+			if (cfg.program_config_element_present)
+				gf_bs_write_int(bs, 0, 3);
+			else
+				gf_bs_write_int(bs, cfg.chan_cfg, 3);
 #else
 			gf_bs_write_int(bs, GF_M4A_AAC_LC-1, 2);
 			gf_bs_write_int(bs, 1, 4); //FIXME
@@ -1363,15 +1502,27 @@
 			gf_bs_write_int(bs, 0, 4);
 			gf_bs_write_int(bs, 7+stream->curr_pck.data_len, 13);
 			gf_bs_write_int(bs, 0x7FF, 11);
-			gf_bs_write_int(bs, 0, 2);
+
+			/*base reframe overhead*/
+			stream->reframe_overhead = 7;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+			if (cfg.program_config_element_present) {
+				gf_bs_write_int(bs, 2, 2);
+
+				u32 cpe_size = (u32) gf_bs_get_position(bs);
+				gf_m4a_write_program_config_element_bs(bs, &cfg);
+				stream->reframe_overhead += (u32) gf_bs_get_position(bs) - cpe_size;
+			} else
+#endif
+				gf_bs_write_int(bs, 0, 2);
+
 
 			gf_bs_write_data(bs, stream->curr_pck.data, stream->curr_pck.data_len);
 			gf_bs_align(bs);
 			gf_free(stream->curr_pck.data);
 			gf_bs_get_content(bs, &stream->curr_pck.data, &stream->curr_pck.data_len);
 			gf_bs_del(bs);
-			/*constant reframe overhead*/
-			stream->reframe_overhead = 7;
 		}
 		/*since we reallocated the packet data buffer, force a discard in pull mode*/
 		stream->discard_data = GF_TRUE;
@@ -1399,6 +1550,17 @@
 	stream->time = stream->program->ts_time_at_pcr_init;
 	time_inc = stream->curr_pck.dts - stream->program->pcr_init_time/300;
 
+	/* CBR, estimate number of packets required to send => time in mux rate, and offset send time*/
+	if (muxer->fixed_rate) {
+		u64 clock_diff = (stream->curr_pck.data_len * 188 / 184 + 188) * 8;
+		clock_diff *= 90000;
+		clock_diff /= muxer->bit_rate;
+		if (time_inc > clock_diff)
+			time_inc -= clock_diff;
+		else
+			time_inc = 0;
+	}
+
 	gf_m2ts_time_inc(&stream->time, time_inc, 90000);
 
 	if (stream == stream->program->pcr) {
@@ -1457,6 +1619,7 @@
 	Bool ignore_next = GF_FALSE;
 	stream->next_payload_size = 0;
 	stream->next_next_payload_size = 0;
+	stream->next_next_next_payload_size = 0;
 
 	stream->next_pck_flags = 0;
 	stream->next_pck_sap = 0;
@@ -1490,8 +1653,11 @@
 			if (!stream->pck_first->next && stream->ifce->input_ctrl) stream->ifce->input_ctrl(stream->ifce, GF_ESI_INPUT_DATA_FLUSH, NULL);
 			if (stream->pck_first->next) {
 				stream->next_next_payload_size = stream->pck_first->next->data_len;
+				if (!stream->pck_first->next->next && stream->ifce->input_ctrl) stream->ifce->input_ctrl(stream->ifce, GF_ESI_INPUT_DATA_FLUSH, NULL);
+				if (stream->pck_first->next->next) {
+					stream->next_next_next_payload_size = stream->pck_first->next->next->data_len;
+				}
 			}
-
 		}
 	}
 	/*consider we don't have the next AU if:
@@ -1515,8 +1681,12 @@
 
 	if (stream->next_payload_size) {
 		stream->next_payload_size += stream->reframe_overhead;
-		if (stream->next_next_payload_size)
+		if (stream->next_next_payload_size) {
 			stream->next_next_payload_size += stream->reframe_overhead;
+			if (stream->next_next_next_payload_size) {
+				stream->next_next_next_payload_size += stream->reframe_overhead;
+			}
+		}
 
 		gf_m2ts_remap_timestamps_for_pes(stream, stream->next_pck_flags, &stream->next_pck_dts, &stream->next_pck_cts, NULL);
 
@@ -1556,6 +1726,13 @@
 		else if (stream->next_payload_size) {
 			/*how much more TS packets do we need to send next AU ?*/
 			while (ts_bytes < pck_size + stream->next_payload_size) {
+				//check we have enough bytes in the next 3 AUs if we increase by 1 TS packet the PES
+				//bytes_to_copy from next will be: ts_bytes + 184 - pck_size
+				//check bytes_to_copy is <= next_payload_size + next_next_payload_size + next_next_next_payload_size
+				//if not, do not add - we do not want to take the risk of having no data while filling a PES packet with an announced length
+				if (ts_bytes + 184 > pck_size + stream->next_payload_size + stream->next_next_payload_size + stream->next_next_next_payload_size)
+					break;
+
 				ts_bytes += 184;
 			}
 			/*don't end next AU in next PES if we don't want to start 2 AUs in one PES
@@ -1573,6 +1750,10 @@
 		/*that's how much bytes we copy from the following AUs*/
 		if (ts_bytes >= pck_size) {
 			stream->copy_from_next_packets = ts_bytes - pck_size;
+			//very low rate case, we didn't enter the previous while loop:
+			//we can't fill the complete TS packet with the next two AUs, do not copy over
+			if (stream->copy_from_next_packets > stream->next_payload_size + stream->next_next_payload_size + stream->next_next_next_payload_size)
+				stream->copy_from_next_packets = 0;
 		} else {
 			u32 skipped = pck_size-ts_bytes;
 			if (stream->pes_data_len > skipped)
@@ -1909,7 +2090,7 @@
 				}
 			}
 
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Inserted PCR "LLD" (%d @90kHz) at mux time %d:%09d\n", pcr, (u32) (pcr/300), stream->program->mux->time.sec, stream->program->mux->time.nanosec ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Inserted PCR "LLD" (%d @90kHz) at mux time %d:%09d\n", pcr, (u32) (pcr/300), stream->program->mux->time.sec, stream->program->mux->time.nanosec ));
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] PCR diff to STB in ms %d - sys clock diff in ms %d - DTS diff %d\n", (u32) (pcr - stream->program->last_pcr) / 27000, now - stream->program->sys_clock_at_last_pcr, (stream->curr_pck.dts - stream->program->last_dts)/90));
 
 			stream->program->sys_clock_at_last_pcr = now;
@@ -1951,8 +2132,12 @@
 	assert(stream->pes_data_remain >= payload_to_copy);
 	stream->pes_data_remain -= payload_to_copy;
 
-	/*update stream time, including headers*/
-	gf_m2ts_time_inc(&stream->time, 1504/*188*8*/, stream->program->mux->bit_rate);
+	/*update stream time, including headers
+	Note that we don't do that if mux is not operating in fixed rate because the rate can be wrong (way too low)
+	causing time to increase too fast on IDRs
+	*/
+	if (stream->program->mux->fixed_rate)
+		gf_m2ts_time_inc(&stream->time, 1504/*188*8*/, stream->program->mux->bit_rate);
 
 	if (stream->pck_offset == stream->curr_pck.data_len) {
 		u64 pcr = gf_m2ts_get_pcr(stream)/300;
@@ -1973,7 +2158,7 @@
 			 stream->time.sec, stream->time.nanosec, stream->program->mux->time.sec, stream->program->mux->time.nanosec
 			 ));
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sent PES: PID %d - DTS "LLD" - PCR "LLD" - stream time %d:%09d - mux time %d:%09d \n",
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sent PES: PID %d - DTS "LLD" - PCR "LLD" - stream time %d:%09d - mux time %d:%09d \n",
 			 stream->pid, stream->curr_pck.dts, pcr,
 			 stream->time.sec, stream->time.nanosec, stream->program->mux->time.sec, stream->program->mux->time.nanosec
 			 ));
@@ -2112,7 +2297,8 @@
 		stream->force_new = (esi_pck->flags & GF_ESI_DATA_AU_END) ? GF_TRUE : GF_FALSE;
 
 		stream->pck_reassembler->data = (char*)gf_realloc(stream->pck_reassembler->data , sizeof(char)*(stream->pck_reassembler->data_len+esi_pck->data_len) );
-		memcpy(stream->pck_reassembler->data + stream->pck_reassembler->data_len, esi_pck->data, esi_pck->data_len);
+		if (esi_pck->data_len)
+			memcpy(stream->pck_reassembler->data + stream->pck_reassembler->data_len, esi_pck->data, esi_pck->data_len);
 		stream->pck_reassembler->data_len += esi_pck->data_len;
 
 		stream->pck_reassembler->flags |= esi_pck->flags;
@@ -2281,37 +2467,10 @@
 	return count;
 }
 
-GF_EXPORT
-GF_M2TS_Mux_Stream *gf_m2ts_program_stream_add(GF_M2TS_Mux_Program *program, struct __elementary_stream_ifce *ifce, u32 pid, Bool is_pcr, Bool force_pes, Bool needs_mutex)
+static void gf_m2ts_program_stream_format_updated(GF_M2TS_Mux_Stream *stream)
 {
-	GF_M2TS_Mux_Stream *stream, *st;
-
-	stream = gf_m2ts_stream_new(pid);
-	stream->ifce = ifce;
-	stream->pid = pid;
-	stream->program = program;
-	if (is_pcr) program->pcr = stream;
-	stream->loop_descriptors = gf_list_new();
-	stream->set_initial_disc = program->initial_disc_set;
-
-	if (program->streams) {
-		/*if PCR keep stream at the beginning*/
-		if (is_pcr) {
-			stream->next = program->streams;
-			program->streams = stream;
-		} else {
-			st = program->streams;
-			while (st->next) st = st->next;
-			st->next = stream;
-		}
-	} else {
-		program->streams = stream;
-	}
-	if (program->pmt) program->pmt->table_needs_update = GF_TRUE;
-	stream->bit_rate = ifce->bit_rate;
-	stream->scheduling_priority = 1;
-
-	stream->force_single_au = (stream->program->mux->au_pes_mode == GF_M2TS_PACK_ALL) ? GF_FALSE : GF_TRUE;
+	struct __elementary_stream_ifce *ifce = stream->ifce;
+	Bool force_pes = stream->force_pes ? GF_TRUE : GF_FALSE;
 
 	switch (ifce->stream_type) {
 	case GF_STREAM_VISUAL:
@@ -2326,7 +2485,10 @@
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_MPEG4;
 			break;
 		case GF_CODECID_AVC:
-			stream->mpeg2_stream_type = GF_M2TS_VIDEO_H264;
+			if (ifce->caps & GF_ESI_STREAM_HLS_SAES)
+				stream->mpeg2_stream_type = GF_M2TS_HLS_AVC_CRYPT;
+			else
+				stream->mpeg2_stream_type = GF_M2TS_VIDEO_H264;
 			/*make sure we send AU delim NALU in same PES as first VCL NAL: 6 bytes (start code + 1 nal hdr + AU delim)
 			+ 4 byte start code + first nal header*/
 			stream->min_bytes_copy_from_next = 11;
@@ -2342,11 +2504,13 @@
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_HEVC;
 			//this is a bit crude and will need refinement
 			if (ifce->depends_on_stream) {
-				GF_M2TS_Mux_Stream *base_st;
-				stream->mpeg2_stream_type = GF_M2TS_VIDEO_HEVC_TEMPORAL;
-				gf_m2ts_stream_add_hierarchy_descriptor(stream);
+				GF_M2TS_Mux_Stream *base_st=NULL;
+				if (! (stream->ifce->caps & GF_ESI_FORCE_DOLBY_VISION)) {
+					stream->mpeg2_stream_type = GF_M2TS_VIDEO_HEVC_TEMPORAL;
+					gf_m2ts_stream_add_hierarchy_descriptor(stream);
+				}
 				stream->force_single_au = GF_TRUE;
-				gf_m2ts_find_stream(program, 0, ifce->depends_on_stream, &base_st);
+				gf_m2ts_find_stream(stream->program, 0, ifce->depends_on_stream, &base_st);
 				if (base_st) base_st->force_single_au = GF_TRUE;
 			}
 
@@ -2383,8 +2547,19 @@
 			stream->mpeg2_stream_id = 0xFA;
 			gf_m2ts_stream_set_default_slconfig(stream);
 			break;
+		case GF_CODECID_VVC:
+			stream->mpeg2_stream_type = GF_M2TS_VIDEO_VVC;
+			/*make sure we send AU delim NALU in same PES as first VCL NAL: 7 bytes (4 start code + 2 nal header + 1 AU delim)
+			+ 4 byte start code + first nal header*/
+			stream->min_bytes_copy_from_next = 12;
+			break;
+		case GF_CODECID_SMPTE_VC1:
+			stream->mpeg2_stream_type = GF_M2TS_VIDEO_VC1;
+			break;
 		default:
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] Unsupported mpeg2-ts video type for codec %s, signaling as PES private using codec 4CC in registration descriptor\n", gf_codecid_name(ifce->codecid) ));
+			if (!ifce->ra_code) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] Unsupported mpeg2-ts video type for codec %s, signaling as PES private using codec 4CC %s in registration descriptor\n", gf_codecid_name(ifce->codecid), gf_4cc_to_str(ifce->codecid) ));
+			}
 
 			stream->mpeg2_stream_type = GF_M2TS_PRIVATE_DATA;
 			stream->force_single_au = GF_TRUE;
@@ -2399,6 +2574,7 @@
 		stream->force_single_au = (stream->program->mux->au_pes_mode == GF_M2TS_PACK_NONE) ? GF_TRUE : GF_FALSE;
 		switch (ifce->codecid) {
 		case GF_CODECID_MPEG_AUDIO:
+		case GF_CODECID_MPEG_AUDIO_L1:
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_MPEG1;
 			break;
 		case GF_CODECID_MPEG2_PART3:
@@ -2410,19 +2586,29 @@
 		case GF_CODECID_AAC_MPEG2_SSRP:
 			if (ifce->caps & GF_ESI_AAC_USE_LATM)
 				stream->mpeg2_stream_type = GF_M2TS_AUDIO_LATM_AAC;
+			else if (ifce->caps & GF_ESI_STREAM_HLS_SAES)
+				stream->mpeg2_stream_type = GF_M2TS_HLS_AAC_CRYPT;
 			else
 				stream->mpeg2_stream_type = GF_M2TS_AUDIO_AAC;
 
-			if (!ifce->repeat_rate) ifce->repeat_rate = 500;
+			stream->refresh_rate_ms = ifce->repeat_rate ? ifce->repeat_rate : 500;
 			break;
 		case GF_CODECID_AC3:
-			stream->mpeg2_stream_type = GF_M2TS_AUDIO_AC3;
+			if (ifce->caps & GF_ESI_STREAM_HLS_SAES)
+				stream->mpeg2_stream_type = GF_M2TS_HLS_AC3_CRYPT;
+			else
+				stream->mpeg2_stream_type = GF_M2TS_AUDIO_AC3;
 			break;
 		case GF_CODECID_EAC3:
-			stream->mpeg2_stream_type = GF_M2TS_AUDIO_EC3;
+			if (ifce->caps & GF_ESI_STREAM_HLS_SAES)
+				stream->mpeg2_stream_type = GF_M2TS_HLS_EC3_CRYPT;
+			else
+				stream->mpeg2_stream_type = GF_M2TS_AUDIO_EC3;
 			break;
 		default:
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] Unsupported mpeg2-ts audio type for codec %s, signaling as PES private using codec 4CC in registration descriptor\n", gf_codecid_name(ifce->codecid) ));
+			if (!ifce->ra_code) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] Unsupported mpeg2-ts audio type for codec %s, signaling as PES private using codec 4CC in registration descriptor\n", gf_codecid_name(ifce->codecid) ));
+			}
 			stream->mpeg2_stream_type = GF_M2TS_PRIVATE_DATA;
 			stream->force_single_au = GF_TRUE;
 			stream->force_reg_desc = GF_TRUE;
@@ -2466,6 +2652,42 @@
 		stream->mpeg2_stream_type = GF_M2TS_METADATA_PES;
 		break;
 	}
+}
+
+GF_EXPORT
+GF_M2TS_Mux_Stream *gf_m2ts_program_stream_add(GF_M2TS_Mux_Program *program, struct __elementary_stream_ifce *ifce, u32 pid, Bool is_pcr, Bool force_pes, Bool needs_mutex)
+{
+	GF_M2TS_Mux_Stream *stream, *st;
+
+	stream = gf_m2ts_stream_new(pid);
+	stream->ifce = ifce;
+	stream->pid = pid;
+	stream->program = program;
+	if (is_pcr) program->pcr = stream;
+	stream->loop_descriptors = gf_list_new();
+	stream->set_initial_disc = program->initial_disc_set;
+
+	if (program->streams) {
+		/*if PCR keep stream at the beginning*/
+		if (is_pcr) {
+			stream->next = program->streams;
+			program->streams = stream;
+		} else {
+			st = program->streams;
+			while (st->next) st = st->next;
+			st->next = stream;
+		}
+	} else {
+		program->streams = stream;
+	}
+	if (program->pmt) program->pmt->table_needs_update = GF_TRUE;
+	stream->bit_rate = ifce->bit_rate;
+	stream->scheduling_priority = 1;
+	stream->force_pes = force_pes ? 1 : 0;
+
+	stream->force_single_au = (stream->program->mux->au_pes_mode == GF_M2TS_PACK_ALL) ? GF_FALSE : GF_TRUE;
+
+	gf_m2ts_program_stream_format_updated(stream);
 
 	if (! (ifce->caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS)) {
 		/*override signaling for all streams except BIFS/OD, to use MPEG-4 PES*/
@@ -2704,6 +2926,11 @@
 		}
 	}
 	stream->next = NULL;
+
+	//if we remove PCR, reassign to first stream
+	if (program->pcr == stream)
+		program->pcr = program->streams;
+
 	gf_m2ts_mux_stream_del(stream);
 	program->pmt->table_needs_update = GF_TRUE;
 }
@@ -2826,6 +3053,67 @@
 	return GF_OK;
 }
 
+/*
+The algo in gf_m2ts_mux_process elects the first stream with lowest time but uses +INF as initial time
+when no realtime nor fixed rate. Regulation is then needed because input may arrive at any time,
+so one stream S1 with input TS1 may be elected to be sent
+while other streams are still waiting for inputs with TSX < TS1. Not regulating would send S1 way too fast.
+This only applies for non real time VBR
+
+We therefore need to check if the stream time is not too ahead of the current mux time.
+However, since the mux time in this mode is set to the stream time of the last stream sent,
+we also need to check the PCR stream:
+- if over, flush everything
+- otherwise, if all non-PCR streams are done or have a stream time >= PCR stream time, the PCR stream can be sent
+- otherwise, the PCR will wait until all non-PCR streams clocks have reached the PCR stream clock
+
+*/
+static Bool gf_m2ts_stream_too_early(GF_M2TS_Mux_Stream *stream, GF_M2TS_Mux *muxer)
+{
+	GF_M2TS_Time t;
+	if (muxer->fixed_rate || muxer->real_time) return GF_FALSE;
+
+	//any stream behind the PCR is not too early
+	if (gf_m2ts_time_less(&stream->time, &stream->program->pcr->time))
+		return GF_FALSE;
+
+	//we consider sending a stream 100ms ahead of current mux time is too early
+	//this is independent of the mux type (realtime, fixed rate)
+	t = stream->time;
+	gf_m2ts_time_inc(&t, 100, 1000);
+	if (!gf_m2ts_time_less(&muxer->time, &t)) {
+		return GF_FALSE;
+	}
+	//if PCR stream is over, flush
+	if (stream->program->pcr->ifce) {
+		if (stream->program->pcr->ifce->caps & (GF_ESI_STREAM_FLUSH|GF_ESI_STREAM_IS_OVER))
+			return GF_FALSE;
+	}
+	//PCR is in pure pcr mode (no associated data), check is any stream is less than PCR
+	if (stream->program->pcr->pcr_only_mode)
+		stream = stream->program->pcr;
+	//if this is the PCR, wait only if some streams in program are behind us
+	if (stream->program->pcr == stream) {
+		GF_M2TS_Mux_Stream *a_stream = stream->program->streams;
+		while (a_stream) {
+			//a_stream time less than stream time, we must wait on stream to process a_stream
+			if ((a_stream != stream)
+				&& a_stream->ifce && !(a_stream->ifce->caps & (GF_ESI_STREAM_FLUSH|GF_ESI_STREAM_IS_OVER))
+				&& gf_m2ts_time_less(&a_stream->time, &stream->time)
+			) {
+				return GF_TRUE;
+			}
+			a_stream = a_stream->next;
+		}
+		return GF_FALSE;
+	}
+	//PCR done or flush, we're not too early
+	else if (stream->program->pcr->ifce && (stream->program->pcr->ifce->caps & (GF_ESI_STREAM_FLUSH|GF_ESI_STREAM_IS_OVER)))
+		return GF_FALSE;
+
+	//not PCR, we're too early
+	return GF_TRUE;
+}
 
 GF_EXPORT
 const u8 *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, GF_M2TSMuxState *status, u32 *usec_till_next)
@@ -2843,7 +3131,7 @@
 	nb_streams = nb_streams_done = 0;
 	*status = GF_M2TS_STATE_IDLE;
 
-	muxer->sap_inserted = GF_FALSE;
+	muxer->sap_inserted = 0;
 	muxer->last_pid = 0;
 
 	now_us = gf_sys_clock_high_res();
@@ -2909,7 +3197,10 @@
 
 		/*PAT*/
 		res = muxer->pat->process(muxer, muxer->pat);
-		if ((res && gf_m2ts_time_less_or_equal(&muxer->pat->time, &time)) || muxer->force_pat) {
+		if ((res && gf_m2ts_time_less_or_equal(&muxer->pat->time, &time))
+			|| muxer->pat->table_needs_send
+			|| muxer->force_pat
+		) {
 			time = muxer->pat->time;
 			stream_to_process = muxer->pat;
 			if (muxer->force_pat) {
@@ -2934,7 +3225,10 @@
 		program = muxer->programs;
 		while (program) {
 			res = program->pmt->process(muxer, program->pmt);
-			if ((res && gf_m2ts_time_less_or_equal(&program->pmt->time, &time)) || (muxer->force_pat_pmt_state==GF_SEG_BOUNDARY_FORCE_PMT)) {
+			if ((res && gf_m2ts_time_less_or_equal(&program->pmt->time, &time))
+				|| program->pmt->table_needs_send
+				|| (muxer->force_pat_pmt_state==GF_SEG_BOUNDARY_FORCE_PMT)
+			) {
 				time = program->pmt->time;
 				stream_to_process = program->pmt;
 				if (muxer->force_pat_pmt_state==GF_SEG_BOUNDARY_FORCE_PMT)
@@ -2980,6 +3274,21 @@
 	program = muxer->programs;
 	while (program) {
 		stream = program->streams;
+
+		//first pass, process all PES and update stream clocks - this is needed for non realtime VBR because gf_m2ts_stream_too_early (below) assumes all
+		//stream times are up to date
+		while (stream) {
+			if (flush_all_pes && !stream->pes_data_remain) {
+				stream->process_res = 0;
+			} else {
+				stream->process_res = stream->process(muxer, stream);
+			}
+			stream = stream->next;
+			continue;
+		}
+
+		//second pass, get earliest PES packet
+		stream = program->streams;
 		while (stream) {
 #if FORCE_PCR_FIRST
 			if (stream != program->pcr)
@@ -2991,14 +3300,18 @@
 					continue;
 				}
 
-				res = stream->process(muxer, stream);
+				res = stream->process_res;
+
 				/*next is rap on this stream, check flushing of other pes (we could use a goto)*/
 				if (!flush_all_pes && muxer->force_pat)
 					return gf_m2ts_mux_process(muxer, status, usec_till_next);
 
 				if (res) {
 					/*always schedule the earliest data*/
-					if (gf_m2ts_time_less(&stream->time, &time)) {
+					if (gf_m2ts_time_less(&stream->time, &time)
+						//we must regulate as input may arrive in burst
+						&& (flush_all_pes || !gf_m2ts_stream_too_early(stream, muxer))
+					) {
 						highest_priority = res;
 						time = stream->time;
 						stream_to_process = stream;
@@ -3050,13 +3363,15 @@
 			gf_m2ts_mux_table_get_next_packet(muxer, stream_to_process, muxer->dst_pck);
 		} else {
 			gf_m2ts_mux_pes_get_next_packet(stream_to_process, muxer->dst_pck);
-			if (stream_to_process->pck_sap_type) {
-				muxer->sap_inserted = GF_TRUE;
-				muxer->sap_type = stream_to_process->pck_sap_type;
-				muxer->sap_time = stream_to_process->pck_sap_time;
+			if (stream_to_process->pid == muxer->ref_pid) {
+				if (stream_to_process->pck_sap_type) {
+					muxer->sap_inserted = GF_TRUE;
+					muxer->sap_type = stream_to_process->pck_sap_type;
+					muxer->sap_time = stream_to_process->pck_sap_time;
+				}
+				muxer->last_pts = stream_to_process->curr_pck.cts;
+				muxer->last_pid = stream_to_process->pid;
 			}
-			muxer->last_pts = stream_to_process->curr_pck.cts;
-			muxer->last_pid = stream_to_process->pid;
 		}
 
 		ret = muxer->dst_pck;
@@ -3078,7 +3393,7 @@
 			muxer->time = muxer->init_ts_time;
 			gf_m2ts_time_inc(&muxer->time, us_diff, 1000000);
 		}
-		/*if a stream was found, use it*/
+		/*if a stream was found, use it - regulation is done by gf_m2ts_stream_too_early*/
 		else if (stream_to_process) {
 			if (gf_m2ts_time_less_or_equal(&muxer->time, &time))
 				muxer->time = time;

gpac-1.0.1.tar.gz/src/media_tools/m3u8.c -> gpac-2.0.0.tar.gz/src/media_tools/m3u8.c Changed

@@ -1,8 +1,8 @@
-/**
+/*
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Pierre Souchay, Jean Le Feuvre, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2010-2012, Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-2022
 *					All rights reserved
 *
 * This file is part of GPAC
@@ -62,7 +62,10 @@
 	char *init_url;
 	char *key_url;
 	bin128 key_iv;
+	Bool has_iv;
 	Bool independent_segments;
+	Bool low_latency, independent_part;
+	u32 discontinuity;
 } s_accumulated_attributes;
 
 
@@ -146,6 +149,8 @@
 	e->duration_info = attribs->duration_in_seconds;
 	e->byte_range_start = attribs->byte_range_start;
 	e->byte_range_end = attribs->byte_range_end;
+	e->low_lat_chunk = attribs->low_latency;
+	e->independent_chunk = attribs->independent_part;
 
 	e->title = (attribs->title ? gf_strdup(attribs->title) : NULL);
 	e->codecs = (attribs->codecs ? gf_strdup(attribs->codecs) : NULL);
@@ -154,10 +159,24 @@
 	e->init_segment_url = attribs->init_url ? gf_strdup(attribs->init_url) : NULL;
 	e->init_byte_range_start = attribs->init_byte_range_start;
 	e->init_byte_range_end = attribs->init_byte_range_end;
-	e->key_uri = (attribs->key_url ? gf_strdup(attribs->key_url) : NULL);
-	memcpy(e->key_iv, attribs->key_iv, sizeof(bin128));
+
+	if (e->drm_method) {
+		e->key_uri = NULL;
+		if (attribs->key_url) {
+			e->key_uri = gf_strdup(attribs->key_url);
+		}
+
+		if (attribs->has_iv) {
+			memcpy(e->key_iv, attribs->key_iv, sizeof(bin128));
+		} else {
+			u32 iv = gf_htonl(attribs->current_media_seq);
+			memset(e->key_iv, 0, sizeof(bin128) );
+			memcpy(e->key_iv + 12, (const void *) &iv, sizeof(iv));
+		}
+	}
 
 	e->utc_start_time = attribs->playlist_utc_timestamp;
+	e->discontinuity = attribs->discontinuity;
 
 	assert(url);
 	e->url = gf_strdup(url);
@@ -425,17 +444,49 @@
 		const char *method = "METHOD=";
 		const size_t method_len = strlen(method);
 		if (safe_start_equals(method, ret[0])) {
-			if (strncmp(ret[0]+method_len, "NONE", 4)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] EXT-X-KEY not supported.\n", line));
+			if (!strncmp(ret[0]+method_len, "NONE", 4)) {
+				attributes->key_method = DRM_NONE;
+				if (attributes->key_url) {
+					gf_free(attributes->key_url);
+					attributes->key_url = NULL;
+				}
+			} else if (!strncmp(ret[0]+method_len, "AES-128", 7)) {
+				attributes->key_method = DRM_AES_128;
+			} else if (!strncmp(ret[0]+method_len, "SAMPLE-AES", 10)) {
+				attributes->key_method = DRM_CENC;
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] EXT-X-KEY method not recognized.\n"));
 			}
-			attributes->key_method = DRM_AES_128;
 			if (ret[1] != NULL && safe_start_equals("URI=\"", ret[1])) {
 				int_value = (u32) strlen(ret[1]);
 				if (ret[1][int_value-1] == '"') {
 					if (attributes->key_url) gf_free(attributes->key_url);
-					attributes->key_url = gf_strdup(&(ret[1][4]));
+					attributes->key_url = gf_strdup(&(ret[1][5]));
+					if (attributes->key_url) {
+						u32 klen = (u32) strlen(attributes->key_url);
+						attributes->key_url[klen-1] = 0;
+					}
 				}
 			}
+			attributes->has_iv = GF_FALSE;
+			if (ret[2] != NULL && safe_start_equals("IV=", ret[2])) {
+				char *IV = ret[2] + 3;
+				if (!strncmp(IV, "0x", 2)) IV+=2;
+				if (strlen(IV) != 32) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] EXT-X-KEY wrong IV len\n"));
+				} else {
+					for (i=0; i<16; i++) {
+						char szV[3];
+						u32 v;
+						szV[0] = IV[2*i];
+						szV[1] = IV[2*i + 1];
+						szV[2] = 0;
+						sscanf(szV, "%X", &v);
+						attributes->key_iv[i] = v;
+					}
+				}
+				attributes->has_iv = GF_TRUE;
+			}
 		}
 		M3U8_COMPATIBILITY_VERSION(1);
 		return ret;
@@ -548,8 +599,18 @@
 	}
 	ret = extract_attributes("#EXT-X-DISCONTINUITY", line, 0);
 	if (ret) {
-		/* #EXT-X-DISCONTINUITY */
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] EXT-X-DISCONTINUITY not supported.\n", line));
+		attributes->discontinuity = 1;
+		M3U8_COMPATIBILITY_VERSION(1);
+		return ret;
+	}
+	ret = extract_attributes("#EXT-X-DISCONTINUITY-SEQUENCE", line, 0);
+	if (ret) {
+		if (ret[0]) {
+			int_value = (s32)strtol(ret[0], &end_ptr, 10);
+			if (end_ptr != ret[0]) {
+				attributes->discontinuity = int_value;
+			}
+		}
 		M3U8_COMPATIBILITY_VERSION(1);
 		return ret;
 	}
@@ -686,7 +747,23 @@
 		//todo extract I/intra rate for speed adaptation
 		return NULL;
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Unknown line in M3U8 file %s\n", line));
+	if (!strncmp(line, "#EXT-X-PART-INF", strlen("#EXT-X-PART-INF") )) {
+		attributes->low_latency = GF_TRUE;
+		return NULL;
+	}
+	//TODO for now we don't use preload hint
+	if (!strncmp(line, "#EXT-X-SERVER-CONTROL", strlen("#EXT-X-SERVER-CONTROL") )) {
+		return NULL;
+	}
+	//TODO for now we don't use preload hint
+	if (!strncmp(line, "#EXT-X-PRELOAD-HINT", strlen("#EXT-X-PRELOAD-HINT") )) {
+		return NULL;
+	}
+	//TODO for now we don't use preload hint
+	if (!strncmp(line, "#EXT-X-RENDITION-REPORT", strlen("#EXT-X-RENDITION-REPORT") )) {
+		return NULL;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Unsupported directive %s\n", line));
 	return NULL;
 }
 
@@ -696,7 +773,9 @@
 */
 MasterPlaylist* master_playlist_new()
 {
-	MasterPlaylist *pl = (MasterPlaylist*)gf_malloc(sizeof(MasterPlaylist));
+	MasterPlaylist *pl;
+	GF_SAFEALLOC(pl, MasterPlaylist);
+
 	if (pl == NULL)
 		return NULL;
 	pl->streams = gf_list_new();
@@ -768,12 +847,12 @@
 		string2num("coverage");
 	}
 #endif
-	return gf_m3u8_parse_sub_playlist(file, playlist, baseURL, NULL, NULL);
+	return gf_m3u8_parse_sub_playlist(file, playlist, baseURL, NULL, NULL, GF_TRUE);
 }
 
 GF_Err declare_sub_playlist(char *currentLine, const char *baseURL, s_accumulated_attributes *attribs, PlaylistElement *sub_playlist, MasterPlaylist **playlist, Stream *in_stream)
 {
-	u32 i, iv, count;
+	u32 i, count;
 
 	char *fullURL = currentLine;
 
@@ -782,17 +861,8 @@
 		return GF_BAD_PARAM;
 	}
 
-	if (gf_url_is_local(fullURL)) {
-		fullURL = gf_url_concatenate(baseURL, fullURL);
-		assert(fullURL);
-	}
-
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] declaring %s %s\n", attribs->is_master_playlist ? "sub-playlist" : "media segment", fullURL));
 
-	memset(attribs->key_iv, 0, sizeof(bin128) );
-	iv = gf_htonl(attribs->current_media_seq);
-	memcpy(attribs->key_iv + 12, (const void *) &iv, sizeof(iv));
-
 	{
 		PlaylistElement *curr_playlist = sub_playlist;
 		/* First, we have to find the matching stream */
@@ -840,7 +910,6 @@
 		if (attribs->is_master_playlist) {
 			if (curr_playlist != NULL) {
 				//playlist has already been defined - this happens when the same video playlist is defined several times with different audio codecs ...
-				gf_free(fullURL);
 				return GF_OK;
 			}
 			curr_playlist = playlist_element_new(TYPE_PLAYLIST, fullURL, attribs);
@@ -872,6 +941,7 @@
 			/* Normal Playlist */
 			assert((*playlist)->streams);
 			if (curr_playlist == NULL) {
+
 				/* This is a "normal" playlist without any element in it */
 				PlaylistElement *subElement;
 				assert(baseURL);
@@ -885,7 +955,12 @@
 				assert(fullURL);
 				assert(curr_playlist->url && !curr_playlist->codecs);
 				curr_playlist->codecs = NULL;
+
 				subElement = playlist_element_new(TYPE_UNKNOWN, fullURL, attribs);
+				if (attribs->init_url) {
+					gf_free(attribs->init_url);
+					attribs->init_url = NULL;
+				}
 				if (subElement == NULL) {
 					gf_m3u8_master_playlist_del(playlist);
 					playlist_element_del(curr_playlist);
@@ -930,6 +1005,7 @@
 		}
 		curr_playlist->element.playlist.media_seq_min = attribs->min_media_sequence;
 		curr_playlist->element.playlist.media_seq_max = attribs->current_media_seq;
+		curr_playlist->element.playlist.discontinuity = attribs->discontinuity;
 		if (attribs->bandwidth > 1)
 			curr_playlist->bandwidth = attribs->bandwidth;
 		if (attribs->is_playlist_ended)
@@ -960,13 +1036,35 @@
 		gf_free(attribs->group.video);
 		attribs->group.video = NULL;
 	}
-	if (fullURL != currentLine) {
-		gf_free(fullURL);
-	}
 	return GF_OK;
 }
 
-GF_Err gf_m3u8_parse_sub_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL, Stream *in_stream, PlaylistElement *sub_playlist)
+typedef struct
+{
+	char *name;
+	u64 start;
+	u32 size;
+	Double duration;
+} HLS_LLChunk;
+
+static void reset_attribs(s_accumulated_attributes *attribs, Bool is_cleanup)
+{
+	attribs->width = attribs->height = 0;
+#define RST_ATTR(_name) if (attribs->_name) { gf_free(attribs->_name); attribs->_name = NULL; }
+
+	RST_ATTR(codecs)
+	RST_ATTR(group.audio)
+	RST_ATTR(language)
+	RST_ATTR(title)
+	if (is_cleanup)
+		RST_ATTR(key_url)
+
+	RST_ATTR(init_url)
+	RST_ATTR(mediaURL)
+}
+
+
+GF_Err gf_m3u8_parse_sub_playlist(const char *m3u8_file, MasterPlaylist **playlist, const char *baseURL, Stream *in_stream, PlaylistElement *sub_playlist, Bool is_master)
 {
 	int i, currentLineNumber;
 	FILE *f = NULL;
@@ -974,25 +1072,36 @@
 	u32 m3u8_size, m3u8pos;
 	char currentLine[M3U8_BUF_SIZE];
 	char **attributes = NULL;
+	Bool release_blob = GF_FALSE;
 	s_accumulated_attributes attribs;
 
-	if (!strncmp(file, "gmem://", 7)) {
-		GF_Err e = gf_blob_get_data(file, &m3u8_payload, &m3u8_size);
+	if (!strncmp(m3u8_file, "gmem://", 7)) {
+		GF_Err e = gf_blob_get(m3u8_file, &m3u8_payload, &m3u8_size, NULL);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot Open m3u8 source %s for reading\n", file));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot Open m3u8 source %s for reading\n", m3u8_file));
 			return e;
 		}
+		release_blob = GF_TRUE;
 	} else {
-		f = gf_fopen(file, "rt");
+		f = gf_fopen(m3u8_file, "rt");
 		if (!f) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot open m3u8 file %s for reading\n", file));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot open m3u8 file %s for reading\n", m3u8_file));
 			return GF_URL_ERROR;
 		}
 	}
+
+	memset(&attribs, 0, sizeof(s_accumulated_attributes));
+
+#define _CLEANUP \
+	reset_attribs(&attribs, GF_TRUE);\
+	if (f) gf_fclose(f); \
+	else if (release_blob) gf_blob_release(m3u8_file);
+
+
 	if (*playlist == NULL) {
 		*playlist = master_playlist_new();
 		if (!(*playlist)) {
-			if (f) gf_fclose(f);
+			_CLEANUP
 			return GF_OUT_OF_MEM;
 		}
 	}
@@ -1034,16 +1143,70 @@
 		if (currentLineNumber == 1) {
 			/* Playlist MUST start with #EXTM3U */
 			if (len < 7 || (strncmp("#EXTM3U", currentLine, 7) != 0)) {
-				gf_fclose(f);
-				gf_m3u8_master_playlist_del(playlist);
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Failed to parse M3U8 File, it should start with #EXTM3U, but was : %s\n", currentLine));
+				_CLEANUP
 				return GF_STREAM_NOT_FOUND;
 			}
 			continue;
 		}
 		if (currentLine[0] == '#') {
+			/* chunk */
+			if (!strncmp("#EXT-X-PART:", currentLine, 12)) {
+				GF_Err e = GF_NON_COMPLIANT_BITSTREAM;
+				char *sep;
+				char *file = strstr(currentLine, "URI=\"");
+				char *dur = strstr(currentLine, "DURATION=");
+				char *br = strstr(currentLine, "BYTERANGE=");
+
+				if (strstr(currentLine, "INDEPENDENT=YES")) {
+					attribs.independent_part = GF_TRUE;
+				}
+				if (br) {
+					u64 start=0;
+					u32 size=0;
+					sep = strchr(br, ',');
+					if (sep) sep[0] = 0;
+					if (sscanf(br+10, "\"%u@"LLU"\"", &size, &start) != 2)
+						file = NULL;
+					attribs.byte_range_start = start;
+					attribs.byte_range_end = start + size - 1;
+				}
+				if (dur) {
+					sep = strchr(dur, ',');
+					if (sep) sep[0] = 0;
+					attribs.duration_in_seconds = atof(dur+9);
+				}
+
+				if (file && dur) {
+					file += 5; // file starts with `URI:"`, move to start of URL
+					//find end quote
+					sep = strchr(file, '"');
+					if (!sep) {
+						e = GF_NON_COMPLIANT_BITSTREAM;
+						_CLEANUP
+						return e;
+					}
+					sep[0] = 0;
+
+					attribs.low_latency = GF_TRUE;
+					attribs.is_media_segment = GF_TRUE;
+					e = declare_sub_playlist(file, baseURL, &attribs, sub_playlist, playlist, in_stream);
+
+					(*playlist)->low_latency = GF_TRUE;
+					sep[0] = '"';
+				}
+				attribs.is_media_segment = GF_FALSE;
+				attribs.low_latency = GF_FALSE;
+				attribs.independent_part = GF_FALSE;
+				attribs.byte_range_start = attribs.byte_range_end = 0;
+				attribs.duration_in_seconds = 0;
+				if (e != GF_OK) {
+					_CLEANUP
+					return e;
+				}
+			}
 			/* A comment or a directive */
-			if (strncmp("#EXT", currentLine, 4) == 0) {
+			else if (!strncmp("#EXT", currentLine, 4)) {
 				attributes = parse_attributes(currentLine, &attribs);
 				if (attributes == NULL) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8]Comment at line %d : %s\n", currentLineNumber, currentLine));
@@ -1066,60 +1229,48 @@
 				if (attribs.independent_segments) {
 					(*playlist)->independent_segments = GF_TRUE;
 				}
+				if (attribs.low_latency) {
+					(*playlist)->low_latency = GF_TRUE;
+					attribs.low_latency = GF_FALSE;
+				}
 				if (attribs.mediaURL) {
 					GF_Err e = declare_sub_playlist(attribs.mediaURL, baseURL, &attribs, sub_playlist, playlist, in_stream);
 					gf_free(attribs.mediaURL);
 					attribs.mediaURL = NULL;
 					if (e != GF_OK) {
-						if (f) gf_fclose(f);
+						_CLEANUP
 						return e;
 					}
 				}
 			}
 		} else {
+
 			/*file encountered: sub-playlist or segment*/
-			GF_Err e = declare_sub_playlist(currentLine, baseURL, &attribs, sub_playlist, playlist, in_stream);
+			GF_Err e;
+			const char *pl_url = baseURL;
+			//this is the first (master) playlist but what is parsed is not a master playlist
+			//we will create a master + child with xlink, but the xlink must be only the file name
+			//otherwise dir/pl_video.m3u8 will be translated in master(dir/pl_video.m3u8) [ child(xlink=dir/pl_video.m3u8) ]
+			//thus xlink resolution would give dir/dir/pl_video.m3u8
+			if (is_master && !attribs.is_master_playlist)
+				pl_url = gf_file_basename(baseURL);
+			e = declare_sub_playlist(currentLine, pl_url, &attribs, sub_playlist, playlist, in_stream);
 			attribs.current_media_seq += 1;
 			if (e != GF_OK) {
-				if (f) gf_fclose(f);
+				_CLEANUP
 				return e;
 			}
 
 			//do not reset all attributes but at least set width/height/codecs to NULL, otherwise we may miss detection
 			//of audio-only playlists in av sequences
 
-			attribs.width = attribs.height = 0;
-			if (attribs.codecs) {
-				gf_free(attribs.codecs);
-				attribs.codecs = NULL;
-			}
-			if (attribs.group.audio) {
-				gf_free(attribs.group.audio);
-				attribs.group.audio=NULL;
-			}
-			if (attribs.language) {
-				gf_free(attribs.language);
-				attribs.language=NULL;
-			}
-			if (attribs.title) {
-				gf_free(attribs.title);
-				attribs.title=NULL;
-			}
-			if (attribs.key_url) {
-				gf_free(attribs.key_url);
-				attribs.key_url=NULL;
-			}
-			if (attribs.init_url) {
-				gf_free(attribs.init_url);
-				attribs.init_url = NULL;
-			}
-			if (attribs.mediaURL) {
-				gf_free(attribs.mediaURL);
-				attribs.mediaURL = NULL;
-			}
+			reset_attribs(&attribs, GF_FALSE);
 		}
 	}
-	if (f) gf_fclose(f);
+
+	_CLEANUP
+
+#undef _CLEANUP
 
 	for (i=0; i<(int)gf_list_count((*playlist)->streams); i++) {
 		u32 j;
@@ -1134,20 +1285,6 @@
 		}
 
 	}
-	if (attribs.key_url)
-		gf_free(attribs.key_url);
-	if (attribs.init_url)
-		gf_free(attribs.init_url);
-	if (attribs.codecs)
-		gf_free(attribs.codecs);
-	if (attribs.group.audio)
-		gf_free(attribs.group.audio);
-	if (attribs.language)
-		gf_free(attribs.language);
-	if (attribs.title)
-		gf_free(attribs.title);
-	if (attribs.mediaURL)
-		gf_free(attribs.mediaURL);
 
 	if (attribs.version < attribs.compatibility_version) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] Version %d specified but tags from version %d detected\n", attribs.version, attribs.compatibility_version));

gpac-1.0.1.tar.gz/src/media_tools/media_export.c -> gpac-2.0.0.tar.gz/src/media_tools/media_export.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Media Tools sub-project
@@ -53,13 +53,13 @@
 	if (dumper->flags & GF_EXPORT_PROBE_ONLY) return e;
 
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_AUTHOR, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
+	if (gf_log_tool_level_on(GF_LOG_MEDIA, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
 		va_list args;
 		char szMsg[1024];
 		va_start(args, format);
 		vsnprintf(szMsg, 1024, format, args);
 		va_end(args);
-		GF_LOG((u32) (e ? GF_LOG_ERROR : GF_LOG_WARNING), GF_LOG_AUTHOR, ("%s\n", szMsg) );
+		GF_LOG((u32) (e ? GF_LOG_ERROR : GF_LOG_WARNING), GF_LOG_MEDIA, ("%s\n", szMsg) );
 	}
 #endif
 	return e;
@@ -78,7 +78,6 @@
 	ogg_page og;
 	u32 count, i, di, theora_kgs, nb_i, nb_p;
 	Bool flush_first = GF_TRUE;
-	GF_BitStream *bs;
 	GF_ISOSample *samp;
 	GF_ESD *esd = gf_isom_get_esd(dumper->file, track, 1);
 
@@ -98,68 +97,73 @@
 	if (!out) return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 
 	theora_kgs = 0;
-	bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-	if (esd->decoderConfig->objectTypeIndication==GF_CODECID_OPUS) {
-		GF_BitStream *bs_out;
-		GF_OpusSpecificBox *dops = (GF_OpusSpecificBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DOPS);
-		dops->size = gf_bs_read_u32(bs);
-		gf_bs_read_u32(bs);
-		gf_isom_box_read((GF_Box *)dops, bs);
-		bs_out = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_data(bs_out, "OpusHead", 8);
-		gf_bs_write_u8(bs_out, 1);//version
-		gf_bs_write_u8(bs_out, dops->OutputChannelCount);
-		gf_bs_write_u16_le(bs_out, dops->PreSkip);
-		gf_bs_write_u32_le(bs_out, dops->InputSampleRate);
-		gf_bs_write_u16_le(bs_out, dops->OutputGain);
-		gf_bs_write_u8(bs_out, dops->ChannelMappingFamily);
-		if (dops->ChannelMappingFamily) {
-			gf_bs_write_u8(bs_out, dops->StreamCount);
-			gf_bs_write_u8(bs_out, dops->CoupledCount);
-			gf_bs_write_data(bs, (char *) dops->ChannelMapping, dops->OutputChannelCount);
-		}
-		gf_isom_box_del((GF_Box*)dops);
-
-		gf_bs_get_content(bs_out, &op.packet, &op.bytes);
-		gf_bs_del(bs_out);
-		ogg_stream_packetin(&os, &op);
-		gf_free(op.packet);
-		op.packetno ++;
+	if (esd && esd->decoderConfig
+		&& esd->decoderConfig->decoderSpecificInfo
+		&& esd->decoderConfig->decoderSpecificInfo->data
+	) {
+		GF_BitStream *bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
+		if (esd->decoderConfig->objectTypeIndication==GF_CODECID_OPUS) {
+			GF_BitStream *bs_out;
+			GF_OpusSpecificBox *dops = (GF_OpusSpecificBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DOPS);
+			dops->size = gf_bs_read_u32(bs);
+			gf_bs_read_u32(bs);
+			gf_isom_box_read((GF_Box *)dops, bs);
+			bs_out = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			gf_bs_write_data(bs_out, "OpusHead", 8);
+			gf_bs_write_u8(bs_out, 1);//version
+			gf_bs_write_u8(bs_out, dops->OutputChannelCount);
+			gf_bs_write_u16_le(bs_out, dops->PreSkip);
+			gf_bs_write_u32_le(bs_out, dops->InputSampleRate);
+			gf_bs_write_u16_le(bs_out, dops->OutputGain);
+			gf_bs_write_u8(bs_out, dops->ChannelMappingFamily);
+			if (dops->ChannelMappingFamily) {
+				gf_bs_write_u8(bs_out, dops->StreamCount);
+				gf_bs_write_u8(bs_out, dops->CoupledCount);
+				gf_bs_write_data(bs, (char *) dops->ChannelMapping, dops->OutputChannelCount);
+			}
+			gf_isom_box_del((GF_Box*)dops);
 
-	} else {
-		while (gf_bs_available(bs)) {
-			op.bytes = gf_bs_read_u16(bs);
-			op.packet = (unsigned char*)gf_malloc(sizeof(char) * op.bytes);
-			gf_bs_read_data(bs, (char*)op.packet, op.bytes);
+			gf_bs_get_content(bs_out, &op.packet, &op.bytes);
+			gf_bs_del(bs_out);
 			ogg_stream_packetin(&os, &op);
+			gf_free(op.packet);
+			op.packetno ++;
 
-			if (flush_first) {
-				ogg_stream_pageout(&os, &og);
-				gf_fwrite(og.header, og.header_len, out);
-				gf_fwrite(og.body, og.body_len, out);
-				flush_first = 0;
-
-				if (esd->decoderConfig->objectTypeIndication==GF_CODECID_THEORA) {
-					u32 kff;
-					GF_BitStream *vbs = gf_bs_new((char*)op.packet, op.bytes, GF_BITSTREAM_READ);
-					gf_bs_skip_bytes(vbs, 40);
-					gf_bs_read_int(vbs, 6); /* quality */
-					kff = 1 << gf_bs_read_int(vbs, 5);
-					gf_bs_del(vbs);
-
-					theora_kgs = 0;
-					kff--;
-					while (kff) {
-						theora_kgs ++;
-						kff >>= 1;
+		} else {
+			while (gf_bs_available(bs)) {
+				op.bytes = gf_bs_read_u16(bs);
+				op.packet = (unsigned char*)gf_malloc(sizeof(char) * op.bytes);
+				gf_bs_read_data(bs, (char*)op.packet, op.bytes);
+				ogg_stream_packetin(&os, &op);
+
+				if (flush_first) {
+					ogg_stream_pageout(&os, &og);
+					gf_fwrite(og.header, og.header_len, out);
+					gf_fwrite(og.body, og.body_len, out);
+					flush_first = 0;
+
+					if (esd->decoderConfig->objectTypeIndication==GF_CODECID_THEORA) {
+						u32 kff;
+						GF_BitStream *vbs = gf_bs_new((char*)op.packet, op.bytes, GF_BITSTREAM_READ);
+						gf_bs_skip_bytes(vbs, 40);
+						gf_bs_read_int(vbs, 6); /* quality */
+						kff = 1 << gf_bs_read_int(vbs, 5);
+						gf_bs_del(vbs);
+
+						theora_kgs = 0;
+						kff--;
+						while (kff) {
+							theora_kgs ++;
+							kff >>= 1;
+						}
 					}
 				}
+				gf_free(op.packet);
+				op.packetno ++;
 			}
-			gf_free(op.packet);
-			op.packetno ++;
 		}
+		gf_bs_del(bs);
 	}
-	gf_bs_del(bs);
 	gf_odf_desc_del((GF_Descriptor *)esd);
 
 	while (ogg_stream_pageout(&os, &og)>0) {
@@ -327,11 +331,7 @@
 		dts = dts / 60;
 		mm = (u32)(dts % 60);
 		hh = (u32)(dts / 60);
-#if defined(WIN32) && !defined(__GNUC__)
-		gf_fprintf(fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: %09I64x\n", hh, mm, ss, ms, gf_ftell(fsub));
-#else
 		gf_fprintf(fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: %09"LLX_SUF"\n", hh, mm, ss, ms, gf_ftell(fsub));
-#endif
 		if (vobsub_packetize_subpicture(fsub, samp->DTS, samp->data, samp->dataLength) != GF_OK) {
 			gf_isom_sample_del(&samp);
 			gf_fclose(fsub);
@@ -398,14 +398,27 @@
 	newTk = gf_isom_new_track(outfile, TrackID, gf_isom_get_media_type(infile, inTrackNum), gf_isom_get_media_timescale(infile, inTrackNum));
 	gf_isom_set_track_enabled(outfile, newTk, GF_TRUE);
 
+	if (gf_isom_has_keep_utc_times(infile)) {
+		u64 cdate, mdate;
+		gf_isom_get_track_creation_time(infile, inTrackNum, &cdate, &mdate);
+		gf_isom_set_track_creation_time(outfile, newTk, cdate, mdate);
+	}
+
 	if (esd) {
 		gf_isom_new_mpeg4_description(outfile, newTk, esd, NULL, NULL, &descIndex);
+	} else {
+		gf_isom_clone_sample_description(outfile, newTk, infile, inTrackNum, 1, NULL, NULL, &descIndex);
+	}
+
+	if (esd && esd->decoderConfig) {
 		if ((esd->decoderConfig->streamType == GF_STREAM_VISUAL) || (esd->decoderConfig->streamType == GF_STREAM_SCENE)) {
 			u32 w, h;
 			gf_isom_get_visual_info(infile, inTrackNum, 1, &w, &h);
 #ifndef GPAC_DISABLE_AV_PARSERS
 			/*this is because so many files have reserved values of 320x240 from v1 ... */
-			if (esd->decoderConfig->objectTypeIndication == GF_CODECID_MPEG4_PART2) {
+			if ((esd->decoderConfig->objectTypeIndication == GF_CODECID_MPEG4_PART2)
+				&& esd->decoderConfig->decoderSpecificInfo
+			) {
 				GF_M4VDecSpecInfo dsi;
 				gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
 				w = dsi.width;
@@ -423,8 +436,6 @@
 		}
 		esd->decoderConfig->avgBitrate = 0;
 		esd->decoderConfig->maxBitrate = 0;
-	} else {
-		gf_isom_clone_sample_description(outfile, newTk, infile, inTrackNum, 1, NULL, NULL, &descIndex);
 	}
 
 	pos = 0;
@@ -434,7 +445,7 @@
 	for (i=0; i<count; i++) {
 		samp = gf_isom_get_sample(infile, inTrackNum, i+1, &di);
 		gf_isom_add_sample(outfile, newTk, descIndex, samp);
-		if (esd) {
+		if (esd && esd->decoderConfig) {
 			rate += samp->dataLength;
 			esd->decoderConfig->avgBitrate += samp->dataLength;
 			if (esd->decoderConfig->bufferSizeDB<samp->dataLength) esd->decoderConfig->bufferSizeDB = samp->dataLength;
@@ -458,8 +469,16 @@
 	 ) {
 		return gf_isom_set_pl_indication(outfile, GF_ISOM_PL_VISUAL, 0x0F);
 	}
+
 	/*likely 3gp or any non-MPEG-4 isomedia file*/
-	else if (!esd) return gf_isom_remove_root_od(outfile);
+	if (!esd)
+		return gf_isom_remove_root_od(outfile);
+
+	//broken stream description, do not check for profiles & levels and remove from root
+	if (!esd->decoderConfig) {
+		gf_odf_desc_del((GF_Descriptor *)esd);
+		return gf_isom_remove_root_od(outfile);
+	}
 
 	dur = gf_isom_get_media_duration(outfile, newTk);
 	if (!dur) dur = ts;
@@ -485,7 +504,9 @@
 			gf_isom_set_pl_indication(outfile, GF_ISOM_PL_VISUAL, iod->visual_profileAndLevel);
 		}
 #ifndef GPAC_DISABLE_AV_PARSERS
-		else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2) {
+		else if ((esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2)
+			&& esd->decoderConfig->decoderSpecificInfo
+		) {
 			GF_M4VDecSpecInfo dsi;
 			gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
 			gf_isom_set_pl_indication(outfile, GF_ISOM_PL_VISUAL, dsi.VideoPL);
@@ -501,7 +522,9 @@
 			gf_isom_set_pl_indication(outfile, GF_ISOM_PL_AUDIO, iod->audio_profileAndLevel);
 		}
 #ifndef GPAC_DISABLE_AV_PARSERS
-		else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_AAC_MPEG4) {
+		else if ((esd->decoderConfig->objectTypeIndication==GF_CODECID_AAC_MPEG4)
+			&& esd->decoderConfig->decoderSpecificInfo
+		) {
 			GF_M4ADecSpecInfo cfg;
 			gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &cfg);
 			gf_isom_set_pl_indication(outfile, GF_ISOM_PL_AUDIO, cfg.audioPL);
@@ -533,7 +556,7 @@
 	GF_ISOOpenMode mode;
 
 	if (!(track = gf_isom_get_track_by_id(dumper->file, dumper->trackID))) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
 		return GF_BAD_PARAM;
 	}
 	if (gf_isom_get_media_type(dumper->file, dumper->trackID)==GF_ISOM_MEDIA_OD) {
@@ -572,6 +595,11 @@
 		gf_isom_set_pl_indication(outfile, GF_ISOM_PL_OD, 0xFF);
 		gf_isom_set_pl_indication(outfile, GF_ISOM_PL_MPEGJ, 0xFF);
 	}
+	if (gf_isom_has_keep_utc_times(dumper->file)) {
+		u64 cdate, mdate;
+		gf_isom_get_creation_time(dumper->file, &cdate, &mdate);
+		gf_isom_set_creation_time(outfile, cdate, mdate);
+	}
 
 	e = gf_export_isom_copy_track(dumper, dumper->file, track, outfile, 1, add_to_iod);
 	if (!add_to_iod) {
@@ -580,6 +608,10 @@
 			gf_isom_remove_track_from_root_od(outfile, i+1);
 		}
 	}
+
+	if (gf_isom_has_keep_utc_times(dumper->file))
+		gf_isom_keep_utc_times(outfile, GF_TRUE);
+
 	if (e) gf_isom_delete(outfile);
 	else gf_isom_close(outfile);
 
@@ -610,7 +642,7 @@
 	u32 headerLength = 0;
 
 	if (!(track = gf_isom_get_track_by_id(dumper->file, dumper->trackID))) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
 		return GF_BAD_PARAM;
 	}
 	if (!track) return gf_export_message(dumper, GF_BAD_PARAM, "Invalid track ID %d", dumper->trackID);
@@ -667,10 +699,12 @@
 		gf_fprintf(vtt, "baseMediaFile: %s\n", gf_file_basename(szMedia));
 	}
 	if (esd) {
-		/* TODO: export the MPEG-4 Stream type only if it is not a GPAC internal value */
-		gf_fprintf(vtt, "MPEG-4-streamType: %d\n", esd->decoderConfig->streamType);
-		/* TODO: export the MPEG-4 Object Type Indication only if it is not a GPAC internal value */
-		gf_fprintf(vtt, "MPEG-4-objectTypeIndication: %d\n", esd->decoderConfig->objectTypeIndication);
+		if (esd->decoderConfig) {
+			/* TODO: export the MPEG-4 Stream type only if it is not a GPAC internal value */
+			gf_fprintf(vtt, "MPEG-4-streamType: %d\n", esd->decoderConfig->streamType);
+			/* TODO: export the MPEG-4 Object Type Indication only if it is not a GPAC internal value */
+			gf_fprintf(vtt, "MPEG-4-objectTypeIndication: %d\n", esd->decoderConfig->objectTypeIndication);
+		}
 		if (gf_isom_is_video_handler_type(mtype) ) {
 			gf_isom_get_visual_info(dumper->file, track, 1, &w, &h);
 			gf_fprintf(vtt, "width:%d\n", w);
@@ -690,7 +724,7 @@
 			if (tx || ty) gf_fprintf(vtt, "translation:%d,%d\n", tx, ty);
 			if (layer) gf_fprintf(vtt, "layer:%d\n", layer);
 		}
-		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+		if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 			if (isText) {
 				if (mstype == GF_ISOM_SUBTYPE_WVTT) {
 					/* Warning: Just use -raw export */
@@ -840,7 +874,7 @@
 	//Bool isText;
 
 	if (!(track = gf_isom_get_track_by_id(dumper->file, dumper->trackID))) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
 		return GF_BAD_PARAM;
 	}
 	if (!track) return gf_export_message(dumper, GF_BAD_PARAM, "Invalid track ID %d", dumper->trackID);
@@ -886,7 +920,7 @@
 	gf_fprintf(six, ">\n");
 	header_size = 0;
 	if (esd) {
-		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+		if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 #if !defined(GPAC_DISABLE_TTXT) && !defined(GPAC_DISABLE_VTT)
 			if (mstype == GF_ISOM_SUBTYPE_WVTT || mstype == GF_ISOM_SUBTYPE_STXT) {
 				gf_webvtt_dump_header_boxed(media,
@@ -963,7 +997,7 @@
 	mux = gf_saf_mux_new();
 	count = gf_isom_get_track_count(dumper->file);
 	for (i=0; i<count; i++) {
-		u32 time_scale, mtype, stream_id;
+		u32 time_scale, mtype, stream_id = 0;
 		GF_ESD *esd;
 		mtype = gf_isom_get_media_type(dumper->file, i+1);
 		if (mtype==GF_ISOM_MEDIA_OD) continue;
@@ -971,7 +1005,7 @@
 
 		time_scale = gf_isom_get_media_timescale(dumper->file, i+1);
 		esd = gf_isom_get_esd(dumper->file, i+1, 1);
-		if (esd) {
+		if (esd && esd->decoderConfig) {
 			stream_id = gf_isom_find_od_id_for_track(dumper->file, i+1);
 			if (!stream_id) stream_id = esd->ESID;
 
@@ -981,8 +1015,11 @@
 			} else {
 				gf_saf_mux_stream_add(mux, stream_id, time_scale, esd->decoderConfig->bufferSizeDB, esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication, NULL, NULL, 0, esd->URLString);
 			}
+		}
+		if (esd)
 			gf_odf_desc_del((GF_Descriptor *)esd);
-		} else {
+
+		if (!stream_id) {
 			char *mime = NULL;
 			switch (gf_isom_get_media_subtype(dumper->file, i+1, 1)) {
 			case GF_ISOM_SUBTYPE_3GP_H263:
@@ -1038,6 +1075,11 @@
 			GF_ISOSample *samp;
 			if (safs[i].last_sample==safs[i].nb_samp) continue;
 			samp = gf_isom_get_sample(dumper->file, safs[i].track_num, safs[i].last_sample + 1, &di);
+			if (!samp) {
+				gf_saf_mux_del(mux);
+				return gf_isom_last_error(dumper->file);
+			}
+
 			gf_saf_mux_add_au(mux, safs[i].stream_id, (u32) (samp->DTS+samp->CTS_Offset), samp->data, samp->dataLength, (samp->IsRAP==RAP) ? 1 : 0);
 			/*data is kept by muxer!!*/
 			gf_free(samp);
@@ -1078,6 +1120,8 @@
 	u32 codec_id=0;
 	u32 sample_count=0;
 	Bool skip_write_filter = GF_FALSE;
+	Bool ext_forced = GF_FALSE;
+	Bool use_dynext = GF_FALSE;
 
 	args = NULL;
 	strcpy(szExt, "");
@@ -1085,18 +1129,27 @@
 		u32 msubtype = 0;
 		u32 mtype = 0;
 		u32 afmt = 0;
+		GF_PixelFormat pfmt = 0;
 		GF_ESD *esd;
 		const char *export_ext = dumper->out_name ? gf_file_ext_start(dumper->out_name) : NULL;
 		u32 track_num = gf_isom_get_track_by_id(dumper->file, dumper->trackID);
 		if (!track_num) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] No tracks with ID %d in file\n", dumper->trackID));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] No tracks with ID %d in file\n", dumper->trackID));
 			return GF_BAD_PARAM;
 		}
 		esd = gf_media_map_esd(dumper->file, track_num, 0);
 		sample_count = gf_isom_get_sample_count(dumper->file, dumper->trackID);
-		if (esd) {
+		if (esd && esd->decoderConfig) {
 			if (esd->decoderConfig->objectTypeIndication<GF_CODECID_LAST_MPEG4_MAPPING) {
 				codec_id = gf_codecid_from_oti(esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
+#ifndef GPAC_DISABLE_AV_PARSERS
+				if (esd->decoderConfig->decoderSpecificInfo && (codec_id==GF_CODECID_AAC_MPEG4)) {
+					GF_M4ADecSpecInfo acfg;
+					gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &acfg);
+					if (acfg.base_object_type == GF_M4A_USAC)
+						codec_id = GF_CODECID_USAC;
+				}
+#endif
 			} else {
 				codec_id = esd->decoderConfig->objectTypeIndication;
 			}
@@ -1107,12 +1160,20 @@
 		}
 		mtype = gf_isom_get_media_type(dumper->file, track_num);
 		if (!codec_id) {
+			pfmt = gf_pixel_fmt_from_qt_type(msubtype);
+			if (pfmt) codec_id = GF_CODECID_RAW;
+		}
+
+		if (!codec_id) {
 			strcpy(szExt, gf_4cc_to_str(msubtype));
+			ext_forced = GF_TRUE;
 		} else if (codec_id==GF_CODECID_RAW) {
 			switch (mtype) {
 			case GF_ISOM_MEDIA_VISUAL:
 			case GF_ISOM_MEDIA_AUXV:
 			case GF_ISOM_MEDIA_PICT:
+				if (pfmt)
+					strcpy(szExt, gf_pixel_fmt_sname(pfmt));
 				break;
 			case GF_ISOM_MEDIA_AUDIO:
 				afmt = gf_audio_fmt_from_isobmf(msubtype);
@@ -1140,7 +1201,7 @@
 		case GF_ISOM_MEDIA_AUXV:
 		case GF_ISOM_MEDIA_PICT:
 		case GF_ISOM_MEDIA_AUDIO:
-			skip_write_filter = GF_TRUE;
+			skip_write_filter = codec_id ? GF_TRUE : GF_FALSE;
 			break;
 		default:
 			switch (codec_id) {
@@ -1152,8 +1213,9 @@
 			case GF_CODECID_SUBS_TEXT:
 			case GF_CODECID_SUBS_XML:
 			case GF_CODECID_SIMPLE_TEXT:
-				//szExt[0] = 0;
-				strcpy(szExt, "*");
+				//use dynamic extension
+				szExt[0] = 0;
+				use_dynext = GF_TRUE;
 				break;
 			}
 			break;
@@ -1186,17 +1248,72 @@
 			return e;
 		}
 		if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
+	} else {
+		const char *export_ext = dumper->out_name ? gf_file_ext_start(dumper->out_name) : NULL;
+		if (!export_ext) {
+			use_dynext = GF_TRUE;
+			if (dumper->in_name) {
+				GF_MediaImporter import;
+				memset(&import, 0, sizeof(GF_MediaImporter));
+				import.flags = GF_IMPORT_PROBE_ONLY;
+				import.in_name = dumper->in_name;
+				e = gf_media_import(&import);
+				if (e) return e;
+				Bool found = GF_FALSE;
+				u32 i;
+				for (i=0; i<import.nb_tracks; i++) {
+					struct __track_import_info *tki = &import.tk_info[i];
+					if (!tki->codecid) continue;
+					if (dumper->trackID) {
+						if (dumper->trackID != tki->track_num) continue;
+					} else if (dumper->track_type) {
+						if ((dumper->track_type==1) && (tki->stream_type!=GF_STREAM_VISUAL)) continue;
+						if ((dumper->track_type==2) && (tki->stream_type!=GF_STREAM_AUDIO)) continue;
+					}
+
+					found = GF_TRUE;
+					skip_write_filter = GF_TRUE;
+
+					const char *sname = gf_codecid_file_ext(tki->codecid);
+					if (export_ext && strstr(sname, export_ext+1)) {
+						szExt[0]=0;
+					} else {
+						char *sep;
+						strncpy(szExt, sname, 29);
+						szExt[29]=0;
+						sep = strchr(szExt, '|');
+						if (sep) sep[0] = 0;
+						use_dynext = GF_FALSE;
+					}
+					dumper->trackID = tki->track_num;
+					dumper->track_type = 0;
+					break;
+				}
+				if (!found) return GF_NOT_FOUND;
+			}
+		} else {
+			skip_write_filter = GF_TRUE;
+		}
 	}
 
 	fsess = gf_fs_new_defaults(0);
 	if (!fsess) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Failed to create filter session\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Failed to create filter session\n"));
 		return GF_OUT_OF_MEM;
 	}
 	file_out = NULL;
 	args = NULL;
+
+	if (dumper->flags & GF_EXPORT_REMUX) {
+		file_out = gf_fs_load_destination(fsess, dumper->out_name, NULL, NULL, &e);
+		if (!file_out) {
+			gf_fs_del(fsess);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Cannot open destination %s\n", dumper->out_name));
+			return e;
+		}
+	}
 	//except in nhml inband file dump, create a sink filter
-	if (!dumper->dump_file && !(dumper->flags & GF_EXPORT_AVI)) {
+	else if (!dumper->dump_file) {
 		Bool no_ext = (dumper->flags & GF_EXPORT_NO_FILE_EXT) ? GF_TRUE : GF_FALSE;
 		char *ext = gf_file_ext_start(dumper->out_name);
 		//mux args, for now we only dump to file
@@ -1233,10 +1350,6 @@
 				if (ext) e |= gf_dynstrcat(&args, ext, NULL);
 			}
 			e |= gf_dynstrcat(&args, ":dynext", NULL);
-		} else if (dumper->flags & GF_EXPORT_AVI_NATIVE) {
-			if (!strlen(szExt)) {
-				e |= gf_dynstrcat(&args, ":dynext", NULL);
-			}
 		} else if (dumper->trackID && strlen(szExt) ) {
 			if (!no_ext && !gf_file_ext_start(dumper->out_name)) {
 				if (args) gf_free(args);
@@ -1248,9 +1361,11 @@
 				e |= gf_dynstrcat(&args, ":ext=", NULL);
 				e |= gf_dynstrcat(&args, szExt, NULL);
 			}
+		} else if ((dumper->trackID || dumper->track_type) && use_dynext) {
+			e |= gf_dynstrcat(&args, ":dynext", NULL);
 		}
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Cannot load arguments for output file dumper\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Cannot load arguments for output file dumper\n"));
 			if (args) gf_free(args);
 			gf_fs_del(fsess);
 			return e;
@@ -1260,7 +1375,7 @@
 		if (!file_out) {
 			gf_fs_del(fsess);
 			if (args) gf_free(args);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Cannot load output file dumper\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Cannot load output file dumper\n"));
 			return e;
 		}
 	}
@@ -1277,7 +1392,7 @@
 		remux = e ? NULL : gf_fs_load_filter(fsess, args, &e);
 		if (!remux || e) {
 			gf_fs_del(fsess);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Cannot load stream->file filter\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Cannot load stream->file filter\n"));
 			if (args) gf_free(args);
 			return e ? e : GF_FILTER_NOT_FOUND;
 		}
@@ -1286,7 +1401,7 @@
 		remux = gf_fs_load_filter(fsess, "nhntw:exporter", &e);
 		if (!remux) {
 			gf_fs_del(fsess);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Cannot load NHNT write filter\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Cannot load NHNT write filter\n"));
 			return e;
 		}
 	}
@@ -1303,28 +1418,22 @@
 		if (!remux || e) {
 			gf_fs_del(fsess);
 			if (args) gf_free(args);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Cannot load NHML write filter\n"));
-			return e ? e : GF_FILTER_NOT_FOUND;
-		}
-	}
-	else if (dumper->flags & GF_EXPORT_AVI) {
-		e = gf_dynstrcat(&args, "avimx:dst=", NULL);
-		e |= gf_dynstrcat(&args, dumper->out_name, NULL);
-		if (!strstr(args, ".avi")) e |= gf_dynstrcat(&args, ".avi", NULL);
-		e |= gf_dynstrcat(&args, ":noraw", NULL);
-
-		file_out = e ? NULL : gf_fs_load_filter(fsess, args, &e);
-		if (!file_out || e) {
-			gf_fs_del(fsess);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Cannot load AVI output filter\n"));
-			if (args) gf_free(args);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Cannot load NHML write filter\n"));
 			return e ? e : GF_FILTER_NOT_FOUND;
 		}
 	} else if (!skip_write_filter) {
-		remux = gf_fs_load_filter(fsess, "writegen", &e);
+		e = gf_dynstrcat(&args, "writegen:exporter", NULL);
+		//extension has been forced, override ext at output of writegen
+		if (ext_forced) {
+			e |= gf_dynstrcat(&args, ":#Extension=", NULL);
+			e |= gf_dynstrcat(&args, szExt, NULL);
+		}
+
+		remux = e ? NULL : gf_fs_load_filter(fsess, args, &e);
 		if (!remux) {
 			gf_fs_del(fsess);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Cannot load stream->file filter\n"));
+			if (args) gf_free(args);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Cannot load stream->file filter\n"));
 			return e;
 		}
 	}
@@ -1347,7 +1456,7 @@
 	if (!reframer || e) {
 		gf_fs_del(fsess);
 		if (args) gf_free(args);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Cannot load reframer filter\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Cannot load reframer filter\n"));
 		return e ? e : GF_FILTER_NOT_FOUND;
 	}
 	if (args) gf_free(args);
@@ -1374,24 +1483,40 @@
 
 	if (!src_filter || e) {
 		gf_fs_del(fsess);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Exporter] Cannot load filter for input file \"%s\": %s\n", dumper->in_name, gf_error_to_string(e) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Exporter] Cannot load filter for input file \"%s\": %s\n", dumper->in_name, gf_error_to_string(e) ));
 		return e;
 	}
 
-	if (dumper->trackID) {
+	if (dumper->track_type) {
+		const char *mtype = (dumper->track_type==1) ? "video" : "audio";
+		if (dumper->trackID) {
+			sprintf(szSubArgs, "%s%d", mtype, dumper->trackID);
+		} else {
+			sprintf(szSubArgs, "%s", mtype);
+		}
+	}
+	else if (dumper->trackID) {
 		sprintf(szSubArgs, "PID=%d", dumper->trackID);
 	}
 	if (remux) {
-		gf_filter_set_source(file_out, remux, dumper->trackID ? szSubArgs : NULL);
-		gf_filter_set_source(remux, reframer, dumper->trackID ? szSubArgs : NULL);
+		gf_filter_set_source(file_out, remux, (dumper->trackID || dumper->track_type) ? szSubArgs : NULL);
+		gf_filter_set_source(remux, reframer, (dumper->trackID || dumper->track_type) ? szSubArgs : NULL);
 	} else {
-		gf_filter_set_source(file_out, reframer, dumper->trackID ? szSubArgs : NULL);
+		gf_filter_set_source(file_out, reframer, (dumper->trackID || dumper->track_type) ? szSubArgs : NULL);
 	}
 
 	e = gf_fs_run(fsess);
 	if (e>GF_OK) e = GF_OK;
 	if (!e) e = gf_fs_get_last_connect_error(fsess);
 	if (!e) e = gf_fs_get_last_process_error(fsess);
+
+	if (!e) {
+		if (dumper->file)
+			gf_fs_print_unused_args(fsess, NULL);
+		else
+			gf_fs_print_unused_args(fsess, "alltk,allt,noedit");
+	}
+	gf_fs_print_non_connected(fsess);
 	if (dumper->print_stats_graph & 1) gf_fs_print_stats(fsess);
 	if (dumper->print_stats_graph & 2) gf_fs_print_connections(fsess);
 	gf_fs_del(fsess);

gpac-1.0.1.tar.gz/src/media_tools/media_import.c -> gpac-2.0.0.tar.gz/src/media_tools/media_import.c Changed

gpac-1.0.1.tar.gz/src/media_tools/mpd.c -> gpac-2.0.0.tar.gz/src/media_tools/mpd.c Changed

@@ -1,8 +1,8 @@
-/**
+/*
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
@@ -31,6 +31,38 @@
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
 
+#define MPD_STORE_EXTENSION_ATTR(_elem)	\
+			if (!_elem->x_attributes) _elem->x_attributes = gf_list_new();	\
+			i--;	\
+			gf_list_rem(root->attributes, i);	\
+			gf_list_add(_elem->x_attributes, att);	\
+
+#define MPD_STORE_EXTENSION_NODE(_elem)	\
+		if (!_elem->x_children) _elem->x_children = gf_list_new();	\
+		i--;	\
+		gf_list_rem(root->content, i);	\
+		child->orig_pos = child_idx;\
+		gf_list_add(_elem->x_children, child);	\
+
+#define MPD_FREE_EXTENSION_NODE(_elem)	\
+	if (_elem->x_attributes) {\
+		while (gf_list_count(_elem->x_attributes)) {\
+			GF_XMLAttribute *att = gf_list_pop_back(_elem->x_attributes);\
+			if (att->name) gf_free(att->name);\
+			if (att->value) gf_free(att->value);\
+			gf_free(att);\
+		}\
+		gf_list_del(_elem->x_attributes);\
+	}\
+	if (_elem->x_children) {\
+		while (gf_list_count(_elem->x_children)) {\
+			GF_XMLNode *child = gf_list_pop_back(_elem->x_children);\
+			gf_xml_dom_node_del(child);\
+		}\
+		gf_list_del(_elem->x_children);\
+	}\
+
+
 static Bool gf_mpd_parse_bool(const char * const attr)
 {
 	if (!strcmp(attr, "true")) return 1;
@@ -53,35 +85,6 @@
 	return 0;
 }
 
-static Bool gf_mpd_is_known_descriptor(GF_XMLNode *child)
-{
-	if (!strcmp(child->name, "FramePacking")
-		|| !strcmp(child->name, "AudioChannelConfiguration")
-		|| !strcmp(child->name, "ContentProtection")
-		|| !strcmp(child->name, "EssentialProperty")
-		|| !strcmp(child->name, "SupplementalProperty")
-		|| !strcmp(child->name, "UTCTiming")
-	) {
-		return GF_TRUE;
-	}
-	else{
-		return GF_FALSE;
-	}
-}
-
-static void gf_mpd_parse_other_descriptors(GF_XMLNode *child, GF_List *other_desc)
-{
-	if(!gf_mpd_is_known_descriptor(child)){
-		char *descriptors=gf_xml_dom_serialize(child,GF_FALSE);
-		GF_MPD_other_descriptors *Desc;
-		GF_SAFEALLOC(Desc,GF_MPD_other_descriptors);
-		if (!Desc) return;
-
-		Desc->xml_desc=descriptors;
-		gf_list_add(other_desc, Desc);
-	}
-}
-
 static char *gf_mpd_parse_text_content(GF_XMLNode *child)
 {
 	u32 child_index = 0;
@@ -132,6 +135,17 @@
 	return res;
 }
 
+static GF_Fraction gf_mpd_parse_fraction(const char * const attr)
+{
+	GF_Fraction res;
+	int ok = sscanf(attr, "%d/%u", &res.num, &res.den);
+	if (ok!=2) {
+		res.den = 1;
+		res.num = atoi(attr);
+	}
+	return res;
+}
+
 u64 gf_mpd_parse_date(const char * const attr)
 {
 	return gf_net_parse_date(attr);
@@ -225,7 +239,7 @@
 	if (dur <= GF_UINT_MAX) {
 		return (u32)dur;
 	} else {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Parsed duration %s ("LLU") doesn't fit on 32 bits! Setting to the 32 bits max.\n", duration, dur));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD] Parsed duration %s ("LLU") doesn't fit on 32 bits! Setting to the 32 bits max.\n", duration, dur));
 		return GF_UINT_MAX;
 	}
 }
@@ -262,48 +276,47 @@
 static GF_Err gf_mpd_parse_program_info(GF_MPD *mpd, GF_XMLNode *root)
 {
 	GF_MPD_ProgramInfo *info;
-	u32 att_index, child_index;
+	GF_XMLNode *child;
+	GF_XMLAttribute *att;
+	u32 child_idx, i;
 
 	GF_SAFEALLOC(info, GF_MPD_ProgramInfo);
 	if (!info) return GF_OUT_OF_MEM;
 
-	att_index = 0;
-	while (1) {
-		GF_XMLAttribute *att = gf_list_get(root->attributes, att_index);
-		if (!att) {
-			break;
-		} else if (!strcmp(att->name, "moreInformationURL")) {
+	i = 0;
+	while ( (att = gf_list_enum(root->attributes, &i)) ) {
+		if (!strcmp(att->name, "moreInformationURL")) {
 			info->more_info_url = gf_mpd_parse_string(att->value);
 		} else if (!strcmp(att->name, "lang")) {
 			info->lang = gf_mpd_parse_string(att->value);
+		} else {
+			MPD_STORE_EXTENSION_ATTR(info)
 		}
-		att_index++;
 	}
 
-	child_index = 0;
-	while (1) {
-		GF_XMLNode *child = gf_list_get(root->content, child_index);
-		if (!child) {
-			break;
-		} else if (child->type == GF_XML_NODE_TYPE) {
-			if (!strcmp(child->name, "Title")) {
-				GF_XMLNode *data_node = gf_list_get(child->content, 0);
-				if (data_node && data_node->type == GF_XML_TEXT_TYPE) {
-					info->title = gf_strdup(data_node->name);
-				}
-			} else if (!strcmp(child->name, "Source")) {
-				GF_XMLNode *data_node = gf_list_get(child->content, 0);
-				if (data_node && data_node->type == GF_XML_TEXT_TYPE) {
-					info->source = gf_strdup(data_node->name);
-				}
-			} else if (!strcmp(child->name, "Copyright")) {
-				GF_XMLNode *data_node = gf_list_get(child->content, 0);
-				if (data_node && data_node->type == GF_XML_TEXT_TYPE) {
-					info->copyright = gf_strdup(data_node->name);
-				}
+	child_idx = i = 0;
+	while ((child = gf_list_enum(root->content, &i))) {
+		if (child->type != GF_XML_NODE_TYPE)
+			continue;
+		if (!strcmp(child->name, "Title")) {
+			GF_XMLNode *data_node = gf_list_get(child->content, 0);
+			if (data_node && data_node->type == GF_XML_TEXT_TYPE) {
+				info->title = gf_strdup(data_node->name);
+			}
+		} else if (!strcmp(child->name, "Source")) {
+			GF_XMLNode *data_node = gf_list_get(child->content, 0);
+			if (data_node && data_node->type == GF_XML_TEXT_TYPE) {
+				info->source = gf_strdup(data_node->name);
+			}
+		} else if (!strcmp(child->name, "Copyright")) {
+			GF_XMLNode *data_node = gf_list_get(child->content, 0);
+			if (data_node && data_node->type == GF_XML_TEXT_TYPE) {
+				info->copyright = gf_strdup(data_node->name);
 			}
+		} else {
+			MPD_STORE_EXTENSION_NODE(info)
 		}
-		child_index++;
+		child_idx++;
 	}
 	return gf_list_add(mpd->program_infos, info);
 }
@@ -331,8 +344,8 @@
 	GF_XMLNode *child;
 	u32 i = 0;
 
-	/*0 by default*/
-	seg->time_shift_buffer_depth = 0;
+	/*infinite by default*/
+ 	seg->time_shift_buffer_depth = (u32) -1; /*infinite by default*/
 
 	while ( (att = gf_list_enum(root->attributes, &i)) ) {
 		if (!strcmp(att->name, "timescale")) seg->timescale = gf_mpd_parse_int(att->value);
@@ -354,6 +367,7 @@
 static GF_MPD_SegmentTimeline *gf_mpd_parse_segment_timeline(GF_MPD *mpd, GF_XMLNode *root)
 {
 	u32 i, j;
+	u64 curr_start_time = 0;
 	GF_XMLAttribute *att;
 	GF_XMLNode *child;
 	GF_MPD_SegmentTimeline *seg;
@@ -368,6 +382,7 @@
 			GF_MPD_SegmentTimelineEntry *seg_tl_ent;
 			GF_SAFEALLOC(seg_tl_ent, GF_MPD_SegmentTimelineEntry);
 			if (!seg_tl_ent) continue;
+			seg_tl_ent->start_time = curr_start_time;
 			gf_list_add(seg->entries, seg_tl_ent);
 
 			j = 0;
@@ -382,6 +397,10 @@
 						seg_tl_ent->repeat_count--;
 				}
 			}
+			if (seg_tl_ent->start_time)
+				curr_start_time = seg_tl_ent->start_time;
+
+			curr_start_time += (u64) (seg_tl_ent->duration * (seg_tl_ent->repeat_count+1));
 		}
 	}
 	return seg;
@@ -538,17 +557,6 @@
 	return GF_OK;
 }
 
-#define MPD_STORE_EXTENSION_ATTR(_elem)	\
-			if (!_elem->attributes) _elem->attributes = gf_list_new();	\
-			i--;	\
-			gf_list_rem(root->attributes, i);	\
-			gf_list_add(_elem->attributes, att);	\
-
-#define MPD_STORE_EXTENSION_NODE(_elem)	\
-		if (!_elem->children) _elem->children = gf_list_new();	\
-		i--;	\
-		gf_list_rem(root->content, i);	\
-		gf_list_add(_elem->children, child);	\
 
 static GF_Err gf_mpd_parse_descriptor_ex(GF_List *container, GF_MPD_Descriptor **out_ptr, GF_XMLNode *root)
 {
@@ -556,6 +564,7 @@
 	GF_XMLNode *child;
 	GF_MPD_Descriptor *mpd_desc;
 	u32 i = 0;
+	u32 child_idx = 0;
 
 	GF_SAFEALLOC(mpd_desc, GF_MPD_Descriptor);
 	if (!mpd_desc) return GF_OUT_OF_MEM;
@@ -571,16 +580,18 @@
 	if (container)
 		gf_list_add(container, mpd_desc);
 	else {
+		assert(out_ptr);
 		if (*out_ptr) gf_mpd_descriptor_free(*out_ptr);
 		*out_ptr = mpd_desc;
 	}
 
 	i = 0;
+	child_idx = 0;
 	while ( (child = gf_list_enum(root->content, &i))) {
 		if (child->type != GF_XML_NODE_TYPE) continue;
 
 		MPD_STORE_EXTENSION_NODE(mpd_desc)
-
+		child_idx++;
 	}
 	return GF_OK;
 }
@@ -621,70 +632,71 @@
 	return pref;
 }
 
-static void gf_mpd_parse_common_representation(GF_MPD *mpd, GF_MPD_CommonAttributes *com, GF_XMLNode *root)
+static void gf_mpd_parse_common_representation_attr(GF_MPD *mpd, GF_MPD_CommonAttributes *com, GF_XMLNode *root, GF_XMLAttribute *att, u32 *index)
 {
-	GF_XMLAttribute *att;
-	GF_XMLNode *child;
-	u32 i = 0;
-
-	com->max_playout_rate = 1.0;
+	if (!strcmp(att->name, "profiles")) com->profiles = gf_mpd_parse_string(att->value);
+	else if (!strcmp(att->name, "width")) com->width = gf_mpd_parse_int(att->value);
+	else if (!strcmp(att->name, "height")) com->height = gf_mpd_parse_int(att->value);
+	else if (!strcmp(att->name, "sar")) {
+		if (com->sar) gf_free(com->sar);
+		com->sar = gf_mpd_parse_frac(att->value, ':', NULL);
+	}
+	else if (!strcmp(att->name, "frameRate")) {
+		if (com->framerate) gf_free(com->framerate);
+		com->framerate = gf_mpd_parse_frac(att->value, '/', NULL);
+	}
+	else if (!strcmp(att->name, "audioSamplingRate")) com->samplerate = gf_mpd_parse_int(att->value);
+	else if (!strcmp(att->name, "mimeType")) com->mime_type = gf_mpd_parse_string(att->value);
+	else if (!strcmp(att->name, "segmentProfiles")) com->segmentProfiles = gf_mpd_parse_string(att->value);
+	else if (!strcmp(att->name, "codecs")) com->codecs = gf_mpd_parse_string(att->value);
+	else if (!strcmp(att->name, "maximumSAPPeriod")) com->maximum_sap_period = gf_mpd_parse_int(att->value);
+	else if (!strcmp(att->name, "startWithSAP")) {
+		if (!strcmp(att->value, "false")) com->starts_with_sap = 0;
+		else com->starts_with_sap = gf_mpd_parse_int(att->value);
+	}
+	else if (!strcmp(att->name, "maxPlayoutRate")) com->max_playout_rate = gf_mpd_parse_double(att->value);
+	else if (!strcmp(att->name, "codingDependency")) com->coding_dependency = gf_mpd_parse_bool(att->value);
+	else if (!strcmp(att->name, "scanType")) {
+		if (!strcmp(att->value, "progressive")) com->scan_type = GF_MPD_SCANTYPE_PROGRESSIVE;
+		else if (!strcmp(att->value, "interlaced")) com->scan_type = GF_MPD_SCANTYPE_INTERLACED;
+	}
+	else if (!strcmp(att->name, "selectionRriority")) com->selection_priority = gf_mpd_parse_int(att->value);
+	else if (!strcmp(att->name, "tag")) com->tag = gf_mpd_parse_string(att->value);
 
-	while ( (att = gf_list_enum(root->attributes, &i)) ) {
-		if (!strcmp(att->name, "profiles")) com->profiles = gf_mpd_parse_string(att->value);
-		else if (!strcmp(att->name, "width")) com->width = gf_mpd_parse_int(att->value);
-		else if (!strcmp(att->name, "height")) com->height = gf_mpd_parse_int(att->value);
-		else if (!strcmp(att->name, "sar")) {
-			if (com->sar) gf_free(com->sar);
-			com->sar = gf_mpd_parse_frac(att->value, ':', NULL);
-		}
-		else if (!strcmp(att->name, "frameRate")) {
-			if (com->framerate) gf_free(com->framerate);
-			com->framerate = gf_mpd_parse_frac(att->value, '/', NULL);
-		}
-		else if (!strcmp(att->name, "audioSamplingRate")) com->samplerate = gf_mpd_parse_int(att->value);
-		else if (!strcmp(att->name, "mimeType")) com->mime_type = gf_mpd_parse_string(att->value);
-		else if (!strcmp(att->name, "segmentProfiles")) com->segmentProfiles = gf_mpd_parse_string(att->value);
-		else if (!strcmp(att->name, "codecs")) com->codecs = gf_mpd_parse_string(att->value);
-		else if (!strcmp(att->name, "maximumSAPPeriod")) com->maximum_sap_period = gf_mpd_parse_int(att->value);
-		else if (!strcmp(att->name, "startWithSAP")) {
-			if (!strcmp(att->value, "false")) com->starts_with_sap = 0;
-			else com->starts_with_sap = gf_mpd_parse_int(att->value);
-		}
-		else if (!strcmp(att->name, "maxPlayoutRate")) com->max_playout_rate = gf_mpd_parse_double(att->value);
-		else if (!strcmp(att->name, "codingDependency")) com->coding_dependency = gf_mpd_parse_bool(att->value);
-		else if (!strcmp(att->name, "scanType")) {
-			if (!strcmp(att->value, "progressive")) com->scan_type = GF_MPD_SCANTYPE_PROGRESSIVE;
-			else if (!strcmp(att->value, "interlaced")) com->scan_type = GF_MPD_SCANTYPE_INTERLACED;
-		}
-		else if (!strcmp(att->name, "selectionRriority")) com->selection_priority = gf_mpd_parse_int(att->value);
-		else if (!strcmp(att->name, "tag")) com->tag = gf_mpd_parse_string(att->value);
+	else {
+		u32 i = *index;
+		MPD_STORE_EXTENSION_ATTR(com);
+		(*index) = i;
 	}
+}
 
-	i = 0;
-	while ( (child = gf_list_enum(root->content, &i))) {
-		if (!gf_mpd_valid_child(mpd, child)) continue;
-		if (!strcmp(child->name, "FramePacking")) {
-			gf_mpd_parse_descriptor(com->frame_packing, child);
-		}
-		else if (!strcmp(child->name, "AudioChannelConfiguration")) {
-			gf_mpd_parse_descriptor(com->audio_channels, child);
-		}
-		else if (!strcmp(child->name, "ContentProtection")) {
-			gf_mpd_parse_descriptor(com->content_protection, child);
-		}
-		else if (!strcmp(child->name, "EssentialProperty")) {
-			gf_mpd_parse_descriptor(com->essential_properties, child);
-		}
-		else if (!strcmp(child->name, "SupplementalProperty")) {
-			gf_mpd_parse_descriptor(com->supplemental_properties, child);
-		}
-		else if (!strcmp(child->name, "ProducerReferenceTime")) {
-			GF_MPD_ProducerReferenceTime *pref = gf_mpd_parse_produce_ref_time(child);
-			if (pref) {
-				if (!com->producer_reference_time) com->producer_reference_time = gf_list_new();
-				gf_list_add(com->producer_reference_time, pref);
-			}
+static void gf_mpd_parse_common_representation_child(GF_MPD *mpd, GF_MPD_CommonAttributes *com, GF_XMLNode *root, GF_XMLNode *child, u32 *index, u32 child_idx)
+{
+	if (!strcmp(child->name, "FramePacking")) {
+		gf_mpd_parse_descriptor(com->frame_packing, child);
+	}
+	else if (!strcmp(child->name, "AudioChannelConfiguration")) {
+		gf_mpd_parse_descriptor(com->audio_channels, child);
+	}
+	else if (!strcmp(child->name, "ContentProtection")) {
+		gf_mpd_parse_descriptor(com->content_protection, child);
+	}
+	else if (!strcmp(child->name, "EssentialProperty")) {
+		gf_mpd_parse_descriptor(com->essential_properties, child);
+	}
+	else if (!strcmp(child->name, "SupplementalProperty")) {
+		gf_mpd_parse_descriptor(com->supplemental_properties, child);
+	}
+	else if (!strcmp(child->name, "ProducerReferenceTime")) {
+		GF_MPD_ProducerReferenceTime *pref = gf_mpd_parse_produce_ref_time(child);
+		if (pref) {
+			if (!com->producer_reference_time) com->producer_reference_time = gf_list_new();
+			gf_list_add(com->producer_reference_time, pref);
 		}
+	} else {
+		u32 i = *index;
+		MPD_STORE_EXTENSION_NODE(com);
+		*index = i;
 	}
 }
 
@@ -706,7 +718,6 @@
 	gf_mpd_init_common_attributes((GF_MPD_CommonAttributes *)rep);
 	rep->base_URLs = gf_list_new();
 	rep->sub_representations = gf_list_new();
-	rep->other_descriptors = gf_list_new();
 	return rep;
 }
 
@@ -730,11 +741,11 @@
 		else if (!strcmp(att->name, "lastPacketIdx")) dasher->last_pck_idx = gf_mpd_parse_long_int(att->value);
 		else if (!strcmp(att->name, "pidID")) dasher->pid_id = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "depID")) dasher->dep_pid_id = gf_mpd_parse_int(att->value);
-		else if (!strcmp(att->name, "periodStart")) dasher->period_start = gf_mpd_parse_double(att->value);
-		else if (!strcmp(att->name, "periodDuration")) dasher->period_duration = gf_mpd_parse_double(att->value);
+		else if (!strcmp(att->name, "periodStart")) gf_parse_lfrac(att->value, &dasher->period_start);
+		else if (!strcmp(att->name, "periodDuration")) gf_parse_lfrac(att->value, &dasher->period_duration);
 		else if (!strcmp(att->name, "ownsSet")) dasher->owns_set = gf_mpd_parse_bool(att->value);
 		else if (!strcmp(att->name, "multiPIDInit")) dasher->multi_pids = gf_mpd_parse_bool(att->value);
-		else if (!strcmp(att->name, "dashDuration")) dasher->dash_dur = gf_mpd_parse_double(att->value);
+		else if (!strcmp(att->name, "dashDuration")) dasher->dash_dur = gf_mpd_parse_fraction(att->value);
 		else if (!strcmp(att->name, "nextSegmentStart")) dasher->next_seg_start = gf_mpd_parse_long_int(att->value);
 		else if (!strcmp(att->name, "firstCTS")) dasher->first_cts = gf_mpd_parse_long_int(att->value);
 		else if (!strcmp(att->name, "firstDTS")) dasher->first_cts = gf_mpd_parse_long_int(att->value);
@@ -794,7 +805,7 @@
 
 static GF_Err gf_mpd_parse_representation(GF_MPD *mpd, GF_List *container, GF_XMLNode *root)
 {
-	u32 i;
+	u32 i, child_idx;
 	GF_MPD_Representation *rep;
 	GF_XMLAttribute *att;
 	GF_XMLNode *child;
@@ -811,12 +822,14 @@
 		else if (!strcmp(att->name, "qualityRanking")) rep->quality_ranking = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "dependencyId")) rep->dependency_id = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "mediaStreamStructureId")) rep->media_stream_structure_id = gf_mpd_parse_string(att->value);
+		else gf_mpd_parse_common_representation_attr(mpd, (GF_MPD_CommonAttributes*)rep, root, att, &i);
 	}
-	gf_mpd_parse_common_representation(mpd, (GF_MPD_CommonAttributes*)rep, root);
 
 	i = 0;
+	child_idx = 0;
 	while ( (child = gf_list_enum(root->content, &i))) {
-		if (!gf_mpd_valid_child(mpd, child)) continue;
+		if (!gf_mpd_valid_child(mpd, child))
+			continue;
 		if (!strcmp(child->name, "BaseURL")) {
 			e = gf_mpd_parse_base_url(rep->base_URLs, child);
 			if (e) return e;
@@ -830,12 +843,12 @@
 		else if (!strcmp(child->name, "SegmentTemplate")) {
 			rep->segment_template = gf_mpd_parse_segment_template(mpd, child);
 		}
+		/*TODO
 		else if (!strcmp(child->name, "SubRepresentation")) {
-			/*TODO
 						e = gf_mpd_parse_subrepresentation(rep->sub_representations, child);
 						if (e) return e;
-			*/
 		}
+		*/
 		else if (!strcmp(child->name, "dasher")) {
 			assert(!rep->dasher_ctx);
 			rep->dasher_ctx = gf_mpd_parse_dasher_context(mpd, child);
@@ -843,13 +856,10 @@
 		else if (!strcmp(child->name, "segments")) {
 			assert(!rep->state_seg_list);
 			rep->state_seg_list = gf_mpd_parse_segments_context(mpd, child);
+		} else {
+			gf_mpd_parse_common_representation_child(mpd, (GF_MPD_CommonAttributes*)rep, root, child, &i, child_idx);
 		}
-		else{
-			/*We'll be assuming here that any unrecognized element is a representation level
-			 *descriptor*/
-			gf_mpd_parse_other_descriptors(child,rep->other_descriptors);
-
-		}
+		child_idx++;
 	}
 	return GF_OK;
 }
@@ -866,16 +876,16 @@
 	set->content_component = gf_list_new();
 	set->base_URLs = gf_list_new();
 	set->representations = gf_list_new();
-	set->other_descriptors = gf_list_new();
 	GF_SAFEALLOC(set->par, GF_MPD_Fractional);
 	/*assign default ID and group*/
 	set->group = -1;
+	set->id = -1;
 	return set;
 }
 
 static GF_Err gf_mpd_parse_adaptation_set(GF_MPD *mpd, GF_List *container, GF_XMLNode *root)
 {
-	u32 i;
+	u32 i, child_idx;
 	GF_MPD_AdaptationSet *set;
 	GF_XMLAttribute *att;
 	GF_XMLNode *child;
@@ -914,9 +924,10 @@
 			if (!strcmp(att->value, "false")) set->subsegment_starts_with_sap = 0;
 			else set->subsegment_starts_with_sap = gf_mpd_parse_int(att->value);
 		}
+		else gf_mpd_parse_common_representation_attr(mpd, (GF_MPD_CommonAttributes*)set, root, att, &i);
 	}
-	gf_mpd_parse_common_representation(mpd, (GF_MPD_CommonAttributes*)set, root);
 
+	child_idx = 0;
 	i = 0;
 	while ( (child = gf_list_enum(root->content, &i))) {
 		if (!gf_mpd_valid_child(mpd, child)) continue;
@@ -956,12 +967,10 @@
 		else if (!strcmp(child->name, "Representation")) {
 			e = gf_mpd_parse_representation(mpd, set->representations, child);
 			if (e) return e;
+		} else {
+			gf_mpd_parse_common_representation_child(mpd, (GF_MPD_CommonAttributes*)set, root, child, &i, child_idx);
 		}
-		else{
-			/*We'll be assuming here that any unrecognized element is a adaptation level
-			 *descriptor*/
-			gf_mpd_parse_other_descriptors(child,set->other_descriptors);
-		}
+		child_idx++;
 	}
 	return GF_OK;
 }
@@ -973,20 +982,31 @@
 	period->adaptation_sets = gf_list_new();
 	period->base_URLs = gf_list_new();
 	period->subsets = gf_list_new();
-	period->other_descriptors = gf_list_new();
 	return period;
 }
 
 GF_Err gf_mpd_parse_period(GF_MPD *mpd, GF_XMLNode *root)
 {
-	u32 i;
+	u32 i, child_idx;
 	GF_MPD_Period *period;
 	GF_XMLAttribute *att;
 	GF_XMLNode *child;
 	GF_Err e;
 
+	Bool is_preperiod = !strcmp(root->name, "PrePeriod") ? GF_TRUE : GF_FALSE;
+
+	if (is_preperiod) {
+		period = gf_list_get(mpd->periods, 0);
+		if (period) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] At most one PrePeriod allowed, and it shall be the first period\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+	}
+
 	period = gf_mpd_period_new();
 	if (!period) return GF_OUT_OF_MEM;
+	period->is_preroll = is_preperiod;
+
 	e = gf_list_add(mpd->periods, period);
 	if (e) return e;
 
@@ -995,14 +1015,25 @@
 		if (strstr(att->name, "href")) period->xlink_href = gf_mpd_parse_string(att->value);
 		else if (strstr(att->name, "actuate")) period->xlink_actuate_on_load = !strcmp(att->value, "onLoad") ? 1 : 0;
 		else if (!strcmp(att->name, "id")) period->ID = gf_mpd_parse_string(att->value);
-		else if (!strcmp(att->name, "start")) period->start = gf_mpd_parse_duration(att->value);
+		else if (!strcmp(att->name, "start")) {
+			if (is_preperiod) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] PrePeriod with @start not allowed, ignoring attribute\n"));
+			} else {
+				period->start = gf_mpd_parse_duration(att->value);
+			}
+		}
 		else if (!strcmp(att->name, "duration")) period->duration = gf_mpd_parse_duration(att->value);
 		else if (!strcmp(att->name, "bitstreamSwitching")) period->bitstream_switching = gf_mpd_parse_bool(att->value);
+		else {
+			MPD_STORE_EXTENSION_ATTR(period)
+		}
 	}
 
+	child_idx = 0;
 	i = 0;
 	while ( (child = gf_list_enum(root->content, &i))) {
-		if (!gf_mpd_valid_child(mpd, child)) continue;
+		if (!gf_mpd_valid_child(mpd, child))
+			continue;
 		if (!strcmp(child->name, "BaseURL")) {
 			e = gf_mpd_parse_base_url(period->base_URLs, child);
 			if (e) return e;
@@ -1022,12 +1053,10 @@
 		}
 		else if (!strcmp(child->name, "SubSet")) {
 		}
-		else{
-			/*We'll be assuming here that any unrecognized element is a period level
-			 *descriptor*/
-			gf_mpd_parse_other_descriptors(child, period->other_descriptors);
+		else {
+			MPD_STORE_EXTENSION_NODE(period)
 		}
-
+		child_idx++;
 	}
 	return GF_OK;
 }
@@ -1080,6 +1109,7 @@
 	if (ptr->source) gf_free(ptr->source);
 	if (ptr->copyright) gf_free(ptr->copyright);
 	if (ptr->more_info_url) gf_free(ptr->more_info_url);
+	MPD_FREE_EXTENSION_NODE(ptr);
 	gf_free(ptr);
 }
 void gf_mpd_segment_url_free(void *_ptr)
@@ -1129,6 +1159,7 @@
 	if (ptr->segment_timeline) gf_mpd_segment_timeline_free(ptr->segment_timeline);
 	gf_mpd_del_list(ptr->segment_URLs, gf_mpd_segment_url_free, 0);
 	if (ptr->dasher_segment_name) gf_free(ptr->dasher_segment_name);
+	if (ptr->previous_xlink_href) gf_free(ptr->previous_xlink_href);
 	gf_free(ptr);
 }
 
@@ -1146,27 +1177,6 @@
 	gf_free(ptr);
 }
 
-void gf_mpd_extensible_free(GF_MPD_ExtensibleVirtual *item)
-{
-	if (item->attributes) {
-		while (gf_list_count(item->attributes)) {
-			GF_XMLAttribute *att = gf_list_last(item->attributes);
-			gf_list_rem_last(item->attributes);
-			if (att->name) gf_free(att->name);
-			if (att->value) gf_free(att->value);
-			gf_free(att);
-		}
-		gf_list_del(item->attributes);
-	}
-	if (item->children) {
-		while (gf_list_count(item->children)) {
-			GF_XMLNode *child = gf_list_last(item->children);
-			gf_list_rem_last(item->children);
-			gf_xml_dom_node_del(child);
-		}
-		gf_list_del(item->children);
-	}
-}
 
 GF_MPD_Descriptor *gf_mpd_descriptor_new(const char *id, const char *schemeIdUri, const char *value) {
 	GF_MPD_Descriptor *mpd_desc;
@@ -1184,18 +1194,11 @@
 	if (mpd_desc->id) gf_free(mpd_desc->id);
 	if (mpd_desc->scheme_id_uri) gf_free(mpd_desc->scheme_id_uri);
 	if (mpd_desc->value) gf_free(mpd_desc->value);
-	gf_mpd_extensible_free((GF_MPD_ExtensibleVirtual *)mpd_desc);
+	MPD_FREE_EXTENSION_NODE(mpd_desc);
 
 	gf_free(mpd_desc);
 }
 
-void gf_mpd_other_descriptor_free(void *_item)
-{
-	GF_MPD_other_descriptors *ptr = (GF_MPD_other_descriptors *)_item;
-	if(ptr->xml_desc)gf_free(ptr->xml_desc);
-	gf_free(ptr);
-}
-
 void gf_mpd_content_component_free(void *item)
 {
 	GF_MPD_ContentComponent *component_descriptor=(GF_MPD_ContentComponent*) item;
@@ -1256,7 +1259,7 @@
 	if (ptr->segment_base) gf_mpd_segment_base_free(ptr->segment_base);
 	if (ptr->segment_list) gf_mpd_segment_list_free(ptr->segment_list);
 	if (ptr->segment_template) gf_mpd_segment_template_free(ptr->segment_template);
-	if (ptr->other_descriptors)gf_mpd_del_list(ptr->other_descriptors, gf_mpd_other_descriptor_free, 0);
+	MPD_FREE_EXTENSION_NODE(ptr);
 
 	if (ptr->dasher_ctx) {
 		gf_free(ptr->dasher_ctx->init_seg);
@@ -1273,6 +1276,8 @@
 			GF_DASH_SegmentContext *s = gf_list_pop_back(ptr->state_seg_list);
 			if (s->filename) gf_free(s->filename);
 			if (s->filepath) gf_free(s->filepath);
+			if (s->frags) gf_free(s->frags);
+			if (s->hls_key_uri) gf_free(s->hls_key_uri);
 			gf_free(s);
 		}
 		gf_list_del(ptr->state_seg_list);
@@ -1301,7 +1306,7 @@
 	if (ptr->segment_template) gf_mpd_segment_template_free(ptr->segment_template);
 	gf_mpd_del_list(ptr->base_URLs, gf_mpd_base_url_free, 0);
 	gf_mpd_del_list(ptr->representations, gf_mpd_representation_free, 0);
-	gf_mpd_del_list(ptr->other_descriptors, gf_mpd_other_descriptor_free, 0);
+	MPD_FREE_EXTENSION_NODE(ptr);
 	gf_free(ptr);
 }
 
@@ -1310,6 +1315,7 @@
 	GF_MPD_Period *ptr = (GF_MPD_Period *)_item;
 	if (ptr->ID) gf_free(ptr->ID);
 	if (ptr->origin_base_url) gf_free(ptr->origin_base_url);
+	if (ptr->broken_xlink) gf_free(ptr->broken_xlink);
 	if (ptr->xlink_href) gf_free(ptr->xlink_href);
 	if (ptr->segment_base) gf_mpd_segment_base_free(ptr->segment_base);
 	if (ptr->segment_list) gf_mpd_segment_list_free(ptr->segment_list);
@@ -1317,7 +1323,7 @@
 
 	gf_mpd_del_list(ptr->base_URLs, gf_mpd_base_url_free, 0);
 	gf_mpd_del_list(ptr->adaptation_sets, gf_mpd_adaptation_set_free, 0);
-	gf_mpd_del_list(ptr->other_descriptors,gf_mpd_other_descriptor_free,0);
+	MPD_FREE_EXTENSION_NODE(ptr);
 	gf_mpd_del_list(ptr->subsets, NULL/*TODO*/, 0);
 	gf_free(ptr);
 }
@@ -1340,7 +1346,9 @@
 	if (mpd->profiles) gf_free(mpd->profiles);
 	if (mpd->ID) gf_free(mpd->ID);
 	gf_mpd_del_list(mpd->utc_timings, gf_mpd_descriptor_free, 0);
-	gf_mpd_extensible_free((GF_MPD_ExtensibleVirtual*) mpd);
+	gf_mpd_del_list(mpd->essential_properties, gf_mpd_descriptor_free, 0);
+	gf_mpd_del_list(mpd->supplemental_properties, gf_mpd_descriptor_free, 0);
+	MPD_FREE_EXTENSION_NODE(mpd);
 	gf_free(mpd);
 }
 
@@ -1349,7 +1357,7 @@
 GF_Err gf_mpd_complete_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *default_base_url)
 {
 	GF_Err e;
-	u32 i;
+	u32 i, child_idx;
 	Bool ns_ok = GF_FALSE;
 	GF_XMLAttribute *att;
 	GF_XMLNode *child;
@@ -1376,7 +1384,7 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Wrong namespace found for DASH MPD - cannot parse\n"));
 	}
 
-	if (!strcmp(root->name, "Period")) {
+	if (!strcmp(root->name, "PrePeriod") || !strcmp(root->name, "Period")) {
 		return gf_mpd_parse_period(mpd, root);
 	}
 
@@ -1424,6 +1432,7 @@
 	if (mpd->type == GF_MPD_TYPE_STATIC)
 		mpd->minimum_update_period = mpd->time_shift_buffer_depth = 0;
 
+	child_idx = 0;
 	i = 0;
 	while ( ( child = gf_list_enum(root->content, &i )) ) {
 		if (! gf_mpd_valid_child(mpd, child))
@@ -1435,7 +1444,7 @@
 		} else if (!strcmp(child->name, "Location")) {
 			char *str = gf_mpd_parse_text_content(child);
 			if (str) gf_list_add(mpd->locations, str);
-		} else if (!strcmp(child->name, "Period")) {
+		} else if (!strcmp(child->name, "PrePeriod") || !strcmp(child->name, "Period")) {
 			e = gf_mpd_parse_period(mpd, child);
 			if (e) return e;
 		} else if (!strcmp(child->name, "Metrics")) {
@@ -1445,9 +1454,15 @@
 			if (e) return e;
 		} else if (!strcmp(child->name, "UTCTiming")) {
 			gf_mpd_parse_descriptor(mpd->utc_timings, child);
+		} else if (!strcmp(child->name, "EssentialProperty")) {
+			gf_mpd_parse_descriptor(mpd->essential_properties, child);
+		}
+		else if (!strcmp(child->name, "SupplementalProperty")) {
+			gf_mpd_parse_descriptor(mpd->supplemental_properties, child);
 		} else {
 			MPD_STORE_EXTENSION_NODE(mpd)
 		}
+		child_idx++;
 	}
 
 	return GF_OK;
@@ -1462,6 +1477,8 @@
 	mpd->locations = gf_list_new();
 	mpd->metrics = gf_list_new();
 	mpd->utc_timings = gf_list_new();
+	mpd->essential_properties = gf_list_new();
+	mpd->supplemental_properties = gf_list_new();
 }
 
 GF_EXPORT
@@ -1479,8 +1496,7 @@
 	return gf_mpd_complete_from_dom(root, mpd, default_base_url);
 }
 
-static GF_Err gf_m3u8_fill_mpd_struct(MasterPlaylist *pl, const char *m3u8_file, const char *src_base_url, const char *mpd_file, char *title, Double update_interval,
- char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, Bool use_segment_timeline, Bool is_end, u32 max_dur, GF_MPD *mpd, Bool parse_sub_playlist)
+static GF_Err gf_m3u8_fill_mpd_struct(MasterPlaylist *pl, const char *m3u8_file, const char *src_base_url, const char *mpd_file, char *title, Double update_interval, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, Bool use_segment_timeline, Bool is_end, u32 max_dur, GF_MPD *mpd, Bool parse_sub_playlist)
 {
 	char *sep, *template_base=NULL, *template_ext;
 	u32 nb_streams, i, j, k, template_width, template_idx_start;
@@ -1489,6 +1505,7 @@
 	GF_MPD_ProgramInfo *info;
 	GF_MPD_Period *period;
 	GF_Err e;
+	if (!parse_sub_playlist) use_mpd_templates = GF_FALSE;
 	Bool all_template_used = use_mpd_templates;
 	char str[1024];
 
@@ -1496,7 +1513,6 @@
 	gf_mpd_init_struct(mpd);
 
 	mpd->time_shift_buffer_depth = (u32) -1; /*infinite by default*/
-	mpd->xml_namespace = "urn:mpeg:dash:schema:mpd:2011";
 	mpd->type = is_end ? GF_MPD_TYPE_STATIC : GF_MPD_TYPE_DYNAMIC;
 
 
@@ -1560,6 +1576,7 @@
 		Bool use_template = use_mpd_templates;
 		GF_SAFEALLOC(set, GF_MPD_AdaptationSet);
 		if (!set) return GF_OUT_OF_MEM;
+		set->id = -1;
 		gf_mpd_init_common_attributes((GF_MPD_CommonAttributes *)set);
 		set->accessibility = gf_list_new();
 		set->role = gf_list_new();
@@ -1669,7 +1686,7 @@
 			all_template_used = GF_FALSE;
 		}
 		for (j=0; j<count_variants; j++) {
-			char *base_url=NULL;
+			char *variant_base_url=NULL;
 			u32 count_elements;
 			char szName[20];
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
@@ -1722,21 +1739,24 @@
 			if (parse_sub_playlist && !elt)
 				break;
 
-			if (elt) {
-				base_url = gf_url_get_absolute_path(elt->url, pe->url);
-			} else {
-				base_url = gf_strdup(pe->url);
-			}
-			sep = strrchr(base_url, '/');
-			if (!sep)
-				sep = strrchr(base_url, '\\');
+			//get base URL of child manifest, only needed when injecting base URL
+			variant_base_url = gf_strdup(pe->url);
+
+			sep = strrchr(variant_base_url, '/');
+			if (!sep) sep = strrchr(variant_base_url, '\\');
 			/*keep final '/' */
-			if (sep)
+			if (sep) {
 				sep[1] = 0;
-			/* if no path separator then base_url is just a filename */
+				/* base_url is same as manifest dir, no add of MPD BaseURL */
+				if (!strcmp(variant_base_url, "./") || !strcmp(variant_base_url, ".\\")) {
+					gf_free(variant_base_url);
+					variant_base_url = NULL;
+				}
+			}
+			/* base_url is just a filename so is same as manifest dir, no add of MPD BaseURL */
 			else {
-				free(base_url);
-				base_url = gf_strdup("./");
+				gf_free(variant_base_url);
+				variant_base_url = NULL;
 			}
 
 			width = pe->width;
@@ -1754,7 +1774,10 @@
 
 				br_start = elt->init_segment_url ? elt->init_byte_range_start : elt->byte_range_start;
 				br_end = elt->init_segment_url ? elt->init_byte_range_end : elt->byte_range_end;
-				elt_url = gf_url_get_absolute_path(elt_url, pe->url);
+
+				char *par_url = gf_url_concatenate(src_base_url, pe->url);
+				elt_url = gf_url_concatenate(par_url, elt_url);
+				gf_free(par_url);
 
 				memset(&import, 0, sizeof(GF_MediaImporter));
 				import.trackID = 0;
@@ -1777,12 +1800,12 @@
 
 				if (!strstr(elt_url, "://") && !gf_file_exists(elt_url)) {
 					import_file = GF_FALSE;
+					if (elt_url) gf_free(elt_url);
 					goto retry_import;
 				}
 				e = gf_media_import(&import);
 
 				if (e != GF_OK) {
-//					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] M3U8 missing Media Element %s< (Playlist %s) %s \n", import.in_name, base_url));
 					k++;
 					if (elt_url) gf_free(elt_url);
 					goto try_next_segment;
@@ -1810,25 +1833,21 @@
 					gf_file_delete(tmp_file);
 
 				if (!pe->codecs) {
-					char szCodecs[1024];
-					szCodecs[0] = 0;
+					char *codecs = NULL;
 					for (k=0; k<import.nb_tracks; k++) {
 						if (strlen(import.tk_info[k].szCodecProfile)) {
-							if (strlen(szCodecs)) strcat(szCodecs, ",");
-							strcat(szCodecs, import.tk_info[k].szCodecProfile);
+							gf_dynstrcat(&codecs, import.tk_info[k].szCodecProfile, ",");
 						}
 					}
-					pe->codecs = gf_strdup(szCodecs);
+					pe->codecs = codecs;
 				}
 				for (k=0; k<import.nb_tracks; k++) {
 					switch (import.tk_info[k].stream_type) {
-					case GF_ISOM_MEDIA_VISUAL:
- case GF_ISOM_MEDIA_AUXV:
- case GF_ISOM_MEDIA_PICT:
+					case GF_STREAM_VISUAL:
 						width = import.tk_info[k].video_info.width;
 						height = import.tk_info[k].video_info.height;
 						break;
-					case GF_ISOM_MEDIA_AUDIO:
+					case GF_STREAM_AUDIO:
 						samplerate = import.tk_info[k].audio_info.sample_rate;
 						num_channels = import.tk_info[k].audio_info.nb_channels;
 						break;
@@ -1864,13 +1883,20 @@
 			if (pe->codecs) {
 				rep->codecs = gf_strdup(pe->codecs);
 			}
-			if (pe->language) {
-				//???
+			if (pe->language && !set->lang) {
+				set->lang = pe->language;
+				pe->language = NULL;
 			}
 			if (width && height) {
 				rep->width = width;
 				rep->height = height;
 			}
+			if (elt) {
+				if (elt->drm_method==DRM_AES_128)
+					rep->crypto_type = 1;
+				else if (elt->drm_method==DRM_CENC)
+					rep->crypto_type = 2;
+			}
 			if (samplerate) {
 				rep->samplerate = samplerate;
 			}
@@ -1887,64 +1913,109 @@
 				}
 			}
 
+			//if parsing subplaylist with a MPD, we translate HLS to MPD directly
+			//compute relative url from source HLS to target MPD and inject it in base URL (SegmentTemplate or SegmentList)
+			//otherwise, we use the element url as is, and wait for xlink resolution, which will be done
+			//against the HLS base URL
+			char *rel_url = NULL;
+			if (parse_sub_playlist && mpd_file) {
+				u32 base_len;
+				//check we do not generate the MPD at the same location
+				char *f1 = gf_file_basename(mpd_file);
+				char *f2 = gf_file_basename(src_base_url);
+				base_len = (u32) (f1 - mpd_file);
+				if ((base_len == (u32) (f2 - src_base_url)) && !strncmp(src_base_url, mpd_file, base_len)) {
+					rel_url = NULL;
+				} else {
+					rel_url = gf_url_concatenate_parent(mpd_file, src_base_url);
+				}
+			}
+
 
 			if (use_template) {
-				GF_MPD_BaseURL *url;
-				GF_SAFEALLOC(url, GF_MPD_BaseURL);
-				if (! url) return GF_OUT_OF_MEM;
-				e = gf_list_add(rep->base_URLs, url);
-				if (e) return GF_OUT_OF_MEM;
-				url->URL = gf_strdup(base_url);
+				//inject baseURL pointing to source playlist
+				if (rel_url || variant_base_url) {
+					GF_MPD_BaseURL *url;
+					GF_SAFEALLOC(url, GF_MPD_BaseURL);
+					if (! url) return GF_OUT_OF_MEM;
+					e = gf_list_add(rep->base_URLs, url);
+					if (e) return GF_OUT_OF_MEM;
 
+					if (rel_url) {
+						if (variant_base_url)
+							url->URL = gf_url_concatenate(rel_url, variant_base_url);
+						else
+							url->URL = gf_strdup(rel_url);
+					} else {
+						url->URL = gf_strdup(variant_base_url);
+					}
+				}
 
 				if (elt->init_segment_url) {
-					u32 len = (u32) strlen(base_url);
 					GF_SAFEALLOC(rep->segment_template, GF_MPD_SegmentTemplate);
 					if (!rep->segment_template) return GF_OUT_OF_MEM;
 					rep->segment_template->start_number = (u32) -1;
-					if (!strncmp(base_url, elt->init_segment_url, len)) {
-						rep->segment_template->initialization = gf_strdup(elt->init_segment_url + len);
-					} else {
-						rep->segment_template->initialization = gf_strdup(elt->init_segment_url);
-					}
+					//no need to conctenate with rel_url since it is now in our MPD base url
+					rep->segment_template->initialization = gf_strdup(elt->init_segment_url);
 				}
 
+				if (rel_url) gf_free(rel_url);
+				if (variant_base_url) gf_free(variant_base_url);
 				continue;
 			}
 
 			byte_range_media_file = NULL;
 			elt = gf_list_get(pe->element.playlist.elements, 0);
-			if (elt && (elt->byte_range_end || elt->byte_range_start)) {
+
+			if (parse_sub_playlist && elt && (elt->byte_range_end || elt->byte_range_start)) {
+				byte_range_media_file = elt->url;
+			}
+
+			//only if we parse subplaylist now (otherwise baseURL added when resolving xlink)
+			if (parse_sub_playlist && elt && (
+				//if byte-range media file, add base URL
+				byte_range_media_file
+				//otherwise if we have different location for HLS vs MPD url or if child playlist is not in same path as master HLS
+				|| (rel_url || strchr(elt->url, '/') || strchr(elt->url, '\\'))
+			)) {
 				GF_MPD_BaseURL *url;
 				GF_SAFEALLOC(url, GF_MPD_BaseURL);
-				if (! url) return GF_OUT_OF_MEM;
+				if (! url) {
+					if (rel_url) gf_free(rel_url);
+					if (variant_base_url) gf_free(variant_base_url);
+					return GF_OUT_OF_MEM;
+				}
 				e = gf_list_add(rep->base_URLs, url);
-				if (e) return GF_OUT_OF_MEM;
-				byte_range_media_file = elt->url;
-				url->URL = gf_strdup(byte_range_media_file);
-			} else {
-				u32 url_len = (u32) strlen(base_url);
-				if (!strcmp(base_url, "./") || !strcmp(base_url, ".")) {
-
-				} else if (strncmp(base_url, mpd_file, url_len)) {
-					GF_MPD_BaseURL *url;
-					GF_SAFEALLOC(url, GF_MPD_BaseURL);
-					if (! url) return GF_OUT_OF_MEM;
-					e = gf_list_add(rep->base_URLs, url);
-					if (e) return GF_OUT_OF_MEM;
-					url->URL = gf_url_concatenate_parent(mpd_file, base_url);
+				if (e) {
+					if (rel_url) gf_free(rel_url);
+					if (variant_base_url) gf_free(variant_base_url);
+					return GF_OUT_OF_MEM;
+				}
+				if (rel_url) {
+					if (variant_base_url) {
+						char *rel_base = gf_url_concatenate(rel_url, variant_base_url);
+						url->URL = gf_url_concatenate(rel_base, elt->url);
+						gf_free(rel_base);
+					} else {
+						url->URL = gf_strdup(rel_url);
+					}
 				}
+				else
+					url->URL = gf_strdup(elt->url);
 			}
+			if (rel_url) gf_free(rel_url);
+			//no longer needed
+			if (variant_base_url) gf_free(variant_base_url);
 
 			GF_SAFEALLOC(rep->segment_list, GF_MPD_SegmentList);
 			if (!rep->segment_list) return GF_OUT_OF_MEM;
-			// doesn't parse sub-playlists, we need to save URL to these sub-playlist in xlink:href so that we can get the segment URL when we need
-			// note: for MPD type static, always parse all sub-playlist because we just do it once in a period
-			if (/*(mpd->type == GF_MPD_TYPE_DYNAMIC) && */ !parse_sub_playlist) {
+
+			//Not parsing sub-playlists, save URL to these sub-playlist in xlink:href
+			//resolution will be done against the HLS base URL
+			//child playlist will be loaded if active and not modified since last load
+			if (!parse_sub_playlist) {
 				rep->segment_list->xlink_href = pe->url;
 				pe->url=NULL;
-				gf_free(base_url);
-				base_url = NULL;
 				if (template_base) {
 					gf_free(template_base);
 					template_base = NULL;
@@ -1955,15 +2026,11 @@
 			rep->segment_list->duration = (u64) (pe->duration_info * 1000);
 			rep->segment_list->timescale = 1000;
 			if (elt && elt->init_segment_url) {
-				u32 len = (u32) strlen(base_url);
 				GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
 				if (!rep->segment_list->initialization_segment) return GF_OUT_OF_MEM;
 
-				if (!strncmp(base_url, elt->init_segment_url, len)) {
-					rep->segment_list->initialization_segment->sourceURL = gf_strdup(elt->init_segment_url + len);
-				} else {
-					rep->segment_list->initialization_segment->sourceURL = gf_strdup(elt->init_segment_url);
-				}
+				rep->segment_list->initialization_segment->sourceURL = gf_strdup(elt->init_segment_url);
+
 				if (elt->init_byte_range_end) {
 					GF_SAFEALLOC(rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
 					if (!rep->segment_list->initialization_segment->byte_range) return GF_OUT_OF_MEM;
@@ -2015,15 +2082,14 @@
 						elt->url=NULL;
 					}
 				} else {
-					u32 len = (u32) strlen(base_url);
-					if (!strncmp(base_url, elt->url, len)) {
-						segment_url->media = gf_strdup(elt->url+len);
-					} else {
-						segment_url->media = elt->url;
-						elt->url=NULL;
-					}
+					segment_url->media = elt->url;
+					elt->url=NULL;
 				}
-
+				//only signal duration if different from default one
+				segment_url->duration = (u64) (rep->segment_list->timescale * elt->duration_info);
+				if (segment_url->duration == rep->segment_list->duration)
+					segment_url->duration = 0;
+					
 				if (elt->drm_method != DRM_NONE) {
 					//segment_url->key_url = "aes-128";
 					if (elt->key_uri) {
@@ -2053,7 +2119,6 @@
 					gf_list_add(rep->segment_list->segment_timeline->entries, se);
 				}
 			}
-			gf_free(base_url);
 		}
 
 		if (template_base) {
@@ -2099,6 +2164,7 @@
 		mpd_file = m3u8_file;
 	}
 
+	mpd->xml_namespace = NULL;
 	the_pe = NULL;
 	pe = NULL;
 	i = 0;
@@ -2147,7 +2213,7 @@
 					continue;
 				}
 				if (e == GF_OK) {
-					pe->load_error = gf_m3u8_parse_sub_playlist(getter->get_cache_name(getter), &pl, suburl, stream, pe);
+					pe->load_error = gf_m3u8_parse_sub_playlist(getter->get_cache_name(getter), &pl, suburl, stream, pe, GF_FALSE);
 				}
 				//getter->del_session(getter);
 			} else { /* for use in MP4Box */
@@ -2155,14 +2221,14 @@
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] Downloading %s...\n", suburl));
 					e = gf_dm_wget(suburl, "tmp.m3u8", 0, 0, NULL);
 					if (e == GF_OK) {
-						e = gf_m3u8_parse_sub_playlist("tmp.m3u8", &pl, suburl, stream, pe);
+						e = gf_m3u8_parse_sub_playlist("tmp.m3u8", &pl, suburl, stream, pe, GF_FALSE);
 					} else {
 						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Download failed for %s\n", suburl));
 						e = GF_OK;
 					}
 					gf_file_delete("tmp.m3u8");
 				} else {
-					e = gf_m3u8_parse_sub_playlist(suburl, &pl, suburl, stream, pe);
+					e = gf_m3u8_parse_sub_playlist(suburl, &pl, suburl, stream, pe, GF_FALSE);
 				}
 				if (e) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Failed to parse subplaylist %s\n", suburl));
@@ -2200,8 +2266,10 @@
 	if (is_end || ((the_pe->element_type == TYPE_PLAYLIST) && the_pe->element.playlist.is_ended)) {
 		update_interval = 0;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] No need to refresh playlist!\n"));
+		mpd->type = GF_MPD_TYPE_STATIC;
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] Playlist will be refreshed every %g seconds, len=%d\n", update_interval, the_pe->duration_info));
+		mpd->type = GF_MPD_TYPE_DYNAMIC;
 	}
 
 	title = the_pe->title;
@@ -2215,24 +2283,24 @@
 
 	gf_m3u8_master_playlist_del(&pl);
 
-	//if local file force static
-	if (strstr(base_url, "://")==NULL)
-		mpd->type = GF_MPD_TYPE_STATIC;
-
 	return e;
 }
 
 GF_EXPORT
-GF_Err gf_m3u8_solve_representation_xlink(GF_MPD_Representation *rep, GF_FileDownload *getter, Bool *is_static, u64 *duration)
+GF_Err gf_m3u8_solve_representation_xlink(GF_MPD_Representation *rep, const char *base_url, GF_FileDownload *getter, Bool *is_static, u64 *duration, u8 last_sig[GF_SHA1_DIGEST_SIZE])
 {
 	GF_Err e;
 	MasterPlaylist *pl = NULL;
 	Stream *stream;
 	PlaylistElement *pe;
 	u32 k, count_elements;
-	u64 start_time=0;
-	u32 base_url_len = 0;
-	char *base_url = NULL;
+	u32 seq_num;
+	Bool has_full_seg_following = GF_FALSE;
+	Bool can_merge_parts = GF_FALSE;
+	Bool first_ll_part = GF_TRUE;
+	u8 signature[GF_SHA1_DIGEST_SIZE];
+	const char *loc_file = rep->segment_list->xlink_href;
+	char *full_url;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] Solving m3u8 variant playlist %s\n", rep->segment_list->xlink_href));
 
@@ -2241,25 +2309,62 @@
 		return GF_BAD_PARAM;
 	}
 
-	if (gf_url_is_local(rep->segment_list->xlink_href)) {
-		e = gf_m3u8_parse_master_playlist(rep->segment_list->xlink_href, &pl, rep->segment_list->xlink_href);
+	//get absolute resource path
+	full_url = gf_url_concatenate(base_url, rep->segment_list->xlink_href);
+
+	if (!strncmp(loc_file, "gmem://", 7)) {
+		u8 *m3u8_payload;
+		u32 m3u8_size;
+		e = gf_blob_get(loc_file, &m3u8_payload, &m3u8_size, NULL);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot load m3u8 source blob %s\n", loc_file));
+			gf_free(full_url);
+			return e;
+		}
+		gf_blob_release(loc_file);
+
+		gf_sha1_csum(m3u8_payload, m3u8_size, signature);
+	} else if (gf_url_is_local(full_url)) {
+		loc_file = full_url;
+		gf_sha1_file(loc_file, signature);
 	} else {
-		e = getter->new_session(getter, rep->segment_list->xlink_href);
+		e = getter->new_session(getter, full_url);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] Download failed for %s\n", rep->segment_list->xlink_href));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] Download failed for %s: %s\n", rep->segment_list->xlink_href, gf_error_to_string(e) ));
+			gf_free(full_url);
 			return e;
 		}
-		e = gf_m3u8_parse_master_playlist(getter->get_cache_name(getter), &pl, rep->segment_list->xlink_href);
+		loc_file = getter->get_cache_name(getter);
+		gf_sha1_file(loc_file, signature);
+	}
+	if (! memcmp(signature, last_sig, GF_SHA1_DIGEST_SIZE)) {
+		gf_free(full_url);
+		return GF_EOS;
 	}
+
+	e = gf_m3u8_parse_sub_playlist(loc_file, &pl, rep->segment_list->xlink_href, NULL, NULL, GF_FALSE);
+	//no longer needed
+	gf_free(full_url);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] Failed to parse playlist %s\n", rep->segment_list->xlink_href));
-		return GF_NON_COMPLIANT_BITSTREAM;
+		gf_m3u8_master_playlist_del(&pl);
+		return e;
 	}
 
 	assert(pl);
 	assert(pl->streams);
+
+	if (!gf_list_count(pl->streams)) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M3U8] Playlist %s still empty\n", rep->segment_list->xlink_href));
+		gf_m3u8_master_playlist_del(&pl);
+		return GF_IP_NETWORK_EMPTY;
+	}
+
 	assert(gf_list_count(pl->streams) == 1);
 
+
+	memcpy(last_sig, signature, GF_SHA1_DIGEST_SIZE);
+
 	if (is_static) {
 		*is_static = pl->playlist_needs_refresh ? GF_FALSE : GF_TRUE;
 	}
@@ -2272,21 +2377,17 @@
 		*duration = (u32) (stream->computed_duration * 1000);
 	}
 
-	if (gf_list_count(rep->base_URLs)) {
-		GF_MPD_BaseURL *burl = gf_list_get(rep->base_URLs, 0);
-		if (burl->URL) {
-			base_url = burl->URL;
-			base_url_len = (u32) strlen(base_url);
-		}
-	}
-	if (!base_url) {
-		base_url = rep->segment_list->xlink_href;
-		if (base_url) {
-			char *sep = gf_file_basename(base_url);
-			if (sep)
-				base_url_len = (u32) (sep - base_url);
-		}
+	//create a base URL if not found, otherwise modify existing one, pointing to our unresolved base (xlink)
+	//if xlink is relative, it wil still be resolved against manifest base url when solving segment templates
+	//this allows using parent path (ie "../") in the master playlist
+	GF_MPD_BaseURL *burl = gf_list_get(rep->base_URLs, 0);
+	if (!burl) {
+		GF_SAFEALLOC(burl, GF_MPD_BaseURL);
+		gf_list_add(rep->base_URLs, burl);
+	} else {
+		gf_free(burl->URL);
 	}
+	burl->URL = gf_strdup(rep->segment_list->xlink_href);
 
 	if (pe->init_segment_url) {
 		if (!rep->segment_list->initialization_segment) {
@@ -2310,6 +2411,8 @@
 		}
 	}
 	rep->starts_with_sap = pl->independent_segments ? 1: 3;
+	if (pl->low_latency)
+		rep->m3u8_low_latency = GF_TRUE;
 
 	rep->segment_list->duration = (u64) (pe->duration_info * 1000);
 	rep->segment_list->timescale = 1000;
@@ -2318,9 +2421,12 @@
 	if (!rep->segment_list->segment_URLs)
 		rep->segment_list->segment_URLs = gf_list_new();
 	count_elements = gf_list_count(pe->element.playlist.elements);
+
+	seq_num = pe->element.playlist.media_seq_min;
+	seq_num += pe->element.playlist.discontinuity;
+
 	for (k=0; k<count_elements; k++) {
 		GF_MPD_SegmentURL *segment_url;
-		char *seg_url;
 		PlaylistElement *elt = gf_list_get(pe->element.playlist.elements, k);
 		if (!elt)
 			continue;
@@ -2330,6 +2436,46 @@
 			rep->playback.disabled = GF_TRUE;
 			return GF_OK;
 		}
+		if (elt->drm_method==DRM_AES_128)
+			rep->crypto_type = 1;
+		else if (elt->drm_method==DRM_CENC)
+			rep->crypto_type = 2;
+
+		if (elt->low_lat_chunk && !has_full_seg_following) {
+			u32 j;
+			u64 last_end = 0;
+			if (elt->byte_range_end && first_ll_part) {
+				last_end = elt->byte_range_end;
+				can_merge_parts = GF_TRUE;
+			}
+			for (j=k+1; j<count_elements; j++) {
+				PlaylistElement *next_elt = gf_list_get(pe->element.playlist.elements, j);
+				if (next_elt->low_lat_chunk) {
+					Bool match = GF_TRUE;
+					if (!first_ll_part) continue;
+
+					if (strcmp(elt->url, next_elt->url))
+						match = GF_FALSE;
+					else if (!elt->byte_range_end && next_elt->byte_range_end)
+						match = GF_FALSE;
+					else if (elt->byte_range_end && !next_elt->byte_range_end)
+						match = GF_FALSE;
+					else if (last_end + 1 != next_elt->byte_range_start)
+						match = GF_FALSE;
+					else
+						last_end = next_elt->byte_range_end;
+
+					if (!match)
+						can_merge_parts = GF_FALSE;
+
+					continue;
+				}
+				has_full_seg_following = GF_TRUE;
+				if (strcmp(elt->url, next_elt->url))
+					can_merge_parts = GF_FALSE;
+				break;
+			}
+		}
 
 		GF_SAFEALLOC(segment_url, GF_MPD_SegmentURL);
 		if (!segment_url) {
@@ -2337,23 +2483,33 @@
 		}
 		gf_list_add(rep->segment_list->segment_URLs, segment_url);
 
-		//get absolute url, and remove base from it if we have a baseURL
-		if (base_url && !strncmp(elt->url, base_url, base_url_len)) {
-			segment_url->media = gf_strdup(elt->url + base_url_len);
+
+		segment_url->media = elt->url;
+		elt->url = NULL;
+
+		segment_url->duration = (u64) (rep->segment_list->timescale * elt->duration_info);
+
+		segment_url->hls_utc_time = elt->utc_start_time;
+
+		//we keep the same seq num for each part
+		segment_url->hls_seq_num = seq_num;
+
+		if (elt->low_lat_chunk) {
+			segment_url->hls_ll_chunk_type = (elt->independent_chunk || first_ll_part) ? 2 : 1;
+			segment_url->can_merge = can_merge_parts ? 1 : 0;
+			segment_url->is_first_part = first_ll_part;
+			rep->m3u8_low_latency = GF_TRUE;
+			first_ll_part = GF_FALSE;
+			if (segment_url->hls_ll_chunk_type==2)
+				rep->m3u8_media_seq_indep_last = gf_list_count(rep->segment_list->segment_URLs) - 1;
 		} else {
-			seg_url = gf_url_concatenate(pe->url, elt->url);
-			if (base_url && !strncmp(seg_url, base_url, base_url_len)) {
-				segment_url->media = gf_strdup(seg_url + base_url_len);
-				gf_free(seg_url);
-			} else {
-				segment_url->media = seg_url;
-			}
+			first_ll_part = GF_TRUE;
+			has_full_seg_following = GF_FALSE;
+			can_merge_parts = GF_FALSE;
+			rep->m3u8_media_seq_indep_last = gf_list_count(rep->segment_list->segment_URLs) - 1;
+			seq_num++;
 		}
 
-		if (! elt->utc_start_time) elt->utc_start_time = start_time;
-		segment_url->hls_utc_start_time = elt->utc_start_time;
-		start_time = elt->utc_start_time + (u64) (1000*elt->duration_info);
-
 		if (elt->drm_method != DRM_NONE) {
 			if (elt->key_uri) {
 				segment_url->key_url = elt->key_uri;
@@ -2374,7 +2530,8 @@
 		rep->segment_list->segment_URLs = NULL;
 	}
 
-	gf_free(rep->segment_list->xlink_href);
+	if (rep->segment_list->previous_xlink_href) gf_free(rep->segment_list->previous_xlink_href);
+	rep->segment_list->previous_xlink_href = rep->segment_list->xlink_href;
 	rep->segment_list->xlink_href = NULL;
 
 	gf_m3u8_master_playlist_del(&pl);
@@ -2494,7 +2651,7 @@
 	if (s->index_range_exact) gf_fprintf(out, " indexRangeExact=\"true\"");
 	if (s->index_range) gf_fprintf(out, " indexRange=\""LLD"-"LLD"\"", s->index_range->start_range, s->index_range->end_range);
 	if (s->availability_time_offset) gf_fprintf(out, " availabilityTimeOffset=\"%g\"", s->availability_time_offset);
-	if (s->time_shift_buffer_depth)
+	if ((s32) s->time_shift_buffer_depth > 0)
 		gf_mpd_print_duration(out, "timeShiftBufferDepth", s->time_shift_buffer_depth, GF_TRUE);
 }
 
@@ -2635,34 +2792,45 @@
 	gf_mpd_lf(out, indent);
 }
 
-static void gf_mpd_extensible_print_attr(FILE *out, GF_MPD_ExtensibleVirtual *item)
+static void gf_mpd_extensible_print_attr(FILE *out, GF_List *attributes)
 {
-	if (item->attributes) {
-		u32 j=0;
-		GF_XMLAttribute *att;
-		while ((att = (GF_XMLAttribute *)gf_list_enum(item->attributes, &j))) {
-			if (!strcmp(att->name, "xmlns")) continue;
-			else if (!strcmp(att->name, "xmlns:gpac")) continue;
-			gf_fprintf(out, " %s=\"", att->name);
-			gf_xml_dump_string(out, NULL, att->value, "\"");
-		}
+	if (!attributes) return;
+	u32 j=0;
+	GF_XMLAttribute *att;
+	while ((att = (GF_XMLAttribute *)gf_list_enum(attributes, &j))) {
+		if (!strcmp(att->name, "xmlns")) continue;
+		else if (!strcmp(att->name, "xmlns:gpac")) continue;
+		gf_fprintf(out, " %s=\"", att->name);
+		gf_xml_dump_string(out, NULL, att->value, "\"");
 	}
 }
 
-static void gf_mpd_extensible_print_nodes(FILE *out, GF_MPD_ExtensibleVirtual *item, s32 indent)
+static void gf_mpd_extensible_print_nodes(FILE *out, GF_List *children, s32 indent, u32 *child_idx, Bool is_final)
 {
-	if (item->children) {
-		u32 j=0;
-		GF_XMLNode *child;
-		gf_fprintf(out, ">");
-		gf_mpd_lf(out, indent);
-		while ((child = (GF_XMLNode *)gf_list_enum(item->children, &j))) {
-			char *txt = gf_xml_dom_serialize(child, 0);
-			gf_mpd_nl(out, indent+1);
-			gf_fprintf(out, "%s", txt);
-			gf_free(txt);
-			gf_mpd_lf(out, indent);
+	u32 idx=0, i, count;
+	if (!children) return;
+	idx = *child_idx;
+	count = gf_list_count(children);
+	for (i=0; i<count; i++) {
+		char *txt;
+		GF_XMLNode *child = (GF_XMLNode *) gf_list_get(children, i);
+
+		if (child->orig_pos < idx)
+			continue;
+		if ((child->orig_pos > idx) && !is_final) {
+			*child_idx = idx+1;
+			return;
 		}
+
+		txt = gf_xml_dom_serialize(child, GF_FALSE, GF_TRUE);
+		gf_mpd_nl(out, indent+1);
+		gf_fprintf(out, "%s", txt);
+		gf_free(txt);
+		gf_mpd_lf(out, indent);
+		idx++;
+	}
+	if (!is_final) {
+		*child_idx = idx+1;
 	}
 }
 
@@ -2674,10 +2842,13 @@
 	if (desc->scheme_id_uri) gf_fprintf(out, " schemeIdUri=\"%s\"", desc->scheme_id_uri);
 	if (desc->value) gf_fprintf(out, " value=\"%s\"", desc->value);
 
-	if (desc->attributes) gf_mpd_extensible_print_attr(out, (GF_MPD_ExtensibleVirtual*)desc);
+	gf_mpd_extensible_print_attr(out, desc->x_attributes);
 
-	if (desc->children) {
-		gf_mpd_extensible_print_nodes(out, (GF_MPD_ExtensibleVirtual*)desc, indent);
+	if (desc->x_children) {
+		u32 idx=0;
+		gf_fprintf(out, ">");
+		gf_mpd_lf(out, indent);
+		gf_mpd_extensible_print_nodes(out, desc->x_children, indent, &idx, GF_TRUE);
 		gf_mpd_nl(out, indent);
 		gf_fprintf(out, "</%s>", desc_name);
 		gf_mpd_lf(out, indent);
@@ -2686,11 +2857,12 @@
 		gf_mpd_lf(out, indent);
 	}
 }
-static void gf_mpd_print_descriptors(FILE *out, GF_List *desc_list, char *desc_name, s32 indent)
+static void gf_mpd_print_descriptors(FILE *out, GF_List *desc_list, char *desc_name, s32 indent, GF_List *x_children, u32 *child_idx)
 {
 	u32 i=0;
 	GF_MPD_Descriptor *desc;
 	while ((desc = (GF_MPD_Descriptor *)gf_list_enum(desc_list, &i))) {
+		gf_mpd_extensible_print_nodes(out, x_children, indent, child_idx, GF_FALSE);
 		gf_mpd_print_desc(out, desc, desc_name, indent);
 	}
 }
@@ -2739,13 +2911,13 @@
 
 }
 
-static u32 gf_mpd_print_common_children(FILE *out, GF_MPD_CommonAttributes *ca, s32 indent)
+static u32 gf_mpd_print_common_children(FILE *out, GF_MPD_CommonAttributes *ca, s32 indent, u32 *child_idx)
 {
-	gf_mpd_print_descriptors(out, ca->frame_packing, "Framepacking", indent);
-	gf_mpd_print_descriptors(out, ca->audio_channels, "AudioChannelConfiguration", indent);
-	gf_mpd_print_descriptors(out, ca->content_protection, "ContentProtection", indent);
-	gf_mpd_print_descriptors(out, ca->essential_properties, "EssentialProperty", indent);
-	gf_mpd_print_descriptors(out, ca->supplemental_properties, "SupplementalProperty", indent);
+	gf_mpd_print_descriptors(out, ca->frame_packing, "Framepacking", indent, ca->x_children, child_idx);
+	gf_mpd_print_descriptors(out, ca->audio_channels, "AudioChannelConfiguration", indent, ca->x_children, child_idx);
+	gf_mpd_print_descriptors(out, ca->content_protection, "ContentProtection", indent, ca->x_children, child_idx);
+	gf_mpd_print_descriptors(out, ca->essential_properties, "EssentialProperty", indent, ca->x_children, child_idx);
+	gf_mpd_print_descriptors(out, ca->supplemental_properties, "SupplementalProperty", indent, ca->x_children, child_idx);
 
 	if (ca->producer_reference_time) {
 		u32 i, count = gf_list_count(ca->producer_reference_time);
@@ -2821,13 +2993,13 @@
 	if (dasher->period_id)
 		gf_fprintf(out, "periodID=\"%s\" ", dasher->period_id);
 
-	if (dasher->period_duration)
-		gf_fprintf(out, "periodDuration=\"%g\" ", dasher->period_duration);
-	if (dasher->period_start)
-		gf_fprintf(out, "periodStart=\"%g\" ", dasher->period_start);
+	if (dasher->period_duration.num && dasher->period_duration.den)
+		gf_fprintf(out, "periodDuration=\""LLD"/"LLU"\" ", dasher->period_duration.num, dasher->period_duration.den);
+	if (dasher->period_start.num && dasher->period_start.den)
+		gf_fprintf(out, "periodStart=\""LLD"/"LLU"\" ", dasher->period_start.num, dasher->period_start.den);
 
 	gf_fprintf(out, "multiPIDInit=\"%s\" ", dasher->multi_pids ? "true" : "false");
-	gf_fprintf(out, "dashDuration=\"%g\" ", dasher->dash_dur);
+	gf_fprintf(out, "dashDuration=\"%d/%d\" ", dasher->dash_dur.num, dasher->dash_dur.den);
 	gf_fprintf(out, "nextSegmentStart=\""LLU"\" ", dasher->next_seg_start);
 	gf_fprintf(out, "firstCTS=\""LLU"\" ", dasher->first_cts);
 	gf_fprintf(out, "firstDTS=\""LLU"\" ", dasher->first_dts);
@@ -2887,6 +3059,8 @@
 			gf_fprintf(out, "idx_size=\"%d\" ", sctx->index_size);
 			if (sctx->index_offset) gf_fprintf(out, "idx_offset=\""LLU"\" ", sctx->index_offset);
 		}
+		//we don't store frag context because we can only serialize the dash state at segment boundaries, and we don't keep frag states for already published
+		//segments
 		gf_fprintf(out, "/>");
 		gf_mpd_lf(out, indent);
 	}
@@ -2896,10 +3070,10 @@
 	gf_mpd_lf(out, indent);
 }
 
-static void gf_mpd_print_representation(GF_MPD_Representation const * const rep, FILE *out, Bool write_context, s32 indent)
+static void gf_mpd_print_representation(GF_MPD_Representation *rep, FILE *out, Bool write_context, s32 indent, u32 alt_mha_profile)
 {
-	u32 i;
-
+	u32 child_idx = 0;
+	char *bck_codecs = NULL;
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "<Representation");
 	if (rep->id) gf_fprintf(out, " id=\"%s\"", rep->id);
@@ -2908,7 +3082,15 @@
 		can_close = 1;
 	}
 */
-
+	if (alt_mha_profile) {
+		char szTmp[15], *sep;
+		bck_codecs = rep->codecs;
+		rep->codecs = gf_strdup(bck_codecs);
+		snprintf(szTmp, 14, "0x%02X", alt_mha_profile-1);
+		szTmp[14] = 0;
+		sep = strstr(rep->codecs, ".0x");
+		if (sep) strcpy(sep+1, szTmp);
+	}
 	gf_mpd_print_common_attributes(out, (GF_MPD_CommonAttributes*)rep);
 
 	if (rep->bandwidth) gf_fprintf(out, " bandwidth=\"%d\"", rep->bandwidth);
@@ -2916,6 +3098,11 @@
 	if (rep->dependency_id) gf_fprintf(out, " dependencyId=\"%s\"", rep->dependency_id);
 	if (rep->media_stream_structure_id) gf_fprintf(out, " mediaStreamStructureId=\"%s\"", rep->media_stream_structure_id);
 
+	if (bck_codecs) {
+		gf_free(rep->codecs);
+		rep->codecs = bck_codecs;
+	}
+
 
 	gf_fprintf(out, ">");
 	gf_mpd_lf(out, indent);
@@ -2929,26 +3116,19 @@
 		}
 	}
 
-	if (rep->other_descriptors){
-		GF_MPD_other_descriptors *rsld;
-		i=0;
-		while ( (rsld = (GF_MPD_other_descriptors*) gf_list_enum(rep->other_descriptors, &i))) {
-			gf_mpd_nl(out, indent+1);
-			gf_fprintf(out, "%s",rsld->xml_desc);
-			gf_mpd_lf(out, indent);
-		}
-	}
-
-	gf_mpd_print_common_children(out, (GF_MPD_CommonAttributes*)rep, indent+1);
+	gf_mpd_print_common_children(out, (GF_MPD_CommonAttributes*)rep, indent+1, &child_idx);
 
 	gf_mpd_print_base_urls(out, rep->base_URLs, indent+1);
 	if (rep->segment_base) {
+		gf_mpd_extensible_print_nodes(out, rep->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_segment_base(out, rep->segment_base, indent+1);
 	}
 	if (rep->segment_list) {
+		gf_mpd_extensible_print_nodes(out, rep->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_segment_list(out, rep->segment_list, indent+1);
 	}
 	if (rep->segment_template) {
+		gf_mpd_extensible_print_nodes(out, rep->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_segment_template(out, rep->segment_template, indent+1);
 	}
 	/*TODO
@@ -2956,22 +3136,30 @@
 				if (e) return e;
 	*/
 
+	gf_mpd_extensible_print_nodes(out, rep->x_children, indent, &child_idx, GF_TRUE);
 
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "</Representation>");
 	gf_mpd_lf(out, indent);
 }
 
-static void gf_mpd_print_adaptation_set(GF_MPD_AdaptationSet *as, FILE *out, Bool write_context, s32 indent)
+static void gf_mpd_print_adaptation_set(GF_MPD_AdaptationSet *as, FILE *out, Bool write_context, s32 indent, u32 alt_mha_profile)
 {
-	u32 i;
+	u32 i, child_idx=0;
 	GF_MPD_Representation *rep;
-	GF_MPD_other_descriptors *o_desc;
+
+	if (!alt_mha_profile && as->nb_alt_mha_profiles && as->alt_mha_profiles_only) {
+		for (i=0; i<as->nb_alt_mha_profiles; i++) {
+			gf_mpd_print_adaptation_set(as, out, write_context, indent, as->alt_mha_profiles[i] + 1);
+		}
+
+		return;
+	}
 
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "<AdaptationSet");
 
-	if (as->id) gf_fprintf(out, " id=\"%d\"", as->id);
+	if (as->id>=0) gf_fprintf(out, " id=\"%d\"", as->id);
 	if (as->xlink_href) {
 		gf_fprintf(out, " xlink:href=\"%s\"", as->xlink_href);
 		if (as->xlink_actuate_on_load)
@@ -3010,51 +3198,50 @@
 	gf_fprintf(out, ">");
 	gf_mpd_lf(out, indent);
 
-	i=0;
-	while ( (o_desc = (GF_MPD_other_descriptors*) gf_list_enum(as->other_descriptors, &i))) {
-		gf_mpd_nl(out, indent+1);
-		//do not use gf_xml_dump_string, this is already an XML escaped element
-		gf_fprintf(out, "%s\n", o_desc->xml_desc);
-		gf_mpd_lf(out, indent);
-	}
-
-	gf_mpd_print_common_children(out, (GF_MPD_CommonAttributes*)as, indent+1);
+	gf_mpd_print_common_children(out, (GF_MPD_CommonAttributes*)as, indent+1, &child_idx);
 
 	gf_mpd_print_base_urls(out, as->base_URLs, indent+1);
 
-	gf_mpd_print_descriptors(out, as->accessibility, "Accessibility", indent+1);
-	gf_mpd_print_descriptors(out, as->role, "Role", indent+1);
-	gf_mpd_print_descriptors(out, as->rating, "Rating", indent+1);
-	gf_mpd_print_descriptors(out, as->viewpoint, "Viewpoint", indent+1);
+	gf_mpd_print_descriptors(out, as->accessibility, "Accessibility", indent+1, as->x_children, &child_idx);
+	gf_mpd_print_descriptors(out, as->role, "Role", indent+1, as->x_children, &child_idx);
+	gf_mpd_print_descriptors(out, as->rating, "Rating", indent+1, as->x_children, &child_idx);
+	gf_mpd_print_descriptors(out, as->viewpoint, "Viewpoint", indent+1, as->x_children, &child_idx);
 	gf_mpd_print_content_component(out, as->content_component, indent+1);
 
 	if (as->segment_base) {
+		gf_mpd_extensible_print_nodes(out, as->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_segment_base(out, as->segment_base, indent+1);
 	}
 	if (as->segment_list) {
+		gf_mpd_extensible_print_nodes(out, as->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_segment_list(out, as->segment_list, indent+1);
 	}
 	if (as->segment_template) {
+		gf_mpd_extensible_print_nodes(out, as->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_segment_template(out, as->segment_template, indent+1);
 	}
 
-
 	i=0;
 	while ((rep = (GF_MPD_Representation *)gf_list_enum(as->representations, &i))) {
-		gf_mpd_print_representation(rep, out, write_context, indent+1);
+		gf_mpd_extensible_print_nodes(out, as->x_children, indent, &child_idx, GF_FALSE);
+		gf_mpd_print_representation(rep, out, write_context, indent+1, alt_mha_profile);
 	}
+	gf_mpd_extensible_print_nodes(out, as->x_children, indent, &child_idx, GF_TRUE);
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "</AdaptationSet>");
 	gf_mpd_lf(out, indent);
 
-
+	if (!alt_mha_profile) {
+		for (i=0; i<as->nb_alt_mha_profiles; i++) {
+			gf_mpd_print_adaptation_set(as, out, write_context, indent, as->alt_mha_profiles[i] + 1);
+		}
+	}
 }
 
 static void gf_mpd_print_period(GF_MPD_Period const * const period, Bool is_dynamic, FILE *out, Bool write_context, s32 indent)
 {
 	GF_MPD_AdaptationSet *as;
-	GF_MPD_other_descriptors *o_desc;
-	u32 i;
+	u32 i, child_idx=0;
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "<Period");
 	if (period->xlink_href) {
@@ -3074,31 +3261,27 @@
 	gf_fprintf(out, ">");
 	gf_mpd_lf(out, indent);
 
-	i=0;
-	while ( (o_desc = (GF_MPD_other_descriptors*) gf_list_enum(period->other_descriptors, &i))) {
-		gf_mpd_nl(out, indent+1);
-		//do not use gf_xml_dump_stringn this is already an XML escape element
-		gf_fprintf(out, "%s", o_desc->xml_desc);
-		gf_mpd_lf(out, indent);
-	}
-	
-
 	gf_mpd_print_base_urls(out, period->base_URLs, indent+1);
 
 	if (period->segment_base) {
+		gf_mpd_extensible_print_nodes(out, period->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_segment_base(out, period->segment_base, indent+1);
 	}
 	if (period->segment_list) {
+		gf_mpd_extensible_print_nodes(out, period->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_segment_list(out, period->segment_list, indent+1);
 	}
 	if (period->segment_template) {
+		gf_mpd_extensible_print_nodes(out, period->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_segment_template(out, period->segment_template, indent+1);
 	}
 
 	i=0;
 	while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
-		gf_mpd_print_adaptation_set(as, out, write_context, indent+1);
+		gf_mpd_extensible_print_nodes(out, period->x_children, indent, &child_idx, GF_FALSE);
+		gf_mpd_print_adaptation_set(as, out, write_context, indent+1, 0);
 	}
+	gf_mpd_extensible_print_nodes(out, period->x_children, indent, &child_idx, GF_TRUE);
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "</Period>");
 	gf_mpd_lf(out, indent);
@@ -3127,10 +3310,11 @@
 	return GF_OK;
 }
 
-static void gf_mpd_write_m3u8_playlist_tags_entry(FILE *out, const GF_MPD_Representation *rep, char *m3u8_name, const char *codec_ext, const char *g_type, const char *g_id_pref, u32 g_as_idx, const char *g2_type, const char *g2_id_pref, u32 g2_as_idx, GF_List *groups_done)
+static void gf_mpd_write_m3u8_playlist_tags_entry(FILE *out, const GF_MPD_Representation *rep, char *m3u8_name, const char *codec_ext, const char *g_type, const char *g_id_pref, u32 g_as_idx, const char *g2_type, const char *g2_id_pref, u32 g2_as_idx, GF_List *groups_done, const GF_MPD_AdaptationSet *set)
 {
+	u32 i;
 	if (groups_done) {
-		u32 i, count=gf_list_count(groups_done);
+		u32 count=gf_list_count(groups_done);
 		Bool g1_done = GF_FALSE;
 		Bool g2_done = GF_FALSE;
 		for (i=0; i<count; i++) {
@@ -3150,15 +3334,25 @@
 		}
 	}
 
-	gf_fprintf(out, "#EXT-X-STREAM-INF:BANDWIDTH=%d,CODECS=\"%s", rep->bandwidth, rep->codecs);
+	if (set && set->intra_only)
+		gf_fprintf(out, "#EXT-X-I-FRAME-STREAM-INF:");
+	else
+		gf_fprintf(out, "#EXT-X-STREAM-INF:");
+
+	gf_fprintf(out, "BANDWIDTH=%d,CODECS=\"%s", rep->bandwidth, rep->codecs);
 	if (codec_ext)
 		gf_fprintf(out, ",%s", codec_ext);
 	gf_fprintf(out, "\"");
 
 	if (rep->width && rep->height)
 		gf_fprintf(out, ",RESOLUTION=%dx%d", rep->width, rep->height);
+
+	if (set && set->intra_only) {
+		gf_fprintf(out, ",URI=\"%s\"\n", m3u8_name);
+		return;
+	}
 	if (rep->fps)
-		gf_fprintf(out,",FRAME-RATE=\"%.03g\"", rep->fps);
+		gf_fprintf(out,",FRAME-RATE=%.03g", rep->fps);
 
 	if (g_type && g_id_pref) {
 		gf_fprintf(out, ",%s=\"%s", g_type, g_id_pref);
@@ -3172,6 +3366,9 @@
 			gf_fprintf(out,"%d", g2_as_idx);
 		gf_fprintf(out,"\"");
 	}
+	for (i=0; i<rep->nb_hls_master_tags; i++) {
+		gf_fprintf(out,",%s", rep->hls_master_tags[i]);
+	}
 	gf_fprintf(out,"\n");
 
 	gf_fprintf(out, "%s\n",m3u8_name);
@@ -3191,6 +3388,7 @@
 	if (!period) {
 		const char *g_type = NULL;
 		const char *g_id = NULL;
+		char szLANG[100];
 
 		if (rep->streamtype==GF_STREAM_AUDIO) {
 			g_type = "AUDIO";
@@ -3203,18 +3401,28 @@
 		if (!g_type || !g_id)
 			return;
 
+		//don't inject LANGUAGE if not known
+		if (!strcmp(as->lang, "und")) {
+			szLANG[0] = 0;
+		} else {
+			sprintf(szLANG, ",LANGUAGE=\"%s\"", as->lang);
+		}
 		if (rep->groupID)
-			gf_fprintf(out, "#EXT-X-MEDIA:TYPE=%s,GROUP-ID=\"%s\",NAME=\"%s\",LANGUAGE=\"%s\",AUTOSELECT=YES,URI=\"%s\"", g_type, rep->groupID, rep->id, as->lang, m3u8_name);
+			gf_fprintf(out, "#EXT-X-MEDIA:TYPE=%s,GROUP-ID=\"%s\",NAME=\"%s\"%s,AUTOSELECT=YES,URI=\"%s\"", g_type, rep->groupID, rep->id, szLANG, m3u8_name);
 		else
-			gf_fprintf(out, "#EXT-X-MEDIA:TYPE=%s,GROUP-ID=\"%s%d\",NAME=\"%s\",LANGUAGE=\"%s\",AUTOSELECT=YES,URI=\"%s\"", g_type, g_id, as_idx, rep->id, as->lang, m3u8_name);
+			gf_fprintf(out, "#EXT-X-MEDIA:TYPE=%s,GROUP-ID=\"%s%d\",NAME=\"%s\"%s,AUTOSELECT=YES,URI=\"%s\"", g_type, g_id, as_idx, rep->id, szLANG, m3u8_name);
 		if (rep->nb_chan)
 			gf_fprintf(out,",CHANNELS=\"%d\"", rep->nb_chan);
+
+		for (i=0; i<rep->nb_hls_master_tags; i++) {
+			gf_fprintf(out,",%s", rep->hls_master_tags[i]);
+		}
 		return;
 	}
 
 	//no other streams, directly write the entry
 	if (!nb_audio && !nb_subs && !nb_cc) {
-		gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, NULL, NULL, NULL, 0, NULL, NULL, 0, NULL);
+		gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, NULL, NULL, NULL, 0, NULL, NULL, 0, NULL, as);
 		return;
 	}
 	groups_done = gf_list_new();
@@ -3256,7 +3464,7 @@
 		if (!g_type) continue;
 		//no audio, or no subs
 		if (!is_audio || !nb_subs) {
-			gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, g_codec, g_type, g_id, g_as_idx, NULL, NULL, 0, groups_done);
+			gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, g_codec, g_type, g_id, g_as_idx, NULL, NULL, 0, groups_done, as);
 			continue;
 		}
 		//audio and subs, we need a second loop on audio to get all subs
@@ -3279,7 +3487,7 @@
 			}
 			if (!g2_type) continue;
 
-			gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, g_codec, g_type, g_id, g_as_idx, g2_type, g2_id, g2_as_idx, groups_done);
+			gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, g_codec, g_type, g_id, g_as_idx, g2_type, g2_id, g2_as_idx, NULL, as);
 		}
 	}
 	gf_list_del(groups_done);
@@ -3302,11 +3510,12 @@
 	return url;
 }
 
-static GF_Err gf_mpd_write_m3u8_playlist(const GF_MPD *mpd, const GF_MPD_Period *period, const GF_MPD_AdaptationSet *as, GF_MPD_Representation *rep, char *m3u8_name, u32 hls_version)
+static GF_Err gf_mpd_write_m3u8_playlist(const GF_MPD *mpd, const GF_MPD_Period *period, const GF_MPD_AdaptationSet *as, GF_MPD_Representation *rep, char *m3u8_name, u32 hls_version, Double max_part_dur_session)
 {
 	u32 i, count;
 	GF_DASH_SegmentContext *sctx;
 	FILE *out;
+	const char *last_kms = NULL;
 	Bool close_file = GF_FALSE;
 
 	if (!strcmp(m3u8_name, "std")) out = stdout;
@@ -3324,9 +3533,18 @@
 	sctx = gf_list_get(rep->state_seg_list, 0);
 
 	gf_fprintf(out,"#EXTM3U\n");
-	gf_fprintf(out,"#EXT-X-TARGETDURATION:%d\n",(u32) (rep->dash_dur) );
+	gf_fprintf(out,"#EXT-X-TARGETDURATION:%d\n", (u32) ((Double) rep->dash_dur.num) / rep->dash_dur.den);
 	gf_fprintf(out,"#EXT-X-VERSION:%d\n", hls_version);
 	gf_fprintf(out,"#EXT-X-MEDIA-SEQUENCE:%d\n", sctx->seg_num);
+	if (as->use_hls_ll) {
+		//PART-HOLD-BACK is REQUIRED if the Playlist contains the EXT-X-PART-INF tag
+		//we use the recommended (should) PART-TARGET x 3
+		gf_fprintf(out,"#EXT-X-SERVER-CONTROL:PART-HOLD-BACK=%g\n", 3 * max_part_dur_session);
+		gf_fprintf(out,"#EXT-X-PART-INF:PART-TARGET=%g\n", rep->hls_ll_part_dur);
+	}
+	for (i=0; i<rep->nb_hls_variant_tags; i++) {
+		gf_fprintf(out,"%s\n", rep->hls_variant_tags[i]);
+	}
 
 	if (as->starts_with_sap<SAP_TYPE_3)
 		gf_fprintf(out,"#EXT-X-INDEPENDENT-SEGMENTS\n");
@@ -3339,15 +3557,152 @@
 		gf_fprintf(out, "\n");
 	}
 
+
 	if (sctx->filename) {
+		if (as->intra_only) {
+			gf_fprintf(out,"#EXT-X-I-FRAMES-ONLY\n");
+		}
 		if (rep->hls_single_file_name) {
 			gf_fprintf(out,"#EXT-X-MAP:URI=\"%s\"\n", rep->hls_single_file_name);
 		}
+
 		for (i=0; i<count; i++) {
 			Double dur;
 			sctx = gf_list_get(rep->state_seg_list, i);
 			assert(sctx->filename);
-			
+
+			if (rep->crypto_type) {
+				const char *kms;
+				if (!sctx->encrypted) kms = "NONE";
+				else if (sctx->hls_key_uri) kms = sctx->hls_key_uri;
+				else {
+					kms = "URI=\"gpac:hls:key:locator:null\"";
+					if (!rep->def_kms_used) {
+						rep->def_kms_used = 1;
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[HLS] Missing key URI in one or more keys - will use dummy one %s\n", kms));
+					}
+				}
+
+				if (!last_kms || strcmp(kms, last_kms)) {
+					if (!strcmp(kms, "NONE")) {
+						gf_fprintf(out,"#EXT-X-KEY:METHOD=NONE\n");
+					} else {
+						char *subkms = (char *) kms;
+						while (1) {
+							char *next = strstr(subkms, ",URI");
+							if (next) next[0] = 0;
+							if (rep->crypto_type==1) {
+								u32 k;
+								gf_fprintf(out,"#EXT-X-KEY:METHOD=AES-128,%s,IV=0x", subkms);
+								for (k=0; k<16; k++)
+									gf_fprintf(out, "%02X", sctx->hls_iv[k]);
+								gf_fprintf(out, "\n");
+							} else {
+								gf_fprintf(out,"#EXT-X-KEY:METHOD=SAMPLE-AES,%s\n", subkms);
+							}
+							if (!next) break;
+							next[0] = ',';
+							subkms = next+1;
+						}
+					}
+					last_kms = (rep->crypto_type==2) ? kms : NULL;
+				}
+			}
+
+			u64 next_br_start_plus_one=0;
+			u32 next_seg_idx=0;
+			if ((mpd->type == GF_MPD_TYPE_DYNAMIC) && sctx->llhls_mode) {
+				u32 k;
+				for (k=0; k<sctx->nb_frags; k++) {
+					Bool write_br = GF_FALSE;
+					dur = sctx->frags[k].duration;
+					dur /= rep->timescale;
+					gf_fprintf(out, "#EXT-X-PART:DURATION=%g,URI=\"%s", dur, sctx->filename);
+
+					if (mpd->force_llhls_mode==1) write_br = GF_TRUE;
+					else if (mpd->force_llhls_mode==2) write_br = GF_FALSE;
+					else if (sctx->llhls_mode==1) write_br = GF_TRUE;
+
+					if (write_br) {
+						gf_fprintf(out, "\",BYTERANGE=\""LLU"@"LLU"\"", sctx->frags[k].size, sctx->frags[k].offset );
+						next_br_start_plus_one = 1 + sctx->frags[k].offset + sctx->frags[k].size;
+					} else {
+						next_seg_idx = k+2;
+						gf_fprintf(out, ".%d\"", k+1);
+					}
+
+					if (sctx->frags[k].independent)
+						gf_fprintf(out, ",INDEPENDENT=YES");
+					gf_fprintf(out, "\n");
+				}
+				//live edge not done yet
+				if (!sctx->llhls_mode) {
+					if (close_file)
+						gf_fclose(out);
+					return GF_OK;
+				}
+			}
+
+			//live edge seg not done yet, do not write EXTINF and stop writing
+			if (sctx->llhls_mode && (i+1==count) && !sctx->llhls_done) {
+				//write preload hint
+				if (mpd->llhls_preload) {
+					//last seg has no parts yet, we just started it (live edge), advertise first part
+					if (!sctx->nb_frags) {
+						assert(sctx->filename);
+						if (sctx->llhls_mode==2) next_seg_idx = 1;
+						else next_br_start_plus_one = 1;
+					}
+
+					if (next_seg_idx)
+						gf_fprintf(out, "#EXT-X-PRELOAD-HINT:TYPE=PART,URI=\"%s.%d\"\n", sctx->filename, next_seg_idx);
+					else if (next_br_start_plus_one)
+						gf_fprintf(out, "#EXT-X-PRELOAD-HINT:TYPE=PART,URI=\"%s\",BYTERANGE-START="LLU"\n", sctx->filename, next_br_start_plus_one-1);
+
+				}
+				//generate rendition report
+				if (mpd->llhls_rendition_reports) {
+					char *par_dir= strchr(m3u8_name, '/');
+					u32 i_as=0;
+					const GF_MPD_AdaptationSet *o_as;
+					while ( (o_as = gf_list_enum(period->adaptation_sets, &i_as))) {
+						u32 i_rep=0;
+						GF_MPD_Representation *o_rep;
+						while ( (o_rep = gf_list_enum(o_as->representations, &i_rep))) {
+							GF_DASH_SegmentContext *o_sctx;
+							if (o_rep == rep) continue;
+							o_sctx = gf_list_last(o_rep->state_seg_list);
+							if (!o_sctx || !o_sctx->llhls_mode) continue;
+							//not clear in the spec, we assume what is listed must be the last PART completely produced
+							//if no frag and a segemnt exists before, use last part of that segment
+							if (!o_sctx->nb_frags) {
+								u32 idx = gf_list_count(o_rep->state_seg_list);
+								if (idx<2) continue;
+								o_sctx = gf_list_get(o_rep->state_seg_list, idx-2);
+								if (!o_sctx || !o_sctx->nb_frags) continue;
+							}
+
+							char *o_name = (char *) o_rep->m3u8_name;
+							if (!o_name) {
+								o_name = gf_file_basename(o_rep->m3u8_var_name);
+							}
+							char *par_url = NULL;
+							//we always produce from the same root, so just use ../
+							//if no parent dir we are producing at the root, and o_name is relative to the root
+							if (par_dir) {
+								gf_dynstrcat(&par_url, "../", NULL);
+								gf_dynstrcat(&par_url, o_name, NULL);
+							}
+							fprintf(out, "#EXT-X-RENDITION-REPORT:URI=\"%s\",LAST-MSN=%d,LAST-PART=%d\n", par_url ? par_url : o_name, o_sctx->seg_num, o_sctx->nb_frags);
+							if (par_url) gf_free(par_url);
+						}
+					}
+				}
+				
+				if (close_file)
+					gf_fclose(out);
+				return GF_OK;
+			}
 			dur = (Double) sctx->dur;
 			dur /= rep->timescale;
 			gf_fprintf(out,"#EXTINF:%g,\n", dur);
@@ -3408,6 +3763,7 @@
 	GF_MPD_AdaptationSet *as;
 	GF_MPD_Representation *rep;
 	Bool use_range = GF_FALSE;
+	Bool use_intra_only = GF_FALSE;
 	Bool use_init = GF_FALSE;
 	Bool use_ind_segments = GF_TRUE;
 	Bool is_fmp4 = GF_FALSE;
@@ -3426,6 +3782,7 @@
 	while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
 		if (gf_list_count(as->content_protection)) { /*use_crypt = GF_TRUE; */ }
 		if (as->starts_with_sap>2) use_ind_segments = GF_FALSE;
+		if (as->intra_only) use_intra_only = GF_TRUE;
 
 		j=0;
 		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
@@ -3437,7 +3794,7 @@
 			}
 
 			sctx = gf_list_get(rep->state_seg_list, 0);
-			if (!sctx->filename) use_range = GF_TRUE;
+			if (sctx && !sctx->filename) use_range = GF_TRUE;
 			if (gf_list_count(rep->content_protection)) { /*use_crypt = GF_TRUE; */ }
 
 			init_seg = gf_mpd_m3u8_get_init_seg(period, as, rep);
@@ -3453,13 +3810,16 @@
 	//we by default use floating point durations
 	hls_version = 3;
 	if (use_range) hls_version = 4;
+	if (use_intra_only) hls_version = 5;
 	if (is_fmp4 || use_init) hls_version = 6;
 
-
 	gf_fprintf(out, "#EXTM3U\n");
-	gf_fprintf(out, "#EXT-X-VERSION: %d\n", hls_version);
+	gf_fprintf(out, "#EXT-X-VERSION:%d\n", hls_version);
 	if (use_ind_segments)
 		gf_fprintf(out, "#EXT-X-INDEPENDENT-SEGMENTS\n");
+
+	for (i=0; i<mpd->nb_hls_ext_master; i++)
+		gf_fprintf(out, "%s\n", mpd->hls_ext_master[i]);
 	gf_fprintf(out, "\n");
 
 	if (!strncmp(m3u8_name, "gfio://", 7)) {
@@ -3474,8 +3834,50 @@
 	if (sep) sep[0] = 0;
 	szVariantName = gf_malloc(sizeof(char) * (100 + strlen(m3u8_name_rad)) );
 
+	//if live low lat, update parts dur
+	Double max_part_dur_session=0;
+	i=0;
+	while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
+		u32 j=0;
+		GF_MPD_Representation *rep;
+		if (!as->use_hls_ll) continue;
+
+		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
+			u32 k=0;
+			//figure out max part duration for this version of the playlist
+			Double max_part_dur=0;
+			GF_DASH_SegmentContext *sctx;
+			while ( (sctx = (GF_DASH_SegmentContext *) gf_list_enum(rep->state_seg_list, &k))) {
+				u32 nseg;
 
-	//first pass, generate all subplaylists, and check if we have muxed components, or video or audio
+				//check max part dur for active ll segments, but use previously computed value
+				//this avoids changing the HOLD-BACK too often which throws error in apple tools/safari
+				Double dur = rep->hls_ll_part_dur;
+				if (!sctx->llhls_mode || sctx->llhls_done) continue;
+				for (nseg=0; nseg<sctx->nb_frags; nseg++) {
+					dur = sctx->frags[nseg].duration;
+					dur /= rep->timescale;
+
+					if (dur>max_part_dur)
+						max_part_dur = dur;
+				}
+			}
+			if (!max_part_dur) max_part_dur = as->hls_ll_target_frag_dur;
+			if (max_part_dur<rep->hls_ll_part_dur)
+				max_part_dur = rep->hls_ll_part_dur;
+
+			//default cdur in gpac
+			if (!max_part_dur) {
+				max_part_dur=1.0;
+			}
+			max_part_dur = ceil(max_part_dur*1000) / 1000.0;
+			rep->hls_ll_part_dur = max_part_dur;
+			if (max_part_dur_session < max_part_dur)
+				max_part_dur_session = max_part_dur;
+		}
+	}
+
+	//first pass, check if we have muxed components, or video or audio, generate playlists names
 	var_idx = 1;
 	i=0;
 	while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
@@ -3490,27 +3892,35 @@
 
 		j=0;
 		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
-			char *name = (char *) rep->m3u8_name;
-
-			if (!rep->state_seg_list || !gf_list_count(rep->state_seg_list) ) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] No segment state in representation, MPD cannot be translated to M3U8, ignoring representation\n"));
-				continue;
-			}
 			if (rep->mime_type) {
 				if (!strncmp(rep->mime_type, "video/", 6)) has_video = GF_TRUE;
 				else if (!strncmp(rep->mime_type, "audio/", 6)) has_audio = GF_TRUE;
 			}
 
-			if (!name) {
+			if (!rep->m3u8_name) {
 				sprintf(szVariantName, "%s_%d.m3u8",m3u8_name_rad, var_idx);
 				if (rep->m3u8_var_name) gf_free(rep->m3u8_var_name);
 				rep->m3u8_var_name = gf_strdup(szVariantName);
-				name = gf_file_basename(rep->m3u8_var_name);
 			}
 			var_idx++;
+		}
+	}
 
+	//second pass, generate all subplaylists
+	i=0;
+	while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
+		j=0;
+		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
+			if (!rep->state_seg_list || !gf_list_count(rep->state_seg_list) ) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] No segment state in representation, MPD cannot be translated to M3U8, ignoring representation\n"));
+				continue;
+			}
 
-			e = gf_mpd_write_m3u8_playlist(mpd, period, as, rep, name, hls_version);
+			char *name = (char *) rep->m3u8_name;
+			if (!name) {
+				name = gf_file_basename(rep->m3u8_var_name);
+			}
+			e = gf_mpd_write_m3u8_playlist(mpd, period, as, rep, name, hls_version, max_part_dur_session);
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] IO error while opening m3u8 files\n"));
 				return GF_IO_ERR;
@@ -3522,7 +3932,7 @@
 	if (!has_video && !has_muxed_comp)
 		nb_audio = 0;
 
-	//second pass, generate master playlists with the right groups
+	//third pass, generate master playlists with the right groups
 	i=0;
 	while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
 		Bool is_video = GF_FALSE;
@@ -3559,6 +3969,7 @@
 
 		j=0;
 		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
+			char szSuffixName[GF_MAX_PATH+1];
 			char *name = (char *) rep->m3u8_name;
 			if (!rep->state_seg_list || !gf_list_count(rep->state_seg_list) ) {
 				continue;
@@ -3567,6 +3978,17 @@
 				name = gf_file_basename(rep->m3u8_var_name);
 			}
 
+			if (mpd->force_llhls_mode==2) {
+				strcpy(szSuffixName, name);
+				sep = gf_file_ext_start(szSuffixName);
+				if (sep) sep[0] = 0;
+				strcat(szSuffixName, "_IF");
+				sep = gf_file_ext_start(name);
+				if (sep)
+					strcat(szSuffixName, sep);
+				name = szSuffixName;
+			}
+
 			gf_mpd_write_m3u8_playlist_tags(as, i, rep, out, name, is_primary ? period : NULL, nb_audio, nb_subs, nb_cc);
 			gf_fprintf(out, "\n");
 		}
@@ -3597,9 +4019,11 @@
 }
 #endif
 
+
+
 GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact)
 {
-	u32 i, count;
+	u32 i, count, child_idx;
 	s32 indent = compact ? GF_INT_MIN : 0;
 	GF_MPD_ProgramInfo *info;
 	char *text;
@@ -3649,7 +4073,7 @@
 		gf_xml_dump_string(out, " profiles=\"", mpd->profiles, "\"");
 	}
 
-	if (mpd->attributes) gf_mpd_extensible_print_attr(out, (GF_MPD_ExtensibleVirtual*)mpd);
+	gf_mpd_extensible_print_attr(out, mpd->x_attributes);
 
 	if (mpd->write_context) {
 		if (mpd->gpac_init_ntp_ms)
@@ -3663,12 +4087,12 @@
 	gf_fprintf(out, ">");
 	gf_mpd_lf(out, indent);
 
-	if (mpd->children) {
-		gf_mpd_extensible_print_nodes(out, (GF_MPD_ExtensibleVirtual*)mpd, indent+1);
-	}
-
+	child_idx = 0;
 	i=0;
 	while ((info = (GF_MPD_ProgramInfo *)gf_list_enum(mpd->program_infos, &i))) {
+		u32 sub_child_idx=0;
+		gf_mpd_extensible_print_nodes(out, mpd->x_children, indent, &child_idx, GF_FALSE);
+
 		gf_mpd_nl(out, indent+1);
 		gf_fprintf(out, "<ProgramInformation");
 		if (info->lang) {
@@ -3677,23 +4101,29 @@
 		if (info->more_info_url) {
 			gf_xml_dump_string(out, " moreInformationURL=\"", info->more_info_url, "\"");
 		}
+		gf_mpd_extensible_print_attr(out, info->x_attributes);
 		gf_fprintf(out, ">");
+
 		gf_mpd_lf(out, indent);
 		if (info->title) {
+			gf_mpd_extensible_print_nodes(out, info->x_children, indent+1, &sub_child_idx, GF_FALSE);
 			gf_mpd_nl(out, indent+2);
 			gf_xml_dump_string(out, "<Title>", info->title, "</Title>");
 			gf_mpd_lf(out, indent);
 		}
 		if (info->source) {
+			gf_mpd_extensible_print_nodes(out, info->x_children, indent+1, &sub_child_idx, GF_FALSE);
 			gf_mpd_nl(out, indent+2);
 			gf_xml_dump_string(out, "<Source>", info->source, "</Source>");
 			gf_mpd_lf(out, indent);
 		}
 		if (info->copyright) {
+			gf_mpd_extensible_print_nodes(out, info->x_children, indent+1, &sub_child_idx, GF_FALSE);
 			gf_mpd_nl(out, indent+2);
 			gf_xml_dump_string(out, "<Copyright>", info->copyright, "</Copyright>");
 			gf_mpd_lf(out, indent);
 		}
+		gf_mpd_extensible_print_nodes(out, info->x_children, indent+1, &sub_child_idx, GF_TRUE);
 		gf_mpd_nl(out, indent+1);
 		gf_fprintf(out, "</ProgramInformation>");
 		gf_mpd_lf(out, indent);
@@ -3705,13 +4135,28 @@
 
 	i=0;
 	while ((text = (char *)gf_list_enum(mpd->locations, &i))) {
+		gf_mpd_extensible_print_nodes(out, mpd->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_nl(out, indent+1);
 		gf_xml_dump_string(out, "<Location>", text, "</Location>");
 		gf_mpd_lf(out, indent);
 	}
 
-	if (gf_list_count(mpd->utc_timings))
-		gf_mpd_print_descriptors(out, mpd->utc_timings, "UTCTiming", indent+1);
+	if (mpd->inject_service_desc) {
+		gf_mpd_extensible_print_nodes(out, mpd->x_children, indent, &child_idx, GF_FALSE);
+		gf_mpd_nl(out, indent+1);
+		gf_fprintf(out, "<ServiceDescription id=\"0\">");
+		gf_mpd_lf(out, indent);
+		gf_mpd_nl(out, indent+2);
+		gf_fprintf(out, "<Latency max=\"6000\" min=\"2000\" referenceId=\"0\" target=\"4000\"/>");
+		gf_mpd_lf(out, indent);
+		gf_mpd_nl(out, indent+2);
+		gf_fprintf(out, "<PlaybackRate max=\"1.04\" min=\"0.96\"/>");
+		gf_mpd_lf(out, indent);
+		gf_mpd_nl(out, indent+1);
+		gf_fprintf(out, "</ServiceDescription>");
+		gf_mpd_lf(out, indent);
+	}
+
 	/*
 		i=0;
 		while ((text = (char *)gf_list_enum(mpd->metrics, &i))) {
@@ -3726,9 +4171,25 @@
 		is_dynamic = (mpd->type==GF_MPD_TYPE_DYNAMIC) ? GF_TRUE : GF_FALSE;
 		//hack for backward compat with old arch, forces print period@start if 0
 		if (!i && count>1 && mpd->was_dynamic) is_dynamic = GF_TRUE;
+
+		gf_mpd_extensible_print_nodes(out, mpd->x_children, indent, &child_idx, GF_FALSE);
 		gf_mpd_print_period(period, is_dynamic, out, mpd->write_context, indent+1);
 	}
 
+	if (gf_list_count(mpd->utc_timings)) {
+		gf_mpd_extensible_print_nodes(out, mpd->x_children, indent, &child_idx, GF_FALSE);
+		gf_mpd_print_descriptors(out, mpd->utc_timings, "UTCTiming", indent+1, mpd->x_children, &child_idx);
+	}
+	if (gf_list_count(mpd->essential_properties)) {
+		gf_mpd_extensible_print_nodes(out, mpd->x_children, indent, &child_idx, GF_FALSE);
+		gf_mpd_print_descriptors(out, mpd->essential_properties, "EssentialProperty", indent+1, mpd->x_children, &child_idx);
+	}
+	if (gf_list_count(mpd->supplemental_properties)) {
+		gf_mpd_extensible_print_nodes(out, mpd->x_children, indent, &child_idx, GF_FALSE);
+		gf_mpd_print_descriptors(out, mpd->supplemental_properties, "SupplementalProperty", indent+1, mpd->x_children, &child_idx);
+	}
+	gf_mpd_extensible_print_nodes(out, mpd->x_children, indent, &child_idx, GF_TRUE);
+
 	gf_fprintf(out, "</MPD>");
 
 	return GF_OK;
@@ -3799,12 +4260,13 @@
 }
 
 GF_EXPORT
-GF_Err gf_mpd_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, const char *mpd_url, u32 base_url_index, GF_MPD_URLResolveType resolve_type, u32 item_index, u32 nb_segments_removed, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration_in_ms, Bool *is_in_base_url, char **out_key_url, bin128 *out_key_iv)
+GF_Err gf_mpd_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, const char *mpd_url, u32 base_url_index, GF_MPD_URLResolveType resolve_type, u32 item_index, u32 nb_segments_removed, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration_in_ms, Bool *is_in_base_url, char **out_key_url, bin128 *out_key_iv, u32 *out_start_number)
 {
 	GF_MPD_SegmentTimeline *timeline = NULL;
 	u32 start_number = 1;
 	u32 timescale=0;
 	u64 duration=0;
+	u64 pto=0;
 	char *url;
 	char *url_to_solve, *solved_template, *first_sep, *media_url;
 	char *init_template, *index_template;
@@ -3823,6 +4285,11 @@
 	url = gf_mpd_get_base_url(rep->base_URLs, url, &base_url_index);
 	assert(url);
 
+	if (resolve_type == GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE_NO_BASE) {
+		resolve_type = GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE;
+		url[0] = 0;
+	}
+
 	/*single URL*/
 	if (!rep->segment_list && !set->segment_list && !period->segment_list && !rep->segment_template && !set->segment_template && !period->segment_template) {
 		GF_MPD_URL *res_url;
@@ -3942,6 +4409,18 @@
 			}
 			*out_url = url;
 			segment = gf_list_get(segments, item_index);
+
+			if (segment->key_url && out_key_url) {
+				//if ':', key URL is absolute or urn:
+				if (strchr(segment->key_url+2, ':'))
+					*out_key_url = gf_strdup(segment->key_url);
+				//otherwise key url is relative to url (base url)
+				else
+					*out_key_url = gf_url_concatenate(url, segment->key_url);
+				if (out_key_iv)
+					memcpy((*out_key_iv), segment->key_iv, sizeof(bin128) );
+			}
+
 			if (segment->media) {
 				*out_url = gf_url_concatenate(url, segment->media);
 				gf_free(url);
@@ -3953,11 +4432,6 @@
 			if (segment->duration) {
 				*segment_duration_in_ms = (u32) ((Double) (segment->duration) * 1000.0 / timescale);
 			}
-			if (segment->key_url && out_key_url) {
-				*out_key_url = gf_strdup((const char *) segment->key_url);
-				if (out_key_iv)
-					memcpy((*out_key_iv), segment->key_iv, sizeof(bin128) );
-			}
 			return GF_OK;
 		case GF_MPD_RESOLVE_URL_INDEX:
 			if (item_index >= segment_count) {
@@ -3994,6 +4468,7 @@
 		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
 		if (!timescale && period->segment_template->timescale) timescale = period->segment_template->timescale;
 		if (!duration && period->segment_template->duration) duration = period->segment_template->duration;
+		pto = period->segment_template->presentation_time_offset;
 	}
 	if (set->segment_template) {
 		if (set->segment_template->initialization) init_template = set->segment_template->initialization;
@@ -4003,6 +4478,7 @@
 		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
 		if (!timescale && set->segment_template->timescale) timescale = set->segment_template->timescale;
 		if (!duration && set->segment_template->duration) duration = set->segment_template->duration;
+		if (set->segment_template->presentation_time_offset) pto = set->segment_template->presentation_time_offset;
 	}
 	if (rep->segment_template) {
 		if (rep->segment_template->initialization) init_template = rep->segment_template->initialization;
@@ -4011,7 +4487,8 @@
 		if (rep->segment_template->start_number != (u32) -1) start_number = rep->segment_template->start_number;
 		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
 		if (!timescale && rep->segment_template->timescale) timescale = rep->segment_template->timescale;
-		if (!duration&& rep->segment_template->duration) duration = rep->segment_template->duration;
+		if (!duration && rep->segment_template->duration) duration = rep->segment_template->duration;
+		if (rep->segment_template->presentation_time_offset) pto = rep->segment_template->presentation_time_offset;
 	}
 
 	/*return segment duration in all cases*/
@@ -4099,11 +4576,16 @@
 		}
 		else if (!strcmp(first_sep+1, "Number")) {
 			if (resolve_type==GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE) {
-				strcat(solved_template, "$Number$");
+				strcat(solved_template, "$Number");
+				if (format_tag)
+					strcat(solved_template, szPrintFormat);
+				strcat(solved_template, "$");
 			} else if (resolve_type==GF_MPD_RESOLVE_URL_MEDIA_NOSTART) {
+				if (out_start_number) *out_start_number = 0;
 				sprintf(szFormat, szPrintFormat, item_index);
 				strcat(solved_template, szFormat);
 			} else {
+				if (out_start_number) *out_start_number = start_number;
 				sprintf(szFormat, szPrintFormat, start_number + item_index);
 				strcat(solved_template, szFormat);
 			}
@@ -4140,9 +4622,10 @@
 					GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, k);
 					if (item_index>cur_idx+ent->repeat_count) {
 						cur_idx += 1 + ent->repeat_count;
-						if (ent->start_time) start_time = ent->start_time;
+						if (ent->start_time)
+							start_time = ent->start_time;
 						if (k<nb_seg-1) {
-							start_time += ent->duration * (1 + ent->repeat_count);
+							start_time += (u64) (ent->duration * (1 + ent->repeat_count));
 							continue;
 						} else {
 							gf_free(url);
@@ -4159,13 +4642,13 @@
 
 					/*replace final 'd' with LLD (%lld or I64d)*/
 					szPrintFormat[strlen(szPrintFormat)-1] = 0;
-					strcat(szPrintFormat, &LLD[1]);
+					strcat(szPrintFormat, &LLU[1]);
 					sprintf(szFormat, szPrintFormat, time);
 					strcat(solved_template, szFormat);
 					break;
 				}
 			} else if (duration) {
-				u64 time = item_index * duration;
+				u64 time = item_index * duration + pto;
 				szPrintFormat[strlen(szPrintFormat)-1] = 0;
 				strcat(szPrintFormat, &LLD[1]);
 				sprintf(szFormat, szPrintFormat, time);
@@ -4544,9 +5027,17 @@
 gf_list_add(container, chunk);
 i = 0;
 while ( (att = gf_list_enum(root->attributes, &i)) ) {
- if (!strcmp(att->name, "n")) {}
- else if (!strcmp(att->name, "d")) chunk->duration = atoi(att->value);
- else if (!strcmp(att->name, "t")) chunk->start_time = atoi(att->value);
+ if (!strcmp(att->name, "r")) {
+			chunk->repeat_count = atoi(att->value);
+			//repeat count is one-based in smooth (number of repeats), 0-based in dash (number of additional repeats)
+			if (chunk->repeat_count)
+				chunk->repeat_count -= 1;
+		}
+ else if (!strcmp(att->name, "d"))
+			chunk->duration = atoi(att->value);
+ else if (!strcmp(att->name, "t")) {
+			sscanf(att->value, LLU, &chunk->start_time);
+		}
 }
 return GF_OK;
 }
@@ -4656,7 +5147,8 @@
 		v = (char *)szTS;
 ISBMFFI_ADD_KEYWORD("scale", v)
 }
- ISBMFFI_ADD_KEYWORD_CONST("tfdt", "0000000000000000000")
+ //reserve space for max u64 as hex, without 0x prefix
+ ISBMFFI_ADD_KEYWORD_CONST("tfdt", "0000000000000000")
 //create a url for the IS to be reconstructed
 rep->mime_type = gf_strdup(is_audio ? "audio/mp4" : "video/mp4");
 GF_SAFEALLOC(rep->segment_template, GF_MPD_SegmentTemplate);
@@ -4674,6 +5166,7 @@
 
 GF_SAFEALLOC(set, GF_MPD_AdaptationSet);
 if (!set) return GF_OUT_OF_MEM;
+ set->id = -1;
 gf_mpd_init_common_attributes((GF_MPD_CommonAttributes *)set);
 
 gf_list_add(container, set);
@@ -4693,7 +5186,9 @@
 while ((att = gf_list_enum(root->attributes, &i))) {
 if (!strcmp(att->name, "Type")) {}
 else if (!strcmp(att->name, "Name")) {}
- else if (!strcmp(att->name, "Chunks")) {}
+ else if (!strcmp(att->name, "Chunks")) {
+			set->smooth_max_chunks = atoi(att->value);
+		}
 else if (!strcmp(att->name, "MaxWidth")) set->max_width = atoi(att->value);
 else if (!strcmp(att->name, "MaxHeight")) set->max_height = atoi(att->value);
 else if (!strcmp(att->name, "Url")) {
@@ -4736,6 +5231,7 @@
 GF_XMLAttribute *att;
 GF_XMLNode *child;
 GF_MPD_Period *period;
+ u64 tsb = 0;
 
 if (!root || !mpd) return GF_BAD_PARAM;
 
@@ -4751,19 +5247,19 @@
 i=0;
 while ((att = gf_list_enum(root->attributes, &i))) {
 if (!strcmp(att->name, "TimeScale"))
- timescale = atoi(att->value);
+			timescale = atoi(att->value);
 else if (!strcmp(att->name, "Duration"))
- mpd->media_presentation_duration = atoi(att->value);
- else if (!strcmp(att->name, "IsLive") && stricmp(att->value, "true") )
- mpd->type = GF_MPD_TYPE_DYNAMIC;
- else if (!strcmp(att->name, "LookaheadCount"))
- {}
+			mpd->media_presentation_duration = atoi(att->value);
+ else if (!strcmp(att->name, "IsLive") && !stricmp(att->value, "true") )
+			mpd->type = GF_MPD_TYPE_DYNAMIC;
 else if (!strcmp(att->name, "DVRWindowLength"))
- mpd->time_shift_buffer_depth = atoi(att->value);
+			sscanf(att->value, LLU, &tsb);
+// else if (!strcmp(att->name, "LookaheadCount")) { }
 }
 mpd->media_presentation_duration = mpd->media_presentation_duration * 1000 / timescale;
- mpd->time_shift_buffer_depth = mpd->time_shift_buffer_depth * 1000 / timescale;
-
+ tsb *= 1000;
+ tsb /= timescale;
+ mpd->time_shift_buffer_depth = (u32) tsb;
 
 GF_SAFEALLOC(period, GF_MPD_Period);
 if (!period) return GF_OUT_OF_MEM;
@@ -4790,10 +5286,10 @@
 	if (!e) {
 		e = gf_mpd_init_smooth_from_dom(gf_xml_dom_get_root(dom), mpd, default_base_url);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("[MPD] Failed to convert smooth manifest to MPD\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD] Failed to convert smooth manifest to MPD\n"));
 		}
 	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("[MPD] Failed to load smooth manifest\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD] Failed to load smooth manifest\n"));
 	}
 	gf_xml_dom_del(dom);
 	return e;
@@ -5024,7 +5520,7 @@
 }
 
 
-GF_Err gf_mpd_load_cues(const char *cues_file, u32 stream_id, u32 *cues_timescale, Bool *use_edit_list, GF_DASHCueInfo **out_cues, u32 *nb_cues)
+GF_Err gf_mpd_load_cues(const char *cues_file, u32 stream_id, u32 *cues_timescale, Bool *use_edit_list, s32 *ts_offset, GF_DASHCueInfo **out_cues, u32 *nb_cues)
 {
 	GF_XMLNode *root, *stream, *cue;
 	GF_XMLAttribute *att;
@@ -5058,11 +5554,13 @@
 		if (strcmp(stream->name, "Stream")) continue;
 
 		*use_edit_list = GF_FALSE;
+		*ts_offset = 0;
 		j=0;
 		while ((att = gf_list_enum(stream->attributes, &j))) {
 			if (!strcmp(att->name, "id")) id = atoi(att->value);
 			else if (!strcmp(att->name, "timescale")) timescale = atoi(att->value);
 			else if (!strcmp(att->name, "mode") && !strcmp(att->value, "edit") ) *use_edit_list = GF_TRUE;
+			else if (!strcmp(att->name, "ts_offset")) *ts_offset = atoi(att->value);
 		}
 		if (id != stream_id) continue;
 
@@ -5113,7 +5611,7 @@
 
 GF_Err gf_mpd_split_adaptation_sets(GF_MPD *mpd)
 {
-	u32 i, nb_periods, next_as_id=0;;
+	u32 i, nb_periods, next_as_id=0;
 	if (!mpd) return GF_BAD_PARAM;
 
 	nb_periods = gf_list_count(mpd->periods);
@@ -5123,8 +5621,8 @@
 		nb_as = gf_list_count(period->adaptation_sets);
 		for (j=0; j<nb_as; j++) {
 			GF_MPD_AdaptationSet *set = gf_list_get(period->adaptation_sets, j);
-			if (set->id > next_as_id)
-				next_as_id = set->id;
+			if (set->id > (s32) next_as_id)
+				next_as_id = (u32) set->id;
 		}
 	}
 	next_as_id++;
@@ -5139,6 +5637,7 @@
 			GF_MPD_AdaptationSet *set = gf_list_get(period->adaptation_sets, j);
 			GF_List *reps = set->representations;
 			u32 nb_reps = gf_list_count(set->representations);
+			set->group = -1;
 
 			gf_list_add(new_as, set);
 			if (nb_reps<=1) {
@@ -5155,6 +5654,10 @@
 				gf_list_rem(reps, 1);
 				set->representations = gf_list_new();
 				gf_list_add(set->representations, rep);
+				if (rep->dependency_id) {
+					gf_free(rep->dependency_id);
+					rep->dependency_id = NULL;
+				}
 
 				if (set->id) {
 					set->id = next_as_id;
@@ -5162,12 +5665,13 @@
 				}
 
 				//serialize
-				gf_mpd_print_adaptation_set(set, f, GF_FALSE, 0);
+				gf_mpd_print_adaptation_set(set, f, GF_FALSE, 0, 0);
 				size = (u32) gf_ftell(f);
 				data = gf_malloc(size+1);
 				gf_fseek(f, 0, SEEK_SET);
 				size = (u32) gf_fread(data, size, f);
 				data[size]=0;
+				memset(&blob, 0, sizeof(GF_Blob));
 				blob.data = data;
 				blob.size = size;
 				sprintf(szAdd, "gmem://%p", &blob);
@@ -5193,5 +5697,15 @@
 	return GF_OK;
 }
 
+GF_MPD_Descriptor *gf_mpd_get_descriptor(GF_List *desclist, char *scheme_id)
+{
+	u32 i, count = gf_list_count(desclist);
+	for (i=0; i<count; i++) {
+		GF_MPD_Descriptor *desc = gf_list_get(desclist, i);
+		if (desc->scheme_id_uri && !strcmp(desc->scheme_id_uri, scheme_id)) return desc;
+	}
+	return NULL;
+}
+
 
 #endif /*GPAC_DISABLE_CORE_TOOLS*/

gpac-1.0.1.tar.gz/src/media_tools/mpeg2_ps.c -> gpac-2.0.0.tar.gz/src/media_tools/mpeg2_ps.c Changed

@@ -139,7 +139,7 @@
 };
 
 /*************************************************************************
- * File access routines. Could all be inlined
+ * File access routines. Could all be inline
 *************************************************************************/
 static FILE *file_open (const char *name)
 {
@@ -850,8 +850,8 @@
 {
 	u32 diff;
 	Bool started_new_pes = 0;
-	GF_AC3Header hdr;
-	memset(&hdr, 0, sizeof(GF_AC3Header));
+	GF_AC3Config hdr;
+	memset(&hdr, 0, sizeof(GF_AC3Config));
 	sptr->frame_ts = sptr->next_pes_ts; // set timestamp after searching
 	if (sptr->pes_buffer_size <= sptr->pes_buffer_on + 6) {
 		if (sptr->pes_buffer_size != sptr->pes_buffer_on)
@@ -1015,8 +1015,8 @@
 			// PCM - ???
 		} else if (sptr->m_substream_id >= 0x80) {
 			u32 pos;
-			GF_AC3Header hdr;
-			memset(&hdr, 0, sizeof(GF_AC3Header));
+			GF_AC3Config hdr;
+			memset(&hdr, 0, sizeof(GF_AC3Config));
 			gf_ac3_parser(buffer, buflen, &pos, &hdr, 0);
 			sptr->bitrate = hdr.bitrate;
 			sptr->freq = hdr.sample_rate;

gpac-1.0.1.tar.gz/src/media_tools/mpegts.c -> gpac-2.0.0.tar.gz/src/media_tools/mpegts.c Changed

@@ -86,9 +86,16 @@
 		return "MHVC Video";
 	case GF_M2TS_VIDEO_MHVC_TEMPORAL:
 		return "MHVC Video Temporal Sublayer";
-
+	case GF_M2TS_VIDEO_VVC:
+		return "VVC Video";
+	case GF_M2TS_VIDEO_VVC_TEMPORAL:
+		return "VVC Video Temporal Sublayer";
+	case GF_M2TS_VIDEO_VC1:
+		return "SMPTE VC-1 Video";
 	case GF_M2TS_AUDIO_AC3:
 		return "Dolby AC3 Audio";
+	case GF_M2TS_AUDIO_EC3:
+		return "Dolby E-AC3 Audio";
 	case GF_M2TS_AUDIO_DTS:
 		return "Dolby DTS Audio";
 	case GF_M2TS_SUBTITLE_DVB:
@@ -158,7 +165,8 @@
 	if (! *buffer)
 		return;
 
-	strncpy((*buffer)+(*pos), msg, msg_len);
+	memcpy((*buffer)+(*pos), msg, msg_len);
+	(*buffer)[*pos+msg_len] = 0;
 	*pos += msg_len;
 }
 
@@ -326,6 +334,9 @@
 {
 	gf_list_del_item(es->program->streams, es);
 
+	if (ts->on_event)
+		ts->on_event(ts, GF_M2TS_EVT_STREAM_REMOVED, es);
+
 	if (es->flags & GF_M2TS_ES_IS_SECTION) {
 		GF_M2TS_SECTION_ES *ses = (GF_M2TS_SECTION_ES *)es;
 		if (ses->sec) gf_m2ts_section_filter_del(ses->sec);
@@ -1214,6 +1225,8 @@
 				 metapd->format_identifier == GF_M2TS_META_ID3 &&
 				 metapd->carriage_flag == METADATA_CARRIAGE_SAME_TS) {
 					/*HLS ID3 Metadata */
+					if (pmt->program->metadata_pointer_descriptor)
+						gf_m2ts_metadata_pointer_descriptor_del(pmt->program->metadata_pointer_descriptor);
 					pmt->program->metadata_pointer_descriptor = metapd;
 				} else {
 					/* don't know what to do with it for now, delete */
@@ -1315,6 +1328,9 @@
 		}
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("stream_type :%d \n",stream_type));
+		if ((stream_type==GF_M2TS_JPEG_XS) && gf_opts_get_bool("core", "m2ts-vvc-old"))
+			stream_type = GF_M2TS_VIDEO_VVC;
+
 		switch (stream_type) {
 
 		/* PES */
@@ -1333,17 +1349,26 @@
 		case GF_M2TS_VIDEO_SHVC_TEMPORAL:
 		case GF_M2TS_VIDEO_MHVC:
 		case GF_M2TS_VIDEO_MHVC_TEMPORAL:
+		case GF_M2TS_VIDEO_VVC:
+		case GF_M2TS_VIDEO_VVC_TEMPORAL:
+		case GF_M2TS_VIDEO_VC1:
+		case GF_M2TS_HLS_AVC_CRYPT:
 			inherit_pcr = 1;
 		case GF_M2TS_AUDIO_MPEG1:
 		case GF_M2TS_AUDIO_MPEG2:
 		case GF_M2TS_AUDIO_AAC:
 		case GF_M2TS_AUDIO_LATM_AAC:
 		case GF_M2TS_AUDIO_AC3:
+		case GF_M2TS_AUDIO_EC3:
 		case GF_M2TS_AUDIO_DTS:
+		case GF_M2TS_AUDIO_OPUS:
 		case GF_M2TS_MHAS_MAIN:
 		case GF_M2TS_MHAS_AUX:
 		case GF_M2TS_SUBTITLE_DVB:
 		case GF_M2TS_METADATA_PES:
+		case GF_M2TS_HLS_AAC_CRYPT:
+		case GF_M2TS_HLS_AC3_CRYPT:
+		case GF_M2TS_HLS_EC3_CRYPT:
 		case 0xA1:
 			GF_SAFEALLOC(pes, GF_M2TS_PES);
 			if (!pes) {
@@ -1433,7 +1458,6 @@
 
 		default:
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] Stream type (0x%x) for PID %d not supported\n", stream_type, pid ) );
-			//GF_LOG(/*GF_LOG_WARNING*/GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Stream type (0x%x) for PID %d not supported\n", stream_type, pid ) );
 			break;
 		}
 
@@ -1449,7 +1473,7 @@
 
 		while (desc_len) {
 			if (pos + 2 > data_size) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Broken PMT descriptor! size %d but position %d and need at least 2 bytes to parse descritpor\n", data_size, pos));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Broken PMT descriptor! size %d but position %d and need at least 2 bytes to parse descriptor\n", data_size, pos));
 				break;
 			}
 			u8 tag = data[0];
@@ -1475,14 +1499,31 @@
 				case GF_M2TS_REGISTRATION_DESCRIPTOR:
 					if (len>=4) {
 						reg_desc_format = GF_4CC(data[2], data[3], data[4], data[5]);
-						/* cf http://www.smpte-ra.org/mpegreg/mpegreg.html */
+						/* cf https://smpte-ra.org/registered-mpeg-ts-ids */
 						switch (reg_desc_format) {
 						case GF_M2TS_RA_STREAM_AC3:
 							es->stream_type = GF_M2TS_AUDIO_AC3;
 							break;
+						case GF_M2TS_RA_STREAM_EAC3:
+							es->stream_type = GF_M2TS_AUDIO_EC3;
+							break;
 						case GF_M2TS_RA_STREAM_VC1:
 							es->stream_type = GF_M2TS_VIDEO_VC1;
 							break;
+						case GF_M2TS_RA_STREAM_HEVC:
+							es->stream_type = GF_M2TS_VIDEO_HEVC;
+							break;
+						case GF_M2TS_RA_STREAM_DTS1:
+						case GF_M2TS_RA_STREAM_DTS2:
+						case GF_M2TS_RA_STREAM_DTS3:
+							es->stream_type = GF_M2TS_AUDIO_DTS;
+							break;
+						case GF_M2TS_RA_STREAM_OPUS:
+							es->stream_type = GF_M2TS_AUDIO_OPUS;
+							break;
+						case GF_M2TS_RA_STREAM_DOVI:
+							break;
+
 						case GF_M2TS_RA_STREAM_GPAC:
 							if (len==8) {
 								es->stream_type = GF_4CC(data[6], data[7], data[8], data[9]);
@@ -1562,6 +1603,8 @@
 					 metad->format_identifier == GF_M2TS_META_ID3) {
 						/*HLS ID3 Metadata */
 						if (pes) {
+							if (pes->metadata_descriptor)
+								gf_m2ts_metadata_descriptor_del(pes->metadata_descriptor);
 							pes->metadata_descriptor = metad;
 							pes->stream_type = GF_M2TS_METADATA_ID3_HLS;
 						}
@@ -1571,6 +1614,29 @@
 					}
 				}
 				break;
+				case GF_M2TS_HEVC_VIDEO_DESCRIPTOR:
+					if (es) es->stream_type = GF_M2TS_VIDEO_HEVC;
+					break;
+
+				case GF_M2TS_AVC_VIDEO_DESCRIPTOR:
+					if (es) es->stream_type = GF_M2TS_VIDEO_H264;
+					break;
+
+				case GF_M2TS_DOLBY_VISION_DESCRIPTOR:
+					if (pes && (len>=5)) {
+						GF_BitStream *hbs = gf_bs_new((const char *)data+2, len, GF_BITSTREAM_READ);
+						pes->dv_info[0] = gf_bs_read_u8(hbs);
+						pes->dv_info[1] = gf_bs_read_u8(hbs);
+						pes->dv_info[2] = gf_bs_read_u8(hbs);
+						pes->dv_info[3] = gf_bs_read_u8(hbs);
+						if (! (pes->dv_info[3] & 0x1) ) {
+							pes->depends_on_pid = gf_bs_read_int(hbs, 13);
+							gf_bs_read_int(hbs, 3);
+						}
+						pes->dv_info[4] = gf_bs_read_u8(hbs);
+						gf_bs_del(hbs);
+					}
+					break;
 
 				default:
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] skipping descriptor (0x%x) not supported\n", tag));
@@ -1591,9 +1657,13 @@
 			es = NULL;
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Private Stream type (0x%x) for PID %d not supported\n", stream_type, pid ) );
 		}
-
 		if (!es) continue;
 
+		if (pes && (stream_type==GF_M2TS_PRIVATE_DATA) && (es->stream_type!=stream_type) && pes->dv_info[0]) {
+			//non-compatible base layer dolby vision
+			pes->dv_info[24] = 1;
+		}
+
 		if (ts->ess[pid]) {
 			//this is component reuse across programs, overwrite the previously declared stream ...
 			if (status & GF_M2TS_TABLE_FOUND) {
@@ -1956,7 +2026,7 @@
 	pes->temi_pending = 1;
 }
 
-void gf_m2ts_flush_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes)
+void gf_m2ts_flush_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, u32 force_flush_type)
 {
 	GF_M2TS_PESHeader pesh;
 	if (!ts) return;
@@ -2002,27 +2072,29 @@
 			if (pesh.PTS) {
 				if (pesh.PTS == pes->PTS) {
 					same_pts = GF_TRUE;
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - same PTS "LLU" for two consecutive PES packets \n", pes->pid, pes->PTS));
+					if (!pes->is_resume) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - same PTS "LLU" for two consecutive PES packets \n", pes->pid, pes->PTS));
+					}
 				}
-	#ifndef GPAC_DISABLE_LOG
+#ifndef GPAC_DISABLE_LOG
 				/*FIXME - this test should only be done for non bi-directionally coded media
 				else if (pesh.PTS < pes->PTS) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - PTS "LLU" less than previous packet PTS "LLU"\n", pes->pid, pesh.PTS, pes->PTS) );
 				}
 				*/
-	#endif
+#endif
 
 				pes->PTS = pesh.PTS;
-	#ifndef GPAC_DISABLE_LOG
+#ifndef GPAC_DISABLE_LOG
 				{
-					if (pes->DTS && (pesh.DTS == pes->DTS)) {
+					if (!pes->is_resume && pes->DTS && (pesh.DTS == pes->DTS)) {
 						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - same DTS "LLU" for two consecutive PES packets \n", pes->pid, pes->DTS));
 					}
 					if (pesh.DTS < pes->DTS) {
 						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - DTS "LLU" less than previous DTS "LLU"\n", pes->pid, pesh.DTS, pes->DTS));
 					}
 				}
-	#endif
+#endif
 				pes->DTS = pesh.DTS;
 			}
 			/*no PTSs were coded, same time*/
@@ -2030,6 +2102,7 @@
 				same_pts = GF_TRUE;
 			}
 
+			pes->is_resume = GF_FALSE;
 
 			/*3-byte start-code + 6 bytes header + hdr extensions*/
 			len = 9 + pesh.hdr_data_len;
@@ -2058,7 +2131,13 @@
 			u32 offset = len;
 
 			if (pesh.pck_len && (pesh.pck_len-3-pesh.hdr_data_len != pes->pck_data_len-len)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PES payload size %d but received %d bytes\n", pes->pid, (u32) ( pesh.pck_len-3-pesh.hdr_data_len), pes->pck_data_len-len));
+				if (!force_flush_type) {
+					pes->is_resume = GF_TRUE;
+					return;
+				}
+				if (force_flush_type==1) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PES payload size %d but received %d bytes\n", pes->pid, (u32) ( pesh.pck_len-3-pesh.hdr_data_len), pes->pck_data_len-len));
+				}
 			}
 			//copy over the remaining of previous PES payload before start of this PES payload
 			if (pes->prev_data_len) {
@@ -2171,7 +2250,7 @@
 
 	/*PES first fragment: flush previous packet*/
 	if (flush_pes && pes->pck_data_len) {
-		gf_m2ts_flush_pes(ts, pes);
+		gf_m2ts_flush_pes(ts, pes, 1);
 		if (!data_size) return;
 	}
 	/*we need to wait for first packet of PES*/
@@ -2193,18 +2272,18 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Got PES packet len %d\n", pes->pid, pes->pes_len));
 
 		if (pes->pes_len + 6 == pes->pck_data_len) {
-			gf_m2ts_flush_pes(ts, pes);
+			gf_m2ts_flush_pes(ts, pes, 1);
 		}
 	}
 }
 
-void gf_m2ts_flush_all(GF_M2TS_Demuxer *ts)
+void gf_m2ts_flush_all(GF_M2TS_Demuxer *ts, Bool no_force_flush)
 {
 	u32 i;
 	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
 		GF_M2TS_ES *stream = ts->ess[i];
 		if (stream && (stream->flags & GF_M2TS_ES_IS_PES)) {
-			gf_m2ts_flush_pes(ts, (GF_M2TS_PES *) stream);
+			gf_m2ts_flush_pes(ts, (GF_M2TS_PES *) stream, no_force_flush ? 0 : 2);
 		}
 	}
 }
@@ -2225,7 +2304,7 @@
 	af_extension = data + 1;
 
 	if (paf->PCR_flag == 1) {
-		u32 base = (data[1] << 24) | (data[2] << 16) | (data[3] << 8) | data[4];
+		u32 base = ((u32)data[1] << 24) | ((u32)data[2] << 16) | ((u32)data[3] << 8) | (u32) data[4];
 		u64 PCR = (u64) base;
 		paf->PCR_base = (PCR << 1) | (data[5] >> 7);
 		paf->PCR_ext = ((data[5] & 1) << 8) | data[6];
@@ -2313,6 +2392,10 @@
 					use_base_temi_url = gf_bs_read_int(bs, 1);
 					gf_bs_read_int(bs, 5); //reserved
 					temi_loc.timeline_id = gf_bs_read_int(bs, 7);
+					if (temi_loc.is_announce) {
+						temi_loc.activation_countdown.den = gf_bs_read_u32(bs);
+						temi_loc.activation_countdown.num = gf_bs_read_u32(bs);
+					}
 					if (!use_base_temi_url) {
 						char *_url = URL;
 						u8 scheme = gf_bs_read_int(bs, 8);
@@ -2627,16 +2710,24 @@
 	if (ts->buffer_size) {
 		//we are sync, copy remaining bytes
 		if ( (ts->buffer[0]==0x47) && (ts->buffer_size<200)) {
+			u32 copy_size;
 			pck_size = ts->prefix_present ? 192 : 188;
 
 			if (ts->alloc_size < 200) {
 				ts->alloc_size = 200;
 				ts->buffer = (char*)gf_realloc(ts->buffer, sizeof(char)*ts->alloc_size);
 			}
-			memcpy(ts->buffer + ts->buffer_size, data, pck_size - ts->buffer_size);
+			copy_size = pck_size - ts->buffer_size;
+			if (copy_size > data_size) {
+				memcpy(ts->buffer + ts->buffer_size, data, data_size);
+				ts->buffer_size += data_size;
+				return GF_OK;
+			}
+			memcpy(ts->buffer + ts->buffer_size, data, copy_size);
 			e |= gf_m2ts_process_packet(ts, (unsigned char *)ts->buffer);
-			data += (pck_size - ts->buffer_size);
-			data_size = data_size - (pck_size - ts->buffer_size);
+			data += copy_size;
+			data_size = data_size - copy_size;
+			assert((s32)data_size >= 0);
 		}
 		//not sync, copy over the complete buffer
 		else {
@@ -2802,6 +2893,23 @@
 
 }
 
+void gf_m2ts_mark_seg_start(GF_M2TS_Demuxer *ts)
+{
+	u32 i;
+	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
+		GF_M2TS_ES *es = (GF_M2TS_ES *) ts->ess[i];
+		if (!es) continue;
+
+		if (es->flags & GF_M2TS_ES_IS_SECTION) {
+			GF_M2TS_SECTION_ES *ses = (GF_M2TS_SECTION_ES *)es;
+			ses->is_seg_start = GF_TRUE;
+		} else {
+			GF_M2TS_PES *pes = (GF_M2TS_PES *)es;
+			pes->is_seg_start = GF_TRUE;
+		}
+	}
+}
+
 
 #if 0 //unused
 u32 gf_m2ts_pes_get_framing_mode(GF_M2TS_PES *pes)
@@ -3009,7 +3117,7 @@
 		if (gf_list_count(ts->dsmcc_controler)) {
 #ifdef GPAC_ENABLE_DSMCC
 			GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord = (GF_M2TS_DSMCC_OVERLORD*)gf_list_get(ts->dsmcc_controler,0);
-			gf_cleanup_dir(dsmcc_overlord->root_dir);
+			gf_dir_cleanup(dsmcc_overlord->root_dir);
 			gf_rmdir(dsmcc_overlord->root_dir);
 			gf_m2ts_delete_dsmcc_overlord(dsmcc_overlord);
 			if(ts->dsmcc_root_dir) {
@@ -3054,7 +3162,20 @@
 
 	ts = gf_m2ts_demux_new();
 	e = gf_m2ts_process_data(ts, buf, size);
-	if (!ts->pck_number) e = GF_BAD_PARAM;
+
+	if (!ts->pck_number) {
+		e = GF_BAD_PARAM;
+	} else {
+		u32 nb_pck;
+		//max number of packets
+		if (ts->prefix_present)
+			nb_pck = size/192;
+		else
+			nb_pck = size/188;
+		//probe success if after align we have nb_pck - 2 and at least 2 packets
+		if ((nb_pck<2) || (ts->pck_number + 2 < nb_pck))
+			e = GF_BAD_PARAM;
+	}
 	gf_m2ts_demux_del(ts);
 
 	gf_log_set_tool_level(GF_LOG_CONTAINER, lt);
@@ -3071,11 +3192,12 @@
 
 	if (!strncmp(fileName, "gmem://", 7)) {
 		u8 *mem_address;
-		if (gf_blob_get_data(fileName, &mem_address, &size) != GF_OK) {
+		if (gf_blob_get(fileName, &mem_address, &size, NULL) != GF_OK) {
 			return GF_FALSE;
 		}
 		if (size>M2TS_PROBE_SIZE) size = M2TS_PROBE_SIZE;
 		memcpy(buf, mem_address, size);
+ gf_blob_release(fileName);
 	} else {
 		FILE *t = gf_fopen(fileName, "rb");
 		if (!t) return 0;

gpac-2.0.0.tar.gz/src/media_tools/route_dmx.c Added

@@ -0,0 +1,2047 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2020
+ *					All rights reserved
+ *
+ * This file is part of GPAC / Media Tools ROUTE (ATSC3, DVB-I) demux sub-project
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/route.h>
+
+#if !defined(GPAC_DISABLE_ROUTE) && !defined(GPAC_DISABLE_CORE_TOOLS)
+
+#include <gpac/network.h>
+#include <gpac/bitstream.h>
+#include <gpac/xml.h>
+#include <gpac/thread.h>
+
+#define GF_ROUTE_SOCK_SIZE	0x80000
+
+typedef struct
+{
+	u8 codepoint;
+	u8 format_id;
+	u8 frag;
+	u8 order;
+	u32 src_fec_payload_id;
+} GF_ROUTELCTReg;
+
+typedef struct
+{
+	char *filename;
+	u32 toi;
+	u32 crc;
+} GF_ROUTELCTFile;
+
+typedef struct
+{
+	u32 tsi;
+	char *toi_template;
+	GF_List *static_files;
+
+	GF_ROUTELCTReg CPs[8];
+	u32 nb_cps;
+	u32 last_dispatched_tsi, last_dispatched_toi;
+	Bool tsi_init;
+} GF_ROUTELCTChannel;
+
+typedef enum
+{
+	GF_LCT_OBJ_INIT=0,
+	GF_LCT_OBJ_RECEPTION,
+	GF_LCT_OBJ_DONE_ERR,
+	GF_LCT_OBJ_DONE,
+	GF_LCT_OBJ_DISPATCHED,
+} GF_LCTObjectStatus;
+
+typedef struct
+{
+	u32 toi, tsi;
+	u32 total_length;
+	//fragment reaggregation
+	char *payload;
+	u32 nb_bytes, nb_recv_bytes, alloc_size;
+	u32 nb_frags, nb_alloc_frags, nb_recv_frags;
+	GF_LCTFragInfo *frags;
+	GF_LCTObjectStatus status;
+	u32 download_time_ms;
+	u32 last_gather_time;
+	u8 closed_flag;
+	u8 force_keep;
+
+	GF_ROUTELCTChannel *rlct;
+	GF_ROUTELCTFile *rlct_file;
+
+	u32 prev_start_offset;
+
+ char solved_path[GF_MAX_PATH];
+ 
+ GF_Blob blob;
+	void *udta;
+} GF_LCTObject;
+
+
+
+typedef struct
+{
+	GF_Socket *sock;
+
+	GF_List *channels;
+} GF_ROUTESession;
+
+typedef enum
+{
+	GF_ROUTE_TUNE_OFF=0,
+	GF_ROUTE_TUNE_ON,
+	GF_ROUTE_TUNE_SLS_ONLY,
+} GF_ROUTETuneMode;
+
+typedef struct
+{
+	u32 service_id;
+	u32 protocol;
+	u32 mpd_version, stsid_version;
+	GF_Socket *sock;
+	u32 secondary_sockets;
+	GF_List *objects;
+	GF_LCTObject *last_active_obj;
+
+	u32 port;
+	char *dst_ip;
+	u32 last_dispatched_toi_on_tsi_zero;
+	u32 stsid_crc;
+
+	GF_List *route_sessions;
+	GF_ROUTETuneMode tune_mode;
+	void *udta;
+} GF_ROUTEService;
+
+struct __gf_routedmx {
+	const char *ip_ifce;
+	GF_Socket *atsc_sock;
+	u8 *buffer;
+	u32 buffer_size;
+	u8 *unz_buffer;
+	u32 unz_buffer_size;
+
+	u32 reorder_timeout;
+	Bool force_reorder;
+ Bool progressive_dispatch;
+ 
+	u32 slt_version, rrt_version, systime_version, aeat_version;
+	GF_List *services;
+
+	GF_List *object_reservoir;
+	GF_BitStream *bs;
+
+	GF_DOMParser *dom;
+	u32 service_autotune;
+	Bool tune_all_sls;
+
+	GF_SockGroup *active_sockets;
+
+
+	void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *info);
+	void *udta;
+
+	u32 debug_tsi;
+
+	u64 nb_packets;
+	u64 total_bytes_recv;
+	u64 first_pck_time, last_pck_time;
+
+ //for now use a single mutex for all blob access
+ GF_Mutex *blob_mx;
+
+};
+
+static void gf_route_static_files_del(GF_List *files)
+{
+	while (gf_list_count(files)) {
+		GF_ROUTELCTFile *rf = gf_list_pop_back(files);
+		gf_free(rf->filename);
+		gf_free(rf);
+	}
+	gf_list_del(files);
+}
+
+static void gf_route_route_session_del(GF_ROUTESession *rs)
+{
+	if (rs->sock) gf_sk_del(rs->sock);
+	while (gf_list_count(rs->channels)) {
+		GF_ROUTELCTChannel *lc = gf_list_pop_back(rs->channels);
+		gf_route_static_files_del(lc->static_files);
+		gf_free(lc->toi_template);
+		gf_free(lc);
+	}
+	gf_list_del(rs->channels);
+	gf_free(rs);
+}
+
+static void gf_route_lct_obj_del(GF_LCTObject *o)
+{
+	if (o->frags) gf_free(o->frags);
+	if (o->payload) gf_free(o->payload);
+	gf_free(o);
+}
+
+static void gf_route_service_del(GF_ROUTEDmx *routedmx, GF_ROUTEService *s)
+{
+	if (s->sock) {
+		gf_sk_group_unregister(routedmx->active_sockets, s->sock);
+		gf_sk_del(s->sock);
+	}
+	while (gf_list_count(s->route_sessions)) {
+		GF_ROUTESession *rsess = gf_list_pop_back(s->route_sessions);
+		gf_route_route_session_del(rsess);
+	}
+	gf_list_del(s->route_sessions);
+
+	while (gf_list_count(s->objects)) {
+		GF_LCTObject *o = gf_list_pop_back(s->objects);
+		gf_route_lct_obj_del(o);
+	}
+	gf_list_del(s->objects);
+	if (s->dst_ip) gf_free(s->dst_ip);
+	gf_free(s);
+}
+
+GF_EXPORT
+void gf_route_dmx_del(GF_ROUTEDmx *routedmx)
+{
+	if (!routedmx) return;
+
+	if (routedmx->buffer) gf_free(routedmx->buffer);
+	if (routedmx->unz_buffer) gf_free(routedmx->unz_buffer);
+	if (routedmx->atsc_sock) gf_sk_del(routedmx->atsc_sock);
+ if (routedmx->dom) gf_xml_dom_del(routedmx->dom);
+ if (routedmx->blob_mx) gf_mx_del(routedmx->blob_mx);
+	if (routedmx->services) {
+		while (gf_list_count(routedmx->services)) {
+			GF_ROUTEService *s = gf_list_pop_back(routedmx->services);
+			gf_route_service_del(routedmx, s);
+		}
+		gf_list_del(routedmx->services);
+	}
+	if (routedmx->active_sockets) gf_sk_group_del(routedmx->active_sockets);
+	if (routedmx->object_reservoir) {
+		while (gf_list_count(routedmx->object_reservoir)) {
+			GF_LCTObject *obj = gf_list_pop_back(routedmx->object_reservoir);
+			gf_route_lct_obj_del(obj);
+		}
+		gf_list_del(routedmx->object_reservoir);
+	}
+	if (routedmx->bs) gf_bs_del(routedmx->bs);
+	gf_free(routedmx);
+}
+
+static GF_ROUTEDmx *gf_route_dmx_new_internal(const char *ifce, u32 sock_buffer_size, Bool is_atsc,
+							 void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *info),
+							 void *udta)
+{
+	GF_ROUTEDmx *routedmx;
+	GF_Err e;
+	GF_SAFEALLOC(routedmx, GF_ROUTEDmx);
+	if (!routedmx) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to allocate ROUTE demuxer\n"));
+		return NULL;
+	}
+	routedmx->ip_ifce = ifce;
+	routedmx->dom = gf_xml_dom_new();
+	if (!routedmx->dom) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to allocate DOM parser\n" ));
+		gf_route_dmx_del(routedmx);
+		return NULL;
+	}
+	routedmx->services = gf_list_new();
+	if (!routedmx->services) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to allocate ROUTE service list\n" ));
+		gf_route_dmx_del(routedmx);
+		return NULL;
+	}
+	routedmx->object_reservoir = gf_list_new();
+	if (!routedmx->object_reservoir) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to allocate ROUTE object reservoir\n" ));
+		gf_route_dmx_del(routedmx);
+		return NULL;
+	}
+ routedmx->blob_mx = gf_mx_new("ROUTEBlob");
+ if (!routedmx->blob_mx) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to allocate ROUTE blob mutex\n" ));
+ gf_route_dmx_del(routedmx);
+ return NULL;
+ }
+
+	if (!sock_buffer_size) sock_buffer_size = GF_ROUTE_SOCK_SIZE;
+	routedmx->unz_buffer_size = sock_buffer_size;
+	//we store one UDP packet, or realloc to store LLS signaling so starting with 10k should be enough in most cases
+	routedmx->buffer_size = 10000;
+	routedmx->buffer = gf_malloc(routedmx->buffer_size);
+	if (!routedmx->buffer) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to allocate socket buffer\n"));
+		gf_route_dmx_del(routedmx);
+		return NULL;
+	}
+	routedmx->unz_buffer = gf_malloc(routedmx->unz_buffer_size);
+	if (!routedmx->unz_buffer) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to allocate socket buffer\n"));
+		gf_route_dmx_del(routedmx);
+		return NULL;
+	}
+
+	routedmx->active_sockets = gf_sk_group_new();
+	if (!routedmx->active_sockets) {
+		gf_route_dmx_del(routedmx);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to create socket group\n"));
+		return NULL;
+	}
+	//create static bs
+	routedmx->bs = gf_bs_new((char*)&e, 1, GF_BITSTREAM_READ);
+
+	routedmx->reorder_timeout = 5000;
+
+	routedmx->on_event = on_event;
+	routedmx->udta = udta;
+
+	if (!is_atsc)
+		return routedmx;
+
+	routedmx->atsc_sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+	if (!routedmx->atsc_sock) {
+		gf_route_dmx_del(routedmx);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to create UDP socket\n"));
+		return NULL;
+	}
+	gf_sk_group_register(routedmx->active_sockets, routedmx->atsc_sock);
+
+	gf_sk_set_usec_wait(routedmx->atsc_sock, 1);
+	e = gf_sk_setup_multicast(routedmx->atsc_sock, GF_ATSC_MCAST_ADDR, GF_ATSC_MCAST_PORT, 1, GF_FALSE, (char *) ifce);
+	if (e) {
+		gf_route_dmx_del(routedmx);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to bind to multicast address on interface %s\n", ifce ? ifce : "default"));
+		return NULL;
+	}
+	gf_sk_set_buffer_size(routedmx->atsc_sock, GF_FALSE, sock_buffer_size);
+	//gf_sk_set_block_mode(routedmx->sock, GF_TRUE);
+	return routedmx;
+}
+
+static void gf_route_register_service_sockets(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, Bool do_register)
+{
+ u32 i;
+ GF_ROUTESession *rsess;
+ if (do_register) gf_sk_group_register(routedmx->active_sockets, s->sock);
+ else gf_sk_group_unregister(routedmx->active_sockets, s->sock);
+
+ if (!s->secondary_sockets) return;
+
+ i=0;
+ while ((rsess = gf_list_enum(s->route_sessions, &i))) {
+ if (! rsess->sock) continue;
+ if (do_register) gf_sk_group_register(routedmx->active_sockets, rsess->sock);
+ else gf_sk_group_unregister(routedmx->active_sockets, rsess->sock);
+ }
+}
+
+static void gf_route_create_service(GF_ROUTEDmx *routedmx, const char *dst_ip, u32 dst_port, u32 service_id, u32 protocol)
+{
+	GF_ROUTEService *service;
+	GF_Err e;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Setting up service %d destination IP %s port %d\n", service_id, dst_ip, dst_port));
+
+	GF_SAFEALLOC(service, GF_ROUTEService);
+	if (!service) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to allocate service %d\n", service_id));
+		return;
+	}
+	service->service_id = service_id;
+	service->protocol = protocol;
+
+	service->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+	gf_sk_set_usec_wait(service->sock, 1);
+	e = gf_sk_setup_multicast(service->sock, dst_ip, dst_port, 0, GF_FALSE, (char*) routedmx->ip_ifce);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to setup multicast on %s:%d for service %d\n", dst_ip, dst_port, service_id));
+		gf_route_service_del(routedmx, service);
+		return;
+	}
+	gf_sk_set_buffer_size(service->sock, GF_FALSE, routedmx->unz_buffer_size);
+	//gf_sk_set_block_mode(service->sock, GF_TRUE);
+
+	service->dst_ip = gf_strdup(dst_ip);
+	service->port = dst_port;
+	service->objects = gf_list_new();
+	service->route_sessions = gf_list_new();
+
+	gf_list_add(routedmx->services, service);
+
+	if (routedmx->atsc_sock) {
+		if (routedmx->service_autotune==0xFFFFFFFF) service->tune_mode = GF_ROUTE_TUNE_ON;
+		else if (routedmx->service_autotune==0xFFFFFFFE) {
+			service->tune_mode = GF_ROUTE_TUNE_ON;
+			routedmx->service_autotune -= 1;
+		}
+		else if (routedmx->service_autotune==service_id) service->tune_mode = GF_ROUTE_TUNE_ON;
+		else if (routedmx->tune_all_sls) service->tune_mode = GF_ROUTE_TUNE_SLS_ONLY;
+
+		//we are tuning, register socket
+ if (service->tune_mode != GF_ROUTE_TUNE_OFF) {
+			//call gf_route_register_service_sockets rather than gf_sk_group_register for coverage purpose only
+ gf_route_register_service_sockets(routedmx, service, GF_TRUE);
+ }
+	} else {
+		service->tune_mode = GF_ROUTE_TUNE_ON;
+		routedmx->service_autotune = service_id;
+		gf_sk_group_register(routedmx->active_sockets, service->sock);
+	}
+
+	if (routedmx->on_event) routedmx->on_event(routedmx->udta, GF_ROUTE_EVT_SERVICE_FOUND, service_id, NULL);
+}
+
+GF_EXPORT
+GF_ROUTEDmx *gf_route_atsc_dmx_new(const char *ifce, u32 sock_buffer_size,
+								 void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *info),
+								 void *udta)
+{
+	return gf_route_dmx_new_internal(ifce, sock_buffer_size, GF_TRUE, on_event, udta);
+
+}
+GF_EXPORT
+GF_ROUTEDmx *gf_route_dmx_new(const char *ip, u32 port, const char *ifce, u32 sock_buffer_size,
+							 void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *info),
+							 void *udta)
+{
+	GF_ROUTEDmx *routedmx = gf_route_dmx_new_internal(ifce, sock_buffer_size, GF_FALSE, on_event, udta);
+	if (!routedmx) return NULL;
+	gf_route_create_service(routedmx, ip, port, 1, 1);
+	return routedmx;
+}
+
+GF_EXPORT
+GF_Err gf_route_atsc3_tune_in(GF_ROUTEDmx *routedmx, u32 serviceID, Bool tune_all_sls)
+{
+	u32 i;
+	GF_ROUTEService *s;
+	if (!routedmx) return GF_BAD_PARAM;
+	routedmx->service_autotune = serviceID;
+	routedmx->tune_all_sls = tune_all_sls;
+	i=0;
+	while ((s = gf_list_enum(routedmx->services, &i))) {
+		GF_ROUTETuneMode prev_mode = s->tune_mode;
+		if (s->service_id==serviceID) s->tune_mode = GF_ROUTE_TUNE_ON;
+		else if (serviceID==0xFFFFFFFF) s->tune_mode = GF_ROUTE_TUNE_ON;
+		else if ((s->tune_mode!=GF_ROUTE_TUNE_ON) && (serviceID==0xFFFFFFFE)) {
+			s->tune_mode = GF_ROUTE_TUNE_ON;
+			serviceID = s->service_id;
+		} else {
+			s->tune_mode = tune_all_sls ? GF_ROUTE_TUNE_SLS_ONLY : GF_ROUTE_TUNE_OFF;
+		}
+		//we were previously not tuned
+		if (prev_mode == GF_ROUTE_TUNE_OFF) {
+			//we are now tuned, register sockets
+			if (s->tune_mode != GF_ROUTE_TUNE_OFF) {
+				gf_route_register_service_sockets(routedmx, s, GF_TRUE);
+			}
+		}
+		//we were previously tuned
+		else {
+			//we are now not tuned, unregister sockets
+			if (s->tune_mode == GF_ROUTE_TUNE_OFF) {
+				gf_route_register_service_sockets(routedmx, s, GF_FALSE);
+			}
+		}
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_route_set_reorder(GF_ROUTEDmx *routedmx, Bool force_reorder, u32 timeout_ms)
+{
+	if (!routedmx) return GF_BAD_PARAM;
+	routedmx->reorder_timeout = timeout_ms;
+	routedmx->force_reorder = force_reorder;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_route_set_allow_progressive_dispatch(GF_ROUTEDmx *routedmx, Bool allow_progressive)
+{
+ if (!routedmx) return GF_BAD_PARAM;
+ routedmx->progressive_dispatch = allow_progressive;
+ return GF_OK;
+}
+
+static GF_Err gf_route_dmx_process_slt(GF_ROUTEDmx *routedmx, GF_XMLNode *root)
+{
+	GF_XMLNode *n;
+	u32 i=0;
+
+	while ( ( n = gf_list_enum(root->content, &i)) ) {
+		if (n->type != GF_XML_NODE_TYPE) continue;
+		//setup service
+		if (!strcmp(n->name, "Service")) {
+			GF_XMLAttribute *att;
+			GF_XMLNode *m;
+			u32 j=0;
+			const char *dst_ip=NULL;
+			u32 dst_port = 0;
+			u32 protocol = 0;
+			u32 service_id=0;
+			while ( ( att = gf_list_enum(n->attributes, &j)) ) {
+				if (!strcmp(att->name, "serviceId")) sscanf(att->value, "%u", &service_id);
+			}
+
+			j=0;
+			while ( ( m = gf_list_enum(n->content, &j)) ) {
+				if (m->type != GF_XML_NODE_TYPE) continue;
+				if (!strcmp(m->name, "BroadcastSvcSignaling")) {
+					u32 k=0;
+					while ( ( att = gf_list_enum(m->attributes, &k)) ) {
+						if (!strcmp(att->name, "slsProtocol")) protocol = atoi(att->value);
+						if (!strcmp(att->name, "slsDestinationIpAddress")) dst_ip = att->value;
+						else if (!strcmp(att->name, "slsDestinationUdpPort")) dst_port = atoi(att->value);
+						//don't care about the rest
+					}
+				}
+			}
+
+			if (!dst_ip || !dst_port) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] No service destination IP or port found for service %d - ignoring service\n", service_id));
+				continue;
+			}
+			if (protocol==2) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] ATSC service %d using MMTP protocol is not supported - ignoring\n", service_id));
+				continue;
+			}
+			if (protocol!=1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Unknown ATSC signaling protocol %d for service %d - ignoring\n", protocol, service_id));
+				continue;
+			}
+
+			//todo - remove existing service ?
+			gf_route_create_service(routedmx, dst_ip, dst_port, service_id, protocol);
+
+		}
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Done scaning all services\n"));
+	if (routedmx->on_event) routedmx->on_event(routedmx->udta, GF_ROUTE_EVT_SERVICE_SCAN, 0, NULL);
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_LOG
+static const char *get_lct_obj_status_name(GF_LCTObjectStatus status)
+{
+	switch (status) {
+	case GF_LCT_OBJ_INIT: return "init";
+	case GF_LCT_OBJ_RECEPTION: return "reception";
+	case GF_LCT_OBJ_DONE_ERR: return "done_error";
+	case GF_LCT_OBJ_DONE: return "done";
+	case GF_LCT_OBJ_DISPATCHED: return "dispatched";
+	}
+	return "unknown";
+}
+#endif // GPAC_DISABLE_LOG
+
+static void gf_route_obj_to_reservoir(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, GF_LCTObject *obj)
+{
+
+	assert (obj->status != GF_LCT_OBJ_RECEPTION);
+
+ if (routedmx->on_event && obj->solved_path[0]) {
+ GF_ROUTEEventFileInfo finfo;
+ memset(&finfo, 0, sizeof(GF_ROUTEEventFileInfo));
+		finfo.filename = obj->solved_path;
+		finfo.udta = obj->udta;
+ routedmx->on_event(routedmx->udta, GF_ROUTE_EVT_FILE_DELETE, s->service_id, &finfo);
+ }
+
+	//remove other objects
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d : moving object tsi %u toi %u to reservoir (status %s)\n", s->service_id, obj->tsi, obj->toi, get_lct_obj_status_name(obj->status) ));
+
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_ROUTE, GF_LOG_DEBUG)){
+		u32 i, count = gf_list_count(s->objects);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d : active objects TOIs for tsi %u: ", s->service_id, obj->tsi));
+		for (i=0;i<count;i++) {
+			GF_LCTObject *o = gf_list_get(s->objects, i);
+			if (o==obj) continue;
+			if (o->tsi != obj->tsi) continue;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, (" %u", o->toi));
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("\n"));
+	}
+#endif
+
+	if (s->last_active_obj==obj) s->last_active_obj = NULL;
+	obj->closed_flag = 0;
+	obj->force_keep = 0;
+	obj->nb_bytes = 0;
+	obj->nb_frags = GF_FALSE;
+	obj->nb_recv_frags = 0;
+	obj->rlct = NULL;
+	obj->rlct_file = NULL;
+	obj->toi = 0;
+ obj->tsi = 0;
+	obj->udta = NULL;
+ obj->solved_path[0] = 0;
+	obj->total_length = 0;
+	obj->prev_start_offset = 0;
+	obj->download_time_ms = 0;
+	obj->last_gather_time = 0;
+	obj->status = GF_LCT_OBJ_INIT;
+	gf_list_del_item(s->objects, obj);
+	gf_list_add(routedmx->object_reservoir, obj);
+
+}
+
+static GF_Err gf_route_dmx_push_object(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, GF_LCTObject *obj, Bool final_push, Bool partial, Bool updated, u64 bytes_done)
+{
+ char *filepath;
+ Bool is_init = GF_FALSE;
+
+ if (obj->rlct_file) {
+ filepath = obj->rlct_file->filename ? obj->rlct_file->filename : "ghost-init.mp4";
+ is_init = GF_TRUE;
+ assert(final_push);
+ } else {
+ if (!obj->solved_path[0])
+ sprintf(obj->solved_path, obj->rlct->toi_template, obj->toi);
+ filepath = obj->solved_path;
+ }
+#ifndef GPAC_DISABLE_LOG
+ if (partial) {
+ GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d got file %s (TSI %u TOI %u) size %d in %d ms (%d bytes in %d fragments)\n", s->service_id, filepath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms, obj->nb_bytes, obj->nb_recv_frags));
+ } else {
+ GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Service %d got file %s (TSI %u TOI %u) size %d in %d ms\n", s->service_id, filepath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms));
+ }
+#endif
+
+ if (routedmx->on_event) {
+ GF_ROUTEEventType evt_type;
+ GF_ROUTEEventFileInfo finfo;
+ memset(&finfo, 0, sizeof(GF_ROUTEEventFileInfo));
+ finfo.filename = filepath;
+		obj->blob.data = obj->payload;
+		obj->blob.flags = 0;
+		if (final_push) {
+			if (!obj->total_length)
+				obj->total_length = obj->alloc_size;
+			if (partial)
+				obj->blob.flags |= GF_BLOB_CORRUPTED;
+			obj->blob.size = (u32) obj->total_length;
+		} else {
+			obj->blob.flags = GF_BLOB_IN_TRANSFER;
+			obj->blob.size = (u32) bytes_done;
+		}
+		finfo.blob = &obj->blob;		
+ finfo.total_size = obj->total_length;
+ finfo.tsi = obj->tsi;
+ finfo.toi = obj->toi;
+		finfo.updated = updated;
+		finfo.udta = obj->udta;
+ finfo.download_ms = obj->download_time_ms;
+ if (is_init)
+ evt_type = GF_ROUTE_EVT_FILE;
+ else if (final_push) {
+ evt_type = GF_ROUTE_EVT_DYN_SEG;
+ finfo.nb_frags = obj->nb_frags;
+ finfo.frags = obj->frags;
+			assert(obj->total_length <= obj->alloc_size);
+ }
+ else
+ evt_type = GF_ROUTE_EVT_DYN_SEG_FRAG;
+
+		routedmx->on_event(routedmx->udta, evt_type, s->service_id, &finfo);
+		//store udta cookie
+		obj->udta = finfo.udta;
+	} else if (final_push) {
+		//keep static files active, move other to reservoir
+		if (!obj->rlct_file)
+			gf_route_obj_to_reservoir(routedmx, s, obj);
+	}
+ return GF_OK;
+}
+
+static GF_Err gf_route_dmx_process_object(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, GF_LCTObject *obj)
+{
+	Bool partial = GF_FALSE;
+	Bool updated = GF_TRUE;
+
+	if (!obj->rlct) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d : internal error, no LCT ROUTE channel defined for object TSI %u TOI %u\n", s->service_id, obj->tsi, obj->toi));
+		return GF_SERVICE_ERROR;
+	}
+	assert(obj->status>GF_LCT_OBJ_RECEPTION);
+
+	if (obj->status==GF_LCT_OBJ_DONE_ERR) {
+		if (obj->rlct->tsi_init) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d : object TSI %u TOI %u partial received only\n", s->service_id, obj->tsi, obj->toi));
+		}
+		partial = GF_TRUE;
+	}
+	obj->rlct->tsi_init = GF_TRUE;
+	if (obj->status == GF_LCT_OBJ_DISPATCHED) return GF_OK;
+	obj->status = GF_LCT_OBJ_DISPATCHED;
+
+	if (obj->rlct_file) {
+		u32 crc = gf_crc_32(obj->payload, obj->total_length);
+		if (crc != obj->rlct_file->crc) {
+			obj->rlct_file->crc = crc;
+			updated = GF_TRUE;
+		} else {
+			updated = GF_FALSE;
+		}
+	}
+	return gf_route_dmx_push_object(routedmx, s, obj, GF_TRUE, partial, updated, 0);
+}
+
+static GF_Err gf_route_service_flush_object(GF_ROUTEService *s, GF_LCTObject *obj)
+{
+	u32 i;
+	u64 start_offset = 0;
+	obj->status = GF_LCT_OBJ_DONE;
+	for (i=0; i<obj->nb_frags; i++) {
+		if (start_offset != obj->frags[i].offset) {
+			obj->status = GF_LCT_OBJ_DONE_ERR;
+			break;
+		}
+		start_offset += obj->frags[i].size;
+	}
+	if (start_offset != obj->total_length) {
+		obj->status = GF_LCT_OBJ_DONE_ERR;
+	}
+	obj->download_time_ms = gf_sys_clock() - obj->download_time_ms;
+	return GF_EOS;
+}
+
+static GF_Err gf_route_service_gather_object(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, u32 tsi, u32 toi, u32 start_offset, char *data, u32 size, u32 total_len, Bool close_flag, Bool in_order, GF_ROUTELCTChannel *rlct, GF_LCTObject **gather_obj)
+{
+	Bool inserted, done;
+	u32 i, count;
+ Bool do_push = GF_FALSE;
+	GF_LCTObject *obj = s->last_active_obj;
+
+	if (routedmx->force_reorder)
+		in_order = GF_FALSE;
+
+	//in case last packet(s) are duplicated after we sent the object, skip them
+	if (rlct) {
+		if ((tsi==rlct->last_dispatched_tsi) && (toi==rlct->last_dispatched_toi)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d TSI %u TOI %u LCT fragment on already dispatched object, skipping\n", s->service_id, tsi, toi));
+			return GF_OK;
+		}
+	} else {
+		if (!tsi && (toi==s->last_dispatched_toi_on_tsi_zero)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d TSI %u TOI %u LCT fragment on already dispatched object, skipping\n", s->service_id, tsi, toi));
+			return GF_OK;
+		}
+	}
+
+	if (!obj || (obj->tsi!=tsi) || (obj->toi!=toi)) {
+		count = gf_list_count(s->objects);
+		for (i=0; i<count; i++) {
+			obj = gf_list_get(s->objects, i);
+			if ((obj->toi == toi) && (obj->tsi==tsi)) break;
+
+			if (!tsi && !obj->tsi && ((obj->toi&0xFFFFFF00) == (toi&0xFFFFFF00)) ) {
+				//change in version of bundle but same other flags: reuse this one
+				obj->nb_frags = obj->nb_recv_frags = 0;
+				obj->nb_bytes = obj->nb_recv_bytes = 0;
+				obj->total_length = total_len;
+				obj->toi = toi;
+				obj->status = GF_LCT_OBJ_INIT;
+				break;
+			}
+			obj = NULL;
+		}
+	}
+	if (!obj) {
+		obj = gf_list_pop_back(routedmx->object_reservoir);
+		if (!obj) {
+			GF_SAFEALLOC(obj, GF_LCTObject);
+			if (!obj) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d failed to allocate LCT object TSI %u TOI %u\n", s->service_id, toi, tsi ));
+				return GF_OUT_OF_MEM;
+			}
+			obj->nb_alloc_frags = 10;
+			obj->frags = gf_malloc(sizeof(GF_LCTFragInfo)*obj->nb_alloc_frags);
+ obj->blob.mx = routedmx->blob_mx;
+		}
+		obj->toi = toi;
+		obj->tsi = tsi;
+		obj->status = GF_LCT_OBJ_INIT;
+		obj->total_length = total_len;
+		if (tsi && rlct) {
+			count = gf_list_count(rlct->static_files);
+			obj->rlct = rlct;
+			obj->rlct_file = NULL;
+			for (i=0; i<count; i++) {
+				GF_ROUTELCTFile *rf = gf_list_get(rlct->static_files, i);
+				if (rf->toi == toi) {
+					obj->rlct_file = rf;
+					break;
+				}
+			}
+		}
+
+		if (!total_len) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Service %d object TSI %u TOI %u started without total-length assigned !\n", s->service_id, tsi, toi ));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d starting object TSI %u TOI %u total-length %d\n", s->service_id, tsi, toi, total_len));
+
+		}
+		obj->download_time_ms = gf_sys_clock();
+		gf_list_add(s->objects, obj);
+	} else if (!obj->total_length && total_len) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Service %d object TSI %u TOI %u was started without total-length assigned, assigning to %u\n", s->service_id, tsi, toi, total_len));
+ 
+ if (obj->alloc_size < total_len) {
+ gf_mx_p(routedmx->blob_mx);
+ obj->payload = gf_realloc(obj->payload, total_len);
+ obj->alloc_size = total_len;
+ obj->blob.size = total_len;
+ obj->blob.data = obj->payload;
+ gf_mx_v(routedmx->blob_mx);
+ }
+		obj->total_length = total_len;
+	} else if (total_len && (obj->total_length != total_len)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d object TSI %u TOI %u mismatch in total-length %u assigned, %u redeclared\n", s->service_id, tsi, toi, obj->total_length, total_len));
+	}
+	if (s->last_active_obj != obj) {
+		//last object had EOS and not completed
+		if (s->last_active_obj && s->last_active_obj->closed_flag && (s->last_active_obj->status<GF_LCT_OBJ_DONE_ERR)) {
+			GF_LCTObject *o = s->last_active_obj;
+		 	if (o->tsi) {
+		 		gf_route_service_flush_object(s, o);
+				gf_route_dmx_process_object(routedmx, s, o);
+			} else {
+				gf_route_obj_to_reservoir(routedmx, s, o);
+			}
+		}
+		//note that if not in order and no timeout, we wait forever !
+		else if (in_order || routedmx->reorder_timeout) {
+			count = gf_list_count(s->objects);
+			for (i=0; i<count; i++) {
+				u32 new_count;
+				GF_LCTObject *o = gf_list_get(s->objects, i);
+				if (o==obj) break;
+				//we can only detect losses if a new TOI on the same TSI is found
+				if (o->tsi != obj->tsi) continue;
+				if (o->status>=GF_LCT_OBJ_DONE_ERR) continue;
+
+				if (!in_order) {
+					u32 elapsed = gf_sys_clock() - o->last_gather_time;
+					if (elapsed < routedmx->reorder_timeout)
+						continue;
+
+					GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d object TSI %u TOI %u timeout after %d ms - forcing dispatch\n", s->service_id, o->tsi, o->toi, elapsed ));
+				} else if (o->rlct && !o->rlct->tsi_init) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d object TSI %u TOI %u incomplete (tune-in) - forcing dispatch\n", s->service_id, o->tsi, o->toi, toi ));
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d object TSI %u TOI %u not completely received but in-order delivery signaled and new TOI %u - forcing dispatch\n", s->service_id, o->tsi, o->toi, toi ));
+				}
+
+				if (o->tsi && o->nb_frags) {
+		 			gf_route_service_flush_object(s, o);
+					gf_route_dmx_process_object(routedmx, s, o);
+				} else {
+					gf_route_obj_to_reservoir(routedmx, s, o);
+				}
+				new_count = gf_list_count(s->objects);
+				//objects purged
+				if (new_count<count) {
+					i=-1;
+					count = new_count;
+				}
+			}
+		}
+		s->last_active_obj = obj;
+	}
+	*gather_obj = obj;
+	assert(obj->toi == toi);
+	assert(obj->tsi == tsi);
+
+	//keep receiving if we are done with errors
+	if (obj->status >= GF_LCT_OBJ_DONE) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d object TSI %u TOI %u already received - skipping\n", s->service_id, tsi, toi ));
+		return GF_EOS;
+	}
+	obj->last_gather_time = gf_sys_clock();
+
+ if (!size) {
+ goto check_done;
+ }
+	obj->nb_recv_bytes += size;
+
+	inserted = GF_FALSE;
+	for (i=0; i<obj->nb_frags; i++) {
+		if ((obj->frags[i].offset <= start_offset) && (obj->frags[i].offset + obj->frags[i].size >= start_offset + size) ) {
+ //data already received
+			goto check_done;
+		}
+
+		//insert fragment
+		if (obj->frags[i].offset > start_offset) {
+			//check overlap (not sure if this is legal)
+			if (start_offset + size > obj->frags[i].offset) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d Overlapping LCT fragment, not supported\n", s->service_id));
+				return GF_NOT_SUPPORTED;
+			}
+			if (obj->nb_frags==obj->nb_alloc_frags) {
+				obj->nb_alloc_frags *= 2;
+				obj->frags = gf_realloc(obj->frags, sizeof(GF_LCTFragInfo)*obj->nb_alloc_frags);
+			}
+			memmove(&obj->frags[i+1], &obj->frags[i], sizeof(GF_LCTFragInfo) * (obj->nb_frags - i) );
+			obj->frags[i].offset = start_offset;
+			obj->frags[i].size = size;
+			obj->nb_bytes += size;
+			obj->nb_frags++;
+			inserted = GF_TRUE;
+ if (!i)
+ do_push = start_offset ? GF_FALSE : routedmx->progressive_dispatch;
+			break;
+		}
+		//expand fragment
+		if (obj->frags[i].offset + obj->frags[i].size == start_offset) {
+			obj->frags[i].size += size;
+			obj->nb_bytes += size;
+			inserted = GF_TRUE;
+ if (!i)
+ do_push = obj->frags[0].offset ? GF_FALSE : routedmx->progressive_dispatch;
+			break;
+		}
+	}
+
+	if (!inserted) {
+		if (obj->nb_frags==obj->nb_alloc_frags) {
+			obj->nb_alloc_frags *= 2;
+			obj->frags = gf_realloc(obj->frags, sizeof(GF_LCTFragInfo)*obj->nb_alloc_frags);
+		}
+		obj->frags[obj->nb_frags].offset = start_offset;
+		obj->frags[obj->nb_frags].size = size;
+		obj->nb_frags++;
+		obj->nb_bytes += size;
+ if (obj->nb_frags==1)
+ do_push = start_offset ? GF_FALSE : routedmx->progressive_dispatch;
+	}
+	obj->nb_recv_frags++;
+	obj->status = GF_LCT_OBJ_RECEPTION;
+
+	assert(obj->toi == toi);
+	assert(obj->tsi == tsi);
+	if (start_offset + size > obj->alloc_size) {
+		obj->alloc_size = start_offset + size;
+		//use total size if available
+		if (obj->alloc_size < obj->total_length)
+			obj->alloc_size = obj->total_length;
+		//for signaling objects, we set byte after last to 0 to use string functions
+		if (!tsi)
+			obj->alloc_size++;
+ gf_mx_p(routedmx->blob_mx);
+		obj->payload = gf_realloc(obj->payload, obj->alloc_size+1);
+		obj->payload[obj->alloc_size] = 0;
+ obj->blob.data = obj->payload;
+ gf_mx_v(routedmx->blob_mx);
+ }
+	assert(obj->alloc_size >= start_offset + size);
+
+	memcpy(obj->payload + start_offset, data, size);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d TSI %u TOI %u append LCT fragment, offset %d total size %d recv bytes %d - offset diff since last %d\n", s->service_id, obj->tsi, obj->toi, start_offset, obj->total_length, obj->nb_bytes, (s32) start_offset - (s32) obj->prev_start_offset));
+
+	obj->prev_start_offset = start_offset;
+	assert(obj->toi == toi);
+	assert(obj->tsi == tsi);
+ 
+ //not a file (uses templates->segment) and can push
+ if (do_push && !obj->rlct_file && obj->rlct) {
+ gf_route_dmx_push_object(routedmx, s, obj, GF_FALSE, GF_TRUE, GF_FALSE, obj->frags[0].size);
+ } else {
+ GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d TSI %u TOI %u: %d bytes inserted on non-first fragment (%d totals), cannot push\n", s->service_id, obj->tsi, obj->toi, size, obj->nb_frags));
+ }
+
+check_done:
+	//check if we are done
+	done = GF_FALSE;
+	if (obj->total_length) {
+		if (obj->nb_bytes >= obj->total_length) {
+			done = GF_TRUE;
+		}
+		else if (close_flag) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d object TSI %u TOI %u closed flag found (object not yet completed)\n", s->service_id, tsi, toi ));
+		}
+	} else {
+		if (close_flag) obj->closed_flag = 1;
+	}
+	if (!done) return GF_OK;
+
+	s->last_active_obj = NULL;
+	if (obj->rlct) {
+		obj->rlct->last_dispatched_tsi = obj->tsi;
+		obj->rlct->last_dispatched_toi = obj->toi;
+	} else {
+		s->last_dispatched_toi_on_tsi_zero = obj->toi;
+	}
+	return gf_route_service_flush_object(s, obj);
+}
+
+static GF_Err gf_route_service_setup_dash(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, char *content, char *content_location)
+{
+	u32 len = (u32) strlen(content);
+
+	if (s->tune_mode==GF_ROUTE_TUNE_SLS_ONLY) {
+		s->tune_mode = GF_ROUTE_TUNE_OFF;
+		//unregister sockets
+		gf_route_register_service_sockets(routedmx, s, GF_FALSE);
+	}
+
+	if (routedmx->on_event) {
+		GF_ROUTEEventFileInfo finfo;
+ GF_Blob blob;
+		memset(&finfo, 0, sizeof(GF_ROUTEEventFileInfo));
+ memset(&blob, 0, sizeof(GF_Blob));
+ blob.data = content;
+ blob.size = len;
+ finfo.blob = &blob;
+ finfo.total_size = len;
+		finfo.filename = content_location;
+		GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Service %d received MPD file %s\n", s->service_id, content_location ));
+		routedmx->on_event(routedmx->udta, GF_ROUTE_EVT_MPD, s->service_id, &finfo);
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Service %d received MPD file %s content:\n%s\n", s->service_id, content_location, content ));
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_route_service_parse_mbms_enveloppe(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, char *content, char *content_location, u32 *stsid_version, u32 *mpd_version)
+{
+	u32 i, j;
+	GF_Err e;
+	GF_XMLAttribute *att;
+	GF_XMLNode *it, *root;
+
+	e = gf_xml_dom_parse_string(routedmx->dom, content);
+	root = gf_xml_dom_get_root(routedmx->dom);
+	if (e || !root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d failed to parse S-TSID: %s\n", s->service_id, gf_error_to_string(e) ));
+		return e;
+	}
+
+	i=0;
+	while ((it = gf_list_enum(root->content, &i))) {
+		const char *content_type = NULL;
+		/*const char *uri = NULL;*/
+		u32 version = 0;
+
+		if (strcmp(it->name, "item")) continue;
+
+		j=0;
+		while ((att = gf_list_enum(it->attributes, &j))) {
+			if (!stricmp(att->name, "contentType")) content_type = att->value;
+			/*else if (!stricmp(att->name, "metadataURI")) uri = att->value;*/
+			else if (!stricmp(att->name, "version")) version = atoi(att->value);
+		}
+		if (!content_type) continue;
+ if (!strcmp(content_type, "application/s-tsid") || !strcmp(content_type, "application/route-s-tsid+xml"))
+ *stsid_version = version;
+		else if (!strcmp(content_type, "application/dash+xml"))
+ *mpd_version = version;
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_route_service_setup_stsid(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, char *content, char *content_location)
+{
+	GF_Err e;
+	GF_XMLAttribute *att;
+	GF_XMLNode *rs, *ls, *srcf, *efdt, *node, *root;
+	u32 i, j, k, crc, nb_lct_channels=0;
+
+	crc = gf_crc_32(content, (u32) strlen(content) );
+	if (!s->stsid_crc) {
+		s->stsid_crc = crc;
+	} else if (s->stsid_crc != crc) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d update of S-TSID not yet supported, skipping\n", s->service_id));
+		return GF_NOT_SUPPORTED;
+	} else {
+		return GF_OK;
+	}
+
+	e = gf_xml_dom_parse_string(routedmx->dom, content);
+	root = gf_xml_dom_get_root(routedmx->dom);
+	if (e || !root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d failed to parse S-TSID: %s\n", s->service_id, gf_error_to_string(e) ));
+		return e;
+	}
+	i=0;
+	while ((rs = gf_list_enum(root->content, &i))) {
+		char *dst_ip = s->dst_ip;
+		u32 dst_port = s->port;
+		char *file_template = NULL;
+		GF_ROUTESession *rsess;
+		GF_ROUTELCTChannel *rlct;
+		u32 tsi = 0;
+		if (rs->type != GF_XML_NODE_TYPE) continue;
+		if (strcmp(rs->name, "RS")) continue;
+
+		j=0;
+		while ((att = gf_list_enum(rs->attributes, &j))) {
+			if (!stricmp(att->name, "dIpAddr")) dst_ip = att->value;
+			else if (!stricmp(att->name, "dPort")) dst_port = atoi(att->value);
+		}
+
+		GF_SAFEALLOC(rsess, GF_ROUTESession);
+		if (!rsess) return GF_OUT_OF_MEM;
+
+		rsess->channels = gf_list_new();
+
+		//need a new socket for the session
+		if ((strcmp(s->dst_ip, dst_ip)) || (s->port != dst_port) ) {
+			rsess->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+			gf_sk_set_usec_wait(rsess->sock, 1);
+			e = gf_sk_setup_multicast(rsess->sock, dst_ip, dst_port, 0, GF_FALSE, (char *) routedmx->ip_ifce);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d failed to setup mcast for route session on %s:%d\n", s->service_id, dst_ip, dst_port));
+				return e;
+			}
+			gf_sk_set_buffer_size(rsess->sock, GF_FALSE, routedmx->unz_buffer_size);
+			//gf_sk_set_block_mode(rsess->sock, GF_TRUE);
+			s->secondary_sockets++;
+			if (s->tune_mode == GF_ROUTE_TUNE_ON) gf_sk_group_register(routedmx->active_sockets, rsess->sock);
+		}
+		gf_list_add(s->route_sessions, rsess);
+
+		j=0;
+		while ((ls = gf_list_enum(rs->content, &j))) {
+			GF_List *static_files;
+			char *sep;
+			if (ls->type != GF_XML_NODE_TYPE) continue;
+			if (strcmp(ls->name, "LS")) continue;
+
+			//extract TSI
+			k=0;
+			while ((att = gf_list_enum(ls->attributes, &k))) {
+				if (!strcmp(att->name, "tsi")) sscanf(att->value, "%u", &tsi);
+			}
+			if (!tsi) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d missing TSI in LS/ROUTE session\n", s->service_id));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			k=0;
+			srcf = NULL;
+			while ((srcf = gf_list_enum(ls->content, &k))) {
+				if ((srcf->type == GF_XML_NODE_TYPE) && !strcmp(srcf->name, "SrcFlow")) break;
+				srcf = NULL;
+			}
+			if (!srcf) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d missing srcFlow in LS/ROUTE session\n", s->service_id));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			//enum srcf for efdt
+			k=0;
+			efdt = NULL;
+			while ((node = gf_list_enum(srcf->content, &k))) {
+				if (node->type != GF_XML_NODE_TYPE) continue;
+				if (!strcmp(node->name, "EFDT")) efdt = node;
+			}
+			if (!efdt) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d missing EFDT element in LS/ROUTE session, not supported\n", s->service_id));
+				return GF_NOT_SUPPORTED;
+			}
+
+			static_files = gf_list_new();
+
+			k=0;
+			while ((node = gf_list_enum(efdt->content, &k))) {
+				if (node->type != GF_XML_NODE_TYPE) continue;
+				//Korean version
+				if (!strcmp(node->name, "FileTemplate")) {
+					GF_XMLNode *cnode = gf_list_get(node->content, 0);
+					if (cnode->type==GF_XML_TEXT_TYPE) file_template = cnode->name;
+				}
+				else if (!strcmp(node->name, "FDTParameters")) {
+					u32 l=0;
+					GF_XMLNode *fdt = NULL;
+					while ((fdt = gf_list_enum(node->content, &l))) {
+						GF_ROUTELCTFile *rf;
+						if (fdt->type != GF_XML_NODE_TYPE) continue;
+						if (strstr(fdt->name, "File")==NULL) continue;
+
+						GF_SAFEALLOC(rf, GF_ROUTELCTFile)
+						if (rf) {
+							u32 n=0;
+							while ((att = gf_list_enum(fdt->attributes, &n))) {
+								if (!strcmp(att->name, "Content-Location")) rf->filename = gf_strdup(att->value);
+								else if (!strcmp(att->name, "TOI")) sscanf(att->value, "%u", &rf->toi);
+							}
+							if (!rf->filename) {
+								gf_free(rf);
+							} else {
+								gf_list_add(static_files, rf);
+							}
+						}
+					}
+				}
+				//US version
+				else if (!strcmp(node->name, "FDT-Instance")) {
+					u32 l=0;
+					GF_XMLNode *fdt = NULL;
+					while ((att = gf_list_enum(node->attributes, &l))) {
+						if (strstr(att->name, "fileTemplate")) file_template = att->value;
+					}
+					l=0;
+					while ((fdt = gf_list_enum(node->content, &l))) {
+						GF_ROUTELCTFile *rf;
+						if (fdt->type != GF_XML_NODE_TYPE) continue;
+						if (strstr(fdt->name, "File")==NULL) continue;
+
+						GF_SAFEALLOC(rf, GF_ROUTELCTFile)
+						if (rf) {
+							u32 n=0;
+							while ((att = gf_list_enum(fdt->attributes, &n))) {
+								if (!strcmp(att->name, "Content-Location")) rf->filename = gf_strdup(att->value);
+								else if (!strcmp(att->name, "TOI")) sscanf(att->value, "%u", &rf->toi);
+							}
+							if (!rf->filename) {
+								gf_free(rf);
+							} else {
+								gf_list_add(static_files, rf);
+							}
+						}
+					}
+				}
+			}
+
+			if (!gf_list_count(static_files)) {
+				GF_ROUTELCTFile *rf;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d missing init file name in LS/ROUTE session, could be problematic - will consider any TOI %u (-1) present as a ghost init segment\n", s->service_id, (u32)-1));
+				//force an init at -1, some streams still have the init not declared but send on TOI -1
+				// interpreting it as a regular segment would break clock setup
+				GF_SAFEALLOC(rf, GF_ROUTELCTFile)
+				rf->toi = (u32) -1;
+				gf_list_add(static_files, rf);
+			}
+			if (!file_template) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Service %d missing file TOI template in LS/ROUTE session, static content only\n", s->service_id));
+			} else {
+				sep = strstr(file_template, "$TOI");
+				if (sep) sep = strchr(sep+3, '$');
+
+				if (!sep) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d wrong TOI template %s in LS/ROUTE session\n", s->service_id, file_template));
+					gf_route_static_files_del(static_files);
+					return GF_NOT_SUPPORTED;
+				}
+			}
+			nb_lct_channels++;
+
+			//OK setup LCT channel for route
+			GF_SAFEALLOC(rlct, GF_ROUTELCTChannel);
+			if (!rlct) {
+				gf_route_static_files_del(static_files);
+				return GF_OUT_OF_MEM;
+			}
+			rlct->static_files = static_files;
+			rlct->tsi = tsi;
+			rlct->toi_template = NULL;
+			if (file_template) {
+				sep = strstr(file_template, "$TOI");
+				sep[0] = 0;
+				gf_dynstrcat(&rlct->toi_template, file_template, NULL);
+				sep[0] = '$';
+
+				if (sep[4]=='$') {
+					gf_dynstrcat(&rlct->toi_template, "%d", NULL);
+					sep += 5;
+				} else {
+					char *sep_end = strchr(sep+3, '$');
+					sep_end[0] = 0;
+					gf_dynstrcat(&rlct->toi_template, sep+4, NULL);
+					sep_end[0] = '$';
+					sep = sep_end + 1;
+				}
+				gf_dynstrcat(&rlct->toi_template, sep, NULL);
+			}
+
+			//fill in payloads
+			k=0;
+			efdt = NULL;
+			while ((node = gf_list_enum(srcf->content, &k))) {
+				if (node->type != GF_XML_NODE_TYPE) continue;
+				if (!strcmp(node->name, "Payload")) {
+					u32 l=0;
+					GF_ROUTELCTReg *lreg;
+					lreg = &rlct->CPs[rlct->nb_cps];
+					lreg->order = 1; //default
+					while ((att = gf_list_enum(node->attributes, &l))) {
+						if (!strcmp(att->name, "codePoint")) lreg->codepoint = (u8) atoi(att->value);
+						else if (!strcmp(att->name, "formatId")) lreg->format_id = (u8) atoi(att->value);
+						else if (!strcmp(att->name, "frag")) lreg->frag = (u8) atoi(att->value);
+						else if (!strcmp(att->name, "order")) {
+							if (!strcmp(att->value, "true")) lreg->order = 1;
+							else lreg->order = 0;
+						}
+						else if (!strcmp(att->name, "srcFecPayloadId")) lreg->src_fec_payload_id = (u8) atoi(att->value);
+					}
+					if (lreg->src_fec_payload_id) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d payload format indicates srcFecPayloadId %d (reserved), assuming 0\n", s->service_id, lreg->src_fec_payload_id));
+
+					}
+					if (lreg->format_id != 1) {
+						if (lreg->format_id && (lreg->format_id<5)) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d payload formatId %d not supported\n", s->service_id, lreg->format_id));
+						} else {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d payload formatId %d reserved, assuming 1\n", s->service_id, lreg->format_id));
+						}
+					}
+					rlct->nb_cps++;
+					if (rlct->nb_cps==8) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d more payload formats than supported (8 max)\n", s->service_id));
+						break;
+					}
+				}
+			}
+
+			gf_list_add(rsess->channels, rlct);
+		}
+	}
+
+	if (!nb_lct_channels) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d does not have any supported LCT channels\n", s->service_id));
+		return GF_NOT_SUPPORTED;
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_route_dmx_process_service_signaling(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, GF_LCTObject *object, u8 cc, u32 stsid_version, u32 mpd_version)
+{
+	char *payload, *boundary=NULL, *sep;
+	char szContentType[100], szContentLocation[1024];
+	u32 payload_size;
+	GF_Err e;
+
+	//uncompress bundle
+	if (object->toi & 0x80000000 /*(1<<31)*/ ) {
+		u32 raw_size;
+		if (object->total_length > routedmx->buffer_size) {
+			routedmx->buffer_size = object->total_length;
+			routedmx->buffer = gf_realloc(routedmx->buffer, object->total_length);
+			if (!routedmx->buffer) return GF_OUT_OF_MEM;
+		}
+		memcpy(routedmx->buffer, object->payload, object->total_length);
+		raw_size = routedmx->unz_buffer_size;
+		e = gf_gz_decompress_payload(routedmx->buffer, object->total_length, &routedmx->unz_buffer, &raw_size);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d failed to decompress signaling bundle: %s\n", s->service_id, gf_error_to_string(e) ));
+			return e;
+		}
+		if (raw_size > routedmx->unz_buffer_size) routedmx->unz_buffer_size = raw_size;
+		payload = routedmx->unz_buffer;
+		payload_size = raw_size;
+	} else {
+		payload = object->payload;
+		payload_size = object->total_length;
+	}
+	payload[payload_size] = 0;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("[ROUTE] Service %d got TSI 0 config package:\n%s\n", s->service_id, payload ));
+
+	//check for multipart
+	if (!strncmp(payload, "Content-Type: multipart/", 24)) {
+		sep = strstr(payload, "boundary=\"");
+		if (!sep) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d cannot find multipart boundary in package:\n%s\n", s->service_id, payload ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		payload = sep + 10;
+		sep = strstr(payload, "\"");
+		if (!sep) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d multipart boundary not properly formatted in package:\n%s\n", s->service_id, payload ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		sep[0] = 0;
+		boundary = gf_strdup(payload);
+		sep[0] = '\"';
+		payload = sep+1;
+	}
+
+	//extract all content
+	while (1) {
+		char *content;
+		//multipart, check for start and end
+		if (boundary) {
+			sep = strstr(payload, boundary);
+			if (!sep) break;
+			payload = sep + strlen(boundary) + 2;
+			sep = strstr(payload, boundary);
+			if (!sep) break;
+			sep[0] = 0;
+		} else {
+			sep = NULL;
+		}
+
+		//extract headers
+		while (strncmp(payload, "\r\n\r\n", 4)) {
+			u32 i=0;
+			while (strchr("\n\r", payload[0]) != NULL) payload++;
+			while (strchr("\r\n", payload[i]) == NULL) i++;
+
+			if (!strnicmp(payload, "Content-Type: ", 14)) {
+				u32 copy = MIN(i-14, 100);
+				strncpy(szContentType, payload+14, copy);
+				szContentType[copy]=0;
+				payload += i;
+			}
+			else if (!strnicmp(payload, "Content-Location: ", 18)) {
+				u32 copy = MIN(i-18, 1024);
+				strncpy(szContentLocation, payload+18, copy);
+				szContentLocation[copy]=0;
+				payload += i;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d unrecognized header entity in package:\n%s\n", s->service_id, payload ));
+			}
+		}
+		payload += 4;
+		content = boundary ? strstr(payload, "\r\n--") : strstr(payload, "\r\n\r\n");
+		if (content) {
+			content[0] = 0;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d package type %s location %s content:\n%s\n", s->service_id, szContentType, szContentLocation, payload ));
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d %s not properly formatted in package:\n%s\n", s->service_id, boundary ? "multipart boundary" : "entity", payload ));
+			if (sep && boundary) sep[0] = boundary[0];
+			gf_free(boundary);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		if (!strcmp(szContentType, "application/mbms-envelope+xml")) {
+			e = gf_route_service_parse_mbms_enveloppe(routedmx, s, payload, szContentLocation, &stsid_version, &mpd_version);
+
+			if (e || !stsid_version || !mpd_version) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d MBMS envelope error %s, S-TSID version %d MPD version %d\n",s->service_id, gf_error_to_string(e), stsid_version, mpd_version ));
+				gf_free(boundary);
+				return e ? e : GF_SERVICE_ERROR;
+			}
+		} else if (!strcmp(szContentType, "application/mbms-user-service-description+xml")) {
+		} else if (!strcmp(szContentType, "application/dash+xml")
+			|| !strcmp(szContentType, "video/vnd.3gpp.mpd")
+			|| !strcmp(szContentType, "audio/mpegurl")
+			|| !strcmp(szContentType, "video/mpegurl")
+		) {
+			if (!s->mpd_version || (mpd_version && (mpd_version+1 != s->mpd_version))) {
+				s->mpd_version = mpd_version+1;
+				gf_route_service_setup_dash(routedmx, s, payload, szContentLocation);
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d same MPD version, ignoring\n",s->service_id));
+			}
+		}
+		//Korean and US version have different mime types
+		else if (!strcmp(szContentType, "application/s-tsid") || !strcmp(szContentType, "application/route-s-tsid+xml")) {
+			if (!s->stsid_version || (stsid_version && (stsid_version+1 != s->stsid_version))) {
+				s->stsid_version = stsid_version+1;
+				gf_route_service_setup_stsid(routedmx, s, payload, szContentLocation);
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d same S-TSID version, ignoring\n",s->service_id));
+			}
+		}
+		if (!sep) break;
+		sep[0] = boundary[0];
+		payload = sep;
+	}
+
+	gf_free(boundary);
+	return GF_OK;
+}
+
+
+static GF_Err gf_route_dmx_process_service(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, GF_ROUTESession *route_sess)
+{
+	GF_Err e;
+	u32 nb_read, v, C, psi, S, O, H, /*Res, A,*/ B, hdr_len, cp, cc, tsi, toi, pos;
+	u32 /*a_G=0, a_U=0,*/ a_S=0, a_M=0/*, a_A=0, a_H=0, a_D=0*/;
+	u64 tol_size=0;
+	Bool in_order = GF_TRUE;
+	u32 start_offset;
+	GF_ROUTELCTChannel *rlct=NULL;
+	GF_LCTObject *gather_object=NULL;
+
+	if (route_sess) {
+		e = gf_sk_receive_no_select(route_sess->sock, routedmx->buffer, routedmx->buffer_size, &nb_read);
+	} else {
+		e = gf_sk_receive_no_select(s->sock, routedmx->buffer, routedmx->buffer_size, &nb_read);
+	}
+
+	if (e != GF_OK) return e;
+	assert(nb_read);
+
+	routedmx->nb_packets++;
+	routedmx->total_bytes_recv += nb_read;
+	routedmx->last_pck_time = gf_sys_clock_high_res();
+	if (!routedmx->first_pck_time) routedmx->first_pck_time = routedmx->last_pck_time;
+
+	e = gf_bs_reassign_buffer(routedmx->bs, routedmx->buffer, nb_read);
+	if (e != GF_OK) return e;
+
+	//parse LCT header
+	v = gf_bs_read_int(routedmx->bs, 4);
+	C = gf_bs_read_int(routedmx->bs, 2);
+	psi = gf_bs_read_int(routedmx->bs, 2);
+	S = gf_bs_read_int(routedmx->bs, 1);
+	O = gf_bs_read_int(routedmx->bs, 2);
+	H = gf_bs_read_int(routedmx->bs, 1);
+	/*Res = */gf_bs_read_int(routedmx->bs, 2);
+	/*A = */gf_bs_read_int(routedmx->bs, 1);
+	B = gf_bs_read_int(routedmx->bs, 1);
+	hdr_len = gf_bs_read_int(routedmx->bs, 8);
+	cp = gf_bs_read_int(routedmx->bs, 8);
+
+	if (v!=1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d : wrong LCT header version %d\n", s->service_id, v));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if (C!=0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d : wrong ROUTE LCT header C %d, expecting 0\n", s->service_id, C));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if ((psi!=0) && (psi!=2) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d : wrong ROUTE LCT header PSI %d, expecting b00 or b10\n", s->service_id, psi));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if (S!=1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d : wrong ROUTE LCT header S, shall be 1\n", s->service_id));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if (O!=1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d : wrong ROUTE LCT header 0, shall be b01\n", s->service_id));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if (H!=0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d : wrong ROUTE LCT header H, shall be 0\n", s->service_id));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	if (hdr_len<4) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Service %d : wrong ROUTE LCT header len %d, shall be at least 4 0\n", s->service_id, hdr_len));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (psi==0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d : FEC ROUTE not implemented\n", s->service_id));
+		return GF_NOT_SUPPORTED;
+	}
+
+	cc = gf_bs_read_u32(routedmx->bs);
+	tsi = gf_bs_read_u32(routedmx->bs);
+	toi = gf_bs_read_u32(routedmx->bs);
+	hdr_len-=4;
+
+	//filter TSI if not 0 (service TSI) and debug mode set
+	if (routedmx->debug_tsi && tsi && (tsi!=routedmx->debug_tsi)) return GF_OK;
+
+	//look for TSI 0 first
+	if (tsi!=0) {
+		Bool cp_found = GF_FALSE;
+		u32 i=0;
+		Bool in_session = GF_FALSE;
+		if (s->tune_mode==GF_ROUTE_TUNE_SLS_ONLY) return GF_OK;
+
+		if (s->last_active_obj && (s->last_active_obj->tsi==tsi)) {
+			in_session = GF_TRUE;
+			rlct = s->last_active_obj->rlct;
+		} else {
+			GF_ROUTESession *rsess;
+			i=0;
+			while ((rsess = gf_list_enum(s->route_sessions, &i))) {
+				u32 j=0;
+				while ((rlct = gf_list_enum(rsess->channels, &j))) {
+					if (rlct->tsi == tsi) {
+						in_session = GF_TRUE;
+						break;
+					}
+					rlct = NULL;
+				}
+				if (in_session) break;
+			}
+		}
+		if (!in_session) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d : no session with TSI %u defined, skipping packet (TOI %u)\n", s->service_id, tsi, toi));
+			return GF_OK;
+		}
+		for (i=0; rlct && i<rlct->nb_cps; i++) {
+			if (rlct->CPs[i].codepoint==cp) {
+				in_order = rlct->CPs[i].order;
+				cp_found = GF_TRUE;
+				break;
+			}
+		}
+		if (!cp_found) {
+			if ((cp==0) || (cp==2) || (cp>=9) ) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d : unsupported code point %d, skipping packet (TOI %u)\n", s->service_id, cp, toi));
+				return GF_OK;
+			}
+		}
+	} else {
+		//check TOI for TSI 0
+		//a_G = (toi & 0x80000000) /*(1<<31)*/ ? 1 : 0;
+		//a_U = (toi & (1<<16)) ? 1 : 0;
+		a_S = (toi & (1<<17)) ? 1 : 0;
+		a_M = (toi & (1<<18)) ? 1 : 0;
+		/*a_A = (toi & (1<<19)) ? 1 : 0;
+		a_H = (toi & (1<<22)) ? 1 : 0;
+		a_D = (toi & (1<<23)) ? 1 : 0;*/
+		v = toi & 0xFF;
+		//skip known version
+		if (a_M && (s->mpd_version == v+1)) a_M = 0;
+		if (a_S && (s->stsid_version == v+1)) a_S = 0;
+
+
+		//for now we only care about S and M
+		if (!a_S && ! a_M) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d : SLT bundle without MPD or S-TSID, skipping packet\n", s->service_id));
+			return GF_OK;
+		}
+	}
+
+	//parse extensions
+	while (hdr_len) {
+		u8 hel=0, het = gf_bs_read_u8(routedmx->bs);
+		if (het<128) hel = gf_bs_read_u8(routedmx->bs);
+
+		switch (het) {
+		case GF_LCT_EXT_FDT:
+			/*flute_version = */gf_bs_read_int(routedmx->bs, 4);
+			/*fdt_instance_id = */gf_bs_read_int(routedmx->bs, 20);
+			break;
+
+		case GF_LCT_EXT_CENC:
+			/*content_encodind = */gf_bs_read_int(routedmx->bs, 8);
+			/*reserved = */gf_bs_read_int(routedmx->bs, 16);
+			break;
+
+		case GF_LCT_EXT_TOL24:
+			tol_size = gf_bs_read_int(routedmx->bs, 24);
+			break;
+
+		case GF_LCT_EXT_TOL48:
+			if (hel!=2) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d : wrong HEL %d for TOL48 LCT extension, expecting 2\n", s->service_id, hel));
+				continue;
+			}
+			tol_size = gf_bs_read_long_int(routedmx->bs, 48);
+			break;
+
+		default:
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d : unsupported header extension HEL %d HET %d, ignoring\n", s->service_id, hel, het));
+			break;
+		}
+		if (hdr_len<hel) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d : wrong HEL %d for LCT extension %d, remaining header size %d\n", s->service_id, hel, het, hdr_len));
+			continue;
+		}
+		if (hel) hdr_len -= hel;
+		else hdr_len -= 1;
+	}
+
+	start_offset = gf_bs_read_u32(routedmx->bs);
+	pos = (u32) gf_bs_get_position(routedmx->bs);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d : LCT packet TSI %u TOI %u size %d startOffset %u TOL "LLU"\n", s->service_id, tsi, toi, nb_read-pos, start_offset, tol_size));
+
+	e = gf_route_service_gather_object(routedmx, s, tsi, toi, start_offset, routedmx->buffer + pos, nb_read-pos, (u32) tol_size, B, in_order, rlct, &gather_object);
+
+	if (e==GF_EOS) {
+		if (!tsi) {
+			if (gather_object->status==GF_LCT_OBJ_DONE_ERR) {
+				gf_route_obj_to_reservoir(routedmx, s, gather_object);
+				return GF_OK;
+			}
+			//we don't assign version here, we use mbms envelope for that since the bundle may have several
+			//packages
+
+			gf_route_dmx_process_service_signaling(routedmx, s, gather_object, cc, a_S ? v : 0, a_M ? v : 0);
+			//we don't release the LCT object, so that we can disard future versions
+		} else {
+			gf_route_dmx_process_object(routedmx, s, gather_object);
+		}
+	}
+
+	return GF_OK;
+}
+
+static GF_Err gf_route_dmx_process_lls(GF_ROUTEDmx *routedmx)
+{
+	u32 read;
+	GF_Err e;
+	const char *name=NULL;
+	u32 lls_table_id, lls_group_id, lls_group_count, lls_table_version;
+	u32 raw_size = routedmx->unz_buffer_size;
+	GF_XMLNode *root;
+
+	e = gf_sk_receive_no_select(routedmx->atsc_sock, routedmx->buffer, routedmx->buffer_size, &read);
+	if (e)
+		return e;
+
+	routedmx->nb_packets++;
+	routedmx->total_bytes_recv += read;
+	routedmx->last_pck_time = gf_sys_clock_high_res();
+	if (!routedmx->first_pck_time) routedmx->first_pck_time = routedmx->last_pck_time;
+
+	lls_table_id = routedmx->buffer[0];
+	lls_group_id = routedmx->buffer[1];
+	lls_group_count = 1 + routedmx->buffer[2];
+	lls_table_version = routedmx->buffer[3];
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] LLSTable size %d version %d: ID %d (%s) - group ID %d - group count %d\n", read, lls_table_id, lls_table_version, (lls_table_id==1) ? "SLT" : (lls_table_id==2) ? "RRT" : (lls_table_id==3) ? "SystemTime" : (lls_table_id==4) ? "AEAT" : "Reserved", lls_group_id, lls_group_count));
+	switch (lls_table_id) {
+	case 1:
+		if (routedmx->slt_version== 1+lls_table_version) return GF_OK;
+		routedmx->slt_version = 1+lls_table_version;
+		name="SLT";
+		break;
+	case 2:
+		if (routedmx->rrt_version== 1+lls_table_version) return GF_OK;
+		routedmx->rrt_version = 1+lls_table_version;
+		name="RRT";
+ 	break;
+	case 3:
+		if (routedmx->systime_version== 1+lls_table_version) return GF_OK;
+		routedmx->systime_version = 1+lls_table_version;
+		name="SysTime";
+ 	break;
+	case 4:
+		if (routedmx->aeat_version== 1+lls_table_version) return GF_OK;
+		routedmx->aeat_version = 1+lls_table_version;
+		name="AEAT";
+ 	break;
+	default:
+		return GF_OK;
+	}
+
+	e = gf_gz_decompress_payload(&routedmx->buffer[4], read-4, &routedmx->unz_buffer, &raw_size);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to decompress %s table: %s\n", name, gf_error_to_string(e) ));
+		return e;
+	}
+	//realloc happened
+	if (routedmx->unz_buffer_size<raw_size) routedmx->unz_buffer_size = raw_size;
+	routedmx->unz_buffer[raw_size]=0;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] %s table - payload:\n%s\n", name, routedmx->unz_buffer));
+
+
+	e = gf_xml_dom_parse_string(routedmx->dom, routedmx->unz_buffer);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to parse SLT XML: %s\n", gf_error_to_string(e) ));
+		return e;
+	}
+
+	root = gf_xml_dom_get_root(routedmx->dom);
+	if (!root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("[ROUTE] Failed to get XML root for %s table\n", name ));
+		return e;
+	}
+
+	switch (lls_table_id) {
+	case 1:
+		return gf_route_dmx_process_slt(routedmx, root);
+	case 2:
+	case 3:
+	case 4:
+	default:
+		break;
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_route_dmx_process(GF_ROUTEDmx *routedmx)
+{
+	u32 i, count;
+	GF_Err e;
+
+	//check all active sockets
+	e = gf_sk_group_select(routedmx->active_sockets, 10, GF_SK_SELECT_READ);
+	if (e) return e;
+
+	if (routedmx->atsc_sock) {
+		if (gf_sk_group_sock_is_set(routedmx->active_sockets, routedmx->atsc_sock, GF_SK_SELECT_READ)) {
+			e = gf_route_dmx_process_lls(routedmx);
+			if (e) return e;
+		}
+	}
+
+	count = gf_list_count(routedmx->services);
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_ROUTESession *rsess;
+		GF_ROUTEService *s = (GF_ROUTEService *)gf_list_get(routedmx->services, i);
+		if (s->tune_mode==GF_ROUTE_TUNE_OFF) continue;
+
+		if (gf_sk_group_sock_is_set(routedmx->active_sockets, s->sock, GF_SK_SELECT_READ)) {
+			e = gf_route_dmx_process_service(routedmx, s, NULL);
+			if (e) return e;
+		}
+		if (s->tune_mode!=GF_ROUTE_TUNE_ON) continue;
+		if (!s->secondary_sockets) continue;
+
+		j=0;
+		while ((rsess = (GF_ROUTESession *)gf_list_enum(s->route_sessions, &j) )) {
+			if (gf_sk_group_sock_is_set(routedmx->active_sockets, rsess->sock, GF_SK_SELECT_READ)) {
+				e = gf_route_dmx_process_service(routedmx, s, rsess);
+				if (e) return e;
+			}
+		}
+
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_route_dmx_find_atsc3_service(GF_ROUTEDmx *routedmx, u32 service_id)
+{
+	u32 i=0;
+	GF_ROUTEService *s;
+	while ((s = gf_list_enum(routedmx->services, &i))) {
+		if (s->service_id != service_id) continue;
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+
+GF_EXPORT
+u32 gf_route_dmx_get_object_count(GF_ROUTEDmx *routedmx, u32 service_id)
+{
+	u32 i=0;
+	GF_ROUTEService *s;
+	while ((s = gf_list_enum(routedmx->services, &i))) {
+		if (s->service_id != service_id) continue;
+		return gf_list_count(s->objects);
+	}
+	return 0;
+}
+
+#if 0
+void gf_route_dmx_print_objects(GF_ROUTEDmx *routedmx, u32 service_id)
+{
+	u32 i=0;
+	GF_ROUTEService *s=NULL;
+	GF_LCTObject *obj = NULL;
+	while ((s = gf_list_enum(routedmx->services, &i))) {
+		if (s->service_id == service_id) break;
+		s = NULL;
+	}
+	if (!s) return;
+	i=0;
+	while ((obj = gf_list_enum(s->objects, &i))) {
+		fprintf(stderr, "#%d TSI %d TOI %d size %d (/%d) status %d\n", i, obj->tsi, obj->toi, obj->nb_bytes, obj->total_length, obj->status);
+	}
+}
+#endif
+
+
+static GF_Err gf_route_dmx_keep_or_remove_object_by_name(GF_ROUTEDmx *routedmx, u32 service_id, char *fileName, Bool purge_previous, Bool is_remove)
+{
+	u32 i=0;
+	GF_ROUTEService *s=NULL;
+	GF_LCTObject *obj = NULL;
+	while ((s = gf_list_enum(routedmx->services, &i))) {
+		if (s->service_id == service_id) break;
+		s = NULL;
+	}
+	if (!s) return GF_BAD_PARAM;
+	i=0;
+	while ((obj = gf_list_enum(s->objects, &i))) {
+		u32 toi;
+		if (obj->rlct && (sscanf(fileName, obj->rlct->toi_template, &toi) == 1)) {
+			u32 tsi;
+			if (toi == obj->toi) {
+				GF_ROUTELCTChannel *rlct = obj->rlct;
+
+				if (!is_remove) {
+					obj->force_keep = 1;
+					return GF_OK;
+				}
+				obj->force_keep = 0;
+
+				//we likely have a loop here
+				if (obj == s->last_active_obj) break;
+				//obj being received do not destroy
+				if (obj->status == GF_LCT_OBJ_RECEPTION) break;
+
+				tsi = obj->tsi;
+				gf_route_obj_to_reservoir(routedmx, s, obj);
+				if (purge_previous) {
+					i=0;
+					while ((obj = gf_list_enum(s->objects, &i))) {
+						if (obj->rlct != rlct) continue;
+						if (obj->rlct_file) continue;
+						if (obj->tsi != tsi) continue;
+						if (obj->toi < toi) {
+							i--;
+							//we likely have a loop here
+							if (obj == s->last_active_obj) return GF_OK;
+							gf_route_obj_to_reservoir(routedmx, s, obj);
+						}
+					}
+				}
+				return GF_OK;
+			}
+		}
+		else if (obj->rlct && obj->rlct_file && obj->rlct_file->filename && !strcmp(fileName, obj->rlct_file->filename)) {
+			if (!is_remove) {
+				obj->force_keep = 1;
+			} else {
+				gf_route_obj_to_reservoir(routedmx, s, obj);
+			}
+			return GF_OK;
+		}
+	}
+	if (is_remove) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Failed to remove object %s from service, object not found\n", fileName));
+		return GF_NOT_FOUND;
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_route_dmx_force_keep_object_by_name(GF_ROUTEDmx *routedmx, u32 service_id, char *fileName)
+{
+	return gf_route_dmx_keep_or_remove_object_by_name(routedmx, service_id, fileName, GF_FALSE, GF_FALSE);
+}
+
+GF_EXPORT
+GF_Err gf_route_dmx_remove_object_by_name(GF_ROUTEDmx *routedmx, u32 service_id, char *fileName, Bool purge_previous)
+{
+	return gf_route_dmx_keep_or_remove_object_by_name(routedmx, service_id, fileName, purge_previous, GF_TRUE);
+}
+
+GF_EXPORT
+Bool gf_route_dmx_remove_first_object(GF_ROUTEDmx *routedmx, u32 service_id)
+{
+	u32 i=0;
+	GF_ROUTEService *s=NULL;
+	GF_LCTObject *obj = NULL;
+	while ((s = gf_list_enum(routedmx->services, &i))) {
+		if (s->service_id == service_id) break;
+		s = NULL;
+	}
+	if (!s) return GF_FALSE;
+
+	i=0;
+	while ( (obj = gf_list_enum(s->objects, &i))) {
+		if (obj == s->last_active_obj) continue;
+		//object is active, abort
+		if (obj->status<=GF_LCT_OBJ_RECEPTION) break;
+
+		if (obj->force_keep)
+			return GF_FALSE;
+
+		//keep static files active
+		if (obj->rlct_file)
+			continue;
+
+		gf_route_obj_to_reservoir(routedmx, s, obj);
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
+void gf_route_dmx_purge_objects(GF_ROUTEDmx *routedmx, u32 service_id)
+{
+	u32 i=0;
+	GF_ROUTEService *s=NULL;
+	GF_LCTObject *obj = NULL;
+	while ((s = gf_list_enum(routedmx->services, &i))) {
+		if (s->service_id == service_id) break;
+		s = NULL;
+	}
+	if (!s) return;
+
+	i=0;
+	while ((obj = gf_list_enum(s->objects, &i))) {
+		//only purge non signaling objects
+		if (!obj->tsi) continue;
+		//if object is being received keep it
+		if (s->last_active_obj == obj) continue;
+		//if object is static file keep it - this may need refinement in case we had init segment updates
+		if (obj->rlct_file) continue;
+		//obj being received do not destroy
+		if (obj->status == GF_LCT_OBJ_RECEPTION) continue;
+		//trash
+		gf_route_obj_to_reservoir(routedmx, s, obj);
+	}
+}
+
+GF_EXPORT
+void gf_route_dmx_set_service_udta(GF_ROUTEDmx *routedmx, u32 service_id, void *udta)
+{
+	u32 i=0;
+	GF_ROUTEService *s=NULL;
+	while ((s = gf_list_enum(routedmx->services, &i))) {
+		if (s->service_id == service_id) {
+			s->udta = udta;
+			return;
+		}
+	}
+}
+
+GF_EXPORT
+void *gf_route_dmx_get_service_udta(GF_ROUTEDmx *routedmx, u32 service_id)
+{
+	u32 i=0;
+	GF_ROUTEService *s=NULL;
+	while ((s = gf_list_enum(routedmx->services, &i))) {
+		if (s->service_id == service_id) {
+			return s->udta;
+		}
+	}
+	return NULL;
+}
+
+GF_EXPORT
+u64 gf_route_dmx_get_first_packet_time(GF_ROUTEDmx *routedmx)
+{
+	return routedmx ? routedmx->first_pck_time : 0;
+}
+
+GF_EXPORT
+u64 gf_route_dmx_get_last_packet_time(GF_ROUTEDmx *routedmx)
+{
+	return routedmx ? routedmx->last_pck_time : 0;
+}
+
+GF_EXPORT
+u64 gf_route_dmx_get_nb_packets(GF_ROUTEDmx *routedmx)
+{
+	return routedmx ? routedmx->nb_packets : 0;
+}
+
+GF_EXPORT
+u64 gf_route_dmx_get_recv_bytes(GF_ROUTEDmx *routedmx)
+{
+	return routedmx ? routedmx->total_bytes_recv : 0;
+}
+
+GF_EXPORT
+void gf_route_dmx_debug_tsi(GF_ROUTEDmx *routedmx, u32 tsi)
+{
+	if (routedmx) routedmx->debug_tsi = tsi;
+}
+
+#endif /* !GPAC_DISABLE_ROUTE && !GPAC_DISABLE_CORE_TOOLS */

gpac-1.0.1.tar.gz/src/media_tools/webvtt.c -> gpac-2.0.0.tar.gz/src/media_tools/webvtt.c Changed

@@ -2,7 +2,7 @@
 * GPAC - Multimedia Framework C SDK
 *
 * Authors: Cyril Concolato
- * Copyright (c) Telecom ParisTech 2000-2012
+ * Copyright (c) Telecom ParisTech 2000-2021
 * All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -106,12 +106,6 @@
 	return (GF_Box *)tmp;
 }
 
-GF_Box *wvtt_box_new()
-{
-	ISOM_DECL_BOX_ALLOC(GF_WebVTTSampleEntryBox, GF_ISOM_BOX_TYPE_WVTT);
-	return (GF_Box *)tmp;
-}
-
 void boxstring_box_del(GF_Box *s)
 {
 	GF_StringBox *box = (GF_StringBox *)s;
@@ -129,8 +123,16 @@
 	gf_free(s);
 }
 
+GF_Box *wvtt_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_WebVTTSampleEntryBox, GF_ISOM_BOX_TYPE_WVTT);
+	gf_isom_sample_entry_init((GF_SampleEntryBox *)tmp);
+	return (GF_Box *)tmp;
+}
+
 void wvtt_box_del(GF_Box *s)
 {
+	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
 	gf_free(s);
 }
 
@@ -143,21 +145,22 @@
 	return GF_OK;
 }
 
-static GF_Err vtcu_Add(GF_Box *s, GF_Box *box)
+
+GF_Err vtcu_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
-	GF_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
-	switch(box->type) {
+	GF_VTTCueBox *ptr = (GF_VTTCueBox *)s;
+	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_CTIM:
-		cuebox->time = (GF_StringBox *)box;
+		BOX_FIELD_ASSIGN(time, GF_StringBox);
 		break;
 	case GF_ISOM_BOX_TYPE_IDEN:
-		cuebox->id = (GF_StringBox *)box;
+		BOX_FIELD_ASSIGN(id, GF_StringBox);
 		break;
 	case GF_ISOM_BOX_TYPE_STTG:
-		cuebox->settings = (GF_StringBox *)box;
+		BOX_FIELD_ASSIGN(settings, GF_StringBox);
 		break;
 	case GF_ISOM_BOX_TYPE_PAYL:
-		cuebox->payload = (GF_StringBox *)box;
+		BOX_FIELD_ASSIGN(payload, GF_StringBox);
 		break;
 	}
 	return GF_OK;
@@ -165,20 +168,20 @@
 
 GF_Err vtcu_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, vtcu_Add);
+	return gf_isom_box_array_read(s, bs);
 }
 
 GF_Err vtte_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, NULL);
+	return gf_isom_box_array_read(s, bs);
 }
 
-static GF_Err wvtt_Add(GF_Box *s, GF_Box *box)
+GF_Err wvtt_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem)
 {
-	GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
-	switch(box->type) {
+	GF_WebVTTSampleEntryBox *ptr = (GF_WebVTTSampleEntryBox *)s;
+	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_VTTC_CONFIG:
-		wvtt->config = (GF_StringBox *)box;
+		BOX_FIELD_ASSIGN(config, GF_StringBox);
 		break;
 	}
 	return GF_OK;
@@ -192,7 +195,7 @@
 	if (e) return e;
 
 	wvtt->size -= 8;
-	return gf_isom_box_array_read(s, bs, wvtt_Add);
+	return gf_isom_box_array_read(s, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -263,7 +266,7 @@
 	return GF_OK;
 }
 
-static GF_Err webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue)
+static GF_Err wvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue)
 {
 	GF_Err e;
 	GF_VTTCueBox *cuebox;
@@ -303,7 +306,7 @@
 		GF_WebVTTCue *cue;
 		i=0;
 		while ((cue = (GF_WebVTTCue *)gf_list_enum(samp->cues, &i))) {
-			e = webvtt_write_cue(bs, cue);
+			e = wvtt_write_cue(bs, cue);
 			if (e) break;
 		}
 		if (e) {
@@ -362,10 +365,9 @@
 		break;
 	}
 	gf_isom_box_dump_start(a, szName, trace);
-	gf_fprintf(trace, "><![CDATA[\n");
-	if (sbox->string)
-		gf_fprintf(trace, "%s", sbox->string);
-	gf_fprintf(trace, "\n]]>");
+	gf_fprintf(trace, ">");
+	if (sbox->string && strlen(sbox->string))
+		gf_fprintf(trace, "<![CDATA[\n%s\n]]>", sbox->string);
 	gf_isom_box_dump_done(szName, a, trace);
 	return GF_OK;
 }
@@ -423,11 +425,12 @@
 	void (*on_cue_read)(void *, GF_WebVTTCue *);
 };
 
-
+#if !defined(GPAC_DISABLE_MEDIA_IMPORT) && !defined(GPAC_DISABLE_ISOM)
 static Bool gf_webvtt_timestamp_is_zero(GF_WebVTTTimestamp *ts)
 {
 	return (ts->hour == 0 && ts->min == 0 && ts->sec == 0 && ts->ms == 0) ? GF_TRUE : GF_FALSE;
 }
+#endif
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 
@@ -491,8 +494,9 @@
 	}
 	if (*prop) {
 		len = (u32) strlen(*prop);
-		*prop = (char*)gf_realloc(*prop, sizeof(char) * (len + text_len + 1) );
-		strcpy(*prop + len, text_data);
+		(*prop) = (char*)gf_realloc((*prop), sizeof(char) * (len + text_len + 1) );
+		strncpy((*prop) + len, text_data, text_len);
+		(*prop)[len+text_len] = 0;
 	} else {
 		*prop = gf_strdup(text_data);
 	}
@@ -1097,13 +1101,13 @@
 }
 
 GF_EXPORT
-GF_List *gf_webvtt_parse_iso_cues(GF_ISOSample *iso_sample, u64 start)
+GF_List *gf_webvtt_parse_iso_cues(GF_ISOSample *iso_sample, u64 start, u64 end)
 {
-	return gf_webvtt_parse_cues_from_data(iso_sample->data, iso_sample->dataLength, start);
+	return gf_webvtt_parse_cues_from_data(iso_sample->data, iso_sample->dataLength, start, end);
 }
 
 GF_EXPORT
-GF_List *gf_webvtt_parse_cues_from_data(const u8 *data, u32 dataLength, u64 start)
+GF_List *gf_webvtt_parse_cues_from_data(const u8 *data, u32 dataLength, u64 start, u64 end)
 {
 	GF_List *cues;
 	GF_WebVTTCue *cue;
@@ -1130,6 +1134,7 @@
 			}
 			gf_list_add(cues, cue);
 			gf_webvtt_timestamp_set(&cue->start, start);
+			gf_webvtt_timestamp_set(&cue->end, end);
 			if (cuebox->id) {
 				gf_webvtt_cue_add_property(cue, WEBVTT_ID, cuebox->id->string, (u32) strlen(cuebox->id->string));
 			}
@@ -1251,13 +1256,15 @@
 	return GF_OK;
 }
 
-GF_Err gf_webvtt_parse_iso_sample(GF_WebVTTParser *parser, u32 timescale, GF_ISOSample *iso_sample, Bool merge, Bool box_mode)
+static GF_Err gf_webvtt_parse_iso_sample(GF_WebVTTParser *parser, u32 timescale, GF_ISOSample *iso_sample, u32 duration, Bool merge, Bool box_mode)
 {
 	if (merge) {
 		u64 start;
+		u64 end;
 		GF_List *cues;
 		start = (iso_sample->DTS * 1000) / timescale;
-		cues = gf_webvtt_parse_iso_cues(iso_sample, start);
+		end = (iso_sample->DTS + duration) * 1000 / timescale;
+		cues = gf_webvtt_parse_iso_cues(iso_sample, start, end);
 		gf_webvtt_merge_cues(parser, start, cues);
 		gf_list_del(cues);
 	} else {
@@ -1503,12 +1510,14 @@
 
 	count = gf_isom_get_sample_count(dumper->file, track);
 	for (i=0; i<count; i++) {
+		u32 sdur;
 		GF_ISOSample *samp = gf_isom_get_sample(dumper->file, track, i+1, &di);
 		if (!samp) {
 			e = gf_isom_last_error(dumper->file);
 			goto exit;
 		}
-		e = gf_webvtt_parse_iso_sample(parser, timescale, samp, merge, box_dump);
+		sdur = gf_isom_get_sample_duration(dumper->file, track, i+1);
+		e = gf_webvtt_parse_iso_sample(parser, timescale, samp, sdur, merge, box_dump);
 		if (e) {
 			goto exit;
 		}

gpac-1.0.1.tar.gz/src/odf/descriptors.c -> gpac-2.0.0.tar.gz/src/odf/descriptors.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / MPEG-4 ObjectDescriptor sub-project
@@ -477,7 +477,7 @@
 {
 	if (!cfg) return;
 	while (gf_list_count(cfg->sequenceParameterSets)) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSets, 0);
+		GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(cfg->sequenceParameterSets, 0);
 		gf_list_rem(cfg->sequenceParameterSets, 0);
 		if (sl->data) gf_free(sl->data);
 		gf_free(sl);
@@ -486,7 +486,7 @@
 	cfg->sequenceParameterSets = NULL;
 
 	while (gf_list_count(cfg->pictureParameterSets)) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, 0);
+		GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(cfg->pictureParameterSets, 0);
 		gf_list_rem(cfg->pictureParameterSets, 0);
 		if (sl->data) gf_free(sl->data);
 		gf_free(sl);
@@ -496,7 +496,7 @@
 
 	if (cfg->sequenceParameterSetExtensions) {
 		while (gf_list_count(cfg->sequenceParameterSetExtensions)) {
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSetExtensions, 0);
+			GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(cfg->sequenceParameterSetExtensions, 0);
 			gf_list_rem(cfg->sequenceParameterSetExtensions, 0);
 			if (sl->data) gf_free(sl->data);
 			gf_free(sl);
@@ -527,7 +527,7 @@
 		gf_bs_write_int(bs, count, 5);
 	}
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSets, i);
+		GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(cfg->sequenceParameterSets, i);
 		if (!cfg->write_annex_b) {
 			gf_bs_write_u16(bs, sl->size);
 		} else {
@@ -540,7 +540,7 @@
 		gf_bs_write_int(bs, count, 8);
 	}
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, i);
+		GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(cfg->pictureParameterSets, i);
 		if (!cfg->write_annex_b) {
 			gf_bs_write_u16(bs, sl->size);
 		} else {
@@ -548,7 +548,7 @@
 		}
 		gf_bs_write_data(bs, sl->data, sl->size);
 	}
-	if (gf_avc_is_rext_profile(cfg->AVCProfileIndication)) {
+	if (gf_avcc_use_extensions(cfg->AVCProfileIndication)) {
 		if (!cfg->write_annex_b) {
 			gf_bs_write_int(bs, 0xFF, 6);
 			gf_bs_write_int(bs, cfg->chroma_format, 2);
@@ -562,7 +562,7 @@
 			gf_bs_write_u8(bs, count);
 		}
 		for (i=0; i<count; i++) {
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *) gf_list_get(cfg->sequenceParameterSetExtensions, i);
+			GF_NALUFFParam *sl = (GF_NALUFFParam *) gf_list_get(cfg->sequenceParameterSetExtensions, i);
 			if (!cfg->write_annex_b) {
 				gf_bs_write_u16(bs, sl->size);
 			} else {
@@ -601,21 +601,51 @@
 	gf_bs_read_int(bs, 3);
 	count = gf_bs_read_int(bs, 5);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_malloc(sizeof(GF_AVCConfigSlot));
-		sl->size = gf_bs_read_int(bs, 16);
+		GF_NALUFFParam *sl;
+		u32 size = gf_bs_read_int(bs, 16);
+		if ((size>gf_bs_available(bs)) || (size<2)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AVC] Wrong param set size %d\n", size));
+			gf_odf_avc_cfg_del(avcc);
+			return NULL;
+		}
+		GF_SAFEALLOC(sl, GF_NALUFFParam );
+		if (!sl) {
+			gf_odf_avc_cfg_del(avcc);
+			return NULL;
+		}
+		sl->size = size;
 		sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+		if (!sl->data) {
+			gf_odf_avc_cfg_del(avcc);
+			return NULL;
+		}
 		gf_bs_read_data(bs, sl->data, sl->size);
 		gf_list_add(avcc->sequenceParameterSets, sl);
 	}
 	count = gf_bs_read_int(bs, 8);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_malloc(sizeof(GF_AVCConfigSlot));
-		sl->size = gf_bs_read_int(bs, 16);
+		GF_NALUFFParam *sl;
+		u32 size = gf_bs_read_int(bs, 16);
+		if ((size>gf_bs_available(bs)) || (size<2)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AVC] Wrong param set size %d\n", size));
+			gf_odf_avc_cfg_del(avcc);
+			return NULL;
+		}
+		GF_SAFEALLOC(sl, GF_NALUFFParam );
+		if (!sl) {
+			gf_odf_avc_cfg_del(avcc);
+			return NULL;
+		}
+		sl->size = size;
 		sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+		if (!sl->data) {
+			gf_odf_avc_cfg_del(avcc);
+			return NULL;
+		}
 		gf_bs_read_data(bs, sl->data, sl->size);
 		gf_list_add(avcc->pictureParameterSets, sl);
 	}
-	if (gf_avc_is_rext_profile(avcc->AVCProfileIndication)) {
+	if (gf_avcc_use_extensions(avcc->AVCProfileIndication)) {
 		gf_bs_read_int(bs, 6);
 		avcc->chroma_format = gf_bs_read_int(bs, 2);
 		gf_bs_read_int(bs, 5);
@@ -627,9 +657,24 @@
 		if (count) {
 			avcc->sequenceParameterSetExtensions = gf_list_new();
 			for (i=0; i<count; i++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_malloc(sizeof(GF_AVCConfigSlot));
-				sl->size = gf_bs_read_u16(bs);
-				sl->data = (char *)gf_malloc(sizeof(char) * sl->size);
+				GF_NALUFFParam *sl;
+				u32 size = gf_bs_read_int(bs, 16);
+				if ((size>gf_bs_available(bs)) || (size<2)) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AVC] Wrong param set size %d\n", size));
+					gf_odf_avc_cfg_del(avcc);
+					return NULL;
+				}
+				GF_SAFEALLOC(sl, GF_NALUFFParam );
+				if (!sl) {
+					gf_odf_avc_cfg_del(avcc);
+					return NULL;
+				}
+				sl->size = size;
+				sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+				if (!sl->data) {
+					gf_odf_avc_cfg_del(avcc);
+					return NULL;
+				}
 				gf_bs_read_data(bs, sl->data, sl->size);
 				gf_list_add(avcc->sequenceParameterSetExtensions, sl);
 			}
@@ -874,11 +919,11 @@
 {
 	if (!cfg) return;
 	while (gf_list_count(cfg->param_array)) {
-		GF_HEVCParamArray *pa = (GF_HEVCParamArray*)gf_list_get(cfg->param_array, 0);
+		GF_NALUFFParamArray *pa = (GF_NALUFFParamArray*)gf_list_get(cfg->param_array, 0);
 		gf_list_rem(cfg->param_array, 0);
 
 		while (gf_list_count(pa->nalus)) {
-			GF_AVCConfigSlot *n = (GF_AVCConfigSlot*)gf_list_get(pa->nalus, 0);
+			GF_NALUFFParam *n = (GF_NALUFFParam*)gf_list_get(pa->nalus, 0);
 			gf_list_rem(pa->nalus, 0);
 			if (n->data) gf_free(n->data);
 			gf_free(n);
@@ -943,7 +988,7 @@
 
 	for (i=0; i<count; i++) {
 		u32 nalucount, j;
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(cfg->param_array, i);
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(cfg->param_array, i);
 
 		nalucount = gf_list_count(ar->nalus);
 		if (!cfg->write_annex_b) {
@@ -954,7 +999,7 @@
 		}
 
 		for (j=0; j<nalucount; j++) {
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+			GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
 			if (!cfg->write_annex_b) {
 				gf_bs_write_int(bs, sl->size, 16);
 			} else {
@@ -1034,8 +1079,8 @@
 	count = gf_bs_read_int(bs, 8);
 	for (i=0; i<count; i++) {
 		u32 nalucount, j;
-		GF_HEVCParamArray *ar;
-		GF_SAFEALLOC(ar, GF_HEVCParamArray);
+		GF_NALUFFParamArray *ar;
+		GF_SAFEALLOC(ar, GF_NALUFFParamArray);
 		if (!ar) {
 			gf_odf_hevc_cfg_del(cfg);
 			return NULL;
@@ -1048,14 +1093,14 @@
 		ar->type = gf_bs_read_int(bs, 6);
 		nalucount = gf_bs_read_int(bs, 16);
 		for (j=0; j<nalucount; j++) {
-			GF_AVCConfigSlot *sl;
+			GF_NALUFFParam *sl;
 			u32 size = gf_bs_read_int(bs, 16);
-			if (size>gf_bs_available(bs)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Wrong param set size %d\n", size));
+			if ((size>gf_bs_available(bs)) || (size<2)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] Wrong param set size %d\n", size));
 				gf_odf_hevc_cfg_del(cfg);
 				return NULL;
 			}
-			GF_SAFEALLOC(sl, GF_AVCConfigSlot );
+			GF_SAFEALLOC(sl, GF_NALUFFParam );
 			if (!sl) {
 				gf_odf_hevc_cfg_del(cfg);
 				return NULL;
@@ -1079,6 +1124,292 @@
 	return cfg;
 }
 
+GF_EXPORT
+GF_VVCConfig *gf_odf_vvc_cfg_new()
+{
+	GF_VVCConfig *cfg;
+	GF_SAFEALLOC(cfg, GF_VVCConfig);
+	if (!cfg) return NULL;
+	cfg->param_array = gf_list_new();
+	cfg->nal_unit_size = 4;
+	cfg->chroma_format = 1;
+	cfg->bit_depth = 8;
+	return cfg;
+}
+
+GF_EXPORT
+void gf_odf_vvc_cfg_del(GF_VVCConfig *cfg)
+{
+	if (!cfg) return;
+	while (gf_list_count(cfg->param_array)) {
+		GF_NALUFFParamArray *pa = (GF_NALUFFParamArray*)gf_list_get(cfg->param_array, 0);
+		gf_list_rem(cfg->param_array, 0);
+
+		while (gf_list_count(pa->nalus)) {
+			GF_NALUFFParam *n = (GF_NALUFFParam*)gf_list_get(pa->nalus, 0);
+			gf_list_rem(pa->nalus, 0);
+			if (n->data) gf_free(n->data);
+			gf_free(n);
+		}
+		gf_list_del(pa->nalus);
+		gf_free(pa);
+	}
+	gf_list_del(cfg->param_array);
+	if (cfg->general_constraint_info)
+		gf_free(cfg->general_constraint_info);
+	if (cfg->sub_profiles_idc)
+		gf_free(cfg->sub_profiles_idc);
+	gf_free(cfg);
+}
+
+GF_EXPORT
+GF_Err gf_odf_vvc_cfg_write_bs(GF_VVCConfig *cfg, GF_BitStream *bs)
+{
+	u32 i, count;
+
+	count = gf_list_count(cfg->param_array);
+
+	if (!cfg->write_annex_b) {
+
+		gf_bs_write_int(bs, 0xFF, 5);
+		gf_bs_write_int(bs, cfg->nal_unit_size - 1, 2);
+		gf_bs_write_int(bs, cfg->ptl_present, 1);
+
+		if (cfg->ptl_present) {
+			s32 idx;
+
+			gf_bs_write_int(bs, cfg->ols_idx, 9);
+			gf_bs_write_int(bs, cfg->numTemporalLayers, 3);
+			gf_bs_write_int(bs, cfg->constantFrameRate, 2);
+			gf_bs_write_int(bs, cfg->chroma_format, 2);
+			gf_bs_write_int(bs, cfg->bit_depth - 8, 3);
+			gf_bs_write_int(bs, 0xFF, 5);
+
+			if (!cfg->general_constraint_info)
+				cfg->num_constraint_info = 0;
+
+			//write PTL
+			gf_bs_write_int(bs, 0, 2);
+			gf_bs_write_int(bs, cfg->num_constraint_info, 6);
+			gf_bs_write_int(bs, cfg->general_profile_idc, 7);
+			gf_bs_write_int(bs, cfg->general_tier_flag, 1);
+			gf_bs_write_u8(bs, cfg->general_level_idc);
+			gf_bs_write_int(bs, cfg->ptl_frame_only_constraint, 1);
+			gf_bs_write_int(bs, cfg->ptl_multilayer_enabled, 1);
+
+			if (cfg->num_constraint_info) {
+				gf_bs_write_data(bs, cfg->general_constraint_info, cfg->num_constraint_info - 1);
+				gf_bs_write_int(bs, cfg->general_constraint_info[cfg->num_constraint_info - 1], 6);
+			} else {
+				gf_bs_write_int(bs, 0, 6);
+			}
+
+			for (idx=cfg->numTemporalLayers-2; idx>=0; idx--) {
+				u8 val = cfg->ptl_sublayer_present_mask & (1<<idx);
+				gf_bs_write_int(bs, val ? 1 : 0, 1);
+			}
+			for (idx=cfg->numTemporalLayers; idx<=8 && cfg->numTemporalLayers>1; idx++) {
+				gf_bs_write_int(bs, 0, 1);
+			}
+			for (idx=cfg->numTemporalLayers-2; idx>=0; idx--) {
+				if (cfg->ptl_sublayer_present_mask & (1<<idx))
+					gf_bs_write_u8(bs, cfg->sublayer_level_idc[idx]);
+			}
+			if (!cfg->sub_profiles_idc) cfg->num_sub_profiles = 0;
+			gf_bs_write_u8(bs, cfg->num_sub_profiles);
+			for (idx=0; idx<cfg->num_sub_profiles; idx++) {
+				gf_bs_write_u32(bs, cfg->sub_profiles_idc[idx]);
+			}
+			//end PTL
+
+			gf_bs_write_u16(bs, cfg->maxPictureWidth);
+			gf_bs_write_u16(bs, cfg->maxPictureHeight);
+			gf_bs_write_u16(bs, cfg->avgFrameRate);
+		}
+		gf_bs_write_int(bs, count, 8);
+	}
+
+	for (i=0; i<count; i++) {
+		u32 nalucount, j;
+		GF_NALUFFParamArray *ar = (GF_NALUFFParamArray*)gf_list_get(cfg->param_array, i);
+
+		nalucount = gf_list_count(ar->nalus);
+		if (!cfg->write_annex_b) {
+			gf_bs_write_int(bs, ar->array_completeness, 1);
+			gf_bs_write_int(bs, 0, 2);
+			gf_bs_write_int(bs, ar->type, 5);
+
+			if ((ar->type != GF_VVC_NALU_DEC_PARAM) && (ar->type != GF_VVC_NALU_OPI))
+				gf_bs_write_int(bs, nalucount, 16);
+			else
+				nalucount = 1;
+		}
+
+		for (j=0; j<nalucount; j++) {
+			GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(ar->nalus, j);
+			if (!cfg->write_annex_b) {
+				gf_bs_write_int(bs, sl->size, 16);
+			} else {
+				gf_bs_write_u32(bs, 1);
+			}
+			gf_bs_write_data(bs, sl->data, sl->size);
+		}
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_odf_vvc_cfg_write(GF_VVCConfig *cfg, u8 **outData, u32 *outSize)
+{
+	GF_Err e;
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	*outSize = 0;
+	*outData = NULL;
+	e = gf_odf_vvc_cfg_write_bs(cfg, bs);
+	if (e==GF_OK)
+		gf_bs_get_content(bs, outData, outSize);
+
+	gf_bs_del(bs);
+	return e;
+}
+
+GF_EXPORT
+GF_VVCConfig *gf_odf_vvc_cfg_read_bs(GF_BitStream *bs)
+{
+	u32 i, count;
+	GF_VVCConfig *cfg = gf_odf_vvc_cfg_new();
+
+	gf_bs_read_int(bs, 5);
+	cfg->nal_unit_size = 1 + gf_bs_read_int(bs, 2);
+	cfg->ptl_present = gf_bs_read_int(bs, 1);
+
+	if (cfg->ptl_present) {
+		s32 j;
+
+		cfg->ols_idx = gf_bs_read_int(bs, 9);
+		cfg->numTemporalLayers = gf_bs_read_int(bs, 3);
+		cfg->constantFrameRate = gf_bs_read_int(bs, 2);
+		cfg->chroma_format = gf_bs_read_int(bs, 2);
+		cfg->bit_depth = 8 + gf_bs_read_int(bs, 3);
+		gf_bs_read_int(bs, 5);
+
+		//parse PTL
+		gf_bs_read_int(bs, 2);
+		cfg->num_constraint_info = gf_bs_read_int(bs, 6);
+		cfg->general_profile_idc = gf_bs_read_int(bs, 7);
+		cfg->general_tier_flag = gf_bs_read_int(bs, 1);
+		cfg->general_level_idc = gf_bs_read_u8(bs);
+		cfg->ptl_frame_only_constraint = gf_bs_read_int(bs, 1);
+		cfg->ptl_multilayer_enabled = gf_bs_read_int(bs, 1);
+
+		if (cfg->num_constraint_info) {
+			cfg->general_constraint_info = gf_malloc(sizeof(u8)*cfg->num_constraint_info);
+			if (!cfg->general_constraint_info) {
+				gf_free(cfg);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] alloc failed while parsing vvc config\n"));
+				return NULL;
+			}
+			gf_bs_read_data(bs, cfg->general_constraint_info, cfg->num_constraint_info - 1);
+			cfg->general_constraint_info[cfg->num_constraint_info-1] = gf_bs_read_int(bs, 6);
+		} else {
+			//forbidden in spec!
+			gf_bs_read_int(bs, 6);
+		}
+
+		cfg->ptl_sublayer_present_mask = 0;
+		for (j=cfg->numTemporalLayers-2; j>=0; j--) {
+			u32 val = gf_bs_read_int(bs, 1);
+			cfg->ptl_sublayer_present_mask |= val << j;
+		}
+		for (j=cfg->numTemporalLayers; j<=8 && cfg->numTemporalLayers>1; j++) {
+			gf_bs_read_int(bs, 1);
+		}
+		for (j=cfg->numTemporalLayers-2; j>=0; j--) {
+			if (cfg->ptl_sublayer_present_mask & (1<<j)) {
+				cfg->sublayer_level_idc[j] = gf_bs_read_u8(bs);
+			}
+		}
+		cfg->num_sub_profiles = gf_bs_read_u8(bs);
+		if (cfg->num_sub_profiles) {
+			cfg->sub_profiles_idc = gf_malloc(sizeof(u32)*cfg->num_sub_profiles);
+			if (!cfg->sub_profiles_idc) {
+				gf_free(cfg->general_constraint_info);
+				gf_free(cfg);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] alloc failed while parsing vvc config\n"));
+				return NULL;
+			}
+		}
+		for (i=0; i<cfg->num_sub_profiles; i++) {
+			cfg->sub_profiles_idc[i] = gf_bs_read_u32(bs);
+		}
+
+		//end PTL
+
+		cfg->maxPictureWidth = gf_bs_read_u16(bs);
+		cfg->maxPictureHeight = gf_bs_read_u16(bs);
+		cfg->avgFrameRate = gf_bs_read_u16(bs);
+	}
+
+	count = gf_bs_read_int(bs, 8);
+	for (i=0; i<count; i++) {
+		u32 nalucount, j;
+		GF_NALUFFParamArray *ar;
+		GF_SAFEALLOC(ar, GF_NALUFFParamArray);
+		if (!ar) {
+			gf_odf_vvc_cfg_del(cfg);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] alloc failed while parsing vvc config\n"));
+			return NULL;
+		}
+		ar->nalus = gf_list_new();
+		gf_list_add(cfg->param_array, ar);
+
+		ar->array_completeness = gf_bs_read_int(bs, 1);
+		gf_bs_read_int(bs, 2);
+		ar->type = gf_bs_read_int(bs, 5);
+
+		if ((ar->type != GF_VVC_NALU_DEC_PARAM) && (ar->type != GF_VVC_NALU_OPI))
+			nalucount = gf_bs_read_int(bs, 16);
+		else
+			nalucount = 1;
+			
+		for (j=0; j<nalucount; j++) {
+			GF_NALUFFParam *sl;
+			u32 size = gf_bs_read_int(bs, 16);
+			if ((size>gf_bs_available(bs)) || (size<2)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] Wrong param set size %d\n", size));
+				gf_odf_vvc_cfg_del(cfg);
+				return NULL;
+			}
+			GF_SAFEALLOC(sl, GF_NALUFFParam );
+			if (!sl) {
+				gf_odf_vvc_cfg_del(cfg);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] alloc failed while parsing vvc config\n"));
+				return NULL;
+			}
+
+			sl->size = size;
+			sl->data = (char *)gf_malloc(sizeof(char) * sl->size);
+			if (!sl->data) {
+				gf_free(sl);
+				gf_odf_vvc_cfg_del(cfg);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VVC] alloc failed while parsing vvc config\n"));
+				return NULL;
+			}
+			gf_bs_read_data(bs, sl->data, sl->size);
+			gf_list_add(ar->nalus, sl);
+		}
+	}
+	return cfg;
+}
+
+GF_EXPORT
+GF_VVCConfig *gf_odf_vvc_cfg_read(u8 *dsi, u32 dsi_size)
+{
+	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
+	GF_VVCConfig *cfg = gf_odf_vvc_cfg_read_bs(bs);
+	gf_bs_del(bs);
+	return cfg;
+}
 
 GF_EXPORT
 GF_AV1Config *gf_odf_av1_cfg_new()
@@ -1184,7 +1515,7 @@
 
 	if (!is_v0) {
 		if (cfg->codec_initdata_size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] VP Configuration Box: invalid data, codec_initdata_size must be 0, was %d - ignoring\n", cfg->codec_initdata_size));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[VPX] Invalid data in configuration: codec_initdata_size must be 0, was %d - ignoring\n", cfg->codec_initdata_size));
 		}
 
 		gf_bs_write_int(bs, (u16)0, 16);
@@ -1231,7 +1562,7 @@
 
 	// must be 0 according to spec
 	if (cfg->codec_initdata_size) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] VP Configuration Box: invalid data, codec_initdata_size must be 0, was %d\n", cfg->codec_initdata_size));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VPX] Invalid data in configuration: codec_initdata_size must be 0, was %d\n", cfg->codec_initdata_size));
 		gf_odf_vp_cfg_del(cfg);
 		return NULL;
 	}
@@ -1277,7 +1608,7 @@
 
 	reserved = gf_bs_read_int(bs, 3);
 	if (reserved != 0 || cfg->marker != 1 || cfg->version != 1) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] wrong avcC reserved %d / marker %d / version %d expecting 0 1 1\n", reserved, cfg->marker, cfg->version));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[AV1] wrong avcC reserved %d / marker %d / version %d expecting 0 1 1\n", reserved, cfg->marker, cfg->version));
 		gf_odf_av1_cfg_del(cfg);
 		return NULL;
 	}
@@ -1297,15 +1628,15 @@
 
 		pos = gf_bs_get_position(bs);
 		obu_size = 0;
-		if (gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_size, NULL, &state) != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AV1] could not parse AV1 OBU at position "LLU". Leaving parsing.\n", pos));
+		if (gf_av1_parse_obu(bs, &obu_type, &obu_size, NULL, &state) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] could not parse AV1 OBU at position "LLU". Leaving parsing.\n", pos));
 			break;
 		}
 		assert(obu_size == gf_bs_get_position(bs) - pos);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] parsed AV1 OBU type=%u size="LLU" at position "LLU".\n", obu_type, obu_size, pos));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[AV1] parsed AV1 OBU type=%u size="LLU" at position "LLU".\n", obu_type, obu_size, pos));
 
 		if (!av1_is_obu_header(obu_type)) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] AV1 unexpected OBU type=%u size="LLU" found at position "LLU". Forwarding.\n", pos));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[AV1] AV1 unexpected OBU type=%u size="LLU" found at position "LLU". Forwarding.\n", pos));
 		}
 		GF_SAFEALLOC(a, GF_AV1_OBUArrayEntry);
 		if (!a) break;
@@ -1321,12 +1652,13 @@
 		gf_list_add(cfg->obu_array, a);
 
 		if (size<obu_size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AV1] AV1 config misses %d bytes to fit the entire OBU\n", obu_size - size));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] AV1 config misses %d bytes to fit the entire OBU\n", obu_size - size));
 			break;
 		}
 		size -= (u32) obu_size;
 	}
 	gf_av1_reset_state(& state, GF_TRUE);
+	gf_bs_align(bs);
 	return cfg;
 #else
 	return NULL;
@@ -1360,20 +1692,19 @@
 	cfg->rpu_present_flag = gf_bs_read_int(bs, 1);
 	cfg->el_present_flag = gf_bs_read_int(bs, 1);
 	cfg->bl_present_flag = gf_bs_read_int(bs, 1);
-	{
-		int i = 0;
-		u32 data[5];
-		memset(data, 0, sizeof(data));
-		gf_bs_read_data(bs, (char*)data, 20);
-		for (i = 0; i < 5; ++i) {
-			if (data[i] != 0) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[odf_cfg] dovi config reserved bytes are not zero\n"));
-			}
+	cfg->dv_bl_signal_compatibility_id = gf_bs_read_int(bs, 4);
+	if (gf_bs_read_int(bs, 28)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[DOVI] Configuration reserved bits are not zero\n"));
+	}
+	for (u32 i=0; i<4; i++) {
+		if (gf_bs_read_u32(bs)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[DOVII] Configuration reserved bits are not zero\n"));
 		}
 	}
 	return cfg;
 }
 
+GF_EXPORT
 void gf_odf_dovi_cfg_del(GF_DOVIDecoderConfigurationRecord *cfg)
 {
 	gf_free(cfg);
@@ -1388,10 +1719,106 @@
 	gf_bs_write_int(bs, cfg->rpu_present_flag, 1);
 	gf_bs_write_int(bs, cfg->el_present_flag, 1);
 	gf_bs_write_int(bs, cfg->bl_present_flag, 1);
+	gf_bs_write_int(bs, cfg->dv_bl_signal_compatibility_id, 4);
+ gf_bs_write_int(bs, 0, 28);
 gf_bs_write_u32(bs, 0);
 gf_bs_write_u32(bs, 0);
 gf_bs_write_u32(bs, 0);
 gf_bs_write_u32(bs, 0);
- gf_bs_write_u32(bs, 0);
 	return GF_OK;
 }
+
+
+GF_Err gf_odf_ac3_cfg_write_bs(GF_AC3Config *cfg, GF_BitStream *bs)
+{
+	if (!cfg || !bs) return GF_BAD_PARAM;
+
+	if (cfg->is_ec3) {
+		u32 i;
+		gf_bs_write_int(bs, cfg->brcode, 13);
+		gf_bs_write_int(bs, cfg->nb_streams - 1, 3);
+		for (i=0; i<cfg->nb_streams; i++) {
+			gf_bs_write_int(bs, cfg->streams[i].fscod, 2);
+			gf_bs_write_int(bs, cfg->streams[i].bsid, 5);
+			gf_bs_write_int(bs, cfg->streams[i].bsmod, 5);
+			gf_bs_write_int(bs, cfg->streams[i].acmod, 3);
+			gf_bs_write_int(bs, cfg->streams[i].lfon, 1);
+			gf_bs_write_int(bs, 0, 3);
+			gf_bs_write_int(bs, cfg->streams[i].nb_dep_sub, 4);
+			if (cfg->streams[i].nb_dep_sub) {
+				gf_bs_write_int(bs, cfg->streams[i].chan_loc, 9);
+			} else {
+				gf_bs_write_int(bs, 0, 1);
+			}
+		}
+	} else {
+		gf_bs_write_int(bs, cfg->streams[0].fscod, 2);
+		gf_bs_write_int(bs, cfg->streams[0].bsid, 5);
+		gf_bs_write_int(bs, cfg->streams[0].bsmod, 3);
+		gf_bs_write_int(bs, cfg->streams[0].acmod, 3);
+		gf_bs_write_int(bs, cfg->streams[0].lfon, 1);
+		gf_bs_write_int(bs, cfg->brcode, 5);
+		gf_bs_write_int(bs, 0, 5);
+	}
+	return GF_OK;
+}
+
+GF_Err gf_odf_ac3_cfg_write(GF_AC3Config *cfg, u8 **data, u32 *size)
+{
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	GF_Err e = gf_odf_ac3_cfg_write_bs(cfg, bs);
+
+	gf_bs_get_content(bs, data, size);
+	gf_bs_del(bs);
+	return e;
+}
+
+GF_Err gf_odf_ac3_config_parse_bs(GF_BitStream *bs, Bool is_ec3, GF_AC3Config *cfg)
+{
+	if (!cfg || !bs) return GF_BAD_PARAM;
+	memset(cfg, 0, sizeof(GF_AC3Config));
+	cfg->is_ec3 = is_ec3;
+	if (is_ec3) {
+		u32 j;
+		cfg->is_ec3 = 1;
+		cfg->brcode = gf_bs_read_int(bs, 13);
+		cfg->nb_streams = 1 + gf_bs_read_int(bs, 3);
+		for (j=0; j<cfg->nb_streams; j++) {
+			cfg->streams[j].fscod = gf_bs_read_int(bs, 2);
+			cfg->streams[j].bsid = gf_bs_read_int(bs, 5);
+			gf_bs_read_int(bs, 1);
+			cfg->streams[j].asvc = gf_bs_read_int(bs, 1);
+			cfg->streams[j].bsmod = gf_bs_read_int(bs, 3);
+			cfg->streams[j].acmod = gf_bs_read_int(bs, 3);
+			cfg->streams[j].lfon = gf_bs_read_int(bs, 1);
+			gf_bs_read_int(bs, 3);
+			cfg->streams[j].nb_dep_sub = gf_bs_read_int(bs, 4);
+			if (cfg->streams[j].nb_dep_sub) {
+				cfg->streams[j].chan_loc = gf_bs_read_int(bs, 9);
+			} else {
+				gf_bs_read_int(bs, 1);
+			}
+		}
+	} else {
+		cfg->nb_streams = 1;
+		cfg->streams[0].fscod = gf_bs_read_int(bs, 2);
+		cfg->streams[0].bsid = gf_bs_read_int(bs, 5);
+		cfg->streams[0].bsmod = gf_bs_read_int(bs, 3);
+		cfg->streams[0].acmod = gf_bs_read_int(bs, 3);
+		cfg->streams[0].lfon = gf_bs_read_int(bs, 1);
+		cfg->brcode = gf_bs_read_int(bs, 5);
+		gf_bs_read_int(bs, 5);
+	}
+	return GF_OK;
+}
+
+GF_Err gf_odf_ac3_config_parse(u8 *dsi, u32 dsi_len, Bool is_ec3, GF_AC3Config *cfg)
+{
+	GF_BitStream *bs;
+	GF_Err e;
+	if (!cfg || !dsi) return GF_BAD_PARAM;
+	bs = gf_bs_new(dsi, dsi_len, GF_BITSTREAM_READ);
+	e = gf_odf_ac3_config_parse_bs(bs, is_ec3, cfg);
+	gf_bs_del(bs);
+	return e;
+}

gpac-1.0.1.tar.gz/src/odf/odf_code.c -> gpac-2.0.0.tar.gz/src/odf/odf_code.c Changed

@@ -47,7 +47,7 @@
 static GFINLINE u32 OD_SizeUTF8String(char *string, Bool isUTF8)
 {
 	if (isUTF8) return 1 + (u32) strlen(string);
-	return 1 + 2 * (u32) gf_utf8_wcslen((const unsigned short *)string);
+	return 1 + 2 * gf_utf8_wcslen((const unsigned short *)string);
 }
 
 static GFINLINE void OD_WriteUTF8String(GF_BitStream *bs, char *string, Bool isUTF8)
@@ -58,7 +58,7 @@
 		gf_bs_write_int(bs, len, 8);
 		gf_bs_write_data(bs, string, len);
 	} else {
-		len = (u32) gf_utf8_wcslen((const unsigned short *)string);
+		len = gf_utf8_wcslen((const unsigned short *)string);
 		gf_bs_write_int(bs, len, 8);
 		gf_bs_write_data(bs, string, len*2);
 	}
@@ -2217,7 +2217,7 @@
 		if (etd->isUTF8) {
 			nonLen = (u32) strlen((const char*)etd->NonItemText);
 		} else {
-			nonLen = (u32) gf_utf8_wcslen((const unsigned short*)etd->NonItemText);
+			nonLen = gf_utf8_wcslen((const unsigned short*)etd->NonItemText);
 		}
 	} else {
 		nonLen = 0;
@@ -2267,7 +2267,7 @@
 		if (etd->isUTF8) {
 			nonLen = (u32) strlen((const char*)etd->NonItemText);
 		} else {
-			nonLen = (u32) gf_utf8_wcslen((const unsigned short*)etd->NonItemText);
+			nonLen = gf_utf8_wcslen((const unsigned short*)etd->NonItemText);
 		}
 	} else {
 		nonLen = 0;

gpac-1.0.1.tar.gz/src/odf/odf_dump.c -> gpac-2.0.0.tar.gz/src/odf/odf_dump.c Changed

gpac-1.0.1.tar.gz/src/odf/odf_parse.c -> gpac-2.0.0.tar.gz/src/odf/odf_parse.c Changed

gpac-1.0.1.tar.gz/src/quickjs/GPAC_README.md -> gpac-2.0.0.tar.gz/src/quickjs/GPAC_README.md Changed

@@ -1,9 +1,20 @@
-QuickJS in GPAC
-- base version is quickjs-2019-09-18
+# QuickJS in GPAC
+Base version is quickjs-2021-03-27 :
+	https://github.com/bellard/quickjs/commit/b5e62895c619d4ffc75c9d822c8d85f1ece77e5b
+	
+## Modifications to QuickJS
 - define CONFIG_VERSION in QuickJS.c
 - patched for MSVC compil, based on https://github.com/horhof/quickjs/compare/master...samhocevar:task/msvc-support
-- patched for no stack checking (breaks multithread support)
+- do not define CONFIG_STACK_CHECK (stack checking breaks multithread support)
 - patched for JS_GetOpaque_Nocheck (get opaque data without class_id check, needed in some places in gpac due to original SpiderMonkey design)
-- patched for JS_EvalWithTarget (for SVG handler+observer, to cleanup)
-- patched for exporting JS_AtomIsArrayIndex
-- patched JS_CGETSET_DEF and JS_CGETSET_MAGIC_DEF for MSVC compil (designated initialzer with struct in union need { } to work properly)
+- patched for exporting JS_AtomIsArrayIndex and JS_IsArrayBuffer
+
+## Modifications to QuickJS-libc ('os' and 'std' modules)
+- moved from pthread to GF_Thread in 'os' module
+- Worker support for windows (patched js_os_poll)
+- cleanup worker thread exit to avoid leaks
+- patch js_std_loop to not run forever for main thread
+- added MSVC support for most 'os' functions (most importantly exec, waitpid and kill)
+- use gpac module loader
+- pacthes for sighandler_t and environ
+

gpac-1.0.1.tar.gz/src/quickjs/cutils.c -> gpac-2.0.0.tar.gz/src/quickjs/cutils.c Changed

@@ -169,7 +169,8 @@
 #if defined(_MSC_VER)
 int dbuf_printf(DynBuf *s, const char *fmt, ...)
 #else
-int __attribute__((format(printf, 2, 3))) dbuf_printf(DynBuf *s, const char *fmt, ...)
+int __attribute__((format(printf, 2, 3))) dbuf_printf(DynBuf *s,
+ const char *fmt, ...)
 #endif
 {
 va_list ap;
@@ -260,43 +261,37 @@
 *pp = p;
 return c;
 }
-#if defined(_MSC_VER)
-	else if (c < 0xc0)
-		return -1;
-	else if (c < 0xe0)
-		l = 1;
-	else if (c < 0xf0)
-		l = 2;
-	else if (c < 0xf8)
-		l = 3;
-	else if (c < 0xfc)
-		l = 4;
-	else if (c < 0xfe)
-		l = 5;
-	else
-		return -1;
-#else
-	switch(c) {
- case 0xc0 ... 0xdf:
+ switch(c) {
+ case 0xc0: case 0xc1: case 0xc2: case 0xc3:
+ case 0xc4: case 0xc5: case 0xc6: case 0xc7:
+ case 0xc8: case 0xc9: case 0xca: case 0xcb:
+ case 0xcc: case 0xcd: case 0xce: case 0xcf:
+ case 0xd0: case 0xd1: case 0xd2: case 0xd3:
+ case 0xd4: case 0xd5: case 0xd6: case 0xd7:
+ case 0xd8: case 0xd9: case 0xda: case 0xdb:
+ case 0xdc: case 0xdd: case 0xde: case 0xdf:
 l = 1;
 break;
- case 0xe0 ... 0xef:
+ case 0xe0: case 0xe1: case 0xe2: case 0xe3:
+ case 0xe4: case 0xe5: case 0xe6: case 0xe7:
+ case 0xe8: case 0xe9: case 0xea: case 0xeb:
+ case 0xec: case 0xed: case 0xee: case 0xef:
 l = 2;
 break;
- case 0xf0 ... 0xf7:
+ case 0xf0: case 0xf1: case 0xf2: case 0xf3:
+ case 0xf4: case 0xf5: case 0xf6: case 0xf7:
 l = 3;
 break;
- case 0xf8 ... 0xfb:
+ case 0xf8: case 0xf9: case 0xfa: case 0xfb:
 l = 4;
 break;
- case 0xfc ... 0xfd:
+ case 0xfc: case 0xfd:
 l = 5;
 break;
 default:
 return -1;
 }
-#endif
-	/* check that we have enough characters */
+ /* check that we have enough characters */
 if (l > (max_len - 1))
 return -1;
 c &= utf8_first_code_mask[l - 1];

gpac-1.0.1.tar.gz/src/quickjs/cutils.h -> gpac-2.0.0.tar.gz/src/quickjs/cutils.h Changed

gpac-1.0.1.tar.gz/src/quickjs/libbf.c -> gpac-2.0.0.tar.gz/src/quickjs/libbf.c Changed

@@ -1,7 +1,7 @@
 /*
 * Tiny arbitrary precision floating point library
 * 
- * Copyright (c) 2017-2020 Fabrice Bellard
+ * Copyright (c) 2017-2021 Fabrice Bellard
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -86,7 +86,6 @@
 static void fft_clear_cache(bf_context_t *s);
 #endif
 #ifdef USE_BF_DEC
-static void mp_pow_init(void);
 static limb_t get_digit(const limb_t *tab, limb_t len, slimb_t pos);
 #endif
 
@@ -126,7 +125,6 @@
 return LIMB_BITS - clz(a - 1);
 }
 
-#if 0 //unused
 /* b must be >= 1 */
 static inline slimb_t ceil_div(slimb_t a, slimb_t b)
 {
@@ -135,7 +133,6 @@
 else
 return a / b;
 }
-#endif
 
 /* b must be >= 1 */
 static inline slimb_t floor_div(slimb_t a, slimb_t b)
@@ -156,6 +153,17 @@
 return a;
 }
 
+/* signed addition with saturation */
+static inline slimb_t sat_add(slimb_t a, slimb_t b)
+{
+ slimb_t r;
+ r = a + b;
+ /* overflow ? */
+ if (((a ^ r) & (b ^ r)) < 0)
+ r = (a >> (LIMB_BITS - 1)) ^ (((limb_t)1 << (LIMB_BITS - 1)) - 1);
+ return r;
+}
+
 #define malloc(s) malloc_is_forbidden(s)
 #define free(p) free_is_forbidden(p)
 #define realloc(p, s) realloc_is_forbidden(p, s)
@@ -166,9 +174,6 @@
 memset(s, 0, sizeof(*s));
 s->realloc_func = realloc_func;
 s->realloc_opaque = realloc_opaque;
-#ifdef USE_BF_DEC
- mp_pow_init();
-#endif
 }
 
 void bf_context_end(bf_context_t *s)
@@ -424,18 +429,13 @@
 if (r->sign == (rnd_mode == BF_RNDD))
 add_one = inexact;
 break;
+ case BF_RNDA:
+ add_one = inexact;
+ break;
 case BF_RNDNA:
 case BF_RNDF:
 add_one = bit1;
 break;
- case BF_RNDNU:
- if (bit1) {
- if (r->sign)
- add_one = bit0;
- else
- add_one = 1;
- }
- break;
 default:
 abort();
 }
@@ -454,7 +454,7 @@
 if (prec == BF_PREC_INF ||
 rnd_mode == BF_RNDN ||
 rnd_mode == BF_RNDNA ||
- rnd_mode == BF_RNDNU ||
+ rnd_mode == BF_RNDA ||
 (rnd_mode == BF_RNDD && sign == 1) ||
 (rnd_mode == BF_RNDU && sign == 0)) {
 bf_set_inf(r, sign);
@@ -478,12 +478,14 @@
 
 /* round to prec1 bits assuming 'r' is non zero and finite. 'r' is
 assumed to have length 'l' (1 <= l <= r->len). Note: 'prec1' can be
- infinite (BF_PREC_INF). Can fail with BF_ST_MEM_ERROR in case of
+ infinite (BF_PREC_INF). 'ret' is 0 or BF_ST_INEXACT if the result
+ is known to be inexact. Can fail with BF_ST_MEM_ERROR in case of
 overflow not returning infinity. */
-static int __bf_round(bf_t *r, limb_t prec1, bf_flags_t flags, limb_t l)
+static int __bf_round(bf_t *r, limb_t prec1, bf_flags_t flags, limb_t l,
+ int ret)
 {
 limb_t v, a;
- int shift, add_one, ret, rnd_mode;
+ int shift, add_one, rnd_mode;
 slimb_t i, bit_pos, pos, e_min, e_max, e_range, prec;
 
 /* e_min and e_max are computed to match the IEEE 754 conventions */
@@ -508,7 +510,6 @@
 
 /* round to prec bits */
 rnd_mode = flags & BF_RND_MASK;
- ret = 0;
 add_one = bf_get_rnd_add(&ret, r, l, prec, rnd_mode);
 
 if (prec <= 0) {
@@ -617,7 +618,7 @@
 }
 r->expn -= shift;
 }
- ret = __bf_round(r, prec1, flags, l);
+ ret = __bf_round(r, prec1, flags, l, 0);
 }
 // bf_print_str("r_final", r);
 return ret;
@@ -640,8 +641,7 @@
 }
 if (a->expn == BF_EXP_ZERO)
 return FALSE;
- is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA ||
- rnd_mode == BF_RNDNU);
+ is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA);
 if (k < (prec + 2))
 return FALSE;
 bit_pos = a->len * LIMB_BITS - 1 - prec;
@@ -668,7 +668,7 @@
 {
 if (r->len == 0)
 return 0;
- return __bf_round(r, prec, flags, r->len);
+ return __bf_round(r, prec, flags, r->len, 0);
 }
 
 /* for debugging */
@@ -782,51 +782,26 @@
 return res;
 }
 
-#define BF_CMP_EQ 1
-#define BF_CMP_LT 2
-#define BF_CMP_LE 3
-
-static int bf_cmp(const bf_t *a, const bf_t *b, int op)
+/* Standard floating point comparison: return 2 if one of the operands
+ is NaN (unordered) or -1, 0, 1 depending on the ordering assuming
+ -0 == +0 */
+int bf_cmp(const bf_t *a, const bf_t *b)
 {
- BOOL is_both_zero;
 int res;
 
- if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN)
- return 0;
- if (a->sign != b->sign) {
- is_both_zero = (a->expn == BF_EXP_ZERO && b->expn == BF_EXP_ZERO);
- if (is_both_zero) {
- return op & BF_CMP_EQ;
- } else if (op & BF_CMP_LT) {
- return a->sign;
- } else {
- return FALSE;
- }
+ if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+ res = 2;
+ } else if (a->sign != b->sign) {
+ if (a->expn == BF_EXP_ZERO && b->expn == BF_EXP_ZERO)
+ res = 0;
+ else
+ res = 1 - 2 * a->sign;
 } else {
 res = bf_cmpu(a, b);
- if (res == 0) {
- return op & BF_CMP_EQ;
- } else if (op & BF_CMP_LT) {
- return (res < 0) ^ a->sign;
- } else {
- return FALSE;
- }
+ if (a->sign)
+ res = -res;
 }
-}
-
-int bf_cmp_eq(const bf_t *a, const bf_t *b)
-{
- return bf_cmp(a, b, BF_CMP_EQ);
-}
-
-int bf_cmp_le(const bf_t *a, const bf_t *b)
-{
- return bf_cmp(a, b, BF_CMP_LE);
-}
-
-int bf_cmp_lt(const bf_t *a, const bf_t *b)
-{
- return bf_cmp(a, b, BF_CMP_LT);
+ return res;
 }
 
 /* Compute the number of bits 'n' matching the pattern:
@@ -1633,11 +1608,11 @@
 slimb_t e_max;
 if (r->len == 0)
 return 0;
- e_max = ((limb_t)1 << BF_EXP_BITS_MAX) - 1;
+ e_max = ((limb_t)1 << BF_EXT_EXP_BITS_MAX) - 1;
 e = bf_max(e, -e_max);
 e = bf_min(e, e_max);
 r->expn += e;
- return __bf_round(r, prec, flags, r->len);
+ return __bf_round(r, prec, flags, r->len, 0);
 }
 
 /* Return e such as a=m*2^e with m odd integer. return 0 if a is zero,
@@ -1726,10 +1701,12 @@
 memset(taba, 0, d * sizeof(limb_t));
 memcpy(taba + d, a->tab, a->len * sizeof(limb_t));
 if (bf_resize(r, n + 1))
+ goto fail1;
+ if (mp_divnorm(s, r->tab, taba, na, b->tab, nb)) {
+ fail1:
+ bf_free(s, taba);
 goto fail;
- if (mp_divnorm(s, r->tab, taba, na, b->tab, nb))
- goto fail;
- 
+ }
 /* see if non zero remainder */
 if (mp_scan_nz(taba, nb))
 r->tab[0] |= 1;
@@ -1779,8 +1756,7 @@
 }
 
 q_sign = a->sign ^ b->sign;
- is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA ||
- rnd_mode == BF_RNDNU);
+ is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA);
 switch(rnd_mode) {
 default:
 case BF_RNDZ:
@@ -1794,12 +1770,12 @@
 case BF_RNDU:
 is_ceil = q_sign ^ 1;
 break;
+ case BF_RNDA:
+ is_ceil = TRUE;
+ break;
 case BF_DIVREM_EUCLIDIAN:
 is_ceil = a->sign;
 break;
- case BF_RNDNU:
- /* XXX: unsupported yet */
- abort();
 }
 
 a1->expn = a->expn;
@@ -1847,26 +1823,14 @@
 return BF_ST_MEM_ERROR;
 }
 
-int bf_fmod(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
- bf_flags_t flags)
+int bf_rem(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+ bf_flags_t flags, int rnd_mode)
 {
 bf_t q_s, *q = &q_s;
 int ret;
 
 bf_init(r->ctx, q);
- ret = bf_divrem(q, r, a, b, prec, flags, BF_RNDZ);
- bf_delete(q);
- return ret;
-}
-
-int bf_remainder(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
- bf_flags_t flags)
-{
- bf_t q_s, *q = &q_s;
- int ret;
- 
- bf_init(r->ctx, q);
- ret = bf_divrem(q, r, a, b, prec, flags, BF_RNDN);
+ ret = bf_divrem(q, r, a, b, prec, flags, rnd_mode);
 bf_delete(q);
 return ret;
 }
@@ -1881,13 +1845,13 @@
 }
 
 int bf_remquo(slimb_t *pq, bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
- bf_flags_t flags)
+ bf_flags_t flags, int rnd_mode)
 {
 bf_t q_s, *q = &q_s;
 int ret;
 
 bf_init(r->ctx, q);
- ret = bf_divrem(q, r, a, b, prec, flags, BF_RNDN);
+ ret = bf_divrem(q, r, a, b, prec, flags, rnd_mode);
 bf_get_limb(pq, q, BF_GET_INT_MOD);
 bf_delete(q);
 return ret;
@@ -2564,19 +2528,18 @@
 return BF_ST_MEM_ERROR;
 }
 
-/* The rounding mode is always BF_RNDZ. Return BF_ST_OVERFLOW if there
+/* The rounding mode is always BF_RNDZ. Return BF_ST_INVALID_OP if there
 is an overflow and 0 otherwise. */
 int bf_get_int32(int *pres, const bf_t *a, int flags)
 {
 uint32_t v;
 int ret;
 if (a->expn >= BF_EXP_INF) {
- ret = 0;
+ ret = BF_ST_INVALID_OP;
 if (flags & BF_GET_INT_MOD) {
 v = 0;
 } else if (a->expn == BF_EXP_INF) {
 v = (uint32_t)INT32_MAX + a->sign;
- /* XXX: return overflow ? */
 } else {
 v = INT32_MAX;
 }
@@ -2589,7 +2552,7 @@
 v = -v;
 ret = 0;
 } else if (!(flags & BF_GET_INT_MOD)) {
- ret = BF_ST_OVERFLOW;
+ ret = BF_ST_INVALID_OP;
 if (a->sign) {
 v = (uint32_t)INT32_MAX + 1;
 if (a->expn == 32 && 
@@ -2609,14 +2572,14 @@
 return ret;
 }
 
-/* The rounding mode is always BF_RNDZ. Return BF_ST_OVERFLOW if there
+/* The rounding mode is always BF_RNDZ. Return BF_ST_INVALID_OP if there
 is an overflow and 0 otherwise. */
 int bf_get_int64(int64_t *pres, const bf_t *a, int flags)
 {
 uint64_t v;
 int ret;
 if (a->expn >= BF_EXP_INF) {
- ret = 0;
+ ret = BF_ST_INVALID_OP;
 if (flags & BF_GET_INT_MOD) {
 v = 0;
 } else if (a->expn == BF_EXP_INF) {
@@ -2641,7 +2604,7 @@
 v = -v;
 ret = 0;
 } else if (!(flags & BF_GET_INT_MOD)) {
- ret = BF_ST_OVERFLOW;
+ ret = BF_ST_INVALID_OP;
 if (a->sign) {
 uint64_t v1;
 v = (uint64_t)INT64_MAX + 1;
@@ -2670,6 +2633,40 @@
 return ret;
 }
 
+/* The rounding mode is always BF_RNDZ. Return BF_ST_INVALID_OP if there
+ is an overflow and 0 otherwise. */
+int bf_get_uint64(uint64_t *pres, const bf_t *a)
+{
+ uint64_t v;
+ int ret;
+ if (a->expn == BF_EXP_NAN) {
+ goto overflow;
+ } else if (a->expn <= 0) {
+ v = 0;
+ ret = 0;
+ } else if (a->sign) {
+ v = 0;
+ ret = BF_ST_INVALID_OP;
+ } else if (a->expn <= 64) {
+#if LIMB_BITS == 32
+ if (a->expn <= 32)
+ v = a->tab[a->len - 1] >> (LIMB_BITS - a->expn);
+ else
+ v = (((uint64_t)a->tab[a->len - 1] << 32) |
+ get_limbz(a, a->len - 2)) >> (64 - a->expn);
+#else
+ v = a->tab[a->len - 1] >> (LIMB_BITS - a->expn);
+#endif
+ ret = 0;
+ } else {
+ overflow:
+ v = UINT64_MAX;
+ ret = BF_ST_INVALID_OP;
+ }
+ *pres = v;
+ return ret;
+}
+
 /* base conversion from radix */
 
 static const uint8_t digits_per_limb_table[BF_RADIX_MAX - 1] = {
@@ -2793,14 +2790,14 @@
 /* XXX: correct overflow/underflow handling */
 /* XXX: rigorous error analysis needed */
 extra_bits = ceil_log2(e) * 2 + 1;
- ret = bf_pow_ui_ui(B, radix, e, prec1 + extra_bits, BF_RNDN);
+ ret = bf_pow_ui_ui(B, radix, e, prec1 + extra_bits, BF_RNDN | BF_FLAG_EXT_EXP);
 overflow = !bf_is_finite(B);
 /* XXX: if bf_pow_ui_ui returns an exact result, can stop
 after the next operation */
 if (expn_sign)
- ret |= bf_div(r, T, B, prec1 + extra_bits, BF_RNDN);
+ ret |= bf_div(r, T, B, prec1 + extra_bits, BF_RNDN | BF_FLAG_EXT_EXP);
 else
- ret |= bf_mul(r, T, B, prec1 + extra_bits, BF_RNDN);
+ ret |= bf_mul(r, T, B, prec1 + extra_bits, BF_RNDN | BF_FLAG_EXT_EXP);
 if (ret & BF_ST_MEM_ERROR)
 break;
 if ((ret & BF_ST_INEXACT) &&
@@ -2809,6 +2806,8 @@
 /* and more precision and retry */
 ziv_extra_bits = ziv_extra_bits + (ziv_extra_bits / 2);
 } else {
+ /* XXX: need to use __bf_round() to pass the inexact
+ flag for the subnormal case */
 ret = bf_round(r, prec, flags) | (ret & BF_ST_INEXACT);
 break;
 }
@@ -3064,7 +3063,7 @@
 c = to_digit(*p);
 if (c >= 10)
 break;
- if (unlikely(expn > ((EXP_MAX - 2 - 9) / 10))) {
+ if (unlikely(expn > ((BF_RAW_EXP_MAX - 2 - 9) / 10))) {
 /* exponent overflow */
 if (exp_is_neg) {
 bf_set_zero(r, is_neg);
@@ -3371,12 +3370,14 @@
 }
 
 /* 'n' is the number of output limbs */
-static void bf_integer_to_radix_rec(bf_t *pow_tab,
- limb_t *out, const bf_t *a, limb_t n,
- int level, limb_t n0, limb_t radixl,
- unsigned int radixl_bits)
+static int bf_integer_to_radix_rec(bf_t *pow_tab,
+ limb_t *out, const bf_t *a, limb_t n,
+ int level, limb_t n0, limb_t radixl,
+ unsigned int radixl_bits)
 {
 limb_t n1, n2, q_prec;
+ int ret;
+ 
 assert(n >= 1);
 if (n == 1) {
 out[0] = get_bits(a->tab, a->len, a->len * LIMB_BITS - a->expn);
@@ -3403,63 +3404,81 @@
 n1 = n - n2;
 B = &pow_tab[2 * level];
 B_inv = &pow_tab[2 * level + 1];
+ ret = 0;
 if (B->len == 0) {
 /* compute BASE^n2 */
- bf_pow_ui_ui(B, radixl, n2, BF_PREC_INF, BF_RNDZ);
+ ret |= bf_pow_ui_ui(B, radixl, n2, BF_PREC_INF, BF_RNDZ);
 /* we use enough bits for the maximum possible 'n1' value,
 i.e. n2 + 1 */
- bf_set_ui(&R, 1);
- bf_div(B_inv, &R, B, (n2 + 1) * radixl_bits + 2, BF_RNDN);
+ ret |= bf_set_ui(&R, 1);
+ ret |= bf_div(B_inv, &R, B, (n2 + 1) * radixl_bits + 2, BF_RNDN);
 }
 // printf("%d: n1=% " PRId64 " n2=%" PRId64 "\n", level, n1, n2);
 q_prec = n1 * radixl_bits;
- bf_mul(&Q, a, B_inv, q_prec, BF_RNDN);
- bf_rint(&Q, BF_RNDZ);
+ ret |= bf_mul(&Q, a, B_inv, q_prec, BF_RNDN);
+ ret |= bf_rint(&Q, BF_RNDZ);
 
- bf_mul(&R, &Q, B, BF_PREC_INF, BF_RNDZ);
- bf_sub(&R, a, &R, BF_PREC_INF, BF_RNDZ);
+ ret |= bf_mul(&R, &Q, B, BF_PREC_INF, BF_RNDZ);
+ ret |= bf_sub(&R, a, &R, BF_PREC_INF, BF_RNDZ);
+
+ if (ret & BF_ST_MEM_ERROR)
+ goto fail;
 /* adjust if necessary */
 q_add = 0;
 while (R.sign && R.len != 0) {
- bf_add(&R, &R, B, BF_PREC_INF, BF_RNDZ);
+ if (bf_add(&R, &R, B, BF_PREC_INF, BF_RNDZ))
+ goto fail;
 q_add--;
 }
 while (bf_cmpu(&R, B) >= 0) {
- bf_sub(&R, &R, B, BF_PREC_INF, BF_RNDZ);
+ if (bf_sub(&R, &R, B, BF_PREC_INF, BF_RNDZ))
+ goto fail;
 q_add++;
 }
 if (q_add != 0) {
- bf_add_si(&Q, &Q, q_add, BF_PREC_INF, BF_RNDZ);
+ if (bf_add_si(&Q, &Q, q_add, BF_PREC_INF, BF_RNDZ))
+ goto fail;
+ }
+ if (bf_integer_to_radix_rec(pow_tab, out + n2, &Q, n1, level + 1, n0,
+ radixl, radixl_bits))
+ goto fail;
+ if (bf_integer_to_radix_rec(pow_tab, out, &R, n2, level + 1, n0,
+ radixl, radixl_bits)) {
+ fail:
+ bf_delete(&Q);
+ bf_delete(&R);
+ return -1;
 }
- bf_integer_to_radix_rec(pow_tab, out + n2, &Q, n1, level + 1, n0,
- radixl, radixl_bits);
- bf_integer_to_radix_rec(pow_tab, out, &R, n2, level + 1, n0,
- radixl, radixl_bits);
 bf_delete(&Q);
 bf_delete(&R);
 }
+ return 0;
 }
 
-static void bf_integer_to_radix(bf_t *r, const bf_t *a, limb_t radixl)
+/* return 0 if OK != 0 if memory error */
+static int bf_integer_to_radix(bf_t *r, const bf_t *a, limb_t radixl)
 {
 bf_context_t *s = r->ctx;
 limb_t r_len;
 bf_t *pow_tab;
- int i, pow_tab_len;
+ int i, pow_tab_len, ret;
 
 r_len = r->len;
 pow_tab_len = (ceil_log2(r_len) + 2) * 2; /* XXX: check */
 pow_tab = bf_malloc(s, sizeof(pow_tab[0]) * pow_tab_len);
+ if (!pow_tab)
+ return -1;
 for(i = 0; i < pow_tab_len; i++)
 bf_init(r->ctx, &pow_tab[i]);
 
- bf_integer_to_radix_rec(pow_tab, r->tab, a, r_len, 0, r_len, radixl,
- ceil_log2(radixl));
+ ret = bf_integer_to_radix_rec(pow_tab, r->tab, a, r_len, 0, r_len, radixl,
+ ceil_log2(radixl));
 
 for(i = 0; i < pow_tab_len; i++) {
 bf_delete(&pow_tab[i]);
 }
 bf_free(s, pow_tab);
+ return ret;
 }
 
 /* a must be >= 0. 'P' is the wanted number of digits in radix
@@ -3503,11 +3522,14 @@
 prec = prec0 + ziv_extra_bits;
 /* XXX: rigorous error analysis needed */
 extra_bits = ceil_log2(e) * 2 + 1;
- ret = bf_pow_ui_ui(r, radix, e, prec + extra_bits, BF_RNDN);
+ ret = bf_pow_ui_ui(r, radix, e, prec + extra_bits,
+ BF_RNDN | BF_FLAG_EXT_EXP);
 if (!e_sign)
- ret |= bf_mul(r, r, a, prec + extra_bits, BF_RNDN);
+ ret |= bf_mul(r, r, a, prec + extra_bits,
+ BF_RNDN | BF_FLAG_EXT_EXP);
 else
- ret |= bf_div(r, a, r, prec + extra_bits, BF_RNDN);
+ ret |= bf_div(r, a, r, prec + extra_bits,
+ BF_RNDN | BF_FLAG_EXT_EXP);
 if (ret & BF_ST_MEM_ERROR)
 return BF_ST_MEM_ERROR;
 /* if the result is not exact, check that it can be safely
@@ -3607,7 +3629,15 @@
 pos = a->len;
 pos_incr = 1;
 first_buf_pos = 0;
- } else if ((radix & (radix - 1)) != 0) {
+ } else if ((radix & (radix - 1)) == 0) {
+ a = (bf_t *)a1;
+ radix_bits = ceil_log2(radix);
+ digits_per_limb = LIMB_BITS / radix_bits;
+ pos_incr = digits_per_limb * radix_bits;
+ /* digits are aligned relative to the radix point */
+ pos = a->len * LIMB_BITS + smod(-a->expn, radix_bits);
+ first_buf_pos = 0;
+ } else {
 limb_t n, radixl;
 
 digits_per_limb = digits_per_limb_table[radix - 2];
@@ -3615,19 +3645,18 @@
 a = &a_s;
 bf_init(a1->ctx, a);
 n = (n_digits + digits_per_limb - 1) / digits_per_limb;
- bf_resize(a, n);
- bf_integer_to_radix(a, a1, radixl);
+ if (bf_resize(a, n)) {
+ dbuf_set_error(s);
+ goto done;
+ }
+ if (bf_integer_to_radix(a, a1, radixl)) {
+ dbuf_set_error(s);
+ goto done;
+ }
 radix_bits = 0;
 pos = n;
 pos_incr = 1;
 first_buf_pos = pos * digits_per_limb - n_digits;
- } else {
- a = (bf_t *)a1;
- radix_bits = ceil_log2(radix);
- digits_per_limb = LIMB_BITS / radix_bits;
- pos_incr = digits_per_limb * radix_bits;
- pos = a->len * LIMB_BITS - a->expn + n_digits * radix_bits;
- first_buf_pos = 0;
 }
 buf_pos = digits_per_limb;
 i = 0;
@@ -3656,6 +3685,7 @@
 buf_pos += l;
 i += l;
 }
+ done:
 if (a != a1)
 bf_delete(a);
 }
@@ -3670,12 +3700,13 @@
 static char *bf_ftoa_internal(size_t *plen, const bf_t *a2, int radix,
 limb_t prec, bf_flags_t flags, BOOL is_dec)
 {
+ bf_context_t *ctx = a2->ctx;
 DynBuf s_s, *s = &s_s;
 int radix_bits;
 
 // bf_print_str("ftoa", a2);
 // printf("radix=%d\n", radix);
- dbuf_init2(s, a2->ctx, bf_dbuf_realloc);
+ dbuf_init2(s, ctx, bf_dbuf_realloc);
 if (a2->expn == BF_EXP_NAN) {
 dbuf_putstr(s, "NaN");
 } else {
@@ -3689,77 +3720,160 @@
 } else {
 int fmt, ret;
 slimb_t n_digits, n, i, n_max, n1;
- bf_t a1_s, *a1;
- bf_t a_s, *a = &a_s;
+ bf_t a1_s, *a1 = &a1_s;
 
- /* make a positive number */
- a->tab = a2->tab;
- a->len = a2->len;
- a->expn = a2->expn;
- a->sign = 0;
- 
 if ((radix & (radix - 1)) != 0)
 radix_bits = 0;
 else
 radix_bits = ceil_log2(radix);
 
 fmt = flags & BF_FTOA_FORMAT_MASK;
- a1 = &a1_s;
- bf_init(a2->ctx, a1);
+ bf_init(ctx, a1);
 if (fmt == BF_FTOA_FORMAT_FRAC) {
- size_t pos, start;
- assert(!is_dec);
- /* one more digit for the rounding */
- n = 1 + bf_mul_log2_radix(bf_max(a->expn, 0), radix, TRUE, TRUE);
- n_digits = n + prec;
- n1 = n;
- if (bf_convert_to_radix(a1, &n1, a, radix, n_digits,
- flags & BF_RND_MASK, TRUE))
- goto fail1;
- start = s->size;
- output_digits(s, a1, radix, n_digits, n, is_dec);
- /* remove leading zeros because we allocated one more digit */
- pos = start;
- while ((pos + 1) < s->size && s->buf[pos] == '0' &&
- s->buf[pos + 1] != '.')
- pos++;
- if (pos > start) {
- memmove(s->buf + start, s->buf + pos, s->size - pos);
- s->size -= (pos - start);
+ if (is_dec || radix_bits != 0) {
+ if (bf_set(a1, a2))
+ goto fail1;
+#ifdef USE_BF_DEC
+ if (is_dec) {
+ if (bfdec_round((bfdec_t *)a1, prec, (flags & BF_RND_MASK) | BF_FLAG_RADPNT_PREC) & BF_ST_MEM_ERROR)
+ goto fail1;
+ n = a1->expn;
+ } else
+#endif
+ {
+ if (bf_round(a1, prec * radix_bits, (flags & BF_RND_MASK) | BF_FLAG_RADPNT_PREC) & BF_ST_MEM_ERROR)
+ goto fail1;
+ n = ceil_div(a1->expn, radix_bits);
+ }
+ if (flags & BF_FTOA_ADD_PREFIX) {
+ if (radix == 16)
+ dbuf_putstr(s, "0x");
+ else if (radix == 8)
+ dbuf_putstr(s, "0o");
+ else if (radix == 2)
+ dbuf_putstr(s, "0b");
+ }
+ if (a1->expn == BF_EXP_ZERO) {
+ dbuf_putstr(s, "0");
+ if (prec > 0) {
+ dbuf_putstr(s, ".");
+ for(i = 0; i < prec; i++) {
+ dbuf_putc(s, '0');
+ }
+ }
+ } else {
+ n_digits = prec + n;
+ if (n <= 0) {
+ /* 0.x */
+ dbuf_putstr(s, "0.");
+ for(i = 0; i < -n; i++) {
+ dbuf_putc(s, '0');
+ }
+ if (n_digits > 0) {
+ output_digits(s, a1, radix, n_digits, n_digits, is_dec);
+ }
+ } else {
+ output_digits(s, a1, radix, n_digits, n, is_dec);
+ }
+ }
+ } else {
+ size_t pos, start;
+ bf_t a_s, *a = &a_s;
+
+ /* make a positive number */
+ a->tab = a2->tab;
+ a->len = a2->len;
+ a->expn = a2->expn;
+ a->sign = 0;
+ 
+ /* one more digit for the rounding */
+ n = 1 + bf_mul_log2_radix(bf_max(a->expn, 0), radix, TRUE, TRUE);
+ n_digits = n + prec;
+ n1 = n;
+ if (bf_convert_to_radix(a1, &n1, a, radix, n_digits,
+ flags & BF_RND_MASK, TRUE))
+ goto fail1;
+ start = s->size;
+ output_digits(s, a1, radix, n_digits, n, is_dec);
+ /* remove leading zeros because we allocated one more digit */
+ pos = start;
+ while ((pos + 1) < s->size && s->buf[pos] == '0' &&
+ s->buf[pos + 1] != '.')
+ pos++;
+ if (pos > start) {
+ memmove(s->buf + start, s->buf + pos, s->size - pos);
+ s->size -= (pos - start);
+ }
 }
 } else {
 #ifdef USE_BF_DEC
 if (is_dec) {
+ if (bf_set(a1, a2))
+ goto fail1;
 if (fmt == BF_FTOA_FORMAT_FIXED) {
 n_digits = prec;
 n_max = n_digits;
+ if (bfdec_round((bfdec_t *)a1, prec, (flags & BF_RND_MASK)) & BF_ST_MEM_ERROR)
+ goto fail1;
 } else {
 /* prec is ignored */
- prec = n_digits = a->len * LIMB_DIGITS;
- /* remove trailing zero digits */
+ prec = n_digits = a1->len * LIMB_DIGITS;
+ /* remove the trailing zero digits */
 while (n_digits > 1 &&
- get_digit(a->tab, a->len, prec - n_digits) == 0) {
+ get_digit(a1->tab, a1->len, prec - n_digits) == 0) {
 n_digits--;
 }
 n_max = n_digits + 4;
 }
- bf_init(a2->ctx, a1);
- bf_set(a1, a);
 n = a1->expn;
 } else
 #endif
- {
+ if (radix_bits != 0) {
+ if (bf_set(a1, a2))
+ goto fail1;
+ if (fmt == BF_FTOA_FORMAT_FIXED) {
+ slimb_t prec_bits;
+ n_digits = prec;
+ n_max = n_digits;
+ /* align to the radix point */
+ prec_bits = prec * radix_bits -
+ smod(-a1->expn, radix_bits);
+ if (bf_round(a1, prec_bits,
+ (flags & BF_RND_MASK)) & BF_ST_MEM_ERROR)
+ goto fail1;
+ } else {
+ limb_t digit_mask;
+ slimb_t pos;
+ /* position of the digit before the most
+ significant digit in bits */
+ pos = a1->len * LIMB_BITS +
+ smod(-a1->expn, radix_bits);
+ n_digits = ceil_div(pos, radix_bits);
+ /* remove the trailing zero digits */
+ digit_mask = ((limb_t)1 << radix_bits) - 1;
+ while (n_digits > 1 &&
+ (get_bits(a1->tab, a1->len, pos - n_digits * radix_bits) & digit_mask) == 0) {
+ n_digits--;
+ }
+ n_max = n_digits + 4;
+ }
+ n = ceil_div(a1->expn, radix_bits);
+ } else {
+ bf_t a_s, *a = &a_s;
+ 
+ /* make a positive number */
+ a->tab = a2->tab;
+ a->len = a2->len;
+ a->expn = a2->expn;
+ a->sign = 0;
+ 
 if (fmt == BF_FTOA_FORMAT_FIXED) {
 n_digits = prec;
 n_max = n_digits;
 } else {
 slimb_t n_digits_max, n_digits_min;
 
- if (prec == BF_PREC_INF) {
- assert(radix_bits != 0);
- /* XXX: could use the exact number of bits */
- prec = a->len * LIMB_BITS;
- }
+ assert(prec != BF_PREC_INF);
 n_digits = 1 + bf_mul_log2_radix(prec, radix, TRUE, TRUE);
 /* max number of digits for non exponential
 notation. The rational is to have the same rule
@@ -3773,7 +3887,7 @@
 /* XXX: inefficient */
 n_digits_max = n_digits;
 n_digits_min = 1;
- bf_init(a2->ctx, b);
+ bf_init(ctx, b);
 while (n_digits_min < n_digits_max) {
 n_digits = (n_digits_min + n_digits_max) / 2;
 if (bf_convert_to_radix(a1, &n, a, radix, n_digits,
@@ -3871,7 +3985,7 @@
 *plen = s->size - 1;
 return (char *)s->buf;
 fail:
- bf_free(a2->ctx, s->buf);
+ bf_free(ctx, s->buf);
 if (plen)
 *plen = 0;
 return NULL;
@@ -4037,7 +4151,7 @@
 
 static int bf_const_get(bf_t *T, limb_t prec, bf_flags_t flags,
 BFConstCache *c,
- void (*func)(bf_t *res, limb_t prec))
+ void (*func)(bf_t *res, limb_t prec), int sign)
 {
 limb_t ziv_extra_bits, prec1;
 
@@ -4053,6 +4167,7 @@
 prec1 = c->prec;
 }
 bf_set(T, &c->val);
+ T->sign = sign;
 if (!bf_can_round(T, prec, flags & BF_RND_MASK, prec1)) {
 /* and more precision and retry */
 ziv_extra_bits = ziv_extra_bits + (ziv_extra_bits / 2);
@@ -4072,13 +4187,20 @@
 int bf_const_log2(bf_t *T, limb_t prec, bf_flags_t flags)
 {
 bf_context_t *s = T->ctx;
- return bf_const_get(T, prec, flags, &s->log2_cache, bf_const_log2_internal);
+ return bf_const_get(T, prec, flags, &s->log2_cache, bf_const_log2_internal, 0);
 }
 
-int bf_const_pi(bf_t *T, limb_t prec, bf_flags_t flags)
+/* return rounded pi * (1 - 2 * sign) */
+static int bf_const_pi_signed(bf_t *T, int sign, limb_t prec, bf_flags_t flags)
 {
 bf_context_t *s = T->ctx;
- return bf_const_get(T, prec, flags, &s->pi_cache, bf_const_pi_internal);
+ return bf_const_get(T, prec, flags, &s->pi_cache, bf_const_pi_internal,
+ sign);
+}
+
+int bf_const_pi(bf_t *T, limb_t prec, bf_flags_t flags)
+{
+ return bf_const_pi_signed(T, 0, prec, flags);
 }
 
 void bf_clear_cache(bf_context_t *s)
@@ -4128,9 +4250,29 @@
 break;
 }
 ziv_extra_bits = ziv_extra_bits * 2;
+ // printf("ziv_extra_bits=%" PRId64 "\n", (int64_t)ziv_extra_bits);
 }
 }
- return bf_round(r, prec, flags) | ret;
+ if (r->len == 0)
+ return ret;
+ else
+ return __bf_round(r, prec, flags, r->len, ret);
+}
+
+/* add (1 - 2*e_sign) * 2^e */
+static int bf_add_epsilon(bf_t *r, const bf_t *a, slimb_t e, int e_sign,
+ limb_t prec, int flags)
+{
+ bf_t T_s, *T = &T_s;
+ int ret;
+ /* small argument case: result = 1 + epsilon * sign(x) */
+ bf_init(a->ctx, T);
+ bf_set_ui(T, 1);
+ T->sign = e_sign;
+ T->expn += e;
+ ret = bf_add(r, r, T, prec, flags);
+ bf_delete(T);
+ return ret;
 }
 
 /* Compute the exponential using faithful rounding at precision 'prec'.
@@ -4195,18 +4337,70 @@
 
 /* undo the range reduction */
 for(i = 0; i < K; i++) {
- bf_mul(r, r, r, prec1, BF_RNDN);
+ bf_mul(r, r, r, prec1, BF_RNDN | BF_FLAG_EXT_EXP);
 }
 
 /* undo the argument reduction */
- bf_mul_2exp(r, n, BF_PREC_INF, BF_RNDZ);
+ bf_mul_2exp(r, n, BF_PREC_INF, BF_RNDZ | BF_FLAG_EXT_EXP);
 
 return BF_ST_INEXACT;
 }
 
+/* crude overflow and underflow tests for exp(a). a_low <= a <= a_high */
+static int check_exp_underflow_overflow(bf_context_t *s, bf_t *r,
+ const bf_t *a_low, const bf_t *a_high,
+ limb_t prec, bf_flags_t flags)
+{
+ bf_t T_s, *T = &T_s;
+ bf_t log2_s, *log2 = &log2_s;
+ slimb_t e_min, e_max;
+ 
+ if (a_high->expn <= 0)
+ return 0;
+
+ e_max = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
+ e_min = -e_max + 3;
+ if (flags & BF_FLAG_SUBNORMAL)
+ e_min -= (prec - 1);
+ 
+ bf_init(s, T);
+ bf_init(s, log2);
+ bf_const_log2(log2, LIMB_BITS, BF_RNDU);
+ bf_mul_ui(T, log2, e_max, LIMB_BITS, BF_RNDU);
+ /* a_low > e_max * log(2) implies exp(a) > e_max */
+ if (bf_cmp_lt(T, a_low) > 0) {
+ /* overflow */
+ bf_delete(T);
+ bf_delete(log2);
+ return bf_set_overflow(r, 0, prec, flags);
+ }
+ /* a_high < (e_min - 2) * log(2) implies exp(a) < (e_min - 2) */
+ bf_const_log2(log2, LIMB_BITS, BF_RNDD);
+ bf_mul_si(T, log2, e_min - 2, LIMB_BITS, BF_RNDD);
+ if (bf_cmp_lt(a_high, T)) {
+ int rnd_mode = flags & BF_RND_MASK;
+ 
+ /* underflow */
+ bf_delete(T);
+ bf_delete(log2);
+ if (rnd_mode == BF_RNDU) {
+ /* set the smallest value */
+ bf_set_ui(r, 1);
+ r->expn = e_min;
+ } else {
+ bf_set_zero(r, 0);
+ }
+ return BF_ST_UNDERFLOW | BF_ST_INEXACT;
+ }
+ bf_delete(log2);
+ bf_delete(T);
+ return 0;
+}
+
 int bf_exp(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
 {
 bf_context_t *s = r->ctx;
+ int ret;
 assert(r != a);
 if (a->len == 0) {
 if (a->expn == BF_EXP_NAN) {
@@ -4222,48 +4416,15 @@
 return 0;
 }
 
- /* crude overflow and underflow tests */
- if (a->expn > 0) {
- bf_t T_s, *T = &T_s;
- bf_t log2_s, *log2 = &log2_s;
- slimb_t e_min, e_max;
- e_max = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
- e_min = -e_max + 3;
- if (flags & BF_FLAG_SUBNORMAL)
- e_min -= (prec - 1);
-
- bf_init(s, T);
- bf_init(s, log2);
- bf_const_log2(log2, LIMB_BITS, BF_RNDU);
- bf_mul_ui(T, log2, e_max, LIMB_BITS, BF_RNDU);
- /* a > e_max * log(2) implies exp(a) > e_max */
- if (bf_cmp_lt(T, a) > 0) {
- /* overflow */
- bf_delete(T);
- bf_delete(log2);
- return bf_set_overflow(r, 0, prec, flags);
- }
- /* a < e_min * log(2) implies exp(a) < e_min */
- bf_mul_si(T, log2, e_min, LIMB_BITS, BF_RNDD);
- if (bf_cmp_lt(a, T)) {
- int rnd_mode = flags & BF_RND_MASK;
-
- /* underflow */
- bf_delete(T);
- bf_delete(log2);
- if (rnd_mode == BF_RNDU) {
- /* set the smallest value */
- bf_set_ui(r, 1);
- r->expn = e_min;
- } else {
- bf_set_zero(r, 0);
- }
- return BF_ST_UNDERFLOW | BF_ST_INEXACT;
- }
- bf_delete(log2);
- bf_delete(T);
+ ret = check_exp_underflow_overflow(s, r, a, a, prec, flags);
+ if (ret)
+ return ret;
+ if (a->expn < 0 && (-a->expn) >= (prec + 2)) { 
+ /* small argument case: result = 1 + epsilon * sign(x) */
+ bf_set_ui(r, 1);
+ return bf_add_epsilon(r, r, -(prec + 2), a->sign, prec, flags);
 }
-
+ 
 return bf_ziv_rounding(r, a, prec, flags, bf_exp_internal, NULL);
 }
 
@@ -4406,7 +4567,6 @@
 }
 
 /* x and y finite and x > 0 */
-/* XXX: overflow/underflow handling */
 static int bf_pow_generic(bf_t *r, const bf_t *x, limb_t prec, void *opaque)
 {
 bf_context_t *s = r->ctx;
@@ -4417,15 +4577,17 @@
 bf_init(s, T);
 /* XXX: proof for the added precision */
 prec1 = prec + 32;
- bf_log(T, x, prec1, BF_RNDF);
- bf_mul(T, T, y, prec1, BF_RNDF);
- bf_exp(r, T, prec1, BF_RNDF);
+ bf_log(T, x, prec1, BF_RNDF | BF_FLAG_EXT_EXP);
+ bf_mul(T, T, y, prec1, BF_RNDF | BF_FLAG_EXT_EXP);
+ if (bf_is_nan(T))
+ bf_set_nan(r);
+ else
+ bf_exp_internal(r, T, prec1, NULL); /* no overflow/underlow test needed */
 bf_delete(T);
 return BF_ST_INEXACT;
 }
 
 /* x and y finite, x > 0, y integer and y fits on one limb */
-/* XXX: overflow/underflow handling */ 
 static int bf_pow_int(bf_t *r, const bf_t *x, limb_t prec, void *opaque)
 {
 bf_context_t *s = r->ctx;
@@ -4440,11 +4602,11 @@
 y1 = -y1;
 /* XXX: proof for the added precision */
 prec1 = prec + ceil_log2(y1) * 2 + 8;
- ret = bf_pow_ui(r, x, y1 < 0 ? -y1 : y1, prec1, BF_RNDN);
+ ret = bf_pow_ui(r, x, y1 < 0 ? -y1 : y1, prec1, BF_RNDN | BF_FLAG_EXT_EXP);
 if (y->sign) {
 bf_init(s, T);
 bf_set_ui(T, 1);
- ret |= bf_div(r, T, r, prec1, BF_RNDN);
+ ret |= bf_div(r, T, r, prec1, BF_RNDN | BF_FLAG_EXT_EXP);
 bf_delete(T);
 }
 return ret;
@@ -4510,7 +4672,7 @@
 int cmp_x_abs_1;
 bf_set_ui(r, 1);
 cmp_x_abs_1 = bf_cmpu(x, r);
- if (cmp_x_abs_1 == 0 && (flags & BF_POW_JS_QUICKS) &&
+ if (cmp_x_abs_1 == 0 && (flags & BF_POW_JS_QUIRKS) &&
 (y->expn >= BF_EXP_INF)) {
 bf_set_nan(r);
 } else if (cmp_x_abs_1 == 0 &&
@@ -4567,70 +4729,95 @@
 if (bf_cmp_eq(T, r)) {
 /* abs(x) = 1: nothing more to do */
 ret = 0;
- } else if (y_is_int) {
- slimb_t T_bits, e;
- int_pow:
- T_bits = T->expn - bf_get_exp_min(T);
- if (T_bits == 1) {
- /* pow(2^b, y) = 2^(b*y) */
- bf_mul_si(T, y, T->expn - 1, LIMB_BITS, BF_RNDZ);
- bf_get_limb(&e, T, 0);
- bf_set_ui(r, 1);
- ret = bf_mul_2exp(r, e, prec, flags);
- } else if (prec == BF_PREC_INF) {
- slimb_t y1;
- /* specific case for infinite precision (integer case) */
- bf_get_limb(&y1, y, 0);
- assert(!y->sign);
- /* x must be an integer, so abs(x) >= 2 */
- if (y1 >= ((slimb_t)1 << BF_EXP_BITS_MAX)) {
- bf_delete(T);
- return bf_set_overflow(r, 0, BF_PREC_INF, flags);
- }
- ret = bf_pow_ui(r, T, y1, BF_PREC_INF, BF_RNDZ);
- } else {
- if (y->expn <= 31) {
- /* small enough power: use exponentiation in all cases */
- } else if (y->sign) {
- /* cannot be exact */
- goto general_case;
+ } else {
+ /* check the overflow/underflow cases */
+ {
+ bf_t al_s, *al = &al_s;
+ bf_t ah_s, *ah = &ah_s;
+ limb_t precl = LIMB_BITS;
+ 
+ bf_init(s, al);
+ bf_init(s, ah);
+ /* compute bounds of log(abs(x)) * y with a low precision */
+ /* XXX: compute bf_log() once */
+ /* XXX: add a fast test before this slow test */
+ bf_log(al, T, precl, BF_RNDD);
+ bf_log(ah, T, precl, BF_RNDU);
+ bf_mul(al, al, y, precl, BF_RNDD ^ y->sign);
+ bf_mul(ah, ah, y, precl, BF_RNDU ^ y->sign);
+ ret = check_exp_underflow_overflow(s, r, al, ah, prec, flags);
+ bf_delete(al);
+ bf_delete(ah);
+ if (ret)
+ goto done;
+ }
+ 
+ if (y_is_int) {
+ slimb_t T_bits, e;
+ int_pow:
+ T_bits = T->expn - bf_get_exp_min(T);
+ if (T_bits == 1) {
+ /* pow(2^b, y) = 2^(b*y) */
+ bf_mul_si(T, y, T->expn - 1, LIMB_BITS, BF_RNDZ);
+ bf_get_limb(&e, T, 0);
+ bf_set_ui(r, 1);
+ ret = bf_mul_2exp(r, e, prec, flags);
+ } else if (prec == BF_PREC_INF) {
+ slimb_t y1;
+ /* specific case for infinite precision (integer case) */
+ bf_get_limb(&y1, y, 0);
+ assert(!y->sign);
+ /* x must be an integer, so abs(x) >= 2 */
+ if (y1 >= ((slimb_t)1 << BF_EXP_BITS_MAX)) {
+ bf_delete(T);
+ return bf_set_overflow(r, 0, BF_PREC_INF, flags);
+ }
+ ret = bf_pow_ui(r, T, y1, BF_PREC_INF, BF_RNDZ);
 } else {
- if (rnd_mode == BF_RNDF)
- goto general_case; /* no need to track exact results */
- /* see if the result has a chance to be exact:
- if x=a*2^b (a odd), x^y=a^y*2^(b*y)
- x^y needs a precision of at least floor_log2(a)*y bits
- */
- bf_mul_si(r, y, T_bits - 1, LIMB_BITS, BF_RNDZ);
- bf_get_limb(&e, r, 0);
- if (prec < e)
+ if (y->expn <= 31) {
+ /* small enough power: use exponentiation in all cases */
+ } else if (y->sign) {
+ /* cannot be exact */
 goto general_case;
+ } else {
+ if (rnd_mode == BF_RNDF)
+ goto general_case; /* no need to track exact results */
+ /* see if the result has a chance to be exact:
+ if x=a*2^b (a odd), x^y=a^y*2^(b*y)
+ x^y needs a precision of at least floor_log2(a)*y bits
+ */
+ bf_mul_si(r, y, T_bits - 1, LIMB_BITS, BF_RNDZ);
+ bf_get_limb(&e, r, 0);
+ if (prec < e)
+ goto general_case;
+ }
+ ret = bf_ziv_rounding(r, T, prec, flags, bf_pow_int, (void *)y);
 }
- ret = bf_ziv_rounding(r, T, prec, flags, bf_pow_int, (void *)y);
- }
- } else {
- if (rnd_mode != BF_RNDF) {
- bf_t *y1;
- if (y_emin < 0 && check_exact_power2n(r, T, -y_emin)) {
- /* the problem is reduced to a power to an integer */
+ } else {
+ if (rnd_mode != BF_RNDF) {
+ bf_t *y1;
+ if (y_emin < 0 && check_exact_power2n(r, T, -y_emin)) {
+ /* the problem is reduced to a power to an integer */
 #if 0
- printf("\nn=%ld\n", -y_emin);
- bf_print_str("T", T);
- bf_print_str("r", r);
-#endif
- bf_set(T, r);
- y1 = &ytmp_s;
- y1->tab = y->tab;
- y1->len = y->len;
- y1->sign = y->sign;
- y1->expn = y->expn - y_emin;
- y = y1;
- goto int_pow;
+ printf("\nn=%" PRId64 "\n", -(int64_t)y_emin);
+ bf_print_str("T", T);
+ bf_print_str("r", r);
+#endif
+ bf_set(T, r);
+ y1 = &ytmp_s;
+ y1->tab = y->tab;
+ y1->len = y->len;
+ y1->sign = y->sign;
+ y1->expn = y->expn - y_emin;
+ y = y1;
+ goto int_pow;
+ }
 }
+ general_case:
+ ret = bf_ziv_rounding(r, T, prec, flags, bf_pow_generic, (void *)y);
 }
- general_case:
- ret = bf_ziv_rounding(r, T, prec, flags, bf_pow_generic, (void *)y);
 }
+ done:
 bf_delete(T);
 r->sign = r_sign;
 return ret;
@@ -4651,7 +4838,7 @@
 bf_delete(T);
 }
 
-int bf_sincos(bf_t *s, bf_t *c, const bf_t *a, limb_t prec)
+static int bf_sincos(bf_t *s, bf_t *c, const bf_t *a, limb_t prec)
 {
 bf_context_t *s1 = a->ctx;
 bf_t T_s, *T = &T_s;
@@ -4661,27 +4848,6 @@
 int is_neg;
 
 assert(c != a && s != a);
- if (a->len == 0) {
- if (a->expn == BF_EXP_NAN) {
- if (c)
- bf_set_nan(c);
- if (s)
- bf_set_nan(s);
- return 0;
- } else if (a->expn == BF_EXP_INF) {
- if (c)
- bf_set_nan(c);
- if (s)
- bf_set_nan(s);
- return BF_ST_INVALID_OP;
- } else {
- if (c)
- bf_set_ui(c, 1);
- if (s)
- bf_set_zero(s, a->sign);
- return 0;
- }
- }
 
 bf_init(s1, T);
 bf_init(s1, U);
@@ -4701,10 +4867,10 @@
 slimb_t cancel;
 cancel = 0;
 for(;;) {
- prec2 = prec1 + cancel;
+ prec2 = prec1 + a->expn + cancel;
 bf_const_pi(U, prec2, BF_RNDF);
 bf_mul_2exp(U, -1, BF_PREC_INF, BF_RNDZ);
- bf_remquo(&mod, T, a, U, prec2, BF_RNDN);
+ bf_remquo(&mod, T, a, U, prec2, BF_RNDN, BF_RNDN);
 // printf("T.expn=%ld prec2=%ld\n", T->expn, prec2);
 if (mod == 0 || (T->expn != BF_EXP_ZERO &&
 (T->expn + prec2) >= (prec1 - 1)))
@@ -4776,6 +4942,30 @@
 
 int bf_cos(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
 {
+ if (a->len == 0) {
+ if (a->expn == BF_EXP_NAN) {
+ bf_set_nan(r);
+ return 0;
+ } else if (a->expn == BF_EXP_INF) {
+ bf_set_nan(r);
+ return BF_ST_INVALID_OP;
+ } else {
+ bf_set_ui(r, 1);
+ return 0;
+ }
+ }
+
+ /* small argument case: result = 1+r(x) with r(x) = -x^2/2 +
+ O(X^4). We assume r(x) < 2^(2*EXP(x) - 1). */
+ if (a->expn < 0) {
+ slimb_t e;
+ e = 2 * a->expn - 1;
+ if (e < -(prec + 2)) {
+ bf_set_ui(r, 1);
+ return bf_add_epsilon(r, r, e, 1, prec, flags);
+ }
+ }
+ 
 return bf_ziv_rounding(r, a, prec, flags, bf_cos_internal, NULL);
 }
 
@@ -4786,15 +4976,6 @@
 
 int bf_sin(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
 {
- return bf_ziv_rounding(r, a, prec, flags, bf_sin_internal, NULL);
-}
-
-static int bf_tan_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
-{
- bf_context_t *s = r->ctx;
- bf_t T_s, *T = &T_s;
- limb_t prec1;
- 
 if (a->len == 0) {
 if (a->expn == BF_EXP_NAN) {
 bf_set_nan(r);
@@ -4808,6 +4989,26 @@
 }
 }
 
+ /* small argument case: result = x+r(x) with r(x) = -x^3/6 +
+ O(X^5). We assume r(x) < 2^(3*EXP(x) - 2). */
+ if (a->expn < 0) {
+ slimb_t e;
+ e = sat_add(2 * a->expn, a->expn - 2);
+ if (e < a->expn - bf_max(prec + 2, a->len * LIMB_BITS + 2)) {
+ bf_set(r, a);
+ return bf_add_epsilon(r, r, e, 1 - a->sign, prec, flags);
+ }
+ }
+
+ return bf_ziv_rounding(r, a, prec, flags, bf_sin_internal, NULL);
+}
+
+static int bf_tan_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+ bf_context_t *s = r->ctx;
+ bf_t T_s, *T = &T_s;
+ limb_t prec1;
+ 
 /* XXX: precision analysis */
 prec1 = prec + 8;
 bf_init(s, T);
@@ -4819,6 +5020,31 @@
 
 int bf_tan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
 {
+ assert(r != a);
+ if (a->len == 0) {
+ if (a->expn == BF_EXP_NAN) {
+ bf_set_nan(r);
+ return 0;
+ } else if (a->expn == BF_EXP_INF) {
+ bf_set_nan(r);
+ return BF_ST_INVALID_OP;
+ } else {
+ bf_set_zero(r, a->sign);
+ return 0;
+ }
+ }
+
+ /* small argument case: result = x+r(x) with r(x) = x^3/3 +
+ O(X^5). We assume r(x) < 2^(3*EXP(x) - 1). */
+ if (a->expn < 0) {
+ slimb_t e;
+ e = sat_add(2 * a->expn, a->expn - 1);
+ if (e < a->expn - bf_max(prec + 2, a->len * LIMB_BITS + 2)) {
+ bf_set(r, a);
+ return bf_add_epsilon(r, r, e, a->sign, prec, flags);
+ }
+ }
+ 
 return bf_ziv_rounding(r, a, prec, flags, bf_tan_internal, NULL);
 }
 
@@ -4836,50 +5062,15 @@
 int cmp_1;
 slimb_t prec1, i, K, l;
 
- if (a->len == 0) {
- if (a->expn == BF_EXP_NAN) {
- bf_set_nan(r);
- return 0;
- } else {
- if (a->expn == BF_EXP_INF)
- i = 1 - 2 * a->sign;
- else
- i = 0;
- i += add_pi2;
- /* return i*(pi/2) with -1 <= i <= 2 */
- if (i == 0) {
- bf_set_zero(r, add_pi2 ? 0 : a->sign);
- return 0;
- } else {
- /* PI or PI/2 */
- bf_const_pi(r, prec, BF_RNDF);
- if (i != 2)
- bf_mul_2exp(r, -1, BF_PREC_INF, BF_RNDZ);
- r->sign = (i < 0);
- return BF_ST_INEXACT;
- }
- }
- }
- 
- bf_init(s, T);
- bf_set_ui(T, 1);
- cmp_1 = bf_cmpu(a, T);
- if (cmp_1 == 0 && !add_pi2) {
- /* short cut: abs(a) == 1 -> +/-pi/4 */
- bf_const_pi(r, prec, BF_RNDF);
- bf_mul_2exp(r, -2, BF_PREC_INF, BF_RNDZ);
- r->sign = a->sign;
- bf_delete(T);
- return BF_ST_INEXACT;
- }
-
 /* XXX: precision analysis */
 K = bf_isqrt((prec + 1) / 2);
 l = prec / (2 * K) + 1;
 prec1 = prec + K + 2 * l + 32;
- // printf("prec=%ld K=%ld l=%ld prec1=%ld\n", prec, K, l, prec1);
+ // printf("prec=%d K=%d l=%d prec1=%d\n", (int)prec, (int)K, (int)l, (int)prec1);
 
- if (cmp_1 > 0) {
+ bf_init(s, T);
+ cmp_1 = (a->expn >= 1); /* a >= 1 */
+ if (cmp_1) {
 bf_set_ui(T, 1);
 bf_div(T, T, a, prec1, BF_RNDN);
 } else {
@@ -4947,6 +5138,47 @@
 
 int bf_atan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
 {
+ bf_context_t *s = r->ctx;
+ bf_t T_s, *T = &T_s;
+ int res;
+ 
+ if (a->len == 0) {
+ if (a->expn == BF_EXP_NAN) {
+ bf_set_nan(r);
+ return 0;
+ } else if (a->expn == BF_EXP_INF) {
+ /* -PI/2 or PI/2 */
+ bf_const_pi_signed(r, a->sign, prec, flags);
+ bf_mul_2exp(r, -1, BF_PREC_INF, BF_RNDZ);
+ return BF_ST_INEXACT;
+ } else {
+ bf_set_zero(r, a->sign);
+ return 0;
+ }
+ }
+ 
+ bf_init(s, T);
+ bf_set_ui(T, 1);
+ res = bf_cmpu(a, T);
+ bf_delete(T);
+ if (res == 0) {
+ /* short cut: abs(a) == 1 -> +/-pi/4 */
+ bf_const_pi_signed(r, a->sign, prec, flags);
+ bf_mul_2exp(r, -2, BF_PREC_INF, BF_RNDZ);
+ return BF_ST_INEXACT;
+ }
+
+ /* small argument case: result = x+r(x) with r(x) = -x^3/3 +
+ O(X^5). We assume r(x) < 2^(3*EXP(x) - 1). */
+ if (a->expn < 0) {
+ slimb_t e;
+ e = sat_add(2 * a->expn, a->expn - 1);
+ if (e < a->expn - bf_max(prec + 2, a->len * LIMB_BITS + 2)) {
+ bf_set(r, a);
+ return bf_add_epsilon(r, r, e, 1 - a->sign, prec, flags);
+ }
+ }
+ 
 return bf_ziv_rounding(r, a, prec, flags, bf_atan_internal, (void *)FALSE);
 }
 
@@ -5000,38 +5232,6 @@
 BOOL is_acos = (BOOL)(intptr_t)opaque;
 bf_t T_s, *T = &T_s;
 limb_t prec1, prec2;
- int res;
- 
- if (a->len == 0) {
- if (a->expn == BF_EXP_NAN) {
- bf_set_nan(r);
- return 0;
- } else if (a->expn == BF_EXP_INF) {
- bf_set_nan(r);
- return BF_ST_INVALID_OP;
- } else {
- if (is_acos) {
- bf_const_pi(r, prec, BF_RNDF);
- bf_mul_2exp(r, -1, BF_PREC_INF, BF_RNDZ);
- return BF_ST_INEXACT;
- } else {
- bf_set_zero(r, a->sign);
- return 0;
- }
- }
- }
- bf_init(s, T);
- bf_set_ui(T, 1);
- res = bf_cmpu(a, T);
- if (res > 0) {
- bf_delete(T);
- bf_set_nan(r);
- return BF_ST_INVALID_OP;
- } else if (res == 0 && a->sign == 0 && is_acos) {
- bf_set_zero(r, 0);
- bf_delete(T);
- return 0;
- }
 
 /* asin(x) = atan(x/sqrt(1-x^2)) 
 acos(x) = pi/2 - asin(x) */
@@ -5043,6 +5243,7 @@
 prec2 = BF_PREC_INF;
 else
 prec2 = prec1;
+ bf_init(s, T);
 bf_mul(T, a, a, prec2, BF_RNDN);
 bf_neg(T);
 bf_add_si(T, T, 1, prec2, BF_RNDN);
@@ -5058,11 +5259,76 @@
 
 int bf_asin(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
 {
+ bf_context_t *s = r->ctx;
+ bf_t T_s, *T = &T_s;
+ int res;
+
+ if (a->len == 0) {
+ if (a->expn == BF_EXP_NAN) {
+ bf_set_nan(r);
+ return 0;
+ } else if (a->expn == BF_EXP_INF) {
+ bf_set_nan(r);
+ return BF_ST_INVALID_OP;
+ } else {
+ bf_set_zero(r, a->sign);
+ return 0;
+ }
+ }
+ bf_init(s, T);
+ bf_set_ui(T, 1);
+ res = bf_cmpu(a, T);
+ bf_delete(T);
+ if (res > 0) {
+ bf_set_nan(r);
+ return BF_ST_INVALID_OP;
+ }
+ 
+ /* small argument case: result = x+r(x) with r(x) = x^3/6 +
+ O(X^5). We assume r(x) < 2^(3*EXP(x) - 2). */
+ if (a->expn < 0) {
+ slimb_t e;
+ e = sat_add(2 * a->expn, a->expn - 2);
+ if (e < a->expn - bf_max(prec + 2, a->len * LIMB_BITS + 2)) {
+ bf_set(r, a);
+ return bf_add_epsilon(r, r, e, a->sign, prec, flags);
+ }
+ }
+
 return bf_ziv_rounding(r, a, prec, flags, bf_asin_internal, (void *)FALSE);
 }
 
 int bf_acos(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
 {
+ bf_context_t *s = r->ctx;
+ bf_t T_s, *T = &T_s;
+ int res;
+
+ if (a->len == 0) {
+ if (a->expn == BF_EXP_NAN) {
+ bf_set_nan(r);
+ return 0;
+ } else if (a->expn == BF_EXP_INF) {
+ bf_set_nan(r);
+ return BF_ST_INVALID_OP;
+ } else {
+ bf_const_pi(r, prec, flags);
+ bf_mul_2exp(r, -1, BF_PREC_INF, BF_RNDZ);
+ return BF_ST_INEXACT;
+ }
+ }
+ bf_init(s, T);
+ bf_set_ui(T, 1);
+ res = bf_cmpu(a, T);
+ bf_delete(T);
+ if (res > 0) {
+ bf_set_nan(r);
+ return BF_ST_INVALID_OP;
+ } else if (res == 0 && a->sign == 0) {
+ bf_set_zero(r, 0);
+ return 0;
+ }
+ 
 return bf_ziv_rounding(r, a, prec, flags, bf_asin_internal, (void *)TRUE);
 }
 
@@ -5126,16 +5392,14 @@
 
 #endif /* LIMB_BITS != 64 */
 
-#if 0 //unused
-static inline limb_t shrd(limb_t low, limb_t high, long shift)
+static inline __maybe_unused limb_t shrd(limb_t low, limb_t high, long shift)
 {
 if (shift != 0)
 low = (low >> shift) | (high << (LIMB_BITS - shift));
 return low;
 }
-#endif
 
-static inline limb_t shld(limb_t a1, limb_t a0, long shift)
+static inline __maybe_unused limb_t shld(limb_t a1, limb_t a0, long shift)
 {
 if (shift != 0)
 return (a1 << shift) | (a0 >> (LIMB_BITS - shift));
@@ -5189,21 +5453,18 @@
 /* fast integer division by a fixed constant */
 
 typedef struct FastDivData {
- limb_t d; /* divisor (only user visible field) */
 limb_t m1; /* multiplier */
- int shift1;
- int shift2;
+ int8_t shift1;
+ int8_t shift2;
 } FastDivData;
 
-#if 1
 /* From "Division by Invariant Integers using Multiplication" by
 Torborn Granlund and Peter L. Montgomery */
 /* d must be != 0 */
-static inline void fast_udiv_init(FastDivData *s, limb_t d)
+static inline __maybe_unused void fast_udiv_init(FastDivData *s, limb_t d)
 {
 int l;
 limb_t q, r, m1;
- s->d = d;
 if (d == 1)
 l = 0;
 else
@@ -5229,54 +5490,78 @@
 return (t1 + t0) >> s->shift2;
 }
 
-#if 0 //unused
-static inline limb_t fast_urem(limb_t a, const FastDivData *s)
-{
- limb_t q;
- q = fast_udiv(a, s);
- return a - q * s->d;
-}
+/* contains 10^i */
+const limb_t mp_pow_dec[LIMB_DIGITS + 1] = {
+ 1U,
+ 10U,
+ 100U,
+ 1000U,
+ 10000U,
+ 100000U,
+ 1000000U,
+ 10000000U,
+ 100000000U,
+ 1000000000U,
+#if LIMB_BITS == 64
+ 10000000000U,
+ 100000000000U,
+ 1000000000000U,
+ 10000000000000U,
+ 100000000000000U,
+ 1000000000000000U,
+ 10000000000000000U,
+ 100000000000000000U,
+ 1000000000000000000U,
+ 10000000000000000000U,
 #endif
+};
 
-#define fast_udivrem(q, r, a, s) q = fast_udiv(a, s), r = a - q * (s)->d
- 
+/* precomputed from fast_udiv_init(10^i) */
+static const FastDivData mp_pow_div[LIMB_DIGITS + 1] = {
+#if LIMB_BITS == 32
+ { 0x00000001, 0, 0 },
+ { 0x9999999a, 1, 3 },
+ { 0x47ae147b, 1, 6 },
+ { 0x0624dd30, 1, 9 },
+ { 0xa36e2eb2, 1, 13 },
+ { 0x4f8b588f, 1, 16 },
+ { 0x0c6f7a0c, 1, 19 },
+ { 0xad7f29ac, 1, 23 },
+ { 0x5798ee24, 1, 26 },
+ { 0x12e0be83, 1, 29 },
 #else
-
-static inline void fast_udiv_init(FastDivData *s, limb_t d)
-{
- s->d = d;
-}
-static inline limb_t fast_udiv(limb_t a, const FastDivData *s)
-{
- return a / s->d;
-}
-static inline limb_t fast_urem(limb_t a, const FastDivData *s)
-{
- return a % s->d;
-}
-
-#define fast_udivrem(q, r, a, s) q = a / (s)->d, r = a % (s)->d
-
+ { 0x0000000000000001, 0, 0 },
+ { 0x999999999999999a, 1, 3 },
+ { 0x47ae147ae147ae15, 1, 6 },
+ { 0x0624dd2f1a9fbe77, 1, 9 },
+ { 0xa36e2eb1c432ca58, 1, 13 },
+ { 0x4f8b588e368f0847, 1, 16 },
+ { 0x0c6f7a0b5ed8d36c, 1, 19 },
+ { 0xad7f29abcaf48579, 1, 23 },
+ { 0x5798ee2308c39dfa, 1, 26 },
+ { 0x12e0be826d694b2f, 1, 29 },
+ { 0xb7cdfd9d7bdbab7e, 1, 33 },
+ { 0x5fd7fe17964955fe, 1, 36 },
+ { 0x19799812dea11198, 1, 39 },
+ { 0xc25c268497681c27, 1, 43 },
+ { 0x6849b86a12b9b01f, 1, 46 },
+ { 0x203af9ee756159b3, 1, 49 },
+ { 0xcd2b297d889bc2b7, 1, 53 },
+ { 0x70ef54646d496893, 1, 56 },
+ { 0x2725dd1d243aba0f, 1, 59 },
+ { 0xd83c94fb6d2ac34d, 1, 63 },
 #endif
+};
 
-/* contains 10^i */
-/* XXX: make it const */
-limb_t mp_pow_dec[LIMB_DIGITS + 1];
-static FastDivData mp_pow_div[LIMB_DIGITS + 1];
-
-static void mp_pow_init(void)
+/* divide by 10^shift with 0 <= shift <= LIMB_DIGITS */
+static inline limb_t fast_shr_dec(limb_t a, int shift)
 {
- limb_t a;
- int i;
- 
- a = 1;
- for(i = 0; i <= LIMB_DIGITS; i++) {
- mp_pow_dec[i] = a;
- fast_udiv_init(&mp_pow_div[i], a);
- a = a * 10;
- }
+ return fast_udiv(a, &mp_pow_div[shift]);
 }
 
+/* division and remainder by 10^shift */
+#define fast_shr_rem_dec(q, r, a, shift) q = fast_shr_dec(a, shift), r = a - q * mp_pow_dec[shift]
+ 
 limb_t mp_add_dec(limb_t *res, const limb_t *op1, const limb_t *op2, 
 mp_size_t n, limb_t carry)
 {
@@ -5536,7 +5821,7 @@
 must be != zero. na must be >= nb. 's' can be NULL if tabb1[nb - 1]
 >= B / 2.
 
- The remainder is is returned in taba and contains nb libms. tabq
+ The remainder is returned in taba and contains nb libms. tabq
 contains na - nb + 1 limbs. No overlap is permitted.
 
 Running time of the standard method: (na - nb + 1) * nb
@@ -5659,7 +5944,7 @@
 l = high;
 for(i = n - 1; i >= 0; i--) {
 a = tab[i];
- fast_udivrem(q, r, a, &mp_pow_div[shift]);
+ fast_shr_rem_dec(q, r, a, shift);
 tab_r[i] = q + l * mp_pow_dec[LIMB_DIGITS - shift];
 l = r;
 }
@@ -5677,7 +5962,7 @@
 l = low;
 for(i = 0; i < n; i++) {
 a = tab[i];
- fast_udivrem(q, r, a, &mp_pow_div[LIMB_DIGITS - shift]);
+ fast_shr_rem_dec(q, r, a, LIMB_DIGITS - shift);
 tab_r[i] = r * mp_pow_dec[shift] + l;
 l = q;
 }
@@ -6017,7 +6302,7 @@
 return 0;
 pos = (limb_t)bit_pos / LIMB_DIGITS;
 shift = (limb_t)bit_pos % LIMB_DIGITS;
- fast_udivrem(q, v, r->tab[pos], &mp_pow_div[shift + 1]);
+ fast_shr_rem_dec(q, v, r->tab[pos], shift + 1);
 (void)q;
 if (v != 0)
 return 1;
@@ -6038,7 +6323,7 @@
 if (i < 0 || i >= len)
 return 0;
 shift = pos - i * LIMB_DIGITS;
- return fast_udiv(tab[i], &mp_pow_div[shift]) % 10;
+ return fast_shr_dec(tab[i], shift) % 10;
 }
 
 #if 0
@@ -6062,7 +6347,7 @@
 a1 = tab[i];
 else
 a1 = 0;
- return fast_udiv(a0, &mp_pow_div[shift]) +
+ return fast_shr_dec(a0, shift) +
 fast_urem(a1, &mp_pow_div[LIMB_DIGITS - shift]) *
 mp_pow_dec[shift];
 }
@@ -6114,13 +6399,8 @@
 case BF_RNDF:
 add_one = (digit1 >= 5);
 break;
- case BF_RNDNU:
- if (digit1 >= 5) {
- if (r->sign)
- add_one = (digit0 != 0);
- else
- add_one = 1;
- }
+ case BF_RNDA:
+ add_one = inexact;
 break;
 default:
 abort();
@@ -6141,8 +6421,7 @@
 int shift, add_one, rnd_mode, ret;
 slimb_t i, bit_pos, pos, e_min, e_max, e_range, prec;
 
- /* e_min and e_max are computed to match the IEEE 754 conventions */
- /* XXX: does not matter for decimal numbers */
+ /* XXX: align to IEEE 754 2008 for decimal numbers ? */
 e_range = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
 e_min = -e_range + 3;
 e_max = e_range;
@@ -6153,6 +6432,11 @@
 prec = r->expn + prec1;
 else
 prec = prec1;
+ } else if (unlikely(r->expn < e_min) && (flags & BF_FLAG_SUBNORMAL)) {
+ /* restrict the precision in case of potentially subnormal
+ result */
+ assert(prec1 != BF_PREC_INF);
+ prec = prec1 - (e_min - r->expn);
 } else {
 prec = prec1;
 }
@@ -6189,10 +6473,16 @@
 
 /* check underflow */
 if (unlikely(r->expn < e_min)) {
- underflow:
- bfdec_set_zero(r, r->sign);
- ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
- return ret;
+ if (flags & BF_FLAG_SUBNORMAL) {
+ /* if inexact, also set the underflow flag */
+ if (ret & BF_ST_INEXACT)
+ ret |= BF_ST_UNDERFLOW;
+ } else {
+ underflow:
+ bfdec_set_zero(r, r->sign);
+ ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
+ return ret;
+ }
 }
 
 /* check overflow */
@@ -6208,7 +6498,7 @@
 if (i >= 0) {
 shift = smod(bit_pos, LIMB_DIGITS);
 if (shift != 0) {
- r->tab[i] = fast_udiv(r->tab[i], &mp_pow_div[shift]) *
+ r->tab[i] = fast_shr_dec(r->tab[i], shift) *
 mp_pow_dec[shift];
 }
 } else {
@@ -6577,10 +6867,10 @@
 /* number of digits after the decimal point */
 /* XXX: check (2 extra digits for rounding + 2 digits) */
 precl = (bf_max(a->expn - b->expn, 0) + 2 +
- 2 + LIMB_DIGITS - 1) / LIMB_DIGITS;
+ prec + 2 + LIMB_DIGITS - 1) / LIMB_DIGITS;
 } else {
 /* number of limbs of the quotient (2 extra digits for rounding) */
- precl = (prec + 2 + LIMB_DIGITS - 1) / LIMB_DIGITS;
+ precl = (prec + 2 + LIMB_DIGITS - 1) / LIMB_DIGITS;
 }
 n = bf_max(a->len, precl);
 
@@ -6685,8 +6975,7 @@
 }
 
 q_sign = a->sign ^ b->sign;
- is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA ||
- rnd_mode == BF_RNDNU);
+ is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA);
 switch(rnd_mode) {
 default:
 case BF_RNDZ:
@@ -6700,12 +6989,12 @@
 case BF_RNDU:
 is_ceil = q_sign ^ 1;
 break;
+ case BF_RNDA:
+ is_ceil = TRUE;
+ break;
 case BF_DIVREM_EUCLIDIAN:
 is_ceil = a->sign;
 break;
- case BF_RNDNU:
- /* XXX: unsupported yet */
- abort();
 }
 
 a1->expn = a->expn;
@@ -6762,14 +7051,14 @@
 return BF_ST_MEM_ERROR;
 }
 
-int bfdec_fmod(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
- bf_flags_t flags)
+int bfdec_rem(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+ bf_flags_t flags, int rnd_mode)
 {
 bfdec_t q_s, *q = &q_s;
 int ret;
 
 bfdec_init(r->ctx, q);
- ret = bfdec_divrem(q, r, a, b, prec, flags, BF_RNDZ);
+ ret = bfdec_divrem(q, r, a, b, prec, flags, rnd_mode);
 bfdec_delete(q);
 return ret;
 }
@@ -6785,7 +7074,7 @@
 bf_context_t *s = a->ctx;
 int ret, k;
 limb_t *a1, v;
- slimb_t n, n1;
+ slimb_t n, n1, prec1;
 limb_t res;
 
 assert(r != a);
@@ -6804,9 +7093,14 @@
 bfdec_set_nan(r);
 ret = BF_ST_INVALID_OP;
 } else {
+ if (flags & BF_FLAG_RADPNT_PREC) {
+ prec1 = bf_max(floor_div(a->expn + 1, 2) + prec, 1);
+ } else {
+ prec1 = prec;
+ }
 /* convert the mantissa to an integer with at least 2 *
 prec + 4 digits */
- n = (2 * (prec + 2) + 2 * LIMB_DIGITS - 1) / (2 * LIMB_DIGITS);
+ n = (2 * (prec1 + 2) + 2 * LIMB_DIGITS - 1) / (2 * LIMB_DIGITS);
 if (bfdec_resize(r, n))
 goto fail;
 a1 = bf_malloc(s, sizeof(limb_t) * 2 * n);
@@ -6875,7 +7169,7 @@
 v = 0;
 ret = 0;
 } else if (a->expn <= 9) {
- v = fast_udiv(a->tab[a->len - 1], &mp_pow_div[LIMB_DIGITS - a->expn]);
+ v = fast_shr_dec(a->tab[a->len - 1], LIMB_DIGITS - a->expn);
 if (a->sign)
 v = -v;
 ret = 0;
@@ -6883,7 +7177,7 @@
 uint64_t v1;
 uint32_t v_max;
 #if LIMB_BITS == 64
- v1 = fast_udiv(a->tab[a->len - 1], &mp_pow_div[LIMB_DIGITS - a->expn]);
+ v1 = fast_shr_dec(a->tab[a->len - 1], LIMB_DIGITS - a->expn);
 #else
 v1 = (uint64_t)a->tab[a->len - 1] * 10 +
 get_digit(a->tab, a->len, (a->len - 1) * LIMB_DIGITS - 1);
@@ -7855,7 +8149,7 @@
 {
 const limb_t *mods = ntt_mods + NB_MODS - nb_mods;
 const limb_t *mods_cr, *mods_cr_inv;
- limb_t y[NB_MODS], u[NB_MODS+2], carry[NB_MODS], fft_len, base_mask1, r;
+ limb_t y[NB_MODS], u[NB_MODS], carry[NB_MODS], fft_len, base_mask1, r;
 slimb_t i, len, pos;
 int j, k, l, shift, n_limb1;
 dlimb_t t;

gpac-1.0.1.tar.gz/src/quickjs/libbf.h -> gpac-2.0.0.tar.gz/src/quickjs/libbf.h Changed

gpac-1.0.1.tar.gz/src/quickjs/libregexp.c -> gpac-2.0.0.tar.gz/src/quickjs/libregexp.c Changed

@@ -75,7 +75,7 @@
 int capture_count;
 int total_capture_count; /* -1 = not computed yet */
 int has_named_captures; /* -1 = don't know, 0 = no, 1 = yes */
- void *mem_opaque;
+ void *opaque;
 DynBuf group_names;
 union {
 char error_msg[TMP_BUF_SIZE];
@@ -110,12 +110,14 @@
 return c >= '0' && c <= '9';
 }
 
-/* insert 'len' bytes at position 'pos' */
-static void dbuf_insert(DynBuf *s, int pos, int len)
+/* insert 'len' bytes at position 'pos'. Return < 0 if error. */
+static int dbuf_insert(DynBuf *s, int pos, int len)
 {
- dbuf_realloc(s, s->size + len);
+ if (dbuf_realloc(s, s->size + len))
+ return -1;
 memmove(s->buf + pos + len, s->buf + pos, s->size - pos);
 s->size += len;
+ return 0;
 }
 
 /* canonicalize with the specific JS regexp rules */
@@ -228,7 +230,7 @@
 invert = c & 1;
 c_pt = char_range_table[c >> 1];
 len = *c_pt++;
- cr_init(cr, s->mem_opaque, lre_realloc);
+ cr_init(cr, s->opaque, lre_realloc);
 for(i = 0; i < len * 2; i++) {
 if (cr_add_point(cr, c_pt[i]))
 goto fail;
@@ -438,8 +440,14 @@
 return -1;
 }
 
-/* Return -1 in case of overflow */
-static int parse_digits(const uint8_t **pp)
+static int re_parse_out_of_memory(REParseState *s)
+{
+ return re_parse_error(s, "out of memory");
+}
+
+/* If allow_overflow is false, return -1 in case of
+ overflow. Otherwise return INT32_MAX. */
+static int parse_digits(const uint8_t **pp, BOOL allow_overflow)
 {
 const uint8_t *p;
 uint64_t v;
@@ -452,8 +460,12 @@
 if (c < '0' || c > '9')
 break;
 v = v * 10 + c - '0';
- if (v >= INT32_MAX)
- return -1;
+ if (v >= INT32_MAX) {
+ if (allow_overflow)
+ v = INT32_MAX;
+ else
+ return -1;
+ }
 p++;
 }
 *pp = p;
@@ -561,11 +573,8 @@
 }
 }
 break;
-#if defined(_MSC_VER)
- case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7':
-#else
- case '0' ... '7':
-#endif
+ case '0': case '1': case '2': case '3':
+ case '4': case '5': case '6': case '7':
 c -= '0';
 if (allow_utf16 == 2) {
 /* only accept \0 not followed by digit */
@@ -620,7 +629,7 @@
 p++;
 q = name;
 while (is_unicode_char(*p)) {
- if ((q - name) > sizeof(name) - 1)
+ if ((q - name) >= sizeof(name) - 1)
 goto unknown_property_name;
 *q++ = *p++;
 }
@@ -629,7 +638,7 @@
 if (*p == '=') {
 p++;
 while (is_unicode_char(*p)) {
- if ((q - value) > sizeof(value) - 1)
+ if ((q - value) >= sizeof(value) - 1)
 return re_parse_error(s, "unknown unicode property value");
 *q++ = *p++;
 }
@@ -646,7 +655,7 @@
 } else if (!strcmp(name, "Script_Extensions") || !strcmp(name, "scx")) {
 script_ext = TRUE;
 do_script:
- cr_init(cr, s->mem_opaque, lre_realloc);
+ cr_init(cr, s->opaque, lre_realloc);
 ret = unicode_script(cr, value, script_ext);
 if (ret) {
 cr_free(cr);
@@ -656,7 +665,7 @@
 goto out_of_memory;
 }
 } else if (!strcmp(name, "General_Category") || !strcmp(name, "gc")) {
- cr_init(cr, s->mem_opaque, lre_realloc);
+ cr_init(cr, s->opaque, lre_realloc);
 ret = unicode_general_category(cr, value);
 if (ret) {
 cr_free(cr);
@@ -666,7 +675,7 @@
 goto out_of_memory;
 }
 } else if (value[0] == '\0') {
- cr_init(cr, s->mem_opaque, lre_realloc);
+ cr_init(cr, s->opaque, lre_realloc);
 ret = unicode_general_category(cr, name);
 if (ret == -1) {
 cr_free(cr);
@@ -696,7 +705,7 @@
 *pp = p;
 return 0;
 out_of_memory:
- return re_parse_error(s, "out of memory");
+ return re_parse_out_of_memory(s);
 }
 #endif /* CONFIG_ALL_UNICODE */
 
@@ -859,7 +868,7 @@
 CharRange cr1_s, *cr1 = &cr1_s;
 BOOL invert;
 
- cr_init(cr, s->mem_opaque, lre_realloc);
+ cr_init(cr, s->opaque, lre_realloc);
 p = *pp;
 p++; /* skip '[' */
 invert = FALSE;
@@ -931,7 +940,7 @@
 *pp = p;
 return 0;
 memory_error:
- re_parse_error(s, "out of memory");
+ re_parse_out_of_memory(s);
 fail:
 cr_free(cr);
 return -1;
@@ -1142,9 +1151,13 @@
 }
 }
 capture_index++;
+ if (capture_index >= CAPTURE_COUNT_MAX)
+ goto done;
 }
 } else {
 capture_index++;
+ if (capture_index >= CAPTURE_COUNT_MAX)
+ goto done;
 }
 break;
 case '\\':
@@ -1158,6 +1171,7 @@
 break;
 }
 }
+ done:
 if (capture_name)
 return -1;
 else
@@ -1233,14 +1247,27 @@
 re_emit_op(s, REOP_prev);
 break;
 case '{':
- /* As an extension (see ES6 annex B), we accept '{' not
- followed by digits as a normal atom */
- if (!is_digit(p[1])) {
- if (s->is_utf16)
- goto invalid_quant_count;
+ if (s->is_utf16) {
+ return re_parse_error(s, "syntax error");
+ } else if (!is_digit(p[1])) {
+ /* Annex B: we accept '{' not followed by digits as a
+ normal atom */
 goto parse_class_atom;
+ } else {
+ const uint8_t *p1 = p + 1;
+ /* Annex B: error if it is like a repetition count */
+ parse_digits(&p1, TRUE);
+ if (*p1 == ',') {
+ p1++;
+ if (is_digit(*p1)) {
+ parse_digits(&p1, TRUE);
+ }
+ }
+ if (*p1 != '}') {
+ goto parse_class_atom;
+ }
 }
- /* fall tru */
+ /* fall thru */
 case '*':
 case '+':
 case '?':
@@ -1285,6 +1312,8 @@
 return -1;
 re_emit_op(s, REOP_match);
 /* jump after the 'match' after the lookahead is successful */
+ if (dbuf_error(&s->byte_code))
+ return -1;
 put_u32(s->byte_code.buf + pos, s->byte_code.size - (pos + 4));
 } else if (p[2] == '<') {
 p += 3;
@@ -1391,15 +1420,13 @@
 }
 }
 goto normal_char;
-#if defined(_MSC_VER)
- case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-#else
- case '1' ... '9':
-#endif
+ case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8':
+ case '9': 
 {
 const uint8_t *q = ++p;
 
- c = parse_digits(&p);
+ c = parse_digits(&p, FALSE);
 if (c < 0 || (c >= s->capture_count && c >= re_count_captures(s))) {
 if (!s->is_utf16) {
 /* Annex B.1.4: accept legacy octal */
@@ -1419,7 +1446,7 @@
 }
 goto normal_char;
 }
- return re_parse_error(s, "back reference out of range in reguar expression");
+ return re_parse_error(s, "back reference out of range in regular expression");
 }
 emit_back_reference:
 last_atom_start = s->byte_code.size;
@@ -1496,32 +1523,38 @@
 quant_max = 1;
 goto quantifier;
 case '{':
- /* As an extension (see ES6 annex B), we accept '{' not
- followed by digits as a normal atom */
- if (!is_digit(p[1])) {
- if (s->is_utf16)
- goto invalid_quant_count;
- break;
- }
- p++;
- quant_min = parse_digits(&p);
- if (quant_min < 0) {
- invalid_quant_count:
- return re_parse_error(s, "invalid repetition count");
- }
- quant_max = quant_min;
- if (*p == ',') {
- p++;
- if (is_digit(*p)) {
- quant_max = parse_digits(&p);
- if (quant_max < 0 || quant_max < quant_min)
+ {
+ const uint8_t *p1 = p;
+ /* As an extension (see ES6 annex B), we accept '{' not
+ followed by digits as a normal atom */
+ if (!is_digit(p[1])) {
+ if (s->is_utf16)
 goto invalid_quant_count;
- } else {
- quant_max = INT32_MAX; /* infinity */
+ break;
+ }
+ p++;
+ quant_min = parse_digits(&p, TRUE);
+ quant_max = quant_min;
+ if (*p == ',') {
+ p++;
+ if (is_digit(*p)) {
+ quant_max = parse_digits(&p, TRUE);
+ if (quant_max < quant_min) {
+ invalid_quant_count:
+ return re_parse_error(s, "invalid repetition count");
+ }
+ } else {
+ quant_max = INT32_MAX; /* infinity */
+ }
 }
+ if (*p != '}' && !s->is_utf16) {
+ /* Annex B: normal atom if invalid '{' syntax */
+ p = p1;
+ break;
+ }
+ if (re_parse_expect(s, &p, '}'))
+ return -1;
 }
- if (re_parse_expect(s, &p, '}'))
- return -1;
 quantifier:
 greedy = TRUE;
 if (*p == '?') {
@@ -1536,12 +1569,15 @@
 
 if (quant_max > 0) {
 /* specific optimization for simple quantifiers */
+ if (dbuf_error(&s->byte_code))
+ goto out_of_memory;
 len = re_is_simple_quantifier(s->byte_code.buf + last_atom_start,
 s->byte_code.size - last_atom_start);
 if (len > 0) {
 re_emit_op(s, REOP_match);
 
- dbuf_insert(&s->byte_code, last_atom_start, 17);
+ if (dbuf_insert(&s->byte_code, last_atom_start, 17))
+ goto out_of_memory;
 pos = last_atom_start;
 s->byte_code.buf[pos++] = REOP_simple_greedy_quant;
 put_u32(&s->byte_code.buf[pos],
@@ -1557,6 +1593,8 @@
 }
 }
 
+ if (dbuf_error(&s->byte_code))
+ goto out_of_memory;
 add_zero_advance_check = (re_check_advance(s->byte_code.buf + last_atom_start,
 s->byte_code.size - last_atom_start) == 0);
 } else {
@@ -1570,7 +1608,8 @@
 /* need to reset the capture in case the atom is
 not executed */
 if (last_capture_count != s->capture_count) {
- dbuf_insert(&s->byte_code, last_atom_start, 3);
+ if (dbuf_insert(&s->byte_code, last_atom_start, 3))
+ goto out_of_memory;
 s->byte_code.buf[last_atom_start++] = REOP_save_reset;
 s->byte_code.buf[last_atom_start++] = last_capture_count;
 s->byte_code.buf[last_atom_start++] = s->capture_count - 1;
@@ -1578,12 +1617,14 @@
 if (quant_max == 0) {
 s->byte_code.size = last_atom_start;
 } else if (quant_max == 1) {
- dbuf_insert(&s->byte_code, last_atom_start, 5);
+ if (dbuf_insert(&s->byte_code, last_atom_start, 5))
+ goto out_of_memory;
 s->byte_code.buf[last_atom_start] = REOP_split_goto_first +
 greedy;
 put_u32(s->byte_code.buf + last_atom_start + 1, len);
 } else if (quant_max == INT32_MAX) {
- dbuf_insert(&s->byte_code, last_atom_start, 5 + add_zero_advance_check);
+ if (dbuf_insert(&s->byte_code, last_atom_start, 5 + add_zero_advance_check))
+ goto out_of_memory;
 s->byte_code.buf[last_atom_start] = REOP_split_goto_first +
 greedy;
 put_u32(s->byte_code.buf + last_atom_start + 1,
@@ -1599,7 +1640,8 @@
 re_emit_goto(s, REOP_goto, last_atom_start);
 }
 } else {
- dbuf_insert(&s->byte_code, last_atom_start, 10);
+ if (dbuf_insert(&s->byte_code, last_atom_start, 10))
+ goto out_of_memory;
 pos = last_atom_start;
 s->byte_code.buf[pos++] = REOP_push_i32;
 put_u32(s->byte_code.buf + pos, quant_max);
@@ -1617,7 +1659,8 @@
 if (quant_min == 1) {
 /* nothing to add */
 } else {
- dbuf_insert(&s->byte_code, last_atom_start, 5);
+ if (dbuf_insert(&s->byte_code, last_atom_start, 5))
+ goto out_of_memory;
 s->byte_code.buf[last_atom_start] = REOP_push_i32;
 put_u32(s->byte_code.buf + last_atom_start + 1,
 quant_min);
@@ -1658,6 +1701,8 @@
 done:
 s->buf_ptr = p;
 return 0;
+ out_of_memory:
+ return re_parse_out_of_memory(s);
 }
 
 static int re_parse_alternative(REParseState *s, BOOL is_backward_dir)
@@ -1698,6 +1743,9 @@
 {
 int start, len, pos;
 
+ if (lre_check_stack_overflow(s->opaque, 0))
+ return re_parse_error(s, "stack overflow");
+ 
 start = s->byte_code.size;
 if (re_parse_alternative(s, is_backward_dir))
 return -1;
@@ -1707,7 +1755,9 @@
 len = s->byte_code.size - start;
 
 /* insert a split before the first alternative */
- dbuf_insert(&s->byte_code, start, 5);
+ if (dbuf_insert(&s->byte_code, start, 5)) {
+ return re_parse_out_of_memory(s);
+ }
 s->byte_code.buf[start] = REOP_split_next_first;
 put_u32(s->byte_code.buf + start + 1, len + 5);
 
@@ -1781,7 +1831,7 @@
 BOOL is_sticky;
 
 memset(s, 0, sizeof(*s));
- s->mem_opaque = opaque;
+ s->opaque = opaque;
 s->buf_ptr = (const uint8_t *)buf;
 s->buf_end = s->buf_ptr + buf_len;
 s->buf_start = s->buf_ptr;
@@ -1832,7 +1882,7 @@
 }
 
 if (dbuf_error(&s->byte_code)) {
- re_parse_error(s, "out of memory");
+ re_parse_out_of_memory(s);
 goto error;
 }
 
@@ -2498,6 +2548,17 @@
 return bc_buf[RE_HEADER_FLAGS];
 }
 
+/* Return NULL if no group names. Otherwise, return a pointer to
+ 'capture_count - 1' zero terminated UTF-8 strings. */
+const char *lre_get_groupnames(const uint8_t *bc_buf)
+{
+ uint32_t re_bytecode_len;
+ if ((lre_get_flags(bc_buf) & LRE_FLAG_NAMED_GROUPS) == 0)
+ return NULL;
+ re_bytecode_len = get_u32(bc_buf + 3);
+ return (const char *)(bc_buf + 7 + re_bytecode_len);
+}
+
 #ifdef TEST
 
 BOOL lre_check_stack_overflow(void *opaque, size_t alloca_size)

gpac-1.0.1.tar.gz/src/quickjs/libregexp.h -> gpac-2.0.0.tar.gz/src/quickjs/libregexp.h Changed

gpac-1.0.1.tar.gz/src/quickjs/libunicode-table.h -> gpac-2.0.0.tar.gz/src/quickjs/libunicode-table.h Changed

@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-static const uint32_t case_conv_table1[359] = {
+static const uint32_t case_conv_table1[361] = {
 0x00209a30, 0x00309a00, 0x005a8173, 0x00601730,
 0x006c0730, 0x006f81b3, 0x00701700, 0x007c0700,
 0x007f8100, 0x00803040, 0x009801c3, 0x00988190,
@@ -86,17 +86,18 @@
 0x53cb1440, 0x53d50130, 0x53d58130, 0x53d60130,
 0x53d68130, 0x53d70130, 0x53d80130, 0x53d88130,
 0x53d90130, 0x53d98131, 0x53da0c40, 0x53e10240,
- 0x53e20131, 0x53e28130, 0x53e30130, 0x55a98101,
- 0x55b85020, 0x7d8001b2, 0x7d8081b2, 0x7d8101b2,
- 0x7d8181da, 0x7d8201da, 0x7d8281b3, 0x7d8301b3,
- 0x7d8981bb, 0x7d8a01bb, 0x7d8a81bb, 0x7d8b01bc,
- 0x7d8b81bb, 0x7f909a31, 0x7fa09a01, 0x82002831,
- 0x82142801, 0x82582431, 0x826c2401, 0x86403331,
- 0x86603301, 0x8c502031, 0x8c602001, 0xb7202031,
- 0xb7302001, 0xf4802231, 0xf4912201,
+ 0x53e20131, 0x53e28130, 0x53e30130, 0x53e38440,
+ 0x53fa8240, 0x55a98101, 0x55b85020, 0x7d8001b2,
+ 0x7d8081b2, 0x7d8101b2, 0x7d8181da, 0x7d8201da,
+ 0x7d8281b3, 0x7d8301b3, 0x7d8981bb, 0x7d8a01bb,
+ 0x7d8a81bb, 0x7d8b01bc, 0x7d8b81bb, 0x7f909a31,
+ 0x7fa09a01, 0x82002831, 0x82142801, 0x82582431,
+ 0x826c2401, 0x86403331, 0x86603301, 0x8c502031,
+ 0x8c602001, 0xb7202031, 0xb7302001, 0xf4802231,
+ 0xf4912201,
 };
 
-static const uint8_t case_conv_table2[359] = {
+static const uint8_t case_conv_table2[361] = {
 0x01, 0x00, 0x9c, 0x06, 0x07, 0x4d, 0x03, 0x04,
 0x10, 0x00, 0x8f, 0x0b, 0x00, 0x00, 0x11, 0x00,
 0x08, 0x00, 0x53, 0x4a, 0x51, 0x00, 0x52, 0x00,
@@ -118,7 +119,7 @@
 0x33, 0x95, 0x00, 0x8e, 0x00, 0x74, 0x99, 0x98,
 0x97, 0x96, 0x00, 0x00, 0x9e, 0x00, 0x9c, 0x00,
 0xa1, 0xa0, 0x15, 0x2e, 0x2f, 0x30, 0xb4, 0xb5,
- 0x4c, 0xaa, 0xa9, 0x12, 0x14, 0x1e, 0x21, 0x22,
+ 0x4e, 0xaa, 0xa9, 0x12, 0x14, 0x1e, 0x21, 0x22,
 0x22, 0x2a, 0x34, 0x35, 0xa6, 0xa7, 0x36, 0x1f,
 0x4a, 0x00, 0x00, 0x97, 0x01, 0x5a, 0xda, 0x1d,
 0x36, 0x05, 0x00, 0xc4, 0xc3, 0xc6, 0xc5, 0xc8,
@@ -137,11 +138,12 @@
 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0xa3, 0xa4,
 0xa5, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb6, 0x00,
 0x00, 0x5a, 0x00, 0x48, 0x00, 0x5b, 0x56, 0x58,
- 0x60, 0x5e, 0x70, 0x69, 0x6f, 0x4b, 0x00, 0x00,
- 0x3b, 0x67, 0xb8, 0x45, 0xa8, 0x8a, 0x8b, 0x8c,
- 0xab, 0xac, 0x58, 0x58, 0xaf, 0x94, 0xb0, 0x6f,
- 0xb2, 0x5a, 0x59, 0x5c, 0x5b, 0x5e, 0x5d, 0x60,
- 0x5f, 0x62, 0x61, 0x64, 0x63, 0x66, 0x65,
+ 0x60, 0x5e, 0x70, 0x69, 0x6f, 0x4d, 0x00, 0x00,
+ 0x3b, 0x67, 0xb8, 0x00, 0x00, 0x45, 0xa8, 0x8a,
+ 0x8b, 0x8c, 0xab, 0xac, 0x58, 0x58, 0xaf, 0x94,
+ 0xb0, 0x6f, 0xb2, 0x5c, 0x5b, 0x5e, 0x5d, 0x60,
+ 0x5f, 0x62, 0x61, 0x64, 0x63, 0x66, 0x65, 0x68,
+ 0x67,
 };
 
 static const uint16_t case_conv_ext[58] = {
@@ -170,7 +172,7 @@
 0x26, 0x01, 0x01, 0x86, 0xe5, 0x80, 0x60, 0x79,
 0xb6, 0x81, 0x40, 0x91, 0x81, 0xbd, 0x88, 0x94,
 0x05, 0x80, 0x98, 0x80, 0xc7, 0x82, 0x43, 0x34,
- 0xa2, 0x06, 0x80, 0x8b, 0x61, 0x28, 0x97, 0xd4,
+ 0xa2, 0x06, 0x80, 0x8c, 0x61, 0x28, 0x96, 0xd4,
 0x80, 0xc6, 0x01, 0x08, 0x09, 0x0b, 0x80, 0x8b,
 0x00, 0x06, 0x80, 0xc0, 0x03, 0x0f, 0x06, 0x80,
 0x9b, 0x03, 0x04, 0x00, 0x16, 0x80, 0x41, 0x53,
@@ -186,107 +188,109 @@
 0xf1, 0x01,
 };
 
-static const uint8_t unicode_prop_Case_Ignorable_table[678] = {
+static const uint8_t unicode_prop_Case_Ignorable_table[692] = {
 0xa6, 0x05, 0x80, 0x8a, 0x80, 0xa2, 0x00, 0x80,
 0xc6, 0x03, 0x00, 0x03, 0x01, 0x81, 0x41, 0xf6,
 0x40, 0xbf, 0x19, 0x18, 0x88, 0x08, 0x80, 0x40,
- 0xfa, 0x86, 0x40, 0xce, 0x80, 0xb6, 0xac, 0x00,
- 0x01, 0x01, 0x00, 0xab, 0x80, 0x8a, 0x85, 0x89,
- 0x8a, 0x00, 0xa2, 0x80, 0x89, 0x94, 0x8f, 0x80,
- 0xe4, 0x38, 0x89, 0x03, 0xa0, 0x00, 0x80, 0x9d,
- 0x9a, 0xda, 0x8a, 0xb9, 0x8a, 0x18, 0x08, 0x97,
- 0x97, 0xaa, 0x82, 0xf6, 0xaf, 0xb6, 0x00, 0x03,
- 0x3b, 0x02, 0x86, 0x89, 0x81, 0x8c, 0x80, 0x8e,
- 0x80, 0xb9, 0x03, 0x1f, 0x80, 0x93, 0x81, 0x99,
- 0x01, 0x81, 0xb8, 0x03, 0x0b, 0x09, 0x12, 0x80,
- 0x9d, 0x0a, 0x80, 0x8a, 0x81, 0xb8, 0x03, 0x20,
- 0x0b, 0x80, 0x93, 0x81, 0x95, 0x28, 0x80, 0xb9,
- 0x01, 0x00, 0x1f, 0x07, 0x80, 0x8a, 0x81, 0x9d,
- 0x80, 0xbc, 0x80, 0x8b, 0x80, 0xb1, 0x02, 0x80,
- 0xb8, 0x14, 0x10, 0x1e, 0x81, 0x8a, 0x81, 0x9c,
- 0x80, 0xb9, 0x01, 0x05, 0x04, 0x81, 0x93, 0x81,
- 0x9b, 0x81, 0xb8, 0x0b, 0x1f, 0x80, 0x93, 0x81,
- 0xe5, 0x06, 0x10, 0x80, 0xd9, 0x01, 0x86, 0x8a,
- 0x88, 0xe1, 0x01, 0x88, 0x88, 0x00, 0x85, 0xc9,
- 0x81, 0x9a, 0x00, 0x00, 0x80, 0xb6, 0x8d, 0x04,
- 0x01, 0x84, 0x8a, 0x80, 0xa3, 0x88, 0x80, 0xe5,
- 0x18, 0x28, 0x09, 0x81, 0x98, 0x0b, 0x82, 0x8f,
- 0x83, 0x8c, 0x01, 0x0d, 0x80, 0x8e, 0x80, 0xdd,
- 0x80, 0x42, 0x5f, 0x82, 0x43, 0xb1, 0x82, 0x9c,
- 0x82, 0x9c, 0x81, 0x9d, 0x81, 0xbf, 0x08, 0x37,
- 0x01, 0x8a, 0x10, 0x20, 0xac, 0x83, 0xb3, 0x80,
- 0xc0, 0x81, 0xa1, 0x80, 0xf5, 0x13, 0x81, 0x88,
- 0x05, 0x82, 0x40, 0xda, 0x09, 0x80, 0xb9, 0x00,
- 0x30, 0x00, 0x01, 0x3d, 0x89, 0x08, 0xa6, 0x07,
- 0x8e, 0xc0, 0x83, 0xaf, 0x00, 0x20, 0x04, 0x80,
- 0xa7, 0x88, 0x8b, 0x81, 0x9f, 0x19, 0x08, 0x82,
- 0xb7, 0x00, 0x0a, 0x00, 0x82, 0xb9, 0x39, 0x81,
- 0xbf, 0x85, 0xd1, 0x10, 0x8c, 0x06, 0x18, 0x28,
- 0x11, 0xb1, 0xbe, 0x8c, 0x80, 0xa1, 0xde, 0x04,
- 0x41, 0xbc, 0x00, 0x82, 0x8a, 0x82, 0x8c, 0x82,
- 0x8c, 0x82, 0x8c, 0x81, 0x8b, 0x27, 0x81, 0x89,
- 0x01, 0x01, 0x84, 0xb0, 0x20, 0x89, 0x00, 0x8c,
- 0x80, 0x8f, 0x8c, 0xb2, 0xa0, 0x4b, 0x8a, 0x81,
- 0xf0, 0x82, 0xfc, 0x80, 0x8e, 0x80, 0xdf, 0x9f,
- 0xae, 0x80, 0x41, 0xd4, 0x80, 0xa3, 0x1a, 0x24,
- 0x80, 0xdc, 0x85, 0xdc, 0x82, 0x60, 0x6f, 0x15,
- 0x80, 0x44, 0xe1, 0x85, 0x41, 0x0d, 0x80, 0xe1,
- 0x18, 0x89, 0x00, 0x9b, 0x83, 0xcf, 0x81, 0x8d,
- 0xa1, 0xcd, 0x80, 0x96, 0x82, 0xec, 0x0f, 0x02,
- 0x03, 0x80, 0x98, 0x81, 0x40, 0x9c, 0x81, 0x99,
- 0x91, 0x8c, 0x80, 0xa5, 0x87, 0x98, 0x8a, 0xad,
- 0x82, 0xaf, 0x01, 0x19, 0x81, 0x90, 0x80, 0x94,
- 0x81, 0xc1, 0x29, 0x09, 0x81, 0x8b, 0x07, 0x80,
- 0xa2, 0x80, 0x8a, 0x80, 0xb2, 0x00, 0x11, 0x0c,
- 0x08, 0x80, 0x9a, 0x80, 0x8d, 0x0c, 0x08, 0x80,
- 0xe3, 0x84, 0x40, 0x84, 0x01, 0x03, 0x80, 0x60,
- 0x4f, 0x2f, 0x80, 0x40, 0x92, 0x8f, 0x42, 0x3d,
- 0x8f, 0x10, 0x8b, 0x8f, 0xa1, 0x01, 0x80, 0x40,
- 0xa8, 0x06, 0x05, 0x80, 0x8a, 0x80, 0xa2, 0x00,
- 0x80, 0xae, 0x80, 0xac, 0x81, 0xc2, 0x80, 0x94,
- 0x82, 0x42, 0x00, 0x80, 0x40, 0xe1, 0x80, 0x40,
- 0x94, 0x84, 0x46, 0x85, 0x10, 0x0c, 0x83, 0xa7,
- 0x13, 0x80, 0x40, 0xa4, 0x81, 0x42, 0x3c, 0x83,
- 0x42, 0x1d, 0x8a, 0x40, 0xaf, 0x80, 0xb5, 0x8e,
+ 0xfa, 0x86, 0x40, 0xce, 0x04, 0x80, 0xb0, 0xac,
+ 0x00, 0x01, 0x01, 0x00, 0xab, 0x80, 0x8a, 0x85,
+ 0x89, 0x8a, 0x00, 0xa2, 0x80, 0x89, 0x94, 0x8f,
+ 0x80, 0xe4, 0x38, 0x89, 0x03, 0xa0, 0x00, 0x80,
+ 0x9d, 0x9a, 0xda, 0x8a, 0xb9, 0x8a, 0x18, 0x08,
+ 0x97, 0x97, 0xaa, 0x82, 0xf6, 0xaf, 0xb6, 0x00,
+ 0x03, 0x3b, 0x02, 0x86, 0x89, 0x81, 0x8c, 0x80,
+ 0x8e, 0x80, 0xb9, 0x03, 0x1f, 0x80, 0x93, 0x81,
+ 0x99, 0x01, 0x81, 0xb8, 0x03, 0x0b, 0x09, 0x12,
+ 0x80, 0x9d, 0x0a, 0x80, 0x8a, 0x81, 0xb8, 0x03,
+ 0x20, 0x0b, 0x80, 0x93, 0x81, 0x95, 0x28, 0x80,
+ 0xb9, 0x01, 0x00, 0x1f, 0x06, 0x81, 0x8a, 0x81,
+ 0x9d, 0x80, 0xbc, 0x80, 0x8b, 0x80, 0xb1, 0x02,
+ 0x80, 0xb8, 0x14, 0x10, 0x1e, 0x81, 0x8a, 0x81,
+ 0x9c, 0x80, 0xb9, 0x01, 0x05, 0x04, 0x81, 0x93,
+ 0x81, 0x9b, 0x81, 0xb8, 0x0b, 0x1f, 0x80, 0x93,
+ 0x81, 0x9c, 0x80, 0xc7, 0x06, 0x10, 0x80, 0xd9,
+ 0x01, 0x86, 0x8a, 0x88, 0xe1, 0x01, 0x88, 0x88,
+ 0x00, 0x85, 0xc9, 0x81, 0x9a, 0x00, 0x00, 0x80,
+ 0xb6, 0x8d, 0x04, 0x01, 0x84, 0x8a, 0x80, 0xa3,
+ 0x88, 0x80, 0xe5, 0x18, 0x28, 0x09, 0x81, 0x98,
+ 0x0b, 0x82, 0x8f, 0x83, 0x8c, 0x01, 0x0d, 0x80,
+ 0x8e, 0x80, 0xdd, 0x80, 0x42, 0x5f, 0x82, 0x43,
+ 0xb1, 0x82, 0x9c, 0x82, 0x9c, 0x81, 0x9d, 0x81,
+ 0xbf, 0x08, 0x37, 0x01, 0x8a, 0x10, 0x20, 0xac,
+ 0x83, 0xb3, 0x80, 0xc0, 0x81, 0xa1, 0x80, 0xf5,
+ 0x13, 0x81, 0x88, 0x05, 0x82, 0x40, 0xda, 0x09,
+ 0x80, 0xb9, 0x00, 0x30, 0x00, 0x01, 0x3d, 0x89,
+ 0x08, 0xa6, 0x07, 0x90, 0xbe, 0x83, 0xaf, 0x00,
+ 0x20, 0x04, 0x80, 0xa7, 0x88, 0x8b, 0x81, 0x9f,
+ 0x19, 0x08, 0x82, 0xb7, 0x00, 0x0a, 0x00, 0x82,
+ 0xb9, 0x39, 0x81, 0xbf, 0x85, 0xd1, 0x10, 0x8c,
+ 0x06, 0x18, 0x28, 0x11, 0xb1, 0xbe, 0x8c, 0x80,
+ 0xa1, 0xde, 0x04, 0x41, 0xbc, 0x00, 0x82, 0x8a,
+ 0x82, 0x8c, 0x82, 0x8c, 0x82, 0x8c, 0x81, 0x8b,
+ 0x27, 0x81, 0x89, 0x01, 0x01, 0x84, 0xb0, 0x20,
+ 0x89, 0x00, 0x8c, 0x80, 0x8f, 0x8c, 0xb2, 0xa0,
+ 0x4b, 0x8a, 0x81, 0xf0, 0x82, 0xfc, 0x80, 0x8e,
+ 0x80, 0xdf, 0x9f, 0xae, 0x80, 0x41, 0xd4, 0x80,
+ 0xa3, 0x1a, 0x24, 0x80, 0xdc, 0x85, 0xdc, 0x82,
+ 0x60, 0x6f, 0x15, 0x80, 0x44, 0xe1, 0x85, 0x41,
+ 0x0d, 0x80, 0xe1, 0x18, 0x89, 0x00, 0x9b, 0x83,
+ 0xcf, 0x81, 0x8d, 0xa1, 0xcd, 0x80, 0x96, 0x82,
+ 0xec, 0x0f, 0x02, 0x03, 0x80, 0x98, 0x0c, 0x80,
+ 0x40, 0x96, 0x81, 0x99, 0x91, 0x8c, 0x80, 0xa5,
+ 0x87, 0x98, 0x8a, 0xad, 0x82, 0xaf, 0x01, 0x19,
+ 0x81, 0x90, 0x80, 0x94, 0x81, 0xc1, 0x29, 0x09,
+ 0x81, 0x8b, 0x07, 0x80, 0xa2, 0x80, 0x8a, 0x80,
+ 0xb2, 0x00, 0x11, 0x0c, 0x08, 0x80, 0x9a, 0x80,
+ 0x8d, 0x0c, 0x08, 0x80, 0xe3, 0x84, 0x88, 0x82,
+ 0xf8, 0x01, 0x03, 0x80, 0x60, 0x4f, 0x2f, 0x80,
+ 0x40, 0x92, 0x8f, 0x42, 0x3d, 0x8f, 0x10, 0x8b,
+ 0x8f, 0xa1, 0x01, 0x80, 0x40, 0xa8, 0x06, 0x05,
+ 0x80, 0x8a, 0x80, 0xa2, 0x00, 0x80, 0xae, 0x80,
+ 0xac, 0x81, 0xc2, 0x80, 0x94, 0x82, 0x42, 0x00,
+ 0x80, 0x40, 0xe1, 0x80, 0x40, 0x94, 0x84, 0x46,
+ 0x85, 0x10, 0x0c, 0x83, 0xa7, 0x13, 0x80, 0x40,
+ 0xa4, 0x81, 0x42, 0x3c, 0x83, 0x41, 0x82, 0x81,
+ 0x40, 0x98, 0x8a, 0x40, 0xaf, 0x80, 0xb5, 0x8e,
 0xb7, 0x82, 0xb0, 0x19, 0x09, 0x80, 0x8e, 0x80,
 0xb1, 0x82, 0xa3, 0x20, 0x87, 0xbd, 0x80, 0x8b,
- 0x81, 0xb3, 0x88, 0x89, 0x83, 0xe1, 0x11, 0x00,
- 0x0d, 0x80, 0x40, 0x9f, 0x02, 0x87, 0x94, 0x81,
- 0xb8, 0x0a, 0x80, 0xa4, 0x32, 0x84, 0x40, 0xc2,
- 0x39, 0x10, 0x80, 0x96, 0x80, 0xd3, 0x28, 0x03,
- 0x08, 0x81, 0x40, 0xed, 0x1d, 0x08, 0x81, 0x9a,
- 0x81, 0xd4, 0x39, 0x00, 0x81, 0xe9, 0x00, 0x01,
- 0x28, 0x80, 0xe4, 0x11, 0x18, 0x84, 0x41, 0x02,
- 0x88, 0x01, 0x41, 0x98, 0x19, 0x0b, 0x80, 0x9f,
- 0x89, 0xa7, 0x29, 0x1f, 0x80, 0x88, 0x29, 0x82,
- 0xad, 0x8c, 0x01, 0x41, 0x95, 0x30, 0x28, 0x80,
- 0xd1, 0x95, 0x0e, 0x01, 0x01, 0xf9, 0x2a, 0x00,
- 0x08, 0x30, 0x80, 0xc7, 0x0a, 0x00, 0x80, 0x41,
- 0x5a, 0x81, 0x55, 0x3a, 0x88, 0x60, 0x36, 0xb6,
- 0x84, 0xba, 0x86, 0x88, 0x83, 0x44, 0x0a, 0x80,
- 0xbe, 0x90, 0xbf, 0x08, 0x80, 0x60, 0x4c, 0xb8,
- 0x08, 0x83, 0x54, 0xc2, 0x82, 0x88, 0x8f, 0x0e,
- 0x9d, 0x83, 0x40, 0x93, 0x82, 0x47, 0xba, 0xb6,
- 0x83, 0xb1, 0x38, 0x8d, 0x80, 0x95, 0x20, 0x8e,
- 0x45, 0x4f, 0x30, 0x90, 0x0e, 0x01, 0x04, 0x41,
- 0x04, 0x8d, 0x41, 0xad, 0x83, 0x45, 0xdf, 0x86,
- 0xec, 0x87, 0x4a, 0xae, 0x84, 0x6c, 0x0c, 0x00,
- 0x80, 0x9d, 0xdf, 0xff, 0x40, 0xef,
+ 0x81, 0xb3, 0x88, 0x89, 0x19, 0x80, 0xde, 0x11,
+ 0x00, 0x0d, 0x80, 0x40, 0x9f, 0x02, 0x87, 0x94,
+ 0x81, 0xb8, 0x0a, 0x80, 0xa4, 0x32, 0x84, 0x40,
+ 0xc2, 0x39, 0x10, 0x80, 0x96, 0x80, 0xd3, 0x28,
+ 0x03, 0x08, 0x81, 0x40, 0xed, 0x1d, 0x08, 0x81,
+ 0x9a, 0x81, 0xd4, 0x39, 0x00, 0x81, 0xe9, 0x00,
+ 0x01, 0x28, 0x80, 0xe4, 0x11, 0x18, 0x84, 0x41,
+ 0x02, 0x88, 0x01, 0x40, 0xff, 0x08, 0x03, 0x80,
+ 0x40, 0x8f, 0x19, 0x0b, 0x80, 0x9f, 0x89, 0xa7,
+ 0x29, 0x1f, 0x80, 0x88, 0x29, 0x82, 0xad, 0x8c,
+ 0x01, 0x41, 0x95, 0x30, 0x28, 0x80, 0xd1, 0x95,
+ 0x0e, 0x01, 0x01, 0xf9, 0x2a, 0x00, 0x08, 0x30,
+ 0x80, 0xc7, 0x0a, 0x00, 0x80, 0x41, 0x5a, 0x81,
+ 0x55, 0x3a, 0x88, 0x60, 0x36, 0xb6, 0x84, 0xba,
+ 0x86, 0x88, 0x83, 0x44, 0x0a, 0x80, 0xbe, 0x90,
+ 0xbf, 0x08, 0x81, 0x60, 0x4c, 0xb7, 0x08, 0x83,
+ 0x54, 0xc2, 0x82, 0x88, 0x8f, 0x0e, 0x9d, 0x83,
+ 0x40, 0x93, 0x82, 0x47, 0xba, 0xb6, 0x83, 0xb1,
+ 0x38, 0x8d, 0x80, 0x95, 0x20, 0x8e, 0x45, 0x4f,
+ 0x30, 0x90, 0x0e, 0x01, 0x04, 0x41, 0x04, 0x8d,
+ 0x41, 0xad, 0x83, 0x45, 0xdf, 0x86, 0xec, 0x87,
+ 0x4a, 0xae, 0x84, 0x6c, 0x0c, 0x00, 0x80, 0x9d,
+ 0xdf, 0xff, 0x40, 0xef,
 };
 
 static const uint8_t unicode_prop_Case_Ignorable_index[66] = {
- 0xc0, 0x05, 0x00, 0x2e, 0x08, 0x20, 0x52, 0x0a,
- 0x00, 0x05, 0x0c, 0x00, 0x4f, 0x0e, 0x20, 0x75,
- 0x10, 0x20, 0x44, 0x18, 0x00, 0x43, 0x1b, 0x00,
- 0x00, 0x1e, 0x00, 0x7e, 0x2c, 0x00, 0x7e, 0xa6,
- 0x40, 0x83, 0xa9, 0x20, 0xf7, 0xaa, 0x00, 0x41,
- 0xff, 0x20, 0x28, 0x0d, 0x01, 0x3f, 0x12, 0x41,
- 0xde, 0x15, 0x21, 0x5c, 0x1a, 0x01, 0xf5, 0x6a,
- 0x21, 0x37, 0xda, 0x01, 0x02, 0x00, 0x2e, 0xf0,
+ 0xbe, 0x05, 0x00, 0xfe, 0x07, 0x00, 0x52, 0x0a,
+ 0x20, 0x05, 0x0c, 0x20, 0x3b, 0x0e, 0x40, 0x61,
+ 0x10, 0x40, 0x0f, 0x18, 0x20, 0x43, 0x1b, 0x60,
+ 0x79, 0x1d, 0x00, 0xf1, 0x20, 0x00, 0x0d, 0xa6,
+ 0x40, 0x2e, 0xa9, 0x20, 0xde, 0xaa, 0x00, 0x0f,
+ 0xff, 0x20, 0xe7, 0x0a, 0x41, 0x82, 0x11, 0x21,
+ 0xc4, 0x14, 0x61, 0x44, 0x19, 0x01, 0x48, 0x1d,
+ 0x21, 0xa4, 0xbc, 0x01, 0x3e, 0xe1, 0x01, 0xf0,
 0x01, 0x0e,
 };
 
-static const uint8_t unicode_prop_ID_Start_table[1024] = {
+static const uint8_t unicode_prop_ID_Start_table[1045] = {
 0xc0, 0x99, 0x85, 0x99, 0xae, 0x80, 0x89, 0x03,
 0x04, 0x96, 0x80, 0x9e, 0x80, 0x41, 0xc9, 0x83,
 0x8b, 0x8d, 0x26, 0x00, 0x80, 0x40, 0x80, 0x20,
@@ -297,142 +301,146 @@
 0x89, 0x11, 0x80, 0x8f, 0x00, 0x9d, 0x9c, 0xd8,
 0x8a, 0x80, 0x97, 0xa0, 0x88, 0x0b, 0x04, 0x95,
 0x18, 0x88, 0x02, 0x80, 0x96, 0x98, 0x86, 0x8a,
- 0xb4, 0x94, 0x07, 0xc5, 0xb5, 0x10, 0x91, 0x06,
- 0x89, 0x8e, 0x8f, 0x1f, 0x09, 0x81, 0x95, 0x06,
- 0x00, 0x13, 0x10, 0x8f, 0x80, 0x8c, 0x08, 0x82,
- 0x8d, 0x81, 0x89, 0x07, 0x2b, 0x09, 0x95, 0x06,
- 0x01, 0x01, 0x01, 0x9e, 0x18, 0x80, 0x92, 0x82,
- 0x8f, 0x88, 0x02, 0x80, 0x95, 0x06, 0x01, 0x04,
- 0x10, 0x91, 0x80, 0x8e, 0x81, 0x96, 0x80, 0x8a,
- 0x39, 0x09, 0x95, 0x06, 0x01, 0x04, 0x10, 0x9d,
- 0x08, 0x82, 0x8e, 0x80, 0x90, 0x00, 0x2a, 0x10,
- 0x1a, 0x08, 0x00, 0x0a, 0x0a, 0x12, 0x8b, 0x95,
- 0x80, 0xb3, 0x38, 0x10, 0x96, 0x80, 0x8f, 0x10,
- 0x99, 0x14, 0x81, 0x9d, 0x03, 0x38, 0x10, 0x96,
- 0x80, 0x89, 0x04, 0x10, 0x9f, 0x00, 0x81, 0x8e,
- 0x81, 0x91, 0x38, 0x10, 0xa8, 0x08, 0x8f, 0x04,
- 0x17, 0x82, 0x97, 0x2c, 0x91, 0x82, 0x97, 0x80,
- 0x88, 0x00, 0x0e, 0xb9, 0xaf, 0x01, 0x8b, 0x86,
- 0xb9, 0x08, 0x00, 0x20, 0x97, 0x00, 0x80, 0x89,
- 0x01, 0x88, 0x01, 0x20, 0x80, 0x94, 0x83, 0x9f,
- 0x80, 0xbe, 0x38, 0xa3, 0x9a, 0x84, 0xf2, 0xaa,
- 0x93, 0x80, 0x8f, 0x2b, 0x1a, 0x02, 0x0e, 0x13,
- 0x8c, 0x8b, 0x80, 0x90, 0xa5, 0x00, 0x20, 0x81,
- 0xaa, 0x80, 0x41, 0x4c, 0x03, 0x0e, 0x00, 0x03,
- 0x81, 0xa8, 0x03, 0x81, 0xa0, 0x03, 0x0e, 0x00,
- 0x03, 0x81, 0x8e, 0x80, 0xb8, 0x03, 0x81, 0xc2,
- 0xa4, 0x8f, 0x8f, 0xd5, 0x0d, 0x82, 0x42, 0x6b,
- 0x81, 0x90, 0x80, 0x99, 0x84, 0xca, 0x82, 0x8a,
- 0x86, 0x8c, 0x03, 0x8d, 0x91, 0x8d, 0x91, 0x8d,
- 0x8c, 0x02, 0x8e, 0xb3, 0xa2, 0x03, 0x80, 0xc2,
- 0xd8, 0x86, 0xa8, 0x00, 0x84, 0xc5, 0x89, 0x9e,
- 0xb0, 0x9d, 0x0c, 0x8a, 0xab, 0x83, 0x99, 0xb5,
- 0x96, 0x88, 0xb4, 0xd1, 0x80, 0xdc, 0xae, 0x90,
- 0x86, 0xb6, 0x9d, 0x8c, 0x81, 0x89, 0xab, 0x99,
- 0xa3, 0xa8, 0x82, 0x89, 0xa3, 0x81, 0x88, 0x86,
- 0xaa, 0x0a, 0xa8, 0x18, 0x28, 0x0a, 0x04, 0x40,
- 0xbf, 0xbf, 0x41, 0x15, 0x0d, 0x81, 0xa5, 0x0d,
- 0x0f, 0x00, 0x00, 0x00, 0x80, 0x9e, 0x81, 0xb4,
- 0x06, 0x00, 0x12, 0x06, 0x13, 0x0d, 0x83, 0x8c,
- 0x22, 0x06, 0xf3, 0x80, 0x8c, 0x80, 0x8f, 0x8c,
- 0xe4, 0x03, 0x01, 0x89, 0x00, 0x0d, 0x28, 0x00,
- 0x00, 0x80, 0x8f, 0x0b, 0x24, 0x18, 0x90, 0xa8,
- 0x4a, 0x76, 0xae, 0x80, 0xae, 0x80, 0x40, 0x84,
- 0x2b, 0x11, 0x8b, 0xa5, 0x00, 0x20, 0x81, 0xb7,
- 0x30, 0x8f, 0x96, 0x88, 0x30, 0x30, 0x30, 0x30,
- 0x30, 0x30, 0x30, 0x86, 0x42, 0x25, 0x82, 0x98,
- 0x88, 0x34, 0x0c, 0x83, 0xd5, 0x1c, 0x80, 0xd9,
- 0x03, 0x84, 0xaa, 0x80, 0xdd, 0x90, 0x9a, 0xb4,
- 0x8f, 0x41, 0xff, 0x59, 0xb5, 0xc9, 0x60, 0x51,
- 0xef, 0x8f, 0x44, 0x8c, 0xc2, 0xad, 0x81, 0x41,
- 0x0c, 0x82, 0x8f, 0x89, 0x81, 0x93, 0xae, 0x8f,
- 0x9e, 0x81, 0xcf, 0xa6, 0x88, 0x81, 0xe6, 0x81,
- 0xb4, 0x0c, 0xaf, 0x8a, 0x02, 0x03, 0x80, 0x96,
- 0x9c, 0xb3, 0x8d, 0xb1, 0xbd, 0x2a, 0x00, 0x81,
- 0x8a, 0x9b, 0x89, 0x96, 0x98, 0x9c, 0x86, 0xae,
- 0x9b, 0x80, 0x8f, 0x20, 0x89, 0x89, 0x20, 0xa8,
- 0x96, 0x10, 0x87, 0x93, 0x96, 0x10, 0x82, 0xb1,
- 0x00, 0x11, 0x0c, 0x08, 0x00, 0x97, 0x11, 0x8a,
- 0x32, 0x8b, 0x29, 0x29, 0x85, 0x88, 0x30, 0x30,
- 0xaa, 0x80, 0x8b, 0x87, 0xf2, 0x9c, 0x60, 0x2b,
- 0xa3, 0x8b, 0x96, 0x83, 0xb0, 0x60, 0x21, 0x03,
- 0x41, 0x6d, 0x81, 0xe9, 0xa5, 0x86, 0x8b, 0x24,
- 0x00, 0x89, 0x80, 0x8c, 0x04, 0x00, 0x01, 0x01,
- 0x80, 0xeb, 0xa0, 0x41, 0x6a, 0x91, 0xbf, 0x81,
- 0xb5, 0xa7, 0x8b, 0xf3, 0x20, 0x40, 0x86, 0xa3,
- 0x99, 0x85, 0x99, 0x8a, 0xd8, 0x15, 0x0d, 0x0d,
- 0x0a, 0xa2, 0x8b, 0x80, 0x99, 0x80, 0x92, 0x01,
- 0x80, 0x8e, 0x81, 0x8d, 0xa1, 0xfa, 0xc4, 0xb4,
- 0x41, 0x0a, 0x9c, 0x82, 0xb0, 0xae, 0x9f, 0x8c,
- 0x9d, 0x84, 0xa5, 0x89, 0x9d, 0x81, 0xa3, 0x1f,
- 0x04, 0xa9, 0x40, 0x9d, 0x91, 0xa3, 0x83, 0xa3,
- 0x83, 0xa7, 0x87, 0xb3, 0x40, 0x9b, 0x41, 0x36,
- 0x88, 0x95, 0x89, 0x87, 0x40, 0x97, 0x29, 0x00,
- 0xab, 0x01, 0x10, 0x81, 0x96, 0x89, 0x96, 0x88,
- 0x9e, 0xc0, 0x92, 0x01, 0x89, 0x95, 0x89, 0x99,
- 0xc5, 0xb7, 0x29, 0xbf, 0x80, 0x8e, 0x18, 0x10,
- 0x9c, 0xa9, 0x9c, 0x82, 0x9c, 0xa2, 0x38, 0x9b,
- 0x9a, 0xb5, 0x89, 0x95, 0x89, 0x92, 0x8c, 0x91,
- 0xed, 0xc8, 0xb6, 0xb2, 0x8c, 0xb2, 0x8c, 0xa3,
- 0x41, 0xdb, 0x9c, 0x89, 0x07, 0x95, 0x40, 0x99,
- 0x96, 0x8b, 0xb4, 0xca, 0xac, 0x9f, 0x98, 0x99,
- 0xa3, 0x9c, 0x80, 0x8a, 0xa2, 0x10, 0x8b, 0xaf,
- 0x8d, 0x83, 0x94, 0x00, 0x80, 0xa2, 0x91, 0x80,
- 0x98, 0xd3, 0x30, 0x00, 0x18, 0x8e, 0x80, 0x89,
- 0x86, 0xae, 0xa5, 0x39, 0x09, 0x95, 0x06, 0x01,
- 0x04, 0x10, 0x91, 0x80, 0x8b, 0x84, 0x40, 0x9d,
- 0xb4, 0x91, 0x83, 0x93, 0x80, 0x9f, 0xaf, 0x93,
- 0x08, 0x80, 0x40, 0xb7, 0xae, 0xa8, 0x83, 0xa3,
- 0xaf, 0x93, 0x80, 0xba, 0xaa, 0x8c, 0x80, 0xc6,
- 0x9a, 0x40, 0xe4, 0xab, 0xf3, 0xbf, 0x9e, 0x80,
- 0x40, 0x9f, 0x39, 0xa6, 0x8f, 0x00, 0x80, 0x9b,
- 0x80, 0x89, 0xa7, 0x30, 0x94, 0x80, 0x8a, 0xad,
- 0x92, 0x80, 0xa1, 0xb8, 0x41, 0x06, 0x88, 0x80,
- 0xa4, 0x90, 0x80, 0xb0, 0x9d, 0xef, 0x30, 0x08,
- 0xa5, 0x94, 0x80, 0x98, 0x28, 0x08, 0x9f, 0x8d,
- 0x80, 0x41, 0x46, 0x92, 0x41, 0x0c, 0x43, 0x99,
- 0xe5, 0xee, 0x90, 0x40, 0xc3, 0x4a, 0xbb, 0x44,
- 0x2e, 0x4f, 0xd0, 0x42, 0x46, 0x60, 0x21, 0xb8,
- 0x42, 0x38, 0x86, 0x9e, 0xf0, 0x9d, 0x91, 0xaf,
- 0x8f, 0x83, 0x9e, 0x94, 0x84, 0x92, 0x42, 0xaf,
- 0xbf, 0xff, 0xca, 0x20, 0xc1, 0x8c, 0xbf, 0x08,
- 0x80, 0x9b, 0x57, 0xf7, 0x87, 0x42, 0xf2, 0x60,
- 0x25, 0x0c, 0x41, 0x1e, 0xb0, 0x82, 0x90, 0x1f,
- 0x41, 0x8b, 0x49, 0x03, 0xea, 0x84, 0x8c, 0x82,
- 0x88, 0x86, 0x89, 0x57, 0x65, 0xd4, 0x80, 0xc6,
- 0x01, 0x08, 0x09, 0x0b, 0x80, 0x8b, 0x00, 0x06,
- 0x80, 0xc0, 0x03, 0x0f, 0x06, 0x80, 0x9b, 0x03,
- 0x04, 0x00, 0x16, 0x80, 0x41, 0x53, 0x81, 0x98,
- 0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x80, 0x9e,
- 0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x80, 0x9e,
- 0x80, 0x98, 0x07, 0x49, 0x33, 0xac, 0x89, 0x86,
- 0x8f, 0x80, 0x41, 0x70, 0xab, 0x45, 0x13, 0x40,
- 0xc4, 0xba, 0xc3, 0x30, 0x44, 0xb3, 0x18, 0x9a,
- 0x01, 0x00, 0x08, 0x80, 0x89, 0x03, 0x00, 0x00,
- 0x28, 0x18, 0x00, 0x00, 0x02, 0x01, 0x00, 0x08,
- 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x06,
- 0x03, 0x03, 0x00, 0x80, 0x89, 0x80, 0x90, 0x22,
- 0x04, 0x80, 0x90, 0x51, 0x43, 0x60, 0xa6, 0xd6,
- 0xa8, 0x50, 0x34, 0x8a, 0x40, 0xdd, 0x81, 0x56,
- 0x81, 0x8d, 0x5d, 0x30, 0x4c, 0x1e, 0x42, 0x1d,
-};
-
-static const uint8_t unicode_prop_ID_Start_index[96] = {
- 0xf6, 0x03, 0x20, 0xa6, 0x07, 0x00, 0xb1, 0x09,
- 0x00, 0xba, 0x0a, 0x00, 0xd1, 0x0b, 0x20, 0x62,
- 0x0d, 0x40, 0x01, 0x0f, 0x20, 0x5e, 0x12, 0x00,
- 0xf9, 0x16, 0x00, 0x17, 0x1a, 0x20, 0xc0, 0x1d,
- 0x20, 0x9d, 0x20, 0x00, 0x68, 0x2d, 0x00, 0x00,
- 0x32, 0x20, 0xc0, 0xa7, 0x20, 0x29, 0xaa, 0x00,
- 0xa4, 0xd7, 0x20, 0xc8, 0xfd, 0x20, 0x75, 0x01,
- 0x01, 0x37, 0x07, 0x01, 0x36, 0x0a, 0x21, 0xf7,
- 0x0f, 0x21, 0xa9, 0x12, 0x01, 0x30, 0x16, 0x21,
- 0x8a, 0x1a, 0x01, 0x9a, 0x23, 0x01, 0x80, 0x6e,
- 0x21, 0x89, 0xbc, 0x21, 0xc1, 0xd6, 0x01, 0xc5,
- 0xe8, 0x21, 0x73, 0xee, 0x01, 0x1e, 0xfa, 0x02,
+ 0xb4, 0x94, 0x80, 0x91, 0xbb, 0xb5, 0x10, 0x91,
+ 0x06, 0x89, 0x8e, 0x8f, 0x1f, 0x09, 0x81, 0x95,
+ 0x06, 0x00, 0x13, 0x10, 0x8f, 0x80, 0x8c, 0x08,
+ 0x82, 0x8d, 0x81, 0x89, 0x07, 0x2b, 0x09, 0x95,
+ 0x06, 0x01, 0x01, 0x01, 0x9e, 0x18, 0x80, 0x92,
+ 0x82, 0x8f, 0x88, 0x02, 0x80, 0x95, 0x06, 0x01,
+ 0x04, 0x10, 0x91, 0x80, 0x8e, 0x81, 0x96, 0x80,
+ 0x8a, 0x39, 0x09, 0x95, 0x06, 0x01, 0x04, 0x10,
+ 0x9d, 0x08, 0x82, 0x8e, 0x80, 0x90, 0x00, 0x2a,
+ 0x10, 0x1a, 0x08, 0x00, 0x0a, 0x0a, 0x12, 0x8b,
+ 0x95, 0x80, 0xb3, 0x38, 0x10, 0x96, 0x80, 0x8f,
+ 0x10, 0x99, 0x14, 0x81, 0x9d, 0x03, 0x38, 0x10,
+ 0x96, 0x80, 0x89, 0x04, 0x10, 0x9f, 0x00, 0x81,
+ 0x8e, 0x81, 0x90, 0x88, 0x02, 0x80, 0xa8, 0x08,
+ 0x8f, 0x04, 0x17, 0x82, 0x97, 0x2c, 0x91, 0x82,
+ 0x97, 0x80, 0x88, 0x00, 0x0e, 0xb9, 0xaf, 0x01,
+ 0x8b, 0x86, 0xb9, 0x08, 0x00, 0x20, 0x97, 0x00,
+ 0x80, 0x89, 0x01, 0x88, 0x01, 0x20, 0x80, 0x94,
+ 0x83, 0x9f, 0x80, 0xbe, 0x38, 0xa3, 0x9a, 0x84,
+ 0xf2, 0xaa, 0x93, 0x80, 0x8f, 0x2b, 0x1a, 0x02,
+ 0x0e, 0x13, 0x8c, 0x8b, 0x80, 0x90, 0xa5, 0x00,
+ 0x20, 0x81, 0xaa, 0x80, 0x41, 0x4c, 0x03, 0x0e,
+ 0x00, 0x03, 0x81, 0xa8, 0x03, 0x81, 0xa0, 0x03,
+ 0x0e, 0x00, 0x03, 0x81, 0x8e, 0x80, 0xb8, 0x03,
+ 0x81, 0xc2, 0xa4, 0x8f, 0x8f, 0xd5, 0x0d, 0x82,
+ 0x42, 0x6b, 0x81, 0x90, 0x80, 0x99, 0x84, 0xca,
+ 0x82, 0x8a, 0x86, 0x8c, 0x03, 0x8d, 0x91, 0x8d,
+ 0x91, 0x8d, 0x8c, 0x02, 0x8e, 0xb3, 0xa2, 0x03,
+ 0x80, 0xc2, 0xd8, 0x86, 0xa8, 0x00, 0x84, 0xc5,
+ 0x89, 0x9e, 0xb0, 0x9d, 0x0c, 0x8a, 0xab, 0x83,
+ 0x99, 0xb5, 0x96, 0x88, 0xb4, 0xd1, 0x80, 0xdc,
+ 0xae, 0x90, 0x86, 0xb6, 0x9d, 0x8c, 0x81, 0x89,
+ 0xab, 0x99, 0xa3, 0xa8, 0x82, 0x89, 0xa3, 0x81,
+ 0x88, 0x86, 0xaa, 0x0a, 0xa8, 0x18, 0x28, 0x0a,
+ 0x04, 0x40, 0xbf, 0xbf, 0x41, 0x15, 0x0d, 0x81,
+ 0xa5, 0x0d, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x9e,
+ 0x81, 0xb4, 0x06, 0x00, 0x12, 0x06, 0x13, 0x0d,
+ 0x83, 0x8c, 0x22, 0x06, 0xf3, 0x80, 0x8c, 0x80,
+ 0x8f, 0x8c, 0xe4, 0x03, 0x01, 0x89, 0x00, 0x0d,
+ 0x28, 0x00, 0x00, 0x80, 0x8f, 0x0b, 0x24, 0x18,
+ 0x90, 0xa8, 0x4a, 0x76, 0xae, 0x80, 0xae, 0x80,
+ 0x40, 0x84, 0x2b, 0x11, 0x8b, 0xa5, 0x00, 0x20,
+ 0x81, 0xb7, 0x30, 0x8f, 0x96, 0x88, 0x30, 0x30,
+ 0x30, 0x30, 0x30, 0x30, 0x30, 0x86, 0x42, 0x25,
+ 0x82, 0x98, 0x88, 0x34, 0x0c, 0x83, 0xd5, 0x1c,
+ 0x80, 0xd9, 0x03, 0x84, 0xaa, 0x80, 0xdd, 0x90,
+ 0x9f, 0xaf, 0x8f, 0x41, 0xff, 0x59, 0xbf, 0xbf,
+ 0x60, 0x51, 0xfc, 0x82, 0x44, 0x8c, 0xc2, 0xad,
+ 0x81, 0x41, 0x0c, 0x82, 0x8f, 0x89, 0x81, 0x93,
+ 0xae, 0x8f, 0x9e, 0x81, 0xcf, 0xa6, 0x88, 0x81,
+ 0xe6, 0x81, 0xb4, 0x81, 0x88, 0xa9, 0x8c, 0x02,
+ 0x03, 0x80, 0x96, 0x9c, 0xb3, 0x8d, 0xb1, 0xbd,
+ 0x2a, 0x00, 0x81, 0x8a, 0x9b, 0x89, 0x96, 0x98,
+ 0x9c, 0x86, 0xae, 0x9b, 0x80, 0x8f, 0x20, 0x89,
+ 0x89, 0x20, 0xa8, 0x96, 0x10, 0x87, 0x93, 0x96,
+ 0x10, 0x82, 0xb1, 0x00, 0x11, 0x0c, 0x08, 0x00,
+ 0x97, 0x11, 0x8a, 0x32, 0x8b, 0x29, 0x29, 0x85,
+ 0x88, 0x30, 0x30, 0xaa, 0x80, 0x8d, 0x85, 0xf2,
+ 0x9c, 0x60, 0x2b, 0xa3, 0x8b, 0x96, 0x83, 0xb0,
+ 0x60, 0x21, 0x03, 0x41, 0x6d, 0x81, 0xe9, 0xa5,
+ 0x86, 0x8b, 0x24, 0x00, 0x89, 0x80, 0x8c, 0x04,
+ 0x00, 0x01, 0x01, 0x80, 0xeb, 0xa0, 0x41, 0x6a,
+ 0x91, 0xbf, 0x81, 0xb5, 0xa7, 0x8b, 0xf3, 0x20,
+ 0x40, 0x86, 0xa3, 0x99, 0x85, 0x99, 0x8a, 0xd8,
+ 0x15, 0x0d, 0x0d, 0x0a, 0xa2, 0x8b, 0x80, 0x99,
+ 0x80, 0x92, 0x01, 0x80, 0x8e, 0x81, 0x8d, 0xa1,
+ 0xfa, 0xc4, 0xb4, 0x41, 0x0a, 0x9c, 0x82, 0xb0,
+ 0xae, 0x9f, 0x8c, 0x9d, 0x84, 0xa5, 0x89, 0x9d,
+ 0x81, 0xa3, 0x1f, 0x04, 0xa9, 0x40, 0x9d, 0x91,
+ 0xa3, 0x83, 0xa3, 0x83, 0xa7, 0x87, 0xb3, 0x40,
+ 0x9b, 0x41, 0x36, 0x88, 0x95, 0x89, 0x87, 0x40,
+ 0x97, 0x29, 0x00, 0xab, 0x01, 0x10, 0x81, 0x96,
+ 0x89, 0x96, 0x88, 0x9e, 0xc0, 0x92, 0x01, 0x89,
+ 0x95, 0x89, 0x99, 0xc5, 0xb7, 0x29, 0xbf, 0x80,
+ 0x8e, 0x18, 0x10, 0x9c, 0xa9, 0x9c, 0x82, 0x9c,
+ 0xa2, 0x38, 0x9b, 0x9a, 0xb5, 0x89, 0x95, 0x89,
+ 0x92, 0x8c, 0x91, 0xed, 0xc8, 0xb6, 0xb2, 0x8c,
+ 0xb2, 0x8c, 0xa3, 0x41, 0x5b, 0xa9, 0x29, 0xcd,
+ 0x9c, 0x89, 0x07, 0x95, 0xe9, 0x94, 0x9a, 0x96,
+ 0x8b, 0xb4, 0xca, 0xac, 0x9f, 0x98, 0x99, 0xa3,
+ 0x9c, 0x01, 0x07, 0xa2, 0x10, 0x8b, 0xaf, 0x8d,
+ 0x83, 0x94, 0x00, 0x80, 0xa2, 0x91, 0x80, 0x98,
+ 0xd3, 0x30, 0x00, 0x18, 0x8e, 0x80, 0x89, 0x86,
+ 0xae, 0xa5, 0x39, 0x09, 0x95, 0x06, 0x01, 0x04,
+ 0x10, 0x91, 0x80, 0x8b, 0x84, 0x40, 0x9d, 0xb4,
+ 0x91, 0x83, 0x93, 0x82, 0x9d, 0xaf, 0x93, 0x08,
+ 0x80, 0x40, 0xb7, 0xae, 0xa8, 0x83, 0xa3, 0xaf,
+ 0x93, 0x80, 0xba, 0xaa, 0x8c, 0x80, 0xc6, 0x9a,
+ 0x40, 0xe4, 0xab, 0xf3, 0xbf, 0x9e, 0x39, 0x01,
+ 0x38, 0x08, 0x97, 0x8e, 0x00, 0x80, 0xdd, 0x39,
+ 0xa6, 0x8f, 0x00, 0x80, 0x9b, 0x80, 0x89, 0xa7,
+ 0x30, 0x94, 0x80, 0x8a, 0xad, 0x92, 0x80, 0xa1,
+ 0xb8, 0x41, 0x06, 0x88, 0x80, 0xa4, 0x90, 0x80,
+ 0xb0, 0x9d, 0xef, 0x30, 0x08, 0xa5, 0x94, 0x80,
+ 0x98, 0x28, 0x08, 0x9f, 0x8d, 0x80, 0x41, 0x46,
+ 0x92, 0x40, 0xbc, 0x80, 0xce, 0x43, 0x99, 0xe5,
+ 0xee, 0x90, 0x40, 0xc3, 0x4a, 0xbb, 0x44, 0x2e,
+ 0x4f, 0xd0, 0x42, 0x46, 0x60, 0x21, 0xb8, 0x42,
+ 0x38, 0x86, 0x9e, 0xf0, 0x9d, 0x91, 0xaf, 0x8f,
+ 0x83, 0x9e, 0x94, 0x84, 0x92, 0x42, 0xaf, 0xbf,
+ 0xff, 0xca, 0x20, 0xc1, 0x8c, 0xbf, 0x08, 0x80,
+ 0x9b, 0x57, 0xf7, 0x87, 0x44, 0xd5, 0xa9, 0x88,
+ 0x60, 0x22, 0xf6, 0x41, 0x1e, 0xb0, 0x82, 0x90,
+ 0x1f, 0x41, 0x8b, 0x49, 0x03, 0xea, 0x84, 0x8c,
+ 0x82, 0x88, 0x86, 0x89, 0x57, 0x65, 0xd4, 0x80,
+ 0xc6, 0x01, 0x08, 0x09, 0x0b, 0x80, 0x8b, 0x00,
+ 0x06, 0x80, 0xc0, 0x03, 0x0f, 0x06, 0x80, 0x9b,
+ 0x03, 0x04, 0x00, 0x16, 0x80, 0x41, 0x53, 0x81,
+ 0x98, 0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x80,
+ 0x9e, 0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x80,
+ 0x9e, 0x80, 0x98, 0x07, 0x49, 0x33, 0xac, 0x89,
+ 0x86, 0x8f, 0x80, 0x41, 0x70, 0xab, 0x45, 0x13,
+ 0x40, 0xc4, 0xba, 0xc3, 0x30, 0x44, 0xb3, 0x18,
+ 0x9a, 0x01, 0x00, 0x08, 0x80, 0x89, 0x03, 0x00,
+ 0x00, 0x28, 0x18, 0x00, 0x00, 0x02, 0x01, 0x00,
+ 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b,
+ 0x06, 0x03, 0x03, 0x00, 0x80, 0x89, 0x80, 0x90,
+ 0x22, 0x04, 0x80, 0x90, 0x51, 0x43, 0x60, 0xa6,
+ 0xdd, 0xa1, 0x50, 0x34, 0x8a, 0x40, 0xdd, 0x81,
+ 0x56, 0x81, 0x8d, 0x5d, 0x30, 0x4c, 0x1e, 0x42,
+ 0x1d, 0x45, 0xe1, 0x53, 0x4a,
+};
+
+static const uint8_t unicode_prop_ID_Start_index[99] = {
+ 0xf6, 0x03, 0x20, 0xa6, 0x07, 0x00, 0xa9, 0x09,
+ 0x00, 0xb4, 0x0a, 0x00, 0xba, 0x0b, 0x00, 0x3e,
+ 0x0d, 0x00, 0xe0, 0x0e, 0x20, 0x57, 0x12, 0x00,
+ 0xeb, 0x16, 0x00, 0xca, 0x19, 0x20, 0xc0, 0x1d,
+ 0x60, 0x80, 0x20, 0x00, 0x2e, 0x2d, 0x00, 0xc0,
+ 0x31, 0x20, 0x89, 0xa7, 0x20, 0xf0, 0xa9, 0x00,
+ 0xe3, 0xab, 0x00, 0x3e, 0xfd, 0x00, 0xfb, 0x00,
+ 0x21, 0x37, 0x07, 0x61, 0x01, 0x0a, 0x01, 0x1d,
+ 0x0f, 0x21, 0x2c, 0x12, 0x01, 0xc8, 0x14, 0x21,
+ 0xd1, 0x19, 0x21, 0x47, 0x1d, 0x01, 0x39, 0x6a,
+ 0x21, 0x09, 0x8d, 0x01, 0xbc, 0xd4, 0x01, 0xa9,
+ 0xd7, 0x21, 0x3a, 0xee, 0x01, 0xde, 0xa6, 0x22,
+ 0x4b, 0x13, 0x03,
 };
 
-static const uint8_t unicode_prop_ID_Continue1_table[607] = {
+static const uint8_t unicode_prop_ID_Continue1_table[626] = {
 0xaf, 0x89, 0xa4, 0x80, 0xd6, 0x80, 0x42, 0x47,
 0xef, 0x96, 0x80, 0x40, 0xfa, 0x84, 0x41, 0x08,
 0xac, 0x00, 0x01, 0x01, 0x00, 0xc7, 0x8a, 0xaf,
@@ -445,14 +453,14 @@
 0x09, 0x89, 0x8d, 0x01, 0x82, 0xb7, 0x00, 0x23,
 0x09, 0x12, 0x80, 0x93, 0x8b, 0x10, 0x8a, 0x82,
 0xb7, 0x00, 0x38, 0x10, 0x82, 0x93, 0x09, 0x89,
- 0x89, 0x28, 0x82, 0xb7, 0x00, 0x31, 0x09, 0x17,
- 0x81, 0x89, 0x09, 0x89, 0x91, 0x80, 0xba, 0x22,
+ 0x89, 0x28, 0x82, 0xb7, 0x00, 0x31, 0x09, 0x16,
+ 0x82, 0x89, 0x09, 0x89, 0x91, 0x80, 0xba, 0x22,
 0x10, 0x83, 0x88, 0x80, 0x8d, 0x89, 0x8f, 0x84,
 0xb8, 0x30, 0x10, 0x1e, 0x81, 0x8a, 0x09, 0x89,
 0x90, 0x82, 0xb7, 0x00, 0x30, 0x10, 0x1e, 0x81,
 0x8a, 0x09, 0x89, 0x8f, 0x83, 0xb6, 0x08, 0x30,
- 0x10, 0x83, 0x88, 0x80, 0x89, 0x09, 0x89, 0x91,
- 0x81, 0xc5, 0x03, 0x28, 0x00, 0x3d, 0x89, 0x09,
+ 0x10, 0x83, 0x88, 0x80, 0x89, 0x09, 0x89, 0x90,
+ 0x82, 0xc5, 0x03, 0x28, 0x00, 0x3d, 0x89, 0x09,
 0xbc, 0x01, 0x86, 0x8b, 0x38, 0x89, 0xd6, 0x01,
 0x88, 0x8a, 0x29, 0x89, 0xbd, 0x0d, 0x89, 0x8a,
 0x00, 0x00, 0x03, 0x81, 0xb0, 0x93, 0x01, 0x84,
@@ -464,67 +472,70 @@
 0x89, 0x40, 0x8e, 0x80, 0xf5, 0x8b, 0x83, 0x8b,
 0x89, 0x89, 0xff, 0x8a, 0xbb, 0x84, 0xb8, 0x89,
 0x80, 0x9c, 0x81, 0x8a, 0x85, 0x89, 0x95, 0x8d,
- 0xc1, 0x84, 0xae, 0x90, 0x8a, 0x89, 0x90, 0x88,
- 0x8b, 0x82, 0x9d, 0x8c, 0x81, 0x89, 0xab, 0x8d,
- 0xaf, 0x93, 0x87, 0x89, 0x85, 0x89, 0xf5, 0x10,
- 0x94, 0x18, 0x28, 0x0a, 0x40, 0xc5, 0xb9, 0x04,
- 0x42, 0x3e, 0x81, 0x92, 0x80, 0xfa, 0x8c, 0x18,
- 0x82, 0x8b, 0x4b, 0xfd, 0x82, 0x40, 0x8c, 0x80,
- 0xdf, 0x9f, 0x42, 0x29, 0x85, 0xe8, 0x81, 0x60,
- 0x75, 0x84, 0x89, 0xc4, 0x03, 0x89, 0x9f, 0x81,
- 0xcf, 0x81, 0x41, 0x0f, 0x02, 0x03, 0x80, 0x96,
- 0x84, 0xd7, 0x81, 0xb1, 0x91, 0x89, 0x89, 0x85,
- 0x91, 0x8c, 0x8a, 0x9b, 0x87, 0x98, 0x8c, 0xab,
- 0x83, 0xae, 0x8d, 0x8e, 0x89, 0x8a, 0x80, 0x89,
- 0x89, 0xae, 0x8d, 0x8b, 0x07, 0x09, 0x89, 0xa0,
- 0x82, 0xb1, 0x00, 0x11, 0x0c, 0x08, 0x80, 0xa8,
- 0x24, 0x81, 0x40, 0xeb, 0x38, 0x09, 0x89, 0x60,
- 0x4f, 0x23, 0x80, 0x42, 0xe0, 0x8f, 0x8f, 0x8f,
- 0x11, 0x97, 0x82, 0x40, 0xbf, 0x89, 0xa4, 0x80,
- 0x42, 0xbc, 0x80, 0x40, 0xe1, 0x80, 0x40, 0x94,
- 0x84, 0x41, 0x24, 0x89, 0x45, 0x56, 0x10, 0x0c,
- 0x83, 0xa7, 0x13, 0x80, 0x40, 0xa4, 0x81, 0x42,
- 0x3c, 0x1f, 0x89, 0x42, 0x0b, 0x8a, 0x40, 0xae,
- 0x82, 0xb4, 0x8e, 0x9e, 0x89, 0x8e, 0x83, 0xac,
- 0x8a, 0xb4, 0x89, 0x2a, 0xa3, 0x8d, 0x80, 0x89,
- 0x21, 0xab, 0x80, 0x8b, 0x82, 0xaf, 0x8d, 0x3b,
- 0x82, 0x89, 0xd1, 0x8b, 0x28, 0x40, 0x9f, 0x8b,
- 0x84, 0x89, 0x2b, 0xb6, 0x08, 0x31, 0x09, 0x82,
- 0x88, 0x80, 0x89, 0x09, 0x32, 0x84, 0x40, 0xbf,
- 0x91, 0x88, 0x89, 0x18, 0xd0, 0x93, 0x8b, 0x89,
- 0x40, 0xd4, 0x31, 0x88, 0x9a, 0x81, 0xd1, 0x90,
- 0x8e, 0x89, 0xd0, 0x8c, 0x87, 0x89, 0xd2, 0x8e,
- 0x83, 0x89, 0x40, 0xf1, 0x8e, 0x40, 0xa4, 0x89,
- 0x40, 0xe6, 0x31, 0x32, 0x80, 0x9b, 0x89, 0xa7,
- 0x30, 0x1f, 0x80, 0x88, 0x8a, 0xad, 0x8f, 0x41,
- 0x94, 0x38, 0x87, 0x8f, 0x89, 0xb7, 0x95, 0x80,
- 0x8d, 0xf9, 0x2a, 0x00, 0x08, 0x30, 0x07, 0x89,
- 0xaf, 0x20, 0x08, 0x27, 0x89, 0x41, 0x48, 0x83,
- 0x60, 0x4b, 0x68, 0x89, 0x40, 0x85, 0x84, 0xba,
- 0x86, 0x98, 0x89, 0x43, 0xf4, 0x00, 0xb6, 0x33,
- 0x60, 0x4d, 0x09, 0x81, 0x54, 0xc5, 0x22, 0x2f,
+ 0x01, 0xbe, 0x84, 0xae, 0x90, 0x8a, 0x89, 0x90,
+ 0x88, 0x8b, 0x82, 0x9d, 0x8c, 0x81, 0x89, 0xab,
+ 0x8d, 0xaf, 0x93, 0x87, 0x89, 0x85, 0x89, 0xf5,
+ 0x10, 0x94, 0x18, 0x28, 0x0a, 0x40, 0xc5, 0xb9,
+ 0x04, 0x42, 0x3e, 0x81, 0x92, 0x80, 0xfa, 0x8c,
+ 0x18, 0x82, 0x8b, 0x4b, 0xfd, 0x82, 0x40, 0x8c,
+ 0x80, 0xdf, 0x9f, 0x42, 0x29, 0x85, 0xe8, 0x81,
+ 0x60, 0x75, 0x84, 0x89, 0xc4, 0x03, 0x89, 0x9f,
+ 0x81, 0xcf, 0x81, 0x41, 0x0f, 0x02, 0x03, 0x80,
+ 0x96, 0x23, 0x80, 0xd2, 0x81, 0xb1, 0x91, 0x89,
+ 0x89, 0x85, 0x91, 0x8c, 0x8a, 0x9b, 0x87, 0x98,
+ 0x8c, 0xab, 0x83, 0xae, 0x8d, 0x8e, 0x89, 0x8a,
+ 0x80, 0x89, 0x89, 0xae, 0x8d, 0x8b, 0x07, 0x09,
+ 0x89, 0xa0, 0x82, 0xb1, 0x00, 0x11, 0x0c, 0x08,
+ 0x80, 0xa8, 0x24, 0x81, 0x40, 0xeb, 0x38, 0x09,
+ 0x89, 0x60, 0x4f, 0x23, 0x80, 0x42, 0xe0, 0x8f,
+ 0x8f, 0x8f, 0x11, 0x97, 0x82, 0x40, 0xbf, 0x89,
+ 0xa4, 0x80, 0x42, 0xbc, 0x80, 0x40, 0xe1, 0x80,
+ 0x40, 0x94, 0x84, 0x41, 0x24, 0x89, 0x45, 0x56,
+ 0x10, 0x0c, 0x83, 0xa7, 0x13, 0x80, 0x40, 0xa4,
+ 0x81, 0x42, 0x3c, 0x1f, 0x89, 0x41, 0x70, 0x81,
+ 0x40, 0x98, 0x8a, 0x40, 0xae, 0x82, 0xb4, 0x8e,
+ 0x9e, 0x89, 0x8e, 0x83, 0xac, 0x8a, 0xb4, 0x89,
+ 0x2a, 0xa3, 0x8d, 0x80, 0x89, 0x21, 0xab, 0x80,
+ 0x8b, 0x82, 0xaf, 0x8d, 0x3b, 0x80, 0x8b, 0xd1,
+ 0x8b, 0x28, 0x40, 0x9f, 0x8b, 0x84, 0x89, 0x2b,
+ 0xb6, 0x08, 0x31, 0x09, 0x82, 0x88, 0x80, 0x89,
+ 0x09, 0x32, 0x84, 0x40, 0xbf, 0x91, 0x88, 0x89,
+ 0x18, 0xd0, 0x93, 0x8b, 0x89, 0x40, 0xd4, 0x31,
+ 0x88, 0x9a, 0x81, 0xd1, 0x90, 0x8e, 0x89, 0xd0,
+ 0x8c, 0x87, 0x89, 0xd2, 0x8e, 0x83, 0x89, 0x40,
+ 0xf1, 0x8e, 0x40, 0xa4, 0x89, 0xc5, 0x28, 0x09,
+ 0x18, 0x00, 0x81, 0x8b, 0x89, 0xf6, 0x31, 0x32,
+ 0x80, 0x9b, 0x89, 0xa7, 0x30, 0x1f, 0x80, 0x88,
+ 0x8a, 0xad, 0x8f, 0x41, 0x94, 0x38, 0x87, 0x8f,
+ 0x89, 0xb7, 0x95, 0x80, 0x8d, 0xf9, 0x2a, 0x00,
+ 0x08, 0x30, 0x07, 0x89, 0xaf, 0x20, 0x08, 0x27,
+ 0x89, 0x41, 0x48, 0x83, 0x60, 0x4b, 0x68, 0x89,
+ 0x40, 0x85, 0x84, 0xba, 0x86, 0x98, 0x89, 0x43,
+ 0xf4, 0x00, 0xb6, 0x33, 0xd0, 0x80, 0x8a, 0x81,
+ 0x60, 0x4c, 0xaa, 0x81, 0x54, 0xc5, 0x22, 0x2f,
 0x39, 0x86, 0x9d, 0x83, 0x40, 0x93, 0x82, 0x45,
 0x88, 0xb1, 0x41, 0xff, 0xb6, 0x83, 0xb1, 0x38,
 0x8d, 0x80, 0x95, 0x20, 0x8e, 0x45, 0x4f, 0x30,
 0x90, 0x0e, 0x01, 0x04, 0x41, 0x04, 0x86, 0x88,
 0x89, 0x41, 0xa1, 0x8d, 0x45, 0xd5, 0x86, 0xec,
- 0x34, 0x89, 0x6c, 0x17, 0xa5, 0x40, 0xef,
+ 0x34, 0x89, 0x52, 0x95, 0x89, 0x6c, 0x05, 0x05,
+ 0x40, 0xef,
 };
 
-static const uint8_t unicode_prop_ID_Continue1_index[57] = {
+static const uint8_t unicode_prop_ID_Continue1_index[60] = {
 0xfa, 0x06, 0x00, 0x84, 0x09, 0x00, 0xf0, 0x0a,
 0x00, 0x70, 0x0c, 0x00, 0xf4, 0x0d, 0x00, 0x4a,
- 0x10, 0x20, 0x1a, 0x18, 0x20, 0x74, 0x1b, 0x00,
- 0xe2, 0x20, 0x00, 0x28, 0xa8, 0x20, 0x7e, 0xaa,
- 0x20, 0x40, 0xff, 0x00, 0x03, 0x10, 0x21, 0xeb,
- 0x12, 0x01, 0x41, 0x16, 0x01, 0x40, 0x1c, 0x61,
- 0x37, 0x6b, 0x21, 0x76, 0xda, 0x01, 0xf0, 0x01,
- 0x0e,
+ 0x10, 0x20, 0x1a, 0x18, 0x20, 0x74, 0x1b, 0x20,
+ 0xdd, 0x20, 0x00, 0x0c, 0xa8, 0x00, 0x5a, 0xaa,
+ 0x20, 0x1a, 0xff, 0x00, 0xad, 0x0e, 0x01, 0x38,
+ 0x12, 0x21, 0xc1, 0x15, 0x21, 0xe5, 0x19, 0x21,
+ 0xaa, 0x1d, 0x21, 0x8c, 0xd1, 0x41, 0x4a, 0xe1,
+ 0x21, 0xf0, 0x01, 0x0e,
 };
 
 #ifdef CONFIG_ALL_UNICODE
 
-static const uint8_t unicode_cc_table[831] = {
+static const uint8_t unicode_cc_table[851] = {
 0xb2, 0xcf, 0xd4, 0x00, 0xe8, 0x03, 0xdc, 0x00,
 0xe8, 0x00, 0xd8, 0x04, 0xdc, 0x01, 0xca, 0x03,
 0xdc, 0x01, 0xca, 0x0a, 0xdc, 0x04, 0x01, 0x03,
@@ -574,77 +585,81 @@
 0x9a, 0x00, 0xe4, 0xb0, 0x5e, 0x00, 0xde, 0xc0,
 0x00, 0xdc, 0xb0, 0xaa, 0xc0, 0x00, 0xdc, 0xb0,
 0x16, 0x00, 0x09, 0x93, 0xc7, 0x81, 0x00, 0xdc,
- 0xaf, 0xc4, 0x05, 0xdc, 0xc1, 0x00, 0xdc, 0xb0,
- 0x45, 0x00, 0x07, 0x8e, 0x00, 0x09, 0xa5, 0xc0,
- 0x00, 0xdc, 0xc6, 0xb0, 0x05, 0x01, 0x09, 0xb0,
- 0x09, 0x00, 0x07, 0x8a, 0x01, 0x09, 0xb0, 0x12,
- 0x00, 0x07, 0xb0, 0x67, 0xc2, 0x41, 0x00, 0x04,
- 0xdc, 0xc1, 0x03, 0xdc, 0xc0, 0x41, 0x00, 0x05,
- 0x01, 0x83, 0x00, 0xdc, 0x85, 0xc0, 0x82, 0xc1,
- 0xb0, 0x95, 0xc1, 0x00, 0xdc, 0xc6, 0x00, 0xdc,
- 0xc1, 0x00, 0xea, 0x00, 0xd6, 0x00, 0xdc, 0x00,
- 0xca, 0xe4, 0x00, 0xe8, 0x01, 0xe4, 0x00, 0xdc,
- 0x80, 0xc0, 0x00, 0xe9, 0x00, 0xdc, 0xc0, 0x00,
- 0xdc, 0xb2, 0x9f, 0xc1, 0x01, 0x01, 0xc3, 0x02,
- 0x01, 0xc1, 0x83, 0xc0, 0x82, 0x01, 0x01, 0xc0,
- 0x00, 0xdc, 0xc0, 0x01, 0x01, 0x03, 0xdc, 0xc0,
- 0xb8, 0x03, 0xcd, 0xc2, 0xb0, 0x5c, 0x00, 0x09,
- 0xb0, 0x2f, 0xdf, 0xb1, 0xf9, 0x00, 0xda, 0x00,
- 0xe4, 0x00, 0xe8, 0x00, 0xde, 0x01, 0xe0, 0xb0,
- 0x38, 0x01, 0x08, 0xb8, 0x6d, 0xa3, 0xc0, 0x83,
- 0xc9, 0x9f, 0xc1, 0xb0, 0x1f, 0xc1, 0xb0, 0xe3,
- 0x00, 0x09, 0xb0, 0x8c, 0x00, 0x09, 0x9a, 0xd1,
- 0xb0, 0x08, 0x02, 0xdc, 0xa4, 0x00, 0x09, 0xb0,
- 0x2e, 0x00, 0x07, 0x8b, 0x00, 0x09, 0xb0, 0xbe,
- 0xc0, 0x80, 0xc1, 0x00, 0xdc, 0x81, 0xc1, 0x84,
- 0xc1, 0x80, 0xc0, 0xb0, 0x03, 0x00, 0x09, 0xb0,
- 0xc5, 0x00, 0x09, 0xb8, 0x46, 0xff, 0x00, 0x1a,
- 0xb2, 0xd0, 0xc6, 0x06, 0xdc, 0xc1, 0xb3, 0x9c,
- 0x00, 0xdc, 0xb0, 0xb1, 0x00, 0xdc, 0xb0, 0x64,
- 0xc4, 0xb6, 0x61, 0x00, 0xdc, 0x80, 0xc0, 0xa7,
- 0xc0, 0x00, 0x01, 0x00, 0xdc, 0x83, 0x00, 0x09,
- 0xb0, 0x74, 0xc0, 0x00, 0xdc, 0xb2, 0x0c, 0xc3,
- 0xb1, 0xed, 0x01, 0xdc, 0xc2, 0x00, 0xdc, 0xc0,
- 0x03, 0xdc, 0xb0, 0xc4, 0x00, 0x09, 0xb0, 0x07,
- 0x00, 0x09, 0xb0, 0x08, 0x00, 0x09, 0x00, 0x07,
- 0xb0, 0x14, 0xc2, 0xaf, 0x01, 0x09, 0xb0, 0x0d,
- 0x00, 0x07, 0xb0, 0x1b, 0x00, 0x09, 0x88, 0x00,
- 0x07, 0xb0, 0x39, 0x00, 0x09, 0x00, 0x07, 0xb0,
- 0x81, 0x00, 0x07, 0x00, 0x09, 0xb0, 0x1f, 0x01,
- 0x07, 0x8f, 0x00, 0x09, 0x97, 0xc6, 0x82, 0xc4,
- 0xb0, 0x9c, 0x00, 0x09, 0x82, 0x00, 0x07, 0x96,
- 0xc0, 0xb0, 0x32, 0x00, 0x09, 0x00, 0x07, 0xb0,
- 0xca, 0x00, 0x09, 0x00, 0x07, 0xb0, 0x4d, 0x00,
- 0x09, 0xb0, 0x45, 0x00, 0x09, 0x00, 0x07, 0xb0,
- 0x42, 0x00, 0x09, 0xb0, 0xdc, 0x00, 0x09, 0x00,
- 0x07, 0xb1, 0x74, 0x00, 0x09, 0xb0, 0x22, 0x00,
+ 0xaf, 0xc4, 0x05, 0xdc, 0xc1, 0x00, 0xdc, 0x80,
+ 0x01, 0xdc, 0xb0, 0x42, 0x00, 0x07, 0x8e, 0x00,
+ 0x09, 0xa5, 0xc0, 0x00, 0xdc, 0xc6, 0xb0, 0x05,
+ 0x01, 0x09, 0xb0, 0x09, 0x00, 0x07, 0x8a, 0x01,
+ 0x09, 0xb0, 0x12, 0x00, 0x07, 0xb0, 0x67, 0xc2,
+ 0x41, 0x00, 0x04, 0xdc, 0xc1, 0x03, 0xdc, 0xc0,
+ 0x41, 0x00, 0x05, 0x01, 0x83, 0x00, 0xdc, 0x85,
+ 0xc0, 0x82, 0xc1, 0xb0, 0x95, 0xc1, 0x00, 0xdc,
+ 0xc6, 0x00, 0xdc, 0xc1, 0x00, 0xea, 0x00, 0xd6,
+ 0x00, 0xdc, 0x00, 0xca, 0xe4, 0x00, 0xe8, 0x01,
+ 0xe4, 0x00, 0xdc, 0x80, 0xc0, 0x00, 0xe9, 0x00,
+ 0xdc, 0xc0, 0x00, 0xdc, 0xb2, 0x9f, 0xc1, 0x01,
+ 0x01, 0xc3, 0x02, 0x01, 0xc1, 0x83, 0xc0, 0x82,
+ 0x01, 0x01, 0xc0, 0x00, 0xdc, 0xc0, 0x01, 0x01,
+ 0x03, 0xdc, 0xc0, 0xb8, 0x03, 0xcd, 0xc2, 0xb0,
+ 0x5c, 0x00, 0x09, 0xb0, 0x2f, 0xdf, 0xb1, 0xf9,
+ 0x00, 0xda, 0x00, 0xe4, 0x00, 0xe8, 0x00, 0xde,
+ 0x01, 0xe0, 0xb0, 0x38, 0x01, 0x08, 0xb8, 0x6d,
+ 0xa3, 0xc0, 0x83, 0xc9, 0x9f, 0xc1, 0xb0, 0x1f,
+ 0xc1, 0xb0, 0xe3, 0x00, 0x09, 0xa4, 0x00, 0x09,
+ 0xb0, 0x66, 0x00, 0x09, 0x9a, 0xd1, 0xb0, 0x08,
+ 0x02, 0xdc, 0xa4, 0x00, 0x09, 0xb0, 0x2e, 0x00,
+ 0x07, 0x8b, 0x00, 0x09, 0xb0, 0xbe, 0xc0, 0x80,
+ 0xc1, 0x00, 0xdc, 0x81, 0xc1, 0x84, 0xc1, 0x80,
+ 0xc0, 0xb0, 0x03, 0x00, 0x09, 0xb0, 0xc5, 0x00,
+ 0x09, 0xb8, 0x46, 0xff, 0x00, 0x1a, 0xb2, 0xd0,
+ 0xc6, 0x06, 0xdc, 0xc1, 0xb3, 0x9c, 0x00, 0xdc,
+ 0xb0, 0xb1, 0x00, 0xdc, 0xb0, 0x64, 0xc4, 0xb6,
+ 0x61, 0x00, 0xdc, 0x80, 0xc0, 0xa7, 0xc0, 0x00,
+ 0x01, 0x00, 0xdc, 0x83, 0x00, 0x09, 0xb0, 0x74,
+ 0xc0, 0x00, 0xdc, 0xb2, 0x0c, 0xc3, 0xb1, 0x52,
+ 0xc1, 0xb0, 0x68, 0x01, 0xdc, 0xc2, 0x00, 0xdc,
+ 0xc0, 0x03, 0xdc, 0xb0, 0xc4, 0x00, 0x09, 0xb0,
+ 0x07, 0x00, 0x09, 0xb0, 0x08, 0x00, 0x09, 0x00,
+ 0x07, 0xb0, 0x14, 0xc2, 0xaf, 0x01, 0x09, 0xb0,
+ 0x0d, 0x00, 0x07, 0xb0, 0x1b, 0x00, 0x09, 0x88,
+ 0x00, 0x07, 0xb0, 0x39, 0x00, 0x09, 0x00, 0x07,
+ 0xb0, 0x81, 0x00, 0x07, 0x00, 0x09, 0xb0, 0x1f,
+ 0x01, 0x07, 0x8f, 0x00, 0x09, 0x97, 0xc6, 0x82,
+ 0xc4, 0xb0, 0x9c, 0x00, 0x09, 0x82, 0x00, 0x07,
+ 0x96, 0xc0, 0xb0, 0x32, 0x00, 0x09, 0x00, 0x07,
+ 0xb0, 0xca, 0x00, 0x09, 0x00, 0x07, 0xb0, 0x4d,
+ 0x00, 0x09, 0xb0, 0x45, 0x00, 0x09, 0x00, 0x07,
+ 0xb0, 0x42, 0x00, 0x09, 0xb0, 0xdc, 0x00, 0x09,
+ 0x00, 0x07, 0xb0, 0xd1, 0x01, 0x09, 0x83, 0x00,
+ 0x07, 0xb0, 0x6b, 0x00, 0x09, 0xb0, 0x22, 0x00,
 0x09, 0x91, 0x00, 0x09, 0xb0, 0x20, 0x00, 0x09,
 0xb1, 0x74, 0x00, 0x09, 0xb0, 0xd1, 0x00, 0x07,
 0x80, 0x01, 0x09, 0xb0, 0x20, 0x00, 0x09, 0xb8,
- 0x45, 0x27, 0x04, 0x01, 0xb0, 0x0a, 0xc6, 0xb8,
- 0x49, 0x36, 0x00, 0x01, 0xb8, 0x0c, 0x95, 0x01,
- 0xd8, 0x02, 0x01, 0x82, 0x00, 0xe2, 0x04, 0xd8,
- 0x87, 0x07, 0xdc, 0x81, 0xc4, 0x01, 0xdc, 0x9d,
- 0xc3, 0xb0, 0x63, 0xc2, 0xb8, 0x05, 0x8a, 0xc6,
- 0x80, 0xd0, 0x81, 0xc6, 0x80, 0xc1, 0x80, 0xc4,
- 0xb0, 0xd4, 0xc6, 0xb1, 0x84, 0xc3, 0xb5, 0xaf,
- 0x06, 0xdc, 0xb0, 0x3c, 0xc5, 0x00, 0x07,
+ 0x45, 0x27, 0x04, 0x01, 0xb0, 0x0a, 0xc6, 0xb4,
+ 0x88, 0x01, 0x06, 0xb8, 0x44, 0x7b, 0x00, 0x01,
+ 0xb8, 0x0c, 0x95, 0x01, 0xd8, 0x02, 0x01, 0x82,
+ 0x00, 0xe2, 0x04, 0xd8, 0x87, 0x07, 0xdc, 0x81,
+ 0xc4, 0x01, 0xdc, 0x9d, 0xc3, 0xb0, 0x63, 0xc2,
+ 0xb8, 0x05, 0x8a, 0xc6, 0x80, 0xd0, 0x81, 0xc6,
+ 0x80, 0xc1, 0x80, 0xc4, 0xb0, 0xd4, 0xc6, 0xb1,
+ 0x84, 0xc3, 0xb5, 0xaf, 0x06, 0xdc, 0xb0, 0x3c,
+ 0xc5, 0x00, 0x07,
 };
 
-static const uint8_t unicode_cc_index[78] = {
+static const uint8_t unicode_cc_index[81] = {
 0x4d, 0x03, 0x00, 0x97, 0x05, 0x20, 0xc6, 0x05,
 0x00, 0xe7, 0x06, 0x00, 0x45, 0x07, 0x00, 0xe2,
 0x08, 0x00, 0x53, 0x09, 0x00, 0xcd, 0x0b, 0x20,
 0x38, 0x0e, 0x00, 0x73, 0x0f, 0x20, 0x5d, 0x13,
- 0x20, 0x60, 0x1a, 0x20, 0xe6, 0x1b, 0x20, 0xfa,
- 0x1c, 0x00, 0x00, 0x1e, 0x20, 0x80, 0x2d, 0x00,
- 0x06, 0xa8, 0x00, 0xbe, 0xaa, 0x00, 0x76, 0x03,
- 0x01, 0x4d, 0x0f, 0x01, 0xcb, 0x11, 0x21, 0x5e,
- 0x14, 0x01, 0x3b, 0x18, 0x21, 0xf0, 0x6a, 0x41,
- 0xaa, 0xd1, 0x01, 0x4b, 0xe9, 0x01,
+ 0x20, 0x60, 0x1a, 0x20, 0xaa, 0x1b, 0x00, 0xf4,
+ 0x1c, 0x00, 0xfe, 0x1d, 0x20, 0x7f, 0x2d, 0x20,
+ 0xf0, 0xa6, 0x00, 0xb2, 0xaa, 0x00, 0xfe, 0x01,
+ 0x01, 0xab, 0x0e, 0x01, 0x73, 0x11, 0x21, 0x70,
+ 0x13, 0x01, 0xb8, 0x16, 0x01, 0x9a, 0x1a, 0x01,
+ 0x9f, 0xbc, 0x01, 0x22, 0xe0, 0x01, 0x4b, 0xe9,
+ 0x01,
 };
 
-static const uint32_t unicode_decomp_table1[687] = {
+static const uint32_t unicode_decomp_table1[690] = {
 0x00280081, 0x002a0097, 0x002a8081, 0x002bc097,
 0x002c8115, 0x002d0097, 0x002d4081, 0x002e0097,
 0x002e4115, 0x002f0199, 0x00302016, 0x00400842,
@@ -771,55 +786,56 @@
 0x0cf54119, 0x0cf5c097, 0x0cf6009b, 0x0cf64099,
 0x0cf68217, 0x0cf78119, 0x0cf804a1, 0x0cfa4525,
 0x0cfcc525, 0x0cff4125, 0x0cffc099, 0x29a70103,
- 0x29dc0081, 0x29fe0103, 0x2ad70203, 0x3e401482,
- 0x3e4a7f82, 0x3e6a3f82, 0x3e8aa102, 0x3e9b0110,
- 0x3e9c2f82, 0x3eb3c590, 0x3ec00197, 0x3ec0c119,
- 0x3ec1413f, 0x3ec4c2af, 0x3ec74184, 0x3ec804ad,
- 0x3eca4081, 0x3eca8304, 0x3ecc03a0, 0x3ece02a0,
- 0x3ecf8084, 0x3ed00120, 0x3ed0c120, 0x3ed184ae,
- 0x3ed3c085, 0x3ed4312d, 0x3ef4cbad, 0x3efa892f,
- 0x3eff022d, 0x3f002f2f, 0x3f1782a5, 0x3f18c0b1,
- 0x3f1907af, 0x3f1cffaf, 0x3f3c81a5, 0x3f3d64af,
- 0x3f542031, 0x3f649b31, 0x3f7c0131, 0x3f7c83b3,
- 0x3f7e40b1, 0x3f7e80bd, 0x3f7ec0bb, 0x3f7f00b3,
- 0x3f840503, 0x3f8c01ad, 0x3f8cc315, 0x3f8e462d,
- 0x3f91cc03, 0x3f97c695, 0x3f9c01af, 0x3f9d0085,
- 0x3f9d852f, 0x3fa03aad, 0x3fbd442f, 0x3fc06f1f,
- 0x3fd7c11f, 0x3fd85fad, 0x3fe80081, 0x3fe84f1f,
- 0x3ff0831f, 0x3ff2831f, 0x3ff4831f, 0x3ff6819f,
- 0x3ff80783, 0x44268192, 0x442ac092, 0x444b8112,
- 0x44d2c112, 0x452ec212, 0x456e8112, 0x74578392,
- 0x746ec312, 0x75000d1f, 0x75068d1f, 0x750d0d1f,
- 0x7513839f, 0x7515891f, 0x751a0d1f, 0x75208d1f,
- 0x75271015, 0x752f439f, 0x7531459f, 0x75340d1f,
- 0x753a8d1f, 0x75410395, 0x7543441f, 0x7545839f,
- 0x75478d1f, 0x754e0795, 0x7552839f, 0x75548d1f,
- 0x755b0d1f, 0x75618d1f, 0x75680d1f, 0x756e8d1f,
- 0x75750d1f, 0x757b8d1f, 0x75820d1f, 0x75888d1f,
- 0x758f0d1f, 0x75958d1f, 0x759c0d1f, 0x75a28d1f,
- 0x75a90103, 0x75aa089f, 0x75ae4081, 0x75ae839f,
- 0x75b04081, 0x75b08c9f, 0x75b6c081, 0x75b7032d,
- 0x75b8889f, 0x75bcc081, 0x75bd039f, 0x75bec081,
- 0x75bf0c9f, 0x75c54081, 0x75c5832d, 0x75c7089f,
- 0x75cb4081, 0x75cb839f, 0x75cd4081, 0x75cd8c9f,
- 0x75d3c081, 0x75d4032d, 0x75d5889f, 0x75d9c081,
- 0x75da039f, 0x75dbc081, 0x75dc0c9f, 0x75e24081,
- 0x75e2832d, 0x75e4089f, 0x75e84081, 0x75e8839f,
- 0x75ea4081, 0x75ea8c9f, 0x75f0c081, 0x75f1042d,
- 0x75f3851f, 0x75f6051f, 0x75f8851f, 0x75fb051f,
- 0x75fd851f, 0x7b80022d, 0x7b814dad, 0x7b884203,
- 0x7b89c081, 0x7b8a452d, 0x7b8d0403, 0x7b908081,
- 0x7b91dc03, 0x7ba0052d, 0x7ba2c8ad, 0x7ba84483,
- 0x7baac8ad, 0x7c400097, 0x7c404521, 0x7c440d25,
- 0x7c4a8087, 0x7c4ac115, 0x7c4b4117, 0x7c4c0d1f,
- 0x7c528217, 0x7c538099, 0x7c53c097, 0x7c5a8197,
- 0x7c640097, 0x7c80012f, 0x7c808081, 0x7c841603,
- 0x7c9004c1, 0x7c940103, 0xbe0001ac, 0xbe00d110,
- 0xbe0947ac, 0xbe0d3910, 0xbe29872c, 0xbe2d022c,
- 0xbe2e3790, 0xbe49ff90, 0xbe69bc10,
+ 0x29dc0081, 0x29fe0103, 0x2ad70203, 0x2ada4081,
+ 0x3e401482, 0x3e4a7f82, 0x3e6a3f82, 0x3e8aa102,
+ 0x3e9b0110, 0x3e9c2f82, 0x3eb3c590, 0x3ec00197,
+ 0x3ec0c119, 0x3ec1413f, 0x3ec4c2af, 0x3ec74184,
+ 0x3ec804ad, 0x3eca4081, 0x3eca8304, 0x3ecc03a0,
+ 0x3ece02a0, 0x3ecf8084, 0x3ed00120, 0x3ed0c120,
+ 0x3ed184ae, 0x3ed3c085, 0x3ed4312d, 0x3ef4cbad,
+ 0x3efa892f, 0x3eff022d, 0x3f002f2f, 0x3f1782a5,
+ 0x3f18c0b1, 0x3f1907af, 0x3f1cffaf, 0x3f3c81a5,
+ 0x3f3d64af, 0x3f542031, 0x3f649b31, 0x3f7c0131,
+ 0x3f7c83b3, 0x3f7e40b1, 0x3f7e80bd, 0x3f7ec0bb,
+ 0x3f7f00b3, 0x3f840503, 0x3f8c01ad, 0x3f8cc315,
+ 0x3f8e462d, 0x3f91cc03, 0x3f97c695, 0x3f9c01af,
+ 0x3f9d0085, 0x3f9d852f, 0x3fa03aad, 0x3fbd442f,
+ 0x3fc06f1f, 0x3fd7c11f, 0x3fd85fad, 0x3fe80081,
+ 0x3fe84f1f, 0x3ff0831f, 0x3ff2831f, 0x3ff4831f,
+ 0x3ff6819f, 0x3ff80783, 0x44268192, 0x442ac092,
+ 0x444b8112, 0x44d2c112, 0x452ec212, 0x456e8112,
+ 0x464e0092, 0x74578392, 0x746ec312, 0x75000d1f,
+ 0x75068d1f, 0x750d0d1f, 0x7513839f, 0x7515891f,
+ 0x751a0d1f, 0x75208d1f, 0x75271015, 0x752f439f,
+ 0x7531459f, 0x75340d1f, 0x753a8d1f, 0x75410395,
+ 0x7543441f, 0x7545839f, 0x75478d1f, 0x754e0795,
+ 0x7552839f, 0x75548d1f, 0x755b0d1f, 0x75618d1f,
+ 0x75680d1f, 0x756e8d1f, 0x75750d1f, 0x757b8d1f,
+ 0x75820d1f, 0x75888d1f, 0x758f0d1f, 0x75958d1f,
+ 0x759c0d1f, 0x75a28d1f, 0x75a90103, 0x75aa089f,
+ 0x75ae4081, 0x75ae839f, 0x75b04081, 0x75b08c9f,
+ 0x75b6c081, 0x75b7032d, 0x75b8889f, 0x75bcc081,
+ 0x75bd039f, 0x75bec081, 0x75bf0c9f, 0x75c54081,
+ 0x75c5832d, 0x75c7089f, 0x75cb4081, 0x75cb839f,
+ 0x75cd4081, 0x75cd8c9f, 0x75d3c081, 0x75d4032d,
+ 0x75d5889f, 0x75d9c081, 0x75da039f, 0x75dbc081,
+ 0x75dc0c9f, 0x75e24081, 0x75e2832d, 0x75e4089f,
+ 0x75e84081, 0x75e8839f, 0x75ea4081, 0x75ea8c9f,
+ 0x75f0c081, 0x75f1042d, 0x75f3851f, 0x75f6051f,
+ 0x75f8851f, 0x75fb051f, 0x75fd851f, 0x7b80022d,
+ 0x7b814dad, 0x7b884203, 0x7b89c081, 0x7b8a452d,
+ 0x7b8d0403, 0x7b908081, 0x7b91dc03, 0x7ba0052d,
+ 0x7ba2c8ad, 0x7ba84483, 0x7baac8ad, 0x7c400097,
+ 0x7c404521, 0x7c440d25, 0x7c4a8087, 0x7c4ac115,
+ 0x7c4b4117, 0x7c4c0d1f, 0x7c528217, 0x7c538099,
+ 0x7c53c097, 0x7c5a8197, 0x7c640097, 0x7c80012f,
+ 0x7c808081, 0x7c841603, 0x7c9004c1, 0x7c940103,
+ 0x7efc051f, 0xbe0001ac, 0xbe00d110, 0xbe0947ac,
+ 0xbe0d3910, 0xbe29872c, 0xbe2d022c, 0xbe2e3790,
+ 0xbe49ff90, 0xbe69bc10,
 };
 
-static const uint16_t unicode_decomp_table2[687] = {
+static const uint16_t unicode_decomp_table2[690] = {
 0x0020, 0x0000, 0x0061, 0x0002, 0x0004, 0x0006, 0x03bc, 0x0008,
 0x000a, 0x000c, 0x0015, 0x0095, 0x00a5, 0x00b9, 0x00c1, 0x00c3,
 0x00c7, 0x00cb, 0x00d1, 0x00d7, 0x00dd, 0x00e0, 0x00e6, 0x00f8,
@@ -883,32 +899,33 @@
 0x10f4, 0x1100, 0x1105, 0x1111, 0x1141, 0x1149, 0x114d, 0x1153,
 0x1157, 0x115a, 0x116e, 0x1171, 0x1175, 0x117b, 0x117d, 0x1181,
 0x1184, 0x118c, 0x1192, 0x1196, 0x119c, 0x11a2, 0x11a8, 0x11ab,
- 0xa76f, 0x11af, 0x11b3, 0x11bb, 0x120d, 0x130b, 0x1409, 0x148d,
- 0x1492, 0x1550, 0x1569, 0x156f, 0x1575, 0x157b, 0x1587, 0x1593,
- 0x002b, 0x159e, 0x15b6, 0x15ba, 0x15be, 0x15c2, 0x15c6, 0x15ca,
- 0x15de, 0x15e2, 0x1646, 0x165f, 0x1685, 0x168b, 0x1749, 0x174f,
- 0x1754, 0x1774, 0x1874, 0x187a, 0x190e, 0x19d0, 0x1a74, 0x1a7c,
- 0x1a9a, 0x1a9f, 0x1ab3, 0x1abd, 0x1ac3, 0x1ad7, 0x1adc, 0x1ae2,
- 0x1af0, 0x1b20, 0x1b2d, 0x1b35, 0x1b39, 0x1b4f, 0x1bc6, 0x1bd8,
- 0x1bda, 0x1bdc, 0x3164, 0x1c1d, 0x1c1f, 0x1c21, 0x1c23, 0x1c25,
- 0x1c27, 0x1c45, 0x1c53, 0x1c58, 0x1c61, 0x1c6a, 0x1c7c, 0x1c85,
- 0x1ca5, 0x1cc0, 0x1cc2, 0x1cc4, 0x1cc6, 0x1cc8, 0x1cca, 0x1ccc,
- 0x1cce, 0x1cee, 0x1cf0, 0x1cf2, 0x1cf4, 0x1cf6, 0x1cfd, 0x1cff,
- 0x1d01, 0x1d03, 0x1d12, 0x1d14, 0x1d16, 0x1d18, 0x1d1a, 0x1d1c,
- 0x1d1e, 0x1d20, 0x1d22, 0x1d24, 0x1d26, 0x1d28, 0x1d2a, 0x1d2c,
- 0x1d2e, 0x1d32, 0x03f4, 0x1d34, 0x2207, 0x1d36, 0x2202, 0x1d38,
- 0x1d40, 0x03f4, 0x1d42, 0x2207, 0x1d44, 0x2202, 0x1d46, 0x1d4e,
- 0x03f4, 0x1d50, 0x2207, 0x1d52, 0x2202, 0x1d54, 0x1d5c, 0x03f4,
- 0x1d5e, 0x2207, 0x1d60, 0x2202, 0x1d62, 0x1d6a, 0x03f4, 0x1d6c,
- 0x2207, 0x1d6e, 0x2202, 0x1d70, 0x1d7a, 0x1d7c, 0x1d7e, 0x1d80,
- 0x1d82, 0x1d84, 0x1d8a, 0x1da7, 0x062d, 0x1daf, 0x1dbb, 0x062c,
- 0x1dcb, 0x1e3b, 0x1e47, 0x1e5a, 0x1e6c, 0x1e7f, 0x1e81, 0x1e85,
- 0x1e8b, 0x1e91, 0x1e93, 0x1e97, 0x1e99, 0x1ea1, 0x1ea4, 0x1ea6,
- 0x1eac, 0x1eae, 0x30b5, 0x1eb4, 0x1f0c, 0x1f22, 0x1f26, 0x1f2b,
- 0x1f78, 0x1f89, 0x208a, 0x209a, 0x20a0, 0x219a, 0x22b8,
+ 0xa76f, 0x11af, 0x11b3, 0x028d, 0x11bb, 0x120d, 0x130b, 0x1409,
+ 0x148d, 0x1492, 0x1550, 0x1569, 0x156f, 0x1575, 0x157b, 0x1587,
+ 0x1593, 0x002b, 0x159e, 0x15b6, 0x15ba, 0x15be, 0x15c2, 0x15c6,
+ 0x15ca, 0x15de, 0x15e2, 0x1646, 0x165f, 0x1685, 0x168b, 0x1749,
+ 0x174f, 0x1754, 0x1774, 0x1874, 0x187a, 0x190e, 0x19d0, 0x1a74,
+ 0x1a7c, 0x1a9a, 0x1a9f, 0x1ab3, 0x1abd, 0x1ac3, 0x1ad7, 0x1adc,
+ 0x1ae2, 0x1af0, 0x1b20, 0x1b2d, 0x1b35, 0x1b39, 0x1b4f, 0x1bc6,
+ 0x1bd8, 0x1bda, 0x1bdc, 0x3164, 0x1c1d, 0x1c1f, 0x1c21, 0x1c23,
+ 0x1c25, 0x1c27, 0x1c45, 0x1c53, 0x1c58, 0x1c61, 0x1c6a, 0x1c7c,
+ 0x1c85, 0x1c8a, 0x1caa, 0x1cc5, 0x1cc7, 0x1cc9, 0x1ccb, 0x1ccd,
+ 0x1ccf, 0x1cd1, 0x1cd3, 0x1cf3, 0x1cf5, 0x1cf7, 0x1cf9, 0x1cfb,
+ 0x1d02, 0x1d04, 0x1d06, 0x1d08, 0x1d17, 0x1d19, 0x1d1b, 0x1d1d,
+ 0x1d1f, 0x1d21, 0x1d23, 0x1d25, 0x1d27, 0x1d29, 0x1d2b, 0x1d2d,
+ 0x1d2f, 0x1d31, 0x1d33, 0x1d37, 0x03f4, 0x1d39, 0x2207, 0x1d3b,
+ 0x2202, 0x1d3d, 0x1d45, 0x03f4, 0x1d47, 0x2207, 0x1d49, 0x2202,
+ 0x1d4b, 0x1d53, 0x03f4, 0x1d55, 0x2207, 0x1d57, 0x2202, 0x1d59,
+ 0x1d61, 0x03f4, 0x1d63, 0x2207, 0x1d65, 0x2202, 0x1d67, 0x1d6f,
+ 0x03f4, 0x1d71, 0x2207, 0x1d73, 0x2202, 0x1d75, 0x1d7f, 0x1d81,
+ 0x1d83, 0x1d85, 0x1d87, 0x1d89, 0x1d8f, 0x1dac, 0x062d, 0x1db4,
+ 0x1dc0, 0x062c, 0x1dd0, 0x1e40, 0x1e4c, 0x1e5f, 0x1e71, 0x1e84,
+ 0x1e86, 0x1e8a, 0x1e90, 0x1e96, 0x1e98, 0x1e9c, 0x1e9e, 0x1ea6,
+ 0x1ea9, 0x1eab, 0x1eb1, 0x1eb3, 0x30b5, 0x1eb9, 0x1f11, 0x1f27,
+ 0x1f2b, 0x1f2d, 0x1f32, 0x1f7f, 0x1f90, 0x2091, 0x20a1, 0x20a7,
+ 0x21a1, 0x22bf,
 };
 
-static const uint8_t unicode_decomp_data[9158] = {
+static const uint8_t unicode_decomp_data[9165] = {
 0x20, 0x88, 0x20, 0x84, 0x32, 0x33, 0x20, 0x81,
 0x20, 0xa7, 0x31, 0x6f, 0x31, 0xd0, 0x34, 0x31,
 0xd0, 0x32, 0x33, 0xd0, 0x34, 0x41, 0x80, 0x41,
@@ -1821,242 +1838,243 @@
 0x13, 0x55, 0xb9, 0x14, 0xba, 0x14, 0xb9, 0x14,
 0xb0, 0x14, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x14,
 0xbd, 0x14, 0x55, 0x50, 0xb8, 0x15, 0xaf, 0x15,
- 0xb9, 0x15, 0xaf, 0x15, 0x55, 0x57, 0xd1, 0x65,
- 0xd1, 0x58, 0xd1, 0x65, 0xd1, 0x5f, 0xd1, 0x6e,
- 0xd1, 0x5f, 0xd1, 0x6f, 0xd1, 0x5f, 0xd1, 0x70,
- 0xd1, 0x5f, 0xd1, 0x71, 0xd1, 0x5f, 0xd1, 0x72,
- 0xd1, 0x55, 0x55, 0x55, 0x05, 0xb9, 0xd1, 0x65,
- 0xd1, 0xba, 0xd1, 0x65, 0xd1, 0xbb, 0xd1, 0x6e,
- 0xd1, 0xbc, 0xd1, 0x6e, 0xd1, 0xbb, 0xd1, 0x6f,
- 0xd1, 0xbc, 0xd1, 0x6f, 0xd1, 0x55, 0x55, 0x55,
- 0x41, 0x00, 0x61, 0x00, 0x41, 0x00, 0x61, 0x00,
- 0x69, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41, 0x00,
- 0x43, 0x44, 0x00, 0x00, 0x47, 0x00, 0x00, 0x4a,
- 0x4b, 0x00, 0x00, 0x4e, 0x4f, 0x50, 0x51, 0x00,
- 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a,
- 0x61, 0x62, 0x63, 0x64, 0x00, 0x66, 0x68, 0x00,
- 0x70, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41, 0x42,
- 0x00, 0x44, 0x45, 0x46, 0x47, 0x4a, 0x00, 0x53,
+ 0xb9, 0x15, 0xaf, 0x15, 0x55, 0x35, 0x19, 0x30,
+ 0x19, 0x05, 0x57, 0xd1, 0x65, 0xd1, 0x58, 0xd1,
+ 0x65, 0xd1, 0x5f, 0xd1, 0x6e, 0xd1, 0x5f, 0xd1,
+ 0x6f, 0xd1, 0x5f, 0xd1, 0x70, 0xd1, 0x5f, 0xd1,
+ 0x71, 0xd1, 0x5f, 0xd1, 0x72, 0xd1, 0x55, 0x55,
+ 0x55, 0x05, 0xb9, 0xd1, 0x65, 0xd1, 0xba, 0xd1,
+ 0x65, 0xd1, 0xbb, 0xd1, 0x6e, 0xd1, 0xbc, 0xd1,
+ 0x6e, 0xd1, 0xbb, 0xd1, 0x6f, 0xd1, 0xbc, 0xd1,
+ 0x6f, 0xd1, 0x55, 0x55, 0x55, 0x41, 0x00, 0x61,
+ 0x00, 0x41, 0x00, 0x61, 0x00, 0x69, 0x00, 0x41,
+ 0x00, 0x61, 0x00, 0x41, 0x00, 0x43, 0x44, 0x00,
+ 0x00, 0x47, 0x00, 0x00, 0x4a, 0x4b, 0x00, 0x00,
+ 0x4e, 0x4f, 0x50, 0x51, 0x00, 0x53, 0x54, 0x55,
+ 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63,
+ 0x64, 0x00, 0x66, 0x68, 0x00, 0x70, 0x00, 0x41,
 0x00, 0x61, 0x00, 0x41, 0x42, 0x00, 0x44, 0x45,
- 0x46, 0x47, 0x00, 0x49, 0x4a, 0x4b, 0x4c, 0x4d,
- 0x00, 0x4f, 0x53, 0x00, 0x61, 0x00, 0x41, 0x00,
- 0x61, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41, 0x00,
- 0x61, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41, 0x00,
- 0x61, 0x00, 0x41, 0x00, 0x61, 0x00, 0x31, 0x01,
- 0x37, 0x02, 0x91, 0x03, 0xa3, 0x03, 0xb1, 0x03,
- 0xd1, 0x03, 0x24, 0x00, 0x1f, 0x04, 0x20, 0x05,
- 0x91, 0x03, 0xa3, 0x03, 0xb1, 0x03, 0xd1, 0x03,
- 0x24, 0x00, 0x1f, 0x04, 0x20, 0x05, 0x91, 0x03,
- 0xa3, 0x03, 0xb1, 0x03, 0xd1, 0x03, 0x24, 0x00,
- 0x1f, 0x04, 0x20, 0x05, 0x91, 0x03, 0xa3, 0x03,
- 0xb1, 0x03, 0xd1, 0x03, 0x24, 0x00, 0x1f, 0x04,
- 0x20, 0x05, 0x91, 0x03, 0xa3, 0x03, 0xb1, 0x03,
- 0xd1, 0x03, 0x24, 0x00, 0x1f, 0x04, 0x20, 0x05,
- 0x0b, 0x0c, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00,
- 0x30, 0x00, 0x30, 0x00, 0x27, 0x06, 0x00, 0x01,
- 0x05, 0x08, 0x2a, 0x06, 0x1e, 0x08, 0x03, 0x0d,
- 0x20, 0x19, 0x1a, 0x1b, 0x1c, 0x09, 0x0f, 0x17,
- 0x0b, 0x18, 0x07, 0x0a, 0x00, 0x01, 0x04, 0x06,
- 0x0c, 0x0e, 0x10, 0x44, 0x90, 0x77, 0x45, 0x28,
- 0x06, 0x2c, 0x06, 0x00, 0x00, 0x47, 0x06, 0x33,
- 0x06, 0x17, 0x10, 0x11, 0x12, 0x13, 0x00, 0x06,
- 0x0e, 0x02, 0x0f, 0x34, 0x06, 0x2a, 0x06, 0x2b,
- 0x06, 0x2e, 0x06, 0x00, 0x00, 0x36, 0x06, 0x00,
- 0x00, 0x3a, 0x06, 0x2d, 0x06, 0x00, 0x00, 0x4a,
- 0x06, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0x46,
- 0x06, 0x33, 0x06, 0x39, 0x06, 0x00, 0x00, 0x35,
- 0x06, 0x42, 0x06, 0x00, 0x00, 0x34, 0x06, 0x00,
- 0x00, 0x00, 0x00, 0x2e, 0x06, 0x00, 0x00, 0x36,
- 0x06, 0x00, 0x00, 0x3a, 0x06, 0x00, 0x00, 0xba,
- 0x06, 0x00, 0x00, 0x6f, 0x06, 0x00, 0x00, 0x28,
- 0x06, 0x2c, 0x06, 0x00, 0x00, 0x47, 0x06, 0x00,
- 0x00, 0x00, 0x00, 0x2d, 0x06, 0x37, 0x06, 0x4a,
- 0x06, 0x43, 0x06, 0x00, 0x00, 0x45, 0x06, 0x46,
- 0x06, 0x33, 0x06, 0x39, 0x06, 0x41, 0x06, 0x35,
- 0x06, 0x42, 0x06, 0x00, 0x00, 0x34, 0x06, 0x2a,
- 0x06, 0x2b, 0x06, 0x2e, 0x06, 0x00, 0x00, 0x36,
- 0x06, 0x38, 0x06, 0x3a, 0x06, 0x6e, 0x06, 0x00,
- 0x00, 0xa1, 0x06, 0x27, 0x06, 0x00, 0x01, 0x05,
- 0x08, 0x20, 0x21, 0x0b, 0x06, 0x10, 0x23, 0x2a,
- 0x06, 0x1a, 0x1b, 0x1c, 0x09, 0x0f, 0x17, 0x0b,
- 0x18, 0x07, 0x0a, 0x00, 0x01, 0x04, 0x06, 0x0c,
- 0x0e, 0x10, 0x28, 0x06, 0x2c, 0x06, 0x2f, 0x06,
- 0x00, 0x00, 0x48, 0x06, 0x32, 0x06, 0x2d, 0x06,
- 0x37, 0x06, 0x4a, 0x06, 0x2a, 0x06, 0x1a, 0x1b,
+ 0x46, 0x47, 0x4a, 0x00, 0x53, 0x00, 0x61, 0x00,
+ 0x41, 0x42, 0x00, 0x44, 0x45, 0x46, 0x47, 0x00,
+ 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x00, 0x4f, 0x53,
+ 0x00, 0x61, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41,
+ 0x00, 0x61, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41,
+ 0x00, 0x61, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41,
+ 0x00, 0x61, 0x00, 0x31, 0x01, 0x37, 0x02, 0x91,
+ 0x03, 0xa3, 0x03, 0xb1, 0x03, 0xd1, 0x03, 0x24,
+ 0x00, 0x1f, 0x04, 0x20, 0x05, 0x91, 0x03, 0xa3,
+ 0x03, 0xb1, 0x03, 0xd1, 0x03, 0x24, 0x00, 0x1f,
+ 0x04, 0x20, 0x05, 0x91, 0x03, 0xa3, 0x03, 0xb1,
+ 0x03, 0xd1, 0x03, 0x24, 0x00, 0x1f, 0x04, 0x20,
+ 0x05, 0x91, 0x03, 0xa3, 0x03, 0xb1, 0x03, 0xd1,
+ 0x03, 0x24, 0x00, 0x1f, 0x04, 0x20, 0x05, 0x91,
+ 0x03, 0xa3, 0x03, 0xb1, 0x03, 0xd1, 0x03, 0x24,
+ 0x00, 0x1f, 0x04, 0x20, 0x05, 0x0b, 0x0c, 0x30,
+ 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30,
+ 0x00, 0x27, 0x06, 0x00, 0x01, 0x05, 0x08, 0x2a,
+ 0x06, 0x1e, 0x08, 0x03, 0x0d, 0x20, 0x19, 0x1a,
+ 0x1b, 0x1c, 0x09, 0x0f, 0x17, 0x0b, 0x18, 0x07,
+ 0x0a, 0x00, 0x01, 0x04, 0x06, 0x0c, 0x0e, 0x10,
+ 0x44, 0x90, 0x77, 0x45, 0x28, 0x06, 0x2c, 0x06,
+ 0x00, 0x00, 0x47, 0x06, 0x33, 0x06, 0x17, 0x10,
+ 0x11, 0x12, 0x13, 0x00, 0x06, 0x0e, 0x02, 0x0f,
+ 0x34, 0x06, 0x2a, 0x06, 0x2b, 0x06, 0x2e, 0x06,
+ 0x00, 0x00, 0x36, 0x06, 0x00, 0x00, 0x3a, 0x06,
+ 0x2d, 0x06, 0x00, 0x00, 0x4a, 0x06, 0x00, 0x00,
+ 0x44, 0x06, 0x00, 0x00, 0x46, 0x06, 0x33, 0x06,
+ 0x39, 0x06, 0x00, 0x00, 0x35, 0x06, 0x42, 0x06,
+ 0x00, 0x00, 0x34, 0x06, 0x00, 0x00, 0x00, 0x00,
+ 0x2e, 0x06, 0x00, 0x00, 0x36, 0x06, 0x00, 0x00,
+ 0x3a, 0x06, 0x00, 0x00, 0xba, 0x06, 0x00, 0x00,
+ 0x6f, 0x06, 0x00, 0x00, 0x28, 0x06, 0x2c, 0x06,
+ 0x00, 0x00, 0x47, 0x06, 0x00, 0x00, 0x00, 0x00,
+ 0x2d, 0x06, 0x37, 0x06, 0x4a, 0x06, 0x43, 0x06,
+ 0x00, 0x00, 0x45, 0x06, 0x46, 0x06, 0x33, 0x06,
+ 0x39, 0x06, 0x41, 0x06, 0x35, 0x06, 0x42, 0x06,
+ 0x00, 0x00, 0x34, 0x06, 0x2a, 0x06, 0x2b, 0x06,
+ 0x2e, 0x06, 0x00, 0x00, 0x36, 0x06, 0x38, 0x06,
+ 0x3a, 0x06, 0x6e, 0x06, 0x00, 0x00, 0xa1, 0x06,
+ 0x27, 0x06, 0x00, 0x01, 0x05, 0x08, 0x20, 0x21,
+ 0x0b, 0x06, 0x10, 0x23, 0x2a, 0x06, 0x1a, 0x1b,
 0x1c, 0x09, 0x0f, 0x17, 0x0b, 0x18, 0x07, 0x0a,
- 0x00, 0x01, 0x04, 0x06, 0x0c, 0x0e, 0x10, 0x30,
- 0x2e, 0x30, 0x00, 0x2c, 0x00, 0x28, 0x00, 0x41,
- 0x00, 0x29, 0x00, 0x14, 0x30, 0x53, 0x00, 0x15,
- 0x30, 0x43, 0x52, 0x43, 0x44, 0x57, 0x5a, 0x41,
- 0x00, 0x48, 0x56, 0x4d, 0x56, 0x53, 0x44, 0x53,
- 0x53, 0x50, 0x50, 0x56, 0x57, 0x43, 0x4d, 0x43,
- 0x4d, 0x44, 0x4d, 0x52, 0x44, 0x4a, 0x4b, 0x30,
- 0x30, 0x00, 0x68, 0x68, 0x4b, 0x62, 0x57, 0x5b,
- 0xcc, 0x53, 0xc7, 0x30, 0x8c, 0x4e, 0x1a, 0x59,
- 0xe3, 0x89, 0x29, 0x59, 0xa4, 0x4e, 0x20, 0x66,
- 0x21, 0x71, 0x99, 0x65, 0x4d, 0x52, 0x8c, 0x5f,
- 0x8d, 0x51, 0xb0, 0x65, 0x1d, 0x52, 0x42, 0x7d,
- 0x1f, 0x75, 0xa9, 0x8c, 0xf0, 0x58, 0x39, 0x54,
- 0x14, 0x6f, 0x95, 0x62, 0x55, 0x63, 0x00, 0x4e,
- 0x09, 0x4e, 0x4a, 0x90, 0xe6, 0x5d, 0x2d, 0x4e,
- 0xf3, 0x53, 0x07, 0x63, 0x70, 0x8d, 0x53, 0x62,
- 0x81, 0x79, 0x7a, 0x7a, 0x08, 0x54, 0x80, 0x6e,
- 0x09, 0x67, 0x08, 0x67, 0x33, 0x75, 0x72, 0x52,
- 0xb6, 0x55, 0x4d, 0x91, 0x14, 0x30, 0x15, 0x30,
- 0x2c, 0x67, 0x09, 0x4e, 0x8c, 0x4e, 0x89, 0x5b,
- 0xb9, 0x70, 0x53, 0x62, 0xd7, 0x76, 0xdd, 0x52,
- 0x57, 0x65, 0x97, 0x5f, 0xef, 0x53, 0x38, 0x4e,
- 0x05, 0x00, 0x09, 0x22, 0x01, 0x60, 0x4f, 0xae,
- 0x4f, 0xbb, 0x4f, 0x02, 0x50, 0x7a, 0x50, 0x99,
- 0x50, 0xe7, 0x50, 0xcf, 0x50, 0x9e, 0x34, 0x3a,
- 0x06, 0x4d, 0x51, 0x54, 0x51, 0x64, 0x51, 0x77,
- 0x51, 0x1c, 0x05, 0xb9, 0x34, 0x67, 0x51, 0x8d,
- 0x51, 0x4b, 0x05, 0x97, 0x51, 0xa4, 0x51, 0xcc,
- 0x4e, 0xac, 0x51, 0xb5, 0x51, 0xdf, 0x91, 0xf5,
- 0x51, 0x03, 0x52, 0xdf, 0x34, 0x3b, 0x52, 0x46,
- 0x52, 0x72, 0x52, 0x77, 0x52, 0x15, 0x35, 0x02,
- 0x00, 0x20, 0x80, 0x80, 0x00, 0x08, 0x00, 0x00,
- 0xc7, 0x52, 0x00, 0x02, 0x1d, 0x33, 0x3e, 0x3f,
- 0x50, 0x82, 0x8a, 0x93, 0xac, 0xb6, 0xb8, 0xb8,
- 0xb8, 0x2c, 0x0a, 0x70, 0x70, 0xca, 0x53, 0xdf,
- 0x53, 0x63, 0x0b, 0xeb, 0x53, 0xf1, 0x53, 0x06,
- 0x54, 0x9e, 0x54, 0x38, 0x54, 0x48, 0x54, 0x68,
- 0x54, 0xa2, 0x54, 0xf6, 0x54, 0x10, 0x55, 0x53,
- 0x55, 0x63, 0x55, 0x84, 0x55, 0x84, 0x55, 0x99,
- 0x55, 0xab, 0x55, 0xb3, 0x55, 0xc2, 0x55, 0x16,
- 0x57, 0x06, 0x56, 0x17, 0x57, 0x51, 0x56, 0x74,
- 0x56, 0x07, 0x52, 0xee, 0x58, 0xce, 0x57, 0xf4,
- 0x57, 0x0d, 0x58, 0x8b, 0x57, 0x32, 0x58, 0x31,
- 0x58, 0xac, 0x58, 0xe4, 0x14, 0xf2, 0x58, 0xf7,
- 0x58, 0x06, 0x59, 0x1a, 0x59, 0x22, 0x59, 0x62,
- 0x59, 0xa8, 0x16, 0xea, 0x16, 0xec, 0x59, 0x1b,
- 0x5a, 0x27, 0x5a, 0xd8, 0x59, 0x66, 0x5a, 0xee,
- 0x36, 0xfc, 0x36, 0x08, 0x5b, 0x3e, 0x5b, 0x3e,
- 0x5b, 0xc8, 0x19, 0xc3, 0x5b, 0xd8, 0x5b, 0xe7,
- 0x5b, 0xf3, 0x5b, 0x18, 0x1b, 0xff, 0x5b, 0x06,
- 0x5c, 0x53, 0x5f, 0x22, 0x5c, 0x81, 0x37, 0x60,
- 0x5c, 0x6e, 0x5c, 0xc0, 0x5c, 0x8d, 0x5c, 0xe4,
- 0x1d, 0x43, 0x5d, 0xe6, 0x1d, 0x6e, 0x5d, 0x6b,
- 0x5d, 0x7c, 0x5d, 0xe1, 0x5d, 0xe2, 0x5d, 0x2f,
- 0x38, 0xfd, 0x5d, 0x28, 0x5e, 0x3d, 0x5e, 0x69,
- 0x5e, 0x62, 0x38, 0x83, 0x21, 0x7c, 0x38, 0xb0,
- 0x5e, 0xb3, 0x5e, 0xb6, 0x5e, 0xca, 0x5e, 0x92,
- 0xa3, 0xfe, 0x5e, 0x31, 0x23, 0x31, 0x23, 0x01,
- 0x82, 0x22, 0x5f, 0x22, 0x5f, 0xc7, 0x38, 0xb8,
- 0x32, 0xda, 0x61, 0x62, 0x5f, 0x6b, 0x5f, 0xe3,
- 0x38, 0x9a, 0x5f, 0xcd, 0x5f, 0xd7, 0x5f, 0xf9,
- 0x5f, 0x81, 0x60, 0x3a, 0x39, 0x1c, 0x39, 0x94,
- 0x60, 0xd4, 0x26, 0xc7, 0x60, 0x02, 0x02, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
- 0x0a, 0x00, 0x00, 0x02, 0x08, 0x00, 0x80, 0x08,
- 0x00, 0x00, 0x08, 0x80, 0x28, 0x80, 0x02, 0x00,
- 0x00, 0x02, 0x48, 0x61, 0x00, 0x04, 0x06, 0x04,
- 0x32, 0x46, 0x6a, 0x5c, 0x67, 0x96, 0xaa, 0xae,
- 0xc8, 0xd3, 0x5d, 0x62, 0x00, 0x54, 0x77, 0xf3,
- 0x0c, 0x2b, 0x3d, 0x63, 0xfc, 0x62, 0x68, 0x63,
- 0x83, 0x63, 0xe4, 0x63, 0xf1, 0x2b, 0x22, 0x64,
- 0xc5, 0x63, 0xa9, 0x63, 0x2e, 0x3a, 0x69, 0x64,
- 0x7e, 0x64, 0x9d, 0x64, 0x77, 0x64, 0x6c, 0x3a,
- 0x4f, 0x65, 0x6c, 0x65, 0x0a, 0x30, 0xe3, 0x65,
- 0xf8, 0x66, 0x49, 0x66, 0x19, 0x3b, 0x91, 0x66,
- 0x08, 0x3b, 0xe4, 0x3a, 0x92, 0x51, 0x95, 0x51,
- 0x00, 0x67, 0x9c, 0x66, 0xad, 0x80, 0xd9, 0x43,
- 0x17, 0x67, 0x1b, 0x67, 0x21, 0x67, 0x5e, 0x67,
- 0x53, 0x67, 0xc3, 0x33, 0x49, 0x3b, 0xfa, 0x67,
- 0x85, 0x67, 0x52, 0x68, 0x85, 0x68, 0x6d, 0x34,
- 0x8e, 0x68, 0x1f, 0x68, 0x14, 0x69, 0x9d, 0x3b,
- 0x42, 0x69, 0xa3, 0x69, 0xea, 0x69, 0xa8, 0x6a,
- 0xa3, 0x36, 0xdb, 0x6a, 0x18, 0x3c, 0x21, 0x6b,
- 0xa7, 0x38, 0x54, 0x6b, 0x4e, 0x3c, 0x72, 0x6b,
- 0x9f, 0x6b, 0xba, 0x6b, 0xbb, 0x6b, 0x8d, 0x3a,
- 0x0b, 0x1d, 0xfa, 0x3a, 0x4e, 0x6c, 0xbc, 0x3c,
- 0xbf, 0x6c, 0xcd, 0x6c, 0x67, 0x6c, 0x16, 0x6d,
- 0x3e, 0x6d, 0x77, 0x6d, 0x41, 0x6d, 0x69, 0x6d,
- 0x78, 0x6d, 0x85, 0x6d, 0x1e, 0x3d, 0x34, 0x6d,
- 0x2f, 0x6e, 0x6e, 0x6e, 0x33, 0x3d, 0xcb, 0x6e,
- 0xc7, 0x6e, 0xd1, 0x3e, 0xf9, 0x6d, 0x6e, 0x6f,
- 0x5e, 0x3f, 0x8e, 0x3f, 0xc6, 0x6f, 0x39, 0x70,
- 0x1e, 0x70, 0x1b, 0x70, 0x96, 0x3d, 0x4a, 0x70,
- 0x7d, 0x70, 0x77, 0x70, 0xad, 0x70, 0x25, 0x05,
- 0x45, 0x71, 0x63, 0x42, 0x9c, 0x71, 0xab, 0x43,
- 0x28, 0x72, 0x35, 0x72, 0x50, 0x72, 0x08, 0x46,
- 0x80, 0x72, 0x95, 0x72, 0x35, 0x47, 0x02, 0x20,
- 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x08,
- 0x80, 0x00, 0x00, 0x02, 0x02, 0x80, 0x8a, 0x00,
- 0x00, 0x20, 0x00, 0x08, 0x0a, 0x00, 0x80, 0x88,
- 0x80, 0x20, 0x14, 0x48, 0x7a, 0x73, 0x8b, 0x73,
- 0xac, 0x3e, 0xa5, 0x73, 0xb8, 0x3e, 0xb8, 0x3e,
- 0x47, 0x74, 0x5c, 0x74, 0x71, 0x74, 0x85, 0x74,
- 0xca, 0x74, 0x1b, 0x3f, 0x24, 0x75, 0x36, 0x4c,
- 0x3e, 0x75, 0x92, 0x4c, 0x70, 0x75, 0x9f, 0x21,
- 0x10, 0x76, 0xa1, 0x4f, 0xb8, 0x4f, 0x44, 0x50,
- 0xfc, 0x3f, 0x08, 0x40, 0xf4, 0x76, 0xf3, 0x50,
- 0xf2, 0x50, 0x19, 0x51, 0x33, 0x51, 0x1e, 0x77,
- 0x1f, 0x77, 0x1f, 0x77, 0x4a, 0x77, 0x39, 0x40,
- 0x8b, 0x77, 0x46, 0x40, 0x96, 0x40, 0x1d, 0x54,
- 0x4e, 0x78, 0x8c, 0x78, 0xcc, 0x78, 0xe3, 0x40,
- 0x26, 0x56, 0x56, 0x79, 0x9a, 0x56, 0xc5, 0x56,
- 0x8f, 0x79, 0xeb, 0x79, 0x2f, 0x41, 0x40, 0x7a,
- 0x4a, 0x7a, 0x4f, 0x7a, 0x7c, 0x59, 0xa7, 0x5a,
- 0xa7, 0x5a, 0xee, 0x7a, 0x02, 0x42, 0xab, 0x5b,
- 0xc6, 0x7b, 0xc9, 0x7b, 0x27, 0x42, 0x80, 0x5c,
- 0xd2, 0x7c, 0xa0, 0x42, 0xe8, 0x7c, 0xe3, 0x7c,
- 0x00, 0x7d, 0x86, 0x5f, 0x63, 0x7d, 0x01, 0x43,
- 0xc7, 0x7d, 0x02, 0x7e, 0x45, 0x7e, 0x34, 0x43,
- 0x28, 0x62, 0x47, 0x62, 0x59, 0x43, 0xd9, 0x62,
- 0x7a, 0x7f, 0x3e, 0x63, 0x95, 0x7f, 0xfa, 0x7f,
- 0x05, 0x80, 0xda, 0x64, 0x23, 0x65, 0x60, 0x80,
- 0xa8, 0x65, 0x70, 0x80, 0x5f, 0x33, 0xd5, 0x43,
- 0xb2, 0x80, 0x03, 0x81, 0x0b, 0x44, 0x3e, 0x81,
- 0xb5, 0x5a, 0xa7, 0x67, 0xb5, 0x67, 0x93, 0x33,
- 0x9c, 0x33, 0x01, 0x82, 0x04, 0x82, 0x9e, 0x8f,
- 0x6b, 0x44, 0x91, 0x82, 0x8b, 0x82, 0x9d, 0x82,
- 0xb3, 0x52, 0xb1, 0x82, 0xb3, 0x82, 0xbd, 0x82,
- 0xe6, 0x82, 0x3c, 0x6b, 0xe5, 0x82, 0x1d, 0x83,
- 0x63, 0x83, 0xad, 0x83, 0x23, 0x83, 0xbd, 0x83,
- 0xe7, 0x83, 0x57, 0x84, 0x53, 0x83, 0xca, 0x83,
- 0xcc, 0x83, 0xdc, 0x83, 0x36, 0x6c, 0x6b, 0x6d,
- 0x02, 0x00, 0x00, 0x20, 0x22, 0x2a, 0xa0, 0x0a,
- 0x00, 0x20, 0x80, 0x28, 0x00, 0xa8, 0x20, 0x20,
- 0x00, 0x02, 0x80, 0x22, 0x02, 0x8a, 0x08, 0x00,
- 0xaa, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x28,
- 0xd5, 0x6c, 0x2b, 0x45, 0xf1, 0x84, 0xf3, 0x84,
- 0x16, 0x85, 0xca, 0x73, 0x64, 0x85, 0x2c, 0x6f,
- 0x5d, 0x45, 0x61, 0x45, 0xb1, 0x6f, 0xd2, 0x70,
- 0x6b, 0x45, 0x50, 0x86, 0x5c, 0x86, 0x67, 0x86,
- 0x69, 0x86, 0xa9, 0x86, 0x88, 0x86, 0x0e, 0x87,
- 0xe2, 0x86, 0x79, 0x87, 0x28, 0x87, 0x6b, 0x87,
- 0x86, 0x87, 0xd7, 0x45, 0xe1, 0x87, 0x01, 0x88,
- 0xf9, 0x45, 0x60, 0x88, 0x63, 0x88, 0x67, 0x76,
- 0xd7, 0x88, 0xde, 0x88, 0x35, 0x46, 0xfa, 0x88,
- 0xbb, 0x34, 0xae, 0x78, 0x66, 0x79, 0xbe, 0x46,
- 0xc7, 0x46, 0xa0, 0x8a, 0xed, 0x8a, 0x8a, 0x8b,
- 0x55, 0x8c, 0xa8, 0x7c, 0xab, 0x8c, 0xc1, 0x8c,
- 0x1b, 0x8d, 0x77, 0x8d, 0x2f, 0x7f, 0x04, 0x08,
- 0xcb, 0x8d, 0xbc, 0x8d, 0xf0, 0x8d, 0xde, 0x08,
- 0xd4, 0x8e, 0x38, 0x8f, 0xd2, 0x85, 0xed, 0x85,
- 0x94, 0x90, 0xf1, 0x90, 0x11, 0x91, 0x2e, 0x87,
- 0x1b, 0x91, 0x38, 0x92, 0xd7, 0x92, 0xd8, 0x92,
- 0x7c, 0x92, 0xf9, 0x93, 0x15, 0x94, 0xfa, 0x8b,
- 0x8b, 0x95, 0x95, 0x49, 0xb7, 0x95, 0x77, 0x8d,
- 0xe6, 0x49, 0xc3, 0x96, 0xb2, 0x5d, 0x23, 0x97,
- 0x45, 0x91, 0x1a, 0x92, 0x6e, 0x4a, 0x76, 0x4a,
- 0xe0, 0x97, 0x0a, 0x94, 0xb2, 0x4a, 0x96, 0x94,
- 0x0b, 0x98, 0x0b, 0x98, 0x29, 0x98, 0xb6, 0x95,
- 0xe2, 0x98, 0x33, 0x4b, 0x29, 0x99, 0xa7, 0x99,
- 0xc2, 0x99, 0xfe, 0x99, 0xce, 0x4b, 0x30, 0x9b,
- 0x12, 0x9b, 0x40, 0x9c, 0xfd, 0x9c, 0xce, 0x4c,
- 0xed, 0x4c, 0x67, 0x9d, 0xce, 0xa0, 0xf8, 0x4c,
- 0x05, 0xa1, 0x0e, 0xa2, 0x91, 0xa2, 0xbb, 0x9e,
- 0x56, 0x4d, 0xf9, 0x9e, 0xfe, 0x9e, 0x05, 0x9f,
- 0x0f, 0x9f, 0x16, 0x9f, 0x3b, 0x9f, 0x00, 0xa6,
- 0x02, 0x88, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x80,
- 0x00, 0x28, 0x00, 0x08, 0xa0, 0x80, 0xa0, 0x80,
- 0x00, 0x80, 0x80, 0x00, 0x0a, 0x88, 0x80, 0x00,
- 0x80, 0x00, 0x20, 0x2a, 0x00, 0x80,
+ 0x00, 0x01, 0x04, 0x06, 0x0c, 0x0e, 0x10, 0x28,
+ 0x06, 0x2c, 0x06, 0x2f, 0x06, 0x00, 0x00, 0x48,
+ 0x06, 0x32, 0x06, 0x2d, 0x06, 0x37, 0x06, 0x4a,
+ 0x06, 0x2a, 0x06, 0x1a, 0x1b, 0x1c, 0x09, 0x0f,
+ 0x17, 0x0b, 0x18, 0x07, 0x0a, 0x00, 0x01, 0x04,
+ 0x06, 0x0c, 0x0e, 0x10, 0x30, 0x2e, 0x30, 0x00,
+ 0x2c, 0x00, 0x28, 0x00, 0x41, 0x00, 0x29, 0x00,
+ 0x14, 0x30, 0x53, 0x00, 0x15, 0x30, 0x43, 0x52,
+ 0x43, 0x44, 0x57, 0x5a, 0x41, 0x00, 0x48, 0x56,
+ 0x4d, 0x56, 0x53, 0x44, 0x53, 0x53, 0x50, 0x50,
+ 0x56, 0x57, 0x43, 0x4d, 0x43, 0x4d, 0x44, 0x4d,
+ 0x52, 0x44, 0x4a, 0x4b, 0x30, 0x30, 0x00, 0x68,
+ 0x68, 0x4b, 0x62, 0x57, 0x5b, 0xcc, 0x53, 0xc7,
+ 0x30, 0x8c, 0x4e, 0x1a, 0x59, 0xe3, 0x89, 0x29,
+ 0x59, 0xa4, 0x4e, 0x20, 0x66, 0x21, 0x71, 0x99,
+ 0x65, 0x4d, 0x52, 0x8c, 0x5f, 0x8d, 0x51, 0xb0,
+ 0x65, 0x1d, 0x52, 0x42, 0x7d, 0x1f, 0x75, 0xa9,
+ 0x8c, 0xf0, 0x58, 0x39, 0x54, 0x14, 0x6f, 0x95,
+ 0x62, 0x55, 0x63, 0x00, 0x4e, 0x09, 0x4e, 0x4a,
+ 0x90, 0xe6, 0x5d, 0x2d, 0x4e, 0xf3, 0x53, 0x07,
+ 0x63, 0x70, 0x8d, 0x53, 0x62, 0x81, 0x79, 0x7a,
+ 0x7a, 0x08, 0x54, 0x80, 0x6e, 0x09, 0x67, 0x08,
+ 0x67, 0x33, 0x75, 0x72, 0x52, 0xb6, 0x55, 0x4d,
+ 0x91, 0x14, 0x30, 0x15, 0x30, 0x2c, 0x67, 0x09,
+ 0x4e, 0x8c, 0x4e, 0x89, 0x5b, 0xb9, 0x70, 0x53,
+ 0x62, 0xd7, 0x76, 0xdd, 0x52, 0x57, 0x65, 0x97,
+ 0x5f, 0xef, 0x53, 0x30, 0x00, 0x38, 0x4e, 0x05,
+ 0x00, 0x09, 0x22, 0x01, 0x60, 0x4f, 0xae, 0x4f,
+ 0xbb, 0x4f, 0x02, 0x50, 0x7a, 0x50, 0x99, 0x50,
+ 0xe7, 0x50, 0xcf, 0x50, 0x9e, 0x34, 0x3a, 0x06,
+ 0x4d, 0x51, 0x54, 0x51, 0x64, 0x51, 0x77, 0x51,
+ 0x1c, 0x05, 0xb9, 0x34, 0x67, 0x51, 0x8d, 0x51,
+ 0x4b, 0x05, 0x97, 0x51, 0xa4, 0x51, 0xcc, 0x4e,
+ 0xac, 0x51, 0xb5, 0x51, 0xdf, 0x91, 0xf5, 0x51,
+ 0x03, 0x52, 0xdf, 0x34, 0x3b, 0x52, 0x46, 0x52,
+ 0x72, 0x52, 0x77, 0x52, 0x15, 0x35, 0x02, 0x00,
+ 0x20, 0x80, 0x80, 0x00, 0x08, 0x00, 0x00, 0xc7,
+ 0x52, 0x00, 0x02, 0x1d, 0x33, 0x3e, 0x3f, 0x50,
+ 0x82, 0x8a, 0x93, 0xac, 0xb6, 0xb8, 0xb8, 0xb8,
+ 0x2c, 0x0a, 0x70, 0x70, 0xca, 0x53, 0xdf, 0x53,
+ 0x63, 0x0b, 0xeb, 0x53, 0xf1, 0x53, 0x06, 0x54,
+ 0x9e, 0x54, 0x38, 0x54, 0x48, 0x54, 0x68, 0x54,
+ 0xa2, 0x54, 0xf6, 0x54, 0x10, 0x55, 0x53, 0x55,
+ 0x63, 0x55, 0x84, 0x55, 0x84, 0x55, 0x99, 0x55,
+ 0xab, 0x55, 0xb3, 0x55, 0xc2, 0x55, 0x16, 0x57,
+ 0x06, 0x56, 0x17, 0x57, 0x51, 0x56, 0x74, 0x56,
+ 0x07, 0x52, 0xee, 0x58, 0xce, 0x57, 0xf4, 0x57,
+ 0x0d, 0x58, 0x8b, 0x57, 0x32, 0x58, 0x31, 0x58,
+ 0xac, 0x58, 0xe4, 0x14, 0xf2, 0x58, 0xf7, 0x58,
+ 0x06, 0x59, 0x1a, 0x59, 0x22, 0x59, 0x62, 0x59,
+ 0xa8, 0x16, 0xea, 0x16, 0xec, 0x59, 0x1b, 0x5a,
+ 0x27, 0x5a, 0xd8, 0x59, 0x66, 0x5a, 0xee, 0x36,
+ 0xfc, 0x36, 0x08, 0x5b, 0x3e, 0x5b, 0x3e, 0x5b,
+ 0xc8, 0x19, 0xc3, 0x5b, 0xd8, 0x5b, 0xe7, 0x5b,
+ 0xf3, 0x5b, 0x18, 0x1b, 0xff, 0x5b, 0x06, 0x5c,
+ 0x53, 0x5f, 0x22, 0x5c, 0x81, 0x37, 0x60, 0x5c,
+ 0x6e, 0x5c, 0xc0, 0x5c, 0x8d, 0x5c, 0xe4, 0x1d,
+ 0x43, 0x5d, 0xe6, 0x1d, 0x6e, 0x5d, 0x6b, 0x5d,
+ 0x7c, 0x5d, 0xe1, 0x5d, 0xe2, 0x5d, 0x2f, 0x38,
+ 0xfd, 0x5d, 0x28, 0x5e, 0x3d, 0x5e, 0x69, 0x5e,
+ 0x62, 0x38, 0x83, 0x21, 0x7c, 0x38, 0xb0, 0x5e,
+ 0xb3, 0x5e, 0xb6, 0x5e, 0xca, 0x5e, 0x92, 0xa3,
+ 0xfe, 0x5e, 0x31, 0x23, 0x31, 0x23, 0x01, 0x82,
+ 0x22, 0x5f, 0x22, 0x5f, 0xc7, 0x38, 0xb8, 0x32,
+ 0xda, 0x61, 0x62, 0x5f, 0x6b, 0x5f, 0xe3, 0x38,
+ 0x9a, 0x5f, 0xcd, 0x5f, 0xd7, 0x5f, 0xf9, 0x5f,
+ 0x81, 0x60, 0x3a, 0x39, 0x1c, 0x39, 0x94, 0x60,
+ 0xd4, 0x26, 0xc7, 0x60, 0x02, 0x02, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0a,
+ 0x00, 0x00, 0x02, 0x08, 0x00, 0x80, 0x08, 0x00,
+ 0x00, 0x08, 0x80, 0x28, 0x80, 0x02, 0x00, 0x00,
+ 0x02, 0x48, 0x61, 0x00, 0x04, 0x06, 0x04, 0x32,
+ 0x46, 0x6a, 0x5c, 0x67, 0x96, 0xaa, 0xae, 0xc8,
+ 0xd3, 0x5d, 0x62, 0x00, 0x54, 0x77, 0xf3, 0x0c,
+ 0x2b, 0x3d, 0x63, 0xfc, 0x62, 0x68, 0x63, 0x83,
+ 0x63, 0xe4, 0x63, 0xf1, 0x2b, 0x22, 0x64, 0xc5,
+ 0x63, 0xa9, 0x63, 0x2e, 0x3a, 0x69, 0x64, 0x7e,
+ 0x64, 0x9d, 0x64, 0x77, 0x64, 0x6c, 0x3a, 0x4f,
+ 0x65, 0x6c, 0x65, 0x0a, 0x30, 0xe3, 0x65, 0xf8,
+ 0x66, 0x49, 0x66, 0x19, 0x3b, 0x91, 0x66, 0x08,
+ 0x3b, 0xe4, 0x3a, 0x92, 0x51, 0x95, 0x51, 0x00,
+ 0x67, 0x9c, 0x66, 0xad, 0x80, 0xd9, 0x43, 0x17,
+ 0x67, 0x1b, 0x67, 0x21, 0x67, 0x5e, 0x67, 0x53,
+ 0x67, 0xc3, 0x33, 0x49, 0x3b, 0xfa, 0x67, 0x85,
+ 0x67, 0x52, 0x68, 0x85, 0x68, 0x6d, 0x34, 0x8e,
+ 0x68, 0x1f, 0x68, 0x14, 0x69, 0x9d, 0x3b, 0x42,
+ 0x69, 0xa3, 0x69, 0xea, 0x69, 0xa8, 0x6a, 0xa3,
+ 0x36, 0xdb, 0x6a, 0x18, 0x3c, 0x21, 0x6b, 0xa7,
+ 0x38, 0x54, 0x6b, 0x4e, 0x3c, 0x72, 0x6b, 0x9f,
+ 0x6b, 0xba, 0x6b, 0xbb, 0x6b, 0x8d, 0x3a, 0x0b,
+ 0x1d, 0xfa, 0x3a, 0x4e, 0x6c, 0xbc, 0x3c, 0xbf,
+ 0x6c, 0xcd, 0x6c, 0x67, 0x6c, 0x16, 0x6d, 0x3e,
+ 0x6d, 0x77, 0x6d, 0x41, 0x6d, 0x69, 0x6d, 0x78,
+ 0x6d, 0x85, 0x6d, 0x1e, 0x3d, 0x34, 0x6d, 0x2f,
+ 0x6e, 0x6e, 0x6e, 0x33, 0x3d, 0xcb, 0x6e, 0xc7,
+ 0x6e, 0xd1, 0x3e, 0xf9, 0x6d, 0x6e, 0x6f, 0x5e,
+ 0x3f, 0x8e, 0x3f, 0xc6, 0x6f, 0x39, 0x70, 0x1e,
+ 0x70, 0x1b, 0x70, 0x96, 0x3d, 0x4a, 0x70, 0x7d,
+ 0x70, 0x77, 0x70, 0xad, 0x70, 0x25, 0x05, 0x45,
+ 0x71, 0x63, 0x42, 0x9c, 0x71, 0xab, 0x43, 0x28,
+ 0x72, 0x35, 0x72, 0x50, 0x72, 0x08, 0x46, 0x80,
+ 0x72, 0x95, 0x72, 0x35, 0x47, 0x02, 0x20, 0x00,
+ 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80,
+ 0x00, 0x00, 0x02, 0x02, 0x80, 0x8a, 0x00, 0x00,
+ 0x20, 0x00, 0x08, 0x0a, 0x00, 0x80, 0x88, 0x80,
+ 0x20, 0x14, 0x48, 0x7a, 0x73, 0x8b, 0x73, 0xac,
+ 0x3e, 0xa5, 0x73, 0xb8, 0x3e, 0xb8, 0x3e, 0x47,
+ 0x74, 0x5c, 0x74, 0x71, 0x74, 0x85, 0x74, 0xca,
+ 0x74, 0x1b, 0x3f, 0x24, 0x75, 0x36, 0x4c, 0x3e,
+ 0x75, 0x92, 0x4c, 0x70, 0x75, 0x9f, 0x21, 0x10,
+ 0x76, 0xa1, 0x4f, 0xb8, 0x4f, 0x44, 0x50, 0xfc,
+ 0x3f, 0x08, 0x40, 0xf4, 0x76, 0xf3, 0x50, 0xf2,
+ 0x50, 0x19, 0x51, 0x33, 0x51, 0x1e, 0x77, 0x1f,
+ 0x77, 0x1f, 0x77, 0x4a, 0x77, 0x39, 0x40, 0x8b,
+ 0x77, 0x46, 0x40, 0x96, 0x40, 0x1d, 0x54, 0x4e,
+ 0x78, 0x8c, 0x78, 0xcc, 0x78, 0xe3, 0x40, 0x26,
+ 0x56, 0x56, 0x79, 0x9a, 0x56, 0xc5, 0x56, 0x8f,
+ 0x79, 0xeb, 0x79, 0x2f, 0x41, 0x40, 0x7a, 0x4a,
+ 0x7a, 0x4f, 0x7a, 0x7c, 0x59, 0xa7, 0x5a, 0xa7,
+ 0x5a, 0xee, 0x7a, 0x02, 0x42, 0xab, 0x5b, 0xc6,
+ 0x7b, 0xc9, 0x7b, 0x27, 0x42, 0x80, 0x5c, 0xd2,
+ 0x7c, 0xa0, 0x42, 0xe8, 0x7c, 0xe3, 0x7c, 0x00,
+ 0x7d, 0x86, 0x5f, 0x63, 0x7d, 0x01, 0x43, 0xc7,
+ 0x7d, 0x02, 0x7e, 0x45, 0x7e, 0x34, 0x43, 0x28,
+ 0x62, 0x47, 0x62, 0x59, 0x43, 0xd9, 0x62, 0x7a,
+ 0x7f, 0x3e, 0x63, 0x95, 0x7f, 0xfa, 0x7f, 0x05,
+ 0x80, 0xda, 0x64, 0x23, 0x65, 0x60, 0x80, 0xa8,
+ 0x65, 0x70, 0x80, 0x5f, 0x33, 0xd5, 0x43, 0xb2,
+ 0x80, 0x03, 0x81, 0x0b, 0x44, 0x3e, 0x81, 0xb5,
+ 0x5a, 0xa7, 0x67, 0xb5, 0x67, 0x93, 0x33, 0x9c,
+ 0x33, 0x01, 0x82, 0x04, 0x82, 0x9e, 0x8f, 0x6b,
+ 0x44, 0x91, 0x82, 0x8b, 0x82, 0x9d, 0x82, 0xb3,
+ 0x52, 0xb1, 0x82, 0xb3, 0x82, 0xbd, 0x82, 0xe6,
+ 0x82, 0x3c, 0x6b, 0xe5, 0x82, 0x1d, 0x83, 0x63,
+ 0x83, 0xad, 0x83, 0x23, 0x83, 0xbd, 0x83, 0xe7,
+ 0x83, 0x57, 0x84, 0x53, 0x83, 0xca, 0x83, 0xcc,
+ 0x83, 0xdc, 0x83, 0x36, 0x6c, 0x6b, 0x6d, 0x02,
+ 0x00, 0x00, 0x20, 0x22, 0x2a, 0xa0, 0x0a, 0x00,
+ 0x20, 0x80, 0x28, 0x00, 0xa8, 0x20, 0x20, 0x00,
+ 0x02, 0x80, 0x22, 0x02, 0x8a, 0x08, 0x00, 0xaa,
+ 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x28, 0xd5,
+ 0x6c, 0x2b, 0x45, 0xf1, 0x84, 0xf3, 0x84, 0x16,
+ 0x85, 0xca, 0x73, 0x64, 0x85, 0x2c, 0x6f, 0x5d,
+ 0x45, 0x61, 0x45, 0xb1, 0x6f, 0xd2, 0x70, 0x6b,
+ 0x45, 0x50, 0x86, 0x5c, 0x86, 0x67, 0x86, 0x69,
+ 0x86, 0xa9, 0x86, 0x88, 0x86, 0x0e, 0x87, 0xe2,
+ 0x86, 0x79, 0x87, 0x28, 0x87, 0x6b, 0x87, 0x86,
+ 0x87, 0xd7, 0x45, 0xe1, 0x87, 0x01, 0x88, 0xf9,
+ 0x45, 0x60, 0x88, 0x63, 0x88, 0x67, 0x76, 0xd7,
+ 0x88, 0xde, 0x88, 0x35, 0x46, 0xfa, 0x88, 0xbb,
+ 0x34, 0xae, 0x78, 0x66, 0x79, 0xbe, 0x46, 0xc7,
+ 0x46, 0xa0, 0x8a, 0xed, 0x8a, 0x8a, 0x8b, 0x55,
+ 0x8c, 0xa8, 0x7c, 0xab, 0x8c, 0xc1, 0x8c, 0x1b,
+ 0x8d, 0x77, 0x8d, 0x2f, 0x7f, 0x04, 0x08, 0xcb,
+ 0x8d, 0xbc, 0x8d, 0xf0, 0x8d, 0xde, 0x08, 0xd4,
+ 0x8e, 0x38, 0x8f, 0xd2, 0x85, 0xed, 0x85, 0x94,
+ 0x90, 0xf1, 0x90, 0x11, 0x91, 0x2e, 0x87, 0x1b,
+ 0x91, 0x38, 0x92, 0xd7, 0x92, 0xd8, 0x92, 0x7c,
+ 0x92, 0xf9, 0x93, 0x15, 0x94, 0xfa, 0x8b, 0x8b,
+ 0x95, 0x95, 0x49, 0xb7, 0x95, 0x77, 0x8d, 0xe6,
+ 0x49, 0xc3, 0x96, 0xb2, 0x5d, 0x23, 0x97, 0x45,
+ 0x91, 0x1a, 0x92, 0x6e, 0x4a, 0x76, 0x4a, 0xe0,
+ 0x97, 0x0a, 0x94, 0xb2, 0x4a, 0x96, 0x94, 0x0b,
+ 0x98, 0x0b, 0x98, 0x29, 0x98, 0xb6, 0x95, 0xe2,
+ 0x98, 0x33, 0x4b, 0x29, 0x99, 0xa7, 0x99, 0xc2,
+ 0x99, 0xfe, 0x99, 0xce, 0x4b, 0x30, 0x9b, 0x12,
+ 0x9b, 0x40, 0x9c, 0xfd, 0x9c, 0xce, 0x4c, 0xed,
+ 0x4c, 0x67, 0x9d, 0xce, 0xa0, 0xf8, 0x4c, 0x05,
+ 0xa1, 0x0e, 0xa2, 0x91, 0xa2, 0xbb, 0x9e, 0x56,
+ 0x4d, 0xf9, 0x9e, 0xfe, 0x9e, 0x05, 0x9f, 0x0f,
+ 0x9f, 0x16, 0x9f, 0x3b, 0x9f, 0x00, 0xa6, 0x02,
+ 0x88, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
+ 0x28, 0x00, 0x08, 0xa0, 0x80, 0xa0, 0x80, 0x00,
+ 0x80, 0x80, 0x00, 0x0a, 0x88, 0x80, 0x00, 0x80,
+ 0x00, 0x20, 0x2a, 0x00, 0x80,
 };
 
-static const uint16_t unicode_comp_table[944] = {
+static const uint16_t unicode_comp_table[945] = {
 0x4a01, 0x49c0, 0x4a02, 0x0280, 0x0281, 0x0282, 0x0283, 0x02c0,
 0x02c2, 0x0a00, 0x0284, 0x2442, 0x0285, 0x07c0, 0x0980, 0x0982,
 0x2440, 0x2280, 0x02c4, 0x2282, 0x2284, 0x2286, 0x02c6, 0x02c8,
@@ -2173,8 +2191,9 @@
 0x5704, 0x5706, 0x5708, 0x570a, 0x570c, 0x570e, 0x5710, 0x5712,
 0x5714, 0x5716, 0x5740, 0x5742, 0x5744, 0x5780, 0x5781, 0x57c0,
 0x57c1, 0x5800, 0x5801, 0x5840, 0x5841, 0x5880, 0x5881, 0x5900,
- 0x5901, 0x5902, 0x5903, 0x5940, 0x8e40, 0x8e42, 0x8e80, 0x8ec0,
- 0x8ec1, 0x8f00, 0x8f01, 0x8f41, 0x8f40, 0x8f43, 0x8f80, 0x8f81,
+ 0x5901, 0x5902, 0x5903, 0x5940, 0x8e80, 0x8e82, 0x8ec0, 0x8f00,
+ 0x8f01, 0x8f40, 0x8f41, 0x8f81, 0x8f80, 0x8f83, 0x8fc0, 0x8fc1,
+ 0x9000,
 };
 
 typedef enum {
@@ -2260,7 +2279,7 @@
 "C,Other" "\0"
 ;
 
-static const uint8_t unicode_gc_table[3719] = {
+static const uint8_t unicode_gc_table[3790] = {
 0xfa, 0x18, 0x17, 0x56, 0x0d, 0x56, 0x12, 0x13,
 0x16, 0x0c, 0x16, 0x11, 0x36, 0xe9, 0x02, 0x36,
 0x4c, 0x36, 0xe1, 0x12, 0x12, 0x16, 0x13, 0x0e,
@@ -2304,8 +2323,8 @@
 0x06, 0x2d, 0xe5, 0x0e, 0x66, 0x04, 0xe6, 0x01,
 0x04, 0x46, 0x04, 0x86, 0x20, 0xf6, 0x07, 0x00,
 0xe5, 0x11, 0x46, 0x20, 0x16, 0x00, 0xe5, 0x03,
- 0xe0, 0x2d, 0xe5, 0x0d, 0x00, 0xe5, 0x00, 0xe0,
- 0x0d, 0xe6, 0x07, 0x1b, 0xe6, 0x18, 0x07, 0xe5,
+ 0xe0, 0x2d, 0xe5, 0x0d, 0x00, 0xe5, 0x0a, 0xe0,
+ 0x03, 0xe6, 0x07, 0x1b, 0xe6, 0x18, 0x07, 0xe5,
 0x2e, 0x06, 0x07, 0x06, 0x05, 0x47, 0xe6, 0x00,
 0x67, 0x06, 0x27, 0x05, 0xc6, 0xe5, 0x02, 0x26,
 0x36, 0xe9, 0x02, 0x16, 0x04, 0xe5, 0x07, 0x06,
@@ -2328,80 +2347,80 @@
 0x00, 0x06, 0x27, 0x00, 0xe5, 0x00, 0x20, 0x25,
 0x20, 0xe5, 0x0e, 0x00, 0xc5, 0x00, 0x25, 0x00,
 0x85, 0x20, 0x06, 0x05, 0x07, 0x06, 0x07, 0x66,
- 0x20, 0x27, 0x20, 0x27, 0x06, 0xe0, 0x00, 0x06,
- 0x07, 0x60, 0x25, 0x00, 0x45, 0x26, 0x20, 0xe9,
- 0x02, 0x0f, 0x05, 0xab, 0xe0, 0x02, 0x06, 0x05,
- 0x00, 0xa5, 0x40, 0x45, 0x00, 0x65, 0x40, 0x25,
- 0x00, 0x05, 0x00, 0x25, 0x40, 0x25, 0x40, 0x45,
- 0x40, 0xe5, 0x04, 0x60, 0x27, 0x06, 0x27, 0x40,
- 0x47, 0x00, 0x47, 0x06, 0x20, 0x05, 0xa0, 0x07,
- 0xe0, 0x06, 0xe9, 0x02, 0x4b, 0xaf, 0x0d, 0x0f,
- 0x80, 0x06, 0x47, 0x06, 0xe5, 0x00, 0x00, 0x45,
- 0x00, 0xe5, 0x0f, 0x00, 0xe5, 0x08, 0x40, 0x05,
- 0x46, 0x67, 0x00, 0x46, 0x00, 0x66, 0xc0, 0x26,
- 0x00, 0x45, 0x80, 0x25, 0x26, 0x20, 0xe9, 0x02,
- 0xc0, 0x16, 0xcb, 0x0f, 0x05, 0x06, 0x27, 0x16,
- 0xe5, 0x00, 0x00, 0x45, 0x00, 0xe5, 0x0f, 0x00,
- 0xe5, 0x02, 0x00, 0x85, 0x20, 0x06, 0x05, 0x07,
- 0x06, 0x87, 0x00, 0x06, 0x27, 0x00, 0x27, 0x26,
- 0xc0, 0x27, 0xc0, 0x05, 0x00, 0x25, 0x26, 0x20,
- 0xe9, 0x02, 0x00, 0x25, 0xe0, 0x05, 0x26, 0x27,
- 0x00, 0xe5, 0x00, 0x00, 0x45, 0x00, 0xe5, 0x21,
- 0x26, 0x05, 0x47, 0x66, 0x00, 0x47, 0x00, 0x47,
- 0x06, 0x05, 0x0f, 0x60, 0x45, 0x07, 0xcb, 0x45,
- 0x26, 0x20, 0xe9, 0x02, 0xeb, 0x01, 0x0f, 0xa5,
- 0x20, 0x27, 0x00, 0xe5, 0x0a, 0x40, 0xe5, 0x10,
- 0x00, 0xe5, 0x01, 0x00, 0x05, 0x20, 0xc5, 0x40,
- 0x06, 0x60, 0x47, 0x46, 0x00, 0x06, 0x00, 0xe7,
- 0x00, 0xa0, 0xe9, 0x02, 0x20, 0x27, 0x16, 0xe0,
- 0x04, 0xe5, 0x28, 0x06, 0x25, 0xc6, 0x60, 0x0d,
- 0xa5, 0x04, 0xe6, 0x00, 0x16, 0xe9, 0x02, 0x36,
- 0xe0, 0x1d, 0x25, 0x00, 0x05, 0x00, 0x85, 0x00,
- 0xe5, 0x10, 0x00, 0x05, 0x00, 0xe5, 0x02, 0x06,
- 0x25, 0xe6, 0x01, 0x05, 0x20, 0x85, 0x00, 0x04,
- 0x00, 0xa6, 0x20, 0xe9, 0x02, 0x20, 0x65, 0xe0,
- 0x18, 0x05, 0x4f, 0xf6, 0x07, 0x0f, 0x16, 0x4f,
- 0x26, 0xaf, 0xe9, 0x02, 0xeb, 0x02, 0x0f, 0x06,
- 0x0f, 0x06, 0x0f, 0x06, 0x12, 0x13, 0x12, 0x13,
- 0x27, 0xe5, 0x00, 0x00, 0xe5, 0x1c, 0x60, 0xe6,
- 0x06, 0x07, 0x86, 0x16, 0x26, 0x85, 0xe6, 0x03,
- 0x00, 0xe6, 0x1c, 0x00, 0xef, 0x00, 0x06, 0xaf,
- 0x00, 0x2f, 0x96, 0x6f, 0x36, 0xe0, 0x1d, 0xe5,
- 0x23, 0x27, 0x66, 0x07, 0xa6, 0x07, 0x26, 0x27,
- 0x26, 0x05, 0xe9, 0x02, 0xb6, 0xa5, 0x27, 0x26,
- 0x65, 0x46, 0x05, 0x47, 0x25, 0xc7, 0x45, 0x66,
- 0xe5, 0x05, 0x06, 0x27, 0x26, 0xa7, 0x06, 0x05,
- 0x07, 0xe9, 0x02, 0x47, 0x06, 0x2f, 0xe1, 0x1e,
- 0x00, 0x01, 0x80, 0x01, 0x20, 0xe2, 0x23, 0x16,
- 0x04, 0x42, 0xe5, 0x80, 0xc1, 0x00, 0x65, 0x20,
- 0xc5, 0x00, 0x05, 0x00, 0x65, 0x20, 0xe5, 0x21,
- 0x00, 0x65, 0x20, 0xe5, 0x19, 0x00, 0x65, 0x20,
- 0xc5, 0x00, 0x05, 0x00, 0x65, 0x20, 0xe5, 0x07,
- 0x00, 0xe5, 0x31, 0x00, 0x65, 0x20, 0xe5, 0x3b,
- 0x20, 0x46, 0xf6, 0x01, 0xeb, 0x0c, 0x40, 0xe5,
- 0x08, 0xef, 0x02, 0xa0, 0xe1, 0x4e, 0x20, 0xa2,
- 0x20, 0x11, 0xe5, 0x81, 0xe4, 0x0f, 0x16, 0xe5,
- 0x09, 0x17, 0xe5, 0x12, 0x12, 0x13, 0x40, 0xe5,
- 0x43, 0x56, 0x4a, 0xe5, 0x00, 0xc0, 0xe5, 0x05,
- 0x00, 0x65, 0x46, 0xe0, 0x03, 0xe5, 0x0a, 0x46,
- 0x36, 0xe0, 0x01, 0xe5, 0x0a, 0x26, 0xe0, 0x04,
- 0xe5, 0x05, 0x00, 0x45, 0x00, 0x26, 0xe0, 0x04,
- 0xe5, 0x2c, 0x26, 0x07, 0xc6, 0xe7, 0x00, 0x06,
- 0x27, 0xe6, 0x03, 0x56, 0x04, 0x56, 0x0d, 0x05,
- 0x06, 0x20, 0xe9, 0x02, 0xa0, 0xeb, 0x02, 0xa0,
- 0xb6, 0x11, 0x76, 0x46, 0x1b, 0x00, 0xe9, 0x02,
- 0xa0, 0xe5, 0x1b, 0x04, 0xe5, 0x2d, 0xc0, 0x85,
- 0x26, 0xe5, 0x1a, 0x06, 0x05, 0x80, 0xe5, 0x3e,
- 0xe0, 0x02, 0xe5, 0x17, 0x00, 0x46, 0x67, 0x26,
- 0x47, 0x60, 0x27, 0x06, 0xa7, 0x46, 0x60, 0x0f,
- 0x40, 0x36, 0xe9, 0x02, 0xe5, 0x16, 0x20, 0x85,
- 0xe0, 0x03, 0xe5, 0x24, 0x60, 0xe5, 0x12, 0xa0,
- 0xe9, 0x02, 0x0b, 0x40, 0xef, 0x1a, 0xe5, 0x0f,
- 0x26, 0x27, 0x06, 0x20, 0x36, 0xe5, 0x2d, 0x07,
- 0x06, 0x07, 0xc6, 0x00, 0x06, 0x07, 0x06, 0x27,
- 0xe6, 0x00, 0xa7, 0xe6, 0x02, 0x20, 0x06, 0xe9,
- 0x02, 0xa0, 0xe9, 0x02, 0xa0, 0xd6, 0x04, 0xb6,
- 0x20, 0xe6, 0x06, 0x08, 0xe0, 0x39, 0x66, 0x07,
+ 0x20, 0x27, 0x20, 0x27, 0x06, 0xc0, 0x26, 0x07,
+ 0x60, 0x25, 0x00, 0x45, 0x26, 0x20, 0xe9, 0x02,
+ 0x0f, 0x05, 0xab, 0xe0, 0x02, 0x06, 0x05, 0x00,
+ 0xa5, 0x40, 0x45, 0x00, 0x65, 0x40, 0x25, 0x00,
+ 0x05, 0x00, 0x25, 0x40, 0x25, 0x40, 0x45, 0x40,
+ 0xe5, 0x04, 0x60, 0x27, 0x06, 0x27, 0x40, 0x47,
+ 0x00, 0x47, 0x06, 0x20, 0x05, 0xa0, 0x07, 0xe0,
+ 0x06, 0xe9, 0x02, 0x4b, 0xaf, 0x0d, 0x0f, 0x80,
+ 0x06, 0x47, 0x06, 0xe5, 0x00, 0x00, 0x45, 0x00,
+ 0xe5, 0x0f, 0x00, 0xe5, 0x08, 0x40, 0x05, 0x46,
+ 0x67, 0x00, 0x46, 0x00, 0x66, 0xc0, 0x26, 0x00,
+ 0x45, 0x80, 0x25, 0x26, 0x20, 0xe9, 0x02, 0xc0,
+ 0x16, 0xcb, 0x0f, 0x05, 0x06, 0x27, 0x16, 0xe5,
+ 0x00, 0x00, 0x45, 0x00, 0xe5, 0x0f, 0x00, 0xe5,
+ 0x02, 0x00, 0x85, 0x20, 0x06, 0x05, 0x07, 0x06,
+ 0x87, 0x00, 0x06, 0x27, 0x00, 0x27, 0x26, 0xc0,
+ 0x27, 0xc0, 0x05, 0x00, 0x25, 0x26, 0x20, 0xe9,
+ 0x02, 0x00, 0x25, 0xe0, 0x05, 0x26, 0x27, 0xe5,
+ 0x01, 0x00, 0x45, 0x00, 0xe5, 0x21, 0x26, 0x05,
+ 0x47, 0x66, 0x00, 0x47, 0x00, 0x47, 0x06, 0x05,
+ 0x0f, 0x60, 0x45, 0x07, 0xcb, 0x45, 0x26, 0x20,
+ 0xe9, 0x02, 0xeb, 0x01, 0x0f, 0xa5, 0x00, 0x06,
+ 0x27, 0x00, 0xe5, 0x0a, 0x40, 0xe5, 0x10, 0x00,
+ 0xe5, 0x01, 0x00, 0x05, 0x20, 0xc5, 0x40, 0x06,
+ 0x60, 0x47, 0x46, 0x00, 0x06, 0x00, 0xe7, 0x00,
+ 0xa0, 0xe9, 0x02, 0x20, 0x27, 0x16, 0xe0, 0x04,
+ 0xe5, 0x28, 0x06, 0x25, 0xc6, 0x60, 0x0d, 0xa5,
+ 0x04, 0xe6, 0x00, 0x16, 0xe9, 0x02, 0x36, 0xe0,
+ 0x1d, 0x25, 0x00, 0x05, 0x00, 0x85, 0x00, 0xe5,
+ 0x10, 0x00, 0x05, 0x00, 0xe5, 0x02, 0x06, 0x25,
+ 0xe6, 0x01, 0x05, 0x20, 0x85, 0x00, 0x04, 0x00,
+ 0xa6, 0x20, 0xe9, 0x02, 0x20, 0x65, 0xe0, 0x18,
+ 0x05, 0x4f, 0xf6, 0x07, 0x0f, 0x16, 0x4f, 0x26,
+ 0xaf, 0xe9, 0x02, 0xeb, 0x02, 0x0f, 0x06, 0x0f,
+ 0x06, 0x0f, 0x06, 0x12, 0x13, 0x12, 0x13, 0x27,
+ 0xe5, 0x00, 0x00, 0xe5, 0x1c, 0x60, 0xe6, 0x06,
+ 0x07, 0x86, 0x16, 0x26, 0x85, 0xe6, 0x03, 0x00,
+ 0xe6, 0x1c, 0x00, 0xef, 0x00, 0x06, 0xaf, 0x00,
+ 0x2f, 0x96, 0x6f, 0x36, 0xe0, 0x1d, 0xe5, 0x23,
+ 0x27, 0x66, 0x07, 0xa6, 0x07, 0x26, 0x27, 0x26,
+ 0x05, 0xe9, 0x02, 0xb6, 0xa5, 0x27, 0x26, 0x65,
+ 0x46, 0x05, 0x47, 0x25, 0xc7, 0x45, 0x66, 0xe5,
+ 0x05, 0x06, 0x27, 0x26, 0xa7, 0x06, 0x05, 0x07,
+ 0xe9, 0x02, 0x47, 0x06, 0x2f, 0xe1, 0x1e, 0x00,
+ 0x01, 0x80, 0x01, 0x20, 0xe2, 0x23, 0x16, 0x04,
+ 0x42, 0xe5, 0x80, 0xc1, 0x00, 0x65, 0x20, 0xc5,
+ 0x00, 0x05, 0x00, 0x65, 0x20, 0xe5, 0x21, 0x00,
+ 0x65, 0x20, 0xe5, 0x19, 0x00, 0x65, 0x20, 0xc5,
+ 0x00, 0x05, 0x00, 0x65, 0x20, 0xe5, 0x07, 0x00,
+ 0xe5, 0x31, 0x00, 0x65, 0x20, 0xe5, 0x3b, 0x20,
+ 0x46, 0xf6, 0x01, 0xeb, 0x0c, 0x40, 0xe5, 0x08,
+ 0xef, 0x02, 0xa0, 0xe1, 0x4e, 0x20, 0xa2, 0x20,
+ 0x11, 0xe5, 0x81, 0xe4, 0x0f, 0x16, 0xe5, 0x09,
+ 0x17, 0xe5, 0x12, 0x12, 0x13, 0x40, 0xe5, 0x43,
+ 0x56, 0x4a, 0xe5, 0x00, 0xc0, 0xe5, 0x05, 0x00,
+ 0x65, 0x46, 0xe0, 0x03, 0xe5, 0x0a, 0x46, 0x36,
+ 0xe0, 0x01, 0xe5, 0x0a, 0x26, 0xe0, 0x04, 0xe5,
+ 0x05, 0x00, 0x45, 0x00, 0x26, 0xe0, 0x04, 0xe5,
+ 0x2c, 0x26, 0x07, 0xc6, 0xe7, 0x00, 0x06, 0x27,
+ 0xe6, 0x03, 0x56, 0x04, 0x56, 0x0d, 0x05, 0x06,
+ 0x20, 0xe9, 0x02, 0xa0, 0xeb, 0x02, 0xa0, 0xb6,
+ 0x11, 0x76, 0x46, 0x1b, 0x00, 0xe9, 0x02, 0xa0,
+ 0xe5, 0x1b, 0x04, 0xe5, 0x2d, 0xc0, 0x85, 0x26,
+ 0xe5, 0x1a, 0x06, 0x05, 0x80, 0xe5, 0x3e, 0xe0,
+ 0x02, 0xe5, 0x17, 0x00, 0x46, 0x67, 0x26, 0x47,
+ 0x60, 0x27, 0x06, 0xa7, 0x46, 0x60, 0x0f, 0x40,
+ 0x36, 0xe9, 0x02, 0xe5, 0x16, 0x20, 0x85, 0xe0,
+ 0x03, 0xe5, 0x24, 0x60, 0xe5, 0x12, 0xa0, 0xe9,
+ 0x02, 0x0b, 0x40, 0xef, 0x1a, 0xe5, 0x0f, 0x26,
+ 0x27, 0x06, 0x20, 0x36, 0xe5, 0x2d, 0x07, 0x06,
+ 0x07, 0xc6, 0x00, 0x06, 0x07, 0x06, 0x27, 0xe6,
+ 0x00, 0xa7, 0xe6, 0x02, 0x20, 0x06, 0xe9, 0x02,
+ 0xa0, 0xe9, 0x02, 0xa0, 0xd6, 0x04, 0xb6, 0x20,
+ 0xe6, 0x06, 0x08, 0x26, 0xe0, 0x37, 0x66, 0x07,
 0xe5, 0x27, 0x06, 0x07, 0x86, 0x07, 0x06, 0x87,
 0x06, 0x27, 0xc5, 0x60, 0xe9, 0x02, 0xd6, 0xef,
 0x02, 0xe6, 0x01, 0xef, 0x01, 0x40, 0x26, 0x07,
@@ -2461,7 +2480,7 @@
 0x13, 0x12, 0x13, 0x12, 0x13, 0xec, 0x37, 0x12,
 0x13, 0x12, 0x13, 0xec, 0x18, 0x12, 0x13, 0xec,
 0x80, 0x7a, 0xef, 0x28, 0xec, 0x0d, 0x2f, 0xac,
- 0xef, 0x1f, 0x20, 0xef, 0x18, 0x20, 0xef, 0x60,
+ 0xef, 0x1f, 0x20, 0xef, 0x18, 0x00, 0xef, 0x61,
 0xe1, 0x27, 0x00, 0xe2, 0x27, 0x00, 0x5f, 0x21,
 0x22, 0xdf, 0x41, 0x02, 0x3f, 0x02, 0x3f, 0x82,
 0x24, 0x41, 0x02, 0xff, 0x5a, 0x02, 0xaf, 0x7f,
@@ -2475,257 +2494,266 @@
 0x11, 0x36, 0x11, 0x16, 0x14, 0x15, 0x36, 0x14,
 0x15, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
 0x13, 0x96, 0x04, 0xf6, 0x02, 0x31, 0x76, 0x11,
- 0x16, 0x12, 0xf6, 0x05, 0xe0, 0x28, 0xef, 0x12,
- 0x00, 0xef, 0x51, 0xe0, 0x04, 0xef, 0x80, 0x4e,
- 0xe0, 0x12, 0xef, 0x04, 0x60, 0x17, 0x56, 0x0f,
- 0x04, 0x05, 0x0a, 0x12, 0x13, 0x12, 0x13, 0x12,
- 0x13, 0x12, 0x13, 0x12, 0x13, 0x2f, 0x12, 0x13,
- 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x11, 0x12,
- 0x33, 0x0f, 0xea, 0x01, 0x66, 0x27, 0x11, 0x84,
- 0x2f, 0x4a, 0x04, 0x05, 0x16, 0x2f, 0x00, 0xe5,
- 0x4e, 0x20, 0x26, 0x2e, 0x24, 0x05, 0x11, 0xe5,
- 0x52, 0x16, 0x44, 0x05, 0x80, 0xe5, 0x23, 0x00,
- 0xe5, 0x56, 0x00, 0x2f, 0x6b, 0xef, 0x02, 0xe5,
- 0x13, 0x80, 0xef, 0x1c, 0xe0, 0x04, 0xe5, 0x08,
- 0xef, 0x17, 0x00, 0xeb, 0x02, 0xef, 0x16, 0xeb,
- 0x00, 0x0f, 0xeb, 0x07, 0xef, 0x18, 0xeb, 0x02,
- 0xef, 0x1f, 0xeb, 0x07, 0xef, 0x80, 0xb8, 0xe5,
- 0x99, 0x2e, 0xe0, 0x02, 0xef, 0x38, 0xe5, 0xc0,
- 0x11, 0x68, 0xe0, 0x08, 0xe5, 0x0d, 0x04, 0xe5,
- 0x83, 0xef, 0x40, 0xef, 0x2f, 0xe0, 0x01, 0xe5,
- 0x20, 0xa4, 0x36, 0xe5, 0x80, 0x84, 0x04, 0x56,
- 0xe5, 0x08, 0xe9, 0x02, 0x25, 0xe0, 0x0c, 0xff,
- 0x26, 0x05, 0x06, 0x48, 0x16, 0xe6, 0x02, 0x16,
- 0x04, 0xff, 0x14, 0x24, 0x26, 0xe5, 0x3e, 0xea,
- 0x02, 0x26, 0xb6, 0xe0, 0x00, 0xee, 0x0f, 0xe4,
- 0x01, 0x2e, 0xff, 0x06, 0x22, 0xff, 0x36, 0x04,
- 0xe2, 0x00, 0x9f, 0xff, 0x02, 0x04, 0x2e, 0x7f,
- 0x05, 0x7f, 0x22, 0xff, 0x0d, 0x61, 0x02, 0x81,
- 0x02, 0xff, 0x02, 0x20, 0x5f, 0x21, 0xe0, 0x28,
- 0x05, 0x24, 0x02, 0xc5, 0x06, 0x45, 0x06, 0x65,
- 0x06, 0xe5, 0x0f, 0x27, 0x26, 0x07, 0x6f, 0x60,
- 0xab, 0x2f, 0x0d, 0x0f, 0xa0, 0xe5, 0x2c, 0x76,
- 0xe0, 0x00, 0x27, 0xe5, 0x2a, 0xe7, 0x08, 0x26,
- 0xe0, 0x00, 0x36, 0xe9, 0x02, 0xa0, 0xe6, 0x0a,
- 0xa5, 0x56, 0x05, 0x16, 0x25, 0x06, 0xe9, 0x02,
- 0xe5, 0x14, 0xe6, 0x00, 0x36, 0xe5, 0x0f, 0xe6,
- 0x03, 0x27, 0xe0, 0x03, 0x16, 0xe5, 0x15, 0x40,
- 0x46, 0x07, 0xe5, 0x27, 0x06, 0x27, 0x66, 0x27,
- 0x26, 0x47, 0xf6, 0x05, 0x00, 0x04, 0xe9, 0x02,
- 0x60, 0x36, 0x85, 0x06, 0x04, 0xe5, 0x01, 0xe9,
- 0x02, 0x85, 0x00, 0xe5, 0x21, 0xa6, 0x27, 0x26,
- 0x27, 0x26, 0xe0, 0x01, 0x45, 0x06, 0xe5, 0x00,
- 0x06, 0x07, 0x20, 0xe9, 0x02, 0x20, 0x76, 0xe5,
- 0x08, 0x04, 0xa5, 0x4f, 0x05, 0x07, 0x06, 0x07,
- 0xe5, 0x2a, 0x06, 0x05, 0x46, 0x25, 0x26, 0x85,
- 0x26, 0x05, 0x06, 0x05, 0xe0, 0x10, 0x25, 0x04,
- 0x36, 0xe5, 0x03, 0x07, 0x26, 0x27, 0x36, 0x05,
- 0x24, 0x07, 0x06, 0xe0, 0x02, 0xa5, 0x20, 0xa5,
- 0x20, 0xa5, 0xe0, 0x01, 0xc5, 0x00, 0xc5, 0x00,
- 0xe2, 0x23, 0x0e, 0x64, 0xe2, 0x00, 0xe0, 0x00,
- 0xe2, 0x48, 0xe5, 0x1b, 0x27, 0x06, 0x27, 0x06,
- 0x27, 0x16, 0x07, 0x06, 0x20, 0xe9, 0x02, 0xa0,
- 0xe5, 0xab, 0x1c, 0xe0, 0x04, 0xe5, 0x0f, 0x60,
- 0xe5, 0x29, 0x60, 0xfc, 0x87, 0x78, 0xfd, 0x98,
- 0x78, 0xe5, 0x80, 0xe6, 0x20, 0xe5, 0x62, 0xe0,
- 0x1e, 0xc2, 0xe0, 0x04, 0x82, 0x80, 0x05, 0x06,
- 0xe5, 0x02, 0x0c, 0xe5, 0x05, 0x00, 0x85, 0x00,
- 0x05, 0x00, 0x25, 0x00, 0x25, 0x00, 0xe5, 0x64,
- 0xee, 0x08, 0xe0, 0x09, 0xe5, 0x80, 0xe3, 0x13,
- 0x12, 0xe0, 0x08, 0xe5, 0x38, 0x20, 0xe5, 0x2e,
- 0xe0, 0x20, 0xe5, 0x04, 0x0d, 0x0f, 0x20, 0xe6,
- 0x08, 0xd6, 0x12, 0x13, 0x16, 0xa0, 0xe6, 0x08,
- 0x16, 0x31, 0x30, 0x12, 0x13, 0x12, 0x13, 0x12,
- 0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
- 0x13, 0x12, 0x13, 0x36, 0x12, 0x13, 0x76, 0x50,
- 0x56, 0x00, 0x76, 0x11, 0x12, 0x13, 0x12, 0x13,
- 0x12, 0x13, 0x56, 0x0c, 0x11, 0x4c, 0x00, 0x16,
- 0x0d, 0x36, 0x60, 0x85, 0x00, 0xe5, 0x7f, 0x20,
- 0x1b, 0x00, 0x56, 0x0d, 0x56, 0x12, 0x13, 0x16,
- 0x0c, 0x16, 0x11, 0x36, 0xe9, 0x02, 0x36, 0x4c,
- 0x36, 0xe1, 0x12, 0x12, 0x16, 0x13, 0x0e, 0x10,
- 0x0e, 0xe2, 0x12, 0x12, 0x0c, 0x13, 0x0c, 0x12,
- 0x13, 0x16, 0x12, 0x13, 0x36, 0xe5, 0x02, 0x04,
- 0xe5, 0x25, 0x24, 0xe5, 0x17, 0x40, 0xa5, 0x20,
- 0xa5, 0x20, 0xa5, 0x20, 0x45, 0x40, 0x2d, 0x0c,
- 0x0e, 0x0f, 0x2d, 0x00, 0x0f, 0x6c, 0x2f, 0xe0,
- 0x02, 0x5b, 0x2f, 0x20, 0xe5, 0x04, 0x00, 0xe5,
- 0x12, 0x00, 0xe5, 0x0b, 0x00, 0x25, 0x00, 0xe5,
- 0x07, 0x20, 0xe5, 0x06, 0xe0, 0x1a, 0xe5, 0x73,
- 0x80, 0x56, 0x60, 0xeb, 0x25, 0x40, 0xef, 0x01,
- 0xea, 0x2d, 0x6b, 0xef, 0x09, 0x2b, 0x4f, 0x00,
- 0xef, 0x04, 0x60, 0x0f, 0xe0, 0x27, 0xef, 0x25,
- 0x06, 0xe0, 0x7a, 0xe5, 0x15, 0x40, 0xe5, 0x29,
- 0xe0, 0x07, 0x06, 0xeb, 0x13, 0x60, 0xe5, 0x18,
- 0x6b, 0xe0, 0x01, 0xe5, 0x0c, 0x0a, 0xe5, 0x00,
- 0x0a, 0x80, 0xe5, 0x1e, 0x86, 0x80, 0xe5, 0x16,
- 0x00, 0x16, 0xe5, 0x1c, 0x60, 0xe5, 0x00, 0x16,
- 0x8a, 0xe0, 0x22, 0xe1, 0x20, 0xe2, 0x20, 0xe5,
- 0x46, 0x20, 0xe9, 0x02, 0xa0, 0xe1, 0x1c, 0x60,
- 0xe2, 0x1c, 0x60, 0xe5, 0x20, 0xe0, 0x00, 0xe5,
- 0x2c, 0xe0, 0x03, 0x16, 0xe0, 0x80, 0x08, 0xe5,
- 0x80, 0xaf, 0xe0, 0x01, 0xe5, 0x0e, 0xe0, 0x02,
- 0xe5, 0x00, 0xe0, 0x80, 0x10, 0xa5, 0x20, 0x05,
- 0x00, 0xe5, 0x24, 0x00, 0x25, 0x40, 0x05, 0x20,
- 0xe5, 0x0f, 0x00, 0x16, 0xeb, 0x00, 0xe5, 0x0f,
- 0x2f, 0xcb, 0xe5, 0x17, 0xe0, 0x00, 0xeb, 0x01,
- 0xe0, 0x28, 0xe5, 0x0b, 0x00, 0x25, 0x80, 0x8b,
- 0xe5, 0x0e, 0xab, 0x40, 0x16, 0xe5, 0x12, 0x80,
- 0x16, 0xe0, 0x38, 0xe5, 0x30, 0x60, 0x2b, 0x25,
- 0xeb, 0x08, 0x20, 0xeb, 0x26, 0x05, 0x46, 0x00,
- 0x26, 0x80, 0x66, 0x65, 0x00, 0x45, 0x00, 0xe5,
- 0x15, 0x20, 0x46, 0x60, 0x06, 0xeb, 0x01, 0xc0,
- 0xf6, 0x01, 0xc0, 0xe5, 0x15, 0x2b, 0x16, 0xe5,
- 0x15, 0x4b, 0xe0, 0x18, 0xe5, 0x00, 0x0f, 0xe5,
- 0x14, 0x26, 0x60, 0x8b, 0xd6, 0xe0, 0x01, 0xe5,
- 0x2e, 0x40, 0xd6, 0xe5, 0x0e, 0x20, 0xeb, 0x00,
- 0xe5, 0x0b, 0x80, 0xeb, 0x00, 0xe5, 0x0a, 0xc0,
- 0x76, 0xe0, 0x04, 0xcb, 0xe0, 0x48, 0xe5, 0x41,
- 0xe0, 0x2f, 0xe1, 0x2b, 0xe0, 0x05, 0xe2, 0x2b,
- 0xc0, 0xab, 0xe5, 0x1c, 0x66, 0xe0, 0x00, 0xe9,
- 0x02, 0xe0, 0x80, 0x9e, 0xeb, 0x17, 0xe0, 0x79,
- 0xe5, 0x15, 0xeb, 0x02, 0x05, 0xe0, 0x00, 0xe5,
- 0x0e, 0xe6, 0x03, 0x6b, 0x96, 0xe0, 0x7e, 0xe5,
+ 0x16, 0x12, 0xf6, 0x05, 0x2f, 0x16, 0xe0, 0x25,
+ 0xef, 0x12, 0x00, 0xef, 0x51, 0xe0, 0x04, 0xef,
+ 0x80, 0x4e, 0xe0, 0x12, 0xef, 0x04, 0x60, 0x17,
+ 0x56, 0x0f, 0x04, 0x05, 0x0a, 0x12, 0x13, 0x12,
+ 0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x2f,
+ 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13,
+ 0x11, 0x12, 0x33, 0x0f, 0xea, 0x01, 0x66, 0x27,
+ 0x11, 0x84, 0x2f, 0x4a, 0x04, 0x05, 0x16, 0x2f,
+ 0x00, 0xe5, 0x4e, 0x20, 0x26, 0x2e, 0x24, 0x05,
+ 0x11, 0xe5, 0x52, 0x16, 0x44, 0x05, 0x80, 0xe5,
+ 0x23, 0x00, 0xe5, 0x56, 0x00, 0x2f, 0x6b, 0xef,
+ 0x02, 0xe5, 0x18, 0xef, 0x1c, 0xe0, 0x04, 0xe5,
+ 0x08, 0xef, 0x17, 0x00, 0xeb, 0x02, 0xef, 0x16,
+ 0xeb, 0x00, 0x0f, 0xeb, 0x07, 0xef, 0x18, 0xeb,
+ 0x02, 0xef, 0x1f, 0xeb, 0x07, 0xef, 0x80, 0xb8,
+ 0xe5, 0x99, 0x38, 0xef, 0x38, 0xe5, 0xc0, 0x11,
+ 0x75, 0x40, 0xe5, 0x0d, 0x04, 0xe5, 0x83, 0xef,
+ 0x40, 0xef, 0x2f, 0xe0, 0x01, 0xe5, 0x20, 0xa4,
+ 0x36, 0xe5, 0x80, 0x84, 0x04, 0x56, 0xe5, 0x08,
+ 0xe9, 0x02, 0x25, 0xe0, 0x0c, 0xff, 0x26, 0x05,
+ 0x06, 0x48, 0x16, 0xe6, 0x02, 0x16, 0x04, 0xff,
+ 0x14, 0x24, 0x26, 0xe5, 0x3e, 0xea, 0x02, 0x26,
+ 0xb6, 0xe0, 0x00, 0xee, 0x0f, 0xe4, 0x01, 0x2e,
+ 0xff, 0x06, 0x22, 0xff, 0x36, 0x04, 0xe2, 0x00,
+ 0x9f, 0xff, 0x02, 0x04, 0x2e, 0x7f, 0x05, 0x7f,
+ 0x22, 0xff, 0x0d, 0x61, 0x02, 0x81, 0x02, 0xff,
+ 0x02, 0x20, 0x5f, 0x41, 0x02, 0x3f, 0xe0, 0x22,
+ 0x3f, 0x05, 0x24, 0x02, 0xc5, 0x06, 0x45, 0x06,
+ 0x65, 0x06, 0xe5, 0x0f, 0x27, 0x26, 0x07, 0x6f,
+ 0x06, 0x40, 0xab, 0x2f, 0x0d, 0x0f, 0xa0, 0xe5,
+ 0x2c, 0x76, 0xe0, 0x00, 0x27, 0xe5, 0x2a, 0xe7,
+ 0x08, 0x26, 0xe0, 0x00, 0x36, 0xe9, 0x02, 0xa0,
+ 0xe6, 0x0a, 0xa5, 0x56, 0x05, 0x16, 0x25, 0x06,
+ 0xe9, 0x02, 0xe5, 0x14, 0xe6, 0x00, 0x36, 0xe5,
+ 0x0f, 0xe6, 0x03, 0x27, 0xe0, 0x03, 0x16, 0xe5,
+ 0x15, 0x40, 0x46, 0x07, 0xe5, 0x27, 0x06, 0x27,
+ 0x66, 0x27, 0x26, 0x47, 0xf6, 0x05, 0x00, 0x04,
+ 0xe9, 0x02, 0x60, 0x36, 0x85, 0x06, 0x04, 0xe5,
+ 0x01, 0xe9, 0x02, 0x85, 0x00, 0xe5, 0x21, 0xa6,
+ 0x27, 0x26, 0x27, 0x26, 0xe0, 0x01, 0x45, 0x06,
+ 0xe5, 0x00, 0x06, 0x07, 0x20, 0xe9, 0x02, 0x20,
+ 0x76, 0xe5, 0x08, 0x04, 0xa5, 0x4f, 0x05, 0x07,
+ 0x06, 0x07, 0xe5, 0x2a, 0x06, 0x05, 0x46, 0x25,
+ 0x26, 0x85, 0x26, 0x05, 0x06, 0x05, 0xe0, 0x10,
+ 0x25, 0x04, 0x36, 0xe5, 0x03, 0x07, 0x26, 0x27,
+ 0x36, 0x05, 0x24, 0x07, 0x06, 0xe0, 0x02, 0xa5,
+ 0x20, 0xa5, 0x20, 0xa5, 0xe0, 0x01, 0xc5, 0x00,
+ 0xc5, 0x00, 0xe2, 0x23, 0x0e, 0x64, 0xe2, 0x01,
+ 0x04, 0x2e, 0x60, 0xe2, 0x48, 0xe5, 0x1b, 0x27,
+ 0x06, 0x27, 0x06, 0x27, 0x16, 0x07, 0x06, 0x20,
+ 0xe9, 0x02, 0xa0, 0xe5, 0xab, 0x1c, 0xe0, 0x04,
+ 0xe5, 0x0f, 0x60, 0xe5, 0x29, 0x60, 0xfc, 0x87,
+ 0x78, 0xfd, 0x98, 0x78, 0xe5, 0x80, 0xe6, 0x20,
+ 0xe5, 0x62, 0xe0, 0x1e, 0xc2, 0xe0, 0x04, 0x82,
+ 0x80, 0x05, 0x06, 0xe5, 0x02, 0x0c, 0xe5, 0x05,
+ 0x00, 0x85, 0x00, 0x05, 0x00, 0x25, 0x00, 0x25,
+ 0x00, 0xe5, 0x64, 0xee, 0x08, 0xe0, 0x09, 0xe5,
+ 0x80, 0xe3, 0x13, 0x12, 0xe0, 0x08, 0xe5, 0x38,
+ 0x20, 0xe5, 0x2e, 0xe0, 0x20, 0xe5, 0x04, 0x0d,
+ 0x0f, 0x20, 0xe6, 0x08, 0xd6, 0x12, 0x13, 0x16,
+ 0xa0, 0xe6, 0x08, 0x16, 0x31, 0x30, 0x12, 0x13,
+ 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13,
+ 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x36, 0x12,
+ 0x13, 0x76, 0x50, 0x56, 0x00, 0x76, 0x11, 0x12,
+ 0x13, 0x12, 0x13, 0x12, 0x13, 0x56, 0x0c, 0x11,
+ 0x4c, 0x00, 0x16, 0x0d, 0x36, 0x60, 0x85, 0x00,
+ 0xe5, 0x7f, 0x20, 0x1b, 0x00, 0x56, 0x0d, 0x56,
+ 0x12, 0x13, 0x16, 0x0c, 0x16, 0x11, 0x36, 0xe9,
+ 0x02, 0x36, 0x4c, 0x36, 0xe1, 0x12, 0x12, 0x16,
+ 0x13, 0x0e, 0x10, 0x0e, 0xe2, 0x12, 0x12, 0x0c,
+ 0x13, 0x0c, 0x12, 0x13, 0x16, 0x12, 0x13, 0x36,
+ 0xe5, 0x02, 0x04, 0xe5, 0x25, 0x24, 0xe5, 0x17,
+ 0x40, 0xa5, 0x20, 0xa5, 0x20, 0xa5, 0x20, 0x45,
+ 0x40, 0x2d, 0x0c, 0x0e, 0x0f, 0x2d, 0x00, 0x0f,
+ 0x6c, 0x2f, 0xe0, 0x02, 0x5b, 0x2f, 0x20, 0xe5,
+ 0x04, 0x00, 0xe5, 0x12, 0x00, 0xe5, 0x0b, 0x00,
+ 0x25, 0x00, 0xe5, 0x07, 0x20, 0xe5, 0x06, 0xe0,
+ 0x1a, 0xe5, 0x73, 0x80, 0x56, 0x60, 0xeb, 0x25,
+ 0x40, 0xef, 0x01, 0xea, 0x2d, 0x6b, 0xef, 0x09,
+ 0x2b, 0x4f, 0x00, 0xef, 0x05, 0x40, 0x0f, 0xe0,
+ 0x27, 0xef, 0x25, 0x06, 0xe0, 0x7a, 0xe5, 0x15,
+ 0x40, 0xe5, 0x29, 0xe0, 0x07, 0x06, 0xeb, 0x13,
+ 0x60, 0xe5, 0x18, 0x6b, 0xe0, 0x01, 0xe5, 0x0c,
+ 0x0a, 0xe5, 0x00, 0x0a, 0x80, 0xe5, 0x1e, 0x86,
+ 0x80, 0xe5, 0x16, 0x00, 0x16, 0xe5, 0x1c, 0x60,
+ 0xe5, 0x00, 0x16, 0x8a, 0xe0, 0x22, 0xe1, 0x20,
+ 0xe2, 0x20, 0xe5, 0x46, 0x20, 0xe9, 0x02, 0xa0,
+ 0xe1, 0x1c, 0x60, 0xe2, 0x1c, 0x60, 0xe5, 0x20,
+ 0xe0, 0x00, 0xe5, 0x2c, 0xe0, 0x03, 0x16, 0xe0,
+ 0x80, 0x08, 0xe5, 0x80, 0xaf, 0xe0, 0x01, 0xe5,
+ 0x0e, 0xe0, 0x02, 0xe5, 0x00, 0xe0, 0x80, 0x10,
+ 0xa5, 0x20, 0x05, 0x00, 0xe5, 0x24, 0x00, 0x25,
+ 0x40, 0x05, 0x20, 0xe5, 0x0f, 0x00, 0x16, 0xeb,
+ 0x00, 0xe5, 0x0f, 0x2f, 0xcb, 0xe5, 0x17, 0xe0,
+ 0x00, 0xeb, 0x01, 0xe0, 0x28, 0xe5, 0x0b, 0x00,
+ 0x25, 0x80, 0x8b, 0xe5, 0x0e, 0xab, 0x40, 0x16,
+ 0xe5, 0x12, 0x80, 0x16, 0xe0, 0x38, 0xe5, 0x30,
+ 0x60, 0x2b, 0x25, 0xeb, 0x08, 0x20, 0xeb, 0x26,
+ 0x05, 0x46, 0x00, 0x26, 0x80, 0x66, 0x65, 0x00,
+ 0x45, 0x00, 0xe5, 0x15, 0x20, 0x46, 0x60, 0x06,
+ 0xeb, 0x01, 0xc0, 0xf6, 0x01, 0xc0, 0xe5, 0x15,
+ 0x2b, 0x16, 0xe5, 0x15, 0x4b, 0xe0, 0x18, 0xe5,
+ 0x00, 0x0f, 0xe5, 0x14, 0x26, 0x60, 0x8b, 0xd6,
+ 0xe0, 0x01, 0xe5, 0x2e, 0x40, 0xd6, 0xe5, 0x0e,
+ 0x20, 0xeb, 0x00, 0xe5, 0x0b, 0x80, 0xeb, 0x00,
+ 0xe5, 0x0a, 0xc0, 0x76, 0xe0, 0x04, 0xcb, 0xe0,
+ 0x48, 0xe5, 0x41, 0xe0, 0x2f, 0xe1, 0x2b, 0xe0,
+ 0x05, 0xe2, 0x2b, 0xc0, 0xab, 0xe5, 0x1c, 0x66,
+ 0xe0, 0x00, 0xe9, 0x02, 0xe0, 0x80, 0x9e, 0xeb,
+ 0x17, 0x00, 0xe5, 0x22, 0x00, 0x26, 0x11, 0x20,
+ 0x25, 0xe0, 0x46, 0xe5, 0x15, 0xeb, 0x02, 0x05,
+ 0xe0, 0x00, 0xe5, 0x0e, 0xe6, 0x03, 0x6b, 0x96,
+ 0xe0, 0x4e, 0xe5, 0x0d, 0xcb, 0xe0, 0x0c, 0xe5,
 0x0f, 0xe0, 0x01, 0x07, 0x06, 0x07, 0xe5, 0x2d,
 0xe6, 0x07, 0xd6, 0x60, 0xeb, 0x0c, 0xe9, 0x02,
 0xe0, 0x07, 0x46, 0x07, 0xe5, 0x25, 0x47, 0x66,
 0x27, 0x26, 0x36, 0x1b, 0x76, 0xe0, 0x03, 0x1b,
 0x20, 0xe5, 0x11, 0xc0, 0xe9, 0x02, 0xa0, 0x46,
 0xe5, 0x1c, 0x86, 0x07, 0xe6, 0x00, 0x00, 0xe9,
- 0x02, 0x76, 0x05, 0x27, 0xe0, 0x01, 0xe5, 0x1b,
- 0x06, 0x36, 0x05, 0xe0, 0x01, 0x26, 0x07, 0xe5,
- 0x28, 0x47, 0xe6, 0x01, 0x27, 0x65, 0x76, 0x66,
- 0x16, 0x20, 0xe9, 0x02, 0x05, 0x16, 0x05, 0x56,
- 0x00, 0xeb, 0x0c, 0xe0, 0x03, 0xe5, 0x0a, 0x00,
- 0xe5, 0x11, 0x47, 0x46, 0x27, 0x06, 0x07, 0x26,
- 0xb6, 0x06, 0xe0, 0x39, 0xc5, 0x00, 0x05, 0x00,
- 0x65, 0x00, 0xe5, 0x07, 0x00, 0xe5, 0x02, 0x16,
- 0xa0, 0xe5, 0x27, 0x06, 0x47, 0xe6, 0x00, 0x80,
- 0xe9, 0x02, 0xa0, 0x26, 0x27, 0x00, 0xe5, 0x00,
- 0x20, 0x25, 0x20, 0xe5, 0x0e, 0x00, 0xc5, 0x00,
- 0x25, 0x00, 0x85, 0x00, 0x26, 0x05, 0x27, 0x06,
- 0x67, 0x20, 0x27, 0x20, 0x47, 0x20, 0x05, 0xa0,
- 0x07, 0x80, 0x85, 0x27, 0x20, 0xc6, 0x40, 0x86,
- 0xe0, 0x80, 0x03, 0xe5, 0x2d, 0x47, 0xe6, 0x00,
- 0x27, 0x46, 0x07, 0x06, 0x65, 0x96, 0xe9, 0x02,
- 0x00, 0x16, 0x00, 0x16, 0x06, 0x05, 0xe0, 0x18,
- 0xe5, 0x28, 0x47, 0xa6, 0x07, 0x06, 0x67, 0x26,
- 0x07, 0x26, 0x25, 0x16, 0x05, 0xe0, 0x00, 0xe9,
- 0x02, 0xe0, 0x80, 0x1e, 0xe5, 0x27, 0x47, 0x66,
- 0x20, 0x67, 0x26, 0x07, 0x26, 0xf6, 0x0f, 0x65,
- 0x26, 0xe0, 0x1a, 0xe5, 0x28, 0x47, 0xe6, 0x00,
- 0x27, 0x06, 0x07, 0x26, 0x56, 0x05, 0xe0, 0x03,
- 0xe9, 0x02, 0xa0, 0xf6, 0x05, 0xe0, 0x0b, 0xe5,
- 0x23, 0x06, 0x07, 0x06, 0x27, 0xa6, 0x07, 0x06,
- 0x05, 0xc0, 0xe9, 0x02, 0xe0, 0x2e, 0xe5, 0x13,
- 0x20, 0x46, 0x27, 0x66, 0x07, 0x86, 0x60, 0xe9,
- 0x02, 0x2b, 0x56, 0x0f, 0xe0, 0x80, 0x38, 0xe5,
- 0x24, 0x47, 0xe6, 0x01, 0x07, 0x26, 0x16, 0xe0,
- 0x5c, 0xe1, 0x18, 0xe2, 0x18, 0xe9, 0x02, 0xeb,
- 0x01, 0xe0, 0x04, 0x05, 0xe0, 0x80, 0x18, 0xe5,
- 0x00, 0x20, 0xe5, 0x1f, 0x47, 0x66, 0x20, 0x26,
- 0x67, 0x06, 0x05, 0x16, 0x05, 0x07, 0xe0, 0x13,
- 0x05, 0xe6, 0x02, 0xe5, 0x20, 0xa6, 0x07, 0x05,
- 0x66, 0xf6, 0x00, 0x06, 0xe0, 0x00, 0x05, 0xa6,
- 0x27, 0x46, 0xe5, 0x26, 0xe6, 0x05, 0x07, 0x26,
- 0x56, 0x05, 0x96, 0xe0, 0x15, 0xe5, 0x31, 0xe0,
- 0x80, 0x7f, 0xe5, 0x01, 0x00, 0xe5, 0x1d, 0x07,
- 0xc6, 0x00, 0xa6, 0x07, 0x06, 0x05, 0x96, 0xe0,
- 0x02, 0xe9, 0x02, 0xeb, 0x0b, 0x40, 0x36, 0xe5,
- 0x16, 0x20, 0xe6, 0x0e, 0x00, 0x07, 0xc6, 0x07,
- 0x26, 0x07, 0x26, 0xe0, 0x41, 0xc5, 0x00, 0x25,
- 0x00, 0xe5, 0x1e, 0xa6, 0x40, 0x06, 0x00, 0x26,
- 0x00, 0xc6, 0x05, 0x06, 0xe0, 0x00, 0xe9, 0x02,
- 0xa0, 0xa5, 0x00, 0x25, 0x00, 0xe5, 0x18, 0x87,
- 0x00, 0x26, 0x00, 0x27, 0x06, 0x07, 0x06, 0x05,
- 0xc0, 0xe9, 0x02, 0xe0, 0x80, 0xae, 0xe5, 0x0b,
- 0x26, 0x27, 0x36, 0xe0, 0x80, 0x3f, 0xeb, 0x0d,
- 0xef, 0x00, 0x6d, 0xef, 0x09, 0xe0, 0x05, 0x16,
- 0xe5, 0x83, 0x12, 0xe0, 0x5e, 0xea, 0x67, 0x00,
- 0x96, 0xe0, 0x03, 0xe5, 0x80, 0x3c, 0xe0, 0x8a,
- 0x34, 0xe5, 0x83, 0xa7, 0x00, 0xfb, 0x01, 0xe0,
- 0x8f, 0x3f, 0xe5, 0x81, 0xbf, 0xe0, 0xa1, 0x31,
- 0xe5, 0x81, 0xb1, 0xc0, 0xe5, 0x17, 0x00, 0xe9,
- 0x02, 0x60, 0x36, 0xe0, 0x58, 0xe5, 0x16, 0x20,
- 0x86, 0x16, 0xe0, 0x02, 0xe5, 0x28, 0xc6, 0x96,
- 0x6f, 0x64, 0x16, 0x0f, 0xe0, 0x02, 0xe9, 0x02,
- 0x00, 0xcb, 0x00, 0xe5, 0x0d, 0x80, 0xe5, 0x0b,
- 0xe0, 0x82, 0x28, 0xe1, 0x18, 0xe2, 0x18, 0xeb,
- 0x0f, 0x76, 0xe0, 0x5d, 0xe5, 0x43, 0x60, 0x06,
- 0x05, 0xe7, 0x2f, 0xc0, 0x66, 0xe4, 0x05, 0xe0,
- 0x38, 0x24, 0x16, 0x04, 0xe0, 0x14, 0xe5, 0x97,
- 0x70, 0xe0, 0x00, 0xe5, 0x82, 0x6b, 0xe0, 0xa4,
- 0x85, 0xe5, 0x80, 0x97, 0xe0, 0x29, 0x45, 0xe0,
- 0x09, 0x65, 0xe0, 0x00, 0xe5, 0x81, 0x04, 0xe0,
- 0x88, 0x7c, 0xe5, 0x63, 0x80, 0xe5, 0x05, 0x40,
- 0xe5, 0x01, 0xc0, 0xe5, 0x02, 0x20, 0x0f, 0x26,
- 0x16, 0x7b, 0xe0, 0x92, 0xd4, 0xef, 0x80, 0x6e,
- 0xe0, 0x02, 0xef, 0x1f, 0x20, 0xef, 0x34, 0x27,
- 0x46, 0x4f, 0xa7, 0xfb, 0x00, 0xe6, 0x00, 0x2f,
- 0xc6, 0xef, 0x16, 0x66, 0xef, 0x33, 0xe0, 0x0f,
- 0xef, 0x3a, 0x46, 0x0f, 0xe0, 0x80, 0x12, 0xeb,
- 0x0c, 0xe0, 0x04, 0xef, 0x4f, 0xe0, 0x01, 0xeb,
- 0x11, 0xe0, 0x7f, 0xe1, 0x12, 0xe2, 0x12, 0xe1,
- 0x12, 0xc2, 0x00, 0xe2, 0x0a, 0xe1, 0x12, 0xe2,
- 0x12, 0x01, 0x00, 0x21, 0x20, 0x01, 0x20, 0x21,
- 0x20, 0x61, 0x00, 0xe1, 0x00, 0x62, 0x00, 0x02,
- 0x00, 0xc2, 0x00, 0xe2, 0x03, 0xe1, 0x12, 0xe2,
- 0x12, 0x21, 0x00, 0x61, 0x20, 0xe1, 0x00, 0x00,
- 0xc1, 0x00, 0xe2, 0x12, 0x21, 0x00, 0x61, 0x00,
- 0x81, 0x00, 0x01, 0x40, 0xc1, 0x00, 0xe2, 0x12,
- 0xe1, 0x12, 0xe2, 0x12, 0xe1, 0x12, 0xe2, 0x12,
- 0xe1, 0x12, 0xe2, 0x12, 0xe1, 0x12, 0xe2, 0x12,
- 0xe1, 0x12, 0xe2, 0x12, 0xe1, 0x12, 0xe2, 0x14,
- 0x20, 0xe1, 0x11, 0x0c, 0xe2, 0x11, 0x0c, 0xa2,
+ 0x02, 0x76, 0x05, 0x27, 0x05, 0xe0, 0x00, 0xe5,
+ 0x1b, 0x06, 0x36, 0x05, 0xe0, 0x01, 0x26, 0x07,
+ 0xe5, 0x28, 0x47, 0xe6, 0x01, 0x27, 0x65, 0x76,
+ 0x66, 0x16, 0x07, 0x06, 0xe9, 0x02, 0x05, 0x16,
+ 0x05, 0x56, 0x00, 0xeb, 0x0c, 0xe0, 0x03, 0xe5,
+ 0x0a, 0x00, 0xe5, 0x11, 0x47, 0x46, 0x27, 0x06,
+ 0x07, 0x26, 0xb6, 0x06, 0xe0, 0x39, 0xc5, 0x00,
+ 0x05, 0x00, 0x65, 0x00, 0xe5, 0x07, 0x00, 0xe5,
+ 0x02, 0x16, 0xa0, 0xe5, 0x27, 0x06, 0x47, 0xe6,
+ 0x00, 0x80, 0xe9, 0x02, 0xa0, 0x26, 0x27, 0x00,
+ 0xe5, 0x00, 0x20, 0x25, 0x20, 0xe5, 0x0e, 0x00,
+ 0xc5, 0x00, 0x25, 0x00, 0x85, 0x00, 0x26, 0x05,
+ 0x27, 0x06, 0x67, 0x20, 0x27, 0x20, 0x47, 0x20,
+ 0x05, 0xa0, 0x07, 0x80, 0x85, 0x27, 0x20, 0xc6,
+ 0x40, 0x86, 0xe0, 0x80, 0x03, 0xe5, 0x2d, 0x47,
+ 0xe6, 0x00, 0x27, 0x46, 0x07, 0x06, 0x65, 0x96,
+ 0xe9, 0x02, 0x36, 0x00, 0x16, 0x06, 0x45, 0xe0,
+ 0x16, 0xe5, 0x28, 0x47, 0xa6, 0x07, 0x06, 0x67,
+ 0x26, 0x07, 0x26, 0x25, 0x16, 0x05, 0xe0, 0x00,
+ 0xe9, 0x02, 0xe0, 0x80, 0x1e, 0xe5, 0x27, 0x47,
+ 0x66, 0x20, 0x67, 0x26, 0x07, 0x26, 0xf6, 0x0f,
+ 0x65, 0x26, 0xe0, 0x1a, 0xe5, 0x28, 0x47, 0xe6,
+ 0x00, 0x27, 0x06, 0x07, 0x26, 0x56, 0x05, 0xe0,
+ 0x03, 0xe9, 0x02, 0xa0, 0xf6, 0x05, 0xe0, 0x0b,
+ 0xe5, 0x23, 0x06, 0x07, 0x06, 0x27, 0xa6, 0x07,
+ 0x06, 0x05, 0xc0, 0xe9, 0x02, 0xe0, 0x2e, 0xe5,
+ 0x13, 0x20, 0x46, 0x27, 0x66, 0x07, 0x86, 0x60,
+ 0xe9, 0x02, 0x2b, 0x56, 0x0f, 0xe0, 0x80, 0x38,
+ 0xe5, 0x24, 0x47, 0xe6, 0x01, 0x07, 0x26, 0x16,
+ 0xe0, 0x5c, 0xe1, 0x18, 0xe2, 0x18, 0xe9, 0x02,
+ 0xeb, 0x01, 0xe0, 0x04, 0xe5, 0x00, 0x20, 0x05,
+ 0x20, 0xe5, 0x00, 0x00, 0x25, 0x00, 0xe5, 0x10,
+ 0xa7, 0x00, 0x27, 0x20, 0x26, 0x07, 0x06, 0x05,
+ 0x07, 0x05, 0x07, 0x06, 0x56, 0xe0, 0x01, 0xe9,
+ 0x02, 0xe0, 0x3e, 0xe5, 0x00, 0x20, 0xe5, 0x1f,
+ 0x47, 0x66, 0x20, 0x26, 0x67, 0x06, 0x05, 0x16,
+ 0x05, 0x07, 0xe0, 0x13, 0x05, 0xe6, 0x02, 0xe5,
+ 0x20, 0xa6, 0x07, 0x05, 0x66, 0xf6, 0x00, 0x06,
+ 0xe0, 0x00, 0x05, 0xa6, 0x27, 0x46, 0xe5, 0x26,
+ 0xe6, 0x05, 0x07, 0x26, 0x56, 0x05, 0x96, 0xe0,
+ 0x15, 0xe5, 0x31, 0xe0, 0x80, 0x7f, 0xe5, 0x01,
+ 0x00, 0xe5, 0x1d, 0x07, 0xc6, 0x00, 0xa6, 0x07,
+ 0x06, 0x05, 0x96, 0xe0, 0x02, 0xe9, 0x02, 0xeb,
+ 0x0b, 0x40, 0x36, 0xe5, 0x16, 0x20, 0xe6, 0x0e,
+ 0x00, 0x07, 0xc6, 0x07, 0x26, 0x07, 0x26, 0xe0,
+ 0x41, 0xc5, 0x00, 0x25, 0x00, 0xe5, 0x1e, 0xa6,
+ 0x40, 0x06, 0x00, 0x26, 0x00, 0xc6, 0x05, 0x06,
+ 0xe0, 0x00, 0xe9, 0x02, 0xa0, 0xa5, 0x00, 0x25,
+ 0x00, 0xe5, 0x18, 0x87, 0x00, 0x26, 0x00, 0x27,
+ 0x06, 0x07, 0x06, 0x05, 0xc0, 0xe9, 0x02, 0xe0,
+ 0x80, 0xae, 0xe5, 0x0b, 0x26, 0x27, 0x36, 0xe0,
+ 0x80, 0x2f, 0x05, 0xe0, 0x07, 0xeb, 0x0d, 0xef,
+ 0x00, 0x6d, 0xef, 0x09, 0xe0, 0x05, 0x16, 0xe5,
+ 0x83, 0x12, 0xe0, 0x5e, 0xea, 0x67, 0x00, 0x96,
+ 0xe0, 0x03, 0xe5, 0x80, 0x3c, 0xe0, 0x8a, 0x34,
+ 0xe5, 0x83, 0xa7, 0x00, 0xfb, 0x01, 0xe0, 0x8f,
+ 0x3f, 0xe5, 0x81, 0xbf, 0xe0, 0xa1, 0x31, 0xe5,
+ 0x81, 0xb1, 0xc0, 0xe5, 0x17, 0x00, 0xe9, 0x02,
+ 0x60, 0x36, 0xe0, 0x58, 0xe5, 0x16, 0x20, 0x86,
+ 0x16, 0xe0, 0x02, 0xe5, 0x28, 0xc6, 0x96, 0x6f,
+ 0x64, 0x16, 0x0f, 0xe0, 0x02, 0xe9, 0x02, 0x00,
+ 0xcb, 0x00, 0xe5, 0x0d, 0x80, 0xe5, 0x0b, 0xe0,
+ 0x82, 0x28, 0xe1, 0x18, 0xe2, 0x18, 0xeb, 0x0f,
+ 0x76, 0xe0, 0x5d, 0xe5, 0x43, 0x60, 0x06, 0x05,
+ 0xe7, 0x2f, 0xc0, 0x66, 0xe4, 0x05, 0xe0, 0x38,
+ 0x24, 0x16, 0x04, 0x06, 0xe0, 0x03, 0x27, 0xe0,
+ 0x06, 0xe5, 0x97, 0x70, 0xe0, 0x00, 0xe5, 0x84,
+ 0x4e, 0xe0, 0x22, 0xe5, 0x01, 0xe0, 0xa2, 0x6f,
+ 0xe5, 0x80, 0x97, 0xe0, 0x29, 0x45, 0xe0, 0x09,
+ 0x65, 0xe0, 0x00, 0xe5, 0x81, 0x04, 0xe0, 0x88,
+ 0x7c, 0xe5, 0x63, 0x80, 0xe5, 0x05, 0x40, 0xe5,
+ 0x01, 0xc0, 0xe5, 0x02, 0x20, 0x0f, 0x26, 0x16,
+ 0x7b, 0xe0, 0x92, 0xd4, 0xef, 0x80, 0x6e, 0xe0,
+ 0x02, 0xef, 0x1f, 0x20, 0xef, 0x34, 0x27, 0x46,
+ 0x4f, 0xa7, 0xfb, 0x00, 0xe6, 0x00, 0x2f, 0xc6,
+ 0xef, 0x16, 0x66, 0xef, 0x33, 0xe0, 0x0f, 0xef,
+ 0x3a, 0x46, 0x0f, 0xe0, 0x80, 0x12, 0xeb, 0x0c,
+ 0xe0, 0x04, 0xef, 0x4f, 0xe0, 0x01, 0xeb, 0x11,
+ 0xe0, 0x7f, 0xe1, 0x12, 0xe2, 0x12, 0xe1, 0x12,
+ 0xc2, 0x00, 0xe2, 0x0a, 0xe1, 0x12, 0xe2, 0x12,
+ 0x01, 0x00, 0x21, 0x20, 0x01, 0x20, 0x21, 0x20,
+ 0x61, 0x00, 0xe1, 0x00, 0x62, 0x00, 0x02, 0x00,
+ 0xc2, 0x00, 0xe2, 0x03, 0xe1, 0x12, 0xe2, 0x12,
+ 0x21, 0x00, 0x61, 0x20, 0xe1, 0x00, 0x00, 0xc1,
+ 0x00, 0xe2, 0x12, 0x21, 0x00, 0x61, 0x00, 0x81,
+ 0x00, 0x01, 0x40, 0xc1, 0x00, 0xe2, 0x12, 0xe1,
+ 0x12, 0xe2, 0x12, 0xe1, 0x12, 0xe2, 0x12, 0xe1,
+ 0x12, 0xe2, 0x12, 0xe1, 0x12, 0xe2, 0x12, 0xe1,
+ 0x12, 0xe2, 0x12, 0xe1, 0x12, 0xe2, 0x14, 0x20,
 0xe1, 0x11, 0x0c, 0xe2, 0x11, 0x0c, 0xa2, 0xe1,
 0x11, 0x0c, 0xe2, 0x11, 0x0c, 0xa2, 0xe1, 0x11,
 0x0c, 0xe2, 0x11, 0x0c, 0xa2, 0xe1, 0x11, 0x0c,
- 0xe2, 0x11, 0x0c, 0xa2, 0x3f, 0x20, 0xe9, 0x2a,
- 0xef, 0x81, 0x78, 0xe6, 0x2f, 0x6f, 0xe6, 0x2a,
- 0xef, 0x00, 0x06, 0xef, 0x06, 0x06, 0x2f, 0x96,
- 0xe0, 0x07, 0x86, 0x00, 0xe6, 0x07, 0xe0, 0x84,
- 0xc8, 0xc6, 0x00, 0xe6, 0x09, 0x20, 0xc6, 0x00,
- 0x26, 0x00, 0x86, 0xe0, 0x80, 0x4d, 0xe5, 0x25,
- 0x40, 0xc6, 0xc4, 0x20, 0xe9, 0x02, 0x60, 0x05,
- 0x0f, 0xe0, 0x80, 0xe8, 0xe5, 0x24, 0x66, 0xe9,
- 0x02, 0x80, 0x0d, 0xe0, 0x84, 0x78, 0xe5, 0x80,
- 0x3d, 0x20, 0xeb, 0x01, 0xc6, 0xe0, 0x21, 0xe1,
- 0x1a, 0xe2, 0x1a, 0xc6, 0x04, 0x60, 0xe9, 0x02,
- 0x60, 0x36, 0xe0, 0x82, 0x89, 0xeb, 0x33, 0x0f,
- 0x4b, 0x0d, 0x6b, 0xe0, 0x44, 0xeb, 0x25, 0x0f,
- 0xeb, 0x07, 0xe0, 0x80, 0x3a, 0x65, 0x00, 0xe5,
- 0x13, 0x00, 0x25, 0x00, 0x05, 0x20, 0x05, 0x00,
- 0xe5, 0x02, 0x00, 0x65, 0x00, 0x05, 0x00, 0x05,
- 0xa0, 0x05, 0x60, 0x05, 0x00, 0x05, 0x00, 0x05,
- 0x00, 0x45, 0x00, 0x25, 0x00, 0x05, 0x20, 0x05,
- 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05,
- 0x00, 0x25, 0x00, 0x05, 0x20, 0x65, 0x00, 0xc5,
- 0x00, 0x65, 0x00, 0x65, 0x00, 0x05, 0x00, 0xe5,
- 0x02, 0x00, 0xe5, 0x09, 0x80, 0x45, 0x00, 0x85,
- 0x00, 0xe5, 0x09, 0xe0, 0x2c, 0x2c, 0xe0, 0x80,
- 0x86, 0xef, 0x24, 0x60, 0xef, 0x5c, 0xe0, 0x04,
- 0xef, 0x07, 0x20, 0xef, 0x07, 0x00, 0xef, 0x07,
- 0x00, 0xef, 0x1d, 0xe0, 0x02, 0xeb, 0x05, 0x40,
- 0xef, 0x55, 0x40, 0xef, 0x35, 0xe0, 0x31, 0xef,
- 0x15, 0xe0, 0x05, 0xef, 0x24, 0x60, 0xef, 0x01,
- 0xc0, 0x2f, 0xe0, 0x06, 0xaf, 0xe0, 0x80, 0x12,
- 0xef, 0x80, 0x73, 0x8e, 0xef, 0x82, 0x4e, 0xe0,
- 0x02, 0xef, 0x05, 0x40, 0xef, 0x03, 0x80, 0xef,
- 0x6c, 0xe0, 0x04, 0xef, 0x51, 0xc0, 0xef, 0x04,
- 0xe0, 0x0c, 0xef, 0x04, 0x60, 0xef, 0x30, 0xe0,
- 0x00, 0xef, 0x02, 0xa0, 0xef, 0x20, 0xe0, 0x00,
- 0xef, 0x16, 0xe0, 0x4a, 0xef, 0x04, 0x00, 0xef,
- 0x5d, 0x00, 0x6f, 0x40, 0xef, 0x21, 0x20, 0xaf,
- 0x40, 0xef, 0x15, 0x20, 0xef, 0x7f, 0xe0, 0x04,
- 0xef, 0x06, 0x20, 0x6f, 0x60, 0x4f, 0x80, 0x4f,
- 0xe0, 0x05, 0xaf, 0xe0, 0x84, 0xe2, 0xe5, 0xc0,
- 0x66, 0x4f, 0xe0, 0x21, 0xe5, 0x8f, 0xad, 0xe0,
- 0x03, 0xe5, 0x80, 0x56, 0x20, 0xe5, 0x95, 0xfa,
- 0xe0, 0x06, 0xe5, 0x9c, 0xa9, 0xe0, 0x8b, 0x97,
- 0xe5, 0x81, 0x96, 0xe0, 0xca, 0xc5, 0x5b, 0x1b,
- 0xe0, 0x16, 0xfb, 0x58, 0xe0, 0x78, 0xe6, 0x80,
- 0x68, 0xe0, 0xc0, 0xbd, 0x88, 0xfd, 0xc0, 0xbf,
- 0x76, 0x20, 0xfd, 0xc0, 0xbf, 0x76, 0x20,
+ 0xe2, 0x11, 0x0c, 0xa2, 0xe1, 0x11, 0x0c, 0xe2,
+ 0x11, 0x0c, 0xa2, 0x3f, 0x20, 0xe9, 0x2a, 0xef,
+ 0x81, 0x78, 0xe6, 0x2f, 0x6f, 0xe6, 0x2a, 0xef,
+ 0x00, 0x06, 0xef, 0x06, 0x06, 0x2f, 0x96, 0xe0,
+ 0x07, 0x86, 0x00, 0xe6, 0x07, 0xe0, 0x84, 0xc8,
+ 0xc6, 0x00, 0xe6, 0x09, 0x20, 0xc6, 0x00, 0x26,
+ 0x00, 0x86, 0xe0, 0x80, 0x4d, 0xe5, 0x25, 0x40,
+ 0xc6, 0xc4, 0x20, 0xe9, 0x02, 0x60, 0x05, 0x0f,
+ 0xe0, 0x80, 0xe8, 0xe5, 0x24, 0x66, 0xe9, 0x02,
+ 0x80, 0x0d, 0xe0, 0x84, 0x78, 0xe5, 0x80, 0x3d,
+ 0x20, 0xeb, 0x01, 0xc6, 0xe0, 0x21, 0xe1, 0x1a,
+ 0xe2, 0x1a, 0xc6, 0x04, 0x60, 0xe9, 0x02, 0x60,
+ 0x36, 0xe0, 0x82, 0x89, 0xeb, 0x33, 0x0f, 0x4b,
+ 0x0d, 0x6b, 0xe0, 0x44, 0xeb, 0x25, 0x0f, 0xeb,
+ 0x07, 0xe0, 0x80, 0x3a, 0x65, 0x00, 0xe5, 0x13,
+ 0x00, 0x25, 0x00, 0x05, 0x20, 0x05, 0x00, 0xe5,
+ 0x02, 0x00, 0x65, 0x00, 0x05, 0x00, 0x05, 0xa0,
+ 0x05, 0x60, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00,
+ 0x45, 0x00, 0x25, 0x00, 0x05, 0x20, 0x05, 0x00,
+ 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00,
+ 0x25, 0x00, 0x05, 0x20, 0x65, 0x00, 0xc5, 0x00,
+ 0x65, 0x00, 0x65, 0x00, 0x05, 0x00, 0xe5, 0x02,
+ 0x00, 0xe5, 0x09, 0x80, 0x45, 0x00, 0x85, 0x00,
+ 0xe5, 0x09, 0xe0, 0x2c, 0x2c, 0xe0, 0x80, 0x86,
+ 0xef, 0x24, 0x60, 0xef, 0x5c, 0xe0, 0x04, 0xef,
+ 0x07, 0x20, 0xef, 0x07, 0x00, 0xef, 0x07, 0x00,
+ 0xef, 0x1d, 0xe0, 0x02, 0xeb, 0x05, 0xef, 0x80,
+ 0x19, 0xe0, 0x30, 0xef, 0x15, 0xe0, 0x05, 0xef,
+ 0x24, 0x60, 0xef, 0x01, 0xc0, 0x2f, 0xe0, 0x06,
+ 0xaf, 0xe0, 0x80, 0x12, 0xef, 0x80, 0x73, 0x8e,
+ 0xef, 0x82, 0x50, 0xe0, 0x00, 0xef, 0x05, 0x40,
+ 0xef, 0x05, 0x40, 0xef, 0x6c, 0xe0, 0x04, 0xef,
+ 0x51, 0xc0, 0xef, 0x04, 0xe0, 0x0c, 0xef, 0x04,
+ 0x60, 0xef, 0x30, 0xe0, 0x00, 0xef, 0x02, 0xa0,
+ 0xef, 0x20, 0xe0, 0x00, 0xef, 0x16, 0x20, 0x2f,
+ 0xe0, 0x46, 0xef, 0x71, 0x00, 0xef, 0x4a, 0x00,
+ 0xef, 0x7f, 0xe0, 0x04, 0xef, 0x06, 0x20, 0x8f,
+ 0x40, 0x4f, 0x80, 0xcf, 0xe0, 0x01, 0xef, 0x11,
+ 0xc0, 0xcf, 0xe0, 0x01, 0x4f, 0xe0, 0x05, 0xcf,
+ 0xe0, 0x21, 0xef, 0x80, 0x0b, 0x00, 0xef, 0x2f,
+ 0xe0, 0x1d, 0xe9, 0x02, 0xe0, 0x83, 0x7e, 0xe5,
+ 0xc0, 0x66, 0x56, 0xe0, 0x1a, 0xe5, 0x8f, 0xad,
+ 0xe0, 0x03, 0xe5, 0x80, 0x56, 0x20, 0xe5, 0x95,
+ 0xfa, 0xe0, 0x06, 0xe5, 0x9c, 0xa9, 0xe0, 0x8b,
+ 0x97, 0xe5, 0x81, 0x96, 0xe0, 0x85, 0x5a, 0xe5,
+ 0x92, 0xc3, 0xe0, 0xca, 0xac, 0x2e, 0x1b, 0xe0,
+ 0x16, 0xfb, 0x58, 0xe0, 0x78, 0xe6, 0x80, 0x68,
+ 0xe0, 0xc0, 0xbd, 0x88, 0xfd, 0xc0, 0xbf, 0x76,
+ 0x20, 0xfd, 0xc0, 0xbf, 0x76, 0x20,
 };
 
 typedef enum {
@@ -2753,6 +2781,7 @@
 UNICODE_SCRIPT_Chakma,
 UNICODE_SCRIPT_Cham,
 UNICODE_SCRIPT_Cherokee,
+ UNICODE_SCRIPT_Chorasmian,
 UNICODE_SCRIPT_Common,
 UNICODE_SCRIPT_Coptic,
 UNICODE_SCRIPT_Cuneiform,
@@ -2760,6 +2789,7 @@
 UNICODE_SCRIPT_Cyrillic,
 UNICODE_SCRIPT_Deseret,
 UNICODE_SCRIPT_Devanagari,
+ UNICODE_SCRIPT_Dives_Akuru,
 UNICODE_SCRIPT_Dogra,
 UNICODE_SCRIPT_Duployan,
 UNICODE_SCRIPT_Egyptian_Hieroglyphs,
@@ -2793,6 +2823,7 @@
 UNICODE_SCRIPT_Kharoshthi,
 UNICODE_SCRIPT_Khmer,
 UNICODE_SCRIPT_Khojki,
+ UNICODE_SCRIPT_Khitan_Small_Script,
 UNICODE_SCRIPT_Khudawadi,
 UNICODE_SCRIPT_Lao,
 UNICODE_SCRIPT_Latin,
@@ -2880,6 +2911,7 @@
 UNICODE_SCRIPT_Vai,
 UNICODE_SCRIPT_Wancho,
 UNICODE_SCRIPT_Warang_Citi,
+ UNICODE_SCRIPT_Yezidi,
 UNICODE_SCRIPT_Yi,
 UNICODE_SCRIPT_Zanabazar_Square,
 UNICODE_SCRIPT_COUNT,
@@ -2909,6 +2941,7 @@
 "Chakma,Cakm" "\0"
 "Cham,Cham" "\0"
 "Cherokee,Cher" "\0"
+ "Chorasmian,Chrs" "\0"
 "Common,Zyyy" "\0"
 "Coptic,Copt,Qaac" "\0"
 "Cuneiform,Xsux" "\0"
@@ -2916,6 +2949,7 @@
 "Cyrillic,Cyrl" "\0"
 "Deseret,Dsrt" "\0"
 "Devanagari,Deva" "\0"
+ "Dives_Akuru,Diak" "\0"
 "Dogra,Dogr" "\0"
 "Duployan,Dupl" "\0"
 "Egyptian_Hieroglyphs,Egyp" "\0"
@@ -2949,6 +2983,7 @@
 "Kharoshthi,Khar" "\0"
 "Khmer,Khmr" "\0"
 "Khojki,Khoj" "\0"
+ "Khitan_Small_Script,Kits" "\0"
 "Khudawadi,Sind" "\0"
 "Lao,Laoo" "\0"
 "Latin,Latn" "\0"
@@ -3036,434 +3071,442 @@
 "Vai,Vaii" "\0"
 "Wancho,Wcho" "\0"
 "Warang_Citi,Wara" "\0"
+ "Yezidi,Yezi" "\0"
 "Yi,Yiii" "\0"
 "Zanabazar_Square,Zanb" "\0"
 ;
 
-static const uint8_t unicode_script_table[2565] = {
- 0xc0, 0x18, 0x99, 0x42, 0x85, 0x18, 0x99, 0x42,
- 0xae, 0x18, 0x80, 0x42, 0x8e, 0x18, 0x80, 0x42,
- 0x84, 0x18, 0x96, 0x42, 0x80, 0x18, 0x9e, 0x42,
- 0x80, 0x18, 0xe1, 0x60, 0x42, 0xa6, 0x18, 0x84,
- 0x42, 0x84, 0x18, 0x81, 0x0d, 0x93, 0x18, 0xe0,
- 0x0f, 0x35, 0x83, 0x29, 0x80, 0x18, 0x82, 0x29,
- 0x01, 0x83, 0x29, 0x80, 0x18, 0x80, 0x29, 0x03,
- 0x80, 0x29, 0x80, 0x18, 0x80, 0x29, 0x80, 0x18,
- 0x82, 0x29, 0x00, 0x80, 0x29, 0x00, 0x93, 0x29,
- 0x00, 0xbe, 0x29, 0x8d, 0x19, 0x8f, 0x29, 0xe0,
- 0x24, 0x1c, 0x81, 0x35, 0xe0, 0x48, 0x1c, 0x00,
- 0xa5, 0x05, 0x01, 0xaf, 0x05, 0x80, 0x18, 0x80,
- 0x05, 0x01, 0x82, 0x05, 0x00, 0xb6, 0x32, 0x07,
- 0x9a, 0x32, 0x03, 0x85, 0x32, 0x0a, 0x84, 0x04,
- 0x80, 0x18, 0x85, 0x04, 0x80, 0x18, 0x8d, 0x04,
- 0x80, 0x18, 0x80, 0x04, 0x00, 0x80, 0x04, 0x80,
- 0x18, 0x9f, 0x04, 0x80, 0x18, 0x89, 0x04, 0x8a,
- 0x35, 0x99, 0x04, 0x80, 0x35, 0xe0, 0x0b, 0x04,
- 0x80, 0x18, 0xa1, 0x04, 0x8d, 0x84, 0x00, 0xbb,
- 0x84, 0x01, 0x82, 0x84, 0xaf, 0x04, 0xb1, 0x8e,
- 0x0d, 0xba, 0x60, 0x01, 0x82, 0x60, 0xad, 0x78,
- 0x01, 0x8e, 0x78, 0x00, 0x9b, 0x4d, 0x01, 0x80,
- 0x4d, 0x00, 0x8a, 0x84, 0x34, 0x94, 0x04, 0x00,
- 0x87, 0x04, 0x14, 0x8e, 0x04, 0x80, 0x18, 0x9c,
- 0x04, 0xd0, 0x1e, 0x83, 0x35, 0x8e, 0x1e, 0x81,
- 0x18, 0x99, 0x1e, 0x83, 0x0b, 0x00, 0x87, 0x0b,
- 0x01, 0x81, 0x0b, 0x01, 0x95, 0x0b, 0x00, 0x86,
- 0x0b, 0x00, 0x80, 0x0b, 0x02, 0x83, 0x0b, 0x01,
- 0x88, 0x0b, 0x01, 0x81, 0x0b, 0x01, 0x83, 0x0b,
- 0x07, 0x80, 0x0b, 0x03, 0x81, 0x0b, 0x00, 0x84,
- 0x0b, 0x01, 0x98, 0x0b, 0x01, 0x82, 0x2c, 0x00,
- 0x85, 0x2c, 0x03, 0x81, 0x2c, 0x01, 0x95, 0x2c,
- 0x00, 0x86, 0x2c, 0x00, 0x81, 0x2c, 0x00, 0x81,
- 0x2c, 0x00, 0x81, 0x2c, 0x01, 0x80, 0x2c, 0x00,
- 0x84, 0x2c, 0x03, 0x81, 0x2c, 0x01, 0x82, 0x2c,
- 0x02, 0x80, 0x2c, 0x06, 0x83, 0x2c, 0x00, 0x80,
- 0x2c, 0x06, 0x90, 0x2c, 0x09, 0x82, 0x2a, 0x00,
- 0x88, 0x2a, 0x00, 0x82, 0x2a, 0x00, 0x95, 0x2a,
- 0x00, 0x86, 0x2a, 0x00, 0x81, 0x2a, 0x00, 0x84,
- 0x2a, 0x01, 0x89, 0x2a, 0x00, 0x82, 0x2a, 0x00,
- 0x82, 0x2a, 0x01, 0x80, 0x2a, 0x0e, 0x83, 0x2a,
- 0x01, 0x8b, 0x2a, 0x06, 0x86, 0x2a, 0x00, 0x82,
- 0x6d, 0x00, 0x87, 0x6d, 0x01, 0x81, 0x6d, 0x01,
- 0x95, 0x6d, 0x00, 0x86, 0x6d, 0x00, 0x81, 0x6d,
- 0x00, 0x84, 0x6d, 0x01, 0x88, 0x6d, 0x01, 0x81,
- 0x6d, 0x01, 0x82, 0x6d, 0x07, 0x81, 0x6d, 0x03,
- 0x81, 0x6d, 0x00, 0x84, 0x6d, 0x01, 0x91, 0x6d,
- 0x09, 0x81, 0x8b, 0x00, 0x85, 0x8b, 0x02, 0x82,
- 0x8b, 0x00, 0x83, 0x8b, 0x02, 0x81, 0x8b, 0x00,
- 0x80, 0x8b, 0x00, 0x81, 0x8b, 0x02, 0x81, 0x8b,
- 0x02, 0x82, 0x8b, 0x02, 0x8b, 0x8b, 0x03, 0x84,
- 0x8b, 0x02, 0x82, 0x8b, 0x00, 0x83, 0x8b, 0x01,
- 0x80, 0x8b, 0x05, 0x80, 0x8b, 0x0d, 0x94, 0x8b,
- 0x04, 0x8c, 0x8d, 0x00, 0x82, 0x8d, 0x00, 0x96,
- 0x8d, 0x00, 0x8f, 0x8d, 0x02, 0x87, 0x8d, 0x00,
- 0x82, 0x8d, 0x00, 0x83, 0x8d, 0x06, 0x81, 0x8d,
- 0x00, 0x82, 0x8d, 0x04, 0x83, 0x8d, 0x01, 0x89,
- 0x8d, 0x06, 0x88, 0x8d, 0x8c, 0x3a, 0x00, 0x82,
- 0x3a, 0x00, 0x96, 0x3a, 0x00, 0x89, 0x3a, 0x00,
- 0x84, 0x3a, 0x01, 0x88, 0x3a, 0x00, 0x82, 0x3a,
- 0x00, 0x83, 0x3a, 0x06, 0x81, 0x3a, 0x06, 0x80,
- 0x3a, 0x00, 0x83, 0x3a, 0x01, 0x89, 0x3a, 0x00,
- 0x81, 0x3a, 0x0c, 0x83, 0x4c, 0x00, 0x87, 0x4c,
- 0x00, 0x82, 0x4c, 0x00, 0xb2, 0x4c, 0x00, 0x82,
- 0x4c, 0x00, 0x85, 0x4c, 0x03, 0x8f, 0x4c, 0x01,
- 0x99, 0x4c, 0x01, 0x81, 0x7e, 0x00, 0x91, 0x7e,
- 0x02, 0x97, 0x7e, 0x00, 0x88, 0x7e, 0x00, 0x80,
- 0x7e, 0x01, 0x86, 0x7e, 0x02, 0x80, 0x7e, 0x03,
- 0x85, 0x7e, 0x00, 0x80, 0x7e, 0x00, 0x87, 0x7e,
- 0x05, 0x89, 0x7e, 0x01, 0x82, 0x7e, 0x0b, 0xb9,
- 0x8f, 0x03, 0x80, 0x18, 0x9b, 0x8f, 0x24, 0x81,
- 0x41, 0x00, 0x80, 0x41, 0x00, 0x84, 0x41, 0x00,
- 0x97, 0x41, 0x00, 0x80, 0x41, 0x00, 0x96, 0x41,
- 0x01, 0x84, 0x41, 0x00, 0x80, 0x41, 0x00, 0x85,
- 0x41, 0x01, 0x89, 0x41, 0x01, 0x83, 0x41, 0x1f,
- 0xc7, 0x90, 0x00, 0xa3, 0x90, 0x03, 0xa6, 0x90,
- 0x00, 0xa3, 0x90, 0x00, 0x8e, 0x90, 0x00, 0x86,
- 0x90, 0x83, 0x18, 0x81, 0x90, 0x24, 0xe0, 0x3f,
- 0x5b, 0xa5, 0x25, 0x00, 0x80, 0x25, 0x04, 0x80,
- 0x25, 0x01, 0xaa, 0x25, 0x80, 0x18, 0x83, 0x25,
- 0xe0, 0x9f, 0x2e, 0xc8, 0x24, 0x00, 0x83, 0x24,
- 0x01, 0x86, 0x24, 0x00, 0x80, 0x24, 0x00, 0x83,
- 0x24, 0x01, 0xa8, 0x24, 0x00, 0x83, 0x24, 0x01,
- 0xa0, 0x24, 0x00, 0x83, 0x24, 0x01, 0x86, 0x24,
- 0x00, 0x80, 0x24, 0x00, 0x83, 0x24, 0x01, 0x8e,
- 0x24, 0x00, 0xb8, 0x24, 0x00, 0x83, 0x24, 0x01,
- 0xc2, 0x24, 0x01, 0x9f, 0x24, 0x02, 0x99, 0x24,
- 0x05, 0xd5, 0x17, 0x01, 0x85, 0x17, 0x01, 0xe2,
- 0x1f, 0x12, 0x9c, 0x63, 0x02, 0xca, 0x77, 0x82,
- 0x18, 0x8a, 0x77, 0x06, 0x8c, 0x85, 0x00, 0x86,
- 0x85, 0x0a, 0x94, 0x30, 0x81, 0x18, 0x08, 0x93,
- 0x11, 0x0b, 0x8c, 0x86, 0x00, 0x82, 0x86, 0x00,
- 0x81, 0x86, 0x0b, 0xdd, 0x3e, 0x01, 0x89, 0x3e,
- 0x05, 0x89, 0x3e, 0x05, 0x81, 0x58, 0x81, 0x18,
- 0x80, 0x58, 0x80, 0x18, 0x88, 0x58, 0x00, 0x89,
- 0x58, 0x05, 0xd8, 0x58, 0x06, 0xaa, 0x58, 0x04,
- 0xc5, 0x12, 0x09, 0x9e, 0x44, 0x00, 0x8b, 0x44,
- 0x03, 0x8b, 0x44, 0x03, 0x80, 0x44, 0x02, 0x8b,
- 0x44, 0x9d, 0x87, 0x01, 0x84, 0x87, 0x0a, 0xab,
- 0x5e, 0x03, 0x99, 0x5e, 0x05, 0x8a, 0x5e, 0x02,
- 0x81, 0x5e, 0x9f, 0x3e, 0x9b, 0x10, 0x01, 0x81,
- 0x10, 0xbe, 0x88, 0x00, 0x9c, 0x88, 0x01, 0x8a,
- 0x88, 0x05, 0x89, 0x88, 0x05, 0x8d, 0x88, 0x01,
- 0x8e, 0x35, 0x40, 0xcb, 0x07, 0x03, 0xac, 0x07,
- 0x02, 0xbf, 0x82, 0xb3, 0x0a, 0x07, 0x83, 0x0a,
- 0xb7, 0x43, 0x02, 0x8e, 0x43, 0x02, 0x82, 0x43,
- 0xaf, 0x64, 0x88, 0x1c, 0x06, 0xaa, 0x25, 0x01,
- 0x82, 0x25, 0x87, 0x82, 0x07, 0x82, 0x35, 0x80,
- 0x18, 0x8c, 0x35, 0x80, 0x18, 0x86, 0x35, 0x83,
- 0x18, 0x80, 0x35, 0x85, 0x18, 0x80, 0x35, 0x82,
- 0x18, 0x81, 0x35, 0x80, 0x18, 0x04, 0xa5, 0x42,
- 0x84, 0x29, 0x80, 0x1c, 0xb0, 0x42, 0x84, 0x29,
- 0x83, 0x42, 0x84, 0x29, 0x8c, 0x42, 0x80, 0x1c,
- 0xc5, 0x42, 0x80, 0x29, 0xb9, 0x35, 0x00, 0x84,
- 0x35, 0xe0, 0x9f, 0x42, 0x95, 0x29, 0x01, 0x85,
- 0x29, 0x01, 0xa5, 0x29, 0x01, 0x85, 0x29, 0x01,
- 0x87, 0x29, 0x00, 0x80, 0x29, 0x00, 0x80, 0x29,
- 0x00, 0x80, 0x29, 0x00, 0x9e, 0x29, 0x01, 0xb4,
- 0x29, 0x00, 0x8e, 0x29, 0x00, 0x8d, 0x29, 0x01,
- 0x85, 0x29, 0x00, 0x92, 0x29, 0x01, 0x82, 0x29,
- 0x00, 0x88, 0x29, 0x00, 0x8b, 0x18, 0x81, 0x35,
- 0xd6, 0x18, 0x00, 0x8a, 0x18, 0x80, 0x42, 0x01,
- 0x8a, 0x18, 0x80, 0x42, 0x8e, 0x18, 0x00, 0x8c,
- 0x42, 0x02, 0x9f, 0x18, 0x0f, 0xa0, 0x35, 0x0e,
- 0xa5, 0x18, 0x80, 0x29, 0x82, 0x18, 0x81, 0x42,
- 0x85, 0x18, 0x80, 0x42, 0x9a, 0x18, 0x80, 0x42,
- 0x90, 0x18, 0xa8, 0x42, 0x82, 0x18, 0x03, 0xe2,
- 0x36, 0x18, 0x18, 0x8a, 0x18, 0x14, 0xe3, 0x3f,
- 0x18, 0xe0, 0x9f, 0x0f, 0xe2, 0x13, 0x18, 0x01,
- 0x9f, 0x18, 0x01, 0xe0, 0x07, 0x18, 0xae, 0x26,
- 0x00, 0xae, 0x26, 0x00, 0x9f, 0x42, 0xe0, 0x13,
- 0x19, 0x04, 0x86, 0x19, 0xa5, 0x25, 0x00, 0x80,
- 0x25, 0x04, 0x80, 0x25, 0x01, 0xb7, 0x91, 0x06,
- 0x81, 0x91, 0x0d, 0x80, 0x91, 0x96, 0x24, 0x08,
- 0x86, 0x24, 0x00, 0x86, 0x24, 0x00, 0x86, 0x24,
- 0x00, 0x86, 0x24, 0x00, 0x86, 0x24, 0x00, 0x86,
- 0x24, 0x00, 0x86, 0x24, 0x00, 0x86, 0x24, 0x00,
- 0x9f, 0x1c, 0xcf, 0x18, 0x2f, 0x99, 0x2d, 0x00,
- 0xd8, 0x2d, 0x0b, 0xe0, 0x75, 0x2d, 0x19, 0x8b,
- 0x18, 0x03, 0x84, 0x18, 0x80, 0x2d, 0x80, 0x18,
- 0x80, 0x2d, 0x98, 0x18, 0x88, 0x2d, 0x83, 0x35,
- 0x81, 0x2e, 0x87, 0x18, 0x83, 0x2d, 0x83, 0x18,
- 0x00, 0xd5, 0x33, 0x01, 0x81, 0x35, 0x81, 0x18,
- 0x82, 0x33, 0x80, 0x18, 0xd9, 0x3b, 0x81, 0x18,
- 0x82, 0x3b, 0x04, 0xaa, 0x0d, 0x00, 0xdd, 0x2e,
- 0x00, 0x8f, 0x18, 0x9a, 0x0d, 0x04, 0xa3, 0x18,
- 0x0b, 0x8f, 0x3b, 0x9e, 0x2e, 0x00, 0xbf, 0x18,
- 0x9e, 0x2e, 0xd0, 0x18, 0xae, 0x3b, 0x80, 0x18,
- 0xd7, 0x3b, 0xe0, 0x47, 0x18, 0xf0, 0x09, 0x55,
- 0x2d, 0x09, 0xbf, 0x18, 0xf0, 0x41, 0x8f, 0x2d,
- 0x0f, 0xe4, 0x2c, 0x97, 0x02, 0xb6, 0x97, 0x08,
- 0xaf, 0x47, 0xe0, 0xcb, 0x94, 0x13, 0xdf, 0x1c,
- 0xd7, 0x08, 0x07, 0xa1, 0x18, 0xe0, 0x05, 0x42,
- 0x82, 0x18, 0xb4, 0x42, 0x01, 0x84, 0x42, 0x2f,
- 0x88, 0x42, 0xab, 0x83, 0x03, 0x89, 0x18, 0x05,
- 0xb7, 0x73, 0x07, 0xc5, 0x79, 0x07, 0x8b, 0x79,
- 0x05, 0x9f, 0x1e, 0xad, 0x3c, 0x80, 0x18, 0x80,
- 0x3c, 0xa3, 0x76, 0x0a, 0x80, 0x76, 0x9c, 0x2e,
- 0x02, 0xcd, 0x38, 0x00, 0x80, 0x18, 0x89, 0x38,
- 0x03, 0x81, 0x38, 0x9e, 0x5b, 0x00, 0xb6, 0x16,
- 0x08, 0x8d, 0x16, 0x01, 0x89, 0x16, 0x01, 0x83,
- 0x16, 0x9f, 0x5b, 0xc2, 0x89, 0x17, 0x84, 0x89,
- 0x96, 0x52, 0x09, 0x85, 0x24, 0x01, 0x85, 0x24,
- 0x01, 0x85, 0x24, 0x08, 0x86, 0x24, 0x00, 0x86,
- 0x24, 0x00, 0xaa, 0x42, 0x80, 0x18, 0x88, 0x42,
- 0x80, 0x29, 0x81, 0x42, 0x07, 0xcf, 0x17, 0xad,
- 0x52, 0x01, 0x89, 0x52, 0x05, 0xf0, 0x1b, 0x43,
- 0x2e, 0x0b, 0x96, 0x2e, 0x03, 0xb0, 0x2e, 0x70,
- 0x10, 0xa3, 0xe1, 0x0d, 0x2d, 0x01, 0xe0, 0x09,
- 0x2d, 0x25, 0x86, 0x42, 0x0b, 0x84, 0x05, 0x04,
- 0x99, 0x32, 0x00, 0x84, 0x32, 0x00, 0x80, 0x32,
- 0x00, 0x81, 0x32, 0x00, 0x81, 0x32, 0x00, 0x89,
- 0x32, 0xe0, 0x11, 0x04, 0x10, 0xe1, 0x0a, 0x04,
- 0x81, 0x18, 0x0f, 0xbf, 0x04, 0x01, 0xb5, 0x04,
- 0x27, 0x8d, 0x04, 0x01, 0x8f, 0x35, 0x89, 0x18,
- 0x05, 0x8d, 0x35, 0x81, 0x1c, 0xa2, 0x18, 0x00,
- 0x92, 0x18, 0x00, 0x83, 0x18, 0x03, 0x84, 0x04,
- 0x00, 0xe0, 0x26, 0x04, 0x01, 0x80, 0x18, 0x00,
- 0x9f, 0x18, 0x99, 0x42, 0x85, 0x18, 0x99, 0x42,
- 0x8a, 0x18, 0x89, 0x3b, 0x80, 0x18, 0xac, 0x3b,
- 0x81, 0x18, 0x9e, 0x2e, 0x02, 0x85, 0x2e, 0x01,
- 0x85, 0x2e, 0x01, 0x85, 0x2e, 0x01, 0x82, 0x2e,
- 0x02, 0x86, 0x18, 0x00, 0x86, 0x18, 0x09, 0x84,
- 0x18, 0x01, 0x8b, 0x46, 0x00, 0x99, 0x46, 0x00,
- 0x92, 0x46, 0x00, 0x81, 0x46, 0x00, 0x8e, 0x46,
- 0x01, 0x8d, 0x46, 0x21, 0xe0, 0x1a, 0x46, 0x04,
- 0x82, 0x18, 0x03, 0xac, 0x18, 0x02, 0x88, 0x18,
- 0xce, 0x29, 0x00, 0x8b, 0x18, 0x03, 0x80, 0x29,
- 0x2e, 0xac, 0x18, 0x80, 0x35, 0x60, 0x21, 0x9c,
- 0x48, 0x02, 0xb0, 0x13, 0x0e, 0x80, 0x35, 0x9a,
- 0x18, 0x03, 0xa3, 0x66, 0x08, 0x82, 0x66, 0x9a,
- 0x27, 0x04, 0xaa, 0x68, 0x04, 0x9d, 0x93, 0x00,
- 0x80, 0x93, 0xa3, 0x69, 0x03, 0x8d, 0x69, 0x29,
- 0xcf, 0x1d, 0xaf, 0x7b, 0x9d, 0x6f, 0x01, 0x89,
- 0x6f, 0x05, 0xa3, 0x6e, 0x03, 0xa3, 0x6e, 0x03,
- 0xa7, 0x22, 0x07, 0xb3, 0x14, 0x0a, 0x80, 0x14,
- 0x60, 0x2f, 0xe0, 0xd6, 0x45, 0x08, 0x95, 0x45,
- 0x09, 0x87, 0x45, 0x60, 0x37, 0x85, 0x1b, 0x01,
- 0x80, 0x1b, 0x00, 0xab, 0x1b, 0x00, 0x81, 0x1b,
- 0x02, 0x80, 0x1b, 0x01, 0x80, 0x1b, 0x95, 0x34,
- 0x00, 0x88, 0x34, 0x9f, 0x71, 0x9e, 0x5c, 0x07,
- 0x88, 0x5c, 0x2f, 0x92, 0x31, 0x00, 0x81, 0x31,
- 0x04, 0x84, 0x31, 0x9b, 0x74, 0x02, 0x80, 0x74,
- 0x99, 0x49, 0x04, 0x80, 0x49, 0x3f, 0x9f, 0x55,
- 0x97, 0x54, 0x03, 0x93, 0x54, 0x01, 0xad, 0x54,
- 0x83, 0x3d, 0x00, 0x81, 0x3d, 0x04, 0x87, 0x3d,
- 0x00, 0x82, 0x3d, 0x00, 0x9c, 0x3d, 0x01, 0x82,
- 0x3d, 0x03, 0x89, 0x3d, 0x06, 0x88, 0x3d, 0x06,
- 0x9f, 0x6b, 0x9f, 0x67, 0x1f, 0xa6, 0x4e, 0x03,
- 0x8b, 0x4e, 0x08, 0xb5, 0x06, 0x02, 0x86, 0x06,
- 0x95, 0x37, 0x01, 0x87, 0x37, 0x92, 0x36, 0x04,
- 0x87, 0x36, 0x91, 0x75, 0x06, 0x83, 0x75, 0x0b,
- 0x86, 0x75, 0x4f, 0xc8, 0x6c, 0x36, 0xb2, 0x65,
- 0x0c, 0xb2, 0x65, 0x06, 0x85, 0x65, 0xa7, 0x2f,
- 0x07, 0x89, 0x2f, 0x60, 0xc5, 0x9e, 0x04, 0x60,
- 0x20, 0xa7, 0x6a, 0x07, 0xa9, 0x7f, 0x60, 0x25,
- 0x96, 0x23, 0x08, 0xcd, 0x0e, 0x03, 0x9d, 0x0e,
- 0x0e, 0x80, 0x0e, 0xc1, 0x39, 0x0a, 0x80, 0x39,
- 0x01, 0x98, 0x80, 0x06, 0x89, 0x80, 0x05, 0xb4,
- 0x15, 0x00, 0x90, 0x15, 0x08, 0xa6, 0x4b, 0x08,
- 0xcd, 0x7a, 0x01, 0x8f, 0x7a, 0x00, 0x93, 0x7e,
- 0x0a, 0x91, 0x3f, 0x00, 0xab, 0x3f, 0x40, 0x86,
- 0x5a, 0x00, 0x80, 0x5a, 0x00, 0x83, 0x5a, 0x00,
- 0x8e, 0x5a, 0x00, 0x8a, 0x5a, 0x05, 0xba, 0x40,
- 0x04, 0x89, 0x40, 0x05, 0x83, 0x28, 0x00, 0x87,
- 0x28, 0x01, 0x81, 0x28, 0x01, 0x95, 0x28, 0x00,
- 0x86, 0x28, 0x00, 0x81, 0x28, 0x00, 0x84, 0x28,
- 0x00, 0x80, 0x35, 0x88, 0x28, 0x01, 0x81, 0x28,
- 0x01, 0x82, 0x28, 0x01, 0x80, 0x28, 0x05, 0x80,
- 0x28, 0x04, 0x86, 0x28, 0x01, 0x86, 0x28, 0x02,
- 0x84, 0x28, 0x60, 0x2a, 0xd9, 0x5f, 0x00, 0x80,
- 0x5f, 0x00, 0x82, 0x5f, 0x1f, 0xc7, 0x92, 0x07,
- 0x89, 0x92, 0x60, 0x45, 0xb5, 0x7c, 0x01, 0xa5,
- 0x7c, 0x21, 0xc4, 0x57, 0x0a, 0x89, 0x57, 0x05,
- 0x8c, 0x58, 0x12, 0xb8, 0x8a, 0x06, 0x89, 0x8a,
- 0x35, 0x9a, 0x02, 0x01, 0x8e, 0x02, 0x03, 0x8f,
- 0x02, 0x60, 0x5f, 0xbb, 0x1f, 0x60, 0x03, 0xd2,
- 0x96, 0x0b, 0x80, 0x96, 0x60, 0x3f, 0x87, 0x5d,
- 0x01, 0xad, 0x5d, 0x01, 0x8a, 0x5d, 0x1a, 0xc7,
- 0x98, 0x07, 0xd2, 0x81, 0x1c, 0xb8, 0x72, 0x60,
- 0xa6, 0x88, 0x0c, 0x00, 0xac, 0x0c, 0x00, 0x8d,
- 0x0c, 0x09, 0x9c, 0x0c, 0x02, 0x9f, 0x4f, 0x01,
- 0x95, 0x4f, 0x00, 0x8d, 0x4f, 0x48, 0x86, 0x50,
- 0x00, 0x81, 0x50, 0x00, 0xab, 0x50, 0x02, 0x80,
- 0x50, 0x00, 0x81, 0x50, 0x00, 0x88, 0x50, 0x07,
- 0x89, 0x50, 0x05, 0x85, 0x2b, 0x00, 0x81, 0x2b,
- 0x00, 0xa4, 0x2b, 0x00, 0x81, 0x2b, 0x00, 0x85,
- 0x2b, 0x06, 0x89, 0x2b, 0x60, 0xd5, 0x98, 0x4a,
- 0x60, 0x66, 0xb1, 0x8b, 0x0c, 0x80, 0x8b, 0xe3,
- 0x39, 0x1a, 0x60, 0x05, 0xe0, 0x0e, 0x1a, 0x00,
- 0x84, 0x1a, 0x0a, 0xe0, 0x63, 0x1a, 0x6a, 0x5b,
- 0xe3, 0xce, 0x21, 0x00, 0x88, 0x21, 0x6f, 0x66,
- 0xe1, 0xe6, 0x03, 0x70, 0x11, 0x58, 0xe1, 0xd8,
- 0x08, 0x06, 0x9e, 0x59, 0x00, 0x89, 0x59, 0x03,
- 0x81, 0x59, 0x5f, 0x9d, 0x09, 0x01, 0x85, 0x09,
- 0x09, 0xc5, 0x70, 0x09, 0x89, 0x70, 0x00, 0x86,
- 0x70, 0x00, 0x94, 0x70, 0x04, 0x92, 0x70, 0x62,
- 0x4f, 0xda, 0x51, 0x60, 0x04, 0xca, 0x56, 0x03,
- 0xb8, 0x56, 0x06, 0x90, 0x56, 0x3f, 0x80, 0x8c,
- 0x80, 0x61, 0x81, 0x18, 0x1b, 0xf0, 0x07, 0x97,
- 0x8c, 0x07, 0xe2, 0x92, 0x8c, 0x70, 0x14, 0xac,
- 0x80, 0x3b, 0xe0, 0xbd, 0x33, 0x30, 0x82, 0x33,
- 0x10, 0x83, 0x3b, 0x07, 0xe1, 0x2b, 0x61, 0x68,
- 0xa3, 0xe0, 0x0a, 0x20, 0x04, 0x8c, 0x20, 0x02,
- 0x88, 0x20, 0x06, 0x89, 0x20, 0x01, 0x83, 0x20,
- 0x83, 0x18, 0x70, 0x02, 0xfb, 0xe0, 0x95, 0x18,
- 0x09, 0xa6, 0x18, 0x01, 0xbd, 0x18, 0x82, 0x35,
- 0x90, 0x18, 0x87, 0x35, 0x81, 0x18, 0x86, 0x35,
- 0x9d, 0x18, 0x83, 0x35, 0xba, 0x18, 0x16, 0xc5,
- 0x29, 0x60, 0x39, 0x93, 0x18, 0x0b, 0xd6, 0x18,
- 0x08, 0x98, 0x18, 0x60, 0x26, 0xd4, 0x18, 0x00,
- 0xc6, 0x18, 0x00, 0x81, 0x18, 0x01, 0x80, 0x18,
- 0x01, 0x81, 0x18, 0x01, 0x83, 0x18, 0x00, 0x8b,
- 0x18, 0x00, 0x80, 0x18, 0x00, 0x86, 0x18, 0x00,
- 0xc0, 0x18, 0x00, 0x83, 0x18, 0x01, 0x87, 0x18,
- 0x00, 0x86, 0x18, 0x00, 0x9b, 0x18, 0x00, 0x83,
- 0x18, 0x00, 0x84, 0x18, 0x00, 0x80, 0x18, 0x02,
- 0x86, 0x18, 0x00, 0xe0, 0xf3, 0x18, 0x01, 0xe0,
- 0xc3, 0x18, 0x01, 0xb1, 0x18, 0xe2, 0x2b, 0x7d,
- 0x0e, 0x84, 0x7d, 0x00, 0x8e, 0x7d, 0x64, 0xef,
- 0x86, 0x26, 0x00, 0x90, 0x26, 0x01, 0x86, 0x26,
- 0x00, 0x81, 0x26, 0x00, 0x84, 0x26, 0x60, 0x74,
- 0xac, 0x62, 0x02, 0x8d, 0x62, 0x01, 0x89, 0x62,
- 0x03, 0x81, 0x62, 0x61, 0x0f, 0xb9, 0x95, 0x04,
- 0x80, 0x95, 0x64, 0x9f, 0xe0, 0x64, 0x53, 0x01,
- 0x8f, 0x53, 0x28, 0xcb, 0x01, 0x03, 0x89, 0x01,
- 0x03, 0x81, 0x01, 0x62, 0xb0, 0xc3, 0x18, 0x4b,
- 0xbc, 0x18, 0x60, 0x61, 0x83, 0x04, 0x00, 0x9a,
- 0x04, 0x00, 0x81, 0x04, 0x00, 0x80, 0x04, 0x01,
- 0x80, 0x04, 0x00, 0x89, 0x04, 0x00, 0x83, 0x04,
- 0x00, 0x80, 0x04, 0x00, 0x80, 0x04, 0x05, 0x80,
- 0x04, 0x03, 0x80, 0x04, 0x00, 0x80, 0x04, 0x00,
- 0x80, 0x04, 0x00, 0x82, 0x04, 0x00, 0x81, 0x04,
- 0x00, 0x80, 0x04, 0x01, 0x80, 0x04, 0x00, 0x80,
- 0x04, 0x00, 0x80, 0x04, 0x00, 0x80, 0x04, 0x00,
- 0x80, 0x04, 0x00, 0x81, 0x04, 0x00, 0x80, 0x04,
- 0x01, 0x83, 0x04, 0x00, 0x86, 0x04, 0x00, 0x83,
- 0x04, 0x00, 0x83, 0x04, 0x00, 0x80, 0x04, 0x00,
- 0x89, 0x04, 0x00, 0x90, 0x04, 0x04, 0x82, 0x04,
- 0x00, 0x84, 0x04, 0x00, 0x90, 0x04, 0x33, 0x81,
- 0x04, 0x60, 0xad, 0xab, 0x18, 0x03, 0xe0, 0x03,
- 0x18, 0x0b, 0x8e, 0x18, 0x01, 0x8e, 0x18, 0x00,
- 0x8e, 0x18, 0x00, 0xa4, 0x18, 0x09, 0x8c, 0x18,
- 0x02, 0xdc, 0x18, 0x02, 0xbc, 0x18, 0x38, 0x99,
- 0x18, 0x80, 0x33, 0x81, 0x18, 0x0c, 0xab, 0x18,
- 0x03, 0x88, 0x18, 0x06, 0x81, 0x18, 0x0d, 0x85,
- 0x18, 0x60, 0x39, 0xe3, 0x75, 0x18, 0x09, 0x8c,
- 0x18, 0x02, 0x8a, 0x18, 0x04, 0xe0, 0x13, 0x18,
- 0x0b, 0xd8, 0x18, 0x06, 0x8b, 0x18, 0x13, 0x8b,
- 0x18, 0x03, 0xb7, 0x18, 0x07, 0x89, 0x18, 0x05,
- 0xa7, 0x18, 0x07, 0x9d, 0x18, 0x51, 0x8b, 0x18,
- 0x00, 0xe0, 0x04, 0x18, 0x00, 0x83, 0x18, 0x02,
- 0xa8, 0x18, 0x01, 0x85, 0x18, 0x02, 0x9c, 0x18,
- 0x01, 0xe0, 0x26, 0x18, 0x0b, 0x8d, 0x18, 0x01,
- 0x83, 0x18, 0x03, 0x82, 0x18, 0x04, 0x82, 0x18,
- 0x0c, 0x85, 0x18, 0x65, 0x09, 0xf0, 0x96, 0x76,
- 0x2d, 0x28, 0xef, 0xd4, 0x2d, 0x0a, 0xe0, 0x7d,
- 0x2d, 0x01, 0xf0, 0x06, 0x21, 0x2d, 0x0d, 0xf0,
- 0x0c, 0xd0, 0x2d, 0x6b, 0xbe, 0xe1, 0xbd, 0x2d,
- 0x7a, 0xf5, 0x82, 0x80, 0x18, 0x1d, 0xdf, 0x18,
- 0x60, 0x1f, 0xe0, 0x8f, 0x35,
-};
-
-static const uint8_t unicode_script_ext_table[789] = {
- 0x82, 0xc1, 0x00, 0x00, 0x01, 0x29, 0x01, 0x00,
- 0x00, 0x01, 0x29, 0x1c, 0x00, 0x0c, 0x01, 0x42,
- 0x80, 0x92, 0x00, 0x00, 0x02, 0x1c, 0x68, 0x00,
- 0x02, 0x1c, 0x26, 0x01, 0x02, 0x1c, 0x42, 0x00,
- 0x02, 0x1c, 0x26, 0x80, 0x80, 0x00, 0x00, 0x02,
- 0x05, 0x25, 0x80, 0x01, 0x00, 0x00, 0x04, 0x04,
- 0x2f, 0x84, 0x8e, 0x0d, 0x00, 0x00, 0x04, 0x04,
- 0x2f, 0x84, 0x8e, 0x00, 0x03, 0x04, 0x84, 0x8e,
- 0x01, 0x00, 0x00, 0x04, 0x04, 0x2f, 0x84, 0x8e,
- 0x1f, 0x00, 0x00, 0x08, 0x01, 0x04, 0x4d, 0x4e,
- 0x75, 0x2f, 0x7f, 0x84, 0x09, 0x00, 0x0a, 0x02,
- 0x04, 0x84, 0x09, 0x00, 0x09, 0x02, 0x04, 0x8e,
- 0x05, 0x00, 0x00, 0x02, 0x04, 0x84, 0x62, 0x00,
- 0x00, 0x02, 0x04, 0x2f, 0x81, 0xfb, 0x00, 0x00,
- 0x0d, 0x0b, 0x1e, 0x28, 0x2a, 0x2c, 0x3a, 0x42,
- 0x4c, 0x6d, 0x7a, 0x8b, 0x8d, 0x92, 0x00, 0x0c,
- 0x0b, 0x1e, 0x28, 0x2a, 0x2c, 0x3a, 0x42, 0x4c,
- 0x6d, 0x8b, 0x8d, 0x92, 0x10, 0x00, 0x00, 0x14,
- 0x0b, 0x1e, 0x1f, 0x2b, 0x50, 0x28, 0x2a, 0x2c,
- 0x3a, 0x4b, 0x4c, 0x5d, 0x6d, 0x40, 0x7e, 0x83,
- 0x8a, 0x8b, 0x8d, 0x92, 0x00, 0x15, 0x0b, 0x1e,
- 0x1f, 0x2b, 0x50, 0x28, 0x2a, 0x2c, 0x3a, 0x44,
- 0x4b, 0x4c, 0x5d, 0x6d, 0x40, 0x7e, 0x83, 0x8a,
- 0x8b, 0x8d, 0x92, 0x09, 0x04, 0x1e, 0x1f, 0x39,
- 0x4b, 0x75, 0x00, 0x09, 0x03, 0x0b, 0x15, 0x83,
- 0x75, 0x00, 0x09, 0x02, 0x2c, 0x5a, 0x75, 0x00,
- 0x09, 0x02, 0x2a, 0x3f, 0x80, 0x75, 0x00, 0x0d,
- 0x02, 0x28, 0x8b, 0x80, 0x71, 0x00, 0x09, 0x02,
- 0x3a, 0x5d, 0x82, 0xcf, 0x00, 0x09, 0x03, 0x15,
- 0x5b, 0x87, 0x80, 0x30, 0x00, 0x00, 0x02, 0x25,
- 0x42, 0x85, 0xb8, 0x00, 0x01, 0x04, 0x11, 0x30,
- 0x86, 0x85, 0x80, 0x4a, 0x00, 0x01, 0x02, 0x58,
- 0x73, 0x00, 0x00, 0x00, 0x02, 0x58, 0x73, 0x84,
- 0x49, 0x00, 0x00, 0x04, 0x0b, 0x1e, 0x28, 0x3a,
- 0x00, 0x01, 0x1e, 0x00, 0x04, 0x0b, 0x1e, 0x28,
- 0x3a, 0x00, 0x02, 0x1e, 0x28, 0x00, 0x01, 0x1e,
- 0x01, 0x02, 0x0b, 0x1e, 0x00, 0x02, 0x1e, 0x7a,
- 0x00, 0x02, 0x0b, 0x1e, 0x00, 0x02, 0x1e, 0x7a,
- 0x00, 0x06, 0x1e, 0x3a, 0x4c, 0x6d, 0x8b, 0x8d,
- 0x00, 0x01, 0x1e, 0x01, 0x02, 0x1e, 0x7a, 0x01,
- 0x01, 0x1e, 0x00, 0x02, 0x1e, 0x7a, 0x00, 0x02,
- 0x0b, 0x1e, 0x06, 0x01, 0x1e, 0x00, 0x02, 0x1e,
- 0x5d, 0x00, 0x02, 0x0b, 0x1e, 0x01, 0x01, 0x1e,
- 0x00, 0x02, 0x0b, 0x1e, 0x03, 0x01, 0x1e, 0x00,
- 0x08, 0x0b, 0x1e, 0x28, 0x3a, 0x5d, 0x6d, 0x8d,
- 0x92, 0x00, 0x02, 0x1e, 0x28, 0x00, 0x03, 0x1e,
- 0x28, 0x3a, 0x01, 0x02, 0x0b, 0x1e, 0x00, 0x01,
- 0x0b, 0x01, 0x02, 0x1e, 0x28, 0x00, 0x01, 0x5d,
- 0x80, 0x44, 0x00, 0x01, 0x01, 0x29, 0x81, 0xec,
- 0x00, 0x00, 0x02, 0x42, 0x58, 0x80, 0x3f, 0x00,
- 0x00, 0x03, 0x1e, 0x28, 0x42, 0x8c, 0xd1, 0x00,
- 0x00, 0x02, 0x1c, 0x26, 0x81, 0x3c, 0x00, 0x01,
- 0x06, 0x0d, 0x2e, 0x2d, 0x33, 0x3b, 0x97, 0x00,
- 0x05, 0x0d, 0x2e, 0x2d, 0x33, 0x3b, 0x01, 0x00,
- 0x00, 0x01, 0x2d, 0x00, 0x00, 0x09, 0x06, 0x0d,
- 0x2e, 0x2d, 0x33, 0x3b, 0x97, 0x00, 0x00, 0x00,
- 0x05, 0x0d, 0x2e, 0x2d, 0x33, 0x3b, 0x07, 0x06,
- 0x0d, 0x2e, 0x2d, 0x33, 0x3b, 0x97, 0x03, 0x05,
- 0x0d, 0x2e, 0x2d, 0x33, 0x3b, 0x09, 0x00, 0x03,
- 0x02, 0x0d, 0x2d, 0x01, 0x00, 0x00, 0x05, 0x0d,
- 0x2e, 0x2d, 0x33, 0x3b, 0x04, 0x02, 0x33, 0x3b,
- 0x00, 0x00, 0x00, 0x05, 0x0d, 0x2e, 0x2d, 0x33,
- 0x3b, 0x03, 0x00, 0x01, 0x03, 0x2d, 0x33, 0x3b,
- 0x01, 0x01, 0x2d, 0x58, 0x00, 0x03, 0x02, 0x33,
- 0x3b, 0x02, 0x00, 0x00, 0x02, 0x33, 0x3b, 0x59,
- 0x00, 0x00, 0x06, 0x0d, 0x2e, 0x2d, 0x33, 0x3b,
- 0x97, 0x00, 0x02, 0x33, 0x3b, 0x80, 0x12, 0x00,
- 0x0f, 0x01, 0x2d, 0x1f, 0x00, 0x23, 0x01, 0x2d,
- 0x3b, 0x00, 0x27, 0x01, 0x2d, 0x37, 0x00, 0x30,
- 0x01, 0x2d, 0x0e, 0x00, 0x0b, 0x01, 0x2d, 0x32,
- 0x00, 0x00, 0x01, 0x2d, 0x57, 0x00, 0x18, 0x01,
- 0x2d, 0x09, 0x00, 0x04, 0x01, 0x2d, 0x5f, 0x00,
- 0x1e, 0x01, 0x2d, 0xc0, 0x31, 0xef, 0x00, 0x00,
- 0x02, 0x1c, 0x26, 0x81, 0x3f, 0x00, 0x02, 0x0e,
- 0x1e, 0x1f, 0x2a, 0x2c, 0x3f, 0x3a, 0x39, 0x4b,
- 0x4c, 0x57, 0x5d, 0x40, 0x8a, 0x92, 0x02, 0x0d,
- 0x1e, 0x1f, 0x2a, 0x2c, 0x3f, 0x3a, 0x39, 0x4b,
- 0x57, 0x5d, 0x40, 0x8a, 0x92, 0x03, 0x0b, 0x1e,
- 0x1f, 0x2a, 0x2c, 0x3f, 0x39, 0x4b, 0x57, 0x40,
- 0x8a, 0x92, 0x80, 0x36, 0x00, 0x00, 0x02, 0x0b,
- 0x1e, 0x00, 0x00, 0x00, 0x02, 0x1e, 0x8b, 0x39,
- 0x00, 0x00, 0x03, 0x3c, 0x42, 0x5b, 0x80, 0x1f,
- 0x00, 0x00, 0x02, 0x10, 0x38, 0xc0, 0x13, 0xa1,
- 0x00, 0x00, 0x02, 0x04, 0x8e, 0x09, 0x00, 0x00,
- 0x02, 0x04, 0x8e, 0x46, 0x00, 0x01, 0x05, 0x0d,
- 0x2e, 0x2d, 0x33, 0x3b, 0x80, 0x99, 0x00, 0x04,
- 0x06, 0x0d, 0x2e, 0x2d, 0x33, 0x3b, 0x97, 0x09,
- 0x00, 0x00, 0x02, 0x33, 0x3b, 0x2c, 0x00, 0x01,
- 0x02, 0x33, 0x3b, 0x80, 0xdf, 0x00, 0x02, 0x02,
- 0x1b, 0x46, 0x03, 0x00, 0x2c, 0x03, 0x1b, 0x45,
- 0x46, 0x02, 0x00, 0x08, 0x02, 0x1b, 0x46, 0x81,
- 0x1f, 0x00, 0x1b, 0x02, 0x04, 0x19, 0x8f, 0x84,
- 0x00, 0x00, 0x02, 0x28, 0x8b, 0x00, 0x00, 0x00,
- 0x02, 0x28, 0x8b, 0x36, 0x00, 0x01, 0x02, 0x28,
- 0x8b, 0x8c, 0x12, 0x00, 0x01, 0x02, 0x28, 0x8b,
- 0x00, 0x00, 0x00, 0x02, 0x28, 0x8b, 0xc0, 0x5c,
- 0x4b, 0x00, 0x03, 0x01, 0x20, 0x96, 0x3b, 0x00,
- 0x11, 0x01, 0x2d, 0x9e, 0x5d, 0x00, 0x01, 0x01,
- 0x2d, 0xce, 0xcd, 0x2d, 0x00,
+static const uint8_t unicode_script_table[2609] = {
+ 0xc0, 0x19, 0x99, 0x45, 0x85, 0x19, 0x99, 0x45,
+ 0xae, 0x19, 0x80, 0x45, 0x8e, 0x19, 0x80, 0x45,
+ 0x84, 0x19, 0x96, 0x45, 0x80, 0x19, 0x9e, 0x45,
+ 0x80, 0x19, 0xe1, 0x60, 0x45, 0xa6, 0x19, 0x84,
+ 0x45, 0x84, 0x19, 0x81, 0x0d, 0x93, 0x19, 0xe0,
+ 0x0f, 0x37, 0x83, 0x2b, 0x80, 0x19, 0x82, 0x2b,
+ 0x01, 0x83, 0x2b, 0x80, 0x19, 0x80, 0x2b, 0x03,
+ 0x80, 0x2b, 0x80, 0x19, 0x80, 0x2b, 0x80, 0x19,
+ 0x82, 0x2b, 0x00, 0x80, 0x2b, 0x00, 0x93, 0x2b,
+ 0x00, 0xbe, 0x2b, 0x8d, 0x1a, 0x8f, 0x2b, 0xe0,
+ 0x24, 0x1d, 0x81, 0x37, 0xe0, 0x48, 0x1d, 0x00,
+ 0xa5, 0x05, 0x01, 0xb1, 0x05, 0x01, 0x82, 0x05,
+ 0x00, 0xb6, 0x34, 0x07, 0x9a, 0x34, 0x03, 0x85,
+ 0x34, 0x0a, 0x84, 0x04, 0x80, 0x19, 0x85, 0x04,
+ 0x80, 0x19, 0x8d, 0x04, 0x80, 0x19, 0x80, 0x04,
+ 0x00, 0x80, 0x04, 0x80, 0x19, 0x9f, 0x04, 0x80,
+ 0x19, 0x89, 0x04, 0x8a, 0x37, 0x99, 0x04, 0x80,
+ 0x37, 0xe0, 0x0b, 0x04, 0x80, 0x19, 0xa1, 0x04,
+ 0x8d, 0x87, 0x00, 0xbb, 0x87, 0x01, 0x82, 0x87,
+ 0xaf, 0x04, 0xb1, 0x91, 0x0d, 0xba, 0x63, 0x01,
+ 0x82, 0x63, 0xad, 0x7b, 0x01, 0x8e, 0x7b, 0x00,
+ 0x9b, 0x50, 0x01, 0x80, 0x50, 0x00, 0x8a, 0x87,
+ 0x34, 0x94, 0x04, 0x00, 0x91, 0x04, 0x0a, 0x8e,
+ 0x04, 0x80, 0x19, 0x9c, 0x04, 0xd0, 0x1f, 0x83,
+ 0x37, 0x8e, 0x1f, 0x81, 0x19, 0x99, 0x1f, 0x83,
+ 0x0b, 0x00, 0x87, 0x0b, 0x01, 0x81, 0x0b, 0x01,
+ 0x95, 0x0b, 0x00, 0x86, 0x0b, 0x00, 0x80, 0x0b,
+ 0x02, 0x83, 0x0b, 0x01, 0x88, 0x0b, 0x01, 0x81,
+ 0x0b, 0x01, 0x83, 0x0b, 0x07, 0x80, 0x0b, 0x03,
+ 0x81, 0x0b, 0x00, 0x84, 0x0b, 0x01, 0x98, 0x0b,
+ 0x01, 0x82, 0x2e, 0x00, 0x85, 0x2e, 0x03, 0x81,
+ 0x2e, 0x01, 0x95, 0x2e, 0x00, 0x86, 0x2e, 0x00,
+ 0x81, 0x2e, 0x00, 0x81, 0x2e, 0x00, 0x81, 0x2e,
+ 0x01, 0x80, 0x2e, 0x00, 0x84, 0x2e, 0x03, 0x81,
+ 0x2e, 0x01, 0x82, 0x2e, 0x02, 0x80, 0x2e, 0x06,
+ 0x83, 0x2e, 0x00, 0x80, 0x2e, 0x06, 0x90, 0x2e,
+ 0x09, 0x82, 0x2c, 0x00, 0x88, 0x2c, 0x00, 0x82,
+ 0x2c, 0x00, 0x95, 0x2c, 0x00, 0x86, 0x2c, 0x00,
+ 0x81, 0x2c, 0x00, 0x84, 0x2c, 0x01, 0x89, 0x2c,
+ 0x00, 0x82, 0x2c, 0x00, 0x82, 0x2c, 0x01, 0x80,
+ 0x2c, 0x0e, 0x83, 0x2c, 0x01, 0x8b, 0x2c, 0x06,
+ 0x86, 0x2c, 0x00, 0x82, 0x70, 0x00, 0x87, 0x70,
+ 0x01, 0x81, 0x70, 0x01, 0x95, 0x70, 0x00, 0x86,
+ 0x70, 0x00, 0x81, 0x70, 0x00, 0x84, 0x70, 0x01,
+ 0x88, 0x70, 0x01, 0x81, 0x70, 0x01, 0x82, 0x70,
+ 0x06, 0x82, 0x70, 0x03, 0x81, 0x70, 0x00, 0x84,
+ 0x70, 0x01, 0x91, 0x70, 0x09, 0x81, 0x8e, 0x00,
+ 0x85, 0x8e, 0x02, 0x82, 0x8e, 0x00, 0x83, 0x8e,
+ 0x02, 0x81, 0x8e, 0x00, 0x80, 0x8e, 0x00, 0x81,
+ 0x8e, 0x02, 0x81, 0x8e, 0x02, 0x82, 0x8e, 0x02,
+ 0x8b, 0x8e, 0x03, 0x84, 0x8e, 0x02, 0x82, 0x8e,
+ 0x00, 0x83, 0x8e, 0x01, 0x80, 0x8e, 0x05, 0x80,
+ 0x8e, 0x0d, 0x94, 0x8e, 0x04, 0x8c, 0x90, 0x00,
+ 0x82, 0x90, 0x00, 0x96, 0x90, 0x00, 0x8f, 0x90,
+ 0x02, 0x87, 0x90, 0x00, 0x82, 0x90, 0x00, 0x83,
+ 0x90, 0x06, 0x81, 0x90, 0x00, 0x82, 0x90, 0x04,
+ 0x83, 0x90, 0x01, 0x89, 0x90, 0x06, 0x88, 0x90,
+ 0x8c, 0x3c, 0x00, 0x82, 0x3c, 0x00, 0x96, 0x3c,
+ 0x00, 0x89, 0x3c, 0x00, 0x84, 0x3c, 0x01, 0x88,
+ 0x3c, 0x00, 0x82, 0x3c, 0x00, 0x83, 0x3c, 0x06,
+ 0x81, 0x3c, 0x06, 0x80, 0x3c, 0x00, 0x83, 0x3c,
+ 0x01, 0x89, 0x3c, 0x00, 0x81, 0x3c, 0x0c, 0x8c,
+ 0x4f, 0x00, 0x82, 0x4f, 0x00, 0xb2, 0x4f, 0x00,
+ 0x82, 0x4f, 0x00, 0x85, 0x4f, 0x03, 0x8f, 0x4f,
+ 0x01, 0x99, 0x4f, 0x00, 0x82, 0x81, 0x00, 0x91,
+ 0x81, 0x02, 0x97, 0x81, 0x00, 0x88, 0x81, 0x00,
+ 0x80, 0x81, 0x01, 0x86, 0x81, 0x02, 0x80, 0x81,
+ 0x03, 0x85, 0x81, 0x00, 0x80, 0x81, 0x00, 0x87,
+ 0x81, 0x05, 0x89, 0x81, 0x01, 0x82, 0x81, 0x0b,
+ 0xb9, 0x92, 0x03, 0x80, 0x19, 0x9b, 0x92, 0x24,
+ 0x81, 0x44, 0x00, 0x80, 0x44, 0x00, 0x84, 0x44,
+ 0x00, 0x97, 0x44, 0x00, 0x80, 0x44, 0x00, 0x96,
+ 0x44, 0x01, 0x84, 0x44, 0x00, 0x80, 0x44, 0x00,
+ 0x85, 0x44, 0x01, 0x89, 0x44, 0x01, 0x83, 0x44,
+ 0x1f, 0xc7, 0x93, 0x00, 0xa3, 0x93, 0x03, 0xa6,
+ 0x93, 0x00, 0xa3, 0x93, 0x00, 0x8e, 0x93, 0x00,
+ 0x86, 0x93, 0x83, 0x19, 0x81, 0x93, 0x24, 0xe0,
+ 0x3f, 0x5e, 0xa5, 0x27, 0x00, 0x80, 0x27, 0x04,
+ 0x80, 0x27, 0x01, 0xaa, 0x27, 0x80, 0x19, 0x83,
+ 0x27, 0xe0, 0x9f, 0x30, 0xc8, 0x26, 0x00, 0x83,
+ 0x26, 0x01, 0x86, 0x26, 0x00, 0x80, 0x26, 0x00,
+ 0x83, 0x26, 0x01, 0xa8, 0x26, 0x00, 0x83, 0x26,
+ 0x01, 0xa0, 0x26, 0x00, 0x83, 0x26, 0x01, 0x86,
+ 0x26, 0x00, 0x80, 0x26, 0x00, 0x83, 0x26, 0x01,
+ 0x8e, 0x26, 0x00, 0xb8, 0x26, 0x00, 0x83, 0x26,
+ 0x01, 0xc2, 0x26, 0x01, 0x9f, 0x26, 0x02, 0x99,
+ 0x26, 0x05, 0xd5, 0x17, 0x01, 0x85, 0x17, 0x01,
+ 0xe2, 0x1f, 0x12, 0x9c, 0x66, 0x02, 0xca, 0x7a,
+ 0x82, 0x19, 0x8a, 0x7a, 0x06, 0x8c, 0x88, 0x00,
+ 0x86, 0x88, 0x0a, 0x94, 0x32, 0x81, 0x19, 0x08,
+ 0x93, 0x11, 0x0b, 0x8c, 0x89, 0x00, 0x82, 0x89,
+ 0x00, 0x81, 0x89, 0x0b, 0xdd, 0x40, 0x01, 0x89,
+ 0x40, 0x05, 0x89, 0x40, 0x05, 0x81, 0x5b, 0x81,
+ 0x19, 0x80, 0x5b, 0x80, 0x19, 0x88, 0x5b, 0x00,
+ 0x89, 0x5b, 0x05, 0xd8, 0x5b, 0x06, 0xaa, 0x5b,
+ 0x04, 0xc5, 0x12, 0x09, 0x9e, 0x47, 0x00, 0x8b,
+ 0x47, 0x03, 0x8b, 0x47, 0x03, 0x80, 0x47, 0x02,
+ 0x8b, 0x47, 0x9d, 0x8a, 0x01, 0x84, 0x8a, 0x0a,
+ 0xab, 0x61, 0x03, 0x99, 0x61, 0x05, 0x8a, 0x61,
+ 0x02, 0x81, 0x61, 0x9f, 0x40, 0x9b, 0x10, 0x01,
+ 0x81, 0x10, 0xbe, 0x8b, 0x00, 0x9c, 0x8b, 0x01,
+ 0x8a, 0x8b, 0x05, 0x89, 0x8b, 0x05, 0x8d, 0x8b,
+ 0x01, 0x90, 0x37, 0x3e, 0xcb, 0x07, 0x03, 0xac,
+ 0x07, 0x02, 0xbf, 0x85, 0xb3, 0x0a, 0x07, 0x83,
+ 0x0a, 0xb7, 0x46, 0x02, 0x8e, 0x46, 0x02, 0x82,
+ 0x46, 0xaf, 0x67, 0x88, 0x1d, 0x06, 0xaa, 0x27,
+ 0x01, 0x82, 0x27, 0x87, 0x85, 0x07, 0x82, 0x37,
+ 0x80, 0x19, 0x8c, 0x37, 0x80, 0x19, 0x86, 0x37,
+ 0x83, 0x19, 0x80, 0x37, 0x85, 0x19, 0x80, 0x37,
+ 0x82, 0x19, 0x81, 0x37, 0x80, 0x19, 0x04, 0xa5,
+ 0x45, 0x84, 0x2b, 0x80, 0x1d, 0xb0, 0x45, 0x84,
+ 0x2b, 0x83, 0x45, 0x84, 0x2b, 0x8c, 0x45, 0x80,
+ 0x1d, 0xc5, 0x45, 0x80, 0x2b, 0xb9, 0x37, 0x00,
+ 0x84, 0x37, 0xe0, 0x9f, 0x45, 0x95, 0x2b, 0x01,
+ 0x85, 0x2b, 0x01, 0xa5, 0x2b, 0x01, 0x85, 0x2b,
+ 0x01, 0x87, 0x2b, 0x00, 0x80, 0x2b, 0x00, 0x80,
+ 0x2b, 0x00, 0x80, 0x2b, 0x00, 0x9e, 0x2b, 0x01,
+ 0xb4, 0x2b, 0x00, 0x8e, 0x2b, 0x00, 0x8d, 0x2b,
+ 0x01, 0x85, 0x2b, 0x00, 0x92, 0x2b, 0x01, 0x82,
+ 0x2b, 0x00, 0x88, 0x2b, 0x00, 0x8b, 0x19, 0x81,
+ 0x37, 0xd6, 0x19, 0x00, 0x8a, 0x19, 0x80, 0x45,
+ 0x01, 0x8a, 0x19, 0x80, 0x45, 0x8e, 0x19, 0x00,
+ 0x8c, 0x45, 0x02, 0x9f, 0x19, 0x0f, 0xa0, 0x37,
+ 0x0e, 0xa5, 0x19, 0x80, 0x2b, 0x82, 0x19, 0x81,
+ 0x45, 0x85, 0x19, 0x80, 0x45, 0x9a, 0x19, 0x80,
+ 0x45, 0x90, 0x19, 0xa8, 0x45, 0x82, 0x19, 0x03,
+ 0xe2, 0x36, 0x19, 0x18, 0x8a, 0x19, 0x14, 0xe3,
+ 0x3f, 0x19, 0xe0, 0x9f, 0x0f, 0xe2, 0x13, 0x19,
+ 0x01, 0x9f, 0x19, 0x00, 0xe0, 0x08, 0x19, 0xae,
+ 0x28, 0x00, 0xae, 0x28, 0x00, 0x9f, 0x45, 0xe0,
+ 0x13, 0x1a, 0x04, 0x86, 0x1a, 0xa5, 0x27, 0x00,
+ 0x80, 0x27, 0x04, 0x80, 0x27, 0x01, 0xb7, 0x94,
+ 0x06, 0x81, 0x94, 0x0d, 0x80, 0x94, 0x96, 0x26,
+ 0x08, 0x86, 0x26, 0x00, 0x86, 0x26, 0x00, 0x86,
+ 0x26, 0x00, 0x86, 0x26, 0x00, 0x86, 0x26, 0x00,
+ 0x86, 0x26, 0x00, 0x86, 0x26, 0x00, 0x86, 0x26,
+ 0x00, 0x9f, 0x1d, 0xd2, 0x19, 0x2c, 0x99, 0x2f,
+ 0x00, 0xd8, 0x2f, 0x0b, 0xe0, 0x75, 0x2f, 0x19,
+ 0x8b, 0x19, 0x03, 0x84, 0x19, 0x80, 0x2f, 0x80,
+ 0x19, 0x80, 0x2f, 0x98, 0x19, 0x88, 0x2f, 0x83,
+ 0x37, 0x81, 0x30, 0x87, 0x19, 0x83, 0x2f, 0x83,
+ 0x19, 0x00, 0xd5, 0x35, 0x01, 0x81, 0x37, 0x81,
+ 0x19, 0x82, 0x35, 0x80, 0x19, 0xd9, 0x3d, 0x81,
+ 0x19, 0x82, 0x3d, 0x04, 0xaa, 0x0d, 0x00, 0xdd,
+ 0x30, 0x00, 0x8f, 0x19, 0x9f, 0x0d, 0xa3, 0x19,
+ 0x0b, 0x8f, 0x3d, 0x9e, 0x30, 0x00, 0xbf, 0x19,
+ 0x9e, 0x30, 0xd0, 0x19, 0xae, 0x3d, 0x80, 0x19,
+ 0xd7, 0x3d, 0xe0, 0x47, 0x19, 0xf0, 0x09, 0x5f,
+ 0x2f, 0xbf, 0x19, 0xf0, 0x41, 0x9c, 0x2f, 0x02,
+ 0xe4, 0x2c, 0x9b, 0x02, 0xb6, 0x9b, 0x08, 0xaf,
+ 0x4a, 0xe0, 0xcb, 0x97, 0x13, 0xdf, 0x1d, 0xd7,
+ 0x08, 0x07, 0xa1, 0x19, 0xe0, 0x05, 0x45, 0x82,
+ 0x19, 0xb4, 0x45, 0x01, 0x88, 0x45, 0x29, 0x8a,
+ 0x45, 0xac, 0x86, 0x02, 0x89, 0x19, 0x05, 0xb7,
+ 0x76, 0x07, 0xc5, 0x7c, 0x07, 0x8b, 0x7c, 0x05,
+ 0x9f, 0x1f, 0xad, 0x3e, 0x80, 0x19, 0x80, 0x3e,
+ 0xa3, 0x79, 0x0a, 0x80, 0x79, 0x9c, 0x30, 0x02,
+ 0xcd, 0x3a, 0x00, 0x80, 0x19, 0x89, 0x3a, 0x03,
+ 0x81, 0x3a, 0x9e, 0x5e, 0x00, 0xb6, 0x16, 0x08,
+ 0x8d, 0x16, 0x01, 0x89, 0x16, 0x01, 0x83, 0x16,
+ 0x9f, 0x5e, 0xc2, 0x8c, 0x17, 0x84, 0x8c, 0x96,
+ 0x55, 0x09, 0x85, 0x26, 0x01, 0x85, 0x26, 0x01,
+ 0x85, 0x26, 0x08, 0x86, 0x26, 0x00, 0x86, 0x26,
+ 0x00, 0xaa, 0x45, 0x80, 0x19, 0x88, 0x45, 0x80,
+ 0x2b, 0x83, 0x45, 0x81, 0x19, 0x03, 0xcf, 0x17,
+ 0xad, 0x55, 0x01, 0x89, 0x55, 0x05, 0xf0, 0x1b,
+ 0x43, 0x30, 0x0b, 0x96, 0x30, 0x03, 0xb0, 0x30,
+ 0x70, 0x10, 0xa3, 0xe1, 0x0d, 0x2f, 0x01, 0xe0,
+ 0x09, 0x2f, 0x25, 0x86, 0x45, 0x0b, 0x84, 0x05,
+ 0x04, 0x99, 0x34, 0x00, 0x84, 0x34, 0x00, 0x80,
+ 0x34, 0x00, 0x81, 0x34, 0x00, 0x81, 0x34, 0x00,
+ 0x89, 0x34, 0xe0, 0x11, 0x04, 0x10, 0xe1, 0x0a,
+ 0x04, 0x81, 0x19, 0x0f, 0xbf, 0x04, 0x01, 0xb5,
+ 0x04, 0x27, 0x8d, 0x04, 0x01, 0x8f, 0x37, 0x89,
+ 0x19, 0x05, 0x8d, 0x37, 0x81, 0x1d, 0xa2, 0x19,
+ 0x00, 0x92, 0x19, 0x00, 0x83, 0x19, 0x03, 0x84,
+ 0x04, 0x00, 0xe0, 0x26, 0x04, 0x01, 0x80, 0x19,
+ 0x00, 0x9f, 0x19, 0x99, 0x45, 0x85, 0x19, 0x99,
+ 0x45, 0x8a, 0x19, 0x89, 0x3d, 0x80, 0x19, 0xac,
+ 0x3d, 0x81, 0x19, 0x9e, 0x30, 0x02, 0x85, 0x30,
+ 0x01, 0x85, 0x30, 0x01, 0x85, 0x30, 0x01, 0x82,
+ 0x30, 0x02, 0x86, 0x19, 0x00, 0x86, 0x19, 0x09,
+ 0x84, 0x19, 0x01, 0x8b, 0x49, 0x00, 0x99, 0x49,
+ 0x00, 0x92, 0x49, 0x00, 0x81, 0x49, 0x00, 0x8e,
+ 0x49, 0x01, 0x8d, 0x49, 0x21, 0xe0, 0x1a, 0x49,
+ 0x04, 0x82, 0x19, 0x03, 0xac, 0x19, 0x02, 0x88,
+ 0x19, 0xce, 0x2b, 0x00, 0x8c, 0x19, 0x02, 0x80,
+ 0x2b, 0x2e, 0xac, 0x19, 0x80, 0x37, 0x60, 0x21,
+ 0x9c, 0x4b, 0x02, 0xb0, 0x13, 0x0e, 0x80, 0x37,
+ 0x9a, 0x19, 0x03, 0xa3, 0x69, 0x08, 0x82, 0x69,
+ 0x9a, 0x29, 0x04, 0xaa, 0x6b, 0x04, 0x9d, 0x96,
+ 0x00, 0x80, 0x96, 0xa3, 0x6c, 0x03, 0x8d, 0x6c,
+ 0x29, 0xcf, 0x1e, 0xaf, 0x7e, 0x9d, 0x72, 0x01,
+ 0x89, 0x72, 0x05, 0xa3, 0x71, 0x03, 0xa3, 0x71,
+ 0x03, 0xa7, 0x24, 0x07, 0xb3, 0x14, 0x0a, 0x80,
+ 0x14, 0x60, 0x2f, 0xe0, 0xd6, 0x48, 0x08, 0x95,
+ 0x48, 0x09, 0x87, 0x48, 0x60, 0x37, 0x85, 0x1c,
+ 0x01, 0x80, 0x1c, 0x00, 0xab, 0x1c, 0x00, 0x81,
+ 0x1c, 0x02, 0x80, 0x1c, 0x01, 0x80, 0x1c, 0x95,
+ 0x36, 0x00, 0x88, 0x36, 0x9f, 0x74, 0x9e, 0x5f,
+ 0x07, 0x88, 0x5f, 0x2f, 0x92, 0x33, 0x00, 0x81,
+ 0x33, 0x04, 0x84, 0x33, 0x9b, 0x77, 0x02, 0x80,
+ 0x77, 0x99, 0x4c, 0x04, 0x80, 0x4c, 0x3f, 0x9f,
+ 0x58, 0x97, 0x57, 0x03, 0x93, 0x57, 0x01, 0xad,
+ 0x57, 0x83, 0x3f, 0x00, 0x81, 0x3f, 0x04, 0x87,
+ 0x3f, 0x00, 0x82, 0x3f, 0x00, 0x9c, 0x3f, 0x01,
+ 0x82, 0x3f, 0x03, 0x89, 0x3f, 0x06, 0x88, 0x3f,
+ 0x06, 0x9f, 0x6e, 0x9f, 0x6a, 0x1f, 0xa6, 0x51,
+ 0x03, 0x8b, 0x51, 0x08, 0xb5, 0x06, 0x02, 0x86,
+ 0x06, 0x95, 0x39, 0x01, 0x87, 0x39, 0x92, 0x38,
+ 0x04, 0x87, 0x38, 0x91, 0x78, 0x06, 0x83, 0x78,
+ 0x0b, 0x86, 0x78, 0x4f, 0xc8, 0x6f, 0x36, 0xb2,
+ 0x68, 0x0c, 0xb2, 0x68, 0x06, 0x85, 0x68, 0xa7,
+ 0x31, 0x07, 0x89, 0x31, 0x60, 0xc5, 0x9e, 0x04,
+ 0x00, 0xa9, 0x9a, 0x00, 0x82, 0x9a, 0x01, 0x81,
+ 0x9a, 0x4d, 0xa7, 0x6d, 0x07, 0xa9, 0x82, 0x55,
+ 0x9b, 0x18, 0x13, 0x96, 0x25, 0x08, 0xcd, 0x0e,
+ 0x03, 0x9d, 0x0e, 0x0e, 0x80, 0x0e, 0xc1, 0x3b,
+ 0x0a, 0x80, 0x3b, 0x01, 0x98, 0x83, 0x06, 0x89,
+ 0x83, 0x05, 0xb4, 0x15, 0x00, 0x91, 0x15, 0x07,
+ 0xa6, 0x4e, 0x08, 0xdf, 0x7d, 0x00, 0x93, 0x81,
+ 0x0a, 0x91, 0x41, 0x00, 0xab, 0x41, 0x40, 0x86,
+ 0x5d, 0x00, 0x80, 0x5d, 0x00, 0x83, 0x5d, 0x00,
+ 0x8e, 0x5d, 0x00, 0x8a, 0x5d, 0x05, 0xba, 0x43,
+ 0x04, 0x89, 0x43, 0x05, 0x83, 0x2a, 0x00, 0x87,
+ 0x2a, 0x01, 0x81, 0x2a, 0x01, 0x95, 0x2a, 0x00,
+ 0x86, 0x2a, 0x00, 0x81, 0x2a, 0x00, 0x84, 0x2a,
+ 0x00, 0x80, 0x37, 0x88, 0x2a, 0x01, 0x81, 0x2a,
+ 0x01, 0x82, 0x2a, 0x01, 0x80, 0x2a, 0x05, 0x80,
+ 0x2a, 0x04, 0x86, 0x2a, 0x01, 0x86, 0x2a, 0x02,
+ 0x84, 0x2a, 0x60, 0x2a, 0xdb, 0x62, 0x00, 0x84,
+ 0x62, 0x1d, 0xc7, 0x95, 0x07, 0x89, 0x95, 0x60,
+ 0x45, 0xb5, 0x7f, 0x01, 0xa5, 0x7f, 0x21, 0xc4,
+ 0x5a, 0x0a, 0x89, 0x5a, 0x05, 0x8c, 0x5b, 0x12,
+ 0xb8, 0x8d, 0x06, 0x89, 0x8d, 0x35, 0x9a, 0x02,
+ 0x01, 0x8e, 0x02, 0x03, 0x8f, 0x02, 0x60, 0x5f,
+ 0xbb, 0x21, 0x60, 0x03, 0xd2, 0x99, 0x0b, 0x80,
+ 0x99, 0x86, 0x20, 0x01, 0x80, 0x20, 0x01, 0x87,
+ 0x20, 0x00, 0x81, 0x20, 0x00, 0x9d, 0x20, 0x00,
+ 0x81, 0x20, 0x01, 0x8b, 0x20, 0x08, 0x89, 0x20,
+ 0x45, 0x87, 0x60, 0x01, 0xad, 0x60, 0x01, 0x8a,
+ 0x60, 0x1a, 0xc7, 0x9c, 0x07, 0xd2, 0x84, 0x1c,
+ 0xb8, 0x75, 0x60, 0xa6, 0x88, 0x0c, 0x00, 0xac,
+ 0x0c, 0x00, 0x8d, 0x0c, 0x09, 0x9c, 0x0c, 0x02,
+ 0x9f, 0x52, 0x01, 0x95, 0x52, 0x00, 0x8d, 0x52,
+ 0x48, 0x86, 0x53, 0x00, 0x81, 0x53, 0x00, 0xab,
+ 0x53, 0x02, 0x80, 0x53, 0x00, 0x81, 0x53, 0x00,
+ 0x88, 0x53, 0x07, 0x89, 0x53, 0x05, 0x85, 0x2d,
+ 0x00, 0x81, 0x2d, 0x00, 0xa4, 0x2d, 0x00, 0x81,
+ 0x2d, 0x00, 0x85, 0x2d, 0x06, 0x89, 0x2d, 0x60,
+ 0xd5, 0x98, 0x4d, 0x60, 0x56, 0x80, 0x4a, 0x0e,
+ 0xb1, 0x8e, 0x0c, 0x80, 0x8e, 0xe3, 0x39, 0x1b,
+ 0x60, 0x05, 0xe0, 0x0e, 0x1b, 0x00, 0x84, 0x1b,
+ 0x0a, 0xe0, 0x63, 0x1b, 0x6a, 0x5b, 0xe3, 0xce,
+ 0x23, 0x00, 0x88, 0x23, 0x6f, 0x66, 0xe1, 0xe6,
+ 0x03, 0x70, 0x11, 0x58, 0xe1, 0xd8, 0x08, 0x06,
+ 0x9e, 0x5c, 0x00, 0x89, 0x5c, 0x03, 0x81, 0x5c,
+ 0x5f, 0x9d, 0x09, 0x01, 0x85, 0x09, 0x09, 0xc5,
+ 0x73, 0x09, 0x89, 0x73, 0x00, 0x86, 0x73, 0x00,
+ 0x94, 0x73, 0x04, 0x92, 0x73, 0x62, 0x4f, 0xda,
+ 0x54, 0x60, 0x04, 0xca, 0x59, 0x03, 0xb8, 0x59,
+ 0x06, 0x90, 0x59, 0x3f, 0x80, 0x8f, 0x80, 0x64,
+ 0x81, 0x19, 0x80, 0x42, 0x0a, 0x81, 0x2f, 0x0d,
+ 0xf0, 0x07, 0x97, 0x8f, 0x07, 0xe2, 0x9f, 0x8f,
+ 0xe1, 0x75, 0x42, 0x29, 0x88, 0x8f, 0x70, 0x12,
+ 0x96, 0x80, 0x3d, 0xe0, 0xbd, 0x35, 0x30, 0x82,
+ 0x35, 0x10, 0x83, 0x3d, 0x07, 0xe1, 0x2b, 0x64,
+ 0x68, 0xa3, 0xe0, 0x0a, 0x22, 0x04, 0x8c, 0x22,
+ 0x02, 0x88, 0x22, 0x06, 0x89, 0x22, 0x01, 0x83,
+ 0x22, 0x83, 0x19, 0x70, 0x02, 0xfb, 0xe0, 0x95,
+ 0x19, 0x09, 0xa6, 0x19, 0x01, 0xbd, 0x19, 0x82,
+ 0x37, 0x90, 0x19, 0x87, 0x37, 0x81, 0x19, 0x86,
+ 0x37, 0x9d, 0x19, 0x83, 0x37, 0xba, 0x19, 0x16,
+ 0xc5, 0x2b, 0x60, 0x39, 0x93, 0x19, 0x0b, 0xd6,
+ 0x19, 0x08, 0x98, 0x19, 0x60, 0x26, 0xd4, 0x19,
+ 0x00, 0xc6, 0x19, 0x00, 0x81, 0x19, 0x01, 0x80,
+ 0x19, 0x01, 0x81, 0x19, 0x01, 0x83, 0x19, 0x00,
+ 0x8b, 0x19, 0x00, 0x80, 0x19, 0x00, 0x86, 0x19,
+ 0x00, 0xc0, 0x19, 0x00, 0x83, 0x19, 0x01, 0x87,
+ 0x19, 0x00, 0x86, 0x19, 0x00, 0x9b, 0x19, 0x00,
+ 0x83, 0x19, 0x00, 0x84, 0x19, 0x00, 0x80, 0x19,
+ 0x02, 0x86, 0x19, 0x00, 0xe0, 0xf3, 0x19, 0x01,
+ 0xe0, 0xc3, 0x19, 0x01, 0xb1, 0x19, 0xe2, 0x2b,
+ 0x80, 0x0e, 0x84, 0x80, 0x00, 0x8e, 0x80, 0x64,
+ 0xef, 0x86, 0x28, 0x00, 0x90, 0x28, 0x01, 0x86,
+ 0x28, 0x00, 0x81, 0x28, 0x00, 0x84, 0x28, 0x60,
+ 0x74, 0xac, 0x65, 0x02, 0x8d, 0x65, 0x01, 0x89,
+ 0x65, 0x03, 0x81, 0x65, 0x61, 0x0f, 0xb9, 0x98,
+ 0x04, 0x80, 0x98, 0x64, 0x9f, 0xe0, 0x64, 0x56,
+ 0x01, 0x8f, 0x56, 0x28, 0xcb, 0x01, 0x03, 0x89,
+ 0x01, 0x03, 0x81, 0x01, 0x62, 0xb0, 0xc3, 0x19,
+ 0x4b, 0xbc, 0x19, 0x60, 0x61, 0x83, 0x04, 0x00,
+ 0x9a, 0x04, 0x00, 0x81, 0x04, 0x00, 0x80, 0x04,
+ 0x01, 0x80, 0x04, 0x00, 0x89, 0x04, 0x00, 0x83,
+ 0x04, 0x00, 0x80, 0x04, 0x00, 0x80, 0x04, 0x05,
+ 0x80, 0x04, 0x03, 0x80, 0x04, 0x00, 0x80, 0x04,
+ 0x00, 0x80, 0x04, 0x00, 0x82, 0x04, 0x00, 0x81,
+ 0x04, 0x00, 0x80, 0x04, 0x01, 0x80, 0x04, 0x00,
+ 0x80, 0x04, 0x00, 0x80, 0x04, 0x00, 0x80, 0x04,
+ 0x00, 0x80, 0x04, 0x00, 0x81, 0x04, 0x00, 0x80,
+ 0x04, 0x01, 0x83, 0x04, 0x00, 0x86, 0x04, 0x00,
+ 0x83, 0x04, 0x00, 0x83, 0x04, 0x00, 0x80, 0x04,
+ 0x00, 0x89, 0x04, 0x00, 0x90, 0x04, 0x04, 0x82,
+ 0x04, 0x00, 0x84, 0x04, 0x00, 0x90, 0x04, 0x33,
+ 0x81, 0x04, 0x60, 0xad, 0xab, 0x19, 0x03, 0xe0,
+ 0x03, 0x19, 0x0b, 0x8e, 0x19, 0x01, 0x8e, 0x19,
+ 0x00, 0x8e, 0x19, 0x00, 0xa4, 0x19, 0x09, 0xe0,
+ 0x4d, 0x19, 0x37, 0x99, 0x19, 0x80, 0x35, 0x81,
+ 0x19, 0x0c, 0xab, 0x19, 0x03, 0x88, 0x19, 0x06,
+ 0x81, 0x19, 0x0d, 0x85, 0x19, 0x60, 0x39, 0xe3,
+ 0x77, 0x19, 0x07, 0x8c, 0x19, 0x02, 0x8c, 0x19,
+ 0x02, 0xe0, 0x13, 0x19, 0x0b, 0xd8, 0x19, 0x06,
+ 0x8b, 0x19, 0x13, 0x8b, 0x19, 0x03, 0xb7, 0x19,
+ 0x07, 0x89, 0x19, 0x05, 0xa7, 0x19, 0x07, 0x9d,
+ 0x19, 0x01, 0x81, 0x19, 0x4d, 0xe0, 0x18, 0x19,
+ 0x00, 0xd1, 0x19, 0x00, 0xe0, 0x26, 0x19, 0x0b,
+ 0x8d, 0x19, 0x01, 0x84, 0x19, 0x02, 0x82, 0x19,
+ 0x04, 0x86, 0x19, 0x08, 0x98, 0x19, 0x06, 0x86,
+ 0x19, 0x08, 0x82, 0x19, 0x0c, 0x86, 0x19, 0x28,
+ 0xe0, 0x32, 0x19, 0x00, 0xb6, 0x19, 0x24, 0x89,
+ 0x19, 0x63, 0xa5, 0xf0, 0x96, 0x7d, 0x2f, 0x21,
+ 0xef, 0xd4, 0x2f, 0x0a, 0xe0, 0x7d, 0x2f, 0x01,
+ 0xf0, 0x06, 0x21, 0x2f, 0x0d, 0xf0, 0x0c, 0xd0,
+ 0x2f, 0x6b, 0xbe, 0xe1, 0xbd, 0x2f, 0x65, 0x81,
+ 0xf0, 0x02, 0xea, 0x2f, 0x7a, 0xdc, 0x55, 0x80,
+ 0x19, 0x1d, 0xdf, 0x19, 0x60, 0x1f, 0xe0, 0x8f,
+ 0x37,
+};
+
+static const uint8_t unicode_script_ext_table[799] = {
+ 0x82, 0xc1, 0x00, 0x00, 0x01, 0x2b, 0x01, 0x00,
+ 0x00, 0x01, 0x2b, 0x1c, 0x00, 0x0c, 0x01, 0x45,
+ 0x80, 0x92, 0x00, 0x00, 0x02, 0x1d, 0x6b, 0x00,
+ 0x02, 0x1d, 0x28, 0x01, 0x02, 0x1d, 0x45, 0x00,
+ 0x02, 0x1d, 0x28, 0x81, 0x03, 0x00, 0x00, 0x05,
+ 0x04, 0x31, 0x87, 0x91, 0x9a, 0x0d, 0x00, 0x00,
+ 0x05, 0x04, 0x31, 0x87, 0x91, 0x9a, 0x00, 0x03,
+ 0x04, 0x87, 0x91, 0x01, 0x00, 0x00, 0x05, 0x04,
+ 0x31, 0x87, 0x91, 0x9a, 0x1f, 0x00, 0x00, 0x08,
+ 0x01, 0x04, 0x50, 0x51, 0x78, 0x31, 0x82, 0x87,
+ 0x09, 0x00, 0x0a, 0x02, 0x04, 0x87, 0x09, 0x00,
+ 0x09, 0x03, 0x04, 0x91, 0x9a, 0x05, 0x00, 0x00,
+ 0x02, 0x04, 0x87, 0x62, 0x00, 0x00, 0x02, 0x04,
+ 0x31, 0x81, 0xfb, 0x00, 0x00, 0x0d, 0x0b, 0x1f,
+ 0x2a, 0x2c, 0x2e, 0x3c, 0x45, 0x4f, 0x70, 0x7d,
+ 0x8e, 0x90, 0x95, 0x00, 0x0c, 0x0b, 0x1f, 0x2a,
+ 0x2c, 0x2e, 0x3c, 0x45, 0x4f, 0x70, 0x8e, 0x90,
+ 0x95, 0x10, 0x00, 0x00, 0x14, 0x0b, 0x1f, 0x21,
+ 0x2d, 0x53, 0x2a, 0x2c, 0x2e, 0x3c, 0x4e, 0x4f,
+ 0x60, 0x70, 0x43, 0x81, 0x86, 0x8d, 0x8e, 0x90,
+ 0x95, 0x00, 0x15, 0x0b, 0x1f, 0x21, 0x2d, 0x53,
+ 0x2a, 0x2c, 0x2e, 0x3c, 0x47, 0x4e, 0x4f, 0x60,
+ 0x70, 0x43, 0x81, 0x86, 0x8d, 0x8e, 0x90, 0x95,
+ 0x09, 0x04, 0x1f, 0x21, 0x3b, 0x4e, 0x75, 0x00,
+ 0x09, 0x03, 0x0b, 0x15, 0x86, 0x75, 0x00, 0x09,
+ 0x02, 0x2e, 0x5d, 0x75, 0x00, 0x09, 0x02, 0x2c,
+ 0x41, 0x80, 0x75, 0x00, 0x0d, 0x02, 0x2a, 0x8e,
+ 0x80, 0x71, 0x00, 0x09, 0x02, 0x3c, 0x60, 0x82,
+ 0xcf, 0x00, 0x09, 0x03, 0x15, 0x5e, 0x8a, 0x80,
+ 0x30, 0x00, 0x00, 0x02, 0x27, 0x45, 0x85, 0xb8,
+ 0x00, 0x01, 0x04, 0x11, 0x32, 0x89, 0x88, 0x80,
+ 0x4a, 0x00, 0x01, 0x02, 0x5b, 0x76, 0x00, 0x00,
+ 0x00, 0x02, 0x5b, 0x76, 0x84, 0x49, 0x00, 0x00,
+ 0x04, 0x0b, 0x1f, 0x2a, 0x3c, 0x00, 0x01, 0x1f,
+ 0x00, 0x04, 0x0b, 0x1f, 0x2a, 0x3c, 0x00, 0x02,
+ 0x1f, 0x2a, 0x00, 0x01, 0x1f, 0x01, 0x02, 0x0b,
+ 0x1f, 0x00, 0x02, 0x1f, 0x7d, 0x00, 0x02, 0x0b,
+ 0x1f, 0x00, 0x02, 0x1f, 0x7d, 0x00, 0x06, 0x1f,
+ 0x3c, 0x4f, 0x70, 0x8e, 0x90, 0x00, 0x01, 0x1f,
+ 0x01, 0x02, 0x1f, 0x7d, 0x01, 0x01, 0x1f, 0x00,
+ 0x02, 0x1f, 0x7d, 0x00, 0x02, 0x0b, 0x1f, 0x06,
+ 0x01, 0x1f, 0x00, 0x02, 0x1f, 0x60, 0x00, 0x02,
+ 0x0b, 0x1f, 0x01, 0x01, 0x1f, 0x00, 0x02, 0x0b,
+ 0x1f, 0x03, 0x01, 0x1f, 0x00, 0x08, 0x0b, 0x1f,
+ 0x2a, 0x3c, 0x60, 0x70, 0x90, 0x95, 0x00, 0x02,
+ 0x1f, 0x2a, 0x00, 0x03, 0x1f, 0x2a, 0x3c, 0x01,
+ 0x02, 0x0b, 0x1f, 0x00, 0x01, 0x0b, 0x01, 0x02,
+ 0x1f, 0x2a, 0x00, 0x01, 0x60, 0x80, 0x44, 0x00,
+ 0x01, 0x01, 0x2b, 0x35, 0x00, 0x00, 0x02, 0x1d,
+ 0x87, 0x81, 0xb5, 0x00, 0x00, 0x02, 0x45, 0x5b,
+ 0x80, 0x3f, 0x00, 0x00, 0x03, 0x1f, 0x2a, 0x45,
+ 0x8c, 0xd1, 0x00, 0x00, 0x02, 0x1d, 0x28, 0x81,
+ 0x3c, 0x00, 0x01, 0x06, 0x0d, 0x30, 0x2f, 0x35,
+ 0x3d, 0x9b, 0x00, 0x05, 0x0d, 0x30, 0x2f, 0x35,
+ 0x3d, 0x01, 0x00, 0x00, 0x01, 0x2f, 0x00, 0x00,
+ 0x09, 0x06, 0x0d, 0x30, 0x2f, 0x35, 0x3d, 0x9b,
+ 0x00, 0x00, 0x00, 0x05, 0x0d, 0x30, 0x2f, 0x35,
+ 0x3d, 0x07, 0x06, 0x0d, 0x30, 0x2f, 0x35, 0x3d,
+ 0x9b, 0x03, 0x05, 0x0d, 0x30, 0x2f, 0x35, 0x3d,
+ 0x09, 0x00, 0x03, 0x02, 0x0d, 0x2f, 0x01, 0x00,
+ 0x00, 0x05, 0x0d, 0x30, 0x2f, 0x35, 0x3d, 0x04,
+ 0x02, 0x35, 0x3d, 0x00, 0x00, 0x00, 0x05, 0x0d,
+ 0x30, 0x2f, 0x35, 0x3d, 0x03, 0x00, 0x01, 0x03,
+ 0x2f, 0x35, 0x3d, 0x01, 0x01, 0x2f, 0x58, 0x00,
+ 0x03, 0x02, 0x35, 0x3d, 0x02, 0x00, 0x00, 0x02,
+ 0x35, 0x3d, 0x59, 0x00, 0x00, 0x06, 0x0d, 0x30,
+ 0x2f, 0x35, 0x3d, 0x9b, 0x00, 0x02, 0x35, 0x3d,
+ 0x80, 0x12, 0x00, 0x0f, 0x01, 0x2f, 0x1f, 0x00,
+ 0x23, 0x01, 0x2f, 0x3b, 0x00, 0x27, 0x01, 0x2f,
+ 0x37, 0x00, 0x30, 0x01, 0x2f, 0x0e, 0x00, 0x0b,
+ 0x01, 0x2f, 0x32, 0x00, 0x00, 0x01, 0x2f, 0x57,
+ 0x00, 0x18, 0x01, 0x2f, 0x09, 0x00, 0x04, 0x01,
+ 0x2f, 0x5f, 0x00, 0x1e, 0x01, 0x2f, 0xc0, 0x31,
+ 0xef, 0x00, 0x00, 0x02, 0x1d, 0x28, 0x80, 0x0f,
+ 0x00, 0x07, 0x02, 0x2f, 0x45, 0x80, 0xa7, 0x00,
+ 0x02, 0x0e, 0x1f, 0x21, 0x2c, 0x2e, 0x41, 0x3c,
+ 0x3b, 0x4e, 0x4f, 0x5a, 0x60, 0x43, 0x8d, 0x95,
+ 0x02, 0x0d, 0x1f, 0x21, 0x2c, 0x2e, 0x41, 0x3c,
+ 0x3b, 0x4e, 0x5a, 0x60, 0x43, 0x8d, 0x95, 0x03,
+ 0x0b, 0x1f, 0x21, 0x2c, 0x2e, 0x41, 0x3b, 0x4e,
+ 0x5a, 0x43, 0x8d, 0x95, 0x80, 0x36, 0x00, 0x00,
+ 0x02, 0x0b, 0x1f, 0x00, 0x00, 0x00, 0x02, 0x1f,
+ 0x8e, 0x39, 0x00, 0x00, 0x03, 0x3e, 0x45, 0x5e,
+ 0x80, 0x1f, 0x00, 0x00, 0x02, 0x10, 0x3a, 0xc0,
+ 0x13, 0xa1, 0x00, 0x00, 0x02, 0x04, 0x91, 0x09,
+ 0x00, 0x00, 0x02, 0x04, 0x91, 0x46, 0x00, 0x01,
+ 0x05, 0x0d, 0x30, 0x2f, 0x35, 0x3d, 0x80, 0x99,
+ 0x00, 0x04, 0x06, 0x0d, 0x30, 0x2f, 0x35, 0x3d,
+ 0x9b, 0x09, 0x00, 0x00, 0x02, 0x35, 0x3d, 0x2c,
+ 0x00, 0x01, 0x02, 0x35, 0x3d, 0x80, 0xdf, 0x00,
+ 0x02, 0x02, 0x1c, 0x49, 0x03, 0x00, 0x2c, 0x03,
+ 0x1c, 0x48, 0x49, 0x02, 0x00, 0x08, 0x02, 0x1c,
+ 0x49, 0x81, 0x1f, 0x00, 0x1b, 0x02, 0x04, 0x1a,
+ 0x8f, 0x84, 0x00, 0x00, 0x02, 0x2a, 0x8e, 0x00,
+ 0x00, 0x00, 0x02, 0x2a, 0x8e, 0x36, 0x00, 0x01,
+ 0x02, 0x2a, 0x8e, 0x8c, 0x12, 0x00, 0x01, 0x02,
+ 0x2a, 0x8e, 0x00, 0x00, 0x00, 0x02, 0x2a, 0x8e,
+ 0xc0, 0x5c, 0x4b, 0x00, 0x03, 0x01, 0x22, 0x96,
+ 0x3b, 0x00, 0x11, 0x01, 0x2f, 0x9e, 0x5d, 0x00,
+ 0x01, 0x01, 0x2f, 0xce, 0xcd, 0x2d, 0x00,
 };
 
 static const uint8_t unicode_prop_Hyphen_table[28] = {
@@ -3501,7 +3544,7 @@
 0x80, 0x89, 0x80, 0x90, 0x22, 0x04, 0x80, 0x90,
 };
 
-static const uint8_t unicode_prop_Other_Alphabetic_table[396] = {
+static const uint8_t unicode_prop_Other_Alphabetic_table[411] = {
 0x43, 0x44, 0x80, 0x42, 0x69, 0x8d, 0x00, 0x01,
 0x01, 0x00, 0xc7, 0x8a, 0xaf, 0x8c, 0x06, 0x8f,
 0x80, 0xe4, 0x33, 0x19, 0x0b, 0x80, 0xa2, 0x80,
@@ -3517,7 +3560,7 @@
 0x30, 0x10, 0x17, 0x81, 0x8a, 0x81, 0x9c, 0x82,
 0xb9, 0x30, 0x10, 0x17, 0x81, 0x8a, 0x81, 0x9b,
 0x83, 0xb9, 0x30, 0x10, 0x82, 0x89, 0x80, 0x89,
- 0x81, 0x9d, 0x81, 0xca, 0x28, 0x00, 0x87, 0x91,
+ 0x81, 0x9c, 0x82, 0xca, 0x28, 0x00, 0x87, 0x91,
 0x81, 0xbc, 0x01, 0x86, 0x91, 0x80, 0xe2, 0x01,
 0x28, 0x81, 0x8f, 0x80, 0x40, 0xa2, 0x90, 0x8a,
 0x8a, 0x80, 0xa3, 0xed, 0x8b, 0x00, 0x0b, 0x96,
@@ -3525,33 +3568,35 @@
 0x89, 0x83, 0x46, 0x73, 0x81, 0x9d, 0x81, 0x9d,
 0x81, 0x9d, 0x81, 0xc1, 0x92, 0x40, 0xbb, 0x81,
 0xa1, 0x80, 0xf5, 0x8b, 0x83, 0x88, 0x40, 0xdd,
- 0x84, 0xb8, 0x89, 0x81, 0x93, 0x40, 0x8a, 0x84,
- 0xaf, 0x8e, 0xbb, 0x82, 0x9d, 0x88, 0x09, 0xb8,
- 0x8a, 0xb1, 0x92, 0x41, 0xaf, 0x8d, 0x46, 0xc0,
- 0xb3, 0x48, 0xf5, 0x9f, 0x60, 0x78, 0x73, 0x87,
- 0xa1, 0x81, 0x41, 0x61, 0x07, 0x80, 0x96, 0x84,
- 0xd7, 0x81, 0xb1, 0x8f, 0x00, 0xb8, 0x80, 0xa5,
- 0x84, 0x9b, 0x8b, 0xac, 0x83, 0xaf, 0x8b, 0xa4,
- 0x80, 0xc2, 0x8d, 0x8b, 0x07, 0x81, 0xac, 0x82,
- 0xb1, 0x00, 0x11, 0x0c, 0x80, 0xab, 0x24, 0x80,
- 0x40, 0xec, 0x87, 0x60, 0x4f, 0x32, 0x80, 0x48,
- 0x56, 0x84, 0x46, 0x85, 0x10, 0x0c, 0x83, 0x43,
- 0x13, 0x83, 0x42, 0xd7, 0x82, 0xb4, 0x8d, 0xbb,
- 0x80, 0xac, 0x88, 0xc6, 0x82, 0xa3, 0x8b, 0x91,
- 0x81, 0xb8, 0x82, 0xaf, 0x8c, 0xeb, 0x88, 0x08,
- 0x28, 0x40, 0x9f, 0x89, 0x96, 0x83, 0xb9, 0x31,
- 0x09, 0x81, 0x89, 0x80, 0x89, 0x81, 0x40, 0xd0,
- 0x8c, 0x02, 0xe9, 0x91, 0x40, 0xec, 0x31, 0x86,
- 0x9c, 0x81, 0xd1, 0x8e, 0x00, 0xe9, 0x8a, 0xe6,
- 0x8d, 0x41, 0x00, 0x8c, 0x41, 0x97, 0x31, 0x2b,
- 0x80, 0x9b, 0x89, 0xa9, 0x20, 0x83, 0x91, 0x8a,
- 0xad, 0x8d, 0x41, 0x96, 0x38, 0x86, 0xd2, 0x95,
- 0x80, 0x8d, 0xf9, 0x2a, 0x00, 0x08, 0x10, 0x02,
- 0x80, 0xc1, 0x20, 0x08, 0x83, 0x41, 0x5b, 0x83,
- 0x60, 0x50, 0x57, 0x00, 0xb6, 0x33, 0x60, 0x4d,
- 0x0a, 0x80, 0x60, 0x23, 0x60, 0x30, 0x90, 0x0e,
- 0x01, 0x04, 0x49, 0x1b, 0x80, 0x47, 0xe7, 0x99,
- 0x85, 0x99, 0x85, 0x99,
+ 0x84, 0xb8, 0x89, 0x81, 0x93, 0xc9, 0x81, 0xbe,
+ 0x84, 0xaf, 0x8e, 0xbb, 0x82, 0x9d, 0x88, 0x09,
+ 0xb8, 0x8a, 0xb1, 0x92, 0x41, 0xaf, 0x8d, 0x46,
+ 0xc0, 0xb3, 0x48, 0xf5, 0x9f, 0x60, 0x78, 0x73,
+ 0x87, 0xa1, 0x81, 0x41, 0x61, 0x07, 0x80, 0x96,
+ 0x84, 0xd7, 0x81, 0xb1, 0x8f, 0x00, 0xb8, 0x80,
+ 0xa5, 0x84, 0x9b, 0x8b, 0xac, 0x83, 0xaf, 0x8b,
+ 0xa4, 0x80, 0xc2, 0x8d, 0x8b, 0x07, 0x81, 0xac,
+ 0x82, 0xb1, 0x00, 0x11, 0x0c, 0x80, 0xab, 0x24,
+ 0x80, 0x40, 0xec, 0x87, 0x60, 0x4f, 0x32, 0x80,
+ 0x48, 0x56, 0x84, 0x46, 0x85, 0x10, 0x0c, 0x83,
+ 0x43, 0x13, 0x83, 0x41, 0x82, 0x81, 0x41, 0x52,
+ 0x82, 0xb4, 0x8d, 0xbb, 0x80, 0xac, 0x88, 0xc6,
+ 0x82, 0xa3, 0x8b, 0x91, 0x81, 0xb8, 0x82, 0xaf,
+ 0x8c, 0x8d, 0x81, 0xdb, 0x88, 0x08, 0x28, 0x40,
+ 0x9f, 0x89, 0x96, 0x83, 0xb9, 0x31, 0x09, 0x81,
+ 0x89, 0x80, 0x89, 0x81, 0x40, 0xd0, 0x8c, 0x02,
+ 0xe9, 0x91, 0x40, 0xec, 0x31, 0x86, 0x9c, 0x81,
+ 0xd1, 0x8e, 0x00, 0xe9, 0x8a, 0xe6, 0x8d, 0x41,
+ 0x00, 0x8c, 0x40, 0xf6, 0x28, 0x09, 0x0a, 0x00,
+ 0x80, 0x40, 0x8d, 0x31, 0x2b, 0x80, 0x9b, 0x89,
+ 0xa9, 0x20, 0x83, 0x91, 0x8a, 0xad, 0x8d, 0x41,
+ 0x96, 0x38, 0x86, 0xd2, 0x95, 0x80, 0x8d, 0xf9,
+ 0x2a, 0x00, 0x08, 0x10, 0x02, 0x80, 0xc1, 0x20,
+ 0x08, 0x83, 0x41, 0x5b, 0x83, 0x60, 0x50, 0x57,
+ 0x00, 0xb6, 0x33, 0xdc, 0x81, 0x60, 0x4c, 0xab,
+ 0x80, 0x60, 0x23, 0x60, 0x30, 0x90, 0x0e, 0x01,
+ 0x04, 0x49, 0x1b, 0x80, 0x47, 0xe7, 0x99, 0x85,
+ 0x99, 0x85, 0x99,
 };
 
 static const uint8_t unicode_prop_Other_Lowercase_table[51] = {
@@ -3569,15 +3614,16 @@
 0xcc, 0x5f, 0x99, 0x85, 0x99, 0x85, 0x99,
 };
 
-static const uint8_t unicode_prop_Other_Grapheme_Extend_table[62] = {
+static const uint8_t unicode_prop_Other_Grapheme_Extend_table[65] = {
 0x49, 0xbd, 0x80, 0x97, 0x80, 0x41, 0x65, 0x80,
 0x97, 0x80, 0xe5, 0x80, 0x97, 0x80, 0x40, 0xe9,
 0x80, 0x91, 0x81, 0xe6, 0x80, 0x97, 0x80, 0xf6,
 0x80, 0x8e, 0x80, 0x4d, 0x54, 0x80, 0x44, 0xd5,
 0x80, 0x50, 0x20, 0x81, 0x60, 0xcf, 0x6d, 0x81,
 0x53, 0x9d, 0x80, 0x97, 0x80, 0x41, 0x57, 0x80,
- 0x8b, 0x80, 0x40, 0xf0, 0x80, 0x60, 0xbb, 0xb4,
- 0x07, 0x84, 0x6c, 0x2e, 0xac, 0xdf,
+ 0x8b, 0x80, 0x40, 0xf0, 0x80, 0x43, 0x7f, 0x80,
+ 0x60, 0xb8, 0x33, 0x07, 0x84, 0x6c, 0x2e, 0xac,
+ 0xdf,
 };
 
 static const uint8_t unicode_prop_Other_Default_Ignorable_Code_Point_table[32] = {
@@ -3630,7 +3676,7 @@
 0x84,
 };
 
-static const uint8_t unicode_prop_Changes_When_NFKC_Casefolded1_table[436] = {
+static const uint8_t unicode_prop_Changes_When_NFKC_Casefolded1_table[441] = {
 0x40, 0x9f, 0x06, 0x00, 0x01, 0x00, 0x01, 0x12,
 0x10, 0x82, 0x9f, 0x80, 0xcf, 0x01, 0x80, 0x8b,
 0x07, 0x80, 0xfb, 0x01, 0x01, 0x80, 0xa5, 0x80,
@@ -3663,29 +3709,30 @@
 0x80, 0xde, 0x80, 0xb0, 0xdd, 0x82, 0x8d, 0xdf,
 0x9e, 0x80, 0xa7, 0x87, 0xae, 0x80, 0x41, 0x7f,
 0x60, 0x72, 0x9b, 0x81, 0x40, 0xd1, 0x80, 0x40,
- 0x86, 0x81, 0x43, 0x61, 0x83, 0x60, 0x4d, 0x9f,
- 0x41, 0x0d, 0x08, 0x00, 0x81, 0x89, 0x00, 0x00,
- 0x09, 0x82, 0xc3, 0x81, 0xe9, 0xa5, 0x86, 0x8b,
- 0x24, 0x00, 0x97, 0x04, 0x00, 0x01, 0x01, 0x80,
- 0xeb, 0xa0, 0x41, 0x6a, 0x91, 0xbf, 0x81, 0xb5,
- 0xa7, 0x8c, 0x82, 0x99, 0x95, 0x94, 0x81, 0x8b,
- 0x80, 0x92, 0x03, 0x1a, 0x00, 0x80, 0x40, 0x86,
- 0x08, 0x80, 0x9f, 0x99, 0x40, 0x83, 0x15, 0x0d,
- 0x0d, 0x0a, 0x16, 0x06, 0x80, 0x88, 0x60, 0xbc,
- 0xa6, 0x83, 0x54, 0xb9, 0x86, 0x8d, 0x87, 0xbf,
- 0x85, 0x42, 0x3e, 0xd4, 0x80, 0xc6, 0x01, 0x08,
- 0x09, 0x0b, 0x80, 0x8b, 0x00, 0x06, 0x80, 0xc0,
- 0x03, 0x0f, 0x06, 0x80, 0x9b, 0x03, 0x04, 0x00,
- 0x16, 0x80, 0x41, 0x53, 0x81, 0x41, 0x23, 0x81,
- 0xb1, 0x55, 0xff, 0x18, 0x9a, 0x01, 0x00, 0x08,
- 0x80, 0x89, 0x03, 0x00, 0x00, 0x28, 0x18, 0x00,
- 0x00, 0x02, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00,
- 0x00, 0x01, 0x00, 0x0b, 0x06, 0x03, 0x03, 0x00,
- 0x80, 0x89, 0x80, 0x90, 0x22, 0x04, 0x80, 0x90,
- 0x42, 0x43, 0x8a, 0x84, 0x9e, 0x80, 0x9f, 0x99,
- 0x82, 0xa2, 0x80, 0xee, 0x82, 0x8c, 0xab, 0x83,
- 0x88, 0x31, 0x61, 0x05, 0xad, 0x42, 0x1d, 0x6b,
- 0x05, 0xe1, 0x4f, 0xff,
+ 0x86, 0x81, 0x43, 0x61, 0x83, 0x88, 0x80, 0x60,
+ 0x4d, 0x95, 0x41, 0x0d, 0x08, 0x00, 0x81, 0x89,
+ 0x00, 0x00, 0x09, 0x82, 0xc3, 0x81, 0xe9, 0xa5,
+ 0x86, 0x8b, 0x24, 0x00, 0x97, 0x04, 0x00, 0x01,
+ 0x01, 0x80, 0xeb, 0xa0, 0x41, 0x6a, 0x91, 0xbf,
+ 0x81, 0xb5, 0xa7, 0x8c, 0x82, 0x99, 0x95, 0x94,
+ 0x81, 0x8b, 0x80, 0x92, 0x03, 0x1a, 0x00, 0x80,
+ 0x40, 0x86, 0x08, 0x80, 0x9f, 0x99, 0x40, 0x83,
+ 0x15, 0x0d, 0x0d, 0x0a, 0x16, 0x06, 0x80, 0x88,
+ 0x60, 0xbc, 0xa6, 0x83, 0x54, 0xb9, 0x86, 0x8d,
+ 0x87, 0xbf, 0x85, 0x42, 0x3e, 0xd4, 0x80, 0xc6,
+ 0x01, 0x08, 0x09, 0x0b, 0x80, 0x8b, 0x00, 0x06,
+ 0x80, 0xc0, 0x03, 0x0f, 0x06, 0x80, 0x9b, 0x03,
+ 0x04, 0x00, 0x16, 0x80, 0x41, 0x53, 0x81, 0x41,
+ 0x23, 0x81, 0xb1, 0x55, 0xff, 0x18, 0x9a, 0x01,
+ 0x00, 0x08, 0x80, 0x89, 0x03, 0x00, 0x00, 0x28,
+ 0x18, 0x00, 0x00, 0x02, 0x01, 0x00, 0x08, 0x00,
+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x06, 0x03,
+ 0x03, 0x00, 0x80, 0x89, 0x80, 0x90, 0x22, 0x04,
+ 0x80, 0x90, 0x42, 0x43, 0x8a, 0x84, 0x9e, 0x80,
+ 0x9f, 0x99, 0x82, 0xa2, 0x80, 0xee, 0x82, 0x8c,
+ 0xab, 0x83, 0x88, 0x31, 0x49, 0x9d, 0x89, 0x60,
+ 0xfc, 0x05, 0x42, 0x1d, 0x6b, 0x05, 0xe1, 0x4f,
+ 0xff,
 };
 
 static const uint8_t unicode_prop_ASCII_Hex_Digit_table[5] = {
@@ -3697,14 +3744,14 @@
 0xb6, 0x83,
 };
 
-static const uint8_t unicode_prop_Dash_table[50] = {
+static const uint8_t unicode_prop_Dash_table[53] = {
 0xac, 0x80, 0x45, 0x5b, 0x80, 0xb2, 0x80, 0x4e,
 0x40, 0x80, 0x44, 0x04, 0x80, 0x48, 0x08, 0x85,
 0xbc, 0x80, 0xa6, 0x80, 0x8e, 0x80, 0x41, 0x85,
 0x80, 0x4c, 0x03, 0x01, 0x80, 0x9e, 0x0b, 0x80,
 0x41, 0xda, 0x80, 0x92, 0x80, 0xee, 0x80, 0x60,
 0xcd, 0x8f, 0x81, 0xa4, 0x80, 0x89, 0x80, 0x40,
- 0xa8, 0x80,
+ 0xa8, 0x80, 0x4f, 0x9e, 0x80,
 };
 
 static const uint8_t unicode_prop_Deprecated_table[23] = {
@@ -3713,7 +3760,7 @@
 0x42, 0xb8, 0x81, 0x6d, 0xdc, 0xd5, 0x80,
 };
 
-static const uint8_t unicode_prop_Diacritic_table[350] = {
+static const uint8_t unicode_prop_Diacritic_table[358] = {
 0xdd, 0x00, 0x80, 0xc6, 0x05, 0x03, 0x01, 0x81,
 0x41, 0xf6, 0x40, 0x9e, 0x07, 0x25, 0x90, 0x0b,
 0x80, 0x88, 0x81, 0x40, 0xfc, 0x84, 0x40, 0xd0,
@@ -3723,55 +3770,57 @@
 0x81, 0x40, 0xc8, 0x9b, 0xbc, 0x80, 0x8f, 0x02,
 0x83, 0x9b, 0x80, 0xc9, 0x80, 0x8f, 0x80, 0xed,
 0x80, 0x8f, 0x80, 0xed, 0x80, 0x8f, 0x80, 0xae,
- 0x82, 0xbb, 0x80, 0x8f, 0x80, 0xfe, 0x80, 0xfe,
- 0x80, 0xed, 0x80, 0x8f, 0x80, 0xec, 0x81, 0x8f,
- 0x80, 0xfb, 0x80, 0xfb, 0x28, 0x80, 0xea, 0x80,
- 0x8c, 0x84, 0xca, 0x81, 0x9a, 0x00, 0x00, 0x03,
- 0x81, 0xc1, 0x10, 0x81, 0xbd, 0x80, 0xef, 0x00,
- 0x81, 0xa7, 0x0b, 0x84, 0x98, 0x30, 0x80, 0x89,
- 0x81, 0x42, 0xc0, 0x82, 0x44, 0x68, 0x8a, 0x88,
- 0x80, 0x41, 0x5a, 0x82, 0x41, 0x38, 0x39, 0x80,
- 0xaf, 0x8d, 0xf5, 0x80, 0x8e, 0x80, 0xa5, 0x88,
- 0xb5, 0x81, 0x40, 0x89, 0x81, 0xbf, 0x85, 0xd1,
- 0x98, 0x18, 0x28, 0x0a, 0xb1, 0xbe, 0xd8, 0x8b,
- 0xa4, 0x22, 0x82, 0x41, 0xbc, 0x00, 0x82, 0x8a,
- 0x82, 0x8c, 0x82, 0x8c, 0x82, 0x8c, 0x81, 0x4c,
- 0xef, 0x82, 0x41, 0x3c, 0x80, 0x41, 0xf9, 0x85,
- 0xe8, 0x83, 0xde, 0x80, 0x60, 0x75, 0x71, 0x80,
- 0x8b, 0x08, 0x80, 0x9b, 0x81, 0xd1, 0x81, 0x8d,
- 0xa1, 0xe5, 0x82, 0xec, 0x81, 0x40, 0xc9, 0x80,
- 0x9a, 0x91, 0xb8, 0x83, 0xa3, 0x80, 0xde, 0x80,
- 0x8b, 0x80, 0xa3, 0x80, 0x40, 0x94, 0x82, 0xc0,
- 0x83, 0xb2, 0x80, 0xe3, 0x84, 0x40, 0x8b, 0x81,
- 0x60, 0x4f, 0x2f, 0x80, 0x43, 0x00, 0x8f, 0x41,
- 0x0d, 0x00, 0x80, 0xae, 0x80, 0xac, 0x81, 0xc2,
- 0x80, 0x42, 0xfb, 0x80, 0x48, 0x03, 0x81, 0x42,
- 0x3a, 0x85, 0x42, 0x1d, 0x8a, 0x41, 0x67, 0x81,
- 0xf7, 0x81, 0xbd, 0x80, 0xcb, 0x80, 0x88, 0x82,
- 0xe7, 0x81, 0x40, 0xb1, 0x81, 0xd0, 0x80, 0x8f,
- 0x80, 0x97, 0x32, 0x84, 0x40, 0xcc, 0x02, 0x80,
- 0xfa, 0x81, 0x40, 0xfa, 0x81, 0xfd, 0x80, 0xf5,
- 0x81, 0xf2, 0x80, 0x41, 0x0c, 0x81, 0x41, 0xa4,
- 0x80, 0xd2, 0x80, 0x91, 0x80, 0xd0, 0x80, 0x41,
- 0xa4, 0x80, 0x41, 0x01, 0x00, 0x81, 0xd0, 0x80,
- 0x60, 0x4d, 0x57, 0x84, 0xba, 0x86, 0x44, 0x57,
- 0x90, 0x60, 0x61, 0xc6, 0x12, 0x2f, 0x39, 0x86,
+ 0x82, 0xbb, 0x80, 0x8f, 0x06, 0x80, 0xf6, 0x80,
+ 0xfe, 0x80, 0xed, 0x80, 0x8f, 0x80, 0xec, 0x81,
+ 0x8f, 0x80, 0xfb, 0x80, 0xfb, 0x28, 0x80, 0xea,
+ 0x80, 0x8c, 0x84, 0xca, 0x81, 0x9a, 0x00, 0x00,
+ 0x03, 0x81, 0xc1, 0x10, 0x81, 0xbd, 0x80, 0xef,
+ 0x00, 0x81, 0xa7, 0x0b, 0x84, 0x98, 0x30, 0x80,
+ 0x89, 0x81, 0x42, 0xc0, 0x82, 0x44, 0x68, 0x8a,
+ 0x88, 0x80, 0x41, 0x5a, 0x82, 0x41, 0x38, 0x39,
+ 0x80, 0xaf, 0x8d, 0xf5, 0x80, 0x8e, 0x80, 0xa5,
+ 0x88, 0xb5, 0x81, 0x40, 0x89, 0x81, 0xbf, 0x85,
+ 0xd1, 0x98, 0x18, 0x28, 0x0a, 0xb1, 0xbe, 0xd8,
+ 0x8b, 0xa4, 0x22, 0x82, 0x41, 0xbc, 0x00, 0x82,
+ 0x8a, 0x82, 0x8c, 0x82, 0x8c, 0x82, 0x8c, 0x81,
+ 0x4c, 0xef, 0x82, 0x41, 0x3c, 0x80, 0x41, 0xf9,
+ 0x85, 0xe8, 0x83, 0xde, 0x80, 0x60, 0x75, 0x71,
+ 0x80, 0x8b, 0x08, 0x80, 0x9b, 0x81, 0xd1, 0x81,
+ 0x8d, 0xa1, 0xe5, 0x82, 0xec, 0x81, 0x40, 0xc9,
+ 0x80, 0x9a, 0x91, 0xb8, 0x83, 0xa3, 0x80, 0xde,
+ 0x80, 0x8b, 0x80, 0xa3, 0x80, 0x40, 0x94, 0x82,
+ 0xc0, 0x83, 0xb2, 0x80, 0xe3, 0x84, 0x88, 0x82,
+ 0xff, 0x81, 0x60, 0x4f, 0x2f, 0x80, 0x43, 0x00,
+ 0x8f, 0x41, 0x0d, 0x00, 0x80, 0xae, 0x80, 0xac,
+ 0x81, 0xc2, 0x80, 0x42, 0xfb, 0x80, 0x48, 0x03,
+ 0x81, 0x42, 0x3a, 0x85, 0x42, 0x1d, 0x8a, 0x41,
+ 0x67, 0x81, 0xf7, 0x81, 0xbd, 0x80, 0xcb, 0x80,
+ 0x88, 0x82, 0xe7, 0x81, 0x40, 0xb1, 0x81, 0xd0,
+ 0x80, 0x8f, 0x80, 0x97, 0x32, 0x84, 0x40, 0xcc,
+ 0x02, 0x80, 0xfa, 0x81, 0x40, 0xfa, 0x81, 0xfd,
+ 0x80, 0xf5, 0x81, 0xf2, 0x80, 0x41, 0x0c, 0x81,
+ 0x41, 0x01, 0x0b, 0x80, 0x40, 0x9b, 0x80, 0xd2,
+ 0x80, 0x91, 0x80, 0xd0, 0x80, 0x41, 0xa4, 0x80,
+ 0x41, 0x01, 0x00, 0x81, 0xd0, 0x80, 0x60, 0x4d,
+ 0x57, 0x84, 0xba, 0x86, 0x44, 0x57, 0x90, 0xcf,
+ 0x81, 0x60, 0x61, 0x74, 0x12, 0x2f, 0x39, 0x86,
 0x9d, 0x83, 0x4f, 0x81, 0x86, 0x41, 0xb4, 0x83,
 0x45, 0xdf, 0x86, 0xec, 0x10, 0x82,
 };
 
-static const uint8_t unicode_prop_Extender_table[86] = {
+static const uint8_t unicode_prop_Extender_table[89] = {
 0x40, 0xb6, 0x80, 0x42, 0x17, 0x81, 0x43, 0x6d,
- 0x80, 0x41, 0xb8, 0x80, 0x46, 0x4a, 0x80, 0xfe,
- 0x80, 0x49, 0x42, 0x80, 0xb7, 0x80, 0x42, 0x62,
- 0x80, 0x41, 0x8d, 0x80, 0xc3, 0x80, 0x53, 0x88,
- 0x80, 0xaa, 0x84, 0xe6, 0x81, 0xdc, 0x82, 0x60,
- 0x6f, 0x15, 0x80, 0x45, 0xf5, 0x80, 0x43, 0xc1,
- 0x80, 0x95, 0x80, 0x40, 0x88, 0x80, 0xeb, 0x80,
- 0x94, 0x81, 0x60, 0x54, 0x7a, 0x80, 0x53, 0xeb,
- 0x80, 0x42, 0x67, 0x82, 0x44, 0xce, 0x80, 0x60,
- 0x50, 0xa8, 0x81, 0x44, 0x9b, 0x08, 0x80, 0x60,
- 0x71, 0x57, 0x81, 0x48, 0x05, 0x82,
+ 0x80, 0x41, 0xb8, 0x80, 0x43, 0x59, 0x80, 0x42,
+ 0xef, 0x80, 0xfe, 0x80, 0x49, 0x42, 0x80, 0xb7,
+ 0x80, 0x42, 0x62, 0x80, 0x41, 0x8d, 0x80, 0xc3,
+ 0x80, 0x53, 0x88, 0x80, 0xaa, 0x84, 0xe6, 0x81,
+ 0xdc, 0x82, 0x60, 0x6f, 0x15, 0x80, 0x45, 0xf5,
+ 0x80, 0x43, 0xc1, 0x80, 0x95, 0x80, 0x40, 0x88,
+ 0x80, 0xeb, 0x80, 0x94, 0x81, 0x60, 0x54, 0x7a,
+ 0x80, 0x53, 0xeb, 0x80, 0x42, 0x67, 0x82, 0x44,
+ 0xce, 0x80, 0x60, 0x50, 0xa8, 0x81, 0x44, 0x9b,
+ 0x08, 0x80, 0x60, 0x71, 0x57, 0x81, 0x48, 0x05,
+ 0x82,
 };
 
 static const uint8_t unicode_prop_Hex_Digit_table[12] = {
@@ -3787,15 +3836,16 @@
 0x60, 0x2f, 0xf1, 0x81,
 };
 
-static const uint8_t unicode_prop_Ideographic_table[58] = {
+static const uint8_t unicode_prop_Ideographic_table[66] = {
 0x60, 0x30, 0x05, 0x81, 0x98, 0x88, 0x8d, 0x82,
- 0x43, 0xc4, 0x59, 0xb5, 0xc9, 0x60, 0x51, 0xef,
- 0x60, 0x59, 0x0f, 0x41, 0x6d, 0x81, 0xe9, 0x60,
- 0x75, 0x25, 0x57, 0xf7, 0x87, 0x42, 0xf2, 0x60,
- 0x26, 0x7c, 0x41, 0x8b, 0x60, 0x4d, 0x03, 0x60,
- 0xa6, 0xd6, 0xa8, 0x50, 0x34, 0x8a, 0x40, 0xdd,
- 0x81, 0x56, 0x81, 0x8d, 0x5d, 0x30, 0x4c, 0x1e,
- 0x42, 0x1d,
+ 0x43, 0xc4, 0x59, 0xbf, 0xbf, 0x60, 0x51, 0xfc,
+ 0x60, 0x59, 0x02, 0x41, 0x6d, 0x81, 0xe9, 0x60,
+ 0x75, 0x09, 0x80, 0x9a, 0x57, 0xf7, 0x87, 0x44,
+ 0xd5, 0xa9, 0x88, 0x60, 0x24, 0x66, 0x41, 0x8b,
+ 0x60, 0x4d, 0x03, 0x60, 0xa6, 0xdd, 0xa1, 0x50,
+ 0x34, 0x8a, 0x40, 0xdd, 0x81, 0x56, 0x81, 0x8d,
+ 0x5d, 0x30, 0x4c, 0x1e, 0x42, 0x1d, 0x45, 0xe1,
+ 0x53, 0x4a,
 };
 
 static const uint8_t unicode_prop_Join_Control_table[4] = {
@@ -3851,7 +3901,7 @@
 0x61, 0xf1, 0xe5, 0x99,
 };
 
-static const uint8_t unicode_prop_Sentence_Terminal_table[184] = {
+static const uint8_t unicode_prop_Sentence_Terminal_table[188] = {
 0xa0, 0x80, 0x8b, 0x80, 0x8f, 0x80, 0x45, 0x48,
 0x80, 0x40, 0x93, 0x81, 0x40, 0xb3, 0x80, 0xaa,
 0x82, 0x40, 0xf5, 0x80, 0xbc, 0x00, 0x02, 0x81,
@@ -3871,10 +3921,11 @@
 0x82, 0x40, 0x80, 0x0d, 0x80, 0x8f, 0x81, 0xd7,
 0x08, 0x81, 0xeb, 0x80, 0x41, 0xa0, 0x81, 0x41,
 0x74, 0x0c, 0x8e, 0xe8, 0x81, 0x40, 0xf8, 0x82,
- 0x43, 0x02, 0x81, 0xd6, 0x81, 0x41, 0xa3, 0x81,
- 0x42, 0xb3, 0x81, 0x60, 0x4b, 0x74, 0x81, 0x40,
- 0x84, 0x80, 0xc0, 0x81, 0x8a, 0x80, 0x43, 0x52,
- 0x80, 0x60, 0x4e, 0x05, 0x80, 0x5d, 0xe7, 0x80,
+ 0x42, 0x04, 0x00, 0x80, 0x40, 0xfa, 0x81, 0xd6,
+ 0x81, 0x41, 0xa3, 0x81, 0x42, 0xb3, 0x81, 0x60,
+ 0x4b, 0x74, 0x81, 0x40, 0x84, 0x80, 0xc0, 0x81,
+ 0x8a, 0x80, 0x43, 0x52, 0x80, 0x60, 0x4e, 0x05,
+ 0x80, 0x5d, 0xe7, 0x80,
 };
 
 static const uint8_t unicode_prop_Soft_Dotted_table[71] = {
@@ -3889,7 +3940,7 @@
 0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1, 0x81,
 };
 
-static const uint8_t unicode_prop_Terminal_Punctuation_table[237] = {
+static const uint8_t unicode_prop_Terminal_Punctuation_table[241] = {
 0xa0, 0x80, 0x89, 0x00, 0x80, 0x8a, 0x0a, 0x80,
 0x43, 0x3d, 0x07, 0x80, 0x42, 0x00, 0x80, 0xb8,
 0x80, 0xc7, 0x80, 0x8d, 0x01, 0x81, 0x40, 0xb3,
@@ -3913,21 +3964,23 @@
 0x85, 0xc3, 0x85, 0xd8, 0x83, 0x43, 0xb7, 0x84,
 0x40, 0xec, 0x86, 0xef, 0x83, 0xfe, 0x82, 0x40,
 0x80, 0x0d, 0x80, 0x8f, 0x81, 0xd7, 0x84, 0xeb,
- 0x80, 0x41, 0xa0, 0x82, 0x8c, 0x80, 0x41, 0x65,
- 0x1a, 0x8e, 0xe8, 0x81, 0x40, 0xf8, 0x82, 0x43,
- 0x02, 0x81, 0xd6, 0x0b, 0x81, 0x41, 0x9d, 0x82,
- 0xac, 0x80, 0x42, 0x84, 0x81, 0x45, 0x76, 0x84,
- 0x60, 0x45, 0xf8, 0x81, 0x40, 0x84, 0x80, 0xc0,
- 0x82, 0x89, 0x80, 0x43, 0x51, 0x81, 0x60, 0x4e,
- 0x05, 0x80, 0x5d, 0xe6, 0x83,
+ 0x80, 0x41, 0xa0, 0x82, 0x8b, 0x81, 0x41, 0x65,
+ 0x1a, 0x8e, 0xe8, 0x81, 0x40, 0xf8, 0x82, 0x42,
+ 0x04, 0x00, 0x80, 0x40, 0xfa, 0x81, 0xd6, 0x0b,
+ 0x81, 0x41, 0x9d, 0x82, 0xac, 0x80, 0x42, 0x84,
+ 0x81, 0x45, 0x76, 0x84, 0x60, 0x45, 0xf8, 0x81,
+ 0x40, 0x84, 0x80, 0xc0, 0x82, 0x89, 0x80, 0x43,
+ 0x51, 0x81, 0x60, 0x4e, 0x05, 0x80, 0x5d, 0xe6,
+ 0x83,
 };
 
-static const uint8_t unicode_prop_Unified_Ideograph_table[38] = {
- 0x60, 0x33, 0xff, 0x59, 0xb5, 0xc9, 0x60, 0x51,
- 0xef, 0x60, 0x5a, 0x1d, 0x08, 0x00, 0x81, 0x89,
+static const uint8_t unicode_prop_Unified_Ideograph_table[42] = {
+ 0x60, 0x33, 0xff, 0x59, 0xbf, 0xbf, 0x60, 0x51,
+ 0xfc, 0x60, 0x5a, 0x10, 0x08, 0x00, 0x81, 0x89,
 0x00, 0x00, 0x09, 0x82, 0x61, 0x05, 0xd5, 0x60,
- 0xa6, 0xd6, 0xa8, 0x50, 0x34, 0x8a, 0x40, 0xdd,
- 0x81, 0x56, 0x81, 0x8d, 0x5d, 0x30,
+ 0xa6, 0xdd, 0xa1, 0x50, 0x34, 0x8a, 0x40, 0xdd,
+ 0x81, 0x56, 0x81, 0x8d, 0x5d, 0x30, 0x54, 0x1e,
+ 0x53, 0x4a,
 };
 
 static const uint8_t unicode_prop_Variation_Selector_table[12] = {
@@ -3966,7 +4019,7 @@
 0x80, 0xb8, 0x80,
 };
 
-static const uint8_t unicode_prop_Emoji_table[236] = {
+static const uint8_t unicode_prop_Emoji_table[238] = {
 0xa2, 0x05, 0x04, 0x89, 0xee, 0x03, 0x80, 0x5f,
 0x8c, 0x80, 0x8b, 0x80, 0x40, 0xd7, 0x80, 0x95,
 0x80, 0xd9, 0x85, 0x8e, 0x81, 0x41, 0x6e, 0x81,
@@ -3976,27 +4029,27 @@
 0x09, 0x03, 0x01, 0x00, 0x09, 0x02, 0x02, 0x0f,
 0x14, 0x00, 0x04, 0x8b, 0x8a, 0x09, 0x00, 0x08,
 0x80, 0x91, 0x01, 0x81, 0x91, 0x28, 0x00, 0x0a,
- 0x0f, 0x0b, 0x81, 0x8a, 0x0c, 0x09, 0x04, 0x08,
- 0x00, 0x81, 0x93, 0x0c, 0x28, 0x19, 0x03, 0x01,
- 0x01, 0x28, 0x01, 0x00, 0x00, 0x05, 0x02, 0x05,
- 0x80, 0x89, 0x81, 0x8e, 0x01, 0x03, 0x00, 0x03,
- 0x10, 0x80, 0x8a, 0x81, 0xaf, 0x82, 0x88, 0x80,
- 0x8d, 0x80, 0x8d, 0x80, 0x41, 0x73, 0x81, 0x41,
- 0xce, 0x82, 0x92, 0x81, 0xb2, 0x03, 0x80, 0x44,
- 0xd9, 0x80, 0x8b, 0x80, 0x42, 0x58, 0x00, 0x80,
- 0x61, 0xbd, 0x69, 0x80, 0x40, 0xc9, 0x80, 0x40,
- 0x9f, 0x81, 0x8b, 0x81, 0x8d, 0x01, 0x89, 0xca,
- 0x99, 0x01, 0x96, 0x80, 0x93, 0x01, 0x88, 0x94,
- 0x81, 0x40, 0xad, 0xa1, 0x81, 0xef, 0x09, 0x02,
- 0x81, 0xd2, 0x0a, 0x80, 0x41, 0x06, 0x80, 0xbe,
- 0x8a, 0x28, 0x97, 0x31, 0x0f, 0x8b, 0x01, 0x19,
- 0x03, 0x81, 0x8c, 0x09, 0x07, 0x81, 0x88, 0x04,
- 0x82, 0x8b, 0x17, 0x11, 0x00, 0x03, 0x05, 0x02,
- 0x05, 0xd5, 0xaf, 0xc5, 0x27, 0x08, 0x89, 0x2a,
- 0x00, 0x0a, 0x01, 0x87, 0x40, 0xe4, 0x8b, 0x41,
- 0x20, 0xad, 0x80, 0x89, 0x80, 0xaa, 0x03, 0x82,
- 0xa8, 0x0d, 0x82, 0x9c, 0x81, 0xb2, 0xef, 0x1b,
- 0x14, 0x82, 0x8c, 0x85,
+ 0x0c, 0x01, 0x0b, 0x81, 0x8a, 0x0c, 0x09, 0x04,
+ 0x08, 0x00, 0x81, 0x93, 0x0c, 0x28, 0x19, 0x03,
+ 0x01, 0x01, 0x28, 0x01, 0x00, 0x00, 0x05, 0x02,
+ 0x05, 0x80, 0x89, 0x81, 0x8e, 0x01, 0x03, 0x00,
+ 0x03, 0x10, 0x80, 0x8a, 0x81, 0xaf, 0x82, 0x88,
+ 0x80, 0x8d, 0x80, 0x8d, 0x80, 0x41, 0x73, 0x81,
+ 0x41, 0xce, 0x82, 0x92, 0x81, 0xb2, 0x03, 0x80,
+ 0x44, 0xd9, 0x80, 0x8b, 0x80, 0x42, 0x58, 0x00,
+ 0x80, 0x61, 0xbd, 0x69, 0x80, 0x40, 0xc9, 0x80,
+ 0x40, 0x9f, 0x81, 0x8b, 0x81, 0x8d, 0x01, 0x89,
+ 0xca, 0x99, 0x01, 0x96, 0x80, 0x93, 0x01, 0x88,
+ 0x94, 0x81, 0x40, 0xad, 0xa1, 0x81, 0xef, 0x09,
+ 0x02, 0x81, 0xd2, 0x0a, 0x80, 0x41, 0x06, 0x80,
+ 0xbe, 0x8a, 0x28, 0x97, 0x31, 0x0f, 0x8b, 0x01,
+ 0x19, 0x03, 0x81, 0x8c, 0x09, 0x07, 0x81, 0x88,
+ 0x04, 0x82, 0x8b, 0x17, 0x11, 0x00, 0x03, 0x05,
+ 0x02, 0x05, 0xd5, 0xaf, 0xc5, 0x27, 0x0a, 0x3d,
+ 0x10, 0x01, 0x10, 0x81, 0x89, 0x40, 0xe2, 0x8b,
+ 0x41, 0x1f, 0xae, 0x80, 0x89, 0x80, 0xb1, 0x80,
+ 0xd1, 0x80, 0xb2, 0xef, 0x22, 0x14, 0x86, 0x88,
+ 0x98, 0x36, 0x88, 0x82, 0x8c, 0x86,
 };
 
 static const uint8_t unicode_prop_Emoji_Component_table[28] = {
@@ -4010,18 +4063,19 @@
 0x61, 0xf3, 0xfa, 0x84,
 };
 
-static const uint8_t unicode_prop_Emoji_Modifier_Base_table[63] = {
+static const uint8_t unicode_prop_Emoji_Modifier_Base_table[66] = {
 0x60, 0x26, 0x1c, 0x80, 0x40, 0xda, 0x80, 0x8f,
 0x83, 0x61, 0xcc, 0x76, 0x80, 0xbb, 0x11, 0x01,
 0x82, 0xf4, 0x09, 0x8a, 0x94, 0x92, 0x10, 0x1a,
 0x02, 0x30, 0x00, 0x97, 0x80, 0x40, 0xc8, 0x0b,
 0x80, 0x94, 0x03, 0x81, 0x40, 0xad, 0x12, 0x84,
 0xd2, 0x80, 0x8f, 0x82, 0x88, 0x80, 0x8a, 0x80,
- 0x42, 0x41, 0x07, 0x3d, 0x80, 0x88, 0x89, 0x0a,
- 0xf5, 0x08, 0x08, 0x80, 0x90, 0x10, 0x8c,
+ 0x42, 0x3e, 0x01, 0x07, 0x3d, 0x80, 0x88, 0x89,
+ 0x0a, 0xb7, 0x80, 0xbc, 0x08, 0x08, 0x80, 0x90,
+ 0x10, 0x8c,
 };
 
-static const uint8_t unicode_prop_Emoji_Presentation_table[143] = {
+static const uint8_t unicode_prop_Emoji_Presentation_table[144] = {
 0x60, 0x23, 0x19, 0x81, 0x40, 0xcc, 0x1a, 0x01,
 0x80, 0x42, 0x08, 0x81, 0x94, 0x81, 0xb1, 0x8b,
 0xaa, 0x80, 0x92, 0x80, 0x8c, 0x07, 0x81, 0x90,
@@ -4036,13 +4090,13 @@
 0x1c, 0x8b, 0x90, 0x10, 0x82, 0xc6, 0x00, 0x80,
 0x40, 0xba, 0x81, 0xbe, 0x8c, 0x18, 0x97, 0x91,
 0x80, 0x99, 0x81, 0x8c, 0x80, 0xd5, 0xd4, 0xaf,
- 0xc5, 0x28, 0x12, 0x08, 0x94, 0x0e, 0x86, 0x40,
- 0xe4, 0x8b, 0x41, 0x20, 0xad, 0x80, 0x89, 0x80,
- 0xaa, 0x03, 0x82, 0xa8, 0x0d, 0x82, 0x9c, 0x81,
- 0xb2, 0xef, 0x1b, 0x14, 0x82, 0x8c, 0x85,
+ 0xc5, 0x28, 0x12, 0x0a, 0x92, 0x0e, 0x88, 0x40,
+ 0xe2, 0x8b, 0x41, 0x1f, 0xae, 0x80, 0x89, 0x80,
+ 0xb1, 0x80, 0xd1, 0x80, 0xb2, 0xef, 0x22, 0x14,
+ 0x86, 0x88, 0x98, 0x36, 0x88, 0x82, 0x8c, 0x86,
 };
 
-static const uint8_t unicode_prop_Extended_Pictographic_table[152] = {
+static const uint8_t unicode_prop_Extended_Pictographic_table[156] = {
 0x40, 0xa8, 0x03, 0x80, 0x5f, 0x8c, 0x80, 0x8b,
 0x80, 0x40, 0xd7, 0x80, 0x95, 0x80, 0xd9, 0x85,
 0x8e, 0x81, 0x41, 0x6e, 0x81, 0x8b, 0x80, 0xde,
@@ -4061,7 +4115,8 @@
 0x88, 0x41, 0xb1, 0x84, 0x41, 0x3d, 0x87, 0x41,
 0x09, 0xaf, 0xff, 0xf3, 0x8b, 0xd4, 0xaa, 0x8b,
 0x83, 0xb7, 0x87, 0x89, 0x85, 0xa7, 0x87, 0x9d,
- 0xd1, 0x8b, 0xae, 0x80, 0x89, 0x80, 0x46, 0xb6,
+ 0xd1, 0x8b, 0xae, 0x80, 0x89, 0x80, 0x41, 0xb8,
+ 0x40, 0xff, 0x43, 0xfd,
 };
 
 static const uint8_t unicode_prop_Default_Ignorable_Code_Point_table[51] = {
@@ -4175,11 +4230,11 @@
 "White_Space,space" "\0"
 "Bidi_Mirrored,Bidi_M" "\0"
 "Emoji" "\0"
- "Emoji_Component" "\0"
- "Emoji_Modifier" "\0"
- "Emoji_Modifier_Base" "\0"
- "Emoji_Presentation" "\0"
- "Extended_Pictographic" "\0"
+ "Emoji_Component,EComp" "\0"
+ "Emoji_Modifier,EMod" "\0"
+ "Emoji_Modifier_Base,EBase" "\0"
+ "Emoji_Presentation,EPres" "\0"
+ "Extended_Pictographic,ExtPict" "\0"
 "Default_Ignorable_Code_Point,DI" "\0"
 "ID_Start,IDS" "\0"
 "Case_Ignorable,CI" "\0"

gpac-1.0.1.tar.gz/src/quickjs/libunicode.c -> gpac-2.0.0.tar.gz/src/quickjs/libunicode.c Changed

@@ -527,7 +527,6 @@
 } else {
 d = unicode_decomp_data + unicode_decomp_table2[idx];
 switch(type) {
-#if defined(_MSC_VER)
 case DECOMP_TYPE_L1:
 case DECOMP_TYPE_L2:
 case DECOMP_TYPE_L3:
@@ -535,9 +534,6 @@
 case DECOMP_TYPE_L5:
 case DECOMP_TYPE_L6:
 case DECOMP_TYPE_L7:
-#else
- case DECOMP_TYPE_L1 ... DECOMP_TYPE_L7:
-#endif
 l = type - DECOMP_TYPE_L1 + 1;
 d += (c - code) * l * 2;
 for(i = 0; i < l; i++) {
@@ -545,12 +541,8 @@
 return 0;
 }
 return l;
-#if defined(_MSC_VER)
 case DECOMP_TYPE_LL1:
 case DECOMP_TYPE_LL2:
-#else
- case DECOMP_TYPE_LL1 ... DECOMP_TYPE_LL2:
-#endif
 {
 uint32_t k, p;
 l = type - DECOMP_TYPE_LL1 + 1;
@@ -566,15 +558,11 @@
 }
 }
 return l;
-#if defined(_MSC_VER)
 case DECOMP_TYPE_S1:
 case DECOMP_TYPE_S2:
 case DECOMP_TYPE_S3:
 case DECOMP_TYPE_S4:
 case DECOMP_TYPE_S5:
-#else
- case DECOMP_TYPE_S1 ... DECOMP_TYPE_S5:
-#endif
 l = type - DECOMP_TYPE_S1 + 1;
 d += (c - code) * l;
 for(i = 0; i < l; i++) {
@@ -605,7 +593,6 @@
 case DECOMP_TYPE_B18:
 l = 18;
 goto decomp_type_b;
-#if defined(_MSC_VER)
 case DECOMP_TYPE_B1:
 case DECOMP_TYPE_B2:
 case DECOMP_TYPE_B3:
@@ -614,9 +601,6 @@
 case DECOMP_TYPE_B6:
 case DECOMP_TYPE_B7:
 case DECOMP_TYPE_B8:
-#else
- case DECOMP_TYPE_B1 ... DECOMP_TYPE_B8:
-#endif
 l = type - DECOMP_TYPE_B1 + 1;
 decomp_type_b:
 {

gpac-1.0.1.tar.gz/src/quickjs/quickjs-atom.h -> gpac-2.0.0.tar.gz/src/quickjs/quickjs-atom.h Changed

@@ -82,6 +82,7 @@
 DEF(fileName, "fileName")
 DEF(lineNumber, "lineNumber")
 DEF(message, "message")
+DEF(errors, "errors")
 DEF(stack, "stack")
 DEF(name, "name")
 DEF(toString, "toString")
@@ -112,6 +113,7 @@
 DEF(_eval_, "<eval>")
 DEF(_ret_, "<ret>")
 DEF(_var_, "<var>")
+DEF(_arg_var_, "<arg_var>")
 DEF(_with_, "<with>")
 DEF(lastIndex, "lastIndex")
 DEF(target, "target")
@@ -219,6 +221,8 @@
 DEF(BigFloat, "BigFloat")
 DEF(BigFloatEnv, "BigFloatEnv")
 DEF(BigDecimal, "BigDecimal")
+DEF(OperatorSet, "OperatorSet")
+DEF(Operators, "Operators")
 #endif
 DEF(Map, "Map")
 DEF(Set, "Set") /* Map + 1 */
@@ -263,27 +267,7 @@
 DEF(Symbol_unscopables, "Symbol.unscopables")
 DEF(Symbol_asyncIterator, "Symbol.asyncIterator")
 #ifdef CONFIG_BIGNUM
-DEF(Symbol_operatorOrder, "Symbol.operatorOrder")
-DEF(Symbol_operatorAdd, "Symbol.operatorAdd")
-DEF(Symbol_operatorSub, "Symbol.operatorSub")
-DEF(Symbol_operatorMul, "Symbol.operatorMul")
-DEF(Symbol_operatorDiv, "Symbol.operatorDiv")
-DEF(Symbol_operatorMod, "Symbol.operatorMod")
-DEF(Symbol_operatorPow, "Symbol.operatorPow")
-DEF(Symbol_operatorShl, "Symbol.operatorShl")
-DEF(Symbol_operatorShr, "Symbol.operatorShr")
-DEF(Symbol_operatorAnd, "Symbol.operatorAnd")
-DEF(Symbol_operatorOr, "Symbol.operatorOr")
-DEF(Symbol_operatorXor, "Symbol.operatorXor")
-DEF(Symbol_operatorCmpLT, "Symbol.operatorCmpLT")
-DEF(Symbol_operatorCmpLE, "Symbol.operatorCmpLE")
-DEF(Symbol_operatorCmpEQ, "Symbol.operatorCmpEQ")
-DEF(Symbol_operatorPlus, "Symbol.operatorPlus")
-DEF(Symbol_operatorNeg, "Symbol.operatorNeg")
-DEF(Symbol_operatorNot, "Symbol.operatorNot")
-DEF(Symbol_operatorInc, "Symbol.operatorInc")
-DEF(Symbol_operatorDec, "Symbol.operatorDec")
-DEF(Symbol_operatorMathMod, "Symbol.operatorMathMod")
+DEF(Symbol_operatorSet, "Symbol.operatorSet")
 #endif
-
+ 
 #endif /* DEF */

gpac-2.0.0.tar.gz/src/quickjs/quickjs-libc.c Added

@@ -0,0 +1,4404 @@
+/*
+ * QuickJS C library
+ * 
+ * Copyright (c) 2017-2021 Fabrice Bellard
+ * Copyright (c) 2017-2021 Charlie Gordon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <gpac/setup.h>
+
+#ifndef GPAC_DISABLE_QJS_LIBC
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <inttypes.h>
+#include <string.h>
+#include <assert.h>
+#if !defined(_MSC_VER)
+#include <unistd.h>
+#include <sys/time.h>
+#include <dirent.h>
+#endif
+#include <errno.h>
+#include <fcntl.h>
+#include <time.h>
+#include <signal.h>
+#include <limits.h>
+#include <sys/stat.h>
+#if defined(_WIN32)
+#include <windows.h>
+#include <conio.h>
+#if !defined(_MSC_VER)
+#include <utime.h>
+#else
+#include <sys/utime.h>
+#include <sys/timeb.h>
+#include <gpac/tools.h>
+#include <io.h>
+#include <direct.h>
+#endif
+#else //_WIN32
+#include <dlfcn.h>
+#include <termios.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+
+#if defined(__APPLE__)
+typedef sig_t mysighandler_t;
+#if !defined(environ)
+#ifdef GPAC_CONFIG_IOS
+char *environ[1] = {NULL};
+#else
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#endif
+#endif
+
+#else /* __APPLE__ */
+extern char **environ;
+typedef void (*mysighandler_t)(int sig_num);
+#endif
+
+#endif
+
+//patch pipe and some unistd things for windows
+#if defined(_WIN32)
+//MSVC only
+#if defined(_MSC_VER) && !defined(__GNUC__)
+#ifndef PATH_MAX
+#define PATH_MAX GF_MAX_PATH
+#endif
+
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+
+#if !defined(S_IFIFO)
+#define S_IFIFO _S_IFIFO /* Pipe */
+#endif
+#if !defined(S_IFBLK)
+#define S_IFBLK 0 /* Block device */
+#endif
+#if !defined(S_ISDIR)
+#define	S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#endif
+
+#endif
+
+//MSVC and mingw
+#define popen _popen
+#define pclose _pclose
+#define pipe(_a) _pipe(_a, 1024, 0)
+
+#endif
+
+/* enable the os.Worker API. We rely on GF_Thread */
+#define USE_WORKER
+
+#ifdef USE_WORKER
+#include <gpac/thread.h>
+#if defined(WIN32) && !defined(__GNUC__)
+
+#else
+#include <stdatomic.h>
+#endif
+
+#endif
+
+#include "cutils.h"
+#include "list.h"
+#include "quickjs-libc.h"
+
+#ifdef GPAC_HAS_QJS
+void js_dump_error(JSContext *ctx);
+void js_dump_error_exc(JSContext *ctx, const JSValue exception_val);
+#define js_std_dump_error js_dump_error
+#define js_std_dump_error1 js_dump_error_exc
+
+//use our own loader
+JSModuleDef *qjs_module_loader(JSContext *ctx, const char *module_name, void *opaque);
+#define js_module_loader qjs_module_loader
+
+#endif //GPAC_HAS_QJS
+
+/* TODO:
+ - add socket calls
+*/
+
+typedef struct {
+ struct list_head link;
+ int fd;
+ JSValue rw_func[2];
+} JSOSRWHandler;
+
+typedef struct {
+ struct list_head link;
+ int sig_num;
+ JSValue func;
+} JSOSSignalHandler;
+
+typedef struct {
+ struct list_head link;
+ BOOL has_object;
+ int64_t timeout;
+ JSValue func;
+} JSOSTimer;
+
+typedef struct {
+ struct list_head link;
+ uint8_t *data;
+ size_t data_len;
+ /* list of SharedArrayBuffers, necessary to free the message */
+ uint8_t **sab_tab;
+ size_t sab_tab_len;
+} JSWorkerMessage;
+
+typedef struct {
+ int ref_count;
+#ifdef USE_WORKER
+ GF_Mutex *mutex;
+#endif
+ struct list_head msg_queue; /* list of JSWorkerMessage.link */
+ int read_fd;
+ int write_fd;
+} JSWorkerMessagePipe;
+
+typedef struct {
+ struct list_head link;
+ JSWorkerMessagePipe *recv_pipe;
+ JSValue on_message_func;
+} JSWorkerMessageHandler;
+
+typedef struct JSThreadState {
+ struct list_head os_rw_handlers; /* list of JSOSRWHandler.link */
+ struct list_head os_signal_handlers; /* list JSOSSignalHandler.link */
+ struct list_head os_timers; /* list of JSOSTimer.link */
+ struct list_head port_list; /* list of JSWorkerMessageHandler.link */
+ int eval_script_recurse; /* only used in the main thread */
+ /* not used in the main thread */
+ JSWorkerMessagePipe *recv_pipe, *send_pipe;
+	int terminated;
+} JSThreadState;
+
+static uint64_t os_pending_signals;
+static int (*os_poll_func)(JSContext *ctx);
+
+static void js_std_dbuf_init(JSContext *ctx, DynBuf *s)
+{
+ dbuf_init2(s, JS_GetRuntime(ctx), (DynBufReallocFunc *)js_realloc_rt);
+}
+
+static BOOL my_isdigit(int c)
+{
+ return (c >= '0' && c <= '9');
+}
+
+static JSValue js_printf_internal(JSContext *ctx,
+ int argc, JSValueConst *argv, FILE *fp)
+{
+ char fmtbuf[32];
+ uint8_t cbuf[UTF8_CHAR_LEN_MAX+1];
+ JSValue res;
+ DynBuf dbuf;
+ const char *fmt_str;
+ const uint8_t *fmt, *fmt_end;
+ const uint8_t *p;
+ char *q;
+ int i, c, len, mod;
+ size_t fmt_len;
+ int32_t int32_arg;
+ int64_t int64_arg;
+ double double_arg;
+ const char *string_arg;
+ /* Use indirect call to dbuf_printf to prevent gcc warning */
+ int (*dbuf_printf_fun)(DynBuf *s, const char *fmt, ...) = (void*)dbuf_printf;
+
+ js_std_dbuf_init(ctx, &dbuf);
+
+ if (argc > 0) {
+ fmt_str = JS_ToCStringLen(ctx, &fmt_len, argv[0]);
+ if (!fmt_str)
+ goto fail;
+
+ i = 1;
+ fmt = (const uint8_t *)fmt_str;
+ fmt_end = fmt + fmt_len;
+ while (fmt < fmt_end) {
+ for (p = fmt; fmt < fmt_end && *fmt != '%'; fmt++)
+ continue;
+ dbuf_put(&dbuf, p, fmt - p);
+ if (fmt >= fmt_end)
+ break;
+ q = fmtbuf;
+ *q++ = *fmt++; /* copy '%' */
+ 
+ /* flags */
+ for(;;) {
+ c = *fmt;
+ if (c == '0' || c == '#' || c == '+' || c == '-' || c == ' ' ||
+ c == '\'') {
+ if (q >= fmtbuf + sizeof(fmtbuf) - 1)
+ goto invalid;
+ *q++ = c;
+ fmt++;
+ } else {
+ break;
+ }
+ }
+ /* width */
+ if (*fmt == '*') {
+ if (i >= argc)
+ goto missing;
+ if (JS_ToInt32(ctx, &int32_arg, argv[i++]))
+ goto fail;
+ q += snprintf(q, fmtbuf + sizeof(fmtbuf) - q, "%d", int32_arg);
+ fmt++;
+ } else {
+ while (my_isdigit(*fmt)) {
+ if (q >= fmtbuf + sizeof(fmtbuf) - 1)
+ goto invalid;
+ *q++ = *fmt++;
+ }
+ }
+ if (*fmt == '.') {
+ if (q >= fmtbuf + sizeof(fmtbuf) - 1)
+ goto invalid;
+ *q++ = *fmt++;
+ if (*fmt == '*') {
+ if (i >= argc)
+ goto missing;
+ if (JS_ToInt32(ctx, &int32_arg, argv[i++]))
+ goto fail;
+ q += snprintf(q, fmtbuf + sizeof(fmtbuf) - q, "%d", int32_arg);
+ fmt++;
+ } else {
+ while (my_isdigit(*fmt)) {
+ if (q >= fmtbuf + sizeof(fmtbuf) - 1)
+ goto invalid;
+ *q++ = *fmt++;
+ }
+ }
+ }
+
+ /* we only support the "l" modifier for 64 bit numbers */
+ mod = ' ';
+ if (*fmt == 'l') {
+ mod = *fmt++;
+ }
+ 
+ /* type */
+ c = *fmt++;
+ if (q >= fmtbuf + sizeof(fmtbuf) - 1)
+ goto invalid;
+ *q++ = c;
+ *q = '\0';
+ 
+ switch (c) {
+ case 'c':
+ if (i >= argc)
+ goto missing;
+ if (JS_IsString(argv[i])) {
+ string_arg = JS_ToCString(ctx, argv[i++]);
+ if (!string_arg)
+ goto fail;
+ int32_arg = unicode_from_utf8((uint8_t *)string_arg, UTF8_CHAR_LEN_MAX, &p);
+ JS_FreeCString(ctx, string_arg);
+ } else {
+ if (JS_ToInt32(ctx, &int32_arg, argv[i++]))
+ goto fail;
+ }
+ /* handle utf-8 encoding explicitly */
+ if ((unsigned)int32_arg > 0x10FFFF)
+ int32_arg = 0xFFFD;
+ /* ignore conversion flags, width and precision */
+ len = unicode_to_utf8(cbuf, int32_arg);
+ dbuf_put(&dbuf, cbuf, len);
+ break;
+ 
+ case 'd':
+ case 'i':
+ case 'o':
+ case 'u':
+ case 'x':
+ case 'X':
+ if (i >= argc)
+ goto missing;
+ if (JS_ToInt64Ext(ctx, &int64_arg, argv[i++]))
+ goto fail;
+ if (mod == 'l') {
+ /* 64 bit number */
+#if defined(_WIN32)
+ if (q >= fmtbuf + sizeof(fmtbuf) - 3)
+ goto invalid;
+ q[2] = q[-1];
+ q[-1] = 'I';
+ q[0] = '6';
+ q[1] = '4';
+ q[3] = '\0';
+ dbuf_printf_fun(&dbuf, fmtbuf, (int64_t)int64_arg);
+#else
+ if (q >= fmtbuf + sizeof(fmtbuf) - 2)
+ goto invalid;
+ q[1] = q[-1];
+ q[-1] = q[0] = 'l';
+ q[2] = '\0';
+ dbuf_printf_fun(&dbuf, fmtbuf, (long long)int64_arg);
+#endif
+ } else {
+ dbuf_printf_fun(&dbuf, fmtbuf, (int)int64_arg);
+ }
+ break;
+
+ case 's':
+ if (i >= argc)
+ goto missing;
+ /* XXX: handle strings containing null characters */
+ string_arg = JS_ToCString(ctx, argv[i++]);
+ if (!string_arg)
+ goto fail;
+ dbuf_printf_fun(&dbuf, fmtbuf, string_arg);
+ JS_FreeCString(ctx, string_arg);
+ break;
+ 
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'a':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'A':
+ if (i >= argc)
+ goto missing;
+ if (JS_ToFloat64(ctx, &double_arg, argv[i++]))
+ goto fail;
+ dbuf_printf_fun(&dbuf, fmtbuf, double_arg);
+ break;
+ 
+ case '%':
+ dbuf_putc(&dbuf, '%');
+ break;
+ 
+ default:
+ /* XXX: should support an extension mechanism */
+ invalid:
+ JS_ThrowTypeError(ctx, "invalid conversion specifier in format string");
+ goto fail;
+ missing:
+ JS_ThrowReferenceError(ctx, "missing argument for conversion specifier");
+ goto fail;
+ }
+ }
+ JS_FreeCString(ctx, fmt_str);
+ }
+ if (dbuf.error) {
+ res = JS_ThrowOutOfMemory(ctx);
+ } else {
+ if (fp) {
+ len = (int) fwrite(dbuf.buf, 1, dbuf.size, fp);
+ res = JS_NewInt32(ctx, len);
+ } else {
+ res = JS_NewStringLen(ctx, (char *)dbuf.buf, dbuf.size);
+ }
+ }
+ dbuf_free(&dbuf);
+ return res;
+
+fail:
+ dbuf_free(&dbuf);
+ return JS_EXCEPTION;
+}
+
+uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename)
+{
+ FILE *f;
+ uint8_t *buf;
+ size_t buf_len;
+ long lret;
+ 
+ f = fopen(filename, "rb");
+ if (!f)
+ return NULL;
+ if (fseek(f, 0, SEEK_END) < 0)
+ goto fail;
+ lret = ftell(f);
+ if (lret < 0)
+ goto fail;
+ /* XXX: on Linux, ftell() return LONG_MAX for directories */
+ if (lret == LONG_MAX) {
+ errno = EISDIR;
+ goto fail;
+ }
+ buf_len = lret;
+ if (fseek(f, 0, SEEK_SET) < 0)
+ goto fail;
+ if (ctx)
+ buf = js_malloc(ctx, buf_len + 1);
+ else
+ buf = malloc(buf_len + 1);
+ if (!buf)
+ goto fail;
+ if (fread(buf, 1, buf_len, f) != buf_len) {
+ errno = EIO;
+ if (ctx)
+ js_free(ctx, buf);
+ else
+ free(buf);
+ fail:
+ fclose(f);
+ return NULL;
+ }
+ buf[buf_len] = '\0';
+ fclose(f);
+ *pbuf_len = buf_len;
+ return buf;
+}
+
+/* load and evaluate a file */
+static JSValue js_loadScript(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ uint8_t *buf;
+ const char *filename;
+ JSValue ret;
+ size_t buf_len;
+ 
+ filename = JS_ToCString(ctx, argv[0]);
+ if (!filename)
+ return JS_EXCEPTION;
+ buf = js_load_file(ctx, &buf_len, filename);
+ if (!buf) {
+ JS_ThrowReferenceError(ctx, "could not load '%s'", filename);
+ JS_FreeCString(ctx, filename);
+ return JS_EXCEPTION;
+ }
+ ret = JS_Eval(ctx, (char *)buf, buf_len, filename,
+ JS_EVAL_TYPE_GLOBAL);
+ js_free(ctx, buf);
+ JS_FreeCString(ctx, filename);
+ return ret;
+}
+
+/* load a file as a UTF-8 encoded string */
+static JSValue js_std_loadFile(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ uint8_t *buf;
+ const char *filename;
+ JSValue ret;
+ size_t buf_len;
+ 
+ filename = JS_ToCString(ctx, argv[0]);
+ if (!filename)
+ return JS_EXCEPTION;
+ buf = js_load_file(ctx, &buf_len, filename);
+ JS_FreeCString(ctx, filename);
+ if (!buf)
+ return JS_NULL;
+ ret = JS_NewStringLen(ctx, (char *)buf, buf_len);
+ js_free(ctx, buf);
+ return ret;
+}
+
+typedef JSModuleDef *(JSInitModuleFunc)(JSContext *ctx,
+ const char *module_name);
+
+#ifndef GPAC_HAS_QJS
+
+#if defined(_WIN32)
+static JSModuleDef *js_module_loader_so(JSContext *ctx,
+ const char *module_name)
+{
+ JS_ThrowReferenceError(ctx, "shared library modules are not supported yet");
+ return NULL;
+}
+#else
+static JSModuleDef *js_module_loader_so(JSContext *ctx,
+ const char *module_name)
+{
+ JSModuleDef *m;
+ void *hd;
+ JSInitModuleFunc *init;
+ char *filename;
+ 
+ if (!strchr(module_name, '/')) {
+ /* must add a '/' so that the DLL is not searched in the
+ system library paths */
+ filename = js_malloc(ctx, strlen(module_name) + 2 + 1);
+ if (!filename)
+ return NULL;
+ strcpy(filename, "./");
+ strcpy(filename + 2, module_name);
+ } else {
+ filename = (char *)module_name;
+ }
+ 
+ /* C module */
+ hd = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
+ if (filename != module_name)
+ js_free(ctx, filename);
+ if (!hd) {
+ JS_ThrowReferenceError(ctx, "could not load module filename '%s' as shared library",
+ module_name);
+ goto fail;
+ }
+
+ init = dlsym(hd, "js_init_module");
+ if (!init) {
+ JS_ThrowReferenceError(ctx, "could not load module filename '%s': js_init_module not found",
+ module_name);
+ goto fail;
+ }
+
+ m = init(ctx, module_name);
+ if (!m) {
+ JS_ThrowReferenceError(ctx, "could not load module filename '%s': initialization error",
+ module_name);
+ fail:
+ if (hd)
+ dlclose(hd);
+ return NULL;
+ }
+ return m;
+}
+#endif /* !_WIN32 */
+
+#endif //GPAC_HAS_QJS
+
+#endif //GPAC_DISABLE_QJS_LIBC
+
+#ifdef GPAC_DISABLE_QJS_LIBC
+#include "cutils.h"
+#include "quickjs-libc.h"
+#endif
+
+int js_module_set_import_meta(JSContext *ctx, JSValueConst func_val,
+ JS_BOOL use_realpath, JS_BOOL is_main)
+{
+ JSModuleDef *m;
+ char buf[PATH_MAX + 16];
+ JSValue meta_obj;
+ JSAtom module_name_atom;
+ const char *module_name;
+ 
+ assert(JS_VALUE_GET_TAG(func_val) == JS_TAG_MODULE);
+ m = JS_VALUE_GET_PTR(func_val);
+
+ module_name_atom = JS_GetModuleName(ctx, m);
+ module_name = JS_AtomToCString(ctx, module_name_atom);
+ JS_FreeAtom(ctx, module_name_atom);
+ if (!module_name)
+ return -1;
+ if (module_name[0] && (module_name[1]!=':') && !strchr(module_name, ':')) {
+ strcpy(buf, "file://");
+#if !defined(_WIN32)
+ /* realpath() cannot be used with modules compiled with qjsc
+ because the corresponding module source code is not
+ necessarily present */
+ if (use_realpath) {
+ char *res = realpath(module_name, buf + strlen(buf));
+ if (!res) {
+ JS_ThrowTypeError(ctx, "realpath failure");
+ JS_FreeCString(ctx, module_name);
+ return -1;
+ }
+ } else
+#endif
+ {
+ pstrcat(buf, sizeof(buf), module_name);
+ }
+ } else {
+ pstrcpy(buf, sizeof(buf), module_name);
+ }
+ JS_FreeCString(ctx, module_name);
+ 
+ meta_obj = JS_GetImportMeta(ctx, m);
+ if (JS_IsException(meta_obj))
+ return -1;
+ JS_DefinePropertyValueStr(ctx, meta_obj, "url",
+ JS_NewString(ctx, buf),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, meta_obj, "main",
+ JS_NewBool(ctx, is_main),
+ JS_PROP_C_W_E);
+ JS_FreeValue(ctx, meta_obj);
+ return 0;
+}
+
+
+#ifndef GPAC_DISABLE_QJS_LIBC
+
+#ifndef GPAC_HAS_QJS
+JSModuleDef *js_module_loader(JSContext *ctx,
+ const char *module_name, void *opaque)
+{
+ JSModuleDef *m;
+
+ if (has_suffix(module_name, ".so")) {
+ m = js_module_loader_so(ctx, module_name);
+ } else {
+ size_t buf_len;
+ uint8_t *buf;
+ JSValue func_val;
+ 
+ buf = js_load_file(ctx, &buf_len, module_name);
+ if (!buf) {
+ JS_ThrowReferenceError(ctx, "could not load module filename '%s'",
+ module_name);
+ return NULL;
+ }
+ 
+ /* compile the module */
+ func_val = JS_Eval(ctx, (char *)buf, buf_len, module_name,
+ JS_EVAL_TYPE_MODULE | JS_EVAL_FLAG_COMPILE_ONLY);
+ js_free(ctx, buf);
+ if (JS_IsException(func_val))
+ return NULL;
+ /* XXX: could propagate the exception */
+ js_module_set_import_meta(ctx, func_val, TRUE, FALSE);
+ /* the module is already referenced, so we must free it */
+ m = JS_VALUE_GET_PTR(func_val);
+ JS_FreeValue(ctx, func_val);
+ }
+ return m;
+}
+#endif
+
+static JSValue js_std_exit(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int status;
+ if (JS_ToInt32(ctx, &status, argv[0]))
+ status = -1;
+ exit(status);
+ return JS_UNDEFINED;
+}
+
+static JSValue js_std_getenv(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *name, *str;
+ name = JS_ToCString(ctx, argv[0]);
+ if (!name)
+ return JS_EXCEPTION;
+ str = getenv(name);
+ JS_FreeCString(ctx, name);
+ if (!str)
+ return JS_UNDEFINED;
+ else
+ return JS_NewString(ctx, str);
+}
+
+#if defined(_WIN32)
+static void setenv(const char *name, const char *value, int overwrite)
+{
+ char *str;
+ size_t name_len, value_len;
+ name_len = strlen(name);
+ value_len = strlen(value);
+ str = malloc(name_len + 1 + value_len + 1);
+ memcpy(str, name, name_len);
+ str[name_len] = '=';
+ memcpy(str + name_len + 1, value, value_len);
+ str[name_len + 1 + value_len] = '\0';
+ _putenv(str);
+ free(str);
+}
+
+static void unsetenv(const char *name)
+{
+ setenv(name, "", TRUE);
+}
+#endif /* _WIN32 */
+
+static JSValue js_std_setenv(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *name, *value;
+ name = JS_ToCString(ctx, argv[0]);
+ if (!name)
+ return JS_EXCEPTION;
+ value = JS_ToCString(ctx, argv[1]);
+ if (!value) {
+ JS_FreeCString(ctx, name);
+ return JS_EXCEPTION;
+ }
+ setenv(name, value, TRUE);
+ JS_FreeCString(ctx, name);
+ JS_FreeCString(ctx, value);
+ return JS_UNDEFINED;
+}
+
+static JSValue js_std_unsetenv(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *name;
+ name = JS_ToCString(ctx, argv[0]);
+ if (!name)
+ return JS_EXCEPTION;
+ unsetenv(name);
+ JS_FreeCString(ctx, name);
+ return JS_UNDEFINED;
+}
+
+/* return an object containing the list of the available environment
+ variables. */
+static JSValue js_std_getenviron(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ char **envp;
+ const char *name, *p, *value;
+ JSValue obj;
+ uint32_t idx;
+ size_t name_len;
+ JSAtom atom;
+ int ret;
+
+ obj = JS_NewObject(ctx);
+ if (JS_IsException(obj))
+ return JS_EXCEPTION;
+ envp = environ;
+ for(idx = 0; envp[idx] != NULL; idx++) {
+ name = envp[idx];
+ p = strchr(name, '=');
+ name_len = p - name;
+ if (!p)
+ continue;
+ value = p + 1;
+ atom = JS_NewAtomLen(ctx, name, name_len);
+ if (atom == JS_ATOM_NULL)
+ goto fail;
+ ret = JS_DefinePropertyValue(ctx, obj, atom, JS_NewString(ctx, value),
+ JS_PROP_C_W_E);
+ JS_FreeAtom(ctx, atom);
+ if (ret < 0)
+ goto fail;
+ }
+ return obj;
+ fail:
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue js_std_gc(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JS_RunGC(JS_GetRuntime(ctx));
+ return JS_UNDEFINED;
+}
+
+static int interrupt_handler(JSRuntime *rt, void *opaque)
+{
+ return (os_pending_signals >> SIGINT) & 1;
+}
+
+static int get_bool_option(JSContext *ctx, BOOL *pbool,
+ JSValueConst obj,
+ const char *option)
+{
+ JSValue val;
+ val = JS_GetPropertyStr(ctx, obj, option);
+ if (JS_IsException(val))
+ return -1;
+ if (!JS_IsUndefined(val)) {
+ *pbool = JS_ToBool(ctx, val);
+ }
+ JS_FreeValue(ctx, val);
+ return 0;
+}
+
+static JSValue js_evalScript(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSRuntime *rt = JS_GetRuntime(ctx);
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ const char *str;
+ size_t len;
+ JSValue ret;
+ JSValueConst options_obj;
+ BOOL backtrace_barrier = FALSE;
+ int flags;
+ 
+ if (argc >= 2) {
+ options_obj = argv[1];
+ if (get_bool_option(ctx, &backtrace_barrier, options_obj,
+ "backtrace_barrier"))
+ return JS_EXCEPTION;
+ }
+
+ str = JS_ToCStringLen(ctx, &len, argv[0]);
+ if (!str)
+ return JS_EXCEPTION;
+ if (!ts->recv_pipe && ++ts->eval_script_recurse == 1) {
+ /* install the interrupt handler */
+ JS_SetInterruptHandler(JS_GetRuntime(ctx), interrupt_handler, NULL);
+ }
+ flags = JS_EVAL_TYPE_GLOBAL; 
+ if (backtrace_barrier)
+ flags |= JS_EVAL_FLAG_BACKTRACE_BARRIER;
+ ret = JS_Eval(ctx, str, len, "<evalScript>", flags);
+ JS_FreeCString(ctx, str);
+ if (!ts->recv_pipe && --ts->eval_script_recurse == 0) {
+ /* remove the interrupt handler */
+ JS_SetInterruptHandler(JS_GetRuntime(ctx), NULL, NULL);
+ os_pending_signals &= ~((uint64_t)1 << SIGINT);
+ /* convert the uncatchable "interrupted" error into a normal error
+ so that it can be caught by the REPL */
+ if (JS_IsException(ret))
+ JS_ResetUncatchableError(ctx);
+ }
+ return ret;
+}
+
+static JSClassID js_std_file_class_id;
+
+typedef struct {
+ FILE *f;
+ BOOL close_in_finalizer;
+ BOOL is_popen;
+} JSSTDFile;
+
+static void js_std_file_finalizer(JSRuntime *rt, JSValue val)
+{
+ JSSTDFile *s = JS_GetOpaque(val, js_std_file_class_id);
+ if (s) {
+ if (s->f && s->close_in_finalizer) {
+ if (s->is_popen)
+ pclose(s->f);
+ else
+ fclose(s->f);
+ }
+ js_free_rt(rt, s);
+ }
+}
+
+static ssize_t js_get_errno(ssize_t ret)
+{
+ if (ret == -1)
+ ret = -errno;
+ return ret;
+}
+
+static JSValue js_std_strerror(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int err;
+ if (JS_ToInt32(ctx, &err, argv[0]))
+ return JS_EXCEPTION;
+ return JS_NewString(ctx, strerror(err));
+}
+
+static JSValue js_std_parseExtJSON(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSValue obj;
+ const char *str;
+ size_t len;
+
+ str = JS_ToCStringLen(ctx, &len, argv[0]);
+ if (!str)
+ return JS_EXCEPTION;
+ obj = JS_ParseJSON2(ctx, str, len, "<input>", JS_PARSE_JSON_EXT);
+ JS_FreeCString(ctx, str);
+ return obj;
+}
+
+static JSValue js_new_std_file(JSContext *ctx, FILE *f,
+ BOOL close_in_finalizer,
+ BOOL is_popen)
+{
+ JSSTDFile *s;
+ JSValue obj;
+ obj = JS_NewObjectClass(ctx, js_std_file_class_id);
+ if (JS_IsException(obj))
+ return obj;
+ s = js_mallocz(ctx, sizeof(*s));
+ if (!s) {
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+ }
+ s->close_in_finalizer = close_in_finalizer;
+ s->is_popen = is_popen;
+ s->f = f;
+ JS_SetOpaque(obj, s);
+ return obj;
+}
+
+static void js_set_error_object(JSContext *ctx, JSValue obj, int err)
+{
+ if (!JS_IsUndefined(obj)) {
+ JS_SetPropertyStr(ctx, obj, "errno", JS_NewInt32(ctx, err));
+ }
+}
+
+static JSValue js_std_open(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *filename, *mode = NULL;
+ FILE *f;
+ int err;
+ 
+ filename = JS_ToCString(ctx, argv[0]);
+ if (!filename)
+ goto fail;
+ mode = JS_ToCString(ctx, argv[1]);
+ if (!mode)
+ goto fail;
+ if (mode[strspn(mode, "rwa+b")] != '\0') {
+ JS_ThrowTypeError(ctx, "invalid file mode");
+ goto fail;
+ }
+
+ f = fopen(filename, mode);
+ if (!f)
+ err = errno;
+ else
+ err = 0;
+ if (argc >= 3)
+ js_set_error_object(ctx, argv[2], err);
+ JS_FreeCString(ctx, filename);
+ JS_FreeCString(ctx, mode);
+ if (!f)
+ return JS_NULL;
+ return js_new_std_file(ctx, f, TRUE, FALSE);
+ fail:
+ JS_FreeCString(ctx, filename);
+ JS_FreeCString(ctx, mode);
+ return JS_EXCEPTION;
+}
+
+static JSValue js_std_popen(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *filename, *mode = NULL;
+ FILE *f;
+ int err;
+ 
+ filename = JS_ToCString(ctx, argv[0]);
+ if (!filename)
+ goto fail;
+ mode = JS_ToCString(ctx, argv[1]);
+ if (!mode)
+ goto fail;
+ if (mode[strspn(mode, "rw")] != '\0') {
+ JS_ThrowTypeError(ctx, "invalid file mode");
+ goto fail;
+ }
+
+ f = popen(filename, mode);
+ if (!f)
+ err = errno;
+ else
+ err = 0;
+ if (argc >= 3)
+ js_set_error_object(ctx, argv[2], err);
+ JS_FreeCString(ctx, filename);
+ JS_FreeCString(ctx, mode);
+ if (!f)
+ return JS_NULL;
+ return js_new_std_file(ctx, f, TRUE, TRUE);
+ fail:
+ JS_FreeCString(ctx, filename);
+ JS_FreeCString(ctx, mode);
+ return JS_EXCEPTION;
+}
+
+static JSValue js_std_fdopen(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *mode;
+ FILE *f;
+ int fd, err;
+
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ mode = JS_ToCString(ctx, argv[1]);
+ if (!mode)
+ goto fail;
+ if (mode[strspn(mode, "rwa+")] != '\0') {
+ JS_ThrowTypeError(ctx, "invalid file mode");
+ goto fail;
+ }
+
+ f = fdopen(fd, mode);
+ if (!f)
+ err = errno;
+ else
+ err = 0;
+ if (argc >= 3)
+ js_set_error_object(ctx, argv[2], err);
+ JS_FreeCString(ctx, mode);
+ if (!f)
+ return JS_NULL;
+ return js_new_std_file(ctx, f, TRUE, FALSE);
+ fail:
+ JS_FreeCString(ctx, mode);
+ return JS_EXCEPTION;
+}
+
+static JSValue js_std_tmpfile(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f;
+ f = tmpfile();
+ if (argc >= 1)
+ js_set_error_object(ctx, argv[0], f ? 0 : errno);
+ if (!f)
+ return JS_NULL;
+ return js_new_std_file(ctx, f, TRUE, FALSE);
+}
+
+static JSValue js_std_sprintf(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ return js_printf_internal(ctx, argc, argv, NULL);
+}
+
+static JSValue js_std_printf(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ return js_printf_internal(ctx, argc, argv, stdout);
+}
+
+static FILE *js_std_file_get(JSContext *ctx, JSValueConst obj)
+{
+ JSSTDFile *s = JS_GetOpaque2(ctx, obj, js_std_file_class_id);
+ if (!s)
+ return NULL;
+ if (!s->f) {
+ JS_ThrowTypeError(ctx, "invalid file handle");
+ return NULL;
+ }
+ return s->f;
+}
+
+static JSValue js_std_file_puts(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv, int magic)
+{
+ FILE *f;
+ int i;
+ const char *str;
+ size_t len;
+
+ if (magic == 0) {
+ f = stdout;
+ } else {
+ f = js_std_file_get(ctx, this_val);
+ if (!f)
+ return JS_EXCEPTION;
+ }
+ 
+ for(i = 0; i < argc; i++) {
+ str = JS_ToCStringLen(ctx, &len, argv[i]);
+ if (!str)
+ return JS_EXCEPTION;
+ fwrite(str, 1, len, f);
+ JS_FreeCString(ctx, str);
+ }
+ return JS_UNDEFINED;
+}
+
+static JSValue js_std_file_close(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSSTDFile *s = JS_GetOpaque2(ctx, this_val, js_std_file_class_id);
+ int err;
+ if (!s)
+ return JS_EXCEPTION;
+ if (!s->f)
+ return JS_ThrowTypeError(ctx, "invalid file handle");
+ if (s->is_popen)
+ err = (int) js_get_errno(pclose(s->f));
+ else
+ err = (int) js_get_errno(fclose(s->f));
+ s->f = NULL;
+ return JS_NewInt32(ctx, err);
+}
+
+static JSValue js_std_file_printf(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ if (!f)
+ return JS_EXCEPTION;
+ return js_printf_internal(ctx, argc, argv, f);
+}
+
+static JSValue js_std_file_flush(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ if (!f)
+ return JS_EXCEPTION;
+ fflush(f);
+ return JS_UNDEFINED;
+}
+
+static JSValue js_std_file_tell(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv, int is_bigint)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ int64_t pos;
+ if (!f)
+ return JS_EXCEPTION;
+ pos = gf_ftell(f);
+ if (is_bigint)
+ return JS_NewBigInt64(ctx, pos);
+ else
+ return JS_NewInt64(ctx, pos);
+}
+
+static JSValue js_std_file_seek(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ int64_t pos;
+ int whence, ret;
+ if (!f)
+ return JS_EXCEPTION;
+ if (JS_ToInt64Ext(ctx, &pos, argv[0]))
+ return JS_EXCEPTION;
+ if (JS_ToInt32(ctx, &whence, argv[1]))
+ return JS_EXCEPTION;
+ ret = gf_fseek(f, pos, whence);
+ if (ret < 0)
+ ret = -errno;
+ return JS_NewInt32(ctx, ret);
+}
+
+static JSValue js_std_file_eof(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ if (!f)
+ return JS_EXCEPTION;
+ return JS_NewBool(ctx, feof(f));
+}
+
+static JSValue js_std_file_error(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ if (!f)
+ return JS_EXCEPTION;
+ return JS_NewBool(ctx, ferror(f));
+}
+
+static JSValue js_std_file_clearerr(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ if (!f)
+ return JS_EXCEPTION;
+ clearerr(f);
+ return JS_UNDEFINED;
+}
+
+static JSValue js_std_file_fileno(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ if (!f)
+ return JS_EXCEPTION;
+ return JS_NewInt32(ctx, fileno(f));
+}
+
+static JSValue js_std_file_read_write(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv, int magic)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ uint64_t pos, len;
+ size_t size, ret;
+ uint8_t *buf;
+ 
+ if (!f)
+ return JS_EXCEPTION;
+ if (JS_ToIndex(ctx, &pos, argv[1]))
+ return JS_EXCEPTION;
+ if (JS_ToIndex(ctx, &len, argv[2]))
+ return JS_EXCEPTION;
+ buf = JS_GetArrayBuffer(ctx, &size, argv[0]);
+ if (!buf)
+ return JS_EXCEPTION;
+ if (pos + len > size)
+ return JS_ThrowRangeError(ctx, "read/write array buffer overflow");
+ if (magic)
+ ret = fwrite(buf + pos, 1, len, f);
+ else
+ ret = fread(buf + pos, 1, len, f);
+ return JS_NewInt64(ctx, ret);
+}
+
+/* XXX: could use less memory and go faster */
+static JSValue js_std_file_getline(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ int c;
+ DynBuf dbuf;
+ JSValue obj;
+ 
+ if (!f)
+ return JS_EXCEPTION;
+
+ js_std_dbuf_init(ctx, &dbuf);
+ for(;;) {
+ c = fgetc(f);
+ if (c == EOF) {
+ if (dbuf.size == 0) {
+ /* EOF */
+ dbuf_free(&dbuf);
+ return JS_NULL;
+ } else {
+ break;
+ }
+ }
+ if (c == '\n')
+ break;
+ if (dbuf_putc(&dbuf, c)) {
+ dbuf_free(&dbuf);
+ return JS_ThrowOutOfMemory(ctx);
+ }
+ }
+ obj = JS_NewStringLen(ctx, (const char *)dbuf.buf, dbuf.size);
+ dbuf_free(&dbuf);
+ return obj;
+}
+
+/* XXX: could use less memory and go faster */
+static JSValue js_std_file_readAsString(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ int c;
+ DynBuf dbuf;
+ JSValue obj;
+ uint64_t max_size64;
+ size_t max_size;
+ JSValueConst max_size_val;
+ 
+ if (!f)
+ return JS_EXCEPTION;
+
+ if (argc >= 1)
+ max_size_val = argv[0];
+ else
+ max_size_val = JS_UNDEFINED;
+ max_size = (size_t)-1;
+ if (!JS_IsUndefined(max_size_val)) {
+ if (JS_ToIndex(ctx, &max_size64, max_size_val))
+ return JS_EXCEPTION;
+ if (max_size64 < max_size)
+ max_size = max_size64;
+ }
+
+ js_std_dbuf_init(ctx, &dbuf);
+ while (max_size != 0) {
+ c = fgetc(f);
+ if (c == EOF)
+ break;
+ if (dbuf_putc(&dbuf, c)) {
+ dbuf_free(&dbuf);
+ return JS_EXCEPTION;
+ }
+ max_size--;
+ }
+ obj = JS_NewStringLen(ctx, (const char *)dbuf.buf, dbuf.size);
+ dbuf_free(&dbuf);
+ return obj;
+}
+
+static JSValue js_std_file_getByte(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ if (!f)
+ return JS_EXCEPTION;
+ return JS_NewInt32(ctx, fgetc(f));
+}
+
+static JSValue js_std_file_putByte(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ FILE *f = js_std_file_get(ctx, this_val);
+ int c;
+ if (!f)
+ return JS_EXCEPTION;
+ if (JS_ToInt32(ctx, &c, argv[0]))
+ return JS_EXCEPTION;
+ c = fputc(c, f);
+ return JS_NewInt32(ctx, c);
+}
+
+/* urlGet */
+
+#define URL_GET_PROGRAM "curl -s -i"
+#define URL_GET_BUF_SIZE 4096
+
+static int http_get_header_line(FILE *f, char *buf, size_t buf_size,
+ DynBuf *dbuf)
+{
+ int c;
+ char *p;
+ 
+ p = buf;
+ for(;;) {
+ c = fgetc(f);
+ if (c < 0)
+ return -1;
+ if ((size_t) (p - buf) < buf_size - 1)
+ *p++ = c;
+ if (dbuf)
+ dbuf_putc(dbuf, c);
+ if (c == '\n')
+ break;
+ }
+ *p = '\0';
+ return 0;
+}
+
+static int http_get_status(const char *buf)
+{
+ const char *p = buf;
+ while (*p != ' ' && *p != '\0')
+ p++;
+ if (*p != ' ')
+ return 0;
+ while (*p == ' ')
+ p++;
+ return atoi(p);
+}
+
+static JSValue js_std_urlGet(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *url;
+ DynBuf cmd_buf;
+ DynBuf data_buf_s, *data_buf = &data_buf_s;
+ DynBuf header_buf_s, *header_buf = &header_buf_s;
+ char *buf; 
+ size_t i, len;
+ int c, status;
+ JSValue response = JS_UNDEFINED, ret_obj;
+ JSValueConst options_obj;
+ FILE *f;
+ BOOL binary_flag, full_flag;
+ 
+ url = JS_ToCString(ctx, argv[0]);
+ if (!url)
+ return JS_EXCEPTION;
+ 
+ binary_flag = FALSE;
+ full_flag = FALSE;
+ 
+ if (argc >= 2) {
+ options_obj = argv[1];
+
+ if (get_bool_option(ctx, &binary_flag, options_obj, "binary"))
+ goto fail_obj;
+
+ if (get_bool_option(ctx, &full_flag, options_obj, "full")) {
+ fail_obj:
+ JS_FreeCString(ctx, url);
+ return JS_EXCEPTION;
+ }
+ }
+ 
+ js_std_dbuf_init(ctx, &cmd_buf);
+ dbuf_printf(&cmd_buf, "%s ''", URL_GET_PROGRAM);
+ len = strlen(url);
+ for(i = 0; i < len; i++) {
+ c = url[i];
+ if (c == '\'' || c == '\\')
+ dbuf_putc(&cmd_buf, '\\');
+ dbuf_putc(&cmd_buf, c);
+ }
+ JS_FreeCString(ctx, url);
+ dbuf_putstr(&cmd_buf, "''");
+ dbuf_putc(&cmd_buf, '\0');
+ if (dbuf_error(&cmd_buf)) {
+ dbuf_free(&cmd_buf);
+ return JS_EXCEPTION;
+ }
+ // printf("%s\n", (char *)cmd_buf.buf);
+ f = popen((char *)cmd_buf.buf, "r");
+ dbuf_free(&cmd_buf);
+ if (!f) {
+ return JS_ThrowTypeError(ctx, "could not start curl");
+ }
+
+ js_std_dbuf_init(ctx, data_buf);
+ js_std_dbuf_init(ctx, header_buf);
+ 
+ buf = js_malloc(ctx, URL_GET_BUF_SIZE);
+ if (!buf)
+ goto fail;
+
+ /* get the HTTP status */
+ if (http_get_header_line(f, buf, URL_GET_BUF_SIZE, NULL) < 0) {
+ status = 0;
+ goto bad_header;
+ }
+ status = http_get_status(buf);
+ if (!full_flag && !(status >= 200 && status <= 299)) {
+ goto bad_header;
+ }
+ 
+ /* wait until there is an empty line */
+ for(;;) {
+ if (http_get_header_line(f, buf, URL_GET_BUF_SIZE, header_buf) < 0) {
+ bad_header:
+ response = JS_NULL;
+ goto done;
+ }
+ if (!strcmp(buf, "\r\n"))
+ break;
+ }
+ if (dbuf_error(header_buf))
+ goto fail;
+ header_buf->size -= 2; /* remove the trailing CRLF */
+
+ /* download the data */
+ for(;;) {
+ len = fread(buf, 1, URL_GET_BUF_SIZE, f);
+ if (len == 0)
+ break;
+ dbuf_put(data_buf, (uint8_t *)buf, len);
+ }
+ if (dbuf_error(data_buf))
+ goto fail;
+ if (binary_flag) {
+ response = JS_NewArrayBufferCopy(ctx,
+ data_buf->buf, data_buf->size);
+ } else {
+ response = JS_NewStringLen(ctx, (char *)data_buf->buf, data_buf->size);
+ }
+ if (JS_IsException(response))
+ goto fail;
+ done:
+ js_free(ctx, buf);
+ buf = NULL;
+ pclose(f);
+ f = NULL;
+ dbuf_free(data_buf);
+ data_buf = NULL;
+
+ if (full_flag) {
+ ret_obj = JS_NewObject(ctx);
+ if (JS_IsException(ret_obj))
+ goto fail;
+ JS_DefinePropertyValueStr(ctx, ret_obj, "response",
+ response,
+ JS_PROP_C_W_E);
+ if (!JS_IsNull(response)) {
+ JS_DefinePropertyValueStr(ctx, ret_obj, "responseHeaders",
+ JS_NewStringLen(ctx, (char *)header_buf->buf,
+ header_buf->size),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, ret_obj, "status",
+ JS_NewInt32(ctx, status),
+ JS_PROP_C_W_E);
+ }
+ } else {
+ ret_obj = response;
+ }
+ dbuf_free(header_buf);
+ return ret_obj;
+ fail:
+ if (f)
+ pclose(f);
+ js_free(ctx, buf);
+ if (data_buf)
+ dbuf_free(data_buf);
+ if (header_buf)
+ dbuf_free(header_buf);
+ JS_FreeValue(ctx, response);
+ return JS_EXCEPTION;
+}
+
+static JSClassDef js_std_file_class = {
+ "FILE",
+ .finalizer = js_std_file_finalizer,
+}; 
+
+static const JSCFunctionListEntry js_std_error_props[] = {
+ /* various errno values */
+#define DEF(x) JS_PROP_INT32_DEF(#x, x, JS_PROP_CONFIGURABLE )
+ DEF(EINVAL),
+ DEF(EIO),
+ DEF(EACCES),
+ DEF(EEXIST),
+ DEF(ENOSPC),
+ DEF(ENOSYS),
+ DEF(EBUSY),
+ DEF(ENOENT),
+ DEF(EPERM),
+ DEF(EPIPE),
+ DEF(EBADF),
+#undef DEF
+};
+
+static const JSCFunctionListEntry js_std_funcs[] = {
+ JS_CFUNC_DEF("exit", 1, js_std_exit ),
+ JS_CFUNC_DEF("gc", 0, js_std_gc ),
+ JS_CFUNC_DEF("evalScript", 1, js_evalScript ),
+ JS_CFUNC_DEF("loadScript", 1, js_loadScript ),
+ JS_CFUNC_DEF("getenv", 1, js_std_getenv ),
+ JS_CFUNC_DEF("setenv", 1, js_std_setenv ),
+ JS_CFUNC_DEF("unsetenv", 1, js_std_unsetenv ),
+ JS_CFUNC_DEF("getenviron", 1, js_std_getenviron ),
+ JS_CFUNC_DEF("urlGet", 1, js_std_urlGet ),
+ JS_CFUNC_DEF("loadFile", 1, js_std_loadFile ),
+ JS_CFUNC_DEF("strerror", 1, js_std_strerror ),
+ JS_CFUNC_DEF("parseExtJSON", 1, js_std_parseExtJSON ),
+ 
+ /* FILE I/O */
+ JS_CFUNC_DEF("open", 2, js_std_open ),
+ JS_CFUNC_DEF("popen", 2, js_std_popen ),
+ JS_CFUNC_DEF("fdopen", 2, js_std_fdopen ),
+ JS_CFUNC_DEF("tmpfile", 0, js_std_tmpfile ),
+ JS_CFUNC_MAGIC_DEF("puts", 1, js_std_file_puts, 0 ),
+ JS_CFUNC_DEF("printf", 1, js_std_printf ),
+ JS_CFUNC_DEF("sprintf", 1, js_std_sprintf ),
+ JS_PROP_INT32_DEF("SEEK_SET", SEEK_SET, JS_PROP_CONFIGURABLE ),
+ JS_PROP_INT32_DEF("SEEK_CUR", SEEK_CUR, JS_PROP_CONFIGURABLE ),
+ JS_PROP_INT32_DEF("SEEK_END", SEEK_END, JS_PROP_CONFIGURABLE ),
+ JS_OBJECT_DEF("Error", js_std_error_props, countof(js_std_error_props), JS_PROP_CONFIGURABLE),
+};
+ 
+static const JSCFunctionListEntry js_std_file_proto_funcs[] = {
+ JS_CFUNC_DEF("close", 0, js_std_file_close ),
+ JS_CFUNC_MAGIC_DEF("puts", 1, js_std_file_puts, 1 ),
+ JS_CFUNC_DEF("printf", 1, js_std_file_printf ),
+ JS_CFUNC_DEF("flush", 0, js_std_file_flush ),
+ JS_CFUNC_MAGIC_DEF("tell", 0, js_std_file_tell, 0 ),
+ JS_CFUNC_MAGIC_DEF("tello", 0, js_std_file_tell, 1 ),
+ JS_CFUNC_DEF("seek", 2, js_std_file_seek ),
+ JS_CFUNC_DEF("eof", 0, js_std_file_eof ),
+ JS_CFUNC_DEF("fileno", 0, js_std_file_fileno ),
+ JS_CFUNC_DEF("error", 0, js_std_file_error ),
+ JS_CFUNC_DEF("clearerr", 0, js_std_file_clearerr ),
+ JS_CFUNC_MAGIC_DEF("read", 3, js_std_file_read_write, 0 ),
+ JS_CFUNC_MAGIC_DEF("write", 3, js_std_file_read_write, 1 ),
+ JS_CFUNC_DEF("getline", 0, js_std_file_getline ),
+ JS_CFUNC_DEF("readAsString", 0, js_std_file_readAsString ),
+ JS_CFUNC_DEF("getByte", 0, js_std_file_getByte ),
+ JS_CFUNC_DEF("putByte", 1, js_std_file_putByte ),
+ /* setvbuf, ... */
+};
+
+static int js_std_init(JSContext *ctx, JSModuleDef *m)
+{
+ JSValue proto;
+ 
+ /* FILE class */
+ /* the class ID is created once */
+ JS_NewClassID(&js_std_file_class_id);
+ /* the class is created once per runtime */
+ JS_NewClass(JS_GetRuntime(ctx), js_std_file_class_id, &js_std_file_class);
+ proto = JS_NewObject(ctx);
+ JS_SetPropertyFunctionList(ctx, proto, js_std_file_proto_funcs,
+ countof(js_std_file_proto_funcs));
+ JS_SetClassProto(ctx, js_std_file_class_id, proto);
+
+ JS_SetModuleExportList(ctx, m, js_std_funcs,
+ countof(js_std_funcs));
+ JS_SetModuleExport(ctx, m, "in", js_new_std_file(ctx, stdin, FALSE, FALSE));
+ JS_SetModuleExport(ctx, m, "out", js_new_std_file(ctx, stdout, FALSE, FALSE));
+ JS_SetModuleExport(ctx, m, "err", js_new_std_file(ctx, stderr, FALSE, FALSE));
+ return 0;
+}
+
+JSModuleDef *js_init_module_std(JSContext *ctx, const char *module_name)
+{
+ JSModuleDef *m;
+ m = JS_NewCModule(ctx, module_name, js_std_init);
+ if (!m)
+ return NULL;
+ JS_AddModuleExportList(ctx, m, js_std_funcs, countof(js_std_funcs));
+ JS_AddModuleExport(ctx, m, "in");
+ JS_AddModuleExport(ctx, m, "out");
+ JS_AddModuleExport(ctx, m, "err");
+ return m;
+}
+
+/**********************************************************/
+/* 'os' object */
+
+static JSValue js_os_open(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *filename;
+ int flags, mode, ret;
+
+ filename = JS_ToCString(ctx, argv[0]);
+ if (!filename)
+ return JS_EXCEPTION;
+ if (JS_ToInt32(ctx, &flags, argv[1]))
+ goto fail;
+ if (argc >= 3 && !JS_IsUndefined(argv[2])) {
+ if (JS_ToInt32(ctx, &mode, argv[2])) {
+ fail:
+ JS_FreeCString(ctx, filename);
+ return JS_EXCEPTION;
+ }
+ } else {
+ mode = 0666;
+ }
+#if defined(_WIN32)
+ /* force binary mode by default */
+ if (!(flags & O_TEXT))
+ flags |= O_BINARY;
+#endif
+ ret = (int) js_get_errno(open(filename, flags, mode));
+ JS_FreeCString(ctx, filename);
+ return JS_NewInt32(ctx, ret);
+}
+
+static JSValue js_os_close(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int fd, ret;
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ ret = (int) js_get_errno(close(fd));
+ return JS_NewInt32(ctx, ret);
+}
+
+static JSValue js_os_seek(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int fd, whence;
+ int64_t pos, ret;
+ BOOL is_bigint;
+ 
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ is_bigint = JS_IsBigInt(ctx, argv[1]);
+ if (JS_ToInt64Ext(ctx, &pos, argv[1]))
+ return JS_EXCEPTION;
+ if (JS_ToInt32(ctx, &whence, argv[2]))
+ return JS_EXCEPTION;
+#ifdef _MSC_VER
+	ret = _lseeki64(fd, pos, whence);
+#else
+	ret = lseek(fd, pos, whence);
+#endif
+	if (ret == -1)
+ ret = -errno;
+ if (is_bigint)
+ return JS_NewBigInt64(ctx, ret);
+ else
+ return JS_NewInt64(ctx, ret);
+}
+
+static JSValue js_os_read_write(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv, int magic)
+{
+ int fd;
+ uint64_t pos, len;
+ size_t size;
+ ssize_t ret;
+ uint8_t *buf;
+ 
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ if (JS_ToIndex(ctx, &pos, argv[2]))
+ return JS_EXCEPTION;
+ if (JS_ToIndex(ctx, &len, argv[3]))
+ return JS_EXCEPTION;
+ buf = JS_GetArrayBuffer(ctx, &size, argv[1]);
+ if (!buf)
+ return JS_EXCEPTION;
+ if (pos + len > size)
+ return JS_ThrowRangeError(ctx, "read/write array buffer overflow");
+
+#ifdef _MSC_VER
+	if (magic)
+		ret = js_get_errno(write(fd, buf + pos, (unsigned int) len));
+	else
+		ret = js_get_errno(read(fd, buf + pos, (unsigned int) len));
+#else
+	if (magic)
+ ret = js_get_errno(write(fd, buf + pos, len));
+ else
+ ret = js_get_errno(read(fd, buf + pos, len));
+#endif
+	return JS_NewInt64(ctx, ret);
+}
+
+static JSValue js_os_isatty(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int fd;
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ return JS_NewBool(ctx, (isatty(fd) != 0));
+}
+
+#if defined(_WIN32)
+static JSValue js_os_ttyGetWinSize(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int fd;
+ HANDLE handle;
+ CONSOLE_SCREEN_BUFFER_INFO info;
+ JSValue obj;
+
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ handle = (HANDLE)_get_osfhandle(fd);
+ 
+ if (!GetConsoleScreenBufferInfo(handle, &info))
+ return JS_NULL;
+ obj = JS_NewArray(ctx);
+ if (JS_IsException(obj))
+ return obj;
+ JS_DefinePropertyValueUint32(ctx, obj, 0, JS_NewInt32(ctx, info.dwSize.X), JS_PROP_C_W_E);
+ JS_DefinePropertyValueUint32(ctx, obj, 1, JS_NewInt32(ctx, info.dwSize.Y), JS_PROP_C_W_E);
+ return obj;
+}
+
+/* Windows 10 built-in VT100 emulation */
+#define __ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
+#define __ENABLE_VIRTUAL_TERMINAL_INPUT 0x0200
+
+static JSValue js_os_ttySetRaw(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int fd;
+ HANDLE handle;
+
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ handle = (HANDLE)_get_osfhandle(fd);
+ SetConsoleMode(handle, ENABLE_WINDOW_INPUT | __ENABLE_VIRTUAL_TERMINAL_INPUT);
+ _setmode(fd, _O_BINARY);
+ if (fd == 0) {
+ handle = (HANDLE)_get_osfhandle(1); /* corresponding output */
+ SetConsoleMode(handle, ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT | __ENABLE_VIRTUAL_TERMINAL_PROCESSING);
+ }
+ return JS_UNDEFINED;
+}
+#else
+static JSValue js_os_ttyGetWinSize(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int fd;
+ struct winsize ws;
+ JSValue obj;
+ 
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ if (ioctl(fd, TIOCGWINSZ, &ws) == 0 &&
+ ws.ws_col >= 4 && ws.ws_row >= 4) {
+ obj = JS_NewArray(ctx);
+ if (JS_IsException(obj))
+ return obj;
+ JS_DefinePropertyValueUint32(ctx, obj, 0, JS_NewInt32(ctx, ws.ws_col), JS_PROP_C_W_E);
+ JS_DefinePropertyValueUint32(ctx, obj, 1, JS_NewInt32(ctx, ws.ws_row), JS_PROP_C_W_E);
+ return obj;
+ } else {
+ return JS_NULL;
+ }
+}
+
+static struct termios oldtty;
+
+static void term_exit(void)
+{
+ tcsetattr(0, TCSANOW, &oldtty);
+}
+
+/* XXX: should add a way to go back to normal mode */
+static JSValue js_os_ttySetRaw(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ struct termios tty;
+ int fd;
+ 
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ 
+ memset(&tty, 0, sizeof(tty));
+ tcgetattr(fd, &tty);
+ oldtty = tty;
+
+ tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP
+ |INLCR|IGNCR|ICRNL|IXON);
+ tty.c_oflag |= OPOST;
+ tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN);
+ tty.c_cflag &= ~(CSIZE|PARENB);
+ tty.c_cflag |= CS8;
+ tty.c_cc[VMIN] = 1;
+ tty.c_cc[VTIME] = 0;
+
+ tcsetattr(fd, TCSANOW, &tty);
+
+ atexit(term_exit);
+ return JS_UNDEFINED;
+}
+
+#endif /* !_WIN32 */
+
+static JSValue js_os_remove(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *filename;
+ int ret;
+ 
+ filename = JS_ToCString(ctx, argv[0]);
+ if (!filename)
+ return JS_EXCEPTION;
+#if defined(_WIN32)
+ {
+ struct stat st;
+ if (stat(filename, &st) == 0 && S_ISDIR(st.st_mode)) {
+ ret = rmdir(filename);
+ } else {
+ ret = unlink(filename);
+ }
+ }
+#else
+ ret = remove(filename);
+#endif
+ ret = (int) js_get_errno(ret);
+ JS_FreeCString(ctx, filename);
+ return JS_NewInt32(ctx, ret);
+}
+
+static JSValue js_os_rename(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *oldpath, *newpath;
+ int ret;
+ 
+ oldpath = JS_ToCString(ctx, argv[0]);
+ if (!oldpath)
+ return JS_EXCEPTION;
+ newpath = JS_ToCString(ctx, argv[1]);
+ if (!newpath) {
+ JS_FreeCString(ctx, oldpath);
+ return JS_EXCEPTION;
+ }
+ ret = (int) js_get_errno(rename(oldpath, newpath));
+ JS_FreeCString(ctx, oldpath);
+ JS_FreeCString(ctx, newpath);
+ return JS_NewInt32(ctx, ret);
+}
+
+static BOOL is_main_thread(JSRuntime *rt)
+{
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ return !ts->recv_pipe;
+}
+
+static JSOSRWHandler *find_rh(JSThreadState *ts, int fd)
+{
+ JSOSRWHandler *rh;
+ struct list_head *el;
+
+ list_for_each(el, &ts->os_rw_handlers) {
+ rh = list_entry(el, JSOSRWHandler, link);
+ if (rh->fd == fd)
+ return rh;
+ }
+ return NULL;
+}
+
+static void free_rw_handler(JSRuntime *rt, JSOSRWHandler *rh)
+{
+ int i;
+ list_del(&rh->link);
+ for(i = 0; i < 2; i++) {
+ JS_FreeValueRT(rt, rh->rw_func[i]);
+ }
+ js_free_rt(rt, rh);
+}
+
+static JSValue js_os_setReadHandler(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv, int magic)
+{
+ JSRuntime *rt = JS_GetRuntime(ctx);
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ JSOSRWHandler *rh;
+ int fd;
+ JSValueConst func;
+ 
+ if (JS_ToInt32(ctx, &fd, argv[0]))
+ return JS_EXCEPTION;
+ func = argv[1];
+ if (JS_IsNull(func)) {
+ rh = find_rh(ts, fd);
+ if (rh) {
+ JS_FreeValue(ctx, rh->rw_func[magic]);
+ rh->rw_func[magic] = JS_NULL;
+ if (JS_IsNull(rh->rw_func[0]) &&
+ JS_IsNull(rh->rw_func[1])) {
+ /* remove the entry */
+ free_rw_handler(JS_GetRuntime(ctx), rh);
+ }
+ }
+ } else {
+ if (!JS_IsFunction(ctx, func))
+ return JS_ThrowTypeError(ctx, "not a function");
+ rh = find_rh(ts, fd);
+ if (!rh) {
+ rh = js_mallocz(ctx, sizeof(*rh));
+ if (!rh)
+ return JS_EXCEPTION;
+ rh->fd = fd;
+ rh->rw_func[0] = JS_NULL;
+ rh->rw_func[1] = JS_NULL;
+ list_add_tail(&rh->link, &ts->os_rw_handlers);
+ }
+ JS_FreeValue(ctx, rh->rw_func[magic]);
+ rh->rw_func[magic] = JS_DupValue(ctx, func);
+ }
+ return JS_UNDEFINED;
+}
+
+static JSOSSignalHandler *find_sh(JSThreadState *ts, int sig_num)
+{
+ JSOSSignalHandler *sh;
+ struct list_head *el;
+ list_for_each(el, &ts->os_signal_handlers) {
+ sh = list_entry(el, JSOSSignalHandler, link);
+ if (sh->sig_num == sig_num)
+ return sh;
+ }
+ return NULL;
+}
+
+static void free_sh(JSRuntime *rt, JSOSSignalHandler *sh)
+{
+ list_del(&sh->link);
+ JS_FreeValueRT(rt, sh->func);
+ js_free_rt(rt, sh);
+}
+
+static void os_signal_handler(int sig_num)
+{
+ os_pending_signals |= ((uint64_t)1 << sig_num);
+}
+
+#if defined(_WIN32)
+typedef void (*mysighandler_t)(int sig_num);
+#endif
+
+static JSValue js_os_signal(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSRuntime *rt = JS_GetRuntime(ctx);
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ JSOSSignalHandler *sh;
+ uint32_t sig_num;
+ JSValueConst func;
+ mysighandler_t handler;
+
+ if (!is_main_thread(rt))
+ return JS_ThrowTypeError(ctx, "signal handler can only be set in the main thread");
+ 
+ if (JS_ToUint32(ctx, &sig_num, argv[0]))
+ return JS_EXCEPTION;
+ if (sig_num >= 64)
+ return JS_ThrowRangeError(ctx, "invalid signal number");
+ func = argv[1];
+ /* func = null: SIG_DFL, func = undefined, SIG_IGN */
+ if (JS_IsNull(func) || JS_IsUndefined(func)) {
+ sh = find_sh(ts, sig_num);
+ if (sh) {
+ free_sh(JS_GetRuntime(ctx), sh);
+ }
+ if (JS_IsNull(func))
+ handler = SIG_DFL;
+ else
+ handler = SIG_IGN;
+ signal(sig_num, handler);
+ } else {
+ if (!JS_IsFunction(ctx, func))
+ return JS_ThrowTypeError(ctx, "not a function");
+ sh = find_sh(ts, sig_num);
+ if (!sh) {
+ sh = js_mallocz(ctx, sizeof(*sh));
+ if (!sh)
+ return JS_EXCEPTION;
+ sh->sig_num = sig_num;
+ list_add_tail(&sh->link, &ts->os_signal_handlers);
+ }
+ JS_FreeValue(ctx, sh->func);
+ sh->func = JS_DupValue(ctx, func);
+ signal(sig_num, os_signal_handler);
+ }
+ return JS_UNDEFINED;
+}
+
+#if defined(__linux__) || defined(__APPLE__)
+static int64_t get_time_ms(void)
+{
+ struct timespec ts;
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ return (uint64_t)ts.tv_sec * 1000 + (ts.tv_nsec / 1000000);
+}
+#elif defined(_WIN32) && defined(_MSC_VER)
+/* more portable, but does not work if the date is updated */
+static int64_t get_time_ms(void)
+{
+	struct _timeb tb;
+
+	_ftime(&tb);
+	return (int64_t)tb.time * 1000 + (tb.millitm);
+
+}
+
+#else
+/* more portable, but does not work if the date is updated */
+static int64_t get_time_ms(void)
+{
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return (int64_t)tv.tv_sec * 1000 + (tv.tv_usec / 1000);
+}
+#endif
+
+static void unlink_timer(JSRuntime *rt, JSOSTimer *th)
+{
+ if (th->link.prev) {
+ list_del(&th->link);
+ th->link.prev = th->link.next = NULL;
+ }
+}
+
+static void free_timer(JSRuntime *rt, JSOSTimer *th)
+{
+ JS_FreeValueRT(rt, th->func);
+ js_free_rt(rt, th);
+}
+
+static JSClassID js_os_timer_class_id;
+
+static void js_os_timer_finalizer(JSRuntime *rt, JSValue val)
+{
+ JSOSTimer *th = JS_GetOpaque(val, js_os_timer_class_id);
+ if (th) {
+ th->has_object = FALSE;
+ if (!th->link.prev)
+ free_timer(rt, th);
+ }
+}
+
+static void js_os_timer_mark(JSRuntime *rt, JSValueConst val,
+ JS_MarkFunc *mark_func)
+{
+ JSOSTimer *th = JS_GetOpaque(val, js_os_timer_class_id);
+ if (th) {
+ JS_MarkValue(rt, th->func, mark_func);
+ }
+}
+
+static JSValue js_os_setTimeout(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSRuntime *rt = JS_GetRuntime(ctx);
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ int64_t delay;
+ JSValueConst func;
+ JSOSTimer *th;
+ JSValue obj;
+
+ func = argv[0];
+ if (!JS_IsFunction(ctx, func))
+ return JS_ThrowTypeError(ctx, "not a function");
+ if (JS_ToInt64(ctx, &delay, argv[1]))
+ return JS_EXCEPTION;
+ obj = JS_NewObjectClass(ctx, js_os_timer_class_id);
+ if (JS_IsException(obj))
+ return obj;
+ th = js_mallocz(ctx, sizeof(*th));
+ if (!th) {
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+ }
+ th->has_object = TRUE;
+ th->timeout = get_time_ms() + delay;
+ th->func = JS_DupValue(ctx, func);
+ list_add_tail(&th->link, &ts->os_timers);
+ JS_SetOpaque(obj, th);
+ return obj;
+}
+
+static JSValue js_os_clearTimeout(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSOSTimer *th = JS_GetOpaque2(ctx, argv[0], js_os_timer_class_id);
+ if (!th)
+ return JS_EXCEPTION;
+ unlink_timer(JS_GetRuntime(ctx), th);
+ return JS_UNDEFINED;
+}
+
+static JSClassDef js_os_timer_class = {
+ "OSTimer",
+ .finalizer = js_os_timer_finalizer,
+ .gc_mark = js_os_timer_mark,
+}; 
+
+static void call_handler(JSContext *ctx, JSValueConst func)
+{
+ JSValue ret, func1;
+ /* 'func' might be destroyed when calling itself (if it frees the
+ handler), so must take extra care */
+ func1 = JS_DupValue(ctx, func);
+ ret = JS_Call(ctx, func1, JS_UNDEFINED, 0, NULL);
+ JS_FreeValue(ctx, func1);
+ if (JS_IsException(ret))
+ js_std_dump_error(ctx);
+ JS_FreeValue(ctx, ret);
+}
+
+
+#ifdef USE_WORKER
+
+static void js_free_message(JSWorkerMessage *msg);
+
+/* return 1 if a message was handled, 0 if no message */
+static int handle_posted_message(JSRuntime *rt, JSContext *ctx,
+	JSWorkerMessageHandler *port)
+{
+	JSWorkerMessagePipe *ps = port->recv_pipe;
+	int ret;
+	struct list_head *el;
+	JSWorkerMessage *msg;
+	JSValue obj, data_obj, func, retval;
+
+	gf_mx_p(ps->mutex);
+	if (!list_empty(&ps->msg_queue)) {
+		el = ps->msg_queue.next;
+		msg = list_entry(el, JSWorkerMessage, link);
+
+		/* remove the message from the queue */
+		list_del(&msg->link);
+
+		if (list_empty(&ps->msg_queue)) {
+			uint8_t buf[16];
+			int ret;
+			for (;;) {
+				ret = read(ps->read_fd, buf, sizeof(buf));
+				if (ret >= 0)
+					break;
+				if (errno != EAGAIN && errno != EINTR)
+					break;
+			}
+		}
+
+		gf_mx_v(ps->mutex);
+
+		data_obj = JS_ReadObject(ctx, msg->data, msg->data_len,
+			JS_READ_OBJ_SAB | JS_READ_OBJ_REFERENCE);
+
+		js_free_message(msg);
+
+		if (JS_IsException(data_obj))
+			goto fail;
+		obj = JS_NewObject(ctx);
+		if (JS_IsException(obj)) {
+			JS_FreeValue(ctx, data_obj);
+			goto fail;
+		}
+		JS_DefinePropertyValueStr(ctx, obj, "data", data_obj, JS_PROP_C_W_E);
+
+		/* 'func' might be destroyed when calling itself (if it frees the
+		handler), so must take extra care */
+		func = JS_DupValue(ctx, port->on_message_func);
+		retval = JS_Call(ctx, func, JS_UNDEFINED, 1, (JSValueConst *)&obj);
+		JS_FreeValue(ctx, obj);
+		JS_FreeValue(ctx, func);
+		if (JS_IsException(retval)) {
+		fail:
+			js_std_dump_error(ctx);
+		}
+		else {
+			JS_FreeValue(ctx, retval);
+		}
+		ret = 1;
+	}
+	else {
+		gf_mx_v(ps->mutex);
+		ret = 0;
+	}
+	return ret;
+}
+#else
+static int handle_posted_message(JSRuntime *rt, JSContext *ctx,
+	JSWorkerMessageHandler *port)
+{
+	return 0;
+}
+#endif
+
+#if defined(_WIN32)
+
+static int js_os_poll(JSContext *ctx)
+{
+ JSRuntime *rt = JS_GetRuntime(ctx);
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ int min_delay, console_fd;
+ int64_t cur_time, delay;
+ JSOSRWHandler *rh;
+ struct list_head *el;
+ 
+ /* XXX: handle signals if useful */
+
+ if (list_empty(&ts->os_rw_handlers) && list_empty(&ts->os_timers) && list_empty(&ts->port_list))
+		return -1; /* no more events */
+ 
+ /* XXX: only timers and basic console input are supported */
+ if (!list_empty(&ts->os_timers)) {
+ cur_time = get_time_ms();
+ min_delay = 10000;
+ list_for_each(el, &ts->os_timers) {
+ JSOSTimer *th = list_entry(el, JSOSTimer, link);
+ delay = th->timeout - cur_time;
+ if (delay <= 0) {
+ JSValue func;
+ /* the timer expired */
+ func = th->func;
+ th->func = JS_UNDEFINED;
+ unlink_timer(rt, th);
+ if (!th->has_object)
+ free_timer(rt, th);
+ call_handler(ctx, func);
+ JS_FreeValue(ctx, func);
+ return 0;
+ } else if (delay < min_delay) {
+ min_delay = (int) delay;
+ }
+ }
+ } else {
+ min_delay = -1;
+ }
+
+ console_fd = -1;
+ list_for_each(el, &ts->os_rw_handlers) {
+ rh = list_entry(el, JSOSRWHandler, link);
+ if (rh->fd == 0 && !JS_IsNull(rh->rw_func[0])) {
+ console_fd = rh->fd;
+ break;
+ }
+ }
+
+	list_for_each(el, &ts->port_list) {
+		JSWorkerMessageHandler *port = list_entry(el, JSWorkerMessageHandler, link);
+		if (!JS_IsNull(port->on_message_func)) {
+			JSWorkerMessagePipe *ps = port->recv_pipe;
+			gf_mx_p(ps->mutex);
+			if (!list_empty(&ps->msg_queue)) {
+				console_fd = ps->read_fd;
+				gf_mx_v(ps->mutex);
+				break;
+			}
+			gf_mx_v(ps->mutex);
+		}
+	}
+
+ if (console_fd >= 0) {
+ DWORD ti, ret;
+ HANDLE handle;
+ if (min_delay == -1)
+ ti = INFINITE;
+ else
+ ti = min_delay;
+ handle = (HANDLE)_get_osfhandle(console_fd);
+ ret = WaitForSingleObject(handle, ti);
+ if (ret == WAIT_OBJECT_0) {
+ list_for_each(el, &ts->os_rw_handlers) {
+ rh = list_entry(el, JSOSRWHandler, link);
+ if (rh->fd == console_fd && !JS_IsNull(rh->rw_func[0])) {
+ call_handler(ctx, rh->rw_func[0]);
+ /* must stop because the list may have been modified */
+ break;
+ }
+ }
+
+			list_for_each(el, &ts->port_list) {
+				JSWorkerMessageHandler *port = list_entry(el, JSWorkerMessageHandler, link);
+				if (!JS_IsNull(port->on_message_func)) {
+					JSWorkerMessagePipe *ps = port->recv_pipe;
+					if (ps->read_fd == console_fd) {
+						if (handle_posted_message(rt, ctx, port))
+							break;
+					}
+				}
+			}
+		}
+	}
+	//do not block if main thread !
+	else if (!ts->recv_pipe || ts->terminated) {
+		return -1;
+ }
+ return 0;
+}
+#else
+
+
+static int js_os_poll(JSContext *ctx)
+{
+ JSRuntime *rt = JS_GetRuntime(ctx);
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ int ret, fd_max, min_delay;
+ int64_t cur_time, delay;
+ fd_set rfds, wfds;
+ JSOSRWHandler *rh;
+ struct list_head *el;
+ struct timeval tv, *tvp;
+
+ /* only check signals in the main thread */
+ if (!ts->recv_pipe &&
+ unlikely(os_pending_signals != 0)) {
+ JSOSSignalHandler *sh;
+ uint64_t mask;
+ 
+ list_for_each(el, &ts->os_signal_handlers) {
+ sh = list_entry(el, JSOSSignalHandler, link);
+ mask = (uint64_t)1 << sh->sig_num;
+ if (os_pending_signals & mask) {
+ os_pending_signals &= ~mask;
+ call_handler(ctx, sh->func);
+ return 0;
+ }
+ }
+ }
+
+ if (list_empty(&ts->os_rw_handlers) && list_empty(&ts->os_timers) &&
+ list_empty(&ts->port_list))
+ return -1; /* no more events */
+ 
+ if (!list_empty(&ts->os_timers)) {
+ cur_time = get_time_ms();
+ min_delay = 10000;
+ list_for_each(el, &ts->os_timers) {
+ JSOSTimer *th = list_entry(el, JSOSTimer, link);
+ delay = th->timeout - cur_time;
+ if (delay <= 0) {
+ JSValue func;
+ /* the timer expired */
+ func = th->func;
+ th->func = JS_UNDEFINED;
+ unlink_timer(rt, th);
+ if (!th->has_object)
+ free_timer(rt, th);
+ call_handler(ctx, func);
+ JS_FreeValue(ctx, func);
+ return 0;
+ } else if (delay < min_delay) {
+ min_delay = delay;
+ }
+ }
+ tv.tv_sec = min_delay / 1000;
+ tv.tv_usec = (min_delay % 1000) * 1000;
+ tvp = &tv;
+ } else {
+#ifdef GPAC_HAS_QJS
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
+ tvp = &tv;
+#else
+ tvp = NULL;
+#endif
+	}
+ 
+ FD_ZERO(&rfds);
+ FD_ZERO(&wfds);
+ fd_max = -1;
+ list_for_each(el, &ts->os_rw_handlers) {
+ rh = list_entry(el, JSOSRWHandler, link);
+ fd_max = max_int(fd_max, rh->fd);
+ if (!JS_IsNull(rh->rw_func[0]))
+ FD_SET(rh->fd, &rfds);
+ if (!JS_IsNull(rh->rw_func[1]))
+ FD_SET(rh->fd, &wfds);
+ }
+
+ list_for_each(el, &ts->port_list) {
+ JSWorkerMessageHandler *port = list_entry(el, JSWorkerMessageHandler, link);
+ if (!JS_IsNull(port->on_message_func)) {
+ JSWorkerMessagePipe *ps = port->recv_pipe;
+ fd_max = max_int(fd_max, ps->read_fd);
+ FD_SET(ps->read_fd, &rfds);
+ }
+ }
+
+ ret = select(fd_max + 1, &rfds, &wfds, NULL, tvp);
+ if (ret > 0) {
+ list_for_each(el, &ts->os_rw_handlers) {
+ rh = list_entry(el, JSOSRWHandler, link);
+ if (!JS_IsNull(rh->rw_func[0]) &&
+ FD_ISSET(rh->fd, &rfds)) {
+ call_handler(ctx, rh->rw_func[0]);
+ /* must stop because the list may have been modified */
+ goto done;
+ }
+ if (!JS_IsNull(rh->rw_func[1]) &&
+ FD_ISSET(rh->fd, &wfds)) {
+ call_handler(ctx, rh->rw_func[1]);
+ /* must stop because the list may have been modified */
+ goto done;
+ }
+ }
+
+ list_for_each(el, &ts->port_list) {
+ JSWorkerMessageHandler *port = list_entry(el, JSWorkerMessageHandler, link);
+ if (!JS_IsNull(port->on_message_func)) {
+ JSWorkerMessagePipe *ps = port->recv_pipe;
+ if (FD_ISSET(ps->read_fd, &rfds)) {
+ if (handle_posted_message(rt, ctx, port))
+ goto done;
+ }
+ }
+ }
+ }
+ //do not block if main thread !
+ else if (!ts->recv_pipe || ts->terminated) {
+		return -1;
+	}
+done:
+ return 0;
+}
+#endif /* !_WIN32 */
+
+static JSValue make_obj_error(JSContext *ctx,
+ JSValue obj,
+ int err)
+{
+ JSValue arr;
+ if (JS_IsException(obj))
+ return obj;
+ arr = JS_NewArray(ctx);
+ if (JS_IsException(arr))
+ return JS_EXCEPTION;
+ JS_DefinePropertyValueUint32(ctx, arr, 0, obj,
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueUint32(ctx, arr, 1, JS_NewInt32(ctx, err),
+ JS_PROP_C_W_E);
+ return arr;
+}
+
+static JSValue make_string_error(JSContext *ctx,
+ const char *buf,
+ int err)
+{
+ return make_obj_error(ctx, JS_NewString(ctx, buf), err);
+}
+
+/* return [cwd, errorcode] */
+static JSValue js_os_getcwd(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ char buf[PATH_MAX];
+ int err;
+ 
+ if (!getcwd(buf, sizeof(buf))) {
+ buf[0] = '\0';
+ err = errno;
+ } else {
+ err = 0;
+ }
+ return make_string_error(ctx, buf, err);
+}
+
+static JSValue js_os_chdir(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *target;
+ int err;
+
+ target = JS_ToCString(ctx, argv[0]);
+ if (!target)
+ return JS_EXCEPTION;
+ err = (int) js_get_errno(chdir(target));
+ JS_FreeCString(ctx, target);
+ return JS_NewInt32(ctx, err);
+}
+
+static JSValue js_os_mkdir(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int mode, ret;
+ const char *path;
+ 
+ if (argc >= 2) {
+ if (JS_ToInt32(ctx, &mode, argv[1]))
+ return JS_EXCEPTION;
+ } else {
+ mode = 0777;
+ }
+ path = JS_ToCString(ctx, argv[0]);
+ if (!path)
+ return JS_EXCEPTION;
+#if defined(_WIN32)
+ (void)mode;
+ ret = (int) js_get_errno(mkdir(path));
+#else
+ ret = js_get_errno(mkdir(path, mode));
+#endif
+ JS_FreeCString(ctx, path);
+ return JS_NewInt32(ctx, ret);
+}
+
+/* return [array, errorcode] */
+static JSValue js_os_readdir(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+#if defined(_WIN32) && defined(_MSC_VER)
+	return JS_EXCEPTION;
+#else
+	const char *path;
+ DIR *f;
+ struct dirent *d;
+ JSValue obj;
+ int err;
+ uint32_t len;
+ 
+ path = JS_ToCString(ctx, argv[0]);
+ if (!path)
+ return JS_EXCEPTION;
+ obj = JS_NewArray(ctx);
+ if (JS_IsException(obj)) {
+ JS_FreeCString(ctx, path);
+ return JS_EXCEPTION;
+ }
+ f = opendir(path);
+ if (!f)
+ err = errno;
+ else
+ err = 0;
+ JS_FreeCString(ctx, path);
+ if (!f)
+ goto done;
+ len = 0;
+ for(;;) {
+ errno = 0;
+ d = readdir(f);
+ if (!d) {
+ err = errno;
+ break;
+ }
+ JS_DefinePropertyValueUint32(ctx, obj, len++,
+ JS_NewString(ctx, d->d_name),
+ JS_PROP_C_W_E);
+ }
+ closedir(f);
+ done:
+ return make_obj_error(ctx, obj, err);
+#endif
+}
+
+#if !defined(_WIN32)
+static int64_t timespec_to_ms(const struct timespec *tv)
+{
+ return (int64_t)tv->tv_sec * 1000 + (tv->tv_nsec / 1000000);
+}
+#endif
+
+/* return [obj, errcode] */
+static JSValue js_os_stat(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv, int is_lstat)
+{
+ const char *path;
+ int err, res;
+ struct stat st;
+ JSValue obj;
+
+ path = JS_ToCString(ctx, argv[0]);
+ if (!path)
+ return JS_EXCEPTION;
+#if defined(_WIN32)
+ res = stat(path, &st);
+#else
+ if (is_lstat)
+ res = lstat(path, &st);
+ else
+ res = stat(path, &st);
+#endif
+ JS_FreeCString(ctx, path);
+ if (res < 0) {
+ err = errno;
+ obj = JS_NULL;
+ } else {
+ err = 0;
+ obj = JS_NewObject(ctx);
+ if (JS_IsException(obj))
+ return JS_EXCEPTION;
+ JS_DefinePropertyValueStr(ctx, obj, "dev",
+ JS_NewInt64(ctx, st.st_dev),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "ino",
+ JS_NewInt64(ctx, st.st_ino),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "mode",
+ JS_NewInt32(ctx, st.st_mode),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "nlink",
+ JS_NewInt64(ctx, st.st_nlink),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "uid",
+ JS_NewInt64(ctx, st.st_uid),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "gid",
+ JS_NewInt64(ctx, st.st_gid),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "rdev",
+ JS_NewInt64(ctx, st.st_rdev),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "size",
+ JS_NewInt64(ctx, st.st_size),
+ JS_PROP_C_W_E);
+#if !defined(_WIN32)
+ JS_DefinePropertyValueStr(ctx, obj, "blocks",
+ JS_NewInt64(ctx, st.st_blocks),
+ JS_PROP_C_W_E);
+#endif
+#if defined(_WIN32)
+ JS_DefinePropertyValueStr(ctx, obj, "atime",
+ JS_NewInt64(ctx, (int64_t)st.st_atime * 1000),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "mtime",
+ JS_NewInt64(ctx, (int64_t)st.st_mtime * 1000),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "ctime",
+ JS_NewInt64(ctx, (int64_t)st.st_ctime * 1000),
+ JS_PROP_C_W_E);
+#elif defined(__APPLE__)
+ JS_DefinePropertyValueStr(ctx, obj, "atime",
+ JS_NewInt64(ctx, timespec_to_ms(&st.st_atimespec)),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "mtime",
+ JS_NewInt64(ctx, timespec_to_ms(&st.st_mtimespec)),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "ctime",
+ JS_NewInt64(ctx, timespec_to_ms(&st.st_ctimespec)),
+ JS_PROP_C_W_E);
+#else
+ JS_DefinePropertyValueStr(ctx, obj, "atime",
+ JS_NewInt64(ctx, timespec_to_ms(&st.st_atim)),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "mtime",
+ JS_NewInt64(ctx, timespec_to_ms(&st.st_mtim)),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueStr(ctx, obj, "ctime",
+ JS_NewInt64(ctx, timespec_to_ms(&st.st_ctim)),
+ JS_PROP_C_W_E);
+#endif
+ }
+ return make_obj_error(ctx, obj, err);
+}
+
+#if !defined(_WIN32)
+static void ms_to_timeval(struct timeval *tv, uint64_t v)
+{
+ tv->tv_sec = v / 1000;
+ tv->tv_usec = (v % 1000) * 1000;
+}
+#endif
+
+static JSValue js_os_utimes(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *path;
+ int64_t atime, mtime;
+ int ret;
+ 
+ if (JS_ToInt64(ctx, &atime, argv[1]))
+ return JS_EXCEPTION;
+ if (JS_ToInt64(ctx, &mtime, argv[2]))
+ return JS_EXCEPTION;
+ path = JS_ToCString(ctx, argv[0]);
+ if (!path)
+ return JS_EXCEPTION;
+#if defined(_WIN32)
+ {
+ struct _utimbuf times;
+ times.actime = atime / 1000;
+ times.modtime = mtime / 1000;
+ ret = (int) js_get_errno(_utime(path, &times));
+ }
+#else
+ {
+ struct timeval times[2];
+ ms_to_timeval(&times[0], atime);
+ ms_to_timeval(&times[1], mtime);
+ ret = js_get_errno(utimes(path, times));
+ }
+#endif
+ JS_FreeCString(ctx, path);
+ return JS_NewInt32(ctx, ret);
+}
+
+/* sleep(delay_ms) */
+static JSValue js_os_sleep(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int64_t delay;
+ int ret;
+ 
+ if (JS_ToInt64(ctx, &delay, argv[0]))
+ return JS_EXCEPTION;
+ if (delay < 0)
+ delay = 0;
+#if defined(_WIN32)
+ {
+ if (delay > INT32_MAX)
+ delay = INT32_MAX;
+ Sleep((DWORD) delay);
+ ret = 0;
+ }
+#else
+ {
+ struct timespec ts;
+
+ ts.tv_sec = delay / 1000;
+ ts.tv_nsec = (delay % 1000) * 1000000;
+ ret = js_get_errno(nanosleep(&ts, NULL));
+ }
+#endif
+ return JS_NewInt32(ctx, ret);
+}
+
+#if defined(_WIN32)
+static char *realpath(const char *path, char *buf)
+{
+ if (!_fullpath(buf, path, PATH_MAX)) {
+ errno = ENOENT;
+ return NULL;
+ } else {
+ return buf;
+ }
+}
+#endif
+
+/* return [path, errorcode] */
+static JSValue js_os_realpath(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *path;
+ char buf[PATH_MAX], *res;
+ int err;
+
+ path = JS_ToCString(ctx, argv[0]);
+ if (!path)
+ return JS_EXCEPTION;
+ res = realpath(path, buf);
+ JS_FreeCString(ctx, path);
+ if (!res) {
+ buf[0] = '\0';
+ err = errno;
+ } else {
+ err = 0;
+ }
+ return make_string_error(ctx, buf, err);
+}
+
+#if !defined(_WIN32)
+static JSValue js_os_symlink(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *target, *linkpath;
+ int err;
+ 
+ target = JS_ToCString(ctx, argv[0]);
+ if (!target)
+ return JS_EXCEPTION;
+ linkpath = JS_ToCString(ctx, argv[1]);
+ if (!linkpath) {
+ JS_FreeCString(ctx, target);
+ return JS_EXCEPTION;
+ }
+ err = js_get_errno(symlink(target, linkpath));
+ JS_FreeCString(ctx, target);
+ JS_FreeCString(ctx, linkpath);
+ return JS_NewInt32(ctx, err);
+}
+
+/* return [path, errorcode] */
+static JSValue js_os_readlink(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ const char *path;
+ char buf[PATH_MAX];
+ int err;
+ ssize_t res;
+ 
+ path = JS_ToCString(ctx, argv[0]);
+ if (!path)
+ return JS_EXCEPTION;
+ res = readlink(path, buf, sizeof(buf) - 1);
+ if (res < 0) {
+ buf[0] = '\0';
+ err = errno;
+ } else {
+ buf[res] = '\0';
+ err = 0;
+ }
+ JS_FreeCString(ctx, path);
+ return make_string_error(ctx, buf, err);
+}
+
+static char **build_envp(JSContext *ctx, JSValueConst obj)
+{
+ uint32_t len, i;
+ JSPropertyEnum *tab;
+ char **envp, *pair;
+ const char *key, *str;
+ JSValue val;
+ size_t key_len, str_len;
+ 
+ if (JS_GetOwnPropertyNames(ctx, &tab, &len, obj,
+ JS_GPN_STRING_MASK | JS_GPN_ENUM_ONLY) < 0)
+ return NULL;
+ envp = js_mallocz(ctx, sizeof(envp[0]) * ((size_t)len + 1));
+ if (!envp)
+ goto fail;
+ for(i = 0; i < len; i++) {
+ val = JS_GetProperty(ctx, obj, tab[i].atom);
+ if (JS_IsException(val))
+ goto fail;
+ str = JS_ToCString(ctx, val);
+ JS_FreeValue(ctx, val);
+ if (!str)
+ goto fail;
+ key = JS_AtomToCString(ctx, tab[i].atom);
+ if (!key) {
+ JS_FreeCString(ctx, str);
+ goto fail;
+ }
+ key_len = strlen(key);
+ str_len = strlen(str);
+ pair = js_malloc(ctx, key_len + str_len + 2);
+ if (!pair) {
+ JS_FreeCString(ctx, key);
+ JS_FreeCString(ctx, str);
+ goto fail;
+ }
+ memcpy(pair, key, key_len);
+ pair[key_len] = '=';
+ memcpy(pair + key_len + 1, str, str_len);
+ pair[key_len + 1 + str_len] = '\0';
+ envp[i] = pair;
+ JS_FreeCString(ctx, key);
+ JS_FreeCString(ctx, str);
+ }
+ done:
+ for(i = 0; i < len; i++)
+ JS_FreeAtom(ctx, tab[i].atom);
+ js_free(ctx, tab);
+ return envp;
+ fail:
+ if (envp) {
+ for(i = 0; i < len; i++)
+ js_free(ctx, envp[i]);
+ js_free(ctx, envp);
+ envp = NULL;
+ }
+ goto done;
+}
+
+/* execvpe is not available on non GNU systems */
+static int my_execvpe(const char *filename, char **argv, char **envp)
+{
+ char *path, *p, *p_next, *p1;
+ char buf[PATH_MAX];
+ size_t filename_len, path_len;
+ BOOL eacces_error;
+ 
+ filename_len = strlen(filename);
+ if (filename_len == 0) {
+ errno = ENOENT;
+ return -1;
+ }
+ if (strchr(filename, '/'))
+ return execve(filename, argv, envp);
+ 
+ path = getenv("PATH");
+ if (!path)
+ path = (char *)"/bin:/usr/bin";
+ eacces_error = FALSE;
+ p = path;
+ for(p = path; p != NULL; p = p_next) {
+ p1 = strchr(p, ':');
+ if (!p1) {
+ p_next = NULL;
+ path_len = strlen(p);
+ } else {
+ p_next = p1 + 1;
+ path_len = p1 - p;
+ }
+ /* path too long */
+ if ((path_len + 1 + filename_len + 1) > PATH_MAX)
+ continue;
+ memcpy(buf, p, path_len);
+ buf[path_len] = '/';
+ memcpy(buf + path_len + 1, filename, filename_len);
+ buf[path_len + 1 + filename_len] = '\0';
+ 
+ execve(buf, argv, envp);
+
+ switch(errno) {
+ case EACCES:
+ eacces_error = TRUE;
+ break;
+ case ENOENT:
+ case ENOTDIR:
+ break;
+ default:
+ return -1;
+ }
+ }
+ if (eacces_error)
+ errno = EACCES;
+ return -1;
+}
+
+/* exec(args[, options]) -> exitcode */
+static JSValue js_os_exec(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSValueConst options, args = argv[0];
+ JSValue val, ret_val;
+ const char **exec_argv, *file = NULL, *str, *cwd = NULL;
+ char **envp = environ;
+ uint32_t exec_argc, i;
+ int ret, pid, status;
+ BOOL block_flag = TRUE, use_path = TRUE;
+ static const char *std_name[3] = { "stdin", "stdout", "stderr" };
+ int std_fds[3];
+ uint32_t uid = -1, gid = -1;
+ 
+ val = JS_GetPropertyStr(ctx, args, "length");
+ if (JS_IsException(val))
+ return JS_EXCEPTION;
+ ret = JS_ToUint32(ctx, &exec_argc, val);
+ JS_FreeValue(ctx, val);
+ if (ret)
+ return JS_EXCEPTION;
+ /* arbitrary limit to avoid overflow */
+ if (exec_argc < 1 || exec_argc > 65535) {
+ return JS_ThrowTypeError(ctx, "invalid number of arguments");
+ }
+ exec_argv = js_mallocz(ctx, sizeof(exec_argv[0]) * (exec_argc + 1));
+ if (!exec_argv)
+ return JS_EXCEPTION;
+ for(i = 0; i < exec_argc; i++) {
+ val = JS_GetPropertyUint32(ctx, args, i);
+ if (JS_IsException(val))
+ goto exception;
+ str = JS_ToCString(ctx, val);
+ JS_FreeValue(ctx, val);
+ if (!str)
+ goto exception;
+ exec_argv[i] = str;
+ }
+ exec_argv[exec_argc] = NULL;
+
+ for(i = 0; i < 3; i++)
+ std_fds[i] = i;
+ 
+ /* get the options, if any */
+ if (argc >= 2) {
+ options = argv[1];
+
+ if (get_bool_option(ctx, &block_flag, options, "block"))
+ goto exception;
+ if (get_bool_option(ctx, &use_path, options, "usePath"))
+ goto exception;
+ 
+ val = JS_GetPropertyStr(ctx, options, "file");
+ if (JS_IsException(val))
+ goto exception;
+ if (!JS_IsUndefined(val)) {
+ file = JS_ToCString(ctx, val);
+ JS_FreeValue(ctx, val);
+ if (!file)
+ goto exception;
+ }
+
+ val = JS_GetPropertyStr(ctx, options, "cwd");
+ if (JS_IsException(val))
+ goto exception;
+ if (!JS_IsUndefined(val)) {
+ cwd = JS_ToCString(ctx, val);
+ JS_FreeValue(ctx, val);
+ if (!cwd)
+ goto exception;
+ }
+
+ /* stdin/stdout/stderr handles */
+ for(i = 0; i < 3; i++) {
+ val = JS_GetPropertyStr(ctx, options, std_name[i]);
+ if (JS_IsException(val))
+ goto exception;
+ if (!JS_IsUndefined(val)) {
+ int fd;
+ ret = JS_ToInt32(ctx, &fd, val);
+ JS_FreeValue(ctx, val);
+ if (ret)
+ goto exception;
+ std_fds[i] = fd;
+ }
+ }
+
+ val = JS_GetPropertyStr(ctx, options, "env");
+ if (JS_IsException(val))
+ goto exception;
+ if (!JS_IsUndefined(val)) {
+ envp = build_envp(ctx, val);
+ JS_FreeValue(ctx, val);
+ if (!envp)
+ goto exception;
+ }
+ 
+ val = JS_GetPropertyStr(ctx, options, "uid");
+ if (JS_IsException(val))
+ goto exception;
+ if (!JS_IsUndefined(val)) {
+ ret = JS_ToUint32(ctx, &uid, val);
+ JS_FreeValue(ctx, val);
+ if (ret)
+ goto exception;
+ }
+
+ val = JS_GetPropertyStr(ctx, options, "gid");
+ if (JS_IsException(val))
+ goto exception;
+ if (!JS_IsUndefined(val)) {
+ ret = JS_ToUint32(ctx, &gid, val);
+ JS_FreeValue(ctx, val);
+ if (ret)
+ goto exception;
+ }
+ }
+
+ pid = fork();
+ if (pid < 0) {
+ JS_ThrowTypeError(ctx, "fork error");
+ goto exception;
+ }
+ if (pid == 0) {
+ /* child */
+ int fd_max = sysconf(_SC_OPEN_MAX);
+
+ /* remap the stdin/stdout/stderr handles if necessary */
+ for(i = 0; i < 3; i++) {
+ if (std_fds[i] != i) {
+ if (dup2(std_fds[i], i) < 0)
+ _exit(127);
+ }
+ }
+
+ for(i = 3; i < fd_max; i++)
+ close(i);
+ if (cwd) {
+ if (chdir(cwd) < 0)
+ _exit(127);
+ }
+ if (uid != -1) {
+ if (setuid(uid) < 0)
+ _exit(127);
+ }
+ if (gid != -1) {
+ if (setgid(gid) < 0)
+ _exit(127);
+ }
+
+ if (!file)
+ file = exec_argv[0];
+ if (use_path)
+ ret = my_execvpe(file, (char **)exec_argv, envp);
+ else
+ ret = execve(file, (char **)exec_argv, envp);
+ _exit(127);
+ }
+ /* parent */
+ if (block_flag) {
+ for(;;) {
+ ret = waitpid(pid, &status, 0);
+ if (ret == pid) {
+ if (WIFEXITED(status)) {
+ ret = WEXITSTATUS(status);
+ break;
+ } else if (WIFSIGNALED(status)) {
+ ret = -WTERMSIG(status);
+ break;
+ }
+ }
+ }
+ } else {
+ ret = pid;
+ }
+ ret_val = JS_NewInt32(ctx, ret);
+ done:
+ JS_FreeCString(ctx, file);
+ JS_FreeCString(ctx, cwd);
+ for(i = 0; i < exec_argc; i++)
+ JS_FreeCString(ctx, exec_argv[i]);
+ js_free(ctx, exec_argv);
+ if (envp != environ) {
+ char **p;
+ p = envp;
+ while (*p != NULL) {
+ js_free(ctx, *p);
+ p++;
+ }
+ js_free(ctx, envp);
+ }
+ return ret_val;
+ exception:
+ ret_val = JS_EXCEPTION;
+ goto done;
+}
+
+/* waitpid(pid, block) -> [pid, status] */
+static JSValue js_os_waitpid(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int pid, status, options, ret;
+ JSValue obj;
+ 
+ if (JS_ToInt32(ctx, &pid, argv[0]))
+ return JS_EXCEPTION;
+ if (JS_ToInt32(ctx, &options, argv[1]))
+ return JS_EXCEPTION;
+
+ ret = waitpid(pid, &status, options);
+ if (ret < 0) {
+ ret = -errno;
+ status = 0;
+ }
+
+ obj = JS_NewArray(ctx);
+ if (JS_IsException(obj))
+ return obj;
+ JS_DefinePropertyValueUint32(ctx, obj, 0, JS_NewInt32(ctx, ret),
+ JS_PROP_C_W_E);
+ JS_DefinePropertyValueUint32(ctx, obj, 1, JS_NewInt32(ctx, status),
+ JS_PROP_C_W_E);
+ return obj;
+} 
+
+/* kill(pid, sig) */
+static JSValue js_os_kill(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int pid, sig, ret;
+ 
+ if (JS_ToInt32(ctx, &pid, argv[0]))
+ return JS_EXCEPTION;
+ if (JS_ToInt32(ctx, &sig, argv[1]))
+ return JS_EXCEPTION;
+ ret = js_get_errno(kill(pid, sig));
+ return JS_NewInt32(ctx, ret);
+}
+
+#else //_WIN32
+
+static char *build_envp_win(JSContext *ctx, JSValueConst obj)
+{
+	uint32_t len, i;
+	JSPropertyEnum *tab;
+	char *envp = NULL;
+	int envp_len = 0;
+	const char *key, *str;
+	JSValue val;
+	size_t key_len, str_len;
+
+	if (JS_GetOwnPropertyNames(ctx, &tab, &len, obj, JS_GPN_STRING_MASK | JS_GPN_ENUM_ONLY) < 0)
+		return NULL;
+
+	for (i = 0; i < len; i++) {
+		val = JS_GetProperty(ctx, obj, tab[i].atom);
+		if (JS_IsException(val))
+			goto fail;
+		str = JS_ToCString(ctx, val);
+		JS_FreeValue(ctx, val);
+		if (!str)
+			goto fail;
+		key = JS_AtomToCString(ctx, tab[i].atom);
+		if (!key) {
+			JS_FreeCString(ctx, str);
+			goto fail;
+		}
+		key_len = strlen(key);
+		str_len = strlen(str);
+		envp = js_realloc(ctx, envp, envp_len + key_len + str_len + 3);
+		if (!envp) {
+			JS_FreeCString(ctx, key);
+			JS_FreeCString(ctx, str);
+			goto fail;
+		}
+		memcpy(envp + envp_len, key, key_len);
+		envp[envp_len+key_len] = '=';
+		memcpy(envp + envp_len + key_len + 1, str, str_len);
+		envp[envp_len + key_len + 1 + str_len] = '\0';
+		//prepare final \0
+		envp[envp_len + key_len + 2 + str_len] = '\0';
+		envp_len += (int) (key_len + 2 + str_len);
+
+		JS_FreeCString(ctx, key);
+		JS_FreeCString(ctx, str);
+	}
+done:
+	for (i = 0; i < len; i++)
+		JS_FreeAtom(ctx, tab[i].atom);
+	js_free(ctx, tab);
+	return envp;
+fail:
+	if (envp) {
+		js_free(ctx, envp);
+		envp = NULL;
+	}
+	goto done;
+}
+
+/* exec(args[, options]) -> exitcode */
+static JSValue js_os_exec(JSContext *ctx, JSValueConst this_val,
+	int argc, JSValueConst *argv)
+{
+	STARTUPINFO si;
+	PROCESS_INFORMATION pi;
+	JSValueConst options, args = argv[0];
+	JSValue val, ret_val;
+	char *exec_argv = NULL, *file = NULL, *cwd = NULL;
+	char *envp = NULL;
+	uint32_t exec_argc, i;
+	int ret;
+	BOOL block_flag = TRUE, use_path = TRUE;
+
+	val = JS_GetPropertyStr(ctx, args, "length");
+	if (JS_IsException(val))
+		return JS_EXCEPTION;
+	ret = JS_ToUint32(ctx, &exec_argc, val);
+	JS_FreeValue(ctx, val);
+	if (ret)
+		return JS_EXCEPTION;
+	/* arbitrary limit to avoid overflow */
+	if (exec_argc < 1 || exec_argc > 65535) {
+		return JS_ThrowTypeError(ctx, "invalid number of arguments");
+	}
+	for (i = 0; i < exec_argc; i++) {
+		char *str;
+		val = JS_GetPropertyUint32(ctx, args, i);
+		if (JS_IsException(val))
+			goto exception;
+		str = (char *) JS_ToCString(ctx, val);
+		JS_FreeValue(ctx, val);
+		if (!str)
+			goto exception;
+		gf_dynstrcat(&exec_argv, str, " ");
+		JS_FreeCString(ctx, str);
+	}
+
+	/* get the options, if any */
+	if (argc >= 2) {
+		options = argv[1];
+
+		if (get_bool_option(ctx, &block_flag, options, "block"))
+			goto exception;
+		if (get_bool_option(ctx, &use_path, options, "usePath"))
+			goto exception;
+
+		val = JS_GetPropertyStr(ctx, options, "cwd");
+		if (JS_IsException(val))
+			goto exception;
+		if (!JS_IsUndefined(val)) {
+			cwd = (char *) JS_ToCString(ctx, val);
+			JS_FreeValue(ctx, val);
+			if (!cwd)
+				goto exception;
+		}
+
+		val = JS_GetPropertyStr(ctx, options, "file");
+		if (JS_IsException(val))
+			goto exception;
+		if (!JS_IsUndefined(val)) {
+			file = (char *) JS_ToCString(ctx, val);
+			JS_FreeValue(ctx, val);
+			if (!file)
+				goto exception;
+		}
+
+		val = JS_GetPropertyStr(ctx, options, "env");
+		if (JS_IsException(val))
+			goto exception;
+		if (!JS_IsUndefined(val)) {
+			envp = build_envp_win(ctx, val);
+			JS_FreeValue(ctx, val);
+			if (!envp)
+				goto exception;
+		}
+	}
+
+	ZeroMemory(&si, sizeof(si));
+	si.cb = sizeof(si);
+	ZeroMemory(&pi, sizeof(pi));
+
+	// Start the child process. 
+	if (!CreateProcess(file, exec_argv, NULL, NULL, FALSE, 0, envp, cwd, &si, &pi)) {
+		JS_ThrowTypeError(ctx, "CreateProcess error");
+		goto exception;
+	}
+
+	/* parent */
+	if (block_flag) {
+		// Wait until child process exits.
+		WaitForSingleObject(pi.hProcess, INFINITE);
+
+		GetExitCodeProcess(pi.hProcess, &ret);
+		CloseHandle(pi.hProcess);
+		CloseHandle(pi.hThread);
+		ret_val = JS_NewInt32(ctx, ret);
+	} else {
+		ret_val = JS_NewArray(ctx);
+		if (JS_IsException(ret_val))
+			return ret_val;
+		JS_DefinePropertyValueUint32(ctx, ret_val, 0, JS_NewInt64(ctx, (int64_t) pi.hProcess), JS_PROP_C_W_E);
+		JS_DefinePropertyValueUint32(ctx, ret_val, 1, JS_NewInt64(ctx, (int64_t) pi.hThread), JS_PROP_C_W_E);
+	}
+
+done:
+	JS_FreeCString(ctx, file);
+	JS_FreeCString(ctx, cwd);
+
+	gf_free(exec_argv);
+	if (envp) js_free(ctx, envp);
+	return ret_val;
+
+exception:
+	ret_val = JS_EXCEPTION;
+	goto done;
+}
+
+/* waitpid(pid, block) -> [pid, status] */
+static JSValue js_os_waitpid(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	HANDLE hProcess, hThread;
+	int64_t lval;
+	int status, options, ret, is_over=0;
+	JSValue obj, val;
+	DWORD rval;
+	if (argc < 2) return JS_EXCEPTION;
+
+	val = JS_GetPropertyUint32(ctx, argv[0], 0);
+	if (JS_IsException(val)) return JS_EXCEPTION;
+	ret = JS_ToInt64(ctx, &lval, val);
+	JS_FreeValue(ctx, val);
+	if (ret) return JS_EXCEPTION;
+	hProcess = (HANDLE) lval;
+
+	val = JS_GetPropertyUint32(ctx, argv[0], 1);
+	if (JS_IsException(val)) return JS_EXCEPTION;
+	ret = JS_ToInt64(ctx, &lval, val);
+	JS_FreeValue(ctx, val);
+	if (ret) return JS_EXCEPTION;
+	hThread = (HANDLE)lval;
+
+	if (JS_ToInt32(ctx, &options, argv[1]))
+		return JS_EXCEPTION;
+
+	if (!hProcess || !hThread) {
+		ret = 0;
+		status = 0;
+		is_over = 1;
+	} else {
+		rval = WaitForSingleObject(hProcess, options ? 1 : INFINITE);
+		if (rval == WAIT_TIMEOUT) {
+			ret = 0;
+			status = 0;
+		}
+		else if (rval == WAIT_OBJECT_0) {
+			ret = 0;
+			GetExitCodeProcess(hProcess, &status);
+			CloseHandle(hProcess);
+			CloseHandle(hThread);
+			JS_SetPropertyUint32(ctx, argv[0], 0, JS_NewInt64(ctx, 0));
+			JS_SetPropertyUint32(ctx, argv[0], 1, JS_NewInt64(ctx, 0));
+			is_over = 1;
+		}
+		else {
+			status = GetLastError();
+		}
+	}
+	obj = JS_NewArray(ctx);
+	if (JS_IsException(obj))
+		return obj;
+	JS_DefinePropertyValueUint32(ctx, obj, 0, is_over ? JS_DupValue(ctx, argv[0]) : JS_NewInt32(ctx, ret), JS_PROP_C_W_E);
+	JS_DefinePropertyValueUint32(ctx, obj, 1, JS_NewInt32(ctx, status), JS_PROP_C_W_E);
+	return obj;
+}
+
+/* kill(pid, sig) */
+static JSValue js_os_kill(JSContext *ctx, JSValueConst this_val,
+	int argc, JSValueConst *argv)
+{
+	int sig, ret;
+	JSValue val;
+	int64_t lval;
+	HANDLE hProcess, hThread;
+
+	val = JS_GetPropertyUint32(ctx, argv[0], 0);
+	if (JS_IsException(val)) return JS_EXCEPTION;
+	ret = JS_ToInt64(ctx, &lval, val);
+	JS_FreeValue(ctx, val);
+	if (ret) return JS_EXCEPTION;
+	hProcess = (HANDLE)lval;
+	if (!hProcess) return JS_EXCEPTION;
+
+	val = JS_GetPropertyUint32(ctx, argv[0], 1);
+	if (JS_IsException(val)) return JS_EXCEPTION;
+	ret = JS_ToInt64(ctx, &lval, val);
+	JS_FreeValue(ctx, val);
+	if (ret) return JS_EXCEPTION;
+	hThread = (HANDLE)lval;
+	if (!hThread) return JS_EXCEPTION;
+
+	if (JS_ToInt32(ctx, &sig, argv[1]))
+		return JS_EXCEPTION;
+	ret = TerminateProcess(hProcess, sig);
+
+	CloseHandle(hProcess);
+	CloseHandle(hThread);
+	JS_SetPropertyUint32(ctx, argv[0], 0, JS_NewInt64(ctx, 0));
+	JS_SetPropertyUint32(ctx, argv[0], 1, JS_NewInt64(ctx, 0));
+
+	return JS_NewInt32(ctx, ret);
+}
+
+
+#endif /* !_WIN32 */
+
+/* pipe() -> [read_fd, write_fd] or null if error */
+static JSValue js_os_pipe(JSContext *ctx, JSValueConst this_val,
+	int argc, JSValueConst *argv)
+{
+	int pipe_fds[2], ret;
+	JSValue obj;
+
+	ret = pipe(pipe_fds);
+	if (ret < 0)
+		return JS_NULL;
+	obj = JS_NewArray(ctx);
+	if (JS_IsException(obj))
+		return obj;
+	JS_DefinePropertyValueUint32(ctx, obj, 0, JS_NewInt32(ctx, pipe_fds[0]),
+		JS_PROP_C_W_E);
+	JS_DefinePropertyValueUint32(ctx, obj, 1, JS_NewInt32(ctx, pipe_fds[1]),
+		JS_PROP_C_W_E);
+	return obj;
+}
+
+/* dup(fd) */
+static JSValue js_os_dup(JSContext *ctx, JSValueConst this_val,
+	int argc, JSValueConst *argv)
+{
+	int fd, ret;
+
+	if (JS_ToInt32(ctx, &fd, argv[0]))
+		return JS_EXCEPTION;
+	ret = (int) js_get_errno(dup(fd));
+	return JS_NewInt32(ctx, ret);
+}
+
+/* dup2(fd) */
+static JSValue js_os_dup2(JSContext *ctx, JSValueConst this_val,
+	int argc, JSValueConst *argv)
+{
+	int fd, fd2, ret;
+
+	if (JS_ToInt32(ctx, &fd, argv[0]))
+		return JS_EXCEPTION;
+	if (JS_ToInt32(ctx, &fd2, argv[1]))
+		return JS_EXCEPTION;
+	ret = (int) js_get_errno(dup2(fd, fd2));
+	return JS_NewInt32(ctx, ret);
+}
+
+
+#ifdef USE_WORKER
+
+/* Worker */
+
+typedef struct {
+ JSWorkerMessagePipe *recv_pipe;
+ JSWorkerMessagePipe *send_pipe;
+ JSWorkerMessageHandler *msg_handler;
+	JSThreadState *ts;
+	GF_Thread *th;
+} JSWorkerData;
+
+typedef struct {
+ char *filename; /* module filename */
+ char *basename; /* module base name */
+ JSWorkerMessagePipe *recv_pipe, *send_pipe;
+	JSWorkerData *worker;
+} WorkerFuncArgs;
+
+typedef struct {
+ int ref_count;
+ uint64_t buf[0];
+} JSSABHeader;
+
+static JSClassID js_worker_class_id;
+static JSContext *(*js_worker_new_context_func)(JSRuntime *rt);
+
+static int atomic_add_int(int *ptr, int v)
+{
+#if defined(WIN32) && !defined(__GNUC__)
+	return _InterlockedExchangeAdd((long volatile*)ptr, (long)v) + v;
+#else
+	return atomic_fetch_add((_Atomic(uint32_t) *)ptr, v) + v;
+#endif
+}
+
+/* shared array buffer allocator */
+static void *js_sab_alloc(void *opaque, size_t size)
+{
+ JSSABHeader *sab;
+ sab = malloc(sizeof(JSSABHeader) + size);
+ if (!sab)
+ return NULL;
+ sab->ref_count = 1;
+ return sab->buf;
+}
+
+static void js_sab_free(void *opaque, void *ptr)
+{
+ JSSABHeader *sab;
+ int ref_count;
+ sab = (JSSABHeader *)((uint8_t *)ptr - sizeof(JSSABHeader));
+ ref_count = atomic_add_int(&sab->ref_count, -1);
+ assert(ref_count >= 0);
+ if (ref_count == 0) {
+ free(sab);
+ }
+}
+
+static void js_sab_dup(void *opaque, void *ptr)
+{
+ JSSABHeader *sab;
+ sab = (JSSABHeader *)((uint8_t *)ptr - sizeof(JSSABHeader));
+ atomic_add_int(&sab->ref_count, 1);
+}
+
+static JSWorkerMessagePipe *js_new_message_pipe(void)
+{
+ JSWorkerMessagePipe *ps;
+ int pipe_fds[2];
+	char mxName[200];
+ 
+ if (pipe(pipe_fds) < 0)
+ return NULL;
+
+ ps = malloc(sizeof(*ps));
+ if (!ps) {
+ close(pipe_fds[0]);
+ close(pipe_fds[1]);
+ return NULL;
+ }
+ ps->ref_count = 1;
+ init_list_head(&ps->msg_queue);
+	sprintf(mxName, "Worker%pMx", ps);
+	ps->mutex = gf_mx_new(mxName);
+ ps->read_fd = pipe_fds[0];
+ ps->write_fd = pipe_fds[1];
+ return ps;
+}
+
+static JSWorkerMessagePipe *js_dup_message_pipe(JSWorkerMessagePipe *ps)
+{
+ atomic_add_int(&ps->ref_count, 1);
+ return ps;
+}
+
+static void js_free_message(JSWorkerMessage *msg)
+{
+ size_t i;
+ /* free the SAB */
+ for(i = 0; i < msg->sab_tab_len; i++) {
+ js_sab_free(NULL, msg->sab_tab[i]);
+ }
+ free(msg->sab_tab);
+ free(msg->data);
+ free(msg);
+}
+
+static void js_free_message_pipe(JSWorkerMessagePipe *ps)
+{
+ struct list_head *el, *el1;
+ JSWorkerMessage *msg;
+ int ref_count;
+ 
+ if (!ps)
+ return;
+ 
+ ref_count = atomic_add_int(&ps->ref_count, -1);
+ assert(ref_count >= 0);
+ if (ref_count == 0) {
+ list_for_each_safe(el, el1, &ps->msg_queue) {
+ msg = list_entry(el, JSWorkerMessage, link);
+ js_free_message(msg);
+ }
+ gf_mx_del(ps->mutex);
+ close(ps->read_fd);
+ close(ps->write_fd);
+ free(ps);
+ }
+}
+
+static void js_free_port(JSRuntime *rt, JSWorkerMessageHandler *port)
+{
+ if (port) {
+ js_free_message_pipe(port->recv_pipe);
+ JS_FreeValueRT(rt, port->on_message_func);
+ list_del(&port->link);
+ js_free_rt(rt, port);
+ }
+}
+
+static void js_worker_finalizer(JSRuntime *rt, JSValue val)
+{
+ JSWorkerData *worker = JS_GetOpaque(val, js_worker_class_id);
+ if (worker) {
+		js_free_message_pipe(worker->recv_pipe);
+ js_free_message_pipe(worker->send_pipe);
+ js_free_port(rt, worker->msg_handler);
+ //worker obj from parent script, indicate the worker can be terminated
+		if (worker->ts)
+			worker->ts->terminated = 1;
+ //worker obj from parent script, wait for thread exit
+ if (worker->th)
+			gf_th_del(worker->th);
+ js_free_rt(rt, worker);
+ }
+}
+
+static JSClassDef js_worker_class = {
+ "Worker",
+ .finalizer = js_worker_finalizer,
+}; 
+
+static void js_std_free_handlers_ex(JSRuntime *rt, int no_free_ts);
+
+static unsigned int worker_func(void *opaque)
+{
+ WorkerFuncArgs *args = opaque;
+ JSRuntime *rt;
+	JSWorkerData *worker;
+ JSThreadState *ts;
+ JSContext *ctx;
+ 
+ rt = JS_NewRuntime();
+ if (rt == NULL) {
+ fprintf(stderr, "JS_NewRuntime failure");
+ exit(1);
+ } 
+ js_std_init_handlers(rt);
+
+ JS_SetModuleLoaderFunc(rt, NULL, js_module_loader, NULL);
+
+ /* set the pipe to communicate with the parent */
+ ts = JS_GetRuntimeOpaque(rt);
+ ts->recv_pipe = args->recv_pipe;
+ ts->send_pipe = args->send_pipe;
+	worker = args->worker;
+	worker->ts = ts;
+
+ /* function pointer to avoid linking the whole JS_NewContext() if
+ not needed */
+ ctx = js_worker_new_context_func ? js_worker_new_context_func(rt) : NULL;
+ if (ctx == NULL) {
+ fprintf(stderr, "JS_NewContext failure");
+		js_std_free_handlers(rt);
+		JS_FreeRuntime(rt);
+		return 1;
+	}
+
+ JS_SetCanBlock(rt, TRUE);
+
+	//don't add log/pring/args in GPAC
+#ifndef GPAC_HAS_QJS
+ js_std_add_helpers(ctx, -1, NULL);
+#endif
+
+ if (!JS_RunModule(ctx, args->basename, args->filename))
+ js_std_dump_error(ctx);
+ free(args->filename);
+ free(args->basename);
+ free(args);
+
+	js_std_loop(ctx);
+	worker->ts = NULL;
+	worker->msg_handler = NULL;
+
+ JS_FreeContext(ctx);
+ //do not free JSThreadState yet, it is used to unlink ports in worker finalizer
+ js_std_free_handlers_ex(rt, 1);
+	JS_FreeRuntime(rt);
+
+ free(ts);
+ return 0;
+}
+
+static JSValue js_worker_ctor_internal(JSContext *ctx, JSValueConst new_target,
+ JSWorkerMessagePipe *recv_pipe,
+ JSWorkerMessagePipe *send_pipe)
+{
+ JSValue obj = JS_UNDEFINED, proto;
+ JSWorkerData *s;
+ 
+ /* create the object */
+ if (JS_IsUndefined(new_target)) {
+ proto = JS_GetClassProto(ctx, js_worker_class_id);
+ } else {
+ proto = JS_GetPropertyStr(ctx, new_target, "prototype");
+ if (JS_IsException(proto))
+ goto fail;
+ }
+ obj = JS_NewObjectProtoClass(ctx, proto, js_worker_class_id);
+ JS_FreeValue(ctx, proto);
+ if (JS_IsException(obj))
+ goto fail;
+ s = js_mallocz(ctx, sizeof(*s));
+ if (!s)
+ goto fail;
+ s->recv_pipe = js_dup_message_pipe(recv_pipe);
+ s->send_pipe = js_dup_message_pipe(send_pipe);
+
+ JS_SetOpaque(obj, s);
+ return obj;
+ fail:
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue js_worker_ctor(JSContext *ctx, JSValueConst new_target,
+ int argc, JSValueConst *argv)
+{
+ JSRuntime *rt = JS_GetRuntime(ctx);
+ WorkerFuncArgs *args = NULL;
+	JSValue obj = JS_UNDEFINED;
+ int ret;
+ const char *filename = NULL, *basename;
+ JSAtom basename_atom;
+ 
+ /* XXX: in order to avoid problems with resource liberation, we
+ don't support creating workers inside workers */
+ if (!is_main_thread(rt))
+ return JS_ThrowTypeError(ctx, "cannot create a worker inside a worker");
+
+ /* base name, assuming the calling function is a normal JS
+ function */
+ basename_atom = JS_GetScriptOrModuleName(ctx, 1);
+ if (basename_atom == JS_ATOM_NULL) {
+ return JS_ThrowTypeError(ctx, "could not determine calling script or module name");
+ }
+ basename = JS_AtomToCString(ctx, basename_atom);
+ JS_FreeAtom(ctx, basename_atom);
+ if (!basename)
+ goto fail;
+ 
+ /* module name */
+ filename = JS_ToCString(ctx, argv[0]);
+ if (!filename)
+ goto fail;
+
+ args = malloc(sizeof(*args));
+ if (!args)
+ goto oom_fail;
+ memset(args, 0, sizeof(*args));
+ args->filename = strdup(filename);
+	args->basename = strdup(basename);
+
+ /* ports */
+ args->recv_pipe = js_new_message_pipe();
+ if (!args->recv_pipe)
+ goto oom_fail;
+ args->send_pipe = js_new_message_pipe();
+ if (!args->send_pipe)
+ goto oom_fail;
+
+ obj = js_worker_ctor_internal(ctx, new_target,
+ args->send_pipe, args->recv_pipe);
+ if (JS_IsException(obj))
+ goto fail;
+ 
+ args->worker = JS_GetOpaque(obj, js_worker_class_id);
+ args->worker->th = gf_th_new("gf_js_worker");
+ if (!args->worker->th) {
+ goto oom_fail;
+ }
+
+	ret = gf_th_run(args->worker->th, worker_func, args);
+ if (ret != 0) {
+ JS_ThrowTypeError(ctx, "could not create worker");
+ goto fail;
+ }
+ JS_FreeCString(ctx, basename);
+ JS_FreeCString(ctx, filename);
+ return obj;
+ oom_fail:
+ JS_ThrowOutOfMemory(ctx);
+ fail:
+ JS_FreeCString(ctx, basename);
+ JS_FreeCString(ctx, filename);
+ if (args) {
+ free(args->filename);
+ free(args->basename);
+ js_free_message_pipe(args->recv_pipe);
+ js_free_message_pipe(args->send_pipe);
+ free(args);
+ }
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue js_worker_postMessage(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSWorkerData *worker = JS_GetOpaque2(ctx, this_val, js_worker_class_id);
+ JSWorkerMessagePipe *ps;
+ size_t data_len, sab_tab_len, i;
+ uint8_t *data;
+ JSWorkerMessage *msg;
+ uint8_t **sab_tab;
+ 
+ if (!worker)
+ return JS_EXCEPTION;
+ 
+ data = JS_WriteObject2(ctx, &data_len, argv[0],
+ JS_WRITE_OBJ_SAB | JS_WRITE_OBJ_REFERENCE,
+ &sab_tab, &sab_tab_len);
+ if (!data)
+ return JS_EXCEPTION;
+
+ msg = malloc(sizeof(*msg));
+ if (!msg)
+ goto fail;
+ msg->data = NULL;
+ msg->sab_tab = NULL;
+
+ /* must reallocate because the allocator may be different */
+ msg->data = malloc(data_len);
+ if (!msg->data)
+ goto fail;
+ memcpy(msg->data, data, data_len);
+ msg->data_len = data_len;
+
+ msg->sab_tab = malloc(sizeof(msg->sab_tab[0]) * sab_tab_len);
+ if (!msg->sab_tab)
+ goto fail;
+ memcpy(msg->sab_tab, sab_tab, sizeof(msg->sab_tab[0]) * sab_tab_len);
+ msg->sab_tab_len = sab_tab_len;
+
+ js_free(ctx, data);
+ js_free(ctx, sab_tab);
+ 
+ /* increment the SAB reference counts */
+ for(i = 0; i < msg->sab_tab_len; i++) {
+ js_sab_dup(NULL, msg->sab_tab[i]);
+ }
+
+ ps = worker->send_pipe;
+ gf_mx_p(ps->mutex);
+ /* indicate that data is present */
+ if (list_empty(&ps->msg_queue)) {
+ uint8_t ch = '\0';
+ int ret;
+ for(;;) {
+ ret = write(ps->write_fd, &ch, 1);
+ if (ret == 1)
+ break;
+ if (ret < 0 && (errno != EAGAIN || errno != EINTR))
+ break;
+ }
+ }
+ list_add_tail(&msg->link, &ps->msg_queue);
+ gf_mx_v(ps->mutex);
+ return JS_UNDEFINED;
+ fail:
+ if (msg) {
+ free(msg->data);
+ free(msg->sab_tab);
+ free(msg);
+ }
+ js_free(ctx, data);
+ js_free(ctx, sab_tab);
+ return JS_EXCEPTION;
+ 
+}
+
+static JSValue js_worker_set_onmessage(JSContext *ctx, JSValueConst this_val,
+ JSValueConst func)
+{
+ JSRuntime *rt = JS_GetRuntime(ctx);
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ JSWorkerData *worker = JS_GetOpaque2(ctx, this_val, js_worker_class_id);
+ JSWorkerMessageHandler *port;
+ 
+ if (!worker)
+ return JS_EXCEPTION;
+
+ port = worker->msg_handler;
+ if (JS_IsNull(func)) {
+ if (port) {
+ js_free_port(rt, port);
+ worker->msg_handler = NULL;
+ }
+ } else {
+ if (!JS_IsFunction(ctx, func))
+ return JS_ThrowTypeError(ctx, "not a function");
+ if (!port) {
+ port = js_mallocz(ctx, sizeof(*port));
+ if (!port)
+ return JS_EXCEPTION;
+ port->recv_pipe = js_dup_message_pipe(worker->recv_pipe);
+ port->on_message_func = JS_NULL;
+ list_add_tail(&port->link, &ts->port_list);
+ worker->msg_handler = port;
+ }
+ JS_FreeValue(ctx, port->on_message_func);
+ port->on_message_func = JS_DupValue(ctx, func);
+ }
+ return JS_UNDEFINED;
+}
+
+static JSValue js_worker_get_onmessage(JSContext *ctx, JSValueConst this_val)
+{
+ JSWorkerData *worker = JS_GetOpaque2(ctx, this_val, js_worker_class_id);
+ JSWorkerMessageHandler *port;
+ if (!worker)
+ return JS_EXCEPTION;
+ port = worker->msg_handler;
+ if (port) {
+ return JS_DupValue(ctx, port->on_message_func);
+ } else {
+ return JS_NULL;
+ }
+}
+
+static const JSCFunctionListEntry js_worker_proto_funcs[] = {
+ JS_CFUNC_DEF("postMessage", 1, js_worker_postMessage ),
+ JS_CGETSET_DEF("onmessage", js_worker_get_onmessage, js_worker_set_onmessage ),
+};
+
+#endif /* USE_WORKER */
+
+void js_std_set_worker_new_context_func(JSContext *(*func)(JSRuntime *rt))
+{
+#ifdef USE_WORKER
+ js_worker_new_context_func = func;
+#endif
+}
+
+#if defined(_WIN32)
+#define OS_PLATFORM "win32"
+#elif defined(__APPLE__)
+#define OS_PLATFORM "darwin"
+#elif defined(EMSCRIPTEN)
+#define OS_PLATFORM "js"
+#else
+#define OS_PLATFORM "linux"
+#endif
+
+#define OS_FLAG(x) JS_PROP_INT32_DEF(#x, x, JS_PROP_CONFIGURABLE )
+
+static const JSCFunctionListEntry js_os_funcs[] = {
+ JS_CFUNC_DEF("open", 2, js_os_open ),
+ OS_FLAG(O_RDONLY),
+ OS_FLAG(O_WRONLY),
+ OS_FLAG(O_RDWR),
+ OS_FLAG(O_APPEND),
+ OS_FLAG(O_CREAT),
+ OS_FLAG(O_EXCL),
+ OS_FLAG(O_TRUNC),
+#if defined(_WIN32)
+ OS_FLAG(O_BINARY),
+ OS_FLAG(O_TEXT),
+#endif
+ JS_CFUNC_DEF("close", 1, js_os_close ),
+ JS_CFUNC_DEF("seek", 3, js_os_seek ),
+ JS_CFUNC_MAGIC_DEF("read", 4, js_os_read_write, 0 ),
+ JS_CFUNC_MAGIC_DEF("write", 4, js_os_read_write, 1 ),
+ JS_CFUNC_DEF("isatty", 1, js_os_isatty ),
+ JS_CFUNC_DEF("ttyGetWinSize", 1, js_os_ttyGetWinSize ),
+ JS_CFUNC_DEF("ttySetRaw", 1, js_os_ttySetRaw ),
+ JS_CFUNC_DEF("remove", 1, js_os_remove ),
+ JS_CFUNC_DEF("rename", 2, js_os_rename ),
+ JS_CFUNC_MAGIC_DEF("setReadHandler", 2, js_os_setReadHandler, 0 ),
+ JS_CFUNC_MAGIC_DEF("setWriteHandler", 2, js_os_setReadHandler, 1 ),
+ JS_CFUNC_DEF("signal", 2, js_os_signal ),
+ OS_FLAG(SIGINT),
+ OS_FLAG(SIGABRT),
+ OS_FLAG(SIGFPE),
+ OS_FLAG(SIGILL),
+ OS_FLAG(SIGSEGV),
+ OS_FLAG(SIGTERM),
+#if !defined(_WIN32)
+ OS_FLAG(SIGQUIT),
+ OS_FLAG(SIGPIPE),
+ OS_FLAG(SIGALRM),
+ OS_FLAG(SIGUSR1),
+ OS_FLAG(SIGUSR2),
+ OS_FLAG(SIGCHLD),
+ OS_FLAG(SIGCONT),
+ OS_FLAG(SIGSTOP),
+ OS_FLAG(SIGTSTP),
+ OS_FLAG(SIGTTIN),
+ OS_FLAG(SIGTTOU),
+#endif
+ JS_CFUNC_DEF("setTimeout", 2, js_os_setTimeout ),
+ JS_CFUNC_DEF("clearTimeout", 1, js_os_clearTimeout ),
+ JS_PROP_STRING_DEF("platform", OS_PLATFORM, 0 ),
+ JS_CFUNC_DEF("getcwd", 0, js_os_getcwd ),
+ JS_CFUNC_DEF("chdir", 0, js_os_chdir ),
+ JS_CFUNC_DEF("mkdir", 1, js_os_mkdir ),
+ JS_CFUNC_DEF("readdir", 1, js_os_readdir ),
+ /* st_mode constants */
+ OS_FLAG(S_IFMT),
+ OS_FLAG(S_IFIFO),
+ OS_FLAG(S_IFCHR),
+ OS_FLAG(S_IFDIR),
+ OS_FLAG(S_IFBLK),
+ OS_FLAG(S_IFREG),
+#if !defined(_WIN32)
+ OS_FLAG(S_IFSOCK),
+ OS_FLAG(S_IFLNK),
+ OS_FLAG(S_ISGID),
+ OS_FLAG(S_ISUID),
+#endif
+ JS_CFUNC_MAGIC_DEF("stat", 1, js_os_stat, 0 ),
+ JS_CFUNC_DEF("utimes", 3, js_os_utimes ),
+ JS_CFUNC_DEF("sleep", 1, js_os_sleep ),
+ JS_CFUNC_DEF("realpath", 1, js_os_realpath ),
+#if !defined(_WIN32)
+ JS_CFUNC_MAGIC_DEF("lstat", 1, js_os_stat, 1 ),
+ JS_CFUNC_DEF("symlink", 2, js_os_symlink ),
+ JS_CFUNC_DEF("readlink", 1, js_os_readlink ),
+	OS_FLAG(WNOHANG),
+#else
+	JS_PROP_INT32_DEF("WNOHANG", 1, JS_PROP_CONFIGURABLE),
+#endif
+	JS_CFUNC_DEF("exec", 1, js_os_exec ),
+ JS_CFUNC_DEF("waitpid", 2, js_os_waitpid ),
+ JS_CFUNC_DEF("pipe", 0, js_os_pipe ),
+ JS_CFUNC_DEF("kill", 2, js_os_kill ),
+	JS_CFUNC_DEF("dup", 1, js_os_dup),
+	JS_CFUNC_DEF("dup2", 2, js_os_dup2),
+};
+
+static int js_os_init(JSContext *ctx, JSModuleDef *m)
+{
+ os_poll_func = js_os_poll;
+ 
+ /* OSTimer class */
+ JS_NewClassID(&js_os_timer_class_id);
+ JS_NewClass(JS_GetRuntime(ctx), js_os_timer_class_id, &js_os_timer_class);
+
+#ifdef USE_WORKER
+ {
+ JSRuntime *rt = JS_GetRuntime(ctx);
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ JSValue proto, obj;
+ /* Worker class */
+ JS_NewClassID(&js_worker_class_id);
+ JS_NewClass(JS_GetRuntime(ctx), js_worker_class_id, &js_worker_class);
+ proto = JS_NewObject(ctx);
+ JS_SetPropertyFunctionList(ctx, proto, js_worker_proto_funcs, countof(js_worker_proto_funcs));
+ 
+ obj = JS_NewCFunction2(ctx, js_worker_ctor, "Worker", 1,
+ JS_CFUNC_constructor, 0);
+ JS_SetConstructor(ctx, obj, proto);
+ 
+ JS_SetClassProto(ctx, js_worker_class_id, proto);
+ 
+ /* set 'Worker.parent' if necessary */
+ if (ts->recv_pipe && ts->send_pipe) {
+ JS_DefinePropertyValueStr(ctx, obj, "parent",
+ js_worker_ctor_internal(ctx, JS_UNDEFINED, ts->recv_pipe, ts->send_pipe),
+ JS_PROP_C_W_E);
+ }
+ 
+ JS_SetModuleExport(ctx, m, "Worker", obj);
+ }
+#endif /* USE_WORKER */
+
+ return JS_SetModuleExportList(ctx, m, js_os_funcs,
+ countof(js_os_funcs));
+}
+
+JSModuleDef *js_init_module_os(JSContext *ctx, const char *module_name)
+{
+ JSModuleDef *m;
+ m = JS_NewCModule(ctx, module_name, js_os_init);
+ if (!m)
+ return NULL;
+ JS_AddModuleExportList(ctx, m, js_os_funcs, countof(js_os_funcs));
+#ifdef USE_WORKER
+ JS_AddModuleExport(ctx, m, "Worker");
+#endif
+ return m;
+}
+
+/**********************************************************/
+#ifndef GPAC_HAS_QJS
+static JSValue js_print(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ int i;
+ const char *str;
+ size_t len;
+
+ for(i = 0; i < argc; i++) {
+ if (i != 0)
+ putchar(' ');
+ str = JS_ToCStringLen(ctx, &len, argv[i]);
+ if (!str)
+ return JS_EXCEPTION;
+ fwrite(str, 1, len, stdout);
+ JS_FreeCString(ctx, str);
+ }
+ putchar('\n');
+ return JS_UNDEFINED;
+}
+
+void js_std_add_helpers(JSContext *ctx, int argc, char **argv)
+{
+ JSValue global_obj, console, args;
+ int i;
+
+ /* XXX: should these global definitions be enumerable? */
+ global_obj = JS_GetGlobalObject(ctx);
+
+ console = JS_NewObject(ctx);
+ JS_SetPropertyStr(ctx, console, "log",
+ JS_NewCFunction(ctx, js_print, "log", 1));
+ JS_SetPropertyStr(ctx, global_obj, "console", console);
+
+ /* same methods as the mozilla JS shell */
+ if (argc >= 0) {
+ args = JS_NewArray(ctx);
+ for(i = 0; i < argc; i++) {
+ JS_SetPropertyUint32(ctx, args, i, JS_NewString(ctx, argv[i]));
+ }
+ JS_SetPropertyStr(ctx, global_obj, "scriptArgs", args);
+ }
+ 
+ JS_SetPropertyStr(ctx, global_obj, "print",
+ JS_NewCFunction(ctx, js_print, "print", 1));
+ JS_SetPropertyStr(ctx, global_obj, "__loadScript",
+ JS_NewCFunction(ctx, js_loadScript, "__loadScript", 1));
+ 
+ JS_FreeValue(ctx, global_obj);
+}
+#endif
+
+void js_std_init_handlers(JSRuntime *rt)
+{
+ JSThreadState *ts;
+
+ ts = malloc(sizeof(*ts));
+ if (!ts) {
+ fprintf(stderr, "Could not allocate memory for the worker");
+ exit(1);
+ }
+ memset(ts, 0, sizeof(*ts));
+ init_list_head(&ts->os_rw_handlers);
+ init_list_head(&ts->os_signal_handlers);
+ init_list_head(&ts->os_timers);
+ init_list_head(&ts->port_list);
+
+ JS_SetRuntimeOpaque(rt, ts);
+
+#ifdef USE_WORKER
+ /* set the SharedArrayBuffer memory handlers */
+ {
+ JSSharedArrayBufferFunctions sf;
+ memset(&sf, 0, sizeof(sf));
+ sf.sab_alloc = js_sab_alloc;
+ sf.sab_free = js_sab_free;
+ sf.sab_dup = js_sab_dup;
+ JS_SetSharedArrayBufferFunctions(rt, &sf);
+ }
+#endif
+}
+
+static void js_std_free_handlers_ex(JSRuntime *rt, int no_free_ts)
+{
+ JSThreadState *ts = JS_GetRuntimeOpaque(rt);
+ struct list_head *el, *el1;
+
+ list_for_each_safe(el, el1, &ts->os_rw_handlers) {
+ JSOSRWHandler *rh = list_entry(el, JSOSRWHandler, link);
+ free_rw_handler(rt, rh);
+ }
+
+ list_for_each_safe(el, el1, &ts->os_signal_handlers) {
+ JSOSSignalHandler *sh = list_entry(el, JSOSSignalHandler, link);
+ free_sh(rt, sh);
+ }
+ 
+ list_for_each_safe(el, el1, &ts->os_timers) {
+ JSOSTimer *th = list_entry(el, JSOSTimer, link);
+ unlink_timer(rt, th);
+ if (!th->has_object)
+ free_timer(rt, th);
+ }
+
+#ifdef USE_WORKER
+
+	//detach all ports (not doint so would result in leaks)
+	list_for_each(el, &ts->port_list) {
+		JSWorkerMessageHandler *port = list_entry(el, JSWorkerMessageHandler, link);
+		if (port && !JS_IsUndefined(port->on_message_func)) {
+			JS_FreeValueRT(rt, port->on_message_func);
+			port->on_message_func = JS_UNDEFINED;
+		}
+	}
+	js_free_message_pipe(ts->recv_pipe);
+ js_free_message_pipe(ts->send_pipe);
+#endif
+
+ if (!no_free_ts)
+ free(ts);
+ JS_SetRuntimeOpaque(rt, NULL); /* fail safe */
+}
+
+void js_std_free_handlers(JSRuntime *rt)
+{
+	js_std_free_handlers_ex(rt, 0);
+
+}
+//unused
+#ifndef GPAC_HAS_QJS
+static void js_dump_obj(JSContext *ctx, FILE *f, JSValueConst val)
+{
+ const char *str;
+
+ str = JS_ToCString(ctx, val);
+ if (str) {
+ fprintf(f, "%s\n", str);
+ JS_FreeCString(ctx, str);
+ } else {
+ fprintf(f, "[exception]\n");
+ }
+}
+
+static void js_std_dump_error1(JSContext *ctx, JSValueConst exception_val)
+{
+ JSValue val;
+ BOOL is_error;
+ 
+ is_error = JS_IsError(ctx, exception_val);
+ js_dump_obj(ctx, stderr, exception_val);
+ if (is_error) {
+ val = JS_GetPropertyStr(ctx, exception_val, "stack");
+ if (!JS_IsUndefined(val)) {
+ js_dump_obj(ctx, stderr, val);
+ }
+ JS_FreeValue(ctx, val);
+ }
+}
+
+void js_std_dump_error(JSContext *ctx)
+{
+ JSValue exception_val;
+ 
+ exception_val = JS_GetException(ctx);
+ js_std_dump_error1(ctx, exception_val);
+ JS_FreeValue(ctx, exception_val);
+}
+
+void js_std_promise_rejection_tracker(JSContext *ctx, JSValueConst promise,
+ JSValueConst reason,
+ BOOL is_handled, void *opaque)
+{
+ if (!is_handled) {
+ fprintf(stderr, "Possibly unhandled promise rejection: ");
+ js_std_dump_error1(ctx, reason);
+ }
+}
+
+#endif
+
+/* main loop which calls the user JS callbacks */
+void js_std_loop(JSContext *ctx)
+{
+ JSContext *ctx1;
+ int err;
+
+ for(;;) {
+ /* execute the pending jobs */
+ for(;;) {
+ err = JS_ExecutePendingJob(JS_GetRuntime(ctx), &ctx1);
+ if (err <= 0) {
+ if (err < 0) {
+ js_std_dump_error(ctx1);
+ }
+ break;
+ }
+ }
+
+ if (!os_poll_func || os_poll_func(ctx))
+ break;
+ }
+}
+
+//not exposed for now
+#ifndef GPAC_HAS_QJS
+
+void js_std_eval_binary(JSContext *ctx, const uint8_t *buf, size_t buf_len,
+ int load_only)
+{
+ JSValue obj, val;
+ obj = JS_ReadObject(ctx, buf, buf_len, JS_READ_OBJ_BYTECODE);
+ if (JS_IsException(obj))
+ goto exception;
+ if (load_only) {
+ if (JS_VALUE_GET_TAG(obj) == JS_TAG_MODULE) {
+ js_module_set_import_meta(ctx, obj, FALSE, FALSE);
+ }
+ } else {
+ if (JS_VALUE_GET_TAG(obj) == JS_TAG_MODULE) {
+ if (JS_ResolveModule(ctx, obj) < 0) {
+ JS_FreeValue(ctx, obj);
+ goto exception;
+ }
+ js_module_set_import_meta(ctx, obj, FALSE, TRUE);
+ }
+ val = JS_EvalFunction(ctx, obj);
+ if (JS_IsException(val)) {
+ exception:
+ js_std_dump_error(ctx);
+ exit(1);
+ }
+ JS_FreeValue(ctx, val);
+ }
+}
+#endif
+
+#endif //GPAC_DISABLE_QJS_LIBC

gpac-2.0.0.tar.gz/src/quickjs/quickjs-libc.h Added

@@ -0,0 +1,60 @@
+/*
+ * QuickJS C library
+ *
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef QUICKJS_LIBC_H
+#define QUICKJS_LIBC_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include "quickjs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JSModuleDef *js_init_module_std(JSContext *ctx, const char *module_name);
+JSModuleDef *js_init_module_os(JSContext *ctx, const char *module_name);
+void js_std_add_helpers(JSContext *ctx, int argc, char **argv);
+void js_std_loop(JSContext *ctx);
+void js_std_init_handlers(JSRuntime *rt);
+void js_std_free_handlers(JSRuntime *rt);
+void js_std_dump_error(JSContext *ctx);
+uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename);
+int js_module_set_import_meta(JSContext *ctx, JSValueConst func_val,
+ JS_BOOL use_realpath, JS_BOOL is_main);
+JSModuleDef *js_module_loader(JSContext *ctx,
+ const char *module_name, void *opaque);
+void js_std_eval_binary(JSContext *ctx, const uint8_t *buf, size_t buf_len,
+ int flags);
+void js_std_promise_rejection_tracker(JSContext *ctx, JSValueConst promise,
+ JSValueConst reason,
+ JS_BOOL is_handled, void *opaque);
+void js_std_set_worker_new_context_func(JSContext *(*func)(JSRuntime *rt));
+
+#ifdef __cplusplus
+} /* extern "C" { */
+#endif
+
+#endif /* QUICKJS_LIBC_H */

gpac-1.0.1.tar.gz/src/quickjs/quickjs-opcode.h -> gpac-2.0.0.tar.gz/src/quickjs/quickjs-opcode.h Changed

@@ -114,12 +114,11 @@
 DEF(      add_brand, 1, 2, 0, none) /* this_obj home_obj -> */
 DEF(   return_async, 1, 1, 0, none)
 DEF(          throw, 1, 1, 0, none)
-DEF(      throw_var, 6, 0, 0, atom_u8)
+DEF(    throw_error, 6, 0, 0, atom_u8)
 DEF(           eval, 5, 1, 1, npop_u16) /* func args... -> ret_val */
 DEF(     apply_eval, 3, 2, 1, u16) /* func array -> ret_eval */
 DEF(         regexp, 1, 2, 1, none) /* create a RegExp object from the pattern and a
                                        bytecode string */
-DEF( get_super_ctor, 1, 1, 1, none)
 DEF(      get_super, 1, 1, 1, none)
 DEF(         import, 1, 1, 1, none) /* dynamic module import */
 
@@ -206,16 +205,15 @@
 DEF(for_await_of_start, 1, 1, 3, none)
 DEF(    for_in_next, 1, 1, 3, none)
 DEF(    for_of_next, 2, 3, 5, u8)
-DEF(for_await_of_next, 1, 3, 4, none)
+DEF(iterator_check_object, 1, 1, 1, none)
 DEF(iterator_get_value_done, 1, 1, 2, none)
 DEF( iterator_close, 1, 3, 0, none)
 DEF(iterator_close_return, 1, 4, 4, none)
-DEF(async_iterator_close, 1, 3, 2, none)
-DEF(async_iterator_next, 1, 4, 4, none)
-DEF(async_iterator_get, 2, 4, 5, u8)
+DEF(  iterator_next, 1, 4, 4, none)
+DEF(  iterator_call, 2, 4, 5, u8)
 DEF(  initial_yield, 1, 0, 0, none)
 DEF(          yield, 1, 1, 2, none)
-DEF(     yield_star, 1, 2, 2, none)
+DEF(     yield_star, 1, 1, 2, none)
 DEF(async_yield_star, 1, 1, 2, none)
 DEF(          await, 1, 1, 1, none)
 
@@ -260,18 +258,13 @@
 DEF(is_undefined_or_null, 1, 1, 1, none)
 #ifdef CONFIG_BIGNUM
 DEF(      mul_pow10, 1, 2, 1, none)
-DEF(       math_div, 1, 2, 1, none)
 DEF(       math_mod, 1, 2, 1, none)
-DEF(       math_pow, 1, 2, 1, none)
 #endif
 /* must be the last non short and non temporary opcode */
 DEF(            nop, 1, 0, 0, none) 
 
 /* temporary opcodes: never emitted in the final bytecode */
 
-def(set_arg_valid_upto, 3, 0, 0, arg) /* emitted in phase 1, removed in phase 2 */
-
-def(close_var_object, 1, 0, 0, none) /* emitted in phase 1, removed in phase 2 */
 def(    enter_scope, 3, 0, 0, u16)  /* emitted in phase 1, removed in phase 2 */
 def(    leave_scope, 3, 0, 0, u16)  /* emitted in phase 1, removed in phase 2 */
 
@@ -363,7 +356,8 @@
 
 DEF(   is_undefined, 1, 1, 1, none)
 DEF(        is_null, 1, 1, 1, none)
-DEF(    is_function, 1, 1, 1, none)
+DEF(typeof_is_undefined, 1, 1, 1, none)
+DEF( typeof_is_function, 1, 1, 1, none)
 #endif
 
 #undef DEF

gpac-1.0.1.tar.gz/src/quickjs/quickjs.c -> gpac-2.0.0.tar.gz/src/quickjs/quickjs.c Changed

@@ -1,8 +1,8 @@
 /*
 * QuickJS Javascript Engine
- *
- * Copyright (c) 2017-2020 Fabrice Bellard
- * Copyright (c) 2017-2020 Charlie Gordon
+ * 
+ * Copyright (c) 2017-2021 Fabrice Bellard
+ * Copyright (c) 2017-2021 Charlie Gordon
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -38,16 +38,14 @@
 #include <malloc/malloc.h>
 #elif defined(__linux__) || defined(__NX__)
 #include <malloc.h>
+#elif defined(__FreeBSD__)
+#include <malloc_np.h>
 #endif
 
 #include "cutils.h"
 #include "list.h"
 #include "quickjs.h"
 #include "libregexp.h"
-
-/* enable bignums */
-#define CONFIG_BIGNUM
-
 #ifdef CONFIG_BIGNUM
 #include "libbf.h"
 #endif
@@ -75,10 +73,17 @@
 
 /* define to include Atomics.* operations which depend on the OS
 threads */
-#if !defined(EMSCRIPTEN) && !defined(_MSC_VER) && !defined(GPAC_CONFIG_ANDROID) && !defined(__MINGW32__) && !defined(GPAC_NO_STDATOMIC)
+#if !defined(EMSCRIPTEN) && !defined(_MSC_VER) && !defined(GPAC_CONFIG_ANDROID) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 #define CONFIG_ATOMICS
 #endif
 
+//no stack limit in GPAC doesn't work with multithreaded context switch
+#if defined(GPAC_QJS_STACK_CHECK)
+/* enable stack limitation */
+#define CONFIG_STACK_CHECK
+#endif
+
+
 /* dump object free */
 //#define DUMP_FREE
 //#define DUMP_CLOSURE
@@ -117,7 +122,7 @@
 #include <errno.h>
 #endif
 
-#define CONFIG_VERSION "2019-09-18"
+#define CONFIG_VERSION "2020-11-08-rc2"
 
 enum {
 /* classid tag */ /* union usage | properties */
@@ -159,7 +164,8 @@
 JS_CLASS_BIG_INT, /* u.object_data */
 JS_CLASS_BIG_FLOAT, /* u.object_data */
 JS_CLASS_FLOAT_ENV, /* u.float_env */
- JS_CLASS_BIG_DECIMAL, /* u.object_data */
+ JS_CLASS_BIG_DECIMAL, /* u.object_data */
+ JS_CLASS_OPERATOR_SET, /* u.operator_set */
 #endif
 JS_CLASS_MAP, /* u.map_state */
 JS_CLASS_SET, /* u.map_state */
@@ -198,15 +204,16 @@
 JS_TYPE_ERROR,
 JS_URI_ERROR,
 JS_INTERNAL_ERROR,
-
+ JS_AGGREGATE_ERROR,
+ 
 JS_NATIVE_ERROR_COUNT, /* number of different NativeError objects */
 } JSErrorEnum;
 
 #define JS_MAX_LOCAL_VARS 65536
-#define JS_STACK_SIZE_MAX 65536
+#define JS_STACK_SIZE_MAX 65534
 #define JS_STRING_LEN_MAX ((1 << 30) - 1)
 
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__GNUC__)
 #define __exception /* */
 typedef int64_t ssize_t;
 #else
@@ -266,20 +273,30 @@
 by the garbage collector) */
 struct list_head gc_obj_list;
 /* list of JSGCObjectHeader.link. Used during JS_FreeValueRT() */
- struct list_head gc_zero_ref_count_list;
+ struct list_head gc_zero_ref_count_list; 
 struct list_head tmp_obj_list; /* used during GC */
 JSGCPhaseEnum gc_phase : 8;
 size_t malloc_gc_threshold;
 #ifdef DUMP_LEAKS
 struct list_head string_list; /* list of JSString.link */
 #endif
+ /* stack limitation */
+ uintptr_t stack_size; /* in bytes, 0 if no limit */
+ uintptr_t stack_top;
+ uintptr_t stack_limit; /* lower stack limit */
+ 
+ JSValue current_exception;
+ /* true if inside an out of memory error, to avoid recursing */
+ BOOL in_out_of_memory : 8;
+
+ struct JSStackFrame *current_stack_frame;
 
 JSInterruptHandler *interrupt_handler;
 void *interrupt_opaque;
 
 JSHostPromiseRejectionTracker *host_promise_rejection_tracker;
 void *host_promise_rejection_tracker_opaque;
-
+ 
 struct list_head job_list; /* list of JSJobEntry.link */
 
 JSModuleNormalizeFunc *module_normalize_func;
@@ -287,7 +304,9 @@
 void *module_loader_opaque;
 
 BOOL can_block : 8; /* TRUE if Atomics.wait can block */
-
+ /* used to allocate, free and clone SharedArrayBuffers */
+ JSSharedArrayBufferFunctions sab_funcs;
+ 
 /* Shape hash table */
 int shape_hash_bits;
 int shape_hash_size;
@@ -298,7 +317,9 @@
 JSNumericOperations bigint_ops;
 JSNumericOperations bigfloat_ops;
 JSNumericOperations bigdecimal_ops;
+ uint32_t operator_count;
 #endif
+ void *user_opaque;
 };
 
 struct JSClass {
@@ -313,8 +334,7 @@
 
 #define JS_MODE_STRICT (1 << 0)
 #define JS_MODE_STRIP (1 << 1)
-#define JS_MODE_BIGINT (1 << 2)
-#define JS_MODE_MATH (1 << 3)
+#define JS_MODE_MATH (1 << 2)
 
 typedef struct JSStackFrame {
 struct JSStackFrame *prev_frame; /* NULL if first stack frame */
@@ -325,9 +345,9 @@
 const uint8_t *cur_pc; /* only used in bytecode functions : PC of the
 instruction after the call */
 int arg_count;
- int js_mode; /* 0 or JS_MODE_BIGINT for C functions */
+ int js_mode; /* 0 or JS_MODE_MATH for C functions */
 /* only used in generators. Current stack pointer value. NULL if
- the function is running. */
+ the function is running. */ 
 JSValue *cur_sp;
 } JSStackFrame;
 
@@ -337,6 +357,7 @@
 JS_GC_OBJ_TYPE_SHAPE,
 JS_GC_OBJ_TYPE_VAR_REF,
 JS_GC_OBJ_TYPE_ASYNC_FUNCTION,
+ JS_GC_OBJ_TYPE_JS_CONTEXT,
 } JSGCObjectTypeEnum;
 
 /* header for GC objects. GC objects are C data structures with a
@@ -360,9 +381,9 @@
 
 /* 0 : the JSVarRef is on the stack. header.link is an element
 of JSStackFrame.var_ref_list.
- 1 : the JSVarRef is detached. header.link has the normal meanning
+ 1 : the JSVarRef is detached. header.link has the normal meanning 
 */
- uint8_t is_detached : 1;
+ uint8_t is_detached : 1; 
 uint8_t is_arg : 1;
 uint16_t var_idx; /* index of the corresponding function variable on
 the stack */
@@ -393,29 +414,30 @@
 } JSBigDecimal;
 #endif
 
+typedef enum {
+ JS_AUTOINIT_ID_PROTOTYPE,
+ JS_AUTOINIT_ID_MODULE_NS,
+ JS_AUTOINIT_ID_PROP,
+} JSAutoInitIDEnum;
+
 /* must be large enough to have a negligible runtime cost and small
 enough to call the interrupt callback often. */
 #define JS_INTERRUPT_COUNTER_INIT 10000
 
 struct JSContext {
+ JSGCObjectHeader header; /* must come first */
 JSRuntime *rt;
 struct list_head link;
- const uint8_t *stack_top;
- size_t stack_size; /* in bytes */
 
- JSValue current_exception;
- /* true if inside an out of memory error, to avoid recursing */
- BOOL in_out_of_memory : 8;
 uint16_t binary_object_count;
 int binary_object_size;
 
 JSShape *array_shape; /* initial shape for Array objects */
 
- JSStackFrame *current_stack_frame;
-
 JSValue *class_proto;
 JSValue function_proto;
 JSValue function_ctor;
+ JSValue array_ctor;
 JSValue regexp_ctor;
 JSValue promise_ctor;
 JSValue native_error_proto[JS_NATIVE_ERROR_COUNT];
@@ -432,8 +454,8 @@
 #ifdef CONFIG_BIGNUM
 bf_context_t *bf_ctx; /* points to rt->bf_ctx, shared by all contexts */
 JSFloatEnv fp_env; /* global FP environment */
- BOOL bignum_ext; /* enable bigint mode, math mode and operator
- overloading */
+ BOOL bignum_ext : 8; /* enable math mode */
+ BOOL allow_operator_overloading : 8;
 #endif
 /* when the counter reaches zero, JSRutime.interrupt_handler is called */
 int interrupt_counter;
@@ -501,14 +523,17 @@
 uint8_t is_arg : 1;
 uint8_t is_const : 1;
 uint8_t is_lexical : 1;
- uint8_t var_kind : 3; /* see JSVarKindEnum */
- /* 9 bits available */
+ uint8_t var_kind : 4; /* see JSVarKindEnum */
+ /* 8 bits available */
 uint16_t var_idx; /* is_local = TRUE: index to a normal variable of the
 parent function. otherwise: index to a closure
 variable of the parent function */
 JSAtom var_name;
 } JSClosureVar;
 
+#define ARG_SCOPE_INDEX 1
+#define ARG_SCOPE_END (-2)
+
 typedef struct JSVarScope {
 int parent; /* index into fd->scopes of the enclosing scope */
 int first; /* index into fd->vars of the last variable in this scope */
@@ -521,6 +546,7 @@
 JS_VAR_NEW_FUNCTION_DECL, /* lexical var with async/generator
 function declaration */
 JS_VAR_CATCH,
+ JS_VAR_FUNCTION_NAME, /* function expression name */
 JS_VAR_PRIVATE_FIELD,
 JS_VAR_PRIVATE_METHOD,
 JS_VAR_PRIVATE_GETTER,
@@ -528,12 +554,21 @@
 JS_VAR_PRIVATE_GETTER_SETTER, /* must come after JS_VAR_PRIVATE_SETTER */
 } JSVarKindEnum;
 
+/* XXX: could use a different structure in bytecode functions to save
+ memory */
 typedef struct JSVarDef {
 JSAtom var_name;
- int scope_level; /* index into fd->scopes of this variable lexical scope */
- int scope_next; /* index into fd->vars of the next variable in the
- * same or enclosing lexical scope */
- uint8_t is_func_var : 1; /* used for the function self reference */
+ /* index into fd->scopes of this variable lexical scope */
+ int scope_level;
+ /* during compilation: 
+ - if scope_level = 0: scope in which the variable is defined
+ - if scope_level != 0: index into fd->vars of the next
+ variable in the same or enclosing lexical scope
+ in a bytecode function:
+ index into fd->vars of the next
+ variable in the same or enclosing lexical scope
+ */
+ int scope_next; 
 uint8_t is_const : 1;
 uint8_t is_lexical : 1;
 uint8_t is_captured : 1;
@@ -543,7 +578,9 @@
 JS_VAR_FUNCTION_DECL/JS_VAR_NEW_FUNCTION_DECL or scope level of
 the definition of the 'var' variables (they have scope_level =
 0) */
- int func_pool_or_scope_idx : 24; /* only used during compilation */
+ int func_pool_idx : 24; /* only used during compilation : index in
+ the constant pool for hoisted function
+ definition */
 } JSVarDef;
 
 /* for the encoding of the pc2line table */
@@ -585,6 +622,7 @@
 uint16_t var_count;
 uint16_t defined_arg_count; /* for length function property */
 uint16_t stack_size; /* maximum stack size */
+ JSContext *realm; /* function realm */
 JSValue *cpool; /* constant pool (self pointer) */
 int cpool_count;
 int closure_var_count;
@@ -627,7 +665,6 @@
 typedef struct JSProxyData {
 JSValue target;
 JSValue handler;
- JSValue proto;
 uint8_t is_func;
 uint8_t is_revoked;
 } JSProxyData;
@@ -666,6 +703,53 @@
 JSAsyncFunctionState func_state;
 } JSAsyncFunctionData;
 
+typedef enum {
+ /* binary operators */
+ JS_OVOP_ADD,
+ JS_OVOP_SUB,
+ JS_OVOP_MUL,
+ JS_OVOP_DIV,
+ JS_OVOP_MOD,
+ JS_OVOP_POW,
+ JS_OVOP_OR,
+ JS_OVOP_AND,
+ JS_OVOP_XOR,
+ JS_OVOP_SHL,
+ JS_OVOP_SAR,
+ JS_OVOP_SHR,
+ JS_OVOP_EQ,
+ JS_OVOP_LESS,
+
+ JS_OVOP_BINARY_COUNT,
+ /* unary operators */
+ JS_OVOP_POS = JS_OVOP_BINARY_COUNT,
+ JS_OVOP_NEG,
+ JS_OVOP_INC,
+ JS_OVOP_DEC,
+ JS_OVOP_NOT,
+
+ JS_OVOP_COUNT,
+} JSOverloadableOperatorEnum;
+
+typedef struct {
+ uint32_t operator_index;
+ JSObject *ops[JS_OVOP_BINARY_COUNT]; /* self operators */
+} JSBinaryOperatorDefEntry;
+
+typedef struct {
+ int count;
+ JSBinaryOperatorDefEntry *tab;
+} JSBinaryOperatorDef;
+
+typedef struct {
+ uint32_t operator_counter;
+ BOOL is_primitive; /* OperatorSet for a primitive type */
+ /* NULL if no operator is defined */
+ JSObject *self_ops[JS_OVOP_COUNT]; /* self operators */
+ JSBinaryOperatorDef left;
+ JSBinaryOperatorDef right;
+} JSOperatorSetData;
+
 typedef struct JSReqModuleEntry {
 JSAtom module_name;
 JSModuleDef *module; /* used using resolution */
@@ -725,12 +809,13 @@
 JSValue func_obj; /* only used for JS modules */
 JSModuleInitFunc *init_func; /* only used for C modules */
 BOOL resolved : 8;
+ BOOL func_created : 8;
 BOOL instantiated : 8;
 BOOL evaluated : 8;
 BOOL eval_mark : 8; /* temporary use during js_evaluate_module() */
 /* true if evaluation yielded an exception. It is saved in
 eval_exception */
- BOOL eval_has_exception : 8;
+ BOOL eval_has_exception : 8; 
 JSValue eval_exception;
 JSValue meta_obj; /* for import.meta */
 };
@@ -752,8 +837,10 @@
 } getset;
 JSVarRef *var_ref; /* JS_PROP_VARREF */
 struct { /* JS_PROP_AUTOINIT */
- int (*init_func)(JSContext *ctx, JSObject *obj,
- JSAtom prop, void *opaque);
+ /* in order to use only 2 pointers, we compress the realm
+ and the init function pointer */
+ uintptr_t realm_and_id; /* realm and init_id (JS_AUTOINIT_ID_x)
+ in the 2 low bits */
 void *opaque;
 } init;
 } u;
@@ -770,16 +857,9 @@
 } JSShapeProperty;
 
 struct JSShape {
-#ifdef _MSC_VER
-	union {
-		JSGCObjectHeader header; /* must come first, 32-bit */
-		uint32_t prop_hash_end[1];
-	};
-#else
-	uint32_t prop_hash_end[0]; /* hash table of size hash_mask + 1
- before the start of the structure. */
-	JSGCObjectHeader header; /* must come first, 32-bit */
-#endif
+ /* hash table of size hash_mask + 1 before the start of the
+ structure (see prop_hash_end()). */
+ JSGCObjectHeader header;
 /* true if the shape is inserted in the shape hash table. If not,
 JSShape.hash is not valid */
 uint8_t is_hashed;
@@ -790,26 +870,28 @@
 uint32_t hash; /* current hash value */
 uint32_t prop_hash_mask;
 int prop_size; /* allocated properties */
- int prop_count;
+ int prop_count; /* include deleted properties */
+ int deleted_prop_count;
 JSShape *shape_hash_next; /* in JSRuntime.shape_hash[h] list */
 JSObject *proto;
 JSShapeProperty prop[0]; /* prop_size elements */
 };
+
 struct JSObject {
 union {
 JSGCObjectHeader header;
 struct {
 int __gc_ref_count; /* corresponds to header.ref_count */
 uint8_t __gc_mark; /* corresponds to header.mark/gc_obj_type */
-
+ 
 uint8_t extensible : 1;
 uint8_t free_mark : 1; /* only used when freeing objects with cycles */
 uint8_t is_exotic : 1; /* TRUE if object has exotic property handlers */
- uint8_t fast_array : 1; /* TRUE if u.array is used for get/put */
+ uint8_t fast_array : 1; /* TRUE if u.array is used for get/put (for JS_CLASS_ARRAY, JS_CLASS_ARGUMENTS and typed arrays) */
 uint8_t is_constructor : 1; /* TRUE if object is a constructor function */
 uint8_t is_uncatchable_error : 1; /* if TRUE, error is not catchable */
- uint8_t is_class : 1; /* TRUE if object is a class constructor */
 uint8_t tmp_mark : 1; /* used in JS_WriteObjectRec() */
+ uint8_t is_HTMLDDA : 1; /* specific annex B IsHtmlDDA behavior */
 uint16_t class_id; /* see JS_CLASS_x */
 };
 };
@@ -828,6 +910,7 @@
 struct JSTypedArray *typed_array; /* JS_CLASS_UINT8C_ARRAY..JS_CLASS_DATAVIEW */
 #ifdef CONFIG_BIGNUM
 struct JSFloatEnv *float_env; /* JS_CLASS_FLOAT_ENV */
+ struct JSOperatorSetData *operator_set; /* JS_CLASS_OPERATOR_SET */
 #endif
 struct JSMapState *map_state; /* JS_CLASS_MAP..JS_CLASS_WEAKSET */
 struct JSMapIteratorData *map_iterator_data; /* JS_CLASS_MAP_ITERATOR, JS_CLASS_SET_ITERATOR */
@@ -846,7 +929,8 @@
 JSVarRef **var_refs;
 JSObject *home_object; /* for 'super' access */
 } func;
- struct { /* JS_CLASS_C_FUNCTION: 8/12 bytes */
+ struct { /* JS_CLASS_C_FUNCTION: 12/20 bytes */
+ JSContext *realm;
 JSCFunctionType c_function;
 uint8_t length;
 uint8_t cproto;
@@ -859,7 +943,7 @@
 struct JSTypedArray *typed_array; /* JS_CLASS_UINT8C_ARRAY..JS_CLASS_FLOAT64_ARRAY */
 } u1;
 union {
- JSValue *values; /* JS_CLASS_ARRAY, JS_CLASS_ARGUMENTS */
+ JSValue *values; /* JS_CLASS_ARRAY, JS_CLASS_ARGUMENTS */ 
 void *ptr; /* JS_CLASS_UINT8C_ARRAY..JS_CLASS_FLOAT64_ARRAY */
 int8_t *int8_ptr; /* JS_CLASS_INT8_ARRAY */
 uint8_t *uint8_ptr; /* JS_CLASS_UINT8_ARRAY, JS_CLASS_UINT8C_ARRAY */
@@ -880,7 +964,7 @@
 /* byte sizes: 40/48/72 */
 };
 enum {
- JS_ATOM_NULL,
+ __JS_ATOM_NULL = JS_ATOM_NULL,
 #define DEF(name, str) JS_ATOM_ ## name,
 #include "quickjs-atom.h"
 #undef DEF
@@ -948,7 +1032,7 @@
 static JSValue JS_InvokeFree(JSContext *ctx, JSValue this_val, JSAtom atom,
 int argc, JSValueConst *argv);
 static __exception int JS_ToArrayLengthFree(JSContext *ctx, uint32_t *plen,
- JSValue val);
+ JSValue val, BOOL is_array_ctor);
 static JSValue JS_EvalObject(JSContext *ctx, JSValueConst this_obj,
 JSValueConst val, int flags, int scope_idx);
 #if defined(_MSC_VER)
@@ -977,6 +1061,9 @@
 static void js_object_data_finalizer(JSRuntime *rt, JSValue val);
 static void js_object_data_mark(JSRuntime *rt, JSValueConst val,
 JS_MarkFunc *mark_func);
+static void js_c_function_finalizer(JSRuntime *rt, JSValue val);
+static void js_c_function_mark(JSRuntime *rt, JSValueConst val,
+ JS_MarkFunc *mark_func);
 static void js_bytecode_function_finalizer(JSRuntime *rt, JSValue val);
 static void js_bytecode_function_mark(JSRuntime *rt, JSValueConst val,
 JS_MarkFunc *mark_func);
@@ -1015,6 +1102,11 @@
 static void js_promise_resolve_function_finalizer(JSRuntime *rt, JSValue val);
 static void js_promise_resolve_function_mark(JSRuntime *rt, JSValueConst val,
 JS_MarkFunc *mark_func);
+#ifdef CONFIG_BIGNUM
+static void js_operator_set_finalizer(JSRuntime *rt, JSValue val);
+static void js_operator_set_mark(JSRuntime *rt, JSValueConst val,
+ JS_MarkFunc *mark_func);
+#endif
 static JSValue JS_ToStringFree(JSContext *ctx, JSValue val);
 static int JS_ToBoolFree(JSContext *ctx, JSValue val);
 static int JS_ToInt32Free(JSContext *ctx, int32_t *pres, JSValue val);
@@ -1045,10 +1137,27 @@
 JSObject *p, JSAtom prop, int prop_flags);
 #ifdef CONFIG_BIGNUM
 static void js_float_env_finalizer(JSRuntime *rt, JSValue val);
-static JSValue JS_NewBigFloat(JSContext *ctx, bf_t *a);
-static JSValue JS_NewBigDecimal(JSContext *ctx, bfdec_t *a);
-static JSValue JS_NewBigInt2(JSContext *ctx, bf_t *a, BOOL force_bigint);
-static JSValue JS_NewBigInt(JSContext *ctx, bf_t *a);
+static JSValue JS_NewBigFloat(JSContext *ctx);
+static inline bf_t *JS_GetBigFloat(JSValueConst val)
+{
+ JSBigFloat *p = JS_VALUE_GET_PTR(val);
+ return &p->num;
+}
+static JSValue JS_NewBigDecimal(JSContext *ctx);
+static inline bfdec_t *JS_GetBigDecimal(JSValueConst val)
+{
+ JSBigDecimal *p = JS_VALUE_GET_PTR(val);
+ return &p->num;
+}
+static JSValue JS_NewBigInt(JSContext *ctx);
+static inline bf_t *JS_GetBigInt(JSValueConst val)
+{
+ JSBigFloat *p = JS_VALUE_GET_PTR(val);
+ return &p->num;
+}
+static JSValue JS_CompactBigInt1(JSContext *ctx, JSValue val,
+ BOOL convert_to_safe_integer);
+static JSValue JS_CompactBigInt(JSContext *ctx, JSValue val);
 static int JS_ToBigInt64Free(JSContext *ctx, int64_t *pres, JSValue val);
 static bf_t *JS_ToBigInt(JSContext *ctx, bf_t *buf, JSValueConst val);
 static void JS_FreeBigInt(JSContext *ctx, bf_t *a, bf_t *buf);
@@ -1059,7 +1168,7 @@
 #endif
 JSValue JS_ThrowOutOfMemory(JSContext *ctx);
 static JSValue JS_ThrowTypeErrorRevokedProxy(JSContext *ctx);
-static JSValueConst js_proxy_getPrototypeOf(JSContext *ctx, JSValueConst obj);
+static JSValue js_proxy_getPrototypeOf(JSContext *ctx, JSValueConst obj);
 static int js_proxy_setPrototypeOf(JSContext *ctx, JSValueConst obj,
 JSValueConst proto_val, BOOL throw_flag);
 static int js_proxy_isExtensible(JSContext *ctx, JSValueConst obj);
@@ -1071,6 +1180,17 @@
 int flags);
 static int js_string_memcmp(const JSString *p1, const JSString *p2, int len);
 static void reset_weak_ref(JSRuntime *rt, JSObject *p);
+static JSValue js_array_buffer_constructor3(JSContext *ctx,
+ JSValueConst new_target,
+ uint64_t len, JSClassID class_id,
+ uint8_t *buf,
+ JSFreeArrayBufferDataFunc *free_func,
+ void *opaque, BOOL alloc_flag);
+static JSArrayBuffer *js_get_array_buffer(JSContext *ctx, JSValueConst obj);
+static JSValue js_typed_array_constructor(JSContext *ctx,
+ JSValueConst this_val,
+ int argc, JSValueConst *argv,
+ int classid);
 static BOOL typed_array_is_detached(JSContext *ctx, JSObject *p);
 static uint32_t typed_array_get_length(JSContext *ctx, JSObject *p);
 static JSValue JS_ThrowTypeErrorDetachedArrayBuffer(JSContext *ctx);
@@ -1087,6 +1207,8 @@
 const char *input, size_t input_len,
 const char *filename, int flags, int scope_idx);
 static void js_free_module_def(JSContext *ctx, JSModuleDef *m);
+static void js_mark_module_def(JSRuntime *rt, JSModuleDef *m,
+ JS_MarkFunc *mark_func);
 static JSValue js_import_meta(JSContext *ctx);
 static JSValue js_dynamic_import(JSContext *ctx, JSValueConst specifier);
 static void free_var_ref(JSRuntime *rt, JSVarRef *var_ref);
@@ -1140,6 +1262,12 @@
 JSGCObjectTypeEnum type);
 static void remove_gc_object(JSGCObjectHeader *h);
 static void js_async_function_free0(JSRuntime *rt, JSAsyncFunctionData *s);
+static JSValue js_instantiate_prototype(JSContext *ctx, JSObject *p, JSAtom atom, void *opaque);
+static JSValue js_module_ns_autoinit(JSContext *ctx, JSObject *p, JSAtom atom,
+ void *opaque);
+static JSValue JS_InstantiateFunctionListItem2(JSContext *ctx, JSObject *p,
+ JSAtom atom, void *opaque);
+void JS_SetUncatchableError(JSContext *ctx, JSValueConst val, BOOL flag);
 
 static const JSClassExoticMethods js_arguments_exotic_methods;
 static const JSClassExoticMethods js_string_exotic_methods;
@@ -1147,19 +1275,6 @@
 static const JSClassExoticMethods js_module_ns_exotic_methods;
 static JSClassID js_class_id_alloc = JS_CLASS_INIT_COUNT;
 
-JS_BOOL JS_IsNumber(JSValueConst v)
-{
-#ifdef CONFIG_BIGNUM
- /* XXX: check the bignum case. Should use a different function */
- int tag = JS_VALUE_GET_TAG(v);
- return tag == JS_TAG_INT || tag == JS_TAG_BIG_INT ||
- tag == JS_TAG_BIG_FLOAT || JS_TAG_IS_FLOAT64(tag);
-#else
- int tag = JS_VALUE_GET_TAG(v);
- return tag == JS_TAG_INT || JS_TAG_IS_FLOAT64(tag);
-#endif
-}
-
 static void js_trigger_gc(JSRuntime *rt, size_t size)
 {
 BOOL force_gc;
@@ -1302,6 +1417,33 @@
 return js_strndup(ctx, str, strlen(str));
 }
 
+static no_inline int js_realloc_array(JSContext *ctx, void **parray,
+ int elem_size, int *psize, int req_size)
+{
+ int new_size;
+ size_t slack;
+ void *new_array;
+ /* XXX: potential arithmetic overflow */
+ new_size = max_int(req_size, *psize * 3 / 2);
+ new_array = js_realloc2(ctx, *parray, new_size * elem_size, &slack);
+ if (!new_array)
+ return -1;
+ new_size += slack / elem_size;
+ *psize = new_size;
+ *parray = new_array;
+ return 0;
+}
+
+/* resize the array and update its size if req_size > *psize */
+static inline int js_resize_array(JSContext *ctx, void **parray, int elem_size,
+ int *psize, int req_size)
+{
+ if (unlikely(req_size > *psize))
+ return js_realloc_array(ctx, parray, elem_size, psize, req_size);
+ else
+ return 0;
+}
+
 static inline void js_dbuf_init(JSContext *ctx, DynBuf *s)
 {
 dbuf_init2(s, ctx->rt, (DynBufReallocFunc *)js_realloc_rt);
@@ -1320,7 +1462,7 @@
 static JSClassShortDef const js_std_class_def[] = {
 { JS_ATOM_Object, NULL, NULL }, /* JS_CLASS_OBJECT */
 { JS_ATOM_Array, js_array_finalizer, js_array_mark }, /* JS_CLASS_ARRAY */
- { JS_ATOM_Error, NULL, NULL }, /* JS_CLASS_ERROR */
+ { JS_ATOM_Error, NULL, NULL }, /* JS_CLASS_ERROR */
 { JS_ATOM_Number, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_NUMBER */
 { JS_ATOM_String, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_STRING */
 { JS_ATOM_Boolean, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_BOOLEAN */
@@ -1329,7 +1471,7 @@
 { JS_ATOM_Arguments, NULL, NULL }, /* JS_CLASS_MAPPED_ARGUMENTS */
 { JS_ATOM_Date, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_DATE */
 { JS_ATOM_Object, NULL, NULL }, /* JS_CLASS_MODULE_NS */
- { JS_ATOM_Function, NULL, NULL }, /* JS_CLASS_C_FUNCTION */
+ { JS_ATOM_Function, js_c_function_finalizer, js_c_function_mark }, /* JS_CLASS_C_FUNCTION */
 { JS_ATOM_Function, js_bytecode_function_finalizer, js_bytecode_function_mark }, /* JS_CLASS_BYTECODE_FUNCTION */
 { JS_ATOM_Function, js_bound_function_finalizer, js_bound_function_mark }, /* JS_CLASS_BOUND_FUNCTION */
 { JS_ATOM_Function, js_c_function_data_finalizer, js_c_function_data_mark }, /* JS_CLASS_C_FUNCTION_DATA */
@@ -1357,6 +1499,7 @@
 { JS_ATOM_BigFloat, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_BIG_FLOAT */
 { JS_ATOM_BigFloatEnv, js_float_env_finalizer, NULL }, /* JS_CLASS_FLOAT_ENV */
 { JS_ATOM_BigDecimal, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_BIG_DECIMAL */
+ { JS_ATOM_OperatorSet, js_operator_set_finalizer, js_operator_set_mark }, /* JS_CLASS_OPERATOR_SET */
 #endif
 { JS_ATOM_Map, js_map_finalizer, js_map_mark }, /* JS_CLASS_MAP */
 { JS_ATOM_Set, js_map_finalizer, js_map_mark }, /* JS_CLASS_SET */
@@ -1366,7 +1509,7 @@
 { JS_ATOM_Set_Iterator, js_map_iterator_finalizer, js_map_iterator_mark }, /* JS_CLASS_SET_ITERATOR */
 { JS_ATOM_Array_Iterator, js_array_iterator_finalizer, js_array_iterator_mark }, /* JS_CLASS_ARRAY_ITERATOR */
 { JS_ATOM_String_Iterator, js_array_iterator_finalizer, js_array_iterator_mark }, /* JS_CLASS_STRING_ITERATOR */
- { JS_ATOM_RegExp_String_Iterator, js_regexp_string_iterator_finalizer, js_regexp_string_iterator_mark }, /* JS_CLASS_STRING_ITERATOR */
+ { JS_ATOM_RegExp_String_Iterator, js_regexp_string_iterator_finalizer, js_regexp_string_iterator_mark }, /* JS_CLASS_REGEXP_STRING_ITERATOR */
 { JS_ATOM_Generator, js_generator_finalizer, js_generator_mark }, /* JS_CLASS_GENERATOR */
 };
 
@@ -1445,6 +1588,36 @@
 
 #endif /* CONFIG_BIGNUM */
 
+#if !defined(CONFIG_STACK_CHECK)
+/* no stack limitation */
+static inline uintptr_t js_get_stack_pointer(void)
+{
+ return 0;
+}
+
+static inline BOOL js_check_stack_overflow(JSRuntime *rt, size_t alloca_size)
+{
+ return FALSE;
+}
+#else
+/* Note: OS and CPU dependent */
+static inline uintptr_t js_get_stack_pointer(void)
+{
+#if defined(_MSC_VER)
+ return (uintptr_t)_AddressOfReturnAddress();
+#else
+ return (uintptr_t)__builtin_frame_address(0);
+#endif
+}
+
+static inline BOOL js_check_stack_overflow(JSRuntime *rt, size_t alloca_size)
+{
+ uintptr_t sp;
+ sp = js_get_stack_pointer() - alloca_size;
+ return unlikely(sp < rt->stack_limit);
+}
+#endif
+
 JSRuntime *JS_NewRuntime2(const JSMallocFunctions *mf, void *opaque)
 {
 JSRuntime *rt;
@@ -1477,7 +1650,7 @@
 init_list_head(&rt->gc_obj_list);
 init_list_head(&rt->gc_zero_ref_count_list);
 rt->gc_phase = JS_GC_PHASE_NONE;
-
+ 
 #ifdef DUMP_LEAKS
 init_list_head(&rt->string_list);
 #endif
@@ -1500,12 +1673,28 @@
 rt->class_array[JS_CLASS_GENERATOR_FUNCTION].call = js_generator_function_call;
 if (init_shape_hash(rt))
 goto fail;
+
+ rt->stack_size = JS_DEFAULT_STACK_SIZE;
+ JS_UpdateStackTop(rt);
+
+ rt->current_exception = JS_NULL;
+
 return rt;
 fail:
 JS_FreeRuntime(rt);
 return NULL;
 }
 
+void *JS_GetRuntimeOpaque(JSRuntime *rt)
+{
+ return rt->user_opaque;
+}
+
+void JS_SetRuntimeOpaque(JSRuntime *rt, void *opaque)
+{
+ rt->user_opaque = opaque;
+}
+
 /* default memory allocation functions with memory limitation */
 static inline size_t js_def_malloc_usable_size(void *ptr)
 {
@@ -1628,6 +1817,12 @@
 rt->can_block = can_block;
 }
 
+void JS_SetSharedArrayBufferFunctions(JSRuntime *rt,
+ const JSSharedArrayBufferFunctions *sf)
+{
+ rt->sab_funcs = *sf;
+}
+
 /* return 0 if OK, < 0 if exception */
 int JS_EnqueueJob(JSContext *ctx, JSJobFunc *job_func,
 int argc, JSValueConst *argv)
@@ -1756,10 +1951,7 @@
 struct list_head *el, *el1;
 int i;
 
- list_for_each_safe(el, el1, &rt->context_list) {
- JSContext *ctx = list_entry(el, JSContext, link);
- JS_FreeContext(ctx);
- }
+ JS_FreeValueRT(rt, rt->current_exception);
 
 list_for_each_safe(el, el1, &rt->job_list) {
 JSJobEntry *e = list_entry(el, JSJobEntry, link);
@@ -1942,38 +2134,6 @@
 }
 }
 
-//#if defined(EMSCRIPTEN)
-//disable stack limit in gpac, it breaks multi thread usage
-#if 1
-/* currently no stack limitation */
-static inline uint8_t *js_get_stack_pointer(void)
-{
- return NULL;
-}
-
-static inline BOOL js_check_stack_overflow(JSContext *ctx, size_t alloca_size)
-{
- return FALSE;
-}
-#else
-/* Note: OS and CPU dependent */
-static inline uint8_t *js_get_stack_pointer(void)
-{
-#if defined(_MSC_VER)
- return _AddressOfReturnAddress();
-#else
- return __builtin_frame_address(0);
-#endif
-}
-
-static inline BOOL js_check_stack_overflow(JSContext *ctx, size_t alloca_size)
-{
- size_t size;
- size = ctx->stack_top - js_get_stack_pointer();
- return unlikely((size + alloca_size) > ctx->stack_size);
-}
-#endif
-
 JSContext *JS_NewContextRaw(JSRuntime *rt)
 {
 JSContext *ctx;
@@ -1982,6 +2142,9 @@
 ctx = js_mallocz_rt(rt, sizeof(JSContext));
 if (!ctx)
 return NULL;
+ ctx->header.ref_count = 1;
+ add_gc_object(rt, &ctx->header, JS_GC_OBJ_TYPE_JS_CONTEXT);
+
 ctx->class_proto = js_malloc_rt(rt, sizeof(ctx->class_proto[0]) *
 rt->class_count);
 if (!ctx->class_proto) {
@@ -1990,9 +2153,6 @@
 }
 ctx->rt = rt;
 list_add_tail(&ctx->link, &rt->context_list);
- ctx->stack_top = js_get_stack_pointer();
- ctx->stack_size = JS_DEFAULT_STACK_SIZE;
- ctx->current_exception = JS_NULL;
 #ifdef CONFIG_BIGNUM
 ctx->bf_ctx = &rt->bf_ctx;
 ctx->fp_env.prec = 113;
@@ -2000,6 +2160,7 @@
 #endif
 for(i = 0; i < rt->class_count; i++)
 ctx->class_proto[i] = JS_NULL;
+ ctx->array_ctor = JS_NULL;
 ctx->regexp_ctor = JS_NULL;
 ctx->promise_ctor = JS_NULL;
 init_list_head(&ctx->loaded_modules);
@@ -2090,11 +2251,60 @@
 }
 }
 
+JSContext *JS_DupContext(JSContext *ctx)
+{
+ ctx->header.ref_count++;
+ return ctx;
+}
+
+/* used by the GC */
+static void JS_MarkContext(JSRuntime *rt, JSContext *ctx,
+ JS_MarkFunc *mark_func)
+{
+ int i;
+ struct list_head *el;
+
+ /* modules are not seen by the GC, so we directly mark the objects
+ referenced by each module */
+ list_for_each(el, &ctx->loaded_modules) {
+ JSModuleDef *m = list_entry(el, JSModuleDef, link);
+ js_mark_module_def(rt, m, mark_func);
+ }
+
+ JS_MarkValue(rt, ctx->global_obj, mark_func);
+ JS_MarkValue(rt, ctx->global_var_obj, mark_func);
+
+ JS_MarkValue(rt, ctx->throw_type_error, mark_func);
+ JS_MarkValue(rt, ctx->eval_obj, mark_func);
+
+ JS_MarkValue(rt, ctx->array_proto_values, mark_func);
+ for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
+ JS_MarkValue(rt, ctx->native_error_proto[i], mark_func);
+ }
+ for(i = 0; i < rt->class_count; i++) {
+ JS_MarkValue(rt, ctx->class_proto[i], mark_func);
+ }
+ JS_MarkValue(rt, ctx->iterator_proto, mark_func);
+ JS_MarkValue(rt, ctx->async_iterator_proto, mark_func);
+ JS_MarkValue(rt, ctx->promise_ctor, mark_func);
+ JS_MarkValue(rt, ctx->array_ctor, mark_func);
+ JS_MarkValue(rt, ctx->regexp_ctor, mark_func);
+ JS_MarkValue(rt, ctx->function_ctor, mark_func);
+ JS_MarkValue(rt, ctx->function_proto, mark_func);
+
+ if (ctx->array_shape)
+ mark_func(rt, &ctx->array_shape->header);
+}
+
 void JS_FreeContext(JSContext *ctx)
 {
 JSRuntime *rt = ctx->rt;
 int i;
 
+ if (--ctx->header.ref_count > 0)
+ return;
+ assert(ctx->header.ref_count == 0);
+ 
 #ifdef DUMP_ATOMS
 JS_DumpAtoms(ctx->rt);
 #endif
@@ -2124,8 +2334,6 @@
 
 js_free_modules(ctx, JS_FREE_MODULE_ALL);
 
- JS_FreeValue(ctx, ctx->current_exception);
-
 JS_FreeValue(ctx, ctx->global_obj);
 JS_FreeValue(ctx, ctx->global_var_obj);
 
@@ -2143,6 +2351,7 @@
 JS_FreeValue(ctx, ctx->iterator_proto);
 JS_FreeValue(ctx, ctx->async_iterator_proto);
 JS_FreeValue(ctx, ctx->promise_ctor);
+ JS_FreeValue(ctx, ctx->array_ctor);
 JS_FreeValue(ctx, ctx->regexp_ctor);
 JS_FreeValue(ctx, ctx->function_ctor);
 JS_FreeValue(ctx, ctx->function_proto);
@@ -2150,6 +2359,7 @@
 js_free_shape_null(ctx->rt, ctx->array_shape);
 
 list_del(&ctx->link);
+ remove_gc_object(&ctx->header);
 js_free_rt(ctx->rt, ctx);
 }
 
@@ -2158,58 +2368,40 @@
 return ctx->rt;
 }
 
-void JS_SetMaxStackSize(JSContext *ctx, size_t stack_size)
+static void update_stack_limit(JSRuntime *rt)
 {
- ctx->stack_size = stack_size;
+ if (rt->stack_size == 0) {
+ rt->stack_limit = 0; /* no limit */
+ } else {
+ rt->stack_limit = rt->stack_top - rt->stack_size;
+ }
 }
 
-static inline BOOL is_strict_mode(JSContext *ctx)
+void JS_SetMaxStackSize(JSRuntime *rt, size_t stack_size)
 {
- JSStackFrame *sf = ctx->current_stack_frame;
- return (sf && (sf->js_mode & JS_MODE_STRICT));
+ rt->stack_size = stack_size;
+ update_stack_limit(rt);
 }
 
-#ifdef CONFIG_BIGNUM
-static inline BOOL is_bigint_mode(JSContext *ctx)
+void JS_UpdateStackTop(JSRuntime *rt)
 {
- JSStackFrame *sf = ctx->current_stack_frame;
- return (sf && (sf->js_mode & JS_MODE_BIGINT));
+ rt->stack_top = js_get_stack_pointer();
+ update_stack_limit(rt);
 }
-#endif
 
-JSValue JS_NewInt64(JSContext *ctx, int64_t v)
+static inline BOOL is_strict_mode(JSContext *ctx)
 {
- if (v == (int32_t)v) {
- return JS_NewInt32(ctx, v);
- } else {
-#ifdef CONFIG_BIGNUM
- if (is_bigint_mode(ctx)) {
- bf_t a_s, *a = &a_s;
- bf_init(ctx->bf_ctx, a);
- bf_set_si(a, v);
- return JS_NewBigInt(ctx, a);
- } else
-#endif
- {
- return __JS_NewFloat64(ctx, (double)v);
- }
- }
+ JSStackFrame *sf = ctx->rt->current_stack_frame;
+ return (sf && (sf->js_mode & JS_MODE_STRICT));
 }
 
-static force_inline JSValue JS_NewUint32(JSContext *ctx, uint32_t val)
-{
 #ifdef CONFIG_BIGNUM
- return JS_NewInt64(ctx, val);
-#else
- JSValue v;
- if (val <= 0x7fffffff) {
- v = JS_MKVAL(JS_TAG_INT, val);
- } else {
- v = __JS_NewFloat64(ctx, val);
- }
- return v;
-#endif
+static inline BOOL is_math_mode(JSContext *ctx)
+{
+ JSStackFrame *sf = ctx->rt->current_stack_frame;
+ return (sf && (sf->js_mode & JS_MODE_MATH));
 }
+#endif
 
 /* JSAtom support */
 
@@ -3164,7 +3356,7 @@
 const char *cstr;
 char *cstr2;
 size_t len, len1;
-
+ 
 str = JS_AtomToString(ctx, name);
 if (JS_IsException(str))
 return JS_ATOM_NULL;
@@ -3231,6 +3423,8 @@
 JSClass *cl, *new_class_array;
 struct list_head *el;
 
+ if (class_id >= (1 << 16))
+ return -1;
 if (class_id < rt->class_count &&
 rt->class_array[class_id].class_id != 0)
 return -1;
@@ -3700,7 +3894,7 @@
 uint32_t c;
 StringBuffer b_s, *b = &b_s;
 size_t len1;
-
+ 
 p_start = (const uint8_t *)buf;
 p_end = p_start + buf_len;
 p = p_start;
@@ -4068,9 +4262,14 @@
 return (JSShape *)(void *)((uint32_t *)sh_alloc + hash_size);
 }
 
+static inline uint32_t *prop_hash_end(JSShape *sh)
+{
+ return (uint32_t *)sh;
+}
+
 static inline void *get_alloc_from_shape(JSShape *sh)
 {
- return sh->prop_hash_end - ((intptr_t)sh->prop_hash_mask + 1);
+ return prop_hash_end(sh) - ((intptr_t)sh->prop_hash_mask + 1);
 }
 
 static inline JSShapeProperty *get_shape_prop(JSShape *sh)
@@ -4181,12 +4380,13 @@
 if (proto)
 JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, proto));
 sh->proto = proto;
- memset(sh->prop_hash_end - hash_size, 0, sizeof(sh->prop_hash_end[0]) *
+ memset(prop_hash_end(sh) - hash_size, 0, sizeof(prop_hash_end(sh)[0]) *
 hash_size);
 sh->prop_hash_mask = hash_size - 1;
- sh->prop_count = 0;
 sh->prop_size = prop_size;
-
+ sh->prop_count = 0;
+ sh->deleted_prop_count = 0;
+ 
 /* insert in the hash table */
 sh->hash = shape_initial_hash(proto);
 sh->is_hashed = TRUE;
@@ -4309,13 +4509,13 @@
 list_add_tail(&sh->header.link, &ctx->rt->gc_obj_list);
 new_hash_mask = new_hash_size - 1;
 sh->prop_hash_mask = new_hash_mask;
- memset(sh->prop_hash_end - new_hash_size, 0,
- sizeof(sh->prop_hash_end[0]) * new_hash_size);
+ memset(prop_hash_end(sh) - new_hash_size, 0,
+ sizeof(prop_hash_end(sh)[0]) * new_hash_size);
 for(i = 0, pr = sh->prop; i < sh->prop_count; i++, pr++) {
 if (pr->atom != JS_ATOM_NULL) {
 h = ((uintptr_t)pr->atom & new_hash_mask);
- pr->hash_next = sh->prop_hash_end[-h - 1];
- sh->prop_hash_end[-h - 1] = i + 1;
+ pr->hash_next = prop_hash_end(sh)[-h - 1];
+ prop_hash_end(sh)[-h - 1] = i + 1;
 }
 }
 js_free(ctx, get_alloc_from_shape(old_sh));
@@ -4337,6 +4537,74 @@
 return 0;
 }
 
+/* remove the deleted properties. */
+static int compact_properties(JSContext *ctx, JSObject *p)
+{
+ JSShape *sh, *old_sh;
+ void *sh_alloc;
+ intptr_t h;
+ uint32_t new_hash_size, i, j, new_hash_mask, new_size;
+ JSShapeProperty *old_pr, *pr;
+ JSProperty *prop, *new_prop;
+ 
+ sh = p->shape;
+ assert(!sh->is_hashed);
+
+ new_size = max_int(JS_PROP_INITIAL_SIZE,
+ sh->prop_count - sh->deleted_prop_count);
+ assert(new_size <= sh->prop_size);
+
+ new_hash_size = sh->prop_hash_mask + 1;
+ while ((new_hash_size / 2) >= new_size)
+ new_hash_size = new_hash_size / 2;
+ new_hash_mask = new_hash_size - 1;
+
+ /* resize the hash table and the properties */
+ old_sh = sh;
+ sh_alloc = js_malloc(ctx, get_shape_size(new_hash_size, new_size));
+ if (!sh_alloc)
+ return -1;
+ sh = get_shape_from_alloc(sh_alloc, new_hash_size);
+ list_del(&old_sh->header.link);
+ memcpy(sh, old_sh, sizeof(JSShape));
+ list_add_tail(&sh->header.link, &ctx->rt->gc_obj_list);
+ 
+ memset(prop_hash_end(sh) - new_hash_size, 0,
+ sizeof(prop_hash_end(sh)[0]) * new_hash_size);
+
+ j = 0;
+ old_pr = old_sh->prop;
+ pr = sh->prop;
+ prop = p->prop;
+ for(i = 0; i < sh->prop_count; i++) {
+ if (old_pr->atom != JS_ATOM_NULL) {
+ pr->atom = old_pr->atom;
+ pr->flags = old_pr->flags;
+ h = ((uintptr_t)old_pr->atom & new_hash_mask);
+ pr->hash_next = prop_hash_end(sh)[-h - 1];
+ prop_hash_end(sh)[-h - 1] = j + 1;
+ prop[j] = prop[i];
+ j++;
+ pr++;
+ }
+ old_pr++;
+ }
+ assert(j == (sh->prop_count - sh->deleted_prop_count));
+ sh->prop_hash_mask = new_hash_mask;
+ sh->prop_size = new_size;
+ sh->deleted_prop_count = 0;
+ sh->prop_count = j;
+
+ p->shape = sh;
+ js_free(ctx, get_alloc_from_shape(old_sh));
+ 
+ /* reduce the size of the object properties */
+ new_prop = js_realloc(ctx, p->prop, sizeof(new_prop[0]) * new_size);
+ if (new_prop)
+ p->prop = new_prop;
+ return 0;
+}
+
 static int add_shape_property(JSContext *ctx, JSShape **psh,
 JSObject *p, JSAtom atom, int prop_flags)
 {
@@ -4376,8 +4644,8 @@
 /* add in hash table */
 hash_mask = sh->prop_hash_mask;
 h = atom & hash_mask;
- pr->hash_next = sh->prop_hash_end[-h - 1];
- sh->prop_hash_end[-h - 1] = sh->prop_count;
+ pr->hash_next = prop_hash_end(sh)[-h - 1];
+ prop_hash_end(sh)[-h - 1] = sh->prop_count;
 return 0;
 }
 
@@ -4456,7 +4724,7 @@
 struct list_head *el;
 JSObject *p;
 JSGCObjectHeader *gp;
-
+ 
 printf("JSShapes: {\n");
 printf("%5s %4s %14s %5s %5s %s\n", "SLOT", "REFS", "PROTO", "SIZE", "COUNT", "PROPS");
 for(i = 0; i < rt->shape_hash_size; i++) {
@@ -4493,8 +4761,8 @@
 p->fast_array = 0;
 p->is_constructor = 0;
 p->is_uncatchable_error = 0;
- p->is_class = 0;
 p->tmp_mark = 0;
+ p->is_HTMLDDA = 0;
 p->first_weak_ref = NULL;
 p->u.opaque = NULL;
 p->shape = sh;
@@ -4533,7 +4801,6 @@
 p->prop[0].u.value = JS_UNDEFINED;
 break;
 case JS_CLASS_ARGUMENTS:
-#if defined(_MSC_VER)
 case JS_CLASS_UINT8C_ARRAY:
 case JS_CLASS_INT8_ARRAY:
 case JS_CLASS_UINT8_ARRAY:
@@ -4547,9 +4814,6 @@
 #endif
 case JS_CLASS_FLOAT32_ARRAY:
 case JS_CLASS_FLOAT64_ARRAY:
-#else
- case JS_CLASS_UINT8C_ARRAY ... JS_CLASS_FLOAT64_ARRAY:
-#endif
 p->is_exotic = 1;
 p->fast_array = 1;
 p->u.array.u.ptr = NULL;
@@ -4788,11 +5052,12 @@
 JSValue func_obj;
 JSObject *p;
 JSAtom name_atom;
-
+ 
 func_obj = JS_NewObjectProtoClass(ctx, proto_val, JS_CLASS_C_FUNCTION);
 if (JS_IsException(func_obj))
 return func_obj;
 p = JS_VALUE_GET_OBJ(func_obj);
+ p->u.cfunc.realm = JS_DupContext(ctx);
 p->u.cfunc.c_function.generic = func;
 p->u.cfunc.length = length;
 p->u.cfunc.cproto = cproto;
@@ -4903,6 +5168,27 @@
 return func_obj;
 }
 
+static JSContext *js_autoinit_get_realm(JSProperty *pr)
+{
+ return (JSContext *)(pr->u.init.realm_and_id & ~3);
+}
+
+static JSAutoInitIDEnum js_autoinit_get_id(JSProperty *pr)
+{
+ return pr->u.init.realm_and_id & 3;
+}
+
+static void js_autoinit_free(JSRuntime *rt, JSProperty *pr)
+{
+ JS_FreeContext(js_autoinit_get_realm(pr));
+}
+
+static void js_autoinit_mark(JSRuntime *rt, JSProperty *pr,
+ JS_MarkFunc *mark_func)
+{
+ mark_func(rt, &js_autoinit_get_realm(pr)->header);
+}
+
 static void free_property(JSRuntime *rt, JSProperty *pr, int prop_flags)
 {
 if (unlikely(prop_flags & JS_PROP_TMASK)) {
@@ -4914,7 +5200,7 @@
 } else if ((prop_flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
 free_var_ref(rt, pr->u.var_ref);
 } else if ((prop_flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
- /* nothing to do */
+ js_autoinit_free(rt, pr);
 }
 } else {
 JS_FreeValueRT(rt, pr->u.value);
@@ -4929,7 +5215,7 @@
 intptr_t h;
 sh = p->shape;
 h = (uintptr_t)atom & sh->prop_hash_mask;
- h = sh->prop_hash_end[-h - 1];
+ h = prop_hash_end(sh)[-h - 1];
 prop = get_shape_prop(sh);
 while (h) {
 pr = &prop[h - 1];
@@ -4950,7 +5236,7 @@
 intptr_t h;
 sh = p->shape;
 h = (uintptr_t)atom & sh->prop_hash_mask;
- h = sh->prop_hash_end[-h - 1];
+ h = prop_hash_end(sh)[-h - 1];
 prop = get_shape_prop(sh);
 while (h) {
 pr = &prop[h - 1];
@@ -5022,6 +5308,23 @@
 JS_MarkValue(rt, p->u.object_data, mark_func);
 }
 
+static void js_c_function_finalizer(JSRuntime *rt, JSValue val)
+{
+ JSObject *p = JS_VALUE_GET_OBJ(val);
+
+ if (p->u.cfunc.realm)
+ JS_FreeContext(p->u.cfunc.realm);
+}
+
+static void js_c_function_mark(JSRuntime *rt, JSValueConst val,
+ JS_MarkFunc *mark_func)
+{
+ JSObject *p = JS_VALUE_GET_OBJ(val);
+
+ if (p->u.cfunc.realm)
+ mark_func(rt, &p->u.cfunc.realm->header);
+}
+
 static void js_bytecode_function_finalizer(JSRuntime *rt, JSValue val)
 {
 JSObject *p1, *p = JS_VALUE_GET_OBJ(val);
@@ -5180,7 +5483,7 @@
 {
 struct list_head *el;
 JSGCObjectHeader *p;
-
+ 
 rt->gc_phase = JS_GC_PHASE_DECREF;
 for(;;) {
 el = rt->gc_zero_ref_count_list.next;
@@ -5333,7 +5636,7 @@
 mark_func(rt, &pr->u.var_ref->header);
 }
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
- /* nothing to do */
+ js_autoinit_mark(rt, pr, mark_func);
 }
 } else {
 JS_MarkValue(rt, pr->u.value, mark_func);
@@ -5358,6 +5661,8 @@
 for(i = 0; i < b->cpool_count; i++) {
 JS_MarkValue(rt, b->cpool[i], mark_func);
 }
+ if (b->realm)
+ mark_func(rt, &b->realm->header);
 }
 break;
 case JS_GC_OBJ_TYPE_VAR_REF:
@@ -5385,45 +5690,17 @@
 }
 }
 break;
+ case JS_GC_OBJ_TYPE_JS_CONTEXT:
+ {
+ JSContext *ctx = (JSContext *)gp;
+ JS_MarkContext(rt, ctx, mark_func);
+ }
+ break;
 default:
 abort();
 }
 }
 
-#if 0
-/* not useful until realms are supported */
-static void mark_context(JSRuntime *rt, JSContext *ctx)
-{
- int i;
- struct list_head *el;
-
- list_for_each(el, &ctx->loaded_modules) {
- JSModuleDef *m = list_entry(el, JSModuleDef, link);
- JS_MarkValue(rt, m->module_ns);
- JS_MarkValue(rt, m->func_obj);
- }
-
- JS_MarkValue(rt, ctx->current_exception);
-
- for(i = 0; i < rt->class_count; i++)
- JS_MarkValue(rt, ctx->class_proto[i]);
- JS_MarkValue(rt, ctx->regexp_ctor);
- JS_MarkValue(rt, ctx->function_ctor);
- JS_MarkValue(rt, ctx->function_proto);
- JS_MarkValue(rt, ctx->iterator_proto);
- JS_MarkValue(rt, ctx->async_iterator_proto);
- JS_MarkValue(rt, ctx->array_proto_values);
-
- for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++)
- JS_MarkValue(rt, ctx->native_error_proto[i]);
-
- JS_MarkValue(rt, ctx->throw_type_error);
- JS_MarkValue(rt, ctx->eval_obj);
- JS_MarkValue(rt, ctx->global_obj);
- JS_MarkValue(rt, ctx->global_var_obj);
-}
-#endif
-
 static void gc_decref_child(JSRuntime *rt, JSGCObjectHeader *p)
 {
 assert(p->ref_count > 0);
@@ -5438,7 +5715,7 @@
 {
 struct list_head *el, *el1;
 JSGCObjectHeader *p;
-
+ 
 init_list_head(&rt->tmp_obj_list);
 
 /* decrement the refcount of all the children of all the GC
@@ -5485,7 +5762,7 @@
 p->mark = 0; /* reset the mark for the next GC call */
 mark_children(rt, p, gc_scan_incref_child);
 }
-
+ 
 /* restore the refcount of the objects to be deleted. */
 list_for_each(el, &rt->tmp_obj_list) {
 p = list_entry(el, JSGCObjectHeader, link);
@@ -5531,7 +5808,7 @@
 }
 }
 rt->gc_phase = JS_GC_PHASE_NONE;
-
+ 
 list_for_each_safe(el, el1, &rt->gc_zero_ref_count_list) {
 p = list_entry(el, JSGCObjectHeader, link);
 assert(p->gc_obj_type == JS_GC_OBJ_TYPE_JS_OBJECT ||
@@ -5770,6 +6047,7 @@
 #ifdef CONFIG_BIGNUM
 case JS_CLASS_BIG_INT: /* u.object_data */
 case JS_CLASS_BIG_FLOAT: /* u.object_data */
+ case JS_CLASS_BIG_DECIMAL: /* u.object_data */
 #endif
 compute_value_size(p->u.object_data, hp);
 break;
@@ -6073,8 +6351,9 @@
 /* WARNING: obj is freed */
 JSValue JS_Throw(JSContext *ctx, JSValue obj)
 {
- JS_FreeValue(ctx, ctx->current_exception);
- ctx->current_exception = obj;
+ JSRuntime *rt = ctx->rt;
+ JS_FreeValue(ctx, rt->current_exception);
+ rt->current_exception = obj;
 return JS_EXCEPTION;
 }
 
@@ -6082,8 +6361,9 @@
 JSValue JS_GetException(JSContext *ctx)
 {
 JSValue val;
- val = ctx->current_exception;
- ctx->current_exception = JS_NULL;
+ JSRuntime *rt = ctx->rt;
+ val = rt->current_exception;
+ rt->current_exception = JS_NULL;
 return val;
 }
 
@@ -6195,7 +6475,7 @@
 JSProperty *pr;
 JSShapeProperty *prs;
 JSValueConst val;
-
+ 
 if (JS_VALUE_GET_TAG(func) != JS_TAG_OBJECT)
 return NULL;
 prs = find_own_property(&pr, JS_VALUE_GET_OBJ(func), JS_ATOM_name);
@@ -6226,7 +6506,7 @@
 const char *str1;
 JSObject *p;
 BOOL backtrace_barrier;
-
+ 
 js_dbuf_init(ctx, &dbuf);
 if (filename) {
 dbuf_printf(&dbuf, " at %s", filename);
@@ -6241,7 +6521,7 @@
 if (backtrace_flags & JS_BACKTRACE_FLAG_SINGLE_LEVEL)
 goto done;
 }
- for(sf = ctx->current_stack_frame; sf != NULL; sf = sf->prev_frame) {
+ for(sf = ctx->rt->current_stack_frame; sf != NULL; sf = sf->prev_frame) {
 if (backtrace_flags & JS_BACKTRACE_FLAG_SKIP_FIRST_LEVEL) {
 backtrace_flags &= ~JS_BACKTRACE_FLAG_SKIP_FIRST_LEVEL;
 continue;
@@ -6258,7 +6538,7 @@
 backtrace_barrier = FALSE;
 if (js_class_has_bytecode(p->class_id)) {
 JSFunctionBytecode *b;
- char atom_buf[ATOM_GET_STR_BUF_SIZE];
+ const char *atom_str;
 int line_num1;
 
 b = p->u.func.function_bytecode;
@@ -6266,9 +6546,10 @@
 if (b->has_debug) {
 line_num1 = find_line_num(ctx, b,
 sf->cur_pc - b->byte_code_buf - 1);
+ atom_str = JS_AtomToCString(ctx, b->debug.filename);
 dbuf_printf(&dbuf, " (%s",
- JS_AtomGetStr(ctx, atom_buf, sizeof(atom_buf),
- b->debug.filename));
+ atom_str ? atom_str : "<null>");
+ JS_FreeCString(ctx, atom_str);
 if (line_num1 != -1)
 dbuf_printf(&dbuf, ":%d", line_num1);
 dbuf_putc(&dbuf, ')');
@@ -6283,7 +6564,10 @@
 }
 done:
 dbuf_putc(&dbuf, '\0');
- str = JS_NewString(ctx, (char *)dbuf.buf);
+ if (dbuf_error(&dbuf))
+ str = JS_NULL;
+ else
+ str = JS_NewString(ctx, (char *)dbuf.buf);
 dbuf_free(&dbuf);
 JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_stack, str,
 JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
@@ -6335,12 +6619,13 @@
 static JSValue JS_ThrowError(JSContext *ctx, JSErrorEnum error_num,
 const char *fmt, va_list ap)
 {
+ JSRuntime *rt = ctx->rt;
 JSStackFrame *sf;
 BOOL add_backtrace;
 
 /* the backtrace is added later if called from a bytecode function */
- sf = ctx->current_stack_frame;
- add_backtrace = !ctx->in_out_of_memory &&
+ sf = rt->current_stack_frame;
+ add_backtrace = !rt->in_out_of_memory &&
 (!sf || (JS_GetFunctionBytecode(sf->cur_func) == NULL));
 return JS_ThrowError2(ctx, error_num, fmt, ap, add_backtrace);
 }
@@ -6394,13 +6679,40 @@
 }
 }
 
+/* never use it directly */
+#if defined(_MSC_VER)
+static JSValue __JS_ThrowTypeErrorAtom(JSContext *ctx, JSAtom atom, const char *fmt, ...)
+#else
+static JSValue __attribute__((format(printf, 3, 4))) __JS_ThrowTypeErrorAtom(JSContext *ctx, JSAtom atom, const char *fmt, ...)
+#endif
+{
+ char buf[ATOM_GET_STR_BUF_SIZE];
+ return JS_ThrowTypeError(ctx, fmt,
+ JS_AtomGetStr(ctx, buf, sizeof(buf), atom));
+}
+
+/* never use it directly */
+#if defined(_MSC_VER)
+static JSValue __JS_ThrowSyntaxErrorAtom(JSContext *ctx, JSAtom atom, const char *fmt, ...)
+#else
+static JSValue __attribute__((format(printf, 3, 4))) __JS_ThrowSyntaxErrorAtom(JSContext *ctx, JSAtom atom, const char *fmt, ...)
+#endif
+{
+ char buf[ATOM_GET_STR_BUF_SIZE];
+ return JS_ThrowSyntaxError(ctx, fmt,
+ JS_AtomGetStr(ctx, buf, sizeof(buf), atom));
+}
+
+/* %s is replaced by 'atom'. The macro is used so that gcc can check
+ the format string. */
+#define JS_ThrowTypeErrorAtom(ctx, fmt, atom) __JS_ThrowTypeErrorAtom(ctx, atom, fmt, "")
+#define JS_ThrowSyntaxErrorAtom(ctx, fmt, atom) __JS_ThrowSyntaxErrorAtom(ctx, atom, fmt, "")
+
 static int JS_ThrowTypeErrorReadOnly(JSContext *ctx, int flags, JSAtom atom)
 {
 if ((flags & JS_PROP_THROW) ||
 ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
- char buf[ATOM_GET_STR_BUF_SIZE];
- JS_ThrowTypeError(ctx, "%s is read-only",
- JS_AtomGetStr(ctx, buf, sizeof(buf), atom));
+ JS_ThrowTypeErrorAtom(ctx, "'%s' is read-only", atom);
 return -1;
 } else {
 return FALSE;
@@ -6454,10 +6766,11 @@
 
 JSValue JS_ThrowOutOfMemory(JSContext *ctx)
 {
- if (!ctx->in_out_of_memory) {
- ctx->in_out_of_memory = TRUE;
+ JSRuntime *rt = ctx->rt;
+ if (!rt->in_out_of_memory) {
+ rt->in_out_of_memory = TRUE;
 JS_ThrowInternalError(ctx, "out of memory");
- ctx->in_out_of_memory = FALSE;
+ rt->in_out_of_memory = FALSE;
 }
 return JS_EXCEPTION;
 }
@@ -6480,7 +6793,7 @@
 static JSValue JS_ThrowReferenceErrorNotDefined(JSContext *ctx, JSAtom name)
 {
 char buf[ATOM_GET_STR_BUF_SIZE];
- return JS_ThrowReferenceError(ctx, "%s is not defined",
+ return JS_ThrowReferenceError(ctx, "'%s' is not defined",
 JS_AtomGetStr(ctx, buf, sizeof(buf), name));
 }
 
@@ -6492,14 +6805,51 @@
 JS_AtomGetStr(ctx, buf, sizeof(buf), name));
 }
 
+static JSValue JS_ThrowReferenceErrorUninitialized2(JSContext *ctx,
+ JSFunctionBytecode *b,
+ int idx, BOOL is_ref)
+{
+ JSAtom atom = JS_ATOM_NULL;
+ if (is_ref) {
+ atom = b->closure_var[idx].var_name;
+ } else {
+ /* not present if the function is stripped and contains no eval() */
+ if (b->vardefs)
+ atom = b->vardefs[b->arg_count + idx].var_name;
+ }
+ return JS_ThrowReferenceErrorUninitialized(ctx, atom);
+}
+
 static JSValue JS_ThrowTypeErrorInvalidClass(JSContext *ctx, int class_id)
 {
 JSRuntime *rt = ctx->rt;
- char buf[ATOM_GET_STR_BUF_SIZE];
 JSAtom name;
 name = rt->class_array[class_id].class_name;
- return JS_ThrowTypeError(ctx, "%s object expected",
- JS_AtomGetStr(ctx, buf, sizeof(buf), name));
+ return JS_ThrowTypeErrorAtom(ctx, "%s object expected", name);
+}
+
+static no_inline __exception int __js_poll_interrupts(JSContext *ctx)
+{
+ JSRuntime *rt = ctx->rt;
+ ctx->interrupt_counter = JS_INTERRUPT_COUNTER_INIT;
+ if (rt->interrupt_handler) {
+ if (rt->interrupt_handler(rt, rt->interrupt_opaque)) {
+ /* XXX: should set a specific flag to avoid catching */
+ JS_ThrowInternalError(ctx, "interrupted");
+ JS_SetUncatchableError(ctx, ctx->rt->current_exception, TRUE);
+ return -1;
+ }
+ }
+ return 0;
+}
+
+static inline __exception int js_poll_interrupts(JSContext *ctx)
+{
+ if (unlikely(--ctx->interrupt_counter <= 0)) {
+ return __js_poll_interrupts(ctx);
+ } else {
+ return 0;
+ }
 }
 
 /* return -1 (exception) or TRUE/FALSE */
@@ -6579,38 +6929,25 @@
 return JS_SetPrototypeInternal(ctx, obj, proto_val, TRUE);
 }
 
-/* Return an Object, JS_NULL or JS_EXCEPTION in case of Proxy object. */
-JSValueConst JS_GetPrototype(JSContext *ctx, JSValueConst val)
+/* Only works for primitive types, otherwise return JS_NULL. */
+static JSValueConst JS_GetPrototypePrimitive(JSContext *ctx, JSValueConst val)
 {
- JSObject *p;
-
 switch(JS_VALUE_GET_NORM_TAG(val)) {
 #ifdef CONFIG_BIGNUM
 case JS_TAG_BIG_INT:
 val = ctx->class_proto[JS_CLASS_BIG_INT];
 break;
- case JS_TAG_INT:
- if (is_bigint_mode(ctx)) {
- val = ctx->class_proto[JS_CLASS_BIG_INT];
- } else {
- val = ctx->class_proto[JS_CLASS_NUMBER];
- }
- break;
- case JS_TAG_FLOAT64:
- val = ctx->class_proto[JS_CLASS_NUMBER];
- break;
 case JS_TAG_BIG_FLOAT:
 val = ctx->class_proto[JS_CLASS_BIG_FLOAT];
 break;
 case JS_TAG_BIG_DECIMAL:
 val = ctx->class_proto[JS_CLASS_BIG_DECIMAL];
 break;
-#else
+#endif
 case JS_TAG_INT:
 case JS_TAG_FLOAT64:
 val = ctx->class_proto[JS_CLASS_NUMBER];
 break;
-#endif
 case JS_TAG_BOOL:
 val = ctx->class_proto[JS_CLASS_BOOLEAN];
 break;
@@ -6621,26 +6958,45 @@
 val = ctx->class_proto[JS_CLASS_SYMBOL];
 break;
 case JS_TAG_OBJECT:
- p = JS_VALUE_GET_OBJ(val);
+ case JS_TAG_NULL:
+ case JS_TAG_UNDEFINED:
+ default:
+ val = JS_NULL;
+ break;
+ }
+ return val;
+}
+
+/* Return an Object, JS_NULL or JS_EXCEPTION in case of Proxy object. */
+JSValue JS_GetPrototype(JSContext *ctx, JSValueConst obj)
+{
+ JSValue val;
+ if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+ JSObject *p;
+ p = JS_VALUE_GET_OBJ(obj);
 if (unlikely(p->class_id == JS_CLASS_PROXY)) {
- val = js_proxy_getPrototypeOf(ctx, val);
+ val = js_proxy_getPrototypeOf(ctx, obj);
 } else {
 p = p->shape->proto;
 if (!p)
 val = JS_NULL;
 else
- val = JS_MKPTR(JS_TAG_OBJECT, p);
+ val = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
 }
- break;
- case JS_TAG_NULL:
- case JS_TAG_UNDEFINED:
- default:
- val = JS_NULL;
- break;
+ } else {
+ val = JS_DupValue(ctx, JS_GetPrototypePrimitive(ctx, obj));
 }
 return val;
 }
 
+static JSValue JS_GetPrototypeFree(JSContext *ctx, JSValue obj)
+{
+ JSValue obj1;
+ obj1 = JS_GetPrototype(ctx, obj);
+ JS_FreeValue(ctx, obj);
+ return obj1;
+}
+
 /* return TRUE, FALSE or (-1) in case of exception */
 static int JS_OrdinaryIsInstanceOf(JSContext *ctx, JSValueConst val,
 JSValueConst obj)
@@ -6661,7 +7017,6 @@
 /* Only explicitly boxed values are instances of constructors */
 if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
 return FALSE;
- ret = FALSE;
 obj_proto = JS_GetProperty(ctx, obj, JS_ATOM_prototype);
 if (JS_VALUE_GET_TAG(obj_proto) != JS_TAG_OBJECT) {
 if (!JS_IsException(obj_proto))
@@ -6674,19 +7029,36 @@
 for(;;) {
 proto1 = p->shape->proto;
 if (!proto1) {
- if (p->class_id == JS_CLASS_PROXY) {
- JSValueConst proto_val;
- proto_val = JS_GetPrototype(ctx, JS_MKPTR(JS_TAG_OBJECT, (JSObject *)p));
- if (JS_IsException(proto_val)) {
- ret = -1;
- goto done;
+ /* slow case if proxy in the prototype chain */
+ if (unlikely(p->class_id == JS_CLASS_PROXY)) {
+ JSValue obj1;
+ obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, (JSObject *)p));
+ for(;;) {
+ obj1 = JS_GetPrototypeFree(ctx, obj1);
+ if (JS_IsException(obj1)) {
+ ret = -1;
+ break;
+ }
+ if (JS_IsNull(obj1)) {
+ ret = FALSE;
+ break;
+ }
+ if (proto == JS_VALUE_GET_OBJ(obj1)) {
+ JS_FreeValue(ctx, obj1);
+ ret = TRUE;
+ break;
+ }
+ /* must check for timeout to avoid infinite loop */
+ if (js_poll_interrupts(ctx)) {
+ JS_FreeValue(ctx, obj1);
+ ret = -1;
+ break;
+ }
 }
- proto1 = JS_VALUE_GET_OBJ(proto_val);
- if (!proto1)
- break;
 } else {
- break;
+ ret = FALSE;
 }
+ break;
 }
 p = proto1;
 if (proto == p) {
@@ -6724,9 +7096,37 @@
 return JS_OrdinaryIsInstanceOf(ctx, val, obj);
 }
 
-static int JS_AutoInitProperty(JSContext *ctx, JSObject *p, JSAtom prop, JSProperty *pr)
+/* return the value associated to the autoinit property or an exception */
+typedef JSValue JSAutoInitFunc(JSContext *ctx, JSObject *p, JSAtom atom, void *opaque);
+
+static JSAutoInitFunc *js_autoinit_func_table[] = {
+ js_instantiate_prototype, /* JS_AUTOINIT_ID_PROTOTYPE */
+ js_module_ns_autoinit, /* JS_AUTOINIT_ID_MODULE_NS */
+ JS_InstantiateFunctionListItem2, /* JS_AUTOINIT_ID_PROP */
+};
+
+/* warning: 'prs' is reallocated after it */
+static int JS_AutoInitProperty(JSContext *ctx, JSObject *p, JSAtom prop,
+ JSProperty *pr, JSShapeProperty *prs)
 {
- return (*pr->u.init.init_func)(ctx, p, prop, pr->u.init.opaque);
+ JSValue val;
+ JSContext *realm;
+ JSAutoInitFunc *func;
+
+ if (js_shape_prepare_update(ctx, p, &prs))
+ return -1;
+
+ realm = js_autoinit_get_realm(pr);
+ func = js_autoinit_func_table[js_autoinit_get_id(pr)];
+ /* 'func' shall not modify the object properties 'pr' */
+ val = func(realm, p, prop, pr->u.init.opaque);
+ js_autoinit_free(ctx->rt, pr);
+ prs->flags &= ~JS_PROP_TMASK;
+ pr->u.value = JS_UNDEFINED;
+ if (JS_IsException(val))
+ return -1;
+ pr->u.value = val;
+ return 0;
 }
 
 JSValue JS_GetPropertyInternal(JSContext *ctx, JSValueConst obj,
@@ -6742,8 +7142,9 @@
 if (unlikely(tag != JS_TAG_OBJECT)) {
 switch(tag) {
 case JS_TAG_NULL:
+ return JS_ThrowTypeErrorAtom(ctx, "cannot read property '%s' of null", prop);
 case JS_TAG_UNDEFINED:
- return JS_ThrowTypeError(ctx, "value has no property");
+ return JS_ThrowTypeErrorAtom(ctx, "cannot read property '%s' of undefined", prop);
 case JS_TAG_EXCEPTION:
 return JS_EXCEPTION;
 case JS_TAG_STRING:
@@ -6768,7 +7169,7 @@
 break;
 }
 /* cannot raise an exception */
- p = JS_VALUE_GET_OBJ(JS_GetPrototype(ctx, obj));
+ p = JS_VALUE_GET_OBJ(JS_GetPrototypePrimitive(ctx, obj));
 if (!p)
 return JS_UNDEFINED;
 } else {
@@ -6796,7 +7197,7 @@
 return JS_DupValue(ctx, val);
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
 /* Instantiate property and retry */
- if (JS_AutoInitProperty(ctx, p, prop, pr))
+ if (JS_AutoInitProperty(ctx, p, prop, pr, prs))
 return JS_EXCEPTION;
 continue;
 }
@@ -6814,7 +7215,7 @@
 return JS_GetPropertyUint32(ctx, JS_MKPTR(JS_TAG_OBJECT, p), idx);
 } else if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
 p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
- goto typed_array_oob;
+ return JS_UNDEFINED;
 }
 } else if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
 p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
@@ -6823,9 +7224,6 @@
 if (ret != 0) {
 if (ret < 0)
 return JS_EXCEPTION;
- typed_array_oob:
- if (typed_array_is_detached(ctx, p))
- return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
 return JS_UNDEFINED;
 }
 }
@@ -6833,15 +7231,25 @@
 const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
 if (em) {
 if (em->get_property) {
+ JSValue obj1, retval;
 /* XXX: should pass throw_ref_error */
- return em->get_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p),
- prop, this_obj);
+ /* Note: if 'p' is a prototype, it can be
+ freed in the called function */
+ obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+ retval = em->get_property(ctx, obj1, prop, this_obj);
+ JS_FreeValue(ctx, obj1);
+ return retval;
 }
 if (em->get_own_property) {
 JSPropertyDescriptor desc;
 int ret;
+ JSValue obj1;
 
- ret = em->get_own_property(ctx, &desc, JS_MKPTR(JS_TAG_OBJECT, p), prop);
+ /* Note: if 'p' is a prototype, it can be
+ freed in the called function */
+ obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+ ret = em->get_own_property(ctx, &desc, obj1, prop);
+ JS_FreeValue(ctx, obj1);
 if (ret < 0)
 return JS_EXCEPTION;
 if (ret) {
@@ -6869,9 +7277,8 @@
 
 static JSValue JS_ThrowTypeErrorPrivateNotFound(JSContext *ctx, JSAtom atom)
 {
- char buf[ATOM_GET_STR_BUF_SIZE];
- return JS_ThrowTypeError(ctx, "private class field %s does not exist",
- JS_AtomGetStr(ctx, buf, sizeof(buf), atom));
+ return JS_ThrowTypeErrorAtom(ctx, "private class field '%s' does not exist",
+ atom);
 }
 
 /* Private fields can be added even on non extensible objects or
@@ -6901,9 +7308,8 @@
 p = JS_VALUE_GET_OBJ(obj);
 prs = find_own_property(&pr, p, prop);
 if (prs) {
- char buf[ATOM_GET_STR_BUF_SIZE];
- JS_ThrowTypeError(ctx, "private class field %s already exists",
- JS_AtomGetStr(ctx, buf, sizeof(buf), prop));
+ JS_ThrowTypeErrorAtom(ctx, "private class field '%s' already exists",
+ prop);
 goto fail;
 }
 pr = add_property(ctx, p, prop, JS_PROP_C_W_E);
@@ -6984,7 +7390,7 @@
 JSProperty *pr;
 JSValue brand;
 JSAtom brand_atom;
-
+ 
 if (unlikely(JS_VALUE_GET_TAG(home_obj) != JS_TAG_OBJECT)) {
 JS_ThrowTypeErrorNotAnObject(ctx);
 return -1;
@@ -7006,7 +7412,7 @@
 brand = JS_DupValue(ctx, pr->u.value);
 }
 brand_atom = js_symbol_to_atom(ctx, brand);
-
+ 
 if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)) {
 JS_ThrowTypeErrorNotAnObject(ctx);
 JS_FreeAtom(ctx, brand_atom);
@@ -7027,7 +7433,7 @@
 JSShapeProperty *prs;
 JSProperty *pr;
 JSValueConst brand;
-
+ 
 /* get the home object of 'func' */
 if (unlikely(JS_VALUE_GET_TAG(func) != JS_TAG_OBJECT)) {
 not_obj:
@@ -7049,23 +7455,39 @@
 /* safety check */
 if (unlikely(JS_VALUE_GET_TAG(brand) != JS_TAG_SYMBOL))
 goto not_obj;
-
+ 
 /* get the brand array of 'obj' */
 if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
 goto not_obj;
 p = JS_VALUE_GET_OBJ(obj);
 #if defined(JS_VALUE_CANNOT_BE_CAST)
- prs = find_own_property(&pr, p, js_symbol_to_atom(ctx, brand));
+	prs = find_own_property(&pr, p, js_symbol_to_atom(ctx, brand));
 #else
- prs = find_own_property(&pr, p, js_symbol_to_atom(ctx, (JSValue)brand));
+	prs = find_own_property(&pr, p, js_symbol_to_atom(ctx, (JSValue)brand));
 #endif
- if (!prs) {
+	if (!prs) {
 JS_ThrowTypeError(ctx, "invalid brand on object");
 return -1;
 }
 return 0;
 }
 
+static uint32_t js_string_obj_get_length(JSContext *ctx,
+ JSValueConst obj)
+{
+ JSObject *p;
+ JSString *p1;
+ uint32_t len = 0;
+
+ /* This is a class exotic method: obj class_id is JS_CLASS_STRING */
+ p = JS_VALUE_GET_OBJ(obj);
+ if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_STRING) {
+ p1 = JS_VALUE_GET_STRING(p->u.object_data);
+ len = p1->len;
+ }
+ return len;
+}
+
 static int num_keys_cmp(const void *p1, const void *p2, void *opaque)
 {
 JSContext *ctx = opaque;
@@ -7077,11 +7499,11 @@
 JS_AtomIsArrayIndex(ctx, &v2, atom2);
 #else
 BOOL atom1_is_integer, atom2_is_integer;
+
 atom1_is_integer = JS_AtomIsArrayIndex(ctx, &v1, atom1);
 atom2_is_integer = JS_AtomIsArrayIndex(ctx, &v2, atom2);
- assert(atom1_is_integer && atom2_is_integer );
+ assert(atom1_is_integer && atom2_is_integer);
 #endif
-
 if (v1 < v2)
 return -1;
 else if (v1 == v2)
@@ -7113,11 +7535,11 @@
 JSPropertyEnum *tab_atom, *tab_exotic;
 JSAtom atom;
 uint32_t num_keys_count, str_keys_count, sym_keys_count, atom_count;
- uint32_t num_index, str_index, sym_index, exotic_count;
+ uint32_t num_index, str_index, sym_index, exotic_count, exotic_keys_count;
 BOOL is_enumerable, num_sorted;
 uint32_t num_key;
 JSAtomKindEnum kind;
-
+ 
 /* clear pointer for consistency in case of failure */
 *ptab = NULL;
 *plen = 0;
@@ -7126,6 +7548,7 @@
 num_keys_count = 0;
 str_keys_count = 0;
 sym_keys_count = 0;
+ exotic_keys_count = 0;
 exotic_count = 0;
 tab_exotic = NULL;
 sh = p->shape;
@@ -7159,17 +7582,13 @@
 
 if (p->is_exotic) {
 if (p->fast_array) {
- /* the implicit GetOwnProperty raises an exception if the
- typed array is detached */
- if ((flags & (JS_GPN_SET_ENUM | JS_GPN_ENUM_ONLY)) &&
- (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
- p->class_id <= JS_CLASS_FLOAT64_ARRAY) &&
- typed_array_is_detached(ctx, p) &&
- typed_array_get_length(ctx, p) != 0) {
- JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
- return -1;
+ if (flags & JS_GPN_STRING_MASK) {
+ num_keys_count += p->u.array.count;
+ }
+ } else if (p->class_id == JS_CLASS_STRING) {
+ if (flags & JS_GPN_STRING_MASK) {
+ num_keys_count += js_string_obj_get_length(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
 }
- num_keys_count += p->u.array.count;
 } else {
 const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
 if (em && em->get_own_property_names) {
@@ -7198,13 +7617,7 @@
 tab_exotic[i].is_enumerable = is_enumerable;
 }
 if (!(flags & JS_GPN_ENUM_ONLY) || is_enumerable) {
- if (JS_AtomIsArrayIndex(ctx, &num_key, atom)) {
- num_keys_count++;
- } else if (kind == JS_ATOM_KIND_STRING) {
- str_keys_count++;
- } else {
- sym_keys_count++;
- }
+ exotic_keys_count++;
 }
 }
 }
@@ -7214,7 +7627,7 @@
 
 /* fill them */
 
- atom_count = num_keys_count + str_keys_count + sym_keys_count;
+ atom_count = num_keys_count + str_keys_count + sym_keys_count + exotic_keys_count;
 /* avoid allocating 0 bytes */
 tab_atom = js_malloc(ctx, sizeof(tab_atom[0]) * max_int(atom_count, 1));
 if (!tab_atom) {
@@ -7250,41 +7663,43 @@
 }
 
 if (p->is_exotic) {
+ int len;
 if (p->fast_array) {
- for(i = 0; i < p->u.array.count; i++) {
- tab_atom[num_index].atom = __JS_AtomFromUInt32(i);
- if (tab_atom[num_index].atom == JS_ATOM_NULL) {
- js_free_prop_enum(ctx, tab_exotic, exotic_count);
- js_free_prop_enum(ctx, tab_atom, num_index);
- return -1;
+ if (flags & JS_GPN_STRING_MASK) {
+ len = p->u.array.count;
+ goto add_array_keys;
+ }
+ } else if (p->class_id == JS_CLASS_STRING) {
+ if (flags & JS_GPN_STRING_MASK) {
+ len = js_string_obj_get_length(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+ add_array_keys:
+ for(i = 0; i < len; i++) {
+ tab_atom[num_index].atom = __JS_AtomFromUInt32(i);
+ if (tab_atom[num_index].atom == JS_ATOM_NULL) {
+ js_free_prop_enum(ctx, tab_atom, num_index);
+ return -1;
+ }
+ tab_atom[num_index].is_enumerable = TRUE;
+ num_index++;
 }
- tab_atom[num_index].is_enumerable = TRUE;
- num_index++;
 }
- }
- if (exotic_count > 0) {
+ } else {
+ /* Note: exotic keys are not reordered and comes after the object own properties. */
 for(i = 0; i < exotic_count; i++) {
 atom = tab_exotic[i].atom;
 is_enumerable = tab_exotic[i].is_enumerable;
 kind = JS_AtomGetKind(ctx, atom);
 if ((!(flags & JS_GPN_ENUM_ONLY) || is_enumerable) &&
 ((flags >> kind) & 1) != 0) {
- if (JS_AtomIsArrayIndex(ctx, &num_key, atom)) {
- j = num_index++;
- num_sorted = FALSE;
- } else if (kind == JS_ATOM_KIND_STRING) {
- j = str_index++;
- } else {
- j = sym_index++;
- }
- tab_atom[j].atom = atom;
- tab_atom[j].is_enumerable = is_enumerable;
+ tab_atom[sym_index].atom = atom;
+ tab_atom[sym_index].is_enumerable = is_enumerable;
+ sym_index++;
 } else {
 JS_FreeAtom(ctx, atom);
 }
 }
+ js_free(ctx, tab_exotic);
 }
- js_free(ctx, tab_exotic);
 }
 
 assert(num_index == num_keys_count);
@@ -7344,7 +7759,7 @@
 desc->value = JS_DupValue(ctx, val);
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
 /* Instantiate property and retry */
- if (JS_AutoInitProperty(ctx, p, prop, pr))
+ if (JS_AutoInitProperty(ctx, p, prop, pr, prs))
 return -1;
 goto retry;
 }
@@ -7372,10 +7787,8 @@
 idx = __JS_AtomToUInt32(prop);
 if (idx < p->u.array.count) {
 if (desc) {
- desc->flags = JS_PROP_WRITABLE | JS_PROP_ENUMERABLE;
- if (p->class_id == JS_CLASS_ARRAY ||
- p->class_id == JS_CLASS_ARGUMENTS)
- desc->flags |= JS_PROP_CONFIGURABLE;
+ desc->flags = JS_PROP_WRITABLE | JS_PROP_ENUMERABLE |
+ JS_PROP_CONFIGURABLE;
 desc->getter = JS_UNDEFINED;
 desc->setter = JS_UNDEFINED;
 desc->value = JS_GetPropertyUint32(ctx, JS_MKPTR(JS_TAG_OBJECT, p), idx);
@@ -7383,19 +7796,6 @@
 return TRUE;
 }
 }
- if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
- p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
- int ret;
- ret = JS_AtomIsNumericIndex(ctx, prop);
- if (ret != 0) {
- if (ret < 0)
- return -1;
- if (typed_array_is_detached(ctx, p)) {
- JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
- return -1;
- }
- }
- }
 } else {
 const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
 if (em && em->get_own_property) {
@@ -7450,6 +7850,7 @@
 {
 JSObject *p;
 int ret;
+ JSValue obj1;
 
 if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
 return FALSE;
@@ -7457,10 +7858,18 @@
 for(;;) {
 if (p->is_exotic) {
 const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
- if (em && em->has_property)
- return em->has_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p), prop);
+ if (em && em->has_property) {
+ /* has_property can free the prototype */
+ obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+ ret = em->has_property(ctx, obj1, prop);
+ JS_FreeValue(ctx, obj1);
+ return ret;
+ }
 }
+ /* JS_GetOwnPropertyInternal can free the prototype */
+ JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
 ret = JS_GetOwnPropertyInternal(ctx, NULL, p, prop);
+ JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
 if (ret != 0)
 return ret;
 if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
@@ -7469,8 +7878,6 @@
 if (ret != 0) {
 if (ret < 0)
 return -1;
- /* the detached array test was done in
- JS_GetOwnPropertyInternal() */
 return FALSE;
 }
 }
@@ -7734,7 +8141,7 @@
 redo:
 sh = p->shape;
 h1 = atom & sh->prop_hash_mask;
- h = sh->prop_hash_end[-h1 - 1];
+ h = prop_hash_end(sh)[-h1 - 1];
 prop = get_shape_prop(sh);
 lpr = NULL;
 lpr_idx = 0; /* prevent warning */
@@ -7755,8 +8162,9 @@
 lpr = get_shape_prop(sh) + lpr_idx;
 lpr->hash_next = pr->hash_next;
 } else {
- sh->prop_hash_end[-h1 - 1] = pr->hash_next;
+ prop_hash_end(sh)[-h1 - 1] = pr->hash_next;
 }
+ sh->deleted_prop_count++;
 /* free the entry */
 pr1 = &p->prop[h - 1];
 free_property(ctx->rt, pr1, pr->flags);
@@ -7765,6 +8173,12 @@
 pr->flags = 0;
 pr->atom = JS_ATOM_NULL;
 pr1->u.value = JS_UNDEFINED;
+
+ /* compact the properties if too many deleted properties */
+ if (sh->deleted_prop_count >= 8 &&
+ sh->deleted_prop_count >= ((unsigned)sh->prop_count / 2)) {
+ compact_properties(ctx, p);
+ }
 return TRUE;
 }
 lpr = pr;
@@ -7788,7 +8202,7 @@
 return -1;
 goto redo;
 } else {
- return FALSE; /* not configurable */
+ return FALSE;
 }
 }
 } else {
@@ -7815,6 +8229,7 @@
 if (JS_IsException(ret))
 return -1;
 JS_FreeValue(ctx, ret);
+ return TRUE;
 } else {
 JS_FreeValue(ctx, val);
 if ((flags & JS_PROP_THROW) ||
@@ -7822,21 +8237,25 @@
 JS_ThrowTypeError(ctx, "no setter for property");
 return -1;
 }
- /* XXX: should return FALSE? */
+ return FALSE;
 }
- return TRUE;
 }
 
 /* set the array length and remove the array elements if necessary. */
-static int set_array_length(JSContext *ctx, JSObject *p, JSProperty *prop,
- JSValue val, int flags)
+static int set_array_length(JSContext *ctx, JSObject *p, JSValue val,
+ int flags)
 {
 uint32_t len, idx, cur_len;
 int i, ret;
 
- ret = JS_ToArrayLengthFree(ctx, &len, val);
+ /* Note: this call can reallocate the properties of 'p' */
+ ret = JS_ToArrayLengthFree(ctx, &len, val, FALSE);
 if (ret)
 return -1;
+ /* JS_ToArrayLengthFree() must be done before the read-only test */
+ if (unlikely(!(p->shape->prop[0].flags & JS_PROP_WRITABLE)))
+ return JS_ThrowTypeErrorReadOnly(ctx, flags, JS_ATOM_length);
+
 if (likely(p->fast_array)) {
 uint32_t old_len = p->u.array.count;
 if (len < old_len) {
@@ -7845,15 +8264,11 @@
 }
 p->u.array.count = len;
 }
-#ifdef CONFIG_BIGNUM
- set_value(ctx, &prop->u.value, JS_NewUint32(ctx, len));
-#else
- prop->u.value = JS_NewUint32(ctx, len);
-#endif
+ p->prop[0].u.value = JS_NewUint32(ctx, len);
 } else {
 /* Note: length is always a uint32 because the object is an
 array */
- JS_ToUint32(ctx, &cur_len, prop->u.value);
+ JS_ToUint32(ctx, &cur_len, p->prop[0].u.value);
 if (len < cur_len) {
 uint32_t d;
 JSShape *sh;
@@ -7917,6 +8332,23 @@
 return TRUE;
 }
 
+/* return -1 if exception */
+static int expand_fast_array(JSContext *ctx, JSObject *p, uint32_t new_len)
+{
+ uint32_t new_size;
+ size_t slack;
+ JSValue *new_array_prop;
+ /* XXX: potential arithmetic overflow */
+ new_size = max_int(new_len, p->u.array.u1.size * 3 / 2);
+ new_array_prop = js_realloc2(ctx, p->u.array.u.values, sizeof(JSValue) * new_size, &slack);
+ if (!new_array_prop)
+ return -1;
+ new_size += slack / sizeof(*new_array_prop);
+ p->u.array.u.values = new_array_prop;
+ p->u.array.u1.size = new_size;
+ return 0;
+}
+
 /* Preconditions: 'p' must be of class JS_CLASS_ARRAY, p->fast_array =
 TRUE and p->extensible = TRUE */
 static int add_fast_array_element(JSContext *ctx, JSObject *p,
@@ -7939,19 +8371,10 @@
 }
 }
 if (unlikely(new_len > p->u.array.u1.size)) {
- uint32_t new_size;
- size_t slack;
- JSValue *new_array_prop;
- /* XXX: potential arithmetic overflow */
- new_size = max_int(new_len, p->u.array.u1.size * 3 / 2);
- new_array_prop = js_realloc2(ctx, p->u.array.u.values, sizeof(JSValue) * new_size, &slack);
- if (!new_array_prop) {
+ if (expand_fast_array(ctx, p, new_len)) {
 JS_FreeValue(ctx, val);
 return -1;
 }
- new_size += slack / sizeof(*new_array_prop);
- p->u.array.u.values = new_array_prop;
- p->u.array.u1.size = new_size;
 }
 p->u.array.u.values[new_len - 1] = val;
 p->u.array.count = new_len;
@@ -7965,29 +8388,38 @@
 JS_FreeValue(ctx, desc->value);
 }
 
-/* generic (and slower) version of JS_SetProperty() for Reflect.set() */
+/* generic (and slower) version of JS_SetProperty() for
+ * Reflect.set(). 'obj' must be an object. */
 static int JS_SetPropertyGeneric(JSContext *ctx,
- JSObject *p, JSAtom prop,
+ JSValueConst obj, JSAtom prop,
 JSValue val, JSValueConst this_obj,
 int flags)
 {
 int ret;
 JSPropertyDescriptor desc;
-
- while (p != NULL) {
+ JSValue obj1;
+ JSObject *p;
+ 
+ obj1 = JS_DupValue(ctx, obj);
+ for(;;) {
+ p = JS_VALUE_GET_OBJ(obj1);
 if (p->is_exotic) {
 const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
 if (em && em->set_property) {
- ret = em->set_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p), prop,
+ ret = em->set_property(ctx, obj1, prop,
 val, this_obj, flags);
+ JS_FreeValue(ctx, obj1);
 JS_FreeValue(ctx, val);
 return ret;
 }
 }
 
 ret = JS_GetOwnPropertyInternal(ctx, &desc, p, prop);
- if (ret < 0)
+ if (ret < 0) {
+ JS_FreeValue(ctx, obj1);
+ JS_FreeValue(ctx, val);
 return ret;
+ }
 if (ret) {
 if (desc.flags & JS_PROP_GETSET) {
 JSObject *setter;
@@ -7998,27 +8430,38 @@
 ret = call_setter(ctx, setter, this_obj, val, flags);
 JS_FreeValue(ctx, desc.getter);
 JS_FreeValue(ctx, desc.setter);
+ JS_FreeValue(ctx, obj1);
 return ret;
 } else {
 JS_FreeValue(ctx, desc.value);
 if (!(desc.flags & JS_PROP_WRITABLE)) {
+ JS_FreeValue(ctx, obj1);
 goto read_only_error;
 }
 }
 break;
 }
- p = p->shape->proto;
+ /* Note: at this point 'obj1' cannot be a proxy. XXX: may have
+ to check recursion */
+ obj1 = JS_GetPrototypeFree(ctx, obj1);
+ if (JS_IsNull(obj1))
+ break;
 }
+ JS_FreeValue(ctx, obj1);
 
- if (!JS_IsObject(this_obj))
+ if (!JS_IsObject(this_obj)) {
+ JS_FreeValue(ctx, val);
 return JS_ThrowTypeErrorOrFalse(ctx, flags, "receiver is not an object");
-
+ }
+ 
 p = JS_VALUE_GET_OBJ(this_obj);
 
 /* modify the property in this_obj if it already exists */
 ret = JS_GetOwnPropertyInternal(ctx, &desc, p, prop);
- if (ret < 0)
+ if (ret < 0) {
+ JS_FreeValue(ctx, val);
 return ret;
+ }
 if (ret) {
 if (desc.flags & JS_PROP_GETSET) {
 JS_FreeValue(ctx, desc.getter);
@@ -8072,14 +8515,17 @@
 if (unlikely(tag != JS_TAG_OBJECT)) {
 switch(tag) {
 case JS_TAG_NULL:
+ JS_FreeValue(ctx, val);
+ JS_ThrowTypeErrorAtom(ctx, "cannot set property '%s' of null", prop);
+ return -1;
 case JS_TAG_UNDEFINED:
 JS_FreeValue(ctx, val);
- JS_ThrowTypeError(ctx, "value has no property");
+ JS_ThrowTypeErrorAtom(ctx, "cannot set property '%s' of undefined", prop);
 return -1;
 default:
 /* even on a primitive type we can have setters on the prototype */
 p = NULL;
- p1 = JS_VALUE_GET_OBJ(JS_GetPrototype(ctx, this_obj));
+ p1 = JS_VALUE_GET_OBJ(JS_GetPrototypePrimitive(ctx, this_obj));
 goto prototype_lookup;
 }
 }
@@ -8092,11 +8538,10 @@
 /* fast case */
 set_value(ctx, &pr->u.value, val);
 return TRUE;
- } else if ((prs->flags & (JS_PROP_LENGTH | JS_PROP_WRITABLE)) ==
- (JS_PROP_LENGTH | JS_PROP_WRITABLE)) {
+ } else if (prs->flags & JS_PROP_LENGTH) {
 assert(p->class_id == JS_CLASS_ARRAY);
 assert(prop == JS_ATOM_length);
- return set_array_length(ctx, p, pr, val, flags);
+ return set_array_length(ctx, p, val, flags);
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
 return call_setter(ctx, pr->u.getset.setter, this_obj, val, flags);
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
@@ -8109,7 +8554,7 @@
 return TRUE;
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
 /* Instantiate property and retry (potentially useless) */
- if (JS_AutoInitProperty(ctx, p, prop, pr)) {
+ if (JS_AutoInitProperty(ctx, p, prop, pr, prs)) {
 JS_FreeValue(ctx, val);
 return -1;
 }
@@ -8147,25 +8592,28 @@
 JS_FreeValue(ctx, val);
 if (JS_IsException(val))
 return -1;
- if (typed_array_is_detached(ctx, p1)) {
- JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
- return -1;
- }
 return JS_ThrowTypeErrorOrFalse(ctx, flags, "out-of-bound numeric index");
 }
 }
 } else {
 const JSClassExoticMethods *em = ctx->rt->class_array[p1->class_id].exotic;
 if (em) {
+ JSValue obj1;
 if (em->set_property) {
- ret = em->set_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p1), prop,
+ /* set_property can free the prototype */
+ obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p1));
+ ret = em->set_property(ctx, obj1, prop,
 val, this_obj, flags);
+ JS_FreeValue(ctx, obj1);
 JS_FreeValue(ctx, val);
 return ret;
 }
 if (em->get_own_property) {
+ /* get_own_property can free the prototype */
+ obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p1));
 ret = em->get_own_property(ctx, &desc,
- JS_MKPTR(JS_TAG_OBJECT, p1), prop);
+ obj1, prop);
+ JS_FreeValue(ctx, obj1);
 if (ret < 0) {
 JS_FreeValue(ctx, val);
 return ret;
@@ -8212,7 +8660,7 @@
 return call_setter(ctx, pr->u.getset.setter, this_obj, val, flags);
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
 /* Instantiate property and retry (potentially useless) */
- if (JS_AutoInitProperty(ctx, p1, prop, pr))
+ if (JS_AutoInitProperty(ctx, p1, prop, pr, prs))
 return -1;
 goto retry2;
 } else if (!(prs->flags & JS_PROP_WRITABLE)) {
@@ -8380,12 +8828,7 @@
 return -1;
 if (unlikely(idx >= (uint32_t)p->u.array.count)) {
 ta_out_of_bound:
- if (typed_array_is_detached(ctx, p)) {
- JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
- return -1;
- } else {
- return JS_ThrowTypeErrorOrFalse(ctx, flags, "out-of-bound numeric index");
- }
+ return JS_ThrowTypeErrorOrFalse(ctx, flags, "out-of-bound numeric index");
 }
 p->u.array.u.double_ptr[idx] = d;
 break;
@@ -8670,13 +9113,36 @@
 redo_prop_update:
 prs = find_own_property(&pr, p, prop);
 if (prs) {
+ /* the range of the Array length property is always tested before */
+ if ((prs->flags & JS_PROP_LENGTH) && (flags & JS_PROP_HAS_VALUE)) {
+ uint32_t array_length;
+ if (JS_ToArrayLengthFree(ctx, &array_length,
+ JS_DupValue(ctx, val), FALSE)) {
+ return -1;
+ }
+ /* this code relies on the fact that Uint32 are never allocated */
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+			val = JS_NewUint32(ctx, array_length);
+#else
+			val = (JSValueConst)JS_NewUint32(ctx, array_length);
+#endif
+			/* prs may have been modified */
+ prs = find_own_property(&pr, p, prop);
+ assert(prs != NULL);
+ }
 /* property already exists */
 if (!check_define_prop_flags(prs->flags, flags)) {
 not_configurable:
 return JS_ThrowTypeErrorOrFalse(ctx, flags, "property is not configurable");
 }
 
- retry:
+ if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+ /* Instantiate property and retry */
+ if (JS_AutoInitProperty(ctx, p, prop, pr, prs))
+ return -1;
+ goto redo_prop_update;
+ }
+
 if (flags & (JS_PROP_HAS_VALUE | JS_PROP_HAS_WRITABLE |
 JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
 if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
@@ -8699,13 +9165,6 @@
 /* convert to getset */
 if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
 free_var_ref(ctx->rt, pr->u.var_ref);
- } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
- /* clear property and update */
- if (js_shape_prepare_update(ctx, p, &prs))
- return -1;
- prs->flags &= ~JS_PROP_TMASK;
- pr->u.value = JS_UNDEFINED;
- goto retry;
 } else {
 JS_FreeValue(ctx, pr->u.value);
 }
@@ -8753,38 +9212,17 @@
 pr->u.value = JS_UNDEFINED;
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
 /* Note: JS_PROP_VARREF is always writable */
- } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
- /* clear property and update */
- if (js_shape_prepare_update(ctx, p, &prs))
- return -1;
- prs->flags &= ~JS_PROP_TMASK;
- pr->u.value = JS_UNDEFINED;
 } else {
 if ((prs->flags & (JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) == 0 &&
- (flags & JS_PROP_HAS_VALUE) &&
- !js_same_value(ctx, val, pr->u.value)) {
- goto not_configurable;
+ (flags & JS_PROP_HAS_VALUE)) {
+ if (!js_same_value(ctx, val, pr->u.value)) {
+ goto not_configurable;
+ } else {
+ return TRUE;
+ }
 }
 }
- if (prs->flags & JS_PROP_LENGTH) {
- if (flags & JS_PROP_HAS_VALUE) {
- res = set_array_length(ctx, p, pr, JS_DupValue(ctx, val),
- flags);
- } else {
- res = TRUE;
- }
- /* still need to reset the writable flag if needed.
- The JS_PROP_LENGTH is reset to have the correct
- read-only behavior in JS_SetProperty(). */
- if ((flags & (JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE)) ==
- JS_PROP_HAS_WRITABLE) {
- prs = get_shape_prop(p->shape);
- if (js_update_property_flags(ctx, p, &prs,
- prs->flags & ~(JS_PROP_WRITABLE | JS_PROP_LENGTH)))
- return -1;
- }
- return res;
- } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+ if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
 if (flags & JS_PROP_HAS_VALUE) {
 if (p->class_id == JS_CLASS_MODULE_NS) {
 /* JS_PROP_WRITABLE is always true for variable
@@ -8808,9 +9246,27 @@
 pr->u.value = val1;
 prs->flags &= ~(JS_PROP_TMASK | JS_PROP_WRITABLE);
 }
- } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
- /* XXX: should never happen, type was reset above */
- abort();
+ } else if (prs->flags & JS_PROP_LENGTH) {
+ if (flags & JS_PROP_HAS_VALUE) {
+ /* Note: no JS code is executable because
+ 'val' is guaranted to be a Uint32 */
+ res = set_array_length(ctx, p, JS_DupValue(ctx, val),
+ flags);
+ } else {
+ res = TRUE;
+ }
+ /* still need to reset the writable flag if
+ needed. The JS_PROP_LENGTH is kept because the
+ Uint32 test is still done if the length
+ property is read-only. */
+ if ((flags & (JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE)) ==
+ JS_PROP_HAS_WRITABLE) {
+ prs = get_shape_prop(p->shape);
+ if (js_update_property_flags(ctx, p, &prs,
+ prs->flags & ~JS_PROP_WRITABLE))
+ return -1;
+ }
+ return res;
 } else {
 if (flags & JS_PROP_HAS_VALUE) {
 JS_FreeValue(ctx, pr->u.value);
@@ -8895,9 +9351,9 @@
 typed_array_oob:
 return JS_ThrowTypeErrorOrFalse(ctx, flags, "out-of-bound index in typed array");
 }
- prop_flags = get_prop_flags(flags, JS_PROP_ENUMERABLE | JS_PROP_WRITABLE);
+ prop_flags = get_prop_flags(flags, JS_PROP_ENUMERABLE | JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
 if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET) ||
- prop_flags != (JS_PROP_ENUMERABLE | JS_PROP_WRITABLE)) {
+ prop_flags != (JS_PROP_ENUMERABLE | JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE)) {
 return JS_ThrowTypeErrorOrFalse(ctx, flags, "invalid descriptor flags");
 }
 if (flags & JS_PROP_HAS_VALUE) {
@@ -8912,8 +9368,7 @@
 }
 
 static int JS_DefineAutoInitProperty(JSContext *ctx, JSValueConst this_obj,
- JSAtom prop, int (*init_func)(JSContext *ctx, JSObject *obj,
- JSAtom prop, void *opaque),
+ JSAtom prop, JSAutoInitIDEnum id,
 void *opaque, int flags)
 {
 JSObject *p;
@@ -8934,8 +9389,10 @@
 pr = add_property(ctx, p, prop, (flags & JS_PROP_C_W_E) | JS_PROP_AUTOINIT);
 if (unlikely(!pr))
 return -1;
-
- pr->u.init.init_func = init_func;
+ pr->u.init.realm_and_id = (uintptr_t)JS_DupContext(ctx);
+ assert((pr->u.init.realm_and_id & 3) == 0);
+ assert(id <= 3);
+ pr->u.init.realm_and_id |= id;
 pr->u.init.opaque = opaque;
 return TRUE;
 }
@@ -9022,7 +9479,7 @@
 JSShapeProperty *prs;
 JSValueConst val;
 JSString *p;
-
+ 
 prs = find_own_property(&pr, JS_VALUE_GET_OBJ(obj), JS_ATOM_name);
 if (!prs)
 return FALSE;
@@ -9072,9 +9529,7 @@
 
 static JSValue JS_ThrowSyntaxErrorVarRedeclaration(JSContext *ctx, JSAtom prop)
 {
- char buf[ATOM_GET_STR_BUF_SIZE];
- return JS_ThrowSyntaxError(ctx, "redeclaration of %s",
- JS_AtomGetStr(ctx, buf, sizeof(buf), prop));
+ return JS_ThrowSyntaxErrorAtom(ctx, "redeclaration of '%s'", prop);
 }
 
 /* flags is 0, DEFINE_GLOBAL_LEX_VAR or DEFINE_GLOBAL_FUNC_VAR */
@@ -9083,7 +9538,6 @@
 {
 JSObject *p;
 JSShapeProperty *prs;
- char buf[ATOM_GET_STR_BUF_SIZE];
 
 p = JS_VALUE_GET_OBJ(ctx->global_obj);
 prs = find_own_property1(p, prop);
@@ -9101,8 +9555,8 @@
 ((prs->flags & (JS_PROP_WRITABLE | JS_PROP_ENUMERABLE)) !=
 (JS_PROP_WRITABLE | JS_PROP_ENUMERABLE)))) {
 define_error:
- JS_ThrowTypeError(ctx, "cannot define variable %s",
- JS_AtomGetStr(ctx, buf, sizeof(buf), prop));
+ JS_ThrowTypeErrorAtom(ctx, "cannot define variable '%s'",
+ prop);
 return -1;
 }
 }
@@ -9284,9 +9738,8 @@
 set_value(ctx, &pr->u.value, val);
 return 0;
 }
-
 flags = JS_PROP_THROW_STRICT;
- if (flag != 2 && is_strict_mode(ctx))
+ if (is_strict_mode(ctx)) 
 flags |= JS_PROP_NO_ADD;
 return JS_SetPropertyInternal(ctx, ctx->global_obj, prop, val, flags);
 }
@@ -9299,7 +9752,7 @@
 JSValue obj1;
 JSObject *p;
 int res;
-
+ 
 obj1 = JS_ToObject(ctx, obj);
 if (JS_IsException(obj1))
 return -1;
@@ -9411,7 +9864,7 @@
 
 void JS_ResetUncatchableError(JSContext *ctx)
 {
- JS_SetUncatchableError(ctx, ctx->current_exception, FALSE);
+ JS_SetUncatchableError(ctx, ctx->rt->current_exception, FALSE);
 }
 
 void JS_SetOpaque(JSValue obj, void *opaque)
@@ -9456,9 +9909,6 @@
 #define HINT_STRING 0
 #define HINT_NUMBER 1
 #define HINT_NONE 2
-#ifdef CONFIG_BIGNUM
-#define HINT_INTEGER 3
-#endif
 /* don't try Symbol.toPrimitive */
 #define HINT_FORCE_ORDINARY (1 << 4)
 
@@ -9493,11 +9943,6 @@
 case HINT_NONE:
 atom = JS_ATOM_default;
 break;
-#ifdef CONFIG_BIGNUM
- case HINT_INTEGER:
- atom = JS_ATOM_integer;
- break;
-#endif
 }
 arg = JS_AtomToString(ctx, atom);
 ret = JS_CallFree(ctx, method, val, 1, (JSValueConst *)&arg);
@@ -9546,6 +9991,24 @@
 return JS_ToPrimitiveFree(ctx, JS_DupValue(ctx, val), hint);
 }
 
+void JS_SetIsHTMLDDA(JSContext *ctx, JSValueConst obj)
+{
+ JSObject *p;
+ if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+ return;
+ p = JS_VALUE_GET_OBJ(obj);
+ p->is_HTMLDDA = TRUE;
+}
+
+static inline BOOL JS_IsHTMLDDA(JSContext *ctx, JSValueConst obj)
+{
+ JSObject *p;
+ if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+ return FALSE;
+ p = JS_VALUE_GET_OBJ(obj);
+ return p->is_HTMLDDA;
+}
+ 
 static int JS_ToBoolFree(JSContext *ctx, JSValue val)
 {
 uint32_t tag = JS_VALUE_GET_TAG(val);
@@ -9583,6 +10046,15 @@
 return ret;
 }
 #endif
+ case JS_TAG_OBJECT:
+ {
+ JSObject *p = JS_VALUE_GET_OBJ(val);
+ BOOL ret;
+ ret = !p->is_HTMLDDA;
+ JS_FreeValue(ctx, val);
+ return ret;
+ }
+ break;
 default:
 if (JS_TAG_IS_FLOAT64(tag)) {
 double d = JS_VALUE_GET_FLOAT64(val);
@@ -9638,11 +10110,11 @@
 {
 double d;
 int c;
-
+ 
 if (!is_float || radix != 10) {
 uint64_t n_max, n;
 int int_exp, is_neg;
-
+ 
 is_neg = 0;
 if (*p == '-') {
 is_neg = 1;
@@ -9690,7 +10162,7 @@
 /* accept _ between digits as a digit separator */
 #define ATOD_ACCEPT_UNDERSCORES (1 << 5)
 /* allow a suffix to override the type */
-#define ATOD_ACCEPT_SUFFIX (1 << 6)
+#define ATOD_ACCEPT_SUFFIX (1 << 6) 
 /* default type */
 #define ATOD_TYPE_MASK (3 << 7)
 #define ATOD_TYPE_FLOAT64 (0 << 7)
@@ -9699,7 +10171,7 @@
 #define ATOD_TYPE_BIG_DECIMAL (3 << 7)
 /* assume bigint mode: floats are parsed as integers if no decimal
 point nor exponent */
-#define ATOD_MODE_BIGINT (1 << 9)
+#define ATOD_MODE_BIGINT (1 << 9) 
 /* accept -0x1 */
 #define ATOD_ACCEPT_PREFIX_AFTER_SIGN (1 << 10)
 
@@ -9709,22 +10181,31 @@
 {
 bf_t a_s, *a = &a_s;
 int ret;
- bf_init(ctx->bf_ctx, a);
+ JSValue val;
+ val = JS_NewBigInt(ctx);
+ if (JS_IsException(val))
+ return val;
+ a = JS_GetBigInt(val);
 ret = bf_atof(a, buf, NULL, radix, BF_PREC_INF, BF_RNDZ);
 if (ret & BF_ST_MEM_ERROR) {
- bf_delete(a);
+ JS_FreeValue(ctx, val);
 return JS_ThrowOutOfMemory(ctx);
 }
- return JS_NewBigInt2(ctx, a, !(flags & ATOD_MODE_BIGINT));
+ val = JS_CompactBigInt1(ctx, val, (flags & ATOD_MODE_BIGINT) != 0);
+ return val;
 }
 
 static JSValue js_string_to_bigfloat(JSContext *ctx, const char *buf,
 int radix, int flags, slimb_t *pexponent)
 {
- bf_t a_s, *a = &a_s;
+ bf_t *a;
 int ret;
-
- bf_init(ctx->bf_ctx, a);
+ JSValue val;
+ 
+ val = JS_NewBigFloat(ctx);
+ if (JS_IsException(val))
+ return val;
+ a = JS_GetBigFloat(val);
 if (flags & ATOD_ACCEPT_SUFFIX) {
 /* return the exponent to get infinite precision */
 ret = bf_atof2(a, pexponent, buf, NULL, radix, BF_PREC_INF,
@@ -9734,25 +10215,30 @@
 ctx->fp_env.flags);
 }
 if (ret & BF_ST_MEM_ERROR) {
- bf_delete(a);
+ JS_FreeValue(ctx, val);
 return JS_ThrowOutOfMemory(ctx);
 }
- return JS_NewBigFloat(ctx, a);
+ return val;
 }
 
 static JSValue js_string_to_bigdecimal(JSContext *ctx, const char *buf,
 int radix, int flags, slimb_t *pexponent)
 {
- bfdec_t a_s, *a = &a_s;
+ bfdec_t *a;
 int ret;
- bfdec_init(ctx->bf_ctx, a);
+ JSValue val;
+ 
+ val = JS_NewBigDecimal(ctx);
+ if (JS_IsException(val))
+ return val;
+ a = JS_GetBigDecimal(val);
 ret = bfdec_atof(a, buf, NULL, BF_PREC_INF,
 BF_RNDZ | BF_ATOF_NO_NAN_INF);
 if (ret & BF_ST_MEM_ERROR) {
- bfdec_delete(a);
+ JS_FreeValue(ctx, val);
 return JS_ThrowOutOfMemory(ctx);
 }
- return JS_NewBigDecimal(ctx, a);
+ return val;
 }
 
 #endif
@@ -9775,11 +10261,11 @@
 int i, j, len;
 BOOL buf_allocated = FALSE;
 JSValue val;
-
+ 
 /* optional separator between digits */
 sep = (flags & ATOD_ACCEPT_UNDERSCORES) ? '_' : 256;
 has_legacy_octal = FALSE;
-
+ 
 p = str;
 p_start = p;
 is_neg = 0;
@@ -9834,10 +10320,12 @@
 strstart(p, "Infinity", &p)) {
 #ifdef CONFIG_BIGNUM
 if (atod_type == ATOD_TYPE_BIG_FLOAT) {
- bf_t a_s, *a = &a_s;
- bf_init(ctx->bf_ctx, a);
+ bf_t *a;
+ val = JS_NewBigFloat(ctx);
+ if (JS_IsException(val))
+ goto done;
+ a = JS_GetBigFloat(val);
 bf_set_inf(a, is_neg);
- val = JS_NewBigFloat(ctx, a);
 } else
 #endif
 {
@@ -9845,7 +10333,7 @@
 				double const zero = 0.0;
 				double d = 1.0 / zero;
 #else
-				double d = 1.0 / 0.0;
+ double d = 1.0 / 0.0;
 #endif
 if (is_neg)
 d = -d;
@@ -9868,6 +10356,8 @@
 if (*p == '.' && (p > p_start || to_digit((uint8_t)p[1]) < radix)) {
 is_float = TRUE;
 p++;
+ if (*p == sep)
+ goto fail;
 while (to_digit((uint8_t)*p) < radix ||
 (*p == sep && to_digit((uint8_t)p[1]) < radix))
 p++;
@@ -9919,7 +10409,7 @@
 } else if (*p == 'l') {
 p++;
 atod_type = ATOD_TYPE_BIG_FLOAT;
- } else if (*p == 'd') {
+ } else if (*p == 'm') {
 p++;
 atod_type = ATOD_TYPE_BIG_DECIMAL;
 } else {
@@ -9985,7 +10475,7 @@
 val = JS_NewFloat64(ctx, d);
 }
 #endif
-
+ 
 done:
 if (buf_allocated)
 js_free_rt(ctx->rt, buf);
@@ -10010,7 +10500,6 @@
 
 typedef enum JSToNumberHintEnum {
 TON_FLAG_NUMBER,
- TON_FLAG_INTEGER,
 TON_FLAG_NUMERIC,
 } JSToNumberHintEnum;
 
@@ -10019,7 +10508,6 @@
 {
 uint32_t tag;
 JSValue ret;
- int hint;
 
 redo:
 tag = JS_VALUE_GET_NORM_TAG(val);
@@ -10033,12 +10521,19 @@
 ret = val;
 break;
 case JS_TAG_BIG_INT:
- if (flag == TON_FLAG_NUMBER && !is_bigint_mode(ctx)) {
+ if (flag != TON_FLAG_NUMERIC) {
 JS_FreeValue(ctx, val);
 return JS_ThrowTypeError(ctx, "cannot convert bigint to number");
 }
- /* fall thru */
+ ret = val;
+ break;
 case JS_TAG_BIG_FLOAT:
+ if (flag != TON_FLAG_NUMERIC) {
+ JS_FreeValue(ctx, val);
+ return JS_ThrowTypeError(ctx, "cannot convert bigfloat to number");
+ }
+ ret = val;
+ break;
 #endif
 case JS_TAG_FLOAT64:
 case JS_TAG_INT:
@@ -10053,12 +10548,7 @@
 ret = JS_NAN;
 break;
 case JS_TAG_OBJECT:
-#ifdef CONFIG_BIGNUM
- hint = flag == TON_FLAG_INTEGER ? HINT_INTEGER : HINT_NUMBER;
-#else
- hint = HINT_NUMBER;
-#endif
- val = JS_ToPrimitiveFree(ctx, val, hint);
+ val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
 if (JS_IsException(val))
 return JS_EXCEPTION;
 goto redo;
@@ -10067,7 +10557,7 @@
 const char *str;
 const char *p;
 size_t len;
-
+ 
 str = JS_ToCStringLen(ctx, &len, val);
 JS_FreeValue(ctx, val);
 if (!str)
@@ -10078,10 +10568,6 @@
 ret = JS_NewInt32(ctx, 0);
 } else {
 int flags = ATOD_ACCEPT_BIN_OCT;
-#ifdef CONFIG_BIGNUM
- if (is_bigint_mode(ctx))
- flags |= ATOD_MODE_BIGINT;
-#endif
 ret = js_atof(ctx, p, &p, 0, flags);
 if (!JS_IsException(ret)) {
 p += skip_spaces(p);
@@ -10110,7 +10596,6 @@
 return JS_ToNumberHintFree(ctx, val, TON_FLAG_NUMBER);
 }
 
-#ifdef CONFIG_BIGNUM
 static JSValue JS_ToNumericFree(JSContext *ctx, JSValue val)
 {
 return JS_ToNumberHintFree(ctx, val, TON_FLAG_NUMERIC);
@@ -10120,7 +10605,6 @@
 {
 return JS_ToNumericFree(ctx, JS_DupValue(ctx, val));
 }
-#endif
 
 static __exception int __JS_ToFloat64Free(JSContext *ctx, double *pres,
 JSValue val)
@@ -10187,6 +10671,7 @@
 return JS_ToNumberFree(ctx, JS_DupValue(ctx, val));
 }
 
+/* same as JS_ToNumber() but return 0 in case of NaN/Undefined */
 static __maybe_unused JSValue JS_ToIntegerFree(JSContext *ctx, JSValue val)
 {
 uint32_t tag;
@@ -10208,18 +10693,12 @@
 ret = JS_NewInt32(ctx, 0);
 } else {
 /* convert -0 to +0 */
- /* XXX: should not be done here ? */
 d = trunc(d) + 0.0;
 ret = JS_NewFloat64(ctx, d);
 }
 }
 break;
 #ifdef CONFIG_BIGNUM
- case JS_TAG_BIG_INT:
- if (!is_bigint_mode(ctx))
- goto to_number;
- ret = val;
- break;
 case JS_TAG_BIG_FLOAT:
 {
 bf_t a_s, *a, r_s, *r = &r_s;
@@ -10233,10 +10712,13 @@
 else
 ret = JS_DupValue(ctx, val);
 } else {
- bf_init(ctx->bf_ctx, r);
- bf_set(r, a);
- bf_rint(r, BF_RNDZ);
- ret = JS_NewBigInt(ctx, r);
+ ret = JS_NewBigInt(ctx);
+ if (!JS_IsException(ret)) {
+ r = JS_GetBigInt(ret);
+ bf_set(r, a);
+ bf_rint(r, BF_RNDZ);
+ ret = JS_CompactBigInt(ctx, ret);
+ }
 }
 if (a == &a_s)
 bf_delete(a);
@@ -10245,9 +10727,6 @@
 break;
 #endif
 default:
-#ifdef CONFIG_BIGNUM
- to_number:
-#endif
 val = JS_ToNumberFree(ctx, val);
 if (JS_IsException(val))
 return val;
@@ -10291,17 +10770,12 @@
 break;
 #ifdef CONFIG_BIGNUM
 case JS_TAG_BIG_FLOAT:
- to_bf:
 {
 JSBigFloat *p = JS_VALUE_GET_PTR(val);
 bf_get_int32(&ret, &p->num, 0);
 JS_FreeValue(ctx, val);
 }
 break;
- case JS_TAG_BIG_INT:
- if (is_bigint_mode(ctx))
- goto to_bf;
- /* fall thru */
 #endif
 default:
 val = JS_ToNumberFree(ctx, val);
@@ -10370,17 +10844,12 @@
 return 0;
 #ifdef CONFIG_BIGNUM
 case JS_TAG_BIG_FLOAT:
- to_bf:
 {
 JSBigFloat *p = JS_VALUE_GET_PTR(val);
 bf_get_int64(pres, &p->num, 0);
 JS_FreeValue(ctx, val);
 }
 return 0;
- case JS_TAG_BIG_INT:
- if (is_bigint_mode(ctx))
- goto to_bf;
- /* fall thru */
 #endif
 default:
 val = JS_ToNumberFree(ctx, val);
@@ -10455,17 +10924,12 @@
 break;
 #ifdef CONFIG_BIGNUM
 case JS_TAG_BIG_FLOAT:
- to_bf:
 {
 JSBigFloat *p = JS_VALUE_GET_PTR(val);
 bf_get_int64(&ret, &p->num, BF_GET_INT_MOD);
 JS_FreeValue(ctx, val);
 }
 break;
- case JS_TAG_BIG_INT:
- if (is_bigint_mode(ctx))
- goto to_bf;
- /* fall thru */
 #endif
 default:
 val = JS_ToNumberFree(ctx, val);
@@ -10484,6 +10948,14 @@
 return JS_ToInt64Free(ctx, pres, JS_DupValue(ctx, val));
 }
 
+int JS_ToInt64Ext(JSContext *ctx, int64_t *pres, JSValueConst val)
+{
+ if (JS_IsBigInt(ctx, val))
+ return JS_ToBigInt64(ctx, pres, val);
+ else
+ return JS_ToInt64(ctx, pres, val);
+}
+
 /* return (<0, 0) in case of exception */
 static int JS_ToInt32Free(JSContext *ctx, int32_t *pres, JSValue val)
 {
@@ -10527,17 +10999,12 @@
 break;
 #ifdef CONFIG_BIGNUM
 case JS_TAG_BIG_FLOAT:
- to_bf:
 {
 JSBigFloat *p = JS_VALUE_GET_PTR(val);
 bf_get_int32(&ret, &p->num, BF_GET_INT_MOD);
 JS_FreeValue(ctx, val);
 }
 break;
- case JS_TAG_BIG_INT:
- if (is_bigint_mode(ctx))
- goto to_bf;
- /* fall thru */
 #endif
 default:
 val = JS_ToNumberFree(ctx, val);
@@ -10595,15 +11062,6 @@
 }
 break;
 #ifdef CONFIG_BIGNUM
- case JS_TAG_BIG_INT:
- {
- JSBigFloat *p = JS_VALUE_GET_PTR(val);
- if (!is_bigint_mode(ctx))
- goto to_number;
- bf_get_int32(&res, &p->num, 0);
- JS_FreeValue(ctx, val);
- }
- goto int_clamp;
 case JS_TAG_BIG_FLOAT:
 {
 JSBigFloat *p = JS_VALUE_GET_PTR(val);
@@ -10618,9 +11076,6 @@
 goto int_clamp;
 #endif
 default:
-#ifdef CONFIG_BIGNUM
- to_number:
-#endif
 val = JS_ToNumberFree(ctx, val);
 if (JS_IsException(val)) {
 *pres = 0;
@@ -10633,11 +11088,10 @@
 }
 
 static __exception int JS_ToArrayLengthFree(JSContext *ctx, uint32_t *plen,
- JSValue val)
+ JSValue val, BOOL is_array_ctor)
 {
 uint32_t tag, len;
 
- redo:
 tag = JS_VALUE_GET_TAG(val);
 switch(tag) {
 case JS_TAG_INT:
@@ -10674,16 +11128,36 @@
 double d;
 d = JS_VALUE_GET_FLOAT64(val);
 len = (uint32_t)d;
- if (len != d) {
- fail:
- JS_ThrowRangeError(ctx, "invalid array length");
- return -1;
- }
+ if (len != d)
+ goto fail;
 } else {
- val = JS_ToNumberFree(ctx, val);
- if (JS_IsException(val))
- return -1;
- goto redo;
+ uint32_t len1;
+
+ if (is_array_ctor) {
+ val = JS_ToNumberFree(ctx, val);
+ if (JS_IsException(val))
+ return -1;
+ /* cannot recurse because val is a number */
+ if (JS_ToArrayLengthFree(ctx, &len, val, TRUE))
+ return -1;
+ } else {
+ /* legacy behavior: must do the conversion twice and compare */
+ if (JS_ToUint32(ctx, &len, val)) {
+ JS_FreeValue(ctx, val);
+ return -1;
+ }
+ val = JS_ToNumberFree(ctx, val);
+ if (JS_IsException(val))
+ return -1;
+ /* cannot recurse because val is a number */
+ if (JS_ToArrayLengthFree(ctx, &len1, val, FALSE))
+ return -1;
+ if (len1 != len) {
+ fail:
+ JS_ThrowRangeError(ctx, "invalid array length");
+ return -1;
+ }
+ }
 }
 break;
 }
@@ -10693,6 +11167,12 @@
 
 #define MAX_SAFE_INTEGER (((int64_t)1 << 53) - 1)
 
+static BOOL is_safe_integer(double d)
+{
+ return isfinite(d) && floor(d) == d &&
+ fabs(d) <= (double)MAX_SAFE_INTEGER;
+}
+
 int JS_ToIndex(JSContext *ctx, uint64_t *plen, JSValueConst val)
 {
 int64_t v;
@@ -10718,7 +11198,6 @@
 }
 
 /* Note: can return an exception */
-/* XXX: bignum case */
 static int JS_NumberIsInteger(JSContext *ctx, JSValueConst val)
 {
 double d;
@@ -10862,7 +11341,8 @@
 return js_ftoa(ctx, val, 10, 0, BF_RNDN | BF_FTOA_FORMAT_FREE_MIN);
 }
 
-static JSValue js_bigdecimal_to_string(JSContext *ctx, JSValueConst val)
+static JSValue js_bigdecimal_to_string1(JSContext *ctx, JSValueConst val,
+ limb_t prec, int flags)
 {
 JSValue ret;
 bfdec_t *a;
@@ -10873,8 +11353,7 @@
 saved_sign = a->sign;
 if (a->expn == BF_EXP_ZERO)
 a->sign = 0;
- str = bfdec_ftoa(NULL, a, 0, BF_RNDZ | BF_FTOA_FORMAT_FREE |
- BF_FTOA_JS_QUIRKS);
+ str = bfdec_ftoa(NULL, a, prec, flags | BF_FTOA_JS_QUIRKS);
 a->sign = saved_sign;
 if (!str)
 return JS_ThrowOutOfMemory(ctx);
@@ -10883,6 +11362,12 @@
 return ret;
 }
 
+static JSValue js_bigdecimal_to_string(JSContext *ctx, JSValueConst val)
+{
+ return js_bigdecimal_to_string1(ctx, val, 0,
+ BF_RNDZ | BF_FTOA_FORMAT_FREE);
+}
+
 #endif /* CONFIG_BIGNUM */
 
 /* 2 <= base <= 36 */
@@ -11353,13 +11838,19 @@
 case JS_CLASS_ARGUMENTS:
 JS_DumpValueShort(rt, p->u.array.u.values[i]);
 break;
-#if defined(_MSC_VER)
- default:
- if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
- p->class_id <= JS_CLASS_FLOAT64_ARRAY)
-#else
- case JS_CLASS_UINT8C_ARRAY ... JS_CLASS_FLOAT64_ARRAY:
+ case JS_CLASS_UINT8C_ARRAY:
+ case JS_CLASS_INT8_ARRAY:
+ case JS_CLASS_UINT8_ARRAY:
+ case JS_CLASS_INT16_ARRAY:
+ case JS_CLASS_UINT16_ARRAY:
+ case JS_CLASS_INT32_ARRAY:
+ case JS_CLASS_UINT32_ARRAY:
+#ifdef CONFIG_BIGNUM
+ case JS_CLASS_BIG_INT64_ARRAY:
+ case JS_CLASS_BIG_UINT64_ARRAY:
 #endif
+ case JS_CLASS_FLOAT32_ARRAY:
+ case JS_CLASS_FLOAT64_ARRAY:
 {
 int size = 1 << typed_array_size_log2(p->class_id);
 const uint8_t *b = p->u.array.u.uint8_ptr + i * size;
@@ -11387,7 +11878,9 @@
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
 printf("[varref %p]", (void *)pr->u.var_ref);
 } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
- printf("[autoinit %p %p]", (void *)pr->u.init.init_func,
+ printf("[autoinit %p %d %p]",
+ (void *)js_autoinit_get_realm(pr),
+ js_autoinit_get_id(pr),
 (void *)pr->u.init.opaque);
 } else {
 JS_DumpValueShort(rt, pr->u.value);
@@ -11397,7 +11890,7 @@
 }
 printf(" }");
 }
-
+ 
 if (js_class_has_bytecode(p->class_id)) {
 JSFunctionBytecode *b = p->u.func.function_bytecode;
 JSVarRef **var_refs;
@@ -11438,6 +11931,9 @@
 case JS_GC_OBJ_TYPE_ASYNC_FUNCTION:
 printf("[async_function]");
 break;
+ case JS_GC_OBJ_TYPE_JS_CONTEXT:
+ printf("[js_context]");
+ break;
 default:
 printf("[unknown %d]", p->gc_obj_type);
 break;
@@ -11593,30 +12089,48 @@
 
 #ifdef CONFIG_BIGNUM
 
+JSValue JS_NewBigInt64_1(JSContext *ctx, int64_t v)
+{
+ JSValue val;
+ bf_t *a;
+ val = JS_NewBigInt(ctx);
+ if (JS_IsException(val))
+ return val;
+ a = JS_GetBigInt(val);
+ if (bf_set_si(a, v)) {
+ JS_FreeValue(ctx, val);
+ return JS_ThrowOutOfMemory(ctx);
+ }
+ return val;
+}
+
 JSValue JS_NewBigInt64(JSContext *ctx, int64_t v)
 {
- BOOL is_bignum = is_bigint_mode(ctx);
- if (is_bignum && v == (int32_t)v) {
- return JS_NewInt32(ctx, v);
+ if (is_math_mode(ctx) &&
+ v >= -MAX_SAFE_INTEGER && v <= MAX_SAFE_INTEGER) {
+ return JS_NewInt64(ctx, v);
 } else {
- bf_t a_s, *a = &a_s;
- bf_init(ctx->bf_ctx, a);
- bf_set_si(a, v);
- return JS_NewBigInt2(ctx, a, TRUE);
+ return JS_NewBigInt64_1(ctx, v);
 }
 }
 
 JSValue JS_NewBigUint64(JSContext *ctx, uint64_t v)
 {
- BOOL is_bignum = is_bigint_mode(ctx);
- if (is_bignum && v == (int32_t)v) {
- return JS_NewInt32(ctx, v);
+ JSValue val;
+ if (is_math_mode(ctx) && v <= MAX_SAFE_INTEGER) {
+ val = JS_NewInt64(ctx, v);
 } else {
- bf_t a_s, *a = &a_s;
- bf_init(ctx->bf_ctx, a);
- bf_set_ui(a, v);
- return JS_NewBigInt2(ctx, a, TRUE);
+ bf_t *a;
+ val = JS_NewBigInt(ctx);
+ if (JS_IsException(val))
+ return val;
+ a = JS_GetBigInt(val);
+ if (bf_set_ui(a, v)) {
+ JS_FreeValue(ctx, val);
+ return JS_ThrowOutOfMemory(ctx);
+ }
 }
+ return val;
 }
 
 /* if the returned bigfloat is allocated it is equal to
@@ -11668,7 +12182,7 @@
 uint32_t tag;
 JSBigDecimal *p;
 bfdec_t *r;
-
+ 
 tag = JS_VALUE_GET_NORM_TAG(val);
 switch(tag) {
 case JS_TAG_BIG_DECIMAL:
@@ -11689,7 +12203,7 @@
 const char *str, *p;
 size_t len;
 int flags;
-
+ 
 str = JS_ToCStringLen(ctx, &len, val);
 JS_FreeValue(ctx, val);
 if (!str)
@@ -11697,13 +12211,10 @@
 p = str;
 p += skip_spaces(p);
 if ((p - str) == len) {
- bf_t a_s, *a = &a_s;
- bf_init(ctx->bf_ctx, a);
- bf_set_si(a, 0);
- val = JS_NewBigInt(ctx, a);
+ val = JS_NewBigInt64(ctx, 0);
 } else {
 flags = ATOD_INT_ONLY | ATOD_ACCEPT_BIN_OCT | ATOD_TYPE_BIG_INT;
- if (is_bigint_mode(ctx))
+ if (is_math_mode(ctx))
 flags |= ATOD_MODE_BIGINT;
 val = js_atof(ctx, p, &p, 0, flags);
 p += skip_spaces(p);
@@ -11740,7 +12251,7 @@
 case JS_TAG_INT:
 case JS_TAG_NULL:
 case JS_TAG_UNDEFINED:
- if (!is_bigint_mode(ctx))
+ if (!is_math_mode(ctx))
 goto fail;
 /* fall tru */
 case JS_TAG_BOOL:
@@ -11751,7 +12262,7 @@
 case JS_TAG_FLOAT64:
 {
 double d = JS_VALUE_GET_FLOAT64(val);
- if (!is_bigint_mode(ctx))
+ if (!is_math_mode(ctx))
 goto fail;
 if (!isfinite(d))
 goto fail;
@@ -11766,7 +12277,7 @@
 r = &p->num;
 break;
 case JS_TAG_BIG_FLOAT:
- if (!is_bigint_mode(ctx))
+ if (!is_math_mode(ctx))
 goto fail;
 p = JS_VALUE_GET_PTR(val);
 if (!bf_is_finite(&p->num))
@@ -11783,8 +12294,7 @@
 return NULL;
 goto redo;
 case JS_TAG_OBJECT:
- val = JS_ToPrimitiveFree(ctx, val,
- is_bigint_mode(ctx) ? HINT_INTEGER : HINT_NUMBER);
+ val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
 if (JS_IsException(val))
 return NULL;
 goto redo;
@@ -11807,21 +12317,26 @@
 if (JS_VALUE_GET_TAG(val) == JS_TAG_BIG_INT) {
 return val;
 } else {
- bf_t a_s, *a, b_s, *b;
+ bf_t a_s, *a, *r;
 int ret;
+ JSValue res; 
 
+ res = JS_NewBigInt(ctx);
+ if (JS_IsException(res))
+ return JS_EXCEPTION;
 a = JS_ToBigIntFree(ctx, &a_s, val);
- if (!a)
+ if (!a) {
+ JS_FreeValue(ctx, res);
 return JS_EXCEPTION;
- b = &b_s;
- bf_init(ctx->bf_ctx, b);
- ret = bf_set(b, a);
+ }
+ r = JS_GetBigInt(res);
+ ret = bf_set(r, a);
 JS_FreeBigInt(ctx, a, &a_s);
 if (ret) {
- bf_delete(b);
+ JS_FreeValue(ctx, res);
 return JS_ThrowOutOfMemory(ctx);
 }
- return JS_NewBigInt2(ctx, b, TRUE);
+ return JS_CompactBigInt(ctx, res);
 }
 }
 
@@ -11860,7 +12375,7 @@
 static JSBigFloat *js_new_bf(JSContext *ctx)
 {
 JSBigFloat *p;
- p = js_mallocz(ctx, sizeof(*p));
+ p = js_malloc(ctx, sizeof(*p));
 if (!p)
 return NULL;
 p->header.ref_count = 1;
@@ -11868,224 +12383,388 @@
 return p;
 }
 
-/* WARNING: 'a' is freed */
-static JSValue JS_NewBigFloat(JSContext *ctx, bf_t *a)
+static JSValue JS_NewBigFloat(JSContext *ctx)
 {
- JSValue ret;
 JSBigFloat *p;
-
- p = js_new_bf(ctx);
- bf_memcpy(&p->num, a);
- ret = JS_MKPTR(JS_TAG_BIG_FLOAT, p);
- return ret;
+ p = js_malloc(ctx, sizeof(*p));
+ if (!p)
+ return JS_EXCEPTION;
+ p->header.ref_count = 1;
+ bf_init(ctx->bf_ctx, &p->num);
+ return JS_MKPTR(JS_TAG_BIG_FLOAT, p);
 }
 
-/* WARNING: 'a' is freed */
-static JSValue JS_NewBigDecimal(JSContext *ctx, bfdec_t *a)
+static JSValue JS_NewBigDecimal(JSContext *ctx)
 {
- JSValue ret;
 JSBigDecimal *p;
-
- p = js_mallocz(ctx, sizeof(*p));
+ p = js_malloc(ctx, sizeof(*p));
 if (!p)
 return JS_EXCEPTION;
 p->header.ref_count = 1;
 bfdec_init(ctx->bf_ctx, &p->num);
- bfdec_memcpy(&p->num, a);
- ret = JS_MKPTR(JS_TAG_BIG_DECIMAL, p);
- return ret;
+ return JS_MKPTR(JS_TAG_BIG_DECIMAL, p);
 }
 
-/* WARNING: 'a' is freed */
-static JSValue JS_NewBigInt2(JSContext *ctx, bf_t *a, BOOL force_bigint)
+static JSValue JS_NewBigInt(JSContext *ctx)
 {
- JSValue ret;
 JSBigFloat *p;
- int32_t v;
-
- if (!force_bigint && bf_get_int32(&v, a, 0) == 0) {
- /* can fit in an int32 */
- ret = JS_NewInt32(ctx, v);
- bf_delete(a);
- } else {
- p = js_new_bf(ctx);
- bf_memcpy(&p->num, a);
- /* normalize the zero representation */
- if (bf_is_zero(&p->num))
- p->num.sign = 0;
- ret = JS_MKPTR(JS_TAG_BIG_INT, p);
- }
- return ret;
+ p = js_malloc(ctx, sizeof(*p));
+ if (!p)
+ return JS_EXCEPTION;
+ p->header.ref_count = 1;
+ bf_init(ctx->bf_ctx, &p->num);
+ return JS_MKPTR(JS_TAG_BIG_INT, p);
 }
 
-static JSValue JS_NewBigInt(JSContext *ctx, bf_t *a)
+static JSValue JS_CompactBigInt1(JSContext *ctx, JSValue val,
+ BOOL convert_to_safe_integer)
 {
- return JS_NewBigInt2(ctx, a, !is_bigint_mode(ctx));
+ int64_t v;
+ bf_t *a;
+ 
+ if (JS_VALUE_GET_TAG(val) != JS_TAG_BIG_INT)
+ return val; /* fail safe */
+ a = JS_GetBigInt(val);
+ if (convert_to_safe_integer && bf_get_int64(&v, a, 0) == 0 &&
+ v >= -MAX_SAFE_INTEGER && v <= MAX_SAFE_INTEGER) {
+ JS_FreeValue(ctx, val);
+ return JS_NewInt64(ctx, v);
+ } else if (a->expn == BF_EXP_ZERO && a->sign) {
+ JSBigFloat *p = JS_VALUE_GET_PTR(val);
+ assert(p->header.ref_count == 1);
+ a->sign = 0;
+ }
+ return val;
 }
 
-/* return < 0 if exception, 0 if overloading method, 1 if overloading
- operator called */
-static __exception int js_call_binary_op_fallback(JSContext *ctx,
- JSValue *pret,
- JSValueConst op1,
- JSValueConst op2,
- OPCodeEnum op)
-{
- JSAtom op_name;
- JSValue method, ret, c1, c2;
- BOOL bool_result, swap_op;
- JSValueConst args[2];
+/* Convert the big int to a safe integer if in math mode. normalize
+ the zero representation. Could also be used to convert the bigint
+ to a short bigint value. The reference count of the value must be
+ 1. Cannot fail */
+static JSValue JS_CompactBigInt(JSContext *ctx, JSValue val)
+{
+ return JS_CompactBigInt1(ctx, val, is_math_mode(ctx));
+}
+
+/* must be kept in sync with JSOverloadableOperatorEnum */
+/* XXX: use atoms ? */
+static const char js_overloadable_operator_names[JS_OVOP_COUNT][4] = {
+ "+",
+ "-",
+ "*",
+ "/",
+ "%",
+ "**",
+ "|",
+ "&",
+ "^",
+ "<<",
+ ">>",
+ ">>>",
+ "==",
+ "<",
+ "pos",
+ "neg",
+ "++",
+ "--",
+ "~",
+};
 
- bool_result = FALSE;
- swap_op = FALSE;
- c1 = JS_UNDEFINED;
- c2 = JS_UNDEFINED;
+static int get_ovop_from_opcode(OPCodeEnum op)
+{
 switch(op) {
 case OP_add:
- op_name = JS_ATOM_Symbol_operatorAdd;
- break;
+ return JS_OVOP_ADD;
 case OP_sub:
- op_name = JS_ATOM_Symbol_operatorSub;
- break;
+ return JS_OVOP_SUB;
 case OP_mul:
- op_name = JS_ATOM_Symbol_operatorMul;
- break;
+ return JS_OVOP_MUL;
 case OP_div:
- case OP_math_div:
- op_name = JS_ATOM_Symbol_operatorDiv;
- break;
+ return JS_OVOP_DIV;
 case OP_mod:
- op_name = JS_ATOM_Symbol_operatorMod;
- break;
- case OP_pow:
- case OP_math_pow:
- op_name = JS_ATOM_Symbol_operatorPow;
- break;
 case OP_math_mod:
- op_name = JS_ATOM_Symbol_operatorMathMod;
- break;
- case OP_shl:
- op_name = JS_ATOM_Symbol_operatorShl;
- break;
- case OP_sar:
- op_name = JS_ATOM_Symbol_operatorShr;
- break;
- case OP_and:
- op_name = JS_ATOM_Symbol_operatorAnd;
- break;
+ return JS_OVOP_MOD;
+ case OP_pow:
+ return JS_OVOP_POW;
 case OP_or:
- op_name = JS_ATOM_Symbol_operatorOr;
- break;
+ return JS_OVOP_OR;
+ case OP_and:
+ return JS_OVOP_AND;
 case OP_xor:
- op_name = JS_ATOM_Symbol_operatorXor;
- break;
+ return JS_OVOP_XOR;
+ case OP_shl:
+ return JS_OVOP_SHL;
+ case OP_sar:
+ return JS_OVOP_SAR;
+ case OP_shr:
+ return JS_OVOP_SHR;
+ case OP_eq:
+ case OP_neq:
+ return JS_OVOP_EQ;
 case OP_lt:
- op_name = JS_ATOM_Symbol_operatorCmpLT;
- bool_result = TRUE;
- break;
 case OP_lte:
- op_name = JS_ATOM_Symbol_operatorCmpLE;
- bool_result = TRUE;
- break;
 case OP_gt:
- op_name = JS_ATOM_Symbol_operatorCmpLT;
- bool_result = TRUE;
- swap_op = TRUE;
- break;
 case OP_gte:
- op_name = JS_ATOM_Symbol_operatorCmpLE;
- bool_result = TRUE;
- swap_op = TRUE;
- break;
- case OP_eq:
- case OP_neq:
- op_name = JS_ATOM_Symbol_operatorCmpEQ;
- bool_result = TRUE;
- break;
+ return JS_OVOP_LESS;
+ case OP_plus:
+ return JS_OVOP_POS;
+ case OP_neg:
+ return JS_OVOP_NEG;
+ case OP_inc:
+ return JS_OVOP_INC;
+ case OP_dec:
+ return JS_OVOP_DEC;
 default:
- goto fail;
+ abort();
+ }
+}
+
+/* return NULL if not present */
+static JSObject *find_binary_op(JSBinaryOperatorDef *def,
+ uint32_t operator_index,
+ JSOverloadableOperatorEnum op)
+{
+ JSBinaryOperatorDefEntry *ent;
+ int i;
+ for(i = 0; i < def->count; i++) {
+ ent = &def->tab[i];
+ if (ent->operator_index == operator_index)
+ return ent->ops[op];
 }
- c1 = JS_GetProperty(ctx, op1, JS_ATOM_constructor);
- if (JS_IsException(c1))
+ return NULL;
+}
+
+/* return -1 if exception, 0 if no operator overloading, 1 if
+ overloaded operator called */
+static __exception int js_call_binary_op_fallback(JSContext *ctx,
+ JSValue *pret,
+ JSValueConst op1,
+ JSValueConst op2,
+ OPCodeEnum op,
+ BOOL is_numeric,
+ int hint)
+{
+ JSValue opset1_obj, opset2_obj, method, ret, new_op1, new_op2;
+ JSOperatorSetData *opset1, *opset2;
+ JSOverloadableOperatorEnum ovop;
+ JSObject *p;
+ JSValueConst args[2];
+ 
+ if (!ctx->allow_operator_overloading)
+ return 0;
+ 
+ opset2_obj = JS_UNDEFINED;
+ opset1_obj = JS_GetProperty(ctx, op1, JS_ATOM_Symbol_operatorSet);
+ if (JS_IsException(opset1_obj))
+ goto exception;
+ if (JS_IsUndefined(opset1_obj))
+ return 0;
+ opset1 = JS_GetOpaque2(ctx, opset1_obj, JS_CLASS_OPERATOR_SET);
+ if (!opset1)
 goto exception;
- c2 = JS_GetProperty(ctx, op2, JS_ATOM_constructor);
- if (JS_IsException(c2))
+
+ opset2_obj = JS_GetProperty(ctx, op2, JS_ATOM_Symbol_operatorSet);
+ if (JS_IsException(opset2_obj))
 goto exception;
- if (JS_VALUE_GET_TAG(c1) != JS_TAG_OBJECT ||
- JS_VALUE_GET_TAG(c2) != JS_TAG_OBJECT)
- goto fail;
- if (JS_VALUE_GET_OBJ(c1) == JS_VALUE_GET_OBJ(c2)) {
- /* if same constructor, there is no ambiguity */
- method = JS_GetProperty(ctx, c1, op_name);
+ if (JS_IsUndefined(opset2_obj)) {
+ JS_FreeValue(ctx, opset1_obj);
+ return 0;
+ }
+ opset2 = JS_GetOpaque2(ctx, opset2_obj, JS_CLASS_OPERATOR_SET);
+ if (!opset2)
+ goto exception;
+
+ if (opset1->is_primitive && opset2->is_primitive) {
+ JS_FreeValue(ctx, opset1_obj);
+ JS_FreeValue(ctx, opset2_obj);
+ return 0;
+ }
+
+ ovop = get_ovop_from_opcode(op);
+ 
+ if (opset1->operator_counter == opset2->operator_counter) {
+ p = opset1->self_ops[ovop];
+ } else if (opset1->operator_counter > opset2->operator_counter) {
+ p = find_binary_op(&opset1->left, opset2->operator_counter, ovop);
 } else {
- JSValue val;
- int order1, order2;
+ p = find_binary_op(&opset2->right, opset1->operator_counter, ovop);
+ }
+ if (!p) {
+ JS_ThrowTypeError(ctx, "operator %s: no function defined",
+ js_overloadable_operator_names[ovop]);
+ goto exception;
+ }
 
- /* different constructors: we use a user-defined ordering */
- val = JS_GetProperty(ctx, c1, JS_ATOM_Symbol_operatorOrder);
- if (JS_IsException(val))
- goto exception;
- if (JS_IsUndefined(val))
- goto undef_order;
- if (JS_ToInt32Free(ctx, &order1, val))
- goto exception;
- val = JS_GetProperty(ctx, c2, JS_ATOM_Symbol_operatorOrder);
- if (JS_IsException(val))
- goto exception;
- if (JS_IsUndefined(val)) {
- undef_order:
- JS_FreeValue(ctx, c1);
- JS_FreeValue(ctx, c2);
- *pret = JS_UNDEFINED;
- return 0;
+ if (opset1->is_primitive) {
+ if (is_numeric) {
+ new_op1 = JS_ToNumeric(ctx, op1);
+ } else {
+ new_op1 = JS_ToPrimitive(ctx, op1, hint);
 }
- if (JS_ToInt32Free(ctx, &order2, val))
+ if (JS_IsException(new_op1))
 goto exception;
- /* ambiguous priority: error */
- if (order1 == order2) {
- JS_ThrowTypeError(ctx, "operator_order is identical in both constructors");
- goto exception;
- }
- if (order1 > order2) {
- val = c1;
+ } else {
+ new_op1 = JS_DupValue(ctx, op1);
+ }
+ 
+ if (opset2->is_primitive) {
+ if (is_numeric) {
+ new_op2 = JS_ToNumeric(ctx, op2);
 } else {
- val = c2;
+ new_op2 = JS_ToPrimitive(ctx, op2, hint);
 }
- method = JS_GetProperty(ctx, val, op_name);
- }
- JS_FreeValue(ctx, c1);
- JS_FreeValue(ctx, c2);
- c1 = JS_UNDEFINED;
- c2 = JS_UNDEFINED;
- if (JS_IsException(method))
- goto exception;
- if (JS_IsUndefined(method) || JS_IsNull(method)) {
- *pret = JS_UNDEFINED;
- return 0;
+ if (JS_IsException(new_op2)) {
+ JS_FreeValue(ctx, new_op1);
+ goto exception;
+ }
+ } else {
+ new_op2 = JS_DupValue(ctx, op2);
 }
- if (swap_op) {
- args[0] = op2;
- args[1] = op1;
+
+ /* XXX: could apply JS_ToPrimitive() if primitive type so that the
+ operator function does not get a value object */
+ 
+ method = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+ if (ovop == JS_OVOP_LESS && (op == OP_lte || op == OP_gt)) {
+ args[0] = new_op2;
+ args[1] = new_op1;
 } else {
- args[0] = op1;
- args[1] = op2;
+ args[0] = new_op1;
+ args[1] = new_op2;
 }
 ret = JS_CallFree(ctx, method, JS_UNDEFINED, 2, args);
+ JS_FreeValue(ctx, new_op1);
+ JS_FreeValue(ctx, new_op2);
 if (JS_IsException(ret))
 goto exception;
- if (bool_result) {
+ if (ovop == JS_OVOP_EQ) {
 BOOL res = JS_ToBoolFree(ctx, ret);
 if (op == OP_neq)
 res ^= 1;
 ret = JS_NewBool(ctx, res);
+ } else if (ovop == JS_OVOP_LESS) {
+ if (JS_IsUndefined(ret)) {
+ ret = JS_FALSE;
+ } else {
+ BOOL res = JS_ToBoolFree(ctx, ret);
+ if (op == OP_lte || op == OP_gte)
+ res ^= 1;
+ ret = JS_NewBool(ctx, res);
+ }
 }
+ JS_FreeValue(ctx, opset1_obj);
+ JS_FreeValue(ctx, opset2_obj);
 *pret = ret;
 return 1;
- fail:
- JS_ThrowTypeError(ctx, "invalid types for binary operator");
 exception:
- JS_FreeValue(ctx, c1);
- JS_FreeValue(ctx, c2);
+ JS_FreeValue(ctx, opset1_obj);
+ JS_FreeValue(ctx, opset2_obj);
+ *pret = JS_UNDEFINED;
+ return -1;
+}
+
+/* try to call the operation on the operatorSet field of 'obj'. Only
+ used for "/" and "**" on the BigInt prototype in math mode */
+static __exception int js_call_binary_op_simple(JSContext *ctx,
+ JSValue *pret,
+ JSValueConst obj,
+ JSValueConst op1,
+ JSValueConst op2,
+ OPCodeEnum op)
+{
+ JSValue opset1_obj, method, ret, new_op1, new_op2;
+ JSOperatorSetData *opset1;
+ JSOverloadableOperatorEnum ovop;
+ JSObject *p;
+ JSValueConst args[2];
+
+ opset1_obj = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_operatorSet);
+ if (JS_IsException(opset1_obj))
+ goto exception;
+ if (JS_IsUndefined(opset1_obj))
+ return 0;
+ opset1 = JS_GetOpaque2(ctx, opset1_obj, JS_CLASS_OPERATOR_SET);
+ if (!opset1)
+ goto exception;
+ ovop = get_ovop_from_opcode(op);
+
+ p = opset1->self_ops[ovop];
+ if (!p) {
+ JS_FreeValue(ctx, opset1_obj);
+ return 0;
+ }
+
+ new_op1 = JS_ToNumeric(ctx, op1);
+ if (JS_IsException(new_op1))
+ goto exception;
+ new_op2 = JS_ToNumeric(ctx, op2);
+ if (JS_IsException(new_op2)) {
+ JS_FreeValue(ctx, new_op1);
+ goto exception;
+ }
+
+ method = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+ args[0] = new_op1;
+ args[1] = new_op2;
+ ret = JS_CallFree(ctx, method, JS_UNDEFINED, 2, args);
+ JS_FreeValue(ctx, new_op1);
+ JS_FreeValue(ctx, new_op2);
+ if (JS_IsException(ret))
+ goto exception;
+ JS_FreeValue(ctx, opset1_obj);
+ *pret = ret;
+ return 1;
+ exception:
+ JS_FreeValue(ctx, opset1_obj);
+ *pret = JS_UNDEFINED;
+ return -1;
+}
+
+/* return -1 if exception, 0 if no operator overloading, 1 if
+ overloaded operator called */
+static __exception int js_call_unary_op_fallback(JSContext *ctx,
+ JSValue *pret,
+ JSValueConst op1,
+ OPCodeEnum op)
+{
+ JSValue opset1_obj, method, ret;
+ JSOperatorSetData *opset1;
+ JSOverloadableOperatorEnum ovop;
+ JSObject *p;
+
+ if (!ctx->allow_operator_overloading)
+ return 0;
+ 
+ opset1_obj = JS_GetProperty(ctx, op1, JS_ATOM_Symbol_operatorSet);
+ if (JS_IsException(opset1_obj))
+ goto exception;
+ if (JS_IsUndefined(opset1_obj))
+ return 0;
+ opset1 = JS_GetOpaque2(ctx, opset1_obj, JS_CLASS_OPERATOR_SET);
+ if (!opset1)
+ goto exception;
+ if (opset1->is_primitive) {
+ JS_FreeValue(ctx, opset1_obj);
+ return 0;
+ }
+
+ ovop = get_ovop_from_opcode(op);
+
+ p = opset1->self_ops[ovop];
+ if (!p) {
+ JS_ThrowTypeError(ctx, "no overloaded operator %s",
+ js_overloadable_operator_names[ovop]);
+ goto exception;
+ }
+ method = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+ ret = JS_CallFree(ctx, method, JS_UNDEFINED, 1, &op1);
+ if (JS_IsException(ret))
+ goto exception;
+ JS_FreeValue(ctx, opset1_obj);
+ *pret = ret;
+ return 1;
+ exception:
+ JS_FreeValue(ctx, opset1_obj);
 *pret = JS_UNDEFINED;
 return -1;
 }
@@ -12108,16 +12787,22 @@
 static int js_unary_arith_bigint(JSContext *ctx,
 JSValue *pres, OPCodeEnum op, JSValue op1)
 {
- bf_t a_s, r_s, *r = &r_s, *a;
+ bf_t a_s, *r, *a;
 int ret, v;
-
- if (op == OP_plus && !is_bigint_mode(ctx)) {
+ JSValue res;
+ 
+ if (op == OP_plus && !is_math_mode(ctx)) {
 JS_ThrowTypeError(ctx, "bigint argument with unary +");
 JS_FreeValue(ctx, op1);
 return -1;
 }
+ res = JS_NewBigInt(ctx);
+ if (JS_IsException(res)) {
+ JS_FreeValue(ctx, op1);
+ return -1;
+ }
+ r = JS_GetBigInt(res);
 a = JS_ToBigInt(ctx, &a_s, op1);
- bf_init(ctx->bf_ctx, r);
 ret = 0;
 switch(op) {
 case OP_inc:
@@ -12142,28 +12827,35 @@
 JS_FreeBigInt(ctx, a, &a_s);
 JS_FreeValue(ctx, op1);
 if (unlikely(ret)) {
- bf_delete(r);
+ JS_FreeValue(ctx, res);
 throw_bf_exception(ctx, ret);
 return -1;
 }
- *pres = JS_NewBigInt(ctx, r);
+ res = JS_CompactBigInt(ctx, res);
+ *pres = res;
 return 0;
 }
 
 static int js_unary_arith_bigfloat(JSContext *ctx,
 JSValue *pres, OPCodeEnum op, JSValue op1)
 {
- bf_t a_s, r_s, *r = &r_s, *a;
+ bf_t a_s, *r, *a;
 int ret, v;
-
- if (op == OP_plus && !is_bigint_mode(ctx)) {
+ JSValue res;
+ 
+ if (op == OP_plus && !is_math_mode(ctx)) {
 JS_ThrowTypeError(ctx, "bigfloat argument with unary +");
 JS_FreeValue(ctx, op1);
 return -1;
 }
 
+ res = JS_NewBigFloat(ctx);
+ if (JS_IsException(res)) {
+ JS_FreeValue(ctx, op1);
+ return -1;
+ }
+ r = JS_GetBigFloat(res);
 a = JS_ToBigFloat(ctx, &a_s, op1);
- bf_init(ctx->bf_ctx, r);
 ret = 0;
 switch(op) {
 case OP_inc:
@@ -12185,28 +12877,34 @@
 bf_delete(a);
 JS_FreeValue(ctx, op1);
 if (unlikely(ret & BF_ST_MEM_ERROR)) {
- bf_delete(r);
+ JS_FreeValue(ctx, res);
 throw_bf_exception(ctx, ret);
 return -1;
 }
- *pres = JS_NewBigFloat(ctx, r);
+ *pres = res;
 return 0;
 }
 
 static int js_unary_arith_bigdecimal(JSContext *ctx,
 JSValue *pres, OPCodeEnum op, JSValue op1)
 {
- bfdec_t r_s, *r = &r_s, *a;
+ bfdec_t *r, *a;
 int ret, v;
-
- if (op == OP_plus && !is_bigint_mode(ctx)) {
+ JSValue res;
+ 
+ if (op == OP_plus && !is_math_mode(ctx)) {
 JS_ThrowTypeError(ctx, "bigdecimal argument with unary +");
 JS_FreeValue(ctx, op1);
 return -1;
 }
 
+ res = JS_NewBigDecimal(ctx);
+ if (JS_IsException(res)) {
+ JS_FreeValue(ctx, op1);
+ return -1;
+ }
+ r = JS_GetBigDecimal(res);
 a = JS_ToBigDecimal(ctx, op1);
- bfdec_init(ctx->bf_ctx, r);
 ret = 0;
 switch(op) {
 case OP_inc:
@@ -12226,11 +12924,11 @@
 }
 JS_FreeValue(ctx, op1);
 if (unlikely(ret)) {
- bfdec_delete(r);
+ JS_FreeValue(ctx, res);
 throw_bf_exception(ctx, ret);
 return -1;
 }
- *pres = JS_NewBigDecimal(ctx, r);
+ *pres = res;
 return 0;
 }
 
@@ -12238,112 +12936,93 @@
 JSValue *sp,
 OPCodeEnum op)
 {
- JSValue op1, val, method;
- BOOL is_legacy;
- JSAtom op_name;
- int v;
+ JSValue op1, val;
+ int v, ret;
 uint32_t tag;
 
 op1 = sp[-1];
 /* fast path for float64 */
 if (JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(op1)))
 goto handle_float64;
- if (JS_IsObject(op1) && ctx->bignum_ext) {
- switch(op) {
- case OP_plus:
- op_name = JS_ATOM_Symbol_operatorPlus;
- break;
- case OP_neg:
- op_name = JS_ATOM_Symbol_operatorNeg;
- break;
- case OP_inc:
- op_name = JS_ATOM_Symbol_operatorInc;
- break;
- case OP_dec:
- op_name = JS_ATOM_Symbol_operatorDec;
- break;
- default:
- abort();
- }
- method = JS_GetProperty(ctx, op1, op_name);
- if (JS_IsException(method))
- return -1;
- if (JS_IsUndefined(method) || JS_IsNull(method))
- goto to_number;
- val = JS_CallFree(ctx, method, op1, 0, NULL);
- if (JS_IsException(val))
+ if (JS_IsObject(op1)) {
+ ret = js_call_unary_op_fallback(ctx, &val, op1, op);
+ if (ret < 0)
 return -1;
- JS_FreeValue(ctx, op1);
- sp[-1] = val;
- } else {
- to_number:
- op1 = JS_ToNumericFree(ctx, op1);
- if (JS_IsException(op1))
- goto exception;
- is_legacy = is_bigint_mode(ctx) ^ 1;
- tag = JS_VALUE_GET_TAG(op1);
- switch(tag) {
- case JS_TAG_INT:
- {
- int64_t v64;
- v64 = JS_VALUE_GET_INT(op1);
- switch(op) {
- case OP_inc:
- case OP_dec:
- v = 2 * (op - OP_dec) - 1;
- v64 += v;
- break;
- case OP_plus:
- break;
- case OP_neg:
- if (v64 == 0 && is_legacy) {
- sp[-1] = __JS_NewFloat64(ctx, -0.0);
- return 0;
- } else {
- v64 = -v64;
- }
- break;
- default:
- abort();
+ if (ret) {
+ JS_FreeValue(ctx, op1);
+ sp[-1] = val;
+ return 0;
+ }
+ }
+
+ op1 = JS_ToNumericFree(ctx, op1);
+ if (JS_IsException(op1))
+ goto exception;
+ tag = JS_VALUE_GET_TAG(op1);
+ switch(tag) {
+ case JS_TAG_INT:
+ {
+ int64_t v64;
+ v64 = JS_VALUE_GET_INT(op1);
+ switch(op) {
+ case OP_inc:
+ case OP_dec:
+ v = 2 * (op - OP_dec) - 1;
+ v64 += v;
+ break;
+ case OP_plus:
+ break;
+ case OP_neg:
+ if (v64 == 0) {
+ sp[-1] = __JS_NewFloat64(ctx, -0.0);
+ return 0;
+ } else {
+ v64 = -v64;
 }
- sp[-1] = JS_NewInt64(ctx, v64);
+ break;
+ default:
+ abort();
 }
- break;
- case JS_TAG_BIG_INT:
- if (ctx->rt->bigint_ops.unary_arith(ctx, sp - 1, op, op1))
- goto exception;
- break;
- case JS_TAG_BIG_FLOAT:
- if (ctx->rt->bigfloat_ops.unary_arith(ctx, sp - 1, op, op1))
- goto exception;
- break;
- case JS_TAG_BIG_DECIMAL:
- if (ctx->rt->bigdecimal_ops.unary_arith(ctx, sp - 1, op, op1))
- goto exception;
- break;
- default:
- handle_float64:
- {
- double d;
- d = JS_VALUE_GET_FLOAT64(op1);
- switch(op) {
- case OP_inc:
- case OP_dec:
- v = 2 * (op - OP_dec) - 1;
- d += v;
- break;
- case OP_plus:
- break;
- case OP_neg:
- d = -d;
- break;
- default:
- abort();
- }
- sp[-1] = __JS_NewFloat64(ctx, d);
+ sp[-1] = JS_NewInt64(ctx, v64);
+ }
+ break;
+ case JS_TAG_BIG_INT:
+ handle_bigint:
+ if (ctx->rt->bigint_ops.unary_arith(ctx, sp - 1, op, op1))
+ goto exception;
+ break;
+ case JS_TAG_BIG_FLOAT:
+ if (ctx->rt->bigfloat_ops.unary_arith(ctx, sp - 1, op, op1))
+ goto exception;
+ break;
+ case JS_TAG_BIG_DECIMAL:
+ if (ctx->rt->bigdecimal_ops.unary_arith(ctx, sp - 1, op, op1))
+ goto exception;
+ break;
+ default:
+ handle_float64:
+ {
+ double d;
+ if (is_math_mode(ctx))
+ goto handle_bigint;
+ d = JS_VALUE_GET_FLOAT64(op1);
+ switch(op) {
+ case OP_inc:
+ case OP_dec:
+ v = 2 * (op - OP_dec) - 1;
+ d += v;
+ break;
+ case OP_plus:
+ break;
+ case OP_neg:
+ d = -d;
+ break;
+ default:
+ abort();
 }
- break;
+ sp[-1] = __JS_NewFloat64(ctx, d);
 }
+ break;
 }
 return 0;
 exception:
@@ -12370,39 +13049,33 @@
 
 static no_inline int js_not_slow(JSContext *ctx, JSValue *sp)
 {
- JSValue op1, method, val;
-
+ JSValue op1, val;
+ int ret;
+ 
 op1 = sp[-1];
 if (JS_IsObject(op1)) {
- if (!ctx->bignum_ext)
- goto to_number;
- method = JS_GetProperty(ctx, op1, JS_ATOM_Symbol_operatorNot);
- if (JS_IsException(method))
- return -1;
- if (JS_IsUndefined(method) || JS_IsNull(method))
- goto to_number;
- val = JS_CallFree(ctx, method, op1, 0, NULL);
- if (JS_IsException(val))
+ ret = js_call_unary_op_fallback(ctx, &val, op1, OP_not);
+ if (ret < 0)
 return -1;
- JS_FreeValue(ctx, op1);
- sp[-1] = val;
- } else {
- if (JS_IsString(op1)) {
- to_number:
- op1 = JS_ToNumberHintFree(ctx, op1, TON_FLAG_INTEGER);
- if (JS_IsException(op1))
- goto exception;
- }
- if (is_bigint_mode(ctx) || JS_VALUE_GET_TAG(op1) == JS_TAG_BIG_INT) {
- if (ctx->rt->bigint_ops.unary_arith(ctx, sp - 1, OP_not, op1))
- goto exception;
- } else {
- int32_t v1;
- if (unlikely(JS_ToInt32Free(ctx, &v1, op1)))
- goto exception;
- sp[-1] = JS_NewInt32(ctx, ~v1);
+ if (ret) {
+ JS_FreeValue(ctx, op1);
+ sp[-1] = val;
+ return 0;
 }
 }
+
+ op1 = JS_ToNumericFree(ctx, op1);
+ if (JS_IsException(op1))
+ goto exception;
+ if (is_math_mode(ctx) || JS_VALUE_GET_TAG(op1) == JS_TAG_BIG_INT) {
+ if (ctx->rt->bigint_ops.unary_arith(ctx, sp - 1, OP_not, op1))
+ goto exception;
+ } else {
+ int32_t v1;
+ if (unlikely(JS_ToInt32Free(ctx, &v1, op1)))
+ goto exception;
+ sp[-1] = JS_NewInt32(ctx, ~v1);
+ }
 return 0;
 exception:
 sp[-1] = JS_UNDEFINED;
@@ -12412,12 +13085,19 @@
 static int js_binary_arith_bigfloat(JSContext *ctx, OPCodeEnum op,
 JSValue *pres, JSValue op1, JSValue op2)
 {
- bf_t a_s, b_s, r_s, *r, *a, *b;
- int ret, rnd_mode;
-
+ bf_t a_s, b_s, *r, *a, *b;
+ int ret;
+ JSValue res;
+ 
+ res = JS_NewBigFloat(ctx);
+ if (JS_IsException(res)) {
+ JS_FreeValue(ctx, op1);
+ JS_FreeValue(ctx, op2);
+ return -1;
+ }
+ r = JS_GetBigFloat(res);
 a = JS_ToBigFloat(ctx, &a_s, op1);
 b = JS_ToBigFloat(ctx, &b_s, op2);
- r = &r_s;
 bf_init(ctx->bf_ctx, r);
 switch(op) {
 case OP_add:
@@ -12429,29 +13109,21 @@
 case OP_mul:
 ret = bf_mul(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags);
 break;
- case OP_math_div:
 case OP_div:
 ret = bf_div(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags);
 break;
 case OP_math_mod:
 /* Euclidian remainder */
- rnd_mode = BF_DIVREM_EUCLIDIAN;
- goto do_mod;
+ ret = bf_rem(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags,
+ BF_DIVREM_EUCLIDIAN);
+ break;
 case OP_mod:
- rnd_mode = BF_RNDZ;
- do_mod:
- {
- bf_t q_s, *q = &q_s;
- bf_init(ctx->bf_ctx, q);
- ret = bf_divrem(q, r, a, b, ctx->fp_env.prec, ctx->fp_env.flags,
- rnd_mode);
- bf_delete(q);
- }
+ ret = bf_rem(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags,
+ BF_RNDZ);
 break;
 case OP_pow:
- case OP_math_pow:
 ret = bf_pow(r, a, b, ctx->fp_env.prec,
- ctx->fp_env.flags | BF_POW_JS_QUICKS);
+ ctx->fp_env.flags | BF_POW_JS_QUIRKS);
 break;
 default:
 abort();
@@ -12463,21 +13135,24 @@
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
 if (unlikely(ret & BF_ST_MEM_ERROR)) {
- bf_delete(r);
+ JS_FreeValue(ctx, res);
 throw_bf_exception(ctx, ret);
 return -1;
 }
- *pres = JS_NewBigFloat(ctx, r);
+ *pres = res;
 return 0;
 }
 
 static int js_binary_arith_bigint(JSContext *ctx, OPCodeEnum op,
 JSValue *pres, JSValue op1, JSValue op2)
 {
- bf_t a_s, b_s, r_s, *r, *a, *b;
- int ret, rnd_mode;
+ bf_t a_s, b_s, *r, *a, *b;
+ int ret;
 JSValue res;
-
+ 
+ res = JS_NewBigInt(ctx);
+ if (JS_IsException(res))
+ goto fail;
 a = JS_ToBigInt(ctx, &a_s, op1);
 if (!a)
 goto fail;
@@ -12486,8 +13161,7 @@
 JS_FreeBigInt(ctx, a, &a_s);
 goto fail;
 }
- r = &r_s;
- bf_init(ctx->bf_ctx, r);
+ r = JS_GetBigInt(res);
 ret = 0;
 switch(op) {
 case OP_add:
@@ -12499,73 +13173,75 @@
 case OP_mul:
 ret = bf_mul(r, a, b, BF_PREC_INF, BF_RNDZ);
 break;
- case OP_math_div:
- goto op_fallback;
 case OP_div:
- if (!is_bigint_mode(ctx)) {
+ if (!is_math_mode(ctx)) {
 bf_t rem_s, *rem = &rem_s;
 bf_init(ctx->bf_ctx, rem);
 ret = bf_divrem(r, rem, a, b, BF_PREC_INF, BF_RNDZ,
 BF_RNDZ);
 bf_delete(rem);
 } else {
- bf_div(r, a, b, 53, bf_set_exp_bits(11) |
- BF_RNDN | BF_FLAG_SUBNORMAL);
- goto float64_result;
+ goto math_mode_div_pow;
 }
 break;
 case OP_math_mod:
 /* Euclidian remainder */
- rnd_mode = BF_DIVREM_EUCLIDIAN;
- goto do_int_mod;
+ ret = bf_rem(r, a, b, BF_PREC_INF, BF_RNDZ,
+ BF_DIVREM_EUCLIDIAN) & BF_ST_INVALID_OP;
+ break;
 case OP_mod:
- rnd_mode = BF_RNDZ;
- do_int_mod:
- {
- bf_t q_s, *q = &q_s;
- bf_init(ctx->bf_ctx, q);
- ret = bf_divrem(q, r, a, b, BF_PREC_INF, BF_RNDZ,
- rnd_mode) & BF_ST_INVALID_OP;
- bf_delete(q);
- }
+ ret = bf_rem(r, a, b, BF_PREC_INF, BF_RNDZ,
+ BF_RNDZ) & BF_ST_INVALID_OP;
 break;
 case OP_pow:
- case OP_math_pow:
 if (b->sign) {
- if (!is_bigint_mode(ctx)) {
+ if (!is_math_mode(ctx)) {
 ret = BF_ST_INVALID_OP;
- } else if (op == OP_math_pow) {
- op_fallback:
- bf_delete(r);
+ } else {
+ math_mode_div_pow:
+ JS_FreeValue(ctx, res);
+ ret = js_call_binary_op_simple(ctx, &res, ctx->class_proto[JS_CLASS_BIG_INT], op1, op2, op);
+ if (ret != 0) {
+ JS_FreeBigInt(ctx, a, &a_s);
+ JS_FreeBigInt(ctx, b, &b_s);
+ JS_FreeValue(ctx, op1);
+ JS_FreeValue(ctx, op2);
+ if (ret < 0) {
+ return -1;
+ } else {
+ *pres = res;
+ return 0;
+ }
+ }
+ /* if no BigInt power operator defined, return a
+ bigfloat */
+ res = JS_NewBigFloat(ctx);
+ if (JS_IsException(res)) {
+ JS_FreeBigInt(ctx, a, &a_s);
+ JS_FreeBigInt(ctx, b, &b_s);
+ goto fail;
+ }
+ r = JS_GetBigFloat(res);
+ if (op == OP_div) {
+ ret = bf_div(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags) & BF_ST_MEM_ERROR;
+ } else {
+ ret = bf_pow(r, a, b, ctx->fp_env.prec,
+ ctx->fp_env.flags | BF_POW_JS_QUIRKS) & BF_ST_MEM_ERROR;
+ }
 JS_FreeBigInt(ctx, a, &a_s);
 JS_FreeBigInt(ctx, b, &b_s);
- ret = js_call_binary_op_fallback(ctx, &res, op1, op2, op);
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
- if (ret < 0) {
- return -1;
- } else if (ret == 0) {
- JS_ThrowTypeError(ctx, "operator must be defined for exact division or power");
+ if (unlikely(ret)) {
+ JS_FreeValue(ctx, res);
+ throw_bf_exception(ctx, ret);
 return -1;
 }
 *pres = res;
 return 0;
- } else {
- double dr;
- bf_pow(r, a, b, 53, bf_set_exp_bits(11) |
- BF_RNDN | BF_FLAG_SUBNORMAL);
- float64_result:
- bf_get_float64(r, &dr, BF_RNDN);
- bf_delete(r);
- JS_FreeBigInt(ctx, a, &a_s);
- JS_FreeBigInt(ctx, b, &b_s);
- JS_FreeValue(ctx, op1);
- JS_FreeValue(ctx, op2);
- *pres = __JS_NewFloat64(ctx, dr);
- return 0;
 }
 } else {
- ret = bf_pow(r, a, b, BF_PREC_INF, BF_RNDZ | BF_POW_JS_QUICKS);
+ ret = bf_pow(r, a, b, BF_PREC_INF, BF_RNDZ | BF_POW_JS_QUIRKS);
 }
 break;
 
@@ -12609,13 +13285,14 @@
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
 if (unlikely(ret)) {
- bf_delete(r);
+ JS_FreeValue(ctx, res);
 throw_bf_exception(ctx, ret);
 return -1;
 }
- *pres = JS_NewBigInt(ctx, r);
+ *pres = JS_CompactBigInt(ctx, res);
 return 0;
 fail:
+ JS_FreeValue(ctx, res);
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
 return -1;
@@ -12651,18 +13328,21 @@
 static int js_binary_arith_bigdecimal(JSContext *ctx, OPCodeEnum op,
 JSValue *pres, JSValue op1, JSValue op2)
 {
- bfdec_t r_s, *r, *a, *b;
- int ret, rnd_mode;
+ bfdec_t *r, *a, *b;
+ int ret;
+ JSValue res;
 
- /* big decimal result */
+ res = JS_NewBigDecimal(ctx);
+ if (JS_IsException(res))
+ goto fail;
+ r = JS_GetBigDecimal(res);
+ 
 a = JS_ToBigDecimal(ctx, op1);
 if (!a)
 goto fail;
 b = JS_ToBigDecimal(ctx, op2);
 if (!b)
 goto fail;
- r = &r_s;
- bfdec_init(ctx->bf_ctx, r);
 switch(op) {
 case OP_add:
 ret = bfdec_add(r, a, b, BF_PREC_INF, BF_RNDZ);
@@ -12673,26 +13353,17 @@
 case OP_mul:
 ret = bfdec_mul(r, a, b, BF_PREC_INF, BF_RNDZ);
 break;
- case OP_math_div:
 case OP_div:
 ret = bfdec_div(r, a, b, BF_PREC_INF, BF_RNDZ);
 break;
 case OP_math_mod:
 /* Euclidian remainder */
- rnd_mode = BF_DIVREM_EUCLIDIAN;
- goto do_mod_dec;
+ ret = bfdec_rem(r, a, b, BF_PREC_INF, BF_RNDZ, BF_DIVREM_EUCLIDIAN);
+ break;
 case OP_mod:
- rnd_mode = BF_RNDZ;
- do_mod_dec:
- {
- bfdec_t q_s, *q = &q_s;
- bfdec_init(ctx->bf_ctx, q);
- ret = bfdec_divrem(q, r, a, b, BF_PREC_INF, BF_RNDZ, rnd_mode);
- bfdec_delete(q);
- }
+ ret = bfdec_rem(r, a, b, BF_PREC_INF, BF_RNDZ, BF_RNDZ);
 break;
 case OP_pow:
- case OP_math_pow:
 ret = js_bfdec_pow(r, a, b);
 break;
 default:
@@ -12701,13 +13372,14 @@
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
 if (unlikely(ret)) {
- bfdec_delete(r);
+ JS_FreeValue(ctx, res);
 throw_bf_exception(ctx, ret);
 return -1;
 }
- *pres = JS_NewBigDecimal(ctx, r);
+ *pres = res;
 return 0;
 fail:
+ JS_FreeValue(ctx, res);
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
 return -1;
@@ -12717,7 +13389,6 @@
 OPCodeEnum op)
 {
 JSValue op1, op2, res;
- BOOL is_legacy;
 uint32_t tag1, tag2;
 int ret;
 double d1, d2;
@@ -12734,12 +13405,11 @@
 }
 
 /* try to call an overloaded operator */
- if (((tag1 == JS_TAG_OBJECT &&
- (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
- (tag2 == JS_TAG_OBJECT &&
- (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) &&
- ctx->bignum_ext) {
- ret = js_call_binary_op_fallback(ctx, &res, op1, op2, op);
+ if ((tag1 == JS_TAG_OBJECT &&
+ (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
+ (tag2 == JS_TAG_OBJECT &&
+ (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) {
+ ret = js_call_binary_op_fallback(ctx, &res, op1, op2, op, TRUE, 0);
 if (ret != 0) {
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
@@ -12770,23 +13440,23 @@
 int64_t v;
 v1 = JS_VALUE_GET_INT(op1);
 v2 = JS_VALUE_GET_INT(op2);
- is_legacy = is_bigint_mode(ctx) ^ 1;
 switch(op) {
 case OP_sub:
 v = (int64_t)v1 - (int64_t)v2;
 break;
 case OP_mul:
 v = (int64_t)v1 * (int64_t)v2;
- if (is_legacy && v == 0 && (v1 | v2) < 0) {
+ if (is_math_mode(ctx) &&
+ (v < -MAX_SAFE_INTEGER || v > MAX_SAFE_INTEGER))
+ goto handle_bigint;
+ if (v == 0 && (v1 | v2) < 0) {
 sp[-2] = __JS_NewFloat64(ctx, -0.0);
 return 0;
 }
 break;
- case OP_math_div:
- if (ctx->rt->bigint_ops.binary_arith(ctx, op, sp - 2, op1, op2))
- goto exception;
- return 0;
 case OP_div:
+ if (is_math_mode(ctx))
+ goto handle_bigint;
 sp[-2] = __JS_NewFloat64(ctx, (double)v1 / (double)v2);
 return 0;
 case OP_math_mod:
@@ -12803,26 +13473,19 @@
 }
 break;
 case OP_mod:
- if (is_legacy && (v1 < 0 || v2 <= 0)) {
+ if (v1 < 0 || v2 <= 0) {
 sp[-2] = JS_NewFloat64(ctx, fmod(v1, v2));
 return 0;
 } else {
- if (unlikely(v2 == 0)) {
- throw_bf_exception(ctx, BF_ST_DIVIDE_ZERO);
- goto exception;
- }
 v = (int64_t)v1 % (int64_t)v2;
 }
 break;
 case OP_pow:
- case OP_math_pow:
- if (is_legacy) {
+ if (!is_math_mode(ctx)) {
 sp[-2] = JS_NewFloat64(ctx, js_pow(v1, v2));
 return 0;
 } else {
- if (ctx->rt->bigint_ops.binary_arith(ctx, op, sp - 2, op1, op2))
- goto exception;
- return 0;
+ goto handle_bigint;
 }
 break;
 default:
@@ -12835,7 +13498,11 @@
 } else if (tag1 == JS_TAG_BIG_FLOAT || tag2 == JS_TAG_BIG_FLOAT) {
 if (ctx->rt->bigfloat_ops.binary_arith(ctx, op, sp - 2, op1, op2))
 goto exception;
- } else if (tag1 == JS_TAG_FLOAT64 || tag2 == JS_TAG_FLOAT64) {
+ } else if (tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) {
+ handle_bigint:
+ if (ctx->rt->bigint_ops.binary_arith(ctx, op, sp - 2, op1, op2))
+ goto exception;
+ } else {
 double dr;
 /* float64 result */
 if (JS_ToFloat64Free(ctx, &d1, op1)) {
@@ -12845,6 +13512,8 @@
 if (JS_ToFloat64Free(ctx, &d2, op2))
 goto exception;
 handle_float64:
+ if (is_math_mode(ctx) && is_safe_integer(d1) && is_safe_integer(d2))
+ goto handle_bigint;
 switch(op) {
 case OP_sub:
 dr = d1 - d2;
@@ -12853,7 +13522,6 @@
 dr = d1 * d2;
 break;
 case OP_div:
- case OP_math_div:
 dr = d1 / d2;
 break;
 case OP_mod:
@@ -12867,16 +13535,12 @@
 dr += d2;
 break;
 case OP_pow:
- case OP_math_pow:
 dr = js_pow(d1, d2);
 break;
 default:
 abort();
 }
 sp[-2] = __JS_NewFloat64(ctx, dr);
- } else {
- if (ctx->rt->bigint_ops.binary_arith(ctx, op, sp - 2, op1, op2))
- goto exception;
 }
 return 0;
 exception:
@@ -12907,12 +13571,14 @@
 
 if (tag1 == JS_TAG_OBJECT || tag2 == JS_TAG_OBJECT) {
 /* try to call an overloaded operator */
- if (((tag1 == JS_TAG_OBJECT &&
- (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
- (tag2 == JS_TAG_OBJECT &&
- (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) &&
- ctx->bignum_ext) {
- ret = js_call_binary_op_fallback(ctx, &res, op1, op2, OP_add);
+ if ((tag1 == JS_TAG_OBJECT &&
+ (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED &&
+ tag2 != JS_TAG_STRING)) ||
+ (tag2 == JS_TAG_OBJECT &&
+ (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED &&
+ tag1 != JS_TAG_STRING))) {
+ ret = js_call_binary_op_fallback(ctx, &res, op1, op2, OP_add,
+ FALSE, HINT_NONE);
 if (ret != 0) {
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
@@ -12973,7 +13639,11 @@
 } else if (tag1 == JS_TAG_BIG_FLOAT || tag2 == JS_TAG_BIG_FLOAT) {
 if (ctx->rt->bigfloat_ops.binary_arith(ctx, OP_add, sp - 2, op1, op2))
 goto exception;
- } else if (tag1 == JS_TAG_FLOAT64 || tag2 == JS_TAG_FLOAT64) {
+ } else if (tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) {
+ handle_bigint:
+ if (ctx->rt->bigint_ops.binary_arith(ctx, OP_add, sp - 2, op1, op2))
+ goto exception;
+ } else {
 double d1, d2;
 /* float64 result */
 if (JS_ToFloat64Free(ctx, &d1, op1)) {
@@ -12982,10 +13652,9 @@
 }
 if (JS_ToFloat64Free(ctx, &d2, op2))
 goto exception;
+ if (is_math_mode(ctx) && is_safe_integer(d1) && is_safe_integer(d2))
+ goto handle_bigint;
 sp[-2] = __JS_NewFloat64(ctx, d1 + d2);
- } else {
- if (ctx->rt->bigint_ops.binary_arith(ctx, OP_add, sp - 2, op1, op2))
- goto exception;
 }
 return 0;
 exception:
@@ -13001,6 +13670,7 @@
 JSValue op1, op2, res;
 int ret;
 uint32_t tag1, tag2;
+ uint32_t v1, v2, r;
 
 op1 = sp[-2];
 op2 = sp[-1];
@@ -13008,12 +13678,11 @@
 tag2 = JS_VALUE_GET_NORM_TAG(op2);
 
 /* try to call an overloaded operator */
- if (((tag1 == JS_TAG_OBJECT &&
- (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
- (tag2 == JS_TAG_OBJECT &&
- (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) &&
- ctx->bignum_ext) {
- ret = js_call_binary_op_fallback(ctx, &res, op1, op2, op);
+ if ((tag1 == JS_TAG_OBJECT &&
+ (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
+ (tag2 == JS_TAG_OBJECT &&
+ (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) {
+ ret = js_call_binary_op_fallback(ctx, &res, op1, op2, op, TRUE, 0);
 if (ret != 0) {
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
@@ -13026,63 +13695,60 @@
 }
 }
 
- op1 = JS_ToNumberHintFree(ctx, op1, TON_FLAG_INTEGER);
+ op1 = JS_ToNumericFree(ctx, op1);
 if (JS_IsException(op1)) {
 JS_FreeValue(ctx, op2);
 goto exception;
 }
- op2 = JS_ToNumberHintFree(ctx, op2, TON_FLAG_INTEGER);
+ op2 = JS_ToNumericFree(ctx, op2);
 if (JS_IsException(op2)) {
 JS_FreeValue(ctx, op1);
 goto exception;
 }
 
- if (!is_bigint_mode(ctx)) {
- uint32_t v1, v2, r;
+ if (is_math_mode(ctx))
+ goto bigint_op;
 
- tag1 = JS_VALUE_GET_TAG(op1);
- tag2 = JS_VALUE_GET_TAG(op2);
- if (tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) {
- if (tag1 != tag2) {
- JS_FreeValue(ctx, op1);
- JS_FreeValue(ctx, op2);
- JS_ThrowTypeError(ctx, "both operands must be bigint");
- goto exception;
- } else {
- goto bigint_op;
- }
+ tag1 = JS_VALUE_GET_TAG(op1);
+ tag2 = JS_VALUE_GET_TAG(op2);
+ if (tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) {
+ if (tag1 != tag2) {
+ JS_FreeValue(ctx, op1);
+ JS_FreeValue(ctx, op2);
+ JS_ThrowTypeError(ctx, "both operands must be bigint");
+ goto exception;
 } else {
- if (unlikely(JS_ToInt32Free(ctx, (int32_t *)&v1, op1))) {
- JS_FreeValue(ctx, op2);
- goto exception;
- }
- if (unlikely(JS_ToInt32Free(ctx, (int32_t *)&v2, op2)))
+ bigint_op:
+ if (ctx->rt->bigint_ops.binary_arith(ctx, op, sp - 2, op1, op2))
 goto exception;
- switch(op) {
- case OP_shl:
- r = v1 << (v2 & 0x1f);
- break;
- case OP_sar:
- r = (int)v1 >> (v2 & 0x1f);
- break;
- case OP_and:
- r = v1 & v2;
- break;
- case OP_or:
- r = v1 | v2;
- break;
- case OP_xor:
- r = v1 ^ v2;
- break;
- default:
- abort();
- }
- sp[-2] = JS_NewInt32(ctx, r);
 }
 } else {
- bigint_op:
- if (ctx->rt->bigint_ops.binary_arith(ctx, op, sp - 2, op1, op2))
+ if (unlikely(JS_ToInt32Free(ctx, (int32_t *)&v1, op1))) {
+ JS_FreeValue(ctx, op2);
+ goto exception;
+ }
+ if (unlikely(JS_ToInt32Free(ctx, (int32_t *)&v2, op2)))
 goto exception;
+ switch(op) {
+ case OP_shl:
+ r = v1 << (v2 & 0x1f);
+ break;
+ case OP_sar:
+ r = (int)v1 >> (v2 & 0x1f);
+ break;
+ case OP_and:
+ r = v1 & v2;
+ break;
+ case OP_or:
+ r = v1 | v2;
+ break;
+ case OP_xor:
+ r = v1 ^ v2;
+ break;
+ default:
+ abort();
+ }
+ sp[-2] = JS_NewInt32(ctx, r);
 }
 return 0;
 exception:
@@ -13097,7 +13763,7 @@
 {
 bf_t a_s, b_s, *a, *b;
 int res;
-
+ 
 a = JS_ToBigFloat(ctx, &a_s, op1);
 if (!a) {
 JS_FreeValue(ctx, op2);
@@ -13159,7 +13825,7 @@
 }
 a = JS_ToBigDecimal(ctx, op1);
 b = JS_ToBigDecimal(ctx, op2);
-
+ 
 switch(op) {
 case OP_lt:
 res = bfdec_cmp_lt(a, b); /* if NaN return false */
@@ -13196,12 +13862,12 @@
 tag1 = JS_VALUE_GET_NORM_TAG(op1);
 tag2 = JS_VALUE_GET_NORM_TAG(op2);
 /* try to call an overloaded operator */
- if (((tag1 == JS_TAG_OBJECT &&
- (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
- (tag2 == JS_TAG_OBJECT &&
- (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) &&
- ctx->bignum_ext) {
- res = js_call_binary_op_fallback(ctx, &ret, op1, op2, op);
+ if ((tag1 == JS_TAG_OBJECT &&
+ (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
+ (tag2 == JS_TAG_OBJECT &&
+ (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) {
+ res = js_call_binary_op_fallback(ctx, &ret, op1, op2, op,
+ FALSE, HINT_NUMBER);
 if (res != 0) {
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
@@ -13250,37 +13916,12 @@
 JS_FreeValue(ctx, op2);
 } else if ((tag1 <= JS_TAG_NULL || tag1 == JS_TAG_FLOAT64) &&
 (tag2 <= JS_TAG_NULL || tag2 == JS_TAG_FLOAT64)) {
- /* can use floating point comparison */
- double d1, d2;
- if (tag1 == JS_TAG_FLOAT64) {
- d1 = JS_VALUE_GET_FLOAT64(op1);
- } else {
- d1 = JS_VALUE_GET_INT(op1);
- }
- if (tag2 == JS_TAG_FLOAT64) {
- d2 = JS_VALUE_GET_FLOAT64(op2);
- } else {
- d2 = JS_VALUE_GET_INT(op2);
- }
- switch(op) {
- case OP_lt:
- res = (d1 < d2); /* if NaN return false */
- break;
- case OP_lte:
- res = (d1 <= d2); /* if NaN return false */
- break;
- case OP_gt:
- res = (d1 > d2); /* if NaN return false */
- break;
- default:
- case OP_gte:
- res = (d1 >= d2); /* if NaN return false */
- break;
- }
+ /* fast path for float64/int */
+ goto float64_compare;
 } else {
 if (((tag1 == JS_TAG_BIG_INT && tag2 == JS_TAG_STRING) ||
 (tag2 == JS_TAG_BIG_INT && tag1 == JS_TAG_STRING)) &&
- !is_bigint_mode(ctx)) {
+ !is_math_mode(ctx)) {
 if (tag1 == JS_TAG_STRING) {
 op1 = JS_StringToBigInt(ctx, op1);
 if (JS_VALUE_GET_TAG(op1) != JS_TAG_BIG_INT)
@@ -13309,20 +13950,51 @@
 }
 }
 
- if (JS_VALUE_GET_TAG(op1) == JS_TAG_BIG_DECIMAL ||
- JS_VALUE_GET_TAG(op2) == JS_TAG_BIG_DECIMAL) {
+ tag1 = JS_VALUE_GET_NORM_TAG(op1);
+ tag2 = JS_VALUE_GET_NORM_TAG(op2);
+
+ if (tag1 == JS_TAG_BIG_DECIMAL || tag2 == JS_TAG_BIG_DECIMAL) {
 res = ctx->rt->bigdecimal_ops.compare(ctx, op, op1, op2);
 if (res < 0)
 goto exception;
- } else if (JS_VALUE_GET_TAG(op1) == JS_TAG_BIG_FLOAT ||
- JS_VALUE_GET_TAG(op2) == JS_TAG_BIG_FLOAT) {
+ } else if (tag1 == JS_TAG_BIG_FLOAT || tag2 == JS_TAG_BIG_FLOAT) {
 res = ctx->rt->bigfloat_ops.compare(ctx, op, op1, op2);
 if (res < 0)
 goto exception;
- } else {
+ } else if (tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) {
 res = ctx->rt->bigint_ops.compare(ctx, op, op1, op2);
 if (res < 0)
 goto exception;
+ } else {
+ double d1, d2;
+
+ float64_compare:
+ /* can use floating point comparison */
+ if (tag1 == JS_TAG_FLOAT64) {
+ d1 = JS_VALUE_GET_FLOAT64(op1);
+ } else {
+ d1 = JS_VALUE_GET_INT(op1);
+ }
+ if (tag2 == JS_TAG_FLOAT64) {
+ d2 = JS_VALUE_GET_FLOAT64(op2);
+ } else {
+ d2 = JS_VALUE_GET_INT(op2);
+ }
+ switch(op) {
+ case OP_lt:
+ res = (d1 < d2); /* if NaN return false */
+ break;
+ case OP_lte:
+ res = (d1 <= d2); /* if NaN return false */
+ break;
+ case OP_gt:
+ res = (d1 > d2); /* if NaN return false */
+ break;
+ default:
+ case OP_gte:
+ res = (d1 >= d2); /* if NaN return false */
+ break;
+ }
 }
 }
 done:
@@ -13386,10 +14058,11 @@
 goto exception;
 }
 } else if (tag1 == tag2) {
- if (tag1 == JS_TAG_OBJECT && ctx->bignum_ext) {
+ if (tag1 == JS_TAG_OBJECT) {
 /* try the fallback operator */
 res = js_call_binary_op_fallback(ctx, &ret, op1, op2,
- is_neq ? OP_neq : OP_eq);
+ is_neq ? OP_neq : OP_eq,
+ FALSE, HINT_NONE);
 if (res != 0) {
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
@@ -13409,7 +14082,7 @@
 (tag2 == JS_TAG_STRING && tag_is_number(tag1))) {
 
 if ((tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) &&
- !is_bigint_mode(ctx)) {
+ !is_math_mode(ctx)) {
 if (tag1 == JS_TAG_STRING) {
 op1 = JS_StringToBigInt(ctx, op1);
 if (JS_VALUE_GET_TAG(op1) != JS_TAG_BIG_INT)
@@ -13451,7 +14124,8 @@
 
 /* try the fallback operator */
 res = js_call_binary_op_fallback(ctx, &ret, op1, op2,
- is_neq ? OP_neq : OP_eq);
+ is_neq ? OP_neq : OP_eq,
+ FALSE, HINT_NONE);
 if (res != 0) {
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
@@ -13475,9 +14149,17 @@
 }
 goto redo;
 } else {
+ /* IsHTMLDDA object is equivalent to undefined for '==' and '!=' */
+ if ((JS_IsHTMLDDA(ctx, op1) &&
+ (tag2 == JS_TAG_NULL || tag2 == JS_TAG_UNDEFINED)) ||
+ (JS_IsHTMLDDA(ctx, op2) &&
+ (tag1 == JS_TAG_NULL || tag1 == JS_TAG_UNDEFINED))) {
+ res = TRUE;
+ } else {
+ res = FALSE;
+ }
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
- res = FALSE;
 }
 done:
 sp[-2] = JS_NewBool(ctx, res ^ is_neq);
@@ -13506,7 +14188,7 @@
 goto exception;
 }
 /* XXX: could forbid >>> in bignum mode */
- if (!is_bigint_mode(ctx) &&
+ if (!is_math_mode(ctx) &&
 (JS_VALUE_GET_TAG(op1) == JS_TAG_BIG_INT ||
 JS_VALUE_GET_TAG(op2) == JS_TAG_BIG_INT)) {
 JS_ThrowTypeError(ctx, "bigint operands are forbidden for >>>");
@@ -13532,7 +14214,7 @@
 bf_t r_s, *r = &r_s;
 double d;
 int ret;
-
+ 
 /* always convert to Float64 */
 bf_init(ctx->bf_ctx, r);
 ret = bf_mul_pow_radix(r, a, 10, exponent,
@@ -13548,39 +14230,65 @@
 
 static no_inline int js_mul_pow10(JSContext *ctx, JSValue *sp)
 {
- bf_t a_s, *a, r_s, *r = &r_s;
- JSValue op1, op2;
- slimb_t e;
+ bf_t a_s, *a, *r;
+ JSValue op1, op2, res;
+ int64_t e;
 int ret;
 
+ res = JS_NewBigFloat(ctx);
+ if (JS_IsException(res))
+ return -1;
+ r = JS_GetBigFloat(res);
 op1 = sp[-2];
 op2 = sp[-1];
 a = JS_ToBigFloat(ctx, &a_s, op1);
 if (!a)
 return -1;
-#if LIMB_BITS == 32
- ret = JS_ToInt32(ctx, &e, op2);
-#else
- ret = JS_ToInt64(ctx, &e, op2);
-#endif
+ if (JS_IsBigInt(ctx, op2)) {
+ ret = JS_ToBigInt64(ctx, &e, op2);
+ } else {
+ ret = JS_ToInt64(ctx, &e, op2);
+ }
 if (ret) {
 if (a == &a_s)
 bf_delete(a);
+ JS_FreeValue(ctx, res);
 return -1;
 }
 
- bf_init(ctx->bf_ctx, r);
 bf_mul_pow_radix(r, a, 10, e, ctx->fp_env.prec, ctx->fp_env.flags);
 if (a == &a_s)
 bf_delete(a);
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
- sp[-2] = JS_NewBigFloat(ctx, r);
+ sp[-2] = res;
 return 0;
 }
 
 #else /* !CONFIG_BIGNUM */
 
+static JSValue JS_ThrowUnsupportedBigint(JSContext *ctx)
+{
+ return JS_ThrowTypeError(ctx, "bigint is not supported");
+}
+
+JSValue JS_NewBigInt64(JSContext *ctx, int64_t v)
+{
+ return JS_ThrowUnsupportedBigint(ctx);
+}
+
+JSValue JS_NewBigUint64(JSContext *ctx, uint64_t v)
+{
+ return JS_ThrowUnsupportedBigint(ctx);
+}
+
+int JS_ToBigInt64(JSContext *ctx, int64_t *pres, JSValueConst val)
+{
+ JS_ThrowUnsupportedBigint(ctx);
+ *pres = 0;
+ return -1;
+}
+
 static no_inline __exception int js_unary_arith_slow(JSContext *ctx,
 JSValue *sp,
 OPCodeEnum op)
@@ -13902,9 +14610,17 @@
 }
 goto redo;
 } else {
+ /* IsHTMLDDA object is equivalent to undefined for '==' and '!=' */
+ if ((JS_IsHTMLDDA(ctx, op1) &&
+ (tag2 == JS_TAG_NULL || tag2 == JS_TAG_UNDEFINED)) ||
+ (JS_IsHTMLDDA(ctx, op2) &&
+ (tag1 == JS_TAG_NULL || tag1 == JS_TAG_UNDEFINED))) {
+ res = TRUE;
+ } else {
+ res = FALSE;
+ }
 JS_FreeValue(ctx, op1);
 JS_FreeValue(ctx, op2);
- res = FALSE;
 }
 sp[-2] = JS_NewBool(ctx, res ^ is_neq);
 return 0;
@@ -13997,22 +14713,9 @@
 d2 = JS_VALUE_GET_INT(op2);
 goto number_test;
 } else if (tag2 == JS_TAG_FLOAT64) {
-#ifdef CONFIG_BIGNUM
- if (is_bigint_mode(ctx)) {
- res = FALSE;
- } else
-#endif
- {
- d2 = JS_VALUE_GET_FLOAT64(op2);
- goto number_test;
- }
- } else
-#ifdef CONFIG_BIGNUM
- if (tag2 == JS_TAG_BIG_INT && is_bigint_mode(ctx)) {
- goto bigint_test;
- } else
-#endif
- {
+ d2 = JS_VALUE_GET_FLOAT64(op2);
+ goto number_test;
+ } else {
 res = FALSE;
 }
 break;
@@ -14020,11 +14723,7 @@
 d1 = JS_VALUE_GET_FLOAT64(op1);
 if (tag2 == JS_TAG_FLOAT64) {
 d2 = JS_VALUE_GET_FLOAT64(op2);
- } else if (tag2 == JS_TAG_INT
-#ifdef CONFIG_BIGNUM
- && !is_bigint_mode(ctx)
-#endif
- ) {
+ } else if (tag2 == JS_TAG_INT) {
 d2 = JS_VALUE_GET_INT(op2);
 } else {
 res = FALSE;
@@ -14051,15 +14750,10 @@
 case JS_TAG_BIG_INT:
 {
 bf_t a_s, *a, b_s, *b;
- if (tag1 == tag2) {
- /* OK */
- } else if (tag2 == JS_TAG_INT && is_bigint_mode(ctx)) {
- /* OK */
- } else {
+ if (tag1 != tag2) {
 res = FALSE;
 break;
 }
- bigint_test:
 a = JS_ToBigFloat(ctx, &a_s, op1);
 b = JS_ToBigFloat(ctx, &b_s, op2);
 res = bf_cmp_eq(a, b);
@@ -14207,7 +14901,7 @@
 return 0;
 }
 
-static __exception int js_operator_typeof(JSContext *ctx, JSValue op1)
+static __exception int js_operator_typeof(JSContext *ctx, JSValueConst op1)
 {
 JSAtom atom;
 uint32_t tag;
@@ -14215,30 +14909,20 @@
 tag = JS_VALUE_GET_NORM_TAG(op1);
 switch(tag) {
 #ifdef CONFIG_BIGNUM
- case JS_TAG_INT:
- if (is_bigint_mode(ctx))
- atom = JS_ATOM_bigint;
- else
- atom = JS_ATOM_number;
- break;
 case JS_TAG_BIG_INT:
 atom = JS_ATOM_bigint;
 break;
- case JS_TAG_FLOAT64:
- atom = JS_ATOM_number;
- break;
 case JS_TAG_BIG_FLOAT:
 atom = JS_ATOM_bigfloat;
 break;
 case JS_TAG_BIG_DECIMAL:
 atom = JS_ATOM_bigdecimal;
 break;
-#else
+#endif
 case JS_TAG_INT:
 case JS_TAG_FLOAT64:
 atom = JS_ATOM_number;
 break;
-#endif
 case JS_TAG_UNDEFINED:
 atom = JS_ATOM_undefined;
 break;
@@ -14249,10 +14933,16 @@
 atom = JS_ATOM_string;
 break;
 case JS_TAG_OBJECT:
- if (JS_IsFunction(ctx, op1))
- atom = JS_ATOM_function;
- else
- goto obj_type;
+ {
+ JSObject *p;
+ p = JS_VALUE_GET_OBJ(op1);
+ if (unlikely(p->is_HTMLDDA)) 
+ atom = JS_ATOM_undefined;
+ else if (JS_IsFunction(ctx, op1))
+ atom = JS_ATOM_function;
+ else
+ goto obj_type;
+ }
 break;
 case JS_TAG_NULL:
 obj_type:
@@ -14445,7 +15135,7 @@
 JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE);
 /* callee returns this function in non strict mode */
 JS_DefinePropertyValue(ctx, val, JS_ATOM_callee,
- JS_DupValue(ctx, ctx->current_stack_frame->cur_func),
+ JS_DupValue(ctx, ctx->rt->current_stack_frame->cur_func),
 JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE);
 return val;
 fail:
@@ -14475,10 +15165,10 @@
 
 static JSValue build_for_in_iterator(JSContext *ctx, JSValue obj)
 {
- JSObject *p, *p1;
+ JSObject *p;
 JSPropertyEnum *tab_atom;
 int i;
- JSValue enum_obj;
+ JSValue enum_obj, obj1;
 JSForInIterator *it;
 uint32_t tag, tab_atom_count;
 
@@ -14507,20 +15197,34 @@
 if (tag == JS_TAG_NULL || tag == JS_TAG_UNDEFINED)
 return enum_obj;
 
- p = JS_VALUE_GET_OBJ(obj);
-
 /* fast path: assume no enumerable properties in the prototype chain */
- p1 = p->shape->proto;
- while (p1 != NULL) {
- if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count, p1,
- JS_GPN_STRING_MASK | JS_GPN_ENUM_ONLY))
+ obj1 = JS_DupValue(ctx, obj);
+ for(;;) {
+ obj1 = JS_GetPrototypeFree(ctx, obj1);
+ if (JS_IsNull(obj1))
+ break;
+ if (JS_IsException(obj1))
+ goto fail;
+ if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count,
+ JS_VALUE_GET_OBJ(obj1),
+ JS_GPN_STRING_MASK | JS_GPN_ENUM_ONLY)) {
+ JS_FreeValue(ctx, obj1);
 goto fail;
+ }
 js_free_prop_enum(ctx, tab_atom, tab_atom_count);
 if (tab_atom_count != 0) {
+ JS_FreeValue(ctx, obj1);
 goto slow_path;
 }
- p1 = p1->shape->proto;
+ /* must check for timeout to avoid infinite loop */
+ if (js_poll_interrupts(ctx)) {
+ JS_FreeValue(ctx, obj1);
+ goto fail;
+ }
 }
+
+ p = JS_VALUE_GET_OBJ(obj);
+
 if (p->fast_array) {
 JSShape *sh;
 JSShapeProperty *prs;
@@ -14530,15 +15234,6 @@
 if (prs->flags & JS_PROP_ENUMERABLE)
 goto normal_case;
 }
- /* the implicit GetOwnProperty raises an exception if the
- typed array is detached */
- if ((p->class_id >= JS_CLASS_UINT8C_ARRAY &&
- p->class_id <= JS_CLASS_FLOAT64_ARRAY) &&
- typed_array_is_detached(ctx, p) &&
- typed_array_get_length(ctx, p) != 0) {
- JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
- goto fail;
- }
 /* for fast arrays, we only store the number of elements */
 it->is_array = TRUE;
 it->array_length = p->u.array.count;
@@ -14557,17 +15252,30 @@
 slow_path:
 /* non enumerable properties hide the enumerables ones in the
 prototype chain */
- while (p != NULL) {
- if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count, p,
- JS_GPN_STRING_MASK | JS_GPN_SET_ENUM))
+ obj1 = JS_DupValue(ctx, obj);
+ for(;;) {
+ if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count,
+ JS_VALUE_GET_OBJ(obj1),
+ JS_GPN_STRING_MASK | JS_GPN_SET_ENUM)) {
+ JS_FreeValue(ctx, obj1);
 goto fail;
+ }
 for(i = 0; i < tab_atom_count; i++) {
 JS_DefinePropertyValue(ctx, enum_obj, tab_atom[i].atom, JS_NULL,
 (tab_atom[i].is_enumerable ?
 JS_PROP_ENUMERABLE : 0));
 }
 js_free_prop_enum(ctx, tab_atom, tab_atom_count);
- p = p->shape->proto;
+ obj1 = JS_GetPrototypeFree(ctx, obj1);
+ if (JS_IsNull(obj1))
+ break;
+ if (JS_IsException(obj1))
+ goto fail;
+ /* must check for timeout to avoid infinite loop */
+ if (js_poll_interrupts(ctx)) {
+ JS_FreeValue(ctx, obj1);
+ goto fail;
+ }
 }
 return enum_obj;
 
@@ -14767,8 +15475,8 @@
 int res;
 
 if (is_exception_pending) {
- ex_obj = ctx->current_exception;
- ctx->current_exception = JS_NULL;
+ ex_obj = ctx->rt->current_exception;
+ ctx->rt->current_exception = JS_NULL;
 res = -1;
 } else {
 ex_obj = JS_UNDEFINED;
@@ -14817,7 +15525,10 @@
 return 0;
 }
 
-/* enum_rec -> enum_rec value done */
+/* enum_rec [objs] -> enum_rec [objs] value done. There are 'offset'
+ objs. If 'done' is true or in case of exception, 'enum_rec' is set
+ to undefined. If 'done' is true, 'value' is always set to
+ undefined. */
 static __exception int js_for_of_next(JSContext *ctx, JSValue *sp, int offset)
 {
 JSValue value = JS_UNDEFINED;
@@ -14832,8 +15543,12 @@
 /* replace the iteration object with undefined */
 JS_FreeValue(ctx, sp[offset]);
 sp[offset] = JS_UNDEFINED;
- if (done < 0)
+ if (done < 0) {
 return -1;
+ } else {
+ JS_FreeValue(ctx, value);
+ value = JS_UNDEFINED;
+ }
 }
 }
 sp[0] = value;
@@ -14841,16 +15556,6 @@
 return 0;
 }
 
-static __exception int js_for_await_of_next(JSContext *ctx, JSValue *sp)
-{
- JSValue result;
- result = JS_Call(ctx, sp[-2], sp[-3], 0, NULL);
- if (JS_IsException(result))
- return -1;
- sp[0] = result;
- return 0;
-}
-
 static JSValue JS_IteratorGetCompleteValue(JSContext *ctx, JSValueConst obj,
 BOOL *pdone)
 {
@@ -14949,10 +15654,10 @@
 static __exception int js_append_enumerate(JSContext *ctx, JSValue *sp)
 {
 JSValue iterator, enumobj, method, value;
- int pos, is_array_iterator;
+ int is_array_iterator;
 JSValue *arrp;
- uint32_t i, count32;
-
+ uint32_t i, count32, pos;
+ 
 if (JS_VALUE_GET_TAG(sp[-2]) != JS_TAG_INT) {
 JS_ThrowInternalError(ctx, "invalid index for append");
 return -1;
@@ -14985,24 +15690,21 @@
 if (is_array_iterator
 && JS_IsCFunction(ctx, method, (JSCFunction *)js_array_iterator_next, 0)
 && js_get_fast_array(ctx, sp[-1], &arrp, &count32)) {
- int64_t len;
- /* Handle fast arrays explicitly */
- if (js_get_length64(ctx, &len, sp[-1]))
+ uint32_t len;
+ if (js_get_length32(ctx, &len, sp[-1]))
 goto exception;
+ /* if len > count32, the elements >= count32 might be read in
+ the prototypes and might have side effects */
+ if (len != count32)
+ goto general_case;
+ /* Handle fast arrays explicitly */
 for (i = 0; i < count32; i++) {
 if (JS_DefinePropertyValueUint32(ctx, sp[-3], pos++,
 JS_DupValue(ctx, arrp[i]), JS_PROP_C_W_E) < 0)
 goto exception;
 }
- if (len > count32) {
- /* This is not strictly correct because the trailing elements are
- empty instead of undefined. Append undefined entries instead.
- */
- pos += len - count32;
- if (JS_SetProperty(ctx, sp[-3], JS_ATOM_length, JS_NewUint32(ctx, pos)) < 0)
- goto exception;
- }
 } else {
+ general_case:
 for (;;) {
 BOOL done;
 value = JS_IteratorNext(ctx, enumobj, method, 0, NULL, &done);
@@ -15016,6 +15718,7 @@
 goto exception;
 }
 }
+ /* Note: could raise an error if too many elements */
 sp[-2] = JS_NewInt32(ctx, pos);
 JS_FreeValue(ctx, enumobj);
 JS_FreeValue(ctx, method);
@@ -15039,8 +15742,10 @@
 uint32_t i, tab_atom_count;
 JSObject *p;
 JSObject *pexcl = NULL;
- int ret = 0, flags;
-
+ int ret, gpn_flags;
+ JSPropertyDescriptor desc;
+ BOOL is_enumerable;
+ 
 if (JS_VALUE_GET_TAG(source) != JS_TAG_OBJECT)
 return 0;
 
@@ -15048,43 +15753,63 @@
 pexcl = JS_VALUE_GET_OBJ(excluded);
 
 p = JS_VALUE_GET_OBJ(source);
+
+ gpn_flags = JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK | JS_GPN_ENUM_ONLY;
+ if (p->is_exotic) {
+ const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+ /* cannot use JS_GPN_ENUM_ONLY with e.g. proxies because it
+ introduces a visible change */
+ if (em && em->get_own_property_names) {
+ gpn_flags &= ~JS_GPN_ENUM_ONLY;
+ }
+ }
 if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count, p,
- JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK |
- JS_GPN_ENUM_ONLY))
+ gpn_flags))
 return -1;
-
- flags = JS_PROP_C_W_E;
-
+ 
 for (i = 0; i < tab_atom_count; i++) {
 if (pexcl) {
 ret = JS_GetOwnPropertyInternal(ctx, NULL, pexcl, tab_atom[i].atom);
 if (ret) {
 if (ret < 0)
- break;
- ret = 0;
+ goto exception;
 continue;
 }
 }
- ret = -1;
+ if (!(gpn_flags & JS_GPN_ENUM_ONLY)) {
+ /* test if the property is enumerable */
+ ret = JS_GetOwnPropertyInternal(ctx, &desc, p, tab_atom[i].atom);
+ if (ret < 0)
+ goto exception;
+ if (!ret)
+ continue;
+ is_enumerable = (desc.flags & JS_PROP_ENUMERABLE) != 0;
+ js_free_desc(ctx, &desc);
+ if (!is_enumerable)
+ continue;
+ }
 val = JS_GetProperty(ctx, source, tab_atom[i].atom);
 if (JS_IsException(val))
- break;
+ goto exception;
 if (setprop)
 ret = JS_SetProperty(ctx, target, tab_atom[i].atom, val);
 else
- ret = JS_DefinePropertyValue(ctx, target, tab_atom[i].atom, val, flags);
+ ret = JS_DefinePropertyValue(ctx, target, tab_atom[i].atom, val,
+ JS_PROP_C_W_E);
 if (ret < 0)
- break;
- ret = 0;
+ goto exception;
 }
 js_free_prop_enum(ctx, tab_atom, tab_atom_count);
- return ret;
+ return 0;
+ exception:
+ js_free_prop_enum(ctx, tab_atom, tab_atom_count);
+ return -1;
 }
 
 /* only valid inside C functions */
 static JSValueConst JS_GetActiveFunction(JSContext *ctx)
 {
- return ctx->current_stack_frame->cur_func;
+ return ctx->rt->current_stack_frame->cur_func;
 }
 
 static JSVarRef *get_var_ref(JSContext *ctx, JSStackFrame *sf,
@@ -15157,7 +15882,7 @@
 return JS_EXCEPTION;
 }
 
-static int js_instantiate_prototype(JSContext *ctx, JSObject *p, JSAtom atom, void *opaque)
+static JSValue js_instantiate_prototype(JSContext *ctx, JSObject *p, JSAtom atom, void *opaque)
 {
 JSValue obj, this_val;
 int ret;
@@ -15165,17 +15890,26 @@
 this_val = JS_MKPTR(JS_TAG_OBJECT, p);
 obj = JS_NewObject(ctx);
 if (JS_IsException(obj))
- return -1;
+ return JS_EXCEPTION;
 set_cycle_flag(ctx, obj);
 set_cycle_flag(ctx, this_val);
 ret = JS_DefinePropertyValue(ctx, obj, JS_ATOM_constructor,
 JS_DupValue(ctx, this_val),
 JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
- if (JS_DefinePropertyValue(ctx, this_val, atom, obj, JS_PROP_WRITABLE) < 0 || ret < 0)
- return -1;
- return 0;
+ if (ret < 0) {
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+ }
+ return obj;
 }
 
+static const uint16_t func_kind_to_class_id[] = {
+ [JS_FUNC_NORMAL] = JS_CLASS_BYTECODE_FUNCTION,
+ [JS_FUNC_GENERATOR] = JS_CLASS_GENERATOR_FUNCTION,
+ [JS_FUNC_ASYNC] = JS_CLASS_ASYNC_FUNCTION,
+ [JS_FUNC_ASYNC_GENERATOR] = JS_CLASS_ASYNC_GENERATOR_FUNCTION,
+};
+
 static JSValue js_closure(JSContext *ctx, JSValue bfunc,
 JSVarRef **cur_var_refs,
 JSStackFrame *sf)
@@ -15183,12 +15917,6 @@
 JSFunctionBytecode *b;
 JSValue func_obj;
 JSAtom name_atom;
- static const uint16_t func_kind_to_class_id[] = {
- [JS_FUNC_NORMAL] = JS_CLASS_BYTECODE_FUNCTION,
- [JS_FUNC_GENERATOR] = JS_CLASS_GENERATOR_FUNCTION,
- [JS_FUNC_ASYNC] = JS_CLASS_ASYNC_FUNCTION,
- [JS_FUNC_ASYNC_GENERATOR] = JS_CLASS_ASYNC_GENERATOR_FUNCTION,
- };
 
 b = JS_VALUE_GET_PTR(bfunc);
 func_obj = JS_NewObjectClass(ctx, func_kind_to_class_id[b->func_kind]);
@@ -15227,7 +15955,7 @@
 object is created on the fly when first accessed */
 JS_SetConstructorBit(ctx, func_obj, TRUE);
 JS_DefineAutoInitProperty(ctx, func_obj, JS_ATOM_prototype,
- js_instantiate_prototype, NULL,
+ JS_AUTOINIT_ID_PROTOTYPE, NULL,
 JS_PROP_WRITABLE);
 }
 return func_obj;
@@ -15303,7 +16031,7 @@
 goto fail;
 }
 
- /* the constructor property must be first. It can be overridden by
+ /* the constructor property must be first. It can be overriden by
 computed property names */
 if (JS_DefinePropertyValue(ctx, proto, JS_ATOM_constructor,
 JS_DupValue(ctx, ctor),
@@ -15380,6 +16108,7 @@
 JSValueConst this_obj,
 int argc, JSValueConst *argv, int flags)
 {
+ JSRuntime *rt = ctx->rt;
 JSCFunctionType func;
 JSObject *p;
 JSStackFrame sf_s, *sf = &sf_s, *prev_sf;
@@ -15393,22 +16122,25 @@
 arg_count = p->u.cfunc.length;
 
 /* better to always check stack overflow */
- if (js_check_stack_overflow(ctx, sizeof(arg_buf[0]) * arg_count))
+ if (js_check_stack_overflow(rt, sizeof(arg_buf[0]) * arg_count))
 return JS_ThrowStackOverflow(ctx);
 
- prev_sf = ctx->current_stack_frame;
+ prev_sf = rt->current_stack_frame;
 sf->prev_frame = prev_sf;
- ctx->current_stack_frame = sf;
+ rt->current_stack_frame = sf;
+ ctx = p->u.cfunc.realm; /* change the current realm */
+ 
 #ifdef CONFIG_BIGNUM
 /* we only propagate the bignum mode as some runtime functions
 test it */
 if (prev_sf)
- sf->js_mode = prev_sf->js_mode & JS_MODE_BIGINT;
+ sf->js_mode = prev_sf->js_mode & JS_MODE_MATH;
 else
 sf->js_mode = 0;
 #else
 sf->js_mode = 0;
 #endif
+
 #if defined(JS_VALUE_CANNOT_BE_CAST)
 sf->cur_func = func_obj;
 #else
@@ -15512,7 +16244,7 @@
 abort();
 }
 
- ctx->current_stack_frame = sf->prev_frame;
+ rt->current_stack_frame = sf->prev_frame;
 return ret_val;
 }
 
@@ -15528,7 +16260,7 @@
 p = JS_VALUE_GET_OBJ(func_obj);
 bf = p->u.bound_function;
 arg_count = bf->argc + argc;
- if (js_check_stack_overflow(ctx, sizeof(JSValue) * arg_count))
+ if (js_check_stack_overflow(ctx->rt, sizeof(JSValue) * arg_count))
 return JS_ThrowStackOverflow(ctx);
 arg_buf = alloca(sizeof(JSValue) * arg_count);
 for(i = 0; i < bf->argc; i++) {
@@ -15549,30 +16281,6 @@
 }
 }
 
-static no_inline __exception int __js_poll_interrupts(JSContext *ctx)
-{
- JSRuntime *rt = ctx->rt;
- ctx->interrupt_counter = JS_INTERRUPT_COUNTER_INIT;
- if (rt->interrupt_handler) {
- if (rt->interrupt_handler(rt, rt->interrupt_opaque)) {
- /* XXX: should set a specific flag to avoid catching */
- JS_ThrowInternalError(ctx, "interrupted");
- JS_SetUncatchableError(ctx, ctx->current_exception, TRUE);
- return -1;
- }
- }
- return 0;
-}
-
-static inline __exception int js_poll_interrupts(JSContext *ctx)
-{
- if (unlikely(--ctx->interrupt_counter <= 0)) {
- return __js_poll_interrupts(ctx);
- } else {
- return 0;
- }
-}
-
 /* argument of OP_special_object */
 typedef enum {
 OP_SPECIAL_OBJECT_ARGUMENTS,
@@ -15589,10 +16297,12 @@
 #define FUNC_RET_YIELD_STAR 2
 
 /* argv[] is modified if (flags & JS_CALL_FLAG_COPY_ARGV) = 0. */
-static JSValue JS_CallInternal(JSContext *ctx, JSValueConst func_obj,
+static JSValue JS_CallInternal(JSContext *caller_ctx, JSValueConst func_obj,
 JSValueConst this_obj, JSValueConst new_target,
 int argc, JSValue *argv, int flags)
 {
+ JSRuntime *rt = caller_ctx->rt;
+ JSContext *ctx;
 JSObject *p;
 JSFunctionBytecode *b;
 JSStackFrame sf_s, *sf = &sf_s;
@@ -15612,7 +16322,7 @@
 #define DEF(id, size, n_pop, n_push, f) && case_OP_ ## id,
 #if SHORT_OPCODES
 #define def(id, size, n_pop, n_push, f)
-#else
+#else 
 #define def(id, size, n_pop, n_push, f) && case_default,
 #endif
 #include "quickjs-opcode.h"
@@ -15624,7 +16334,7 @@
 #define BREAK SWITCH(pc)
 #endif
 
- if (js_poll_interrupts(ctx))
+ if (js_poll_interrupts(caller_ctx))
 return JS_EXCEPTION;
 if (unlikely(JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)) {
 if (flags & JS_CALL_FLAG_GENERATOR) {
@@ -15634,6 +16344,7 @@
 sf = &s->frame;
 p = JS_VALUE_GET_OBJ(sf->cur_func);
 b = p->u.func.function_bytecode;
+ ctx = b->realm;
 var_refs = p->u.func.var_refs;
 local_buf = arg_buf = sf->arg_buf;
 var_buf = sf->var_buf;
@@ -15641,8 +16352,8 @@
 sp = sf->cur_sp;
 sf->cur_sp = NULL; /* cur_sp is NULL if the function is running */
 pc = sf->cur_pc;
- sf->prev_frame = ctx->current_stack_frame;
- ctx->current_stack_frame = sf;
+ sf->prev_frame = rt->current_stack_frame;
+ rt->current_stack_frame = sf;
 if (s->throw_flag)
 goto exception;
 else
@@ -15654,12 +16365,12 @@
 p = JS_VALUE_GET_OBJ(func_obj);
 if (unlikely(p->class_id != JS_CLASS_BYTECODE_FUNCTION)) {
 JSClassCall *call_func;
- call_func = ctx->rt->class_array[p->class_id].call;
+ call_func = rt->class_array[p->class_id].call;
 if (!call_func) {
 not_a_function:
- return JS_ThrowTypeError(ctx, "not a function");
+ return JS_ThrowTypeError(caller_ctx, "not a function");
 }
- return call_func(ctx, func_obj, this_obj, argc,
+ return call_func(caller_ctx, func_obj, this_obj, argc,
 (JSValueConst *)argv, flags);
 }
 b = p->u.func.function_bytecode;
@@ -15672,8 +16383,8 @@
 
 alloca_size = sizeof(JSValue) * (arg_allocated_size + b->var_count +
 b->stack_size);
- if (js_check_stack_overflow(ctx, alloca_size))
- return JS_ThrowStackOverflow(ctx);
+ if (js_check_stack_overflow(rt, alloca_size))
+ return JS_ThrowStackOverflow(caller_ctx);
 
 sf->js_mode = b->js_mode;
 arg_buf = argv;
@@ -15691,7 +16402,7 @@
 int n = min_int(argc, b->arg_count);
 arg_buf = local_buf;
 for(i = 0; i < n; i++)
- arg_buf[i] = JS_DupValue(ctx, argv[i]);
+ arg_buf[i] = JS_DupValue(caller_ctx, argv[i]);
 for(; i < b->arg_count; i++)
 arg_buf[i] = JS_UNDEFINED;
 sf->arg_count = b->arg_count;
@@ -15706,8 +16417,10 @@
 stack_buf = var_buf + b->var_count;
 sp = stack_buf;
 pc = b->byte_code_buf;
- sf->prev_frame = ctx->current_stack_frame;
- ctx->current_stack_frame = sf;
+ sf->prev_frame = rt->current_stack_frame;
+ rt->current_stack_frame = sf;
+ ctx = b->realm; /* set the current realm */
+ 
 restart:
 for(;;) {
 int call_argc;
@@ -16131,7 +16844,7 @@
 /* return TRUE if 'this' should be returned */
 if (!JS_IsObject(sp[-1])) {
 if (!JS_IsUndefined(sp[-1])) {
- JS_ThrowTypeError(ctx, "derived class constructor must return an object or undefined");
+ JS_ThrowTypeError(caller_ctx, "derived class constructor must return an object or undefined");
 goto exception;
 }
 sp[0] = JS_TRUE;
@@ -16157,16 +16870,17 @@
 JS_FreeValue(ctx, sp[-1]);
 sp -= 2;
 BREAK;
-
+ 
 CASE(OP_throw):
 JS_Throw(ctx, *--sp);
 goto exception;
 
- CASE(OP_throw_var):
+ CASE(OP_throw_error):
 #define JS_THROW_VAR_RO 0
 #define JS_THROW_VAR_REDECL 1
 #define JS_THROW_VAR_UNINITIALIZED 2
-#define JS_THROW_VAR_DELETE_SUPER 3
+#define JS_THROW_ERROR_DELETE_SUPER 3
+#define JS_THROW_ERROR_ITERATOR_THROW 4
 {
 JSAtom atom;
 int type;
@@ -16182,9 +16896,12 @@
 if (type == JS_THROW_VAR_UNINITIALIZED)
 JS_ThrowReferenceErrorUninitialized(ctx, atom);
 else
- if (type == JS_THROW_VAR_DELETE_SUPER)
+ if (type == JS_THROW_ERROR_DELETE_SUPER)
 JS_ThrowReferenceError(ctx, "unsupported reference to 'super'");
 else
+ if (type == JS_THROW_ERROR_ITERATOR_THROW)
+ JS_ThrowTypeError(ctx, "iterator does not have a throw method");
+ else
 JS_ThrowInternalError(ctx, "invalid throw var type %d", type);
 }
 goto exception;
@@ -16259,26 +16976,10 @@
 }
 BREAK;
 
- CASE(OP_get_super_ctor):
- {
- JSValue proto;
- proto = JS_DupValue(ctx, JS_GetPrototype(ctx, sp[-1]));
- if (JS_IsException(proto))
- goto exception;
- if (!JS_IsConstructor(ctx, proto)) {
- JS_FreeValue(ctx, proto);
- JS_ThrowTypeError(ctx, "not a constructor");
- goto exception;
- }
- JS_FreeValue(ctx, sp[-1]);
- sp[-1] = proto;
- }
- BREAK;
-
 CASE(OP_get_super):
 {
 JSValue proto;
- proto = JS_DupValue(ctx, JS_GetPrototype(ctx, sp[-1]));
+ proto = JS_GetPrototype(ctx, sp[-1]);
 if (JS_IsException(proto))
 goto exception;
 JS_FreeValue(ctx, sp[-1]);
@@ -16528,7 +17229,7 @@
 pc += 2;
 val = *var_refs[idx]->pvalue;
 if (unlikely(JS_IsUninitialized(val))) {
- JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+ JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, TRUE);
 goto exception;
 }
 sp[0] = JS_DupValue(ctx, val);
@@ -16541,7 +17242,7 @@
 idx = get_u16(pc);
 pc += 2;
 if (unlikely(JS_IsUninitialized(*var_refs[idx]->pvalue))) {
- JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+ JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, TRUE);
 goto exception;
 }
 set_value(ctx, var_refs[idx]->pvalue, sp[-1]);
@@ -16554,7 +17255,7 @@
 idx = get_u16(pc);
 pc += 2;
 if (unlikely(!JS_IsUninitialized(*var_refs[idx]->pvalue))) {
- JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+ JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, TRUE);
 goto exception;
 }
 set_value(ctx, var_refs[idx]->pvalue, sp[-1]);
@@ -16575,7 +17276,7 @@
 idx = get_u16(pc);
 pc += 2;
 if (unlikely(JS_IsUninitialized(var_buf[idx]))) {
- JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+ JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, FALSE);
 goto exception;
 }
 sp[0] = JS_DupValue(ctx, var_buf[idx]);
@@ -16588,7 +17289,7 @@
 idx = get_u16(pc);
 pc += 2;
 if (unlikely(JS_IsUninitialized(var_buf[idx]))) {
- JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+ JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, FALSE);
 goto exception;
 }
 set_value(ctx, &var_buf[idx], sp[-1]);
@@ -16642,7 +17343,7 @@
 pr = add_property(ctx, JS_VALUE_GET_OBJ(sp[-1]), atom,
 JS_PROP_WRITABLE | JS_PROP_VARREF);
 if (!pr) {
- free_var_ref(ctx->rt, var_ref);
+ free_var_ref(rt, var_ref);
 goto exception;
 }
 pr->u.var_ref = var_ref;
@@ -16827,18 +17528,20 @@
 sp += 1;
 *sp++ = JS_NewCatchOffset(ctx, 0);
 BREAK;
- CASE(OP_for_await_of_next):
- if (js_for_await_of_next(ctx, sp))
- goto exception;
- sp += 1;
- BREAK;
 CASE(OP_iterator_get_value_done):
 if (js_iterator_get_value_done(ctx, sp))
 goto exception;
 sp += 1;
 BREAK;
+ CASE(OP_iterator_check_object):
+ if (unlikely(!JS_IsObject(sp[-1]))) {
+ JS_ThrowTypeError(ctx, "iterator must return an object");
+ goto exception;
+ }
+ BREAK;
 
 CASE(OP_iterator_close):
+ /* iter_obj next catch_offset -> */
 sp--; /* drop the catch offset to avoid getting caught by exception */
 JS_FreeValue(ctx, sp[-1]); /* drop the next method */
 sp--;
@@ -16872,33 +17575,7 @@
 }
 BREAK;
 
- CASE(OP_async_iterator_close):
- /* iter_obj next catch_offset -> value flag */
- {
- JSValue ret, method;
- int ret_flag;
- method = JS_GetProperty(ctx, sp[-3], JS_ATOM_return);
- if (JS_IsException(method))
- goto exception;
- if (JS_IsUndefined(method) || JS_IsNull(method)) {
- ret = JS_UNDEFINED;
- ret_flag = TRUE;
- } else {
- ret = JS_CallFree(ctx, method, sp[-3], 0, NULL);
- if (JS_IsException(ret))
- goto exception;
- ret_flag = FALSE;
- }
- JS_FreeValue(ctx, sp[-3]);
- JS_FreeValue(ctx, sp[-2]);
- JS_FreeValue(ctx, sp[-1]);
- sp[-3] = ret;
- sp[-2] = JS_NewBool(ctx, ret_flag);
- sp -= 1;
- }
- BREAK;
-
- CASE(OP_async_iterator_next):
+ CASE(OP_iterator_next):
 /* stack: iter_obj next catch_offset val */
 {
 JSValue ret;
@@ -16911,25 +17588,28 @@
 }
 BREAK;
 
- CASE(OP_async_iterator_get):
+ CASE(OP_iterator_call):
 /* stack: iter_obj next catch_offset val */
 {
 JSValue method, ret;
 BOOL ret_flag;
 int flags;
 flags = *pc++;
- if (flags == 2) {
- JS_ThrowTypeError(ctx, "iterator does not have a throw method");
- goto exception;
- }
- method = JS_GetProperty(ctx, sp[-4], flags ? JS_ATOM_throw : JS_ATOM_return);
+ method = JS_GetProperty(ctx, sp[-4], (flags & 1) ?
+ JS_ATOM_throw : JS_ATOM_return);
 if (JS_IsException(method))
 goto exception;
 if (JS_IsUndefined(method) || JS_IsNull(method)) {
 ret_flag = TRUE;
 } else {
- ret = JS_CallFree(ctx, method, sp[-4],
- 1, (JSValueConst *)(sp - 1));
+ if (flags & 2) {
+ /* no argument */
+ ret = JS_CallFree(ctx, method, sp[-4],
+ 0, NULL);
+ } else {
+ ret = JS_CallFree(ctx, method, sp[-4],
+ 1, (JSValueConst *)(sp - 1));
+ }
 if (JS_IsException(ret))
 goto exception;
 JS_FreeValue(ctx, sp[-1]);
@@ -17005,7 +17685,7 @@
 {
 JSAtom atom;
 JSValue val;
-
+ 
 atom = get_u32(pc);
 pc += 4;
 val = JS_NewSymbolFromAtom(ctx, atom, JS_ATOM_TYPE_PRIVATE);
@@ -17014,7 +17694,7 @@
 *sp++ = val;
 }
 BREAK;
-
+ 
 CASE(OP_get_private_field):
 {
 JSValue val;
@@ -17167,7 +17847,7 @@
 {
 int class_flags;
 JSAtom atom;
-
+ 
 atom = get_u32(pc);
 class_flags = pc[4];
 pc += 5;
@@ -17255,7 +17935,8 @@
 
 CASE(OP_put_ref_value):
 {
- int ret;
+ int ret, flags;
+ flags = JS_PROP_THROW_STRICT;
 if (unlikely(JS_IsUndefined(sp[-3]))) {
 if (is_strict_mode(ctx)) {
 JSAtom atom = JS_ValueToAtom(ctx, sp[-2]);
@@ -17267,8 +17948,11 @@
 } else {
 sp[-3] = JS_DupValue(ctx, ctx->global_obj);
 }
+ } else {
+ if (is_strict_mode(ctx))
+ flags |= JS_PROP_NO_ADD;
 }
- ret = JS_SetPropertyValue(ctx, sp[-3], sp[-2], sp[-1], JS_PROP_THROW_STRICT);
+ ret = JS_SetPropertyValue(ctx, sp[-3], sp[-2], sp[-1], flags);
 JS_FreeValue(ctx, sp[-3]);
 sp -= 3;
 if (unlikely(ret < 0))
@@ -17287,8 +17971,7 @@
 atom = JS_ValueToAtom(ctx, sp[-2]);
 if (unlikely(atom == JS_ATOM_NULL))
 goto exception;
- ret = JS_SetPropertyGeneric(ctx, JS_VALUE_GET_OBJ(sp[-3]),
- atom, sp[-1], sp[-4],
+ ret = JS_SetPropertyGeneric(ctx, sp[-3], atom, sp[-1], sp[-4],
 JS_PROP_THROW_STRICT);
 JS_FreeAtom(ctx, atom);
 JS_FreeValue(ctx, sp[-4]);
@@ -17361,47 +18044,42 @@
 BREAK;
 CASE(OP_add_loc):
 {
- JSValue ops[2];
+ JSValue *pv;
 int idx;
 idx = *pc;
 pc += 1;
 
- ops[0] = var_buf[idx];
- ops[1] = sp[-1];
- if (likely(JS_VALUE_IS_BOTH_INT(ops[0], ops[1]))) {
+ pv = &var_buf[idx];
+ if (likely(JS_VALUE_IS_BOTH_INT(*pv, sp[-1]))) {
 int64_t r;
- r = (int64_t)JS_VALUE_GET_INT(ops[0]) + JS_VALUE_GET_INT(ops[1]);
+ r = (int64_t)JS_VALUE_GET_INT(*pv) +
+ JS_VALUE_GET_INT(sp[-1]);
 if (unlikely((int)r != r))
 goto add_loc_slow;
- var_buf[idx] = JS_NewInt32(ctx, r);
+ *pv = JS_NewInt32(ctx, r);
 sp--;
- } else if (JS_VALUE_GET_TAG(ops[0]) == JS_TAG_STRING) {
+ } else if (JS_VALUE_GET_TAG(*pv) == JS_TAG_STRING) {
+ JSValue op1;
+ op1 = sp[-1];
 sp--;
- ops[1] = JS_ToPrimitiveFree(ctx, ops[1], HINT_NONE);
- if (JS_IsException(ops[1])) {
+ op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NONE);
+ if (JS_IsException(op1))
 goto exception;
- }
- /* XXX: should not modify the variable in case of
- exception */
- ops[0] = JS_ConcatString(ctx, ops[0], ops[1]);
- if (JS_IsException(ops[0])) {
- var_buf[idx] = JS_UNDEFINED;
+ op1 = JS_ConcatString(ctx, JS_DupValue(ctx, *pv), op1);
+ if (JS_IsException(op1))
 goto exception;
- }
- var_buf[idx] = ops[0];
+ set_value(ctx, pv, op1);
 } else {
+ JSValue ops[2];
 add_loc_slow:
- /* XXX: should not modify the variable in case of
- exception */
- sp--;
 /* In case of exception, js_add_slow frees ops[0]
- and ops[1]. */
- /* XXX: change API */
- if (js_add_slow(ctx, ops + 2)) {
- var_buf[idx] = JS_UNDEFINED;
+ and ops[1], so we must duplicate *pv */
+ ops[0] = JS_DupValue(ctx, *pv);
+ ops[1] = sp[-1];
+ sp--;
+ if (js_add_slow(ctx, ops + 2))
 goto exception;
- }
- var_buf[idx] = ops[0];
+ set_value(ctx, pv, ops[0]);
 }
 }
 BREAK;
@@ -17438,11 +18116,12 @@
 v1 = JS_VALUE_GET_INT(op1);
 v2 = JS_VALUE_GET_INT(op2);
 r = (int64_t)v1 * v2;
-#ifdef CONFIG_BIGNUM
- if (unlikely((int)r != r) || (r == 0 && !is_bigint_mode(ctx)))
- goto binary_arith_slow;
-#else
 if (unlikely((int)r != r)) {
+#ifdef CONFIG_BIGNUM
+ if (unlikely(sf->js_mode & JS_MODE_MATH) &&
+ (r < -MAX_SAFE_INTEGER || r > MAX_SAFE_INTEGER))
+ goto binary_arith_slow;
+#endif
 d = (double)r;
 goto mul_fp_res;
 }
@@ -17451,14 +18130,15 @@
 d = -0.0;
 goto mul_fp_res;
 }
-#endif
 sp[-2] = JS_NewInt32(ctx, r);
 sp--;
 } else if (JS_VALUE_IS_BOTH_FLOAT(op1, op2)) {
+#ifdef CONFIG_BIGNUM
+ if (unlikely(sf->js_mode & JS_MODE_MATH))
+ goto binary_arith_slow;
+#endif
 d = JS_VALUE_GET_FLOAT64(op1) * JS_VALUE_GET_FLOAT64(op2);
-#ifndef CONFIG_BIGNUM
 mul_fp_res:
-#endif
 sp[-2] = __JS_NewFloat64(ctx, d);
 sp--;
 } else {
@@ -17466,11 +18146,6 @@
 }
 }
 BREAK;
-#ifdef CONFIG_BIGNUM
- CASE(OP_math_div):
- CASE(OP_div):
- goto binary_arith_slow;
-#else
 CASE(OP_div):
 {
 JSValue op1, op2;
@@ -17478,6 +18153,8 @@
 op2 = sp[-1];
 if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
 int v1, v2;
+ if (unlikely(sf->js_mode & JS_MODE_MATH))
+ goto binary_arith_slow;
 v1 = JS_VALUE_GET_INT(op1);
 v2 = JS_VALUE_GET_INT(op2);
 sp[-2] = JS_NewFloat64(ctx, (double)v1 / (double)v2);
@@ -17487,7 +18164,6 @@
 }
 }
 BREAK;
-#endif
 CASE(OP_mod):
 #ifdef CONFIG_BIGNUM
 CASE(OP_math_mod):
@@ -17513,9 +18189,6 @@
 }
 BREAK;
 CASE(OP_pow):
-#ifdef CONFIG_BIGNUM
- CASE(OP_math_pow):
-#endif
 binary_arith_slow:
 if (js_binary_arith_slow(ctx, sp, opcode))
 goto exception;
@@ -17545,11 +18218,6 @@
 tag = JS_VALUE_GET_TAG(op1);
 if (tag == JS_TAG_INT) {
 val = JS_VALUE_GET_INT(op1);
-#ifdef CONFIG_BIGNUM
- if (unlikely(val == INT32_MIN) ||
- (val == 0 && !is_bigint_mode(ctx)))
- goto slow_neg;
-#else
 /* Note: -0 cannot be expressed as integer */
 if (unlikely(val == 0)) {
 d = -0.0;
@@ -17559,18 +18227,12 @@
 d = -(double)val;
 goto neg_fp_res;
 }
-#endif
 sp[-1] = JS_NewInt32(ctx, -val);
 } else if (JS_TAG_IS_FLOAT64(tag)) {
 d = -JS_VALUE_GET_FLOAT64(op1);
-#ifndef CONFIG_BIGNUM
 neg_fp_res:
-#endif
 sp[-1] = __JS_NewFloat64(ctx, d);
 } else {
-#ifdef CONFIG_BIGNUM
- slow_neg:
-#endif
 if (js_unary_arith_slow(ctx, sp, opcode))
 goto exception;
 }
@@ -17632,8 +18294,12 @@
 var_buf[idx] = JS_NewInt32(ctx, val + 1);
 } else {
 inc_loc_slow:
- if (js_unary_arith_slow(ctx, var_buf + idx + 1, OP_inc))
+ /* must duplicate otherwise the variable value may
+ be destroyed before JS code accesses it */
+ op1 = JS_DupValue(ctx, op1);
+ if (js_unary_arith_slow(ctx, &op1 + 1, OP_inc))
 goto exception;
+ set_value(ctx, &var_buf[idx], op1);
 }
 }
 BREAK;
@@ -17653,8 +18319,12 @@
 var_buf[idx] = JS_NewInt32(ctx, val - 1);
 } else {
 dec_loc_slow:
- if (js_unary_arith_slow(ctx, var_buf + idx + 1, OP_dec))
+ /* must duplicate otherwise the variable value may
+ be destroyed before JS code accesses it */
+ op1 = JS_DupValue(ctx, op1);
+ if (js_unary_arith_slow(ctx, &op1 + 1, OP_dec))
 goto exception;
+ set_value(ctx, &var_buf[idx], op1);
 }
 }
 BREAK;
@@ -17683,7 +18353,7 @@
 #ifdef CONFIG_BIGNUM
 {
 int64_t r;
- if (is_bigint_mode(ctx)) {
+ if (unlikely(sf->js_mode & JS_MODE_MATH)) {
 if (v2 > 0x1f)
 goto shl_slow;
 r = (int64_t)v1 << v2;
@@ -17739,7 +18409,7 @@
 v2 = JS_VALUE_GET_INT(op2);
 #ifdef CONFIG_BIGNUM
 if (unlikely(v2 > 0x1f)) {
- if (is_bigint_mode(ctx))
+ if (unlikely(sf->js_mode & JS_MODE_MATH))
 goto sar_slow;
 else
 v2 &= 0x1f;
@@ -17841,7 +18511,7 @@
 
 #ifdef CONFIG_BIGNUM
 CASE(OP_mul_pow10):
- if (ctx->rt->bigfloat_ops.mul_pow10(ctx, sp))
+ if (rt->bigfloat_ops.mul_pow10(ctx, sp))
 goto exception;
 sp--;
 BREAK;
@@ -17980,6 +18650,7 @@
 set_value(ctx, &sp[-1], val);
 break;
 case OP_with_put_var:
+ /* XXX: check if strict mode */
 ret = JS_SetPropertyInternal(ctx, obj, atom, sp[-2],
 JS_PROP_THROW_STRICT);
 JS_FreeValue(ctx, sp[-1]);
@@ -18062,7 +18733,15 @@
 } else {
 goto free_and_set_false;
 }
- CASE(OP_is_function):
+ /* XXX: could merge to a single opcode */
+ CASE(OP_typeof_is_undefined):
+ /* different from OP_is_undefined because of isHTMLDDA */
+ if (js_operator_typeof(ctx, sp[-1]) == JS_ATOM_undefined) {
+ goto free_and_set_true;
+ } else {
+ goto free_and_set_false;
+ }
+ CASE(OP_typeof_is_function):
 if (js_operator_typeof(ctx, sp[-1]) == JS_ATOM_function) {
 goto free_and_set_true;
 } else {
@@ -18086,14 +18765,14 @@
 }
 }
 exception:
- if (is_backtrace_needed(ctx, ctx->current_exception)) {
+ if (is_backtrace_needed(ctx, rt->current_exception)) {
 /* add the backtrace information now (it is not done
 before if the exception happens in a bytecode
 operation */
 sf->cur_pc = pc;
- build_backtrace(ctx, ctx->current_exception, NULL, 0, 0);
+ build_backtrace(ctx, rt->current_exception, NULL, 0, 0);
 }
- if (!JS_IsUncatchableError(ctx, ctx->current_exception)) {
+ if (!JS_IsUncatchableError(ctx, rt->current_exception)) {
 while (sp > stack_buf) {
 JSValue val = *--sp;
 JS_FreeValue(ctx, val);
@@ -18105,8 +18784,8 @@
 sp--;
 JS_IteratorClose(ctx, sp[-1], TRUE);
 } else {
- *sp++ = ctx->current_exception;
- ctx->current_exception = JS_NULL;
+ *sp++ = rt->current_exception;
+ rt->current_exception = JS_NULL;
 pc = b->byte_code_buf + pos;
 goto restart;
 }
@@ -18125,14 +18804,14 @@
 done:
 if (unlikely(!list_empty(&sf->var_ref_list))) {
 /* variable references reference the stack: must close them */
- close_var_refs(ctx->rt, sf);
+ close_var_refs(rt, sf);
 }
 /* free the local variables and stack */
 for(pval = local_buf; pval < sp; pval++) {
 JS_FreeValue(ctx, *pval);
 }
 }
- ctx->current_stack_frame = sf->prev_frame;
+ rt->current_stack_frame = sf->prev_frame;
 return ret_val;
 }
 
@@ -18152,24 +18831,62 @@
 return res;
 }
 
-static JSValue js_get_prototype_from_ctor(JSContext *ctx, JSValueConst ctor,
- JSValueConst def_proto)
+/* warning: the refcount of the context is not incremented. Return
+ NULL in case of exception (case of revoked proxy only) */
+static JSContext *JS_GetFunctionRealm(JSContext *ctx, JSValueConst func_obj)
 {
- JSValue proto;
- proto = JS_GetProperty(ctx, ctor, JS_ATOM_prototype);
- if (JS_IsException(proto))
- return proto;
- if (!JS_IsObject(proto)) {
- JS_FreeValue(ctx, proto);
- proto = JS_DupValue(ctx, def_proto);
+ JSObject *p;
+ JSContext *realm;
+ 
+ if (JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)
+ return ctx;
+ p = JS_VALUE_GET_OBJ(func_obj);
+ switch(p->class_id) {
+ case JS_CLASS_C_FUNCTION:
+ realm = p->u.cfunc.realm;
+ break;
+ case JS_CLASS_BYTECODE_FUNCTION:
+ case JS_CLASS_GENERATOR_FUNCTION:
+ case JS_CLASS_ASYNC_FUNCTION:
+ case JS_CLASS_ASYNC_GENERATOR_FUNCTION:
+ {
+ JSFunctionBytecode *b;
+ b = p->u.func.function_bytecode;
+ realm = b->realm;
+ }
+ break;
+ case JS_CLASS_PROXY:
+ {
+ JSProxyData *s = p->u.opaque;
+ if (!s)
+ return ctx;
+ if (s->is_revoked) {
+ JS_ThrowTypeErrorRevokedProxy(ctx);
+ return NULL;
+ } else {
+ realm = JS_GetFunctionRealm(ctx, s->target);
+ }
+ }
+ break;
+ case JS_CLASS_BOUND_FUNCTION:
+ {
+ JSBoundFunction *bf = p->u.bound_function;
+ realm = JS_GetFunctionRealm(ctx, bf->func_obj);
+ }
+ break;
+ default:
+ realm = ctx;
+ break;
 }
- return proto;
+ return realm;
 }
 
 static JSValue js_create_from_ctor(JSContext *ctx, JSValueConst ctor,
 int class_id)
 {
 JSValue proto, obj;
+ JSContext *realm;
+ 
 if (JS_IsUndefined(ctor)) {
 proto = JS_DupValue(ctx, ctx->class_proto[class_id]);
 } else {
@@ -18178,14 +18895,10 @@
 return proto;
 if (!JS_IsObject(proto)) {
 JS_FreeValue(ctx, proto);
- /* check if revoked proxy */
- {
- JSProxyData *s = JS_GetOpaque(ctor, JS_CLASS_PROXY);
- if (s && s->is_revoked)
- return JS_ThrowTypeErrorRevokedProxy(ctx);
- }
- /* XXX: should use the ctor realm instead of 'ctx' */
- proto = JS_DupValue(ctx, ctx->class_proto[class_id]);
+ realm = JS_GetFunctionRealm(ctx, ctor);
+ if (!realm)
+ return JS_EXCEPTION;
+ proto = JS_DupValue(ctx, realm->class_proto[class_id]);
 }
 }
 obj = JS_NewObjectProtoClass(ctx, proto, class_id);
@@ -18340,7 +19053,7 @@
 
 /* close the closure variables. */
 close_var_refs(rt, sf);
-
+ 
 if (sf->arg_buf) {
 /* cannot free the function if it is running */
 assert(sf->cur_sp != NULL);
@@ -18357,6 +19070,9 @@
 {
 JSValue func_obj;
 
+ if (js_check_stack_overflow(ctx->rt, 0))
+ return JS_ThrowStackOverflow(ctx);
+
 /* the tag does not matter provided it is not an object */
 func_obj = JS_MKPTR(JS_TAG_INT, s);
 return JS_CallInternal(ctx, func_obj, s->this_val, JS_UNDEFINED,
@@ -18425,13 +19141,11 @@
 JSGeneratorData *s = JS_GetOpaque(this_val, JS_CLASS_GENERATOR);
 JSStackFrame *sf;
 JSValue ret, func_ret;
- JSValueConst iter_args[1];
 
 *pdone = TRUE;
 if (!s)
 return JS_ThrowTypeError(ctx, "not a generator");
 sf = &s->func_state.frame;
- redo:
 switch(s->state) {
 default:
 case JS_GENERATOR_STATE_SUSPENDED_START:
@@ -18443,85 +19157,16 @@
 }
 break;
 case JS_GENERATOR_STATE_SUSPENDED_YIELD_STAR:
- {
- int done;
- JSValue method, iter_obj;
-
- iter_obj = sf->cur_sp[-2];
- if (magic == GEN_MAGIC_NEXT) {
- method = JS_DupValue(ctx, sf->cur_sp[-1]);
- } else {
- method = JS_GetProperty(ctx, iter_obj,
- magic == GEN_MAGIC_RETURN ?
- JS_ATOM_return : JS_ATOM_throw);
- if (JS_IsException(method))
- goto iter_exception;
- }
- if (magic != GEN_MAGIC_NEXT &&
- (JS_IsUndefined(method) || JS_IsNull(method))) {
- /* default action */
- if (magic == GEN_MAGIC_RETURN) {
- ret = JS_DupValue(ctx, argv[0]);
- goto iter_done;
- } else {
- if (JS_IteratorClose(ctx, iter_obj, FALSE))
- goto iter_exception;
- JS_ThrowTypeError(ctx, "iterator does not have a throw method");
- goto iter_exception;
- }
- }
- ret = JS_IteratorNext2(ctx, iter_obj, method, argc, argv, &done);
- JS_FreeValue(ctx, method);
- if (JS_IsException(ret)) {
- iter_exception:
- goto exec_throw;
- }
- /* if not done, the iterator returns the exact object
- returned by 'method' */
- if (done == 2) {
- JSValue done_val, value;
- done_val = JS_GetProperty(ctx, ret, JS_ATOM_done);
- if (JS_IsException(done_val)) {
- JS_FreeValue(ctx, ret);
- goto iter_exception;
- }
- done = JS_ToBoolFree(ctx, done_val);
- if (done) {
- value = JS_GetProperty(ctx, ret, JS_ATOM_value);
- JS_FreeValue(ctx, ret);
- if (JS_IsException(value))
- goto iter_exception;
- ret = value;
- goto iter_done;
- } else {
- *pdone = 2;
- }
- } else {
- if (done) {
- /* 'yield *' returns the value associated to done = true */
- iter_done:
- JS_FreeValue(ctx, sf->cur_sp[-2]);
- JS_FreeValue(ctx, sf->cur_sp[-1]);
- sf->cur_sp--;
- goto exec_arg;
- } else {
- *pdone = FALSE;
- }
- }
- break;
- }
- break;
 case JS_GENERATOR_STATE_SUSPENDED_YIELD:
 /* cur_sp[-1] was set to JS_UNDEFINED in the previous call */
 ret = JS_DupValue(ctx, argv[0]);
- if (magic == GEN_MAGIC_THROW) {
+ if (magic == GEN_MAGIC_THROW &&
+ s->state == JS_GENERATOR_STATE_SUSPENDED_YIELD) {
 JS_Throw(ctx, ret);
- exec_throw:
 s->func_state.throw_flag = TRUE;
 } else {
- exec_arg:
 sf->cur_sp[-1] = ret;
- sf->cur_sp[0] = JS_NewBool(ctx, (magic == GEN_MAGIC_RETURN));
+ sf->cur_sp[0] = JS_NewInt32(ctx, magic);
 sf->cur_sp++;
 exec_no_arg:
 s->func_state.throw_flag = FALSE;
@@ -18535,17 +19180,14 @@
 return func_ret;
 }
 if (JS_VALUE_GET_TAG(func_ret) == JS_TAG_INT) {
+ /* get the returned yield value at the top of the stack */
+ ret = sf->cur_sp[-1];
+ sf->cur_sp[-1] = JS_UNDEFINED;
 if (JS_VALUE_GET_INT(func_ret) == FUNC_RET_YIELD_STAR) {
- /* 'yield *' */
 s->state = JS_GENERATOR_STATE_SUSPENDED_YIELD_STAR;
- iter_args[0] = JS_UNDEFINED;
- argc = 1;
- argv = iter_args;
- goto redo;
- } else {
- /* get the return the yield value at the top of the stack */
- ret = sf->cur_sp[-1];
- sf->cur_sp[-1] = JS_UNDEFINED;
+ /* return (value, done) object */
+ *pdone = 2;
+ } else {
 *pdone = FALSE;
 }
 } else {
@@ -19254,6 +19896,9 @@
 TOK_MATH_POW_ASSIGN,
 #endif
 TOK_POW_ASSIGN,
+ TOK_LAND_ASSIGN,
+ TOK_LOR_ASSIGN,
+ TOK_DOUBLE_QUESTION_MARK_ASSIGN,
 TOK_DEC,
 TOK_INC,
 TOK_SHL,
@@ -19353,15 +19998,15 @@
 int has_iterator;
 } BlockEnv;
 
-typedef struct JSHoistedDef {
- int cpool_idx; /* -1 means variable global definition */
- uint8_t force_init : 1; /* initialize to undefined */
+typedef struct JSGlobalVar {
+ int cpool_idx; /* if >= 0, index in the constant pool for hoisted
+ function defintion*/
+ uint8_t force_init : 1; /* force initialization to undefined */
 uint8_t is_lexical : 1; /* global let/const definition */
 uint8_t is_const : 1; /* const definition */
- int var_idx; /* function object index if cpool_idx >= 0 */
 int scope_level; /* scope of definition */
- JSAtom var_name; /* variable name if cpool_idx < 0 */
-} JSHoistedDef;
+ JSAtom var_name; /* variable name */
+} JSGlobalVar;
 
 typedef struct RelocEntry {
 struct RelocEntry *next;
@@ -19424,6 +20069,7 @@
 BOOL has_home_object; /* TRUE if the home object is available */
 BOOL has_prototype; /* true if a prototype field is necessary */
 BOOL has_simple_parameter_list;
+ BOOL has_parameter_expressions; /* if true, an argument scope is created */
 BOOL has_use_strict; /* to reject directive in special cases */
 BOOL has_eval_call; /* true if the function contains a call to eval() */
 BOOL has_arguments_binding; /* true if the 'arguments' binding is
@@ -19451,7 +20097,10 @@
 int arg_count; /* number of arguments */
 int defined_arg_count;
 int var_object_idx; /* -1 if none */
+ int arg_var_object_idx; /* -1 if none (var object for the argument scope) */
 int arguments_var_idx; /* -1 if none */
+ int arguments_arg_idx; /* argument variable definition in argument scope, 
+ -1 if none */
 int func_var_idx; /* variable containing the current function (-1
 if none, only used if is_func_expr is true) */
 int eval_ret_idx; /* variable containing the return value of the eval, -1 if none */
@@ -19460,23 +20109,24 @@
 int this_active_func_var_idx; /* variable containg the 'this.active_func' value, -1 if none */
 int home_object_var_idx;
 BOOL need_home_object;
-
+ 
 int scope_level; /* index into fd->scopes if the current lexical scope */
 int scope_first; /* index into vd->vars of first lexically scoped variable */
 int scope_size; /* allocated size of fd->scopes array */
 int scope_count; /* number of entries used in the fd->scopes array */
 JSVarScope *scopes;
 JSVarScope def_scope_array[4];
+ int body_scope; /* scope of the body of the function or eval */
 
- int hoisted_def_count;
- int hoisted_def_size;
- JSHoistedDef *hoisted_def;
+ int global_var_count;
+ int global_var_size;
+ JSGlobalVar *global_vars;
 
 DynBuf byte_code;
 int last_opcode_pos; /* -1 if no last opcode */
 int last_opcode_line_num;
 BOOL use_short_opcodes; /* true if short opcodes are used in byte_code */
-
+ 
 LabelSlot *label_slots;
 int label_size; /* allocated size for label_slots[] */
 int label_count;
@@ -19484,8 +20134,8 @@
 
 /* constant pool (strings, functions, numbers) */
 JSValue *cpool;
- uint32_t cpool_count;
- uint32_t cpool_size;
+ int cpool_count;
+ int cpool_size;
 
 /* list of variables in the closure */
 int closure_var_count;
@@ -19555,6 +20205,7 @@
 JSFunctionDef *cur_func;
 BOOL is_module; /* parsing a module */
 BOOL allow_html_comments;
+ BOOL ext_json; /* true if accepting JSON superset */
 } JSParseState;
 
 typedef struct JSOpCode {
@@ -19612,23 +20263,20 @@
 JS_FreeValue(s->ctx, token->u.regexp.flags);
 break;
 case TOK_IDENT:
-#if !defined(_MSC_VER)
- case TOK_FIRST_KEYWORD ... TOK_LAST_KEYWORD:
-#endif
 case TOK_PRIVATE_NAME:
 JS_FreeAtom(s->ctx, token->u.ident.atom);
 break;
 default:
-#if defined(_MSC_VER)
 if (token->val >= TOK_FIRST_KEYWORD &&
- token->val <= TOK_LAST_KEYWORD)
+ token->val <= TOK_LAST_KEYWORD) {
 JS_FreeAtom(s->ctx, token->u.ident.atom);
-#endif
+ }
 break;
 }
 }
 
-static void __maybe_unused dump_token(JSParseState *s, const JSToken *token)
+static void __maybe_unused dump_token(JSParseState *s,
+ const JSToken *token)
 {
 switch(token->val) {
 case TOK_NUMBER:
@@ -19697,14 +20345,14 @@
 JSContext *ctx = s->ctx;
 va_list ap;
 int backtrace_flags;
-
+ 
 va_start(ap, fmt);
 JS_ThrowError2(ctx, JS_SYNTAX_ERROR, fmt, ap, FALSE);
 va_end(ap);
 backtrace_flags = 0;
 if (s->cur_func && s->cur_func->backtrace_barrier)
 backtrace_flags = JS_BACKTRACE_FLAG_SINGLE_LEVEL;
- build_backtrace(ctx, ctx->current_exception, s->filename, s->line_num,
+ build_backtrace(ctx, ctx->rt->current_exception, s->filename, s->line_num,
 backtrace_flags);
 return -1;
 }
@@ -19840,6 +20488,8 @@
 }
 if (c == '\\') {
 c = *p;
+ /* XXX: need a specific JSON case to avoid
+ accepting invalid escapes */
 switch(c) {
 case '\0':
 if (p >= s->buf_end)
@@ -19863,18 +20513,23 @@
 s->line_num++;
 continue;
 default:
- if (c >= '0' && c <= '7') {
+ if (c >= '0' && c <= '9') {
 if (!s->cur_func)
- goto invalid_octal; /* JSON case */
+ goto invalid_escape; /* JSON case */
 if (!(s->cur_func->js_mode & JS_MODE_STRICT) && sep != '`')
 goto parse_escape;
 if (c == '0' && !(p[1] >= '0' && p[1] <= '9')) {
 p++;
 c = '\0';
 } else {
- invalid_octal:
- if (do_throw)
- js_parse_error(s, "invalid octal syntax in strict mode");
+ if (c >= '8' || sep == '`') {
+ /* Note: according to ES2021, \8 and \9 are not
+ accepted in strict mode or in templates. */
+ goto invalid_escape;
+ } else {
+ if (do_throw)
+ js_parse_error(s, "octal escape sequences are not allowed in strict mode");
+ }
 goto fail;
 }
 } else if (c >= 0x80) {
@@ -19891,6 +20546,7 @@
 parse_escape:
 ret = lre_parse_escape(&p, TRUE);
 if (ret == -1) {
+ invalid_escape:
 if (do_throw)
 js_parse_error(s, "malformed escape sequence in string literal");
 goto fail;
@@ -20034,17 +20690,93 @@
 return -1;
 }
 
+static __exception int ident_realloc(JSContext *ctx, char **pbuf, size_t *psize,
+ char *static_buf)
+{
+ char *buf, *new_buf;
+ size_t size, new_size;
+ 
+ buf = *pbuf;
+ size = *psize;
+ if (size >= (SIZE_MAX / 3) * 2)
+ new_size = SIZE_MAX;
+ else
+ new_size = size + (size >> 1);
+ if (buf == static_buf) {
+ new_buf = js_malloc(ctx, new_size);
+ if (!new_buf)
+ return -1;
+ memcpy(new_buf, buf, size);
+ } else {
+ new_buf = js_realloc(ctx, buf, new_size);
+ if (!new_buf)
+ return -1;
+ }
+ *pbuf = new_buf;
+ *psize = new_size;
+ return 0;
+}
+
+/* 'c' is the first character. Return JS_ATOM_NULL in case of error */
+static JSAtom parse_ident(JSParseState *s, const uint8_t **pp,
+ BOOL *pident_has_escape, int c, BOOL is_private)
+{
+ const uint8_t *p, *p1;
+ char ident_buf[128], *buf;
+ size_t ident_size, ident_pos;
+ JSAtom atom;
+ 
+ p = *pp;
+ buf = ident_buf;
+ ident_size = sizeof(ident_buf);
+ ident_pos = 0;
+ if (is_private)
+ buf[ident_pos++] = '#';
+ for(;;) {
+ p1 = p;
+ 
+ if (c < 128) {
+ buf[ident_pos++] = c;
+ } else {
+ ident_pos += unicode_to_utf8((uint8_t*)buf + ident_pos, c);
+ }
+ c = *p1++;
+ if (c == '\\' && *p1 == 'u') {
+ c = lre_parse_escape(&p1, TRUE);
+ *pident_has_escape = TRUE;
+ } else if (c >= 128) {
+ c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p1);
+ }
+ if (!lre_js_is_ident_next(c))
+ break;
+ p = p1;
+ if (unlikely(ident_pos >= ident_size - UTF8_CHAR_LEN_MAX)) {
+ if (ident_realloc(s->ctx, &buf, &ident_size, ident_buf)) {
+ atom = JS_ATOM_NULL;
+ goto done;
+ }
+ }
+ }
+ atom = JS_NewAtomLen(s->ctx, buf, ident_pos);
+ done:
+ if (unlikely(buf != ident_buf))
+ js_free(s->ctx, buf);
+ *pp = p;
+ return atom;
+}
+
+
 static __exception int next_token(JSParseState *s)
 {
 const uint8_t *p;
 int c;
- char buf[4096], *q;
 BOOL ident_has_escape;
-
- if (js_check_stack_overflow(s->ctx, 0)) {
+ JSAtom atom;
+ 
+ if (js_check_stack_overflow(s->ctx->rt, 0)) {
 return js_parse_error(s, "stack overflow");
 }
-
+ 
 free_token(s, &s->token);
 
 p = s->last_ptr = s->buf_ptr;
@@ -20056,23 +20788,18 @@
 c = *p;
 switch(c) {
 case 0:
- s->token.val = TOK_EOF;
- break;
- case '`':
- if (!s->cur_func) {
- /* JSON does not accept templates */
+ if (p >= s->buf_end) {
+ s->token.val = TOK_EOF;
+ } else {
 goto def_token;
 }
+ break;
+ case '`':
 if (js_parse_template_part(s, p + 1))
 goto fail;
 p = s->buf_ptr;
 break;
 case '\'':
- if (!s->cur_func) {
- /* JSON does not accept single quoted strings */
- goto def_token;
- }
- /* fall through */
 case '\"':
 if (js_parse_string(s, c, TRUE, p + 1, &s->token, &p))
 goto fail;
@@ -20090,11 +20817,6 @@
 goto redo;
 case '\f':
 case '\v':
- if (!s->cur_func) {
- /* JSONWhitespace does not match <VT>, nor <FF> */
- goto def_token;
- }
- /* fall through */
 case ' ':
 case '\t':
 p++;
@@ -20123,6 +20845,8 @@
 c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
 if (c == CP_LS || c == CP_PS) {
 s->got_lf = TRUE; /* considered as LF for ASI */
+ } else if (c == -1) {
+ p++; /* skip invalid UTF-8 */
 }
 } else {
 p++;
@@ -20141,8 +20865,11 @@
 if (*p >= 0x80) {
 c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
 /* LS or PS are considered as line terminator */
- if (c == CP_LS || c == CP_PS)
+ if (c == CP_LS || c == CP_PS) {
 break;
+ } else if (c == -1) {
+ p++; /* skip invalid UTF-8 */
+ }
 } else {
 p++;
 }
@@ -20170,62 +20897,43 @@
 }
 }
 goto def_token;
-#if defined(_MSC_VER)
- case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': case 'm':
- case 'n': case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u': case 'v': case 'w': case 'x': case 'y': case 'z':
- case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': case 'M':
- case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
-#else
- case 'a' ... 'z':
- case 'A' ... 'Z':
-#endif
+ case 'a': case 'b': case 'c': case 'd':
+ case 'e': case 'f': case 'g': case 'h':
+ case 'i': case 'j': case 'k': case 'l':
+ case 'm': case 'n': case 'o': case 'p':
+ case 'q': case 'r': case 's': case 't':
+ case 'u': case 'v': case 'w': case 'x':
+ case 'y': case 'z': 
+ case 'A': case 'B': case 'C': case 'D':
+ case 'E': case 'F': case 'G': case 'H':
+ case 'I': case 'J': case 'K': case 'L':
+ case 'M': case 'N': case 'O': case 'P':
+ case 'Q': case 'R': case 'S': case 'T':
+ case 'U': case 'V': case 'W': case 'X':
+ case 'Y': case 'Z': 
 case '_':
 case '$':
 /* identifier */
 p++;
 ident_has_escape = FALSE;
 has_ident:
- q = buf;
- for(;;) {
- const uint8_t *p1 = p;
-
- if (c < 128) {
- *q++ = c;
- } else {
- q += unicode_to_utf8((uint8_t*)q, c);
- }
- c = *p1++;
- if (c == '\\' && *p1 == 'u') {
- c = lre_parse_escape(&p1, TRUE);
- ident_has_escape = TRUE;
- } else if (c >= 128) {
- c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p1);
- }
- /* XXX: check if c >= 0 and c <= 0x10FFFF */
- if (!lre_js_is_ident_next(c))
- break;
- p = p1;
- if ((q - buf) >= sizeof(buf) - UTF8_CHAR_LEN_MAX) {
- js_parse_error(s, "identifier too long");
- goto fail;
- }
- }
- *q = '\0';
- s->token.u.ident.atom = JS_NewAtomLen(s->ctx, buf, q - buf);
+ atom = parse_ident(s, &p, &ident_has_escape, c, FALSE);
+ if (atom == JS_ATOM_NULL)
+ goto fail;
+ s->token.u.ident.atom = atom;
 s->token.u.ident.has_escape = ident_has_escape;
 s->token.u.ident.is_reserved = FALSE;
 if (s->token.u.ident.atom <= JS_ATOM_LAST_KEYWORD ||
 (s->token.u.ident.atom <= JS_ATOM_LAST_STRICT_KEYWORD &&
- s->cur_func && (s->cur_func->js_mode & JS_MODE_STRICT)) ||
- (s->token.u.ident.atom == JS_ATOM_yield && s->cur_func &&
+ (s->cur_func->js_mode & JS_MODE_STRICT)) ||
+ (s->token.u.ident.atom == JS_ATOM_yield &&
 ((s->cur_func->func_kind & JS_FUNC_GENERATOR) ||
 (s->cur_func->func_type == JS_PARSE_FUNC_ARROW &&
 !s->cur_func->in_function_body && s->cur_func->parent &&
 (s->cur_func->parent->func_kind & JS_FUNC_GENERATOR)))) ||
 (s->token.u.ident.atom == JS_ATOM_await &&
 (s->is_module ||
- (s->cur_func &&
- ((s->cur_func->func_kind & JS_FUNC_ASYNC) ||
+ (((s->cur_func->func_kind & JS_FUNC_ASYNC) ||
 (s->cur_func->func_type == JS_PARSE_FUNC_ARROW &&
 !s->cur_func->in_function_body && s->cur_func->parent &&
 (s->cur_func->parent->func_kind & JS_FUNC_ASYNC))))))) {
@@ -20245,8 +20953,6 @@
 {
 const uint8_t *p1;
 p++;
- q = buf;
- *q++ = '#';
 p1 = p;
 c = *p1++;
 if (c == '\\' && *p1 == 'u') {
@@ -20259,31 +20965,11 @@
 goto fail;
 }
 p = p1;
- for(;;) {
- if (c < 128) {
- *q++ = c;
- } else {
- q += unicode_to_utf8((uint8_t*)q, c);
- }
- p1 = p;
- c = *p1++;
- if (c == '\\' && *p1 == 'u') {
- c = lre_parse_escape(&p1, TRUE);
- ident_has_escape = TRUE;
- } else if (c >= 128) {
- c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p1);
- }
- /* XXX: check if c >= 0 and c <= 0x10FFFF */
- if (!lre_js_is_ident_next(c))
- break;
- p = p1;
- if ((q - buf) >= sizeof(buf) - UTF8_CHAR_LEN_MAX) {
- js_parse_error(s, "private name too long");
- goto fail;
- }
- }
- *q = '\0';
- s->token.u.ident.atom = JS_NewAtomLen(s->ctx, buf, q - buf);
+ ident_has_escape = FALSE; /* not used */
+ atom = parse_ident(s, &p, &ident_has_escape, c, TRUE);
+ if (atom == JS_ATOM_NULL)
+ goto fail;
+ s->token.u.ident.atom = atom;
 s->token.val = TOK_PRIVATE_NAME;
 }
 break;
@@ -20300,40 +20986,32 @@
 }
 break;
 case '0':
- /* in strict or JSON parsing mode, octal literals are not accepted */
- if (is_digit(p[1]) && (!s->cur_func ||
- (s->cur_func->js_mode & JS_MODE_STRICT))) {
+ /* in strict mode, octal literals are not accepted */
+ if (is_digit(p[1]) && (s->cur_func->js_mode & JS_MODE_STRICT)) {
 js_parse_error(s, "octal literals are deprecated in strict mode");
 goto fail;
 }
 goto parse_number;
-#if defined(_MSC_VER)
- case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-#else
- case '1' ... '9':
-#endif
+ case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8':
+ case '9': 
 /* number */
 parse_number:
 {
 JSValue ret;
 const uint8_t *p1;
 int flags, radix;
- if (!s->cur_func) {
- flags = 0;
- radix = 10;
- } else {
- flags = ATOD_ACCEPT_BIN_OCT | ATOD_ACCEPT_LEGACY_OCTAL |
- ATOD_ACCEPT_UNDERSCORES;
+ flags = ATOD_ACCEPT_BIN_OCT | ATOD_ACCEPT_LEGACY_OCTAL |
+ ATOD_ACCEPT_UNDERSCORES;
 #ifdef CONFIG_BIGNUM
- flags |= ATOD_ACCEPT_SUFFIX;
- if (s->cur_func->js_mode & JS_MODE_BIGINT) {
- flags |= ATOD_MODE_BIGINT;
- if (s->cur_func->js_mode & JS_MODE_MATH)
- flags |= ATOD_TYPE_BIG_FLOAT;
- }
-#endif
- radix = 0;
+ flags |= ATOD_ACCEPT_SUFFIX;
+ if (s->cur_func->js_mode & JS_MODE_MATH) {
+ flags |= ATOD_MODE_BIGINT;
+ if (s->cur_func->js_mode & JS_MODE_MATH)
+ flags |= ATOD_TYPE_BIG_FLOAT;
 }
+#endif
+ radix = 0;
 #ifdef CONFIG_BIGNUM
 s->token.u.num.exponent = 0;
 ret = js_atof2(s->ctx, (const char *)p, (const char **)&p, radix,
@@ -20486,8 +21164,13 @@
 p += 2;
 s->token.val = TOK_AND_ASSIGN;
 } else if (p[1] == '&') {
- p += 2;
- s->token.val = TOK_LAND;
+ if (p[2] == '=') {
+ p += 3;
+ s->token.val = TOK_LAND_ASSIGN;
+ } else {
+ p += 2;
+ s->token.val = TOK_LAND;
+ }
 } else {
 goto def_token;
 }
@@ -20498,7 +21181,7 @@
 case '^':
 if (p[1] == '=') {
 p += 2;
- if (s->cur_func && (s->cur_func->js_mode & JS_MODE_MATH))
+ if (s->cur_func->js_mode & JS_MODE_MATH)
 s->token.val = TOK_MATH_POW_ASSIGN;
 else
 s->token.val = TOK_XOR_ASSIGN;
@@ -20512,7 +21195,7 @@
 }
 } else {
 p++;
- if (s->cur_func && (s->cur_func->js_mode & JS_MODE_MATH))
+ if (s->cur_func->js_mode & JS_MODE_MATH)
 s->token.val = TOK_MATH_POW;
 else
 s->token.val = '^';
@@ -20533,16 +21216,26 @@
 p += 2;
 s->token.val = TOK_OR_ASSIGN;
 } else if (p[1] == '|') {
- p += 2;
- s->token.val = TOK_LOR;
+ if (p[2] == '=') {
+ p += 3;
+ s->token.val = TOK_LOR_ASSIGN;
+ } else {
+ p += 2;
+ s->token.val = TOK_LOR;
+ }
 } else {
 goto def_token;
 }
 break;
 case '?':
 if (p[1] == '?') {
- p += 2;
- s->token.val = TOK_DOUBLE_QUESTION_MARK;
+ if (p[2] == '=') {
+ p += 3;
+ s->token.val = TOK_DOUBLE_QUESTION_MARK_ASSIGN;
+ } else {
+ p += 2;
+ s->token.val = TOK_DOUBLE_QUESTION_MARK;
+ }
 } else if (p[1] == '.' && !(p[2] >= '0' && p[2] <= '9')) {
 p += 2;
 s->token.val = TOK_QUESTION_MARK_DOT;
@@ -20557,22 +21250,12 @@
 switch(c) {
 case CP_PS:
 case CP_LS:
- if (!s->cur_func) {
- /* <PS> and <LS> are not JSONWhitespace */
- goto def_token;
- } else {
- /* XXX: should avoid incrementing line_number, but
- needed to handle HTML comments */
- goto line_terminator;
- }
+ /* XXX: should avoid incrementing line_number, but
+ needed to handle HTML comments */
+ goto line_terminator; 
 default:
 if (lre_is_space(c)) {
- if (!s->cur_func) {
- /* category z spaces are not JSONWhitespace */
- goto def_token;
- } else {
- goto redo;
- }
+ goto redo;
 } else if (lre_js_is_ident_first(c)) {
 ident_has_escape = FALSE;
 goto has_ident;
@@ -20597,6 +21280,234 @@
 return -1;
 }
 
+/* 'c' is the first character. Return JS_ATOM_NULL in case of error */
+static JSAtom json_parse_ident(JSParseState *s, const uint8_t **pp, int c)
+{
+ const uint8_t *p;
+ char ident_buf[128], *buf;
+ size_t ident_size, ident_pos;
+ JSAtom atom;
+ 
+ p = *pp;
+ buf = ident_buf;
+ ident_size = sizeof(ident_buf);
+ ident_pos = 0;
+ for(;;) {
+ buf[ident_pos++] = c;
+ c = *p;
+ if (c >= 128 ||
+ !((lre_id_continue_table_ascii[c >> 5] >> (c & 31)) & 1))
+ break;
+ p++;
+ if (unlikely(ident_pos >= ident_size - UTF8_CHAR_LEN_MAX)) {
+ if (ident_realloc(s->ctx, &buf, &ident_size, ident_buf)) {
+ atom = JS_ATOM_NULL;
+ goto done;
+ }
+ }
+ }
+ atom = JS_NewAtomLen(s->ctx, buf, ident_pos);
+ done:
+ if (unlikely(buf != ident_buf))
+ js_free(s->ctx, buf);
+ *pp = p;
+ return atom;
+}
+
+static __exception int json_next_token(JSParseState *s)
+{
+ const uint8_t *p;
+ int c;
+ JSAtom atom;
+ 
+ if (js_check_stack_overflow(s->ctx->rt, 0)) {
+ return js_parse_error(s, "stack overflow");
+ }
+ 
+ free_token(s, &s->token);
+
+ p = s->last_ptr = s->buf_ptr;
+ s->last_line_num = s->token.line_num;
+ redo:
+ s->token.line_num = s->line_num;
+ s->token.ptr = p;
+ c = *p;
+ switch(c) {
+ case 0:
+ if (p >= s->buf_end) {
+ s->token.val = TOK_EOF;
+ } else {
+ goto def_token;
+ }
+ break;
+ case '\'':
+ if (!s->ext_json) {
+ /* JSON does not accept single quoted strings */
+ goto def_token;
+ }
+ /* fall through */
+ case '\"':
+ if (js_parse_string(s, c, TRUE, p + 1, &s->token, &p))
+ goto fail;
+ break;
+ case '\r': /* accept DOS and MAC newline sequences */
+ if (p[1] == '\n') {
+ p++;
+ }
+ /* fall thru */
+ case '\n':
+ p++;
+ s->line_num++;
+ goto redo;
+ case '\f':
+ case '\v':
+ if (!s->ext_json) {
+ /* JSONWhitespace does not match <VT>, nor <FF> */
+ goto def_token;
+ }
+ /* fall through */
+ case ' ':
+ case '\t':
+ p++;
+ goto redo;
+ case '/':
+ if (!s->ext_json) {
+ /* JSON does not accept comments */
+ goto def_token;
+ }
+ if (p[1] == '*') {
+ /* comment */
+ p += 2;
+ for(;;) {
+ if (*p == '\0' && p >= s->buf_end) {
+ js_parse_error(s, "unexpected end of comment");
+ goto fail;
+ }
+ if (p[0] == '*' && p[1] == '/') {
+ p += 2;
+ break;
+ }
+ if (*p == '\n') {
+ s->line_num++;
+ p++;
+ } else if (*p == '\r') {
+ p++;
+ } else if (*p >= 0x80) {
+ c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+ if (c == -1) {
+ p++; /* skip invalid UTF-8 */
+ }
+ } else {
+ p++;
+ }
+ }
+ goto redo;
+ } else if (p[1] == '/') {
+ /* line comment */
+ p += 2;
+ for(;;) {
+ if (*p == '\0' && p >= s->buf_end)
+ break;
+ if (*p == '\r' || *p == '\n')
+ break;
+ if (*p >= 0x80) {
+ c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+ /* LS or PS are considered as line terminator */
+ if (c == CP_LS || c == CP_PS) {
+ break;
+ } else if (c == -1) {
+ p++; /* skip invalid UTF-8 */
+ }
+ } else {
+ p++;
+ }
+ }
+ goto redo;
+ } else {
+ goto def_token;
+ }
+ break;
+ case 'a': case 'b': case 'c': case 'd':
+ case 'e': case 'f': case 'g': case 'h':
+ case 'i': case 'j': case 'k': case 'l':
+ case 'm': case 'n': case 'o': case 'p':
+ case 'q': case 'r': case 's': case 't':
+ case 'u': case 'v': case 'w': case 'x':
+ case 'y': case 'z': 
+ case 'A': case 'B': case 'C': case 'D':
+ case 'E': case 'F': case 'G': case 'H':
+ case 'I': case 'J': case 'K': case 'L':
+ case 'M': case 'N': case 'O': case 'P':
+ case 'Q': case 'R': case 'S': case 'T':
+ case 'U': case 'V': case 'W': case 'X':
+ case 'Y': case 'Z': 
+ case '_':
+ case '$':
+ /* identifier : only pure ascii characters are accepted */
+ p++;
+ atom = json_parse_ident(s, &p, c);
+ if (atom == JS_ATOM_NULL)
+ goto fail;
+ s->token.u.ident.atom = atom;
+ s->token.u.ident.has_escape = FALSE;
+ s->token.u.ident.is_reserved = FALSE;
+ s->token.val = TOK_IDENT;
+ break;
+ case '+':
+ if (!s->ext_json || !is_digit(p[1]))
+ goto def_token;
+ goto parse_number;
+ case '0':
+ if (is_digit(p[1]))
+ goto def_token;
+ goto parse_number;
+ case '-':
+ if (!is_digit(p[1]))
+ goto def_token;
+ goto parse_number;
+ case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8':
+ case '9': 
+ /* number */
+ parse_number:
+ {
+ JSValue ret;
+ int flags, radix;
+ if (!s->ext_json) {
+ flags = 0;
+ radix = 10;
+ } else {
+ flags = ATOD_ACCEPT_BIN_OCT;
+ radix = 0;
+ }
+ ret = js_atof(s->ctx, (const char *)p, (const char **)&p, radix,
+ flags);
+ if (JS_IsException(ret))
+ goto fail;
+ s->token.val = TOK_NUMBER;
+ s->token.u.num.val = ret;
+ }
+ break;
+ default:
+ if (c >= 128) {
+ js_parse_error(s, "unexpected character");
+ goto fail;
+ }
+ def_token:
+ s->token.val = c;
+ p++;
+ break;
+ }
+ s->buf_ptr = p;
+
+ // dump_token(s, &s->token);
+ return 0;
+
+ fail:
+ s->token.val = TOK_ERROR;
+ return -1;
+}
+
 /* only used for ':' and '=>', 'let' or 'function' look-ahead. *pp is
 only set if TOK_IMPORT is returned */
 /* XXX: handle all unicode cases */
@@ -20604,7 +21515,7 @@
 {
 const uint8_t *p;
 uint32_t c;
-
+ 
 /* skip spaces and comments */
 p = *pp;
 for (;;) {
@@ -20657,6 +21568,12 @@
 }
 } else if (c == 'o' && *p == 'f' && !lre_js_is_ident_next(p[1])) {
 return TOK_OF;
+ } else if (c == 'e' &&
+ p[0] == 'x' && p[1] == 'p' && p[2] == 'o' &&
+ p[3] == 'r' && p[4] == 't' &&
+ !lre_js_is_ident_next(p[5])) {
+ *pp = p + 5;
+ return TOK_EXPORT;
 } else if (c == 'f' && p[0] == 'u' && p[1] == 'n' &&
 p[2] == 'c' && p[3] == 't' && p[4] == 'i' &&
 p[5] == 'o' && p[6] == 'n' && !lre_js_is_ident_next(p[7])) {
@@ -20680,16 +21597,21 @@
 (heuristic). 'input' must be a zero terminated.
 
 Heuristic: skip comments and expect 'import' keyword not followed
- by '(' or '.'
+ by '(' or '.' or export keyword.
 */
 BOOL JS_DetectModule(const char *input, size_t input_len)
 {
 const uint8_t *p = (const uint8_t *)input;
 int tok;
- if (simple_next_token(&p, FALSE) != TOK_IMPORT)
+ switch(simple_next_token(&p, FALSE)) {
+ case TOK_IMPORT:
+ tok = simple_next_token(&p, FALSE);
+ return (tok != '.' && tok != '(');
+ case TOK_EXPORT:
+ return TRUE;
+ default:
 return FALSE;
- tok = simple_next_token(&p, FALSE);
- return (tok != '.' && tok != '(');
+ }
 }
 
 static inline int get_prev_opcode(JSFunctionDef *fd) {
@@ -20707,7 +21629,7 @@
 case OP_return_undef:
 case OP_return_async:
 case OP_throw:
- case OP_throw_var:
+ case OP_throw_error:
 case OP_goto:
 #if SHORT_OPCODES
 case OP_goto8:
@@ -20773,20 +21695,10 @@
 LabelSlot *ls;
 
 if (label < 0) {
- if (fd->label_count >= fd->label_size) {
- int new_size;
- size_t slack;
- LabelSlot *new_tab;
-
- /* XXX: potential arithmetic overflow */
- new_size = fd->label_size * 3 / 2 + 4;
- new_tab = js_realloc2(fd->ctx, fd->label_slots, new_size * sizeof(*new_tab), &slack);
- if (!new_tab)
- return -1;
- new_size += slack / sizeof(*new_tab);
- fd->label_slots = new_tab;
- fd->label_size = new_size;
- }
+ if (js_resize_array(fd->ctx, (void *)&fd->label_slots,
+ sizeof(fd->label_slots[0]),
+ &fd->label_size, fd->label_count + 1))
+ return -1;
 label = fd->label_count++;
 ls = &fd->label_slots[label];
 ls->ref_count = 0;
@@ -20834,19 +21746,10 @@
 static int cpool_add(JSParseState *s, JSValue val)
 {
 JSFunctionDef *fd = s->cur_func;
- if (fd->cpool_count >= fd->cpool_size) {
- int new_size;
- size_t slack;
- JSValue *new_tab;
- /* XXX: potential arithmetic overflow */
- new_size = max_int(fd->cpool_count + 1, fd->cpool_size * 3 / 2);
- new_tab = js_realloc2(s->ctx, fd->cpool, new_size * sizeof(JSValue), &slack);
- if (!new_tab)
- return -1;
- new_size += slack / sizeof(*new_tab);
- fd->cpool = new_tab;
- fd->cpool_size = new_size;
- }
+ 
+ if (js_resize_array(s->ctx, (void *)&fd->cpool, sizeof(fd->cpool[0]),
+ &fd->cpool_size, fd->cpool_count + 1))
+ return -1;
 fd->cpool[fd->cpool_count++] = val;
 return fd->cpool_count - 1;
 }
@@ -20898,6 +21801,21 @@
 return find_arg(ctx, fd, name);
 }
 
+/* find a variable declaration in a given scope */
+static int find_var_in_scope(JSContext *ctx, JSFunctionDef *fd,
+ JSAtom name, int scope_level)
+{
+ int scope_idx;
+ for(scope_idx = fd->scopes[scope_level].first; scope_idx >= 0;
+ scope_idx = fd->vars[scope_idx].scope_next) {
+ if (fd->vars[scope_idx].scope_level != scope_level)
+ break;
+ if (fd->vars[scope_idx].var_name == name)
+ return scope_idx;
+ }
+ return -1;
+}
+
 /* return true if scope == parent_scope or if scope is a child of
 parent_scope */
 static BOOL is_child_scope(JSContext *ctx, JSFunctionDef *fd,
@@ -20919,7 +21837,7 @@
 for(i = 0; i < fd->var_count; i++) {
 JSVarDef *vd = &fd->vars[i];
 if (vd->var_name == name && vd->scope_level == 0) {
- if (is_child_scope(ctx, fd, vd->func_pool_or_scope_idx,
+ if (is_child_scope(ctx, fd, vd->scope_next,
 scope_level))
 return i;
 }
@@ -20928,11 +21846,11 @@
 }
 
 
-static JSHoistedDef *find_hoisted_def(JSFunctionDef *fd, JSAtom name)
+static JSGlobalVar *find_global_var(JSFunctionDef *fd, JSAtom name)
 {
 int i;
- for(i = 0; i < fd->hoisted_def_count; i++) {
- JSHoistedDef *hf = &fd->hoisted_def[i];
+ for(i = 0; i < fd->global_var_count; i++) {
+ JSGlobalVar *hf = &fd->global_vars[i];
 if (hf->var_name == name)
 return hf;
 }
@@ -20940,9 +21858,9 @@
 
 }
 
-static JSHoistedDef *find_lexical_hoisted_def(JSFunctionDef *fd, JSAtom name)
+static JSGlobalVar *find_lexical_global_var(JSFunctionDef *fd, JSAtom name)
 {
- JSHoistedDef *hf = find_hoisted_def(fd, name);
+ JSGlobalVar *hf = find_global_var(fd, name);
 if (hf && hf->is_lexical)
 return hf;
 else
@@ -20962,7 +21880,7 @@
 }
 
 if (fd->is_eval && fd->eval_type == JS_EVAL_TYPE_GLOBAL) {
- if (find_lexical_hoisted_def(fd, name))
+ if (find_lexical_global_var(fd, name))
 return GLOBAL_VAR_OFFSET;
 }
 return -1;
@@ -21045,21 +21963,13 @@
 JS_ThrowInternalError(ctx, "too many local variables");
 return -1;
 }
- if ((fd->var_count + 1) > fd->var_size) {
- int new_size;
- size_t slack;
- JSVarDef *new_buf;
- new_size = max_int(fd->var_count + 1, fd->var_size * 3 / 2);
- new_buf = js_realloc2(ctx, fd->vars, new_size * sizeof(*fd->vars), &slack);
- if (!new_buf)
- return -1;
- new_size += slack / sizeof(*new_buf);
- fd->vars = new_buf;
- fd->var_size = new_size;
- }
+ if (js_resize_array(ctx, (void **)&fd->vars, sizeof(fd->vars[0]),
+ &fd->var_size, fd->var_count + 1))
+ return -1;
 vd = &fd->vars[fd->var_count++];
 memset(vd, 0, sizeof(*vd));
 vd->var_name = JS_DupAtom(ctx, name);
+ vd->func_pool_idx = -1;
 return fd->var_count - 1;
 }
 
@@ -21083,22 +21993,47 @@
 int idx = fd->func_var_idx;
 if (idx < 0 && (idx = add_var(ctx, fd, name)) >= 0) {
 fd->func_var_idx = idx;
- fd->vars[idx].is_func_var = TRUE;
+ fd->vars[idx].var_kind = JS_VAR_FUNCTION_NAME;
 if (fd->js_mode & JS_MODE_STRICT)
 fd->vars[idx].is_const = TRUE;
 }
 return idx;
 }
 
-static int add_arguments_var(JSContext *ctx, JSFunctionDef *fd, JSAtom name)
+static int add_arguments_var(JSContext *ctx, JSFunctionDef *fd)
 {
 int idx = fd->arguments_var_idx;
- if (idx < 0 && (idx = add_var(ctx, fd, name)) >= 0) {
+ if (idx < 0 && (idx = add_var(ctx, fd, JS_ATOM_arguments)) >= 0) {
 fd->arguments_var_idx = idx;
 }
 return idx;
 }
 
+/* add an argument definition in the argument scope. Only needed when
+ "eval()" may be called in the argument scope. Return 0 if OK. */
+static int add_arguments_arg(JSContext *ctx, JSFunctionDef *fd)
+{
+ int idx;
+ if (fd->arguments_arg_idx < 0) {
+ idx = find_var_in_scope(ctx, fd, JS_ATOM_arguments, ARG_SCOPE_INDEX);
+ if (idx < 0) {
+ /* XXX: the scope links are not fully updated. May be an
+ issue if there are child scopes of the argument
+ scope */
+ idx = add_var(ctx, fd, JS_ATOM_arguments);
+ if (idx < 0)
+ return -1;
+ fd->vars[idx].scope_next = fd->scopes[ARG_SCOPE_INDEX].first;
+ fd->scopes[ARG_SCOPE_INDEX].first = idx;
+ fd->vars[idx].scope_level = ARG_SCOPE_INDEX;
+ fd->vars[idx].is_lexical = TRUE;
+
+ fd->arguments_arg_idx = idx;
+ }
+ }
+ return 0;
+}
+
 static int add_arg(JSContext *ctx, JSFunctionDef *fd, JSAtom name)
 {
 JSVarDef *vd;
@@ -21108,56 +22043,33 @@
 JS_ThrowInternalError(ctx, "too many arguments");
 return -1;
 }
- if ((fd->arg_count + 1) > fd->arg_size) {
- int new_size;
- size_t slack;
- JSVarDef *new_buf;
- new_size = max_int(fd->arg_count + 1, fd->arg_size * 3 / 2);
- new_buf = js_realloc2(ctx, fd->args, new_size * sizeof(*fd->args), &slack);
- if (!new_buf)
- return -1;
- new_size += slack / sizeof(*new_buf);
- fd->args = new_buf;
- fd->arg_size = new_size;
- }
+ if (js_resize_array(ctx, (void **)&fd->args, sizeof(fd->args[0]),
+ &fd->arg_size, fd->arg_count + 1))
+ return -1;
 vd = &fd->args[fd->arg_count++];
 memset(vd, 0, sizeof(*vd));
 vd->var_name = JS_DupAtom(ctx, name);
+ vd->func_pool_idx = -1;
 return fd->arg_count - 1;
 }
 
-/* add a Hoisted definition for a function (cpool_idx >= 0) or a
- global variable (cpool_idx = -1) */
-static JSHoistedDef *add_hoisted_def(JSContext *ctx,
- JSFunctionDef *s, int cpool_idx,
- JSAtom name, int var_idx, BOOL is_lexical)
-{
- JSHoistedDef *hf;
-
- if (s->hoisted_def_count >= s->hoisted_def_size) {
- int new_size;
- size_t slack;
- JSHoistedDef *new_tab;
- new_size = max_int(s->hoisted_def_count + 1,
- s->hoisted_def_size * 3 / 2);
- new_tab = js_realloc2(ctx, s->hoisted_def, new_size * sizeof(s->hoisted_def[0]), &slack);
- if (!new_tab)
- return NULL;
- new_size += slack / sizeof(*new_tab);
- s->hoisted_def = new_tab;
- s->hoisted_def_size = new_size;
- }
- hf = &s->hoisted_def[s->hoisted_def_count++];
- hf->cpool_idx = cpool_idx;
- hf->force_init = 0;
- hf->is_lexical = is_lexical;
+/* add a global variable definition */
+static JSGlobalVar *add_global_var(JSContext *ctx, JSFunctionDef *s,
+ JSAtom name)
+{
+ JSGlobalVar *hf;
+
+ if (js_resize_array(ctx, (void **)&s->global_vars,
+ sizeof(s->global_vars[0]),
+ &s->global_var_size, s->global_var_count + 1))
+ return NULL;
+ hf = &s->global_vars[s->global_var_count++];
+ hf->cpool_idx = -1;
+ hf->force_init = FALSE;
+ hf->is_lexical = FALSE;
 hf->is_const = FALSE;
- hf->var_idx = var_idx;
 hf->scope_level = s->scope_level;
- hf->var_name = JS_ATOM_NULL;
- if (name != JS_ATOM_NULL) {
- hf->var_name = JS_DupAtom(ctx, name);
- }
+ hf->var_name = JS_DupAtom(ctx, name);
 return hf;
 }
 
@@ -21202,7 +22114,7 @@
 goto redef_lex_error;
 }
 } else {
- if (fd->scope_level == 1) {
+ if (fd->scope_level == fd->body_scope) {
 redef_lex_error:
 /* redefining a scoped var in the same scope: error */
 return js_parse_error(s, "invalid redefinition of lexical identifier");
@@ -21211,7 +22123,7 @@
 }
 if (var_def_type != JS_VAR_DEF_FUNCTION_DECL &&
 var_def_type != JS_VAR_DEF_NEW_FUNCTION_DECL &&
- fd->scope_level == 1 &&
+ fd->scope_level == fd->body_scope &&
 find_arg(ctx, fd, name) >= 0) {
 /* lexical variable redefines a parameter name */
 return js_parse_error(s, "invalid redefinition of parameter name");
@@ -21220,24 +22132,25 @@
 if (find_var_in_child_scope(ctx, fd, name, fd->scope_level) >= 0) {
 return js_parse_error(s, "invalid redefinition of a variable");
 }
-
+ 
 if (fd->is_global_var) {
- JSHoistedDef *hf;
- hf = find_hoisted_def(fd, name);
+ JSGlobalVar *hf;
+ hf = find_global_var(fd, name);
 if (hf && is_child_scope(ctx, fd, hf->scope_level,
 fd->scope_level)) {
 return js_parse_error(s, "invalid redefinition of global identifier");
 }
 }
-
+ 
 if (fd->is_eval &&
 (fd->eval_type == JS_EVAL_TYPE_GLOBAL ||
 fd->eval_type == JS_EVAL_TYPE_MODULE) &&
- fd->scope_level == 1) {
- JSHoistedDef *hf;
- hf = add_hoisted_def(s->ctx, fd, -1, name, -1, TRUE);
+ fd->scope_level == fd->body_scope) {
+ JSGlobalVar *hf;
+ hf = add_global_var(s->ctx, fd, name);
 if (!hf)
 return -1;
+ hf->is_lexical = TRUE;
 hf->is_const = (var_def_type == JS_VAR_DEF_CONST);
 idx = GLOBAL_VAR_OFFSET;
 } else {
@@ -21269,13 +22182,13 @@
 return js_parse_error(s, "invalid redefinition of lexical identifier");
 }
 if (fd->is_global_var) {
- JSHoistedDef *hf;
- hf = find_hoisted_def(fd, name);
+ JSGlobalVar *hf;
+ hf = find_global_var(fd, name);
 if (hf && hf->is_lexical && hf->scope_level == fd->scope_level &&
 fd->eval_type == JS_EVAL_TYPE_MODULE) {
 goto invalid_lexical_redefinition;
 }
- hf = add_hoisted_def(s->ctx, fd, -1, name, -1, FALSE);
+ hf = add_global_var(s->ctx, fd, name);
 if (!hf)
 return -1;
 idx = GLOBAL_VAR_OFFSET;
@@ -21288,7 +22201,7 @@
 if (idx >= 0) {
 if (name == JS_ATOM_arguments && fd->has_arguments_binding)
 fd->arguments_var_idx = idx;
- fd->vars[idx].func_pool_or_scope_idx = fd->scope_level;
+ fd->vars[idx].scope_next = fd->scope_level;
 }
 }
 break;
@@ -21330,8 +22243,9 @@
 int function_line_num,
 JSParseExportEnum export_flag,
 JSFunctionDef **pfd);
-static __exception int js_parse_assign_expr(JSParseState *s, int in_accepted);
-static __exception int js_parse_unary(JSParseState *s, int exponentiation_flag);
+static __exception int js_parse_assign_expr2(JSParseState *s, int parse_flags);
+static __exception int js_parse_assign_expr(JSParseState *s);
+static __exception int js_parse_unary(JSParseState *s, int parse_flags);
 static void push_break_entry(JSFunctionDef *fd, BlockEnv *be,
 JSAtom label_name,
 int label_break, int label_cont,
@@ -21438,7 +22352,7 @@
 goto done;
 if (next_token(s))
 return -1;
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_expr(s))
 return -1;
 depth++;
 if (s->token.val != '}') {
@@ -21446,7 +22360,8 @@
 }
 /* XXX: should convert to string at this stage? */
 free_token(s, &s->token);
- /* Resume TOK_TEMPLATE parsing (s->token.line_num and s->token.ptr are OK) */
+ /* Resume TOK_TEMPLATE parsing (s->token.line_num and
+ * s->token.ptr are OK) */
 s->got_lf = FALSE;
 s->last_line_num = s->token.line_num;
 if (js_parse_template_part(s, s->buf_ptr))
@@ -21497,7 +22412,7 @@
 BOOL is_non_reserved_ident;
 JSAtom name;
 int prop_type;
-
+ 
 prop_type = PROP_TYPE_IDENT;
 if (allow_method) {
 if (token_is_pseudo_keyword(s, JS_ATOM_get)
@@ -21662,8 +22577,9 @@
 }
 }
 
-#define SKIP_HAS_SEMI (1 << 0)
-#define SKIP_HAS_ELLIPSIS (1 << 1)
+#define SKIP_HAS_SEMI (1 << 0)
+#define SKIP_HAS_ELLIPSIS (1 << 1)
+#define SKIP_HAS_ASSIGNMENT (1 << 2)
 
 /* XXX: improve speed with early bailout */
 /* XXX: no longer works if regexps are present. Could use previous
@@ -21674,7 +22590,7 @@
 size_t level = 0;
 JSParsePos pos;
 int last_tok, tok = TOK_EOF;
- int tok_len, bits = 0;
+ int c, tok_len, bits = 0;
 
 /* protect from underflow */
 state[level++] = 0;
@@ -21699,8 +22615,30 @@
 goto done;
 break;
 case '}':
- if (state[--level] != '{')
+ c = state[--level];
+ if (c == '`') {
+ /* continue the parsing of the template */
+ free_token(s, &s->token);
+ /* Resume TOK_TEMPLATE parsing (s->token.line_num and
+ * s->token.ptr are OK) */
+ s->got_lf = FALSE;
+ s->last_line_num = s->token.line_num;
+ if (js_parse_template_part(s, s->buf_ptr))
+ goto done;
+ goto handle_template;
+ } else if (c != '{') {
 goto done;
+ }
+ break;
+ case TOK_TEMPLATE:
+ handle_template:
+ if (s->token.u.str.sep != '`') {
+ /* '${' inside the template : closing '}' and continue
+ parsing the template */
+ if (level >= sizeof(state))
+ goto done;
+ state[level++] = '`';
+ } 
 break;
 case TOK_EOF:
 goto done;
@@ -21714,7 +22652,10 @@
 bits |= SKIP_HAS_ELLIPSIS;
 }
 break;
-
+ case '=':
+ bits |= SKIP_HAS_ASSIGNMENT;
+ break;
+ 
 case TOK_DIV_ASSIGN:
 tok_len = 2;
 goto parse_regexp;
@@ -21829,7 +22770,7 @@
 if (s->token.val == TOK_ELLIPSIS) {
 if (next_token(s))
 return -1;
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 emit_op(s, OP_null); /* dummy excludeList */
 emit_op(s, OP_copy_data_properties);
@@ -21888,7 +22829,7 @@
 } else {
 if (js_parse_expect(s, ':'))
 goto fail;
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 goto fail;
 if (name == JS_ATOM_NULL) {
 set_object_name_computed(s);
@@ -21923,10 +22864,25 @@
 return -1;
 }
 
-static __exception int js_parse_postfix_expr(JSParseState *s,
- BOOL accept_lparen);
+/* allow the 'in' binary operator */
+#define PF_IN_ACCEPTED (1 << 0) 
+/* allow function calls parsing in js_parse_postfix_expr() */
+#define PF_POSTFIX_CALL (1 << 1) 
+/* allow arrow functions parsing in js_parse_postfix_expr() */
+#define PF_ARROW_FUNC (1 << 2) 
+/* allow the exponentiation operator in js_parse_unary() */
+#define PF_POW_ALLOWED (1 << 3) 
+/* forbid the exponentiation operator in js_parse_unary() */
+#define PF_POW_FORBIDDEN (1 << 4) 
+
+static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags);
 
-/* XXX: is there is nicer solution ? */
+static __exception int js_parse_left_hand_side_expr(JSParseState *s)
+{
+ return js_parse_postfix_expr(s, PF_POSTFIX_CALL);
+}
+
+/* XXX: could generate specific bytecode */
 static __exception int js_parse_class_default_ctor(JSParseState *s,
 BOOL has_super,
 JSFunctionDef **pfd)
@@ -21936,10 +22892,11 @@
 int ret, line_num;
 JSParseFunctionEnum func_type;
 const uint8_t *saved_buf_end;
-
+ 
 js_parse_get_pos(s, &pos);
 if (has_super) {
- str = "(...a){super(...a);}";
+ /* spec change: no argument evaluation */
+ str = "(){super(...arguments);}";
 func_type = JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR;
 } else {
 str = "(){}";
@@ -21982,7 +22939,7 @@
 static void emit_class_field_init(JSParseState *s)
 {
 int label_next;
-
+ 
 emit_op(s, OP_scope_get_var);
 emit_atom(s, JS_ATOM_class_fields_init);
 emit_u16(s, s->cur_func->scope_level);
@@ -21990,13 +22947,13 @@
 /* no need to call the class field initializer if not defined */
 emit_op(s, OP_dup);
 label_next = emit_goto(s, OP_if_false, -1);
-
+ 
 emit_op(s, OP_scope_get_var);
 emit_atom(s, JS_ATOM_this);
 emit_u16(s, 0);
-
+ 
 emit_op(s, OP_swap);
-
+ 
 emit_op(s, OP_call_method);
 emit_u16(s, 0);
 
@@ -22021,29 +22978,29 @@
 ClassFieldsDef *cf)
 {
 int label_add_brand;
-
+ 
 cf->fields_init_fd = js_parse_function_class_fields_init(s);
 if (!cf->fields_init_fd)
 return -1;
 
 s->cur_func = cf->fields_init_fd;
-
+ 
 /* XXX: would be better to add the code only if needed, maybe in a
 later pass */
 emit_op(s, OP_push_false); /* will be patched later */
 cf->brand_push_pos = cf->fields_init_fd->last_opcode_pos;
 label_add_brand = emit_goto(s, OP_if_false, -1);
-
+ 
 emit_op(s, OP_scope_get_var);
 emit_atom(s, JS_ATOM_this);
 emit_u16(s, 0);
-
+ 
 emit_op(s, OP_scope_get_var);
 emit_atom(s, JS_ATOM_home_object);
 emit_u16(s, 0);
-
+ 
 emit_op(s, OP_add_brand);
-
+ 
 emit_label(s, label_add_brand);
 
 s->cur_func = s->cur_func->parent;
@@ -22060,7 +23017,7 @@
 }
 /* patch the start of the function to enable the OP_add_brand code */
 cf->fields_init_fd->byte_code.buf[cf->brand_push_pos] = OP_push_true;
-
+ 
 cf->has_brand = TRUE;
 }
 return 0;
@@ -22069,11 +23026,11 @@
 static void emit_class_init_end(JSParseState *s, ClassFieldsDef *cf)
 {
 int cpool_idx;
-
+ 
 s->cur_func = cf->fields_init_fd;
 emit_op(s, OP_return_undef);
 s->cur_func = s->cur_func->parent;
-
+ 
 cpool_idx = cpool_add(s, JS_NULL);
 cf->fields_init_fd->parent_cpool_idx = cpool_idx;
 emit_op(s, OP_fclosure);
@@ -22096,7 +23053,7 @@
 const uint8_t *class_start_ptr = s->token.ptr;
 const uint8_t *start_ptr;
 ClassFieldsDef class_fields[2];
-
+ 
 /* classes are parsed and executed in strict mode */
 saved_js_mode = fd->js_mode;
 fd->js_mode |= JS_MODE_STRICT;
@@ -22128,8 +23085,7 @@
 class_flags = JS_DEFINE_CLASS_HAS_HERITAGE;
 if (next_token(s))
 goto fail;
- /* XXX: the grammar only allows LeftHandSideExpression */
- if (js_parse_postfix_expr(s, TRUE))
+ if (js_parse_left_hand_side_expr(s))
 goto fail;
 } else {
 emit_op(s, OP_undefined);
@@ -22160,7 +23116,7 @@
 } else {
 class_name1 = class_name;
 }
-
+ 
 emit_op(s, OP_define_class);
 emit_atom(s, class_name1);
 emit_u8(s, class_flags);
@@ -22172,7 +23128,7 @@
 cf->computed_fields_count = 0;
 cf->has_brand = FALSE;
 }
-
+ 
 ctor_fd = NULL;
 while (s->token.val != '}') {
 if (s->token.val == ';') {
@@ -22181,19 +23137,28 @@
 continue;
 }
 is_static = (s->token.val == TOK_STATIC);
+ prop_type = -1;
 if (is_static) {
 if (next_token(s))
 goto fail;
+ /* allow "static" field name */
+ if (s->token.val == ';' || s->token.val == '=') {
+ is_static = FALSE;
+ name = JS_DupAtom(ctx, JS_ATOM_static);
+ prop_type = PROP_TYPE_IDENT;
+ }
 }
 if (is_static)
 emit_op(s, OP_swap);
 start_ptr = s->token.ptr;
- prop_type = js_parse_property_name(s, &name, TRUE, FALSE, TRUE);
- if (prop_type < 0)
- goto fail;
+ if (prop_type < 0) {
+ prop_type = js_parse_property_name(s, &name, TRUE, FALSE, TRUE);
+ if (prop_type < 0)
+ goto fail;
+ }
 is_private = prop_type & PROP_TYPE_PRIVATE;
 prop_type &= ~PROP_TYPE_PRIVATE;
-
+ 
 if ((name == JS_ATOM_constructor && !is_static &&
 prop_type != PROP_TYPE_IDENT) ||
 (name == JS_ATOM_prototype && is_static) ||
@@ -22239,7 +23204,7 @@
 if (is_set) {
 JSAtom setter_name;
 int ret;
-
+ 
 setter_name = get_private_setter_name(ctx, name);
 if (setter_name == JS_ATOM_NULL)
 goto fail;
@@ -22265,7 +23230,7 @@
 } else if (prop_type == PROP_TYPE_IDENT && s->token.val != '(') {
 ClassFieldsDef *cf = &class_fields[is_static];
 JSAtom field_var_name = JS_ATOM_NULL;
-
+ 
 /* class field */
 
 /* XXX: spec: not consistent with method name checks */
@@ -22273,7 +23238,7 @@
 js_parse_error(s, "invalid field name");
 goto fail;
 }
-
+ 
 if (is_private) {
 if (find_private_class_field(ctx, fd, name,
 fd->scope_level) >= 0) {
@@ -22323,11 +23288,11 @@
 emit_atom(s, name);
 emit_u16(s, s->cur_func->scope_level);
 }
-
+ 
 if (s->token.val == '=') {
 if (next_token(s))
 goto fail;
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 goto fail;
 } else {
 emit_op(s, OP_undefined);
@@ -22350,7 +23315,7 @@
 } else {
 JSParseFunctionEnum func_type;
 JSFunctionKindEnum func_kind;
-
+ 
 func_type = JS_PARSE_FUNC_METHOD;
 func_kind = JS_FUNC_NORMAL;
 if (prop_type == PROP_TYPE_STAR) {
@@ -22442,7 +23407,7 @@
 {
 ClassFieldsDef *cf = &class_fields[0];
 int var_idx;
-
+ 
 var_idx = define_var(s, fd, JS_ATOM_class_fields_init,
 JS_VAR_DEF_CONST);
 if (var_idx < 0)
@@ -22469,7 +23434,7 @@
 emit_u16(s, 0);
 emit_op(s, OP_drop);
 }
-
+ 
 if (class_name != JS_ATOM_NULL) {
 /* store the class name in the scoped class name variable (it
 is independent from the class statement variable
@@ -22531,7 +23496,7 @@
 while (s->token.val != ']' && idx < 32) {
 if (s->token.val == ',' || s->token.val == TOK_ELLIPSIS)
 break;
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 idx++;
 /* accept trailing comma */
@@ -22552,7 +23517,7 @@
 break;
 need_length = TRUE;
 if (s->token.val != ',') {
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 emit_op(s, OP_define_field);
 emit_u32(s, __JS_AtomFromUInt32(idx));
@@ -22587,7 +23552,7 @@
 if (s->token.val == TOK_ELLIPSIS) {
 if (next_token(s))
 return -1;
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 #if 1
 emit_op(s, OP_append);
@@ -22619,7 +23584,7 @@
 } else {
 need_length = TRUE;
 if (s->token.val != ',') {
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 /* a idx val */
 emit_op(s, OP_define_array_el);
@@ -22665,15 +23630,6 @@
 return FALSE;
 }
 
-typedef struct JSLValue {
- int opcode;
- int scope;
- int label;
- int depth;
- int tok;
- JSAtom name;
-} JSLValue;
-
 static __exception int get_lvalue(JSParseState *s, int *popcode, int *pscope,
 JSAtom *pname, int *plabel, int *pdepth, BOOL keep,
 int tok)
@@ -22798,84 +23754,112 @@
 return 0;
 }
 
-/* if special = TRUE: specific post inc/dec case */
-/* name has a live reference */
+typedef enum {
+ PUT_LVALUE_NOKEEP, /* [depth] v -> */
+ PUT_LVALUE_NOKEEP_DEPTH, /* [depth] v -> , keep depth (currently
+ just disable optimizations) */
+ PUT_LVALUE_KEEP_TOP, /* [depth] v -> v */
+ PUT_LVALUE_KEEP_SECOND, /* [depth] v0 v -> v0 */
+ PUT_LVALUE_NOKEEP_BOTTOM, /* v [depth] -> */
+} PutLValueEnum;
+
+/* name has a live reference. 'is_let' is only used with opcode =
+ OP_scope_get_var which is never generated by get_lvalue(). */
 static void put_lvalue(JSParseState *s, int opcode, int scope,
- JSAtom name, int label, BOOL special)
+ JSAtom name, int label, PutLValueEnum special,
+ BOOL is_let)
 {
 switch(opcode) {
 case OP_get_field:
- if (!special)
- emit_op(s, OP_insert2); /* obj v -> v obj v */
- else
- emit_op(s, OP_perm3); /* obj v0 v -> v0 obj v */
- emit_op(s, OP_put_field);
- emit_u32(s, name); /* name has refcount */
- break;
 case OP_scope_get_private_field:
- if (!special)
+ /* depth = 1 */
+ switch(special) {
+ case PUT_LVALUE_NOKEEP:
+ case PUT_LVALUE_NOKEEP_DEPTH:
+ break;
+ case PUT_LVALUE_KEEP_TOP:
 emit_op(s, OP_insert2); /* obj v -> v obj v */
- else
+ break;
+ case PUT_LVALUE_KEEP_SECOND:
 emit_op(s, OP_perm3); /* obj v0 v -> v0 obj v */
- emit_op(s, OP_scope_put_private_field);
- emit_u32(s, name); /* name has refcount */
- emit_u16(s, scope);
+ break;
+ case PUT_LVALUE_NOKEEP_BOTTOM:
+ emit_op(s, OP_swap);
+ break;
+ default:
+ abort();
+ }
 break;
 case OP_get_array_el:
- if (!special)
- emit_op(s, OP_insert3); /* obj prop v -> v obj prop v */
- else
- emit_op(s, OP_perm4); /* obj prop v0 v -> v0 obj prop v */
- emit_op(s, OP_put_array_el);
- break;
 case OP_get_ref_value:
- JS_FreeAtom(s->ctx, name);
- emit_label(s, label);
- if (!special)
+ /* depth = 2 */
+ if (opcode == OP_get_ref_value) {
+ JS_FreeAtom(s->ctx, name);
+ emit_label(s, label);
+ }
+ switch(special) {
+ case PUT_LVALUE_NOKEEP:
+ emit_op(s, OP_nop); /* will trigger optimization */
+ break;
+ case PUT_LVALUE_NOKEEP_DEPTH:
+ break;
+ case PUT_LVALUE_KEEP_TOP:
 emit_op(s, OP_insert3); /* obj prop v -> v obj prop v */
- else
+ break;
+ case PUT_LVALUE_KEEP_SECOND:
 emit_op(s, OP_perm4); /* obj prop v0 v -> v0 obj prop v */
- emit_op(s, OP_put_ref_value);
+ break;
+ case PUT_LVALUE_NOKEEP_BOTTOM:
+ emit_op(s, OP_rot3l);
+ break;
+ default:
+ abort();
+ }
 break;
 case OP_get_super_value:
- if (!special)
+ /* depth = 3 */
+ switch(special) {
+ case PUT_LVALUE_NOKEEP:
+ case PUT_LVALUE_NOKEEP_DEPTH:
+ break;
+ case PUT_LVALUE_KEEP_TOP:
 emit_op(s, OP_insert4); /* this obj prop v -> v this obj prop v */
- else
+ break;
+ case PUT_LVALUE_KEEP_SECOND:
 emit_op(s, OP_perm5); /* this obj prop v0 v -> v0 this obj prop v */
- emit_op(s, OP_put_super_value);
+ break;
+ case PUT_LVALUE_NOKEEP_BOTTOM:
+ emit_op(s, OP_rot4l);
+ break;
+ default:
+ abort();
+ }
 break;
 default:
- abort();
+ break;
 }
-}
-
-static void put_lvalue_nokeep(JSParseState *s, int opcode, int scope,
- JSAtom name, int label, int var_tok)
-{
+ 
 switch(opcode) {
 case OP_scope_get_var: /* val -- */
- emit_op(s, (var_tok == TOK_CONST || var_tok == TOK_LET) ?
- OP_scope_put_var_init : OP_scope_put_var);
+ assert(special == PUT_LVALUE_NOKEEP ||
+ special == PUT_LVALUE_NOKEEP_DEPTH);
+ emit_op(s, is_let ? OP_scope_put_var_init : OP_scope_put_var);
 emit_u32(s, name); /* has refcount */
 emit_u16(s, scope);
 break;
- case OP_get_field: /* obj val -- */
+ case OP_get_field:
 emit_op(s, OP_put_field);
- emit_u32(s, name); /* has refcount */
+ emit_u32(s, name); /* name has refcount */
 break;
 case OP_scope_get_private_field:
 emit_op(s, OP_scope_put_private_field);
- emit_u32(s, name); /* has refcount */
+ emit_u32(s, name); /* name has refcount */
 emit_u16(s, scope);
 break;
- case OP_get_array_el: /* obj prop val -- */
+ case OP_get_array_el:
 emit_op(s, OP_put_array_el);
 break;
- case OP_get_ref_value: /* obj prop val -- */
- /* XXX: currently this reference is never optimized */
- JS_FreeAtom(s->ctx, name);
- emit_label(s, label);
- //emit_op(s, OP_nop); /* emit 2 bytes for optimizer */
+ case OP_get_ref_value:
 emit_op(s, OP_put_ref_value);
 break;
 case OP_get_super_value:
@@ -22908,7 +23892,7 @@
 {
 JSFunctionDef *fd = s->cur_func;
 JSVarDefEnum var_def_type;
-
+ 
 if (name == JS_ATOM_yield && fd->func_kind == JS_FUNC_GENERATOR) {
 return js_parse_error(s, "yield is a reserved identifier");
 }
@@ -22986,7 +23970,7 @@
 return js_parse_error(s, "duplicate parameter names not allowed in this context");
 }
 
-static JSAtom js_parse_destructing_var(JSParseState *s, int tok, int is_arg)
+static JSAtom js_parse_destructuring_var(JSParseState *s, int tok, int is_arg)
 {
 JSAtom name;
 
@@ -23008,7 +23992,9 @@
 return JS_ATOM_NULL;
 }
 
-static int js_parse_destructing_element(JSParseState *s, int tok, int is_arg,
+/* Return -1 if error, 0 if no initializer, 1 if an initializer is
+ present at the top level. */
+static int js_parse_destructuring_element(JSParseState *s, int tok, int is_arg,
 int hasval, int has_ellipsis,
 BOOL allow_initializer)
 {
@@ -23016,7 +24002,8 @@
 int start_addr, assign_addr;
 JSAtom prop_name, var_name;
 int opcode, scope, tok1, skip_bits;
-
+ BOOL has_initializer;
+ 
 if (has_ellipsis < 0) {
 /* pre-parse destructuration target for spread detection */
 js_parse_skip_parens_token(s, &skip_bits, FALSE);
@@ -23061,7 +24048,7 @@
 if (next_token(s))
 return -1;
 if (tok) {
- var_name = js_parse_destructing_var(s, tok, is_arg);
+ var_name = js_parse_destructuring_var(s, tok, is_arg);
 if (var_name == JS_ATOM_NULL)
 return -1;
 opcode = OP_scope_get_var;
@@ -23069,7 +24056,7 @@
 label_lvalue = -1;
 depth_lvalue = 0;
 } else {
- if (js_parse_postfix_expr(s, TRUE))
+ if (js_parse_left_hand_side_expr(s))
 return -1;
 
 if (get_lvalue(s, &opcode, &scope, &var_name,
@@ -23125,7 +24112,7 @@
 emit_op(s, OP_get_field2);
 emit_u32(s, prop_name);
 }
- if (js_parse_destructing_element(s, tok, is_arg, TRUE, -1, TRUE))
+ if (js_parse_destructuring_element(s, tok, is_arg, TRUE, -1, TRUE) < 0)
 return -1;
 if (s->token.val == '}')
 break;
@@ -23158,11 +24145,11 @@
 emit_op(s, OP_dup);
 }
 if (tok) {
- var_name = js_parse_destructing_var(s, tok, is_arg);
+ var_name = js_parse_destructuring_var(s, tok, is_arg);
 if (var_name == JS_ATOM_NULL)
 goto prop_error;
 } else {
- if (js_parse_postfix_expr(s, TRUE))
+ if (js_parse_left_hand_side_expr(s))
 goto prop_error;
 lvalue:
 if (get_lvalue(s, &opcode, &scope, &var_name,
@@ -23260,14 +24247,16 @@
 if (next_token(s))
 goto var_error;
 emit_op(s, OP_drop);
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 goto var_error;
 if (opcode == OP_scope_get_var || opcode == OP_get_ref_value)
 set_object_name(s, var_name);
 emit_label(s, label_hasval);
 }
 /* store value into lvalue object */
- put_lvalue_nokeep(s, opcode, scope, var_name, label_lvalue, tok);
+ put_lvalue(s, opcode, scope, var_name, label_lvalue,
+ PUT_LVALUE_NOKEEP_DEPTH,
+ (tok == TOK_CONST || tok == TOK_LET));
 if (s->token.val == '}')
 break;
 /* accept a trailing comma before the '}' */
@@ -23322,13 +24311,13 @@
 emit_u8(s, 0);
 emit_op(s, OP_drop);
 }
- if (js_parse_destructing_element(s, tok, is_arg, TRUE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE))
+ if (js_parse_destructuring_element(s, tok, is_arg, TRUE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE) < 0)
 return -1;
 } else {
 var_name = JS_ATOM_NULL;
 enum_depth = 0;
 if (tok) {
- var_name = js_parse_destructing_var(s, tok, is_arg);
+ var_name = js_parse_destructuring_var(s, tok, is_arg);
 if (var_name == JS_ATOM_NULL)
 goto var_error;
 if (js_define_var(s, var_name, tok))
@@ -23336,7 +24325,7 @@
 opcode = OP_scope_get_var;
 scope = s->cur_func->scope_level;
 } else {
- if (js_parse_postfix_expr(s, TRUE))
+ if (js_parse_left_hand_side_expr(s))
 return -1;
 if (get_lvalue(s, &opcode, &scope, &var_name,
 &label_lvalue, &enum_depth, FALSE, '[')) {
@@ -23360,15 +24349,16 @@
 if (next_token(s))
 goto var_error;
 emit_op(s, OP_drop);
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 goto var_error;
 if (opcode == OP_scope_get_var || opcode == OP_get_ref_value)
 set_object_name(s, var_name);
 emit_label(s, label_hasval);
 }
 /* store value into lvalue object */
- put_lvalue_nokeep(s, opcode, scope, var_name,
- label_lvalue, tok);
+ put_lvalue(s, opcode, scope, var_name,
+ label_lvalue, PUT_LVALUE_NOKEEP_DEPTH,
+ (tok == TOK_CONST || tok == TOK_LET));
 }
 if (s->token.val == ']')
 break;
@@ -23394,18 +24384,26 @@
 emit_label(s, label_parse);
 if (hasval)
 emit_op(s, OP_drop);
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 emit_goto(s, OP_goto, label_assign);
 emit_label(s, label_done);
+ has_initializer = TRUE;
 } else {
- assert(hasval);
+ /* normally hasval is true except if
+ js_parse_skip_parens_token() was wrong in the parsing */
+ // assert(hasval);
+ if (!hasval) {
+ js_parse_error(s, "too complicated destructuring expression");
+ return -1;
+ }
 /* remove test and decrement label ref count */
 memset(s->cur_func->byte_code.buf + start_addr, OP_nop,
 assign_addr - start_addr);
 s->cur_func->label_slots[label_parse].ref_count--;
+ has_initializer = FALSE;
 }
- return 0;
+ return has_initializer;
 
 prop_error:
 JS_FreeAtom(s->ctx, prop_name);
@@ -23438,11 +24436,13 @@
 emit_label(s, label_next);
 }
 
-static __exception int js_parse_postfix_expr(JSParseState *s, BOOL accept_lparen)
+/* allowed parse_flags: PF_POSTFIX_CALL, PF_ARROW_FUNC */
+static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags)
 {
 FuncCallType call_type;
 int optional_chaining_label;
-
+ BOOL accept_lparen = (parse_flags & PF_POSTFIX_CALL) != 0;
+ 
 call_type = FUNC_CALL_NORMAL;
 switch(s->token.val) {
 case TOK_NUMBER:
@@ -23456,7 +24456,6 @@
 } else
 #ifdef CONFIG_BIGNUM
 if (JS_VALUE_GET_TAG(val) == JS_TAG_BIG_FLOAT) {
- bf_t r_s, *r = &r_s;
 slimb_t e;
 int ret;
 
@@ -23470,9 +24469,9 @@
 emit_op(s, OP_push_i32);
 emit_u32(s, e);
 } else {
- bf_init(s->ctx->bf_ctx, r);
- bf_set_si(r, e);
- val = JS_NewBigInt(s->ctx, r);
+ val = JS_NewBigInt64_1(s->ctx, e);
+ if (JS_IsException(val))
+ return -1;
 ret = emit_push_const(s, val, 0);
 JS_FreeValue(s->ctx, val);
 if (ret < 0)
@@ -23499,7 +24498,7 @@
 if (next_token(s))
 return -1;
 break;
-
+ 
 case TOK_DIV_ASSIGN:
 s->buf_ptr -= 2;
 goto parse_regexp;
@@ -23522,7 +24521,7 @@
 backtrace_flags = 0;
 if (s->cur_func && s->cur_func->backtrace_barrier)
 backtrace_flags = JS_BACKTRACE_FLAG_SINGLE_LEVEL;
- build_backtrace(s->ctx, s->ctx->current_exception,
+ build_backtrace(s->ctx, s->ctx->rt->current_exception,
 s->filename, s->token.line_num,
 backtrace_flags);
 return -1;
@@ -23540,7 +24539,8 @@
 }
 break;
 case '(':
- if (js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) {
+ if ((parse_flags & PF_ARROW_FUNC) &&
+ js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) {
 if (js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
 JS_FUNC_NORMAL, JS_ATOM_NULL,
 s->token.ptr, s->token.line_num))
@@ -23588,7 +24588,8 @@
 if (s->token.u.ident.is_reserved) {
 return js_parse_error_reserved_identifier(s);
 }
- if (peek_token(s, TRUE) == TOK_ARROW) {
+ if ((parse_flags & PF_ARROW_FUNC) &&
+ peek_token(s, TRUE) == TOK_ARROW) {
 if (js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
 JS_FUNC_NORMAL, JS_ATOM_NULL,
 s->token.ptr, s->token.line_num))
@@ -23607,10 +24608,11 @@
 JS_FUNC_ASYNC, JS_ATOM_NULL,
 source_ptr, source_line_num))
 return -1;
- } else if ((s->token.val == '(' &&
- js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) ||
- (s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved &&
- peek_token(s, TRUE) == TOK_ARROW)) {
+ } else if ((parse_flags & PF_ARROW_FUNC) &&
+ ((s->token.val == '(' &&
+ js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) ||
+ (s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved &&
+ peek_token(s, TRUE) == TOK_ARROW))) {
 if (js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
 JS_FUNC_ASYNC, JS_ATOM_NULL,
 source_ptr, source_line_num))
@@ -23640,7 +24642,7 @@
 {
 int skip_bits;
 if (js_parse_skip_parens_token(s, &skip_bits, FALSE) == '=') {
- if (js_parse_destructing_element(s, 0, 0, FALSE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE))
+ if (js_parse_destructuring_element(s, 0, 0, FALSE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE) < 0)
 return -1;
 } else {
 if (s->token.val == '{') {
@@ -23669,7 +24671,7 @@
 emit_atom(s, JS_ATOM_new_target);
 emit_u16(s, 0);
 } else {
- if (js_parse_postfix_expr(s, FALSE))
+ if (js_parse_postfix_expr(s, 0))
 return -1;
 accept_lparen = TRUE;
 if (s->token.val != '(') {
@@ -23722,7 +24724,7 @@
 return -1;
 if (!accept_lparen)
 return js_parse_error(s, "invalid use of 'import()'");
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 if (js_parse_expect(s, ')'))
 return -1;
@@ -23738,7 +24740,7 @@
 for(;;) {
 JSFunctionDef *fd = s->cur_func;
 BOOL has_optional_chain = FALSE;
-
+ 
 if (s->token.val == TOK_QUESTION_MARK_DOT) {
 /* optional chaining */
 if (next_token(s))
@@ -23790,7 +24792,7 @@
 int scope;
 name = get_u32(fd->byte_code.buf + fd->last_opcode_pos + 1);
 scope = get_u16(fd->byte_code.buf + fd->last_opcode_pos + 5);
- if (name == JS_ATOM_eval && call_type == FUNC_CALL_NORMAL) {
+ if (name == JS_ATOM_eval && call_type == FUNC_CALL_NORMAL && !has_optional_chain) {
 /* direct 'eval' */
 opcode = OP_eval;
 } else {
@@ -23838,7 +24840,7 @@
 emit_atom(s, JS_ATOM_this_active_func);
 emit_u16(s, 0);
 
- emit_op(s, OP_get_super_ctor);
+ emit_op(s, OP_get_super);
 
 emit_op(s, OP_scope_get_var);
 emit_atom(s, JS_ATOM_new_target);
@@ -23855,7 +24857,7 @@
 }
 if (s->token.val == TOK_ELLIPSIS)
 break;
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 arg_count++;
 if (s->token.val == ')')
@@ -23875,7 +24877,7 @@
 if (s->token.val == TOK_ELLIPSIS) {
 if (next_token(s))
 return -1;
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 #if 1
 /* XXX: could pass is_last indicator? */
@@ -23906,7 +24908,7 @@
 emit_op(s, OP_nip1);
 #endif
 } else {
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 /* array idx val */
 emit_op(s, OP_define_array_el);
@@ -24008,16 +25010,19 @@
 } else if (s->token.val == '.') {
 if (next_token(s))
 return -1;
+ parse_property:
 if (s->token.val == TOK_PRIVATE_NAME) {
 /* private class field */
 if (get_prev_opcode(fd) == OP_get_super) {
 return js_parse_error(s, "private class field forbidden after super");
 }
+ if (has_optional_chain) {
+ optional_chain_test(s, &optional_chaining_label, 1);
+ }
 emit_op(s, OP_scope_get_private_field);
 emit_atom(s, s->token.u.ident.atom);
 emit_u16(s, s->cur_func->scope_level);
 } else {
- parse_property:
 if (!token_is_ident(s->token.val)) {
 return js_parse_error(s, "expecting field name");
 }
@@ -24076,7 +25081,7 @@
 
 if (next_token(s))
 return -1;
- if (js_parse_unary(s, -1))
+ if (js_parse_unary(s, PF_POW_FORBIDDEN))
 return -1;
 switch(opcode = get_prev_opcode(fd)) {
 case OP_get_field:
@@ -24115,9 +25120,9 @@
 case OP_scope_get_private_field:
 return js_parse_error(s, "cannot delete a private class field");
 case OP_get_super_value:
- emit_op(s, OP_throw_var);
+ emit_op(s, OP_throw_error);
 emit_atom(s, JS_ATOM_NULL);
- emit_u8(s, JS_THROW_VAR_DELETE_SUPER);
+ emit_u8(s, JS_THROW_ERROR_DELETE_SUPER);
 break;
 default:
 ret_true:
@@ -24128,7 +25133,8 @@
 return 0;
 }
 
-static __exception int js_parse_unary(JSParseState *s, int exponentiation_flag)
+/* allowed parse_flags: PF_ARROW_FUNC, PF_POW_ALLOWED, PF_POW_FORBIDDEN */
+static __exception int js_parse_unary(JSParseState *s, int parse_flags)
 {
 int op;
 
@@ -24141,7 +25147,7 @@
 op = s->token.val;
 if (next_token(s))
 return -1;
- if (js_parse_unary(s, -1))
+ if (js_parse_unary(s, PF_POW_FORBIDDEN))
 return -1;
 switch(op) {
 case '-':
@@ -24163,7 +25169,7 @@
 default:
 abort();
 }
- exponentiation_flag = 0;
+ parse_flags = 0;
 break;
 case TOK_DEC:
 case TOK_INC:
@@ -24173,13 +25179,13 @@
 op = s->token.val;
 if (next_token(s))
 return -1;
- /* XXX: should parse LeftHandSideExpression */
 if (js_parse_unary(s, 0))
 return -1;
 if (get_lvalue(s, &opcode, &scope, &name, &label, NULL, TRUE, op))
 return -1;
 emit_op(s, OP_dec + op - TOK_DEC);
- put_lvalue(s, opcode, scope, name, label, FALSE);
+ put_lvalue(s, opcode, scope, name, label, PUT_LVALUE_KEEP_TOP,
+ FALSE);
 }
 break;
 case TOK_TYPEOF:
@@ -24187,7 +25193,7 @@
 JSFunctionDef *fd;
 if (next_token(s))
 return -1;
- if (js_parse_unary(s, -1))
+ if (js_parse_unary(s, PF_POW_FORBIDDEN))
 return -1;
 /* reference access should not return an exception, so we
 patch the get_var */
@@ -24196,13 +25202,13 @@
 fd->byte_code.buf[fd->last_opcode_pos] = OP_scope_get_var_undef;
 }
 emit_op(s, OP_typeof);
- exponentiation_flag = 0;
+ parse_flags = 0;
 }
 break;
 case TOK_DELETE:
 if (js_parse_delete(s))
 return -1;
- exponentiation_flag = 0;
+ parse_flags = 0;
 break;
 case TOK_AWAIT:
 if (!(s->cur_func->func_kind & JS_FUNC_ASYNC))
@@ -24211,13 +25217,14 @@
 return js_parse_error(s, "await in default expression");
 if (next_token(s))
 return -1;
- if (js_parse_unary(s, -1))
+ if (js_parse_unary(s, PF_POW_FORBIDDEN))
 return -1;
 emit_op(s, OP_await);
- exponentiation_flag = 0;
+ parse_flags = 0;
 break;
 default:
- if (js_parse_postfix_expr(s, TRUE))
+ if (js_parse_postfix_expr(s, (parse_flags & PF_ARROW_FUNC) |
+ PF_POSTFIX_CALL))
 return -1;
 if (!s->got_lf &&
 (s->token.val == TOK_DEC || s->token.val == TOK_INC)) {
@@ -24227,32 +25234,30 @@
 if (get_lvalue(s, &opcode, &scope, &name, &label, NULL, TRUE, op))
 return -1;
 emit_op(s, OP_post_dec + op - TOK_DEC);
- put_lvalue(s, opcode, scope, name, label, TRUE);
+ put_lvalue(s, opcode, scope, name, label, PUT_LVALUE_KEEP_SECOND,
+ FALSE);
 if (next_token(s))
- return -1;
+ return -1; 
 }
 break;
 }
- if (exponentiation_flag) {
+ if (parse_flags & (PF_POW_ALLOWED | PF_POW_FORBIDDEN)) {
 #ifdef CONFIG_BIGNUM
 if (s->token.val == TOK_POW || s->token.val == TOK_MATH_POW) {
 /* Extended exponentiation syntax rules: we extend the ES7
 grammar in order to have more intuitive semantics:
 -2**2 evaluates to -4. */
 if (!(s->cur_func->js_mode & JS_MODE_MATH)) {
- if (exponentiation_flag < 0) {
+ if (parse_flags & PF_POW_FORBIDDEN) {
 JS_ThrowSyntaxError(s->ctx, "unparenthesized unary expression can't appear on the left-hand side of '**'");
 return -1;
 }
 }
 if (next_token(s))
 return -1;
- if (js_parse_unary(s, 1))
+ if (js_parse_unary(s, PF_POW_ALLOWED))
 return -1;
- if (s->cur_func->js_mode & JS_MODE_MATH)
- emit_op(s, OP_math_pow);
- else
- emit_op(s, OP_pow);
+ emit_op(s, OP_pow);
 }
 #else
 if (s->token.val == TOK_POW) {
@@ -24261,13 +25266,13 @@
 regarding the precedence of prefix operators and the
 postifx exponential, ES7 specifies that -2**2 is a
 syntax error. */
- if (exponentiation_flag < 0) {
+ if (parse_flags & PF_POW_FORBIDDEN) {
 JS_ThrowSyntaxError(s->ctx, "unparenthesized unary expression can't appear on the left-hand side of '**'");
 return -1;
 }
 if (next_token(s))
 return -1;
- if (js_parse_unary(s, 1))
+ if (js_parse_unary(s, PF_POW_ALLOWED))
 return -1;
 emit_op(s, OP_pow);
 }
@@ -24276,15 +25281,17 @@
 return 0;
 }
 
+/* allowed parse_flags: PF_ARROW_FUNC, PF_IN_ACCEPTED */
 static __exception int js_parse_expr_binary(JSParseState *s, int level,
- BOOL in_accepted)
+ int parse_flags)
 {
 int op, opcode;
 
 if (level == 0) {
- return js_parse_unary(s, 1);
+ return js_parse_unary(s, (parse_flags & PF_ARROW_FUNC) |
+ PF_POW_ALLOWED);
 }
- if (js_parse_expr_binary(s, level - 1, in_accepted))
+ if (js_parse_expr_binary(s, level - 1, parse_flags))
 return -1;
 for(;;) {
 op = s->token.val;
@@ -24295,12 +25302,7 @@
 opcode = OP_mul;
 break;
 case '/':
-#ifdef CONFIG_BIGNUM
- if (s->cur_func->js_mode & JS_MODE_MATH)
- opcode = OP_math_div;
- else
-#endif
- opcode = OP_div;
+ opcode = OP_div;
 break;
 case '%':
 #ifdef CONFIG_BIGNUM
@@ -24359,7 +25361,7 @@
 opcode = OP_instanceof;
 break;
 case TOK_IN:
- if (in_accepted) {
+ if (parse_flags & PF_IN_ACCEPTED) {
 opcode = OP_in;
 } else {
 return 0;
@@ -24419,23 +25421,24 @@
 }
 if (next_token(s))
 return -1;
- if (js_parse_expr_binary(s, level - 1, in_accepted))
+ if (js_parse_expr_binary(s, level - 1, parse_flags & ~PF_ARROW_FUNC))
 return -1;
 emit_op(s, opcode);
 }
 return 0;
 }
 
+/* allowed parse_flags: PF_ARROW_FUNC, PF_IN_ACCEPTED */
 static __exception int js_parse_logical_and_or(JSParseState *s, int op,
- BOOL in_accepted)
+ int parse_flags)
 {
 int label1;
 
 if (op == TOK_LAND) {
- if (js_parse_expr_binary(s, 8, in_accepted))
+ if (js_parse_expr_binary(s, 8, parse_flags))
 return -1;
 } else {
- if (js_parse_logical_and_or(s, TOK_LAND, in_accepted))
+ if (js_parse_logical_and_or(s, TOK_LAND, parse_flags))
 return -1;
 }
 if (s->token.val == op) {
@@ -24449,10 +25452,11 @@
 emit_op(s, OP_drop);
 
 if (op == TOK_LAND) {
- if (js_parse_expr_binary(s, 8, in_accepted))
+ if (js_parse_expr_binary(s, 8, parse_flags & ~PF_ARROW_FUNC))
 return -1;
 } else {
- if (js_parse_logical_and_or(s, TOK_LAND, in_accepted))
+ if (js_parse_logical_and_or(s, TOK_LAND,
+ parse_flags & ~PF_ARROW_FUNC))
 return -1;
 }
 if (s->token.val != op) {
@@ -24467,24 +25471,24 @@
 return 0;
 }
 
-static __exception int js_parse_coalesce_expr(JSParseState *s, BOOL in_accepted)
+static __exception int js_parse_coalesce_expr(JSParseState *s, int parse_flags)
 {
 int label1;
-
- if (js_parse_logical_and_or(s, TOK_LOR, in_accepted))
+ 
+ if (js_parse_logical_and_or(s, TOK_LOR, parse_flags))
 return -1;
 if (s->token.val == TOK_DOUBLE_QUESTION_MARK) {
 label1 = new_label(s);
 for(;;) {
 if (next_token(s))
 return -1;
-
+ 
 emit_op(s, OP_dup);
 emit_op(s, OP_is_undefined_or_null);
 emit_goto(s, OP_if_false, label1);
 emit_op(s, OP_drop);
-
- if (js_parse_expr_binary(s, 8, in_accepted))
+ 
+ if (js_parse_expr_binary(s, 8, parse_flags & ~PF_ARROW_FUNC))
 return -1;
 if (s->token.val != TOK_DOUBLE_QUESTION_MARK)
 break;
@@ -24494,18 +25498,19 @@
 return 0;
 }
 
-static __exception int js_parse_cond_expr(JSParseState *s, BOOL in_accepted)
+/* allowed parse_flags: PF_ARROW_FUNC, PF_IN_ACCEPTED */
+static __exception int js_parse_cond_expr(JSParseState *s, int parse_flags)
 {
 int label1, label2;
 
- if (js_parse_coalesce_expr(s, in_accepted))
+ if (js_parse_coalesce_expr(s, parse_flags))
 return -1;
 if (s->token.val == '?') {
 if (next_token(s))
 return -1;
 label1 = emit_goto(s, OP_if_false, -1);
 
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 if (js_parse_expect(s, ':'))
 return -1;
@@ -24514,7 +25519,7 @@
 
 emit_label(s, label1);
 
- if (js_parse_assign_expr(s, in_accepted))
+ if (js_parse_assign_expr2(s, parse_flags & PF_IN_ACCEPTED))
 return -1;
 
 emit_label(s, label2);
@@ -24524,14 +25529,16 @@
 
 static void emit_return(JSParseState *s, BOOL hasval);
 
-static __exception int js_parse_assign_expr(JSParseState *s, BOOL in_accepted)
+/* allowed parse_flags: PF_IN_ACCEPTED */
+static __exception int js_parse_assign_expr2(JSParseState *s, int parse_flags)
 {
 int opcode, op, scope;
 JSAtom name0 = JS_ATOM_NULL;
 JSAtom name;
 
 if (s->token.val == TOK_YIELD) {
- BOOL is_star = FALSE;
+ BOOL is_star = FALSE, is_async;
+ 
 if (!(s->cur_func->func_kind & JS_FUNC_GENERATOR))
 return js_parse_error(s, "unexpected 'yield' keyword");
 if (!s->cur_func->in_function_body)
@@ -24548,109 +25555,120 @@
 if (next_token(s))
 return -1;
 }
- if (js_parse_assign_expr(s, in_accepted))
+ if (js_parse_assign_expr2(s, parse_flags))
 return -1;
 } else {
 emit_op(s, OP_undefined);
 }
- if (s->cur_func->func_kind == JS_FUNC_ASYNC_GENERATOR) {
+ is_async = (s->cur_func->func_kind == JS_FUNC_ASYNC_GENERATOR);
+
+ if (is_star) {
 int label_loop, label_return, label_next;
 int label_return1, label_yield, label_throw, label_throw1;
 int label_throw2;
 
- if (is_star) {
- label_loop = new_label(s);
- label_yield = new_label(s);
-
- emit_op(s, OP_for_await_of_start);
-
- /* remove the catch offset (XXX: could avoid pushing back
- undefined) */
- emit_op(s, OP_drop);
- emit_op(s, OP_undefined);
+ label_loop = new_label(s);
+ label_yield = new_label(s);
 
- emit_op(s, OP_undefined); /* initial value */
+ emit_op(s, is_async ? OP_for_await_of_start : OP_for_of_start);
 
- emit_label(s, label_loop);
- emit_op(s, OP_async_iterator_next);
+ /* remove the catch offset (XXX: could avoid pushing back
+ undefined) */
+ emit_op(s, OP_drop);
+ emit_op(s, OP_undefined);
+ 
+ emit_op(s, OP_undefined); /* initial value */
+ 
+ emit_label(s, label_loop);
+ emit_op(s, OP_iterator_next);
+ if (is_async)
 emit_op(s, OP_await);
- emit_op(s, OP_iterator_get_value_done);
- label_next = emit_goto(s, OP_if_true, -1); /* end of loop */
+ emit_op(s, OP_iterator_check_object);
+ emit_op(s, OP_get_field2);
+ emit_atom(s, JS_ATOM_done);
+ label_next = emit_goto(s, OP_if_true, -1); /* end of loop */
+ emit_label(s, label_yield);
+ if (is_async) {
+ /* OP_async_yield_star takes the value as parameter */
+ emit_op(s, OP_get_field);
+ emit_atom(s, JS_ATOM_value);
 emit_op(s, OP_await);
- emit_label(s, label_yield);
 emit_op(s, OP_async_yield_star);
- emit_op(s, OP_dup);
- label_return = emit_goto(s, OP_if_true, -1);
- emit_op(s, OP_drop);
- emit_goto(s, OP_goto, label_loop);
-
- emit_label(s, label_return);
- emit_op(s, OP_push_i32);
- emit_u32(s, 2);
- emit_op(s, OP_strict_eq);
- label_throw = emit_goto(s, OP_if_true, -1);
-
- /* return handling */
- emit_op(s, OP_await);
- emit_op(s, OP_async_iterator_get);
- emit_u8(s, 0);
- label_return1 = emit_goto(s, OP_if_true, -1);
+ } else {
+ /* OP_yield_star takes (value, done) as parameter */
+ emit_op(s, OP_yield_star);
+ }
+ emit_op(s, OP_dup);
+ label_return = emit_goto(s, OP_if_true, -1);
+ emit_op(s, OP_drop);
+ emit_goto(s, OP_goto, label_loop);
+ 
+ emit_label(s, label_return);
+ emit_op(s, OP_push_i32);
+ emit_u32(s, 2);
+ emit_op(s, OP_strict_eq);
+ label_throw = emit_goto(s, OP_if_true, -1);
+ 
+ /* return handling */
+ if (is_async)
 emit_op(s, OP_await);
- emit_op(s, OP_iterator_get_value_done);
- /* XXX: the spec does not indicate that an await should be
- performed in case done = true, but the tests assume it */
- emit_goto(s, OP_if_false, label_yield);
-
- emit_label(s, label_return1);
- emit_op(s, OP_nip);
- emit_op(s, OP_nip);
- emit_op(s, OP_nip);
- emit_return(s, TRUE);
-
- /* throw handling */
- emit_label(s, label_throw);
- emit_op(s, OP_async_iterator_get);
- emit_u8(s, 1);
- label_throw1 = emit_goto(s, OP_if_true, -1);
+ emit_op(s, OP_iterator_call);
+ emit_u8(s, 0);
+ label_return1 = emit_goto(s, OP_if_true, -1);
+ if (is_async)
 emit_op(s, OP_await);
- emit_op(s, OP_iterator_get_value_done);
- emit_goto(s, OP_if_false, label_yield);
- /* XXX: the spec does not indicate that an await should be
- performed in case done = true, but the tests assume it */
+ emit_op(s, OP_iterator_check_object);
+ emit_op(s, OP_get_field2);
+ emit_atom(s, JS_ATOM_done);
+ emit_goto(s, OP_if_false, label_yield);
+
+ emit_op(s, OP_get_field);
+ emit_atom(s, JS_ATOM_value);
+ 
+ emit_label(s, label_return1);
+ emit_op(s, OP_nip);
+ emit_op(s, OP_nip);
+ emit_op(s, OP_nip);
+ emit_return(s, TRUE);
+ 
+ /* throw handling */
+ emit_label(s, label_throw);
+ emit_op(s, OP_iterator_call);
+ emit_u8(s, 1);
+ label_throw1 = emit_goto(s, OP_if_true, -1);
+ if (is_async)
 emit_op(s, OP_await);
- emit_goto(s, OP_goto, label_next);
- /* close the iterator and throw a type error exception */
- emit_label(s, label_throw1);
- emit_op(s, OP_async_iterator_get);
- emit_u8(s, 0);
- label_throw2 = emit_goto(s, OP_if_true, -1);
+ emit_op(s, OP_iterator_check_object);
+ emit_op(s, OP_get_field2);
+ emit_atom(s, JS_ATOM_done);
+ emit_goto(s, OP_if_false, label_yield);
+ emit_goto(s, OP_goto, label_next);
+ /* close the iterator and throw a type error exception */
+ emit_label(s, label_throw1);
+ emit_op(s, OP_iterator_call);
+ emit_u8(s, 2);
+ label_throw2 = emit_goto(s, OP_if_true, -1);
+ if (is_async)
 emit_op(s, OP_await);
- emit_label(s, label_throw2);
- emit_op(s, OP_async_iterator_get);
- emit_u8(s, 2); /* throw the type error exception */
- emit_op(s, OP_drop); /* never reached */
+ emit_label(s, label_throw2);
 
- emit_label(s, label_next);
- emit_op(s, OP_nip); /* keep the value associated with
- done = true */
- emit_op(s, OP_nip);
- emit_op(s, OP_nip);
- } else {
- emit_op(s, OP_await);
- emit_op(s, OP_yield);
- label_next = emit_goto(s, OP_if_false, -1);
- emit_return(s, TRUE);
- emit_label(s, label_next);
- }
+ emit_op(s, OP_throw_error);
+ emit_atom(s, JS_ATOM_NULL);
+ emit_u8(s, JS_THROW_ERROR_ITERATOR_THROW);
+ 
+ emit_label(s, label_next);
+ emit_op(s, OP_get_field);
+ emit_atom(s, JS_ATOM_value);
+ emit_op(s, OP_nip); /* keep the value associated with
+ done = true */
+ emit_op(s, OP_nip);
+ emit_op(s, OP_nip);
 } else {
 int label_next;
- if (is_star) {
- emit_op(s, OP_for_of_start);
- emit_op(s, OP_drop); /* drop the catch offset */
- emit_op(s, OP_yield_star);
- } else {
- emit_op(s, OP_yield);
- }
+ 
+ if (is_async)
+ emit_op(s, OP_await);
+ emit_op(s, OP_yield);
 label_next = emit_goto(s, OP_if_false, -1);
 emit_return(s, TRUE);
 emit_label(s, label_next);
@@ -24661,7 +25679,7 @@
 /* name0 is used to check for OP_set_name pattern, not duplicated */
 name0 = s->token.u.ident.atom;
 }
- if (js_parse_cond_expr(s, in_accepted))
+ if (js_parse_cond_expr(s, parse_flags | PF_ARROW_FUNC))
 return -1;
 
 op = s->token.val;
@@ -24672,7 +25690,7 @@
 if (get_lvalue(s, &opcode, &scope, &name, &label, NULL, (op != '='), op) < 0)
 return -1;
 
- if (js_parse_assign_expr(s, in_accepted)) {
+ if (js_parse_assign_expr2(s, parse_flags)) {
 JS_FreeAtom(s->ctx, name);
 return -1;
 }
@@ -24693,26 +25711,82 @@
 op = assign_opcodes[op - TOK_MUL_ASSIGN];
 #ifdef CONFIG_BIGNUM
 if (s->cur_func->js_mode & JS_MODE_MATH) {
- if (op == OP_div)
- op = OP_math_div;
- else if (op == OP_mod)
+ if (op == OP_mod)
 op = OP_math_mod;
- else if (op == OP_pow)
- op = OP_math_pow;
 }
 #endif
 emit_op(s, op);
 }
- put_lvalue(s, opcode, scope, name, label, FALSE);
+ put_lvalue(s, opcode, scope, name, label, PUT_LVALUE_KEEP_TOP, FALSE);
+ } else if (op >= TOK_LAND_ASSIGN && op <= TOK_DOUBLE_QUESTION_MARK_ASSIGN) {
+ int label, label1, depth_lvalue, label2;
+ 
+ if (next_token(s))
+ return -1;
+ if (get_lvalue(s, &opcode, &scope, &name, &label,
+ &depth_lvalue, TRUE, op) < 0)
+ return -1;
+
+ emit_op(s, OP_dup);
+ if (op == TOK_DOUBLE_QUESTION_MARK_ASSIGN)
+ emit_op(s, OP_is_undefined_or_null);
+ label1 = emit_goto(s, op == TOK_LOR_ASSIGN ? OP_if_true : OP_if_false,
+ -1);
+ emit_op(s, OP_drop);
+ 
+ if (js_parse_assign_expr2(s, parse_flags)) {
+ JS_FreeAtom(s->ctx, name);
+ return -1;
+ }
+
+ if (opcode == OP_get_ref_value && name == name0) {
+ set_object_name(s, name);
+ }
+ 
+ switch(depth_lvalue) {
+ case 1:
+ emit_op(s, OP_insert2);
+ break;
+ case 2:
+ emit_op(s, OP_insert3);
+ break;
+ case 3:
+ emit_op(s, OP_insert4);
+ break;
+ default:
+ abort();
+ }
+
+ /* XXX: we disable the OP_put_ref_value optimization by not
+ using put_lvalue() otherwise depth_lvalue is not correct */
+ put_lvalue(s, opcode, scope, name, label, PUT_LVALUE_NOKEEP_DEPTH,
+ FALSE);
+ label2 = emit_goto(s, OP_goto, -1);
+ 
+ emit_label(s, label1);
+
+ /* remove the lvalue stack entries */
+ while (depth_lvalue != 0) {
+ emit_op(s, OP_nip);
+ depth_lvalue--;
+ }
+
+ emit_label(s, label2);
 }
 return 0;
 }
 
-static __exception int js_parse_expr2(JSParseState *s, BOOL in_accepted)
+static __exception int js_parse_assign_expr(JSParseState *s)
+{
+ return js_parse_assign_expr2(s, PF_IN_ACCEPTED);
+}
+
+/* allowed parse_flags: PF_IN_ACCEPTED */
+static __exception int js_parse_expr2(JSParseState *s, int parse_flags)
 {
 BOOL comma = FALSE;
 for(;;) {
- if (js_parse_assign_expr(s, in_accepted))
+ if (js_parse_assign_expr2(s, parse_flags))
 return -1;
 if (comma) {
 /* prevent get_lvalue from using the last expression
@@ -24734,7 +25808,7 @@
 
 static __exception int js_parse_expr(JSParseState *s)
 {
- return js_parse_expr2(s, TRUE);
+ return js_parse_expr2(s, PF_IN_ACCEPTED);
 }
 
 static void push_break_entry(JSFunctionDef *fd, BlockEnv *be,
@@ -24830,12 +25904,25 @@
 }
 emit_op(s, OP_iterator_close_return);
 if (s->cur_func->func_kind == JS_FUNC_ASYNC_GENERATOR) {
- int label_next;
- emit_op(s, OP_async_iterator_close);
+ int label_next, label_next2;
+
+ emit_op(s, OP_drop); /* catch offset */
+ emit_op(s, OP_drop); /* next */
+ emit_op(s, OP_get_field2);
+ emit_atom(s, JS_ATOM_return);
+ /* stack: iter_obj return_func */
+ emit_op(s, OP_dup);
+ emit_op(s, OP_is_undefined_or_null);
 label_next = emit_goto(s, OP_if_true, -1);
+ emit_op(s, OP_call_method);
+ emit_u16(s, 0);
+ emit_op(s, OP_iterator_check_object);
 emit_op(s, OP_await);
+ label_next2 = emit_goto(s, OP_goto, -1);
 emit_label(s, label_next);
 emit_op(s, OP_drop);
+ emit_label(s, label_next2);
+ emit_op(s, OP_drop);
 } else {
 emit_op(s, OP_iterator_close);
 }
@@ -24870,6 +25957,8 @@
 label_return = -1;
 }
 
+ /* XXX: if this is not initialized, should throw the
+ ReferenceError in the caller realm */
 emit_op(s, OP_scope_get_var);
 emit_atom(s, JS_ATOM_this);
 emit_u16(s, 0);
@@ -24921,7 +26010,8 @@
 return 0;
 }
 
-static __exception int js_parse_var(JSParseState *s, BOOL in_accepted, int tok,
+/* allowed parse_flags: PF_IN_ACCEPTED */
+static __exception int js_parse_var(JSParseState *s, int parse_flags, int tok,
 BOOL export_flag)
 {
 JSContext *ctx = s->ctx;
@@ -24961,15 +26051,15 @@
 emit_u16(s, fd->scope_level);
 if (get_lvalue(s, &opcode, &scope, &name1, &label, NULL, FALSE, '=') < 0)
 goto var_error;
- if (js_parse_assign_expr(s, in_accepted)) {
+ if (js_parse_assign_expr2(s, parse_flags)) {
 JS_FreeAtom(ctx, name1);
 goto var_error;
 }
 set_object_name(s, name);
- put_lvalue(s, opcode, scope, name1, label, FALSE);
- emit_op(s, OP_drop);
+ put_lvalue(s, opcode, scope, name1, label,
+ PUT_LVALUE_NOKEEP, FALSE);
 } else {
- if (js_parse_assign_expr(s, in_accepted))
+ if (js_parse_assign_expr2(s, parse_flags))
 goto var_error;
 set_object_name(s, name);
 emit_op(s, (tok == TOK_CONST || tok == TOK_LET) ?
@@ -24996,7 +26086,7 @@
 if ((s->token.val == '[' || s->token.val == '{')
 && js_parse_skip_parens_token(s, &skip_bits, FALSE) == '=') {
 emit_op(s, OP_undefined);
- if (js_parse_destructing_element(s, tok, 0, TRUE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE))
+ if (js_parse_destructuring_element(s, tok, 0, TRUE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE) < 0)
 return -1;
 } else {
 return js_parse_error(s, "variable name expected");
@@ -25125,7 +26215,7 @@
 
 if (!(s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved)) {
 if (s->token.val == '[' || s->token.val == '{') {
- if (js_parse_destructing_element(s, tok, 0, TRUE, -1, FALSE))
+ if (js_parse_destructuring_element(s, tok, 0, TRUE, -1, FALSE) < 0)
 return -1;
 has_destructuring = TRUE;
 } else {
@@ -25151,32 +26241,17 @@
 int skip_bits;
 if ((s->token.val == '[' || s->token.val == '{')
 && ((tok1 = js_parse_skip_parens_token(s, &skip_bits, FALSE)) == TOK_IN || tok1 == TOK_OF)) {
- if (js_parse_destructing_element(s, 0, 0, TRUE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE))
+ if (js_parse_destructuring_element(s, 0, 0, TRUE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE) < 0)
 return -1;
 } else {
- int lvalue_label, depth;
- if (js_parse_postfix_expr(s, TRUE))
+ int lvalue_label;
+ if (js_parse_left_hand_side_expr(s))
 return -1;
 if (get_lvalue(s, &opcode, &scope, &var_name, &lvalue_label,
- &depth, FALSE, TOK_FOR))
+ NULL, FALSE, TOK_FOR))
 return -1;
- /* swap value and lvalue object and store it into lvalue object */
- /* enum_rec val [depth] -- enum_rec */
- switch(depth) {
- case 1:
- emit_op(s, OP_swap);
- break;
- case 2:
- emit_op(s, OP_rot3l);
- break;
- case 3:
- emit_op(s, OP_rot4l);
- break;
- default:
- abort();
- }
- put_lvalue_nokeep(s, opcode, scope, var_name, lvalue_label,
- TOK_FOR /* not used */);
+ put_lvalue(s, opcode, scope, var_name, lvalue_label,
+ PUT_LVALUE_NOKEEP_BOTTOM, FALSE);
 }
 var_name = JS_ATOM_NULL;
 }
@@ -25190,7 +26265,7 @@
 /* parse and evaluate initializer prior to evaluating the
 object (only used with "for in" with a non lexical variable
 in non strict mode */
- if (next_token(s) || js_parse_assign_expr(s, FALSE)) {
+ if (next_token(s) || js_parse_assign_expr2(s, 0)) {
 JS_FreeAtom(ctx, var_name);
 return -1;
 }
@@ -25223,7 +26298,7 @@
 if (next_token(s))
 return -1;
 if (is_for_of) {
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 } else {
 if (js_parse_expr(s))
@@ -25276,7 +26351,11 @@
 if (is_for_of) {
 if (is_async) {
 /* call the next method */
- emit_op(s, OP_for_await_of_next);
+ /* stack: iter_obj next catch_offset */
+ emit_op(s, OP_dup3);
+ emit_op(s, OP_drop);
+ emit_op(s, OP_call_method);
+ emit_u16(s, 0);
 /* get the result of the promise */
 emit_op(s, OP_await);
 /* unwrap the value and done values */
@@ -25834,7 +26913,7 @@
 if (!(s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved)) {
 if (s->token.val == '[' || s->token.val == '{') {
 /* XXX: TOK_LET is not completely correct */
- if (js_parse_destructing_element(s, TOK_LET, 0, TRUE, -1, TRUE))
+ if (js_parse_destructuring_element(s, TOK_LET, 0, TRUE, -1, TRUE) < 0)
 goto fail;
 } else {
 js_parse_error(s, "identifier expected");
@@ -25900,18 +26979,37 @@
 }
 emit_label(s, label_finally);
 if (s->token.val == TOK_FINALLY) {
- int saved_eval_ret_idx;
+ int saved_eval_ret_idx = 0; /* avoid warning */
+ 
 if (next_token(s))
 goto fail;
 /* on the stack: ret_value gosub_ret_value */
 push_break_entry(s->cur_func, &block_env, JS_ATOM_NULL,
 -1, -1, 2);
- saved_eval_ret_idx = s->cur_func->eval_ret_idx;
- s->cur_func->eval_ret_idx = -1;
- /* 'finally' does not update eval_ret */
+
+ if (s->cur_func->eval_ret_idx >= 0) {
+ /* 'finally' updates eval_ret only if not a normal
+ termination */
+ saved_eval_ret_idx =
+ add_var(s->ctx, s->cur_func, JS_ATOM__ret_);
+ if (saved_eval_ret_idx < 0)
+ goto fail;
+ emit_op(s, OP_get_loc);
+ emit_u16(s, s->cur_func->eval_ret_idx);
+ emit_op(s, OP_put_loc);
+ emit_u16(s, saved_eval_ret_idx);
+ set_eval_ret_undefined(s);
+ }
+ 
 if (js_parse_block(s))
 goto fail;
- s->cur_func->eval_ret_idx = saved_eval_ret_idx;
+
+ if (s->cur_func->eval_ret_idx >= 0) {
+ emit_op(s, OP_get_loc);
+ emit_u16(s, saved_eval_ret_idx);
+ emit_op(s, OP_put_loc);
+ emit_u16(s, s->cur_func->eval_ret_idx);
+ }
 pop_break_entry(s->cur_func);
 }
 emit_op(s, OP_ret);
@@ -26007,7 +27105,7 @@
 if (js_parse_expect_semi(s))
 goto fail;
 break;
-
+ 
 case TOK_ENUM:
 case TOK_EXPORT:
 case TOK_EXTENDS:
@@ -26057,6 +27155,25 @@
 return m;
 }
 
+static void js_mark_module_def(JSRuntime *rt, JSModuleDef *m,
+ JS_MarkFunc *mark_func)
+{
+ int i;
+
+ for(i = 0; i < m->export_entries_count; i++) {
+ JSExportEntry *me = &m->export_entries[i];
+ if (me->export_type == JS_EXPORT_TYPE_LOCAL &&
+ me->u.local.var_ref) {
+ mark_func(rt, &me->u.local.var_ref->header);
+ }
+ }
+
+ JS_MarkValue(rt, m->module_ns, mark_func);
+ JS_MarkValue(rt, m->func_obj, mark_func);
+ JS_MarkValue(rt, m->eval_exception, mark_func);
+ JS_MarkValue(rt, m->meta_obj, mark_func);
+}
+
 static void js_free_module_def(JSContext *ctx, JSModuleDef *m)
 {
 int i;
@@ -26094,26 +27211,6 @@
 js_free(ctx, m);
 }
 
-static int js_resize_array(JSContext *ctx, void **parray, int elem_size,
- int *psize, int *pcount, int new_count)
-{
- if (unlikely(new_count > *psize)) {
- int new_size;
- size_t slack;
- void *new_array;
- /* XXX: potential arithmetic overflow */
- new_size = max_int(new_count, *psize * 3 / 2);
- new_array = js_realloc2(ctx, *parray, new_size * elem_size, &slack);
- if (!new_array)
- return -1;
- new_size += slack / elem_size;
- *psize = new_size;
- *parray = new_array;
- }
- *pcount = new_count;
- return 0;
-}
-
 static int add_req_module_entry(JSContext *ctx, JSModuleDef *m,
 JSAtom module_name)
 {
@@ -26129,11 +27226,10 @@
 
 if (js_resize_array(ctx, (void **)&m->req_module_entries,
 sizeof(JSReqModuleEntry),
- &m->req_module_entries_size, &m->req_module_entries_count,
+ &m->req_module_entries_size,
 m->req_module_entries_count + 1))
 return -1;
- i = m->req_module_entries_count - 1;
- rme = &m->req_module_entries[i];
+ rme = &m->req_module_entries[m->req_module_entries_count++];
 rme->module_name = JS_DupAtom(ctx, module_name);
 rme->module = NULL;
 return i;
@@ -26165,18 +27261,17 @@
 js_parse_error(s, "duplicate exported name '%s'",
 JS_AtomGetStr(ctx, buf1, sizeof(buf1), export_name));
 } else {
- JS_ThrowSyntaxError(ctx, "duplicate exported name '%s'",
- JS_AtomGetStr(ctx, buf1, sizeof(buf1), export_name));
+ JS_ThrowSyntaxErrorAtom(ctx, "duplicate exported name '%s'", export_name);
 }
 return NULL;
 }
 
 if (js_resize_array(ctx, (void **)&m->export_entries,
 sizeof(JSExportEntry),
- &m->export_entries_size, &m->export_entries_count,
+ &m->export_entries_size,
 m->export_entries_count + 1))
 return NULL;
- me = &m->export_entries[m->export_entries_count - 1];
+ me = &m->export_entries[m->export_entries_count++];
 memset(me, 0, sizeof(*me));
 me->local_name = JS_DupAtom(ctx, local_name);
 me->export_name = JS_DupAtom(ctx, export_name);
@@ -26199,10 +27294,10 @@
 
 if (js_resize_array(ctx, (void **)&m->star_export_entries,
 sizeof(JSStarExportEntry),
- &m->star_export_entries_size, &m->star_export_entries_count,
+ &m->star_export_entries_size,
 m->star_export_entries_count + 1))
 return -1;
- se = &m->star_export_entries[m->star_export_entries_count - 1];
+ se = &m->star_export_entries[m->star_export_entries_count++];
 se->req_module_idx = req_module_idx;
 return 0;
 }
@@ -26327,7 +27422,7 @@
 {
 struct list_head *el;
 JSModuleDef *m;
-
+ 
 /* first look at the loaded modules */
 list_for_each(el, &ctx->loaded_modules) {
 m = list_entry(el, JSModuleDef, link);
@@ -26339,32 +27434,20 @@
 
 /* return NULL in case of exception (e.g. module could not be loaded) */
 static JSModuleDef *js_host_resolve_imported_module(JSContext *ctx,
- JSAtom base_module_name,
- JSAtom module_name1)
+ const char *base_cname,
+ const char *cname1)
 {
 JSRuntime *rt = ctx->rt;
 JSModuleDef *m;
 char *cname;
- const char *base_cname, *cname1;
 JSAtom module_name;
 
- base_cname = JS_AtomToCString(ctx, base_module_name);
- if (!base_cname)
- return NULL;
- cname1 = JS_AtomToCString(ctx, module_name1);
- if (!cname1) {
- JS_FreeCString(ctx, base_cname);
- return NULL;
- }
-
 if (!rt->module_normalize_func) {
 cname = js_default_module_normalize_name(ctx, base_cname, cname1);
 } else {
 cname = rt->module_normalize_func(ctx, base_cname, cname1,
 rt->module_loader_opaque);
 }
- JS_FreeCString(ctx, base_cname);
- JS_FreeCString(ctx, cname1);
 if (!cname)
 return NULL;
 
@@ -26398,6 +27481,27 @@
 return m;
 }
 
+static JSModuleDef *js_host_resolve_imported_module_atom(JSContext *ctx,
+ JSAtom base_module_name,
+ JSAtom module_name1)
+{
+ const char *base_cname, *cname;
+ JSModuleDef *m;
+ 
+ base_cname = JS_AtomToCString(ctx, base_module_name);
+ if (!base_cname)
+ return NULL;
+ cname = JS_AtomToCString(ctx, module_name1);
+ if (!cname) {
+ JS_FreeCString(ctx, base_cname);
+ return NULL;
+ }
+ m = js_host_resolve_imported_module(ctx, base_cname, cname);
+ JS_FreeCString(ctx, base_cname);
+ JS_FreeCString(ctx, cname);
+ return m;
+}
+
 typedef struct JSResolveEntry {
 JSModuleDef *module;
 JSAtom name;
@@ -26428,10 +27532,9 @@
 
 if (js_resize_array(ctx, (void **)&s->array,
 sizeof(JSResolveEntry),
- &s->size, &s->count,
- s->count + 1))
+ &s->size, s->count + 1))
 return -1;
- re = &s->array[s->count - 1];
+ re = &s->array[s->count++];
 re->module = m;
 re->name = JS_DupAtom(ctx, name);
 return 0;
@@ -26556,17 +27659,17 @@
 break;
 default:
 case JS_RESOLVE_RES_NOT_FOUND:
- JS_ThrowSyntaxError(ctx, "export '%s' in module '%s' is ambiguous",
+ JS_ThrowSyntaxError(ctx, "Could not find export '%s' in module '%s'",
 JS_AtomGetStr(ctx, buf1, sizeof(buf1), export_name),
 JS_AtomGetStr(ctx, buf2, sizeof(buf2), m->module_name));
 break;
 case JS_RESOLVE_RES_CIRCULAR:
- JS_ThrowSyntaxError(ctx, "Could not find export '%s' in module '%s'",
+ JS_ThrowSyntaxError(ctx, "circular reference when looking for export '%s' in module '%s'",
 JS_AtomGetStr(ctx, buf1, sizeof(buf1), export_name),
 JS_AtomGetStr(ctx, buf2, sizeof(buf2), m->module_name));
 break;
 case JS_RESOLVE_RES_AMBIGUOUS:
- JS_ThrowSyntaxError(ctx, "circular reference when looking for export '%s' in module '%s'",
+ JS_ThrowSyntaxError(ctx, "export '%s' in module '%s' is ambiguous",
 JS_AtomGetStr(ctx, buf1, sizeof(buf1), export_name),
 JS_AtomGetStr(ctx, buf2, sizeof(buf2), m->module_name));
 break;
@@ -26623,9 +27726,9 @@
 return 0;
 }
 if (js_resize_array(ctx, (void **)&s->modules, sizeof(s->modules[0]),
- &s->modules_size, &s->modules_count, s->modules_count + 1))
+ &s->modules_size, s->modules_count + 1))
 return -1;
- s->modules[s->modules_count - 1] = m;
+ s->modules[s->modules_count++] = m;
 
 for(i = 0; i < m->export_entries_count; i++) {
 JSExportEntry *me = &m->export_entries[i];
@@ -26634,9 +27737,10 @@
 j = find_exported_name(s, me->export_name);
 if (j < 0) {
 if (js_resize_array(ctx, (void **)&s->exported_names, sizeof(s->exported_names[0]),
- &s->exported_names_size, &s->exported_names_count, s->exported_names_count + 1))
+ &s->exported_names_size,
+ s->exported_names_count + 1))
 return -1;
- en = &s->exported_names[s->exported_names_count - 1];
+ en = &s->exported_names[s->exported_names_count++];
 en->export_name = me->export_name;
 /* avoid a second lookup for simple module exports */
 if (from_star || me->export_type != JS_EXPORT_TYPE_LOCAL)
@@ -26693,19 +27797,11 @@
 
 static JSValue js_get_module_ns(JSContext *ctx, JSModuleDef *m);
 
-static int js_module_ns_autoinit(JSContext *ctx, JSObject *p, JSAtom atom,
- void *opaque)
+static JSValue js_module_ns_autoinit(JSContext *ctx, JSObject *p, JSAtom atom,
+ void *opaque)
 {
 JSModuleDef *m = opaque;
- JSValue val, this_val = JS_MKPTR(JS_TAG_OBJECT, p);
-
- val = js_get_module_ns(ctx, m);
- if (JS_IsException(val))
- return -1;
- if (JS_DefinePropertyValue(ctx, this_val, atom, val,
- JS_PROP_ENUMERABLE | JS_PROP_WRITABLE) < 0)
- return -1;
- return 0;
+ return js_get_module_ns(ctx, m);
 }
 
 static JSValue js_build_module_ns(JSContext *ctx, JSModuleDef *m)
@@ -26788,7 +27884,7 @@
 /* the exported namespace must be created on demand */
 if (JS_DefineAutoInitProperty(ctx, obj,
 en->export_name,
- js_module_ns_autoinit,
+ JS_AUTOINIT_ID_MODULE_NS,
 en->u.module, JS_PROP_ENUMERABLE | JS_PROP_WRITABLE) < 0)
 goto fail;
 break;
@@ -26841,8 +27937,8 @@
 /* resolve each requested module */
 for(i = 0; i < m->req_module_entries_count; i++) {
 JSReqModuleEntry *rme = &m->req_module_entries[i];
- m1 = js_host_resolve_imported_module(ctx, m->module_name,
- rme->module_name);
+ m1 = js_host_resolve_imported_module_atom(ctx, m->module_name,
+ rme->module_name);
 if (!m1)
 return -1;
 rme->module = m1;
@@ -26872,7 +27968,7 @@
 }
 
 /* Create the <eval> function associated with the module */
-static int js_create_module_function(JSContext *ctx, JSModuleDef *m)
+static int js_create_module_bytecode_function(JSContext *ctx, JSModuleDef *m)
 {
 JSFunctionBytecode *b;
 int i;
@@ -26923,20 +28019,15 @@
 return -1;
 }
 
-/* Prepare a module to be executed by resolving all the imported
- variables. */
-static int js_instantiate_module(JSContext *ctx, JSModuleDef *m)
+/* must be done before js_link_module() because of cyclic references */
+static int js_create_module_function(JSContext *ctx, JSModuleDef *m)
 {
- int i;
- JSImportEntry *mi;
- JSModuleDef *m1;
- JSVarRef **var_refs, *var_ref;
- JSObject *p;
 BOOL is_c_module;
-
- if (m->instantiated)
+ int i;
+ JSVarRef *var_ref;
+ 
+ if (m->func_created)
 return 0;
- m->instantiated = TRUE;
 
 is_c_module = (m->init_func != NULL);
 
@@ -26947,18 +28038,54 @@
 if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
 var_ref = js_create_module_var(ctx, FALSE);
 if (!var_ref)
- goto fail;
+ return -1;
 me->u.local.var_ref = var_ref;
 }
 }
 } else {
- if (js_create_module_function(ctx, m) < 0)
- goto fail;
+ if (js_create_module_bytecode_function(ctx, m))
+ return -1;
+ }
+ m->func_created = TRUE;
+
+ /* do it on the dependencies */
+ 
+ for(i = 0; i < m->req_module_entries_count; i++) {
+ JSReqModuleEntry *rme = &m->req_module_entries[i];
+ if (js_create_module_function(ctx, rme->module) < 0)
+ return -1;
 }
 
+ return 0;
+} 
+
+ 
+/* Prepare a module to be executed by resolving all the imported
+ variables. */
+static int js_link_module(JSContext *ctx, JSModuleDef *m)
+{
+ int i;
+ JSImportEntry *mi;
+ JSModuleDef *m1;
+ JSVarRef **var_refs, *var_ref;
+ JSObject *p;
+ BOOL is_c_module;
+ JSValue ret_val;
+ 
+ if (m->instantiated)
+ return 0;
+ m->instantiated = TRUE;
+
+#ifdef DUMP_MODULE_RESOLVE
+ {
+ char buf1[ATOM_GET_STR_BUF_SIZE];
+ printf("start instantiating module '%s':\n", JS_AtomGetStr(ctx, buf1, sizeof(buf1), m->module_name));
+ }
+#endif
+
 for(i = 0; i < m->req_module_entries_count; i++) {
 JSReqModuleEntry *rme = &m->req_module_entries[i];
- if (js_instantiate_module(ctx, rme->module) < 0)
+ if (js_link_module(ctx, rme->module) < 0)
 goto fail;
 }
 
@@ -26997,6 +28124,8 @@
 }
 #endif
 
+ is_c_module = (m->init_func != NULL);
+
 if (!is_c_module) {
 p = JS_VALUE_GET_OBJ(m->func_obj);
 var_refs = p->u.func.var_refs;
@@ -27075,6 +28204,12 @@
 me->u.local.var_ref = var_ref;
 }
 }
+
+ /* initialize the global variables */
+ ret_val = JS_Call(ctx, m->func_obj, JS_TRUE, 0, NULL);
+ if (JS_IsException(ret_val))
+ goto fail;
+ JS_FreeValue(ctx, ret_val);
 }
 
 #ifdef DUMP_MODULE_RESOLVE
@@ -27085,8 +28220,9 @@
 return -1;
 }
 
-/* warning: the returned atom is not allocated */
-static JSAtom js_get_script_or_module_name(JSContext *ctx)
+/* return JS_ATOM_NULL if the name cannot be found. Only works with
+ not striped bytecode functions. */
+JSAtom JS_GetScriptOrModuleName(JSContext *ctx, int n_stack_levels)
 {
 JSStackFrame *sf;
 JSFunctionBytecode *b;
@@ -27094,15 +28230,23 @@
 /* XXX: currently we just use the filename of the englobing
 function. It does not work for eval(). Need to add a
 ScriptOrModule info in JSFunctionBytecode */
- sf = ctx->current_stack_frame;
- assert(sf != NULL);
- assert(JS_VALUE_GET_TAG(sf->cur_func) == JS_TAG_OBJECT);
+ sf = ctx->rt->current_stack_frame;
+ if (!sf)
+ return JS_ATOM_NULL;
+ while (n_stack_levels-- > 0) {
+ sf = sf->prev_frame;
+ if (!sf)
+ return JS_ATOM_NULL;
+ }
+ if (JS_VALUE_GET_TAG(sf->cur_func) != JS_TAG_OBJECT)
+ return JS_ATOM_NULL;
 p = JS_VALUE_GET_OBJ(sf->cur_func);
- assert(js_class_has_bytecode(p->class_id));
+ if (!js_class_has_bytecode(p->class_id))
+ return JS_ATOM_NULL;
 b = p->u.func.function_bytecode;
 if (!b->has_debug)
 return JS_ATOM_NULL;
- return b->debug.filename;
+ return JS_DupAtom(ctx, b->debug.filename);
 }
 
 JSAtom JS_GetModuleName(JSContext *ctx, JSModuleDef *m)
@@ -27128,14 +28272,15 @@
 {
 JSAtom filename;
 JSModuleDef *m;
-
- filename = js_get_script_or_module_name(ctx);
+ 
+ filename = JS_GetScriptOrModuleName(ctx, 0);
 if (filename == JS_ATOM_NULL)
 goto fail;
 
 /* XXX: inefficient, need to add a module or script pointer in
 JSFunctionBytecode */
 m = js_find_loaded_module(ctx, filename);
+ JS_FreeAtom(ctx, filename);
 if (!m) {
 fail:
 JS_ThrowTypeError(ctx, "import.meta not supported in this context");
@@ -27144,68 +28289,109 @@
 return JS_GetImportMeta(ctx, m);
 }
 
-static JSValue js_dynamic_import(JSContext *ctx, JSValueConst specifier)
+/* used by os.Worker() and import() */
+JSModuleDef *JS_RunModule(JSContext *ctx, const char *basename,
+ const char *filename)
 {
 JSModuleDef *m;
- JSAtom basename, filename;
- JSValue promise, resolving_funcs[2];
- JSValue specifierString, ret, func_obj, err, ns;
-
- promise = JS_NewPromiseCapability(ctx, resolving_funcs);
- if (JS_IsException(promise))
- return promise;
-
- basename = js_get_script_or_module_name(ctx);
- if (basename == JS_ATOM_NULL) {
- JS_ThrowTypeError(ctx, "no function filename for import()");
- goto exception;
- }
-
- specifierString = JS_ToString(ctx, specifier);
- if (JS_IsException(specifierString))
- goto exception;
- filename = JS_ValueToAtom(ctx, specifierString);
- JS_FreeValue(ctx, specifierString);
- if (filename == JS_ATOM_NULL)
- goto exception;
-
+ JSValue ret, func_obj;
+ 
 m = js_host_resolve_imported_module(ctx, basename, filename);
- JS_FreeAtom(ctx, filename);
- if (!m) {
- goto exception;
- }
-
+ if (!m)
+ return NULL;
+ 
 if (js_resolve_module(ctx, m) < 0) {
 js_free_modules(ctx, JS_FREE_MODULE_NOT_RESOLVED);
- goto exception;
+ return NULL;
 }
 
 /* Evaluate the module code */
 func_obj = JS_DupValue(ctx, JS_MKPTR(JS_TAG_MODULE, m));
 ret = JS_EvalFunction(ctx, func_obj);
 if (JS_IsException(ret))
- goto exception;
+ return NULL;
 JS_FreeValue(ctx, ret);
+ return m;
+}
+
+static JSValue js_dynamic_import_job(JSContext *ctx,
+ int argc, JSValueConst *argv)
+{
+ JSValueConst *resolving_funcs = argv;
+ JSValueConst basename_val = argv[2];
+ JSValueConst specifier = argv[3];
+ JSModuleDef *m;
+ const char *basename = NULL, *filename;
+ JSValue ret, err, ns;
+
+ if (!JS_IsString(basename_val)) {
+ JS_ThrowTypeError(ctx, "no function filename for import()");
+ goto exception;
+ }
+ basename = JS_ToCString(ctx, basename_val);
+ if (!basename)
+ goto exception;
+
+ filename = JS_ToCString(ctx, specifier);
+ if (!filename)
+ goto exception;
+ 
+ m = JS_RunModule(ctx, basename, filename);
+ JS_FreeCString(ctx, filename);
+ if (!m)
+ goto exception;
 
 /* return the module namespace */
 ns = js_get_module_ns(ctx, m);
- if (JS_IsException(ret))
+ if (JS_IsException(ns))
 goto exception;
 
 ret = JS_Call(ctx, resolving_funcs[0], JS_UNDEFINED,
 1, (JSValueConst *)&ns);
 JS_FreeValue(ctx, ret); /* XXX: what to do if exception ? */
 JS_FreeValue(ctx, ns);
- JS_FreeValue(ctx, resolving_funcs[0]);
- JS_FreeValue(ctx, resolving_funcs[1]);
- return promise;
-
+ JS_FreeCString(ctx, basename);
+ return JS_UNDEFINED;
 exception:
+
 err = JS_GetException(ctx);
 ret = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED,
 1, (JSValueConst *)&err);
 JS_FreeValue(ctx, ret); /* XXX: what to do if exception ? */
 JS_FreeValue(ctx, err);
+ JS_FreeCString(ctx, basename);
+ return JS_UNDEFINED;
+}
+
+static JSValue js_dynamic_import(JSContext *ctx, JSValueConst specifier)
+{
+ JSAtom basename;
+ JSValue promise, resolving_funcs[2], basename_val;
+ JSValueConst args[4];
+
+ basename = JS_GetScriptOrModuleName(ctx, 0);
+ if (basename == JS_ATOM_NULL)
+ basename_val = JS_NULL;
+ else
+ basename_val = JS_AtomToValue(ctx, basename);
+ JS_FreeAtom(ctx, basename);
+ if (JS_IsException(basename_val))
+ return basename_val;
+ 
+ promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+ if (JS_IsException(promise)) {
+ JS_FreeValue(ctx, basename_val);
+ return promise;
+ }
+
+ args[0] = resolving_funcs[0];
+ args[1] = resolving_funcs[1];
+ args[2] = basename_val;
+ args[3] = specifier;
+ 
+ JS_EnqueueJob(ctx, js_dynamic_import_job, 4, args);
+
+ JS_FreeValue(ctx, basename_val);
 JS_FreeValue(ctx, resolving_funcs[0]);
 JS_FreeValue(ctx, resolving_funcs[1]);
 return promise;
@@ -27260,7 +28446,7 @@
 if (JS_IsException(ret_val)) {
 /* save the thrown exception value */
 m->eval_has_exception = TRUE;
- m->eval_exception = JS_DupValue(ctx, ctx->current_exception);
+ m->eval_exception = JS_DupValue(ctx, ctx->rt->current_exception);
 }
 m->eval_mark = FALSE;
 m->evaluated = TRUE;
@@ -27423,7 +28609,7 @@
 s->token.ptr, s->token.line_num,
 JS_PARSE_EXPORT_DEFAULT, NULL);
 } else {
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 return -1;
 }
 /* set the name of anonymous functions */
@@ -27484,10 +28670,10 @@
 return -1;
 if (js_resize_array(ctx, (void **)&m->import_entries,
 sizeof(JSImportEntry),
- &m->import_entries_size, &m->import_entries_count,
+ &m->import_entries_size,
 m->import_entries_count + 1))
 return -1;
- mi = &m->import_entries[m->import_entries_count - 1];
+ mi = &m->import_entries[m->import_entries_count++];
 mi->import_name = JS_DupAtom(ctx, import_name);
 mi->var_idx = var_idx;
 return 0;
@@ -27540,6 +28726,10 @@
 return js_parse_error(s, "expecting 'as'");
 if (next_token(s))
 return -1;
+ if (!token_is_ident(s->token.val)) {
+ js_parse_error(s, "identifier expected");
+ return -1;
+ }
 local_name = JS_DupAtom(ctx, s->token.u.ident.atom);
 import_name = JS_ATOM__star_;
 if (next_token(s))
@@ -27608,7 +28798,7 @@
 {
 JSFunctionDef *fd = s->cur_func;
 int tok;
-
+ 
 if (s->token.val == TOK_FUNCTION ||
 (token_is_pseudo_keyword(s, JS_ATOM_async) &&
 peek_token(s, TRUE) == TOK_FUNCTION)) {
@@ -27662,7 +28852,9 @@
 fd->last_opcode_pos = -1;
 fd->func_name = JS_ATOM_NULL;
 fd->var_object_idx = -1;
+ fd->arg_var_object_idx = -1;
 fd->arguments_var_idx = -1;
+ fd->arguments_arg_idx = -1;
 fd->func_var_idx = -1;
 fd->eval_ret_idx = -1;
 fd->this_var_idx = -1;
@@ -27671,13 +28863,14 @@
 fd->home_object_var_idx = -1;
 
 /* XXX: should distinguish arg, var and var object and body scopes */
- fd->scope_level = 0; /* 0: var/arg scope, 1:body scope */
- fd->scope_first = -1;
 fd->scopes = fd->def_scope_array;
 fd->scope_size = countof(fd->def_scope_array);
 fd->scope_count = 1;
 fd->scopes[0].first = -1;
 fd->scopes[0].parent = -1;
+ fd->scope_level = 0; /* 0: var/arg scope */
+ fd->scope_first = -1;
+ fd->body_scope = -1;
 
 fd->filename = JS_NewAtom(ctx, filename);
 fd->line_num = line_num;
@@ -27697,7 +28890,7 @@
 int pos, len, op;
 JSAtom atom;
 const JSOpCode *oi;
-
+ 
 pos = 0;
 while (pos < bc_len) {
 op = bc_buf[pos];
@@ -27705,7 +28898,7 @@
 oi = &short_opcode_info(op);
 else
 oi = &opcode_info[op];
-
+ 
 len = oi->size;
 switch(oi->fmt) {
 case OP_FMT_atom:
@@ -27758,10 +28951,10 @@
 }
 js_free(ctx, fd->args);
 
- for(i = 0; i < fd->hoisted_def_count; i++) {
- JS_FreeAtom(ctx, fd->hoisted_def[i].var_name);
+ for(i = 0; i < fd->global_var_count; i++) {
+ JS_FreeAtom(ctx, fd->global_vars[i].var_name);
 }
- js_free(ctx, fd->hoisted_def);
+ js_free(ctx, fd->global_vars);
 
 for(i = 0; i < fd->closure_var_count; i++) {
 JSClosureVar *cv = &fd->closure_var[i];
@@ -28214,20 +29407,10 @@
 return -1;
 }
 
- if (s->closure_var_count >= s->closure_var_size) {
- JSClosureVar *new_tab;
- int new_size;
- size_t slack;
- new_size = max_int(s->closure_var_count + 1,
- s->closure_var_size * 3 / 2);
- new_tab = js_realloc2(ctx, s->closure_var,
- new_size * sizeof(JSClosureVar), &slack);
- if (!new_tab)
- return -1;
- new_size += slack / sizeof(*new_tab);
- s->closure_var = new_tab;
- s->closure_var_size = new_size;
- }
+ if (js_resize_array(ctx, (void **)&s->closure_var,
+ sizeof(s->closure_var[0]),
+ &s->closure_var_size, s->closure_var_count + 1))
+ return -1;
 cv = &s->closure_var[s->closure_var_count++];
 cv->is_local = is_local;
 cv->is_arg = is_arg;
@@ -28305,7 +29488,7 @@
 return (bc_buf[pos + 1] == OP_put_ref_value &&
 (opcode == OP_insert3 ||
 opcode == OP_perm4 ||
- //opcode == OP_nop ||
+ opcode == OP_nop ||
 opcode == OP_rot3l));
 }
 
@@ -28315,7 +29498,7 @@
 return (bc_buf[pos + 1] == OP_put_ref_value &&
 (opcode == OP_insert3 ||
 opcode == OP_perm4 ||
- //opcode == OP_nop ||
+ opcode == OP_nop ||
 opcode == OP_rot3l));
 }
 
@@ -28397,20 +29580,22 @@
 end_pos = label_pos + 2;
 op = bc_buf[label_pos];
 if (is_strict) {
- switch(op) {
- case OP_insert3:
- op = OP_insert2;
- break;
- case OP_perm4:
- op = OP_perm3;
- break;
- case OP_rot3l:
- op = OP_swap;
- break;
- default:
- abort();
+ if (op != OP_nop) {
+ switch(op) {
+ case OP_insert3:
+ op = OP_insert2;
+ break;
+ case OP_perm4:
+ op = OP_perm3;
+ break;
+ case OP_rot3l:
+ op = OP_swap;
+ break;
+ default:
+ abort();
+ }
+ bc_buf[pos++] = op;
 }
- bc_buf[pos++] = op;
 } else {
 if (op == OP_insert3)
 bc_buf[pos++] = OP_dup;
@@ -28453,19 +29638,27 @@
 switch(var_name) {
 case JS_ATOM_home_object:
 /* 'home_object' pseudo variable */
- var_idx = s->home_object_var_idx = add_var(ctx, s, var_name);
+ if (s->home_object_var_idx < 0)
+ s->home_object_var_idx = add_var(ctx, s, var_name);
+ var_idx = s->home_object_var_idx;
 break;
 case JS_ATOM_this_active_func:
 /* 'this.active_func' pseudo variable */
- var_idx = s->this_active_func_var_idx = add_var(ctx, s, var_name);
+ if (s->this_active_func_var_idx < 0)
+ s->this_active_func_var_idx = add_var(ctx, s, var_name);
+ var_idx = s->this_active_func_var_idx;
 break;
 case JS_ATOM_new_target:
 /* 'new.target' pseudo variable */
- var_idx = s->new_target_var_idx = add_var(ctx, s, var_name);
+ if (s->new_target_var_idx < 0)
+ s->new_target_var_idx = add_var(ctx, s, var_name);
+ var_idx = s->new_target_var_idx;
 break;
 case JS_ATOM_this:
 /* 'this' pseudo variable */
- var_idx = s->this_var_idx = add_var_this(ctx, s);
+ if (s->this_var_idx < 0)
+ s->this_var_idx = add_var_this(ctx, s);
+ var_idx = s->this_var_idx;
 break;
 default:
 var_idx = -1;
@@ -28474,18 +29667,32 @@
 return var_idx;
 }
 
+/* test if 'var_name' is in the variable object on the stack. If is it
+ the case, handle it and jump to 'label_done' */
+static void var_object_test(JSContext *ctx, JSFunctionDef *s,
+ JSAtom var_name, int op, DynBuf *bc,
+ int *plabel_done, BOOL is_with)
+{
+ dbuf_putc(bc, get_with_scope_opcode(op));
+ dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+ *plabel_done = new_label_fd(s, *plabel_done);
+ dbuf_put_u32(bc, *plabel_done);
+ dbuf_putc(bc, is_with);
+ update_label(s, *plabel_done, 1);
+ s->jump_size++;
+}
+ 
 /* return the position of the next opcode */
 static int resolve_scope_var(JSContext *ctx, JSFunctionDef *s,
 JSAtom var_name, int scope_level, int op,
 DynBuf *bc, uint8_t *bc_buf,
- LabelSlot *ls, int pos_next, int arg_valid)
+ LabelSlot *ls, int pos_next)
 {
 int idx, var_idx, is_put;
 int label_done;
- BOOL is_func_var = FALSE;
 JSFunctionDef *fd;
 JSVarDef *vd;
- BOOL is_pseudo_var;
+ BOOL is_pseudo_var, is_arg_scope;
 
 label_done = -1;
 
@@ -28503,12 +29710,11 @@
 if (vd->var_name == var_name) {
 if (op == OP_scope_put_var || op == OP_scope_make_ref) {
 if (vd->is_const) {
- dbuf_putc(bc, OP_throw_var);
+ dbuf_putc(bc, OP_throw_error);
 dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
 dbuf_putc(bc, JS_THROW_VAR_RO);
 goto done;
 }
- is_func_var = vd->is_func_var;
 }
 var_idx = idx;
 break;
@@ -28516,33 +29722,16 @@
 if (vd->var_name == JS_ATOM__with_ && !is_pseudo_var) {
 dbuf_putc(bc, OP_get_loc);
 dbuf_put_u16(bc, idx);
- dbuf_putc(bc, get_with_scope_opcode(op));
- dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
- label_done = new_label_fd(s, label_done);
- dbuf_put_u32(bc, label_done);
- dbuf_putc(bc, 1);
- update_label(s, label_done, 1);
- s->jump_size++;
+ var_object_test(ctx, s, var_name, op, bc, &label_done, 1);
 }
 idx = vd->scope_next;
 }
+ is_arg_scope = (idx == ARG_SCOPE_END);
 if (var_idx < 0) {
- /* XXX: scoping issues:
- should not resolve vars from the function body during argument parse,
- `arguments` and function-name should not be hidden by later vars.
- */
- var_idx = find_var(ctx, s, var_name);
- if (var_idx >= 0) {
- if (scope_level == 0
- && (var_idx & ARGUMENT_VAR_OFFSET)
- && (var_idx - ARGUMENT_VAR_OFFSET) >= arg_valid) {
- /* referring to an uninitialized argument */
- dbuf_putc(bc, OP_throw_var);
- dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
- dbuf_putc(bc, JS_THROW_VAR_UNINITIALIZED);
- }
- if (!(var_idx & ARGUMENT_VAR_OFFSET))
- is_func_var = s->vars[var_idx].is_func_var;
+ /* argument scope: variables are not visible but pseudo
+ variables are visible */
+ if (!is_arg_scope) {
+ var_idx = find_var(ctx, s, var_name);
 }
 
 if (var_idx < 0 && is_pseudo_var)
@@ -28551,21 +29740,31 @@
 if (var_idx < 0 && var_name == JS_ATOM_arguments &&
 s->has_arguments_binding) {
 /* 'arguments' pseudo variable */
- var_idx = add_arguments_var(ctx, s, var_name);
+ var_idx = add_arguments_var(ctx, s);
 }
 if (var_idx < 0 && s->is_func_expr && var_name == s->func_name) {
 /* add a new variable with the function name */
 var_idx = add_func_var(ctx, s, var_name);
- is_func_var = TRUE;
 }
 }
 if (var_idx >= 0) {
+ if ((op == OP_scope_put_var || op == OP_scope_make_ref) &&
+ !(var_idx & ARGUMENT_VAR_OFFSET) &&
+ s->vars[var_idx].is_const) {
+ /* only happens when assigning a function expression name
+ in strict mode */
+ dbuf_putc(bc, OP_throw_error);
+ dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+ dbuf_putc(bc, JS_THROW_VAR_RO);
+ goto done;
+ }
 /* OP_scope_put_var_init is only used to initialize a
 lexical variable, so it is never used in a with or var object. It
 can be used with a closure (module global variable case). */
 switch (op) {
 case OP_scope_make_ref:
- if (is_func_var) {
+ if (!(var_idx & ARGUMENT_VAR_OFFSET) &&
+ s->vars[var_idx].var_kind == JS_VAR_FUNCTION_NAME) {
 /* Create a dummy object reference for the func_var */
 dbuf_putc(bc, OP_object);
 dbuf_putc(bc, OP_get_loc);
@@ -28613,7 +29812,6 @@
 if (var_idx & ARGUMENT_VAR_OFFSET) {
 dbuf_putc(bc, OP_get_arg + is_put);
 dbuf_put_u16(bc, var_idx - ARGUMENT_VAR_OFFSET);
- /* XXX: should test if argument reference needs TDZ check */
 } else {
 if (is_put) {
 if (s->vars[var_idx].is_lexical) {
@@ -28646,41 +29844,32 @@
 goto done;
 }
 /* check eval object */
- if (s->var_object_idx >= 0 && !is_pseudo_var) {
+ if (!is_arg_scope && s->var_object_idx >= 0 && !is_pseudo_var) {
 dbuf_putc(bc, OP_get_loc);
 dbuf_put_u16(bc, s->var_object_idx);
- dbuf_putc(bc, get_with_scope_opcode(op));
- dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
- label_done = new_label_fd(s, label_done);
- dbuf_put_u32(bc, label_done);
- dbuf_putc(bc, 0);
- update_label(s, label_done, 1);
- s->jump_size++;
+ var_object_test(ctx, s, var_name, op, bc, &label_done, 0);
+ }
+ /* check eval object in argument scope */
+ if (s->arg_var_object_idx >= 0 && !is_pseudo_var) {
+ dbuf_putc(bc, OP_get_loc);
+ dbuf_put_u16(bc, s->arg_var_object_idx);
+ var_object_test(ctx, s, var_name, op, bc, &label_done, 0);
 }
+
 /* check parent scopes */
 for (fd = s; fd->parent;) {
 scope_level = fd->parent_scope_level;
 fd = fd->parent;
- if (scope_level == 0) {
- /* function is defined as part of the argument parsing: hide vars
- from the function body.
- XXX: variables created from argument destructuring might need
- to be visible, should refine this method.
- */
- var_idx = find_arg(ctx, fd, var_name);
- goto check_idx;
- }
 for (idx = fd->scopes[scope_level].first; idx >= 0;) {
 vd = &fd->vars[idx];
 if (vd->var_name == var_name) {
 if (op == OP_scope_put_var || op == OP_scope_make_ref) {
 if (vd->is_const) {
- dbuf_putc(bc, OP_throw_var);
+ dbuf_putc(bc, OP_throw_error);
 dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
 dbuf_putc(bc, JS_THROW_VAR_RO);
 goto done;
 }
- is_func_var = vd->is_func_var;
 }
 var_idx = idx;
 break;
@@ -28690,26 +29879,19 @@
 if (idx >= 0) {
 dbuf_putc(bc, OP_get_var_ref);
 dbuf_put_u16(bc, idx);
- dbuf_putc(bc, get_with_scope_opcode(op));
- dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
- label_done = new_label_fd(s, label_done);
- dbuf_put_u32(bc, label_done);
- dbuf_putc(bc, 1);
- update_label(s, label_done, 1);
- s->jump_size++;
+ var_object_test(ctx, s, var_name, op, bc, &label_done, 1);
 }
 }
 idx = vd->scope_next;
 }
+ is_arg_scope = (idx == ARG_SCOPE_END);
 if (var_idx >= 0)
 break;
-
- var_idx = find_var(ctx, fd, var_name);
- check_idx:
- if (var_idx >= 0) {
- if (!(var_idx & ARGUMENT_VAR_OFFSET))
- is_func_var = fd->vars[var_idx].is_func_var;
- break;
+ 
+ if (!is_arg_scope) {
+ var_idx = find_var(ctx, fd, var_name);
+ if (var_idx >= 0)
+ break;
 }
 if (is_pseudo_var) {
 var_idx = resolve_pseudo_var(ctx, fd, var_name);
@@ -28717,33 +29899,39 @@
 break;
 }
 if (var_name == JS_ATOM_arguments && fd->has_arguments_binding) {
- var_idx = add_arguments_var(ctx, fd, var_name);
+ var_idx = add_arguments_var(ctx, fd);
 break;
 }
 if (fd->is_func_expr && fd->func_name == var_name) {
 /* add a new variable with the function name */
 var_idx = add_func_var(ctx, fd, var_name);
- is_func_var = TRUE;
 break;
 }
 
 /* check eval object */
- if (fd->var_object_idx >= 0 && !is_pseudo_var) {
- fd->vars[fd->var_object_idx].is_captured = 1;
+ if (!is_arg_scope && fd->var_object_idx >= 0 && !is_pseudo_var) {
+ vd = &fd->vars[fd->var_object_idx];
+ vd->is_captured = 1;
 idx = get_closure_var(ctx, s, fd, FALSE,
- fd->var_object_idx, JS_ATOM__var_,
+ fd->var_object_idx, vd->var_name,
 FALSE, FALSE, JS_VAR_NORMAL);
 dbuf_putc(bc, OP_get_var_ref);
 dbuf_put_u16(bc, idx);
- dbuf_putc(bc, get_with_scope_opcode(op));
- dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
- label_done = new_label_fd(s, label_done);
- dbuf_put_u32(bc, label_done);
- dbuf_putc(bc, 0);
- update_label(s, label_done, 1);
- s->jump_size++;
+ var_object_test(ctx, s, var_name, op, bc, &label_done, 0);
 }
 
+ /* check eval object in argument scope */
+ if (fd->arg_var_object_idx >= 0 && !is_pseudo_var) {
+ vd = &fd->vars[fd->arg_var_object_idx];
+ vd->is_captured = 1;
+ idx = get_closure_var(ctx, s, fd, FALSE,
+ fd->arg_var_object_idx, vd->var_name,
+ FALSE, FALSE, JS_VAR_NORMAL);
+ dbuf_putc(bc, OP_get_var_ref);
+ dbuf_put_u16(bc, idx);
+ var_object_test(ctx, s, var_name, op, bc, &label_done, 0);
+ }
+ 
 if (fd->is_eval)
 break; /* it it necessarily the top level function */
 }
@@ -28768,6 +29956,7 @@
 }
 goto has_idx;
 } else if ((cv->var_name == JS_ATOM__var_ ||
+ cv->var_name == JS_ATOM__arg_var_ ||
 cv->var_name == JS_ATOM__with_) && !is_pseudo_var) {
 int is_with = (cv->var_name == JS_ATOM__with_);
 if (fd != s) {
@@ -28781,13 +29970,7 @@
 }
 dbuf_putc(bc, OP_get_var_ref);
 dbuf_put_u16(bc, idx);
- dbuf_putc(bc, get_with_scope_opcode(op));
- dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
- label_done = new_label_fd(s, label_done);
- dbuf_put_u32(bc, label_done);
- dbuf_putc(bc, is_with);
- update_label(s, label_done, 1);
- s->jump_size++;
+ var_object_test(ctx, s, var_name, op, bc, &label_done, is_with);
 }
 }
 }
@@ -28812,14 +29995,14 @@
 has_idx:
 if ((op == OP_scope_put_var || op == OP_scope_make_ref) &&
 s->closure_var[idx].is_const) {
- dbuf_putc(bc, OP_throw_var);
+ dbuf_putc(bc, OP_throw_error);
 dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
 dbuf_putc(bc, JS_THROW_VAR_RO);
 goto done;
 }
 switch (op) {
 case OP_scope_make_ref:
- if (is_func_var) {
+ if (s->closure_var[idx].var_kind == JS_VAR_FUNCTION_NAME) {
 /* Create a dummy object reference for the func_var */
 dbuf_putc(bc, OP_object);
 dbuf_putc(bc, OP_get_var_ref);
@@ -28951,7 +30134,7 @@
 {
 /* if the field is not initialized, the error is catched when
 accessing it */
- if (is_ref)
+ if (is_ref) 
 dbuf_putc(bc, OP_get_var_ref);
 else
 dbuf_putc(bc, OP_get_loc);
@@ -28966,7 +30149,7 @@
 int idx, var_kind;
 JSFunctionDef *fd;
 BOOL is_ref;
-
+ 
 fd = s;
 is_ref = FALSE;
 for(;;) {
@@ -28983,8 +30166,6 @@
 }
 scope_level = fd->parent_scope_level;
 if (!fd->parent) {
- char buf[ATOM_GET_STR_BUF_SIZE];
-
 if (fd->is_eval) {
 /* closure of the eval function (top level) */
 for (idx = 0; idx < fd->closure_var_count; idx++) {
@@ -29007,8 +30188,8 @@
 }
 }
 /* XXX: no line number info */
- JS_ThrowSyntaxError(ctx, "undefined private field %s",
- JS_AtomGetStr(ctx, buf, sizeof(buf), var_name));
+ JS_ThrowSyntaxErrorAtom(ctx, "undefined private field '%s'",
+ var_name);
 return -1;
 } else {
 fd = fd->parent;
@@ -29061,7 +30242,7 @@
 break;
 case JS_VAR_PRIVATE_SETTER:
 /* XXX: add clearer error message */
- dbuf_putc(bc, OP_throw_var);
+ dbuf_putc(bc, OP_throw_error);
 dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
 dbuf_putc(bc, JS_THROW_VAR_RO);
 break;
@@ -29078,7 +30259,7 @@
 case JS_VAR_PRIVATE_METHOD:
 case JS_VAR_PRIVATE_GETTER:
 /* XXX: add clearer error message */
- dbuf_putc(bc, OP_throw_var);
+ dbuf_putc(bc, OP_throw_error);
 dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
 dbuf_putc(bc, JS_THROW_VAR_RO);
 break;
@@ -29130,17 +30311,33 @@
 }
 }
 
+/* XXX: should handle the argument scope generically */
+static BOOL is_var_in_arg_scope(const JSVarDef *vd)
+{
+ return (vd->var_name == JS_ATOM_home_object ||
+ vd->var_name == JS_ATOM_this_active_func ||
+ vd->var_name == JS_ATOM_new_target ||
+ vd->var_name == JS_ATOM_this ||
+ vd->var_name == JS_ATOM__arg_var_ ||
+ vd->var_kind == JS_VAR_FUNCTION_NAME);
+}
+
 static void add_eval_variables(JSContext *ctx, JSFunctionDef *s)
 {
 JSFunctionDef *fd;
 JSVarDef *vd;
 int i, scope_level, scope_idx;
- BOOL has_arguments_binding, has_this_binding;
+ BOOL has_arguments_binding, has_this_binding, is_arg_scope;
 
 /* in non strict mode, variables are created in the caller's
 environment object */
 if (!s->is_eval && !(s->js_mode & JS_MODE_STRICT)) {
 s->var_object_idx = add_var(ctx, s, JS_ATOM__var_);
+ if (s->has_parameter_expressions) {
+ /* an additional variable object is needed for the
+ argument scope */
+ s->arg_var_object_idx = add_var(ctx, s, JS_ATOM__arg_var_);
+ }
 }
 
 /* eval can potentially use 'arguments' so we must define it */
@@ -29156,8 +30353,14 @@
 s->home_object_var_idx = add_var(ctx, s, JS_ATOM_home_object);
 }
 has_arguments_binding = s->has_arguments_binding;
- if (has_arguments_binding)
- add_arguments_var(ctx, s, JS_ATOM_arguments);
+ if (has_arguments_binding) {
+ add_arguments_var(ctx, s);
+ /* also add an arguments binding in the argument scope to
+ raise an error if a direct eval in the argument scope tries
+ to redefine it */
+ if (s->has_parameter_expressions && !(s->js_mode & JS_MODE_STRICT))
+ add_arguments_arg(ctx, s);
+ }
 if (s->is_func_expr && s->func_name != JS_ATOM_NULL)
 add_func_var(ctx, s, s->func_name);
 
@@ -29174,7 +30377,6 @@
 fd = fd->parent;
 if (!fd)
 break;
- scope_idx = fd->scopes[scope_level].first;
 /* add 'this' if it was not previously added */
 if (!has_this_binding && fd->has_this_binding) {
 if (fd->this_var_idx < 0)
@@ -29189,7 +30391,7 @@
 }
 /* add 'arguments' if it was not previously added */
 if (!has_arguments_binding && fd->has_arguments_binding) {
- add_arguments_var(ctx, fd, JS_ATOM_arguments);
+ add_arguments_var(ctx, fd);
 has_arguments_binding = TRUE;
 }
 /* add function name */
@@ -29197,6 +30399,7 @@
 add_func_var(ctx, fd, fd->func_name);
 
 /* add lexical variables */
+ scope_idx = fd->scopes[scope_level].first;
 while (scope_idx >= 0) {
 vd = &fd->vars[scope_idx];
 vd->is_captured = 1;
@@ -29204,24 +30407,37 @@
 vd->var_name, vd->is_const, vd->is_lexical, vd->var_kind);
 scope_idx = vd->scope_next;
 }
- /* add unscoped variables */
- for(i = 0; i < fd->arg_count; i++) {
- vd = &fd->args[i];
- if (vd->var_name != JS_ATOM_NULL) {
- get_closure_var(ctx, s, fd,
- TRUE, i, vd->var_name, FALSE, FALSE,
- JS_VAR_NORMAL);
- }
- }
- for(i = 0; i < fd->var_count; i++) {
- vd = &fd->vars[i];
- /* do not close top level last result */
- if (vd->scope_level == 0 &&
- vd->var_name != JS_ATOM__ret_ &&
- vd->var_name != JS_ATOM_NULL) {
- get_closure_var(ctx, s, fd,
- FALSE, i, vd->var_name, FALSE, FALSE,
- JS_VAR_NORMAL);
+ is_arg_scope = (scope_idx == ARG_SCOPE_END);
+ if (!is_arg_scope) {
+ /* add unscoped variables */
+ for(i = 0; i < fd->arg_count; i++) {
+ vd = &fd->args[i];
+ if (vd->var_name != JS_ATOM_NULL) {
+ get_closure_var(ctx, s, fd,
+ TRUE, i, vd->var_name, FALSE, FALSE,
+ JS_VAR_NORMAL);
+ }
+ }
+ for(i = 0; i < fd->var_count; i++) {
+ vd = &fd->vars[i];
+ /* do not close top level last result */
+ if (vd->scope_level == 0 &&
+ vd->var_name != JS_ATOM__ret_ &&
+ vd->var_name != JS_ATOM_NULL) {
+ get_closure_var(ctx, s, fd,
+ FALSE, i, vd->var_name, FALSE, FALSE,
+ JS_VAR_NORMAL);
+ }
+ }
+ } else {
+ for(i = 0; i < fd->var_count; i++) {
+ vd = &fd->vars[i];
+ /* do not close top level last result */
+ if (vd->scope_level == 0 && is_var_in_arg_scope(vd)) {
+ get_closure_var(ctx, s, fd,
+ FALSE, i, vd->var_name, FALSE, FALSE,
+ JS_VAR_NORMAL);
+ }
 }
 }
 if (fd->is_eval) {
@@ -29239,6 +30455,18 @@
 }
 }
 
+static void set_closure_from_var(JSContext *ctx, JSClosureVar *cv,
+ JSVarDef *vd, int var_idx)
+{
+ cv->is_local = TRUE;
+ cv->is_arg = FALSE;
+ cv->is_const = vd->is_const;
+ cv->is_lexical = vd->is_lexical;
+ cv->var_kind = vd->var_kind;
+ cv->var_idx = var_idx;
+ cv->var_name = JS_DupAtom(ctx, vd->var_name);
+}
+
 /* for direct eval compilation: add references to the variables of the
 calling function */
 static __exception int add_closure_variables(JSContext *ctx, JSFunctionDef *s,
@@ -29246,7 +30474,8 @@
 {
 int i, count;
 JSVarDef *vd;
-
+ BOOL is_arg_scope;
+ 
 count = b->arg_count + b->var_count + b->closure_var_count;
 s->closure_var = NULL;
 s->closure_var_count = 0;
@@ -29261,41 +30490,41 @@
 vd = &b->vardefs[b->arg_count + i];
 if (vd->scope_level > 0) {
 JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
- cv->is_local = TRUE;
- cv->is_arg = FALSE;
- cv->is_const = vd->is_const;
- cv->is_lexical = vd->is_lexical;
- cv->var_kind = vd->var_kind;
- cv->var_idx = i;
- cv->var_name = JS_DupAtom(ctx, vd->var_name);
+ set_closure_from_var(ctx, cv, vd, i);
 }
 i = vd->scope_next;
 }
- /* Add argument variables */
- for(i = 0; i < b->arg_count; i++) {
- JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
- vd = &b->vardefs[i];
- cv->is_local = TRUE;
- cv->is_arg = TRUE;
- cv->is_const = FALSE;
- cv->is_lexical = FALSE;
- cv->var_kind = JS_VAR_NORMAL;
- cv->var_idx = i;
- cv->var_name = JS_DupAtom(ctx, vd->var_name);
- }
- /* Add local non lexical variables */
- for(i = 0; i < b->var_count; i++) {
- vd = &b->vardefs[b->arg_count + i];
- if (vd->scope_level == 0 && vd->var_name != JS_ATOM__ret_) {
+ is_arg_scope = (i == ARG_SCOPE_END);
+ if (!is_arg_scope) {
+ /* Add argument variables */
+ for(i = 0; i < b->arg_count; i++) {
 JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
+ vd = &b->vardefs[i];
 cv->is_local = TRUE;
- cv->is_arg = FALSE;
+ cv->is_arg = TRUE;
 cv->is_const = FALSE;
 cv->is_lexical = FALSE;
 cv->var_kind = JS_VAR_NORMAL;
 cv->var_idx = i;
 cv->var_name = JS_DupAtom(ctx, vd->var_name);
 }
+ /* Add local non lexical variables */
+ for(i = 0; i < b->var_count; i++) {
+ vd = &b->vardefs[b->arg_count + i];
+ if (vd->scope_level == 0 && vd->var_name != JS_ATOM__ret_) {
+ JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
+ set_closure_from_var(ctx, cv, vd, i);
+ }
+ }
+ } else {
+ /* only add pseudo variables */
+ for(i = 0; i < b->var_count; i++) {
+ vd = &b->vardefs[b->arg_count + i];
+ if (vd->scope_level == 0 && is_var_in_arg_scope(vd)) {
+ JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
+ set_closure_from_var(ctx, cv, vd, i);
+ }
+ }
 }
 for(i = 0; i < b->closure_var_count; i++) {
 JSClosureVar *cv0 = &b->closure_var[i];
@@ -29323,9 +30552,9 @@
 JSAtom atom;
 } CodeContext;
 
-#define M2(op1, op2) ((op1) | ((op2) << 8))
-#define M3(op1, op2, op3) ((op1) | ((op2) << 8) | ((op3) << 16))
-#define M4(op1, op2, op3, op4) ((op1) | ((op2) << 8) | ((op3) << 16) | ((op4) << 24))
+#define M2(op1, op2) ((op1) | (((uint32_t) op2) << 8))
+#define M3(op1, op2, op3) ((op1) | (((uint32_t) op2) << 8) | (((uint32_t) op3) << 16))
+#define M4(op1, op2, op3, op4) ((op1) | (((uint32_t) op2) << 8) | (((uint32_t) op3) << 16) | (((uint32_t) op4) << 24))
 
 static BOOL code_match(CodeContext *s, int pos, ...)
 {
@@ -29453,59 +30682,93 @@
 
 static void instantiate_hoisted_definitions(JSContext *ctx, JSFunctionDef *s, DynBuf *bc)
 {
- int i, idx, var_idx;
+ int i, idx, label_next = -1;
 
- /* add the hoisted functions and variables */
- for(i = 0; i < s->hoisted_def_count; i++) {
- JSHoistedDef *hf = &s->hoisted_def[i];
+ /* add the hoisted functions in arguments and local variables */
+ for(i = 0; i < s->arg_count; i++) {
+ JSVarDef *vd = &s->args[i];
+ if (vd->func_pool_idx >= 0) {
+ dbuf_putc(bc, OP_fclosure);
+ dbuf_put_u32(bc, vd->func_pool_idx);
+ dbuf_putc(bc, OP_put_arg);
+ dbuf_put_u16(bc, i);
+ }
+ }
+ for(i = 0; i < s->var_count; i++) {
+ JSVarDef *vd = &s->vars[i];
+ if (vd->scope_level == 0 && vd->func_pool_idx >= 0) {
+ dbuf_putc(bc, OP_fclosure);
+ dbuf_put_u32(bc, vd->func_pool_idx);
+ dbuf_putc(bc, OP_put_loc);
+ dbuf_put_u16(bc, i);
+ }
+ }
+
+ /* the module global variables must be initialized before
+ evaluating the module so that the exported functions are
+ visible if there are cyclic module references */
+ if (s->module) {
+ label_next = new_label_fd(s, -1);
+ 
+ /* if 'this' is true, initialize the global variables and return */
+ dbuf_putc(bc, OP_push_this);
+ dbuf_putc(bc, OP_if_false);
+ dbuf_put_u32(bc, label_next);
+ update_label(s, label_next, 1);
+ s->jump_size++;
+ }
+ 
+ /* add the global variables (only happens if s->is_global_var is
+ true) */
+ for(i = 0; i < s->global_var_count; i++) {
+ JSGlobalVar *hf = &s->global_vars[i];
 int has_closure = 0;
 BOOL force_init = hf->force_init;
- if (s->is_global_var && hf->var_name != JS_ATOM_NULL) {
- /* we are in an eval, so the closure contains all the
- enclosing variables */
- /* If the outer function has a variable environment,
- create a property for the variable there */
- for(idx = 0; idx < s->closure_var_count; idx++) {
- JSClosureVar *cv = &s->closure_var[idx];
- if (cv->var_name == hf->var_name) {
- has_closure = 2;
- force_init = FALSE;
- break;
- }
- if (cv->var_name == JS_ATOM__var_) {
- dbuf_putc(bc, OP_get_var_ref);
- dbuf_put_u16(bc, idx);
- has_closure = 1;
- force_init = TRUE;
- break;
- }
+ /* we are in an eval, so the closure contains all the
+ enclosing variables */
+ /* If the outer function has a variable environment,
+ create a property for the variable there */
+ for(idx = 0; idx < s->closure_var_count; idx++) {
+ JSClosureVar *cv = &s->closure_var[idx];
+ if (cv->var_name == hf->var_name) {
+ has_closure = 2;
+ force_init = FALSE;
+ break;
 }
- if (!has_closure) {
- int flags;
-
- flags = 0;
- if (s->eval_type != JS_EVAL_TYPE_GLOBAL)
- flags |= JS_PROP_CONFIGURABLE;
- if (hf->cpool_idx >= 0 && !hf->is_lexical) {
- /* global function definitions need a specific handling */
- dbuf_putc(bc, OP_fclosure);
- dbuf_put_u32(bc, hf->cpool_idx);
-
- dbuf_putc(bc, OP_define_func);
- dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
- dbuf_putc(bc, flags);
-
- goto done_hoisted_def;
- } else {
- if (hf->is_lexical) {
- flags |= DEFINE_GLOBAL_LEX_VAR;
- if (!hf->is_const)
- flags |= JS_PROP_WRITABLE;
- }
- dbuf_putc(bc, OP_define_var);
- dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
- dbuf_putc(bc, flags);
+ if (cv->var_name == JS_ATOM__var_ ||
+ cv->var_name == JS_ATOM__arg_var_) {
+ dbuf_putc(bc, OP_get_var_ref);
+ dbuf_put_u16(bc, idx);
+ has_closure = 1;
+ force_init = TRUE;
+ break;
+ }
+ }
+ if (!has_closure) {
+ int flags;
+ 
+ flags = 0;
+ if (s->eval_type != JS_EVAL_TYPE_GLOBAL)
+ flags |= JS_PROP_CONFIGURABLE;
+ if (hf->cpool_idx >= 0 && !hf->is_lexical) {
+ /* global function definitions need a specific handling */
+ dbuf_putc(bc, OP_fclosure);
+ dbuf_put_u32(bc, hf->cpool_idx);
+ 
+ dbuf_putc(bc, OP_define_func);
+ dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
+ dbuf_putc(bc, flags);
+ 
+ goto done_global_var;
+ } else {
+ if (hf->is_lexical) {
+ flags |= DEFINE_GLOBAL_LEX_VAR;
+ if (!hf->is_const)
+ flags |= JS_PROP_WRITABLE;
 }
+ dbuf_putc(bc, OP_define_var);
+ dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
+ dbuf_putc(bc, flags);
 }
 }
 if (hf->cpool_idx >= 0 || force_init) {
@@ -29520,37 +30783,35 @@
 } else {
 dbuf_putc(bc, OP_undefined);
 }
- if (s->is_global_var) {
- if (has_closure == 2) {
- dbuf_putc(bc, OP_put_var_ref);
- dbuf_put_u16(bc, idx);
- } else if (has_closure == 1) {
- dbuf_putc(bc, OP_define_field);
- dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
- dbuf_putc(bc, OP_drop);
- } else {
- /* XXX: Check if variable is writable and enumerable */
- dbuf_putc(bc, OP_put_var);
- dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
- }
+ if (has_closure == 2) {
+ dbuf_putc(bc, OP_put_var_ref);
+ dbuf_put_u16(bc, idx);
+ } else if (has_closure == 1) {
+ dbuf_putc(bc, OP_define_field);
+ dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
+ dbuf_putc(bc, OP_drop);
 } else {
- var_idx = hf->var_idx;
- if (var_idx & ARGUMENT_VAR_OFFSET) {
- dbuf_putc(bc, OP_put_arg);
- dbuf_put_u16(bc, var_idx - ARGUMENT_VAR_OFFSET);
- } else {
- dbuf_putc(bc, OP_put_loc);
- dbuf_put_u16(bc, var_idx);
- }
+ /* XXX: Check if variable is writable and enumerable */
+ dbuf_putc(bc, OP_put_var);
+ dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
 }
 }
- done_hoisted_def:
+ done_global_var:
 JS_FreeAtom(ctx, hf->var_name);
 }
- js_free(ctx, s->hoisted_def);
- s->hoisted_def = NULL;
- s->hoisted_def_count = 0;
- s->hoisted_def_size = 0;
+
+ if (s->module) {
+ dbuf_putc(bc, OP_return_undef);
+ 
+ dbuf_putc(bc, OP_label);
+ dbuf_put_u32(bc, label_next);
+ s->label_slots[label_next].pos2 = bc->size;
+ }
+
+ js_free(ctx, s->global_vars);
+ s->global_vars = NULL;
+ s->global_var_count = 0;
+ s->global_var_size = 0;
 }
 
 static int skip_dead_code(JSFunctionDef *s, const uint8_t *bc_buf, int bc_len,
@@ -29630,7 +30891,7 @@
 variables when necessary */
 static __exception int resolve_variables(JSContext *ctx, JSFunctionDef *s)
 {
- int pos, pos_next, bc_len, op, len, i, idx, arg_valid, line_num;
+ int pos, pos_next, bc_len, op, len, i, idx, line_num;
 uint8_t *bc_buf;
 JSAtom var_name;
 DynBuf bc_out;
@@ -29643,47 +30904,43 @@
 
 /* first pass for runtime checks (must be done before the
 variables are created) */
- if (s->is_global_var) {
- for(i = 0; i < s->hoisted_def_count; i++) {
- JSHoistedDef *hf = &s->hoisted_def[i];
- int flags;
-
- if (hf->var_name != JS_ATOM_NULL) {
- /* check if global variable (XXX: simplify) */
- for(idx = 0; idx < s->closure_var_count; idx++) {
- JSClosureVar *cv = &s->closure_var[idx];
- if (cv->var_name == hf->var_name) {
- if (s->eval_type == JS_EVAL_TYPE_DIRECT &&
- cv->is_lexical) {
- /* Check if a lexical variable is
- redefined as 'var'. XXX: Could abort
- compilation here, but for consistency
- with the other checks, we delay the
- error generation. */
- dbuf_putc(&bc_out, OP_throw_var);
- dbuf_put_u32(&bc_out, JS_DupAtom(ctx, hf->var_name));
- dbuf_putc(&bc_out, JS_THROW_VAR_REDECL);
- }
- goto next;
- }
- if (cv->var_name == JS_ATOM__var_)
- goto next;
+ for(i = 0; i < s->global_var_count; i++) {
+ JSGlobalVar *hf = &s->global_vars[i];
+ int flags;
+ 
+ /* check if global variable (XXX: simplify) */
+ for(idx = 0; idx < s->closure_var_count; idx++) {
+ JSClosureVar *cv = &s->closure_var[idx];
+ if (cv->var_name == hf->var_name) {
+ if (s->eval_type == JS_EVAL_TYPE_DIRECT &&
+ cv->is_lexical) {
+ /* Check if a lexical variable is
+ redefined as 'var'. XXX: Could abort
+ compilation here, but for consistency
+ with the other checks, we delay the
+ error generation. */
+ dbuf_putc(&bc_out, OP_throw_error);
+ dbuf_put_u32(&bc_out, JS_DupAtom(ctx, hf->var_name));
+ dbuf_putc(&bc_out, JS_THROW_VAR_REDECL);
 }
-
- dbuf_putc(&bc_out, OP_check_define_var);
- dbuf_put_u32(&bc_out, JS_DupAtom(ctx, hf->var_name));
- flags = 0;
- if (hf->is_lexical)
- flags |= DEFINE_GLOBAL_LEX_VAR;
- if (hf->cpool_idx >= 0)
- flags |= DEFINE_GLOBAL_FUNC_VAR;
- dbuf_putc(&bc_out, flags);
+ goto next;
 }
- next: ;
+ if (cv->var_name == JS_ATOM__var_ ||
+ cv->var_name == JS_ATOM__arg_var_)
+ goto next;
 }
+ 
+ dbuf_putc(&bc_out, OP_check_define_var);
+ dbuf_put_u32(&bc_out, JS_DupAtom(ctx, hf->var_name));
+ flags = 0;
+ if (hf->is_lexical)
+ flags |= DEFINE_GLOBAL_LEX_VAR;
+ if (hf->cpool_idx >= 0)
+ flags |= DEFINE_GLOBAL_FUNC_VAR;
+ dbuf_putc(&bc_out, flags);
+ next: ;
 }
 
- arg_valid = 0;
 line_num = 0; /* avoid warning */
 for (pos = 0; pos < bc_len; pos = pos_next) {
 op = bc_buf[pos];
@@ -29695,9 +30952,6 @@
 s->line_number_size++;
 goto no_change;
 
- case OP_set_arg_valid_upto:
- arg_valid = get_u16(bc_buf + pos + 1);
- break;
 case OP_eval: /* convert scope index to adjusted variable index */
 {
 int call_argc = get_u16(bc_buf + pos + 1);
@@ -29723,7 +30977,7 @@
 var_name = get_u32(bc_buf + pos + 1);
 scope = get_u16(bc_buf + pos + 5);
 pos_next = resolve_scope_var(ctx, s, var_name, scope, op, &bc_out,
- NULL, NULL, pos_next, arg_valid);
+ NULL, NULL, pos_next);
 JS_FreeAtom(ctx, var_name);
 break;
 case OP_scope_make_ref:
@@ -29736,7 +30990,7 @@
 ls = &s->label_slots[label];
 ls->ref_count--; /* always remove label reference */
 pos_next = resolve_scope_var(ctx, s, var_name, scope, op, &bc_out,
- bc_buf, ls, pos_next, arg_valid);
+ bc_buf, ls, pos_next);
 JS_FreeAtom(ctx, var_name);
 }
 break;
@@ -29819,7 +31073,7 @@
 case OP_return:
 case OP_return_undef:
 case OP_throw:
- case OP_throw_var:
+ case OP_throw_error:
 case OP_ret:
 if (OPTIMIZE) {
 /* remove dead code */
@@ -29853,25 +31107,27 @@
 {
 int scope_idx, scope = get_u16(bc_buf + pos + 1);
 
- if (scope == 1) {
+ if (scope == s->body_scope) {
 instantiate_hoisted_definitions(ctx, s, &bc_out);
 }
 
 for(scope_idx = s->scopes[scope].first; scope_idx >= 0;) {
 JSVarDef *vd = &s->vars[scope_idx];
 if (vd->scope_level == scope) {
- if (vd->var_kind == JS_VAR_FUNCTION_DECL ||
- vd->var_kind == JS_VAR_NEW_FUNCTION_DECL) {
- /* Initialize lexical variable upon entering scope */
- dbuf_putc(&bc_out, OP_fclosure);
- dbuf_put_u32(&bc_out, vd->func_pool_or_scope_idx);
- dbuf_putc(&bc_out, OP_put_loc);
- dbuf_put_u16(&bc_out, scope_idx);
- } else {
- /* XXX: should check if variable can be used
- before initialization */
- dbuf_putc(&bc_out, OP_set_loc_uninitialized);
- dbuf_put_u16(&bc_out, scope_idx);
+ if (scope_idx != s->arguments_arg_idx) {
+ if (vd->var_kind == JS_VAR_FUNCTION_DECL ||
+ vd->var_kind == JS_VAR_NEW_FUNCTION_DECL) {
+ /* Initialize lexical variable upon entering scope */
+ dbuf_putc(&bc_out, OP_fclosure);
+ dbuf_put_u32(&bc_out, vd->func_pool_idx);
+ dbuf_putc(&bc_out, OP_put_loc);
+ dbuf_put_u16(&bc_out, scope_idx);
+ } else {
+ /* XXX: should check if variable can be used
+ before initialization */
+ dbuf_putc(&bc_out, OP_set_loc_uninitialized);
+ dbuf_put_u16(&bc_out, scope_idx);
+ }
 }
 scope_idx = vd->scope_next;
 } else {
@@ -29954,7 +31210,7 @@
 case OP_set_class_name:
 /* only used during parsing */
 break;
-
+ 
 default:
 no_change:
 dbuf_put(&bc_out, bc_buf + pos, len);
@@ -30274,6 +31530,8 @@
 dbuf_putc(&bc_out, OP_special_object);
 dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_MAPPED_ARGUMENTS);
 }
+ if (s->arguments_arg_idx >= 0)
+ put_short_code(&bc_out, OP_set_loc, s->arguments_arg_idx);
 put_short_code(&bc_out, OP_put_loc, s->arguments_var_idx);
 }
 /* initialize a reference to the current function if needed */
@@ -30288,6 +31546,11 @@
 dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_VAR_OBJECT);
 put_short_code(&bc_out, OP_put_loc, s->var_object_idx);
 }
+ if (s->arg_var_object_idx >= 0) {
+ dbuf_putc(&bc_out, OP_special_object);
+ dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_VAR_OBJECT);
+ put_short_code(&bc_out, OP_put_loc, s->arg_var_object_idx);
+ }
 
 for (pos = 0; pos < bc_len; pos = pos_next) {
 int val;
@@ -30295,20 +31558,6 @@
 len = opcode_info[op].size;
 pos_next = pos + len;
 switch(op) {
- case OP_close_var_object:
- {
- if (s->var_object_idx >= 0) {
- /* close the var object and create a new one */
- add_pc2line_info(s, bc_out.size, line_num);
- dbuf_putc(&bc_out, OP_close_loc);
- dbuf_put_u16(&bc_out, s->var_object_idx);
- dbuf_putc(&bc_out, OP_special_object);
- dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_VAR_OBJECT);
- put_short_code(&bc_out, OP_put_loc, s->var_object_idx);
- }
- }
- break;
-
 case OP_line_num:
 /* line number info (for debug). We put it in a separate
 compressed table to reduce memory usage and get better
@@ -30363,13 +31612,15 @@
 put_short_code(&bc_out, op, argc);
 break;
 }
-// goto no_change;
+#if 0
+ goto no_change;
+#endif
 
 case OP_return:
 case OP_return_undef:
 case OP_return_async:
 case OP_throw:
- case OP_throw_var:
+ case OP_throw_error:
 pos_next = skip_dead_code(s, bc_buf, bc_len, pos_next, &line_num);
 goto no_change;
 
@@ -30933,20 +32184,20 @@
 }
 goto no_change;
 
+#if SHORT_OPCODES
 case OP_typeof:
 if (OPTIMIZE) {
 /* simplify typeof tests */
 if (code_match(&cc, pos_next, OP_push_atom_value, M4(OP_strict_eq, OP_strict_neq, OP_eq, OP_neq), -1)) {
 if (cc.line_num >= 0) line_num = cc.line_num;
 int op1 = (cc.op == OP_strict_eq || cc.op == OP_eq) ? OP_strict_eq : OP_strict_neq;
-#if SHORT_OPCODES
 int op2 = -1;
 switch (cc.atom) {
 case JS_ATOM_undefined:
- op2 = OP_is_undefined;
+ op2 = OP_typeof_is_undefined;
 break;
 case JS_ATOM_function:
- op2 = OP_is_function;
+ op2 = OP_typeof_is_function;
 break;
 }
 if (op2 >= 0) {
@@ -30970,19 +32221,10 @@
 goto has_label;
 }
 }
-#endif
- if (cc.atom == JS_ATOM_undefined) {
- /* transform typeof(s) == "undefined" into s === void 0 */
- add_pc2line_info(s, bc_out.size, line_num);
- dbuf_putc(&bc_out, OP_undefined);
- dbuf_putc(&bc_out, op1);
- JS_FreeAtom(ctx, cc.atom);
- pos_next = cc.pos;
- break;
- }
 }
 }
 goto no_change;
+#endif
 
 default:
 no_change:
@@ -31099,56 +32341,91 @@
 /* compute the maximum stack size needed by the function */
 
 typedef struct StackSizeState {
+ int bc_len;
 int stack_len_max;
 uint16_t *stack_level_tab;
+ int *pc_stack;
+ int pc_stack_len;
+ int pc_stack_size;
 } StackSizeState;
 
-static __exception int compute_stack_size_rec(JSContext *ctx,
- JSFunctionDef *fd,
- StackSizeState *s,
- int pos, int op, int stack_len)
+/* 'op' is only used for error indication */
+static __exception int ss_check(JSContext *ctx, StackSizeState *s,
+ int pos, int op, int stack_len)
 {
- int bc_len, diff, n_pop, pos_next;
- const JSOpCode *oi;
- const uint8_t *bc_buf;
-
+ if ((unsigned)pos >= s->bc_len) {
+ JS_ThrowInternalError(ctx, "bytecode buffer overflow (op=%d, pc=%d)", op, pos);
+ return -1;
+ }
 if (stack_len > s->stack_len_max) {
 s->stack_len_max = stack_len;
- if (s->stack_len_max > JS_STACK_SIZE_MAX)
- goto stack_overflow;
+ if (s->stack_len_max > JS_STACK_SIZE_MAX) {
+ JS_ThrowInternalError(ctx, "stack overflow (op=%d, pc=%d)", op, pos);
+ return -1;
+ }
 }
- bc_buf = fd->byte_code.buf;
- bc_len = fd->byte_code.size;
- for(;;) {
- if ((unsigned)pos >= bc_len)
- goto buf_overflow;
-#if 0
- printf("%5d: %d\n", pos, stack_len);
-#endif
- if (s->stack_level_tab[pos] != 0xffff) {
- /* already explored: check that the stack size is consistent */
- if (s->stack_level_tab[pos] != stack_len) {
- JS_ThrowInternalError(ctx, "unconsistent stack size: %d %d (pc=%d)",
- s->stack_level_tab[pos], stack_len, pos);
- return -1;
- } else {
- return 0;
- }
+ if (s->stack_level_tab[pos] != 0xffff) {
+ /* already explored: check that the stack size is consistent */
+ if (s->stack_level_tab[pos] != stack_len) {
+ JS_ThrowInternalError(ctx, "unconsistent stack size: %d %d (pc=%d)",
+ s->stack_level_tab[pos], stack_len, pos);
+ return -1;
 } else {
- s->stack_level_tab[pos] = stack_len;
+ return 0;
 }
+ }
+
+ /* mark as explored and store the stack size */
+ s->stack_level_tab[pos] = stack_len;
+
+ /* queue the new PC to explore */
+ if (js_resize_array(ctx, (void **)&s->pc_stack, sizeof(s->pc_stack[0]),
+ &s->pc_stack_size, s->pc_stack_len + 1))
+ return -1;
+ s->pc_stack[s->pc_stack_len++] = pos;
+ return 0;
+}
+
+static __exception int compute_stack_size(JSContext *ctx,
+ JSFunctionDef *fd,
+ int *pstack_size)
+{
+ StackSizeState s_s, *s = &s_s;
+ int i, diff, n_pop, pos_next, stack_len, pos, op;
+ const JSOpCode *oi;
+ const uint8_t *bc_buf;
+
+ bc_buf = fd->byte_code.buf;
+ s->bc_len = fd->byte_code.size;
+ /* bc_len > 0 */
+ s->stack_level_tab = js_malloc(ctx, sizeof(s->stack_level_tab[0]) *
+ s->bc_len);
+ if (!s->stack_level_tab)
+ return -1;
+ for(i = 0; i < s->bc_len; i++)
+ s->stack_level_tab[i] = 0xffff;
+ s->stack_len_max = 0;
+ s->pc_stack = NULL;
+ s->pc_stack_len = 0;
+ s->pc_stack_size = 0;
 
+ /* breadth-first graph exploration */
+ if (ss_check(ctx, s, 0, OP_invalid, 0))
+ goto fail;
+
+ while (s->pc_stack_len > 0) {
+ pos = s->pc_stack[--s->pc_stack_len];
+ stack_len = s->stack_level_tab[pos];
 op = bc_buf[pos];
 if (op == 0 || op >= OP_COUNT) {
 JS_ThrowInternalError(ctx, "invalid opcode (op=%d, pc=%d)", op, pos);
- return -1;
+ goto fail;
 }
 oi = &short_opcode_info(op);
 pos_next = pos + oi->size;
- if (pos_next > bc_len) {
- buf_overflow:
+ if (pos_next > s->bc_len) {
 JS_ThrowInternalError(ctx, "bytecode buffer overflow (op=%d, pc=%d)", op, pos);
- return -1;
+ goto fail;
 }
 n_pop = oi->n_pop;
 /* call pops a variable number of arguments */
@@ -31164,13 +32441,15 @@
 
 if (stack_len < n_pop) {
 JS_ThrowInternalError(ctx, "stack underflow (op=%d, pc=%d)", op, pos);
- return -1;
+ goto fail;
 }
 stack_len += oi->n_push - n_pop;
 if (stack_len > s->stack_len_max) {
 s->stack_len_max = stack_len;
- if (s->stack_len_max > JS_STACK_SIZE_MAX)
- goto stack_overflow;
+ if (s->stack_len_max > JS_STACK_SIZE_MAX) {
+ JS_ThrowInternalError(ctx, "stack overflow (op=%d, pc=%d)", op, pos);
+ goto fail;
+ }
 }
 switch(op) {
 case OP_tail_call:
@@ -31179,9 +32458,9 @@
 case OP_return_undef:
 case OP_return_async:
 case OP_throw:
- case OP_throw_var:
+ case OP_throw_error:
 case OP_ret:
- goto done;
+ goto done_insn;
 case OP_goto:
 diff = get_u32(bc_buf + pos + 1);
 pos_next = pos + 1 + diff;
@@ -31198,73 +32477,57 @@
 case OP_if_true8:
 case OP_if_false8:
 diff = (int8_t)bc_buf[pos + 1];
- if (compute_stack_size_rec(ctx, fd, s, pos + 1 + diff, op, stack_len))
- return -1;
+ if (ss_check(ctx, s, pos + 1 + diff, op, stack_len))
+ goto fail;
 break;
 #endif
 case OP_if_true:
 case OP_if_false:
 case OP_catch:
 diff = get_u32(bc_buf + pos + 1);
- if (compute_stack_size_rec(ctx, fd, s, pos + 1 + diff, op, stack_len))
- return -1;
+ if (ss_check(ctx, s, pos + 1 + diff, op, stack_len))
+ goto fail;
 break;
 case OP_gosub:
 diff = get_u32(bc_buf + pos + 1);
- if (compute_stack_size_rec(ctx, fd, s, pos + 1 + diff, op, stack_len + 1))
- return -1;
+ if (ss_check(ctx, s, pos + 1 + diff, op, stack_len + 1))
+ goto fail;
 break;
 case OP_with_get_var:
 case OP_with_delete_var:
 diff = get_u32(bc_buf + pos + 5);
- if (compute_stack_size_rec(ctx, fd, s, pos + 5 + diff, op, stack_len + 1))
- return -1;
+ if (ss_check(ctx, s, pos + 5 + diff, op, stack_len + 1))
+ goto fail;
 break;
 case OP_with_make_ref:
 case OP_with_get_ref:
 case OP_with_get_ref_undef:
 diff = get_u32(bc_buf + pos + 5);
- if (compute_stack_size_rec(ctx, fd, s, pos + 5 + diff, op, stack_len + 2))
- return -1;
+ if (ss_check(ctx, s, pos + 5 + diff, op, stack_len + 2))
+ goto fail;
 break;
 case OP_with_put_var:
 diff = get_u32(bc_buf + pos + 5);
- if (compute_stack_size_rec(ctx, fd, s, pos + 5 + diff, op, stack_len - 1))
- return -1;
+ if (ss_check(ctx, s, pos + 5 + diff, op, stack_len - 1))
+ goto fail;
 break;
 
 default:
 break;
 }
- pos = pos_next;
+ if (ss_check(ctx, s, pos_next, op, stack_len))
+ goto fail;
+ done_insn: ;
 }
- done:
- return 0;
-
- stack_overflow:
- JS_ThrowInternalError(ctx, "stack overflow (op=%d, pc=%d)", op, pos);
- return -1;
-}
-
-static __exception int compute_stack_size(JSContext *ctx,
- JSFunctionDef *fd,
- int *pstack_size)
-{
- StackSizeState s_s, *s = &s_s;
- int bc_len, i, ret;
-
- bc_len = fd->byte_code.size;
- /* bc_len > 0 */
- s->stack_level_tab = js_malloc(ctx, sizeof(s->stack_level_tab[0]) * bc_len);
- if (!s->stack_level_tab)
- return -1;
- for(i = 0; i < bc_len; i++)
- s->stack_level_tab[i] = 0xffff;
- s->stack_len_max = 0;
- ret = compute_stack_size_rec(ctx, fd, s, 0, OP_invalid, 0);
 js_free(ctx, s->stack_level_tab);
+ js_free(ctx, s->pc_stack);
 *pstack_size = s->stack_len_max;
- return ret;
+ return 0;
+ fail:
+ js_free(ctx, s->stack_level_tab);
+ js_free(ctx, s->pc_stack);
+ *pstack_size = 0;
+ return -1;
 }
 
 static int add_module_variables(JSContext *ctx, JSFunctionDef *fd)
@@ -31272,14 +32535,14 @@
 int i, idx;
 JSModuleDef *m = fd->module;
 JSExportEntry *me;
- JSHoistedDef *hf;
+ JSGlobalVar *hf;
 
 /* The imported global variables were added as closure variables
 in js_parse_import(). We add here the module global
 variables. */
 
- for(i = 0; i < fd->hoisted_def_count; i++) {
- hf = &fd->hoisted_def[i];
+ for(i = 0; i < fd->global_var_count; i++) {
+ hf = &fd->global_vars[i];
 if (add_closure_var(ctx, fd, TRUE, FALSE, i, hf->var_name, hf->is_const,
 hf->is_lexical, FALSE) < 0)
 return -1;
@@ -31291,9 +32554,8 @@
 if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
 idx = find_closure_var(ctx, fd, me->local_name);
 if (idx < 0) {
- char buf1[ATOM_GET_STR_BUF_SIZE];
- JS_ThrowSyntaxError(ctx, "exported variable '%s' does not exist",
- JS_AtomGetStr(ctx, buf1, sizeof(buf1), me->local_name));
+ JS_ThrowSyntaxErrorAtom(ctx, "exported variable '%s' does not exist",
+ me->local_name);
 return -1;
 }
 me->u.local.var_idx = idx;
@@ -31318,6 +32580,10 @@
 for (scope = 0; scope < fd->scope_count; scope++) {
 fd->scopes[scope].first = -1;
 }
+ if (fd->has_parameter_expressions) {
+ /* special end of variable list marker for the argument scope */
+ fd->scopes[ARG_SCOPE_INDEX].first = ARG_SCOPE_END;
+ }
 for (idx = 0; idx < fd->var_count; idx++) {
 JSVarDef *vd = &fd->vars[idx];
 vd->scope_next = fd->scopes[vd->scope_level].first;
@@ -31325,12 +32591,12 @@
 }
 for (scope = 2; scope < fd->scope_count; scope++) {
 JSVarScope *sd = &fd->scopes[scope];
- if (sd->first == -1)
+ if (sd->first < 0)
 sd->first = fd->scopes[sd->parent].first;
 }
 for (idx = 0; idx < fd->var_count; idx++) {
 JSVarDef *vd = &fd->vars[idx];
- if (vd->scope_next == -1 && vd->scope_level > 1) {
+ if (vd->scope_next < 0 && vd->scope_level > 1) {
 scope = fd->scopes[vd->scope_level].parent;
 vd->scope_next = fd->scopes[scope].first;
 }
@@ -31441,8 +32707,10 @@
 }
 } else {
 b->vardefs = (void *)((uint8_t*)b + vardefs_offset);
- memcpy(b->vardefs, fd->args, fd->arg_count * sizeof(fd->args[0]));
- memcpy(b->vardefs + fd->arg_count, fd->vars, fd->var_count * sizeof(fd->vars[0]));
+ if (fd->arg_count)
+ memcpy(b->vardefs, fd->args, fd->arg_count * sizeof(fd->args[0]));
+ if (fd->var_count)
+ memcpy(b->vardefs + fd->arg_count, fd->vars, fd->var_count * sizeof(fd->vars[0]));
 }
 b->var_count = fd->var_count;
 b->arg_count = fd->arg_count;
@@ -31504,9 +32772,10 @@
 b->super_allowed = fd->super_allowed;
 b->arguments_allowed = fd->arguments_allowed;
 b->backtrace_barrier = fd->backtrace_barrier;
+ b->realm = JS_DupContext(ctx);
 
 add_gc_object(ctx->rt, &b->header, JS_GC_OBJ_TYPE_FUNCTION_BYTECODE);
-
+ 
 #if defined(DUMP_BYTECODE) && (DUMP_BYTECODE & 1)
 if (!(fd->js_mode & JS_MODE_STRIP)) {
 js_dump_function_bytecode(ctx, b);
@@ -31550,6 +32819,8 @@
 JSClosureVar *cv = &b->closure_var[i];
 JS_FreeAtomRT(rt, cv->var_name);
 }
+ if (b->realm)
+ JS_FreeContext(b->realm);
 
 JS_FreeAtomRT(rt, b->func_name);
 if (b->has_debug) {
@@ -31654,11 +32925,8 @@
 }
 #endif
 #ifdef CONFIG_BIGNUM
- else if (s->ctx->bignum_ext && !strcmp(str, "use bigint")) {
- s->cur_func->js_mode |= JS_MODE_BIGINT;
- }
 else if (s->ctx->bignum_ext && !strcmp(str, "use math")) {
- s->cur_func->js_mode |= JS_MODE_BIGINT | JS_MODE_MATH;
+ s->cur_func->js_mode |= JS_MODE_MATH;
 }
 #endif
 }
@@ -31702,7 +32970,8 @@
 /* Check if argument name duplicates a destructuring parameter */
 /* XXX: should have a flag for such variables */
 for (i = 0; i < fd->var_count; i++) {
- if (fd->vars[i].var_name == name)
+ if (fd->vars[i].var_name == name &&
+ fd->vars[i].scope_level == 0)
 goto duplicate;
 }
 }
@@ -31718,7 +32987,7 @@
 static JSFunctionDef *js_parse_function_class_fields_init(JSParseState *s)
 {
 JSFunctionDef *fd;
-
+ 
 fd = js_new_function_def(s->ctx, s->cur_func, FALSE, FALSE,
 s->filename, 0);
 if (!fd)
@@ -31726,7 +32995,7 @@
 fd->func_name = JS_ATOM_NULL;
 fd->has_prototype = FALSE;
 fd->has_home_object = TRUE;
-
+ 
 fd->has_arguments_binding = FALSE;
 fd->has_this_binding = TRUE;
 fd->is_derived_class_constructor = FALSE;
@@ -31734,7 +33003,7 @@
 fd->super_call_allowed = FALSE;
 fd->super_allowed = fd->has_home_object;
 fd->arguments_allowed = FALSE;
-
+ 
 fd->func_kind = JS_FUNC_NORMAL;
 fd->func_type = JS_PARSE_FUNC_METHOD;
 return fd;
@@ -31811,8 +33080,8 @@
 
 if (fd->is_eval && fd->eval_type == JS_EVAL_TYPE_MODULE &&
 (func_type == JS_PARSE_FUNC_STATEMENT || func_type == JS_PARSE_FUNC_VAR)) {
- JSHoistedDef *hf;
- hf = find_hoisted_def(fd, func_name);
+ JSGlobalVar *hf;
+ hf = find_global_var(fd, func_name);
 /* XXX: should check scope chain */
 if (hf && hf->scope_level == fd->scope_level) {
 js_parse_error(s, "invalid redefinition of global identifier in module code");
@@ -31822,21 +33091,23 @@
 }
 
 if (func_type == JS_PARSE_FUNC_VAR) {
- /* Create lexical name here so function closure contains it */
 if (!(fd->js_mode & JS_MODE_STRICT)
+ && func_kind == JS_FUNC_NORMAL
 && find_lexical_decl(ctx, fd, func_name, fd->scope_first, FALSE) < 0
 && !((func_idx = find_var(ctx, fd, func_name)) >= 0 && (func_idx & ARGUMENT_VAR_OFFSET))
 && !(func_name == JS_ATOM_arguments && fd->has_arguments_binding)) {
 create_func_var = TRUE;
 }
+ /* Create the lexical name here so that the function closure
+ contains it */
 if (fd->is_eval &&
 (fd->eval_type == JS_EVAL_TYPE_GLOBAL ||
 fd->eval_type == JS_EVAL_TYPE_MODULE) &&
- fd->scope_level == 1) {
+ fd->scope_level == fd->body_scope) {
 /* avoid creating a lexical variable in the global
 scope. XXX: check annex B */
- JSHoistedDef *hf;
- hf = find_hoisted_def(fd, func_name);
+ JSGlobalVar *hf;
+ hf = find_global_var(fd, func_name);
 /* XXX: should check scope chain */
 if (hf && hf->scope_level == fd->scope_level) {
 js_parse_error(s, "invalid redefinition of global identifier");
@@ -31908,9 +33179,10 @@
 if (func_type == JS_PARSE_FUNC_CLASS_CONSTRUCTOR) {
 emit_class_field_init(s);
 }
-
+ 
 /* parse arguments */
 fd->has_simple_parameter_list = TRUE;
+ fd->has_parameter_expressions = FALSE;
 has_opt_arg = FALSE;
 if (func_type == JS_PARSE_FUNC_ARROW && s->token.val == TOK_IDENT) {
 JSAtom name;
@@ -31923,13 +33195,30 @@
 goto fail;
 fd->defined_arg_count = 1;
 } else {
- if (js_parse_expect(s, '('))
- goto fail;
+ if (s->token.val == '(') {
+ int skip_bits;
+ /* if there is an '=' inside the parameter list, we
+ consider there is a parameter expression inside */
+ js_parse_skip_parens_token(s, &skip_bits, FALSE);
+ if (skip_bits & SKIP_HAS_ASSIGNMENT)
+ fd->has_parameter_expressions = TRUE;
+ if (next_token(s))
+ goto fail;
+ } else {
+ if (js_parse_expect(s, '('))
+ goto fail;
+ }
 
+ if (fd->has_parameter_expressions) {
+ fd->scope_level = -1; /* force no parent scope */
+ if (push_scope(s) < 0)
+ return -1;
+ }
+ 
 while (s->token.val != ')') {
 JSAtom name;
 BOOL rest = FALSE;
- int idx;
+ int idx, has_initializer;
 
 if (s->token.val == TOK_ELLIPSIS) {
 fd->has_simple_parameter_list = FALSE;
@@ -31948,15 +33237,13 @@
 emit_op(s, OP_get_arg);
 emit_u16(s, idx);
 }
- if (js_parse_destructing_element(s, TOK_VAR, 1, TRUE, -1, TRUE))
+ has_initializer = js_parse_destructuring_element(s, fd->has_parameter_expressions ? TOK_LET : TOK_VAR, 1, TRUE, -1, TRUE);
+ if (has_initializer < 0)
 goto fail;
- /* Close var object: necessary if direct eval call
- occurred in the assignment expression or if any
- variable was captured and a later direct eval call
- may instantiate it in the var object.
- The next pass will generate the capture if required.
- */
- emit_op(s, OP_close_var_object);
+ if (has_initializer)
+ has_opt_arg = TRUE;
+ if (!has_opt_arg)
+ fd->defined_arg_count++;
 } else if (s->token.val == TOK_IDENT) {
 if (s->token.u.ident.is_reserved) {
 js_parse_error_reserved_identifier(s);
@@ -31967,6 +33254,11 @@
 js_parse_error_reserved_identifier(s);
 goto fail;
 }
+ if (fd->has_parameter_expressions) {
+ if (define_var(s, fd, name, JS_VAR_DEF_LET) < 0)
+ goto fail;
+ }
+ /* XXX: could avoid allocating an argument if rest is true */
 idx = add_arg(ctx, fd, name);
 if (idx < 0)
 goto fail;
@@ -31975,72 +33267,55 @@
 if (rest) {
 emit_op(s, OP_rest);
 emit_u16(s, idx);
+ if (fd->has_parameter_expressions) {
+ emit_op(s, OP_dup);
+ emit_op(s, OP_scope_put_var_init);
+ emit_atom(s, name);
+ emit_u16(s, fd->scope_level);
+ }
 emit_op(s, OP_put_arg);
 emit_u16(s, idx);
 fd->has_simple_parameter_list = FALSE;
 has_opt_arg = TRUE;
 } else if (s->token.val == '=') {
+ int label;
+ 
 fd->has_simple_parameter_list = FALSE;
 has_opt_arg = TRUE;
 
 if (next_token(s))
 goto fail;
 
- /* optimize `x = void 0` default value: no code needed */
- if (s->token.val == TOK_VOID) {
- JSParsePos pos;
- js_parse_get_pos(s, &pos);
- if (next_token(s))
- goto fail;
- if (s->token.val == TOK_NUMBER) {
- if (next_token(s))
- goto fail;
- if (s->token.val == ',') {
- if (next_token(s))
- goto fail;
- continue;
- }
- if (s->token.val == ')') {
- continue;
- }
- }
- if (js_parse_seek_token(s, &pos))
- goto fail;
+ label = new_label(s);
+ emit_op(s, OP_get_arg);
+ emit_u16(s, idx);
+ emit_op(s, OP_dup);
+ emit_op(s, OP_undefined);
+ emit_op(s, OP_strict_eq);
+ emit_goto(s, OP_if_false, label);
+ emit_op(s, OP_drop);
+ if (js_parse_assign_expr(s))
+ goto fail;
+ set_object_name(s, name);
+ emit_op(s, OP_dup);
+ emit_op(s, OP_put_arg);
+ emit_u16(s, idx);
+ emit_label(s, label);
+ emit_op(s, OP_scope_put_var_init);
+ emit_atom(s, name);
+ emit_u16(s, fd->scope_level);
+ } else {
+ if (!has_opt_arg) {
+ fd->defined_arg_count++;
 }
-#if 0
- /* XXX: not correct for eval code */
- /* Check for a default value of `undefined`
- to omit default argument processing */
- if (s->token.val == TOK_IDENT &&
- s->token.u.ident.atom == JS_ATOM_undefined &&
- fd->parent == NULL &&
- ((tok = peek_token(s, FALSE)) == ',' || tok == ')')) {
- if (next_token(s)) /* ignore undefined token */
- goto fail;
- } else
-#endif
- {
- int label = new_label(s);
- if (idx > 0) {
- emit_op(s, OP_set_arg_valid_upto);
- emit_u16(s, idx);
- }
+ if (fd->has_parameter_expressions) {
+ /* copy the argument to the argument scope */
 emit_op(s, OP_get_arg);
 emit_u16(s, idx);
- emit_op(s, OP_undefined);
- emit_op(s, OP_strict_eq);
- emit_goto(s, OP_if_false, label);
- if (js_parse_assign_expr(s, TRUE))
- goto fail;
- set_object_name(s, name);
- emit_op(s, OP_put_arg);
- emit_u16(s, idx);
- /* Close var object: see above comment. */
- emit_op(s, OP_close_var_object);
- emit_label(s, label);
+ emit_op(s, OP_scope_put_var_init);
+ emit_atom(s, name);
+ emit_u16(s, fd->scope_level);
 }
- } else if (!has_opt_arg) {
- fd->defined_arg_count++;
 }
 } else {
 js_parse_error(s, "missing formal parameter");
@@ -32050,10 +33325,10 @@
 js_parse_expect(s, ')');
 goto fail;
 }
- if (s->token.val == ',') {
- if (next_token(s))
- goto fail;
- }
+ if (s->token.val == ')')
+ break;
+ if (js_parse_expect(s, ','))
+ goto fail;
 }
 if ((func_type == JS_PARSE_FUNC_GETTER && fd->arg_count != 0) ||
 (func_type == JS_PARSE_FUNC_SETTER && fd->arg_count != 1)) {
@@ -32062,6 +33337,41 @@
 }
 }
 
+ if (fd->has_parameter_expressions) {
+ int idx;
+
+ /* Copy the variables in the argument scope to the variable
+ scope (see FunctionDeclarationInstantiation() in spec). The
+ normal arguments are already present, so no need to copy
+ them. */
+ idx = fd->scopes[fd->scope_level].first;
+ while (idx >= 0) {
+ JSVarDef *vd = &fd->vars[idx];
+ if (vd->scope_level != fd->scope_level)
+ break;
+ if (find_var(ctx, fd, vd->var_name) < 0) {
+ if (add_var(ctx, fd, vd->var_name) < 0)
+ goto fail;
+ vd = &fd->vars[idx]; /* fd->vars may have been reallocated */
+ emit_op(s, OP_scope_get_var);
+ emit_atom(s, vd->var_name);
+ emit_u16(s, fd->scope_level);
+ emit_op(s, OP_scope_put_var);
+ emit_atom(s, vd->var_name);
+ emit_u16(s, 0);
+ }
+ idx = vd->scope_next;
+ }
+ 
+ /* the argument scope has no parent, hence we don't use pop_scope(s) */
+ emit_op(s, OP_leave_scope);
+ emit_u16(s, fd->scope_level);
+
+ /* set the variable scope as the current scope */
+ fd->scope_level = 0;
+ fd->scope_first = fd->scopes[fd->scope_level].first;
+ }
+ 
 if (next_token(s))
 goto fail;
 
@@ -32073,7 +33383,8 @@
 /* in generators, yield expression is forbidden during the parsing
 of the arguments */
 fd->in_function_body = TRUE;
- push_scope(s); /* enter body scope: fd->scope_level = 1 */
+ push_scope(s); /* enter body scope */
+ fd->body_scope = fd->scope_level;
 
 if (s->token.val == TOK_ARROW) {
 if (next_token(s))
@@ -32083,7 +33394,7 @@
 if (js_parse_function_check_names(s, fd, func_name))
 goto fail;
 
- if (js_parse_assign_expr(s, TRUE))
+ if (js_parse_assign_expr(s))
 goto fail;
 
 if (func_kind != JS_FUNC_NORMAL)
@@ -32165,16 +33476,16 @@
 emit_u32(s, idx);
 if (create_func_var) {
 if (s->cur_func->is_global_var) {
- JSHoistedDef *hf;
+ JSGlobalVar *hf;
 /* the global variable must be defined at the start of the
 function */
- hf = add_hoisted_def(ctx, s->cur_func, -1, func_name, -1, FALSE);
+ hf = add_global_var(ctx, s->cur_func, func_name);
 if (!hf)
 goto fail;
 /* it is considered as defined at the top level
 (needed for annex B.3.3.4 and B.3.3.5
 checks) */
- hf->scope_level = 0;
+ hf->scope_level = 0; 
 hf->force_init = ((s->cur_func->js_mode & JS_MODE_STRICT) != 0);
 /* store directly into global var, bypass lexical scope */
 emit_op(s, OP_dup);
@@ -32198,7 +33509,7 @@
 }
 if (lexical_func_idx >= 0) {
 /* lexical variable will be initialized upon entering scope */
- s->cur_func->vars[lexical_func_idx].func_pool_or_scope_idx = idx;
+ s->cur_func->vars[lexical_func_idx].func_pool_idx = idx;
 emit_op(s, OP_drop);
 } else {
 /* store function object into its lexical name */
@@ -32214,17 +33525,23 @@
 if (var_idx < 0)
 goto fail;
 /* the variable will be assigned at the top of the function */
- if (!add_hoisted_def(ctx, s->cur_func, idx, JS_ATOM_NULL, var_idx, FALSE))
- goto fail;
+ if (var_idx & ARGUMENT_VAR_OFFSET) {
+ s->cur_func->args[var_idx - ARGUMENT_VAR_OFFSET].func_pool_idx = idx;
+ } else {
+ s->cur_func->vars[var_idx].func_pool_idx = idx;
+ }
 } else {
 JSAtom func_var_name;
+ JSGlobalVar *hf;
 if (func_name == JS_ATOM_NULL)
 func_var_name = JS_ATOM__default_; /* export default */
 else
 func_var_name = func_name;
 /* the variable will be assigned at the top of the function */
- if (!add_hoisted_def(ctx, s->cur_func, idx, func_var_name, -1, FALSE))
+ hf = add_global_var(ctx, s->cur_func, func_var_name);
+ if (!hf)
 goto fail;
+ hf->cpool_idx = idx;
 if (export_flag != JS_PARSE_EXPORT_NONE) {
 if (!add_export_entry(s, s->cur_func->module, func_var_name,
 export_flag == JS_PARSE_EXPORT_NAMED ? func_var_name : JS_ATOM_default, JS_EXPORT_TYPE_LOCAL))
@@ -32324,7 +33641,9 @@
 m = JS_VALUE_GET_PTR(fun_obj);
 /* the module refcount should be >= 2 */
 JS_FreeValue(ctx, fun_obj);
- if (js_instantiate_module(ctx, m) < 0)
+ if (js_create_module_function(ctx, m) < 0)
+ goto fail;
+ if (js_link_module(ctx, m) < 0)
 goto fail;
 ret_val = js_evaluate_module(ctx, m);
 if (JS_IsException(ret_val)) {
@@ -32356,8 +33675,11 @@
 break;
 } else if (*p >= 0x80) {
 c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
- if (c == CP_LS || c == CP_PS)
+ if (c == CP_LS || c == CP_PS) {
 break;
+ } else if (c == -1) {
+ p++; /* skip invalid UTF-8 */
+ }
 } else {
 p++;
 }
@@ -32387,7 +33709,7 @@
 m = NULL;
 if (eval_type == JS_EVAL_TYPE_DIRECT) {
 JSObject *p;
- sf = ctx->current_stack_frame;
+ sf = ctx->rt->current_stack_frame;
 assert(sf != NULL);
 assert(JS_VALUE_GET_TAG(sf->cur_func) == JS_TAG_OBJECT);
 p = JS_VALUE_GET_OBJ(sf->cur_func);
@@ -32443,7 +33765,8 @@
 s->allow_html_comments = !s->is_module;
 
 push_scope(s); /* body scope */
-
+ fd->body_scope = fd->scope_level;
+ 
 err = js_parse_program(s);
 if (err) {
 fail:
@@ -32506,32 +33829,27 @@
 
 }
 
-JSValue JS_Eval(JSContext *ctx, const char *input, size_t input_len,
- const char *filename, int eval_flags)
+JSValue JS_EvalThis(JSContext *ctx, JSValueConst this_obj,
+ const char *input, size_t input_len,
+ const char *filename, int eval_flags)
 {
 JSValue ret;
+
 #ifdef _DEBUG
- int eval_type = eval_flags & JS_EVAL_TYPE_MASK;
- assert(eval_type == JS_EVAL_TYPE_GLOBAL ||
+	int eval_type = eval_flags & JS_EVAL_TYPE_MASK;
+	assert(eval_type == JS_EVAL_TYPE_GLOBAL ||
 eval_type == JS_EVAL_TYPE_MODULE);
 #endif
- ret = JS_EvalInternal(ctx, ctx->global_obj, input, input_len, filename,
+	ret = JS_EvalInternal(ctx, this_obj, input, input_len, filename,
 eval_flags, -1);
 return ret;
 }
 
-JSValue JS_EvalWithTarget(JSContext *ctx, JSValueConst this_obj, const char *input, size_t input_len,
+JSValue JS_Eval(JSContext *ctx, const char *input, size_t input_len,
 const char *filename, int eval_flags)
 {
- JSValue ret;
-#ifdef _DEBUG
- int eval_type = eval_flags & JS_EVAL_TYPE_MASK;
- assert(eval_type == JS_EVAL_TYPE_GLOBAL ||
- eval_type == JS_EVAL_TYPE_MODULE);
-#endif
- ret = JS_EvalInternal(ctx, this_obj, input, input_len, filename,
- eval_flags, -1);
- return ret;
+ return JS_EvalThis(ctx, ctx->global_obj, input, input_len, filename,
+ eval_flags);
 }
 
 int JS_ResolveModule(JSContext *ctx, JSValueConst obj)
@@ -32547,6 +33865,110 @@
 }
 
 /*******************************************************************/
+/* object list */
+
+typedef struct {
+ JSObject *obj;
+ uint32_t hash_next; /* -1 if no next entry */
+} JSObjectListEntry;
+
+/* XXX: reuse it to optimize weak references */
+typedef struct {
+ JSObjectListEntry *object_tab;
+ int object_count;
+ int object_size;
+ uint32_t *hash_table;
+ uint32_t hash_size;
+} JSObjectList;
+
+static void js_object_list_init(JSObjectList *s)
+{
+ memset(s, 0, sizeof(*s));
+}
+
+static uint32_t js_object_list_get_hash(JSObject *p, uint32_t hash_size)
+{
+ return ((uintptr_t)p * 3163) & (hash_size - 1);
+}
+
+static int js_object_list_resize_hash(JSContext *ctx, JSObjectList *s,
+ uint32_t new_hash_size)
+{
+ JSObjectListEntry *e;
+ uint32_t i, h, *new_hash_table;
+
+ new_hash_table = js_malloc(ctx, sizeof(new_hash_table[0]) * new_hash_size);
+ if (!new_hash_table)
+ return -1;
+ js_free(ctx, s->hash_table);
+ s->hash_table = new_hash_table;
+ s->hash_size = new_hash_size;
+ 
+ for(i = 0; i < s->hash_size; i++) {
+ s->hash_table[i] = -1;
+ }
+ for(i = 0; i < s->object_count; i++) {
+ e = &s->object_tab[i];
+ h = js_object_list_get_hash(e->obj, s->hash_size); 
+ e->hash_next = s->hash_table[h];
+ s->hash_table[h] = i;
+ }
+ return 0;
+}
+
+/* the reference count of 'obj' is not modified. Return 0 if OK, -1 if
+ memory error */
+static int js_object_list_add(JSContext *ctx, JSObjectList *s, JSObject *obj)
+{
+ JSObjectListEntry *e;
+ uint32_t h, new_hash_size;
+ 
+ if (js_resize_array(ctx, (void *)&s->object_tab,
+ sizeof(s->object_tab[0]),
+ &s->object_size, s->object_count + 1))
+ return -1;
+ if (unlikely((s->object_count + 1) >= s->hash_size)) {
+ new_hash_size = max_uint32(s->hash_size, 4);
+ while (new_hash_size <= s->object_count)
+ new_hash_size *= 2;
+ if (js_object_list_resize_hash(ctx, s, new_hash_size))
+ return -1;
+ }
+ e = &s->object_tab[s->object_count++];
+ h = js_object_list_get_hash(obj, s->hash_size); 
+ e->obj = obj;
+ e->hash_next = s->hash_table[h];
+ s->hash_table[h] = s->object_count - 1;
+ return 0;
+}
+
+/* return -1 if not present or the object index */
+static int js_object_list_find(JSContext *ctx, JSObjectList *s, JSObject *obj)
+{
+ JSObjectListEntry *e;
+ uint32_t h, p;
+
+ /* must test empty size because there is no hash table */
+ if (s->object_count == 0)
+ return -1;
+ h = js_object_list_get_hash(obj, s->hash_size); 
+ p = s->hash_table[h];
+ while (p != -1) {
+ e = &s->object_tab[p];
+ if (e->obj == obj)
+ return p;
+ p = e->hash_next;
+ }
+ return -1;
+}
+
+static void js_object_list_end(JSContext *ctx, JSObjectList *s)
+{
+ js_free(ctx, s->object_tab);
+ js_free(ctx, s->hash_table);
+}
+
+/*******************************************************************/
 /* binary object writer & reader */
 
 typedef enum BCTagEnum {
@@ -32565,6 +33987,12 @@
 BC_TAG_TEMPLATE_OBJECT,
 BC_TAG_FUNCTION_BYTECODE,
 BC_TAG_MODULE,
+ BC_TAG_TYPED_ARRAY,
+ BC_TAG_ARRAY_BUFFER,
+ BC_TAG_SHARED_ARRAY_BUFFER,
+ BC_TAG_DATE,
+ BC_TAG_OBJECT_VALUE,
+ BC_TAG_OBJECT_REFERENCE,
 } BCTagEnum;
 
 #ifdef CONFIG_BIGNUM
@@ -32582,14 +34010,21 @@
 typedef struct BCWriterState {
 JSContext *ctx;
 DynBuf dbuf;
- BOOL byte_swap;
- BOOL allow_bytecode;
+ BOOL byte_swap : 8;
+ BOOL allow_bytecode : 8;
+ BOOL allow_sab : 8;
+ BOOL allow_reference : 8;
 uint32_t first_atom;
 uint32_t *atom_to_idx;
 int atom_to_idx_size;
 JSAtom *idx_to_atom;
 int idx_to_atom_count;
 int idx_to_atom_size;
+ uint8_t **sab_tab;
+ int sab_tab_len;
+ int sab_tab_size;
+ /* list of referenced objects (used if allow_reference = TRUE) */
+ JSObjectList object_list;
 } BCWriterState;
 
 #ifdef DUMP_READ_OBJECT
@@ -32610,6 +34045,12 @@
 "template",
 "function",
 "module",
+ "TypedArray",
+ "ArrayBuffer",
+ "SharedArrayBuffer",
+ "Date",
+ "ObjectValue",
+ "ObjectReference",
 };
 #endif
 
@@ -32669,36 +34110,20 @@
 return 0;
 }
 if (atom >= s->atom_to_idx_size) {
- size_t new_size, i, slack;
- uint32_t *new_tab;
- /* XXX: potential arithmetic overflow */
- new_size = s->atom_to_idx_size * 3 / 2;
- if ((atom + 1) > new_size)
- new_size = atom + 1;
- new_tab = js_realloc2(s->ctx, s->atom_to_idx,
- new_size * sizeof(s->atom_to_idx[0]), &slack);
- if (!new_tab)
- goto fail;
- new_size += slack / sizeof(*new_tab);
- for(i = s->atom_to_idx_size; i < new_size; i++)
- new_tab[i] = 0;
- s->atom_to_idx = new_tab;
- s->atom_to_idx_size = new_size;
- }
- if ((s->idx_to_atom_count + 1) > s->idx_to_atom_size) {
- size_t new_size, slack;
- JSAtom *new_tab;
- new_size = s->idx_to_atom_size * 3 / 2;
- if ((s->idx_to_atom_count + 1) > new_size)
- new_size = s->idx_to_atom_count + 1;
- new_tab = js_realloc2(s->ctx, s->idx_to_atom,
- new_size * sizeof(s->idx_to_atom[0]), &slack);
- if (!new_tab)
- goto fail;
- new_size += slack / sizeof(*new_tab);
- s->idx_to_atom = new_tab;
- s->idx_to_atom_size = new_size;
- }
+ int old_size, i;
+ old_size = s->atom_to_idx_size;
+ if (js_resize_array(s->ctx, (void **)&s->atom_to_idx,
+ sizeof(s->atom_to_idx[0]), &s->atom_to_idx_size,
+ atom + 1))
+ return -1;
+ /* XXX: could add a specific js_resize_array() function to do it */
+ for(i = old_size; i < s->atom_to_idx_size; i++)
+ s->atom_to_idx[i] = 0;
+ }
+ if (js_resize_array(s->ctx, (void **)&s->idx_to_atom,
+ sizeof(s->idx_to_atom[0]),
+ &s->idx_to_atom_size, s->idx_to_atom_count + 1))
+ goto fail;
 
 v = s->idx_to_atom_count++;
 s->idx_to_atom[v] = atom + s->first_atom;
@@ -32930,7 +34355,7 @@
 int bpos, d;
 uint8_t v8;
 size_t i0;
-
+ 
 /* little endian BCD */
 i = 0;
 while (i < a->len && a->tab[i] == 0)
@@ -32950,7 +34375,7 @@
 return -1;
 }
 bc_put_leb128(s, len);
-
+ 
 bpos = 0;
 v8 = 0;
 i0 = i;
@@ -32981,10 +34406,276 @@
 }
 #endif /* CONFIG_BIGNUM */
 
+static int JS_WriteObjectRec(BCWriterState *s, JSValueConst obj);
+
+static int JS_WriteFunctionTag(BCWriterState *s, JSValueConst obj)
+{
+ JSFunctionBytecode *b = JS_VALUE_GET_PTR(obj);
+ uint32_t flags;
+ int idx, i;
+ 
+ bc_put_u8(s, BC_TAG_FUNCTION_BYTECODE);
+ flags = idx = 0;
+ bc_set_flags(&flags, &idx, b->has_prototype, 1);
+ bc_set_flags(&flags, &idx, b->has_simple_parameter_list, 1);
+ bc_set_flags(&flags, &idx, b->is_derived_class_constructor, 1);
+ bc_set_flags(&flags, &idx, b->need_home_object, 1);
+ bc_set_flags(&flags, &idx, b->func_kind, 2);
+ bc_set_flags(&flags, &idx, b->new_target_allowed, 1);
+ bc_set_flags(&flags, &idx, b->super_call_allowed, 1);
+ bc_set_flags(&flags, &idx, b->super_allowed, 1);
+ bc_set_flags(&flags, &idx, b->arguments_allowed, 1);
+ bc_set_flags(&flags, &idx, b->has_debug, 1);
+ bc_set_flags(&flags, &idx, b->backtrace_barrier, 1);
+ assert(idx <= 16);
+ bc_put_u16(s, flags);
+ bc_put_u8(s, b->js_mode);
+ bc_put_atom(s, b->func_name);
+ 
+ bc_put_leb128(s, b->arg_count);
+ bc_put_leb128(s, b->var_count);
+ bc_put_leb128(s, b->defined_arg_count);
+ bc_put_leb128(s, b->stack_size);
+ bc_put_leb128(s, b->closure_var_count);
+ bc_put_leb128(s, b->cpool_count);
+ bc_put_leb128(s, b->byte_code_len);
+ if (b->vardefs) {
+ /* XXX: this field is redundant */
+ bc_put_leb128(s, b->arg_count + b->var_count);
+ for(i = 0; i < b->arg_count + b->var_count; i++) {
+ JSVarDef *vd = &b->vardefs[i];
+ bc_put_atom(s, vd->var_name);
+ bc_put_leb128(s, vd->scope_level);
+ bc_put_leb128(s, vd->scope_next + 1);
+ flags = idx = 0;
+ bc_set_flags(&flags, &idx, vd->var_kind, 4);
+ bc_set_flags(&flags, &idx, vd->is_const, 1);
+ bc_set_flags(&flags, &idx, vd->is_lexical, 1);
+ bc_set_flags(&flags, &idx, vd->is_captured, 1);
+ assert(idx <= 8);
+ bc_put_u8(s, flags);
+ }
+ } else {
+ bc_put_leb128(s, 0);
+ }
+ 
+ for(i = 0; i < b->closure_var_count; i++) {
+ JSClosureVar *cv = &b->closure_var[i];
+ bc_put_atom(s, cv->var_name);
+ bc_put_leb128(s, cv->var_idx);
+ flags = idx = 0;
+ bc_set_flags(&flags, &idx, cv->is_local, 1);
+ bc_set_flags(&flags, &idx, cv->is_arg, 1);
+ bc_set_flags(&flags, &idx, cv->is_const, 1);
+ bc_set_flags(&flags, &idx, cv->is_lexical, 1);
+ bc_set_flags(&flags, &idx, cv->var_kind, 4);
+ assert(idx <= 8);
+ bc_put_u8(s, flags);
+ }
+ 
+ if (JS_WriteFunctionBytecode(s, b->byte_code_buf, b->byte_code_len))
+ goto fail;
+ 
+ if (b->has_debug) {
+ bc_put_atom(s, b->debug.filename);
+ bc_put_leb128(s, b->debug.line_num);
+ bc_put_leb128(s, b->debug.pc2line_len);
+ dbuf_put(&s->dbuf, b->debug.pc2line_buf, b->debug.pc2line_len);
+ }
+ 
+ for(i = 0; i < b->cpool_count; i++) {
+ if (JS_WriteObjectRec(s, b->cpool[i]))
+ goto fail;
+ }
+ return 0;
+ fail:
+ return -1;
+}
+
+static int JS_WriteModule(BCWriterState *s, JSValueConst obj)
+{
+ JSModuleDef *m = JS_VALUE_GET_PTR(obj);
+ int i;
+ 
+ bc_put_u8(s, BC_TAG_MODULE);
+ bc_put_atom(s, m->module_name);
+ 
+ bc_put_leb128(s, m->req_module_entries_count);
+ for(i = 0; i < m->req_module_entries_count; i++) {
+ JSReqModuleEntry *rme = &m->req_module_entries[i];
+ bc_put_atom(s, rme->module_name);
+ }
+ 
+ bc_put_leb128(s, m->export_entries_count);
+ for(i = 0; i < m->export_entries_count; i++) {
+ JSExportEntry *me = &m->export_entries[i];
+ bc_put_u8(s, me->export_type);
+ if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
+ bc_put_leb128(s, me->u.local.var_idx);
+ } else {
+ bc_put_leb128(s, me->u.req_module_idx);
+ bc_put_atom(s, me->local_name);
+ }
+ bc_put_atom(s, me->export_name);
+ }
+ 
+ bc_put_leb128(s, m->star_export_entries_count);
+ for(i = 0; i < m->star_export_entries_count; i++) {
+ JSStarExportEntry *se = &m->star_export_entries[i];
+ bc_put_leb128(s, se->req_module_idx);
+ }
+ 
+ bc_put_leb128(s, m->import_entries_count);
+ for(i = 0; i < m->import_entries_count; i++) {
+ JSImportEntry *mi = &m->import_entries[i];
+ bc_put_leb128(s, mi->var_idx);
+ bc_put_atom(s, mi->import_name);
+ bc_put_leb128(s, mi->req_module_idx);
+ }
+ 
+ if (JS_WriteObjectRec(s, m->func_obj))
+ goto fail;
+ return 0;
+ fail:
+ return -1;
+}
+
+static int JS_WriteArray(BCWriterState *s, JSValueConst obj)
+{
+ JSObject *p = JS_VALUE_GET_OBJ(obj);
+ uint32_t i, len;
+ JSValue val;
+ int ret;
+ BOOL is_template;
+ 
+ if (s->allow_bytecode && !p->extensible) {
+ /* not extensible array: we consider it is a
+ template when we are saving bytecode */
+ bc_put_u8(s, BC_TAG_TEMPLATE_OBJECT);
+ is_template = TRUE;
+ } else {
+ bc_put_u8(s, BC_TAG_ARRAY);
+ is_template = FALSE;
+ }
+ if (js_get_length32(s->ctx, &len, obj))
+ goto fail1;
+ bc_put_leb128(s, len);
+ for(i = 0; i < len; i++) {
+ val = JS_GetPropertyUint32(s->ctx, obj, i);
+ if (JS_IsException(val))
+ goto fail1;
+ ret = JS_WriteObjectRec(s, val);
+ JS_FreeValue(s->ctx, val);
+ if (ret)
+ goto fail1;
+ }
+ if (is_template) {
+ val = JS_GetProperty(s->ctx, obj, JS_ATOM_raw);
+ if (JS_IsException(val))
+ goto fail1;
+ ret = JS_WriteObjectRec(s, val);
+ JS_FreeValue(s->ctx, val);
+ if (ret)
+ goto fail1;
+ }
+ return 0;
+ fail1:
+ return -1;
+}
+
+static int JS_WriteObjectTag(BCWriterState *s, JSValueConst obj)
+{
+ JSObject *p = JS_VALUE_GET_OBJ(obj);
+ uint32_t i, prop_count;
+ JSShape *sh;
+ JSShapeProperty *pr;
+ int pass;
+ JSAtom atom;
+
+ bc_put_u8(s, BC_TAG_OBJECT);
+ prop_count = 0;
+ sh = p->shape;
+ for(pass = 0; pass < 2; pass++) {
+ if (pass == 1)
+ bc_put_leb128(s, prop_count);
+ for(i = 0, pr = get_shape_prop(sh); i < sh->prop_count; i++, pr++) {
+ atom = pr->atom;
+ if (atom != JS_ATOM_NULL &&
+ JS_AtomIsString(s->ctx, atom) &&
+ (pr->flags & JS_PROP_ENUMERABLE)) {
+ if (pr->flags & JS_PROP_TMASK) {
+ JS_ThrowTypeError(s->ctx, "only value properties are supported");
+ goto fail;
+ }
+ if (pass == 0) {
+ prop_count++;
+ } else {
+ bc_put_atom(s, atom);
+ if (JS_WriteObjectRec(s, p->prop[i].u.value))
+ goto fail;
+ }
+ }
+ }
+ }
+ return 0;
+ fail:
+ return -1;
+}
+
+static int JS_WriteTypedArray(BCWriterState *s, JSValueConst obj)
+{
+ JSObject *p = JS_VALUE_GET_OBJ(obj);
+ JSTypedArray *ta = p->u.typed_array;
+
+ bc_put_u8(s, BC_TAG_TYPED_ARRAY);
+ bc_put_u8(s, p->class_id - JS_CLASS_UINT8C_ARRAY);
+ bc_put_leb128(s, p->u.array.count);
+ bc_put_leb128(s, ta->offset);
+ if (JS_WriteObjectRec(s, JS_MKPTR(JS_TAG_OBJECT, ta->buffer)))
+ return -1;
+ return 0;
+}
+
+static int JS_WriteArrayBuffer(BCWriterState *s, JSValueConst obj)
+{
+ JSObject *p = JS_VALUE_GET_OBJ(obj);
+ JSArrayBuffer *abuf = p->u.array_buffer;
+ if (abuf->detached) {
+ JS_ThrowTypeErrorDetachedArrayBuffer(s->ctx);
+ return -1;
+ }
+ bc_put_u8(s, BC_TAG_ARRAY_BUFFER);
+ bc_put_leb128(s, abuf->byte_length);
+ dbuf_put(&s->dbuf, abuf->data, abuf->byte_length);
+ return 0;
+}
+
+static int JS_WriteSharedArrayBuffer(BCWriterState *s, JSValueConst obj)
+{
+ JSObject *p = JS_VALUE_GET_OBJ(obj);
+ JSArrayBuffer *abuf = p->u.array_buffer;
+ assert(!abuf->detached); /* SharedArrayBuffer are never detached */
+ bc_put_u8(s, BC_TAG_SHARED_ARRAY_BUFFER);
+ bc_put_leb128(s, abuf->byte_length);
+ bc_put_u64(s, (uintptr_t)abuf->data);
+ if (js_resize_array(s->ctx, (void **)&s->sab_tab, sizeof(s->sab_tab[0]),
+ &s->sab_tab_size, s->sab_tab_len + 1))
+ return -1;
+ /* keep the SAB pointer so that the user can clone it or free it */
+ s->sab_tab[s->sab_tab_len++] = abuf->data;
+ return 0;
+}
+
 static int JS_WriteObjectRec(BCWriterState *s, JSValueConst obj)
 {
- uint32_t tag = JS_VALUE_GET_NORM_TAG(obj);
+ uint32_t tag;
 
+ if (js_check_stack_overflow(s->ctx->rt, 0)) {
+ JS_ThrowStackOverflow(s->ctx);
+ return -1;
+ }
+
+ tag = JS_VALUE_GET_NORM_TAG(obj);
 switch(tag) {
 case JS_TAG_NULL:
 bc_put_u8(s, BC_TAG_NULL);
@@ -33015,218 +34706,82 @@
 }
 break;
 case JS_TAG_FUNCTION_BYTECODE:
- {
- JSFunctionBytecode *b = JS_VALUE_GET_PTR(obj);
- uint32_t flags;
- int idx, i;
-
- if (!s->allow_bytecode)
- goto invalid_tag;
- bc_put_u8(s, BC_TAG_FUNCTION_BYTECODE);
- flags = idx = 0;
- bc_set_flags(&flags, &idx, b->has_prototype, 1);
- bc_set_flags(&flags, &idx, b->has_simple_parameter_list, 1);
- bc_set_flags(&flags, &idx, b->is_derived_class_constructor, 1);
- bc_set_flags(&flags, &idx, b->need_home_object, 1);
- bc_set_flags(&flags, &idx, b->func_kind, 2);
- bc_set_flags(&flags, &idx, b->new_target_allowed, 1);
- bc_set_flags(&flags, &idx, b->super_call_allowed, 1);
- bc_set_flags(&flags, &idx, b->super_allowed, 1);
- bc_set_flags(&flags, &idx, b->arguments_allowed, 1);
- bc_set_flags(&flags, &idx, b->has_debug, 1);
- bc_set_flags(&flags, &idx, b->backtrace_barrier, 1);
- assert(idx <= 16);
- bc_put_u16(s, flags);
- bc_put_u8(s, b->js_mode);
- bc_put_atom(s, b->func_name);
-
- bc_put_leb128(s, b->arg_count);
- bc_put_leb128(s, b->var_count);
- bc_put_leb128(s, b->defined_arg_count);
- bc_put_leb128(s, b->stack_size);
- bc_put_leb128(s, b->closure_var_count);
- bc_put_leb128(s, b->cpool_count);
- bc_put_leb128(s, b->byte_code_len);
- if (b->vardefs) {
- bc_put_leb128(s, b->arg_count + b->var_count);
- for(i = 0; i < b->arg_count + b->var_count; i++) {
- JSVarDef *vd = &b->vardefs[i];
- bc_put_atom(s, vd->var_name);
- bc_put_leb128(s, vd->scope_level);
- bc_put_leb128(s, vd->scope_next + 1);
- flags = idx = 0;
- bc_set_flags(&flags, &idx, vd->var_kind, 4);
- bc_set_flags(&flags, &idx, vd->is_func_var, 1);
- bc_set_flags(&flags, &idx, vd->is_const, 1);
- bc_set_flags(&flags, &idx, vd->is_lexical, 1);
- bc_set_flags(&flags, &idx, vd->is_captured, 1);
- assert(idx <= 8);
- bc_put_u8(s, flags);
- }
- } else {
- bc_put_leb128(s, 0);
- }
-
- for(i = 0; i < b->closure_var_count; i++) {
- JSClosureVar *cv = &b->closure_var[i];
- bc_put_atom(s, cv->var_name);
- bc_put_leb128(s, cv->var_idx);
- flags = idx = 0;
- bc_set_flags(&flags, &idx, cv->is_local, 1);
- bc_set_flags(&flags, &idx, cv->is_arg, 1);
- bc_set_flags(&flags, &idx, cv->is_const, 1);
- bc_set_flags(&flags, &idx, cv->is_lexical, 1);
- bc_set_flags(&flags, &idx, cv->var_kind, 4);
- assert(idx <= 8);
- bc_put_u8(s, flags);
- }
-
- if (JS_WriteFunctionBytecode(s, b->byte_code_buf, b->byte_code_len))
- goto fail;
-
- if (b->has_debug) {
- bc_put_atom(s, b->debug.filename);
- bc_put_leb128(s, b->debug.line_num);
- bc_put_leb128(s, b->debug.pc2line_len);
- dbuf_put(&s->dbuf, b->debug.pc2line_buf, b->debug.pc2line_len);
- }
-
- for(i = 0; i < b->cpool_count; i++) {
- if (JS_WriteObjectRec(s, b->cpool[i]))
- goto fail;
- }
- }
+ if (!s->allow_bytecode)
+ goto invalid_tag;
+ if (JS_WriteFunctionTag(s, obj))
+ goto fail;
 break;
 case JS_TAG_MODULE:
- {
- JSModuleDef *m = JS_VALUE_GET_PTR(obj);
- int i;
-
- if (!s->allow_bytecode)
- goto invalid_tag;
- bc_put_u8(s, BC_TAG_MODULE);
- bc_put_atom(s, m->module_name);
-
- bc_put_leb128(s, m->req_module_entries_count);
- for(i = 0; i < m->req_module_entries_count; i++) {
- JSReqModuleEntry *rme = &m->req_module_entries[i];
- bc_put_atom(s, rme->module_name);
- }
-
- bc_put_leb128(s, m->export_entries_count);
- for(i = 0; i < m->export_entries_count; i++) {
- JSExportEntry *me = &m->export_entries[i];
- bc_put_u8(s, me->export_type);
- if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
- bc_put_leb128(s, me->u.local.var_idx);
- } else {
- bc_put_leb128(s, me->u.req_module_idx);
- bc_put_atom(s, me->local_name);
- }
- bc_put_atom(s, me->export_name);
- }
-
- bc_put_leb128(s, m->star_export_entries_count);
- for(i = 0; i < m->star_export_entries_count; i++) {
- JSStarExportEntry *se = &m->star_export_entries[i];
- bc_put_leb128(s, se->req_module_idx);
- }
-
- bc_put_leb128(s, m->import_entries_count);
- for(i = 0; i < m->import_entries_count; i++) {
- JSImportEntry *mi = &m->import_entries[i];
- bc_put_leb128(s, mi->var_idx);
- bc_put_atom(s, mi->import_name);
- bc_put_leb128(s, mi->req_module_idx);
- }
-
- if (JS_WriteObjectRec(s, m->func_obj))
- goto fail;
- }
+ if (!s->allow_bytecode)
+ goto invalid_tag;
+ if (JS_WriteModule(s, obj))
+ goto fail;
 break;
 case JS_TAG_OBJECT:
 {
 JSObject *p = JS_VALUE_GET_OBJ(obj);
- uint32_t i, prop_count, len;
- JSShape *sh;
- JSShapeProperty *pr;
- JSValue val;
- int ret, pass;
- BOOL is_template;
- JSAtom atom;
-
- if (p->class_id != JS_CLASS_ARRAY &&
- p->class_id != JS_CLASS_OBJECT) {
- JS_ThrowTypeError(s->ctx, "unsupported object class");
- goto fail;
- }
- if (p->tmp_mark) {
- JS_ThrowTypeError(s->ctx, "circular reference");
- goto fail;
- }
- p->tmp_mark = 1;
- if (p->class_id == JS_CLASS_ARRAY) {
- if (s->allow_bytecode && !p->extensible) {
- /* not extensible array: we consider it is a
- template when we are saving bytecode */
- bc_put_u8(s, BC_TAG_TEMPLATE_OBJECT);
- is_template = TRUE;
+ int ret, idx;
+ 
+ if (s->allow_reference) {
+ idx = js_object_list_find(s->ctx, &s->object_list, p);
+ if (idx >= 0) {
+ bc_put_u8(s, BC_TAG_OBJECT_REFERENCE);
+ bc_put_leb128(s, idx);
+ break;
 } else {
- bc_put_u8(s, BC_TAG_ARRAY);
- is_template = FALSE;
- }
- if (js_get_length32(s->ctx, &len, obj))
- goto fail1;
- bc_put_leb128(s, len);
- for(i = 0; i < len; i++) {
- val = JS_GetPropertyUint32(s->ctx, obj, i);
- if (JS_IsException(val))
- goto fail1;
- ret = JS_WriteObjectRec(s, val);
- JS_FreeValue(s->ctx, val);
- if (ret)
- goto fail1;
- }
- if (is_template) {
- val = JS_GetProperty(s->ctx, obj, JS_ATOM_raw);
- if (JS_IsException(val))
- goto fail1;
- ret = JS_WriteObjectRec(s, val);
- JS_FreeValue(s->ctx, val);
- if (ret)
- goto fail1;
+ if (js_object_list_add(s->ctx, &s->object_list, p))
+ goto fail;
 }
 } else {
- bc_put_u8(s, BC_TAG_OBJECT);
- prop_count = 0;
- sh = p->shape;
- for(pass = 0; pass < 2; pass++) {
- if (pass == 1)
- bc_put_leb128(s, prop_count);
- for(i = 0, pr = get_shape_prop(sh); i < sh->prop_count; i++, pr++) {
- atom = pr->atom;
- if (atom != JS_ATOM_NULL &&
- JS_AtomIsString(s->ctx, atom) &&
- (pr->flags & JS_PROP_ENUMERABLE)) {
- if (pr->flags & JS_PROP_TMASK) {
- JS_ThrowTypeError(s->ctx, "only value properties are supported");
- goto fail;
- }
- if (pass == 0) {
- prop_count++;
- } else {
- bc_put_atom(s, atom);
- if (JS_WriteObjectRec(s, p->prop[i].u.value)) {
- fail1:
- p->tmp_mark = 0;
- goto fail;
- }
- }
- }
- }
+ if (p->tmp_mark) {
+ JS_ThrowTypeError(s->ctx, "circular reference");
+ goto fail;
 }
+ p->tmp_mark = 1;
+ }
+ switch(p->class_id) {
+ case JS_CLASS_ARRAY:
+ ret = JS_WriteArray(s, obj);
+ break;
+ case JS_CLASS_OBJECT:
+ ret = JS_WriteObjectTag(s, obj);
+ break;
+ case JS_CLASS_ARRAY_BUFFER:
+ ret = JS_WriteArrayBuffer(s, obj);
+ break;
+ case JS_CLASS_SHARED_ARRAY_BUFFER:
+ if (!s->allow_sab)
+ goto invalid_tag;
+ ret = JS_WriteSharedArrayBuffer(s, obj);
+ break;
+ case JS_CLASS_DATE:
+ bc_put_u8(s, BC_TAG_DATE);
+ ret = JS_WriteObjectRec(s, p->u.object_data);
+ break;
+ case JS_CLASS_NUMBER:
+ case JS_CLASS_STRING:
+ case JS_CLASS_BOOLEAN:
+#ifdef CONFIG_BIGNUM
+ case JS_CLASS_BIG_INT:
+ case JS_CLASS_BIG_FLOAT:
+ case JS_CLASS_BIG_DECIMAL:
+#endif
+ bc_put_u8(s, BC_TAG_OBJECT_VALUE);
+ ret = JS_WriteObjectRec(s, p->u.object_data);
+ break;
+ default:
+ if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+ p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+ ret = JS_WriteTypedArray(s, obj);
+ } else {
+ JS_ThrowTypeError(s->ctx, "unsupported object class");
+ ret = -1;
+ }
+ break;
 }
 p->tmp_mark = 0;
+ if (ret)
+ goto fail;
 }
 break;
 #ifdef CONFIG_BIGNUM
@@ -33288,8 +34843,8 @@
 return -1;
 }
 
-uint8_t *JS_WriteObject(JSContext *ctx, size_t *psize, JSValueConst obj,
- int flags)
+uint8_t *JS_WriteObject2(JSContext *ctx, size_t *psize, JSValueConst obj,
+ int flags, uint8_t ***psab_tab, size_t *psab_tab_len)
 {
 BCWriterState ss, *s = &ss;
 
@@ -33298,29 +34853,48 @@
 /* XXX: byte swapped output is untested */
 s->byte_swap = ((flags & JS_WRITE_OBJ_BSWAP) != 0);
 s->allow_bytecode = ((flags & JS_WRITE_OBJ_BYTECODE) != 0);
+ s->allow_sab = ((flags & JS_WRITE_OBJ_SAB) != 0);
+ s->allow_reference = ((flags & JS_WRITE_OBJ_REFERENCE) != 0);
 /* XXX: could use a different version when bytecode is included */
 if (s->allow_bytecode)
 s->first_atom = JS_ATOM_END;
 else
 s->first_atom = 1;
 js_dbuf_init(ctx, &s->dbuf);
-
+ js_object_list_init(&s->object_list);
+ 
 if (JS_WriteObjectRec(s, obj))
 goto fail;
 if (JS_WriteObjectAtoms(s))
 goto fail;
+ js_object_list_end(ctx, &s->object_list);
 js_free(ctx, s->atom_to_idx);
 js_free(ctx, s->idx_to_atom);
 *psize = s->dbuf.size;
+ if (psab_tab)
+ *psab_tab = s->sab_tab;
+ if (psab_tab_len)
+ *psab_tab_len = s->sab_tab_len;
 return s->dbuf.buf;
 fail:
+ js_object_list_end(ctx, &s->object_list);
 js_free(ctx, s->atom_to_idx);
 js_free(ctx, s->idx_to_atom);
 dbuf_free(&s->dbuf);
 *psize = 0;
+ if (psab_tab)
+ *psab_tab = NULL;
+ if (psab_tab_len)
+ *psab_tab_len = 0;
 return NULL;
 }
 
+uint8_t *JS_WriteObject(JSContext *ctx, size_t *psize, JSValueConst obj,
+ int flags)
+{
+ return JS_WriteObject2(ctx, psize, obj, flags, NULL, NULL);
+}
+
 typedef struct BCReaderState {
 JSContext *ctx;
 const uint8_t *buf_start, *ptr, *buf_end;
@@ -33328,8 +34902,15 @@
 uint32_t idx_to_atom_count;
 JSAtom *idx_to_atom;
 int error_state;
- BOOL allow_bytecode;
- BOOL is_rom_data;
+ BOOL allow_sab : 8;
+ BOOL allow_bytecode : 8;
+ BOOL is_rom_data : 8;
+ BOOL allow_reference : 8;
+ /* object references */
+ JSObject **objects;
+ int objects_count;
+ int objects_size;
+ 
 #ifdef DUMP_READ_OBJECT
 const uint8_t *ptr_last;
 int level;
@@ -33533,7 +35114,7 @@
 p->u.str8[size] = '\0'; /* add the trailing zero for 8 bit strings */
 }
 #ifdef DUMP_READ_OBJECT
- bc_read_trace(s, "string: "); JS_DumpString(s->ctx->rt, p); printf("\n");
+ JS_DumpString(s->ctx->rt, p); printf("\n");
 #endif
 return p;
 }
@@ -33614,9 +35195,7 @@
 limb_t v;
 bf_t *a;
 int bpos, d;
-
- bc_read_trace(s, "%s {\n", bc_tag_str[tag]);
-
+ 
 p = js_new_bf(s->ctx);
 if (!p)
 goto fail;
@@ -33738,28 +35317,566 @@
 }
 #endif /* CONFIG_BIGNUM */
 
+static JSValue JS_ReadObjectRec(BCReaderState *s);
+
+static int BC_add_object_ref1(BCReaderState *s, JSObject *p)
+{
+ if (s->allow_reference) {
+ if (js_resize_array(s->ctx, (void *)&s->objects,
+ sizeof(s->objects[0]),
+ &s->objects_size, s->objects_count + 1))
+ return -1;
+ s->objects[s->objects_count++] = p;
+ }
+ return 0;
+}
+
+static int BC_add_object_ref(BCReaderState *s, JSValueConst obj)
+{
+ return BC_add_object_ref1(s, JS_VALUE_GET_OBJ(obj));
+}
+
+static JSValue JS_ReadFunctionTag(BCReaderState *s)
+{
+ JSContext *ctx = s->ctx;
+ JSFunctionBytecode bc, *b;
+ JSValue obj = JS_UNDEFINED;
+ uint16_t v16;
+ uint8_t v8;
+ int idx, i, local_count;
+ int function_size, cpool_offset, byte_code_offset;
+ int closure_var_offset, vardefs_offset;
+
+ memset(&bc, 0, sizeof(bc));
+ bc.header.ref_count = 1;
+ //bc.gc_header.mark = 0;
+
+ if (bc_get_u16(s, &v16))
+ goto fail;
+ idx = 0;
+ bc.has_prototype = bc_get_flags(v16, &idx, 1);
+ bc.has_simple_parameter_list = bc_get_flags(v16, &idx, 1);
+ bc.is_derived_class_constructor = bc_get_flags(v16, &idx, 1);
+ bc.need_home_object = bc_get_flags(v16, &idx, 1);
+ bc.func_kind = bc_get_flags(v16, &idx, 2);
+ bc.new_target_allowed = bc_get_flags(v16, &idx, 1);
+ bc.super_call_allowed = bc_get_flags(v16, &idx, 1);
+ bc.super_allowed = bc_get_flags(v16, &idx, 1);
+ bc.arguments_allowed = bc_get_flags(v16, &idx, 1);
+ bc.has_debug = bc_get_flags(v16, &idx, 1);
+ bc.backtrace_barrier = bc_get_flags(v16, &idx, 1);
+ bc.read_only_bytecode = s->is_rom_data;
+ if (bc_get_u8(s, &v8))
+ goto fail;
+ bc.js_mode = v8;
+ if (bc_get_atom(s, &bc.func_name)) //@ atom leak if failure
+ goto fail;
+ if (bc_get_leb128_u16(s, &bc.arg_count))
+ goto fail;
+ if (bc_get_leb128_u16(s, &bc.var_count))
+ goto fail;
+ if (bc_get_leb128_u16(s, &bc.defined_arg_count))
+ goto fail;
+ if (bc_get_leb128_u16(s, &bc.stack_size))
+ goto fail;
+ if (bc_get_leb128_int(s, &bc.closure_var_count))
+ goto fail;
+ if (bc_get_leb128_int(s, &bc.cpool_count))
+ goto fail;
+ if (bc_get_leb128_int(s, &bc.byte_code_len))
+ goto fail;
+ if (bc_get_leb128_int(s, &local_count))
+ goto fail;
+
+ if (bc.has_debug) {
+ function_size = sizeof(*b);
+ } else {
+ function_size = offsetof(JSFunctionBytecode, debug);
+ }
+ cpool_offset = function_size;
+ function_size += bc.cpool_count * sizeof(*bc.cpool);
+ vardefs_offset = function_size;
+ function_size += local_count * sizeof(*bc.vardefs);
+ closure_var_offset = function_size;
+ function_size += bc.closure_var_count * sizeof(*bc.closure_var);
+ byte_code_offset = function_size;
+ if (!bc.read_only_bytecode) {
+ function_size += bc.byte_code_len;
+ }
+
+ b = js_mallocz(ctx, function_size);
+ if (!b)
+ return JS_EXCEPTION;
+ 
+ memcpy(b, &bc, offsetof(JSFunctionBytecode, debug));
+ b->header.ref_count = 1;
+ if (local_count != 0) {
+ b->vardefs = (void *)((uint8_t*)b + vardefs_offset);
+ }
+ if (b->closure_var_count != 0) {
+ b->closure_var = (void *)((uint8_t*)b + closure_var_offset);
+ }
+ if (b->cpool_count != 0) {
+ b->cpool = (void *)((uint8_t*)b + cpool_offset);
+ }
+ 
+ add_gc_object(ctx->rt, &b->header, JS_GC_OBJ_TYPE_FUNCTION_BYTECODE);
+ 
+ obj = JS_MKPTR(JS_TAG_FUNCTION_BYTECODE, b);
+
+#ifdef DUMP_READ_OBJECT
+ bc_read_trace(s, "name: "); print_atom(s->ctx, b->func_name); printf("\n");
+#endif
+ bc_read_trace(s, "args=%d vars=%d defargs=%d closures=%d cpool=%d\n",
+ b->arg_count, b->var_count, b->defined_arg_count,
+ b->closure_var_count, b->cpool_count);
+ bc_read_trace(s, "stack=%d bclen=%d locals=%d\n",
+ b->stack_size, b->byte_code_len, local_count);
+
+ if (local_count != 0) {
+ bc_read_trace(s, "vars {\n");
+ for(i = 0; i < local_count; i++) {
+ JSVarDef *vd = &b->vardefs[i];
+ if (bc_get_atom(s, &vd->var_name))
+ goto fail;
+ if (bc_get_leb128_int(s, &vd->scope_level))
+ goto fail;
+ if (bc_get_leb128_int(s, &vd->scope_next))
+ goto fail;
+ vd->scope_next--;
+ if (bc_get_u8(s, &v8))
+ goto fail;
+ idx = 0;
+ vd->var_kind = bc_get_flags(v8, &idx, 4);
+ vd->is_const = bc_get_flags(v8, &idx, 1);
+ vd->is_lexical = bc_get_flags(v8, &idx, 1);
+ vd->is_captured = bc_get_flags(v8, &idx, 1);
+#ifdef DUMP_READ_OBJECT
+ bc_read_trace(s, "name: "); print_atom(s->ctx, vd->var_name); printf("\n");
+#endif
+ }
+ bc_read_trace(s, "}\n");
+ }
+ if (b->closure_var_count != 0) {
+ bc_read_trace(s, "closure vars {\n");
+ for(i = 0; i < b->closure_var_count; i++) {
+ JSClosureVar *cv = &b->closure_var[i];
+ int var_idx;
+ if (bc_get_atom(s, &cv->var_name))
+ goto fail;
+ if (bc_get_leb128_int(s, &var_idx))
+ goto fail;
+ cv->var_idx = var_idx;
+ if (bc_get_u8(s, &v8))
+ goto fail;
+ idx = 0;
+ cv->is_local = bc_get_flags(v8, &idx, 1);
+ cv->is_arg = bc_get_flags(v8, &idx, 1);
+ cv->is_const = bc_get_flags(v8, &idx, 1);
+ cv->is_lexical = bc_get_flags(v8, &idx, 1);
+ cv->var_kind = bc_get_flags(v8, &idx, 4);
+#ifdef DUMP_READ_OBJECT
+ bc_read_trace(s, "name: "); print_atom(s->ctx, cv->var_name); printf("\n");
+#endif
+ }
+ bc_read_trace(s, "}\n");
+ }
+ {
+ bc_read_trace(s, "bytecode {\n");
+ if (JS_ReadFunctionBytecode(s, b, byte_code_offset, b->byte_code_len))
+ goto fail;
+ bc_read_trace(s, "}\n");
+ }
+ if (b->has_debug) {
+ /* read optional debug information */
+ bc_read_trace(s, "debug {\n");
+ if (bc_get_atom(s, &b->debug.filename))
+ goto fail;
+ if (bc_get_leb128_int(s, &b->debug.line_num))
+ goto fail;
+ if (bc_get_leb128_int(s, &b->debug.pc2line_len))
+ goto fail;
+ if (b->debug.pc2line_len) {
+ b->debug.pc2line_buf = js_mallocz(ctx, b->debug.pc2line_len);
+ if (!b->debug.pc2line_buf)
+ goto fail;
+ if (bc_get_buf(s, b->debug.pc2line_buf, b->debug.pc2line_len))
+ goto fail;
+ }
+#ifdef DUMP_READ_OBJECT
+ bc_read_trace(s, "filename: "); print_atom(s->ctx, b->debug.filename); printf("\n");
+#endif
+ bc_read_trace(s, "}\n");
+ }
+ if (b->cpool_count != 0) {
+ bc_read_trace(s, "cpool {\n");
+ for(i = 0; i < b->cpool_count; i++) {
+ JSValue val;
+ val = JS_ReadObjectRec(s);
+ if (JS_IsException(val))
+ goto fail;
+ b->cpool[i] = val;
+ }
+ bc_read_trace(s, "}\n");
+ }
+ b->realm = JS_DupContext(ctx);
+ return obj;
+ fail:
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadModule(BCReaderState *s)
+{
+ JSContext *ctx = s->ctx;
+ JSValue obj;
+ JSModuleDef *m = NULL;
+ JSAtom module_name;
+ int i;
+ uint8_t v8;
+ 
+ if (bc_get_atom(s, &module_name))
+ goto fail;
+#ifdef DUMP_READ_OBJECT
+ bc_read_trace(s, "name: "); print_atom(s->ctx, module_name); printf("\n");
+#endif
+ m = js_new_module_def(ctx, module_name);
+ if (!m)
+ goto fail;
+ obj = JS_DupValue(ctx, JS_MKPTR(JS_TAG_MODULE, m));
+ if (bc_get_leb128_int(s, &m->req_module_entries_count))
+ goto fail;
+ if (m->req_module_entries_count != 0) {
+ m->req_module_entries_size = m->req_module_entries_count;
+ m->req_module_entries = js_mallocz(ctx, sizeof(m->req_module_entries[0]) * m->req_module_entries_size);
+ if (!m->req_module_entries)
+ goto fail;
+ for(i = 0; i < m->req_module_entries_count; i++) {
+ JSReqModuleEntry *rme = &m->req_module_entries[i];
+ if (bc_get_atom(s, &rme->module_name))
+ goto fail;
+ }
+ }
+
+ if (bc_get_leb128_int(s, &m->export_entries_count))
+ goto fail;
+ if (m->export_entries_count != 0) {
+ m->export_entries_size = m->export_entries_count;
+ m->export_entries = js_mallocz(ctx, sizeof(m->export_entries[0]) * m->export_entries_size);
+ if (!m->export_entries)
+ goto fail;
+ for(i = 0; i < m->export_entries_count; i++) {
+ JSExportEntry *me = &m->export_entries[i];
+ if (bc_get_u8(s, &v8))
+ goto fail;
+ me->export_type = v8;
+ if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
+ if (bc_get_leb128_int(s, &me->u.local.var_idx))
+ goto fail;
+ } else {
+ if (bc_get_leb128_int(s, &me->u.req_module_idx))
+ goto fail;
+ if (bc_get_atom(s, &me->local_name))
+ goto fail;
+ }
+ if (bc_get_atom(s, &me->export_name))
+ goto fail;
+ }
+ }
+
+ if (bc_get_leb128_int(s, &m->star_export_entries_count))
+ goto fail;
+ if (m->star_export_entries_count != 0) {
+ m->star_export_entries_size = m->star_export_entries_count;
+ m->star_export_entries = js_mallocz(ctx, sizeof(m->star_export_entries[0]) * m->star_export_entries_size);
+ if (!m->star_export_entries)
+ goto fail;
+ for(i = 0; i < m->star_export_entries_count; i++) {
+ JSStarExportEntry *se = &m->star_export_entries[i];
+ if (bc_get_leb128_int(s, &se->req_module_idx))
+ goto fail;
+ }
+ }
+
+ if (bc_get_leb128_int(s, &m->import_entries_count))
+ goto fail;
+ if (m->import_entries_count != 0) {
+ m->import_entries_size = m->import_entries_count;
+ m->import_entries = js_mallocz(ctx, sizeof(m->import_entries[0]) * m->import_entries_size);
+ if (!m->import_entries)
+ goto fail;
+ for(i = 0; i < m->import_entries_count; i++) {
+ JSImportEntry *mi = &m->import_entries[i];
+ if (bc_get_leb128_int(s, &mi->var_idx))
+ goto fail;
+ if (bc_get_atom(s, &mi->import_name))
+ goto fail;
+ if (bc_get_leb128_int(s, &mi->req_module_idx))
+ goto fail;
+ }
+ }
+
+ m->func_obj = JS_ReadObjectRec(s);
+ if (JS_IsException(m->func_obj))
+ goto fail;
+ return obj;
+ fail:
+ if (m) {
+ js_free_module_def(ctx, m);
+ }
+ return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadObjectTag(BCReaderState *s)
+{
+ JSContext *ctx = s->ctx;
+ JSValue obj;
+ uint32_t prop_count, i;
+ JSAtom atom;
+ JSValue val;
+ int ret;
+ 
+ obj = JS_NewObject(ctx);
+ if (BC_add_object_ref(s, obj))
+ goto fail;
+ if (bc_get_leb128(s, &prop_count))
+ goto fail;
+ for(i = 0; i < prop_count; i++) {
+ if (bc_get_atom(s, &atom))
+ goto fail;
+#ifdef DUMP_READ_OBJECT
+ bc_read_trace(s, "propname: "); print_atom(s->ctx, atom); printf("\n");
+#endif
+ val = JS_ReadObjectRec(s);
+ if (JS_IsException(val)) {
+ JS_FreeAtom(ctx, atom);
+ goto fail;
+ }
+ ret = JS_DefinePropertyValue(ctx, obj, atom, val, JS_PROP_C_W_E);
+ JS_FreeAtom(ctx, atom);
+ if (ret < 0)
+ goto fail;
+ }
+ return obj;
+ fail:
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadArray(BCReaderState *s, int tag)
+{
+ JSContext *ctx = s->ctx;
+ JSValue obj;
+ uint32_t len, i;
+ JSValue val;
+ int ret, prop_flags;
+ BOOL is_template;
+
+ obj = JS_NewArray(ctx);
+ if (BC_add_object_ref(s, obj))
+ goto fail;
+ is_template = (tag == BC_TAG_TEMPLATE_OBJECT);
+ if (bc_get_leb128(s, &len))
+ goto fail;
+ for(i = 0; i < len; i++) {
+ val = JS_ReadObjectRec(s);
+ if (JS_IsException(val))
+ goto fail;
+ if (is_template)
+ prop_flags = JS_PROP_ENUMERABLE;
+ else
+ prop_flags = JS_PROP_C_W_E;
+ ret = JS_DefinePropertyValueUint32(ctx, obj, i, val,
+ prop_flags);
+ if (ret < 0)
+ goto fail;
+ }
+ if (is_template) {
+ val = JS_ReadObjectRec(s);
+ if (JS_IsException(val))
+ goto fail;
+ if (!JS_IsUndefined(val)) {
+ ret = JS_DefinePropertyValue(ctx, obj, JS_ATOM_raw, val, 0);
+ if (ret < 0)
+ goto fail;
+ }
+ JS_PreventExtensions(ctx, obj);
+ }
+ return obj;
+ fail:
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadTypedArray(BCReaderState *s)
+{
+ JSContext *ctx = s->ctx;
+ JSValue obj = JS_UNDEFINED, array_buffer = JS_UNDEFINED;
+ uint8_t array_tag;
+ JSValueConst args[3];
+ uint32_t offset, len, idx;
+ 
+ if (bc_get_u8(s, &array_tag))
+ return JS_EXCEPTION;
+ if (array_tag >= JS_TYPED_ARRAY_COUNT)
+ return JS_ThrowTypeError(ctx, "invalid typed array");
+ if (bc_get_leb128(s, &len))
+ return JS_EXCEPTION;
+ if (bc_get_leb128(s, &offset))
+ return JS_EXCEPTION;
+ /* XXX: this hack could be avoided if the typed array could be
+ created before the array buffer */
+ idx = s->objects_count;
+ if (BC_add_object_ref1(s, NULL))
+ goto fail;
+ array_buffer = JS_ReadObjectRec(s);
+ if (JS_IsException(array_buffer))
+ return JS_EXCEPTION;
+ if (!js_get_array_buffer(ctx, array_buffer)) {
+ JS_FreeValue(ctx, array_buffer);
+ return JS_EXCEPTION;
+ }
+ args[0] = array_buffer;
+ args[1] = JS_NewInt64(ctx, offset);
+ args[2] = JS_NewInt64(ctx, len);
+ obj = js_typed_array_constructor(ctx, JS_UNDEFINED,
+ 3, args,
+ JS_CLASS_UINT8C_ARRAY + array_tag);
+ if (JS_IsException(obj))
+ goto fail;
+ if (s->allow_reference) {
+ s->objects[idx] = JS_VALUE_GET_OBJ(obj);
+ }
+ JS_FreeValue(ctx, array_buffer);
+ return obj;
+ fail:
+ JS_FreeValue(ctx, array_buffer);
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadArrayBuffer(BCReaderState *s)
+{
+ JSContext *ctx = s->ctx;
+ uint32_t byte_length;
+ JSValue obj;
+ 
+ if (bc_get_leb128(s, &byte_length))
+ return JS_EXCEPTION;
+ if (unlikely(s->buf_end - s->ptr < byte_length)) {
+ bc_read_error_end(s);
+ return JS_EXCEPTION;
+ }
+ obj = JS_NewArrayBufferCopy(ctx, s->ptr, byte_length);
+ if (JS_IsException(obj))
+ goto fail;
+ if (BC_add_object_ref(s, obj))
+ goto fail;
+ s->ptr += byte_length;
+ return obj;
+ fail:
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadSharedArrayBuffer(BCReaderState *s)
+{
+ JSContext *ctx = s->ctx;
+ uint32_t byte_length;
+ uint8_t *data_ptr;
+ JSValue obj;
+ uint64_t u64;
+ 
+ if (bc_get_leb128(s, &byte_length))
+ return JS_EXCEPTION;
+ if (bc_get_u64(s, &u64))
+ return JS_EXCEPTION;
+ data_ptr = (uint8_t *)(uintptr_t)u64;
+ /* the SharedArrayBuffer is cloned */
+ obj = js_array_buffer_constructor3(ctx, JS_UNDEFINED, byte_length,
+ JS_CLASS_SHARED_ARRAY_BUFFER,
+ data_ptr,
+ NULL, NULL, FALSE);
+ if (JS_IsException(obj))
+ goto fail;
+ if (BC_add_object_ref(s, obj))
+ goto fail;
+ return obj;
+ fail:
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadDate(BCReaderState *s)
+{
+ JSContext *ctx = s->ctx;
+ JSValue val, obj = JS_UNDEFINED;
+
+ val = JS_ReadObjectRec(s);
+ if (JS_IsException(val))
+ goto fail;
+ if (!JS_IsNumber(val)) {
+ JS_ThrowTypeError(ctx, "Number tag expected for date");
+ goto fail;
+ }
+ obj = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_DATE],
+ JS_CLASS_DATE);
+ if (JS_IsException(obj))
+ goto fail;
+ if (BC_add_object_ref(s, obj))
+ goto fail;
+ JS_SetObjectData(ctx, obj, val);
+ return obj;
+ fail:
+ JS_FreeValue(ctx, val);
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadObjectValue(BCReaderState *s)
+{
+ JSContext *ctx = s->ctx;
+ JSValue val, obj = JS_UNDEFINED;
+
+ val = JS_ReadObjectRec(s);
+ if (JS_IsException(val))
+ goto fail;
+ obj = JS_ToObject(ctx, val);
+ if (JS_IsException(obj))
+ goto fail;
+ if (BC_add_object_ref(s, obj))
+ goto fail;
+ JS_FreeValue(ctx, val);
+ return obj;
+ fail:
+ JS_FreeValue(ctx, val);
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
+}
+
 static JSValue JS_ReadObjectRec(BCReaderState *s)
 {
 JSContext *ctx = s->ctx;
 uint8_t tag;
 JSValue obj = JS_UNDEFINED;
- JSModuleDef *m = NULL;
+
+ if (js_check_stack_overflow(ctx->rt, 0))
+ return JS_ThrowStackOverflow(ctx);
 
 if (bc_get_u8(s, &tag))
 return JS_EXCEPTION;
 
+ bc_read_trace(s, "%s {\n", bc_tag_str[tag]);
+
 switch(tag) {
 case BC_TAG_NULL:
- bc_read_trace(s, "null\n");
 obj = JS_NULL;
 break;
 case BC_TAG_UNDEFINED:
- bc_read_trace(s, "undefined\n");
 obj = JS_UNDEFINED;
 break;
 case BC_TAG_BOOL_FALSE:
 case BC_TAG_BOOL_TRUE:
- bc_read_trace(s, "%s\n", bc_tag_str[tag]);
 obj = JS_NewBool(ctx, tag - BC_TAG_BOOL_FALSE);
 break;
 case BC_TAG_INT32:
@@ -33767,7 +35884,7 @@
 int32_t val;
 if (bc_get_sleb128(s, &val))
 return JS_EXCEPTION;
- bc_read_trace(s, "int32 %d\n", val);
+ bc_read_trace(s, "%d\n", val);
 obj = JS_NewInt32(ctx, val);
 }
 break;
@@ -33776,7 +35893,7 @@
 JSFloat64Union u;
 if (bc_get_u64(s, &u.u64))
 return JS_EXCEPTION;
- bc_read_trace(s, "float64 %g\n", u.d);
+ bc_read_trace(s, "%g\n", u.d);
 obj = __JS_NewFloat64(ctx, u.d);
 }
 break;
@@ -33790,376 +35907,68 @@
 }
 break;
 case BC_TAG_FUNCTION_BYTECODE:
- {
- JSFunctionBytecode bc, *b;
- uint16_t v16;
- uint8_t v8;
- int idx, i, local_count;
- int function_size, cpool_offset, byte_code_offset;
- int closure_var_offset, vardefs_offset;
-
- if (!s->allow_bytecode)
- goto invalid_tag;
- bc_read_trace(s, "%s {\n", bc_tag_str[tag]);
-
- memset(&bc, 0, sizeof(bc));
- bc.header.ref_count = 1;
- //bc.gc_header.mark = 0;
-
- if (bc_get_u16(s, &v16))
- goto fail;
- idx = 0;
- bc.has_prototype = bc_get_flags(v16, &idx, 1);
- bc.has_simple_parameter_list = bc_get_flags(v16, &idx, 1);
- bc.is_derived_class_constructor = bc_get_flags(v16, &idx, 1);
- bc.need_home_object = bc_get_flags(v16, &idx, 1);
- bc.func_kind = bc_get_flags(v16, &idx, 2);
- bc.new_target_allowed = bc_get_flags(v16, &idx, 1);
- bc.super_call_allowed = bc_get_flags(v16, &idx, 1);
- bc.super_allowed = bc_get_flags(v16, &idx, 1);
- bc.arguments_allowed = bc_get_flags(v16, &idx, 1);
- bc.has_debug = bc_get_flags(v16, &idx, 1);
- bc.backtrace_barrier = bc_get_flags(v16, &idx, 1);
- bc.read_only_bytecode = s->is_rom_data;
- if (bc_get_u8(s, &v8))
- goto fail;
- bc.js_mode = v8;
- if (bc_get_atom(s, &bc.func_name)) //@ atom leak if failure
- goto fail;
- if (bc_get_leb128_u16(s, &bc.arg_count))
- goto fail;
- if (bc_get_leb128_u16(s, &bc.var_count))
- goto fail;
- if (bc_get_leb128_u16(s, &bc.defined_arg_count))
- goto fail;
- if (bc_get_leb128_u16(s, &bc.stack_size))
- goto fail;
- if (bc_get_leb128_int(s, &bc.closure_var_count))
- goto fail;
- if (bc_get_leb128_int(s, &bc.cpool_count))
- goto fail;
- if (bc_get_leb128_int(s, &bc.byte_code_len))
- goto fail;
- if (bc_get_leb128_int(s, &local_count))
- goto fail;
-
- if (bc.has_debug) {
- function_size = sizeof(*b);
- } else {
- function_size = offsetof(JSFunctionBytecode, debug);
- }
- cpool_offset = function_size;
- function_size += bc.cpool_count * sizeof(*bc.cpool);
- vardefs_offset = function_size;
- function_size += local_count * sizeof(*bc.vardefs);
- closure_var_offset = function_size;
- function_size += bc.closure_var_count * sizeof(*bc.closure_var);
- byte_code_offset = function_size;
- if (!bc.read_only_bytecode) {
- function_size += bc.byte_code_len;
- }
-
- b = js_mallocz(ctx, function_size);
- if (!b)
- return JS_EXCEPTION;
-
- memcpy(b, &bc, offsetof(JSFunctionBytecode, debug));
- b->header.ref_count = 1;
- add_gc_object(ctx->rt, &b->header, JS_GC_OBJ_TYPE_FUNCTION_BYTECODE);
-
- obj = JS_MKPTR(JS_TAG_FUNCTION_BYTECODE, b);
-
-#ifdef DUMP_READ_OBJECT
- bc_read_trace(s, "name: "); print_atom(s->ctx, b->func_name); printf("\n");
-#endif
- bc_read_trace(s, "args=%d vars=%d defargs=%d closures=%d cpool=%d\n",
- b->arg_count, b->var_count, b->defined_arg_count,
- b->closure_var_count, b->cpool_count);
- bc_read_trace(s, "stack=%d bclen=%d locals=%d\n",
- b->stack_size, b->byte_code_len, local_count);
-
- if (local_count != 0) {
- bc_read_trace(s, "vars {\n");
- b->vardefs = (void *)((uint8_t*)b + vardefs_offset);
- for(i = 0; i < local_count; i++) {
- JSVarDef *vd = &b->vardefs[i];
- if (bc_get_atom(s, &vd->var_name))
- goto fail;
- if (bc_get_leb128_int(s, &vd->scope_level))
- goto fail;
- if (bc_get_leb128_int(s, &vd->scope_next))
- goto fail;
- vd->scope_next--;
- if (bc_get_u8(s, &v8))
- goto fail;
- idx = 0;
- vd->var_kind = bc_get_flags(v8, &idx, 4);
- vd->is_func_var = bc_get_flags(v8, &idx, 1);
- vd->is_const = bc_get_flags(v8, &idx, 1);
- vd->is_lexical = bc_get_flags(v8, &idx, 1);
- vd->is_captured = bc_get_flags(v8, &idx, 1);
-#ifdef DUMP_READ_OBJECT
- bc_read_trace(s, "name: "); print_atom(s->ctx, vd->var_name); printf("\n");
-#endif
- }
- bc_read_trace(s, "}\n");
- }
- if (b->closure_var_count != 0) {
- bc_read_trace(s, "closure vars {\n");
- b->closure_var = (void *)((uint8_t*)b + closure_var_offset);
- for(i = 0; i < b->closure_var_count; i++) {
- JSClosureVar *cv = &b->closure_var[i];
- int var_idx;
- if (bc_get_atom(s, &cv->var_name))
- goto fail;
- if (bc_get_leb128_int(s, &var_idx))
- goto fail;
- cv->var_idx = var_idx;
- if (bc_get_u8(s, &v8))
- goto fail;
- idx = 0;
- cv->is_local = bc_get_flags(v8, &idx, 1);
- cv->is_arg = bc_get_flags(v8, &idx, 1);
- cv->is_const = bc_get_flags(v8, &idx, 1);
- cv->is_lexical = bc_get_flags(v8, &idx, 1);
- cv->var_kind = bc_get_flags(v8, &idx, 4);
-#ifdef DUMP_READ_OBJECT
- bc_read_trace(s, "name: "); print_atom(s->ctx, cv->var_name); printf("\n");
-#endif
- }
- bc_read_trace(s, "}\n");
- }
- {
- bc_read_trace(s, "bytecode {\n");
- if (JS_ReadFunctionBytecode(s, b, byte_code_offset, b->byte_code_len))
- goto fail;
- bc_read_trace(s, "}\n");
- }
- if (b->has_debug) {
- /* read optional debug information */
- bc_read_trace(s, "debug {\n");
- if (bc_get_atom(s, &b->debug.filename))
- goto fail;
- if (bc_get_leb128_int(s, &b->debug.line_num))
- goto fail;
- if (bc_get_leb128_int(s, &b->debug.pc2line_len))
- goto fail;
- if (b->debug.pc2line_len) {
- b->debug.pc2line_buf = js_mallocz(ctx, b->debug.pc2line_len);
- if (!b->debug.pc2line_buf)
- goto fail;
- if (bc_get_buf(s, b->debug.pc2line_buf, b->debug.pc2line_len))
- goto fail;
- }
-#ifdef DUMP_READ_OBJECT
- bc_read_trace(s, "filename: "); print_atom(s->ctx, b->debug.filename); printf("\n");
-#endif
- bc_read_trace(s, "}\n");
- }
- if (b->cpool_count != 0) {
- bc_read_trace(s, "cpool {\n");
- b->cpool = (void *)((uint8_t*)b + cpool_offset);
- for(i = 0; i < b->cpool_count; i++) {
- JSValue val;
- val = JS_ReadObjectRec(s);
- if (JS_IsException(val))
- goto fail;
- b->cpool[i] = val;
- }
- bc_read_trace(s, "}\n");
- }
- bc_read_trace(s, "}\n");
- }
+ if (!s->allow_bytecode)
+ goto invalid_tag;
+ obj = JS_ReadFunctionTag(s);
 break;
 case BC_TAG_MODULE:
- {
- JSAtom module_name;
- int i;
- uint8_t v8;
-
- if (!s->allow_bytecode)
- goto invalid_tag;
- bc_read_trace(s, "%s {\n", bc_tag_str[tag]);
- if (bc_get_atom(s, &module_name))
- goto fail;
-#ifdef DUMP_READ_OBJECT
- bc_read_trace(s, "name: "); print_atom(s->ctx, module_name); printf("\n");
-#endif
- m = js_new_module_def(ctx, module_name);
- if (!m)
- goto fail;
- obj = JS_DupValue(ctx, JS_MKPTR(JS_TAG_MODULE, m));
- if (bc_get_leb128_int(s, &m->req_module_entries_count))
- goto fail;
- if (m->req_module_entries_count != 0) {
- m->req_module_entries_size = m->req_module_entries_count;
- m->req_module_entries = js_mallocz(ctx, sizeof(m->req_module_entries[0]) * m->req_module_entries_size);
- if (!m->req_module_entries)
- goto fail;
- for(i = 0; i < m->req_module_entries_count; i++) {
- JSReqModuleEntry *rme = &m->req_module_entries[i];
- if (bc_get_atom(s, &rme->module_name))
- goto fail;
- }
- }
-
- if (bc_get_leb128_int(s, &m->export_entries_count))
- goto fail;
- if (m->export_entries_count != 0) {
- m->export_entries_size = m->export_entries_count;
- m->export_entries = js_mallocz(ctx, sizeof(m->export_entries[0]) * m->export_entries_size);
- if (!m->export_entries)
- goto fail;
- for(i = 0; i < m->export_entries_count; i++) {
- JSExportEntry *me = &m->export_entries[i];
- if (bc_get_u8(s, &v8))
- goto fail;
- me->export_type = v8;
- if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
- if (bc_get_leb128_int(s, &me->u.local.var_idx))
- goto fail;
- } else {
- if (bc_get_leb128_int(s, &me->u.req_module_idx))
- goto fail;
- if (bc_get_atom(s, &me->local_name))
- goto fail;
- }
- if (bc_get_atom(s, &me->export_name))
- goto fail;
- }
- }
-
- if (bc_get_leb128_int(s, &m->star_export_entries_count))
- goto fail;
- if (m->star_export_entries_count != 0) {
- m->star_export_entries_size = m->star_export_entries_count;
- m->star_export_entries = js_mallocz(ctx, sizeof(m->star_export_entries[0]) * m->star_export_entries_size);
- if (!m->star_export_entries)
- goto fail;
- for(i = 0; i < m->star_export_entries_count; i++) {
- JSStarExportEntry *se = &m->star_export_entries[i];
- if (bc_get_leb128_int(s, &se->req_module_idx))
- goto fail;
- }
- }
-
- if (bc_get_leb128_int(s, &m->import_entries_count))
- goto fail;
- if (m->import_entries_count != 0) {
- m->import_entries_size = m->import_entries_count;
- m->import_entries = js_mallocz(ctx, sizeof(m->import_entries[0]) * m->import_entries_size);
- if (!m->import_entries)
- goto fail;
- for(i = 0; i < m->import_entries_count; i++) {
- JSImportEntry *mi = &m->import_entries[i];
- if (bc_get_leb128_int(s, &mi->var_idx))
- goto fail;
- if (bc_get_atom(s, &mi->import_name))
- goto fail;
- if (bc_get_leb128_int(s, &mi->req_module_idx))
- goto fail;
- }
- }
-
- m->func_obj = JS_ReadObjectRec(s);
- if (JS_IsException(m->func_obj))
- goto fail;
- bc_read_trace(s, "}\n");
- }
+ if (!s->allow_bytecode)
+ goto invalid_tag;
+ obj = JS_ReadModule(s);
 break;
 case BC_TAG_OBJECT:
- {
- uint32_t prop_count, i;
- JSAtom atom;
- JSValue val;
- int ret;
-
- bc_read_trace(s, "%s {\n", bc_tag_str[tag]);
-
- obj = JS_NewObject(ctx);
- if (bc_get_leb128(s, &prop_count))
- goto fail;
- for(i = 0; i < prop_count; i++) {
- if (bc_get_atom(s, &atom))
- goto fail;
-#ifdef DUMP_READ_OBJECT
- bc_read_trace(s, "propname: "); print_atom(s->ctx, atom); printf("\n");
-#endif
- val = JS_ReadObjectRec(s);
- if (JS_IsException(val)) {
- JS_FreeAtom(ctx, atom);
- goto fail;
- }
- ret = JS_DefinePropertyValue(ctx, obj, atom, val, JS_PROP_C_W_E);
- JS_FreeAtom(ctx, atom);
- if (ret < 0)
- goto fail;
- }
- bc_read_trace(s, "}\n");
- }
+ obj = JS_ReadObjectTag(s);
 break;
 case BC_TAG_ARRAY:
 case BC_TAG_TEMPLATE_OBJECT:
- {
- uint32_t len, i;
- JSValue val;
- int ret, prop_flags;
- BOOL is_template;
-
- bc_read_trace(s, "%s {\n", bc_tag_str[tag]);
-
- obj = JS_NewArray(ctx);
- is_template = (tag == BC_TAG_TEMPLATE_OBJECT);
- if (bc_get_leb128(s, &len))
- goto fail;
- for(i = 0; i < len; i++) {
- val = JS_ReadObjectRec(s);
- if (JS_IsException(val))
- goto fail;
- if (is_template)
- prop_flags = JS_PROP_ENUMERABLE;
- else
- prop_flags = JS_PROP_C_W_E;
- ret = JS_DefinePropertyValueUint32(ctx, obj, i, val,
- prop_flags);
- if (ret < 0)
- goto fail;
- }
- if (is_template) {
- val = JS_ReadObjectRec(s);
- if (JS_IsException(val))
- goto fail;
- if (!JS_IsUndefined(val)) {
- ret = JS_DefinePropertyValue(ctx, obj, JS_ATOM_raw, val, 0);
- if (ret < 0)
- goto fail;
- }
- JS_PreventExtensions(ctx, obj);
- }
- bc_read_trace(s, "}\n");
- }
+ obj = JS_ReadArray(s, tag);
+ break;
+ case BC_TAG_TYPED_ARRAY:
+ obj = JS_ReadTypedArray(s);
+ break;
+ case BC_TAG_ARRAY_BUFFER:
+ obj = JS_ReadArrayBuffer(s);
+ break;
+ case BC_TAG_SHARED_ARRAY_BUFFER:
+ if (!s->allow_sab || !ctx->rt->sab_funcs.sab_dup)
+ goto invalid_tag;
+ obj = JS_ReadSharedArrayBuffer(s);
+ break;
+ case BC_TAG_DATE:
+ obj = JS_ReadDate(s);
+ break;
+ case BC_TAG_OBJECT_VALUE:
+ obj = JS_ReadObjectValue(s);
 break;
 #ifdef CONFIG_BIGNUM
 case BC_TAG_BIG_INT:
 case BC_TAG_BIG_FLOAT:
 case BC_TAG_BIG_DECIMAL:
 obj = JS_ReadBigNum(s, tag);
- if (JS_IsException(obj))
- goto fail;
 break;
 #endif
+ case BC_TAG_OBJECT_REFERENCE:
+ {
+ uint32_t val;
+ if (!s->allow_reference)
+ return JS_ThrowSyntaxError(ctx, "object references are not allowed");
+ if (bc_get_leb128(s, &val))
+ return JS_EXCEPTION;
+ bc_read_trace(s, "%u\n", val);
+ if (val >= s->objects_count) {
+ return JS_ThrowSyntaxError(ctx, "invalid object reference (%u >= %u)",
+ val, s->objects_count);
+ }
+ obj = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, s->objects[val]));
+ }
+ break;
 default:
 invalid_tag:
 return JS_ThrowSyntaxError(ctx, "invalid tag (tag=%d pos=%u)",
 tag, (unsigned int)(s->ptr - s->buf_start));
 }
+ bc_read_trace(s, "}\n");
 return obj;
- fail:
- if (m) {
- js_free_module_def(ctx, m);
- }
- JS_FreeValue(ctx, obj);
- return JS_EXCEPTION;
 }
 
 static int JS_ReadObjectAtoms(BCReaderState *s)
@@ -34212,10 +36021,11 @@
 }
 js_free(s->ctx, s->idx_to_atom);
 }
+ js_free(s->ctx, s->objects);
 }
 
 JSValue JS_ReadObject(JSContext *ctx, const uint8_t *buf, size_t buf_len,
- int flags)
+ int flags)
 {
 BCReaderState ss, *s = &ss;
 JSValue obj;
@@ -34230,6 +36040,8 @@
 s->ptr = buf;
 s->allow_bytecode = ((flags & JS_READ_OBJ_BYTECODE) != 0);
 s->is_rom_data = ((flags & JS_READ_OBJ_ROM_DATA) != 0);
+ s->allow_sab = ((flags & JS_READ_OBJ_SAB) != 0);
+ s->allow_reference = ((flags & JS_READ_OBJ_REFERENCE) != 0);
 if (s->allow_bytecode)
 s->first_atom = JS_ATOM_END;
 else
@@ -34290,16 +36102,39 @@
 return atom;
 }
 
-static int JS_InstantiateFunctionListItem(JSContext *ctx, JSObject *p,
- JSAtom atom, void *opaque)
+static JSValue JS_InstantiateFunctionListItem2(JSContext *ctx, JSObject *p,
+ JSAtom atom, void *opaque)
 {
 const JSCFunctionListEntry *e = opaque;
- JSValueConst obj = JS_MKPTR(JS_TAG_OBJECT, p);
+ JSValue val;
+
+ switch(e->def_type) {
+ case JS_DEF_CFUNC:
+ val = JS_NewCFunction2(ctx, e->u.func.cfunc.generic,
+ e->name, e->u.func.length, e->u.func.cproto, e->magic);
+ break;
+ case JS_DEF_PROP_STRING:
+ val = JS_NewAtomString(ctx, e->u.str);
+ break;
+ case JS_DEF_OBJECT:
+ val = JS_NewObject(ctx);
+ JS_SetPropertyFunctionList(ctx, val, e->u.prop_list.tab, e->u.prop_list.len);
+ break;
+ default:
+ abort();
+ }
+ return val;
+}
+
+static int JS_InstantiateFunctionListItem(JSContext *ctx, JSValueConst obj,
+ JSAtom atom,
+ const JSCFunctionListEntry *e)
+{
 JSValue val;
 int prop_flags = e->prop_flags;
 
 switch(e->def_type) {
- case JS_DEF_ALIAS:
+ case JS_DEF_ALIAS: /* using autoinit for aliases is not safe */
 {
 JSAtom atom1 = find_atom(ctx, e->u.alias.name);
 switch (e->u.alias.base) {
@@ -34316,12 +36151,16 @@
 abort();
 }
 JS_FreeAtom(ctx, atom1);
- goto setval;
+ if (atom == JS_ATOM_Symbol_toPrimitive) {
+ /* Symbol.toPrimitive functions are not writable */
+ prop_flags = JS_PROP_CONFIGURABLE;
+ } else if (atom == JS_ATOM_Symbol_hasInstance) {
+ /* Function.prototype[Symbol.hasInstance] is not writable nor configurable */
+ prop_flags = 0;
+ }
 }
+ break;
 case JS_DEF_CFUNC:
- val = JS_NewCFunction2(ctx, e->u.func.cfunc.generic,
- e->name, e->u.func.length, e->u.func.cproto, e->magic);
- setval:
 if (atom == JS_ATOM_Symbol_toPrimitive) {
 /* Symbol.toPrimitive functions are not writable */
 prop_flags = JS_PROP_CONFIGURABLE;
@@ -34329,8 +36168,10 @@
 /* Function.prototype[Symbol.hasInstance] is not writable nor configurable */
 prop_flags = 0;
 }
- break;
- case JS_DEF_CGETSET:
+ JS_DefineAutoInitProperty(ctx, obj, atom, JS_AUTOINIT_ID_PROP,
+ (void *)e, prop_flags);
+ return 0;
+ case JS_DEF_CGETSET: /* XXX: use autoinit again ? */
 case JS_DEF_CGETSET_MAGIC:
 {
 JSValue getter, setter;
@@ -34354,9 +36195,6 @@
 return 0;
 }
 break;
- case JS_DEF_PROP_STRING:
- val = JS_NewAtomString(ctx, e->u.str);
- break;
 case JS_DEF_PROP_INT32:
 val = JS_NewInt32(ctx, e->u.i32);
 break;
@@ -34369,10 +36207,11 @@
 case JS_DEF_PROP_UNDEFINED:
 val = JS_UNDEFINED;
 break;
+ case JS_DEF_PROP_STRING:
 case JS_DEF_OBJECT:
- val = JS_NewObject(ctx);
- JS_SetPropertyFunctionList(ctx, val, e->u.prop_list.tab, e->u.prop_list.len);
- break;
+ JS_DefineAutoInitProperty(ctx, obj, atom, JS_AUTOINIT_ID_PROP,
+ (void *)e, prop_flags);
+ return 0;
 default:
 abort();
 }
@@ -34383,36 +36222,12 @@
 void JS_SetPropertyFunctionList(JSContext *ctx, JSValueConst obj,
 const JSCFunctionListEntry *tab, int len)
 {
- int i, prop_flags;
+ int i;
 
 for (i = 0; i < len; i++) {
 const JSCFunctionListEntry *e = &tab[i];
 JSAtom atom = find_atom(ctx, e->name);
-
- switch (e->def_type) {
- case JS_DEF_CFUNC:
- case JS_DEF_CGETSET:
- case JS_DEF_CGETSET_MAGIC:
- case JS_DEF_PROP_STRING:
- case JS_DEF_ALIAS:
- case JS_DEF_OBJECT:
- prop_flags = JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE | (e->prop_flags & JS_PROP_ENUMERABLE);
- JS_DefineAutoInitProperty(ctx, obj, atom,
- JS_InstantiateFunctionListItem,
- (void *)e, prop_flags);
- break;
- case JS_DEF_PROP_INT32:
- case JS_DEF_PROP_INT64:
- case JS_DEF_PROP_DOUBLE:
- case JS_DEF_PROP_UNDEFINED:
- {
- JSObject *p = JS_VALUE_GET_OBJ(obj);
- JS_InstantiateFunctionListItem(ctx, p, atom, (void *)e);
- }
- break;
- default:
- abort();
- }
+ JS_InstantiateFunctionListItem(ctx, obj, atom, e);
 JS_FreeAtom(ctx, atom);
 }
 }
@@ -34453,6 +36268,10 @@
 case JS_DEF_PROP_DOUBLE:
 val = __JS_NewFloat64(ctx, e->u.f64);
 break;
+ case JS_DEF_OBJECT:
+ val = JS_NewObject(ctx);
+ JS_SetPropertyFunctionList(ctx, val, e->u.prop_list.tab, e->u.prop_list.len);
+ break;
 default:
 abort();
 }
@@ -34477,7 +36296,7 @@
 set_cycle_flag(ctx, proto);
 }
 
-void JS_SetConstructor(JSContext *ctx, JSValueConst func_obj,
+void JS_SetConstructor(JSContext *ctx, JSValueConst func_obj, 
 JSValueConst proto)
 {
 JS_SetConstructor2(ctx, func_obj, proto,
@@ -34560,30 +36379,20 @@
 case JS_TAG_EXCEPTION:
 return JS_DupValue(ctx, val);
 #ifdef CONFIG_BIGNUM
- case JS_TAG_INT:
- if (is_bigint_mode(ctx))
- obj = JS_NewObjectClass(ctx, JS_CLASS_BIG_INT);
- else
- obj = JS_NewObjectClass(ctx, JS_CLASS_NUMBER);
- goto set_value;
 case JS_TAG_BIG_INT:
 obj = JS_NewObjectClass(ctx, JS_CLASS_BIG_INT);
 goto set_value;
- case JS_TAG_FLOAT64:
- obj = JS_NewObjectClass(ctx, JS_CLASS_NUMBER);
- goto set_value;
 case JS_TAG_BIG_FLOAT:
 obj = JS_NewObjectClass(ctx, JS_CLASS_BIG_FLOAT);
 goto set_value;
 case JS_TAG_BIG_DECIMAL:
 obj = JS_NewObjectClass(ctx, JS_CLASS_BIG_DECIMAL);
 goto set_value;
-#else
+#endif
 case JS_TAG_INT:
 case JS_TAG_FLOAT64:
 obj = JS_NewObjectClass(ctx, JS_CLASS_NUMBER);
 goto set_value;
-#endif
 case JS_TAG_STRING:
 /* XXX: should call the string constructor */
 {
@@ -34725,7 +36534,7 @@
 if (JS_IsException(props))
 return -1;
 p = JS_VALUE_GET_OBJ(props);
- if (JS_GetOwnPropertyNamesInternal(ctx, &atoms, &len, p, JS_GPN_ENUM_ONLY | JS_GPN_STRING_MASK) < 0)
+ if (JS_GetOwnPropertyNamesInternal(ctx, &atoms, &len, p, JS_GPN_ENUM_ONLY | JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK) < 0)
 goto exception;
 for(i = 0; i < len; i++) {
 JS_FreeValue(ctx, desc);
@@ -34802,7 +36611,7 @@
 JS_VALUE_GET_TAG(val) == JS_TAG_UNDEFINED)
 return JS_ThrowTypeErrorNotAnObject(ctx);
 }
- return JS_DupValue(ctx, JS_GetPrototype(ctx, val));
+ return JS_GetPrototype(ctx, val);
 }
 
 static JSValue js_object_setPrototypeOf(JSContext *ctx, JSValueConst this_val,
@@ -35156,10 +36965,13 @@
 ret = JS_PreventExtensions(ctx, obj);
 if (ret < 0)
 return JS_EXCEPTION;
- if (reflect)
+ if (reflect) {
 return JS_NewBool(ctx, ret);
- else
+ } else {
+ if (!ret)
+ return JS_ThrowTypeError(ctx, "proxy preventExtensions handler returned false");
 return JS_DupValue(ctx, obj);
+ }
 }
 
 static JSValue js_object_hasOwnProperty(JSContext *ctx, JSValueConst this_val,
@@ -35301,7 +37113,7 @@
 if (!res) {
 return JS_ThrowTypeError(ctx, "proxy preventExtensions handler returned false");
 }
-
+ 
 p = JS_VALUE_GET_OBJ(obj);
 flags = JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK;
 if (JS_GetOwnPropertyNamesInternal(ctx, &props, &len, p, flags))
@@ -35327,7 +37139,7 @@
 goto exception;
 }
 js_free_prop_enum(ctx, props, len);
- return JS_TRUE;
+ return JS_DupValue(ctx, obj);
 
 exception:
 js_free_prop_enum(ctx, props, len);
@@ -35342,7 +37154,7 @@
 JSPropertyEnum *props;
 uint32_t len, i;
 int flags, res;
-
+ 
 if (!JS_IsObject(obj))
 return JS_TRUE;
 
@@ -35371,7 +37183,7 @@
 if (res < 0)
 return JS_EXCEPTION;
 res ^= 1;
-done:
+done: 
 js_free_prop_enum(ctx, props, len);
 return JS_NewBool(ctx, res);
 
@@ -35394,14 +37206,14 @@
 obj = JS_NewObject(ctx);
 if (JS_IsException(obj))
 return obj;
-
+ 
 iter = JS_GetIterator(ctx, iterable, FALSE);
 if (JS_IsException(iter))
 goto fail;
 next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
 if (JS_IsException(next_method))
 goto fail;
-
+ 
 for(;;) {
 JSValue key, value, item;
 item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
@@ -35411,7 +37223,7 @@
 JS_FreeValue(ctx, item);
 break;
 }
-
+ 
 key = JS_UNDEFINED;
 value = JS_UNDEFINED;
 if (!JS_IsObject(item)) {
@@ -35593,7 +37405,7 @@
 val = JS_ToObject(ctx, this_val);
 if (JS_IsException(val))
 return val;
- ret = JS_DupValue(ctx, JS_GetPrototype(ctx, val));
+ ret = JS_GetPrototype(ctx, val);
 JS_FreeValue(ctx, val);
 return ret;
 }
@@ -35614,9 +37426,9 @@
 static JSValue js_object_isPrototypeOf(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv)
 {
- JSValue obj;
+ JSValue obj, v1;
 JSValueConst v;
- int max_depth = 1000, res = -1;
+ int res;
 
 v = argv[0];
 if (!JS_IsObject(v))
@@ -35624,27 +37436,29 @@
 obj = JS_ToObject(ctx, this_val);
 if (JS_IsException(obj))
 return JS_EXCEPTION;
- while (--max_depth > 0) {
- v = JS_GetPrototype(ctx, v);
- if (JS_IsException(v))
+ v1 = JS_DupValue(ctx, v);
+ for(;;) {
+ v1 = JS_GetPrototypeFree(ctx, v1);
+ if (JS_IsException(v1))
 goto exception;
- if (JS_IsNull(v)) {
+ if (JS_IsNull(v1)) {
 res = FALSE;
 break;
 }
- if (js_strict_eq2(ctx, JS_DupValue(ctx, obj), JS_DupValue(ctx, v),
- JS_EQ_STRICT)) {
+ if (JS_VALUE_GET_OBJ(obj) == JS_VALUE_GET_OBJ(v1)) {
 res = TRUE;
 break;
 }
+ /* avoid infinite loop (possible with proxies) */
+ if (js_poll_interrupts(ctx))
+ goto exception;
 }
+ JS_FreeValue(ctx, v1);
 JS_FreeValue(ctx, obj);
- if (res < 0)
- return JS_ThrowInternalError(ctx, "prototype chain cycle");
- else
- return JS_NewBool(ctx, res);
+ return JS_NewBool(ctx, res);
 
 exception:
+ JS_FreeValue(ctx, v1);
 JS_FreeValue(ctx, obj);
 return JS_EXCEPTION;
 }
@@ -35684,7 +37498,6 @@
 int argc, JSValueConst *argv, int setter)
 {
 JSValue obj, res = JS_EXCEPTION;
- JSValueConst v;
 JSAtom prop = JS_ATOM_NULL;
 JSPropertyDescriptor desc;
 int has_prop;
@@ -35696,8 +37509,8 @@
 if (unlikely(prop == JS_ATOM_NULL))
 goto exception;
 
- for (v = obj;;) {
- has_prop = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(v), prop);
+ for (;;) {
+ has_prop = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(obj), prop);
 if (has_prop < 0)
 goto exception;
 if (has_prop) {
@@ -35708,13 +37521,16 @@
 js_free_desc(ctx, &desc);
 break;
 }
- v = JS_GetPrototype(ctx, v);
- if (JS_IsException(v))
+ obj = JS_GetPrototypeFree(ctx, obj);
+ if (JS_IsException(obj))
 goto exception;
- if (JS_IsNull(v)) {
+ if (JS_IsNull(obj)) {
 res = JS_UNDEFINED;
 break;
 }
+ /* avoid infinite loop (possible with proxies) */
+ if (js_poll_interrupts(ctx))
+ goto exception;
 }
 
 exception:
@@ -35780,65 +37596,18 @@
 return JS_UNDEFINED;
 }
 
-/* insert a '\n' at unicode character position 'pos' in the source of
- 'func_obj' */
-static int patch_function_constructor_source(JSContext *ctx,
- JSValueConst func_obj,
- size_t pos)
-{
- JSObject *p;
- JSFunctionBytecode *b;
- char *r, *r_end, *new_source;
- int c;
- size_t idx, len;
-
- if (JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)
- return 0;
- p = JS_VALUE_GET_OBJ(func_obj);
- if (!js_class_has_bytecode(p->class_id))
- return 0;
- b = p->u.func.function_bytecode;
- if (!b->has_debug)
- return 0;
- r = b->debug.source;
- r_end = b->debug.source + b->debug.source_len;
- idx = 0;
- while (r < r_end) {
- if (idx == pos) {
- /* add the '\n' */
- new_source = js_realloc(ctx, b->debug.source,
- b->debug.source_len + 2);
- if (!new_source)
- return -1;
- len = r - b->debug.source;
- memmove(new_source + len + 1, new_source + len,
- b->debug.source_len + 1 - len);
- new_source[len] = '\n';
- b->debug.source = new_source;
- b->debug.source_len++;
- break;
- }
- c = unicode_from_utf8((const uint8_t *)r, UTF8_CHAR_LEN_MAX,
- (const uint8_t **)&r);
- if (c < 0)
- break;
- idx++;
- }
- return 0;
-}
-
 /* XXX: add a specific eval mode so that Function("}), ({") is rejected */
 static JSValue js_function_constructor(JSContext *ctx, JSValueConst new_target,
 int argc, JSValueConst *argv, int magic)
 {
 JSFunctionKindEnum func_kind = magic;
- int i, n, ret, func_start_pos;
+ int i, n, ret;
 JSValue s, proto, obj = JS_UNDEFINED;
 StringBuffer b_s, *b = &b_s;
 
 string_buffer_init(ctx, b, 0);
 string_buffer_putc8(b, '(');
-
+ 
 if (func_kind == JS_FUNC_ASYNC || func_kind == JS_FUNC_ASYNC_GENERATOR) {
 string_buffer_puts8(b, "async ");
 }
@@ -35857,13 +37626,7 @@
 if (string_buffer_concat_value(b, argv[i]))
 goto fail;
 }
- string_buffer_puts8(b, "\n) {");
- /* Annex B HTML comments: We don't add a '\n' after "{" so that
- "-->" is not considered as an HTML comment. It is necessary
- because in the spec the function body is parsed separately. */
- /* XXX: find a simpler way or be deliberately incompatible to
- simplify the code ? */
- func_start_pos = b->len - 1; /* the leading '(' is not in the source */
+ string_buffer_puts8(b, "\n) {\n");
 if (n >= 0) {
 if (string_buffer_concat_value(b, argv[n]))
 goto fail;
@@ -35877,19 +37640,23 @@
 JS_FreeValue(ctx, s);
 if (JS_IsException(obj))
 goto fail1;
- if (patch_function_constructor_source(ctx, obj, func_start_pos) < 0)
- goto fail1;
 if (!JS_IsUndefined(new_target)) {
 /* set the prototype */
- proto = js_get_prototype_from_ctor(ctx, new_target, JS_UNDEFINED);
+ proto = JS_GetProperty(ctx, new_target, JS_ATOM_prototype);
 if (JS_IsException(proto))
 goto fail1;
- if (!JS_IsUndefined(proto)) {
- ret = JS_SetPrototypeInternal(ctx, obj, proto, TRUE);
+ if (!JS_IsObject(proto)) {
+ JSContext *realm;
 JS_FreeValue(ctx, proto);
- if (ret < 0)
+ realm = JS_GetFunctionRealm(ctx, new_target);
+ if (!realm)
 goto fail1;
+ proto = JS_DupValue(ctx, realm->class_proto[func_kind_to_class_id[func_kind]]);
 }
+ ret = JS_SetPrototypeInternal(ctx, obj, proto, TRUE);
+ JS_FreeValue(ctx, proto);
+ if (ret < 0)
+ goto fail1;
 }
 return obj;
 
@@ -35947,6 +37714,10 @@
 }
 if (js_get_length32(ctx, &len, array_arg))
 return NULL;
+ if (len > JS_MAX_LOCAL_VARS) {
+ JS_ThrowInternalError(ctx, "too many arguments");
+ return NULL;
+ }
 /* avoid allocating 0 bytes */
 tab = js_mallocz(ctx, sizeof(tab[0]) * max_uint32(1, len));
 if (!tab)
@@ -35972,6 +37743,8 @@
 return tab;
 }
 
+/* magic value: 0 = normal apply, 1 = apply for constructor, 2 =
+ Reflect.apply */
 static JSValue js_function_apply(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv, int magic)
 {
@@ -35983,14 +37756,14 @@
 return JS_EXCEPTION;
 this_arg = argv[0];
 array_arg = argv[1];
- if (JS_VALUE_GET_TAG(array_arg) == JS_TAG_UNDEFINED ||
- JS_VALUE_GET_TAG(array_arg) == JS_TAG_NULL) {
+ if ((JS_VALUE_GET_TAG(array_arg) == JS_TAG_UNDEFINED ||
+ JS_VALUE_GET_TAG(array_arg) == JS_TAG_NULL) && magic != 2) {
 return JS_Call(ctx, this_val, this_arg, 0, NULL);
 }
 tab = build_arg_list(ctx, &len, array_arg);
 if (!tab)
 return JS_EXCEPTION;
- if (magic) {
+ if (magic & 1) {
 ret = JS_CallConstructor2(ctx, this_val, this_arg, len, (JSValueConst *)tab);
 } else {
 ret = JS_Call(ctx, this_val, this_arg, len, (JSValueConst *)tab);
@@ -36013,10 +37786,9 @@
 int argc, JSValueConst *argv)
 {
 JSBoundFunction *bf;
- JSValue func_obj, name1;
+ JSValue func_obj, name1, len_val;
 JSObject *p;
- int arg_count, i;
- uint32_t len1;
+ int arg_count, i, ret;
 
 if (check_function(ctx, this_val))
 return JS_EXCEPTION;
@@ -36039,6 +37811,44 @@
 }
 p->u.bound_function = bf;
 
+ /* XXX: the spec could be simpler by only using GetOwnProperty */
+ ret = JS_GetOwnProperty(ctx, NULL, this_val, JS_ATOM_length);
+ if (ret < 0)
+ goto exception;
+ if (!ret) {
+ len_val = JS_NewInt32(ctx, 0);
+ } else {
+ len_val = JS_GetProperty(ctx, this_val, JS_ATOM_length);
+ if (JS_IsException(len_val))
+ goto exception;
+ if (JS_VALUE_GET_TAG(len_val) == JS_TAG_INT) {
+ /* most common case */
+ int len1 = JS_VALUE_GET_INT(len_val);
+ if (len1 <= arg_count)
+ len1 = 0;
+ else
+ len1 -= arg_count;
+ len_val = JS_NewInt32(ctx, len1);
+ } else if (JS_VALUE_GET_NORM_TAG(len_val) == JS_TAG_FLOAT64) {
+ double d = JS_VALUE_GET_FLOAT64(len_val);
+ if (isnan(d)) {
+ d = 0.0;
+ } else {
+ d = trunc(d);
+ if (d <= (double)arg_count)
+ d = 0.0;
+ else
+ d -= (double)arg_count; /* also converts -0 to +0 */
+ }
+ len_val = JS_NewFloat64(ctx, d);
+ } else {
+ JS_FreeValue(ctx, len_val);
+ len_val = JS_NewInt32(ctx, 0);
+ }
+ }
+ JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_length,
+ len_val, JS_PROP_CONFIGURABLE);
+
 name1 = JS_GetProperty(ctx, this_val, JS_ATOM_name);
 if (JS_IsException(name1))
 goto exception;
@@ -36051,15 +37861,6 @@
 goto exception;
 JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_name, name1,
 JS_PROP_CONFIGURABLE);
- if (js_get_length32(ctx, &len1, this_val))
- goto exception;
- if (len1 <= (uint32_t)arg_count)
- len1 = 0;
- else
- len1 -= arg_count;
- JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_length,
- JS_NewUint32(ctx, len1),
- JS_PROP_CONFIGURABLE);
 return func_obj;
 exception:
 JS_FreeValue(ctx, func_obj);
@@ -36087,27 +37888,22 @@
 JSValue name;
 const char *pref, *suff;
 
- if (p->is_class) {
- pref = "class ";
- suff = " {\n [native code]\n}";
- } else {
- switch(func_kind) {
- default:
- case JS_FUNC_NORMAL:
- pref = "function ";
- break;
- case JS_FUNC_GENERATOR:
- pref = "function *";
- break;
- case JS_FUNC_ASYNC:
- pref = "async function ";
- break;
- case JS_FUNC_ASYNC_GENERATOR:
- pref = "async function *";
- break;
- }
- suff = "() {\n [native code]\n}";
+ switch(func_kind) {
+ default:
+ case JS_FUNC_NORMAL:
+ pref = "function ";
+ break;
+ case JS_FUNC_GENERATOR:
+ pref = "function *";
+ break;
+ case JS_FUNC_ASYNC:
+ pref = "async function ";
+ break;
+ case JS_FUNC_ASYNC_GENERATOR:
+ pref = "async function *";
+ break;
 }
+ suff = "() {\n [native code]\n}";
 name = JS_GetProperty(ctx, this_val, JS_ATOM_name);
 if (JS_IsUndefined(name))
 name = JS_AtomToString(ctx, JS_ATOM_empty_string);
@@ -36138,38 +37934,102 @@
 
 /* Error class */
 
+static JSValue iterator_to_array(JSContext *ctx, JSValueConst items)
+{
+ JSValue iter, next_method = JS_UNDEFINED;
+ JSValue v, r = JS_UNDEFINED;
+ int64_t k;
+ BOOL done;
+ 
+ iter = JS_GetIterator(ctx, items, FALSE);
+ if (JS_IsException(iter))
+ goto exception;
+ next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+ if (JS_IsException(next_method))
+ goto exception;
+ r = JS_NewArray(ctx);
+ if (JS_IsException(r))
+ goto exception;
+ for (k = 0;; k++) {
+ v = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+ if (JS_IsException(v))
+ goto exception_close;
+ if (done)
+ break;
+ if (JS_DefinePropertyValueInt64(ctx, r, k, v,
+ JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+ goto exception_close;
+ }
+ done:
+ JS_FreeValue(ctx, next_method);
+ JS_FreeValue(ctx, iter);
+ return r;
+ exception_close:
+ JS_IteratorClose(ctx, iter, TRUE);
+ exception:
+ JS_FreeValue(ctx, r);
+ r = JS_EXCEPTION;
+ goto done;
+}
+
 static JSValue js_error_constructor(JSContext *ctx, JSValueConst new_target,
 int argc, JSValueConst *argv, int magic)
 {
 JSValue obj, msg, proto;
- JSValueConst proto1;
+ JSValueConst message;
 
 if (JS_IsUndefined(new_target))
 new_target = JS_GetActiveFunction(ctx);
- if (magic < 0) {
- proto1 = ctx->class_proto[JS_CLASS_ERROR];
- } else {
- proto1 = ctx->native_error_proto[magic];
- }
- proto = js_get_prototype_from_ctor(ctx, new_target, proto1);
+ proto = JS_GetProperty(ctx, new_target, JS_ATOM_prototype);
 if (JS_IsException(proto))
 return proto;
+ if (!JS_IsObject(proto)) {
+ JSContext *realm;
+ JSValueConst proto1;
+ 
+ JS_FreeValue(ctx, proto);
+ realm = JS_GetFunctionRealm(ctx, new_target);
+ if (!realm)
+ return JS_EXCEPTION;
+ if (magic < 0) {
+ proto1 = realm->class_proto[JS_CLASS_ERROR];
+ } else {
+ proto1 = realm->native_error_proto[magic];
+ }
+ proto = JS_DupValue(ctx, proto1);
+ }
 obj = JS_NewObjectProtoClass(ctx, proto, JS_CLASS_ERROR);
 JS_FreeValue(ctx, proto);
 if (JS_IsException(obj))
 return obj;
- if (!JS_IsUndefined(argv[0])) {
- msg = JS_ToString(ctx, argv[0]);
- if (unlikely(JS_IsException(msg))) {
- JS_FreeValue(ctx, obj);
- return JS_EXCEPTION;
- }
+ if (magic == JS_AGGREGATE_ERROR) {
+ message = argv[1];
+ } else {
+ message = argv[0];
+ }
+
+ if (!JS_IsUndefined(message)) {
+ msg = JS_ToString(ctx, message);
+ if (unlikely(JS_IsException(msg)))
+ goto exception;
 JS_DefinePropertyValue(ctx, obj, JS_ATOM_message, msg,
 JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
 }
+
+ if (magic == JS_AGGREGATE_ERROR) {
+ JSValue error_list = iterator_to_array(ctx, argv[0]);
+ if (JS_IsException(error_list))
+ goto exception;
+ JS_DefinePropertyValue(ctx, obj, JS_ATOM_errors, error_list,
+ JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+ }
+
 /* skip the Error() function in the backtrace */
 build_backtrace(ctx, obj, NULL, 0, JS_BACKTRACE_FLAG_SKIP_FIRST_LEVEL);
 return obj;
+ exception:
+ JS_FreeValue(ctx, obj);
+ return JS_EXCEPTION;
 }
 
 static JSValue js_error_toString(JSContext *ctx, JSValueConst this_val,
@@ -36207,6 +38067,24 @@
 JS_PROP_STRING_DEF("message", "", JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
 };
 
+/* AggregateError */
+
+/* used by C code. */
+static JSValue js_aggregate_error_constructor(JSContext *ctx,
+ JSValueConst errors)
+{
+ JSValue obj;
+ 
+ obj = JS_NewObjectProtoClass(ctx,
+ ctx->native_error_proto[JS_AGGREGATE_ERROR],
+ JS_CLASS_ERROR);
+ if (JS_IsException(obj))
+ return obj;
+ JS_DefinePropertyValue(ctx, obj, JS_ATOM_errors, JS_DupValue(ctx, errors),
+ JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+ return obj;
+}
+
 /* Array */
 
 static int JS_CopySubArray(JSContext *ctx,
@@ -36255,7 +38133,7 @@
 return obj;
 if (argc == 1 && JS_IsNumber(argv[0])) {
 uint32_t len;
- if (JS_ToArrayLengthFree(ctx, &len, JS_DupValue(ctx, argv[0])))
+ if (JS_ToArrayLengthFree(ctx, &len, JS_DupValue(ctx, argv[0]), TRUE))
 goto fail;
 if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewUint32(ctx, len)) < 0)
 goto fail;
@@ -36432,22 +38310,47 @@
 static JSValue JS_ArraySpeciesCreate(JSContext *ctx, JSValueConst obj,
 JSValueConst len_val)
 {
- JSValue ctor, ret;
+ JSValue ctor, ret, species;
 int res;
-
+ JSContext *realm;
+ 
 res = JS_IsArray(ctx, obj);
 if (res < 0)
 return JS_EXCEPTION;
 if (!res)
 return js_array_constructor(ctx, JS_UNDEFINED, 1, &len_val);
- ctor = JS_SpeciesConstructor(ctx, obj, JS_UNDEFINED);
+ ctor = JS_GetProperty(ctx, obj, JS_ATOM_constructor);
 if (JS_IsException(ctor))
- return JS_EXCEPTION;
- if (JS_IsUndefined(ctor))
+ return ctor;
+ if (JS_IsConstructor(ctx, ctor)) {
+ /* legacy web compatibility */
+ realm = JS_GetFunctionRealm(ctx, ctor);
+ if (!realm) {
+ JS_FreeValue(ctx, ctor);
+ return JS_EXCEPTION;
+ }
+ if (realm != ctx &&
+ js_same_value(ctx, ctor, realm->array_ctor)) {
+ JS_FreeValue(ctx, ctor);
+ ctor = JS_UNDEFINED;
+ }
+ }
+ if (JS_IsObject(ctor)) {
+ species = JS_GetProperty(ctx, ctor, JS_ATOM_Symbol_species);
+ JS_FreeValue(ctx, ctor);
+ if (JS_IsException(species))
+ return species;
+ ctor = species;
+ if (JS_IsNull(ctor))
+ ctor = JS_UNDEFINED;
+ }
+ if (JS_IsUndefined(ctor)) {
 return js_array_constructor(ctx, JS_UNDEFINED, 1, &len_val);
- ret = JS_CallConstructor(ctx, ctor, 1, &len_val);
- JS_FreeValue(ctx, ctor);
- return ret;
+ } else {
+ ret = JS_CallConstructor(ctx, ctor, 1, &len_val);
+ JS_FreeValue(ctx, ctor);
+ return ret;
+ }
 }
 
 static const JSCFunctionListEntry js_array_funcs[] = {
@@ -36500,7 +38403,7 @@
 if (res) {
 if (js_get_length64(ctx, &len, e))
 goto exception;
- if (n + len >= MAX_SAFE_INTEGER) {
+ if (n + len > MAX_SAFE_INTEGER) {
 JS_ThrowTypeError(ctx, "Array loo long");
 goto exception;
 }
@@ -36575,7 +38478,7 @@
 this_arg = JS_UNDEFINED;
 if (argc > 1)
 this_arg = argv[1];
-
+ 
 if (check_function(ctx, func))
 goto exception;
 
@@ -36615,9 +38518,16 @@
 n = 0;
 
 for(k = 0; k < len; k++) {
- present = JS_TryGetPropertyInt64(ctx, obj, k, &val);
- if (present < 0)
- goto exception;
+ if (special & special_TA) {
+ val = JS_GetPropertyInt64(ctx, obj, k);
+ if (JS_IsException(val))
+ goto exception;
+ present = TRUE;
+ } else {
+ present = JS_TryGetPropertyInt64(ctx, obj, k, &val);
+ if (present < 0)
+ goto exception;
+ }
 if (present) {
 index_val = JS_NewInt64(ctx, k);
 if (JS_IsException(index_val))
@@ -36735,18 +38645,32 @@
 }
 k1 = (special & special_reduceRight) ? len - k - 1 : k;
 k++;
- present = JS_TryGetPropertyInt64(ctx, obj, k1, &acc);
- if (present < 0)
- goto exception;
- if (present)
+ if (special & special_TA) {
+ acc = JS_GetPropertyInt64(ctx, obj, k1);
+ if (JS_IsException(acc))
+ goto exception;
 break;
+ } else {
+ present = JS_TryGetPropertyInt64(ctx, obj, k1, &acc);
+ if (present < 0)
+ goto exception;
+ if (present)
+ break;
+ }
 }
 }
 for (; k < len; k++) {
 k1 = (special & special_reduceRight) ? len - k - 1 : k;
- present = JS_TryGetPropertyInt64(ctx, obj, k1, &val);
- if (present < 0)
- goto exception;
+ if (special & special_TA) {
+ val = JS_GetPropertyInt64(ctx, obj, k1);
+ if (JS_IsException(val))
+ goto exception;
+ present = TRUE;
+ } else {
+ present = JS_TryGetPropertyInt64(ctx, obj, k1, &val);
+ if (present < 0)
+ goto exception;
+ }
 if (present) {
 index_val = JS_NewInt64(ctx, k1);
 if (JS_IsException(index_val))
@@ -37151,27 +39075,64 @@
 int64_t len, from, newLen;
 
 obj = JS_ToObject(ctx, this_val);
- if (js_get_length64(ctx, &len, obj))
- goto exception;
- newLen = len + argc;
- if (newLen > MAX_SAFE_INTEGER) {
- JS_ThrowTypeError(ctx, "Array loo long");
- goto exception;
- }
- from = len;
- if (unshift && argc > 0) {
- if (JS_CopySubArray(ctx, obj, argc, 0, len, -1))
+
+ if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+ JSObject *p = JS_VALUE_GET_OBJ(obj);
+ if (p->class_id != JS_CLASS_ARRAY ||
+ !p->fast_array || !p->extensible)
+ goto generic_case;
+ /* length must be writable */
+ if (unlikely(!(get_shape_prop(p->shape)->flags & JS_PROP_WRITABLE)))
+ goto generic_case;
+ /* check the length */
+ if (unlikely(JS_VALUE_GET_TAG(p->prop[0].u.value) != JS_TAG_INT))
+ goto generic_case;
+ len = JS_VALUE_GET_INT(p->prop[0].u.value);
+ /* we don't support holes */
+ if (unlikely(len != p->u.array.count))
+ goto generic_case;
+ newLen = len + argc;
+ if (unlikely(newLen > INT32_MAX))
+ goto generic_case;
+ if (newLen > p->u.array.u1.size) {
+ if (expand_fast_array(ctx, p, newLen))
+ goto exception;
+ }
+ if (unshift && argc > 0) {
+ memmove(p->u.array.u.values + argc, p->u.array.u.values,
+ len * sizeof(p->u.array.u.values[0]));
+ from = 0;
+ } else {
+ from = len;
+ }
+ for(i = 0; i < argc; i++) {
+ p->u.array.u.values[from + i] = JS_DupValue(ctx, argv[i]);
+ }
+ p->u.array.count = newLen;
+ p->prop[0].u.value = JS_NewInt32(ctx, newLen);
+ } else {
+ generic_case:
+ if (js_get_length64(ctx, &len, obj))
 goto exception;
- from = 0;
- }
- for(i = 0; i < argc; i++) {
- if (JS_SetPropertyInt64(ctx, obj, from + i,
- JS_DupValue(ctx, argv[i])) < 0)
+ newLen = len + argc;
+ if (newLen > MAX_SAFE_INTEGER) {
+ JS_ThrowTypeError(ctx, "Array loo long");
+ goto exception;
+ }
+ from = len;
+ if (unshift && argc > 0) {
+ if (JS_CopySubArray(ctx, obj, argc, 0, len, -1))
+ goto exception;
+ from = 0;
+ }
+ for(i = 0; i < argc; i++) {
+ if (JS_SetPropertyInt64(ctx, obj, from + i,
+ JS_DupValue(ctx, argv[i])) < 0)
+ goto exception;
+ }
+ if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewInt64(ctx, newLen)) < 0)
 goto exception;
 }
- if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewInt64(ctx, newLen)) < 0)
- goto exception;
-
 JS_FreeValue(ctx, obj);
 return JS_NewInt64(ctx, newLen);
 
@@ -37401,6 +39362,11 @@
 int64_t sourceIndex, elementLen;
 int present, is_array;
 
+ if (js_check_stack_overflow(ctx->rt, 0)) {
+ JS_ThrowStackOverflow(ctx);
+ return -1;
+ }
+
 for (sourceIndex = 0; sourceIndex < sourceLen; sourceIndex++) {
 present = JS_TryGetPropertyInt64(ctx, source, sourceIndex, &element);
 if (present < 0)
@@ -37441,7 +39407,8 @@
 JS_ThrowTypeError(ctx, "Array too long");
 goto fail;
 }
- if (JS_SetPropertyInt64(ctx, target, targetIndex, element) < 0)
+ if (JS_DefinePropertyValueInt64(ctx, target, targetIndex, element,
+ JS_PROP_C_W_E | JS_PROP_THROW) < 0)
 return -1;
 targetIndex++;
 }
@@ -37838,7 +39805,6 @@
 JS_CFUNC_DEF("copyWithin", 2, js_array_copyWithin ),
 JS_CFUNC_MAGIC_DEF("flatMap", 1, js_array_flatten, 1 ),
 JS_CFUNC_MAGIC_DEF("flat", 0, js_array_flatten, 0 ),
- JS_CFUNC_MAGIC_DEF("flatten", 0, js_array_flatten, 0 ),
 JS_CFUNC_MAGIC_DEF("values", 0, js_create_array_iterator, JS_ITERATOR_KIND_VALUE ),
 JS_ALIAS_DEF("[Symbol.iterator]", "values" ),
 JS_CFUNC_MAGIC_DEF("keys", 0, js_create_array_iterator, JS_ITERATOR_KIND_KEY ),
@@ -37856,17 +39822,14 @@
 int argc, JSValueConst *argv)
 {
 JSValue val, obj;
-#ifdef CONFIG_BIGNUM
 if (argc == 0) {
- if (is_bigint_mode(ctx))
- val = __JS_NewFloat64(ctx, 0);
- else
- val = JS_NewInt32(ctx, 0);
+ val = JS_NewInt32(ctx, 0);
 } else {
 val = JS_ToNumeric(ctx, argv[0]);
 if (JS_IsException(val))
 return val;
 switch(JS_VALUE_GET_TAG(val)) {
+#ifdef CONFIG_BIGNUM
 case JS_TAG_BIG_INT:
 case JS_TAG_BIG_FLOAT:
 {
@@ -37877,25 +39840,19 @@
 val = __JS_NewFloat64(ctx, d);
 }
 break;
- case JS_TAG_INT:
- if (is_bigint_mode(ctx)) {
- /* always return a number in bignum mode */
- val = __JS_NewFloat64(ctx, JS_VALUE_GET_INT(val));
- }
+ case JS_TAG_BIG_DECIMAL:
+ val = JS_ToStringFree(ctx, val);
+ if (JS_IsException(val))
+ return val;
+ val = JS_ToNumberFree(ctx, val);
+ if (JS_IsException(val))
+ return val;
 break;
+#endif
 default:
 break;
 }
 }
-#else
- if (argc == 0) {
- val = JS_NewInt32(ctx, 0);
- } else {
- val = JS_ToNumber(ctx, argv[0]);
- if (JS_IsException(val))
- return val;
- }
-#endif
 if (!JS_IsUndefined(new_target)) {
 obj = js_create_from_ctor(ctx, new_target, JS_CLASS_NUMBER);
 if (!JS_IsException(obj))
@@ -37926,7 +39883,6 @@
 static JSValue js_number_isNaN(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv)
 {
- /* XXX: should just check for float and big_float */
 if (!JS_IsNumber(argv[0]))
 return JS_FALSE;
 return js_global_isNaN(ctx, this_val, argc, argv);
@@ -37959,8 +39915,7 @@
 return JS_FALSE;
 if (unlikely(JS_ToFloat64(ctx, &d, argv[0])))
 return JS_EXCEPTION;
- return JS_NewBool(ctx, isfinite(d) && floor(d) == d &&
- fabs(d) <= (double)MAX_SAFE_INTEGER);
+ return JS_NewBool(ctx, is_safe_integer(d));
 }
 
 static const JSCFunctionListEntry js_number_funcs[] = {
@@ -38004,6 +39959,18 @@
 return js_thisNumberValue(ctx, this_val);
 }
 
+static int js_get_radix(JSContext *ctx, JSValueConst val)
+{
+ int radix;
+ if (JS_ToInt32Sat(ctx, &radix, val))
+ return -1;
+ if (radix < 2 || radix > 36) {
+ JS_ThrowRangeError(ctx, "radix must be between 2 and 36");
+ return -1;
+ }
+ return radix;
+}
+
 static JSValue js_number_toString(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv, int magic)
 {
@@ -38017,12 +39984,9 @@
 if (magic || JS_IsUndefined(argv[0])) {
 base = 10;
 } else {
- if (JS_ToInt32Sat(ctx, &base, argv[0]))
- goto fail;
- if (base < 2 || base > 36) {
- JS_ThrowRangeError(ctx, "radix must be between 2 and 36");
+ base = js_get_radix(ctx, argv[0]);
+ if (base < 0)
 goto fail;
- }
 }
 if (JS_ToFloat64Free(ctx, &d, val))
 return JS_EXCEPTION;
@@ -38138,10 +40102,6 @@
 p = str;
 p += skip_spaces(p);
 flags = ATOD_INT_ONLY | ATOD_ACCEPT_PREFIX_AFTER_SIGN;
-#ifdef CONFIG_BIGNUM
- if (is_bigint_mode(ctx))
- flags |= ATOD_MODE_BIGINT;
-#endif
 ret = js_atof(ctx, p, NULL, radix, flags);
 }
 JS_FreeCString(ctx, str);
@@ -38250,46 +40210,6 @@
 return FALSE;
 }
 
-static uint32_t js_string_obj_get_length(JSContext *ctx,
- JSValueConst obj)
-{
- JSObject *p;
- JSString *p1;
- uint32_t len = 0;
-
- /* This is a class exotic method: obj class_id is JS_CLASS_STRING */
- p = JS_VALUE_GET_OBJ(obj);
- if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_STRING) {
- p1 = JS_VALUE_GET_STRING(p->u.object_data);
- len = p1->len;
- }
- return len;
-}
-
-static int js_string_get_own_property_names(JSContext *ctx,
- JSPropertyEnum **ptab,
- uint32_t *plen,
- JSValueConst obj)
-{
- JSPropertyEnum *tab;
- uint32_t len, i;
-
- len = js_string_obj_get_length(ctx, obj);
- tab = NULL;
- if (len > 0) {
- /* do not allocate 0 bytes */
- tab = js_malloc(ctx, sizeof(JSPropertyEnum) * len);
- if (!tab)
- return -1;
- for(i = 0; i < len; i++) {
- tab[i].atom = __JS_AtomFromUInt32(i);
- }
- }
- *ptab = tab;
- *plen = len;
- return 0;
-}
-
 static int js_string_define_own_property(JSContext *ctx,
 JSValueConst this_obj,
 JSAtom prop, JSValueConst val,
@@ -38297,14 +40217,31 @@
 JSValueConst setter, int flags)
 {
 uint32_t idx;
-
+ JSObject *p;
+ JSString *p1, *p2;
+ 
 if (__JS_AtomIsTaggedInt(prop)) {
 idx = __JS_AtomToUInt32(prop);
- if (idx >= js_string_obj_get_length(ctx, this_obj))
+ p = JS_VALUE_GET_OBJ(this_obj);
+ if (JS_VALUE_GET_TAG(p->u.object_data) != JS_TAG_STRING)
+ goto def;
+ p1 = JS_VALUE_GET_STRING(p->u.object_data);
+ if (idx >= p1->len)
 goto def;
 if (!check_define_prop_flags(JS_PROP_ENUMERABLE, flags))
- return JS_ThrowTypeErrorOrFalse(ctx, flags, "property is not configurable");
- /* XXX: should check if same value is configured */
+ goto fail;
+ /* check that the same value is configured */
+ if (flags & JS_PROP_HAS_VALUE) {
+ if (JS_VALUE_GET_TAG(val) != JS_TAG_STRING)
+ goto fail;
+ p2 = JS_VALUE_GET_STRING(val);
+ if (p2->len != 1)
+ goto fail;
+ if (string_get(p1, idx) != string_get(p2, 0)) {
+ fail:
+ return JS_ThrowTypeErrorOrFalse(ctx, flags, "property is not configurable");
+ }
+ }
 return TRUE;
 } else {
 def:
@@ -38329,7 +40266,6 @@
 
 static const JSClassExoticMethods js_string_exotic_methods = {
 .get_own_property = js_string_get_own_property,
- .get_own_property_names = js_string_get_own_property_names,
 .define_own_property = js_string_define_own_property,
 .delete_property = js_string_delete_property,
 };
@@ -38449,7 +40385,7 @@
 goto exception;
 if (js_get_length64(ctx, &n, raw) < 0)
 goto exception;
-
+ 
 for (i = 0; i < n; i++) {
 val = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, raw, i));
 if (JS_IsException(val))
@@ -38654,12 +40590,14 @@
 return -1;
 }
 
-static int string_advance_index(JSString *p, int index, BOOL unicode)
+static int64_t string_advance_index(JSString *p, int64_t index, BOOL unicode)
 {
- if (!unicode || (unsigned)index >= p->len || !p->is_wide_char) {
+ if (!unicode || index >= p->len || !p->is_wide_char) {
 index++;
 } else {
- string_getc(p, &index);
+ int index32 = (int)index;
+ string_getc(p, &index32);
+ index = index32;
 }
 return index;
 }
@@ -38756,22 +40694,25 @@
 p1 = JS_VALUE_GET_STRING(v);
 len = p->len;
 v_len = p1->len;
- pos = (magic & 2) ? len : 0;
+ pos = (magic == 2) ? len : 0;
 if (argc > 1 && !JS_IsUndefined(argv[1])) {
 if (JS_ToInt32Clamp(ctx, &pos, argv[1], 0, len, 0))
 goto fail;
 }
 len -= v_len;
- start = pos;
- stop = len;
- if (magic & 1) {
- stop = pos;
- }
- if (magic & 2) {
- pos -= v_len;
+ ret = 0;
+ if (magic == 0) {
+ start = pos;
+ stop = len;
+ } else {
+ if (magic == 1) {
+ if (pos > len)
+ goto done;
+ } else {
+ pos -= v_len;
+ }
 start = stop = pos;
 }
- ret = 0;
 if (start >= 0 && start <= stop) {
 for (i = start;; i++) {
 if (!string_cmp(p, p1, i, 0, v_len)) {
@@ -38782,6 +40723,7 @@
 break;
 }
 }
+ done:
 JS_FreeValue(ctx, str);
 JS_FreeValue(ctx, v);
 return JS_NewBool(ctx, ret);
@@ -38796,7 +40738,7 @@
 {
 int ret;
 JSValue flags;
-
+ 
 ret = js_is_regexp(ctx, regexp);
 if (ret < 0)
 return -1;
@@ -38862,7 +40804,8 @@
 #else
 args[args_len++] = (JSValueConst)str;
 #endif
- }
+
+	}
 rx = JS_CallConstructor(ctx, ctx->regexp_ctor, args_len, args);
 JS_FreeValue(ctx, str);
 if (JS_IsException(rx)) {
@@ -38931,15 +40874,17 @@
 string_buffer_concat(b, sp, position + matched_len, sp->len);
 } else if (c >= '0' && c <= '9') {
 k = c - '0';
- c1 = string_get(rp, j);
- if (c1 >= '0' && c1 <= '9') {
- /* This behavior is specified in ES6 and refined in ECMA 2019 */
- /* ECMA 2019 does not have the extra test, but
- Test262 S15.5.4.11_A3_T1..3 require this behavior */
- k1 = k * 10 + c1 - '0';
- if (k1 >= 1 && k1 < captures_len) {
- k = k1;
- j++;
+ if (j < len) {
+ c1 = string_get(rp, j);
+ if (c1 >= '0' && c1 <= '9') {
+ /* This behavior is specified in ES6 and refined in ECMA 2019 */
+ /* ECMA 2019 does not have the extra test, but
+ Test262 S15.5.4.11_A3_T1..3 require this behavior */
+ k1 = k * 10 + c1 - '0';
+ if (k1 >= 1 && k1 < captures_len) {
+ k = k1;
+ j++;
+ }
 }
 }
 if (k >= 1 && k < captures_len) {
@@ -39010,7 +40955,7 @@
 replacer = JS_GetProperty(ctx, searchValue, JS_ATOM_Symbol_replace);
 if (JS_IsException(replacer))
 return JS_EXCEPTION;
- if (!JS_IsUndefined(replacer)) {
+ if (!JS_IsUndefined(replacer) && !JS_IsNull(replacer)) {
 args[0] = O;
 args[1] = replaceValue;
 return JS_CallFree(ctx, replacer, searchValue, 2, args);
@@ -39072,7 +41017,7 @@
 }
 if (JS_IsException(repl_str))
 goto exception;
-
+ 
 string_buffer_concat(b, sp, endOfLastMatch, pos);
 string_buffer_concat_value_free(b, repl_str);
 endOfLastMatch = pos + searchp->len;
@@ -39291,10 +41236,6 @@
 len = p->len;
 if (len >= n)
 return str;
- if (n > JS_STRING_LEN_MAX) {
- JS_ThrowInternalError(ctx, "string too long");
- goto fail2;
- }
 if (argc > 1 && !JS_IsUndefined(argv[1])) {
 v = JS_ToString(ctx, argv[1]);
 if (JS_IsException(v))
@@ -39309,6 +41250,10 @@
 p1 = NULL;
 }
 }
+ if (n > JS_STRING_LEN_MAX) {
+ JS_ThrowInternalError(ctx, "string too long");
+ goto fail2;
+ }
 if (string_buffer_init(ctx, b, n))
 goto fail3;
 n -= len;
@@ -39750,7 +41695,7 @@
 static struct { const char *tag, *attr; } const defs[] = {
 { "a", "name" }, { "big", NULL }, { "blink", NULL }, { "b", NULL },
 { "tt", NULL }, { "font", "color" }, { "font", "size" }, { "i", NULL },
- { "a", "href" }, { "small", NULL }, { "strike", NULL },
+ { "a", "href" }, { "small", NULL }, { "strike", NULL }, 
 { "sub", NULL }, { "sup", NULL },
 };
 
@@ -39908,201 +41853,11 @@
 }
 }
 
-#ifdef CONFIG_BIGNUM
-
-enum {
- MATH_OP_ABS,
- MATH_OP_FLOOR,
- MATH_OP_CEIL,
- MATH_OP_ROUND,
- MATH_OP_TRUNC,
- MATH_OP_SQRT,
- MATH_OP_FPROUND,
- MATH_OP_ACOS,
- MATH_OP_ASIN,
- MATH_OP_ATAN,
- MATH_OP_ATAN2,
- MATH_OP_COS,
- MATH_OP_EXP,
- MATH_OP_LOG,
- MATH_OP_POW,
- MATH_OP_SIN,
- MATH_OP_TAN,
- MATH_OP_FMOD,
- MATH_OP_REM,
- MATH_OP_SIGN,
-
- MATH_OP_ADD,
- MATH_OP_SUB,
- MATH_OP_MUL,
- MATH_OP_DIV,
-};
-
-static JSValue js_bigfloat_fop(JSContext *ctx, JSValueConst this_val,
- int argc, JSValueConst *argv, int magic)
-{
- bf_t a_s, *a, r_s, *r = &r_s;
- JSFloatEnv *fe;
- int rnd_mode;
- JSValue op1;
-
- op1 = JS_ToNumber(ctx, argv[0]);
- if (JS_IsException(op1))
- return op1;
- a = JS_ToBigFloat(ctx, &a_s, op1);
- fe = &ctx->fp_env;
- if (argc > 1) {
- fe = JS_GetOpaque2(ctx, argv[1], JS_CLASS_FLOAT_ENV);
- if (!fe) {
- if (a == &a_s)
- bf_delete(a);
- JS_FreeValue(ctx, op1);
- return JS_EXCEPTION;
- }
- }
-
- bf_init(ctx->bf_ctx, r);
- switch (magic) {
- case MATH_OP_ABS:
- bf_set(r, a);
- r->sign = 0;
- break;
- case MATH_OP_FLOOR:
- rnd_mode = BF_RNDD;
- goto rint;
- case MATH_OP_CEIL:
- rnd_mode = BF_RNDU;
- goto rint;
- case MATH_OP_ROUND:
- rnd_mode = BF_RNDNU;
- goto rint;
- case MATH_OP_TRUNC:
- rnd_mode = BF_RNDZ;
- rint:
- bf_set(r, a);
- fe->status |= bf_rint(r, rnd_mode);
- break;
- case MATH_OP_SQRT:
- fe->status |= bf_sqrt(r, a, fe->prec, fe->flags);
- break;
- case MATH_OP_FPROUND:
- bf_set(r, a);
- fe->status |= bf_round(r, fe->prec, fe->flags);
- break;
- case MATH_OP_ACOS:
- fe->status |= bf_acos(r, a, fe->prec, fe->flags);
- break;
- case MATH_OP_ASIN:
- fe->status |= bf_asin(r, a, fe->prec, fe->flags);
- break;
- case MATH_OP_ATAN:
- fe->status |= bf_atan(r, a, fe->prec, fe->flags);
- break;
- case MATH_OP_COS:
- fe->status |= bf_cos(r, a, fe->prec, fe->flags);
- break;
- case MATH_OP_EXP:
- fe->status |= bf_exp(r, a, fe->prec, fe->flags);
- break;
- case MATH_OP_LOG:
- fe->status |= bf_log(r, a, fe->prec, fe->flags);
- break;
- case MATH_OP_SIN:
- fe->status |= bf_sin(r, a, fe->prec, fe->flags);
- break;
- case MATH_OP_TAN:
- fe->status |= bf_tan(r, a, fe->prec, fe->flags);
- break;
- case MATH_OP_SIGN:
- if (bf_is_nan(a) || bf_is_zero(a)) {
- bf_set(r, a);
- } else {
- bf_set_si(r, 1 - 2 * a->sign);
- }
- break;
- default:
- abort();
- }
- if (a == &a_s)
- bf_delete(a);
- JS_FreeValue(ctx, op1);
- return JS_NewBigFloat(ctx, r);
-}
-
-static JSValue js_bigfloat_fop2(JSContext *ctx, JSValueConst this_val,
- int argc, JSValueConst *argv, int magic)
-{
- bf_t a_s, *a, b_s, *b, r_s, *r = &r_s;
- JSFloatEnv *fe;
- JSValue op1, op2;
-
- op1 = JS_ToNumber(ctx, argv[0]);
- if (JS_IsException(op1))
- return op1;
- op2 = JS_ToNumber(ctx, argv[1]);
- if (JS_IsException(op2)) {
- JS_FreeValue(ctx, op1);
- return op2;
- }
- a = JS_ToBigFloat(ctx, &a_s, op1);
- b = JS_ToBigFloat(ctx, &b_s, op2);
- fe = &ctx->fp_env;
- if (argc > 2) {
- fe = JS_GetOpaque2(ctx, argv[2], JS_CLASS_FLOAT_ENV);
- if (!fe) {
- if (a == &a_s)
- bf_delete(a);
- if (b == &b_s)
- bf_delete(b);
- JS_FreeValue(ctx, op1);
- JS_FreeValue(ctx, op2);
- return JS_EXCEPTION;
- }
- }
-
- bf_init(ctx->bf_ctx, r);
- switch (magic) {
- case MATH_OP_ATAN2:
- fe->status |= bf_atan2(r, a, b, fe->prec, fe->flags);
- break;
- case MATH_OP_POW:
- fe->status |= bf_pow(r, a, b, fe->prec, fe->flags | BF_POW_JS_QUICKS);
- break;
- case MATH_OP_FMOD:
- fe->status |= bf_fmod(r, a, b, fe->prec, fe->flags);
- break;
- case MATH_OP_REM:
- fe->status |= bf_remainder(r, a, b, fe->prec, fe->flags);
- break;
- case MATH_OP_ADD:
- fe->status |= bf_add(r, a, b, fe->prec, fe->flags);
- break;
- case MATH_OP_SUB:
- fe->status |= bf_sub(r, a, b, fe->prec, fe->flags);
- break;
- case MATH_OP_MUL:
- fe->status |= bf_mul(r, a, b, fe->prec, fe->flags);
- break;
- case MATH_OP_DIV:
- fe->status |= bf_div(r, a, b, fe->prec, fe->flags);
- break;
- default:
- abort();
- }
- if (a == &a_s)
- bf_delete(a);
- if (b == &b_s)
- bf_delete(b);
- JS_FreeValue(ctx, op1);
- JS_FreeValue(ctx, op2);
- return JS_NewBigFloat(ctx, r);
-}
-
 static JSValue js_math_min_max(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv, int magic)
 {
 BOOL is_max = magic;
- JSValue val, ret;
+ double r, a;
 int i;
 uint32_t tag;
 
@@ -40111,166 +41866,9 @@
 		double const zero = 0.0;
 		return __JS_NewFloat64(ctx, is_max ? -1.0 / zero : 1.0 / zero);
 #else
-		return __JS_NewFloat64(ctx, is_max ? -1.0 / 0.0 : 1.0 / 0.0);
-#endif
-	}
-
- tag = JS_VALUE_GET_TAG(argv[0]);
- if (tag == JS_TAG_INT) {
- int a1, r1 = JS_VALUE_GET_INT(argv[0]);
- for(i = 1; i < argc; i++) {
- tag = JS_VALUE_GET_TAG(argv[i]);
- if (tag != JS_TAG_INT) {
- ret = JS_NewInt32(ctx, r1);
- goto generic_case;
- }
- a1 = JS_VALUE_GET_INT(argv[i]);
- if (is_max)
- r1 = max_int(r1, a1);
- else
- r1 = min_int(r1, a1);
- }
- ret = JS_NewInt32(ctx, r1);
- } else {
- ret = JS_ToNumber(ctx, argv[0]);
- if (JS_IsException(ret))
- return ret;
- i = 1;
- generic_case:
- for(; i < argc; i++) {
- val = JS_ToNumber(ctx, argv[i]);
- if (JS_IsException(val)) {
- JS_FreeValue(ctx, ret);
- return val;
- }
- if (JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(ret)) &&
- JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(val))) {
- double r, a;
- r = JS_VALUE_GET_FLOAT64(ret);
- a = JS_VALUE_GET_FLOAT64(val);
- if (!isnan(r)) {
- if (isnan(a)) {
- r = a;
- } else {
- if (is_max)
- r = js_fmax(r, a);
- else
- r = js_fmin(r, a);
- }
- ret = __JS_NewFloat64(ctx, r);
- }
- } else {
- bf_t a_s, *a, r_s, *r;
- int res;
-
- r = JS_ToBigFloat(ctx, &r_s, ret);
- if (!bf_is_nan(r)) {
- a = JS_ToBigFloat(ctx, &a_s, val);
- res = bf_cmp_full(a, r);
- if (is_max)
- res = -res;
- if (bf_is_nan(a) || res < 0) {
- JS_FreeValue(ctx, ret);
- ret = JS_DupValue(ctx, val);
- }
- if (a == &a_s)
- bf_delete(a);
- }
- if (r == &r_s)
- bf_delete(r);
- JS_FreeValue(ctx, val);
- }
- }
- }
- return ret;
-}
-
-static JSValue js_math_abs(JSContext *ctx, JSValueConst this_val,
- int argc, JSValueConst *argv)
-{
- JSValue val;
- uint32_t tag;
-
- val = JS_ToNumeric(ctx, argv[0]);
- tag = JS_VALUE_GET_NORM_TAG(val);
- switch(tag) {
- case JS_TAG_INT:
- if (JS_VALUE_GET_INT(val) < 0)
- val = JS_NewInt64(ctx, -(int64_t)JS_VALUE_GET_INT(val));
- break;
- case JS_TAG_FLOAT64:
- val = __JS_NewFloat64(ctx, fabs(JS_VALUE_GET_FLOAT64(val)));
- break;
- case JS_TAG_BIG_FLOAT:
- case JS_TAG_BIG_INT:
- {
- JSBigFloat *p = JS_VALUE_GET_PTR(val);
- bf_t r_s, *r = &r_s;
- bf_init(ctx->bf_ctx, r);
- bf_set(r, &p->num);
- r->sign = 0;
- JS_FreeValue(ctx, val);
- if (tag == JS_TAG_BIG_FLOAT)
- val = JS_NewBigFloat(ctx, r);
- else
- val = JS_NewBigInt2(ctx, r, TRUE);
- }
- break;
- default:
- break;
- }
- return val;
-}
-
-#if 0
-/* XXX: should give exact rounding */
-/* XXX: correct NaN/Infinity handling */
-static JSValue js_math_hypot(JSContext *ctx, JSValueConst this_val,
- int argc, JSValueConst *argv)
-{
- bf_t a_s, *a, r_s, *r = &r_s, r2_s, *r2 = &r2_s;
- JSValue val;
- int i;
- BOOL is_float;
-
- bf_init(ctx->bf_ctx, r);
- bf_set_si(r, 0);
- for(i = 0; i < argc; i++) {
- val = JS_ToNumber(ctx, argv[i]);
- if (JS_IsException(val)) {
- bf_delete(r);
- return val;
- }
- a = JS_ToBigFloat(ctx, &is_float, &a_s, val);
- bf_add(r, r, a, ctx->fp_env.prec, ctx->fp_env.flags);
- if (a == &a_s)
- bf_delete(a);
- }
- bf_init(ctx->bf_ctx, r2);
- bf_sqrt(r2, r, ctx->fp_env.prec, ctx->fp_env.flags);
- bf_delete(r);
- return JS_NewBigFloat(ctx, r2);
-}
-#endif
-
-#else
-
-static JSValue js_math_min_max(JSContext *ctx, JSValueConst this_val,
- int argc, JSValueConst *argv, int magic)
-{
- BOOL is_max = magic;
- double r, a;
- int i;
- uint32_t tag;
-
- if (unlikely(argc == 0)) {
-#if defined(_MSC_VER)
- double const zero = 0.0;
- return __JS_NewFloat64(ctx, is_max ? -1.0 / zero : 1.0 / zero);
-#else
 return __JS_NewFloat64(ctx, is_max ? -1.0 / 0.0 : 1.0 / 0.0);
 #endif
- }
+	}
 
 tag = JS_VALUE_GET_TAG(argv[0]);
 if (tag == JS_TAG_INT) {
@@ -40313,8 +41911,6 @@
 }
 }
 
-#endif /* !CONFIG_BIGNUM */
-
 static double js_math_sign(double a)
 {
 if (isnan(a) || a == 0.0)
@@ -40356,24 +41952,23 @@
 static JSValue js_math_hypot(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv)
 {
- double r, a, b;
+ double r, a;
 int i;
 
- if (argc == 2) {
- /* use the more precise built-in function when possible */
- if (JS_ToFloat64(ctx, &a, argv[0]))
- return JS_EXCEPTION;
- if (JS_ToFloat64(ctx, &b, argv[1]))
+ r = 0;
+ if (argc > 0) {
+ if (JS_ToFloat64(ctx, &r, argv[0]))
 return JS_EXCEPTION;
- r = hypot(a, b);
- } else {
- r = 0;
- for(i = 0; i < argc; i++) {
- if (JS_ToFloat64(ctx, &a, argv[i]))
- return JS_EXCEPTION;
- r += a;
+ if (argc == 1) {
+ r = fabs(r);
+ } else {
+ /* use the built-in function to minimize precision loss */
+ for (i = 1; i < argc; i++) {
+ if (JS_ToFloat64(ctx, &a, argv[i]))
+ return JS_EXCEPTION;
+ r = hypot(r, a);
+ }
 }
- r = sqrt(r);
 }
 return JS_NewFloat64(ctx, r);
 }
@@ -40422,10 +42017,17 @@
 return x * 0x2545F4914F6CDD1D;
 }
 
+#if defined(_MSC_VER)
+#include <time.h>
+#include <sys/timeb.h>
+#endif
+
 static void js_random_init(JSContext *ctx)
 {
-#if defined(_MSC_VER) // FIXME: implement this
- ctx->random_state = 42;
+#if defined(_MSC_VER) // FIXME: more precision
+	struct _timeb	tb;
+	_ftime(&tb);
+	ctx->random_state = ( (int64_t)tb.time * 1000000) + (tb.millitm*1000);
 #else
 struct timeval tv;
 gettimeofday(&tv, NULL);
@@ -40434,6 +42036,7 @@
 /* the state must be non zero */
 if (ctx->random_state == 0)
 ctx->random_state = 1;
+
 }
 
 static JSValue js_math_random(JSContext *ctx, JSValueConst this_val,
@@ -40456,11 +42059,7 @@
 static const JSCFunctionListEntry js_math_funcs[] = {
 JS_CFUNC_MAGIC_DEF("min", 2, js_math_min_max, 0 ),
 JS_CFUNC_MAGIC_DEF("max", 2, js_math_min_max, 1 ),
-#ifdef CONFIG_BIGNUM
- JS_CFUNC_DEF("abs", 1, js_math_abs ),
-#else
 JS_CFUNC_SPECIAL_DEF("abs", 1, f_f, fabs ),
-#endif
 #if defined(_MSC_VER)
 JS_CFUNC_SPECIAL_DEF("floor", 1, f_f, const_floor ),
 JS_CFUNC_SPECIAL_DEF("ceil", 1, f_f, const_ceil ),
@@ -40534,19 +42133,21 @@
 static JSValue js___date_clock(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv)
 {
- int64_t d;
-#if defined(_MSC_VER) // FIXME: implement this
- d = 42;
+	int64_t d;
+#if defined(_MSC_VER) // FIXME: more precision
+	struct _timeb	tb;
+	_ftime(&tb);
+	d = ( (int64_t)tb.time * 1000000) + (tb.millitm*1000);
 #else
 struct timeval tv;
 gettimeofday(&tv, NULL);
- d = (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
+	d = (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
 #endif
 return JS_NewInt64(ctx, d);
 }
 
 /* OS dependent. d = argv[0] is in ms from 1970. Return the difference
- between local time and UTC time 'd' in minutes */
+ between UTC time and local time 'd' in minutes */
 static int getTimezoneOffset(int64_t time) {
 #if defined(_WIN32)
 /* XXX: TODO */
@@ -40562,7 +42163,7 @@
 32 bits and hopefully provides the same result as 64-bit
 implementation of localtime_r.
 */
- if ((time_t)-1 < (0) ) {
+ if ((time_t)-1 < (0)) {
 if (time < INT32_MIN) {
 time = INT32_MIN;
 } else if (time > INT32_MAX) {
@@ -40596,6 +42197,20 @@
 return JS_NewInt32(ctx, getTimezoneOffset((int64_t)dd));
 }
 
+static JSValue js_get_prototype_from_ctor(JSContext *ctx, JSValueConst ctor,
+ JSValueConst def_proto)
+{
+ JSValue proto;
+ proto = JS_GetProperty(ctx, ctor, JS_ATOM_prototype);
+ if (JS_IsException(proto))
+ return proto;
+ if (!JS_IsObject(proto)) {
+ JS_FreeValue(ctx, proto);
+ proto = JS_DupValue(ctx, def_proto);
+ }
+ return proto;
+}
+
 /* create a new date object */
 static JSValue js___date_create(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv)
@@ -40913,7 +42528,7 @@
 if (p->len == 0) {
 empty_regex:
 return JS_NewString(ctx, "(?:)");
- }
+ } 
 string_buffer_init2(ctx, b, p->len, p->is_wide_char);
 
 /* Escape '/' and newline sequences as needed */
@@ -40965,13 +42580,14 @@
 if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
 return JS_ThrowTypeErrorNotAnObject(ctx);
 
- if (js_same_value(ctx, this_val, ctx->class_proto[JS_CLASS_REGEXP]))
- return JS_UNDEFINED;
-
- re = js_get_regexp(ctx, this_val, TRUE);
- if (!re)
- return JS_EXCEPTION;
-
+ re = js_get_regexp(ctx, this_val, FALSE);
+ if (!re) {
+ if (js_same_value(ctx, this_val, ctx->class_proto[JS_CLASS_REGEXP]))
+ return JS_UNDEFINED;
+ else
+ return JS_ThrowTypeErrorInvalidClass(ctx, JS_CLASS_REGEXP);
+ }
+ 
 flags = lre_get_flags(re->bytecode->u.str8);
 return JS_NewBool(ctx, (flags & mask) != 0);
 }
@@ -41048,7 +42664,7 @@
 BOOL lre_check_stack_overflow(void *opaque, size_t alloca_size)
 {
 JSContext *ctx = opaque;
- return js_check_stack_overflow(ctx, alloca_size);
+ return js_check_stack_overflow(ctx->rt, alloca_size);
 }
 
 void *lre_realloc(void *opaque, void *ptr, size_t size)
@@ -41130,14 +42746,11 @@
 if (JS_IsException(obj))
 goto fail;
 prop_flags = JS_PROP_C_W_E | JS_PROP_THROW;
- group_name_ptr = NULL;
- if (re_flags & LRE_FLAG_NAMED_GROUPS) {
- uint32_t re_bytecode_len;
+ group_name_ptr = lre_get_groupnames(re_bytecode);
+ if (group_name_ptr) {
 groups = JS_NewObjectProto(ctx, JS_NULL);
 if (JS_IsException(groups))
 goto fail;
- re_bytecode_len = get_u32(re_bytecode + 3);
- group_name_ptr = (char *)(re_bytecode + 7 + re_bytecode_len);
 }
 
 for(i = 0; i < capture_count; i++) {
@@ -41187,7 +42800,7 @@
 return JS_EXCEPTION;
 }
 
-/* delete partions of a string that match a given regex */
+/* delete portions of a string that match a given regex */
 static JSValue JS_RegExpDelete(JSContext *ctx, JSValueConst this_val, JSValueConst arg)
 {
 JSRegExp *re = js_get_regexp(ctx, this_val, TRUE);
@@ -41386,9 +42999,7 @@
 JS_GetProperty(ctx, rx, JS_ATOM_lastIndex)) < 0)
 goto exception;
 p = JS_VALUE_GET_STRING(S);
- nextIndex = thisIndex + 1;
- if (thisIndex < p->len)
- nextIndex = string_advance_index(p, thisIndex, fullUnicode);
+ nextIndex = string_advance_index(p, thisIndex, fullUnicode);
 if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt64(ctx, nextIndex)) < 0)
 goto exception;
 }
@@ -41477,7 +43088,7 @@
 sp = JS_VALUE_GET_STRING(S);
 nextIndex = string_advance_index(sp, thisIndex, it->unicode);
 if (JS_SetProperty(ctx, R, JS_ATOM_lastIndex,
- JS_NewInt32(ctx, nextIndex)) < 0)
+ JS_NewInt64(ctx, nextIndex)) < 0)
 goto exception;
 }
 JS_FreeValue(ctx, matchStr);
@@ -41503,7 +43114,7 @@
 JSString *strp;
 int64_t lastIndex;
 JSRegExpStringIteratorData *it;
-
+ 
 if (!JS_IsObject(R))
 return JS_ThrowTypeErrorNotAnObject(ctx);
 
@@ -41511,7 +43122,7 @@
 flags = JS_UNDEFINED;
 matcher = JS_UNDEFINED;
 iter = JS_UNDEFINED;
-
+ 
 S = JS_ToString(ctx, argv[0]);
 if (JS_IsException(S))
 goto exception;
@@ -41530,9 +43141,9 @@
 JS_GetProperty(ctx, R, JS_ATOM_lastIndex)))
 goto exception;
 if (JS_SetProperty(ctx, matcher, JS_ATOM_lastIndex,
- JS_NewInt32(ctx, lastIndex)) < 0)
+ JS_NewInt64(ctx, lastIndex)) < 0)
 goto exception;
-
+ 
 iter = JS_NewObjectClass(ctx, JS_CLASS_REGEXP_STRING_ITERATOR);
 if (JS_IsException(iter))
 goto exception;
@@ -41670,7 +43281,7 @@
 str = JS_ToString(ctx, argv[0]);
 if (JS_IsException(str))
 goto exception;
-
+ 
 sp = JS_VALUE_GET_STRING(str);
 rp = NULL;
 functionalReplace = JS_IsFunction(ctx, rep);
@@ -41718,7 +43329,7 @@
 if (JS_ToLengthFree(ctx, &thisIndex, JS_GetProperty(ctx, rx, JS_ATOM_lastIndex)) < 0)
 goto exception;
 nextIndex = string_advance_index(sp, thisIndex, fullUnicode);
- if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt32(ctx, nextIndex)) < 0)
+ if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt64(ctx, nextIndex)) < 0)
 goto exception;
 }
 }
@@ -41744,7 +43355,8 @@
 tab = JS_NewArray(ctx);
 if (JS_IsException(tab))
 goto exception;
- if (JS_SetPropertyInt64(ctx, tab, 0, JS_DupValue(ctx, matched)) < 0)
+ if (JS_DefinePropertyValueInt64(ctx, tab, 0, JS_DupValue(ctx, matched),
+ JS_PROP_C_W_E | JS_PROP_THROW) < 0)
 goto exception;
 for(n = 1; n < nCaptures; n++) {
 JSValue capN;
@@ -41756,7 +43368,8 @@
 if (JS_IsException(capN))
 goto exception;
 }
- if (JS_SetPropertyInt64(ctx, tab, n, capN) < 0)
+ if (JS_DefinePropertyValueInt64(ctx, tab, n, capN,
+ JS_PROP_C_W_E | JS_PROP_THROW) < 0)
 goto exception;
 }
 JS_FreeValue(ctx, namedCaptures);
@@ -41764,12 +43377,12 @@
 if (JS_IsException(namedCaptures))
 goto exception;
 if (functionalReplace) {
- if (JS_SetPropertyInt64(ctx, tab, n++, JS_NewInt32(ctx, position)) < 0)
+ if (JS_DefinePropertyValueInt64(ctx, tab, n++, JS_NewInt32(ctx, position), JS_PROP_C_W_E | JS_PROP_THROW) < 0)
 goto exception;
- if (JS_SetPropertyInt64(ctx, tab, n++, JS_DupValue(ctx, str)) < 0)
+ if (JS_DefinePropertyValueInt64(ctx, tab, n++, JS_DupValue(ctx, str), JS_PROP_C_W_E | JS_PROP_THROW) < 0)
 goto exception;
 if (!JS_IsUndefined(namedCaptures)) {
- if (JS_SetPropertyInt64(ctx, tab, n++, JS_DupValue(ctx, namedCaptures)) < 0)
+ if (JS_DefinePropertyValueInt64(ctx, tab, n++, JS_DupValue(ctx, namedCaptures), JS_PROP_C_W_E | JS_PROP_THROW) < 0)
 goto exception;
 }
 args[0] = JS_UNDEFINED;
@@ -41777,14 +43390,23 @@
 JS_FreeValue(ctx, rep_str);
 rep_str = JS_ToStringFree(ctx, js_function_apply(ctx, rep, 2, args, 0));
 } else {
+ JSValue namedCaptures1;
+ if (!JS_IsUndefined(namedCaptures)) {
+ namedCaptures1 = JS_ToObject(ctx, namedCaptures);
+ if (JS_IsException(namedCaptures1))
+ goto exception;
+ } else {
+ namedCaptures1 = JS_UNDEFINED;
+ }
 args[0] = matched;
 args[1] = str;
 args[2] = JS_NewInt32(ctx, position);
 args[3] = tab;
- args[4] = namedCaptures;
+ args[4] = namedCaptures1;
 args[5] = rep_val;
 JS_FreeValue(ctx, rep_str);
 rep_str = js_string___GetSubstitution(ctx, JS_UNDEFINED, 6, args);
+ JS_FreeValue(ctx, namedCaptures1);
 }
 if (JS_IsException(rep_str))
 goto exception;
@@ -41847,8 +43469,10 @@
 if (js_same_value(ctx, currentLastIndex, previousLastIndex)) {
 JS_FreeValue(ctx, previousLastIndex);
 } else {
- if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, previousLastIndex) < 0)
+ if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, previousLastIndex) < 0) {
+ previousLastIndex = JS_UNDEFINED;
 goto exception;
+ }
 }
 JS_FreeValue(ctx, str);
 JS_FreeValue(ctx, currentLastIndex);
@@ -41936,7 +43560,7 @@
 while (q < size) {
 if (JS_SetProperty(ctx, splitter, JS_ATOM_lastIndex, JS_NewInt32(ctx, q)) < 0)
 goto exception;
- JS_FreeValue(ctx, z);
+ JS_FreeValue(ctx, z); 
 z = JS_RegExpExec(ctx, splitter, str);
 if (JS_IsException(z))
 goto exception;
@@ -41953,7 +43577,8 @@
 sub = js_sub_string(ctx, strp, p, q);
 if (JS_IsException(sub))
 goto exception;
- if (JS_SetPropertyInt64(ctx, A, lengthA++, sub) < 0)
+ if (JS_DefinePropertyValueInt64(ctx, A, lengthA++, sub,
+ JS_PROP_C_W_E | JS_PROP_THROW) < 0)
 goto exception;
 if (lengthA == lim)
 goto done;
@@ -41964,7 +43589,7 @@
 sub = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, z, i));
 if (JS_IsException(sub))
 goto exception;
- if (JS_SetPropertyInt64(ctx, A, lengthA++, sub) < 0)
+ if (JS_DefinePropertyValueInt64(ctx, A, lengthA++, sub, JS_PROP_C_W_E | JS_PROP_THROW) < 0)
 goto exception;
 if (lengthA == lim)
 goto done;
@@ -41979,7 +43604,7 @@
 sub = js_sub_string(ctx, strp, p, size);
 if (JS_IsException(sub))
 goto exception;
- if (JS_SetPropertyInt64(ctx, A, lengthA++, sub) < 0)
+ if (JS_DefinePropertyValueInt64(ctx, A, lengthA++, sub, JS_PROP_C_W_E | JS_PROP_THROW) < 0)
 goto exception;
 goto done;
 exception:
@@ -41990,7 +43615,7 @@
 JS_FreeValue(ctx, ctor);
 JS_FreeValue(ctx, splitter);
 JS_FreeValue(ctx, flags);
- JS_FreeValue(ctx, z);
+ JS_FreeValue(ctx, z); 
 return A;
 }
 
@@ -42055,58 +43680,69 @@
 
 /* JSON */
 
-/* XXX: this parser is less strict than the JSON standard because we
- reuse the Javascript tokenizer. It could be improved by adding a
- specific JSON parse flag. */
+static int json_parse_expect(JSParseState *s, int tok)
+{
+ if (s->token.val != tok) {
+ /* XXX: dump token correctly in all cases */
+ return js_parse_error(s, "expecting '%c'", tok);
+ }
+ return json_next_token(s);
+}
+
 static JSValue json_parse_value(JSParseState *s)
 {
 JSContext *ctx = s->ctx;
 JSValue val = JS_NULL;
- BOOL is_neg;
 int ret;
 
 switch(s->token.val) {
 case '{':
 {
- JSValue prop_val, prop_str;
-
- if (next_token(s))
+ JSValue prop_val;
+ JSAtom prop_name;
+ 
+ if (json_next_token(s))
 goto fail;
 val = JS_NewObject(ctx);
 if (JS_IsException(val))
 goto fail;
 if (s->token.val != '}') {
 for(;;) {
- if (s->token.val != TOK_STRING) {
+ if (s->token.val == TOK_STRING) {
+ prop_name = JS_ValueToAtom(ctx, s->token.u.str.str);
+ if (prop_name == JS_ATOM_NULL)
+ goto fail;
+ } else if (s->ext_json && s->token.val == TOK_IDENT) {
+ prop_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+ } else {
 js_parse_error(s, "expecting property name");
 goto fail;
 }
- prop_str = JS_DupValue(ctx, s->token.u.str.str);
- if (next_token(s)) {
- JS_FreeValue(ctx, prop_str);
- goto fail;
- }
- if (js_parse_expect(s, ':')) {
- JS_FreeValue(ctx, prop_str);
- goto fail;
- }
+ if (json_next_token(s))
+ goto fail1;
+ if (json_parse_expect(s, ':'))
+ goto fail1;
 prop_val = json_parse_value(s);
 if (JS_IsException(prop_val)) {
- JS_FreeValue(ctx, prop_str);
+ fail1:
+ JS_FreeAtom(ctx, prop_name);
 goto fail;
 }
- ret = JS_DefinePropertyValueValue(ctx, val, prop_str,
- prop_val, JS_PROP_C_W_E);
+ ret = JS_DefinePropertyValue(ctx, val, prop_name,
+ prop_val, JS_PROP_C_W_E);
+ JS_FreeAtom(ctx, prop_name);
 if (ret < 0)
 goto fail;
 
 if (s->token.val != ',')
 break;
- if (next_token(s))
+ if (json_next_token(s))
 goto fail;
+ if (s->ext_json && s->token.val == '}')
+ break;
 }
 }
- if (js_parse_expect(s, '}'))
+ if (json_parse_expect(s, '}'))
 goto fail;
 }
 break;
@@ -42115,7 +43751,7 @@
 JSValue el;
 uint32_t idx;
 
- if (next_token(s))
+ if (json_next_token(s))
 goto fail;
 val = JS_NewArray(ctx);
 if (JS_IsException(val))
@@ -42131,86 +43767,41 @@
 goto fail;
 if (s->token.val != ',')
 break;
- if (next_token(s))
+ if (json_next_token(s))
 goto fail;
 idx++;
+ if (s->ext_json && s->token.val == ']')
+ break;
 }
 }
- if (js_parse_expect(s, ']'))
+ if (json_parse_expect(s, ']'))
 goto fail;
 }
 break;
 case TOK_STRING:
 val = JS_DupValue(ctx, s->token.u.str.str);
- if (next_token(s))
+ if (json_next_token(s))
 goto fail;
 break;
 case TOK_NUMBER:
- is_neg = 0;
- goto number;
- case '-':
- if (next_token(s))
- goto fail;
- if (s->token.val != TOK_NUMBER) {
- js_parse_error(s, "number expected");
- goto fail;
- }
- is_neg = 1;
- number:
-#ifdef CONFIG_BIGNUM
- val = JS_DupValue(ctx, s->token.u.num.val);
- if (is_neg) {
- switch(JS_VALUE_GET_NORM_TAG(val)) {
- case JS_TAG_BIG_INT:
- case JS_TAG_BIG_FLOAT:
- {
- JSBigFloat *p;
- p = JS_VALUE_GET_PTR(val);
- bf_neg(&p->num);
- }
- break;
- case JS_TAG_FLOAT64:
- {
- double d;
- d = JS_VALUE_GET_FLOAT64(val);
- val = __JS_NewFloat64(ctx, -d);
- }
- break;
- default:
- case JS_TAG_INT:
- {
- int v;
- v = JS_VALUE_GET_INT(val);
- if (v == 0 && !is_bigint_mode(s->ctx))
- val = __JS_NewFloat64(ctx, -0.0);
- else
- val = JS_NewInt64(ctx, -(int64_t)v);
- }
- break;
- }
- }
-#else
 val = s->token.u.num.val;
- if (is_neg) {
- double d;
- JS_ToFloat64(ctx, &d, val); /* no exception possible */
- val = JS_NewFloat64(ctx, -d);
- }
-#endif
- if (next_token(s))
- goto fail;
- break;
- case TOK_FALSE:
- case TOK_TRUE:
- val = JS_NewBool(ctx, s->token.val - TOK_FALSE);
- if (next_token(s))
+ if (json_next_token(s))
 goto fail;
 break;
- case TOK_NULL:
- if (next_token(s))
+ case TOK_IDENT:
+ if (s->token.u.ident.atom == JS_ATOM_false ||
+ s->token.u.ident.atom == JS_ATOM_true) {
+ val = JS_NewBool(ctx, (s->token.u.ident.atom == JS_ATOM_true));
+ } else if (s->token.u.ident.atom == JS_ATOM_null) {
+ val = JS_NULL;
+ } else {
+ goto def_token;
+ }
+ if (json_next_token(s))
 goto fail;
 break;
 default:
+ def_token:
 if (s->token.val == TOK_EOF) {
 js_parse_error(s, "unexpected end of input");
 } else {
@@ -42225,15 +43816,15 @@
 return JS_EXCEPTION;
 }
 
-JSValue JS_ParseJSON(JSContext *ctx, const char *buf, size_t buf_len,
- const char *filename)
+JSValue JS_ParseJSON2(JSContext *ctx, const char *buf, size_t buf_len,
+ const char *filename, int flags)
 {
 JSParseState s1, *s = &s1;
- JSValue val;
+ JSValue val = JS_UNDEFINED;
 
 js_parse_init(ctx, s, buf, buf_len, filename);
-
- if (next_token(s))
+ s->ext_json = ((flags & JS_PARSE_JSON_EXT) != 0);
+ if (json_next_token(s))
 goto fail;
 val = json_parse_value(s);
 if (JS_IsException(val))
@@ -42244,10 +43835,17 @@
 }
 return val;
 fail:
+ JS_FreeValue(ctx, val);
 free_token(s, &s->token);
 return JS_EXCEPTION;
 }
 
+JSValue JS_ParseJSON(JSContext *ctx, const char *buf, size_t buf_len,
+ const char *filename)
+{
+ return JS_ParseJSON2(ctx, buf, buf_len, filename, 0); 
+}
+
 static JSValue internalize_json_property(JSContext *ctx, JSValueConst holder,
 JSAtom name, JSValueConst reviver)
 {
@@ -42258,7 +43856,7 @@
 JSAtom prop;
 JSPropertyEnum *atoms = NULL;
 
- if (js_check_stack_overflow(ctx, 0)) {
+ if (js_check_stack_overflow(ctx->rt, 0)) {
 return JS_ThrowStackOverflow(ctx);
 }
 
@@ -42366,10 +43964,6 @@
 return r;
 }
 
-#ifdef CONFIG_BIGNUM
-static inline BOOL JS_IsBigInt(JSContext *ctx, JSValueConst v);
-#endif
-
 static JSValue js_json_check(JSContext *ctx, JSONStringifyContext *jsc,
 JSValueConst holder, JSValue val, JSValueConst key)
 {
@@ -42442,7 +44036,7 @@
 int64_t i, len;
 int cl, ret;
 BOOL has_content;
-
+ 
 indent1 = JS_UNDEFINED;
 sep = JS_UNDEFINED;
 sep1 = JS_UNDEFINED;
@@ -42617,7 +44211,7 @@
 JS_FreeValue(ctx, val);
 return 0;
 }
-
+ 
 exception:
 JS_FreeValue(ctx, val);
 JS_FreeValue(ctx, tab);
@@ -42735,7 +44329,7 @@
 JS_DupValue(ctx, obj), JS_PROP_C_W_E) < 0)
 goto exception;
 val = JS_DupValue(ctx, obj);
-
+ 
 val = js_json_check(ctx, jsc, wrapper, val, jsc->empty);
 if (JS_IsException(val))
 goto exception;
@@ -42790,7 +44384,7 @@
 static JSValue js_reflect_apply(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv)
 {
- return js_function_apply(ctx, argv[0], max_int(0, argc - 1), argv + 1, 0);
+ return js_function_apply(ctx, argv[0], max_int(0, argc - 1), argv + 1, 2);
 }
 
 static JSValue js_reflect_construct(JSContext *ctx, JSValueConst this_val,
@@ -42902,7 +44496,7 @@
 atom = JS_ValueToAtom(ctx, prop);
 if (unlikely(atom == JS_ATOM_NULL))
 return JS_EXCEPTION;
- ret = JS_SetPropertyGeneric(ctx, JS_VALUE_GET_OBJ(obj), atom,
+ ret = JS_SetPropertyGeneric(ctx, obj, atom,
 JS_DupValue(ctx, val), receiver, 0);
 JS_FreeAtom(ctx, atom);
 if (ret < 0)
@@ -42946,6 +44540,7 @@
 JS_CFUNC_MAGIC_DEF("preventExtensions", 1, js_object_preventExtensions, 1 ),
 JS_CFUNC_DEF("set", 3, js_reflect_set ),
 JS_CFUNC_DEF("setPrototypeOf", 2, js_reflect_setPrototypeOf ),
+ JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Reflect", JS_PROP_CONFIGURABLE ),
 };
 
 static const JSCFunctionListEntry js_reflect_obj[] = {
@@ -42960,7 +44555,6 @@
 if (s) {
 JS_FreeValueRT(rt, s->target);
 JS_FreeValueRT(rt, s->handler);
- JS_FreeValueRT(rt, s->proto);
 js_free_rt(rt, s);
 }
 }
@@ -42972,7 +44566,6 @@
 if (s) {
 JS_MarkValue(rt, s->target, mark_func);
 JS_MarkValue(rt, s->handler, mark_func);
- JS_MarkValue(rt, s->proto, mark_func);
 }
 }
 
@@ -42988,11 +44581,11 @@
 JSValue method;
 
 /* safer to test recursion in all proxy methods */
- if (js_check_stack_overflow(ctx, 0)) {
+ if (js_check_stack_overflow(ctx->rt, 0)) {
 JS_ThrowStackOverflow(ctx);
 return NULL;
 }
-
+ 
 /* 's' should never be NULL */
 if (s->is_revoked) {
 JS_ThrowTypeErrorRevokedProxy(ctx);
@@ -43007,17 +44600,12 @@
 return s;
 }
 
-static JSValueConst js_proxy_getPrototypeOf(JSContext *ctx, JSValueConst obj)
+static JSValue js_proxy_getPrototypeOf(JSContext *ctx, JSValueConst obj)
 {
 JSProxyData *s;
- JSValue method, ret;
- JSValueConst proto1;
+ JSValue method, ret, proto1;
 int res;
 
- /* must check for timeout to avoid infinite loop in instanceof */
- if (js_poll_interrupts(ctx))
- return JS_EXCEPTION;
-
 s = get_proxy_method(ctx, &method, obj, JS_ATOM_getPrototypeOf);
 if (!s)
 return JS_EXCEPTION;
@@ -43043,26 +44631,22 @@
 return JS_EXCEPTION;
 }
 if (JS_VALUE_GET_OBJ(proto1) != JS_VALUE_GET_OBJ(ret)) {
+ JS_FreeValue(ctx, proto1);
 fail:
 JS_FreeValue(ctx, ret);
 return JS_ThrowTypeError(ctx, "proxy: inconsistent prototype");
 }
+ JS_FreeValue(ctx, proto1);
 }
- /* store the prototype in the proxy so that its refcount is at least 1 */
- set_value(ctx, &s->proto, ret);
-#if defined(JS_VALUE_CANNOT_BE_CAST)
 return ret;
-#else
- return (JSValueConst)ret;
-#endif
 }
 
 static int js_proxy_setPrototypeOf(JSContext *ctx, JSValueConst obj,
 JSValueConst proto_val, BOOL throw_flag)
 {
 JSProxyData *s;
- JSValue method, ret;
- JSValueConst args[2], proto1;
+ JSValue method, ret, proto1;
+ JSValueConst args[2];
 BOOL res;
 int res2;
 
@@ -43093,9 +44677,11 @@
 if (JS_IsException(proto1))
 return -1;
 if (JS_VALUE_GET_OBJ(proto_val) != JS_VALUE_GET_OBJ(proto1)) {
+ JS_FreeValue(ctx, proto1);
 JS_ThrowTypeError(ctx, "proxy: inconsistent prototype");
 return -1;
 }
+ JS_FreeValue(ctx, proto1);
 }
 return TRUE;
 }
@@ -43258,7 +44844,7 @@
 if (!s)
 return -1;
 if (JS_IsUndefined(method)) {
- return JS_SetPropertyGeneric(ctx, JS_VALUE_GET_OBJ(s->target), atom,
+ return JS_SetPropertyGeneric(ctx, s->target, atom,
 JS_DupValue(ctx, value), receiver,
 flags);
 }
@@ -43398,7 +44984,7 @@
 JS_FreeValue(ctx, trap_result_obj);
 if (res < 0)
 return -1;
-
+ 
 if (target_desc_ret) {
 /* convert result_desc.flags to defineProperty flags */
 flags1 = result_desc.flags | JS_PROP_HAS_CONFIGURABLE | JS_PROP_HAS_ENUMERABLE;
@@ -43763,7 +45349,7 @@
 
 if (flags & JS_CALL_FLAG_CONSTRUCTOR)
 return js_proxy_call_constructor(ctx, func_obj, this_obj, argc, argv);
-
+ 
 s = get_proxy_method(ctx, &method, func_obj, JS_ATOM_apply);
 if (!s)
 return JS_EXCEPTION;
@@ -43822,14 +45408,6 @@
 if (JS_VALUE_GET_TAG(target) != JS_TAG_OBJECT ||
 JS_VALUE_GET_TAG(handler) != JS_TAG_OBJECT)
 return JS_ThrowTypeErrorNotAnObject(ctx);
- s = JS_GetOpaque(target, JS_CLASS_PROXY);
- if (s && s->is_revoked)
- goto revoked_proxy;
- s = JS_GetOpaque(handler, JS_CLASS_PROXY);
- if (s && s->is_revoked) {
- revoked_proxy:
- return JS_ThrowTypeErrorRevokedProxy(ctx);
- }
 
 obj = JS_NewObjectProtoClass(ctx, JS_NULL, JS_CLASS_PROXY);
 if (JS_IsException(obj))
@@ -43841,7 +45419,6 @@
 }
 s->target = JS_DupValue(ctx, target);
 s->handler = JS_DupValue(ctx, handler);
- s->proto = JS_NULL;
 s->is_func = JS_IsFunction(ctx, target);
 s->is_revoked = FALSE;
 JS_SetOpaque(obj, s);
@@ -44369,7 +45946,7 @@
 list_del(&mr->hash_link);
 list_del(&mr->link);
 }
-
+ 
 /* second pass to free the values to avoid modifying the weak
 reference list while traversing it. */
 for(mr = p->first_weak_ref; mr != NULL; mr = mr_next) {
@@ -45354,30 +46931,34 @@
 return (remainingElementsCount == 0);
 }
 
+#define PROMISE_MAGIC_all 0
+#define PROMISE_MAGIC_allSettled 1
+#define PROMISE_MAGIC_any 2
+
 static JSValue js_promise_all_resolve_element(JSContext *ctx,
 JSValueConst this_val,
 int argc, JSValueConst *argv,
 int magic,
 JSValue *func_data)
 {
- int is_allSettled = magic & 1;
- int is_reject = magic & 2;
+ int resolve_type = magic & 3;
+ int is_reject = magic & 4;
 BOOL alreadyCalled = JS_ToBool(ctx, func_data[0]);
 JSValueConst values = func_data[2];
 JSValueConst resolve = func_data[3];
 JSValueConst resolve_element_env = func_data[4];
 JSValue ret, obj;
 int is_zero, index;
-
+ 
 if (JS_ToInt32(ctx, &index, func_data[1]))
 return JS_EXCEPTION;
 if (alreadyCalled)
 return JS_UNDEFINED;
 func_data[0] = JS_NewBool(ctx, TRUE);
 
- if (is_allSettled) {
+ if (resolve_type == PROMISE_MAGIC_allSettled) {
 JSValue str;
-
+ 
 obj = JS_NewObject(ctx);
 if (JS_IsException(obj))
 return JS_EXCEPTION;
@@ -45402,12 +46983,21 @@
 if (JS_DefinePropertyValueUint32(ctx, values, index,
 obj, JS_PROP_C_W_E) < 0)
 return JS_EXCEPTION;
-
+ 
 is_zero = remainingElementsCount_add(ctx, resolve_element_env, -1);
 if (is_zero < 0)
 return JS_EXCEPTION;
 if (is_zero) {
- ret = JS_Call(ctx, resolve, JS_UNDEFINED, 1, (JSValueConst *)&values);
+ if (resolve_type == PROMISE_MAGIC_any) {
+ JSValue error;
+ error = js_aggregate_error_constructor(ctx, values);
+ if (JS_IsException(error))
+ return JS_EXCEPTION;
+ ret = JS_Call(ctx, resolve, JS_UNDEFINED, 1, (JSValueConst *)&error);
+ JS_FreeValue(ctx, error);
+ } else {
+ ret = JS_Call(ctx, resolve, JS_UNDEFINED, 1, (JSValueConst *)&values);
+ }
 if (JS_IsException(ret))
 return ret;
 JS_FreeValue(ctx, ret);
@@ -45419,19 +47009,23 @@
 static JSValue js_promise_all(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv, int magic)
 {
- JSValue result_promise, resolving_funcs[2], iter, item, next_promise, ret;
+ JSValue result_promise, resolving_funcs[2], item, next_promise, ret;
 JSValue next_method = JS_UNDEFINED, values = JS_UNDEFINED;
 JSValue resolve_element_env = JS_UNDEFINED, resolve_element, reject_element;
- JSValue promise_resolve = JS_UNDEFINED;
+ JSValue promise_resolve = JS_UNDEFINED, iter = JS_UNDEFINED;
 JSValueConst then_args[2], resolve_element_data[5];
- BOOL done, is_allSettled = magic;
- int index, is_zero;
-
+ BOOL done;
+ int index, is_zero, is_promise_any = (magic == PROMISE_MAGIC_any);
+ 
 if (!JS_IsObject(this_val))
 return JS_ThrowTypeErrorNotAnObject(ctx);
 result_promise = js_new_promise_capability(ctx, resolving_funcs, this_val);
 if (JS_IsException(result_promise))
 return result_promise;
+ promise_resolve = JS_GetProperty(ctx, this_val, JS_ATOM_resolve);
+ if (JS_IsException(promise_resolve) ||
+ check_function(ctx, promise_resolve))
+ goto fail_reject;
 iter = JS_GetIterator(ctx, argv[0], FALSE);
 if (JS_IsException(iter)) {
 JSValue error;
@@ -45458,12 +47052,7 @@
 JS_NewInt32(ctx, 1),
 JS_PROP_CONFIGURABLE | JS_PROP_ENUMERABLE | JS_PROP_WRITABLE) < 0)
 goto fail_reject;
-
- promise_resolve = JS_GetProperty(ctx, this_val, JS_ATOM_resolve);
- if (JS_IsException(promise_resolve) ||
- check_function(ctx, promise_resolve))
- goto fail_reject1;
-
+ 
 index = 0;
 for(;;) {
 /* XXX: conformance: should close the iterator if error on 'done'
@@ -45473,7 +47062,7 @@
 goto fail_reject;
 if (done)
 break;
- next_promise = JS_Call(ctx, promise_resolve,
+ next_promise = JS_Call(ctx, promise_resolve, 
 this_val, 1, (JSValueConst *)&item);
 JS_FreeValue(ctx, item);
 if (JS_IsException(next_promise)) {
@@ -45488,24 +47077,30 @@
 resolve_element_data[1] = (JSValueConst)JS_NewInt32(ctx, index);
 #endif
 resolve_element_data[2] = values;
- resolve_element_data[3] = resolving_funcs[0];
+ resolve_element_data[3] = resolving_funcs[is_promise_any];
 resolve_element_data[4] = resolve_element_env;
 resolve_element =
 JS_NewCFunctionData(ctx, js_promise_all_resolve_element, 1,
- is_allSettled, 5, resolve_element_data);
+ magic, 5, resolve_element_data);
 if (JS_IsException(resolve_element)) {
 JS_FreeValue(ctx, next_promise);
 goto fail_reject1;
 }
-
- if (is_allSettled) {
+ 
+ if (magic == PROMISE_MAGIC_allSettled) {
 reject_element =
 JS_NewCFunctionData(ctx, js_promise_all_resolve_element, 1,
- is_allSettled | 2, 5, resolve_element_data);
+ magic | 4, 5, resolve_element_data);
 if (JS_IsException(reject_element)) {
 JS_FreeValue(ctx, next_promise);
 goto fail_reject1;
 }
+ } else if (magic == PROMISE_MAGIC_any) {
+ if (JS_DefinePropertyValueUint32(ctx, values, index,
+ JS_UNDEFINED, JS_PROP_C_W_E) < 0)
+ goto fail_reject1;
+ reject_element = resolve_element;
+ resolve_element = JS_DupValue(ctx, resolving_funcs[0]);
 } else {
 reject_element = JS_DupValue(ctx, resolving_funcs[1]);
 }
@@ -45531,7 +47126,15 @@
 if (is_zero < 0)
 goto fail_reject;
 if (is_zero) {
- ret = JS_Call(ctx, resolving_funcs[0], JS_UNDEFINED,
+ if (magic == PROMISE_MAGIC_any) {
+ JSValue error;
+ error = js_aggregate_error_constructor(ctx, values);
+ if (JS_IsException(error))
+ goto fail_reject;
+ JS_FreeValue(ctx, values);
+ values = error;
+ }
+ ret = JS_Call(ctx, resolving_funcs[is_promise_any], JS_UNDEFINED,
 1, (JSValueConst *)&values);
 if (check_exception_free(ctx, ret))
 goto fail_reject;
@@ -45555,8 +47158,8 @@
 static JSValue js_promise_race(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv)
 {
- JSValue result_promise, resolving_funcs[2], iter, item, next_promise, ret;
- JSValue next_method = JS_UNDEFINED;
+ JSValue result_promise, resolving_funcs[2], item, next_promise, ret;
+ JSValue next_method = JS_UNDEFINED, iter = JS_UNDEFINED;
 JSValue promise_resolve = JS_UNDEFINED;
 BOOL done;
 
@@ -45565,6 +47168,10 @@
 result_promise = js_new_promise_capability(ctx, resolving_funcs, this_val);
 if (JS_IsException(result_promise))
 return result_promise;
+ promise_resolve = JS_GetProperty(ctx, this_val, JS_ATOM_resolve);
+ if (JS_IsException(promise_resolve) ||
+ check_function(ctx, promise_resolve))
+ goto fail_reject;
 iter = JS_GetIterator(ctx, argv[0], FALSE);
 if (JS_IsException(iter)) {
 JSValue error;
@@ -45581,11 +47188,6 @@
 if (JS_IsException(next_method))
 goto fail_reject;
 
- promise_resolve = JS_GetProperty(ctx, this_val, JS_ATOM_resolve);
- if (JS_IsException(promise_resolve) ||
- check_function(ctx, promise_resolve))
- goto fail_reject1;
-
 for(;;) {
 /* XXX: conformance: should close the iterator if error on 'done'
 access, but not on 'value' access */
@@ -45735,31 +47337,20 @@
 {
 JSValueConst ctor = func_data[0];
 JSValueConst onFinally = func_data[1];
- JSValue res, promise, resolving_funcs[2], ret, then_func;
+ JSValue res, promise, ret, then_func;
 
 res = JS_Call(ctx, onFinally, JS_UNDEFINED, 0, NULL);
 if (JS_IsException(res))
 return res;
- promise = js_new_promise_capability(ctx, resolving_funcs, ctor);
- if (JS_IsException(promise)) {
- JS_FreeValue(ctx, res);
- return JS_EXCEPTION;
- }
- ret = JS_Call(ctx, resolving_funcs[0], JS_UNDEFINED,
- 1, (JSValueConst*)&res);
+ promise = js_promise_resolve(ctx, ctor, 1, (JSValueConst *)&res, 0);
 JS_FreeValue(ctx, res);
- JS_FreeValue(ctx, resolving_funcs[0]);
- JS_FreeValue(ctx, resolving_funcs[1]);
- if (JS_IsException(ret)) {
- JS_FreeValue(ctx, promise);
- return ret;
- }
- JS_FreeValue(ctx, ret);
+ if (JS_IsException(promise))
+ return promise;
 if (magic == 0) {
- then_func = JS_NewCFunctionData(ctx, js_promise_finally_value_thunk, 1,
+ then_func = JS_NewCFunctionData(ctx, js_promise_finally_value_thunk, 0,
 0, 1, argv);
 } else {
- then_func = JS_NewCFunctionData(ctx, js_promise_finally_thrower, 1,
+ then_func = JS_NewCFunctionData(ctx, js_promise_finally_thrower, 0,
 0, 1, argv);
 }
 if (JS_IsException(then_func)) {
@@ -45809,8 +47400,9 @@
 static const JSCFunctionListEntry js_promise_funcs[] = {
 JS_CFUNC_MAGIC_DEF("resolve", 1, js_promise_resolve, 0 ),
 JS_CFUNC_MAGIC_DEF("reject", 1, js_promise_resolve, 1 ),
- JS_CFUNC_MAGIC_DEF("all", 1, js_promise_all, 0 ),
- JS_CFUNC_MAGIC_DEF("allSettled", 1, js_promise_all, 1 ),
+ JS_CFUNC_MAGIC_DEF("all", 1, js_promise_all, PROMISE_MAGIC_all ),
+ JS_CFUNC_MAGIC_DEF("allSettled", 1, js_promise_all, PROMISE_MAGIC_allSettled ),
+ JS_CFUNC_MAGIC_DEF("any", 1, js_promise_all, PROMISE_MAGIC_any ),
 JS_CFUNC_DEF("race", 1, js_promise_race ),
 //JS_CFUNC_DEF("__newPromiseCapability", 1, js_promise___newPromiseCapability ),
 JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL),
@@ -45949,7 +47541,8 @@
 goto done_resolve;
 }
 }
- value = JS_IteratorNext2(ctx, s->sync_iter, method, 1, argv, &done);
+ value = JS_IteratorNext2(ctx, s->sync_iter, method,
+ argc >= 1 ? 1 : 0, argv, &done);
 JS_FreeValue(ctx, method);
 if (JS_IsException(value))
 goto reject;
@@ -46472,7 +48065,7 @@
 JSObject *p = JS_VALUE_GET_OBJ(this_val);
 if (p->class_id == JS_CLASS_DATE) {
 JS_FreeValue(ctx, p->u.object_data);
- p->u.object_data = __JS_NewFloat64(ctx, v);
+ p->u.object_data = JS_NewFloat64(ctx, v);
 return JS_DupValue(ctx, p->u.object_data);
 }
 }
@@ -46516,7 +48109,7 @@
 static char const day_names[] = "SunMonTueWedThuFriSat";
 
 static __exception int get_date_fields(JSContext *ctx, JSValueConst obj,
- int64_t fields[9], int is_local, int force)
+ double fields[9], int is_local, int force)
 {
 double dval;
 int64_t d, days, wd, y, i, md, h, m, s, ms, tz = 0;
@@ -46575,12 +48168,18 @@
 return NAN;
 }
 
-static double set_date_fields(int64_t fields[], int is_local) {
- int64_t days, y, m, md, h, d, i;
-
- i = fields[1];
- m = math_mod(i, 12);
- y = fields[0] + (i - m) / 12;
+/* The spec mandates the use of 'double' and it fixes the order
+ of the operations */
+static double set_date_fields(double fields[], int is_local) {
+ int64_t y;
+ double days, d, h, m1;
+ int i, m, md;
+ 
+ m1 = fields[1];
+ m = fmod(m1, 12);
+ if (m < 0)
+ m += 12;
+ y = (int64_t)(fields[0] + floor(m1 / 12));
 days = days_from_year(y);
 
 for(i = 0; i < m; i++) {
@@ -46590,7 +48189,8 @@
 days += md;
 }
 days += fields[2] - 1;
- h = ((fields[3] * 60 + fields[4]) * 60 + fields[5]) * 1000 + fields[6];
+ h = fields[3] * 3600000 + fields[4] * 60000 + 
+ fields[5] * 1000 + fields[6];
 d = days * 86400000 + h;
 if (is_local)
 d += getTimezoneOffset(d) * 60000;
@@ -46601,7 +48201,7 @@
 int argc, JSValueConst *argv, int magic)
 {
 // get_date_field(obj, n, is_local)
- int64_t fields[9];
+ double fields[9];
 int res, n, is_local;
 
 is_local = magic & 0x0F;
@@ -46615,14 +48215,14 @@
 if (magic & 0x100) { // getYear
 fields[0] -= 1900;
 }
- return JS_NewInt64(ctx, fields[n]);
+ return JS_NewFloat64(ctx, fields[n]);
 }
 
 static JSValue set_date_field(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv, int magic)
 {
 // _field(obj, first_field, end_field, args, is_local)
- int64_t fields[9];
+ double fields[9];
 int res, first_field, end_field, is_local, i, n;
 double d, a;
 
@@ -46664,7 +48264,7 @@
 {
 // _string(obj, fmt, part)
 char buf[64];
- int64_t fields[9];
+ double fields[9];
 int res, fmt, part, pos;
 int y, mon, d, h, m, s, ms, wd, tz;
 
@@ -46766,10 +48366,6 @@
 }
 
 /* OS dependent: return the UTC time in ms since 1970. */
-#if defined(_MSC_VER)
-#include <time.h>
-#include <sys/timeb.h>
-#endif
 static int64_t date_now(void) {
 #if defined(_MSC_VER)
 	struct _timeb	tb;
@@ -46780,6 +48376,7 @@
 gettimeofday(&tv, NULL);
 return (int64_t)tv.tv_sec * 1000 + (tv.tv_usec / 1000);
 #endif
+
 }
 
 static JSValue js_date_constructor(JSContext *ctx, JSValueConst new_target,
@@ -46822,7 +48419,7 @@
 }
 val = time_clip(val);
 } else {
- int64_t fields[] = { 0, 0, 1, 0, 0, 0, 0 };
+ double fields[] = { 0, 0, 1, 0, 0, 0, 0 };
 if (n > 7)
 n = 7;
 for(i = 0; i < n; i++) {
@@ -46841,12 +48438,12 @@
 JSValueConst args[3];
 args[0] = new_target;
 args[1] = ctx->class_proto[JS_CLASS_DATE];
- args[2] = __JS_NewFloat64(ctx, val);
+ args[2] = JS_NewFloat64(ctx, val);
 rv = js___date_create(ctx, JS_UNDEFINED, 3, args);
 #else
 rv = js_create_from_ctor(ctx, new_target, JS_CLASS_DATE);
 if (!JS_IsException(rv))
- JS_SetObjectData(ctx, rv, __JS_NewFloat64(ctx, val));
+ JS_SetObjectData(ctx, rv, JS_NewFloat64(ctx, val));
 #endif
 if (!JS_IsException(rv) && JS_IsUndefined(new_target)) {
 /* invoked as a function, return (new Date()).toString(); */
@@ -46862,7 +48459,7 @@
 int argc, JSValueConst *argv)
 {
 // UTC(y, mon, d, h, m, s, ms)
- int64_t fields[] = { 0, 0, 1, 0, 0, 0, 0 };
+ double fields[] = { 0, 0, 1, 0, 0, 0, 0 };
 int i, n;
 double a;
 
@@ -46880,7 +48477,7 @@
 if (i == 0 && fields[0] >= 0 && fields[0] < 100)
 fields[0] += 1900;
 }
- return __JS_NewFloat64(ctx, set_date_fields(fields, 0));
+ return JS_NewFloat64(ctx, set_date_fields(fields, 0));
 }
 
 static void string_skip_spaces(JSString *sp, int *pp) {
@@ -46893,24 +48490,22 @@
 *pp += 1;
 }
 
-/* parse a numeric field */
-static int string_get_field(JSString *sp, int *pp, int64_t *pval) {
+/* parse a numeric field with an optional sign if accept_sign is TRUE */
+static int string_get_digits(JSString *sp, int *pp, int64_t *pval) {
 int64_t v = 0;
- int c, p = *pp;
-
- /* skip non digits, should only skip spaces? */
- while (p < sp->len) {
- c = string_get(sp, p);
- if (c >= '0' && c <= '9')
- break;
- p++;
- }
+ int c, p = *pp, p_start;
+ 
 if (p >= sp->len)
 return -1;
+ p_start = p;
 while (p < sp->len) {
 c = string_get(sp, p);
- if (!(c >= '0' && c <= '9'))
- break;
+ if (!(c >= '0' && c <= '9')) {
+ if (p == p_start)
+ return -1;
+ else
+ break;
+ }
 v = v * 10 + c - '0';
 p++;
 }
@@ -46919,8 +48514,25 @@
 return 0;
 }
 
+static int string_get_signed_digits(JSString *sp, int *pp, int64_t *pval) {
+ int res, sgn, p = *pp;
+ 
+ if (p >= sp->len)
+ return -1;
+
+ sgn = string_get(sp, p);
+ if (sgn == '-' || sgn == '+')
+ p++;
+ 
+ res = string_get_digits(sp, &p, pval);
+ if (res == 0 && sgn == '-')
+ *pval = -*pval;
+ *pp = p;
+ return res;
+}
+
 /* parse a fixed width numeric field */
-static int string_get_digits(JSString *sp, int *pp, int n, int64_t *pval) {
+static int string_get_fixed_width_digits(JSString *sp, int *pp, int n, int64_t *pval) {
 int64_t v = 0;
 int i, c, p = *pp;
 
@@ -46938,23 +48550,32 @@
 return 0;
 }
 
-/* parse a signed numeric field */
-static int string_get_signed_field(JSString *sp, int *pp, int64_t *pval) {
- int sgn, res;
-
- if (*pp >= sp->len)
+static int string_get_milliseconds(JSString *sp, int *pp, int64_t *pval) {
+ /* parse milliseconds as a fractional part, round to nearest */
+ /* XXX: the spec does not indicate which rounding should be used */
+ int mul = 1000, ms = 0, p = *pp, c, p_start;
+ if (p >= sp->len)
 return -1;
-
- sgn = string_get(sp, *pp);
- if (sgn == '-' || sgn == '+')
- *pp += 1;
-
- res = string_get_field(sp, pp, pval);
- if (res == 0 && sgn == '-')
- *pval = -*pval;
- return res;
+ p_start = p;
+ while (p < sp->len) {
+ c = string_get(sp, p);
+ if (!(c >= '0' && c <= '9')) {
+ if (p == p_start)
+ return -1;
+ else
+ break;
+ }
+ if (mul == 1 && c >= '5')
+ ms += 1;
+ ms += (c - '0') * (mul /= 10);
+ p++;
+ }
+ *pval = ms;
+ *pp = p;
+ return 0;
 }
 
+
 static int find_abbrev(JSString *sp, int p, const char *list, int count) {
 int n, i;
 
@@ -46990,56 +48611,92 @@
 // parse(s)
 JSValue s, rv;
 int64_t fields[] = { 0, 1, 1, 0, 0, 0, 0 };
+ double fields1[7];
 int64_t tz, hh, mm;
 double d;
- int p, i, c, sgn;
+ int p, i, c, sgn, l;
 JSString *sp;
-
+ BOOL is_local;
+ 
 rv = JS_NAN;
 
 s = JS_ToString(ctx, argv[0]);
 if (JS_IsException(s))
 return JS_EXCEPTION;
-
+ 
 sp = JS_VALUE_GET_STRING(s);
 p = 0;
 if (p < sp->len && (((c = string_get(sp, p)) >= '0' && c <= '9') || c == '+' || c == '-')) {
 /* ISO format */
 /* year field can be negative */
- /* XXX: could be stricter */
- if (string_get_signed_field(sp, &p, &fields[0]))
+ if (string_get_signed_digits(sp, &p, &fields[0]))
 goto done;
 
- for (i = 1; i < 6; i++) {
- if (string_get_field(sp, &p, &fields[i]))
+ for (i = 1; i < 7; i++) {
+ if (p >= sp->len)
 break;
- }
- if (i == 6 && p < sp->len && string_get(sp, p) == '.') {
- /* parse milliseconds as a fractional part, round to nearest */
- /* XXX: the spec does not indicate which rounding should be used */
- int mul = 1000, ms = 0;
- while (++p < sp->len) {
- int c = string_get(sp, p);
- if (!(c >= '0' && c <= '9'))
- break;
- if (mul == 1 && c >= '5')
- ms += 1;
- ms += (c - '0') * (mul /= 10);
+ switch(i) {
+ case 1:
+ case 2:
+ c = '-';
+ break;
+ case 3:
+ c = 'T';
+ break;
+ case 4:
+ case 5:
+ c = ':';
+ break;
+ case 6:
+ c = '.';
+ break;
+ }
+ if (string_get(sp, p) != c)
+ break;
+ p++;
+ if (i == 6) {
+ if (string_get_milliseconds(sp, &p, &fields[i]))
+ goto done;
+ } else {
+ if (string_get_digits(sp, &p, &fields[i]))
+ goto done;
 }
- fields[6] = ms;
 }
+ /* no time: UTC by default */
+ is_local = (i > 3);
 fields[1] -= 1;
 
- /* parse the time zone offset if present: [+-]HH:mm */
+ /* parse the time zone offset if present: [+-]HH:mm or [+-]HHmm */
 tz = 0;
- if (p < sp->len && ((sgn = string_get(sp, p)) == '+' || sgn == '-')) {
- if (string_get_field(sp, &p, &hh))
+ if (p < sp->len) {
+ sgn = string_get(sp, p);
+ if (sgn == '+' || sgn == '-') {
+ p++;
+ l = sp->len - p;
+ if (l != 4 && l != 5)
+ goto done;
+ if (string_get_fixed_width_digits(sp, &p, 2, &hh))
+ goto done;
+ if (l == 5) {
+ if (string_get(sp, p) != ':')
+ goto done;
+ p++;
+ }
+ if (string_get_fixed_width_digits(sp, &p, 2, &mm))
+ goto done;
+ tz = hh * 60 + mm;
+ if (sgn == '-')
+ tz = -tz;
+ is_local = FALSE;
+ } else if (sgn == 'Z') {
+ p++;
+ is_local = FALSE;
+ } else {
 goto done;
- if (string_get_field(sp, &p, &mm))
+ }
+ /* error if extraneous characters */
+ if (p != sp->len)
 goto done;
- tz = hh * 60 + mm;
- if (sgn == '-')
- tz = -tz;
 }
 } else {
 /* toString or toUTCString format */
@@ -47051,7 +48708,7 @@
 c = string_get(sp, p);
 if (c >= '0' && c <= '9') {
 /* day of month first */
- if (string_get_field(sp, &p, &fields[2]))
+ if (string_get_digits(sp, &p, &fields[2]))
 goto done;
 if (string_get_month(sp, &p, &fields[1]))
 goto done;
@@ -47059,29 +48716,40 @@
 /* month first */
 if (string_get_month(sp, &p, &fields[1]))
 goto done;
- if (string_get_field(sp, &p, &fields[2]))
+ string_skip_spaces(sp, &p);
+ if (string_get_digits(sp, &p, &fields[2]))
 goto done;
 }
+ /* year */
 string_skip_spaces(sp, &p);
- if (string_get_signed_field(sp, &p, &fields[0]))
+ if (string_get_signed_digits(sp, &p, &fields[0]))
 goto done;
 
 /* hour, min, seconds */
+ string_skip_spaces(sp, &p);
 for(i = 0; i < 3; i++) {
- if (string_get_field(sp, &p, &fields[3 + i]))
+ if (i == 1 || i == 2) {
+ if (p >= sp->len)
+ goto done;
+ if (string_get(sp, p) != ':')
+ goto done;
+ p++;
+ }
+ if (string_get_digits(sp, &p, &fields[3 + i]))
 goto done;
 }
 // XXX: parse optional milliseconds?
 
 /* parse the time zone offset if present: [+-]HHmm */
+ is_local = FALSE;
 tz = 0;
 for (tz = 0; p < sp->len; p++) {
 sgn = string_get(sp, p);
 if (sgn == '+' || sgn == '-') {
 p++;
- if (string_get_digits(sp, &p, 2, &hh))
+ if (string_get_fixed_width_digits(sp, &p, 2, &hh))
 goto done;
- if (string_get_digits(sp, &p, 2, &mm))
+ if (string_get_fixed_width_digits(sp, &p, 2, &mm))
 goto done;
 tz = hh * 60 + mm;
 if (sgn == '-')
@@ -47090,8 +48758,10 @@
 }
 }
 }
- d = set_date_fields(fields, 0) - tz * 60000;
- rv = __JS_NewFloat64(ctx, d);
+ for(i = 0; i < 7; i++)
+ fields1[i] = fields[i];
+ d = set_date_fields(fields1, is_local) - tz * 60000;
+ rv = JS_NewFloat64(ctx, d);
 
 done:
 JS_FreeValue(ctx, s);
@@ -47161,7 +48831,7 @@
 
 if (JS_ThisTimeValue(ctx, &v, this_val))
 return JS_EXCEPTION;
- return __JS_NewFloat64(ctx, v);
+ return JS_NewFloat64(ctx, v);
 }
 
 static JSValue js_date_setTime(JSContext *ctx, JSValueConst this_val,
@@ -47190,7 +48860,7 @@
 if (y >= 0 && y < 100)
 y += 1900;
 }
- args[0] = __JS_NewFloat64(ctx, y);
+ args[0] = JS_NewFloat64(ctx, y);
 return set_date_field(ctx, this_val, 1, args, 0x011);
 }
 
@@ -47310,61 +48980,364 @@
 
 #ifdef CONFIG_BIGNUM
 
+/* Operators */
+
+static void js_operator_set_finalizer(JSRuntime *rt, JSValue val)
+{
+ JSOperatorSetData *opset = JS_GetOpaque(val, JS_CLASS_OPERATOR_SET);
+ int i, j;
+ JSBinaryOperatorDefEntry *ent;
+ 
+ if (opset) {
+ for(i = 0; i < JS_OVOP_COUNT; i++) {
+ if (opset->self_ops[i])
+ JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, opset->self_ops[i]));
+ }
+ for(j = 0; j < opset->left.count; j++) {
+ ent = &opset->left.tab[j];
+ for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+ if (ent->ops[i])
+ JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, ent->ops[i]));
+ }
+ }
+ js_free_rt(rt, opset->left.tab);
+ for(j = 0; j < opset->right.count; j++) {
+ ent = &opset->right.tab[j];
+ for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+ if (ent->ops[i])
+ JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, ent->ops[i]));
+ }
+ }
+ js_free_rt(rt, opset->right.tab);
+ js_free_rt(rt, opset);
+ }
+}
+
+static void js_operator_set_mark(JSRuntime *rt, JSValueConst val,
+ JS_MarkFunc *mark_func)
+{
+ JSOperatorSetData *opset = JS_GetOpaque(val, JS_CLASS_OPERATOR_SET);
+ int i, j;
+ JSBinaryOperatorDefEntry *ent;
+ 
+ if (opset) {
+ for(i = 0; i < JS_OVOP_COUNT; i++) {
+ if (opset->self_ops[i])
+ JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, opset->self_ops[i]),
+ mark_func);
+ }
+ for(j = 0; j < opset->left.count; j++) {
+ ent = &opset->left.tab[j];
+ for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+ if (ent->ops[i])
+ JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, ent->ops[i]),
+ mark_func);
+ }
+ }
+ for(j = 0; j < opset->right.count; j++) {
+ ent = &opset->right.tab[j];
+ for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+ if (ent->ops[i])
+ JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, ent->ops[i]),
+ mark_func);
+ }
+ }
+ }
+}
+
+
+/* create an OperatorSet object */
+static JSValue js_operators_create_internal(JSContext *ctx,
+ int argc, JSValueConst *argv,
+ BOOL is_primitive)
+{
+ JSValue opset_obj, prop, obj;
+ JSOperatorSetData *opset, *opset1;
+ JSBinaryOperatorDef *def;
+ JSValueConst arg;
+ int i, j;
+ JSBinaryOperatorDefEntry *new_tab;
+ JSBinaryOperatorDefEntry *ent;
+ uint32_t op_count;
+
+ if (ctx->rt->operator_count == UINT32_MAX) {
+ return JS_ThrowTypeError(ctx, "too many operators");
+ }
+ opset_obj = JS_NewObjectProtoClass(ctx, JS_NULL, JS_CLASS_OPERATOR_SET);
+ if (JS_IsException(opset_obj))
+ goto fail;
+ opset = js_mallocz(ctx, sizeof(*opset));
+ if (!opset)
+ goto fail;
+ JS_SetOpaque(opset_obj, opset);
+ if (argc >= 1) {
+ arg = argv[0];
+ /* self operators */
+ for(i = 0; i < JS_OVOP_COUNT; i++) {
+ prop = JS_GetPropertyStr(ctx, arg, js_overloadable_operator_names[i]);
+ if (JS_IsException(prop))
+ goto fail;
+ if (!JS_IsUndefined(prop)) {
+ if (check_function(ctx, prop)) {
+ JS_FreeValue(ctx, prop);
+ goto fail;
+ }
+ opset->self_ops[i] = JS_VALUE_GET_OBJ(prop);
+ }
+ }
+ }
+ /* left & right operators */
+ for(j = 1; j < argc; j++) {
+ arg = argv[j];
+ prop = JS_GetPropertyStr(ctx, arg, "left");
+ if (JS_IsException(prop))
+ goto fail;
+ def = &opset->right;
+ if (JS_IsUndefined(prop)) {
+ prop = JS_GetPropertyStr(ctx, arg, "right");
+ if (JS_IsException(prop))
+ goto fail;
+ if (JS_IsUndefined(prop)) {
+ JS_ThrowTypeError(ctx, "left or right property must be present");
+ goto fail;
+ }
+ def = &opset->left;
+ }
+ /* get the operator set */
+ obj = JS_GetProperty(ctx, prop, JS_ATOM_prototype);
+ JS_FreeValue(ctx, prop);
+ if (JS_IsException(obj))
+ goto fail;
+ prop = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_operatorSet);
+ JS_FreeValue(ctx, obj);
+ if (JS_IsException(prop))
+ goto fail;
+ opset1 = JS_GetOpaque2(ctx, prop, JS_CLASS_OPERATOR_SET);
+ if (!opset1) {
+ JS_FreeValue(ctx, prop);
+ goto fail;
+ }
+ op_count = opset1->operator_counter;
+ JS_FreeValue(ctx, prop);
+ 
+ /* we assume there are few entries */
+ new_tab = js_realloc(ctx, def->tab,
+ (def->count + 1) * sizeof(def->tab[0]));
+ if (!new_tab)
+ goto fail;
+ def->tab = new_tab;
+ def->count++;
+ ent = def->tab + def->count - 1;
+ memset(ent, 0, sizeof(def->tab[0]));
+ ent->operator_index = op_count;
+ 
+ for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+ prop = JS_GetPropertyStr(ctx, arg,
+ js_overloadable_operator_names[i]);
+ if (JS_IsException(prop))
+ goto fail;
+ if (!JS_IsUndefined(prop)) {
+ if (check_function(ctx, prop)) {
+ JS_FreeValue(ctx, prop);
+ goto fail;
+ }
+ ent->ops[i] = JS_VALUE_GET_OBJ(prop);
+ }
+ }
+ }
+ opset->is_primitive = is_primitive;
+ opset->operator_counter = ctx->rt->operator_count++;
+ return opset_obj;
+ fail:
+ JS_FreeValue(ctx, opset_obj);
+ return JS_EXCEPTION;
+}
+
+static JSValue js_operators_create(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ return js_operators_create_internal(ctx, argc, argv, FALSE);
+}
+
+static JSValue js_operators_updateBigIntOperators(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSValue opset_obj, prop;
+ JSOperatorSetData *opset;
+ const JSOverloadableOperatorEnum ops[2] = { JS_OVOP_DIV, JS_OVOP_POW };
+ JSOverloadableOperatorEnum op;
+ int i;
+ 
+ opset_obj = JS_GetProperty(ctx, ctx->class_proto[JS_CLASS_BIG_INT],
+ JS_ATOM_Symbol_operatorSet);
+ if (JS_IsException(opset_obj))
+ goto fail;
+ opset = JS_GetOpaque2(ctx, opset_obj, JS_CLASS_OPERATOR_SET);
+ if (!opset)
+ goto fail;
+ for(i = 0; i < countof(ops); i++) {
+ op = ops[i];
+ prop = JS_GetPropertyStr(ctx, argv[0],
+ js_overloadable_operator_names[op]);
+ if (JS_IsException(prop))
+ goto fail;
+ if (!JS_IsUndefined(prop)) {
+ if (!JS_IsNull(prop) && check_function(ctx, prop)) {
+ JS_FreeValue(ctx, prop);
+ goto fail;
+ }
+ if (opset->self_ops[op])
+ JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, opset->self_ops[op]));
+ if (JS_IsNull(prop)) {
+ opset->self_ops[op] = NULL;
+ } else {
+ opset->self_ops[op] = JS_VALUE_GET_PTR(prop);
+ }
+ }
+ }
+ JS_FreeValue(ctx, opset_obj);
+ return JS_UNDEFINED;
+ fail:
+ JS_FreeValue(ctx, opset_obj);
+ return JS_EXCEPTION;
+}
+
+static int js_operators_set_default(JSContext *ctx, JSValueConst obj)
+{
+ JSValue opset_obj;
+
+ if (!JS_IsObject(obj)) /* in case the prototype is not defined */
+ return 0;
+ opset_obj = js_operators_create_internal(ctx, 0, NULL, TRUE);
+ if (JS_IsException(opset_obj))
+ return -1;
+ /* cannot be modified by the user */
+ JS_DefinePropertyValue(ctx, obj, JS_ATOM_Symbol_operatorSet,
+ opset_obj, 0);
+ return 0;
+}
+
+static JSValue js_dummy_operators_ctor(JSContext *ctx, JSValueConst new_target,
+ int argc, JSValueConst *argv)
+{
+ return js_create_from_ctor(ctx, new_target, JS_CLASS_OBJECT);
+}
+
+static JSValue js_global_operators(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSValue func_obj, proto, opset_obj;
+
+ func_obj = JS_UNDEFINED;
+ proto = JS_NewObject(ctx);
+ if (JS_IsException(proto))
+ return JS_EXCEPTION;
+ opset_obj = js_operators_create_internal(ctx, argc, argv, FALSE);
+ if (JS_IsException(opset_obj))
+ goto fail;
+ JS_DefinePropertyValue(ctx, proto, JS_ATOM_Symbol_operatorSet,
+ opset_obj, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+ func_obj = JS_NewCFunction2(ctx, js_dummy_operators_ctor, "Operators",
+ 0, JS_CFUNC_constructor, 0);
+ if (JS_IsException(func_obj))
+ goto fail;
+ JS_SetConstructor2(ctx, func_obj, proto,
+ 0, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+ JS_FreeValue(ctx, proto);
+ return func_obj;
+ fail:
+ JS_FreeValue(ctx, proto);
+ JS_FreeValue(ctx, func_obj);
+ return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_operators_funcs[] = {
+ JS_CFUNC_DEF("create", 1, js_operators_create ),
+ JS_CFUNC_DEF("updateBigIntOperators", 2, js_operators_updateBigIntOperators ),
+};
+
+/* must be called after all overloadable base types are initialized */
+void JS_AddIntrinsicOperators(JSContext *ctx)
+{
+ JSValue obj;
+
+ ctx->allow_operator_overloading = TRUE;
+ obj = JS_NewCFunction(ctx, js_global_operators, "Operators", 1);
+ JS_SetPropertyFunctionList(ctx, obj,
+ js_operators_funcs,
+ countof(js_operators_funcs));
+ JS_DefinePropertyValue(ctx, ctx->global_obj, JS_ATOM_Operators,
+ obj,
+ JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+ /* add default operatorSets */
+ js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_BOOLEAN]);
+ js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_NUMBER]);
+ js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_STRING]);
+ js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_BIG_INT]);
+ js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_BIG_FLOAT]);
+ js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_BIG_DECIMAL]);
+}
+
 /* BigInt */
 
 static JSValue JS_ToBigIntCtorFree(JSContext *ctx, JSValue val)
 {
 uint32_t tag;
- BOOL is_legacy;
- int ret;
 
- is_legacy = is_bigint_mode(ctx) ^ 1;
 redo:
 tag = JS_VALUE_GET_NORM_TAG(val);
 switch(tag) {
 case JS_TAG_INT:
 case JS_TAG_BOOL:
- if (is_legacy) {
- bf_t r_s, *r = &r_s;
- bf_init(ctx->bf_ctx, r);
- bf_set_si(r, JS_VALUE_GET_INT(val));
- val = JS_NewBigInt2(ctx, r, TRUE);
- } else {
- val = JS_NewInt32(ctx, JS_VALUE_GET_INT(val));
- }
+ val = JS_NewBigInt64(ctx, JS_VALUE_GET_INT(val));
 break;
 case JS_TAG_BIG_INT:
 break;
 case JS_TAG_FLOAT64:
 case JS_TAG_BIG_FLOAT:
 {
- bf_t *a, a_s, r_s, *r = &r_s;
+ bf_t *a, a_s;
+ 
 a = JS_ToBigFloat(ctx, &a_s, val);
- bf_init(ctx->bf_ctx, r);
 if (!bf_is_finite(a)) {
 JS_FreeValue(ctx, val);
 val = JS_ThrowRangeError(ctx, "cannot convert NaN or Infinity to bigint");
 } else {
- bf_set(r, a);
- ret = bf_rint(r, BF_RNDZ);
+ JSValue val1 = JS_NewBigInt(ctx);
+ bf_t *r;
+ int ret;
+ if (JS_IsException(val1)) {
+ JS_FreeValue(ctx, val);
+ return JS_EXCEPTION;
+ }
+ r = JS_GetBigInt(val1);
+ ret = bf_set(r, a);
+ ret |= bf_rint(r, BF_RNDZ);
 JS_FreeValue(ctx, val);
- if (is_legacy && (ret & BF_ST_INEXACT)) {
- bf_delete(r);
+ if (ret & BF_ST_MEM_ERROR) {
+ JS_FreeValue(ctx, val1);
+ val = JS_ThrowOutOfMemory(ctx);
+ } else if (ret & BF_ST_INEXACT) {
+ JS_FreeValue(ctx, val1);
 val = JS_ThrowRangeError(ctx, "cannot convert to bigint: not an integer");
 } else {
- val = JS_NewBigInt2(ctx, r, is_legacy);
+ val = JS_CompactBigInt(ctx, val1);
 }
 }
 if (a == &a_s)
 bf_delete(a);
 }
 break;
+ case JS_TAG_BIG_DECIMAL:
+ val = JS_ToStringFree(ctx, val);
+ if (JS_IsException(val))
+ break;
+ goto redo;
 case JS_TAG_STRING:
 val = JS_StringToBigIntErr(ctx, val);
 break;
 case JS_TAG_OBJECT:
- val = JS_ToPrimitiveFree(ctx, val,
- is_legacy ? HINT_NUMBER : HINT_INTEGER);
+ val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
 if (JS_IsException(val))
 break;
 goto redo;
@@ -47378,23 +49351,14 @@
 }
 
 static JSValue js_bigint_constructor(JSContext *ctx,
- JSValueConst this_val,
+ JSValueConst new_target,
 int argc, JSValueConst *argv)
 {
+ if (!JS_IsUndefined(new_target))
+ return JS_ThrowTypeError(ctx, "not a constructor");
 return JS_ToBigIntCtorFree(ctx, JS_DupValue(ctx, argv[0]));
 }
 
-static inline BOOL JS_IsBigInt(JSContext *ctx, JSValueConst v)
-{
- int tag = JS_VALUE_GET_TAG(v);
- if (tag == JS_TAG_BIG_INT)
- return TRUE;
- if (is_bigint_mode(ctx))
- return tag == JS_TAG_INT;
- else
- return FALSE;
-}
-
 static JSValue js_thisBigIntValue(JSContext *ctx, JSValueConst this_val)
 {
 if (JS_IsBigInt(ctx, this_val))
@@ -47403,8 +49367,6 @@
 if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
 JSObject *p = JS_VALUE_GET_OBJ(this_val);
 if (p->class_id == JS_CLASS_BIG_INT) {
- /* XXX: may relax the check in case the object comes from
- bignum mode */
 if (JS_IsBigInt(ctx, p->u.object_data))
 return JS_DupValue(ctx, p->u.object_data);
 }
@@ -47425,12 +49387,9 @@
 if (argc == 0 || JS_IsUndefined(argv[0])) {
 base = 10;
 } else {
- if (JS_ToInt32Sat(ctx, &base, argv[0]))
- goto fail;
- if (base < 2 || base > 36) {
- JS_ThrowRangeError(ctx, "radix must be between 2 and 36");
+ base = js_get_radix(ctx, argv[0]);
+ if (base < 0)
 goto fail;
- }
 }
 ret = js_bigint_to_string1(ctx, val, base);
 JS_FreeValue(ctx, val);
@@ -47450,72 +49409,96 @@
 JSValueConst this_val,
 int argc, JSValueConst *argv, int magic)
 {
- bf_t a_s, b_s, *a, *b, r_s, *r = &r_s, q_s, *q = &q_s;
+ bf_t a_s, b_s, *a, *b, *r, *q;
 int status;
-
+ JSValue q_val, r_val;
+ 
+ q_val = JS_NewBigInt(ctx);
+ if (JS_IsException(q_val))
+ return JS_EXCEPTION;
+ r_val = JS_NewBigInt(ctx);
+ if (JS_IsException(r_val))
+ goto fail;
 b = NULL;
 a = JS_ToBigInt(ctx, &a_s, argv[0]);
 if (!a)
- return JS_EXCEPTION;
+ goto fail;
 b = JS_ToBigInt(ctx, &b_s, argv[1]);
 if (!b) {
 JS_FreeBigInt(ctx, a, &a_s);
- return JS_EXCEPTION;
+ goto fail;
 }
- bf_init(ctx->bf_ctx, q);
- bf_init(ctx->bf_ctx, r);
+ q = JS_GetBigInt(q_val);
+ r = JS_GetBigInt(r_val);
 status = bf_divrem(q, r, a, b, BF_PREC_INF, BF_RNDZ, magic & 0xf);
 JS_FreeBigInt(ctx, a, &a_s);
 JS_FreeBigInt(ctx, b, &b_s);
 if (unlikely(status)) {
- bf_delete(q);
- bf_delete(r);
 throw_bf_exception(ctx, status);
- return JS_EXCEPTION;
+ goto fail;
 }
+ q_val = JS_CompactBigInt(ctx, q_val);
 if (magic & 0x10) {
 JSValue ret;
- /* XXX: handle exceptions */
 ret = JS_NewArray(ctx);
- JS_SetPropertyUint32(ctx, ret, 0, JS_NewBigInt(ctx, q));
- JS_SetPropertyUint32(ctx, ret, 1, JS_NewBigInt(ctx, r));
+ if (JS_IsException(ret))
+ goto fail;
+ JS_SetPropertyUint32(ctx, ret, 0, q_val);
+ JS_SetPropertyUint32(ctx, ret, 1, JS_CompactBigInt(ctx, r_val));
 return ret;
 } else {
- bf_delete(r);
- return JS_NewBigInt(ctx, q);
+ JS_FreeValue(ctx, r_val);
+ return q_val;
 }
+ fail:
+ JS_FreeValue(ctx, q_val);
+ JS_FreeValue(ctx, r_val);
+ return JS_EXCEPTION;
 }
 
 static JSValue js_bigint_sqrt(JSContext *ctx,
 JSValueConst this_val,
 int argc, JSValueConst *argv, int magic)
 {
- bf_t a_s, *a, r_s, *r = &r_s, rem_s, *rem = &rem_s;
+ bf_t a_s, *a, *r, *rem;
 int status;
+ JSValue r_val, rem_val;
+ 
+ r_val = JS_NewBigInt(ctx);
+ if (JS_IsException(r_val))
+ return JS_EXCEPTION;
+ rem_val = JS_NewBigInt(ctx);
+ if (JS_IsException(rem_val))
+ return JS_EXCEPTION;
+ r = JS_GetBigInt(r_val);
+ rem = JS_GetBigInt(rem_val);
 
 a = JS_ToBigInt(ctx, &a_s, argv[0]);
 if (!a)
- return JS_EXCEPTION;
- bf_init(ctx->bf_ctx, r);
- bf_init(ctx->bf_ctx, rem);
+ goto fail;
 status = bf_sqrtrem(r, rem, a);
 JS_FreeBigInt(ctx, a, &a_s);
 if (unlikely(status & ~BF_ST_INEXACT)) {
- bf_delete(r);
- bf_delete(rem);
- return throw_bf_exception(ctx, status);
+ throw_bf_exception(ctx, status);
+ goto fail;
 }
+ r_val = JS_CompactBigInt(ctx, r_val);
 if (magic) {
 JSValue ret;
- /* XXX: handle exceptions */
 ret = JS_NewArray(ctx);
- JS_SetPropertyUint32(ctx, ret, 0, JS_NewBigInt(ctx, r));
- JS_SetPropertyUint32(ctx, ret, 1, JS_NewBigInt(ctx, rem));
+ if (JS_IsException(ret))
+ goto fail;
+ JS_SetPropertyUint32(ctx, ret, 0, r_val);
+ JS_SetPropertyUint32(ctx, ret, 1, JS_CompactBigInt(ctx, rem_val));
 return ret;
 } else {
- bf_delete(rem);
- return JS_NewBigInt(ctx, r);
+ JS_FreeValue(ctx, rem_val);
+ return r_val;
 }
+ fail:
+ JS_FreeValue(ctx, r_val);
+ JS_FreeValue(ctx, rem_val);
+ return JS_EXCEPTION;
 }
 
 static JSValue js_bigint_op1(JSContext *ctx,
@@ -47556,15 +49539,22 @@
 int argc, JSValueConst *argv, int asIntN)
 {
 uint64_t bits;
- bf_t a_s, *a = &a_s, r_s, *r = &r_s, mask_s, *mask = &mask_s;
-
+ bf_t a_s, *a = &a_s, *r, mask_s, *mask = &mask_s;
+ JSValue res;
+ 
 if (JS_ToIndex(ctx, &bits, argv[0]))
 return JS_EXCEPTION;
+ res = JS_NewBigInt(ctx);
+ if (JS_IsException(res))
+ return JS_EXCEPTION;
+ r = JS_GetBigInt(res);
 a = JS_ToBigInt(ctx, &a_s, argv[1]);
- if (!a)
+ if (!a) {
+ JS_FreeValue(ctx, res);
 return JS_EXCEPTION;
+ }
 /* XXX: optimize */
- bf_init(ctx->bf_ctx, r);
+ r = JS_GetBigInt(res);
 bf_init(ctx->bf_ctx, mask);
 bf_set_ui(mask, 1);
 bf_mul_2exp(mask, bits, BF_PREC_INF, BF_RNDZ);
@@ -47581,7 +49571,7 @@
 }
 bf_delete(mask);
 JS_FreeBigInt(ctx, a, &a_s);
- return JS_NewBigInt(ctx, r);
+ return JS_CompactBigInt(ctx, res);
 }
 
 static const JSCFunctionListEntry js_bigint_funcs[] = {
@@ -47611,21 +49601,20 @@
 void JS_AddIntrinsicBigInt(JSContext *ctx)
 {
 JSRuntime *rt = ctx->rt;
- JSValue obj1;
+ JSValueConst obj1;
 
 rt->bigint_ops.to_string = js_bigint_to_string;
 rt->bigint_ops.from_string = js_string_to_bigint;
 rt->bigint_ops.unary_arith = js_unary_arith_bigint;
 rt->bigint_ops.binary_arith = js_binary_arith_bigint;
 rt->bigint_ops.compare = js_compare_bigfloat;
-
+ 
 ctx->class_proto[JS_CLASS_BIG_INT] = JS_NewObject(ctx);
 JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_BIG_INT],
 js_bigint_proto_funcs,
 countof(js_bigint_proto_funcs));
- obj1 = JS_NewCFunction(ctx, js_bigint_constructor, "BigInt", 1);
- JS_NewGlobalCConstructor2(ctx, obj1, "BigInt",
- ctx->class_proto[JS_CLASS_BIG_INT]);
+ obj1 = JS_NewGlobalCConstructor(ctx, "BigInt", js_bigint_constructor, 1,
+ ctx->class_proto[JS_CLASS_BIG_INT]);
 JS_SetPropertyFunctionList(ctx, obj1, js_bigint_funcs,
 countof(js_bigint_funcs));
 }
@@ -47660,12 +49649,9 @@
 if (argc == 0 || JS_IsUndefined(argv[0])) {
 base = 10;
 } else {
- if (JS_ToInt32Sat(ctx, &base, argv[0]))
+ base = js_get_radix(ctx, argv[0]);
+ if (base < 0)
 goto fail;
- if (base < 2 || base > 36) {
- JS_ThrowRangeError(ctx, "radix must be between 2 and 36");
- goto fail;
- }
 }
 ret = js_ftoa(ctx, val, base, 0, BF_RNDN | BF_FTOA_FORMAT_FREE_MIN);
 JS_FreeValue(ctx, val);
@@ -47681,7 +49667,7 @@
 return js_thisBigFloatValue(ctx, this_val);
 }
 
-static int get_rnd_mode(JSContext *ctx, JSValueConst val)
+static int bigfloat_get_rnd_mode(JSContext *ctx, JSValueConst val)
 {
 int rnd_mode;
 if (JS_ToInt32Sat(ctx, &rnd_mode, val))
@@ -47698,8 +49684,7 @@
 {
 JSValue val, ret;
 int64_t f;
- int res, rnd_mode;
- bf_t a_s, *a, b;
+ int rnd_mode, radix;
 
 val = js_thisBigFloatValue(ctx, this_val);
 if (JS_IsException(val))
@@ -47711,26 +49696,19 @@
 goto fail;
 }
 rnd_mode = BF_RNDNA;
+ radix = 10;
+ /* XXX: swap parameter order for rounding mode and radix */
 if (argc > 1) {
- rnd_mode = get_rnd_mode(ctx, argv[1]);
+ rnd_mode = bigfloat_get_rnd_mode(ctx, argv[1]);
 if (rnd_mode < 0)
 goto fail;
 }
-
- a = JS_ToBigFloat(ctx, &a_s, val);
- if (!a)
- goto fail;
- bf_init(ctx->bf_ctx, &b);
- bf_set_float64(&b, 1e21);
- res = bf_cmpu(a, &b);
- bf_delete(&b);
- if (a == &a_s)
- bf_delete(a);
- if (res >= 0) {
- ret = JS_ToString(ctx, val);
- } else {
- ret = js_ftoa(ctx, val, 10, f, rnd_mode | BF_FTOA_FORMAT_FRAC);
+ if (argc > 2) {
+ radix = js_get_radix(ctx, argv[2]);
+ if (radix < 0)
+ goto fail;
 }
+ ret = js_ftoa(ctx, val, radix, f, rnd_mode | BF_FTOA_FORMAT_FRAC);
 JS_FreeValue(ctx, val);
 return ret;
 fail:
@@ -47763,7 +49741,7 @@
 {
 JSValue val, ret;
 int64_t f;
- int rnd_mode;
+ int rnd_mode, radix;
 
 val = js_thisBigFloatValue(ctx, this_val);
 if (JS_IsException(val))
@@ -47781,12 +49759,18 @@
 goto fail;
 }
 rnd_mode = BF_RNDNA;
+ radix = 10;
 if (argc > 1) {
- rnd_mode = get_rnd_mode(ctx, argv[1]);
+ rnd_mode = bigfloat_get_rnd_mode(ctx, argv[1]);
 if (rnd_mode < 0)
 goto fail;
 }
- ret = js_ftoa(ctx, val, 10, f + 1,
+ if (argc > 2) {
+ radix = js_get_radix(ctx, argv[2]);
+ if (radix < 0)
+ goto fail;
+ }
+ ret = js_ftoa(ctx, val, radix, f + 1,
 rnd_mode | BF_FTOA_FORMAT_FIXED | BF_FTOA_FORCE_EXP);
 }
 JS_FreeValue(ctx, val);
@@ -47801,7 +49785,7 @@
 {
 JSValue val, ret;
 int64_t p;
- int rnd_mode;
+ int rnd_mode, radix;
 
 val = js_thisBigFloatValue(ctx, this_val);
 if (JS_IsException(val))
@@ -47819,12 +49803,18 @@
 goto fail;
 }
 rnd_mode = BF_RNDNA;
+ radix = 10;
 if (argc > 1) {
- rnd_mode = get_rnd_mode(ctx, argv[1]);
+ rnd_mode = bigfloat_get_rnd_mode(ctx, argv[1]);
 if (rnd_mode < 0)
 goto fail;
 }
- ret = js_ftoa(ctx, val, 10, p, rnd_mode | BF_FTOA_FORMAT_FIXED);
+ if (argc > 2) {
+ radix = js_get_radix(ctx, argv[2]);
+ if (radix < 0)
+ goto fail;
+ }
+ ret = js_ftoa(ctx, val, radix, p, rnd_mode | BF_FTOA_FORMAT_FIXED);
 }
 JS_FreeValue(ctx, val);
 return ret;
@@ -47842,15 +49832,19 @@
 };
 
 static JSValue js_bigfloat_constructor(JSContext *ctx,
- JSValueConst this_val,
+ JSValueConst new_target,
 int argc, JSValueConst *argv)
 {
 JSValue val;
+ if (!JS_IsUndefined(new_target))
+ return JS_ThrowTypeError(ctx, "not a constructor");
 if (argc == 0) {
- bf_t r_s, *r = &r_s;
- bf_init(ctx->bf_ctx, r);
+ bf_t *r;
+ val = JS_NewBigFloat(ctx);
+ if (JS_IsException(val))
+ return val;
+ r = JS_GetBigFloat(val);
 bf_set_zero(r, 0);
- val = JS_NewBigFloat(ctx, r);
 } else {
 val = JS_DupValue(ctx, argv[0]);
 redo:
@@ -47859,18 +49853,26 @@
 break;
 case JS_TAG_FLOAT64:
 {
- bf_t r_s, *r = &r_s;
- bf_init(ctx->bf_ctx, r);
- bf_set_float64(r, JS_VALUE_GET_FLOAT64(val));
- val = JS_NewBigFloat(ctx, r);
+ bf_t *r;
+ double d = JS_VALUE_GET_FLOAT64(val);
+ val = JS_NewBigFloat(ctx);
+ if (JS_IsException(val))
+ break;
+ r = JS_GetBigFloat(val);
+ if (bf_set_float64(r, d))
+ goto fail;
 }
 break;
 case JS_TAG_INT:
 {
- bf_t r_s, *r = &r_s;
- bf_init(ctx->bf_ctx, r);
- bf_set_si(r, JS_VALUE_GET_INT(val));
- val = JS_NewBigFloat(ctx, r);
+ bf_t *r;
+ int32_t v = JS_VALUE_GET_INT(val);
+ val = JS_NewBigFloat(ctx);
+ if (JS_IsException(val))
+ break;
+ r = JS_GetBigFloat(val);
+ if (bf_set_si(r, v))
+ goto fail;
 }
 break;
 case JS_TAG_BIG_INT:
@@ -47880,6 +49882,11 @@
 val = JS_MKPTR(JS_TAG_BIG_FLOAT, p);
 }
 break;
+ case JS_TAG_BIG_DECIMAL:
+ val = JS_ToStringFree(ctx, val);
+ if (JS_IsException(val))
+ break;
+ goto redo;
 case JS_TAG_STRING:
 {
 const char *str, *p;
@@ -47893,10 +49900,12 @@
 p = str;
 p += skip_spaces(p);
 if ((p - str) == len) {
- bf_t r_s, *r = &r_s;
- bf_init(ctx->bf_ctx, r);
- bf_set_si(r, 0);
- val = JS_NewBigFloat(ctx, r);
+ bf_t *r;
+ val = JS_NewBigFloat(ctx);
+ if (JS_IsException(val))
+ break;
+ r = JS_GetBigFloat(val);
+ bf_set_zero(r, 0);
 err = 0;
 } else {
 val = js_atof(ctx, p, &p, 0, ATOD_ACCEPT_BIN_OCT |
@@ -47929,13 +49938,20 @@
 }
 }
 return val;
+ fail:
+ JS_FreeValue(ctx, val);
+ return JS_EXCEPTION;
 }
 
 static JSValue js_bigfloat_get_const(JSContext *ctx,
- JSValueConst this_val, int magic)
+ JSValueConst this_val, int magic)
 {
- bf_t r_s, *r = &r_s;
- bf_init(ctx->bf_ctx, r);
+ bf_t *r;
+ JSValue val;
+ val = JS_NewBigFloat(ctx);
+ if (JS_IsException(val))
+ return val;
+ r = JS_GetBigFloat(val);
 switch(magic) {
 case 0: /* PI */
 bf_const_pi(r, ctx->fp_env.prec, ctx->fp_env.flags);
@@ -47971,13 +49987,13 @@
 default:
 abort();
 }
- return JS_NewBigFloat(ctx, r);
+ return val;
 }
 
 static JSValue js_bigfloat_parseFloat(JSContext *ctx, JSValueConst this_val,
 int argc, JSValueConst *argv)
 {
- bf_t a_s, *a = &a_s;
+ bf_t *a;
 const char *str;
 JSValue ret;
 int radix;
@@ -48001,10 +50017,13 @@
 if (!fe)
 goto fail;
 }
- bf_init(ctx->bf_ctx, a);
+ ret = JS_NewBigFloat(ctx);
+ if (JS_IsException(ret))
+ goto done;
+ a = JS_GetBigFloat(ret);
 /* XXX: use js_atof() */
 bf_atof(a, str, NULL, radix, fe->prec, fe->flags);
- ret = JS_NewBigFloat(ctx, a);
+ done:
 JS_FreeCString(ctx, str);
 return ret;
 }
@@ -48014,7 +50033,7 @@
 {
 JSValueConst val = argv[0];
 JSBigFloat *p;
-
+ 
 if (JS_VALUE_GET_NORM_TAG(val) != JS_TAG_BIG_FLOAT)
 return JS_FALSE;
 p = JS_VALUE_GET_PTR(val);
@@ -48026,11 +50045,205 @@
 {
 JSValueConst val = argv[0];
 JSBigFloat *p;
-
+ 
 if (JS_VALUE_GET_NORM_TAG(val) != JS_TAG_BIG_FLOAT)
 return JS_FALSE;
 p = JS_VALUE_GET_PTR(val);
- return JS_NewBool(ctx, bf_is_finite(&p->num));
+ return JS_NewBool(ctx, bf_is_nan(&p->num));
+}
+
+enum {
+ MATH_OP_ABS,
+ MATH_OP_FLOOR,
+ MATH_OP_CEIL,
+ MATH_OP_ROUND,
+ MATH_OP_TRUNC,
+ MATH_OP_SQRT,
+ MATH_OP_FPROUND,
+ MATH_OP_ACOS,
+ MATH_OP_ASIN,
+ MATH_OP_ATAN,
+ MATH_OP_ATAN2,
+ MATH_OP_COS,
+ MATH_OP_EXP,
+ MATH_OP_LOG,
+ MATH_OP_POW,
+ MATH_OP_SIN,
+ MATH_OP_TAN,
+ MATH_OP_FMOD,
+ MATH_OP_REM,
+ MATH_OP_SIGN,
+
+ MATH_OP_ADD,
+ MATH_OP_SUB,
+ MATH_OP_MUL,
+ MATH_OP_DIV,
+};
+
+static JSValue js_bigfloat_fop(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv, int magic)
+{
+ bf_t a_s, *a, *r;
+ JSFloatEnv *fe;
+ int rnd_mode;
+ JSValue op1, res;
+
+ op1 = JS_ToNumeric(ctx, argv[0]);
+ if (JS_IsException(op1))
+ return op1;
+ a = JS_ToBigFloat(ctx, &a_s, op1);
+ fe = &ctx->fp_env;
+ if (argc > 1) {
+ fe = JS_GetOpaque2(ctx, argv[1], JS_CLASS_FLOAT_ENV);
+ if (!fe)
+ goto fail;
+ }
+ res = JS_NewBigFloat(ctx);
+ if (JS_IsException(res)) {
+ fail:
+ if (a == &a_s)
+ bf_delete(a);
+ JS_FreeValue(ctx, op1);
+ return JS_EXCEPTION;
+ }
+ r = JS_GetBigFloat(res);
+ switch (magic) {
+ case MATH_OP_ABS:
+ bf_set(r, a);
+ r->sign = 0;
+ break;
+ case MATH_OP_FLOOR:
+ rnd_mode = BF_RNDD;
+ goto rint;
+ case MATH_OP_CEIL:
+ rnd_mode = BF_RNDU;
+ goto rint;
+ case MATH_OP_ROUND:
+ rnd_mode = BF_RNDNA;
+ goto rint;
+ case MATH_OP_TRUNC:
+ rnd_mode = BF_RNDZ;
+ rint:
+ bf_set(r, a);
+ fe->status |= bf_rint(r, rnd_mode);
+ break;
+ case MATH_OP_SQRT:
+ fe->status |= bf_sqrt(r, a, fe->prec, fe->flags);
+ break;
+ case MATH_OP_FPROUND:
+ bf_set(r, a);
+ fe->status |= bf_round(r, fe->prec, fe->flags);
+ break;
+ case MATH_OP_ACOS:
+ fe->status |= bf_acos(r, a, fe->prec, fe->flags);
+ break;
+ case MATH_OP_ASIN:
+ fe->status |= bf_asin(r, a, fe->prec, fe->flags);
+ break;
+ case MATH_OP_ATAN:
+ fe->status |= bf_atan(r, a, fe->prec, fe->flags);
+ break;
+ case MATH_OP_COS:
+ fe->status |= bf_cos(r, a, fe->prec, fe->flags);
+ break;
+ case MATH_OP_EXP:
+ fe->status |= bf_exp(r, a, fe->prec, fe->flags);
+ break;
+ case MATH_OP_LOG:
+ fe->status |= bf_log(r, a, fe->prec, fe->flags);
+ break;
+ case MATH_OP_SIN:
+ fe->status |= bf_sin(r, a, fe->prec, fe->flags);
+ break;
+ case MATH_OP_TAN:
+ fe->status |= bf_tan(r, a, fe->prec, fe->flags);
+ break;
+ case MATH_OP_SIGN:
+ if (bf_is_nan(a) || bf_is_zero(a)) {
+ bf_set(r, a);
+ } else {
+ bf_set_si(r, 1 - 2 * a->sign);
+ }
+ break;
+ default:
+ abort();
+ }
+ if (a == &a_s)
+ bf_delete(a);
+ JS_FreeValue(ctx, op1);
+ return res;
+}
+
+static JSValue js_bigfloat_fop2(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv, int magic)
+{
+ bf_t a_s, *a, b_s, *b, r_s, *r = &r_s;
+ JSFloatEnv *fe;
+ JSValue op1, op2, res;
+
+ op1 = JS_ToNumeric(ctx, argv[0]);
+ if (JS_IsException(op1))
+ return op1;
+ op2 = JS_ToNumeric(ctx, argv[1]);
+ if (JS_IsException(op2)) {
+ JS_FreeValue(ctx, op1);
+ return op2;
+ }
+ a = JS_ToBigFloat(ctx, &a_s, op1);
+ b = JS_ToBigFloat(ctx, &b_s, op2);
+ fe = &ctx->fp_env;
+ if (argc > 2) {
+ fe = JS_GetOpaque2(ctx, argv[2], JS_CLASS_FLOAT_ENV);
+ if (!fe)
+ goto fail;
+ }
+ res = JS_NewBigFloat(ctx);
+ if (JS_IsException(res)) {
+ fail:
+ if (a == &a_s)
+ bf_delete(a);
+ if (b == &b_s)
+ bf_delete(b);
+ JS_FreeValue(ctx, op1);
+ JS_FreeValue(ctx, op2);
+ return JS_EXCEPTION;
+ }
+ r = JS_GetBigFloat(res);
+ switch (magic) {
+ case MATH_OP_ATAN2:
+ fe->status |= bf_atan2(r, a, b, fe->prec, fe->flags);
+ break;
+ case MATH_OP_POW:
+ fe->status |= bf_pow(r, a, b, fe->prec, fe->flags | BF_POW_JS_QUIRKS);
+ break;
+ case MATH_OP_FMOD:
+ fe->status |= bf_rem(r, a, b, fe->prec, fe->flags, BF_RNDZ);
+ break;
+ case MATH_OP_REM:
+ fe->status |= bf_rem(r, a, b, fe->prec, fe->flags, BF_RNDN);
+ break;
+ case MATH_OP_ADD:
+ fe->status |= bf_add(r, a, b, fe->prec, fe->flags);
+ break;
+ case MATH_OP_SUB:
+ fe->status |= bf_sub(r, a, b, fe->prec, fe->flags);
+ break;
+ case MATH_OP_MUL:
+ fe->status |= bf_mul(r, a, b, fe->prec, fe->flags);
+ break;
+ case MATH_OP_DIV:
+ fe->status |= bf_div(r, a, b, fe->prec, fe->flags);
+ break;
+ default:
+ abort();
+ }
+ if (a == &a_s)
+ bf_delete(a);
+ if (b == &b_s)
+ bf_delete(b);
+ JS_FreeValue(ctx, op1);
+ JS_FreeValue(ctx, op2);
+ return res;
 }
 
 static const JSCFunctionListEntry js_bigfloat_funcs[] = {
@@ -48125,9 +50338,6 @@
 return JS_NewInt32(ctx, bf_get_exp_bits(ctx->fp_env.flags));
 }
 
-/* temporary fix for string conversion overflows */
-#define BF_EXP_BITS_MAX1 (BF_EXP_BITS_MAX - 1)
-
 static JSValue js_float_env_setPrec(JSContext *ctx,
 JSValueConst this_val,
 int argc, JSValueConst *argv)
@@ -48143,18 +50353,16 @@
 return JS_EXCEPTION;
 if (prec < BF_PREC_MIN || prec > BF_PREC_MAX)
 return JS_ThrowRangeError(ctx, "invalid precision");
- exp_bits = BF_EXP_BITS_MAX1;
+ exp_bits = BF_EXP_BITS_MAX;
 
 if (argc > 2 && !JS_IsUndefined(argv[2])) {
 if (JS_ToInt32Sat(ctx, &exp_bits, argv[2]))
 return JS_EXCEPTION;
- if (exp_bits < BF_EXP_BITS_MIN || exp_bits > BF_EXP_BITS_MAX1)
+ if (exp_bits < BF_EXP_BITS_MIN || exp_bits > BF_EXP_BITS_MAX)
 return JS_ThrowRangeError(ctx, "invalid number of exponent bits");
 }
 
- flags = BF_RNDN | bf_set_exp_bits(exp_bits);
- if (exp_bits != BF_EXP_BITS_MAX1)
- flags |= BF_FLAG_SUBNORMAL;
+ flags = BF_RNDN | BF_FLAG_SUBNORMAL | bf_set_exp_bits(exp_bits);
 
 saved_prec = ctx->fp_env.prec;
 saved_flags = ctx->fp_env.flags;
@@ -48214,24 +50422,20 @@
 case FE_EXP:
 if (JS_ToInt32Sat(ctx, &b, val))
 return JS_EXCEPTION;
- if (b < BF_EXP_BITS_MIN || b > BF_EXP_BITS_MAX1)
+ if (b < BF_EXP_BITS_MIN || b > BF_EXP_BITS_MAX)
 return JS_ThrowRangeError(ctx, "invalid number of exponent bits");
- if (b == BF_EXP_BITS_MAX1)
- fe->flags &= ~BF_FLAG_SUBNORMAL;
 fe->flags = (fe->flags & ~(BF_EXP_BITS_MASK << BF_EXP_BITS_SHIFT)) |
 bf_set_exp_bits(b);
 break;
 case FE_RNDMODE:
- b = get_rnd_mode(ctx, val);
+ b = bigfloat_get_rnd_mode(ctx, val);
 if (b < 0)
 return JS_EXCEPTION;
 fe->flags = (fe->flags & ~BF_RND_MASK) | b;
 break;
 case FE_SUBNORMAL:
 b = JS_ToBool(ctx, val);
- if (bf_get_exp_bits(fe->flags) != BF_EXP_BITS_MAX1) {
- fe->flags = (fe->flags & ~BF_FLAG_SUBNORMAL) | (b ? BF_FLAG_SUBNORMAL: 0);
- }
+ fe->flags = (fe->flags & ~BF_FLAG_SUBNORMAL) | (b ? BF_FLAG_SUBNORMAL: 0);
 break;
 default:
 b = JS_ToBool(ctx, val);
@@ -48261,12 +50465,12 @@
 JS_PROP_INT32_DEF("RNDU", BF_RNDU, 0 ),
 JS_PROP_INT32_DEF("RNDD", BF_RNDD, 0 ),
 JS_PROP_INT32_DEF("RNDNA", BF_RNDNA, 0 ),
- JS_PROP_INT32_DEF("RNDNU", BF_RNDNU, 0 ),
+ JS_PROP_INT32_DEF("RNDA", BF_RNDA, 0 ),
 JS_PROP_INT32_DEF("RNDF", BF_RNDF, 0 ),
 JS_PROP_INT32_DEF("precMin", BF_PREC_MIN, 0 ),
 JS_PROP_INT64_DEF("precMax", BF_PREC_MAX, 0 ),
 JS_PROP_INT32_DEF("expBitsMin", BF_EXP_BITS_MIN, 0 ),
- JS_PROP_INT32_DEF("expBitsMax", BF_EXP_BITS_MAX1, 0 ),
+ JS_PROP_INT32_DEF("expBitsMax", BF_EXP_BITS_MAX, 0 ),
 };
 
 static const JSCFunctionListEntry js_float_env_proto_funcs[] = {
@@ -48294,9 +50498,8 @@
 void JS_AddIntrinsicBigFloat(JSContext *ctx)
 {
 JSRuntime *rt = ctx->rt;
- JSValue obj1;
- JSValueConst obj2;
-
+ JSValueConst obj1;
+ 
 rt->bigfloat_ops.to_string = js_bigfloat_to_string;
 rt->bigfloat_ops.from_string = js_string_to_bigfloat;
 rt->bigfloat_ops.unary_arith = js_unary_arith_bigfloat;
@@ -48304,14 +50507,13 @@
 rt->bigfloat_ops.compare = js_compare_bigfloat;
 rt->bigfloat_ops.mul_pow10_to_float64 = js_mul_pow10_to_float64;
 rt->bigfloat_ops.mul_pow10 = js_mul_pow10;
-
+ 
 ctx->class_proto[JS_CLASS_BIG_FLOAT] = JS_NewObject(ctx);
 JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_BIG_FLOAT],
 js_bigfloat_proto_funcs,
 countof(js_bigfloat_proto_funcs));
- obj1 = JS_NewCFunction(ctx, js_bigfloat_constructor, "BigFloat", 1);
- JS_NewGlobalCConstructor2(ctx, obj1, "BigFloat",
- ctx->class_proto[JS_CLASS_BIG_FLOAT]);
+ obj1 = JS_NewGlobalCConstructor(ctx, "BigFloat", js_bigfloat_constructor, 1,
+ ctx->class_proto[JS_CLASS_BIG_FLOAT]);
 JS_SetPropertyFunctionList(ctx, obj1, js_bigfloat_funcs,
 countof(js_bigfloat_funcs));
 
@@ -48319,10 +50521,10 @@
 JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_FLOAT_ENV],
 js_float_env_proto_funcs,
 countof(js_float_env_proto_funcs));
- obj2 = JS_NewGlobalCConstructorOnly(ctx, "BigFloatEnv",
+ obj1 = JS_NewGlobalCConstructorOnly(ctx, "BigFloatEnv",
 js_float_env_constructor, 1,
 ctx->class_proto[JS_CLASS_FLOAT_ENV]);
- JS_SetPropertyFunctionList(ctx, obj2, js_float_env_funcs,
+ JS_SetPropertyFunctionList(ctx, obj1, js_float_env_funcs,
 countof(js_float_env_funcs));
 }
 
@@ -48342,10 +50544,18 @@
 case JS_TAG_BOOL:
 case JS_TAG_INT:
 {
- bfdec_t r_s, *r = &r_s;
- bfdec_init(ctx->bf_ctx, r);
- bfdec_set_si(r, JS_VALUE_GET_INT(val));
- val = JS_NewBigDecimal(ctx, r);
+ bfdec_t *r;
+ int32_t v = JS_VALUE_GET_INT(val);
+
+ val = JS_NewBigDecimal(ctx);
+ if (JS_IsException(val))
+ break;
+ r = JS_GetBigDecimal(val);
+ if (bfdec_set_si(r, v)) {
+ JS_FreeValue(ctx, val);
+ val = JS_EXCEPTION;
+ break;
+ }
 }
 break;
 case JS_TAG_FLOAT64:
@@ -48368,10 +50578,12 @@
 p = str;
 p += skip_spaces(p);
 if ((p - str) == len) {
- bfdec_t r_s, *r = &r_s;
- bfdec_init(ctx->bf_ctx, r);
+ bfdec_t *r;
+ val = JS_NewBigDecimal(ctx);
+ if (JS_IsException(val))
+ break;
+ r = JS_GetBigDecimal(val);
 bfdec_set_zero(r, 0);
- val = JS_NewBigDecimal(ctx, r);
 err = 0;
 } else {
 val = js_atof(ctx, p, &p, 0, ATOD_TYPE_BIG_DECIMAL);
@@ -48396,12 +50608,14 @@
 goto redo;
 case JS_TAG_UNDEFINED:
 {
- bfdec_t r_s, *r = &r_s;
+ bfdec_t *r;
 if (!allow_null_or_undefined)
 goto fail;
- bfdec_init(ctx->bf_ctx, r);
+ val = JS_NewBigDecimal(ctx);
+ if (JS_IsException(val))
+ break;
+ r = JS_GetBigDecimal(val);
 bfdec_set_nan(r);
- val = JS_NewBigDecimal(ctx, r);
 }
 break;
 default:
@@ -48413,15 +50627,19 @@
 }
 
 static JSValue js_bigdecimal_constructor(JSContext *ctx,
- JSValueConst this_val,
+ JSValueConst new_target,
 int argc, JSValueConst *argv)
 {
 JSValue val;
+ if (!JS_IsUndefined(new_target))
+ return JS_ThrowTypeError(ctx, "not a constructor");
 if (argc == 0) {
- bfdec_t r_s, *r = &r_s;
- bfdec_init(ctx->bf_ctx, r);
+ bfdec_t *r;
+ val = JS_NewBigDecimal(ctx);
+ if (JS_IsException(val))
+ return val;
+ r = JS_GetBigDecimal(val);
 bfdec_set_zero(r, 0);
- val = JS_NewBigDecimal(ctx, r);
 } else {
 val = JS_ToBigDecimalFree(ctx, JS_DupValue(ctx, argv[0]), FALSE);
 }
@@ -48460,43 +50678,29 @@
 return js_thisBigDecimalValue(ctx, this_val);
 }
 
-typedef struct {
- int64_t prec;
- bf_flags_t flags;
-} BigDecimalEnv;
-
-static int js_bigdecimal_get_env(JSContext *ctx, BigDecimalEnv *fe,
- JSValueConst obj)
+static int js_bigdecimal_get_rnd_mode(JSContext *ctx, JSValueConst obj)
 {
- JSValue prop;
 const char *str;
 size_t size;
- int64_t val;
- BOOL has_prec;
-
- if (!JS_IsObject(obj)) {
- JS_ThrowTypeErrorNotAnObject(ctx);
- return -1;
- }
- prop = JS_GetProperty(ctx, obj, JS_ATOM_roundingMode);
- if (JS_IsException(prop))
- return -1;
- str = JS_ToCStringLen(ctx, &size, prop);
- JS_FreeValue(ctx, prop);
+ int rnd_mode;
+ 
+ str = JS_ToCStringLen(ctx, &size, obj);
 if (!str)
 return -1;
 if (strlen(str) != size)
 goto invalid_rounding_mode;
 if (!strcmp(str, "floor")) {
- fe->flags = BF_RNDD;
+ rnd_mode = BF_RNDD;
 } else if (!strcmp(str, "ceiling")) {
- fe->flags = BF_RNDU;
+ rnd_mode = BF_RNDU;
 } else if (!strcmp(str, "down")) {
- fe->flags = BF_RNDZ;
+ rnd_mode = BF_RNDZ;
+ } else if (!strcmp(str, "up")) {
+ rnd_mode = BF_RNDA;
 } else if (!strcmp(str, "half-even")) {
- fe->flags = BF_RNDN;
+ rnd_mode = BF_RNDN;
 } else if (!strcmp(str, "half-up")) {
- fe->flags = BF_RNDNA;
+ rnd_mode = BF_RNDNA;
 } else {
 invalid_rounding_mode:
 JS_FreeCString(ctx, str);
@@ -48504,7 +50708,35 @@
 return -1;
 }
 JS_FreeCString(ctx, str);
+ return rnd_mode;
+}
 
+typedef struct {
+ int64_t prec;
+ bf_flags_t flags;
+} BigDecimalEnv;
+
+static int js_bigdecimal_get_env(JSContext *ctx, BigDecimalEnv *fe,
+ JSValueConst obj)
+{
+ JSValue prop;
+ int64_t val;
+ BOOL has_prec;
+ int rnd_mode;
+ 
+ if (!JS_IsObject(obj)) {
+ JS_ThrowTypeErrorNotAnObject(ctx);
+ return -1;
+ }
+ prop = JS_GetProperty(ctx, obj, JS_ATOM_roundingMode);
+ if (JS_IsException(prop))
+ return -1;
+ rnd_mode = js_bigdecimal_get_rnd_mode(ctx, prop);
+ JS_FreeValue(ctx, prop);
+ if (rnd_mode < 0)
+ return -1;
+ fe->flags = rnd_mode;
+ 
 prop = JS_GetProperty(ctx, obj, JS_ATOM_maximumSignificantDigits);
 if (JS_IsException(prop))
 return -1;
@@ -48512,7 +50744,7 @@
 if (!JS_IsUndefined(prop)) {
 if (JS_ToInt64SatFree(ctx, &val, prop))
 return -1;
- if (val < 0 || val > BF_PREC_MAX)
+ if (val < 1 || val > BF_PREC_MAX)
 goto invalid_precision;
 fe->prec = val;
 has_prec = TRUE;
@@ -48550,7 +50782,7 @@
 int argc, JSValueConst *argv, int magic)
 {
 bfdec_t *a, *b, r_s, *r = &r_s;
- JSValue op1, op2;
+ JSValue op1, op2, res;
 BigDecimalEnv fe_s, *fe = &fe_s;
 int op_count, ret;
 
@@ -48559,7 +50791,7 @@
 op_count = 1;
 else
 op_count = 2;
-
+ 
 op1 = JS_ToNumeric(ctx, argv[0]);
 if (JS_IsException(op1))
 return op1;
@@ -48584,21 +50816,18 @@
 fe->flags = BF_RNDZ;
 fe->prec = BF_PREC_INF;
 if (op_count < argc) {
- if (js_bigdecimal_get_env(ctx, fe, argv[op_count])) {
- fail:
- JS_FreeValue(ctx, op1);
- JS_FreeValue(ctx, op2);
- return JS_EXCEPTION;
- }
- if ((fe->flags & BF_FLAG_RADPNT_PREC) &&
- magic != MATH_OP_DIV &&
- magic != MATH_OP_ROUND) {
- JS_ThrowTypeError(ctx, "maximumFractionDigits is not supported for this operation");
+ if (js_bigdecimal_get_env(ctx, fe, argv[op_count]))
 goto fail;
- }
 }
 
- bfdec_init(ctx->bf_ctx, r);
+ res = JS_NewBigDecimal(ctx);
+ if (JS_IsException(res)) {
+ fail:
+ JS_FreeValue(ctx, op1);
+ JS_FreeValue(ctx, op2);
+ return JS_EXCEPTION;
+ }
+ r = JS_GetBigDecimal(res);
 switch (magic) {
 case MATH_OP_ADD:
 ret = bfdec_add(r, a, b, fe->prec, fe->flags);
@@ -48612,6 +50841,9 @@
 case MATH_OP_DIV:
 ret = bfdec_div(r, a, b, fe->prec, fe->flags);
 break;
+ case MATH_OP_FMOD:
+ ret = bfdec_rem(r, a, b, fe->prec, fe->flags, BF_RNDZ);
+ break;
 case MATH_OP_SQRT:
 ret = bfdec_sqrt(r, a, fe->prec, fe->flags);
 break;
@@ -48628,16 +50860,119 @@
 ret &= BF_ST_MEM_ERROR | BF_ST_DIVIDE_ZERO | BF_ST_INVALID_OP |
 BF_ST_OVERFLOW;
 if (ret != 0) {
- bfdec_delete(r);
+ JS_FreeValue(ctx, res);
 return throw_bf_exception(ctx, ret);
 } else {
- return JS_NewBigDecimal(ctx, r);
+ return res;
+ }
+}
+
+static JSValue js_bigdecimal_toFixed(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSValue val, ret;
+ int64_t f;
+ int rnd_mode;
+
+ val = js_thisBigDecimalValue(ctx, this_val);
+ if (JS_IsException(val))
+ return val;
+ if (JS_ToInt64Sat(ctx, &f, argv[0]))
+ goto fail;
+ if (f < 0 || f > BF_PREC_MAX) {
+ JS_ThrowRangeError(ctx, "invalid number of digits");
+ goto fail;
+ }
+ rnd_mode = BF_RNDNA;
+ if (argc > 1) {
+ rnd_mode = js_bigdecimal_get_rnd_mode(ctx, argv[1]);
+ if (rnd_mode < 0)
+ goto fail;
+ }
+ ret = js_bigdecimal_to_string1(ctx, val, f, rnd_mode | BF_FTOA_FORMAT_FRAC);
+ JS_FreeValue(ctx, val);
+ return ret;
+ fail:
+ JS_FreeValue(ctx, val);
+ return JS_EXCEPTION;
+}
+
+static JSValue js_bigdecimal_toExponential(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSValue val, ret;
+ int64_t f;
+ int rnd_mode;
+
+ val = js_thisBigDecimalValue(ctx, this_val);
+ if (JS_IsException(val))
+ return val;
+ if (JS_ToInt64Sat(ctx, &f, argv[0]))
+ goto fail;
+ if (JS_IsUndefined(argv[0])) {
+ ret = js_bigdecimal_to_string1(ctx, val, 0,
+ BF_RNDN | BF_FTOA_FORMAT_FREE_MIN | BF_FTOA_FORCE_EXP);
+ } else {
+ if (f < 0 || f > BF_PREC_MAX) {
+ JS_ThrowRangeError(ctx, "invalid number of digits");
+ goto fail;
+ }
+ rnd_mode = BF_RNDNA;
+ if (argc > 1) {
+ rnd_mode = js_bigdecimal_get_rnd_mode(ctx, argv[1]);
+ if (rnd_mode < 0)
+ goto fail;
+ }
+ ret = js_bigdecimal_to_string1(ctx, val, f + 1,
+ rnd_mode | BF_FTOA_FORMAT_FIXED | BF_FTOA_FORCE_EXP);
 }
+ JS_FreeValue(ctx, val);
+ return ret;
+ fail:
+ JS_FreeValue(ctx, val);
+ return JS_EXCEPTION;
+}
+
+static JSValue js_bigdecimal_toPrecision(JSContext *ctx, JSValueConst this_val,
+ int argc, JSValueConst *argv)
+{
+ JSValue val, ret;
+ int64_t p;
+ int rnd_mode;
+
+ val = js_thisBigDecimalValue(ctx, this_val);
+ if (JS_IsException(val))
+ return val;
+ if (JS_IsUndefined(argv[0])) {
+ return JS_ToStringFree(ctx, val);
+ }
+ if (JS_ToInt64Sat(ctx, &p, argv[0]))
+ goto fail;
+ if (p < 1 || p > BF_PREC_MAX) {
+ JS_ThrowRangeError(ctx, "invalid number of digits");
+ goto fail;
+ }
+ rnd_mode = BF_RNDNA;
+ if (argc > 1) {
+ rnd_mode = js_bigdecimal_get_rnd_mode(ctx, argv[1]);
+ if (rnd_mode < 0)
+ goto fail;
+ }
+ ret = js_bigdecimal_to_string1(ctx, val, p,
+ rnd_mode | BF_FTOA_FORMAT_FIXED);
+ JS_FreeValue(ctx, val);
+ return ret;
+ fail:
+ JS_FreeValue(ctx, val);
+ return JS_EXCEPTION;
 }
 
 static const JSCFunctionListEntry js_bigdecimal_proto_funcs[] = {
 JS_CFUNC_DEF("toString", 0, js_bigdecimal_toString ),
 JS_CFUNC_DEF("valueOf", 0, js_bigdecimal_valueOf ),
+ JS_CFUNC_DEF("toPrecision", 1, js_bigdecimal_toPrecision ),
+ JS_CFUNC_DEF("toFixed", 1, js_bigdecimal_toFixed ),
+ JS_CFUNC_DEF("toExponential", 1, js_bigdecimal_toExponential ),
 };
 
 static const JSCFunctionListEntry js_bigdecimal_funcs[] = {
@@ -48645,6 +50980,7 @@
 JS_CFUNC_MAGIC_DEF("sub", 2, js_bigdecimal_fop, MATH_OP_SUB ),
 JS_CFUNC_MAGIC_DEF("mul", 2, js_bigdecimal_fop, MATH_OP_MUL ),
 JS_CFUNC_MAGIC_DEF("div", 2, js_bigdecimal_fop, MATH_OP_DIV ),
+ JS_CFUNC_MAGIC_DEF("mod", 2, js_bigdecimal_fop, MATH_OP_FMOD ),
 JS_CFUNC_MAGIC_DEF("round", 1, js_bigdecimal_fop, MATH_OP_ROUND ),
 JS_CFUNC_MAGIC_DEF("sqrt", 1, js_bigdecimal_fop, MATH_OP_SQRT ),
 };
@@ -48652,7 +50988,7 @@
 void JS_AddIntrinsicBigDecimal(JSContext *ctx)
 {
 JSRuntime *rt = ctx->rt;
- JSValue obj1;
+ JSValueConst obj1;
 
 rt->bigdecimal_ops.to_string = js_bigdecimal_to_string;
 rt->bigdecimal_ops.from_string = js_string_to_bigdecimal;
@@ -48664,9 +51000,9 @@
 JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_BIG_DECIMAL],
 js_bigdecimal_proto_funcs,
 countof(js_bigdecimal_proto_funcs));
- obj1 = JS_NewCFunction(ctx, js_bigdecimal_constructor, "BigDecimal", 1);
- JS_NewGlobalCConstructor2(ctx, obj1, "BigDecimal",
- ctx->class_proto[JS_CLASS_BIG_DECIMAL]);
+ obj1 = JS_NewGlobalCConstructor(ctx, "BigDecimal",
+ js_bigdecimal_constructor, 1,
+ ctx->class_proto[JS_CLASS_BIG_DECIMAL]);
 JS_SetPropertyFunctionList(ctx, obj1, js_bigdecimal_funcs,
 countof(js_bigdecimal_funcs));
 }
@@ -48681,7 +51017,7 @@
 static const char * const native_error_name[JS_NATIVE_ERROR_COUNT] = {
 "EvalError", "RangeError", "ReferenceError",
 "SyntaxError", "TypeError", "URIError",
- "InternalError",
+ "InternalError", "AggregateError",
 };
 
 /* Minimum amount of objects to be able to compile code and display
@@ -48786,9 +51122,12 @@
 "Error", ctx->class_proto[JS_CLASS_ERROR]);
 
 for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
- JSValue func_obj = JS_NewCFunction3(ctx, (JSCFunction *)js_error_constructor,
- native_error_name[i], 1,
- JS_CFUNC_constructor_or_func_magic, i, obj1);
+ JSValue func_obj;
+ int n_args;
+ n_args = 1 + (i == JS_AGGREGATE_ERROR);
+ func_obj = JS_NewCFunction3(ctx, (JSCFunction *)js_error_constructor,
+ native_error_name[i], n_args,
+ JS_CFUNC_constructor_or_func_magic, i, obj1);
 JS_NewGlobalCConstructor2(ctx, func_obj, native_error_name[i],
 ctx->native_error_proto[i]);
 }
@@ -48806,6 +51145,7 @@
 
 obj = JS_NewGlobalCConstructor(ctx, "Array", js_array_constructor, 1,
 ctx->class_proto[JS_CLASS_ARRAY]);
+ ctx->array_ctor = JS_DupValue(ctx, obj);
 JS_SetPropertyFunctionList(ctx, obj, js_array_funcs,
 countof(js_array_funcs));
 
@@ -48833,6 +51173,12 @@
 js_array_iterator_proto_funcs,
 countof(js_array_iterator_proto_funcs));
 
+ /* parseFloat and parseInteger must be defined before Number
+ because of the Number.parseFloat and Number.parseInteger
+ aliases */
+ JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_global_funcs,
+ countof(js_global_funcs));
+
 /* Number */
 ctx->class_proto[JS_CLASS_NUMBER] = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
 JS_CLASS_NUMBER);
@@ -48922,9 +51268,6 @@
 JS_DupValue(ctx, ctx->eval_obj),
 JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
 
- JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_global_funcs,
- countof(js_global_funcs));
-
 JS_DefinePropertyValue(ctx, ctx->global_obj, JS_ATOM_globalThis,
 JS_DupValue(ctx, ctx->global_obj),
 JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE);
@@ -48947,6 +51290,7 @@
 JSFreeArrayBufferDataFunc *free_func,
 void *opaque, BOOL alloc_flag)
 {
+ JSRuntime *rt = ctx->rt;
 JSValue obj;
 JSArrayBuffer *abuf = NULL;
 
@@ -48963,11 +51307,24 @@
 goto fail;
 abuf->byte_length = len;
 if (alloc_flag) {
- /* the allocation must be done after the object creation */
- abuf->data = js_mallocz(ctx, max_int(len, 1));
- if (!abuf->data)
- goto fail;
+ if (class_id == JS_CLASS_SHARED_ARRAY_BUFFER &&
+ rt->sab_funcs.sab_alloc) {
+ abuf->data = rt->sab_funcs.sab_alloc(rt->sab_funcs.sab_opaque,
+ max_int(len, 1));
+ if (!abuf->data)
+ goto fail;
+ memset(abuf->data, 0, len);
+ } else {
+ /* the allocation must be done after the object creation */
+ abuf->data = js_mallocz(ctx, max_int(len, 1));
+ if (!abuf->data)
+ goto fail;
+ }
 } else {
+ if (class_id == JS_CLASS_SHARED_ARRAY_BUFFER &&
+ rt->sab_funcs.sab_dup) {
+ rt->sab_funcs.sab_dup(rt->sab_funcs.sab_opaque, buf);
+ }
 abuf->data = buf;
 }
 init_list_head(&abuf->array_list);
@@ -49057,8 +51414,12 @@
 array finalizers using it, so abuf->array_list is not
 necessarily empty. */
 // assert(list_empty(&abuf->array_list));
- if (abuf->free_func)
- abuf->free_func(rt, abuf->opaque, abuf->data);
+ if (abuf->shared && rt->sab_funcs.sab_free) {
+ rt->sab_funcs.sab_free(rt->sab_funcs.sab_opaque, abuf->data);
+ } else {
+ if (abuf->free_func)
+ abuf->free_func(rt, abuf->opaque, abuf->data);
+ }
 js_free_rt(rt, abuf);
 }
 }
@@ -49097,8 +51458,7 @@
 JSArrayBuffer *abuf = JS_GetOpaque2(ctx, this_val, class_id);
 if (!abuf)
 return JS_EXCEPTION;
- if (abuf->detached)
- return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+ /* return 0 if detached */
 return JS_NewUint32(ctx, abuf->byte_length);
 }
 
@@ -49388,7 +51748,7 @@
 }
 return JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, ta->buffer));
 }
-
+ 
 static JSValue js_typed_array_get_toStringTag(JSContext *ctx,
 JSValueConst this_val)
 {
@@ -49534,11 +51894,6 @@
 }
 #endif
 
-static JSValue js_typed_array_constructor(JSContext *ctx,
- JSValueConst this_val,
- int argc, JSValueConst *argv,
- int classid);
-
 static JSValue js_typed_array_create(JSContext *ctx, JSValueConst ctor,
 int argc, JSValueConst *argv)
 {
@@ -49742,6 +52097,8 @@
 count = min_int(final - from, len - to);
 if (count > 0) {
 p = JS_VALUE_GET_OBJ(this_val);
+ if (typed_array_is_detached(ctx, p))
+ return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
 shift = typed_array_size_log2(p->class_id);
 memmove(p->u.array.u.uint8_ptr + (to << shift),
 p->u.array.u.uint8_ptr + (from << shift),
@@ -49809,6 +52166,9 @@
 return JS_EXCEPTION;
 }
 
+ if (typed_array_is_detached(ctx, p))
+ return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+ 
 shift = typed_array_size_log2(p->class_id);
 switch(shift) {
 case 0:
@@ -49897,7 +52257,7 @@
 int argc, JSValueConst *argv, int special)
 {
 JSObject *p;
- int len, tag, is_int, is_big, k, stop, inc, res = -1;
+ int len, tag, is_int, is_bigint, k, stop, inc, res = -1;
 int64_t v64;
 double d;
 float f;
@@ -49940,7 +52300,17 @@
 inc = 1;
 }
 
- is_big = 0;
+ p = JS_VALUE_GET_OBJ(this_val);
+ /* if the array was detached, no need to go further (but no
+ exception is raised) */
+ if (typed_array_is_detached(ctx, p)) {
+ /* "includes" scans all the properties, so "undefined" can match */
+ if (special == special_includes && JS_IsUndefined(argv[0]) && len > 0)
+ res = 0;
+ goto done;
+ }
+ 
+ is_bigint = 0;
 is_int = 0; /* avoid warning */
 v64 = 0; /* avoid warning */
 tag = JS_VALUE_GET_NORM_TAG(argv[0]);
@@ -49955,17 +52325,26 @@
 is_int = (v64 == d);
 } else
 #ifdef CONFIG_BIGNUM
- if (tag == JS_TAG_BIG_INT || tag == JS_TAG_BIG_FLOAT) {
- /* will a generic loop for bigint and bigfloat */
- /* XXX: should use the generic loop in math_mode? */
- is_big = 1;
+ if (tag == JS_TAG_BIG_INT) {
+ JSBigFloat *p1 = JS_VALUE_GET_PTR(argv[0]);
+ 
+ if (p->class_id == JS_CLASS_BIG_INT64_ARRAY) {
+ if (bf_get_int64(&v64, &p1->num, 0) != 0)
+ goto done;
+ } else if (p->class_id == JS_CLASS_BIG_UINT64_ARRAY) {
+ if (bf_get_uint64((uint64_t *)&v64, &p1->num) != 0)
+ goto done;
+ } else {
+ goto done;
+ }
+ d = 0;
+ is_bigint = 1;
 } else
 #endif
 {
 goto done;
 }
 
- p = JS_VALUE_GET_OBJ(this_val);
 switch (p->class_id) {
 case JS_CLASS_INT8_ARRAY:
 if (is_int && (int8_t)v64 == v64)
@@ -50032,7 +52411,7 @@
 }
 break;
 case JS_CLASS_FLOAT32_ARRAY:
- if (is_big)
+ if (is_bigint)
 break;
 if (isnan(d)) {
 const float *pv = p->u.array.u.float_ptr;
@@ -50056,7 +52435,7 @@
 }
 break;
 case JS_CLASS_FLOAT64_ARRAY:
- if (is_big)
+ if (is_bigint)
 break;
 if (isnan(d)) {
 const double *pv = p->u.array.u.double_ptr;
@@ -50081,20 +52460,22 @@
 break;
 #ifdef CONFIG_BIGNUM
 case JS_CLASS_BIG_INT64_ARRAY:
+ if (is_bigint || (is_math_mode(ctx) && is_int &&
+ v64 >= -MAX_SAFE_INTEGER &&
+ v64 <= MAX_SAFE_INTEGER)) {
+ goto scan64;
+ }
+ break;
 case JS_CLASS_BIG_UINT64_ARRAY:
- if (is_big || is_strict_mode(ctx)) {
- /* generic loop for bignums, argv[0] is a bignum != NaN */
- /* XXX: optimize with explicit values */
+ if (is_bigint || (is_math_mode(ctx) && is_int &&
+ v64 >= 0 && v64 <= MAX_SAFE_INTEGER)) {
+ const uint64_t *pv;
+ uint64_t v;
+ scan64:
+ pv = p->u.array.u.uint64_ptr;
+ v = v64;
 for (; k != stop; k += inc) {
- JSValue v = JS_GetPropertyUint32(ctx, this_val, k);
- int ret;
- if (JS_IsException(v))
- goto exception;
- ret = js_same_value_zero(ctx, v, argv[0]);
- JS_FreeValue(ctx, v);
- if (ret) {
- if (ret < 0)
- goto exception;
+ if (pv[k] == v) {
 res = k;
 break;
 }
@@ -50152,13 +52533,16 @@
 }
 }
 el = JS_GetPropertyUint32(ctx, this_val, i);
- if (JS_IsException(el))
- goto fail;
- if (toLocaleString) {
- el = JS_ToLocaleStringFree(ctx, el);
+ /* Can return undefined for example if the typed array is detached */
+ if (!JS_IsNull(el) && !JS_IsUndefined(el)) {
+ if (JS_IsException(el))
+ goto fail;
+ if (toLocaleString) {
+ el = JS_ToLocaleStringFree(ctx, el);
+ }
+ if (string_buffer_concat_value_free(b, el))
+ goto fail;
 }
- if (string_buffer_concat_value_free(b, el))
- goto fail;
 }
 JS_FreeValue(ctx, sep);
 return string_buffer_end(b);
@@ -50501,7 +52885,8 @@
 JS_FreeValue(ctx, (JSValue)argv[0]);
 JS_FreeValue(ctx, (JSValue)argv[1]);
 #endif
- }
+
+	}
 return cmp;
 }
 
@@ -50581,7 +52966,7 @@
 uint32_t *array_idx;
 void *array_tmp;
 size_t i, j;
-
+ 
 /* XXX: a stable sort would use less memory */
 array_idx = js_malloc(ctx, len * sizeof(array_idx[0]));
 if (!array_idx)
@@ -51277,9 +53662,10 @@
 } AtomicsOpEnum;
 
 static void *js_atomics_get_ptr(JSContext *ctx,
+ JSArrayBuffer **pabuf,
 int *psize_log2, JSClassID *pclass_id,
 JSValueConst obj, JSValueConst idx_val,
- BOOL is_waitable)
+ int is_waitable)
 {
 JSObject *p;
 JSTypedArray *ta;
@@ -51314,18 +53700,27 @@
 ta = p->u.typed_array;
 abuf = ta->buffer->u.array_buffer;
 if (!abuf->shared) {
- JS_ThrowTypeError(ctx, "not a SharedArrayBuffer TypedArray");
- return NULL;
+ if (is_waitable == 2) {
+ JS_ThrowTypeError(ctx, "not a SharedArrayBuffer TypedArray");
+ return NULL;
+ }
+ if (abuf->detached) {
+ JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+ return NULL;
+ }
 }
 if (JS_ToIndex(ctx, &idx, idx_val)) {
 return NULL;
 }
+ /* if the array buffer is detached, p->u.array.count = 0 */
 if (idx >= p->u.array.count) {
 JS_ThrowRangeError(ctx, "out-of-bound access");
 return NULL;
 }
 size_log2 = typed_array_size_log2(p->class_id);
 ptr = p->u.array.u.uint8_ptr + ((uintptr_t)idx << size_log2);
+ if (pabuf)
+ *pabuf = abuf;
 if (psize_log2)
 *psize_log2 = size_log2;
 if (pclass_id)
@@ -51346,17 +53741,18 @@
 void *ptr;
 JSValue ret;
 JSClassID class_id;
+ JSArrayBuffer *abuf;
 
- ptr = js_atomics_get_ptr(ctx, &size_log2, &class_id,
- argv[0], argv[1], FALSE);
+ ptr = js_atomics_get_ptr(ctx, &abuf, &size_log2, &class_id,
+ argv[0], argv[1], 0);
 if (!ptr)
 return JS_EXCEPTION;
 rep_val = 0;
 if (op == ATOMICS_OP_LOAD) {
 v = 0;
- } else
+ } else {
 #ifdef CONFIG_BIGNUM
- if (size_log2 == 3) {
+ if (size_log2 == 3) {
 int64_t v64;
 if (JS_ToBigInt64(ctx, &v64, argv[2]))
 return JS_EXCEPTION;
@@ -51366,21 +53762,25 @@
 return JS_EXCEPTION;
 rep_val = v64;
 }
- } else
+ } else
 #endif
- {
- uint32_t v32;
- if (JS_ToUint32(ctx, &v32, argv[2]))
- return JS_EXCEPTION;
- v = v32;
- if (op == ATOMICS_OP_COMPARE_EXCHANGE) {
- if (JS_ToUint32(ctx, &v32, argv[3]))
- return JS_EXCEPTION;
- rep_val = v32;
- }
+ {
+ uint32_t v32;
+ if (JS_ToUint32(ctx, &v32, argv[2]))
+ return JS_EXCEPTION;
+ v = v32;
+ if (op == ATOMICS_OP_COMPARE_EXCHANGE) {
+ if (JS_ToUint32(ctx, &v32, argv[3]))
+ return JS_EXCEPTION;
+ rep_val = v32;
+ }
+ }
+ if (abuf->detached)
+ return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
 }
- switch(op | (size_log2 << 3)) {
 
+ switch(op | (size_log2 << 3)) {
+ 
 #ifdef CONFIG_BIGNUM
 #define OP(op_name, func_name) \
 case ATOMICS_OP_ ## op_name | (0 << 3): \
@@ -51429,7 +53829,7 @@
 a = atomic_load((_Atomic(uint64_t) *)ptr);
 break;
 #endif
-
+ 
 case ATOMICS_OP_COMPARE_EXCHANGE | (0 << 3):
 {
 uint8_t v1 = v;
@@ -51505,8 +53905,10 @@
 int size_log2;
 void *ptr;
 JSValue ret;
+ JSArrayBuffer *abuf;
 
- ptr = js_atomics_get_ptr(ctx, &size_log2, NULL, argv[0], argv[1], FALSE);
+ ptr = js_atomics_get_ptr(ctx, &abuf, &size_log2, NULL,
+ argv[0], argv[1], 0);
 if (!ptr)
 return JS_EXCEPTION;
 #ifdef CONFIG_BIGNUM
@@ -51519,6 +53921,8 @@
 JS_FreeValue(ctx, ret);
 return JS_EXCEPTION;
 }
+ if (abuf->detached)
+ return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
 atomic_store((_Atomic(uint64_t) *)ptr, v64);
 } else
 #endif
@@ -51532,6 +53936,8 @@
 JS_FreeValue(ctx, ret);
 return JS_EXCEPTION;
 }
+ if (abuf->detached)
+ return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
 switch(size_log2) {
 case 0:
 atomic_store((_Atomic(uint8_t) *)ptr, v);
@@ -51593,7 +53999,8 @@
 int ret, size_log2, res;
 double d;
 
- ptr = js_atomics_get_ptr(ctx, &size_log2, NULL, argv[0], argv[1], TRUE);
+ ptr = js_atomics_get_ptr(ctx, NULL, &size_log2, NULL,
+ argv[0], argv[1], 2);
 if (!ptr)
 return JS_EXCEPTION;
 #ifdef CONFIG_BIGNUM
@@ -51602,7 +54009,7 @@
 return JS_EXCEPTION;
 } else
 #endif
- {
+ { 
 if (JS_ToInt32(ctx, &v32, argv[2]))
 return JS_EXCEPTION;
 v = v32;
@@ -51642,7 +54049,6 @@
 pthread_cond_wait(&waiter->cond, &js_atomics_mutex);
 ret = 0;
 } else {
-
 #ifdef __MACH__
 		// OS X pre sierra does not have clock_gettime, use clock_get_time
 		clock_serv_t cclock;
@@ -51685,8 +54091,9 @@
 int32_t count, n;
 void *ptr;
 JSAtomicsWaiter *waiter;
+ JSArrayBuffer *abuf;
 
- ptr = js_atomics_get_ptr(ctx, NULL, NULL, argv[0], argv[1], TRUE);
+ ptr = js_atomics_get_ptr(ctx, &abuf, NULL, NULL, argv[0], argv[1], 1);
 if (!ptr)
 return JS_EXCEPTION;
 
@@ -51696,9 +54103,11 @@
 if (JS_ToInt32Clamp(ctx, &count, argv[2], 0, INT32_MAX, 0))
 return JS_EXCEPTION;
 }
+ if (abuf->detached)
+ return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
 
 n = 0;
- if (count > 0) {
+ if (abuf->shared && count > 0) {
 pthread_mutex_lock(&js_atomics_mutex);
 init_list_head(&waiter_list);
 list_for_each_safe(el, el1, &js_atomics_waiter_list) {
@@ -51834,3 +54243,26 @@
 JS_AddIntrinsicAtomics(ctx);
 #endif
 }
+
+/* return -1 if exception (proxy case) or TRUE/FALSE */
+int JS_IsArrayBuffer(JSContext *ctx, JSValueConst val)
+{
+ JSObject *p;
+ if (JS_VALUE_GET_TAG(val) == JS_TAG_OBJECT) {
+ p = JS_VALUE_GET_OBJ(val);
+		if (p->class_id == JS_CLASS_ARRAY_BUFFER) return TRUE;
+		if (p->class_id == JS_CLASS_SHARED_ARRAY_BUFFER) return TRUE;
+ }
+	return FALSE;
+}
+
+/* return -1 if exception (proxy case) or TRUE/FALSE */
+int JS_SwitchClassID(JSValue obj, JSClassID class_id)
+{
+ JSObject *p;
+ if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+ return FALSE;
+ p = JS_VALUE_GET_OBJ(obj);
+ p->class_id = class_id;
+	return TRUE;
+}

gpac-1.0.1.tar.gz/src/quickjs/quickjs.h -> gpac-2.0.0.tar.gz/src/quickjs/quickjs.h Changed

@@ -1,8 +1,8 @@
 /*
 * QuickJS Javascript Engine
 *
- * Copyright (c) 2017-2020 Fabrice Bellard
- * Copyright (c) 2017-2020 Charlie Gordon
+ * Copyright (c) 2017-2021 Fabrice Bellard
+ * Copyright (c) 2017-2021 Charlie Gordon
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -53,7 +53,7 @@
 typedef uint32_t JSClassID;
 typedef uint32_t JSAtom;
 
-#if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64)
+#if INTPTR_MAX >= INT64_MAX
 #define JS_PTR64
 #define JS_PTR64_DEF(a) a
 #else
@@ -215,6 +215,7 @@
 #define JS_VALUE_GET_FLOAT64(v) ((v).u.float64)
 #define JS_VALUE_GET_PTR(v) ((v).u.ptr)
 
+
 #if defined(_MSC_VER) && defined(__cplusplus)
 #define JS_MKVAL(tag, val) [&](){ JSValue tmp { { (void *)(intptr_t)val }, tag }; return tmp; }()
 #define JS_MKPTR(tag, p) [&](){ JSValue tmp { { p }, tag }; return tmp; }()
@@ -342,8 +343,15 @@
 void JS_SetRuntimeInfo(JSRuntime *rt, const char *info);
 void JS_SetMemoryLimit(JSRuntime *rt, size_t limit);
 void JS_SetGCThreshold(JSRuntime *rt, size_t gc_threshold);
+/* use 0 to disable maximum stack size check */
+void JS_SetMaxStackSize(JSRuntime *rt, size_t stack_size);
+/* should be called when changing thread to update the stack top value
+ used to check stack overflow. */
+void JS_UpdateStackTop(JSRuntime *rt);
 JSRuntime *JS_NewRuntime2(const JSMallocFunctions *mf, void *opaque);
 void JS_FreeRuntime(JSRuntime *rt);
+void *JS_GetRuntimeOpaque(JSRuntime *rt);
+void JS_SetRuntimeOpaque(JSRuntime *rt, void *opaque);
 typedef void JS_MarkFunc(JSRuntime *rt, JSGCObjectHeader *gp);
 void JS_MarkValue(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func);
 void JS_RunGC(JSRuntime *rt);
@@ -351,10 +359,10 @@
 
 JSContext *JS_NewContext(JSRuntime *rt);
 void JS_FreeContext(JSContext *s);
+JSContext *JS_DupContext(JSContext *ctx);
 void *JS_GetContextOpaque(JSContext *ctx);
 void JS_SetContextOpaque(JSContext *ctx, void *opaque);
 JSRuntime *JS_GetRuntime(JSContext *ctx);
-void JS_SetMaxStackSize(JSContext *ctx, size_t stack_size);
 void JS_SetClassProto(JSContext *ctx, JSClassID class_id, JSValue obj);
 JSValue JS_GetClassProto(JSContext *ctx, JSClassID class_id);
 
@@ -375,7 +383,9 @@
 void JS_AddIntrinsicBigInt(JSContext *ctx);
 void JS_AddIntrinsicBigFloat(JSContext *ctx);
 void JS_AddIntrinsicBigDecimal(JSContext *ctx);
-/* enable "use bigint", "use math" and operator overloading */
+/* enable operator overloading */
+void JS_AddIntrinsicOperators(JSContext *ctx);
+/* enable "use math" */
 void JS_EnableBignumExt(JSContext *ctx, JS_BOOL enable);
 
 JSValue js_string_codePointRange(JSContext *ctx, JSValueConst this_val,
@@ -416,6 +426,8 @@
 void JS_DumpMemoryUsage(FILE *fp, const JSMemoryUsage *s, JSRuntime *rt);
 
 /* atom support */
+#define JS_ATOM_NULL 0
+
 JSAtom JS_NewAtomLen(JSContext *ctx, const char *str, size_t len);
 JSAtom JS_NewAtom(JSContext *ctx, const char *str);
 JSAtom JS_NewAtomUInt32(JSContext *ctx, uint32_t n);
@@ -502,7 +514,7 @@
 
 static js_force_inline JSValue JS_NewBool(JSContext *ctx, JS_BOOL val)
 {
- return JS_MKVAL(JS_TAG_BOOL, val);
+ return JS_MKVAL(JS_TAG_BOOL, (val != 0));
 }
 
 static js_force_inline JSValue JS_NewInt32(JSContext *ctx, int32_t val)
@@ -515,7 +527,28 @@
 return JS_MKVAL(JS_TAG_CATCH_OFFSET, val);
 }
 
-JSValue JS_NewInt64(JSContext *ctx, int64_t v);
+static js_force_inline JSValue JS_NewInt64(JSContext *ctx, int64_t val)
+{
+ JSValue v;
+ if (val == (int32_t)val) {
+ v = JS_NewInt32(ctx, (int32_t)val);
+ } else {
+ v = __JS_NewFloat64(ctx, (double) val);
+ }
+ return v;
+}
+
+static js_force_inline JSValue JS_NewUint32(JSContext *ctx, uint32_t val)
+{
+ JSValue v;
+ if (val <= 0x7fffffff) {
+ v = JS_NewInt32(ctx, val);
+ } else {
+ v = __JS_NewFloat64(ctx, val);
+ }
+ return v;
+}
+
 JSValue JS_NewBigInt64(JSContext *ctx, int64_t v);
 JSValue JS_NewBigUint64(JSContext *ctx, uint64_t v);
 
@@ -528,7 +561,20 @@
 uint64_t u;
 } u, t;
 u.d = d;
- val = (int32_t)d;
+
+	/*for asan tests*/
+#ifdef ASAN_ENABLED
+	if (isnan(d))
+		return JS_NAN;
+
+	if (d > 2147483647.0)
+ return __JS_NewFloat64(ctx, d);
+
+	if (d < -2147483648.0)
+ return __JS_NewFloat64(ctx, d);
+#endif
+
+ val = (int32_t) d;
 t.d = val;
 /* -0 cannot be represented as integer, so we compare the bit
 representation */
@@ -540,12 +586,22 @@
 return v;
 }
 
-JS_BOOL JS_IsNumber(JSValueConst v);
+static inline JS_BOOL JS_IsNumber(JSValueConst v)
+{
+ int tag = JS_VALUE_GET_TAG(v);
+ return tag == JS_TAG_INT || JS_TAG_IS_FLOAT64(tag);
+}
 
 static inline JS_BOOL JS_IsInteger(JSValueConst v)
 {
 int tag = JS_VALUE_GET_TAG(v);
- return tag == JS_TAG_INT || tag == JS_TAG_BIG_INT;
+ return tag == JS_TAG_INT ;
+}
+
+static inline JS_BOOL JS_IsBigInt(JSContext *ctx, JSValueConst v)
+{
+ int tag = JS_VALUE_GET_TAG(v);
+ return tag == JS_TAG_BIG_INT;
 }
 
 static inline JS_BOOL JS_IsBigFloat(JSValueConst v)
@@ -661,14 +717,17 @@
 
 int JS_ToBool(JSContext *ctx, JSValueConst val); /* return -1 for JS_EXCEPTION */
 int JS_ToInt32(JSContext *ctx, int32_t *pres, JSValueConst val);
-static int inline JS_ToUint32(JSContext *ctx, uint32_t *pres, JSValueConst val)
+static inline int JS_ToUint32(JSContext *ctx, uint32_t *pres, JSValueConst val)
 {
 return JS_ToInt32(ctx, (int32_t*)pres, val);
 }
 int JS_ToInt64(JSContext *ctx, int64_t *pres, JSValueConst val);
 int JS_ToIndex(JSContext *ctx, uint64_t *plen, JSValueConst val);
 int JS_ToFloat64(JSContext *ctx, double *pres, JSValueConst val);
+/* return an exception if 'val' is a Number */
 int JS_ToBigInt64(JSContext *ctx, int64_t *pres, JSValueConst val);
+/* same as JS_ToInt64() but allow BigInt */
+int JS_ToInt64Ext(JSContext *ctx, int64_t *pres, JSValueConst val);
 
 JSValue JS_NewStringLen(JSContext *ctx, const char *str1, size_t len1);
 JSValue JS_NewString(JSContext *ctx, const char *str);
@@ -730,7 +789,7 @@
 int JS_PreventExtensions(JSContext *ctx, JSValueConst obj);
 int JS_DeleteProperty(JSContext *ctx, JSValueConst obj, JSAtom prop, int flags);
 int JS_SetPrototype(JSContext *ctx, JSValueConst obj, JSValueConst proto_val);
-JSValueConst JS_GetPrototype(JSContext *ctx, JSValueConst val);
+JSValue JS_GetPrototype(JSContext *ctx, JSValueConst val);
 
 #define JS_GPN_STRING_MASK (1 << 0)
 #define JS_GPN_SYMBOL_MASK (1 << 1)
@@ -758,8 +817,10 @@
 /* 'input' must be zero terminated i.e. input[input_len] = '\0'. */
 JSValue JS_Eval(JSContext *ctx, const char *input, size_t input_len,
 const char *filename, int eval_flags);
-
-JSValue JS_EvalFunction(JSContext *ctx, JSValue fun_obj);
+/* same as JS_Eval() but with an explicit 'this_obj' parameter */
+JSValue JS_EvalThis(JSContext *ctx, JSValueConst this_obj,
+ const char *input, size_t input_len,
+ const char *filename, int eval_flags);
 JSValue JS_GetGlobalObject(JSContext *ctx);
 int JS_IsInstanceOf(JSContext *ctx, JSValueConst val, JSValueConst obj);
 int JS_DefineProperty(JSContext *ctx, JSValueConst this_obj,
@@ -781,6 +842,9 @@
 /* 'buf' must be zero terminated i.e. buf[buf_len] = '\0'. */
 JSValue JS_ParseJSON(JSContext *ctx, const char *buf, size_t buf_len,
 const char *filename);
+#define JS_PARSE_JSON_EXT (1 << 0) /* allow extended JSON */
+JSValue JS_ParseJSON2(JSContext *ctx, const char *buf, size_t buf_len,
+ const char *filename, int flags);
 JSValue JS_JSONStringify(JSContext *ctx, JSValueConst obj,
 JSValueConst replacer, JSValueConst space0);
 
@@ -795,6 +859,14 @@
 size_t *pbyte_offset,
 size_t *pbyte_length,
 size_t *pbytes_per_element);
+typedef struct {
+ void *(*sab_alloc)(void *opaque, size_t size);
+ void (*sab_free)(void *opaque, void *ptr);
+ void (*sab_dup)(void *opaque, void *ptr);
+ void *sab_opaque;
+} JSSharedArrayBufferFunctions;
+void JS_SetSharedArrayBufferFunctions(JSRuntime *rt,
+ const JSSharedArrayBufferFunctions *sf);
 
 JSValue JS_NewPromiseCapability(JSContext *ctx, JSValue *resolving_funcs);
 
@@ -809,6 +881,8 @@
 void JS_SetInterruptHandler(JSRuntime *rt, JSInterruptHandler *cb, void *opaque);
 /* if can_block is TRUE, Atomics.wait() can be used */
 void JS_SetCanBlock(JSRuntime *rt, JS_BOOL can_block);
+/* set the [IsHTMLDDA] internal slot */
+void JS_SetIsHTMLDDA(JSContext *ctx, JSValueConst obj);
 
 typedef struct JSModuleDef JSModuleDef;
 
@@ -838,18 +912,36 @@
 int JS_ExecutePendingJob(JSRuntime *rt, JSContext **pctx);
 
 /* Object Writer/Reader (currently only used to handle precompiled code) */
-#define JS_WRITE_OBJ_BYTECODE (1 << 0) /* allow function/module */
-#define JS_WRITE_OBJ_BSWAP (1 << 1) /* byte swapped output */
+#define JS_WRITE_OBJ_BYTECODE (1 << 0) /* allow function/module */
+#define JS_WRITE_OBJ_BSWAP (1 << 1) /* byte swapped output */
+#define JS_WRITE_OBJ_SAB (1 << 2) /* allow SharedArrayBuffer */
+#define JS_WRITE_OBJ_REFERENCE (1 << 3) /* allow object references to
+ encode arbitrary object
+ graph */
 uint8_t *JS_WriteObject(JSContext *ctx, size_t *psize, JSValueConst obj,
 int flags);
+uint8_t *JS_WriteObject2(JSContext *ctx, size_t *psize, JSValueConst obj,
+ int flags, uint8_t ***psab_tab, size_t *psab_tab_len);
+
 #define JS_READ_OBJ_BYTECODE (1 << 0) /* allow function/module */
 #define JS_READ_OBJ_ROM_DATA (1 << 1) /* avoid duplicating 'buf' data */
+#define JS_READ_OBJ_SAB (1 << 2) /* allow SharedArrayBuffer */
+#define JS_READ_OBJ_REFERENCE (1 << 3) /* allow object references */
 JSValue JS_ReadObject(JSContext *ctx, const uint8_t *buf, size_t buf_len,
 int flags);
+/* instantiate and evaluate a bytecode function. Only used when
+ reading a script or module with JS_ReadObject() */
+JSValue JS_EvalFunction(JSContext *ctx, JSValue fun_obj);
 /* load the dependencies of the module 'obj'. Useful when JS_ReadObject()
 returns a module. */
 int JS_ResolveModule(JSContext *ctx, JSValueConst obj);
 
+/* only exported for os.Worker() */
+JSAtom JS_GetScriptOrModuleName(JSContext *ctx, int n_stack_levels);
+/* only exported for os.Worker() */
+JSModuleDef *JS_RunModule(JSContext *ctx, const char *basename,
+ const char *filename);
+
 /* C function definition */
 typedef enum JSCFunctionEnum { /* XXX: should rename for namespace isolation */
 JS_CFUNC_generic,
@@ -988,10 +1080,11 @@
 #undef js_force_inline
 
 /*GPAC patched*/
-JSValue JS_EvalWithTarget(JSContext *ctx, JSValueConst this_obj, const char *input, size_t input_len,
- const char *filename, int eval_flags);
-
 int JS_AtomIsArrayIndex(JSContext *ctx, uint32_t *pval, JSAtom atom);
+int JS_IsArrayBuffer(JSContext *ctx, JSValueConst val);
+
+/* return -1 if exception (proxy case) or TRUE/FALSE */
+int JS_SwitchClassID(JSValue obj, JSClassID class_id);
 
 void *JS_GetOpaque_Nocheck(JSValueConst obj);
 /*end GPAC patched*/

gpac-1.0.1.tar.gz/src/scene_manager/encode_isom.c -> gpac-2.0.0.tar.gz/src/scene_manager/encode_isom.c Changed

@@ -1062,7 +1062,7 @@
 			is_in_iod = 0;
 			j=0;
 			while ((esd = (GF_ESD*)gf_list_enum(iod->ESDescriptors, &j))) {
-				if (esd->decoderConfig->streamType != GF_STREAM_OD) {
+				if (!esd->decoderConfig || (esd->decoderConfig->streamType != GF_STREAM_OD)) {
 					esd = NULL;
 					continue;
 				}
@@ -1073,17 +1073,32 @@
 				}
 			}
 		}
-		if (!esd) esd = gf_sm_locate_esd(ctx, sc->ESID);
+		if (!esd)
+			esd = gf_sm_locate_esd(ctx, sc->ESID);
+
 		if (!esd) {
 			delete_desc = 1;
 			esd = gf_odf_desc_esd_new(2);
+			if (!esd) {
+				e = GF_OUT_OF_MEM;
+				goto err_exit;
+			}
 			esd->ESID = sc->ESID;
 			esd->decoderConfig->objectTypeIndication = GF_CODECID_OD_V1;
 			esd->decoderConfig->streamType = GF_STREAM_OD;
+		} else if (!esd->decoderConfig) {
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			goto err_exit;
 		}
 
 		/*create OD track*/
-		if (!esd->slConfig) esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
+		if (!esd->slConfig) {
+			esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
+			if (!esd->slConfig) {
+				e = GF_OUT_OF_MEM;
+				goto err_exit;
+			}
+		}
 		if (sc->timeScale) esd->slConfig->timestampResolution = sc->timeScale;
 		if (!esd->slConfig->timestampResolution) esd->slConfig->timestampResolution = 1000;
 		track = gf_isom_new_track(mp4, sc->ESID, GF_ISOM_MEDIA_OD, esd->slConfig->timestampResolution);

gpac-1.0.1.tar.gz/src/scene_manager/loader_bt.c -> gpac-2.0.0.tar.gz/src/scene_manager/loader_bt.c Changed

gpac-1.0.1.tar.gz/src/scene_manager/loader_isom.c -> gpac-2.0.0.tar.gz/src/scene_manager/loader_isom.c Changed

@@ -55,33 +55,35 @@
 				}
 				if (esd->URLString) continue;
 
-				switch (esd->decoderConfig->streamType) {
-				case GF_STREAM_OD:
-					continue;
+				if (esd->decoderConfig) {
+					switch (esd->decoderConfig->streamType) {
+					case GF_STREAM_OD:
+						continue;
 
-				case GF_STREAM_SCENE:
-					if ((esd->decoderConfig->objectTypeIndication != GF_CODECID_AFX) &&
-					        (esd->decoderConfig->objectTypeIndication != GF_CODECID_SYNTHESIZED_TEXTURE)
-					   ) {
+					case GF_STREAM_SCENE:
+						if ((esd->decoderConfig->objectTypeIndication != GF_CODECID_AFX) &&
+								(esd->decoderConfig->objectTypeIndication != GF_CODECID_SYNTHESIZED_TEXTURE)
+						   ) {
+							continue;
+						}
+						break;
+					/*dump the OCR track duration in case the OCR is used by media controls & co*/
+					case GF_STREAM_OCR:
+					{
+						u32 track;
+						Double dur;
+						GF_MuxInfo *mi = (GF_MuxInfo *) gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
+						gf_list_add(esd->extensionDescriptors, mi);
+						track = gf_isom_get_track_by_id(mp4, esd->ESID);
+						dur = (Double) (s64) gf_isom_get_track_duration(mp4, track);
+						dur /= gf_isom_get_timescale(mp4);
+						mi->duration = (u32) (dur * 1000);
 						continue;
 					}
-					break;
-				/*dump the OCR track duration in case the OCR is used by media controls & co*/
-				case GF_STREAM_OCR:
-				{
-					u32 track;
-					Double dur;
-					GF_MuxInfo *mi = (GF_MuxInfo *) gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
-					gf_list_add(esd->extensionDescriptors, mi);
-					track = gf_isom_get_track_by_id(mp4, esd->ESID);
-					dur = (Double) (s64) gf_isom_get_track_duration(mp4, track);
-					dur /= gf_isom_get_timescale(mp4);
-					mi->duration = (u32) (dur * 1000);
-					continue;;
-				}
-				break;
-				default:
-					break;
+						break;
+					default:
+						break;
+					}
 				}
 
 				GF_MuxInfo *mi = (GF_MuxInfo *) gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
@@ -100,33 +102,35 @@
 		while ((esd = (GF_ESD *)gf_list_enum(esdU->ESDescriptors, &i))) {
 			Bool import = 1;
 			if (esd->URLString) continue;
-			switch (esd->decoderConfig->streamType) {
-			case GF_STREAM_OD:
-				import = 0;
-				break;
-			case GF_STREAM_SCENE:
-				if ((esd->decoderConfig->objectTypeIndication != GF_CODECID_AFX) &&
-				        (esd->decoderConfig->objectTypeIndication != GF_CODECID_SYNTHESIZED_TEXTURE)
-				   ) {
+			if (esd->decoderConfig) {
+				switch (esd->decoderConfig->streamType) {
+				case GF_STREAM_OD:
+					import = 0;
+					break;
+				case GF_STREAM_SCENE:
+					if ((esd->decoderConfig->objectTypeIndication != GF_CODECID_AFX) &&
+							(esd->decoderConfig->objectTypeIndication != GF_CODECID_SYNTHESIZED_TEXTURE)
+					   ) {
+						import = 0;
+					}
+					break;
+				/*dump the OCR track duration in case the OCR is used by media controls & co*/
+				case GF_STREAM_OCR:
+				{
+					u32 track;
+					Double dur;
+					GF_MuxInfo *mi = (GF_MuxInfo *) gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
+					gf_list_add(esd->extensionDescriptors, mi);
+					track = gf_isom_get_track_by_id(mp4, esd->ESID);
+					dur = (Double) (s64) gf_isom_get_track_duration(mp4, track);
+					dur /= gf_isom_get_timescale(mp4);
+					mi->duration = (u32) (dur * 1000);
 					import = 0;
 				}
-				break;
-			/*dump the OCR track duration in case the OCR is used by media controls & co*/
-			case GF_STREAM_OCR:
-			{
-				u32 track;
-				Double dur;
-				GF_MuxInfo *mi = (GF_MuxInfo *) gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
-				gf_list_add(esd->extensionDescriptors, mi);
-				track = gf_isom_get_track_by_id(mp4, esd->ESID);
-				dur = (Double) (s64) gf_isom_get_track_duration(mp4, track);
-				dur /= gf_isom_get_timescale(mp4);
-				mi->duration = (u32) (dur * 1000);
-				import = 0;
-			}
-			break;
-			default:
-				break;
+					break;
+				default:
+					break;
+				}
 			}
 			if (import) {
 				GF_MuxInfo *mi = (GF_MuxInfo *) gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
@@ -215,14 +219,19 @@
 			break;
 		}
 		esd = gf_isom_get_esd(load->isom, i+1, 1);
-		if (!esd || !esd->decoderConfig) continue;
-		if (esd->decoderConfig->objectTypeIndication==GF_CODECID_TEXT_MPEG4)
+		if (!esd) continue;
+		if (!esd->decoderConfig || (esd->decoderConfig->objectTypeIndication==GF_CODECID_TEXT_MPEG4)) {
+			gf_odf_desc_del((GF_Descriptor *) esd);
+			esd = NULL;
 			continue;
+		}
 
 		if ((esd->decoderConfig->objectTypeIndication == GF_CODECID_AFX) ||
 		        (esd->decoderConfig->objectTypeIndication == GF_CODECID_SYNTHESIZED_TEXTURE)
 		   ) {
 			nb_samp += gf_isom_get_sample_count(load->isom, i+1);
+			gf_odf_desc_del((GF_Descriptor *) esd);
+			esd = NULL;
 			continue;
 		}
 		sc = gf_sm_stream_new(load->ctx, esd->ESID, esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
@@ -254,7 +263,12 @@
 			if (esd->decoderConfig->objectTypeIndication==0x09) {
 				if (!esd->dependsOnESID && nbBifs && !i)
 					mp4_report(load, GF_OK, "several scene namespaces used or improper scene dependencies in file - import may be incorrect");
-				e = gf_laser_decoder_configure_stream(lsr_dec, esd->ESID, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+
+				if (!esd->decoderConfig->decoderSpecificInfo)
+					e = GF_NON_COMPLIANT_BITSTREAM;
+				else
+					e = gf_laser_decoder_configure_stream(lsr_dec, esd->ESID, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+
 				if (e) goto exit;
 				nbLaser++;
 			}

gpac-1.0.1.tar.gz/src/scene_manager/loader_svg.c -> gpac-2.0.0.tar.gz/src/scene_manager/loader_svg.c Changed

gpac-1.0.1.tar.gz/src/scene_manager/loader_xmt.c -> gpac-2.0.0.tar.gz/src/scene_manager/loader_xmt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -122,7 +122,7 @@
 {
 	char *desc_name;
 	u32 ID;
-	/*store nodes refering to this URL*/
+	/*store nodes referring to this URL*/
 	GF_List *mf_urls;
 	GF_ObjectDescriptor *od;
 } XMT_ODLink;
@@ -186,7 +186,7 @@
 	if (!ID) {
 		if (!strnicmp(name, "od", 2)) ID = atoi(name + 2);
 		else if (!strnicmp(name, "iod", 3)) ID = atoi(name+ 3);
-		/*be carefull, an url like "11-regression-test.mp4" will return 1 on sscanf :)*/
+		/*be careful, an url like "11-regression-test.mp4" will return 1 on sscanf :)*/
 		else if (sscanf(name, "%u", &ID) == 1) {
 			char szURL[20];
 			sprintf(szURL, "%u", ID);
@@ -246,7 +246,7 @@
 	ID = 0;
 	if (!strnicmp(name, "od", 2)) ID = atoi(name + 2);
 	else if (!strnicmp(name, "iod", 3)) ID = atoi(name + 3);
-	/*be carefull, an url like "11-regression-test.mp4" will return 1 on sscanf :)*/
+	/*be careful, an url like "11-regression-test.mp4" will return 1 on sscanf :)*/
 	else if (sscanf(name, "%u", &ID) == 1) {
 		char szURL[20];
 		sprintf(szURL, "%u", ID);
@@ -1858,7 +1858,10 @@
 				gf_node_get_field_by_name(parent->node, "children", &container);
 				parent->last = NULL;
 			}
-
+			if (!container.far_ptr) {
+				parser->last_error = GF_SG_UNKNOWN_NODE;
+				container.fieldType = GF_SG_VRML_UNKNOWN;
+			}
 		}
 		if (container.fieldType == GF_SG_VRML_SFNODE) {
 			if (* ((GF_Node **)container.far_ptr) ) gf_node_unregister(* ((GF_Node **)container.far_ptr) , parent->node);

gpac-1.0.1.tar.gz/src/scene_manager/scene_dump.c -> gpac-2.0.0.tar.gz/src/scene_manager/scene_dump.c Changed

@@ -240,6 +240,7 @@
 			for (i=0; i<count; i++) {
 				GF_LASERConfig lsrcfg;
 				GF_ESD *esd = (GF_ESD *)gf_list_get(iod->ESDescriptors, i);
+				if (!esd || !esd->decoderConfig) continue;
 				if (esd->decoderConfig->streamType != GF_STREAM_SCENE) continue;
 				if (esd->decoderConfig->objectTypeIndication != 0x09) continue;
 				if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) continue;
@@ -421,16 +422,14 @@
 
 static void scene_dump_utf_string(GF_SceneDumper *sdump, Bool escape_xml, char *str)
 {
-	size_t _len;
 	u32 len, i;
 	u16 *uniLine;
 	if (!str) return;
 	len = (u32) strlen(str);
 	if (!len) return;
 	uniLine = (u16*)gf_malloc(sizeof(u16) * len*4);
-	_len = gf_utf8_mbstowcs(uniLine, len, (const char **) &str);
-	if (_len != (size_t) (-1)) {
-		len = (u32) _len;
+	len = gf_utf8_mbstowcs(uniLine, len, (const char **) &str);
+	if (len != GF_UTF8_FAIL) {
 		for (i=0; i<len; i++) {
 			//if (uniLine[i] == (u16) '\"') gf_fprintf(sdump->trace, "\\");
 			switch (uniLine[i]) {
@@ -584,21 +583,24 @@
 		u32 len, i;
 		char *str;
 		str = (char*)((SFScript *)ptr)->script_text;
+		if (!str) {
+			if (!sdump->XMLDump) {
+				gf_fprintf(sdump->trace, "\"\"");
+			}
+			break;
+		}
 		len = (u32)strlen(str);
 
 		if (!sdump->XMLDump) {
 			gf_fprintf(sdump->trace, "\"%s\"", str);
 		}
 		else {
-			size_t _len;
 			u16 *uniLine;
 
 			uniLine = (u16*)gf_malloc(sizeof(short) * (len + 1));
-			_len = gf_utf8_mbstowcs(uniLine, len, (const char **)&str);
-
-			if (_len != (size_t)-1) {
-				len = (u32)_len;
+			len = gf_utf8_mbstowcs(uniLine, len, (const char **)&str);
 
+			if (len != GF_UTF8_FAIL) {
 				for (i = 0; i<len; i++) {
 
 					switch (uniLine[i]) {
@@ -695,7 +697,7 @@
 			short uniLine[5000];
 			str = ((SFURL *)ptr)->url;
 			len = gf_utf8_mbstowcs(uniLine, 5000, (const char **) &str);
-			if (len != (size_t) -1) {
+			if (len != GF_UTF8_FAIL) {
 				gf_fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ? "'" : "&quot;") : "\"");
 				fwprintf(sdump->trace, (unsigned short *) uniLine);
 				gf_fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ? "'" : "&quot;") : "\"");
@@ -937,10 +939,12 @@
 		}
 
 		if (!sdump->XMLDump) gf_fprintf(sdump->trace, "[");
-		for (i=0; i<mffield->count; i++) {
-			if (i) gf_fprintf(sdump->trace, " ");
-			gf_sg_vrml_mf_get_item(field.far_ptr, field.fieldType, &slot_ptr, i);
-			gf_dump_vrml_sffield(sdump, sf_type, slot_ptr, 1, node);
+		if (mffield) {
+			for (i=0; i<mffield->count; i++) {
+				if (i) gf_fprintf(sdump->trace, " ");
+				gf_sg_vrml_mf_get_item(field.far_ptr, field.fieldType, &slot_ptr, i);
+				gf_dump_vrml_sffield(sdump, sf_type, slot_ptr, 1, node);
+			}
 		}
 		if (!sdump->XMLDump) gf_fprintf(sdump->trace, "]");
 
@@ -1104,7 +1108,8 @@
 					} else {
 						gf_fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
 					}
-					gf_dump_vrml_sffield(sdump, field.fieldType, field.far_ptr, 0, node);
+					if (field.far_ptr)
+						gf_dump_vrml_sffield(sdump, field.fieldType, field.far_ptr, 0, node);
 					if (has_sublist)
 						gf_fprintf(sdump->trace, "\">\n");
 					else
@@ -1119,13 +1124,13 @@
 				gf_fprintf(sdump->trace, " ");
 				if (field.fieldType == GF_SG_VRML_SFNODE) {
 					gf_dump_vrml_node(sdump, field.far_ptr ? *(GF_Node **)field.far_ptr : NULL, 0, NULL);
-				} else {
+				} else if (field.far_ptr) {
 					gf_dump_vrml_simple_field(sdump, field, node);
 				}
 			}
 			gf_fprintf(sdump->trace, "\n");
 		}
-	} else {
+	} else if (field.far_ptr) {
 		GenMFField *mffield = (GenMFField *) field.far_ptr;
 		sf_type = gf_sg_vrml_get_sf_type(field.fieldType);
 
@@ -1258,11 +1263,13 @@
 				} else {
 					gf_fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
 				}
-				for (i=0; i<mffield->count; i++) {
-					if (i) gf_fprintf(sdump->trace, " ");
-					if (field.fieldType != GF_SG_VRML_MFNODE) {
-						gf_sg_vrml_mf_get_item(field.far_ptr, field.fieldType, &slot_ptr, i);
-						gf_dump_vrml_sffield(sdump, sf_type, slot_ptr, (mffield->count>1) ? 1 : 0, node);
+				if (mffield) {
+					for (i=0; i<mffield->count; i++) {
+						if (i) gf_fprintf(sdump->trace, " ");
+						if (field.fieldType != GF_SG_VRML_MFNODE) {
+							gf_sg_vrml_mf_get_item(field.far_ptr, field.fieldType, &slot_ptr, i);
+							gf_dump_vrml_sffield(sdump, sf_type, slot_ptr, (mffield->count>1) ? 1 : 0, node);
+						}
 					}
 				}
 				gf_fprintf(sdump->trace, "\"/>\n");
@@ -2323,7 +2330,7 @@
 
 static GF_Err gf_dump_vrml_route(GF_SceneDumper *sdump, GF_Route *r, u32 dump_type)
 {
-	char toNode[512], fromNode[512];
+	char toNodeBuf[100], fromNodeBuf[100], *to_node_p, *from_node_p;
 	const char *node_name;
 	u32 id;
 	if (!r->is_setup) {
@@ -2335,22 +2342,22 @@
 
 	if (sdump->XMLDump || !dump_type) DUMP_IND(sdump);
 
+	to_node_p = toNodeBuf;
+	from_node_p = fromNodeBuf;
 	node_name = gf_node_get_name_and_id(r->FromNode, &id);
 	if (node_name) {
 		const char *to_name;
-		strcpy(fromNode, node_name);
+		from_node_p = (char *)node_name;
 		to_name = gf_node_get_name(r->ToNode);
 		if (to_name) {
-			strcpy(toNode, to_name);
+			to_node_p = (char *) to_name;
 		} else {
-			char str[100];
 			id = gf_node_get_id(r->ToNode);
-			sprintf(str, "node_%d", id);
-			strcpy(toNode, str);
+			sprintf(toNodeBuf, "node_%d", id);
 		}
 	} else {
-		sprintf(fromNode, "N%d", id-1);
-		sprintf(toNode, "N%d", gf_node_get_id(r->ToNode) - 1);
+		sprintf(fromNodeBuf, "N%d", id-1);
+		sprintf(toNodeBuf, "N%d", gf_node_get_id(r->ToNode) - 1);
 	}
 	if (sdump->XMLDump) {
 		gf_fprintf(sdump->trace, "<ROUTE");
@@ -2359,7 +2366,7 @@
 			scene_dump_vrml_route_id(sdump, r->ID, r->name);
 			EndAttribute(sdump);
 		}
-		gf_fprintf(sdump->trace, " fromNode=\"%s\" fromField=\"%s\" toNode=\"%s\" toField=\"%s\"/>\n", fromNode, r->FromField.name, toNode, r->ToField.name);
+		gf_fprintf(sdump->trace, " fromNode=\"%s\" fromField=\"%s\" toNode=\"%s\" toField=\"%s\"/>\n", from_node_p, r->FromField.name, to_node_p, r->ToField.name);
 	} else {
 		if (dump_type==2) gf_fprintf(sdump->trace, "ROUTE ");
 		if (r->ID) {
@@ -2368,10 +2375,10 @@
 			gf_fprintf(sdump->trace, " ");
 		}
 		if (dump_type==1) {
-			gf_fprintf(sdump->trace, "%s.%s TO %s.%s\n", fromNode, r->FromField.name, toNode, r->ToField.name);
+			gf_fprintf(sdump->trace, "%s.%s TO %s.%s\n", from_node_p, r->FromField.name, to_node_p, r->ToField.name);
 		} else {
 			if (dump_type!=2) gf_fprintf(sdump->trace, "ROUTE ");
-			gf_fprintf(sdump->trace, "%s.%s TO %s.%s\n", fromNode, r->FromField.name, toNode, r->ToField.name);
+			gf_fprintf(sdump->trace, "%s.%s TO %s.%s\n", from_node_p, r->FromField.name, to_node_p, r->ToField.name);
 		}
 	}
 	return GF_OK;
@@ -2662,7 +2669,10 @@
 			else if (f->fieldType==SVG_Transform_Rotate_datatype) att_name = "rotation";
 			else if (f->fieldType==SVG_Transform_Translate_datatype) att_name = "translation";
 			else if (f->fieldIndex==(u32) -1) att_name = "textContent";
-			else att_name = (char*) gf_svg_get_attribute_name(com->node, f->fieldIndex);
+			else {
+				if (!com->node) return GF_NON_COMPLIANT_BITSTREAM;
+				att_name = (char*) gf_svg_get_attribute_name(com->node, f->fieldIndex);
+			}
 
 			gf_fprintf(sdump->trace, "attributeName=\"%s\" ", att_name);
 			if (f->field_ptr) {
@@ -3208,7 +3218,7 @@
 			GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(com->objectDescriptors, j);
 			GF_ESD *esd = (GF_ESD *) gf_list_get(od->ESDescriptors, 0);
 			GF_MuxInfo *mux;
-			if (!esd) {
+			if (!esd || (esd->tag != GF_ODF_ESD_TAG)) {
 				if (od->URLString) {
 					gf_fprintf(dumper->trace, "<saf:RemoteStreamHeader streamID=\"stream%d\" url=\"%s\"", au->owner->ESID, od->URLString);
 					if (au->timing) gf_fprintf(dumper->trace, " time=\""LLD"\"", au->timing);
@@ -3221,7 +3231,9 @@
 
 
 			gf_fprintf(dumper->trace, "<saf:mediaHeader streamID=\"stream%d\"", esd->ESID);
-			gf_fprintf(dumper->trace, " streamType=\"%d\" objectTypeIndication=\"%d\" timeStampResolution=\"%d\"", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication, au->owner->timeScale);
+			if (esd->decoderConfig) {
+				gf_fprintf(dumper->trace, " streamType=\"%d\" objectTypeIndication=\"%d\" timeStampResolution=\"%d\"", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication, au->owner->timeScale);
+			}
 			if (au->timing) gf_fprintf(dumper->trace, " time=\""LLD"\"", au->timing);
 			if (mux && mux->file_name) gf_fprintf(dumper->trace, " source=\"%s\"", mux->file_name);
 			gf_fprintf(dumper->trace, "/>\n");

gpac-1.0.1.tar.gz/src/scene_manager/scene_engine.c -> gpac-2.0.0.tar.gz/src/scene_manager/scene_engine.c Changed

@@ -2,7 +2,7 @@
 *					GPAC Multimedia Framework
 *
 *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -334,7 +334,7 @@
 #ifndef GPAC_DISABLE_SCENE_DUMP
 	dumper = gf_sm_dumper_new(seng->ctx->scene_graph, rad_name, GF_FALSE, ' ', GF_SM_DUMP_SVG);
 	if (!dumper) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name));
 		e = GF_IO_ERR;
 		goto exit;
 	}
@@ -355,7 +355,7 @@
 
 		dumper = gf_sm_dumper_new(seng->ctx->scene_graph, rad_name, GF_FALSE, ' ', GF_SM_DUMP_SVG);
 		if (!dumper) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name));
 			e = GF_IO_ERR;
 			goto exit;
 		}
@@ -365,7 +365,7 @@
 #endif
 
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot dump DIMS Commands\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SceneEngine] Cannot dump DIMS Commands\n"));
 		goto exit;
 	}
 #endif
@@ -381,7 +381,7 @@
 
 	e = gf_file_load_data(file_name, (u8 **) &buffer, &fsize);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Error loading SVG dump file %s\n", file_name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SceneEngine] Error loading SVG dump file %s\n", file_name));
 		goto exit;
 	}
 
@@ -396,20 +396,20 @@
 	/* Then, if compression is asked, we do it */
 	buffer_len = (u32)fsize;
 	assert(fsize < 0x80000000);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[SceneEngine] Sending DIMS data - sizes: raw (%d)", buffer_len));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCENE, ("[SceneEngine] Sending DIMS data - sizes: raw (%d)", buffer_len));
 	if (compress_dims) {
 #ifndef GPAC_DISABLE_ZLIB
 		dims_header |= GF_DIMS_UNIT_C;
 		e = gf_gz_compress_payload(&buffer, buffer_len, &buffer_len);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("/ compressed (%d)", buffer_len));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCENE, ("/ compressed (%d)", buffer_len));
 		if (e) goto exit;
 #else
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: your version of GPAC was compiled with no libz support. Abort."));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("Error: your version of GPAC was compiled with no libz support. Abort."));
 		e = GF_NOT_SUPPORTED;
 		goto exit;
 #endif
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCENE, ("\n"));
 
 	/* Then, prepare the DIMS data using a bitstream instead of direct manipulation for endianness
 	 The new bitstream size should be:
@@ -420,7 +420,7 @@
 	 */
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	if (buffer_len > 65535) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[SceneEngine] Warning: DIMS Unit size too big !!!\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_SCENE, ("[SceneEngine] Warning: DIMS Unit size too big !!!\n"));
 		gf_bs_write_u16(bs, 0); /* internal GPAC hack to indicate that the size is larger than 65535 */
 		gf_bs_write_u32(bs, buffer_len+1);
 	} else {

gpac-1.0.1.tar.gz/src/scene_manager/scene_manager.c -> gpac-2.0.0.tar.gz/src/scene_manager/scene_manager.c Changed

gpac-1.0.1.tar.gz/src/scene_manager/scene_stats.c -> gpac-2.0.0.tar.gz/src/scene_manager/scene_stats.c Changed

gpac-1.0.1.tar.gz/src/scene_manager/swf_bifs.c -> gpac-2.0.0.tar.gz/src/scene_manager/swf_bifs.c Changed

gpac-1.0.1.tar.gz/src/scene_manager/swf_svg.c -> gpac-2.0.0.tar.gz/src/scene_manager/swf_svg.c Changed

gpac-1.0.1.tar.gz/src/scenegraph/base_scenegraph.c -> gpac-2.0.0.tar.gz/src/scenegraph/base_scenegraph.c Changed

@@ -196,6 +196,8 @@
 	gf_free(sg);
 }
 
+//unused, cf gf_sg_reset
+#if 0
 /*recursive traverse of the whole graph to check for scope mixes (nodes from an inline graph
 inserted in a parent graph through bind or routes). We must do this otherwise we're certain to get random
 crashes or mem leaks.*/
@@ -297,6 +299,7 @@
 		}
 	}
 }
+#endif
 
 GFINLINE GF_Node *SG_SearchForNode(GF_SceneGraph *sg, GF_Node *node)
 {
@@ -331,9 +334,9 @@
 	NodeIDedItem *reg_node;
 	if (!sg) return;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCENE, ("[SceneGraph] Reseting scene graph\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCENE, ("[SceneGraph] resetting scene graph\n"));
 #if 0
-	/*inlined graph, remove any of this graph nodes from the parent graph*/
+	/*inline graph, remove any of this graph nodes from the parent graph*/
 	if (!sg->pOwningProto && sg->parent_scene) {
 		GF_SceneGraph *par = sg->parent_scene;
 		while (par->parent_scene) par = par->parent_scene;
@@ -364,7 +367,7 @@
 
 	gf_mx_p(sg->dom_evt_mx);
 	/*remove listeners attached to the doc*/
-	gf_dom_event_remove_all_listeners(sg->dom_evt);
+	gf_dom_event_remove_all_listeners(sg->dom_evt, sg);
 	/*flush any pending add_listener*/
 	gf_dom_listener_reset_deferred(sg);
 	gf_mx_v(sg->dom_evt_mx);
@@ -399,12 +402,14 @@
 	if (sg->RootNode) gf_node_unregister(sg->RootNode, NULL);
 	sg->RootNode = NULL;
 
+#ifndef GPAC_DISABLE_VRML
 	if (!sg->pOwningProto && gf_list_count(sg->protos) && sg->GetExternProtoLib)
 		sg->GetExternProtoLib(sg->userpriv, NULL);
+#endif
 
 	/*WATCHOUT: we may have cyclic dependencies due to
 	1- a node referencing itself (forbidden in VRML)
-	2- nodes refered to in commands of conditionals children of this node (MPEG-4 is mute about that)
+	2- nodes referred to in commands of conditionals children of this node (MPEG-4 is mute about that)
 	we recursively preocess from last declared DEF node to first one
 	*/
 restart:
@@ -604,8 +609,8 @@
 Bool gf_sg_get_scene_size_info(GF_SceneGraph *sg, u32 *width, u32 *height)
 {
 	if (!sg) return 0;
-	*width = sg->width;
-	*height = sg->height;
+	if (width) *width = sg->width;
+	if (height) *height = sg->height;
 	return (sg->width && sg->height) ? 1 : 0;
 }
 
@@ -723,7 +728,6 @@
 	assert(pNode->sgprivate->parents==NULL);
 
 	if (pSG) {
-		GF_Route *r;
 		/*if def, remove from sg def table*/
 		if (pNode->sgprivate->flags & GF_NODE_IS_DEF) {
 			remove_node_id(pSG, pNode);
@@ -731,6 +735,7 @@
 
 #ifndef GPAC_DISABLE_VRML
 		/*check all routes from or to this node and destroy them - cf spec*/
+		GF_Route *r;
 		j=0;
 		while ((r = (GF_Route *)gf_list_enum(pSG->Routes, &j))) {
 			if ( (r->ToNode == pNode) || (r->FromNode == pNode)) {
@@ -1593,7 +1598,7 @@
 		}
 #ifndef GPAC_DISABLE_SVG
 		if (node->sgprivate->interact->dom_evt) {
-			gf_dom_event_remove_all_listeners(node->sgprivate->interact->dom_evt);
+			gf_dom_event_remove_all_listeners(node->sgprivate->interact->dom_evt, node->sgprivate->scenegraph);
 			gf_dom_event_target_del(node->sgprivate->interact->dom_evt);
 		}
 		if (node->sgprivate->interact->animations) {
@@ -1868,14 +1873,15 @@
 		gf_node_free(node);
 	}
 	else if (node->sgprivate->tag==TAG_DOMUpdates) {
-		u32 i, count;
 		GF_DOMUpdates *up = (GF_DOMUpdates *)node;
 		if (up->data) gf_free(up->data);
-		count = gf_list_count(up->updates);
+#ifndef GPAC_DISABLE_VRML
+		u32 i, count = gf_list_count(up->updates);
 		for (i=0; i<count; i++) {
 			GF_Command *com = gf_list_get(up->updates, i);
 			gf_sg_command_del(com);
 		}
+#endif
 		gf_list_del(up->updates);
 		gf_sg_parent_reset(node);
 		gf_node_free(node);
@@ -1923,7 +1929,7 @@
 GF_EXPORT
 const char *gf_node_get_class_name(GF_Node *node)
 {
-	assert(node && node->sgprivate->tag);
+	if (!node) return "null";
 	if (node->sgprivate->tag==TAG_UndefinedNode) return "UndefinedNode";
 #ifndef GPAC_DISABLE_VRML
 	else if (node->sgprivate->tag==TAG_ProtoNode) return ((GF_ProtoInstance*)node)->proto_name;
@@ -2363,7 +2369,9 @@
 GF_Err gf_node_replace_child(GF_Node *node, GF_ChildNodeItem **container, s32 pos, GF_Node *newNode)
 {
 	GF_ChildNodeItem *child, *prev;
+#ifndef GPAC_DISABLE_VRML
 	u32 tag;
+#endif
 	u32 cur_pos = 0;
 
 	child = *container;
@@ -2377,7 +2385,10 @@
 		}
 		break;
 	}
+#ifndef GPAC_DISABLE_VRML
 	tag = child->node->sgprivate->tag;
+#endif
+
 	gf_node_unregister(child->node, node);
 	if (newNode) {
 		child->node = newNode;
@@ -2437,6 +2448,7 @@
 
 static GF_Err gf_sg_load_dom_node(GF_SceneGraph *document, GF_XMLNode *n, GF_DOMFullNode *par)
 {
+#ifndef GPAC_DISABLE_VRML
 	u32 i, count;
 	GF_DOMFullAttribute *prev = NULL;
 	GF_DOMFullNode *node;
@@ -2503,6 +2515,9 @@
 		if (e) return e;
 	}
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 GF_Err gf_sg_init_from_xml_node(GF_SceneGraph *document, GF_DOMXMLNODE root_node)

gpac-1.0.1.tar.gz/src/scenegraph/commands.c -> gpac-2.0.0.tar.gz/src/scenegraph/commands.c Changed

gpac-1.0.1.tar.gz/src/scenegraph/dom_events.c -> gpac-2.0.0.tar.gz/src/scenegraph/dom_events.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012
+ *			Copyright (c) Telecom ParisTech 2004-2022
  *					All rights reserved
  *
  *  This file is part of GPAC / DOM 3 Events sub-project
@@ -189,11 +189,15 @@
 	return GF_OK;
 }
 
-void gf_dom_event_remove_all_listeners(GF_DOMEventTarget *event_target)
+void gf_dom_event_remove_all_listeners(GF_DOMEventTarget *event_target, GF_SceneGraph *sg)
 {
 	while (gf_list_count(event_target->listeners)) {
 		GF_Node *n = (GF_Node *)gf_list_get(event_target->listeners, 0);
-		gf_dom_listener_del(n, event_target);
+		if (gf_list_find(sg->exported_nodes, n)>=0) {
+			gf_list_rem(event_target->listeners, 0);
+		} else {
+			gf_dom_listener_del(n, event_target);
+		}
 	}
 }
 
@@ -260,6 +264,7 @@
 	if (hdl->sgprivate->scenegraph->svg_js) {
 		void svgjs_handler_execute(struct __tag_svg_script_ctx *svg_js, GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer, const char *_none);
 		svgjs_handler_execute(hdl->sgprivate->scenegraph->svg_js, hdl, event, observer, NULL);
+		return;
 	}
 #endif
 	GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[DOM Events] JavaScript context not found \n"));
@@ -714,7 +719,7 @@
 		if (j!=count) i++;
 		count++;
 		found++;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing   ] Time %f - Timed element %s - Inserting new time in %s: %f\n", gf_node_get_scene_time(timed_elt), gf_node_get_log_name(timed_elt), (is_end?"end":"begin"), resolved->clock));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing   ] Time %f - Timed element %s - Inserting new time in %s: %f\n", gf_node_get_scene_time(timed_elt), gf_node_get_log_name(timed_elt), (is_end?"end":"begin"), resolved->clock));
 	}
 	/* calling indirectly gf_smil_timing_modified */
 	if (found) gf_node_changed(timed_elt, info);
@@ -723,7 +728,7 @@
 static void gf_smil_handle_event_begin(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
 {
 	GF_FieldInfo info;
-	SVGTimedAnimBaseElement *timed_elt = (SVGTimedAnimBaseElement *)gf_node_get_private(hdl);
+	SVGTimedAnimBaseElement *timed_elt = (SVGTimedAnimBaseElement *) ((SVG_handlerElement *)hdl)->timed_elt;
 	if (!timed_elt || !timed_elt->timingp) return;
 
 	memset(&info, 0, sizeof(GF_FieldInfo));
@@ -736,7 +741,9 @@
 static void gf_smil_handle_event_end(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
 {
 	GF_FieldInfo info;
-	GF_Node *timed_elt = (GF_Node *)gf_node_get_private(hdl);
+	SVGTimedAnimBaseElement *timed_elt = (SVGTimedAnimBaseElement *) ((SVG_handlerElement *)hdl)->timed_elt;
+	if (!timed_elt || !timed_elt->timingp) return;
+
 	memset(&info, 0, sizeof(GF_FieldInfo));
 	info.name = "end";
 	info.far_ptr = ((SVGTimedAnimBaseElement *)timed_elt)->timingp->end;
@@ -777,22 +784,12 @@
 
 		if (hdl) {
 			((SVG_handlerElement *)hdl)->handle_event = is_begin ? gf_smil_handle_event_begin : gf_smil_handle_event_end;
+			//remember parent timed element
+			((SVG_handlerElement *)hdl)->timed_elt = node;
 		}
 		else {
 			continue;
 		}
-
-		//this code is broken, it introduces a cyclic ref between the parent and the handler but
-		//the listener (parent of the handler) is not inserted in the graph, so destruction of the handler
-		//will only happen if the SMIL_Time is destroyed (thus destroying the listener), but this SMIL_time
-		//will never get destroyed since the attribute owner (node) has an extra instance
-#if 0
-		/*We don't want to insert the implicit listener in the DOM. However remember
-		the listener at the handler level in case the handler gets destroyed*/
-		gf_node_set_private((GF_Node *)hdl, node);
-		gf_node_register((GF_Node*)node, NULL);
-#endif
-
 		/*we keep the t->element pointer in order to discard the source of identical events (begin of # elements, ...)*/
 	}
 }

gpac-1.0.1.tar.gz/src/scenegraph/dom_js.c -> gpac-2.0.0.tar.gz/src/scenegraph/dom_js.c Changed

@@ -291,7 +291,8 @@
 
 	if (doc->reference_count)
 		doc->reference_count++;
-	gf_node_register(doc->RootNode, NULL);
+	//no need to register root once more, it is already registered with graph
+//	gf_node_register(doc->RootNode, NULL);
 	par_sg = doc;
 	while (par_sg && !par_sg->get_document_class)
 		par_sg = par_sg->parent_scene;
@@ -322,12 +323,13 @@
 	JSClassID __class=0;
 	JSValue new_obj;
 	GF_SceneGraph *par_sg = sg;
-	if (!dom_rt) return JS_EXCEPTION;
+	if (!dom_rt) return GF_JS_EXCEPTION(c);
 	if (sg->js_data) return JS_DupValue(c, sg->js_data->document);
 
 	if (sg->reference_count)
 		sg->reference_count++;
-	gf_node_register(sg->RootNode, NULL);
+	//no need to register root once more, it is already registered with graph
+//	gf_node_register(sg->RootNode, NULL);
 
 	while (par_sg && !par_sg->get_element_class) {
 		par_sg = par_sg->parent_scene;
@@ -514,7 +516,7 @@
 	JSValue new_obj;
 	if (!n) return JS_NULL;
 	GF_SAFEALLOC(nl, DOMNodeList);
-	if (!nl) return JS_EXCEPTION;
+	if (!nl) return GF_JS_EXCEPTION(c);
 	
 	nl->owner = n;
 	if (n->sgprivate->scenegraph->reference_count)
@@ -554,7 +556,7 @@
 
 	nl = (DOMNodeList *) JS_GetOpaque(obj, domNodeListClass.class_id);
 	if (!nl || (argc!=1) || JS_ToInt32(c, &idx, argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	count = gf_node_list_get_count(nl->owner ? nl->owner->children : nl->child);
 	if ((idx<0) || ((u32) idx>=count)) {
@@ -569,7 +571,7 @@
 	DOMNodeList *nl;
 	u32 count;
 	nl = (DOMNodeList *) JS_GetOpaque(obj, domNodeListClass.class_id);
-	if (!nl) return JS_EXCEPTION;
+	if (!nl) return GF_JS_EXCEPTION(c);
 	count = gf_node_list_get_count(nl->owner ? nl->owner->children : nl->child);
 
 	switch (magic) {
@@ -718,6 +720,7 @@
 	return GF_BAD_PARAM;
 }
 
+void svg_execute_handler(GF_Node *node, GF_DOM_Event *event, GF_Node *observer);
 
 static GF_Node *create_listener(GF_SceneGraph *sg, GF_EventType evtType, GF_Node *n, GF_Node *vrml_node,
 JSContext *c, char *callback, JSValue funval, JSValue evt_handler)
@@ -746,6 +749,7 @@
 				handler->js_data->fun_val = JS_DupValue(c, funval);
 				handler->sgprivate->UserCallback = dom_handler_remove;
 				gf_list_add(dom_rt->handlers, handler);
+				handler->handle_event = svg_execute_handler;
 			}
 			handler->js_data->evt_listen_obj = evt_handler;
 		}
@@ -767,7 +771,7 @@
 	if (callback) gf_dom_add_text_node((GF_Node *)handler, gf_strdup(callback));
 
 #ifndef GPAC_DISABLE_SVG
-	if (handler->sgprivate->scenegraph->svg_js)
+	if (handler->sgprivate->scenegraph->svg_js && !handler->handle_event)
 		handler->handle_event = gf_sg_handle_dom_event;
 #endif
 
@@ -889,7 +893,7 @@
 #endif
 
 err_exit:
-	if (callback) JS_FreeCString(c, callback);
+	if (callback) gf_free(callback);
 	return JS_UNDEFINED;
 }
 
@@ -985,7 +989,7 @@
 	GF_ParentNode *par;
 
 	if (!argc || !JS_IsObject(argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	n = dom_get_node(obj);
 	if (!n) {
@@ -1025,7 +1029,7 @@
 	GF_Node *n, *new_node;
 
 	if (!argc || !JS_IsObject(argv[0])) {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	n = dom_get_node(obj);
 	if (!n) {
@@ -1058,7 +1062,7 @@
 	GF_Node *n, *new_node, *old_node;
 	GF_ParentNode *par;
 
-	if ((argc!=2) || !JS_IsObject(argv[0]) || !JS_IsObject(argv[1])) return JS_EXCEPTION;
+	if ((argc!=2) || !JS_IsObject(argv[0]) || !JS_IsObject(argv[1])) return GF_JS_EXCEPTION(c);
 	n = dom_get_node(obj);
 	if (!n) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
 
@@ -1177,6 +1181,8 @@
 	/*browse attributes*/
 	GF_DOMAttribute *att;
 	if (!node) return NULL;
+	if (node->sgprivate->tag < GF_NODE_FIRST_DOM_NODE_TAG) return NULL;
+
 	att = ((SVG_Element*)node)->attributes;
 	while (att) {
 		if (att->tag==TAG_DOM_ATT_any) {
@@ -1232,7 +1238,7 @@
 	n = dom_get_node(obj);
 	if (!n) {
 		sg = dom_get_doc(c, obj);
-		if (!sg) return JS_EXCEPTION;
+		if (!sg) return GF_JS_EXCEPTION(c);
 	}
 	tag = n ? gf_node_get_tag(n) : 0;
 	par = (GF_ParentNode*)n;
@@ -1395,7 +1401,7 @@
 
 	n = dom_get_node(obj);
 	/*note an element - we don't support property setting on document yet*/
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	tag = n ? gf_node_get_tag(n) : 0;
 	switch (magic) {
@@ -1444,9 +1450,12 @@
 		gf_free(sg->js_data);
 		sg->js_data = NULL;
 	}
-	if (sg->RootNode) {
-		gf_node_unregister(sg->RootNode, NULL);
-	}
+
+	//no need to unregister root, we did not registered it in the constructor
+//	if (sg->RootNode) {
+//		gf_node_unregister(sg->RootNode, NULL);
+//	}
+
 	if (sg->reference_count) {
 		sg->reference_count--;
 		if (!sg->reference_count)
@@ -1457,7 +1466,7 @@
 static JSValue dom_document_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_EXCEPTION;
+	if (!sg) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case DOCUMENT_JSPROPERTY_IMPLEMENTATION:
@@ -1492,7 +1501,7 @@
 static JSValue dom_document_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_EXCEPTION;
+	if (!sg) return GF_JS_EXCEPTION(c);
 	return js_throw_err(c, GF_DOM_EXC_NOT_SUPPORTED_ERR);
 }
 
@@ -1505,14 +1514,14 @@
 	GF_SceneGraph *sg = dom_get_doc(c, obj);
 
 	if (!sg || !argc || !JS_CHECK_STRING(argv[0]) )
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	name = NULL;
 	/*NS version*/
 	ns = 0;
 	xmlns = NULL;
 	if (argc==2) {
-		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		if (!JS_CHECK_STRING(argv[1])) return GF_JS_EXCEPTION(c);
 		xmlns = JS_ToCString(c, argv[0]);
 		if (xmlns) ns = gf_sg_get_namespace_code_from_name(sg, (char *) xmlns);
 		name = JS_ToCString(c, argv[1]);
@@ -1545,7 +1554,7 @@
 {
 	GF_Node *n;
 	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_EXCEPTION;
+	if (!sg) return GF_JS_EXCEPTION(c);
 
 	n = gf_node_new(sg, TAG_DOMText);
 	if (argc) {
@@ -1586,20 +1595,20 @@
 	JSValue new_obj;
 	const char *name;
 	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_EXCEPTION;
+	if (!sg) return GF_JS_EXCEPTION(c);
 
-	if (!argc || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (!argc || !JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 
 	/*NS version - TODO*/
 	if (argc==2) {
-		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		if (!JS_CHECK_STRING(argv[1])) return GF_JS_EXCEPTION(c);
 		name = JS_ToCString(c, argv[1]);
 	} else {
 		name = JS_ToCString(c, argv[0]);
 	}
 
 	GF_SAFEALLOC(nl, DOMNodeList);
-	if (!nl) return JS_EXCEPTION;
+	if (!nl) return GF_JS_EXCEPTION(c);
 
 	if (name && !strcmp(name, "*"))
 		xml_doc_gather_nodes((GF_ParentNode*)sg->RootNode, NULL, nl);
@@ -1620,8 +1629,8 @@
 	JSValue ret;
 
 	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_EXCEPTION;
-	if (!argc || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (!sg) return GF_JS_EXCEPTION(c);
+	if (!argc || !JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 	id = JS_ToCString(c, argv[0]);
 
 	/*we don't use the regular gf_sg_find_node_by_name because we may have nodes defined with the
@@ -1671,7 +1680,7 @@
 	JSValue ret = JS_NULL;
 
 	GF_Node *n = dom_get_node(obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	if (!argc || !JS_CHECK_STRING(argv[0]))
 		return JS_TRUE;
@@ -1741,13 +1750,13 @@
 	JSValue ret = JS_NULL;
 
 	GF_Node *n = dom_get_node(obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if (!argc || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (!argc || !JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 	ns = NULL;
 	/*NS version*/
 	if (argc==2) {
-		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		if (!JS_CHECK_STRING(argv[1])) return GF_JS_EXCEPTION(c);
 		ns = JS_ToCString(c, argv[0]);
 		name = JS_ToCString(c, argv[1]);
 	} else {
@@ -1796,13 +1805,13 @@
 	const char *name, *ns;
 
 	GF_Node *n = dom_get_node(obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if (!argc || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (!argc || !JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 	ns = NULL;
 	/*NS version*/
 	if (argc==2) {
-		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		if (!JS_CHECK_STRING(argv[1])) return GF_JS_EXCEPTION(c);
 		ns = JS_ToCString(c, argv[0]);
 		name = JS_ToCString(c, argv[1]);
 	} else {
@@ -1821,23 +1830,26 @@
 	} else if (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG) {
 		u32 ns_code = 0;
 		if (ns) ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, (char *) ns);
-		else ns_code = gf_sg_get_namespace_code(n->sgprivate->scenegraph, NULL);
+		else if (!strchr(name, ':'))
+			ns_code = gf_sg_get_namespace_code(n->sgprivate->scenegraph, NULL);
 
 		tag = gf_xml_get_attribute_tag(n, (char *)name, ns_code);
 	}
 
 	while (att) {
-		if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, name)) {
-			DOM_String *s;
-			if (prev) prev->next = att->next;
-			else node->attributes = att->next;
-			s = att->data;
-			if (*s) gf_free(*s);
-			gf_free(s);
-			gf_free(att->name);
-			gf_free(att);
-			dom_node_changed(n, GF_FALSE, NULL);
-			goto exit;
+		if (att->tag==TAG_DOM_ATT_any) {
+			if (!strcmp(att->name, name)) {
+				DOM_String *s;
+				if (prev) prev->next = att->next;
+				else node->attributes = att->next;
+				s = att->data;
+				if (*s) gf_free(*s);
+				gf_free(s);
+				gf_free(att->name);
+				gf_free(att);
+				dom_node_changed(n, GF_FALSE, NULL);
+				goto exit;
+			}
 		} else if (tag==att->tag) {
 			if (prev) prev->next = att->next;
 			else node->attributes = att->next;
@@ -1910,6 +1922,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOMJS] Failed to allocate DOM attribute\n"));
 		return;
 	}
+	att->tag = TAG_DOM_ATT_any;
 	att->name = gf_strdup(attribute_name);
 	att->data_type = (u16) DOM_String_datatype;
 	att->data = gf_svg_create_attribute_value(att->data_type);
@@ -2035,11 +2048,11 @@
 	char szVal[100];
 
 	GF_Node *n = dom_get_node(obj);
-	if (!n) return JS_EXCEPTION;
-	if ((argc < 2)) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
+	if ((argc < 2)) return GF_JS_EXCEPTION(c);
 
 	if (!JS_CHECK_STRING(argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	idx = 1;
 	name = _val = val = NULL;
@@ -2048,7 +2061,7 @@
 	if (argc==3) {
 		char *sep;
 		if (!JS_CHECK_STRING(argv[1]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 		ns = JS_ToCString(c, argv[0]);
 		gf_sg_add_namespace(n->sgprivate->scenegraph, (char *) ns, NULL);
 		name = JS_ToCString(c, argv[1]);
@@ -2120,19 +2133,19 @@
 	const char *name;
 
 	GF_Node *n = dom_get_node(obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if (!argc || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (!argc || !JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 
 	/*NS version*/
 	if (argc==2) {
-		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		if (!JS_CHECK_STRING(argv[1])) return GF_JS_EXCEPTION(c);
 		name = JS_ToCString(c, argv[1]);
 	} else {
 		name = JS_ToCString(c, argv[0]);
 	}
 	GF_SAFEALLOC(nl, DOMNodeList);
-	if (!nl) return JS_EXCEPTION;
+	if (!nl) return GF_JS_EXCEPTION(c);
 
 	if (name && !strcmp(name, "*")) {
 		JS_FreeCString(c, name);
@@ -2152,13 +2165,13 @@
 	Bool is_id;
 
 	GF_Node *n = dom_get_node(obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if ((argc<2) || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if ((argc<2) || !JS_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 
 	/*NS version*/
 	if (argc==3) {
-		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		if (!JS_CHECK_STRING(argv[1])) return GF_JS_EXCEPTION(c);
 		name = JS_ToCString(c, argv[1]);
 		is_id = JS_ToBool(c, argv[2]) ? GF_TRUE : GF_FALSE;
 	} else {
@@ -2169,11 +2182,11 @@
 	if (node_id && is_id) {
 		/*we only support ONE ID per node*/
 		JS_FreeCString(c, name);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	if (is_id) {
-		if (!name) return JS_EXCEPTION;
-		gf_node_set_id(n, gf_sg_get_max_node_id(n->sgprivate->scenegraph) + 1, gf_strdup(name) );
+		if (!name) return GF_JS_EXCEPTION(c);
+		gf_node_set_id(n, gf_sg_get_max_node_id(n->sgprivate->scenegraph) + 1, name);
 	} else if (node_id) {
 		gf_node_remove_id(n);
 	}
@@ -2198,7 +2211,7 @@
 	JSValue ret;
 	char *out_str = NULL;
 	GF_Node *n = dom_get_node(obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	GF_ChildNodeItem *child;
 	child = ((GF_ParentNode *) n)->children;
@@ -2221,7 +2234,7 @@
 static JSValue dom_text_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_DOMText *txt = (GF_DOMText*)dom_get_node(obj);
-	if (!txt || (txt->sgprivate->tag != TAG_DOMText)) return JS_EXCEPTION;
+	if (!txt || (txt->sgprivate->tag != TAG_DOMText)) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case TEXT_JSPROPERTY_DATA:
@@ -2245,7 +2258,7 @@
 static JSValue dom_text_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	GF_DOMText *txt = (GF_DOMText*)dom_get_node(obj);
-	if (!txt || (txt->sgprivate->tag != TAG_DOMText)) return JS_EXCEPTION;
+	if (!txt || (txt->sgprivate->tag != TAG_DOMText)) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case TEXT_JSPROPERTY_DATA:
@@ -2266,21 +2279,21 @@
 static JSValue event_stop_propagation(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_DOM_Event *evt = JS_GetOpaque(obj, domEventClass.class_id);
-	if (!evt) return JS_EXCEPTION;
+	if (!evt) return GF_JS_EXCEPTION(c);
 	evt->event_phase |= GF_DOM_EVENT_PHASE_CANCEL;
 	return JS_TRUE;
 }
 static JSValue event_stop_immediate_propagation(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_DOM_Event *evt = JS_GetOpaque(obj, domEventClass.class_id);
-	if (!evt) return JS_EXCEPTION;
+	if (!evt) return GF_JS_EXCEPTION(c);
 	evt->event_phase |= GF_DOM_EVENT_PHASE_CANCEL_ALL;
 	return JS_TRUE;
 }
 static JSValue event_prevent_default(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_DOM_Event *evt = JS_GetOpaque(obj, domEventClass.class_id);
-	if (!evt) return JS_EXCEPTION;
+	if (!evt) return GF_JS_EXCEPTION(c);
 	evt->event_phase |= GF_DOM_EVENT_PHASE_PREVENT;
 	return JS_TRUE;
 }
@@ -2364,7 +2377,8 @@
 		txt[0] = evt->detail;
 		txt[1] = 0;
 		srcp = (const u16 *) txt;
-		len = (u32) gf_utf8_wcstombs(szData, 5, &srcp);
+		len = gf_utf8_wcstombs(szData, 5, &srcp);
+		if (len == GF_UTF8_FAIL) len = 0;
 		szData[len] = 0;
 		return JS_NewString(c, szData);
 	}
@@ -2561,7 +2575,9 @@
 	JS_CFUNC_DEF("removeAttributeNode", 1, xml_dom3_not_implemented),
 	JS_CFUNC_DEF("getAttributeNodeNS", 2, xml_dom3_not_implemented),
 	JS_CFUNC_DEF("setAttributeNodeNS", 1, xml_dom3_not_implemented),
-	JS_CFUNC_DEF("setIdAttributeNode", 2, xml_dom3_not_implemented)
+	JS_CFUNC_DEF("setIdAttributeNode", 2, xml_dom3_not_implemented),
+	/*eventTarget interface*/
+	JS_DOM3_EVENT_TARGET_INTERFACE
 };
 
 static const JSCFunctionListEntry text_Funcs[] =
@@ -2774,7 +2790,8 @@
 	}
 	if (sg->js_data) {
 		if (!JS_IsUndefined(sg->js_data->document)) {
-//			dom_document_finalize(c, sg->document);
+			//detach sg from object and free it
+			JS_SetOpaque(sg->js_data->document, NULL);
 			JS_FreeValueRT(rt, sg->js_data->document);
 		}
 		gf_free(sg->js_data);

gpac-1.0.1.tar.gz/src/scenegraph/mpeg4_nodes.c -> gpac-2.0.0.tar.gz/src/scenegraph/mpeg4_nodes.c Changed

@@ -12838,7 +12838,8 @@
 	}
 }
 
-
+//unused
+#if 0
 static s32 Script_get_field_index_by_name(char *name)
 {
 	if (!strcmp("url", name)) return 0;
@@ -12846,6 +12847,7 @@
 	if (!strcmp("mustEvaluate", name)) return 2;
 	return -1;
 }
+#endif
 static Bool Script_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)
 {
 	switch (FieldIndex) {
@@ -28000,7 +28002,7 @@
 		info->name = "addChildren";
 		info->eventType = GF_SG_EVENT_IN;
 		info->on_event_in = ((M_SBBone *)node)->on_addChildren;
-		info->fieldType = GF_SG_VRML_SFNODE;
+		info->fieldType = GF_SG_VRML_MFNODE;
 		info->NDTtype = NDT_SF3DNode;
 		info->far_ptr = & ((M_SBBone *)node)->addChildren;
 		return GF_OK;
@@ -28008,7 +28010,7 @@
 		info->name = "removeChildren";
 		info->eventType = GF_SG_EVENT_IN;
 		info->on_event_in = ((M_SBBone *)node)->on_removeChildren;
-		info->fieldType = GF_SG_VRML_SFNODE;
+		info->fieldType = GF_SG_VRML_MFNODE;
 		info->NDTtype = NDT_SF3DNode;
 		info->far_ptr = & ((M_SBBone *)node)->removeChildren;
 		return GF_OK;
@@ -35920,7 +35922,7 @@
 		info->name = "addChildren";
 		info->eventType = GF_SG_EVENT_IN;
 		info->on_event_in = ((M_Shadow *)node)->on_addChildren;
-		info->fieldType = GF_SG_VRML_SFNODE;
+		info->fieldType = GF_SG_VRML_MFNODE;
 		info->NDTtype = NDT_SF3DNode;
 		info->far_ptr = & ((M_Shadow *)node)->addChildren;
 		return GF_OK;
@@ -35928,7 +35930,7 @@
 		info->name = "removeChildren";
 		info->eventType = GF_SG_EVENT_IN;
 		info->on_event_in = ((M_Shadow *)node)->on_removeChildren;
-		info->fieldType = GF_SG_VRML_SFNODE;
+		info->fieldType = GF_SG_VRML_MFNODE;
 		info->NDTtype = NDT_SF3DNode;
 		info->far_ptr = & ((M_Shadow *)node)->removeChildren;
 		return GF_OK;
@@ -40169,8 +40171,11 @@
 		return Rectangle_get_field_index_by_name(name);
 	case TAG_MPEG4_ScalarInterpolator:
 		return ScalarInterpolator_get_field_index_by_name(name);
+//unused
+#if 0
 	case TAG_MPEG4_Script:
 		return Script_get_field_index_by_name(name);
+#endif
 	case TAG_MPEG4_Shape:
 		return Shape_get_field_index_by_name(name);
 	case TAG_MPEG4_Sound:

gpac-1.0.1.tar.gz/src/scenegraph/qjs_common.h -> gpac-2.0.0.tar.gz/src/scenegraph/qjs_common.h Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *				Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2021
 *					All rights reserved
 *
 * This file is part of GPAC / Scene Management sub-project
@@ -23,8 +23,8 @@
 *
 */
 
-#ifndef SG_QJS_COMMONE
-#define SG_QJS_COMMONE
+#ifndef _SG_QJS_COMMON_
+#define _SG_QJS_COMMON_
 
 #include <gpac/list.h>
 #include <gpac/scenegraph.h>
@@ -56,10 +56,14 @@
 /* throws an error with integer property 'code' set to err and string property 'message' set to the formatted string*/
 JSValue js_throw_err_msg(JSContext *ctx, s32 err, const char *fmt, ...);
 
-void js_do_loop(JSContext *ctx);
+void js_std_loop(JSContext *ctx);
 void js_dump_error(JSContext *ctx);
+void js_dump_error_exc(JSContext *ctx, const JSValue exception_val);
+
 JSValue js_print(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 
+void js_load_constants(JSContext *ctx, JSValue global_obj);
+
 /********************************************
 
 	SceneGraph JS tools
@@ -235,18 +239,23 @@
 const char *jsf_get_script_filename(JSContext *c);
 
 
-/*definitions of C modules in gpac, potentially used by both SceneGraph and JSFilter*/
-void qjs_module_init_scenejs(JSContext *ctx);
-void qjs_module_init_storage(JSContext *ctx);
+/*special init of XHR as builtin of DOM rather than standalone module*/
 void qjs_module_init_xhr_global(JSContext *c, JSValue global);
-void qjs_module_init_xhr(JSContext *c);
-void qjs_module_init_evg(JSContext *c);
-void qjs_module_init_webgl(JSContext *c);
-void qjs_module_init_gpaccore(JSContext *c);
+
+void qjs_init_all_modules(JSContext *ctx, Bool no_webgl, Bool for_vrml);
+
+Bool gs_js_context_is_valid(JSContext *ctx);
+JSRuntime *gf_js_get_rt();
+
+const char *jsf_get_script_filename(JSContext *c);
+
+
+#define GF_JS_EXCEPTION(_ctx) \
+	js_throw_err_msg(_ctx, GF_BAD_PARAM, "Invalid value in function %s (%s@%d)", __func__, strrchr(__FILE__, GF_PATH_SEPARATOR)+1, __LINE__)
 
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif //SG_QJS_COMMONE
+#endif //_SG_QJS_COMMON_

gpac-1.0.1.tar.gz/src/scenegraph/smil_anim.c -> gpac-2.0.0.tar.gz/src/scenegraph/smil_anim.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012
+ *			Copyright (c) Telecom ParisTech 2004-2022
  *
  *  This file is part of GPAC / SVG Scene Graph sub-project
  *
@@ -149,13 +149,13 @@
 	SMILAnimationAttributesPointers *animp = rai->animp;
 
 	if (!animp->to) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL,
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME,
 		       ("[SMIL Animation] Animation     %s - set element without to attribute\n",
 		        gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 		return;
 	}
 	if (!animp->to->type) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL,
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME,
 		       ("[SMIL Animation] Animation     %s - set element with an unparsed to attribute\n",
 		        gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 		return;
@@ -168,7 +168,7 @@
 		else rai->interpolated_value_changed = 1;
 		return;
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 		       ("[SMIL Animation] Time %f - Animation     %s - applying set animation\n",
 		        gf_node_get_scene_time((GF_Node*)rai->anim_elt),
 		        gf_node_get_log_name((GF_Node *)rai->anim_elt)));
@@ -216,7 +216,7 @@
 		else
 			*interpolation_coefficient = FIX_ONE;
 		if (!rai->change_detection_mode)
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - Using Key Times: index %d, interval duration %.2f, coeff: %.2f\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt),
 			        gf_node_get_log_name((GF_Node *)rai->anim_elt),
@@ -237,7 +237,7 @@
 		}
 		if (keyValueIndex) *keyValueIndex = 0;
 		if (!rai->change_detection_mode)
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - Using Key Points: key Point Index %d, coeff: %.2f\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyTimeIndex, *interpolation_coefficient));
 	}
@@ -276,7 +276,7 @@
 			   therefore no need to resolve inherit and currentColor */
 			gf_svg_attributes_copy(&rai->interpolated_value, &value_info, 0);
 			rai->previous_key_index = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - Using values[0] as interpolation value\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 			return;
@@ -308,7 +308,7 @@
 			}
 			interpolation_coefficient = tmp - INT2FIX(keyValueIndex);
 		}
-		//GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Animation] Time %f - Animation     %s - No KeyTimes: key index %d, coeff: %.2f\n", gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex, FIX2FLT(interpolation_coefficient)));
+		//GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Animation] Time %f - Animation     %s - No KeyTimes: key index %d, coeff: %.2f\n", gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex, FIX2FLT(interpolation_coefficient)));
 	} else {
 		gf_smil_anim_use_keypoints_keytimes(rai, normalized_simple_time, &interpolation_coefficient, &keyValueIndex);
 	}
@@ -326,7 +326,7 @@
 
 		switch (real_calcMode) {
 		case SMIL_CALCMODE_DISCRETE:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - applying discrete animation using values (key value index: %d)\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex));
 			value_info.far_ptr = gf_list_get(values, keyValueIndex);
@@ -340,7 +340,7 @@
 		/* TODO: at the moment assume it is linear */
 		case SMIL_CALCMODE_LINEAR:
 			if (keyValueIndex == rai->values_count - 1) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 				       ("[SMIL Animation] Time %f - Animation     %s - applying linear animation using values (setting last key value: %d)\n",
 				        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex));
 				value_info.far_ptr = gf_list_get(values, rai->values_count - 1);
@@ -349,7 +349,7 @@
 				gf_svg_attributes_copy(&rai->interpolated_value, &value_info, 0);
 			} else {
 
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 				       ("[SMIL Animation] Time %f - Animation     %s - applying linear animation using values (key value indices: %d, %d / coeff: %f)\n",
 				        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), keyValueIndex, keyValueIndex+1, interpolation_coefficient));
 				value_info.far_ptr = gf_list_get(values, keyValueIndex);
@@ -400,7 +400,7 @@
 		}
 	} else {
 
-		if (animp->from) {
+		if (animp->from && animp->from->value) {
 			from_info.fieldType = animp->from->type;
 			from_info.far_ptr = animp->from->value;
 		} else {
@@ -421,7 +421,7 @@
 			gf_svg_attributes_resolve_currentColor(&from_info, &rai->owner->current_color_value);
 			gf_svg_attributes_resolve_inherit(&from_info, &rai->owner->parent_presentation_value);
 		}
-		if (animp->to) {
+		if (animp->to && animp->to->value) {
 			to_info.fieldType = animp->to->type;
 			to_info.far_ptr = animp->to->value;
 		} else {
@@ -451,7 +451,7 @@
 		case SMIL_CALCMODE_DISCRETE:
 		{
 			/* before half of the duration stay at 'from' and then switch to 'to' */
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - applying from-to animation (using %s value)\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), (useFrom?"from":"to")));
 			gf_svg_attributes_copy(&rai->interpolated_value, (useFrom?&from_info:&to_info), 0);
@@ -462,7 +462,7 @@
 		case SMIL_CALCMODE_PACED:
 		case SMIL_CALCMODE_LINEAR:
 		default:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - applying from-to animation (linear interpolation, using coefficient %f)\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), interpolation_coefficient));
 			gf_svg_attributes_interpolate(&from_info, &to_info, &rai->interpolated_value, interpolation_coefficient, 1);
@@ -537,12 +537,12 @@
 		{
 			/* before half of the duration stay at 'from' and then switch to 'to' */
 			if (useFrom) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 				       ("[SMIL Animation] Time %f - Animation     %s - applying from-by animation (setting from)",
 				        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 				gf_svg_attributes_muladd(from_coef, &from_info, 0, &by_info, &rai->interpolated_value, 0);
 			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 				       ("[SMIL Animation] Time %f - Animation     %s - applying from-by animation (setting from+by)",
 				        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 				gf_svg_attributes_muladd(from_coef, &from_info, FIX_ONE, &by_info, &rai->interpolated_value, 0);
@@ -554,7 +554,7 @@
 		case SMIL_CALCMODE_PACED:
 		case SMIL_CALCMODE_LINEAR:
 		default:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - applying from-by animation (linear interpolation between from and from+by, coef: %f)\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), normalized_simple_time));
 			gf_svg_attributes_muladd(from_coef, &from_info, normalized_simple_time, &by_info, &rai->interpolated_value, 0);
@@ -570,7 +570,7 @@
 	gf_mx2d_init(*m);
 
 	gf_path_iterator_get_transform(rai->path_iterator, offset, 1, m, 1, 0);
-	//GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("offset: %f, position: (%f, %f)", offset, ((GF_Matrix2D *)rai->interpolated_value.far_ptr)->m[2], ((GF_Matrix2D *)rai->interpolated_value.far_ptr)->m[5]));
+	//GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("offset: %f, position: (%f, %f)", offset, ((GF_Matrix2D *)rai->interpolated_value.far_ptr)->m[2], ((GF_Matrix2D *)rai->interpolated_value.far_ptr)->m[5]));
 	switch (rai->rotate) {
 	case SVG_NUMBER_AUTO:
 		break;
@@ -600,7 +600,7 @@
 	} else {
 		rai->previous_coef = interpolation_coefficient;
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 		       ("[SMIL Animation] Time %f - Animation     %s - applying path animation (coef: %f)\n",
 		        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), normalized_simple_time));
 
@@ -628,10 +628,10 @@
 	}
 
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
+	if (gf_log_tool_level_on(GF_LOG_COMPTIME, GF_LOG_DEBUG)) {
 		char *str = gf_svg_dump_attribute(rai->anim_elt, &rai->interpolated_value);
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Animation] Time %f - Animation     %s - Interpolation value changed for attribute %s, new value: %s \n",
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Animation] Time %f - Animation     %s - Interpolation value changed for attribute %s, new value: %s \n",
 		       gf_node_get_scene_time(rai->anim_elt), gf_node_get_log_name(rai->anim_elt),
 		       gf_svg_get_attribute_name(rai->anim_elt, rai->owner->presentation_value.fieldIndex), str)
 		);
@@ -693,7 +693,7 @@
 			rai->last_specified_value.far_ptr   = animp->to->value;
 		} else {
 			/* TODO ??? */
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Animation     %s - set element without to attribute\n",
 			        gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 		}
@@ -750,7 +750,7 @@
 		}
 
 		if ((animp->accumulate && *animp->accumulate == SMIL_ACCUMULATE_SUM) && nb_iterations > 0) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - applying accumulation (iteration #%d)\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt), nb_iterations));
 
@@ -781,7 +781,7 @@
 		/* Apply additive behavior if required
 			PV = (additive == sum ? PV + animp->IV : animp->IV); */
 		if (animp->additive && *animp->additive == SMIL_ADDITIVE_SUM) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - applying additive behavior\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 
@@ -791,9 +791,9 @@
 			                      1);
 
 #ifndef GPAC_DISABLE_LOG
-			if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
+			if (gf_log_tool_level_on(GF_LOG_COMPTIME, GF_LOG_DEBUG)) {
 				char *str = gf_svg_dump_attribute((GF_Node*)rai->anim_elt, &rai->owner->presentation_value);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Animation] Time %f - Animation     %s - Presentation value changed for attribute %s, new value: %s\n",
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Animation] Time %f - Animation     %s - Presentation value changed for attribute %s, new value: %s\n",
 				       gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node*)rai->anim_elt),
 				       gf_svg_get_attribute_name((GF_Node*)rai->anim_elt, rai->owner->presentation_value.fieldIndex), str)
 				);
@@ -802,7 +802,7 @@
 #endif
 
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Time %f - Animation     %s - applying non-additive behavior\n",
 			        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 
@@ -817,10 +817,10 @@
 
 			gf_svg_attributes_copy(&rai->owner->presentation_value, &rai->interpolated_value, 1);
 #ifndef GPAC_DISABLE_LOG
-			if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
+			if (gf_log_tool_level_on(GF_LOG_COMPTIME, GF_LOG_DEBUG)) {
 				char *str = gf_svg_dump_attribute((GF_Node*)rai->anim_elt, &rai->owner->presentation_value);
 
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Animation] Time %f - Animation     %s - Presentation value changed for attribute %s, new value: %s\n",
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Animation] Time %f - Animation     %s - Presentation value changed for attribute %s, new value: %s\n",
 				       gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node*)rai->anim_elt),
 				       gf_svg_get_attribute_name((GF_Node*)rai->anim_elt, rai->owner->presentation_value.fieldIndex), str)
 				);
@@ -842,12 +842,6 @@
 	gf_smil_apply_additive(rai);
 }
 
-static void gf_smil_anim_animate_with_fraction(SMIL_Timing_RTI *rti, Fixed normalized_simple_time)
-{
-	gf_smil_anim_animate(rti, rti->fraction);
-	rti->evaluate_status = SMIL_TIMING_EVAL_NONE;
-}
-
 void gf_smil_anim_reset_variables(SMIL_Anim_RTI *rai)
 {
 	if (!rai) return;
@@ -875,7 +869,7 @@
 		else
 			rai->interpolated_value_changed = 0;
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 		       ("[SMIL Animation] Time %f - Animation     %s - applying freeze behavior\n",
 		        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 
@@ -897,7 +891,7 @@
 		else
 			rai->interpolated_value_changed = 0;
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL,
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME,
 		       ("[SMIL Animation] Time %f - Animation     %s - applying remove behavior\n",
 		        gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node *)rai->anim_elt)));
 
@@ -909,10 +903,10 @@
 		rai->anim_done = 1;
 
 #ifndef GPAC_DISABLE_LOG
-		if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
+		if (gf_log_tool_level_on(GF_LOG_COMPTIME, GF_LOG_DEBUG)) {
 			char *str = gf_svg_dump_attribute((GF_Node*)rai->anim_elt, &rai->owner->presentation_value);
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Animation] Time %f - Animation     %s - Presentation value changed for attribute %s, new value: %s\n",
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Animation] Time %f - Animation     %s - Presentation value changed for attribute %s, new value: %s\n",
 			       gf_node_get_scene_time((GF_Node*)rai->anim_elt), gf_node_get_log_name((GF_Node*)rai->anim_elt),
 			       gf_svg_get_attribute_name((GF_Node*)rai->anim_elt, rai->owner->presentation_value.fieldIndex), str)
 			);
@@ -941,7 +935,8 @@
 		gf_smil_anim_remove(rti, normalized_simple_time);
 		break;
 	case SMIL_TIMING_EVAL_FRACTION:
-		gf_smil_anim_animate_with_fraction(rti, normalized_simple_time);
+		gf_smil_anim_animate(rti, normalized_simple_time);
+		rti->evaluate_status = SMIL_TIMING_EVAL_NONE;
 		break;
 		/*
 			discard should be done before in smil_notify_time
@@ -1042,10 +1037,10 @@
 //		gf_svg_attributes_copy(&aa->presentation_value, &aa->specified_value, 0);
 
 #ifndef GPAC_DISABLE_LOG
-			if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
+			if (gf_log_tool_level_on(GF_LOG_COMPTIME, GF_LOG_DEBUG)) {
 				char *str = gf_svg_dump_attribute(node, &aa->presentation_value);
 
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Animation] Time %f - Element %s - Presentation value changed for attribute %s, new value: %s - dirty flags %x\n",
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Animation] Time %f - Element %s - Presentation value changed for attribute %s, new value: %s - dirty flags %x\n",
 				       gf_node_get_scene_time(node), gf_node_get_log_name(node),
 				       gf_svg_get_attribute_name(node, aa->presentation_value.fieldIndex), str, aa->dirty_flags)
 				);
@@ -1136,7 +1131,7 @@
 			gf_mx2d_init(*(GF_Matrix2D *)target_attribute.far_ptr);
 			break;
 		default:
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Missing attributeName attribute on element %s\n",
 			        gf_node_get_log_name((GF_Node*)e) ));
 			return;
@@ -1146,7 +1141,7 @@
 	if (animp->attributeType && *animp->attributeType == SMIL_ATTRIBUTETYPE_CSS) {
 		/* see example animate-elem-219-t.svg from the SVG test suite, upper row */
 		if (!gf_svg_is_property(target, &target_attribute)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL,
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME,
 			       ("[SMIL Animation] Using CSS attributeType for an animation on an attribute which is not a property %s\n",
 			        gf_node_get_log_name((GF_Node*)e) ));
 			return;
@@ -1156,7 +1151,7 @@
 	/* Creation and setup of the runtime structure for animation */
 	GF_SAFEALLOC(rai, SMIL_Anim_RTI)
 	if (!rai) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, ("[SMIL Animation] Failed to allocated SMIL anim RTI\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[SMIL Animation] Failed to allocated SMIL anim RTI\n"));
 		return;
 	}
 
@@ -1198,7 +1193,7 @@
 			animp->additive = info.far_ptr;
 		}
 		if (*animp->additive == SMIL_ADDITIVE_REPLACE) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL, ("[SMIL Animation] Warning: by-animations cannot use additive=\"replace\"\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME, ("[SMIL Animation] Warning: by-animations cannot use additive=\"replace\"\n"));
 		}
 		*animp->additive = SMIL_ADDITIVE_SUM;
 	}
@@ -1299,7 +1294,7 @@
 	if (!aa) {
 		GF_SAFEALLOC(aa, SMIL_AttributeAnimations)
 		if (!aa) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, ("[SMIL Animation] Failed to allocated SMIL attribue ani\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[SMIL Animation] Failed to allocated SMIL attribue ani\n"));
 			return;
 		}
 
@@ -1422,7 +1417,7 @@
 	gf_svg_flatten_attributes((SVG_Element *)e, &all_atts);
 	GF_SAFEALLOC(e->xlinkp, XLinkAttributesPointers);
 	if (!e->xlinkp) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL,("[SMIL] Error creating anim xlink attrib\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME,("[SMIL] Error creating anim xlink attrib\n"));
 		return;
 	}
 	xlinkp = e->xlinkp;
@@ -1456,7 +1451,7 @@
 	}
 	if (xlinkp->href->type == XMLRI_STRING) {
 		if (!xlinkp->href->string) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL,("Error: IRI not initialized\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME,("Error: IRI not initialized\n"));
 			return;
 		} else {
 			GF_Node *n;
@@ -1472,7 +1467,7 @@
 		}
 	}
 	if (!xlinkp->href->target) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_SMIL,("Trying to initialize an animation when the target is not known\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPTIME,("Trying to initialize an animation when the target is not known\n"));
 		return;
 	}

gpac-1.0.1.tar.gz/src/scenegraph/smil_timing.c -> gpac-2.0.0.tar.gz/src/scenegraph/smil_timing.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2004-2012
+ *			Copyright (c) Telecom ParisTech 2004-2022
 *
 * This file is part of GPAC / SVG Scene Graph sub-project
 *
@@ -34,12 +34,12 @@
 
 static void gf_smil_timing_print_interval(SMIL_Timing_RTI *rti, Bool current, SMIL_Interval *interval)
 {
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - ", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, (current ? "Current " : " Next "));
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("Interval - "));
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("begin: %.2f", interval->begin));
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, (" - end: %.2f", interval->end));
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, (" - simple dur: %.2f - active dur: %.2f\n",interval->simple_duration, interval->active_duration));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - ", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, (current ? "Current " : " Next "));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("Interval - "));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("begin: %.2f", interval->begin));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, (" - end: %.2f", interval->end));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, (" - simple dur: %.2f - active dur: %.2f\n",interval->simple_duration, interval->active_duration));
 }
 
 /* Computes the active duration for the given interval,
@@ -227,7 +227,7 @@
 	if ((0) && rti->current_interval->end == -2) {
 		/* TODO: check if the interval can be discarded (i.e. if end is specified with an invalid end value (return -2)),
 		 probably yes, but next time we call the evaluation of interval, we should call get_first_interval */
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Wrong Interval\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Wrong Interval\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 		rti->current_interval->begin = -1;
 		rti->current_interval->end = -1;
 		return;
@@ -260,7 +260,7 @@
 		gf_smil_timing_get_interval_end(rti, interval);
 		if (interval->end == -2) {
 			/* this is a wrong interval see first animation in animate-elem-201-t.svg */
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Wrong Interval\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Wrong Interval\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 			interval->begin = -1;
 			interval->end = -1;
 			return 0;
@@ -358,12 +358,12 @@
 
 	GF_SAFEALLOC(rti, SMIL_Timing_RTI)
 	if (!rti) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, ("[SMIL Timing] Failed to alloc SMIL timing RTI\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[SMIL Timing] Failed to alloc SMIL timing RTI\n"));
 		return;
 	}
 	timingp->runtime = rti;
 	rti->timed_elt = timed_elt;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Initialization\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Initialization\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 
 	rti->timingp = timingp;
 	rti->status = SMIL_STATUS_WAITING_TO_BEGIN;
@@ -375,13 +375,13 @@
 
 	GF_SAFEALLOC(rti->current_interval, SMIL_Interval);
 	if (!rti->current_interval) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, ("[SMIL Timing] Failed to alloc SMIL timing current interval\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[SMIL Timing] Failed to alloc SMIL timing current interval\n"));
 		return;
 	}
 	gf_smil_timing_get_first_interval(rti);
 	GF_SAFEALLOC(rti->next_interval, SMIL_Interval);
 	if (!rti->next_interval) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, ("[SMIL Timing] Failed to alloc SMIL timing next interval\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[SMIL Timing] Failed to alloc SMIL timing next interval\n"));
 		return;
 	}
 	gf_smil_timing_get_next_interval(rti, 0, rti->next_interval, rti->current_interval->begin);
@@ -420,7 +420,7 @@
 
 	if (!rti || !timed_elt) return;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Destruction\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Destruction\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 	gf_free(rti->current_interval);
 	gf_free(rti->next_interval);
 
@@ -560,7 +560,7 @@
 
 	if (begin->clock > scene_time) return 0;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SVG Composer] discarding element %s at time %f\n", target ? gf_node_get_log_name(target) : "None", scene_time));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SVG Composer] discarding element %s at time %f\n", target ? gf_node_get_log_name(target) : "None", scene_time));
 
 	gf_smil_mark_modified(rti, 1);
 
@@ -633,7 +633,7 @@
 		if (rti->current_interval->begin != -1 && rti->scene_time >= rti->current_interval->begin) {
 			/* if there is a computed interval with a definite begin value
 			 and if that value is lesser than the scene time, then the animation becomes active */
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Activating\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Activating\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 			rti->status = SMIL_STATUS_ACTIVE;
 
 			if (rti->timed_elt->sgprivate->tag==TAG_LSR_conditional) {
@@ -650,7 +650,7 @@
 			evt.smil_event_time = rti->current_interval->begin;
 			gf_dom_event_fire((GF_Node *)rti->timed_elt, &evt);
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Evaluating (Not starting)\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Evaluating (Not starting)\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 			ret = -2;
 			goto exit;
 		}
@@ -662,7 +662,7 @@
 		if (rti->current_interval->active_duration >= 0
 		 && rti->scene_time >= (rti->current_interval->begin + rti->current_interval->active_duration)) {
 force_end:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Stopping \n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Stopping \n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 
 			rti->normalized_simple_time = gf_smil_timing_get_normalized_simple_time(rti, rti->scene_time, NULL);
 			ret = rti->postpone;
@@ -670,14 +670,14 @@
 			if (timingp->fill && *timingp->fill == SMIL_FILL_FREEZE) {
 				rti->status = SMIL_STATUS_FROZEN;
 				rti->evaluate_status = SMIL_TIMING_EVAL_FREEZE;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Preparing to freeze\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Preparing to freeze\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 				if (!rti->postpone) {
 					rti->evaluate(rti, rti->normalized_simple_time, rti->evaluate_status);
 				}
 			} else {
 				rti->status = SMIL_STATUS_DONE;
 				rti->evaluate_status = SMIL_TIMING_EVAL_REMOVE;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Preparing to remove\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Preparing to remove\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 				if (!rti->postpone) {
 					rti->evaluate(rti, rti->normalized_simple_time, rti->evaluate_status);
 				}
@@ -692,7 +692,7 @@
 		} else { /* the animation is still active */
 
 			if (!timingp->restart || *timingp->restart == SMIL_RESTART_ALWAYS) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Checking for restart (always)\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Checking for restart (always)\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 
 				if (rti->next_interval->begin != -1 && rti->next_interval->begin < rti->scene_time) {
 					*rti->current_interval = *rti->next_interval;
@@ -718,11 +718,11 @@
 			cur_id = rti->current_interval->nb_iterations;
 			rti->normalized_simple_time = gf_smil_timing_get_normalized_simple_time(rti, rti->scene_time, &force_end);
 			if (force_end) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Forcing end (fill or remove)\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Forcing end (fill or remove)\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 				goto force_end;
 			}
 			if (cur_id < rti->current_interval->nb_iterations) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[SMIL Timing ] Time %f - Timed element %s - Preparing to repeat\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Preparing to repeat\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 				memset(&evt, 0, sizeof(evt));
 				evt.type = GF_EVENT_REPEAT_EVENT;
 				evt.smil_event_time = rti->current_interval->begin + rti->current_interval->nb_iterations*rti->current_interval->simple_duration;
@@ -731,7 +731,7 @@
 
 				rti->evaluate_status = SMIL_TIMING_EVAL_REPEAT;
 			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Preparing to update\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Preparing to update\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 				rti->evaluate_status = SMIL_TIMING_EVAL_UPDATE;
 			}
 
@@ -758,7 +758,7 @@
 	if ((rti->status == SMIL_STATUS_DONE) || (rti->status == SMIL_STATUS_FROZEN)) {
 		if (!timingp->restart || *timingp->restart != SMIL_RESTART_NEVER) {
 			/* Check changes in begin or end attributes */
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Checking for restart when not active\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Checking for restart when not active\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 			if (rti->next_interval->begin != -1) {
 				Bool restart_timing = 0;
 				/*next interval is right now*/
@@ -783,7 +783,7 @@
 				if (restart_timing) {
 					rti->status = SMIL_STATUS_WAITING_TO_BEGIN;
 					rti->evaluate_status = SMIL_TIMING_EVAL_NONE;
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Returning to eval none status\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Returning to eval none status\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 					ret = 0;
 					goto waiting_to_begin;
 				}
@@ -881,7 +881,7 @@
 		/* If the element does not define its simple duration, we assume it's blocked in final state
 		 Is this correct ? */
 		rti->current_interval->nb_iterations = 0;
-		//GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Error Computing Normalized Simple Time while simple duration is indefinite\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+		//GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Error Computing Normalized Simple Time while simple duration is indefinite\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 		return FIX_ONE;
 	}
 
@@ -908,7 +908,7 @@
 	rti = timingp->runtime;
 	if (!rti) return;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Modification\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Modification\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 	if (rti->current_interval->begin == -1) {
 		gf_smil_timing_get_next_interval(rti, 1, rti->current_interval, gf_node_get_scene_time((GF_Node*)rti->timed_elt));
 	} else {
@@ -917,7 +917,7 @@
 		if ((0) && rti->current_interval->end == -2) {
 			/* TODO: check if the interval can be discarded if end = -2,
 			 probably no, because the interval is currently running*/
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SMIL, ("[SMIL Timing ] Time %f - Timed element %s - Wrong Interval\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[SMIL Timing ] Time %f - Timed element %s - Wrong Interval\n", gf_node_get_scene_time((GF_Node *)rti->timed_elt), gf_node_get_log_name((GF_Node *)rti->timed_elt)));
 			rti->current_interval->begin = -1;
 			rti->current_interval->end = -1;
 			return;
@@ -970,7 +970,7 @@
 		SMIL_Time *t;
 		GF_SAFEALLOC(t, SMIL_Time);
 		if (!t) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, ("[SMIL Timing] Failed to alloc SMIL time for discard\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[SMIL Timing] Failed to alloc SMIL time for discard\n"));
 			return 0;
 		}
 		t->clock = 0;
@@ -992,7 +992,7 @@
 	GF_List *l;
 	GF_SAFEALLOC(begin, SMIL_Time);
 	if (!begin) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SMIL, ("[SMIL Timing] Failed to alloc SMIL begin value\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[SMIL Timing] Failed to alloc SMIL begin value\n"));
 		return;
 	}

gpac-1.0.1.tar.gz/src/scenegraph/svg_attributes.c -> gpac-2.0.0.tar.gz/src/scenegraph/svg_attributes.c Changed

@@ -2,7 +2,7 @@
 *					GPAC Multimedia Framework
 *
 *			Authors: Cyril Concolato, Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2004-2012
+ *			Copyright (c) Telecom ParisTech 2004-2022
 *					All rights reserved
 *
 * This file is part of GPAC / SVG Loader module
@@ -211,6 +211,7 @@
 
 };
 
+#ifdef WIN32
 /** In order to have the same representation of laser/svg media on unix and windows
 * we have to force windows to use the same rounding method as the glibc.
 * See: http://pubs.opengroup.org/onlinepubs/009695399/functions/fprintf.html
@@ -251,7 +252,6 @@
 	return value;
 };
 
-#ifdef WIN32
 #define _FIX2FLT(x) (round_float_hte(FIX2FLT(x),6))
 #else
 #define _FIX2FLT(x) FIX2FLT(x)
@@ -298,6 +298,7 @@
 static const struct predef_keyid {
 	GF_KeyCode key_code;
 	const char *name;
+	const char *friendly_name;
 } predefined_key_identifiers[] =
 {
 	{ GF_KEY_ACCEPT, "Accept" },
@@ -406,78 +407,78 @@
 	{ GF_KEY_VOLUMEUP, "VolumeUp" },
 	{ GF_KEY_WIN, "Win" },
 	{ GF_KEY_ZOOM, "Zoom" },
-	{ GF_KEY_BACKSPACE, "U+0008" },
-	{ GF_KEY_TAB, "U+0009" },
-	{ GF_KEY_CANCEL, "U+0018" },
-	{ GF_KEY_ESCAPE, "U+001B" },
-	{ GF_KEY_SPACE, "U+0020" },
-	{ GF_KEY_EXCLAMATION, "U+0021" },
-	{ GF_KEY_QUOTATION, "U+0022" },
-	{ GF_KEY_NUMBER, "U+0023" },
-	{ GF_KEY_DOLLAR, "U+0024" },
-	{ GF_KEY_AMPERSAND, "U+0026" },
-	{ GF_KEY_APOSTROPHE, "U+0027" },
-	{ GF_KEY_LEFTPARENTHESIS, "U+0028" },
-	{ GF_KEY_RIGHTPARENTHESIS, "U+0029" },
-	{ GF_KEY_STAR, "U+002A" },
-	{ GF_KEY_PLUS, "U+002B" },
-	{ GF_KEY_COMMA, "U+002C" },
-	{ GF_KEY_HYPHEN, "U+002D" },
-	{ GF_KEY_FULLSTOP, "U+002E" },
-	{ GF_KEY_SLASH, "U+002F" },
-	{ GF_KEY_0, "U+0030" },
-	{ GF_KEY_1, "U+0031" },
-	{ GF_KEY_2, "U+0032" },
-	{ GF_KEY_3, "U+0033" },
-	{ GF_KEY_4, "U+0034" },
-	{ GF_KEY_5, "U+0035" },
-	{ GF_KEY_6, "U+0036" },
-	{ GF_KEY_7, "U+0037" },
-	{ GF_KEY_8, "U+0038" },
-	{ GF_KEY_9, "U+0039" },
-	{ GF_KEY_COLON, "U+003A" },
-	{ GF_KEY_SEMICOLON, "U+003B" },
-	{ GF_KEY_LESSTHAN, "U+003C" },
-	{ GF_KEY_EQUALS, "U+003D" },
-	{ GF_KEY_GREATERTHAN, "U+003E" },
-	{ GF_KEY_QUESTION, "U+003F" },
-	{ GF_KEY_AT, "U+0040" },
-	{ GF_KEY_A, "U+0041" },
-	{ GF_KEY_B, "U+0042" },
-	{ GF_KEY_C, "U+0043" },
-	{ GF_KEY_D, "U+0044" },
-	{ GF_KEY_E, "U+0045" },
-	{ GF_KEY_F, "U+0046" },
-	{ GF_KEY_G, "U+0047" },
-	{ GF_KEY_H, "U+0048" },
-	{ GF_KEY_I, "U+0049" },
-	{ GF_KEY_J, "U+004A" },
-	{ GF_KEY_K, "U+004B" },
-	{ GF_KEY_L, "U+004C" },
-	{ GF_KEY_M, "U+004D" },
-	{ GF_KEY_N, "U+004E" },
-	{ GF_KEY_O, "U+004F" },
-	{ GF_KEY_P, "U+0050" },
-	{ GF_KEY_Q, "U+0051" },
-	{ GF_KEY_R, "U+0052" },
-	{ GF_KEY_S, "U+0053" },
-	{ GF_KEY_T, "U+0054" },
-	{ GF_KEY_U, "U+0055" },
-	{ GF_KEY_V, "U+0056" },
-	{ GF_KEY_W, "U+0057" },
-	{ GF_KEY_X, "U+0058" },
-	{ GF_KEY_Y, "U+0059" },
-	{ GF_KEY_Z, "U+005A" },
-	{ GF_KEY_LEFTSQUAREBRACKET, "U+005B" },
-	{ GF_KEY_BACKSLASH, "U+005C" },
-	{ GF_KEY_RIGHTSQUAREBRACKET, "U+005D" },
-	{ GF_KEY_CIRCUM, "U+005E" },
-	{ GF_KEY_UNDERSCORE, "U+005F" },
-	{ GF_KEY_GRAVEACCENT, "U+0060" },
-	{ GF_KEY_LEFTCURLYBRACKET, "U+007B" },
-	{ GF_KEY_PIPE, "U+007C" },
-	{ GF_KEY_RIGHTCURLYBRACKET, "U+007D" },
-	{ GF_KEY_DEL, "U+007F" },
+	{ GF_KEY_BACKSPACE, "U+0008", "backspace" },
+	{ GF_KEY_TAB, "U+0009", "tab" },
+	{ GF_KEY_CANCEL, "U+0018", "cancel" },
+	{ GF_KEY_ESCAPE, "U+001B", "esc" },
+	{ GF_KEY_SPACE, "U+0020", "space" },
+	{ GF_KEY_EXCLAMATION, "U+0021", "!" },
+	{ GF_KEY_QUOTATION, "U+0022", "\"" },
+	{ GF_KEY_NUMBER, "U+0023", "#" },
+	{ GF_KEY_DOLLAR, "U+0024", "$" },
+	{ GF_KEY_AMPERSAND, "U+0026", "&" },
+	{ GF_KEY_APOSTROPHE, "U+0027", "'" },
+	{ GF_KEY_LEFTPARENTHESIS, "U+0028", "(" },
+	{ GF_KEY_RIGHTPARENTHESIS, "U+0029", ")" },
+	{ GF_KEY_STAR, "U+002A", "*" },
+	{ GF_KEY_PLUS, "U+002B", "+" },
+	{ GF_KEY_COMMA, "U+002C", "," },
+	{ GF_KEY_HYPHEN, "U+002D", "-" },
+	{ GF_KEY_FULLSTOP, "U+002E", "." },
+	{ GF_KEY_SLASH, "U+002F", "/" },
+	{ GF_KEY_0, "U+0030", "0" },
+	{ GF_KEY_1, "U+0031", "1" },
+	{ GF_KEY_2, "U+0032", "2" },
+	{ GF_KEY_3, "U+0033", "3" },
+	{ GF_KEY_4, "U+0034", "4" },
+	{ GF_KEY_5, "U+0035", "5" },
+	{ GF_KEY_6, "U+0036", "6" },
+	{ GF_KEY_7, "U+0037", "7" },
+	{ GF_KEY_8, "U+0038", "8" },
+	{ GF_KEY_9, "U+0039", "9" },
+	{ GF_KEY_COLON, "U+003A", ":" },
+	{ GF_KEY_SEMICOLON, "U+003B", ";" },
+	{ GF_KEY_LESSTHAN, "U+003C", "<" },
+	{ GF_KEY_EQUALS, "U+003D", "=" },
+	{ GF_KEY_GREATERTHAN, "U+003E", ">" },
+	{ GF_KEY_QUESTION, "U+003F", "?" },
+	{ GF_KEY_AT, "U+0040", "@" },
+	{ GF_KEY_A, "U+0041", "A" },
+	{ GF_KEY_B, "U+0042", "B" },
+	{ GF_KEY_C, "U+0043", "C" },
+	{ GF_KEY_D, "U+0044", "D" },
+	{ GF_KEY_E, "U+0045", "E" },
+	{ GF_KEY_F, "U+0046", "F" },
+	{ GF_KEY_G, "U+0047", "G" },
+	{ GF_KEY_H, "U+0048", "H" },
+	{ GF_KEY_I, "U+0049", "I" },
+	{ GF_KEY_J, "U+004A", "J" },
+	{ GF_KEY_K, "U+004B", "K" },
+	{ GF_KEY_L, "U+004C", "L" },
+	{ GF_KEY_M, "U+004D", "M" },
+	{ GF_KEY_N, "U+004E", "N" },
+	{ GF_KEY_O, "U+004F", "O" },
+	{ GF_KEY_P, "U+0050", "P" },
+	{ GF_KEY_Q, "U+0051", "Q" },
+	{ GF_KEY_R, "U+0052", "R" },
+	{ GF_KEY_S, "U+0053", "S" },
+	{ GF_KEY_T, "U+0054", "T" },
+	{ GF_KEY_U, "U+0055", "U" },
+	{ GF_KEY_V, "U+0056", "V" },
+	{ GF_KEY_W, "U+0057", "W" },
+	{ GF_KEY_X, "U+0058", "X" },
+	{ GF_KEY_Y, "U+0059", "Y" },
+	{ GF_KEY_Z, "U+005A", "Z" },
+	{ GF_KEY_LEFTSQUAREBRACKET, "U+005B", "[" },
+	{ GF_KEY_BACKSLASH, "U+005C", "\\" },
+	{ GF_KEY_RIGHTSQUAREBRACKET, "U+005D", "]" },
+	{ GF_KEY_CIRCUM, "U+005E", "^" },
+	{ GF_KEY_UNDERSCORE, "U+005F", "_" },
+	{ GF_KEY_GRAVEACCENT, "U+0060", "`" },
+	{ GF_KEY_LEFTCURLYBRACKET, "U+007B", "{" },
+	{ GF_KEY_PIPE, "U+007C", "|" },
+	{ GF_KEY_RIGHTCURLYBRACKET, "U+007D", "}" },
+	{ GF_KEY_DEL, "U+007F", "del" },
 	{ GF_KEY_INVERTEXCLAMATION, "U+00A1" },
 	{ GF_KEY_DEADGRAVE, "U+0300" },
 	{ GF_KEY_DEADEACUTE, "U+0301" },
@@ -493,7 +494,7 @@
 	{ GF_KEY_DEADCEDILLA, "U+0327" },
 	{ GF_KEY_DEADOGONEK, "U+0328" },
 	{ GF_KEY_DEADIOTA, "U+0345" },
-	{ GF_KEY_EURO, "U+20AC" },
+	{ GF_KEY_EURO, "U+20AC"},
 	{ GF_KEY_DEADVOICESOUND, "U+3099" },
 	{ GF_KEY_DEADSEMIVOICESOUND, "U+309A" },
 	{ GF_KEY_CHANNELUP, "ChannelUp" },
@@ -516,6 +517,15 @@
 	if (!key_identifier || count<= (u32) key_identifier) return "Unknown";
 	return predefined_key_identifiers[key_identifier-1].name;
 }
+GF_EXPORT
+const char *gf_dom_get_friendly_name(GF_KeyCode key_identifier)
+{
+	u32 count = sizeof(predefined_key_identifiers) / sizeof(struct predef_keyid);
+	if (!key_identifier || count<= (u32) key_identifier) return "Unknown";
+	if (predefined_key_identifiers[key_identifier-1].friendly_name)
+		return predefined_key_identifiers[key_identifier-1].friendly_name;
+	return predefined_key_identifiers[key_identifier-1].name;
+}
 
 
 GF_EXPORT
@@ -3037,6 +3047,19 @@
 	}
 }
 
+static void svg_parse_clippath(GF_Node *e, SVG_ClipPath *o, char *attribute_content)
+{
+	if (o->target.string) gf_free(o->target.string);
+	o->target.string = NULL;
+	o->target.target = NULL;
+
+	if (!strnicmp(attribute_content, "url(", 4)) {
+		char *sep = strrchr(attribute_content, ')');
+		if (sep) sep[0] = 0;
+		svg_parse_iri(e, &o->target, attribute_content+4);
+		if (sep) sep[0] = ')';
+	}
+}
 /* end of Basic SVG datatype parsing functions */
 
 void svg_parse_one_anim_value(GF_Node *n, SMIL_AnimateValue *anim_value, char *attribute_content, u8 anim_value_type)
@@ -3248,7 +3271,6 @@
 	case SVG_Focusable_datatype:
 		svg_parse_focusable((SVG_Focusable*)info->far_ptr, attribute_content);
 		break;
-
 	case SVG_InitialVisibility_datatype:
 		svg_parse_initialvisibility((SVG_InitialVisibility*)info->far_ptr, attribute_content);
 		break;
@@ -3432,6 +3454,10 @@
 	case SVG_Focus_datatype:
 		svg_parse_focus(n, (SVG_Focus*)info->far_ptr, attribute_content);
 		break;
+	case SVG_ClipPath_datatype:
+		svg_parse_clippath(n, (SVG_ClipPath*)info->far_ptr, attribute_content);
+		break;
+
 	case LASeR_Choice_datatype:
 		laser_parse_choice((LASeR_Choice*)info->far_ptr, attribute_content);
 		break;
@@ -3728,6 +3754,12 @@
 		GF_SAFEALLOC(foc, SVG_Focus)
 		return foc;
 	}
+	case SVG_ClipPath_datatype:
+	{
+		SVG_ClipPath *cp;
+		GF_SAFEALLOC(cp, SVG_ClipPath)
+		return cp;
+	}
 	case SMIL_AttributeName_datatype:
 	{
 		SMIL_AttributeName *an;
@@ -4548,7 +4580,7 @@
 	case SVG_FontFamily_datatype:
 	{
 		SVG_FontFamily *f = (SVG_FontFamily *)info->far_ptr;
-		return gf_strdup( (f->type==SVG_FONTFAMILY_INHERIT) ? "inherit" : (const char *) f->value);
+		return gf_strdup( (!f->value || (f->type==SVG_FONTFAMILY_INHERIT)) ? "inherit" : (const char *) f->value);
 	}
 
 	case SVG_PreserveAspectRatio_datatype:
@@ -4594,6 +4626,12 @@
 			return gf_strdup(tmp);
 		}
 	}
+	case SVG_ClipPath_datatype:
+	{
+		SVG_ClipPath *cp = (SVG_ClipPath *)info->far_ptr;
+		sprintf(tmp, "url(#%s)", cp->target.string);
+		return gf_strdup(tmp);
+	}
 	break;
 	case SVG_Focusable_datatype:
 	{
@@ -4886,7 +4924,7 @@
 	case SVG_PointerEvents_datatype:
 		break;
 	case XMLRI_List_datatype:
-		return gf_strdup( (char *) info->far_ptr);
+		return gf_strdup(info->far_ptr ? (char *) info->far_ptr : "");
 
 	case SVG_Points_datatype:
 	{
@@ -5295,6 +5333,14 @@
 	}
 	break;
 
+	case SVG_ClipPath_datatype:
+	{
+		SVG_ClipPath *cp1 = (SVG_ClipPath *) f1->far_ptr;
+		SVG_ClipPath *cp2 = (SVG_ClipPath *)f2->far_ptr;
+		return (cp1->target.string && cp2->target.string && !strcmp(cp1->target.string, cp2->target.string)) ? 1 : 0;
+	}
+	break;
+
 	case DOM_StringList_datatype:
 	{
 		GF_List *l1 = *(GF_List **) f1->far_ptr;
@@ -5403,7 +5449,7 @@
 		return 1;
 	}
 	default:
-		GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[SVG Attributes] comparaison for field %s of type %s not supported\n", f1->name ? f1->name : "unknown", gf_svg_attribute_type_to_string(f1->fieldType)));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_SCENE, ("[SVG Attributes] comparaison for field %s of type %s not supported\n", f1->name ? f1->name : "unknown", gf_svg_attribute_type_to_string(f1->fieldType)));
 		return 0;
 	}
 }
@@ -5418,7 +5464,7 @@
 static GF_Err svg_color_muladd(Fixed alpha, SVG_Color *a, Fixed beta, SVG_Color *b, SVG_Color *c, Bool clamp)
 {
 	if (a->type != SVG_COLOR_RGBCOLOR || b->type != SVG_COLOR_RGBCOLOR) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] only RGB colors are additive\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] only RGB colors are additive\n"));
 		return GF_BAD_PARAM;
 	}
 	c->type = SVG_COLOR_RGBCOLOR;
@@ -5433,11 +5479,11 @@
 {
 	if (!a || !b || !c) return GF_BAD_PARAM;
 	if (a->type != b->type) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] cannot add lengths of mismatching types\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] cannot add lengths of mismatching types\n"));
 		return GF_BAD_PARAM;
 	}
 	if (a->type == SVG_NUMBER_INHERIT || a->type == SVG_NUMBER_AUTO) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] cannot add lengths\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] cannot add lengths\n"));
 		return GF_BAD_PARAM;
 	}
 	c->value = gf_mulfix(alpha, a->value) + gf_mulfix(beta, b->value);
@@ -5704,9 +5750,11 @@
 	a->type = b->type;
 	a->array.count = b->array.count;
 	a->array.units = (u8*)gf_malloc(sizeof(u8)*a->array.count);
-	memcpy(a->array.units, b->array.units, sizeof(u8)*a->array.count);
+	if (a->array.count)
+		memcpy(a->array.units, b->array.units, sizeof(u8)*a->array.count);
 	a->array.vals = (Fixed*)gf_malloc(sizeof(Fixed)*a->array.count);
-	memcpy(a->array.vals, b->array.vals, sizeof(Fixed)*a->array.count);
+	if (a->array.count)
+		memcpy(a->array.vals, b->array.vals, sizeof(Fixed)*a->array.count);
 	return GF_OK;
 }
 
@@ -5736,19 +5784,12 @@
 		c->m[4] = a->m[4];
 		c->m[5] = gf_mulfix(alpha, a->m[5]) + gf_mulfix(beta, b->m[5]);
 	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] matrix operations not supported\n"));
 		return GF_BAD_PARAM;
 	}
 	return GF_OK;
 }
 
-static GF_Err laser_size_muladd(Fixed alpha, LASeR_Size *sza, Fixed beta, LASeR_Size *szb, LASeR_Size *szc)
-{
-	szc->width = gf_mulfix(alpha, sza->width) + gf_mulfix(beta, szb->width);
-	szc->height = gf_mulfix(alpha, sza->height) + gf_mulfix(beta, szb->height);
-	return GF_OK;
-}
-
 /* c = alpha * a + beta * b */
 GF_Err gf_svg_attributes_muladd(Fixed alpha, GF_FieldInfo *a,
 Fixed beta, GF_FieldInfo *b,
@@ -5783,7 +5824,7 @@
 		SVG_Paint *pb = (SVG_Paint *)b->far_ptr;
 		SVG_Paint *pc = (SVG_Paint *)c->far_ptr;
 		if (pa->type != pb->type || pa->type != SVG_PAINT_COLOR || pb->type != SVG_PAINT_COLOR) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] only color paints are additive\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] only color paints are additive\n"));
 			return GF_BAD_PARAM;
 		}
 		pc->type = SVG_PAINT_COLOR;
@@ -5823,7 +5864,7 @@
 			if (ta->is_ref == tb->is_ref) {
 				return svg_matrix_muladd(alpha, &ta->mat, beta, &tb->mat, &tc->mat);
 			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] matrix operations not supported\n"));
 				return GF_NOT_SUPPORTED;
 			}
 		} else {
@@ -5832,7 +5873,7 @@
 			/*TOCHECK what is this test*/
 			/*
 						if (alpha != FIX_ONE) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
+							GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] matrix operations not supported\n"));
 							return GF_NOT_SUPPORTED;
 						}
 			*/
@@ -5854,7 +5895,7 @@
 				gf_mx2d_add_skew_y(&tmp, gf_mulfix(*(Fixed*)b->far_ptr, beta));
 				break;
 			default:
-				GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] copy of attributes %s not supported\n", a->name));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] copy of attributes %s not supported\n", a->name));
 				return GF_NOT_SUPPORTED;
 			}
 			gf_mx2d_add_matrix(&tmp, &((SVG_Transform*)a->far_ptr)->mat);
@@ -5866,7 +5907,7 @@
 		if (b->fieldType == SVG_Transform_Translate_datatype) {
 			return svg_point_muladd(alpha, (SVG_Point*)a->far_ptr, beta, (SVG_Point*)b->far_ptr, (SVG_Point*)c->far_ptr);
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] matrix operations not supported\n"));
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -5883,7 +5924,7 @@
 				return svg_point_muladd(alpha, (SVG_Point*)a->far_ptr, beta, (SVG_Point*)b->far_ptr, (SVG_Point*)c->far_ptr);
 			}
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] matrix operations not supported\n"));
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -5891,7 +5932,7 @@
 		if (b->fieldType == SVG_Transform_Rotate_datatype) {
 			return svg_point_angle_muladd(alpha, (SVG_Point_Angle*)a->far_ptr, beta, (SVG_Point_Angle*)b->far_ptr, (SVG_Point_Angle*)c->far_ptr);
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] matrix operations not supported\n"));
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -5900,7 +5941,7 @@
 			*(Fixed*)c->far_ptr = gf_mulfix(alpha, *(Fixed*)a->far_ptr) + gf_mulfix(beta, *(Fixed*)b->far_ptr);
 			return GF_OK;
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] matrix operations not supported\n"));
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -5909,7 +5950,7 @@
 			*(Fixed*)c->far_ptr = gf_mulfix(alpha, *(Fixed*)a->far_ptr) + gf_mulfix(beta, *(Fixed*)b->far_ptr);
 			return GF_OK;
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] matrix operations not supported\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] matrix operations not supported\n"));
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -5934,7 +5975,13 @@
 	}
 	break;
 	case LASeR_Size_datatype:
-		laser_size_muladd(alpha, (LASeR_Size*)a->far_ptr, beta, (LASeR_Size*)b->far_ptr, (LASeR_Size*)c->far_ptr);
+	{
+		LASeR_Size *sza = (LASeR_Size*)a->far_ptr;
+		LASeR_Size *szb = (LASeR_Size*)b->far_ptr;
+		LASeR_Size *szc = (LASeR_Size*)c->far_ptr;
+		szc->width = gf_mulfix(alpha, sza->width) + gf_mulfix(beta, szb->width);
+		szc->height = gf_mulfix(alpha, sza->height) + gf_mulfix(beta, szb->height);
+	}
 		break;
 
 	/* Keyword types */
@@ -5994,8 +6041,9 @@
 	case SMIL_Times_datatype:
 	case SMIL_Duration_datatype:
 	case SMIL_RepeatCount_datatype:
+	case SVG_ClipPath_datatype:
 	default:
-		GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[SVG Attributes] addition for attributes %s of type %s not supported\n", a->name, gf_svg_attribute_type_to_string(a->fieldType)));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_SCENE, ("[SVG Attributes] addition for attributes %s of type %s not supported\n", a->name, gf_svg_attribute_type_to_string(a->fieldType)));
 		return GF_NOT_SUPPORTED;
 	}
 	return GF_OK;
@@ -6085,7 +6133,7 @@
 			gf_mx2d_copy(((SVG_Transform *)a->far_ptr)->mat, ((SVG_Transform *)b->far_ptr)->mat);
 			break;
 		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[SVG Attributes] forbidden type of transform\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[SVG Attributes] forbidden type of transform\n"));
 			return GF_NOT_SUPPORTED;
 		}
 		return GF_OK;
@@ -6170,7 +6218,15 @@
 		if ( ((SVG_Focus *)b->far_ptr)->target.string)
 			((SVG_Focus *)a->far_ptr)->target.string = gf_strdup( ((SVG_Focus *)b->far_ptr)->target.string);
 	}
-	return GF_OK;
+		return GF_OK;
+
+	case SVG_ClipPath_datatype:
+		if ( ((SVG_ClipPath *)b->far_ptr)->target.string) {
+			if (((SVG_ClipPath *)a->far_ptr)->target.string)
+				gf_free(((SVG_ClipPath *)a->far_ptr)->target.string);
+			((SVG_ClipPath *)a->far_ptr)->target.string = gf_strdup( ((SVG_ClipPath *)b->far_ptr)->target.string);
+		}
+		return GF_OK;
 
 	case SMIL_Times_datatype:
 	{
@@ -6237,7 +6293,7 @@
 	case SMIL_AnimateValues_datatype:
 	case SMIL_RepeatCount_datatype:
 	default:
-		GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[SVG Attributes] copy of attributes %s of type %s not supported\n", a->name, gf_svg_attribute_type_to_string(a->fieldType)));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_SCENE, ("[SVG Attributes] copy of attributes %s of type %s not supported\n", a->name, gf_svg_attribute_type_to_string(a->fieldType)));
 		return GF_OK;
 	}
 	return GF_OK;
@@ -6375,7 +6431,7 @@
 	case SMIL_Duration_datatype:
 	case SMIL_RepeatCount_datatype:
 	default:
-		GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[SVG Attributes] interpolation for attributes %s of type %s not supported\n", a->name, gf_svg_attribute_type_to_string(a->fieldType)));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_SCENE, ("[SVG Attributes] interpolation for attributes %s of type %s not supported\n", a->name, gf_svg_attribute_type_to_string(a->fieldType)));
 		return GF_OK;
 	}
 	return GF_OK;
@@ -6540,6 +6596,8 @@
 		return "GradientOffset";
 	case SVG_Focus_datatype	:
 		return "Focus";
+	case SVG_ClipPath_datatype	:
+		return "ClipPath";
 	case SVG_Clock_datatype	:
 		return "Clock";
 	case DOM_String_datatype	:

gpac-1.0.1.tar.gz/src/scenegraph/svg_js.c -> gpac-2.0.0.tar.gz/src/scenegraph/svg_js.c Changed

@@ -123,10 +123,8 @@
 {
 	if (svg_js->handler_execute(hdl, event, observer, (char *) iri)) {
 		return;
-	} else {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[DOM Events] Error executing JavaScript event handler\n"));
-		return;
 	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[DOM Events] Error executing JavaScript event handler\n"));
 }
 static Bool svg_script_execute_handler(GF_Node *node, GF_DOM_Event *event, GF_Node *observer, char *utf8_script);
 
@@ -194,12 +192,14 @@
 	GF_JSAPIParam par;
 	GF_SceneGraph *sg = JS_GetOpaque(obj, svg_globalClass.class_id);
 	if ((argc!=1) || !sg)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	par.uri.url = (char *) JS_ToCString(c, argv[0]);
 	par.uri.nb_params = 0;
-	ScriptAction(sg, GF_JSAPI_OP_LOAD_URL, sg->RootNode, &par);
-	JS_FreeCString(c, par.uri.url);
+	if (par.uri.url) {
+		ScriptAction(sg, GF_JSAPI_OP_LOAD_URL, sg->RootNode, &par);
+		JS_FreeCString(c, par.uri.url);
+	}
 	return JS_UNDEFINED;
 }
 
@@ -210,13 +210,15 @@
 	GF_Node *node;
 	const char *str;
 
-	if (!JS_IsObject(argv[1])) {
+	if ((argc<2) || !JS_IsObject(argv[1])) {
 		return js_throw_err(c, GF_DOM_EXC_WRONG_DOCUMENT_ERR);
 	}
 
+	sg = dom_get_doc(c, argv[1]);
+	if (!sg) return js_throw_err(c, GF_DOM_EXC_WRONG_DOCUMENT_ERR);
+
 	str = JS_ToCString(c, argv[0]);
 	if (!str) return JS_TRUE;
-	sg = dom_get_doc(c, argv[1]);
 
 	node = gf_sm_load_svg_from_string(sg, (char *) str);
 	JS_FreeCString(c, str);
@@ -259,7 +261,7 @@
 static JSValue global_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_SceneGraph *sg = JS_GetOpaque(obj, svg_globalClass.class_id);
-	if (!sg) return JS_EXCEPTION;
+	if (!sg) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	/*namespaceURI*/
@@ -326,7 +328,7 @@
 static JSValue svg_doc_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_EXCEPTION;
+	if (!sg) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case 0:/*global*/
 		return JS_GetGlobalObject(c);
@@ -350,19 +352,19 @@
 		return JS_NULL;
 	}
 	case 5:/*currentScale*/
-		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_EXCEPTION;
+		if (n->sgprivate->tag!=TAG_SVG_svg) return GF_JS_EXCEPTION(c);
 		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_SCALE, (GF_Node *)n, &par)) {
 			return JS_NewFloat64(c, FIX2FLT(par.val) );
 		}
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	case 6:/*currentRotate*/
-		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_EXCEPTION;
+		if (n->sgprivate->tag!=TAG_SVG_svg) return GF_JS_EXCEPTION(c);
 		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_ROTATION, (GF_Node *)n, &par)) {
 			return JS_NewFloat64(c, FIX2FLT(par.val) );
 		}
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	case 7:/*currentTranslate*/
-		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_EXCEPTION;
+		if (n->sgprivate->tag!=TAG_SVG_svg) return GF_JS_EXCEPTION(c);
 		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_TRANSLATE, (GF_Node *)n, &par)) {
 			JSValue r = JS_NewObjectClass(c, pointClass.class_id);
 			pointCI *rc = (pointCI *)gf_malloc(sizeof(pointCI));
@@ -372,9 +374,9 @@
 			JS_SetOpaque(r, rc);
 			return r;
 		}
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	case 8:/*viewport*/
-		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_EXCEPTION;
+		if (n->sgprivate->tag!=TAG_SVG_svg) return GF_JS_EXCEPTION(c);
 		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_VIEWPORT, (GF_Node *)n, &par)) {
 			JSValue r = JS_NewObjectClass(c, rectClass.class_id);
 			rectCI *rc = (rectCI *)gf_malloc(sizeof(rectCI));
@@ -386,7 +388,7 @@
 			JS_SetOpaque(r, rc);
 			return r;
 		}
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	case 9:/*currentTime*/
 		return JS_NewFloat64(c, gf_node_get_scene_time((GF_Node *)n) );
 	case 10:/*isPaused*/
@@ -422,7 +424,7 @@
 	GF_JSAPIParam par;
 	Double d;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case 0:/*id*/
@@ -448,7 +450,7 @@
 		/*currentScale*/
 	case 5:
 		if ((n->sgprivate->tag!=TAG_SVG_svg) || JS_ToFloat64(c, &d, value))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 
 		par.val = FLT2FIX(d);
 		if (!par.val) {
@@ -461,7 +463,7 @@
 		/*currentRotate*/
 	case 6:
 		if ((n->sgprivate->tag!=TAG_SVG_svg) || JS_ToFloat64(c, &d, value))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 
 		par.val = FLT2FIX(d);
 		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_ROTATION, (GF_Node *)n, &par)) {
@@ -471,7 +473,7 @@
 		/*currentTime*/
 	case 9:
 		if ((n->sgprivate->tag!=TAG_SVG_svg) || JS_ToFloat64(c, &d, value))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 
 		par.time = d;
 		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_TIME, (GF_Node *)n, &par)) {
@@ -524,7 +526,7 @@
 		info.far_ptr = ((SVGTimedAnimBaseElement *)n)->timingp->begin;
 	}
 	if (!info.far_ptr) {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	times = *((GF_List **)info.far_ptr);
 	GF_SAFEALLOC(newtime, SMIL_Time);
@@ -570,7 +572,7 @@
 {
 	u32 tag;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	tag = gf_node_get_tag(n);
 	if (gf_svg_is_animation_tag(tag)) {
@@ -590,7 +592,7 @@
 {
 	u32 tag;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	tag = gf_node_get_tag(n);
 	if (gf_svg_is_animation_tag(tag)) {
@@ -610,7 +612,7 @@
 {
 	u32 tag;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	tag = gf_node_get_tag(n);
 	if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
@@ -628,7 +630,7 @@
 	GF_Node *n = dom_get_element(c, obj);
 
 	if (!n || !argc || JS_ToFloat64(c, &speed, argv[0]) ) {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	tag = gf_node_get_tag(n);
 	if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
@@ -650,7 +652,7 @@
 	JSValue ret;
 	GF_FieldInfo info;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	//ns = NULL;
 	name = NULL;
@@ -660,11 +662,11 @@
 		name = JS_ToCString(c, argv[1]);
 	} else if (argc==1) {
 		name = JS_ToCString(c, argv[0]);
-	} else return JS_EXCEPTION;
+	} else return GF_JS_EXCEPTION(c);
 
 	if (!name) {
 		//JS_FreeCString(c, ns);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	if (!strcmp(name, "#text")) {
 		char *res = gf_dom_flatten_textContent(n);
@@ -679,7 +681,7 @@
 	//JS_FreeCString(c, ns);
 	JS_FreeCString(c, name);
 
-	if (e!=GF_OK) return JS_EXCEPTION;
+	if (e!=GF_OK) return GF_JS_EXCEPTION(c);
 
 	switch (info.fieldType) {
 	/* inheritable floats */
@@ -734,6 +736,7 @@
 	case SVG_ContentType_datatype:
 	case SVG_LanguageID_datatype:
 	case SVG_Focus_datatype:
+	case SVG_ClipPath_datatype:
 	case SVG_ID_datatype:
 	case SVG_GradientOffset_datatype:
 		/*end of DOM string traits*/
@@ -765,7 +768,7 @@
 	case SMIL_RepeatCount_datatype:
 	default:
 		/*end unimplemented/unnkown/FIXME traits*/
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 #endif
 	}
 	return JS_NULL;
@@ -777,15 +780,15 @@
 	GF_FieldInfo info;
 	GF_Err e;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	if ((argc!=1) || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
 	szName = JS_ToCString(c, argv[0]);
-	if (!szName) return JS_EXCEPTION;
+	if (!szName) return GF_JS_EXCEPTION(c);
 
 	e = gf_node_get_attribute_by_name(n, (char *) szName, 0, GF_TRUE, GF_TRUE, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	switch (info.fieldType) {
 	/* inheritable floats */
@@ -812,18 +815,18 @@
 	GF_FieldInfo info;
 	GF_Err e;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	if ((argc!=1) || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
 	szName = JS_ToCString(c, argv[0]);
 
 	e = gf_node_get_field_by_name(n, (char *) szName, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	if (info.fieldType==SVG_Transform_datatype) {
 		GF_Matrix2D *mx = (GF_Matrix2D *)gf_malloc(sizeof(GF_Matrix2D));
-		if (!mx) return JS_EXCEPTION;
+		if (!mx) return GF_JS_EXCEPTION(c);
 		JSValue mO = JS_NewObjectClass(c, matrixClass.class_id);
 		gf_mx2d_init(*mx);
 		gf_mx2d_copy(*mx, ((SVG_Transform*)info.far_ptr)->mat);
@@ -840,14 +843,14 @@
 	GF_FieldInfo info;
 	GF_Err e;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	if ((argc!=1) || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
 	szName = JS_ToCString(c, argv[0]);
 
 	e = gf_node_get_field_by_name(n, (char *) szName, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	if (info.fieldType==SVG_ViewBox_datatype) {
 		JSValue newObj;
@@ -874,14 +877,14 @@
 	GF_FieldInfo info;
 	GF_Err e;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	if ((argc!=1) || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
 	szName = JS_ToCString(c, argv[0]);
 
 	e = gf_node_get_field_by_name(n, (char *) szName, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	if (info.fieldType==SVG_PathData_datatype) {
 		return svg_new_path_object(c, (SVG_PathData *)info.far_ptr);
@@ -898,14 +901,14 @@
 	JSValue newObj;
 
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	if ((argc!=1) || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
 	szName = JS_ToCString(c, argv[0]);
 
 	e = gf_node_get_field_by_name(n, (char *) szName, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	switch (info.fieldType) {
 	case SVG_Color_datatype:
@@ -953,13 +956,13 @@
 	GF_Err e;
 	GF_FieldInfo info;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	val = ns = name = NULL;
-	if (!JSVAL_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (!JSVAL_CHECK_STRING(argv[0])) return GF_JS_EXCEPTION(c);
 	if (argc==3) {
-		if (!JSVAL_CHECK_STRING(argv[1])) return JS_EXCEPTION;
-		if (!JSVAL_CHECK_STRING(argv[2])) return JS_EXCEPTION;
+		if (!JSVAL_CHECK_STRING(argv[1])) return GF_JS_EXCEPTION(c);
+		if (!JSVAL_CHECK_STRING(argv[2])) return GF_JS_EXCEPTION(c);
 		ns = JS_ToCString(c, argv[0]);
 		name = JS_ToCString(c, argv[1]);
 		val = JS_ToCString(c, argv[2]);
@@ -967,12 +970,12 @@
 		name = JS_ToCString(c, argv[0]);
 		val = JS_ToCString(c, argv[1]);
 	} else {
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	if (!name) {
 		JS_FreeCString(c, ns);
 		JS_FreeCString(c, val);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	if (!strcmp(name, "#text")) {
 		if (val) dom_node_set_textContent(n, (char *) val);
@@ -987,7 +990,7 @@
 
 	if (!val || (e!=GF_OK)) {
 		JS_FreeCString(c, val);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	e = gf_svg_parse_attribute(n, &info, (char *) val, 0);
 	JS_FreeCString(c, val);
@@ -1005,15 +1008,15 @@
 	const char *szName;
 
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
-	if (argc!=2) return JS_EXCEPTION;
-	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
-	if (!JS_IsNumber(argv[1]) || JS_ToFloat64(c, &d, argv[1])) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
+	if (argc!=2) return GF_JS_EXCEPTION(c);
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
+	if (!JS_IsNumber(argv[1]) || JS_ToFloat64(c, &d, argv[1])) return GF_JS_EXCEPTION(c);
 
 	szName = JS_ToCString(c, argv[0]);
 	e = gf_node_get_field_by_name(n, (char *) szName, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	switch (info.fieldType) {
 	/* inheritable floats */
@@ -1063,17 +1066,17 @@
 	GF_Node *n = dom_get_element(c, obj);
 	if (!n) return JS_TRUE;
 
-	if (argc!=2) return JS_EXCEPTION;
-	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
-	if (JS_IsNull(argv[1]) || !JS_IsObject(argv[1])) return JS_EXCEPTION;
+	if (argc!=2) return GF_JS_EXCEPTION(c);
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_IsNull(argv[1]) || !JS_IsObject(argv[1])) return GF_JS_EXCEPTION(c);
 
 	mx = JS_GetOpaque(argv[1], matrixClass.class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
 
 	szName = JS_ToCString(c, argv[0]);
 	e = gf_node_get_field_by_name(n, (char *) szName, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	if (info.fieldType==SVG_Transform_datatype) {
 		gf_mx2d_copy(((SVG_Transform*)info.far_ptr)->mat, *mx);
@@ -1090,19 +1093,19 @@
 	rectCI *rc;
 	GF_Err e;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if (argc!=2) return JS_EXCEPTION;
+	if (argc!=2) return GF_JS_EXCEPTION(c);
 	if (!JS_IsString(argv[0])) return JS_TRUE;
-	if (JS_IsNull(argv[1]) || !JS_IsObject(argv[1])) return JS_EXCEPTION;
+	if (JS_IsNull(argv[1]) || !JS_IsObject(argv[1])) return GF_JS_EXCEPTION(c);
 
 	rc = JS_GetOpaque(argv[1], rectClass.class_id);
-	if (!rc) return JS_EXCEPTION;
+	if (!rc) return GF_JS_EXCEPTION(c);
 
 	szName = JS_ToCString(c, argv[0]);
 	e = gf_node_get_field_by_name(n, (char *) szName, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	if (info.fieldType==SVG_ViewBox_datatype) {
 		SVG_ViewBox *v = (SVG_ViewBox *)info.far_ptr;
@@ -1123,18 +1126,18 @@
 	const char *szName;
 	GF_Err e;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if (argc!=2) return JS_EXCEPTION;
-	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
-	if (JS_IsNull(argv[1]) || !JS_IsObject(argv[1])) return JS_EXCEPTION;
+	if (argc!=2) return GF_JS_EXCEPTION(c);
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_IsNull(argv[1]) || !JS_IsObject(argv[1])) return GF_JS_EXCEPTION(c);
 	path = JS_GetOpaque( argv[1], pathClass.class_id);
-	if (!path) return JS_EXCEPTION;
+	if (!path) return GF_JS_EXCEPTION(c);
 
 	szName = JS_ToCString(c, argv[0]);
 	e = gf_node_get_field_by_name(n, (char *) szName, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	if (info.fieldType==SVG_PathData_datatype) {
 #if USE_GF_PATH
@@ -1190,18 +1193,18 @@
 	GF_Err e;
 	const char *szName;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
-	if (argc!=2) return JS_EXCEPTION;
-	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
-	if (!JS_IsObject(argv[1])) return JS_EXCEPTION;
+	if (argc!=2) return GF_JS_EXCEPTION(c);
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
+	if (!JS_IsObject(argv[1])) return GF_JS_EXCEPTION(c);
 	rgb = JS_GetOpaque(argv[1], rgbClass.class_id);
-	if (!rgb) return JS_EXCEPTION;
+	if (!rgb) return GF_JS_EXCEPTION(c);
 
 	szName = JS_ToCString(c, argv[0]);
 	e = gf_node_get_field_by_name(n, (char *) szName, &info);
 	JS_FreeCString(c, szName);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	switch (info.fieldType) {
 	case SVG_Color_datatype:
@@ -1233,13 +1236,13 @@
 {
 	GF_JSAPIParam par;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_EXCEPTION;
+	if (!n || argc) return GF_JS_EXCEPTION(c);
 
 	par.bbox.is_set = GF_FALSE;
 	if (ScriptAction(n->sgprivate->scenegraph, get_screen ? GF_JSAPI_OP_GET_SCREEN_BBOX : GF_JSAPI_OP_GET_LOCAL_BBOX, (GF_Node *)n, &par) ) {
 		if (par.bbox.is_set) {
 			rectCI *rc = (rectCI *)gf_malloc(sizeof(rectCI));
-			if (!rc) return JS_EXCEPTION;
+			if (!rc) return GF_JS_EXCEPTION(c);
 			JSValue rO = JS_NewObjectClass(c, rectClass.class_id);
 			rc->sg = NULL;
 			rc->x = FIX2FLT(par.bbox.min_edge.x);
@@ -1270,17 +1273,17 @@
 {
 	GF_JSAPIParam par;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_EXCEPTION;
+	if (!n || argc) return GF_JS_EXCEPTION(c);
 
 	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_TRANSFORM, (GF_Node *)n, &par)) {
 		GF_Matrix2D *mx = (GF_Matrix2D *)gf_malloc(sizeof(GF_Matrix2D));
-		if (!mx) return JS_EXCEPTION;
+		if (!mx) return GF_JS_EXCEPTION(c);
 		JSValue mO = JS_NewObjectClass(c, matrixClass.class_id);
 		gf_mx2d_from_mx(mx, &par.mx);
 		JS_SetOpaque(mO, mx);
 		return mO;
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 static JSValue svg_udom_create_matrix_components(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
@@ -1289,8 +1292,8 @@
 	JSValue mat;
 	Double v;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
-	if (argc!=6) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
+	if (argc!=6) return GF_JS_EXCEPTION(c);
 
 	GF_SAFEALLOC(mx, GF_Matrix2D)
 	if (!mx) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
@@ -1317,7 +1320,7 @@
 	rectCI *rc;
 	JSValue r;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_EXCEPTION;
+	if (!n || argc) return GF_JS_EXCEPTION(c);
 
 	GF_SAFEALLOC(rc, rectCI);
 	if (!rc) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
@@ -1331,7 +1334,7 @@
 	pointCI *pt;
 	JSValue r;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_EXCEPTION;
+	if (!n || argc) return GF_JS_EXCEPTION(c);
 
 	GF_SAFEALLOC(pt, pointCI);
 	if (!pt) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
@@ -1345,7 +1348,7 @@
 	pathCI *path;
 	JSValue p;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_EXCEPTION;
+	if (!n || argc) return GF_JS_EXCEPTION(c);
 
 	GF_SAFEALLOC(path, pathCI);
 	if (!path) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
@@ -1359,7 +1362,7 @@
 	rgbCI *col;
 	JSValue p;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n|| (argc!=3)) return JS_EXCEPTION;
+	if (!n|| (argc!=3)) return GF_JS_EXCEPTION(c);
 
 	GF_SAFEALLOC(col, rgbCI);
 	if (!col) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
@@ -1378,8 +1381,8 @@
 	GF_FieldInfo info;
 
 	GF_Node *n = (GF_Node *)dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
-	if (n->sgprivate->tag != TAG_SVG_path) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
+	if (n->sgprivate->tag != TAG_SVG_path) return GF_JS_EXCEPTION(c);
 
 	gf_node_get_field_by_name(n, "d", &info);
 	if (info.fieldType == SVG_PathData_datatype) {
@@ -1400,8 +1403,8 @@
 {
 	GF_JSAPIParam par;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
-	if ((argc!=1) || !JS_IsObject(argv[0])) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
+	if ((argc!=1) || !JS_IsObject(argv[0])) return GF_JS_EXCEPTION(c);
 
 	JS_ToInt32(c, &par.opt, argv[1]);
 	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_FOCUS, (GF_Node *)n, &par))
@@ -1413,12 +1416,12 @@
 {
 	GF_JSAPIParam par;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
-	if ((argc!=1) || !JS_IsObject(argv[0])) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
+	if ((argc!=1) || !JS_IsObject(argv[0])) return GF_JS_EXCEPTION(c);
 
 	par.node = dom_get_element(c, argv[0]);
 	/*NOT IN THE GRAPH*/
-	if (!par.node || !par.node->sgprivate->num_instances) return JS_EXCEPTION;
+	if (!par.node || !par.node->sgprivate->num_instances) return GF_JS_EXCEPTION(c);
 	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_FOCUS, (GF_Node *)n, &par))
 		return JS_TRUE;
 	return JS_TRUE;
@@ -1428,10 +1431,10 @@
 {
 	GF_JSAPIParam par;
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_EXCEPTION;
+	if (!n || argc) return GF_JS_EXCEPTION(c);
 
 	if (!ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_FOCUS, (GF_Node *)n, &par))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	if (par.node) {
 		return dom_element_construct(c, par.node);
@@ -1442,7 +1445,7 @@
 static JSValue svg_udom_get_time(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	return JS_NewFloat64(c, gf_node_get_scene_time(n) );
 }
@@ -1463,37 +1466,37 @@
 static JSValue rgb_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	rgbCI *col = (rgbCI *) JS_GetOpaque(obj, rgbClass.class_id);
-	if (!col) return JS_EXCEPTION;
+	if (!col) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case 0: return JS_NewInt32(c, col->r);
 	case 1: return JS_NewInt32(c, col->g);
 	case 2: return JS_NewInt32(c, col->b);
 	default:
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 }
 static JSValue rgb_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	rgbCI *col = (rgbCI *) JS_GetOpaque(obj, rgbClass.class_id);
-	if (!col) return JS_EXCEPTION;
+	if (!col) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
-	case 0: return JS_ToInt32(c, &col->r, value) ? JS_EXCEPTION : JS_TRUE;
-	case 1: return JS_ToInt32(c, &col->g, value) ? JS_EXCEPTION : JS_TRUE;
-	case 2: return JS_ToInt32(c, &col->b, value) ? JS_EXCEPTION : JS_TRUE;
+	case 0: return JS_ToInt32(c, &col->r, value) ? GF_JS_EXCEPTION(c) : JS_TRUE;
+	case 1: return JS_ToInt32(c, &col->g, value) ? GF_JS_EXCEPTION(c) : JS_TRUE;
+	case 2: return JS_ToInt32(c, &col->b, value) ? GF_JS_EXCEPTION(c) : JS_TRUE;
 	default:
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 }
 
 static JSValue rect_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	rectCI *rc = (rectCI *) JS_GetOpaque(obj, rectClass.class_id);
-	if (!rc) return JS_EXCEPTION;
+	if (!rc) return GF_JS_EXCEPTION(c);
 	if (rc->sg) {
 		GF_JSAPIParam par;
 		if (!ScriptAction(rc->sg, GF_JSAPI_OP_GET_VIEWPORT, rc->sg->RootNode, &par)) {
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 		}
 		rc->x = FIX2FLT(par.rc.x);
 		rc->y = FIX2FLT(par.rc.y);
@@ -1506,7 +1509,7 @@
 	case 2: return JS_NewFloat64(c, rc->w);
 	case 3: return JS_NewFloat64(c, rc->h);
 	default:
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 }
 
@@ -1514,8 +1517,8 @@
 {
 	Double d;
 	rectCI *rc = (rectCI *) JS_GetOpaque(obj, rectClass.class_id);
-	if (!rc) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &d, value)) return JS_EXCEPTION;
+	if (!rc) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &d, value)) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case 0:
 		rc->x = (Float) d;
@@ -1530,19 +1533,19 @@
 		rc->h = (Float) d;
 		return JS_TRUE;
 	default:
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 }
 
 static JSValue point_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	pointCI *pt = (pointCI *) JS_GetOpaque(obj, pointClass.class_id);
-	if (!pt) return JS_EXCEPTION;
+	if (!pt) return GF_JS_EXCEPTION(c);
 
 	if (pt->sg) {
 		GF_JSAPIParam par;
 		if (!ScriptAction(pt->sg, GF_JSAPI_OP_GET_TRANSLATE, pt->sg->RootNode, &par)) {
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 		}
 		pt->x = FIX2FLT(par.pt.x);
 		pt->y = FIX2FLT(par.pt.y);
@@ -1550,17 +1553,17 @@
 	switch (magic) {
 	case 0: return JS_NewFloat64(c, pt->x);
 	case 1: return JS_NewFloat64(c, pt->y);
-	default: return JS_EXCEPTION;
+	default: return GF_JS_EXCEPTION(c);
 	}
 }
 
 static JSValue point_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
 {
 	pointCI *pt = (pointCI *) JS_GetOpaque(obj, pointClass.class_id);
-	if (!pt) return JS_EXCEPTION;
+	if (!pt) return GF_JS_EXCEPTION(c);
 
 	Double d;
-	if (JS_ToFloat64(c, &d, value)) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &d, value)) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case 0:
 		pt->x = (Float) d;
@@ -1569,7 +1572,7 @@
 		pt->y = (Float) d;
 		break;
 	default:
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 	if (pt->sg) {
 		GF_JSAPIParam par;
@@ -1588,7 +1591,7 @@
 	JSValue obj;
 	pathCI *p;
 	GF_SAFEALLOC(p, pathCI);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	if (d) {
 		u32 i, count;
 		p->nb_coms = gf_list_count(d->commands);
@@ -1621,11 +1624,11 @@
 static JSValue path_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	pathCI *p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case 0: return JS_NewInt32(c, p->nb_coms);
 	default:
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 }
 
@@ -1633,8 +1636,8 @@
 {
 	u32 idx;
 	pathCI *p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
-	if (!p) return JS_EXCEPTION;
-	if ((argc!=1) || JS_ToInt32(c, &idx, argv[0])) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
+	if ((argc!=1) || JS_ToInt32(c, &idx, argv[0])) return GF_JS_EXCEPTION(c);
 	if (idx>=p->nb_coms) return JS_TRUE;
 	switch (p->tags[idx]) {
 	case 0: return JS_NewInt32(c, 77);/* Move To */
@@ -1648,7 +1651,7 @@
 	case 6:
 		return JS_NewInt32(c, 90);/* Close */
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 static JSValue svg_path_get_segment_param(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
@@ -1656,11 +1659,11 @@
 	u32 i, idx, param_idx, pt_idx;
 	ptCI *pt;
 	pathCI *p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 
-	if ((argc!=2) || !JS_IsInteger(argv[0]) || !JS_IsInteger(argv[1])) return JS_EXCEPTION;
-	if (JS_ToInt32(c, &idx, argv[0])) return JS_EXCEPTION;
-	if (JS_ToInt32(c, &param_idx, argv[1])) return JS_EXCEPTION;
+	if ((argc!=2) || !JS_IsInteger(argv[0]) || !JS_IsInteger(argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToInt32(c, &idx, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToInt32(c, &param_idx, argv[1])) return GF_JS_EXCEPTION(c);
 	if (idx>=p->nb_coms) return JS_TRUE;
 	pt_idx = 0;
 	for (i=0; i<idx; i++) {
@@ -1725,7 +1728,7 @@
 	case 6:
 		return JS_NewFloat64(c, 0);
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 static u32 svg_path_realloc_pts(pathCI *p, u32 nb_pts)
@@ -1765,10 +1768,10 @@
 	u32 nb_pts;
 
 	p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
-	if (!p || (argc!=2)) return JS_EXCEPTION;
+	if (!p || (argc!=2)) return GF_JS_EXCEPTION(c);
 
-	if (JS_ToFloat64(c, &x, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y, argv[1])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &x, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y, argv[1])) return GF_JS_EXCEPTION(c);
 	nb_pts = svg_path_realloc_pts(p, 1);
 	p->pts[nb_pts].x = (Float) x;
 	p->pts[nb_pts].y = (Float) y;
@@ -1784,10 +1787,10 @@
 	Double x, y;
 	u32 nb_pts;
 	p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
-	if (!p || (argc!=2)) return JS_EXCEPTION;
+	if (!p || (argc!=2)) return GF_JS_EXCEPTION(c);
 
-	if (JS_ToFloat64(c, &x, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y, argv[1])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &x, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y, argv[1])) return GF_JS_EXCEPTION(c);
 
 	nb_pts = svg_path_realloc_pts(p, 1);
 	p->pts[nb_pts].x = (Float) x;
@@ -1805,12 +1808,12 @@
 	u32 nb_pts;
 
 	p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
-	if (!p || (argc!=4)) return JS_EXCEPTION;
+	if (!p || (argc!=4)) return GF_JS_EXCEPTION(c);
 
-	if (JS_ToFloat64(c, &x1, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y1, argv[1])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &x2, argv[2])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y2, argv[3])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &x1, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y1, argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &x2, argv[2])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y2, argv[3])) return GF_JS_EXCEPTION(c);
 	nb_pts = svg_path_realloc_pts(p, 2);
 	p->pts[nb_pts].x = (Float) x1;
 	p->pts[nb_pts].y = (Float) y1;
@@ -1829,14 +1832,14 @@
 	u32 nb_pts;
 
 	p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
-	if (!p || (argc!=6)) return JS_EXCEPTION;
-
-	if (JS_ToFloat64(c, &x1, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y1, argv[1])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &x2, argv[2])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y2, argv[3])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &x, argv[4])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &y, argv[5])) return JS_EXCEPTION;
+	if (!p || (argc!=6)) return GF_JS_EXCEPTION(c);
+
+	if (JS_ToFloat64(c, &x1, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y1, argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &x2, argv[2])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y2, argv[3])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &x, argv[4])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &y, argv[5])) return GF_JS_EXCEPTION(c);
 	nb_pts = svg_path_realloc_pts(p, 3);
 	p->pts[nb_pts].x = (Float) x1;
 	p->pts[nb_pts].y = (Float) y1;
@@ -1853,7 +1856,7 @@
 static JSValue svg_path_close(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	pathCI *p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 
 	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
 	p->tags[p->nb_coms] = 6;
@@ -1865,7 +1868,7 @@
 static JSValue matrix_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_Matrix2D *mx = (GF_Matrix2D *) JS_GetOpaque(obj, matrixClass.class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case 0: return JS_NewFloat64(c, FIX2FLT(mx->m[0]));
@@ -1875,7 +1878,7 @@
 	case 4: return JS_NewFloat64(c, FIX2FLT(mx->m[2]));
 	case 5: return JS_NewFloat64(c, FIX2FLT(mx->m[5]));
 	default:
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 }
 
@@ -1883,40 +1886,40 @@
 {
 	Double d;
 	GF_Matrix2D *mx = (GF_Matrix2D *) JS_GetOpaque(obj, matrixClass.class_id);
-	if (!mx) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &d, value)) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &d, value)) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case 0:
 		mx->m[0] = FLT2FIX(d);
-		break;
+		return JS_UNDEFINED;
 	case 1:
 		mx->m[3] = FLT2FIX(d);
-		break;
+		return JS_UNDEFINED;
 	case 2:
 		mx->m[1] = FLT2FIX(d);
-		break;
+		return JS_UNDEFINED;
 	case 3:
 		mx->m[4] = FLT2FIX(d);
-		break;
+		return JS_UNDEFINED;
 	case 4:
 		mx->m[2] = FLT2FIX(d);
-		break;
+		return JS_UNDEFINED;
 	case 5:
 		mx->m[5] = FLT2FIX(d);
-		break;
+		return JS_UNDEFINED;
 	default:
 		break;
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 static JSValue svg_mx2d_get_component(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	u32 comp;
 	GF_Matrix2D *mx = (GF_Matrix2D *) JS_GetOpaque(obj, matrixClass.class_id);
-	if (!mx || (argc!=1)) return JS_EXCEPTION;
-	if (JS_ToInt32(c, &comp, argv[0])) return JS_EXCEPTION;
+	if (!mx || (argc!=1)) return GF_JS_EXCEPTION(c);
+	if (JS_ToInt32(c, &comp, argv[0])) return GF_JS_EXCEPTION(c);
 
 	switch (comp) {
 	case 0: return JS_NewFloat64(c, FIX2FLT(mx->m[0]));
@@ -1926,16 +1929,16 @@
 	case 4: return JS_NewFloat64(c, FIX2FLT(mx->m[2]));
 	case 5: return JS_NewFloat64(c, FIX2FLT(mx->m[5]));
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 static JSValue svg_mx2d_multiply(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Matrix2D *mx1, *mx2;
 	mx1 = (GF_Matrix2D *) JS_GetOpaque(obj, matrixClass.class_id);
-	if (!mx1 || (argc!=1)) return JS_EXCEPTION;
+	if (!mx1 || (argc!=1)) return GF_JS_EXCEPTION(c);
 	mx2 = (GF_Matrix2D *) JS_GetOpaque(argv[0], matrixClass.class_id);
-	if (!mx2) return JS_EXCEPTION;
+	if (!mx2) return GF_JS_EXCEPTION(c);
 
 	gf_mx2d_add_matrix(mx1, mx2);
 	return JS_DupValue(c, obj);
@@ -1944,7 +1947,7 @@
 static JSValue svg_mx2d_inverse(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Matrix2D *mx = (GF_Matrix2D *) JS_GetOpaque(obj, matrixClass.class_id);
-	if (!mx) return JS_EXCEPTION;
+	if (!mx) return GF_JS_EXCEPTION(c);
 	gf_mx2d_inverse(mx);
 	return JS_DupValue(c, obj);
 }
@@ -1954,9 +1957,9 @@
 	Double x, y;
 	GF_Matrix2D *mx1, mx2;
 	mx1 = (GF_Matrix2D *) JS_GetOpaque(obj, matrixClass.class_id);
-	if (!mx1 || (argc!=2)) return JS_EXCEPTION;
+	if (!mx1 || (argc!=2)) return GF_JS_EXCEPTION(c);
 
-	if (JS_ToFloat64(c, &x, argv[0]) || JS_ToFloat64(c, &y, argv[1])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &x, argv[0]) || JS_ToFloat64(c, &y, argv[1])) return GF_JS_EXCEPTION(c);
 
 	gf_mx2d_init(mx2);
 	mx2.m[2] = FLT2FIX(x);
@@ -1970,8 +1973,8 @@
 	Double scale;
 	GF_Matrix2D *mx1, mx2;
 	mx1 = (GF_Matrix2D *) JS_GetOpaque(obj, matrixClass.class_id);
-	if (!mx1 || (argc!=2)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &scale, argv[0])) return JS_EXCEPTION;
+	if (!mx1 || (argc!=2)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &scale, argv[0])) return GF_JS_EXCEPTION(c);
 
 	gf_mx2d_init(mx2);
 	mx2.m[0] = mx2.m[4] = FLT2FIX(scale);
@@ -1985,8 +1988,8 @@
 	GF_Matrix2D *mx1, mx2;
 
 	mx1 = (GF_Matrix2D *) JS_GetOpaque(obj, matrixClass.class_id);
-	if (!mx1 || (argc!=2)) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &angle, argv[0])) return JS_EXCEPTION;
+	if (!mx1 || (argc!=1)) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &angle, argv[0])) return GF_JS_EXCEPTION(c);
 
 	gf_mx2d_init(mx2);
 	gf_mx2d_add_rotation(&mx2, 0, 0, gf_mulfix(FLT2FIX(angle/180), GF_PI));
@@ -1994,31 +1997,6 @@
 	return JS_DupValue(c, obj);
 }
 
-JSValue svg_udom_new_rect(JSContext *c, Fixed x, Fixed y, Fixed width, Fixed height)
-{
-	rectCI *rc = (rectCI *)gf_malloc(sizeof(rectCI));
-	if (!rc) return JS_EXCEPTION;
-	JSValue r = JS_NewObjectClass(c, rectClass.class_id);
-	rc->x = FIX2FLT(x);
-	rc->y = FIX2FLT(y);
-	rc->w = FIX2FLT(width);
-	rc->h = FIX2FLT(height);
-	rc->sg = NULL;
-	JS_SetOpaque(r, rc);
-	return r;
-}
-
-JSValue svg_udom_new_point(JSContext *c, Fixed x, Fixed y)
-{
-	pointCI *pt = (pointCI *)gf_malloc(sizeof(pointCI));
-	if (!pt) return JS_EXCEPTION;
-	JSValue p = JS_NewObjectClass(c, pointClass.class_id);
-	pt->x = FIX2FLT(x);
-	pt->y = FIX2FLT(y);
-	pt->sg = NULL;
-	JS_SetOpaque(p, pt);
-	return p;
-}
 
 #ifdef GPAC_ENABLE_HTML5_MEDIA
 void *html_get_element_class(GF_Node *n);
@@ -2330,7 +2308,7 @@
 		gf_js_call_gc(sg->svg_js->js_ctx);
 		sg->svg_js->force_gc = GF_FALSE;
 	}
-	js_do_loop(sg->svg_js->js_ctx);
+	js_std_loop(sg->svg_js->js_ctx);
 	gf_js_lock(sg->svg_js->js_ctx, GF_FALSE);
 
 	return ok;
@@ -2581,7 +2559,7 @@
 		}
 		JS_FreeValue(svg_js->js_ctx, ret);
 		gf_dom_listener_process_add(node->sgprivate->scenegraph);
-		js_do_loop(svg_js->js_ctx);
+		js_std_loop(svg_js->js_ctx);
 	}
 }
 
@@ -2612,6 +2590,7 @@
 	GF_SVGJS *svg_js;
 	JSValue __this;
 	JSValue ret;
+	Bool free_this = GF_FALSE;
 	u32 flags = JS_EVAL_TYPE_GLOBAL;
 	Bool success=GF_TRUE;
 	GF_DOM_Event *prev_event = NULL;
@@ -2622,7 +2601,7 @@
 		if (!node) return GF_FALSE;
 		hdl = NULL;
 	} else {
-		if (JS_IsUndefined(hdl->js_data->fun_val) && JS_IsUndefined(hdl->js_data->evt_listen_obj)) {
+		if (!hdl->js_data || (JS_IsUndefined(hdl->js_data->fun_val) && JS_IsUndefined(hdl->js_data->evt_listen_obj))) {
 			txt = svg_get_text_child(node);
 			if (!txt) return GF_FALSE;
 		}
@@ -2663,16 +2642,22 @@
 		flags = JS_EVAL_TYPE_MODULE;
 
 	/*if an observer is being specified, use it*/
-	if (hdl && hdl->js_data && !JS_IsUndefined(hdl->js_data->evt_listen_obj)) __this = hdl->js_data->evt_listen_obj;
+	if (hdl && hdl->js_data && !JS_IsUndefined(hdl->js_data->evt_listen_obj))
+		__this = hdl->js_data->evt_listen_obj;
 	/*compile the jsfun if any - 'this' is the associated observer*/
-	else __this = observer ? dom_element_construct(svg_js->js_ctx, observer) : svg_js->global;
+	else if (observer) {
+		__this = dom_element_construct(svg_js->js_ctx, observer);
+		free_this = GF_TRUE;
+	} else {
+		__this = svg_js->global;
+	}
 
 	if (txt && hdl && hdl->js_data && !JS_IsUndefined(hdl->js_data->fun_val)) {
-		hdl->js_data->fun_val = JS_EvalWithTarget(svg_js->js_ctx, __this, txt->textContent, strlen(txt->textContent), "handler", flags|JS_EVAL_FLAG_COMPILE_ONLY);
+		hdl->js_data->fun_val = JS_EvalThis(svg_js->js_ctx, __this, txt->textContent, strlen(txt->textContent), "handler", flags|JS_EVAL_FLAG_COMPILE_ONLY);
 	}
 
 	if (utf8_script) {
-		ret = JS_EvalWithTarget(svg_js->js_ctx, __this, utf8_script, (u32) strlen(utf8_script), "inline script", flags);
+		ret = JS_EvalThis(svg_js->js_ctx, __this, utf8_script, (u32) strlen(utf8_script), "inline script", flags);
 	}
 	else if (hdl && hdl->js_data
 		&& (!JS_IsUndefined(hdl->js_data->fun_val) || !JS_IsUndefined(hdl->js_data->evt_listen_obj) )
@@ -2690,16 +2675,23 @@
 			ret = JS_Call(svg_js->js_ctx, fun, hdl->js_data->evt_listen_obj, 1, argv);
 			JS_FreeValue(svg_js->js_ctx, fun);
 		}
+		JS_FreeValue(svg_js->js_ctx, evt);
 	} else if (txt) {
 		JSValue fun = JS_GetPropertyStr(svg_js->js_ctx, svg_js->global, txt->textContent);
+		if (JS_IsUndefined(fun)) {
+			JSValue glob = JS_GetGlobalObject(svg_js->js_ctx);
+			fun = JS_GetPropertyStr(svg_js->js_ctx, glob, txt->textContent);
+			JS_FreeValue(svg_js->js_ctx, glob);
+		}
+
 		if (!JS_IsUndefined(fun)) {
 			ret = JS_NULL;
-			if (svg_script_execute(node->sgprivate->scenegraph, txt->textContent, event)) {
+			if (! svg_script_execute(node->sgprivate->scenegraph, txt->textContent, event)) {
 				success = GF_FALSE;
 			}
 		}
 		else {
-			ret = JS_EvalWithTarget(svg_js->js_ctx, __this, txt->textContent, (u32) strlen(txt->textContent), "internal", flags);
+			ret = JS_EvalThis(svg_js->js_ctx, __this, txt->textContent, (u32) strlen(txt->textContent), "internal", flags);
 		}
 		JS_FreeValue(svg_js->js_ctx, fun);
 	} else {
@@ -2711,6 +2703,9 @@
 	}
 	JS_FreeValue(svg_js->js_ctx, ret);
 
+	if (free_this)
+		JS_FreeValue(svg_js->js_ctx, __this);
+
 	JS_SetOpaque(svg_js->event, prev_event);
 	if (txt && hdl && hdl->js_data) hdl->js_data->fun_val = JS_UNDEFINED;
 
@@ -2722,7 +2717,7 @@
 
 	/*check any pending exception if outer-most event*/
 	if (!prev_event) {
-		js_do_loop(svg_js->js_ctx);
+		js_std_loop(svg_js->js_ctx);
 	}
 
 	gf_js_lock(svg_js->js_ctx, GF_FALSE);
@@ -2749,6 +2744,62 @@
 	return GF_TRUE;
 }
 
+void svg_execute_handler(GF_Node *node, GF_DOM_Event *event, GF_Node *observer)
+{
+	JSValue evt;
+	JSValue argv[1];
+	JSValue __this;
+	JSValue ret;
+	Bool success=GF_TRUE;
+	GF_DOMHandler *hdl = (GF_DOMHandler *)node;
+	JSContext *ctx;
+
+	if (!hdl || !hdl->js_data || !hdl->js_data->ctx
+		|| (JS_IsUndefined(hdl->js_data->fun_val) && JS_IsUndefined(hdl->js_data->evt_listen_obj))
+	) {
+		return;
+	}
+	ctx = hdl->js_data->ctx;
+
+	/*if an observer is being specified, use it*/
+	if (hdl && hdl->js_data && !JS_IsUndefined(hdl->js_data->evt_listen_obj))
+		__this = hdl->js_data->evt_listen_obj;
+	else
+		return;
+	/*compile the jsfun if any - 'this' is the associated observer*/
+//	else
+//		__this = observer ? dom_element_construct(ctx, observer) : svg_js->global;
+
+	gf_js_lock(ctx, GF_TRUE);
+
+
+	evt = gf_dom_new_event(ctx);
+	JS_SetOpaque(evt, event);
+	argv[0] = evt;
+
+	if (!JS_IsUndefined(hdl->js_data->fun_val) ) {
+		ret = JS_Call(ctx, hdl->js_data->fun_val, __this, 1, argv);
+	} else {
+		JSValue fun = JS_GetPropertyStr(ctx, hdl->js_data->evt_listen_obj, "hanldeEvent");
+		ret = JS_Call(ctx, fun, hdl->js_data->evt_listen_obj, 1, argv);
+		JS_FreeValue(ctx, fun);
+	}
+
+	if (JS_IsException(ret)) {
+		js_dump_error(ctx);
+		success = GF_FALSE;
+	}
+	JS_FreeValue(ctx, ret);
+	JS_FreeValue(ctx, evt);
+
+	gf_js_lock(ctx, GF_FALSE);
+
+	if (!success) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("SVG: Invalid event handler script\n" ));
+		return;
+	}
+}
+
 #endif
 
 #endif

gpac-1.0.1.tar.gz/src/scenegraph/svg_properties.c -> gpac-2.0.0.tar.gz/src/scenegraph/svg_properties.c Changed

gpac-1.0.1.tar.gz/src/scenegraph/svg_types.c -> gpac-2.0.0.tar.gz/src/scenegraph/svg_types.c Changed

@@ -224,7 +224,7 @@
 
 
 /* TODO: update for elliptical arcs */
-#if USE_GF_PATH
+#if USE_GF_PATH==0
 void gf_svg_path_build(GF_Path *path, GF_List *commands, GF_List *points)
 {
 	u32 i, j, command_count;
@@ -359,7 +359,8 @@
 static void svg_delete_one_anim_value(u8 anim_datatype, void *anim_value, GF_SceneGraph *sg)
 {
 	/* TODO: handle specific animation types : Motion, else ? */
-	gf_svg_delete_attribute_value(anim_datatype, anim_value, sg);
+	if (anim_value)
+		gf_svg_delete_attribute_value(anim_datatype, anim_value, sg);
 }
 
 void gf_svg_reset_animate_values(SMIL_AnimateValues anim_values, GF_SceneGraph *sg)
@@ -401,6 +402,10 @@
 		gf_svg_reset_iri(sg, & ((SVG_Focus*)value)->target);
 		gf_free(value);
 		break;
+	case SVG_ClipPath_datatype:
+		gf_svg_reset_iri(sg, & ((SVG_ClipPath*)value)->target);
+		gf_free(value);
+		break;
 	case SVG_PathData_datatype:
 #if USE_GF_PATH
 		gf_path_del((GF_Path *)value);
@@ -487,6 +492,8 @@
 		if (*(SVG_String *)value) gf_free(*(SVG_String *)value);
 		gf_free(value);
 		break;
+	case SVG_NodeList_datatype:
+		break;
 	case SMIL_RepeatCount_datatype:
 	case SMIL_Duration_datatype:
 	case SVG_Length_datatype:

gpac-1.0.1.tar.gz/src/scenegraph/vrml_js.c -> gpac-2.0.0.tar.gz/src/scenegraph/vrml_js.c Changed

@@ -35,9 +35,12 @@
 
 typedef struct
 {
+
 	u8 is_setup;
-	/*set to true for proto IS fields*/
+	/*set to 1 for proto IS fields*/
 	u8 IS_route;
+	/*set to 1 for JS route to fun*/
+	u8 script_route;
 
 	u32 ID;
 	char *name;
@@ -69,7 +72,7 @@
 
 	/*pointer to the SFNode if this is an SFNode or MFNode[i] field */
 	GF_Node *node;
-	/*when creating MFnode from inside the script, the node list is stored here untill attached to an object*/
+	/*when creating MFnode from inside the script, the node list is stored here until attached to an object*/
 	GF_ChildNodeItem *temp_list;
 	/*only set when not owned by a node, in which case field.far_ptr is also set to this value*/
 	void *field_ptr;
@@ -156,213 +159,6 @@
 GF_JSClass AnyClass;
 #endif
 
-typedef struct
-{
-	JSRuntime *js_runtime;
-	u32 nb_inst;
-	JSContext *ctx;
-
-	GF_Mutex *mx;
-	GF_List *allocated_contexts;
-} GF_JSRuntime;
-
-static GF_JSRuntime *js_rt = NULL;
-
-int qjs_module_set_import_meta(JSContext *ctx, JSValueConst func_val, Bool use_realpath, Bool is_main)
-{
-	JSModuleDef *m;
-	JSValue meta_obj;
-	JSAtom module_name_atom;
-	const char *module_name, *src_file;
-
-	assert(JS_VALUE_GET_TAG(func_val) == JS_TAG_MODULE);
-	m = JS_VALUE_GET_PTR(func_val);
-
-	module_name_atom = JS_GetModuleName(ctx, m);
-	module_name = JS_AtomToCString(ctx, module_name_atom);
-	JS_FreeAtom(ctx, module_name_atom);
-	if (!module_name)
-		return -1;
-	src_file = module_name;
-	if (!strchr(module_name, ':')) {
-		char buf[GF_MAX_PATH + 16];
-		strcpy(buf, "file://");
-#if !defined(_WIN32)
-		/* realpath() cannot be used with modules compiled with qjsc
-		because the corresponding module source code is not
-		necessarily present */
-		if (use_realpath) {
-			char *res = realpath(module_name, buf + strlen(buf));
-			if (!res) {
-				JS_ThrowTypeError(ctx, "realpath failure");
-				JS_FreeCString(ctx, module_name);
-				return -1;
-			}
-			src_file = res;
-		} 
-#endif
-	}
-
-	meta_obj = JS_GetImportMeta(ctx, m);
-	if (JS_IsException(meta_obj)) {
-		JS_FreeCString(ctx, module_name);
-		return -1;
-	}
-	JS_DefinePropertyValueStr(ctx, meta_obj, "url", JS_NewString(ctx, src_file), JS_PROP_C_W_E);
-	JS_DefinePropertyValueStr(ctx, meta_obj, "main", JS_NewBool(ctx, is_main), JS_PROP_C_W_E);
-	JS_FreeCString(ctx, module_name);
-	JS_FreeValue(ctx, meta_obj);
- return 0;
-}
-
-#if defined(WIN32) || defined(_WIN32_WCE)
-#include <windows.h>
-#else
-#include <dlfcn.h>
-#endif
-
-typedef JSModuleDef *(JSInitModuleFunc)(JSContext *ctx, const char *module_name);
-
-static JSModuleDef *qjs_module_loader_dyn_lib(JSContext *ctx,
- const char *module_name)
-{
-	JSModuleDef *m=NULL;
-	void *hd;
-	JSInitModuleFunc *init;
-	char *filename;
-
-	if (!strchr(module_name, '/') || !strchr(module_name, '\\')) {
-		/* must add a '/' so that the DLL is not searched in the system library paths */
-		filename = gf_malloc(strlen(module_name) + 2 + 1);
-		if (!filename) return NULL;
-		strcpy(filename, "./");
-		strcpy(filename + 2, module_name);
-	} else {
-		filename = (char *)module_name;
-	}
-
-	/* load dynamic lib */
-#ifdef WIN32
-	hd = LoadLibrary(filename);
-#else
-	hd = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
-#endif
-
-	if (filename != module_name)
-		gf_free(filename);
-
-	if (!hd) {
-		JS_ThrowReferenceError(ctx, "could not load module filename '%s' as shared library", module_name);
-		return NULL;
-	}
-
-#ifdef WIN32
-	init = (JSInitModuleFunc *) GetProcAddress(hd, "js_init_module");
-#else
-	init = (JSInitModuleFunc *) dlsym(hd, "js_init_module");
-#endif
-
-	if (!init) {
-		JS_ThrowReferenceError(ctx, "could not load module filename '%s': js_init_module not found", module_name);
-	} else {
-		m = init(ctx, module_name);
-		if (!m) {
-			JS_ThrowReferenceError(ctx, "could not load module filename '%s': initialization error", module_name);
-		}
-	}
-#ifdef WIN32
-	FreeLibrary(hd);
-#else
-	dlclose(hd);
-#endif
-
-	return m;
-}
-
-JSModuleDef *qjs_module_loader(JSContext *ctx, const char *module_name, void *opaque)
-{
-	JSModuleDef *m;
-	const char *fext = gf_file_ext_start(module_name);
-
-	if (fext && (!strcmp(fext, ".so") || !strcmp(fext, ".dll") || !strcmp(fext, ".dylib")) ) {
-		m = qjs_module_loader_dyn_lib(ctx, module_name);
-	} else {
-		u32 buf_len;
-		u8 *buf;
-		JSValue func_val;
-		GF_Err e = gf_file_load_data(module_name, &buf, &buf_len);
-
-		if (e != GF_OK) {
-			JS_ThrowReferenceError(ctx, "could not load module filename '%s': %s", module_name, gf_error_to_string(e) );
-			return NULL;
-		}
-		/* compile the module */
-		func_val = JS_Eval(ctx, (char *)buf, buf_len, module_name, JS_EVAL_TYPE_MODULE | JS_EVAL_FLAG_COMPILE_ONLY);
-		js_free(ctx, buf);
-		if (JS_IsException(func_val))
-			return NULL;
-		/* XXX: could propagate the exception */
-		qjs_module_set_import_meta(ctx, func_val, GF_TRUE, GF_FALSE);
-		/* the module is already referenced, so we must free it */
-		m = JS_VALUE_GET_PTR(func_val);
-		JS_FreeValue(ctx, func_val);
-	}
-	return m;
-}
-
-JSContext *gf_js_create_context()
-{
-	JSContext *ctx;
-	if (!js_rt) {
-		JSRuntime *js_runtime = JS_NewRuntime();
-		if (!js_runtime) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[ECMAScript] Cannot allocate ECMAScript runtime\n"));
-			return NULL;
-		}
-		GF_SAFEALLOC(js_rt, GF_JSRuntime);
-		if (!js_rt) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[JS] Failed to create script runtime\n"));
-			return NULL;
-		}
-		js_rt->js_runtime = js_runtime;
-		js_rt->allocated_contexts = gf_list_new();
-		js_rt->mx = gf_mx_new("JavaScript");
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[ECMAScript] ECMAScript runtime allocated %p\n", js_runtime));
-
- 	JS_SetModuleLoaderFunc(js_rt->js_runtime, NULL, qjs_module_loader, NULL);
-
-	}
-	js_rt->nb_inst++;
-
-	gf_mx_p(js_rt->mx);
-
-	ctx = JS_NewContext(js_rt->js_runtime);
-
-	gf_list_add(js_rt->allocated_contexts, ctx);
-	gf_mx_v(js_rt->mx);
-
-	return ctx;
-}
-
-void gf_js_delete_context(JSContext *ctx)
-{
-	gf_js_call_gc(ctx);
-
-	gf_list_del_item(js_rt->allocated_contexts, ctx);
-	JS_FreeContext(ctx);
-	if (js_rt) {
-		js_rt->nb_inst --;
-		if (js_rt->nb_inst == 0) {
-			JS_FreeRuntime(js_rt->js_runtime);
-			gf_list_del(js_rt->allocated_contexts);
-			gf_mx_del(js_rt->mx);
-			gf_free(js_rt);
-			js_rt = NULL;
-		}
-	}
-}
-
-
 
 #ifndef GPAC_DISABLE_SVG
 /*SVG tags for script handling*/
@@ -387,13 +183,6 @@
 static JSValue vrml_event_remove_listener(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv);
 #endif // GPAC_DISABLE_SVG
 
-void gf_js_call_gc(JSContext *c)
-{
-	gf_js_lock(c, 1);
-	JS_RunGC(js_rt->js_runtime);
-	gf_js_lock(c, 0);
-}
-
 void do_js_gc(JSContext *c, GF_Node *node)
 {
 #ifdef FORCE_GC
@@ -406,133 +195,13 @@
 	}
 }
 
-
-static JSValue js_print_ex(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, u32 ltool, u32 error_type)
-{
- int i=0;
- Bool first=GF_TRUE;
- s32 logl = GF_LOG_INFO;
- JSValue v, g;
- const char *c_logname=NULL;
- const char *log_name = "JS";
-
- if ((argc>1) && JS_IsNumber(argv[0])) {
-		JS_ToInt32(ctx, &logl, argv[0]);
-		i=1;
-	}
-	if (error_type)
-		logl = GF_LOG_ERROR;
-	g = JS_GetGlobalObject(ctx);
-	v = JS_GetPropertyStr(ctx, g, "_gpac_log_name");
-	if (!JS_IsUndefined(v) && !JS_IsNull(v)) {
-		c_logname = JS_ToCString(ctx, v);
-		JS_FreeValue(ctx, v);
-		if (c_logname) {
-			log_name = c_logname;
-			if (!strlen(log_name))
-				log_name = NULL;
-		}
-	}
-	JS_FreeValue(ctx, g);
-
-	if (log_name) {
-#ifndef GPAC_DISABLE_LOG
-		GF_LOG(logl, ltool, ("[%s] ", log_name));
-#else
-		fprintf(stderr, "[%s] ", log_name);
-#endif
-	}
-	if (error_type==2) {
-#ifndef GPAC_DISABLE_LOG
-		GF_LOG(logl, ltool, ("Throw "));
-#else
-		fprintf(stderr, "Throw ");
-#endif
-	}
-
- for (; i < argc; i++) {
-		const char *str = JS_ToCString(ctx, argv[i]);
- if (!str) return JS_EXCEPTION;
-
- if (logl==-1) {
-			gf_sys_format_help(stderr, GF_PRINTARG_HIGHLIGHT_FIRST, "%s\n", str);
-		} else if (logl==-2) {
-			gf_sys_format_help(stderr, 0, "%s\n", str);
-		} else if (!log_name || (logl<0)) {
-			fprintf(stderr, "%s%s", (first) ? "" : " ", str);
-		} else {
-#ifndef GPAC_DISABLE_LOG
-			GF_LOG(logl, ltool, ("%s%s", (first) ? "" : " ", str));
-#else
-			fprintf(stderr, "%s%s", (first) ? "" : " ", str);
-#endif
-		}
- JS_FreeCString(ctx, str);
- first=GF_FALSE;
- }
-#ifndef GPAC_DISABLE_LOG
- 	GF_LOG(logl, ltool, ("\n"));
-#else
-	fprintf(stderr, "\n");
-#endif
-	if (c_logname) JS_FreeCString(ctx, c_logname);
-	return JS_UNDEFINED;
-}
-JSValue js_print(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
-{
-	return js_print_ex(ctx, this_val, argc, argv, GF_LOG_CONSOLE, GF_FALSE);
-
-}
-
-void js_dump_error(JSContext *ctx)
-{
- JSValue exception_val;
- Bool is_error;
-	u32 err_type = 1;
- exception_val = JS_GetException(ctx);
- is_error = JS_IsError(ctx, exception_val);
- if (!is_error) err_type = 2;
-
-
- js_print_ex(ctx, JS_NULL, 1, (JSValueConst *)&exception_val, GF_LOG_SCRIPT, err_type);
-
- if (is_error) {
- JSValue val = JS_GetPropertyStr(ctx, exception_val, "stack");
- if (!JS_IsUndefined(val)) {
-			const char *stack = JS_ToCString(ctx, val);
-#ifndef GPAC_DISABLE_LOG
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("%s\n", stack) );
-#else
-			fprintf(stderr, "%s\n", stack);
-#endif
- JS_FreeCString(ctx, stack);
- }
- JS_FreeValue(ctx, val);
- }
- JS_FreeValue(ctx, exception_val);
-}
-
-void js_do_loop(JSContext *ctx)
-{
-	while (1) {
-		JSContext *ctx1;
-		int err = JS_ExecutePendingJob(JS_GetRuntime(ctx), &ctx1);
-		if (err <= 0) {
-			if (err < 0) {
-				js_dump_error(ctx1);
-			}
-			break;
-		}
-	}
-}
-
 #ifndef GPAC_DISABLE_VRML
 
 /*MPEG4 & X3D tags (for node tables & script handling)*/
 #include <gpac/nodes_mpeg4.h>
 #include <gpac/nodes_x3d.h>
 
-void SFColor_fromHSV(SFColor *col)
+static void SFColor_fromHSV(SFColor *col)
 {
 	Fixed f, q, t, p, hue, sat, val;
 	u32 i;
@@ -584,7 +253,7 @@
 	}
 }
 
-void SFColor_toHSV(SFColor *col)
+static void SFColor_toHSV(SFColor *col)
 {
 	Fixed h, s;
 	Fixed _max = MAX(col->red, MAX(col->green, col->blue));
@@ -636,7 +305,7 @@
 
 static JSValue getName(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
-	return JS_NewString(ctx, "GPAC RichMediaEngine");
+	return JS_NewString(ctx, "GPAC");
 }
 static JSValue getVersion(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
@@ -703,14 +372,14 @@
 		GF_SAFEALLOC(node->sgprivate->interact, struct _node_interactive_ext);
 		if (!node->sgprivate->interact) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRMLJS] Failed to create interact storage\n"));
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(priv->js_ctx);
 		}
 	}
 	if (!node->sgprivate->interact->js_binding) {
 		GF_SAFEALLOC(node->sgprivate->interact->js_binding, struct _node_js_binding);
 		if (!node->sgprivate->interact->js_binding) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRMLJS] Failed to create JS bindings storage\n"));
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(priv->js_ctx);
 		}
 		node->sgprivate->interact->js_binding->fields = gf_list_new();
 	}
@@ -732,7 +401,7 @@
 	const char *url;
 	GF_Node *node = JS_GetContextOpaque(c);
 	JSValue aval = JS_UNDEFINED;
-	if (!node || !argc || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	if (!node || !argc || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
 
 	if ((argc>1) && JS_IsBool(argv[1])) no_complain = (JS_ToBool(c,argv[1])) ? 1 : 0;
 
@@ -777,7 +446,7 @@
 	JS_FreeCString(c, str);
 	return dom_element_construct(c, node);
 #else
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 #endif
 }
 
@@ -792,9 +461,9 @@
 	if (JS_IsString(argv[0])) name = JS_ToCString(c, argv[0]);
 	else if (JS_IsInteger(argv[0])) {
 		if (JS_ToInt32(c, &ID, argv[0]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 	}
-	if (!ID && !name) return JS_EXCEPTION;
+	if (!ID && !name) return GF_JS_EXCEPTION(c);
 
 	elt = NULL;
 	if (ID) elt = gf_sg_find_node(sc->sgprivate->scenegraph, ID);
@@ -855,7 +524,7 @@
 	JS_FreeValue(priv->js_ctx, argv[1]);
 	JS_FreeValue(priv->js_ctx, rval);
 
-	js_do_loop(priv->js_ctx);
+	js_std_loop(priv->js_ctx);
 	gf_js_lock(priv->js_ctx, 0);
 
 	do_js_gc(priv->js_ctx, node);
@@ -869,16 +538,16 @@
 	GF_FieldInfo info;
 	u32 f_id1, f_id2;
 	GF_Err e;
-	if (argc!=4) return JS_EXCEPTION;
+	if (argc!=4) return GF_JS_EXCEPTION(c);
 	ptr = (GF_JSField *) JS_GetOpaque(argv[0], SFNodeClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 
 	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	n1 = * ((GF_Node **)ptr->field.far_ptr);
-	if (!n1) return JS_EXCEPTION;
+	if (!n1) return GF_JS_EXCEPTION(c);
 	n2 = NULL;
 
-	if (!JS_IsString(argv[1])) return JS_EXCEPTION;
+	if (!JS_IsString(argv[1])) return GF_JS_EXCEPTION(c);
 	f1 = JS_ToCString(c, argv[1]);
 	if (!f1) return JS_FALSE;
 	if (!strnicmp(f1, "_field", 6)) {
@@ -889,10 +558,10 @@
 		f_id1 = info.fieldIndex;
 	}
 	JS_FreeCString(c, f1);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 
-	if (!JS_IsObject(argv[2])) return JS_EXCEPTION;
+	if (!JS_IsObject(argv[2])) return GF_JS_EXCEPTION(c);
 
 	ptr = (GF_JSField *) JS_GetOpaque(argv[2], SFNodeClass.class_id);
 
@@ -902,10 +571,10 @@
 		GF_Route *r;
 		assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 		n2 = * ((GF_Node **)ptr->field.far_ptr);
-		if (!n2) return JS_EXCEPTION;
+		if (!n2) return GF_JS_EXCEPTION(c);
 
 		f2 = JS_ToCString(c, argv[3]);
-		if (!f2) return JS_EXCEPTION;
+		if (!f2) return GF_JS_EXCEPTION(c);
 
 		if (!strnicmp(f2, "_field", 6)) {
 			f_id2 = atoi(f2+6);
@@ -925,18 +594,19 @@
 			f_id2 = info.fieldIndex;
 		}
 		JS_FreeCString(c, f2);
-		if (e != GF_OK) return JS_EXCEPTION;
+		if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 		r = gf_sg_route_new(n1->sgprivate->scenegraph, n1, f_id1, n2, f_id2);
-		if (!r) return JS_EXCEPTION;
+		if (!r) return GF_JS_EXCEPTION(c);
 	}
 	/*route to object*/
 	else {
 		u32 i = 0;
 		const char *fun_name;
+		char *fun_name_dup=NULL;
 		JSAtom atom;
 		GF_RouteToScript *r = NULL;
-		if (!JS_IsFunction(c, argv[3]) ) return JS_EXCEPTION;
+		if (!JS_IsFunction(c, argv[3]) ) return GF_JS_EXCEPTION(c);
 
 		atom = JS_ValueToAtom(c, argv[3]);
 		fun_name = JS_AtomToCString(c, atom);
@@ -950,12 +620,17 @@
 					break;
 			}
 		}
+		if (!r) fun_name_dup = gf_strdup(fun_name);
 		JS_FreeCString(c, fun_name);
 		JS_FreeAtom(c, atom);
 
 		if ( !r ) {
 			GF_SAFEALLOC(r, GF_RouteToScript)
-			if (!r) return JS_FALSE;
+			if (!r) {
+				if (fun_name_dup) gf_free(fun_name_dup);
+				return JS_FALSE;
+			}
+			r->script_route = 1;
 			r->FromNode = n1;
 			r->FromField.fieldIndex = f_id1;
 			gf_node_get_field(r->FromNode, f_id1, &r->FromField);
@@ -965,7 +640,9 @@
 			r->ToField.on_event_in = on_route_to_object;
 			r->ToField.eventType = GF_SG_EVENT_IN;
 			r->ToField.far_ptr = NULL;
-			r->ToField.name = fun_name;
+			//store fun text val in name, route to obj cannot have their ID set
+			r->name = fun_name_dup;
+			r->ToField.name = r->name;
 
 			r->obj = JS_DupValue(c, argv[2]);
 			r->fun = JS_DupValue(c, argv[3]);
@@ -977,7 +654,9 @@
 				GF_SAFEALLOC(n1->sgprivate->interact, struct _node_interactive_ext);
 				if (!n1->sgprivate->interact) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRMLJS] Failed to create interact storage\n"));
-					return JS_EXCEPTION;
+					if (fun_name_dup) gf_free(fun_name_dup);
+					gf_free(r);
+					return GF_JS_EXCEPTION(c);
 				}
 			}
 			if (!n1->sgprivate->interact->routes) n1->sgprivate->interact->routes = gf_list_new();
@@ -1001,10 +680,10 @@
 	if (argc!=4) return JS_FALSE;
 
 	if (!JS_IsObject(argv[0]) || JS_IsNull(argv[0]))
-	 	return JS_EXCEPTION;
+	 	return GF_JS_EXCEPTION(c);
 
 	ptr = JS_GetOpaque(argv[0], SFNodeClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 
 	if (JS_IsString(argv[1]) && JS_IsNull(argv[2]) && JS_IsNull(argv[3])) {
@@ -1019,16 +698,16 @@
 		JS_FreeCString(c, f1);
 		return JS_UNDEFINED;
 	}
-	if (!JS_IsString(argv[1]) || !JS_IsString(argv[3])) return JS_EXCEPTION;
+	if (!JS_IsString(argv[1]) || !JS_IsString(argv[3])) return GF_JS_EXCEPTION(c);
 
 	n1 = * ((GF_Node **)ptr->field.far_ptr);
 
 	ptr = JS_GetOpaque(argv[2], SFNodeClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	n2 = * ((GF_Node **)ptr->field.far_ptr);
 
-	if (!n1 || !n2) return JS_EXCEPTION;
+	if (!n1 || !n2) return GF_JS_EXCEPTION(c);
 	if (!n1->sgprivate->interact) return JS_UNDEFINED;
 
 	f1 = JS_ToCString(c, argv[1]);
@@ -1036,7 +715,7 @@
 	if (!f1 || !f2) {
 		JS_FreeCString(c, f1);
 		JS_FreeCString(c, f2);
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	}
 
 	if (!strnicmp(f1, "_field", 6)) {
@@ -1047,7 +726,7 @@
 		f_id1 = info.fieldIndex;
 	}
 	JS_FreeCString(c, f1);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	if (!strnicmp(f2, "_field", 6)) {
 		f_id2 = atoi(f2+6);
@@ -1057,7 +736,7 @@
 		f_id2 = info.fieldIndex;
 	}
 	JS_FreeCString(c, f2);
-	if (e != GF_OK) return JS_EXCEPTION;
+	if (e != GF_OK) return GF_JS_EXCEPTION(c);
 
 	i=0;
 	while ((rts = gf_list_enum(n1->sgprivate->interact->routes, &i))) {
@@ -1079,7 +758,7 @@
 	GF_JSField *f;
 	M_Script *script = (M_Script *) JS_GetContextOpaque(c);
 
-	if (argc < 1) return JS_EXCEPTION;
+	if (argc < 1) return GF_JS_EXCEPTION(c);
 
 	if (JS_IsString(argv[0])) {
 		Bool res;
@@ -1090,10 +769,10 @@
 		JS_FreeCString(c, par.uri.url);
 		return res ? JS_TRUE : JS_FALSE;
 	}
-	if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+	if (!JS_IsObject(argv[0])) return GF_JS_EXCEPTION(c);
 
 	f = (GF_JSField *) JS_GetOpaque_Nocheck(argv[0]);
-	if (!f || !f->mfvals) return JS_EXCEPTION;
+	if (!f || !f->mfvals) return GF_JS_EXCEPTION(c);
 
 	for (i=0; i<f->mfvals_count; i++) {
 		Bool res=GF_FALSE;
@@ -1115,7 +794,7 @@
 {
 	GF_JSAPIParam par;
 	GF_Node *node = JS_GetContextOpaque(c);
-	if (!argc || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	if (!argc || !JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
 	par.uri.url = (char *) JS_ToCString(c, argv[0]);
 	ScriptAction(c, NULL, GF_JSAPI_OP_SET_TITLE, node->sgprivate->scenegraph->RootNode, &par);
 	JS_FreeCString(c, par.uri.url);
@@ -1133,13 +812,13 @@
 	const char *str;
 	GF_List *nlist;
 	GF_Node *sc_node = JS_GetContextOpaque(c);
-	if (!sc_node || (argc < 1)) return JS_EXCEPTION;
+	if (!sc_node || (argc < 1)) return GF_JS_EXCEPTION(c);
 
-	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
+	if (!JS_IsString(argv[0])) return GF_JS_EXCEPTION(c);
 	str = JS_ToCString(c, argv[0]);
 	nlist = gf_sm_load_bt_from_string(sc_node->sgprivate->scenegraph, (char *)str, 1);
 	JS_FreeCString(c, str);
-	if (!nlist) return JS_EXCEPTION;
+	if (!nlist) return GF_JS_EXCEPTION(c);
 
 	priv = JS_GetScriptStack(c);
 	memset(&field, 0, sizeof(GF_FieldInfo));
@@ -1156,7 +835,7 @@
 	gf_list_del(nlist);
 	return res;
 #else
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 #endif
 }
 
@@ -1232,9 +911,9 @@
 	GF_ScriptField *sf;
 
 	script = JS_GetScriptStack(c);
-	if (!script) return JS_EXCEPTION;
+	if (!script) return GF_JS_EXCEPTION(c);
 	n = (GF_Node *) JS_GetScript(c);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	i=0;
 	while ((sf = gf_list_enum(script->fields, &i))) {
@@ -1246,7 +925,7 @@
 			return JS_UNDEFINED;
 		}
 	}
-	return JS_EXCEPTION;
+	return GF_JS_EXCEPTION(c);
 }
 
 
@@ -1270,13 +949,6 @@
 		gf_dynstrcat(str, temp, NULL);
 		break;
 	}
-	case GF_SG_VRML_SFVEC4F:
-	{
-		SFVec4f val = * ((SFVec4f *) f_ptr);
-		sprintf(temp, "%f %f %f %f", FIX2FLT(val.x), FIX2FLT(val.y), FIX2FLT(val.z), FIX2FLT(val.q));
-		gf_dynstrcat(str, temp, NULL);
-		break;
-	}
 	case GF_SG_VRML_SFROTATION:
 	{
 		SFRotation val = * ((SFRotation *) f_ptr);
@@ -1327,7 +999,7 @@
 	if (!JS_IsUndefined(ptr->obj) && is_js_call) {
 		if (ptr->js_ctx) {
 			GF_ScriptPriv *priv;
-			if (gf_list_find(js_rt->allocated_contexts, ptr->js_ctx) < 0)
+			if (!gs_js_context_is_valid(ptr->js_ctx))
 				return;
 			priv = JS_GetScriptStack(ptr->js_ctx);
 			gf_list_del_item(priv->jsf_cache, ptr);
@@ -1409,7 +1081,7 @@
 	M_Script *sc = JS_GetScript(c);
 
 	if (argc && !JS_IsString(argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	tag = 0;
 	if (!argc) {
@@ -1425,7 +1097,7 @@
 
 	ID = 0;
 	node_name = (char *) JS_ToCString(c, argv[0]);
-	if (!node_name) return JS_EXCEPTION;
+	if (!node_name) return GF_JS_EXCEPTION(c);
 
 	if (!strnicmp(node_name, "_proto", 6)) {
 		ID = atoi(node_name+6);
@@ -1515,11 +1187,11 @@
 	const char *name;
 
 	f = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(c);
 
 	str[0] = 0;
 	n = * ((GF_Node **)f->field.far_ptr);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 
 	name = gf_node_get_name_and_id(n, &id);
 	if (id) {
@@ -1538,9 +1210,9 @@
 	GF_Node *n;
 	GF_JSField *f;
 	f = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(c);
 	n = * ((GF_Node **)f->field.far_ptr);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 	return JS_NewFloat64(c, gf_node_get_scene_time(n));
 }
 
@@ -1555,14 +1227,14 @@
 	GF_ScriptPriv *priv;
 
 	ptr = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	n = * ((GF_Node **)ptr->field.far_ptr);
-	if (!n) return JS_EXCEPTION;
+	if (!n) return GF_JS_EXCEPTION(c);
 	priv = JS_GetScriptStack(c);
 
 	fieldName = JS_AtomToCString(c, atom);
-	if (!fieldName) return JS_EXCEPTION;
+	if (!fieldName) return GF_JS_EXCEPTION(c);
 
 	if (!strcmp(fieldName, "toString")) {
 		JS_FreeCString(c, fieldName);
@@ -1709,12 +1381,12 @@
 	u32 w, h, nbComp;
 	MFInt32 *pixels;
 	JSValue obj;
-	if (argc<4) return JS_EXCEPTION;
+	if (argc<4) return GF_JS_EXCEPTION(c);
 	if (!JS_IsInteger(argv[0]) || !JS_IsInteger(argv[1]) || !JS_IsInteger(argv[2]) || !JS_IsObject(argv[3]) )
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	pixels = JS_GetOpaque(argv[3], MFInt32Class.class_id);
-	if (!pixels) return JS_EXCEPTION;
+	if (!pixels) return GF_JS_EXCEPTION(c);
 
 	obj = JS_NewObjectClass(c, SFImageClass.class_id);
 	if (JS_IsException(obj)) return obj;
@@ -1730,7 +1402,7 @@
 	SFImage *sfi;
 	GF_ScriptPriv *priv = JS_GetScriptStack(c);
 	GF_JSField *val = (GF_JSField *) JS_GetOpaque(this_val, SFImageClass.class_id);
-	if (!val) return JS_EXCEPTION;
+	if (!val) return GF_JS_EXCEPTION(c);
 	sfi = (SFImage*)val->field.far_ptr;
 
 	switch (magic) {
@@ -1759,7 +1431,7 @@
 	Bool changed = 0;
 	SFImage *sfi;
 	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFImageClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 
 	sfi = (SFImage*)ptr->field.far_ptr;
 	switch (magic) {
@@ -1796,7 +1468,7 @@
 		GF_JSField *sf;
 		u32 len, i;
 		sf = JS_GetOpaque(value, MFInt32Class.class_id);
-		if (!sf) return JS_EXCEPTION;
+		if (!sf) return GF_JS_EXCEPTION(c);
 		pixels = (MFInt32 *) sf->field.far_ptr;
 		if (sfi->pixels) gf_free(sfi->pixels);
 		len = sfi->width*sfi->height*sfi->numComponents;
@@ -1842,7 +1514,7 @@
 static JSValue vec2f_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_JSField *val = (GF_JSField *) JS_GetOpaque(obj, SFVec2fClass.class_id);
-	if (!val) return JS_EXCEPTION;
+	if (!val) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case 0:
@@ -1861,7 +1533,7 @@
 	Fixed v;
 	Bool changed = 0;
 	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFVec2fClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 
 	if (JS_ToFloat64(c, &d, value)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Value is not a number while assigning SFVec2f\n"));
@@ -1887,19 +1559,19 @@
 
 static JSValue vec2f_operand(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, u32 op)
 {
-	SFVec2f *v1, *v2;
+	SFVec2f *v1, *v2=NULL;
 	Double d = 0.0;
 	JSValue pNew;
 	Fixed v;
 	GF_JSField *p1 = (GF_JSField *) JS_GetOpaque(obj, SFVec2fClass.class_id);
-	if (!p1) return JS_EXCEPTION;
+	if (!p1) return GF_JS_EXCEPTION(c);
 	GF_JSField *p2 = NULL;
 
 	if (argc) {
 		if (JS_IsObject(argv[0])) {
 			p2 = (GF_JSField *) JS_GetOpaque(argv[0], SFVec2fClass.class_id);
 		} else if (JS_ToFloat64(c, &d, argv[0]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 	}
 
 	v1 = ((GF_JSField *) p1)->field.far_ptr;
@@ -1910,11 +1582,11 @@
 	case 5:
 		return JS_NewFloat64(c, FIX2FLT(gf_v2d_len(v1)) );
 	case 7:
-		if (!p2) return JS_EXCEPTION;
+		if (!p2) return GF_JS_EXCEPTION(c);
 		return JS_NewFloat64(c, FIX2FLT( gf_mulfix(v1->x, v2->x) + gf_mulfix(v1->y, v2->y) ) );
 	case 0:
 	case 1:
-		if (!p2) return JS_EXCEPTION;
+		if (!p2) return GF_JS_EXCEPTION(c);
 	}
 
 	pNew = JS_NewObjectClass(c, SFVec2fClass.class_id);
@@ -2009,7 +1681,7 @@
 static JSValue vec3f_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_JSField *val = (GF_JSField *) JS_GetOpaque(obj, SFVec3fClass.class_id);
-	if (!val) return JS_EXCEPTION;
+	if (!val) return GF_JS_EXCEPTION(c);
 
 	switch (magic) {
 	case 0:
@@ -2028,7 +1700,7 @@
 	Fixed v;
 	Bool changed = 0;
 	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFVec3fClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 
 	if (JS_ToFloat64(c, &d, value)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Value is not a number while assigning SFVec3f\n"));
@@ -2066,14 +1738,14 @@
 	JSValue pNew;
 	Fixed v;
 	GF_JSField *p1 = (GF_JSField *) JS_GetOpaque(obj, SFVec3fClass.class_id);
-	if (!p1) return JS_EXCEPTION;
+	if (!p1) return GF_JS_EXCEPTION(c);
 	GF_JSField *p2 = NULL;
 
 	if (argc) {
 		if (JS_IsObject(argv[0])) {
 			p2 = (GF_JSField *) JS_GetOpaque(argv[0], SFVec3fClass.class_id);
 		} else if (JS_ToFloat64(c, &d, argv[0]))
-			return JS_EXCEPTION;
+			return GF_JS_EXCEPTION(c);
 	}
 
 	v1 = ((GF_JSField *) p1)->field.far_ptr;
@@ -2084,12 +1756,12 @@
 	case 0:
 	case 1:
 	case 8:
-		if (!p2) return JS_EXCEPTION;
+		if (!p2) return GF_JS_EXCEPTION(c);
 	case 5:
 		return JS_NewFloat64(c, FIX2FLT(gf_vec_len(*v1)) );
 	case 7:
 		vec = *v1;
-		if (!p2) return JS_EXCEPTION;
+		if (!p2) return GF_JS_EXCEPTION(c);
 		wvec = *v2;
 		return JS_NewFloat64(c, FIX2FLT(gf_vec_dot(vec, wvec)) );
 	}
@@ -2203,10 +1875,10 @@
 	}
 
 
-	if (argc!=2) return JS_EXCEPTION;
-	if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+	if (argc!=2) return GF_JS_EXCEPTION(c);
+	if (!JS_IsObject(argv[0])) return GF_JS_EXCEPTION(c);
 	f = JS_GetOpaque(argv[0], SFVec3fClass.class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(c);
 
 	v1 = * (SFVec3f *) (f)->field.far_ptr;
 	if (JS_IsNumber(argv[1])) {
@@ -2217,7 +1889,7 @@
 
 	if (!JS_IsObject(argv[1])) return JS_FALSE;
 	f = JS_GetOpaque(argv[1], SFVec3fClass.class_id);
-	if (!f) return JS_EXCEPTION;
+	if (!f) return GF_JS_EXCEPTION(c);
 	v2 = * (SFVec3f *) (f)->field.far_ptr;
 	l1 = gf_vec_len(v1);
 	l2 = gf_vec_len(v2);
@@ -2233,7 +1905,7 @@
 static JSValue rot_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_JSField *val = (GF_JSField *) JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!val) return JS_EXCEPTION;
+	if (!val) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case 0:
 		return JS_NewFloat64(c, FIX2FLT( ((SFRotation*)val->field.far_ptr)->x));
@@ -2253,7 +1925,7 @@
 	Fixed v;
 	Bool changed = 0;
 	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 
 	if (JS_ToFloat64(c, &d, value)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Value is not a number while assigning SFRotation\n"));
@@ -2293,7 +1965,7 @@
 	SFRotation r;
 	JSValue pNew;
 	GF_JSField *p = JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	r = * (SFRotation *) (p)->field.far_ptr;
 	pNew = JS_NewObjectClass(c, SFVec3fClass.class_id);
 	SFVec3f_Create(c, pNew, r.x, r.y, r.z);
@@ -2304,7 +1976,7 @@
 	SFRotation r;
 	JSValue pNew;
 	GF_JSField *p = JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	r = * (SFRotation *) (p)->field.far_ptr;
 	pNew = JS_NewObjectClass(c, SFRotationClass.class_id);
 	SFRotation_Create(c, pNew, r.x, r.y, r.z, r.q-GF_PI);
@@ -2318,12 +1990,12 @@
 	JSValue pNew;
 
 	if (argc<=0 || !JS_IsObject(argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	GF_JSField *p = JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	r1 = * (SFRotation *) (p)->field.far_ptr;
 	p = JS_GetOpaque(argv[0], SFRotationClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	r2 = * (SFRotation *) (p)->field.far_ptr;
 
 	q1 = gf_quat_from_rotation(r1);
@@ -2343,14 +2015,14 @@
 	GF_Matrix mx;
 	JSValue pNew;
 	if (argc<=0 || !JS_IsObject(argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 
 	GF_JSField *p = JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	r = * (SFRotation *) (p)->field.far_ptr;
 
 	p = JS_GetOpaque(argv[0], SFVec3fClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	v = * (SFVec3f *) (p)->field.far_ptr;
 
 	gf_mx_init(mx);
@@ -2366,13 +2038,13 @@
 	SFRotation *r;
 	GF_JSField *ptr;
 	if (argc<=0 || !JS_IsObject(argv[0]))
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	ptr = JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 	r = (SFRotation *) (ptr)->field.far_ptr;
 
 	GF_JSField *p = JS_GetOpaque(argv[0], SFVec3fClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	v = * (SFVec3f *) (p)->field.far_ptr;
 
 	r->x = v.x;
@@ -2389,17 +2061,17 @@
 	Double d;
 	GF_JSField *p;
 
-	if (argc<=0 || !JS_IsObject(argv[0]))
-		return JS_EXCEPTION;
+	if ((argc<2) || !JS_IsObject(argv[0]))
+		return GF_JS_EXCEPTION(c);
 	p = JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	v1 = * (SFRotation *) (p)->field.far_ptr;
 
 	p = JS_GetOpaque(argv[0], SFRotationClass.class_id);
-	if (!p) return JS_EXCEPTION;
+	if (!p) return GF_JS_EXCEPTION(c);
 	v2 = * (SFRotation *) (p)->field.far_ptr;
 
-	if (JS_ToFloat64(c, &d, argv[1])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &d, argv[1])) return GF_JS_EXCEPTION(c);
 
 	q1 = gf_quat_from_rotation(v1);
 	q2 = gf_quat_from_rotation(v2);
@@ -2439,7 +2111,7 @@
 static JSValue color_getProperty(JSContext *c, JSValueConst obj, int magic)
 {
 	GF_JSField *val = (GF_JSField *) JS_GetOpaque(obj, SFColorClass.class_id);
-	if (!val) return JS_EXCEPTION;
+	if (!val) return GF_JS_EXCEPTION(c);
 	switch (magic) {
 	case 0:
 		return JS_NewFloat64(c, FIX2FLT( ((SFColor*)val->field.far_ptr)->red));
@@ -2461,7 +2133,7 @@
 	Fixed v;
 	Bool changed = 0;
 	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFColorClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 
 	if (JS_ToFloat64(c, &d, value)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Value is not a number while assigning SFColor\n"));
@@ -2495,14 +2167,14 @@
 {
 	SFColor *v1, hsv;
 	Double h=0, s=0, v=0;
-	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFColorClass.class_id);
+	if (!ptr) return GF_JS_EXCEPTION(c);
 	if (argc != 3) return JS_FALSE;
 
 	v1 = (ptr)->field.far_ptr;
-	if (JS_ToFloat64(c, &h, argv[0])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &s, argv[1])) return JS_EXCEPTION;
-	if (JS_ToFloat64(c, &v, argv[2])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &h, argv[0])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &s, argv[1])) return GF_JS_EXCEPTION(c);
+	if (JS_ToFloat64(c, &v, argv[2])) return GF_JS_EXCEPTION(c);
 
 	hsv.red = FLT2FIX( h);
 	hsv.green = FLT2FIX( s);
@@ -2518,9 +2190,8 @@
 	SFColor *v1, hsv;
 	JSValue arr;
 
-	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFRotationClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
-	if (argc != 3) return JS_FALSE;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFColorClass.class_id);
+	if (!ptr) return GF_JS_EXCEPTION(c);
 
 	v1 = (ptr)->field.far_ptr;
 	hsv = *v1;
@@ -2597,7 +2268,6 @@
 	GF_JSField *ptr = JS_GetOpaque_Nocheck(obj);
 
 	JS_ObjectDestroyed(rt, obj, ptr, 1);
-
 	if (!ptr) return;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] unregistering MFField %s\n", ptr->field.name));
@@ -2637,7 +2307,7 @@
 		if (!strcmp(str, "length")) {
 			GF_JSField *f_ptr = JS_GetOpaque_Nocheck(obj);
 			if (!f_ptr) {
-				ret = JS_EXCEPTION;
+				ret = GF_JS_EXCEPTION(c);
 			} else if (f_ptr->field.fieldType==GF_SG_VRML_MFNODE) {
 				ret = JS_NewInt32(c, gf_node_list_get_count(*(GF_ChildNodeItem **)f_ptr->field.far_ptr) );
 			} else {
@@ -3016,7 +2686,7 @@
 	GF_Node *node;
 	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(this_val, SFNodeClass.class_id);
 	if (!ptr)
-		return JS_EXCEPTION;
+		return GF_JS_EXCEPTION(c);
 	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	node = * ((GF_Node **)ptr->field.far_ptr);
 	return gf_sg_js_event_add_listener(c, this_val, argc, argv, node);
@@ -3026,7 +2696,7 @@
 {
 	GF_Node *node;
 	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(this_val, SFNodeClass.class_id);
-	if (!ptr) return JS_EXCEPTION;
+	if (!ptr) return GF_JS_EXCEPTION(c);
 	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	node = * ((GF_Node **)ptr->field.far_ptr);
 	return gf_sg_js_event_remove_listener(c, this_val, argc, argv, node);
@@ -3132,6 +2802,7 @@
 	JS_CGETSET_MAGIC_DEF("y", image_getProperty, image_setProperty, 1),
 	JS_CGETSET_MAGIC_DEF("comp", image_getProperty, image_setProperty, 2),
 	JS_CGETSET_MAGIC_DEF("array", image_getProperty, image_setProperty, 3),
+	JS_CFUNC_DEF("toString", 0, field_toString),
 };
 
 static const JSCFunctionListEntry MFArray_funcs[] =
@@ -3156,8 +2827,10 @@
 		u32 i=0;
 		GF_RouteToScript *r;
 		while ( (r = gf_list_enum(jsf->node->sgprivate->interact->routes, &i))) {
-			JS_MarkValue(rt, r->fun, mark_func);
-			JS_MarkValue(rt, r->obj, mark_func);
+			if (r->script_route) {
+				JS_MarkValue(rt, r->fun, mark_func);
+				JS_MarkValue(rt, r->obj, mark_func);
+			}
 		}
 	}
 	if (jsf->mfvals) {
@@ -3173,7 +2846,7 @@
 	if (!_class.class_id) {\
 		JS_NewClassID(&(_class.class_id)); \
 		_class.class.class_name = _name; \
-		JS_NewClass(js_rt->js_runtime, _class.class_id, &(_class.class));\
+		JS_NewClass(js_runtime, _class.class_id, &(_class.class));\
 	}\
 
 #define SETUP_JSCLASS(_class, _name, _proto_funcs, _construct, _finalize, _exotic) \
@@ -3184,7 +2857,7 @@
 		_class.class.finalizer = _finalize;\
 		_class.class.exotic = _exotic;\
 		_class.class.gc_mark = field_gc_mark;\
-		JS_NewClass(js_rt->js_runtime, _class.class_id, &(_class.class));\
+		JS_NewClass(js_runtime, _class.class_id, &(_class.class));\
 	}\
 	{ \
 	JSValue _proto_obj = JS_NewObjectClass(sc->js_ctx, _class.class_id);\
@@ -3197,7 +2870,7 @@
 static void vrml_js_init_api(GF_ScriptPriv *sc, GF_Node *script)
 {
 	sc->js_obj = JS_GetGlobalObject(sc->js_ctx);
-
+	JSRuntime *js_runtime = JS_GetRuntime(sc->js_ctx);
 	//init all our classes
 	SETUP_JSCLASS_BASIC(globalClass, "global");
 	SETUP_JSCLASS_BASIC(AnyClass, "AnyClass");
@@ -4026,8 +3699,11 @@
 
 static void JS_ReleaseRootObjects(GF_ScriptPriv *priv)
 {
+	JSRuntime *js_runtime = gf_js_get_rt();
+
 	/*pop the list rather than walk through it since unprotecting an element could trigger GC which in turn could modify this list content*/
 	while (gf_list_count(priv->jsf_cache)) {
+		JSValue obj;
 		GF_JSField *jsf = gf_list_pop_back(priv->jsf_cache);
 		assert(jsf);
 
@@ -4038,21 +3714,22 @@
 		We therefore destroy by hand all SFNode (obj rooted) and MFNode (for js_list)
 		*/
 
-		JS_FreeValue(priv->js_ctx, jsf->obj);
-
-		if (jsf->mfvals)
-			array_finalize_ex(js_rt->js_runtime, jsf->obj, 0);
-		else if (jsf->node)
-			node_finalize_ex(js_rt->js_runtime, jsf->obj, 0);
+		obj = jsf->obj;
+		jsf->obj = JS_UNDEFINED;
+		if (jsf->mfvals && js_runtime)
+			array_finalize_ex(js_runtime, obj, 0);
+		else if (jsf->node && js_runtime)
+			node_finalize_ex(js_runtime, obj, 0);
 		else
 			jsf->js_ctx=NULL;
 
-		jsf->obj = JS_UNDEFINED;
+		JS_FreeValue(priv->js_ctx, obj);
 	}
 }
 
 static void JS_PreDestroy(GF_Node *node)
 {
+	GF_SceneGraph *scene;
 	GF_ScriptPriv *priv = node->sgprivate->UserPrivate;
 	if (!priv) return;
 
@@ -4081,6 +3758,19 @@
 
 	JS_FreeValue(priv->js_ctx, priv->js_obj);
 
+
+	scene = JS_GetContextOpaque(priv->js_ctx);
+	if (scene && scene->__reserved_null) {
+		GF_Node *n = JS_GetContextOpaque(priv->js_ctx);
+		scene = n->sgprivate->scenegraph;
+	}
+	if (scene && scene->attached_session) {
+		void gf_fs_unload_js_api(JSContext *c, GF_FilterSession *fs);
+
+		gf_fs_unload_js_api(priv->js_ctx, scene->attached_session);
+	}
+
+
 	gf_js_lock(priv->js_ctx, 0);
 
 	gf_js_delete_context(priv->js_ctx);
@@ -4208,7 +3898,7 @@
 	JS_FreeValue(priv->js_ctx, argv[0]);
 	JS_FreeValue(priv->js_ctx, argv[1]);
 
-	js_do_loop(priv->js_ctx);
+	js_std_loop(priv->js_ctx);
 	gf_js_lock(priv->js_ctx, 0);
 
 	gf_js_vrml_flush_event_out(node, priv);
@@ -4269,7 +3959,7 @@
 	}
 	gf_free(jsscript);
 	if (success)
-		js_do_loop(priv->js_ctx);
+		js_std_loop(priv->js_ctx);
 	return success;
 }
 
@@ -4383,9 +4073,7 @@
 	JS_SetContextOpaque(priv->js_ctx, node);
 	vrml_js_init_api(priv, node);
 
-	qjs_module_init_gpaccore(priv->js_ctx);
-	qjs_module_init_scenejs(priv->js_ctx);
-	qjs_module_init_storage(priv->js_ctx);
+	qjs_init_all_modules(priv->js_ctx, GF_TRUE, GF_TRUE);
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] Built-in classes initialized\n"));
 #ifndef GPAC_DISABLE_SVG
@@ -4440,7 +4128,7 @@
 	}
 
 	JS_FreeValue(priv->js_ctx, ret);
-	js_do_loop(priv->js_ctx);
+	js_std_loop(priv->js_ctx);
 
 	gf_js_lock(priv->js_ctx, 0);
 
@@ -4658,7 +4346,7 @@
 	event->is_vrml = prev_type;
 	JS_SetOpaque(priv->the_event, prev_event);
 
-	js_do_loop(priv->js_ctx);
+	js_std_loop(priv->js_ctx);
 	gf_js_lock(priv->js_ctx, 0);
 
 #endif
@@ -4690,11 +4378,9 @@
 GF_Node *gf_sg_js_get_node(JSContext *c, JSValue obj)
 {
 #ifndef GPAC_DISABLE_VRML
-	if (js_rt) {
-		GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
-		if (ptr && (ptr->field.fieldType==GF_SG_VRML_SFNODE))
-			return * ((GF_Node **)ptr->field.far_ptr);
-	}
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
+	if (ptr && (ptr->field.fieldType==GF_SG_VRML_SFNODE))
+		return * ((GF_Node **)ptr->field.far_ptr);
 #endif
 
 #ifndef GPAC_DISABLE_SVG
@@ -4720,62 +4406,3 @@
 	return 0;
 #endif
 }
-
-
-#ifdef GPAC_HAS_QJS
-
-/*
- * locking/try-locking the JS context
- *
- * */
-GF_EXPORT
-void gf_js_lock(struct JSContext *cx, Bool LockIt)
-{
-	if (!js_rt) return;
-
-	if (LockIt) {
-		gf_mx_p(js_rt->mx);
-	} else {
-		gf_mx_v(js_rt->mx);
-	}
-}
-
-GF_EXPORT
-Bool gf_js_try_lock(struct JSContext *cx)
-{
-	assert(cx);
-	if (gf_mx_try_lock(js_rt->mx)) {
-		return 1;
-	}
-	return 0;
-}
-
-JSRuntime *gf_js_get_rt()
-{
-	if (!js_rt) return NULL;
-	return js_rt->js_runtime;
-}
-
-#endif /* GPAC_HAS_QJS */
-
-GF_Err gf_scene_execute_script(GF_SceneGraph *sg, const char *com)
-{
-#if defined(GPAC_HAS_QJS) && !defined(GPAC_DISABLE_SVG)
-	u32 tag;
-	GF_Err e;
-	GF_Node *root = gf_sg_get_root_node(sg);
-	if (root) {
-		tag = gf_node_get_tag(root);
-		if (tag >= GF_NODE_RANGE_FIRST_SVG) {
-			GF_Err svg_exec_script(struct __tag_svg_script_ctx *svg_js, GF_SceneGraph *sg, const char *com);
-			return svg_exec_script(sg->svg_js, sg, (char *)com);
-		} else {
-			e = GF_NOT_SUPPORTED;
-			return e;
-		}
-	}
-	return GF_BAD_PARAM;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-}

gpac-1.0.1.tar.gz/src/scenegraph/vrml_proto.c -> gpac-2.0.0.tar.gz/src/scenegraph/vrml_proto.c Changed

@@ -841,25 +841,27 @@
 		GF_ProtoField *field = (GF_ProtoField *)gf_list_get(inst->fields, 0);
 		gf_list_rem(inst->fields, 0);
 
-		/*regular type*/
-		if ( (field->FieldType!=GF_SG_VRML_SFNODE) && (field->FieldType!=GF_SG_VRML_MFNODE)) {
-			gf_sg_vrml_field_pointer_del(field->field_pointer, field->FieldType);
-		}
-		/*node types: delete instances*/
-		else if (field->field_pointer) {
-			if (field->FieldType == GF_SG_VRML_SFNODE) {
-				gf_node_unregister((GF_Node *) field->field_pointer, (GF_Node *) inst);
-			} else {
-				GF_ChildNodeItem *list = (GF_ChildNodeItem *)field->field_pointer;
-				while (list) {
-					GF_ChildNodeItem *cur = list;
-					gf_node_unregister(list->node, (GF_Node *) inst);
-					list = list->next;
-					gf_free(cur);
+		if (field->field_pointer) {
+			/*regular type*/
+			if ( (field->FieldType!=GF_SG_VRML_SFNODE) && (field->FieldType!=GF_SG_VRML_MFNODE)) {
+				gf_sg_vrml_field_pointer_del(field->field_pointer, field->FieldType);
+			}
+			/*node types: delete instances*/
+			else {
+				if (field->FieldType == GF_SG_VRML_SFNODE) {
+					gf_node_unregister((GF_Node *) field->field_pointer, (GF_Node *) inst);
+				} else {
+					GF_ChildNodeItem *list = (GF_ChildNodeItem *)field->field_pointer;
+					while (list) {
+						GF_ChildNodeItem *cur = list;
+						gf_node_unregister(list->node, (GF_Node *) inst);
+						list = list->next;
+						gf_free(cur);
+					}
 				}
 			}
 		}
-
+		
 		gf_free(field);
 	}
 	gf_list_del(inst->fields);
@@ -990,6 +992,7 @@
 	GF_Err e;
 	GF_Route *r;
 	GF_FieldInfo field, nodeField;
+	if (!protoinst) return GF_BAD_PARAM;
 	if (protoinst->sgprivate->tag != TAG_ProtoNode) return GF_BAD_PARAM;
 
 	e = gf_node_get_field(protoinst, protoFieldIndex, &field);
@@ -1250,7 +1253,7 @@
 GF_EXPORT
 u32 gf_sg_proto_get_id(GF_Proto *proto)
 {
-	return proto->ID;
+	return proto ? proto->ID : 0;
 }
 
 GF_EXPORT

gpac-1.0.1.tar.gz/src/scenegraph/vrml_script.c -> gpac-2.0.0.tar.gz/src/scenegraph/vrml_script.c Changed

gpac-1.0.1.tar.gz/src/scenegraph/vrml_tools.c -> gpac-2.0.0.tar.gz/src/scenegraph/vrml_tools.c Changed

@@ -610,10 +610,6 @@
 void gf_sg_sfstring_del(SFString par) {
 	if (par.buffer) gf_free(par.buffer);
 }
-void gf_sg_sfscript_del(SFScript par) {
-	if (par.script_text) gf_free(par.script_text);
-}
-
 
 void gf_sg_sfcommand_del(SFCommandBuffer cb)
 {
@@ -1119,7 +1115,7 @@
 GF_Err gf_sg_vrml_mf_reset(void *mf, u32 FieldType)
 {
 	GenMFField *mffield = (GenMFField *)mf;
-	if (!mffield->array) return GF_OK;
+	if (!mffield || !mffield->array) return GF_OK;
 
 	//field we can't copy
 	if (gf_sg_vrml_is_sf_field(FieldType)) return GF_BAD_PARAM;
@@ -1133,7 +1129,7 @@
 		gf_sg_mfurl_del( * ((MFURL *) mf));
 		break;
 	case GF_SG_VRML_MFSCRIPT:
-		gf_sg_mfscript_del( * ((MFScript *) mf));
+		gf_sg_mfscript_del( * ((MFScript *) mf));	
 		break;
 	default:
 		if (mffield->array) gf_free(mffield->array);
@@ -1156,6 +1152,7 @@
 
 	if (gf_sg_vrml_is_sf_field(FieldType)) return GF_BAD_PARAM;
 	if (FieldType == GF_SG_VRML_MFNODE) return GF_BAD_PARAM;
+	if (!mffield) return GF_NON_COMPLIANT_BITSTREAM;
 
 	FieldSize = gf_sg_vrml_get_sf_size(FieldType);
 
@@ -1182,6 +1179,7 @@
 	*new_ptr = NULL;
 	if (gf_sg_vrml_is_sf_field(FieldType)) return GF_BAD_PARAM;
 	if (FieldType == GF_SG_VRML_MFNODE) return GF_BAD_PARAM;
+	if (!mffield) return GF_NON_COMPLIANT_BITSTREAM;
 
 	FieldSize = gf_sg_vrml_get_sf_size(FieldType);
 
@@ -1197,6 +1195,7 @@
 GF_Err gf_sg_vrml_mf_append(void *mf, u32 FieldType, void **new_ptr)
 {
 	GenMFField *mffield = (GenMFField *)mf;
+	if (!mf) return GF_NON_COMPLIANT_BITSTREAM;
 	return gf_sg_vrml_mf_insert(mf, FieldType, new_ptr, mffield->count+2);
 }
 
@@ -1208,6 +1207,7 @@
 	char *buffer;
 	u32 FieldSize, i, k;
 	GenMFField *mffield = (GenMFField *)mf;
+	if (!mffield) return GF_NON_COMPLIANT_BITSTREAM;
 
 	FieldSize = gf_sg_vrml_get_sf_size(FieldType);
 
@@ -1414,7 +1414,8 @@
 			((GenMFField *)dest)->array = gf_realloc(((GenMFField *)dest)->array, size);
 			((GenMFField *)dest)->count = ((GenMFField *)orig)->count;
 		}
-		memcpy(((GenMFField *)dest)->array, ((GenMFField *)orig)->array, size);
+		if (size)
+			memcpy(((GenMFField *)dest)->array, ((GenMFField *)orig)->array, size);
 		break;
 	//complex MFFields
 	case GF_SG_VRML_MFSTRING:

gpac-1.0.1.tar.gz/src/scenegraph/x3d_nodes.c -> gpac-2.0.0.tar.gz/src/scenegraph/x3d_nodes.c Changed

@@ -11159,10 +11159,13 @@
 }
 
 
+//unused
+#if 0
 static u32 Script_get_field_count(GF_Node *node, u8 dummy)
 {
 	return 4;
 }
+#endif
 
 static GF_Err Script_get_field(GF_Node *node, GF_FieldInfo *info)
 {
@@ -11198,6 +11201,8 @@
 }
 
 
+//unused
+#if 0
 static s32 Script_get_field_index_by_name(char *name)
 {
 	if (!strcmp("url", name)) return 0;
@@ -11206,7 +11211,7 @@
 	if (!strcmp("metadata", name)) return 3;
 	return -1;
 }
-
+#endif
 
 static GF_Node *Script_Create()
 {
@@ -15410,8 +15415,11 @@
 		return Rectangle2D_get_field_count(node, 0);
 	case TAG_X3D_ScalarInterpolator:
 		return ScalarInterpolator_get_field_count(node, 0);
+//unused
+#if 0
 	case TAG_X3D_Script:
 		return Script_get_field_count(node, 0);
+#endif
 	case TAG_X3D_Shape:
 		return Shape_get_field_count(node, 0);
 	case TAG_X3D_SignalPdu:
@@ -16074,8 +16082,11 @@
 		return Rectangle2D_get_field_index_by_name(name);
 	case TAG_X3D_ScalarInterpolator:
 		return ScalarInterpolator_get_field_index_by_name(name);
+//unused
+#if 0
 	case TAG_X3D_Script:
 		return Script_get_field_index_by_name(name);
+#endif
 	case TAG_X3D_Shape:
 		return Shape_get_field_index_by_name(name);
 	case TAG_X3D_SignalPdu:

gpac-1.0.1.tar.gz/src/scenegraph/xml_ns.c -> gpac-2.0.0.tar.gz/src/scenegraph/xml_ns.c Changed

@@ -122,7 +122,7 @@
 	{ "audio-level", TAG_SVG_ATT_audio_level, SVG_Number_datatype, 0, GF_XMLNS_SVG },
 	{ "viewport-fill", TAG_SVG_ATT_viewport_fill, SVG_Paint_datatype, 0, GF_XMLNS_SVG },
 	{ "viewport-fill-opacity", TAG_SVG_ATT_viewport_fill_opacity, SVG_Number_datatype, 0, GF_XMLNS_SVG },
-	{ "overflow", TAG_SVG_ATT_overflow, DOM_String_datatype, 0, GF_XMLNS_SVG },
+	{ "overflow", TAG_SVG_ATT_overflow, SVG_Overflow_datatype, 0, GF_XMLNS_SVG },
 	{ "fill-opacity", TAG_SVG_ATT_fill_opacity, SVG_Number_datatype, 0, GF_XMLNS_SVG },
 	{ "stroke-opacity", TAG_SVG_ATT_stroke_opacity, SVG_Number_datatype, 0, GF_XMLNS_SVG },
 	{ "fill-rule", TAG_SVG_ATT_fill_rule, SVG_FillRule_datatype, 0, GF_XMLNS_SVG },
@@ -274,6 +274,9 @@
 	{ "overlay", TAG_SVG_ATT_overlay, SVG_Overlay_datatype, 0, GF_XMLNS_SVG },
 	{ "fullscreen", TAG_SVG_ATT_fullscreen, SVG_Boolean_datatype, 0, GF_XMLNS_SVG },
 	{ "motionTransform", TAG_SVG_ATT_motionTransform, SVG_Motion_datatype, 0, GF_XMLNS_SVG },
+	{ "clip-path", TAG_SVG_ATT_clip_path, SVG_ClipPath_datatype, 0, GF_XMLNS_SVG },
+
+
 	/*SMIL anim fill*/
 	{ "fill", TAG_SVG_ATT_smil_fill, SMIL_Fill_datatype, GF_SVG_ATTOPT_SMIL, GF_XMLNS_SVG },
 	/*regular paint fill*/
@@ -382,7 +385,7 @@
 	while (att) {
 		if (att->tag==TAG_DOM_ATT_any) {
 			GF_DOMFullAttribute *datt = (GF_DOMFullAttribute*)att;
-			if (datt->name && !strncmp(datt->name, "xmlns", 5) && !strcmp(datt->name+6, attribute_name)) {
+			if (datt->name && !strncmp(datt->name, "xmlns:", 6) && !strcmp(datt->name+6, attribute_name)) {
 				return gf_xml_get_namespace_id(*(DOM_String *) datt->data);
 			}
 		}
@@ -495,6 +498,7 @@
 			return xml_attributes[i].tag;
 		}
 	}
+
 	return TAG_DOM_ATT_any;
 }
 
@@ -552,6 +556,7 @@
 	{ "animateTransform", TAG_SVG_animateTransform, GF_XMLNS_SVG },
 	{ "animation", TAG_SVG_animation, GF_XMLNS_SVG },
 	{ "audio", TAG_SVG_audio, GF_XMLNS_SVG },
+	{ "clipPath", TAG_SVG_clip_path, GF_XMLNS_SVG },
 	{ "circle", TAG_SVG_circle, GF_XMLNS_SVG },
 	{ "defs", TAG_SVG_defs, GF_XMLNS_SVG },
 	{ "desc", TAG_SVG_desc, GF_XMLNS_SVG },
@@ -1045,8 +1050,12 @@
 	char szFile[GF_MAX_PATH];
 	u64 fsize;
 	FILE *f;
+	int concatres;
 
-	sprintf(szFile, "%s%04X%s", base_file, idx, ext);
+	concatres = snprintf(szFile, GF_MAX_PATH, "%s%04X%s", base_file, idx, ext);
+	if (concatres<0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Path too long (limit %d) when trying to concatenate %s and %s\n", GF_MAX_PATH, base_file, ext));
+	}
 
 	f = gf_fopen(szFile, "rb");
 	if (!f) return 0;
@@ -1165,4 +1174,3 @@
 
 
 #endif /*GPAC_DISABLE_SVG*/
-

gpac-1.0.1.tar.gz/src/terminal/terminal.c -> gpac-2.0.0.tar.gz/src/terminal/terminal.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2018
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / Media terminal sub-project
@@ -65,20 +65,6 @@
 }
 
 
-#ifdef FILTER_FIXME
-
-static Bool gf_term_get_user_pass(void *usr_cbk, const char *site_url, char *usr_name, char *password)
-{
-	GF_Event evt;
-	GF_Terminal *term = (GF_Terminal *)usr_cbk;
-	evt.type = GF_EVENT_AUTHORIZATION;
-	evt.auth.site_url = site_url;
-	evt.auth.user = usr_name;
-	evt.auth.password = password;
-	return gf_term_send_event(term, &evt);
-}
-#endif
-
 static GF_Err gf_sc_step_clocks_intern(GF_Compositor *compositor, u32 ms_diff, Bool force_resume_pause)
 {
 	/*only play/pause if connected*/
@@ -207,7 +193,7 @@
 		/*disconnect*/
 		gf_sc_disconnect(compositor);
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Connecting to %s\n", URL));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Terminal] Connecting to %s\n", URL));
 
 	assert(!compositor->root_scene);
 
@@ -230,7 +216,7 @@
 		scene->first_frame_pause_type = pause_at_first_frame;
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] root scene created\n", URL));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Terminal] root scene created\n", URL));
 
 	if (!strnicmp(URL, "views://", 8)) {
 		gf_scene_generate_views(compositor->root_scene, (char *) URL+8, (char*)parent_path);
@@ -240,19 +226,15 @@
 		gf_scene_generate_mosaic(compositor->root_scene, (char *) URL+9, (char*)parent_path);
 		return;
 	}
-	else if (!strnicmp(URL, "mosaic://", 9)) {
-		gf_scene_generate_mosaic(compositor->root_scene, (char *) URL+9, (char*)parent_path);
-		return;
-	}
 
-	gf_scene_ns_connect_object(scene, odm, (char *) URL, (char*)parent_path);
+	gf_scene_ns_connect_object(scene, odm, (char *) URL, (char*)parent_path, NULL);
 }
 
 
 GF_EXPORT
 Bool gf_term_is_type_supported(GF_Terminal *term, const char* mime)
 {
-	return gf_fs_mime_supported(term->fsess, mime);
+	return gf_fs_is_supported_mime(term->fsess, mime);
 }
 
 //todo: move this to compositor ?
@@ -279,17 +261,15 @@
 		}
 
 		force_delete = 0;
-		if (file) {
-			FILE *t = gf_fopen(file, "r");
-			if (!t) force_delete = 1;
-			else gf_fclose(t);
+		if (file && gf_file_exists(file)) {
+			force_delete = 1;
 		}
 		sscanf(opt, "%u", &exp);
 		gf_net_get_ntp(&sec, &frac);
 		if (exp && (exp<sec)) force_delete=1;
 
 		if (force_delete) {
-			if (file) gf_file_delete((char*) opt);
+			if (file) gf_file_delete(file);
 
 			gf_opts_del_section(name);
 			i--;
@@ -309,11 +289,11 @@
 	const char *opt;
 	char szArgs[200];
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Creating terminal\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Terminal] Creating terminal\n"));
 
 	tmp = (GF_Terminal*)gf_malloc(sizeof(GF_Terminal));
 	if (!tmp) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate GF_Terminal : OUT OF MEMORY ?\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[Terminal] Failed to allocate GF_Terminal : OUT OF MEMORY ?\n"));
 		return NULL;
 	}
 	memset(tmp, 0, sizeof(GF_Terminal));
@@ -328,9 +308,9 @@
 	sprintf(szArgs, "%d", user->init_flags);
 	gf_opts_set_key("Temp", "InitFlags", szArgs);
 
-	tmp->fsess = gf_fs_new_defaults(GF_FS_FLAG_NO_MAIN_THREAD);
+	tmp->fsess = gf_fs_new_defaults(GF_FS_FLAG_NON_BLOCKING);
 	if (!tmp->fsess) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to create filter session.\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[Terminal] Failed to create filter session.\n"));
 		gf_free(tmp);
 		return NULL;
 	}
@@ -343,7 +323,7 @@
 	def_h = opt ? atoi(opt) : 0;
 
 	if (def_w && def_h) {
-		sprintf(szArgs, "compositor:FID=compose:player=base:size=%dx%d", def_w, def_h);
+		sprintf(szArgs, "compositor:FID=compose:player=base:osize=%dx%d", def_w, def_h);
 	} else {
 		strcpy(szArgs, "compositor:FID=compose:player=base");
 	}
@@ -351,22 +331,13 @@
 	comp_filter = gf_fs_load_filter(tmp->fsess, szArgs, &e);
 	tmp->compositor = comp_filter ? gf_sc_from_filter(comp_filter) : NULL;
 	if (!tmp->compositor) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to load compositor filter: %s\n", gf_error_to_string(e) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPTIME, ("[Terminal] Failed to load compositor filter: %s\n", gf_error_to_string(e) ));
 		gf_fs_del(tmp->fsess);
 		gf_free(tmp);
 		return NULL;
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] compositor loaded\n"));
-
-#ifdef FILTER_FIXME
-	gf_dm_set_auth_callback(tmp->downloader, gf_term_get_user_pass, tmp);
-
-	tmp->uri_relocators = gf_list_new();
-	tmp->locales.relocate_uri = term_check_locales;
-	tmp->locales.term = tmp;
-	gf_list_add(tmp->uri_relocators, &tmp->locales);
-#endif
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Terminal] compositor loaded\n"));
 
 	gf_term_refresh_cache();
 	gf_fs_run(tmp->fsess);
@@ -379,10 +350,10 @@
 {
 	if (!term) return GF_BAD_PARAM;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Destroying terminal\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Terminal] Destroying terminal\n"));
 	/*close main service*/
 	gf_term_disconnect(term);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] main service disconnected\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Terminal] main service disconnected\n"));
 
 	term->in_destroy = GF_TRUE;
 	/*stop the media manager */
@@ -391,7 +362,7 @@
 	gf_sys_close();
 	if (term->reload_url) gf_free(term->reload_url);
 	gf_free(term);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Terminal destroyed\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("[Terminal] Terminal destroyed\n"));
 	return GF_OK;
 }
 
@@ -446,6 +417,8 @@
 	return compositor->root_scene->root_od->scene_ns->url;
 }
 
+GF_DownloadManager *gf_filter_get_download_manager(GF_Filter *filter);
+
 /*set rendering option*/
 GF_EXPORT
 GF_Err gf_term_set_option(GF_Terminal * term, u32 type, u32 value)
@@ -455,11 +428,13 @@
 	case GF_OPT_PLAY_STATE:
 		gf_term_set_play_state(term->compositor, value, 0, 1);
 		return GF_OK;
-#ifdef FILTER_FIXME
 	case GF_OPT_HTTP_MAX_RATE:
-		gf_dm_set_data_rate(term->downloader, value);
+	{
+		GF_DownloadManager *dm = gf_filter_get_download_manager(term->compositor->filter);
+		if (!dm) return GF_SERVICE_ERROR;
+		gf_dm_set_data_rate(dm, value);
 		return GF_OK;
-#endif
+	}
 	default:
 		return gf_sc_set_option(term->compositor, type, value);
 	}
@@ -506,11 +481,11 @@
 	case GF_OPT_CAN_SELECT_STREAMS:
 		return (compositor->root_scene && compositor->root_scene->is_dynamic_scene) ? 1 : 0;
 	case GF_OPT_HTTP_MAX_RATE:
-#if FILTER_FIXME
-		return gf_dm_get_data_rate(compositor->downloader);
-#else
-		return 0;
-#endif
+	{
+		GF_DownloadManager *dm = gf_filter_get_download_manager(compositor->filter);
+		if (!dm) return 0;
+		return gf_dm_get_data_rate(dm);
+	}
 	case GF_OPT_VIDEO_BENCH:
 		return compositor->bench_mode ? GF_TRUE : GF_FALSE;
 	case GF_OPT_ORIENTATION_SENSORS_ACTIVE:
@@ -541,26 +516,6 @@
 } GF_TermConnectObject;
 
 
-#ifdef FILTER_FIXME
-
-
-/* Browses all registered relocators (ZIP-based, ISOFF-based or file-system-based to relocate a URI based on the locale */
-GF_EXPORT
-Bool gf_term_relocate_url(GF_Terminal *term, const char *service_url, const char *parent_url, char *out_relocated_url, char *out_localized_url)
-{
-	u32 i, count;
-
-	count = gf_list_count(term->uri_relocators);
-	for (i=0; i<count; i++) {
-		Bool result;
-		GF_URIRelocator *uri_relocator = gf_list_get(term->uri_relocators, i);
-		result = uri_relocator->relocate_uri(uri_relocator, parent_url, service_url, out_relocated_url, out_localized_url);
-		if (result) return 1;
-	}
-	return 0;
-}
-#endif
-
 GF_EXPORT
 u32 gf_sc_play_from_time(GF_Compositor *compositor, u64 from_time, u32 pause_at_first_frame)
 {
@@ -574,7 +529,7 @@
 			pause_at_first_frame = 0;
 	}
 
-	/*for dynamic scene OD ressources are static and all object use the same clock, so don't restart the root
+	/*for dynamic scene OD resources are static and all object use the same clock, so don't restart the root
 	OD, just act as a mediaControl on all playing streams*/
 	if (compositor->root_scene->is_dynamic_scene) {
 
@@ -731,11 +686,25 @@
 	if (!term || !com) return GF_BAD_PARAM;
 
 	if (type && (!stricmp(type, "application/ecmascript") || !stricmp(type, "js")) ) {
-		return gf_scene_execute_script(compositor->root_scene->graph, com);
+#if defined(GPAC_HAS_QJS) && !defined(GPAC_DISABLE_SVG)
+		u32 tag;
+		GF_Node *root = gf_sg_get_root_node(compositor->root_scene->graph);
+		if (!root) return GF_BAD_PARAM;
+		tag = gf_node_get_tag(root);
+		if (tag >= GF_NODE_RANGE_FIRST_SVG) {
+			if (compositor->root_scene->graph->svg_js) {
+				GF_Err svg_exec_script(struct __tag_svg_script_ctx *svg_js, GF_SceneGraph *sg, const char *com);
+				return svg_exec_script(compositor->root_scene->graph->svg_js, compositor->root_scene->graph, (char *)com);
+			}
+			return GF_NOT_FOUND;
+		}
+		return GF_NOT_SUPPORTED;
+#else
+		return GF_NOT_SUPPORTED;
+#endif
 	}
 
 	if (!type && !strncmp(com, "gpac ", 5)) {
-#ifdef FILTER_FIXME
 		com += 5;
 		//new add-on
 		if (compositor->root_scene && !strncmp(com, "add ", 4)) {
@@ -747,7 +716,7 @@
 			return GF_OK;
 		}
 		//new splicing add-on
-		if (term->root_scene && !strncmp(com, "splice ", 7)) {
+		if (compositor->root_scene && !strncmp(com, "splice ", 7)) {
 			char *sep;
 			Double start, end;
 			Bool is_pts = GF_FALSE;
@@ -772,9 +741,9 @@
 			}
 			//splice end, locate first splice with no end set and set it
 			else if (sscanf(com, "%lf", &end)==1) {
-				u32 count = gf_list_count(term->root_scene->declared_addons);
+				u32 count = gf_list_count(compositor->root_scene->declared_addons);
 				for (i=0; i<count; i++) {
-					GF_AddonMedia *addon = gf_list_get(term->root_scene->declared_addons, i);
+					GF_AddonMedia *addon = gf_list_get(compositor->root_scene->declared_addons, i);
 					if (addon->is_splicing && (addon->splice_end<0) ) {
 						addon->splice_end = end;
 						break;
@@ -790,16 +759,15 @@
 			addon_info.splice_start_time = start;
 			addon_info.splice_end_time = end;
 			addon_info.splice_time_pts = is_pts;
-			gf_scene_register_associated_media(term->root_scene, &addon_info);
+			gf_scene_register_associated_media(compositor->root_scene, &addon_info);
 			return GF_OK;
 		}
 		//select object
-		if (term->root_scene && !strncmp(com, "select ", 7)) {
+		if (compositor->root_scene && !strncmp(com, "select ", 7)) {
 			u32 idx = atoi(com+7);
-			gf_term_select_object(term, gf_list_get(term->root_scene->resources, idx));
+			gf_term_select_object(term, gf_list_get(compositor->root_scene->resources, idx));
 			return GF_OK;
 		}
-#endif
 		return GF_OK;
 	}
 
@@ -964,50 +932,6 @@
 }
 
 
-enum
-{
-	GF_ACTION_PLAY,
-	GF_ACTION_STOP,
-	GF_ACTION_STEP,
-	GF_ACTION_EXIT,
-	GF_ACTION_MUTE,
-	GF_ACTION_VOLUP,
-	GF_ACTION_VOLDOWN,
-	GF_ACTION_JUMP_FORWARD,
-	GF_ACTION_JUMP_BACKWARD,
-	GF_ACTION_JUMP_START,
-	GF_ACTION_JUMP_END,
-	GF_ACTION_VERY_FAST_FORWARD,
-	GF_ACTION_FAST_FORWARD,
-	GF_ACTION_SLOW_FORWARD,
-	GF_ACTION_VERY_FAST_REWIND,
-	GF_ACTION_FAST_REWIND,
-	GF_ACTION_SLOW_REWIND,
-	GF_ACTION_NEXT,
-	GF_ACTION_PREVIOUS,
-	GF_ACTION_QUALITY_UP,
-	GF_ACTION_QUALITY_DOWN,
-};
-
-#ifdef FILTER_FIXME //unused for now, need to patch compositor shortcuts
-static void set_clocks_speed(GF_Compositor *compositor, Fixed ratio)
-{
-	u32 i, j;
-	GF_SceneNamespace *ns;
-
-	/*pause all clocks on all services*/
-	i=0;
-	while ( (ns = (GF_SceneNamespace*)gf_list_enum(compositor->root_scene->namespaces, &i)) ) {
-		GF_Clock *ck;
-		j=0;
-		while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
-			Fixed s = gf_mulfix(ck->speed, ratio);
-			gf_clock_set_speed(ck, s);
-		}
-	}
-}
-#endif
-
 GF_EXPORT
 GF_Err gf_term_set_speed(GF_Terminal *term, Fixed speed)
 {
@@ -1022,16 +946,15 @@
 	if (speed<0) {
 		i=0;
 		while ( (ns = (GF_SceneNamespace*)gf_list_enum(term->compositor->root_scene->namespaces, &i)) ) {
-#ifdef FILTER_FIXME
-			GF_NetworkCommand com;
-			GF_Err e;
-			memset(&com, 0, sizeof(GF_NetworkCommand));
-			com.base.command_type = GF_NET_SERVICE_CAN_REVERSE_PLAYBACK;
-			e = gf_term_service_command(ns, &com);
-			if (e != GF_OK) {
-				return e;
+			u32 k=0;
+			GF_ObjectManager *odm;
+			if (!ns->owner || !ns->owner->subscene) continue;
+
+			while ( (odm = gf_list_enum(ns->owner->subscene->resources, &k))) {
+				const GF_PropertyValue *p = gf_filter_pid_get_property(odm->pid, GF_PROP_PID_PLAYBACK_MODE);
+				if (!p || (p->value.uint!=GF_PLAYBACK_MODE_REWIND))
+					return GF_NOT_SUPPORTED;
 			}
-#endif
 		}
 	}
 
@@ -1071,15 +994,70 @@
 		speed = -speed;
 
 	fps = term->compositor->fps;
-	fps.num = fps.num * (u32) (1000 * FIX2FLT(speed));
-	fps.den *= 1000;
+	if (fps.den<1000) {
+		fps.num = fps.num * (u32) (1000 * FIX2FLT(speed));
+		fps.den *= 1000;
+	} else {
+		fps.num = (u32) (fps.num * FIX2FLT(speed));
+	}
 	gf_media_get_reduced_frame_rate(&fps.num, &fps.den);
 	gf_sc_set_fps(term->compositor, fps);
 	return GF_OK;
 }
 
-#ifdef FILTER_FIXME
-GF_EXPORT
+#if 0 //no more support for shortcuts in MP4 client, this must be done through GUI
+
+enum
+{
+	GF_ACTION_PLAY,
+	GF_ACTION_STOP,
+	GF_ACTION_STEP,
+	GF_ACTION_EXIT,
+	GF_ACTION_MUTE,
+	GF_ACTION_VOLUP,
+	GF_ACTION_VOLDOWN,
+	GF_ACTION_JUMP_FORWARD,
+	GF_ACTION_JUMP_BACKWARD,
+	GF_ACTION_JUMP_START,
+	GF_ACTION_JUMP_END,
+	GF_ACTION_VERY_FAST_FORWARD,
+	GF_ACTION_FAST_FORWARD,
+	GF_ACTION_SLOW_FORWARD,
+	GF_ACTION_VERY_FAST_REWIND,
+	GF_ACTION_FAST_REWIND,
+	GF_ACTION_SLOW_REWIND,
+	GF_ACTION_NEXT,
+	GF_ACTION_PREVIOUS,
+	GF_ACTION_QUALITY_UP,
+	GF_ACTION_QUALITY_DOWN,
+};
+
+#define	MAX_SHORTCUTS	200
+
+typedef struct
+{
+	u8 code;
+	u8 mods;
+	u8 action;
+} GF_Shortcut;
+
+static void set_clocks_speed(GF_Compositor *compositor, Fixed ratio)
+{
+	u32 i, j;
+	GF_SceneNamespace *ns;
+
+	/*pause all clocks on all services*/
+	i=0;
+	while ( (ns = (GF_SceneNamespace*)gf_list_enum(compositor->root_scene->namespaces, &i)) ) {
+		GF_Clock *ck;
+		j=0;
+		while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
+			Fixed s = gf_mulfix(ck->speed, ratio);
+			gf_clock_set_speed(ck, s);
+		}
+	}
+}
+
 void gf_term_process_shortcut(GF_Terminal *term, GF_Event *ev)
 {
 	GF_Event evt;
@@ -1323,7 +1301,7 @@
 		}
 	}
 
-	gf_fs_run_step(term->fsess);
+	gf_fs_run(term->fsess);
 	return term->compositor->frame_was_produced;
 }
 
@@ -1749,3 +1727,17 @@
 	if (term->fsess)
 		gf_fs_print_connections(term->fsess);
 }
+
+
+
+GF_EXPORT
+Bool gf_term_is_supported_url(GF_Terminal *term, const char *fileName, Bool use_parent_url, Bool no_mime_check)
+{
+	char *parent_url = NULL;
+	if (!term || !term->compositor || !term->compositor->root_scene || !term->compositor->root_scene->root_od || !term->compositor->root_scene->root_od->scene_ns)
+		return GF_FALSE;
+		
+	if (use_parent_url && term->compositor->root_scene)
+		parent_url = term->compositor->root_scene->root_od->scene_ns->url;
+	return gf_filter_is_supported_source(term->compositor->filter, fileName, parent_url);
+}

gpac-1.0.1.tar.gz/src/utils/Remotery.c -> gpac-2.0.0.tar.gz/src/utils/Remotery.c Changed

@@ -49,7 +49,7 @@
 #define RMT_IMPL
 #include <gpac/tools.h>
 
-#ifdef RMT_PLATFORM_WINDOWS
+#if defined(RMT_PLATFORM_WINDOWS) && !defined(__GNUC__)
 #pragma comment(lib, "ws2_32.lib")
 #endif
 
@@ -946,7 +946,7 @@
 return RMT_ERROR_VIRTUAL_MEMORY_BUFFER_FAIL;
 
 // Set the file size to twice the buffer size
- // TODO: this 2x behaviour can be avoided with similar solution to Win/Mac
+ // TODO: this 2x behavior can be avoided with similar solution to Win/Mac
 if (ftruncate (file_descriptor, size * 2))
 return RMT_ERROR_VIRTUAL_MEMORY_BUFFER_FAIL;
 
@@ -3574,7 +3574,12 @@
 {
 // Add message header and align for ARM platforms
 rmtU32 size = sizeof(Message) + payload_size;
+#ifdef GPAC_64_BITS
+ size = (size + 7) & ~7U;
+#else
 size = (size + 3) & ~3U;
+#endif
+
 return size;
 }
 
@@ -5242,7 +5247,7 @@
 
 static void SetDebuggerThreadName(const char* name)
 {
- #ifdef RMT_PLATFORM_WINDOWS
+ #if defined(RMT_PLATFORM_WINDOWS) && !defined(__GNUC__)
 THREADNAME_INFO info;
 info.dwType = 0x1000;
 info.szName = name;

gpac-1.0.1.tar.gz/src/utils/alloc.c -> gpac-2.0.0.tar.gz/src/utils/alloc.c Changed

@@ -214,9 +214,13 @@
 #define SYMBOL_MAX_SIZE 50
 #include <windows.h>
 /* on visual studio 2015 windows sdk 8.1 dbghelp has a typedef enum with no name that throws a warning */
+#if	!defined(__GNUC__)
 #pragma warning(disable: 4091)
+#endif
 #include <dbghelp.h>
+#if	!defined(__GNUC__)
 #pragma comment(lib, "dbghelp.lib")
+#endif
 /*memory ownership to the caller*/
 static void store_backtrace(char *s_backtrace)
 {
@@ -479,7 +483,7 @@
 typedef struct s_memory_element
 {
 void *ptr;
- int size;
+ unsigned int size;
 struct s_memory_element *next;
 #ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
 char *backtrace_stack;
@@ -509,7 +513,7 @@
 
 
 /*base functions (add, find, del_item, del) are implemented upon a stack model*/
-static void gf_memory_add_stack(memory_element **p, void *ptr, int size, const char *filename, int line)
+static void gf_memory_add_stack(memory_element **p, void *ptr, unsigned int size, const char *filename, int line)
 {
 	memory_element *element = (memory_element*)MALLOC(sizeof(memory_element));
 	if (!element) {
@@ -558,9 +562,9 @@
 }
 
 /*returns the size of the deleted item*/
-static int gf_memory_del_item_stack(memory_element **p, void *ptr)
+static unsigned int gf_memory_del_item_stack(memory_element **p, void *ptr)
 {
-	int size;
+	unsigned int size;
 	memory_element *curr_element=*p, *prev_element=NULL;
 	while (curr_element) {
 		if (curr_element->ptr == ptr) {
@@ -582,7 +586,7 @@
 }
 
 /*this list is implemented as a stack to minimise the cost of freeing recent allocations*/
-static void gf_memory_add(memory_list *p, void *ptr, int size, const char *filename, int line)
+static void gf_memory_add(memory_list *p, void *ptr, unsigned int size, const char *filename, int line)
 {
 	unsigned int hash;
 	if (!*p) *p = (memory_list) CALLOC(HASH_ENTRIES, sizeof(memory_element*));
@@ -602,10 +606,10 @@
 	return gf_memory_find_stack(p[hash], ptr);
 }
 
-static int gf_memory_del_item(memory_list *p, void *ptr)
+static unsigned int gf_memory_del_item(memory_list *p, void *ptr)
 {
 	unsigned int hash;
-	int ret;
+	unsigned int ret;
 	memory_element **sub_list;
 	if (!*p) *p = (memory_list) CALLOC(HASH_ENTRIES, sizeof(memory_element*));
 	assert(*p);
@@ -659,7 +663,7 @@
 	/*lock*/
 	gf_mx_p(gpac_allocations_lock);
 
-	gf_memory_add(&memory_add, ptr, (int)size, filename, line);
+	gf_memory_add(&memory_add, ptr, (unsigned int)size, filename, line);
 	gf_memory_del_item(&memory_rem, ptr); /*the same block can be reallocated, so remove it from the deallocation list*/
 
 	/*update stats*/
@@ -718,7 +722,7 @@
 /*returns the size of the unregistered block*/
 static int unregister_address(void *ptr, const char *filename, int line)
 {
-	int size = 0; /*default: failure*/
+	unsigned int size = 0; /*default: failure*/
 
 	/*lock*/
 	gf_mx_p(gpac_allocations_lock);
@@ -754,7 +758,6 @@
 			}
 		} else {
 			size = gf_memory_del_item(&memory_add, ptr);
-			assert(size>=0);
 
 			/*update stats*/
 			gpac_allocated_memory -= size;
@@ -943,3 +946,43 @@
 }
 
 #endif //unused
+
+/*
+ * FROM: https://github.com/freebsd/freebsd-src/blob/master/sys/libkern/strlcpy.c
+ *
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ */
+/*
+ * Copy string src to buffer dst of size dsize. At most dsize-1
+ * chars will be copied. Always NUL terminates (unless dsize == 0).
+ * Returns strlen(src); if retval >= dsize, truncation occurred.
+ */
+GF_EXPORT
+size_t gf_strlcpy(char * dst, const char * src, size_t dsize)
+{
+	const char *osrc = src;
+	size_t nleft = dsize;
+
+	/* Copy as many bytes as will fit. */
+	if (nleft != 0) {
+		while (--nleft != 0) {
+			if ((*dst++ = *src++) == '\0')
+				break;
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src. */
+	if (nleft == 0) {
+		if (dsize != 0)
+			*dst = '\0';		/* NUL-terminate dst */
+		while (*src++)
+			;
+	}
+
+	return(src - osrc - 1);	/* count does not include NUL */
+}

gpac-1.0.1.tar.gz/src/utils/base_encoding.c -> gpac-2.0.0.tar.gz/src/utils/base_encoding.c Changed

gpac-1.0.1.tar.gz/src/utils/bitstream.c -> gpac-2.0.0.tar.gz/src/utils/bitstream.c Changed

@@ -73,11 +73,17 @@
 	u8 *cache_read;
 	u32 cache_read_size, cache_read_pos, cache_read_alloc;
 
+	void (*on_log)(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3);
+	void *log_udta;
+
+	u32 total_bits_read;
+	u32 overflow_state;
 };
 
 GF_Err gf_bs_reassign_buffer(GF_BitStream *bs, const u8 *buffer, u64 BufferSize)
 {
 	if (!bs) return GF_BAD_PARAM;
+	bs->total_bits_read = 0;
 	if (bs->bsmode == GF_BITSTREAM_READ) {
 		bs->original = (char*)buffer;
 		bs->size = BufferSize;
@@ -350,6 +356,7 @@
 		u8 res;
 		if (bs->position >= bs->size) {
 			if (bs->EndOfStream) bs->EndOfStream(bs->par);
+			if (!bs->overflow_state) bs->overflow_state = 1;
 			return 0;
 		}
 		res = bs->original[bs->position++];
@@ -399,6 +406,7 @@
 bs_eof:
 	if (bs->EndOfStream) {
 		bs->EndOfStream(bs->par);
+		if (!bs->overflow_state) bs->overflow_state = 1;
 	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[BS] Attempt to overread bitstream\n"));
 	}
@@ -438,6 +446,7 @@
 u32 gf_bs_read_int(GF_BitStream *bs, u32 nBits)
 {
 	u32 ret;
+	bs->total_bits_read+= nBits;
 
 #ifndef NO_OPTS
 	if (nBits + bs->nbBits <= 8) {
@@ -603,7 +612,24 @@
 {
 	u64 ret = 0;
 	if (nBits>64) {
-		gf_bs_read_long_int(bs, nBits-64);
+		u32 skip = nBits-64;
+		if (gf_bs_available(bs) * 8 < nBits-8) {
+			if (bs->EndOfStream) bs->EndOfStream(bs->par);
+			bs->position = bs->size;
+			if (!bs->overflow_state) bs->overflow_state = 1;
+			return 0;
+		}
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Reading %d bits but max should be 64, skipping %d most significants bits\n", nBits, nBits-64));
+		//avoid recursion
+		while (skip) {
+			if (skip>32) {
+				gf_bs_read_int(bs, 32);
+				skip-=32;
+			} else {
+				gf_bs_read_int(bs, skip);
+				skip=0;
+			}
+		}
 		ret = gf_bs_read_long_int(bs, 64);
 	} else {
 		while (nBits-- > 0) {
@@ -1130,7 +1156,7 @@
 void gf_bs_get_content_no_truncate(GF_BitStream *bs, u8 **output, u32 *outSize, u32 *alloc_size)
 {
 	/*only in WRITE MEM mode*/
-	if (bs->bsmode != GF_BITSTREAM_WRITE_DYN) return;
+	if (!bs || bs->bsmode != GF_BITSTREAM_WRITE_DYN) return;
 
 	if (bs->on_block_out && bs->position>bs->bytes_out) {
 		bs->on_block_out(bs->usr_data, bs->original, (u32) (bs->position - bs->bytes_out) );
@@ -1201,16 +1227,26 @@
 			bs->position += csize;
 			bs->cache_read_pos = bs->cache_read_size;
 		}
-		//weird msys2 bug resulting in broken seek on some files ?!? -the big is not happening when doing absolute seek
+		//weird msys2 bug resulting in broken seek on some files ?!? -the bug is not happening when doing absolute seek
 //		gf_fseek(bs->stream, nbBytes, SEEK_CUR);
 		bs->position += nbBytes;
+		if (bs->bsmode == GF_BITSTREAM_FILE_READ) {
+			if (bs->position > bs->size) bs->position = bs->size;
+		}
 		gf_fseek(bs->stream, bs->position, SEEK_SET);
 		return;
 	}
 
 	/*special case for reading*/
 	if (bs->bsmode == GF_BITSTREAM_READ) {
-		bs->position += nbBytes;
+		if (bs->remove_emul_prevention_byte) {
+			while (nbBytes) {
+				gf_bs_read_u8(bs);
+				nbBytes--;
+			}
+		} else {
+			bs->position += nbBytes;
+		}
 		return;
 	}
 	/*for writing we must do it this way, otherwise pb in dynamic buffers*/
@@ -1292,6 +1328,7 @@
 GF_EXPORT
 GF_Err gf_bs_seek(GF_BitStream *bs, u64 offset)
 {
+	bs->overflow_state = 0;
 	if (bs->on_block_out) {
 		GF_Err e;
 		if (offset < bs->bytes_out) {
@@ -1379,8 +1416,12 @@
 GF_EXPORT
 u64 gf_bs_get_size(GF_BitStream *bs)
 {
-	if (bs->cache_write)
-		return bs->size + bs->buffer_written;
+	if (bs->cache_write) {
+		if (bs->size == bs->position)
+			return bs->size + bs->buffer_written;
+		else
+			return bs->size;
+	}
 	if (bs->on_block_out)
 		return bs->position;
 	return bs->size;
@@ -1652,3 +1693,29 @@
 	return GF_IO_ERR;
 }
 
+
+GF_Err gf_bs_set_logger(GF_BitStream *bs, void (*on_bs_log)(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3), void *udta)
+{
+	if (!bs) return GF_BAD_PARAM;
+	bs->on_log = on_bs_log;
+	bs->log_udta = udta;
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_AVPARSE_LOGS
+void gf_bs_log_idx(GF_BitStream *bs, u32 nBits, const char *fname, s64 val, s32 idx1, s32 idx2, s32 idx3)
+{
+	assert(bs);
+	if (bs->on_log) bs->on_log(bs->log_udta, fname, nBits, val, idx1, idx2, idx3);
+}
+#endif
+
+
+void gf_bs_mark_overflow(GF_BitStream *bs, Bool reset)
+{
+	bs->overflow_state = reset ? 0 : 2;
+}
+u32 gf_bs_is_overflow(GF_BitStream *bs)
+{
+	return bs->overflow_state;
+}

gpac-1.0.1.tar.gz/src/utils/cache.c -> gpac-2.0.0.tar.gz/src/utils/cache.c Changed

@@ -51,11 +51,11 @@
 
 enum CacheValid
 {
-	NO_VALIDATION = 0,
 	MUST_REVALIDATE = 1,
-	IS_HTTPS = 2,
-	CORRUPTED = 4,
-	NO_CACHE = 8
+	IS_HTTPS = 1<<1,
+	CORRUPTED = 1<<2,
+	NO_CACHE = 1<<3,
+ DELETED = 1<<4
 };
 
 struct __CacheReaderStruct {
@@ -167,9 +167,20 @@
 	char *forced_headers;
 	u32 downtime;
 
-	GF_Blob cache_blob;
+ GF_Blob cache_blob;
+ GF_Blob *external_blob;
+ Bool persistent;
 };
 
+Bool gf_cache_entry_persistent(const DownloadedCacheEntry entry)
+{
+	return entry ? entry->persistent : GF_FALSE;
+}
+void gf_cache_entry_set_persistent(const DownloadedCacheEntry entry)
+{
+	if (entry) entry->persistent = GF_TRUE;
+}
+
 Bool delete_cache_files(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info) {
 	const char * startPattern;
 	int sz;
@@ -208,7 +219,7 @@
 }
 
 void gf_cache_entry_set_delete_files_when_deleted(const DownloadedCacheEntry entry) {
-	if (entry)
+	if (entry && !entry->persistent)
 		entry->deletableFilesOnDelete = GF_TRUE;
 }
 
@@ -353,23 +364,22 @@
 	return entry ? entry->cache_filename : NULL;
 }
 
-GF_Err gf_cache_append_http_headers(const DownloadedCacheEntry entry, char * httpRequest) {
-	if (!entry || !httpRequest)
+GF_Err gf_cache_get_http_headers(const DownloadedCacheEntry entry, const char **etag, const char **last_modif)
+{
+	if (!entry || !etag || !last_modif)
 		return GF_BAD_PARAM;
+
+	*etag = *last_modif = NULL;
 	if (entry->flags)
 		return GF_OK;
 	if (gf_cache_check_if_cache_file_is_corrupted(entry))
 		return GF_OK;
-	/* OK, this is potentially bad if httpRequest is not big enough */
-	if (entry->diskETag) {
-		strcat(httpRequest, "If-None-Match: ");
-		strcat(httpRequest, entry->diskETag);
-		strcat(httpRequest, "\r\n");
-	}
-	if (entry->diskLastModified) {
-		strcat(httpRequest, "If-Modified-Since: ");
-		strcat(httpRequest, entry->diskLastModified);
-		strcat(httpRequest, "\r\n");
+
+	*etag = entry->diskETag;
+	*last_modif = entry->diskLastModified;
+	if (entry->persistent && entry->memory_stored) {
+		*etag = entry->serverETag;
+		*last_modif = entry->serverLastModified;
 	}
 	return GF_OK;
 }
@@ -379,7 +389,7 @@
 static const char * default_cache_file_suffix = ".dat";
 static const char * cache_file_info_suffix = ".txt";
 
-DownloadedCacheEntry gf_cache_create_entry ( GF_DownloadManager * dm, const char * cache_directory, const char * url , u64 start_range, u64 end_range, Bool mem_storage)
+DownloadedCacheEntry gf_cache_create_entry ( GF_DownloadManager * dm, const char * cache_directory, const char * url , u64 start_range, u64 end_range, Bool mem_storage, GF_Mutex *mx)
 {
 	char tmp[_CACHE_TMP_SIZE];
 	u8 hash[_CACHE_HASH_SIZE];
@@ -436,7 +446,7 @@
 	entry->contentLength = 0;
 	entry->serverETag = NULL;
 	entry->diskETag = NULL;
-	entry->flags = NO_VALIDATION;
+	entry->flags = 0;
 	entry->validity = 0;
 	entry->diskLastModified = NULL;
 	entry->serverLastModified = NULL;
@@ -477,6 +487,7 @@
 	}
 
 	if (entry->memory_stored) {
+		entry->cache_blob.mx = mx;
 		entry->cache_blob.data = entry->mem_storage;
 		entry->cache_blob.size = entry->contentLength;
 		sprintf(entry->cache_filename, "gmem://%p", &entry->cache_blob);
@@ -560,7 +571,11 @@
 
 u32 gf_cache_get_content_length( const DownloadedCacheEntry entry)
 {
-	return entry ? entry->contentLength : 0;
+	if (!entry) return 0;
+	if (entry->external_blob) {
+		return entry->external_blob->size;
+	}
+	return entry->contentLength;
 }
 
 GF_Err gf_cache_close_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, Bool success )
@@ -618,7 +633,7 @@
 	return e;
 }
 
-GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess )
+GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, GF_Mutex *mx )
 {
 	CHECK_ENTRY;
 	if (!sess)
@@ -636,19 +651,26 @@
 	entry->flags &= ~CORRUPTED;
 
 	if (entry->memory_stored) {
+		if (!entry->cache_blob.mx)
+			entry->cache_blob.mx = mx;
+
+		gf_mx_p(entry->cache_blob.mx);
+
 		GF_LOG(GF_LOG_INFO, GF_LOG_CACHE, ("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
 		if (!entry->mem_allocated || (entry->mem_allocated < entry->contentLength)) {
 			if (entry->contentLength) entry->mem_allocated = entry->contentLength;
 			else if (!entry->mem_allocated) entry->mem_allocated = 81920;
 			entry->mem_storage = (u8*)gf_realloc(entry->mem_storage, sizeof(char)* (entry->mem_allocated + 2) );
 		}
+		entry->cache_blob.data = entry->mem_storage;
+		entry->cache_blob.size = entry->contentLength;
+		sprintf(entry->cache_filename, "gmem://%p", &entry->cache_blob);
+		gf_mx_v(entry->cache_blob.mx);
+
 		if (!entry->mem_allocated) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE, ("[CACHE] Failed to create memory storage for file %s\n", entry->url));
 			return GF_OUT_OF_MEM;
 		}
-		entry->cache_blob.data = entry->mem_storage;
-		entry->cache_blob.size = entry->contentLength;
-		sprintf(entry->cache_filename, "gmem://%p", &entry->cache_blob);
 		return GF_OK;
 	}
 
@@ -669,7 +691,7 @@
 	return GF_OK;
 }
 
-GF_Err gf_cache_write_to_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, const char * data, const u32 size) {
+GF_Err gf_cache_write_to_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, const char * data, const u32 size, GF_Mutex *mx) {
 	u32 read;
 	CHECK_ENTRY;
 
@@ -679,6 +701,10 @@
 	}
 
 	if (entry->memory_stored) {
+		if (!entry->cache_blob.mx)
+			entry->cache_blob.mx = mx;
+		assert(mx);
+		gf_mx_p(entry->cache_blob.mx);
 		if (entry->written_in_cache + size > entry->mem_allocated) {
 			u32 new_size = MAX(entry->mem_allocated*2, entry->written_in_cache + size);
 			entry->mem_storage = (u8*)gf_realloc(entry->mem_storage, (new_size+2));
@@ -692,6 +718,7 @@
 		entry->written_in_cache += size;
 		memset(entry->mem_storage + entry->written_in_cache, 0, 2);
 		entry->cache_blob.size = entry->written_in_cache;
+		gf_mx_v(entry->cache_blob.mx);
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Storing %d bytes to memory\n", size));
 		return GF_OK;
@@ -736,8 +763,10 @@
 #endif
 	if (entry->file_exists && entry->deletableFilesOnDelete) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CACHE, ("[CACHE] url %s cleanup, deleting %s...\n", entry->url, entry->cache_filename));
-		if (GF_OK != gf_file_delete(entry->cache_filename))
+		//if file exists, delete it (dash client may trash m3u8 files on the fly while converting them to MPD ...)
+		if (gf_file_exists(entry->cache_filename) && (gf_file_delete(entry->cache_filename)!=GF_OK) ) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE, ("[CACHE] gf_cache_delete_entry:%d, failed to delete file %s\n", __LINE__, entry->cache_filename));
+		}
 	}
 #ifdef ENABLE_WRITE_MX
 	entry->write_mutex = NULL;
@@ -949,37 +978,99 @@
 	if (!entry) return 0;
 	return entry->downtime;
 }
+Bool gf_cache_is_done(const DownloadedCacheEntry entry)
+{
+ Bool res = GF_TRUE;
+ if (entry && entry->external_blob) {
+ gf_mx_p(entry->external_blob->mx);
+ res = (entry->external_blob->flags & GF_BLOB_IN_TRANSFER) ? GF_FALSE : GF_TRUE;
+ gf_mx_v(entry->external_blob->mx);
+ } else if (entry) {
+ res = (entry->cache_blob.flags & GF_BLOB_IN_TRANSFER) ? GF_FALSE : GF_TRUE;
+ }
+ return res;
+}
+const u8 *gf_cache_get_content(const DownloadedCacheEntry entry, u32 *size)
+{
+ if (!entry) return NULL;
+ if (entry->external_blob) {
+ u8 *data;
+ GF_Err e = gf_blob_get(entry->cache_filename, &data, size, NULL);
+ if (e) return NULL;
+ return data;
+ }
+ *size = entry->cache_blob.size;
+ return entry->cache_blob.data;
+}
+void gf_cache_release_content(const DownloadedCacheEntry entry)
+{
+ if (!entry) return;
+ if (!entry->external_blob) return;
+ gf_blob_release(entry->cache_filename);
+}
+Bool gf_cache_is_deleted(const DownloadedCacheEntry entry)
+{
+ if (!entry) return GF_TRUE;
+ if (entry->flags == DELETED) return GF_TRUE;
+ return GF_FALSE;
+}
 
-Bool gf_cache_set_content(const DownloadedCacheEntry entry, char *data, u32 size, Bool copy)
+Bool gf_cache_set_content(const DownloadedCacheEntry entry, GF_Blob *blob, Bool copy, GF_Mutex *mx)
 {
 	if (!entry || !entry->memory_stored) return GF_FALSE;
 
-	if (!copy) {
-		if (entry->mem_allocated) gf_free(entry->mem_storage);
-		entry->mem_storage = (u8 *) data;
-		entry->written_in_cache = size;
+ if (!blob) {
+ entry->flags = DELETED;
+ return GF_TRUE;
+ }
+ if (blob->mx)
+ gf_mx_p(blob->mx);
+	
+ if (!copy) {
+ if (entry->mem_allocated) gf_free(entry->mem_storage);
+		entry->mem_storage = (u8 *) blob->data;
+ if (!entry->written_in_cache)
+ sprintf(entry->cache_filename, "gmem://%p", blob);
+		entry->written_in_cache = blob->size;
 		entry->mem_allocated = 0;
-		entry->cache_blob.data = entry->mem_storage;
-		entry->cache_blob.size = entry->written_in_cache;
-		sprintf(entry->cache_filename, "gmem://%p", &entry->cache_blob);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Storing %d bytes to memory from external module\n", size));
-		return GF_TRUE;
-	}
-	if ( size >= entry->mem_allocated) {
-		u32 new_size;
-		new_size = MAX(entry->mem_allocated*2, size+1);
-		entry->mem_storage = (u8*)gf_realloc(entry->mem_allocated ? entry->mem_storage : NULL, (new_size+2));
-		entry->mem_allocated = new_size;
-		entry->cache_blob.data = entry->mem_storage;
-		entry->cache_blob.size = entry->contentLength;
-		sprintf(entry->cache_filename, "gmem://%p", &entry->cache_blob);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Reallocating memory cache to %d bytes\n", new_size));
-	}
-	memcpy(entry->mem_storage, data, size);
-	entry->mem_storage[size] = 0;
-	entry->cache_blob.size = entry->written_in_cache = size;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Storing %d bytes to cache memory\n", size));
-	return GF_FALSE;
+		entry->cache_blob.data = NULL;
+		entry->cache_blob.size = 0;
+ entry->external_blob = blob;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Storing %d bytes to memory from external module\n", blob->size));
+ } else {
+		if (!entry->cache_blob.mx)
+			entry->cache_blob.mx = mx;
+		gf_mx_p(entry->cache_blob.mx);
+
+ if (blob->size >= entry->mem_allocated) {
+ u32 new_size;
+ new_size = MAX(entry->mem_allocated*2, blob->size+1);
+ entry->mem_storage = (u8*)gf_realloc(entry->mem_allocated ? entry->mem_storage : NULL, (new_size+2));
+ entry->mem_allocated = new_size;
+ entry->cache_blob.data = entry->mem_storage;
+ entry->cache_blob.size = entry->contentLength;
+ if (!entry->written_in_cache)
+ sprintf(entry->cache_filename, "gmem://%p", &entry->cache_blob);
+ GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Reallocating memory cache to %d bytes\n", new_size));
+ }
+ memcpy(entry->mem_storage, blob->data, blob->size);
+ entry->mem_storage[blob->size] = 0;
+ entry->cache_blob.size = entry->written_in_cache = blob->size;
+ GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Storing %d bytes to cache memory\n", blob->size));
+
+		gf_mx_v(entry->cache_blob.mx);
+
+		entry->cache_blob.flags = blob->flags;
+ }
+	if (blob->flags & GF_BLOB_IN_TRANSFER)
+		entry->contentLength = 0;
+	else
+		entry->contentLength = blob->size;
+
+ if (blob->mx)
+ gf_mx_v(blob->mx);
+
+ return GF_TRUE;
 }
 
 #endif

gpac-1.0.1.tar.gz/src/utils/color.c -> gpac-2.0.0.tar.gz/src/utils/color.c Changed

@@ -1817,6 +1817,7 @@
 	case GF_PIXEL_UYVY:
 	case GF_PIXEL_VYUY:
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 	case GF_PIXEL_YUV_10:
 	case GF_PIXEL_YUV422:
 	case GF_PIXEL_YUV422_10:
@@ -1883,16 +1884,23 @@
 					e = color_write_yuv422_10_to_yuv422(dst, src, src_wnd, GF_FALSE);
 				else if (dst->pixel_format == GF_PIXEL_YUV)
 					e = color_write_yuv422_10_to_yuv(dst, src, src_wnd, GF_FALSE);
+				else if (dst->pixel_format == GF_PIXEL_YVU)
+					e = color_write_yuv422_10_to_yuv(dst, src, src_wnd, GF_TRUE);
 				break;
 			case GF_PIXEL_YUV444_10:
 				if (dst->pixel_format == GF_PIXEL_YUV444)
 					e = color_write_yuv444_10_to_yuv444(dst, src, src_wnd, GF_FALSE);
 				else if (dst->pixel_format == GF_PIXEL_YUV)
 					e = color_write_yuv444_10_to_yuv(dst, src, src_wnd, GF_FALSE);
+				else if (dst->pixel_format == GF_PIXEL_YVU)
+					e = color_write_yuv444_10_to_yuv(dst, src, src_wnd, GF_TRUE);
 				break;
 			case GF_PIXEL_YUV:
 				e = color_write_yuv420_to_yuv(dst, src, src_wnd, GF_FALSE);
 				break;
+			case GF_PIXEL_YVU:
+				e = color_write_yuv420_to_yuv(dst, src, src_wnd, GF_TRUE);
+				break;
 			case GF_PIXEL_YUV422:
 				e = color_write_yuv422_to_yuv(dst, src, src_wnd, GF_FALSE);
 				break;
@@ -1984,6 +1992,7 @@
 		load_line = load_line_rgbd;
 		break;
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 		yuv2rgb_init();
 		yuv_planar_type = 1;
 		break;
@@ -2043,7 +2052,7 @@
 		load_line = load_line_vyuy;
 		break;
 	default:
-		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Source pixel format %s not supported by gf_stretch_bits\n", gf_pixel_fmt_name(src->pixel_format) ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Source pixel format %s not supported by gf_stretch_bits\n", gf_pixel_fmt_name(src->pixel_format) ));
 		return GF_NOT_SUPPORTED;
 	}
 
@@ -2110,6 +2119,9 @@
 	dst_w = dst_wnd ? dst_wnd->w : dst->width;
 	dst_h = dst_wnd ? dst_wnd->h : dst->height;
 
+	if (!src_w || !src_h || !dst_w || !dst_h)
+		return GF_OK;
+		
 	if (yuv_planar_type && (src_w%2)) src_w++;
 
 	tmp = (u8 *) gf_malloc(sizeof(u8) * src_w * (yuv_planar_type ? 8 : 4) );
@@ -3502,6 +3514,7 @@
 {
 	switch (pf) {
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 	case GF_PIXEL_YUV_10:
 	case GF_PIXEL_YUV422:
 	case GF_PIXEL_YUV422_10:
@@ -4312,12 +4325,16 @@
 {
 	u32 i, count;
 	u32 res;
+	if (!strcmp(name, "none") )
+		return 0;
 	if ((name[0]=='$') || (name[0]=='#')) {
 		sscanf(name+1, "%x", &res);
+		if (strlen(name+1) == 8) return res;
 		return res | 0xFF000000;
 	}
 	if (!strnicmp(name, "0x", 2) ) {
 		sscanf(name+2, "%x", &res);
+		if (strlen(name+2) == 8) return res;
 		return res | 0xFF000000;
 	}
 
@@ -4328,7 +4345,7 @@
 			return res;
 		}
 	}
-
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unknown color code %s, using 0x00000000\n", name));
 	return 0;
 
 }

gpac-1.0.1.tar.gz/src/utils/configfile.c -> gpac-2.0.0.tar.gz/src/utils/configfile.c Changed

gpac-1.0.1.tar.gz/src/utils/constants.c -> gpac-2.0.0.tar.gz/src/utils/constants.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2022
 *					All rights reserved
 *
 * This file is part of GPAC / filters sub-project
@@ -59,7 +59,7 @@
 	{GF_CODECID_TEXT_MPEG4, GF_CODECID_TEXT_MPEG4, GF_STREAM_TEXT, "MPEG-4 Streaming Text", "m4txt", "text", "application/x-mpeg4-text"},
 	{GF_CODECID_LASER, GF_CODECID_LASER, GF_STREAM_SCENE, "MPEG-4 LASeR", "laser", "lsr1", "application/x-laser"},
 	{GF_CODECID_SAF, GF_CODECID_SAF, GF_STREAM_SCENE, "MPEG-4 Simple Aggregation Format", "saf", "mp4s", "application/saf"},
-	{GF_CODECID_MPEG4_PART2, GF_CODECID_MPEG4_PART2, GF_STREAM_VISUAL, "MPEG-4 Visual part 2", "cmp|m4vp2", "mp4v", "video/mp4v-es"},
+	{GF_CODECID_MPEG4_PART2, GF_CODECID_MPEG4_PART2, GF_STREAM_VISUAL, "MPEG-4 Visual part 2", "cmp|m4ve|m4v", "mp4v", "video/mp4v-es"},
 	{GF_CODECID_AVC, GF_CODECID_AVC, GF_STREAM_VISUAL, "MPEG-4 AVC|H264 Video", "264|avc|h264", "avc1", "video/avc"},
 	{GF_CODECID_AVC_PS, GF_CODECID_AVC_PS, GF_STREAM_VISUAL, "MPEG-4 AVC|H264 Video Parameter Sets", "avcps", "avcp", "video/avc"},
 	{GF_CODECID_SVC, GF_CODECID_SVC, GF_STREAM_VISUAL, "MPEG-4 AVC|H264 Scalable Video Coding", "svc|avc|264|h264", "svc1", "video/svc"},
@@ -75,13 +75,14 @@
 	{GF_CODECID_MPEG1, GF_CODECID_MPEG1, GF_STREAM_VISUAL, "MPEG-1 Video", "m1v", "mp1v", "video/mp1v-es"},
 	{GF_CODECID_JPEG, GF_CODECID_JPEG, GF_STREAM_VISUAL, "JPEG Image", "jpg|jpeg", "jpeg", "image/jpeg"},
 	{GF_CODECID_PNG, GF_CODECID_PNG, GF_STREAM_VISUAL, "PNG Image", "png", "png ", "image/png"},
-	{GF_CODECID_J2K, 0x6E, GF_STREAM_VISUAL, "JPEG200 Image", "jp2|j2k", "mjp2", "image/jp2"},
+	{GF_CODECID_J2K, 0x6E, GF_STREAM_VISUAL, "JPEG2000 Image", "jp2|j2k", "mjp2", "image/jp2"},
 	{GF_CODECID_AAC_MPEG4, GF_CODECID_AAC_MPEG4, GF_STREAM_AUDIO, "MPEG-4 AAC Audio", "aac", "mp4a", "audio/aac"},
 	{GF_CODECID_AAC_MPEG2_MP, GF_CODECID_AAC_MPEG2_MP, GF_STREAM_AUDIO, "MPEG-2 AAC Audio Main", "aac|aac2m", "mp4a", "audio/aac", GF_CODECID_AAC_MPEG4},
 	{GF_CODECID_AAC_MPEG2_LCP, GF_CODECID_AAC_MPEG2_LCP, GF_STREAM_AUDIO, "MPEG-2 AAC Audio Low Complexity", "aac|aac2l", "mp4a", "audio/aac", GF_CODECID_AAC_MPEG4},
 	{GF_CODECID_AAC_MPEG2_SSRP, GF_CODECID_AAC_MPEG2_SSRP, GF_STREAM_AUDIO, "MPEG-2 AAC Audio Scalable Sampling Rate", "aac|aac2s", "mp4a", "audio/aac", GF_CODECID_AAC_MPEG4},
 	{GF_CODECID_MPEG_AUDIO, GF_CODECID_MPEG_AUDIO, GF_STREAM_AUDIO, "MPEG-1 Audio", "mp3|m1a", ".mp3", "audio/mp3"},
-	{GF_CODECID_MPEG2_PART3, GF_CODECID_MPEG2_PART3, GF_STREAM_AUDIO, "MPEG-2 Audio", "mp3|m2a", ".mp3", "audio/mp3"},
+	{GF_CODECID_MPEG2_PART3, GF_CODECID_MPEG2_PART3, GF_STREAM_AUDIO, "MPEG-2 Audio", "mp2", ".mp3", "audio/mpeg"},
+	{GF_CODECID_MPEG_AUDIO_L1, GF_CODECID_MPEG_AUDIO, GF_STREAM_AUDIO, "MPEG-1 Audio Layer 1", "mp1", ".mp3", "audio/mpeg"},
 	{GF_CODECID_S263, 0, GF_STREAM_VISUAL, "H263 Video", "h263", "s263", "video/h263", .alt_codecid=GF_CODECID_H263},
 	{GF_CODECID_H263, 0, GF_STREAM_VISUAL, "H263 Video", "h263", "h263", "video/h263", .alt_codecid=GF_CODECID_S263},
 	{GF_CODECID_HEVC_TILES, 0, GF_STREAM_VISUAL, "HEVC tiles Video", "hvt1", "hvt1", "video/x-hevc-tiles", .alt_codecid=GF_CODECID_HEVC},
@@ -96,6 +97,7 @@
 	{GF_CODECID_DIRAC, 0xA4, GF_STREAM_VISUAL, "Dirac Video", "dirac", NULL, "video/dirac"},
 	{GF_CODECID_AC3, 0xA5, GF_STREAM_AUDIO, "AC3 Audio", "ac3", "ac-3", "audio/ac3"},
 	{GF_CODECID_EAC3, 0xA6, GF_STREAM_AUDIO, "Enhanced AC3 Audio", "eac3", "ec-3", "audio/eac3"},
+	{GF_CODECID_TRUEHD, 0, GF_STREAM_AUDIO, "Dolby TrueHD", "mlp", "mlpa", "audio/truehd"},
 	{GF_CODECID_DRA, 0xA7, GF_STREAM_AUDIO, "DRA Audio", "dra", NULL, "audio/dra"},
 	{GF_CODECID_G719, 0xA8, GF_STREAM_AUDIO, "G719 Audio", "g719", NULL, "audio/g719"},
 	{GF_CODECID_DTS_CA, 0xA9, GF_STREAM_AUDIO, "DTS Coherent Acoustics Audio", "dstca", NULL, "audio/dts"},
@@ -135,14 +137,14 @@
 	{GF_CODECID_IBM_ALAW, 0, GF_STREAM_AUDIO, "IBM ALAW", "ialaw", NULL, "audio/pcm"},
 	{GF_CODECID_IBM_ADPCM, 0, GF_STREAM_AUDIO, "IBM ADPCL", "iadpcl", NULL, "audio/pcm"},
 	{GF_CODECID_FLASH, 0, GF_STREAM_SCENE, "Adobe Flash", "swf", NULL, "audio/pcm"},
-	{GF_CODECID_RAW, 0, GF_STREAM_UNKNOWN, "Raw media", "raw", NULL, "audio/pcm"},
+	{GF_CODECID_RAW, 0, GF_STREAM_UNKNOWN, "Raw media", "raw", NULL, "*/*"},
 
 	{GF_CODECID_AV1, 0, GF_STREAM_VISUAL, "AOM AV1 Video", "av1|ivf|obu|av1b", NULL, "video/av1"},
 	{GF_CODECID_VP8, 0, GF_STREAM_VISUAL, "VP8 Video", "vp8|ivf", NULL, "video/vp8"},
 	{GF_CODECID_VP9, 0, GF_STREAM_VISUAL, "VP9 Video", "vp9|ivf", NULL, "video/vp9"},
 	{GF_CODECID_VP10, 0, GF_STREAM_VISUAL, "VP10 Video", "vp10|ivf", NULL, "video/vp10"},
 
-	{GF_CODECID_MPHA, 0, GF_STREAM_AUDIO, "MPEG-H Audio", "mpha", "mha1", "audio/x-mpegh"},
+	{GF_CODECID_MPHA, 0, GF_STREAM_AUDIO, "MPEG-H Audio", "mhas", "mha1", "audio/x-mpegh"},
 	{GF_CODECID_MHAS, 0, GF_STREAM_AUDIO, "MPEG-H AudioMux", "mhas", "mhm1", "audio/x-mhas"},
 
 	{GF_CODECID_APCH, 0, GF_STREAM_VISUAL, "ProRes Video 422 HQ", "prores|apch", "apch", "video/prores"},
@@ -154,20 +156,35 @@
 	{GF_CODECID_FFMPEG, 0, GF_STREAM_UNKNOWN, "FFMPEG unmapped codec", "ffmpeg", NULL, NULL},
 
 	{GF_CODECID_TMCD, 0, GF_STREAM_METADATA, "QT TimeCode", "tmcd", NULL, NULL},
+	{GF_CODECID_VVC, 0, GF_STREAM_VISUAL, "VVC Video", "vvc|266|h266", "vvc1", "video/vvc"},
+	{GF_CODECID_VVC_SUBPIC, 0, GF_STREAM_VISUAL, "VVC Subpicture Video", "vvs1", "vvs1", "video/x-vvc-subpic", .alt_codecid=GF_CODECID_VVC},
+	{GF_CODECID_USAC, GF_CODECID_AAC_MPEG4, GF_STREAM_AUDIO, "xHEAAC / USAC Audio", "usac|xheaac", "mp4a", "audio/x-xheaac"},
+	{GF_CODECID_V210, 0, GF_STREAM_VISUAL, "v210 YUV 422 10 bits", "v210", "v210", "video/x-raw-v210"},
+	{GF_CODECID_FFV1, 0, GF_STREAM_VISUAL, "FFMPEG Video Codec 1", "ffv1", NULL, "video/x-ffv1"},
 };
 
 
 GF_EXPORT
-GF_CodecID gf_codec_parse(const char *cname)
+GF_CodecID gf_codecid_parse(const char *cname)
 {
-	u32 len = (u32) strlen(cname);
+	u32 ilen = (u32) strlen(cname);
 	u32 i, count = sizeof(CodecRegistry) / sizeof(CodecIDReg);
 	for (i=0; i<count; i++) {
-		char *sep;
-		if (!strcmp(CodecRegistry[i].sname, cname)) return CodecRegistry[i].codecid;
-		if (!strchr(CodecRegistry[i].sname, '|') ) continue;
-		sep = strstr(CodecRegistry[i].sname, cname);
-		if (sep && (!sep[len] || (sep[len]=='|'))) return CodecRegistry[i].codecid;
+		const char *n = CodecRegistry[i].sname;
+		while (n) {
+			char *sep = strchr(n, '|');
+			u32 len;
+			if (sep)
+				len = (u32) (sep - n);
+			else
+				len = (u32) strlen(n);
+
+			//allow case insensitive names
+			if ((len==ilen) && !strnicmp(n, cname, len))
+				return CodecRegistry[i].codecid;
+			if (!sep) break;
+			n = sep+1;
+		}
 	}
 	return GF_CODECID_NONE;
 }
@@ -180,7 +197,14 @@
 {
 	switch (isobmftype) {
 	case GF_ISOM_SUBTYPE_DVHE:
+	case GF_ISOM_SUBTYPE_DVH1:
 		return GF_CODECID_HEVC;
+	case GF_ISOM_SUBTYPE_DVA1:
+	case GF_ISOM_SUBTYPE_DVAV:
+		return GF_CODECID_AVC;
+	case GF_ISOM_SUBTYPE_AV01:
+	case GF_ISOM_SUBTYPE_DAV1:
+		return GF_CODECID_AV1;
 	case GF_ISOM_SUBTYPE_3GP_AMR:
 		return GF_CODECID_AMR;
 	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
@@ -225,6 +249,17 @@
 	case GF_ISOM_SUBTYPE_TEXT:
 	case GF_ISOM_SUBTYPE_TX3G:
 		return GF_CODECID_TX3G;
+	case GF_ISOM_SUBTYPE_VVC1:
+	case GF_ISOM_SUBTYPE_VVI1:
+		return GF_CODECID_VVC;
+	case GF_QT_SUBTYPE_YUV422_10:
+		return GF_CODECID_V210;
+	case GF_ISOM_SUBTYPE_VP08:
+		return GF_CODECID_VP8;
+	case GF_ISOM_SUBTYPE_VP09:
+		return GF_CODECID_VP9;
+	case GF_ISOM_SUBTYPE_VP10:
+		return GF_CODECID_VP10;
 
 	case GF_QT_SUBTYPE_APCH:
 		return GF_CODECID_APCH;
@@ -250,6 +285,10 @@
 		return GF_CODECID_RAW;
 	case GF_QT_SUBTYPE_IN32:
 		return GF_CODECID_RAW;
+	case GF_ISOM_SUBTYPE_MLPA:
+		return GF_CODECID_TRUEHD;
+	case GF_ISOM_SUBTYPE_FFV1:
+		return GF_CODECID_FFV1;
 	default:
 		break;
 	}
@@ -374,26 +413,27 @@
 	u32 st;
 	const char *name;
 	const char *desc;
+	const char *sname;
 	const char *alt_name;
 } GF_StreamTypeDesc;
 
 static const GF_StreamTypeDesc GF_StreamTypes[] =
 {
-	{GF_STREAM_VISUAL, "Visual", "Video or Image stream", "Video"},
-	{GF_STREAM_AUDIO, "Audio", "Audio stream"},
-	{GF_STREAM_SCENE, "SceneDescription", "Scene stream"},
-	{GF_STREAM_TEXT, "Text", "Text or subtitle stream"},
-	{GF_STREAM_METADATA, "Metadata", "Metadata stream"},
-	{GF_STREAM_FILE, "File", "Raw file stream"},
-	{GF_STREAM_ENCRYPTED, "Encrypted", "Encrypted media stream"},
-	{GF_STREAM_OD, "ObjectDescriptor", "MPEG-4 ObjectDescriptor stream"},
-	{GF_STREAM_OCR, "ClockReference", "MPEG-4 Clock Reference stream"},
-	{GF_STREAM_MPEG7, "MPEG7", "MPEG-7 description stream"},
-	{GF_STREAM_IPMP, "IPMP", "MPEG-4 IPMP/DRM stream"},
-	{GF_STREAM_OCI, "OCI", "MPEG-4 ObjectContentInformation stream"},
-	{GF_STREAM_MPEGJ, "MPEGJ", "MPEG-4 JAVA stream"},
-	{GF_STREAM_INTERACT, "Interaction", "MPEG-4 Interaction Sensor stream"},
-	{GF_STREAM_FONT, "Font", "MPEG-4 Font stream"}
+	{GF_STREAM_VISUAL, "Visual", "Video or Image stream", "video", "Video"},
+	{GF_STREAM_AUDIO, "Audio", "Audio stream", "audio"},
+	{GF_STREAM_SCENE, "SceneDescription", "Scene stream", "scene"},
+	{GF_STREAM_TEXT, "Text", "Text or subtitle stream", "text"},
+	{GF_STREAM_METADATA, "Metadata", "Metadata stream", "meta"},
+	{GF_STREAM_FILE, "File", "Raw file stream", "file"},
+	{GF_STREAM_ENCRYPTED, "Encrypted", "Encrypted media stream", "crypt"},
+	{GF_STREAM_OD, "ObjectDescriptor", "MPEG-4 ObjectDescriptor stream", "od"},
+	{GF_STREAM_OCR, "ClockReference", "MPEG-4 Clock Reference stream", "ocr"},
+	{GF_STREAM_MPEG7, "MPEG7", "MPEG-7 description stream", "mpeg7"},
+	{GF_STREAM_IPMP, "IPMP", "MPEG-4 IPMP/DRM stream", "ipmp"},
+	{GF_STREAM_OCI, "OCI", "MPEG-4 ObjectContentInformation stream", "oci"},
+	{GF_STREAM_MPEGJ, "MPEGJ", "MPEG-4 JAVA stream", "mpegj"},
+	{GF_STREAM_INTERACT, "Interaction", "MPEG-4 Interaction Sensor stream", "interact"},
+	{GF_STREAM_FONT, "Font", "MPEG-4 Font stream", "font"}
 };
 
 GF_EXPORT
@@ -408,6 +448,17 @@
 }
 
 GF_EXPORT
+const char *gf_stream_type_short_name(u32 streamType)
+{
+	u32 i, nb_st = sizeof(GF_StreamTypes) / sizeof(GF_StreamTypeDesc);
+	for (i=0; i<nb_st; i++) {
+		if (GF_StreamTypes[i].st == streamType)
+			return GF_StreamTypes[i].sname;
+	}
+	return "unkn";
+}
+
+GF_EXPORT
 u32 gf_stream_type_by_name(const char *val)
 {
 	u32 i, nb_st = sizeof(GF_StreamTypes) / sizeof(GF_StreamTypeDesc);
@@ -417,13 +468,18 @@
 		if (GF_StreamTypes[i].alt_name && !stricmp(GF_StreamTypes[i].alt_name, val))
 			return GF_StreamTypes[i].st;
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("Unknow stream type %s\n", val));
+	if (strnicmp(val, "unkn", 4) && strnicmp(val, "undef", 5)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Unknow stream type %s\n", val));
+	}
 	return GF_STREAM_UNKNOWN;
 }
 
+#if 0
 static char szAllStreamTypes[500] = {0};
 
-GF_EXPORT
+/*! Gets the list of names of all stream types defined
+\return names of all stream types defined
+ */
 const char *gf_stream_type_all_names()
 {
 	if (!szAllStreamTypes[0]) {
@@ -433,7 +489,7 @@
 		for (i=0; i<nb_st; i++) {
 			u32 len = (u32) strlen(GF_StreamTypes[i].name);
 			if (len+tot_len+2>=500) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Not enough memory to hold all stream types!!\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Not enough memory to hold all stream types!!\n"));
 				break;
 			}
 			if (i) {
@@ -446,6 +502,8 @@
 	}
 	return szAllStreamTypes;
 }
+#endif
+
 
 GF_EXPORT
 u32 gf_stream_types_enum(u32 *idx, const char **name, const char **desc)
@@ -511,6 +569,7 @@
 {
 	{GF_AUDIO_FMT_U8, "u8", "8 bit PCM", "pc8"},
 	{GF_AUDIO_FMT_S16, "s16", "16 bit PCM Little Endian", "pcm"},
+	{GF_AUDIO_FMT_S16_BE, "s16b", "16 bit PCM Big Endian", "pcmb"},
 	{GF_AUDIO_FMT_S24, "s24", "24 bit PCM"},
 	{GF_AUDIO_FMT_S32, "s32", "32 bit PCM Little Endian"},
 	{GF_AUDIO_FMT_FLT, "flt", "32-bit floating point PCM"},
@@ -537,7 +596,7 @@
 			return GF_AudioFormats[i].sfmt;
 		i++;
 	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported audio format %s\n", af_name));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unsupported audio format %s\n", af_name));
 	return 0;
 }
 
@@ -549,7 +608,7 @@
 		if (GF_AudioFormats[i].sfmt==sfmt) return GF_AudioFormats[i].name;
 		i++;
 	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported audio format %d\n", sfmt ));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unsupported audio format %d\n", sfmt ));
 	return "unknown";
 }
 GF_EXPORT
@@ -564,7 +623,7 @@
 		}
 		i++;
 	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported audio format %d\n", sfmt ));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unsupported audio format %d\n", sfmt ));
 	return "unknown";
 }
 
@@ -580,7 +639,7 @@
 		while (!i || GF_AudioFormats[i].sfmt) {
 			u32 len = (u32) strlen(GF_AudioFormats[i].name);
 			if (len+tot_len+2>=500) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Not enough memory to hold all audio formats!!\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Not enough memory to hold all audio formats!!\n"));
 				break;
 			}
 			strcat((char *)szAllAudioFormats, ",");
@@ -606,7 +665,7 @@
 			const char * n = GF_AudioFormats[i].sname ? GF_AudioFormats[i].sname : GF_AudioFormats[i].name;
 			u32 len = (u32) strlen(n);
 			if (len+tot_len+1>=500) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Not enough memory to hold all audio formats!!\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Not enough memory to hold all audio formats!!\n"));
 				break;
 			}
 			if (i) {
@@ -650,6 +709,7 @@
 	case GF_AUDIO_FMT_U8: return 8;
 
 	case GF_AUDIO_FMT_S16P:
+	case GF_AUDIO_FMT_S16_BE:
 	case GF_AUDIO_FMT_S16: return 16;
 
 	case GF_AUDIO_FMT_S32P:
@@ -687,22 +747,37 @@
 	return GF_FALSE;
 }
 
+static struct pcmfmt_to_qt
+{
+	GF_AudioFormat afmt;
+	u32 qt4cc;
+} AudiosToQT[] = {
+	{GF_AUDIO_FMT_S16, GF_QT_SUBTYPE_SOWT},
+	{GF_AUDIO_FMT_FLT, GF_QT_SUBTYPE_FL32},
+	{GF_AUDIO_FMT_DBL, GF_QT_SUBTYPE_FL64},
+	{GF_AUDIO_FMT_S24, GF_QT_SUBTYPE_IN24},
+	{GF_AUDIO_FMT_S32, GF_QT_SUBTYPE_IN32},
+	{GF_AUDIO_FMT_S16_BE, GF_QT_SUBTYPE_TWOS},
+};
+
 GF_EXPORT
 GF_AudioFormat gf_audio_fmt_from_isobmf(u32 msubtype)
 {
-	switch (msubtype) {
-	case GF_QT_SUBTYPE_TWOS:
-		return GF_AUDIO_FMT_S16;
-	case GF_QT_SUBTYPE_SOWT:
-		return GF_AUDIO_FMT_S16;
-	case GF_QT_SUBTYPE_FL32:
-		return GF_AUDIO_FMT_FLT;
-	case GF_QT_SUBTYPE_FL64:
-		return GF_AUDIO_FMT_DBL;
-	case GF_QT_SUBTYPE_IN24:
-		return GF_AUDIO_FMT_S24;
-	case GF_QT_SUBTYPE_IN32:
-		return GF_AUDIO_FMT_S32;
+	u32 i, count = GF_ARRAY_LENGTH(AudiosToQT);
+	for (i=0; i<count; i++) {
+		if (msubtype == AudiosToQT[i].qt4cc)
+			return AudiosToQT[i].afmt;
+	}
+	return 0;
+}
+
+GF_EXPORT
+u32 gf_audio_fmt_to_isobmf(GF_AudioFormat afmt)
+{
+	u32 i, count = GF_ARRAY_LENGTH(AudiosToQT);
+	for (i=0; i<count; i++) {
+		if (afmt == AudiosToQT[i].afmt)
+			return AudiosToQT[i].qt4cc;
 	}
 	return 0;
 }
@@ -716,8 +791,10 @@
 	else if ((nb_chan==3) && !nb_surr && !nb_lfe) return 3;
 	else if ((nb_chan==3) && (nb_surr==1) && !nb_lfe) return 4;
 	else if ((nb_chan==3) && (nb_surr==2) && !nb_lfe) return 5;
+
 	else if ((nb_chan==3) && (nb_surr==2) && (nb_lfe==1)) return 6;
 	else if ((nb_chan==5) && (nb_surr==0) && (nb_lfe==1)) return 6;
+	else if ((nb_chan==6) && (nb_surr==0) && (nb_lfe==0)) return 6; //mis-signalled 5.1
 
 	else if ((nb_chan==5) && (nb_surr==2) && (nb_lfe==1)) return 7;
 	else if ((nb_chan==2) && (nb_surr==1) && !nb_lfe) return 9;
@@ -728,13 +805,16 @@
 	//we miss left / right front center vs left / right front vertical to signal this one
 //	else if ((nb_chan==5) && (nb_surr==2) && (nb_lfe==1)) return 14;
 	else if ((nb_chan==5) && (nb_surr==5) && (nb_lfe==2)) return 15;
+
 	else if ((nb_chan==5) && (nb_surr==4) && (nb_lfe==1)) return 16;
+	else if ((nb_chan==10) && (nb_surr==0) && (nb_lfe==0)) return 16; //mis-signalled 5.1.4
+
 	else if ((nb_surr==5) && (nb_lfe==1) && (nb_chan==6)) return 17;
 	else if ((nb_surr==7) && (nb_lfe==1) && (nb_chan==6)) return 18;
 	else if ((nb_chan==5) && (nb_surr==6) && (nb_lfe==1)) return 19;
 	else if ((nb_chan==7) && (nb_surr==6) && (nb_lfe==1)) return 20;
 
-	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Unkown CICP mapping for channel config %d/%d.%d\n", nb_chan, nb_surr, nb_lfe));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Unknown CICP mapping for channel config %d/%d.%d\n", nb_chan, nb_surr, nb_lfe));
 	return 0;
 }
 
@@ -747,8 +827,8 @@
 
 static const GF_CICPAudioLayout GF_CICPLayouts[] =
 {
-	{1, "1/0.0", GF_AUDIO_CH_FRONT_CENTER },
-	{2, "2/0.0", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT },
+	{1, "mono"/*"1/0.0"*/, GF_AUDIO_CH_FRONT_CENTER },
+	{2, "stereo"/*"2/0.0"*/, GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT },
 	{3, "3/0.0", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER },
 	{4, "3/1.0", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_REAR_CENTER },
 	{5, "3/2.0", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_REAR_SURROUND_LEFT | GF_AUDIO_CH_REAR_SURROUND_RIGHT },
@@ -776,7 +856,7 @@
 	for (i = 0; i < nb_cicp; i++) {
 		if (GF_CICPLayouts[i].cicp == cicp_layout) return GF_CICPLayouts[i].channel_mask;
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("Unsupported cicp audio layout value %d\n", cicp_layout));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Unsupported cicp audio layout value %d\n", cicp_layout));
 	return 0;
 }
 
@@ -787,21 +867,160 @@
 	for (i = 0; i < nb_cicp; i++) {
 		if (GF_CICPLayouts[i].cicp == cicp_layout) return GF_CICPLayouts[i].name;
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("Unsupported cicp audio layout value %d\n", cicp_layout));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Unsupported cicp audio layout value %d\n", cicp_layout));
+	return "unknwon";
+}
+
+GF_EXPORT
+const char *gf_audio_fmt_get_layout_name(u64 ch_layout)
+{
+	u32 i, nb_cicp = sizeof(GF_CICPLayouts) / sizeof(GF_CICPAudioLayout);
+	for (i = 0; i < nb_cicp; i++) {
+		if (GF_CICPLayouts[i].channel_mask == ch_layout) return GF_CICPLayouts[i].name;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Unsupported audio layout value "LLU"\n", ch_layout));
 	return "unknwon";
 }
 
 GF_EXPORT
+u64 gf_audio_fmt_get_layout_from_name(const char *name)
+{
+	u32 i, iname, nb_cicp = sizeof(GF_CICPLayouts) / sizeof(GF_CICPAudioLayout);
+	if (!name) return 0;
+	iname = atoi(name);
+	for (i = 0; i < nb_cicp; i++) {
+		if (!strcmp(GF_CICPLayouts[i].name, name))
+			return GF_CICPLayouts[i].channel_mask;
+		if (GF_CICPLayouts[i].cicp == iname)
+			return GF_CICPLayouts[i].channel_mask;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Unsupported audio layout name %s\n", name));
+	return 0;
+}
+
+
+GF_EXPORT
 u32 gf_audio_fmt_get_cicp_from_layout(u64 chan_layout)
 {
 	u32 i, nb_cicp = sizeof(GF_CICPLayouts) / sizeof(GF_CICPAudioLayout);
 	for (i = 0; i < nb_cicp; i++) {
 		if (GF_CICPLayouts[i].channel_mask == chan_layout) return GF_CICPLayouts[i].cicp;
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("Unsupported cicp audio layout for channel layout "LLU"\n", chan_layout));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Unsupported cicp audio layout for channel layout "LLU"\n", chan_layout));
 	return 255;
 }
 
+//unused
+#if 0
+/*! get channel CICP code from name
+\param name channel layout name
+\return channel CICP code
+*/
+u32 gf_audio_fmt_get_cicp_from_name(const char *name)
+{
+	u32 i, iname, nb_cicp = sizeof(GF_CICPLayouts) / sizeof(GF_CICPAudioLayout);
+	if (!name) return 0;
+	iname = atoi(name);
+	for (i = 0; i < nb_cicp; i++) {
+		if (!strcmp(GF_CICPLayouts[i].name, name))
+			return GF_CICPLayouts[i].cicp;
+		if (GF_CICPLayouts[i].cicp == iname)
+			return GF_CICPLayouts[i].cicp;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Unsupported audio layout name %s\n", name));
+	return 0;
+}
+
+/*! get channel CICP name from
+\param cicp_code channel cicp code
+\return channel CICP name
+*/
+const char *gf_audio_fmt_get_cicp_name(u32 cicp_code)
+{
+	u32 i, nb_cicp = sizeof(GF_CICPLayouts) / sizeof(GF_CICPAudioLayout);
+	for (i = 0; i < nb_cicp; i++) {
+		if (GF_CICPLayouts[i].cicp == cicp_code) return GF_CICPLayouts[i].name;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Unsupported cicp audio layout for channel layout "LLU"\n", cicp_code));
+	return NULL;
+}
+#endif
+
+
+GF_EXPORT
+u32 gf_audio_fmt_get_num_channels_from_layout(u64 chan_layout)
+{
+	u32 i, nb_chan = 0;
+	for (i=0; i<64; i++) {
+		nb_chan += (chan_layout&1) ? 1 : 0;
+		chan_layout>>=1;
+	}
+	return nb_chan;
+}
+
+static char szCICPLayoutAllNames[1024];
+const char *gf_audio_fmt_cicp_all_names()
+{
+	if (szCICPLayoutAllNames[0] == 0) {
+		u32 i, count = GF_ARRAY_LENGTH(GF_CICPLayouts);
+		for (i=0; i<count; i++) {
+			if (i) strcat(szCICPLayoutAllNames, ",");
+			strcat(szCICPLayoutAllNames, GF_CICPLayouts[i].name);
+		}
+	}
+	return szCICPLayoutAllNames;
+}
+
+
+GF_EXPORT
+u32 gf_audio_fmt_cicp_enum(u32 idx, const char **short_name, u64 *ch_mask)
+{
+	u32 count = GF_ARRAY_LENGTH(GF_CICPLayouts);
+	if (idx >= count) return 0;
+	if (short_name) *short_name = GF_CICPLayouts[idx].name;
+	if (ch_mask) *ch_mask = GF_CICPLayouts[idx].channel_mask;
+	return GF_CICPLayouts[idx].cicp;
+}
+
+
+GF_EXPORT
+u16 gf_audio_fmt_get_dolby_chanmap(u32 cicp)
+{
+	u16 res = 0;
+	u64 layout = gf_audio_fmt_get_layout_from_cicp(cicp);
+
+	if (layout & GF_AUDIO_CH_FRONT_LEFT) res |= (1<<15); // 0
+	if (layout & GF_AUDIO_CH_FRONT_CENTER) res |= (1<<14); //1
+	if (layout & GF_AUDIO_CH_FRONT_RIGHT) res |= (1<<13); //2
+	if (layout & GF_AUDIO_CH_REAR_SURROUND_LEFT) res |= (1<<12); //3
+	if (layout & GF_AUDIO_CH_REAR_SURROUND_RIGHT) res |= (1<<11); //4
+	//Lc/Rc
+	if (layout & GF_AUDIO_CH_FRONT_CENTER_LEFT) res |= (1<<11); //5
+	//Lrs/Rrs
+	if (layout & GF_AUDIO_CH_SURROUND_LEFT) res |= (1<<9); //6
+	//Cs
+	if (layout & GF_AUDIO_CH_REAR_CENTER) res |= (1<<8); //7
+	//Ts
+	if (layout & GF_AUDIO_CH_REAR_CENTER_TOP) res |= (1<<7); //8
+	//Lsd/Rsd
+	if (layout & GF_AUDIO_CH_SIDE_SURROUND_LEFT) res |= (1<<6); //9
+	//Lw/Rw
+	if (layout & GF_AUDIO_CH_FRONT_CENTER_LEFT) res |= (1<<5); //10
+	//Vhl/Vhr
+	if (layout & GF_AUDIO_CH_FRONT_TOP_LEFT) res |= (1<<4); //11
+	//Vhc
+	if (layout & GF_AUDIO_CH_FRONT_TOP_CENTER) res |= (1<<3); //12
+	//Lts/Rts
+	if (layout & GF_AUDIO_CH_SURROUND_TOP_LEFT) res |= (1<<2); //13
+	//LFE2
+	if (layout & GF_AUDIO_CH_LFE2) res |= (1<<1); //14
+	//LFE
+	if (layout & GF_AUDIO_CH_LFE) res |= (1); //15
+	return res;
+
+}
+
+
 typedef struct
 {
 	GF_PixelFormat pixfmt;
@@ -810,25 +1029,36 @@
 	const char *sname; //short name, as used in gpac
 } GF_PixFmt;
 
+//DO NOT CHANGE ORDER, YUV formats first !
 static const GF_PixFmt GF_PixelFormats[] =
 {
 	{GF_PIXEL_YUV, "yuv420", "Planar YUV 420 8 bit", "yuv"},
+	{GF_PIXEL_YVU, "yvu420", "Planar YVU 420 8 bit", "yvu"},
 	{GF_PIXEL_YUV_10, "yuv420_10", "Planar YUV 420 10 bit", "yuvl"},
 	{GF_PIXEL_YUV422, "yuv422", "Planar YUV 422 8 bit", "yuv2"},
 	{GF_PIXEL_YUV422_10, "yuv422_10", "Planar YUV 422 10 bit", "yp2l"},
 	{GF_PIXEL_YUV444, "yuv444", "Planar YUV 444 8 bit", "yuv4"},
 	{GF_PIXEL_YUV444_10, "yuv444_10", "Planar YUV 444 10 bit", "yp4l"},
-	{GF_PIXEL_UYVY, "uyvy", "Planar UYVY 422 8 bit"},
-	{GF_PIXEL_VYUY, "vyuy", "Planar VYUV 422 8 bit"},
-	{GF_PIXEL_YUYV, "yuyv", "Planar YUYV 422 8 bit"},
-	{GF_PIXEL_YVYU, "yvyu", "Planar YVYU 422 8 bit"},
-	{GF_PIXEL_NV12, "nv12", "Semi-planar YUV 420 8 bit, Y plane and UV plane"},
-	{GF_PIXEL_NV21, "nv21", "Semi-planar YUV 420 8 bit, Y plane and VU plane"},
+	{GF_PIXEL_UYVY, "uyvy", "Packed UYVY 422 8 bit"},
+	{GF_PIXEL_VYUY, "vyuy", "Packed VYUV 422 8 bit"},
+	{GF_PIXEL_YUYV, "yuyv", "Packed YUYV 422 8 bit"},
+	{GF_PIXEL_YVYU, "yvyu", "Packed YVYU 422 8 bit"},
+	{GF_PIXEL_UYVY_10, "uyvl", "Packed UYVY 422 10->16 bit"},
+	{GF_PIXEL_VYUY_10, "vyul", "Packed VYUV 422 10->16 bit"},
+	{GF_PIXEL_YUYV_10, "yuyl", "Packed YUYV 422 10->16 bit"},
+	{GF_PIXEL_YVYU_10, "yvyl", "Packed YVYU 422 10->16 bit"},
+	{GF_PIXEL_NV12, "nv12", "Semi-planar YUV 420 8 bit, Y plane and UV packed plane"},
+	{GF_PIXEL_NV21, "nv21", "Semi-planar YUV 420 8 bit, Y plane and VU packed plane"},
 	{GF_PIXEL_NV12_10, "nv1l", "Semi-planar YUV 420 10 bit, Y plane and UV plane"},
 	{GF_PIXEL_NV21_10, "nv2l", "Semi-planar YUV 420 8 bit, Y plane and VU plane"},
 	{GF_PIXEL_YUVA, "yuva", "Planar YUV+alpha 420 8 bit"},
 	{GF_PIXEL_YUVD, "yuvd", "Planar YUV+depth 420 8 bit"},
 	{GF_PIXEL_YUVA444, "yuv444a", "Planar YUV+alpha 444 8 bit", "yp4a"},
+	{GF_PIXEL_YUV444_PACK, "yuv444p", "Packed YUV 444 8 bit", "yv4p"},
+	{GF_PIXEL_YUVA444_PACK, "yuv444ap", "Packed YUV+alpha 444 8 bit", "y4ap"},
+	{GF_PIXEL_YUV444_10_PACK, "yuv444p_10", "Packed YUV 444 10 bit", "y4lp"},
+
+	//first non-yuv format
 	{GF_PIXEL_GREYSCALE, "grey", "Greyscale 8 bit"},
 	{GF_PIXEL_ALPHAGREY, "algr", "Alpha+Grey 8 bit"},
 	{GF_PIXEL_GREYALPHA, "gral", "Grey+Alpha 8 bit"},
@@ -857,7 +1087,7 @@
 GF_PixelFormat gf_pixel_fmt_parse(const char *pf_name)
 {
 	u32 i=0;
-	if (!pf_name || !strcmp(pf_name, "none")) return 0;
+	if (!pf_name || !strcmp(pf_name, "none") || !strcmp(pf_name, "0")) return 0;
 	while (GF_PixelFormats[i].pixfmt) {
 		if (!strcmp(GF_PixelFormats[i].name, pf_name))
 			return GF_PixelFormats[i].pixfmt;
@@ -865,9 +1095,33 @@
 			return GF_PixelFormats[i].pixfmt;
 		i++;
 	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported pixel format %s\n", pf_name));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unsupported pixel format %s\n", pf_name));
 	return 0;
 }
+
+GF_EXPORT
+Bool gf_pixel_fmt_probe(GF_PixelFormat pf_4cc, const char *pf_name)
+{
+	u32 i=0;
+	if (pf_name) {
+		if (!strcmp(pf_name, "none") || !strcmp(pf_name, "0")) return GF_TRUE;
+	}
+	while (GF_PixelFormats[i].pixfmt) {
+		if (pf_4cc) {
+			if (GF_PixelFormats[i].pixfmt == pf_4cc)
+				return GF_TRUE;
+		}
+		if (pf_name) {
+			if (!strcmp(GF_PixelFormats[i].name, pf_name))
+				return GF_TRUE;
+			if (GF_PixelFormats[i].sname && !strcmp(GF_PixelFormats[i].sname, pf_name))
+				return GF_TRUE;
+		}
+		i++;
+	}
+	return GF_FALSE;
+}
+
 GF_EXPORT
 const char *gf_pixel_fmt_name(GF_PixelFormat pfmt)
 {
@@ -876,7 +1130,7 @@
 		if (GF_PixelFormats[i].pixfmt==pfmt) return GF_PixelFormats[i].name;
 		i++;
 	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported pixel format %d (%s)\n", pfmt, gf_4cc_to_str(pfmt) ));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unsupported pixel format %d (%s)\n", pfmt, gf_4cc_to_str(pfmt) ));
 	return "unknown";
 }
 GF_EXPORT
@@ -891,13 +1145,13 @@
 		}
 		i++;
 	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported pixel format %d (%s)\n", pfmt, gf_4cc_to_str(pfmt) ));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unsupported pixel format %d (%s)\n", pfmt, gf_4cc_to_str(pfmt) ));
 	return "unknown";
 
 }
 
 GF_EXPORT
-u32 gf_pixel_fmt_enum(u32 *idx, const char **name, const char **fileext, const char **description)
+GF_PixelFormat gf_pixel_fmt_enum(u32 *idx, const char **name, const char **fileext, const char **description)
 {
 	u32 nb_pfmt = sizeof(GF_PixelFormats) / sizeof(GF_PixFmt);
 	if (*idx >= nb_pfmt) return 0;
@@ -913,6 +1167,18 @@
 }
 
 
+GF_EXPORT
+Bool gf_pixel_fmt_is_yuv(GF_PixelFormat pfmt)
+{
+	u32 i=0;
+	while (GF_PixelFormats[i].pixfmt) {
+		if (GF_PixelFormats[i].pixfmt==pfmt) return GF_TRUE;
+		if (GF_PixelFormats[i].pixfmt==GF_PIXEL_GREYSCALE) return GF_FALSE;
+		i++;
+	}
+	return GF_FALSE;
+}
+
 static char szAllPixelFormats[5000] = {0};
 
 GF_EXPORT
@@ -933,7 +1199,7 @@
 
 			len = (u32) strlen(GF_PixelFormats[i].name);
 			if (len+tot_len+2>=5000) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Not enough memory to hold all pixel formats!!\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Not enough memory to hold all pixel formats!!\n"));
 				break;
 			}
 			strcat((char *)szAllPixelFormats, ",");
@@ -965,7 +1231,7 @@
 			n = GF_PixelFormats[i].sname ? GF_PixelFormats[i].sname : GF_PixelFormats[i].name;
 			len = (u32) strlen(n);
 			if (len+tot_len+1>=5000) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Not enough memory to hold all pixel formats!!\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Not enough memory to hold all pixel formats!!\n"));
 				break;
 			}
 			if (i) {
@@ -1037,6 +1303,7 @@
 		planes=1;
 		break;
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 		stride = no_in_stride ? width : *out_stride;
 		uv_height = height / 2;
 		if (height % 2) uv_height++;
@@ -1131,6 +1398,30 @@
 		planes=1;
 		size = height * stride;
 		break;
+	case GF_PIXEL_UYVY_10:
+	case GF_PIXEL_VYUY_10:
+	case GF_PIXEL_YUYV_10:
+	case GF_PIXEL_YVYU_10:
+		stride = no_in_stride ? 4*width : *out_stride;
+		planes=1;
+		size = height * stride;
+		break;
+	case GF_PIXEL_YUV444_PACK:
+		stride = no_in_stride ? 3 * width : *out_stride;
+		planes=1;
+		size = height * stride;
+		break;
+	case GF_PIXEL_YUVA444_PACK:
+		stride = no_in_stride ? 4 * width : *out_stride;
+		planes=1;
+		size = height * stride;
+		break;
+	case GF_PIXEL_YUV444_10_PACK:
+		stride = no_in_stride ? 4 * width : *out_stride;
+		planes = 1;
+		size = height * stride;
+		break;
+
 	case GF_PIXEL_GL_EXTERNAL:
 		planes = 1;
 		size = 0;
@@ -1139,7 +1430,7 @@
 		uv_height = 0;
 		break;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported pixel format %s, cannot get size info\n", gf_pixel_fmt_name(pixfmt) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unsupported pixel format %s, cannot get size info\n", gf_pixel_fmt_name(pixfmt) ));
 		return GF_FALSE;
 	}
 	if (out_size) *out_size = size;
@@ -1151,6 +1442,47 @@
 }
 
 GF_EXPORT
+Bool gf_pixel_fmt_is_transparent(GF_PixelFormat pixfmt)
+{
+	switch (pixfmt) {
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_RGBA:
+	case GF_PIXEL_ABGR:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_RGBAS:
+	case GF_PIXEL_YUVA:
+	case GF_PIXEL_YUVA444:
+	case GF_PIXEL_YUVA444_PACK:
+		return GF_TRUE;
+	default:
+		break;
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
+u32 gf_pixel_is_wide_depth(GF_PixelFormat pixfmt)
+{
+	switch (pixfmt) {
+	case GF_PIXEL_YUV_10:
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_YUV444_10:
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+	case GF_PIXEL_UYVY_10:
+	case GF_PIXEL_VYUY_10:
+	case GF_PIXEL_YUYV_10:
+	case GF_PIXEL_YVYU_10:
+	case GF_PIXEL_YUV444_10_PACK:
+		return 10;
+	default:
+		return 8;
+	}
+}
+
+GF_EXPORT
 u32 gf_pixel_get_bytes_per_pixel(GF_PixelFormat pixfmt)
 {
 	switch (pixfmt) {
@@ -1180,6 +1512,7 @@
 	case GF_PIXEL_RGBS:
 		return 3;
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 	case GF_PIXEL_YUVA:
 	case GF_PIXEL_YUVA444:
 	case GF_PIXEL_YUVD:
@@ -1205,10 +1538,20 @@
 	case GF_PIXEL_YUYV:
 	case GF_PIXEL_YVYU:
 		return 1;
+	case GF_PIXEL_UYVY_10:
+	case GF_PIXEL_VYUY_10:
+	case GF_PIXEL_YUYV_10:
+	case GF_PIXEL_YVYU_10:
+		return 2;
+	case GF_PIXEL_YUV444_PACK:
+	case GF_PIXEL_YUVA444_PACK:
+	case GF_PIXEL_YUV444_10_PACK:
+		return 1;
+
 	case GF_PIXEL_GL_EXTERNAL:
 		return 1;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported pixel format %s, cannot get bytes per pixel info\n", gf_pixel_fmt_name(pixfmt) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unsupported pixel format %s, cannot get bytes per pixel info\n", gf_pixel_fmt_name(pixfmt) ));
 		break;
 	}
 	return 0;
@@ -1250,6 +1593,7 @@
 	case GF_PIXEL_RGBS:
 		return 4;
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
 		return 3;
 	case GF_PIXEL_YUVA:
 	case GF_PIXEL_YUVA444:
@@ -1277,45 +1621,144 @@
 	case GF_PIXEL_YUYV:
 	case GF_PIXEL_YVYU:
 		return 3;
+	case GF_PIXEL_UYVY_10:
+	case GF_PIXEL_VYUY_10:
+	case GF_PIXEL_YUYV_10:
+	case GF_PIXEL_YVYU_10:
+		return 3;
+	case GF_PIXEL_YUV444_PACK:
+		return 3;
+	case GF_PIXEL_YUVA444_PACK:
+		return 4;
+	case GF_PIXEL_YUV444_10_PACK:
+		return 3;
+
 	case GF_PIXEL_GL_EXTERNAL:
 		return 1;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported pixel format %s, cannot get number of components per pixel info\n", gf_pixel_fmt_name(pixfmt) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unsupported pixel format %s, cannot get number of components per pixel info\n", gf_pixel_fmt_name(pixfmt) ));
 		break;
 	}
 	return 0;
 }
 
+static struct pixfmt_to_qt
+{
+	GF_PixelFormat pfmt;
+	u32 qt4cc;
+} PixelsToQT[] = {
+	{GF_PIXEL_RGB, GF_QT_SUBTYPE_RAW},
+	{GF_PIXEL_YUYV, GF_QT_SUBTYPE_YUYV},
+	{GF_PIXEL_UYVY, GF_QT_SUBTYPE_UYVY},
+	{GF_PIXEL_YUV444_PACK, GF_QT_SUBTYPE_YUV444},
+	{GF_PIXEL_YUVA444_PACK, GF_QT_SUBTYPE_YUVA444},
+	{GF_PIXEL_UYVY_10, GF_QT_SUBTYPE_YUV422_16},
+	{GF_PIXEL_YVYU, GF_QT_SUBTYPE_YVYU},
+	{GF_PIXEL_YUV444_10_PACK, GF_QT_SUBTYPE_YUV444_10},
+	{GF_PIXEL_YUV, GF_QT_SUBTYPE_YUV420},
+	{GF_PIXEL_YUV, GF_QT_SUBTYPE_I420},
+	{GF_PIXEL_YUV, GF_QT_SUBTYPE_IYUV},
+	{GF_PIXEL_YVU, GF_QT_SUBTYPE_YV12},
+	{GF_PIXEL_RGBA, GF_QT_SUBTYPE_RGBA},
+	{GF_PIXEL_ABGR, GF_QT_SUBTYPE_ABGR}
+};
 
+GF_EXPORT
+GF_PixelFormat gf_pixel_fmt_from_qt_type(u32 qt_code)
+{
+	u32 i, count = GF_ARRAY_LENGTH(PixelsToQT);
+	for (i=0; i<count; i++) {
+		if (PixelsToQT[i].qt4cc==qt_code) return PixelsToQT[i].pfmt;
+	}
+	return 0;
+}
 
+GF_EXPORT
+u32 gf_pixel_fmt_to_qt_type(GF_PixelFormat pix_fmt)
+{
+	u32 i, count = GF_ARRAY_LENGTH(PixelsToQT);
+	for (i=0; i<count; i++) {
+		if (PixelsToQT[i].pfmt==pix_fmt) return PixelsToQT[i].qt4cc;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Unknown mapping to QT/ISOBMFF for pixel format %s\n", gf_pixel_fmt_name(pix_fmt)));
+	return 0;
+}
 
 
 static struct _itags {
 	const char *name;
+	const char *alt_name;
 	u32 itag;
 	u32 id3tag;
 	u32 type;
+	Bool match_substr;
 } itunes_tags[] = {
 
-	{"album", GF_ISOM_ITUNE_ALBUM, GF_ID3V2_FRAME_TALB, GF_ITAG_STR},
-	{"artist", GF_ISOM_ITUNE_ARTIST, GF_ID3V2_FRAME_TPE1, GF_ITAG_STR},
-	{"comment", GF_ISOM_ITUNE_COMMENT, 0, GF_ITAG_SUBSTR},
-	{"complilation", GF_ISOM_ITUNE_COMPILATION, GF_ID3V2_FRAME_TCMP, GF_ITAG_BOOL},
-	{"composer", GF_ISOM_ITUNE_COMPOSER, GF_ID3V2_FRAME_TCOM, GF_ITAG_STR},
-	{"year", GF_ISOM_ITUNE_CREATED, GF_ID3V2_FRAME_TDRC, GF_ITAG_STR},
-	{"disk", GF_ISOM_ITUNE_DISK, GF_ID3V2_FRAME_TPOS, GF_ITAG_STR},
-	{"tool", GF_ISOM_ITUNE_TOOL, 0, GF_ITAG_STR},
-	{"genre", GF_ISOM_ITUNE_GENRE, GF_ID3V2_FRAME_TCON, GF_ITAG_STR},
-	{"contentgroup", GF_ISOM_ITUNE_GROUP, GF_ID3V2_FRAME_TIT1, GF_ITAG_STR},
-	{"title", GF_ISOM_ITUNE_NAME, GF_ID3V2_FRAME_TIT2, GF_ITAG_STR},
-	{"tempo", GF_ISOM_ITUNE_TEMPO, GF_ID3V2_FRAME_TBPM, GF_ITAG_STR},
-	{"track", GF_ISOM_ITUNE_TRACK, 0, GF_ITAG_STR},
-	{"tracknum", GF_ISOM_ITUNE_TRACKNUMBER, GF_ID3V2_FRAME_TRCK, GF_ITAG_STR},
-	{"writer", GF_ISOM_ITUNE_WRITER, GF_ID3V2_FRAME_TEXT, GF_ITAG_STR},
-	{"encoder", GF_ISOM_ITUNE_ENCODER, GF_ID3V2_FRAME_TSSE, GF_ITAG_STR},
-	{"album_artist", GF_ISOM_ITUNE_ALBUM_ARTIST, GF_ID3V2_FRAME_TPE2, GF_ITAG_SUBSTR},
-	{"gapless", GF_ISOM_ITUNE_GAPLESS, 0, GF_ITAG_BOOL},
-	{"conductor", GF_ISOM_ITUNE_CONDUCTOR, GF_ID3V2_FRAME_TPE3, GF_ITAG_STR},
+	{"title", "name", GF_ISOM_ITUNE_NAME, GF_ID3V2_FRAME_TIT2, GF_ITAG_STR, 0},
+	{"artist", NULL, GF_ISOM_ITUNE_ARTIST, GF_ID3V2_FRAME_TPE1, GF_ITAG_STR, 0},
+	{"album_artist", "albumArtist", GF_ISOM_ITUNE_ALBUM_ARTIST, GF_ID3V2_FRAME_TPE2, GF_ITAG_STR, 1},
+	{"album", NULL, GF_ISOM_ITUNE_ALBUM, GF_ID3V2_FRAME_TALB, GF_ITAG_STR, 0},
+	{"group", "grouping", GF_ISOM_ITUNE_GROUP, GF_ID3V2_FRAME_TIT1, GF_ITAG_STR, 0},
+	{"composer", NULL, GF_ISOM_ITUNE_COMPOSER, GF_ID3V2_FRAME_TCOM, GF_ITAG_STR, 0},
+	{"writer", NULL, GF_ISOM_ITUNE_WRITER, GF_ID3V2_FRAME_TEXT, GF_ITAG_STR, 0},
+	{"conductor", NULL, GF_ISOM_ITUNE_CONDUCTOR, GF_ID3V2_FRAME_TPE3, GF_ITAG_STR, 0},
+	{"comment", "comments", GF_ISOM_ITUNE_COMMENT, GF_ID3V2_FRAME_COMM, GF_ITAG_STR, 1},
+	//mapped dynamically to GF_ISOM_ITUNE_GENRE or GF_ISOM_ITUNE_GENRE_USER
+	{"genre", NULL, GF_ISOM_ITUNE_GENRE, GF_ID3V2_FRAME_TCON, GF_ITAG_ID3_GENRE, 0},
+	{"created", "releaseDate", GF_ISOM_ITUNE_CREATED, GF_ID3V2_FRAME_TYER, GF_ITAG_STR, 1},
+	{"track", NULL, GF_ISOM_ITUNE_TRACK, 0, GF_ITAG_STR, 0},
+	{"tracknum", NULL, GF_ISOM_ITUNE_TRACKNUMBER, GF_ID3V2_FRAME_TRCK, GF_ITAG_FRAC8, 0},
+	{"disk", NULL, GF_ISOM_ITUNE_DISK, GF_ID3V2_FRAME_TPOS, GF_ITAG_FRAC6, 0},
+	{"tempo", NULL, GF_ISOM_ITUNE_TEMPO, GF_ID3V2_FRAME_TBPM, GF_ITAG_INT16, 0},
+	{"compilation", NULL, GF_ISOM_ITUNE_COMPILATION, GF_ID3V2_FRAME_TCMP, GF_ITAG_BOOL, 0},
+	{"show", "tvShow", GF_ISOM_ITUNE_TV_SHOW, 0, GF_ITAG_STR, 0},
+	{"episode_id", "tvEpisodeID", GF_ISOM_ITUNE_TV_EPISODE, 0, GF_ITAG_STR, 0},
+	{"season", "tvSeason", GF_ISOM_ITUNE_TV_SEASON, 0, GF_ITAG_INT32, 0},
+	{"episode", "tvEPisode", GF_ISOM_ITUNE_TV_EPISODE_NUM, 0, GF_ITAG_INT32, 0},
+	{"network", "tvNetwork", GF_ISOM_ITUNE_TV_NETWORK, 0, GF_ITAG_STR, 0},
+	{"sdesc", "description", GF_ISOM_ITUNE_DESCRIPTION, 0, GF_ITAG_STR, 0},
+	{"ldesc", "longDescription", GF_ISOM_ITUNE_LONG_DESCRIPTION, GF_ID3V2_FRAME_TDES, GF_ITAG_STR, 0},
+	{"lyrics", NULL, GF_ISOM_ITUNE_LYRICS, GF_ID3V2_FRAME_USLT, GF_ITAG_STR, 0},
+	{"sort_name", "sortName", GF_ISOM_ITUNE_SORT_NAME, GF_ID3V2_FRAME_TSOT, GF_ITAG_STR, 0},
+	{"sort_artist", "sortArtist", GF_ISOM_ITUNE_SORT_ARTIST, GF_ID3V2_FRAME_TSOP, GF_ITAG_STR, 0},
+	{"sort_album_artist", "sortAlbumArtist", GF_ISOM_ITUNE_SORT_ALB_ARTIST, GF_ID3V2_FRAME_TSO2, GF_ITAG_STR, 0},
+	{"sort_album", "sortAlbum", GF_ISOM_ITUNE_SORT_ALBUM, GF_ID3V2_FRAME_TSOA, GF_ITAG_STR, 0},
+	{"sort_composer", "sortComposer", GF_ISOM_ITUNE_SORT_COMPOSER, GF_ID3V2_FRAME_TSOC, GF_ITAG_STR, 0},
+	{"sort_show", "sortShow", GF_ISOM_ITUNE_SORT_SHOW, 0, GF_ITAG_STR, 0},
+	{"cover", "artwork", GF_ISOM_ITUNE_COVER_ART, 0, GF_ITAG_FILE, 0},
+	{"copyright", NULL, GF_ISOM_ITUNE_COPYRIGHT, GF_ID3V2_FRAME_TCOP, GF_ITAG_STR, 0},
+	{"tool", "encodingTool", GF_ISOM_ITUNE_TOOL, 0, GF_ITAG_STR, 0},
+	{"encoder", "encodedBy", GF_ISOM_ITUNE_ENCODER, GF_ID3V2_FRAME_TENC, GF_ITAG_STR, 0},
+	{"pdate", "purchaseDate", GF_ISOM_ITUNE_PURCHASE_DATE, 0, GF_ITAG_STR, 0},
+	{"podcast", NULL, GF_ISOM_ITUNE_PODCAST, 0, GF_ITAG_BOOL, 0},
+	{"url", "podcastURL", GF_ISOM_ITUNE_PODCAST_URL, 0, GF_ITAG_STR, 0},
+	{"keywords", NULL, GF_ISOM_ITUNE_KEYWORDS, GF_ID3V2_FRAME_TKWD, GF_ITAG_STR, 0},
+	{"category", NULL, GF_ISOM_ITUNE_CATEGORY, GF_ID3V2_FRAME_TCAT, GF_ITAG_STR, 0},
+	{"hdvideo", NULL, GF_ISOM_ITUNE_HD_VIDEO, 0, GF_ITAG_INT8, 0},
+	{"media", "mediaType", GF_ISOM_ITUNE_MEDIA_TYPE, 0, GF_ITAG_INT8, 0},
+	{"rating", "contentRating", GF_ISOM_ITUNE_RATING, 0, GF_ITAG_INT8, 0},
+	{"gapless", NULL, GF_ISOM_ITUNE_GAPLESS, 0, GF_ITAG_BOOL, 0},
+	{"art_director", NULL, GF_ISOM_ITUNE_ART_DIRECTOR, 0, GF_ITAG_STR, 0},
+	{"arranger", NULL, GF_ISOM_ITUNE_ARRANGER, 0, GF_ITAG_STR, 0},
+	{"lyricist", NULL, GF_ISOM_ITUNE_LYRICIST, 0, GF_ITAG_STR, 0},
+	{"acknowledgement", NULL, GF_ISOM_ITUNE_COPY_ACK, 0, GF_ITAG_STR, 0},
+	{"song_description", NULL, GF_ISOM_ITUNE_SONG_DESC, 0, GF_ITAG_STR, 0},
+	{"director", NULL, GF_ISOM_ITUNE_DIRECTOR, 0, GF_ITAG_STR, 0},
+	{"equalizer", NULL, GF_ISOM_ITUNE_EQ_PRESET, 0, GF_ITAG_STR, 0},
+	{"liner", NULL, GF_ISOM_ITUNE_LINER_NOTES, 0, GF_ITAG_STR, 0},
+	{"record_company", NULL, GF_ISOM_ITUNE_REC_COMPANY, 0, GF_ITAG_STR, 0},
+	{"original_artist", NULL, GF_ISOM_ITUNE_ORIG_ARTIST, 0, GF_ITAG_STR, 0},
+	{"phono_rights", NULL, GF_ISOM_ITUNE_PHONO_RIGHTS, 0, GF_ITAG_STR, 0},
+	{"producer", NULL, GF_ISOM_ITUNE_PRODUCER, 0, GF_ITAG_STR, 0},
+	{"performer", NULL, GF_ISOM_ITUNE_PERFORMER, 0, GF_ITAG_STR, 0},
+	{"publisher", NULL, GF_ISOM_ITUNE_PUBLISHER, 0, GF_ITAG_STR, 0},
+	{"sound_engineer", NULL, GF_ISOM_ITUNE_SOUND_ENG, 0, GF_ITAG_STR, 0},
+	{"soloist", NULL, GF_ISOM_ITUNE_SOLOIST, 0, GF_ITAG_STR, 0},
+	{"credits", NULL, GF_ISOM_ITUNE_CREDITS, 0, GF_ITAG_STR, 0},
+	{"thanks", NULL, GF_ISOM_ITUNE_THANKS, 0, GF_ITAG_STR, 0},
+	{"online_info", NULL, GF_ISOM_ITUNE_ONLINE, 0, GF_ITAG_STR, 0},
+	{"exec_producer", NULL, GF_ISOM_ITUNE_EXEC_PRODUCER, 0, GF_ITAG_STR, 0},
+
 };
 
 GF_EXPORT
@@ -1344,9 +1787,9 @@
 {
 	u32 i, count = GF_ARRAY_LENGTH(itunes_tags);
 	for (i=0; i<count; i++) {
-		if (!strcmp(tag_name, itunes_tags[i].name)) {
+		if (!stricmp(tag_name, itunes_tags[i].name)) {
 			return i;
-		} else if ((itunes_tags[i].type==GF_ITAG_SUBSTR) && !strnicmp(tag_name, itunes_tags[i].name, strlen(itunes_tags[i].name) )) {
+		} else if (itunes_tags[i].match_substr && !strnicmp(tag_name, itunes_tags[i].name, strlen(itunes_tags[i].name) )) {
 			return i;
 		}
 	}
@@ -1354,10 +1797,10 @@
 }
 
 GF_EXPORT
-u32 gf_itags_get_type(u32 tag_idx)
+s32 gf_itags_get_type(u32 tag_idx)
 {
 	u32 count = GF_ARRAY_LENGTH(itunes_tags);
-	if (tag_idx>=count) return 0;
+	if (tag_idx>=count) return -1;
 	return itunes_tags[tag_idx].type;
 }
 
@@ -1370,6 +1813,14 @@
 }
 
 GF_EXPORT
+const char *gf_itags_get_alt_name(u32 tag_idx)
+{
+	u32 count = GF_ARRAY_LENGTH(itunes_tags);
+	if (tag_idx>=count) return NULL;
+	return itunes_tags[tag_idx].alt_name;
+}
+
+GF_EXPORT
 u32 gf_itags_get_itag(u32 tag_idx)
 {
 	u32 count = GF_ARRAY_LENGTH(itunes_tags);
@@ -1437,3 +1888,324 @@
 	}
 	return 0;
 }
+
+struct cicp_prim
+{
+	u32 code;
+	const char *name;
+} CICPColorPrimaries[] = {
+	{GF_CICP_PRIM_RESERVED_0, "reserved0"},
+	{GF_CICP_PRIM_BT709, "BT709"},
+	{GF_CICP_PRIM_UNSPECIFIED, "undef"},
+	{GF_CICP_PRIM_RESERVED_3, "reserved3"},
+	{GF_CICP_PRIM_BT470M, "BT470M"},
+	{GF_CICP_PRIM_BT470G, "BT470G"},
+	{GF_CICP_PRIM_SMPTE170, "SMPTE170"},
+	{GF_CICP_PRIM_SMPTE240, "SMPTE240"},
+	{GF_CICP_PRIM_FILM, "FILM"},
+	{GF_CICP_PRIM_BT2020, "BT2020"},
+	{GF_CICP_PRIM_SMPTE428, "SMPTE428"},
+	{GF_CICP_PRIM_SMPTE431, "SMPTE431"},
+	{GF_CICP_PRIM_SMPTE432, "SMPTE432"},
+	{GF_CICP_PRIM_EBU3213, "EBU3213"},
+};
+
+static void cicp_parse_int(const char *val, u32 *ival)
+{
+	if (sscanf(val, "%u", ival)!=1) {
+		*ival = (u32) -1;
+	} else {
+		char szCoef[100];
+		sprintf(szCoef, "%u", *ival);
+		if (stricmp(szCoef, val))
+			*ival = -1;
+	}
+}
+
+GF_EXPORT
+u32 gf_cicp_parse_color_primaries(const char *val)
+{
+	u32 i, ival, count = GF_ARRAY_LENGTH(CICPColorPrimaries);
+	cicp_parse_int(val, &ival);
+	for (i=0; i<count; i++) {
+		if (!stricmp(val, CICPColorPrimaries[i].name) || (ival==CICPColorPrimaries[i].code)) {
+			return CICPColorPrimaries[i].code;
+		}
+	}
+	if (strcmp(val, "-1")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unknow CICP color primaries type %s\n", val));
+	}
+	return (u32) -1;
+}
+
+GF_EXPORT
+const char *gf_cicp_color_primaries_name(u32 cicp_mx)
+{
+	u32 i, count = GF_ARRAY_LENGTH(CICPColorPrimaries);
+	for (i=0; i<count; i++) {
+		if (CICPColorPrimaries[i].code==cicp_mx) {
+			return CICPColorPrimaries[i].name;
+		}
+	}
+	return "unknwon";
+}
+
+static char szCICPPrimAllNames[1024];
+
+GF_EXPORT
+const char *gf_cicp_color_primaries_all_names()
+{
+	if (szCICPPrimAllNames[0] == 0) {
+		u32 i, count = GF_ARRAY_LENGTH(CICPColorPrimaries);
+		for (i=0; i<count; i++) {
+			if (i) strcat(szCICPPrimAllNames, ",");
+			strcat(szCICPPrimAllNames, CICPColorPrimaries[i].name);
+		}
+	}
+	return szCICPPrimAllNames;
+}
+
+
+struct cicp_trans
+{
+	u32 code;
+	const char *name;
+} CICPColorTransfer[] = {
+	{GF_CICP_TRANSFER_RESERVED_0, "reserved0"},
+	{GF_CICP_TRANSFER_BT709, "BT709"},
+	{GF_CICP_TRANSFER_UNSPECIFIED, "undef"},
+	{GF_CICP_TRANSFER_RESERVED_3, "reserved3"},
+	{GF_CICP_TRANSFER_BT470M, "BT470M"},
+	{GF_CICP_TRANSFER_BT470BG, "BT470BG"},
+	{GF_CICP_TRANSFER_SMPTE170, "SMPTE170"},
+	{GF_CICP_TRANSFER_SMPTE240, "SMPTE249"},
+	{GF_CICP_TRANSFER_LINEAR, "Linear"},
+	{GF_CICP_TRANSFER_LOG100, "Log100"},
+	{GF_CICP_TRANSFER_LOG316, "Log316"},
+	{GF_CICP_TRANSFER_IEC61966, "IEC61966"},
+	{GF_CICP_TRANSFER_BT1361, "BT1361"},
+	{GF_CICP_TRANSFER_SRGB, "sRGB"},
+	{GF_CICP_TRANSFER_BT2020_10, "BT2020_10"},
+	{GF_CICP_TRANSFER_BT2020_12, "BT2020_12"},
+	{GF_CICP_TRANSFER_SMPTE2084, "SMPTE2084"},
+	{GF_CICP_TRANSFER_SMPTE428, "SMPTE428"},
+	{GF_CICP_TRANSFER_STDB67, "STDB67"}
+};
+
+GF_EXPORT
+u32 gf_cicp_parse_color_transfer(const char *val)
+{
+	u32 i, ival, count = GF_ARRAY_LENGTH(CICPColorTransfer);
+	cicp_parse_int(val, &ival);
+	for (i=0; i<count; i++) {
+		if (!stricmp(val, CICPColorTransfer[i].name) || (CICPColorTransfer[i].code==ival)) {
+			return CICPColorTransfer[i].code;
+		}
+	}
+	if (strcmp(val, "-1")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unknow CICP color transfer type %s\n", val));
+	}
+	return (u32) -1;
+}
+
+GF_EXPORT
+const char *gf_cicp_color_transfer_name(u32 cicp_mx)
+{
+	u32 i, count = GF_ARRAY_LENGTH(CICPColorTransfer);
+	for (i=0; i<count; i++) {
+		if (CICPColorTransfer[i].code==cicp_mx) {
+			return CICPColorTransfer[i].name;
+		}
+	}
+	return "unknwon";
+}
+
+static char szCICPTFCAllNames[1024];
+
+GF_EXPORT
+const char *gf_cicp_color_transfer_all_names()
+{
+	if (szCICPTFCAllNames[0] == 0) {
+		u32 i, count = GF_ARRAY_LENGTH(CICPColorTransfer);
+		for (i=0; i<count; i++) {
+			if (i) strcat(szCICPTFCAllNames, ",");
+			strcat(szCICPTFCAllNames, CICPColorTransfer[i].name);
+		}
+	}
+	return szCICPTFCAllNames;
+}
+
+struct cicp_mx
+{
+	u32 code;
+	const char *name;
+} CICPColorMatrixCoefficients[] = {
+	{GF_CICP_MX_IDENTITY, "GBR"},
+	{GF_CICP_MX_BT709, "BT709"},
+	{GF_CICP_MX_UNSPECIFIED, "undef"},
+	{GF_CICP_MX_FCC47, "FCC"},
+	{GF_CICP_MX_BT601_625, "BT601"},
+	{GF_CICP_MX_SMPTE170, "SMPTE170"},
+	{GF_CICP_MX_SMPTE240, "SMPTE240"},
+	{GF_CICP_MX_YCgCo, "YCgCo"},
+	{GF_CICP_MX_BT2020, "BT2020"},
+	{GF_CICP_MX_BT2020_CL, "BT2020cl"},
+	{GF_CICP_MX_YDzDx, "YDzDx"},
+};
+
+GF_EXPORT
+u32 gf_cicp_parse_color_matrix(const char *val)
+{
+	u32 i, ival, count = GF_ARRAY_LENGTH(CICPColorMatrixCoefficients);
+	cicp_parse_int(val, &ival);
+	for (i=0; i<count; i++) {
+		if (!stricmp(val, CICPColorMatrixCoefficients[i].name) || (ival==CICPColorMatrixCoefficients[i].code)) {
+			return CICPColorMatrixCoefficients[i].code;
+		}
+	}
+	if (strcmp(val, "-1")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unknow CICP color matrix type %s\n", val));
+	}
+	return (u32) -1;
+}
+
+GF_EXPORT
+const char *gf_cicp_color_matrix_name(u32 cicp_mx)
+{
+	u32 i, count = GF_ARRAY_LENGTH(CICPColorMatrixCoefficients);
+	for (i=0; i<count; i++) {
+		if (CICPColorMatrixCoefficients[i].code==cicp_mx) {
+			return CICPColorMatrixCoefficients[i].name;
+		}
+	}
+	return "unknwon";
+}
+
+static char szCICPMXAllNames[1024];
+GF_EXPORT
+const char *gf_cicp_color_matrix_all_names()
+{
+	if (szCICPMXAllNames[0] == 0) {
+		u32 i, count = GF_ARRAY_LENGTH(CICPColorMatrixCoefficients);
+		for (i=0; i<count; i++) {
+			if (i) strcat(szCICPMXAllNames, ",");
+			strcat(szCICPMXAllNames, CICPColorMatrixCoefficients[i].name);
+		}
+	}
+	return szCICPMXAllNames;
+}
+
+
+GF_EXPORT
+u64 gf_timestamp_rescale(u64 value, u64 timescale, u64 new_timescale)
+{
+	if (!timescale || !new_timescale)
+		return 0;
+	//no timestamp
+	if (value==0xFFFFFFFFFFFFFFFFUL)
+		return value;
+
+	if (new_timescale == timescale)
+		return value;
+		
+	if (! (new_timescale % timescale)) {
+		u32 div = (u32) (new_timescale / timescale);
+		return value * div;
+	}
+	if (! (timescale % new_timescale)) {
+		u32 div = (u32) (timescale / new_timescale);
+		return value / div;
+	}
+
+	if (value <= GF_INT_MAX) {
+		return (value * new_timescale) / timescale;
+	}
+
+	u64 int_part = value / timescale;
+	u64 frac_part = (value % timescale * new_timescale) / timescale;
+	if (int_part >= GF_INT_MAX) {
+		Double res = (Double) value;
+		res *= new_timescale;
+		res /= timescale;
+		return (u64) res;
+	}
+	return int_part * new_timescale + frac_part;
+}
+
+GF_EXPORT
+s64 gf_timestamp_rescale_signed(s64 value, u64 timescale, u64 new_timescale)
+{
+	if (!timescale || !new_timescale)
+		return 0;
+
+	if (! (new_timescale % timescale)) {
+		s32 div = (s32) (new_timescale / timescale);
+		return value * div;
+	}
+	if (! (timescale % new_timescale)) {
+		s32 div = (s32) (timescale / new_timescale);
+		return value / div;
+	}
+
+	if (value <= GF_INT_MAX) {
+		return (value * (s32) new_timescale) / (s32) timescale;
+	}
+
+	s64 int_part = value / timescale;
+	s64 frac_part = ((value % timescale) * new_timescale) / timescale;
+	if ((int_part >= GF_INT_MAX) || (int_part <= GF_INT_MIN)) {
+		Double res = (Double) value;
+		res *= new_timescale;
+		res /= timescale;
+		return (s64) res;
+	}
+	return int_part * (s32) new_timescale + frac_part;
+}
+
+#define TIMESTAMP_COMPARE(_op) \
+	if (timescale1==timescale2) { \
+		return (value1 _op value2); \
+	} \
+	\
+	if ((value1 <= GF_INT_MAX) && (value2 <= GF_INT_MAX)) { \
+		return (value1 * timescale2 _op value2 * timescale1); \
+	} \
+	\
+	if ((value1==0xFFFFFFFFFFFFFFFFUL) || (value2==0xFFFFFFFFFFFFFFFFUL)) \
+		return GF_FALSE; \
+	\
+	if (!timescale1 || !timescale2) return GF_FALSE; \
+	\
+	u64 v1_rescale = gf_timestamp_rescale(value1, timescale1, timescale2); \
+	return (v1_rescale _op value2); \
+
+
+GF_EXPORT
+Bool gf_timestamp_less(u64 value1, u64 timescale1, u64 value2, u64 timescale2)
+{
+	TIMESTAMP_COMPARE(<)
+}
+
+GF_EXPORT
+Bool gf_timestamp_less_or_equal(u64 value1, u64 timescale1, u64 value2, u64 timescale2)
+{
+	TIMESTAMP_COMPARE(<=)
+}
+
+GF_EXPORT
+Bool gf_timestamp_greater(u64 value1, u64 timescale1, u64 value2, u64 timescale2)
+{
+	TIMESTAMP_COMPARE(>)
+}
+
+GF_EXPORT
+Bool gf_timestamp_greater_or_equal(u64 value1, u64 timescale1, u64 value2, u64 timescale2)
+{
+	TIMESTAMP_COMPARE(>=)
+}
+
+GF_EXPORT
+Bool gf_timestamp_equal(u64 value1, u64 timescale1, u64 value2, u64 timescale2)
+{
+	TIMESTAMP_COMPARE(==)
+}

gpac-1.0.1.tar.gz/src/utils/dlmalloc.c -> gpac-2.0.0.tar.gz/src/utils/dlmalloc.c Changed

@@ -2241,7 +2241,7 @@
 work in the same way as fd/bk pointers of small chunks.
 
 Each tree contains a power of 2 sized range of chunk sizes (the
- smallest is 0x100 <= x < 0x180), which is is divided in half at each
+ smallest is 0x100 <= x < 0x180), which is divided in half at each
 tree level, with the chunks in the smaller half of the range (0x100
 <= x < 0x140 for the top nose) in the left subtree and the larger
 half (0x140 <= x < 0x180) in the right subtree. This is, of course,
@@ -4738,7 +4738,7 @@
 
 void dlfree(void* mem) {
 	/*
-	 Consolidate freed chunks with preceeding or succeeding bordering
+	 Consolidate freed chunks with preceding or succeeding bordering
 	 free chunks, if they exist, and then place in a bin. Intermixed
 	 with special cases for top, dv, mmapped chunks, and usage errors.
 	*/
@@ -5645,7 +5645,7 @@
 * Use ordered bins instead of best-fit threshhold
 * Eliminate block-local decls to simplify tracing and debugging.
 * Support another case of realloc via move into top
- * Fix error occuring when initial sbrk_base not word-aligned.
+ * Fix error occurring when initial sbrk_base not word-aligned.
 * Rely on page size for units instead of SBRK_UNIT to
 avoid surprises about sbrk alignment conventions.
 * Add mallinfo, mallopt. Thanks to Raymond Nijssen

gpac-1.0.1.tar.gz/src/utils/downloader.c -> gpac-2.0.0.tar.gz/src/utils/downloader.c Changed

@@ -2,7 +2,7 @@
 *					GPAC Multimedia Framework
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2020
+ *			Copyright (c) Telecom ParisTech 2005-2022
 *					All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -41,9 +41,29 @@
 #include <openssl/x509v3.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
+#endif
+
+#ifdef GPAC_HAS_HTTP2
+#if defined(_MSC_VER)
+typedef SSIZE_T ssize_t;
+#define NGHTTP2_STATICLIB
+#else
+#if defined(WIN32) && defined(GPAC_STATIC_BUILD)
+#define NGHTTP2_STATICLIB
+#endif
+#endif
+#include <nghttp2/nghttp2.h>
 
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#pragma comment(lib, "nghttp2")
+# endif
 #endif
 
+#endif
+
+
+
 #ifdef __USE_POSIX
 #include <unistd.h>
 #endif
@@ -60,7 +80,35 @@
 #define GF_DOWNLOAD_BUFFER_SIZE		131072
 
 
+#ifdef GPAC_HAS_HTTP2
+#define HTTP2_BUFFER_SETTINGS_SIZE 128
+
+
+typedef struct
+{
+	u8 * data;
+	u32 size, alloc, offset;
+} h2_reagg_buffer;
+
+typedef struct
+{
+	Bool do_shutdown;
+	GF_List *sessions;
+	nghttp2_session *ng_sess;
+
+	GF_DownloadSession *net_sess;
+	GF_Mutex *mx;
+	Bool copy;
+} GF_H2_Session;
+
+
+#endif
+
+static void gf_dm_data_received(GF_DownloadSession *sess, u8 *payload, u32 payload_size, Bool store_in_init, u32 *rewrite_size, u8 *original_payload);
+static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_size, u32 *out_read);
+
 static void gf_dm_connect(GF_DownloadSession *sess);
+GF_Err gf_dm_sess_send(GF_DownloadSession *sess, u8 *data, u32 size);
 
 /*internal flags*/
 enum
@@ -143,8 +191,6 @@
 	u32 flags;
 	u32 total_size, bytes_done, icy_metaint, icy_count, icy_bytes;
 	u64 start_time;
-	u64 chunk_run_time;
-	u64 active_time, in_time, idle_time;
 
 	u32 bytes_per_sec;
 	u64 start_time_utc;
@@ -190,7 +236,7 @@
 	u32 current_chunk_size;
 	u64 current_chunk_start;
 
-	u64 request_start_time;
+	u64 request_start_time, last_fetch_time;
 	/*private extension*/
 	void *ext;
 
@@ -203,8 +249,36 @@
 	Bool server_mode;
 	//0: not PUT/POST, 1: waiting for body to be completed, 2: body done
 	u32 put_state;
+
+	u64 last_cap_rate_time;
+	u64 last_cap_rate_bytes;
+	u32 last_cap_rate_bytes_per_sec;
+
+	u64 last_chunk_start_time;
+	u32 chunk_wnd_dur;
+	u32 chunk_bytes, chunk_header_bytes, cumulated_chunk_header_bytes;
+	//in bytes per seconds
+	Double cumulated_chunk_rate;
+
+	u32 connection_timeout_ms;
+
+#ifdef GPAC_HAS_HTTP2
+	//HTTP/2 session used by this download session. f not NULL, the mutex, socket and ssl context are moved along sessions
+	GF_H2_Session *h2_sess;
+	int32_t h2_stream_id;
+	h2_reagg_buffer h2_buf;
+
+	nghttp2_data_provider data_io;
+	u8 *h2_send_data;
+	u32 h2_send_data_len;
+
+	u8 *h2_upgrade_settings;
+	u32 h2_upgrade_settings_len;
+	u8 h2_headers_seen, h2_ready_to_send, h2_is_eos, h2_data_paused, h2_upgrade_state, h2_data_done, h2_switch_sess;
+#endif
 };
 
+
 struct __gf_download_manager
 {
 	GF_Mutex *cache_mx;
@@ -230,6 +304,9 @@
 
 	GF_FilterSession *filter_session;
 
+#ifdef GPAC_HAS_HTTP2
+	Bool disable_http2;
+#endif
 
 	Bool (*local_cache_url_provider_cbk)(void *udta, char *url, Bool cache_destroy);
 	void *lc_udta;
@@ -255,20 +332,639 @@
 
 #endif
 
+
+/*HTTP2 callbacks*/
+#ifdef GPAC_HAS_HTTP2
+
+#ifdef GPAC_HAS_SSL
+/* NPN TLS extension client callback. We check that server advertised
+ the HTTP/2 protocol the nghttp2 library supports. If not, exit
+ the program. */
+static int h2_select_next_proto_cb(SSL *ssl , unsigned char **out,
+ unsigned char *outlen, const unsigned char *in,
+ unsigned int inlen, void *arg)
+{
+	if (nghttp2_select_next_protocol(out, outlen, in, inlen) <= 0) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] Server did not advertise " NGHTTP2_PROTO_VERSION_ID));
+	}
+	return SSL_TLSEXT_ERR_OK;
+}
+#endif
+
+//detach session from HTTP2 session - the session mutex SHALL be grabbed before calling this
+void h2_detach_session(GF_H2_Session *h2_sess, GF_DownloadSession *sess)
+{
+	if (!h2_sess || !sess) return;
+	assert(sess->h2_sess == h2_sess);
+	assert(sess->mx);
+
+	gf_list_del_item(h2_sess->sessions, sess);
+	if (!gf_list_count(h2_sess->sessions)) {
+		if (sess->sock) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[Downloader] closing socket\n"));
+			gf_sk_del(sess->sock);
+			sess->sock = NULL;
+		}
+#ifdef GPAC_HAS_SSL
+		if (sess->ssl) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[Downloader] shut down SSL context\n"));
+			SSL_shutdown(sess->ssl);
+			SSL_free(sess->ssl);
+			sess->ssl = NULL;
+		}
+#endif
+		//destroy h2 session
+		nghttp2_session_del(h2_sess->ng_sess);
+		gf_list_del(h2_sess->sessions);
+		gf_mx_v(h2_sess->mx);
+		gf_mx_del(sess->mx);
+		gf_free(h2_sess);
+	} else {
+		GF_DownloadSession *asess = gf_list_get(h2_sess->sessions, 0);
+		assert(asess->h2_sess == h2_sess);
+		assert(asess->sock);
+
+		h2_sess->net_sess = asess;
+		sess->sock = NULL;
+#ifdef GPAC_HAS_SSL
+		sess->ssl = NULL;
+#endif
+		gf_mx_v(sess->mx);
+	}
+
+	if (sess->h2_buf.data) {
+		gf_free(sess->h2_buf.data);
+		memset(&sess->h2_buf, 0, sizeof(h2_reagg_buffer));
+	}
+	sess->h2_sess = NULL;
+	sess->mx = NULL;
+}
+
+static GF_Err h2_session_send(GF_DownloadSession *sess)
+{
+	assert(sess->h2_sess);
+	int rv = nghttp2_session_send(sess->h2_sess->ng_sess);
+	if (rv != 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP/2] session_send error : %s\n", nghttp2_strerror(rv)));
+		if (sess->status != GF_NETIO_STATE_ERROR) {
+			sess->status = GF_NETIO_STATE_ERROR;
+			if (rv==NGHTTP2_ERR_NOMEM) sess->last_error = GF_OUT_OF_MEM;
+			else sess->last_error = GF_SERVICE_ERROR;
+		}
+		return sess->last_error;
+	}
+//	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] session_send OK\n"));
+	return GF_OK;
+}
+
+static GF_DownloadSession *h2_get_session(void *user_data, s32 stream_id, Bool can_reassign)
+{
+	u32 i, nb_sess;
+	GF_DownloadSession *first_not_assigned = NULL;
+	GF_H2_Session *h2sess = (GF_H2_Session *)user_data;
+
+	nb_sess = gf_list_count(h2sess->sessions);
+	for (i=0;i<nb_sess; i++) {
+		GF_DownloadSession *s = gf_list_get(h2sess->sessions, i);
+		if (s->h2_stream_id == stream_id)
+			return s;
+
+		if (s->server_mode && !s->h2_stream_id && !first_not_assigned) {
+			first_not_assigned = s;
+		}
+	}
+	if (can_reassign && first_not_assigned) {
+		first_not_assigned->h2_stream_id = stream_id;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] reassigning old server session to new stream %d\n", stream_id));
+		assert(first_not_assigned->data_io.source.ptr);
+		first_not_assigned->total_size = first_not_assigned->bytes_done = 0;
+		first_not_assigned->status = GF_NETIO_CONNECTED;
+		return first_not_assigned;
+	}
+	return NULL;
+}
+
+static int h2_header_callback(nghttp2_session *session,
+								const nghttp2_frame *frame, const uint8_t *name,
+								size_t namelen, const uint8_t *value,
+								size_t valuelen, uint8_t flags ,
+								void *user_data)
+{
+	GF_DownloadSession *sess;
+
+	switch (frame->hd.type) {
+	case NGHTTP2_HEADERS:
+		sess = h2_get_session(user_data, frame->hd.stream_id, GF_FALSE);
+		if (!sess)
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		if (
+			(!sess->server_mode && (frame->headers.cat == NGHTTP2_HCAT_RESPONSE))
+			|| (sess->server_mode && ((frame->headers.cat == NGHTTP2_HCAT_HEADERS) || (frame->headers.cat == NGHTTP2_HCAT_REQUEST)))
+		) {
+			GF_HTTPHeader *hdrp;
+
+			GF_SAFEALLOC(hdrp, GF_HTTPHeader);
+			if (hdrp) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] stream_id %d got header %s: %s\n", sess->h2_stream_id, name, value));
+				hdrp->name = gf_strdup(name);
+				hdrp->value = gf_strdup(value);
+				gf_list_add(sess->headers, hdrp);
+			}
+		break;
+		}
+	}
+	return 0;
+}
+
+static int h2_begin_headers_callback(nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
+{
+	GF_DownloadSession *sess = h2_get_session(user_data, frame->hd.stream_id, GF_TRUE);
+	if (!sess) {
+		GF_H2_Session *h2sess = (GF_H2_Session *)user_data;
+		GF_DownloadSession *par_sess = h2sess->net_sess;
+		assert(par_sess);
+		if (!par_sess->server_mode)
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+
+
+		if (par_sess->user_proc) {
+			GF_NETIO_Parameter param;
+			memset(&param, 0, sizeof(GF_NETIO_Parameter));
+			param.msg_type = GF_NETIO_REQUEST_SESSION;
+			par_sess->in_callback = GF_TRUE;
+			param.sess = par_sess;
+			param.reply = frame->hd.stream_id;
+			par_sess->user_proc(par_sess->usr_cbk, &param);
+			par_sess->in_callback = GF_FALSE;
+
+			if (param.error == GF_OK)
+				sess = h2_get_session(user_data, frame->hd.stream_id, GF_FALSE);
+		}
+
+		if (!sess)
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+	}
+
+	switch (frame->hd.type) {
+	case NGHTTP2_HEADERS:
+		if (sess->server_mode) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] stream_id %d header callback\n", frame->hd.stream_id));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] stream_id %d (%s) header callback\n", frame->hd.stream_id, sess->remote_path));
+		}
+		break;
+	}
+	return 0;
+}
+
+static int h2_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
+{
+	GF_DownloadSession *sess;
+	switch (frame->hd.type) {
+	case NGHTTP2_HEADERS:
+		sess = h2_get_session(user_data, frame->hd.stream_id, GF_FALSE);
+		if (!sess)
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+
+		if (
+			(!sess->server_mode && (frame->headers.cat == NGHTTP2_HCAT_RESPONSE))
+			|| (sess->server_mode && ((frame->headers.cat == NGHTTP2_HCAT_HEADERS) || (frame->headers.cat == NGHTTP2_HCAT_REQUEST)))
+		) {
+			sess->h2_headers_seen = 1;
+			if (sess->server_mode) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] All headers received for stream ID %d\n", sess->h2_stream_id));
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] All headers received for stream ID %d\n", sess->h2_stream_id));
+			}
+		}
+		if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] stream_id %d (%s) data done\n", frame->hd.stream_id, sess->remote_path ? sess->remote_path : sess->orig_url));
+			sess->h2_data_done = 1;
+		}
+		break;
+	case NGHTTP2_DATA:
+		if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
+			sess = h2_get_session(user_data, frame->hd.stream_id, GF_FALSE);
+			//if no session with such ID this means we got all our bytes and considered the session done, do not throw and error
+			if (sess) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] stream_id %d (%s) data done\n", frame->hd.stream_id, sess->remote_path ? sess->remote_path : sess->orig_url));
+				sess->h2_data_done = 1;
+			}
+		}
+		break;
+	case NGHTTP2_RST_STREAM:
+		sess = h2_get_session(user_data, frame->hd.stream_id, GF_FALSE);
+		// cancel from remote peer, signal if not done
+		if (sess && sess->server_mode && !sess->h2_is_eos) {
+			GF_NETIO_Parameter param;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] stream_id %d (%s) canceled\n", frame->hd.stream_id, sess->remote_path ? sess->remote_path : sess->orig_url));
+			memset(&param, 0, sizeof(GF_NETIO_Parameter));
+			param.msg_type = GF_NETIO_CANCEL_STREAM;
+			gf_mx_p(sess->mx);
+			sess->in_callback = GF_TRUE;
+			param.sess = sess;
+			sess->user_proc(sess->usr_cbk, &param);
+			sess->in_callback = GF_FALSE;
+			gf_mx_v(sess->mx);
+		}
+		break;
+	}
+
+	return 0;
+}
+
+static int h2_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags, int32_t stream_id, const uint8_t *data, size_t len, void *user_data)
+{
+	GF_DownloadSession *sess = h2_get_session(user_data, stream_id, GF_FALSE);
+	if (!sess)
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+
+	if (sess->h2_buf.size + len > sess->h2_buf.alloc) {
+		sess->h2_buf.alloc = sess->h2_buf.size + (u32) len;
+		sess->h2_buf.data = gf_realloc(sess->h2_buf.data, sizeof(u8) * sess->h2_buf.alloc);
+		if (!sess->h2_buf.data) return NGHTTP2_ERR_NOMEM;
+	}
+	memcpy(sess->h2_buf.data + sess->h2_buf.size, data, len);
+	sess->h2_buf.size += (u32) len;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] stream_id %d received %d bytes (%d/%d total) - flags %d\n", sess->h2_stream_id, len, sess->bytes_done, sess->total_size, flags));
+	return 0;
+}
+
+static int h2_stream_close_callback(nghttp2_session *session, int32_t stream_id, uint32_t error_code, void *user_data)
+{
+	Bool do_retry = GF_FALSE;
+	GF_DownloadSession *sess = h2_get_session(user_data, stream_id, GF_FALSE);
+	if (!sess)
+		return 0;
+
+	gf_mx_p(sess->mx);
+
+	if (error_code==NGHTTP2_REFUSED_STREAM)
+		do_retry = GF_TRUE;
+	else if (sess->h2_sess->do_shutdown && !sess->server_mode && !sess->bytes_done)
+		do_retry = GF_TRUE;
+
+	if (do_retry) {
+		sess->h2_sess->do_shutdown = GF_TRUE;
+		sess->h2_switch_sess = GF_TRUE;
+		sess->status = GF_NETIO_SETUP;
+		sess->last_error = GF_OK;
+		gf_mx_v(sess->mx);
+		return 0;
+	}
+
+	if (error_code) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP/2] stream_id %d (%s) closed with error_code=%d\n", stream_id, sess->remote_path ? sess->remote_path : sess->orig_url, error_code));
+		sess->status = GF_NETIO_STATE_ERROR;
+		sess->last_error = GF_IP_NETWORK_FAILURE;
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] stream_id %d (%s) closed\n", stream_id, sess->remote_path ? sess->remote_path : sess->orig_url));
+		//keep status in DATA_EXCHANGE as this frame might have been pushed while processing another session
+	}
+	//stream closed
+	sess->h2_stream_id = 0;
+	gf_mx_v(sess->mx);
+	return 0;
+}
+
+static int h2_error_callback(nghttp2_session *session, const char *msg, size_t len, void *user_data)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP/2] error %s\n", msg));
+	return 0;
+}
+
+static ssize_t h2_write_data(GF_DownloadSession *sess, const uint8_t *data, size_t length)
+{
+	GF_Err e;
+#ifdef GPAC_HAS_SSL
+	if (sess->ssl) {
+		assert(length);
+		int res = SSL_write(sess->ssl, data, (int) length);
+		if (res <= 0) {
+			int err = SSL_get_error(sess->ssl, res);
+			if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
+				return NGHTTP2_ERR_WOULDBLOCK;
+			} else {
+				//err = errno;
+				return NGHTTP2_ERR_SESSION_CLOSING;
+			}
+		}
+		return res;
+	}
+#endif
+
+	e = gf_sk_send(sess->sock, data, (u32) length);
+	switch (e) {
+	case GF_OK:
+		return length;
+	case GF_IP_SOCK_WOULD_BLOCK:
+		return NGHTTP2_ERR_WOULDBLOCK;
+	case GF_IP_CONNECTION_CLOSED:
+		return NGHTTP2_ERR_EOF;
+	default:
+		break;
+	}
+	return NGHTTP2_ERR_CALLBACK_FAILURE;
+}
+
+static ssize_t h2_send_callback(nghttp2_session *session, const uint8_t *data, size_t length, int flags, void *user_data)
+{
+	GF_H2_Session *h2sess = (GF_H2_Session *)user_data;
+	GF_DownloadSession *sess = h2sess->net_sess;
+
+	return h2_write_data(sess, data, length);
+}
+
+static int h2_before_frame_send_callback(nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
+{
+	GF_DownloadSession *sess = h2_get_session(user_data, frame->hd.stream_id, GF_FALSE);
+	if (!sess)
+		return 0;
+	sess->h2_ready_to_send = 1;
+	return 0;
+}
+
+
+static ssize_t h2_data_source_read_callback(nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t length, uint32_t *data_flags, nghttp2_data_source *source, void *user_data)
+{
+	GF_DownloadSession *sess = (GF_DownloadSession *) source->ptr;
+
+	if (!sess->h2_send_data_len) {
+		sess->h2_send_data = NULL;
+		if (sess->h2_is_eos) {
+			*data_flags = NGHTTP2_DATA_FLAG_EOF;
+			return 0;
+		}
+		sess->h2_data_paused = 1;
+		return NGHTTP2_ERR_DEFERRED;
+	}
+
+	if (sess->h2_sess->copy) {
+		u32 copy = (sess->h2_send_data_len > length) ? (u32) length : sess->h2_send_data_len;
+		memcpy(buf, sess->h2_send_data, copy);
+		sess->h2_send_data += copy;
+		sess->h2_send_data_len -= copy;
+		return copy;
+	}
+
+	*data_flags = NGHTTP2_DATA_FLAG_NO_COPY;
+	if (sess->h2_send_data_len > length)
+		return length;
+	return sess->h2_send_data_len;
+}
+
+static void h2_flush_send(GF_DownloadSession *sess)
+{
+	char h2_flush[1024];
+	u32 res;
+
+	while (sess->h2_send_data) {
+		GF_Err e;
+		h2_session_send(sess);
+		//read any frame pending from remote peer (window update and co)
+		e = gf_dm_read_data(sess, h2_flush, 1023, &res);
+		if ((e<0) && (e != GF_IP_NETWORK_EMPTY) && (e != GF_IP_SOCK_WOULD_BLOCK)) {
+			sess->status = GF_NETIO_STATE_ERROR;
+			sess->last_error = e;
+			break;
+		}
+
+		//error or regular eos
+		if (!sess->h2_stream_id)
+			break;
+		if (sess->status==GF_NETIO_STATE_ERROR)
+			break;
+	}
+}
+
+static char padding[256];
+
+static int h2_send_data_callback(nghttp2_session *session, nghttp2_frame *frame, const uint8_t *framehd, size_t length, nghttp2_data_source *source, void *user_data)
+{	ssize_t rv;
+	GF_DownloadSession *sess = (GF_DownloadSession *) source->ptr;
+
+	assert(sess->h2_send_data_len);
+	assert(sess->h2_send_data_len >= length);
+
+	rv = h2_write_data(sess, (u8 *) framehd, 9);
+	if (rv<0) goto err;
+
+	if (frame->data.padlen > 0) {
+		u32 padlen = (u32) frame->data.padlen - 1;
+		rv = h2_write_data(sess, padding, padlen);
+		if (rv<0) goto err;
+	}
+	rv = h2_write_data(sess, (u8 *) sess->h2_send_data, length);
+	if (rv<0) goto err;
+
+	sess->h2_send_data += (u32) length;
+	sess->h2_send_data_len -= (u32) length;
+	return 0;
+err:
+
+	sess->status = GF_NETIO_STATE_ERROR;
+	sess->last_error = GF_IP_NETWORK_FAILURE;
+	return NGHTTP2_ERR_CALLBACK_FAILURE;
+}
+
+static void h2_initialize_session(GF_DownloadSession *sess)
+{
+	int rv;
+	nghttp2_settings_entry iv[2] = {
+		{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100},
+		{NGHTTP2_SETTINGS_ENABLE_PUSH, 0}
+	};
+	char szMXName[100];
+	nghttp2_session_callbacks *callbacks;
+
+	nghttp2_session_callbacks_new(&callbacks);
+	nghttp2_session_callbacks_set_send_callback(callbacks, h2_send_callback);
+	nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks, h2_frame_recv_callback);
+	nghttp2_session_callbacks_set_before_frame_send_callback(callbacks, h2_before_frame_send_callback);
+
+	nghttp2_session_callbacks_set_on_data_chunk_recv_callback(callbacks, h2_data_chunk_recv_callback);
+	nghttp2_session_callbacks_set_on_stream_close_callback(callbacks, h2_stream_close_callback);
+	nghttp2_session_callbacks_set_on_header_callback(callbacks, h2_header_callback);
+	nghttp2_session_callbacks_set_on_begin_headers_callback(callbacks, h2_begin_headers_callback);
+	nghttp2_session_callbacks_set_error_callback(callbacks, h2_error_callback);
+
+	GF_SAFEALLOC(sess->h2_sess, GF_H2_Session)
+	sess->h2_sess->sessions = gf_list_new();
+	sess->h2_sess->copy = gf_opts_get_bool("core", "h2-copy");
+	if (!sess->h2_sess->copy)
+		nghttp2_session_callbacks_set_send_data_callback(callbacks, h2_send_data_callback);
+
+	if (sess->server_mode) {
+		nghttp2_session_server_new(&sess->h2_sess->ng_sess, callbacks, sess->h2_sess);
+	} else {
+		nghttp2_session_client_new(&sess->h2_sess->ng_sess, callbacks, sess->h2_sess);
+	}
+	nghttp2_session_callbacks_del(callbacks);
+	sess->h2_sess->net_sess = sess;
+	gf_list_add(sess->h2_sess->sessions, sess);
+
+	sprintf(szMXName, "http2_%p", sess->h2_sess);
+	sess->h2_sess->mx = gf_mx_new(szMXName);
+	sess->mx = sess->h2_sess->mx;
+	sess->chunked = GF_FALSE;
+
+	sess->data_io.read_callback = h2_data_source_read_callback;
+	sess->data_io.source.ptr = sess;
+
+	if (sess->server_mode) {
+		sess->h2_stream_id = 1;
+		if (sess->h2_upgrade_settings) {
+			rv = nghttp2_session_upgrade2(sess->h2_sess->ng_sess, sess->h2_upgrade_settings, sess->h2_upgrade_settings_len, 0, sess);
+			gf_free(sess->h2_upgrade_settings);
+			sess->h2_upgrade_settings = NULL;
+
+			if (rv) {
+				sess->status = GF_NETIO_STATE_ERROR;
+				sess->last_error = (rv==NGHTTP2_ERR_NOMEM) ? GF_OUT_OF_MEM : GF_REMOTE_SERVICE_ERROR;
+				return;
+			}
+		}
+	}
+
+	/* client 24 bytes magic string will be sent by nghttp2 library */
+	rv = nghttp2_submit_settings(sess->h2_sess->ng_sess, NGHTTP2_FLAG_NONE, iv, GF_ARRAY_LENGTH(iv));
+	if (rv != 0) {
+		sess->status = GF_NETIO_STATE_ERROR;
+		sess->last_error = (rv==NGHTTP2_ERR_NOMEM) ? GF_OUT_OF_MEM : GF_SERVICE_ERROR;
+		return;
+	}
+	h2_session_send(sess);
+}
+
+
+#define NV_HDR(_hdr, _name, _value) { \
+		_hdr.name = (uint8_t *)_name;\
+		_hdr.value = (uint8_t *)_value;\
+		_hdr.namelen = (u32) strlen(_name);\
+		_hdr.valuelen = (u32) strlen(_value);\
+		_hdr.flags = NGHTTP2_NV_FLAG_NONE;\
+	}
+
+static GF_Err h2_submit_request(GF_DownloadSession *sess, char *req_name, const char *url, const char *param_string, Bool has_body)
+{
+	u32 nb_hdrs, i;
+	char *hostport = NULL;
+	char *path = NULL;
+	char port[20];
+	nghttp2_nv *hdrs;
+
+	nb_hdrs = gf_list_count(sess->headers);
+	hdrs = gf_malloc(sizeof(nghttp2_nv) * (nb_hdrs + 4));
+
+	NV_HDR(hdrs[0], ":method", req_name);
+	NV_HDR(hdrs[1], ":scheme", "https");
+
+	gf_dynstrcat(&hostport, sess->server_name, NULL);
+	sprintf(port, ":%d", sess->port);
+	gf_dynstrcat(&hostport, port, NULL);
+	NV_HDR(hdrs[2], ":authority", hostport);
+
+	if (param_string) {
+		gf_dynstrcat(&path, url, NULL);
+		if (strchr(sess->remote_path, '?')) {
+			gf_dynstrcat(&path, param_string, "&");
+		} else {
+			gf_dynstrcat(&path, param_string, "?");
+		}
+		NV_HDR(hdrs[3], ":path", path);
+	} else {
+		NV_HDR(hdrs[3], ":path", url);
+	}
+
+	for (i=0; i<nb_hdrs; i++) {
+		GF_HTTPHeader *hdr = gf_list_get(sess->headers, i);
+		NV_HDR(hdrs[4+i], hdr->name, hdr->value);
+	}
+	if (has_body) {
+		assert(sess->data_io.read_callback);
+		assert(sess->data_io.source.ptr != NULL);
+	}
+
+	sess->h2_data_done = 0;
+	sess->h2_headers_seen = 0;
+	sess->h2_stream_id = nghttp2_submit_request(sess->h2_sess->ng_sess, NULL, hdrs, nb_hdrs+4, has_body ? &sess->data_io : NULL, sess);
+	sess->h2_ready_to_send = 0;
+
+#ifndef GPAC_DISABLE_LOGS
+	if (gf_log_tool_level_on(GF_LOG_HTTP, GF_LOG_DEBUG)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] send request (has_body %d) for new stream_id %d:\n", has_body, sess->h2_stream_id));
+		for (i=0; i<nb_hdrs+4; i++) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("\t%s: %s\n", hdrs[i].name, hdrs[i].value));
+		}
+	}
+#endif
+
+	gf_free(hdrs);
+	gf_free(hostport);
+	if (path) gf_free(path);
+
+	if (sess->h2_stream_id < 0) {
+		return GF_IP_NETWORK_FAILURE;
+	}
+
+	return GF_OK;
+}
+
+
+static void h2_flush_data(GF_DownloadSession *sess, Bool store_in_init)
+{
+	gf_dm_data_received(sess, (u8 *) sess->h2_buf.data, sess->h2_buf.size, store_in_init, NULL, NULL);
+	sess->h2_buf.size = 0;
+}
+
+static void h2_flush_data_ex(GF_DownloadSession *sess, u8 *obuffer, u32 size, u32 *nb_bytes)
+{
+	u32 copy, nb_b_pck;
+	u8 *data;
+	*nb_bytes = 0;
+	if (!sess->h2_buf.size)
+		return;
+
+	assert(sess->h2_buf.offset<=sess->h2_buf.size);
+
+	nb_b_pck = sess->h2_buf.size - sess->h2_buf.offset;
+	if (nb_b_pck > size)
+		copy = size;
+	else
+		copy = nb_b_pck;
+
+	data = sess->h2_buf.data + sess->h2_buf.offset;
+	memcpy(obuffer, data, copy);
+	*nb_bytes = copy;
+	gf_dm_data_received(sess, (u8 *) data, copy, GF_FALSE, NULL, NULL);
+
+	if (copy < nb_b_pck) {
+		sess->h2_buf.offset += copy;
+	} else {
+		sess->h2_buf.size = sess->h2_buf.offset = 0;
+	}
+	assert(sess->h2_buf.offset<=sess->h2_buf.size);
+}
+
+
+#endif
+
+static void sess_connection_closed(GF_DownloadSession *sess)
+{
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess) {
+		sess->h2_sess->do_shutdown = GF_TRUE;
+		sess->h2_switch_sess = GF_TRUE;
+	}
+#endif
+}
+
 /*
 * Private methods of cache
 */
 
-/**
- * \brief Write data to cache
- * Writes data to the cache. A call to gf_cache_open_write_cache should have been issued before calling this function.
-\param entry The entry to use
-\param sess The download session
-\param data data to write
-\param size number of elements to write
-\param GF_OK is everything went fine, GF_BAD_PARAM if cache has not been opened, GF_IO_ERR if a failure occurs
- */
-GF_Err gf_cache_write_to_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, const char * data, const u32 size);
+//Writes data to the cache. A call to gf_cache_open_write_cache should have been issued before calling this function.
+GF_Err gf_cache_write_to_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, const char * data, const u32 size, GF_Mutex *mx);
 
 /**
 * \brief Close the write file pointer of cache
@@ -415,6 +1111,137 @@
 	return GF_FALSE;
 }
 
+#ifndef GPAC_DISABLE_LOG
+static const char *tls_rt_get_name(int type)
+{
+	switch(type) {
+#ifdef SSL3_RT_HEADER
+	case SSL3_RT_HEADER: return "TLS header";
+#endif
+	case SSL3_RT_CHANGE_CIPHER_SPEC: return "TLS change cipher";
+	case SSL3_RT_ALERT: return "TLS alert";
+	case SSL3_RT_HANDSHAKE: return "TLS handshake";
+	case SSL3_RT_APPLICATION_DATA: return "TLS app data";
+	default: return "TLS Unknown";
+	}
+}
+
+static const char *ssl_msg_get_name(int version, int msg)
+{
+#ifdef SSL_CTRL_SET_MSG_CALLBACK
+
+#ifdef SSL2_VERSION_MAJOR
+	if (version == SSL2_VERSION_MAJOR) {
+		switch(msg) {
+		case SSL2_MT_ERROR: return "Error";
+		case SSL2_MT_CLIENT_HELLO: return "Client hello";
+		case SSL2_MT_CLIENT_MASTER_KEY: return "Client key";
+		case SSL2_MT_CLIENT_FINISHED: return "Client finished";
+		case SSL2_MT_SERVER_HELLO: return "Server hello";
+		case SSL2_MT_SERVER_VERIFY: return "Server verify";
+		case SSL2_MT_SERVER_FINISHED: return "Server finished";
+		case SSL2_MT_REQUEST_CERTIFICATE: return "Request CERT";
+		case SSL2_MT_CLIENT_CERTIFICATE: return "Client CERT";
+		}
+	} else
+#endif
+	if (version == SSL3_VERSION_MAJOR) {
+		switch(msg) {
+		case SSL3_MT_HELLO_REQUEST: return "Hello request";
+		case SSL3_MT_CLIENT_HELLO: return "Client hello";
+		case SSL3_MT_SERVER_HELLO: return "Server hello";
+	#ifdef SSL3_MT_NEWSESSION_TICKET
+		case SSL3_MT_NEWSESSION_TICKET: return "Newsession Ticket";
+	#endif
+		case SSL3_MT_CERTIFICATE: return "Certificate";
+		case SSL3_MT_SERVER_KEY_EXCHANGE: return "Server key exchange";
+		case SSL3_MT_CLIENT_KEY_EXCHANGE: return "Client key exchange";
+		case SSL3_MT_CERTIFICATE_REQUEST: return "Request CERT";
+		case SSL3_MT_SERVER_DONE: return "Server finished";
+		case SSL3_MT_CERTIFICATE_VERIFY: return "CERT verify";
+		case SSL3_MT_FINISHED: return "Finished";
+#ifdef SSL3_MT_CERTIFICATE_STATUS
+		case SSL3_MT_CERTIFICATE_STATUS: return "Certificate Status";
+#endif
+#ifdef SSL3_MT_ENCRYPTED_EXTENSIONS
+		case SSL3_MT_ENCRYPTED_EXTENSIONS: return "Encrypted Extensions";
+#endif
+#ifdef SSL3_MT_SUPPLEMENTAL_DATA
+		case SSL3_MT_SUPPLEMENTAL_DATA: return "Supplemental data";
+#endif
+#ifdef SSL3_MT_END_OF_EARLY_DATA
+		case SSL3_MT_END_OF_EARLY_DATA: return "End of early data";
+#endif
+#ifdef SSL3_MT_KEY_UPDATE
+		case SSL3_MT_KEY_UPDATE: return "Key update";
+#endif
+#ifdef SSL3_MT_NEXT_PROTO
+		case SSL3_MT_NEXT_PROTO: return "Next protocol";
+#endif
+#ifdef SSL3_MT_MESSAGE_HASH
+		case SSL3_MT_MESSAGE_HASH: return "Message hash";
+#endif
+		}
+	}
+#endif
+	return "Unknown";
+}
+
+static void ssl_on_log(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *udat)
+{
+	const char *msg_name, *tls_rt_name;
+	int msg_type;
+	char szUnknown[32];
+	const char *szVersion = NULL;
+
+	if (!version) return;
+#ifdef SSL3_RT_INNER_CONTENT_TYPE
+	if (content_type == SSL3_RT_INNER_CONTENT_TYPE) return;
+#endif
+
+	switch (version) {
+#ifdef SSL2_VERSION
+	case SSL2_VERSION: szVersion = "SSLv2"; break;
+#endif
+#ifdef SSL3_VERSION
+	case SSL3_VERSION: szVersion = "SSLv3"; break;
+#endif
+	case TLS1_VERSION: szVersion = "TLSv1.0"; break;
+#ifdef TLS1_1_VERSION
+	case TLS1_1_VERSION: szVersion = "TLSv1.1"; break;
+#endif
+#ifdef TLS1_2_VERSION
+	case TLS1_2_VERSION: szVersion = "TLSv1.2"; break;
+#endif
+#ifdef TLS1_3_VERSION
+	case TLS1_3_VERSION: szVersion = "TLSv1.3"; break;
+#endif
+	case 0: break;
+	default:
+		snprintf(szUnknown, 31, "(%x)", version);
+		szVersion = szUnknown;
+		break;
+	}
+	version >>= 8;
+	if ((version == SSL3_VERSION_MAJOR) && content_type)
+		tls_rt_name = tls_rt_get_name(content_type);
+	else
+		tls_rt_name = "";
+
+	if (content_type == SSL3_RT_CHANGE_CIPHER_SPEC) {
+		msg_type = *(char *)buf;
+		msg_name = "Change cipher spec";
+	} else if (content_type == SSL3_RT_ALERT) {
+		msg_type = (((char *)buf)[0] << 8) + ((char *)buf)[1];
+		msg_name = SSL_alert_desc_string_long(msg_type);
+	} else {
+		msg_type = *(char *)buf;
+		msg_name = ssl_msg_get_name(version, msg_type);
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[%s] %s %s (%d)\n", szVersion, tls_rt_name, msg_name, msg_type));
+}
+#endif //GPAC_DISABLE_LOG
+
 static int ssl_init(GF_DownloadManager *dm, u32 mode)
 {
 #if OPENSSL_VERSION_NUMBER > 0x00909000
@@ -462,6 +1289,9 @@
 
 	dm->ssl_ctx = SSL_CTX_new(meth);
 	if (!dm->ssl_ctx) goto error;
+	SSL_CTX_set_options(dm->ssl_ctx, SSL_OP_ALL);
+//	SSL_CTX_set_max_proto_version(dm->ssl_ctx, 0);
+
 	SSL_CTX_set_default_verify_paths(dm->ssl_ctx);
 	SSL_CTX_load_verify_locations (dm->ssl_ctx, NULL, NULL);
 	/* SSL_VERIFY_NONE instructs OpenSSL not to abort SSL_connect if the
@@ -470,6 +1300,22 @@
 	 than examining the error stack after a failed SSL_connect. */
 	SSL_CTX_set_verify(dm->ssl_ctx, SSL_VERIFY_NONE, NULL);
 
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_NETWORK, GF_LOG_DEBUG) ) {
+		SSL_CTX_set_msg_callback(dm->ssl_ctx, ssl_on_log);
+	}
+#endif
+
+
+#ifdef GPAC_HAS_HTTP2
+	if (!dm->disable_http2) {
+		SSL_CTX_set_next_proto_select_cb(dm->ssl_ctx, h2_select_next_proto_cb, NULL);
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+		SSL_CTX_set_alpn_protos(dm->ssl_ctx, (const unsigned char *)"\x02h2", 3);
+#endif
+	}
+#endif
+
 	/* Since fd_write unconditionally assumes partial writes (and handles them correctly),
 	allow them in OpenSSL. */
 	SSL_CTX_set_mode(dm->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
@@ -482,6 +1328,33 @@
 	return 0;
 }
 
+#ifdef GPAC_HAS_HTTP2
+
+static unsigned char next_proto_list[256];
+static size_t next_proto_list_len;
+
+#ifndef OPENSSL_NO_NEXTPROTONEG
+static int next_proto_cb(SSL *ssl, const unsigned char **data, unsigned int *len, void *arg)
+{
+	*data = next_proto_list;
+	*len = (unsigned int)next_proto_list_len;
+	return SSL_TLSEXT_ERR_OK;
+}
+#endif //OPENSSL_NO_NEXTPROTONEG
+
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+static int alpn_select_proto_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
+{
+	int rv = nghttp2_select_next_protocol((unsigned char **)out, outlen, in, inlen);
+	if (rv != 1) {
+		return SSL_TLSEXT_ERR_NOACK;
+	}
+	return SSL_TLSEXT_ERR_OK;
+}
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
+
+#endif
+
 
 void *gf_ssl_server_context_new(const char *cert, const char *key)
 {
@@ -507,6 +1380,29 @@
 		SSL_CTX_free(ctx);
 		return NULL;
 	}
+
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_NETWORK, GF_LOG_DEBUG) ) {
+		SSL_CTX_set_msg_callback(ctx, ssl_on_log);
+	}
+#endif
+
+
+#ifdef GPAC_HAS_HTTP2
+	if (!gf_opts_get_bool("core", "no-h2")) {
+		next_proto_list[0] = NGHTTP2_PROTO_VERSION_ID_LEN;
+		memcpy(&next_proto_list[1], NGHTTP2_PROTO_VERSION_ID, NGHTTP2_PROTO_VERSION_ID_LEN);
+		next_proto_list_len = 1 + NGHTTP2_PROTO_VERSION_ID_LEN;
+
+		SSL_CTX_set_next_protos_advertised_cb(ctx, next_proto_cb, NULL);
+
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+		SSL_CTX_set_alpn_select_cb(ctx, alpn_select_proto_cb, NULL);
+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
+	}
+
+#endif
+
 return ctx;
 }
 
@@ -533,13 +1429,9 @@
 	*e = GF_OK;
 	return ssl;
 }
-void gf_ssl_del(void *ssl)
-{
-	SSL_shutdown(ssl);
-	SSL_free(ssl);
-}
 
-GF_Err gf_ssl_write(void *ssl_ctx, const u8 *buffer, u32 size)
+
+static GF_Err gf_ssl_write(void *ssl_ctx, const u8 *buffer, u32 size)
 {
 	u32 idx=0;
 	s32 nb_tls_blocks = size/16000;
@@ -597,8 +1489,6 @@
 		url = gf_cache_get_url(e);
 		assert( url );
 		if (strcmp(url, sess->orig_url)) continue;
-		if (sess->needs_cache_reconfig==2)
-			continue;
 
 		if (! sess->is_range_continuation) {
 			if (sess->range_start != gf_cache_get_start_range(e)) continue;
@@ -614,15 +1504,8 @@
 
 /**
 * Creates a new cache entry
-\param dm The download manager to create this entry
-\param cache_directory The path to the directory containing cache files
-\param url The full URL
-\param start_range the start of the byte range request
-\param end_range the end of the byte range request
-\param mem_storage Boolean indicating if the cache data should be stored in memory
-\param The DownloadedCacheEntry
 */
-DownloadedCacheEntry gf_cache_create_entry( GF_DownloadManager * dm, const char * cache_directory, const char * url, u64 start_range, u64 end_range, Bool mem_storage);
+DownloadedCacheEntry gf_cache_create_entry( GF_DownloadManager * dm, const char * cache_directory, const char * url, u64 start_range, u64 end_range, Bool mem_storage, GF_Mutex *mx);
 
 /*!
 * Removes a session for a DownloadedCacheEntry
@@ -634,7 +1517,7 @@
 
 Bool gf_cache_set_mime(const DownloadedCacheEntry entry, const char *mime);
 Bool gf_cache_set_range(const DownloadedCacheEntry entry, u64 size, u64 start_range, u64 end_range);
-Bool gf_cache_set_content(const DownloadedCacheEntry entry, char *data, u32 size, Bool copy);
+Bool gf_cache_set_content(const DownloadedCacheEntry entry, GF_Blob *blob, Bool copy, GF_Mutex *mx);
 Bool gf_cache_set_headers(const DownloadedCacheEntry entry, const char *headers);
 Bool gf_cache_set_downtime(const DownloadedCacheEntry entry, u32 download_time_ms);
 
@@ -649,7 +1532,7 @@
 		gf_cache_remove_session_from_cache_entry(sess->cache_entry, sess);
 		if (sess->dm
 		 /*JLF - not sure what the rationale of this test is, and it prevents cleanup of cache entry
-		 which then results to crash when restarting the session (entry->writeFilePtr i snot set back to NULL)*/
+		 which then results to crash when restarting the session (entry->writeFilePtr is not set back to NULL)*/
 		 && gf_cache_entry_is_delete_files_when_deleted(sess->cache_entry)
 
 		 && (0 == gf_cache_get_sessions_count_for_cache_entry(sess->cache_entry)))
@@ -679,18 +1562,23 @@
 \param the number of sessions in the cached entry, -1 if one of the parameters is wrong
 */
 s32 gf_cache_add_session_to_cache_entry(DownloadedCacheEntry entry, GF_DownloadSession * sess);
+Bool gf_cache_entry_persistent(const DownloadedCacheEntry entry);
+void gf_cache_entry_set_persistent(const DownloadedCacheEntry entry);
 
 static void gf_dm_sess_notify_state(GF_DownloadSession *sess, GF_NetIOStatus dnload_status, GF_Err error);
 
 static void gf_dm_configure_cache(GF_DownloadSession *sess)
 {
 	DownloadedCacheEntry entry;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[Downloader] gf_dm_configure_cache(%p), cached=%s\n", sess, (sess->flags & GF_NETIO_SESSION_NOT_CACHED) ? "no" : "yes" ));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[Downloader] gf_dm_configure_cache(%p), cached=%s URL=%s\n", sess, (sess->flags & GF_NETIO_SESSION_NOT_CACHED) ? "no" : "yes", sess->orig_url ));
 	gf_dm_remove_cache_entry_from_session(sess);
-	if (sess->flags & GF_NETIO_SESSION_NOT_CACHED) {
+	//session is not cached and we don't cache the first URL
+	if ((sess->flags & GF_NETIO_SESSION_NOT_CACHED) && !(sess->flags & GF_NETIO_SESSION_KEEP_FIRST_CACHE)) {
 		sess->reused_cache_entry = GF_FALSE;
 		if (sess->cache_entry)
 			gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
+
+		sess->cache_entry = NULL;
 	} else {
 		Bool found = GF_FALSE;
 		u32 i, count;
@@ -703,11 +1591,19 @@
 			}
 			/* We found the existing session */
 			if (sess->cache_entry) {
+				Bool delete_cache = GF_TRUE;
+
+				if (sess->flags & GF_NETIO_SESSION_KEEP_CACHE) {
+					delete_cache = GF_FALSE;
+				}
+				if (gf_cache_entry_persistent(sess->cache_entry))
+					delete_cache = GF_FALSE;
+
 				/*! indicate we can destroy file upon destruction, except if disabled at session level*/
-				if (! (sess->flags & GF_NETIO_SESSION_KEEP_CACHE))
+				if (delete_cache)
 					gf_cache_entry_set_delete_files_when_deleted(sess->cache_entry);
 
-				if (0 == gf_cache_get_sessions_count_for_cache_entry(sess->cache_entry)) {
+				if (!gf_cache_entry_persistent(sess->cache_entry) && !gf_cache_get_sessions_count_for_cache_entry(sess->cache_entry)) {
 					gf_mx_p( sess->dm->cache_mx );
 					/* No session attached anymore... we can delete it */
 					gf_list_del_item(sess->dm->cache_entries, sess->cache_entry);
@@ -716,7 +1612,7 @@
 				}
 				sess->cache_entry = NULL;
 			}
-			entry = gf_cache_create_entry(sess->dm, sess->dm->cache_directory, sess->orig_url, sess->range_start, sess->range_end, (sess->flags&GF_NETIO_SESSION_MEMORY_CACHE) ? GF_TRUE : GF_FALSE);
+			entry = gf_cache_create_entry(sess->dm, sess->dm->cache_directory, sess->orig_url, sess->range_start, sess->range_end, (sess->flags&GF_NETIO_SESSION_MEMORY_CACHE) ? GF_TRUE : GF_FALSE, sess->dm->cache_mx);
 			gf_mx_p( sess->dm->cache_mx );
 			gf_list_add(sess->dm->cache_entries, entry);
 			gf_mx_v( sess->dm->cache_mx );
@@ -737,20 +1633,30 @@
 		}
 		if (!found) {
 			sess->reused_cache_entry = GF_FALSE;
-			gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
+			if (sess->cache_entry)
+				gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
 		}
 		gf_cache_add_session_to_cache_entry(sess->cache_entry, sess);
 		if (sess->needs_range)
 			gf_cache_set_range(sess->cache_entry, 0, sess->range_start, sess->range_end);
 		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[CACHE] Cache setup to %p %s\n", sess, gf_cache_get_cache_filename(sess->cache_entry)));
 
+		if (sess->cache_entry) {
+			if (sess->flags & GF_NETIO_SESSION_KEEP_FIRST_CACHE) {
+				sess->flags &= ~GF_NETIO_SESSION_KEEP_FIRST_CACHE;
+				gf_cache_entry_set_persistent(sess->cache_entry);
+			}
+			if ((sess->flags & GF_NETIO_SESSION_MEMORY_CACHE) && (sess->flags & GF_NETIO_SESSION_KEEP_CACHE) ) {
+				gf_cache_entry_set_persistent(sess->cache_entry);
+			}
+		}
 
 		if ( (sess->allow_direct_reuse || sess->dm->allow_offline_cache) && !gf_cache_check_if_cache_file_is_corrupted(sess->cache_entry)
 		) {
 			sess->from_cache_only = GF_TRUE;
 			sess->connect_time = 0;
 			sess->status = GF_NETIO_CONNECTED;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP] using existing cache entry\n"));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] using existing cache entry\n"));
 			gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
 		}
 	}
@@ -768,7 +1674,7 @@
 	gf_dm_url_info_init(&info);
 	e = gf_dm_get_url_info(url, &info, NULL);
 	if (e != GF_OK) {
-		gf_mx_p( dm->cache_mx );
+		gf_mx_v( dm->cache_mx );
 		gf_dm_url_info_del(&info);
 		return;
 	}
@@ -799,11 +1705,12 @@
 	/* If we are heren it means we did not found this URL in cache */
 	gf_mx_v( dm->cache_mx );
 	gf_free(realURL);
-	GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[CACHE] Cannot find URL %s, cache file won't be deleted.\n", url));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[CACHE] Cannot find URL %s, cache file won't be deleted.\n", url));
 }
 
 GF_EXPORT
-void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess, const char * url) {
+void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess, const char * url)
+{
 	if (sess && sess->dm && url) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[CACHE] Requesting deletion for %s\n", url));
 		gf_dm_delete_cached_file_entry(sess->dm, url);
@@ -812,8 +1719,164 @@
 	}
 }
 
+void gf_dm_sess_set_header(GF_DownloadSession *sess, const char *name, const char *value)
+{
+	GF_HTTPHeader *hdr;
+	if (!sess) return;
 
-static void gf_dm_clear_headers(GF_DownloadSession *sess)
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess || sess->h2_upgrade_settings) {
+		if (!stricmp(name, "Transfer-Encoding"))
+			return;
+		if (!stricmp(name, "Connection")) return;
+		if (!stricmp(name, "Keep-Alive")) return;
+	}
+#endif
+
+	GF_SAFEALLOC(hdr, GF_HTTPHeader)
+	if (hdr) {
+		hdr->name = gf_strdup(name);
+		hdr->value = gf_strdup(value);
+		gf_list_add(sess->headers, hdr);
+	}
+}
+
+GF_Err gf_dm_sess_send_reply(GF_DownloadSession *sess, u32 reply_code, const char *response_body, Bool no_body)
+{
+	u32 i, count;
+	GF_Err e;
+	char szFmt[50];
+	char *rsp_buf = NULL;
+	if (!sess || !sess->server_mode) return GF_BAD_PARAM;
+
+	count = gf_list_count(sess->headers);
+
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_upgrade_settings) {
+		u32 len;
+		assert(!sess->h2_sess);
+		gf_dynstrcat(&rsp_buf, "HTTP/1.1 101 Switching Protocols\r\n"
+								"Connection: Upgrade\r\n"
+								"Upgrade: h2c\r\n\r\n", NULL);
+
+
+		len = (u32) strlen(rsp_buf);
+		e = gf_sk_send(sess->sock, rsp_buf, len);
+		gf_free(rsp_buf);
+		rsp_buf = NULL;
+
+		h2_initialize_session(sess);
+	}
+
+	if (sess->h2_sess) {
+		nghttp2_nv *hdrs;
+
+		if (response_body) {
+			no_body = GF_FALSE;
+			sess->h2_send_data = (u8 *) response_body;
+			sess->h2_send_data_len = (u32) strlen(response_body);
+			sess->h2_is_eos = 1;
+		} else if (!no_body) {
+			switch (reply_code) {
+			case 200:
+			case 206:
+				no_body = GF_FALSE;
+				sess->h2_is_eos = 0;
+				break;
+			default:
+				no_body = GF_TRUE;
+				break;
+			}
+		}
+
+		hdrs = gf_malloc(sizeof(nghttp2_nv) * (count + 1) );
+
+		sprintf(szFmt, "%d", reply_code);
+		NV_HDR(hdrs[0], ":status", szFmt);
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP/2] send reply for stream_id %d (body %d) headers:\n:status: %s\n", sess->h2_stream_id, !no_body, szFmt));
+		for (i=0; i<count; i++) {
+			GF_HTTPHeader *hdr = gf_list_get(sess->headers, i);
+			NV_HDR(hdrs[i+1], hdr->name, hdr->value)
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("%s: %s\n", hdr->name, hdr->value));
+		}
+
+
+		gf_mx_p(sess->mx);
+
+		int rv = nghttp2_submit_response(sess->h2_sess->ng_sess, sess->h2_stream_id, hdrs, count+1, no_body ? NULL : &sess->data_io);
+
+		gf_free(hdrs);
+
+		if (rv != 0) {
+			gf_mx_v(sess->mx);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP/2] Failed to submit reply: %s\n", nghttp2_strerror(rv)));
+			return GF_SERVICE_ERROR;
+		}
+		h2_session_send(sess);
+		//in case we have a body already setup with this reply
+		h2_flush_send(sess);
+
+		gf_mx_v(sess->mx);
+
+		//h2_stream_id may still be 0 at this point (typically reply to PUT/POST)
+		return GF_OK;
+	}
+#endif
+
+
+
+	sprintf(szFmt, "HTTP/1.1 %d ", reply_code);
+	gf_dynstrcat(&rsp_buf, szFmt, NULL);
+	switch (reply_code) {
+	case 400: gf_dynstrcat(&rsp_buf, "Bad Request", NULL); break;
+	case 403: gf_dynstrcat(&rsp_buf, "Forbidden", NULL); break;
+	case 405: gf_dynstrcat(&rsp_buf, "Not Allowed", NULL); break;
+	case 416: gf_dynstrcat(&rsp_buf, "Requested Range Not Satisfiable", NULL); break;
+	case 411: gf_dynstrcat(&rsp_buf, "Length Required", NULL); break;
+	case 404: gf_dynstrcat(&rsp_buf, "Not Found", NULL); break;
+	case 501: gf_dynstrcat(&rsp_buf, "Not Implemented", NULL); break;
+	case 500: gf_dynstrcat(&rsp_buf, "Internal Server Error", NULL); break;
+	case 304: gf_dynstrcat(&rsp_buf, "Not Modified", NULL); break;
+	case 204: gf_dynstrcat(&rsp_buf, "No Content", NULL); break;
+	case 206: gf_dynstrcat(&rsp_buf, "Partial Content", NULL); break;
+	case 200: gf_dynstrcat(&rsp_buf, "OK", NULL); break;
+	case 201: gf_dynstrcat(&rsp_buf, "Created", NULL); break;
+	default:
+		gf_dynstrcat(&rsp_buf, "OK", NULL); break;
+	}
+	gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+	if (!rsp_buf) return GF_OUT_OF_MEM;
+
+	for (i=0; i<count; i++) {
+		GF_HTTPHeader *hdr = gf_list_get(sess->headers, i);
+		gf_dynstrcat(&rsp_buf, hdr->name, NULL);
+		gf_dynstrcat(&rsp_buf, ": ", NULL);
+		gf_dynstrcat(&rsp_buf, hdr->value, NULL);
+		gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+	}
+	gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+	if (!rsp_buf) return GF_OUT_OF_MEM;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] send reply for %s:\n%s\n", sess->orig_url, rsp_buf));
+
+	if (response_body) {
+		gf_dynstrcat(&rsp_buf, response_body, NULL);
+		if (!rsp_buf) return GF_OUT_OF_MEM;
+	}
+
+	count = (u32) strlen(rsp_buf);
+#ifdef GPAC_HAS_SSL
+	if (sess->ssl) {
+		e = gf_ssl_write(sess->ssl, rsp_buf, count);
+	} else
+#endif
+		e = gf_sk_send(sess->sock, rsp_buf, count);
+
+	gf_free(rsp_buf);
+	return e;
+}
+
+void gf_dm_sess_clear_headers(GF_DownloadSession *sess)
 {
 	while (gf_list_count(sess->headers)) {
 		GF_HTTPHeader *hdr = (GF_HTTPHeader*)gf_list_last(sess->headers);
@@ -828,16 +1891,22 @@
 	}
 }
 
+typedef enum
+{
+	HTTP_NO_CLOSE=0,
+	HTTP_CLOSE,
+	HTTP_RESET_CONN,
+} HTTPCloseType;
 
-static void gf_dm_disconnect(GF_DownloadSession *sess, Bool force_close)
+static void gf_dm_disconnect(GF_DownloadSession *sess, HTTPCloseType close_type)
 {
 	assert( sess );
-	if (sess->connection_close) force_close = GF_TRUE;
+	if (sess->connection_close) close_type = HTTP_RESET_CONN;
 	sess->connection_close = GF_FALSE;
 	sess->remaining_data_size = 0;
 
 	if (sess->status >= GF_NETIO_DISCONNECTED) {
-		if (force_close && sess->use_cache_file && sess->cache_entry) {
+		if (close_type && sess->use_cache_file && sess->cache_entry) {
 			gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
 		}
 		return;
@@ -847,7 +1916,22 @@
 	gf_mx_p(sess->mx);
 
 	if (!sess->server_mode) {
-		if (force_close || !(sess->flags & GF_NETIO_SESSION_PERSISTENT)) {
+		Bool do_close = (close_type || !(sess->flags & GF_NETIO_SESSION_PERSISTENT)) ? GF_TRUE : GF_FALSE;
+#ifdef GPAC_HAS_HTTP2
+		if (sess->h2_sess) {
+			do_close = (close_type==HTTP_RESET_CONN) ? GF_TRUE : GF_FALSE;
+		}
+#endif
+
+
+		if (do_close) {
+#ifdef GPAC_HAS_HTTP2
+			if (sess->h2_sess) {
+				sess->h2_sess->do_shutdown = GF_TRUE;
+				h2_detach_session(sess->h2_sess, sess);
+			}
+#endif
+
 #ifdef GPAC_HAS_SSL
 			if (sess->ssl) {
 				SSL_shutdown(sess->ssl);
@@ -861,10 +1945,12 @@
 				gf_sk_del(sx);
 			}
 		}
-		if (force_close && sess->use_cache_file) {
+
+		if (close_type && sess->use_cache_file && sess->cache_entry) {
 			gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
 		}
 	}
+
 	sess->status = GF_NETIO_DISCONNECTED;
 	if (sess->num_retry) sess->num_retry--;
 
@@ -877,14 +1963,14 @@
 	if (!sess)
 		return;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[Downloader] %s session (%p) URL %s\n", sess->server_mode ? "Detach" : "Destroy", sess, sess->orig_url));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[Downloader] Destroy session URL %s\n", sess->orig_url));
 	/*self-destruction, let the download manager destroy us*/
 	if ((sess->th || sess->ftask) && sess->in_callback) {
 		sess->destroy = GF_TRUE;
 		return;
 	}
-	gf_dm_disconnect(sess, GF_TRUE);
-	gf_dm_clear_headers(sess);
+	gf_dm_disconnect(sess, HTTP_CLOSE);
+	gf_dm_sess_clear_headers(sess);
 
 	/*if threaded wait for thread exit*/
 	if (sess->th) {
@@ -915,10 +2001,37 @@
 
 	sess->orig_url = sess->server_name = sess->remote_path;
 	sess->creds = NULL;
-	if (sess->sock && !sess->server_mode)
+
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess) {
+		gf_mx_p(sess->mx);
+		h2_detach_session(sess->h2_sess, sess);
+		gf_mx_v(sess->mx);
+	}
+
+	if (sess->h2_upgrade_settings)
+		gf_free(sess->h2_upgrade_settings);
+#endif
+
+
+#ifdef GPAC_HAS_SSL
+	//in server mode SSL context is managed by caller
+	if (sess->ssl) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[Downloader] shut down SSL context\n"));
+		SSL_shutdown(sess->ssl);
+		SSL_free(sess->ssl);
+		sess->ssl = NULL;
+	}
+#endif
+	if (sess->sock) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[Downloader] closing socket\n"));
 		gf_sk_del(sess->sock);
+	}
 	gf_list_del(sess->headers);
+
 	gf_mx_del(sess->mx);
+
+
 	if (sess->ftask) {
 		sess->ftask->sess = NULL;
 		sess->ftask = NULL;
@@ -970,7 +2083,8 @@
 GF_EXPORT
 GF_Err gf_dm_sess_last_error(GF_DownloadSession *sess)
 {
-	if (!sess) return GF_BAD_PARAM;
+	if (!sess)
+		return GF_BAD_PARAM;
 	return sess->last_error;
 }
 
@@ -1146,6 +2260,8 @@
 
 char *gf_cache_get_forced_headers(const DownloadedCacheEntry entry);
 u32 gf_cache_get_downtime(const DownloadedCacheEntry entry);
+Bool gf_cache_is_done(const DownloadedCacheEntry entry);
+Bool gf_cache_is_deleted(const DownloadedCacheEntry entry);
 
 static void gf_dm_sess_reload_cached_headers(GF_DownloadSession *sess)
 {
@@ -1155,7 +2271,7 @@
 
 	hdrs = gf_cache_get_forced_headers(sess->cache_entry);
 
-	gf_dm_clear_headers(sess);
+	gf_dm_sess_clear_headers(sess);
 	while (hdrs) {
 		char *sep2, *sepL = strstr(hdrs, "\r\n");
 		if (sepL) sepL[0] = 0;
@@ -1183,10 +2299,12 @@
 {
 	Bool socket_changed = GF_FALSE;
 	GF_URL_Info info;
+	Bool free_proto = GF_FALSE;
 	char *sep_frag=NULL;
-	if (!url) return GF_BAD_PARAM;
+	if (!url)
+		return GF_BAD_PARAM;
 
-	gf_dm_clear_headers(sess);
+	gf_dm_sess_clear_headers(sess);
 	sess->allow_direct_reuse = allow_direct_reuse;
 	gf_dm_url_info_init(&info);
 
@@ -1195,6 +2313,14 @@
 	else if (sess->status>GF_NETIO_DISCONNECTED)
 		socket_changed = GF_TRUE;
 
+	else if (sess->connection_timeout_ms) {
+		u32 diff = (u32) ( gf_sys_clock_high_res() - sess->last_fetch_time) / 1000;
+		if (diff >= sess->connection_timeout_ms) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] Timeout reached (%d ms since last vs %d ms timeout), reconnecting\n", diff, sess->connection_timeout_ms));
+			socket_changed = GF_TRUE;
+		}
+	}
+
 	assert(sess->status != GF_NETIO_WAIT_FOR_REPLY);
 	assert(sess->status != GF_NETIO_DATA_EXCHANGE);
 
@@ -1219,6 +2345,7 @@
 		sep[3] = 0;
 		info.protocol = gf_strdup(sess->orig_url_before_redirect);
 		sep[3] = c;
+		free_proto = GF_TRUE;
 	}
 
 	if (sess->port != info.port) {
@@ -1260,8 +2387,10 @@
 		sess->server_name = info.server_name ? gf_strdup(info.server_name) : NULL;
 	}
 
-	if (sess->orig_url) gf_free(sess->orig_url);
-	sess->orig_url = gf_strdup(info.canonicalRepresentation);
+	if (info.canonicalRepresentation) {
+		if (sess->orig_url) gf_free(sess->orig_url);
+		sess->orig_url = gf_strdup(info.canonicalRepresentation);
+	}
 
 	if (!sess->orig_url_before_redirect)
 		sess->orig_url_before_redirect = gf_strdup(url);
@@ -1272,24 +2401,43 @@
 	if (sess->status==GF_NETIO_STATE_ERROR)
 		socket_changed = GF_TRUE;
 
-	if (!socket_changed && info.userName && !strcmp(info.userName, sess->creds->username)) {
+	if (!socket_changed && info.userName && !strcmp(info.userName, sess->creds->username)) {
 	} else {
 		sess->creds = NULL;
-		if (info.userName ) {
+		if (info.userName) {
 			if (! sess->dm) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP] Did not found any download manager, credentials not supported\n"));
 			} else
 				sess->creds = gf_user_credentials_register(sess->dm, sess->server_name, info.userName, info.password, info.userName && info.password);
 		}
 	}
+	if (free_proto) gf_free((char *) info.protocol);
 	gf_dm_url_info_del(&info);
 	if (sep_frag) sep_frag[0]='#';
 
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess) {
+		if (sess->h2_sess->do_shutdown)
+			socket_changed = GF_TRUE;
+		sess->h2_buf.size = 0;
+		sess->h2_buf.offset = 0;
+	}
+#endif
+
 	if (sess->sock && !socket_changed) {
 		sess->status = GF_NETIO_CONNECTED;
 		sess->num_retry = SESSION_RETRY_COUNT;
 		sess->needs_cache_reconfig = 1;
 	} else {
+
+#ifdef GPAC_HAS_HTTP2
+		if (sess->h2_sess) {
+			gf_mx_p(sess->mx);
+			h2_detach_session(sess->h2_sess, sess);
+			gf_mx_v(sess->mx);
+		}
+#endif
+
 		if (sess->sock) {
 			gf_sk_del(sess->sock);
 			sess->sock = NULL;
@@ -1302,11 +2450,11 @@
 			sess->ssl = NULL;
 		}
 #endif
-
 	}
 	sess->total_size = 0;
 	sess->bytes_done = 0;
-	assert(sess->remaining_data_size==0);
+	//could be not-0 after a byte-range request using chunk transfer
+	sess->remaining_data_size = 0;
 
 	sess->local_cache_only = GF_FALSE;
 	if (sess->dm && sess->dm->local_cache_url_provider_cbk) {
@@ -1316,10 +2464,22 @@
 			gf_free(sess->orig_url);
 			sess->orig_url = gf_strdup(url);
 			sess->last_error = GF_OK;
+			sess->use_cache_file = GF_TRUE;
 			gf_dm_configure_cache(sess);
-			sess->status = GF_NETIO_DATA_TRANSFERED;
-			sess->total_size = gf_cache_get_content_length(sess->cache_entry);
-			sess->bytes_done = sess->total_size;
+			sess->bytes_done = 0;
+ if (sess->cache_entry && gf_cache_is_deleted(sess->cache_entry)) {
+ sess->status = GF_NETIO_DATA_TRANSFERED;
+ sess->last_error = GF_URL_REMOVED;
+ //return GF_OK;
+ } else if (! gf_cache_is_done(sess->cache_entry)) {
+ sess->total_size = 0;
+ sess->status = GF_NETIO_DATA_EXCHANGE;
+ } else {
+				sess->total_size = gf_cache_get_content_length(sess->cache_entry);
+ sess->bytes_done = sess->total_size;
+ sess->status = GF_NETIO_DATA_TRANSFERED;
+ }
+
 			sess->total_time_since_req = gf_cache_get_downtime(sess->cache_entry);
 			if (sess->total_time_since_req)
 				sess->bytes_per_sec = (u32) ((1000 * (u64) sess->bytes_done) / sess->total_time_since_req);
@@ -1328,7 +2488,9 @@
 			gf_dm_sess_reload_cached_headers(sess);
 		}
 	}
-	return sess->last_error;
+	if (sess->last_error)
+		return sess->last_error;
+	return gf_dm_sess_set_range(sess, 0, 0, GF_TRUE);
 }
 
 
@@ -1354,7 +2516,7 @@
 	if (do_run) return GF_TRUE;
 
 	/*destroy all session but keep connection active*/
-	gf_dm_disconnect(sess, GF_FALSE);
+	gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 	sess->status = GF_NETIO_STATE_ERROR;
 	sess->last_error = GF_OK;
 	return GF_FALSE;
@@ -1409,7 +2571,6 @@
 
 	GF_SAFEALLOC(sess, GF_DownloadSession);
 	if (!sess) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("%s:%d Cannot allocate session for URL %s: OUT OF MEMORY!\n", __FILE__, __LINE__, url));
 		return NULL;
 	}
 	sess->headers = gf_list_new();
@@ -1429,6 +2590,9 @@
 	sess->request_timeout = gf_opts_get_int("core", "req-timeout");
 	if (!sess->request_timeout) sess->request_timeout = 20000;
 
+	sess->chunk_wnd_dur = gf_opts_get_int("core", "cte-rate-wnd") * 1000;
+	if (!sess->chunk_wnd_dur) sess->chunk_wnd_dur = 20000;
+
 	sess->dm = dm;
 	if (server) {
 		sess->sock = server;
@@ -1444,7 +2608,7 @@
 	if (dm)
 		sess->disable_cache = dm->disable_cache;
 
-	if (! (dl_flags&GF_NETIO_SESSION_NOT_THREADED)) {
+	if (! (dl_flags & GF_NETIO_SESSION_NOT_THREADED)) {
 		sess->mx = gf_mx_new(url);
 		if (!sess->mx) {
 			gf_free(sess);
@@ -1454,7 +2618,7 @@
 
 	*e = gf_dm_sess_setup_from_url(sess, url, GF_FALSE);
 	if (*e) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("%s:%d gf_dm_sess_new_simple: error=%s at setup for '%s'\n", __FILE__, __LINE__, gf_error_to_string(*e), url));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[Downloader] failed to create session for %s: %s\n", url, gf_error_to_string(*e)));
 		gf_dm_sess_del(sess);
 		return NULL;
 	}
@@ -1471,13 +2635,93 @@
 void *usr_cbk,
 GF_Err *e)
 {
-	GF_DownloadSession *sess = gf_dm_sess_new_internal(NULL, NULL, 0, user_io, usr_cbk, server, e);
+	GF_DownloadSession *sess;
+
+#if defined(GPAC_HAS_HTTP2) && defined(GPAC_HAS_SSL)
+	Bool h2_negotiated = GF_FALSE;
+	if (ssl_sock_ctx) {
+		const unsigned char *alpn = NULL;
+		unsigned int alpnlen = 0;
+		SSL_get0_next_proto_negotiated(ssl_sock_ctx, &alpn, &alpnlen);
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+		if (alpn == NULL) {
+			SSL_get0_alpn_selected(ssl_sock_ctx, &alpn, &alpnlen);
+		}
+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
+
+		if (alpn && (alpnlen == 2) && !memcmp("h2", alpn, 2)) {
+			h2_negotiated = GF_TRUE;
+		}
+	}
+#endif //GPAC_HAS_HTTP2 && GPAC_HAS_SSL
+
+	sess = gf_dm_sess_new_internal(NULL, NULL, 0, user_io, usr_cbk, server, e);
+
 #ifdef GPAC_HAS_SSL
-	if (sess) sess->ssl = ssl_sock_ctx;
+	if (sess) {
+		sess->ssl = ssl_sock_ctx;
+
+#if defined(GPAC_HAS_HTTP2)
+		if (h2_negotiated) {
+			h2_initialize_session(sess);
+		}
+#endif
+	}
 #endif
 	return sess;
 }
 
+GF_DownloadSession *gf_dm_sess_new_subsession(GF_DownloadSession *sess, u32 stream_id, void *usr_cbk, GF_Err *e)
+{
+#ifdef GPAC_HAS_HTTP2
+	GF_DownloadSession *sub_sess;
+	if (!sess->h2_sess || !stream_id) return NULL;
+	gf_mx_p(sess->mx);
+	sub_sess = gf_dm_sess_new_internal(NULL, NULL, 0, sess->user_proc, usr_cbk, sess->sock, e);
+	if (!sub_sess) {
+		gf_mx_v(sess->mx);
+		return NULL;
+	}
+	gf_list_add(sess->h2_sess->sessions, sub_sess);
+#ifdef GPAC_HAS_SSL
+	sub_sess->ssl = sess->ssl;
+#endif
+	sub_sess->h2_sess = sess->h2_sess;
+	if (sub_sess->mx) gf_mx_del(sub_sess->mx);
+	sub_sess->mx = sess->h2_sess->mx;
+	sub_sess->h2_stream_id = stream_id;
+	sub_sess->status = GF_NETIO_CONNECTED;
+	sub_sess->data_io.read_callback = h2_data_source_read_callback;
+	sub_sess->data_io.source.ptr = sub_sess;
+	gf_mx_v(sess->mx);
+	return sub_sess;
+#else
+	return NULL;
+#endif
+}
+
+u32 gf_dm_sess_subsession_count(GF_DownloadSession *sess)
+{
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess)
+		return gf_list_count(sess->h2_sess->sessions);
+#endif
+	return 1;
+}
+
+
+void gf_dm_sess_server_reset(GF_DownloadSession *sess)
+{
+	if (!sess->server_mode) return;
+
+	gf_dm_sess_clear_headers(sess);
+	sess->total_size = sess->bytes_done = 0;
+	sess->chunk_bytes = 0;
+	sess->chunk_header_bytes = 0;
+	sess->chunked = GF_FALSE;
+	sess->status = GF_NETIO_CONNECTED;
+}
+
 
 GF_EXPORT
 GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *url, u32 dl_flags,
@@ -1494,9 +2738,11 @@
 GF_Err *e)
 {
 	GF_DownloadSession *sess;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("%s:%d gf_dm_sess_new(%s)\n", __FILE__, __LINE__, url));
 	*e = GF_OK;
-	if (gf_dm_is_local(dm, url)) return NULL;
+	if (gf_dm_is_local(dm, url)) {
+		*e = GF_NOT_SUPPORTED;
+		return NULL;
+	}
 
 	if (!gf_dm_can_handle_url(dm, url)) {
 		*e = GF_NOT_SUPPORTED;
@@ -1533,18 +2779,41 @@
 		return GF_IP_CONNECTION_CLOSED;
 	}
 
+	*out_read = 0;
+
 #ifdef GPAC_HAS_SSL
 	if (sess->ssl) {
 		s32 size;
+
+		//receive on null buffer (select only, check if data available)
 		e = gf_sk_receive(sess->sock, NULL, 0, NULL);
-		if (e==GF_IP_NETWORK_EMPTY) {
+		//empty and no pending bytes in SSL, network empty
+		if ((e==GF_IP_NETWORK_EMPTY) &&
+#if 1
+			!SSL_pending(sess->ssl)
+#else
+			//no support for SSL_has_pending in old libSSL and same result can be achieved with SSL_pending
+			!SSL_has_pending(sess->ssl)
+#endif
+		) {
 			gf_mx_v(sess->mx);
 			return e;
 		}
 		size = SSL_read(sess->ssl, data, data_size);
-		if (size < 0)
-			e = GF_IO_ERR;
-		else if (!size)
+		if (size < 0) {
+			int err = SSL_get_error(sess->ssl, size);
+			if (err==SSL_ERROR_SSL) {
+/*
+				char msg[1024];
+				SSL_load_error_strings();
+				ERR_error_string_n(ERR_get_error(), msg, sizeof(msg));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[SSL] Cannot read, error %s\n", msg));
+*/
+				e = GF_IO_ERR;
+			} else {
+				e = gf_sk_probe(sess->sock);
+			}
+		} else if (!size)
 			e = GF_IP_NETWORK_EMPTY;
 		else {
 			e = GF_OK;
@@ -1556,6 +2825,26 @@
 
 		e = gf_sk_receive(sess->sock, data, data_size, out_read);
 
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess) {
+		if (*out_read > 0) {
+			ssize_t read_len = nghttp2_session_mem_recv(sess->h2_sess->ng_sess, data, *out_read);
+			if(read_len < 0 ) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP/2] nghttp2_session_mem_recv error: %s\n", nghttp2_strerror((int) read_len)));
+				return GF_IO_ERR;
+			}
+		}
+		/* send pending frames - h2_sess may be NULL at this point if the connection was reset during processing of nghttp2_session_mem_recv
+			this typically happens if we have a refused stream
+		 */
+		if (sess->h2_sess)
+			h2_session_send(sess);
+	}
+#endif //GPAC_HAS_HTTP2
+
+	if (*out_read)
+		sess->last_fetch_time = gf_sys_clock_high_res();
+
 	gf_mx_v(sess->mx);
 	return e;
 }
@@ -1611,6 +2900,66 @@
 	u16 proxy_port = 0;
 	const char *proxy;
 
+#ifdef GPAC_HAS_HTTP2
+
+	if (sess->h2_switch_sess) {
+		sess->h2_switch_sess = 0;
+		gf_mx_p(sess->mx);
+		h2_detach_session(sess->h2_sess, sess);
+		gf_mx_v(sess->mx);
+
+		if (sess->num_retry) {
+			sess->last_error = GF_OK;
+			sess->num_retry--;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP/2] stream_id %d (%s) refused by server, retrying and marking session as no longer available\n", sess->h2_stream_id, sess->remote_path ? sess->remote_path : sess->orig_url));
+
+			sess->h2_stream_id = 0;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP/2] stream_id %d (%s) refused by server after all retries, marking session as no longer available\n", sess->h2_stream_id, sess->remote_path ? sess->remote_path : sess->orig_url));
+			sess->status = GF_NETIO_STATE_ERROR;
+			sess->last_error = GF_REMOTE_SERVICE_ERROR;
+			sess->h2_stream_id = 0;
+			return;
+		}
+	}
+	assert(!sess->h2_sess);
+
+	if (sess->dm && !sess->dm->disable_http2) {
+		u32 i, count = gf_list_count(sess->dm->sessions);
+		for (i=0; i<count; i++) {
+			GF_DownloadSession *a_sess = gf_list_get(sess->dm->sessions, i);
+			if (!a_sess->h2_sess) continue;
+			if (a_sess->h2_sess->do_shutdown) continue;
+			if (strcmp(a_sess->server_name, sess->server_name)) continue;
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] associating session %s to existing http2 session\n", sess->remote_path ? sess->remote_path : sess->orig_url));
+
+			if (sess->mx) gf_mx_del(sess->mx);
+			sess->h2_sess = a_sess->h2_sess;
+			sess->mx = a_sess->h2_sess->mx;
+			sess->sock = a_sess->sock;
+#ifdef GPAC_HAS_SSL
+			sess->ssl = a_sess->ssl;
+#endif
+			sess->data_io.read_callback = h2_data_source_read_callback;
+			sess->data_io.source.ptr = sess;
+			gf_list_add(sess->h2_sess->sessions, sess);
+
+			if (sess->allow_direct_reuse) {
+				gf_dm_configure_cache(sess);
+				if (sess->from_cache_only) return;
+			}
+
+			sess->connect_time = 0;
+			sess->status = GF_NETIO_CONNECTED;
+			gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
+			gf_dm_configure_cache(sess);
+			return;
+		}
+	}
+#endif
+
+
 	if (!sess->sock) {
 		sess->num_retry = 40;
 		sess->sock = gf_sk_new(GF_SOCK_TYPE_TCP);
@@ -1712,12 +3061,48 @@
 
 			sess->ssl = SSL_new(sess->dm->ssl_ctx);
 			SSL_set_fd(sess->ssl, gf_sk_get_handle(sess->sock));
+			SSL_ctrl(sess->ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, (void*) proxy);
+
 			SSL_set_connect_state(sess->ssl);
 			ret = SSL_connect(sess->ssl);
 			if (ret<=0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[SSL] Cannot connect, error %d\n", ret));
+				ret = SSL_get_error(sess->ssl, ret);
+				if (ret==SSL_ERROR_SSL) {
+					char msg[1024];
+					SSL_load_error_strings();
+					ERR_error_string_n(ERR_get_error(), msg, sizeof(msg));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[SSL] Cannot connect, error %s\n", msg));
+#ifdef GPAC_HAS_HTTP2
+					if (!sess->dm->disable_http2) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("\tYou may want to retry with HTTP/2 support disabled (-no-h2)\n"));
+					}
+#endif
+					sess->last_error = GF_SERVICE_ERROR;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[SSL] Cannot connect, error %d\n", ret));
+					sess->last_error = GF_REMOTE_SERVICE_ERROR;
+				}
 			} else {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[SSL] connected\n"));
+
+
+#ifdef GPAC_HAS_HTTP2
+				if (!sess->dm->disable_http2) {
+					const u8 *alpn = NULL;
+					u32 alpnlen = 0;
+					SSL_get0_next_proto_negotiated(sess->ssl, &alpn, &alpnlen);
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+					if (alpn == NULL) {
+						SSL_get0_alpn_selected(sess->ssl, &alpn, &alpnlen);
+					}
+#endif
+					if (alpn == NULL || alpnlen != 2 || memcmp("h2", alpn, 2) != 0) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[SSL] HTTP/2 is not negotiated\n"));
+					} else {
+						h2_initialize_session(sess);
+					}
+				}
+#endif
 			}
 
 			cert = SSL_get_peer_certificate(sess->ssl);
@@ -1780,7 +3165,7 @@
 #ifndef GPAC_DISABLE_LOG
 						for (i = 0; i < (int)gf_list_count(valid_names); ++i) {
 							const char *valid_name = (const char*) gf_list_get(valid_names, i);
-							GF_LOG(success ? GF_LOG_WARNING : GF_LOG_ERROR, GF_LOG_HTTP, ("[SSL] Tried name: %s\n", valid_name));
+							GF_LOG(success ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_HTTP, ("[SSL] Tried name: %s\n", valid_name));
 						}
 #endif
 					}
@@ -1795,7 +3180,7 @@
 				X509_free(cert);
 
 				if (!success) {
-					gf_dm_disconnect(sess, GF_TRUE);
+					gf_dm_disconnect(sess, HTTP_RESET_CONN);
 					sess->status = GF_NETIO_STATE_ERROR;
 					sess->last_error = GF_AUTHENTICATION_FAILURE;
 					gf_dm_sess_notify_state(sess, sess->status, sess->last_error);
@@ -1837,7 +3222,7 @@
 					/* Since HEAD is not understood by this server, we use a GET instead */
 					sess->http_read_type = GET;
 					sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
-					gf_dm_disconnect(sess, GF_FALSE);
+					gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 					sess->status = GF_NETIO_SETUP;
 					sess->server_only_understand_get = GF_TRUE;
 					GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("gf_dm_refresh_cache_entry() : Timeout with HEAD, try with GET\n"));
@@ -1890,7 +3275,8 @@
 GF_EXPORT
 GF_Err gf_dm_sess_set_range(GF_DownloadSession *sess, u64 start_range, u64 end_range, Bool discontinue_cache)
 {
-	if (!sess) return GF_BAD_PARAM;
+	if (!sess)
+		return GF_BAD_PARAM;
 	if (sess->cache_entry) {
 		if (!discontinue_cache) {
 			if (gf_cache_get_end_range(sess->cache_entry) + 1 != start_range)
@@ -1926,6 +3312,26 @@
 	return GF_OK;
 }
 
+#ifdef GPAC_HAS_HTTP2
+static void gf_dm_sess_flush_input(GF_DownloadSession *sess)
+{
+	char sHTTP[GF_DOWNLOAD_BUFFER_SIZE+1];
+	u32 res;
+	sHTTP[0] = 0;
+	GF_Err e = gf_dm_read_data(sess, sHTTP, GF_DOWNLOAD_BUFFER_SIZE, &res);
+	switch (e) {
+	case GF_IP_NETWORK_EMPTY:
+	case GF_OK:
+	case GF_IP_SOCK_WOULD_BLOCK:
+		return;
+	default:
+		sess->status = GF_NETIO_STATE_ERROR;
+		sess->last_error = e;
+		return;
+	}
+}
+#endif
+
 GF_EXPORT
 GF_Err gf_dm_sess_process(GF_DownloadSession *sess)
 {
@@ -1944,7 +3350,7 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP] Session already started - ignoring start\n"));
 			return GF_OK;
 		}
-		sess->th = gf_th_new(sess->orig_url);
+		sess->th = gf_th_new( gf_file_basename(sess->orig_url) );
 		if (!sess->th) return GF_OUT_OF_MEM;
 		gf_th_run(sess->th, gf_dm_session_thread, sess);
 		return GF_OK;
@@ -1966,6 +3372,16 @@
 		case GF_NETIO_WAIT_FOR_REPLY:
 		case GF_NETIO_CONNECTED:
 			sess->do_requests(sess);
+			if (sess->server_mode) {
+				if (sess->status == GF_NETIO_STATE_ERROR) {
+					sess->status = GF_NETIO_DISCONNECTED;
+					sess->last_error = GF_IP_CONNECTION_CLOSED;
+					sess_connection_closed(sess);
+					go = GF_FALSE;
+				} else if (sess->last_error==GF_IP_NETWORK_EMPTY) {
+					go = GF_FALSE;
+				}
+			}
 			break;
 		case GF_NETIO_DATA_EXCHANGE:
 			if (sess->put_state==2) {
@@ -1976,6 +3392,14 @@
 			sess->do_requests(sess);
 			break;
 		case GF_NETIO_DATA_TRANSFERED:
+#ifdef GPAC_HAS_HTTP2
+			if (sess->h2_sess && sess->server_mode) {
+				gf_dm_sess_flush_input(sess);
+				h2_session_send(sess);
+			}
+#endif
+			go = GF_FALSE;
+			break;
 		case GF_NETIO_DISCONNECTED:
 		case GF_NETIO_STATE_ERROR:
 			go = GF_FALSE;
@@ -2090,6 +3514,10 @@
 	default_cache_dir = NULL;
 	gf_mx_p( dm->cache_mx );
 
+#ifdef GPAC_HAS_HTTP2
+	dm->disable_http2 = gf_opts_get_bool("core", "no-h2");
+#endif
+
 	opt = gf_opts_get_key("core", "cache");
 
 retry_cache:
@@ -2129,7 +3557,7 @@
 	}
 
 	/*use it in in BYTES per second*/
-	dm->limit_data_rate = 1000 * gf_opts_get_int("core", "maxrate") / 8;
+	dm->limit_data_rate = gf_opts_get_int("core", "maxrate") / 8;
 
 	dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
 	//when rate is limited, use smaller smaller read size
@@ -2353,11 +3781,6 @@
 		if ((body_start[0]=='\r') && (body_start[1]=='\n')) {
 			body_start += 2;
 			*header_size = 2;
-			//chunk exactly ends our packet, reset session start time
-			if (*payload_size == 2) {
-				sess->chunk_run_time += gf_sys_clock_high_res() - sess->start_time;
-				sess->start_time = 0;
-			}
 		}
 		if (*payload_size <= 4) {
 			*header_size = 0;
@@ -2369,15 +3792,6 @@
 		te_header = NULL;
 	}
 
-	//start of a new chunk, update start time
-	if (!sess->start_time) {
-		sess->start_time = gf_sys_clock_high_res();
-		//assume RTT is session reply time, and that chunk transfer started RTT/2 ago
-		if (first_chunk_in_payload && sess->start_time > sess->reply_time/2)
-			sess->start_time -= sess->reply_time/2;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] First byte in chunk received (%d bytes in packet), new start time %u ms\n", *payload_size, (u32) sess->start_time/1000));
-	}
-
 	//cannot parse now, copy over the bytes
 	if (!te_header) {
 		*header_size = 0;
@@ -2415,32 +3829,39 @@
 }
 
 
-static void dm_sess_update_download_rate(GF_DownloadSession * sess, Bool always_check)
+static void dm_sess_update_download_rate(GF_DownloadSession * sess)
 {
-	u64 runtime;
-	if (!always_check && (sess->bytes_done==sess->total_size)) return;
-
-	/*update state*/
-	runtime = sess->chunk_run_time;
-	if (sess->start_time) {
-		runtime += (gf_sys_clock_high_res() - sess->start_time);
-		if (sess->active_time) {
-			runtime = sess->active_time;
-		}
+	if (!sess->bytes_done) {
+		sess->bytes_per_sec = 0;
+		return;
 	}
-	if (!runtime) runtime=1;
 
-	sess->bytes_per_sec = (u32) ((1000000 * (u64) sess->bytes_done) / runtime);
+	//session is chunked and we have reached our first full window
+	if (sess->chunked && sess->cumulated_chunk_rate) {
+		/*use our cumulated weighted rate in bytes per seconds, and divide by total size*/
+		sess->bytes_per_sec = (u32) (sess->cumulated_chunk_rate / (sess->bytes_done + sess->cumulated_chunk_header_bytes) );
 
-	if (sess->chunked) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] bandwidth estimation: download time "LLD" us (chunk download time "LLD" us) - bytes %u - rate %u kbps\n", runtime, sess->chunk_run_time, sess->bytes_done, sess->bytes_per_sec*8/1000));
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_HTTP, GF_LOG_DEBUG)) {
+			u64 runtime = (gf_sys_clock_high_res() - sess->request_start_time);
+			if (!runtime) runtime=1;
+			u32 kbps = (u32) ((1000000 * (u64) (sess->bytes_done + sess->cumulated_chunk_header_bytes)) / runtime) / 125;
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] bandwidth estimation: download time "LLD" us - bytes %u - chunk rate %u kbps (overall rate rate %u kbps)\n", runtime, sess->bytes_done, sess->bytes_per_sec / 125, kbps));
+		}
+#endif
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] bandwidth estimation: download time "LLD" us - bytes %u - rate %u kbps\n", runtime, sess->bytes_done, sess->bytes_per_sec*8/1000));
+		/*compute bps starting from request send time*/
+		u64 runtime = (gf_sys_clock_high_res() - sess->request_start_time);
+		if (!runtime) runtime=1;
+
+		sess->bytes_per_sec = (u32) ((1000000 * (u64) sess->bytes_done) / runtime);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] bandwidth estimation: download time "LLD" us - bytes %u - rate %u kbps\n", runtime, sess->bytes_done, sess->bytes_per_sec / 125));
 	}
 }
 
 
-static GFINLINE void gf_dm_data_received(GF_DownloadSession *sess, u8 *payload, u32 payload_size, Bool store_in_init, u32 *rewrite_size, u8 *original_payload)
+static void gf_dm_data_received(GF_DownloadSession *sess, u8 *payload, u32 payload_size, Bool store_in_init, u32 *rewrite_size, u8 *original_payload)
 {
 	u32 nbBytes, remaining, hdr_size;
 	u8 *data;
@@ -2455,7 +3876,6 @@
 		return; //nothing to do
 	if (sess->chunked) {
 		data = (u8 *) gf_dm_get_chunk_data(sess, first_chunk_in_payload, (char *) payload, &nbBytes, &hdr_size);
-		//first_chunk_in_payload = GF_FALSE;
 		if (!hdr_size && !data) {
 			/* keep the data and wait for the rest */
 			sess->remaining_data_size = nbBytes;
@@ -2470,11 +3890,14 @@
 			nbBytes = payload_size - hdr_size;
 			payload_size = 0;
 			payload = NULL;
+			sess->chunk_header_bytes += hdr_size;
 		} else {
 			payload_size -= hdr_size + nbBytes;
 			payload += hdr_size + nbBytes;
 			flush_chunk = GF_TRUE;
+			sess->chunk_header_bytes += hdr_size;
 		}
+
 		/*chunk transfer is done*/
 		if (sess->last_chunk_found) {
 			sess->total_size = sess->bytes_done;
@@ -2493,11 +3916,11 @@
 	//we have some new bytes received
 	if (nbBytes && !sess->remaining_data_size) {
 		sess->bytes_done += nbBytes;
-		dm_sess_update_download_rate(sess, GF_TRUE);
+		dm_sess_update_download_rate(sess);
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] url %s received %d new bytes (%d kbps)\n", gf_cache_get_url(sess->cache_entry), nbBytes, 8*sess->bytes_per_sec/1000));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] url %s received %d new bytes (%d kbps)\n", sess->orig_url, nbBytes, 8*sess->bytes_per_sec/1000));
 		if (sess->total_size && (sess->bytes_done > sess->total_size)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP] url %s received more bytes than planned!! Got %d bytes vs %d content length\n", gf_cache_get_url(sess->cache_entry), sess->bytes_done , sess->total_size ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP] url %s received more bytes than planned!! Got %d bytes vs %d content length\n", sess->orig_url, sess->bytes_done , sess->total_size ));
 			sess->bytes_done = sess->total_size;
 		}
 
@@ -2505,7 +3928,7 @@
 			gf_icy_skip_data(sess, (char *) data, nbBytes);
 		else {
 			if (sess->use_cache_file)
-				gf_cache_write_to_cache( sess->cache_entry, sess, (char *) data, nbBytes);
+				gf_cache_write_to_cache( sess->cache_entry, sess, (char *) data, nbBytes, sess->dm ? sess->dm->cache_mx : NULL);
 
 			par.msg_type = GF_NETIO_DATA_EXCHANGE;
 			par.error = GF_OK;
@@ -2518,38 +3941,38 @@
 	//and we're done
 	if (sess->total_size && (sess->bytes_done == sess->total_size)) {
 		u64 run_time;
+
+#if 0 //def GPAC_HAS_HTTP2
+		if (0 && sess->h2_sess && sess->h2_stream_id)
+			return;
+#endif
+
 		if (sess->use_cache_file) {
 			gf_cache_close_write_cache(sess->cache_entry, sess, GF_TRUE);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP,
 			 ("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
 		}
 
-		gf_dm_disconnect(sess, GF_FALSE);
+		gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 		par.msg_type = GF_NETIO_DATA_TRANSFERED;
 		par.error = GF_OK;
 
 		gf_dm_sess_user_io(sess, &par);
 		sess->total_time_since_req = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
 		run_time = gf_sys_clock_high_res() - sess->start_time;
-		if (sess->in_time) {
-			sess->active_time += gf_sys_clock_high_res() - sess->in_time;
-			if (run_time > sess->active_time) {
-				sess->total_time_since_req -= (u32) (run_time - sess->active_time);
-				run_time = sess->active_time; // + (run_time - sess->active_time)/3;
-				sess->bytes_per_sec = (u32) ((1000000 * (u64) sess->bytes_done) / run_time);
-			}
-		}
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] url %s (%d bytes) downloaded in "LLU" us (%d kbps) (%d us since request - got response in %d us - active time %d us)\n", gf_cache_get_url(sess->cache_entry), sess->bytes_done,
-		 run_time, 8*sess->bytes_per_sec/1000, sess->total_time_since_req, sess->reply_time, sess->active_time ? sess->active_time : sess->reply_time ));
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] %s (%d bytes) downloaded in "LLU" us (%d kbps) (%d us since request - got response in %d us)\n", gf_file_basename(gf_cache_get_url(sess->cache_entry)), sess->bytes_done,
+		 run_time, 8*sess->bytes_per_sec/1000, sess->total_time_since_req, sess->reply_time));
 
 		if (sess->chunked && (payload_size==2))
 			payload_size=0;
 	}
 
-	if (rewrite_size && sess->chunked && data && original_payload) {
-		//use memmove since regions overlap
-		memmove(original_payload + *rewrite_size, data, nbBytes);
+	if (rewrite_size && sess->chunked && data) {
+		if (original_payload) {
+			//use memmove since regions overlap
+			memmove(original_payload + *rewrite_size, data, nbBytes);
+		}
 		*rewrite_size += nbBytes;
 	}
 
@@ -2563,7 +3986,8 @@
 static Bool dm_exceeds_cap_rate(GF_DownloadManager * dm)
 {
 	u32 cumul_rate = 0;
-	u32 nb_sess = 0;
+//	u32 nb_sess = 0;
+	u64 now = gf_sys_clock_high_res();
 	u32 i, count = gf_list_count(dm->sessions);
 
 	//check if this fits with all other sessions
@@ -2573,16 +3997,70 @@
 		//session not running done
 		if (sess->status != GF_NETIO_DATA_EXCHANGE) continue;
 
-		dm_sess_update_download_rate(sess, GF_FALSE);
-		cumul_rate += sess->bytes_per_sec;
-		nb_sess ++;
+		//compute average rate on a window of 200 ms
+		//we cannot just use sess->bytes_per_sec because the rate limit might be changed dynamically
+		//so we need a recent history, not the session history
+		//note that we don't try to use the estimated bps of chunk transfer when capping
+		if (!sess->last_cap_rate_time) {
+			u64 runtime;
+			sess->last_cap_rate_time = sess->request_start_time;
+			sess->last_cap_rate_bytes = sess->bytes_done;
+
+			/*compute bps starting from request send time, do not call update_download_rate as we don't want the chunk transfer rate*/
+			runtime = (gf_sys_clock_high_res() - sess->request_start_time);
+			if (!runtime) runtime=1;
+			sess->last_cap_rate_bytes_per_sec = (u32) ((1000000 * (u64) sess->bytes_done) / runtime);
+		} else if (now > sess->last_cap_rate_time) {
+			u64 time = now - sess->last_cap_rate_time;
+			u64 bytes = sess->bytes_done - sess->last_cap_rate_bytes;
+			sess->last_cap_rate_bytes_per_sec = (u32) ((1000000 * (u64) bytes) / time);
+			if (time > 200000) {
+				//this is an approximation we don't know precisely when these were received
+				//and we don't really care since next rate estimation will be really high anyway and will exceed cap
+				sess->last_cap_rate_bytes = sess->bytes_done;
+				sess->last_cap_rate_time = now;
+			}
+		} else {
+			return GF_TRUE;
+		}
+		cumul_rate += sess->last_cap_rate_bytes_per_sec;
+		//nb_sess ++;
 	}
-	if ( cumul_rate >= nb_sess * dm->limit_data_rate)
+	if ( cumul_rate >= dm->limit_data_rate)
 		return GF_TRUE;
 
 	return GF_FALSE;
 }
 
+static void gf_dm_sess_estimate_chunk_rate(GF_DownloadSession *sess, u32 nb_bytes)
+{
+	u64 now = gf_sys_clock_high_res();
+	sess->chunk_bytes += nb_bytes;
+	if ((now > sess->last_chunk_start_time + sess->chunk_wnd_dur) || (sess->total_size==sess->bytes_done) ) {
+		if (sess->chunk_bytes) {
+			u32 tot_bytes = sess->chunk_bytes + sess->chunk_header_bytes;
+			//compute rate in bytes per seconds
+			Double rate = 1000000.0 * tot_bytes;
+			rate /= (now - sess->last_chunk_start_time);
+
+			//cumulated rate is the weighted sum of our probe rates, the weight being the number of bytes
+			//when comuting the bitrate, we will divide by the total size
+			sess->cumulated_chunk_rate += rate * tot_bytes;
+
+			sess->chunk_bytes = 0;
+			sess->cumulated_chunk_header_bytes += sess->chunk_header_bytes;
+			sess->chunk_header_bytes = 0;
+
+			//we are done, update rate
+			if (sess->total_size==sess->bytes_done)
+				dm_sess_update_download_rate(sess);
+		}
+		sess->last_chunk_start_time = now;
+	}
+}
+
+const u8 *gf_cache_get_content(const DownloadedCacheEntry entry, u32 *size);
+void gf_cache_release_content(const DownloadedCacheEntry entry);
 
 GF_EXPORT
 GF_Err gf_dm_sess_fetch_data(GF_DownloadSession *sess, char *buffer, u32 buffer_size, u32 *read_size)
@@ -2598,24 +4076,31 @@
 		}
 		return GF_BAD_PARAM;
 	}
-	if (sess->th) return GF_BAD_PARAM;
+	if (sess->th)
+		return GF_BAD_PARAM;
 	if (sess->status == GF_NETIO_DISCONNECTED) {
 		if (!sess->init_data_size)
 			return GF_EOS;
 	}
-	else if (sess->status > GF_NETIO_DATA_TRANSFERED) return GF_BAD_PARAM;
+	else if (sess->status == GF_NETIO_STATE_ERROR) {
+		return sess->last_error;
+	}
+	else if (sess->status > GF_NETIO_DATA_TRANSFERED)
+		return GF_BAD_PARAM;
 
 	*read_size = 0;
 	if (sess->status == GF_NETIO_DATA_TRANSFERED) {
-		if (!sess->server_mode) return GF_EOS;
-		if (!sess->init_data_size && sess->total_size && (sess->total_size==sess->bytes_done)) return GF_EOS;
+		if (!sess->server_mode)
+			return GF_EOS;
+		if (!sess->init_data_size && sess->total_size && (sess->total_size==sess->bytes_done))
+			return GF_EOS;
 		sess->status = GF_NETIO_DATA_EXCHANGE;
 	}
 
-	sess->in_time = gf_sys_clock_high_res();
 	if (sess->status == GF_NETIO_SETUP) {
 		gf_dm_connect(sess);
-		if (sess->last_error) return sess->last_error;
+		if (sess->last_error)
+			return sess->last_error;
 		e = GF_OK;
 	} else if (sess->status < GF_NETIO_DATA_EXCHANGE) {
 		sess->do_requests(sess);
@@ -2639,33 +4124,138 @@
 			memmove(sess->init_data, sess->init_data+buffer_size, sizeof(char)*sess->init_data_size);
 			e = GF_OK;
 		}
+ } else if (sess->local_cache_only) {
+ u32 to_copy, data_size;
+ const u8 *ptr;
+ e = GF_OK;
+ assert(sess->cache_entry);
+ //always refresh total size
+ sess->total_size = gf_cache_get_content_length(sess->cache_entry);
+
+ ptr = gf_cache_get_content(sess->cache_entry, &data_size);
+ if (!ptr) return GF_OUT_OF_MEM;
+
+ if (sess->bytes_done >= data_size) {
+ *read_size = 0;
+			gf_cache_release_content(sess->cache_entry);
+ if (gf_cache_is_done(sess->cache_entry)) {
+ sess->status = GF_NETIO_DATA_TRANSFERED;
+ return GF_EOS;
+ }
+ return GF_IP_NETWORK_EMPTY;
+ }
+ to_copy = data_size - sess->bytes_done;
+ if (to_copy > buffer_size) to_copy = buffer_size;
+
+ memcpy(buffer, ptr + sess->bytes_done, to_copy);
+ sess->bytes_done += to_copy;
+ *read_size = to_copy;
+ if (gf_cache_is_done(sess->cache_entry))
+ sess->status = GF_NETIO_DATA_TRANSFERED;
+		else
+			sess->total_size = 0;
+		gf_cache_release_content(sess->cache_entry);
 	} else {
 
-		if (sess->dm && sess->dm->limit_data_rate && dm_exceeds_cap_rate(sess->dm)) {
-			if (sess->idle_time) sess->active_time += sess->in_time - sess->idle_time;
-			sess->idle_time = sess->in_time;
-			return GF_IP_NETWORK_EMPTY;
+		if (sess->dm && sess->dm->limit_data_rate) {
+			if (dm_exceeds_cap_rate(sess->dm))
+				return GF_IP_NETWORK_EMPTY;
+
+			if (buffer_size > sess->dm->read_buf_size)
+				buffer_size = sess->dm->read_buf_size;
 		}
 
-		if (sess->remaining_data && sess->remaining_data_size) {
-			if (sess->remaining_data_size >= buffer_size) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP] No HTTP chunk header found for %d bytes, assuming broken chunk transfer and aborting\n", sess->remaining_data_size));
-				return GF_NON_COMPLIANT_BITSTREAM;
+		e = GF_OK;
+		*read_size = 0;
+		u32 nb_read = 0;
+		//perform a loop, mostly for chunk-tranfer mode where a server may push a lot of small TCP frames,
+		//we want to flush everything as fast as possible
+		while (1) {
+			u32 single_read = 0;
+
+			if (sess->remaining_data && sess->remaining_data_size) {
+				if (nb_read + sess->remaining_data_size >= buffer_size) {
+					if (!nb_read) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP] No HTTP chunk header found for %d bytes, assuming broken chunk transfer and aborting\n", sess->remaining_data_size));
+						return GF_NON_COMPLIANT_BITSTREAM;
+					}
+					break;
+				}
+				memcpy(buffer + nb_read, sess->remaining_data, sess->remaining_data_size);
+			} else if (nb_read >= buffer_size) {
+				break;
+			}
+			e = gf_dm_read_data(sess, buffer + nb_read + sess->remaining_data_size, buffer_size - sess->remaining_data_size - nb_read, &single_read);
+			if (e<0) {
+				assert(single_read==0);
+				break;
 			}
-			memcpy(buffer, sess->remaining_data, sess->remaining_data_size);
-		}
 
-		e = gf_dm_read_data(sess, buffer + sess->remaining_data_size, buffer_size - sess->remaining_data_size, read_size);
-		if (!e) {
-			size = sess->remaining_data_size + (*read_size);
+			size = sess->remaining_data_size + single_read;
 			sess->remaining_data_size = 0;
-			*read_size = 0;
-			gf_dm_data_received(sess, (u8 *) buffer, size, GF_FALSE, read_size, buffer);
+			single_read = 0;
+
+#ifdef GPAC_HAS_HTTP2
+			if (!sess->h2_sess)
+#endif
+				gf_dm_data_received(sess, (u8 *) buffer + nb_read, size, GF_FALSE, &single_read, buffer + nb_read);
+
+
 			if (!sess->chunked)
-				*read_size = size;
+				single_read = size;
+
+			nb_read += single_read;
+		}
+
+#ifdef GPAC_HAS_HTTP2
+		if (sess->h2_sess) {
+			nb_read = 0;
+			h2_flush_data_ex(sess, buffer, buffer_size, &nb_read);
+			h2_session_send(sess);
+
+			//stream is over and all data flushed, move to GF_NETIO_DATA_TRANSFERED in client mode
+			if (sess->h2_data_done && !sess->h2_buf.size && !sess->server_mode) {
+				sess->status = GF_NETIO_DATA_TRANSFERED;
+			}
+		}
+#endif
+
+		*read_size = nb_read;
+		//we had data but last call to gf_dm_read_data may have returned network empty
+		if (nb_read && (e<0))
+			e = GF_OK;
+
+
+		//estimate rate for chunk-transfer - we only do that for fetch_data
+		if (sess->chunked
+#ifdef GPAC_HAS_HTTP2
+			|| sess->h2_sess
+#endif
+		)
+			gf_dm_sess_estimate_chunk_rate(sess, nb_read);
+
+		if (! (*read_size) && (e==GF_IP_NETWORK_EMPTY)) {
+#ifdef GPAC_HAS_HTTP2
+			if (sess->h2_sess && (!sess->h2_stream_id || sess->h2_data_done) && sess->bytes_done && !sess->total_size) {
+				sess->status = GF_NETIO_DATA_TRANSFERED;
+				return GF_EOS;
+			}
+#endif
+
+			e = gf_sk_probe(sess->sock);
+			if ((e==GF_IP_CONNECTION_CLOSED) || (gf_sys_clock_high_res() - sess->last_fetch_time > 1000 * sess->request_timeout)
+			) {
+				if (e==GF_IP_CONNECTION_CLOSED) {
+					sess->last_error = GF_IP_CONNECTION_CLOSED;
+					sess_connection_closed(sess);
+				} else {
+					sess->last_error = GF_IP_NETWORK_EMPTY;
+				}
+				sess->status = GF_NETIO_STATE_ERROR;
+				return GF_IP_NETWORK_EMPTY;
+			}
 		}
 	}
-	sess->active_time += gf_sys_clock_high_res() - sess->in_time;
 
 	if (sess->server_mode && (sess->status == GF_NETIO_DATA_EXCHANGE)) {
 		sess->status = GF_NETIO_DATA_TRANSFERED;
@@ -2677,7 +4267,8 @@
 GF_EXPORT
 GF_Err gf_dm_sess_get_stats(GF_DownloadSession * sess, const char **server, const char **path, u64 *total_size, u64 *bytes_done, u32 *bytes_per_sec, GF_NetIOStatus *net_status)
 {
-	if (!sess) return GF_BAD_PARAM;
+	if (!sess)
+		return GF_BAD_PARAM;
 	if (server) *server = sess->server_name;
 	if (path) *path = sess->remote_path;
 	if (total_size) {
@@ -2685,7 +4276,14 @@
 		else *total_size = sess->total_size;
 	}
 	if (bytes_done) *bytes_done = sess->bytes_done;
-	if (bytes_per_sec) *bytes_per_sec = sess->bytes_per_sec;
+	if (bytes_per_sec) {
+		if (sess->dm && sess->dm->limit_data_rate && sess->last_cap_rate_bytes_per_sec) {
+			*bytes_per_sec = sess->last_cap_rate_bytes_per_sec;
+		} else {
+			*bytes_per_sec = sess->bytes_per_sec;
+		}
+	}
+
 	if (net_status) *net_status = sess->status;
 	if (sess->status == GF_NETIO_DISCONNECTED) return GF_EOS;
 	else if (sess->status == GF_NETIO_STATE_ERROR) return GF_SERVICE_ERROR;
@@ -2728,7 +4326,14 @@
 {
 	if (sess) {
 		gf_mx_p(sess->mx);
-		gf_dm_disconnect(sess, GF_TRUE);
+
+#ifdef GPAC_HAS_HTTP2
+		if (sess->h2_sess && (sess->status==GF_NETIO_DATA_EXCHANGE)) {
+			nghttp2_submit_rst_stream(sess->h2_sess->ng_sess, NGHTTP2_FLAG_NONE, sess->h2_stream_id, NGHTTP2_NO_ERROR);
+			h2_session_send(sess);
+		}
+#endif
+		gf_dm_disconnect(sess, HTTP_CLOSE);
 		sess->status = GF_NETIO_STATE_ERROR;
 		gf_mx_v(sess->mx);
 	}
@@ -2774,16 +4379,18 @@
 	Bool no_cache = GF_FALSE;
 	char range_buf[1024];
 	char pass_buf[1124];
+	char req_name[20];
 	const char *user_agent;
 	const char *url;
 	const char *user_profile;
 	const char *param_string;
-	Bool has_accept, has_connection, has_range, has_agent, has_language, send_profile, has_mime;
+	Bool inject_icy = GF_FALSE;
+	u32 i, count;
+	GF_HTTPHeader *hdr;
+	Bool has_accept, has_connection, has_range, has_agent, has_language, send_profile, has_mime, has_chunk_transfer;
 	assert (sess->status == GF_NETIO_CONNECTED);
 
-	gf_dm_clear_headers(sess);
-	sess->active_time = 0;
-
+	gf_dm_sess_clear_headers(sess);
 	assert(sess->remaining_data_size == 0);
 
 	if (sess->needs_cache_reconfig) {
@@ -2791,7 +4398,7 @@
 		sess->needs_cache_reconfig = 0;
 	}
 	if (sess->from_cache_only) {
-		sess->request_start_time = gf_sys_clock_high_res();
+		sess->last_fetch_time = sess->request_start_time = gf_sys_clock_high_res();
 		sess->req_hdr_size = 0;
 		sess->status = GF_NETIO_WAIT_FOR_REPLY;
 		gf_dm_sess_notify_state(sess, GF_NETIO_WAIT_FOR_REPLY, GF_OK);
@@ -2802,7 +4409,7 @@
 	strcpy(pass_buf, "");
 	sess->creds = gf_find_user_credentials_for_site( sess->dm, sess->server_name );
 	if (sess->creds && sess->creds->valid) {
-		sprintf(pass_buf, "Authorization: Basic %s", sess->creds->digest);
+		sprintf(pass_buf, "Basic %s", sess->creds->digest);
 	}
 
 	user_agent = gf_opts_get_key("core", "ua");
@@ -2818,87 +4425,138 @@
 		par.name = "GET";
 	}
 
-	if (par.name) {
-		if (!strcmp(par.name, "GET")) sess->http_read_type = GET;
-		else if (!strcmp(par.name, "HEAD")) sess->http_read_type = HEAD;
-		else sess->http_read_type = OTHER;
+	strncpy(req_name, par.name, 19);
+	req_name[19] = 0;
 
-		if (!strcmp(par.name, "PUT") || !strcmp(par.name, "POST"))
-			sess->put_state = 1;
-	} else {
+	if (!strcmp(req_name, "GET")) {
 		sess->http_read_type = GET;
-	}
+#ifdef GPAC_HAS_HTTP2
+		if (!sess->h2_sess)
+#endif
+			inject_icy = GF_TRUE;
+	} else if (!strcmp(req_name, "HEAD")) sess->http_read_type = HEAD;
+	else sess->http_read_type = OTHER;
+
+	if (!strcmp(req_name, "PUT") || !strcmp(req_name, "POST"))
+		sess->put_state = 1;
 
 	url = (sess->proxy_enabled==1) ? sess->orig_url : sess->remote_path;
 
-	param_string = gf_opts_get_key("core", "query-string");
-	if (param_string) {
-		if (strchr(sess->remote_path, '?')) {
-			sprintf(sHTTP, "%s %s&%s HTTP/1.0\r\nHost: %s\r\n" ,
-			 par.name ? par.name : "GET", url, param_string, sess->server_name);
-		} else {
-			sprintf(sHTTP, "%s %s?%s HTTP/1.0\r\nHost: %s\r\n" ,
-			 par.name ? par.name : "GET", url, param_string, sess->server_name);
+	/*get all headers*/
+	gf_dm_sess_clear_headers(sess);
+
+
+#define PUSH_HDR(_name, _value) {\
+		GF_SAFEALLOC(hdr, GF_HTTPHeader)\
+		hdr->name = gf_strdup(_name);\
+		hdr->value = gf_strdup(_value);\
+		gf_list_add(sess->headers, hdr);\
 		}
-	} else {
-		sprintf(sHTTP, "%s %s HTTP/1.1\r\nHost: %s\r\n" ,
-		 par.name ? par.name : "GET", url, sess->server_name);
-	}
 
-	/*get all headers*/
-	has_agent = has_accept = has_connection = has_range = has_language = has_mime = GF_FALSE;
+	has_agent = has_accept = has_connection = has_range = has_language = has_mime = has_chunk_transfer = GF_FALSE;
 	while (1) {
 		par.msg_type = GF_NETIO_GET_HEADER;
 		par.value = NULL;
 		gf_dm_sess_user_io(sess, &par);
 		if (!par.value) break;
-		strcat(sHTTP, par.name);
-		strcat(sHTTP, ": ");
-		strcat(sHTTP, par.value);
-		strcat(sHTTP, "\r\n");
-		if (!strcmp(par.name, "Accept")) has_accept = GF_TRUE;
-		else if (!strcmp(par.name, "Connection")) has_connection = GF_TRUE;
-		else if (!strcmp(par.name, "Range")) has_range = GF_TRUE;
-		else if (!strcmp(par.name, "User-Agent")) has_agent = GF_TRUE;
-		else if (!strcmp(par.name, "Accept-Language")) has_language = GF_TRUE;
-		else if (!strcmp(par.name, "Content-Type")) has_mime = GF_TRUE;
+
+		if (!stricmp(par.name, "Connection")) {
+			if (!stricmp(par.value, "close"))
+				has_connection = GF_TRUE;
+			else
+				continue;
+		}
 		else if (!stricmp(par.name, "Transfer-Encoding")) {
 			if (!stricmp(par.value, "chunked"))
-				sess->chunked = GF_TRUE;
+				has_chunk_transfer = GF_TRUE;
+			continue;
 		}
 
+		PUSH_HDR(par.name, par.value)
+
+		if (!stricmp(par.name, "Accept")) has_accept = GF_TRUE;
+		else if (!stricmp(par.name, "Range")) has_range = GF_TRUE;
+		else if (!stricmp(par.name, "User-Agent")) has_agent = GF_TRUE;
+		else if (!stricmp(par.name, "Accept-Language")) has_language = GF_TRUE;
+		else if (!stricmp(par.name, "Content-Type")) has_mime = GF_TRUE;
+
 		if (!par.msg_type) break;
 	}
-	if (!has_agent) {
-		strcat(sHTTP, "User-Agent: ");
-		strcat(sHTTP, user_agent);
-		strcat(sHTTP, "\r\n");
-	}
+	if (!has_agent) PUSH_HDR("User-Agent", user_agent)
+
 	/*no mime and POST/PUT, default to octet stream*/
-	if (!has_mime && (sess->http_read_type==OTHER)) strcat(sHTTP, "Content-Type: application/octet-stream\r\n");
-	if (!has_accept && (sess->http_read_type!=OTHER) ) strcat(sHTTP, "Accept: */*\r\n");
-	if (sess->proxy_enabled==1) strcat(sHTTP, "Proxy-Connection: Keep-alive\r\n");
-	else if (!has_connection) strcat(sHTTP, "Connection: Keep-Alive\r\n");
-	if (!has_range && sess->needs_range) {
-		if (!sess->range_end) sprintf(range_buf, "Range: bytes="LLD"-\r\n", sess->range_start);
-		else sprintf(range_buf, "Range: bytes="LLD"-"LLD"\r\n", sess->range_start, sess->range_end);
-		strcat(sHTTP, range_buf);
+	if (!has_mime && (sess->http_read_type==OTHER)) PUSH_HDR("Content-Type", "application/octet-stream")
+
+	if (!has_accept && (sess->http_read_type!=OTHER) ) PUSH_HDR("Accept", "*/*")
+
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess)
+		has_connection = GF_TRUE;
+
+	if (!has_connection && !sess->h2_sess
+#ifdef GPAC_HAS_SSL
+		&& !sess->ssl
+#endif
+		&& !sess->dm->disable_http2 && (sess->h2_upgrade_state!=2)
+		&& !gf_opts_get_bool("core", "no-h2c")
+	) {
+		u8 settings[HTTP2_BUFFER_SETTINGS_SIZE];
+		u32 settings_len;
+		u8 b64[100];
+		u32 b64len;
+
+		nghttp2_settings_entry h2_settings[2] = {
+			{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100},
+			{NGHTTP2_SETTINGS_ENABLE_PUSH, 0}
+		};
+
+		PUSH_HDR("Connection", "Upgrade, HTTP2-Settings")
+		PUSH_HDR("Upgrade", "h2c")
+
+
+		settings_len = (u32) nghttp2_pack_settings_payload(settings, HTTP2_BUFFER_SETTINGS_SIZE, h2_settings, GF_ARRAY_LENGTH(h2_settings));
+		b64len = gf_base64_encode(settings, settings_len, b64, 100);
+		b64[b64len] = 0;
+		PUSH_HDR("HTTP2-Settings", b64)
+
+		sess->h2_upgrade_state = 1;
+		inject_icy = GF_FALSE;
+	} else
+#endif
+	if (sess->proxy_enabled==1) PUSH_HDR("Proxy-Connection", "Keep-alive")
+	else if (!has_connection) {
+		PUSH_HDR("Connection", "Keep-Alive");
+	}
+
 
+	if (has_chunk_transfer
+#ifdef GPAC_HAS_HTTP2
+		&& !sess->h2_sess
+#endif
+	) {
+		PUSH_HDR("Transfer-Encoding", "chunked");
+		sess->chunked = GF_TRUE;
+	}
+
+	if (!has_range && sess->needs_range) {
+		if (!sess->range_end)
+			sprintf(range_buf, "bytes="LLD"-", sess->range_start);
+		//if end is set to -1 use open end
+		else if (sess->range_end==(u64)-1)
+			sprintf(range_buf, "bytes="LLD"-", sess->range_start);
+		else
+			sprintf(range_buf, "bytes="LLD"-"LLD"", sess->range_start, sess->range_end);
+		PUSH_HDR("Range", range_buf)
 		no_cache = GF_TRUE;
 	}
 	if (!has_language) {
 		const char *opt = gf_opts_get_key("core", "lang");
-		if (opt) {
-			strcat(sHTTP, "Accept-Language: ");
-			strcat(sHTTP, opt);
-			strcat(sHTTP, "\r\n");
-		}
+		if (opt) PUSH_HDR("Accept-Language", opt)
 	}
 
 
 	if (strlen(pass_buf)) {
-		strcat(sHTTP, pass_buf);
-		strcat(sHTTP, "\r\n");
+		PUSH_HDR("Authorization", pass_buf)
 	}
 
 	par.msg_type = GF_NETIO_GET_CONTENT;
@@ -2910,9 +4568,7 @@
 	user_profile = gf_opts_get_key("core", "user-profileid");
 
 	if (user_profile) {
-		strcat(sHTTP, "X-UserProfileID: ");
-		strcat(sHTTP, user_profile);
-		strcat(sHTTP, "\r\n");
+		PUSH_HDR("X-UserProfileID", user_profile);
 	} else if ((sess->http_read_type == GET) || (sess->http_read_type == HEAD) ) {
 		user_profile = gf_opts_get_key("core", "user-profile");
 		if (user_profile && gf_file_exists(user_profile)) {
@@ -2920,9 +4576,9 @@
 			if (profile) {
 				par.size = (u32) gf_fsize(profile);
 				gf_fclose(profile);
-				sprintf(range_buf, "Content-Length: %d\r\n", par.size);
-				strcat(sHTTP, range_buf);
-				strcat(sHTTP, "Content-Type: text/xml\r\n");
+				sprintf(range_buf, "%d", par.size);
+				PUSH_HDR("Content-Length", range_buf);
+				PUSH_HDR("Content-Type", "text/xml");
 				send_profile = GF_TRUE;
 			}
 		}
@@ -2932,24 +4588,86 @@
 	if (!send_profile) {
 		gf_dm_sess_user_io(sess, &par);
 		if (par.data && par.size) {
-			sprintf(range_buf, "Content-Length: %d\r\n", par.size);
-			strcat(sHTTP, range_buf);
+			sprintf(range_buf, "%d", par.size);
+			PUSH_HDR("Content-Length", range_buf);
 		} else {
 			par.data = NULL;
 			par.size = 0;
 		}
 	}
 
-	if (sess->http_read_type!=OTHER) {
-		/*signal we support title streaming*/
-//		if (!strcmp(sess->remote_path, "/")) strcat(sHTTP, "icy-metadata:1\r\n");
+	if (inject_icy) {
 		/* This will force the server to respond with Icy-Metaint */
-		strcat(sHTTP, "Icy-Metadata: 1\r\n");
+		PUSH_HDR("Icy-Metadata", "1");
+	}
+
+	if (sess->http_read_type!=OTHER) {
+		const char *etag=NULL, *last_modif=NULL;
 
 		/*cached headers are not appended in POST*/
-		if (!no_cache && !sess->disable_cache && (GF_OK < gf_cache_append_http_headers( sess->cache_entry, sHTTP)) ) {
+		if (!no_cache && !sess->disable_cache && (GF_OK < gf_cache_get_http_headers( sess->cache_entry, &etag, &last_modif)) ) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("Cache Entry : %p, FAILED to append cache directives.", sess->cache_entry));
 		}
+
+		if (etag) PUSH_HDR("If-None-Match", etag)
+		if (last_modif) PUSH_HDR("If-Modified-Since", last_modif)
+	}
+
+
+	//done gathering headers
+
+	param_string = gf_opts_get_key("core", "query-string");
+
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess) {
+		Bool has_body = GF_FALSE;
+
+		gf_mx_p(sess->mx);
+
+		sess->h2_send_data = NULL;
+		if (par.data && par.size) {
+			has_body = GF_TRUE;
+			sess->h2_send_data = (u8 *) par.data;
+			sess->h2_send_data_len = par.size;
+			sess->h2_is_eos = GF_TRUE;
+		} else if (sess->put_state==1) {
+			has_body = GF_TRUE;
+		}
+
+		e = h2_submit_request(sess, req_name, url, param_string, has_body);
+
+		sess->last_fetch_time = sess->request_start_time = gf_sys_clock_high_res();
+		if (!e)
+			e = h2_session_send(sess);
+
+		//in case we have a body already setup with this request
+		h2_flush_send(sess);
+
+		gf_mx_v(sess->mx);
+
+		sess->h2_is_eos = GF_FALSE;
+		goto req_sent;
+	}
+#endif // GPAC_HAS_HTTP2
+
+	if (param_string) {
+		if (strchr(sess->remote_path, '?')) {
+			sprintf(sHTTP, "%s %s&%s HTTP/1.1\r\nHost: %s\r\n", req_name, url, param_string, sess->server_name);
+		} else {
+			sprintf(sHTTP, "%s %s?%s HTTP/1.1\r\nHost: %s\r\n", req_name, url, param_string, sess->server_name);
+		}
+	} else {
+		sprintf(sHTTP, "%s %s HTTP/1.1\r\nHost: %s\r\n", req_name, url, sess->server_name);
+	}
+
+	//serialize headers
+	count = gf_list_count(sess->headers);
+	for (i=0; i<count; i++) {
+		hdr = gf_list_get(sess->headers, i);
+		strcat(sHTTP, hdr->name);
+		strcat(sHTTP, ": ");
+		strcat(sHTTP, hdr->value);
+		strcat(sHTTP, "\r\n");
 	}
 
 	strcat(sHTTP, "\r\n");
@@ -2983,7 +4701,7 @@
 			}
 		}
 
-		sess->request_start_time = gf_sys_clock_high_res();
+		sess->last_fetch_time = sess->request_start_time = gf_sys_clock_high_res();
 		sess->req_hdr_size = len+par.size;
 
 #ifdef GPAC_HAS_SSL
@@ -2998,7 +4716,7 @@
 	} else {
 		u32 len = (u32) strlen(sHTTP);
 
-		sess->request_start_time = gf_sys_clock_high_res();
+		sess->last_fetch_time = sess->request_start_time = gf_sys_clock_high_res();
 		sess->req_hdr_size = len;
 
 #ifdef GPAC_HAS_SSL
@@ -3017,6 +4735,12 @@
 #endif
 	}
 
+
+#ifdef GPAC_HAS_HTTP2
+req_sent:
+#endif
+	gf_dm_sess_clear_headers(sess);
+
 	if (e) {
 		sess->status = GF_NETIO_STATE_ERROR;
 		sess->last_error = e;
@@ -3046,7 +4770,7 @@
 	u32 buf_size = sess->dm ? sess->dm->read_buf_size : GF_DOWNLOAD_BUFFER_SIZE;
 
 	while (1) {
-		u32 remaining_data_size, size=0;
+		u32 prev_remaining_data_size, size=0, rewrite_size=0;
 		if (sess->status>=GF_NETIO_DISCONNECTED)
 			return GF_REMOTE_SERVICE_ERROR;
 
@@ -3066,13 +4790,13 @@
 			memcpy(sHTTP, sess->remaining_data, sess->remaining_data_size);
 		}
 		e = gf_dm_read_data(sess, sHTTP + sess->remaining_data_size, buf_size - sess->remaining_data_size, &size);
-		if (e!= GF_IP_CONNECTION_CLOSED && (!size || e == GF_IP_NETWORK_EMPTY)) {
-			if (e == GF_IP_CONNECTION_CLOSED || (!sess->total_size && !sess->chunked && (gf_sys_clock_high_res() - sess->start_time > 5000000))) {
+		if ((e != GF_IP_CONNECTION_CLOSED) && (!size || e == GF_IP_NETWORK_EMPTY)) {
+			if (!sess->total_size && !sess->chunked && (gf_sys_clock_high_res() - sess->start_time > 5000000)) {
 				sess->total_size = sess->bytes_done;
 				gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
 				assert(sess->server_name);
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP] Disconnected from %s: %s\n", sess->server_name, gf_error_to_string(e)));
-				gf_dm_disconnect(sess, (e == GF_IP_CONNECTION_CLOSED) ? GF_TRUE : GF_FALSE);
+				gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 			}
 			return GF_OK;
 		}
@@ -3080,12 +4804,16 @@
 		if (e) {
 			if (sess->sock && (e == GF_IP_CONNECTION_CLOSED)) {
 				u32 len = gf_cache_get_content_length(sess->cache_entry);
-				if (size > 0)
-					gf_dm_data_received(sess, (u8 *) sHTTP, size, GF_FALSE, NULL, NULL);
-				if ( ( (len == 0) && sess->use_cache_file)
-				 /*ivica patch*/
-				 || (size==0)
-				 ) {
+				if (size > 0) {
+#ifdef GPAC_HAS_HTTP2
+					if (sess->h2_sess) {
+						h2_flush_data(sess, GF_FALSE);
+					} else
+#endif
+						gf_dm_data_received(sess, (u8 *) sHTTP, size, GF_FALSE, NULL, NULL);
+				}
+
+				if ( ( (len == 0) && sess->use_cache_file) || sess->bytes_done) {
 					sess->total_size = sess->bytes_done;
 					// HTTP 1.1 without content length...
 					gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
@@ -3096,18 +4824,29 @@
 					e = GF_OK;
 				}
 			}
-			gf_dm_disconnect(sess, GF_TRUE);
+			gf_dm_disconnect(sess, HTTP_CLOSE);
 			sess->last_error = e;
 			gf_dm_sess_notify_state(sess, sess->status, e);
 			return e;
 		}
 
-		remaining_data_size = sess->remaining_data_size;
+		prev_remaining_data_size = sess->remaining_data_size;
 		sess->remaining_data_size = 0;
 
-		sHTTP[size + remaining_data_size] = 0;
+		sHTTP[size + prev_remaining_data_size] = 0;
+
+#ifdef GPAC_HAS_HTTP2
+		if (sess->h2_sess) {
+			h2_flush_data(sess, GF_FALSE);
+			if (sess->h2_data_done)
+				sess->status = GF_NETIO_DATA_TRANSFERED;
+		} else
+#endif
+			gf_dm_data_received(sess, (u8 *) sHTTP, size + prev_remaining_data_size, GF_FALSE, &rewrite_size, NULL);
+
+		if (sess->chunked)
+			gf_dm_sess_estimate_chunk_rate(sess, rewrite_size);
 
-		gf_dm_data_received(sess, (u8 *) sHTTP, size + remaining_data_size, GF_FALSE, NULL, NULL);
 
 		/*socket empty*/
 		if (size < buf_size) {
@@ -3145,6 +4884,19 @@
 	}
 }
 
+static u32 http_parse_method(const char *comp)
+{
+	if (!strcmp(comp, "GET")) return GF_HTTP_GET;
+	else if (!strcmp(comp, "HEAD")) return GF_HTTP_HEAD;
+	else if (!strcmp(comp, "OPTIONS")) return GF_HTTP_OPTIONS;
+	else if (!strcmp(comp, "PUT")) return GF_HTTP_PUT;
+	else if (!strcmp(comp, "POST")) return GF_HTTP_POST;
+	else if (!strcmp(comp, "DELETE")) return GF_HTTP_DELETE;
+	else if (!strcmp(comp, "CONNECT")) return GF_HTTP_CONNECT;
+	else if (!strcmp(comp, "TRACE")) return GF_HTTP_TRACE;
+	else return 0;
+}
+
 /*!
 * Waits for the response HEADERS, parse the information... and so on
 \param sess The session
@@ -3157,13 +4909,18 @@
 	u32 res, i, buf_size;
 	s32 LinePos, Pos;
 	u32 method=0;
-	u32 rsp_code, ContentLength, first_byte, last_byte, total_size, range, no_range;
+	u32 rsp_code=0, ContentLength, first_byte, last_byte, total_size, range, no_range;
 	Bool connection_closed = GF_FALSE;
+	Bool connection_keep_alive = GF_FALSE;
+	u32 connection_timeout=0;
 	char buf[1025];
 	char comp[400];
 	GF_Err e;
 	char * new_location;
 	const char * mime_type;
+#ifdef GPAC_HAS_HTTP2
+	Bool upgrade_to_http2 = GF_FALSE;
+#endif
 
 
 	if (sess->server_mode) {
@@ -3186,7 +4943,7 @@
 		par.msg_type = GF_NETIO_DATA_TRANSFERED;
 		par.error = GF_OK;
 		gf_dm_sess_user_io(sess, &par);
-		gf_dm_disconnect(sess, GF_FALSE);
+		gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 		return GF_OK;
 	}
 
@@ -3196,26 +4953,61 @@
 	sess->start_time = gf_sys_clock_high_res();
 	sess->start_time_utc = gf_net_get_utc();
 	sess->chunked = GF_FALSE;
-	sess->chunk_run_time = 0;
 	sess->last_chunk_found = GF_FALSE;
+
+	sess->last_chunk_start_time = sess->request_start_time;
+	sess->chunk_bytes = 0;
+	sess->cumulated_chunk_rate = 0;
+
 //	gf_sk_reset(sess->sock);
 	sHTTP[0] = 0;
 
 	while (1) {
 		e = gf_dm_read_data(sess, sHTTP + bytesRead, buf_size - bytesRead, &res);
+
+#ifdef GPAC_HAS_HTTP2
+		/* break as soon as we have a header frame*/
+		if (sess->h2_headers_seen) {
+			sess->h2_headers_seen = 0;
+			res = 0;
+			bytesRead = 0;
+			BodyStart = 0;
+			e = GF_OK;
+			break;
+		}
+#endif
+
 		switch (e) {
 		case GF_IP_NETWORK_EMPTY:
 			if (!bytesRead) {
 				e = gf_sk_probe(sess->sock);
-				if ((e==GF_IP_CONNECTION_CLOSED) || (gf_sys_clock_high_res() - sess->request_start_time > 1000 * sess->request_timeout)
-				) {
-					sess->last_error = (e==GF_IP_CONNECTION_CLOSED) ? e : GF_IP_NETWORK_EMPTY;
+
+				if (e==GF_IP_CONNECTION_CLOSED) {
+					sess->last_error = GF_IP_CONNECTION_CLOSED;
+					sess_connection_closed(sess);
 					sess->status = GF_NETIO_STATE_ERROR;
 					return GF_IP_NETWORK_EMPTY;
 				}
-				assert(res==0);
+				if (!sess->server_mode && (gf_sys_clock_high_res() - sess->request_start_time > 1000 * sess->request_timeout)) {
+					sess->last_error = GF_IP_NETWORK_FAILURE;
+					sess->status = GF_NETIO_STATE_ERROR;
+					return GF_IP_NETWORK_FAILURE;
+				}
+				if (sess->server_mode)
+					sess->last_error = GF_IP_NETWORK_EMPTY;
 				return GF_OK;
 			}
+			if (sess->status==GF_NETIO_STATE_ERROR)
+				return sess->last_error;
+			if (!res && sess->status<=GF_NETIO_CONNECTED)
+				return GF_OK;
+
+#ifdef GPAC_HAS_HTTP2
+			//we may have received bytes (bytesRead>0) yet none for this session, return GF_IP_NETWORK_EMPTY if empty
+			if (sess->h2_sess)
+				return GF_IP_NETWORK_EMPTY;
+#endif
+
 			continue;
 		/*socket has been closed while configuring, retry (not sure if the server got the GET)*/
 		case GF_IP_CONNECTION_CLOSED:
@@ -3225,12 +5017,13 @@
 			}
 			if (sess->server_mode) {
 				sess->last_error = GF_IP_CONNECTION_CLOSED;
+				sess_connection_closed(sess);
 				sess->status = GF_NETIO_DISCONNECTED;
 				GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] Connection closed by client\n", sess->remote_path));
 				return GF_IP_CONNECTION_CLOSED;
 			}
 			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] Connection closed by server when processing %s - retrying\n", sess->remote_path));
-			gf_dm_disconnect(sess, GF_TRUE);
+			gf_dm_disconnect(sess, HTTP_RESET_CONN);
 
 			if (sess->num_retry)
 				sess->status = GF_NETIO_SETUP;
@@ -3248,6 +5041,23 @@
 		}
 		bytesRead += res;
 
+#ifdef GPAC_HAS_HTTP2
+		//in case we got a refused stream
+		if (sess->status==GF_NETIO_SETUP) {
+			return GF_OK;
+		}
+		if (sess->h2_sess)
+			continue;
+#endif
+
+		//HTTP1.1 only
+
+		//weird bug on some servers sending twice the last chunk
+		if (bytesRead && !strncmp(sHTTP, "0\r\n\r\n", 5) ) {
+			bytesRead -= res;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP] End of chunk found while waiting server response when processing %s - retrying\n", sess->remote_path));
+		}
+
 		/*locate body start*/
 		BodyStart = gf_token_find(sHTTP, 0, bytesRead, "\r\n\r\n");
 		if (BodyStart > 0) {
@@ -3260,121 +5070,128 @@
 			break;
 		}
 	}
-	if (bytesRead < 0) {
-		e = GF_REMOTE_SERVICE_ERROR;
-		goto exit;
-	}
-	if (!BodyStart)
-		BodyStart = bytesRead;
 
-	sHTTP[BodyStart-1] = 0;
-	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] %s\n\n", sHTTP));
+	no_range = range = ContentLength = first_byte = last_byte = total_size = rsp_code = 0;
 
-	sess->reply_time = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
-	sess->rsp_hdr_size = BodyStart;
-
-	LinePos = gf_token_get_line(sHTTP, 0, bytesRead, buf, 1024);
-	Pos = gf_token_get(buf, 0, " \t\r\n", comp, 400);
-
-	if (sess->server_mode) {
-		if (!strcmp(comp, "GET")) method = GF_HTTP_GET;
-		else if (!strcmp(comp, "HEAD")) method = GF_HTTP_HEAD;
-		else if (!strcmp(comp, "OPTIONS")) method = GF_HTTP_OPTIONS;
-		else if (!strcmp(comp, "PUT")) method = GF_HTTP_PUT;
-		else if (!strcmp(comp, "POST")) method = GF_HTTP_POST;
-		else if (!strcmp(comp, "DELETE"))
-			method = GF_HTTP_DELETE;
-		else if (!strcmp(comp, "CONNECT")) method = GF_HTTP_CONNECT;
-		else if (!strcmp(comp, "TRACE")) method = GF_HTTP_TRACE;
-		else method = 0;
-
-		Pos = gf_token_get(buf, Pos, " \t\r\n", comp, 400);
-		if (sess->orig_url) gf_free(sess->orig_url);
-		sess->orig_url = gf_strdup(comp);
-		/*Pos = */gf_token_get(buf, Pos, " \t\r\n", comp, 400);
-		if ((strncmp("HTTP", comp, 4) != 0)) {
+#ifdef GPAC_HAS_HTTP2
+	if (!sess->h2_sess) {
+#endif
+		if (bytesRead < 0) {
 			e = GF_REMOTE_SERVICE_ERROR;
 			goto exit;
 		}
-		//flush potential body except for PUT/POST
-		if ((method==GF_HTTP_PUT) || (method==GF_HTTP_POST))
-			rsp_code = 200;
-		else
-			rsp_code = 300;
-	} else {
 
-		if (!strncmp("ICY", comp, 3)) {
-			sess->use_cache_file = GF_FALSE;
-			/*be prepared not to receive any mime type from ShoutCast servers*/
-			if (!gf_cache_get_mime_type(sess->cache_entry))
-				gf_cache_set_mime_type(sess->cache_entry, "audio/mpeg");
-		} else if ((strncmp("HTTP", comp, 4) != 0)) {
-			e = GF_REMOTE_SERVICE_ERROR;
-			goto exit;
-		}
-		Pos = gf_token_get(buf, Pos, " ", comp, 400);
-		if (Pos <= 0) {
-			e = GF_REMOTE_SERVICE_ERROR;
-			goto exit;
-		}
-		rsp_code = (u32) atoi(comp);
-		/*Pos = */gf_token_get(buf, Pos, " \r\n", comp, 400);
+		if (!BodyStart)
+			BodyStart = bytesRead;
 
-	}
+		sHTTP[BodyStart-1] = 0;
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] %s\n\n", sHTTP));
 
-	no_range = range = ContentLength = first_byte = last_byte = total_size = 0;
-	/* parse headers*/
-	while (1) {
-		GF_HTTPHeader *hdrp;
-		char *sep, *hdr_sep, *hdr, *hdr_val;
-		if ( (s32) LinePos + 4 > BodyStart) break;
-		LinePos = gf_token_get_line(sHTTP, LinePos , bytesRead, buf, 1024);
-		if (LinePos < 0) break;
-
-		hdr_sep = NULL;
-		hdr_val = NULL;
-		hdr = buf;
-		sep = strchr(buf, ':');
-		if (sep) {
-			sep[0]=0;
-			hdr_val = sep+1;
-			while (hdr_val[0]==' ') hdr_val++;
-			hdr_sep = strrchr(hdr_val, '\r');
-			if (hdr_sep) hdr_sep[0] = 0;
-		}
-
-		GF_SAFEALLOC(hdrp, GF_HTTPHeader);
-		if (hdrp) {
-			hdrp->name = gf_strdup(hdr);
-			hdrp->value = gf_strdup(hdr_val);
-			gf_list_add(sess->headers, hdrp);
-		}
+		sess->reply_time = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
+		sess->rsp_hdr_size = BodyStart;
 
-		if (sep) sep[0]=':';
-		if (hdr_sep) hdr_sep[0] = '\r';
+		LinePos = gf_token_get_line(sHTTP, 0, bytesRead, buf, 1024);
+		Pos = gf_token_get(buf, 0, " \t\r\n", comp, 400);
 
+		//TODO for HTTP2
 		if (sess->server_mode) {
-			if (!stricmp(hdrp->name, "Transfer-Encoding") && !stricmp(hdrp->value, "chunked"))
-				sess->chunked = GF_TRUE;
+			method = http_parse_method(comp);
+
+			Pos = gf_token_get(buf, Pos, " \t\r\n", comp, 400);
+			if (sess->orig_url) gf_free(sess->orig_url);
+			sess->orig_url = gf_strdup(comp);
+			/*Pos = */gf_token_get(buf, Pos, " \t\r\n", comp, 400);
+			if ((strncmp("HTTP", comp, 4) != 0)) {
+				e = GF_REMOTE_SERVICE_ERROR;
+				goto exit;
+			}
+			//flush potential body except for PUT/POST
+			if ((method==GF_HTTP_PUT) || (method==GF_HTTP_POST))
+				rsp_code = 200;
+			else
+				rsp_code = 300;
+		} else {
+
+			if (!strncmp("ICY", comp, 3)) {
+				sess->use_cache_file = GF_FALSE;
+				/*be prepared not to receive any mime type from ShoutCast servers*/
+				if (!gf_cache_get_mime_type(sess->cache_entry))
+					gf_cache_set_mime_type(sess->cache_entry, "audio/mpeg");
+			} else if ((strncmp("HTTP", comp, 4) != 0)) {
+				e = GF_REMOTE_SERVICE_ERROR;
+				goto exit;
+			}
+			Pos = gf_token_get(buf, Pos, " ", comp, 400);
+			if (Pos <= 0) {
+				e = GF_REMOTE_SERVICE_ERROR;
+				goto exit;
+			}
+			rsp_code = (u32) atoi(comp);
+			/*Pos = */gf_token_get(buf, Pos, " \r\n", comp, 400);
+
 		}
+
+		/* parse headers*/
+		while (1) {
+			GF_HTTPHeader *hdrp;
+			char *sep, *hdr_sep, *hdr, *hdr_val;
+			if ( (s32) LinePos + 4 > BodyStart) break;
+			LinePos = gf_token_get_line(sHTTP, LinePos , bytesRead, buf, 1024);
+			if (LinePos < 0) break;
+
+			hdr_sep = NULL;
+			hdr_val = NULL;
+			hdr = buf;
+			sep = strchr(buf, ':');
+			if (sep) {
+				sep[0]=0;
+				hdr_val = sep+1;
+				while (hdr_val[0]==' ') hdr_val++;
+				hdr_sep = strrchr(hdr_val, '\r');
+				if (hdr_sep) hdr_sep[0] = 0;
+			}
+
+			GF_SAFEALLOC(hdrp, GF_HTTPHeader);
+			if (hdrp) {
+				hdrp->name = gf_strdup(hdr);
+				hdrp->value = gf_strdup(hdr_val);
+				gf_list_add(sess->headers, hdrp);
+			}
+
+			if (sep) sep[0]=':';
+			if (hdr_sep) hdr_sep[0] = '\r';
+
+			if (sess->server_mode) {
+				if (!stricmp(hdrp->name, "Transfer-Encoding") && !stricmp(hdrp->value, "chunked"))
+					sess->chunked = GF_TRUE;
+			}
+		}
+
+#ifdef GPAC_HAS_HTTP2
 	}
+#endif
 
 	if (!sess->server_mode) {
 		Bool cache_no_store = GF_FALSE;
 		//default pre-processing of headers - needs cleanup, not all of these have to be parsed before checking reply code
 		for (i=0; i<gf_list_count(sess->headers); i++) {
 			char *val;
-			GF_HTTPHeader *hdrp = (GF_HTTPHeader*)gf_list_get(sess->headers, i);
+			GF_HTTPHeader *hdr = (GF_HTTPHeader*)gf_list_get(sess->headers, i);
 
-			if (!stricmp(hdrp->name, "Content-Length") ) {
-				ContentLength = (u32) atoi(hdrp->value);
+#ifdef GPAC_HAS_HTTP2
+			if (!stricmp(hdr->name, ":status") ) {
+				rsp_code = (u32) atoi(hdr->value);
+			} else
+#endif
+			if (!stricmp(hdr->name, "Content-Length") ) {
+				ContentLength = (u32) atoi(hdr->value);
 
 				if ((rsp_code<300) && sess->cache_entry)
 					gf_cache_set_content_length(sess->cache_entry, ContentLength);
 
 			}
-			else if (!stricmp(hdrp->name, "Content-Type")) {
-				char *mime = gf_strdup(hdrp->value);
+			else if (!stricmp(hdr->name, "Content-Type")) {
+				char *mime = gf_strdup(hdr->value);
 				while (1) {
 					u32 len = (u32) strlen(mime);
 					char c = len ? mime[len-1] : 0;
@@ -3398,9 +5215,9 @@
 				}
 				if (mime) gf_free(mime);
 			}
-			else if (!stricmp(hdrp->name, "Content-Range")) {
-				if (!strncmp(hdrp->value, "bytes", 5)) {
-					val = hdrp->value + 5;
+			else if (!stricmp(hdr->name, "Content-Range")) {
+				if (!strnicmp(hdr->value, "bytes", 5)) {
+					val = hdr->value + 5;
 					if (val[0] == ':') val += 1;
 					while (val[0] == ' ') val += 1;
 
@@ -3411,50 +5228,78 @@
 					}
 				}
 			}
-			else if (!stricmp(hdrp->name, "Accept-Ranges")) {
-				if (strstr(hdrp->value, "none")) no_range = 1;
+			else if (!stricmp(hdr->name, "Accept-Ranges")) {
+				if (strstr(hdr->value, "none")) no_range = 1;
 			}
-			else if (!stricmp(hdrp->name, "Location"))
-				new_location = gf_strdup(hdrp->value);
-			else if (!strnicmp(hdrp->name, "ice", 3) || !strnicmp(hdrp->name, "icy", 3) ) {
+			else if (!stricmp(hdr->name, "Location"))
+				new_location = gf_strdup(hdr->value);
+			else if (!strnicmp(hdr->name, "ice", 3) || !strnicmp(hdr->name, "icy", 3) ) {
 				/* For HTTP icy servers, we disable cache */
 				if (sess->icy_metaint == 0)
 					sess->icy_metaint = -1;
 				sess->use_cache_file = GF_FALSE;
-				if (!stricmp(hdrp->name, "icy-metaint")) {
-					sess->icy_metaint = atoi(hdrp->value);
+				if (!stricmp(hdr->name, "icy-metaint")) {
+					sess->icy_metaint = atoi(hdr->value);
 				}
 			}
-			else if (!stricmp(hdrp->name, "Cache-Control")) {
-				if (strstr(hdrp->value, "no-store")) {
+			else if (!stricmp(hdr->name, "Cache-Control")) {
+				if (strstr(hdr->value, "no-store")) {
 					cache_no_store = GF_TRUE;
 				}
 			}
-			else if (!stricmp(hdrp->name, "ETag")) {
+			else if (!stricmp(hdr->name, "ETag")) {
 				if (rsp_code<300)
-					gf_cache_set_etag_on_server(sess->cache_entry, hdrp->value);
+					gf_cache_set_etag_on_server(sess->cache_entry, hdr->value);
 			}
-			else if (!stricmp(hdrp->name, "Last-Modified")) {
+			else if (!stricmp(hdr->name, "Last-Modified")) {
 				if (rsp_code<300)
-					gf_cache_set_last_modified_on_server(sess->cache_entry, hdrp->value);
+					gf_cache_set_last_modified_on_server(sess->cache_entry, hdr->value);
 			}
-			else if (!stricmp(hdrp->name, "Transfer-Encoding")) {
-				if (!stricmp(hdrp->value, "chunked"))
+			else if (!stricmp(hdr->name, "Transfer-Encoding")) {
+				if (!stricmp(hdr->value, "chunked"))
 					sess->chunked = GF_TRUE;
 			}
-			else if (!stricmp(hdrp->name, "X-UserProfileID") ) {
-				gf_opts_set_key("core", "user-profileid", hdrp->value);
+			else if (!stricmp(hdr->name, "X-UserProfileID") ) {
+				gf_opts_set_key("core", "user-profileid", hdr->value);
 			}
-			else if (!stricmp(hdrp->name, "Connection") ) {
-				if (strstr(hdrp->value, "close"))
+			else if (!stricmp(hdr->name, "Connection") ) {
+				if (strstr(hdr->value, "close"))
 					connection_closed = GF_TRUE;
+				else if (strstr(hdr->value, "Keep-Alive"))
+					connection_keep_alive = GF_TRUE;
 			}
+			else if (!stricmp(hdr->name, "Keep-Alive") ) {
+				char *tout = strstr(hdr->value, "timeout=");
+				if (tout) {
+					char c=0;
+					s32 end = gf_token_find(tout, 0, (u32) strlen(tout), ", ");
+					if (end>=0) {
+						c = tout[end];
+						tout[end] = 0;
+					}
+					connection_timeout = atoi(tout+8);
+					if (end>=0) tout[end] = c;
+				}
+				if (strstr(hdr->value, "close"))
+					connection_closed = GF_TRUE;
+			}
+#ifdef GPAC_HAS_HTTP2
+			else if (!stricmp(hdr->name, "Upgrade") ) {
+				if (!sess->dm->disable_http2 && !gf_opts_get_bool("core", "no-h2c") && !strncmp(hdr->value,"h2c", 3)) {
+					upgrade_to_http2 = GF_TRUE;
+				}
+			}
+#endif
 
 			if (sess->status==GF_NETIO_DISCONNECTED) return GF_OK;
 		}
 
 		if (cache_no_store) {
-			if (sess->cache_entry && !ContentLength && (rsp_code<300) ) {
+			if (sess->cache_entry && !ContentLength && !sess->chunked && (rsp_code<300)
+#ifdef GPAC_HAS_HTTP2
+				&& !sess->h2_sess
+#endif
+			) {
 				sess->use_cache_file = GF_FALSE;
 				gf_cache_remove_session_from_cache_entry(sess->cache_entry, sess);
 				sess->cache_entry = NULL;
@@ -3465,6 +5310,16 @@
 
 
 		gf_cache_set_headers_processed(sess->cache_entry);
+
+		if (connection_keep_alive
+			&& !gf_opts_get_bool("core", "no-timeout")
+			&& !sess->server_mode
+#ifdef GPAC_HAS_HTTP2
+			&& !sess->h2_sess
+#endif
+		) {
+			sess->connection_timeout_ms = connection_timeout*1000;
+		}
 	}
 
 	par.msg_type = GF_NETIO_PARSE_REPLY;
@@ -3477,9 +5332,52 @@
 	if (sess->creds && rsp_code != 304)
 		sess->creds->valid = GF_TRUE;
 
+#ifdef GPAC_HAS_HTTP2
+	if ((rsp_code == 101) && upgrade_to_http2) {
+		int rv;
+		u8 settings[HTTP2_BUFFER_SETTINGS_SIZE];
+		u32 settings_len;
+
+		nghttp2_settings_entry h2_settings[2] = {
+			{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100},
+			{NGHTTP2_SETTINGS_ENABLE_PUSH, 0}
+		};
+		settings_len = (u32) nghttp2_pack_settings_payload(settings, HTTP2_BUFFER_SETTINGS_SIZE, h2_settings, GF_ARRAY_LENGTH(h2_settings));
+
+		h2_initialize_session(sess);
+		sess->h2_stream_id = 1;
+		rv = nghttp2_session_upgrade2(sess->h2_sess->ng_sess, settings, settings_len, (sess->http_read_type==1) ? 1 : 0, sess);
+		if (rv < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP/2] nghttp2_session_upgrade2 error: %s\n", nghttp2_strerror(rv)));
+			return GF_IP_NETWORK_FAILURE;
+		}
+		//push the body
+		if (bytesRead > BodyStart) {
+			rv = (int) nghttp2_session_mem_recv(sess->h2_sess->ng_sess, sHTTP + BodyStart , bytesRead - BodyStart);
+			if (rv < 0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP/2] nghttp2_session_mem_recv error: %s\n", nghttp2_strerror(rv)));
+				return GF_IP_NETWORK_FAILURE;
+			}
+			//stay in WAIT_FOR_REPLY state and do not flush data, cache is not fully configured yet
+		}
+		//send pending frames
+		e = h2_session_send(sess);
+		if (e) return e;
+		sess->connection_close = GF_FALSE;
+		sess->h2_upgrade_state = 0;
+		return GF_OK;
+	}
+	if (sess->h2_upgrade_state)
+		sess->h2_upgrade_state = 2;
+#endif
+
 
 	/*try to flush body */
-	if (rsp_code>=300) {
+	if ((rsp_code>=300)
+#ifdef GPAC_HAS_HTTP2
+		&& !sess->h2_sess
+#endif
+	) {
 		u32 start = gf_sys_clock();
 		while (BodyStart + ContentLength > (u32) bytesRead) {
 			e = gf_dm_read_data(sess, sHTTP + bytesRead, buf_size - bytesRead, &res);
@@ -3507,17 +5405,63 @@
 			sess->connection_close = GF_TRUE;
 		}
 	}
+
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess) {
+		u32 count = gf_list_count(sess->headers);
+		for (i=0; i<count; i++) {
+			GF_HTTPHeader *hdr = gf_list_get(sess->headers, i);
+			if (!stricmp(hdr->name, ":method")) {
+				method = http_parse_method(hdr->value);
+				rsp_code = 200;
+			}
+			else if (!stricmp(hdr->name, ":path")) {
+				if (sess->orig_url) gf_free(sess->orig_url);
+				sess->orig_url = gf_strdup(hdr->value);
+			}
+		}
+	} else if (sess->server_mode && !gf_opts_get_bool("core", "no-h2") && !gf_opts_get_bool("core", "no-h2c")) {
+		Bool is_upgradeable = GF_FALSE;
+		char *h2_settings = NULL;
+		u32 count = gf_list_count(sess->headers);
+		for (i=0; i<count; i++) {
+			GF_HTTPHeader *hdr = gf_list_get(sess->headers, i);
+			if (!stricmp(hdr->name, "Upgrade")) {
+				if (strstr(hdr->value, "h2c"))
+					is_upgradeable = GF_TRUE;
+			}
+			else if (!stricmp(hdr->name, "HTTP2-Settings")) {
+				h2_settings = hdr->value;
+			}
+		}
+
+		if (is_upgradeable && h2_settings) {
+			u32 len = (u32) strlen(h2_settings);
+			sess->h2_upgrade_settings = gf_malloc(sizeof(char) * len * 2);
+			sess->h2_upgrade_settings_len = gf_base64_decode(h2_settings, len, sess->h2_upgrade_settings, len*2);
+		}
+	}
+#endif
+
+
 	if (sess->server_mode) {
 		if (ContentLength) {
 			par.data = sHTTP + BodyStart;
 			par.size = ContentLength;
-		} else if (BodyStart < (s32) bytesRead) {
+		} else if ((BodyStart < (s32) bytesRead)
+#ifdef GPAC_HAS_HTTP2
+			&& !sess->h2_sess
+#endif
+		) {
 			if (sess->init_data) gf_free(sess->init_data);
 			sess->init_data_size = 0;
 			sess->init_data = NULL;
 
 			gf_dm_data_received(sess, (u8 *) sHTTP + BodyStart, bytesRead - BodyStart, GF_TRUE, NULL, NULL);
 		}
+
+		sess->request_start_time = gf_sys_clock_high_res();
+
 		par.reply = method;
 		gf_dm_sess_user_io(sess, &par);
 		sess->status = GF_NETIO_DATA_TRANSFERED;
@@ -3525,8 +5469,12 @@
 	}
 	//remember if we can keep the session alive after the transfer is done
 	sess->connection_close = connection_closed;
+	assert(rsp_code);
 
 	switch (rsp_code) {
+	//100 continue
+	case 100:
+		break;
 	case 200:
 	case 201:
 	case 202:
@@ -3542,6 +5490,7 @@
 	/*redirection: extract the new location*/
 	case 301:
 	case 302:
+	case 303:
 	case 307:
 		if (!new_location || !strlen(new_location) ) {
 			gf_dm_sess_user_io(sess, &par);
@@ -3554,7 +5503,7 @@
 			new_location[strlen(new_location)-1] = 0;
 
 		/*reset and reconnect*/
-		gf_dm_disconnect(sess, GF_TRUE);
+		gf_dm_disconnect(sess, HTTP_CLOSE);
 		sess->status = GF_NETIO_SETUP;
 		e = gf_dm_sess_setup_from_url(sess, new_location, GF_FALSE);
 		if (e) {
@@ -3572,7 +5521,7 @@
 
 		gf_dm_sess_notify_state(sess, GF_NETIO_PARSE_REPLY, GF_OK);
 
-		gf_dm_disconnect(sess, GF_FALSE);
+		gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 		if (sess->user_proc) {
 			/* For modules that do not use cache and have problems with GF_NETIO_DATA_TRANSFERED ... */
 			const char * filename;
@@ -3584,7 +5533,7 @@
 			if (!f) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] FAILED to open cache file %s for reading contents !\n", filename));
 				/* Ooops, no cache, redowload everything ! */
-				gf_dm_disconnect(sess, GF_FALSE);
+				gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 				sess->status = GF_NETIO_SETUP;
 				e = gf_dm_sess_setup_from_url(sess, sess->orig_url, GF_FALSE);
 				sess->total_size = gf_cache_get_cache_filesize(sess->cache_entry);
@@ -3629,7 +5578,7 @@
 		sess->status = GF_NETIO_DATA_TRANSFERED;
 		par.error = GF_OK;
 		gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-		gf_dm_disconnect(sess, GF_FALSE);
+		gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 		return GF_OK;
 	}
 	case 401:
@@ -3638,7 +5587,7 @@
 		sess->creds = gf_user_credentials_register(sess->dm, sess->server_name, NULL, NULL, GF_FALSE);
 		if (!sess->creds) {
 			/* User credentials have not been filled properly, we have to abort */
-			gf_dm_disconnect(sess, GF_TRUE);
+			gf_dm_disconnect(sess, HTTP_CLOSE);
 			sess->status = GF_NETIO_STATE_ERROR;
 			par.error = GF_AUTHENTICATION_FAILURE;
 			par.msg_type = GF_NETIO_DISCONNECTED;
@@ -3647,7 +5596,7 @@
 			sess->last_error = e;
 			goto exit;
 		}
-		gf_dm_disconnect(sess, GF_FALSE);
+		gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 		sess->status = GF_NETIO_SETUP;
 		e = gf_dm_sess_setup_from_url(sess, sess->orig_url, GF_FALSE);
 		if (e) {
@@ -3667,23 +5616,23 @@
 		notify_headers(sess, sHTTP, bytesRead, BodyStart);
 		e = GF_URL_ERROR;
 		goto exit;
-		break;
-	case 416:
+
+ case 416:
 		/* Range not accepted */
 		gf_dm_sess_user_io(sess, &par);
 
 		notify_headers(sess, sHTTP, bytesRead, BodyStart);
 		e = GF_SERVICE_ERROR;
 		goto exit;
-		break;
-	case 400:
+
+ case 400:
 	case 501:
 		/* Method not implemented ! */
 		if (sess->http_read_type == HEAD) {
 			/* Since HEAD is not understood by this server, we use a GET instead */
 			sess->http_read_type = GET;
 			sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
-			gf_dm_disconnect(sess, GF_FALSE);
+			gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 			sess->status = GF_NETIO_SETUP;
 			sess->server_only_understand_get = GF_TRUE;
 			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("Method not supported, try with GET.\n"));
@@ -3705,7 +5654,7 @@
 		/*retry without proxy*/
 		if (sess->proxy_enabled==1) {
 			sess->proxy_enabled=2;
-			gf_dm_disconnect(sess, GF_TRUE);
+			gf_dm_disconnect(sess, HTTP_CLOSE);
 			sess->status = GF_NETIO_SETUP;
 			return GF_OK;
 		}
@@ -3715,6 +5664,13 @@
 		e = GF_EOS;
 		goto exit;
 
+ case 504:
+ /* gateway timeout, notified as URL error */
+ gf_dm_sess_user_io(sess, &par);
+ notify_headers(sess, sHTTP, bytesRead, BodyStart);
+ e = GF_URL_ERROR;
+ goto exit;
+
 	default:
 		gf_dm_sess_user_io(sess, &par);
 		notify_headers(sess, sHTTP, bytesRead, BodyStart);
@@ -3728,12 +5684,10 @@
 		sess->use_cache_file = GF_FALSE;
 
 	if (sess->http_read_type==HEAD) {
-		gf_dm_disconnect(sess, GF_FALSE);
+		gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 		gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
 		sess->http_read_type = GET;
 		return GF_OK;
-
-
 	}
 
 
@@ -3752,6 +5706,12 @@
 	}
 #endif
 
+	//in HTTP2 we may resume to setup state if we got a refused stream
+	if (sess->status == GF_NETIO_SETUP) {
+		return GF_OK;
+	}
+
+
 	/*some servers may reply without content length, but we MUST have it*/
 	if (e) goto exit;
 	if (sess->icy_metaint != 0) {
@@ -3763,7 +5723,11 @@
 		sess->icy_bytes = 0;
 		sess->total_size = SIZE_IN_STREAM;
 		sess->status = GF_NETIO_DATA_EXCHANGE;
-	} else if (!ContentLength && !sess->chunked) {
+	} else if (!ContentLength && !sess->chunked
+#ifdef GPAC_HAS_HTTP2
+		&& !sess->h2_sess
+#endif
+	) {
 		if (sess->http_read_type == GET) {
 			sess->total_size = SIZE_IN_STREAM;
 			sess->use_cache_file = GF_FALSE;
@@ -3771,9 +5735,15 @@
 			sess->bytes_done = 0;
 		} else {
 			gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-			gf_dm_disconnect(sess, GF_FALSE);
+			gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 			return GF_OK;
 		}
+#ifdef GPAC_HAS_HTTP2
+	} else if (sess->h2_sess && !ContentLength && (sess->http_read_type != GET)) {
+		gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
+		gf_dm_disconnect(sess, HTTP_NO_CLOSE);
+		return GF_OK;
+#endif
 	} else {
 		sess->total_size = ContentLength;
 		if (sess->use_cache_file && sess->http_read_type == GET ) {
@@ -3789,24 +5759,33 @@
 
 
 	/* we may have existing data in this buffer ... */
+#ifdef GPAC_HAS_HTTP2
+	if (!e && sess->h2_sess) {
+		h2_flush_data(sess, GF_TRUE);
+	} else
+#endif
 	if (!e && (BodyStart < (s32) bytesRead)) {
+		u32 rewrite_size=0;
 		if (sess->init_data) gf_free(sess->init_data);
 		sess->init_data_size = 0;
 		sess->init_data = NULL;
 
-		gf_dm_data_received(sess, (u8 *) sHTTP + BodyStart, bytesRead - BodyStart, GF_TRUE, NULL, NULL);
+		gf_dm_data_received(sess, (u8 *) sHTTP + BodyStart, bytesRead - BodyStart, GF_TRUE, &rewrite_size, NULL);
+
+		if (sess->chunked)
+			gf_dm_sess_estimate_chunk_rate(sess, rewrite_size);
 	}
 exit:
 	if (e) {
 		if (e<0) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP] Error parsing reply: %s for URL %s\nReply was:\n%s\n", gf_error_to_string(e), sess->orig_url, sHTTP ));
+			GF_LOG((e==GF_URL_ERROR) ? GF_LOG_INFO : GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP] Error parsing reply for URL %s: %s (code %d)\n", sess->orig_url, gf_error_to_string(e), rsp_code ));
 		} else {
 			e = GF_OK;
 		}
 		gf_cache_entry_set_delete_files_when_deleted(sess->cache_entry);
 		gf_dm_remove_cache_entry_from_session(sess);
 		sess->cache_entry = NULL;
-		gf_dm_disconnect(sess, GF_FALSE);
+		gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 		if (connection_closed)
 			sess->status = GF_NETIO_STATE_ERROR;
 		else
@@ -3820,18 +5799,19 @@
 }
 
 /**
- * Default performing behaviour
+ * Default performing behavior
 \param sess The session
 */
 void http_do_requests(GF_DownloadSession *sess)
 {
 	char sHTTP[GF_DOWNLOAD_BUFFER_SIZE+1];
+	sHTTP[0] = 0;
 
 	if (sess->reused_cache_entry) {
 		//main session is done downloading, notify - to do we should send progress events on this session also ...
 		if (!gf_cache_is_in_progress(sess->cache_entry)) {
 			GF_NETIO_Parameter par;
-			gf_dm_disconnect(sess, GF_FALSE);
+			gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 			sess->reused_cache_entry = GF_FALSE;
 			memset(&par, 0, sizeof(GF_NETIO_Parameter));
 			par.msg_type = GF_NETIO_DATA_TRANSFERED;
@@ -4070,7 +6050,8 @@
 */
 GF_Err gf_dm_sess_reset(GF_DownloadSession *sess)
 {
-	if (!sess) return GF_BAD_PARAM;
+	if (!sess)
+		return GF_BAD_PARAM;
 	sess->status = GF_NETIO_SETUP;
 	sess->needs_range = GF_FALSE;
 	sess->range_start = sess->range_end = 0;
@@ -4190,13 +6171,14 @@
 \param sess The session
 \param flags The new flags for the session - if flags is 0xFFFFFFFF, existing flags are not modified
 \param user_io The new callback function
-\param cbk The new user data to ba used in the callback function
+\param cbk The new user data to be used in the callback function
 \param GF_OK or error
 */
 GF_Err gf_dm_sess_reassign(GF_DownloadSession *sess, u32 flags, gf_dm_user_io user_io, void *cbk)
 {
 	/*shall only be called for non-threaded sessions!! */
-	if (sess->th) return GF_BAD_PARAM;
+	if (sess->th)
+		return GF_BAD_PARAM;
 
 	if (flags == 0xFFFFFFFF) {
 		sess->user_proc = user_io;
@@ -4234,7 +6216,8 @@
 		dm->limit_data_rate = rate_in_bits_per_sec/8;
 
 		sprintf(opt, "%d", rate_in_bits_per_sec);
-		gf_opts_set_key("core", "maxrate", opt);
+		//temporary store of maxrate
+		gf_opts_set_key("temp", "maxrate", opt);
 
 		dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
 		//when rate is limited, use smaller smaller read size
@@ -4266,18 +6249,28 @@
 
 	for (i=0; i<count; i++) {
 		GF_DownloadSession *sess = (GF_DownloadSession*)gf_list_get(dm->sessions, i);
-		if (sess->total_size==sess->bytes_done) {
-			if (gf_sys_clock_high_res() - sess->start_time>2000000) {
-				continue;
+		if (sess->status >= GF_NETIO_DATA_TRANSFERED) {
+			if (sess->total_size==sess->bytes_done) {
+				//do not aggregate session if done/interrupted since more than 1/2 a sec
+				if (gf_sys_clock_high_res() - sess->start_time > 500000) {
+					continue;
+				}
 			}
 		}
-		dm_sess_update_download_rate(sess, GF_FALSE);
 		ret += sess->bytes_per_sec;
 	}
 	gf_mx_v(dm->cache_mx);
 	return 8*ret;
 }
 
+Bool gf_dm_sess_is_h2(GF_DownloadSession *sess)
+{
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess) return GF_TRUE;
+#endif
+	return GF_FALSE;
+}
+
 GF_EXPORT
 const char *gf_dm_sess_get_header(GF_DownloadSession *sess, const char *name)
 {
@@ -4286,7 +6279,7 @@
 	count = gf_list_count(sess->headers);
 	for (i=0; i<count; i++) {
 		GF_HTTPHeader *header = (GF_HTTPHeader*)gf_list_get(sess->headers, i);
-		if (!strcmp(header->name, name)) return header->value;
+		if (!stricmp(header->name, name)) return header->value;
 	}
 	return NULL;
 }
@@ -4295,7 +6288,8 @@
 GF_Err gf_dm_sess_enum_headers(GF_DownloadSession *sess, u32 *idx, const char **hdr_name, const char **hdr_val)
 {
 	GF_HTTPHeader *hdr;
-	if( !sess || !idx || !hdr_name || !hdr_val) return GF_BAD_PARAM;
+	if( !sess || !idx || !hdr_name || !hdr_val)
+		return GF_BAD_PARAM;
 	hdr = gf_list_get(sess->headers, *idx);
 	if (!hdr) return GF_EOS;
 	(*idx) = (*idx) + 1;
@@ -4307,7 +6301,8 @@
 GF_EXPORT
 GF_Err gf_dm_sess_get_header_sizes_and_times(GF_DownloadSession *sess, u32 *req_hdr_size, u32 *rsp_hdr_size, u32 *connect_time, u32 *reply_time, u32 *download_time)
 {
-	if (!sess) return GF_BAD_PARAM;
+	if (!sess)
+		return GF_BAD_PARAM;
 
 	if (req_hdr_size) *req_hdr_size = sess->req_hdr_size;
 	if (rsp_hdr_size) *rsp_hdr_size = sess->rsp_hdr_size;
@@ -4318,16 +6313,22 @@
 }
 
 GF_EXPORT
-void gf_dm_sess_force_memory_mode(GF_DownloadSession *sess)
+void gf_dm_sess_force_memory_mode(GF_DownloadSession *sess, u32 force_keep)
 {
-	if (sess) sess->flags |= GF_NETIO_SESSION_MEMORY_CACHE;
+	if (sess) {
+		sess->flags |= GF_NETIO_SESSION_MEMORY_CACHE;
+		if (force_keep==1)
+			sess->flags |= GF_NETIO_SESSION_KEEP_CACHE;
+		else if (force_keep==2)
+			sess->flags |= GF_NETIO_SESSION_KEEP_FIRST_CACHE;
+	}
 }
 
-
 GF_EXPORT
 GF_Err gf_dm_set_localcache_provider(GF_DownloadManager *dm, Bool (*local_cache_url_provider_cbk)(void *udta, char *url, Bool is_cache_destroy), void *lc_udta)
 {
-	if (!dm) return GF_BAD_PARAM;
+	if (!dm)
+		return GF_BAD_PARAM;
 	dm->local_cache_url_provider_cbk = local_cache_url_provider_cbk;
 	dm->lc_udta = lc_udta;
 	return GF_OK;
@@ -4335,13 +6336,14 @@
 }
 
 GF_EXPORT
-const DownloadedCacheEntry gf_dm_add_cache_entry(GF_DownloadManager *dm, const char *szURL, u8 *data, u64 size, u64 start_range, u64 end_range, const char *mime, Bool clone_memory, u32 download_time_ms)
+DownloadedCacheEntry gf_dm_add_cache_entry(GF_DownloadManager *dm, const char *szURL, GF_Blob *blob, u64 start_range, u64 end_range, const char *mime, Bool clone_memory, u32 download_time_ms)
 {
 	u32 i, count;
 	DownloadedCacheEntry the_entry = NULL;
 
 	gf_mx_p(dm->cache_mx );
-	GF_LOG(GF_LOG_INFO, GF_LOG_CACHE, ("[HTTP] Pushing %s to cache\n", szURL));
+	if (blob)
+		GF_LOG(GF_LOG_INFO, GF_LOG_CACHE, ("[HTTP] Pushing %s to cache "LLU" bytes (done %s)\n", szURL, blob->size, (blob->flags & GF_BLOB_IN_TRANSFER) ? "no" : "yes"));
 	count = gf_list_count(dm->cache_entries);
 	for (i = 0 ; i < count; i++) {
 		const char * url;
@@ -4360,16 +6362,20 @@
 		break;
 	}
 	if (!the_entry) {
-		the_entry = gf_cache_create_entry(dm, "", szURL, 0, 0, GF_TRUE);
-		if (!the_entry) return NULL;
+		the_entry = gf_cache_create_entry(dm, "", szURL, 0, 0, GF_TRUE, dm->cache_mx);
+		if (!the_entry) {
+			gf_mx_v(dm->cache_mx );
+			return NULL;
+		}
 		gf_list_add(dm->cache_entries, the_entry);
 	}
 
 	gf_cache_set_mime(the_entry, mime);
-	gf_cache_set_range(the_entry, size, start_range, end_range);
-	gf_cache_set_content(the_entry, data, (u32) size, clone_memory ? GF_TRUE : GF_FALSE);
-	gf_cache_set_downtime(the_entry, download_time_ms);
+	if (blob && ! (blob->flags & GF_BLOB_IN_TRANSFER))
+		gf_cache_set_range(the_entry, blob->size, start_range, end_range);
 
+	gf_cache_set_content(the_entry, blob, clone_memory ? GF_TRUE : GF_FALSE, dm->cache_mx);
+	gf_cache_set_downtime(the_entry, download_time_ms);
 	gf_mx_v(dm->cache_mx );
 	return the_entry;
 }
@@ -4379,7 +6385,8 @@
 {
 	u32 i, count;
 	Bool res;
-	if (!entry) return GF_BAD_PARAM;
+	if (!entry)
+		return GF_BAD_PARAM;
 	gf_mx_p(dm->cache_mx);
 	res = gf_cache_set_headers(entry, headers);
 	count = gf_list_count(dm->sessions);
@@ -4408,7 +6415,8 @@
 #endif
 
 	gf_mx_v(dm->cache_mx);
-	return res ? GF_OK : GF_BAD_PARAM;
+	if (res) return GF_OK;
+	return GF_BAD_PARAM;
 }
 
 GF_EXPORT
@@ -4416,13 +6424,55 @@
 {
 	GF_Err e = GF_OK;
 
+#ifdef GPAC_HAS_HTTP2
+	if (sess->h2_sess) {
+		if (sess->h2_send_data)
+			return GF_SERVICE_ERROR;
+		if (!sess->h2_stream_id)
+			return GF_SERVICE_ERROR;
+
+		gf_mx_p(sess->mx);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP/2] Sending %d bytes on stream_id %d\n", size, sess->h2_stream_id));
+
+		sess->h2_send_data = data;
+		sess->h2_send_data_len = size;
+		if (sess->h2_data_paused) {
+			sess->h2_data_paused = 0;
+			nghttp2_session_resume_data(sess->h2_sess->ng_sess, sess->h2_stream_id);
+		}
+		//if no data, signal end of stream, otherwise regular send
+		if (!data || !size) {
+			sess->h2_is_eos = 1;
+			h2_session_send(sess);
+			//stream_id is not yet 0 in case of PUT/PUSH, stream is closed once we get reply from server
+		} else {
+			sess->h2_is_eos = 0;
+			//send the data
+			h2_flush_send(sess);
+		}
+		sess->h2_is_eos = 0;
+
+		gf_mx_v(sess->mx);
+
+		if (!data || !size) {
+			if (sess->put_state) {
+				sess->put_state = 2;
+				sess->status = GF_NETIO_WAIT_FOR_REPLY;
+				return GF_OK;
+			}
+		}
+		return GF_OK;
+	}
+#endif
+
 	if (!data || !size) {
 		if (sess->put_state) {
 			sess->put_state = 2;
 			sess->status = GF_NETIO_WAIT_FOR_REPLY;
 			return GF_OK;
 		}
-		return GF_BAD_PARAM;
+		return GF_OK;
 	}
 
 #ifdef GPAC_HAS_SSL
@@ -4433,6 +6483,7 @@
 		e = gf_sk_send(sess->sock, data, size);
 
 	if (e==GF_IP_CONNECTION_CLOSED) {
+		sess_connection_closed(sess);
 		sess->status = GF_NETIO_STATE_ERROR;
 		return e;
 	}
@@ -4442,4 +6493,30 @@
 	return e;
 }
 
+void gf_dm_sess_flush_h2(GF_DownloadSession *sess)
+{
+#ifdef GPAC_HAS_HTTP2
+	u64 in_time;
+	u32 res;
+	char h2_flush[2024];
+	if (!sess->h2_sess) return;
+
+	in_time = gf_sys_clock_high_res();
+	while (nghttp2_session_want_read(sess->h2_sess->ng_sess)) {
+		GF_Err e;
+		if (gf_sys_clock_high_res() - in_time > 100000)
+			break;
+
+		//read any frame pending from remote peer (window update and co)
+		e = gf_dm_read_data(sess, h2_flush, 2023, &res);
+		if ((e<0) && (e != GF_IP_NETWORK_EMPTY) && (e != GF_IP_SOCK_WOULD_BLOCK)) {
+			sess->last_error = e;
+			sess->status = GF_NETIO_STATE_ERROR;
+			break;
+		}
+	}
+#endif
+}
+
+
 #endif

gpac-1.0.1.tar.gz/src/utils/error.c -> gpac-2.0.0.tar.gz/src/utils/error.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -24,6 +24,7 @@
 */
 
 #include <gpac/tools.h>
+#include <gpac/thread.h>
 
 
 //ugly patch, we have a concurrence issue with gf_4cc_to_str, for now fixed by rolling buffers
@@ -35,31 +36,34 @@
 const char *gf_4cc_to_str(u32 type)
 {
 	u32 ch, i;
-	Bool is_ok=GF_TRUE;
 	char *szTYPE = szTYPE_BUF[buf_4cc_idx];
 	char *name = (char *)szTYPE;
 	if (!type) return "00000000";
 	buf_4cc_idx++;
-	if (buf_4cc_idx==NB_4CC_BUF)
+	if (buf_4cc_idx>=NB_4CC_BUF)
 		buf_4cc_idx=0;
 
-	for (i = 0; i < 4; i++, name++) {
+	for (i = 0; i < 4; i++) {
 		ch = type >> (8 * (3-i) ) & 0xff;
 		if ( ch >= 0x20 && ch <= 0x7E ) {
 			*name = ch;
+			name++;
 		} else {
-			is_ok=GF_FALSE;
-			break;
+			sprintf(name, "%02X", ch);
+			name += 2;
 		}
 	}
-	if (is_ok) {
-		*name = 0;
-		return (const char *) szTYPE;
-	}
-	sprintf(szTYPE, "%02X%02X%02X%02X", (type>>24)&0xFF, (type>>16)&0xFF, (type>>8)&0xFF, (type)&0xFF);
+	*name = 0;
 	return (const char *) szTYPE;
 }
 
+GF_EXPORT
+u32 gf_4cc_parse(const char *val)
+{
+	if (val && strlen(val)==4) return GF_4CC(val[0], val[1], val[2], val[3]);
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Value is not a properly defined 4CC", val));
+	return 0;
+}
 
 static const char *szProg[] =
 {
@@ -88,13 +92,21 @@
 
 static u64 prev_pos = (u64) -1;
 static u64 prev_pc = (u64) -1;
+extern char gf_prog_lf;
+
 static void gf_on_progress_std(const char *_title, u64 done, u64 total)
 {
 	Double prog;
 	u32 pos, pc;
 	const char *szT = _title ? (char *)_title : (char *) "";
-	prog = (double) done;
-	prog /= total;
+
+	if (total) {
+		prog = (double) done;
+		prog /= total;
+	} else {
+		prog = 0;
+	}
+
 	pos = MIN((u32) (20 * prog), 20);
 
 	if (pos>prev_pos) {
@@ -105,7 +117,7 @@
 	if ((pos!=prev_pos) || (pc!=prev_pc)) {
 		prev_pos = pos;
 		prev_pc = pc;
-		fprintf(stderr, "%s: |%s| (%02d/100)\r", szT, szProg[pos], pc);
+		fprintf(stderr, "%s: |%s| (%02d/100)%c", szT, szProg[pos], pc, gf_prog_lf);
 		fflush(stderr);
 	}
 	if (done==total) {
@@ -115,7 +127,7 @@
 				fprintf(stderr, " ");
 				len--;
 			};
-			fprintf(stderr, "\r");
+			fprintf(stderr, "%c", gf_prog_lf);
 		}
 		prev_pos = 0;
 	}
@@ -162,8 +174,6 @@
 	{ GF_LOG_NETWORK, "network", GF_LOG_WARNING },
 	{ GF_LOG_HTTP, "http", GF_LOG_WARNING },
 	{ GF_LOG_RTP, "rtp", GF_LOG_WARNING },
-	{ GF_LOG_AUTHOR, "author", GF_LOG_WARNING },
-	{ GF_LOG_SYNC, "sync", GF_LOG_WARNING },
 	{ GF_LOG_CODEC, "codec", GF_LOG_WARNING },
 	{ GF_LOG_PARSER, "parser", GF_LOG_WARNING },
 	{ GF_LOG_MEDIA, "media", GF_LOG_WARNING },
@@ -171,10 +181,10 @@
 	{ GF_LOG_SCRIPT, "script", GF_LOG_WARNING },
 	{ GF_LOG_INTERACT, "interact", GF_LOG_WARNING },
 	{ GF_LOG_COMPOSE, "compose", GF_LOG_WARNING },
+	{ GF_LOG_COMPTIME, "ctime", GF_LOG_WARNING },
 	{ GF_LOG_CACHE, "cache", GF_LOG_WARNING },
 	{ GF_LOG_MMIO, "mmio", GF_LOG_WARNING },
 	{ GF_LOG_RTI, "rti", GF_LOG_WARNING },
-	{ GF_LOG_SMIL, "smil", GF_LOG_WARNING },
 	{ GF_LOG_MEMORY, "mem", GF_LOG_WARNING },
 	{ GF_LOG_AUDIO, "audio", GF_LOG_WARNING },
 	{ GF_LOG_MODULE, "module", GF_LOG_WARNING },
@@ -183,7 +193,7 @@
 	{ GF_LOG_DASH, "dash", GF_LOG_WARNING },
 	{ GF_LOG_FILTER, "filter", GF_LOG_WARNING },
 	{ GF_LOG_SCHEDULER, "sched", GF_LOG_WARNING },
-	{ GF_LOG_ATSC, "atsc", GF_LOG_WARNING },
+	{ GF_LOG_ROUTE, "route", GF_LOG_WARNING },
 	{ GF_LOG_CONSOLE, "console", GF_LOG_INFO },
 	{ GF_LOG_APP, "app", GF_LOG_INFO },
 };
@@ -381,7 +391,7 @@
 }
 
 
-#if defined(GPAC_CONFIG_WIN32)
+#if defined(GPAC_CONFIG_WIN32) || defined(WIN32)
 #include <windows.h>
 #include <wincon.h>
 static HANDLE console = NULL;
@@ -404,19 +414,20 @@
 	if (gf_sys_is_test_mode() || gpac_no_color_logs)
 		return;
 	color_code = code & 0xFFFF;
-#if defined(GPAC_CONFIG_WIN32)
+#if defined(GPAC_CONFIG_WIN32) || defined(WIN32)
 	WORD attribs=0;
 	if (!is_mintty && (console == NULL)) {
 		CONSOLE_SCREEN_BUFFER_INFO console_info;
 		const char *shellv = getenv("SHELL");
 		if (shellv) {
 			is_mintty = GF_TRUE;
+			GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Console] Detected MSys/MinGW/Cygwin TTY, will use VT for coloring\n"))
 		} else {
 			console = GetStdHandle(STD_ERROR_HANDLE);
-			assert(console != INVALID_HANDLE_VALUE);
 			if (console != INVALID_HANDLE_VALUE) {
 				GetConsoleScreenBufferInfo(console, &console_info);
 				console_attr_ori = console_info.wAttributes;
+				GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Console] Detected Windows shell, will use SetConsoleTextAttribute for coloring\n"))
 			}
 		}
 	}
@@ -650,7 +661,8 @@
 void default_log_callback(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist)
 {
 	FILE *logs = gpac_log_file ? gpac_log_file : stderr;
-	do_log_time(logs);
+	if (tool != GF_LOG_APP)
+		do_log_time(logs);
 
 	if (gf_fileio_check(logs)) {
 		gf_fileio_printf((GF_FileIO *)logs, fmt, vlist);
@@ -683,15 +695,16 @@
 		gf_sys_set_console_code(stderr, GF_CONSOLE_WHITE);
 		break;
 	}
-	do_log_time(stderr);
+	if (tool != GF_LOG_APP)
+		do_log_time(stderr);
 
 	vfprintf(stderr, fmt, vlist);
 	gf_sys_set_console_code(stderr, GF_CONSOLE_RESET);
+	gf_fflush(stderr);
 }
 
 
 
-#include <gpac/thread.h>
 static void *user_log_cbk = NULL;
 gf_log_cbk log_cbk = default_log_callback_color;
 static Bool log_exit_on_error = GF_FALSE;
@@ -858,7 +871,6 @@
 	case GF_SCRIPT_ERROR:
 		return "Invalid Script";
 
-	/*MPEG-4 Errors */
 	case GF_BUFFER_TOO_SMALL:
 		return "Bad Buffer size (too small)";
 	case GF_NON_COMPLIANT_BITSTREAM:
@@ -866,9 +878,10 @@
 	case GF_FILTER_NOT_FOUND:
 		return "Filter not found for the desired type";
 
-	/*DMIF errors - local and control plane */
 	case GF_URL_ERROR:
 		return "Requested URL is not valid or cannot be found";
+	case GF_URL_REMOVED:
+		return "Requested URL is no longer available";
 
 	case GF_SERVICE_ERROR:
 		return "Internal Service Error";
@@ -1095,6 +1108,9 @@
 #ifdef GPAC_USE_GLES2
 	 "GPAC_USE_GLES2 "
 #endif
+#ifdef GPAC_DISABLE_ZLIB
+	 "GPAC_DISABLE_ZLIB "
+#endif
 #ifdef GPAC_DISABLE_SVG
 	 "GPAC_DISABLE_SVG "
 #endif
@@ -1170,8 +1186,8 @@
 #ifdef GPAC_DISABLE_STREAMING
 	 "GPAC_DISABLE_STREAMING "
 #endif
-#ifdef GPAC_DISABLE_ATSC
-	 "GPAC_DISABLE_ATSC "
+#ifdef GPAC_DISABLE_ROUTE
+	 "GPAC_DISABLE_ROUTE "
 #endif
 
 	 ;
@@ -1742,18 +1758,33 @@
 }
 
 GF_EXPORT
-GF_Err gf_blob_get_data(const char *blob_url, u8 **out_data, u32 *out_size)
+GF_Err gf_blob_get(const char *blob_url, u8 **out_data, u32 *out_size, u32 *out_flags)
 {
 	GF_Blob *blob = NULL;
 	if (strncmp(blob_url, "gmem://", 7)) return GF_BAD_PARAM;
 	if (sscanf(blob_url, "gmem://%p", &blob) != 1) return GF_BAD_PARAM;
 	if (!blob) return GF_BAD_PARAM;
+	if (blob->data && blob->mx)
+		gf_mx_p(blob->mx);
 	if (out_data) *out_data = blob->data;
 	if (out_size) *out_size = blob->size;
+	if (out_flags) *out_flags = blob->flags;
 	return GF_OK;
 }
 
 GF_EXPORT
+GF_Err gf_blob_release(const char *blob_url)
+{
+ GF_Blob *blob = NULL;
+ if (strncmp(blob_url, "gmem://", 7)) return GF_BAD_PARAM;
+ if (sscanf(blob_url, "gmem://%p", &blob) != 1) return GF_BAD_PARAM;
+ if (!blob) return GF_BAD_PARAM;
+ if (blob->data && blob->mx)
+ gf_mx_v(blob->mx);
+ return GF_OK;
+}
+
+GF_EXPORT
 GF_Err gf_dynstrcat(char **str, const char *to_append, const char *sep)
 {
 	u32	l1, l2, lsep;
@@ -1774,3 +1805,92 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+Bool gf_parse_lfrac(const char *value, GF_Fraction64 *frac)
+{
+	Float v;
+	u32 len, i;
+	Bool all_num=GF_TRUE;
+	char *sep;
+	if (!frac) return GF_FALSE;
+	frac->num = 0;
+	frac->den = 0;
+	if (!value) return GF_FALSE;
+
+	if (sscanf(value, LLD"/"LLU, &frac->num, &frac->den) == 2) {
+		return GF_TRUE;
+	}
+	if (sscanf(value, LLD"-"LLU, &frac->num, &frac->den) == 2) {
+		return GF_TRUE;
+	}
+	if (sscanf(value, "%g", &v) != 1) {
+		frac->num = 0;
+		frac->den = 0;
+		return GF_FALSE;
+	}
+	sep = strchr(value, '.');
+	if (!sep) sep = strchr(value, ',');
+	if (!sep) {
+		frac->num = atoi(value);
+		frac->den = 1;
+		return GF_TRUE;
+	}
+
+	len = (u32) strlen(sep+1);
+	for (i=1; i<=len; i++) {
+		if ((sep[i]<'0') || (sep[i]>'9')) {
+			all_num = GF_FALSE;
+			break;
+		}
+	}
+	if (all_num) {
+		u32 div_trail_zero = 1;
+		sscanf(value, LLD"."LLU, &frac->num, &frac->den);
+
+		i=0;
+		frac->den = 1;
+		while (i<len) {
+			i++;
+			frac->den *= 10;
+		}
+		//trash trailing zero
+		i=len;
+		while (i>0) {
+			if (sep[i] != '0') {
+				break;
+			}
+			div_trail_zero *= 10;
+			i--;
+		}
+
+
+		frac->num *= frac->den / div_trail_zero;
+		frac->num += atoi(sep+1) / div_trail_zero;
+		frac->den /= div_trail_zero;
+
+		return GF_TRUE;
+	}
+
+	if (len <= 3) frac->den = 1000;
+	else if (len <= 6) frac->den = 1000000;
+	else frac->den = 1000000000;
+
+	frac->num = (u64)( (atof(value) * frac->den) + 0.5 );
+	return GF_TRUE;
+}
+
+GF_EXPORT
+Bool gf_parse_frac(const char *value, GF_Fraction *frac)
+{
+	GF_Fraction64 r;
+	Bool res;
+	if (!frac) return GF_FALSE;
+	res = gf_parse_lfrac(value, &r);
+	while ((r.num >= 0x80000000) && (r.den > 1000)) {
+		r.num /= 1000;
+		r.den /= 1000;
+	}
+	frac->num = (s32) r.num;
+	frac->den = (u32) r.den;
+	return res;
+}

gpac-1.0.1.tar.gz/src/utils/gltools.c -> gpac-2.0.0.tar.gz/src/utils/gltools.c Changed

@@ -334,90 +334,122 @@
 
 }
 
+static char *gl_shader_yuv_matrix = \
+"uniform mat4 _gf_%s_mx;\n\
+";
+
 
+#if 0 //old code
+static char *gl_shader_yuv_coefs = \
+"const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
+const vec3 R_mul = vec3(1.164, 0.000, 1.596);\n\
+const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
+const vec3 B_mul = vec3(1.164, 2.018, 0.000);\n\
+";
+
+static char *gl_shader_yuv_coefs_jpeg = \
+"const vec3 offset = vec3(0.0, -0.5, -0.5);\n\
+const vec3 R_mul = vec3(1, 0.000, 1.40200);\n\
+const vec3 G_mul = vec3(1, -0.34414, -0.71414);\n\
+const vec3 B_mul = vec3(1, 1.77200, 0.000);\n\
+";
+#endif
 
 static char *gl_shader_vars_yuv = \
 "uniform sampler2D _gf_%s_1;\n\
 uniform sampler2D _gf_%s_2;\n\
 uniform sampler2D _gf_%s_3;\n\
-const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
-const vec3 R_mul = vec3(1.164, 0.000, 1.596);\n\
-const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
-const vec3 B_mul = vec3(1.164, 2.018, 0.000);\n\
 ";
 
 static char *gl_shader_fun_yuv = \
 "vec2 texc;\n\
-vec3 yuv, rgb;\n\
+vec4 yuv;\n\
 texc = _gpacTexCoord.st;\n\
 yuv.x = texture2D(_gf_%s_1, texc).r;\n\
 yuv.y = texture2D(_gf_%s_2, texc).r;\n\
 yuv.z = texture2D(_gf_%s_3, texc).r;\n\
-yuv += offset;\n\
-rgb.r = dot(yuv, R_mul);\n\
-rgb.g = dot(yuv, G_mul);\n\
-rgb.b = dot(yuv, B_mul);\n\
-return vec4(rgb, 1.0);\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
+";
+
+static char *gl_shader_fun_yvu = \
+"vec2 texc;\n\
+vec4 yuv;\n\
+texc = _gpacTexCoord.st;\n\
+yuv.x = texture2D(_gf_%s_1, texc).r;\n\
+yuv.y = texture2D(_gf_%s_3, texc).r;\n\
+yuv.z = texture2D(_gf_%s_2, texc).r;\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
+";
+static char *gl_shader_vars_yuva = \
+"uniform sampler2D _gf_%s_1;\n\
+uniform sampler2D _gf_%s_2;\n\
+uniform sampler2D _gf_%s_3;\n\
+uniform sampler2D _gf_%s_4;\n\
+";
+
+static char *gl_shader_fun_yuva = \
+"vec2 texc;\n\
+vec4 yuv;\n\
+texc = _gpacTexCoord.st;\n\
+yuv.x = texture2D(_gf_%s_1, texc).r;\n\
+yuv.y = texture2D(_gf_%s_2, texc).r;\n\
+yuv.z = texture2D(_gf_%s_3, texc).r;\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = texture2D(_gf_%s_4, texc).r;\n\
+return yuv;\n\
 ";
 
 static char *gl_shader_vars_nv12 = \
 "uniform sampler2D _gf_%s_1;\n\
 uniform sampler2D _gf_%s_2;\n\
-const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
-const vec3 R_mul = vec3(1.164, 0.000, 1.596);\n\
-const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
-const vec3 B_mul = vec3(1.164, 2.018, 0.000);\n\
 ";
 
 static char *gl_shader_fun_nv12 = \
 "vec2 texc;\n\
-vec3 yuv, rgb;\n\
+vec4 yuv;\n\
 texc = _gpacTexCoord.st;\n\
 yuv.x = texture2D(_gf_%s_1, texc).r;\n\
 yuv.yz = texture2D(_gf_%s_2, texc).ra;\n\
-yuv += offset;\n\
-rgb.r = dot(yuv, R_mul);\n\
-rgb.g = dot(yuv, G_mul);\n\
-rgb.b = dot(yuv, B_mul);\n\
-return vec4(rgb, 1.0);\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
 ";
 
 
 static char *gl_shader_vars_nv21 = \
 "uniform sampler2D _gf_%s_1;\n\
 uniform sampler2D _gf_%s_2;\n\
-const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
-const vec3 R_mul = vec3(1.164, 0.000, 1.596);\n\
-const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
-const vec3 B_mul = vec3(1.164, 2.018, 0.000);\n\
 ";
 
 static char *gl_shader_fun_nv21 = \
 "vec2 texc;\n\
-vec3 yuv, rgb;\n\
+vec4 yuv;\n\
 texc = _gpacTexCoord.st;\n\
 yuv.x = texture2D(_gf_%s_1, texc).r;\n\
 yuv.yz = texture2D(_gf_%s_2, texc).ar;\n\
-yuv += offset;\n\
-rgb.r = dot(yuv, R_mul);\n\
-rgb.g = dot(yuv, G_mul);\n\
-rgb.b = dot(yuv, B_mul);\n\
-return vec4(rgb, 1.0);\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
 ";
 
 
 static char *gl_shader_vars_uyvu = \
-	"uniform sampler2D _gf_%s_1;\
-	uniform float _gf_%s_width;\
-	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\
-	const vec3 R_mul = vec3(1.164, 0.000, 1.596);\
-	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\
-	const vec3 B_mul = vec3(1.164, 2.018, 0.000);\
-	";
+"uniform sampler2D _gf_%s_1;\
+uniform float _gf_%s_width;\
+";
 
 static char *gl_shader_fun_uyvy = \
 "vec2 texc, t_texc;\
-vec3 yuv, rgb;\
+vec4 yuv;\
 vec4 uyvy;\
 float tex_s;\
 texc = _gpacTexCoord.st;\
@@ -430,17 +462,16 @@
 yuv.r = uyvy.g;\
 yuv.g = uyvy.r;\
 yuv.b = uyvy.b;\
-yuv += offset; \
-rgb.r = dot(yuv, R_mul); \
-rgb.g = dot(yuv, G_mul); \
-rgb.b = dot(yuv, B_mul); \
-return vec4(rgb, 1.0);\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
 ";
 
 
 static char *gl_shader_fun_vyuy = \
 "vec2 texc, t_texc;\
-vec3 yuv, rgb;\
+vec4 yuv;\
 vec4 vyuy;\
 float tex_s;\
 texc = _gpacTexCoord.st;\
@@ -453,17 +484,16 @@
 yuv.r = vyuy.g;\
 yuv.g = vyuy.b;\
 yuv.b = vyuy.r;\
-yuv += offset; \
-rgb.r = dot(yuv, R_mul); \
-rgb.g = dot(yuv, G_mul); \
-rgb.b = dot(yuv, B_mul); \
-return vec4(rgb, 1.0);\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
 ";
 
 
 static char *gl_shader_fun_yuyv = \
 "vec2 texc, t_texc;\
-vec3 yuv, rgb;\
+vec4 yuv;\
 vec4 yvyu;\
 float tex_s;\
 texc = _gpacTexCoord.st;\
@@ -476,16 +506,15 @@
 yuv.r = yvyu.r;\
 yuv.g = yvyu.g;\
 yuv.b = yvyu.a;\
-yuv += offset; \
-rgb.r = dot(yuv, R_mul); \
-rgb.g = dot(yuv, G_mul); \
-rgb.b = dot(yuv, B_mul); \
-return vec4(rgb, 1.0);\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
 ";
 
 static char *gl_shader_fun_yvyu = \
 "vec2 texc, t_texc;\
-vec3 yuv, rgb;\
+vec4 yuv;\
 vec4 yuyv;\
 float tex_s;\
 texc = _gpacTexCoord.st;\
@@ -498,13 +527,106 @@
 yuv.r = yuyv.r;\
 yuv.g = yuyv.a;\
 yuv.b = yuyv.g;\
-yuv += offset; \
-rgb.r = dot(yuv, R_mul); \
-rgb.g = dot(yuv, G_mul); \
-rgb.b = dot(yuv, B_mul); \
-return vec4(rgb, 1.0);\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
+";
+
+
+static char *gl_shader_vars_yuv4_pack = \
+"uniform sampler2D _gf_%s_1;\n\
+";
+
+static char *gl_shader_fun_yuv4_pack = \
+"vec2 texc;\n\
+vec4 yuv;\n\
+texc = _gpacTexCoord.st;\n\
+yuv = texture2D(_gf_%s_1, texc).gbr;\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
 ";
 
+static char *gl_shader_fun_yuv4a_pack = \
+"vec2 texc;\n\
+vec4 tex;\n\
+vec4 yuv;\n\
+texc = _gpacTexCoord.st;\n\
+tex = texture2D(_gf_%s_1, texc).rgba;\n\
+yuv.r = tex.g;\n\
+yuv.g = tex.r;\n\
+yuv.b = tex.b;\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
+";
+
+#if 1
+//10 bit V, 10 bit Y, 10 bit U, 2 bits lost
+//V: 8 bit R + 2 bits G
+//Y: 6 bit G + 4 bits B
+//U: 4 bit R + 6 bits A
+static char *gl_shader_fun_yuv4_10_pack = \
+"vec2 texc;\n\
+vec4 val;\n\
+int valr, valg, valb, vala, interm1, interm2;\n\
+vec4 yuv;\n\
+texc = _gpacTexCoord.st;\n\
+val = texture2D(_gf_%s_1, texc).rgba;\n\
+valr = int(val.r*255);\n\
+valg = int(val.g*255);\n\
+valb = int(val.b*255);\n\
+vala = int(val.a*63);\n\
+interm1 = valg / 64;\n\
+yuv.b = float( (valr * 4) + (interm1) ) / 1023.0;\n\
+interm1 *= 64;\n\
+interm2 = valb / 16;\n\
+yuv.r = float( ((valg - interm1) * 16) + (interm2) ) / 1023.0;\n\
+interm2 *= 16;\n\
+yuv.g = float( ((valb - interm2) * 64) + vala ) / 1023.0;\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
+";
+
+#else
+
+
+//in byte order:
+//2 bits lost, 10 bit U, 10 bit Y, 10 bit V
+//U: 6 bit R + 4 bits G
+//Y: 4 bit G + 6 bits B
+//V: 2 bit B + 8 bits A
+static char *gl_shader_fun_yuv4_10_pack = \
+"vec2 texc;\n\
+vec4 val;\n\
+int valr, valg, valb, vala, interm1, interm2;\n\
+vec4 yuv;\n\
+texc = _gpacTexCoord.st;\n\
+val = texture2D(_gf_%s_1, texc).rgba;\n\
+valr = int(val.r*63);\n\
+valg = int(val.g*255);\n\
+valb = int(val.b*255);\n\
+vala = int(val.a*255);\n\
+interm1 = valg / 16;\n\
+yuv.b = float( (valr * 16) + (interm1) ) / 1023.0;\n\
+interm1 *= 16;\n\
+interm2 = valb / 4;\n\
+yuv.g = float( ((valg - interm1) * 64) + (interm2) ) / 1023.0;\n\
+interm2 *= 4;\n\
+yuv.r = float( ((valb - interm2) * 256) + vala ) / 1023.0;\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
+";
+
+#endif
+
 static char *gl_shader_vars_rgb = \
 "uniform sampler2D _gf_%s_1;\n\
 ";
@@ -611,8 +733,7 @@
 ";
 
 
-
-Bool gf_gl_txw_insert_fragment_shader(u32 pix_fmt, const char *tx_name, char **f_source)
+Bool gf_gl_txw_insert_fragment_shader(u32 pix_fmt, const char *tx_name, char **f_source, Bool y_flip)
 {
 	char szCode[4000];
 	const char *shader_vars = NULL;
@@ -630,21 +751,37 @@
 		shader_fun = gl_shader_fun_nv12;
 		break;
 	case GF_PIXEL_UYVY:
+	case GF_PIXEL_UYVY_10:
 		shader_vars = gl_shader_vars_uyvu;
 		shader_fun = gl_shader_fun_uyvy;
 		break;
 	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YUYV_10:
 		shader_vars = gl_shader_vars_uyvu; //same as uyvy
 		shader_fun = gl_shader_fun_yuyv;
 		break;
 	case GF_PIXEL_VYUY:
+	case GF_PIXEL_VYUY_10:
 		shader_vars = gl_shader_vars_uyvu; //same as uyvy
 		shader_fun = gl_shader_fun_vyuy;
 		break;
 	case GF_PIXEL_YVYU:
+	case GF_PIXEL_YVYU_10:
 		shader_vars = gl_shader_vars_uyvu; //same as uyvy
 		shader_fun = gl_shader_fun_yvyu;
 		break;
+	case GF_PIXEL_YUV444_PACK:
+		shader_vars = gl_shader_vars_yuv4_pack;
+		shader_fun = gl_shader_fun_yuv4_pack;
+		break;
+	case GF_PIXEL_YUVA444_PACK:
+		shader_vars = gl_shader_vars_yuv4_pack;
+		shader_fun = gl_shader_fun_yuv4a_pack;
+		break;
+	case GF_PIXEL_YUV444_10_PACK:
+		shader_vars = gl_shader_vars_yuv4_pack;
+		shader_fun = gl_shader_fun_yuv4_10_pack;
+		break;
 	case GF_PIXEL_ALPHAGREY:
 		shader_vars = gl_shader_vars_rgb;
 		shader_fun = gl_shader_fun_alphagrey;
@@ -680,16 +817,23 @@
 
 	case GF_PIXEL_YUV:
 	case GF_PIXEL_YUV_10:
-	case GF_PIXEL_YUVA:
 	case GF_PIXEL_YUVD:
 	case GF_PIXEL_YUV422:
 	case GF_PIXEL_YUV422_10:
-	case GF_PIXEL_YUVA444:
 	case GF_PIXEL_YUV444:
 	case GF_PIXEL_YUV444_10:
 		shader_vars = gl_shader_vars_yuv;
 		shader_fun = gl_shader_fun_yuv;
 		break;
+	case GF_PIXEL_YVU:
+		shader_vars = gl_shader_vars_yuv;
+		shader_fun = gl_shader_fun_yvu;
+		break;
+	case GF_PIXEL_YUVA:
+	case GF_PIXEL_YUVA444:
+		shader_vars = gl_shader_vars_yuva;
+		shader_fun = gl_shader_fun_yuva;
+		break;
 	case GF_PIXEL_GL_EXTERNAL:
 		shader_vars = gl_shader_vars_externalOES;
 		shader_fun = gl_shader_fun_rgb;
@@ -701,15 +845,25 @@
 	}
 
 	if (!shader_vars || !shader_fun) return GF_FALSE;
-	/*format with max 3 tx_name (for yuv)*/
-	sprintf(szCode, shader_vars, tx_name, tx_name, tx_name);
+	/*format with max 4 tx_name (for yuva)*/
+	sprintf(szCode, shader_vars, tx_name, tx_name, tx_name, tx_name);
 	gf_dynstrcat(f_source, szCode, NULL);
 
+	if (gf_pixel_fmt_is_yuv(pix_fmt)) {
+//		gf_dynstrcat(f_source, gl_shader_yuv_matrix, NULL);
+
+		sprintf(szCode, gl_shader_yuv_matrix, tx_name);
+		gf_dynstrcat(f_source, szCode, NULL);
+	}
+
 	gf_dynstrcat(f_source, "\nvec4 ", NULL);
 	gf_dynstrcat(f_source, tx_name, NULL);
 	gf_dynstrcat(f_source, "_sample(vec2 _gpacTexCoord) {\n", NULL);
-	/*format with max 3 tx_name (for yuv)*/
-	sprintf(szCode, shader_fun, tx_name, tx_name, tx_name);
+	if (y_flip) {
+		gf_dynstrcat(f_source, "_gpacTexCoord.t = 1.0 - _gpacTexCoord.t;\n", NULL);
+	}
+	/*format with max 4 tx_name (for yuva) + matrix for yuv*/
+	sprintf(szCode, shader_fun, tx_name, tx_name, tx_name, tx_name, tx_name);
 
 	gf_dynstrcat(f_source, szCode, NULL);
 	gf_dynstrcat(f_source, "\n}\n", NULL);
@@ -718,7 +872,7 @@
 }
 
 
-Bool gf_gl_txw_setup(GF_GLTextureWrapper *tx, u32 pix_fmt, u32 width, u32 height, u32 stride, u32 uv_stride, Bool linear_interp, GF_FilterFrameInterface *frame_ifce)
+Bool gf_gl_txw_setup(GF_GLTextureWrapper *tx, u32 pix_fmt, u32 width, u32 height, u32 stride, u32 uv_stride, Bool linear_interp, GF_FilterFrameInterface *frame_ifce, Bool full_range, s32 matrix_coef_or_neg)
 {
 	u32 i;
 
@@ -733,17 +887,27 @@
 	tx->bit_depth = 8;
 	tx->gl_format = GL_LUMINANCE;
 	tx->bytes_per_pix = 1;
+	tx->fullrange = full_range;
+	if (matrix_coef_or_neg==GF_CICP_MX_UNSPECIFIED)
+		tx->mx_cicp = -1;
+	else
+		tx->mx_cicp = matrix_coef_or_neg;
 
 	switch (tx->pix_fmt) {
 	case GF_PIXEL_YUV444_10:
 		tx->bit_depth = 10;
 	case GF_PIXEL_YUV444:
+	case GF_PIXEL_YUVA444:
 		tx->uv_w = tx->width;
 		tx->uv_h = tx->height;
 		if (!tx->uv_stride)
 			tx->uv_stride = tx->stride;
 		tx->is_yuv = GF_TRUE;
 		tx->nb_textures = 3;
+		if (tx->pix_fmt==GF_PIXEL_YUVA444) {
+			tx->nb_textures = 4;
+			tx->has_alpha = GF_TRUE;
+		}
 		break;
 	case GF_PIXEL_YUV422_10:
 		tx->bit_depth = 10;
@@ -758,6 +922,8 @@
 	case GF_PIXEL_YUV_10:
 		tx->bit_depth = 10;
 	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
+	case GF_PIXEL_YUVA:
 		tx->uv_w = tx->width/2;
 		if (tx->width % 2) tx->uv_w++;
 		tx->uv_h = tx->height/2;
@@ -768,6 +934,10 @@
 		}
 		tx->is_yuv = GF_TRUE;
 		tx->nb_textures = 3;
+		if (tx->pix_fmt==GF_PIXEL_YUVA) {
+			tx->nb_textures = 4;
+			tx->has_alpha = GF_TRUE;
+		}
 		break;
 	case GF_PIXEL_NV12_10:
 	case GF_PIXEL_NV21_10:
@@ -781,6 +951,11 @@
 		tx->is_yuv = GF_TRUE;
 		tx->nb_textures = 2;
 		break;
+	case GF_PIXEL_UYVY_10:
+	case GF_PIXEL_YUYV_10:
+	case GF_PIXEL_YVYU_10:
+	case GF_PIXEL_VYUY_10:
+		tx->bit_depth = 16;
 	case GF_PIXEL_UYVY:
 	case GF_PIXEL_YUYV:
 	case GF_PIXEL_YVYU:
@@ -794,6 +969,18 @@
 		tx->is_yuv = GF_TRUE;
 		tx->nb_textures = 1;
 		break;
+	case GF_PIXEL_YUVA444_PACK:
+		tx->has_alpha = GF_TRUE;
+	case GF_PIXEL_YUV444_PACK:
+	case GF_PIXEL_YUV444_10_PACK:
+		tx->uv_w = tx->width;
+		tx->uv_h = tx->height;
+		if (!tx->uv_stride) {
+			tx->uv_stride = tx->stride;
+		}
+		tx->is_yuv = GF_TRUE;
+		tx->nb_textures = 1;
+		break;
 	case GF_PIXEL_GREYSCALE:
 		tx->gl_format = GL_LUMINANCE;
 		tx->bytes_per_pix = 1;
@@ -911,6 +1098,7 @@
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, glmode);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, glmode);
 #endif
+			GL_CHECK_ERR()
 		}
 
 
@@ -977,10 +1165,17 @@
 	if (!frame_ifce) {
 		if (tx->is_yuv) {
 			if (tx->nb_textures==2) {
-				pU = data + tx->stride * tx->height;
-			} else if (tx->nb_textures==3) {
+				if (tx->has_alpha) {
+					pA = data + tx->stride * tx->height;
+				} else {
+					pU = data + tx->stride * tx->height;
+				}
+			} else if (tx->nb_textures>=3) {
 				pU = data + tx->stride * tx->height;
 				pV = pU + tx->uv_stride * tx->uv_h;
+				if (tx->nb_textures==4) {
+					pA = pV + tx->uv_stride * tx->uv_h;
+				}
 			}
 		}
 	} else {
@@ -1062,7 +1257,15 @@
 				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[0]);
 				ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
 
-				linesize = tx->width/2 * tx->bytes_per_pix * 4;
+				if (tx->pix_fmt==GF_PIXEL_YUV444_PACK)
+					linesize = 3 * tx->width;
+				else if (tx->pix_fmt==GF_PIXEL_YUVA444_PACK)
+					linesize = 4 * tx->width;
+				else if (tx->pix_fmt==GF_PIXEL_YUV444_10_PACK)
+					linesize = 4 * tx->width;
+				else
+					linesize = tx->width/2 * tx->bytes_per_pix * 4;
+
 				p_stride = stride_luma;
 				count = tx->height;
 
@@ -1077,7 +1280,15 @@
 			if (tx->pbo_state!=GF_GL_PBO_PUSH) {
 				glBindTexture(GL_TEXTURE_2D, tx->textures[0] );
 				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[0]);
-				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx->width/2, tx->height, 0, GL_RGBA, tx->memory_format, NULL);
+
+				if (tx->pix_fmt==GF_PIXEL_YUV444_PACK)
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tx->width, tx->height, 0, GL_RGB, tx->memory_format, NULL);
+				else if (tx->pix_fmt==GF_PIXEL_YUVA444_PACK)
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx->width, tx->height, 0, GL_RGBA, tx->memory_format, NULL);
+				else if (tx->pix_fmt==GF_PIXEL_YUV444_10_PACK)
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx->width, tx->height, 0, GL_RGBA, tx->memory_format, NULL);
+				else
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx->width/2, tx->height, 0, GL_RGBA, tx->memory_format, NULL);
 				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
 			}
 		} else {
@@ -1155,28 +1366,51 @@
 		}
 	}
 #endif
-	else if ((tx->pix_fmt==GF_PIXEL_UYVY) || (tx->pix_fmt==GF_PIXEL_YUYV) || (tx->pix_fmt==GF_PIXEL_VYUY) || (tx->pix_fmt==GF_PIXEL_YVYU)) {
+	else if ((tx->nb_textures==1) || ((tx->nb_textures==2) && tx->has_alpha)) {
 		u32 uv_stride = 0;
 		glBindTexture(GL_TEXTURE_2D, tx->textures[0] );
 
 		use_stride = GF_FALSE;
-		if (stride_luma > 2*tx->width) {
-			//stride is given in bytes for packed formats, so divide by 2 to get the number of pixels
-			//for YUYV, and we upload as a texture with half the wsize so rdevide again by two
-			//since GL_UNPACK_ROW_LENGTH counts in component and we moved the set 2 bytes per comp on 10 bits
-			//no need to further divide
-			uv_stride = stride_luma/4;
-			use_stride = GF_TRUE;
-		}
+		if ((tx->pix_fmt==GF_PIXEL_YUV444_PACK) || (tx->pix_fmt==GF_PIXEL_YUVA444_PACK) || (tx->pix_fmt==GF_PIXEL_YUV444_10_PACK)) {
+			u32 nb_bytes = 3;
+			GLuint fmt = GL_RGB;
+			if (tx->pix_fmt!=GF_PIXEL_YUV444_PACK) {
+				nb_bytes = 4;
+				fmt = GL_RGBA;
+			}
+			if (stride_luma > nb_bytes*tx->width) {
+				use_stride = GF_TRUE;
+			}
+
 #if !defined(GPAC_GL_NO_STRIDE)
-		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, uv_stride);
+			if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, stride_luma/tx->bytes_per_pix);
 #endif
-		if (tx->first_tx_load) {
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx->width/2, tx->height, 0, GL_RGBA, tx->memory_format, pY);
-			tx->first_tx_load = GF_FALSE;
-		} else {
-			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tx->width/2, tx->height, GL_RGBA, tx->memory_format, pY);
+			if (tx->first_tx_load) {
+				glTexImage2D(GL_TEXTURE_2D, 0, fmt, tx->width, tx->height, 0, fmt, tx->memory_format, pY);
+				tx->first_tx_load = GF_FALSE;
+			} else {
+				glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tx->width, tx->height, fmt, tx->memory_format, pY);
+			}
 
+		} else {
+			u32 scaler = tx->scale_10bit ? 4 : 2;
+			if (stride_luma > scaler*tx->width) {
+				//stride is given in bytes for packed formats, so divide by 2 to get the number of pixels
+				//for YUYV, and we upload as a texture with half the wsize so redivide again by two
+				//since GL_UNPACK_ROW_LENGTH counts in component and we moved the set 2 bytes per comp on 10 bits
+				//no need to further divide
+				uv_stride = stride_luma/scaler/2;
+				use_stride = GF_TRUE;
+			}
+#if !defined(GPAC_GL_NO_STRIDE)
+			if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, uv_stride);
+#endif
+			if (tx->first_tx_load) {
+				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx->width/2, tx->height, 0, GL_RGBA, tx->memory_format, pY);
+				tx->first_tx_load = GF_FALSE;
+			} else {
+				glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tx->width/2, tx->height, GL_RGBA, tx->memory_format, pY);
+			}
 		}
 
 #if !defined(GPAC_GL_NO_STRIDE)
@@ -1205,6 +1439,14 @@
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, tx->uv_w, tx->uv_h, 0, tx->gl_format, tx->memory_format, pV);
 		}
 
+		if (pA) {
+			glBindTexture(GL_TEXTURE_2D, tx->textures[3] );
+#if !defined(GPAC_GL_NO_STRIDE)
+			if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, stride_luma/tx->bytes_per_pix);
+#endif
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, tx->width, tx->height, 0, tx->gl_format, tx->memory_format, pA);
+		}
+
 #if !defined(GPAC_GL_NO_STRIDE)
 		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 #endif
@@ -1234,27 +1476,146 @@
 			glBindTexture(GL_TEXTURE_2D, 0);
 		}
 
+		if (pA) {
+			glBindTexture(GL_TEXTURE_2D, tx->textures[3] );
+#if !defined(GPAC_GL_NO_STRIDE)
+			if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, stride_luma/tx->bytes_per_pix);
+#endif
+			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tx->width, tx->height, tx->gl_format, tx->memory_format, pA);
+			glBindTexture(GL_TEXTURE_2D, 0);
+		}
+
 #if !defined(GPAC_GL_NO_STRIDE)
 		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 #endif
 	}
+
+	//restore red/alpha scale
+	if (tx->scale_10bit) {
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
+		glPixelTransferi(GL_RED_SCALE, 1);
+		glPixelTransferi(GL_ALPHA_SCALE, 1);
+		glPixelStorei(GL_UNPACK_LSB_FIRST, 0);
+#endif
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	}
+
 	return GF_TRUE;
 }
 
+
+struct yuv_coefs {
+	u32 cicp;
+	Double Kr, Kb;
+} YUVMatrices[] = {
+	{GF_CICP_MX_BT709, 0.2126, 0.0722},
+	{GF_CICP_MX_FCC47, 0.3, 0.11},
+	{GF_CICP_MX_BT601_625, 0.299, 0.114},
+	{GF_CICP_MX_SMPTE170, 0.299, 0.114},
+	{GF_CICP_MX_SMPTE240, 0.212, 0.087},
+	{GF_CICP_MX_BT2020, 0.2627, 0.0593},
+	{GF_CICP_MX_BT2020_CL, 0.2627, 0.0593}
+};
+
+static void get_yuv_color_matrix(GF_GLTextureWrapper *tx, GF_Matrix *mx)
+{
+	Double Kg;
+	struct yuv_coefs *yc = NULL;
+
+	//setup YUV->RGB matrix, in row-major
+	gf_mx_init(*mx);
+
+	if (tx->mx_cicp>=0) {
+		u32 i, count=GF_ARRAY_LENGTH(YUVMatrices);
+		u32 mx_code = (u32) tx->mx_cicp;
+
+		if (mx_code==GF_CICP_MX_IDENTITY) {
+			return;
+		}
+
+		if (mx_code==GF_CICP_MX_YCgCo) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[GL] YCgCo matrix not supported, will use BT709\n"));
+			yc = &YUVMatrices[1];
+		}
+		else if (mx_code==GF_CICP_MX_YDzDx) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[GL] YDxDy matrix not supported, will use BT709\n"));
+			yc = &YUVMatrices[1];
+		} else {
+			for (i=0; i<count; i++) {
+				if (YUVMatrices[i].cicp == mx_code) {
+					yc = &YUVMatrices[i];
+					break;
+				}
+			}
+			if (!yc) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GL] Unrecognized matrix coefficient value %d, will use BT709\n", mx_code));
+				yc = &YUVMatrices[1];
+			}
+		}
+	} else {
+		yc = &YUVMatrices[1];
+	}
+
+	Kg = 1.0 - yc->Kr - yc->Kb;
+
+	mx->m[0] = 1.0f;
+	mx->m[2] = (Float) (2.0 * (1.0 - yc->Kr) );
+
+	mx->m[4] = 1.0;
+	mx->m[5] = (Float) ( - 2.0 * (1.0 - yc->Kb) * yc->Kb / Kg );
+	mx->m[6] = (Float) ( - 2.0 * (1.0 - yc->Kr) * yc->Kr / Kg );
+
+	mx->m[8] = 1.0f;
+	mx->m[9] = (Float) (2.0 * (1.0 - yc->Kb) );
+	mx->m[10] = 0.0;
+
+	//move to column major
+	gf_mx_transpose(mx);
+
+	if (tx->fullrange) {
+		gf_mx_add_translation(mx, 0, FLT2FIX(-0.5), FLT2FIX(-0.5));
+	} else {
+		gf_mx_add_scale(mx, FLT2FIX(255.0/216.0), FLT2FIX(255.0/224.0), FLT2FIX(255.0/224.0) );
+		gf_mx_add_translation(mx, FLT2FIX(-0.0625), FLT2FIX(-0.5), FLT2FIX(-0.5));
+	}
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[GL] YUV2RGB matrix is (column-major):\n"
+		"\t%.4f\t%.4f\t%.4f\t%.4f\n"
+		"\t%.4f\t%.4f\t%.4f\t%.4f\n"
+		"\t%.4f\t%.4f\t%.4f\t%.4f\n"
+		"\t%.4f\t%.4f\t%.4f\t%.4f\n",
+			mx->m[0], mx->m[1], mx->m[2], mx->m[3],
+			mx->m[4], mx->m[5], mx->m[6], mx->m[7],
+			mx->m[8], mx->m[9], mx->m[10], mx->m[11],
+			mx->m[12], mx->m[13], mx->m[14], mx->m[15]
+	));
+
+}
+
+
 Bool gf_gl_txw_bind(GF_GLTextureWrapper *tx, const char *tx_name, u32 gl_program, u32 texture_unit)
 {
 	if (!texture_unit)
 		texture_unit = GL_TEXTURE0;
 
+	if (gl_program && (gl_program != tx->last_program)) {
+		tx->last_program = gl_program;
+		tx->uniform_setup = GF_FALSE;
+	}
+
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
-	if (!tx->uniform_setup && gl_program) {
+	if ((!tx->uniform_setup || (tx->init_active_texture != texture_unit)) && gl_program) {
 		char szName[100];
 		u32 i;
 		u32 start_idx = texture_unit - GL_TEXTURE0;
 		s32 loc;
+		tx->init_active_texture = texture_unit;
 		for (i=0; i<tx->nb_textures; i++) {
 			sprintf(szName, "_gf_%s_%d", tx_name, i+1);
 			loc = glGetUniformLocation(gl_program, szName);
+			if (!i && (loc == -1))
+				loc = glGetUniformLocation(gl_program, tx_name);
+
 			GL_CHECK_ERR()
 			if (loc == -1) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[GL] Failed to locate texture %s in shader\n", szName));
@@ -1264,11 +1625,30 @@
 			GL_CHECK_ERR()
 		}
 		GL_CHECK_ERR()
+	}
+	if (!tx->uniform_setup && gl_program) {
+		s32 loc;
+		char szName[100];
+		if (tx->is_yuv) {
+			GF_Matrix mx;
+			get_yuv_color_matrix(tx, &mx);
+			sprintf(szName, "_gf_%s_mx", tx_name);
+			loc = glGetUniformLocation(gl_program, szName);
+			if (loc == -1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[GL] Failed to locate texture %s in shader\n", szName));
+				return GF_FALSE;
+			}
+			glUniformMatrix4fv(loc, 1, GL_FALSE, mx.m);
+		}
 		switch (tx->pix_fmt) {
 		case GF_PIXEL_UYVY:
 		case GF_PIXEL_YUYV:
 		case GF_PIXEL_VYUY:
 		case GF_PIXEL_YVYU:
+		case GF_PIXEL_UYVY_10:
+		case GF_PIXEL_YUYV_10:
+		case GF_PIXEL_VYUY_10:
+		case GF_PIXEL_YVYU_10:
 			sprintf(szName, "_gf_%s_width", tx_name);
 			loc = glGetUniformLocation(gl_program, szName);
 			if (loc == -1) {
@@ -1324,6 +1704,10 @@
 		}
 		return GF_TRUE;
 	}
+	if (tx->nb_textures>3) {
+		glActiveTexture(texture_unit + 3);
+		glBindTexture(GL_TEXTURE_2D, tx->textures[3]);
+	}
 	if (tx->nb_textures>2) {
 		glActiveTexture(texture_unit + 2);
 		glBindTexture(GL_TEXTURE_2D, tx->textures[2]);
@@ -1376,11 +1760,11 @@
 {
 }
 
-Bool gf_gl_txw_insert_fragment_shader(u32 pix_fmt, const char *tx_name, char **f_source)
+Bool gf_gl_txw_insert_fragment_shader(u32 pix_fmt, const char *tx_name, char **f_source, Bool y_flip)
 {
 	return GF_FALSE;
 }
-Bool gf_gl_txw_setup(GF_GLTextureWrapper *tx, u32 pix_fmt, u32 width, u32 height, u32 stride, u32 uv_stride, Bool linear_interp, GF_FilterFrameInterface *frame_ifce)
+Bool gf_gl_txw_setup(GF_GLTextureWrapper *tx, u32 pix_fmt, u32 width, u32 height, u32 stride, u32 uv_stride, Bool linear_interp, GF_FilterFrameInterface *frame_ifce, Bool full_range, s32 matrix_coef_or_neg)
 {
 	return GF_FALSE;
 }

gpac-1.0.1.tar.gz/src/utils/list.c -> gpac-2.0.0.tar.gz/src/utils/list.c Changed

gpac-1.0.1.tar.gz/src/utils/math.c -> gpac-2.0.0.tar.gz/src/utils/math.c Changed

gpac-1.0.1.tar.gz/src/utils/module.c -> gpac-2.0.0.tar.gz/src/utils/module.c Changed

@@ -140,6 +140,53 @@
 }
 
 
+void gf_modules_refresh_module_directories()
+{
+	char* directories;
+	char* tmp_dirs;
+	char * pch;
+	u32 i;
+	GF_ModuleManager *pm = gpac_modules_static;
+	if (!pm) return;
+
+	for (i=0; i<pm->num_dirs; i++) {
+		gf_free(pm->dirs[i]);
+	}
+	pm->num_dirs = 0;
+
+	//default module directory
+	directories = (char*)gf_opts_get_key("core", "module-dir");
+	if (directories) {
+		pm->dirs[0] = gf_strdup(directories);
+		pm->num_dirs = 1;
+	}
+
+	/* User-defined directories*/
+	directories = (char*)gf_opts_get_key("core", "mod-dirs");
+	if (! directories) {
+		if (!pm->num_dirs) {
+#ifndef GPAC_CONFIG_IOS
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Modules directories not found - check the \"module-dir\" key is set in the \"core\" section\n"));
+#endif
+		}
+		return;
+	}
+
+	tmp_dirs = directories;
+	pch = strtok (tmp_dirs,";");
+
+	while (pch != NULL) {
+		if (pm->num_dirs == MAX_MODULE_DIRS) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Reach maximum number of module directories %d.\n", MAX_MODULE_DIRS));
+			break;
+		}
+		pm->dirs[pm->num_dirs] = gf_strdup(pch);
+		pm->num_dirs++;
+		pch = strtok (NULL, ";");
+	}
+}
+
+
 /*!
 \brief module manager construtcor
 *
@@ -152,8 +199,6 @@
 void gf_modules_new(GF_Config *config)
 {
 	const char *opt;
-	u32 num_dirs = 0;
-
 	if (!config) return;
 	if (gpac_modules_static) return;
 
@@ -162,7 +207,7 @@
 	if (!gpac_modules_static) return;
 	gpac_modules_static->cfg = config;
 	gpac_modules_static->mutex = gf_mx_new("Module Manager");
-	gf_modules_get_module_directories( &num_dirs);
+	gf_modules_refresh_module_directories();
 
 	/* Initialize module list */
 	gpac_modules_static->plug_list = gf_list_new();
@@ -193,6 +238,14 @@
 }
 
 
+void gf_module_reload_dirs()
+{
+	if (!gpac_modules_static) return;
+	gf_modules_refresh_module_directories();
+	gpac_modules_static->needs_load = GF_TRUE;
+}
+
+
 /*!
 \brief module manager destructor
 *
@@ -250,47 +303,6 @@
 	return gf_list_count(gpac_modules_static->plug_list);
 }
 
-GF_EXPORT
-const char **gf_modules_get_module_directories(u32* num_dirs)
-{
-	char* directories;
-	char* tmp_dirs;
-	char * pch;
-	GF_ModuleManager *pm = gpac_modules_static;
-	if (!pm) return NULL;
-	gf_modules_check_load();
-	if (pm->num_dirs > 0 ) {
-		*num_dirs = pm->num_dirs;
-		return pm->dirs;
-	}
-	if (!pm->cfg) return NULL;
-
-	/* Get directory from config file */
-	directories = (char*)gf_opts_get_key("core", "mod-dirs");
-	if (! directories) {
-#ifndef GPAC_CONFIG_IOS
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Modules directories not found - check the \"ModulesDirectory\" key is set in the \"Core\" section\n"));
-#endif
-		return NULL;
-	}
-
-	tmp_dirs = directories;
-	pch = strtok (tmp_dirs,";");
-
-	while (pch != NULL)
-	{
-		if (pm->num_dirs == MAX_MODULE_DIRS) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Reach maximum number of module directories %d.\n", MAX_MODULE_DIRS));
-			break;
-		}
-
-		pm->dirs[pm->num_dirs] = gf_strdup(pch);
-		pm->num_dirs++;
-		pch = strtok (NULL, ";");
-	}
-	*num_dirs = pm->num_dirs;
-	return pm->dirs;
-}
 
 GF_EXPORT
 GF_BaseInterface *gf_modules_load(u32 whichplug, u32 InterfaceFamily)

gpac-1.0.1.tar.gz/src/utils/module_wrap.h -> gpac-2.0.0.tar.gz/src/utils/module_wrap.h Changed

gpac-1.0.1.tar.gz/src/utils/os_config_init.c -> gpac-2.0.0.tar.gz/src/utils/os_config_init.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -89,13 +89,14 @@
 {
 	char szPath[GF_MAX_PATH];
 	FILE *f;
+	int concatres;
 
 	if (! gf_dir_exists(path)) return 0;
 
 	if (!strcmp(name, TEST_MODULE)) {
 		Bool res = GF_FALSE;
 #if defined(GPAC_STATIC_MODULES) || defined(GPAC_MP4BOX_MINI)
-		if (gf_dir_exists(path)) res = GF_TRUE;
+		res = GF_TRUE;
 #else
 		gf_enum_directory(path, GF_FALSE, mod_enum, &res, NULL);
 #endif
@@ -104,7 +105,11 @@
 		return 1;
 	}
 
-	sprintf(szPath, "%s%c%s", path, GF_PATH_SEPARATOR, name);
+	concatres = snprintf(szPath, GF_MAX_PATH, "%s%c%s", path, GF_PATH_SEPARATOR, name);
+	if (concatres<0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Path too long (limit %d) when trying to concatenate %s and %s\n", GF_MAX_PATH, path, name));
+	}
+
 	//do not use gf_fopen here, we don't want to throw en error if failure
 	f = fopen(szPath, "rb");
 	if (!f) return GF_FALSE;
@@ -120,6 +125,7 @@
 	//were we store gui/%, shaders/*, scripts/*
 	GF_PATH_SHARE,
 	GF_PATH_MODULES,
+	GF_PATH_LIB
 };
 
 #if defined(WIN32) || defined(_WIN32_WCE)
@@ -153,6 +159,7 @@
 	if (!strstr(file_path, "gpac") && !strstr(file_path, "GPAC") ) {
 		HKEY hKey = NULL;
 		DWORD dwSize = GF_MAX_PATH;
+		file_path[0] = 0;
 
 		/*locate the key in current user, then in local machine*/
 #ifdef _WIN32_WCE
@@ -179,7 +186,10 @@
 		RegCloseKey(hKey);
 #endif
 	}
-
+	//empty path, try DLL
+	if (!file_path[0] && (path_type != GF_PATH_LIB)) {
+		get_default_install_path(file_path, GF_PATH_LIB);
+	}
 
 	if (path_type==GF_PATH_APP) return GF_TRUE;
 
@@ -198,6 +208,21 @@
 	/*modules are stored in the GPAC directory (should be changed to GPAC/modules)*/
 	if (path_type==GF_PATH_MODULES) return GF_TRUE;
 
+	if (path_type == GF_PATH_LIB) {
+		HMODULE hm=NULL;
+		if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+			(LPCSTR)&get_default_install_path, &hm) == 0) {
+			return 0;
+		}
+		if (GetModuleFileName(hm, file_path, GF_MAX_PATH) == 0) {
+			return 0;
+		}
+		char *sep = strrchr(file_path, '\\');
+		if (!sep) sep = strrchr(file_path, '/');
+		if (sep) sep[0] = 0;
+		return 1;
+	}
+
 	/*we are looking for the config file path - make sure it is writable*/
 	assert(path_type == GF_PATH_CFG);
 
@@ -288,6 +313,25 @@
 /*Linux, OSX, iOS*/
 #else
 
+//dlinfo
+#if defined(__DARWIN__) || defined(__APPLE__)
+#include <dlfcn.h>
+
+typedef Dl_info _Dl_info;
+#elif defined(GPAC_CONFIG_LINUX)
+
+
+typedef struct
+{
+	const char *dli_fname;
+	void *dli_fbase;
+	const char *dli_sname;
+	void *dli_saddr;
+} _Dl_info;
+int dladdr(void *, _Dl_info *);
+
+#endif
+
 static Bool get_default_install_path(char *file_path, u32 path_type)
 {
 	char app_path[GF_MAX_PATH];
@@ -303,8 +347,9 @@
 		char buf[PATH_MAX];
 		char *res;
 #endif
+
 		if (!user_home) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Couldn't find HOME directory\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Couldn't find HOME directory\n"));
 			return 0;
 		}
 #ifdef GPAC_CONFIG_IOS
@@ -376,6 +421,23 @@
 		return 0;
 	}
 
+	if (path_type==GF_PATH_LIB) {
+#if defined(__DARWIN__) || defined(__APPLE__) || defined(GPAC_CONFIG_LINUX)
+		_Dl_info dl_info;
+		dl_info.dli_fname = NULL;
+		if (dladdr((void *)get_default_install_path, &dl_info)
+			&& dl_info.dli_fname
+		) {
+			strcpy(file_path, dl_info.dli_fname);
+			sep = strrchr(file_path, '/');
+			if (sep) sep[0] = 0;
+			return 1;
+		}
+		return 0;
+#endif
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unknown arch, cannot find library path\n"));
+		return 0;
+	}
 
 	/*locate the app*/
 	if (!get_default_install_path(app_path, GF_PATH_APP)) {
@@ -403,15 +465,20 @@
 	}
 
 	if (path_type==GF_PATH_SHARE) {
+		Bool try_lib=GF_TRUE;
 		if (get_default_install_path(app_path, GF_PATH_CFG)) {
+			sep = strstr(app_path, ".gpac/");
+			if (sep) sep[5]=0;
 			/*GUI not found, look in ~/.gpac/share/gui/ */
-			strcat(app_path, "/.gpac/share");
-			if (check_file_exists("share/gui.bt", app_path, file_path)) return 1;
+			strcat(app_path, "/share");
+			if (check_file_exists("gui/gui.bt", app_path, file_path)) return 1;
 		}
 
 		/*GUI not found, look in gpac distribution if any */
 		if (get_default_install_path(app_path, GF_PATH_APP)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[core] trying to locate share from application dir %s\n", app_path));
 			strcat(app_path, "/");
+retry_lib:
 			sep = strstr(app_path, "/bin/");
 			if (sep) {
 				sep[0] = 0;
@@ -427,23 +494,32 @@
 				if (check_file_exists("gui/gui.bt", app_path, file_path)) return 1;
 			}
 		}
+		if (get_default_install_path(app_path, GF_PATH_LIB)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[core] trying to locate share from dynamic libgpac dir %s\n", app_path));
+			sep = strstr(app_path, "/lib");
+			if (sep) {
+				sep[0] = 0;
+				strcat(app_path, "/share");
+				if (check_file_exists("gui/gui.bt", app_path, file_path)) return 1;
+			}
+			if (try_lib) {
+				try_lib = GF_FALSE;
+				goto retry_lib;
+			}
+		}
 		/*GUI not found, look in .app for OSX case*/
 	}
 
 	if (path_type==GF_PATH_MODULES) {
-		/*look in gpac compilation tree (modules are output in the same folder as apps) */
+		/*look in gpac compilation tree (modules are output in the same folder as apps) and in distrib tree */
 		if (get_default_install_path(app_path, GF_PATH_APP)) {
 			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+
 			/*on OSX check modules subdirectory */
 			strcat(app_path, "/modules");
 			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
 
-			/*modules not found*/
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Couldn't find any modules in standard path (app path %s)\n", app_path));
-		}
-
-		/* look in distrib tree */
-		if (get_default_install_path(app_path, GF_PATH_APP)) {
+			get_default_install_path(app_path, GF_PATH_APP);
 			strcat(app_path, "/");
 			sep = strstr(app_path, "/bin/");
 			if (sep) {
@@ -451,16 +527,27 @@
 				strcat(app_path, "/lib/gpac");
 				if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
 			}
+
+			/*modules not found*/
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Couldn't find any modules in standard path (app path %s)\n", app_path));
+		}
+
+		/*look in lib install */
+		if (get_default_install_path(app_path, GF_PATH_LIB)) {
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+			strcat(app_path, "/gpac");
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Couldn't find any modules in lib path %s\n", app_path));
 		}
 
+
 		/*modules not found, look in ~/.gpac/modules/ */
 		if (get_default_install_path(app_path, GF_PATH_CFG)) {
-			strcpy(app_path, file_path);
-			strcat(app_path, "/.gpac/modules");
+			strcat(app_path, "/modules");
 			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
 		}
 		/*modules not found, failure*/
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Couldn't find any modules in HOME path (app path %s)\n", app_path));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Couldn't find any modules in HOME path (app path %s)\n", app_path));
 		return 0;
 	}
 
@@ -522,28 +609,57 @@
 
 #endif
 
+const char * gf_get_default_cache_directory_ex(Bool do_create);
+
+GF_EXPORT
+void gf_get_default_font_dir(char szPath[GF_MAX_PATH])
+{
+#if defined(_WIN32_WCE)
+	strcpy(szPath, "\\Windows");
+
+#elif defined(WIN32)
+	GetWindowsDirectory((char*)szPath, MAX_PATH);
+	if (szPath[strlen((char*)szPath)-1] != '\\') strcat((char*)szPath, "\\");
+	strcat((char *)szPath, "Fonts");
+
+#elif defined(__APPLE__) && defined(GPAC_CONFIG_IOS)
+	strcpy(szPath, "/System/Library/Fonts/Cache,/System/Library/Fonts/AppFonts,/System/Library/Fonts/Core,/System/Library/Fonts/Extra");
+#elif defined(__APPLE__)
+	strcpy(szPath, "/System/Library/Fonts,/Library/Fonts");
+
+#elif defined(GPAC_CONFIG_ANDROID)
+	strcpy(szPath, "/system/fonts/");
+#else
+	//scan all /usr/share/fonts, not just /usr/share/fonts/truetype/ which does not exist in some distrros
+	strcpy(szPath, "/usr/share/fonts/");
+#endif
+}
+
 
 static GF_Config *create_default_config(char *file_path, const char *profile)
 {
 	Bool moddir_found;
 	GF_Config *cfg;
-	char szProfilePath[GF_MAX_PATH];
 	char szPath[GF_MAX_PATH];
 
 	if (! get_default_install_path(file_path, GF_PATH_CFG)) {
-		return NULL;
-	}
-	/*Create the config file*/
-	if (profile) {
-		sprintf(szPath, "%s%cprofiles%c%s%c%s", file_path, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, profile, GF_PATH_SEPARATOR, CFG_FILE_NAME);
-	} else {
-		sprintf(szPath, "%s%c%s", file_path, GF_PATH_SEPARATOR, CFG_FILE_NAME);
+		profile = "0";
 	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Trying to create config file: %s\n", szPath ));
+	/*Create temp config file*/
 	if (profile && !strcmp(profile, "0")) {
 		cfg = gf_cfg_new(NULL, NULL);
 	} else {
-		FILE *f = gf_fopen(szPath, "wt");
+		FILE *f;
+
+		/*create config file from disk*/
+		if (profile) {
+			sprintf(szPath, "%s%cprofiles%c%s%c%s", file_path, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, profile, GF_PATH_SEPARATOR, CFG_FILE_NAME);
+		} else {
+			sprintf(szPath, "%s%c%s", file_path, GF_PATH_SEPARATOR, CFG_FILE_NAME);
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Trying to create config file: %s\n", szPath ));
+
+		f = gf_fopen(szPath, "wt");
 		if (!f) return NULL;
 		gf_fclose(f);
 
@@ -551,7 +667,6 @@
 	}
 
 	if (!cfg) return NULL;
-	strcpy(szProfilePath, szPath);
 
 
 #ifndef GPAC_CONFIG_IOS
@@ -570,9 +685,9 @@
 
 
 	if (!moddir_found) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] default modules not found\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Core] default modules directory not found\n"));
 	} else {
-		gf_cfg_set_key(cfg, "core", "mod-dirs", szPath);
+		gf_cfg_set_key(cfg, "core", "module-dir", szPath);
 	}
 
 #if defined(GPAC_CONFIG_IOS)
@@ -584,7 +699,7 @@
 	}
 #else
 	/*get default temporary directoy */
-	gf_cfg_set_key(cfg, "core", "cache", gf_get_default_cache_directory());
+	gf_cfg_set_key(cfg, "core", "cache", gf_get_default_cache_directory_ex(GF_FALSE));
 #endif
 
 	gf_cfg_set_key(cfg, "core", "ds-disable-notif", "no");
@@ -593,30 +708,8 @@
 	gf_cfg_set_key(cfg, "core", "font-reader", "FreeType Font Reader");
 	gf_cfg_set_key(cfg, "core", "rescan-fonts", "yes");
 
-	gf_cfg_set_key(cfg, "core", "js-dirs", "$GJS");
-
-
-#if defined(_WIN32_WCE)
-	/*FIXME - is this true on all WinCE systems??*/
-	strcpy(szPath, "\\Windows");
-#elif defined(WIN32)
-	GetWindowsDirectory((char*)szPath, MAX_PATH);
-	if (szPath[strlen((char*)szPath)-1] != '\\') strcat((char*)szPath, "\\");
-	strcat((char *)szPath, "Fonts");
-#elif defined(__APPLE__)
-
-#ifdef GPAC_CONFIG_IOS
-	strcpy(szPath, "/System/Library/Fonts/Cache,/System/Library/Fonts/AppFonts,/System/Library/Fonts/Core,/System/Library/Fonts/Extra");
-#else
-	strcpy(szPath, "/Library/Fonts");
-#endif
 
-#elif defined(GPAC_CONFIG_ANDROID)
-	strcpy(szPath, "/system/fonts/");
-#else
-	//scan all /usr/share/fonts, not just /usr/share/fonts/truetype/ which does not exist in some distrros
-	strcpy(szPath, "/usr/share/fonts/");
-#endif
+	gf_get_default_font_dir(szPath);
 	gf_cfg_set_key(cfg, "core", "font-dirs", szPath);
 
 	gf_cfg_set_key(cfg, "core", "cache-size", "100M");
@@ -677,8 +770,8 @@
 
 	if (profile && !strcmp(profile, "0")) {
 		GF_Err gf_cfg_set_filename(GF_Config *iniFile, const char * fileName);
-		sprintf(szPath, "%s%c%s", file_path, GF_PATH_SEPARATOR, CFG_FILE_NAME);
-		gf_cfg_set_filename(cfg, szPath);
+//		sprintf(szPath, "%s%c%s", gf_get_default_cache_directory(), GF_PATH_SEPARATOR, CFG_FILE_NAME);
+		gf_cfg_set_filename(cfg, CFG_FILE_NAME);
 		gf_cfg_discard_changes(cfg);
 		return cfg;
 	}
@@ -719,16 +812,16 @@
 	const char *opt;
 
 	if ( get_default_install_path(path, GF_PATH_MODULES) ) {
-		opt = gf_cfg_get_key(cfg, "core", "mod-dirs");
+		opt = gf_cfg_get_key(cfg, "core", "module-dir");
 		//for OSX, we can have an install in /usr/... and an install in /Applications/Osmo4.app - always change
 #if defined(__DARWIN__) || defined(__APPLE__)
 		if (!opt || strcmp(opt, path))
-			gf_cfg_set_key(cfg, "core", "mod-dirs", path);
+			gf_cfg_set_key(cfg, "core", "module-dir", path);
 #else
 
 		//otherwise only check we didn't switch between a 64 bit version and a 32 bit version
 		if (!opt) {
-			gf_cfg_set_key(cfg, "core", "mod-dirs", path);
+			gf_cfg_set_key(cfg, "core", "module-dir", path);
 		} else {
 			Bool erase_modules_dir = GF_FALSE;
 			const char *opt64 = gf_cfg_get_key(cfg, "core", "64bits");
@@ -753,7 +846,7 @@
 			gf_cfg_set_key(cfg, "core", "64bits", opt64);
 
 			if (erase_modules_dir) {
-				gf_cfg_set_key(cfg, "core", "mod-dirs", path);
+				gf_cfg_set_key(cfg, "core", "module-dir", path);
 			}
 		}
 #endif
@@ -797,7 +890,7 @@
 
 	if (profile) {
 		prof_len = (u32) strlen(profile);
-		prof_opt = gf_url_colon_suffix(profile);
+		prof_opt = gf_url_colon_suffix(profile, 0);
 		if (prof_opt) {
 			prof_len -= (u32) strlen(prof_opt);
 			if (strstr(prof_opt, "reload")) force_new_cfg = GF_TRUE;
@@ -827,8 +920,12 @@
 	}
 
 	if (!get_default_install_path(szPath, GF_PATH_CFG)) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[core] Fatal error: Cannot create global config file in application or user home directory - no write access\n"));
-		goto exit;
+		if (!profile || strcmp(profile, "0")) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[core] Cannot locate global config path in application or user home directory, using temporary config file\n"));
+		}
+		profile="0";
+		cfg = create_default_config(szPath, profile);
+		goto skip_cfg;
 	}
 
 	if (profile) {
@@ -849,7 +946,7 @@
 
 		if (nb_old_sec || force_new_cfg) {
 			if (nb_old_sec && (!profile || strcmp(profile, "0"))) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[core] Incompatible (0.8.0 or older) config file %s found in %s - creating new file\n", CFG_FILE_NAME, szPath ));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[core] Incompatible config file %s found in %s - creating new file\n", CFG_FILE_NAME, szPath ));
 			}
 			gf_cfg_del(cfg);
 			cfg = create_default_config(szPath, profile);
@@ -862,6 +959,8 @@
 		}
 		cfg = create_default_config(szPath, profile);
 	}
+
+skip_cfg:
 	if (!cfg) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] Cannot create config file %s in %s directory\n", CFG_FILE_NAME, szPath));
 		goto exit;
@@ -874,13 +973,18 @@
 	check_modules_dir(cfg);
 
 	if (!gf_cfg_get_key(cfg, "core", "store-dir")) {
-		char *sep;
-		strcpy(szPath, gf_cfg_get_filename(cfg));
-		sep = strrchr(szPath, '/');
-		if (!sep) sep = strrchr(szPath, '\\');
-		if (sep) sep[0] = 0;
-		strcat(szPath, "/Storage");
-		if (!gf_dir_exists(szPath)) gf_mkdir(szPath);
+		if (profile && !strcmp(profile, "0")) {
+			strcpy(szPath, gf_get_default_cache_directory_ex(GF_FALSE) );
+			strcat(szPath, "/Storage");
+		} else {
+			char *sep;
+			strcpy(szPath, gf_cfg_get_filename(cfg));
+			sep = strrchr(szPath, '/');
+			if (!sep) sep = strrchr(szPath, '\\');
+			if (sep) sep[0] = 0;
+			strcat(szPath, "/Storage");
+			if (!gf_dir_exists(szPath)) gf_mkdir(szPath);
+		}
 		gf_cfg_set_key(cfg, "core", "store-dir", szPath);
 	}
 
@@ -1025,72 +1129,77 @@
 #include <gpac/main.h>
 
 GF_GPACArg GPAC_Args[] = {
+ GF_DEF_ARG("tmp", NULL, "specify directory for temporary file creation instead of OS-default temportary file management", NULL, NULL, GF_ARG_STRING, 0),
 GF_DEF_ARG("noprog", NULL, "disable progress messages", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_LOG),
 GF_DEF_ARG("quiet", NULL, "disable all messages, including errors", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_LOG),
 GF_DEF_ARG("log-file", "lf", "set output log file", NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_LOG),
- GF_DEF_ARG("log-clock", "lc", "log time in micro sec since start time of GPAC before each log line", NULL, NULL, GF_ARG_BOOL, GF_ARG_SUBSYS_LOG),
- GF_DEF_ARG("log-utc", "lu", "log UTC time in ms before each log line", NULL, NULL, GF_ARG_BOOL, GF_ARG_SUBSYS_LOG),
- GF_DEF_ARG("logs", NULL, "set log tools and levels. \n"\
-			" \n"\
-			"You can independently log different tools involved in a session. \n"\
-			"log_args is formatted as a ':'-separated list of `toolX[:toolZ]@levelX` \n"\
-	 "`levelX` can be one of:\n"\
-	 "- quiet: skip logs\n"\
-	 "- error: logs only error messages\n"\
-	 "- warning: logs error+warning messages\n"\
-	 "- info: logs error+warning+info messages\n"\
-	 "- debug: logs all messages\n"\
-	 "`toolX` can be one of:\n"\
-	 "- core: libgpac core\n"\
-	 "- coding: bitstream formats (audio, video, scene)\n"\
-	 "- container: container formats (ISO File, MPEG-2 TS, AVI, ...)\n"\
-	 "- network: network data except RTP trafic\n"\
-	 "- http: HTTP trafic\n"\
-	 "- rtp: RTP trafic\n"\
-	 "- author: authoring tools (hint, import, export)\n"\
-	 "- sync: terminal sync layer\n"\
-	 "- codec: terminal codec messages\n"\
-	 "- parser: scene parsers (svg, xmt, bt) and other\n"\
-	 "- media: terminal media object management\n"\
-	 "- scene: scene graph and scene manager\n"\
-	 "- script: scripting engine messages\n"\
-	 "- interact: interaction engine (events, scripts, etc)\n"\
-	 "- smil: SMIL timing engine\n"\
-	 "- compose: composition engine (2D, 3D, etc)\n"\
-	 "- mmio: Audio/Video HW I/O management\n"\
-	 "- rti: various run-time stats\n"\
-	 "- cache: HTTP cache subsystem\n"\
-	 "- audio: Audio renderer and mixers\n"\
-	 "- mem: GPAC memory tracker\n"\
-	 "- dash: HTTP streaming logs\n"\
-	 "- module: GPAC modules (av out, font engine, 2D rasterizer)\n"\
-	 "- filter: filters debugging\n"\
-	 "- sched: filter session scheduler debugging\n"\
-	 "- mutex: log all mutex calls\n"\
-	 "- atsc: ATSC3 debugging\n"\
-	 "- all: all tools logged - other tools can be specified afterwards. \n"\
-	 "The special keyword `ncl` can be set to disable color logs. \n"\
-	 "The special keyword `strict` can be set to exit at first error. \n"\
-	 "EX -logs all@info:dash@debug:ncl\n"\
-			"This moves all log to info level, dash to debug level and disable color logs"\
+ GF_DEF_ARG("log-clock", "lc", "log time in micro sec since start time of GPAC before each log line except for `app` tool", NULL, NULL, GF_ARG_BOOL, GF_ARG_SUBSYS_LOG),
+ GF_DEF_ARG("log-utc", "lu", "log UTC time in ms before each log line except for `app` tool", NULL, NULL, GF_ARG_BOOL, GF_ARG_SUBSYS_LOG),
+ GF_DEF_ARG("logs", NULL, "set log tools and levels. \n"
+			" \n"
+			"You can independently log different tools involved in a session. \n"
+			"log_args is formatted as a colon (':') separated list of `toolX[:toolZ]@levelX` \n"
+	 "`levelX` can be one of:\n"
+	 "- quiet: skip logs\n"
+	 "- error: logs only error messages\n"
+	 "- warning: logs error+warning messages\n"
+	 "- info: logs error+warning+info messages\n"
+	 "- debug: logs all messages\n"
+	 "\n`toolX` can be one of:\n"
+	 "- core: libgpac core\n"
+	 "- mutex: log all mutex calls\n"
+	 "- mem: GPAC memory tracker\n"
+	 "- module: GPAC modules (av out, font engine, 2D rasterizer)\n"
+	 "- filter: filter session debugging\n"
+	 "- sched: filter session scheduler debugging\n"
+	 "- codec: codec messages (used by encoder and decoder filters)\n"
+	 "- coding: bitstream formats (audio, video, scene)\n"
+	 "- container: container formats (ISO File, MPEG-2 TS, AVI, ...) and multiplexer/demultiplexer filters\n"
+	 "- network: TCP/UDP sockets and TLS\n"
+	 "- http: HTTP traffic\n"
+	 "- cache: HTTP cache subsystem\n"
+	 "- rtp: RTP traffic\n"
+	 "- dash: HTTP streaming logs\n"
+	 "- route: ROUTE (ATSC3) debugging\n"
+	 "- media: messages from generic filters and reframer/rewriter filters\n"
+	 "- parser: textual parsers (svg, xmt, bt, ...)\n"
+	 "- mmio: I/O management (AV devices, file, pipes, OpenGL)\n"
+	 "- audio: audio renderer/mixer/output\n"
+	 "- script: script engine except console log\n"
+	 "- console: script console log\n"
+	 "- scene: scene graph and scene manager\n"
+	 "- compose: composition engine (2D, 3D, etc)\n"
+	 "- ctime: media and SMIL timing info from composition engine\n"
+	 "- interact: interaction messages (UI events and triggered DOM events and VRML route)\n"
+	 "- rti: run-time stats of compositor\n"
+	 "- all: all tools logged - other tools can be specified afterwards. \n"
+	 "The special keyword `ncl` can be set to disable color logs. \n"
+	 "The special keyword `strict` can be set to exit at first error. \n"
+	 "\nEX -logs=all@info:dash@debug:ncl\n"
+			"This moves all log to info level, dash to debug level and disable color logs"
 			, NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_LOG),
+ GF_DEF_ARG("proglf", NULL, "use new line at each progress messages", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_LOG),
 
 GF_DEF_ARG("strict-error", "se", "exit after the first error is reported", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("store-dir", NULL, "set storage directory", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_CORE),
- GF_DEF_ARG("mod-dirs", NULL, "set module directories", NULL, NULL, GF_ARG_STRINGS, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("mod-dirs", NULL, "set additional module directories as a semi-colon `;` separated list", NULL, NULL, GF_ARG_STRINGS, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("js-dirs", NULL, "set javascript directories", NULL, NULL, GF_ARG_STRINGS, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("no-js-mods", NULL, "disable javascript module loading", NULL, NULL, GF_ARG_STRINGS, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
- GF_DEF_ARG("ifce", NULL, "set default multicast interface through interface IP address", NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("ifce", NULL, "set default multicast interface through interface IP address (default is 127.0.0.1)", NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("lang", NULL, "set preferred language", NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_CORE),
- GF_DEF_ARG("cfg", "opt", "set configuration file value. The string parameter can be formatted as:\n"\
-	 "- `section:key=val`: set the key to a new value\n"\
-	 "- `section:key=null`, `section:key`: remove the key\n"\
-	 "- `section:*=null`: remove the section"\
+ GF_DEF_ARG("cfg", "opt", "get or set configuration file value. The string parameter can be formatted as:\n"
+	 "- `section:key=val`: set the key to a new value\n"
+	 "- `section:key=null`, `section:key`: remove the key\n"
+	 "- `section=null`: remove the section\n"
+	 "- no argument: print the entire configuration file\n"
+	 "- `section`: print the given section\n"
+	 "- `section:key`: print the given `key` in `section` (section can be set to `*`)"
+	 "- `*:key`: print the given `key` in all sections"
 			, NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("no-save", NULL, "discard any changes made to the config file upon exit", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("version", NULL, "set to GPAC version, used to check config file refresh", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_HIDE|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("mod-reload", NULL, "unload / reload module shared libs when no longer used", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
- GF_DEF_ARG("for-test", NULL, "disable all creation/modif dates and GPAC versions in files", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("for-test", NULL, "disable all creation/modification dates and GPAC versions in files", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("old-arch", NULL, "enable compatibility with pre-filters versions of GPAC", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("ntp-shift", NULL, "shift NTP clock by given amount in seconds", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("devclass", NULL, "set device class\n"
@@ -1099,46 +1208,56 @@
 "- desktop: desktop device", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_HIDE|GF_ARG_SUBSYS_CORE),
 
 GF_DEF_ARG("bs-cache-size", NULL, "cache size for bitstream read and write from file (0 disable cache, slower IOs)", "512", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("no-check", NULL, "disable compliance tests for inputs (ISOBMFF for now). This will likely result in random crashes", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("unhandled-rejection", NULL, "dump unhandled promise rejections", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
 GF_DEF_ARG("cache", NULL, "cache directory location", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("proxy-on", NULL, "enable HTTP proxy", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("proxy-name", NULL, "set HTTP proxy address", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("proxy-port", NULL, "set HTTP proxy port", "80", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("maxrate", NULL, "set max HTTP download rate in bits per sec. 0 means unlimited", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("no-cache", NULL, "disable HTTP caching", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
- GF_DEF_ARG("offline-cache", NULL, "enable offline HTTP caching (no revalidation of existing resource in cache)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
+ GF_DEF_ARG("offline-cache", NULL, "enable offline HTTP caching (no re-validation of existing resource in cache)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("clean-cache", NULL, "indicate if HTTP cache should be clean upon launch/exit", NULL, NULL, GF_ARG_BOOL, GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("cache-size", NULL, "specify cache size in bytes", "100M", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("head-timeout", NULL, "set HTTP head request timeout in milliseconds", "5000", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("req-timeout", NULL, "set HTTP/RTSP request timeout in milliseconds", "20000", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
+ GF_DEF_ARG("no-timeout", NULL, "ignore HTTP 1.1 timeout in keep-alive", "false", NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("broken-cert", NULL, "enable accepting broken SSL certificates", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("user-agent", "ua", "set user agent name for HTTP/RTSP", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("user-profileid", NULL, "set user profile ID (through **X-UserProfileID** entity header) in HTTP requests", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("user-profile", NULL, "set user profile filename. Content of file is appended as body to HTTP HEAD/GET requests, associated Mime is **text/xml**", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("query-string", NULL, "insert query string (without `?`) to URL on requests", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 GF_DEF_ARG("dm-threads", NULL, "force using threads for async download requests rather than session scheduler", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
+ GF_DEF_ARG("cte-rate-wnd", NULL, "set window analysis length in milliseconds for chunk-transfer encoding rate estimation", "20", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
+
+#ifdef GPAC_HAS_HTTP2
+ GF_DEF_ARG("no-h2", NULL, "disable HTTP2", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
+ GF_DEF_ARG("no-h2c", NULL, "disable HTTP2 upgrade (i.e. over non-TLS)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
+ GF_DEF_ARG("h2-copy", NULL, "enable intermediate copy of data in nghttp2 (default is disabled but may report as broken frames in wireshark)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
+#endif
 
 GF_DEF_ARG("dbg-edges", NULL, "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)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
-GF_DEF_ARG("full-link", NULL, "throw error if any pid in the filter graph cannot be linked", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
+GF_DEF_ARG("full-link", NULL, "throw error if any PID in the filter graph cannot be linked", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
 
 GF_DEF_ARG("no-block", NULL, "disable blocking mode of filters\n"
 			"- no: enable blocking mode\n"
-			"- fanout: disable blocking on fanout, unblocking the PID as soon as one of its destinations requires a packet\n"
+			"- fanout: disable blocking on fan-out, unblocking the PID as soon as one of its destinations requires a packet\n"
 			"- all: disable blocking", "no", "no|fanout|all", GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
 GF_DEF_ARG("no-reg", NULL, "disable regulation (no sleep) in session", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
- GF_DEF_ARG("no-reassign", NULL, "disable source filter reassignment in pid graph resolution", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
- GF_DEF_ARG("sched", NULL, "set scheduler mode\n"\
-		"- free: lock-free queues except for task list (default)\n"\
-		"- lock: mutexes for queues when several threads\n"\
-		"- freex: lock-free queues including for task lists (experimental)\n"\
-		"- flock: mutexes for queues even when no thread (debug mode)\n"\
+ GF_DEF_ARG("no-reassign", NULL, "disable source filter reassignment in PID graph resolution", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
+ GF_DEF_ARG("sched", NULL, "set scheduler mode\n"
+		"- free: lock-free queues except for task list (default)\n"
+		"- lock: mutexes for queues when several threads\n"
+		"- freex: lock-free queues including for task lists (experimental)\n"
+		"- flock: mutexes for queues even when no thread (debug mode)\n"
 		"- direct: no threads and direct dispatch of tasks whenever possible (debug mode)", "free", "free|lock|flock|freex|direct", GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
- GF_DEF_ARG("max-chain", NULL, "set maximum chain length when resolving filter links. Default value covers for __[ in -> ] demux -> reframe -> decode -> encode -> reframe -> mux [ -> out]__. Filter chains loaded for adaptation (eg pixel format change) are loaded after the link resolution. Setting the value to 0 disables dynamic link resolution. You will have to specify the entire chain manually", "6", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
+ GF_DEF_ARG("max-chain", NULL, "set maximum chain length when resolving filter links. Default value covers for __[ in -> ] dmx -> reframe -> decode -> encode -> reframe -> mx [ -> out]__. Filter chains loaded for adaptation (e.g. pixel format change) are loaded after the link resolution. Setting the value to 0 disables dynamic link resolution. You will have to specify the entire chain manually", "6", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
 GF_DEF_ARG("max-sleep", NULL, "set maximum sleep time slot in milliseconds when regulation is enabled", "50", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
 
 GF_DEF_ARG("threads", NULL, "set N extra thread for the session. -1 means use all available cores", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
 GF_DEF_ARG("no-probe", NULL, "disable data probing on sources and relies on extension (faster load but more error-prone)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
 GF_DEF_ARG("no-argchk", NULL, "disable tracking of argument usage (all arguments will be considered as used)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
- GF_DEF_ARG("blacklist", NULL, "blacklist the filters listed in the given string (comma-separated list)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
+ GF_DEF_ARG("blacklist", NULL, "blacklist the filters listed in the given string (comma-separated list). If first character is '-', this is a whitelist, i.e. only filters listed in the given string will be allowed", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
 GF_DEF_ARG("no-graph-cache", NULL, "disable internal caching of filter graph connections. If disabled, the graph will be recomputed at each link resolution (lower memory usage but slower)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
 GF_DEF_ARG("no-reservoir", NULL, "disable memory recycling for packets and properties. This uses much less memory but stresses the system memory allocator much more", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
 
@@ -1147,19 +1266,19 @@
 "- always: always on hardware\n"
 "- never: always on system memory\n"
 "- auto: selected by GPAC based on content type (graphics or video)", "auto", "auto|always|never", GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("pref-yuv4cc", NULL, "set prefered YUV 4CC for overlays (used by DirectX only)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
+ GF_DEF_ARG("pref-yuv4cc", NULL, "set preferred YUV 4CC for overlays (used by DirectX only)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
 GF_DEF_ARG("yuv-overlay", NULL, "indicate YUV overlay is possible on the video card. Always overridden by video output module", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_HIDE|GF_ARG_SUBSYS_VIDEO),
 GF_DEF_ARG("offscreen-yuv", NULL, "indicate if offscreen yuv->rgb is enabled. can be set to false to force disabling", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
 GF_DEF_ARG("overlay-color-key", NULL, "color to use for overlay keying, hex format", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("gl-bits-comp", NULL, "number of bits per color component in openGL", "8", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("gl-bits-depth", NULL, "number of bits for depth buffer in openGL", "16", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("gl-doublebuf", NULL, "enable openGL double buffering", "yes", NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
+ GF_DEF_ARG("gl-bits-comp", NULL, "number of bits per color component in OpenGL", "8", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
+ GF_DEF_ARG("gl-bits-depth", NULL, "number of bits for depth buffer in OpenGL", "16", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
+ GF_DEF_ARG("gl-doublebuf", NULL, "enable OpenGL double buffering", "yes", NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
 GF_DEF_ARG("sdl-defer", NULL, "use defer rendering for SDL", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
 GF_DEF_ARG("no-colorkey", NULL, "disable color keying at the video output level", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
 GF_DEF_ARG("glfbo-txid", NULL, "set output texture ID when using `glfbo` output. The OpenGL context shall be initialized and gf_term_process shall be called with the OpenGL context active", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
 GF_DEF_ARG("video-output", NULL, "indicate the name of the video output module to use (see `gpac -h modules`)."
- 	" The reserved name `glfbo` is used in player mode to draw in the openGL texture identified by [-glfbo-txid](). "
- 	" In this mode, the application is responsible for sending event to the terminal"
+	" The reserved name `glfbo` is used in player mode to draw in the OpenGL texture identified by [-glfbo-txid](). "
+	" In this mode, the application is responsible for sending event to the terminal"
 , NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
 GF_DEF_ARG("audio-output", NULL, "indicate the name of the audio output module to use", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
 GF_DEF_ARG("alsa-devname", NULL, "set ALSA dev name", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_AUDIO),
@@ -1169,7 +1288,7 @@
 GF_DEF_ARG("font-dirs", NULL, "indicate comma-separated list of directories to scan for fonts", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_TEXT),
 GF_DEF_ARG("rescan-fonts", NULL, "indicate the font directory must be rescanned", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_TEXT),
 GF_DEF_ARG("wait-fonts", NULL, "wait for SVG fonts to be loaded before displaying frames", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_TEXT),
-
+ GF_DEF_ARG("webvtt-hours", NULL, "force writing hour when serializing WebVTT", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_TEXT),
 GF_DEF_ARG("rmt", NULL, "enable profiling through [Remotery](https://github.com/Celtoys/Remotery). A copy of Remotery visualizer is in gpac/share/vis, usually installed in __/usr/share/gpac/vis__ or __Program Files/GPAC/vis__", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_RMT),
 GF_DEF_ARG("rmt-port", NULL, "set remotery port", "17815", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_RMT),
 GF_DEF_ARG("rmt-reuse", NULL, "allow remotery to reuse port", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_RMT),
@@ -1179,6 +1298,12 @@
 GF_DEF_ARG("rmt-qsize", NULL, "set remotery message queue size in bytes", "131072", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_RMT),
 GF_DEF_ARG("rmt-log", NULL, "redirect logs to remotery (experimental, usually not well handled by browser)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_RMT),
 GF_DEF_ARG("rmt-ogl", NULL, "make remotery sample opengl calls", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_RMT),
+
+ GF_DEF_ARG("m2ts-vvc-old", NULL, "hack for old TS streams using 0x32 for VVC instead of 0x33", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HACKS),
+ GF_DEF_ARG("piff-force-subsamples", NULL, "hack for PIFF PSEC files generated by 0.9.0 and 1.0 MP4Box with wrong subsample_count inserted for audio", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HACKS),
+ GF_DEF_ARG("vvdec-annexb", NULL, "hack for old vvdec+libavcodec supporting only annexB format", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HACKS),
+
+
 {0}
 };
 
@@ -1256,6 +1381,16 @@
 	char *sep, *sep2, szSec[1024], szKey[1024], szVal[1024];
 	sep = strchr(opt_string, ':');
 	if (!sep) {
+		sep = strchr(opt_string, '=');
+		if (sep && !stricmp(sep, "=null")) {
+			sepIdx = sep - opt_string;
+			if (sepIdx>=1024) sepIdx = 1023;
+			strncpy(szSec, opt_string, sepIdx);
+			szSec[sepIdx] = 0;
+			gf_opts_del_section(szSec);
+			return GF_TRUE;
+		}
+
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreArgs] Badly formatted option %s - expected Section:Name=Value\n", opt_string ) );
 		return GF_FALSE;
 	}
@@ -1282,7 +1417,7 @@
 	sepIdx = strlen(sep2+1);
 	if (sepIdx>=1024)
 		sepIdx = 1023;
-	strncpy(szVal, sep2+1, sepIdx);
+	memcpy(szVal, sep2+1, sepIdx);
 	szVal[sepIdx] = 0;
 
 	if (!stricmp(szKey, "*")) {
@@ -1309,6 +1444,8 @@
 	return GF_TRUE;
 }
 
+void gf_module_reload_dirs();
+
 Bool gf_opts_load_option(const char *arg_name, const char *val, Bool *consumed_next, GF_Err *e)
 {
 	const GF_GPACArg *arg = NULL;
@@ -1328,7 +1465,48 @@
 
 	if (!strcmp(arg->name, "cfg")) {
 		*consumed_next = GF_TRUE;
-		if (! gf_sys_set_cfg_option(val)) *e = GF_BAD_PARAM;
+		if (val && strchr(val, '=')) {
+			if (! gf_sys_set_cfg_option(val)) *e = GF_BAD_PARAM;
+		} else {
+			u32 sec_len = 0;
+			char *sep = val ? strchr(val, ':') : NULL;
+			u32 sec_count = gf_opts_get_section_count();
+			if (sep) {
+				sec_len = (u32) (sep - val - 1);
+				sep++;
+			} else if (val) {
+				sec_len = (u32) strlen(val);
+			}
+			for (i=0; i<sec_count; i++) {
+				u32 k, key_count;
+				Bool sec_hdr_done = GF_FALSE;
+				const char *sname = gf_opts_get_section_name(i);
+				key_count = sname ? gf_opts_get_key_count(sname) : 0;
+				if (!key_count) continue;
+
+				if (sec_len) {
+					if (!strncmp(val, "*", sec_len) || !strncmp(val, "@", sec_len)) {
+					} else if (strncmp(val, sname, sec_len) || (sec_len != (u32) strlen(sname) ) ) {
+						continue;
+					}
+				}
+				for (k=0; k<key_count; k++) {
+					const char *kname = gf_opts_get_key_name(sname, k);
+					const char *kval = kname ? gf_opts_get_key(sname, kname) : NULL;
+					if (!kval) continue;
+					if (sep && strcmp(sep, kname)) continue;
+
+					if (!sec_hdr_done) {
+						sec_hdr_done = GF_TRUE;
+						fprintf(stdout, "[%s]\n", sname);
+					}
+					fprintf(stdout, "%s=%s\n", kname, kval);
+				}
+				if (sec_hdr_done)
+					fprintf(stdout, "\n");
+			}
+			exit(0);
+		}
 		return GF_TRUE;
 	}
 	if (!strcmp(arg->name, "strict-error")) {
@@ -1355,8 +1533,12 @@
 		*consumed_next = GF_TRUE;
 		if (!val && (arg->type==GF_ARG_BOOL))
 			gf_opts_set_key("temp", arg->name, "true");
-		else
+		else {
 			gf_opts_set_key("temp", arg->name, val);
+			if (!strcmp(arg->name, "mod-dirs")) {
+				gf_module_reload_dirs();
+			}
+		}
 	}
 	return GF_TRUE;
 }
@@ -1435,12 +1617,17 @@
 		}
 		sep = strstr(arg->description, ".\n");
 		if (sep) {
-			fprintf(stderr, "\nWARNING: arg %s bad description format \"%s\", should not contain .\\n", arg->name, arg->description);
+			fprintf(stderr, "\nWARNING: arg %s bad description format \"%s\", should not contain .\\n \n", arg->name, arg->description);
+			exit(1);
+		}
+		sep = strstr(arg->description, "- ");
+		if (sep && (sep[-1]!='\n') && !strcmp(sep, "- see")) {
+			fprintf(stderr, "\nWARNING: arg %s bad description format \"%s\", should have \\n before first bullet\n", arg->name, arg->description);
 			exit(1);
 		}
 
 		sep = strchr(arg->description, ' ');
-		if (sep) {
+		if (sep && (sep>arg->description)) {
 			sep--;
 			if ((sep[0] == 's') && (sep[-1] != 's')) {
 				fprintf(stderr, "\nWARNING: arg %s bad description format \"%s\", should use infintive\n", arg->name, arg->description);
@@ -1488,7 +1675,10 @@
 		gf_free(arg_name);
 	}
 
-	if (arg->type==GF_ARG_INT && arg->values && strchr(arg->values, '|')) {
+	if (arg->type==GF_ARG_CUSTOM) {
+		if (arg->val)
+			gf_sys_format_help(helpout, flags, " `%s`", arg->val);
+	} else if (arg->type==GF_ARG_INT && arg->values && strchr(arg->values, '|')) {
 		gf_sys_format_help(helpout, flags, " (Enum");
 		if (arg->val)
 			gf_sys_format_help(helpout, flags, ", default: **%s**", arg->val);
@@ -1501,6 +1691,8 @@
 		case GF_ARG_DOUBLE: gf_sys_format_help(helpout, flags, "number"); break;
 		case GF_ARG_STRING: gf_sys_format_help(helpout, flags, "string"); break;
 		case GF_ARG_STRINGS: gf_sys_format_help(helpout, flags, "string list"); break;
+		case GF_ARG_4CC: gf_sys_format_help(helpout, flags, "4CC"); break;
+		case GF_ARG_4CCS: gf_sys_format_help(helpout, flags, "4CC list"); break;
 		default: break;
 		}
 		if (arg->val)
@@ -1584,6 +1776,50 @@
 
 static u32 line_pos = 0;
 
+//#define CHECK_BALANCED_SEPS
+
+#ifdef CHECK_BALANCED_SEPS
+static void check_char_balanced(char *buf, char c)
+{
+	char *txt = buf;
+	while (txt) {
+		char *bquote_next;
+		char *bquote = strchr(txt, c);
+		if (!bquote) break;
+		if (c=='\'') {
+			if ((bquote[1]=='s') && (bquote[2]==' ')) {
+				txt = bquote + 1;
+				continue;
+			}
+		}
+		bquote_next = strchr(bquote+1, c);
+		if (!bquote_next) {
+			fprintf(stderr, "Missing closing %c after %s\n", c, bquote);
+			exit(1);
+		}
+		switch (bquote_next[1] ) {
+		case 0:
+		case '\n':
+		case ' ':
+		case ',':
+		case '.':
+		case ')':
+		case ']':
+		case ':':
+			break;
+		default:
+			if (c=='\'') {
+				if ((bquote_next[1]>='A') && (bquote_next[1]<='Z'))
+					break;
+			}
+			fprintf(stderr, "Missing space after closing %c %s\n", c, bquote_next);
+			exit(1);
+		}
+		txt = bquote_next + 1;
+	}
+}
+#endif
+
 GF_EXPORT
 void gf_sys_format_help(FILE *helpout, u32 flags, const char *fmt, ...)
 {
@@ -1592,6 +1828,8 @@
 	va_list vlist;
 	Bool escape_xml = GF_FALSE;
 	Bool escape_pipe = GF_FALSE;
+	Bool prev_was_example = GF_FALSE;
+	Bool prev_has_line_after = GF_FALSE;
 	u32 gen_doc = 0;
 	u32 is_app_opts = 0;
 	if (flags & GF_PRINTARG_MD) {
@@ -1618,6 +1856,12 @@
 	vsprintf(help_buf, fmt, vlist);
 	va_end(vlist);
 
+#ifdef CHECK_BALANCED_SEPS
+	if (gen_doc) {
+		check_char_balanced(help_buf, '`');
+		check_char_balanced(help_buf, '\'');
+	}
+#endif
 
 	line = help_buf;
 	while (line[0]) {
@@ -1633,6 +1877,12 @@
 
 		if (next_line) next_line[0]=0;
 
+		if (prev_has_line_after && !strlen(line)) {
+			if (!next_line) break;
+			line = next_line+1;
+			line_pos=0;
+			continue;
+		}
 
 		if ((line[0]=='#') && (line[1]==' ')) {
 			if (!gen_doc)
@@ -1650,14 +1900,25 @@
 				line+=3;
 			else if (gen_doc==2) {
 				line+=3;
-				header_string = ".P\n.B\n";
+				header_string = ".SS ";
 			}
 
 			console_code = GF_CONSOLE_MAGENTA;
 			line_before = GF_TRUE;
+		} else if ((line[0]=='#') && (line[1]=='#') && (line[2]=='#') && (line[3]==' ')) {
+			if (!gen_doc)
+				line+=4;
+			else if (gen_doc==2) {
+				line+=4;
+				header_string = ".P\n.B\n";
+			}
+
+			console_code = GF_CONSOLE_CYAN;
+			line_after = GF_TRUE;
 		} else if ((line[0]=='E') && (line[1]=='X') && (line[2]==' ')) {
 			line+=3;
 			console_code = GF_CONSOLE_YELLOW;
+
 			if (gen_doc==1) {
 				header_string = "Example\n```\n";
 				footer_string = "\n```";
@@ -1667,6 +1928,17 @@
 			} else {
 				header_string = "Example:\n";
 			}
+
+			if (prev_was_example) {
+				header_string = NULL;
+			}
+
+			if (next_line && (next_line[1]=='E') && (next_line[2]=='X') && (next_line[3]==' ')) {
+				prev_was_example = GF_TRUE;
+				footer_string = NULL;
+			} else {
+				prev_was_example = GF_FALSE;
+			}
 		} else if (!strncmp(line, "Note: ", 6)) {
 			console_code = GF_CONSOLE_CYAN | GF_CONSOLE_ITALIC;
 		} else if (!strncmp(line, "Warning: ", 9)) {
@@ -1736,6 +2008,12 @@
 		if (gen_doc==2) {
 			line_before = line_after = GF_FALSE;
 		}
+
+		if (prev_has_line_after) line_before = GF_FALSE;
+		prev_has_line_after = GF_FALSE;
+		if (!strlen(line))
+			prev_has_line_after = GF_TRUE;
+
 		if (line_before) {
 			fprintf(helpout, "\n");
 			line_pos=0;
@@ -1992,6 +2270,7 @@
 			if (gen_doc==1) fprintf(helpout, " ");
 			fprintf(helpout, (flags & GF_PRINTARG_NL_TO_BR) ? " " : "\n");
 			line_pos=0;
+			prev_has_line_after = GF_TRUE;
 		}
 
 		if (!next_line) break;
@@ -2009,6 +2288,22 @@
 	}
 }
 
+GF_EXPORT
+Bool gf_strnistr(const char *text, const char *subtext, u32 subtext_len)
+{
+	if (!*text || !subtext || !subtext_len)
+		return GF_FALSE;
+
+	while (*text) {
+		if (tolower(*text) == *subtext) {
+			if (!strnicmp(text, subtext, subtext_len))
+				return GF_TRUE;
+
+		}
+		text++;
+	}
+	return GF_FALSE;
+}
 
 GF_EXPORT
 Bool gf_sys_word_match(const char *orig, const char *dst)
@@ -2024,7 +2319,7 @@
 		return GF_TRUE;
 	if ((dlen>=3) && (dlen<olen) && !strncmp(orig, dst, dlen))
 		return GF_TRUE;
-		
+
 	if (olen*2 < dlen) {
 		char *s1 = strchr(orig, ':');
 		char *s2 = strchr(dst, ':');
@@ -2035,6 +2330,10 @@
 			return GF_TRUE;
 		return GF_FALSE;
 	}
+
+	if (gf_strnistr(orig, dst, dlen))
+		return GF_TRUE;
+
 	run = gf_malloc(sizeof(u32) * olen);
 	memset(run, 0, sizeof(u32) * olen);
 
@@ -2064,12 +2363,13 @@
 		gf_free(run);
 		return GF_FALSE;
 	}
+/*
 	//if 4/5 of characters are matched, suggest it
 	if (match * 5 >= 4 * dlen ) {
 		gf_free(run);
 		return GF_TRUE;
 	}
-/*	if ((olen<=4) && (match>=3) && (dlen*2<olen*3) ) {
+	if ((olen<=4) && (match>=3) && (dlen*2<olen*3) ) {
 		gf_free(run);
 		return GF_TRUE;
 	}

gpac-1.0.1.tar.gz/src/utils/os_divers.c -> gpac-2.0.0.tar.gz/src/utils/os_divers.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2022
 *					All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -79,8 +79,8 @@
 
 #include <gpac/revision.h>
 #define GPAC_FULL_VERSION GPAC_VERSION "-rev" GPAC_GIT_REVISION
-#define GPAC_COPYRIGHT "(c) 2000-2020 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io"
 
+#define GPAC_COPYRIGHT "(c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io"
 
 GF_EXPORT
 const char *gf_gpac_version()
@@ -88,22 +88,50 @@
 	return GPAC_FULL_VERSION;
 }
 
+#ifdef GPAC_MP4BOX_MINI
+#define MINI_BUILD_DISCLAIMER "\n\tMINI build (encoders, decoders, audio and video output disabled)"
+#endif
+
 GF_EXPORT
 const char *gf_gpac_copyright()
 {
-	return GPAC_COPYRIGHT;
+	return GPAC_COPYRIGHT
+#ifdef GPAC_MP4BOX_MINI
+		MINI_BUILD_DISCLAIMER
+#endif
+		;
 }
 GF_EXPORT
 const char *gf_gpac_copyright_cite()
 {
-	return GPAC_COPYRIGHT"\n\n" \
-			"Please cite our work in your research:\n"\
-		"\tGPAC Filters: https://doi.org/10.1145/3339825.3394929\n"\
-		"\tGPAC: https://doi.org/10.1145/1291233.1291452\n"\
+	return GPAC_COPYRIGHT
+#ifdef GPAC_MP4BOX_MINI
+		MINI_BUILD_DISCLAIMER
+#endif
+		"\n\n" \
+			"Please cite our work in your research:\n"
+		"\tGPAC Filters: https://doi.org/10.1145/3339825.3394929\n"
+		"\tGPAC: https://doi.org/10.1145/1291233.1291452\n"
 		;
 
 }
 
+GF_EXPORT
+u32 gf_gpac_abi_major()
+{
+	return GPAC_VERSION_MAJOR;
+}
+GF_EXPORT
+u32 gf_gpac_abi_minor()
+{
+	return GPAC_VERSION_MINOR;
+}
+GF_EXPORT
+u32 gf_gpac_abi_micro()
+{
+	return GPAC_VERSION_MICRO;
+}
+
 
 #ifndef WIN32
 
@@ -524,7 +552,7 @@
 	init_keyboard();
 	if (echo_off) t_orig.c_lflag &= ~ECHO;
 	else t_orig.c_lflag |= ECHO;
-	close_keyboard(0);
+	close_keyboard(GF_FALSE);
 }
 
 GF_EXPORT
@@ -536,10 +564,10 @@
 
 	//we are not foreground nor piped (used for IDEs), can't read stdin
 	if ((fg!=-1) && (fg != getpgrp())) {
-		return 0;
+		return GF_FALSE;
 	}
 	init_keyboard();
-	if (ch_peek != -1) return 1;
+	if (ch_peek != -1) return GF_TRUE;
 	t_new.c_cc[VMIN]=0;
 	tcsetattr(0, TCSANOW, &t_new);
 	nread = (s32) read(0, &ch, 1);
@@ -547,10 +575,10 @@
 	tcsetattr(0, TCSANOW, &t_new);
 	if(nread == 1) {
 		ch_peek = ch;
-		return 1;
+		return GF_TRUE;
 	}
-	close_keyboard(0);
-	return 0;
+	close_keyboard(GF_FALSE);
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -560,12 +588,12 @@
 	if (ch_peek != -1) {
 		ch = ch_peek;
 		ch_peek = -1;
-		close_keyboard(1);
+		close_keyboard(GF_TRUE);
 		return ch;
 	}
 	if (0==read(0,&ch,1))
 		ch = 0;
-	close_keyboard(1);
+	close_keyboard(GF_TRUE);
 	return ch;
 }
 
@@ -865,6 +893,7 @@
 }
 
 static u32 gpac_quiet = 0;
+char gf_prog_lf = '\r';
 
 GF_EXPORT
 GF_Err gf_sys_set_args(s32 argc, const char **argv)
@@ -878,8 +907,12 @@
 			Bool consumed;
 			GF_Err e;
 			Bool use_sep=GF_FALSE;
+			Bool bool_value = GF_TRUE;
+			char *arg_val;
 			const char *arg = argv[i];
-			char *arg_val = strchr(arg, '=');
+			if (!arg) continue;
+
+			arg_val = strchr(arg, '=');
 			if (arg_val) {
 				arg_val[0]=0;
 				arg_val++;
@@ -894,6 +927,10 @@
 				}
 				continue;
 			}
+			if (arg_val && (!strcmp(arg_val, "no") || !strcmp(arg_val, "false") || !strcmp(arg_val, "°0") ) )
+				bool_value = GF_FALSE;
+
+
 			if (arg[1]=='-') {
 				gpac_has_global_filter_args = GF_TRUE;
 			} else if (arg[1]=='+') {
@@ -920,12 +957,14 @@
 				gpac_quiet = 2;
 			} else if (!strcmp(arg, "-noprog")) {
 				if (!gpac_quiet) gpac_quiet = 1;
+			} else if (!strcmp(arg, "-proglf")) {
+				gf_prog_lf = '\n';
 			} else if (!stricmp(arg, "-for-test")) {
-				gpac_test_mode = GF_TRUE;
+				gpac_test_mode = bool_value;
 			} else if (!stricmp(arg, "-old-arch")) {
-				gpac_old_arch = GF_TRUE;
+				gpac_old_arch = bool_value;
 			} else if (!stricmp(arg, "-no-save")) {
-				gpac_discard_config = GF_TRUE;
+				gpac_discard_config = bool_value;
 			} else if (!stricmp(arg, "-ntp-shift")) {
 				s32 shift = arg_val ? atoi(arg_val) : 0;
 				gf_net_set_ntp_shift(shift);
@@ -942,6 +981,14 @@
 			}
 		}
 
+#ifdef GPAC_CONFIG_DARWIN
+		//if running in xcode disable color logs (not supported by output console)
+		if (getenv("__XCODE_BUILT_PRODUCTS_DIR_PATHS") != NULL) {
+			gf_log_set_tools_levels("ncl", GF_FALSE);
+		}
+#endif
+
+
 #ifndef GPAC_DISABLE_LOG
 		if (gpac_log_file_name) {
 			gpac_log_file = gf_fopen(gpac_log_file_name, "wt");
@@ -1011,6 +1058,32 @@
 	if (arg>=gpac_argc) return NULL;
 	return gpac_argv[arg];
 }
+GF_EXPORT
+const char *gf_sys_find_global_arg(const char *arg)
+{
+	u32 i;
+	if (!gpac_argc || !gpac_argv) return NULL;
+	for (i=0; i<gpac_argc; i++) {
+		const char *sep;
+		u32 len;
+		const char *an_arg = gpac_argv[i];
+		if (an_arg[0]!='-') continue;
+		if ((an_arg[1]!='-') && (an_arg[1]!='+')) continue;
+		an_arg += 2;
+		sep = strchr(an_arg, '@');
+		if (sep) an_arg = sep+1;
+		sep = strchr(an_arg, '=');
+		if (sep) len = (u32) (sep - an_arg);
+		else len = (u32) strlen(an_arg);
+		if (len != (u32) strlen(arg)) continue;
+
+		if (strncmp(an_arg, arg, len)) continue;
+
+		if (!sep) return "";
+		return sep;
+	}
+	return NULL;
+}
 
 
 #ifndef GPAC_DISABLE_REMOTERY
@@ -1025,6 +1098,8 @@
 
 void gpac_rmt_log_callback(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist)
 {
+#ifndef GPAC_DISABLE_LOG
+
 #define RMT_LOG_SIZE	5000
 	char szMsg[RMT_LOG_SIZE];
 	u32 len;
@@ -1037,6 +1112,9 @@
 	rmt_LogText(szMsg);
 
 #undef RMT_LOG_SIZE
+
+#endif
+
 }
 
 static void *rmt_udta = NULL;
@@ -1068,7 +1146,7 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] unable to initialize Remotery profiler: error %d\n", rme));
 			return GF_FALSE;
 		}
-		//openGL binding is done upon loading of the driver, otherwise crashes on windows
+		//OpenGL binding is done upon loading of the driver, otherwise crashes on windows
 
 		if (gf_opts_get_bool("core", "rmt-log")) {
 			gpac_prev_default_logs = gf_log_set_callback(NULL, gpac_rmt_log_callback);
@@ -1715,8 +1793,7 @@
 		count = THREAD_BASIC_INFO_COUNT;
 		error = thread_info(thread_table[i], THREAD_BASIC_INFO, (thread_info_t)thi, &count);
 		if (error != KERN_SUCCESS) {
-			mach_error("[RTI] Unexpected thread_info() call return", error);
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[RTI] Unexpected thread info for PID %d\n", the_rti.pid));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[RTI] Unexpected thread_info error for process %d: %s\n", the_rti.pid, mach_error_string(error) ));
 			break;
 		}
 		if ((thi->flags & TH_FLAGS_IDLE) == 0) {
@@ -1777,7 +1854,7 @@
 	entry_time = gf_sys_clock();
 	if (last_update_time && (entry_time - last_update_time < refresh_time_ms)) {
 		memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
-		return 0;
+		return GF_FALSE;
 	}
 	u_k_time = idle_time = 0;
 	f = gf_fopen("/proc/stat", "r");
@@ -1857,10 +1934,10 @@
 		char line[2048];
 		while (gf_fgets(line, 1024, f) != NULL) {
 			if (!strnicmp(line, "MemTotal:", 9)) {
-				sscanf(line, "MemTotal: "LLU" kB", &the_rti.physical_memory);
+				sscanf(line, "MemTotal: " LLU " kB", &the_rti.physical_memory);
 				the_rti.physical_memory *= 1024;
 			} else if (!strnicmp(line, "MemFree:", 8)) {
-				sscanf(line, "MemFree: "LLU" kB", &the_rti.physical_memory_avail);
+				sscanf(line, "MemFree: " LLU " kB", &the_rti.physical_memory_avail);
 				the_rti.physical_memory_avail *= 1024;
 				break;
 			}
@@ -1921,7 +1998,7 @@
 	last_cpu_u_k_time = u_k_time;
 	last_update_time = entry_time;
 	memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
-	return 1;
+	return GF_TRUE;
 }
 
 #endif
@@ -1938,8 +2015,8 @@
 }
 
 static char szCacheDir[GF_MAX_PATH];
-GF_EXPORT
-const char * gf_get_default_cache_directory()
+
+const char * gf_get_default_cache_directory_ex(Bool do_create)
 {
 	const char *cache_dir;
 	char root_tmp[GF_MAX_PATH];
@@ -1968,13 +2045,19 @@
 
 	strcat(szCacheDir, "gpac_cache");
 
-	if ( !gf_dir_exists(szCacheDir) && gf_mkdir(szCacheDir)!=GF_OK ) {
+	if (do_create && !gf_dir_exists(szCacheDir) && gf_mkdir(szCacheDir)!=GF_OK ) {
 		strcpy(szCacheDir, root_tmp);
 		return szCacheDir;
 	}
 	return szCacheDir;
 }
 
+GF_EXPORT
+const char * gf_get_default_cache_directory()
+{
+	return gf_get_default_cache_directory_ex(GF_TRUE);
+}
+
 
 GF_EXPORT
 Bool gf_sys_get_battery_state(Bool *onBattery, u32 *onCharge, u32*level, u32 *batteryLifeTime, u32 *batteryFullLifeTime)
@@ -2290,6 +2373,39 @@
 	return (s32) (local - remote);
 }
 
+#if 0
+/*!
+
+Adds or remove a given amount of microseconds to an NTP timestamp
+\param ntp NTP timestamp
+\param usec microseconds to add/remove
+\return adjusted NTP timestamp
+ */
+GF_EXPORT
+u64 gf_net_add_usec(u64 ntp, s32 usec)
+{
+	u64 sec, frac;
+	s64 usec_ntp;
+
+	sec = (ntp >> 32);
+	frac = (ntp & 0xFFFFFFFFULL);
+	usec_ntp = (s64) ( frac*1000000 / 0xFFFFFFFFULL );
+	usec_ntp += usec;
+	while (usec_ntp > 1000000) {
+		usec_ntp -= 1000000;
+		sec += 1;
+	}
+	while (usec_ntp < 0) {
+		usec_ntp += 1000000;
+		sec -= 1;
+	}
+	ntp = ( usec_ntp * 0xFFFFFFFFULL / 1000000 ) & 0xFFFFFFFFULL;
+	ntp |= (sec<<32);
+	return ntp;
+}
+#endif
+
+
 GF_EXPORT
 u64 gf_net_get_ntp_ms()
 {
@@ -2332,9 +2448,21 @@
 	t_timezone = (t_gmt.tm_hour - t_local.tm_hour) * 3600 + (t_gmt.tm_min - t_local.tm_min) * 60;
 	return t_timezone;
 #endif
-
 }
 
+GF_EXPORT
+Bool gf_net_time_is_dst()
+{
+#if defined(_WIN32_WCE)
+	return GF_FALSE;
+#else
+	struct tm t_local;
+	time_t t_time;
+	t_time = time(NULL);
+	t_local = *localtime(&t_time);
+	return t_local.tm_isdst ? GF_TRUE : GF_FALSE;
+#endif
+}
 //no mkgmtime on mingw..., use our own
 #if (defined(WIN32) && defined(__GNUC__))
 
@@ -2425,13 +2553,13 @@
 	oh = om = 0;
 	secs = 0;
 
-	if (sscanf(val, "%d-%d-%dT%d:%d:%gZ", &year, &month, &day, &h, &m, &secs) == 6) {
-	}
-	else if (sscanf(val, "%d-%d-%dT%d:%d:%g-%d:%d", &year, &month, &day, &h, &m, &secs, &oh, &om) == 8) {
+	if (sscanf(val, "%d-%d-%dT%d:%d:%g-%d:%d", &year, &month, &day, &h, &m, &secs, &oh, &om) == 8) {
 		neg_time_zone = GF_TRUE;
 	}
 	else if (sscanf(val, "%d-%d-%dT%d:%d:%g+%d:%d", &year, &month, &day, &h, &m, &secs, &oh, &om) == 8) {
 	}
+	else if (sscanf(val, "%d-%d-%dT%d:%d:%gZ", &year, &month, &day, &h, &m, &secs) == 6) {
+	}
 	else if (sscanf(val, "%3s, %d %3s %d %d:%d:%d", szDay, &day, szMonth, &year, &h, &m, &s)==7) {
 		secs = (Float) s;
 	}
@@ -2508,7 +2636,7 @@
 
 	if (om || oh) {
 		s32 diff = (60*oh + om)*60;
-		if (neg_time_zone) diff = -diff;
+		if (!neg_time_zone) diff = -diff;
 		current_time = current_time + diff;
 	}
 	current_time *= 1000;
@@ -2641,13 +2769,13 @@
 
 	fsize = gf_fsize(file);
 	if (fsize>0xFFFFFFFFUL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] file %s is too big to load in memory ("LLU" bytes)\n", fsize));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ( "[Core] file %s is too big to load in memory (" LLU " bytes)\n", fsize) );
 		return GF_OUT_OF_MEM;
 	}
 
 	*out_size = (u32) fsize;
 	if (fsize == 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] file is empty\n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] file is empty\n"));
 		return GF_OK;
 	}

gpac-1.0.1.tar.gz/src/utils/os_file.c -> gpac-2.0.0.tar.gz/src/utils/os_file.c Changed

@@ -1,7 +1,7 @@
 /*
 *			GPAC - Multimedia Framework C SDK
 *
- *			Authors: Jean Le Feuvre - Copyright (c) Telecom ParisTech 2000-2020
+ *			Authors: Jean Le Feuvre - Copyright (c) Telecom ParisTech 2000-2022
 *			 Romain Bouqueau - Copyright (c) Romain Bouqueau 2015
 *					All rights reserved
 *
@@ -159,7 +159,7 @@
 	Bool directory_clean_mode = *(Bool*)cbck;
 
 	if(directory_clean_mode) {
-		gf_cleanup_dir(item_path);
+		gf_dir_cleanup(item_path);
 		gf_rmdir(item_path);
 	} else {
 		gf_file_delete(item_path);
@@ -168,7 +168,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_cleanup_dir(const char* DirPathName)
+GF_Err gf_dir_cleanup(const char* DirPathName)
 {
 	Bool directory_clean_mode;
 
@@ -252,7 +252,6 @@
 
 	if (gfio_type) {
 		GF_FileIO *gfio_ref;
-		GF_FileIO *new_gfio;
 		GF_Err e;
 		Bool res = GF_TRUE;
 		if (gfio_type==1)
@@ -261,11 +260,9 @@
 			gfio_ref = gf_fileio_from_url(par_name);
 
 		if (!gfio_ref) return GF_FALSE;
-		new_gfio = gf_fileio_open_url(gfio_ref, fileName, "probe", &e);
+		gf_fileio_open_url(gfio_ref, (gfio_type==1) ? gf_fileio_resource_url(gfio_ref) : fileName, "probe", &e);
 		if (e==GF_URL_ERROR)
 			res = GF_FALSE;
-		if (new_gfio)
-			gf_fileio_open_url(new_gfio, NULL, "r", &e);
 		return res;
 	}
 
@@ -384,51 +381,69 @@
 	WCHAR _file[GF_MAX_PATH];
 	WIN32_FIND_DATA FindData;
 	HANDLE fh;
-	ULARGE_INTEGER uli;
-	ULONGLONG time_ms;
+//	ULARGE_INTEGER uli;
+	ULONGLONG time_us;
 	BOOL ret;
 	CE_CharToWide((char *) filename, _file);
 	fh = FindFirstFile(_file, &FindData);
 	if (fh == INVALID_HANDLE_VALUE) return 0;
-	uli.LowPart = FindData.ftLastWriteTime.dwLowDateTime;
-	uli.HighPart = FindData.ftLastWriteTime.dwHighDateTime;
+//	uli.LowPart = FindData.ftLastWriteTime.dwLowDateTime;
+//	uli.HighPart = FindData.ftLastWriteTime.dwHighDateTime;
+	time_us = (u64) ((*(LONGLONG *) &FindData.ftLastWriteTime - TIMESPEC_TO_FILETIME_OFFSET) / 10);
 	ret = FindClose(fh);
 	if (!ret) {
 		DWORD err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] FindClose() in gf_file_modification_time() returned the following error code: %d\n", err));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] FindClose() in gf_file_modification_time() error: %d\n", err));
 	}
-	time_ms = uli.QuadPart/10000;
-	return time_ms;
+//	time_ms = uli.QuadPart/10000;
+	return time_us;
 #elif defined(WIN32) && !defined(__GNUC__)
-	struct _stat64 sb;
+	struct _stat64 st;
 	int op_result;
 	wchar_t* wcsFilename = gf_utf8_to_wcs(filename);
 	if (!wcsFilename)
 		return 0;
-	op_result = _wstat64(wcsFilename, &sb);
+	op_result = _wstat64(wcsFilename, &st);
 	gf_free(wcsFilename);
 	if (op_result != 0) return 0;
-	return sb.st_mtime;
+	u64 time_us = st.st_mtime * 1000000;
+#if defined(GPAC_HAS_MTIM_NSEC)
+	time_us += st.st_mtim.tv_nsec / 1000;
+#endif
+	return time_us;
 #else
-	struct stat sb;
-	if (stat(filename, &sb) != 0) return 0;
-	return sb.st_mtime;
+	struct stat st;
+	if (stat(filename, &st) != 0) return 0;
+	u64 time_us = st.st_mtime * 1000000;
+
+#if defined(__DARWIN__) || defined(__APPLE__) || defined(GPAC_CONFIG_IOS)
+	time_us += st.st_mtimespec.tv_nsec / 1000;
+#elif defined(GPAC_HAS_MTIM_NSEC)
+	time_us += st.st_mtim.tv_nsec / 1000;
+#elif defined(GPAC_CONFIG_ANDROID)
+	time_us += st.st_mtime_nsec / 1000;
+#endif
+
+	return time_us;
 #endif
 	return 0;
 }
 
-#ifdef GPAC_MEMORY_TRACKING
 #include <gpac/list.h>
 extern int gf_mem_track_enabled;
 static GF_List * gpac_open_files = NULL;
+
 typedef struct
 {
 	FILE *ptr;
 	char *url;
+	Bool is_temp;
 } GF_FileHandle;
-#endif
+
 static u32 gpac_file_handles = 0;
 
+
+
 GF_EXPORT
 u32 gf_file_handles_count()
 {
@@ -452,56 +467,72 @@
 }
 #endif
 
-static void gf_register_file_handle(const char *filename, FILE *ptr)
+static void gf_register_file_handle(char *filename, FILE *ptr, Bool is_temp_file)
 {
+	if (is_temp_file
 #ifdef GPAC_MEMORY_TRACKING
-	if (gf_mem_track_enabled) {
+		|| gf_mem_track_enabled
+#endif
+	) {
 		GF_FileHandle *h;
 		if (!gpac_open_files) gpac_open_files = gf_list_new();
 		GF_SAFEALLOC(h, GF_FileHandle);
 		if (h) {
 			h->ptr = ptr;
-			h->url = gf_strdup(filename);
+			if (is_temp_file) {
+				h->is_temp = GF_TRUE;
+				h->url = filename;
+			} else {
+				h->url = gf_strdup(filename);
+			}
 			gf_list_add(gpac_open_files, h);
 		}
 	}
-#endif
 	gpac_file_handles++;
 }
 
 #include <gpac/thread.h>
 extern GF_Mutex *logs_mx;
 
-static void gf_unregister_file_handle(FILE *ptr)
+static Bool gf_unregister_file_handle(FILE *ptr)
 {
+	u32 i, count;
+	Bool res = GF_FALSE;
 	assert(gpac_file_handles);
 	gpac_file_handles--;
-#ifdef GPAC_MEMORY_TRACKING
-	if (gf_mem_track_enabled) {
-		u32 i, count;
-		gf_mx_p(logs_mx);
-		count = gf_list_count(gpac_open_files);
-		for (i=0; i<count; i++) {
-			GF_FileHandle *h = gf_list_get(gpac_open_files, i);
-			if (h->ptr==ptr) {
-				gf_free(h->url);
-				gf_free(h);
-				gf_list_rem(gpac_open_files, i);
-				if (!gf_list_count(gpac_open_files)) {
-					gf_list_del(gpac_open_files);
-					gpac_open_files = NULL;
-				}
-				gf_mx_v(logs_mx);
-				return;
+
+	if (!gpac_open_files)
+		return GF_FALSE;
+
+	gf_mx_p(logs_mx);
+	count = gf_list_count(gpac_open_files);
+	for (i=0; i<count; i++) {
+		GF_FileHandle *h = gf_list_get(gpac_open_files, i);
+		if (h->ptr != ptr) continue;
+
+		if (h->is_temp) {
+			GF_Err e;
+			fclose(h->ptr);
+			e = gf_file_delete(h->url);
+			if (e) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Core] Failed to delete temp file %s: %s\n", h->url, gf_error_to_string(e)));
 			}
+			res = GF_TRUE;
+		}
+		gf_free(h->url);
+		gf_free(h);
+		gf_list_rem(gpac_open_files, i);
+		if (!gf_list_count(gpac_open_files)) {
+			gf_list_del(gpac_open_files);
+			gpac_open_files = NULL;
 		}
-		gf_mx_v(logs_mx);
+		break;
 	}
-#endif
+	gf_mx_v(logs_mx);
+	return res;
 }
 
-GF_EXPORT
-FILE *gf_file_temp(char ** const fileName)
+static FILE *gf_file_temp_os(char ** const fileName)
 {
 	FILE *res;
 #if defined(_WIN32_WCE)
@@ -550,11 +581,51 @@
 #endif
 
 	if (res) {
-		gf_register_file_handle("temp file", res);
+		gf_register_file_handle("temp file", res, GF_FALSE);
 	}
 	return res;
 }
 
+GF_EXPORT
+FILE *gf_file_temp(char ** const fileName)
+{
+	const char *tmp_dir = gf_opts_get_key("core", "tmp");
+
+	if (tmp_dir && tmp_dir[0]) {
+		FILE *res;
+		char *opath=NULL, szFName[100];
+		u32 len = (u32) strlen(tmp_dir);
+
+		gf_dynstrcat(&opath, tmp_dir, NULL);
+		if (!strchr("/\\", tmp_dir[len-1]))
+			gf_dynstrcat(&opath, "/", NULL);
+		if (!opath) return NULL;
+
+		sprintf(szFName, "_libgpac_%d_%p_" LLU "_%d", gf_sys_get_process_id(), opath, gf_sys_clock_high_res(), gf_rand() );
+		gf_dynstrcat(&opath, szFName, NULL);
+		if (fileName) {
+			sprintf(szFName, "%p", fileName);
+			gf_dynstrcat(&opath, szFName, "_");
+		}
+
+		if (gf_file_exists(opath)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Something went wrong creating temp file path %s, file already exists !\n", opath));
+			gf_free(opath);
+			return NULL;
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Opening new temp file %s\n", opath));
+		res = gf_fopen_ex(opath, "__temp_file", "w+b", GF_FALSE);
+		if (!res) {
+			gf_free(opath);
+			return NULL;
+		}
+		gf_register_file_handle(opath, res, GF_TRUE);
+		return res;
+	}
+	return gf_file_temp_os(fileName);
+}
+
+
 /*enumerate directories*/
 GF_EXPORT
 GF_Err gf_enum_directory(const char *dir, Bool enum_directory, gf_enum_dir_item enum_dir_fct, void *cbck, const char *filter)
@@ -667,12 +738,12 @@
 	}
 
 	tmpdir = _path;
-	if (gf_utf8_mbstowcs(path, GF_MAX_PATH, &tmpdir) == (size_t)-1) {
+	if (gf_utf8_mbstowcs(path, GF_MAX_PATH, &tmpdir) == GF_UTF8_FAIL) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot convert %s to UTF16: broken string\n", dir));
 		return GF_BAD_PARAM;
 	}
 	tmpdir = filter;
-	if (gf_utf8_mbstowcs(w_filter, sizeof(w_filter), &tmpdir) == (size_t)-1) {
+	if (gf_utf8_mbstowcs(w_filter, sizeof(w_filter), &tmpdir) == GF_UTF8_FAIL) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot convert %s to UTF16: broken string\n", filter));
 		return GF_BAD_PARAM;
 	}
@@ -773,7 +844,7 @@
 		file_info.size += 1;
 		file_info.size *= FindData.nFileSizeHigh;
 		file_info.size += FindData.nFileSizeLow;
-		file_info.last_modified = (u64) ((*(LONGLONG *) &FindData.ftLastWriteTime - TIMESPEC_TO_FILETIME_OFFSET) / 10000000);
+		file_info.last_modified = (u64) ((*(LONGLONG *) &FindData.ftLastWriteTime - TIMESPEC_TO_FILETIME_OFFSET) / 10);
 #endif
 
 #if defined (_WIN32_WCE)
@@ -797,12 +868,19 @@
 
 		file_info.size = st.st_size;
 
-		{
-			struct tm _t = * gf_gmtime(& st.st_mtime);
-			file_info.last_modified = mktime(&_t);
-		}
+		struct tm _t = * gf_gmtime(& st.st_mtime);
+		file_info.last_modified = mktime(&_t);
+		file_info.last_modified *= 1000000;
+#if defined(__DARWIN__) || defined(__APPLE__) || defined(GPAC_CONFIG_IOS)
+		file_info.last_modified += st.st_mtimespec.tv_nsec / 1000;
+#elif defined(GPAC_HAS_MTIM_NSEC)
+		file_info.last_modified += st.st_mtim.tv_nsec / 1000;
+#elif defined(GPAC_CONFIG_ANDROID)
+		file_info.last_modified += st.st_mtime_nsec / 1000;
+#endif
+
 		file = the_file->d_name;
-		if (file && file[0]=='.') file_info.hidden = 1;
+		if (file && file[0]=='.') file_info.hidden = GF_TRUE;
 
 		if (file_info.directory) {
 			char * parent_name = strrchr(item_path, '/');
@@ -887,7 +965,7 @@
 	void *udta;
 
 	u64 bytes_done, file_size_plus_one;
-	Bool cache_complete;
+	Bool cache_complete, main_th;
 	u32 bytes_per_sec;
 
 	u32 printf_alloc;
@@ -1090,7 +1168,8 @@
 	char szURL[100];
 	GF_FileIO *ptr=NULL;
 	if (!url) return NULL;
-	
+	if (strncmp(url, "gfio://", 7)) return NULL;
+
 	sscanf(url, "gfio://%p", &ptr);
 	sprintf(szURL, "gfio://%p", ptr);
 	if (strcmp(url, szURL))
@@ -1157,6 +1236,23 @@
 }
 
 GF_EXPORT
+GF_Err gf_fileio_tag_main_thread(GF_FileIO *fileio)
+{
+	if (!fileio) return GF_BAD_PARAM;
+	fileio->main_th = GF_TRUE;
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_fileio_is_main_thread(const char *url)
+{
+	GF_FileIO *gfio = gf_fileio_from_url(url);
+	if (!gfio) return GF_FALSE;
+	return gfio->main_th;
+}
+
+
+GF_EXPORT
 u64 gf_ftell(FILE *fp)
 {
 	if (!fp) return -1;
@@ -1223,11 +1319,17 @@
 static GF_FileIO *gf_fileio_from_blob(const char *file_name)
 {
 	u8 *blob_data;
-	u32 blob_size;
+	u32 blob_size, flags;
 	GF_FileIOBlob *gfio_blob;
-	GF_Err e = gf_blob_get_data(file_name, &blob_data, &blob_size);
+	GF_Err e = gf_blob_get(file_name, &blob_data, &blob_size, &flags);
 	if (e || !blob_data) return NULL;
-
+ gf_blob_release(file_name);
+ 
+ if (flags) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Attempt at creating a GFIO object on blob corrupted or in transfer, not supported !"));
+ return NULL;
+ }
+ 
 	GF_SAFEALLOC(gfio_blob, GF_FileIOBlob);
 	if (!gfio_blob) return NULL;
 	gfio_blob->data = blob_data;
@@ -1235,7 +1337,7 @@
 	return gf_fileio_new((char *) file_name, gfio_blob, gfio_blob_open, gfio_blob_seek, gfio_blob_read, NULL, gfio_blob_tell, gfio_blob_eof, NULL);
 }
 GF_EXPORT
-FILE *gf_fopen_ex(const char *file_name, const char *parent_name, const char *mode)
+FILE *gf_fopen_ex(const char *file_name, const char *parent_name, const char *mode, Bool no_warn)
 {
 	FILE *res = NULL;
 	u32 gfio_type = 0;
@@ -1248,7 +1350,7 @@
 			return NULL;
 		new_gfio = gf_fileio_from_blob(file_name);
 		if (new_gfio)
-			gf_register_file_handle(file_name, (FILE *) new_gfio);
+			gf_register_file_handle((char*)file_name, (FILE *) new_gfio, GF_FALSE);
 		return (FILE *) new_gfio;
 
 	}
@@ -1280,10 +1382,13 @@
 		}
 		new_gfio = gf_fileio_open_url(gfio_ref, file_name, mode, &e);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("FileIO %s open in mode %s failed: %s\n", file_name, mode, gf_error_to_string(e)));
+			if (!no_warn) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("FileIO %s open in mode %s failed: %s\n", file_name, mode, gf_error_to_string(e)));
+			}
 			return NULL;
 		}
-		gf_register_file_handle(file_name, (FILE *) new_gfio);
+		if (new_gfio)
+			gf_register_file_handle((char*)file_name, (FILE *) new_gfio, GF_FALSE);
 		return (FILE *) new_gfio;
 	}
 
@@ -1340,9 +1445,11 @@
 #endif
 
 	if (res) {
-		gf_register_file_handle(file_name, res);
+		if (!parent_name || strcmp(parent_name, "__temp_file"))
+			gf_register_file_handle((char*)file_name, res, GF_FALSE);
+
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] file \"%s\" opened in mode \"%s\" - %d file handles\n", file_name, mode, gpac_file_handles));
-	} else {
+	} else if (!no_warn) {
 		if (strchr(mode, 'w') || strchr(mode, 'a')) {
 #if defined(WIN32)
 			u32 err = GetLastError();
@@ -1358,19 +1465,20 @@
 GF_EXPORT
 FILE *gf_fopen(const char *file_name, const char *mode)
 {
-	return gf_fopen_ex(file_name, NULL, mode);
+	return gf_fopen_ex(file_name, NULL, mode, GF_FALSE);
 }
 
 GF_EXPORT
 s32 gf_fclose(FILE *file)
 {
 	if (!file)
-		return GF_OK;
+		return 0;
 
-	gf_unregister_file_handle(file);
+	if (gf_unregister_file_handle(file))
+		return 0;
 	if (gf_fileio_check(file)) {
 		GF_Err e;
-		gf_fileio_open_url((GF_FileIO *) file, NULL, "deref", &e);
+		gf_fileio_open_url((GF_FileIO *) file, NULL, "close", &e);
 		if (e) return -1;
 		return 0;
 	}
@@ -1616,15 +1724,16 @@
 	return NULL;
 }
 
+
 GF_EXPORT
-char* gf_url_colon_suffix(const char *path)
+char* gf_url_colon_suffix(const char *path, char assign_sep)
 {
 	char *sep = strchr(path, ':');
 	if (!sep) return NULL;
 
 	//handle Z:\ and Z:/
 	if ((path[1]==':') && ( (path[2]=='/') || (path[2]=='\\') ) )
-		return gf_url_colon_suffix(path+2);
+		return gf_url_colon_suffix(path+2, assign_sep);
 
 	if (!strncmp(path, "gfio://", 7) || !strncmp(path, "gmem://", 7)) {
 		return strchr(path+7, ':');
@@ -1643,15 +1752,44 @@
 			if sep[1]==':', then sep[2] is valid (0 or something else), no need to check for len
 		*/
 		if ((sep[1]==':') && ( (sep[2]=='/') || (sep[2]=='\\') ) ) {
-			return gf_url_colon_suffix(sep+2);
+			return gf_url_colon_suffix(sep+2, assign_sep);
 		}
 		//find closest : or /, if : is before / consider this is a port or an IPv6 address and check next : after /
 		next_colon = strchr(sep, ':');
 		next_slash = strchr(sep, '/');
 		if (next_colon && next_slash && ((next_slash - sep) > (next_colon - sep)) ) {
-			next_colon = strchr(next_slash, ':');
+			const char *last_colon;
+			u32 i, port, nb_colons=0, nb_dots=0, nb_non_alnums=0;
+			next_slash[0] = 0;
+			last_colon = strrchr(next_colon, ':');
+			port = atoi(last_colon+1);
+			for (i=0; i<strlen(next_colon+1); i++) {
+				if (next_colon[i+1] == ':') nb_colons++;
+				else if (next_colon[i+1] == '.') nb_dots++;
+				//closing bracket of IPv6
+				else if (next_colon[i+1] == ']') {}
+				else if (!isalnum(next_colon[i+1])) {
+					nb_non_alnums++;
+					break;
+				}
+			}
+			next_slash[0] = '/';
+			//if no non-alphanum, we must have either a port (ipv4) or extra colons but no dots (ipv6)
+			if (!nb_non_alnums && (port || (nb_colons && !nb_dots)))
+				next_colon = strchr(next_slash, ':');
 		}
 		return next_colon;
 	}
+
+	if (sep && assign_sep) {
+		char *file_ext = strchr(path, '.');
+		char *assign = strchr(path, assign_sep);
+		if (assign && assign>file_ext) assign = NULL;
+		if (assign) file_ext = NULL;
+		if (file_ext && (file_ext>sep)) {
+			sep = strchr(file_ext, ':');
+		}
+	}
 	return sep;
 }
+

gpac-1.0.1.tar.gz/src/utils/os_module.c -> gpac-2.0.0.tar.gz/src/utils/os_module.c Changed

@@ -156,7 +156,7 @@
 #endif
 	if (!inst->filterreg_func && (!inst->load_func || !inst->query_func || !inst->destroy_func) ) {
 
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Invalid module file %s, missing %s function\n", inst->name, !inst->query_func ? "QueryInterface" :  !inst->load_func ? "LoadInterface" : "ShutdownInterface"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Invalid module file %s, missing %s or RegisterFilter function\n", inst->name, !inst->query_func ? "QueryInterface" :  !inst->load_func ? "LoadInterface" : "ShutdownInterface"));
 		return GF_TRUE;
 	}
 
@@ -191,6 +191,7 @@
 static Bool enum_modules(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	ModuleInstance *inst;
+	char *sep;
 #if CHECK_MODULE
 	QueryInterface query_func;
 	LoadInterface load_func;
@@ -273,7 +274,11 @@
 	inst->plugman = pm;
 	inst->name = gf_strdup(item_name);
 	inst->dir = gf_strdup(item_path);
-	gf_url_get_resource_path(item_path, inst->dir);
+
+	sep = strrchr(inst->dir, '/');
+	if (!sep) sep = strrchr(inst->dir, '\\');
+	if (sep) sep[1] = 0;
+
 	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Added module %s.\n", inst->name));
 	gf_list_add(pm->plug_list, inst);
 	return GF_FALSE;

gpac-1.0.1.tar.gz/src/utils/os_net.c -> gpac-2.0.0.tar.gz/src/utils/os_net.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2021
 *					All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -271,10 +271,10 @@
 		service = (char *)portstring;
 	}
 	if (PeerName) {
-		strncpy(node, PeerName, MAX_PEER_NAME_LEN);
+		strncpy(node, PeerName, MAX_PEER_NAME_LEN-1);
 		if (node[0]=='[') {
 			node[strlen(node)-1] = 0;
-			strncpy(node, &node[1], MAX_PEER_NAME_LEN);
+			memmove(node, &node[1], MAX_PEER_NAME_LEN-1);
 		}
 		node[MAX_PEER_NAME_LEN - 1] = 0;
 		dest = (char *) node;
@@ -396,8 +396,8 @@
 	} else {
 		res = getsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &nsize, &psize );
 	}
-	if ((res>=0) && (nsize=!NewSize)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Socket] Asked to set socket %s buffer size to %d but system used %d\n", SendBuffer ? "send" : "receive", NewSize, nsize));
+	if ((res>=0) && (nsize!=NewSize)) {
+		GF_LOG(nsize <= NewSize ? GF_LOG_WARNING : GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Socket] Asked to set socket %s buffer size to %d but system used %d\n", SendBuffer ? "send" : "receive", NewSize, nsize));
 	}
 
 	return GF_OK;
@@ -481,8 +481,10 @@
 GF_EXPORT
 void gf_sk_reset(GF_Socket *sock)
 {
-	u32 clear;
-	if (sock) setsockopt(sock->socket, SOL_SOCKET, SO_ERROR, (char *) &clear, sizeof(u32) );
+	if (sock) {
+		u32 clear=0;
+		setsockopt(sock->socket, SOL_SOCKET, SO_ERROR, (char *) &clear, sizeof(u32) );
+	}
 }
 
 GF_EXPORT
@@ -498,6 +500,17 @@
 	sock->usec_wait = (usec_wait>=1000000) ? 500 : usec_wait;
 }
 
+#ifdef GPAC_STATIC_BUILD
+struct hostent *gf_gethostbyname(const char *PeerName)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("Static GPAC build has no DNS support, cannot resolve host %s !\n", PeerName));
+	return NULL;
+}
+#else
+#define gf_gethostbyname gethostbyname
+#endif
+
+
 //connects a socket to a remote peer on a given port
 GF_EXPORT
 GF_Err gf_sk_connect(GF_Socket *sock, const char *PeerName, u16 PortNumber, const char *local_ip)
@@ -618,7 +631,7 @@
 	sock->dest_addr.sin_addr.s_addr = inet_addr(PeerName);
 	if (sock->dest_addr.sin_addr.s_addr==INADDR_NONE) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Solving %s address\n", PeerName));
-		Host = gethostbyname(PeerName);
+		Host = gf_gethostbyname(PeerName);
 		if (Host == NULL) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Failed to retrieve host %s address: %s\n", PeerName, gf_errno_str(LASTSOCKERROR) ));
 			switch (LASTSOCKERROR) {
@@ -685,10 +698,12 @@
 	struct sockaddr_in LocalAdd;
 	struct hostent *Host = NULL;
 #endif
-	s32 ret;
+	s32 ret = 0;
 	s32 optval;
 
 	if (!sock || sock->socket) return GF_BAD_PARAM;
+	if (local_ip && !strcmp(local_ip, "127.0.0.1"))
+		local_ip = NULL;
 
 	if (sock->flags & GF_SOCK_IS_UN) {
 #ifdef GPAC_HAS_SOCK_UN
@@ -821,7 +836,7 @@
 		buf[0] = 0;
 		ret = gethostname(buf, GF_MAX_IP_NAME_LEN);
 		/*get the IP address*/
-		Host = gethostbyname(buf);
+		Host = gf_gethostbyname(buf);
 		if (Host != NULL) {
 			memcpy((char *) &LocalAdd.sin_addr, Host->h_addr_list[0], sizeof(LocalAdd.sin_addr));
 			ip_add = LocalAdd.sin_addr.s_addr;
@@ -864,13 +879,13 @@
 			ret = GF_IP_CONNECTION_FAILURE;
 		}
 	}
-	
+
 	if (peer_name && peer_port) {
 		sock->dest_addr.sin_port = htons(peer_port);
 		sock->dest_addr.sin_family = AF_INET;
 		sock->dest_addr.sin_addr.s_addr = inet_addr(peer_name);
 		if (sock->dest_addr.sin_addr.s_addr == INADDR_NONE) {
-			Host = gethostbyname(peer_name);
+			Host = gf_gethostbyname(peer_name);
 			if (Host == NULL) ret = GF_IP_ADDRESS_NOT_FOUND;
 			else memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
 		}
@@ -971,6 +986,55 @@
 	return GF_OK;
 }
 
+GF_Err gf_sk_select(GF_Socket *sock, u32 mode)
+{
+#ifndef __SYMBIAN32__
+	int ready;
+	struct timeval timeout;
+	fd_set RGroup;
+	fd_set WGroup;
+#endif
+
+	//the socket must be bound or connected
+	if (!sock || !sock->socket)
+		return GF_BAD_PARAM;
+
+#ifndef __SYMBIAN32__
+	//can we write?
+	FD_ZERO(&RGroup);
+	FD_ZERO(&WGroup);
+	if (mode != GF_SK_SELECT_WRITE)
+		FD_SET(sock->socket, &RGroup);
+	if (mode != GF_SK_SELECT_READ)
+		FD_SET(sock->socket, &WGroup);
+	timeout.tv_sec = 0;
+	timeout.tv_usec = sock->usec_wait;
+
+	//TODO CHECK IF THIS IS CORRECT
+	ready = select((int) sock->socket+1, &RGroup, &WGroup, NULL, &timeout);
+	if (ready == SOCKET_ERROR) {
+		switch (LASTSOCKERROR) {
+		case EAGAIN:
+			return GF_IP_SOCK_WOULD_BLOCK;
+		default:
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[socket] select failure: %s\n", gf_errno_str(LASTSOCKERROR)));
+			return GF_IP_NETWORK_FAILURE;
+		}
+	}
+
+	//should never happen (to check: is writeability is guaranteed for not-connected sockets)
+	if (!ready)
+		return GF_IP_SOCK_WOULD_BLOCK;
+	if ((mode != GF_SK_SELECT_WRITE) && !FD_ISSET(sock->socket, &RGroup))
+		return GF_IP_SOCK_WOULD_BLOCK;
+	if ((mode != GF_SK_SELECT_READ) && !FD_ISSET(sock->socket, &WGroup))
+		return GF_IP_SOCK_WOULD_BLOCK;
+	return GF_OK;
+#else
+	return GF_IP_SOCK_WOULD_BLOCK;
+#endif
+}
+
 
 GF_EXPORT
 u32 gf_sk_is_multicast_address(const char *multi_IPAdd)
@@ -1261,7 +1325,7 @@
 
 	if (!gf_list_count(sg->sockets))
 		return GF_IP_NETWORK_EMPTY;
-		
+
 	FD_ZERO(&sg->rgroup);
 	FD_ZERO(&sg->wgroup);
 
@@ -1377,12 +1441,12 @@
 	}
 #endif
 	if (!buffer) return GF_OK;
-	
+
 	if (sock->flags & GF_SOCK_HAS_PEER)
 		res = (s32) recvfrom(sock->socket, (char *) buffer, length, 0, (struct sockaddr *)&sock->dest_addr, &sock->dest_addr_len);
 	else {
 		res = (s32) recv(sock->socket, (char *) buffer, length, 0);
-		if (res == 0)
+		if (!do_select && (res == 0))
 			return GF_IP_CONNECTION_CLOSED;
 	}
 
@@ -1398,7 +1462,8 @@
 		case ENOTCONN:
 		case ECONNRESET:
 		case ECONNABORTED:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading: %s\n", gf_errno_str(LASTSOCKERROR)));
+			//log as debug, let higher level decide if this is an error or not
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[socket] error reading: %s\n", gf_errno_str(LASTSOCKERROR)));
 			return GF_IP_CONNECTION_CLOSED;
 #endif
 		default:
@@ -1659,7 +1724,7 @@
 		//setup the address
 		remote_add.sin_port = htons(remotePort);
 		//get the server IP
-		Host = gethostbyname(remoteHost);
+		Host = gf_gethostbyname(remoteHost);
 		if (Host == NULL) return GF_IP_ADDRESS_NOT_FOUND;
 		memcpy((char *) &remote_add.sin_addr, Host->h_addr_list[0], sizeof(u32));
 	} else {
@@ -1719,9 +1784,21 @@
 	}
 #endif
 	res = (s32) recv(sock->socket, buffer, 1, MSG_PEEK);
-	if (res == 0) {
+	if (res > 0) return GF_OK;
+#if 0
+	res = LASTSOCKERROR;
+	switch (res) {
+	case 0:
+	case EAGAIN:
+		return GF_IP_NETWORK_EMPTY;
+	default:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] probe error: %s\n", gf_errno_str(res)));
 		return GF_IP_CONNECTION_CLOSED;
 	}
+#else
+	return GF_IP_CONNECTION_CLOSED;
+#endif
+
 	return GF_OK;
 }

gpac-1.0.1.tar.gz/src/utils/os_thread.c -> gpac-2.0.0.tar.gz/src/utils/os_thread.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2021
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -172,6 +172,20 @@
 #endif
 	GF_Thread *t = (GF_Thread *)ptr;
 
+
+//not activated by default, not portable
+#if 0 && !defined(GPAC_DISABLE_LOG)
+	if (t->log_name) {
+#ifdef WIN32
+#elif defined(__DARWIN__) || defined(__APPLE__)
+		pthread_setname_np(t->log_name);
+#else
+		pthread_setname_np(t->threadH, t->log_name);
+#endif
+	}
+#endif
+
+
 	/* Signal the caller */
 	if (! t->_signal) goto exit;
 #ifdef GPAC_CONFIG_ANDROID
@@ -270,6 +284,7 @@
 		return GF_IO_ERR;
 	}
 
+
 	/*wait for the child function to call us - do NOT return before, otherwise the thread status would
 	be unknown*/
 	gf_sema_wait(t->_signal);
@@ -638,7 +653,7 @@
 Bool gf_mx_try_lock(GF_Mutex *mx)
 {
 	u32 caller;
-	if (!mx) return GF_FALSE;
+	if (!mx) return GF_TRUE;
 	caller = gf_th_id();
 	if (caller == mx->Holder) {
 		mx->HolderCount += 1;

gpac-1.0.1.tar.gz/src/utils/path2d.c -> gpac-2.0.0.tar.gz/src/utils/path2d.c Changed

@@ -99,7 +99,7 @@
 
 #define GF_2D_REALLOC(_gp)	\
 	if (_gp->n_alloc_points < _gp->n_points+3) {	\
-		_gp->n_alloc_points = (_gp->n_alloc_points<5) ? 10 : (_gp->n_alloc_points*3/2);	\
+		_gp->n_alloc_points = (_gp->n_alloc_points<5) ? 10 : (_gp->n_alloc_points*2);	\
 		_gp->points = (GF_Point2D *)gf_realloc(_gp->points, sizeof(GF_Point2D)*(_gp->n_alloc_points));	\
 		_gp->tags = (u8 *) gf_realloc(_gp->tags, sizeof(u8)*(_gp->n_alloc_points));	\
 	}	\
@@ -304,14 +304,16 @@
 	if (!gp->points) return GF_OUT_OF_MEM;
 	gp->tags = (u8*)gf_realloc(gp->tags, sizeof(u8)*gp->n_alloc_points);
 	if (!gp->tags) return GF_OUT_OF_MEM;
-	memcpy(gp->points + gp->n_points, src->points, sizeof(GF_Point2D)*src->n_points);
-	if (mx) {
-		for (i=0; i<src->n_points; i++) {
-			gf_mx2d_apply_coords(mx, &gp->points[i+gp->n_points].x, &gp->points[i+gp->n_points].y);
+	if (src->n_points) {
+		memcpy(gp->points + gp->n_points, src->points, sizeof(GF_Point2D)*src->n_points);
+		if (mx) {
+			for (i=0; i<src->n_points; i++) {
+				gf_mx2d_apply_coords(mx, &gp->points[i+gp->n_points].x, &gp->points[i+gp->n_points].y);
+			}
 		}
+		memcpy(gp->tags + gp->n_points, src->tags, sizeof(u8)*src->n_points);
+		gp->n_points += src->n_points;
 	}
-	memcpy(gp->tags + gp->n_points, src->tags, sizeof(u8)*src->n_points);
-	gp->n_points += src->n_points;
 	gf_rect_union(&gp->bbox, &src->bbox);
 	if (!(src->flags & GF_PATH_FLATTENED)) gp->flags &= ~GF_PATH_FLATTENED;
 	if (src->flags & GF_PATH_BBOX_DIRTY) gp->flags |= GF_PATH_BBOX_DIRTY;
@@ -998,6 +1000,7 @@
 void gf_path_flatten(GF_Path *gp)
 {
 	GF_Path *res;
+	u32 flags = gp->flags;
 	if (gp->flags & GF_PATH_FLATTENED) return;
 	if (!gp->n_points) return;
 	res = gf_path_get_flatten(gp);
@@ -1005,6 +1008,7 @@
 	if (gp->points) gf_free(gp->points);
 	if (gp->tags) gf_free(gp->tags);
 	memcpy(gp, res, sizeof(GF_Path));
+	gp->flags |= (flags & (GF_PATH_FILL_ZERO_NONZERO|GF_PATH_FILL_EVEN));
 	gf_free(res);
 }

gpac-1.0.1.tar.gz/src/utils/path2d_stroker.c -> gpac-2.0.0.tar.gz/src/utils/path2d_stroker.c Changed

gpac-1.0.1.tar.gz/src/utils/sha1.c -> gpac-2.0.0.tar.gz/src/utils/sha1.c Changed

@@ -690,35 +690,48 @@
  * Output = SHA-1( file contents )
  */
 GF_EXPORT
-GF_Err gf_sha1_file( const char *path, u8 output[GF_SHA1_DIGEST_SIZE] )
+GF_Err gf_sha1_file_ptr(FILE *f, u8 output[GF_SHA1_DIGEST_SIZE] )
 {
-	FILE *f;
+	u64 pos = gf_ftell(f);
 	size_t n;
 	GF_SHA1Context *ctx;
 	u8 buf[1024];
 
+	ctx  = gf_sha1_starts();
+	gf_fseek(f, 0, SEEK_SET);
+
+	while( ( n = gf_fread( buf, sizeof( buf ), f ) ) > 0 )
+		gf_sha1_update(ctx, buf, (s32) n );
+
+	gf_sha1_finish(ctx, output );
+
+	gf_fseek(f, pos, SEEK_SET);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_sha1_file( const char *path, u8 output[GF_SHA1_DIGEST_SIZE] )
+{
+	FILE *f;
+	GF_Err e;
+
 	if (!strncmp(path, "gmem://", 7)) {
 		u32 size;
 		u8 *mem_address;
-		GF_Err e = gf_blob_get_data(path, &mem_address, &size);
+		e = gf_blob_get(path, &mem_address, &size, NULL);
 		if (e) return e;
 
 		gf_sha1_csum(mem_address, size, output);
+        gf_blob_release(path);
 		return GF_OK;
 	}
 
 	if( ( f = gf_fopen( path, "rb" ) ) == NULL )
 		return GF_URL_ERROR;
 
-	ctx  = gf_sha1_starts();
-
-	while( ( n = gf_fread( buf, sizeof( buf ), f ) ) > 0 )
-		gf_sha1_update(ctx, buf, (s32) n );
-
-	gf_sha1_finish(ctx, output );
-
+	e = gf_sha1_file_ptr(f, output);
 	gf_fclose( f );
-	return GF_OK;
+	return e;
 }
 
 /*

gpac-1.0.1.tar.gz/src/utils/symbian_net.cpp -> gpac-2.0.0.tar.gz/src/utils/symbian_net.cpp Changed

@@ -411,7 +411,7 @@
 	/*get the server IP*/
 	sock->dest_addr.sin_addr.s_addr = inet_addr(PeerName);
 	if (sock->dest_addr.sin_addr.s_addr==INADDR_NONE) {
-		Host = gethostbyname(PeerName);
+		Host = gf_gethostbyname(PeerName);
 		if (Host == NULL) {
 			switch (LASTSOCKERROR) {
 #ifndef __SYMBIAN32__
@@ -536,7 +536,7 @@
 	ret = gethostname(buf, GF_MAX_IP_NAME_LEN);
 	if (ret == SOCKET_ERROR) return GF_IP_ADDRESS_NOT_FOUND;
 	/*get the IP address*/
-	Host = gethostbyname(buf);
+	Host = gf_gethostbyname(buf);
 	if (Host == NULL) return GF_IP_ADDRESS_NOT_FOUND;
 	/*setup the address*/
 	memcpy((char *) &LocalAdd.sin_addr, Host->h_addr_list[0], sizeof(LocalAdd.sin_addr));
@@ -557,7 +557,7 @@
 		sock->dest_addr.sin_family = AF_INET;
 		sock->dest_addr.sin_addr.s_addr = inet_addr(peer_name);
 		if (sock->dest_addr.sin_addr.s_addr == INADDR_NONE) {
-			Host = gethostbyname(peer_name);
+			Host = gf_gethostbyname(peer_name);
 			if (Host == NULL) return GF_IP_ADDRESS_NOT_FOUND;
 			memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
 		}
@@ -1091,7 +1091,7 @@
 		//setup the address
 		remote_add.sin_port = htons(remotePort);
 		//get the server IP
-		Host = gethostbyname(remoteHost);
+		Host = gf_gethostbyname(remoteHost);
 		if (Host == NULL) return GF_IP_ADDRESS_NOT_FOUND;
 		memcpy((char *) &remote_add.sin_addr, Host->h_addr_list[0], sizeof(u32));
 	} else {

gpac-1.0.1.tar.gz/src/utils/url.c -> gpac-2.0.0.tar.gz/src/utils/url.c Changed

@@ -451,6 +451,43 @@
 	return outpath;
 }
 
+char *gf_url_percent_decode(const char *path)
+{
+	char *outpath;
+	u32 i, count, len;
+	if (!path) return NULL;
+
+	len = (u32) strlen(path);
+	count = 0;
+	for (i=0; i<len; i++) {
+		u8 c = path[i];
+		if (c=='%') {
+			i+= 2;
+		}
+		count++;
+	}
+	if (!count) return gf_strdup(path);
+	outpath = (char*)gf_malloc(sizeof(char) * (count + 1));
+
+	for (i=0; i<len; i++) {
+		u8 c = path[i];
+		if (c=='%') {
+			u32 res;
+			char szChar[3];
+			szChar[0] = path[i+1];
+			szChar[1] = path[i+1];
+			szChar[2] = 0;
+			sscanf(szChar, "%02X", &res);
+			i += 2;
+			outpath[i] = (char) res;
+		} else {
+			outpath[i] = c;
+		}
+	}
+	outpath[count] = 0;
+	return outpath;
+}
+
 GF_EXPORT
 const char *gf_url_get_resource_name(const char *sURL)
 {
@@ -463,19 +500,21 @@
 }
 
 GF_EXPORT
-Bool gf_url_get_resource_path(const char *sURL, char *res_path)
+const char *gf_url_get_path(const char *sURL)
 {
-	char *sep;
-	strcpy(res_path, sURL);
-	sep = strrchr(res_path, '/');
-	if (!sep) sep = strrchr(res_path, '\\');
-	if (sep) {
-		sep[1] = 0;
-		return GF_TRUE;
-	}
-	return GF_FALSE;
+	char *sep = strstr(sURL, "://");
+	if (!sep) return sURL;
+	sep = strchr(sep + 3, '/');
+	if (sep) return sep;
+	return NULL;
 }
 
+//exported for python bindings
+GF_EXPORT
+void gf_url_free(char *sURL)
+{
+	if (sURL) gf_free(sURL);
+}
 
 #if 0 //unused
 Bool gf_url_remove_last_delimiter(const char *sURL, char *res_path)
@@ -489,7 +528,7 @@
 	return GF_FALSE;
 }
 
-const char* gf_url_get_ressource_extension(const char *sURL) {
+const char* gf_url_get_resource_extension(const char *sURL) {
 	const char *dot = strrchr(sURL, '.');
 	if(!dot || dot == sURL) return "";
 	return dot + 1;

gpac-1.0.1.tar.gz/src/utils/utf.c -> gpac-2.0.0.tar.gz/src/utils/utf.c Changed

@@ -248,7 +248,7 @@
 * definition of UTF-8 goes up to 4-byte sequences.
 */
 
-static Boolean isLegalUTF8(const UTF8 *source, int length) {
+Boolean isLegalUTF8(const UTF8 *source, int length) {
 	UTF8 a;
 	const UTF8 *srcptr = source+length;
 	switch (length) {
@@ -375,18 +375,77 @@
 }
 
 
+GF_EXPORT
+Bool gf_utf8_is_legal(const u8 *data, u32 length)
+{
+	//we simply run ConvertUTF8toUTF16 without target
+	const UTF8** sourceStart = (const UTF8**) &data;
+	const UTF8* sourceEnd = (const UTF8*) ( data + length );
+	ConversionResult result = conversionOK;
+	const UTF8* source = *sourceStart;
+
+	while (source < sourceEnd) {
+		UTF32 ch = 0;
+		unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+		if (source + extraBytesToRead >= sourceEnd) {
+			result = sourceExhausted;
+			break;
+		}
+		/* Do this check whether lenient or strict */
+		if (! isLegalUTF8(source, extraBytesToRead+1)) {
+			result = sourceIllegal;
+			break;
+		}
+		/*
+		 * The cases all fall through. See "Note A" below.
+		 */
+		switch (extraBytesToRead) {
+		case 5:
+			ch += *source++;
+			ch <<= 6; /* remember, illegal UTF-8 */
+		case 4:
+			ch += *source++;
+			ch <<= 6; /* remember, illegal UTF-8 */
+		case 3:
+			ch += *source++;
+			ch <<= 6;
+		case 2:
+			ch += *source++;
+			ch <<= 6;
+		case 1:
+			ch += *source++;
+			ch <<= 6;
+		case 0:
+			ch += *source++;
+		}
+		ch -= offsetsFromUTF8[extraBytesToRead];
+
+		if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+			/* UTF-16 surrogate values are illegal in UTF-32 */
+			if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+				result = sourceIllegal;
+				break;
+			}
+		} else if (ch > UNI_MAX_UTF16) {
+			result = sourceIllegal;
+			break; /* Bail out; shouldn't continue */
+		}
+	}
+	return (result==conversionOK) ? GF_TRUE : GF_FALSE;
+}
 
 GF_EXPORT
-size_t gf_utf8_wcslen (const unsigned short *s)
+u32 gf_utf8_wcslen (const unsigned short *s)
 {
 	const unsigned short* ptr;
+	if (!s) return 0;
 	for (ptr = s; *ptr != (unsigned short)'\0'; ptr++) {
 	}
-	return ptr - s;
+	return (u32) ( ptr - s );
 }
 
 GF_EXPORT
-size_t gf_utf8_wcstombs(char* dest, size_t len, const unsigned short** srcp)
+u32 gf_utf8_wcstombs(char* dest, size_t len, const unsigned short** srcp)
 {
 	if (!srcp || !*srcp)
 		return 0;
@@ -398,15 +457,15 @@
 		ConversionFlags flags = strictConversion;
 
 		ConversionResult res = ConvertUTF16toUTF8(sourceStart, sourceEnd, &targetStart, targetEnd, flags);
-		if (res != conversionOK) return (size_t)-1;
+		if (res != conversionOK) return GF_UTF8_FAIL;
 		*targetStart = 0;
 		*srcp=NULL;
-		return strlen(dest);
+		return (u32) strlen(dest);
 	}
 }
 
 GF_EXPORT
-size_t gf_utf8_mbstowcs(unsigned short* dest, size_t len, const char** srcp)
+u32 gf_utf8_mbstowcs(unsigned short* dest, size_t len, const char** srcp)
 {
 	if (!srcp || !*srcp)
 		return 0;
@@ -417,7 +476,7 @@
 		UTF16* targetEnd = (UTF16* ) (dest + len);
 		ConversionFlags flags = strictConversion;
 		ConversionResult res = ConvertUTF8toUTF16(sourceStart, sourceEnd, &targetStart, targetEnd, flags);
-		if (res != conversionOK) return (size_t)-1;
+		if (res != conversionOK) return GF_UTF8_FAIL;
 		*targetStart = 0;
 		*srcp=NULL;
 		return gf_utf8_wcslen(dest);
@@ -428,16 +487,16 @@
 #else
 
 GF_EXPORT
-size_t gf_utf8_wcslen (const unsigned short *s)
+u32 gf_utf8_wcslen (const unsigned short *s)
 {
 	const unsigned short* ptr;
 	for (ptr = s; *ptr != (unsigned short)'\0'; ptr++) {
 	}
-	return ptr - s;
+	return (u32) (ptr - s);
 }
 
 GF_EXPORT
-size_t gf_utf8_wcstombs(char* dest, size_t len, const unsigned short** srcp)
+u32 gf_utf8_wcstombs(char* dest, size_t len, const unsigned short** srcp)
 {
 	/*
 	* Original code from the GNU UTF-8 Library
@@ -480,7 +539,7 @@
 					*destptr++ = (unsigned char)(((wc >> (6 * --count)) & 0x3F) | 0x80);
 				} while (count > 0);
 		}
-		return destptr - dest;
+		return (u32) (destptr - dest);
 	} else {
 		/* Ignore dest and len. */
 		size_t totalcount = 0;
@@ -500,7 +559,7 @@
 			}
 			totalcount += count;
 		}
-		return totalcount;
+		return (u32) totalcount;
 	}
 }
 
@@ -518,7 +577,7 @@
 static gf_utf8_mbstate_t internal;
 
 GF_EXPORT
-size_t gf_utf8_mbstowcs(unsigned short* dest, size_t len, const char** srcp)
+u32 gf_utf8_mbstowcs(unsigned short* dest, size_t len, const char** srcp)
 {
 	gf_utf8_mbstate_t* ps = &internal;
 	const char *src = *srcp;
@@ -578,11 +637,11 @@
 		goto bad_input;
 	}
 	*srcp = src;
-	return destptr-dest;
+	return (u32) (destptr - dest);
 
 bad_input:
 	*srcp = src;
-	return (size_t)(-1);
+	return GF_UTF8_FAIL;
 }
 
 
@@ -590,36 +649,47 @@
 
 
 GF_EXPORT
-char *gf_utf_get_utf8_string_from_bom(u8 *data, u32 size, char **out_ptr)
+GF_Err gf_utf_get_utf8_string_from_bom(const u8 *data, u32 size, char **out_ptr, char **result)
 {
 	u32 unicode_type = 0;
+	if (!out_ptr || !result || !data) return GF_BAD_PARAM;
 	*out_ptr = NULL;
+	*result = (char *) data;
 
 	if (size>=5) {
 		/*0: no unicode, 1: UTF-16BE, 2: UTF-16LE*/
 		if ((data[0]==0xFF) && (data[1]==0xFE)) {
 			if (!data[2] && !data[3]) {
-				return NULL;
+				return GF_OK;
 			} else {
 				unicode_type = 2;
 			}
 		} else if ((data[0]==0xFE) && (data[1]==0xFF)) {
 			if (!data[2] && !data[3]) {
-				return NULL;
+				return GF_OK;
 			} else {
 				unicode_type = 1;
 			}
 		} else if ((data[0]==0xEF) && (data[1]==0xBB) && (data[2]==0xBF)) {
-			return data+4;
+			*result = (char *) (data+4);
+			return GF_OK;
 		}
 	}
 
-	if (!unicode_type) return data;
+	if (!unicode_type) {
+		*result = (char *) data;
+		return GF_OK;
+	}
 
 	if (size%2) size--;
 	u16 *str_wc = gf_malloc(size+2);
+	if (!str_wc) return GF_OUT_OF_MEM;
 	u16 *srcwc;
 	char *dst = gf_malloc(size+2);
+	if (!dst) {
+		gf_free(str_wc);
+		return GF_OUT_OF_MEM;
+	}
 	*out_ptr = dst;
 	u32 i;
 	for (i=0; i<size; i+=2) {
@@ -646,10 +716,15 @@
 	}
 	str_wc[i/2] = 0;
 	srcwc = str_wc;
-	gf_utf8_wcstombs(dst, size, (const unsigned short **) &srcwc);
+	u32 res = gf_utf8_wcstombs(dst, size, (const unsigned short **) &srcwc);
 	gf_free(str_wc);
-
-	return dst;
+	if (res==GF_UTF8_FAIL) {
+		gf_free(dst);
+		*out_ptr = NULL;
+		return GF_IO_ERR;
+	}
+	*result = dst;
+	return GF_OK;
 }
 
 
@@ -665,7 +740,7 @@
 	result = gf_calloc(source_len + 1, sizeof(wchar_t));
 	if (!result)
 		return 0;
-	if (gf_utf8_mbstowcs(result, source_len, &str) == (size_t)-1) {
+	if (gf_utf8_mbstowcs(result, source_len, &str) == GF_UTF8_FAIL) {
 		gf_free(result);
 		return 0;
 	}
@@ -682,7 +757,7 @@
 	result = gf_calloc(source_len + 1, UTF8_MAX_BYTES_PER_CHAR);
 	if (!result)
 		return 0;
-	if (gf_utf8_wcstombs(result, source_len * UTF8_MAX_BYTES_PER_CHAR, &str) < 0) {
+	if (gf_utf8_wcstombs(result, source_len * UTF8_MAX_BYTES_PER_CHAR, &str) == GF_UTF8_FAIL) {
 		gf_free(result);
 		return 0;
 	}

gpac-1.0.1.tar.gz/src/utils/xml_parser.c -> gpac-2.0.0.tar.gz/src/utils/xml_parser.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2020
+ *			Copyright (c) Telecom ParisTech 2005-2022
 *			All rights reserved
 *
 * This file is part of GPAC / common tools sub-project
@@ -63,7 +63,7 @@
 			if (str[i+1]=='#') {
 				char szChar[20], *end;
 				u16 wchar[2];
-				u32 val;
+				u32 val, _len;
 				const unsigned short *srcp;
 				strncpy(szChar, str+i, 10);
 				szChar[10] = 0;
@@ -78,7 +78,9 @@
 					sscanf(szChar, "&#%u;", &val);
 				wchar[0] = val;
 				srcp = wchar;
-				j += (u32) gf_utf8_wcstombs(&value[j], 20, &srcp);
+				_len = gf_utf8_wcstombs(&value[j], 20, &srcp);
+				if (_len == GF_UTF8_FAIL) _len = 0;
+				j += _len;
 			}
 			else if (!strnicmp(&str[i], "&amp;", sizeof(char)*5)) {
 				value[j] = '&';
@@ -1074,10 +1076,10 @@
 
 	if (parser->unicode_type>1) {
 		const u16 *sptr = (const u16 *)string;
-		u32 len = 2 * (u32) gf_utf8_wcslen(sptr);
+		u32 len = 2 * gf_utf8_wcslen(sptr);
 		utf_conv = (char *)gf_malloc(sizeof(char)*(len+1));
-		len = (u32) gf_utf8_wcstombs(utf_conv, len, &sptr);
-		if (len==(u32) -1) {
+		len = gf_utf8_wcstombs(utf_conv, len, &sptr);
+		if (len == GF_UTF8_FAIL) {
 			parser->sax_state = SAX_STATE_SYNTAX_ERROR;
 			gf_free(utf_conv);
 			return GF_CORRUPTED_DATA;
@@ -1226,7 +1228,7 @@
 	if (!strncmp(fileName, "gmem://", 7)) {
 		u32 size;
 		u8 *xml_mem_address;
-		e = gf_blob_get_data(fileName, &xml_mem_address, &size);
+		e = gf_blob_get(fileName, &xml_mem_address, &size, NULL);
 		if (e) return e;
 
 		parser->file_size = size;
@@ -1239,12 +1241,12 @@
 		parser->current_pos = 0;
 
 		e = gf_xml_sax_init(parser, szLine);
-		if (e) return e;
-
-
-		e = gf_xml_sax_parse(parser, xml_mem_address+4);
-		if (parser->on_progress) parser->on_progress(parser->sax_cbck, parser->file_pos, parser->file_size);
-
+ if (!e) {
+ e = gf_xml_sax_parse(parser, xml_mem_address+4);
+ if (parser->on_progress) parser->on_progress(parser->sax_cbck, parser->file_pos, parser->file_size);
+ }
+ gf_blob_release(fileName);
+ 
 		parser->elt_start_pos = parser->elt_end_pos = 0;
 		parser->elt_name_start = parser->elt_name_end = 0;
 		parser->att_name_start = 0;
@@ -1619,10 +1621,10 @@
 
 
 GF_EXPORT
-void gf_xml_dom_node_del(GF_XMLNode *node)
+void gf_xml_dom_node_reset(GF_XMLNode *node, Bool reset_attribs, Bool reset_children)
 {
 	if (!node) return;
-	if (node->attributes) {
+	if (node->attributes && reset_attribs) {
 		while (gf_list_count(node->attributes)) {
 			GF_XMLAttribute *att = (GF_XMLAttribute *)gf_list_last(node->attributes);
 			gf_list_rem_last(node->attributes);
@@ -1630,16 +1632,24 @@
 			if (att->value) gf_free(att->value);
 			gf_free(att);
 		}
-		gf_list_del(node->attributes);
 	}
-	if (node->content) {
+
+	if (reset_children && node->content) {
 		while (gf_list_count(node->content)) {
 			GF_XMLNode *child = (GF_XMLNode *)gf_list_last(node->content);
 			gf_list_rem_last(node->content);
 			gf_xml_dom_node_del(child);
 		}
-		gf_list_del(node->content);
 	}
+}
+
+GF_EXPORT
+void gf_xml_dom_node_del(GF_XMLNode *node)
+{
+	if (!node) return;
+	gf_xml_dom_node_reset(node, GF_TRUE, GF_TRUE);
+	if (node->attributes) gf_list_del(node->attributes);
+	if (node->content) gf_list_del(node->content);
 	if (node->ns) gf_free(node->ns);
 	if (node->name) gf_free(node->name);
 	gf_free(node);
@@ -1783,14 +1793,17 @@
 	gf_free(parser);
 }
 
-#if 0 //unused
+GF_EXPORT
 GF_XMLNode *gf_xml_dom_detach_root(GF_DOMParser *parser)
 {
-	GF_XMLNode *root = parser->root;
-	parser->root = NULL;
+	GF_XMLNode *root;
+	if (!parser)
+		return NULL;
+	root = parser->root;
+	gf_list_del_item(parser->root_nodes, root);
+	parser->root = gf_list_get(parser->root_nodes, 0);
 	return root;
 }
-#endif
 
 static void dom_on_progress(void *cbck, u64 done, u64 tot)
 {
@@ -1866,15 +1879,16 @@
 }
 
 
-static void gf_xml_dom_node_serialize(GF_XMLNode *node, Bool content_only, char **str, u32 *alloc_size, u32 *size)
+static void gf_xml_dom_node_serialize(GF_XMLNode *node, Bool content_only, Bool no_escape, char **str, u32 *alloc_size, u32 *size)
 {
 	u32 i, count, vlen;
 	char *name;
 
 #define SET_STRING(v)	\
 	vlen = (u32) strlen(v);	\
-	if (vlen+ (*size) >= (*alloc_size)) {	\
+	if (vlen + (*size) >= (*alloc_size)) {	\
 		(*alloc_size) += 1024;	\
+		if (vlen + (*size) >= (*alloc_size)) (*alloc_size) = vlen + (*size) + 1;\
 		(*str) = gf_realloc((*str), (*alloc_size));	\
 		(*str)[(*size)] = 0;	\
 	}	\
@@ -1891,7 +1905,39 @@
 		name = node->name;
 		if ((name[0]=='\r') && (name[1]=='\n'))
 			name++;
-		SET_STRING(name);
+
+		if (no_escape) {
+			SET_STRING(name);
+		} else {
+			u32 tlen;
+			char szChar[2];
+			szChar[1] = 0;
+			tlen = (u32) strlen(name);
+			for (i= 0; i<tlen; i++) {
+				switch (name[i]) {
+				case '&':
+					SET_STRING("&amp;");
+					break;
+				case '<':
+					SET_STRING("&lt;");
+					break;
+				case '>':
+					SET_STRING("&gt;");
+					break;
+				case '\'':
+					SET_STRING("&apos;");
+					break;
+				case '\"':
+					SET_STRING("&quot;");
+					break;
+
+				default:
+					szChar[0] = name[i];
+					SET_STRING(szChar);
+					break;
+				}
+			}
+		}
 		return;
 	}
 
@@ -1924,7 +1970,7 @@
 	count = gf_list_count(node->content);
 	for (i=0; i<count; i++) {
 		GF_XMLNode *child = (GF_XMLNode*)gf_list_get(node->content, i);
-		gf_xml_dom_node_serialize(child, GF_FALSE, str, alloc_size, size);
+		gf_xml_dom_node_serialize(child, GF_FALSE, GF_FALSE, str, alloc_size, size);
 	}
 	if (!content_only) {
 		SET_STRING("</");
@@ -1938,12 +1984,25 @@
 }
 
 GF_EXPORT
-char *gf_xml_dom_serialize(GF_XMLNode *node, Bool content_only)
+char *gf_xml_dom_serialize(GF_XMLNode *node, Bool content_only, Bool no_escape)
 {
 	u32 alloc_size = 0;
 	u32 size = 0;
 	char *str = NULL;
-	gf_xml_dom_node_serialize(node, content_only, &str, &alloc_size, &size);
+	gf_xml_dom_node_serialize(node, content_only, no_escape, &str, &alloc_size, &size);
+	return str;
+}
+
+GF_EXPORT
+char *gf_xml_dom_serialize_root(GF_XMLNode *node, Bool content_only, Bool no_escape)
+{
+	u32 alloc_size, size;
+	char *str = NULL;
+	gf_dynstrcat(&str, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", NULL);
+	if (!str) return NULL;
+
+	alloc_size = size = (u32) strlen(str) + 1;
+	gf_xml_dom_node_serialize(node, content_only, no_escape, &str, &alloc_size, &size);
 	return str;
 }
 
@@ -2000,6 +2059,17 @@
 	return gf_list_add(node->content, child);
 }
 
+#if 0
+/*!
+\brief Removes the node to the list of children of this node.
+
+Removes the node to the list of children of this node.
+\warning Doesn't free the memory of the removed children.
+
+\param node the GF_XMLNode node
+\param child the GF_XMLNode child to remove
+\return Error code if any, otherwise GF_OK
+ */
 GF_EXPORT
 GF_Err gf_xml_dom_rem_child(GF_XMLNode *node, GF_XMLNode *child) {
 	s32 idx;
@@ -2009,7 +2079,6 @@
 	return gf_list_rem(node->content, idx);
 }
 
-#if 0
 GF_XMLNode* gf_xml_dom_node_new(const char* ns, const char* name) {
 	GF_XMLNode* node;
 	GF_SAFEALLOC(node, GF_XMLNode);
@@ -2044,11 +2113,14 @@
 	}\
 
 
-GF_Err gf_xml_parse_bit_sequence_bs(GF_XMLNode *bsroot, const char *parent_url, GF_BitStream *bs)
+GF_Err gf_xml_parse_bit_sequence_bs(GF_XMLNode *bsroot, const char *parent_url, GF_BitStream *bs_orig)
 {
 	u32 i, j;
+	GF_Err e = GF_OK;
 	GF_XMLNode *node;
 	GF_XMLAttribute *att;
+	GF_BitStream *bs = bs_orig;
+	u32 enc_base64 = 0;
 
 	i=0;
 	while ((node = (GF_XMLNode *) gf_list_enum(bsroot->content, &i))) {
@@ -2061,6 +2133,7 @@
 		Double val_double = 0;
 		Bool use_word128 = GF_FALSE;
 		Bool use_text = GF_FALSE;
+		Bool base64_prefix_bits = 0;
 		Bool big_endian = GF_TRUE;
 		Bool has_float = GF_FALSE;
 		Bool has_double = GF_FALSE;
@@ -2071,7 +2144,8 @@
 		if (node->type) continue;
 
 		if (stricmp(node->name, "BS") ) {
-			gf_xml_parse_bit_sequence_bs(node, parent_url, bs);
+			e = gf_xml_parse_bit_sequence_bs(node, parent_url, bs);
+			if (e) goto exit;
 			continue;
 		}
 
@@ -2102,7 +2176,7 @@
 				GF_Err e = gf_bin128_parse(att->value, word128);
 if (e != GF_OK) {
 GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Cannot parse ID128\n"));
- return e;
+ goto exit;
 }
 				use_word128 = GF_TRUE;
 			} else if (!stricmp(att->name, "textmode")) {
@@ -2114,8 +2188,33 @@
 				if (!strnicmp(szData, "0x", 2)) szData += 2;
 			} else if (!stricmp(att->name, "endian") && !stricmp(att->value, "little")) {
 				big_endian = GF_FALSE;
+			} else if (!stricmp(att->name, "base64")) {
+				if (!stricmp(att->value, "yes") || !stricmp(att->value, "true") ) {
+					if (!enc_base64) enc_base64 = 1;
+				} else if (!stricmp(att->value, "start")) {
+					if (!enc_base64) enc_base64 = 2;
+				} else if (!stricmp(att->value, "end")) {
+					if (enc_base64==2) enc_base64 = 3;
+				} else {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Invalid base64 attribute %s, expecting yes/no, start or end\n", att->value));
+ e = GF_NON_COMPLIANT_BITSTREAM;
+ goto exit;
+				}
+			} else if (!stricmp(att->name, "base64Prefix")) {
+				base64_prefix_bits = atoi(att->value);
+			}
+		}
+
+		if (enc_base64 && (enc_base64<3)) {
+			if (bs == bs_orig) {
+				bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				if (!bs) {
+					e = GF_OUT_OF_MEM;
+					goto exit;
+				}
 			}
 		}
+
 		if (szString) {
 			u32 len = (u32) strlen(szString);
 			if (nb_bits)
@@ -2126,7 +2225,10 @@
 			u32 len = (u32) strlen(szBase64);
 			char *data = (char *) gf_malloc(sizeof(char)*len);
 			u32 ret;
-			if (!data ) return GF_OUT_OF_MEM;
+			if (!data) {
+				e = GF_OUT_OF_MEM;
+				goto exit;
+			}
 
 			ret = (u32) gf_base64_decode((char *)szBase64, len, data, len);
 			if ((s32) ret >=0) {
@@ -2135,13 +2237,17 @@
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Error decoding base64 %s\n", att->value));
 				gf_free(data);
-				return GF_BAD_PARAM;
+				e = GF_BAD_PARAM;
+				goto exit;
 			}
 			gf_free(data);
 		} else if (szData) {
 			u32 len = (u32) strlen(szData);
 			char *data = (char *) gf_malloc(sizeof(char)*len/2);
-			if (!data) return GF_OUT_OF_MEM;
+			if (!data) {
+				e = GF_OUT_OF_MEM;
+				goto exit;
+			}
 
 			for (j=0; j<len; j+=2) {
 				u32 v;
@@ -2165,7 +2271,8 @@
 					gf_bs_write_u32_le(bs, (u32)value);
 				else {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Little-endian values can only be 16 or 32-bit\n"));
-					return GF_BAD_PARAM;
+					e = GF_BAD_PARAM;
+					goto exit;
 				}
 			}
 			else {
@@ -2186,7 +2293,8 @@
 
 			if (!_tmp) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Error opening file %s\n", szFile));
-				return GF_URL_ERROR;
+				e = GF_URL_ERROR;
+				goto exit;
 			}
 
 			if (!size) {
@@ -2203,7 +2311,8 @@
 				read = (u32) gf_fread(block, bsize, _tmp);
 				if ((s32) read < 0) {
 					gf_fclose(_tmp);
-					return GF_IO_ERR;
+					e = GF_IO_ERR;
+					goto exit;
 				}
 
 				gf_bs_write_data(bs, block, read);
@@ -2213,8 +2322,52 @@
 		} else if (use_word128) {
 			gf_bs_write_data(bs, (char *)word128, 16);
 		}
+
+		if ((enc_base64==1) || (enc_base64==3)) {
+			u8 *bs_data;
+			u32 bs_data_size;
+			assert (bs != bs_orig);
+			gf_bs_get_content(bs, &bs_data, &bs_data_size);
+			gf_bs_del(bs);
+			enc_base64 = 0;
+			bs = bs_orig;
+			if (bs_data) {
+				u8 *bs_data_out;
+				bs_data_out = gf_malloc(sizeof(char)*2*bs_data_size);
+				if (!bs_data_out) {
+					e = GF_OUT_OF_MEM;
+					goto exit;
+				}
+				u32 res = gf_base64_encode(bs_data, bs_data_size, bs_data_out, 2*bs_data_size);
+				bs_data_out[res] = 0;
+				if (base64_prefix_bits) {
+					if (base64_prefix_bits % 8) {
+						gf_bs_write_int(bs, res, base64_prefix_bits);
+					} else {
+						u32 nb_bytes = base64_prefix_bits/8;
+						if (!big_endian && (nb_bytes==8)) gf_bs_write_u64_le(bs, res);
+						else if (!big_endian && (nb_bytes==4)) gf_bs_write_u32_le(bs, res);
+						else if (!big_endian && (nb_bytes==2)) gf_bs_write_u16_le(bs, res);
+						else
+							gf_bs_write_int(bs, res, base64_prefix_bits);
+					}
+				}
+				gf_bs_write_data(bs, bs_data_out, res);
+				gf_free(bs_data);
+				gf_free(bs_data_out);
+			}
+		}
 	}
-	return GF_OK;
+
+exit:
+	if (bs != bs_orig) {
+		if (!e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] base64 encoding context not closed\n"));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_bs_del(bs);
+	}
+	return e;
 }
 
 GF_EXPORT
@@ -2269,6 +2422,8 @@
 	return GF_BAD_PARAM;
 }
 
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
+
 void gf_xml_dump_string(FILE* file, const char *before, const char *str, const char *after)
 {
 	size_t i;
@@ -2306,5 +2461,3 @@
 		gf_fprintf(file, "%s", after);
 	}
 }
-
-#endif /*GPAC_DISABLE_CORE_TOOLS*/

gpac-1.0.1.tar.gz/static.mak -> gpac-2.0.0.tar.gz/static.mak Changed

Build Results
RPM Lint

Refresh

Comments for request 5519 0

Request History

Aloysius created request almost 3 years ago

Update to version 2.0.0

Aloysius accepted request almost 3 years ago